From db7a00335ad67a41bee9e201078a18a2ecc257f1 Mon Sep 17 00:00:00 2001
From: "J. Duke" <duke@openjdk.org>
Date: Sat, 1 Dec 2007 00:00:00 +0000
Subject: [PATCH 001/311] Initial load

---
 nashorn/.hgignore    | 4 ++++
 nashorn/.jcheck/conf | 1 +
 2 files changed, 5 insertions(+)
 create mode 100644 nashorn/.hgignore
 create mode 100644 nashorn/.jcheck/conf

diff --git a/nashorn/.hgignore b/nashorn/.hgignore
new file mode 100644
index 00000000000..83cef213d48
--- /dev/null
+++ b/nashorn/.hgignore
@@ -0,0 +1,4 @@
+^build/
+^dist/
+/nbproject/private/
+^.hgtip
diff --git a/nashorn/.jcheck/conf b/nashorn/.jcheck/conf
new file mode 100644
index 00000000000..6d0dbe48e36
--- /dev/null
+++ b/nashorn/.jcheck/conf
@@ -0,0 +1 @@
+project=jdk8

From 69a6be0305772fbcba9bf0798e0f61445bf42083 Mon Sep 17 00:00:00 2001
From: Anthony Petrov <anthony@openjdk.org>
Date: Fri, 12 Oct 2012 15:51:44 +0400
Subject: [PATCH 002/311] 7173145: Improve in-memory representation of
 splashscreens

Reviewed-by: bae, mschoene
---
 jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c
index fcd7de01639..b1a59098955 100644
--- a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c
+++ b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c
@@ -133,6 +133,10 @@ SplashDecodeJpeg(Splash * splash, struct jpeg_decompress_struct *cinfo)
     ImageFormat srcFormat;
 
     jpeg_read_header(cinfo, TRUE);
+
+    // SplashScreen jpeg converter expects data in RGB format only
+    cinfo->out_color_space = JCS_RGB;
+
     jpeg_start_decompress(cinfo);
 
     SplashCleanup(splash);

From f36ef09388cc33f69d56573d6a51ccea6333b632 Mon Sep 17 00:00:00 2001
From: Xue-Lei Andrew Fan <xuelei@openjdk.org>
Date: Mon, 15 Oct 2012 07:42:18 -0700
Subject: [PATCH 003/311] 7192393: Better Checking of order of TLS Messages

Also reviewed by Andrew Gross<Andrew.Gross@Oracle.COM>

Reviewed-by: weijun
---
 .../sun/security/ssl/ClientHandshaker.java       |  5 ++---
 .../sun/security/ssl/ServerHandshaker.java       | 16 +++++++++-------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java b/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java
index 9ebeb75c5aa..63d48ad376d 100644
--- a/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java
+++ b/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java
@@ -128,9 +128,8 @@ final class ClientHandshaker extends Handshaker {
      * in the constructor.
      */
     void processMessage(byte type, int messageLen) throws IOException {
-        if (state > type
-                && (type != HandshakeMessage.ht_hello_request
-                    && state != HandshakeMessage.ht_client_hello)) {
+        if (state >= type
+                && (type != HandshakeMessage.ht_hello_request)) {
             throw new SSLProtocolException(
                     "Handshake message sequence violation, " + type);
         }
diff --git a/jdk/src/share/classes/sun/security/ssl/ServerHandshaker.java b/jdk/src/share/classes/sun/security/ssl/ServerHandshaker.java
index 8b10f8a9499..a8d256f76d6 100644
--- a/jdk/src/share/classes/sun/security/ssl/ServerHandshaker.java
+++ b/jdk/src/share/classes/sun/security/ssl/ServerHandshaker.java
@@ -150,7 +150,7 @@ final class ServerHandshaker extends Handshaker {
         // In SSLv3 and TLS, messages follow strictly increasing
         // numerical order _except_ for one annoying special case.
         //
-        if ((state > type)
+        if ((state >= type)
                 && (state != HandshakeMessage.ht_client_key_exchange
                     && type != HandshakeMessage.ht_certificate_verify)) {
             throw new SSLProtocolException(
@@ -250,13 +250,15 @@ final class ServerHandshaker extends Handshaker {
         }
 
         //
-        // Move the state machine forward except for that annoying
-        // special case.  This means that clients could send extra
-        // cert verify messages; not a problem so long as all of
-        // them actually check out.
+        // Move state machine forward if the message handling
+        // code didn't already do so
         //
-        if (state < type && type != HandshakeMessage.ht_certificate_verify) {
-            state = type;
+        if (state < type) {
+            if(type == HandshakeMessage.ht_certificate_verify) {
+                state = type + 2;    // an annoying special case
+            } else {
+                state = type;
+            }
         }
     }
 

From c4f31fd22e9905fb38ad0919154d9fcd6c7c3183 Mon Sep 17 00:00:00 2001
From: Sergey Malenkov <malenkov@openjdk.org>
Date: Mon, 15 Oct 2012 19:00:13 +0400
Subject: [PATCH 004/311] 7200493: Improve cache handling

Reviewed-by: art, ahgross
---
 .../share/classes/com/sun/beans/finder/MethodFinder.java   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/jdk/src/share/classes/com/sun/beans/finder/MethodFinder.java b/jdk/src/share/classes/com/sun/beans/finder/MethodFinder.java
index fa7cc5612ab..98c52bc929a 100644
--- a/jdk/src/share/classes/com/sun/beans/finder/MethodFinder.java
+++ b/jdk/src/share/classes/com/sun/beans/finder/MethodFinder.java
@@ -66,11 +66,14 @@ public final class MethodFinder extends AbstractFinder<Method> {
         Signature signature = new Signature(type, name, args);
 
         Method method = CACHE.get(signature);
-        if (method != null) {
+        boolean cached = method != null;
+        if (cached && isPackageAccessible(method.getDeclaringClass())) {
             return method;
         }
         method = findAccessibleMethod(new MethodFinder(name, args).find(type.getMethods()));
-        CACHE.put(signature, method);
+        if (!cached) {
+            CACHE.put(signature, method);
+        }
         return method;
     }
 

From e2a34e4d9e5975da831124dd4d49e389fabcfcf5 Mon Sep 17 00:00:00 2001
From: Pavel Porvatov <rupashka@openjdk.org>
Date: Tue, 16 Oct 2012 14:13:39 +0400
Subject: [PATCH 005/311] 7186948: Improve Swing data validation

Reviewed-by: art, ahgross
---
 jdk/src/share/classes/javax/swing/UIDefaults.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/jdk/src/share/classes/javax/swing/UIDefaults.java b/jdk/src/share/classes/javax/swing/UIDefaults.java
index 9f22122d7b2..9f304e742c7 100644
--- a/jdk/src/share/classes/javax/swing/UIDefaults.java
+++ b/jdk/src/share/classes/javax/swing/UIDefaults.java
@@ -677,6 +677,8 @@ public class UIDefaults extends Hashtable<Object,Object>
         try {
             String className = (String)get(uiClassID);
             if (className != null) {
+                ReflectUtil.checkPackageAccess(className);
+
                 Class cls = (Class)get(className);
                 if (cls == null) {
                     if (uiClassLoader == null) {

From 1ee5b4509e4ee5008bdcf19b54b14de7f6e1b443 Mon Sep 17 00:00:00 2001
From: Kumar Srinivasan <ksrini@openjdk.org>
Date: Tue, 16 Oct 2012 12:29:10 -0700
Subject: [PATCH 006/311] 7186945: Unpack200 improvement

Reviewed-by: jrose, jjh, mschoene
---
 .../share/native/com/sun/java/util/jar/pack/jni.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp b/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
index bedecda5391..50b5d114b39 100644
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
@@ -127,8 +127,10 @@ static jlong read_input_via_jni(unpacker* self,
 
 JNIEXPORT void JNICALL
 Java_com_sun_java_util_jar_pack_NativeUnpack_initIDs(JNIEnv *env, jclass clazz) {
+#ifndef PRODUCT
   dbg = getenv("DEBUG_ATTACH");
   while( dbg != null) { sleep(10); }
+#endif
   NIclazz = (jclass) env->NewGlobalRef(clazz);
   unpackerPtrFID = env->GetFieldID(clazz, "unpackerPtr", "J");
   currentInstMID = env->GetStaticMethodID(clazz, "currentInstance",
@@ -230,11 +232,14 @@ Java_com_sun_java_util_jar_pack_NativeUnpack_getUnusedInput(JNIEnv *env, jobject
 
   // We have fetched all the files.
   // Now swallow up any remaining input.
-  if (uPtr->input_remaining() == 0)
+  if (uPtr->input_remaining() == 0) {
     return null;
-  else
-    return env->NewDirectByteBuffer(uPtr->input_scan(),
-                                    uPtr->input_remaining());
+  } else {
+    bytes remaining_bytes;
+    remaining_bytes.malloc(uPtr->input_remaining());
+    remaining_bytes.copyFrom(uPtr->input_scan(), uPtr->input_remaining());
+    return env->NewDirectByteBuffer(remaining_bytes.ptr, remaining_bytes.len);
+  }
 }
 
 JNIEXPORT jlong JNICALL

From 0c4da1ece18f318e7f8387f595dbfbc64c2573ef Mon Sep 17 00:00:00 2001
From: Kumar Srinivasan <ksrini@openjdk.org>
Date: Tue, 16 Oct 2012 12:35:22 -0700
Subject: [PATCH 007/311] 7186957: Improve Pack200 data validation

Reviewed-by: jrose, jjh, mschoene
---
 .../sun/java/util/jar/pack/BandStructure.java |  3 +-
 .../sun/java/util/jar/pack/ConstantPool.java  |  2 ++
 .../com/sun/java/util/jar/pack/bands.cpp      |  4 +++
 .../native/com/sun/java/util/jar/pack/bands.h |  4 +--
 .../com/sun/java/util/jar/pack/unpack.cpp     | 30 ++++++++++++++++---
 5 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java b/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java
index f3d5cec8e48..b53e082b802 100644
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java
@@ -1000,7 +1000,6 @@ class BandStructure {
 
         /** Write a constant pool reference. */
         public void putRef(Entry e) {
-            assert(index != null);
             addValue(encodeRefOrNull(e, index));
         }
         public void putRef(Entry e, Index index) {
@@ -1052,6 +1051,8 @@ class BandStructure {
 
 
     int encodeRef(Entry e, Index ix) {
+        if (ix == null)
+            throw new RuntimeException("null index for " + e.stringValue());
         int coding = ix.indexOf(e);
         if (verbose > 2)
             Utils.log.fine("putRef "+coding+" => "+e);
diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java b/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java
index be4da54d247..4c5e5ba050d 100644
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java
@@ -1381,6 +1381,8 @@ class ConstantPool {
 
         /** Index of all CP entries of a given tag and class. */
         public Index getMemberIndex(byte tag, ClassEntry classRef) {
+            if (classRef == null)
+                throw new RuntimeException("missing class reference for " + tagName(tag));
             if (indexByTagAndClass == null)
                 indexByTagAndClass = new Index[CONSTANT_Limit][];
             Index allClasses =  getIndexByTag(CONSTANT_Class);
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/bands.cpp b/jdk/src/share/native/com/sun/java/util/jar/pack/bands.cpp
index 08cdc8d3e76..6db0f31bc32 100644
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/bands.cpp
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/bands.cpp
@@ -187,6 +187,10 @@ void band::setIndexByTag(byte tag) {
 
 entry* band::getRefCommon(cpindex* ix_, bool nullOKwithCaller) {
   CHECK_0;
+  if (ix_ == NULL) {
+      abort("no index");
+      return NULL;
+  }
   assert(ix_->ixTag == ixTag
          || ((ixTag == CONSTANT_All ||
               ixTag == CONSTANT_LoadableValue ||
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/bands.h b/jdk/src/share/native/com/sun/java/util/jar/pack/bands.h
index b8e322aa1db..30ce8ed49a3 100644
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/bands.h
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/bands.h
@@ -99,8 +99,8 @@ struct band {
 
   int    getByte()  { assert(ix == null); return vs[0].getByte(); }
   int    getInt()   { assert(ix == null); return vs[0].getInt(); }
-  entry* getRefN()  { assert(ix != null); return getRefCommon(ix, true); }
-  entry* getRef()   { assert(ix != null); return getRefCommon(ix, false); }
+  entry* getRefN()  { return getRefCommon(ix, true); }
+  entry* getRef()   { return getRefCommon(ix, false); }
   entry* getRefUsing(cpindex* ix2)
                     { assert(ix == null); return getRefCommon(ix2, true); }
   entry* getRefCommon(cpindex* ix, bool nullOK);
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp b/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
index d7c51978ded..bb0e10bb32b 100644
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
@@ -281,11 +281,13 @@ int entry::typeSize() {
 }
 
 inline cpindex* cpool::getFieldIndex(entry* classRef) {
+  if (classRef == NULL) { abort("missing class reference"); return NULL; }
   assert(classRef->tagMatches(CONSTANT_Class));
   assert((uint)classRef->inord < (uint)tag_count[CONSTANT_Class]);
   return &member_indexes[classRef->inord*2+0];
 }
 inline cpindex* cpool::getMethodIndex(entry* classRef) {
+  if (classRef == NULL) { abort("missing class reference"); return NULL; }
   assert(classRef->tagMatches(CONSTANT_Class));
   assert((uint)classRef->inord < (uint)tag_count[CONSTANT_Class]);
   return &member_indexes[classRef->inord*2+1];
@@ -1289,6 +1291,7 @@ void unpacker::read_double_refs(band& cp_band, byte ref1Tag, byte ref2Tag,
     entry& e = cpMap[i];
     e.refs = U_NEW(entry*, e.nrefs = 2);
     e.refs[0] = cp_band1.getRef();
+    CHECK;
     e.refs[1] = cp_band2.getRef();
     CHECK;
   }
@@ -1369,6 +1372,7 @@ void unpacker::read_method_type(entry* cpMap, int len) {
       entry& e = cpMap[i];
       e.refs = U_NEW(entry*, e.nrefs = 1);
       e.refs[0] = cp_MethodType.getRef();
+      CHECK;
   }
 }
 
@@ -2104,6 +2108,7 @@ void unpacker::read_attr_defs() {
     int    attrc   = ADH_BYTE_CONTEXT(header);
     int    idx     = ADH_BYTE_INDEX(header);
     entry* name    = attr_definition_name.getRef();
+    CHECK;
     entry* layout  = attr_definition_layout.getRef();
     CHECK;
     attr_defs[attrc].defineLayout(idx, name, layout->value.b.strval());
@@ -2208,7 +2213,9 @@ void unpacker::read_ics() {
     if (ics[i].name == NO_ENTRY_YET) {
       // Long form.
       ics[i].outer = ic_outer_class.getRefN();
+      CHECK;
       ics[i].name  = ic_name.getRefN();
+      CHECK;
     } else {
       // Fill in outer and name based on inner.
       bytes& n = ics[i].inner->value.b;
@@ -2724,6 +2731,7 @@ void unpacker::putlayout(band** body) {
           e = b.getRefUsing(cp.getKQIndex());
         else
           e = b.getRefN();
+        CHECK;
         switch (b.le_len) {
         case 0: break;
         case 1: putu1ref(e); break;
@@ -4006,6 +4014,7 @@ void unpacker::write_bc_ops() {
     NOT_PRODUCT(bc_superfield.setIndex(null));
     NOT_PRODUCT(bc_supermethod.setIndex(null));
   }
+  CHECK;
 
   for (int curIP = 0; ; curIP++) {
     int curPC = (int)(wpoffset() - codeBase);
@@ -4119,7 +4128,8 @@ void unpacker::write_bc_ops() {
         int coding = bc_initref.getInt();
         // Find the nth overloading of <init> in classRef.
         entry*   ref = null;
-        cpindex* ix = (classRef == null)? null: cp.getMethodIndex(classRef);
+        cpindex* ix = cp.getMethodIndex(classRef);
+        CHECK;
         for (int j = 0, which_init = 0; ; j++) {
           ref = (ix == null)? null: ix->get(j);
           if (ref == null)  break;  // oops, bad input
@@ -4396,6 +4406,7 @@ int unpacker::write_attrs(int attrc, julong indexBits) {
       case ADH_BYTE(ATTR_CONTEXT_CLASS, CLASS_ATTR_EnclosingMethod):
         aname = cp.sym[cpool::s_EnclosingMethod];
         putref(class_EnclosingMethod_RC.getRefN());
+        CHECK_0;
         putref(class_EnclosingMethod_RDN.getRefN());
         break;
 
@@ -4414,6 +4425,7 @@ int unpacker::write_attrs(int attrc, julong indexBits) {
         putu2(count = method_Exceptions_N.getInt());
         for (j = 0; j < count; j++) {
           putref(method_Exceptions_RC.getRefN());
+          CHECK_0;
         }
         break;
 
@@ -4437,16 +4449,18 @@ int unpacker::write_attrs(int attrc, julong indexBits) {
             // (253)     [(1)(2)(2)]
             // (254)     [(1)(2)(2)(2)]
             putu2(code_StackMapTable_offset.getInt());
+            CHECK_0;
             for (int k = (tag - 251); k > 0; k--) {
               put_stackmap_type();
+              CHECK_0;
             }
           } else {
             // (255)     [(1)NH[(2)]NH[(2)]]
             putu2(code_StackMapTable_offset.getInt());
             putu2(j2 = code_StackMapTable_local_N.getInt());
-            while (j2-- > 0)  put_stackmap_type();
+            while (j2-- > 0) {put_stackmap_type(); CHECK_0;}
             putu2(j2 = code_StackMapTable_stack_N.getInt());
-            while (j2-- > 0)  put_stackmap_type();
+            while (j2-- > 0)  {put_stackmap_type(); CHECK_0;}
           }
         }
         break;
@@ -4470,7 +4484,9 @@ int unpacker::write_attrs(int attrc, julong indexBits) {
           bii    += code_LocalVariableTable_span_O.getInt();
           putu2(to_bci(bii) - bci);
           putref(code_LocalVariableTable_name_RU.getRefN());
+          CHECK_0;
           putref(code_LocalVariableTable_type_RS.getRefN());
+          CHECK_0;
           putu2(code_LocalVariableTable_slot.getInt());
         }
         break;
@@ -4485,7 +4501,9 @@ int unpacker::write_attrs(int attrc, julong indexBits) {
           bii    += code_LocalVariableTypeTable_span_O.getInt();
           putu2(to_bci(bii) - bci);
           putref(code_LocalVariableTypeTable_name_RU.getRefN());
+          CHECK_0;
           putref(code_LocalVariableTypeTable_type_RS.getRefN());
+          CHECK_0;
           putu2(code_LocalVariableTypeTable_slot.getInt());
         }
         break;
@@ -4513,7 +4531,7 @@ int unpacker::write_attrs(int attrc, julong indexBits) {
         break;
       }
     }
-
+    CHECK_0;
     if (aname == null) {
       // Unparse a compressor-defined attribute.
       layout_definition* lo = ad.getLayout(idx);
@@ -4669,7 +4687,9 @@ int  unpacker::write_ics(int naOffset, int na) {
       flags &= ~ACC_IC_LONG_FORM;  // clear high bit if set to get clean zero
       extra_ic.flags = flags;
       extra_ic.outer = class_InnerClasses_outer_RCN.getRefN();
+      CHECK_0;
       extra_ic.name  = class_InnerClasses_name_RUN.getRefN();
+      CHECK_0;
       // Detect if this is an exact copy of the global tuple.
       if (global_ic != null) {
         if (global_ic->flags != extra_ic.flags ||
@@ -4778,6 +4798,7 @@ void unpacker::write_classfile_tail() {
   julong indexMask = ad.flagIndexMask();
 
   cur_class = class_this.getRef();
+  CHECK;
   cur_super = class_super.getRef();
   CHECK;
 
@@ -4791,6 +4812,7 @@ void unpacker::write_classfile_tail() {
   putu2(num = class_interface_count.getInt());
   for (i = 0; i < num; i++) {
     putref(class_interface.getRef());
+    CHECK;
   }
 
   write_members(class_field_count.getInt(),  ATTR_CONTEXT_FIELD);

From ef7ede903e93a14a736085aa6d23a5caa95ad886 Mon Sep 17 00:00:00 2001
From: Kumar Srinivasan <ksrini@openjdk.org>
Date: Tue, 16 Oct 2012 12:38:29 -0700
Subject: [PATCH 008/311] 7186946: Refine unpacker resource usage

Reviewed-by: jrose, jjh, mschoene
---
 .../sun/java/util/jar/pack/NativeUnpack.java  |  6 ++-
 .../sun/java/util/jar/pack/PackerImpl.java    |  4 +-
 .../sun/java/util/jar/pack/UnpackerImpl.java  |  6 +--
 .../native/com/sun/java/util/jar/pack/jni.cpp | 40 ++++++++++++++-----
 .../com/sun/java/util/jar/pack/unpack.cpp     |  4 +-
 5 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java b/jdk/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java
index 7e525729034..3f2f430fb84 100644
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -109,6 +109,10 @@ class NativeUnpack {
         return (p200 == null)? null: p200._nunp;
     }
 
+    private synchronized long getUnpackerPtr() {
+        return unpackerPtr;
+    }
+
     // Callback from the unpacker engine to get more data.
     private long readInputFn(ByteBuffer pbuf, long minlen) throws IOException {
         if (in == null)  return 0;  // nothing is readable
diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java b/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java
index c7ef4ee2013..dce8811e377 100644
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java
@@ -83,7 +83,7 @@ public class PackerImpl  extends TLGlobals implements Pack200.Packer {
      * @param out an OutputStream
      * @exception IOException if an error is encountered.
      */
-    public void pack(JarFile in, OutputStream out) throws IOException {
+    public synchronized void pack(JarFile in, OutputStream out) throws IOException {
         assert(Utils.currentInstance.get() == null);
         TimeZone tz = (props.getBoolean(Utils.PACK_DEFAULT_TIMEZONE))
                       ? null
@@ -118,7 +118,7 @@ public class PackerImpl  extends TLGlobals implements Pack200.Packer {
      * @param out an OutputStream
      * @exception IOException if an error is encountered.
      */
-    public void pack(JarInputStream in, OutputStream out) throws IOException {
+    public synchronized void pack(JarInputStream in, OutputStream out) throws IOException {
         assert(Utils.currentInstance.get() == null);
         TimeZone tz = (props.getBoolean(Utils.PACK_DEFAULT_TIMEZONE)) ? null :
             TimeZone.getDefault();
diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java b/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java
index 5727d32986e..fd8ccfd3c71 100644
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -106,7 +106,7 @@ public class UnpackerImpl extends TLGlobals implements Pack200.Unpacker {
      * @param out a JarOutputStream.
      * @exception IOException if an error is encountered.
      */
-    public void unpack(InputStream in, JarOutputStream out) throws IOException {
+    public synchronized void unpack(InputStream in, JarOutputStream out) throws IOException {
         if (in == null) {
             throw new NullPointerException("null input");
         }
@@ -151,7 +151,7 @@ public class UnpackerImpl extends TLGlobals implements Pack200.Unpacker {
      * @param out a JarOutputStream.
      * @exception IOException if an error is encountered.
      */
-    public void unpack(File in, JarOutputStream out) throws IOException {
+    public synchronized void unpack(File in, JarOutputStream out) throws IOException {
         if (in == null) {
             throw new NullPointerException("null input");
         }
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp b/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
index 50b5d114b39..26c683f0ae9 100644
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
@@ -50,6 +50,7 @@ static jfieldID  unpackerPtrFID;
 static jmethodID currentInstMID;
 static jmethodID readInputMID;
 static jclass    NIclazz;
+static jmethodID getUnpackerPtrMID;
 
 static char* dbg = null;
 
@@ -60,8 +61,8 @@ static jlong read_input_via_jni(unpacker* self,
 
 static unpacker* get_unpacker(JNIEnv *env, jobject pObj, bool noCreate=false) {
   unpacker* uPtr;
-  uPtr = (unpacker*)jlong2ptr(env->GetLongField(pObj, unpackerPtrFID));
-  //fprintf(stderr, "get_unpacker(%p) uPtr=%p\n", pObj, uPtr);
+  jlong p = env->CallLongMethod(pObj, getUnpackerPtrMID);
+  uPtr = (unpacker*)jlong2ptr(p);
   if (uPtr == null) {
     if (noCreate)  return null;
     uPtr = new unpacker();
@@ -94,11 +95,15 @@ static unpacker* get_unpacker() {
   if (env == null)
     return null;
   jobject pObj = env->CallStaticObjectMethod(NIclazz, currentInstMID);
-  //fprintf(stderr, "get_unpacker() pObj=%p\n", pObj);
-  if (pObj == null)
-    return null;
-  // Got pObj and env; now do it the easy way.
-  return get_unpacker(env, pObj);
+  //fprintf(stderr, "get_unpacker0() pObj=%p\n", pObj);
+  if (pObj != null) {
+    // Got pObj and env; now do it the easy way.
+    return get_unpacker(env, pObj);
+  }
+  // this should really not happen, if it does something is seriously
+  // wrong throw an exception
+  THROW_IOE(ERROR_INTERNAL);
+  return null;
 }
 
 static void free_unpacker(JNIEnv *env, jobject pObj, unpacker* uPtr) {
@@ -137,10 +142,13 @@ Java_com_sun_java_util_jar_pack_NativeUnpack_initIDs(JNIEnv *env, jclass clazz)
                                           "()Ljava/lang/Object;");
   readInputMID = env->GetMethodID(clazz, "readInputFn",
                                   "(Ljava/nio/ByteBuffer;J)J");
+  getUnpackerPtrMID = env->GetMethodID(clazz, "getUnpackerPtr", "()J");
+
   if (unpackerPtrFID == null ||
       currentInstMID == null ||
       readInputMID == null ||
-      NIclazz == null) {
+      NIclazz == null ||
+      getUnpackerPtrMID == null) {
     THROW_IOE("cannot init class members");
   }
 }
@@ -148,8 +156,13 @@ Java_com_sun_java_util_jar_pack_NativeUnpack_initIDs(JNIEnv *env, jclass clazz)
 JNIEXPORT jlong JNICALL
 Java_com_sun_java_util_jar_pack_NativeUnpack_start(JNIEnv *env, jobject pObj,
                                    jobject pBuf, jlong offset) {
-  unpacker* uPtr = get_unpacker(env, pObj);
-
+  // try to get the unpacker pointer the hard way first, we do this to ensure
+  // valid object pointers and env is intact, if not now is good time to bail.
+  unpacker* uPtr = get_unpacker();
+  //fprintf(stderr, "start(%p) uPtr=%p initializing\n", pObj, uPtr);
+  if (uPtr == null) {
+      return -1;
+  }
   // redirect our io to the default log file or whatever.
   uPtr->redirect_stdio();
 
@@ -165,7 +178,12 @@ Java_com_sun_java_util_jar_pack_NativeUnpack_start(JNIEnv *env, jobject pObj,
     else
       { buf = (char*)buf + (size_t)offset; buflen -= (size_t)offset; }
   }
-
+  // before we start off we make sure there is no other error by the time we
+  // get here
+  if (uPtr->aborting()) {
+    THROW_IOE(uPtr->get_abort_message());
+    return 0;
+  }
   uPtr->start(buf, buflen);
   if (uPtr->aborting()) {
     THROW_IOE(uPtr->get_abort_message());
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp b/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
index bb0e10bb32b..9c950498252 100644
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
@@ -3117,7 +3117,7 @@ void unpacker::read_bcs() {
 
 void unpacker::read_bands() {
   byte* rp0 = rp;
-
+  CHECK;
   read_file_header();
   CHECK;
 
@@ -3879,10 +3879,12 @@ void unpacker::dump_options() {
 // packed file and len is the length of the buffer.
 // If null, the callback is used to fill an internal buffer.
 void unpacker::start(void* packptr, size_t len) {
+  CHECK;
   NOT_PRODUCT(debug_u = this);
   if (packptr != null && len != 0) {
     inbytes.set((byte*) packptr, len);
   }
+  CHECK;
   read_bands();
 }
 

From f9122bd3fd36e7e1c113c9c50ca46ff2e29231a8 Mon Sep 17 00:00:00 2001
From: Kumar Srinivasan <ksrini@openjdk.org>
Date: Tue, 16 Oct 2012 16:38:38 -0700
Subject: [PATCH 009/311] 7200499: Better data validation for options

Reviewed-by: darcy, jjh, mschoene
---
 jdk/src/share/bin/jli_util.h  |  2 +-
 jdk/src/windows/bin/java_md.c | 32 ++++++++++++++++++++++++++++----
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/jdk/src/share/bin/jli_util.h b/jdk/src/share/bin/jli_util.h
index 568318c95c6..dd53e936210 100644
--- a/jdk/src/share/bin/jli_util.h
+++ b/jdk/src/share/bin/jli_util.h
@@ -66,7 +66,7 @@ int     JLI_GetStdArgc();
 #include <io.h>
 #define JLI_StrCaseCmp(p1, p2)          stricmp((p1), (p2))
 #define JLI_StrNCaseCmp(p1, p2, p3)     strnicmp((p1), (p2), (p3))
-#define JLI_Snprintf                    _snprintf
+size_t  JLI_Snprintf(char *buffer, size_t size, const char *format, ...);
 void JLI_CmdToArgs(char *cmdline);
 #define JLI_Lseek                       _lseeki64
 #else  /* NIXES */
diff --git a/jdk/src/windows/bin/java_md.c b/jdk/src/windows/bin/java_md.c
index e236cab1f2e..df118717279 100644
--- a/jdk/src/windows/bin/java_md.c
+++ b/jdk/src/windows/bin/java_md.c
@@ -101,7 +101,6 @@ int awtPreloadD3D = -1;
 /* funtion in awt.dll (src/windows/native/sun/java2d/d3d/D3DPipelineManager.cpp) */
 #define D3D_PRELOAD_FUNC "preloadD3D"
 
-
 /* Extracts value of a parameter with the specified name
  * from command line argument (returns pointer in the argument).
  * Returns NULL if the argument does not contains the parameter.
@@ -276,7 +275,8 @@ LoadMSVCRT()
 #endif
 #ifdef CRT_DLL
         if (GetJREPath(crtpath, MAXPATHLEN)) {
-            if (JLI_StrLen(crtpath) + JLI_StrLen("\\bin\\") + JLI_StrLen(CRT_DLL) >= MAXPATHLEN) {
+            if (JLI_StrLen(crtpath) + JLI_StrLen("\\bin\\") +
+                    JLI_StrLen(CRT_DLL) >= MAXPATHLEN) {
                 JLI_ReportErrorMessage(JRE_ERROR11);
                 return JNI_FALSE;
             }
@@ -347,7 +347,8 @@ GetJVMPath(const char *jrepath, const char *jvmtype,
     if (JLI_StrChr(jvmtype, '/') || JLI_StrChr(jvmtype, '\\')) {
         JLI_Snprintf(jvmpath, jvmpathsize, "%s\\" JVM_DLL, jvmtype);
     } else {
-        JLI_Snprintf(jvmpath, jvmpathsize, "%s\\bin\\%s\\" JVM_DLL, jrepath, jvmtype);
+        JLI_Snprintf(jvmpath, jvmpathsize, "%s\\bin\\%s\\" JVM_DLL,
+                     jrepath, jvmtype);
     }
     if (stat(jvmpath, &s) == 0) {
         return JNI_TRUE;
@@ -526,6 +527,29 @@ jlong Counter2Micros(jlong counts)
     return (counts * 1000 * 1000)/counterFrequency.QuadPart;
 }
 
+/*
+ * windows snprintf does not guarantee a null terminator in the buffer,
+ * if the computed size is equal to or greater than the buffer size,
+ * as well as error conditions, this function guarantees a null terminator
+ * under all these conditions. An unreasonable buffer size will return
+ * an error value.
+ */
+size_t
+JLI_Snprintf(char* buffer, size_t size, const char* format, ...)
+{
+    size_t rc;
+    va_list vl;
+    if (size <= 0)
+        return -1;
+    va_start(vl, format);
+    rc = vsnprintf(buffer, size - 1, format, vl);
+    /* force a null terminator, if something is amiss */
+    if (rc < 0 || rc >= size)
+        buffer[size - 1] = '\0';
+    va_end(vl);
+    return rc;
+}
+
 void
 JLI_ReportErrorMessage(const char* fmt, ...) {
     va_list vl;
@@ -880,7 +904,7 @@ unquote(const char *s) {
  */
 void
 ExecJRE(char *jre, char **argv) {
-    int     len;
+    jint     len;
     char    path[MAXPATHLEN + 1];
 
     const char *progname = GetProgramName();

From 2414c54cc122c611c359e0e736cf43256602d75a Mon Sep 17 00:00:00 2001
From: Kumar Srinivasan <ksrini@openjdk.org>
Date: Tue, 16 Oct 2012 10:56:25 -0700
Subject: [PATCH 010/311] 7200500: Launcher better input validation

Reviewed-by: darcy, jjh, mschoene
---
 jdk/src/share/bin/parse_manifest.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/jdk/src/share/bin/parse_manifest.c b/jdk/src/share/bin/parse_manifest.c
index ec3014931f2..22df69cb943 100644
--- a/jdk/src/share/bin/parse_manifest.c
+++ b/jdk/src/share/bin/parse_manifest.c
@@ -568,9 +568,9 @@ JLI_ParseManifest(char *jarfile, manifest_info *info)
 #ifdef O_BINARY
         | O_BINARY /* use binary mode on windows */
 #endif
-        )) == -1)
+        )) == -1) {
         return (-1);
-
+    }
     info->manifest_version = NULL;
     info->main_class = NULL;
     info->jre_version = NULL;
@@ -617,12 +617,14 @@ JLI_JarUnpackFile(const char *jarfile, const char *filename, int *size) {
     zentry  entry;
     void    *data = NULL;
 
-    fd = open(jarfile, O_RDONLY
+    if ((fd = open(jarfile, O_RDONLY
 #ifdef O_BINARY
         | O_BINARY /* use binary mode on windows */
 #endif
-        );
-    if (fd != -1 && find_file(fd, &entry, filename) == 0) {
+        )) == -1) {
+        return NULL;
+    }
+    if (find_file(fd, &entry, filename) == 0) {
         data = inflate_file(fd, &entry, size);
     }
     close(fd);
@@ -664,8 +666,9 @@ JLI_ManifestIterate(const char *jarfile, attribute_closure ac, void *user_data)
 #ifdef O_BINARY
         | O_BINARY /* use binary mode on windows */
 #endif
-        )) == -1)
+        )) == -1) {
         return (-1);
+    }
 
     if (rc = find_file(fd, &entry, manifest_name) != 0) {
         close(fd);

From 1193ef2418fbb3e307eb370fe769418e5b768b8f Mon Sep 17 00:00:00 2001
From: David Holmes <dholmes@openjdk.org>
Date: Wed, 22 Aug 2012 21:40:19 -0400
Subject: [PATCH 011/311] 6776941: Improve thread pool shutdown

Reviewed-by: dl, skoivu
---
 .../util/concurrent/ThreadPoolExecutor.java   | 172 +++++++++++-------
 1 file changed, 104 insertions(+), 68 deletions(-)

diff --git a/jdk/src/share/classes/java/util/concurrent/ThreadPoolExecutor.java b/jdk/src/share/classes/java/util/concurrent/ThreadPoolExecutor.java
index db7adf0e417..b7be7274d3f 100644
--- a/jdk/src/share/classes/java/util/concurrent/ThreadPoolExecutor.java
+++ b/jdk/src/share/classes/java/util/concurrent/ThreadPoolExecutor.java
@@ -34,8 +34,10 @@
  */
 
 package java.util.concurrent;
-import java.util.concurrent.locks.*;
-import java.util.concurrent.atomic.*;
+import java.util.concurrent.locks.AbstractQueuedSynchronizer;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.*;
 
 /**
@@ -491,10 +493,15 @@ public class ThreadPoolExecutor extends AbstractExecutorService {
      * policy limiting the number of threads.  Even though it is not
      * treated as an error, failure to create threads may result in
      * new tasks being rejected or existing ones remaining stuck in
-     * the queue. On the other hand, no special precautions exist to
-     * handle OutOfMemoryErrors that might be thrown while trying to
-     * create threads, since there is generally no recourse from
-     * within this class.
+     * the queue.
+     *
+     * We go further and preserve pool invariants even in the face of
+     * errors such as OutOfMemoryError, that might be thrown while
+     * trying to create threads.  Such errors are rather common due to
+     * the need to allocate a native stack in Thread#start, and users
+     * will want to perform clean pool shutdown to clean up.  There
+     * will likely be enough memory available for the cleanup code to
+     * complete without encountering yet another OutOfMemoryError.
      */
     private volatile ThreadFactory threadFactory;
 
@@ -568,9 +575,13 @@ public class ThreadPoolExecutor extends AbstractExecutorService {
      * task execution.  This protects against interrupts that are
      * intended to wake up a worker thread waiting for a task from
      * instead interrupting a task being run.  We implement a simple
-     * non-reentrant mutual exclusion lock rather than use ReentrantLock
-     * because we do not want worker tasks to be able to reacquire the
-     * lock when they invoke pool control methods like setCorePoolSize.
+     * non-reentrant mutual exclusion lock rather than use
+     * ReentrantLock because we do not want worker tasks to be able to
+     * reacquire the lock when they invoke pool control methods like
+     * setCorePoolSize.  Additionally, to suppress interrupts until
+     * the thread actually starts running tasks, we initialize lock
+     * state to a negative value, and clear it upon start (in
+     * runWorker).
      */
     private final class Worker
         extends AbstractQueuedSynchronizer
@@ -594,6 +605,7 @@ public class ThreadPoolExecutor extends AbstractExecutorService {
          * @param firstTask the first task (null if none)
          */
         Worker(Runnable firstTask) {
+            setState(-1); // inhibit interrupts until runWorker
             this.firstTask = firstTask;
             this.thread = getThreadFactory().newThread(this);
         }
@@ -609,7 +621,7 @@ public class ThreadPoolExecutor extends AbstractExecutorService {
         // The value 1 represents the locked state.
 
         protected boolean isHeldExclusively() {
-            return getState() == 1;
+            return getState() != 0;
         }
 
         protected boolean tryAcquire(int unused) {
@@ -630,6 +642,16 @@ public class ThreadPoolExecutor extends AbstractExecutorService {
         public boolean tryLock()  { return tryAcquire(1); }
         public void unlock()      { release(1); }
         public boolean isLocked() { return isHeldExclusively(); }
+
+        void interruptIfStarted() {
+            Thread t;
+            if (getState() >= 0 && (t = thread) != null && !t.isInterrupted()) {
+                try {
+                    t.interrupt();
+                } catch (SecurityException ignore) {
+                }
+            }
+        }
     }
 
     /*
@@ -728,12 +750,8 @@ public class ThreadPoolExecutor extends AbstractExecutorService {
         final ReentrantLock mainLock = this.mainLock;
         mainLock.lock();
         try {
-            for (Worker w : workers) {
-                try {
-                    w.thread.interrupt();
-                } catch (SecurityException ignore) {
-                }
-            }
+            for (Worker w : workers)
+                w.interruptIfStarted();
         } finally {
             mainLock.unlock();
         }
@@ -790,19 +808,6 @@ public class ThreadPoolExecutor extends AbstractExecutorService {
 
     private static final boolean ONLY_ONE = true;
 
-    /**
-     * Ensures that unless the pool is stopping, the current thread
-     * does not have its interrupt set. This requires a double-check
-     * of state in case the interrupt was cleared concurrently with a
-     * shutdownNow -- if so, the interrupt is re-enabled.
-     */
-    private void clearInterruptsForTaskRun() {
-        if (runStateLessThan(ctl.get(), STOP) &&
-            Thread.interrupted() &&
-            runStateAtLeast(ctl.get(), STOP))
-            Thread.currentThread().interrupt();
-    }
-
     /*
      * Misc utilities, most of which are also exported to
      * ScheduledThreadPoolExecutor
@@ -862,12 +867,13 @@ public class ThreadPoolExecutor extends AbstractExecutorService {
      * Checks if a new worker can be added with respect to current
      * pool state and the given bound (either core or maximum). If so,
      * the worker count is adjusted accordingly, and, if possible, a
-     * new worker is created and started running firstTask as its
+     * new worker is created and started, running firstTask as its
      * first task. This method returns false if the pool is stopped or
      * eligible to shut down. It also returns false if the thread
-     * factory fails to create a thread when asked, which requires a
-     * backout of workerCount, and a recheck for termination, in case
-     * the existence of this worker was holding up termination.
+     * factory fails to create a thread when asked.  If the thread
+     * creation fails, either due to the thread factory returning
+     * null, or due to an exception (typically OutOfMemoryError in
+     * Thread#start), we roll back cleanly.
      *
      * @param firstTask the task the new thread should run first (or
      * null if none). Workers are created with an initial first task
@@ -910,46 +916,65 @@ public class ThreadPoolExecutor extends AbstractExecutorService {
             }
         }
 
-        Worker w = new Worker(firstTask);
-        Thread t = w.thread;
+        boolean workerStarted = false;
+        boolean workerAdded = false;
+        Worker w = null;
+        try {
+            final ReentrantLock mainLock = this.mainLock;
+            w = new Worker(firstTask);
+            final Thread t = w.thread;
+            if (t != null) {
+                mainLock.lock();
+                try {
+                    // Recheck while holding lock.
+                    // Back out on ThreadFactory failure or if
+                    // shut down before lock acquired.
+                    int c = ctl.get();
+                    int rs = runStateOf(c);
 
+                    if (rs < SHUTDOWN ||
+                        (rs == SHUTDOWN && firstTask == null)) {
+                        if (t.isAlive()) // precheck that t is startable
+                            throw new IllegalThreadStateException();
+                        workers.add(w);
+                        int s = workers.size();
+                        if (s > largestPoolSize)
+                            largestPoolSize = s;
+                        workerAdded = true;
+                    }
+                } finally {
+                    mainLock.unlock();
+                }
+                if (workerAdded) {
+                    t.start();
+                    workerStarted = true;
+                }
+            }
+        } finally {
+            if (! workerStarted)
+                addWorkerFailed(w);
+        }
+        return workerStarted;
+    }
+
+    /**
+     * Rolls back the worker thread creation.
+     * - removes worker from workers, if present
+     * - decrements worker count
+     * - rechecks for termination, in case the existence of this
+     *   worker was holding up termination
+     */
+    private void addWorkerFailed(Worker w) {
         final ReentrantLock mainLock = this.mainLock;
         mainLock.lock();
         try {
-            // Recheck while holding lock.
-            // Back out on ThreadFactory failure or if
-            // shut down before lock acquired.
-            int c = ctl.get();
-            int rs = runStateOf(c);
-
-            if (t == null ||
-                (rs >= SHUTDOWN &&
-                 ! (rs == SHUTDOWN &&
-                    firstTask == null))) {
-                decrementWorkerCount();
-                tryTerminate();
-                return false;
-            }
-
-            workers.add(w);
-
-            int s = workers.size();
-            if (s > largestPoolSize)
-                largestPoolSize = s;
+            if (w != null)
+                workers.remove(w);
+            decrementWorkerCount();
+            tryTerminate();
         } finally {
             mainLock.unlock();
         }
-
-        t.start();
-        // It is possible (but unlikely) for a thread to have been
-        // added to workers, but not yet started, during transition to
-        // STOP, which could result in a rare missed interrupt,
-        // because Thread.interrupt is not guaranteed to have any effect
-        // on a non-yet-started Thread (see Thread#interrupt).
-        if (runStateOf(ctl.get()) == STOP && ! t.isInterrupted())
-            t.interrupt();
-
-        return true;
     }
 
     /**
@@ -1096,15 +1121,25 @@ public class ThreadPoolExecutor extends AbstractExecutorService {
      * @param w the worker
      */
     final void runWorker(Worker w) {
+        Thread wt = Thread.currentThread();
         Runnable task = w.firstTask;
         w.firstTask = null;
+        w.unlock(); // allow interrupts
         boolean completedAbruptly = true;
         try {
             while (task != null || (task = getTask()) != null) {
                 w.lock();
-                clearInterruptsForTaskRun();
+                // If pool is stopping, ensure thread is interrupted;
+                // if not, ensure thread is not interrupted.  This
+                // requires a recheck in second case to deal with
+                // shutdownNow race while clearing interrupt
+                if ((runStateAtLeast(ctl.get(), STOP) ||
+                     (Thread.interrupted() &&
+                      runStateAtLeast(ctl.get(), STOP))) &&
+                    !wt.isInterrupted())
+                    wt.interrupt();
                 try {
-                    beforeExecute(w.thread, task);
+                    beforeExecute(wt, task);
                     Throwable thrown = null;
                     try {
                         task.run();
@@ -2064,3 +2099,4 @@ public class ThreadPoolExecutor extends AbstractExecutorService {
         }
     }
 }
+

From c8ebc97b440104b7479b1d681967fb41a41c0052 Mon Sep 17 00:00:00 2001
From: Xue-Lei Andrew Fan <xuelei@openjdk.org>
Date: Mon, 22 Oct 2012 07:28:51 -0700
Subject: [PATCH 012/311] 7192392: Better validation of client keys

Also reviewed by Andrew Gross<Andrew.Gross@Oracle.COM>

Reviewed-by: vinnie
---
 .../sun/crypto/provider/DHKeyAgreement.java   |   5 +
 .../sun/security/pkcs11/P11KeyAgreement.java  |   9 +
 .../sun/security/ssl/ClientHandshaker.java    |   8 +-
 .../sun/security/ssl/DHClientKeyExchange.java |  19 +-
 .../classes/sun/security/ssl/DHCrypt.java     |  87 ++++++--
 .../sun/security/ssl/HandshakeMessage.java    |  16 +-
 .../security/ssl/RSAClientKeyExchange.java    |   4 +-
 .../sun/security/ssl/ServerHandshaker.java    |   2 +-
 .../ssl/SignatureAndHashAlgorithm.java        |   4 +-
 .../util/DisabledAlgorithmConstraints.java    |   2 +-
 .../classes/sun/security/util/KeyLength.java  |  91 --------
 .../classes/sun/security/util/KeyUtil.java    | 204 ++++++++++++++++++
 .../security/mscapi/ShortRSAKeyWithinTLS.java |   6 +-
 13 files changed, 334 insertions(+), 123 deletions(-)
 delete mode 100644 jdk/src/share/classes/sun/security/util/KeyLength.java
 create mode 100644 jdk/src/share/classes/sun/security/util/KeyUtil.java

diff --git a/jdk/src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java b/jdk/src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java
index b69875dd481..33fa49297dd 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java
@@ -41,6 +41,8 @@ import javax.crypto.ShortBufferException;
 import javax.crypto.SecretKey;
 import javax.crypto.spec.*;
 
+import sun.security.util.KeyUtil;
+
 /**
  * This class implements the Diffie-Hellman key agreement protocol between
  * any number of parties.
@@ -200,6 +202,9 @@ extends KeyAgreementSpi {
             throw new InvalidKeyException("Incompatible parameters");
         }
 
+        // validate the Diffie-Hellman public key
+        KeyUtil.validate(dhPubKey);
+
         // store the y value
         this.y = dhPubKey.getY();
 
diff --git a/jdk/src/share/classes/sun/security/pkcs11/P11KeyAgreement.java b/jdk/src/share/classes/sun/security/pkcs11/P11KeyAgreement.java
index dd7c3294649..11ce2b6126b 100644
--- a/jdk/src/share/classes/sun/security/pkcs11/P11KeyAgreement.java
+++ b/jdk/src/share/classes/sun/security/pkcs11/P11KeyAgreement.java
@@ -37,6 +37,7 @@ import javax.crypto.spec.*;
 import static sun.security.pkcs11.TemplateManager.*;
 import sun.security.pkcs11.wrapper.*;
 import static sun.security.pkcs11.wrapper.PKCS11Constants.*;
+import sun.security.util.KeyUtil;
 
 /**
  * KeyAgreement implementation class. This class currently supports
@@ -134,6 +135,10 @@ final class P11KeyAgreement extends KeyAgreementSpi {
         BigInteger p, g, y;
         if (key instanceof DHPublicKey) {
             DHPublicKey dhKey = (DHPublicKey)key;
+
+            // validate the Diffie-Hellman public key
+            KeyUtil.validate(dhKey);
+
             y = dhKey.getY();
             DHParameterSpec params = dhKey.getParams();
             p = params.getP();
@@ -145,6 +150,10 @@ final class P11KeyAgreement extends KeyAgreementSpi {
             try {
                 DHPublicKeySpec spec = kf.engineGetKeySpec(
                         key, DHPublicKeySpec.class);
+
+                // validate the Diffie-Hellman public key
+                KeyUtil.validate(spec);
+
                 y = spec.getY();
                 p = spec.getP();
                 g = spec.getG();
diff --git a/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java b/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java
index 63d48ad376d..0c1022b4ce7 100644
--- a/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java
+++ b/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java
@@ -192,8 +192,12 @@ final class ClientHandshaker extends Handshaker {
                 }
                 break;
             case K_DH_ANON:
-                this.serverKeyExchange(new DH_ServerKeyExchange(
+                try {
+                    this.serverKeyExchange(new DH_ServerKeyExchange(
                                                 input, protocolVersion));
+                } catch (GeneralSecurityException e) {
+                    throwSSLException("Server key", e);
+                }
                 break;
             case K_DHE_DSS:
             case K_DHE_RSA:
@@ -921,7 +925,7 @@ final class ClientHandshaker extends Handshaker {
         case K_DHE_RSA:
         case K_DHE_DSS:
         case K_DH_ANON:
-            preMasterSecret = dh.getAgreedSecret(serverDH);
+            preMasterSecret = dh.getAgreedSecret(serverDH, true);
             break;
         case K_ECDHE_RSA:
         case K_ECDHE_ECDSA:
diff --git a/jdk/src/share/classes/sun/security/ssl/DHClientKeyExchange.java b/jdk/src/share/classes/sun/security/ssl/DHClientKeyExchange.java
index 8838193a57b..b4500988970 100644
--- a/jdk/src/share/classes/sun/security/ssl/DHClientKeyExchange.java
+++ b/jdk/src/share/classes/sun/security/ssl/DHClientKeyExchange.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@ package sun.security.ssl;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.math.BigInteger;
-
+import javax.net.ssl.SSLHandshakeException;
 
 /*
  * Message used by clients to send their Diffie-Hellman public
@@ -50,7 +50,7 @@ final class DHClientKeyExchange extends HandshakeMessage {
     private byte dh_Yc[];               // 1 to 2^16 -1 bytes
 
     BigInteger getClientPublicKey() {
-        return new BigInteger(1, dh_Yc);
+        return dh_Yc == null ? null : new BigInteger(1, dh_Yc);
     }
 
     /*
@@ -72,7 +72,14 @@ final class DHClientKeyExchange extends HandshakeMessage {
      * but that's what the protocol spec requires.)
      */
     DHClientKeyExchange(HandshakeInStream input) throws IOException {
-        dh_Yc = input.getBytes16();
+        if (input.available() >= 2) {
+            dh_Yc = input.getBytes16();
+        } else {
+            // currently, we don't support cipher suites that requires
+            // implicit public key of client.
+            throw new SSLHandshakeException(
+                    "Unsupported implicit client DiffieHellman public key");
+        }
     }
 
     int messageLength() {
@@ -84,7 +91,9 @@ final class DHClientKeyExchange extends HandshakeMessage {
     }
 
     void send(HandshakeOutStream s) throws IOException {
-        s.putBytes16(dh_Yc);
+        if (dh_Yc != null && dh_Yc.length != 0) {
+            s.putBytes16(dh_Yc);
+        }
     }
 
     void print(PrintStream s) throws IOException {
diff --git a/jdk/src/share/classes/sun/security/ssl/DHCrypt.java b/jdk/src/share/classes/sun/security/ssl/DHCrypt.java
index d475ae8e978..ae9118f4ba5 100644
--- a/jdk/src/share/classes/sun/security/ssl/DHCrypt.java
+++ b/jdk/src/share/classes/sun/security/ssl/DHCrypt.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,12 +28,15 @@ package sun.security.ssl;
 
 import java.math.BigInteger;
 import java.security.*;
-
+import java.io.IOException;
+import javax.net.ssl.SSLHandshakeException;
 import javax.crypto.SecretKey;
 import javax.crypto.KeyAgreement;
 import javax.crypto.interfaces.DHPublicKey;
 import javax.crypto.spec.*;
 
+import sun.security.util.KeyUtil;
+
 /**
  * This class implements the Diffie-Hellman key exchange algorithm.
  * D-H means combining your private key with your partners public key to
@@ -54,7 +57,8 @@ import javax.crypto.spec.*;
  *  . if we are server, call DHCrypt(keyLength,random). This generates
  *    an ephemeral keypair of the request length.
  *  . if we are client, call DHCrypt(modulus, base, random). This
- *    generates an ephemeral keypair using the parameters specified by the server.
+ *    generates an ephemeral keypair using the parameters specified by
+ *    the server.
  *  . send parameters and public value to remote peer
  *  . receive peers ephemeral public key
  *  . call getAgreedSecret() to calculate the shared secret
@@ -83,6 +87,9 @@ final class DHCrypt {
     // public component of our key, X = (g ^ x) mod p
     private BigInteger publicValue;             // X (aka y)
 
+    // the times to recove from failure if public key validation
+    private static int MAX_FAILOVER_TIMES = 2;
+
     /**
      * Generate a Diffie-Hellman keypair of the specified size.
      */
@@ -90,9 +97,12 @@ final class DHCrypt {
         try {
             KeyPairGenerator kpg = JsseJce.getKeyPairGenerator("DiffieHellman");
             kpg.initialize(keyLength, random);
-            KeyPair kp = kpg.generateKeyPair();
-            privateKey = kp.getPrivate();
-            DHPublicKeySpec spec = getDHPublicKeySpec(kp.getPublic());
+
+            DHPublicKeySpec spec = generateDHPublicKeySpec(kpg);
+            if (spec == null) {
+                throw new RuntimeException("Could not generate DH keypair");
+            }
+
             publicValue = spec.getY();
             modulus = spec.getP();
             base = spec.getG();
@@ -115,20 +125,25 @@ final class DHCrypt {
             KeyPairGenerator kpg = JsseJce.getKeyPairGenerator("DiffieHellman");
             DHParameterSpec params = new DHParameterSpec(modulus, base);
             kpg.initialize(params, random);
-            KeyPair kp = kpg.generateKeyPair();
-            privateKey = kp.getPrivate();
-            DHPublicKeySpec spec = getDHPublicKeySpec(kp.getPublic());
+
+            DHPublicKeySpec spec = generateDHPublicKeySpec(kpg);
+            if (spec == null) {
+                throw new RuntimeException("Could not generate DH keypair");
+            }
+
             publicValue = spec.getY();
         } catch (GeneralSecurityException e) {
             throw new RuntimeException("Could not generate DH keypair", e);
         }
     }
 
+
     static DHPublicKeySpec getDHPublicKeySpec(PublicKey key) {
         if (key instanceof DHPublicKey) {
             DHPublicKey dhKey = (DHPublicKey)key;
             DHParameterSpec params = dhKey.getParams();
-            return new DHPublicKeySpec(dhKey.getY(), params.getP(), params.getG());
+            return new DHPublicKeySpec(dhKey.getY(),
+                                    params.getP(), params.getG());
         }
         try {
             KeyFactory factory = JsseJce.getKeyFactory("DH");
@@ -166,17 +181,32 @@ final class DHCrypt {
      * <P>It is illegal to call this member function if the private key
      * has not been set (or generated).
      *
-     * @param peerPublicKey the peer's public key.
-     * @returns the secret, which is an unsigned big-endian integer
-     *  the same size as the Diffie-Hellman modulus.
+     * @param  peerPublicKey the peer's public key.
+     * @param  keyIsValidated whether the {@code peerPublicKey} has beed
+     *         validated
+     * @return the secret, which is an unsigned big-endian integer
+     *         the same size as the Diffie-Hellman modulus.
      */
-    SecretKey getAgreedSecret(BigInteger peerPublicValue) {
+    SecretKey getAgreedSecret(BigInteger peerPublicValue,
+            boolean keyIsValidated) throws IOException {
         try {
             KeyFactory kf = JsseJce.getKeyFactory("DiffieHellman");
             DHPublicKeySpec spec =
                         new DHPublicKeySpec(peerPublicValue, modulus, base);
             PublicKey publicKey = kf.generatePublic(spec);
             KeyAgreement ka = JsseJce.getKeyAgreement("DiffieHellman");
+
+            // validate the Diffie-Hellman public key
+            if (!keyIsValidated &&
+                    !KeyUtil.isOracleJCEProvider(ka.getProvider().getName())) {
+                try {
+                    KeyUtil.validate(spec);
+                } catch (InvalidKeyException ike) {
+                    // prefer handshake_failure alert to internal_error alert
+                    throw new SSLHandshakeException(ike.getMessage());
+                }
+            }
+
             ka.init(privateKey);
             ka.doPhase(publicKey, true);
             return ka.generateSecret("TlsPremasterSecret");
@@ -185,4 +215,33 @@ final class DHCrypt {
         }
     }
 
+    // Generate and validate DHPublicKeySpec
+    private DHPublicKeySpec generateDHPublicKeySpec(KeyPairGenerator kpg)
+            throws GeneralSecurityException {
+
+        boolean doExtraValiadtion =
+                    (!KeyUtil.isOracleJCEProvider(kpg.getProvider().getName()));
+        for (int i = 0; i <= MAX_FAILOVER_TIMES; i++) {
+            KeyPair kp = kpg.generateKeyPair();
+            privateKey = kp.getPrivate();
+            DHPublicKeySpec spec = getDHPublicKeySpec(kp.getPublic());
+
+            // validate the Diffie-Hellman public key
+            if (doExtraValiadtion) {
+                try {
+                    KeyUtil.validate(spec);
+                } catch (InvalidKeyException ivke) {
+                    if (i == MAX_FAILOVER_TIMES) {
+                        throw ivke;
+                    }
+                    // otherwise, ignore the exception and try the next one
+                    continue;
+                }
+            }
+
+            return spec;
+        }
+
+        return null;
+    }
 }
diff --git a/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java b/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java
index 4b952fe9ed8..81364e07c53 100644
--- a/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java
+++ b/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,12 +41,14 @@ import javax.security.auth.x500.X500Principal;
 
 import javax.crypto.KeyGenerator;
 import javax.crypto.SecretKey;
+import javax.crypto.spec.DHPublicKeySpec;
 
 import javax.net.ssl.*;
 
 import sun.security.internal.spec.TlsPrfParameterSpec;
 import sun.security.ssl.CipherSuite.*;
 import static sun.security.ssl.CipherSuite.PRF.*;
+import sun.security.util.KeyUtil;
 
 /**
  * Many data structures are involved in the handshake messages.  These
@@ -702,6 +704,7 @@ class DH_ServerKeyExchange extends ServerKeyExchange
         this.protocolVersion = protocolVersion;
         this.preferableSignatureAlgorithm = null;
 
+        // The DH key has been validated in the constructor of DHCrypt.
         setValues(obj);
         signature = null;
     }
@@ -718,6 +721,7 @@ class DH_ServerKeyExchange extends ServerKeyExchange
 
         this.protocolVersion = protocolVersion;
 
+        // The DH key has been validated in the constructor of DHCrypt.
         setValues(obj);
 
         Signature sig;
@@ -744,7 +748,8 @@ class DH_ServerKeyExchange extends ServerKeyExchange
      * DH_anon key exchange
      */
     DH_ServerKeyExchange(HandshakeInStream input,
-            ProtocolVersion protocolVersion) throws IOException {
+            ProtocolVersion protocolVersion)
+            throws IOException, GeneralSecurityException {
 
         this.protocolVersion = protocolVersion;
         this.preferableSignatureAlgorithm = null;
@@ -752,6 +757,10 @@ class DH_ServerKeyExchange extends ServerKeyExchange
         dh_p = input.getBytes16();
         dh_g = input.getBytes16();
         dh_Ys = input.getBytes16();
+        KeyUtil.validate(new DHPublicKeySpec(new BigInteger(1, dh_Ys),
+                                             new BigInteger(1, dh_p),
+                                             new BigInteger(1, dh_g)));
+
         signature = null;
     }
 
@@ -772,6 +781,9 @@ class DH_ServerKeyExchange extends ServerKeyExchange
         dh_p = input.getBytes16();
         dh_g = input.getBytes16();
         dh_Ys = input.getBytes16();
+        KeyUtil.validate(new DHPublicKeySpec(new BigInteger(1, dh_Ys),
+                                             new BigInteger(1, dh_p),
+                                             new BigInteger(1, dh_g)));
 
         // read the signature and hash algorithm
         if (protocolVersion.v >= ProtocolVersion.TLS12.v) {
diff --git a/jdk/src/share/classes/sun/security/ssl/RSAClientKeyExchange.java b/jdk/src/share/classes/sun/security/ssl/RSAClientKeyExchange.java
index 36fda8c39cb..7166ecdcb24 100644
--- a/jdk/src/share/classes/sun/security/ssl/RSAClientKeyExchange.java
+++ b/jdk/src/share/classes/sun/security/ssl/RSAClientKeyExchange.java
@@ -36,7 +36,7 @@ import javax.crypto.spec.*;
 import javax.net.ssl.*;
 
 import sun.security.internal.spec.TlsRsaPremasterSecretParameterSpec;
-import sun.security.util.KeyLength;
+import sun.security.util.KeyUtil;
 
 /**
  * This is the client key exchange message (CLIENT --> SERVER) used with
@@ -193,7 +193,7 @@ final class RSAClientKeyExchange extends HandshakeMessage {
                         "unable to get the plaintext of the premaster secret");
                 }
 
-                int keySize = KeyLength.getKeySize(secretKey);
+                int keySize = KeyUtil.getKeySize(secretKey);
                 if (keySize > 0 && keySize != 384) {       // 384 = 48 * 8
                     if (debug != null && Debug.isOn("handshake")) {
                         System.out.println(
diff --git a/jdk/src/share/classes/sun/security/ssl/ServerHandshaker.java b/jdk/src/share/classes/sun/security/ssl/ServerHandshaker.java
index a8d256f76d6..c651b444f49 100644
--- a/jdk/src/share/classes/sun/security/ssl/ServerHandshaker.java
+++ b/jdk/src/share/classes/sun/security/ssl/ServerHandshaker.java
@@ -1365,7 +1365,7 @@ final class ServerHandshaker extends Handshaker {
         if (debug != null && Debug.isOn("handshake")) {
             mesg.print(System.out);
         }
-        return dh.getAgreedSecret(mesg.getClientPublicKey());
+        return dh.getAgreedSecret(mesg.getClientPublicKey(), false);
     }
 
     private SecretKey clientKeyExchange(ECDHClientKeyExchange mesg)
diff --git a/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java b/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java
index d1bc65393bb..043b9b156f7 100644
--- a/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java
+++ b/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java
@@ -38,7 +38,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.ArrayList;
 
-import sun.security.util.KeyLength;
+import sun.security.util.KeyUtil;
 
 /**
  * Signature and hash algorithm.
@@ -279,7 +279,7 @@ final class SignatureAndHashAlgorithm {
              * If key size is less than 512, the  digest length should be
              * less than or equal to 20 bytes.
              */
-            int keySize = KeyLength.getKeySize(signingKey);
+            int keySize = KeyUtil.getKeySize(signingKey);
             if (keySize >= 768) {
                 maxDigestLength = HashAlgorithm.SHA512.length;
             } else if ((keySize >= 512) && (keySize < 768)) {
diff --git a/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java b/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java
index ca0393a323d..17b56974ea3 100644
--- a/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java
+++ b/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java
@@ -440,7 +440,7 @@ public class DisabledAlgorithmConstraints implements AlgorithmConstraints {
 
         // Does this key constraint disable the specified key?
         public boolean disables(Key key) {
-            int size = KeyLength.getKeySize(key);
+            int size = KeyUtil.getKeySize(key);
 
             if (size == 0) {
                 return true;    // we don't allow any key of size 0.
diff --git a/jdk/src/share/classes/sun/security/util/KeyLength.java b/jdk/src/share/classes/sun/security/util/KeyLength.java
deleted file mode 100644
index 3ffbac3f30f..00000000000
--- a/jdk/src/share/classes/sun/security/util/KeyLength.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.security.util;
-
-import java.security.Key;
-import java.security.PrivilegedAction;
-import java.security.AccessController;
-import java.security.interfaces.ECKey;
-import java.security.interfaces.RSAKey;
-import java.security.interfaces.DSAKey;
-import javax.crypto.SecretKey;
-import javax.crypto.interfaces.DHKey;
-
-/**
- * A utility class to get key length
- */
-public final class KeyLength {
-
-    /**
-     * Returns the key size of the given key object in bits.
-     *
-     * @param key the key object, cannot be null
-     * @return the key size of the given key object in bits, or -1 if the
-     *       key size is not accessible
-     */
-    final public static int getKeySize(Key key) {
-        int size = -1;
-
-        if (key instanceof Length) {
-            try {
-                Length ruler = (Length)key;
-                size = ruler.length();
-            } catch (UnsupportedOperationException usoe) {
-                // ignore the exception
-            }
-
-            if (size >= 0) {
-                return size;
-            }
-        }
-
-        // try to parse the length from key specification
-        if (key instanceof SecretKey) {
-            SecretKey sk = (SecretKey)key;
-            String format = sk.getFormat();
-            if ("RAW".equals(format) && sk.getEncoded() != null) {
-                size = (sk.getEncoded().length * 8);
-            }   // Otherwise, it may be a unextractable key of PKCS#11, or
-                // a key we are not able to handle.
-        } else if (key instanceof RSAKey) {
-            RSAKey pubk = (RSAKey)key;
-            size = pubk.getModulus().bitLength();
-        } else if (key instanceof ECKey) {
-            ECKey pubk = (ECKey)key;
-            size = pubk.getParams().getOrder().bitLength();
-        } else if (key instanceof DSAKey) {
-            DSAKey pubk = (DSAKey)key;
-            size = pubk.getParams().getP().bitLength();
-        } else if (key instanceof DHKey) {
-            DHKey pubk = (DHKey)key;
-            size = pubk.getParams().getP().bitLength();
-        }   // Otherwise, it may be a unextractable key of PKCS#11, or
-            // a key we are not able to handle.
-
-        return size;
-    }
-}
-
diff --git a/jdk/src/share/classes/sun/security/util/KeyUtil.java b/jdk/src/share/classes/sun/security/util/KeyUtil.java
new file mode 100644
index 00000000000..6664dab38b6
--- /dev/null
+++ b/jdk/src/share/classes/sun/security/util/KeyUtil.java
@@ -0,0 +1,204 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package sun.security.util;
+
+import java.security.Key;
+import java.security.PrivilegedAction;
+import java.security.AccessController;
+import java.security.InvalidKeyException;
+import java.security.interfaces.ECKey;
+import java.security.interfaces.RSAKey;
+import java.security.interfaces.DSAKey;
+import java.security.spec.KeySpec;
+import javax.crypto.SecretKey;
+import javax.crypto.interfaces.DHKey;
+import javax.crypto.interfaces.DHPublicKey;
+import javax.crypto.spec.DHParameterSpec;
+import javax.crypto.spec.DHPublicKeySpec;
+import java.math.BigInteger;
+
+/**
+ * A utility class to get key length, valiate keys, etc.
+ */
+public final class KeyUtil {
+
+    /**
+     * Returns the key size of the given key object in bits.
+     *
+     * @param key the key object, cannot be null
+     * @return the key size of the given key object in bits, or -1 if the
+     *       key size is not accessible
+     */
+    public static final int getKeySize(Key key) {
+        int size = -1;
+
+        if (key instanceof Length) {
+            try {
+                Length ruler = (Length)key;
+                size = ruler.length();
+            } catch (UnsupportedOperationException usoe) {
+                // ignore the exception
+            }
+
+            if (size >= 0) {
+                return size;
+            }
+        }
+
+        // try to parse the length from key specification
+        if (key instanceof SecretKey) {
+            SecretKey sk = (SecretKey)key;
+            String format = sk.getFormat();
+            if ("RAW".equals(format) && sk.getEncoded() != null) {
+                size = (sk.getEncoded().length * 8);
+            }   // Otherwise, it may be a unextractable key of PKCS#11, or
+                // a key we are not able to handle.
+        } else if (key instanceof RSAKey) {
+            RSAKey pubk = (RSAKey)key;
+            size = pubk.getModulus().bitLength();
+        } else if (key instanceof ECKey) {
+            ECKey pubk = (ECKey)key;
+            size = pubk.getParams().getOrder().bitLength();
+        } else if (key instanceof DSAKey) {
+            DSAKey pubk = (DSAKey)key;
+            size = pubk.getParams().getP().bitLength();
+        } else if (key instanceof DHKey) {
+            DHKey pubk = (DHKey)key;
+            size = pubk.getParams().getP().bitLength();
+        }   // Otherwise, it may be a unextractable key of PKCS#11, or
+            // a key we are not able to handle.
+
+        return size;
+    }
+
+    /**
+     * Returns whether the key is valid or not.
+     * <P>
+     * Note that this method is only apply to DHPublicKey at present.
+     *
+     * @param  publicKey
+     *         the key object, cannot be null
+     *
+     * @throws NullPointerException if {@code publicKey} is null
+     * @throws InvalidKeyException if {@code publicKey} is invalid
+     */
+    public static final void validate(Key key)
+            throws InvalidKeyException {
+        if (key == null) {
+            throw new NullPointerException(
+                "The key to be validated cannot be null");
+        }
+
+        if (key instanceof DHPublicKey) {
+            validateDHPublicKey((DHPublicKey)key);
+        }
+    }
+
+
+    /**
+     * Returns whether the key spec is valid or not.
+     * <P>
+     * Note that this method is only apply to DHPublicKeySpec at present.
+     *
+     * @param  keySpec
+     *         the key spec object, cannot be null
+     *
+     * @throws NullPointerException if {@code keySpec} is null
+     * @throws InvalidKeyException if {@code keySpec} is invalid
+     */
+    public static final void validate(KeySpec keySpec)
+            throws InvalidKeyException {
+        if (keySpec == null) {
+            throw new NullPointerException(
+                "The key spec to be validated cannot be null");
+        }
+
+        if (keySpec instanceof DHPublicKeySpec) {
+            validateDHPublicKey((DHPublicKeySpec)keySpec);
+        }
+    }
+
+    /**
+     * Returns whether the specified provider is Oracle provider or not.
+     * <P>
+     * Note that this method is only apply to SunJCE and SunPKCS11 at present.
+     *
+     * @param  providerName
+     *         the provider name
+     * @return true if, and only if, the provider of the specified
+     *         {@code providerName} is Oracle provider
+     */
+    public static final boolean isOracleJCEProvider(String providerName) {
+        return providerName != null && (providerName.equals("SunJCE") ||
+                                        providerName.startsWith("SunPKCS11"));
+    }
+
+    /**
+     * Returns whether the Diffie-Hellman public key is valid or not.
+     *
+     * Per RFC 2631 and NIST SP800-56A, the following algorithm is used to
+     * validate Diffie-Hellman public keys:
+     * 1. Verify that y lies within the interval [2,p-1]. If it does not,
+     *    the key is invalid.
+     * 2. Compute y^q mod p. If the result == 1, the key is valid.
+     *    Otherwise the key is invalid.
+     */
+    private static void validateDHPublicKey(DHPublicKey publicKey)
+            throws InvalidKeyException {
+        DHParameterSpec paramSpec = publicKey.getParams();
+
+        BigInteger p = paramSpec.getP();
+        BigInteger g = paramSpec.getG();
+        BigInteger y = publicKey.getY();
+
+        validateDHPublicKey(p, g, y);
+    }
+
+    private static void validateDHPublicKey(DHPublicKeySpec publicKeySpec)
+            throws InvalidKeyException {
+        validateDHPublicKey(publicKeySpec.getP(),
+            publicKeySpec.getG(), publicKeySpec.getY());
+    }
+
+    private static void validateDHPublicKey(BigInteger p,
+            BigInteger g, BigInteger y) throws InvalidKeyException {
+
+        // For better interoperability, the interval is limited to [2, p-2].
+        BigInteger leftOpen = BigInteger.ONE;
+        BigInteger rightOpen = p.subtract(BigInteger.ONE);
+        if (y.compareTo(leftOpen) <= 0) {
+            throw new InvalidKeyException(
+                    "Diffie-Hellman public key is too small");
+        }
+        if (y.compareTo(rightOpen) >= 0) {
+            throw new InvalidKeyException(
+                    "Diffie-Hellman public key is too large");
+        }
+
+        // Don't bother to check against the y^q mod p if safe primes are used.
+    }
+}
+
diff --git a/jdk/test/sun/security/mscapi/ShortRSAKeyWithinTLS.java b/jdk/test/sun/security/mscapi/ShortRSAKeyWithinTLS.java
index e4f7eb1a773..8958718ae7a 100644
--- a/jdk/test/sun/security/mscapi/ShortRSAKeyWithinTLS.java
+++ b/jdk/test/sun/security/mscapi/ShortRSAKeyWithinTLS.java
@@ -29,7 +29,7 @@ import javax.net.*;
 import javax.net.ssl.*;
 import java.lang.reflect.*;
 
-import sun.security.util.KeyLength;
+import sun.security.util.KeyUtil;
 
 public class ShortRSAKeyWithinTLS {
 
@@ -175,13 +175,13 @@ public class ShortRSAKeyWithinTLS {
             privateKey = (PrivateKey)ks.getKey(keyAlias, null);
             publicKey = (PublicKey)ks.getCertificate(keyAlias).getPublicKey();
 
-            int privateKeySize = KeyLength.getKeySize(privateKey);
+            int privateKeySize = KeyUtil.getKeySize(privateKey);
             if (privateKeySize != keySize) {
                 throw new Exception("Expected key size is " + keySize +
                         ", but the private key size is " + privateKeySize);
             }
 
-            int publicKeySize = KeyLength.getKeySize(publicKey);
+            int publicKeySize = KeyUtil.getKeySize(publicKey);
             if (publicKeySize != keySize) {
                 throw new Exception("Expected key size is " + keySize +
                         ", but the public key size is " + publicKeySize);

From 64bb35a5c6a514314ea81dc373a5bf62eadeba76 Mon Sep 17 00:00:00 2001
From: Kurchi Subhra Hazra <khazra@openjdk.org>
Date: Mon, 22 Oct 2012 11:49:37 -0700
Subject: [PATCH 013/311] 7186954: Improve connection performance

Reviewed-by: chegar, skoivu
---
 .../sun/net/httpserver/ChunkedInputStream.java     | 14 +++++++++++---
 .../sun/net/www/http/ChunkedInputStream.java       |  9 +++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/jdk/src/share/classes/sun/net/httpserver/ChunkedInputStream.java b/jdk/src/share/classes/sun/net/httpserver/ChunkedInputStream.java
index 4adab7d52ed..387ec1c8e62 100644
--- a/jdk/src/share/classes/sun/net/httpserver/ChunkedInputStream.java
+++ b/jdk/src/share/classes/sun/net/httpserver/ChunkedInputStream.java
@@ -41,8 +41,12 @@ class ChunkedInputStream extends LeftOverInputStream {
 
     private boolean needToReadHeader = true;
 
-    static char CR = '\r';
-    static char LF = '\n';
+    final static char CR = '\r';
+    final static char LF = '\n';
+    /*
+     * Maximum chunk header size of 2KB + 2 bytes for CRLF
+     */
+    private final static int MAX_CHUNK_HEADER_SIZE = 2050;
 
     private int numeric (char[] arr, int nchars) throws IOException {
         assert arr.length >= nchars;
@@ -73,10 +77,14 @@ class ChunkedInputStream extends LeftOverInputStream {
         char[] len_arr = new char [16];
         int len_size = 0;
         boolean end_of_len = false;
+        int read = 0;
 
         while ((c=in.read())!= -1) {
             char ch = (char) c;
-            if (len_size == len_arr.length -1) {
+            read++;
+            if ((len_size == len_arr.length -1) ||
+                (read > MAX_CHUNK_HEADER_SIZE))
+            {
                 throw new IOException ("invalid chunk header");
             }
             if (gotCR) {
diff --git a/jdk/src/share/classes/sun/net/www/http/ChunkedInputStream.java b/jdk/src/share/classes/sun/net/www/http/ChunkedInputStream.java
index 3dd445e7488..af45752206f 100644
--- a/jdk/src/share/classes/sun/net/www/http/ChunkedInputStream.java
+++ b/jdk/src/share/classes/sun/net/www/http/ChunkedInputStream.java
@@ -125,6 +125,11 @@ class ChunkedInputStream extends InputStream implements Hurryable {
      */
     private boolean closed;
 
+    /*
+     * Maximum chunk header size of 2KB + 2 bytes for CRLF
+     */
+    private final static int MAX_CHUNK_HEADER_SIZE = 2050;
+
     /**
      * State to indicate that next field should be :-
      *  chunk-size [ chunk-extension ] CRLF
@@ -290,6 +295,10 @@ class ChunkedInputStream extends InputStream implements Hurryable {
                             break;
                         }
                         pos++;
+                        if ((pos - rawPos) >= MAX_CHUNK_HEADER_SIZE) {
+                            error = true;
+                            throw new IOException("Chunk header too long");
+                        }
                     }
                     if (pos >= rawCount) {
                         return;

From 42cf97b02fd2a64bf8ab254087cdee142c4326c9 Mon Sep 17 00:00:00 2001
From: Weijun Wang <weijun@openjdk.org>
Date: Wed, 19 Sep 2012 12:58:43 +0800
Subject: [PATCH 014/311] 8000210: Improve JarFile code quality

Reviewed-by: ahgross, xuelei, mschoene
---
 .../share/classes/java/util/jar/JarFile.java  | 21 ++++++++++---------
 .../security/util/DerIndefLenConverter.java   |  4 ++++
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/jdk/src/share/classes/java/util/jar/JarFile.java b/jdk/src/share/classes/java/util/jar/JarFile.java
index 513d509e2f8..2dbb5206512 100644
--- a/jdk/src/share/classes/java/util/jar/JarFile.java
+++ b/jdk/src/share/classes/java/util/jar/JarFile.java
@@ -34,6 +34,7 @@ import java.security.CodeSigner;
 import java.security.cert.Certificate;
 import java.security.AccessController;
 import java.security.CodeSource;
+import sun.misc.IOUtils;
 import sun.security.action.GetPropertyAction;
 import sun.security.util.ManifestEntryVerifier;
 import sun.misc.SharedSecrets;
@@ -329,6 +330,9 @@ class JarFile extends ZipFile {
             if (names != null) {
                 for (int i = 0; i < names.length; i++) {
                     JarEntry e = getJarEntry(names[i]);
+                    if (e == null) {
+                        throw new JarException("corrupted jar file");
+                    }
                     if (!e.isDirectory()) {
                         if (mev == null) {
                             mev = new ManifestEntryVerifier
@@ -348,6 +352,10 @@ class JarFile extends ZipFile {
             // treat the jar file as being unsigned
             jv = null;
             verify = false;
+            if (JarVerifier.debug != null) {
+                JarVerifier.debug.println("jarfile parsing error!");
+                ex.printStackTrace();
+            }
         }
 
         // if after initializing the verifier we have nothing
@@ -375,11 +383,9 @@ class JarFile extends ZipFile {
      * META-INF files.
      */
     private byte[] getBytes(ZipEntry ze) throws IOException {
-        byte[] b = new byte[(int)ze.getSize()];
-        try (DataInputStream is = new DataInputStream(super.getInputStream(ze))) {
-            is.readFully(b, 0, b.length);
+        try (InputStream is = super.getInputStream(ze)) {
+            return IOUtils.readFully(is, (int)ze.getSize(), true);
         }
-        return b;
     }
 
     /**
@@ -479,12 +485,7 @@ class JarFile extends ZipFile {
         if (!isKnownToNotHaveClassPathAttribute()) {
             JarEntry manEntry = getManEntry();
             if (manEntry != null) {
-                byte[] b = new byte[(int)manEntry.getSize()];
-                try (DataInputStream dis = new DataInputStream(
-                         super.getInputStream(manEntry))) {
-                    dis.readFully(b, 0, b.length);
-                }
-
+                byte[] b = getBytes(manEntry);
                 int last = b.length - src.length;
                 int i = 0;
                 next:
diff --git a/jdk/src/share/classes/sun/security/util/DerIndefLenConverter.java b/jdk/src/share/classes/sun/security/util/DerIndefLenConverter.java
index 50bb06ad7b3..78d9e302d6c 100644
--- a/jdk/src/share/classes/sun/security/util/DerIndefLenConverter.java
+++ b/jdk/src/share/classes/sun/security/util/DerIndefLenConverter.java
@@ -325,6 +325,10 @@ class DerIndefLenConverter {
             }
         }
 
+        if (unresolved != 0) {
+            throw new IOException("not all indef len BER resolved");
+        }
+
         newData = new byte[dataSize + numOfTotalLenBytes + unused];
         dataPos=0; newDataPos=0; index=0;
 

From cb3cb72e07d5e881ca4fc5f36e1b8dcd11c28d78 Mon Sep 17 00:00:00 2001
From: Sean Mullan <mullan@openjdk.org>
Date: Fri, 26 Oct 2012 15:21:05 -0400
Subject: [PATCH 015/311] 7201068: Better handling of UI elements

Reviewed-by: xuelei
---
 jdk/src/share/lib/security/java.security       | 16 ++++++++++++++--
 .../share/lib/security/java.security-macosx    | 18 ++++++++++++++++--
 .../share/lib/security/java.security-solaris   | 16 ++++++++++++++--
 .../share/lib/security/java.security-windows   | 16 ++++++++++++++--
 4 files changed, 58 insertions(+), 8 deletions(-)

diff --git a/jdk/src/share/lib/security/java.security b/jdk/src/share/lib/security/java.security
index 3bb8597654c..d0dc3c5b423 100644
--- a/jdk/src/share/lib/security/java.security
+++ b/jdk/src/share/lib/security/java.security
@@ -145,7 +145,13 @@ keystore.type=jks
 # passed to checkPackageAccess unless the
 # corresponding RuntimePermission ("accessClassInPackage."+package) has
 # been granted.
-package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.
+package.access=sun.,\
+               com.sun.xml.internal.,\
+               com.sun.imageio.,\
+               com.sun.org.apache.xerces.internal.utils.,\
+               com.sun.org.apache.xalan.internal.utils.,\
+               com.sun.org.glassfish.external.,\
+               com.sun.org.glassfish.gmbal.
 
 #
 # List of comma-separated packages that start with or equal this string
@@ -157,7 +163,13 @@ package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.
 # by default, none of the class loaders supplied with the JDK call
 # checkPackageDefinition.
 #
-package.definition=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.
+package.definition=sun.,\
+                   com.sun.xml.internal.,\
+                   com.sun.imageio.,\
+                   com.sun.org.apache.xerces.internal.utils.,\
+                   com.sun.org.apache.xalan.internal.utils.,\
+                   com.sun.org.glassfish.external.,\
+                   com.sun.org.glassfish.gmbal.
 
 #
 # Determines whether this properties file can be appended to
diff --git a/jdk/src/share/lib/security/java.security-macosx b/jdk/src/share/lib/security/java.security-macosx
index 689172f40d6..22c6b44c567 100644
--- a/jdk/src/share/lib/security/java.security-macosx
+++ b/jdk/src/share/lib/security/java.security-macosx
@@ -146,7 +146,14 @@ keystore.type=jks
 # passed to checkPackageAccess unless the
 # corresponding RuntimePermission ("accessClassInPackage."+package) has
 # been granted.
-package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,apple.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.
+package.access=sun.,\
+               com.sun.xml.internal.,\
+               com.sun.imageio.,\
+               com.sun.org.apache.xerces.internal.utils.,\
+               com.sun.org.apache.xalan.internal.utils.,\
+               com.sun.org.glassfish.external.,\
+               com.sun.org.glassfish.gmbal.,\
+               apple.
 
 #
 # List of comma-separated packages that start with or equal this string
@@ -158,7 +165,14 @@ package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.
 # by default, none of the class loaders supplied with the JDK call
 # checkPackageDefinition.
 #
-package.definition=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,apple.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.
+package.definition=sun.,\
+                   com.sun.xml.internal.,\
+                   com.sun.imageio.,\
+                   com.sun.org.apache.xerces.internal.utils.,\
+                   com.sun.org.apache.xalan.internal.utils.,\
+                   com.sun.org.glassfish.external.,\
+                   com.sun.org.glassfish.gmbal.,\
+                   apple.
 
 #
 # Determines whether this properties file can be appended to
diff --git a/jdk/src/share/lib/security/java.security-solaris b/jdk/src/share/lib/security/java.security-solaris
index 1c5062c4c8b..c26b06a8de4 100644
--- a/jdk/src/share/lib/security/java.security-solaris
+++ b/jdk/src/share/lib/security/java.security-solaris
@@ -147,7 +147,13 @@ keystore.type=jks
 # passed to checkPackageAccess unless the
 # corresponding RuntimePermission ("accessClassInPackage."+package) has
 # been granted.
-package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.
+package.access=sun.,\
+               com.sun.xml.internal.,\
+               com.sun.imageio.,\
+               com.sun.org.apache.xerces.internal.utils.,\
+               com.sun.org.apache.xalan.internal.utils.,\
+               com.sun.org.glassfish.external.,\
+               com.sun.org.glassfish.gmbal.
 
 #
 # List of comma-separated packages that start with or equal this string
@@ -159,7 +165,13 @@ package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.
 # by default, none of the class loaders supplied with the JDK call
 # checkPackageDefinition.
 #
-package.definition=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.
+package.definition=sun.,\
+                   com.sun.xml.internal.,\
+                   com.sun.imageio.,\
+                   com.sun.org.apache.xerces.internal.utils.,\
+                   com.sun.org.apache.xalan.internal.utils.,\
+                   com.sun.org.glassfish.external.,\
+                   com.sun.org.glassfish.gmbal.
 
 #
 # Determines whether this properties file can be appended to
diff --git a/jdk/src/share/lib/security/java.security-windows b/jdk/src/share/lib/security/java.security-windows
index c98c0c95865..f9103a98718 100644
--- a/jdk/src/share/lib/security/java.security-windows
+++ b/jdk/src/share/lib/security/java.security-windows
@@ -146,7 +146,13 @@ keystore.type=jks
 # passed to checkPackageAccess unless the
 # corresponding RuntimePermission ("accessClassInPackage."+package) has
 # been granted.
-package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.
+package.access=sun.,\
+               com.sun.xml.internal.,\
+               com.sun.imageio.,\
+               com.sun.org.apache.xerces.internal.utils.,\
+               com.sun.org.apache.xalan.internal.utils.,\
+               com.sun.org.glassfish.external.,\
+               com.sun.org.glassfish.gmbal.
 
 #
 # List of comma-separated packages that start with or equal this string
@@ -158,7 +164,13 @@ package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.
 # by default, none of the class loaders supplied with the JDK call
 # checkPackageDefinition.
 #
-package.definition=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.
+package.definition=sun.,\
+                   com.sun.xml.internal.,\
+                   com.sun.imageio.,\
+                   com.sun.org.apache.xerces.internal.utils.,\
+                   com.sun.org.apache.xalan.internal.utils.,\
+                   com.sun.org.glassfish.external.,\
+                   com.sun.org.glassfish.gmbal.
 
 #
 # Determines whether this properties file can be appended to

From 526b1f405ca7a6b8646905a44d9083eea3a6c810 Mon Sep 17 00:00:00 2001
From: Jaroslav Bachorik <jaroslav.bachorik@oracle.com>
Date: Tue, 30 Oct 2012 17:05:45 +0400
Subject: [PATCH 016/311] 8000539: JMX implementation allows invocation of
 methods of a system class

Added extra packageAccess check call

Reviewed-by: ahgross, dfuchs
---
 .../classes/com/sun/jmx/mbeanserver/Introspector.java     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/jdk/src/share/classes/com/sun/jmx/mbeanserver/Introspector.java b/jdk/src/share/classes/com/sun/jmx/mbeanserver/Introspector.java
index 2e259a818c8..365a004778e 100644
--- a/jdk/src/share/classes/com/sun/jmx/mbeanserver/Introspector.java
+++ b/jdk/src/share/classes/com/sun/jmx/mbeanserver/Introspector.java
@@ -56,6 +56,8 @@ import java.lang.reflect.Array;
 import java.lang.reflect.InvocationTargetException;
 import javax.management.AttributeNotFoundException;
 import javax.management.openmbean.CompositeData;
+import sun.reflect.misc.MethodUtil;
+import sun.reflect.misc.ReflectUtil;
 
 /**
  * This class contains the methods for performing all the tests needed to verify
@@ -528,8 +530,10 @@ public class Introspector {
                     // to locate method
                     readMethod = SimpleIntrospector.getReadMethod(clazz, element);
                 }
-                if (readMethod != null)
-                    return readMethod.invoke(complex);
+                if (readMethod != null) {
+                    ReflectUtil.checkPackageAccess(readMethod.getDeclaringClass());
+                    return MethodUtil.invoke(readMethod, complex, new Class[0]);
+                }
 
                 throw new AttributeNotFoundException(
                     "Could not find the getter method for the property " +

From 25e301ca19586c57c9047b42e0ccea9183105463 Mon Sep 17 00:00:00 2001
From: Sean Coffey <coffeys@openjdk.org>
Date: Tue, 30 Oct 2012 17:06:35 +0000
Subject: [PATCH 017/311] 8000631: Restrict access to class constructor

Reviewed-by: alanb, ahgross
---
 .../com_sun_corba_se_impl_orbutil.jmk         |   14 +-
 .../com/sun/corba/se/impl/corba/AnyImpl.java  |    6 +-
 .../se/impl/encoding/CDRInputStream_1_0.java  |   61 +-
 .../se/impl/encoding/CDROutputStream_1_0.java |   20 +-
 .../sun/corba/se/impl/io/FVDCodeBaseImpl.java |    8 +-
 .../corba/se/impl/io/ValueHandlerImpl.java    |   85 +-
 .../sun/corba/se/impl/io/ValueUtility.java    |   10 +-
 .../corba/se/impl/javax/rmi/CORBA/Util.java   |    6 +-
 .../com/sun/corba/se/impl/orb/ORBImpl.java    |    2 +-
 .../se/impl/orbutil/IIOPInputStream_1_3.java  |   57 -
 .../se/impl/orbutil/IIOPOutputStream_1_3.java |   68 --
 .../impl/orbutil/IIOPOutputStream_1_3_1.java  |   66 -
 .../sun/corba/se/impl/orbutil/ORBUtility.java |   38 +-
 .../se/impl/orbutil/RepIdDelegator_1_3.java   |  177 ---
 .../se/impl/orbutil/RepIdDelegator_1_3_1.java |  177 ---
 .../impl/orbutil/RepositoryIdCache_1_3.java   |  108 --
 .../impl/orbutil/RepositoryIdCache_1_3_1.java |  102 --
 .../se/impl/orbutil/RepositoryIdFactory.java  |   53 +-
 .../se/impl/orbutil/RepositoryId_1_3.java     |  990 ---------------
 .../se/impl/orbutil/RepositoryId_1_3_1.java   | 1065 -----------------
 .../se/impl/orbutil/ValueHandlerImpl_1_3.java |  251 ----
 .../impl/orbutil/ValueHandlerImpl_1_3_1.java  |   77 --
 .../corba/JavaCorbaAccess.java}               |   32 +-
 .../classes/sun/corba/SharedSecrets.java      |   60 +
 24 files changed, 123 insertions(+), 3410 deletions(-)
 delete mode 100644 corba/src/share/classes/com/sun/corba/se/impl/orbutil/IIOPInputStream_1_3.java
 delete mode 100644 corba/src/share/classes/com/sun/corba/se/impl/orbutil/IIOPOutputStream_1_3.java
 delete mode 100644 corba/src/share/classes/com/sun/corba/se/impl/orbutil/IIOPOutputStream_1_3_1.java
 delete mode 100644 corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepIdDelegator_1_3.java
 delete mode 100644 corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepIdDelegator_1_3_1.java
 delete mode 100644 corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdCache_1_3.java
 delete mode 100644 corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdCache_1_3_1.java
 delete mode 100644 corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryId_1_3.java
 delete mode 100644 corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryId_1_3_1.java
 delete mode 100644 corba/src/share/classes/com/sun/corba/se/impl/orbutil/ValueHandlerImpl_1_3.java
 delete mode 100644 corba/src/share/classes/com/sun/corba/se/impl/orbutil/ValueHandlerImpl_1_3_1.java
 rename corba/src/share/classes/{com/sun/corba/se/impl/orbutil/IIOPInputStream_1_3_1.java => sun/corba/JavaCorbaAccess.java} (58%)
 create mode 100644 corba/src/share/classes/sun/corba/SharedSecrets.java

diff --git a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk b/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk
index 5009bb508e3..465c546ec59 100644
--- a/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk
+++ b/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -29,10 +29,6 @@ com_sun_corba_se_impl_orbutil_java = \
 	com/sun/corba/se/impl/orbutil/DenseIntMapImpl.java \
 	com/sun/corba/se/impl/orbutil/GetPropertyAction.java \
 	com/sun/corba/se/impl/orbutil/HexOutputStream.java \
-	com/sun/corba/se/impl/orbutil/IIOPInputStream_1_3.java \
-	com/sun/corba/se/impl/orbutil/IIOPInputStream_1_3_1.java \
-	com/sun/corba/se/impl/orbutil/IIOPOutputStream_1_3.java \
-	com/sun/corba/se/impl/orbutil/IIOPOutputStream_1_3_1.java \
 	com/sun/corba/se/impl/orbutil/LegacyHookGetFields.java \
 	com/sun/corba/se/impl/orbutil/LegacyHookPutFields.java \
 	com/sun/corba/se/impl/orbutil/LogKeywords.java \
@@ -45,19 +41,11 @@ com_sun_corba_se_impl_orbutil_java = \
 	com/sun/corba/se/impl/orbutil/ORBUtility.java \
 	com/sun/corba/se/impl/orbutil/ORBClassLoader.java \
 	com/sun/corba/se/impl/orbutil/RepIdDelegator.java \
-	com/sun/corba/se/impl/orbutil/RepIdDelegator_1_3.java \
-	com/sun/corba/se/impl/orbutil/RepIdDelegator_1_3_1.java \
-	com/sun/corba/se/impl/orbutil/RepositoryIdCache_1_3.java \
-	com/sun/corba/se/impl/orbutil/RepositoryId_1_3.java \
 	com/sun/corba/se/impl/orbutil/RepositoryIdFactory.java \
 	com/sun/corba/se/impl/orbutil/RepositoryIdStrings.java \
 	com/sun/corba/se/impl/orbutil/RepositoryIdUtility.java \
 	com/sun/corba/se/impl/orbutil/RepositoryIdInterface.java \
-	com/sun/corba/se/impl/orbutil/RepositoryIdCache_1_3_1.java \
-	com/sun/corba/se/impl/orbutil/RepositoryId_1_3_1.java \
 	com/sun/corba/se/impl/orbutil/StackImpl.java \
-	com/sun/corba/se/impl/orbutil/ValueHandlerImpl_1_3_1.java \
-	com/sun/corba/se/impl/orbutil/ValueHandlerImpl_1_3.java \
 	com/sun/corba/se/impl/orbutil/closure/Future.java \
 	com/sun/corba/se/impl/orbutil/closure/Constant.java \
 	com/sun/corba/se/impl/orbutil/concurrent/Sync.java \
diff --git a/corba/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java b/corba/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java
index 6b33f34b9a9..0177bdd6407 100644
--- a/corba/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java
+++ b/corba/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1218,7 +1218,7 @@ public class AnyImpl extends Any
         // See bug 4391648 for more info about the tcORB in this
         // case.
         RepositoryIdStrings repStrs
-            = RepositoryIdFactory.getRepIdStringsFactory(tcORB);
+            = RepositoryIdFactory.getRepIdStringsFactory();
 
 
         // Assertion: c instanceof Serializable?
@@ -1251,7 +1251,7 @@ public class AnyImpl extends Any
         // Anything else
         // We know that this is a TypeCodeImpl since it is our ORB
         classTC = (TypeCodeImpl)ValueUtility.createTypeCodeForClass(
-            tcORB, c, ORBUtility.createValueHandler(tcORB));
+            tcORB, c, ORBUtility.createValueHandler());
         // Intruct classTC to store its buffer
         classTC.setCaching(true);
         // Update the cache
diff --git a/corba/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java b/corba/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java
index d17d6f378e2..a00d66cb5b5 100644
--- a/corba/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java
+++ b/corba/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -269,8 +269,8 @@ public class CDRInputStream_1_0 extends CDRInputStreamBase
 
     private final void createRepositoryIdHandlers()
     {
-        repIdUtil = RepositoryIdFactory.getRepIdUtility(orb);
-        repIdStrs = RepositoryIdFactory.getRepIdStringsFactory(orb);
+        repIdUtil = RepositoryIdFactory.getRepIdUtility();
+        repIdStrs = RepositoryIdFactory.getRepIdStringsFactory();
     }
 
     public GIOPVersion getGIOPVersion() {
@@ -564,10 +564,7 @@ public class CDRInputStream_1_0 extends CDRInputStreamBase
 
         checkForNegativeLength(len);
 
-        if (orb != null && ORBUtility.isLegacyORB((ORB)orb))
-            return legacyReadString(len);
-        else
-            return internalReadString(len);
+        return internalReadString(len);
     }
 
     private final String internalReadString(int len) {
@@ -588,54 +585,6 @@ public class CDRInputStream_1_0 extends CDRInputStreamBase
         return new String(result, 0, getCharConverter().getNumChars());
     }
 
-    private final String legacyReadString(int len) {
-
-        //
-        // Workaround for ORBs which send string lengths of
-        // zero to mean empty string.
-        //
-        //
-        // IMPORTANT: Do not replace 'new String("")' with "", it may result
-        // in a Serialization bug (See serialization.zerolengthstring) and
-        // bug id: 4728756 for details
-        if (len == 0)
-            return new String("");
-
-        len--;
-        char[] c = new char[len];
-
-        int n = 0;
-        while (n < len) {
-            int avail;
-            int bytes;
-            int wanted;
-
-            avail = bbwi.buflen - bbwi.position();
-            if (avail <= 0) {
-                grow(1, 1);
-                avail = bbwi.buflen - bbwi.position();
-            }
-            wanted = len - n;
-            bytes = (wanted < avail) ? wanted : avail;
-            // Microbenchmarks are showing a loop of ByteBuffer.get(int) being
-            // faster than ByteBuffer.get(byte[], int, int).
-            for (int i=0; i<bytes; i++) {
-                c[n+i] = (char) (bbwi.byteBuffer.get(bbwi.position()+i) & 0xFF);
-            }
-            bbwi.position(bbwi.position() + bytes);
-            n += bytes;
-        }
-
-        //
-        // Skip past terminating null byte
-        //
-        if (bbwi.position() + 1 > bbwi.buflen)
-            alignAndCheck(1, 1);
-        bbwi.position(bbwi.position() + 1);
-
-        return new String(c);
-    }
-
     public final String read_string() {
         return readStringOrIndirection(false);
     }
@@ -1045,7 +994,7 @@ public class CDRInputStream_1_0 extends CDRInputStreamBase
 
                 try {
                     if (valueHandler == null)
-                        valueHandler = ORBUtility.createValueHandler(orb);
+                        valueHandler = ORBUtility.createValueHandler();
 
                     value = valueHandler.readValue(parent,
                                                    indirection,
diff --git a/corba/src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_0.java b/corba/src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_0.java
index 25e15286978..3e60c4801b0 100644
--- a/corba/src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_0.java
+++ b/corba/src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_0.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -189,18 +189,8 @@ public class CDROutputStream_1_0 extends CDROutputStreamBase
 
     private final void createRepositoryIdHandlers()
     {
-        if (orb != null) {
-            // Get the appropriate versions based on the ORB version.  The
-            // ORB versioning info is only in the core ORB.
-            repIdUtil
-                = RepositoryIdFactory.getRepIdUtility(orb);
-            repIdStrs
-                = RepositoryIdFactory.getRepIdStringsFactory(orb);
-        } else {
-            // Get the latest versions
-            repIdUtil = RepositoryIdFactory.getRepIdUtility();
-            repIdStrs = RepositoryIdFactory.getRepIdStringsFactory();
-        }
+        repIdUtil = RepositoryIdFactory.getRepIdUtility();
+        repIdStrs = RepositoryIdFactory.getRepIdStringsFactory();
     }
 
     public BufferManagerWrite getBufferManager()
@@ -705,7 +695,7 @@ public class CDROutputStream_1_0 extends CDROutputStreamBase
     private void writeArray(Serializable array, Class clazz) {
 
         if (valueHandler == null)
-            valueHandler = ORBUtility.createValueHandler(orb); //d11638
+            valueHandler = ORBUtility.createValueHandler(); //d11638
 
         // Write value_tag
         int indirection = writeValueTag(mustChunk, true,
@@ -768,7 +758,7 @@ public class CDROutputStream_1_0 extends CDROutputStreamBase
 
     private void writeRMIIIOPValueType(Serializable object, Class clazz) {
         if (valueHandler == null)
-            valueHandler = ORBUtility.createValueHandler(orb); //d11638
+            valueHandler = ORBUtility.createValueHandler(); //d11638
 
         Serializable key = object;
 
diff --git a/corba/src/share/classes/com/sun/corba/se/impl/io/FVDCodeBaseImpl.java b/corba/src/share/classes/com/sun/corba/se/impl/io/FVDCodeBaseImpl.java
index f87ef71d45d..c69fb42421b 100644
--- a/corba/src/share/classes/com/sun/corba/se/impl/io/FVDCodeBaseImpl.java
+++ b/corba/src/share/classes/com/sun/corba/se/impl/io/FVDCodeBaseImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -86,7 +86,7 @@ public class FVDCodeBaseImpl extends _CodeBaseImplBase
             // default to using the current ORB version in case the
             // vhandler is not set
             if (vhandler == null) {
-                vhandler = new ValueHandlerImpl(false);
+                vhandler = ValueHandlerImpl.getInstance(false);
             }
 
             // Util.getCodebase may return null which would
@@ -120,7 +120,7 @@ public class FVDCodeBaseImpl extends _CodeBaseImplBase
                 // default to using the current ORB version in case the
                 // vhandler is not set
                 if (vhandler == null) {
-                    vhandler = new ValueHandlerImpl(false);
+                    vhandler = ValueHandlerImpl.getInstance(false);
                 }
 
                 try{
@@ -161,7 +161,7 @@ public class FVDCodeBaseImpl extends _CodeBaseImplBase
             // default to using the current ORB version in case the
             // vhandler is not set
             if (vhandler == null) {
-                vhandler = new ValueHandlerImpl(false);
+                vhandler = ValueHandlerImpl.getInstance(false);
             }
 
             Stack repIds = new Stack();
diff --git a/corba/src/share/classes/com/sun/corba/se/impl/io/ValueHandlerImpl.java b/corba/src/share/classes/com/sun/corba/se/impl/io/ValueHandlerImpl.java
index e1c82cf9bfc..fdf35018275 100644
--- a/corba/src/share/classes/com/sun/corba/se/impl/io/ValueHandlerImpl.java
+++ b/corba/src/share/classes/com/sun/corba/se/impl/io/ValueHandlerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -53,7 +53,7 @@ import com.sun.corba.se.spi.logging.CORBALogDomains;
 import com.sun.corba.se.impl.logging.OMGSystemException;
 import com.sun.corba.se.impl.logging.UtilSystemException;
 
-public class ValueHandlerImpl implements javax.rmi.CORBA.ValueHandlerMultiFormat {
+public final class ValueHandlerImpl implements javax.rmi.CORBA.ValueHandlerMultiFormat {
 
     // Property to override our maximum stream format version
     public static final String FORMAT_VERSION_PROPERTY
@@ -150,14 +150,22 @@ public class ValueHandlerImpl implements javax.rmi.CORBA.ValueHandlerMultiFormat
         writeValueWithVersion(out, value, streamFormatVersion);
     }
 
-    public ValueHandlerImpl(){}
+    private ValueHandlerImpl(){}
 
-    public ValueHandlerImpl(boolean isInputStream) {
+    private ValueHandlerImpl(boolean isInputStream) {
         this();
         useHashtables = false;
         this.isInputStream = isInputStream;
     }
 
+    static ValueHandlerImpl getInstance() {
+        return new ValueHandlerImpl();
+    }
+
+    static ValueHandlerImpl getInstance(boolean isInputStream) {
+        return new ValueHandlerImpl(isInputStream);
+    }
+
     /**
      * Writes the value to the stream using java semantics.
      * @param out The stream to write the value to
@@ -458,12 +466,7 @@ public class ValueHandlerImpl implements javax.rmi.CORBA.ValueHandlerMultiFormat
         return ObjectStreamClass.lookup(value.getClass()).writeReplace(value);
     }
 
-    /**
-     * Encapsulates writing of Java char arrays so that the 1.3 subclass
-     * can override it without exposing internals across packages.  This
-     * is a fix for bug 4367783.
-     */
-    protected void writeCharArray(org.omg.CORBA_2_3.portable.OutputStream out,
+    private void writeCharArray(org.omg.CORBA_2_3.portable.OutputStream out,
                                 char[] array,
                                 int offset,
                                 int length)
@@ -576,12 +579,7 @@ public class ValueHandlerImpl implements javax.rmi.CORBA.ValueHandlerMultiFormat
         }
     }
 
-    /**
-     * Encapsulates reading of Java char arrays so that the 1.3 subclass
-     * can override it without exposing internals across packages.  This
-     * is a fix for bug 4367783.
-     */
-    protected void readCharArray(org.omg.CORBA_2_3.portable.InputStream in,
+    private void readCharArray(org.omg.CORBA_2_3.portable.InputStream in,
                                  char[] array,
                                  int offset,
                                  int length)
@@ -795,7 +793,7 @@ public class ValueHandlerImpl implements javax.rmi.CORBA.ValueHandlerMultiFormat
         return RepositoryId.cache.getId(repId).isSequence();
     }
 
-    protected String getOutputStreamClassName() {
+    private String getOutputStreamClassName() {
         return "com.sun.corba.se.impl.io.IIOPOutputStream";
     }
 
@@ -843,29 +841,11 @@ public class ValueHandlerImpl implements javax.rmi.CORBA.ValueHandlerMultiFormat
     private IIOPOutputStream createOutputStreamBuiltInNoPriv(
         final String name
     ) throws IOException {
-        return
-            name.equals(
-                IIOPOutputStream
-                    .class.getName()
-            ) ?
-            new IIOPOutputStream() :
-
-            name.equals(
-                com.sun.corba.se.impl.orbutil.IIOPOutputStream_1_3
-                    .class.getName()
-            ) ?
-            new com.sun.corba.se.impl.orbutil.IIOPOutputStream_1_3() :
-
-            name.equals(
-                com.sun.corba.se.impl.orbutil.IIOPOutputStream_1_3_1
-                    .class.getName()
-            ) ?
-            new com.sun.corba.se.impl.orbutil.IIOPOutputStream_1_3_1() :
-
-            null;
+        return name.equals(IIOPOutputStream.class.getName()) ?
+                new IIOPOutputStream() : null;
     }
 
-    protected String getInputStreamClassName() {
+    private String getInputStreamClassName() {
         return "com.sun.corba.se.impl.io.IIOPInputStream";
     }
 
@@ -913,26 +893,8 @@ public class ValueHandlerImpl implements javax.rmi.CORBA.ValueHandlerMultiFormat
      private IIOPInputStream createInputStreamBuiltInNoPriv(
          final String name
      ) throws IOException {
-         return
-             name.equals(
-                 IIOPInputStream
-                     .class.getName()
-             ) ?
-             new IIOPInputStream() :
-
-             name.equals(
-                 com.sun.corba.se.impl.orbutil.IIOPInputStream_1_3
-                     .class.getName()
-             ) ?
-             new com.sun.corba.se.impl.orbutil.IIOPInputStream_1_3() :
-
-             name.equals(
-                 com.sun.corba.se.impl.orbutil.IIOPInputStream_1_3_1
-                     .class.getName()
-             ) ?
-             new com.sun.corba.se.impl.orbutil.IIOPInputStream_1_3_1() :
-
-             null;
+         return name.equals(IIOPInputStream.class.getName()) ?
+                new IIOPInputStream() : null;
      }
 
      /**
@@ -958,12 +920,7 @@ public class ValueHandlerImpl implements javax.rmi.CORBA.ValueHandlerMultiFormat
 
     }
 
-    /**
-     * Our JDK 1.3 and JDK 1.3.1 behavior subclasses override this.
-     * The correct behavior is for a Java char to map to a CORBA wchar,
-     * but our older code mapped it to a CORBA char.
-     */
-    protected TCKind getJavaCharTCKind() {
+    TCKind getJavaCharTCKind() {
         return TCKind.tk_wchar;
     }
 }
diff --git a/corba/src/share/classes/com/sun/corba/se/impl/io/ValueUtility.java b/corba/src/share/classes/com/sun/corba/se/impl/io/ValueUtility.java
index 84bb1685515..41d85a265fc 100644
--- a/corba/src/share/classes/com/sun/corba/se/impl/io/ValueUtility.java
+++ b/corba/src/share/classes/com/sun/corba/se/impl/io/ValueUtility.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -93,6 +93,14 @@ public class ValueUtility {
         null,       // tk_abstract_interface 32
     };
 
+    static {
+        sun.corba.SharedSecrets.setJavaCorbaAccess(new sun.corba.JavaCorbaAccess() {
+            public ValueHandlerImpl newValueHandlerImpl() {
+                return ValueHandlerImpl.getInstance();
+            }
+        });
+    }
+
     public static String getSignature(ValueMember member)
         throws ClassNotFoundException {
 
diff --git a/corba/src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java b/corba/src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java
index 7721999591c..aa2c6483804 100644
--- a/corba/src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java
+++ b/corba/src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java
@@ -112,6 +112,9 @@ import com.sun.corba.se.impl.util.JDKBridge;
 import com.sun.corba.se.impl.orbutil.ORBClassLoader;
 import com.sun.corba.se.impl.logging.UtilSystemException;
 import com.sun.corba.se.spi.logging.CORBALogDomains;
+import sun.corba.SharedSecrets;
+import sun.corba.JavaCorbaAccess;
+
 
 /**
  * Provides utility methods that can be used by stubs and ties to
@@ -125,7 +128,8 @@ public class Util implements javax.rmi.CORBA.UtilDelegate
     // Maps targets to ties.
     private static IdentityHashtable exportedServants = new IdentityHashtable();
 
-    private static ValueHandlerImpl valueHandlerSingleton = new ValueHandlerImpl();
+    private static final ValueHandlerImpl valueHandlerSingleton =
+        SharedSecrets.getJavaCorbaAccess().newValueHandlerImpl();
 
     private UtilSystemException utilWrapper = UtilSystemException.get(
                                                   CORBALogDomains.RPC_ENCODING);
diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java b/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java
index 9c03173238b..5db85734a95 100644
--- a/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java
+++ b/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java
@@ -840,7 +840,7 @@ public class ORBImpl extends com.sun.corba.se.spi.orb.ORB
         // backward compatability 4365188
         CodeBase cb;
 
-        ValueHandler vh = ORBUtility.createValueHandler(this);
+        ValueHandler vh = ORBUtility.createValueHandler();
 
         cb = (CodeBase)vh.getRunTimeCodeBase();
         return ORBUtility.connectAndGetIOR( this, cb ) ;
diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/IIOPInputStream_1_3.java b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/IIOPInputStream_1_3.java
deleted file mode 100644
index 235d7343c9b..00000000000
--- a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/IIOPInputStream_1_3.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.sun.corba.se.impl.orbutil;
-
-import java.io.*;
-import java.util.Hashtable;
-
-/**
- * Implements legacy behavior from before Ladybird to maintain
- * backwards compatibility.
- */
-public class IIOPInputStream_1_3 extends com.sun.corba.se.impl.io.IIOPInputStream
-{
-    // The newer version in the io package correctly reads a wstring instead.
-    // This concerns bug 4379597.
-    protected String internalReadUTF(org.omg.CORBA.portable.InputStream stream)
-    {
-        return stream.read_string();
-    }
-
-    /**
-     * Before JDK 1.3.1_01, the PutField/GetField implementation
-     * actually sent a Hashtable.
-     */
-    public ObjectInputStream.GetField readFields()
-        throws IOException, ClassNotFoundException, NotActiveException {
-        Hashtable fields = (Hashtable)readObject();
-        return new LegacyHookGetFields(fields);
-    }
-
-    public IIOPInputStream_1_3()
-        throws java.io.IOException {
-        super();
-    }
-}
diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/IIOPOutputStream_1_3.java b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/IIOPOutputStream_1_3.java
deleted file mode 100644
index e9d81cdd254..00000000000
--- a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/IIOPOutputStream_1_3.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.sun.corba.se.impl.orbutil;
-
-import java.io.*;
-
-/**
- * Implements legacy behavior from before Ladybird to maintain
- * backwards compatibility.
- */
-public class IIOPOutputStream_1_3 extends com.sun.corba.se.impl.io.IIOPOutputStream
-{
-    // We can't assume that the superclass's putFields
-    // member will be non-private.  We must allow
-    // the RI to run on JDK 1.3.1 FCS as well as
-    // the JDK 1.3.1_01 patch.
-    private ObjectOutputStream.PutField putFields_1_3;
-
-    // The newer version in the io package correctly writes a wstring instead.
-    // This concerns bug 4379597.
-    protected void internalWriteUTF(org.omg.CORBA.portable.OutputStream stream,
-                                    String data)
-    {
-        stream.write_string(data);
-    }
-
-    public IIOPOutputStream_1_3()
-        throws java.io.IOException {
-        super();
-    }
-
-    /**
-     * Before JDK 1.3.1_01, the PutField/GetField implementation
-     * actually sent a Hashtable.
-     */
-    public ObjectOutputStream.PutField putFields()
-        throws IOException {
-        putFields_1_3 = new LegacyHookPutFields();
-        return putFields_1_3;
-    }
-
-    public void writeFields()
-        throws IOException {
-        putFields_1_3.write(this);
-    }
-}
diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/IIOPOutputStream_1_3_1.java b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/IIOPOutputStream_1_3_1.java
deleted file mode 100644
index 6c7bfd46fd0..00000000000
--- a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/IIOPOutputStream_1_3_1.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2001, 2002, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- */
-package com.sun.corba.se.impl.orbutil;
-
-import java.io.*;
-import java.util.Hashtable;
-
-/**
- * Implements legacy behavior from Ladybird to maintain
- * backwards compatibility.
- */
-public class IIOPOutputStream_1_3_1 extends com.sun.corba.se.impl.io.IIOPOutputStream
-{
-    // We can't assume that the superclass's putFields
-    // member will be non-private.  We must allow
-    // the RI to run on JDK 1.3.1 FCS as well as
-    // the JDK 1.3.1_01 patch.
-    private ObjectOutputStream.PutField putFields_1_3_1;
-
-    public IIOPOutputStream_1_3_1()
-        throws java.io.IOException {
-        super();
-    }
-
-    /**
-     * Before JDK 1.3.1_01, the PutField/GetField implementation
-     * actually sent a Hashtable.
-     */
-    public ObjectOutputStream.PutField putFields()
-        throws IOException {
-
-        putFields_1_3_1 = new LegacyHookPutFields();
-        return putFields_1_3_1;
-    }
-
-    public void writeFields()
-        throws IOException {
-
-        putFields_1_3_1.write(this);
-    }
-}
diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/ORBUtility.java b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/ORBUtility.java
index b4cc902ee7a..23d51f9008a 100644
--- a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/ORBUtility.java
+++ b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/ORBUtility.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -160,44 +160,12 @@ public final class ORBUtility {
     }
 
     /**
-     * Creates the correct ValueHandler for the given ORB,
-     * querying ORBVersion information.  If the ORB or
-     * ORBVersion is null, gets the ValueHandler from
-     * Util.createValueHandler.
+     * Return default ValueHandler
      */
-    public static ValueHandler createValueHandler(ORB orb) {
-
-        if (orb == null)
-            return Util.createValueHandler();
-
-        ORBVersion version = orb.getORBVersion();
-
-        if (version == null)
-            return Util.createValueHandler();
-
-        if (version.equals(ORBVersionFactory.getOLD()))
-            return new ValueHandlerImpl_1_3();
-        if (version.equals(ORBVersionFactory.getNEW()))
-            return new ValueHandlerImpl_1_3_1();
-
+    public static ValueHandler createValueHandler() {
         return Util.createValueHandler();
     }
 
-    /**
-     * Returns true if the given ORB could accurately be determined to be a
-     * Kestrel or earlier ORB.  Note: If passed the ORBSingleton, this will return
-     * false.
-     */
-    public static boolean isLegacyORB(ORB orb)
-    {
-        try {
-            ORBVersion currentORB = orb.getORBVersion();
-            return currentORB.equals( ORBVersionFactory.getOLD() ) ;
-        } catch (SecurityException se) {
-            return false;
-        }
-    }
-
     /**
      * Returns true if it was accurately determined that the remote ORB is
      * a foreign (non-JavaSoft) ORB.  Note:  If passed the ORBSingleton, this
diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepIdDelegator_1_3.java b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepIdDelegator_1_3.java
deleted file mode 100644
index c4e218304cb..00000000000
--- a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepIdDelegator_1_3.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.corba.se.impl.orbutil;
-
-import org.omg.CORBA.ORB;
-import java.io.Serializable;
-import java.util.Hashtable;
-import java.net.MalformedURLException;
-import com.sun.corba.se.impl.io.TypeMismatchException;
-import com.sun.corba.se.impl.util.RepositoryId;
-
-/**
- * Delegates to the RepositoryId_1_3 implementation in
- * com.sun.corba.se.impl.orbutil.  This is necessary to
- * overcome the fact that many of RepositoryId's methods
- * are static.
- */
-public final class RepIdDelegator_1_3
-    implements RepositoryIdStrings,
-               RepositoryIdUtility,
-               RepositoryIdInterface
-{
-    // RepositoryIdFactory methods
-
-    public String createForAnyType(Class type) {
-        return RepositoryId_1_3.createForAnyType(type);
-    }
-
-    public String createForJavaType(Serializable ser)
-        throws TypeMismatchException
-    {
-        return RepositoryId_1_3.createForJavaType(ser);
-    }
-
-    public String createForJavaType(Class clz)
-        throws TypeMismatchException
-    {
-        return RepositoryId_1_3.createForJavaType(clz);
-    }
-
-    public String createSequenceRepID(java.lang.Object ser) {
-        return RepositoryId_1_3.createSequenceRepID(ser);
-    }
-
-    public String createSequenceRepID(Class clazz) {
-        return RepositoryId_1_3.createSequenceRepID(clazz);
-    }
-
-    public RepositoryIdInterface getFromString(String repIdString) {
-        return new RepIdDelegator_1_3(RepositoryId_1_3.cache.getId(repIdString));
-    }
-
-    // RepositoryIdUtility methods
-
-    public boolean isChunkedEncoding(int valueTag) {
-        return RepositoryId.isChunkedEncoding(valueTag);
-    }
-
-    public boolean isCodeBasePresent(int valueTag) {
-        return RepositoryId.isCodeBasePresent(valueTag);
-    }
-
-    public String getClassDescValueRepId() {
-        return RepositoryId_1_3.kClassDescValueRepID;
-    }
-
-    public String getWStringValueRepId() {
-        return RepositoryId_1_3.kWStringValueRepID;
-    }
-
-    public int getTypeInfo(int valueTag) {
-        return RepositoryId.getTypeInfo(valueTag);
-    }
-
-    public int getStandardRMIChunkedNoRepStrId() {
-        return RepositoryId.kPreComputed_StandardRMIChunked_NoRep;
-    }
-
-    public int getCodeBaseRMIChunkedNoRepStrId() {
-        return RepositoryId.kPreComputed_CodeBaseRMIChunked_NoRep;
-    }
-
-    public int getStandardRMIChunkedId() {
-        return RepositoryId.kPreComputed_StandardRMIChunked;
-    }
-
-    public int getCodeBaseRMIChunkedId() {
-        return RepositoryId.kPreComputed_CodeBaseRMIChunked;
-    }
-
-    public int getStandardRMIUnchunkedId() {
-        return RepositoryId.kPreComputed_StandardRMIUnchunked;
-    }
-
-    public int getCodeBaseRMIUnchunkedId() {
-        return RepositoryId.kPreComputed_CodeBaseRMIUnchunked;
-    }
-
-    public int getStandardRMIUnchunkedNoRepStrId() {
-        return RepositoryId.kPreComputed_StandardRMIUnchunked_NoRep;
-    }
-
-    public int getCodeBaseRMIUnchunkedNoRepStrId() {
-        return RepositoryId.kPreComputed_CodeBaseRMIUnchunked_NoRep;
-    }
-
-    // RepositoryIdInterface methods
-
-    public Class getClassFromType() throws ClassNotFoundException {
-        return delegate.getClassFromType();
-    }
-
-    public Class getClassFromType(String codebaseURL)
-        throws ClassNotFoundException, MalformedURLException
-    {
-        return delegate.getClassFromType(codebaseURL);
-    }
-
-    public Class getClassFromType(Class expectedType,
-                                  String codebaseURL)
-        throws ClassNotFoundException, MalformedURLException
-    {
-        return delegate.getClassFromType(expectedType, codebaseURL);
-    }
-
-    public String getClassName() {
-        return delegate.getClassName();
-    }
-
-    // Constructor used for factory/utility cases
-    public RepIdDelegator_1_3() {}
-
-    // Constructor used by getIdFromString.  All non-static
-    // RepositoryId methods will use the provided delegate.
-    private RepIdDelegator_1_3(RepositoryId_1_3 _delegate) {
-        this.delegate = _delegate;
-    }
-
-    private RepositoryId_1_3 delegate = null;
-
-    public String toString() {
-        if (delegate != null)
-            return delegate.toString();
-        else
-            return this.getClass().getName();
-    }
-
-    public boolean equals(Object obj) {
-        if (delegate != null)
-            return delegate.equals(obj);
-        else
-            return super.equals(obj);
-    }
-}
diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepIdDelegator_1_3_1.java b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepIdDelegator_1_3_1.java
deleted file mode 100644
index dc1195fa073..00000000000
--- a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepIdDelegator_1_3_1.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright (c) 2001, 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.corba.se.impl.orbutil;
-
-import org.omg.CORBA.ORB;
-import java.io.Serializable;
-import java.util.Hashtable;
-import java.net.MalformedURLException;
-import com.sun.corba.se.impl.io.TypeMismatchException;
-import com.sun.corba.se.impl.util.RepositoryId;
-
-/**
- * Delegates to the RepositoryId_1_3_1 implementation in
- * com.sun.corba.se.impl.orbutil.  This is necessary to
- * overcome the fact that many of RepositoryId's methods
- * are static.
- */
-public final class RepIdDelegator_1_3_1
-    implements RepositoryIdStrings,
-               RepositoryIdUtility,
-               RepositoryIdInterface
-{
-    // RepositoryIdFactory methods
-
-    public String createForAnyType(Class type) {
-        return RepositoryId_1_3_1.createForAnyType(type);
-    }
-
-    public String createForJavaType(Serializable ser)
-        throws TypeMismatchException
-    {
-        return RepositoryId_1_3_1.createForJavaType(ser);
-    }
-
-    public String createForJavaType(Class clz)
-        throws TypeMismatchException
-    {
-        return RepositoryId_1_3_1.createForJavaType(clz);
-    }
-
-    public String createSequenceRepID(java.lang.Object ser) {
-        return RepositoryId_1_3_1.createSequenceRepID(ser);
-    }
-
-    public String createSequenceRepID(Class clazz) {
-        return RepositoryId_1_3_1.createSequenceRepID(clazz);
-    }
-
-    public RepositoryIdInterface getFromString(String repIdString) {
-        return new RepIdDelegator_1_3_1(RepositoryId_1_3_1.cache.getId(repIdString));
-    }
-
-    // RepositoryIdUtility methods
-
-    public boolean isChunkedEncoding(int valueTag) {
-        return RepositoryId.isChunkedEncoding(valueTag);
-    }
-
-    public boolean isCodeBasePresent(int valueTag) {
-        return RepositoryId.isCodeBasePresent(valueTag);
-    }
-
-    public String getClassDescValueRepId() {
-        return RepositoryId_1_3_1.kClassDescValueRepID;
-    }
-
-    public String getWStringValueRepId() {
-        return RepositoryId_1_3_1.kWStringValueRepID;
-    }
-
-    public int getTypeInfo(int valueTag) {
-        return RepositoryId.getTypeInfo(valueTag);
-    }
-
-    public int getStandardRMIChunkedNoRepStrId() {
-        return RepositoryId.kPreComputed_StandardRMIChunked_NoRep;
-    }
-
-    public int getCodeBaseRMIChunkedNoRepStrId() {
-        return RepositoryId.kPreComputed_CodeBaseRMIChunked_NoRep;
-    }
-
-    public int getStandardRMIChunkedId() {
-        return RepositoryId.kPreComputed_StandardRMIChunked;
-    }
-
-    public int getCodeBaseRMIChunkedId() {
-        return RepositoryId.kPreComputed_CodeBaseRMIChunked;
-    }
-
-    public int getStandardRMIUnchunkedId() {
-        return RepositoryId.kPreComputed_StandardRMIUnchunked;
-    }
-
-    public int getCodeBaseRMIUnchunkedId() {
-        return RepositoryId.kPreComputed_CodeBaseRMIUnchunked;
-    }
-
-    public int getStandardRMIUnchunkedNoRepStrId() {
-        return RepositoryId.kPreComputed_StandardRMIUnchunked_NoRep;
-    }
-
-    public int getCodeBaseRMIUnchunkedNoRepStrId() {
-        return RepositoryId.kPreComputed_CodeBaseRMIUnchunked_NoRep;
-    }
-
-    // RepositoryIdInterface methods
-
-    public Class getClassFromType() throws ClassNotFoundException {
-        return delegate.getClassFromType();
-    }
-
-    public Class getClassFromType(String codebaseURL)
-        throws ClassNotFoundException, MalformedURLException
-    {
-        return delegate.getClassFromType(codebaseURL);
-    }
-
-    public Class getClassFromType(Class expectedType,
-                                  String codebaseURL)
-        throws ClassNotFoundException, MalformedURLException
-    {
-        return delegate.getClassFromType(expectedType, codebaseURL);
-    }
-
-    public String getClassName() {
-        return delegate.getClassName();
-    }
-
-    // Constructor used for factory/utility cases
-    public RepIdDelegator_1_3_1() {}
-
-    // Constructor used by getIdFromString.  All non-static
-    // RepositoryId methods will use the provided delegate.
-    private RepIdDelegator_1_3_1(RepositoryId_1_3_1 _delegate) {
-        this.delegate = _delegate;
-    }
-
-    private RepositoryId_1_3_1 delegate = null;
-
-    public String toString() {
-        if (delegate != null)
-            return delegate.toString();
-        else
-            return this.getClass().getName();
-    }
-
-    public boolean equals(Object obj) {
-        if (delegate != null)
-            return delegate.equals(obj);
-        else
-            return super.equals(obj);
-    }
-}
diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdCache_1_3.java b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdCache_1_3.java
deleted file mode 100644
index 3a35b33a645..00000000000
--- a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdCache_1_3.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-/*
- * Licensed Materials - Property of IBM
- * RMI-IIOP v1.0
- * Copyright IBM Corp. 1998 1999  All Rights Reserved
- *
- */
-
-package com.sun.corba.se.impl.orbutil;
-
-import java.util.Stack;
-import java.util.Hashtable;
-import java.util.EmptyStackException;
-import java.util.Enumeration;
-
-// Really limited pool - in this case just creating several at a time...
-class RepositoryIdPool_1_3 extends Stack {
-
-    private static int MAX_CACHE_SIZE = 4;
-    private RepositoryIdCache_1_3 cache;
-
-    public final synchronized RepositoryId_1_3 popId() {
-
-        try {
-            return (RepositoryId_1_3)super.pop();
-        }
-        catch(EmptyStackException e) {
-            increasePool(5);
-            return (RepositoryId_1_3)super.pop();
-        }
-
-    }
-
-    // Pool management
-    final void increasePool(int size) {
-        //if (cache.size() <= MAX_CACHE_SIZE)
-        for (int i = size; i > 0; i--)
-            push(new RepositoryId_1_3());
-        /*
-          // _REVISIT_ This will not work w/out either thread tracing or weak references.  I am
-          // betting that thread tracing almost completely negates benefit of reuse.  Until either
-          // 1.2 only inclusion or proof to the contrary, I'll leave it this way...
-          else {
-          int numToReclaim = cache.size() / 2;
-          Enumeration keys = cache.keys();
-          Enumeration elements = cache.elements();
-          for (int i = numToReclaim; i > 0; i--) {
-          Object key = keys.nextElement();
-          Object element = elements.nextElement();
-
-          push(element);
-          cache.remove(key);
-          }
-          }
-        */
-    }
-
-    final void setCaches(RepositoryIdCache_1_3 cache) {
-        this.cache = cache;
-    }
-
-}
-
-public class RepositoryIdCache_1_3 extends Hashtable {
-
-    private RepositoryIdPool_1_3 pool = new RepositoryIdPool_1_3();
-
-    public RepositoryIdCache_1_3() {
-        pool.setCaches(this);
-    }
-
-    public final synchronized RepositoryId_1_3 getId(String key) {
-        RepositoryId_1_3 repId = (RepositoryId_1_3)super.get(key);
-
-        if (repId != null)
-            return repId;
-        else {
-            //repId = pool.popId().init(key);
-            repId = new RepositoryId_1_3(key);
-            put(key, repId);
-            return repId;
-        }
-
-    }
-}
diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdCache_1_3_1.java b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdCache_1_3_1.java
deleted file mode 100644
index 11acc5b522a..00000000000
--- a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdCache_1_3_1.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 2001, 2002, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.corba.se.impl.orbutil;
-
-import java.util.Stack;
-import java.util.Hashtable;
-import java.util.EmptyStackException;
-import java.util.Enumeration;
-
-// Really limited pool - in this case just creating several at a time...
-class RepositoryIdPool_1_3_1 extends Stack {
-
-    private static int MAX_CACHE_SIZE = 4;
-    private RepositoryIdCache_1_3_1 cache;
-
-    public final synchronized RepositoryId_1_3_1 popId() {
-
-        try {
-            return (RepositoryId_1_3_1)super.pop();
-        }
-        catch(EmptyStackException e) {
-            increasePool(5);
-            return (RepositoryId_1_3_1)super.pop();
-        }
-
-    }
-
-    // Pool management
-    final void increasePool(int size) {
-        //if (cache.size() <= MAX_CACHE_SIZE)
-        for (int i = size; i > 0; i--)
-            push(new RepositoryId_1_3_1());
-        /*
-          // _REVISIT_ This will not work w/out either thread tracing or weak references.  I am
-          // betting that thread tracing almost completely negates benefit of reuse.  Until either
-          // 1.2 only inclusion or proof to the contrary, I'll leave it this way...
-          else {
-          int numToReclaim = cache.size() / 2;
-          Enumeration keys = cache.keys();
-          Enumeration elements = cache.elements();
-          for (int i = numToReclaim; i > 0; i--) {
-          Object key = keys.nextElement();
-          Object element = elements.nextElement();
-
-          push(element);
-          cache.remove(key);
-          }
-          }
-        */
-    }
-
-    final void setCaches(RepositoryIdCache_1_3_1 cache) {
-        this.cache = cache;
-    }
-
-}
-
-public class RepositoryIdCache_1_3_1 extends Hashtable {
-
-    private RepositoryIdPool_1_3_1 pool = new RepositoryIdPool_1_3_1();
-
-    public RepositoryIdCache_1_3_1() {
-        pool.setCaches(this);
-    }
-
-    public final synchronized RepositoryId_1_3_1 getId(String key) {
-        RepositoryId_1_3_1 repId = (RepositoryId_1_3_1)super.get(key);
-
-        if (repId != null)
-            return repId;
-        else {
-            //repId = pool.popId().init(key);
-            repId = new RepositoryId_1_3_1(key);
-            put(key, repId);
-            return repId;
-        }
-
-    }
-}
diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdFactory.java b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdFactory.java
index 35014680527..5f3a237e995 100644
--- a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdFactory.java
+++ b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,12 +30,6 @@ import com.sun.corba.se.spi.orb.ORB;
 
 public abstract class RepositoryIdFactory
 {
-    private static final RepIdDelegator_1_3 legacyDelegator
-        = new RepIdDelegator_1_3();
-
-    private static final RepIdDelegator_1_3_1 ladybirdDelegator
-        = new RepIdDelegator_1_3_1();
-
     private static final RepIdDelegator currentDelegator
         = new RepIdDelegator();
 
@@ -47,29 +41,6 @@ public abstract class RepositoryIdFactory
         return currentDelegator;
     }
 
-    /**
-     * Checks the version of the ORB and returns the appropriate
-     * RepositoryIdStrings instance.
-     */
-    public static RepositoryIdStrings getRepIdStringsFactory(ORB orb)
-    {
-        if (orb != null) {
-            switch (orb.getORBVersion().getORBType()) {
-                case ORBVersion.NEWER:
-                case ORBVersion.FOREIGN:
-                case ORBVersion.JDK1_3_1_01:
-                    return currentDelegator;
-                case ORBVersion.OLD:
-                    return legacyDelegator;
-                case ORBVersion.NEW:
-                    return ladybirdDelegator;
-                default:
-                    return currentDelegator;
-            }
-        } else
-            return currentDelegator;
-    }
-
     /**
      * Returns the latest version RepositoryIdUtility instance
      */
@@ -78,26 +49,4 @@ public abstract class RepositoryIdFactory
         return currentDelegator;
     }
 
-    /**
-     * Checks the version of the ORB and returns the appropriate
-     * RepositoryIdUtility instance.
-     */
-    public static RepositoryIdUtility getRepIdUtility(ORB orb)
-    {
-        if (orb != null) {
-            switch (orb.getORBVersion().getORBType()) {
-                case ORBVersion.NEWER:
-                case ORBVersion.FOREIGN:
-                case ORBVersion.JDK1_3_1_01:
-                    return currentDelegator;
-                case ORBVersion.OLD:
-                    return legacyDelegator;
-                case ORBVersion.NEW:
-                    return ladybirdDelegator;
-                default:
-                    return currentDelegator;
-            }
-        } else
-            return currentDelegator;
-    }
 }
diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryId_1_3.java b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryId_1_3.java
deleted file mode 100644
index 8cf9edd4834..00000000000
--- a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryId_1_3.java
+++ /dev/null
@@ -1,990 +0,0 @@
-/*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-/*
- * Licensed Materials - Property of IBM
- * RMI-IIOP v1.0
- * Copyright IBM Corp. 1998 1999  All Rights Reserved
- *
- */
-
-package com.sun.corba.se.impl.orbutil;
-
-import java.util.StringTokenizer;
-import java.util.Hashtable;
-import java.io.IOException;
-import java.lang.reflect.Method;
-
-// Imports for using codebase URL to load class
-import java.net.MalformedURLException;
-import org.omg.CORBA.portable.ValueBase;
-import org.omg.CORBA.portable.IDLEntity;
-
-import com.sun.corba.se.impl.util.JDKBridge;
-import com.sun.corba.se.impl.util.Utility;
-import com.sun.corba.se.impl.util.PackagePrefixChecker;
-import com.sun.corba.se.impl.util.IdentityHashtable;
-import com.sun.corba.se.impl.io.ObjectStreamClass;
-
-import javax.rmi.CORBA.Util;
-
-// keeping the original RepositoryId class that was shipped in
-// JDK 1.3.  It has interoperability bugs
-
-public class RepositoryId_1_3 {
-
-    // Legal IDL Identifier characters (1 = legal). Note
-    // that '.' (2E) is marked as legal even though it is
-    // not legal in IDL. This allows us to treat a fully
-    // qualified Java name with '.' package separators
-    // uniformly, and is safe because that is the only
-    // legal use of '.' in a Java name.
-
-    public static final RepositoryIdCache_1_3 cache = new RepositoryIdCache_1_3();
-    private static final byte[] IDL_IDENTIFIER_CHARS = {
-
-        // 0 1 2 3  4 5 6 7  8 9 a b  c d e f
-        0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // 00-0f
-        0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // 10-1f
-        0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,1,0, // 20-2f
-        1,1,1,1, 1,1,1,1, 1,1,0,0, 0,0,0,0, // 30-3f
-        0,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, // 40-4f
-        1,1,1,1, 1,1,1,1, 1,1,1,0, 0,0,0,1, // 50-5f
-        0,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, // 60-6f
-        1,1,1,1, 1,1,1,1, 1,1,1,0, 0,0,0,0, // 70-7f
-        0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // 80-8f
-        0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // 90-9f
-        0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // a0-af
-        0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // b0-bf
-        1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, // c0-cf
-        0,1,1,1, 1,1,1,0, 1,1,1,1, 1,0,0,1, // d0-df
-        1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, // e0-ef
-        0,1,1,1, 1,1,1,0, 1,1,1,1, 1,0,0,1, // f0-ff
-    };
-
-    private static String defaultServerURL = null;
-    private static boolean useCodebaseOnly = false;
-
-    static {
-        if (defaultServerURL == null)
-            defaultServerURL = (String)JDKBridge.getLocalCodebase();
-        useCodebaseOnly = JDKBridge.useCodebaseOnly();
-
-    }
-
-    private static IdentityHashtable classToRepStr = new IdentityHashtable();
-    private static IdentityHashtable classIDLToRepStr = new IdentityHashtable();
-    private static IdentityHashtable classSeqToRepStr = new IdentityHashtable();
-
-    private static IdentityHashtable repStrToByteArray = new IdentityHashtable();
-    private static Hashtable repStrToClass = new Hashtable();
-
-    private String repId = null;
-    private boolean isSupportedFormat = true;
-    private String typeString = null;
-    private String versionString = null;
-    private boolean isSequence = false;
-    private boolean isRMIValueType = false;
-    private boolean isIDLType = false;
-    private String completeClassName = null;
-    private String unqualifiedName = null;
-    private String definedInId = null;
-    private Class clazz = null;
-    private String suid = null, actualSuid = null;
-    private long suidLong = ObjectStreamClass.kDefaultUID, actualSuidLong = ObjectStreamClass.kDefaultUID;
-
-    // Repository ID fragments
-    private static final String kValuePrefix = "RMI:";
-    private static final String kIDLPrefix = "IDL:";
-    private static final String kIDLNamePrefix = "omg.org/";
-    private static final String kIDLClassnamePrefix = "org.omg.";
-    private static final String kSequencePrefix = "[";
-    private static final String kCORBAPrefix = "CORBA/";
-    private static final String kArrayPrefix = kValuePrefix + kSequencePrefix + kCORBAPrefix;
-    private static final int kValuePrefixLength = kValuePrefix.length();
-    private static final int kIDLPrefixLength = kIDLPrefix.length();
-    private static final int kSequencePrefixLength = kSequencePrefix.length();
-    private static final String kInterfaceHashCode = ":0000000000000000";
-    private static final String kInterfaceOnlyHashStr = "0000000000000000";
-    private static final String kExternalizableHashStr = "0000000000000001";
-
-    // Value tag utility methods and constants
-    public static final int kInitialValueTag= 0x7fffff00;
-    public static final int kNoTypeInfo = 0;
-    public static final int kSingleRepTypeInfo = 0x02;
-    public static final int  kPartialListTypeInfo = 0x06;
-    public static final int  kChunkedMask = 0x08;
-
-    // Public, well known repository IDs
-
-    // _REVISIT_ : A table structure with a good search routine for all of this
-    // would be more efficient and easier to maintain...
-
-    // String
-    public static final String kWStringValueVersion = "1.0";
-    public static final String kWStringValueHash = ":"+kWStringValueVersion;
-    public static final String kWStringStubValue = "WStringValue";
-    public static final String kWStringTypeStr = "omg.org/CORBA/"+kWStringStubValue;
-    public static final String kWStringValueRepID = kIDLPrefix + kWStringTypeStr + kWStringValueHash;
-
-    // Any
-    public static final String kAnyRepID = kIDLPrefix + "omg.org/CORBA/Any";
-
-    // Class
-    public static final String kClassDescValueHash = ":" + Long.toHexString(
-       ObjectStreamClass.getSerialVersionUID(javax.rmi.CORBA.ClassDesc.class));
-    public static final String kClassDescStubValue = "ClassDesc";
-    public static final String kClassDescTypeStr = "javax.rmi.CORBA."+kClassDescStubValue;
-    public static final String kClassDescValueRepID = kValuePrefix + kClassDescTypeStr + kClassDescValueHash;
-
-    // Object
-    public static final String kObjectValueHash = ":1.0";
-    public static final String kObjectStubValue = "Object";
-
-    // Sequence
-    public static final String kSequenceValueHash = ":1.0";
-    public static final String kPrimitiveSequenceValueHash = ":0000000000000000";
-
-    // Serializable
-    public static final String kSerializableValueHash = ":1.0";
-    public static final String kSerializableStubValue = "Serializable";
-
-    // Externalizable
-    public static final String kExternalizableValueHash = ":1.0";
-    public static final String kExternalizableStubValue = "Externalizable";
-
-    // Remote (The empty string is used for java.rmi.Remote)
-    public static final String kRemoteValueHash = "";
-    public static final String kRemoteStubValue = "";
-    public static final String kRemoteTypeStr = "";
-    public static final String kRemoteValueRepID = "";
-
-    private static final Hashtable kSpecialArrayTypeStrings = new Hashtable();
-
-    static {
-        kSpecialArrayTypeStrings.put("CORBA.WStringValue", new StringBuffer(java.lang.String.class.getName()));
-        kSpecialArrayTypeStrings.put("javax.rmi.CORBA.ClassDesc", new StringBuffer(java.lang.Class.class.getName()));
-        kSpecialArrayTypeStrings.put("CORBA.Object", new StringBuffer(java.rmi.Remote.class.getName()));
-
-    }
-
-    private static final Hashtable kSpecialCasesRepIDs = new Hashtable();
-
-    static {
-        kSpecialCasesRepIDs.put(java.lang.String.class, kWStringValueRepID);
-        kSpecialCasesRepIDs.put(java.lang.Class.class, kClassDescValueRepID);
-        kSpecialCasesRepIDs.put(java.rmi.Remote.class, kRemoteValueRepID);
-    }
-
-    private static final Hashtable kSpecialCasesStubValues = new Hashtable();
-
-    static {
-        kSpecialCasesStubValues.put(java.lang.String.class, kWStringStubValue);
-        kSpecialCasesStubValues.put(java.lang.Class.class, kClassDescStubValue);
-        kSpecialCasesStubValues.put(java.lang.Object.class, kObjectStubValue);
-        kSpecialCasesStubValues.put(java.io.Serializable.class, kSerializableStubValue);
-        kSpecialCasesStubValues.put(java.io.Externalizable.class, kExternalizableStubValue);
-        kSpecialCasesStubValues.put(java.rmi.Remote.class, kRemoteStubValue);
-    }
-
-
-    private static final Hashtable kSpecialCasesVersions = new Hashtable();
-
-    static {
-        kSpecialCasesVersions.put(java.lang.String.class, kWStringValueHash);
-        kSpecialCasesVersions.put(java.lang.Class.class, kClassDescValueHash);
-        kSpecialCasesVersions.put(java.lang.Object.class, kObjectValueHash);
-        kSpecialCasesVersions.put(java.io.Serializable.class, kSerializableValueHash);
-        kSpecialCasesVersions.put(java.io.Externalizable.class, kExternalizableValueHash);
-        kSpecialCasesVersions.put(java.rmi.Remote.class, kRemoteValueHash);
-    }
-
-    private static final Hashtable kSpecialCasesClasses = new Hashtable();
-
-    static {
-        kSpecialCasesClasses.put(kWStringTypeStr, java.lang.String.class);
-        kSpecialCasesClasses.put(kClassDescTypeStr, java.lang.Class.class);
-        kSpecialCasesClasses.put(kRemoteTypeStr, java.rmi.Remote.class);
-
-        kSpecialCasesClasses.put("org.omg.CORBA.WStringValue", java.lang.String.class);
-        kSpecialCasesClasses.put("javax.rmi.CORBA.ClassDesc", java.lang.Class.class);
-        //kSpecialCasesClasses.put(kRemoteTypeStr, java.rmi.Remote.class);
-    }
-
-    private static final Hashtable kSpecialCasesArrayPrefix = new Hashtable();
-
-    static {
-        kSpecialCasesArrayPrefix.put(java.lang.String.class, kValuePrefix + kSequencePrefix + kCORBAPrefix);
-        kSpecialCasesArrayPrefix.put(java.lang.Class.class, kValuePrefix + kSequencePrefix + "javax/rmi/CORBA/");
-        kSpecialCasesArrayPrefix.put(java.lang.Object.class, kValuePrefix + kSequencePrefix + "java/lang/");
-        kSpecialCasesArrayPrefix.put(java.io.Serializable.class, kValuePrefix + kSequencePrefix + "java/io/");
-        kSpecialCasesArrayPrefix.put(java.io.Externalizable.class, kValuePrefix + kSequencePrefix + "java/io/");
-        kSpecialCasesArrayPrefix.put(java.rmi.Remote.class, kValuePrefix + kSequencePrefix + kCORBAPrefix);
-    }
-
-    private static final Hashtable kSpecialPrimitives = new Hashtable();
-
-    static {
-        kSpecialPrimitives.put("int","long");
-        kSpecialPrimitives.put("long","longlong");
-        kSpecialPrimitives.put("byte","octet");
-    }
-
-    /**
-     * Used to convert ascii to hex.
-     */
-    private static final byte ASCII_HEX[] =     {
-        (byte)'0',
-        (byte)'1',
-        (byte)'2',
-        (byte)'3',
-        (byte)'4',
-        (byte)'5',
-        (byte)'6',
-        (byte)'7',
-        (byte)'8',
-        (byte)'9',
-        (byte)'A',
-        (byte)'B',
-        (byte)'C',
-        (byte)'D',
-        (byte)'E',
-        (byte)'F',
-    };
-
-
-    // Interface Rep ID Strings
-    public static final String kjava_rmi_Remote = createForAnyType(java.rmi.Remote.class);
-    public static final String korg_omg_CORBA_Object = createForAnyType(org.omg.CORBA.Object.class);
-
-    // Dummy arguments for getIdFromHelper method
-    public static final Class kNoParamTypes[] ={};
-    public static final Object kNoArgs[] = {};
-
-
-    RepositoryId_1_3(){}
-
-    RepositoryId_1_3(String aRepId){
-        init(aRepId);
-    }
-
-    RepositoryId_1_3 init(String aRepId){
-
-        this.repId = aRepId;
-
-        // Special case for remote
-        if (aRepId.length() == 0) {
-            clazz = java.rmi.Remote.class;
-            typeString = "";
-            isRMIValueType = true;
-            suid = kInterfaceOnlyHashStr;
-            return this;
-        }
-        else if (aRepId.equals(kWStringValueRepID)) {
-            clazz = java.lang.String.class;
-            typeString = kWStringTypeStr;
-            isIDLType = true;
-            versionString = kWStringValueVersion;
-            return this;
-        }
-        else {
-
-        String repId = convertFromISOLatin1(aRepId);
-
-        versionString = repId.substring(repId.indexOf(':', repId.indexOf(':')+1));
-        if (repId.startsWith(kIDLPrefix)) {
-            typeString =
-                repId.substring(kIDLPrefixLength, repId.indexOf(':', kIDLPrefixLength));
-            isIDLType = true;
-            if (typeString.startsWith(kIDLNamePrefix))
-                completeClassName = kIDLClassnamePrefix +
-                    typeString.substring(kIDLNamePrefix.length()).replace('/','.');
-            else completeClassName = typeString.replace('/','.');
-
-        }
-        else if (repId.startsWith(kValuePrefix)) {
-            typeString =
-                repId.substring(kValuePrefixLength, repId.indexOf(':', kValuePrefixLength));
-            isRMIValueType = true;
-
-            if (versionString.indexOf('.') == -1) {
-                    actualSuid = versionString.substring(1);
-                    suid = actualSuid;  // default if not explicitly specified
-
-                    if (actualSuid.indexOf(':') != -1){
-                    // we have a declared hash also
-                        int pos = actualSuid.indexOf(':')+1;
-                        // actualSuid = suid.substring(pos);
-                        // suid = suid.substring(0, pos-1);
-                        suid = actualSuid.substring(pos);
-                        actualSuid = actualSuid.substring(0, pos-1);
-                }
-
-            }
-            else {
-                    // _REVISIT_ : Special case version failure ?
-            }
-        }
-        else isSupportedFormat = false;
-
-        if (typeString.startsWith(kSequencePrefix)) {
-            isSequence = true;
-        }
-
-
-        return this;
-    }
-    }
-
-    public final String getUnqualifiedName() {
-        if (unqualifiedName == null){
-            String className = getClassName();
-            int index = (className != null) ? className.lastIndexOf('.') : -1;
-            if (index == -1){
-                unqualifiedName = className;
-                definedInId = "IDL::1.0";
-            }
-            else {
-                unqualifiedName = className.substring(index);
-                definedInId = "IDL:" + className.substring(0, index).replace('.','/') + ":1.0";
-            }
-        }
-
-        return unqualifiedName;
-    }
-
-    public final String getDefinedInId() {
-        if (definedInId == null){
-            getUnqualifiedName();
-        }
-
-        return definedInId;
-    }
-
-    public final String getTypeString() {
-        return typeString;
-    }
-
-    public final String getVersionString() {
-        return versionString;
-    }
-
-    public final String getSerialVersionUID() {
-        return suid;
-    }
-
-    public final String getActualSerialVersionUID() {
-        return actualSuid;
-    }
-    public final long getSerialVersionUIDAsLong() {
-        return suidLong;
-    }
-
-    public final long getActualSerialVersionUIDAsLong() {
-        return actualSuidLong;
-    }
-
-    public final boolean isRMIValueType() {
-        return isRMIValueType;
-    }
-
-    public final boolean isIDLType() {
-        return isIDLType;
-    }
-
-    public final String getRepositoryId() {
-        return repId;
-    }
-
-    public static byte[] getByteArray(String repStr) {
-        synchronized (repStrToByteArray){
-            return (byte[]) repStrToByteArray.get(repStr);
-        }
-    }
-
-    public static void setByteArray(String repStr, byte[] repStrBytes) {
-        synchronized (repStrToByteArray){
-            repStrToByteArray.put(repStr, repStrBytes);
-        }
-    }
-
-    public final boolean isSequence() {
-        return isSequence;
-    }
-
-    public final boolean isSupportedFormat() {
-        return isSupportedFormat;
-    }
-
-
-    // This method will return the classname from the typestring OR if the classname turns out to be
-    // a special class "pseudo" name, then the matching real classname is returned.
-    public final String getClassName() {
-
-        if (isRMIValueType)
-            return typeString;
-        else if (isIDLType)
-            return completeClassName;
-        else return null;
-
-    }
-
-    // This method calls getClazzFromType() and falls back to the repStrToClass
-    // cache if no class was found.  It's used where any class matching the
-    // given repid is an acceptable result.
-    public final Class getAnyClassFromType() throws ClassNotFoundException {
-        try {
-            return getClassFromType();
-        } catch (ClassNotFoundException cnfe) {
-            Class clz = (Class)repStrToClass.get(repId);
-            if (clz != null)
-                return clz;
-            else
-                throw cnfe;
-        }
-    }
-
-    public final Class getClassFromType()
-        throws ClassNotFoundException {
-        if (clazz != null)
-            return clazz;
-
-        Class specialCase = (Class)kSpecialCasesClasses.get(getClassName());
-
-        if (specialCase != null){
-            clazz = specialCase;
-            return specialCase;
-        }
-        else
-            {
-                try{
-                    return Util.loadClass(getClassName(), null, null);
-                }
-                catch(ClassNotFoundException cnfe){
-                    if (defaultServerURL != null) {
-                        try{
-                            return getClassFromType(defaultServerURL);
-                        }
-                        catch(MalformedURLException mue){
-                            throw cnfe;
-                        }
-                    }
-                    else throw cnfe;
-                }
-            }
-
-    }
-
-    public final Class getClassFromType(Class expectedType, String codebase)
-        throws ClassNotFoundException {
-        if (clazz != null)
-            return clazz;
-
-        Class specialCase = (Class)kSpecialCasesClasses.get(getClassName());
-
-        if (specialCase != null){
-            clazz = specialCase;
-            return specialCase;
-        } else {
-            ClassLoader expectedTypeClassLoader = (expectedType == null ? null : expectedType.getClassLoader());
-            return loadClassOfType(getClassName(),
-                                            codebase,
-                                            expectedTypeClassLoader,
-                                            expectedType,
-                                            expectedTypeClassLoader);
-        }
-
-    }
-
-    public final Class getClassFromType(String url)
-        throws ClassNotFoundException, MalformedURLException {
-        return Util.loadClass(getClassName(), url, null);
-    }
-
-    public final String toString() {
-        return repId;
-    }
-
-    private static String createHashString(java.io.Serializable ser) {
-
-        return createHashString(ser.getClass());
-    }
-
-    private static String createHashString(java.lang.Class clazz) {
-
-        if (clazz.isInterface() || !java.io.Serializable.class.isAssignableFrom(clazz))
-            return kInterfaceHashCode;
-
-
-        long actualLong = ObjectStreamClassUtil_1_3.computeStructuralUID(false, clazz);
-        String hash = null;
-        if (actualLong == 0)
-            hash = kInterfaceOnlyHashStr;
-        else if (actualLong == 1)
-            hash = kExternalizableHashStr;
-        else
-            hash = Long.toHexString(actualLong).toUpperCase();
-        while(hash.length() < 16){
-            hash = "0" + hash;
-        }
-
-        long declaredLong = ObjectStreamClassUtil_1_3.computeSerialVersionUID(clazz);
-        String declared = null;
-        if (declaredLong == 0)
-            declared = kInterfaceOnlyHashStr;
-        else if (declaredLong == 1)
-            declared = kExternalizableHashStr;
-        else
-            declared = Long.toHexString(declaredLong).toUpperCase();
-        while (declared.length() < 16){
-            declared = "0" + declared;
-    }
-        hash = hash + ":" + declared;
-
-        return ":" + hash;
-    }
-
-    /**
-     * Creates a repository ID for a sequence.  This is for expert users only as
-     * this method assumes the object passed is an array.  If passed an object
-     * that is not an array, it will produce a rep id for a sequence of zero
-     * length.  This would be an error.
-     * @param ser The Java object to create a repository ID for
-     **/
-    public static String createSequenceRepID(java.lang.Object ser){
-        return createSequenceRepID(ser.getClass());
-    }
-
-    /**
-     * Creates a repository ID for a sequence.  This is for expert users only as
-     * this method assumes the object passed is an array.  If passed an object
-     * that is not an array, it will produce a malformed rep id.
-     * @param clazz The Java class to create a repository ID for
-     **/
-    public static String createSequenceRepID(java.lang.Class clazz){
-        synchronized (classSeqToRepStr){
-
-        String repid = (String)classSeqToRepStr.get(clazz);
-        if (repid != null)
-            return repid;
-
-        Class originalClazz = clazz;
-
-        Class type = null;
-        int numOfDims = 0;
-
-        while ((type = clazz.getComponentType()) != null) {
-            numOfDims++;
-            clazz = type;
-        }
-
-        if (clazz.isPrimitive())
-            repid = kValuePrefix + originalClazz.getName() + kPrimitiveSequenceValueHash;
-        else {
-            StringBuffer buf = new StringBuffer();
-            buf.append(kValuePrefix);
-            while(numOfDims-- > 0) {
-                buf.append("[");
-            }
-            buf.append("L");
-            buf.append(convertToISOLatin1(clazz.getName()));
-            buf.append(";");
-            buf.append(createHashString(clazz));
-            repid = buf.toString();
-        }
-        classSeqToRepStr.put(originalClazz,repid);
-        return repid;
-        }
-
-    }
-
-
-    public static String createForSpecialCase(java.lang.Class clazz){
-        if (clazz.isArray()){
-            return createSequenceRepID(clazz);
-        }
-        else {
-            return (String)kSpecialCasesRepIDs.get(clazz);
-        }
-    }
-
-    public static String createForSpecialCase(java.io.Serializable ser){
-        Class clazz = ser.getClass();
-        if (clazz.isArray()){
-            return createSequenceRepID(ser);
-        }
-        else
-            return createForSpecialCase(clazz);
-    }
-
-    /**
-     * Creates a repository ID for a normal Java Type.
-     * @param ser The Java object to create a repository ID for
-     * @exception com.sun.corba.se.impl.io.TypeMismatchException if ser implements the
-     * org.omg.CORBA.portable.IDLEntity interface which indicates it is an IDL Value type.
-     **/
-    public static String createForJavaType(java.io.Serializable ser)
-        throws com.sun.corba.se.impl.io.TypeMismatchException
-    {
-        synchronized (classToRepStr) {
-        String repid = createForSpecialCase(ser);
-        if (repid != null)
-            return repid;
-        Class clazz = ser.getClass();
-        repid = (String)classToRepStr.get(clazz);
-
-        if (repid != null)
-            return repid;
-
-        repid = kValuePrefix + convertToISOLatin1(clazz.getName()) +
-            createHashString(clazz);
-
-        classToRepStr.put(clazz, repid);
-            repStrToClass.put(repid, clazz);
-        return repid;
-    }
-    }
-
-    /**
-     * Creates a repository ID for a normal Java Type.
-     * @param clz The Java class to create a repository ID for
-     * @exception com.sun.corba.se.impl.io.TypeMismatchException if ser implements the
-     * org.omg.CORBA.portable.IDLEntity interface which indicates it is an IDL Value type.
-     **/
-    public static String createForJavaType(Class clz)
-        throws com.sun.corba.se.impl.io.TypeMismatchException
-    {
-        synchronized (classToRepStr){
-        String repid = createForSpecialCase(clz);
-        if (repid != null)
-            return repid;
-
-        repid = (String)classToRepStr.get(clz);
-        if (repid != null)
-            return repid;
-
-        repid = kValuePrefix + convertToISOLatin1(clz.getName()) +
-            createHashString(clz);
-
-        classToRepStr.put(clz, repid);
-            repStrToClass.put(repid, clz);
-        return repid;
-    }
-    }
-
-    /**
-     * Creates a repository ID for an IDL Java Type.
-     * @param ser The IDL Value object to create a repository ID for
-     * @param major The major version number
-     * @param minor The minor version number
-     * @exception com.sun.corba.se.impl.io.TypeMismatchException if ser does not implement the
-     * org.omg.CORBA.portable.IDLEntity interface which indicates it is an IDL Value type.
-     **/
-    public static String createForIDLType(Class ser, int major, int minor)
-        throws com.sun.corba.se.impl.io.TypeMismatchException
-    {
-        synchronized (classIDLToRepStr){
-        String repid = (String)classIDLToRepStr.get(ser);
-        if (repid != null)
-            return repid;
-
-        repid = kIDLPrefix + convertToISOLatin1(ser.getName()).replace('.','/') +
-            ":" + major + "." + minor;
-        classIDLToRepStr.put(ser, repid);
-        return repid;
-    }
-    }
-
-    private static String getIdFromHelper(Class clazz){
-        try {
-            Class helperClazz = Utility.loadClassForClass(clazz.getName()+"Helper", null,
-                                    clazz.getClassLoader(), clazz, clazz.getClassLoader());
-            Method idMethod = helperClazz.getDeclaredMethod("id", kNoParamTypes);
-            return (String)idMethod.invoke(null, kNoArgs);
-        }
-        catch(java.lang.ClassNotFoundException cnfe)
-            {
-                throw new org.omg.CORBA.MARSHAL(cnfe.toString());
-            }
-        catch(java.lang.NoSuchMethodException nsme)
-            {
-                throw new org.omg.CORBA.MARSHAL(nsme.toString());
-            }
-        catch(java.lang.reflect.InvocationTargetException ite)
-            {
-                throw new org.omg.CORBA.MARSHAL(ite.toString());
-            }
-        catch(java.lang.IllegalAccessException iae)
-            {
-                throw new org.omg.CORBA.MARSHAL(iae.toString());
-    }
-    }
-
-    /**
-     * Createa a repository ID for the type if it is either a java type
-     * or an IDL type.
-     * @param type The type to create rep. id for
-     * @return The rep. id.
-     **/
-    public static String createForAnyType(Class type) {
-        try{
-            if (type.isArray())
-                return createSequenceRepID(type);
-            else if (IDLEntity.class.isAssignableFrom(type))
-                {
-                    try{
-                        return getIdFromHelper(type);
-                    }
-                    catch(Throwable t) {
-                        return createForIDLType(type, 1, 0);
-                    }
-                }
-            else return createForJavaType(type);
-        }
-        catch(com.sun.corba.se.impl.io.TypeMismatchException e){
-            return null;
-        }
-
-    }
-
-    public static boolean isAbstractBase(Class clazz) {
-        return (clazz.isInterface() &&
-                IDLEntity.class.isAssignableFrom(clazz) &&
-                (!ValueBase.class.isAssignableFrom(clazz)) &&
-                (!org.omg.CORBA.Object.class.isAssignableFrom(clazz)));
-
-    }
-
-    /**
-     * Convert strings with illegal IDL identifier characters.
-     * <p>
-     * Section 5.5.7 of OBV spec.
-     */
-    private static String convertToISOLatin1 (String name) {
-
-        int length = name.length();
-        if (length == 0) {
-            return name;
-        }
-        StringBuffer buffer = null;
-
-        for (int i = 0; i < length; i++) {
-
-            char c = name.charAt(i);
-
-            if (c > 255 || IDL_IDENTIFIER_CHARS[c] == 0) {
-
-                // We gotta convert. Have we already started?
-
-                if (buffer == null) {
-
-                    // No, so get set up...
-
-                    buffer = new StringBuffer(name.substring(0,i));
-                }
-
-                // Convert the character into the IDL escape syntax...
-                buffer.append(
-                              "\\U" +
-                              (char)ASCII_HEX[(c & 0xF000) >>> 12] +
-                              (char)ASCII_HEX[(c & 0x0F00) >>> 8] +
-                              (char)ASCII_HEX[(c & 0x00F0) >>> 4] +
-                              (char)ASCII_HEX[(c & 0x000F)]);
-
-            } else {
-                if (buffer != null) {
-                    buffer.append(c);
-                }
-            }
-        }
-
-        if (buffer != null) {
-            name = buffer.toString();
-        }
-
-        return name;
-    }
-
-    /**
-     * Convert strings with ISO Latin 1 escape sequences back to original strings.
-     * <p>
-     * Section 5.5.7 of OBV spec.
-     */
-    private static String convertFromISOLatin1 (String name) {
-
-        int index = -1;
-        StringBuffer buf = new StringBuffer(name);
-
-        while ((index = buf.toString().indexOf("\\U")) != -1){
-            String str = "0000" + buf.toString().substring(index+2, index+6);
-
-            // Convert Hexadecimal
-            byte[] buffer = new byte[(str.length() - 4) / 2];
-            for (int i=4, j=0; i < str.length(); i +=2, j++) {
-                buffer[j] = (byte)((ORBUtility.hexOf(str.charAt(i)) << 4) & 0xF0);
-                buffer[j] |= (byte)((ORBUtility.hexOf(str.charAt(i+1)) << 0) & 0x0F);
-            }
-            buf = new StringBuffer(delete(buf.toString(), index, index+6));
-            buf.insert(index, (char)buffer[1]);
-        }
-
-        return buf.toString();
-
-
-    }
-
-    private static String delete(String str, int from, int to)
-    {
-        return str.substring(0, from) + str.substring(to, str.length());
-    }
-
-    private static String replace(String target, String arg, String source)
-    {
-        int i = 0;
-        i = target.indexOf(arg);
-
-        while(i != -1)
-            {
-                String left = target.substring(0, i);
-                String right = target.substring(i+arg.length());
-                target = new String(left+source+right);
-                i = target.indexOf(arg);
-            }
-        return target;
-    }
-
-    /*
-     * Load a class and check that it is assignable to a given type.
-     * @param className the class name.
-     * @param remoteCodebase the codebase to use. May be null.
-     * @param loader the class loader of last resort. May be null.
-     * @param expectedType the expected type. May be null.
-     * @return the loaded class.
-     */
-    private Class loadClassOfType (String className,
-                                  String remoteCodebase,
-                                  ClassLoader loader,
-                                  Class expectedType,
-                                  ClassLoader expectedTypeClassLoader)
-        throws ClassNotFoundException {
-
-        Class loadedClass = null;
-
-        try {
-            //Sequence finding of the stubs according to spec
-            try{
-                //If-else is put here for speed up of J2EE.
-                //According to the OMG spec, the if clause is not dead code.
-                //It can occur if some compiler has allowed generation
-                //into org.omg.stub hierarchy for non-offending
-                //classes. This will encourage people to
-                //produce non-offending class stubs in their own hierarchy.
-                if(!PackagePrefixChecker
-                   .hasOffendingPrefix(PackagePrefixChecker
-                                       .withoutPackagePrefix(className))){
-                    loadedClass = Util.loadClass
-                        (PackagePrefixChecker.withoutPackagePrefix(className),
-                         remoteCodebase,
-                         loader);
-                } else {
-                    loadedClass = Util.loadClass
-                        (className,
-                         remoteCodebase,
-                         loader);
-                }
-            } catch (ClassNotFoundException cnfe) {
-                loadedClass = Util.loadClass
-                    (className,
-                     remoteCodebase,
-                     loader);
-            }
-            if (expectedType == null)
-                return loadedClass;
-        } catch (ClassNotFoundException cnfe) {
-            if (expectedType == null)
-                throw cnfe;
-        }
-
-        // If no class was not loaded, or if the loaded class is not of the
-        // correct type, make a further attempt to load the correct class
-        // using the classloader of the expected type.
-        // _REVISIT_ Is this step necessary, or should the Util,loadClass
-        // algorithm always produce a valid class if the setup is correct?
-        // Does the OMG standard algorithm need to be changed to include
-        // this step?
-        if (loadedClass == null || !expectedType.isAssignableFrom(loadedClass)) {
-            if (expectedType.getClassLoader() != expectedTypeClassLoader)
-                throw new IllegalArgumentException("expectedTypeClassLoader not class loader of expectedType.");
-
-            if (expectedTypeClassLoader != null)
-                loadedClass = expectedTypeClassLoader.loadClass(className);
-            else
-                loadedClass = ORBClassLoader.loadClass(className);
-        }
-
-        return loadedClass;
-    }
-
-    /**
-     * Checks to see if the FullValueDescription should be retrieved.
-     * @exception Throws IOException if suids do not match or if the repositoryID
-     * is not an RMIValueType
-     */
-    public static boolean useFullValueDescription(Class clazz, String repositoryID)
-        throws IOException{
-
-        String clazzRepIDStr = createForAnyType(clazz);
-
-        if (clazzRepIDStr.equals(repositoryID))
-            return false;
-
-        RepositoryId_1_3 targetRepid;
-        RepositoryId_1_3 clazzRepid;
-
-        synchronized(cache) {
-        // to avoid race condition where multiple threads could be
-        // accessing this method, and their access to the cache may
-        // be interleaved giving unexpected results
-
-            targetRepid = cache.getId(repositoryID);
-            clazzRepid = cache.getId(clazzRepIDStr);
-        }
-
-        if ((targetRepid.isRMIValueType()) && (clazzRepid.isRMIValueType())){
-            if (!targetRepid.getSerialVersionUID().equals(clazzRepid.getSerialVersionUID())) {
-
-                String mssg = "Mismatched serialization UIDs : Source (Rep. ID" +
-                    clazzRepid + ") = " +
-                    clazzRepid.getSerialVersionUID() + " whereas Target (Rep. ID " + repositoryID +
-                    ") = " + targetRepid.getSerialVersionUID();
-                throw new IOException(mssg);
-            } else {
-                return true;
-            }
-        } else {
-
-            throw new IOException("The repository ID is not of an RMI value type (Expected ID = " + clazzRepIDStr + "; Received ID = " + repositoryID +")");
-        }
-    }
-}
diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryId_1_3_1.java b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryId_1_3_1.java
deleted file mode 100644
index 8c1ab6e7390..00000000000
--- a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryId_1_3_1.java
+++ /dev/null
@@ -1,1065 +0,0 @@
-/*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- */
-package com.sun.corba.se.impl.orbutil;
-
-import java.util.StringTokenizer;
-import java.util.Hashtable;
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import org.omg.CORBA.portable.ValueBase;
-import org.omg.CORBA.portable.IDLEntity;
-
-//d11638 files in the same package, therefore remove their reference
-//import com.sun.corba.se.impl.util.JDKBridge;
-//import com.sun.corba.se.impl.util.IdentityHashtable;
-import com.sun.corba.se.impl.util.JDKBridge;
-import com.sun.corba.se.impl.util.Utility;
-import com.sun.corba.se.impl.util.PackagePrefixChecker;
-import com.sun.corba.se.impl.util.IdentityHashtable;
-
-import javax.rmi.CORBA.Util;
-
-/**
- * Because all methods in RepositoryId are static, we have
- * to duplicate all of this code, freezing it in its 1.3.1
- * form for backwards compatibility.
- *
- * For security reasons, we can't expose enough of
- * io/ObjectStreamClass, so it has to be duplicated in
- * orbutil.
- */
-public class RepositoryId_1_3_1 {
-
-    // Legal IDL Identifier characters (1 = legal). Note
-    // that '.' (2E) is marked as legal even though it is
-    // not legal in IDL. This allows us to treat a fully
-    // qualified Java name with '.' package separators
-    // uniformly, and is safe because that is the only
-    // legal use of '.' in a Java name.
-
-    private static final byte[] IDL_IDENTIFIER_CHARS = {
-
-        // 0 1 2 3  4 5 6 7  8 9 a b  c d e f
-        0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // 00-0f
-        0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // 10-1f
-        0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,1,0, // 20-2f
-        1,1,1,1, 1,1,1,1, 1,1,0,0, 0,0,0,0, // 30-3f
-        0,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, // 40-4f
-        1,1,1,1, 1,1,1,1, 1,1,1,0, 0,0,0,1, // 50-5f
-        0,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, // 60-6f
-        1,1,1,1, 1,1,1,1, 1,1,1,0, 0,0,0,0, // 70-7f
-        0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // 80-8f
-        0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // 90-9f
-        0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // a0-af
-        0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, // b0-bf
-        1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, // c0-cf
-        0,1,1,1, 1,1,1,0, 1,1,1,1, 1,0,0,1, // d0-df
-        1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, // e0-ef
-        0,1,1,1, 1,1,1,0, 1,1,1,1, 1,0,0,1, // f0-ff
-    };
-
-
-    private static final long serialVersionUID = 123456789L;
-
-    private static String defaultServerURL = null;
-    private static boolean useCodebaseOnly = false;
-
-    static {
-        if (defaultServerURL == null)
-            defaultServerURL = (String)JDKBridge.getLocalCodebase();
-        useCodebaseOnly = JDKBridge.useCodebaseOnly();
-
-    }
-
-    private static IdentityHashtable classToRepStr = new IdentityHashtable();
-    private static IdentityHashtable classIDLToRepStr = new IdentityHashtable();
-    private static IdentityHashtable classSeqToRepStr = new IdentityHashtable();
-
-    private static IdentityHashtable repStrToByteArray = new IdentityHashtable();
-    private static Hashtable repStrToClass = new Hashtable();
-
-    private String repId = null;
-    private boolean isSupportedFormat = true;
-    private String typeString = null;
-    private String versionString = null;
-    private boolean isSequence = false;
-    private boolean isRMIValueType = false;
-    private boolean isIDLType = false;
-    private String completeClassName = null;
-    private String unqualifiedName = null;
-    private String definedInId = null;
-    private Class clazz = null;
-    private String suid = null, actualSuid = null;
-    private long suidLong = ObjectStreamClass_1_3_1.kDefaultUID, actualSuidLong = ObjectStreamClass_1_3_1.kDefaultUID;
-
-    // Repository ID fragments
-    private static final String kSequenceKeyword = "seq";
-    private static final String kValuePrefix = "RMI:";
-    private static final String kIDLPrefix = "IDL:";
-    private static final String kIDLNamePrefix = "omg.org/";
-    private static final String kIDLClassnamePrefix = "org.omg.";
-    private static final String kSequencePrefix = "[";
-    private static final String kCORBAPrefix = "CORBA/";
-    private static final String kArrayPrefix = kValuePrefix + kSequencePrefix + kCORBAPrefix;
-    private static final int kValuePrefixLength = kValuePrefix.length();
-    private static final int kIDLPrefixLength = kIDLPrefix.length();
-    private static final int kSequencePrefixLength = kSequencePrefix.length();
-    private static final String kInterfaceHashCode = ":0000000000000000";
-    private static final String kInterfaceOnlyHashStr = "0000000000000000";
-    private static final String kExternalizableHashStr = "0000000000000001";
-
-    // Value tag utility methods and constants
-    public static final int kInitialValueTag= 0x7fffff00;
-    public static final int kNoTypeInfo = 0;
-    public static final int kSingleRepTypeInfo = 0x02;
-    public static final int  kPartialListTypeInfo = 0x06;
-    public static final int  kChunkedMask = 0x08;
-    public static final int kPreComputed_StandardRMIUnchunked = RepositoryId_1_3_1.computeValueTag(false, RepositoryId_1_3_1.kSingleRepTypeInfo, false);
-    public static final int kPreComputed_CodeBaseRMIUnchunked = RepositoryId_1_3_1.computeValueTag(true, RepositoryId_1_3_1.kSingleRepTypeInfo, false);
-    public static final int kPreComputed_StandardRMIChunked = RepositoryId_1_3_1.computeValueTag(false, RepositoryId_1_3_1.kSingleRepTypeInfo, true);
-    public static final int kPreComputed_CodeBaseRMIChunked = RepositoryId_1_3_1.computeValueTag(true, RepositoryId_1_3_1.kSingleRepTypeInfo, true);
-
-    public static final int kPreComputed_StandardRMIUnchunked_NoRep = RepositoryId_1_3_1.computeValueTag(false, RepositoryId_1_3_1.kNoTypeInfo, false);
-    public static final int kPreComputed_CodeBaseRMIUnchunked_NoRep = RepositoryId_1_3_1.computeValueTag(true, RepositoryId_1_3_1.kNoTypeInfo, false);
-    public static final int kPreComputed_StandardRMIChunked_NoRep = RepositoryId_1_3_1.computeValueTag(false, RepositoryId_1_3_1.kNoTypeInfo, true);
-    public static final int kPreComputed_CodeBaseRMIChunked_NoRep = RepositoryId_1_3_1.computeValueTag(true, RepositoryId_1_3_1.kNoTypeInfo, true);
-
-    // Public, well known repository IDs
-
-    // _REVISIT_ : A table structure with a good search routine for all of this
-    // would be more efficient and easier to maintain...
-
-    // String
-    public static final String kWStringValueVersion = "1.0";
-    public static final String kWStringValueHash = ":"+kWStringValueVersion;
-    public static final String kWStringStubValue = "WStringValue";
-    public static final String kWStringTypeStr = "omg.org/CORBA/"+kWStringStubValue;
-    public static final String kWStringValueRepID = kIDLPrefix + kWStringTypeStr + kWStringValueHash;
-
-    // Any
-    public static final String kAnyRepID = kIDLPrefix + "omg.org/CORBA/Any";
-
-    // Class
-    // Anita4: convert to uppercase
-    public static final String kClassDescValueHash = ":" +
-       Long.toHexString(
-       ObjectStreamClass_1_3_1.getActualSerialVersionUID(javax.rmi.CORBA.ClassDesc.class)).toUpperCase() + ":" +
-      Long.toHexString(
-       ObjectStreamClass_1_3_1.getSerialVersionUID(javax.rmi.CORBA.ClassDesc.class)).toUpperCase();
-    public static final String kClassDescStubValue = "ClassDesc";
-    public static final String kClassDescTypeStr = "javax.rmi.CORBA."+kClassDescStubValue;
-    public static final String kClassDescValueRepID = kValuePrefix + kClassDescTypeStr + kClassDescValueHash;
-
-    // Object
-    public static final String kObjectValueHash = ":1.0";
-    public static final String kObjectStubValue = "Object";
-
-    // Sequence
-    public static final String kSequenceValueHash = ":1.0";
-    public static final String kPrimitiveSequenceValueHash = ":0000000000000000";
-
-    // Serializable
-    public static final String kSerializableValueHash = ":1.0";
-    public static final String kSerializableStubValue = "Serializable";
-
-    // Externalizable
-    public static final String kExternalizableValueHash = ":1.0";
-    public static final String kExternalizableStubValue = "Externalizable";
-
-    // Remote (The empty string is used for java.rmi.Remote)
-    public static final String kRemoteValueHash = "";
-    public static final String kRemoteStubValue = "";
-    public static final String kRemoteTypeStr = "";
-    public static final String kRemoteValueRepID = "";
-
-    private static final Hashtable kSpecialArrayTypeStrings = new Hashtable();
-
-    static {
-        kSpecialArrayTypeStrings.put("CORBA.WStringValue", new StringBuffer(java.lang.String.class.getName()));
-        kSpecialArrayTypeStrings.put("javax.rmi.CORBA.ClassDesc", new StringBuffer(java.lang.Class.class.getName()));
-        kSpecialArrayTypeStrings.put("CORBA.Object", new StringBuffer(java.rmi.Remote.class.getName()));
-
-    }
-
-    private static final Hashtable kSpecialCasesRepIDs = new Hashtable();
-
-    static {
-        kSpecialCasesRepIDs.put(java.lang.String.class, kWStringValueRepID);
-        kSpecialCasesRepIDs.put(java.lang.Class.class, kClassDescValueRepID);
-        kSpecialCasesRepIDs.put(java.rmi.Remote.class, kRemoteValueRepID);
-    }
-
-    private static final Hashtable kSpecialCasesStubValues = new Hashtable();
-
-    static {
-        kSpecialCasesStubValues.put(java.lang.String.class, kWStringStubValue);
-        kSpecialCasesStubValues.put(java.lang.Class.class, kClassDescStubValue);
-        kSpecialCasesStubValues.put(java.lang.Object.class, kObjectStubValue);
-        kSpecialCasesStubValues.put(java.io.Serializable.class, kSerializableStubValue);
-        kSpecialCasesStubValues.put(java.io.Externalizable.class, kExternalizableStubValue);
-        kSpecialCasesStubValues.put(java.rmi.Remote.class, kRemoteStubValue);
-    }
-
-
-    private static final Hashtable kSpecialCasesVersions = new Hashtable();
-
-    static {
-        kSpecialCasesVersions.put(java.lang.String.class, kWStringValueHash);
-        kSpecialCasesVersions.put(java.lang.Class.class, kClassDescValueHash);
-        kSpecialCasesVersions.put(java.lang.Object.class, kObjectValueHash);
-        kSpecialCasesVersions.put(java.io.Serializable.class, kSerializableValueHash);
-        kSpecialCasesVersions.put(java.io.Externalizable.class, kExternalizableValueHash);
-        kSpecialCasesVersions.put(java.rmi.Remote.class, kRemoteValueHash);
-    }
-
-    private static final Hashtable kSpecialCasesClasses = new Hashtable();
-
-    static {
-        kSpecialCasesClasses.put(kWStringTypeStr, java.lang.String.class);
-        kSpecialCasesClasses.put(kClassDescTypeStr, java.lang.Class.class);
-        kSpecialCasesClasses.put(kRemoteTypeStr, java.rmi.Remote.class);
-
-        kSpecialCasesClasses.put("org.omg.CORBA.WStringValue", java.lang.String.class);
-        kSpecialCasesClasses.put("javax.rmi.CORBA.ClassDesc", java.lang.Class.class);
-        //kSpecialCasesClasses.put(kRemoteTypeStr, java.rmi.Remote.class);
-    }
-
-    private static final Hashtable kSpecialCasesArrayPrefix = new Hashtable();
-
-    static {
-        kSpecialCasesArrayPrefix.put(java.lang.String.class, kValuePrefix + kSequencePrefix + kCORBAPrefix);
-        kSpecialCasesArrayPrefix.put(java.lang.Class.class, kValuePrefix + kSequencePrefix + "javax/rmi/CORBA/");
-        kSpecialCasesArrayPrefix.put(java.lang.Object.class, kValuePrefix + kSequencePrefix + "java/lang/");
-        kSpecialCasesArrayPrefix.put(java.io.Serializable.class, kValuePrefix + kSequencePrefix + "java/io/");
-        kSpecialCasesArrayPrefix.put(java.io.Externalizable.class, kValuePrefix + kSequencePrefix + "java/io/");
-        kSpecialCasesArrayPrefix.put(java.rmi.Remote.class, kValuePrefix + kSequencePrefix + kCORBAPrefix);
-    }
-
-    private static final Hashtable kSpecialPrimitives = new Hashtable();
-
-    static {
-        kSpecialPrimitives.put("int","long");
-        kSpecialPrimitives.put("long","longlong");
-        kSpecialPrimitives.put("byte","octet");
-    }
-
-    /**
-     * Used to convert ascii to hex.
-     */
-    private static final byte ASCII_HEX[] =     {
-        (byte)'0',
-        (byte)'1',
-        (byte)'2',
-        (byte)'3',
-        (byte)'4',
-        (byte)'5',
-        (byte)'6',
-        (byte)'7',
-        (byte)'8',
-        (byte)'9',
-        (byte)'A',
-        (byte)'B',
-        (byte)'C',
-        (byte)'D',
-        (byte)'E',
-        (byte)'F',
-    };
-
-
-    // bug fix for 4328952; to eliminate possibility of overriding this
-    // in a subclass.
-    public static final RepositoryIdCache_1_3_1 cache = new RepositoryIdCache_1_3_1();
-
-    // Interface Rep ID Strings
-    public static final String kjava_rmi_Remote = createForAnyType(java.rmi.Remote.class);
-    public static final String korg_omg_CORBA_Object = createForAnyType(org.omg.CORBA.Object.class);
-
-    // Dummy arguments for getIdFromHelper method
-    public static final Class kNoParamTypes[] ={};
-    public static final Object kNoArgs[] = {};
-
-
-    // To create a RepositoryID, use code similar to the following:
-    // RepositoryId.cache.getId( id );
-
-    RepositoryId_1_3_1(){}
-
-    RepositoryId_1_3_1(String aRepId){
-        init(aRepId);
-    }
-
-    RepositoryId_1_3_1 init(String aRepId){
-
-        this.repId = aRepId;
-
-        // Special case for remote
-        if (aRepId.length() == 0) {
-            clazz = java.rmi.Remote.class;
-            typeString = "";
-            isRMIValueType = true;
-            suid = kInterfaceOnlyHashStr;
-            return this;
-        }
-        else if (aRepId.equals(kWStringValueRepID)) {
-            clazz = java.lang.String.class;
-            typeString = kWStringTypeStr;
-            isIDLType = true;
-            // fix where Attempting to obtain a FullValueDescription
-            // for an RMI value type with a String field causes an exception.
-            completeClassName = "java.lang.String";
-            versionString = kWStringValueVersion;
-            return this;
-        }
-        else {
-
-        String repId = convertFromISOLatin1(aRepId);
-
-        versionString = repId.substring(repId.indexOf(':', repId.indexOf(':')+1));
-        if (repId.startsWith(kIDLPrefix)) {
-            typeString =
-                repId.substring(kIDLPrefixLength, repId.indexOf(':', kIDLPrefixLength));
-            isIDLType = true;
-            if (typeString.startsWith(kIDLNamePrefix))
-                completeClassName = kIDLClassnamePrefix +
-                    typeString.substring(kIDLNamePrefix.length()).replace('/','.');
-            else completeClassName = typeString.replace('/','.');
-
-        }
-        else if (repId.startsWith(kValuePrefix)) {
-            typeString =
-                repId.substring(kValuePrefixLength, repId.indexOf(':', kValuePrefixLength));
-            isRMIValueType = true;
-
-            if (versionString.indexOf('.') == -1) {
-                    actualSuid = versionString.substring(1);
-                    suid = actualSuid;  // default if not explicitly specified
-
-                    if (actualSuid.indexOf(':') != -1){
-                    // we have a declared hash also
-                        int pos = actualSuid.indexOf(':')+1;
-                        // actualSuid = suid.substring(pos);
-                        // suid = suid.substring(0, pos-1);
-                        suid = actualSuid.substring(pos);
-                        actualSuid = actualSuid.substring(0, pos-1);
-                }
-
-            }
-            else {
-                    // _REVISIT_ : Special case version failure ?
-            }
-        }
-        else isSupportedFormat = false;
-
-        if (typeString.startsWith(kSequencePrefix)) {
-            isSequence = true;
-        }
-
-
-        return this;
-    }
-    }
-
-    public final String getUnqualifiedName() {
-        if (unqualifiedName == null){
-            String className = getClassName();
-            int index = className.lastIndexOf('.');
-            if (index == -1){
-                unqualifiedName = className;
-                definedInId = "IDL::1.0";
-            }
-            else {
-                unqualifiedName = className.substring(index);
-                definedInId = "IDL:" + className.substring(0, index).replace('.','/') + ":1.0";
-            }
-        }
-
-        return unqualifiedName;
-    }
-
-    public final String getDefinedInId() {
-        if (definedInId == null){
-            getUnqualifiedName();
-        }
-
-        return definedInId;
-    }
-
-    public final String getTypeString() {
-        return typeString;
-    }
-
-    public final String getVersionString() {
-        return versionString;
-    }
-
-    public final String getSerialVersionUID() {
-        return suid;
-    }
-
-    public final String getActualSerialVersionUID() {
-        return actualSuid;
-    }
-    public final long getSerialVersionUIDAsLong() {
-        return suidLong;
-    }
-
-    public final long getActualSerialVersionUIDAsLong() {
-        return actualSuidLong;
-    }
-
-    public final boolean isRMIValueType() {
-        return isRMIValueType;
-    }
-
-    public final boolean isIDLType() {
-        return isIDLType;
-    }
-
-    public final String getRepositoryId() {
-        return repId;
-    }
-
-    public static byte[] getByteArray(String repStr) {
-        synchronized (repStrToByteArray){
-            return (byte[]) repStrToByteArray.get(repStr);
-        }
-    }
-
-    public static void setByteArray(String repStr, byte[] repStrBytes) {
-        synchronized (repStrToByteArray){
-            repStrToByteArray.put(repStr, repStrBytes);
-        }
-    }
-
-    public final boolean isSequence() {
-        return isSequence;
-    }
-
-    public final boolean isSupportedFormat() {
-        return isSupportedFormat;
-    }
-
-
-    // This method will return the classname from the typestring OR if the classname turns out to be
-    // a special class "pseudo" name, then the matching real classname is returned.
-    public final String getClassName() {
-
-        if (isRMIValueType)
-            return typeString;
-        else if (isIDLType)
-            return completeClassName;
-        else return null;
-
-    }
-
-    // This method calls getClazzFromType() and falls back to the repStrToClass
-    // cache if no class was found.  It's used where any class matching the
-    // given repid is an acceptable result.
-    public final Class getAnyClassFromType() throws ClassNotFoundException {
-        try {
-            return getClassFromType();
-        } catch (ClassNotFoundException cnfe) {
-            Class clz = (Class)repStrToClass.get(repId);
-            if (clz != null)
-                return clz;
-            else
-                throw cnfe;
-        }
-    }
-
-    public final Class getClassFromType()
-        throws ClassNotFoundException {
-        if (clazz != null)
-            return clazz;
-
-        Class specialCase = (Class)kSpecialCasesClasses.get(getClassName());
-
-        if (specialCase != null){
-            clazz = specialCase;
-            return specialCase;
-        }
-        else
-            {
-                try{
-                    return Util.loadClass(getClassName(), null, null);
-                }
-                catch(ClassNotFoundException cnfe){
-                    if (defaultServerURL != null) {
-                        try{
-                            return getClassFromType(defaultServerURL);
-                        }
-                        catch(MalformedURLException mue){
-                            throw cnfe;
-                        }
-                    }
-                    else throw cnfe;
-                }
-            }
-
-    }
-
-    public final Class getClassFromType(Class expectedType, String codebase)
-        throws ClassNotFoundException {
-        if (clazz != null)
-            return clazz;
-
-        Class specialCase = (Class)kSpecialCasesClasses.get(getClassName());
-
-        if (specialCase != null){
-            clazz = specialCase;
-            return specialCase;
-        } else {
-            ClassLoader expectedTypeClassLoader = (expectedType == null ? null : expectedType.getClassLoader());
-            return loadClassOfType(getClassName(),
-                                   codebase,
-                                   expectedTypeClassLoader,
-                                   expectedType,
-                                   expectedTypeClassLoader);
-        }
-
-    }
-
-    public final Class getClassFromType(String url)
-        throws ClassNotFoundException, MalformedURLException {
-        return Util.loadClass(getClassName(), url, null);
-    }
-
-    public final String toString() {
-        return repId;
-    }
-
-    /**
-     * Checks to see if the FullValueDescription should be retrieved.
-     * @exception Throws IOException if suids do not match or if the repositoryID
-     * is not an RMIValueType
-     */
-    public static boolean useFullValueDescription(Class clazz, String repositoryID)
-        throws IOException{
-
-        String clazzRepIDStr = createForAnyType(clazz);
-
-        if (clazzRepIDStr.equals(repositoryID))
-            return false;
-
-        RepositoryId_1_3_1 targetRepid;
-        RepositoryId_1_3_1 clazzRepid;
-
-        synchronized(cache) {
-        // to avoid race condition where multiple threads could be
-        // accessing this method, and their access to the cache may
-        // be interleaved giving unexpected results
-
-            targetRepid = cache.getId(repositoryID);
-            clazzRepid = cache.getId(clazzRepIDStr);
-        }
-        //ObjectStreamClass osc = ObjectStreamClass.lookup(clazz);
-
-        if ((targetRepid.isRMIValueType()) && (clazzRepid.isRMIValueType())){
-            if (!targetRepid.getSerialVersionUID().equals(clazzRepid.getSerialVersionUID())) {
-
-                String mssg = "Mismatched serialization UIDs : Source (Rep. ID" +
-                    clazzRepid + ") = " +
-                    clazzRepid.getSerialVersionUID() + " whereas Target (Rep. ID " + repositoryID +
-                    ") = " + targetRepid.getSerialVersionUID();
-                                //com.sun.corba.se.impl.io.ValueUtility.log("RepositoryId",mssg);
-                throw new IOException(mssg);
-        }
-            else {
-                return true;
-            }
-        }
-        else {
-
-            throw new IOException("The repository ID is not of an RMI value type (Expected ID = " + clazzRepIDStr + "; Received ID = " + repositoryID +")");
-    }
-    }
-
-    private static String createHashString(java.io.Serializable ser) {
-
-        return createHashString(ser.getClass());
-    }
-
-    private static String createHashString(java.lang.Class clazz) {
-
-        if (clazz.isInterface() || !java.io.Serializable.class.isAssignableFrom(clazz))
-            return kInterfaceHashCode;
-
-        //ObjectStreamClass osc = ObjectStreamClass.lookup(clazz);
-
-        long actualLong = ObjectStreamClass_1_3_1.getActualSerialVersionUID(clazz);
-        String hash = null;
-        if (actualLong == 0)
-            hash = kInterfaceOnlyHashStr;
-        else if (actualLong == 1)
-            hash = kExternalizableHashStr;
-        else
-            hash = Long.toHexString(actualLong).toUpperCase();
-        while(hash.length() < 16){
-            hash = "0" + hash;
-        }
-
-        long declaredLong = ObjectStreamClass_1_3_1.getSerialVersionUID(clazz);
-        String declared = null;
-        if (declaredLong == 0)
-            declared = kInterfaceOnlyHashStr;
-        else if (declaredLong == 1)
-            declared = kExternalizableHashStr;
-        else
-            declared = Long.toHexString(declaredLong).toUpperCase();
-        while (declared.length() < 16){
-            declared = "0" + declared;
-    }
-        hash = hash + ":" + declared;
-
-        return ":" + hash;
-    }
-
-    /**
-     * Creates a repository ID for a sequence.  This is for expert users only as
-     * this method assumes the object passed is an array.  If passed an object
-     * that is not an array, it will produce a rep id for a sequence of zero
-     * length.  This would be an error.
-     * @param ser The Java object to create a repository ID for
-     **/
-    public static String createSequenceRepID(java.lang.Object ser){
-        return createSequenceRepID(ser.getClass());
-    }
-
-    /**
-     * Creates a repository ID for a sequence.  This is for expert users only as
-     * this method assumes the object passed is an array.  If passed an object
-     * that is not an array, it will produce a malformed rep id.
-     * @param clazz The Java class to create a repository ID for
-     **/
-    public static String createSequenceRepID(java.lang.Class clazz){
-        synchronized (classSeqToRepStr){
-
-        String repid = (String)classSeqToRepStr.get(clazz);
-        if (repid != null)
-            return repid;
-
-        Class originalClazz = clazz;
-
-        Class type = null;
-        int numOfDims = 0;
-
-        while ((type = clazz.getComponentType()) != null) {
-            numOfDims++;
-            clazz = type;
-        }
-
-        if (clazz.isPrimitive())
-            repid = kValuePrefix + originalClazz.getName() + kPrimitiveSequenceValueHash;
-        else {
-            StringBuffer buf = new StringBuffer();
-            buf.append(kValuePrefix);
-            while(numOfDims-- > 0) {
-                buf.append("[");
-            }
-            buf.append("L");
-            buf.append(convertToISOLatin1(clazz.getName()));
-            buf.append(";");
-            buf.append(createHashString(clazz));
-            repid = buf.toString();
-        }
-        classSeqToRepStr.put(originalClazz,repid);
-        return repid;
-        }
-
-    }
-
-
-    public static String createForSpecialCase(java.lang.Class clazz){
-        if (clazz.isArray()){
-            return createSequenceRepID(clazz);
-        }
-        else {
-            return (String)kSpecialCasesRepIDs.get(clazz);
-        }
-    }
-
-    public static String createForSpecialCase(java.io.Serializable ser){
-        Class clazz = ser.getClass();
-        if (clazz.isArray()){
-            return createSequenceRepID(ser);
-        }
-        else
-            return createForSpecialCase(clazz);
-    }
-
-    /**
-     * Creates a repository ID for a normal Java Type.
-     * @param ser The Java object to create a repository ID for
-     * @exception com.sun.corba.se.impl.io.TypeMismatchException if ser implements the
-     * org.omg.CORBA.portable.IDLEntity interface which indicates it is an IDL Value type.
-     **/
-    public static String createForJavaType(java.io.Serializable ser)
-        throws com.sun.corba.se.impl.io.TypeMismatchException
-    {
-        synchronized (classToRepStr) {
-        String repid = createForSpecialCase(ser);
-        if (repid != null)
-            return repid;
-        Class clazz = ser.getClass();
-        repid = (String)classToRepStr.get(clazz);
-
-        if (repid != null)
-            return repid;
-
-        repid = kValuePrefix + convertToISOLatin1(clazz.getName()) +
-            createHashString(clazz);
-
-        classToRepStr.put(clazz, repid);
-            repStrToClass.put(repid, clazz);
-        return repid;
-    }
-    }
-
-    /**
-     * Creates a repository ID for a normal Java Type.
-     * @param clz The Java class to create a repository ID for
-     * @exception com.sun.corba.se.impl.io.TypeMismatchException if ser implements the
-     * org.omg.CORBA.portable.IDLEntity interface which indicates it is an IDL Value type.
-     **/
-    public static String createForJavaType(Class clz)
-        throws com.sun.corba.se.impl.io.TypeMismatchException
-    {
-        synchronized (classToRepStr){
-        String repid = createForSpecialCase(clz);
-        if (repid != null)
-            return repid;
-
-        repid = (String)classToRepStr.get(clz);
-        if (repid != null)
-            return repid;
-
-        repid = kValuePrefix + convertToISOLatin1(clz.getName()) +
-            createHashString(clz);
-
-        classToRepStr.put(clz, repid);
-            repStrToClass.put(repid, clz);
-        return repid;
-    }
-    }
-
-    /**
-     * Creates a repository ID for an IDL Java Type.
-     * @param ser The IDL Value object to create a repository ID for
-     * @param major The major version number
-     * @param minor The minor version number
-     * @exception com.sun.corba.se.impl.io.TypeMismatchException if ser does not implement the
-     * org.omg.CORBA.portable.IDLEntity interface which indicates it is an IDL Value type.
-     **/
-    public static String createForIDLType(Class ser, int major, int minor)
-        throws com.sun.corba.se.impl.io.TypeMismatchException
-    {
-        synchronized (classIDLToRepStr){
-        String repid = (String)classIDLToRepStr.get(ser);
-        if (repid != null)
-            return repid;
-
-        repid = kIDLPrefix + convertToISOLatin1(ser.getName()).replace('.','/') +
-            ":" + major + "." + minor;
-        classIDLToRepStr.put(ser, repid);
-        return repid;
-    }
-    }
-
-    private static String getIdFromHelper(Class clazz){
-        try {
-            Class helperClazz = Utility.loadClassForClass(clazz.getName()+"Helper", null,
-                                    clazz.getClassLoader(), clazz, clazz.getClassLoader());
-            Method idMethod = helperClazz.getDeclaredMethod("id", kNoParamTypes);
-            return (String)idMethod.invoke(null, kNoArgs);
-        }
-        catch(java.lang.ClassNotFoundException cnfe)
-            {
-                throw new org.omg.CORBA.MARSHAL(cnfe.toString());
-            }
-        catch(java.lang.NoSuchMethodException nsme)
-            {
-                throw new org.omg.CORBA.MARSHAL(nsme.toString());
-            }
-        catch(java.lang.reflect.InvocationTargetException ite)
-            {
-                throw new org.omg.CORBA.MARSHAL(ite.toString());
-            }
-        catch(java.lang.IllegalAccessException iae)
-            {
-                throw new org.omg.CORBA.MARSHAL(iae.toString());
-    }
-    }
-
-    /**
-     * Createa a repository ID for the type if it is either a java type
-     * or an IDL type.
-     * @param type The type to create rep. id for
-     * @return The rep. id.
-     **/
-    public static String createForAnyType(Class type) {
-        try{
-            if (type.isArray())
-                return createSequenceRepID(type);
-            else if (IDLEntity.class.isAssignableFrom(type))
-                {
-                    try{
-                        return getIdFromHelper(type);
-                    }
-                    catch(Throwable t) {
-                        return createForIDLType(type, 1, 0);
-                    }
-                }
-            else return createForJavaType(type);
-        }
-        catch(com.sun.corba.se.impl.io.TypeMismatchException e){
-            return null;
-        }
-
-    }
-
-    public static boolean isAbstractBase(Class clazz) {
-        return (clazz.isInterface() &&
-                IDLEntity.class.isAssignableFrom(clazz) &&
-                (!ValueBase.class.isAssignableFrom(clazz)) &&
-                (!org.omg.CORBA.Object.class.isAssignableFrom(clazz)));
-
-    }
-
-    public static boolean isAnyRequired(Class clazz) {
-        return ((clazz == java.lang.Object.class) ||
-                (clazz == java.io.Serializable.class) ||
-                (clazz == java.io.Externalizable.class));
-    }
-
-    public static long fromHex(String hexNumber) {
-        if (hexNumber.startsWith("0x"))
-            return Long.valueOf(hexNumber.substring(2), 16).longValue();
-        else return Long.valueOf(hexNumber, 16).longValue();
-    }
-
-    /**
-     * Convert strings with illegal IDL identifier characters.
-     * <p>
-     * Section 5.5.7 of OBV spec.
-     */
-    private static String convertToISOLatin1 (String name) {
-
-        int length = name.length();
-        if (length == 0) {
-            return name;
-        }
-        StringBuffer buffer = null;
-
-        for (int i = 0; i < length; i++) {
-
-            char c = name.charAt(i);
-
-            if (c > 255 || IDL_IDENTIFIER_CHARS[c] == 0) {
-
-                // We gotta convert. Have we already started?
-
-                if (buffer == null) {
-
-                    // No, so get set up...
-
-                    buffer = new StringBuffer(name.substring(0,i));
-                }
-
-                // Convert the character into the IDL escape syntax...
-                buffer.append(
-                              "\\U" +
-                              (char)ASCII_HEX[(c & 0xF000) >>> 12] +
-                              (char)ASCII_HEX[(c & 0x0F00) >>> 8] +
-                              (char)ASCII_HEX[(c & 0x00F0) >>> 4] +
-                              (char)ASCII_HEX[(c & 0x000F)]);
-
-            } else {
-                if (buffer != null) {
-                    buffer.append(c);
-                }
-            }
-        }
-
-        if (buffer != null) {
-            name = buffer.toString();
-        }
-
-        return name;
-    }
-
-    /**
-     * Convert strings with ISO Latin 1 escape sequences back to original strings.
-     * <p>
-     * Section 5.5.7 of OBV spec.
-     */
-    private static String convertFromISOLatin1 (String name) {
-
-        int index = -1;
-        StringBuffer buf = new StringBuffer(name);
-
-        while ((index = buf.toString().indexOf("\\U")) != -1){
-            String str = "0000" + buf.toString().substring(index+2, index+6);
-
-            // Convert Hexadecimal
-            byte[] buffer = new byte[(str.length() - 4) / 2];
-            for (int i=4, j=0; i < str.length(); i +=2, j++) {
-                buffer[j] = (byte)((ORBUtility.hexOf(str.charAt(i)) << 4) & 0xF0);
-                buffer[j] |= (byte)((ORBUtility.hexOf(str.charAt(i+1)) << 0) & 0x0F);
-            }
-            buf = new StringBuffer(delete(buf.toString(), index, index+6));
-            buf.insert(index, (char)buffer[1]);
-        }
-
-        return buf.toString();
-
-
-    }
-
-    private static String delete(String str, int from, int to)
-    {
-        return str.substring(0, from) + str.substring(to, str.length());
-    }
-
-    private static String replace(String target, String arg, String source)
-    {
-        int i = 0;
-        i = target.indexOf(arg);
-
-        while(i != -1)
-            {
-                String left = target.substring(0, i);
-                String right = target.substring(i+arg.length());
-                target = new String(left+source+right);
-                i = target.indexOf(arg);
-            }
-        return target;
-    }
-
-    public static int computeValueTag(boolean codeBasePresent, int typeInfo, boolean chunkedEncoding){
-        int value_tag = kInitialValueTag;
-
-        if (codeBasePresent)
-            value_tag = value_tag | 0x00000001;
-
-        value_tag = value_tag | typeInfo;
-
-        if (chunkedEncoding)
-            value_tag = value_tag | kChunkedMask;
-
-        return value_tag;
-    }
-
-    public static boolean isCodeBasePresent(int value_tag){
-        return ((value_tag & 0x00000001) == 1);
-    }
-
-    public static int getTypeInfo(int value_tag){
-        return (value_tag & 0x00000006);
-    }
-
-    public static boolean isChunkedEncoding(int value_tag){
-        return ((value_tag & kChunkedMask) != 0);
-    }
-
-    public static String getServerURL(){
-        return defaultServerURL;
-    }
-
-    /*
-     * Load a class and check that it is assignable to a given type.
-     * @param className the class name.
-     * @param remoteCodebase the codebase to use. May be null.
-     * @param loader the class loader of last resort. May be null.
-     * @param expectedType the expected type. May be null.
-     * @return the loaded class.
-     */
-    private Class loadClassOfType (String className,
-                                  String remoteCodebase,
-                                  ClassLoader loader,
-                                  Class expectedType,
-                                  ClassLoader expectedTypeClassLoader)
-        throws ClassNotFoundException {
-
-        Class loadedClass = null;
-
-        try {
-            //Sequence finding of the stubs according to spec
-            try{
-                //If-else is put here for speed up of J2EE.
-                //According to the OMG spec, the if clause is not dead code.
-                //It can occur if some compiler has allowed generation
-                //into org.omg.stub hierarchy for non-offending
-                //classes. This will encourage people to
-                //produce non-offending class stubs in their own hierarchy.
-                if(!PackagePrefixChecker
-                   .hasOffendingPrefix(PackagePrefixChecker
-                                       .withoutPackagePrefix(className))){
-                    loadedClass = Util.loadClass
-                        (PackagePrefixChecker.withoutPackagePrefix(className),
-                         remoteCodebase,
-                         loader);
-                } else {
-                    loadedClass = Util.loadClass
-                        (className,
-                         remoteCodebase,
-                         loader);
-                }
-            } catch (ClassNotFoundException cnfe) {
-                loadedClass = Util.loadClass
-                    (className,
-                     remoteCodebase,
-                     loader);
-            }
-            if (expectedType == null)
-                return loadedClass;
-        } catch (ClassNotFoundException cnfe) {
-            if (expectedType == null)
-                throw cnfe;
-        }
-
-        // If no class was not loaded, or if the loaded class is not of the
-        // correct type, make a further attempt to load the correct class
-        // using the classloader of the expected type.
-        // _REVISIT_ Is this step necessary, or should the Util,loadClass
-        // algorithm always produce a valid class if the setup is correct?
-        // Does the OMG standard algorithm need to be changed to include
-        // this step?
-        if (loadedClass == null || !expectedType.isAssignableFrom(loadedClass)) {
-            if (expectedType.getClassLoader() != expectedTypeClassLoader)
-                throw new IllegalArgumentException("expectedTypeClassLoader not class loader of expectedType.");
-
-            if (expectedTypeClassLoader != null)
-                loadedClass = expectedTypeClassLoader.loadClass(className);
-            else
-                loadedClass = Class.forName(className);
-        }
-
-        return loadedClass;
-    }
-}
diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/ValueHandlerImpl_1_3.java b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/ValueHandlerImpl_1_3.java
deleted file mode 100644
index 68b53c32c46..00000000000
--- a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/ValueHandlerImpl_1_3.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-/*
- * Licensed Materials - Property of IBM
- * RMI-IIOP v1.0
- * Copyright IBM Corp. 1998 1999  All Rights Reserved
- *
- */
-
-package com.sun.corba.se.impl.orbutil;
-
-import javax.rmi.CORBA.Util;
-import javax.rmi.PortableRemoteObject;
-
-import java.util.Hashtable;
-import java.util.Stack;
-import java.io.IOException;
-import java.util.EmptyStackException;
-
-import com.sun.corba.se.impl.util.Utility;
-import com.sun.corba.se.impl.io.IIOPInputStream;
-import com.sun.corba.se.impl.io.IIOPOutputStream;
-import com.sun.corba.se.impl.util.RepositoryId;
-import com.sun.corba.se.impl.util.Utility;
-
-import org.omg.CORBA.TCKind;
-import org.omg.CORBA.MARSHAL;
-import org.omg.CORBA.CompletionStatus;
-import org.omg.CORBA.portable.IndirectionException;
-import com.sun.org.omg.SendingContext.CodeBase;
-
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-/**
- * This class overrides behavior of our current ValueHandlerImpl to
- * provide backwards compatibility with JDK 1.3.0.
- */
-public class ValueHandlerImpl_1_3 extends com.sun.corba.se.impl.io.ValueHandlerImpl {
-
-    public ValueHandlerImpl_1_3(){
-        super();
-    }
-
-    public ValueHandlerImpl_1_3(boolean isInputStream) {
-        super(isInputStream);
-    }
-
-    /**
-     * Writes the value to the stream using java semantics.
-     * @param out The stream to write the value to
-     * @param value The value to be written to the stream
-     **/
-    public void writeValue(org.omg.CORBA.portable.OutputStream _out, java.io.Serializable value) {
-        super.writeValue(_out, value);
-    }
-
-    /**
-     * Reads a value from the stream using java semantics.
-     * @param in The stream to read the value from
-     * @param clazz The type of the value to be read in
-     * @param sender The sending context runtime
-     **/
-    public java.io.Serializable readValue(org.omg.CORBA.portable.InputStream _in,
-                                          int offset,
-                                          java.lang.Class clazz,
-                                          String repositoryID,
-                                          org.omg.SendingContext.RunTime _sender)
-    {
-        return super.readValue(_in, offset, clazz, repositoryID, _sender);
-    }
-
-    /**
-     * Returns the repository ID for the given RMI value Class.
-     * @param clz The class to return a repository ID for.
-     * @return the repository ID of the Class.
-     **/
-    public java.lang.String getRMIRepositoryID(java.lang.Class clz) {
-        return RepositoryId_1_3.createForJavaType(clz);
-    }
-
-    /**
-     * Indicates whether the given Class performs custom or
-     * default marshaling.
-     * @param clz The class to test for custom marshaling.
-     * @return True if the class performs custom marshaling, false
-     * if it does not.
-     **/
-    public boolean isCustomMarshaled(java.lang.Class clz) {
-        return super.isCustomMarshaled(clz);
-    }
-
-    /**
-     * Returns the CodeBase for this ValueHandler.  This is used by
-     * the ORB runtime.  The server sends the service context containing
-     * the IOR for this CodeBase on the first GIOP reply.  The clients
-     * do the same on the first GIOP request.
-     * @return the SendingContext.CodeBase of this ValueHandler.
-     **/
-    public org.omg.SendingContext.RunTime getRunTimeCodeBase() {
-        return super.getRunTimeCodeBase();
-    }
-
-    /**
-     * If the value contains a writeReplace method then the result
-     * is returned.  Otherwise, the value itself is returned.
-     * @return the true value to marshal on the wire.
-     **/
-    public java.io.Serializable writeReplace(java.io.Serializable value) {
-        return super.writeReplace(value);
-    }
-
-    // methods supported for backward compatability so that the appropriate
-    // Rep-id calculations take place based on the ORB version
-
-    /**
-     *  Returns a boolean of whether or not RepositoryId indicates
-     *  FullValueDescriptor.
-     *  used for backward compatability
-     */
-
-     public boolean useFullValueDescription(Class clazz, String repositoryID)
-        throws IOException
-
-     {
-        return RepositoryId_1_3.useFullValueDescription(clazz, repositoryID);
-     }
-
-     public String getClassName(String id)
-     {
-        RepositoryId_1_3 repID = RepositoryId_1_3.cache.getId(id);
-        return repID.getClassName();
-     }
-
-     public Class getClassFromType(String id)
-        throws ClassNotFoundException
-     {
-        RepositoryId_1_3 repId = RepositoryId_1_3.cache.getId(id);
-        return repId.getClassFromType();
-     }
-
-     public Class getAnyClassFromType(String id)
-        throws ClassNotFoundException
-     {
-        RepositoryId_1_3 repId = RepositoryId_1_3.cache.getId(id);
-        return repId.getAnyClassFromType();
-     }
-
-     public String createForAnyType(Class cl)
-     {
-        return RepositoryId_1_3.createForAnyType(cl);
-     }
-
-     public String getDefinedInId(String id)
-     {
-        RepositoryId_1_3 repId = RepositoryId_1_3.cache.getId(id);
-        return repId.getDefinedInId();
-     }
-
-     public String getUnqualifiedName(String id)
-     {
-        RepositoryId_1_3 repId = RepositoryId_1_3.cache.getId(id);
-        return repId.getUnqualifiedName();
-     }
-
-     public String getSerialVersionUID(String id)
-     {
-        RepositoryId_1_3 repId = RepositoryId_1_3.cache.getId(id);
-        return repId.getSerialVersionUID();
-     }
-
-     public boolean isAbstractBase(Class clazz)
-     {
-        return RepositoryId_1_3.isAbstractBase(clazz);
-     }
-
-     public boolean isSequence(String id)
-     {
-        RepositoryId_1_3 repId = RepositoryId_1_3.cache.getId(id);
-        return repId.isSequence();
-     }
-
-    /**
-     * Preserves the incorrect 1.3 behavior which truncates Java chars in
-     * arrays to 8-bit CORBA chars.  Bug 4367783.  This enables us to
-     * continue interoperating with our legacy ORBs.  If this goes into
-     * Ladybird, then Ladybird and Kestrel will interoperate as long as
-     * people don't use chars greater than 8-bits.
-     */
-    protected void writeCharArray(org.omg.CORBA_2_3.portable.OutputStream out,
-                                char[] array,
-                                int offset,
-                                int length)
-    {
-        out.write_char_array(array, offset, length);
-    }
-
-    /**
-     * Preserves the incorrect 1.3 behavior which truncates Java chars in
-     * arrays to 8-bit CORBA chars.  Bug 4367783.  This enables us to
-     * continue interoperating with our legacy ORBs.  If this goes into
-     * Ladybird, then Ladybird and Kestrel will interoperate as long as
-     * people don't use chars greater than 8-bits.
-     */
-    protected void readCharArray(org.omg.CORBA_2_3.portable.InputStream in,
-                                 char[] array,
-                                 int offset,
-                                 int length)
-    {
-        in.read_char_array(array, offset, length);
-    }
-
-    protected final String getOutputStreamClassName() {
-        return "com.sun.corba.se.impl.orbutil.IIOPOutputStream_1_3";
-    }
-
-    protected final String getInputStreamClassName() {
-        return "com.sun.corba.se.impl.orbutil.IIOPInputStream_1_3";
-    }
-
-    /**
-     * Our JDK 1.3 and JDK 1.3.1 behavior subclasses override this.
-     * The correct behavior is for a Java char to map to a CORBA wchar,
-     * but our older code mapped it to a CORBA char.
-     */
-    protected TCKind getJavaCharTCKind() {
-        return TCKind.tk_char;
-    }
-}
diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/ValueHandlerImpl_1_3_1.java b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/ValueHandlerImpl_1_3_1.java
deleted file mode 100644
index 7309ec14c5e..00000000000
--- a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/ValueHandlerImpl_1_3_1.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2001, 2002, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.sun.corba.se.impl.orbutil;
-
-import org.omg.CORBA.TCKind;
-
-/**
- * This class overrides behavior of our current ValueHandlerImpl to
- * provide backwards compatibility with JDK 1.3.1.
- */
-public class ValueHandlerImpl_1_3_1
-    extends com.sun.corba.se.impl.io.ValueHandlerImpl
-{
-    public ValueHandlerImpl_1_3_1() {}
-
-    public ValueHandlerImpl_1_3_1(boolean isInputStream) {
-        super(isInputStream);
-    }
-
-    /**
-     * Our JDK 1.3 and JDK 1.3.1 behavior subclasses override this.
-     * The correct behavior is for a Java char to map to a CORBA wchar,
-     * but our older code mapped it to a CORBA char.
-     */
-    protected TCKind getJavaCharTCKind() {
-        return TCKind.tk_char;
-    }
-
-    /**
-     * RepositoryId_1_3_1 performs an incorrect repId calculation
-     * when using serialPersistentFields and one of the fields no longer
-     * exists on the class itself.
-     */
-    public boolean useFullValueDescription(Class clazz, String repositoryID)
-        throws java.io.IOException
-    {
-        return RepositoryId_1_3_1.useFullValueDescription(clazz, repositoryID);
-    }
-
-    /**
-     * Installs the legacy IIOPOutputStream_1_3_1 which does
-     * PutFields/GetFields incorrectly.  Bug 4407244.
-     */
-    protected final String getOutputStreamClassName() {
-        return "com.sun.corba.se.impl.orbutil.IIOPOutputStream_1_3_1";
-    }
-
-    /**
-     * Installs the legacy IIOPInputStream_1_3_1 which does
-     * PutFields/GetFields incorrectly.  Bug 4407244.
-     */
-    protected final String getInputStreamClassName() {
-        return "com.sun.corba.se.impl.orbutil.IIOPInputStream_1_3_1";
-    }
-}
diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/IIOPInputStream_1_3_1.java b/corba/src/share/classes/sun/corba/JavaCorbaAccess.java
similarity index 58%
rename from corba/src/share/classes/com/sun/corba/se/impl/orbutil/IIOPInputStream_1_3_1.java
rename to corba/src/share/classes/sun/corba/JavaCorbaAccess.java
index 1946f5e48e1..046453f2767 100644
--- a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/IIOPInputStream_1_3_1.java
+++ b/corba/src/share/classes/sun/corba/JavaCorbaAccess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,32 +23,10 @@
  * questions.
  */
 
-/*
- */
-package com.sun.corba.se.impl.orbutil;
+package sun.corba;
 
-import java.io.*;
-import java.util.Hashtable;
+import com.sun.corba.se.impl.io.ValueHandlerImpl;
 
-/**
- * Implements legacy behavior from Ladybird to maintain
- * backwards compatibility.
- */
-public class IIOPInputStream_1_3_1 extends com.sun.corba.se.impl.io.IIOPInputStream
-{
-    public IIOPInputStream_1_3_1()
-        throws java.io.IOException {
-        super();
-    }
-
-    /**
-     * Before JDK 1.3.1_01, the PutField/GetField implementation
-     * actually sent a Hashtable.
-     */
-    public ObjectInputStream.GetField readFields()
-        throws IOException, ClassNotFoundException, NotActiveException {
-
-        Hashtable fields = (Hashtable)readObject();
-        return new LegacyHookGetFields(fields);
-    }
+public interface JavaCorbaAccess {
+    public ValueHandlerImpl newValueHandlerImpl();
 }
diff --git a/corba/src/share/classes/sun/corba/SharedSecrets.java b/corba/src/share/classes/sun/corba/SharedSecrets.java
new file mode 100644
index 00000000000..aba3ee0767a
--- /dev/null
+++ b/corba/src/share/classes/sun/corba/SharedSecrets.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package sun.corba;
+
+import com.sun.corba.se.impl.io.ValueUtility;
+import sun.misc.Unsafe;
+
+import java.security.AccessController;
+
+/** A repository of "shared secrets", which are a mechanism for
+    calling implementation-private methods in another package without
+    using reflection. A package-private class implements a public
+    interface and provides the ability to call package-private methods
+    within that package; the object implementing that interface is
+    provided through a third package to which access is restricted.
+    This framework avoids the primary disadvantage of using reflection
+    for this purpose, namely the loss of compile-time checking. */
+
+// SharedSecrets cloned in corba repo to avoid build issues
+public class SharedSecrets {
+    private static final Unsafe unsafe = Unsafe.getUnsafe();
+    private static JavaCorbaAccess javaCorbaAccess;
+
+    public static JavaCorbaAccess getJavaCorbaAccess() {
+        if (javaCorbaAccess == null) {
+            // Ensure ValueUtility is initialized; we know that that class
+            // provides the shared secret
+            unsafe.ensureClassInitialized(ValueUtility.class);
+        }
+        return javaCorbaAccess;
+    }
+
+    public static void setJavaCorbaAccess(JavaCorbaAccess access) {
+        javaCorbaAccess = access;
+    }
+
+}

From f50507bccf9128588567a6d1050f75be6afb1331 Mon Sep 17 00:00:00 2001
From: Neil Richards <ngmr@openjdk.org>
Date: Tue, 30 Oct 2012 17:15:13 +0000
Subject: [PATCH 018/311] 8000540: Improve IIOP type reuse management

Reviewed-by: alanb, ahgross, coffeys
---
 .../corba/se/impl/io/ObjectStreamClass.java   | 110 +++++++-----------
 1 file changed, 39 insertions(+), 71 deletions(-)

diff --git a/corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java b/corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java
index c2e23a41387..95412a11257 100644
--- a/corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java
+++ b/corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 /*
  * Licensed Materials - Property of IBM
  * RMI-IIOP v1.0
- * Copyright IBM Corp. 1998 1999  All Rights Reserved
+ * Copyright IBM Corp. 1998 2012  All Rights Reserved
  *
  */
 
@@ -56,7 +56,6 @@ import java.io.Serializable;
 
 import java.util.Arrays;
 import java.util.Comparator;
-import java.util.Hashtable;
 
 import com.sun.corba.se.impl.util.RepositoryId;
 
@@ -83,8 +82,6 @@ public class ObjectStreamClass implements java.io.Serializable {
     private static Object noArgsList[] = {};
     private static Class noTypesList[] = {};
 
-    private static Hashtable translatedFields;
-
     /** true if represents enum type */
     private boolean isEnum;
 
@@ -384,6 +381,42 @@ public class ObjectStreamClass implements java.io.Serializable {
          */
     }
 
+    private static final class PersistentFieldsValue
+            extends ClassValue<ObjectStreamField[]> {
+        PersistentFieldsValue() { }
+
+        protected ObjectStreamField[] computeValue(Class<?> type) {
+            try {
+                Field pf = type.getDeclaredField("serialPersistentFields");
+                int mods = pf.getModifiers();
+                if (Modifier.isPrivate(mods) && Modifier.isStatic(mods) &&
+                        Modifier.isFinal(mods)) {
+                    pf.setAccessible(true);
+                    java.io.ObjectStreamField[] fields =
+                        (java.io.ObjectStreamField[])pf.get(type);
+                    return translateFields(fields);
+                }
+            } catch (NoSuchFieldException | IllegalAccessException |
+                    IllegalArgumentException | ClassCastException e) {
+            }
+            return null;
+        }
+
+        private static ObjectStreamField[] translateFields(
+            java.io.ObjectStreamField[] fields) {
+            ObjectStreamField[] translation =
+                new ObjectStreamField[fields.length];
+            for (int i = 0; i < fields.length; i++) {
+                translation[i] = new ObjectStreamField(fields[i].getName(),
+                        fields[i].getType());
+            }
+            return translation;
+        }
+    }
+
+    private static final PersistentFieldsValue persistentFieldsValue =
+        new PersistentFieldsValue();
+
     /*
      * Initialize class descriptor.  This method is only invoked on class
      * descriptors created via calls to lookupInternal().  This method is kept
@@ -416,35 +449,7 @@ public class ObjectStreamClass implements java.io.Serializable {
                  * If it is declared, use the declared serialPersistentFields.
                  * Otherwise, extract the fields from the class itself.
                  */
-                try {
-                    Field pf = cl.getDeclaredField("serialPersistentFields");
-                    // serial bug 7; the serialPersistentFields were not
-                    // being read and stored as Accessible bit was not set
-                    pf.setAccessible(true);
-                    // serial bug 7; need to find if the field is of type
-                    // java.io.ObjectStreamField
-                    java.io.ObjectStreamField[] f =
-                           (java.io.ObjectStreamField[])pf.get(cl);
-                    int mods = pf.getModifiers();
-                    if ((Modifier.isPrivate(mods)) &&
-                        (Modifier.isStatic(mods)) &&
-                        (Modifier.isFinal(mods)))
-                    {
-                        fields = (ObjectStreamField[])translateFields((Object[])pf.get(cl));
-                    }
-                } catch (NoSuchFieldException e) {
-                    fields = null;
-                } catch (IllegalAccessException e) {
-                    fields = null;
-                } catch (IllegalArgumentException e) {
-                    fields = null;
-                } catch (ClassCastException e) {
-                    /* Thrown if a field serialPersistentField exists
-                     * but it is not of type ObjectStreamField.
-                     */
-                    fields = null;
-                }
-
+                    fields = persistentFieldsValue.get(cl);
 
                 if (fields == null) {
                     /* Get all of the declared fields for this
@@ -641,43 +646,6 @@ public class ObjectStreamClass implements java.io.Serializable {
         superclass = null;
     }
 
-    private static Object[] translateFields(Object objs[])
-        throws NoSuchFieldException {
-        try{
-            java.io.ObjectStreamField fields[] = (java.io.ObjectStreamField[])objs;
-            Object translation[] = null;
-
-            if (translatedFields == null)
-                translatedFields = new Hashtable();
-
-            translation = (Object[])translatedFields.get(fields);
-
-            if (translation != null)
-                return translation;
-            else {
-                Class osfClass = Class.forName("com.sun.corba.se.impl.io.ObjectStreamField");
-                translation = (Object[])java.lang.reflect.Array.newInstance(osfClass, objs.length);
-                Object arg[] = new Object[2];
-                Class types[] = {String.class, Class.class};
-                Constructor constructor = osfClass.getDeclaredConstructor(types);
-                for (int i = fields.length -1; i >= 0; i--){
-                    arg[0] = fields[i].getName();
-                    arg[1] = fields[i].getType();
-
-                    translation[i] = constructor.newInstance(arg);
-                }
-                translatedFields.put(fields, translation);
-
-            }
-
-            return (Object[])translation;
-        }
-        catch(Throwable t){
-            NoSuchFieldException nsfe = new NoSuchFieldException();
-            nsfe.initCause( t ) ;
-            throw nsfe ;
-        }
-    }
 
     /*
      * Set the class this version descriptor matches.

From d3ccd20d1fc444e6ea7b314d5aaf23a718ab5054 Mon Sep 17 00:00:00 2001
From: Mandy Chung <mchung@openjdk.org>
Date: Fri, 2 Nov 2012 16:50:23 -0700
Subject: [PATCH 019/311] 7197546: (proxy) Reflect about creating reflective
 proxies

Reviewed-by: alanb, jdn, jrose
---
 jdk/src/share/classes/java/lang/Class.java    |  50 +++---
 .../java/lang/invoke/MethodHandleProxies.java |  73 ++++++---
 .../classes/java/lang/reflect/Proxy.java      | 154 +++++++++++++++++-
 .../classes/sun/reflect/misc/ReflectUtil.java |  25 +++
 .../loadProxyClasses/security.policy          |   1 +
 5 files changed, 254 insertions(+), 49 deletions(-)

diff --git a/jdk/src/share/classes/java/lang/Class.java b/jdk/src/share/classes/java/lang/Class.java
index ec9d9725655..a22493feb6f 100644
--- a/jdk/src/share/classes/java/lang/Class.java
+++ b/jdk/src/share/classes/java/lang/Class.java
@@ -60,7 +60,9 @@ import sun.reflect.generics.repository.ConstructorRepository;
 import sun.reflect.generics.scope.ClassScope;
 import sun.security.util.SecurityConstants;
 import java.lang.annotation.Annotation;
+import java.lang.reflect.Proxy;
 import sun.reflect.annotation.*;
+import sun.reflect.misc.ReflectUtil;
 
 /**
  * Instances of the class {@code Class} represent classes and
@@ -247,11 +249,11 @@ public final
                                    ClassLoader loader)
         throws ClassNotFoundException
     {
-        if (loader == null) {
+        if (sun.misc.VM.isSystemDomainLoader(loader)) {
             SecurityManager sm = System.getSecurityManager();
             if (sm != null) {
                 ClassLoader ccl = ClassLoader.getCallerClassLoader();
-                if (ccl != null) {
+                if (!sun.misc.VM.isSystemDomainLoader(ccl)) {
                     sm.checkPermission(
                         SecurityConstants.GET_CLASSLOADER_PERMISSION);
                 }
@@ -316,7 +318,7 @@ public final
         throws InstantiationException, IllegalAccessException
     {
         if (System.getSecurityManager() != null) {
-            checkMemberAccess(Member.PUBLIC, ClassLoader.getCallerClassLoader());
+            checkMemberAccess(Member.PUBLIC, ClassLoader.getCallerClassLoader(), false);
         }
         return newInstance0();
     }
@@ -1295,7 +1297,7 @@ public final
         // be very careful not to change the stack depth of this
         // checkMemberAccess call for security reasons
         // see java.lang.SecurityManager.checkMemberAccess
-        checkMemberAccess(Member.PUBLIC, ClassLoader.getCallerClassLoader());
+        checkMemberAccess(Member.PUBLIC, ClassLoader.getCallerClassLoader(), false);
 
         // Privileged so this implementation can look at DECLARED classes,
         // something the caller might not have privilege to do.  The code here
@@ -1370,7 +1372,7 @@ public final
         // be very careful not to change the stack depth of this
         // checkMemberAccess call for security reasons
         // see java.lang.SecurityManager.checkMemberAccess
-        checkMemberAccess(Member.PUBLIC, ClassLoader.getCallerClassLoader());
+        checkMemberAccess(Member.PUBLIC, ClassLoader.getCallerClassLoader(), true);
         return copyFields(privateGetPublicFields(null));
     }
 
@@ -1421,7 +1423,7 @@ public final
         // be very careful not to change the stack depth of this
         // checkMemberAccess call for security reasons
         // see java.lang.SecurityManager.checkMemberAccess
-        checkMemberAccess(Member.PUBLIC, ClassLoader.getCallerClassLoader());
+        checkMemberAccess(Member.PUBLIC, ClassLoader.getCallerClassLoader(), true);
         return copyMethods(privateGetPublicMethods());
     }
 
@@ -1470,7 +1472,7 @@ public final
         // be very careful not to change the stack depth of this
         // checkMemberAccess call for security reasons
         // see java.lang.SecurityManager.checkMemberAccess
-        checkMemberAccess(Member.PUBLIC, ClassLoader.getCallerClassLoader());
+        checkMemberAccess(Member.PUBLIC, ClassLoader.getCallerClassLoader(), true);
         return copyConstructors(privateGetDeclaredConstructors(true));
     }
 
@@ -1529,7 +1531,7 @@ public final
         // be very careful not to change the stack depth of this
         // checkMemberAccess call for security reasons
         // see java.lang.SecurityManager.checkMemberAccess
-        checkMemberAccess(Member.PUBLIC, ClassLoader.getCallerClassLoader());
+        checkMemberAccess(Member.PUBLIC, ClassLoader.getCallerClassLoader(), true);
         Field field = getField0(name);
         if (field == null) {
             throw new NoSuchFieldException(name);
@@ -1614,7 +1616,7 @@ public final
         // be very careful not to change the stack depth of this
         // checkMemberAccess call for security reasons
         // see java.lang.SecurityManager.checkMemberAccess
-        checkMemberAccess(Member.PUBLIC, ClassLoader.getCallerClassLoader());
+        checkMemberAccess(Member.PUBLIC, ClassLoader.getCallerClassLoader(), true);
         Method method = getMethod0(name, parameterTypes);
         if (method == null) {
             throw new NoSuchMethodException(getName() + "." + name + argumentTypesToString(parameterTypes));
@@ -1668,7 +1670,7 @@ public final
         // be very careful not to change the stack depth of this
         // checkMemberAccess call for security reasons
         // see java.lang.SecurityManager.checkMemberAccess
-        checkMemberAccess(Member.PUBLIC, ClassLoader.getCallerClassLoader());
+        checkMemberAccess(Member.PUBLIC, ClassLoader.getCallerClassLoader(), true);
         return getConstructor0(parameterTypes, Member.PUBLIC);
     }
 
@@ -1710,7 +1712,7 @@ public final
         // be very careful not to change the stack depth of this
         // checkMemberAccess call for security reasons
         // see java.lang.SecurityManager.checkMemberAccess
-        checkMemberAccess(Member.DECLARED, ClassLoader.getCallerClassLoader());
+        checkMemberAccess(Member.DECLARED, ClassLoader.getCallerClassLoader(), false);
         return getDeclaredClasses0();
     }
 
@@ -1754,7 +1756,7 @@ public final
         // be very careful not to change the stack depth of this
         // checkMemberAccess call for security reasons
         // see java.lang.SecurityManager.checkMemberAccess
-        checkMemberAccess(Member.DECLARED, ClassLoader.getCallerClassLoader());
+        checkMemberAccess(Member.DECLARED, ClassLoader.getCallerClassLoader(), true);
         return copyFields(privateGetDeclaredFields(false));
     }
 
@@ -1802,7 +1804,7 @@ public final
         // be very careful not to change the stack depth of this
         // checkMemberAccess call for security reasons
         // see java.lang.SecurityManager.checkMemberAccess
-        checkMemberAccess(Member.DECLARED, ClassLoader.getCallerClassLoader());
+        checkMemberAccess(Member.DECLARED, ClassLoader.getCallerClassLoader(), true);
         return copyMethods(privateGetDeclaredMethods(false));
     }
 
@@ -1847,7 +1849,7 @@ public final
         // be very careful not to change the stack depth of this
         // checkMemberAccess call for security reasons
         // see java.lang.SecurityManager.checkMemberAccess
-        checkMemberAccess(Member.DECLARED, ClassLoader.getCallerClassLoader());
+        checkMemberAccess(Member.DECLARED, ClassLoader.getCallerClassLoader(), true);
         return copyConstructors(privateGetDeclaredConstructors(false));
     }
 
@@ -1891,7 +1893,7 @@ public final
         // be very careful not to change the stack depth of this
         // checkMemberAccess call for security reasons
         // see java.lang.SecurityManager.checkMemberAccess
-        checkMemberAccess(Member.DECLARED, ClassLoader.getCallerClassLoader());
+        checkMemberAccess(Member.DECLARED, ClassLoader.getCallerClassLoader(), true);
         Field field = searchFields(privateGetDeclaredFields(false), name);
         if (field == null) {
             throw new NoSuchFieldException(name);
@@ -1946,7 +1948,7 @@ public final
         // be very careful not to change the stack depth of this
         // checkMemberAccess call for security reasons
         // see java.lang.SecurityManager.checkMemberAccess
-        checkMemberAccess(Member.DECLARED, ClassLoader.getCallerClassLoader());
+        checkMemberAccess(Member.DECLARED, ClassLoader.getCallerClassLoader(), true);
         Method method = searchMethods(privateGetDeclaredMethods(false), name, parameterTypes);
         if (method == null) {
             throw new NoSuchMethodException(getName() + "." + name + argumentTypesToString(parameterTypes));
@@ -1996,7 +1998,7 @@ public final
         // be very careful not to change the stack depth of this
         // checkMemberAccess call for security reasons
         // see java.lang.SecurityManager.checkMemberAccess
-        checkMemberAccess(Member.DECLARED, ClassLoader.getCallerClassLoader());
+        checkMemberAccess(Member.DECLARED, ClassLoader.getCallerClassLoader(), true);
         return getConstructor0(parameterTypes, Member.DECLARED);
     }
 
@@ -2166,18 +2168,26 @@ public final
      * <p> Default policy: allow all clients access with normal Java access
      * control.
      */
-    private void checkMemberAccess(int which, ClassLoader ccl) {
+    private void checkMemberAccess(int which, ClassLoader ccl, boolean checkProxyInterfaces) {
         SecurityManager s = System.getSecurityManager();
         if (s != null) {
             s.checkMemberAccess(this, which);
             ClassLoader cl = getClassLoader0();
-            if (sun.reflect.misc.ReflectUtil.needsPackageAccessCheck(ccl, cl)) {
+            if (ReflectUtil.needsPackageAccessCheck(ccl, cl)) {
                 String name = this.getName();
                 int i = name.lastIndexOf('.');
                 if (i != -1) {
-                    s.checkPackageAccess(name.substring(0, i));
+                    // skip the package access check on a proxy class in default proxy package
+                    String pkg = name.substring(0, i);
+                    if (!Proxy.isProxyClass(this) || !pkg.equals(ReflectUtil.PROXY_PACKAGE)) {
+                        s.checkPackageAccess(pkg);
+                    }
                 }
             }
+            // check package access on the proxy interfaces
+            if (checkProxyInterfaces && Proxy.isProxyClass(this)) {
+                ReflectUtil.checkProxyPackageAccess(ccl, this.getInterfaces());
+            }
         }
     }
 
diff --git a/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java b/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java
index 8e068238b1f..e305ced7de4 100644
--- a/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java
+++ b/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java
@@ -26,8 +26,12 @@
 package java.lang.invoke;
 
 import java.lang.reflect.*;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 import sun.invoke.WrapperInstance;
 import java.util.ArrayList;
+import sun.reflect.Reflection;
+import sun.reflect.misc.ReflectUtil;
 
 /**
  * This class consists exclusively of static methods that help adapt
@@ -137,6 +141,18 @@ public class MethodHandleProxies {
     <T> T asInterfaceInstance(final Class<T> intfc, final MethodHandle target) {
         if (!intfc.isInterface() || !Modifier.isPublic(intfc.getModifiers()))
             throw new IllegalArgumentException("not a public interface: "+intfc.getName());
+        SecurityManager smgr = System.getSecurityManager();
+        if (smgr != null) {
+            final int CALLER_FRAME = 2; // 0: Reflection, 1: asInterfaceInstance, 2: caller
+            final Class<?> caller = Reflection.getCallerClass(CALLER_FRAME);
+            final ClassLoader ccl = caller.getClassLoader();
+            ReflectUtil.checkProxyPackageAccess(ccl, intfc);
+        }
+        ClassLoader proxyLoader = intfc.getClassLoader();
+        if (proxyLoader == null) {
+            ClassLoader cl = Thread.currentThread().getContextClassLoader(); // avoid use of BCP
+            proxyLoader = cl != null ? cl : ClassLoader.getSystemClassLoader();
+        }
         final Method[] methods = getSingleNameMethods(intfc);
         if (methods == null)
             throw new IllegalArgumentException("not a single-method interface: "+intfc.getName());
@@ -148,27 +164,44 @@ public class MethodHandleProxies {
             checkTarget = checkTarget.asType(checkTarget.type().changeReturnType(Object.class));
             vaTargets[i] = checkTarget.asSpreader(Object[].class, smMT.parameterCount());
         }
-        return intfc.cast(Proxy.newProxyInstance(
-                intfc.getClassLoader(),
-                new Class<?>[]{ intfc, WrapperInstance.class },
-                new InvocationHandler() {
-                    private Object getArg(String name) {
-                        if ((Object)name == "getWrapperInstanceTarget")  return target;
-                        if ((Object)name == "getWrapperInstanceType")    return intfc;
-                        throw new AssertionError();
+        final InvocationHandler ih = new InvocationHandler() {
+                private Object getArg(String name) {
+                    if ((Object)name == "getWrapperInstanceTarget")  return target;
+                    if ((Object)name == "getWrapperInstanceType")    return intfc;
+                    throw new AssertionError();
+                }
+                public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+                    for (int i = 0; i < methods.length; i++) {
+                        if (method.equals(methods[i]))
+                            return vaTargets[i].invokeExact(args);
                     }
-                    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-                        for (int i = 0; i < methods.length; i++) {
-                            if (method.equals(methods[i]))
-                                return vaTargets[i].invokeExact(args);
-                        }
-                        if (method.getDeclaringClass() == WrapperInstance.class)
-                            return getArg(method.getName());
-                        if (isObjectMethod(method))
-                            return callObjectMethod(proxy, method, args);
-                        throw new InternalError("bad proxy method: "+method);
-                    }
-                }));
+                    if (method.getDeclaringClass() == WrapperInstance.class)
+                        return getArg(method.getName());
+                    if (isObjectMethod(method))
+                        return callObjectMethod(proxy, method, args);
+                    throw new InternalError("bad proxy method: "+method);
+                }
+            };
+
+        Object proxy;
+        if (smgr != null) {
+            // sun.invoke.WrapperInstance is a restricted interface not accessible
+            // by any non-null class loader.
+            final ClassLoader loader = proxyLoader;
+            proxy = AccessController.doPrivileged(new PrivilegedAction<Object>() {
+                public Object run() {
+                    return Proxy.newProxyInstance(
+                            loader,
+                            new Class<?>[]{ intfc, WrapperInstance.class },
+                            ih);
+                }
+            });
+        } else {
+            proxy = Proxy.newProxyInstance(proxyLoader,
+                                           new Class<?>[]{ intfc, WrapperInstance.class },
+                                           ih);
+        }
+        return intfc.cast(proxy);
     }
 
     /**
diff --git a/jdk/src/share/classes/java/lang/reflect/Proxy.java b/jdk/src/share/classes/java/lang/reflect/Proxy.java
index c2420915031..d7299b20dbb 100644
--- a/jdk/src/share/classes/java/lang/reflect/Proxy.java
+++ b/jdk/src/share/classes/java/lang/reflect/Proxy.java
@@ -27,6 +27,9 @@ package java.lang.reflect;
 
 import java.lang.ref.Reference;
 import java.lang.ref.WeakReference;
+import java.security.AccessController;
+import java.security.Permission;
+import java.security.PrivilegedAction;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
@@ -36,6 +39,9 @@ import java.util.Set;
 import java.util.List;
 import java.util.WeakHashMap;
 import sun.misc.ProxyGenerator;
+import sun.reflect.Reflection;
+import sun.reflect.misc.ReflectUtil;
+import sun.security.util.SecurityConstants;
 
 /**
  * {@code Proxy} provides static methods for creating dynamic proxy
@@ -265,9 +271,69 @@ public class Proxy implements java.io.Serializable {
      * @param   h the invocation handler for this proxy instance
      */
     protected Proxy(InvocationHandler h) {
+        doNewInstanceCheck();
         this.h = h;
     }
 
+    private static class ProxyAccessHelper {
+        // The permission is implementation specific.
+        static final Permission PROXY_PERMISSION =
+            new ReflectPermission("proxyConstructorNewInstance");
+        // These system properties are defined to provide a short-term
+        // workaround if customers need to disable the new security checks.
+        static final boolean allowNewInstance;
+        static final boolean allowNullLoader;
+        static {
+            allowNewInstance = getBooleanProperty("sun.reflect.proxy.allowsNewInstance");
+            allowNullLoader = getBooleanProperty("sun.reflect.proxy.allowsNullLoader");
+        }
+
+        private static boolean getBooleanProperty(final String key) {
+            String s = AccessController.doPrivileged(new PrivilegedAction<String>() {
+                public String run() {
+                    return System.getProperty(key);
+                }
+            });
+            return Boolean.valueOf(s);
+        }
+
+        static boolean needsNewInstanceCheck(Class<?> proxyClass) {
+            if (!Proxy.isProxyClass(proxyClass) || allowNewInstance) {
+                return false;
+            }
+
+            if (proxyClass.getName().startsWith(ReflectUtil.PROXY_PACKAGE + ".")) {
+                // all proxy interfaces are public
+                return false;
+            }
+            for (Class<?> intf : proxyClass.getInterfaces()) {
+                if (!Modifier.isPublic(intf.getModifiers())) {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+
+    /*
+     * Access check on a proxy class that implements any non-public interface.
+     *
+     * @throws  SecurityException if a security manager exists, and
+     *          the caller does not have the permission.
+     */
+    private void doNewInstanceCheck() {
+        SecurityManager sm = System.getSecurityManager();
+        Class<?> proxyClass = this.getClass();
+        if (sm != null && ProxyAccessHelper.needsNewInstanceCheck(proxyClass)) {
+            try {
+                sm.checkPermission(ProxyAccessHelper.PROXY_PERMISSION);
+            } catch (SecurityException e) {
+                throw new SecurityException("Not allowed to construct a Proxy "
+                        + "instance that implements a non-public interface", e);
+            }
+        }
+    }
+
     /**
      * Returns the {@code java.lang.Class} object for a proxy class
      * given a class loader and an array of interfaces.  The proxy class
@@ -346,6 +412,51 @@ public class Proxy implements java.io.Serializable {
                                          Class<?>... interfaces)
         throws IllegalArgumentException
     {
+        return getProxyClass0(loader, interfaces); // stack walk magic: do not refactor
+    }
+
+    private static void checkProxyLoader(ClassLoader ccl,
+                                         ClassLoader loader)
+    {
+        SecurityManager sm = System.getSecurityManager();
+        if (sm != null) {
+            if (loader == null && ccl != null) {
+                if (!ProxyAccessHelper.allowNullLoader) {
+                    sm.checkPermission(SecurityConstants.GET_CLASSLOADER_PERMISSION);
+                }
+            }
+        }
+    }
+
+    /*
+     * Generate a proxy class (caller-sensitive).
+     *
+     * To define a proxy class, it performs the access checks as in
+     * Class.forName (VM will invoke ClassLoader.checkPackageAccess):
+     * 1. "getClassLoader" permission check if loader == null
+     * 2. checkPackageAccess on the interfaces it implements
+     *
+     * To get a constructor and new instance of a proxy class, it performs
+     * the package access check on the interfaces it implements
+     * as in Class.getConstructor.
+     *
+     * If an interface is non-public, the proxy class must be defined by
+     * the defining loader of the interface.  If the caller's class loader
+     * is not the same as the defining loader of the interface, the VM
+     * will throw IllegalAccessError when the generated proxy class is
+     * being defined via the defineClass0 method.
+     */
+    private static Class<?> getProxyClass0(ClassLoader loader,
+                                           Class<?>... interfaces) {
+        SecurityManager sm = System.getSecurityManager();
+        if (sm != null) {
+            final int CALLER_FRAME = 3; // 0: Reflection, 1: getProxyClass0 2: Proxy 3: caller
+            final Class<?> caller = Reflection.getCallerClass(CALLER_FRAME);
+            final ClassLoader ccl = caller.getClassLoader();
+            checkProxyLoader(ccl, loader);
+            ReflectUtil.checkProxyPackageAccess(ccl, interfaces);
+        }
+
         if (interfaces.length > 65535) {
             throw new IllegalArgumentException("interface limit exceeded");
         }
@@ -497,8 +608,9 @@ public class Proxy implements java.io.Serializable {
                 }
             }
 
-            if (proxyPkg == null) {     // if no non-public proxy interfaces,
-                proxyPkg = "";          // use the unnamed package
+            if (proxyPkg == null) {
+                // if no non-public proxy interfaces, use sun.proxy package
+                proxyPkg = ReflectUtil.PROXY_PACKAGE + ".";
             }
 
             {
@@ -598,22 +710,46 @@ public class Proxy implements java.io.Serializable {
         /*
          * Look up or generate the designated proxy class.
          */
-        Class<?> cl = getProxyClass(loader, interfaces);
+        Class<?> cl = getProxyClass0(loader, interfaces); // stack walk magic: do not refactor
 
         /*
          * Invoke its constructor with the designated invocation handler.
          */
         try {
-            Constructor<?> cons = cl.getConstructor(constructorParams);
-            return cons.newInstance(new Object[] { h });
-        } catch (NoSuchMethodException |
-                 IllegalAccessException |
-                 InstantiationException |
-                 InvocationTargetException e) {
+            final Constructor<?> cons = cl.getConstructor(constructorParams);
+            final InvocationHandler ih = h;
+            SecurityManager sm = System.getSecurityManager();
+            if (sm != null && ProxyAccessHelper.needsNewInstanceCheck(cl)) {
+                // create proxy instance with doPrivilege as the proxy class may
+                // implement non-public interfaces that requires a special permission
+                return AccessController.doPrivileged(new PrivilegedAction<Object>() {
+                    public Object run() {
+                        return newInstance(cons, ih);
+                    }
+                });
+            } else {
+                return newInstance(cons, ih);
+            }
+        } catch (NoSuchMethodException e) {
             throw new InternalError(e.toString(), e);
         }
     }
 
+    private static Object newInstance(Constructor<?> cons, InvocationHandler h) {
+        try {
+            return cons.newInstance(new Object[] {h} );
+        } catch (IllegalAccessException | InstantiationException e) {
+            throw new InternalError(e.toString(), e);
+        } catch (InvocationTargetException e) {
+            Throwable t = e.getCause();
+            if (t instanceof RuntimeException) {
+                throw (RuntimeException) t;
+            } else {
+                throw new InternalError(t.toString(), t);
+            }
+        }
+    }
+
     /**
      * Returns true if and only if the specified class was dynamically
      * generated to be a proxy class using the {@code getProxyClass}
diff --git a/jdk/src/share/classes/sun/reflect/misc/ReflectUtil.java b/jdk/src/share/classes/sun/reflect/misc/ReflectUtil.java
index 5a90c28db41..06956101dcc 100644
--- a/jdk/src/share/classes/sun/reflect/misc/ReflectUtil.java
+++ b/jdk/src/share/classes/sun/reflect/misc/ReflectUtil.java
@@ -178,4 +178,29 @@ public final class ReflectUtil {
 
         return !isAncestor(from, to);
     }
+
+    /**
+     * Access check on the interfaces that a proxy class implements and throw
+     * {@code SecurityException} if it accesses a restricted package.
+     *
+     * @param ccl the caller's class loader
+     * @param interfaces the list of interfaces that a proxy class implements
+     *
+     * @see Proxy#checkProxyAccess
+     */
+    public static void checkProxyPackageAccess(ClassLoader ccl,
+                                               Class<?>... interfaces)
+    {
+        SecurityManager sm = System.getSecurityManager();
+        if (sm != null) {
+            for (Class<?> intf : interfaces) {
+                ClassLoader cl = intf.getClassLoader();
+                if (needsPackageAccessCheck(ccl, cl)) {
+                    checkPackageAccess(intf);
+                }
+            }
+        }
+    }
+
+    public static final String PROXY_PACKAGE = "sun.proxy";
 }
diff --git a/jdk/test/java/rmi/server/RMIClassLoader/loadProxyClasses/security.policy b/jdk/test/java/rmi/server/RMIClassLoader/loadProxyClasses/security.policy
index f6e312ec696..3ba44491aca 100644
--- a/jdk/test/java/rmi/server/RMIClassLoader/loadProxyClasses/security.policy
+++ b/jdk/test/java/rmi/server/RMIClassLoader/loadProxyClasses/security.policy
@@ -13,6 +13,7 @@ grant {
     permission java.io.FilePermission ".${/}-", "read,write,delete";
 
     permission java.lang.RuntimePermission "createClassLoader";
+    permission java.lang.RuntimePermission "getClassLoader";
     permission java.lang.RuntimePermission "setContextClassLoader";
 
     // used by TestLibrary to determine test environment

From c1be65b49cbc31b30dfe6fac38a2459cee7c75fb Mon Sep 17 00:00:00 2001
From: Keith McGuigan <kamg@openjdk.org>
Date: Mon, 5 Nov 2012 17:03:33 -0500
Subject: [PATCH 020/311] 8001307: Modify ACC_SUPER behavior

Disallow non-virtual calls even when ACC_SUPER is absent.

Reviewed-by: kvn, acorn
---
 hotspot/src/share/vm/interpreter/linkResolver.cpp | 2 +-
 hotspot/src/share/vm/runtime/globals.hpp          | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/hotspot/src/share/vm/interpreter/linkResolver.cpp b/hotspot/src/share/vm/interpreter/linkResolver.cpp
index c794f06e175..c77d27189a2 100644
--- a/hotspot/src/share/vm/interpreter/linkResolver.cpp
+++ b/hotspot/src/share/vm/interpreter/linkResolver.cpp
@@ -786,7 +786,7 @@ void LinkResolver::runtime_resolve_special_method(CallInfo& result, methodHandle
 
     if (check_access &&
         // a) check if ACC_SUPER flag is set for the current class
-        current_klass->is_super() &&
+        (current_klass->is_super() || !AllowNonVirtualCalls) &&
         // b) check if the method class is a superclass of the current class (superclass relation is not reflexive!)
         current_klass->is_subtype_of(method_klass()) && current_klass() != method_klass() &&
         // c) check if the method is not <init>
diff --git a/hotspot/src/share/vm/runtime/globals.hpp b/hotspot/src/share/vm/runtime/globals.hpp
index e783883ebe0..f3a75e31d00 100644
--- a/hotspot/src/share/vm/runtime/globals.hpp
+++ b/hotspot/src/share/vm/runtime/globals.hpp
@@ -3602,7 +3602,10 @@ class CommandLineFlags {
           "Enable internal testing APIs")                                   \
                                                                             \
   product(bool, PrintGCCause, true,                                         \
-          "Include GC cause in GC logging")
+          "Include GC cause in GC logging")                                 \
+                                                                            \
+  product(bool, AllowNonVirtualCalls, false,                                \
+          "Obey the ACC_SUPER flag and allow invokenonvirtual calls")
 
 /*
  *  Macros for factoring of globals

From ec9f5edf2ffc128e326fe56b056c6bfa45c7532e Mon Sep 17 00:00:00 2001
From: Pavel Porvatov <rupashka@openjdk.org>
Date: Tue, 6 Nov 2012 15:30:34 +0400
Subject: [PATCH 021/311] 7200491: Tighten up JTable layout code

Reviewed-by: art, skoivu
---
 jdk/src/share/classes/javax/swing/JTable.java      | 14 +++++---------
 .../javax/swing/plaf/nimbus/NimbusLookAndFeel.java |  7 ++++++-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/jdk/src/share/classes/javax/swing/JTable.java b/jdk/src/share/classes/javax/swing/JTable.java
index fbd61d9a9fc..05fc918e9eb 100644
--- a/jdk/src/share/classes/javax/swing/JTable.java
+++ b/jdk/src/share/classes/javax/swing/JTable.java
@@ -781,15 +781,11 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
                         scrollPane.getCorner(JScrollPane.UPPER_TRAILING_CORNER);
                 if (corner == null || corner instanceof UIResource){
                     corner = null;
-                    Object componentClass = UIManager.get(
-                            "Table.scrollPaneCornerComponent");
-                    if (componentClass instanceof Class){
-                        try {
-                            corner = (Component)
-                                    ((Class)componentClass).newInstance();
-                        } catch (Exception e) {
-                            // just ignore and don't set corner
-                        }
+                    try {
+                        corner = (Component) UIManager.get(
+                                "Table.scrollPaneCornerComponent");
+                    } catch (Exception e) {
+                        // just ignore and don't set corner
                     }
                     scrollPane.setCorner(JScrollPane.UPPER_TRAILING_CORNER,
                             corner);
diff --git a/jdk/src/share/classes/javax/swing/plaf/nimbus/NimbusLookAndFeel.java b/jdk/src/share/classes/javax/swing/plaf/nimbus/NimbusLookAndFeel.java
index b03bf653fc5..402a6885982 100644
--- a/jdk/src/share/classes/javax/swing/plaf/nimbus/NimbusLookAndFeel.java
+++ b/jdk/src/share/classes/javax/swing/plaf/nimbus/NimbusLookAndFeel.java
@@ -159,7 +159,12 @@ public class NimbusLookAndFeel extends SynthLookAndFeel {
 
             // Store Table ScrollPane Corner Component
             uiDefaults.put("Table.scrollPaneCornerComponent",
-                    TableScrollPaneCorner.class);
+                    new UIDefaults.ActiveValue() {
+                        @Override
+                        public Object createValue(UIDefaults table) {
+                            return new TableScrollPaneCorner();
+                        }
+                    });
 
             // Setup the settings for ToolBarSeparator which is custom
             // installed for Nimbus

From e3b2bdd16f1cc4e8618b53866a51cadce6e26c47 Mon Sep 17 00:00:00 2001
From: Mala Bankal <mbankal@openjdk.org>
Date: Mon, 17 Dec 2012 07:43:20 -0800
Subject: [PATCH 022/311] 7141694: Improving CORBA internals

Reviewed-by: coffeys, ahgross
---
 .../classes/com/sun/corba/se/spi/orb/ORB.java | 34 +++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/corba/src/share/classes/com/sun/corba/se/spi/orb/ORB.java b/corba/src/share/classes/com/sun/corba/se/spi/orb/ORB.java
index 22b89e73f22..306a9f7d2bf 100644
--- a/corba/src/share/classes/com/sun/corba/se/spi/orb/ORB.java
+++ b/corba/src/share/classes/com/sun/corba/se/spi/orb/ORB.java
@@ -98,6 +98,7 @@ import com.sun.corba.se.impl.logging.OMGSystemException ;
 import com.sun.corba.se.impl.presentation.rmi.PresentationManagerImpl ;
 
 import com.sun.corba.se.impl.orbutil.ORBClassLoader ;
+import sun.awt.AppContext;
 
 public abstract class ORB extends com.sun.corba.se.org.omg.CORBA.ORB
     implements Broker, TypeCodeFactory
@@ -173,14 +174,7 @@ public abstract class ORB extends com.sun.corba.se.org.omg.CORBA.ORB
 
     protected MonitoringManager monitoringManager;
 
-    // There is only one instance of the PresentationManager
-    // that is shared between all ORBs.  This is necessary
-    // because RMI-IIOP requires the PresentationManager in
-    // places where no ORB is available, so the PresentationManager
-    // must be global.  It is initialized here as well.
-    protected static PresentationManager globalPM = null ;
-
-    static {
+    private static PresentationManager setupPresentationManager() {
         staticWrapper = ORBUtilSystemException.get(
             CORBALogDomains.RPC_PRESENTATION ) ;
 
@@ -220,10 +214,11 @@ public abstract class ORB extends com.sun.corba.se.org.omg.CORBA.ORB
                 }
             ) ;
 
-        globalPM = new PresentationManagerImpl( useDynamicStub ) ;
-        globalPM.setStubFactoryFactory( false,
+        PresentationManager pm = new PresentationManagerImpl( useDynamicStub ) ;
+        pm.setStubFactoryFactory( false,
             PresentationDefaults.getStaticStubFactoryFactory() ) ;
-        globalPM.setStubFactoryFactory( true, dynamicStubFactoryFactory ) ;
+        pm.setStubFactoryFactory( true, dynamicStubFactoryFactory ) ;
+        return pm;
     }
 
     public void destroy() {
@@ -234,11 +229,19 @@ public abstract class ORB extends com.sun.corba.se.org.omg.CORBA.ORB
         byteBufferPool = null;
     }
 
-    /** Get the single instance of the PresentationManager
+    /**
+     * Returns the Presentation Manager for the current thread group, using the ThreadGroup-specific
+     * AppContext to hold it. Creates and records one if needed.
      */
     public static PresentationManager getPresentationManager()
     {
-        return globalPM ;
+        AppContext ac = AppContext.getAppContext();
+        PresentationManager pm = (PresentationManager) ac.get(PresentationManager.class);
+        if (pm == null) {
+            pm = setupPresentationManager();
+            ac.put(PresentationManager.class, pm);
+        }
+        return pm;
     }
 
     /** Get the appropriate StubFactoryFactory.  This
@@ -248,8 +251,9 @@ public abstract class ORB extends com.sun.corba.se.org.omg.CORBA.ORB
     public static PresentationManager.StubFactoryFactory
         getStubFactoryFactory()
     {
-        boolean useDynamicStubs = globalPM.useDynamicStubs() ;
-        return globalPM.getStubFactoryFactory( useDynamicStubs ) ;
+        PresentationManager gPM = getPresentationManager();
+        boolean useDynamicStubs = gPM.useDynamicStubs() ;
+        return gPM.getStubFactoryFactory( useDynamicStubs ) ;
     }
 
     protected ORB()

From 8e50f0daf950c6be4cf322c635c92b1ee5d57fde Mon Sep 17 00:00:00 2001
From: Sean Coffey <coffeys@openjdk.org>
Date: Tue, 6 Nov 2012 15:50:14 +0000
Subject: [PATCH 023/311] 7201066: Change modifiers on unused fields

Reviewed-by: alanb, skoivu
---
 .../com/sun/corba/se/impl/activation/ServerMain.java      | 8 ++++----
 .../com/sun/corba/se/impl/io/ObjectStreamClass.java       | 4 ++--
 .../corba/se/impl/orbutil/ObjectStreamClass_1_3_1.java    | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/corba/src/share/classes/com/sun/corba/se/impl/activation/ServerMain.java b/corba/src/share/classes/com/sun/corba/se/impl/activation/ServerMain.java
index c51b08966bd..cd6d534af49 100644
--- a/corba/src/share/classes/com/sun/corba/se/impl/activation/ServerMain.java
+++ b/corba/src/share/classes/com/sun/corba/se/impl/activation/ServerMain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -322,9 +322,9 @@ class ServerCallback extends
     com.sun.corba.se.spi.activation._ServerImplBase
 {
     private ORB orb;
-    private Method installMethod ;
-    private Method uninstallMethod ;
-    private Method shutdownMethod ;
+    private transient Method installMethod ;
+    private transient Method uninstallMethod ;
+    private transient Method shutdownMethod ;
     private Object methodArgs[] ;
 
     ServerCallback(ORB orb, Method installMethod, Method uninstallMethod,
diff --git a/corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java b/corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java
index 95412a11257..2c6e3bc08bb 100644
--- a/corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java
+++ b/corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java
@@ -1523,8 +1523,8 @@ public class ObjectStreamClass implements java.io.Serializable {
     private boolean hasExternalizableBlockData;
     Method writeObjectMethod;
     Method readObjectMethod;
-    private Method writeReplaceObjectMethod;
-    private Method readResolveObjectMethod;
+    private transient Method writeReplaceObjectMethod;
+    private transient Method readResolveObjectMethod;
     private Constructor cons ;
 
     /**
diff --git a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClass_1_3_1.java b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClass_1_3_1.java
index c9a6f8f1d51..891a4887123 100644
--- a/corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClass_1_3_1.java
+++ b/corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClass_1_3_1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1119,8 +1119,8 @@ public class ObjectStreamClass_1_3_1 implements java.io.Serializable {
     private boolean hasExternalizableBlockData;
     Method writeObjectMethod;
     Method readObjectMethod;
-    private Method writeReplaceObjectMethod;
-    private Method readResolveObjectMethod;
+    private transient Method writeReplaceObjectMethod;
+    private transient Method readResolveObjectMethod;
 
     /*
      * ObjectStreamClass_1_3_1 that this one was built from.

From 90f2168fa25b2cf418cfd789161daa0ae4e38400 Mon Sep 17 00:00:00 2001
From: Chris Hegarty <chegar@openjdk.org>
Date: Wed, 7 Nov 2012 14:26:41 +0000
Subject: [PATCH 024/311] 7201071: InetSocketAddress serialization issue

Reviewed-by: alanb, michaelm, skoivu
---
 .../classes/java/net/InetSocketAddress.java   | 272 ++++++++++++------
 .../sun/nio/ch/DatagramChannelImpl.java       |  18 +-
 .../sun/nio/ch/sctp/SctpChannelImpl.java      |  14 +-
 .../sun/nio/ch/sctp/SctpMultiChannelImpl.java |  16 +-
 .../native/sun/nio/ch/DatagramChannelImpl.c   |   9 +-
 .../native/sun/nio/ch/sctp/SctpChannelImpl.c  |  27 +-
 .../native/sun/nio/ch/DatagramChannelImpl.c   |  10 +-
 .../DatagramChannel/SendToUnresolved.java     |   2 +-
 8 files changed, 225 insertions(+), 143 deletions(-)

diff --git a/jdk/src/share/classes/java/net/InetSocketAddress.java b/jdk/src/share/classes/java/net/InetSocketAddress.java
index b250b18ce5a..d4322e9b427 100644
--- a/jdk/src/share/classes/java/net/InetSocketAddress.java
+++ b/jdk/src/share/classes/java/net/InetSocketAddress.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,9 +24,12 @@
  */
 package java.net;
 
-import java.io.ObjectInputStream;
 import java.io.IOException;
 import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.ObjectStreamException;
+import java.io.ObjectStreamField;
 
 /**
  *
@@ -46,23 +49,105 @@ import java.io.InvalidObjectException;
  * @see java.net.ServerSocket
  * @since 1.4
  */
-public class InetSocketAddress extends SocketAddress {
-    /* The hostname of the Socket Address
-     * @serial
-     */
-    private String hostname = null;
-    /* The IP address of the Socket Address
-     * @serial
-     */
-    private InetAddress addr = null;
-    /* The port number of the Socket Address
-     * @serial
-     */
-    private int port;
+public class InetSocketAddress
+    extends SocketAddress
+{
+    // Private implementation class pointed to by all public methods.
+    private static class InetSocketAddressHolder {
+        // The hostname of the Socket Address
+        private String hostname;
+        // The IP address of the Socket Address
+        private InetAddress addr;
+        // The port number of the Socket Address
+        private int port;
+
+        private InetSocketAddressHolder(String hostname, InetAddress addr, int port) {
+            this.hostname = hostname;
+            this.addr = addr;
+            this.port = port;
+        }
+
+        private int getPort() {
+            return port;
+        }
+
+        private InetAddress getAddress() {
+            return addr;
+        }
+
+        private String getHostName() {
+            if (hostname != null)
+                return hostname;
+            if (addr != null)
+                return addr.getHostName();
+            return null;
+        }
+
+        private String getHostString() {
+            if (hostname != null)
+                return hostname;
+            if (addr != null) {
+                if (addr.hostName != null)
+                    return addr.hostName;
+                else
+                    return addr.getHostAddress();
+            }
+            return null;
+        }
+
+        private boolean isUnresolved() {
+            return addr == null;
+        }
+
+        @Override
+        public String toString() {
+            if (isUnresolved()) {
+                return hostname + ":" + port;
+            } else {
+                return addr.toString() + ":" + port;
+            }
+        }
+
+        @Override
+        public final boolean equals(Object obj) {
+            if (obj == null || !(obj instanceof InetSocketAddressHolder))
+                return false;
+            InetSocketAddressHolder that = (InetSocketAddressHolder)obj;
+            boolean sameIP;
+            if (addr != null)
+                sameIP = addr.equals(that.addr);
+            else if (hostname != null)
+                sameIP = (that.addr == null) &&
+                    hostname.equalsIgnoreCase(that.hostname);
+            else
+                sameIP = (that.addr == null) && (that.hostname == null);
+            return sameIP && (port == that.port);
+        }
+
+        @Override
+        public final int hashCode() {
+            if (addr != null)
+                return addr.hashCode() + port;
+            if (hostname != null)
+                return hostname.toLowerCase().hashCode() + port;
+            return port;
+        }
+    }
+
+    private final transient InetSocketAddressHolder holder;
 
     private static final long serialVersionUID = 5076001401234631237L;
 
-    private InetSocketAddress() {
+    private static int checkPort(int port) {
+        if (port < 0 || port > 0xFFFF)
+            throw new IllegalArgumentException("port out of range:" + port);
+        return port;
+    }
+
+    private static String checkHost(String hostname) {
+        if (hostname == null)
+            throw new IllegalArgumentException("hostname can't be null");
+        return hostname;
     }
 
     /**
@@ -97,14 +182,10 @@ public class InetSocketAddress extends SocketAddress {
      * range of valid port values.
      */
     public InetSocketAddress(InetAddress addr, int port) {
-        if (port < 0 || port > 0xFFFF) {
-            throw new IllegalArgumentException("port out of range:" + port);
-        }
-        this.port = port;
-        if (addr == null)
-            this.addr = InetAddress.anyLocalAddress();
-        else
-            this.addr = addr;
+        holder = new InetSocketAddressHolder(
+                        null,
+                        addr == null ? InetAddress.anyLocalAddress() : addr,
+                        checkPort(port));
     }
 
     /**
@@ -132,19 +213,20 @@ public class InetSocketAddress extends SocketAddress {
      * @see     #isUnresolved()
      */
     public InetSocketAddress(String hostname, int port) {
-        if (port < 0 || port > 0xFFFF) {
-            throw new IllegalArgumentException("port out of range:" + port);
-        }
-        if (hostname == null) {
-            throw new IllegalArgumentException("hostname can't be null");
-        }
+        checkHost(hostname);
+        InetAddress addr = null;
+        String host = null;
         try {
             addr = InetAddress.getByName(hostname);
         } catch(UnknownHostException e) {
-            this.hostname = hostname;
-            addr = null;
+            host = hostname;
         }
-        this.port = port;
+        holder = new InetSocketAddressHolder(host, addr, checkPort(port));
+    }
+
+    // private constructor for creating unresolved instances
+    private InetSocketAddress(int port, String hostname) {
+        holder = new InetSocketAddressHolder(hostname, null, port);
     }
 
     /**
@@ -169,31 +251,67 @@ public class InetSocketAddress extends SocketAddress {
      * @since 1.5
      */
     public static InetSocketAddress createUnresolved(String host, int port) {
-        if (port < 0 || port > 0xFFFF) {
-            throw new IllegalArgumentException("port out of range:" + port);
-        }
-        if (host == null) {
-            throw new IllegalArgumentException("hostname can't be null");
-        }
-        InetSocketAddress s = new InetSocketAddress();
-        s.port = port;
-        s.hostname = host;
-        s.addr = null;
-        return s;
+        return new InetSocketAddress(checkPort(port), checkHost(host));
     }
 
-    private void readObject(ObjectInputStream s)
-        throws IOException, ClassNotFoundException {
-        s.defaultReadObject();
+    /**
+     * @serialField hostname String
+     * @serialField addr InetAddress
+     * @serialField port int
+     */
+    private static final ObjectStreamField[] serialPersistentFields = {
+         new ObjectStreamField("hostname", String.class),
+         new ObjectStreamField("addr", InetAddress.class),
+         new ObjectStreamField("port", int.class)};
+
+    private void writeObject(ObjectOutputStream out)
+        throws IOException
+    {
+        // Don't call defaultWriteObject()
+         ObjectOutputStream.PutField pfields = out.putFields();
+         pfields.put("hostname", holder.hostname);
+         pfields.put("addr", holder.addr);
+         pfields.put("port", holder.port);
+         out.writeFields();
+     }
+
+    private void readObject(ObjectInputStream in)
+        throws IOException, ClassNotFoundException
+    {
+        // Don't call defaultReadObject()
+        ObjectInputStream.GetField oisFields = in.readFields();
+        final String oisHostname = (String)oisFields.get("hostname", null);
+        final InetAddress oisAddr = (InetAddress)oisFields.get("addr", null);
+        final int oisPort = oisFields.get("port", -1);
 
         // Check that our invariants are satisfied
-        if (port < 0 || port > 0xFFFF) {
-            throw new InvalidObjectException("port out of range:" + port);
-        }
-
-        if (hostname == null && addr == null) {
+        checkPort(oisPort);
+        if (oisHostname == null && oisAddr == null)
             throw new InvalidObjectException("hostname and addr " +
                                              "can't both be null");
+
+        InetSocketAddressHolder h = new InetSocketAddressHolder(oisHostname,
+                                                                oisAddr,
+                                                                oisPort);
+        UNSAFE.putObject(this, FIELDS_OFFSET, h);
+    }
+
+    private void readObjectNoData()
+        throws ObjectStreamException
+    {
+        throw new InvalidObjectException("Stream data required");
+    }
+
+    private static final long FIELDS_OFFSET;
+    private static final sun.misc.Unsafe UNSAFE;
+    static {
+        try {
+            sun.misc.Unsafe unsafe = sun.misc.Unsafe.getUnsafe();
+            FIELDS_OFFSET = unsafe.objectFieldOffset(
+                    InetSocketAddress.class.getDeclaredField("holder"));
+            UNSAFE = unsafe;
+        } catch (ReflectiveOperationException e) {
+            throw new Error(e);
         }
     }
 
@@ -203,7 +321,7 @@ public class InetSocketAddress extends SocketAddress {
      * @return the port number.
      */
     public final int getPort() {
-        return port;
+        return holder.getPort();
     }
 
     /**
@@ -213,7 +331,7 @@ public class InetSocketAddress extends SocketAddress {
      * @return the InetAdress or <code>null</code> if it is unresolved.
      */
     public final InetAddress getAddress() {
-        return addr;
+        return holder.getAddress();
     }
 
     /**
@@ -224,31 +342,19 @@ public class InetSocketAddress extends SocketAddress {
      * @return  the hostname part of the address.
      */
     public final String getHostName() {
-        if (hostname != null)
-            return hostname;
-        if (addr != null)
-            return addr.getHostName();
-        return null;
+        return holder.getHostName();
     }
 
     /**
      * Returns the hostname, or the String form of the address if it
      * doesn't have a hostname (it was created using a literal).
-     * This has the benefit of <b>not</b> attemptimg a reverse lookup.
+     * This has the benefit of <b>not</b> attempting a reverse lookup.
      *
      * @return the hostname, or String representation of the address.
      * @since 1.7
      */
     public final String getHostString() {
-        if (hostname != null)
-            return hostname;
-        if (addr != null) {
-            if (addr.hostName != null)
-                return addr.hostName;
-            else
-                return addr.getHostAddress();
-        }
-        return null;
+        return holder.getHostString();
     }
 
     /**
@@ -258,7 +364,7 @@ public class InetSocketAddress extends SocketAddress {
      *          an <code>InetAddress</code>.
      */
     public final boolean isUnresolved() {
-        return addr == null;
+        return holder.isUnresolved();
     }
 
     /**
@@ -269,12 +375,9 @@ public class InetSocketAddress extends SocketAddress {
      *
      * @return  a string representation of this object.
      */
+    @Override
     public String toString() {
-        if (isUnresolved()) {
-            return hostname + ":" + port;
-        } else {
-            return addr.toString() + ":" + port;
-        }
+        return holder.toString();
     }
 
     /**
@@ -297,19 +400,11 @@ public class InetSocketAddress extends SocketAddress {
      *          <code>false</code> otherwise.
      * @see java.net.InetAddress#equals(java.lang.Object)
      */
+    @Override
     public final boolean equals(Object obj) {
         if (obj == null || !(obj instanceof InetSocketAddress))
             return false;
-        InetSocketAddress sockAddr = (InetSocketAddress) obj;
-        boolean sameIP = false;
-        if (this.addr != null)
-            sameIP = this.addr.equals(sockAddr.addr);
-        else if (this.hostname != null)
-            sameIP = (sockAddr.addr == null) &&
-                this.hostname.equalsIgnoreCase(sockAddr.hostname);
-        else
-            sameIP = (sockAddr.addr == null) && (sockAddr.hostname == null);
-        return sameIP && (this.port == sockAddr.port);
+        return holder.equals(((InetSocketAddress) obj).holder);
     }
 
     /**
@@ -317,11 +412,8 @@ public class InetSocketAddress extends SocketAddress {
      *
      * @return  a hash code value for this socket address.
      */
+    @Override
     public final int hashCode() {
-        if (addr != null)
-            return addr.hashCode() + port;
-        if (hostname != null)
-            return hostname.toLowerCase().hashCode() + port;
-        return port;
+        return holder.hashCode();
     }
 }
diff --git a/jdk/src/share/classes/sun/nio/ch/DatagramChannelImpl.java b/jdk/src/share/classes/sun/nio/ch/DatagramChannelImpl.java
index 3d60a38d74c..ff2ee589600 100644
--- a/jdk/src/share/classes/sun/nio/ch/DatagramChannelImpl.java
+++ b/jdk/src/share/classes/sun/nio/ch/DatagramChannelImpl.java
@@ -421,7 +421,7 @@ class DatagramChannelImpl
 
         synchronized (writeLock) {
             ensureOpen();
-            InetSocketAddress isa = (InetSocketAddress)target;
+            InetSocketAddress isa = Net.checkAddress(target);
             InetAddress ia = isa.getAddress();
             if (ia == null)
                 throw new IOException("Target address not resolved");
@@ -432,9 +432,9 @@ class DatagramChannelImpl
                     SecurityManager sm = System.getSecurityManager();
                     if (sm != null) {
                         if (ia.isMulticastAddress()) {
-                            sm.checkMulticast(isa.getAddress());
+                            sm.checkMulticast(ia);
                         } else {
-                            sm.checkConnect(isa.getAddress().getHostAddress(),
+                            sm.checkConnect(ia.getHostAddress(),
                                             isa.getPort());
                         }
                     }
@@ -454,7 +454,7 @@ class DatagramChannelImpl
                     return 0;
                 writerThread = NativeThread.current();
                 do {
-                    n = send(fd, src, target);
+                    n = send(fd, src, isa);
                 } while ((n == IOStatus.INTERRUPTED) && isOpen());
 
                 synchronized (stateLock) {
@@ -471,7 +471,7 @@ class DatagramChannelImpl
         }
     }
 
-    private int send(FileDescriptor fd, ByteBuffer src, SocketAddress target)
+    private int send(FileDescriptor fd, ByteBuffer src, InetSocketAddress target)
         throws IOException
     {
         if (src instanceof DirectBuffer)
@@ -502,7 +502,7 @@ class DatagramChannelImpl
     }
 
     private int sendFromNativeBuffer(FileDescriptor fd, ByteBuffer bb,
-                                            SocketAddress target)
+                                     InetSocketAddress target)
         throws IOException
     {
         int pos = bb.position();
@@ -514,7 +514,7 @@ class DatagramChannelImpl
         int written;
         try {
             written = send0(preferIPv6, fd, ((DirectBuffer)bb).address() + pos,
-                            rem, target);
+                            rem, target.getAddress(), target.getPort());
         } catch (PortUnreachableException pue) {
             if (isConnected())
                 throw pue;
@@ -1116,8 +1116,8 @@ class DatagramChannelImpl
                                 boolean connected)
         throws IOException;
 
-    private native int send0(boolean preferIPv6, FileDescriptor fd, long address, int len,
-                             SocketAddress sa)
+    private native int send0(boolean preferIPv6, FileDescriptor fd, long address,
+                             int len, InetAddress addr, int port)
         throws IOException;
 
     static {
diff --git a/jdk/src/solaris/classes/sun/nio/ch/sctp/SctpChannelImpl.java b/jdk/src/solaris/classes/sun/nio/ch/sctp/SctpChannelImpl.java
index 92f17cb3e8b..411e33c4e84 100644
--- a/jdk/src/solaris/classes/sun/nio/ch/sctp/SctpChannelImpl.java
+++ b/jdk/src/solaris/classes/sun/nio/ch/sctp/SctpChannelImpl.java
@@ -1026,13 +1026,21 @@ public class SctpChannelImpl extends SctpChannel
                                      boolean unordered,
                                      int ppid)
             throws IOException {
+        InetAddress addr = null;     // no preferred address
+        int port = 0;
+        if (target != null) {
+            InetSocketAddress isa = Net.checkAddress(target);
+            addr = isa.getAddress();
+            port = isa.getPort();
+        }
+
         int pos = bb.position();
         int lim = bb.limit();
         assert (pos <= lim);
         int rem = (pos <= lim ? lim - pos : 0);
 
-        int written = send0(fd, ((DirectBuffer)bb).address() + pos,
-                            rem, target, -1 /*121*/, streamNumber, unordered, ppid);
+        int written = send0(fd, ((DirectBuffer)bb).address() + pos, rem, addr,
+                            port, -1 /*121*/, streamNumber, unordered, ppid);
         if (written > 0)
             bb.position(pos + written);
         return written;
@@ -1091,7 +1099,7 @@ public class SctpChannelImpl extends SctpChannel
             long address, int length, boolean peek) throws IOException;
 
     static native int send0(int fd, long address, int length,
-            SocketAddress target, int assocId, int streamNumber,
+            InetAddress addr, int port, int assocId, int streamNumber,
             boolean unordered, int ppid) throws IOException;
 
     private static native int checkConnect(FileDescriptor fd, boolean block,
diff --git a/jdk/src/solaris/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java b/jdk/src/solaris/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java
index fa44072f4dc..63dc94931da 100644
--- a/jdk/src/solaris/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java
+++ b/jdk/src/solaris/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java
@@ -889,13 +889,20 @@ public class SctpMultiChannelImpl extends SctpMultiChannel
                                      boolean unordered,
                                      int ppid)
             throws IOException {
+        InetAddress addr = null;     // no preferred address
+        int port = 0;
+        if (target != null) {
+            InetSocketAddress isa = Net.checkAddress(target);
+            addr = isa.getAddress();
+            port = isa.getPort();
+        }
         int pos = bb.position();
         int lim = bb.limit();
         assert (pos <= lim);
         int rem = (pos <= lim ? lim - pos : 0);
 
-        int written = send0(fd, ((DirectBuffer)bb).address() + pos,
-                            rem, target, assocId, streamNumber, unordered, ppid);
+        int written = send0(fd, ((DirectBuffer)bb).address() + pos, rem, addr,
+                            port, assocId, streamNumber, unordered, ppid);
         if (written > 0)
             bb.position(pos + written);
         return written;
@@ -976,13 +983,14 @@ public class SctpMultiChannelImpl extends SctpMultiChannel
     private static int send0(int fd,
                              long address,
                              int length,
-                             SocketAddress target,
+                             InetAddress addr,
+                             int port,
                              int assocId,
                              int streamNumber,
                              boolean unordered,
                              int ppid)
             throws IOException {
-        return SctpChannelImpl.send0(fd, address, length, target, assocId,
+        return SctpChannelImpl.send0(fd, address, length, addr, port, assocId,
                 streamNumber, unordered, ppid);
     }
 
diff --git a/jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c b/jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c
index 3bccd574871..c460d61f9c4 100644
--- a/jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c
+++ b/jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c
@@ -46,8 +46,6 @@
 
 #include "sun_nio_ch_DatagramChannelImpl.h"
 
-static jfieldID isa_addrID;     /* address in java.net.InetSocketAddress */
-static jfieldID isa_portID;     /* port in java.net.InetSocketAddress */
 static jfieldID dci_senderID;   /* sender in sun.nio.ch.DatagramChannelImpl */
 static jfieldID dci_senderAddrID; /* sender InetAddress in sun.nio.ch.DatagramChannelImpl */
 static jfieldID dci_senderPortID; /* sender port in sun.nio.ch.DatagramChannelImpl */
@@ -61,9 +59,6 @@ Java_sun_nio_ch_DatagramChannelImpl_initIDs(JNIEnv *env, jclass clazz)
     isa_class = (*env)->NewGlobalRef(env, clazz);
     isa_ctorID = (*env)->GetMethodID(env, clazz, "<init>",
                                      "(Ljava/net/InetAddress;I)V");
-    isa_addrID = (*env)->GetFieldID(env, clazz, "addr",
-                                    "Ljava/net/InetAddress;");
-    isa_portID = (*env)->GetFieldID(env, clazz, "port", "I");
 
     clazz = (*env)->FindClass(env, "sun/nio/ch/DatagramChannelImpl");
     dci_senderID = (*env)->GetFieldID(env, clazz, "sender",
@@ -212,15 +207,13 @@ Java_sun_nio_ch_DatagramChannelImpl_receive0(JNIEnv *env, jobject this,
 JNIEXPORT jint JNICALL
 Java_sun_nio_ch_DatagramChannelImpl_send0(JNIEnv *env, jobject this,
                                           jboolean preferIPv6, jobject fdo, jlong address,
-                                            jint len, jobject dest)
+                                          jint len, jobject destAddress, jint destPort)
 {
     jint fd = fdval(env, fdo);
     void *buf = (void *)jlong_to_ptr(address);
     SOCKADDR sa;
     int sa_len = SOCKADDR_LEN;
     jint n = 0;
-    jobject destAddress = (*env)->GetObjectField(env, dest, isa_addrID);
-    jint destPort = (*env)->GetIntField(env, dest, isa_portID);
 
     if (len > MAX_PACKET_LEN) {
         len = MAX_PACKET_LEN;
diff --git a/jdk/src/solaris/native/sun/nio/ch/sctp/SctpChannelImpl.c b/jdk/src/solaris/native/sun/nio/ch/sctp/SctpChannelImpl.c
index 4333720c3d8..77ef9423e5c 100644
--- a/jdk/src/solaris/native/sun/nio/ch/sctp/SctpChannelImpl.c
+++ b/jdk/src/solaris/native/sun/nio/ch/sctp/SctpChannelImpl.c
@@ -67,8 +67,6 @@ static jclass    spc_class;    /* sun.nio.ch.sctp.PeerAddressChanged         */
 static jmethodID spc_ctrID;    /* sun.nio.ch.sctp.PeerAddressChanged.<init>  */
 static jclass    ss_class;     /* sun.nio.ch.sctp.Shutdown                   */
 static jmethodID ss_ctrID;     /* sun.nio.ch.sctp.Shutdown.<init>            */
-static jfieldID  isa_addrID;   /* java.net.InetSocketAddress.addr            */
-static jfieldID  isa_portID;   /* java.net.InetSocketAddress.port            */
 
 /* defined in SctpNet.c */
 jobject SockAddrToInetSocketAddress(JNIEnv* env, struct sockaddr* addr);
@@ -138,13 +136,6 @@ JNIEXPORT void JNICALL Java_sun_nio_ch_sctp_SctpChannelImpl_initIDs
     CHECK_NULL(ss_class);
     ss_ctrID = (*env)->GetMethodID(env, cls, "<init>", "(I)V");
     CHECK_NULL(ss_ctrID);
-
-    /* InetSocketAddress */
-    cls = (*env)->FindClass(env, "java/net/InetSocketAddress");
-    CHECK_NULL(cls);
-    isa_addrID = (*env)->GetFieldID(env, cls, "addr", "Ljava/net/InetAddress;");
-    CHECK_NULL(isa_addrID);
-    isa_portID = (*env)->GetFieldID(env, cls, "port", "I");
 }
 
 void getControlData
@@ -509,12 +500,12 @@ JNIEXPORT jint JNICALL Java_sun_nio_ch_sctp_SctpChannelImpl_receive0
 /*
  * Class:     sun_nio_ch_sctp_SctpChannelImpl
  * Method:    send0
- * Signature: (IJILjava/net/SocketAddress;IIZI)I
+ * Signature: (IJILjava/net/InetAddress;IIIZI)I
  */
 JNIEXPORT jint JNICALL Java_sun_nio_ch_sctp_SctpChannelImpl_send0
   (JNIEnv *env, jclass klass, jint fd, jlong address, jint length,
-   jobject saTarget, jint assocId, jint streamNumber, jboolean unordered,
-   jint ppid) {
+   jobject targetAddress, jint targetPort, jint assocId, jint streamNumber,
+   jboolean unordered, jint ppid) {
     SOCKADDR sa;
     int sa_len = sizeof(sa);
     ssize_t rv = 0;
@@ -526,17 +517,13 @@ JNIEXPORT jint JNICALL Java_sun_nio_ch_sctp_SctpChannelImpl_send0
     struct controlData cdata[1];
 
     /* SctpChannel:
-     *    saTarget may contain the preferred address or NULL to use primary,
+     *    targetAddress may contain the preferred address or NULL to use primary,
      *    assocId will always be -1
      * SctpMultiChannell:
-     *    Setup new association, saTarget will contain address, assocId = -1
-     *    Association already existing, assocId != -1, saTarget = preferred addr
+     *    Setup new association, targetAddress will contain address, assocId = -1
+     *    Association already existing, assocId != -1, targetAddress = preferred addr
      */
-    if (saTarget != NULL /*&& assocId <= 0*/) {
-
-        jobject targetAddress = (*env)->GetObjectField(env, saTarget, isa_addrID);
-        jint targetPort = (*env)->GetIntField(env, saTarget, isa_portID);
-
+    if (targetAddress != NULL /*&& assocId <= 0*/) {
         if (NET_InetAddressToSockaddr(env, targetAddress, targetPort,
                                       (struct sockaddr *)&sa,
                                       &sa_len, JNI_TRUE) != 0) {
diff --git a/jdk/src/windows/native/sun/nio/ch/DatagramChannelImpl.c b/jdk/src/windows/native/sun/nio/ch/DatagramChannelImpl.c
index 555ca9fbbfb..d98032e4e0b 100644
--- a/jdk/src/windows/native/sun/nio/ch/DatagramChannelImpl.c
+++ b/jdk/src/windows/native/sun/nio/ch/DatagramChannelImpl.c
@@ -34,8 +34,6 @@
 #include "net_util.h"
 #include <winsock2.h>
 
-static jfieldID isa_addrID;     /* address in java.net.InetSocketAddress */
-static jfieldID isa_portID;     /* port in java.net.InetSocketAddress */
 static jfieldID dci_senderID;   /* sender in sun.nio.ch.DatagramChannelImpl */
 static jfieldID dci_senderAddrID; /* sender InetAddress in sun.nio.ch.DatagramChannelImpl */
 static jfieldID dci_senderPortID; /* sender port in sun.nio.ch.DatagramChannelImpl */
@@ -50,9 +48,6 @@ Java_sun_nio_ch_DatagramChannelImpl_initIDs(JNIEnv *env, jclass clazz)
     isa_class = (*env)->NewGlobalRef(env, clazz);
     isa_ctorID = (*env)->GetMethodID(env, clazz, "<init>",
                                      "(Ljava/net/InetAddress;I)V");
-    isa_addrID = (*env)->GetFieldID(env, clazz, "addr",
-                                    "Ljava/net/InetAddress;");
-    isa_portID = (*env)->GetFieldID(env, clazz, "port", "I");
 
     clazz = (*env)->FindClass(env, "sun/nio/ch/DatagramChannelImpl");
     dci_senderID = (*env)->GetFieldID(env, clazz, "sender",
@@ -214,15 +209,14 @@ Java_sun_nio_ch_DatagramChannelImpl_receive0(JNIEnv *env, jobject this,
 JNIEXPORT jint JNICALL
 Java_sun_nio_ch_DatagramChannelImpl_send0(JNIEnv *env, jobject this,
                                           jboolean preferIPv6, jobject fdo,
-                                          jlong address, jint len, jobject dest)
+                                          jlong address, jint len,
+                                          jobject destAddress, jint destPort)
 {
     jint fd = fdval(env, fdo);
     void *buf = (void *)jlong_to_ptr(address);
     SOCKETADDRESS sa;
     int sa_len;
     jint rv = 0;
-    jobject destAddress = (*env)->GetObjectField(env, dest, isa_addrID);
-    jint destPort = (*env)->GetIntField(env, dest, isa_portID);
 
     if (NET_InetAddressToSockaddr(env, destAddress, destPort,
                                   (struct sockaddr *)&sa,
diff --git a/jdk/test/java/nio/channels/DatagramChannel/SendToUnresolved.java b/jdk/test/java/nio/channels/DatagramChannel/SendToUnresolved.java
index c916b2ef8af..7b9ec6a9a36 100644
--- a/jdk/test/java/nio/channels/DatagramChannel/SendToUnresolved.java
+++ b/jdk/test/java/nio/channels/DatagramChannel/SendToUnresolved.java
@@ -42,7 +42,7 @@ public class SendToUnresolved {
         try {
             dc.send(bb, sa);
             throw new RuntimeException("Expected exception not thrown");
-        } catch (IOException e) {
+        } catch (IOException | UnresolvedAddressException e) {
             // Correct result
         }
         dc.close();

From 39edc8d2b5b7cc550453e5027181b9779ed61bf8 Mon Sep 17 00:00:00 2001
From: Stuart Marks <smarks@openjdk.org>
Date: Thu, 8 Nov 2012 15:41:01 -0800
Subject: [PATCH 025/311] 7201070: Serialization to conform to protocol

Reviewed-by: dmocek, ahgross, skoivu
---
 jdk/src/share/classes/java/io/ObjectInputStream.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/jdk/src/share/classes/java/io/ObjectInputStream.java b/jdk/src/share/classes/java/io/ObjectInputStream.java
index 1963187eaaa..1125bb04616 100644
--- a/jdk/src/share/classes/java/io/ObjectInputStream.java
+++ b/jdk/src/share/classes/java/io/ObjectInputStream.java
@@ -1752,6 +1752,12 @@ public class ObjectInputStream
         ObjectStreamClass desc = readClassDesc(false);
         desc.checkDeserialize();
 
+        Class<?> cl = desc.forClass();
+        if (cl == String.class || cl == Class.class
+                || cl == ObjectStreamClass.class) {
+            throw new InvalidClassException("invalid class descriptor");
+        }
+
         Object obj;
         try {
             obj = desc.isInstantiable() ? desc.newInstance() : null;

From 695e6ab2e077b530118831cbcb4511596a73a9f9 Mon Sep 17 00:00:00 2001
From: Kumar Srinivasan <ksrini@openjdk.org>
Date: Fri, 9 Nov 2012 14:36:10 -0800
Subject: [PATCH 026/311] 8002091: tools/launcher/ToolsOpts.java test started
 to fail since 7u11 b01 on Windows

Reviewed-by: darcy, jjh, mschoene
---
 jdk/src/share/bin/jli_util.h           |  2 +-
 jdk/src/windows/bin/java_md.c          | 39 +++++++++++++++++---------
 jdk/test/tools/launcher/ToolsOpts.java |  1 +
 3 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/jdk/src/share/bin/jli_util.h b/jdk/src/share/bin/jli_util.h
index dd53e936210..388910407ff 100644
--- a/jdk/src/share/bin/jli_util.h
+++ b/jdk/src/share/bin/jli_util.h
@@ -66,7 +66,7 @@ int     JLI_GetStdArgc();
 #include <io.h>
 #define JLI_StrCaseCmp(p1, p2)          stricmp((p1), (p2))
 #define JLI_StrNCaseCmp(p1, p2, p3)     strnicmp((p1), (p2), (p3))
-size_t  JLI_Snprintf(char *buffer, size_t size, const char *format, ...);
+int  JLI_Snprintf(char *buffer, size_t size, const char *format, ...);
 void JLI_CmdToArgs(char *cmdline);
 #define JLI_Lseek                       _lseeki64
 #else  /* NIXES */
diff --git a/jdk/src/windows/bin/java_md.c b/jdk/src/windows/bin/java_md.c
index df118717279..4078ecc754b 100644
--- a/jdk/src/windows/bin/java_md.c
+++ b/jdk/src/windows/bin/java_md.c
@@ -526,27 +526,35 @@ jlong Counter2Micros(jlong counts)
     }
     return (counts * 1000 * 1000)/counterFrequency.QuadPart;
 }
-
 /*
  * windows snprintf does not guarantee a null terminator in the buffer,
  * if the computed size is equal to or greater than the buffer size,
- * as well as error conditions, this function guarantees a null terminator
- * under all these conditions. An unreasonable buffer size will return
- * an error value.
+ * as well as error conditions. This function guarantees a null terminator
+ * under all these conditions. An unreasonable buffer or size will return
+ * an error value. Under all other conditions this function will return the
+ * size of the bytes actually written minus the null terminator, similar
+ * to ansi snprintf api. Thus when calling this function the caller must
+ * ensure storage for the null terminator.
  */
-size_t
-JLI_Snprintf(char* buffer, size_t size, const char* format, ...)
-{
-    size_t rc;
+int
+JLI_Snprintf(char* buffer, size_t size, const char* format, ...) {
+    int rc;
     va_list vl;
-    if (size <= 0)
+    if (size == 0 || buffer == NULL)
         return -1;
+    buffer[0] = '\0';
     va_start(vl, format);
-    rc = vsnprintf(buffer, size - 1, format, vl);
-    /* force a null terminator, if something is amiss */
-    if (rc < 0 || rc >= size)
-        buffer[size - 1] = '\0';
+    rc = vsnprintf(buffer, size, format, vl);
     va_end(vl);
+    /* force a null terminator, if something is amiss */
+    if (rc < 0) {
+        /* apply ansi semantics */
+        buffer[size - 1] = '\0';
+        return size;
+    } else if (rc == size) {
+        /* force a null terminator */
+        buffer[size - 1] = '\0';
+    }
     return rc;
 }
 
@@ -1441,7 +1449,10 @@ CreateApplicationArgs(JNIEnv *env, char **strv, int argc)
         // we add the indicator
         tlen = 1 + JLI_StrLen(strv[i]) + 1;
         nargv[i] = (char *) JLI_MemAlloc(tlen);
-        JLI_Snprintf(nargv[i], tlen, "%c%s", arg_expand ? 'T' : 'F', strv[i]);
+        if (JLI_Snprintf(nargv[i], tlen, "%c%s", arg_expand ? 'T' : 'F',
+                         strv[i]) < 0) {
+            return NULL;
+        }
         JLI_TraceLauncher("%s\n", nargv[i]);
     }
 
diff --git a/jdk/test/tools/launcher/ToolsOpts.java b/jdk/test/tools/launcher/ToolsOpts.java
index 4535990dbca..f01931d5482 100644
--- a/jdk/test/tools/launcher/ToolsOpts.java
+++ b/jdk/test/tools/launcher/ToolsOpts.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @bug 8002091
  * @summary Test options patterns for javac,javah,javap and javadoc using
  * javac as a test launcher. Create a dummy javac and intercept options to check
  * reception of options as passed through the launcher without having to launch

From 1d3d850ee0b3a31197dfff7ee3e124dfc33c5b09 Mon Sep 17 00:00:00 2001
From: Oleg Pekhovskiy <bagiras@openjdk.org>
Date: Thu, 15 Nov 2012 23:03:31 +0400
Subject: [PATCH 027/311] 7192977: Issue in toolkit thread

Reviewed-by: skoivu, rupashka, art
---
 .../share/classes/java/awt/EventQueue.java    |  19 +-
 jdk/src/share/classes/java/awt/Window.java    |   2 +-
 .../classes/javax/swing/RepaintManager.java   | 167 ++++++++++--------
 .../share/classes/sun/applet/AppletPanel.java |  60 +++----
 .../share/classes/sun/awt/AWTAccessor.java    |   8 +
 .../sun/awt/windows/WComponentPeer.java       |   9 +-
 .../sun/awt/windows/WEmbeddedFrame.java       |  13 +-
 7 files changed, 164 insertions(+), 114 deletions(-)

diff --git a/jdk/src/share/classes/java/awt/EventQueue.java b/jdk/src/share/classes/java/awt/EventQueue.java
index 5ba9756a1af..57a2ccfa3b9 100644
--- a/jdk/src/share/classes/java/awt/EventQueue.java
+++ b/jdk/src/share/classes/java/awt/EventQueue.java
@@ -194,7 +194,8 @@ public class EventQueue {
                 }
                 public void removeSourceEvents(EventQueue eventQueue,
                                                Object source,
-                                               boolean removeAllEvents) {
+                                               boolean removeAllEvents)
+                {
                     eventQueue.removeSourceEvents(source, removeAllEvents);
                 }
                 public boolean noEvents(EventQueue eventQueue) {
@@ -203,6 +204,11 @@ public class EventQueue {
                 public void wakeup(EventQueue eventQueue, boolean isShutdown) {
                     eventQueue.wakeup(isShutdown);
                 }
+                public void invokeAndWait(Object source, Runnable r)
+                    throws InterruptedException, InvocationTargetException
+                {
+                    EventQueue.invokeAndWait(source, r);
+                }
             });
     }
 
@@ -1245,8 +1251,14 @@ public class EventQueue {
      * @since           1.2
      */
     public static void invokeAndWait(Runnable runnable)
-             throws InterruptedException, InvocationTargetException {
+        throws InterruptedException, InvocationTargetException
+    {
+        invokeAndWait(Toolkit.getDefaultToolkit(), runnable);
+    }
 
+    static void invokeAndWait(Object source, Runnable runnable)
+        throws InterruptedException, InvocationTargetException
+    {
         if (EventQueue.isDispatchThread()) {
             throw new Error("Cannot call invokeAndWait from the event dispatcher thread");
         }
@@ -1255,8 +1267,7 @@ public class EventQueue {
         Object lock = new AWTInvocationLock();
 
         InvocationEvent event =
-            new InvocationEvent(Toolkit.getDefaultToolkit(), runnable, lock,
-                                true);
+            new InvocationEvent(source, runnable, lock, true);
 
         synchronized (lock) {
             Toolkit.getEventQueue().postEvent(event);
diff --git a/jdk/src/share/classes/java/awt/Window.java b/jdk/src/share/classes/java/awt/Window.java
index 984e287bd50..4b966273e0f 100644
--- a/jdk/src/share/classes/java/awt/Window.java
+++ b/jdk/src/share/classes/java/awt/Window.java
@@ -1206,7 +1206,7 @@ public class Window extends Container implements Accessible {
         }
         else {
             try {
-                EventQueue.invokeAndWait(action);
+                EventQueue.invokeAndWait(this, action);
             }
             catch (InterruptedException e) {
                 System.err.println("Disposal was interrupted:");
diff --git a/jdk/src/share/classes/javax/swing/RepaintManager.java b/jdk/src/share/classes/javax/swing/RepaintManager.java
index aa3f8bdf50c..8f2e6093393 100644
--- a/jdk/src/share/classes/javax/swing/RepaintManager.java
+++ b/jdk/src/share/classes/javax/swing/RepaintManager.java
@@ -27,11 +27,12 @@ package javax.swing;
 
 import java.awt.*;
 import java.awt.event.*;
-import java.awt.peer.ComponentPeer;
-import java.awt.peer.ContainerPeer;
 import java.awt.image.VolatileImage;
+import java.security.AccessControlContext;
 import java.security.AccessController;
+import java.security.PrivilegedAction;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.applet.*;
 
 import sun.awt.AWTAccessor;
@@ -39,6 +40,8 @@ import sun.awt.AppContext;
 import sun.awt.DisplayChangedListener;
 import sun.awt.SunToolkit;
 import sun.java2d.SunGraphicsEnvironment;
+import sun.misc.JavaSecurityAccess;
+import sun.misc.SharedSecrets;
 import sun.security.action.GetPropertyAction;
 
 import com.sun.java.swing.SwingUtilities3;
@@ -176,6 +179,9 @@ public class RepaintManager
      */
     private final ProcessingRunnable processingRunnable;
 
+    private final static JavaSecurityAccess javaSecurityAccess =
+        SharedSecrets.getJavaSecurityAccess();
+
 
     static {
         volatileImageBufferEnabled = "true".equals(AccessController.
@@ -548,13 +554,26 @@ public class RepaintManager
     // This is called from the toolkit thread when awt needs to run a
     // Runnable before we paint.
     //
-    void nativeQueueSurfaceDataRunnable(AppContext appContext, Component c,
-                                        Runnable r) {
+    void nativeQueueSurfaceDataRunnable(AppContext appContext,
+                                        final Component c, final Runnable r)
+    {
         synchronized(this) {
             if (runnableList == null) {
                 runnableList = new LinkedList<Runnable>();
             }
-            runnableList.add(r);
+            runnableList.add(new Runnable() {
+                public void run() {
+                    AccessControlContext stack = AccessController.getContext();
+                    AccessControlContext acc =
+                        AWTAccessor.getComponentAccessor().getAccessControlContext(c);
+                    javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction<Void>() {
+                        public Void run() {
+                            r.run();
+                            return null;
+                        }
+                    }, stack, acc);
+                }
+            });
         }
         scheduleProcessingRunnable(appContext);
     }
@@ -652,9 +671,9 @@ public class RepaintManager
      * @see #addInvalidComponent
      */
     public void validateInvalidComponents() {
-        java.util.List<Component> ic;
+        final java.util.List<Component> ic;
         synchronized(this) {
-            if(invalidComponents == null) {
+            if (invalidComponents == null) {
                 return;
             }
             ic = invalidComponents;
@@ -662,7 +681,17 @@ public class RepaintManager
         }
         int n = ic.size();
         for(int i = 0; i < n; i++) {
-            ic.get(i).validate();
+            final Component c = ic.get(i);
+            AccessControlContext stack = AccessController.getContext();
+            AccessControlContext acc =
+                AWTAccessor.getComponentAccessor().getAccessControlContext(c);
+            javaSecurityAccess.doIntersectionPrivilege(
+                new PrivilegedAction<Void>() {
+                    public Void run() {
+                        c.validate();
+                        return null;
+                    }
+                }, stack, acc);
         }
     }
 
@@ -740,78 +769,78 @@ public class RepaintManager
         paintDirtyRegions(tmpDirtyComponents);
     }
 
-    private void paintDirtyRegions(Map<Component,Rectangle>
-                                   tmpDirtyComponents){
-        int i, count;
-        java.util.List<Component> roots;
-        Component dirtyComponent;
-
-        count = tmpDirtyComponents.size();
-        if (count == 0) {
+    private void paintDirtyRegions(
+        final Map<Component,Rectangle> tmpDirtyComponents)
+    {
+        if (tmpDirtyComponents.isEmpty()) {
             return;
         }
 
-        Rectangle rect;
-        int localBoundsX = 0;
-        int localBoundsY = 0;
-        int localBoundsH;
-        int localBoundsW;
-
-        roots = new ArrayList<Component>(count);
-
+        final java.util.List<Component> roots =
+            new ArrayList<Component>(tmpDirtyComponents.size());
         for (Component dirty : tmpDirtyComponents.keySet()) {
             collectDirtyComponents(tmpDirtyComponents, dirty, roots);
         }
 
-        count = roots.size();
+        final AtomicInteger count = new AtomicInteger(roots.size());
         painting = true;
         try {
-            for(i=0 ; i < count ; i++) {
-                dirtyComponent = roots.get(i);
-                rect = tmpDirtyComponents.get(dirtyComponent);
-                // Sometimes when RepaintManager is changed during the painting
-                // we may get null here, see #6995769 for details
-                if (rect == null) {
-                    continue;
-                }
-                localBoundsH = dirtyComponent.getHeight();
-                localBoundsW = dirtyComponent.getWidth();
-
-                SwingUtilities.computeIntersection(localBoundsX,
-                                                   localBoundsY,
-                                                   localBoundsW,
-                                                   localBoundsH,
-                                                   rect);
-                if (dirtyComponent instanceof JComponent) {
-                    ((JComponent)dirtyComponent).paintImmediately(
-                        rect.x,rect.y,rect.width, rect.height);
-                }
-                else if (dirtyComponent.isShowing()) {
-                    Graphics g = JComponent.safelyGetGraphics(
-                            dirtyComponent, dirtyComponent);
-                    // If the Graphics goes away, it means someone disposed of
-                    // the window, don't do anything.
-                    if (g != null) {
-                        g.setClip(rect.x, rect.y, rect.width, rect.height);
-                        try {
-                            dirtyComponent.paint(g);
-                        } finally {
-                            g.dispose();
+            for (int j=0 ; j < count.get(); j++) {
+                final int i = j;
+                final Component dirtyComponent = roots.get(j);
+                AccessControlContext stack = AccessController.getContext();
+                AccessControlContext acc =
+                    AWTAccessor.getComponentAccessor().getAccessControlContext(dirtyComponent);
+                javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction<Void>() {
+                    public Void run() {
+                        Rectangle rect = tmpDirtyComponents.get(dirtyComponent);
+                        // Sometimes when RepaintManager is changed during the painting
+                        // we may get null here, see #6995769 for details
+                        if (rect == null) {
+                            return null;
                         }
+
+                        int localBoundsH = dirtyComponent.getHeight();
+                        int localBoundsW = dirtyComponent.getWidth();
+                        SwingUtilities.computeIntersection(0,
+                                                           0,
+                                                           localBoundsW,
+                                                           localBoundsH,
+                                                           rect);
+                        if (dirtyComponent instanceof JComponent) {
+                            ((JComponent)dirtyComponent).paintImmediately(
+                                rect.x,rect.y,rect.width, rect.height);
+                        }
+                        else if (dirtyComponent.isShowing()) {
+                            Graphics g = JComponent.safelyGetGraphics(
+                                    dirtyComponent, dirtyComponent);
+                            // If the Graphics goes away, it means someone disposed of
+                            // the window, don't do anything.
+                            if (g != null) {
+                                g.setClip(rect.x, rect.y, rect.width, rect.height);
+                                try {
+                                    dirtyComponent.paint(g);
+                                } finally {
+                                    g.dispose();
+                                }
+                            }
+                        }
+                        // If the repaintRoot has been set, service it now and
+                        // remove any components that are children of repaintRoot.
+                        if (repaintRoot != null) {
+                            adjustRoots(repaintRoot, roots, i + 1);
+                            count.set(roots.size());
+                            paintManager.isRepaintingRoot = true;
+                            repaintRoot.paintImmediately(0, 0, repaintRoot.getWidth(),
+                                                         repaintRoot.getHeight());
+                            paintManager.isRepaintingRoot = false;
+                            // Only service repaintRoot once.
+                            repaintRoot = null;
+                        }
+
+                        return null;
                     }
-                }
-                // If the repaintRoot has been set, service it now and
-                // remove any components that are children of repaintRoot.
-                if (repaintRoot != null) {
-                    adjustRoots(repaintRoot, roots, i + 1);
-                    count = roots.size();
-                    paintManager.isRepaintingRoot = true;
-                    repaintRoot.paintImmediately(0, 0, repaintRoot.getWidth(),
-                                                 repaintRoot.getHeight());
-                    paintManager.isRepaintingRoot = false;
-                    // Only service repaintRoot once.
-                    repaintRoot = null;
-                }
+                }, stack, acc);
             }
         } finally {
             painting = false;
diff --git a/jdk/src/share/classes/sun/applet/AppletPanel.java b/jdk/src/share/classes/sun/applet/AppletPanel.java
index e090beec417..5ca566214db 100644
--- a/jdk/src/share/classes/sun/applet/AppletPanel.java
+++ b/jdk/src/share/classes/sun/applet/AppletPanel.java
@@ -45,6 +45,7 @@ import java.util.*;
 import java.util.Collections;
 import java.util.Locale;
 import java.util.WeakHashMap;
+import sun.awt.AWTAccessor;
 import sun.awt.AppContext;
 import sun.awt.EmbeddedFrame;
 import sun.awt.SunToolkit;
@@ -448,12 +449,12 @@ abstract class AppletPanel extends Panel implements AppletStub, Runnable {
                       // to avoid deadlock.
                       try {
                           final AppletPanel p = this;
-
-                          EventQueue.invokeAndWait(new Runnable() {
-                                  public void run() {
-                                      p.validate();
-                                  }
-                              });
+                          Runnable r = new Runnable() {
+                              public void run() {
+                                  p.validate();
+                              }
+                          };
+                          AWTAccessor.getEventQueueAccessor().invokeAndWait(applet, r);
                       }
                       catch(InterruptedException ie) {
                       }
@@ -478,18 +479,19 @@ abstract class AppletPanel extends Panel implements AppletStub, Runnable {
                       try {
                           final AppletPanel p = this;
                           final Applet a = applet;
+                          Runnable r = new Runnable() {
+                              public void run() {
+                                  p.validate();
+                                  a.setVisible(true);
 
-                          EventQueue.invokeAndWait(new Runnable() {
-                                  public void run() {
-                                      p.validate();
-                                      a.setVisible(true);
-
-                                      // Fix for BugTraq ID 4041703.
-                                      // Set the default focus for an applet.
-                                      if (hasInitialFocus())
-                                        setDefaultFocus();
+                                  // Fix for BugTraq ID 4041703.
+                                  // Set the default focus for an applet.
+                                  if (hasInitialFocus()) {
+                                      setDefaultFocus();
                                   }
-                              });
+                              }
+                          };
+                          AWTAccessor.getEventQueueAccessor().invokeAndWait(applet, r);
                       }
                       catch(InterruptedException ie) {
                       }
@@ -512,13 +514,12 @@ abstract class AppletPanel extends Panel implements AppletStub, Runnable {
                     // to avoid deadlock.
                     try {
                         final Applet a = applet;
-
-                        EventQueue.invokeAndWait(new Runnable() {
-                                public void run()
-                                {
-                                    a.setVisible(false);
-                                }
-                            });
+                        Runnable r = new Runnable() {
+                            public void run() {
+                                a.setVisible(false);
+                            }
+                        };
+                        AWTAccessor.getEventQueueAccessor().invokeAndWait(applet, r);
                     }
                     catch(InterruptedException ie) {
                     }
@@ -570,17 +571,14 @@ abstract class AppletPanel extends Panel implements AppletStub, Runnable {
                     }
                     status = APPLET_DISPOSE;
 
-                    try
-                    {
+                    try {
                         final Applet a = applet;
-
-                        EventQueue.invokeAndWait(new Runnable()
-                        {
-                            public void run()
-                            {
+                        Runnable r = new Runnable() {
+                            public void run() {
                                 remove(a);
                             }
-                        });
+                        };
+                        AWTAccessor.getEventQueueAccessor().invokeAndWait(applet, r);
                     }
                     catch(InterruptedException ie)
                     {
diff --git a/jdk/src/share/classes/sun/awt/AWTAccessor.java b/jdk/src/share/classes/sun/awt/AWTAccessor.java
index 21f426da2f5..633fdcb4c18 100644
--- a/jdk/src/share/classes/sun/awt/AWTAccessor.java
+++ b/jdk/src/share/classes/sun/awt/AWTAccessor.java
@@ -34,6 +34,8 @@ import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 import java.awt.geom.Point2D;
 import java.awt.peer.ComponentPeer;
+
+import java.lang.reflect.InvocationTargetException;
 import java.security.AccessControlContext;
 
 import java.io.File;
@@ -476,6 +478,12 @@ public final class AWTAccessor {
          * appeared.
          */
         void wakeup(EventQueue eventQueue, boolean isShutdown);
+
+        /**
+         * Static in EventQueue
+         */
+        void invokeAndWait(Object source, Runnable r)
+            throws InterruptedException, InvocationTargetException;
     }
 
     /*
diff --git a/jdk/src/windows/classes/sun/awt/windows/WComponentPeer.java b/jdk/src/windows/classes/sun/awt/windows/WComponentPeer.java
index 6f788c2ac5d..37a257f1130 100644
--- a/jdk/src/windows/classes/sun/awt/windows/WComponentPeer.java
+++ b/jdk/src/windows/classes/sun/awt/windows/WComponentPeer.java
@@ -488,14 +488,15 @@ public abstract class WComponentPeer extends WObjectPeer
                     try {
                         replaceSurfaceData();
                     } catch (InvalidPipeException e) {
-                    // REMIND : what do we do if our surface creation failed?
+                        // REMIND : what do we do if our surface creation failed?
                     }
                 }
             }
         };
+        Component c = (Component)target;
         // Fix 6255371.
-        if (!PaintEventDispatcher.getPaintEventDispatcher().queueSurfaceDataReplacing((Component)target, r)) {
-            postEvent(new InvocationEvent(Toolkit.getDefaultToolkit(), r));
+        if (!PaintEventDispatcher.getPaintEventDispatcher().queueSurfaceDataReplacing(c, r)) {
+            postEvent(new InvocationEvent(c, r));
         }
     }
 
@@ -618,7 +619,7 @@ public abstract class WComponentPeer extends WObjectPeer
     }
 
     public void disposeLater() {
-        postEvent(new InvocationEvent(Toolkit.getDefaultToolkit(), new Runnable() {
+        postEvent(new InvocationEvent(target, new Runnable() {
             public void run() {
                 dispose();
             }
diff --git a/jdk/src/windows/classes/sun/awt/windows/WEmbeddedFrame.java b/jdk/src/windows/classes/sun/awt/windows/WEmbeddedFrame.java
index b0f9cd3279d..3bc2c3b6b63 100644
--- a/jdk/src/windows/classes/sun/awt/windows/WEmbeddedFrame.java
+++ b/jdk/src/windows/classes/sun/awt/windows/WEmbeddedFrame.java
@@ -27,6 +27,7 @@ package sun.awt.windows;
 
 import sun.awt.*;
 import java.awt.*;
+import java.awt.event.InvocationEvent;
 import java.awt.peer.ComponentPeer;
 import java.awt.image.*;
 import sun.awt.image.ByteInterleavedRaster;
@@ -232,11 +233,13 @@ public class WEmbeddedFrame extends EmbeddedFrame {
         } else {
             // To avoid focus concurrence b/w IE and EmbeddedFrame
             // activation is postponed by means of posting it to EDT.
-            EventQueue.invokeLater(new Runnable() {
-                    public void run() {
-                        ((WEmbeddedFramePeer)getPeer()).synthesizeWmActivate(true);
-                    }
-                });
+            Runnable r = new Runnable() {
+                public void run() {
+                    ((WEmbeddedFramePeer)getPeer()).synthesizeWmActivate(true);
+                }
+            };
+            WToolkit.postEvent(WToolkit.targetToAppContext(this),
+                               new InvocationEvent(this, r));
         }
     }
 

From 7749e896e76a27c5872c068bf24f4bd84b294abb Mon Sep 17 00:00:00 2001
From: Andrew Brygin <bae@openjdk.org>
Date: Fri, 16 Nov 2012 11:05:43 +0400
Subject: [PATCH 028/311] 8001972: Improve image processing

Reviewed-by: prr, ahgross
---
 .../sun/awt/image/ByteComponentRaster.java    | 70 ++++++++++-----
 .../sun/awt/image/ByteInterleavedRaster.java  | 29 +-----
 .../sun/awt/image/ShortComponentRaster.java   | 69 +++++++++-----
 .../sun/awt/image/ShortInterleavedRaster.java | 29 +-----
 .../native/sun/awt/image/awt_parseImage.c     | 90 +++++++++++++++++--
 .../native/sun/awt/medialib/safe_alloc.h      |  5 ++
 6 files changed, 191 insertions(+), 101 deletions(-)

diff --git a/jdk/src/share/classes/sun/awt/image/ByteComponentRaster.java b/jdk/src/share/classes/sun/awt/image/ByteComponentRaster.java
index c92f7665904..49c642e37db 100644
--- a/jdk/src/share/classes/sun/awt/image/ByteComponentRaster.java
+++ b/jdk/src/share/classes/sun/awt/image/ByteComponentRaster.java
@@ -198,7 +198,7 @@ public class ByteComponentRaster extends SunWritableRaster {
         }
         this.bandOffset = this.dataOffsets[0];
 
-        verify(false);
+        verify();
     }
 
     /**
@@ -857,38 +857,68 @@ public class ByteComponentRaster extends SunWritableRaster {
     }
 
     /**
-     * Verify that the layout parameters are consistent with
-     * the data.  If strictCheck
-     * is false, this method will check for ArrayIndexOutOfBounds conditions.  If
-     * strictCheck is true, this method will check for additional error
-     * conditions such as line wraparound (width of a line greater than
-     * the scanline stride).
-     * @return   String   Error string, if the layout is incompatible with
-     *                    the data.  Otherwise returns null.
+     * Verify that the layout parameters are consistent with the data.
+     *
+     * The method verifies whether scanline stride and pixel stride do not
+     * cause an integer overflow during calculation of a position of the pixel
+     * in data buffer. It also verifies whether the data buffer has enough data
+     *  to correspond the raster layout attributes.
+     *
+     * @throws RasterFormatException if an integer overflow is detected,
+     * or if data buffer has not enough capacity.
      */
-    private void verify (boolean strictCheck) {
-        // Make sure data for Raster is in a legal range
-        for (int i=0; i < dataOffsets.length; i++) {
+    protected final void verify() {
+        for (int i = 0; i < dataOffsets.length; i++) {
             if (dataOffsets[i] < 0) {
-                throw new RasterFormatException("Data offsets for band "+i+
-                                                "("+dataOffsets[i]+
-                                                ") must be >= 0");
+                throw new RasterFormatException("Data offsets for band " + i
+                            + "(" + dataOffsets[i]
+                            + ") must be >= 0");
             }
         }
 
         int maxSize = 0;
         int size;
 
-        for (int i=0; i < numDataElements; i++) {
-            size = (height-1)*scanlineStride + (width-1)*pixelStride +
-                dataOffsets[i];
+        // we can be sure that width and height are greater than 0
+        if (scanlineStride < 0 ||
+            scanlineStride > (Integer.MAX_VALUE / height))
+        {
+            // integer overflow
+            throw new RasterFormatException("Incorrect scanline stride: "
+                    + scanlineStride);
+        }
+        int lastScanOffset = (height - 1) * scanlineStride;
+
+        if (pixelStride < 0 ||
+            pixelStride > (Integer.MAX_VALUE / width))
+        {
+            // integer overflow
+            throw new RasterFormatException("Incorrect pixel stride: "
+                    + pixelStride);
+        }
+        int lastPixelOffset = (width - 1) * pixelStride;
+
+        if (lastPixelOffset > (Integer.MAX_VALUE - lastScanOffset)) {
+            // integer overflow
+            throw new RasterFormatException("Incorrect raster attributes");
+        }
+        lastPixelOffset += lastScanOffset;
+
+        for (int i = 0; i < numDataElements; i++) {
+            size = lastPixelOffset + dataOffsets[i];
+            if (dataOffsets[i] > (Integer.MAX_VALUE - lastPixelOffset)) {
+                throw new RasterFormatException("Incorrect band offset: "
+                            + dataOffsets[i]);
+
+            }
+
             if (size > maxSize) {
                 maxSize = size;
             }
         }
         if (data.length < maxSize) {
-            throw new RasterFormatException("Data array too small (should be "+
-                                          maxSize+" )");
+            throw new RasterFormatException("Data array too small (should be "
+                    + maxSize + " )");
         }
     }
 
diff --git a/jdk/src/share/classes/sun/awt/image/ByteInterleavedRaster.java b/jdk/src/share/classes/sun/awt/image/ByteInterleavedRaster.java
index b721d686867..4279ce1f90a 100644
--- a/jdk/src/share/classes/sun/awt/image/ByteInterleavedRaster.java
+++ b/jdk/src/share/classes/sun/awt/image/ByteInterleavedRaster.java
@@ -250,7 +250,7 @@ public class ByteInterleavedRaster extends ByteComponentRaster {
             }
         }
 
-        verify(false);
+        verify();
     }
 
     /**
@@ -1292,33 +1292,6 @@ public class ByteInterleavedRaster extends ByteComponentRaster {
         return createCompatibleWritableRaster(width,height);
     }
 
-    /**
-     * Verify that the layout parameters are consistent with
-     * the data.  If strictCheck
-     * is false, this method will check for ArrayIndexOutOfBounds conditions.  If
-     * strictCheck is true, this method will check for additional error
-     * conditions such as line wraparound (width of a line greater than
-     * the scanline stride).
-     * @return   String   Error string, if the layout is incompatible with
-     *                    the data.  Otherwise returns null.
-     */
-    private void verify (boolean strictCheck) {
-        int maxSize = 0;
-        int size;
-
-        for (int i=0; i < numDataElements; i++) {
-            size = (height-1)*scanlineStride + (width-1)*pixelStride +
-                dataOffsets[i];
-            if (size > maxSize) {
-                maxSize = size;
-            }
-        }
-        if (data.length < maxSize) {
-            throw new RasterFormatException("Data array too small (should be "+
-                                          maxSize+" )");
-        }
-    }
-
     public String toString() {
         return new String ("ByteInterleavedRaster: width = "+width+" height = "
                            + height
diff --git a/jdk/src/share/classes/sun/awt/image/ShortComponentRaster.java b/jdk/src/share/classes/sun/awt/image/ShortComponentRaster.java
index bc39bd2f0c8..df2c0f7d663 100644
--- a/jdk/src/share/classes/sun/awt/image/ShortComponentRaster.java
+++ b/jdk/src/share/classes/sun/awt/image/ShortComponentRaster.java
@@ -198,7 +198,7 @@ public class ShortComponentRaster extends SunWritableRaster {
         }
         this.bandOffset = this.dataOffsets[0];
 
-        verify(false);
+        verify();
     }
 
     /**
@@ -791,38 +791,67 @@ public class ShortComponentRaster extends SunWritableRaster {
     }
 
     /**
-     * Verify that the layout parameters are consistent with
-     * the data.  If strictCheck
-     * is false, this method will check for ArrayIndexOutOfBounds conditions.  If
-     * strictCheck is true, this method will check for additional error
-     * conditions such as line wraparound (width of a line greater than
-     * the scanline stride).
-     * @return   String   Error string, if the layout is incompatible with
-     *                    the data.  Otherwise returns null.
+     * Verify that the layout parameters are consistent with the data.
+     *
+     * The method verifies whether scanline stride and pixel stride do not
+     * cause an integer overflow during calculation of a position of the pixel
+     * in data buffer. It also verifies whether the data buffer has enough data
+     *  to correspond the raster layout attributes.
+     *
+     * @throws RasterFormatException if an integer overflow is detected,
+     * or if data buffer has not enough capacity.
      */
-    private void verify (boolean strictCheck) {
-        // Make sure data for Raster is in a legal range
-        for (int i=0; i < dataOffsets.length; i++) {
+    protected final void verify() {
+        for (int i = 0; i < dataOffsets.length; i++) {
             if (dataOffsets[i] < 0) {
-                throw new RasterFormatException("Data offsets for band "+i+
-                                                "("+dataOffsets[i]+
-                                                ") must be >= 0");
+                throw new RasterFormatException("Data offsets for band " + i
+                            + "(" + dataOffsets[i]
+                            + ") must be >= 0");
             }
         }
 
         int maxSize = 0;
         int size;
 
-        for (int i=0; i < numDataElements; i++) {
-            size = (height-1)*scanlineStride + (width-1)*pixelStride +
-                dataOffsets[i];
+        // we can be sure that width and height are greater than 0
+        if (scanlineStride < 0 ||
+            scanlineStride > (Integer.MAX_VALUE / height))
+        {
+            // integer overflow
+            throw new RasterFormatException("Incorrect scanline stride: "
+                    + scanlineStride);
+        }
+        int lastScanOffset = (height - 1) * scanlineStride;
+
+        if (pixelStride < 0 ||
+            pixelStride > (Integer.MAX_VALUE / width))
+        {
+            // integer overflow
+            throw new RasterFormatException("Incorrect pixel stride: "
+                    + pixelStride);
+        }
+        int lastPixelOffset = (width - 1) * pixelStride;
+
+        if (lastPixelOffset > (Integer.MAX_VALUE - lastScanOffset)) {
+            // integer overflow
+            throw new RasterFormatException("Incorrect raster attributes");
+        }
+        lastPixelOffset += lastScanOffset;
+
+        for (int i = 0; i < numDataElements; i++) {
+            size = lastPixelOffset + dataOffsets[i];
+            if (dataOffsets[i] > (Integer.MAX_VALUE - lastPixelOffset)) {
+                throw new RasterFormatException("Incorrect band offset: "
+                            + dataOffsets[i]);
+            }
+
             if (size > maxSize) {
                 maxSize = size;
             }
         }
         if (data.length < maxSize) {
-            throw new RasterFormatException("Data array too small (should be "+
-                                          maxSize+" )");
+            throw new RasterFormatException("Data array too small (should be "
+                    + maxSize + " )");
         }
     }
 
diff --git a/jdk/src/share/classes/sun/awt/image/ShortInterleavedRaster.java b/jdk/src/share/classes/sun/awt/image/ShortInterleavedRaster.java
index ef624f978c2..c55d111d7fd 100644
--- a/jdk/src/share/classes/sun/awt/image/ShortInterleavedRaster.java
+++ b/jdk/src/share/classes/sun/awt/image/ShortInterleavedRaster.java
@@ -171,7 +171,7 @@ public class ShortInterleavedRaster extends ShortComponentRaster {
               sampleModel);
         }
         this.bandOffset = this.dataOffsets[0];
-        verify(false);
+        verify();
     }
 
     /**
@@ -762,33 +762,6 @@ public class ShortInterleavedRaster extends ShortComponentRaster {
         return createCompatibleWritableRaster(width,height);
     }
 
-    /**
-     * Verify that the layout parameters are consistent with
-     * the data.  If strictCheck
-     * is false, this method will check for ArrayIndexOutOfBounds conditions.  If
-     * strictCheck is true, this method will check for additional error
-     * conditions such as line wraparound (width of a line greater than
-     * the scanline stride).
-     * @return   String   Error string, if the layout is incompatible with
-     *                    the data.  Otherwise returns null.
-     */
-    private void verify (boolean strictCheck) {
-        int maxSize = 0;
-        int size;
-
-        for (int i=0; i < numDataElements; i++) {
-            size = (height-1)*scanlineStride + (width-1)*pixelStride +
-                dataOffsets[i];
-            if (size > maxSize) {
-                maxSize = size;
-            }
-        }
-        if (data.length < maxSize) {
-            throw new RasterFormatException("Data array too small (should be "+
-                                          maxSize+" )");
-        }
-    }
-
     public String toString() {
         return new String ("ShortInterleavedRaster: width = "+width
                            +" height = " + height
diff --git a/jdk/src/share/native/sun/awt/image/awt_parseImage.c b/jdk/src/share/native/sun/awt/image/awt_parseImage.c
index 264a02f1642..cdd22189d78 100644
--- a/jdk/src/share/native/sun/awt/image/awt_parseImage.c
+++ b/jdk/src/share/native/sun/awt/image/awt_parseImage.c
@@ -114,6 +114,62 @@ int awt_parseImage(JNIEnv *env, jobject jimage, BufImageS_t **imagePP,
     return status;
 }
 
+/* Verifies whether the channel offsets are sane and correspond to the type of
+ * the raster.
+ *
+ * Return value:
+ *     0: Failure: channel offsets are invalid
+ *     1: Success
+ */
+static int checkChannelOffsets(RasterS_t *rasterP, int dataArrayLength) {
+    int i, lastPixelOffset, lastScanOffset;
+    switch (rasterP->rasterType) {
+    case COMPONENT_RASTER_TYPE:
+        if (!SAFE_TO_MULT(rasterP->height, rasterP->scanlineStride)) {
+            return 0;
+        }
+        if (!SAFE_TO_MULT(rasterP->width, rasterP->pixelStride)) {
+            return 0;
+        }
+
+        lastScanOffset = (rasterP->height - 1) * rasterP->scanlineStride;
+        lastPixelOffset = (rasterP->width - 1) * rasterP->pixelStride;
+
+
+        if (!SAFE_TO_ADD(lastPixelOffset, lastScanOffset)) {
+            return 0;
+        }
+
+        lastPixelOffset += lastScanOffset;
+
+        for (i = 0; i < rasterP->numDataElements; i++) {
+            int off = rasterP->chanOffsets[i];
+            int size = lastPixelOffset + off;
+
+            if (off < 0 || !SAFE_TO_ADD(lastPixelOffset, off)) {
+                return 0;
+            }
+
+            if (size < lastPixelOffset || size >= dataArrayLength) {
+                // an overflow, or insufficient buffer capacity
+                return 0;
+            }
+        }
+        return 1;
+    case BANDED_RASTER_TYPE:
+        // NB:caller does not support the banded rasters yet,
+        // so this branch of the code must be re-defined in
+        // order to provide valid criteria for the data offsets
+        // verification, when/if banded rasters will be supported.
+        // At the moment, we prohibit banded rasters as well.
+        return 0;
+    default:
+        // PACKED_RASTER_TYPE: does not support channel offsets
+        // UNKNOWN_RASTER_TYPE: should not be used, likely indicates an error
+        return 0;
+    }
+}
+
 /* Parse the raster.  All of the raster information is returned in the
  * rasterP structure.
  *
@@ -125,7 +181,6 @@ int awt_parseImage(JNIEnv *env, jobject jimage, BufImageS_t **imagePP,
 int awt_parseRaster(JNIEnv *env, jobject jraster, RasterS_t *rasterP) {
     jobject joffs = NULL;
     /* int status;*/
-    int isDiscrete = TRUE;
 
     if (JNU_IsNull(env, jraster)) {
         JNU_ThrowNullPointerException(env, "null Raster object");
@@ -155,6 +210,9 @@ int awt_parseRaster(JNIEnv *env, jobject jraster, RasterS_t *rasterP) {
         return -1;
     }
 
+    // make sure that the raster type is initialized
+    rasterP->rasterType = UNKNOWN_RASTER_TYPE;
+
     if (rasterP->numBands <= 0 ||
         rasterP->numBands > MAX_NUMBANDS)
     {
@@ -254,7 +312,6 @@ int awt_parseRaster(JNIEnv *env, jobject jraster, RasterS_t *rasterP) {
         }
         rasterP->chanOffsets[0] = (*env)->GetIntField(env, jraster, g_BPRdataBitOffsetID);
         rasterP->dataType = BYTE_DATA_TYPE;
-        isDiscrete = FALSE;
     }
     else {
         rasterP->type = sun_awt_image_IntegerComponentRaster_TYPE_CUSTOM;
@@ -265,7 +322,19 @@ int awt_parseRaster(JNIEnv *env, jobject jraster, RasterS_t *rasterP) {
         return 0;
     }
 
-    if (isDiscrete) {
+    // do basic validation of the raster structure
+    if (rasterP->width <= 0 || rasterP->height <= 0 ||
+        rasterP->pixelStride <= 0 || rasterP->scanlineStride <= 0)
+    {
+        // invalid raster
+        return -1;
+    }
+
+    // channel (data) offsets
+    switch (rasterP->rasterType) {
+    case COMPONENT_RASTER_TYPE:
+    case BANDED_RASTER_TYPE: // note that this routine does not support banded rasters at the moment
+        // get channel (data) offsets
         rasterP->chanOffsets = NULL;
         if (SAFE_TO_ALLOC_2(rasterP->numDataElements, sizeof(jint))) {
             rasterP->chanOffsets =
@@ -278,10 +347,21 @@ int awt_parseRaster(JNIEnv *env, jobject jraster, RasterS_t *rasterP) {
         }
         (*env)->GetIntArrayRegion(env, joffs, 0, rasterP->numDataElements,
                                   rasterP->chanOffsets);
+        if (rasterP->jdata == NULL) {
+            // unable to verify the raster
+            return -1;
+        }
+        // verify whether channel offsets look sane
+        if (!checkChannelOffsets(rasterP, (*env)->GetArrayLength(env, rasterP->jdata))) {
+            return -1;
+        }
+        break;
+    default:
+        ; // PACKED_RASTER_TYPE does not use the channel offsets.
     }
 
-    /* additioanl check for sppsm fields validity: make sure that
-     * size of raster samples doesn't exceed the data type cpacity.
+    /* additional check for sppsm fields validity: make sure that
+     * size of raster samples doesn't exceed the data type capacity.
      */
     if (rasterP->dataType > UNKNOWN_DATA_TYPE && /* data type has been recognized */
         rasterP->sppsm.maxBitSize > 0 && /* raster has SPP sample model */
diff --git a/jdk/src/share/native/sun/awt/medialib/safe_alloc.h b/jdk/src/share/native/sun/awt/medialib/safe_alloc.h
index ce744af2c3b..579d98638dc 100644
--- a/jdk/src/share/native/sun/awt/medialib/safe_alloc.h
+++ b/jdk/src/share/native/sun/awt/medialib/safe_alloc.h
@@ -41,5 +41,10 @@
     (((w) > 0) && ((h) > 0) && ((sz) > 0) &&                               \
      (((0xffffffffu / ((juint)(w))) / ((juint)(h))) > ((juint)(sz))))
 
+#define SAFE_TO_MULT(a, b) \
+    (((a) > 0) && ((b) >= 0) && ((0x7fffffff / (a)) > (b)))
+
+#define SAFE_TO_ADD(a, b) \
+    (((a) >= 0) && ((b) >= 0) && ((0x7fffffff - (a)) > (b)))
 
 #endif // __SAFE_ALLOC_H__

From 52caa8646b6b5ea2ae4a3b6883c8072f257db2ef Mon Sep 17 00:00:00 2001
From: Darryl Mocek <dmocek@openjdk.org>
Date: Mon, 19 Nov 2012 13:54:12 -0800
Subject: [PATCH 029/311] 6563318: RMI data sanitization

Reviewed-by: ahgross, hawtin, mchung, smarks
---
 .../sun/rmi/transport/proxy/CGIHandler.java   |  6 +--
 jdk/test/java/rmi/testlibrary/JavaVM.java     | 39 +++++++++++++++++++
 2 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java b/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java
index 918986deec9..460c9f17203 100644
--- a/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java
+++ b/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -153,7 +153,7 @@ public final class CGIHandler {
                     returnServerError(e.getMessage());
                 }
             else
-                returnClientError("invalid command: " + command);
+                returnClientError("invalid command.");
         } catch (Exception e) {
             returnServerError("internal error: " + e.getMessage());
         }
@@ -225,7 +225,7 @@ final class CGIForwardCommand implements CGICommandHandler {
         try {
             port = Integer.parseInt(param);
         } catch (NumberFormatException e) {
-            throw new CGIClientException("invalid port number: " + param);
+            throw new CGIClientException("invalid port number.");
         }
         if (port <= 0 || port > 0xFFFF)
             throw new CGIClientException("invalid port: " + port);
diff --git a/jdk/test/java/rmi/testlibrary/JavaVM.java b/jdk/test/java/rmi/testlibrary/JavaVM.java
index 62be87d8279..d7b94bfe4b1 100644
--- a/jdk/test/java/rmi/testlibrary/JavaVM.java
+++ b/jdk/test/java/rmi/testlibrary/JavaVM.java
@@ -133,6 +133,14 @@ public class JavaVM {
         return TestLibrary.getExtraProperty("jcov.options","");
     }
 
+    public void start(Runnable runnable) throws IOException {
+        if (runnable == null) {
+            throw new NullPointerException("Runnable cannot be null.");
+        }
+
+        start();
+        new JavaVMCallbackHandler(runnable).start();
+    }
 
     /**
      * Exec the VM as specified in this object's constructor.
@@ -235,4 +243,35 @@ public class JavaVM {
     protected Process getVM() {
         return vm;
     }
+
+    /**
+     * Handles calling the callback.
+     */
+    private class JavaVMCallbackHandler extends Thread {
+        Runnable runnable;
+
+        JavaVMCallbackHandler(Runnable runnable) {
+            this.runnable = runnable;
+        }
+
+
+        /**
+         * Wait for the Process to terminate and notify the callback.
+         */
+        @Override
+        public void run() {
+            if (vm != null) {
+                try {
+                    vm.waitFor();
+                } catch(InterruptedException ie) {
+                    // Restore the interrupted status
+                    Thread.currentThread().interrupt();
+                }
+            }
+
+            if (runnable != null) {
+                runnable.run();
+            }
+        }
+    }
 }

From 103aa32912bf857ca25737649db2800c4dbb8365 Mon Sep 17 00:00:00 2001
From: Darryl Mocek <dmocek@openjdk.org>
Date: Mon, 19 Nov 2012 15:38:56 -0800
Subject: [PATCH 030/311] 8001242: Improve RMI HTTP conformance

Reviewed-by: ahgross, mchung, smarks
---
 .../sun/rmi/transport/proxy/CGIHandler.java       | 13 ++++++++-----
 .../sun/rmi/transport/proxy/HttpInputStream.java  | 15 +++++++++------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java b/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java
index 460c9f17203..a60b23864af 100644
--- a/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java
+++ b/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java
@@ -293,11 +293,14 @@ final class CGIForwardCommand implements CGICommandHandler {
                     "unexpected EOF reading server response");
 
             if (line.toLowerCase().startsWith(key)) {
-                // if contentLengthFound is true
-                // we should probably do something here
-                responseContentLength =
-                    Integer.parseInt(line.substring(key.length()).trim());
-                contentLengthFound = true;
+                if (contentLengthFound) {
+                    throw new CGIServerException(
+                            "Multiple Content-length entries found.");
+                } else {
+                    responseContentLength =
+                        Integer.parseInt(line.substring(key.length()).trim());
+                    contentLengthFound = true;
+                }
             }
         } while ((line.length() != 0) &&
                  (line.charAt(0) != '\r') && (line.charAt(0) != '\n'));
diff --git a/jdk/src/share/classes/sun/rmi/transport/proxy/HttpInputStream.java b/jdk/src/share/classes/sun/rmi/transport/proxy/HttpInputStream.java
index 773493e48df..3a35bb02b25 100644
--- a/jdk/src/share/classes/sun/rmi/transport/proxy/HttpInputStream.java
+++ b/jdk/src/share/classes/sun/rmi/transport/proxy/HttpInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -70,11 +70,14 @@ class HttpInputStream extends FilterInputStream {
                 throw new EOFException();
 
             if (line.toLowerCase().startsWith(key)) {
-                // if contentLengthFound is true
-                // we should probably do something here
-                bytesLeft =
-                    Integer.parseInt(line.substring(key.length()).trim());
-                contentLengthFound = true;
+                if (contentLengthFound) {
+                    throw new IOException(
+                            "Multiple Content-length entries found.");
+                } else {
+                    bytesLeft =
+                        Integer.parseInt(line.substring(key.length()).trim());
+                    contentLengthFound = true;
+                }
             }
 
             // The idea here is to go past the first blank line.

From b9b59635225b5db8216c3da0024545ad279f6f53 Mon Sep 17 00:00:00 2001
From: Andrew Brygin <bae@openjdk.org>
Date: Tue, 20 Nov 2012 11:46:42 +0400
Subject: [PATCH 031/311] 8002325: Improve management of images

Reviewed-by: prr, ahgross
---
 .../native/sun/awt/image/awt_parseImage.c     | 20 +++++++++++++++++++
 .../native/sun/awt/image/awt_parseImage.h     |  1 +
 2 files changed, 21 insertions(+)

diff --git a/jdk/src/share/native/sun/awt/image/awt_parseImage.c b/jdk/src/share/native/sun/awt/image/awt_parseImage.c
index cdd22189d78..4fe4efd2916 100644
--- a/jdk/src/share/native/sun/awt/image/awt_parseImage.c
+++ b/jdk/src/share/native/sun/awt/image/awt_parseImage.c
@@ -223,9 +223,14 @@ int awt_parseRaster(JNIEnv *env, jobject jraster, RasterS_t *rasterP) {
         return 0;
     }
 
+    rasterP->sppsm.isUsed = 0;
+
     if ((*env)->IsInstanceOf(env, rasterP->jsampleModel,
        (*env)->FindClass(env,"java/awt/image/SinglePixelPackedSampleModel"))) {
         jobject jmask, joffs, jnbits;
+
+        rasterP->sppsm.isUsed = 1;
+
         rasterP->sppsm.maxBitSize = (*env)->GetIntField(env,
                                                         rasterP->jsampleModel,
                                                         g_SPPSMmaxBitID);
@@ -711,6 +716,21 @@ setHints(JNIEnv *env, BufImageS_t *imageP) {
     }
     else if (cmodelP->cmType == DIRECT_CM_TYPE || cmodelP->cmType == PACKED_CM_TYPE) {
         int i;
+
+        /* do some sanity check first: make sure that
+         * - sample model is SinglePixelPackedSampleModel
+         * - number of bands in the raster corresponds to the number
+         *   of color components in the color model
+         */
+        if (!rasterP->sppsm.isUsed ||
+            rasterP->numBands != cmodelP->numComponents)
+        {
+            /* given raster is not compatible with the color model,
+             * so the operation has to be aborted.
+             */
+            return -1;
+        }
+
         if (cmodelP->maxNbits > 8) {
             hintP->needToExpand = TRUE;
             hintP->expandToNbits = cmodelP->maxNbits;
diff --git a/jdk/src/share/native/sun/awt/image/awt_parseImage.h b/jdk/src/share/native/sun/awt/image/awt_parseImage.h
index f58adabb754..b92bb0c2833 100644
--- a/jdk/src/share/native/sun/awt/image/awt_parseImage.h
+++ b/jdk/src/share/native/sun/awt/image/awt_parseImage.h
@@ -95,6 +95,7 @@ typedef struct {
     jint offsets[MAX_NUMBANDS];
     jint nBits[MAX_NUMBANDS];
     jint  maxBitSize;
+    jint isUsed; // flag to indicate whether the raster sample model is SPPSM
 } SPPSampleModelS_t;
 
 /* Struct that holds information for the Raster object */

From 6ddbe35ee2793eb0ebc52b013e46b65d25c804dc Mon Sep 17 00:00:00 2001
From: Denis Fokin <denis@openjdk.org>
Date: Mon, 26 Nov 2012 20:49:54 +0400
Subject: [PATCH 032/311] 7186952: Improve clipboard access

Reviewed-by: serb, ahgross
---
 .../share/classes/java/awt/TextComponent.java | 25 ++++++-------------
 .../native/sun/windows/awt_TextComponent.cpp  | 22 ++++++++--------
 .../native/sun/windows/awt_TextComponent.h    |  3 +--
 3 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/jdk/src/share/classes/java/awt/TextComponent.java b/jdk/src/share/classes/java/awt/TextComponent.java
index c99cae403a4..838c7c9dd3c 100644
--- a/jdk/src/share/classes/java/awt/TextComponent.java
+++ b/jdk/src/share/classes/java/awt/TextComponent.java
@@ -109,12 +109,6 @@ public class TextComponent extends Component implements Accessible {
     // the background color of non-editable TextComponents.
     boolean backgroundSetByClientCode = false;
 
-    /**
-     * True if this <code>TextComponent</code> has access
-     * to the System clipboard.
-     */
-    transient private boolean canAccessClipboard;
-
     transient protected TextListener textListener;
 
     /*
@@ -139,7 +133,6 @@ public class TextComponent extends Component implements Accessible {
         GraphicsEnvironment.checkHeadless();
         this.text = (text != null) ? text : "";
         setCursor(Cursor.getPredefinedCursor(Cursor.TEXT_CURSOR));
-        checkSystemClipboardAccess();
     }
 
     private void enableInputMethodsIfNecessary() {
@@ -734,17 +727,14 @@ public class TextComponent extends Component implements Accessible {
     /**
      * Assigns a valid value to the canAccessClipboard instance variable.
      */
-    private void checkSystemClipboardAccess() {
-        canAccessClipboard = true;
+    private boolean canAccessClipboard() {
         SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            try {
-                sm.checkSystemClipboardAccess();
-            }
-            catch (SecurityException e) {
-                canAccessClipboard = false;
-            }
-        }
+        if (sm == null) return true;
+        try {
+            sm.checkSystemClipboardAccess();
+            return true;
+        } catch (SecurityException e) {}
+        return false;
     }
 
     /*
@@ -827,7 +817,6 @@ public class TextComponent extends Component implements Accessible {
             }
         }
         enableInputMethodsIfNecessary();
-        checkSystemClipboardAccess();
     }
 
 
diff --git a/jdk/src/windows/native/sun/windows/awt_TextComponent.cpp b/jdk/src/windows/native/sun/windows/awt_TextComponent.cpp
index f16ba6c345c..eddcbca4088 100644
--- a/jdk/src/windows/native/sun/windows/awt_TextComponent.cpp
+++ b/jdk/src/windows/native/sun/windows/awt_TextComponent.cpp
@@ -53,14 +53,12 @@ struct EnableEditingStruct {
  * AwtTextComponent fields
  */
 
-/* java.awt.TextComponent fields */
-jfieldID AwtTextComponent::canAccessClipboardID;
-
-
 /************************************************************************
  * AwtTextComponent methods
  */
 
+jmethodID AwtTextComponent::canAccessClipboardMID;
+
 AwtTextComponent::AwtTextComponent() {
     m_synthetic = FALSE;
     m_lStartPos = -1;
@@ -367,8 +365,7 @@ AwtTextComponent::WmPaste()
         }
         jobject target = GetTarget(env);
         jboolean canAccessClipboard =
-            env->GetBooleanField(target,
-                                 AwtTextComponent::canAccessClipboardID);
+            env->CallBooleanMethod (target, AwtTextComponent::canAccessClipboardMID);
         env->DeleteLocalRef(target);
         return (canAccessClipboard) ? mrDoDefault : mrConsume;
     }
@@ -854,12 +851,13 @@ Java_sun_awt_windows_WTextComponentPeer_initIDs(JNIEnv *env, jclass cls)
 {
     TRY;
 
-    cls = env->FindClass("java/awt/TextComponent");
-    if (cls != NULL) {
-        AwtTextComponent::canAccessClipboardID =
-            env->GetFieldID(cls, "canAccessClipboard", "Z");
-        DASSERT(AwtTextComponent::canAccessClipboardID != NULL);
-    }
+    jclass textComponentClassID = env->FindClass("java/awt/TextComponent");
+    AwtTextComponent::canAccessClipboardMID =
+        env->GetMethodID(textComponentClassID,
+        "canAccessClipboard", "()Z");
+    env->DeleteLocalRef(textComponentClassID);
+
+    DASSERT(AwtTextComponent::canAccessClipboardMID != NULL);
 
     CATCH_BAD_ALLOC;
 }
diff --git a/jdk/src/windows/native/sun/windows/awt_TextComponent.h b/jdk/src/windows/native/sun/windows/awt_TextComponent.h
index e50219cd271..cc0fc97f780 100644
--- a/jdk/src/windows/native/sun/windows/awt_TextComponent.h
+++ b/jdk/src/windows/native/sun/windows/awt_TextComponent.h
@@ -42,8 +42,7 @@
 
 class AwtTextComponent : public AwtComponent {
 public:
-    /* java.awt.TextComponent canAccessClipboard field ID */
-    static jfieldID canAccessClipboardID;
+    static jmethodID canAccessClipboardMID;
 
     AwtTextComponent();
 

From 7dde39f4f5a8075a71cd57eee4c5418aaed1aa24 Mon Sep 17 00:00:00 2001
From: Mandy Chung <mchung@openjdk.org>
Date: Mon, 26 Nov 2012 22:49:06 -0800
Subject: [PATCH 033/311] 6664509: Add logging context 6664528: Find log level
 matching its name or value given at construction time

Reviewed-by: alanb, ahgross, jgish, hawtin
---
 .../classes/java/util/logging/Level.java      | 255 +++++++--
 .../classes/java/util/logging/LogManager.java | 531 +++++++++++-------
 .../classes/java/util/logging/Logger.java     |  67 ++-
 .../classes/java/util/logging/Logging.java    |  10 +-
 .../java/util/logging/LoggingProxyImpl.java   |  11 +-
 .../java/util/logging/SimpleFormatter.java    |   2 +-
 jdk/src/share/classes/sun/awt/AppContext.java |  39 +-
 .../share/classes/sun/misc/JavaAWTAccess.java |   8 +
 jdk/src/share/lib/security/java.security      |   6 +
 9 files changed, 678 insertions(+), 251 deletions(-)

diff --git a/jdk/src/share/classes/java/util/logging/Level.java b/jdk/src/share/classes/java/util/logging/Level.java
index 286ed5e6008..6847518ce02 100644
--- a/jdk/src/share/classes/java/util/logging/Level.java
+++ b/jdk/src/share/classes/java/util/logging/Level.java
@@ -24,6 +24,10 @@
  */
 
 package java.util.logging;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.ResourceBundle;
 
 /**
@@ -59,7 +63,6 @@ import java.util.ResourceBundle;
  */
 
 public class Level implements java.io.Serializable {
-    private static java.util.ArrayList<Level> known = new java.util.ArrayList<>();
     private static String defaultBundle = "sun.util.logging.resources.logging";
 
     /**
@@ -77,6 +80,9 @@ public class Level implements java.io.Serializable {
      */
     private final String resourceBundleName;
 
+    // localized level name
+    private String localizedLevelName;
+
     /**
      * OFF is a special level that can be used to turn off logging.
      * This level is initialized to <CODE>Integer.MAX_VALUE</CODE>.
@@ -202,9 +208,8 @@ public class Level implements java.io.Serializable {
         this.name = name;
         this.value = value;
         this.resourceBundleName = resourceBundleName;
-        synchronized (Level.class) {
-            known.add(this);
-        }
+        this.localizedLevelName = resourceBundleName == null ? name : null;
+        KnownLevel.add(this);
     }
 
     /**
@@ -236,12 +241,76 @@ public class Level implements java.io.Serializable {
      * @return localized name
      */
     public String getLocalizedName() {
+        return getLocalizedLevelName();
+    }
+
+    // package-private getLevelName() is used by the implementation
+    // instead of getName() to avoid calling the subclass's version
+    final String getLevelName() {
+        return this.name;
+    }
+
+    final synchronized String getLocalizedLevelName() {
+        if (localizedLevelName != null) {
+            return localizedLevelName;
+        }
+
         try {
             ResourceBundle rb = ResourceBundle.getBundle(resourceBundleName);
-            return rb.getString(name);
+            localizedLevelName = rb.getString(name);
         } catch (Exception ex) {
-            return name;
+            localizedLevelName = name;
         }
+        return localizedLevelName;
+    }
+
+    // Returns a mirrored Level object that matches the given name as
+    // specified in the Level.parse method.  Returns null if not found.
+    //
+    // It returns the same Level object as the one returned by Level.parse
+    // method if the given name is a non-localized name or integer.
+    //
+    // If the name is a localized name, findLevel and parse method may
+    // return a different level value if there is a custom Level subclass
+    // that overrides Level.getLocalizedName() to return a different string
+    // than what's returned by the default implementation.
+    //
+    static Level findLevel(String name) {
+        if (name == null) {
+            throw new NullPointerException();
+        }
+
+        KnownLevel level;
+
+        // Look for a known Level with the given non-localized name.
+        level = KnownLevel.findByName(name);
+        if (level != null) {
+            return level.mirroredLevel;
+        }
+
+        // Now, check if the given name is an integer.  If so,
+        // first look for a Level with the given value and then
+        // if necessary create one.
+        try {
+            int x = Integer.parseInt(name);
+            level = KnownLevel.findByValue(x);
+            if (level == null) {
+                // add new Level
+                Level levelObject = new Level(name, x);
+                level = KnownLevel.findByValue(x);
+            }
+            return level.mirroredLevel;
+        } catch (NumberFormatException ex) {
+            // Not an integer.
+            // Drop through.
+        }
+
+        level = KnownLevel.findByLocalizedLevelName(name);
+        if (level != null) {
+            return level.mirroredLevel;
+        }
+
+        return null;
     }
 
     /**
@@ -268,21 +337,15 @@ public class Level implements java.io.Serializable {
     // Serialization magic to prevent "doppelgangers".
     // This is a performance optimization.
     private Object readResolve() {
-        synchronized (Level.class) {
-            for (int i = 0; i < known.size(); i++) {
-                Level other = known.get(i);
-                if (this.name.equals(other.name) && this.value == other.value
-                        && (this.resourceBundleName == other.resourceBundleName ||
-                            (this.resourceBundleName != null &&
-                            this.resourceBundleName.equals(other.resourceBundleName)))) {
-                    return other;
-                }
-            }
-            // Woops.  Whoever sent us this object knows
-            // about a new log level.  Add it to our list.
-            known.add(this);
-            return this;
+        KnownLevel o = KnownLevel.matches(this);
+        if (o != null) {
+            return o.levelObject;
         }
+
+        // Woops.  Whoever sent us this object knows
+        // about a new log level.  Add it to our list.
+        Level level = new Level(this.name, this.value, this.resourceBundleName);
+        return level;
     }
 
     /**
@@ -296,6 +359,7 @@ public class Level implements java.io.Serializable {
      * <li>     "SEVERE"
      * <li>     "1000"
      * </ul>
+     *
      * @param  name   string to be parsed
      * @throws NullPointerException if the name is null
      * @throws IllegalArgumentException if the value is not valid.
@@ -315,12 +379,12 @@ public class Level implements java.io.Serializable {
         // Check that name is not null.
         name.length();
 
+        KnownLevel level;
+
         // Look for a known Level with the given non-localized name.
-        for (int i = 0; i < known.size(); i++) {
-            Level l = known.get(i);
-            if (name.equals(l.name)) {
-                return l;
-            }
+        level = KnownLevel.findByName(name);
+        if (level != null) {
+            return level.levelObject;
         }
 
         // Now, check if the given name is an integer.  If so,
@@ -328,14 +392,13 @@ public class Level implements java.io.Serializable {
         // if necessary create one.
         try {
             int x = Integer.parseInt(name);
-            for (int i = 0; i < known.size(); i++) {
-                Level l = known.get(i);
-                if (l.value == x) {
-                    return l;
-                }
+            level = KnownLevel.findByValue(x);
+            if (level == null) {
+                // add new Level
+                Level levelObject = new Level(name, x);
+                level = KnownLevel.findByValue(x);
             }
-            // Create a new Level.
-            return new Level(name, x);
+            return level.levelObject;
         } catch (NumberFormatException ex) {
             // Not an integer.
             // Drop through.
@@ -344,11 +407,9 @@ public class Level implements java.io.Serializable {
         // Finally, look for a known level with the given localized name,
         // in the current default locale.
         // This is relatively expensive, but not excessively so.
-        for (int i = 0; i < known.size(); i++) {
-            Level l =  known.get(i);
-            if (name.equals(l.getLocalizedName())) {
-                return l;
-            }
+        level = KnownLevel.findByLocalizedName(name);
+        if (level != null) {
+            return level.levelObject;
         }
 
         // OK, we've tried everything and failed
@@ -375,4 +436,124 @@ public class Level implements java.io.Serializable {
     public int hashCode() {
         return this.value;
     }
+
+    // KnownLevel class maintains the global list of all known levels.
+    // The API allows multiple custom Level instances of the same name/value
+    // be created. This class provides convenient methods to find a level
+    // by a given name, by a given value, or by a given localized name.
+    //
+    // KnownLevel wraps the following Level objects:
+    // 1. levelObject:   standard Level object or custom Level object
+    // 2. mirroredLevel: Level object representing the level specified in the
+    //                   logging configuration.
+    //
+    // Level.getName, Level.getLocalizedName, Level.getResourceBundleName methods
+    // are non-final but the name and resource bundle name are parameters to
+    // the Level constructor.  Use the mirroredLevel object instead of the
+    // levelObject to prevent the logging framework to execute foreign code
+    // implemented by untrusted Level subclass.
+    //
+    // Implementation Notes:
+    // If Level.getName, Level.getLocalizedName, Level.getResourceBundleName methods
+    // were final, the following KnownLevel implementation can be removed.
+    // Future API change should take this into consideration.
+    static final class KnownLevel {
+        private static Map<String, List<KnownLevel>> nameToLevels = new HashMap<>();
+        private static Map<Integer, List<KnownLevel>> intToLevels = new HashMap<>();
+        final Level levelObject;     // instance of Level class or Level subclass
+        final Level mirroredLevel;   // instance of Level class
+        KnownLevel(Level l) {
+            this.levelObject = l;
+            if (l.getClass() == Level.class) {
+                this.mirroredLevel = l;
+            } else {
+                this.mirroredLevel = new Level(l.name, l.value, l.resourceBundleName);
+            }
+        }
+
+        static synchronized void add(Level l) {
+            // the mirroredLevel object is always added to the list
+            // before the custom Level instance
+            KnownLevel o = new KnownLevel(l);
+            List<KnownLevel> list = nameToLevels.get(l.name);
+            if (list == null) {
+                list = new ArrayList<>();
+                nameToLevels.put(l.name, list);
+            }
+            list.add(o);
+
+            list = intToLevels.get(l.value);
+            if (list == null) {
+                list = new ArrayList<>();
+                intToLevels.put(l.value, list);
+            }
+            list.add(o);
+        }
+
+        // Returns a KnownLevel with the given non-localized name.
+        static synchronized KnownLevel findByName(String name) {
+            List<KnownLevel> list = nameToLevels.get(name);
+            if (list != null) {
+                return list.get(0);
+            }
+            return null;
+        }
+
+        // Returns a KnownLevel with the given value.
+        static synchronized KnownLevel findByValue(int value) {
+            List<KnownLevel> list = intToLevels.get(value);
+            if (list != null) {
+                return list.get(0);
+            }
+            return null;
+        }
+
+        // Returns a KnownLevel with the given localized name matching
+        // by calling the Level.getLocalizedLevelName() method (i.e. found
+        // from the resourceBundle associated with the Level object).
+        // This method does not call Level.getLocalizedName() that may
+        // be overridden in a subclass implementation
+        static synchronized KnownLevel findByLocalizedLevelName(String name) {
+            for (List<KnownLevel> levels : nameToLevels.values()) {
+                for (KnownLevel l : levels) {
+                    String lname = l.levelObject.getLocalizedLevelName();
+                    if (name.equals(lname)) {
+                        return l;
+                    }
+                }
+            }
+            return null;
+        }
+
+        // Returns a KnownLevel with the given localized name matching
+        // by calling the Level.getLocalizedName() method
+        static synchronized KnownLevel findByLocalizedName(String name) {
+            for (List<KnownLevel> levels : nameToLevels.values()) {
+                for (KnownLevel l : levels) {
+                    String lname = l.levelObject.getLocalizedName();
+                    if (name.equals(lname)) {
+                        return l;
+                    }
+                }
+            }
+            return null;
+        }
+
+        static synchronized KnownLevel matches(Level l) {
+            List<KnownLevel> list = nameToLevels.get(l.name);
+            if (list != null) {
+                for (KnownLevel level : list) {
+                    Level other = level.mirroredLevel;
+                    if (l.value == other.value &&
+                           (l.resourceBundleName == other.resourceBundleName ||
+                               (l.resourceBundleName != null &&
+                                l.resourceBundleName.equals(other.resourceBundleName)))) {
+                        return level;
+                    }
+                }
+            }
+            return null;
+        }
+    }
+
 }
diff --git a/jdk/src/share/classes/java/util/logging/LogManager.java b/jdk/src/share/classes/java/util/logging/LogManager.java
index bfdf83f93da..78c90acee7d 100644
--- a/jdk/src/share/classes/java/util/logging/LogManager.java
+++ b/jdk/src/share/classes/java/util/logging/LogManager.java
@@ -34,6 +34,8 @@ import java.lang.ref.WeakReference;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeEvent;
 import java.net.URL;
+import sun.misc.JavaAWTAccess;
+import sun.misc.SharedSecrets;
 import sun.security.action.GetPropertyAction;
 
 /**
@@ -157,10 +159,9 @@ public class LogManager {
     // count to allow for cases where the same listener is registered many times.
     private final Map<PropertyChangeListener,Integer> listenerMap = new HashMap<>();
 
-    // Table of named Loggers that maps names to Loggers.
-    private Hashtable<String,LoggerWeakRef> namedLoggers = new Hashtable<>();
-    // Tree of named Loggers
-    private LogNode root = new LogNode(null);
+    // LoggerContext for system loggers and user loggers
+    private final LoggerContext systemContext = new SystemLoggerContext();
+    private final LoggerContext userContext = new UserLoggerContext();
     private Logger rootLogger;
 
     // Have we done the primordial reading of the configuration file?
@@ -198,12 +199,13 @@ public class LogManager {
 
                     // Create and retain Logger for the root of the namespace.
                     manager.rootLogger = manager.new RootLogger();
-                    manager.addLogger(manager.rootLogger);
+                    manager.systemContext.addLogger(manager.rootLogger);
+                    manager.userContext.addLogger(manager.rootLogger);
 
                     // Adding the global Logger. Doing so in the Logger.<clinit>
                     // would deadlock with the LogManager.<clinit>.
                     Logger.getGlobal().setLogManager(manager);
-                    manager.addLogger(Logger.getGlobal());
+                    manager.systemContext.addLogger(Logger.getGlobal());
 
                     // We don't call readConfiguration() here, as we may be running
                     // very early in the JVM startup sequence.  Instead readConfiguration
@@ -281,14 +283,14 @@ public class LogManager {
                         return;
                     }
                     readPrimordialConfiguration = true;
+
                     try {
-                        AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
-                                public Object run() throws Exception {
+                        AccessController.doPrivileged(new PrivilegedExceptionAction<Void>() {
+                                public Void run() throws Exception {
                                     readConfiguration();
 
                                     // Platform loggers begin to delegate to java.util.logging.Logger
                                     sun.util.logging.PlatformLogger.redirectPlatformLoggers();
-
                                     return null;
                                 }
                             });
@@ -358,62 +360,290 @@ public class LogManager {
         }
     }
 
-    // Package-level method.
-    // Find or create a specified logger instance. If a logger has
-    // already been created with the given name it is returned.
-    // Otherwise a new logger instance is created and registered
-    // in the LogManager global namespace.
+    // Returns the LoggerContext for the user code (i.e. application or AppContext).
+    // Loggers are isolated from each AppContext.
+    LoggerContext getUserContext() {
+        LoggerContext context = null;
 
-    // This method will always return a non-null Logger object.
-    // Synchronization is not required here. All synchronization for
-    // adding a new Logger object is handled by addLogger().
-    Logger demandLogger(String name) {
-        Logger result = getLogger(name);
-        if (result == null) {
-            // only allocate the new logger once
-            Logger newLogger = new Logger(name, null);
-            do {
-                if (addLogger(newLogger)) {
-                    // We successfully added the new Logger that we
-                    // created above so return it without refetching.
-                    return newLogger;
+        SecurityManager sm = System.getSecurityManager();
+        JavaAWTAccess javaAwtAccess = SharedSecrets.getJavaAWTAccess();
+        if (sm != null && javaAwtAccess != null) {
+            synchronized (javaAwtAccess) {
+                // AppContext.getAppContext() returns the system AppContext if called
+                // from a system thread but Logger.getLogger might be called from
+                // an applet code. Instead, find the AppContext of the applet code
+                // from the execution stack.
+                Object ecx = javaAwtAccess.getExecutionContext();
+                if (ecx == null) {
+                    // fall back to AppContext.getAppContext()
+                    ecx = javaAwtAccess.getContext();
                 }
-
-                // We didn't add the new Logger that we created above
-                // because another thread added a Logger with the same
-                // name after our null check above and before our call
-                // to addLogger(). We have to refetch the Logger because
-                // addLogger() returns a boolean instead of the Logger
-                // reference itself. However, if the thread that created
-                // the other Logger is not holding a strong reference to
-                // the other Logger, then it is possible for the other
-                // Logger to be GC'ed after we saw it in addLogger() and
-                // before we can refetch it. If it has been GC'ed then
-                // we'll just loop around and try again.
-                result = getLogger(name);
-            } while (result == null);
+                context = (LoggerContext)javaAwtAccess.get(ecx, LoggerContext.class);
+                if (context == null) {
+                    if (javaAwtAccess.isMainAppContext()) {
+                        context = userContext;
+                    } else {
+                        context = new UserLoggerContext();
+                        context.addLogger(manager.rootLogger);
+                    }
+                    javaAwtAccess.put(ecx, LoggerContext.class, context);
+                }
+            }
+        } else {
+            context = userContext;
         }
-        return result;
+        return context;
     }
 
-    // If logger.getUseParentHandlers() returns 'true' and any of the logger's
-    // parents have levels or handlers defined, make sure they are instantiated.
-    private void processParentHandlers(Logger logger, String name) {
-        int ix = 1;
-        for (;;) {
-            int ix2 = name.indexOf(".", ix);
-            if (ix2 < 0) {
-                break;
-            }
-            String pname = name.substring(0,ix2);
+    LoggerContext getSystemContext() {
+        return systemContext;
+    }
 
-            if (getProperty(pname+".level")    != null ||
-                getProperty(pname+".handlers") != null) {
-                // This pname has a level/handlers definition.
-                // Make sure it exists.
-                demandLogger(pname);
+    private List<LoggerContext> contexts() {
+        List<LoggerContext> cxs = new ArrayList<>();
+        cxs.add(systemContext);
+        cxs.add(getUserContext());
+        return cxs;
+    }
+
+    static class LoggerContext {
+        // Table of named Loggers that maps names to Loggers.
+        private final Hashtable<String,LoggerWeakRef> namedLoggers = new Hashtable<>();
+        // Tree of named Loggers
+        private final LogNode root;
+
+        private LoggerContext() {
+            this.root = new LogNode(null, this);
+        }
+
+        synchronized Logger findLogger(String name) {
+            LoggerWeakRef ref = namedLoggers.get(name);
+            if (ref == null) {
+                return null;
             }
-            ix = ix2+1;
+            Logger logger = ref.get();
+            if (logger == null) {
+                // Hashtable holds stale weak reference
+                // to a logger which has been GC-ed.
+                removeLogger(name);
+            }
+            return logger;
+        }
+
+        synchronized boolean addLogger(Logger logger) {
+            final String name = logger.getName();
+            if (name == null) {
+                throw new NullPointerException();
+            }
+
+            // cleanup some Loggers that have been GC'ed
+            manager.drainLoggerRefQueueBounded();
+
+            LoggerWeakRef ref = namedLoggers.get(name);
+            if (ref != null) {
+                if (ref.get() == null) {
+                    // It's possible that the Logger was GC'ed after the
+                    // drainLoggerRefQueueBounded() call above so allow
+                    // a new one to be registered.
+                    removeLogger(name);
+                } else {
+                    // We already have a registered logger with the given name.
+                    return false;
+                }
+            }
+
+            // We're adding a new logger.
+            // Note that we are creating a weak reference here.
+            ref = manager.new LoggerWeakRef(logger);
+            namedLoggers.put(name, ref);
+
+            // Apply any initial level defined for the new logger.
+            Level level = manager.getLevelProperty(name + ".level", null);
+            if (level != null) {
+                doSetLevel(logger, level);
+            }
+
+            // Do we have a per logger handler too?
+            // Note: this will add a 200ms penalty
+            manager.loadLoggerHandlers(logger, name, name + ".handlers");
+            processParentHandlers(logger, name);
+
+            // Find the new node and its parent.
+            LogNode node = getNode(name);
+            node.loggerRef = ref;
+            Logger parent = null;
+            LogNode nodep = node.parent;
+            while (nodep != null) {
+                LoggerWeakRef nodeRef = nodep.loggerRef;
+                if (nodeRef != null) {
+                    parent = nodeRef.get();
+                    if (parent != null) {
+                        break;
+                    }
+                }
+                nodep = nodep.parent;
+            }
+
+            if (parent != null) {
+                doSetParent(logger, parent);
+            }
+            // Walk over the children and tell them we are their new parent.
+            node.walkAndSetParent(logger);
+            // new LogNode is ready so tell the LoggerWeakRef about it
+            ref.setNode(node);
+            return true;
+        }
+
+        void removeLogger(String name) {
+            namedLoggers.remove(name);
+        }
+
+        synchronized Enumeration<String> getLoggerNames() {
+            return namedLoggers.keys();
+        }
+
+        Logger demandLogger(String name) {
+            return demandLogger(name, null);
+        }
+
+        // Find or create a specified logger instance. If a logger has
+        // already been created with the given name it is returned.
+        // Otherwise a new logger instance is created and registered
+        // in the LogManager global namespace.
+
+        // This method will always return a non-null Logger object.
+        // Synchronization is not required here. All synchronization for
+        // adding a new Logger object is handled by addLogger().
+        Logger demandLogger(String name, String resourceBundleName) {
+            Logger result = findLogger(name);
+            if (result == null) {
+                // only allocate the new logger once
+                Logger newLogger = new Logger(name, resourceBundleName);
+                do {
+                    if (addLogger(newLogger)) {
+                        // We successfully added the new Logger that we
+                        // created above so return it without refetching.
+                        return newLogger;
+                    }
+
+                    // We didn't add the new Logger that we created above
+                    // because another thread added a Logger with the same
+                    // name after our null check above and before our call
+                    // to addLogger(). We have to refetch the Logger because
+                    // addLogger() returns a boolean instead of the Logger
+                    // reference itself. However, if the thread that created
+                    // the other Logger is not holding a strong reference to
+                    // the other Logger, then it is possible for the other
+                    // Logger to be GC'ed after we saw it in addLogger() and
+                    // before we can refetch it. If it has been GC'ed then
+                    // we'll just loop around and try again.
+                    result = findLogger(name);
+                } while (result == null);
+            }
+            return result;
+        }
+
+        // If logger.getUseParentHandlers() returns 'true' and any of the logger's
+        // parents have levels or handlers defined, make sure they are instantiated.
+        private void processParentHandlers(Logger logger, String name) {
+            int ix = 1;
+            for (;;) {
+                int ix2 = name.indexOf(".", ix);
+                if (ix2 < 0) {
+                    break;
+                }
+                String pname = name.substring(0, ix2);
+
+                if (manager.getProperty(pname + ".level") != null ||
+                    manager.getProperty(pname + ".handlers") != null) {
+                    // This pname has a level/handlers definition.
+                    // Make sure it exists.
+                    demandLogger(pname);
+                }
+                ix = ix2+1;
+            }
+        }
+
+        // Gets a node in our tree of logger nodes.
+        // If necessary, create it.
+        LogNode getNode(String name) {
+            if (name == null || name.equals("")) {
+                return root;
+            }
+            LogNode node = root;
+            while (name.length() > 0) {
+                int ix = name.indexOf(".");
+                String head;
+                if (ix > 0) {
+                    head = name.substring(0, ix);
+                    name = name.substring(ix + 1);
+                } else {
+                    head = name;
+                    name = "";
+                }
+                if (node.children == null) {
+                    node.children = new HashMap<>();
+                }
+                LogNode child = node.children.get(head);
+                if (child == null) {
+                    child = new LogNode(node, this);
+                    node.children.put(head, child);
+                }
+                node = child;
+            }
+            return node;
+        }
+    }
+
+    static class SystemLoggerContext extends LoggerContext {
+        // Default resource bundle for all system loggers
+        Logger demandLogger(String name) {
+            // default to use the system logger's resource bundle
+            return super.demandLogger(name, Logger.SYSTEM_LOGGER_RB_NAME);
+        }
+    }
+
+    static class UserLoggerContext extends LoggerContext {
+        /**
+         * Returns a Logger of the given name if there is one registered
+         * in this context.  Otherwise, it will return the one registered
+         * in the system context if there is one.  The returned Logger
+         * instance may be initialized with a different resourceBundleName.
+         * If no such logger exists, a new Logger instance will be created
+         * and registered in this context.
+         */
+        Logger demandLogger(String name, String resourceBundleName) {
+            Logger result = findLogger(name);
+            if (result == null) {
+                // use the system logger if exists; or allocate a new logger.
+                // The system logger is added to the app logger context so that
+                // any child logger created in the app logger context can have
+                // a system logger as its parent if already exist.
+                Logger logger = manager.systemContext.findLogger(name);
+                Logger newLogger =
+                    logger != null ? logger : new Logger(name, resourceBundleName);
+                do {
+                    if (addLogger(newLogger)) {
+                        // We successfully added the new Logger that we
+                        // created above so return it without refetching.
+                        return newLogger;
+                    }
+
+                    // We didn't add the new Logger that we created above
+                    // because another thread added a Logger with the same
+                    // name after our null check above and before our call
+                    // to addLogger(). We have to refetch the Logger because
+                    // addLogger() returns a boolean instead of the Logger
+                    // reference itself. However, if the thread that created
+                    // the other Logger is not holding a strong reference to
+                    // the other Logger, then it is possible for the other
+                    // Logger to be GC'ed after we saw it in addLogger() and
+                    // before we can refetch it. If it has been GC'ed then
+                    // we'll just loop around and try again.
+                    result = findLogger(name);
+                } while (result == null);
+            }
+            return result;
         }
     }
 
@@ -438,16 +668,17 @@ public class LogManager {
                     try {
                         Class<?> clz = ClassLoader.getSystemClassLoader().loadClass(word);
                         Handler  hdl = (Handler) clz.newInstance();
-                        try {
-                            // Check if there is a property defining the
-                            // this handler's level.
-                            String levs = getProperty(word + ".level");
-                            if (levs != null) {
-                                hdl.setLevel(Level.parse(levs));
+                        // Check if there is a property defining the
+                        // this handler's level.
+                        String levs = getProperty(word + ".level");
+                        if (levs != null) {
+                            Level l = Level.findLevel(levs);
+                            if (l != null) {
+                                hdl.setLevel(l);
+                            } else {
+                                // Probably a bad level. Drop through.
+                                System.err.println("Can't set level for " + word);
                             }
-                        } catch (Exception ex) {
-                            System.err.println("Can't set level for " + word);
-                            // Probably a bad level. Drop through.
                         }
                         // Add this Handler to the logger
                         logger.addHandler(hdl);
@@ -503,7 +734,7 @@ public class LogManager {
             if (node != null) {
                 // if we have a LogNode, then we were a named Logger
                 // so clear namedLoggers weak ref to us
-                manager.namedLoggers.remove(name);
+                node.context.removeLogger(name);
                 name = null;  // clear our ref to the Logger's name
 
                 node.loggerRef = null;  // clear LogNode's weak ref to us
@@ -592,70 +823,15 @@ public class LogManager {
      *          false if a logger of that name already exists.
      * @exception NullPointerException if the logger name is null.
      */
-    public synchronized boolean addLogger(Logger logger) {
+    public boolean addLogger(Logger logger) {
         final String name = logger.getName();
         if (name == null) {
             throw new NullPointerException();
         }
-
-        // cleanup some Loggers that have been GC'ed
-        drainLoggerRefQueueBounded();
-
-        LoggerWeakRef ref = namedLoggers.get(name);
-        if (ref != null) {
-            if (ref.get() == null) {
-                // It's possible that the Logger was GC'ed after the
-                // drainLoggerRefQueueBounded() call above so allow
-                // a new one to be registered.
-                namedLoggers.remove(name);
-            } else {
-                // We already have a registered logger with the given name.
-                return false;
-            }
+        if (systemContext.findLogger(name) != null) {
+            return false;
         }
-
-        // We're adding a new logger.
-        // Note that we are creating a weak reference here.
-        ref = new LoggerWeakRef(logger);
-        namedLoggers.put(name, ref);
-
-        // Apply any initial level defined for the new logger.
-        Level level = getLevelProperty(name+".level", null);
-        if (level != null) {
-            doSetLevel(logger, level);
-        }
-
-        // Do we have a per logger handler too?
-        // Note: this will add a 200ms penalty
-        loadLoggerHandlers(logger, name, name+".handlers");
-        processParentHandlers(logger, name);
-
-        // Find the new node and its parent.
-        LogNode node = findNode(name);
-        node.loggerRef = ref;
-        Logger parent = null;
-        LogNode nodep = node.parent;
-        while (nodep != null) {
-            LoggerWeakRef nodeRef = nodep.loggerRef;
-            if (nodeRef != null) {
-                parent = nodeRef.get();
-                if (parent != null) {
-                    break;
-                }
-            }
-            nodep = nodep.parent;
-        }
-
-        if (parent != null) {
-            doSetParent(logger, parent);
-        }
-        // Walk over the children and tell them we are their new parent.
-        node.walkAndSetParent(logger);
-
-        // new LogNode is ready so tell the LoggerWeakRef about it
-        ref.setNode(node);
-
-        return true;
+        return getUserContext().addLogger(logger);
     }
 
 
@@ -697,36 +873,6 @@ public class LogManager {
             }});
     }
 
-    // Find a node in our tree of logger nodes.
-    // If necessary, create it.
-    private LogNode findNode(String name) {
-        if (name == null || name.equals("")) {
-            return root;
-        }
-        LogNode node = root;
-        while (name.length() > 0) {
-            int ix = name.indexOf(".");
-            String head;
-            if (ix > 0) {
-                head = name.substring(0,ix);
-                name = name.substring(ix+1);
-            } else {
-                head = name;
-                name = "";
-            }
-            if (node.children == null) {
-                node.children = new HashMap<>();
-            }
-            LogNode child = node.children.get(head);
-            if (child == null) {
-                child = new LogNode(node);
-                node.children.put(head, child);
-            }
-            node = child;
-        }
-        return node;
-    }
-
     /**
      * Method to find a named logger.
      * <p>
@@ -742,18 +888,16 @@ public class LogManager {
      * @param name name of the logger
      * @return  matching logger or null if none is found
      */
-    public synchronized Logger getLogger(String name) {
-        LoggerWeakRef ref = namedLoggers.get(name);
-        if (ref == null) {
-            return null;
-        }
-        Logger logger = ref.get();
-        if (logger == null) {
-            // Hashtable holds stale weak reference
-            // to a logger which has been GC-ed.
-            namedLoggers.remove(name);
-        }
-        return logger;
+    public Logger getLogger(String name) {
+        // return the first logger added
+        //
+        // once a system logger is added in the system context, no one can
+        // adds a logger with the same name in the global context
+        // (see LogManager.addLogger).  So if there is a logger in the global
+        // context with the same name as one in the system context, it must be
+        // added before the system logger was created.
+        Logger logger = getUserContext().findLogger(name);
+        return logger != null ? logger : systemContext.findLogger(name);
     }
 
     /**
@@ -772,8 +916,11 @@ public class LogManager {
      * <p>
      * @return  enumeration of logger name strings
      */
-    public synchronized Enumeration<String> getLoggerNames() {
-        return namedLoggers.keys();
+    public Enumeration<String> getLoggerNames() {
+        // only return unique names
+        Set<String> names = new HashSet<>(Collections.list(systemContext.getLoggerNames()));
+        names.addAll(Collections.list(getUserContext().getLoggerNames()));
+        return Collections.enumeration(names);
     }
 
     /**
@@ -858,20 +1005,20 @@ public class LogManager {
             // the global handlers, if they haven't been initialized yet.
             initializedGlobalHandlers = true;
         }
-        Enumeration<String> enum_ = getLoggerNames();
-        while (enum_.hasMoreElements()) {
-            String name = enum_.nextElement();
-            resetLogger(name);
+        for (LoggerContext cx : contexts()) {
+            Enumeration<String> enum_ = cx.getLoggerNames();
+            while (enum_.hasMoreElements()) {
+                String name = enum_.nextElement();
+                Logger logger = cx.findLogger(name);
+                if (logger != null) {
+                    resetLogger(logger);
+                }
+            }
         }
     }
 
-
     // Private method to reset an individual target logger.
-    private void resetLogger(String name) {
-        Logger logger = getLogger(name);
-        if (logger == null) {
-            return;
-        }
+    private void resetLogger(Logger logger) {
         // Close all the Logger's handlers.
         Handler[] targets = logger.getHandlers();
         for (int i = 0; i < targets.length; i++) {
@@ -883,6 +1030,7 @@ public class LogManager {
                 // Problems closing a handler?  Keep going...
             }
         }
+        String name = logger.getName();
         if (name != null && name.equals("")) {
             // This is the root logger.
             logger.setLevel(defaultLevel);
@@ -1046,11 +1194,8 @@ public class LogManager {
         if (val == null) {
             return defaultValue;
         }
-        try {
-            return Level.parse(val.trim());
-        } catch (Exception ex) {
-            return defaultValue;
-        }
+        Level l = Level.findLevel(val.trim());
+        return l != null ? l : defaultValue;
     }
 
     // Package private method to get a filter property.
@@ -1140,9 +1285,11 @@ public class LogManager {
         HashMap<String,LogNode> children;
         LoggerWeakRef loggerRef;
         LogNode parent;
+        final LoggerContext context;
 
-        LogNode(LogNode parent) {
+        LogNode(LogNode parent, LoggerContext context) {
             this.parent = parent;
+            this.context = context;
         }
 
         // Recursive method to walk the tree below a node and set
@@ -1215,11 +1362,13 @@ public class LogManager {
                 System.err.println("Bad level value for property: " + key);
                 continue;
             }
-            Logger l = getLogger(name);
-            if (l == null) {
-                continue;
+            for (LoggerContext cx : contexts()) {
+                Logger l = cx.findLogger(name);
+                if (l == null) {
+                    continue;
+                }
+                l.setLevel(level);
             }
-            l.setLevel(level);
         }
     }
 
diff --git a/jdk/src/share/classes/java/util/logging/Logger.java b/jdk/src/share/classes/java/util/logging/Logger.java
index f1d6f729b91..fec3d5c9a64 100644
--- a/jdk/src/share/classes/java/util/logging/Logger.java
+++ b/jdk/src/share/classes/java/util/logging/Logger.java
@@ -30,6 +30,7 @@ import java.util.*;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.security.*;
 import java.lang.ref.WeakReference;
+import java.util.logging.LogManager.LoggerContext;
 
 /**
  * A Logger object is used to log messages for a specific
@@ -286,6 +287,26 @@ public class Logger {
         }
     }
 
+    // Until all JDK code converted to call sun.util.logging.PlatformLogger
+    // (see 7054233), we need to determine if Logger.getLogger is to add
+    // a system logger or user logger.
+    //
+    // As an interim solution, if the immediate caller whose caller loader is
+    // null, we assume it's a system logger and add it to the system context.
+    private static LoggerContext getLoggerContext() {
+        LogManager manager = LogManager.getLogManager();
+        SecurityManager sm = System.getSecurityManager();
+        if (sm != null) {
+            // 0: Reflection 1: Logger.getLoggerContext 2: Logger.getLogger 3: caller
+            final int SKIP_FRAMES = 3;
+            Class<?> caller = sun.reflect.Reflection.getCallerClass(SKIP_FRAMES);
+            if (caller.getClassLoader() == null) {
+                return manager.getSystemContext();
+            }
+        }
+        return manager.getUserContext();
+    }
+
     /**
      * Find or create a logger for a named subsystem.  If a logger has
      * already been created with the given name it is returned.  Otherwise
@@ -327,8 +348,8 @@ public class Logger {
         // would throw an IllegalArgumentException in the second call
         // because the wrapper would result in an attempt to replace
         // the existing "resourceBundleForFoo" with null.
-        LogManager manager = LogManager.getLogManager();
-        return manager.demandLogger(name);
+        LoggerContext context = getLoggerContext();
+        return context.demandLogger(name);
     }
 
     /**
@@ -375,8 +396,8 @@ public class Logger {
     // Synchronization is not required here. All synchronization for
     // adding a new Logger object is handled by LogManager.addLogger().
     public static Logger getLogger(String name, String resourceBundleName) {
-        LogManager manager = LogManager.getLogManager();
-        Logger result = manager.demandLogger(name);
+        LoggerContext context = getLoggerContext();
+        Logger result = context.demandLogger(name, resourceBundleName);
 
         // MissingResourceException or IllegalArgumentException can be
         // thrown by setupResourceInfo().
@@ -384,6 +405,18 @@ public class Logger {
         return result;
     }
 
+    // package-private
+    // Add a platform logger to the system context.
+    // i.e. caller of sun.util.logging.PlatformLogger.getLogger
+    static Logger getPlatformLogger(String name) {
+        LogManager manager = LogManager.getLogManager();
+        LoggerContext context = manager.getSystemContext();
+
+        // all loggers in the system context will default to
+        // the system logger's resource bundle
+        Logger result = context.demandLogger(name);
+        return result;
+    }
 
     /**
      * Create an anonymous Logger.  The newly created Logger is not
@@ -536,7 +569,7 @@ public class Logger {
     private void doLog(LogRecord lr) {
         lr.setLoggerName(name);
         String ebname = getEffectiveResourceBundleName();
-        if (ebname != null) {
+        if (ebname != null && !ebname.equals(SYSTEM_LOGGER_RB_NAME)) {
             lr.setResourceBundleName(ebname);
             lr.setResourceBundle(findResourceBundle(ebname));
         }
@@ -1285,6 +1318,22 @@ public class Logger {
     // May also return null if we can't find the resource bundle and
     // there is no suitable previous cached value.
 
+    static final String SYSTEM_LOGGER_RB_NAME = "sun.util.logging.resources.logging";
+
+    private static ResourceBundle findSystemResourceBundle(final Locale locale) {
+        // the resource bundle is in a restricted package
+        return AccessController.doPrivileged(new PrivilegedAction<ResourceBundle>() {
+            public ResourceBundle run() {
+                try {
+                    return ResourceBundle.getBundle(SYSTEM_LOGGER_RB_NAME,
+                                                    locale);
+                } catch (MissingResourceException e) {
+                    throw new InternalError(e.toString());
+                }
+            }
+        });
+    }
+
     private synchronized ResourceBundle findResourceBundle(String name) {
         // Return a null bundle for a null name.
         if (name == null) {
@@ -1299,6 +1348,13 @@ public class Logger {
             return catalog;
         }
 
+        if (name.equals(SYSTEM_LOGGER_RB_NAME)) {
+            catalog = findSystemResourceBundle(currentLocale);
+            catalogName = name;
+            catalogLocale = currentLocale;
+            return catalog;
+        }
+
         // Use the thread's context ClassLoader.  If there isn't one,
         // use the SystemClassloader.
         ClassLoader cl = Thread.currentThread().getContextClassLoader();
@@ -1315,7 +1371,6 @@ public class Logger {
             // ClassLoader.  Drop through.
         }
 
-
         // Fall back to searching up the call stack and trying each
         // calling ClassLoader.
         for (int ix = 0; ; ix++) {
diff --git a/jdk/src/share/classes/java/util/logging/Logging.java b/jdk/src/share/classes/java/util/logging/Logging.java
index 2492349188e..bf34046826d 100644
--- a/jdk/src/share/classes/java/util/logging/Logging.java
+++ b/jdk/src/share/classes/java/util/logging/Logging.java
@@ -34,7 +34,7 @@ import java.util.ArrayList;
  *
  * The <tt>LoggingMXBean</tt> interface provides a standard
  * method for management access to the individual
- * java.util.Logger objects available at runtime.
+ * {@code Logger} objects available at runtime.
  *
  * @author Ron Mann
  * @author Mandy Chung
@@ -75,7 +75,7 @@ class Logging implements LoggingMXBean {
         if (level == null) {
             return EMPTY_STRING;
         } else {
-            return level.getName();
+            return level.getLevelName();
         }
     }
 
@@ -85,7 +85,6 @@ class Logging implements LoggingMXBean {
         }
 
         Logger logger = logManager.getLogger(loggerName);
-
         if (logger == null) {
             throw new IllegalArgumentException("Logger " + loggerName +
                 "does not exist");
@@ -94,7 +93,10 @@ class Logging implements LoggingMXBean {
         Level level = null;
         if (levelName != null) {
             // parse will throw IAE if logLevel is invalid
-            level = Level.parse(levelName);
+            level = Level.findLevel(levelName);
+            if (level == null) {
+                throw new IllegalArgumentException("Unknown level \"" + levelName + "\"");
+            }
         }
 
         logger.setLevel(level);
diff --git a/jdk/src/share/classes/java/util/logging/LoggingProxyImpl.java b/jdk/src/share/classes/java/util/logging/LoggingProxyImpl.java
index 8e027d66a47..dbb62a144e3 100644
--- a/jdk/src/share/classes/java/util/logging/LoggingProxyImpl.java
+++ b/jdk/src/share/classes/java/util/logging/LoggingProxyImpl.java
@@ -37,7 +37,8 @@ class LoggingProxyImpl implements LoggingProxy {
 
     @Override
     public Object getLogger(String name) {
-        return Logger.getLogger(name);
+        // always create a platform logger with the resource bundle name
+        return Logger.getPlatformLogger(name);
     }
 
     @Override
@@ -92,12 +93,16 @@ class LoggingProxyImpl implements LoggingProxy {
 
     @Override
     public Object parseLevel(String levelName) {
-        return Level.parse(levelName);
+        Level level = Level.findLevel(levelName);
+        if (level == null) {
+            throw new IllegalArgumentException("Unknown level \"" + levelName + "\"");
+        }
+        return level;
     }
 
     @Override
     public String getLevelName(Object level) {
-        return ((Level) level).getName();
+        return ((Level) level).getLevelName();
     }
 
     @Override
diff --git a/jdk/src/share/classes/java/util/logging/SimpleFormatter.java b/jdk/src/share/classes/java/util/logging/SimpleFormatter.java
index 87f2c7eeba6..af2b1dcb5f2 100644
--- a/jdk/src/share/classes/java/util/logging/SimpleFormatter.java
+++ b/jdk/src/share/classes/java/util/logging/SimpleFormatter.java
@@ -162,7 +162,7 @@ public class SimpleFormatter extends Formatter {
                              dat,
                              source,
                              record.getLoggerName(),
-                             record.getLevel().getLocalizedName(),
+                             record.getLevel().getLocalizedLevelName(),
                              message,
                              throwable);
     }
diff --git a/jdk/src/share/classes/sun/awt/AppContext.java b/jdk/src/share/classes/sun/awt/AppContext.java
index 0756b6c82bd..47f472737ea 100644
--- a/jdk/src/share/classes/sun/awt/AppContext.java
+++ b/jdk/src/share/classes/sun/awt/AppContext.java
@@ -327,21 +327,27 @@ public final class AppContext {
             // Before we return the main "system" AppContext, check to
             // see if there's an AWTSecurityManager installed.  If so,
             // allow it to choose the AppContext to return.
-            SecurityManager securityManager = System.getSecurityManager();
-            if ((securityManager != null) &&
-                (securityManager instanceof AWTSecurityManager))
-            {
-                AWTSecurityManager awtSecMgr = (AWTSecurityManager)securityManager;
-                AppContext secAppContext = awtSecMgr.getAppContext();
-                if (secAppContext != null)  {
-                    appContext = secAppContext; // Return what we're told
-                }
+            AppContext secAppContext = getExecutionAppContext();
+            if (secAppContext != null) {
+                appContext = secAppContext; // Return what we're told
             }
         }
 
         return appContext;
     }
 
+    private final static AppContext getExecutionAppContext() {
+        SecurityManager securityManager = System.getSecurityManager();
+        if ((securityManager != null) &&
+            (securityManager instanceof AWTSecurityManager))
+        {
+            AWTSecurityManager awtSecMgr = (AWTSecurityManager) securityManager;
+            AppContext secAppContext = awtSecMgr.getAppContext();
+            return secAppContext; // Return what we're told
+        }
+        return null;
+    }
+
     /**
      * Returns the main ("system") AppContext.
      *
@@ -806,6 +812,21 @@ public final class AppContext {
             public boolean isMainAppContext() {
                 return (numAppContexts.get() == 1);
             }
+            public Object getContext() {
+                return getAppContext();
+            }
+            public Object getExecutionContext() {
+                return getExecutionAppContext();
+            }
+            public Object get(Object context, Object key) {
+                return ((AppContext)context).get(key);
+            }
+            public void put(Object context, Object key, Object value) {
+                ((AppContext)context).put(key, value);
+            }
+            public void remove(Object context, Object key) {
+                ((AppContext)context).remove(key);
+            }
         });
     }
 }
diff --git a/jdk/src/share/classes/sun/misc/JavaAWTAccess.java b/jdk/src/share/classes/sun/misc/JavaAWTAccess.java
index 6e3712592ce..e64a38b22c9 100644
--- a/jdk/src/share/classes/sun/misc/JavaAWTAccess.java
+++ b/jdk/src/share/classes/sun/misc/JavaAWTAccess.java
@@ -26,6 +26,14 @@
 package sun.misc;
 
 public interface JavaAWTAccess {
+    public Object getContext();
+    public Object getExecutionContext();
+
+    public Object get(Object context, Object key);
+    public void put(Object context, Object key, Object value);
+    public void remove(Object context, Object key);
+
+    // convenience methods whose context is the object returned by getContext()
     public Object get(Object key);
     public void put(Object key, Object value);
     public void remove(Object key);
diff --git a/jdk/src/share/lib/security/java.security b/jdk/src/share/lib/security/java.security
index d0dc3c5b423..741f0c2f64d 100644
--- a/jdk/src/share/lib/security/java.security
+++ b/jdk/src/share/lib/security/java.security
@@ -148,6 +148,9 @@ keystore.type=jks
 package.access=sun.,\
                com.sun.xml.internal.,\
                com.sun.imageio.,\
+               com.sun.istack.internal.,\
+               com.sun.jmx.default.,\
+               com.sun.jmx.remote.util.,\
                com.sun.org.apache.xerces.internal.utils.,\
                com.sun.org.apache.xalan.internal.utils.,\
                com.sun.org.glassfish.external.,\
@@ -166,6 +169,9 @@ package.access=sun.,\
 package.definition=sun.,\
                    com.sun.xml.internal.,\
                    com.sun.imageio.,\
+                   com.sun.istack.internal.,\
+                   com.sun.jmx.default.,\
+                   com.sun.jmx.remote.util.,\
                    com.sun.org.apache.xerces.internal.utils.,\
                    com.sun.org.apache.xalan.internal.utils.,\
                    com.sun.org.glassfish.external.,\

From eb67f3f1da2cbf1eeb42f01d9cc778dbbd0820c9 Mon Sep 17 00:00:00 2001
From: Denis Fokin <denis@openjdk.org>
Date: Fri, 30 Nov 2012 15:51:44 +0400
Subject: [PATCH 034/311] 7201064: Better dialogue checking

Reviewed-by: serb, skoivu
---
 jdk/src/share/classes/java/awt/Dialog.java | 55 ++++++++++++++++++----
 1 file changed, 47 insertions(+), 8 deletions(-)

diff --git a/jdk/src/share/classes/java/awt/Dialog.java b/jdk/src/share/classes/java/awt/Dialog.java
index 800d19c0200..33ae6dde3b9 100644
--- a/jdk/src/share/classes/java/awt/Dialog.java
+++ b/jdk/src/share/classes/java/awt/Dialog.java
@@ -39,6 +39,7 @@ import sun.awt.PeerEvent;
 import sun.awt.util.IdentityArrayList;
 import sun.awt.util.IdentityLinkedList;
 import sun.security.util.SecurityConstants;
+import java.security.AccessControlException;
 
 /**
  * A Dialog is a top-level window with a title and a border
@@ -128,6 +129,8 @@ public class Dialog extends Window {
      */
     boolean undecorated = false;
 
+    private transient boolean initialized = false;
+
     /**
      * Modal dialogs block all input to some top-level windows.
      * Whether a particular window is blocked depends on dialog's type
@@ -671,6 +674,7 @@ public class Dialog extends Window {
         this.title = title;
         setModalityType(modalityType);
         SunToolkit.checkAndSetPolicy(this);
+        initialized = true;
     }
 
     /**
@@ -722,6 +726,7 @@ public class Dialog extends Window {
         this.title = title;
         setModalityType(modalityType);
         SunToolkit.checkAndSetPolicy(this);
+        initialized = true;
     }
 
     /**
@@ -851,12 +856,9 @@ public class Dialog extends Window {
         if (modalityType == type) {
             return;
         }
-        if (type == ModalityType.TOOLKIT_MODAL) {
-            SecurityManager sm = System.getSecurityManager();
-            if (sm != null) {
-                sm.checkPermission(SecurityConstants.AWT.TOOLKIT_MODALITY_PERMISSION);
-            }
-        }
+
+        checkModalityPermission(type);
+
         modalityType = type;
         modal = (modalityType != ModalityType.MODELESS);
     }
@@ -1025,6 +1027,11 @@ public class Dialog extends Window {
      */
     @Deprecated
     public void show() {
+        if (!initialized) {
+            throw new IllegalStateException("The dialog component " +
+                "has not been initialized properly");
+        }
+
         beforeFirstShow = false;
         if (!isModal()) {
             conditionalShow(null, null);
@@ -1600,18 +1607,50 @@ public class Dialog extends Window {
         }
     }
 
+    private void checkModalityPermission(ModalityType mt) {
+        if (mt == ModalityType.TOOLKIT_MODAL) {
+            SecurityManager sm = System.getSecurityManager();
+            if (sm != null) {
+                sm.checkPermission(
+                    SecurityConstants.AWT.TOOLKIT_MODALITY_PERMISSION
+                );
+            }
+        }
+    }
+
     private void readObject(ObjectInputStream s)
         throws ClassNotFoundException, IOException, HeadlessException
     {
         GraphicsEnvironment.checkHeadless();
-        s.defaultReadObject();
+
+        java.io.ObjectInputStream.GetField fields =
+            s.readFields();
+
+        ModalityType localModalityType = (ModalityType)fields.get("modalityType", null);
+
+        try {
+            checkModalityPermission(localModalityType);
+        } catch (AccessControlException ace) {
+            localModalityType = DEFAULT_MODALITY_TYPE;
+        }
 
         // in 1.5 or earlier modalityType was absent, so use "modal" instead
-        if (modalityType == null) {
+        if (localModalityType == null) {
+            this.modal = fields.get("modal", false);
             setModal(modal);
         }
 
+        this.resizable = fields.get("resizable", true);
+        this.undecorated = fields.get("undecorated", false);
+        this.title = (String)fields.get("title", "");
+        this.modalityType = localModalityType;
+
         blockedWindows = new IdentityArrayList();
+
+        SunToolkit.checkAndSetPolicy(this);
+
+        initialized = true;
+
     }
 
     /*

From d093c6fbb64b8f9294756755e5e5349f2a616c83 Mon Sep 17 00:00:00 2001
From: Mandy Chung <mchung@openjdk.org>
Date: Wed, 5 Dec 2012 14:02:58 -0800
Subject: [PATCH 035/311] 8004175: Restricted packages added in java.security
 are missing in java.security-{macosx, solaris, windows}

Reviewed-by: alanb, ahgross, mullan
---
 jdk/src/share/lib/security/java.security-macosx  | 6 ++++++
 jdk/src/share/lib/security/java.security-solaris | 6 ++++++
 jdk/src/share/lib/security/java.security-windows | 6 ++++++
 3 files changed, 18 insertions(+)

diff --git a/jdk/src/share/lib/security/java.security-macosx b/jdk/src/share/lib/security/java.security-macosx
index 9a4f2964e79..5f4d82974ac 100644
--- a/jdk/src/share/lib/security/java.security-macosx
+++ b/jdk/src/share/lib/security/java.security-macosx
@@ -149,6 +149,9 @@ keystore.type=jks
 package.access=sun.,\
                com.sun.xml.internal.,\
                com.sun.imageio.,\
+               com.sun.istack.internal.,\
+               com.sun.jmx.defaults.,\
+               com.sun.jmx.remote.util.,\
                com.sun.org.apache.xerces.internal.utils.,\
                com.sun.org.apache.xalan.internal.utils.,\
                com.sun.org.glassfish.external.,\
@@ -168,6 +171,9 @@ package.access=sun.,\
 package.definition=sun.,\
                    com.sun.xml.internal.,\
                    com.sun.imageio.,\
+                   com.sun.istack.internal.,\
+                   com.sun.jmx.defaults.,\
+                   com.sun.jmx.remote.util.,\
                    com.sun.org.apache.xerces.internal.utils.,\
                    com.sun.org.apache.xalan.internal.utils.,\
                    com.sun.org.glassfish.external.,\
diff --git a/jdk/src/share/lib/security/java.security-solaris b/jdk/src/share/lib/security/java.security-solaris
index a5b1d577d2e..f8e6774e3a1 100644
--- a/jdk/src/share/lib/security/java.security-solaris
+++ b/jdk/src/share/lib/security/java.security-solaris
@@ -150,6 +150,9 @@ keystore.type=jks
 package.access=sun.,\
                com.sun.xml.internal.,\
                com.sun.imageio.,\
+               com.sun.istack.internal.,\
+               com.sun.jmx.defaults.,\
+               com.sun.jmx.remote.util.,\
                com.sun.org.apache.xerces.internal.utils.,\
                com.sun.org.apache.xalan.internal.utils.,\
                com.sun.org.glassfish.external.,\
@@ -168,6 +171,9 @@ package.access=sun.,\
 package.definition=sun.,\
                    com.sun.xml.internal.,\
                    com.sun.imageio.,\
+                   com.sun.istack.internal.,\
+                   com.sun.jmx.defaults.,\
+                   com.sun.jmx.remote.util.,\
                    com.sun.org.apache.xerces.internal.utils.,\
                    com.sun.org.apache.xalan.internal.utils.,\
                    com.sun.org.glassfish.external.,\
diff --git a/jdk/src/share/lib/security/java.security-windows b/jdk/src/share/lib/security/java.security-windows
index c2f0ebf8f21..d539f90be63 100644
--- a/jdk/src/share/lib/security/java.security-windows
+++ b/jdk/src/share/lib/security/java.security-windows
@@ -149,6 +149,9 @@ keystore.type=jks
 package.access=sun.,\
                com.sun.xml.internal.,\
                com.sun.imageio.,\
+               com.sun.istack.internal.,\
+               com.sun.jmx.defaults.,\
+               com.sun.jmx.remote.util.,\
                com.sun.org.apache.xerces.internal.utils.,\
                com.sun.org.apache.xalan.internal.utils.,\
                com.sun.org.glassfish.external.,\
@@ -167,6 +170,9 @@ package.access=sun.,\
 package.definition=sun.,\
                    com.sun.xml.internal.,\
                    com.sun.imageio.,\
+                   com.sun.istack.internal.,\
+                   com.sun.jmx.defaults.,\
+                   com.sun.jmx.remote.util.,\
                    com.sun.org.apache.xerces.internal.utils.,\
                    com.sun.org.apache.xalan.internal.utils.,\
                    com.sun.org.glassfish.external.,\

From 07d6fc6bd103f05febb52e76796b6b08790c31d1 Mon Sep 17 00:00:00 2001
From: Jaroslav Bachorik <jaroslav.bachorik@oracle.com>
Date: Fri, 7 Dec 2012 22:49:08 +0400
Subject: [PATCH 036/311] 8000537: Contextualize RequiredModelMBean class

Contextualize RequiredModelMBean class

Reviewed-by: asaha
---
 .../modelmbean/RequiredModelMBean.java        | 225 +++++++++++++-----
 1 file changed, 172 insertions(+), 53 deletions(-)

diff --git a/jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java b/jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java
index c1600a94317..6d28adaf0f7 100644
--- a/jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java
+++ b/jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,11 +39,13 @@ import java.io.PrintStream;
 import java.lang.reflect.InvocationTargetException;
 
 import java.lang.reflect.Method;
+import java.security.AccessControlContext;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.logging.Level;
 import java.util.Map;
 import java.util.Set;
@@ -78,6 +80,8 @@ import javax.management.RuntimeErrorException;
 import javax.management.RuntimeOperationsException;
 import javax.management.ServiceNotFoundException;
 import javax.management.loading.ClassLoaderRepository;
+import sun.misc.JavaSecurityAccess;
+import sun.misc.SharedSecrets;
 
 import sun.reflect.misc.MethodUtil;
 import sun.reflect.misc.ReflectUtil;
@@ -138,6 +142,9 @@ public class RequiredModelMBean
     private boolean registered = false;
     private transient MBeanServer server = null;
 
+    private final static JavaSecurityAccess javaSecurityAccess = SharedSecrets.getJavaSecurityAccess();
+    final private AccessControlContext acc = AccessController.getContext();
+
     /*************************************/
     /* constructors                      */
     /*************************************/
@@ -1025,10 +1032,31 @@ public class RequiredModelMBean
 
             if (opClassName != null) {
                 try {
-                    final ClassLoader targetClassLoader =
-                        targetObject.getClass().getClassLoader();
-                    targetClass = Class.forName(opClassName, false,
-                                                targetClassLoader);
+                    AccessControlContext stack = AccessController.getContext();
+                    final Object obj = targetObject;
+                    final String className = opClassName;
+                    final ClassNotFoundException[] caughtException = new ClassNotFoundException[1];
+
+                    targetClass = javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction<Class<?>>() {
+
+                        @Override
+                        public Class<?> run() {
+                            try {
+                                ReflectUtil.checkPackageAccess(className);
+                                final ClassLoader targetClassLoader =
+                                    obj.getClass().getClassLoader();
+                                return Class.forName(className, false,
+                                                            targetClassLoader);
+                            } catch (ClassNotFoundException e) {
+                                caughtException[0] = e;
+                            }
+                            return null;
+                        }
+                    }, stack, acc);
+
+                    if (caughtException[0] != null) {
+                        throw caughtException[0];
+                    }
                 } catch (ClassNotFoundException e) {
                     final String msg =
                         "class for invoke " + opName + " not found";
@@ -1061,9 +1089,9 @@ public class RequiredModelMBean
         return result;
     }
 
-    private static Method resolveMethod(Class<?> targetClass,
+    private Method resolveMethod(Class<?> targetClass,
                                         String opMethodName,
-                                        String[] sig)
+                                        final String[] sig)
             throws ReflectionException {
         final boolean tracing = MODELMBEAN_LOGGER.isLoggable(Level.FINER);
 
@@ -1078,30 +1106,45 @@ public class RequiredModelMBean
         if (sig == null)
             argClasses = null;
         else {
+            final AccessControlContext stack = AccessController.getContext();
+            final ReflectionException[] caughtException = new ReflectionException[1];
             final ClassLoader targetClassLoader = targetClass.getClassLoader();
             argClasses = new Class<?>[sig.length];
-            for (int i = 0; i < sig.length; i++) {
-                if (tracing) {
-                    MODELMBEAN_LOGGER.logp(Level.FINER,
-                        RequiredModelMBean.class.getName(),"resolveMethod",
-                            "resolve type " + sig[i]);
-                }
-                argClasses[i] = (Class<?>) primitiveClassMap.get(sig[i]);
-                if (argClasses[i] == null) {
-                    try {
-                        argClasses[i] =
-                            Class.forName(sig[i], false, targetClassLoader);
-                    } catch (ClassNotFoundException e) {
+
+            javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction<Void>() {
+
+                @Override
+                public Void run() {
+                    for (int i = 0; i < sig.length; i++) {
                         if (tracing) {
                             MODELMBEAN_LOGGER.logp(Level.FINER,
-                                    RequiredModelMBean.class.getName(),
-                                    "resolveMethod",
-                                    "class not found");
+                                RequiredModelMBean.class.getName(),"resolveMethod",
+                                    "resolve type " + sig[i]);
+                        }
+                        argClasses[i] = (Class<?>) primitiveClassMap.get(sig[i]);
+                        if (argClasses[i] == null) {
+                            try {
+                                ReflectUtil.checkPackageAccess(sig[i]);
+                                argClasses[i] =
+                                    Class.forName(sig[i], false, targetClassLoader);
+                            } catch (ClassNotFoundException e) {
+                                if (tracing) {
+                                    MODELMBEAN_LOGGER.logp(Level.FINER,
+                                            RequiredModelMBean.class.getName(),
+                                            "resolveMethod",
+                                            "class not found");
+                                }
+                                final String msg = "Parameter class not found";
+                                caughtException[0] = new ReflectionException(e, msg);
+                            }
                         }
-                        final String msg = "Parameter class not found";
-                        throw new ReflectionException(e, msg);
                     }
+                    return null;
                 }
+            }, stack, acc);
+
+            if (caughtException[0] != null) {
+                throw caughtException[0];
             }
         }
 
@@ -1133,7 +1176,7 @@ public class RequiredModelMBean
     /* Find a method in RequiredModelMBean as determined by the given
        parameters.  Return null if there is none, or if the parameters
        exclude using it.  Called from invoke. */
-    private static Method findRMMBMethod(String opMethodName,
+    private Method findRMMBMethod(String opMethodName,
                                          Object targetObjectField,
                                          String opClassName,
                                          String[] sig) {
@@ -1155,19 +1198,29 @@ public class RequiredModelMBean
         if (opClassName == null)
             targetClass = rmmbClass;
         else {
-            try {
-                final ClassLoader targetClassLoader =
-                    rmmbClass.getClassLoader();
-                targetClass = Class.forName(opClassName, false,
-                                            targetClassLoader);
-                if (!rmmbClass.isAssignableFrom(targetClass))
-                    return null;
-            } catch (ClassNotFoundException e) {
-                return null;
-            }
+            AccessControlContext stack = AccessController.getContext();
+            final String className = opClassName;
+            targetClass = javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction<Class<?>>() {
+
+                @Override
+                public Class<?> run() {
+                    try {
+                        ReflectUtil.checkPackageAccess(className);
+                        final ClassLoader targetClassLoader =
+                            rmmbClass.getClassLoader();
+                        Class clz = Class.forName(className, false,
+                                                    targetClassLoader);
+                        if (!rmmbClass.isAssignableFrom(clz))
+                            return null;
+                        return clz;
+                    } catch (ClassNotFoundException e) {
+                        return null;
+                    }
+                }
+            }, stack, acc);
         }
         try {
-            return resolveMethod(targetClass, opMethodName, sig);
+            return targetClass != null ? resolveMethod(targetClass, opMethodName, sig) : null;
         } catch (ReflectionException e) {
             return null;
         }
@@ -1177,12 +1230,35 @@ public class RequiredModelMBean
      * Invoke the given method, and throw the somewhat unpredictable
      * appropriate exception if the method itself gets an exception.
      */
-    private Object invokeMethod(String opName, Method method,
-                                Object targetObject, Object[] opArgs)
+    private Object invokeMethod(String opName, final Method method,
+                                final Object targetObject, final Object[] opArgs)
             throws MBeanException, ReflectionException {
         try {
-            ReflectUtil.checkPackageAccess(method.getDeclaringClass());
-            return MethodUtil.invoke(method, targetObject, opArgs);
+            final Throwable[] caughtException = new Throwable[1];
+            AccessControlContext stack = AccessController.getContext();
+            Object rslt = javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction<Object>() {
+
+                @Override
+                public Object run() {
+                    try {
+                        ReflectUtil.checkPackageAccess(method.getDeclaringClass());
+                        return MethodUtil.invoke(method, targetObject, opArgs);
+                    } catch (InvocationTargetException e) {
+                        caughtException[0] = e;
+                    } catch (IllegalAccessException e) {
+                        caughtException[0] = e;
+                    }
+                    return null;
+                }
+            }, stack, acc);
+            if (caughtException[0] != null) {
+                if (caughtException[0] instanceof Exception) {
+                    throw (Exception)caughtException[0];
+                } else if(caughtException[0] instanceof Error) {
+                    throw (Error)caughtException[0];
+                }
+            }
+            return rslt;
         } catch (RuntimeErrorException ree) {
             throw new RuntimeOperationsException(ree,
                       "RuntimeException occurred in RequiredModelMBean "+
@@ -1567,7 +1643,7 @@ public class RequiredModelMBean
                 }
 
                 // make sure response class matches type field
-                String respType = attrInfo.getType();
+                final String respType = attrInfo.getType();
                 if (response != null) {
                     String responseClass = response.getClass().getName();
                     if (!respType.equals(responseClass)) {
@@ -1590,9 +1666,31 @@ public class RequiredModelMBean
                             // inequality may come from type subclassing
                             boolean subtype;
                             try {
-                                ClassLoader cl =
-                                    response.getClass().getClassLoader();
-                                Class<?> c = Class.forName(respType, true, cl);
+                                final Class respClass = response.getClass();
+                                final Exception[] caughException = new Exception[1];
+
+                                AccessControlContext stack = AccessController.getContext();
+
+                                Class c = javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction<Class<?>>() {
+
+                                    @Override
+                                    public Class<?> run() {
+                                        try {
+                                            ReflectUtil.checkPackageAccess(respType);
+                                            ClassLoader cl =
+                                                respClass.getClassLoader();
+                                            return Class.forName(respType, true, cl);
+                                        } catch (Exception e) {
+                                            caughException[0] = e;
+                                        }
+                                        return null;
+                                    }
+                                }, stack, acc);
+
+                                if (caughException[0] != null) {
+                                    throw caughException[0];
+                                }
+
                                 subtype = c.isInstance(response);
                             } catch (Exception e) {
                                 subtype = false;
@@ -2745,16 +2843,37 @@ public class RequiredModelMBean
         return MBeanServerFactory.getClassLoaderRepository(server);
     }
 
-    private Class<?> loadClass(String className)
+    private Class<?> loadClass(final String className)
         throws ClassNotFoundException {
-        try {
-            return Class.forName(className);
-        } catch (ClassNotFoundException e) {
-            final ClassLoaderRepository clr =
-                getClassLoaderRepository();
-            if (clr == null) throw new ClassNotFoundException(className);
-            return clr.loadClass(className);
+        AccessControlContext stack = AccessController.getContext();
+        final ClassNotFoundException[] caughtException = new ClassNotFoundException[1];
+
+        Class c = javaSecurityAccess.doIntersectionPrivilege(new PrivilegedAction<Class<?>>() {
+
+            @Override
+            public Class<?> run() {
+                try {
+                    ReflectUtil.checkPackageAccess(className);
+                    return Class.forName(className);
+                } catch (ClassNotFoundException e) {
+                    final ClassLoaderRepository clr =
+                        getClassLoaderRepository();
+                    try {
+                        if (clr == null) throw new ClassNotFoundException(className);
+                        return clr.loadClass(className);
+                    } catch (ClassNotFoundException ex) {
+                        caughtException[0] = ex;
+                    }
+                }
+                return null;
+            }
+        }, stack, acc);
+
+        if (caughtException[0] != null) {
+            throw caughtException[0];
         }
+
+        return c;
     }
 
 

From 3780f56b0f987516d3a8d029ded0c11f62f32716 Mon Sep 17 00:00:00 2001
From: Denis Fokin <denis@openjdk.org>
Date: Wed, 12 Dec 2012 21:08:19 +0400
Subject: [PATCH 037/311] 8004341: Two JCK tests fails with 7u11 b06

Reviewed-by: serb, skoivu
---
 jdk/src/share/classes/java/awt/Dialog.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jdk/src/share/classes/java/awt/Dialog.java b/jdk/src/share/classes/java/awt/Dialog.java
index d24944f2995..d27041fd322 100644
--- a/jdk/src/share/classes/java/awt/Dialog.java
+++ b/jdk/src/share/classes/java/awt/Dialog.java
@@ -1638,12 +1638,13 @@ public class Dialog extends Window {
         if (localModalityType == null) {
             this.modal = fields.get("modal", false);
             setModal(modal);
+        } else {
+            this.modalityType = localModalityType;
         }
 
         this.resizable = fields.get("resizable", true);
         this.undecorated = fields.get("undecorated", false);
         this.title = (String)fields.get("title", "");
-        this.modalityType = localModalityType;
 
         blockedWindows = new IdentityArrayList<>();
 

From be64e9b087b120e3864b89dca2e5adb61661f777 Mon Sep 17 00:00:00 2001
From: Sean Mullan <mullan@openjdk.org>
Date: Tue, 18 Dec 2012 13:48:48 -0500
Subject: [PATCH 038/311] 8004302: javax/xml/soap/Test7013971.java fails since
 jdk6u39b01

Reviewed-by: vinnie, skoivu, mgrebac, ohair, tbell
---
 jdk/src/share/lib/security/java.security-macosx  | 8 ++++++--
 jdk/src/share/lib/security/java.security-solaris | 8 ++++++--
 jdk/src/share/lib/security/java.security-windows | 8 ++++++--
 jdk/test/Makefile                                | 1 +
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/jdk/src/share/lib/security/java.security-macosx b/jdk/src/share/lib/security/java.security-macosx
index 5f4d82974ac..707f1cf21a7 100644
--- a/jdk/src/share/lib/security/java.security-macosx
+++ b/jdk/src/share/lib/security/java.security-macosx
@@ -147,7 +147,9 @@ keystore.type=jks
 # corresponding RuntimePermission ("accessClassInPackage."+package) has
 # been granted.
 package.access=sun.,\
-               com.sun.xml.internal.,\
+               com.sun.xml.internal.bind.,\
+               com.sun.xml.internal.org.jvnet.staxex.,\
+               com.sun.xml.internal.ws.,\
                com.sun.imageio.,\
                com.sun.istack.internal.,\
                com.sun.jmx.defaults.,\
@@ -169,7 +171,9 @@ package.access=sun.,\
 # checkPackageDefinition.
 #
 package.definition=sun.,\
-                   com.sun.xml.internal.,\
+                   com.sun.xml.internal.bind.,\
+                   com.sun.xml.internal.org.jvnet.staxex.,\
+                   com.sun.xml.internal.ws.,\
                    com.sun.imageio.,\
                    com.sun.istack.internal.,\
                    com.sun.jmx.defaults.,\
diff --git a/jdk/src/share/lib/security/java.security-solaris b/jdk/src/share/lib/security/java.security-solaris
index f8e6774e3a1..5f905227d5f 100644
--- a/jdk/src/share/lib/security/java.security-solaris
+++ b/jdk/src/share/lib/security/java.security-solaris
@@ -148,7 +148,9 @@ keystore.type=jks
 # corresponding RuntimePermission ("accessClassInPackage."+package) has
 # been granted.
 package.access=sun.,\
-               com.sun.xml.internal.,\
+               com.sun.xml.internal.bind.,\
+               com.sun.xml.internal.org.jvnet.staxex.,\
+               com.sun.xml.internal.ws.,\
                com.sun.imageio.,\
                com.sun.istack.internal.,\
                com.sun.jmx.defaults.,\
@@ -169,7 +171,9 @@ package.access=sun.,\
 # checkPackageDefinition.
 #
 package.definition=sun.,\
-                   com.sun.xml.internal.,\
+                   com.sun.xml.internal.bind.,\
+                   com.sun.xml.internal.org.jvnet.staxex.,\
+                   com.sun.xml.internal.ws.,\
                    com.sun.imageio.,\
                    com.sun.istack.internal.,\
                    com.sun.jmx.defaults.,\
diff --git a/jdk/src/share/lib/security/java.security-windows b/jdk/src/share/lib/security/java.security-windows
index d539f90be63..fceb1021d6d 100644
--- a/jdk/src/share/lib/security/java.security-windows
+++ b/jdk/src/share/lib/security/java.security-windows
@@ -147,7 +147,9 @@ keystore.type=jks
 # corresponding RuntimePermission ("accessClassInPackage."+package) has
 # been granted.
 package.access=sun.,\
-               com.sun.xml.internal.,\
+               com.sun.xml.internal.bind.,\
+               com.sun.xml.internal.org.jvnet.staxex.,\
+               com.sun.xml.internal.ws.,\
                com.sun.imageio.,\
                com.sun.istack.internal.,\
                com.sun.jmx.defaults.,\
@@ -168,7 +170,9 @@ package.access=sun.,\
 # checkPackageDefinition.
 #
 package.definition=sun.,\
-                   com.sun.xml.internal.,\
+                   com.sun.xml.internal.bind.,\
+                   com.sun.xml.internal.org.jvnet.staxex.,\
+                   com.sun.xml.internal.ws.,\
                    com.sun.imageio.,\
                    com.sun.istack.internal.,\
                    com.sun.jmx.defaults.,\
diff --git a/jdk/test/Makefile b/jdk/test/Makefile
index 408aaaeed25..cac80e27c9f 100644
--- a/jdk/test/Makefile
+++ b/jdk/test/Makefile
@@ -512,6 +512,7 @@ jdk_other: $(call TestDirs, \
           javax/script \
 	  java/sql javax/sql \
           javax/smartcardio \
+	  javax/xml/soap \
 	  javax/xml/ws com/sun/internal/ws \
 	  jdk/asm \
 	  com/sun/org/apache/xerces \

From 958099576a0d2161a18d59eb679eb1e2dd7aaa5c Mon Sep 17 00:00:00 2001
From: John Coomes <jcoomes@openjdk.org>
Date: Thu, 20 Dec 2012 14:16:21 -0800
Subject: [PATCH 039/311] 8005364: initial hg tags for nashorn repo

Reviewed-by: amurillo
---
 nashorn/.hgtags | 193 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 193 insertions(+)
 create mode 100644 nashorn/.hgtags

diff --git a/nashorn/.hgtags b/nashorn/.hgtags
new file mode 100644
index 00000000000..4eb67ac90af
--- /dev/null
+++ b/nashorn/.hgtags
@@ -0,0 +1,193 @@
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b24
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b25
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b26
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b27
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b28
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b29
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b30
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b31
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b32
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b33
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b34
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b35
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b36
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b37
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b38
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b39
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b40
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b41
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b42
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b43
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b44
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b45
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b46
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b47
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b48
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b49
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b50
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b51
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b52
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b53
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b54
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b55
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b56
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b57
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b58
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b59
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b60
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b61
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b62
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b63
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b64
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b65
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b66
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b67
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b68
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b69
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b70
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b71
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b72
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b73
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b74
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b75
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b76
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b77
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b78
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b79
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b80
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b81
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b82
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b83
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b84
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b85
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b86
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b87
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b88
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b89
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b90
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b91
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b92
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b93
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b94
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b95
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b96
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b97
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b98
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b99
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b100
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b101
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b102
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b103
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b104
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b105
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b106
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b107
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b108
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b109
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b110
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b111
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b112
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b113
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b114
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b115
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b116
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b117
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b118
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b119
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b120
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b121
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b122
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b123
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b124
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b125
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b126
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b127
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b128
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b129
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b130
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b131
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b132
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b133
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b134
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b135
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b136
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b137
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b138
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b139
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b140
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b141
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b142
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b143
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b144
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b145
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b146
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk7-b147
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b01
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b02
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b03
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b04
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b05
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b06
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b07
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b08
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b09
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b10
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b11
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b12
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b13
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b14
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b15
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b17
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b16
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b18
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b19
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b20
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b21
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b22
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b23
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b24
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b25
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b26
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b27
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b28
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b29
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b30
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b31
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b32
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b33
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b34
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b35
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b36
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b37
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b38
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b39
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b40
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b41
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b42
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b43
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b44
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b45
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b46
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b47
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b48
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b49
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b50
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b51
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b52
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b53
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b54
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b55
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b56
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b57
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b58
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b59
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b60
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b61
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b62
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b63
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b64
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b65
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b66
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b67
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b68
+b8a1b238c77c7c00024daaa2cb7d10838e017b5f jdk8-b69

From 98762d6ee02e40111558f0e8502ad35f64d0fb22 Mon Sep 17 00:00:00 2001
From: Jim Laskey <jlaskey@openjdk.org>
Date: Fri, 21 Dec 2012 16:36:24 -0400
Subject: [PATCH 040/311] 8005403: Open-source Nashorn

Co-authored-by: Akhil Arora <akhil.arora@oracle.com>
Co-authored-by: Andreas Woess <andreas.woess@jku.at>
Co-authored-by: Attila Szegedi <attila.szegedi@oracle.com>
Co-authored-by: Hannes Wallnoefer <hannes.wallnoefer@oracle.com>
Co-authored-by: Henry Jen <henry.jen@oracle.com>
Co-authored-by: Marcus Lagergren <marcus.lagergren@oracle.com>
Co-authored-by: Pavel Semenov <pavel.semenov@oracle.com>
Co-authored-by: Pavel Stepanov <pavel.stepanov@oracle.com>
Co-authored-by: Petr Hejl <petr.hejl@oracle.com>
Co-authored-by: Petr Pisl <petr.pisl@oracle.com>
Co-authored-by: Sundararajan Athijegannathan <sundararajan.athijegannathan@oracle.com>
Reviewed-by: attila, hannesw, lagergren, sundar
---
 nashorn/.hgignore                             |    23 +-
 nashorn/ASSEMBLY_EXCEPTION                    |    27 +
 nashorn/LICENSE                               |   347 +
 nashorn/README                                |   147 +
 nashorn/RELEASE_README                        |    20 +
 nashorn/THIRD_PARTY_README                    |    69 +
 nashorn/bin/checkintest.sh                    |   266 +
 nashorn/bin/fixorphantests.sh                 |    52 +
 nashorn/bin/fixwhitespace.sh                  |    30 +
 nashorn/bin/jjs                               |    29 +
 nashorn/bin/jjs.bat                           |    27 +
 nashorn/bin/jjssecure                         |    29 +
 nashorn/bin/jjssecure.bat                     |    27 +
 nashorn/bin/nashorn                           |    29 +
 nashorn/bin/nashorn.bat                       |    27 +
 nashorn/bin/rm-non-tracked.sh                 |    24 +
 nashorn/bin/verbose_octane.bat                |    59 +
 nashorn/bin/verbose_octane.sh                 |    58 +
 nashorn/buildtools/nasgen/README              |    34 +
 nashorn/buildtools/nasgen/build.xml           |    60 +
 nashorn/buildtools/nasgen/nasgen.iml          |    39 +
 nashorn/buildtools/nasgen/project.properties  |    52 +
 .../nasgen/src/META-INF/MANIFEST.MF           |     4 +
 .../internal/tools/nasgen/ClassGenerator.java |   334 +
 .../tools/nasgen/ConstructorGenerator.java    |   276 +
 .../nashorn/internal/tools/nasgen/Main.java   |   181 +
 .../internal/tools/nasgen/MemberInfo.java     |   377 +
 .../tools/nasgen/MethodGenerator.java         |   426 +
 .../internal/tools/nasgen/NullVisitor.java    |    88 +
 .../tools/nasgen/PrototypeGenerator.java      |   184 +
 .../tools/nasgen/ScriptClassInfo.java         |   237 +
 .../nasgen/ScriptClassInfoCollector.java      |   331 +
 .../tools/nasgen/ScriptClassInstrumentor.java |   309 +
 .../tools/nasgen/StringConstants.java         |   113 +
 nashorn/docs/DEVELOPER_README                 |   445 +
 nashorn/docs/genshelldoc.js                   |    90 +
 nashorn/make/Makefile                         |   224 +
 nashorn/make/build-benchmark.xml              |   348 +
 nashorn/make/build-nasgen.xml                 |    86 +
 nashorn/make/build.xml                        |   355 +
 nashorn/make/nbproject/ide-file-targets.xml   |    59 +
 nashorn/make/nbproject/ide-targets.xml        |    41 +
 nashorn/make/nbproject/jdk.xml                |   179 +
 nashorn/make/nbproject/nbjdk.properties       |    24 +
 nashorn/make/nbproject/nbjdk.xml              |    48 +
 nashorn/make/nbproject/project.xml            |   177 +
 nashorn/make/project.properties               |   223 +
 nashorn/samples/counters.js                   |    39 +
 nashorn/samples/letter.js                     |    49 +
 nashorn/samples/parser.js                     |    43 +
 nashorn/samples/shell.js                      |    78 +
 nashorn/samples/test.js                       |    32 +
 nashorn/samples/uniq.js                       |    55 +
 nashorn/src/META-INF/MANIFEST.MF              |     5 +
 .../services/javax.script.ScriptEngineFactory |    25 +
 .../api/scripting/NashornException.java       |   121 +
 .../api/scripting/NashornScriptEngine.java    |   521 +
 .../scripting/NashornScriptEngineFactory.java |   179 +
 .../api/scripting/ScriptObjectMirror.java     |   323 +
 .../nashorn/api/scripting/package-info.java   |    38 +
 .../nashorn/api/scripting/resources/engine.js |    58 +
 .../internal/codegen/AccessSpecializer.java   |   428 +
 .../internal/codegen/BranchOptimizer.java     |   199 +
 .../internal/codegen/ClassEmitter.java        |   620 +
 .../internal/codegen/CodeGenerator.java       |  3266 ++
 .../nashorn/internal/codegen/CompileUnit.java |    95 +
 .../nashorn/internal/codegen/Compiler.java    |   685 +
 .../internal/codegen/CompilerConstants.java   |   687 +
 .../internal/codegen/ConstantData.java        |   165 +
 .../jdk/nashorn/internal/codegen/Emitter.java |    49 +
 .../jdk/nashorn/internal/codegen/Frame.java   |   196 +
 .../internal/codegen/FunctionSignature.java   |   209 +
 .../jdk/nashorn/internal/codegen/Lower.java   |  3057 ++
 .../internal/codegen/MethodEmitter.java       |  2349 ++
 .../nashorn/internal/codegen/Namespace.java   |   101 +
 .../internal/codegen/RuntimeCallSite.java     |   701 +
 .../internal/codegen/SharedScopeCall.java     |   192 +
 .../nashorn/internal/codegen/Splitter.java    |   403 +
 .../nashorn/internal/codegen/Transform.java   |    33 +
 .../nashorn/internal/codegen/WeighNodes.java  |   308 +
 .../codegen/objects/FieldObjectCreator.java   |   186 +
 .../objects/FunctionObjectCreator.java        |   133 +
 .../internal/codegen/objects/MapCreator.java  |   163 +
 .../codegen/objects/ObjectClassGenerator.java |   762 +
 .../codegen/objects/ObjectCreator.java        |   175 +
 .../codegen/objects/ObjectMapCreator.java     |    54 +
 .../internal/codegen/types/ArrayType.java     |   107 +
 .../internal/codegen/types/BitwiseType.java   |    44 +
 .../internal/codegen/types/BooleanType.java   |   161 +
 .../codegen/types/BytecodeArrayOps.java       |    78 +
 .../codegen/types/BytecodeBitwiseOps.java     |    96 +
 .../codegen/types/BytecodeNumericOps.java     |    93 +
 .../internal/codegen/types/BytecodeOps.java   |   158 +
 .../internal/codegen/types/IntType.java       |   260 +
 .../internal/codegen/types/LongType.java      |   229 +
 .../internal/codegen/types/NumberType.java    |   177 +
 .../internal/codegen/types/NumericType.java   |    43 +
 .../internal/codegen/types/ObjectType.java    |   174 +
 .../nashorn/internal/codegen/types/Type.java  |   882 +
 .../jdk/nashorn/internal/ir/AccessNode.java   |   166 +
 .../jdk/nashorn/internal/ir/Assignment.java   |    63 +
 .../src/jdk/nashorn/internal/ir/BaseNode.java |   101 +
 .../jdk/nashorn/internal/ir/BinaryNode.java   |   246 +
 .../src/jdk/nashorn/internal/ir/Block.java    |   591 +
 .../jdk/nashorn/internal/ir/BreakNode.java    |    97 +
 .../nashorn/internal/ir/BreakableNode.java    |    68 +
 .../src/jdk/nashorn/internal/ir/CallNode.java |   271 +
 .../src/jdk/nashorn/internal/ir/CaseNode.java |   138 +
 .../jdk/nashorn/internal/ir/CatchNode.java    |   161 +
 .../jdk/nashorn/internal/ir/ContinueNode.java |    90 +
 .../jdk/nashorn/internal/ir/DoWhileNode.java  |    82 +
 .../jdk/nashorn/internal/ir/EmptyNode.java    |    71 +
 .../jdk/nashorn/internal/ir/ExecuteNode.java  |   108 +
 .../src/jdk/nashorn/internal/ir/ForNode.java  |   213 +
 .../jdk/nashorn/internal/ir/FunctionCall.java |    39 +
 .../jdk/nashorn/internal/ir/FunctionNode.java |  1242 +
 .../jdk/nashorn/internal/ir/IdentNode.java    |   221 +
 .../src/jdk/nashorn/internal/ir/IfNode.java   |   131 +
 .../jdk/nashorn/internal/ir/IndexNode.java    |   160 +
 .../jdk/nashorn/internal/ir/LabelNode.java    |   155 +
 .../jdk/nashorn/internal/ir/LabeledNode.java  |   124 +
 .../nashorn/internal/ir/LineNumberNode.java   |    97 +
 .../jdk/nashorn/internal/ir/LiteralNode.java  |   785 +
 .../src/jdk/nashorn/internal/ir/Location.java |   142 +
 nashorn/src/jdk/nashorn/internal/ir/Node.java |   432 +
 .../jdk/nashorn/internal/ir/ObjectNode.java   |   135 +
 .../jdk/nashorn/internal/ir/PropertyKey.java  |    39 +
 .../jdk/nashorn/internal/ir/PropertyNode.java |   190 +
 .../nashorn/internal/ir/ReferenceNode.java    |    92 +
 .../jdk/nashorn/internal/ir/ReturnNode.java   |   167 +
 .../jdk/nashorn/internal/ir/RuntimeNode.java  |   395 +
 .../jdk/nashorn/internal/ir/SplitNode.java    |   221 +
 .../jdk/nashorn/internal/ir/SwitchNode.java   |   182 +
 .../src/jdk/nashorn/internal/ir/Symbol.java   |   610 +
 .../jdk/nashorn/internal/ir/TernaryNode.java  |   140 +
 .../jdk/nashorn/internal/ir/ThrowNode.java    |   119 +
 .../src/jdk/nashorn/internal/ir/TryNode.java  |   233 +
 .../jdk/nashorn/internal/ir/TypeOverride.java |    58 +
 .../jdk/nashorn/internal/ir/UnaryNode.java    |   233 +
 .../src/jdk/nashorn/internal/ir/VarNode.java  |   249 +
 .../jdk/nashorn/internal/ir/WhileNode.java    |   164 +
 .../src/jdk/nashorn/internal/ir/WithNode.java |   124 +
 .../internal/ir/annotations/ChildNode.java    |    42 +
 .../internal/ir/annotations/Ignore.java       |    43 +
 .../internal/ir/annotations/ParentNode.java   |    44 +
 .../internal/ir/annotations/Reference.java    |    42 +
 .../nashorn/internal/ir/debug/ASTWriter.java  |   244 +
 .../nashorn/internal/ir/debug/JSONWriter.java |  1012 +
 .../internal/ir/debug/PrintVisitor.java       |   436 +
 .../ir/visitor/NodeOperatorVisitor.java       |  1287 +
 .../internal/ir/visitor/NodeVisitor.java      |   882 +
 .../objects/AccessorPropertyDescriptor.java   |   210 +
 .../internal/objects/ArrayBufferView.java     |   370 +
 .../objects/DataPropertyDescriptor.java       |   197 +
 .../nashorn/internal/objects/DateParser.java  |   705 +
 .../objects/GenericPropertyDescriptor.java    |   169 +
 .../jdk/nashorn/internal/objects/Global.java  |  1663 +
 .../internal/objects/NativeArguments.java     |   625 +
 .../nashorn/internal/objects/NativeArray.java |  1281 +
 .../internal/objects/NativeArrayBuffer.java   |   114 +
 .../internal/objects/NativeBoolean.java       |   181 +
 .../nashorn/internal/objects/NativeDate.java  |  1335 +
 .../nashorn/internal/objects/NativeDebug.java |   274 +
 .../nashorn/internal/objects/NativeError.java |   325 +
 .../internal/objects/NativeEvalError.java     |    87 +
 .../internal/objects/NativeFloat32Array.java  |   186 +
 .../internal/objects/NativeFloat64Array.java  |   196 +
 .../internal/objects/NativeFunction.java      |   252 +
 .../internal/objects/NativeInt16Array.java    |   144 +
 .../internal/objects/NativeInt32Array.java    |   148 +
 .../internal/objects/NativeInt8Array.java     |   138 +
 .../internal/objects/NativeJSAdapter.java     |   739 +
 .../nashorn/internal/objects/NativeJSON.java  |   545 +
 .../nashorn/internal/objects/NativeJava.java  |   385 +
 .../internal/objects/NativeJavaImporter.java  |   151 +
 .../nashorn/internal/objects/NativeMath.java  |   700 +
 .../internal/objects/NativeNumber.java        |   388 +
 .../internal/objects/NativeObject.java        |   412 +
 .../internal/objects/NativeRangeError.java    |    86 +
 .../objects/NativeReferenceError.java         |    86 +
 .../internal/objects/NativeRegExp.java        |   772 +
 .../objects/NativeRegExpExecResult.java       |    84 +
 .../objects/NativeStrictArguments.java        |   147 +
 .../internal/objects/NativeString.java        |   937 +
 .../internal/objects/NativeSyntaxError.java   |    88 +
 .../internal/objects/NativeTypeError.java     |    86 +
 .../internal/objects/NativeURIError.java      |    85 +
 .../internal/objects/NativeUint16Array.java   |   144 +
 .../internal/objects/NativeUint32Array.java   |   162 +
 .../internal/objects/NativeUint8Array.java    |   137 +
 .../objects/NativeUint8ClampedArray.java      |   154 +
 .../internal/objects/PrototypeObject.java     |   111 +
 .../internal/objects/ScriptFunctionImpl.java  |   345 +
 .../objects/annotations/Attribute.java        |    51 +
 .../objects/annotations/Constructor.java      |    49 +
 .../objects/annotations/Function.java         |    62 +
 .../internal/objects/annotations/Getter.java  |    55 +
 .../objects/annotations/Property.java         |    60 +
 .../objects/annotations/ScriptClass.java      |    44 +
 .../internal/objects/annotations/Setter.java  |    55 +
 .../annotations/SpecializedConstructor.java   |    47 +
 .../annotations/SpecializedFunction.java      |    46 +
 .../internal/objects/annotations/Where.java   |    38 +
 .../internal/objects/package-info.java        |    33 +
 .../internal/parser/AbstractParser.java       |   458 +
 .../nashorn/internal/parser/JSONParser.java   |   346 +
 .../jdk/nashorn/internal/parser/Lexer.java    |  1647 +
 .../jdk/nashorn/internal/parser/Parser.java   |  2981 ++
 .../jdk/nashorn/internal/parser/RegExp.java   |   180 +
 .../internal/parser/RegExpScanner.java        |  1414 +
 .../jdk/nashorn/internal/parser/Scanner.java  |   193 +
 .../jdk/nashorn/internal/parser/Token.java    |   152 +
 .../nashorn/internal/parser/TokenKind.java    |    50 +
 .../nashorn/internal/parser/TokenLookup.java  |   222 +
 .../nashorn/internal/parser/TokenStream.java  |   212 +
 .../nashorn/internal/parser/TokenType.java    |   284 +
 .../internal/runtime/AccessorProperty.java    |   353 +
 .../nashorn/internal/runtime/BitVector.java   |   278 +
 .../internal/runtime/CodeInstaller.java       |    47 +
 .../nashorn/internal/runtime/ConsString.java  |   117 +
 .../jdk/nashorn/internal/runtime/Context.java |   872 +
 .../jdk/nashorn/internal/runtime/Debug.java   |   120 +
 .../nashorn/internal/runtime/DebugLogger.java |   187 +
 .../runtime/DefaultPropertyAccess.java        |   243 +
 .../nashorn/internal/runtime/ECMAErrors.java  |   242 +
 .../internal/runtime/ECMAException.java       |   326 +
 .../internal/runtime/ErrorManager.java        |   236 +
 .../internal/runtime/FindProperty.java        |   209 +
 .../internal/runtime/FunctionScope.java       |    93 +
 .../internal/runtime/GlobalFunctions.java     |   460 +
 .../internal/runtime/GlobalObject.java        |   238 +
 .../nashorn/internal/runtime/JSErrorType.java |    46 +
 .../jdk/nashorn/internal/runtime/JSType.java  |   928 +
 .../jdk/nashorn/internal/runtime/Logging.java |   151 +
 .../internal/runtime/NashornLoader.java       |   138 +
 .../internal/runtime/NativeJavaPackage.java   |   189 +
 .../internal/runtime/NumberToString.java      |   786 +
 .../internal/runtime/ParserException.java     |   138 +
 .../nashorn/internal/runtime/Property.java    |   477 +
 .../internal/runtime/PropertyAccess.java      |   365 +
 .../internal/runtime/PropertyDescriptor.java  |   155 +
 .../internal/runtime/PropertyHashMap.java     |   649 +
 .../internal/runtime/PropertyListener.java    |    57 +
 .../runtime/PropertyListenerManager.java      |   192 +
 .../nashorn/internal/runtime/PropertyMap.java |   919 +
 .../runtime/QuotedStringTokenizer.java        |   156 +
 .../nashorn/internal/runtime/RegExpMatch.java |    80 +
 .../jdk/nashorn/internal/runtime/Scope.java   |    55 +
 .../internal/runtime/ScriptFunction.java      |  1002 +
 .../internal/runtime/ScriptLoader.java        |    73 +
 .../internal/runtime/ScriptObject.java        |  3427 ++
 .../internal/runtime/ScriptRuntime.java       |   876 +
 .../internal/runtime/ScriptingFunctions.java  |   114 +
 .../jdk/nashorn/internal/runtime/Source.java  |   436 +
 .../internal/runtime/SpillProperty.java       |   118 +
 .../internal/runtime/StructureLoader.java     |   145 +
 .../nashorn/internal/runtime/URIUtils.java    |   297 +
 .../nashorn/internal/runtime/Undefined.java   |   205 +
 .../runtime/UserAccessorProperty.java         |   163 +
 .../jdk/nashorn/internal/runtime/Version.java |    73 +
 .../nashorn/internal/runtime/WithObject.java  |   274 +
 .../internal/runtime/arrays/ArrayData.java    |   507 +
 .../internal/runtime/arrays/ArrayFilter.java  |   194 +
 .../internal/runtime/arrays/ArrayIndex.java   |   247 +
 .../runtime/arrays/ArrayIterator.java         |    88 +
 .../runtime/arrays/ArrayLikeIterator.java     |   156 +
 .../runtime/arrays/DeletedArrayFilter.java    |   182 +
 .../arrays/DeletedRangeArrayFilter.java       |   245 +
 .../arrays/EmptyArrayLikeIterator.java        |    51 +
 .../runtime/arrays/FrozenArrayFilter.java     |    78 +
 .../internal/runtime/arrays/IntArrayData.java |   274 +
 .../arrays/InvalidArrayIndexException.java    |    66 +
 .../runtime/arrays/IteratorAction.java        |   139 +
 .../runtime/arrays/LongArrayData.java         |   236 +
 .../internal/runtime/arrays/MapIterator.java  |    76 +
 .../runtime/arrays/NoTypeArrayData.java       |   181 +
 .../runtime/arrays/NumberArrayData.java       |   219 +
 .../runtime/arrays/ObjectArrayData.java       |   195 +
 .../runtime/arrays/ReverseArrayIterator.java  |    59 +
 .../runtime/arrays/ReverseMapIterator.java    |    55 +
 .../runtime/arrays/SealedArrayFilter.java     |    64 +
 .../runtime/arrays/SparseArrayData.java       |   336 +
 .../runtime/arrays/UndefinedArrayFilter.java  |   210 +
 .../internal/runtime/linker/Bootstrap.java    |   208 +
 .../internal/runtime/linker/InvokeByName.java |   116 +
 .../runtime/linker/JSObjectLinker.java        |   232 +
 .../runtime/linker/JavaAdapterFactory.java    |  1061 +
 .../linker/JavaArgumentConverters.java        |   302 +
 .../runtime/linker/LinkerCallSite.java        |   540 +
 .../internal/runtime/linker/Lookup.java       |   214 +
 .../internal/runtime/linker/Mangler.java      |   140 +
 .../runtime/linker/MethodHandleFactory.java   |   633 +
 .../linker/MethodHandleFunctionality.java     |   305 +
 .../runtime/linker/NashornBottomLinker.java   |   172 +
 .../linker/NashornCallSiteDescriptor.java     |   287 +
 .../linker/NashornGuardedInvocation.java      |    68 +
 .../runtime/linker/NashornGuards.java         |   131 +
 .../runtime/linker/NashornLinker.java         |   141 +
 .../linker/NashornPrimitiveLinker.java        |   228 +
 .../runtime/linker/PrimitiveLookup.java       |   108 +
 .../runtime/options/KeyValueOption.java       |    93 +
 .../internal/runtime/options/Option.java      |    61 +
 .../runtime/options/OptionTemplate.java       |   367 +
 .../internal/runtime/options/Options.java     |   657 +
 .../internal/runtime/options/ValueOption.java |    59 +
 .../runtime/resources/Messages.properties     |   137 +
 .../runtime/resources/Options.properties      |   301 +
 .../runtime/resources/mozilla_compat.js       |   301 +
 .../internal/runtime/resources/parser.js      |    63 +
 .../resources/version.properties-template     |    27 +
 .../src/jdk/nashorn/internal/scripts/JO$.java |    62 +
 .../src/jdk/nashorn/internal/scripts/JS$.java |    33 +
 nashorn/src/jdk/nashorn/tools/Shell.java      |   396 +
 .../nashorn/tools/resources/Shell.properties  |    32 +
 .../src/jdk/nashorn/tools/resources/shell.js  |    72 +
 nashorn/src/netscape/javascript/JSObject.java |   101 +
 nashorn/src/overview.html                     |   113 +
 nashorn/test/README                           |    78 +
 nashorn/test/examples/dual-fields-micro.js    |    48 +
 nashorn/test/examples/innerbench.js           |    60 +
 nashorn/test/examples/typechain.js            |    46 +
 nashorn/test/lib/benchmark.js                 |    52 +
 nashorn/test/opt/add.js                       |    58 +
 nashorn/test/opt/add_constant.js              |    45 +
 nashorn/test/opt/add_reuse_callsite.js        |    48 +
 nashorn/test/opt/add_revert2.js               |    46 +
 nashorn/test/opt/cascade_specialize.js        |    40 +
 nashorn/test/script/assert.js                 |    63 +
 nashorn/test/script/basic/NASHORN-100.js      |    39 +
 .../test/script/basic/NASHORN-100.js.EXPECTED |     3 +
 nashorn/test/script/basic/NASHORN-101.js      |    58 +
 .../test/script/basic/NASHORN-101.js.EXPECTED |     9 +
 nashorn/test/script/basic/NASHORN-102.js      |    43 +
 .../test/script/basic/NASHORN-102.js.EXPECTED |     2 +
 nashorn/test/script/basic/NASHORN-103.js      |    39 +
 nashorn/test/script/basic/NASHORN-104.js      |    35 +
 .../test/script/basic/NASHORN-104.js.EXPECTED |     4 +
 nashorn/test/script/basic/NASHORN-105.js      |    50 +
 .../test/script/basic/NASHORN-105.js.EXPECTED |    18 +
 nashorn/test/script/basic/NASHORN-106.js      |    39 +
 .../test/script/basic/NASHORN-106.js.EXPECTED |     9 +
 nashorn/test/script/basic/NASHORN-107.js      |    33 +
 nashorn/test/script/basic/NASHORN-108.js      |    32 +
 .../test/script/basic/NASHORN-108.js.EXPECTED |     3 +
 nashorn/test/script/basic/NASHORN-109.js      |    43 +
 .../test/script/basic/NASHORN-109.js.EXPECTED |     2 +
 nashorn/test/script/basic/NASHORN-11.js       |    38 +
 .../test/script/basic/NASHORN-11.js.EXPECTED  |     2 +
 nashorn/test/script/basic/NASHORN-111.js      |    38 +
 .../test/script/basic/NASHORN-111.js.EXPECTED |     1 +
 nashorn/test/script/basic/NASHORN-113.js      |    34 +
 .../test/script/basic/NASHORN-113.js.EXPECTED |     2 +
 nashorn/test/script/basic/NASHORN-114.js      |    45 +
 nashorn/test/script/basic/NASHORN-115.js      |    48 +
 .../test/script/basic/NASHORN-115.js.EXPECTED |     5 +
 nashorn/test/script/basic/NASHORN-117.js      |   160 +
 nashorn/test/script/basic/NASHORN-118.js      |    43 +
 .../test/script/basic/NASHORN-118.js.EXPECTED |     3 +
 nashorn/test/script/basic/NASHORN-119.js      |    37 +
 .../test/script/basic/NASHORN-119.js.EXPECTED |     3 +
 nashorn/test/script/basic/NASHORN-12.js       |   145 +
 nashorn/test/script/basic/NASHORN-120.js      |    59 +
 nashorn/test/script/basic/NASHORN-122.js      |    36 +
 .../test/script/basic/NASHORN-122.js.EXPECTED |     4 +
 nashorn/test/script/basic/NASHORN-126.js      |    34 +
 .../test/script/basic/NASHORN-126.js.EXPECTED |     2 +
 nashorn/test/script/basic/NASHORN-127.js      |    39 +
 .../test/script/basic/NASHORN-127.js.EXPECTED |     2 +
 nashorn/test/script/basic/NASHORN-130.js      |    38 +
 nashorn/test/script/basic/NASHORN-132.js      |    70 +
 .../test/script/basic/NASHORN-132.js.EXPECTED |    10 +
 nashorn/test/script/basic/NASHORN-133.js      |    46 +
 .../test/script/basic/NASHORN-133.js.EXPECTED |     7 +
 nashorn/test/script/basic/NASHORN-135.js      |    49 +
 nashorn/test/script/basic/NASHORN-136.js      |    77 +
 .../test/script/basic/NASHORN-136.js.EXPECTED |    24 +
 nashorn/test/script/basic/NASHORN-14.js       |    39 +
 .../test/script/basic/NASHORN-14.js.EXPECTED  |     2 +
 nashorn/test/script/basic/NASHORN-148.js      |    83 +
 .../test/script/basic/NASHORN-148.js.EXPECTED |    20 +
 nashorn/test/script/basic/NASHORN-15.js       |    46 +
 .../test/script/basic/NASHORN-15.js.EXPECTED  |    10 +
 nashorn/test/script/basic/NASHORN-153.js      |    35 +
 nashorn/test/script/basic/NASHORN-156.js      |    38 +
 nashorn/test/script/basic/NASHORN-157.js      |    38 +
 nashorn/test/script/basic/NASHORN-163.js      |    41 +
 .../test/script/basic/NASHORN-163.js.EXPECTED |     8 +
 nashorn/test/script/basic/NASHORN-164.js      |    37 +
 nashorn/test/script/basic/NASHORN-165.js      |    35 +
 nashorn/test/script/basic/NASHORN-166.js      |    46 +
 nashorn/test/script/basic/NASHORN-168.js      |    54 +
 .../test/script/basic/NASHORN-168.js.EXPECTED |    16 +
 nashorn/test/script/basic/NASHORN-169.js      |    33 +
 nashorn/test/script/basic/NASHORN-172.js      |    55 +
 nashorn/test/script/basic/NASHORN-173.js      |    72 +
 .../test/script/basic/NASHORN-173.js.EXPECTED |   247 +
 nashorn/test/script/basic/NASHORN-174.js      |    47 +
 nashorn/test/script/basic/NASHORN-175.js      |    31 +
 nashorn/test/script/basic/NASHORN-176.js      |    40 +
 nashorn/test/script/basic/NASHORN-177.js      |    37 +
 .../test/script/basic/NASHORN-177.js.EXPECTED |     2 +
 nashorn/test/script/basic/NASHORN-178.js      |    46 +
 .../test/script/basic/NASHORN-178.js.EXPECTED |     4 +
 nashorn/test/script/basic/NASHORN-179.js      |    41 +
 nashorn/test/script/basic/NASHORN-18.js       |    41 +
 .../test/script/basic/NASHORN-18.js.EXPECTED  |     1 +
 nashorn/test/script/basic/NASHORN-181.js      |    40 +
 nashorn/test/script/basic/NASHORN-182.js      |    54 +
 nashorn/test/script/basic/NASHORN-183.js      |    55 +
 nashorn/test/script/basic/NASHORN-184.js      |    38 +
 .../test/script/basic/NASHORN-184.js.EXPECTED |     3 +
 nashorn/test/script/basic/NASHORN-185.js      |    37 +
 .../test/script/basic/NASHORN-185.js.EXPECTED |     1 +
 nashorn/test/script/basic/NASHORN-187.js      |    48 +
 nashorn/test/script/basic/NASHORN-188.js      |    66 +
 .../test/script/basic/NASHORN-188.js.EXPECTED |   208 +
 nashorn/test/script/basic/NASHORN-19.js       |   279 +
 .../test/script/basic/NASHORN-19.js.EXPECTED  |   177 +
 nashorn/test/script/basic/NASHORN-190.js      |    78 +
 nashorn/test/script/basic/NASHORN-192.js      |    71 +
 nashorn/test/script/basic/NASHORN-194.js      |    48 +
 nashorn/test/script/basic/NASHORN-196.js      |    39 +
 nashorn/test/script/basic/NASHORN-198.js      |    39 +
 nashorn/test/script/basic/NASHORN-20.js       |    33 +
 .../test/script/basic/NASHORN-20.js.EXPECTED  |     1 +
 nashorn/test/script/basic/NASHORN-201.js      |    36 +
 nashorn/test/script/basic/NASHORN-202.js      |    33 +
 nashorn/test/script/basic/NASHORN-203.js      |    40 +
 nashorn/test/script/basic/NASHORN-204.js      |    46 +
 nashorn/test/script/basic/NASHORN-205.js      |    65 +
 nashorn/test/script/basic/NASHORN-206.js      |    38 +
 nashorn/test/script/basic/NASHORN-207.js      |   132 +
 nashorn/test/script/basic/NASHORN-207_2.js    |   237 +
 nashorn/test/script/basic/NASHORN-208.js      |    70 +
 .../test/script/basic/NASHORN-208.js.EXPECTED |     1 +
 nashorn/test/script/basic/NASHORN-209.js      |    42 +
 .../test/script/basic/NASHORN-209.js.EXPECTED |     6 +
 nashorn/test/script/basic/NASHORN-21.js       |    47 +
 .../test/script/basic/NASHORN-21.js.EXPECTED  |     2 +
 nashorn/test/script/basic/NASHORN-211.js      |    50 +
 nashorn/test/script/basic/NASHORN-212.js      |    72 +
 nashorn/test/script/basic/NASHORN-213.js      |    40 +
 nashorn/test/script/basic/NASHORN-215.js      |   100 +
 .../test/script/basic/NASHORN-215.js.EXPECTED |    15 +
 nashorn/test/script/basic/NASHORN-216.js      |    41 +
 nashorn/test/script/basic/NASHORN-217.js      |    54 +
 .../test/script/basic/NASHORN-217.js.EXPECTED |    10 +
 nashorn/test/script/basic/NASHORN-219.js      |    31 +
 .../test/script/basic/NASHORN-219.js.EXPECTED |     1 +
 nashorn/test/script/basic/NASHORN-22.js       |    42 +
 .../test/script/basic/NASHORN-22.js.EXPECTED  |     2 +
 nashorn/test/script/basic/NASHORN-221.js      |    51 +
 nashorn/test/script/basic/NASHORN-222.js      |    44 +
 nashorn/test/script/basic/NASHORN-223.js      |    40 +
 nashorn/test/script/basic/NASHORN-225.js      |    40 +
 nashorn/test/script/basic/NASHORN-226.js      |    51 +
 nashorn/test/script/basic/NASHORN-227.js      |    46 +
 nashorn/test/script/basic/NASHORN-228.js      |    54 +
 nashorn/test/script/basic/NASHORN-229.js      |    42 +
 .../test/script/basic/NASHORN-229_subtest.js  |    41 +
 nashorn/test/script/basic/NASHORN-23.js       |    46 +
 .../test/script/basic/NASHORN-23.js.EXPECTED  |     1 +
 nashorn/test/script/basic/NASHORN-232.js      |    44 +
 nashorn/test/script/basic/NASHORN-234.js      |    58 +
 nashorn/test/script/basic/NASHORN-235.js      |    45 +
 nashorn/test/script/basic/NASHORN-236.js      |    30 +
 nashorn/test/script/basic/NASHORN-237.js      |    37 +
 nashorn/test/script/basic/NASHORN-239.js      |    35 +
 nashorn/test/script/basic/NASHORN-24.js       |    47 +
 .../test/script/basic/NASHORN-24.js.EXPECTED  |     2 +
 nashorn/test/script/basic/NASHORN-241.js      |    59 +
 nashorn/test/script/basic/NASHORN-242.js      |    40 +
 nashorn/test/script/basic/NASHORN-245.js      |    46 +
 nashorn/test/script/basic/NASHORN-247.js      |    55 +
 nashorn/test/script/basic/NASHORN-25.js       |    48 +
 .../test/script/basic/NASHORN-25.js.EXPECTED  |     2 +
 nashorn/test/script/basic/NASHORN-251.js      |   103 +
 nashorn/test/script/basic/NASHORN-252.js      |    42 +
 nashorn/test/script/basic/NASHORN-253.js      |    74 +
 nashorn/test/script/basic/NASHORN-256.js      |    74 +
 nashorn/test/script/basic/NASHORN-258.js      |    67 +
 .../test/script/basic/NASHORN-258.js.EXPECTED |     2 +
 nashorn/test/script/basic/NASHORN-26.js       |    53 +
 .../test/script/basic/NASHORN-26.js.EXPECTED  |     6 +
 nashorn/test/script/basic/NASHORN-260.js      |    54 +
 nashorn/test/script/basic/NASHORN-261.js      |    85 +
 nashorn/test/script/basic/NASHORN-262.js      |    40 +
 nashorn/test/script/basic/NASHORN-263.js      |    59 +
 nashorn/test/script/basic/NASHORN-264.js      |    47 +
 nashorn/test/script/basic/NASHORN-265.js      |    46 +
 .../test/script/basic/NASHORN-265.js.EXPECTED |     1 +
 nashorn/test/script/basic/NASHORN-266.js      |    66 +
 nashorn/test/script/basic/NASHORN-269.js      |    67 +
 nashorn/test/script/basic/NASHORN-27.js       |    41 +
 .../test/script/basic/NASHORN-27.js.EXPECTED  |     9 +
 nashorn/test/script/basic/NASHORN-270.js      |    46 +
 nashorn/test/script/basic/NASHORN-271.js      |    46 +
 nashorn/test/script/basic/NASHORN-275.js      |    81 +
 nashorn/test/script/basic/NASHORN-276.js      |    38 +
 nashorn/test/script/basic/NASHORN-277.js      |    34 +
 nashorn/test/script/basic/NASHORN-278.js      |    42 +
 nashorn/test/script/basic/NASHORN-28.js       |    54 +
 .../test/script/basic/NASHORN-28.js.EXPECTED  |     4 +
 nashorn/test/script/basic/NASHORN-281.js      |    54 +
 nashorn/test/script/basic/NASHORN-284.js      |    48 +
 .../test/script/basic/NASHORN-284.js.EXPECTED |     2 +
 nashorn/test/script/basic/NASHORN-285.js      |    60 +
 .../test/script/basic/NASHORN-285.js.EXPECTED |     2 +
 nashorn/test/script/basic/NASHORN-288.js      |    56 +
 nashorn/test/script/basic/NASHORN-29.js       |    42 +
 .../test/script/basic/NASHORN-29.js.EXPECTED  |     2 +
 nashorn/test/script/basic/NASHORN-293.js      |    54 +
 .../test/script/basic/NASHORN-293.js.EXPECTED |     9 +
 nashorn/test/script/basic/NASHORN-294.js      |    46 +
 nashorn/test/script/basic/NASHORN-296.js      |    53 +
 nashorn/test/script/basic/NASHORN-297.js      |    46 +
 nashorn/test/script/basic/NASHORN-30.js       |    48 +
 .../test/script/basic/NASHORN-30.js.EXPECTED  |     2 +
 nashorn/test/script/basic/NASHORN-300.js      |    43 +
 nashorn/test/script/basic/NASHORN-301.js      |    35 +
 .../test/script/basic/NASHORN-301.js.EXPECTED |    35 +
 nashorn/test/script/basic/NASHORN-304.js      |    52 +
 nashorn/test/script/basic/NASHORN-310.js      |    57 +
 .../test/script/basic/NASHORN-310.js.EXPECTED |     4 +
 nashorn/test/script/basic/NASHORN-318.js      |    36 +
 .../test/script/basic/NASHORN-318.js.EXPECTED |     4 +
 nashorn/test/script/basic/NASHORN-32.js       |    71 +
 .../test/script/basic/NASHORN-32.js.EXPECTED  |    12 +
 nashorn/test/script/basic/NASHORN-321.js      |    43 +
 .../test/script/basic/NASHORN-321.js.EXPECTED |     2 +
 nashorn/test/script/basic/NASHORN-323.js      |    38 +
 .../test/script/basic/NASHORN-323.js.EXPECTED |     1 +
 nashorn/test/script/basic/NASHORN-324.js      |    47 +
 nashorn/test/script/basic/NASHORN-33.js       |    45 +
 .../test/script/basic/NASHORN-33.js.EXPECTED  |     2 +
 nashorn/test/script/basic/NASHORN-331.js      |    60 +
 .../test/script/basic/NASHORN-331.js.EXPECTED |    24 +
 nashorn/test/script/basic/NASHORN-337.js      |    43 +
 .../test/script/basic/NASHORN-337.js.EXPECTED |     8 +
 nashorn/test/script/basic/NASHORN-34.js       |    49 +
 .../test/script/basic/NASHORN-34.js.EXPECTED  |     2 +
 nashorn/test/script/basic/NASHORN-340.js      |    44 +
 .../test/script/basic/NASHORN-340.js.EXPECTED |     6 +
 nashorn/test/script/basic/NASHORN-349.js      |    48 +
 nashorn/test/script/basic/NASHORN-354.js      |    41 +
 .../test/script/basic/NASHORN-354.js.EXPECTED |     3 +
 nashorn/test/script/basic/NASHORN-355.js      |    42 +
 .../test/script/basic/NASHORN-355.js.EXPECTED |     3 +
 nashorn/test/script/basic/NASHORN-36.js       |    48 +
 .../test/script/basic/NASHORN-36.js.EXPECTED  |     4 +
 nashorn/test/script/basic/NASHORN-365.js      |    45 +
 nashorn/test/script/basic/NASHORN-366.js      |    35 +
 .../test/script/basic/NASHORN-366.js.EXPECTED |     5 +
 nashorn/test/script/basic/NASHORN-368.js      |    40 +
 .../test/script/basic/NASHORN-368.js.EXPECTED |    20 +
 nashorn/test/script/basic/NASHORN-37.js       |    75 +
 .../test/script/basic/NASHORN-37.js.EXPECTED  |    20 +
 nashorn/test/script/basic/NASHORN-375.js      |    53 +
 nashorn/test/script/basic/NASHORN-376.js      |    46 +
 nashorn/test/script/basic/NASHORN-377.js      |   226 +
 .../test/script/basic/NASHORN-377.js.EXPECTED |    34 +
 nashorn/test/script/basic/NASHORN-378.js      |    59 +
 nashorn/test/script/basic/NASHORN-38.js       |    43 +
 .../test/script/basic/NASHORN-38.js.EXPECTED  |     2 +
 nashorn/test/script/basic/NASHORN-380.js      |    37 +
 .../test/script/basic/NASHORN-380.js.EXPECTED |     4 +
 nashorn/test/script/basic/NASHORN-381.js      |    47 +
 nashorn/test/script/basic/NASHORN-382.js      |    40 +
 nashorn/test/script/basic/NASHORN-383.js      |    54 +
 nashorn/test/script/basic/NASHORN-384.js      |    34 +
 .../test/script/basic/NASHORN-384.js.EXPECTED |     2 +
 nashorn/test/script/basic/NASHORN-385.js      |    69 +
 .../test/script/basic/NASHORN-385.js.EXPECTED |     6 +
 nashorn/test/script/basic/NASHORN-389.js      |    40 +
 .../test/script/basic/NASHORN-389.js.EXPECTED |     5 +
 nashorn/test/script/basic/NASHORN-393.js      |    37 +
 .../test/script/basic/NASHORN-393.js.EXPECTED |     2 +
 nashorn/test/script/basic/NASHORN-394.js      |    34 +
 .../test/script/basic/NASHORN-394.js.EXPECTED |     1 +
 nashorn/test/script/basic/NASHORN-396.js      |    47 +
 nashorn/test/script/basic/NASHORN-397.js      |    48 +
 nashorn/test/script/basic/NASHORN-398.js      |    72 +
 nashorn/test/script/basic/NASHORN-40.js       |    41 +
 .../test/script/basic/NASHORN-40.js.EXPECTED  |     6 +
 nashorn/test/script/basic/NASHORN-400.js      |    66 +
 .../test/script/basic/NASHORN-400.js.EXPECTED |     2 +
 nashorn/test/script/basic/NASHORN-401.js      |    43 +
 .../test/script/basic/NASHORN-401.js.EXPECTED |     9 +
 nashorn/test/script/basic/NASHORN-402.js      |    44 +
 .../test/script/basic/NASHORN-402.js.EXPECTED |     5 +
 nashorn/test/script/basic/NASHORN-404.js      |    43 +
 nashorn/test/script/basic/NASHORN-405.js      |    35 +
 .../test/script/basic/NASHORN-405.js.EXPECTED |     2 +
 nashorn/test/script/basic/NASHORN-406.js      |    83 +
 nashorn/test/script/basic/NASHORN-408.js      |    38 +
 .../test/script/basic/NASHORN-408.js.EXPECTED |     5 +
 nashorn/test/script/basic/NASHORN-415.js      |    35 +
 .../test/script/basic/NASHORN-415.js.EXPECTED |     2 +
 nashorn/test/script/basic/NASHORN-416.js      |    51 +
 nashorn/test/script/basic/NASHORN-417.js      |    47 +
 nashorn/test/script/basic/NASHORN-418.js      |    81 +
 nashorn/test/script/basic/NASHORN-420.js      |    45 +
 nashorn/test/script/basic/NASHORN-421.js      |    63 +
 nashorn/test/script/basic/NASHORN-423.js      |  4030 +++
 .../test/script/basic/NASHORN-423.js.EXPECTED |  4000 ++
 nashorn/test/script/basic/NASHORN-423a.js     |  2030 ++
 nashorn/test/script/basic/NASHORN-424.js      |    83 +
 .../test/script/basic/NASHORN-424.js.EXPECTED |    33 +
 nashorn/test/script/basic/NASHORN-425.js      |    44 +
 .../test/script/basic/NASHORN-425.js.EXPECTED |     3 +
 nashorn/test/script/basic/NASHORN-426.js      |    54 +
 nashorn/test/script/basic/NASHORN-427.js      |    75 +
 nashorn/test/script/basic/NASHORN-428.js      |    53 +
 nashorn/test/script/basic/NASHORN-429.js      |    40 +
 nashorn/test/script/basic/NASHORN-432.js      |    39 +
 nashorn/test/script/basic/NASHORN-433.js      |    47 +
 nashorn/test/script/basic/NASHORN-434.js      |    61 +
 nashorn/test/script/basic/NASHORN-435.js      |    40 +
 nashorn/test/script/basic/NASHORN-437.js      |    51 +
 nashorn/test/script/basic/NASHORN-44.js       |    52 +
 .../test/script/basic/NASHORN-44.js.EXPECTED  |    12 +
 nashorn/test/script/basic/NASHORN-441.js      |    89 +
 .../test/script/basic/NASHORN-441.js.EXPECTED |    17 +
 nashorn/test/script/basic/NASHORN-442.js      |    50 +
 nashorn/test/script/basic/NASHORN-443.js      |    48 +
 nashorn/test/script/basic/NASHORN-444.js      |    71 +
 .../test/script/basic/NASHORN-444.js.EXPECTED |     4 +
 nashorn/test/script/basic/NASHORN-445.js      |    56 +
 nashorn/test/script/basic/NASHORN-446.js      |    45 +
 nashorn/test/script/basic/NASHORN-447.js      |    46 +
 nashorn/test/script/basic/NASHORN-448.js      |    44 +
 nashorn/test/script/basic/NASHORN-449.js      |    53 +
 .../test/script/basic/NASHORN-449.js.EXPECTED |     0
 nashorn/test/script/basic/NASHORN-45.js       |    62 +
 .../test/script/basic/NASHORN-45.js.EXPECTED  |     4 +
 nashorn/test/script/basic/NASHORN-450.js      |    47 +
 nashorn/test/script/basic/NASHORN-452.js      |    79 +
 nashorn/test/script/basic/NASHORN-459.js      |    67 +
 nashorn/test/script/basic/NASHORN-46.js       |    45 +
 .../test/script/basic/NASHORN-46.js.EXPECTED  |     2 +
 nashorn/test/script/basic/NASHORN-462.js      |    43 +
 nashorn/test/script/basic/NASHORN-463.js      |    36 +
 nashorn/test/script/basic/NASHORN-468.js      |  3035 ++
 nashorn/test/script/basic/NASHORN-47.js       |    46 +
 nashorn/test/script/basic/NASHORN-473.js      |    42 +
 .../test/script/basic/NASHORN-473.js.EXPECTED |     4 +
 nashorn/test/script/basic/NASHORN-474.js      |    54 +
 .../test/script/basic/NASHORN-474.js.EXPECTED |     6 +
 nashorn/test/script/basic/NASHORN-478.js      |   115 +
 nashorn/test/script/basic/NASHORN-48.js       |    73 +
 .../test/script/basic/NASHORN-48.js.EXPECTED  |     6 +
 nashorn/test/script/basic/NASHORN-481.js      | 10035 ++++++
 .../test/script/basic/NASHORN-481.js.EXPECTED |     1 +
 nashorn/test/script/basic/NASHORN-482.js      |    41 +
 nashorn/test/script/basic/NASHORN-484.js      |    34 +
 .../test/script/basic/NASHORN-484.js.EXPECTED |     2 +
 nashorn/test/script/basic/NASHORN-486.js      |    81 +
 nashorn/test/script/basic/NASHORN-487.js      |    43 +
 nashorn/test/script/basic/NASHORN-488.js      |    48 +
 nashorn/test/script/basic/NASHORN-49.js       |    63 +
 .../test/script/basic/NASHORN-49.js.EXPECTED  |     4 +
 nashorn/test/script/basic/NASHORN-490.js      |    48 +
 nashorn/test/script/basic/NASHORN-494.js      |    57 +
 nashorn/test/script/basic/NASHORN-497.js      |    44 +
 nashorn/test/script/basic/NASHORN-498.js      |    42 +
 nashorn/test/script/basic/NASHORN-499.js      |    38 +
 nashorn/test/script/basic/NASHORN-50.js       |    55 +
 .../test/script/basic/NASHORN-50.js.EXPECTED  |     1 +
 nashorn/test/script/basic/NASHORN-500.js      |    66 +
 nashorn/test/script/basic/NASHORN-503.js      |    52 +
 .../test/script/basic/NASHORN-503.js.EXPECTED |     5 +
 nashorn/test/script/basic/NASHORN-51.js       |    62 +
 .../test/script/basic/NASHORN-51.js.EXPECTED  |    24 +
 nashorn/test/script/basic/NASHORN-511.js      |    55 +
 nashorn/test/script/basic/NASHORN-515.js      |   145 +
 .../test/script/basic/NASHORN-515.js.EXPECTED |     6 +
 nashorn/test/script/basic/NASHORN-516.js      |    49 +
 nashorn/test/script/basic/NASHORN-52.js       |    38 +
 nashorn/test/script/basic/NASHORN-534.js      | 30066 ++++++++++++++++
 .../test/script/basic/NASHORN-534.js.EXPECTED |    13 +
 nashorn/test/script/basic/NASHORN-535.js      |    46 +
 .../test/script/basic/NASHORN-535.js.EXPECTED |     2 +
 nashorn/test/script/basic/NASHORN-544.js      |    46 +
 nashorn/test/script/basic/NASHORN-55.js       |    37 +
 nashorn/test/script/basic/NASHORN-554.js      |    40 +
 .../test/script/basic/NASHORN-554.js.EXPECTED |    10 +
 nashorn/test/script/basic/NASHORN-556.js      |   216 +
 .../test/script/basic/NASHORN-556.js.EXPECTED |    16 +
 nashorn/test/script/basic/NASHORN-56.js       |    41 +
 .../test/script/basic/NASHORN-56.js.EXPECTED  |     3 +
 nashorn/test/script/basic/NASHORN-562.js      |    38 +
 nashorn/test/script/basic/NASHORN-565.js      |    38 +
 .../test/script/basic/NASHORN-565.js.EXPECTED |     6 +
 nashorn/test/script/basic/NASHORN-575.js      |    61 +
 .../test/script/basic/NASHORN-575.js.EXPECTED |    18 +
 nashorn/test/script/basic/NASHORN-58.js       |   149 +
 .../test/script/basic/NASHORN-58.js.EXPECTED  |    23 +
 nashorn/test/script/basic/NASHORN-59.js       |    41 +
 .../test/script/basic/NASHORN-59.js.EXPECTED  |     1 +
 nashorn/test/script/basic/NASHORN-592.js      |   120 +
 .../test/script/basic/NASHORN-592.js.EXPECTED |    44 +
 nashorn/test/script/basic/NASHORN-597.js      |    83 +
 .../test/script/basic/NASHORN-597.js.EXPECTED |     8 +
 nashorn/test/script/basic/NASHORN-60.js       |    36 +
 .../test/script/basic/NASHORN-60.js.EXPECTED  |     3 +
 nashorn/test/script/basic/NASHORN-609.js      |    43 +
 .../test/script/basic/NASHORN-609.js.EXPECTED |     5 +
 nashorn/test/script/basic/NASHORN-61.js       |    35 +
 .../test/script/basic/NASHORN-61.js.EXPECTED  |     1 +
 nashorn/test/script/basic/NASHORN-62.js       |    52 +
 .../test/script/basic/NASHORN-62.js.EXPECTED  |     2 +
 nashorn/test/script/basic/NASHORN-620.js      |    35 +
 .../test/script/basic/NASHORN-620.js.EXPECTED |     5 +
 nashorn/test/script/basic/NASHORN-623.js      |    54 +
 .../test/script/basic/NASHORN-623.js.EXPECTED |     3 +
 nashorn/test/script/basic/NASHORN-627.js      |   155 +
 .../test/script/basic/NASHORN-627.js.EXPECTED |  1241 +
 nashorn/test/script/basic/NASHORN-63.js       |   108 +
 .../test/script/basic/NASHORN-631.js.EXPECTED |  3917 ++
 nashorn/test/script/basic/NASHORN-637.js      |    49 +
 .../test/script/basic/NASHORN-637.js.EXPECTED |     8 +
 nashorn/test/script/basic/NASHORN-638.js      |    72 +
 .../test/script/basic/NASHORN-638.js.EXPECTED |     1 +
 nashorn/test/script/basic/NASHORN-639.js      |    41 +
 nashorn/test/script/basic/NASHORN-64.js       |    61 +
 nashorn/test/script/basic/NASHORN-642.js      |    41 +
 .../test/script/basic/NASHORN-642.js.EXPECTED |     3 +
 nashorn/test/script/basic/NASHORN-646.js      |    31 +
 nashorn/test/script/basic/NASHORN-653.js      |   104 +
 nashorn/test/script/basic/NASHORN-658.js      |    45 +
 nashorn/test/script/basic/NASHORN-659.js      |    39 +
 nashorn/test/script/basic/NASHORN-66.js       |    33 +
 .../test/script/basic/NASHORN-66.js.EXPECTED  |     2 +
 nashorn/test/script/basic/NASHORN-664.js      |    50 +
 nashorn/test/script/basic/NASHORN-665.js      |    55 +
 nashorn/test/script/basic/NASHORN-67.js       |    44 +
 .../test/script/basic/NASHORN-67.js.EXPECTED  |     1 +
 nashorn/test/script/basic/NASHORN-678.js      |    50 +
 nashorn/test/script/basic/NASHORN-68.js       |    34 +
 .../test/script/basic/NASHORN-68.js.EXPECTED  |     4 +
 nashorn/test/script/basic/NASHORN-689.js      |   114 +
 .../test/script/basic/NASHORN-689.js.EXPECTED |    50 +
 nashorn/test/script/basic/NASHORN-69.js       |    45 +
 .../test/script/basic/NASHORN-69.js.EXPECTED  |    15 +
 nashorn/test/script/basic/NASHORN-691.js      |    57 +
 .../test/script/basic/NASHORN-691.js.EXPECTED |     4 +
 nashorn/test/script/basic/NASHORN-694.js      |    39 +
 .../test/script/basic/NASHORN-694.js.EXPECTED |     6 +
 nashorn/test/script/basic/NASHORN-697.js      |    59 +
 nashorn/test/script/basic/NASHORN-703.js      |   113 +
 .../test/script/basic/NASHORN-703.js.EXPECTED |     7 +
 nashorn/test/script/basic/NASHORN-703a.js     |   122 +
 .../script/basic/NASHORN-703a.js.EXPECTED     |     7 +
 nashorn/test/script/basic/NASHORN-705.js      |    35 +
 nashorn/test/script/basic/NASHORN-71.js       |    33 +
 .../test/script/basic/NASHORN-71.js.EXPECTED  |     3 +
 nashorn/test/script/basic/NASHORN-710.js      |    42 +
 nashorn/test/script/basic/NASHORN-711.js      |    54 +
 .../test/script/basic/NASHORN-711.js.EXPECTED |     4 +
 nashorn/test/script/basic/NASHORN-72.js       |    54 +
 .../test/script/basic/NASHORN-72.js.EXPECTED  |     8 +
 nashorn/test/script/basic/NASHORN-722.js      |    42 +
 nashorn/test/script/basic/NASHORN-73.js       |   122 +
 .../test/script/basic/NASHORN-73.js.EXPECTED  |    12 +
 nashorn/test/script/basic/NASHORN-737.js      |    33 +
 .../test/script/basic/NASHORN-737.js.EXPECTED |     1 +
 nashorn/test/script/basic/NASHORN-74.js       |    35 +
 .../test/script/basic/NASHORN-74.js.EXPECTED  |     1 +
 nashorn/test/script/basic/NASHORN-740.js      |    33 +
 .../test/script/basic/NASHORN-740.js.EXPECTED |     2 +
 nashorn/test/script/basic/NASHORN-75.js       |    47 +
 .../test/script/basic/NASHORN-75.js.EXPECTED  |     3 +
 nashorn/test/script/basic/NASHORN-758.js      |    40 +
 nashorn/test/script/basic/NASHORN-759.js      |    78 +
 .../test/script/basic/NASHORN-759.js.EXPECTED |    47 +
 nashorn/test/script/basic/NASHORN-760.js      |    54 +
 nashorn/test/script/basic/NASHORN-768.js      |    93 +
 nashorn/test/script/basic/NASHORN-778.js      |    33 +
 nashorn/test/script/basic/NASHORN-78.js       |    54 +
 nashorn/test/script/basic/NASHORN-79.js       |    40 +
 .../test/script/basic/NASHORN-79.js.EXPECTED  |     2 +
 nashorn/test/script/basic/NASHORN-792.js      |    72 +
 .../test/script/basic/NASHORN-792.js.EXPECTED |     7 +
 nashorn/test/script/basic/NASHORN-80.js       |    35 +
 .../test/script/basic/NASHORN-80.js.EXPECTED  |     5 +
 nashorn/test/script/basic/NASHORN-81.js       |    77 +
 nashorn/test/script/basic/NASHORN-833.js      |    40 +
 .../test/script/basic/NASHORN-833.js.EXPECTED |     2 +
 nashorn/test/script/basic/NASHORN-85.js       |    31 +
 .../test/script/basic/NASHORN-85.js.EXPECTED  |     1 +
 nashorn/test/script/basic/NASHORN-86.js       |    67 +
 nashorn/test/script/basic/NASHORN-87.js       |    40 +
 nashorn/test/script/basic/NASHORN-89.js       |    81 +
 nashorn/test/script/basic/NASHORN-90.js       |    34 +
 .../test/script/basic/NASHORN-90.js.EXPECTED  |     5 +
 nashorn/test/script/basic/NASHORN-91.js       |    42 +
 .../test/script/basic/NASHORN-91.js.EXPECTED  |     4 +
 nashorn/test/script/basic/NASHORN-92.js       |    42 +
 .../test/script/basic/NASHORN-92.js.EXPECTED  |     2 +
 nashorn/test/script/basic/NASHORN-93.js       |    39 +
 nashorn/test/script/basic/NASHORN-95.js       |    50 +
 .../test/script/basic/NASHORN-95.js.EXPECTED  |     4 +
 nashorn/test/script/basic/NASHORN-96.js       |    35 +
 .../test/script/basic/NASHORN-96.js.EXPECTED  |     2 +
 nashorn/test/script/basic/NASHORN-97.js       |    37 +
 nashorn/test/script/basic/NASHORN-98.js       |    47 +
 .../test/script/basic/NASHORN-98.js.EXPECTED  |     6 +
 nashorn/test/script/basic/NASHORN-99.js       |    54 +
 nashorn/test/script/basic/addition.js         |    84 +
 .../test/script/basic/addition.js.EXPECTED    |    20 +
 nashorn/test/script/basic/allgettersetters.js |   133 +
 nashorn/test/script/basic/andor.js            |    35 +
 nashorn/test/script/basic/andor.js.EXPECTED   |     4 +
 nashorn/test/script/basic/anonrecur.js        |    34 +
 .../test/script/basic/anonrecur.js.EXPECTED   |     1 +
 nashorn/test/script/basic/applycall.js        |    56 +
 .../test/script/basic/applycall.js.EXPECTED   |    14 +
 nashorn/test/script/basic/args.js             |    47 +
 nashorn/test/script/basic/args.js.EXPECTED    |     3 +
 nashorn/test/script/basic/arity.js            |    91 +
 nashorn/test/script/basic/arity.js.EXPECTED   |    30 +
 nashorn/test/script/basic/arrayprotoclass.js  |    32 +
 .../script/basic/arrayprotoclass.js.EXPECTED  |     1 +
 nashorn/test/script/basic/arrays.js           |   160 +
 nashorn/test/script/basic/arrays.js.EXPECTED  |    51 +
 nashorn/test/script/basic/arrays2.js          |    53 +
 nashorn/test/script/basic/arrays2.js.EXPECTED |     7 +
 nashorn/test/script/basic/arraysIntKey.js     |    35 +
 .../script/basic/arraysIntKey.js.EXPECTED     |     2 +
 nashorn/test/script/basic/arrayset.js         |    39 +
 .../test/script/basic/arrayset.js.EXPECTED    |     6 +
 nashorn/test/script/basic/arrayundefined.js   |    36 +
 .../script/basic/arrayundefined.js.EXPECTED   |     4 +
 nashorn/test/script/basic/assign.js           |    50 +
 nashorn/test/script/basic/assign.js.EXPECTED  |    13 +
 nashorn/test/script/basic/bitwise_and.js      |    51 +
 .../test/script/basic/bitwise_and.js.EXPECTED |    18 +
 nashorn/test/script/basic/booleangetter.js    |    43 +
 .../script/basic/booleangetter.js.EXPECTED    |     1 +
 nashorn/test/script/basic/builtin.js          |    73 +
 nashorn/test/script/basic/builtin.js.EXPECTED |     1 +
 nashorn/test/script/basic/builtin_assign.js   |    36 +
 .../script/basic/builtin_assign.js.EXPECTED   |     3 +
 nashorn/test/script/basic/builtinchain.js     |    55 +
 .../script/basic/builtinchain.js.EXPECTED     |    16 +
 nashorn/test/script/basic/calllink.js         |    81 +
 .../test/script/basic/calllink.js.EXPECTED    |    12 +
 nashorn/test/script/basic/closure.js          |    38 +
 nashorn/test/script/basic/closure.js.EXPECTED |     8 +
 nashorn/test/script/basic/commandargs.js      |    36 +
 .../test/script/basic/commandargs.js.EXPECTED |     2 +
 nashorn/test/script/basic/compile-octane.js   |    30 +
 .../script/basic/compile-octane.js.EXPECTED   |    12 +
 nashorn/test/script/basic/condassign.js       |    36 +
 .../test/script/basic/condassign.js.EXPECTED  |     2 +
 nashorn/test/script/basic/construct.js        |    59 +
 .../test/script/basic/construct.js.EXPECTED   |    15 +
 nashorn/test/script/basic/constructorname.js  |    52 +
 .../script/basic/constructorname.js.EXPECTED  |     7 +
 nashorn/test/script/basic/date.js             |   101 +
 nashorn/test/script/basic/date.js.EXPECTED    |   132 +
 nashorn/test/script/basic/dateparse.js        |    55 +
 .../test/script/basic/dateparse.js.EXPECTED   |    10 +
 nashorn/test/script/basic/decinc.js           |    70 +
 nashorn/test/script/basic/decinc.js.EXPECTED  |    12 +
 nashorn/test/script/basic/delete.js           |    63 +
 nashorn/test/script/basic/delete.js.EXPECTED  |    18 +
 nashorn/test/script/basic/delete2.js          |    80 +
 nashorn/test/script/basic/delete2.js.EXPECTED |    25 +
 nashorn/test/script/basic/dotpropname.js      |    40 +
 .../test/script/basic/dotpropname.js.EXPECTED |     2 +
 nashorn/test/script/basic/doublecache.js      |    54 +
 .../test/script/basic/doublecache.js.EXPECTED |    19 +
 nashorn/test/script/basic/enumeration.js      |    55 +
 .../test/script/basic/enumeration.js.EXPECTED |    16 +
 nashorn/test/script/basic/errors.js           |    95 +
 nashorn/test/script/basic/errors.js.EXPECTED  |    31 +
 nashorn/test/script/basic/errorstack.js       |    51 +
 .../test/script/basic/errorstack.js.EXPECTED  |     4 +
 nashorn/test/script/basic/eval.js             |    73 +
 nashorn/test/script/basic/eval.js.EXPECTED    |    15 +
 nashorn/test/script/basic/evalreturn.js       |    71 +
 .../test/script/basic/evalreturn.js.EXPECTED  |    11 +
 nashorn/test/script/basic/exprclosure.js      |    38 +
 .../test/script/basic/exprclosure.js.EXPECTED |     4 +
 nashorn/test/script/basic/extensibility.js    |    47 +
 .../script/basic/extensibility.js.EXPECTED    |     6 +
 nashorn/test/script/basic/fileline.js         |    48 +
 .../test/script/basic/fileline.js.EXPECTED    |     4 +
 .../test/script/basic/finally-catchalls.js    |   121 +
 .../basic/finally-catchalls.js.EXPECTED       |    62 +
 nashorn/test/script/basic/finallyreturn.js    |    41 +
 .../script/basic/finallyreturn.js.EXPECTED    |     1 +
 nashorn/test/script/basic/forin.js            |    56 +
 nashorn/test/script/basic/forin.js.EXPECTED   |    37 +
 nashorn/test/script/basic/forin2.js           |   116 +
 nashorn/test/script/basic/forin2.js.EXPECTED  |     4 +
 nashorn/test/script/basic/funcarray.js        |    42 +
 .../test/script/basic/funcarray.js.EXPECTED   |     4 +
 nashorn/test/script/basic/funcbind.js         |    53 +
 .../test/script/basic/funcbind.js.EXPECTED    |    11 +
 nashorn/test/script/basic/funcconstructor.js  |    43 +
 .../script/basic/funcconstructor.js.EXPECTED  |    10 +
 nashorn/test/script/basic/getclassname.js     |   126 +
 nashorn/test/script/basic/getenv.js           |    31 +
 nashorn/test/script/basic/getenv.js.EXPECTED  |     1 +
 nashorn/test/script/basic/getter_callsite.js  |    51 +
 .../script/basic/getter_callsite.js.EXPECTED  |     4 +
 nashorn/test/script/basic/gettercalls.js      |    48 +
 .../test/script/basic/gettercalls.js.EXPECTED |    21 +
 nashorn/test/script/basic/getterfunc.js       |    69 +
 .../test/script/basic/getterfunc.js.EXPECTED  |    30 +
 nashorn/test/script/basic/gettersetter.js     |    78 +
 .../script/basic/gettersetter.js.EXPECTED     |    13 +
 nashorn/test/script/basic/globalaccess.js     |    40 +
 .../script/basic/globalaccess.js.EXPECTED     |     1 +
 nashorn/test/script/basic/globals.js          |    94 +
 nashorn/test/script/basic/globals.js.EXPECTED |    32 +
 nashorn/test/script/basic/globalscope.js      |    43 +
 .../test/script/basic/globalscope.js.EXPECTED |     2 +
 nashorn/test/script/basic/hello.js            |    31 +
 nashorn/test/script/basic/hello.js.EXPECTED   |     1 +
 nashorn/test/script/basic/herestr_operator.js |    39 +
 .../script/basic/herestr_operator.js.EXPECTED |     1 +
 nashorn/test/script/basic/illegaljavaname.js  |    37 +
 .../script/basic/illegaljavaname.js.EXPECTED  |     2 +
 nashorn/test/script/basic/incheck.js          |    54 +
 nashorn/test/script/basic/incheck.js.EXPECTED |    10 +
 nashorn/test/script/basic/indexedcall.js      |    35 +
 .../test/script/basic/indexedcall.js.EXPECTED |     1 +
 nashorn/test/script/basic/info.js             |    32 +
 nashorn/test/script/basic/info.js.EXPECTED    |     1 +
 .../script/basic/inherited_nonwritable.js     |    40 +
 nashorn/test/script/basic/instanceof.js       |    66 +
 .../test/script/basic/instanceof.js.EXPECTED  |    21 +
 nashorn/test/script/basic/instanceof2.js      |    48 +
 .../test/script/basic/instanceof2.js.EXPECTED |     8 +
 nashorn/test/script/basic/interfaces.js       |    50 +
 .../test/script/basic/interfaces.js.EXPECTED  |     3 +
 nashorn/test/script/basic/iterator.js         |    42 +
 .../test/script/basic/iterator.js.EXPECTED    |    12 +
 nashorn/test/script/basic/java.js             |    47 +
 nashorn/test/script/basic/java.js.EXPECTED    |    12 +
 nashorn/test/script/basic/javaarray.js        |    71 +
 .../test/script/basic/javaarray.js.EXPECTED   |    16 +
 .../test/script/basic/javaarrayconversion.js  |   221 +
 .../basic/javaarrayconversion.js.EXPECTED     |     1 +
 nashorn/test/script/basic/javaexceptions.js   |    58 +
 .../script/basic/javaexceptions.js.EXPECTED   |     7 +
 nashorn/test/script/basic/javaimporter.js     |    48 +
 .../script/basic/javaimporter.js.EXPECTED     |     4 +
 nashorn/test/script/basic/javainnerclasses.js |    53 +
 .../script/basic/javainnerclasses.js.EXPECTED |     9 +
 nashorn/test/script/basic/javasigcall.js      |    46 +
 .../test/script/basic/javasigcall.js.EXPECTED |     5 +
 nashorn/test/script/basic/jquery.js           |    93 +
 nashorn/test/script/basic/jquery.js.EXPECTED  |     2 +
 nashorn/test/script/basic/jsadapter.js        |    99 +
 .../test/script/basic/jsadapter.js.EXPECTED   |    22 +
 nashorn/test/script/basic/jsadapterlink.js    |    67 +
 .../script/basic/jsadapterlink.js.EXPECTED    |     8 +
 nashorn/test/script/basic/json.js             |    62 +
 nashorn/test/script/basic/json.js.EXPECTED    |    15 +
 nashorn/test/script/basic/list.js             |    68 +
 nashorn/test/script/basic/list.js.EXPECTED    |    17 +
 nashorn/test/script/basic/literal.js          |    38 +
 nashorn/test/script/basic/literal.js.EXPECTED |     4 +
 nashorn/test/script/basic/load.js             |    31 +
 nashorn/test/script/basic/load.js.EXPECTED    |     1 +
 nashorn/test/script/basic/loadedfile.js       |    36 +
 nashorn/test/script/basic/localundef.js       |    46 +
 .../test/script/basic/localundef.js.EXPECTED  |     3 +
 nashorn/test/script/basic/map.js              |    60 +
 nashorn/test/script/basic/map.js.EXPECTED     |    18 +
 nashorn/test/script/basic/math.js             |    42 +
 nashorn/test/script/basic/math.js.EXPECTED    |     9 +
 nashorn/test/script/basic/minuszero.js        |    41 +
 .../test/script/basic/minuszero.js.EXPECTED   |     6 +
 nashorn/test/script/basic/module.js           |    34 +
 nashorn/test/script/basic/moduleload.js       |    36 +
 .../test/script/basic/moduleload.js.EXPECTED  |     6 +
 nashorn/test/script/basic/nashorn2.js         |    35 +
 .../test/script/basic/nashorn2.js.EXPECTED    |     2 +
 nashorn/test/script/basic/natives.js          |    37 +
 nashorn/test/script/basic/natives.js.EXPECTED |     3 +
 nashorn/test/script/basic/new.js              |    62 +
 nashorn/test/script/basic/new.js.EXPECTED     |    14 +
 nashorn/test/script/basic/newexpr.js          |    66 +
 nashorn/test/script/basic/newexpr.js.EXPECTED |     7 +
 nashorn/test/script/basic/newnew.js           |    48 +
 nashorn/test/script/basic/newnew.js.EXPECTED  |     6 +
 nashorn/test/script/basic/nonconstructors.js  |    53 +
 .../script/basic/nonconstructors.js.EXPECTED  |     4 +
 nashorn/test/script/basic/nosuchmethod.js     |    40 +
 .../script/basic/nosuchmethod.js.EXPECTED     |     4 +
 nashorn/test/script/basic/nosuchproperty.js   |    63 +
 .../script/basic/nosuchproperty.js.EXPECTED   |     4 +
 nashorn/test/script/basic/number.js           |    42 +
 nashorn/test/script/basic/number.js.EXPECTED  |     7 +
 nashorn/test/script/basic/numberstring.js     |    43 +
 .../script/basic/numberstring.js.EXPECTED     |    67 +
 nashorn/test/script/basic/objectprops.js      |    64 +
 .../test/script/basic/objectprops.js.EXPECTED |     8 +
 nashorn/test/script/basic/objects.js          |    72 +
 nashorn/test/script/basic/objects.js.EXPECTED |    46 +
 nashorn/test/script/basic/options.js          |    34 +
 nashorn/test/script/basic/options.js.EXPECTED |     3 +
 nashorn/test/script/basic/propchange.js       |    58 +
 .../test/script/basic/propchange.js.EXPECTED  |     5 +
 nashorn/test/script/basic/propertycheck.js    |    37 +
 .../script/basic/propertycheck.js.EXPECTED    |     2 +
 nashorn/test/script/basic/proto.js.EXPECTED   |     2 +
 nashorn/test/script/basic/prototype.js        |    52 +
 .../test/script/basic/prototype.js.EXPECTED   |     1 +
 nashorn/test/script/basic/pushpull.js         |    41 +
 .../test/script/basic/pushpull.js.EXPECTED    |     7 +
 nashorn/test/script/basic/regex.js            |   114 +
 nashorn/test/script/basic/regex.js.EXPECTED   |    49 +
 nashorn/test/script/basic/regexp_flags.js     |    49 +
 nashorn/test/script/basic/run-octane.js       |   222 +
 nashorn/test/script/basic/runsunspider.js     |   191 +
 .../script/basic/runsunspider.js.EXPECTED     |     1 +
 nashorn/test/script/basic/samfunc.js          |    48 +
 nashorn/test/script/basic/samfunc.js.EXPECTED |     2 +
 nashorn/test/script/basic/scripting.js        |    81 +
 .../test/script/basic/scripting.js.EXPECTED   |   103 +
 nashorn/test/script/basic/sealfreeze.js       |    55 +
 .../test/script/basic/sealfreeze.js.EXPECTED  |    10 +
 nashorn/test/script/basic/setlength.js        |    45 +
 .../test/script/basic/setlength.js.EXPECTED   |    10 +
 nashorn/test/script/basic/stdin.js            |    35 +
 nashorn/test/script/basic/stdin.js.EXPECTED   |     3 +
 nashorn/test/script/basic/strings.js          |    87 +
 nashorn/test/script/basic/strings.js.EXPECTED |    37 +
 nashorn/test/script/basic/throws.js           |    33 +
 nashorn/test/script/basic/throws.js.EXPECTED  |     1 +
 nashorn/test/script/basic/tosource.js         |    38 +
 .../test/script/basic/tosource.js.EXPECTED    |     4 +
 nashorn/test/script/basic/tostring.js         |    53 +
 .../test/script/basic/tostring.js.EXPECTED    |     8 +
 nashorn/test/script/basic/try.js              |    50 +
 nashorn/test/script/basic/try.js.EXPECTED     |     7 +
 nashorn/test/script/basic/trybreakcont.js     |    39 +
 .../script/basic/trybreakcont.js.EXPECTED     |     2 +
 nashorn/test/script/basic/trycatch.js         |    47 +
 .../test/script/basic/trycatch.js.EXPECTED    |     1 +
 nashorn/test/script/basic/trycatchfor.js      |    37 +
 .../test/script/basic/trycatchfor.js.EXPECTED |     1 +
 nashorn/test/script/basic/tryfinallyreturn.js |    44 +
 .../script/basic/tryfinallyreturn.js.EXPECTED |     2 +
 nashorn/test/script/basic/tryforbreak.js      |    38 +
 .../test/script/basic/tryforbreak.js.EXPECTED |     1 +
 nashorn/test/script/basic/typechange.js       |    33 +
 .../test/script/basic/typechange.js.EXPECTED  |     1 +
 nashorn/test/script/basic/typeof.js           |    47 +
 nashorn/test/script/basic/typeof.js.EXPECTED  |     7 +
 nashorn/test/script/basic/typeof2.js          |    45 +
 nashorn/test/script/basic/typeof2.js.EXPECTED |    12 +
 nashorn/test/script/basic/undefined.js        |    94 +
 .../test/script/basic/undefined.js.EXPECTED   |    10 +
 nashorn/test/script/basic/underscore.js       |    37 +
 .../test/script/basic/underscore.js.EXPECTED  |     1 +
 nashorn/test/script/basic/varargs.js          |    56 +
 nashorn/test/script/basic/varargs.js.EXPECTED |    57 +
 nashorn/test/script/basic/void.js             |    41 +
 nashorn/test/script/basic/void.js.EXPECTED    |     8 +
 nashorn/test/script/basic/with.js             |    64 +
 nashorn/test/script/basic/with.js.EXPECTED    |    13 +
 nashorn/test/script/basic/withprimitive.js    |    38 +
 .../script/basic/withprimitive.js.EXPECTED    |     1 +
 nashorn/test/script/basic/writable_relink.js  |    41 +
 .../script/basic/writable_relink.js.EXPECTED  |     4 +
 .../test/script/basic/xmlStrings.js.EXPECTED  |    23 +
 nashorn/test/script/basic/xorassign.js        |    37 +
 .../test/script/basic/xorassign.js.EXPECTED   |     1 +
 nashorn/test/script/basic/yui.js              |    45 +
 nashorn/test/script/basic/yui.js.EXPECTED     |     2 +
 nashorn/test/script/error/NASHORN-154/README  |     6 +
 .../function_mult_params_in_strict.js         |    38 +
 ...function_mult_params_in_strict.js.EXPECTED |     3 +
 .../improper_return_break_continue.js         |    40 +
 ...improper_return_break_continue.js.EXPECTED |    15 +
 .../error/NASHORN-154/invalid_lvalue.js       |    42 +
 .../NASHORN-154/invalid_lvalue.js.EXPECTED    |    15 +
 .../NASHORN-154/literal_data_and_accessor.js  |    38 +
 .../literal_data_and_accessor.js.EXPECTED     |     6 +
 .../error/NASHORN-154/literal_mult_getters.js |    36 +
 .../literal_mult_getters.js.EXPECTED          |     3 +
 .../literal_mult_prop_in_strict.js            |    37 +
 .../literal_mult_prop_in_strict.js.EXPECTED   |     3 +
 .../error/NASHORN-154/with_in_strict.js       |    38 +
 .../NASHORN-154/with_in_strict.js.EXPECTED    |     9 +
 nashorn/test/script/error/NASHORN-214.js      |    44 +
 .../test/script/error/NASHORN-214.js.EXPECTED |     3 +
 nashorn/test/script/error/NASHORN-35.js       |    32 +
 .../test/script/error/NASHORN-35.js.EXPECTED  |     3 +
 nashorn/test/script/error/NASHORN-39.js       |    33 +
 .../test/script/error/NASHORN-39.js.EXPECTED  |     3 +
 nashorn/test/script/error/NASHORN-568.js      |    30 +
 .../test/script/error/NASHORN-568.js.EXPECTED |     3 +
 nashorn/test/script/error/NASHORN-57.js       |    35 +
 .../test/script/error/NASHORN-57.js.EXPECTED  |     3 +
 nashorn/test/script/error/NASHORN-668.js      |    38 +
 .../test/script/error/NASHORN-668.js.EXPECTED |    11 +
 nashorn/test/script/error/quotemissing.js     |    28 +
 .../script/error/quotemissing.js.EXPECTED     |     3 +
 nashorn/test/script/error/strictmode.js       |    35 +
 .../test/script/error/strictmode.js.EXPECTED  |     1 +
 .../script/representations/NASHORN-592a.js    |   122 +
 nashorn/test/script/sandbox/NASHORN-525.js    |    54 +
 nashorn/test/script/sandbox/README            |     1 +
 nashorn/test/script/sandbox/classloader.js    |    41 +
 .../script/sandbox/classloader.js.EXPECTED    |     1 +
 nashorn/test/script/sandbox/doprivileged.js   |    58 +
 .../script/sandbox/doprivileged.js.EXPECTED   |     2 +
 nashorn/test/script/sandbox/exit.js           |    46 +
 nashorn/test/script/sandbox/exit.js.EXPECTED  |     2 +
 nashorn/test/script/sandbox/file.js           |    55 +
 nashorn/test/script/sandbox/file.js.EXPECTED  |     3 +
 nashorn/test/script/sandbox/javaextend.js     |   102 +
 .../script/sandbox/javaextend.js.EXPECTED     |    19 +
 nashorn/test/script/sandbox/loadLibrary.js    |    43 +
 nashorn/test/script/sandbox/net.js            |    43 +
 nashorn/test/script/sandbox/net.js.EXPECTED   |     1 +
 nashorn/test/script/sandbox/property.js       |    44 +
 .../test/script/sandbox/property.js.EXPECTED  |     1 +
 nashorn/test/script/sandbox/reflection.js     |    45 +
 .../script/sandbox/reflection.js.EXPECTED     |     1 +
 nashorn/test/script/sandbox/runnable.js       |    41 +
 .../test/script/sandbox/runnable.js.EXPECTED  |     2 +
 nashorn/test/script/sandbox/unsafe.js         |    66 +
 .../test/script/sandbox/unsafe.js.EXPECTED    |     4 +
 nashorn/test/script/test262.js                |    39 +
 nashorn/test/script/test262_single.js         |    38 +
 .../test/src/UnnamedPackageTestCallback.java  |    28 +
 .../api/scripting/MultipleEngineTest.java     |    54 +
 .../api/scripting/ScriptEngineTest.java       |   862 +
 .../src/jdk/nashorn/api/scripting/Window.java |    75 +
 .../api/scripting/WindowEventHandler.java     |    32 +
 .../internal/access/BooleanAccessTest.java    |   206 +
 .../internal/access/MethodAccessTest.java     |   453 +
 .../internal/access/NumberAccessTest.java     |   776 +
 .../internal/access/NumberBoxingTest.java     |   348 +
 .../internal/access/ObjectAccessTest.java     |   152 +
 .../jdk/nashorn/internal/access/Person.java   |    58 +
 .../nashorn/internal/access/SharedObject.java |   466 +
 .../internal/access/StringAccessTest.java     |   155 +
 .../internal/codegen/CompilerTest.java        |   188 +
 .../nashorn/internal/parser/ParserTest.java   |   187 +
 .../internal/performance/AuroraWrapper.java   |   214 +
 .../internal/performance/OctaneTest.java      |   307 +
 .../performance/PerformanceWrapper.java       |   155 +
 .../internal/performance/SplayTest.java       |    48 +
 .../nashorn/internal/runtime/ContextTest.java |   111 +
 .../nashorn/internal/runtime/JSTypeTest.java  |   104 +
 .../runtime/Nashorn401TestSubject.java        |    57 +
 .../framework/AbstractScriptRunnable.java     |   297 +
 .../test/framework/JSJUnitReportReporter.java |    41 +
 .../test/framework/OrphanTestFinder.java      |    67 +
 .../test/framework/ParallelTestRunner.java    |   492 +
 .../test/framework/ScriptEvaluator.java       |    45 +
 .../test/framework/ScriptRunnable.java        |   236 +
 .../internal/test/framework/ScriptTest.java   |    79 +
 .../framework/SeparateContextEvaluator.java   |    40 +
 .../framework/SharedContextEvaluator.java     |   151 +
 .../internal/test/framework/TestConfig.java   |    75 +
 .../internal/test/framework/TestFinder.java   |   362 +
 .../internal/test/framework/TestHelper.java   |   134 +
 .../framework/TestReorderInterceptor.java     |    59 +
 .../test/models/ConstructorWithArgument.java  |    40 +
 .../internal/test/models/FinalClass.java      |    30 +
 .../models/NoAccessibleConstructorClass.java  |    30 +
 .../internal/test/models/NonPublicClass.java  |    30 +
 .../internal/test/models/OuterClass.java      |    65 +
 .../internal/test/models/OverloadedSam.java   |    31 +
 .../internal/test/models/OverrideObject.java  |    44 +
 1176 files changed, 188153 insertions(+), 1 deletion(-)
 create mode 100644 nashorn/ASSEMBLY_EXCEPTION
 create mode 100644 nashorn/LICENSE
 create mode 100644 nashorn/README
 create mode 100644 nashorn/RELEASE_README
 create mode 100644 nashorn/THIRD_PARTY_README
 create mode 100644 nashorn/bin/checkintest.sh
 create mode 100644 nashorn/bin/fixorphantests.sh
 create mode 100644 nashorn/bin/fixwhitespace.sh
 create mode 100644 nashorn/bin/jjs
 create mode 100644 nashorn/bin/jjs.bat
 create mode 100644 nashorn/bin/jjssecure
 create mode 100644 nashorn/bin/jjssecure.bat
 create mode 100644 nashorn/bin/nashorn
 create mode 100644 nashorn/bin/nashorn.bat
 create mode 100644 nashorn/bin/rm-non-tracked.sh
 create mode 100644 nashorn/bin/verbose_octane.bat
 create mode 100644 nashorn/bin/verbose_octane.sh
 create mode 100644 nashorn/buildtools/nasgen/README
 create mode 100644 nashorn/buildtools/nasgen/build.xml
 create mode 100644 nashorn/buildtools/nasgen/nasgen.iml
 create mode 100644 nashorn/buildtools/nasgen/project.properties
 create mode 100644 nashorn/buildtools/nasgen/src/META-INF/MANIFEST.MF
 create mode 100644 nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ClassGenerator.java
 create mode 100644 nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ConstructorGenerator.java
 create mode 100644 nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/Main.java
 create mode 100644 nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MemberInfo.java
 create mode 100644 nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MethodGenerator.java
 create mode 100644 nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/NullVisitor.java
 create mode 100644 nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/PrototypeGenerator.java
 create mode 100644 nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfo.java
 create mode 100644 nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfoCollector.java
 create mode 100644 nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInstrumentor.java
 create mode 100644 nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/StringConstants.java
 create mode 100644 nashorn/docs/DEVELOPER_README
 create mode 100644 nashorn/docs/genshelldoc.js
 create mode 100644 nashorn/make/Makefile
 create mode 100644 nashorn/make/build-benchmark.xml
 create mode 100644 nashorn/make/build-nasgen.xml
 create mode 100644 nashorn/make/build.xml
 create mode 100644 nashorn/make/nbproject/ide-file-targets.xml
 create mode 100644 nashorn/make/nbproject/ide-targets.xml
 create mode 100644 nashorn/make/nbproject/jdk.xml
 create mode 100644 nashorn/make/nbproject/nbjdk.properties
 create mode 100644 nashorn/make/nbproject/nbjdk.xml
 create mode 100644 nashorn/make/nbproject/project.xml
 create mode 100644 nashorn/make/project.properties
 create mode 100644 nashorn/samples/counters.js
 create mode 100644 nashorn/samples/letter.js
 create mode 100644 nashorn/samples/parser.js
 create mode 100644 nashorn/samples/shell.js
 create mode 100644 nashorn/samples/test.js
 create mode 100644 nashorn/samples/uniq.js
 create mode 100644 nashorn/src/META-INF/MANIFEST.MF
 create mode 100644 nashorn/src/META-INF/services/javax.script.ScriptEngineFactory
 create mode 100644 nashorn/src/jdk/nashorn/api/scripting/NashornException.java
 create mode 100644 nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
 create mode 100644 nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java
 create mode 100644 nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java
 create mode 100644 nashorn/src/jdk/nashorn/api/scripting/package-info.java
 create mode 100644 nashorn/src/jdk/nashorn/api/scripting/resources/engine.js
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/AccessSpecializer.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/BranchOptimizer.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/ClassEmitter.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/CompileUnit.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/CompilerConstants.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/ConstantData.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/Emitter.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/Frame.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/FunctionSignature.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/Lower.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/Namespace.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/RuntimeCallSite.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/SharedScopeCall.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/Splitter.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/Transform.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/WeighNodes.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/objects/FieldObjectCreator.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/objects/FunctionObjectCreator.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/objects/MapCreator.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectClassGenerator.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectCreator.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectMapCreator.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/types/ArrayType.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/types/BitwiseType.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/types/BooleanType.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeArrayOps.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeBitwiseOps.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeNumericOps.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeOps.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/types/IntType.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/types/LongType.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/types/NumberType.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/types/NumericType.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/types/ObjectType.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/types/Type.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/AccessNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/Assignment.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/BaseNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/BinaryNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/Block.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/BreakNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/BreakableNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/CallNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/CaseNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/CatchNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/ContinueNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/DoWhileNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/EmptyNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/ExecuteNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/ForNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/FunctionCall.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/IdentNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/IfNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/IndexNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/LabelNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/LabeledNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/LineNumberNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/LiteralNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/Location.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/Node.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/ObjectNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/PropertyKey.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/PropertyNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/ReferenceNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/ReturnNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/RuntimeNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/SplitNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/SwitchNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/Symbol.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/TernaryNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/ThrowNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/TryNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/TypeOverride.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/UnaryNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/VarNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/WhileNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/WithNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/annotations/ChildNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/annotations/Ignore.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/annotations/ParentNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/annotations/Reference.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/debug/ASTWriter.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/debug/JSONWriter.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/debug/PrintVisitor.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/visitor/NodeOperatorVisitor.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/ir/visitor/NodeVisitor.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/ArrayBufferView.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/DataPropertyDescriptor.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/DateParser.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/GenericPropertyDescriptor.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/Global.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/NativeArguments.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/NativeArray.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/NativeArrayBuffer.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/NativeBoolean.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/NativeDate.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/NativeDebug.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/NativeError.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/NativeEvalError.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/NativeFloat32Array.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/NativeFloat64Array.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/NativeFunction.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/NativeInt16Array.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/NativeInt32Array.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/NativeInt8Array.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/NativeJSON.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/NativeJava.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/NativeJavaImporter.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/NativeMath.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/NativeObject.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/NativeRangeError.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/NativeReferenceError.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/NativeRegExpExecResult.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/NativeStrictArguments.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/NativeString.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/NativeSyntaxError.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/NativeTypeError.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/NativeURIError.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/NativeUint16Array.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/NativeUint32Array.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/NativeUint8Array.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/NativeUint8ClampedArray.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/PrototypeObject.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/annotations/Attribute.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/annotations/Constructor.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/annotations/Function.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/annotations/Getter.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/annotations/Property.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/annotations/ScriptClass.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/annotations/Setter.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/annotations/SpecializedConstructor.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/annotations/SpecializedFunction.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/annotations/Where.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/package-info.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/parser/AbstractParser.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/parser/JSONParser.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/parser/Lexer.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/parser/Parser.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/parser/RegExp.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/parser/RegExpScanner.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/parser/Scanner.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/parser/Token.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/parser/TokenKind.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/parser/TokenLookup.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/parser/TokenStream.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/parser/TokenType.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/AccessorProperty.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/BitVector.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/CodeInstaller.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/ConsString.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/Context.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/Debug.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/DebugLogger.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/DefaultPropertyAccess.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/ECMAErrors.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/ECMAException.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/ErrorManager.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/FindProperty.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/FunctionScope.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/GlobalFunctions.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/GlobalObject.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/JSErrorType.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/JSType.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/Logging.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/NashornLoader.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/NativeJavaPackage.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/NumberToString.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/ParserException.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/Property.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/PropertyAccess.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/PropertyDescriptor.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/PropertyHashMap.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/PropertyListener.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/PropertyListenerManager.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/QuotedStringTokenizer.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/RegExpMatch.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/Scope.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/ScriptLoader.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/Source.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/SpillProperty.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/StructureLoader.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/URIUtils.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/Undefined.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/UserAccessorProperty.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/Version.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/WithObject.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayData.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayFilter.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayIndex.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayIterator.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayLikeIterator.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/arrays/DeletedArrayFilter.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/arrays/DeletedRangeArrayFilter.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/arrays/EmptyArrayLikeIterator.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/arrays/FrozenArrayFilter.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/arrays/IntArrayData.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/arrays/InvalidArrayIndexException.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/arrays/IteratorAction.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/arrays/LongArrayData.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/arrays/MapIterator.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/arrays/NoTypeArrayData.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/arrays/NumberArrayData.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/arrays/ObjectArrayData.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseArrayIterator.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseMapIterator.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/arrays/SealedArrayFilter.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/arrays/SparseArrayData.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/arrays/UndefinedArrayFilter.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/linker/Bootstrap.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/linker/InvokeByName.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/linker/Lookup.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/linker/Mangler.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/linker/MethodHandleFactory.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/linker/MethodHandleFunctionality.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/linker/NashornGuardedInvocation.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/linker/NashornGuards.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/linker/NashornLinker.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/options/KeyValueOption.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/options/Option.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/options/OptionTemplate.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/options/Options.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/options/ValueOption.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/resources/Messages.properties
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/resources/Options.properties
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/resources/parser.js
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/resources/version.properties-template
 create mode 100644 nashorn/src/jdk/nashorn/internal/scripts/JO$.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/scripts/JS$.java
 create mode 100644 nashorn/src/jdk/nashorn/tools/Shell.java
 create mode 100644 nashorn/src/jdk/nashorn/tools/resources/Shell.properties
 create mode 100644 nashorn/src/jdk/nashorn/tools/resources/shell.js
 create mode 100644 nashorn/src/netscape/javascript/JSObject.java
 create mode 100644 nashorn/src/overview.html
 create mode 100644 nashorn/test/README
 create mode 100644 nashorn/test/examples/dual-fields-micro.js
 create mode 100644 nashorn/test/examples/innerbench.js
 create mode 100644 nashorn/test/examples/typechain.js
 create mode 100644 nashorn/test/lib/benchmark.js
 create mode 100644 nashorn/test/opt/add.js
 create mode 100644 nashorn/test/opt/add_constant.js
 create mode 100644 nashorn/test/opt/add_reuse_callsite.js
 create mode 100644 nashorn/test/opt/add_revert2.js
 create mode 100644 nashorn/test/opt/cascade_specialize.js
 create mode 100644 nashorn/test/script/assert.js
 create mode 100644 nashorn/test/script/basic/NASHORN-100.js
 create mode 100644 nashorn/test/script/basic/NASHORN-100.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-101.js
 create mode 100644 nashorn/test/script/basic/NASHORN-101.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-102.js
 create mode 100644 nashorn/test/script/basic/NASHORN-102.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-103.js
 create mode 100644 nashorn/test/script/basic/NASHORN-104.js
 create mode 100644 nashorn/test/script/basic/NASHORN-104.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-105.js
 create mode 100644 nashorn/test/script/basic/NASHORN-105.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-106.js
 create mode 100644 nashorn/test/script/basic/NASHORN-106.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-107.js
 create mode 100644 nashorn/test/script/basic/NASHORN-108.js
 create mode 100644 nashorn/test/script/basic/NASHORN-108.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-109.js
 create mode 100644 nashorn/test/script/basic/NASHORN-109.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-11.js
 create mode 100644 nashorn/test/script/basic/NASHORN-11.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-111.js
 create mode 100644 nashorn/test/script/basic/NASHORN-111.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-113.js
 create mode 100644 nashorn/test/script/basic/NASHORN-113.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-114.js
 create mode 100644 nashorn/test/script/basic/NASHORN-115.js
 create mode 100644 nashorn/test/script/basic/NASHORN-115.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-117.js
 create mode 100644 nashorn/test/script/basic/NASHORN-118.js
 create mode 100644 nashorn/test/script/basic/NASHORN-118.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-119.js
 create mode 100644 nashorn/test/script/basic/NASHORN-119.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-12.js
 create mode 100644 nashorn/test/script/basic/NASHORN-120.js
 create mode 100644 nashorn/test/script/basic/NASHORN-122.js
 create mode 100644 nashorn/test/script/basic/NASHORN-122.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-126.js
 create mode 100644 nashorn/test/script/basic/NASHORN-126.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-127.js
 create mode 100644 nashorn/test/script/basic/NASHORN-127.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-130.js
 create mode 100644 nashorn/test/script/basic/NASHORN-132.js
 create mode 100644 nashorn/test/script/basic/NASHORN-132.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-133.js
 create mode 100644 nashorn/test/script/basic/NASHORN-133.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-135.js
 create mode 100644 nashorn/test/script/basic/NASHORN-136.js
 create mode 100644 nashorn/test/script/basic/NASHORN-136.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-14.js
 create mode 100644 nashorn/test/script/basic/NASHORN-14.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-148.js
 create mode 100644 nashorn/test/script/basic/NASHORN-148.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-15.js
 create mode 100644 nashorn/test/script/basic/NASHORN-15.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-153.js
 create mode 100644 nashorn/test/script/basic/NASHORN-156.js
 create mode 100644 nashorn/test/script/basic/NASHORN-157.js
 create mode 100644 nashorn/test/script/basic/NASHORN-163.js
 create mode 100644 nashorn/test/script/basic/NASHORN-163.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-164.js
 create mode 100644 nashorn/test/script/basic/NASHORN-165.js
 create mode 100644 nashorn/test/script/basic/NASHORN-166.js
 create mode 100644 nashorn/test/script/basic/NASHORN-168.js
 create mode 100644 nashorn/test/script/basic/NASHORN-168.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-169.js
 create mode 100644 nashorn/test/script/basic/NASHORN-172.js
 create mode 100644 nashorn/test/script/basic/NASHORN-173.js
 create mode 100644 nashorn/test/script/basic/NASHORN-173.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-174.js
 create mode 100644 nashorn/test/script/basic/NASHORN-175.js
 create mode 100644 nashorn/test/script/basic/NASHORN-176.js
 create mode 100644 nashorn/test/script/basic/NASHORN-177.js
 create mode 100644 nashorn/test/script/basic/NASHORN-177.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-178.js
 create mode 100644 nashorn/test/script/basic/NASHORN-178.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-179.js
 create mode 100644 nashorn/test/script/basic/NASHORN-18.js
 create mode 100644 nashorn/test/script/basic/NASHORN-18.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-181.js
 create mode 100644 nashorn/test/script/basic/NASHORN-182.js
 create mode 100644 nashorn/test/script/basic/NASHORN-183.js
 create mode 100644 nashorn/test/script/basic/NASHORN-184.js
 create mode 100644 nashorn/test/script/basic/NASHORN-184.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-185.js
 create mode 100644 nashorn/test/script/basic/NASHORN-185.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-187.js
 create mode 100644 nashorn/test/script/basic/NASHORN-188.js
 create mode 100644 nashorn/test/script/basic/NASHORN-188.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-19.js
 create mode 100644 nashorn/test/script/basic/NASHORN-19.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-190.js
 create mode 100644 nashorn/test/script/basic/NASHORN-192.js
 create mode 100644 nashorn/test/script/basic/NASHORN-194.js
 create mode 100644 nashorn/test/script/basic/NASHORN-196.js
 create mode 100644 nashorn/test/script/basic/NASHORN-198.js
 create mode 100644 nashorn/test/script/basic/NASHORN-20.js
 create mode 100644 nashorn/test/script/basic/NASHORN-20.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-201.js
 create mode 100644 nashorn/test/script/basic/NASHORN-202.js
 create mode 100644 nashorn/test/script/basic/NASHORN-203.js
 create mode 100644 nashorn/test/script/basic/NASHORN-204.js
 create mode 100644 nashorn/test/script/basic/NASHORN-205.js
 create mode 100644 nashorn/test/script/basic/NASHORN-206.js
 create mode 100644 nashorn/test/script/basic/NASHORN-207.js
 create mode 100644 nashorn/test/script/basic/NASHORN-207_2.js
 create mode 100644 nashorn/test/script/basic/NASHORN-208.js
 create mode 100644 nashorn/test/script/basic/NASHORN-208.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-209.js
 create mode 100644 nashorn/test/script/basic/NASHORN-209.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-21.js
 create mode 100644 nashorn/test/script/basic/NASHORN-21.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-211.js
 create mode 100644 nashorn/test/script/basic/NASHORN-212.js
 create mode 100644 nashorn/test/script/basic/NASHORN-213.js
 create mode 100644 nashorn/test/script/basic/NASHORN-215.js
 create mode 100644 nashorn/test/script/basic/NASHORN-215.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-216.js
 create mode 100644 nashorn/test/script/basic/NASHORN-217.js
 create mode 100644 nashorn/test/script/basic/NASHORN-217.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-219.js
 create mode 100644 nashorn/test/script/basic/NASHORN-219.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-22.js
 create mode 100644 nashorn/test/script/basic/NASHORN-22.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-221.js
 create mode 100644 nashorn/test/script/basic/NASHORN-222.js
 create mode 100644 nashorn/test/script/basic/NASHORN-223.js
 create mode 100644 nashorn/test/script/basic/NASHORN-225.js
 create mode 100644 nashorn/test/script/basic/NASHORN-226.js
 create mode 100644 nashorn/test/script/basic/NASHORN-227.js
 create mode 100644 nashorn/test/script/basic/NASHORN-228.js
 create mode 100644 nashorn/test/script/basic/NASHORN-229.js
 create mode 100644 nashorn/test/script/basic/NASHORN-229_subtest.js
 create mode 100644 nashorn/test/script/basic/NASHORN-23.js
 create mode 100644 nashorn/test/script/basic/NASHORN-23.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-232.js
 create mode 100644 nashorn/test/script/basic/NASHORN-234.js
 create mode 100644 nashorn/test/script/basic/NASHORN-235.js
 create mode 100644 nashorn/test/script/basic/NASHORN-236.js
 create mode 100644 nashorn/test/script/basic/NASHORN-237.js
 create mode 100644 nashorn/test/script/basic/NASHORN-239.js
 create mode 100644 nashorn/test/script/basic/NASHORN-24.js
 create mode 100644 nashorn/test/script/basic/NASHORN-24.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-241.js
 create mode 100644 nashorn/test/script/basic/NASHORN-242.js
 create mode 100644 nashorn/test/script/basic/NASHORN-245.js
 create mode 100644 nashorn/test/script/basic/NASHORN-247.js
 create mode 100644 nashorn/test/script/basic/NASHORN-25.js
 create mode 100644 nashorn/test/script/basic/NASHORN-25.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-251.js
 create mode 100644 nashorn/test/script/basic/NASHORN-252.js
 create mode 100644 nashorn/test/script/basic/NASHORN-253.js
 create mode 100644 nashorn/test/script/basic/NASHORN-256.js
 create mode 100644 nashorn/test/script/basic/NASHORN-258.js
 create mode 100644 nashorn/test/script/basic/NASHORN-258.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-26.js
 create mode 100644 nashorn/test/script/basic/NASHORN-26.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-260.js
 create mode 100644 nashorn/test/script/basic/NASHORN-261.js
 create mode 100644 nashorn/test/script/basic/NASHORN-262.js
 create mode 100644 nashorn/test/script/basic/NASHORN-263.js
 create mode 100644 nashorn/test/script/basic/NASHORN-264.js
 create mode 100644 nashorn/test/script/basic/NASHORN-265.js
 create mode 100644 nashorn/test/script/basic/NASHORN-265.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-266.js
 create mode 100644 nashorn/test/script/basic/NASHORN-269.js
 create mode 100644 nashorn/test/script/basic/NASHORN-27.js
 create mode 100644 nashorn/test/script/basic/NASHORN-27.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-270.js
 create mode 100644 nashorn/test/script/basic/NASHORN-271.js
 create mode 100644 nashorn/test/script/basic/NASHORN-275.js
 create mode 100644 nashorn/test/script/basic/NASHORN-276.js
 create mode 100644 nashorn/test/script/basic/NASHORN-277.js
 create mode 100644 nashorn/test/script/basic/NASHORN-278.js
 create mode 100644 nashorn/test/script/basic/NASHORN-28.js
 create mode 100644 nashorn/test/script/basic/NASHORN-28.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-281.js
 create mode 100644 nashorn/test/script/basic/NASHORN-284.js
 create mode 100644 nashorn/test/script/basic/NASHORN-284.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-285.js
 create mode 100644 nashorn/test/script/basic/NASHORN-285.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-288.js
 create mode 100644 nashorn/test/script/basic/NASHORN-29.js
 create mode 100644 nashorn/test/script/basic/NASHORN-29.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-293.js
 create mode 100644 nashorn/test/script/basic/NASHORN-293.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-294.js
 create mode 100644 nashorn/test/script/basic/NASHORN-296.js
 create mode 100644 nashorn/test/script/basic/NASHORN-297.js
 create mode 100644 nashorn/test/script/basic/NASHORN-30.js
 create mode 100644 nashorn/test/script/basic/NASHORN-30.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-300.js
 create mode 100644 nashorn/test/script/basic/NASHORN-301.js
 create mode 100644 nashorn/test/script/basic/NASHORN-301.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-304.js
 create mode 100644 nashorn/test/script/basic/NASHORN-310.js
 create mode 100644 nashorn/test/script/basic/NASHORN-310.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-318.js
 create mode 100644 nashorn/test/script/basic/NASHORN-318.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-32.js
 create mode 100644 nashorn/test/script/basic/NASHORN-32.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-321.js
 create mode 100644 nashorn/test/script/basic/NASHORN-321.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-323.js
 create mode 100644 nashorn/test/script/basic/NASHORN-323.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-324.js
 create mode 100644 nashorn/test/script/basic/NASHORN-33.js
 create mode 100644 nashorn/test/script/basic/NASHORN-33.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-331.js
 create mode 100644 nashorn/test/script/basic/NASHORN-331.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-337.js
 create mode 100644 nashorn/test/script/basic/NASHORN-337.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-34.js
 create mode 100644 nashorn/test/script/basic/NASHORN-34.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-340.js
 create mode 100644 nashorn/test/script/basic/NASHORN-340.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-349.js
 create mode 100644 nashorn/test/script/basic/NASHORN-354.js
 create mode 100644 nashorn/test/script/basic/NASHORN-354.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-355.js
 create mode 100644 nashorn/test/script/basic/NASHORN-355.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-36.js
 create mode 100644 nashorn/test/script/basic/NASHORN-36.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-365.js
 create mode 100644 nashorn/test/script/basic/NASHORN-366.js
 create mode 100644 nashorn/test/script/basic/NASHORN-366.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-368.js
 create mode 100644 nashorn/test/script/basic/NASHORN-368.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-37.js
 create mode 100644 nashorn/test/script/basic/NASHORN-37.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-375.js
 create mode 100644 nashorn/test/script/basic/NASHORN-376.js
 create mode 100644 nashorn/test/script/basic/NASHORN-377.js
 create mode 100644 nashorn/test/script/basic/NASHORN-377.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-378.js
 create mode 100644 nashorn/test/script/basic/NASHORN-38.js
 create mode 100644 nashorn/test/script/basic/NASHORN-38.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-380.js
 create mode 100644 nashorn/test/script/basic/NASHORN-380.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-381.js
 create mode 100644 nashorn/test/script/basic/NASHORN-382.js
 create mode 100644 nashorn/test/script/basic/NASHORN-383.js
 create mode 100644 nashorn/test/script/basic/NASHORN-384.js
 create mode 100644 nashorn/test/script/basic/NASHORN-384.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-385.js
 create mode 100644 nashorn/test/script/basic/NASHORN-385.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-389.js
 create mode 100644 nashorn/test/script/basic/NASHORN-389.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-393.js
 create mode 100644 nashorn/test/script/basic/NASHORN-393.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-394.js
 create mode 100644 nashorn/test/script/basic/NASHORN-394.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-396.js
 create mode 100644 nashorn/test/script/basic/NASHORN-397.js
 create mode 100644 nashorn/test/script/basic/NASHORN-398.js
 create mode 100644 nashorn/test/script/basic/NASHORN-40.js
 create mode 100644 nashorn/test/script/basic/NASHORN-40.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-400.js
 create mode 100644 nashorn/test/script/basic/NASHORN-400.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-401.js
 create mode 100644 nashorn/test/script/basic/NASHORN-401.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-402.js
 create mode 100644 nashorn/test/script/basic/NASHORN-402.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-404.js
 create mode 100644 nashorn/test/script/basic/NASHORN-405.js
 create mode 100644 nashorn/test/script/basic/NASHORN-405.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-406.js
 create mode 100644 nashorn/test/script/basic/NASHORN-408.js
 create mode 100644 nashorn/test/script/basic/NASHORN-408.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-415.js
 create mode 100644 nashorn/test/script/basic/NASHORN-415.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-416.js
 create mode 100644 nashorn/test/script/basic/NASHORN-417.js
 create mode 100644 nashorn/test/script/basic/NASHORN-418.js
 create mode 100644 nashorn/test/script/basic/NASHORN-420.js
 create mode 100644 nashorn/test/script/basic/NASHORN-421.js
 create mode 100644 nashorn/test/script/basic/NASHORN-423.js
 create mode 100644 nashorn/test/script/basic/NASHORN-423.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-423a.js
 create mode 100644 nashorn/test/script/basic/NASHORN-424.js
 create mode 100644 nashorn/test/script/basic/NASHORN-424.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-425.js
 create mode 100644 nashorn/test/script/basic/NASHORN-425.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-426.js
 create mode 100644 nashorn/test/script/basic/NASHORN-427.js
 create mode 100644 nashorn/test/script/basic/NASHORN-428.js
 create mode 100644 nashorn/test/script/basic/NASHORN-429.js
 create mode 100644 nashorn/test/script/basic/NASHORN-432.js
 create mode 100644 nashorn/test/script/basic/NASHORN-433.js
 create mode 100644 nashorn/test/script/basic/NASHORN-434.js
 create mode 100644 nashorn/test/script/basic/NASHORN-435.js
 create mode 100644 nashorn/test/script/basic/NASHORN-437.js
 create mode 100644 nashorn/test/script/basic/NASHORN-44.js
 create mode 100644 nashorn/test/script/basic/NASHORN-44.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-441.js
 create mode 100644 nashorn/test/script/basic/NASHORN-441.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-442.js
 create mode 100644 nashorn/test/script/basic/NASHORN-443.js
 create mode 100644 nashorn/test/script/basic/NASHORN-444.js
 create mode 100644 nashorn/test/script/basic/NASHORN-444.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-445.js
 create mode 100644 nashorn/test/script/basic/NASHORN-446.js
 create mode 100644 nashorn/test/script/basic/NASHORN-447.js
 create mode 100644 nashorn/test/script/basic/NASHORN-448.js
 create mode 100644 nashorn/test/script/basic/NASHORN-449.js
 create mode 100644 nashorn/test/script/basic/NASHORN-449.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-45.js
 create mode 100644 nashorn/test/script/basic/NASHORN-45.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-450.js
 create mode 100644 nashorn/test/script/basic/NASHORN-452.js
 create mode 100644 nashorn/test/script/basic/NASHORN-459.js
 create mode 100644 nashorn/test/script/basic/NASHORN-46.js
 create mode 100644 nashorn/test/script/basic/NASHORN-46.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-462.js
 create mode 100644 nashorn/test/script/basic/NASHORN-463.js
 create mode 100644 nashorn/test/script/basic/NASHORN-468.js
 create mode 100644 nashorn/test/script/basic/NASHORN-47.js
 create mode 100644 nashorn/test/script/basic/NASHORN-473.js
 create mode 100644 nashorn/test/script/basic/NASHORN-473.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-474.js
 create mode 100644 nashorn/test/script/basic/NASHORN-474.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-478.js
 create mode 100644 nashorn/test/script/basic/NASHORN-48.js
 create mode 100644 nashorn/test/script/basic/NASHORN-48.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-481.js
 create mode 100644 nashorn/test/script/basic/NASHORN-481.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-482.js
 create mode 100644 nashorn/test/script/basic/NASHORN-484.js
 create mode 100644 nashorn/test/script/basic/NASHORN-484.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-486.js
 create mode 100644 nashorn/test/script/basic/NASHORN-487.js
 create mode 100644 nashorn/test/script/basic/NASHORN-488.js
 create mode 100644 nashorn/test/script/basic/NASHORN-49.js
 create mode 100644 nashorn/test/script/basic/NASHORN-49.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-490.js
 create mode 100644 nashorn/test/script/basic/NASHORN-494.js
 create mode 100644 nashorn/test/script/basic/NASHORN-497.js
 create mode 100644 nashorn/test/script/basic/NASHORN-498.js
 create mode 100644 nashorn/test/script/basic/NASHORN-499.js
 create mode 100644 nashorn/test/script/basic/NASHORN-50.js
 create mode 100644 nashorn/test/script/basic/NASHORN-50.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-500.js
 create mode 100644 nashorn/test/script/basic/NASHORN-503.js
 create mode 100644 nashorn/test/script/basic/NASHORN-503.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-51.js
 create mode 100644 nashorn/test/script/basic/NASHORN-51.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-511.js
 create mode 100644 nashorn/test/script/basic/NASHORN-515.js
 create mode 100644 nashorn/test/script/basic/NASHORN-515.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-516.js
 create mode 100644 nashorn/test/script/basic/NASHORN-52.js
 create mode 100644 nashorn/test/script/basic/NASHORN-534.js
 create mode 100644 nashorn/test/script/basic/NASHORN-534.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-535.js
 create mode 100644 nashorn/test/script/basic/NASHORN-535.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-544.js
 create mode 100644 nashorn/test/script/basic/NASHORN-55.js
 create mode 100644 nashorn/test/script/basic/NASHORN-554.js
 create mode 100644 nashorn/test/script/basic/NASHORN-554.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-556.js
 create mode 100644 nashorn/test/script/basic/NASHORN-556.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-56.js
 create mode 100644 nashorn/test/script/basic/NASHORN-56.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-562.js
 create mode 100644 nashorn/test/script/basic/NASHORN-565.js
 create mode 100644 nashorn/test/script/basic/NASHORN-565.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-575.js
 create mode 100644 nashorn/test/script/basic/NASHORN-575.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-58.js
 create mode 100644 nashorn/test/script/basic/NASHORN-58.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-59.js
 create mode 100644 nashorn/test/script/basic/NASHORN-59.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-592.js
 create mode 100644 nashorn/test/script/basic/NASHORN-592.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-597.js
 create mode 100644 nashorn/test/script/basic/NASHORN-597.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-60.js
 create mode 100644 nashorn/test/script/basic/NASHORN-60.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-609.js
 create mode 100644 nashorn/test/script/basic/NASHORN-609.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-61.js
 create mode 100644 nashorn/test/script/basic/NASHORN-61.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-62.js
 create mode 100644 nashorn/test/script/basic/NASHORN-62.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-620.js
 create mode 100644 nashorn/test/script/basic/NASHORN-620.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-623.js
 create mode 100644 nashorn/test/script/basic/NASHORN-623.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-627.js
 create mode 100644 nashorn/test/script/basic/NASHORN-627.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-63.js
 create mode 100644 nashorn/test/script/basic/NASHORN-631.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-637.js
 create mode 100644 nashorn/test/script/basic/NASHORN-637.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-638.js
 create mode 100644 nashorn/test/script/basic/NASHORN-638.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-639.js
 create mode 100644 nashorn/test/script/basic/NASHORN-64.js
 create mode 100644 nashorn/test/script/basic/NASHORN-642.js
 create mode 100644 nashorn/test/script/basic/NASHORN-642.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-646.js
 create mode 100644 nashorn/test/script/basic/NASHORN-653.js
 create mode 100644 nashorn/test/script/basic/NASHORN-658.js
 create mode 100644 nashorn/test/script/basic/NASHORN-659.js
 create mode 100644 nashorn/test/script/basic/NASHORN-66.js
 create mode 100644 nashorn/test/script/basic/NASHORN-66.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-664.js
 create mode 100644 nashorn/test/script/basic/NASHORN-665.js
 create mode 100644 nashorn/test/script/basic/NASHORN-67.js
 create mode 100644 nashorn/test/script/basic/NASHORN-67.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-678.js
 create mode 100644 nashorn/test/script/basic/NASHORN-68.js
 create mode 100644 nashorn/test/script/basic/NASHORN-68.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-689.js
 create mode 100644 nashorn/test/script/basic/NASHORN-689.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-69.js
 create mode 100644 nashorn/test/script/basic/NASHORN-69.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-691.js
 create mode 100644 nashorn/test/script/basic/NASHORN-691.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-694.js
 create mode 100644 nashorn/test/script/basic/NASHORN-694.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-697.js
 create mode 100644 nashorn/test/script/basic/NASHORN-703.js
 create mode 100644 nashorn/test/script/basic/NASHORN-703.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-703a.js
 create mode 100644 nashorn/test/script/basic/NASHORN-703a.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-705.js
 create mode 100644 nashorn/test/script/basic/NASHORN-71.js
 create mode 100644 nashorn/test/script/basic/NASHORN-71.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-710.js
 create mode 100644 nashorn/test/script/basic/NASHORN-711.js
 create mode 100644 nashorn/test/script/basic/NASHORN-711.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-72.js
 create mode 100644 nashorn/test/script/basic/NASHORN-72.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-722.js
 create mode 100644 nashorn/test/script/basic/NASHORN-73.js
 create mode 100644 nashorn/test/script/basic/NASHORN-73.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-737.js
 create mode 100644 nashorn/test/script/basic/NASHORN-737.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-74.js
 create mode 100644 nashorn/test/script/basic/NASHORN-74.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-740.js
 create mode 100644 nashorn/test/script/basic/NASHORN-740.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-75.js
 create mode 100644 nashorn/test/script/basic/NASHORN-75.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-758.js
 create mode 100644 nashorn/test/script/basic/NASHORN-759.js
 create mode 100644 nashorn/test/script/basic/NASHORN-759.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-760.js
 create mode 100644 nashorn/test/script/basic/NASHORN-768.js
 create mode 100644 nashorn/test/script/basic/NASHORN-778.js
 create mode 100644 nashorn/test/script/basic/NASHORN-78.js
 create mode 100644 nashorn/test/script/basic/NASHORN-79.js
 create mode 100644 nashorn/test/script/basic/NASHORN-79.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-792.js
 create mode 100644 nashorn/test/script/basic/NASHORN-792.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-80.js
 create mode 100644 nashorn/test/script/basic/NASHORN-80.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-81.js
 create mode 100644 nashorn/test/script/basic/NASHORN-833.js
 create mode 100644 nashorn/test/script/basic/NASHORN-833.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-85.js
 create mode 100644 nashorn/test/script/basic/NASHORN-85.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-86.js
 create mode 100644 nashorn/test/script/basic/NASHORN-87.js
 create mode 100644 nashorn/test/script/basic/NASHORN-89.js
 create mode 100644 nashorn/test/script/basic/NASHORN-90.js
 create mode 100644 nashorn/test/script/basic/NASHORN-90.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-91.js
 create mode 100644 nashorn/test/script/basic/NASHORN-91.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-92.js
 create mode 100644 nashorn/test/script/basic/NASHORN-92.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-93.js
 create mode 100644 nashorn/test/script/basic/NASHORN-95.js
 create mode 100644 nashorn/test/script/basic/NASHORN-95.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-96.js
 create mode 100644 nashorn/test/script/basic/NASHORN-96.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-97.js
 create mode 100644 nashorn/test/script/basic/NASHORN-98.js
 create mode 100644 nashorn/test/script/basic/NASHORN-98.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/NASHORN-99.js
 create mode 100644 nashorn/test/script/basic/addition.js
 create mode 100644 nashorn/test/script/basic/addition.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/allgettersetters.js
 create mode 100644 nashorn/test/script/basic/andor.js
 create mode 100644 nashorn/test/script/basic/andor.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/anonrecur.js
 create mode 100644 nashorn/test/script/basic/anonrecur.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/applycall.js
 create mode 100644 nashorn/test/script/basic/applycall.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/args.js
 create mode 100644 nashorn/test/script/basic/args.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/arity.js
 create mode 100644 nashorn/test/script/basic/arity.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/arrayprotoclass.js
 create mode 100644 nashorn/test/script/basic/arrayprotoclass.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/arrays.js
 create mode 100644 nashorn/test/script/basic/arrays.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/arrays2.js
 create mode 100644 nashorn/test/script/basic/arrays2.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/arraysIntKey.js
 create mode 100644 nashorn/test/script/basic/arraysIntKey.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/arrayset.js
 create mode 100644 nashorn/test/script/basic/arrayset.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/arrayundefined.js
 create mode 100644 nashorn/test/script/basic/arrayundefined.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/assign.js
 create mode 100644 nashorn/test/script/basic/assign.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/bitwise_and.js
 create mode 100644 nashorn/test/script/basic/bitwise_and.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/booleangetter.js
 create mode 100644 nashorn/test/script/basic/booleangetter.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/builtin.js
 create mode 100644 nashorn/test/script/basic/builtin.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/builtin_assign.js
 create mode 100644 nashorn/test/script/basic/builtin_assign.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/builtinchain.js
 create mode 100644 nashorn/test/script/basic/builtinchain.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/calllink.js
 create mode 100644 nashorn/test/script/basic/calllink.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/closure.js
 create mode 100644 nashorn/test/script/basic/closure.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/commandargs.js
 create mode 100644 nashorn/test/script/basic/commandargs.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/compile-octane.js
 create mode 100644 nashorn/test/script/basic/compile-octane.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/condassign.js
 create mode 100644 nashorn/test/script/basic/condassign.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/construct.js
 create mode 100644 nashorn/test/script/basic/construct.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/constructorname.js
 create mode 100644 nashorn/test/script/basic/constructorname.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/date.js
 create mode 100644 nashorn/test/script/basic/date.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/dateparse.js
 create mode 100644 nashorn/test/script/basic/dateparse.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/decinc.js
 create mode 100644 nashorn/test/script/basic/decinc.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/delete.js
 create mode 100644 nashorn/test/script/basic/delete.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/delete2.js
 create mode 100644 nashorn/test/script/basic/delete2.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/dotpropname.js
 create mode 100644 nashorn/test/script/basic/dotpropname.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/doublecache.js
 create mode 100644 nashorn/test/script/basic/doublecache.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/enumeration.js
 create mode 100644 nashorn/test/script/basic/enumeration.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/errors.js
 create mode 100644 nashorn/test/script/basic/errors.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/errorstack.js
 create mode 100644 nashorn/test/script/basic/errorstack.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/eval.js
 create mode 100644 nashorn/test/script/basic/eval.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/evalreturn.js
 create mode 100644 nashorn/test/script/basic/evalreturn.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/exprclosure.js
 create mode 100644 nashorn/test/script/basic/exprclosure.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/extensibility.js
 create mode 100644 nashorn/test/script/basic/extensibility.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/fileline.js
 create mode 100644 nashorn/test/script/basic/fileline.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/finally-catchalls.js
 create mode 100644 nashorn/test/script/basic/finally-catchalls.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/finallyreturn.js
 create mode 100644 nashorn/test/script/basic/finallyreturn.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/forin.js
 create mode 100644 nashorn/test/script/basic/forin.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/forin2.js
 create mode 100644 nashorn/test/script/basic/forin2.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/funcarray.js
 create mode 100644 nashorn/test/script/basic/funcarray.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/funcbind.js
 create mode 100644 nashorn/test/script/basic/funcbind.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/funcconstructor.js
 create mode 100644 nashorn/test/script/basic/funcconstructor.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/getclassname.js
 create mode 100644 nashorn/test/script/basic/getenv.js
 create mode 100644 nashorn/test/script/basic/getenv.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/getter_callsite.js
 create mode 100644 nashorn/test/script/basic/getter_callsite.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/gettercalls.js
 create mode 100644 nashorn/test/script/basic/gettercalls.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/getterfunc.js
 create mode 100644 nashorn/test/script/basic/getterfunc.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/gettersetter.js
 create mode 100644 nashorn/test/script/basic/gettersetter.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/globalaccess.js
 create mode 100644 nashorn/test/script/basic/globalaccess.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/globals.js
 create mode 100644 nashorn/test/script/basic/globals.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/globalscope.js
 create mode 100644 nashorn/test/script/basic/globalscope.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/hello.js
 create mode 100644 nashorn/test/script/basic/hello.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/herestr_operator.js
 create mode 100644 nashorn/test/script/basic/herestr_operator.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/illegaljavaname.js
 create mode 100644 nashorn/test/script/basic/illegaljavaname.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/incheck.js
 create mode 100644 nashorn/test/script/basic/incheck.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/indexedcall.js
 create mode 100644 nashorn/test/script/basic/indexedcall.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/info.js
 create mode 100644 nashorn/test/script/basic/info.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/inherited_nonwritable.js
 create mode 100644 nashorn/test/script/basic/instanceof.js
 create mode 100644 nashorn/test/script/basic/instanceof.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/instanceof2.js
 create mode 100644 nashorn/test/script/basic/instanceof2.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/interfaces.js
 create mode 100644 nashorn/test/script/basic/interfaces.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/iterator.js
 create mode 100644 nashorn/test/script/basic/iterator.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/java.js
 create mode 100644 nashorn/test/script/basic/java.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/javaarray.js
 create mode 100644 nashorn/test/script/basic/javaarray.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/javaarrayconversion.js
 create mode 100644 nashorn/test/script/basic/javaarrayconversion.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/javaexceptions.js
 create mode 100644 nashorn/test/script/basic/javaexceptions.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/javaimporter.js
 create mode 100644 nashorn/test/script/basic/javaimporter.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/javainnerclasses.js
 create mode 100644 nashorn/test/script/basic/javainnerclasses.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/javasigcall.js
 create mode 100644 nashorn/test/script/basic/javasigcall.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/jquery.js
 create mode 100644 nashorn/test/script/basic/jquery.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/jsadapter.js
 create mode 100644 nashorn/test/script/basic/jsadapter.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/jsadapterlink.js
 create mode 100644 nashorn/test/script/basic/jsadapterlink.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/json.js
 create mode 100644 nashorn/test/script/basic/json.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/list.js
 create mode 100644 nashorn/test/script/basic/list.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/literal.js
 create mode 100644 nashorn/test/script/basic/literal.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/load.js
 create mode 100644 nashorn/test/script/basic/load.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/loadedfile.js
 create mode 100644 nashorn/test/script/basic/localundef.js
 create mode 100644 nashorn/test/script/basic/localundef.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/map.js
 create mode 100644 nashorn/test/script/basic/map.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/math.js
 create mode 100644 nashorn/test/script/basic/math.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/minuszero.js
 create mode 100644 nashorn/test/script/basic/minuszero.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/module.js
 create mode 100644 nashorn/test/script/basic/moduleload.js
 create mode 100644 nashorn/test/script/basic/moduleload.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/nashorn2.js
 create mode 100644 nashorn/test/script/basic/nashorn2.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/natives.js
 create mode 100644 nashorn/test/script/basic/natives.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/new.js
 create mode 100644 nashorn/test/script/basic/new.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/newexpr.js
 create mode 100644 nashorn/test/script/basic/newexpr.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/newnew.js
 create mode 100644 nashorn/test/script/basic/newnew.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/nonconstructors.js
 create mode 100644 nashorn/test/script/basic/nonconstructors.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/nosuchmethod.js
 create mode 100644 nashorn/test/script/basic/nosuchmethod.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/nosuchproperty.js
 create mode 100644 nashorn/test/script/basic/nosuchproperty.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/number.js
 create mode 100644 nashorn/test/script/basic/number.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/numberstring.js
 create mode 100644 nashorn/test/script/basic/numberstring.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/objectprops.js
 create mode 100644 nashorn/test/script/basic/objectprops.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/objects.js
 create mode 100644 nashorn/test/script/basic/objects.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/options.js
 create mode 100644 nashorn/test/script/basic/options.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/propchange.js
 create mode 100644 nashorn/test/script/basic/propchange.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/propertycheck.js
 create mode 100644 nashorn/test/script/basic/propertycheck.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/proto.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/prototype.js
 create mode 100644 nashorn/test/script/basic/prototype.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/pushpull.js
 create mode 100644 nashorn/test/script/basic/pushpull.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/regex.js
 create mode 100644 nashorn/test/script/basic/regex.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/regexp_flags.js
 create mode 100644 nashorn/test/script/basic/run-octane.js
 create mode 100644 nashorn/test/script/basic/runsunspider.js
 create mode 100644 nashorn/test/script/basic/runsunspider.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/samfunc.js
 create mode 100644 nashorn/test/script/basic/samfunc.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/scripting.js
 create mode 100644 nashorn/test/script/basic/scripting.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/sealfreeze.js
 create mode 100644 nashorn/test/script/basic/sealfreeze.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/setlength.js
 create mode 100644 nashorn/test/script/basic/setlength.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/stdin.js
 create mode 100644 nashorn/test/script/basic/stdin.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/strings.js
 create mode 100644 nashorn/test/script/basic/strings.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/throws.js
 create mode 100644 nashorn/test/script/basic/throws.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/tosource.js
 create mode 100644 nashorn/test/script/basic/tosource.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/tostring.js
 create mode 100644 nashorn/test/script/basic/tostring.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/try.js
 create mode 100644 nashorn/test/script/basic/try.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/trybreakcont.js
 create mode 100644 nashorn/test/script/basic/trybreakcont.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/trycatch.js
 create mode 100644 nashorn/test/script/basic/trycatch.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/trycatchfor.js
 create mode 100644 nashorn/test/script/basic/trycatchfor.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/tryfinallyreturn.js
 create mode 100644 nashorn/test/script/basic/tryfinallyreturn.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/tryforbreak.js
 create mode 100644 nashorn/test/script/basic/tryforbreak.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/typechange.js
 create mode 100644 nashorn/test/script/basic/typechange.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/typeof.js
 create mode 100644 nashorn/test/script/basic/typeof.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/typeof2.js
 create mode 100644 nashorn/test/script/basic/typeof2.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/undefined.js
 create mode 100644 nashorn/test/script/basic/undefined.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/underscore.js
 create mode 100644 nashorn/test/script/basic/underscore.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/varargs.js
 create mode 100644 nashorn/test/script/basic/varargs.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/void.js
 create mode 100644 nashorn/test/script/basic/void.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/with.js
 create mode 100644 nashorn/test/script/basic/with.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/withprimitive.js
 create mode 100644 nashorn/test/script/basic/withprimitive.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/writable_relink.js
 create mode 100644 nashorn/test/script/basic/writable_relink.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/xmlStrings.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/xorassign.js
 create mode 100644 nashorn/test/script/basic/xorassign.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/yui.js
 create mode 100644 nashorn/test/script/basic/yui.js.EXPECTED
 create mode 100644 nashorn/test/script/error/NASHORN-154/README
 create mode 100644 nashorn/test/script/error/NASHORN-154/function_mult_params_in_strict.js
 create mode 100644 nashorn/test/script/error/NASHORN-154/function_mult_params_in_strict.js.EXPECTED
 create mode 100644 nashorn/test/script/error/NASHORN-154/improper_return_break_continue.js
 create mode 100644 nashorn/test/script/error/NASHORN-154/improper_return_break_continue.js.EXPECTED
 create mode 100644 nashorn/test/script/error/NASHORN-154/invalid_lvalue.js
 create mode 100644 nashorn/test/script/error/NASHORN-154/invalid_lvalue.js.EXPECTED
 create mode 100644 nashorn/test/script/error/NASHORN-154/literal_data_and_accessor.js
 create mode 100644 nashorn/test/script/error/NASHORN-154/literal_data_and_accessor.js.EXPECTED
 create mode 100644 nashorn/test/script/error/NASHORN-154/literal_mult_getters.js
 create mode 100644 nashorn/test/script/error/NASHORN-154/literal_mult_getters.js.EXPECTED
 create mode 100644 nashorn/test/script/error/NASHORN-154/literal_mult_prop_in_strict.js
 create mode 100644 nashorn/test/script/error/NASHORN-154/literal_mult_prop_in_strict.js.EXPECTED
 create mode 100644 nashorn/test/script/error/NASHORN-154/with_in_strict.js
 create mode 100644 nashorn/test/script/error/NASHORN-154/with_in_strict.js.EXPECTED
 create mode 100644 nashorn/test/script/error/NASHORN-214.js
 create mode 100644 nashorn/test/script/error/NASHORN-214.js.EXPECTED
 create mode 100644 nashorn/test/script/error/NASHORN-35.js
 create mode 100644 nashorn/test/script/error/NASHORN-35.js.EXPECTED
 create mode 100644 nashorn/test/script/error/NASHORN-39.js
 create mode 100644 nashorn/test/script/error/NASHORN-39.js.EXPECTED
 create mode 100644 nashorn/test/script/error/NASHORN-568.js
 create mode 100644 nashorn/test/script/error/NASHORN-568.js.EXPECTED
 create mode 100644 nashorn/test/script/error/NASHORN-57.js
 create mode 100644 nashorn/test/script/error/NASHORN-57.js.EXPECTED
 create mode 100644 nashorn/test/script/error/NASHORN-668.js
 create mode 100644 nashorn/test/script/error/NASHORN-668.js.EXPECTED
 create mode 100644 nashorn/test/script/error/quotemissing.js
 create mode 100644 nashorn/test/script/error/quotemissing.js.EXPECTED
 create mode 100644 nashorn/test/script/error/strictmode.js
 create mode 100644 nashorn/test/script/error/strictmode.js.EXPECTED
 create mode 100644 nashorn/test/script/representations/NASHORN-592a.js
 create mode 100644 nashorn/test/script/sandbox/NASHORN-525.js
 create mode 100644 nashorn/test/script/sandbox/README
 create mode 100644 nashorn/test/script/sandbox/classloader.js
 create mode 100644 nashorn/test/script/sandbox/classloader.js.EXPECTED
 create mode 100644 nashorn/test/script/sandbox/doprivileged.js
 create mode 100644 nashorn/test/script/sandbox/doprivileged.js.EXPECTED
 create mode 100644 nashorn/test/script/sandbox/exit.js
 create mode 100644 nashorn/test/script/sandbox/exit.js.EXPECTED
 create mode 100644 nashorn/test/script/sandbox/file.js
 create mode 100644 nashorn/test/script/sandbox/file.js.EXPECTED
 create mode 100644 nashorn/test/script/sandbox/javaextend.js
 create mode 100644 nashorn/test/script/sandbox/javaextend.js.EXPECTED
 create mode 100644 nashorn/test/script/sandbox/loadLibrary.js
 create mode 100644 nashorn/test/script/sandbox/net.js
 create mode 100644 nashorn/test/script/sandbox/net.js.EXPECTED
 create mode 100644 nashorn/test/script/sandbox/property.js
 create mode 100644 nashorn/test/script/sandbox/property.js.EXPECTED
 create mode 100644 nashorn/test/script/sandbox/reflection.js
 create mode 100644 nashorn/test/script/sandbox/reflection.js.EXPECTED
 create mode 100644 nashorn/test/script/sandbox/runnable.js
 create mode 100644 nashorn/test/script/sandbox/runnable.js.EXPECTED
 create mode 100644 nashorn/test/script/sandbox/unsafe.js
 create mode 100644 nashorn/test/script/sandbox/unsafe.js.EXPECTED
 create mode 100644 nashorn/test/script/test262.js
 create mode 100644 nashorn/test/script/test262_single.js
 create mode 100644 nashorn/test/src/UnnamedPackageTestCallback.java
 create mode 100644 nashorn/test/src/jdk/nashorn/api/scripting/MultipleEngineTest.java
 create mode 100644 nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
 create mode 100644 nashorn/test/src/jdk/nashorn/api/scripting/Window.java
 create mode 100644 nashorn/test/src/jdk/nashorn/api/scripting/WindowEventHandler.java
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/access/BooleanAccessTest.java
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/access/MethodAccessTest.java
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/access/NumberAccessTest.java
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/access/NumberBoxingTest.java
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/access/ObjectAccessTest.java
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/access/Person.java
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/access/SharedObject.java
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/access/StringAccessTest.java
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/codegen/CompilerTest.java
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/parser/ParserTest.java
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/performance/AuroraWrapper.java
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/performance/OctaneTest.java
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/performance/PerformanceWrapper.java
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/performance/SplayTest.java
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/runtime/ContextTest.java
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/runtime/JSTypeTest.java
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/runtime/Nashorn401TestSubject.java
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/test/framework/AbstractScriptRunnable.java
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/test/framework/JSJUnitReportReporter.java
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/test/framework/OrphanTestFinder.java
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/test/framework/ParallelTestRunner.java
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/test/framework/ScriptEvaluator.java
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/test/framework/ScriptRunnable.java
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/test/framework/ScriptTest.java
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/test/framework/SeparateContextEvaluator.java
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/test/framework/SharedContextEvaluator.java
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/test/framework/TestConfig.java
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/test/framework/TestFinder.java
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/test/framework/TestHelper.java
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/test/framework/TestReorderInterceptor.java
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/test/models/ConstructorWithArgument.java
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/test/models/FinalClass.java
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/test/models/NoAccessibleConstructorClass.java
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/test/models/NonPublicClass.java
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/test/models/OuterClass.java
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/test/models/OverloadedSam.java
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/test/models/OverrideObject.java

diff --git a/nashorn/.hgignore b/nashorn/.hgignore
index 83cef213d48..fe2082c8702 100644
--- a/nashorn/.hgignore
+++ b/nashorn/.hgignore
@@ -1,4 +1,25 @@
+syntax: glob
+
 ^build/
 ^dist/
-/nbproject/private/
 ^.hgtip
+/nbproject/private/
+^webrev/
+webrev.zip
+*.class
+*.log
+*.orig
+hotspot.log
+private.properties
+genfiles.properties
+private.xml
+.DS_Store*
+TEST-*.xml
+TESTS-*.xml
+report.xml
+CC/
+jcov2/
+buildtools/nasgen/nbproject/private/
+buildtools/nasgen/dist/
+buildtools/nasgen/build/
+.idea/*
diff --git a/nashorn/ASSEMBLY_EXCEPTION b/nashorn/ASSEMBLY_EXCEPTION
new file mode 100644
index 00000000000..8b7ac1d0813
--- /dev/null
+++ b/nashorn/ASSEMBLY_EXCEPTION
@@ -0,0 +1,27 @@
+
+OPENJDK ASSEMBLY EXCEPTION
+
+The OpenJDK source code made available by Sun at openjdk.java.net and
+openjdk.dev.java.net ("OpenJDK Code") is distributed under the terms of the
+GNU General Public License <http://www.gnu.org/copyleft/gpl.html> version 2
+only ("GPL2"), with the following clarification and special exception.
+
+    Linking this OpenJDK Code statically or dynamically with other code
+    is making a combined work based on this library.  Thus, the terms
+    and conditions of GPL2 cover the whole combination.
+
+    As a special exception, Sun gives you permission to link this
+    OpenJDK Code with certain code licensed by Sun as indicated at
+    http://openjdk.java.net/legal/exception-modules-2007-05-08.html
+    ("Designated Exception Modules") to produce an executable,
+    regardless of the license terms of the Designated Exception Modules,
+    and to copy and distribute the resulting executable under GPL2,
+    provided that the Designated Exception Modules continue to be
+    governed by the licenses under which they were offered by Sun.
+
+As such, it allows licensees and sublicensees of Sun's GPL2 OpenJDK Code to
+build an executable that includes those portions of necessary code that Sun
+could not provide under GPL2 (or that Sun has provided under GPL2 with the
+Classpath exception).  If you modify or add to the OpenJDK code, that new
+GPL2 code may still be combined with Designated Exception Modules if the
+new code is made subject to this exception by its copyright holder.
diff --git a/nashorn/LICENSE b/nashorn/LICENSE
new file mode 100644
index 00000000000..b40a0f457d7
--- /dev/null
+++ b/nashorn/LICENSE
@@ -0,0 +1,347 @@
+The GNU General Public License (GPL)
+
+Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Everyone is permitted to copy and distribute verbatim copies of this license
+document, but changing it is not allowed.
+
+Preamble
+
+The licenses for most software are designed to take away your freedom to share
+and change it.  By contrast, the GNU General Public License is intended to
+guarantee your freedom to share and change free software--to make sure the
+software is free for all its users.  This General Public License applies to
+most of the Free Software Foundation's software and to any other program whose
+authors commit to using it.  (Some other Free Software Foundation software is
+covered by the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+When we speak of free software, we are referring to freedom, not price.  Our
+General Public Licenses are designed to make sure that you have the freedom to
+distribute copies of free software (and charge for this service if you wish),
+that you receive source code or can get it if you want it, that you can change
+the software or use pieces of it in new free programs; and that you know you
+can do these things.
+
+To protect your rights, we need to make restrictions that forbid anyone to deny
+you these rights or to ask you to surrender the rights.  These restrictions
+translate to certain responsibilities for you if you distribute copies of the
+software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis or for
+a fee, you must give the recipients all the rights that you have.  You must
+make sure that they, too, receive or can get the source code.  And you must
+show them these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the software, and (2)
+offer you this license which gives you legal permission to copy, distribute
+and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain that
+everyone understands that there is no warranty for this free software.  If the
+software is modified by someone else and passed on, we want its recipients to
+know that what they have is not the original, so that any problems introduced
+by others will not reflect on the original authors' reputations.
+
+Finally, any free program is threatened constantly by software patents.  We
+wish to avoid the danger that redistributors of a free program will
+individually obtain patent licenses, in effect making the program proprietary.
+To prevent this, we have made it clear that any patent must be licensed for
+everyone's free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and modification
+follow.
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License applies to any program or other work which contains a notice
+placed by the copyright holder saying it may be distributed under the terms of
+this General Public License.  The "Program", below, refers to any such program
+or work, and a "work based on the Program" means either the Program or any
+derivative work under copyright law: that is to say, a work containing the
+Program or a portion of it, either verbatim or with modifications and/or
+translated into another language.  (Hereinafter, translation is included
+without limitation in the term "modification".) Each licensee is addressed as
+"you".
+
+Activities other than copying, distribution and modification are not covered by
+this License; they are outside its scope.  The act of running the Program is
+not restricted, and the output from the Program is covered only if its contents
+constitute a work based on the Program (independent of having been made by
+running the Program).  Whether that is true depends on what the Program does.
+
+1. You may copy and distribute verbatim copies of the Program's source code as
+you receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice and
+disclaimer of warranty; keep intact all the notices that refer to this License
+and to the absence of any warranty; and give any other recipients of the
+Program a copy of this License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and you may
+at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of it, thus
+forming a work based on the Program, and copy and distribute such modifications
+or work under the terms of Section 1 above, provided that you also meet all of
+these conditions:
+
+    a) You must cause the modified files to carry prominent notices stating
+    that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in whole or
+    in part contains or is derived from the Program or any part thereof, to be
+    licensed as a whole at no charge to all third parties under the terms of
+    this License.
+
+    c) If the modified program normally reads commands interactively when run,
+    you must cause it, when started running for such interactive use in the
+    most ordinary way, to print or display an announcement including an
+    appropriate copyright notice and a notice that there is no warranty (or
+    else, saying that you provide a warranty) and that users may redistribute
+    the program under these conditions, and telling the user how to view a copy
+    of this License.  (Exception: if the Program itself is interactive but does
+    not normally print such an announcement, your work based on the Program is
+    not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If identifiable
+sections of that work are not derived from the Program, and can be reasonably
+considered independent and separate works in themselves, then this License, and
+its terms, do not apply to those sections when you distribute them as separate
+works.  But when you distribute the same sections as part of a whole which is a
+work based on the Program, the distribution of the whole must be on the terms
+of this License, whose permissions for other licensees extend to the entire
+whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your
+rights to work written entirely by you; rather, the intent is to exercise the
+right to control the distribution of derivative or collective works based on
+the Program.
+
+In addition, mere aggregation of another work not based on the Program with the
+Program (or with a work based on the Program) on a volume of a storage or
+distribution medium does not bring the other work under the scope of this
+License.
+
+3. You may copy and distribute the Program (or a work based on it, under
+Section 2) in object code or executable form under the terms of Sections 1 and
+2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable source
+    code, which must be distributed under the terms of Sections 1 and 2 above
+    on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three years, to
+    give any third party, for a charge no more than your cost of physically
+    performing source distribution, a complete machine-readable copy of the
+    corresponding source code, to be distributed under the terms of Sections 1
+    and 2 above on a medium customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer to
+    distribute corresponding source code.  (This alternative is allowed only
+    for noncommercial distribution and only if you received the program in
+    object code or executable form with such an offer, in accord with
+    Subsection b above.)
+
+The source code for a work means the preferred form of the work for making
+modifications to it.  For an executable work, complete source code means all
+the source code for all modules it contains, plus any associated interface
+definition files, plus the scripts used to control compilation and installation
+of the executable.  However, as a special exception, the source code
+distributed need not include anything that is normally distributed (in either
+source or binary form) with the major components (compiler, kernel, and so on)
+of the operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the source
+code from the same place counts as distribution of the source code, even though
+third parties are not compelled to copy the source along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program except as
+expressly provided under this License.  Any attempt otherwise to copy, modify,
+sublicense or distribute the Program is void, and will automatically terminate
+your rights under this License.  However, parties who have received copies, or
+rights, from you under this License will not have their licenses terminated so
+long as such parties remain in full compliance.
+
+5. You are not required to accept this License, since you have not signed it.
+However, nothing else grants you permission to modify or distribute the Program
+or its derivative works.  These actions are prohibited by law if you do not
+accept this License.  Therefore, by modifying or distributing the Program (or
+any work based on the Program), you indicate your acceptance of this License to
+do so, and all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the Program),
+the recipient automatically receives a license from the original licensor to
+copy, distribute or modify the Program subject to these terms and conditions.
+You may not impose any further restrictions on the recipients' exercise of the
+rights granted herein.  You are not responsible for enforcing compliance by
+third parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues), conditions
+are imposed on you (whether by court order, agreement or otherwise) that
+contradict the conditions of this License, they do not excuse you from the
+conditions of this License.  If you cannot distribute so as to satisfy
+simultaneously your obligations under this License and any other pertinent
+obligations, then as a consequence you may not distribute the Program at all.
+For example, if a patent license would not permit royalty-free redistribution
+of the Program by all those who receive copies directly or indirectly through
+you, then the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply and
+the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or
+other property right claims or to contest validity of any such claims; this
+section has the sole purpose of protecting the integrity of the free software
+distribution system, which is implemented by public license practices.  Many
+people have made generous contributions to the wide range of software
+distributed through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing to
+distribute software through any other system and a licensee cannot impose that
+choice.
+
+This section is intended to make thoroughly clear what is believed to be a
+consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in certain
+countries either by patents or by copyrighted interfaces, the original
+copyright holder who places the Program under this License may add an explicit
+geographical distribution limitation excluding those countries, so that
+distribution is permitted only in or among countries not thus excluded.  In
+such case, this License incorporates the limitation as if written in the body
+of this License.
+
+9. The Free Software Foundation may publish revised and/or new versions of the
+General Public License from time to time.  Such new versions will be similar in
+spirit to the present version, but may differ in detail to address new problems
+or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any later
+version", you have the option of following the terms and conditions either of
+that version or of any later version published by the Free Software Foundation.
+If the Program does not specify a version number of this License, you may
+choose any version ever published by the Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free programs
+whose distribution conditions are different, write to the author to ask for
+permission.  For software which is copyrighted by the Free Software Foundation,
+write to the Free Software Foundation; we sometimes make exceptions for this.
+Our decision will be guided by the two goals of preserving the free status of
+all derivatives of our free software and of promoting the sharing and reuse of
+software generally.
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR
+THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE
+STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE
+PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE,
+YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
+ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE
+PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR
+INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA
+BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER
+OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest possible
+use to the public, the best way to achieve this is to make it free software
+which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program.  It is safest to attach
+them to the start of each source file to most effectively convey the exclusion
+of warranty; and each file should have at least the "copyright" line and a
+pointer to where the full notice is found.
+
+    One line to give the program's name and a brief idea of what it does.
+
+    Copyright (C) <year> <name of author>
+
+    This program is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the Free
+    Software Foundation; either version 2 of the License, or (at your option)
+    any later version.
+
+    This program is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+    more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc., 59
+    Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this when it
+starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author Gnomovision comes
+    with ABSOLUTELY NO WARRANTY; for details type 'show w'.  This is free
+    software, and you are welcome to redistribute it under certain conditions;
+    type 'show c' for details.
+
+The hypothetical commands 'show w' and 'show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may be
+called something other than 'show w' and 'show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.  Here
+is a sample; alter the names:
+
+    Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+    'Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+    signature of Ty Coon, 1 April 1989
+
+    Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General Public
+License instead of this License.
+
+
+"CLASSPATH" EXCEPTION TO THE GPL
+
+Certain source files distributed by Oracle America and/or its affiliates are
+subject to the following clarification and special exception to the GPL, but
+only where Oracle has expressly included in the particular source file's header
+the words "Oracle designates this particular file as subject to the "Classpath"
+exception as provided by Oracle in the LICENSE file that accompanied this code."
+
+    Linking this library statically or dynamically with other modules is making
+    a combined work based on this library.  Thus, the terms and conditions of
+    the GNU General Public License cover the whole combination.
+
+    As a special exception, the copyright holders of this library give you
+    permission to link this library with independent modules to produce an
+    executable, regardless of the license terms of these independent modules,
+    and to copy and distribute the resulting executable under terms of your
+    choice, provided that you also meet, for each linked independent module,
+    the terms and conditions of the license of that module.  An independent
+    module is a module which is not derived from or based on this library.  If
+    you modify this library, you may extend this exception to your version of
+    the library, but you are not obligated to do so.  If you do not wish to do
+    so, delete this exception statement from your version.
diff --git a/nashorn/README b/nashorn/README
new file mode 100644
index 00000000000..52b30919065
--- /dev/null
+++ b/nashorn/README
@@ -0,0 +1,147 @@
+- What is Nashorn?
+
+Nashorn is a runtime environment for programs written in ECMAScript 5.1
+that runs on top of JVM.
+
+- How to find out more about ECMAScript 5.1?
+
+The specification can be found at
+
+    http://www.ecma-international.org/publications/standards/Ecma-262.htm
+
+- How to checkout sources of Nashorn project?
+
+Nashorn project uses Mercurial source code control system. You can
+download Mercurial from http://mercurial.selenic.com/wiki/Download
+
+Information about the forest extension can be found at
+
+    http://mercurial.selenic.com/wiki/ForestExtension
+
+and downlaoded using
+
+    hg clone https://bitbucket.org/gxti/hgforest
+
+You can clone Nashorn Mercurial forest using this command:
+
+    hg fclone http://hg.openjdk.java.net/nashorn/jdk8 nashorn~jdk8
+    
+To update your copy of the forest (fwith the latest code:
+
+    (cd nashorn~jdk8 ; hg fpull)
+    
+Or just the nashorn subdirectory with
+
+    (cd nashorn~jdk8/nashorn ; hg pull -u)
+    
+To learn about Mercurial in detail, please visit http://hgbook.red-bean.com.
+
+- How to build?
+
+To build Nashorn, you need to install JDK 8. You may use the Nashorn
+forest build (recommended) or down load from java.net.  You will need to
+set JAVA_HOME environmental variable to point to your JDK installation
+directory.
+
+    cd nashorn~jdk8/nashorn/make
+    ant clean; ant
+
+- How to run?
+
+Use the jjs script (see RELESE_README):
+
+    cd nashorn~jdk8/nashorn
+    sh bin/jjs <your .js file>
+
+Nashorn supports javax.script API. It is possible to drop nashorn.jar in
+class path and request for "nashorn" script engine from
+javax.script.ScriptEngineManager. 
+
+Look for samples under the directory test/src/jdk/nashorn/api/scripting/.
+
+- Documentation
+
+Comprehensive development documentation is found in the Nashorn JavaDoc. You can
+build it using:
+
+    cd nashorn~jdk8/nashorn/make
+    ant javadoc
+    
+after which you can view the generated documentation at dist/javadoc/index.html.
+
+- Running tests
+
+Nashorn tests are TestNG based. Running tests requires downloading the
+TestNG library and placing its jar file into the lib subdirectory:
+
+    # download and install TestNG
+    wget http://testng.org/testng-x.y.z.zip
+    unzip testng-x.y.z.zip
+    cp testng-x.y.z/testng-x.y.z.jar test/lib/testng.jar
+    
+After that, you can run the tests using:
+    cd make
+    ant test
+    
+You can also run the ECMA-262 test suite with Nashorn. In order to do
+that, you will need to get a copy of it and put it in
+test/script/external/test262 directory. A convenient way to do it is:
+
+   hg clone http://hg.ecmascript.org/tests/test262/ test/script/external/test262
+    
+Alternatively, you can check it out elsewhere and make
+test/script/external/test262 a symbolic link to that directory. After
+you've done this, you can run the ECMA-262 tests using:
+
+    cd nashorn~jdk8/nashorn/make
+    ant test262
+    
+These tests take time, so we have a parallelized runner for them that
+takes advantage of all processor cores on the computer:
+
+    cd nashorn~jdk8/nashorn/make
+    ant test262parallel
+    
+- How to write your own test?
+
+Nashorn uses it's own simple test framework. Any .js file dropped under
+nashorn/test directory is considered as a test. A test file can
+optionally have .js.EXPECTED (foo.js.EXPECTED for foo.js) associated
+with it. The .EXPECTED file, if exists, should contain the output
+expected from compiling and/or running the test file.
+
+The test runner crawls these directories for .js files and looks for
+JTReg-style @foo comments to identify tests.
+
+    * @test - A test is tagged with @test.
+
+    * @test/fail - Tests that are supposed to fail (compiling, see @run/fail
+      for runtime) are tagged with @test/fail.
+
+    * @test/compile-error - Test expects compilation to fail, compares
+      output.
+
+    * @test/warning - Test expects compiler warnings, compares output.
+
+    * @test/nocompare - Test expects to compile [and/or run?]
+      successfully(may be warnings), does not compare output.
+
+    * @subtest - denotes necessary file for a main test file; itself is not
+      a test.
+
+    * @run - A test that should be run is also tagged with @run (otherwise
+      the test runner only compiles the test).
+
+    * @run/fail - A test that should compile but fail with a runtime error.
+
+    * @run/ignore-std-error - script may produce output on stderr, ignore
+      this output.
+
+    * @argument - pass an argument to script.
+
+    * @option \ - pass option to engine, sample.
+
+/**
+ * @option --dump-ir-graph
+ * @test
+ */
diff --git a/nashorn/RELEASE_README b/nashorn/RELEASE_README
new file mode 100644
index 00000000000..9984be4ce32
--- /dev/null
+++ b/nashorn/RELEASE_README
@@ -0,0 +1,20 @@
+The Nashorn repo is in the process of being migrated to OpenJDK and as such is
+incomplete in several areas.
+
+- The build system is not fully integrated.  When complete, Nashorn will be
+installed in its proper location in the JRE.
+
+- Once integrated, the correct version of the JDK will be wrapped around 
+Nashorn.  In the meantime, ensure you use JDK8 b68 or later.
+
+- The jjs tool has not been implemented in binary form yet.  Use "sh bin/jjs" 
+(or bin/jjs.bat on windows) in the interm.
+
+- The Dynalink component is not fully integrated into Nashorn as yet, but will
+be when details are finalized.
+
+- And, finally Nashorn is still in development.  To stay up to date, subscribe
+to nashorn-dev@openjdk.java.net at
+
+    http://mail.openjdk.java.net/mailman/listinfo/nashorn-dev.
+
diff --git a/nashorn/THIRD_PARTY_README b/nashorn/THIRD_PARTY_README
new file mode 100644
index 00000000000..44318349aed
--- /dev/null
+++ b/nashorn/THIRD_PARTY_README
@@ -0,0 +1,69 @@
+DO NOT TRANSLATE OR LOCALIZE.
+-----------------------------
+
+%% This notice is provided with respect to  ECMAScript Language
+Specification ECMA-262 Edition 5.1 which is included with the Nashorn
+technology.
+
+--- begin of LICENSE ---
+Copyright notice
+Copyright © 2011 Ecma International
+Ecma International
+Rue du Rhone 114
+CH-1204 Geneva
+Tel: +41 22 849 6000
+Fax: +41 22 849 6001
+Web: http://www.ecma-international.org
+
+This document and possible translations of it may be copied and furnished to
+others, and derivative works that comment on or otherwise explain it or assist
+in its implementation may be prepared, copied, published, and distributed, in
+whole or in part, without restriction of any kind, provided that the above
+copyright notice and this section are included on all such copies and derivative
+works. However, this document itself may not be modified in any way, including
+by removing the copyright notice or references to Ecma International, except as
+needed for the purpose of developing any document or deliverable produced by
+Ecma International (in which case the rules applied to copyrights must be
+followed) or as required to translate it into languages other than English. The
+limited permissions granted above are perpetual and will not be revoked by Ecma
+International or its successors or assigns. This document and the information
+contained herein is provided on an "AS IS" basis and ECMA INTERNATIONAL
+DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY
+WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY OWNERSHIP
+RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR
+PURPOSE." Software License
+
+All Software contained in this document ("Software)" is protected by copyright
+and is being made available under the "BSD License", included below. This
+Software may be subject to third party rights (rights from parties other than
+Ecma International), including patent rights, and no licenses under such third
+party rights are granted under this license even if the third party concerned is
+a member of Ecma International. SEE THE ECMA CODE OF CONDUCT IN PATENT MATTERS
+AVAILABLE AT http://www.ecma-international.org/memento/codeofconduct.htm FOR
+INFORMATION REGARDING THE LICENSING OF PATENT CLAIMS THAT ARE REQUIRED TO
+IMPLEMENT ECMA INTERNATIONAL STANDARDS*. Redistribution and use in source and
+binary forms, with or without modification, are permitted provided that the
+following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+2. 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 with the distribution.
+
+3. Neither the name of the authors nor Ecma International may be used to endorse
+or promote products derived from this software without specific prior written
+permission.
+
+THIS SOFTWARE IS PROVIDED BY THE ECMA INTERNATIONAL "AS IS" AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+SHALL ECMA INTERNATIONAL BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+OF SUCH DAMAGE.
+--- end of LICENSE ---
diff --git a/nashorn/bin/checkintest.sh b/nashorn/bin/checkintest.sh
new file mode 100644
index 00000000000..a4750d5888e
--- /dev/null
+++ b/nashorn/bin/checkintest.sh
@@ -0,0 +1,266 @@
+#!/bin/bash
+#
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+# 
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+# 
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+# 
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+#best pass rate at test 262 known
+TEST262_PASS_AT_LEAST=435
+
+RUN_TEST="true"
+RUN_TEST262="true"
+RUN_NODE="true"
+KEEP_OUTPUT="true"
+CLEAN_AND_BUILD_NASHORN="true"
+
+#the stable node version to sync against
+NODE_LAST_STABLE=v0.6.18
+
+#parse args
+for arg in $*
+do
+    if [ $arg = "--no-test" ]; then
+	RUN_TEST="false"
+	echo "**** WARNING - you have disabled 'ant test', which is a minimum checkin requirement..."
+    elif [ $arg = "--no-262" ]; then
+	RUN_TEST262="false"
+    elif [ $arg = "--no-node" ]; then
+	RUN_NODE="false"
+    elif [ $arg = "--no-build" ]; then
+	CLEAN_AND_BUILD_NASHORN="false"
+    elif [ $arg = "--no-logs" ]; then
+	KEEP_OUTPUT="false"
+    fi
+done
+
+function lastpart() {        
+    arr=$(echo $1 | tr "/" "\n")
+    for x in $arr
+    do
+	_last=$x
+    done
+    echo $_last
+}
+
+function check_installed() {
+    which $1 >/dev/null
+    if [ $? -ne 0 ]; then
+	echo "Error $1 not installed: $?"
+	exit 2
+    fi
+}
+
+check_installed hg
+check_installed git
+check_installed mv
+check_installed git
+
+PWD=$(pwd);
+
+while [ -z $NASHORN_ROOT ]
+do
+    if [ -e $PWD/.hg ]; then
+	NASHORN_ROOT=${PWD}
+	break
+    fi
+    PWD=$(dirname ${PWD})
+done
+
+echo "Nashorn root detected at ${NASHORN_ROOT}"
+
+COMMON_ROOT=$(dirname $NASHORN_ROOT)
+echo "Common root is ${COMMON_ROOT}"
+
+echo "Running checkintest..."
+
+ABSOLUTE_NASHORN_HOME=$COMMON_ROOT/$(lastpart $NASHORN_ROOT)
+
+if [ $CLEAN_AND_BUILD_NASHORN != "false" ]; then
+    echo "Cleaning and building nashorn at $ABSOLUTE_NASHORN_HOME/nashorn..."
+    $(cd $ABSOLUTE_NASHORN_HOME/nashorn; ant clean >/dev/null 2>/dev/null)
+    $(cd $ABSOLUTE_NASHORN_HOME/nashorn; ant jar >/dev/null 2>/dev/null)
+    echo "Done."
+fi
+
+function failure_check() {
+    while read line
+    do
+	LINE=$(echo $line | grep "Tests run")    
+	if [ "${LINE}" != "" ]; then
+	    RESULT=$(echo $line | grep "Failures: 0" | grep "Errors: 0")
+	    if [ "${RESULT}" == "" ]; then
+		TESTNAME=$2
+		echo "There were errors in ${TESTNAME} : ${LINE}"
+		exit 1
+	    fi
+	fi
+    done < $1
+}
+
+function test() {
+    TEST_OUTPUT=$ABSOLUTE_NASHORN_HOME/$(mktemp tmp.XXXXX)
+    echo "Running 'ant test' on nashorn from ${ABSOLUTE_NASHORN_HOME}/nashorn..."
+    $(cd $ABSOLUTE_NASHORN_HOME/nashorn; ant test >$TEST_OUTPUT)
+    echo "Done."
+
+    failure_check $TEST_OUTPUT
+
+    echo "**** SUCCESS: 'ant test' successful"
+
+    if [ $KEEP_OUTPUT == "true" ]; then
+	cp $TEST_OUTPUT ./checkintest.test.log
+	rm -fr $TEST_OUTPUT
+    fi
+}
+
+if [ $RUN_TEST != "false" ]; then
+    test;
+fi
+
+function test262() {
+
+    echo "Running 'ant test262parallel' on nashorn from ${ABSOLUTE_NASHORN_HOME}/nashorn..."
+    TEST262_OUTPUT=$ABSOLUTE_NASHORN_HOME/$(mktemp tmp.XXXXX)
+
+    echo "Looking for ${ABSOLUTE_NASHORN_HOME}/test/test262..."
+
+    if [ ! -e $ABSOLUTE_NASHORN_HOME/nashorn/test/test262 ]; then
+	echo "test262 is missing... looking in $COMMON_ROOT..."
+	if [ ! -e $COMMON_ROOT/test262 ]; then
+	    echo "... not there either... cloning from repo..."
+	    hg clone http://hg.ecmascript.org/tests/test262 $COMMON_ROOT/test262 >/dev/null 2>/dev/null
+	    echo "Done."
+	fi
+	echo "Adding soft link ${COMMON_ROOT}/test262 -> ${ABSOLUTE_NASHORN_HOME}/test/test262..."
+	ln -s $COMMON_ROOT/test262 $ABSOLUTE_NASHORN_HOME/nashorn/test/test262
+	echo "Done."
+    fi
+
+    echo "Ensuring test262 is up to date..."
+    $(cd $ABSOLUTE_NASHORN_HOME/nashorn/test/test262; hg pull -u >/dev/null 2>/dev/null)
+    echo "Done."
+
+    echo "Running test262..."
+    $(cd $ABSOLUTE_NASHORN_HOME/nashorn; ant test262parallel > $TEST262_OUTPUT)
+    
+    FAILED=$(cat $TEST262_OUTPUT|grep "Tests run:"| cut -d ' ' -f 15 |tr -cd '"[[:digit:]]')
+    if [ $FAILED -gt $TEST262_PASS_AT_LEAST ]; then 
+	echo "FAILURE: There are ${FAILED} failures in test262 and can be no more than ${TEST262_PASS_AT_LEAST}"
+	cp $TEST262_OUTPUT ./checkintest.test262.log
+	echo "See ./checkintest.test262.log"
+	echo "Terminating due to error"
+	exit 1
+    elif [ $FAILED -lt $TEST262_PASS_AT_LEAST ]; then
+	echo "There seem to have been fixes to 262. ${FAILED} < ${TEST262_PASS_AT_LEAST}. Please update limit in bin/checkintest.sh"
+    fi
+    
+    echo "**** SUCCESS: Test262 passed with no more than ${TEST262_PASS_AT_LEAST} failures."
+
+    if [ $KEEP_OUTPUT == "true" ]; then
+	cp $TEST262_OUTPUT ./checkintest.test262.log
+	rm -fr $TEST262_OUTPUT
+    fi    
+}
+
+if [ $RUN_TEST262 != "false" ]; then
+    test262;    
+fi;
+
+function testnode() {
+    TESTNODEJAR_OUTPUT=$ABSOLUTE_NASHORN_HOME/$(mktemp tmp.XXXXX)
+   
+    echo "Running node tests..."
+#replace node jar properties nashorn with this nashorn
+    
+    NODEJAR_PROPERTIES=~/nodejar.properties
+    
+    NODE_HOME=$(cat $NODEJAR_PROPERTIES | grep ^node.home | cut -f2 -d=)    
+    NASHORN_HOME=$(cat $NODEJAR_PROPERTIES | grep ^nashorn.home | cut -f2 -d=)
+    
+    ABSOLUTE_NODE_HOME=$COMMON_ROOT/$(lastpart $NODE_HOME)    
+    
+    echo "Writing nodejar.properties..."
+
+    cat > $NODEJAR_PROPERTIES << EOF
+node.home=../node
+nashorn.home=../$(lastpart $NASHORN_ROOT)
+EOF
+    echo "Done."
+    echo "Checking node home ${ABSOLUTE_NODE_HOME}..."
+
+    if [ ! -e $ABSOLUTE_NODE_HOME ]; then
+	echo "Node base dir not found. Cloning node..."    
+	$(cd $COMMON_ROOT; git clone https://github.com/joyent/node.git $(lastpart $NODE_HOME) >/dev/null 2>/dev/null)
+	echo "Done."
+	echo "Updating to last stable version ${NODE_LAST_STABLE}..."
+	$(cd $ABSOLUTE_NODE_HOME; git checkout $NODE_LAST_STABLE >/dev/null 2>/dev/null)
+	echo "Done."
+	echo "Running configure..."
+	$(cd $ABSOLUTE_NODE_HOME; ./configure >/dev/null 2>/dev/null)
+	echo "Done."
+    fi
+    
+    echo "Ensuring node is built..."
+#make sure node is built
+    $(cd $ABSOLUTE_NODE_HOME; make >/dev/null 2>/dev/null)
+    echo "Done."
+
+    NODEJAR_HOME=$COMMON_ROOT/nodejar
+
+    if [ ! -e $NODEJAR_HOME ]; then
+	echo "No node jar home found. cloning from depot..."
+	$(cd $COMMON_ROOT; hg clone https://hg.kenai.com/hg/nodejs~source nodejar >/dev/null 2>/dev/null) 
+	$(cd $COMMON_ROOT/nodejar; ant >/dev/null)
+	echo "Done."
+	echo "Copying node files..."
+	$(cd $COMMON_ROOT/nodejar; ant copy-node-files >/dev/null 2>/dev/null)
+	echo "Patching node files..."
+	$(cd $COMMON_ROOT/nodejar; ant patch-node-files >/dev/null 2>/dev/null)
+	echo "Done."
+    fi
+    
+    echo "Ensuring node.jar is up to date from source depot..."
+    $(cd $COMMON_ROOT/nodejar; hg pull -u >/dev/null 2>/dev/null)
+    echo "Done."
+
+    echo "Installing nashorn..."
+    $(cd $COMMON_ROOT/nodejar; ant >/dev/null)
+    echo "Done."
+
+    echo "Running node.jar test..."
+    $(cd $COMMON_ROOT/nodejar; mvn clean verify >$TESTNODEJAR_OUTPUT)
+    echo "Done."
+
+    failure_check $TESTNODEJAR_OUTPUT
+    
+    echo "**** SUCCESS: Node test successful."
+
+    if [ $KEEP_OUTPUT == "true" ]; then
+	rm -fr $TESTNODEJAR_OUTPUT
+	cp $TESTNODEJAR_OUTPUT ./checkintest.nodejar.log
+    fi
+}
+
+if [ $RUN_NODE != "false" ]; then
+    testnode;
+fi;
+
+echo "Finished"
diff --git a/nashorn/bin/fixorphantests.sh b/nashorn/bin/fixorphantests.sh
new file mode 100644
index 00000000000..d7e5f74b6af
--- /dev/null
+++ b/nashorn/bin/fixorphantests.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+#
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+# 
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+# 
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+# 
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+#ensure that all tests tagged with @test are also tagged with @run
+
+for f in $(find test/script/basic/*.js); do 
+    grep @test $f >/dev/null
+    TEST=$?
+    grep @run $f >/dev/null
+    RUN=$?    
+
+    if [ $TEST -eq 0 ] && [ ! $RUN -eq 0 ]; then		
+	echo "repairing ${f}..."
+	TEMP=$(mktemp /tmp/scratch.XXXXXX)
+
+	#IFS='', -raw flag to preserve white space
+	while IFS='' read -r line; do 	    
+	    echo $line | grep @test >/dev/null
+	    TEST=$?
+	    printf "%s\n" "$line" 
+	    if [ $TEST -eq 0 ]; then
+		printf "%s\n" "$line" | sed s/@test/@run/g 
+	    fi	   
+	done < $f >$TEMP
+
+	cp $TEMP $f
+
+	rm -fr $TEMP
+    fi
+
+done
diff --git a/nashorn/bin/fixwhitespace.sh b/nashorn/bin/fixwhitespace.sh
new file mode 100644
index 00000000000..921a233df21
--- /dev/null
+++ b/nashorn/bin/fixwhitespace.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+#
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+# 
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+# 
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+# 
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+#convert tabs to spaces
+find . -name "*.java" -exec sed -i "" 's/	/    /g' {} \;
+
+#remove trailing whitespace
+find . -name "*.java" -exec sed -i "" 's/[ 	]*$//' \{} \;
+
diff --git a/nashorn/bin/jjs b/nashorn/bin/jjs
new file mode 100644
index 00000000000..ae436b27ab5
--- /dev/null
+++ b/nashorn/bin/jjs
@@ -0,0 +1,29 @@
+#!/bin/bash
+#
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+[ -z "$JAVA_HOME" ] && echo "Please set JAVA_HOME" && exit 1;
+
+$JAVA_HOME/bin/java -server -XX:-TieredCompilation -Xms2G -Xmx2G -esa -ea -Djava.ext.dirs=$JAVA_HOME/jre/lib/ext:`dirname $0`/../dist -XX:+HeapDumpOnOutOfMemoryError -Djava.lang.invoke.MethodHandle.DEBUG_NAMES=false -Dnashorn.debug=true jdk.nashorn.tools.Shell $*
diff --git a/nashorn/bin/jjs.bat b/nashorn/bin/jjs.bat
new file mode 100644
index 00000000000..a7169577bcb
--- /dev/null
+++ b/nashorn/bin/jjs.bat
@@ -0,0 +1,27 @@
+rem
+rem Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+rem DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+rem
+rem This code is free software; you can redistribute it and/or modify it
+rem under the terms of the GNU General Public License version 2 only, as
+rem published by the Free Software Foundation.  Oracle designates this
+rem particular file as subject to the "Classpath" exception as provided
+rem by Oracle in the LICENSE file that accompanied this code.
+rem
+rem This code is distributed in the hope that it will be useful, but WITHOUT
+rem ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+rem FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+rem version 2 for more details (a copy is included in the LICENSE file that
+rem accompanied this code).
+rem
+rem You should have received a copy of the GNU General Public License version
+rem 2 along with this work; if not, write to the Free Software Foundation,
+rem Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+rem
+rem Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+rem or visit www.oracle.com if you need additional information or have any
+rem questions.
+rem
+@echo off
+
+java -Xms2G -Xmx2G -XX:-TieredCompilation -server -esa -ea -Djava.ext.dirs=%~dp0\..\dist -XX:+HeapDumpOnOutOfMemoryError -Dnashorn.debug=true -Djava.lang.invoke.MethodHandle.DEBUG_NAMES=false jdk.nashorn.tools.Shell
diff --git a/nashorn/bin/jjssecure b/nashorn/bin/jjssecure
new file mode 100644
index 00000000000..887c421d95c
--- /dev/null
+++ b/nashorn/bin/jjssecure
@@ -0,0 +1,29 @@
+#!/bin/bash
+#
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+[ -z "$JAVA_HOME" ] && echo "Please set JAVA_HOME" && exit 1;
+
+$JAVA_HOME/bin/java -Xms2G -Xmx2G -XX:-TieredCompilation -server -esa -ea -Djava.ext.dirs=$JAVA_HOME/jre/lib/ext:`dirname $0`/../dist -XX:+HeapDumpOnOutOfMemoryError -Dnashorn.debug=true -Djava.lang.invoke.MethodHandle.DEBUG_NAMES=true -Dnashorn.home=`dirname $0`/.. -Djava.security.manager jdk.nashorn.tools.Shell $*
diff --git a/nashorn/bin/jjssecure.bat b/nashorn/bin/jjssecure.bat
new file mode 100644
index 00000000000..662b167ae19
--- /dev/null
+++ b/nashorn/bin/jjssecure.bat
@@ -0,0 +1,27 @@
+rem
+rem Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+rem DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+rem
+rem This code is free software; you can redistribute it and/or modify it
+rem under the terms of the GNU General Public License version 2 only, as
+rem published by the Free Software Foundation.  Oracle designates this
+rem particular file as subject to the "Classpath" exception as provided
+rem by Oracle in the LICENSE file that accompanied this code.
+rem
+rem This code is distributed in the hope that it will be useful, but WITHOUT
+rem ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+rem FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+rem version 2 for more details (a copy is included in the LICENSE file that
+rem accompanied this code).
+rem
+rem You should have received a copy of the GNU General Public License version
+rem 2 along with this work; if not, write to the Free Software Foundation,
+rem Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+rem
+rem Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+rem or visit www.oracle.com if you need additional information or have any
+rem questions.
+rem
+@echo off
+
+java -Xms2G -Xmx2G -XX:-TieredCompilation -server -esa -ea -Djava.ext.dirs=%~dp0\..\dist -XX:+HeapDumpOnOutOfMemoryError -Dnashorn.debug=true -Djava.lang.invoke.MethodHandle.DEBUG_NAMES=false -Dnashorn.home=%~dp0\.. -Djava.security.manager jdk.nashorn.tools.Shell
diff --git a/nashorn/bin/nashorn b/nashorn/bin/nashorn
new file mode 100644
index 00000000000..7720f423cdb
--- /dev/null
+++ b/nashorn/bin/nashorn
@@ -0,0 +1,29 @@
+#!/bin/bash
+#
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+[ -z "$JAVA_HOME" ] && echo "Please set JAVA_HOME" && exit 1;
+
+$JAVA_HOME/bin/jrunscript -J-Xms2G -J-Xmx2G -J-XX:-TieredCompilation -J-server -J-esa -J-ea -J-Djava.ext.dirs=$JAVA_HOME/jre/lib/ext:`dirname $0`/../dist -J-XX:+HeapDumpOnOutOfMemoryError -J-Djava.lang.invoke.MethodHandle.DEBUG_NAMES=false -J-Dnashorn.debug=true -l nashorn $*
diff --git a/nashorn/bin/nashorn.bat b/nashorn/bin/nashorn.bat
new file mode 100644
index 00000000000..86aafc44a8a
--- /dev/null
+++ b/nashorn/bin/nashorn.bat
@@ -0,0 +1,27 @@
+rem
+rem Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+rem DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+rem
+rem This code is free software; you can redistribute it and/or modify it
+rem under the terms of the GNU General Public License version 2 only, as
+rem published by the Free Software Foundation.  Oracle designates this
+rem particular file as subject to the "Classpath" exception as provided
+rem by Oracle in the LICENSE file that accompanied this code.
+rem
+rem This code is distributed in the hope that it will be useful, but WITHOUT
+rem ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+rem FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+rem version 2 for more details (a copy is included in the LICENSE file that
+rem accompanied this code).
+rem
+rem You should have received a copy of the GNU General Public License version
+rem 2 along with this work; if not, write to the Free Software Foundation,
+rem Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+rem
+rem Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+rem or visit www.oracle.com if you need additional information or have any
+rem questions.
+rem
+@echo off
+
+jrunscript -J-Xms2G -J-Xmx2G -J-XX:-TieredCompilation -J-server -J-esa -J-ea -J-Djava.ext.dirs=%~dp0\..\dist -J-XX:+HeapDumpOnOutOfMemoryError -J-Dnashorn.debug=true -J-Djava.lang.invoke.MethodHandle.DEBUG_NAMES=false -l nashorn
diff --git a/nashorn/bin/rm-non-tracked.sh b/nashorn/bin/rm-non-tracked.sh
new file mode 100644
index 00000000000..aaadcf3809c
--- /dev/null
+++ b/nashorn/bin/rm-non-tracked.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+#
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+# 
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+# 
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+# 
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+hg status|grep ^\?|awk '{print $2}'|xargs rm
diff --git a/nashorn/bin/verbose_octane.bat b/nashorn/bin/verbose_octane.bat
new file mode 100644
index 00000000000..69abbf8b47d
--- /dev/null
+++ b/nashorn/bin/verbose_octane.bat
@@ -0,0 +1,59 @@
+rem
+rem Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+rem DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+rem 
+rem This code is free software; you can redistribute it and/or modify it
+rem under the terms of the GNU General Public License version 2 only, as
+rem published by the Free Software Foundation.
+rem 
+rem This code is distributed in the hope that it will be useful, but WITHOUT
+rem ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+rem FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+rem version 2 for more details (a copy is included in the LICENSE file that
+rem accompanied this code).
+rem 
+rem You should have received a copy of the GNU General Public License version
+rem 2 along with this work; if not, write to the Free Software Foundation,
+rem Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+rem 
+rem Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+rem or visit www.oracle.com if you need additional information or have any
+rem questions.
+rem
+@echo off
+
+if "%JAVA_HOME%" neq "" (
+  call :run "%JAVA_HOME%/bin/java"
+) else (
+  call :run java
+)
+goto :EOF
+
+:run
+setlocal
+set NASHORN_JAR=dist/nashorn.jar
+set JVM_FLAGS=-Xms2G -Xmx2G -XX:-TieredCompilation -server -esa -ea -jar %NASHORN_JAR%
+set JVM_FLAGS7=-Xbootclasspath/p:%NASHORN_JAR% %JVM_FLAGS%
+set OCTANE_ARGS=--verbose --iterations 7
+
+%1 -fullversion 2>&1 | findstr /L /C:"version ""1.7"
+if %errorlevel% equ 0 (
+  set CMD=%1 %JVM_FLAGS7%
+) else (
+  %1 -fullversion
+  set CMD=%1 %JVM_FLAGS%
+)
+
+%CMD% test/script/basic/run-octane.js -- test/script/external/octane/benchmarks/box2d.js %OCTANE_ARGS%
+%CMD% test/script/basic/run-octane.js -- test/script/external/octane/benchmarks/code-load.js %OCTANE_ARGS%
+%CMD% test/script/basic/run-octane.js -- test/script/external/octane/benchmarks/crypto.js %OCTANE_ARGS%
+%CMD% test/script/basic/run-octane.js -- test/script/external/octane/benchmarks/deltablue.js %OCTANE_ARGS%
+%CMD% test/script/basic/run-octane.js -- test/script/external/octane/benchmarks/gbemu.js %OCTANE_ARGS%
+%CMD% test/script/basic/run-octane.js -- test/script/external/octane/benchmarks/navier-stokes.js %OCTANE_ARGS%
+%CMD% test/script/basic/run-octane.js -- test/script/external/octane/benchmarks/pdfjs.js %OCTANE_ARGS%
+%CMD% test/script/basic/run-octane.js -- test/script/external/octane/benchmarks/raytrace.js %OCTANE_ARGS%
+%CMD% test/script/basic/run-octane.js -- test/script/external/octane/benchmarks/regexp.js %OCTANE_ARGS%
+%CMD% test/script/basic/run-octane.js -- test/script/external/octane/benchmarks/richards.js %OCTANE_ARGS%
+%CMD% test/script/basic/run-octane.js -- test/script/external/octane/benchmarks/splay.js %OCTANE_ARGS%
+endlocal
+goto :EOF
diff --git a/nashorn/bin/verbose_octane.sh b/nashorn/bin/verbose_octane.sh
new file mode 100644
index 00000000000..6a9b7eb32e1
--- /dev/null
+++ b/nashorn/bin/verbose_octane.sh
@@ -0,0 +1,58 @@
+#!/bin/bash
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+# 
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+# 
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+# 
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+ITERS=$1
+if [ -z $ITERS ]; then 
+    ITERS=7
+fi
+NASHORN_JAR=dist/nashorn.jar
+JVM_FLAGS="-XX:+UnlockDiagnosticVMOptions -Dnashorn.unstable.relink.threshold=8 -Xms2G -Xmx2G -XX:-TieredCompilation -server -jar ${NASHORN_JAR}"
+JVM_FLAGS7="-Xbootclasspath/p:${NASHORN_JAR} ${JVM_FLAGS}"
+OCTANE_ARGS="--verbose --iterations ${ITERS}"
+
+BENCHMARKS=( "box2d.js" "code-load.js" "crypto.js" "deltablue.js" "earley-boyer.js" "gbemu.js" "navier-stokes.js" "raytrace.js" "regexp.js" "richards.js" "splay.js" )
+# TODO mandreel.js has metaspace issues
+
+if [ ! -z $JAVA7_HOME ]; then	
+    echo "running ${ITERS} iterations with java7 using JAVA_HOME=${JAVA7_HOME}..."
+    for BENCHMARK in "${BENCHMARKS[@]}"
+    do 
+	CMD="${JAVA8_HOME}/bin/java ${JVM_FLAGS} test/script/basic/run-octane.js -- test/script/external/octane/benchmarks/${BENCHMARK} ${OCTANE_ARGS}"
+	$CMD
+    done
+else
+    echo "no JAVA7_HOME set. skipping java7"
+fi
+
+if [ ! -z $JAVA8_HOME ]; then
+    echo "running ${ITERS} iterations with java8 using JAVA_HOME=${JAVA8_HOME}..."   
+    for BENCHMARK in "${BENCHMARKS[@]}"
+    do 
+	CMD="${JAVA8_HOME}/bin/java ${JVM_FLAGS} test/script/basic/run-octane.js -- test/script/external/octane/benchmarks/${BENCHMARK} ${OCTANE_ARGS}"
+	$CMD
+    done
+else 
+    echo "no JAVA8_HOME set"
+fi
+
+echo "Done"
diff --git a/nashorn/buildtools/nasgen/README b/nashorn/buildtools/nasgen/README
new file mode 100644
index 00000000000..d4509459691
--- /dev/null
+++ b/nashorn/buildtools/nasgen/README
@@ -0,0 +1,34 @@
+Nasgen is a tool for processing Java classes that implement native
+JavaScript objects. It does so by looking for the
+com.oracle.nashorn.objects.annotations.ScriptClass annotation and other
+annotations in that package.
+
+For each  class "C", nasgen instruments the original class and generates
+two additional classes: a "C$Prototype" class for the JavaScript
+prototype object, and a "C$Constructor" class for the JavaScript
+constructor function.
+
+Each class instrumented or generated by nasgen contains a private static
+"$nasgenmap$" field of type com.oracle.nashorn.runtime.PropertyMap and
+static initializer block to initialize the field to the object's
+JavaScript properties.
+
+Members annotated with @Function, @Property, @Getter, and @Setter are
+mapped to the $Constructor, $Prototype, or main class, depending on the
+value of the annotation's 'where' field. By default, @Property, @Getter,
+and @Setter belong to the main class while @Function methods without
+explicit 'where' field belong to the $Prototype class. The @Constructor
+annotation marks a method to be invoked as JavaScript constructor.
+
+Nasgen enforces all @Function/@Getter/@Setter/@Constructor annotated
+methods to be declared as static. Static final @Property fields remain
+in the main class while other @Property fields are moved to respective
+classes depending on the annotation's 'where' value. For functions
+mapped to the $Prototype or $Constructor class, nasgen also generates
+getters and setters prefixed by G$ and S$, respectively.
+
+Nasgen-generated classes are hidden from normal ClassLoaders by giving
+them a ".clazz" file name extension instead of the standard ".class"
+extension. This allows script classes to be loaded independently by each
+Nashorn context through the com.oracle.nashorn.runtime.StructureLoader
+class loader.
diff --git a/nashorn/buildtools/nasgen/build.xml b/nashorn/buildtools/nasgen/build.xml
new file mode 100644
index 00000000000..e20793b7d43
--- /dev/null
+++ b/nashorn/buildtools/nasgen/build.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ 
+ This code is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 2 only, as
+ published by the Free Software Foundation.
+ 
+ This code is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ version 2 for more details (a copy is included in the LICENSE file that
+ accompanied this code).
+ 
+ You should have received a copy of the GNU General Public License version
+ 2 along with this work; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ 
+ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ or visit www.oracle.com if you need additional information or have any
+ questions.
+-->
+<project name="nasgen" default="all" basedir=".">
+  <target name="init">
+    <loadproperties srcFile="project.properties"/>
+  </target>
+
+  <target name="prepare" depends="init">
+    <mkdir dir="${build.classes.dir}"/>
+    <mkdir dir="${dist.dir}"/>
+    <mkdir dir="${dist.dir}/lib"/>
+  </target>
+
+  <target name="clean" depends="init">
+    <delete dir="${build.dir}"/>
+    <delete dir="${dist.dir}"/>
+  </target>
+
+  <target name="compile" depends="prepare" description="Compiles the nasgen sources">
+    <javac srcdir="${src.dir}"
+           destdir="${build.classes.dir}"
+           classpath="${javac.classpath}"
+           debug="${javac.debug}"
+           includeantruntime="false">
+      <compilerarg value="-Xlint:unchecked"/>
+      <compilerarg value="-Xlint:deprecation"/>
+      <compilerarg value="-XDignore.symbol.file"/>
+    </javac>
+  </target>
+
+  <target name="jar" depends="compile" description="Creates nasgen.jar">
+    <jar jarfile="${dist.jar}" basedir="${build.classes.dir}" manifest="${meta.inf.dir}/MANIFEST.MF"/>
+  </target>
+
+  <target name="dist" depends="jar"/>
+
+  <target name="all" depends="dist" 
+    description="Builds sources and generates nasgen.jar"/>
+</project>
diff --git a/nashorn/buildtools/nasgen/nasgen.iml b/nashorn/buildtools/nasgen/nasgen.iml
new file mode 100644
index 00000000000..b67d39e96ff
--- /dev/null
+++ b/nashorn/buildtools/nasgen/nasgen.iml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ 
+ This code is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 2 only, as
+ published by the Free Software Foundation.
+ 
+ This code is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ version 2 for more details (a copy is included in the LICENSE file that
+ accompanied this code).
+ 
+ You should have received a copy of the GNU General Public License version
+ 2 along with this work; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ 
+ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ or visit www.oracle.com if you need additional information or have any
+ questions.
+-->
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build/classes" />
+    <output-test url="file://$MODULE_DIR$/build/test/classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+      <excludeFolder url="file://$MODULE_DIR$/dist" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="asm" />
+  </component>
+</module>
+
diff --git a/nashorn/buildtools/nasgen/project.properties b/nashorn/buildtools/nasgen/project.properties
new file mode 100644
index 00000000000..65047d95312
--- /dev/null
+++ b/nashorn/buildtools/nasgen/project.properties
@@ -0,0 +1,52 @@
+#
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+# 
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+# 
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+# 
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+application.title=nasgen
+
+# source and target levels
+build.compiler=modern
+javac.source=1.7
+javac.target=1.7
+
+build.classes.dir=${build.dir}/classes
+
+# This directory is removed when the project is cleaned:
+build.dir=build
+
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.jar=${dist.dir}/nasgen.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+
+nashorn.dir=../../
+
+javac.debug=true
+
+javac.classpath=\
+    ${nashorn.dir}/build/classes
+
+meta.inf.dir=${src.dir}/META-INF
+run.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+run.jvmargs=
+src.dir=src
diff --git a/nashorn/buildtools/nasgen/src/META-INF/MANIFEST.MF b/nashorn/buildtools/nasgen/src/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..b70986369a1
--- /dev/null
+++ b/nashorn/buildtools/nasgen/src/META-INF/MANIFEST.MF
@@ -0,0 +1,4 @@
+Manifest-Version: 1.0
+Class-Path: lib/ant-1.7.1.jar
+Main-Class: jdk.nashorn.internal.tools.nasgen.Main
+
diff --git a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ClassGenerator.java b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ClassGenerator.java
new file mode 100644
index 00000000000..3a78da413d2
--- /dev/null
+++ b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ClassGenerator.java
@@ -0,0 +1,334 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.tools.nasgen;
+
+import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PRIVATE;
+import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PUBLIC;
+import static jdk.internal.org.objectweb.asm.Opcodes.ACC_STATIC;
+import static jdk.internal.org.objectweb.asm.Opcodes.H_INVOKESTATIC;
+import static jdk.internal.org.objectweb.asm.Opcodes.H_INVOKEVIRTUAL;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.CLINIT;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.DEFAULT_INIT_DESC;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.GETTER_PREFIX;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.GET_CLASS_NAME;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.GET_CLASS_NAME_DESC;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.INIT;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.LOOKUP_NEWPROPERTY;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.LOOKUP_NEWPROPERTY_DESC;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.LOOKUP_TYPE;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.MAP_DESC;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.MAP_FIELD_NAME;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.MAP_NEWMAP;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.MAP_NEWMAP_DESC;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.MAP_TYPE;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.OBJECT_DESC;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTIONIMPL_MAKEFUNCTION;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTIONIMPL_MAKEFUNCTION_DESC;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTIONIMPL_MAKEFUNCTION_SPECS_DESC;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTIONIMPL_TYPE;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTION_SETARITY;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTION_SETARITY_DESC;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTION_TYPE;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.SETTER_PREFIX;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.TYPE_OBJECT;
+
+import java.io.BufferedInputStream;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.List;
+import jdk.internal.org.objectweb.asm.ClassReader;
+import jdk.internal.org.objectweb.asm.ClassVisitor;
+import jdk.internal.org.objectweb.asm.ClassWriter;
+import jdk.internal.org.objectweb.asm.FieldVisitor;
+import jdk.internal.org.objectweb.asm.Handle;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.Type;
+import jdk.nashorn.internal.tools.nasgen.MemberInfo.Kind;
+
+/**
+ * Base class for class generator classes.
+ *
+ */
+public class ClassGenerator {
+    /** ASM class writer used to output bytecode for this class */
+    protected final ClassWriter cw;
+
+    /**
+     * Constructor
+     */
+    protected ClassGenerator() {
+        this.cw = makeClassWriter();
+    }
+
+    MethodGenerator makeStaticInitializer() {
+        return makeStaticInitializer(cw);
+    }
+
+    MethodGenerator makeConstructor() {
+        return makeConstructor(cw);
+    }
+
+    MethodGenerator makeMethod(final int access, final String name, final String desc) {
+        return makeMethod(cw, access, name, desc);
+    }
+
+    void addMapField() {
+        addMapField(cw);
+    }
+
+    void addField(final String name, final String desc) {
+        addField(cw, name, desc);
+    }
+
+    void addFunctionField(final String name) {
+        addFunctionField(cw, name);
+    }
+
+    void addGetter(final String owner, final MemberInfo memInfo) {
+        addGetter(cw, owner, memInfo);
+    }
+
+    void addSetter(final String owner, final MemberInfo memInfo) {
+        addSetter(cw, owner, memInfo);
+    }
+
+    void emitGetClassName(final String name) {
+        final MethodGenerator mi = makeMethod(ACC_PUBLIC, GET_CLASS_NAME, GET_CLASS_NAME_DESC);
+        mi.loadLiteral(name);
+        mi.returnValue();
+        mi.computeMaxs();
+        mi.visitEnd();
+    }
+
+    static ClassWriter makeClassWriter() {
+        return new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS) {
+            @Override
+            protected String getCommonSuperClass(final String type1, final String type2) {
+                try {
+                    return super.getCommonSuperClass(type1, type2);
+                } catch (final RuntimeException | LinkageError e) {
+                    return StringConstants.OBJECT_TYPE;
+                }
+            }
+        };
+    }
+
+    static MethodGenerator makeStaticInitializer(final ClassVisitor cv) {
+        return makeStaticInitializer(cv, CLINIT);
+    }
+
+    static MethodGenerator makeStaticInitializer(final ClassVisitor cv, final String name) {
+        final int access = ACC_PUBLIC | ACC_STATIC;
+        final String desc = DEFAULT_INIT_DESC;
+        final MethodVisitor mv = cv.visitMethod(access, name, desc, null, null);
+        return new MethodGenerator(mv, access, name, desc);
+    }
+
+    static MethodGenerator makeConstructor(final ClassVisitor cv) {
+        final int access = ACC_PUBLIC;
+        final String name = INIT;
+        final String desc = DEFAULT_INIT_DESC;
+        final MethodVisitor mv = cv.visitMethod(access, name, desc, null, null);
+        return new MethodGenerator(mv, access, name, desc);
+    }
+
+    static MethodGenerator makeMethod(final ClassVisitor cv, final int access, final String name, final String desc) {
+        final MethodVisitor mv = cv.visitMethod(access, name, desc, null, null);
+        return new MethodGenerator(mv, access, name, desc);
+    }
+
+    static void emitStaticInitPrefix(final MethodGenerator mi, final String className) {
+        mi.visitCode();
+        mi.pushNull();
+        mi.putStatic(className, MAP_FIELD_NAME, MAP_DESC);
+        mi.loadClass(className);
+        mi.invokeStatic(MAP_TYPE, MAP_NEWMAP, MAP_NEWMAP_DESC);
+        mi.storeLocal(0);
+    }
+
+    static void emitStaticInitSuffix(final MethodGenerator mi, final String className) {
+        mi.loadLocal(0);
+        mi.putStatic(className, MAP_FIELD_NAME, MAP_DESC);
+        mi.returnVoid();
+        mi.computeMaxs();
+        mi.visitEnd();
+    }
+
+    @SuppressWarnings("fallthrough")
+    private static Type memInfoType(final MemberInfo memInfo) {
+        switch (memInfo.getJavaDesc().charAt(0)) {
+            case 'I': return Type.INT_TYPE;
+            case 'J': return Type.LONG_TYPE;
+            case 'D': return Type.DOUBLE_TYPE;
+            default:  assert false : memInfo.getJavaDesc();
+            case 'L': return TYPE_OBJECT;
+        }
+    }
+
+    private static String getterDesc(final MemberInfo memInfo) {
+        return Type.getMethodDescriptor(memInfoType(memInfo));
+    }
+
+    private static String setterDesc(final MemberInfo memInfo) {
+        return Type.getMethodDescriptor(Type.VOID_TYPE, memInfoType(memInfo));
+    }
+
+    static void addGetter(final ClassVisitor cv, final String owner, final MemberInfo memInfo) {
+        final int access = ACC_PUBLIC;
+        final String name = GETTER_PREFIX + memInfo.getJavaName();
+        final String desc = getterDesc(memInfo);
+        final MethodVisitor mv = cv.visitMethod(access, name, desc, null, null);
+        final MethodGenerator mi = new MethodGenerator(mv, access, name, desc);
+        mi.visitCode();
+        if (memInfo.isStatic() && memInfo.getKind() == Kind.PROPERTY) {
+            mi.getStatic(owner, memInfo.getJavaName(), memInfo.getJavaDesc());
+        } else {
+            mi.loadLocal(0);
+            mi.getField(owner, memInfo.getJavaName(), memInfo.getJavaDesc());
+        }
+        mi.returnValue();
+        mi.computeMaxs();
+        mi.visitEnd();
+    }
+
+    static void addSetter(final ClassVisitor cv, final String owner, final MemberInfo memInfo) {
+        final int access = ACC_PUBLIC;
+        final String name = SETTER_PREFIX + memInfo.getJavaName();
+        final String desc = setterDesc(memInfo);
+        final MethodVisitor mv = cv.visitMethod(access, name, desc, null, null);
+        final MethodGenerator mi = new MethodGenerator(mv, access, name, desc);
+        mi.visitCode();
+        if (memInfo.isStatic() && memInfo.getKind() == Kind.PROPERTY) {
+            mi.loadLocal(1);
+            mi.putStatic(owner, memInfo.getJavaName(), memInfo.getJavaDesc());
+        } else {
+            mi.loadLocal(0);
+            mi.loadLocal(1);
+            mi.putField(owner, memInfo.getJavaName(), memInfo.getJavaDesc());
+        }
+        mi.returnVoid();
+        mi.computeMaxs();
+        mi.visitEnd();
+    }
+
+    static void addMapField(final ClassVisitor cv) {
+        // add a MAP static field
+        final FieldVisitor fv = cv.visitField(ACC_PRIVATE | ACC_STATIC,
+            MAP_FIELD_NAME, MAP_DESC, null, null);
+        if (fv != null) {
+            fv.visitEnd();
+        }
+    }
+
+    static void addField(final ClassVisitor cv, final String name, final String desc) {
+        final FieldVisitor fv = cv.visitField(ACC_PRIVATE, name, desc, null, null);
+        if (fv != null) {
+            fv.visitEnd();
+        }
+    }
+
+    static void addFunctionField(final ClassVisitor cv, final String name) {
+        addField(cv, name, OBJECT_DESC);
+    }
+
+    static void newFunction(final MethodGenerator mi, final String className, final MemberInfo memInfo, final List<MemberInfo> specs) {
+        final boolean arityFound = (memInfo.getArity() != MemberInfo.DEFAULT_ARITY);
+
+        mi.loadLiteral(memInfo.getName());
+        mi.visitLdcInsn(new Handle(H_INVOKESTATIC, className, memInfo.getJavaName(), memInfo.getJavaDesc()));
+
+        assert specs != null;
+        if (!specs.isEmpty()) {
+            mi.memberInfoArray(className, specs);
+            mi.invokeStatic(SCRIPTFUNCTIONIMPL_TYPE, SCRIPTFUNCTIONIMPL_MAKEFUNCTION, SCRIPTFUNCTIONIMPL_MAKEFUNCTION_SPECS_DESC);
+        } else {
+            mi.invokeStatic(SCRIPTFUNCTIONIMPL_TYPE, SCRIPTFUNCTIONIMPL_MAKEFUNCTION, SCRIPTFUNCTIONIMPL_MAKEFUNCTION_DESC);
+        }
+
+        if (arityFound) {
+            mi.dup();
+            mi.push(memInfo.getArity());
+            mi.invokeVirtual(SCRIPTFUNCTION_TYPE, SCRIPTFUNCTION_SETARITY, SCRIPTFUNCTION_SETARITY_DESC);
+        }
+
+    }
+
+    static void linkerAddGetterSetter(final MethodGenerator mi, final String className, final MemberInfo memInfo) {
+        final String propertyName = memInfo.getName();
+        mi.loadLocal(0);
+        mi.loadLiteral(propertyName);
+        // setup flags
+        mi.push(memInfo.getAttributes());
+        // setup getter method handle
+        String javaName = GETTER_PREFIX + memInfo.getJavaName();
+        mi.visitLdcInsn(new Handle(H_INVOKEVIRTUAL, className, javaName, getterDesc(memInfo)));
+        // setup setter method handle
+        if (memInfo.isFinal()) {
+            mi.pushNull();
+        } else {
+            javaName = SETTER_PREFIX + memInfo.getJavaName();
+            mi.visitLdcInsn(new Handle(H_INVOKEVIRTUAL, className, javaName, setterDesc(memInfo)));
+        }
+        mi.invokeStatic(LOOKUP_TYPE, LOOKUP_NEWPROPERTY, LOOKUP_NEWPROPERTY_DESC);
+        mi.storeLocal(0);
+    }
+
+    static void linkerAddGetterSetter(final MethodGenerator mi, final String className, final MemberInfo getter, final MemberInfo setter) {
+        final String propertyName = getter.getName();
+        mi.loadLocal(0);
+        mi.loadLiteral(propertyName);
+        // setup flags
+        mi.push(getter.getAttributes());
+        // setup getter method handle
+        mi.visitLdcInsn(new Handle(H_INVOKESTATIC, className,
+                getter.getJavaName(), getter.getJavaDesc()));
+        // setup setter method handle
+        if (setter == null) {
+            mi.pushNull();
+        } else {
+            mi.visitLdcInsn(new Handle(H_INVOKESTATIC, className,
+                    setter.getJavaName(), setter.getJavaDesc()));
+        }
+        mi.invokeStatic(LOOKUP_TYPE, LOOKUP_NEWPROPERTY, LOOKUP_NEWPROPERTY_DESC);
+        mi.storeLocal(0);
+    }
+
+    static ScriptClassInfo getScriptClassInfo(final String fileName) throws IOException {
+        try (BufferedInputStream bis = new BufferedInputStream(new FileInputStream(fileName))) {
+            return getScriptClassInfo(new ClassReader(bis));
+        }
+    }
+
+    static ScriptClassInfo getScriptClassInfo(final byte[] classBuf) {
+        return getScriptClassInfo(new ClassReader(classBuf));
+    }
+
+    private static ScriptClassInfo getScriptClassInfo(final ClassReader reader) {
+        final ScriptClassInfoCollector scic = new ScriptClassInfoCollector();
+        reader.accept(scic, 0);
+        return scic.getScriptClassInfo();
+    }
+}
diff --git a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ConstructorGenerator.java b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ConstructorGenerator.java
new file mode 100644
index 00000000000..2491e630ee7
--- /dev/null
+++ b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ConstructorGenerator.java
@@ -0,0 +1,276 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.tools.nasgen;
+
+import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PUBLIC;
+import static jdk.internal.org.objectweb.asm.Opcodes.ACC_SUPER;
+import static jdk.internal.org.objectweb.asm.Opcodes.H_INVOKESTATIC;
+import static jdk.internal.org.objectweb.asm.Opcodes.V1_7;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.CONSTRUCTOR_SUFFIX;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.DEFAULT_INIT_DESC;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.INIT;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.MAP_DESC;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.MAP_DUPLICATE;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.MAP_DUPLICATE_DESC;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.MAP_FIELD_NAME;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.MAP_TYPE;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.OBJECT_DESC;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROTOTYPE;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROTOTYPEOBJECT_SETCONSTRUCTOR;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROTOTYPEOBJECT_SETCONSTRUCTOR_DESC;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROTOTYPEOBJECT_TYPE;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTIONIMPL_INIT_DESC3;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTIONIMPL_INIT_DESC4;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTIONIMPL_TYPE;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTION_SETARITY;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTION_SETARITY_DESC;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTFUNCTION_TYPE;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTOBJECT_INIT_DESC;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTOBJECT_TYPE;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.List;
+import jdk.internal.org.objectweb.asm.Handle;
+
+/**
+ * This class generates constructor class for a @ClassInfo annotated class.
+ *
+ */
+public class ConstructorGenerator extends ClassGenerator {
+    private final ScriptClassInfo scriptClassInfo;
+    private final String className;
+    private final MemberInfo constructor;
+    private final int memberCount;
+    private final List<MemberInfo> specs;
+
+    ConstructorGenerator(final ScriptClassInfo sci) {
+        this.scriptClassInfo = sci;
+
+        this.className = scriptClassInfo.getConstructorClassName();
+        this.constructor = scriptClassInfo.getConstructor();
+        this.memberCount = scriptClassInfo.getConstructorMemberCount();
+        this.specs = scriptClassInfo.getSpecializedConstructors();
+    }
+
+    byte[] getClassBytes() {
+        // new class extensing from ScriptObject
+        final String superClass = (constructor != null)? SCRIPTFUNCTIONIMPL_TYPE : SCRIPTOBJECT_TYPE;
+        cw.visit(V1_7, ACC_PUBLIC | ACC_SUPER, className, null, superClass, null);
+        if (memberCount > 0) {
+            // add fields
+            emitFields();
+            // add <clinit>
+            emitStaticInitializer();
+        }
+        // add <init>
+        emitConstructor();
+
+        if (constructor == null) {
+            emitGetClassName(scriptClassInfo.getName());
+        }
+
+        cw.visitEnd();
+        return cw.toByteArray();
+    }
+
+    // --Internals only below this point
+    private void emitFields() {
+        // Introduce "Function" type instance fields for each
+        // constructor @Function in script class and introduce instance
+        // fields for each constructor @Property in the script class.
+        for (MemberInfo memInfo : scriptClassInfo.getMembers()) {
+            if (memInfo.isConstructorFunction()) {
+                addFunctionField(memInfo.getJavaName());
+                memInfo = (MemberInfo)memInfo.clone();
+                memInfo.setJavaDesc(OBJECT_DESC);
+                memInfo.setJavaAccess(ACC_PUBLIC);
+                addGetter(className, memInfo);
+                addSetter(className, memInfo);
+            } else if (memInfo.isConstructorProperty()) {
+                if (memInfo.isStaticFinal()) {
+                    addGetter(scriptClassInfo.getJavaName(), memInfo);
+                } else {
+                    addField(memInfo.getJavaName(), memInfo.getJavaDesc());
+                    memInfo = (MemberInfo)memInfo.clone();
+                    memInfo.setJavaAccess(ACC_PUBLIC);
+                    addGetter(className, memInfo);
+                    addSetter(className, memInfo);
+                }
+            }
+        }
+
+        addMapField();
+    }
+
+    private void emitStaticInitializer() {
+        final MethodGenerator mi = makeStaticInitializer();
+        emitStaticInitPrefix(mi, className);
+
+        for (final MemberInfo memInfo : scriptClassInfo.getMembers()) {
+            if (memInfo.isConstructorFunction() || memInfo.isConstructorProperty()) {
+                linkerAddGetterSetter(mi, className, memInfo);
+            } else if (memInfo.isConstructorGetter()) {
+                final MemberInfo setter = scriptClassInfo.findSetter(memInfo);
+                linkerAddGetterSetter(mi, className, memInfo, setter);
+            }
+        }
+        emitStaticInitSuffix(mi, className);
+    }
+
+    private void emitConstructor() {
+        final MethodGenerator mi = makeConstructor();
+        mi.visitCode();
+        callSuper(mi);
+
+        if (memberCount > 0) {
+            // initialize Function type fields
+            initFunctionFields(mi);
+            // initialize data fields
+            initDataFields(mi);
+        }
+
+        if (constructor != null) {
+            final int arity = constructor.getArity();
+            if (arity != MemberInfo.DEFAULT_ARITY) {
+                mi.loadThis();
+                mi.push(arity);
+                mi.invokeVirtual(SCRIPTFUNCTION_TYPE, SCRIPTFUNCTION_SETARITY,
+                        SCRIPTFUNCTION_SETARITY_DESC);
+            }
+        }
+        mi.returnVoid();
+        mi.computeMaxs();
+        mi.visitEnd();
+    }
+
+    private void loadMap(final MethodGenerator mi) {
+        if (memberCount > 0) {
+            mi.getStatic(className, MAP_FIELD_NAME, MAP_DESC);
+            // make sure we use duplicated PropertyMap so that original map
+            // stays intact and so can be used for many globals in same context
+            mi.invokeVirtual(MAP_TYPE, MAP_DUPLICATE, MAP_DUPLICATE_DESC);
+        }
+    }
+
+    private void callSuper(final MethodGenerator mi) {
+        String superClass, superDesc;
+        mi.loadThis();
+        if (constructor == null) {
+            // call ScriptObject.<init>
+            superClass = SCRIPTOBJECT_TYPE;
+            superDesc = (memberCount > 0) ? SCRIPTOBJECT_INIT_DESC : DEFAULT_INIT_DESC;
+            loadMap(mi);
+        } else {
+            // call Function.<init>
+            superClass = SCRIPTFUNCTIONIMPL_TYPE;
+            superDesc = (memberCount > 0) ? SCRIPTFUNCTIONIMPL_INIT_DESC4 : SCRIPTFUNCTIONIMPL_INIT_DESC3;
+            mi.loadLiteral(constructor.getName());
+            mi.visitLdcInsn(new Handle(H_INVOKESTATIC, scriptClassInfo.getJavaName(), constructor.getJavaName(), constructor.getJavaDesc()));
+            loadMap(mi);
+            mi.memberInfoArray(scriptClassInfo.getJavaName(), specs); //pushes null if specs empty
+        }
+
+        mi.invokeSpecial(superClass, INIT, superDesc);
+    }
+
+    private void initFunctionFields(final MethodGenerator mi) {
+        for (final MemberInfo memInfo : scriptClassInfo.getMembers()) {
+            if (!memInfo.isConstructorFunction()) {
+                continue;
+            }
+            mi.loadThis();
+            newFunction(mi, scriptClassInfo.getJavaName(), memInfo, scriptClassInfo.findSpecializations(memInfo.getJavaName()));
+            mi.putField(className, memInfo.getJavaName(), OBJECT_DESC);
+        }
+    }
+
+    private void initDataFields(final MethodGenerator mi) {
+         for (final MemberInfo memInfo : scriptClassInfo.getMembers()) {
+            if (!memInfo.isConstructorProperty() || memInfo.isFinal()) {
+                continue;
+            }
+            final Object value = memInfo.getValue();
+            if (value != null) {
+                mi.loadThis();
+                mi.loadLiteral(value);
+                mi.putField(className, memInfo.getJavaName(), memInfo.getJavaDesc());
+            } else if (!memInfo.getInitClass().isEmpty()) {
+                final String clazz = memInfo.getInitClass();
+                mi.loadThis();
+                mi.newObject(clazz);
+                mi.dup();
+                mi.invokeSpecial(clazz, INIT, DEFAULT_INIT_DESC);
+                mi.putField(className, memInfo.getJavaName(), memInfo.getJavaDesc());
+            }
+        }
+
+        if (constructor != null) {
+            mi.loadThis();
+            final String protoName = scriptClassInfo.getPrototypeClassName();
+            mi.newObject(protoName);
+            mi.dup();
+            mi.invokeSpecial(protoName, INIT, DEFAULT_INIT_DESC);
+            mi.dup();
+            mi.loadThis();
+            mi.invokeStatic(PROTOTYPEOBJECT_TYPE, PROTOTYPEOBJECT_SETCONSTRUCTOR,
+                    PROTOTYPEOBJECT_SETCONSTRUCTOR_DESC);
+            mi.putField(SCRIPTFUNCTION_TYPE, PROTOTYPE, OBJECT_DESC);
+        }
+    }
+
+    /**
+     * Entry point for ConstructorGenerator run separately as an application. Will display
+     * usage. Takes one argument, a class name.
+     * @param args args vector
+     * @throws IOException if class can't be read
+     */
+    public static void main(final String[] args) throws IOException {
+        if (args.length != 1) {
+            System.err.println("Usage: " + ConstructorGenerator.class.getName() + " <class>");
+            System.exit(1);
+        }
+
+        final String className = args[0].replace('.', '/');
+        final ScriptClassInfo sci = getScriptClassInfo(className + ".class");
+        if (sci == null) {
+            System.err.println("No @ScriptClass in " + className);
+            System.exit(2);
+            throw new IOException(); // get rid of warning for sci.verify() below - may be null
+        }
+
+        try {
+            sci.verify();
+        } catch (final Exception e) {
+            System.err.println(e.getMessage());
+            System.exit(3);
+        }
+        final ConstructorGenerator gen = new ConstructorGenerator(sci);
+        try (FileOutputStream fos = new FileOutputStream(className + CONSTRUCTOR_SUFFIX + ".class")) {
+            fos.write(gen.getClassBytes());
+        }
+    }
+}
diff --git a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/Main.java b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/Main.java
new file mode 100644
index 00000000000..96e49c1df49
--- /dev/null
+++ b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/Main.java
@@ -0,0 +1,181 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.tools.nasgen;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+import jdk.internal.org.objectweb.asm.ClassReader;
+import jdk.internal.org.objectweb.asm.ClassWriter;
+import jdk.internal.org.objectweb.asm.util.CheckClassAdapter;
+
+/**
+ * Main class for the "nasgen" tool.
+ *
+ */
+public class Main {
+    private static final boolean DEBUG = Boolean.getBoolean("nasgen.debug");
+
+    private interface ErrorReporter {
+        public void error(String msg);
+    }
+
+    /**
+     * Public entry point for Nasgen if invoked from command line. Nasgen takes three arguments
+     * in order: input directory, package list, output directory
+     *
+     * @param args argument vector
+     */
+    public static void main(final String[] args) {
+        final ErrorReporter reporter = new ErrorReporter() {
+            @Override
+            public void error(final String msg) {
+                Main.error(msg, 1);
+            }
+        };
+        if (args.length == 3) {
+            processAll(args[0], args[1], args[2], reporter);
+        } else {
+            error("Usage: nasgen <input-dir> <package-list> <output-dir>", 1);
+        }
+    }
+
+    private static void processAll(final String in, final String pkgList, final String out, final ErrorReporter reporter) {
+        final File inDir = new File(in);
+        if (!inDir.exists() || !inDir.isDirectory()) {
+            reporter.error(in + " does not exist or not a directory");
+            return;
+        }
+
+        final File outDir = new File(out);
+        if (!outDir.exists() || !outDir.isDirectory()) {
+            reporter.error(out + " does not exist or not a directory");
+            return;
+        }
+
+        final String[] packages = pkgList.split(":");
+        for (String pkg : packages) {
+            pkg = pkg.replace('.', File.separatorChar);
+            final File dir = new File(inDir, pkg);
+            final File[] classes = dir.listFiles();
+            for (final File clazz : classes) {
+                if (clazz.isFile() && clazz.getName().endsWith(".class")) {
+                    if (! process(clazz, new File(outDir, pkg), reporter)) {
+                        return;
+                    }
+                }
+            }
+        }
+    }
+
+    private static boolean process(final File inFile, final File outDir, final ErrorReporter reporter) {
+        try {
+            byte[] buf = new byte[(int)inFile.length()];
+
+            try (FileInputStream fin = new FileInputStream(inFile)) {
+                fin.read(buf);
+            }
+
+            final ScriptClassInfo sci = ClassGenerator.getScriptClassInfo(buf);
+
+            if (sci != null) {
+                try {
+                    sci.verify();
+                } catch (final Exception e) {
+                    reporter.error(e.getMessage());
+                    return false;
+                }
+
+                // create necessary output package dir
+                outDir.mkdirs();
+
+                // instrument @ScriptClass
+                final ClassWriter writer = ClassGenerator.makeClassWriter();
+                final ClassReader reader = new ClassReader(buf);
+                final ScriptClassInstrumentor inst = new ScriptClassInstrumentor(writer, sci);
+                reader.accept(inst, 0);
+                //noinspection UnusedAssignment
+
+                // write instrumented class
+                try (FileOutputStream fos = new FileOutputStream(new File(outDir, inFile.getName()))) {
+                    buf = writer.toByteArray();
+                    if (DEBUG) {
+                        verify(buf);
+                    }
+                    fos.write(buf);
+                }
+
+                // simple class name without package prefix
+                String simpleName = inFile.getName();
+                simpleName = simpleName.substring(0, simpleName.indexOf(".class"));
+
+                if (sci.getPrototypeMemberCount() > 0) {
+                    // generate prototype class
+                    final PrototypeGenerator protGen = new PrototypeGenerator(sci);
+                    buf = protGen.getClassBytes();
+                    if (DEBUG) {
+                        verify(buf);
+                    }
+                    try (FileOutputStream fos = new FileOutputStream(new File(outDir, simpleName + StringConstants.PROTOTYPE_SUFFIX + ".class"))) {
+                        fos.write(buf);
+                    }
+                }
+
+                if (sci.getConstructorMemberCount() > 0 || sci.getConstructor() != null) {
+                    // generate constructor class
+                    final ConstructorGenerator consGen = new ConstructorGenerator(sci);
+                    buf = consGen.getClassBytes();
+                    if (DEBUG) {
+                        verify(buf);
+                    }
+                    try (FileOutputStream fos = new FileOutputStream(new File(outDir, simpleName + StringConstants.CONSTRUCTOR_SUFFIX + ".class"))) {
+                        fos.write(buf);
+                    }
+                }
+            }
+            return true;
+        } catch (final IOException | RuntimeException e) {
+            if (DEBUG) {
+                e.printStackTrace(System.err);
+            }
+            reporter.error(e.getMessage());
+
+            return false;
+        }
+    }
+
+    private static void verify(final byte[] buf) {
+        final ClassReader cr = new ClassReader(buf);
+        CheckClassAdapter.verify(cr, false, new PrintWriter(System.err));
+    }
+
+    private static void error(final String msg, final int exitCode) {
+        System.err.println(msg);
+        System.exit(exitCode);
+    }
+}
diff --git a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MemberInfo.java b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MemberInfo.java
new file mode 100644
index 00000000000..62e8de2a6bc
--- /dev/null
+++ b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MemberInfo.java
@@ -0,0 +1,377 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.tools.nasgen;
+
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.OBJECT_ARRAY_DESC;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.OBJECT_DESC;
+
+import jdk.internal.org.objectweb.asm.Opcodes;
+import jdk.internal.org.objectweb.asm.Type;
+import jdk.nashorn.internal.objects.annotations.Where;
+
+/**
+ * Details about a Java method or field annotated with any of the field/method
+ * annotations from the jdk.nashorn.internal.objects.annotations package.
+ */
+public final class MemberInfo implements Cloneable {
+    /**
+     * The different kinds of available class annotations
+     */
+    public static enum Kind {
+        /** This is a script class */
+        SCRIPT_CLASS,
+        /** This is a constructor */
+        CONSTRUCTOR,
+        /** This is a function */
+        FUNCTION,
+        /** This is a getter */
+        GETTER,
+        /** This is a setter */
+        SETTER,
+        /** This is a property */
+        PROPERTY,
+        /** This is a specialized version of a function */
+        SPECIALIZED_FUNCTION,
+        /** This is a specialized version of a constructor */
+        SPECIALIZED_CONSTRUCTOR
+    }
+
+    // keep in sync with jdk.nashorn.internal.objects.annotations.Attribute
+    static final int DEFAULT_ATTRIBUTES = 0x0;
+
+    static final int DEFAULT_ARITY = -2;
+
+    // the kind of the script annotation - one of the above constants
+    private MemberInfo.Kind kind;
+    // script property name
+    private String name;
+    // script property attributes
+    private int attributes;
+    // name of the java member
+    private String javaName;
+    // type descriptor of the java member
+    private String javaDesc;
+    // access bits of the Java field or method
+    private int javaAccess;
+    // initial value for static @Property fields
+    private Object value;
+    // class whose object is created to fill property value
+    private String initClass;
+    // arity of the Function or Constructor
+    private int arity;
+
+    private Where where;
+
+    /**
+     * @return the kind
+     */
+    public Kind getKind() {
+        return kind;
+    }
+
+    /**
+     * @param kind the kind to set
+     */
+    public void setKind(final Kind kind) {
+        this.kind = kind;
+    }
+
+    /**
+     * @return the name
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * @param name the name to set
+     */
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+    /**
+     * @return the attributes
+     */
+    public int getAttributes() {
+        return attributes;
+    }
+
+    /**
+     * @param attributes the attributes to set
+     */
+    public void setAttributes(final int attributes) {
+        this.attributes = attributes;
+    }
+
+    /**
+     * @return the javaName
+     */
+    public String getJavaName() {
+        return javaName;
+    }
+
+    /**
+     * @param javaName the javaName to set
+     */
+    public void setJavaName(final String javaName) {
+        this.javaName = javaName;
+    }
+
+    /**
+     * @return the javaDesc
+     */
+    public String getJavaDesc() {
+        return javaDesc;
+    }
+
+    void setJavaDesc(final String javaDesc) {
+        this.javaDesc = javaDesc;
+    }
+
+    int getJavaAccess() {
+        return javaAccess;
+    }
+
+    void setJavaAccess(final int access) {
+        this.javaAccess = access;
+    }
+
+    Object getValue() {
+        return value;
+    }
+
+    void setValue(final Object value) {
+        this.value = value;
+    }
+
+    Where getWhere() {
+        return where;
+    }
+
+    void setWhere(final Where where) {
+        this.where = where;
+    }
+
+    boolean isFinal() {
+        return (javaAccess & Opcodes.ACC_FINAL) != 0;
+    }
+
+    boolean isStatic() {
+        return (javaAccess & Opcodes.ACC_STATIC) != 0;
+    }
+
+    boolean isStaticFinal() {
+        return isStatic() && isFinal();
+    }
+
+    boolean isInstanceGetter() {
+        return kind == Kind.GETTER && where == Where.INSTANCE;
+    }
+
+    /**
+     * Check whether this MemberInfo is a getter that resides in the instance
+     * @return true if instance setter
+     */
+    boolean isInstanceSetter() {
+        return kind == Kind.SETTER && where == Where.INSTANCE;
+    }
+
+    boolean isInstanceProperty() {
+        return kind == Kind.PROPERTY && where == Where.INSTANCE;
+    }
+
+    boolean isInstanceFunction() {
+        return kind == Kind.FUNCTION && where == Where.INSTANCE;
+    }
+
+    boolean isPrototypeGetter() {
+        return kind == Kind.GETTER && where == Where.PROTOTYPE;
+    }
+
+    boolean isPrototypeSetter() {
+        return kind == Kind.SETTER && where == Where.PROTOTYPE;
+    }
+
+    boolean isPrototypeProperty() {
+        return kind == Kind.PROPERTY && where == Where.PROTOTYPE;
+    }
+
+    boolean isPrototypeFunction() {
+        return kind == Kind.FUNCTION && where == Where.PROTOTYPE;
+    }
+
+    boolean isConstructorGetter() {
+        return kind == Kind.GETTER && where == Where.CONSTRUCTOR;
+    }
+
+    boolean isConstructorSetter() {
+        return kind == Kind.SETTER && where == Where.CONSTRUCTOR;
+    }
+
+    boolean isConstructorProperty() {
+        return kind == Kind.PROPERTY && where == Where.CONSTRUCTOR;
+    }
+
+    boolean isConstructorFunction() {
+        return kind == Kind.FUNCTION && where == Where.CONSTRUCTOR;
+    }
+
+    boolean isConstructor() {
+        return kind == Kind.CONSTRUCTOR;
+    }
+
+    void verify() {
+        if (kind == Kind.CONSTRUCTOR) {
+            final Type returnType = Type.getReturnType(javaDesc);
+            if (! returnType.toString().equals(OBJECT_DESC)) {
+                error("return value should be of Object type, found" + returnType);
+            }
+            final Type[] argTypes = Type.getArgumentTypes(javaDesc);
+            if (argTypes.length < 2) {
+                error("constructor methods should have at least 2 args");
+            }
+            if (! argTypes[0].equals(Type.BOOLEAN_TYPE)) {
+                error("first argument should be of boolean type, found" + argTypes[0]);
+            }
+            if (! argTypes[1].toString().equals(OBJECT_DESC)) {
+                error("second argument should be of Object type, found" + argTypes[0]);
+            }
+
+            if (argTypes.length > 2) {
+                for (int i = 2; i < argTypes.length - 1; i++) {
+                    if (! argTypes[i].toString().equals(OBJECT_DESC)) {
+                        error(i + "'th argument should be of Object type, found " + argTypes[i]);
+                    }
+                }
+
+                final String lastArgType = argTypes[argTypes.length - 1].toString();
+                final boolean isVarArg = lastArgType.equals(OBJECT_ARRAY_DESC);
+                if (!lastArgType.equals(OBJECT_DESC) && !isVarArg) {
+                    error("last argument is neither Object nor Object[] type: " + lastArgType);
+                }
+
+                if (isVarArg && argTypes.length > 3) {
+                    error("vararg constructor has more than 3 arguments");
+                }
+            }
+        } else if (kind == Kind.FUNCTION) {
+            final Type returnType = Type.getReturnType(javaDesc);
+            if (! returnType.toString().equals(OBJECT_DESC)) {
+                error("return value should be of Object type, found" + returnType);
+            }
+            final Type[] argTypes = Type.getArgumentTypes(javaDesc);
+            if (argTypes.length < 1) {
+                error("function methods should have at least 1 arg");
+            }
+            if (! argTypes[0].toString().equals(OBJECT_DESC)) {
+                error("first argument should be of Object type, found" + argTypes[0]);
+            }
+
+            if (argTypes.length > 1) {
+                for (int i = 1; i < argTypes.length - 1; i++) {
+                    if (! argTypes[i].toString().equals(OBJECT_DESC)) {
+                        error(i + "'th argument should be of Object type, found " + argTypes[i]);
+                    }
+                }
+
+                final String lastArgType = argTypes[argTypes.length - 1].toString();
+                final boolean isVarArg = lastArgType.equals(OBJECT_ARRAY_DESC);
+                if (!lastArgType.equals(OBJECT_DESC) && !isVarArg) {
+                    error("last argument is neither Object nor Object[] type: " + lastArgType);
+                }
+
+                if (isVarArg && argTypes.length > 2) {
+                    error("vararg function has more than 2 arguments");
+                }
+            }
+        } else if (kind == Kind.GETTER) {
+            final Type[] argTypes = Type.getArgumentTypes(javaDesc);
+            if (argTypes.length != 1) {
+                error("getter methods should have one argument");
+            }
+            if (! argTypes[0].toString().equals(OBJECT_DESC)) {
+                error("first argument of getter should be of Object type, found: " + argTypes[0]);
+            }
+            if (Type.getReturnType(javaDesc).equals(Type.VOID_TYPE)) {
+                error("return type of getter should not be void");
+            }
+        } else if (kind == Kind.SETTER) {
+            final Type[] argTypes = Type.getArgumentTypes(javaDesc);
+            if (argTypes.length != 2) {
+                error("setter methods should have two arguments");
+            }
+            if (! argTypes[0].toString().equals(OBJECT_DESC)) {
+                error("first argument of setter should be of Object type, found: " + argTypes[0]);
+            }
+            if (!Type.getReturnType(javaDesc).toString().equals("V")) {
+                error("return type of setter should be void, found: " + Type.getReturnType(javaDesc));
+            }
+        }
+    }
+
+    private void error(final String msg) {
+        throw new RuntimeException(javaName + javaDesc + " : " + msg);
+    }
+
+    /**
+     * @return the initClass
+     */
+    String getInitClass() {
+        return initClass;
+    }
+
+    /**
+     * @param initClass the initClass to set
+     */
+    void setInitClass(final String initClass) {
+        this.initClass = initClass;
+    }
+
+    @Override
+    protected Object clone() {
+        try {
+            return super.clone();
+        } catch (final CloneNotSupportedException e) {
+            assert false : "clone not supported " + e;
+            return null;
+        }
+    }
+
+    /**
+     * @return the arity
+     */
+    int getArity() {
+        return arity;
+    }
+
+    /**
+     * @param arity the arity to set
+     */
+    void setArity(final int arity) {
+        this.arity = arity;
+    }
+}
diff --git a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MethodGenerator.java b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MethodGenerator.java
new file mode 100644
index 00000000000..500b8224946
--- /dev/null
+++ b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MethodGenerator.java
@@ -0,0 +1,426 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.tools.nasgen;
+
+import static jdk.internal.org.objectweb.asm.Opcodes.AALOAD;
+import static jdk.internal.org.objectweb.asm.Opcodes.AASTORE;
+import static jdk.internal.org.objectweb.asm.Opcodes.ACC_STATIC;
+import static jdk.internal.org.objectweb.asm.Opcodes.ACONST_NULL;
+import static jdk.internal.org.objectweb.asm.Opcodes.ALOAD;
+import static jdk.internal.org.objectweb.asm.Opcodes.ANEWARRAY;
+import static jdk.internal.org.objectweb.asm.Opcodes.ARETURN;
+import static jdk.internal.org.objectweb.asm.Opcodes.ASM4;
+import static jdk.internal.org.objectweb.asm.Opcodes.ASTORE;
+import static jdk.internal.org.objectweb.asm.Opcodes.BALOAD;
+import static jdk.internal.org.objectweb.asm.Opcodes.BASTORE;
+import static jdk.internal.org.objectweb.asm.Opcodes.BIPUSH;
+import static jdk.internal.org.objectweb.asm.Opcodes.CALOAD;
+import static jdk.internal.org.objectweb.asm.Opcodes.CASTORE;
+import static jdk.internal.org.objectweb.asm.Opcodes.CHECKCAST;
+import static jdk.internal.org.objectweb.asm.Opcodes.DALOAD;
+import static jdk.internal.org.objectweb.asm.Opcodes.DASTORE;
+import static jdk.internal.org.objectweb.asm.Opcodes.DCONST_0;
+import static jdk.internal.org.objectweb.asm.Opcodes.DRETURN;
+import static jdk.internal.org.objectweb.asm.Opcodes.DUP;
+import static jdk.internal.org.objectweb.asm.Opcodes.DUP2;
+import static jdk.internal.org.objectweb.asm.Opcodes.FALOAD;
+import static jdk.internal.org.objectweb.asm.Opcodes.FASTORE;
+import static jdk.internal.org.objectweb.asm.Opcodes.FCONST_0;
+import static jdk.internal.org.objectweb.asm.Opcodes.FRETURN;
+import static jdk.internal.org.objectweb.asm.Opcodes.GETFIELD;
+import static jdk.internal.org.objectweb.asm.Opcodes.GETSTATIC;
+import static jdk.internal.org.objectweb.asm.Opcodes.H_INVOKESTATIC;
+import static jdk.internal.org.objectweb.asm.Opcodes.IALOAD;
+import static jdk.internal.org.objectweb.asm.Opcodes.IASTORE;
+import static jdk.internal.org.objectweb.asm.Opcodes.ICONST_0;
+import static jdk.internal.org.objectweb.asm.Opcodes.ILOAD;
+import static jdk.internal.org.objectweb.asm.Opcodes.INVOKESPECIAL;
+import static jdk.internal.org.objectweb.asm.Opcodes.INVOKESTATIC;
+import static jdk.internal.org.objectweb.asm.Opcodes.INVOKEVIRTUAL;
+import static jdk.internal.org.objectweb.asm.Opcodes.IRETURN;
+import static jdk.internal.org.objectweb.asm.Opcodes.ISTORE;
+import static jdk.internal.org.objectweb.asm.Opcodes.LALOAD;
+import static jdk.internal.org.objectweb.asm.Opcodes.LASTORE;
+import static jdk.internal.org.objectweb.asm.Opcodes.LCONST_0;
+import static jdk.internal.org.objectweb.asm.Opcodes.LRETURN;
+import static jdk.internal.org.objectweb.asm.Opcodes.NEW;
+import static jdk.internal.org.objectweb.asm.Opcodes.POP;
+import static jdk.internal.org.objectweb.asm.Opcodes.PUTFIELD;
+import static jdk.internal.org.objectweb.asm.Opcodes.PUTSTATIC;
+import static jdk.internal.org.objectweb.asm.Opcodes.RETURN;
+import static jdk.internal.org.objectweb.asm.Opcodes.SALOAD;
+import static jdk.internal.org.objectweb.asm.Opcodes.SASTORE;
+import static jdk.internal.org.objectweb.asm.Opcodes.SIPUSH;
+import static jdk.internal.org.objectweb.asm.Opcodes.SWAP;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.METHODHANDLE_TYPE;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.TYPE_METHODHANDLE;
+
+import java.util.List;
+import jdk.internal.org.objectweb.asm.Handle;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.Type;
+
+/**
+ * Base class for all method generating classes.
+ *
+ */
+public class MethodGenerator extends MethodVisitor {
+    private final int access;
+    private final String name;
+    private final String descriptor;
+    private final Type returnType;
+    private final Type[] argumentTypes;
+
+    MethodGenerator(final MethodVisitor mv, final int access, final String name, final String descriptor) {
+        super(ASM4, mv);
+        this.access        = access;
+        this.name          = name;
+        this.descriptor    = descriptor;
+        this.returnType    = Type.getReturnType(descriptor);
+        this.argumentTypes = Type.getArgumentTypes(descriptor);
+    }
+
+    int getAccess() {
+        return access;
+    }
+
+    final String getName() {
+        return name;
+    }
+
+    final String getDescriptor() {
+        return descriptor;
+    }
+
+    final Type getReturnType() {
+        return returnType;
+    }
+
+    final Type[] getArgumentTypes() {
+        return argumentTypes;
+    }
+
+    /**
+     * Check whether access for this method is static
+     * @return true if static
+     */
+    protected final boolean isStatic() {
+        return (getAccess() & ACC_STATIC) != 0;
+    }
+
+    /**
+     * Check whether this method is a constructor
+     * @return true if constructor
+     */
+    protected final boolean isConstructor() {
+        return "<init>".equals(name);
+    }
+
+    void newObject(final String type) {
+        super.visitTypeInsn(NEW, type);
+    }
+
+    void newObjectArray(final String type) {
+        super.visitTypeInsn(ANEWARRAY, type);
+    }
+
+    void loadThis() {
+        if ((access & ACC_STATIC) != 0) {
+            throw new IllegalStateException("no 'this' inside static method");
+        }
+        super.visitVarInsn(ALOAD, 0);
+    }
+
+    void returnValue() {
+        super.visitInsn(returnType.getOpcode(IRETURN));
+    }
+
+    void returnVoid() {
+        super.visitInsn(RETURN);
+    }
+
+    // load, store
+    void arrayLoad(final Type type) {
+        super.visitInsn(type.getOpcode(IALOAD));
+    }
+
+    void arrayLoad() {
+        super.visitInsn(AALOAD);
+    }
+
+    void arrayStore(final Type type) {
+        super.visitInsn(type.getOpcode(IASTORE));
+    }
+
+    void arrayStore() {
+        super.visitInsn(AASTORE);
+    }
+
+    void loadLiteral(final Object value) {
+        super.visitLdcInsn(value);
+    }
+
+    void classLiteral(final String className) {
+        super.visitLdcInsn(className);
+    }
+
+    void loadLocal(final Type type, final int index) {
+        super.visitVarInsn(type.getOpcode(ILOAD), index);
+    }
+
+    void loadLocal(final int index) {
+        super.visitVarInsn(ALOAD, index);
+    }
+
+    void storeLocal(final Type type, final int index) {
+        super.visitVarInsn(type.getOpcode(ISTORE), index);
+    }
+
+    void storeLocal(final int index) {
+        super.visitVarInsn(ASTORE, index);
+    }
+
+    void checkcast(final String type) {
+        super.visitTypeInsn(CHECKCAST, type);
+    }
+
+    // push constants/literals
+    void pushNull() {
+        super.visitInsn(ACONST_NULL);
+    }
+
+    void push(final int value) {
+        if (value >= -1 && value <= 5) {
+            super.visitInsn(ICONST_0 + value);
+        } else if (value >= Byte.MIN_VALUE && value <= Byte.MAX_VALUE) {
+            super.visitIntInsn(BIPUSH, value);
+        } else if (value >= Short.MIN_VALUE && value <= Short.MAX_VALUE) {
+            super.visitIntInsn(SIPUSH, value);
+        } else {
+            super.visitLdcInsn(value);
+        }
+    }
+
+    void loadClass(final String className) {
+        super.visitLdcInsn(Type.getObjectType(className));
+    }
+
+    void pop() {
+        super.visitInsn(POP);
+    }
+
+    // various "dups"
+    void dup() {
+        super.visitInsn(DUP);
+    }
+
+    void dup2() {
+        super.visitInsn(DUP2);
+    }
+
+    void swap() {
+        super.visitInsn(SWAP);
+    }
+
+    void dupArrayValue(final int arrayOpcode) {
+        switch (arrayOpcode) {
+            case IALOAD: case FALOAD:
+            case AALOAD: case BALOAD:
+            case CALOAD: case SALOAD:
+            case IASTORE: case FASTORE:
+            case AASTORE: case BASTORE:
+            case CASTORE: case SASTORE:
+                dup();
+            break;
+
+            case LALOAD: case DALOAD:
+            case LASTORE: case DASTORE:
+                dup2();
+            break;
+            default:
+                throw new AssertionError("invalid dup");
+        }
+    }
+
+    void dupReturnValue(final int returnOpcode) {
+        switch (returnOpcode) {
+            case IRETURN:
+            case FRETURN:
+            case ARETURN:
+                super.visitInsn(DUP);
+                return;
+            case LRETURN:
+            case DRETURN:
+                super.visitInsn(DUP2);
+                return;
+            case RETURN:
+                return;
+            default:
+                throw new IllegalArgumentException("not return");
+        }
+    }
+
+    void dupValue(final Type type) {
+        switch (type.getSize()) {
+            case 1:
+                dup();
+            break;
+            case 2:
+                dup2();
+            break;
+            default:
+                throw new AssertionError("invalid dup");
+        }
+    }
+
+    void dupValue(final String desc) {
+        final int typeCode = desc.charAt(0);
+        switch (typeCode) {
+            case '[':
+            case 'L':
+            case 'Z':
+            case 'C':
+            case 'B':
+            case 'S':
+            case 'I':
+                super.visitInsn(DUP);
+                break;
+            case 'J':
+            case 'D':
+                super.visitInsn(DUP2);
+                break;
+            default:
+                throw new RuntimeException("invalid signature");
+        }
+    }
+
+    // push default value of given type desc
+    void defaultValue(final String desc) {
+        final int typeCode = desc.charAt(0);
+        switch (typeCode) {
+            case '[':
+            case 'L':
+                super.visitInsn(ACONST_NULL);
+                break;
+            case 'Z':
+            case 'C':
+            case 'B':
+            case 'S':
+            case 'I':
+                super.visitInsn(ICONST_0);
+                break;
+            case 'J':
+                super.visitInsn(LCONST_0);
+                break;
+            case 'F':
+                super.visitInsn(FCONST_0);
+                break;
+            case 'D':
+                super.visitInsn(DCONST_0);
+                break;
+            default:
+                throw new AssertionError("invalid desc " + desc);
+        }
+    }
+
+    // invokes, field get/sets
+    void invokeVirtual(final String owner, final String method, final String desc) {
+        super.visitMethodInsn(INVOKEVIRTUAL, owner, method, desc);
+    }
+
+    void invokeSpecial(final String owner, final String method, final String desc) {
+        super.visitMethodInsn(INVOKESPECIAL, owner, method, desc);
+    }
+
+    void invokeStatic(final String owner, final String method, final String desc) {
+        super.visitMethodInsn(INVOKESTATIC, owner, method, desc);
+    }
+
+    void putStatic(final String owner, final String field, final String desc) {
+        super.visitFieldInsn(PUTSTATIC, owner, field, desc);
+    }
+
+    void getStatic(final String owner, final String field, final String desc) {
+        super.visitFieldInsn(GETSTATIC, owner, field, desc);
+    }
+
+    void putField(final String owner, final String field, final String desc) {
+        super.visitFieldInsn(PUTFIELD, owner, field, desc);
+    }
+
+    void getField(final String owner, final String field, final String desc) {
+        super.visitFieldInsn(GETFIELD, owner, field, desc);
+    }
+
+    void memberInfoArray(final String className, final List<MemberInfo> mis) {
+        if (mis.isEmpty()) {
+            pushNull();
+            return;
+        }
+
+        int pos = 0;
+        push(mis.size());
+        newObjectArray(METHODHANDLE_TYPE);
+        for (final MemberInfo mi : mis) {
+            dup();
+            push(pos++);
+            visitLdcInsn(new Handle(H_INVOKESTATIC, className, mi.getJavaName(), mi.getJavaDesc()));
+            arrayStore(TYPE_METHODHANDLE);
+        }
+    }
+
+    void computeMaxs() {
+        // These values are ignored as we create class writer
+        // with ClassWriter.COMPUTE_MAXS flag.
+        super.visitMaxs(Short.MAX_VALUE, Short.MAX_VALUE);
+    }
+
+    // debugging support - print calls
+    void println(final String msg) {
+        super.visitFieldInsn(GETSTATIC,
+                    "java/lang/System",
+                    "out",
+                    "Ljava/io/PrintStream;");
+        super.visitLdcInsn(msg);
+        super.visitMethodInsn(INVOKEVIRTUAL,
+                    "java/io/PrintStream",
+                    "println",
+                    "(Ljava/lang/String;)V");
+    }
+
+    // print the object on the top of the stack
+    void printObject() {
+        super.visitFieldInsn(GETSTATIC,
+                    "java/lang/System",
+                    "out",
+                    "Ljava/io/PrintStream;");
+        super.visitInsn(SWAP);
+        super.visitMethodInsn(INVOKEVIRTUAL,
+                    "java/io/PrintStream",
+                    "println",
+                    "(Ljava/lang/Object;)V");
+    }
+}
diff --git a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/NullVisitor.java b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/NullVisitor.java
new file mode 100644
index 00000000000..7f585c0392b
--- /dev/null
+++ b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/NullVisitor.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.tools.nasgen;
+
+import jdk.internal.org.objectweb.asm.AnnotationVisitor;
+import jdk.internal.org.objectweb.asm.ClassVisitor;
+import jdk.internal.org.objectweb.asm.FieldVisitor;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+
+/**
+ * A visitor that does nothing on visitXXX calls.
+ *
+ */
+public class NullVisitor extends ClassVisitor {
+    NullVisitor() {
+        super(Opcodes.ASM4);
+    }
+
+    @Override
+    public MethodVisitor visitMethod(
+        final int access,
+        final String name,
+        final String desc,
+        final String signature,
+        final String[] exceptions) {
+        return new MethodVisitor(Opcodes.ASM4) {
+            @Override
+            public AnnotationVisitor visitAnnotationDefault() {
+                return new NullAnnotationVisitor();
+            }
+
+            @Override
+            public AnnotationVisitor visitAnnotation(final String descriptor, final boolean visible) {
+                return new NullAnnotationVisitor();
+            }
+        };
+    }
+
+    @Override
+    public FieldVisitor visitField(
+        final int access,
+        final String name,
+        final String desc,
+        final String signature,
+        final Object value) {
+        return new FieldVisitor(Opcodes.ASM4) {
+            @Override
+            public AnnotationVisitor visitAnnotation(final String descriptor, final boolean visible) {
+                return new NullAnnotationVisitor();
+            }
+        };
+    }
+
+    @Override
+    public AnnotationVisitor visitAnnotation(final String desc, final boolean visible) {
+        return new NullAnnotationVisitor();
+    }
+
+    private static class NullAnnotationVisitor extends AnnotationVisitor {
+        NullAnnotationVisitor() {
+            super(Opcodes.ASM4);
+        }
+    }
+}
diff --git a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/PrototypeGenerator.java b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/PrototypeGenerator.java
new file mode 100644
index 00000000000..a8b6e639b4e
--- /dev/null
+++ b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/PrototypeGenerator.java
@@ -0,0 +1,184 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.tools.nasgen;
+
+import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PUBLIC;
+import static jdk.internal.org.objectweb.asm.Opcodes.ACC_SUPER;
+import static jdk.internal.org.objectweb.asm.Opcodes.V1_7;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.DEFAULT_INIT_DESC;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.INIT;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.MAP_DESC;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.MAP_DUPLICATE;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.MAP_DUPLICATE_DESC;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.MAP_FIELD_NAME;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.MAP_TYPE;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.OBJECT_DESC;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROTOTYPEOBJECT_TYPE;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.PROTOTYPE_SUFFIX;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTOBJECT_INIT_DESC;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+/**
+ * This class generates prototype class for a @ClassInfo annotated class.
+ *
+ */
+public class PrototypeGenerator extends ClassGenerator {
+    private final ScriptClassInfo scriptClassInfo;
+    private final String className;
+    private final int memberCount;
+
+    PrototypeGenerator(final ScriptClassInfo sci) {
+        this.scriptClassInfo = sci;
+        this.className = scriptClassInfo.getPrototypeClassName();
+        this.memberCount = scriptClassInfo.getPrototypeMemberCount();
+    }
+
+    byte[] getClassBytes() {
+        // new class extensing from ScriptObject
+        cw.visit(V1_7, ACC_PUBLIC | ACC_SUPER, className, null, PROTOTYPEOBJECT_TYPE, null);
+        if (memberCount > 0) {
+            // add fields
+            emitFields();
+            // add <clinit>
+            emitStaticInitializer();
+        }
+        // add <init>
+        emitConstructor();
+
+        // add getClassName()
+        emitGetClassName(scriptClassInfo.getName());
+
+        cw.visitEnd();
+        return cw.toByteArray();
+    }
+
+    // --Internals only below this point
+    private void emitFields() {
+        // introduce "Function" type instance fields for each
+        // prototype @Function in script class info
+        for (MemberInfo memInfo : scriptClassInfo.getMembers()) {
+            if (memInfo.isPrototypeFunction()) {
+                addFunctionField(memInfo.getJavaName());
+                memInfo = (MemberInfo)memInfo.clone();
+                memInfo.setJavaDesc(OBJECT_DESC);
+                addGetter(className, memInfo);
+                addSetter(className, memInfo);
+            } else if (memInfo.isPrototypeProperty()) {
+                if (memInfo.isStaticFinal()) {
+                    addGetter(scriptClassInfo.getJavaName(), memInfo);
+                } else {
+                    addField(memInfo.getJavaName(), memInfo.getJavaDesc());
+                    memInfo = (MemberInfo)memInfo.clone();
+                    memInfo.setJavaAccess(ACC_PUBLIC);
+                    addGetter(className, memInfo);
+                    addSetter(className, memInfo);
+                }
+            }
+        }
+
+        addMapField();
+    }
+
+    private void emitStaticInitializer() {
+        final MethodGenerator mi = makeStaticInitializer();
+        emitStaticInitPrefix(mi, className);
+        for (final MemberInfo memInfo : scriptClassInfo.getMembers()) {
+            if (memInfo.isPrototypeFunction() || memInfo.isPrototypeProperty()) {
+                linkerAddGetterSetter(mi, className, memInfo);
+            } else if (memInfo.isPrototypeGetter()) {
+                final MemberInfo setter = scriptClassInfo.findSetter(memInfo);
+                linkerAddGetterSetter(mi, className, memInfo, setter);
+            }
+        }
+        emitStaticInitSuffix(mi, className);
+    }
+
+    private void emitConstructor() {
+        final MethodGenerator mi = makeConstructor();
+        mi.visitCode();
+        mi.loadThis();
+        if (memberCount > 0) {
+            // call "super(map$)"
+            mi.getStatic(className, MAP_FIELD_NAME, MAP_DESC);
+            // make sure we use duplicated PropertyMap so that original map
+            // stays intact and so can be used for many globals in same context
+            mi.invokeVirtual(MAP_TYPE, MAP_DUPLICATE, MAP_DUPLICATE_DESC);
+            mi.invokeSpecial(PROTOTYPEOBJECT_TYPE, INIT, SCRIPTOBJECT_INIT_DESC);
+            // initialize Function type fields
+            initFunctionFields(mi);
+        } else {
+            // call "super()"
+            mi.invokeSpecial(PROTOTYPEOBJECT_TYPE, INIT, DEFAULT_INIT_DESC);
+        }
+        mi.returnVoid();
+        mi.computeMaxs();
+        mi.visitEnd();
+    }
+
+    private void initFunctionFields(final MethodGenerator mi) {
+        for (final MemberInfo memInfo : scriptClassInfo.getMembers()) {
+            if (! memInfo.isPrototypeFunction()) {
+                continue;
+            }
+            mi.loadThis();
+            newFunction(mi, scriptClassInfo.getJavaName(), memInfo, scriptClassInfo.findSpecializations(memInfo.getJavaName()));
+            mi.putField(className, memInfo.getJavaName(), OBJECT_DESC);
+        }
+    }
+
+    /**
+     * External entry point for PrototypeGenerator if called from the command line
+     *
+     * @param args arguments, takes 1 argument which is the class to process
+     * @throws IOException if class cannot be read
+     */
+    public static void main(final String[] args) throws IOException {
+        if (args.length != 1) {
+            System.err.println("Usage: " + ConstructorGenerator.class.getName() + " <class>");
+            System.exit(1);
+        }
+
+        final String className = args[0].replace('.', '/');
+        final ScriptClassInfo sci = getScriptClassInfo(className + ".class");
+        if (sci == null) {
+            System.err.println("No @ScriptClass in " + className);
+            System.exit(2);
+            throw new AssertionError(); //guard against warning that sci is null below
+        }
+        try {
+            sci.verify();
+        } catch (final Exception e) {
+            System.err.println(e.getMessage());
+            System.exit(3);
+        }
+        final PrototypeGenerator gen = new PrototypeGenerator(sci);
+        try (FileOutputStream fos = new FileOutputStream(className + PROTOTYPE_SUFFIX + ".class")) {
+            fos.write(gen.getClassBytes());
+        }
+    }
+}
diff --git a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfo.java b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfo.java
new file mode 100644
index 00000000000..b5e285225c5
--- /dev/null
+++ b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfo.java
@@ -0,0 +1,237 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.tools.nasgen;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import jdk.internal.org.objectweb.asm.Type;
+import jdk.nashorn.internal.objects.annotations.Constructor;
+import jdk.nashorn.internal.objects.annotations.Function;
+import jdk.nashorn.internal.objects.annotations.Getter;
+import jdk.nashorn.internal.objects.annotations.Property;
+import jdk.nashorn.internal.objects.annotations.ScriptClass;
+import jdk.nashorn.internal.objects.annotations.Setter;
+import jdk.nashorn.internal.objects.annotations.SpecializedConstructor;
+import jdk.nashorn.internal.objects.annotations.SpecializedFunction;
+import jdk.nashorn.internal.objects.annotations.Where;
+import jdk.nashorn.internal.tools.nasgen.MemberInfo.Kind;
+
+/**
+ * All annotation information from a class that is annotated with
+ * the annotation com.sun.oracle.objects.annotations.ScriptClass.
+ *
+ */
+public final class ScriptClassInfo {
+    // descriptots for various annotations
+    static final String SCRIPT_CLASS_ANNO_DESC  = Type.getDescriptor(ScriptClass.class);
+    static final String CONSTRUCTOR_ANNO_DESC   = Type.getDescriptor(Constructor.class);
+    static final String FUNCTION_ANNO_DESC      = Type.getDescriptor(Function.class);
+    static final String GETTER_ANNO_DESC        = Type.getDescriptor(Getter.class);
+    static final String SETTER_ANNO_DESC        = Type.getDescriptor(Setter.class);
+    static final String PROPERTY_ANNO_DESC      = Type.getDescriptor(Property.class);
+    static final String WHERE_ENUM_DESC         = Type.getDescriptor(Where.class);
+    static final String SPECIALIZED_FUNCTION    = Type.getDescriptor(SpecializedFunction.class);
+    static final String SPECIALIZED_CONSTRUCTOR = Type.getDescriptor(SpecializedConstructor.class);
+
+    static final Map<String, Kind> annotations = new HashMap<>();
+
+    static {
+        annotations.put(SCRIPT_CLASS_ANNO_DESC, Kind.SCRIPT_CLASS);
+        annotations.put(FUNCTION_ANNO_DESC, Kind.FUNCTION);
+        annotations.put(CONSTRUCTOR_ANNO_DESC, Kind.CONSTRUCTOR);
+        annotations.put(GETTER_ANNO_DESC, Kind.GETTER);
+        annotations.put(SETTER_ANNO_DESC, Kind.SETTER);
+        annotations.put(PROPERTY_ANNO_DESC, Kind.PROPERTY);
+        annotations.put(SPECIALIZED_FUNCTION, Kind.SPECIALIZED_FUNCTION);
+        annotations.put(SPECIALIZED_CONSTRUCTOR, Kind.SPECIALIZED_CONSTRUCTOR);
+    }
+
+    // name of the script class
+    private String name;
+    // member info for script properties
+    private List<MemberInfo> members = Collections.emptyList();
+    // java class name that is annotated with @ScriptClass
+    private String javaName;
+
+    /**
+     * @return the name
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * @param name the name to set
+     */
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+    /**
+     * @return the members
+     */
+    public List<MemberInfo> getMembers() {
+        return Collections.unmodifiableList(members);
+    }
+
+    /**
+     * @param members the members to set
+     */
+    public void setMembers(final List<MemberInfo> members) {
+        this.members = members;
+    }
+
+    MemberInfo getConstructor() {
+        for (final MemberInfo memInfo : members) {
+            if (memInfo.getKind() == Kind.CONSTRUCTOR) {
+                return memInfo;
+            }
+        }
+        return null;
+    }
+
+    List<MemberInfo> getSpecializedConstructors() {
+        final List<MemberInfo> res = new LinkedList<>();
+        for (final MemberInfo memInfo : members) {
+            if (memInfo.getKind() == Kind.SPECIALIZED_CONSTRUCTOR) {
+                res.add(memInfo);
+            }
+        }
+        return res;
+    }
+
+    int getPrototypeMemberCount() {
+        int count = 0;
+        for (final MemberInfo memInfo : members) {
+            if (memInfo.getWhere() == Where.PROTOTYPE || memInfo.isConstructor()) {
+                count++;
+            }
+        }
+        return count;
+    }
+
+    int getConstructorMemberCount() {
+        int count = 0;
+        for (final MemberInfo memInfo : members) {
+            if (memInfo.getWhere() == Where.CONSTRUCTOR) {
+                count++;
+            }
+        }
+        return count;
+    }
+
+    int getInstancePropertyCount() {
+        int count = 0;
+        for (final MemberInfo memInfo : members) {
+            if (memInfo.getWhere() == Where.INSTANCE) {
+                count++;
+            }
+        }
+        return count;
+    }
+
+    MemberInfo find(final String findJavaName, final String findJavaDesc, final int findAccess) {
+        for (final MemberInfo memInfo : members) {
+            if (memInfo.getJavaName().equals(findJavaName) &&
+                memInfo.getJavaDesc().equals(findJavaDesc) &&
+                memInfo.getJavaAccess() == findAccess) {
+                return memInfo;
+            }
+        }
+        return null;
+    }
+
+    List<MemberInfo> findSpecializations(final String methodName) {
+        final List<MemberInfo> res = new LinkedList<>();
+        for (final MemberInfo memInfo : members) {
+            if (memInfo.getName().equals(methodName) &&
+                memInfo.getKind() == Kind.SPECIALIZED_FUNCTION) {
+                res.add(memInfo);
+            }
+        }
+        return res;
+    }
+
+    MemberInfo findSetter(final MemberInfo getter) {
+        assert getter.getKind() == Kind.GETTER : "getter expected";
+        final String getterName = getter.getName();
+        final Where getterWhere = getter.getWhere();
+        for (final MemberInfo memInfo : members) {
+            if (memInfo.getKind() == Kind.SETTER &&
+                getterName.equals(memInfo.getName()) &&
+                getterWhere == memInfo.getWhere()) {
+                return memInfo;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * @return the javaName
+     */
+    public String getJavaName() {
+        return javaName;
+    }
+
+    /**
+     * @param javaName the javaName to set
+     */
+    void setJavaName(final String javaName) {
+        this.javaName = javaName;
+    }
+
+    String getConstructorClassName() {
+        return getJavaName() + StringConstants.CONSTRUCTOR_SUFFIX;
+    }
+
+    String getPrototypeClassName() {
+        return getJavaName() + StringConstants.PROTOTYPE_SUFFIX;
+    }
+
+    void verify() {
+        boolean constructorSeen = false;
+        for (final MemberInfo memInfo : getMembers()) {
+            if (memInfo.isConstructor()) {
+                if (constructorSeen) {
+                    error("more than @Constructor method");
+                }
+                constructorSeen = true;
+            }
+            try {
+                memInfo.verify();
+            } catch (final Exception e) {
+                error(e.getMessage());
+            }
+        }
+    }
+
+    private void error(final String msg) throws RuntimeException {
+        throw new RuntimeException(javaName + " : " + msg);
+    }
+}
diff --git a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfoCollector.java b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfoCollector.java
new file mode 100644
index 00000000000..43c2bc6c6ea
--- /dev/null
+++ b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfoCollector.java
@@ -0,0 +1,331 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.tools.nasgen;
+
+import static jdk.nashorn.internal.tools.nasgen.ScriptClassInfo.SCRIPT_CLASS_ANNO_DESC;
+import static jdk.nashorn.internal.tools.nasgen.ScriptClassInfo.WHERE_ENUM_DESC;
+
+import java.io.BufferedInputStream;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import jdk.internal.org.objectweb.asm.AnnotationVisitor;
+import jdk.internal.org.objectweb.asm.ClassReader;
+import jdk.internal.org.objectweb.asm.ClassVisitor;
+import jdk.internal.org.objectweb.asm.FieldVisitor;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+import jdk.nashorn.internal.objects.annotations.Where;
+import jdk.nashorn.internal.tools.nasgen.MemberInfo.Kind;
+
+/**
+ * This class collects all @ScriptClass and other annotation information from a
+ * compiled .class file. Enforces that @Function/@Getter/@Setter/@Constructor
+ * methods are declared to be 'static'.
+ */
+public class ScriptClassInfoCollector extends ClassVisitor {
+    private String scriptClassName;
+    private List<MemberInfo> scriptMembers;
+    private String javaClassName;
+
+    ScriptClassInfoCollector(final ClassVisitor visitor) {
+        super(Opcodes.ASM4, visitor);
+    }
+
+    ScriptClassInfoCollector() {
+        this(new NullVisitor());
+    }
+
+    private void addScriptMember(final MemberInfo memInfo) {
+        if (scriptMembers == null) {
+            scriptMembers = new ArrayList<>();
+        }
+        scriptMembers.add(memInfo);
+    }
+
+    @Override
+    public void visit(final int version, final int access, final String name, final String signature,
+           final String superName, final String[] interfaces) {
+        super.visit(version, access, name, signature, superName, interfaces);
+        javaClassName = name;
+    }
+
+    @Override
+    public AnnotationVisitor visitAnnotation(final String desc, final boolean visible) {
+        final AnnotationVisitor delegateAV = super.visitAnnotation(desc, visible);
+        if (SCRIPT_CLASS_ANNO_DESC.equals(desc)) {
+            return new AnnotationVisitor(Opcodes.ASM4, delegateAV) {
+                @Override
+                public void visit(final String name, final Object value) {
+                    if ("value".equals(name)) {
+                        scriptClassName = (String) value;
+                    }
+                    super.visit(name, value);
+                }
+            };
+        }
+
+        return delegateAV;
+    }
+
+    @Override
+    public FieldVisitor visitField(final int fieldAccess, final String fieldName, final String fieldDesc, final String signature, final Object value) {
+        final FieldVisitor delegateFV = super.visitField(fieldAccess, fieldName, fieldDesc, signature, value);
+
+        return new FieldVisitor(Opcodes.ASM4, delegateFV) {
+            @Override
+            public AnnotationVisitor visitAnnotation(final String descriptor, final boolean visible) {
+                final AnnotationVisitor delegateAV = super.visitAnnotation(descriptor, visible);
+
+                if (ScriptClassInfo.PROPERTY_ANNO_DESC.equals(descriptor)) {
+                    final MemberInfo memInfo = new MemberInfo();
+
+                    memInfo.setKind(Kind.PROPERTY);
+                    memInfo.setJavaName(fieldName);
+                    memInfo.setJavaDesc(fieldDesc);
+                    memInfo.setJavaAccess(fieldAccess);
+
+                    if ((fieldAccess & Opcodes.ACC_STATIC) != 0) {
+                        memInfo.setValue(value);
+                    }
+
+                    addScriptMember(memInfo);
+
+                    return new AnnotationVisitor(Opcodes.ASM4, delegateAV) {
+                        // These could be "null" if values are not suppiled,
+                        // in which case we have to use the default values.
+                        private String  name;
+                        private Integer attributes;
+                        private String  clazz = "";
+                        private Where   where;
+
+                        @Override
+                        public void visit(final String annotationName, final Object annotationValue) {
+                            switch (annotationName) {
+                            case "name":
+                                this.name = (String) annotationValue;
+                                break;
+                            case "attributes":
+                                this.attributes = (Integer) annotationValue;
+                                break;
+                            case "clazz":
+                                this.clazz = (annotationValue == null) ? "" : annotationValue.toString();
+                                break;
+                            default:
+                                break;
+                            }
+                            super.visit(annotationName, annotationValue);
+                        }
+
+                        @Override
+                        public void visitEnum(final String enumName, final String desc, final String enumValue) {
+                            if ("where".equals(enumName) && WHERE_ENUM_DESC.equals(desc)) {
+                                this.where = Where.valueOf(enumValue);
+                            }
+                            super.visitEnum(enumName, desc, enumValue);
+                        }
+
+                        @Override
+                        public void visitEnd() {
+                            super.visitEnd();
+                            memInfo.setName(name == null ? fieldName : name);
+                            memInfo.setAttributes(attributes == null
+                                    ? MemberInfo.DEFAULT_ATTRIBUTES : attributes);
+                            clazz = clazz.replace('.', '/');
+                            memInfo.setInitClass(clazz);
+                            memInfo.setWhere(where == null? Where.INSTANCE : where);
+                        }
+                    };
+                }
+
+                return delegateAV;
+            }
+        };
+    }
+
+    private void error(final String javaName, final String javaDesc, final String msg) {
+        throw new RuntimeException(scriptClassName + "." + javaName + javaDesc + " : " + msg);
+    }
+
+    @Override
+    public MethodVisitor visitMethod(final int methodAccess, final String methodName,
+            final String methodDesc, final String signature, final String[] exceptions) {
+
+        final MethodVisitor delegateMV = super.visitMethod(methodAccess, methodName, methodDesc,
+                signature, exceptions);
+
+        return new MethodVisitor(Opcodes.ASM4, delegateMV) {
+
+            @Override
+            public AnnotationVisitor visitAnnotation(final String descriptor, final boolean visible) {
+                final AnnotationVisitor delegateAV = super.visitAnnotation(descriptor, visible);
+                final Kind annoKind = ScriptClassInfo.annotations.get(descriptor);
+
+                if (annoKind != null) {
+                    if ((methodAccess & Opcodes.ACC_STATIC) == 0) {
+                        error(methodName, methodDesc, "nasgen method annotations cannot be on instance methods");
+                    }
+
+                    final MemberInfo memInfo = new MemberInfo();
+
+                    memInfo.setKind(annoKind);
+                    memInfo.setJavaName(methodName);
+                    memInfo.setJavaDesc(methodDesc);
+                    memInfo.setJavaAccess(methodAccess);
+
+                    addScriptMember(memInfo);
+
+                    return new AnnotationVisitor(Opcodes.ASM4, delegateAV) {
+                        // These could be "null" if values are not suppiled,
+                        // in which case we have to use the default values.
+                        private String  name;
+                        private Integer attributes;
+                        private Integer arity;
+                        private Where   where;
+
+                        @Override
+                        public void visit(final String annotationName, final Object annotationValue) {
+                            switch (annotationName) {
+                            case "name":
+                                this.name = (String)annotationValue;
+                                break;
+                            case "attributes":
+                                this.attributes = (Integer)annotationValue;
+                                break;
+                            case "arity":
+                                this.arity = (Integer)annotationValue;
+                                break;
+                            default:
+                                break;
+                            }
+
+                            super.visit(annotationName, annotationValue);
+                        }
+
+                        @Override
+                        public void visitEnum(final String enumName, final String desc, final String enumValue) {
+                            if ("where".equals(enumName) && WHERE_ENUM_DESC.equals(desc)) {
+                                this.where = Where.valueOf(enumValue);
+                            }
+                            super.visitEnum(enumName, desc, enumValue);
+                        }
+
+                        @Override
+                        public void visitEnd() {
+                            super.visitEnd();
+
+                            if (memInfo.getKind() == Kind.CONSTRUCTOR) {
+                                memInfo.setName(name == null ? scriptClassName : name);
+                            } else {
+                                memInfo.setName(name == null ? methodName : name);
+                            }
+                            memInfo.setAttributes(attributes == null ? MemberInfo.DEFAULT_ATTRIBUTES : attributes);
+
+                            memInfo.setArity((arity == null)? MemberInfo.DEFAULT_ARITY : arity);
+                            if (where == null) {
+                                // by default @Getter/@Setter belongs to INSTANCE
+                                // @Function belong to PROTOTYPE.
+                                switch (memInfo.getKind()) {
+                                    case GETTER:
+                                    case SETTER:
+                                        where = Where.INSTANCE;
+                                        break;
+                                    case SPECIALIZED_CONSTRUCTOR:
+                                    case CONSTRUCTOR:
+                                        where = Where.CONSTRUCTOR;
+                                        break;
+                                    case FUNCTION:
+                                        where = Where.PROTOTYPE;
+                                        break;
+                                    case SPECIALIZED_FUNCTION:
+                                        //TODO is this correct
+                                    default:
+                                        break;
+                                }
+                            }
+                            memInfo.setWhere(where);
+                        }
+                    };
+                }
+
+                return delegateAV;
+            }
+        };
+    }
+
+    ScriptClassInfo getScriptClassInfo() {
+        ScriptClassInfo sci = null;
+        if (scriptClassName != null) {
+            sci = new ScriptClassInfo();
+            sci.setName(scriptClassName);
+            if (scriptMembers == null) {
+                scriptMembers = Collections.emptyList();
+            }
+            sci.setMembers(scriptMembers);
+            sci.setJavaName(javaClassName);
+        }
+        return sci;
+    }
+
+    /**
+     * External entry point for ScriptClassInfoCollector if invoked from the command line
+     * @param args argument vector, args contains a class for which to collect info
+     * @throws IOException if there were problems parsing args or class
+     */
+    public static void main(final String[] args) throws IOException {
+        if (args.length != 1) {
+            System.err.println("Usage: " + ScriptClassInfoCollector.class.getName() + " <class>");
+            System.exit(1);
+        }
+
+        args[0] = args[0].replace('.', '/');
+        final ScriptClassInfoCollector scic = new ScriptClassInfoCollector();
+        try (final BufferedInputStream bis = new BufferedInputStream(new FileInputStream(args[0] + ".class"))) {
+            final ClassReader reader = new ClassReader(bis);
+            reader.accept(scic, 0);
+        }
+        final ScriptClassInfo sci = scic.getScriptClassInfo();
+        final PrintStream out = System.out;
+        if (sci != null) {
+            out.println("script class: " + sci.getName());
+            out.println("===================================");
+            for (final MemberInfo memInfo : sci.getMembers()) {
+                out.println("kind : " + memInfo.getKind());
+                out.println("name : " + memInfo.getName());
+                out.println("attributes: " + memInfo.getAttributes());
+                out.println("javaName: " + memInfo.getJavaName());
+                out.println("javaDesc: " + memInfo.getJavaDesc());
+                out.println("where: " + memInfo.getWhere());
+                out.println("=====================================");
+            }
+        } else {
+            out.println(args[0] + " is not a @ScriptClass");
+        }
+    }
+}
diff --git a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInstrumentor.java b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInstrumentor.java
new file mode 100644
index 00000000000..c8e97370737
--- /dev/null
+++ b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInstrumentor.java
@@ -0,0 +1,309 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.tools.nasgen;
+
+import static jdk.internal.org.objectweb.asm.Opcodes.ALOAD;
+import static jdk.internal.org.objectweb.asm.Opcodes.DUP;
+import static jdk.internal.org.objectweb.asm.Opcodes.GETSTATIC;
+import static jdk.internal.org.objectweb.asm.Opcodes.INVOKESPECIAL;
+import static jdk.internal.org.objectweb.asm.Opcodes.INVOKESTATIC;
+import static jdk.internal.org.objectweb.asm.Opcodes.NEW;
+import static jdk.internal.org.objectweb.asm.Opcodes.PUTFIELD;
+import static jdk.internal.org.objectweb.asm.Opcodes.RETURN;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.$CLINIT$;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.CLINIT;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.DEFAULT_INIT_DESC;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.INIT;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.MAP_DESC;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.MAP_FIELD_NAME;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.OBJECT_DESC;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTOBJECT_INIT_DESC;
+import static jdk.nashorn.internal.tools.nasgen.StringConstants.SCRIPTOBJECT_TYPE;
+
+import java.io.BufferedInputStream;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import jdk.internal.org.objectweb.asm.AnnotationVisitor;
+import jdk.internal.org.objectweb.asm.Attribute;
+import jdk.internal.org.objectweb.asm.ClassReader;
+import jdk.internal.org.objectweb.asm.ClassVisitor;
+import jdk.internal.org.objectweb.asm.ClassWriter;
+import jdk.internal.org.objectweb.asm.FieldVisitor;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+import jdk.internal.org.objectweb.asm.util.CheckClassAdapter;
+import jdk.nashorn.internal.objects.annotations.Where;
+import jdk.nashorn.internal.tools.nasgen.MemberInfo.Kind;
+
+/**
+ * This class instruments the java class annotated with @ScriptClass.
+ *
+ * Changes done are:
+ *
+ * 1) remove all jdk.nashorn.internal.objects.annotations.* annotations.
+ * 2) static final @Property fields stay here. Other @Property fields moved to
+ *    respective classes depending on 'where' value of annotation.
+ * 2) add "Map" type static field named "$map".
+ * 3) add static initializer block to initialize map.
+ */
+
+public class ScriptClassInstrumentor extends ClassVisitor {
+    private final ScriptClassInfo scriptClassInfo;
+    private final int memberCount;
+    private boolean staticInitFound;
+
+    ScriptClassInstrumentor(final ClassVisitor visitor, final ScriptClassInfo sci) {
+        super(Opcodes.ASM4, visitor);
+        if (sci == null) {
+            throw new IllegalArgumentException("Null ScriptClassInfo, is the class annotated?");
+        }
+        this.scriptClassInfo = sci;
+        this.memberCount = scriptClassInfo.getInstancePropertyCount();
+    }
+
+    @Override
+    public AnnotationVisitor visitAnnotation(final String desc, final boolean visible) {
+        if (ScriptClassInfo.annotations.containsKey(desc)) {
+            // ignore @ScriptClass
+            return null;
+        }
+
+        return super.visitAnnotation(desc, visible);
+    }
+
+    @Override
+    public FieldVisitor visitField(final int fieldAccess, final String fieldName,
+            final String fieldDesc, final String signature, final Object value) {
+        final MemberInfo memInfo = scriptClassInfo.find(fieldName, fieldDesc, fieldAccess);
+        if (memInfo != null && memInfo.getKind() == Kind.PROPERTY &&
+                memInfo.getWhere() != Where.INSTANCE && !memInfo.isStaticFinal()) {
+            // non-instance @Property fields - these have to go elsewhere unless 'static final'
+            return null;
+        }
+
+        final FieldVisitor delegateFV = super.visitField(fieldAccess, fieldName, fieldDesc,
+                signature, value);
+        return new FieldVisitor(Opcodes.ASM4, delegateFV) {
+            @Override
+            public AnnotationVisitor visitAnnotation(final String desc, final boolean visible) {
+                if (ScriptClassInfo.annotations.containsKey(desc)) {
+                    // ignore script field annotations
+                    return null;
+                }
+
+                return fv.visitAnnotation(desc, visible);
+            }
+
+            @Override
+            public void visitAttribute(final Attribute attr) {
+                fv.visitAttribute(attr);
+            }
+
+            @Override
+            public void visitEnd() {
+                fv.visitEnd();
+            }
+        };
+    }
+
+    @Override
+    public MethodVisitor visitMethod(final int methodAccess, final String methodName,
+            final String methodDesc, final String signature, final String[] exceptions) {
+
+        final boolean isConstructor = INIT.equals(methodName);
+        final boolean isStaticInit  = CLINIT.equals(methodName);
+
+        if (isStaticInit) {
+            staticInitFound = true;
+        }
+
+        final MethodGenerator delegateMV = new MethodGenerator(super.visitMethod(methodAccess, methodName, methodDesc,
+                signature, exceptions), methodAccess, methodName, methodDesc);
+
+        return new MethodVisitor(Opcodes.ASM4, delegateMV) {
+            @Override
+            public void visitInsn(final int opcode) {
+                // call $clinit$ just before return from <clinit>
+                if (isStaticInit && opcode == RETURN) {
+                    super.visitMethodInsn(INVOKESTATIC, scriptClassInfo.getJavaName(),
+                            $CLINIT$, DEFAULT_INIT_DESC);
+                }
+                super.visitInsn(opcode);
+            }
+
+            @Override
+            public void visitMethodInsn(final int opcode, final String owner, final String name, final String desc) {
+                if (isConstructor && opcode == INVOKESPECIAL &&
+                        INIT.equals(name) && SCRIPTOBJECT_TYPE.equals(owner)) {
+                    super.visitFieldInsn(GETSTATIC, scriptClassInfo.getJavaName(),
+                            MAP_FIELD_NAME, MAP_DESC);
+                    super.visitMethodInsn(INVOKESPECIAL, SCRIPTOBJECT_TYPE, INIT,
+                            SCRIPTOBJECT_INIT_DESC);
+
+                    if (memberCount > 0) {
+                        // initialize @Property fields if needed
+                        for (final MemberInfo memInfo : scriptClassInfo.getMembers()) {
+                            if (memInfo.isInstanceProperty() && !memInfo.getInitClass().isEmpty()) {
+                                final String clazz = memInfo.getInitClass();
+                                super.visitVarInsn(ALOAD, 0);
+                                super.visitTypeInsn(NEW, clazz);
+                                super.visitInsn(DUP);
+                                super.visitMethodInsn(INVOKESPECIAL, clazz,
+                                    INIT, DEFAULT_INIT_DESC);
+                                super.visitFieldInsn(PUTFIELD, scriptClassInfo.getJavaName(),
+                                    memInfo.getJavaName(), memInfo.getJavaDesc());
+                            }
+
+                            if (memInfo.isInstanceFunction()) {
+                                super.visitVarInsn(ALOAD, 0);
+                                ClassGenerator.newFunction(delegateMV, scriptClassInfo.getJavaName(), memInfo, scriptClassInfo.findSpecializations(memInfo.getJavaName()));
+                                super.visitFieldInsn(PUTFIELD, scriptClassInfo.getJavaName(),
+                                    memInfo.getJavaName(), OBJECT_DESC);
+                            }
+                        }
+                    }
+                } else {
+                    super.visitMethodInsn(opcode, owner, name, desc);
+                }
+            }
+
+            @Override
+            public AnnotationVisitor visitAnnotation(final String desc, final boolean visible) {
+                if (ScriptClassInfo.annotations.containsKey(desc)) {
+                    // ignore script method annotations
+                    return null;
+                }
+                return super.visitAnnotation(desc, visible);
+            }
+        };
+    }
+
+    @Override
+    public void visitEnd() {
+        emitFields();
+        emitStaticInitializer();
+        emitGettersSetters();
+        super.visitEnd();
+    }
+
+    private void emitFields() {
+        // introduce "Function" type instance fields for each
+        // instance @Function in script class info
+        final String className = scriptClassInfo.getJavaName();
+        for (MemberInfo memInfo : scriptClassInfo.getMembers()) {
+            if (memInfo.isInstanceFunction()) {
+                ClassGenerator.addFunctionField(cv, memInfo.getJavaName());
+                memInfo = (MemberInfo)memInfo.clone();
+                memInfo.setJavaDesc(OBJECT_DESC);
+                ClassGenerator.addGetter(cv, className, memInfo);
+                ClassGenerator.addSetter(cv, className, memInfo);
+            }
+        }
+        ClassGenerator.addMapField(this);
+    }
+
+    void emitGettersSetters() {
+        if (memberCount > 0) {
+            for (final MemberInfo memInfo : scriptClassInfo.getMembers()) {
+                final String className = scriptClassInfo.getJavaName();
+                if (memInfo.isInstanceProperty()) {
+                    ClassGenerator.addGetter(cv, className, memInfo);
+                    if (! memInfo.isFinal()) {
+                        ClassGenerator.addSetter(cv, className, memInfo);
+                    }
+                }
+            }
+        }
+    }
+
+    private void emitStaticInitializer() {
+        final String className = scriptClassInfo.getJavaName();
+        if (! staticInitFound) {
+            // no user written <clinit> and so create one
+            final MethodVisitor mv = ClassGenerator.makeStaticInitializer(this);
+            mv.visitCode();
+            mv.visitInsn(RETURN);
+            mv.visitMaxs(Short.MAX_VALUE, 0);
+            mv.visitEnd();
+        }
+        // Now generate $clinit$
+        final MethodGenerator mi = ClassGenerator.makeStaticInitializer(this, $CLINIT$);
+        ClassGenerator.emitStaticInitPrefix(mi, className);
+        if (memberCount > 0) {
+            for (final MemberInfo memInfo : scriptClassInfo.getMembers()) {
+                if (memInfo.isInstanceProperty() || memInfo.isInstanceFunction()) {
+                    ClassGenerator.linkerAddGetterSetter(mi, className, memInfo);
+                } else if (memInfo.isInstanceGetter()) {
+                    final MemberInfo setter = scriptClassInfo.findSetter(memInfo);
+                    ClassGenerator.linkerAddGetterSetter(mi, className, memInfo, setter);
+                }
+            }
+        }
+        ClassGenerator.emitStaticInitSuffix(mi, className);
+    }
+
+    /**
+     * External entry point for ScriptClassInfoCollector if run from the command line
+     *
+     * @param args arguments - one argument is needed, the name of the class to collect info from
+     *
+     * @throws IOException if there are problems reading class
+     */
+    public static void main(final String[] args) throws IOException {
+        if (args.length != 1) {
+            System.err.println("Usage: " + ScriptClassInfoCollector.class.getName() + " <class>");
+            System.exit(1);
+        }
+
+        final String fileName = args[0].replace('.', '/') + ".class";
+        final ScriptClassInfo sci = ClassGenerator.getScriptClassInfo(fileName);
+        if (sci == null) {
+            System.err.println("No @ScriptClass in " + fileName);
+            System.exit(2);
+            throw new AssertionError(); //guard against warning that sci is null below
+        }
+
+        try {
+            sci.verify();
+        } catch (final Exception e) {
+            System.err.println(e.getMessage());
+            System.exit(3);
+        }
+
+        final ClassWriter writer = ClassGenerator.makeClassWriter();
+        try (final BufferedInputStream bis = new BufferedInputStream(new FileInputStream(fileName))) {
+            final ClassReader reader = new ClassReader(bis);
+            final CheckClassAdapter checker = new CheckClassAdapter(writer);
+            final ScriptClassInstrumentor instr = new ScriptClassInstrumentor(checker, sci);
+            reader.accept(instr, 0);
+        }
+
+        try (FileOutputStream fos = new FileOutputStream(fileName)) {
+            fos.write(writer.toByteArray());
+        }
+    }
+}
diff --git a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/StringConstants.java b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/StringConstants.java
new file mode 100644
index 00000000000..06032733e92
--- /dev/null
+++ b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/StringConstants.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.tools.nasgen;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.reflect.Method;
+import jdk.internal.org.objectweb.asm.Type;
+import jdk.nashorn.internal.objects.PrototypeObject;
+import jdk.nashorn.internal.objects.ScriptFunctionImpl;
+import jdk.nashorn.internal.runtime.PropertyMap;
+import jdk.nashorn.internal.runtime.ScriptFunction;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.linker.Lookup;
+
+/**
+ * String constants used for code generation/instrumentation.
+ */
+@SuppressWarnings("javadoc")
+public interface StringConstants {
+    static final Type TYPE_METHOD             = Type.getType(Method.class);
+    static final Type TYPE_METHODHANDLE       = Type.getType(MethodHandle.class);
+    static final Type TYPE_METHODHANDLE_ARRAY = Type.getType(MethodHandle[].class);
+    static final Type TYPE_OBJECT             = Type.getType(Object.class);
+    static final Type TYPE_CLASS              = Type.getType(Class.class);
+    static final Type TYPE_STRING             = Type.getType(String.class);
+
+    // Nashorn types
+    static final Type TYPE_LOOKUP             = Type.getType(Lookup.class);
+    static final Type TYPE_PROPERTYMAP        = Type.getType(PropertyMap.class);
+    static final Type TYPE_PROTOTYPEOBJECT    = Type.getType(PrototypeObject.class);
+    static final Type TYPE_SCRIPTFUNCTION     = Type.getType(ScriptFunction.class);
+    static final Type TYPE_SCRIPTFUNCTIONIMPL = Type.getType(ScriptFunctionImpl.class);
+    static final Type TYPE_SCRIPTOBJECT       = Type.getType(ScriptObject.class);
+
+    static final String PROTOTYPE = "prototype";
+    static final String PROTOTYPE_SUFFIX = "$Prototype";
+    static final String CONSTRUCTOR_SUFFIX = "$Constructor";
+    // This field name is known to Nashorn runtime (Context).
+    // Synchronize the name change, if needed at all.
+    static final String MAP_FIELD_NAME = "$nasgenmap$";
+    static final String $CLINIT$ = "$clinit$";
+    static final String CLINIT = "<clinit>";
+    static final String INIT = "<init>";
+    static final String DEFAULT_INIT_DESC = Type.getMethodDescriptor(Type.VOID_TYPE);
+
+    static final String SCRIPTOBJECT_INIT_DESC = Type.getMethodDescriptor(Type.VOID_TYPE, TYPE_PROPERTYMAP);
+
+    static final String METHODHANDLE_TYPE = TYPE_METHODHANDLE.getInternalName();
+
+    static final String OBJECT_TYPE = TYPE_OBJECT.getInternalName();
+    static final String OBJECT_DESC = TYPE_OBJECT.getDescriptor();
+    static final String OBJECT_ARRAY_DESC = Type.getDescriptor(Object[].class);
+
+    static final String SCRIPTFUNCTION_TYPE = TYPE_SCRIPTFUNCTION.getInternalName();
+    static final String SCRIPTFUNCTIONIMPL_TYPE = TYPE_SCRIPTFUNCTIONIMPL.getInternalName();
+    static final String SCRIPTFUNCTIONIMPL_MAKEFUNCTION = "makeFunction";
+    static final String SCRIPTFUNCTIONIMPL_MAKEFUNCTION_DESC =
+        Type.getMethodDescriptor(TYPE_SCRIPTFUNCTION, TYPE_STRING, TYPE_METHODHANDLE);
+    static final String SCRIPTFUNCTIONIMPL_MAKEFUNCTION_SPECS_DESC =
+        Type.getMethodDescriptor(TYPE_SCRIPTFUNCTION, TYPE_STRING, TYPE_METHODHANDLE, TYPE_METHODHANDLE_ARRAY);
+
+    static final String SCRIPTFUNCTIONIMPL_INIT_DESC3 =
+        Type.getMethodDescriptor(Type.VOID_TYPE, TYPE_STRING, TYPE_METHODHANDLE, TYPE_METHODHANDLE_ARRAY);
+    static final String SCRIPTFUNCTIONIMPL_INIT_DESC4 =
+        Type.getMethodDescriptor(Type.VOID_TYPE, TYPE_STRING, TYPE_METHODHANDLE, TYPE_PROPERTYMAP, TYPE_METHODHANDLE_ARRAY);
+    static final String SCRIPTFUNCTION_SETARITY = "setArity";
+    static final String SCRIPTFUNCTION_SETARITY_DESC = Type.getMethodDescriptor(Type.VOID_TYPE, Type.INT_TYPE);
+    static final String PROTOTYPEOBJECT_TYPE = TYPE_PROTOTYPEOBJECT.getInternalName();
+    static final String PROTOTYPEOBJECT_SETCONSTRUCTOR = "setConstructor";
+    static final String PROTOTYPEOBJECT_SETCONSTRUCTOR_DESC = Type.getMethodDescriptor(Type.VOID_TYPE, TYPE_OBJECT, TYPE_OBJECT);
+    static final String SCRIPTOBJECT_TYPE = TYPE_SCRIPTOBJECT.getInternalName();
+    static final String MAP_TYPE = TYPE_PROPERTYMAP.getInternalName();
+    static final String MAP_DESC = TYPE_PROPERTYMAP.getDescriptor();
+    static final String MAP_NEWMAP = "newMap";
+    static final String MAP_NEWMAP_DESC = Type.getMethodDescriptor(TYPE_PROPERTYMAP, TYPE_CLASS);
+    static final String MAP_DUPLICATE = "duplicate";
+    static final String MAP_DUPLICATE_DESC = Type.getMethodDescriptor(TYPE_PROPERTYMAP);
+    static final String MAP_SETFLAGS = "setFlags";
+    static final String LOOKUP_TYPE = TYPE_LOOKUP.getInternalName();
+    static final String LOOKUP_GETMETHOD = "getMethod";
+    static final String LOOKUP_NEWPROPERTY = "newProperty";
+    static final String LOOKUP_NEWPROPERTY_DESC =
+        Type.getMethodDescriptor(TYPE_PROPERTYMAP, TYPE_PROPERTYMAP, TYPE_STRING, Type.INT_TYPE, TYPE_METHODHANDLE, TYPE_METHODHANDLE);
+    static final String GETTER_PREFIX = "G$";
+    static final String SETTER_PREFIX = "S$";
+
+    // ScriptObject.getClassName() method.
+    static final String GET_CLASS_NAME = "getClassName";
+    static final String GET_CLASS_NAME_DESC = Type.getMethodDescriptor(TYPE_STRING);
+}
diff --git a/nashorn/docs/DEVELOPER_README b/nashorn/docs/DEVELOPER_README
new file mode 100644
index 00000000000..747379bc87b
--- /dev/null
+++ b/nashorn/docs/DEVELOPER_README
@@ -0,0 +1,445 @@
+This document describes system properties that are used for internal
+debugging and instrumentation purposes, along with the system loggers,
+which are used for the same thing.
+
+This document is intended as a developer resource, and it is not
+needed as Nashorn documentation for normal usage. Flags and system
+properties described herein are subject to change without notice.
+
+=====================================
+1. System properties used internally
+=====================================
+
+This documentation of the system property flags assume that the
+default value of the flag is false, unless otherwise specified.
+
+
+SYSTEM PROPERTY: -Dnashorn.callsiteaccess.debug
+
+See the description of the access logger below. This flag is
+equivalent to enabling the access logger with "info" level.
+
+
+SYSTEM PROPERTY: -Dnashorn.compiler.ints.disable
+
+This flag prevents ints and longs (non double values) from being used
+for any primitive representation in the lowered IR. This is default
+false, i.e Lower will attempt to use integer variables as long as it
+can. For example, var x = 17 would try to use x as an integer, unless
+other operations occur later that require coercion to wider type, for
+example x *= 17.1;
+
+
+SYSTEM PROPERTY: -Dnashorn.compiler.intarithmetic 
+
+Arithmetic operations in Nashorn (except bitwise ones) typically
+coerce the operands to doubles (as per the JavaScript spec). To switch
+this off and remain in integer mode, for example for "var x = a&b; var
+y = c&d; var z = x*y;", use this flag. This will force the
+multiplication of variables that are ints to be done with the IMUL
+bytecode and the result "z" to become an int.
+
+WARNING: Note that is is experimental only to ensure that type support
+exists for all primitive types. The generated code is unsound. This
+will be the case until we do optimizations based on it. There is a CR
+in Nashorn to do better range analysis, and ensure that this is only
+done where the operation can't overflow into a wider type. Currently
+no overflow checking is done, so at the moment, until range analysis
+has been completed, this option is turned off.
+
+We've experimented by using int arithmetic for everything and putting
+overflow checks afterwards, which would recompute the operation with
+the correct precision, but have yet to find a configuration where this
+is faster than just using doubles directly, even if the int operation
+does not overflow. Getting access to a JVM intrinsic that does branch
+on overflow would probably alleviate this.
+
+There is also a problem with this optimistic approach if the symbol
+happens to reside in a local variable slot in the bytecode, as those
+are strongly typed. Then we would need to split large sections of
+control flow, so this is probably not the right way to go, while range
+analysis is. There is a large difference between integer bytecode
+without overflow checks and double bytecode. The former is
+significantly faster.
+
+
+SYSTEM PROPERTY: -Dnashorn.codegen.debug, -Dnashorn.codegen.debug.trace=<x>
+
+See the description of the codegen logger below.
+
+
+SYSTEM_PROPERTY: -Dnashorn.fields.debug
+
+See the description on the fields logger below.
+
+
+SYSTEM PROPERTY: -Dnashorn.fields.dual
+
+When this property is true, Nashorn will attempt to use primitive
+fields for AccessorProperties (currently just AccessorProperties, not
+spill properties). Memory footprint for script objects will increase,
+as we need to maintain both a primitive field (a long) as well as an
+Object field for the property value. Ints are represented as the 32
+low bits of the long fields. Doubles are represented as the
+doubleToLongBits of their value. This way a single field can be used
+for all primitive types. Packing and unpacking doubles to their bit
+representation is intrinsified by the JVM and extremely fast.
+
+While dual fields in theory runs significantly faster than Object
+fields due to reduction of boxing and memory allocation overhead,
+there is still work to be done to make this a general purpose
+solution. Research is ongoing.
+
+In the future, this might complement or be replaced by experimental
+feature sun.misc.TaggedArray, which has been discussed on the mlvm
+mailing list. TaggedArrays are basically a way to share data space
+between primitives and references, and have the GC understand this.
+
+As long as only primitive values are written to the fields and enough
+type information exists to make sure that any reads don't have to be
+uselessly boxed and unboxed, this is significantly faster than the
+standard "Objects only" approach that currently is the default. See
+test/examples/dual-fields-micro.js for an example that runs twice as
+fast with dual fields as without them. Here, the compiler, can
+determine that we are dealing with numbers only throughout the entire
+property life span of the properties involved.
+
+If a "real" object (not a boxed primitive) is written to a field that
+has a primitive representation, its callsite is relinked and an Object
+field is used forevermore for that particular field in that
+PropertyMap and its children, even if primitives are later assigned to
+it.
+
+As the amount of compile time type information is very small in a
+dynamic language like JavaScript, it is frequently the case that
+something has to be treated as an object, because we don't know any
+better. In reality though, it is often a boxed primitive is stored to
+an AccessorProperty. The fastest way to handle this soundly is to use
+a callsite typecheck and avoid blowing the field up to an Object. We
+never revert object fields to primitives. Ping-pong:ing back and forth
+between primitive representation and Object representation would cause
+fatal performance overhead, so this is not an option.
+
+For a general application the dual fields approach is still slower
+than objects only fields in some places, about the same in most cases,
+and significantly faster in very few. This is due the program using
+primitives, but we still can't prove it. For example "local_var a =
+call(); field = a;" may very well write a double to the field, but the
+compiler dare not guess a double type if field is a local variable,
+due to bytecode variables being strongly typed and later non
+interchangeable. To get around this, the entire method would have to
+be replaced and a continuation retained to restart from. We believe
+that the next steps we should go through are instead:
+
+1) Implement method specialization based on callsite, as it's quite
+frequently the case that numbers are passed around, but currently our
+function nodes just have object types visible to the compiler. For
+example "var b = 17; func(a,b,17)" is an example where two parameters
+can be specialized, but the main version of func might also be called
+from another callsite with func(x,y,"string").
+
+2) This requires lazy jitting as the functions have to be specialized
+per callsite.
+
+Even though "function square(x) { return x*x }" might look like a
+trivial function that can always only take doubles, this is not
+true. Someone might have overridden the valueOf for x so that the
+toNumber coercion has side effects. To fulfil JavaScript semantics,
+the coercion has to run twice for both terms of the multiplication
+even if they are the same object. This means that call site
+specialization is necessary, not parameter specialization on the form
+"function square(x) { var xd = (double)x; return xd*xd; }", as one
+might first think.
+
+Generating a method specialization for any variant of a function that
+we can determine by types at compile time is a combinatorial explosion
+of byte code (try it e.g. on all the variants of am3 in the Octane
+benchmark crypto.js). Thus, this needs to be lazy
+
+3) Possibly optimistic callsite writes, something on the form
+
+x = y; //x is a field known to be a primitive. y is only an object as
+far as we can tell
+
+turns into
+
+try {
+  x = (int)y;
+} catch (X is not an integer field right now | ClassCastException e) {
+  x = y;
+}
+
+Mini POC shows that this is the key to a lot of dual field performance
+in seemingly trivial micros where one unknown object, in reality
+actually a primitive, foils it for us. Very common pattern. Once we
+are "all primitives", dual fields runs a lot faster than Object fields
+only.
+
+We still have to deal with objects vs primitives for local bytecode
+slots, possibly through code copying and versioning.
+
+
+SYSTEM PROPERTY: -Dnashorn.compiler.symbol.trace=<x>
+
+When this property is set, creation and manipulation of any symbol
+named "x" will show information about when the compiler changes its
+type assumption, bytecode local variable slot assignment and other
+data. This is useful if, for example, a symbol shows up as an Object,
+when you believe it should be a primitive. Usually there is an
+explanation for this, for example that it exists in the global scope
+and type analysis has to be more conservative. In that case, the stack
+trace upon type change to object will usually tell us why.
+
+
+SYSTEM PROPERTY: nashorn.lexer.xmlliterals
+
+If this property it set, it means that the Lexer should attempt to
+parse XML literals, which would otherwise generate syntax
+errors. Warning: there are currently no unit tests for this
+functionality.
+
+XML literals, when this is enabled, end up as standard LiteralNodes in
+the IR.
+
+
+SYSTEM_PROPERTY: nashorn.debug
+
+If this property is set to true, Nashorn runs in Debug mode. Debug
+mode is slightly slower, as for example statistics counters are enabled
+during the run. Debug mode makes available a NativeDebug instance
+called "Debug" in the global space that can be used to print property
+maps and layout for script objects, as well as a "dumpCounters" method
+that will print the current values of the previously mentioned stats
+counters.
+
+These functions currently exists for Debug:
+
+"map" - print(Debug.map(x)) will dump the PropertyMap for object x to
+stdout (currently there also exist functions called "embedX", where X
+is a value from 0 to 3, that will dump the contents of the embed pool
+for the first spill properties in any script object and "spill", that
+will dump the contents of the growing spill pool of spill properties
+in any script object. This is of course subject to change without
+notice, should we change the script object layout.
+
+"methodHandle" - this method returns the method handle that is used
+for invoking a particular script function.
+
+"identical" - this method compares two script objects for reference
+equality. It is a == Java comparison
+
+"dumpCounters" - will dump the debug counters' current values to
+stdout.
+
+Currently we count number of ScriptObjects in the system, number of
+Scope objects in the system, number of ScriptObject listeners added,
+removed and dead (without references).
+
+We also count number of ScriptFunctions, ScriptFunction invocations
+and ScriptFunction allocations.
+
+Furthermore we count PropertyMap statistics: how many property maps
+exist, how many times were property maps cloned, how many times did
+the property map history cache hit, prevent new allocations, how many
+prototype invalidations were done, how many time the property map
+proto cache hit.
+
+Finally we count callsite misses on a per callsite bases, which occur
+when a callsite has to be relinked, due to a previous assumption of
+object layout being invalidated.
+
+
+SYSTEM PROPERTY: nashorn.methodhandles.debug,
+nashorn.methodhandles.debug=create
+
+If this property is enabled, each MethodHandle related call that uses
+the java.lang.invoke package gets its MethodHandle intercepted and an
+instrumentation printout of arguments and return value appended to
+it. This shows exactly which method handles are executed and from
+where. (Also MethodTypes and SwitchPoints). This can be augmented with
+more information, for example, instance count, by subclassing or
+further extending the TraceMethodHandleFactory implementation in
+MethodHandleFactory.java.
+
+If the property is specialized with "=create" as its option,
+instrumentation will be shown for method handles upon creation time
+rather than at runtime usage.
+
+
+SYSTEM PROPERTY: nashorn.methodhandles.debug.stacktrace
+
+This does the same as nashorn.methodhandles.debug, but when enabled
+also dumps the stack trace for every instrumented method handle
+operation. Warning: This is enormously verbose, but provides a pretty
+decent "grep:able" picture of where the calls are coming from.
+
+See the description of the codegen logger below for a more verbose
+description of this option
+
+
+SYSTEM PROPERTY: nashorn.scriptfunction.specialization.disable
+
+There are several "fast path" implementations of constructors and
+functions in the NativeObject classes that, in their original form,
+take a variable amount of arguments. Said functions are also declared
+to take Object parameters in their original form, as this is what the
+JavaScript specification mandates.
+
+However, we often know quite a lot more at a callsite of one of these
+functions. For example, Math.min is called with a fixed number (2) of
+integer arguments. The overhead of boxing these ints to Objects and
+folding them into an Object array for the generic varargs Math.min
+function is an order of magnitude slower than calling a specialized
+implementation of Math.min that takes two integers. Specialized
+functions and constructors are identified by the tag
+@SpecializedFunction and @SpecializedConstructor in the Nashorn
+code. The linker will link in the most appropriate (narrowest types,
+right number of types and least number of arguments) specialization if
+specializations are available.
+
+Every ScriptFunction may carry specializations that the linker can
+choose from. This framework will likely be extended for user defined
+functions. The compiler can often infer enough parameter type info
+from callsites for in order to generate simpler versions with less
+generic Object types. This feature depends on future lazy jitting, as
+there tend to be many calls to user defined functions, some where the
+callsite can be specialized, some where we mostly see object
+parameters even at the callsite.
+
+If this system property is set to true, the linker will not attempt to
+use any specialized function or constructor for native objects, but
+just call the generic one.
+
+
+SYSTEM PROPERTY: nashorn.tcs.miss.samplePercent=<x>
+
+When running with the trace callsite option (-tcs), Nashorn will count
+and instrument any callsite misses that require relinking. As the
+number of relinks is large and usually produces a lot of output, this
+system property can be used to constrain the percentage of misses that
+should be logged. Typically this is set to 1 or 5 (percent). 1% is the
+default value.
+
+
+SYSTEM_PROPERTY: nashorn.profilefile=<filename>
+
+When running with the profile callsite options (-pcs), Nashorn will
+dump profiling data for all callsites to stderr as a shutdown hook. To
+instead redirect this to a file, specify the path to the file using
+this system property.
+
+
+===============
+2. The loggers.
+===============
+
+The Nashorn loggers can be used to print per-module or per-subsystem
+debug information with different levels of verbosity. The loggers for
+a given subsystem are available are enabled by using
+
+--log=<systemname>[:<level>]
+
+on the command line.
+
+Here <systemname> identifies the name of the subsystem to be logged
+and the optional colon and level argument is a standard
+java.util.logging.Level name (severe, warning, info, config, fine,
+finer, finest). If the level is left out for a particular subsystem,
+it defaults to "info". Any log message logged as the level or a level
+that is more important will be output to stderr by the logger.
+
+Several loggers can be enabled by a single command line option, by
+putting a comma after each subsystem/level tuple (or each subsystem if
+level is unspecified). The --log option can also be given multiple
+times on the same command line, with the same effect.
+
+For example: --log=codegen,fields:finest is equivalent to
+--log=codegen:info --log=fields:finest
+
+The subsystems that currently support logging are:
+
+
+* compiler
+
+The compiler is in charge of turning source code and function nodes
+into byte code, and installs the classes into a class loader
+controlled from the Context. Log messages are, for example, about
+things like new compile units being allocated. The compiler has global
+settings that all the tiers of codegen (e.g. Lower and CodeGenerator)
+use.
+
+
+* codegen
+
+The code generator is the emitter stage of the code pipeline, and
+turns the lowest tier of a FunctionNode into bytecode. Codegen logging
+shows byte codes as they are being emitted, line number information
+and jumps. It also shows the contents of the bytecode stack prior to
+each instruction being emitted. This is a good debugging aid. For
+example:
+
+[codegen] #41                       line:2 (f)_afc824e 
+[codegen] #42                           load symbol x slot=2 
+[codegen] #43  {1:O}                    load int 0 
+[codegen] #44  {2:I O}                  dynamic_runtime_call GT:ZOI_I args=2 returnType=boolean 
+[codegen] #45                              signature (Ljava/lang/Object;I)Z 
+[codegen] #46  {1:Z}                    ifeq  ternary_false_5402fe28 
+[codegen] #47                           load symbol x slot=2 
+[codegen] #48  {1:O}                    goto ternary_exit_107c1f2f 
+[codegen] #49                       ternary_false_5402fe28 
+[codegen] #50                           load symbol x slot=2 
+[codegen] #51  {1:O}                    convert object -> double 
+[codegen] #52  {1:D}                    neg 
+[codegen] #53  {1:D}                    convert double -> object 
+[codegen] #54  {1:O}                ternary_exit_107c1f2f 
+[codegen] #55  {1:O}                    return object 
+
+shows a ternary node being generated for the sequence "return x > 0 ?
+x : -x"
+
+The first number on the log line is a unique monotonically increasing
+emission id per bytecode. There is no guarantee this is the same id
+between runs.  depending on non deterministic code
+execution/compilation, but for small applications it usually is. If
+the system variable -Dnashorn.codegen.debug.trace=<x> is set, where x
+is a bytecode emission id, a stack trace will be shown as the
+particular bytecode is about to be emitted. This can be a quick way to
+determine where it comes from without attaching the debugger. "Who
+generated that neg?"
+
+The --log=codegen option is equivalent to setting the system variable
+"nashorn.codegen.debug" to true.
+
+
+* lower
+
+The lowering annotates a FunctionNode with symbols for each identifier
+and transforms high level constructs into lower level ones, that the
+CodeGenerator consumes.
+
+Lower logging typically outputs things like post pass actions,
+insertions of casts because symbol types have been changed and type
+specialization information. Currently very little info is generated by
+this logger. This will probably change.
+
+
+* access
+
+The --log=access option is equivalent to setting the system variable
+"nashorn.callsiteaccess.debug" to true. There are several levels of
+the access logger, usually the default level "info" is enough
+
+It is very simple to create your own logger. Use the DebugLogger class
+and give the subsystem name as a constructor argument.
+
+
+* fields
+
+The --log=fields option (at info level) is equivalent to setting the
+system variable "nashorn.fields.debug" to true. At the info level it
+will only show info about type assumptions that were invalidated. If
+the level is set to finest, it will also trace every AccessorProperty
+getter and setter in the program, show arguments, return values
+etc. It will also show the internal representation of respective field
+(Object in the normal case, unless running with the dual field
+representation)
\ No newline at end of file
diff --git a/nashorn/docs/genshelldoc.js b/nashorn/docs/genshelldoc.js
new file mode 100644
index 00000000000..c3cf5c305e6
--- /dev/null
+++ b/nashorn/docs/genshelldoc.js
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Generate HTML documentation for shell tool. Re-run this tool to regenerate
+ * html doc when you change options.
+ *
+ * Usage:
+ *
+ *     jjs -scripting genshelldoc.js > shell.html
+ */
+
+var Options = Packages.jdk.nashorn.internal.runtime.options.Options;
+var title = "Nashorn command line shell tool";
+
+print(<<PREFIX
+<html>
+<head>
+<title>
+${title}
+</title>
+</head>
+<body>
+<h1>Usage</h1>
+<p>
+<code>
+<b>jjs &lt;options&gt; &lt;script-files&gt; [ -- &lt;script-arguments&gt; ]</b>
+</code>
+</p>
+
+<h1>${title} options</h1>
+
+<table border="0">
+<tr>
+<th>name</th>
+<th>type</th>
+<th>default</th>
+<th>description</th>
+</tr>
+PREFIX);
+
+for each (opt in Options.validOptions) {
+
+var isTimezone = (opt.type == "timezone");   
+var defValue = opt.defaultValue;
+if (defValue == null) {
+    defValue = "&lt;none&gt;";
+}
+
+if (isTimezone) {
+    // don't output current user's timezone
+    defValue = "&lt;default-timezone&gt;"
+}
+
+print(<<ROW
+  <tr>
+  <td><b>${opt.name} ${opt.shortName == null? "" : opt.shortName}</b></td>
+  <td>${opt.type}</td>
+  <td>${defValue}</td>
+  <td>${opt.description}</td>
+  </tr>
+ROW);
+
+}
+
+print(<<SUFFIX
+</table>
+</body>
+</html>
+SUFFIX);
diff --git a/nashorn/make/Makefile b/nashorn/make/Makefile
new file mode 100644
index 00000000000..7d768708853
--- /dev/null
+++ b/nashorn/make/Makefile
@@ -0,0 +1,224 @@
+#
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# Makefile for nashorn: wrapper around Ant build.xml file
+
+#
+# On Solaris, the standard 'make' utility will not work with these makefiles.
+#    This little rule is only understood by Solaris make, and is harmless
+#    when seen by the GNU make tool. If using Solaris make, this causes the
+#    make command to fail.
+#
+SUN_MAKE_TEST:sh = @echo "ERROR: PLEASE USE GNU VERSION OF MAKE"; exit 33
+
+#
+# Minimal platform defs
+# Need FullPath because we can't rely on gnumake abspath, until we use v3.81
+#
+
+SYSTEM_UNAME := $(shell uname)
+
+# Where is unwanted output to be delivered?
+# On Windows, MKS uses the special file "NUL", cygwin uses the customary unix file.
+ifeq ($(SYSTEM_UNAME), Windows_NT)
+DEV_NULL = NUL
+else
+DEV_NULL = /dev/null 
+endif
+
+ifneq (,$(findstring CYGWIN,$(SYSTEM_UNAME)))
+USING_CYGWIN = true
+endif
+
+ifdef USING_CYGWIN
+define FullPath
+$(shell cygpath -a -s -m $1 2> $(DEV_NULL))
+endef
+else
+define FullPath
+$(shell cd $1 2> $(DEV_NULL) && pwd)
+endef
+endif
+
+#
+# Makefile args
+#
+
+ifdef QUIET
+  ANT_OPTIONS += -quiet
+endif
+
+ifdef VERBOSE
+  ANT_OPTIONS += -verbose -debug
+endif
+
+ifdef JDK_VERSION
+  ANT_OPTIONS += -Djdk.version=$(JDK_VERSION)
+endif 
+
+ifdef FULL_VERSION
+  ANT_OPTIONS += -Dfull.version='$(FULL_VERSION)' # will contain spaces
+endif 
+
+ifdef MILESTONE
+ifneq ($(MILESTONE),fcs)
+  ANT_OPTIONS += -Dmilestone=$(MILESTONE)
+else
+  ANT_OPTIONS += -Drelease=$(JDK_VERSION)
+endif
+endif
+
+ifdef BUILD_NUMBER
+  ANT_OPTIONS += -Dbuild.number=$(BUILD_NUMBER)
+else
+  ifdef JDK_BUILD_NUMBER
+    ANT_OPTIONS += -Dbuild.number=$(JDK_BUILD_NUMBER)
+  endif
+endif
+
+ifeq ($(VARIANT), DBG)
+  ANT_OPTIONS += -Djavac.debug=true
+else
+  ifeq ($(VARIANT), OPT)
+    ANT_OPTIONS += -Djavac.debug=false
+  endif
+endif
+
+ifeq ($(DEBUG_CLASSFILES), true)
+  ANT_OPTIONS += -Djavac.debug=true
+  ANT_OPTIONS += -Ddebug.classfiles=true
+endif
+
+# Note: jdk/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN)
+# and the somewhat misnamed CLASS_VERSION (-target NN)
+ifdef TARGET_CLASS_VERSION
+  ANT_OPTIONS += -Djavac.target=$(TARGET_CLASS_VERSION)
+else
+  ifdef JAVAC_TARGET_ARG 
+    ANT_OPTIONS += -Djavac.target=$(JAVAC_TARGET_ARG)
+  endif
+endif 
+
+ifdef SOURCE_LANGUAGE_VERSION
+  ANT_OPTIONS += -Djavac.source=$(SOURCE_LANGUAGE_VERSION)
+else
+  ifdef JAVAC_SOURCE_ARG 
+    ANT_OPTIONS += -Djavac.source=$(JAVAC_SOURCE_ARG)
+  endif
+endif 
+
+ifdef ALT_BOOTDIR
+  ANT_OPTIONS += -Dboot.java.home=$(ALT_BOOTDIR)
+  ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
+endif
+
+# To facilitate bootstrapping, much of langtools can be compiled with (just)
+# a boot JDK. However, some source files need to be compiled against 
+# new JDK API. In a bootstrap build, an import JDK may not be available,
+# so build.xml can also build against the source files in a jdk repo,
+# in which case it will automatically generate stub files for the new JDK API.
+ifdef JDK_TOPDIR
+  ANT_OPTIONS += -Dimport.jdk=$(JDK_TOPDIR)
+else 
+  ifdef ALT_JDK_TOPDIR
+    ANT_OPTIONS += -Dimport.jdk=$(ALT_JDK_TOPDIR)
+  else 
+    ifdef ALT_JDK_IMPORT_PATH
+      ANT_OPTIONS += -Dimport.jdk=$(ALT_JDK_IMPORT_PATH)
+    endif
+  endif
+endif
+
+ifdef ALT_OUTPUTDIR
+  OUTPUTDIR = $(ALT_OUTPUTDIR)
+  ANT_OPTIONS += -Dbuild.dir=$(ALT_OUTPUTDIR)/build
+  ANT_OPTIONS += -Ddist.dir=$(ALT_OUTPUTDIR)/dist
+else
+  OUTPUTDIR = ..
+endif
+#ABS_OUTPUTDIR = $(abspath $(OUTPUTDIR))
+ABS_OUTPUTDIR = $(call FullPath,$(OUTPUTDIR))
+
+ANT_TMPDIR = $(ABS_OUTPUTDIR)/build/ant-tmp
+ANT_OPTS = ANT_OPTS=-Djava.io.tmpdir='$(ANT_TMPDIR)'
+
+ifdef FINDBUGS_HOME
+  ANT_OPTIONS += -Dfindbugs.home=$(FINDBUGS_HOME)
+endif
+
+ifdef ANT_HOME
+  ANT = $(ANT_HOME)/bin/ant
+  ifneq ($(shell test -x $(ANT) && echo OK), OK)
+    $(error $(ANT) not found -- please update ANT_HOME)
+  endif
+else
+  ANT = ant
+  ifneq ($(shell test -x "`which $(ANT)`" && echo OK), OK)
+    $(error 'ant' not found -- please set ANT_HOME or put 'ant' on your PATH)
+  endif
+endif
+
+# Default target and expected 'do everything' target
+# comments docs to avoid too many ASM warnings
+# all: test docs
+
+all: test
+
+# Standard make clobber target
+clobber: clean
+
+# All ant targets of interest
+ANT_TARGETS = clean jar javadoc shelldoc docs test test262 test262parallel # for now
+
+# Create diagnostics log (careful, ant 1.8.0 -diagnostics always does an exit 1)
+$(OUTPUTDIR)/build/ant-diagnostics.log:
+	@mkdir -p $(OUTPUTDIR)/build $(ANT_TMPDIR)
+	@$(RM) $@
+	$(ANT_JAVA_HOME) $(ANT_OPTS) $(ANT) -diagnostics > $@ ; \
+	  $(ANT_JAVA_HOME) $(ANT_OPTS) $(ANT) -version >> $@
+
+# Create a make target for each
+$(ANT_TARGETS): $(OUTPUTDIR)/build/ant-diagnostics.log
+	@ mkdir -p $(OUTPUTDIR)/build $(ANT_TMPDIR)
+	$(ANT_JAVA_HOME) $(ANT_OPTS) $(ANT) $(ANT_OPTIONS) $@
+
+#-------------------------------------------------------------------
+#
+# Targets for Oracle's internal JPRT build system
+
+CD = cd
+ZIP = zip
+
+JPRT_ARCHIVE_BUNDLE=$(ABS_OUTPUTDIR)/$(JPRT_BUILD_FLAVOR)-bundle.zip
+
+jprt_build_product jprt_build_debug jprt_build_fastdebug: all
+	( $(CD) $(OUTPUTDIR) && \
+	  $(ZIP) -q -r $(JPRT_ARCHIVE_BUNDLE) build dist )
+
+#-------------------------------------------------------------------
+
+# Declare these phony (not filenames)
+.PHONY: $(ANT_TARGETS) all clobber \
+	jprt_build_product jprt_build_debug jprt_build_fastdebug
diff --git a/nashorn/make/build-benchmark.xml b/nashorn/make/build-benchmark.xml
new file mode 100644
index 00000000000..b6dce19565e
--- /dev/null
+++ b/nashorn/make/build-benchmark.xml
@@ -0,0 +1,348 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ 
+ This code is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 2 only, as
+ published by the Free Software Foundation.
+ 
+ This code is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ version 2 for more details (a copy is included in the LICENSE file that
+ accompanied this code).
+ 
+ You should have received a copy of the GNU General Public License version
+ 2 along with this work; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ 
+ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ or visit www.oracle.com if you need additional information or have any
+ questions.
+-->
+<project name="nashorn-benchmarks" default="all" basedir="..">
+
+  <target name="octane-init" depends="jar">
+    <fileset id="octane-set"
+	     dir="${octane-test-sys-prop.test.js.roots}"
+	     excludes="${octane-test-sys-prop.test.js.exclude.list}">
+      <include name="**/*.js"/>
+    </fileset>
+    <pathconvert pathsep=" " property="octane-tests" refid="octane-set"/>
+    <property name="extra-arg" value=""/>
+  </target>
+
+  <!-- box2d -->
+  <target name="box2d-init">
+    <property name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/box2d.js"/>
+  </target>
+
+  <target name="octane-box2d" depends="jar, box2d-init, octane-verbose">
+    <antcall target="run-octane"/>
+  </target>
+
+  <target name="octane-box2d-v8" depends="jar, box2d-init, octane-verbose">
+    <antcall target="run-octane-v8"/>
+  </target>
+
+  <target name="octane-box2d-rhino" depends="jar, box2d-init, octane-verbose">
+    <antcall target="run-octane-rhino"/>
+  </target>
+
+  <!-- code-load -->  
+  <target name="code-load-init">
+    <property name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/code-load.js"/>
+  </target>
+
+  <target name="octane-code-load" depends="jar, code-load-init, octane-verbose">
+    <antcall target="run-octane"/>
+  </target>
+
+  <target name="octane-code-load-v8" depends="jar, code-load-init, octane-verbose">
+    <antcall target="run-octane-v8"/>
+  </target>
+
+  <target name="octane-code-load-rhino" depends="jar, code-load-init, octane-verbose">
+    <antcall target="run-octane-rhino"/>
+  </target>
+
+  <!-- crypto -->
+  <target name="crypto-init">
+    <property name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/crypto.js"/>
+  </target>
+
+  <target name="octane-crypto" depends="jar, crypto-init, octane-verbose">
+    <antcall target="run-octane"/>
+  </target>
+
+  <target name="octane-crypto-v8" depends="jar, crypto-init, octane-verbose">
+    <antcall target="run-octane-v8"/>
+  </target>
+
+  <target name="octane-crypto-rhino" depends="jar, crypto-init, octane-verbose">
+    <antcall target="run-octane-rhino"/>
+  </target>
+
+  <!-- deltablue -->
+  <target name="deltablue-init">
+    <property name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/deltablue.js"/>
+  </target>
+
+  <target name="octane-deltablue" depends="jar, deltablue-init, octane-verbose">
+    <antcall target="run-octane"/>
+  </target>
+
+  <target name="octane-deltablue-v8" depends="jar, deltablue-init, octane-verbose">
+    <antcall target="run-octane-v8"/>
+  </target>
+
+  <target name="octane-deltablue-rhino" depends="jar, deltablue-init, octane-verbose">
+    <antcall target="run-octane-rhino"/>
+  </target>
+
+  <!-- earley-boyer -->
+  <target name="earley-boyer-init">
+    <property name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/earley-boyer.js"/>
+  </target>
+
+  <target name="octane-earley-boyer" depends="jar, earley-boyer-init, octane-verbose">
+    <antcall target="run-octane"/>
+  </target>
+
+  <target name="octane-earley-boyer-v8" depends="jar, earley-boyer-init, octane-verbose">
+    <antcall target="run-octane-v8"/>
+  </target>
+
+  <target name="octane-earley-boyer-rhino" depends="jar, earley-boyer-init, octane-verbose">
+    <antcall target="run-octane-rhino"/>
+  </target>
+
+  <!-- gbemu -->  
+  <target name="gbemu-init">
+    <property name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/gbemu.js"/>
+  </target>
+
+  <target name="octane-gbemu" depends="jar, gbemu-init, octane-verbose">
+    <antcall target="run-octane"/>
+  </target>
+
+  <target name="octane-gbemu-v8" depends="jar, gbemu-init, octane-verbose">
+    <antcall target="run-octane-v8"/>
+  </target>
+
+  <target name="octane-gbemu-rhino" depends="jar, gbemu-init, octane-verbose">
+    <antcall target="run-octane-rhino"/>
+  </target>
+
+  <!-- navier-stokes -->
+  <target name="navier-stokes-init">
+    <property name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/navier-stokes.js"/>
+  </target>
+
+  <target name="octane-navier-stokes" depends="jar, navier-stokes-init, octane-verbose">
+    <antcall target="run-octane"/>
+  </target>
+
+  <target name="octane-navier-stokes-v8" depends="jar, navier-stokes-init, octane-verbose">
+    <antcall target="run-octane-v8"/>
+  </target>
+
+  <target name="octane-navier-stokes-rhino" depends="jar, navier-stokes-init, octane-verbose">
+    <antcall target="run-octane-rhino"/>
+  </target>
+
+  <!-- pdfjs -->  
+  <target name="pdfjs-init">
+    <property name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/pdfjs.js"/>
+  </target>
+
+  <target name="octane-pdfjs" depends="jar, pdfjs-init, octane-verbose">
+    <antcall target="run-octane"/>
+  </target>
+
+  <target name="octane-pdfjs-v8" depends="jar, pdfjs-init, octane-verbose">
+    <antcall target="run-octane-v8"/>
+  </target>
+
+  <target name="octane-pdfjs-rhino" depends="jar, pdfjs-init, octane-verbose">
+    <antcall target="run-octane-rhino"/>
+  </target>
+
+  <!-- raytrace -->
+  <target name="raytrace-init">
+    <property name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/raytrace.js"/>
+  </target>
+
+  <target name="octane-raytrace" depends="jar, raytrace-init, octane-verbose">
+    <antcall target="run-octane"/>
+  </target>
+
+  <target name="octane-raytrace-v8" depends="jar, raytrace-init, octane-verbose">
+    <antcall target="run-octane-v8"/>
+  </target>
+
+  <target name="octane-raytrace-rhino" depends="jar, raytrace-init, octane-verbose">
+    <antcall target="run-octane-rhino"/>
+  </target>
+
+  <!-- regexp -->
+  <target name="regexp-init">
+    <property name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/regexp.js"/>
+  </target>
+
+  <target name="octane-regexp" depends="jar, regexp-init, octane-verbose">
+    <antcall target="run-octane"/>
+  </target>
+
+  <target name="octane-regexp-octane-v8" depends="jar, regexp-init, octane-verbose">
+    <antcall target="run-octane-v8"/>
+  </target>
+
+  <target name="octane-regexp-rhino" depends="jar, regexp-init, octane-verbose">
+    <antcall target="run-octane-rhino"/>
+  </target>
+
+
+  <!-- splay -->
+  <target name="splay-init">
+    <property name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/splay.js"/>
+  </target>
+
+  <target name="octane-splay" depends="jar, splay-init, octane-verbose">
+    <antcall target="run-octane"/>
+  </target>
+
+  <target name="octane-splay-v8" depends="jar, splay-init, octane-verbose">
+    <antcall target="run-octane-v8"/>
+  </target>
+
+  <target name="octane-splay-rhino" depends="jar, splay-init, octane-verbose">
+    <antcall target="run-octane-rhino"/>
+  </target>
+
+  <target name="octane-verbose">
+    <property name="extra-arg" value="--verbose"/>
+  </target>
+
+  <!-- run octane benchmarks using Nashorn as runtime -->
+  <target name="octane" depends="octane-init">
+    <antcall target="run-octane"/>
+  </target>
+
+  <!-- run octane benchmarks using octane as runtime -->
+  <target name="octane-v8" depends="octane-init">
+    <antcall target="run-octane-v8"/>
+  </target>
+
+  <!-- run octane benchmarks using Rhino as runtime -->
+  <target name="octane-rhino" depends="octane-init">
+    <antcall target="run-octane-rhino"/>
+  </target>
+  
+  <target name="run-octane">
+    <java classname="${nashorn.shell.tool}"
+          classpath="${run.test.classpath}"
+          fork="true"
+          dir=".">
+      <jvmarg line="${boot.class.path}"/>
+      <jvmarg line="${ext.class.path}"/>
+      <jvmarg line="${run.test.jvmargs.octane}"/>
+      <arg value="${octane-test-sys-prop.test.js.framework}"/>
+      <arg value="--"/>
+      <arg value="${octane-tests}"/>
+      <arg value="--runtime"/>
+      <arg value="Nashorn"/>
+      <arg value="--verbose"/>
+      <arg value="--iterations 8"/>
+      <arg value="${extra-arg}"/>
+    </java>
+  </target>
+
+  <target name="run-octane-v8">
+    <exec executable="${v8.shell}">
+      <arg value="${octane-test-sys-prop.test.js.framework}"/>
+      <arg value="--"/>
+      <arg value="${octane-tests}"/>      
+      <arg value="--runtime"/>
+      <arg value="v8"/>
+      <arg value="--verbose"/>
+      <arg value="--iterations 8"/>
+      <arg value="${extra-arg}"/>
+    </exec>
+  </target>
+
+  <target name="run-octane-rhino">
+    <java jar="${rhino.jar}"
+          classpath="${run.test.classpath}"
+          fork="true"
+          dir=".">
+      <jvmarg line="${boot.class.path}"/>
+      <jvmarg line="${run.test.jvmargs.octane}"/>
+      <arg value="${octane-test-sys-prop.test.js.framework}"/>
+      <arg value="${octane-tests}"/>
+      <arg value="--runtime"/>
+      <arg value="Rhino"/>
+      <arg value="--verbose"/>
+      <arg value="--iterations 8"/>
+      <arg value="${extra-arg}"/>
+    </java>
+  </target>
+
+  <!-- run octane with all known runtimes for comparison -->
+  <target name="octane-all" depends="octane, octane-v8, octane-rhino">
+    <exec executable="${v8.shell}">
+      <arg value="${octane-test-sys-prop.test.js.framework}"/>
+      <arg value="${octane-tests}/"/>
+    </exec>
+  </target>
+   
+  <target name="sunspider-init" depends="jar">
+    <fileset id="sunspider-set"
+	     dir="${sunspider-test-sys-prop.test.js.roots}"
+	     excludes="${sunspider-test-sys-prop.test.js.exclude.list}">
+      <include name="**/*.js"/>
+    </fileset>
+    <pathconvert pathsep=" " property="sunspider-tests" refid="sunspider-set"/>
+  </target>
+
+  <!-- run sunspider with Nashorn -->
+  <target name="sunspider" depends="sunspider-init">
+    <java classname="${nashorn.shell.tool}"
+          classpath="${run.test.classpath}"
+          fork="true"
+          dir=".">
+      <jvmarg line="${boot.class.path}"/>
+      <jvmarg line="${ext.class.path}"/>
+      <jvmarg line="${run.test.jvmargs}"/>
+      <arg value="-timezone=PST"/>
+      <arg value="--class-cache-size=50"/>
+      <arg value="${sunspider-test-sys-prop.test.js.framework}"/>
+      <arg value="--"/>
+      <arg value="${sunspider-tests}/"/>
+    </java>
+  </target>
+
+  <!-- run sunspider with v8 -->
+  <target name="sunspider-v8" depends="sunspider-init">
+    <exec executable="${v8.shell}">
+      <arg value="${sunspider-test-sys-prop.test.js.framework}"/>
+      <arg value="--"/>
+      <arg value="${sunspider-tests}/"/>
+    </exec>
+  </target>
+
+  <!-- run sunspider with Rhino -->
+  <target name="sunspider-rhino" depends="sunspider-init">
+    <java jar="${rhino.jar}"
+          classpath="${run.test.classpath}"
+          fork="true"
+          dir=".">
+      <jvmarg line="${boot.class.path}"/>
+      <jvmarg line="${run.test.jvmargs}"/>
+      <arg value="${sunspider-test-sys-prop.test.js.framework}"/>
+      <arg value="${sunspider-tests}/"/>
+    </java>
+  </target>
+
+</project>
diff --git a/nashorn/make/build-nasgen.xml b/nashorn/make/build-nasgen.xml
new file mode 100644
index 00000000000..fe5a67820bb
--- /dev/null
+++ b/nashorn/make/build-nasgen.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ 
+ This code is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 2 only, as
+ published by the Free Software Foundation.
+ 
+ This code is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ version 2 for more details (a copy is included in the LICENSE file that
+ accompanied this code).
+ 
+ You should have received a copy of the GNU General Public License version
+ 2 along with this work; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ 
+ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ or visit www.oracle.com if you need additional information or have any
+ questions.
+-->
+<project name="build-nasgen" default="run-nasgen" basedir="..">
+    <description>Builds and runs nasgen.</description>
+    <import file="build.xml"/>
+
+    <target name="build-nasgen" depends="compile-asm">
+        <ant inheritAll="false" dir="${basedir}/buildtools/nasgen"
+            antfile="build.xml" target="jar"/>
+    </target>
+
+    <target name="run-nasgen" depends="build-nasgen">
+        <java classname="${nasgen.tool}" fork="true" failonerror="true">
+            <classpath>
+                <pathelement location="${basedir}/jcov2/lib/jcov_j2se_rt.jar"/>
+                <pathelement location="${basedir}/buildtools/nasgen/dist/nasgen.jar"/>
+                <pathelement path="${basedir}/build/classes"/>
+            </classpath>
+            <arg value="${basedir}/build/classes"/>
+            <arg value="jdk.nashorn.internal.objects"/>
+            <arg value="${basedir}/build/classes"/>
+        </java>
+
+        <move todir="${basedir}/build/classes/jdk/nashorn/internal/objects">
+            <fileset dir="${basedir}/build/classes/jdk/nashorn/internal/objects"/>
+            <mapper type="glob" from="*.class" to="*.clazz"/>
+        </move>
+    </target>
+
+    <target name="run-nasgen-eclipse">
+        <mkdir dir="${basedir}/build/eclipse/.nasgentmp"/>
+
+        <java classname="jdk.nashorn.internal.tools.nasgen.Main" fork="true" failonerror="true">
+            <classpath>
+                <pathelement location="${basedir}/buildtools/nasgen/dist/nasgen.jar"/>
+                <pathelement path="${basedir}/build/eclipse"/>
+            </classpath>
+            <arg value="${basedir}/build/eclipse"/>
+            <arg value="jdk.nashorn.internal.objects"/>
+            <arg value="${basedir}/build/eclipse/.nasgentmp"/>
+        </java>
+
+        <move todir="${basedir}/build/eclipse/jdk/nashorn/internal/objects">
+            <fileset dir="${basedir}/build/eclipse/.nasgentmp/jdk/nashorn/internal/objects">
+                <include name="*.class"/>
+            </fileset>
+            <mapper type="glob" from="*.class" to="*.clazz"/>
+        </move>
+
+        <delete includeemptydirs="true"><fileset dir="${basedir}/build/eclipse/.nasgentmp" includes="**"/></delete>
+
+        <copy todir="${basedir}/build/eclipse/jdk/nashorn/internal/objects" preservelastmodified="true">
+            <fileset dir="${basedir}/build/eclipse/jdk/nashorn/internal/objects">
+                <include name="**/*.class"/>
+            </fileset>
+            <mapper type="glob" from="*.class" to="*.clazz"/>
+        </copy>
+    </target>
+
+    <target name="clean-nasgen">
+        <ant inheritAll="false" dir="${basedir}/buildtools/nasgen"
+            antfile="build.xml" target="clean"/>
+    </target>
+
+</project>
diff --git a/nashorn/make/build.xml b/nashorn/make/build.xml
new file mode 100644
index 00000000000..79669a8020d
--- /dev/null
+++ b/nashorn/make/build.xml
@@ -0,0 +1,355 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+
+ This code is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 2 only, as
+ published by the Free Software Foundation.
+
+ This code is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ version 2 for more details (a copy is included in the LICENSE file that
+ accompanied this code).
+
+ You should have received a copy of the GNU General Public License version
+ 2 along with this work; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ or visit www.oracle.com if you need additional information or have any
+ questions.
+-->
+<project name="nashorn" default="all" basedir="..">
+  <import file="build-nasgen.xml"/>
+  <import file="build-benchmark.xml"/>
+
+  <target name="init">
+    <loadproperties srcFile="make/project.properties"/>
+    <path id="nashorn.ext.path">
+      <pathelement location="${dist.dir}"/>
+    </path>
+    <property name="ext.class.path" value="-Djava.ext.dirs=&quot;${toString:nashorn.ext.path}&quot;"/>
+  </target>
+
+  <target name="prepare" depends="init">
+    <mkdir dir="${build.dir}"/>
+    <mkdir dir="${build.classes.dir}"/>
+    <mkdir dir="${build.classes.dir}/META-INF/services"/>
+    <mkdir dir="${build.test.classes.dir}"/>
+    <mkdir dir="${dist.dir}"/>
+    <mkdir dir="${dist.javadoc.dir}"/>
+    <!-- check if JDK already has ASM classes -->
+    <available property="asm.available" classname="jdk.internal.org.objectweb.asm.Type"/>
+    <!-- check if testng.jar is avaiable -->
+    <available property="testng.available" file="${file.reference.testng.jar}"/>
+  </target>
+
+  <target name="clean" depends="init, clean-nasgen">
+    <delete includeemptydirs="true">
+      <fileset dir="${build.dir}" excludes="${dynalink.dir.name}/**/*" erroronmissingdir="false"/>
+    </delete>
+    <delete dir="${dist.dir}"/>
+  </target>
+
+  <target name="clean-dynalink">
+    <delete dir="${dynalink.dir}"/>
+  </target>
+
+  <target name="clean-all" depends="clean-dynalink, clean">
+    <delete dir="${build.dir}"/>
+  </target>
+
+  <!-- do it only if ASM is not available -->
+  <target name="compile-asm" depends="prepare" unless="asm.available">
+    <javac srcdir="${asm.src.dir}"
+           destdir="${build.classes.dir}"
+           excludes="**/optimizer/* **/xml/* **/attrs/*"
+           source="${javac.source}"
+           target="${javac.target}"
+           debug="${javac.debug}"
+           encoding="${javac.encoding}"
+           includeantruntime="false"/>
+  </target>
+
+  <target name="check-dynalink-uptodate" depends="init">
+    <property name="versioned.dynalink.jar" value="${dynalink.dir}/dynalink-${dynalink.jar.version}.jar"/>
+    <condition property="dynalink.uptodate">
+      <and>
+        <available file="${versioned.dynalink.jar}"/>
+        <filesmatch file1="${versioned.dynalink.jar}" file2="${dynalink.jar}"/>
+      </and>
+    </condition>
+  </target>
+
+  <target name="get-dynalink" depends="check-dynalink-uptodate" unless="dynalink.uptodate">
+    <mkdir dir="${dynalink.dir}"/>
+    <!-- Delete previous snapshots, if any -->
+    <delete>
+      <fileset dir="${dynalink.dir}" includes="*"/>
+    </delete>
+    <property name="dynalink.download.base.url" value="http://oss.sonatype.org/content/repositories/${dynalink.version.type}s/org/dynalang/dynalink/${dynalink.version}/dynalink-${dynalink.jar.version}"/>
+    <get src="${dynalink.download.base.url}.jar" dest="${versioned.dynalink.jar}" usetimestamp="true"/>
+    <get src="${dynalink.download.base.url}-sources.jar" dest="${dynalink.dir}/dynalink-sources.jar" usetimestamp="true"/>
+    <copy file="${versioned.dynalink.jar}" tofile="${dynalink.jar}" overwrite="true"/>
+  </target>
+
+  <target name="compile" depends="compile-asm, get-dynalink" description="Compiles nashorn">
+    <javac srcdir="${src.dir}"
+           destdir="${build.classes.dir}"
+           classpath="${javac.classpath}"
+           source="${javac.source}"
+           target="${javac.target}"
+           debug="${javac.debug}"
+           encoding="${javac.encoding}"
+           includeantruntime="false">
+      <compilerarg value="-Xlint:unchecked"/>
+      <compilerarg value="-Xlint:deprecation"/>
+      <compilerarg value="-XDignore.symbol.file"/>
+    </javac>
+    <copy todir="${build.classes.dir}/META-INF/services">
+       <fileset dir="${meta.inf.dir}/services/"/>
+    </copy>
+     <copy todir="${build.classes.dir}/jdk/nashorn/api/scripting/resources">
+       <fileset dir="${src.dir}/jdk/nashorn/api/scripting/resources/"/>
+    </copy>
+    <copy todir="${build.classes.dir}/jdk/nashorn/internal/runtime/resources">
+       <fileset dir="${src.dir}/jdk/nashorn/internal/runtime/resources/"/>
+    </copy>
+    <copy todir="${build.classes.dir}/jdk/nashorn/tools/resources">
+       <fileset dir="${src.dir}/jdk/nashorn/tools/resources/"/>
+    </copy>
+    <echo message="full=${nashorn.fullversion}" file="${build.classes.dir}/jdk/nashorn/internal/runtime/resources/version.properties"/>
+    <echo file="${build.classes.dir}/jdk/nashorn/internal/runtime/resources/version.properties" append="true">${line.separator}</echo>
+    <echo message="release=${nashorn.version}" file="${build.classes.dir}/jdk/nashorn/internal/runtime/resources/version.properties" append="true"/>
+  </target>
+
+  <target name="jar" depends="compile, run-nasgen" description="Creates nashorn.jar">
+    <jar jarfile="${dist.jar}" manifest="${meta.inf.dir}/MANIFEST.MF" index="true" filesetmanifest="merge">
+      <fileset dir="${build.classes.dir}"/>
+      <zipfileset src="${dynalink.jar}"/>
+      <manifest>
+        <attribute name="Archiver-Version" value="n/a"/>
+        <attribute name="Build-Jdk" value="${java.runtime.version}"/>
+        <attribute name="Built-By" value="n/a"/>
+        <attribute name="Created-By" value="Ant jar task"/>
+        <section name="jdk/nashorn/">
+          <attribute name="Implementation-Title" value="${nashorn.product.name}"/>
+          <attribute name="Implementation-Version" value="${nashorn.version}"/>
+        </section>
+      </manifest>
+    </jar>
+  </target>
+
+  <target name="javadoc" depends="compile-asm">
+    <javadoc destdir="${dist.javadoc.dir}" private="yes" use="yes" overview="src/overview.html" windowtitle="${nashorn.product.name} ${nashorn.version}">
+      <classpath>
+        <pathelement location="${build.classes.dir}"/>
+        <pathelement location="${dynalink.jar}"/>
+      </classpath>
+      <fileset dir="${src.dir}" includes="**/*.java"/>
+      <link href="http://docs.oracle.com/javase/7/docs/api"/>
+      <link href="http://szegedi.github.com/dynalink/0.4/javadoc"/>
+    </javadoc>
+  </target>
+
+  <!-- generate shell.html for shell tool documentation -->
+  <target name="shelldoc" depends="jar">
+    <java classname="${nashorn.shell.tool}" dir="${basedir}" output="${dist.dir}/shell.html" failonerror="true" fork="true">
+      <jvmarg line="${ext.class.path}"/>
+      <arg value="-scripting"/>
+      <arg value="docs/genshelldoc.js"/>
+    </java>
+  </target>
+
+  <!-- generate all docs -->
+  <target name="docs" depends="javadoc, shelldoc"/>
+
+  <!-- create .zip and .tar.gz for nashorn binaries and scripts. -->
+  <target name="dist" depends="jar">
+      <zip destfile="${build.zip}" basedir=".."
+          excludes="nashorn/bin/*.sh" includes="nashorn/bin/** nashorn/dist/**"/>
+      <tar destfile="${build.gzip}" basedir=".." compression="gzip"
+          excludes="nashorn/bin/*.sh" includes="nashorn/bin/** nashorn/dist/**"/>
+  </target>
+
+  <target name="compile-test" depends="compile, run-nasgen" if="testng.available">
+    <!-- testng task -->
+    <taskdef name="testng" classname="org.testng.TestNGAntTask"
+        classpath="${file.reference.testng.jar}"/>
+
+    <javac srcdir="${test.src.dir}"
+           destdir="${build.test.classes.dir}"
+           classpath="${javac.test.classpath}"
+           source="${javac.source}"
+           target="${javac.target}"
+           debug="${javac.debug}"
+           encoding="${javac.encoding}"
+           includeantruntime="false"/>
+  </target>
+
+  <target name="generate-policy-file">
+    <!-- Generating nashorn.policy file -->
+    <echo message="grant codeBase &quot;file:/${basedir}/dist/nashorn.jar&quot; {" file="${build.dir}/nashorn.policy"/>
+    <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
+    <echo message="permission java.security.AllPermission;" file="${build.dir}/nashorn.policy" append="true"/>
+    <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
+    <echo message="};" file="${build.dir}/nashorn.policy" append="true"/>
+    <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
+
+    <echo message="grant codeBase &quot;file:/${basedir}/build/test/classes&quot; {" file="${build.dir}/nashorn.policy" append="true"/>
+    <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
+    <echo message="    permission java.security.AllPermission;" file="${build.dir}/nashorn.policy" append="true"/>
+    <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
+    <echo message="};" file="${build.dir}/nashorn.policy" append="true"/>
+    <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
+
+    <echo message="grant codeBase &quot;file:/${basedir}/${file.reference.testng.jar}&quot; {" file="${build.dir}/nashorn.policy" append="true"/>
+    <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
+    <echo message="    permission java.security.AllPermission;" file="${build.dir}/nashorn.policy" append="true"/>
+    <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
+    <echo message="};" file="${build.dir}/nashorn.policy" append="true"/>
+    <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
+
+    <echo message="grant codeBase &quot;file:/${basedir}/test/script/basic/*&quot; {" file="${build.dir}/nashorn.policy" append="true"/>
+    <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
+    <echo message="    permission java.security.AllPermission;" file="${build.dir}/nashorn.policy" append="true"/>
+    <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
+    <echo message="};" file="${build.dir}/nashorn.policy" append="true"/>
+    <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
+
+    <echo message="grant codeBase &quot;file:/${basedir}/test/perf/*&quot; {" file="${build.dir}/nashorn.policy" append="true"/>
+    <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
+    <echo message="    permission java.security.AllPermission;" file="${build.dir}/nashorn.policy" append="true"/>
+    <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
+    <echo message="};" file="${build.dir}/nashorn.policy" append="true"/>
+    <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
+
+    <replace file="${build.dir}/nashorn.policy"><replacetoken>\</replacetoken><replacevalue>/</replacevalue></replace>    <!--hack for Windows - to make URLs with normal path separators -->
+    <replace file="${build.dir}/nashorn.policy"><replacetoken>//</replacetoken><replacevalue>/</replacevalue></replace>   <!--hack for Unix - to avoid leading // in URLs -->
+
+  </target>
+
+  <target name="check-external-tests">
+      <available file="${test.external.dir}/prototype" property="test-sys-prop.external.prototype"/>
+      <available file="${test.external.dir}/sunspider" property="test-sys-prop.external.sunspider"/>
+      <available file="${test.external.dir}/underscore" property="test-sys-prop.external.underscore"/>
+      <available file="${test.external.dir}/octane" property="test-sys-prop.external.octane"/>
+      <available file="${test.external.dir}/yui" property="test-sys-prop.external.yui"/>
+      <available file="${test.external.dir}/jquery" property="test-sys-prop.external.jquery"/>
+      <available file="${test.external.dir}/test262" property="test-sys-prop.external.test262"/>
+  </target>
+
+  <target name="check-testng" unless="testng.available">
+    <echo message="WARNING: TestNG not available, will not run tests. Please copy testng.jar under test/lib directory."/>
+  </target>
+
+  <target name="test" depends="jar, check-testng, check-external-tests, compile-test, generate-policy-file" if="testng.available">
+    <java classname="${nashorn.shell.tool}" fork="true" dir="${test.script.dir}/representations" output="${build.dir}/output1.log" error="${build.dir}/err.log">
+      <jvmarg line="${ext.class.path}"/>
+      <jvmarg line="-Dnashorn.fields.dual=true"/>
+      <arg value="NASHORN-592a.js"/>
+    </java>
+    <java classname="${nashorn.shell.tool}" fork="true" dir="${test.script.dir}/representations" output="${build.dir}/output2.log" error="${build.dir}/err.log">
+      <jvmarg line="${ext.class.path}"/>
+      <arg value="NASHORN-592a.js"/>
+    </java>
+    <condition property="representation-ok">
+      <filesmatch file1="${build.dir}/output1.log" file2="${build.dir}/output2.log"/>
+    </condition>
+    <fail unless="representation-ok">Representation test failed - output differs!</fail>
+    <fileset id="test.classes" dir="${build.test.classes.dir}">
+      <include name="**/access/*Test.class"/>
+      <include name="**/api/scripting/*Test.class"/>
+      <include name="**/codegen/*Test.class"/>
+      <include name="**/parser/*Test.class"/>
+      <include name="**/runtime/*Test.class"/>
+      <include name="**/framework/*Test.class"/>
+    </fileset>
+
+    <testng outputdir="${build.test.results.dir}" classfilesetref="test.classes"
+       verbose="${testng.verbose}" haltonfailure="true" useDefaultListeners="false" listeners="${testng.listeners}" workingDir="${basedir}">
+      <jvmarg line="${ext.class.path}"/>
+      <jvmarg line="${run.test.jvmargs} ${run.test.jvmsecurityargs}"/>
+      <propertyset>
+        <propertyref prefix="test-sys-prop."/>
+        <mapper from="test-sys-prop.*" to="*" type="glob"/>
+      </propertyset>
+      <classpath>
+          <pathelement path="${run.test.classpath}"/>
+      </classpath>
+    </testng>
+  </target>
+
+  <target name="test-basicparallel" depends="jar, check-testng, check-external-tests, compile-test, generate-policy-file">
+      <!-- use just build.test.classes.dir to avoid referring to TestNG -->
+      <java classname="${parallel.test.runner}" dir="${basedir}" classpath="${build.test.classes.dir}" failonerror="true" fork="true">
+      <jvmarg line="${ext.class.path}"/>
+      <jvmarg line="${run.test.jvmargs} ${run.test.jvmsecurityargs}"/>
+      <syspropertyset>
+          <propertyref prefix="test-sys-prop."/>
+          <mapper type="glob" from="test-sys-prop.*" to="*"/>
+      </syspropertyset>
+      </java>
+  </target>
+
+  <target name="test262" depends="jar, check-testng, check-external-tests, compile-test" if="testng.available">
+    <fileset id="test.classes" dir="${build.test.classes.dir}">
+       <include name="**/framework/*Test.class"/>
+    </fileset>
+
+    <testng outputdir="${build.test.results.dir}" classfilesetref="test.classes"
+       verbose="${testng.verbose}" haltonfailure="true" useDefaultListeners="false" listeners="${testng.listeners}" workingDir="${basedir}">
+      <jvmarg line="${ext.class.path}"/>
+      <jvmarg line="${run.test.jvmargs}"/>
+      <propertyset>
+        <propertyref prefix="test262-test-sys-prop."/>
+        <mapper from="test262-test-sys-prop.*" to="*" type="glob"/>
+      </propertyset>
+      <classpath>
+          <pathelement path="${run.test.classpath}"/>
+      </classpath>
+    </testng>
+  </target>
+
+  <target name="test262parallel" depends="test262-parallel"/>
+
+  <target name="test262-parallel" depends="jar, check-testng, check-external-tests, compile-test" if="testng.available">
+    <!-- use just build.test.classes.dir to avoid referring to TestNG -->
+    <java classname="${parallel.test.runner}" dir="${basedir}" classpath="${build.test.classes.dir}" fork="true">
+      <jvmarg line="${ext.class.path}"/>
+      <jvmarg line="${run.test.jvmargs}"/>
+      <syspropertyset>
+          <propertyref prefix="test262-test-sys-prop."/>
+          <mapper type="glob" from="test262-test-sys-prop.*" to="*"/>
+      </syspropertyset>
+    </java>
+  </target>
+
+  <target name="all" depends="test, docs"
+      description="Build, test and generate docs for nashorn"/>
+
+  <target name="run" depends="jar"
+      description="Run the shell with a sample script">
+    <java classname="${nashorn.shell.tool}" fork="true" dir="samples">
+        <jvmarg line="${ext.class.path}"/>
+        <jvmarg line="${run.test.jvmargs}"/>
+        <arg value="-dump-on-error"/>
+        <arg value="test.js"/>
+    </java>
+  </target>
+
+  <target name="debug" depends="jar"
+      description="Debug the shell with a sample script">
+    <java classname="${nashorn.shell.tool}" fork="true" dir="samples">
+        <jvmarg line="${ext.class.path}"/>
+        <jvmarg line="${run.test.jvmargs}"/>
+        <arg value="--print-code"/>
+        <arg value="--verify-code"/>
+        <arg value="--print-symbols"/>
+        <jvmarg value="-Dnashorn.codegen.debug=true"/>
+        <arg value="test.js"/>
+    </java>
+  </target>
+</project>
diff --git a/nashorn/make/nbproject/ide-file-targets.xml b/nashorn/make/nbproject/ide-file-targets.xml
new file mode 100644
index 00000000000..3a957ccd8a2
--- /dev/null
+++ b/nashorn/make/nbproject/ide-file-targets.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ 
+ This code is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 2 only, as
+ published by the Free Software Foundation.
+ 
+ This code is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ version 2 for more details (a copy is included in the LICENSE file that
+ accompanied this code).
+ 
+ You should have received a copy of the GNU General Public License version
+ 2 along with this work; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ 
+ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ or visit www.oracle.com if you need additional information or have any
+ questions.
+-->
+<project basedir=".." name="nashorn-IDE">
+    <property file="nbproject/nbjdk.properties"/>
+    <property location="${netbeans.user}/build.properties" name="user.properties.file"/>
+    <property file="${user.properties.file}"/>
+    <import file="jdk.xml"/>
+    <import file="${basedir}/build-init.xml"/>
+    <!-- TODO: edit the following target according to your needs -->
+    <!-- (more info: http://www.netbeans.org/kb/articles/freeform-config.html#runsingle) -->
+    <target depends="-jdk-init, init" name="debug-selected-file-in-src">
+        <fail unless="debug.class">Must set property 'debug.class'</fail>
+        <ant antfile="build.xml" inheritall="false" target="jar"/>
+        <nbjpdastart addressproperty="jpda.address" name="nashorn" transport="dt_socket">
+            <classpath path="${run.test.classpath}"/>
+        </nbjpdastart>
+        <java classname="${debug.class}" fork="false">
+            <classpath path="${run.test.classpath}"/>
+            <jvmarg line="${boot.class.path}"/>
+            <jvmarg value="-Xdebug"/>
+            <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+            <jvmarg line="${run.test.jvmargs}"/>
+            <arg value="${debug.class}"/>
+        </java>
+    </target>
+    <!-- TODO: edit the following target according to your needs -->
+    <!-- (more info: http://www.netbeans.org/kb/articles/freeform-config.html#runsingle) -->
+    <target depends="-jdk-init, init" name="run-selected-file-in-src">
+        <fail unless="run.class">Must set property 'run.class'</fail>
+        <ant antfile="build.xml" inheritall="false" target="jar"/>
+        <java classname="${run.class}" failonerror="true" fork="false">
+            <classpath path="${run.test.classpath}"/>
+            <jvmarg line="${boot.class.path}"/>
+            <jvmarg line="${run.test.jvmargs}"/>
+            <arg value="${run.class}"/>
+        </java>
+    </target>
+</project>
diff --git a/nashorn/make/nbproject/ide-targets.xml b/nashorn/make/nbproject/ide-targets.xml
new file mode 100644
index 00000000000..281672d8b5a
--- /dev/null
+++ b/nashorn/make/nbproject/ide-targets.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+
+ This code is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 2 only, as
+ published by the Free Software Foundation.
+
+ This code is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ version 2 for more details (a copy is included in the LICENSE file that
+ accompanied this code).
+
+ You should have received a copy of the GNU General Public License version
+ 2 along with this work; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ or visit www.oracle.com if you need additional information or have any
+ questions.
+-->
+
+<project basedir="../.." name="nashorn-IDE">
+    <import file="../build.xml"/>
+    <!-- TODO: edit the following target according to your needs -->
+    <!-- (more info: http://www.netbeans.org/kb/articles/freeform-config.html#debugj2se) -->
+    <target depends="jar" description="Run the shell with a sample script" name="debug-nb">
+        <nbjpdastart addressproperty="jpda.address" name="nashorn" transport="dt_socket">
+            <classpath path="${run.test.classpath}"/>
+        </nbjpdastart>
+        <java classname="jdk.nashorn.tools.Shell" classpath="${run.test.classpath}" dir="samples" fork="true">
+            <jvmarg line="${ext.class.path}"/> 
+            <jvmarg line="${run.test.jvmargs}"/>
+            <arg value="test.js"/>
+            <jvmarg value="-Xdebug"/>
+            <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+        </java>
+    </target>
+</project>
diff --git a/nashorn/make/nbproject/jdk.xml b/nashorn/make/nbproject/jdk.xml
new file mode 100644
index 00000000000..b6fa7ebba63
--- /dev/null
+++ b/nashorn/make/nbproject/jdk.xml
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8"?><project name="jdk" basedir=".">
+<!--
+ Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ 
+ This code is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 2 only, as
+ published by the Free Software Foundation.
+ 
+ This code is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ version 2 for more details (a copy is included in the LICENSE file that
+ accompanied this code).
+ 
+ You should have received a copy of the GNU General Public License version
+ 2 along with this work; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ 
+ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ or visit www.oracle.com if you need additional information or have any
+ questions.
+-->
+
+    
+    <description>
+        Permits selection of a JDK to use when building and running project.
+        See: http://www.netbeans.org/issues/show_bug.cgi?id=64160
+    </description>
+
+    <target name="-jdk-pre-preinit">
+        <condition property="nbjdk.active-or-nbjdk.home">
+            <or>
+                <and>
+                    <isset property="nbjdk.active"/>
+                    <not>
+                        <equals arg1="${nbjdk.active}" arg2="default_platform"/>
+                    </not>
+                </and>
+                <and>
+                    <isset property="nbjdk.home"/>
+                    <not>
+                        <isset property="nbjdk.home.defaulted"/>
+                    </not>
+                </and>
+            </or>
+        </condition>
+    </target>
+
+    <target xmlns:common="http://java.netbeans.org/freeform/jdk.xml" name="-jdk-preinit" depends="-jdk-pre-preinit" if="nbjdk.active-or-nbjdk.home">
+        <macrodef name="property" uri="http://java.netbeans.org/freeform/jdk.xml">
+            <attribute name="name"/>
+            <attribute name="value"/>
+            <sequential>
+                <property name="@{name}" value="${@{value}}"/>
+            </sequential>
+        </macrodef>
+        <common:property name="nbjdk.home" value="platforms.${nbjdk.active}.home"/>
+        <common:property name="nbjdk.javac.tmp" value="platforms.${nbjdk.active}.javac"/>
+        <condition property=".exe" value=".exe">
+            <os family="windows"/> 
+        </condition>
+        <property name=".exe" value=""/>
+        <condition property="nbjdk.javac" value="${nbjdk.home}/bin/javac${.exe}">
+            <equals arg1="${nbjdk.javac.tmp}" arg2="$${platforms.${nbjdk.active}.javac}"/>
+        </condition>
+        <property name="nbjdk.javac" value="${nbjdk.javac.tmp}"/>
+        <common:property name="nbjdk.java.tmp" value="platforms.${nbjdk.active}.java"/>
+        <condition property="nbjdk.java" value="${nbjdk.home}/bin/java${.exe}">
+            <equals arg1="${nbjdk.java.tmp}" arg2="$${platforms.${nbjdk.active}.java}"/>
+        </condition>
+        <property name="nbjdk.java" value="${nbjdk.java.tmp}"/>
+        <common:property name="nbjdk.javadoc.tmp" value="platforms.${nbjdk.active}.javadoc"/>
+        <condition property="nbjdk.javadoc" value="${nbjdk.home}/bin/javadoc${.exe}">
+            <equals arg1="${nbjdk.javadoc.tmp}" arg2="$${platforms.${nbjdk.active}.javadoc}"/>
+        </condition>
+        <property name="nbjdk.javadoc" value="${nbjdk.javadoc.tmp}"/>
+        <common:property name="nbjdk.bootclasspath.tmp" value="platforms.${nbjdk.active}.bootclasspath"/>
+        <condition property="nbjdk.bootclasspath" value="${nbjdk.home}/jre/lib/rt.jar">
+            <equals arg1="${nbjdk.bootclasspath.tmp}" arg2="$${platforms.${nbjdk.active}.bootclasspath}"/>
+        </condition>
+        <property name="nbjdk.bootclasspath" value="${nbjdk.bootclasspath.tmp}"/>
+        <condition property="nbjdk.valid">
+            <and>
+                <available file="${nbjdk.home}" type="dir"/>
+                <available file="${nbjdk.javac}" type="file"/>
+                <available file="${nbjdk.java}" type="file"/>
+                <available file="${nbjdk.javadoc}" type="file"/>
+                
+            </and>
+        </condition>
+        <echo level="verbose">nbjdk.active=${nbjdk.active} nbjdk.home=${nbjdk.home} nbjdk.java=${nbjdk.java} nbjdk.javac=${nbjdk.javac} nbjdk.javadoc=${nbjdk.javadoc} nbjdk.bootclasspath=${nbjdk.bootclasspath} nbjdk.valid=${nbjdk.valid} have-jdk-1.4=${have-jdk-1.4} have-jdk-1.5=${have-jdk-1.5}</echo>
+    </target>
+
+    <target name="-jdk-warn" depends="-jdk-preinit" if="nbjdk.active-or-nbjdk.home" unless="nbjdk.valid">
+        <property name="jdkhome.presumed" location="${java.home}/.."/>
+        <echo level="warning">Warning: nbjdk.active=${nbjdk.active} or nbjdk.home=${nbjdk.home} is an invalid Java platform; ignoring and using ${jdkhome.presumed}</echo>
+    </target>
+
+    <target name="-jdk-presetdef-basic" depends="-jdk-preinit" if="nbjdk.valid" unless="nbjdk.presetdef.basic.done">
+        
+        
+        <macrodef name="javac-presetdef">
+            <attribute name="javacval"/>
+            <sequential>
+                <presetdef name="javac">
+                    <javac fork="yes" executable="@{javacval}"/>
+                </presetdef>
+            </sequential>
+        </macrodef>
+        <javac-presetdef javacval="${nbjdk.javac}"/>
+        <macrodef name="java-presetdef">
+            <attribute name="javaval"/>
+            <sequential>
+                <presetdef name="java">
+                    <java fork="yes" jvm="@{javaval}"/>
+                </presetdef>
+            </sequential>
+        </macrodef>
+        <java-presetdef javaval="${nbjdk.java}"/>
+        <macrodef name="javadoc-presetdef">
+            <attribute name="javadocval"/>
+            <sequential>
+                <presetdef name="javadoc">
+                    <javadoc executable="@{javadocval}"/>
+                </presetdef>
+            </sequential>
+        </macrodef>
+        <javadoc-presetdef javadocval="${nbjdk.javadoc}"/>
+        <macrodef name="junit-presetdef">
+            <attribute name="javaval"/>
+            <sequential>
+                <presetdef name="junit">
+                    <junit fork="yes" jvm="@{javaval}"/>
+                </presetdef>
+            </sequential>
+        </macrodef>
+        <junit-presetdef javaval="${nbjdk.java}"/>
+        <property name="nbjdk.presetdef.basic.done" value="true"/>
+    </target>
+
+    <target name="-jdk-presetdef-nbjpdastart" depends="-jdk-preinit" if="nbjdk.valid" unless="nbjdk.presetdef.nbjpdastart.done">
+        <macrodef name="nbjpdastart-presetdef">
+            <attribute name="bootcpval"/>
+            <sequential>
+                <presetdef name="nbjpdastart">
+                    <nbjpdastart>
+                        <bootclasspath>
+                            <path path="@{bootcpval}"/>
+                        </bootclasspath>
+                    </nbjpdastart>
+                </presetdef>
+            </sequential>
+        </macrodef>
+        <nbjpdastart-presetdef bootcpval="${nbjdk.bootclasspath}"/>
+        <property name="nbjdk.presetdef.nbjpdastart.done" value="true"/>
+    </target>
+
+    <target name="-jdk-default" unless="nbjdk.active-or-nbjdk.home">
+        
+        <property name="java.home.parent" location="${java.home}/.."/>
+        <condition property="nbjdk.home" value="${java.home.parent}">
+            <available file="${java.home.parent}/lib/tools.jar" type="file"/>
+        </condition>
+        <condition property="nbjdk.home" value="${java.home}">
+            <available file="${java.home}/lib/tools.jar" type="file"/>
+        </condition>
+        
+        <condition property="nbjdk.home" value="/Library/Java/Home">
+            <available file="/Library/Java/Home" type="dir"/>
+        </condition>
+        
+        <property name="nbjdk.home" location="${java.home.parent}"/>
+        <property name="nbjdk.home.defaulted" value="true"/>
+    </target>
+
+    <target name="-jdk-init" depends="-jdk-preinit,-jdk-warn,-jdk-presetdef-basic,-jdk-default"/>
+
+</project>
\ No newline at end of file
diff --git a/nashorn/make/nbproject/nbjdk.properties b/nashorn/make/nbproject/nbjdk.properties
new file mode 100644
index 00000000000..6260c35a3d8
--- /dev/null
+++ b/nashorn/make/nbproject/nbjdk.properties
@@ -0,0 +1,24 @@
+#
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+# 
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+# 
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+# 
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+nbjdk.active=JDK_1.8
+
diff --git a/nashorn/make/nbproject/nbjdk.xml b/nashorn/make/nbproject/nbjdk.xml
new file mode 100644
index 00000000000..cbd7af38a5f
--- /dev/null
+++ b/nashorn/make/nbproject/nbjdk.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ 
+ This code is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 2 only, as
+ published by the Free Software Foundation.
+ 
+ This code is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ version 2 for more details (a copy is included in the LICENSE file that
+ accompanied this code).
+ 
+ You should have received a copy of the GNU General Public License version
+ 2 along with this work; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ 
+ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ or visit www.oracle.com if you need additional information or have any
+ questions.
+-->
+<project basedir="..">
+    <property file="../global.properties"/>
+    <property file="nbproject/nbjdk.properties"/>
+    <property location="${netbeans.user}/build.properties" name="user.properties.file"/>
+    <property file="${user.properties.file}"/>
+    <import file="jdk.xml"/>
+    <target depends="-jdk-init" name="jar">
+        <ant inheritall="false" target="jar"/>
+    </target>
+    <target depends="-jdk-init" name="clean">
+        <ant inheritall="false" target="clean"/>
+    </target>
+    <target depends="-jdk-init" name="javadoc">
+        <ant inheritall="false" target="javadoc"/>
+    </target>
+    <target depends="-jdk-init" name="test">
+        <ant inheritall="false" target="test"/>
+    </target>
+    <target depends="-jdk-init" name="run">
+        <ant inheritall="false" target="run"/>
+    </target>
+    <target depends="-jdk-init,-jdk-presetdef-nbjpdastart" name="debug-nb">
+        <ant antfile="nbproject/ide-targets.xml" inheritall="false" target="debug-nb"/>
+    </target>
+</project>
diff --git a/nashorn/make/nbproject/project.xml b/nashorn/make/nbproject/project.xml
new file mode 100644
index 00000000000..ee88965a853
--- /dev/null
+++ b/nashorn/make/nbproject/project.xml
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ 
+ This code is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 2 only, as
+ published by the Free Software Foundation.
+ 
+ This code is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ version 2 for more details (a copy is included in the LICENSE file that
+ accompanied this code).
+ 
+ You should have received a copy of the GNU General Public License version
+ 2 along with this work; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ 
+ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ or visit www.oracle.com if you need additional information or have any
+ questions.
+-->
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.ant.freeform</type>
+    <configuration>
+        <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
+            <name>nashorn</name>
+        </general-data>
+        <general-data xmlns="http://www.netbeans.org/ns/freeform-project/2">
+            <!-- Do not use Project Properties customizer when editing this file manually. -->
+            <name>nashorn</name>
+            <properties/>
+            <folders>
+                <source-folder>
+                    <label>nashorn</label>
+                    <location>.</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
+                    <label>../src</label>
+                    <location>../src</location>
+                </source-folder>
+                <source-folder>
+                    <label>../test/src</label>
+                    <location>../test/src</location>
+                </source-folder>
+                <source-folder>
+                    <label>../buildtools/nasgen/src</label>
+                    <location>../buildtools/nasgen/src</location>
+                </source-folder>
+                <source-folder>
+                    <label>../test/src</label>
+                    <type>java</type>
+                    <location>../test/src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
+                    <label>../src</label>
+                    <type>java</type>
+                    <location>../src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
+                    <label>../buildtools/nasgen/src</label>
+                    <type>java</type>
+                    <location>../buildtools/nasgen/src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+            </folders>
+            <ide-actions>
+                <action name="build">
+                    <script>nbproject/nbjdk.xml</script>
+                    <target>jar</target>
+                </action>
+                <action name="clean">
+                    <script>nbproject/nbjdk.xml</script>
+                    <target>clean</target>
+                </action>
+                <action name="javadoc">
+                    <script>nbproject/nbjdk.xml</script>
+                    <target>javadoc</target>
+                </action>
+                <action name="test">
+                    <script>nbproject/nbjdk.xml</script>
+                    <target>test</target>
+                </action>
+                <action name="rebuild">
+                    <script>nbproject/nbjdk.xml</script>
+                    <target>clean</target>
+                    <target>jar</target>
+                </action>
+                <action name="run">
+                    <script>nbproject/nbjdk.xml</script>
+                    <target>run</target>
+                </action>
+                <action name="debug">
+                    <script>nbproject/nbjdk.xml</script>
+                    <target>debug-nb</target>
+                </action>
+                <action name="debug.single">
+                    <script>nbproject/ide-file-targets.xml</script>
+                    <target>debug-selected-file-in-src</target>
+                    <context>
+                        <property>debug.class</property>
+                        <folder>test/src</folder>
+                        <pattern>\.java$</pattern>
+                        <format>java-name</format>
+                        <arity>
+                            <one-file-only/>
+                        </arity>
+                    </context>
+                </action>
+                <action name="run.single">
+                    <script>nbproject/ide-file-targets.xml</script>
+                    <target>run-selected-file-in-src</target>
+                    <context>
+                        <property>run.class</property>
+                        <folder>test/src</folder>
+                        <pattern>\.java$</pattern>
+                        <format>java-name</format>
+                        <arity>
+                            <one-file-only/>
+                        </arity>
+                    </context>
+                </action>
+            </ide-actions>
+            <view>
+                <items>
+                    <source-folder style="packages">
+                        <label>../test/src</label>
+                        <location>../test/src</location>
+                    </source-folder>
+                    <source-folder style="packages">
+                        <label>../src</label>
+                        <location>../src</location>
+                    </source-folder>
+                    <source-folder style="packages">
+                        <label>../buildtools/nasgen/src</label>
+                        <location>../buildtools/nasgen/src</location>
+                    </source-folder>
+                    <source-file>
+                        <location>build.xml</location>
+                    </source-file>
+                </items>
+                <context-menu>
+                    <ide-action name="build"/>
+                    <ide-action name="rebuild"/>
+                    <ide-action name="clean"/>
+                    <ide-action name="javadoc"/>
+                    <ide-action name="run"/>
+                    <ide-action name="test"/>
+                    <ide-action name="debug"/>
+                </context-menu>
+            </view>
+            <subprojects/>
+        </general-data>
+        <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/3">
+            <compilation-unit>
+                <package-root>../test/src</package-root>
+                <unit-tests/>
+                <classpath mode="compile">../test/lib/testng.jar:../build/classes:../src</classpath>
+                <source-level>1.7</source-level>
+            </compilation-unit>
+            <compilation-unit>
+                <package-root>../src</package-root>
+                <classpath mode="compile">../build/dynalink/dynalink.jar</classpath>
+                <source-level>1.7</source-level>
+            </compilation-unit>
+            <compilation-unit>
+                <package-root>../buildtools/nasgen/src</package-root>
+                <classpath mode="compile">../build/classes:../src</classpath>
+                <source-level>1.7</source-level>
+            </compilation-unit>
+        </java-data>
+    </configuration>
+</project>
diff --git a/nashorn/make/project.properties b/nashorn/make/project.properties
new file mode 100644
index 00000000000..64ec4083406
--- /dev/null
+++ b/nashorn/make/project.properties
@@ -0,0 +1,223 @@
+#
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+# 
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+# 
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+# 
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+application.title=nashorn
+
+# source and target levels
+build.compiler=modern
+javac.source=1.7
+javac.target=1.7
+
+# nashorn version information
+nashorn.version=0.1
+nashorn.fullversion=0.1
+nashorn.product.name=Oracle Nashorn
+
+# This directory is removed when the project is cleaned:
+build.dir=build
+build.classes.dir=${build.dir}/classes
+build.zip=${build.dir}/nashorn.zip
+build.gzip=${build.dir}/nashorn.tar.gz
+
+# nashorn Shell tool
+nashorn.shell.tool=jdk.nashorn.tools.Shell
+
+# nasgen tool
+nasgen.tool=jdk.nashorn.internal.tools.nasgen.Main
+
+# parallel test runner tool
+parallel.test.runner=jdk.nashorn.internal.test.framework.ParallelTestRunner
+
+# test classes directory
+build.test.classes.dir=${build.dir}/test/classes
+# test results directory
+build.test.results.dir=${build.dir}/test/reports
+
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.jar=${dist.dir}/nashorn.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+
+# directory where asm project lives
+asm.dir=../asm
+asm.src.dir=${asm.dir}/src
+
+# jars refererred
+file.reference.testng.jar=test/lib/testng.jar
+
+# Set testng verbose level
+# From TestNG docs: "the verbosity level (0 to 10 where 10 is most detailed) 
+# Actually, this is a lie: you can specify -1 and this will put TestNG in 
+# debug mode (no longer slicing off stack traces and all)."
+
+testng.verbose=2
+
+# TestNG listeners - we want to replace TestNG's own JUnit
+# reporter, but want everything else provided by default
+# Unfortunately, we've to clone the other default reporters here.
+
+testng.listeners=\
+ org.testng.reporters.SuiteHTMLReporter, \
+ org.testng.reporters.jq.Main, \
+ org.testng.reporters.FailedReporter, \
+ org.testng.reporters.XMLReporter \
+ org.testng.reporters.EmailableReporter, \
+ jdk.nashorn.internal.test.framework.JSJUnitReportReporter
+
+# Define the version of Dynalink that is used. Version types are either
+# 'snapshot' or 'release'. When it is 'snapshot', the version must have
+# "-SNAPSHOT" suffix and the jar version will have a timestamp in it. When
+# it's 'release', the version has no suffix, and the jar version is 
+# identical to version - fun with Maven central.
+dynalink.version=0.5-SNAPSHOT
+dynalink.version.type=snapshot
+dynalink.jar.version=0.5-20121218.140128-11
+dynalink.dir.name=dynalink
+dynalink.dir=build/${dynalink.dir.name}
+dynalink.jar=${dynalink.dir}/dynalink.jar
+
+javac.debug=true
+javac.encoding=ascii
+javac.classpath=\
+    ${build.classes.dir}:\
+    ${dynalink.jar}
+javac.test.classpath=\
+    ${build.classes.dir}:\
+    ${build.test.classes.dir}:\
+    ${file.reference.testng.jar}
+
+meta.inf.dir=${src.dir}/META-INF
+
+run.classpath=\
+    ${build.classes.dir}
+
+# test scripts to run
+test.dir=test
+test.script.dir=test/script
+test.basic.dir=test/script/basic
+test.error.dir=test/script/error
+test.sandbox.dir=test/script/sandbox
+test.external.dir=test/script/external
+test262.dir=${test.external.dir}/test262
+test262.suite.dir=${test262.dir}/test/suite
+
+test-sys-prop.test.dir=${test.dir}
+test-sys-prop.test.js.roots=${test.basic.dir} ${test.error.dir} ${test.sandbox.dir}
+test-sys-prop.test262.suite.dir=${test262.suite.dir}
+test-sys-prop.es5conform.testcases.dir=${test.external.dir}/ES5Conform/TestCases
+test-sys-prop.test.basic.dir=${test.basic.dir}
+
+# framework root for our script tests
+test-sys-prop.test.js.framework=${test.script.dir}/assert.js
+
+# Control the verbosity of ParserTest
+test-sys-prop.parsertest.verbose=false
+
+# turn on/off scripting mode for parser tests
+test-sys-prop.parsertest.scripting=true
+
+# turn on/off test262 scripts for parser tests
+test-sys-prop.parsertest.test262=false
+
+# Control the verbosity of the CompilerTest
+test-sys-prop.compilertest.verbose=false
+
+# turn on/off scripting mode for compiler tests
+test-sys-prop.compilertest.scripting=true
+
+# turn on/off test262 scripts for compiler tests
+test-sys-prop.compilertest.test262=false
+
+# test directory to be excluded.
+test-sys-prop.test.js.exclude.dir=${test.script.dir}/currently-failing ${test.external.dir}
+
+# run everything that's js in here, without checking file headers for test annotations
+test-sys-prop.test.js.unchecked.dir=${test262.dir}
+
+# test root for octane
+octane-test-sys-prop.test.js.roots=${test.external.dir}/octane/benchmarks
+
+# framework root for octane
+octane-test-sys-prop.test.js.framework=${test.basic.dir}/run-octane.js
+
+# list of tests to be excluded
+octane-test-sys-prop.test.js.exclude.list=base.js
+
+# test root for sunspider
+sunspider-test-sys-prop.test.js.roots=${test.external.dir}/sunspider/
+
+# framework root for sunspider
+sunspider-test-sys-prop.test.js.framework=${test.basic.dir}/runsunspider.js
+
+# list of tests to be excluded
+sunspider-test-sys-prop.test.js.exclude.list=
+
+# execute our script tests in shared nashorn context or not?
+test-sys-prop.test.js.shared.context=false
+
+# execute test262 tests in shared nashorn context or not?
+test262-test-sys-prop.test.js.shared.context=true
+
+# test262 test root
+test262-test-sys-prop.test.js.roots=${test262.suite.dir}
+# test262 enable/disable strict mode tests
+test262-test-sys-prop.test.js.enable.strict.mode=true
+
+# file containing test262 tests to be excluded
+# test262-test-sys-prop.test.js.excludes.file=${test262.dir}/test/config/excludelist.xml
+
+# list of test262 test dirs to be excluded
+test262-test-sys-prop.test.js.exclude.dir=\
+    ${test262.suite.dir}/intl402/
+
+# test262 test frameworks
+test262-test-sys-prop.test.js.framework=\
+    -timezone=PST \
+    ${test.script.dir}/test262.js \
+    ${test262.dir}/test/harness/framework.js \
+    ${test262.dir}/test/harness/sta.js
+
+run.test.classpath=\
+    ${file.reference.testng.jar}:\
+    ${build.test.classes.dir}
+src.dir=src
+test.src.dir=test/src
+
+#  -XX:+PrintCompilation -XX:+UnlockDiagnosticVMOptions -XX:+PrintNMethods
+# add '-Dtest.js.outofprocess' to run each test in a new sub-process
+run.test.jvmargs=-server -Xmx3G -XX:-TieredCompilation -esa -ea -Dnashorn.debug=true -Dfile.encoding=UTF-8 
+#-XX:+HeapDumpOnOutOfMemoryError -XX:-UseCompressedKlassPointers -XX:+PrintHeapAtGC -XX:ClassMetaspaceSize=300M  
+run.test.jvmargs.octane=-Xms2G -Xmx2G ${run.test.jvmargs}
+
+run.test.jvmsecurityargs=-Xverify:all -Djava.security.manager -Djava.security.policy=${basedir}/build/nashorn.policy
+
+# path of rhino.jar for benchmarks
+rhino.jar=
+
+v8.shell=d8
+
+#path to rhino jar file
+octaneperf-sys-prop.rhino.jar=${rhino.jar}
+
+#timeout for performance tests in minutes
+octaneperf-sys-prop.timeout.value=10
diff --git a/nashorn/samples/counters.js b/nashorn/samples/counters.js
new file mode 100644
index 00000000000..eb55d2870cf
--- /dev/null
+++ b/nashorn/samples/counters.js
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. 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 with the distribution.
+ * 
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * This file can be run along with any script you want to run
+ * to print aggregate stat counters from nashorn.
+ *
+ * Usage:  jjs <your-file.js> counters.js
+ */
+
+Debug.dumpCounters();
diff --git a/nashorn/samples/letter.js b/nashorn/samples/letter.js
new file mode 100644
index 00000000000..d45bd086b45
--- /dev/null
+++ b/nashorn/samples/letter.js
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. 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 with the distribution.
+ * 
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * Demonstrates "heredoc" feature with "scripting" mode.
+ *
+ * Usage: jjs -scripting letter.js -- <sender> <recipient>
+ */
+
+# This is shell-style line comment
+var obj = { sender: $ARG[0], recipient: $ARG[1] };
+
+// JavaScript style line comment is ok too.
+print(<<EOF);
+Dear ${obj.recipient},
+ 
+I wish you all the best.
+
+Regards,
+${obj.sender}
+EOF
diff --git a/nashorn/samples/parser.js b/nashorn/samples/parser.js
new file mode 100644
index 00000000000..a738c03b9af
--- /dev/null
+++ b/nashorn/samples/parser.js
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. 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 with the distribution.
+ * 
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+/**
+ * Simple sample demonstrating parser API.
+ */
+
+load("nashorn:parser.js");
+try {
+    var json = parse("print('hello')");
+    print(JSON.stringify(json));
+} catch (e) {
+    print(e);
+}
diff --git a/nashorn/samples/shell.js b/nashorn/samples/shell.js
new file mode 100644
index 00000000000..380e6d7066f
--- /dev/null
+++ b/nashorn/samples/shell.js
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. 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 with the distribution.
+ * 
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * This is a simple shell tool in JavaScript.
+ *
+ * Runs any operating system command using Java "exec". When "eval" command is
+ * used, evaluates argument(s) as JavaScript code.
+ */
+
+var imports = new JavaImporter(java.io, java.lang, java.util);
+
+function prompt() {
+    java.lang.System.out.print(">");
+}
+
+with (imports) {
+    var reader = new BufferedReader(new InputStreamReader(System["in"]));
+    var line = null;
+    prompt();
+    while ((line = reader.readLine()) != null) {
+        if (line != "") {
+            var args = line.split(" ");
+            try {
+                if (args[0] == "eval") {
+                    var code = line.substring("eval".length);
+                    var res = eval(code);
+                    if (res != undefined) {
+                        print(res);
+                    }
+                } else {
+                    var argList = new ArrayList();
+                    for (i in args) { argList.add(args[i]); }                
+                    var procBuilder = new ProcessBuilder(argList);
+                    procBuilder.redirectErrorStream();
+                    var proc = procBuilder.start();
+                    var out = new BufferedReader(new InputStreamReader(proc.getInputStream()));
+                    var line = null;
+                    while ((line = out.readLine()) != null) {
+                        System.out.println(line);
+                    }
+                    proc.waitFor();
+                }
+            } catch (e) {
+                print(e);
+            }
+        }
+        prompt();
+    }
+}
diff --git a/nashorn/samples/test.js b/nashorn/samples/test.js
new file mode 100644
index 00000000000..e1d30b0ac51
--- /dev/null
+++ b/nashorn/samples/test.js
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. 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 with the distribution.
+ * 
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+print("Hello World");
diff --git a/nashorn/samples/uniq.js b/nashorn/samples/uniq.js
new file mode 100644
index 00000000000..157c4f59451
--- /dev/null
+++ b/nashorn/samples/uniq.js
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. 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 with the distribution.
+ * 
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * Prints unique lines from a given file.
+ */
+
+if (arguments.length != 1) {
+    print("Usage: jjs uniq.js -- <file>");
+    java.lang.System.exit(1);
+}
+
+var imports = new JavaImporter(java.io);
+
+var uniqueLines = {};
+with (imports) {
+    var reader = new BufferedReader(new FileReader(arguments[0]));
+    while ((line = reader.readLine()) != null) {
+        // using a JS object as a map...
+        uniqueLines[line] = true;
+    }
+}
+
+// now print the collected lines
+for (i in uniqueLines) {
+    print(i);
+}
diff --git a/nashorn/src/META-INF/MANIFEST.MF b/nashorn/src/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..b61190e5ba9
--- /dev/null
+++ b/nashorn/src/META-INF/MANIFEST.MF
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Main-Class: jdk.nashorn.tools.Shell
+
+Name: jdk/nashorn/
+Implementation-Vendor: Oracle Corporation
diff --git a/nashorn/src/META-INF/services/javax.script.ScriptEngineFactory b/nashorn/src/META-INF/services/javax.script.ScriptEngineFactory
new file mode 100644
index 00000000000..ec7da013a99
--- /dev/null
+++ b/nashorn/src/META-INF/services/javax.script.ScriptEngineFactory
@@ -0,0 +1,25 @@
+#
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+jdk.nashorn.api.scripting.NashornScriptEngineFactory
diff --git a/nashorn/src/jdk/nashorn/api/scripting/NashornException.java b/nashorn/src/jdk/nashorn/api/scripting/NashornException.java
new file mode 100644
index 00000000000..f1a42648b7e
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/api/scripting/NashornException.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.api.scripting;
+
+/**
+ * This is base exception for all Nashorn exceptions. These originate from user's
+ * ECMAScript code. Example: script parse errors, exceptions thrown from scripts.
+ * Note that ScriptEngine methods like "eval", "invokeMethod", "invokeFunction"
+ * will wrap this as ScriptException and throw it. But, there are cases where user
+ * may need to access this exception (or implementation defined subtype of this).
+ * For example, if java interface is implemented by a script object or Java access
+ * to script object properties via java.util.Map interface. In these cases, user
+ * code will get an instance of this or implementation defined subclass.
+ */
+@SuppressWarnings("serial")
+public class NashornException extends RuntimeException {
+    // script file name
+    private String      fileName;
+    // script line number
+    private int         line;
+    // script column number
+    private int         column;
+
+    /**
+     * Constructor
+     *
+     * @param msg exception message
+     */
+    protected NashornException(final String msg) {
+        super(msg);
+    }
+
+    /**
+     * Constructor
+     * @param msg   exception message
+     * @param cause exception cause
+     */
+    protected NashornException(final String msg, final Throwable cause) {
+        super(msg, cause);
+    }
+
+    /**
+     * Constructor
+     *
+     * @param cause exception cause
+     */
+    protected NashornException(final Throwable cause) {
+        super(cause);
+    }
+
+     /**
+      * Get the source file name for this {@code NashornException}
+      * @return the file name
+      */
+     public final String getFileName() {
+         return fileName;
+     }
+
+    /**
+     * Set the source file name for this {@code NashornException}
+     * @param fileName file name
+     */
+    protected final void setFileName(final String fileName) {
+         this.fileName = fileName;
+     }
+
+    /**
+     * Get the line number for this {@code NashornException}
+     * @return the line number
+     */
+     public final int getLineNumber() {
+         return line;
+     }
+
+    /**
+     * Set the line number for this {@code NashornException}
+     * @param line line number
+     */
+    protected final void setLineNumber(final int line) {
+         this.line = line;
+     }
+
+    /**
+     * Get the column for this {@code NashornException}
+     * @return the column
+     */
+    public final int getColumnNumber() {
+        return column;
+    }
+
+   /**
+    * Set the column number for this {@code NashornException}
+    * @param column the column
+    */
+    public final void setColumnNumber(final int column) {
+        this.column = column;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
new file mode 100644
index 00000000000..3fde40aae94
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
@@ -0,0 +1,521 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.api.scripting;
+
+import static jdk.nashorn.internal.runtime.ECMAErrors.referenceError;
+import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.lang.invoke.MethodHandle;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.net.URL;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import javax.script.AbstractScriptEngine;
+import javax.script.Bindings;
+import javax.script.Compilable;
+import javax.script.CompiledScript;
+import javax.script.Invocable;
+import javax.script.ScriptContext;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineFactory;
+import javax.script.ScriptException;
+import javax.script.SimpleBindings;
+import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.runtime.ErrorManager;
+import jdk.nashorn.internal.runtime.GlobalObject;
+import jdk.nashorn.internal.runtime.Property;
+import jdk.nashorn.internal.runtime.ScriptFunction;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
+import jdk.nashorn.internal.runtime.Source;
+import jdk.nashorn.internal.runtime.linker.JavaAdapterFactory;
+import jdk.nashorn.internal.runtime.options.Options;
+
+/**
+ * JSR-223 compliant script engine for Nashorn. Instances are not created directly, but rather returned through
+ * {@link NashornScriptEngineFactory#getScriptEngine()}. Note that this engine implements the {@link Compilable} and
+ * {@link Invocable} interfaces, allowing for efficient precompilation and repeated execution of scripts.
+ * @see NashornScriptEngineFactory
+ */
+
+public final class NashornScriptEngine extends AbstractScriptEngine implements Compilable, Invocable {
+
+    private final ScriptEngineFactory factory;
+    private final Context             nashornContext;
+    private final ScriptObject        global;
+
+    // default options passed to Nashorn Options object
+    private static final String[] DEFAULT_OPTIONS = new String[] { "-scripting", "-af", "-doe" };
+
+    NashornScriptEngine(final NashornScriptEngineFactory factory) {
+        this(factory, DEFAULT_OPTIONS);
+    }
+
+    @SuppressWarnings("LeakingThisInConstructor")
+    NashornScriptEngine(final NashornScriptEngineFactory factory, final String[] args) {
+        this.factory = factory;
+        final Options options = new Options("nashorn");
+        options.process(args);
+
+        // throw ParseException on first error from script
+        final ErrorManager errors = new Context.ThrowErrorManager();
+        // create new Nashorn Context and get global object
+        this.nashornContext = AccessController.doPrivileged(new PrivilegedAction<Context>() {
+            @Override
+            public Context run() {
+                try {
+                    return new Context(options, errors);
+                } catch (final RuntimeException e) {
+                    if (Context.DEBUG) {
+                        e.printStackTrace();
+                    }
+                    throw e;
+                }
+            }
+        });
+
+        // create new global object
+        this.global = nashornContext.createGlobal();
+
+        // current ScriptContext exposed as "context"
+        global.addOwnProperty("context", Property.NOT_ENUMERABLE, context);
+        // current ScriptEngine instance exposed as "engine". We added @SuppressWarnings("LeakingThisInConstructor") as
+        // NetBeans identifies this assignment as such a leak - this is a false positive as we're setting this property
+        // in the Global of a Context we just created - both the Context and the Global were just created and can not be
+        // seen from another thread outside of this constructor.
+        global.addOwnProperty("engine", Property.NOT_ENUMERABLE, this);
+        // global script arguments
+        global.addOwnProperty("arguments", Property.NOT_ENUMERABLE, UNDEFINED);
+
+        // evaluate engine initial script
+        try {
+            AccessController.doPrivileged(new PrivilegedExceptionAction<Void>() {
+                @Override
+                public Void run() throws ScriptException {
+                    evalEngineScript();
+                    return null;
+                }
+            });
+        } catch (final PrivilegedActionException e) {
+            if (Context.DEBUG) {
+                e.printStackTrace();
+            }
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public Object eval(final Reader reader, final ScriptContext ctxt) throws ScriptException {
+        try {
+            return evalImpl(Source.readFully(reader), ctxt);
+        } catch (final IOException e) {
+            throw new ScriptException(e);
+        }
+    }
+
+    @Override
+    public Object eval(final String script, final ScriptContext ctxt) throws ScriptException {
+        return evalImpl(script.toCharArray(), ctxt);
+    }
+
+    /*
+     * FIXME: This is not exactly right. Script execution should actually
+     * put the variables in ENGINE_SCOPE bindings. But, it is difficult
+     * (not possible?) with the way ScriptObject is implemented. So, for now
+     * giving access to script variables by accessing it from "globals". This
+     * way at least engine.get("foo") will work whenever "foo" is a global var
+     * defined by eval'ed scripts.
+     */
+    @Override
+    public Object get(final String key) {
+        Object value = super.get(key);
+        if (value == null) {
+            value = ScriptObjectMirror.wrap(global.get(key), global);
+        }
+        return (value == UNDEFINED) ? null : value;
+    }
+
+    @Override
+    public ScriptEngineFactory getFactory() {
+        return factory;
+    }
+
+    @Override
+    public Bindings createBindings() {
+        return new SimpleBindings();
+    }
+
+    // Compilable methods
+
+    @Override
+    public CompiledScript compile(final Reader reader) throws ScriptException {
+        try {
+            return asCompiledScript(compileImpl(Source.readFully(reader), context));
+        } catch (final IOException e) {
+            throw new ScriptException(e);
+        }
+    }
+
+    @Override
+    public CompiledScript compile(final String str) throws ScriptException {
+        return asCompiledScript(compileImpl(str.toCharArray(), context));
+    }
+
+    // Invocable methods
+
+    @Override
+    public Object invokeFunction(final String name, final Object... args)
+            throws ScriptException, NoSuchMethodException {
+        return invokeImpl(null, name, args);
+    }
+
+    @Override
+    public Object invokeMethod(final Object self, final String name, final Object... args)
+            throws ScriptException, NoSuchMethodException {
+        if (self == null) {
+            throw new IllegalArgumentException("script object can not be null");
+        }
+        return invokeImpl(self, name, args);
+    }
+
+    private <T> T getInterfaceInner(final Object self, final Class<T> clazz) {
+        final Object realSelf;
+        if(self == null) {
+            realSelf = global;
+        } else if (!(self instanceof ScriptObject)) {
+            realSelf = ScriptObjectMirror.unwrap(self, global);
+        } else {
+            realSelf = self;
+        }
+        try {
+            final ScriptObject oldGlobal = Context.getGlobal();
+            try {
+                if(oldGlobal != global) {
+                    setNashornGlobal(global);
+                }
+                return clazz.cast(JavaAdapterFactory.getConstructor(realSelf.getClass(), clazz).invoke(realSelf));
+            } finally {
+                if(oldGlobal != global) {
+                    setNashornGlobal(oldGlobal);
+                }
+            }
+        } catch(final RuntimeException|Error e) {
+            throw e;
+        } catch(final Throwable t) {
+            throw new RuntimeException(t);
+        }
+    }
+
+    @Override
+    public <T> T getInterface(final Class<T> clazz) {
+        return getInterfaceInner(null, clazz);
+    }
+
+    @Override
+    public <T> T getInterface(final Object self, final Class<T> clazz) {
+        if (self == null) {
+            throw new IllegalArgumentException("script object can not be null");
+        }
+        return getInterfaceInner(self, clazz);
+    }
+
+    // These are called from the "engine.js" script
+
+    /**
+     * This hook is used to search js global variables exposed from Java code.
+     *
+     * @param self 'this' passed from the script
+     * @param ctxt current ScriptContext in which name is searched
+     * @param name name of the variable searched
+     * @return the value of the named variable
+     */
+    public Object __noSuchProperty__(final Object self, final ScriptContext ctxt, final String name) {
+        final int scope = ctxt.getAttributesScope(name);
+        if (scope != -1) {
+            return ScriptObjectMirror.unwrap(ctxt.getAttribute(name, scope), global);
+        }
+
+        if (self == UNDEFINED) {
+            // scope access and so throw ReferenceError
+            referenceError(global, "not.defined", name);
+        }
+
+        return UNDEFINED;
+    }
+
+    /**
+     * This hook is used to call js global functions exposed from Java code.
+     *
+     * @param self 'this' passed from the script
+     * @param ctxt current ScriptContext in which method is searched
+     * @param name name of the method
+     * @param args arguments to be passed to the method
+     * @return return value of the called method
+     */
+    public Object __noSuchMethod__(final Object self, final ScriptContext ctxt, final String name, final Object args) {
+        final int scope = ctxt.getAttributesScope(name);
+        Object value;
+
+        if (scope != -1) {
+            value = ctxt.getAttribute(name, scope);
+        } else {
+            if (self == UNDEFINED) {
+                referenceError(global, "not.defined", name);
+            } else {
+                typeError(global, "no.such.function", name, ScriptRuntime.safeToString(global));
+            }
+            return UNDEFINED;
+        }
+
+        value = ScriptObjectMirror.unwrap(value, global);
+
+        if (value instanceof Method) {
+            final Method method = (Method) value;
+            final int    mods   = method.getModifiers();
+            if (Modifier.isStatic(mods) && Modifier.isPublic(mods)) {
+               value = MH.find((Method)value);
+            }
+        }
+
+        if (value instanceof MethodHandle) {
+            value = ((GlobalObject)global).newScriptFunction(name, (MethodHandle)value, null, false);
+        }
+
+        if (!(value instanceof ScriptFunction)) {
+            typeError(global, "not.a.function", name);
+        }
+
+        if (value instanceof ScriptFunction) {
+            return ScriptObjectMirror.unwrap(ScriptRuntime.apply((ScriptFunction)value, global, args), global);
+        }
+
+        typeError(global, "not.a.function", ScriptRuntime.safeToString(name));
+
+        return UNDEFINED;
+    }
+
+    private void evalEngineScript() throws ScriptException {
+        final URL url = NashornScriptEngine.class.getResource("resources/engine.js");
+        try {
+            final InputStream is = url.openStream();
+            put(ScriptEngine.FILENAME, url);
+            try (final InputStreamReader isr = new InputStreamReader(is)) {
+                eval(isr);
+            }
+        } catch (final IOException e) {
+            throw new ScriptException(e);
+        } finally {
+            put(ScriptEngine.FILENAME, null);
+        }
+    }
+
+    // scripts should see "context" and "engine" as variables
+    private void setContextVariables(final ScriptContext ctxt) {
+        ctxt.setAttribute("context", ctxt, ScriptContext.ENGINE_SCOPE);
+        // current ScriptContext exposed as "context"
+        global.set("context", ctxt, false);
+        Object args = ctxt.getAttribute("arguments");
+        // if no arguments passed, make it empty array
+        if (args == null) {
+            args = ScriptRuntime.EMPTY_ARRAY;
+        }
+        args = ((GlobalObject)global).wrapAsObject(args);
+        global.set("arguments", args, false);
+    }
+
+    private Object invokeImpl(final Object selfObject, final String name, final Object... args) throws ScriptException, NoSuchMethodException {
+        final ScriptObject oldGlobal     = Context.getGlobal();
+        final boolean globalChanged = (oldGlobal != global);
+
+        Object self = selfObject;
+
+        try {
+            if (globalChanged) {
+                setNashornGlobal(global);
+            }
+
+            ScriptObject sobj;
+            Object       value;
+
+            self = ScriptObjectMirror.unwrap(self, global);
+
+            // FIXME: should convert when self is not ScriptObject
+            if (self instanceof ScriptObject) {
+                sobj = (ScriptObject)self;
+                value = sobj.get(name);
+            } else if (self == null) {
+                self  = global;
+                sobj  = global;
+                value = sobj.get(name);
+            } else {
+                // Find the java method and make a ScriptFunction of it.
+                final Method[] methods = self.getClass().getMethods();
+                Method target = null;
+
+                for (final Method mth : methods) {
+                    // choose the right overload by number of arguments -- don't
+                    // care overload resolution for now..
+                    if (mth.getName().equals(name) &&
+                        mth.getParameterTypes().length == args.length) {
+                        target = mth;
+                        break;
+                    }
+                }
+                if (target == null) {
+                    throw new NoSuchMethodException(name);
+                }
+                final GlobalObject gobj = (GlobalObject) global;
+                value = gobj.newScriptFunction(name, MH.find(target), null, false);
+            }
+
+            if (value instanceof ScriptFunction) {
+                final Object res;
+                try {
+                    res = ScriptRuntime.apply((ScriptFunction)value, self, ScriptObjectMirror.unwrapArray(args, global));
+                } catch (final Exception e) {
+                    throwAsScriptException(e);
+                    throw new AssertionError("should not reach here");
+                }
+                return ScriptObjectMirror.wrap(res, global);
+            }
+
+            throw new NoSuchMethodException(name);
+        } finally {
+            if (globalChanged) {
+                setNashornGlobal(oldGlobal);
+            }
+        }
+    }
+
+    private Object evalImpl(final char[] buf, final ScriptContext ctxt) throws ScriptException {
+        return evalImpl(compileImpl(buf, ctxt), ctxt);
+    }
+
+    private Object evalImpl(final ScriptFunction script, final ScriptContext ctxt) throws ScriptException {
+        if (script == null) {
+            return null;
+        }
+        final ScriptObject oldGlobal = Context.getGlobal();
+        final boolean globalChanged = (oldGlobal != global);
+        try {
+            if (globalChanged) {
+                setNashornGlobal(global);
+            }
+
+            setContextVariables(ctxt);
+            Object res = ScriptRuntime.apply(script, global);
+            res = ScriptObjectMirror.wrap(res, global);
+            return (res == UNDEFINED) ? null : res;
+        } catch (final Exception e) {
+            throwAsScriptException(e);
+            throw new AssertionError("should not reach here");
+        } finally {
+            if (globalChanged) {
+                setNashornGlobal(oldGlobal);
+            }
+        }
+    }
+
+    private static void throwAsScriptException(final Exception e) throws ScriptException {
+        if (e instanceof ScriptException) {
+            throw (ScriptException)e;
+        } else if (e instanceof NashornException) {
+            final NashornException ne = (NashornException)e;
+            final ScriptException se = new ScriptException(
+                ne.getMessage(), ne.getFileName(),
+                ne.getLineNumber(), ne.getColumnNumber());
+            se.initCause(e);
+            throw se;
+        } else if (e instanceof RuntimeException) {
+            throw (RuntimeException)e;
+        } else {
+            // wrap any other exception as ScriptException
+            throw new ScriptException(e);
+        }
+    }
+
+    private CompiledScript asCompiledScript(final ScriptFunction script) {
+        return new CompiledScript() {
+            @Override
+            public Object eval(final ScriptContext ctxt) throws ScriptException {
+                return evalImpl(script, ctxt);
+            }
+            @Override
+            public ScriptEngine getEngine() {
+                return NashornScriptEngine.this;
+            }
+        };
+    }
+
+    private ScriptFunction compileImpl(final char[] buf, final ScriptContext ctxt) throws ScriptException {
+        final ScriptObject oldGlobal = Context.getGlobal();
+        final boolean globalChanged = (oldGlobal != global);
+        try {
+            final Object val = ctxt.getAttribute(ScriptEngine.FILENAME);
+            final String fileName = (val != null) ? val.toString() : "<eval>";
+
+            // !!HACK!! do not evaluate "init.js" from jrunscript tool!!
+            if ("<system-init>".equals(fileName)) {
+                return null;
+            }
+
+            final Source source = new Source(fileName, buf);
+            if (globalChanged) {
+                setNashornGlobal(global);
+            }
+
+            setContextVariables(ctxt);
+            return nashornContext.compileScript(source, global, nashornContext._strict);
+        } catch (final Exception e) {
+            throwAsScriptException(e);
+            throw new AssertionError("should not reach here");
+        } finally {
+            if (globalChanged) {
+                setNashornGlobal(oldGlobal);
+            }
+        }
+    }
+
+    // don't make this public!!
+    static void setNashornGlobal(final ScriptObject global) {
+        AccessController.doPrivileged(new PrivilegedAction<Void>() {
+            @Override
+            public Void run() {
+               Context.setGlobal(global);
+               return null;
+            }
+        });
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java
new file mode 100644
index 00000000000..2bb6a3484d7
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java
@@ -0,0 +1,179 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.api.scripting;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineFactory;
+import jdk.nashorn.internal.runtime.Version;
+
+/**
+ * JSR-223 compliant script engine factory for Nashorn. The engine answers for:
+ * <ul>
+ * <li>names {@code "nashorn"}, {@code "Nashorn"}, {@code "js"}, {@code "JS"}, {@code "JavaScript"},
+ * {@code "javascript"}, {@code "ECMAScript"}, and {@code "ecmascript"};</li>
+ * <li>MIME types {@code "application/javascript"}, {@code "application/ecmascript"}, {@code "text/javascript"}, and
+ * {@code "text/ecmascript"};</li>
+ * <li>as well as for the extension {@code "js"}.</li>
+ * </ul>
+ * Programs executing in engines created using {@link #getScriptEngine(String[])} will have the passed arguments
+ * accessible as a global variable named {@code "arguments"}.
+ */
+public final class NashornScriptEngineFactory implements ScriptEngineFactory {
+    @Override
+    public String getEngineName() {
+        return (String) getParameter(ScriptEngine.ENGINE);
+    }
+
+    @Override
+    public String getEngineVersion() {
+        return (String) getParameter(ScriptEngine.ENGINE_VERSION);
+    }
+
+    @Override
+    public List<String> getExtensions() {
+        return Collections.unmodifiableList(extensions);
+    }
+
+    @Override
+    public String getLanguageName() {
+        return (String) getParameter(ScriptEngine.LANGUAGE);
+    }
+
+    @Override
+    public String getLanguageVersion() {
+        return (String) getParameter(ScriptEngine.LANGUAGE_VERSION);
+    }
+
+    @Override
+    public String getMethodCallSyntax(final String obj, final String method, final String... args) {
+        final StringBuilder sb = new StringBuilder().append(obj).append('.').append(method).append('(');
+        final int len = args.length;
+
+        if (len > 0) {
+            sb.append(args[0]);
+        }
+        for (int i = 1; i < len; i++) {
+            sb.append(',').append(args[i]);
+        }
+        sb.append(')');
+
+        return sb.toString();
+    }
+
+    @Override
+    public List<String> getMimeTypes() {
+        return Collections.unmodifiableList(mimeTypes);
+    }
+
+    @Override
+    public List<String> getNames() {
+        return Collections.unmodifiableList(names);
+    }
+
+    @Override
+    public String getOutputStatement(final String toDisplay) {
+        return "print(" + toDisplay + ")";
+    }
+
+    @Override
+    public Object getParameter(final String key) {
+        switch (key) {
+        case ScriptEngine.NAME:
+            return "javascript";
+        case ScriptEngine.ENGINE:
+            return "Oracle Nashorn";
+        case ScriptEngine.ENGINE_VERSION:
+            return Version.version();
+        case ScriptEngine.LANGUAGE:
+            return "ECMAScript";
+        case ScriptEngine.LANGUAGE_VERSION:
+            return "ECMA - 262 Edition 5.1";
+        case "THREADING":
+            // The engine implementation is not thread-safe. Can't be
+            // used to execute scripts concurrently on multiple threads.
+            return null;
+        default:
+            throw new IllegalArgumentException("Invalid key");
+        }
+    }
+
+    @Override
+    public String getProgram(final String... statements) {
+        final StringBuilder sb = new StringBuilder();
+
+        for (final String statement : statements) {
+            sb.append(statement).append(';');
+        }
+
+        return sb.toString();
+    }
+
+    @Override
+    public ScriptEngine getScriptEngine() {
+        return new NashornScriptEngine(this);
+    }
+
+    /**
+     * Create a new Script engine initialized by given arguments.
+     *
+     * @param args arguments array passed to script engine.
+     * @return newly created script engine.
+     */
+    public ScriptEngine getScriptEngine(final String[] args) {
+        return new NashornScriptEngine(this, args);
+    }
+
+    // -- Internals only below this point
+
+    private static final List<String> names;
+    private static final List<String> mimeTypes;
+    private static final List<String> extensions;
+
+    static {
+        names = immutableList(
+                    "nashorn", "Nashorn",
+                    "js", "JS",
+                    "JavaScript", "javascript",
+                    "ECMAScript", "ecmascript"
+                );
+
+        mimeTypes = immutableList(
+                        "application/javascript",
+                        "application/ecmascript",
+                        "text/javascript",
+                        "text/ecmascript"
+                    );
+
+        extensions = immutableList("js");
+    }
+
+    private static List<String> immutableList(final String... elements) {
+        return Collections.unmodifiableList(Arrays.asList(elements));
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java b/nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java
new file mode 100644
index 00000000000..44021fada90
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java
@@ -0,0 +1,323 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.api.scripting;
+
+import java.util.AbstractMap;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.runtime.ScriptFunction;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import netscape.javascript.JSObject;
+
+/**
+ * Mirror object that wraps a given ScriptObject instance. User can
+ * access ScriptObject via the java.util.Map interface.
+ */
+final class ScriptObjectMirror extends JSObject implements Map<Object, Object> {
+    private final ScriptObject sobj;
+    private final ScriptObject global;
+
+    ScriptObjectMirror(final ScriptObject sobj, final ScriptObject global) {
+        this.sobj = sobj;
+        this.global = global;
+    }
+
+    @Override
+    public boolean equals(final Object other) {
+        if (other instanceof ScriptObjectMirror) {
+            return sobj.equals(((ScriptObjectMirror)other).sobj);
+        }
+
+        return false;
+    }
+
+    @Override
+    public int hashCode() {
+        return sobj.hashCode();
+    }
+
+    private <V> V inGlobal(final Callable<V> callable) {
+        final ScriptObject oldGlobal = Context.getGlobal();
+        final boolean globalChanged = (oldGlobal != global);
+        if (globalChanged) {
+            NashornScriptEngine.setNashornGlobal(global);
+        }
+        try {
+            return callable.call();
+        } catch (final RuntimeException e) {
+            throw e;
+        } catch (final Exception e) {
+            throw new AssertionError("Cannot happen", e);
+        } finally {
+            if (globalChanged) {
+                NashornScriptEngine.setNashornGlobal(oldGlobal);
+            }
+        }
+    }
+
+    // JSObject methods
+    @Override
+    public Object call(final String methodName, final Object args[]) {
+        final Object val = sobj.get(methodName);
+        final ScriptObject oldGlobal = Context.getGlobal();
+        final boolean globalChanged = (oldGlobal != global);
+
+        if (val instanceof ScriptFunction) {
+            final Object[] modifiedArgs = unwrapArray(args, global);
+            if (modifiedArgs != null) {
+                for (int i = 0; i < modifiedArgs.length; i++) {
+                    final Object arg = modifiedArgs[i];
+                    if (arg instanceof ScriptObject) {
+                        modifiedArgs[i] = wrap(arg, oldGlobal);
+                    }
+                }
+            }
+
+            try {
+                if (globalChanged) {
+                    NashornScriptEngine.setNashornGlobal(global);
+                }
+                return wrap(((ScriptFunction)val).invoke(sobj, modifiedArgs), global);
+            } catch (final RuntimeException | Error e) {
+                throw e;
+            } catch (final Throwable t) {
+                throw new RuntimeException(t);
+            } finally {
+                if (globalChanged) {
+                    NashornScriptEngine.setNashornGlobal(oldGlobal);
+                }
+            }
+       }
+
+       throw new RuntimeException("No such method: " + methodName);
+    }
+
+    @Override
+    public Object eval(final String s) {
+        return inGlobal(new Callable<Object>() {
+            @Override
+            public Object call() {
+                return wrap(global.getContext().eval(global, s, null, null, false), global);
+            }
+        });
+    }
+
+    @Override
+    public Object getMember(final String name) {
+        return get(name);
+    }
+
+    @Override
+    public Object getSlot(final int index) {
+        return get(Integer.valueOf(index));
+    }
+
+    @Override
+    public void removeMember(final String name) {
+        remove(name);
+    }
+
+    @Override
+    public void setMember(final String name, final Object value) {
+        put(name, wrap(value, Context.getGlobal()));
+    }
+
+    @Override
+    public void setSlot(final int index, final Object value) {
+        put(Integer.valueOf(index), wrap(value, Context.getGlobal()));
+    }
+
+    @Override
+    public void clear() {
+        inGlobal(new Callable<Object>() {
+            @Override public Object call() {
+                sobj.clear();
+                return null;
+            }});
+    }
+
+    @Override
+    public boolean containsKey(final Object key) {
+        return inGlobal(new Callable<Boolean>() {
+            @Override public Boolean call() {
+                return sobj.containsKey(unwrap(key, global));
+            }});
+    }
+
+    @Override
+    public boolean containsValue(final Object value) {
+        return inGlobal(new Callable<Boolean>() {
+            @Override public Boolean call() {
+                return sobj.containsValue(unwrap(value, global));
+            }});
+    }
+
+    @Override
+    public Set<Map.Entry<Object, Object>> entrySet() {
+        return inGlobal(new Callable<Set<Map.Entry<Object, Object>>>() {
+            @Override public Set<Map.Entry<Object, Object>> call() {
+                final Iterator<String>               iter    = sobj.propertyIterator();
+                final Set<Map.Entry<Object, Object>> entries = new HashSet<>();
+
+                while (iter.hasNext()) {
+                    final Object key   = wrap(iter.next(), global);
+                    final Object value = wrap(sobj.get(key), global);
+                    entries.add(new AbstractMap.SimpleImmutableEntry<>(key, value));
+                }
+
+                return Collections.unmodifiableSet(entries);
+            }
+        });
+    }
+
+    @Override
+    public Object get(final Object key) {
+        return inGlobal(new Callable<Object>() { @Override public Object call() {
+            return wrap(sobj.get(key), global);
+        }});
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return inGlobal(new Callable<Boolean>() { @Override public Boolean call() {
+            return sobj.isEmpty();
+        }});
+    }
+
+    @Override
+    public Set<Object> keySet() {
+        return inGlobal(new Callable<Set<Object>>() { @Override public Set<Object> call() {
+            final Iterator<String> iter   = sobj.propertyIterator();
+            final Set<Object>      keySet = new HashSet<>();
+
+            while (iter.hasNext()) {
+                keySet.add(wrap(iter.next(), global));
+            }
+
+            return Collections.unmodifiableSet(keySet);
+        }});
+    }
+
+    @Override
+    public Object put(final Object key, final Object value) {
+        return inGlobal(new Callable<Object>() {
+            @Override public Object call() {
+                return sobj.put(unwrap(key, global), unwrap(value, global));
+        }});
+    }
+
+    @Override
+    public void putAll(final Map<?, ?> map) {
+        final boolean strict = sobj.getContext()._strict;
+        inGlobal(new Callable<Object>() { @Override public Object call() {
+            for (final Map.Entry<?, ?> entry : map.entrySet()) {
+                sobj.set(unwrap(entry.getKey(), global), unwrap(entry.getValue(), global), strict);
+            }
+            return null;
+        }});
+    }
+
+    @Override
+    public Object remove(final Object key) {
+        return inGlobal(new Callable<Object>() {
+            @Override public Object call() {
+                return wrap(sobj.remove(unwrap(key, global)), global);
+            }
+        });
+    }
+
+    @Override
+    public int size() {
+        return inGlobal(new Callable<Integer>() {
+            @Override public Integer call() {
+                return sobj.size();
+            }
+        });
+    }
+
+    @Override
+    public Collection<Object> values() {
+        return inGlobal(new Callable<Collection<Object>>() { @Override public Collection<Object> call() {
+            final List<Object>     values = new ArrayList<>(size());
+            final Iterator<Object> iter   = sobj.valueIterator();
+
+            while (iter.hasNext()) {
+                values.add(wrap(iter.next(), global));
+            }
+
+            return Collections.unmodifiableList(values);
+        }});
+    }
+
+    static Object wrap(final Object obj, final ScriptObject homeGlobal) {
+        return (obj instanceof ScriptObject) ? new ScriptObjectMirror((ScriptObject)obj, homeGlobal) : obj;
+    }
+
+    static Object unwrap(final Object obj, final ScriptObject homeGlobal) {
+        if (obj instanceof ScriptObjectMirror) {
+            final ScriptObjectMirror mirror = (ScriptObjectMirror)obj;
+            return (mirror.global == homeGlobal)? mirror.sobj : obj;
+        }
+
+        return obj;
+    }
+
+    static Object[] wrapArray(final Object[] args, final ScriptObject homeGlobal) {
+        if (args == null || args.length == 0) {
+            return args;
+        }
+
+        final Object[] newArgs = new Object[args.length];
+        int index = 0;
+        for (final Object obj : args) {
+            newArgs[index] = wrap(obj, homeGlobal);
+            index++;
+        }
+        return newArgs;
+    }
+
+    static Object[] unwrapArray(final Object[] args, final ScriptObject homeGlobal) {
+        if (args == null || args.length == 0) {
+            return args;
+        }
+
+        final Object[] newArgs = new Object[args.length];
+        int index = 0;
+        for (final Object obj : args) {
+            newArgs[index] = unwrap(obj, homeGlobal);
+            index++;
+        }
+        return newArgs;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/api/scripting/package-info.java b/nashorn/src/jdk/nashorn/api/scripting/package-info.java
new file mode 100644
index 00000000000..32472901236
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/api/scripting/package-info.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * This package provides the {@code javax.script} integration, which is the preferred way to use Nashorn.
+ * You will ordinarily do this to obtain an instance of a Nashorn script engine:
+ * <pre>
+ * import javax.script.*;
+ * ...
+ * ScriptEngine nashornEngine = new ScriptEngineManager().getEngineByName("Nashorn");
+ * </pre>
+ * <p>Nashorn script engines implement the optional {@link javax.script.Invocable} and {@link javax.script.Compilable}
+ * interfaces, allowing for efficient pre-compilation and repeated execution of scripts. See
+ * {@link jdk.nashorn.api.scripting.NashornScriptEngineFactory} for further details.
+ */
+package jdk.nashorn.api.scripting;
diff --git a/nashorn/src/jdk/nashorn/api/scripting/resources/engine.js b/nashorn/src/jdk/nashorn/api/scripting/resources/engine.js
new file mode 100644
index 00000000000..49e8d45b853
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/api/scripting/resources/engine.js
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * This script file is executed by script engine at the construction
+ * of the engine. The functions here assume global variables "context"
+ * of type javax.script.ScriptContext and "engine" of the type
+ * jdk.nashorn.api.scripting.NashornScriptEngine.
+ *
+ **/
+
+Object.defineProperty(this, "__noSuchProperty__", {
+    configurable: true,
+    enumerable: false,
+    writable: true,
+    value: function (name) {
+        'use strict';
+        return engine.__noSuchProperty__(this, context, name);
+    }
+});
+
+Object.defineProperty(this, "__noSuchMethod__", {
+    configurable: true,
+    enumerable: false,
+    writable: true,
+    value: function (name, args) {
+        'use strict';
+        return engine.__noSuchMethod__(this, context, name, args);
+    }
+});
+
+function print(str) {
+    var writer = context.getWriter();
+    if (! (writer instanceof java.io.PrintWriter)) {
+        writer = new java.io.PrintWriter(writer);
+    }
+    writer.println(String(str));
+}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/AccessSpecializer.java b/nashorn/src/jdk/nashorn/internal/codegen/AccessSpecializer.java
new file mode 100644
index 00000000000..56a3e7ecc45
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/AccessSpecializer.java
@@ -0,0 +1,428 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.codegen;
+
+import java.util.HashSet;
+import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.ir.AccessNode;
+import jdk.nashorn.internal.ir.Assignment;
+import jdk.nashorn.internal.ir.BinaryNode;
+import jdk.nashorn.internal.ir.CallNode;
+import jdk.nashorn.internal.ir.FunctionNode;
+import jdk.nashorn.internal.ir.IdentNode;
+import jdk.nashorn.internal.ir.IndexNode;
+import jdk.nashorn.internal.ir.Node;
+import jdk.nashorn.internal.ir.ReferenceNode;
+import jdk.nashorn.internal.ir.Symbol;
+import jdk.nashorn.internal.ir.TypeOverride;
+import jdk.nashorn.internal.ir.UnaryNode;
+import jdk.nashorn.internal.ir.VarNode;
+import jdk.nashorn.internal.ir.visitor.NodeOperatorVisitor;
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.parser.Token;
+import jdk.nashorn.internal.parser.TokenType;
+import jdk.nashorn.internal.runtime.Debug;
+import jdk.nashorn.internal.runtime.DebugLogger;
+
+/**
+ * This is a post pass for Lower, that removes casts for accessors to objects in
+ * Scope, and replaces the accessor type with a narrower one with possible.
+ *
+ * Any node that implements TypeOverride will be subject to access specialization.
+ *
+ * TypeOverride basically means "type inference has determined that the field x
+ * is an object, but if you do x & 17, it can be read as an int, which we hope
+ * coincides with its internal representation. In that case there is no boxing
+ * that may or may not be removed by the JVM and less data bandwidth.
+ *
+ * Ideally this should not be a post pass, but it requires slot AND scope info, and has
+ * to be run where it is, which is called from {@link CodeGenerator}.
+ *
+ * @see TypeOverride
+ */
+
+final class AccessSpecializer extends NodeOperatorVisitor implements Transform {
+    /** Debug logger for access specialization. Enable it with --log=access:level
+        or -Dnashorn.specializations.debug */
+    private static final DebugLogger LOG   = new DebugLogger("access", "nashorn.callsiteaccess.debug");
+    private static final boolean     DEBUG = LOG.isEnabled();
+
+    @Override
+    public Node enter(final FunctionNode node) {
+        if (node.isTransformApplied(AccessSpecializer.class)) {
+            return null;
+        }
+
+        return node;
+    }
+
+    @Override
+    public Node leave(final FunctionNode node) {
+        node.registerTransform(AccessSpecializer.class);
+        return node;
+    }
+
+    @Override
+    public Node leave(final VarNode varNode) {
+        if (varNode.isAssignment()) {
+            return leaveAssign(varNode);
+        }
+
+        return varNode;
+    }
+
+    @Override
+    public Node leave(final CallNode callNode) {
+        final Node function = callNode.getFunction();
+        if (function instanceof ReferenceNode) {
+            changeType(callNode, ((ReferenceNode)function).getReference().getType());
+        }
+        return callNode;
+    }
+
+    @Override
+    public Node leaveASSIGN(final BinaryNode binaryNode) {
+        return leaveAssign(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_ADD(final BinaryNode binaryNode) {
+        return leaveAssign(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_BIT_AND(final BinaryNode binaryNode) {
+        return leaveAssign(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_BIT_OR(final BinaryNode binaryNode) {
+        return leaveAssign(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_BIT_XOR(final BinaryNode binaryNode) {
+        return leaveAssign(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_DIV(final BinaryNode binaryNode) {
+        return leaveAssign(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_MOD(final BinaryNode binaryNode) {
+        return leaveAssign(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_MUL(final BinaryNode binaryNode) {
+        return leaveAssign(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_SAR(final BinaryNode binaryNode) {
+        return leaveAssign(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_SHL(final BinaryNode binaryNode) {
+        return leaveAssign(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_SHR(final BinaryNode binaryNode) {
+        return leaveAssign(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_SUB(final BinaryNode binaryNode) {
+        return leaveAssign(binaryNode);
+    }
+
+    @Override
+    public Node leaveCOMMALEFT(final BinaryNode binaryNode) {
+        return propagateResultType(binaryNode, binaryNode.lhs().getType());
+    }
+
+    @Override
+    public Node leaveCOMMARIGHT(final BinaryNode binaryNode) {
+        return propagateResultType(binaryNode, binaryNode.rhs().getType());
+    }
+
+    @Override
+    public Node leaveCONVERT(final UnaryNode unaryNode) {
+        final Type castTo = unaryNode.getType();
+
+        Node rhs = unaryNode.rhs();
+
+        // Go through all conversions until we find the first non-convert node.
+        while (rhs.tokenType() == TokenType.CONVERT) {
+            rhs = ((UnaryNode)rhs).rhs();
+        }
+
+        // If this node can be type changed
+        if (canHaveCallSiteType(rhs) && isSupportedCallSiteType(castTo)) {
+            /*
+             * Just add a callsite type and throw away the cast, appropriate
+             * getter/setter is selected, which will do the conversion for us
+             */
+            changeType(rhs, castTo);
+            fine("*** cast: converting " + debugNode(unaryNode) + " to " + debugNode(rhs));
+
+            return rhs;
+        }
+
+        // Micro optimization for node hygiene and pattern detection - remove unnecessary same type cast
+        if (unaryNode.getType().isEquivalentTo(rhs.getType())) {
+            return rhs;
+        }
+
+        return unaryNode;
+    }
+
+    @Override
+    public Node leaveDECINC(final UnaryNode unaryNode) {
+        assert unaryNode.isAssignment();
+
+        final Node dest = unaryNode.getAssignmentDest();
+        if (canHaveCallSiteType(dest) && isSupportedCallSiteType(unaryNode.getType())) {
+            changeTypeInAssignment(dest, unaryNode.getType());
+        }
+
+        return unaryNode;
+    }
+
+    /**
+     * Is this a node that can have its type overridden. This is true for
+     * AccessNodes, IndexNodes and IdentNodes
+     *
+     * @param node the node to check
+     * @return true if node can have a callsite type
+     */
+    private static boolean canHaveCallSiteType(final Node node) {
+        return node instanceof TypeOverride && ((TypeOverride)node).canHaveCallSiteType();
+    }
+
+    /**
+     * Is the specialization type supported. Currently we treat booleans as objects
+     * and have no special boolean type accessor, thus booleans are ignored.
+     * TODO - support booleans? NASHORN-590
+     *
+     * @param castTo the type to check
+     * @return true if call site type is supported
+     */
+    private static boolean isSupportedCallSiteType(final Type castTo) {
+        return castTo.isNumeric(); // don't specializable for boolean
+    }
+
+    /**
+     * Turn a node into a covert node
+     *
+     * @param  node the node
+     * @return the node as a convert node
+     */
+    private static Node convert(final Node node) {
+        return new UnaryNode(node.getSource(),
+                Token.recast(node.getToken(), TokenType.CONVERT),
+                node);
+    }
+
+    private static Node leaveAssign(final Node node) {
+        assert node.isAssignment() : node + " is not an assignment";
+
+
+        final Node lhs = ((Assignment<?>)node).getAssignmentDest();
+        Node       rhs = ((Assignment<?>)node).getAssignmentSource();
+
+        /**
+         * Nodes with local variable slots  are assumed to be of their optimal type
+         * already and aren't affected here. This is not strictly true, for instance
+         * with doubles instead of in a bounded loop. TODO - range check: NASHORN-363
+         *
+         * This is also not strictly true for var y = x = 55; where y has no other uses
+         * Then y can be an int, but lower conservatively does an object of the assign to
+         * scope
+         */
+        final Symbol lhsSymbol = lhs.getSymbol();
+
+        if (lhsSymbol.hasSlot() && !lhsSymbol.isScope()) {
+            finest(lhs.getSymbol() + " has slot!");
+            if (!lhs.getType().isEquivalentTo(rhs.getType())) {
+                finest("\tslot assignment: " +lhs.getType()+ " " +rhs.getType() + " " + debugNode(node));
+
+                final Node c = convert(rhs);
+                c.setSymbol(lhsSymbol);
+                ((Assignment<?>)node).setAssignmentSource(c);
+
+                fine("*** slot assignment turned to : " + debugNode(node));
+            } else {
+                finest("aborted - type equivalence between lhs and rhs");
+            }
+
+            return node;
+        }
+
+        // e.g. __DIR__, __LINE__, __FILE__ - don't try to change these
+        if (lhs instanceof IdentNode && ((IdentNode)lhs).isSpecialIdentity()) {
+            return node;
+        }
+
+        /**
+         * Try to cast to the type of the right hand side, now pruned. E.g. an (object)17 should
+         * now be just 17, an int.
+         */
+        Type castTo = rhs.getType();
+
+        // If LHS can't get a new type, neither can rhs - retain the convert
+        if (!canHaveCallSiteType(lhs)) {
+            return node;
+        }
+
+        // Take the narrowest type of the entire cast sequence
+        while (rhs.tokenType() == TokenType.CONVERT) {
+            rhs    = ((UnaryNode)rhs).rhs();
+            castTo = Type.narrowest(rhs.getType(), castTo); //e.g. (object)(int) -> int even though object is outermost
+        }
+
+        // If castTo is wider than widestOperationType, castTo can be further slowed down
+        final Type widestOperationType = node.getWidestOperationType();
+        finest("node wants to be " + castTo + " and its widest operation is " + widestOperationType);
+
+        if (widestOperationType != castTo && Type.widest(castTo, widestOperationType) == castTo) {
+            info("###" + node + " castTo was " + castTo + " but could be downgraded to " + node.getWidestOperationType());
+            castTo = node.getWidestOperationType();
+            if (rhs instanceof TypeOverride) {
+                changeType(rhs, castTo);
+            }
+        }
+
+        /*
+         * If this is a self modifying op, we can't be narrower than the widest optype
+         * or e.g. x = x + 12 and x += 12 will turn into different things
+         */
+        if (node.isSelfModifying()) {
+            castTo = Type.widest(widestOperationType, castTo);
+        }
+
+        // We only specialize for numerics, not for booleans.
+        if (isSupportedCallSiteType(castTo)) {
+            if (rhs.getType() != castTo) {
+                finest("cast was necessary, abort: " + node + " " + rhs.getType() + " != " + castTo);
+                return node;
+            }
+
+            finest("assign: " + debugNode(node));
+
+            changeTypeInAssignment(lhs, castTo);
+            ((Assignment<?>)node).setAssignmentSource(rhs);
+
+            info("### modified to " + debugNode(node) + " (given type override " + castTo + ")");
+
+            propagateResultType(node, castTo);
+        }
+
+        return node;
+    }
+
+    private static Node propagateResultType(final Node node, final Type type) {
+        //warning! this CANNOT be done for non temporaries as they are used in other computations
+        if (isSupportedCallSiteType(type)) {
+            if (node.getSymbol().isTemp()) {
+                finest("changing temporary type: " + debugNode(node) + " to " + type);
+                node.getSymbol().setTypeOverride(type);
+                info("### node modified to " + debugNode(node) + " (given type override " + type + ")");
+            }
+        }
+        return node;
+    }
+
+    private static void changeTypeInAssignment(final Node dest, final Type newType) {
+        if (changeType(dest, newType)) {
+            finest("changed assignment " + dest + " " + dest.getSymbol());
+            assert !newType.isObject();
+
+            final HashSet<Node> exclude = new HashSet<>();
+
+            dest.accept(new NodeVisitor() {
+
+                private void setCanBePrimitive(final Symbol symbol) {
+                    fine("*** can be primitive symbol " + symbol + " " + Debug.id(symbol));
+                    symbol.setCanBePrimitive(newType);
+                }
+
+                @Override
+                public Node enter(final IdentNode identNode) {
+                    if (!exclude.contains(identNode)) {
+                        setCanBePrimitive(identNode.getSymbol());
+                    }
+                    return null;
+                }
+
+                @Override
+                public Node enter(final AccessNode accessNode) {
+                    setCanBePrimitive(accessNode.getProperty().getSymbol());
+                    return null;
+                }
+
+                @Override
+                public Node enter(final IndexNode indexNode) {
+                    exclude.add(indexNode.getBase()); //prevent array base node to be flagged as primitive, but k in a[k++] is fine
+                    return indexNode;
+                }
+
+            });
+        }
+    }
+
+    private static boolean changeType(final Node node, final Type newType) {
+        if (!node.getType().equals(newType)) {
+            ((TypeOverride)node).setType(newType);
+            return true;
+        }
+        return false;
+    }
+
+    private static String debugNode(final Node node) {
+        if (DEBUG) {
+            return node.toString();
+        }
+        return "";
+    }
+
+    private static void info(final String str) {
+        LOG.info(str);
+    }
+
+    private static void fine(final String str) {
+        LOG.fine(str);
+    }
+
+    private static void finest(final String str) {
+        LOG.finest(str);
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/BranchOptimizer.java b/nashorn/src/jdk/nashorn/internal/codegen/BranchOptimizer.java
new file mode 100644
index 00000000000..e15633f801e
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/BranchOptimizer.java
@@ -0,0 +1,199 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.codegen;
+
+import static jdk.nashorn.internal.codegen.MethodEmitter.Condition.EQ;
+import static jdk.nashorn.internal.codegen.MethodEmitter.Condition.GE;
+import static jdk.nashorn.internal.codegen.MethodEmitter.Condition.GT;
+import static jdk.nashorn.internal.codegen.MethodEmitter.Condition.LE;
+import static jdk.nashorn.internal.codegen.MethodEmitter.Condition.LT;
+import static jdk.nashorn.internal.codegen.MethodEmitter.Condition.NE;
+
+import jdk.nashorn.internal.codegen.MethodEmitter.Label;
+import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.ir.BinaryNode;
+import jdk.nashorn.internal.ir.Node;
+import jdk.nashorn.internal.ir.TernaryNode;
+import jdk.nashorn.internal.ir.UnaryNode;
+
+/**
+ * Branch optimizer for CodeGenerator. Given a jump condition this helper
+ * class attempts to simplify the control flow
+ */
+final class BranchOptimizer {
+
+    private final CodeGenerator codegen;
+    private final MethodEmitter method;
+
+    BranchOptimizer(final CodeGenerator codegen, final MethodEmitter method) {
+        this.codegen = codegen;
+        this.method  = method;
+    }
+
+    void execute(final Node node, final Label label, final boolean state) {
+        branchOptimizer(node, label, state);
+    }
+
+    private void load(final Node node) {
+        codegen.load(node);
+    }
+
+    private void branchOptimizer(final UnaryNode unaryNode, final Label label, final boolean state) {
+        final Node rhs = unaryNode.rhs();
+
+        switch (unaryNode.tokenType()) {
+        case NOT:
+            branchOptimizer(rhs, label, !state);
+            return;
+        case CONVERT:
+            if (unaryNode.getType().isBoolean()) {
+                branchOptimizer(rhs, label, state);
+                return;
+            }
+            break;
+        default:
+            break;
+        }
+
+        // convert to boolean
+        load(unaryNode);
+        method.convert(Type.BOOLEAN);
+        if (state) {
+            method.ifne(label);
+        } else {
+            method.ifeq(label);
+        }
+    }
+
+    private void branchOptimizer(final BinaryNode binaryNode, final Label label, final boolean state) {
+        final Node lhs = binaryNode.lhs();
+        final Node rhs = binaryNode.rhs();
+
+        switch (binaryNode.tokenType()) {
+        case AND:
+            if (state) {
+                final Label skip = new Label("skip");
+                branchOptimizer(lhs, skip, false);
+                branchOptimizer(rhs, label, true);
+                method.label(skip);
+            } else {
+                branchOptimizer(lhs, label, false);
+                branchOptimizer(rhs, label, false);
+            }
+            return;
+
+        case OR:
+            if (state) {
+                branchOptimizer(lhs, label, true);
+                branchOptimizer(rhs, label, true);
+            } else {
+                final Label skip = new Label("skip");
+                branchOptimizer(lhs, skip, true);
+                branchOptimizer(rhs, label, false);
+                method.label(skip);
+            }
+            return;
+
+        case EQ:
+        case EQ_STRICT:
+            assert rhs.getType().isEquivalentTo(lhs.getType()) : "type mismatch: " + lhs.getSymbol() + " to " + rhs.getSymbol();
+            load(lhs);
+            load(rhs);
+            method.conditionalJump(state ? EQ : NE, true, label);
+            return;
+
+        case NE:
+        case NE_STRICT:
+            assert rhs.getType().isEquivalentTo(lhs.getType()) : "type mismatch: " + lhs.getSymbol() + " to " + rhs.getSymbol();
+            load(lhs);
+            load(rhs);
+            method.conditionalJump(state ? NE : EQ, true, label);
+            return;
+
+        case GE:
+            assert rhs.getType().isEquivalentTo(lhs.getType()) : "type mismatch: " + lhs.getSymbol() + " to " + rhs.getSymbol();
+            load(lhs);
+            load(rhs);
+            method.conditionalJump(state ? GE : LT, !state, label);
+            return;
+
+        case GT:
+            assert rhs.getType().isEquivalentTo(lhs.getType()) : "type mismatch: " + lhs.getSymbol() + " to " + rhs.getSymbol();
+            load(lhs);
+            load(rhs);
+            method.conditionalJump(state ? GT : LE, !state, label);
+            return;
+
+        case LE:
+            assert rhs.getType().isEquivalentTo(lhs.getType()) : "type mismatch: " + lhs.getSymbol() + " to " + rhs.getSymbol();
+            load(lhs);
+            load(rhs);
+            method.conditionalJump(state ? LE : GT, state, label);
+            return;
+
+        case LT:
+            assert rhs.getType().isEquivalentTo(lhs.getType()) : "type mismatch: " + lhs.getSymbol() + " to " + rhs.getSymbol() + " in " + binaryNode;
+            load(lhs);
+            load(rhs);
+            method.conditionalJump(state ? LT : GE, state, label);
+            return;
+
+        default:
+            break;
+        }
+
+        load(binaryNode);
+        method.convert(Type.BOOLEAN);
+        if (state) {
+            method.ifne(label);
+        } else {
+            method.ifeq(label);
+        }
+    }
+
+    private void branchOptimizer(final Node node, final Label label, final boolean state) {
+        if (!(node instanceof TernaryNode)) {
+
+            if (node instanceof BinaryNode) {
+                branchOptimizer((BinaryNode)node, label, state);
+                return;
+            }
+
+            if (node instanceof UnaryNode) {
+                branchOptimizer((UnaryNode)node, label, state);
+                return;
+            }
+        }
+
+        load(node);
+        method.convert(Type.BOOLEAN);
+        if (state) {
+            method.ifne(label);
+        } else {
+            method.ifeq(label);
+        }
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/ClassEmitter.java b/nashorn/src/jdk/nashorn/internal/codegen/ClassEmitter.java
new file mode 100644
index 00000000000..9b95cf836f9
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/ClassEmitter.java
@@ -0,0 +1,620 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.codegen;
+
+import static jdk.internal.org.objectweb.asm.Opcodes.ACC_FINAL;
+import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PRIVATE;
+import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PUBLIC;
+import static jdk.internal.org.objectweb.asm.Opcodes.ACC_STATIC;
+import static jdk.internal.org.objectweb.asm.Opcodes.ACC_SUPER;
+import static jdk.internal.org.objectweb.asm.Opcodes.ACC_VARARGS;
+import static jdk.internal.org.objectweb.asm.Opcodes.H_INVOKEINTERFACE;
+import static jdk.internal.org.objectweb.asm.Opcodes.H_INVOKESPECIAL;
+import static jdk.internal.org.objectweb.asm.Opcodes.H_INVOKESTATIC;
+import static jdk.internal.org.objectweb.asm.Opcodes.H_INVOKEVIRTUAL;
+import static jdk.internal.org.objectweb.asm.Opcodes.H_NEWINVOKESPECIAL;
+import static jdk.internal.org.objectweb.asm.Opcodes.V1_7;
+import static jdk.nashorn.internal.codegen.CompilerConstants.CLINIT;
+import static jdk.nashorn.internal.codegen.CompilerConstants.CONSTANTS;
+import static jdk.nashorn.internal.codegen.CompilerConstants.GET_ARRAY_PREFIX;
+import static jdk.nashorn.internal.codegen.CompilerConstants.GET_ARRAY_SUFFIX;
+import static jdk.nashorn.internal.codegen.CompilerConstants.GET_MAP;
+import static jdk.nashorn.internal.codegen.CompilerConstants.GET_STRING;
+import static jdk.nashorn.internal.codegen.CompilerConstants.INIT;
+import static jdk.nashorn.internal.codegen.CompilerConstants.SET_MAP;
+import static jdk.nashorn.internal.codegen.CompilerConstants.SOURCE;
+import static jdk.nashorn.internal.codegen.CompilerConstants.STRICT_MODE;
+import static jdk.nashorn.internal.codegen.CompilerConstants.className;
+import static jdk.nashorn.internal.codegen.CompilerConstants.methodDescriptor;
+import static jdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
+import static jdk.nashorn.internal.codegen.CompilerConstants.typeDescriptor;
+
+import java.util.Arrays;
+import java.util.EnumSet;
+import java.util.HashSet;
+import java.util.Set;
+import jdk.internal.org.objectweb.asm.ClassReader;
+import jdk.internal.org.objectweb.asm.ClassWriter;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.util.TraceClassVisitor;
+import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.ir.FunctionNode;
+import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.runtime.PropertyMap;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * The interface responsible for speaking to ASM, emitting classes,
+ * fields and methods.
+ * <p>
+ * This file contains the ClassEmitter, which is the master object
+ * responsible for writing byte codes. It utilizes a MethodEmitter
+ * for method generation, which also the NodeVisitors own, to keep
+ * track of the current code generator and what it is doing.
+ * <p>
+ * There is, however, nothing stopping you from using this in a
+ * completely self contained environment, for example in ObjectGenerator
+ * where there are no visitors or external hooks.
+ * <p>
+ * MethodEmitter makes it simple to generate code for methods without
+ * having to do arduous type checking. It maintains a type stack
+ * and will pick the appropriate operation for all operations sent to it
+ * We also allow chained called to a MethodEmitter for brevity, e.g.
+ * it is legal to write _new(className).dup() or
+ * load(slot).load(slot2).xor().store(slot3);
+ * <p>
+ * If running with assertions enabled, any type conflict, such as different
+ * bytecode stack sizes or operating on the wrong type will be detected
+ * and an error thrown.
+ * <p>
+ * There is also a very nice debug interface that can emit formatted
+ * bytecodes that have been written. This is enabled by setting the
+ * environment "nashorn.codegen.debug" to true, or --log=codegen:<level>
+ * <p>
+ * A ClassEmitter implements an Emitter - i.e. it needs to have
+ * well defined start and end calls for whatever it is generating. Assertions
+ * detect if this is not true
+ *
+ * @see Compiler
+ * @see CodeGenerator
+ */
+public class ClassEmitter implements Emitter {
+
+    /** Sanity check flag - have we started on a class? */
+    private boolean classStarted;
+
+    /** Sanity check flag - have we ended this emission? */
+    private boolean classEnded;
+
+    /**
+     * Sanity checks - which methods have we currently
+     * started for generation in this class?
+     */
+    private final HashSet<MethodEmitter> methodsStarted;
+
+    /** The ASM classwriter that we use for all bytecode operations */
+    protected final ClassWriter cw;
+
+    /** The context */
+    protected final Context context;
+
+    /** Default flags for class generation - oublic class */
+    private static final EnumSet<Flag> DEFAULT_METHOD_FLAGS = EnumSet.of(Flag.PUBLIC);
+
+    /** Compile unit class name. */
+    private String unitClassName;
+
+    /** Set of constants access methods required. */
+    private Set<Class<?>> constantMethodNeeded;
+
+    /**
+     * Constructor - only used internally in this class as it breaks
+     * abstraction towards ASM or other code generator below
+     *
+     * @param context  context
+     * @param cw       ASM classwriter
+     */
+    private ClassEmitter(final Context context, final ClassWriter cw) {
+        assert context != null;
+
+        this.context        = context;
+        this.cw             = cw;
+        this.methodsStarted = new HashSet<>();
+    }
+
+    /**
+     * Constructor
+     *
+     * @param context         context
+     * @param className       name of class to weave
+     * @param superClassName  super class name for class
+     * @param interfaceNames  names of interfaces implemented by this class, or null if none
+     */
+    public ClassEmitter(final Context context, final String className, final String superClassName, final String... interfaceNames) {
+        this(context, new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS));
+        cw.visit(V1_7, ACC_PUBLIC | ACC_SUPER, className, null, superClassName, interfaceNames);
+    }
+
+    /**
+     * Constructor from the compiler
+     *
+     * @param compiler      Compiler
+     * @param unitClassName Compile unit class name.
+     * @param strictMode    Should we generate this method in strict mode
+     */
+    ClassEmitter(final Compiler compiler, final String unitClassName, final boolean strictMode) {
+        this(compiler.getContext(),
+             new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS) {
+                private static final String OBJECT_CLASS  = "java/lang/Object";
+
+                @Override
+                protected String getCommonSuperClass(final String type1, final String type2) {
+                    try {
+                        return super.getCommonSuperClass(type1, type2);
+                    } catch (final RuntimeException e) {
+                        if (isScriptObject(Compiler.SCRIPTS_PACKAGE, type1) && isScriptObject(Compiler.SCRIPTS_PACKAGE, type2)) {
+                            return className(ScriptObject.class);
+                        }
+                        return OBJECT_CLASS;
+                    }
+                }
+            });
+
+        this.unitClassName        = unitClassName;
+        this.constantMethodNeeded = new HashSet<>();
+
+        cw.visit(V1_7, ACC_PUBLIC | ACC_SUPER, unitClassName, null, Compiler.pathName(jdk.nashorn.internal.scripts.JS$.class.getName()), null);
+        cw.visitSource(compiler.getSource().getName(), null);
+
+        defineCommonStatics(strictMode);
+    }
+
+    /**
+     * Define the static fields common in all scripts.
+     * @param strictMode Should we generate this method in strict mode
+     */
+    private void defineCommonStatics(final boolean strictMode) {
+        // source - used to store the source data (text) for this script.  Shared across
+        // compile units.  Set externally by the compiler.
+        field(EnumSet.of(Flag.PUBLIC, Flag.STATIC), SOURCE.tag(), Source.class);
+
+        // constants - used to the constants array for this script.  Shared across
+        // compile units.  Set externally by the compiler.
+        field(EnumSet.of(Flag.PUBLIC, Flag.STATIC), CONSTANTS.tag(), Object[].class);
+
+        // strictMode - was this script compiled in strict mode.  Set externally by the compiler.
+        field(EnumSet.of(Flag.PUBLIC, Flag.STATIC, Flag.FINAL), STRICT_MODE.tag(), boolean.class, strictMode);
+    }
+
+    /**
+     * Define static utilities common needed in scripts.  These are per compile unit
+     * and therefore have to be defined here and not in code gen.
+     */
+    private void defineCommonUtilities() {
+        assert unitClassName != null;
+
+        if (constantMethodNeeded.contains(String.class)) {
+            // $getString - get the ith entry from the constants table and cast to String.
+            final MethodEmitter getStringMethod = method(EnumSet.of(Flag.PRIVATE, Flag.STATIC), GET_STRING.tag(), String.class, int.class);
+            getStringMethod.begin();
+            getStringMethod.getStatic(unitClassName, CONSTANTS.tag(), CONSTANTS.descriptor())
+                        .load(Type.INT, 0)
+                        .arrayload()
+                        .checkcast(String.class)
+                        ._return();
+            getStringMethod.end();
+        }
+
+        if (constantMethodNeeded.contains(PropertyMap.class)) {
+            // $getMap - get the ith entry from the constants table and cast to PropertyMap.
+            final MethodEmitter getMapMethod = method(EnumSet.of(Flag.PUBLIC, Flag.STATIC), GET_MAP.tag(), PropertyMap.class, int.class);
+            getMapMethod.begin();
+            getMapMethod.loadConstants(unitClassName)
+                        .load(Type.INT, 0)
+                        .arrayload()
+                        .checkcast(PropertyMap.class)
+                        ._return();
+            getMapMethod.end();
+
+            // $setMap - overwrite an existing map.
+            final MethodEmitter setMapMethod = method(EnumSet.of(Flag.PUBLIC, Flag.STATIC), SET_MAP.tag(), void.class, int.class, PropertyMap.class);
+            setMapMethod.begin();
+            setMapMethod.loadConstants(unitClassName)
+                        .load(Type.INT, 0)
+                        .load(Type.OBJECT, 1)
+                        .arraystore();
+            setMapMethod.returnVoid();
+            setMapMethod.end();
+        }
+
+        // $getXXXX$array - get the ith entry from the constants table and cast to XXXX[].
+        for (final Class<?> cls : constantMethodNeeded) {
+            if (cls.isArray()) {
+                defineGetArrayMethod(cls);
+            }
+        }
+    }
+
+    /**
+     * Constructs a primitive specific method for getting the ith entry from the constants table and cast.
+     * @param cls Array class.
+     */
+    private void defineGetArrayMethod(final Class<?> cls) {
+        assert unitClassName != null;
+
+        final String        methodName     = getArrayMethodName(cls);
+        final MethodEmitter getArrayMethod = method(EnumSet.of(Flag.PRIVATE, Flag.STATIC), methodName, cls, int.class);
+
+        getArrayMethod.begin();
+        getArrayMethod.getStatic(unitClassName, CONSTANTS.tag(), CONSTANTS.descriptor())
+                      .load(Type.INT, 0)
+                      .arrayload()
+                      .checkcast(cls)
+                      .dup()
+                      .arraylength()
+                      .invoke(staticCallNoLookup(Arrays.class, "copyOf", cls, cls, int.class))
+                      ._return();
+        getArrayMethod.end();
+    }
+
+    /**
+     * Generate the name of a get array from constant pool method.
+     * @param cls Name of array class.
+     * @return Method name.
+     */
+    static String getArrayMethodName(final Class<?> cls) {
+        assert cls.isArray();
+        return GET_ARRAY_PREFIX.tag() + cls.getComponentType().getSimpleName() + GET_ARRAY_SUFFIX.tag();
+    }
+
+    /**
+     * Ensure a get constant method is issued for the class.
+     * @param cls Class of constant.
+     */
+    public void needGetConstantMethod(final Class<?> cls) {
+        constantMethodNeeded.add(cls);
+    }
+
+    /**
+     * Inspect class name and decide whether we are generating a ScriptObject class
+     *
+     * @param scriptPrefix the script class prefix for the current script
+     * @param type         the type to check
+     *
+     * @return true if type is ScriptObject
+     */
+    private static boolean isScriptObject(final String scriptPrefix, final String type) {
+        if (type.startsWith(scriptPrefix)) {
+            return true;
+        } else if (type.equals(CompilerConstants.className(ScriptObject.class))) {
+            return true;
+        } else if (type.startsWith(Compiler.OBJECTS_PACKAGE)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Call at beginning of class emission
+     * @see Emitter
+     */
+    @Override
+    public void begin() {
+        classStarted = true;
+    }
+
+    /**
+     * Call at end of class emission
+     * @see Emitter
+     */
+    @Override
+    public void end() {
+        assert classStarted;
+
+        if (unitClassName != null) {
+            defineCommonUtilities();
+        }
+
+        cw.visitEnd();
+        classStarted = false;
+        classEnded   = true;
+        assert methodsStarted.isEmpty() : "methodsStarted not empty " + methodsStarted;
+    }
+
+    /**
+     * Disassemble an array of byte code.
+     *
+     * @param context   the context
+     * @param bytecode  byte array representing bytecode
+     */
+    public static void disassemble(final Context context, final byte[] bytecode) {
+        new ClassReader(bytecode).accept(new TraceClassVisitor(context.getErr()), 0);
+    }
+
+    /**
+     * Verify an array of byte code as a valid Java class
+     *
+     * @param context  the context
+     * @param bytecode the bytecode array
+     */
+    public static void verify(final Context context, final byte[] bytecode) {
+        context.verify(bytecode);
+    }
+
+    /**
+     * @return context used for class emission
+     */
+    Context getContext() {
+        return context;
+    }
+
+    /**
+     * Call back from MethodEmitter for method start
+     *
+     * @see MethodEmitter
+     *
+     * @param method method emitter.
+     */
+    void beginMethod(final MethodEmitter method) {
+        assert !methodsStarted.contains(method);
+        methodsStarted.add(method);
+    }
+
+    /**
+     * Call back from MethodEmitter for method end
+     *
+     * @see MethodEmitter
+     *
+     * @param method
+     */
+    void endMethod(final MethodEmitter method) {
+        assert methodsStarted.contains(method);
+        methodsStarted.remove(method);
+    }
+
+    /**
+     * Add a new method to the class - defaults to public method
+     *
+     * @param methodName name of method
+     * @param rtype      return type of the method
+     * @param ptypes     parameter types the method
+     *
+     * @return method emitter to use for weaving this method
+     */
+    public MethodEmitter method(final String methodName, final Class<?> rtype, final Class<?>... ptypes) {
+        return method(DEFAULT_METHOD_FLAGS, methodName, rtype, ptypes); //TODO why public default ?
+    }
+
+    /**
+     * Add a new method to the class - defaults to public method
+     *
+     * @param methodFlags access flags for the method
+     * @param methodName  name of method
+     * @param rtype       return type of the method
+     * @param ptypes      parameter types the method
+     *
+     * @return method emitter to use for weaving this method
+     */
+    public MethodEmitter method(final EnumSet<Flag> methodFlags, final String methodName, final Class<?> rtype, final Class<?>... ptypes) {
+        return new MethodEmitter(this, cw.visitMethod(Flag.getValue(methodFlags), methodName, methodDescriptor(rtype, ptypes), null, null));
+    }
+
+    /**
+     * Add a new method to the class - defaults to public method
+     *
+     * @param methodName name of method
+     * @param descriptor descriptor of method
+     *
+     * @return method emitter to use for weaving this method
+     */
+    public MethodEmitter method(final String methodName, final String descriptor) {
+        return method(DEFAULT_METHOD_FLAGS, methodName, descriptor);
+    }
+
+    /**
+     * Add a new method to the class - defaults to public method
+     *
+     * @param methodFlags access flags for the method
+     * @param methodName  name of method
+     * @param descriptor  descriptor of method
+     *
+     * @return method emitter to use for weaving this method
+     */
+    public MethodEmitter method(final EnumSet<Flag> methodFlags, final String methodName, final String descriptor) {
+        return new MethodEmitter(this, cw.visitMethod(Flag.getValue(methodFlags), methodName, descriptor, null, null));
+    }
+
+    /**
+     * Add a new method to the class, representing a function node
+     *
+     * @param functionNode the function node to generate a method for
+     * @return method emitter to use for weaving this method
+     */
+    public MethodEmitter method(final FunctionNode functionNode) {
+        final MethodVisitor mv = cw.visitMethod(
+            ACC_PUBLIC | ACC_STATIC | (functionNode.isVarArg() ? ACC_VARARGS : 0),
+            functionNode.getName(),
+            FunctionSignature.functionSignature(functionNode),
+            null,
+            null);
+
+        return new MethodEmitter(this, mv, functionNode);
+    }
+
+    /**
+     * Start generating the <clinit> method in the class
+     *
+     * @return method emitter to use for weaving <clinit>
+     */
+    public MethodEmitter clinit() {
+        return method(EnumSet.of(Flag.STATIC), CLINIT.tag(), void.class);
+    }
+
+    /**
+     * Start generating an <init>()V method in the class
+     *
+     * @return method emitter to use for weaving <init>()V
+     */
+    public MethodEmitter init() {
+        return method(INIT.tag(), void.class);
+    }
+
+    /**
+     * Start generating an <init>()V method in the class
+     *
+     * @param ptypes parameter types for constructor
+     * @return method emitter to use for weaving <init>()V
+     */
+    public MethodEmitter init(final Class<?>... ptypes) {
+        return method(INIT.tag(), void.class, ptypes);
+    }
+
+    /**
+     * Start generating an <init>(...)V method in the class
+     *
+     * @param flags  access flags for the constructor
+     * @param ptypes parameter types for the constructor
+     *
+     * @return method emitter to use for weaving <init>(...)V
+     */
+    public MethodEmitter init(final EnumSet<Flag> flags, final Class<?>... ptypes) {
+        return method(flags, INIT.tag(), void.class, ptypes);
+    }
+
+    /**
+     * Add a field to the class, initialized to a value
+     *
+     * @param fieldFlags flags, e.g. should it be static or public etc
+     * @param fieldName  name of field
+     * @param fieldType  the type of the field
+     * @param value      the value
+     *
+     * @see ClassEmitter.Flag
+     */
+    public final void field(final EnumSet<Flag> fieldFlags, final String fieldName, final Class<?> fieldType, final Object value) {
+        cw.visitField(Flag.getValue(fieldFlags), fieldName, typeDescriptor(fieldType), null, value).visitEnd();
+    }
+
+    /**
+     * Add a field to the class
+     *
+     * @param fieldFlags access flags for the field
+     * @param fieldName  name of field
+     * @param fieldType  type of the field
+     *
+     * @see ClassEmitter.Flag
+     */
+    public final void field(final EnumSet<Flag> fieldFlags, final String fieldName, final Class<?> fieldType) {
+        field(fieldFlags, fieldName, fieldType, null);
+    }
+
+    /**
+     * Add a field to the class - defaults to public
+     *
+     * @param fieldName  name of field
+     * @param fieldType  type of field
+     */
+    public final void field(final String fieldName, final Class<?> fieldType) {
+        field(EnumSet.of(Flag.PUBLIC), fieldName, fieldType, null);
+    }
+
+    /**
+     * Return a bytecode array from this ClassEmitter. The ClassEmitter must
+     * have been ended (having its end function called) for this to work.
+     *
+     * @return byte code array for generated class, null if class generation hasn't been ended with {@link ClassEmitter#end()}
+     */
+    public byte[] toByteArray() {
+        assert classEnded;
+        if (!classEnded) {
+            return null;
+        }
+
+        return cw.toByteArray();
+    }
+
+    /**
+     * Abstraction for flags used in class emission
+     *
+     * We provide abstraction separating these from the underlying bytecode
+     * emitter.
+     *
+     * Flags are provided for method handles, protection levels, static/virtual
+     * fields/methods.
+     */
+    public static enum Flag {
+        /** method handle with static access */
+        HANDLE_STATIC(H_INVOKESTATIC),
+        /** method handle with new invoke special access */
+        HANDLE_NEWSPECIAL(H_NEWINVOKESPECIAL),
+        /** method handle with invoke special access */
+        HANDLE_SPECIAL(H_INVOKESPECIAL),
+        /** method handle with invoke virtual access */
+        HANDLE_VIRTUAL(H_INVOKEVIRTUAL),
+        /** method handle with invoke interface access */
+        HANDLE_INTERFACE(H_INVOKEINTERFACE),
+
+        /** final access */
+        FINAL(ACC_FINAL),
+        /** static access */
+        STATIC(ACC_STATIC),
+        /** public access */
+        PUBLIC(ACC_PUBLIC),
+        /** private access */
+        PRIVATE(ACC_PRIVATE);
+
+        private int value;
+
+        private Flag(final int value) {
+            this.value = value;
+        }
+
+        /**
+         * Get the value of this flag
+         * @return the int value
+         */
+        public int getValue() {
+            return value;
+        }
+
+        /**
+         * Return the corresponding ASM flag value for an enum set of flags
+         *
+         * @param flags enum set of flags
+         * @return an integer value representing the flags intrinsic values or:ed together
+         */
+        public static int getValue(final EnumSet<Flag> flags) {
+            int v = 0;
+            for (final Flag flag : flags) {
+                v |= flag.getValue();
+            }
+            return v;
+        }
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
new file mode 100644
index 00000000000..71dc3a7bcb4
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
@@ -0,0 +1,3266 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.codegen;
+
+import static jdk.nashorn.internal.codegen.ClassEmitter.Flag.PRIVATE;
+import static jdk.nashorn.internal.codegen.ClassEmitter.Flag.STATIC;
+import static jdk.nashorn.internal.codegen.CompilerConstants.GET_MAP;
+import static jdk.nashorn.internal.codegen.CompilerConstants.GET_STRING;
+import static jdk.nashorn.internal.codegen.CompilerConstants.LEAF;
+import static jdk.nashorn.internal.codegen.CompilerConstants.QUICK_PREFIX;
+import static jdk.nashorn.internal.codegen.CompilerConstants.REGEX_PREFIX;
+import static jdk.nashorn.internal.codegen.CompilerConstants.SCOPE;
+import static jdk.nashorn.internal.codegen.CompilerConstants.SPLIT_ARRAY_ARG;
+import static jdk.nashorn.internal.codegen.CompilerConstants.SPLIT_PREFIX;
+import static jdk.nashorn.internal.codegen.CompilerConstants.interfaceCallNoLookup;
+import static jdk.nashorn.internal.codegen.CompilerConstants.methodDescriptor;
+import static jdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
+import static jdk.nashorn.internal.codegen.CompilerConstants.staticField;
+import static jdk.nashorn.internal.codegen.CompilerConstants.typeDescriptor;
+import static jdk.nashorn.internal.ir.Symbol.IS_INTERNAL;
+import static jdk.nashorn.internal.ir.Symbol.IS_TEMP;
+import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_FAST_SCOPE;
+import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_FUNCTION_DECLARATION;
+import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_SCOPE;
+import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_STRICT;
+
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.TreeMap;
+import jdk.nashorn.internal.codegen.ClassEmitter.Flag;
+import jdk.nashorn.internal.codegen.CompilerConstants.Call;
+import jdk.nashorn.internal.codegen.MethodEmitter.Condition;
+import jdk.nashorn.internal.codegen.MethodEmitter.Label;
+import jdk.nashorn.internal.codegen.RuntimeCallSite.SpecializedRuntimeNode;
+import jdk.nashorn.internal.codegen.objects.FieldObjectCreator;
+import jdk.nashorn.internal.codegen.objects.FunctionObjectCreator;
+import jdk.nashorn.internal.codegen.objects.MapCreator;
+import jdk.nashorn.internal.codegen.objects.ObjectMapCreator;
+import jdk.nashorn.internal.codegen.types.ArrayType;
+import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.ir.AccessNode;
+import jdk.nashorn.internal.ir.BaseNode;
+import jdk.nashorn.internal.ir.BinaryNode;
+import jdk.nashorn.internal.ir.Block;
+import jdk.nashorn.internal.ir.BreakNode;
+import jdk.nashorn.internal.ir.CallNode;
+import jdk.nashorn.internal.ir.CaseNode;
+import jdk.nashorn.internal.ir.CatchNode;
+import jdk.nashorn.internal.ir.ContinueNode;
+import jdk.nashorn.internal.ir.DoWhileNode;
+import jdk.nashorn.internal.ir.EmptyNode;
+import jdk.nashorn.internal.ir.ExecuteNode;
+import jdk.nashorn.internal.ir.ForNode;
+import jdk.nashorn.internal.ir.FunctionNode;
+import jdk.nashorn.internal.ir.IdentNode;
+import jdk.nashorn.internal.ir.IfNode;
+import jdk.nashorn.internal.ir.IndexNode;
+import jdk.nashorn.internal.ir.LineNumberNode;
+import jdk.nashorn.internal.ir.LiteralNode;
+import jdk.nashorn.internal.ir.LiteralNode.ArrayLiteralNode;
+import jdk.nashorn.internal.ir.LiteralNode.ArrayLiteralNode.ArrayUnit;
+import jdk.nashorn.internal.ir.Node;
+import jdk.nashorn.internal.ir.ObjectNode;
+import jdk.nashorn.internal.ir.PropertyNode;
+import jdk.nashorn.internal.ir.ReferenceNode;
+import jdk.nashorn.internal.ir.ReturnNode;
+import jdk.nashorn.internal.ir.RuntimeNode;
+import jdk.nashorn.internal.ir.RuntimeNode.Request;
+import jdk.nashorn.internal.ir.SplitNode;
+import jdk.nashorn.internal.ir.SwitchNode;
+import jdk.nashorn.internal.ir.Symbol;
+import jdk.nashorn.internal.ir.TernaryNode;
+import jdk.nashorn.internal.ir.ThrowNode;
+import jdk.nashorn.internal.ir.TryNode;
+import jdk.nashorn.internal.ir.UnaryNode;
+import jdk.nashorn.internal.ir.VarNode;
+import jdk.nashorn.internal.ir.WhileNode;
+import jdk.nashorn.internal.ir.WithNode;
+import jdk.nashorn.internal.ir.debug.ASTWriter;
+import jdk.nashorn.internal.ir.visitor.NodeOperatorVisitor;
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.parser.Lexer.RegexToken;
+import jdk.nashorn.internal.parser.TokenType;
+import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.runtime.ECMAException;
+import jdk.nashorn.internal.runtime.PropertyMap;
+import jdk.nashorn.internal.runtime.Scope;
+import jdk.nashorn.internal.runtime.ScriptFunction;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
+import jdk.nashorn.internal.runtime.Source;
+import jdk.nashorn.internal.runtime.Undefined;
+import jdk.nashorn.internal.runtime.linker.LinkerCallSite;
+
+/**
+ * This is the lowest tier of the code generator. It takes lowered ASTs emitted
+ * from Lower and emits Java byte code. The byte code emission logic is broken
+ * out into MethodEmitter. MethodEmitter works internally with a type stack, and
+ * keeps track of the contents of the byte code stack. This way we avoid a large
+ * number of special cases on the form
+ * <pre>
+ * {@code
+ * if (type == INT) {
+ *     visitInsn(ILOAD, slot);
+ * } else if (type == DOUBLE) {
+ *     visitInsn(DOUBLE, slot);
+ * }
+ * }
+ * </pre>
+ * This quickly became apparent when the code generator was generalized to work
+ * with all types, and not just numbers or objects.
+ * <p>
+ * The CodeGenerator visits nodes only once, tags them as resolved and emits
+ * bytecode for them.
+ */
+public final class CodeGenerator extends NodeOperatorVisitor {
+
+    /** Current compiler */
+    private final Compiler compiler;
+
+    /** Compiler context */
+    private final Context context;
+
+    /** Call site flags given to the code generator to be used for all generated call sites */
+    private final int callSiteFlags;
+
+    /** How many regexp fields have been emitted */
+    private int regexFieldCount;
+
+    /** Map of shared scope call sites */
+    private final Map<SharedScopeCall, SharedScopeCall> scopeCalls = new HashMap<>();
+
+    /** When should we stop caching regexp expressions in fields to limit bytecode size? */
+    private static final int MAX_REGEX_FIELDS = 2 * 1024;
+
+    /**
+     * Constructor.
+     *
+     * @param compiler
+     */
+    CodeGenerator(final Compiler compiler) {
+        this.compiler      = compiler;
+        this.context       = compiler.getContext();
+        this.callSiteFlags = context._callsite_flags;
+    }
+
+    /**
+     * Get the compiler
+     *
+     * @return the compiler used
+     */
+    public Compiler getCompiler() {
+        return compiler;
+    }
+
+    /**
+     * Gets the call site flags, adding the strict flag if the current function
+     * being generated is in strict mode
+     *
+     * @return the correct flags for a call site in the current function
+     */
+    public int getCallSiteFlags() {
+        return getCurrentFunctionNode().isStrictMode() ? callSiteFlags | CALLSITE_STRICT : callSiteFlags;
+    }
+
+    /**
+     * Load an identity node
+     *
+     * @param identNode an identity node to load
+     * @return the method generator used
+     */
+    private MethodEmitter loadIdent(final IdentNode identNode) {
+        final Symbol symbol = identNode.getSymbol();
+
+        if (!symbol.isScope()) {
+            assert symbol.hasSlot() && symbol.getSlot() != 0 || symbol.isThis();
+            return method.load(symbol);
+        }
+
+        final String name = symbol.getName();
+
+        if (CompilerConstants.__FILE__.name().equals(name)) {
+            return method.load(identNode.getSource().getName());
+        } else if (CompilerConstants.__DIR__.name().equals(name)) {
+            return method.load(identNode.getSource().getBase());
+        } else if (CompilerConstants.__LINE__.name().equals(name)) {
+            return method.load(identNode.getSource().getLine(identNode.position())).convert(Type.OBJECT);
+        } else {
+            assert identNode.getSymbol().isScope() : identNode + " is not in scope!";
+
+            final int flags = CALLSITE_SCOPE | getCallSiteFlags();
+            method.loadScope();
+
+            if (symbol.isFastScope(getCurrentFunctionNode())) {
+                // Only generate shared scope getter for fast-scope symbols so we know we can dial in correct scope.
+                if (symbol.getUseCount() > SharedScopeCall.FAST_SCOPE_GET_THRESHOLD) {
+                    return loadSharedScopeVar(identNode.getType(), symbol, flags);
+                }
+                return loadFastScopeVar(identNode.getType(), symbol, flags, identNode.isFunction());
+            }
+            return method.dynamicGet(identNode.getType(), identNode.getName(), flags, identNode.isFunction());
+        }
+    }
+
+    private MethodEmitter loadSharedScopeVar(final Type valueType, final Symbol symbol, final int flags) {
+        method.load(symbol.isFastScope(getCurrentFunctionNode()) ? getScopeProtoDepth(getCurrentBlock(), symbol) : -1);
+        final SharedScopeCall scopeCall = getScopeGet(valueType, symbol, flags | CALLSITE_FAST_SCOPE);
+        scopeCall.generateInvoke(method);
+        return method;
+    }
+
+    private MethodEmitter loadFastScopeVar(final Type valueType, final Symbol symbol, final int flags, final boolean isMethod) {
+        loadFastScopeProto(symbol, false);
+        method.dynamicGet(valueType, symbol.getName(), flags | CALLSITE_FAST_SCOPE, isMethod);
+        return method;
+    }
+
+    private MethodEmitter storeFastScopeVar(final Type valueType, final Symbol symbol, final int flags) {
+        loadFastScopeProto(symbol, true);
+        method.dynamicSet(valueType, symbol.getName(), flags | CALLSITE_FAST_SCOPE);
+        return method;
+    }
+
+    private static int getScopeProtoDepth(final Block currentBlock, final Symbol symbol) {
+        if (currentBlock == symbol.getBlock()) {
+            return 0;
+        }
+
+        final int   delta       = currentBlock.needsScope() ? 1 : 0;
+        final Block parentBlock = currentBlock.getParent();
+
+        if (parentBlock != null) {
+            final int result = getScopeProtoDepth(parentBlock, symbol);
+            if (result != -1) {
+                return delta + result;
+            }
+        }
+
+        if (currentBlock instanceof FunctionNode) {
+            for (final Block lookupBlock : ((FunctionNode)currentBlock).getReferencingParentBlocks()) {
+                final int result = getScopeProtoDepth(lookupBlock, symbol);
+                if (result != -1) {
+                    return delta + result;
+                }
+            }
+        }
+
+        return -1;
+    }
+
+    private void loadFastScopeProto(final Symbol symbol, final boolean swap) {
+        final int depth = getScopeProtoDepth(getCurrentBlock(), symbol);
+        assert depth != -1;
+        if(depth > 0) {
+            if (swap) {
+                method.swap();
+            }
+            for (int i = 0; i < depth; i++) {
+                method.invoke(ScriptObject.GET_PROTO);
+            }
+            if (swap) {
+                method.swap();
+            }
+        }
+    }
+
+    /**
+     * Generate code that loads this node to the stack. This method is only
+     * public to be accessible from the maps sub package. Do not call externally
+     *
+     * @param node node to load
+     *
+     * @return the method emitter used
+     */
+    public MethodEmitter load(final Node node) {
+        return load(node, false);
+    }
+
+    private MethodEmitter load(final Node node, final boolean baseAlreadyOnStack) {
+        final Symbol symbol = node.getSymbol();
+
+        // If we lack symbols, we just generate what we see.
+        if (symbol == null) {
+            node.accept(this);
+            return method;
+        }
+
+        /*
+         * The load may be of type IdentNode, e.g. "x", AccessNode, e.g. "x.y"
+         * or IndexNode e.g. "x[y]". Both AccessNodes and IndexNodes are
+         * BaseNodes and the logic for loading the base object is reused
+         */
+        final CodeGenerator codegen = this;
+
+        node.accept(new NodeVisitor(compileUnit, method) {
+            @Override
+            public Node enter(final IdentNode identNode) {
+                loadIdent(identNode);
+                return null;
+            }
+
+            @Override
+            public Node enter(final AccessNode accessNode) {
+                if (!baseAlreadyOnStack) {
+                    load(accessNode.getBase()).convert(Type.OBJECT);
+                }
+                assert method.peekType().isObject();
+                method.dynamicGet(node.getType(), accessNode.getProperty().getName(), getCallSiteFlags(), accessNode.isFunction());
+                return null;
+            }
+
+            @Override
+            public Node enter(final IndexNode indexNode) {
+                if (!baseAlreadyOnStack) {
+                    load(indexNode.getBase());
+                    load(indexNode.getIndex());
+                }
+                method.dynamicGetIndex(node.getType(), getCallSiteFlags(), indexNode.isFunction());
+                return null;
+            }
+
+            @Override
+            public Node enterDefault(final Node otherNode) {
+                otherNode.accept(codegen); // generate code for whatever we are looking at.
+                method.load(symbol); // load the final symbol to the stack (or nop if no slot, then result is already there)
+                return null;
+            }
+        });
+
+        return method;
+    }
+
+    @Override
+    public Node enter(final AccessNode accessNode) {
+        if (accessNode.testResolved()) {
+            return null;
+        }
+
+        load(accessNode);
+
+        return null;
+    }
+
+    /**
+     * Initialize a specific set of vars to undefined. This has to be done at
+     * the start of each method for local variables that aren't passed as
+     * parameters.
+     *
+     * @param symbols list of symbols.
+     */
+    private void initSymbols(final Iterable<Symbol> symbols) {
+        final LinkedList<Symbol> numbers = new LinkedList<>();
+        final LinkedList<Symbol> objects = new LinkedList<>();
+
+        for (final Symbol symbol : symbols) {
+            /*
+             * The following symbols are guaranteed to be defined and thus safe
+             * from having unsigned written to them: parameters internals this
+             *
+             * Otherwise we must, unless we perform control/escape analysis,
+             * assign them undefined.
+             */
+            final boolean isInternal = symbol.isParam() || symbol.isInternal() || symbol.isThis() || !symbol.canBeUndefined();
+
+            if (symbol.hasSlot() && !isInternal) {
+                assert symbol.getSymbolType().isNumber() || symbol.getSymbolType().isObject() : "no potentially undefined narrower local vars than doubles are allowed: " + symbol + " in " + getCurrentFunctionNode();
+                if (symbol.getSymbolType().isNumber()) {
+                    numbers.add(symbol);
+                } else if (symbol.getSymbolType().isObject()) {
+                    objects.add(symbol);
+                }
+            }
+        }
+
+        initSymbols(numbers, Type.NUMBER);
+        initSymbols(objects, Type.OBJECT);
+    }
+
+    private void initSymbols(final LinkedList<Symbol> symbols, final Type type) {
+        if (symbols.isEmpty()) {
+            return;
+        }
+
+        method.loadUndefined(type);
+        while (!symbols.isEmpty()) {
+            final Symbol symbol = symbols.removeFirst();
+            if (!symbols.isEmpty()) {
+                method.dup();
+            }
+            method.store(symbol);
+        }
+    }
+
+    /**
+     * Create symbol debug information.
+     *
+     * @param block block containing symbols.
+     */
+    private void symbolInfo(final Block block) {
+        for (final Symbol symbol : block.getFrame().getSymbols()) {
+            method.localVariable(symbol, block.getEntryLabel(), block.getBreakLabel());
+        }
+    }
+
+    @Override
+    public Node enter(final Block block) {
+        if (block.testResolved()) {
+            return null;
+        }
+
+        method.label(block.getEntryLabel());
+        initLocals(block);
+
+        return block;
+    }
+
+    @Override
+    public Node leave(final Block block) {
+        method.label(block.getBreakLabel());
+        symbolInfo(block);
+
+        if (block.needsScope()) {
+            popBlockScope(block);
+        }
+
+        return block;
+    }
+
+    private void popBlockScope(final Block block) {
+        final Label exitLabel     = new Label("block_exit");
+        final Label recoveryLabel = new Label("block_catch");
+        final Label skipLabel     = new Label("skip_catch");
+
+        /* pop scope a la try-finally */
+        method.loadScope();
+        method.invoke(ScriptObject.GET_PROTO);
+        method.storeScope();
+        method._goto(skipLabel);
+        method.label(exitLabel);
+
+        method._catch(recoveryLabel);
+        method.loadScope();
+        method.invoke(ScriptObject.GET_PROTO);
+        method.storeScope();
+        method.athrow();
+        method.label(skipLabel);
+        method._try(block.getEntryLabel(), exitLabel, recoveryLabel, Throwable.class);
+    }
+
+    @Override
+    public Node enter(final BreakNode breakNode) {
+        if (breakNode.testResolved()) {
+            return null;
+        }
+
+        for (int i = 0; i < breakNode.getScopeNestingLevel(); i++) {
+            closeWith();
+        }
+
+        method.splitAwareGoto(breakNode.getTargetLabel());
+
+        return null;
+    }
+
+    private MethodEmitter loadArgs(final List<Node> args) {
+        return loadArgs(args, null, false, args.size());
+    }
+
+    private MethodEmitter loadArgs(final List<Node> args, final String signature, final boolean isVarArg, final int argCount) {
+        // arg have already been converted to objects here.
+        if (isVarArg || argCount > LinkerCallSite.ARGLIMIT) {
+            loadArgsArray(args);
+            return method;
+        }
+
+        // pad with undefined if size is too short. argCount is the real number of args
+        int n = 0;
+        final Type[] params = signature == null ? null : Type.getMethodArguments(signature);
+        for (final Node arg : args) {
+            assert arg != null;
+            load(arg);
+            if (params != null) {
+                method.convert(params[n]);
+            }
+            n++;
+            if (n >= argCount) {
+                break;
+            }
+        }
+
+        while (n < argCount) {
+            method.loadUndefined(Type.OBJECT);
+            n++;
+        }
+
+        return method;
+    }
+
+    /**
+     * Create a new function object, including generating its stub code.
+     *
+     * @param functionNode  FunctionNode to utilize.
+     */
+    private void newFunctionObject(final FunctionNode functionNode) {
+         // Turn thisProperties into keys and symbols for the FunctionAnalyzer
+        final Map<String, Node> thisProperties = functionNode.getThisProperties();
+
+        final List<String> keys    = new ArrayList<>();
+        final List<Symbol> symbols = new ArrayList<>();
+
+        for (final Entry<String, Node> entry : thisProperties.entrySet()) {
+            keys.add(entry.getKey());
+            symbols.add(entry.getValue().getSymbol());
+        }
+
+        new FunctionObjectCreator(this, functionNode, keys, symbols).makeObject(method);
+    }
+
+    @Override
+    public Node enter(final CallNode callNode) {
+        if (callNode.testResolved()) {
+            return null;
+        }
+
+        final List<Node>   args            = callNode.getArgs();
+        final Node         function        = callNode.getFunction();
+        final FunctionNode currentFunction = getCurrentFunctionNode();
+        final Block        currentBlock    = getCurrentBlock();
+
+        function.accept(new NodeVisitor(compileUnit, method) {
+
+            private void sharedScopeCall(final IdentNode identNode, final int flags) {
+                final Symbol symbol = identNode.getSymbol();
+                int    scopeCallFlags = flags;
+                method.loadScope();
+                if (symbol.isFastScope(currentFunction)) {
+                    method.load(getScopeProtoDepth(currentBlock, symbol));
+                    scopeCallFlags |= CALLSITE_FAST_SCOPE;
+                } else {
+                    method.load(-1); // Bypass fast-scope code in shared callsite
+                }
+                loadArgs(args);
+                final Type[] paramTypes = method.getTypesFromStack(args.size());
+                final SharedScopeCall scopeCall = getScopeCall(symbol, identNode.getType(), callNode.getType(), paramTypes, scopeCallFlags);
+                scopeCall.generateInvoke(method);
+            }
+
+            private void scopeCall(final IdentNode node, final int flags) {
+                load(node);
+                method.convert(Type.OBJECT); // foo() makes no sense if foo == 3
+                // ScriptFunction will see CALLSITE_SCOPE and will bind scope accordingly.
+                method.loadNull();
+                loadArgs(args);
+                method.dynamicCall(callNode.getType(), args.size(), flags);
+            }
+
+            private void evalCall(final IdentNode node, final int flags) {
+                load(node);
+                method.convert(Type.OBJECT); // foo() makes no sense if foo == 3
+
+                final Label not_eval  = new Label("not_eval");
+                final Label eval_done = new Label("eval_done");
+
+                // check if this is the real built-in eval
+                method.dup();
+                globalIsEval();
+
+                method.ifeq(not_eval);
+                // We don't need ScriptFunction object for 'eval'
+                method.pop();
+
+                method.loadScope(); // Load up self (scope).
+
+                final CallNode.EvalArgs evalArgs = callNode.getEvalArgs();
+                // load evaluated code
+                load(evalArgs.code);
+                method.convert(Type.OBJECT);
+                // special/extra 'eval' arguments
+                load(evalArgs.evalThis);
+                method.load(evalArgs.location);
+                method.load(evalArgs.strictMode);
+                method.convert(Type.OBJECT);
+
+                // direct call to Global.directEval
+                globalDirectEval();
+                method.convert(callNode.getType());
+                method._goto(eval_done);
+
+                method.label(not_eval);
+                // This is some scope 'eval' or global eval replaced by user
+                // but not the built-in ECMAScript 'eval' function call
+                method.loadNull();
+                loadArgs(args);
+                method.dynamicCall(callNode.getType(), args.size(), flags);
+
+                method.label(eval_done);
+            }
+
+            @Override
+            public Node enter(final IdentNode node) {
+                final Symbol symbol = node.getSymbol();
+
+                if (symbol.isScope()) {
+                    final int flags = getCallSiteFlags() | CALLSITE_SCOPE;
+                    final int useCount = symbol.getUseCount();
+
+                    // Threshold for generating shared scope callsite is lower for fast scope symbols because we know
+                    // we can dial in the correct scope. However, we als need to enable it for non-fast scopes to
+                    // support huge scripts like mandreel.js.
+                    if (callNode.isEval()) {
+                        evalCall(node, flags);
+                    } else if (useCount <= SharedScopeCall.FAST_SCOPE_CALL_THRESHOLD
+                            || (!symbol.isFastScope(currentFunction) && useCount <= SharedScopeCall.SLOW_SCOPE_CALL_THRESHOLD)
+                            || callNode.inWithBlock()) {
+                        scopeCall(node, flags);
+                    } else {
+                        sharedScopeCall(node, flags);
+                    }
+                    assert method.peekType().equals(callNode.getType());
+                } else {
+                    enterDefault(node);
+                }
+
+                return null;
+            }
+
+            @Override
+            public Node enter(final AccessNode node) {
+                load(node.getBase());
+                method.convert(Type.OBJECT);
+                method.dup();
+                method.dynamicGet(node.getType(), node.getProperty().getName(), getCallSiteFlags(), true);
+                method.swap();
+                loadArgs(args);
+                method.dynamicCall(callNode.getType(), args.size(), getCallSiteFlags());
+                assert method.peekType().equals(callNode.getType());
+
+                return null;
+            }
+
+            @Override
+            public Node enter(final ReferenceNode node) {
+                final FunctionNode callee   = node.getReference();
+                final boolean      isVarArg = callee.isVarArg();
+                final int          argCount = isVarArg ? -1 : callee.getParameters().size();
+
+                final String signature = new FunctionSignature(true, callee.needsCallee(), callee.getReturnType(), isVarArg ? null : callee.getParameters()).toString();
+
+                if (callee.isStrictMode()) { // self is undefined
+                    method.loadUndefined(Type.OBJECT);
+                } else { // get global from scope (which is the self)
+                    globalInstance();
+                }
+
+                if (callee.needsCallee()) { // TODO: always true
+                    newFunctionObject(callee); // TODO: if callee not needed, function object is used only to pass scope (could be optimized). if neither the scope nor the function object is needed by the callee, we can pass null instead.
+                }
+
+                loadArgs(args, signature, isVarArg, argCount);
+                method.invokeStatic(callee.getCompileUnit().getUnitClassName(), callee.getName(), signature);
+                assert method.peekType().equals(callee.getReturnType()) : method.peekType() + " != " + callee.getReturnType();
+
+                return null;
+            }
+
+            @Override
+            public Node enter(final IndexNode node) {
+                load(node.getBase());
+                method.convert(Type.OBJECT);
+                method.dup();
+                load(node.getIndex());
+                final Type indexType = node.getIndex().getType();
+                if (indexType.isObject() || indexType.isBoolean()) {
+                    method.convert(Type.OBJECT); //TODO
+                }
+                method.dynamicGetIndex(node.getType(), getCallSiteFlags(), true);
+                method.swap();
+                loadArgs(args);
+                method.dynamicCall(callNode.getType(), args.size(), getCallSiteFlags());
+                assert method.peekType().equals(callNode.getType());
+
+                return null;
+            }
+
+            @Override
+            protected Node enterDefault(final Node node) {
+                // Load up function.
+                load(function);
+                method.convert(Type.OBJECT); //TODO, e.g. booleans can be used as functions
+                method.loadNull(); // ScriptFunction will figure out the correct this when it sees CALLSITE_SCOPE
+
+                loadArgs(args);
+                method.dynamicCall(callNode.getType(), args.size(), getCallSiteFlags() | CALLSITE_SCOPE);
+                assert method.peekType().equals(callNode.getType());
+
+                return null;
+            }
+        });
+
+        method.store(callNode.getSymbol());
+
+        return null;
+    }
+
+    @Override
+    public Node enter(final ContinueNode continueNode) {
+        if (continueNode.testResolved()) {
+            return null;
+        }
+
+        for (int i = 0; i < continueNode.getScopeNestingLevel(); i++) {
+            closeWith();
+        }
+
+        method.splitAwareGoto(continueNode.getTargetLabel());
+
+        return null;
+    }
+
+    @Override
+    public Node enter(final DoWhileNode doWhileNode) {
+        return enter((WhileNode)doWhileNode);
+    }
+
+    @Override
+    public Node enter(final EmptyNode emptyNode) {
+        return null;
+    }
+
+    @Override
+    public Node enter(final ExecuteNode executeNode) {
+        if (executeNode.testResolved()) {
+            return null;
+        }
+
+        final Node expression = executeNode.getExpression();
+        expression.accept(this);
+
+        return null;
+    }
+
+    @Override
+    public Node enter(final ForNode forNode) {
+        if (forNode.testResolved()) {
+            return null;
+        }
+
+        final Node  test   = forNode.getTest();
+        final Block body   = forNode.getBody();
+        final Node  modify = forNode.getModify();
+
+        final Label breakLabel    = forNode.getBreakLabel();
+        final Label continueLabel = forNode.getContinueLabel();
+        final Label loopLabel     = new Label("loop");
+
+        Node init = forNode.getInit();
+
+        if (forNode.isForIn()) {
+            final Symbol iter = forNode.getIterator();
+
+            // We have to evaluate the optional initializer expression
+            // of the iterator variable of the for-in statement.
+            if (init instanceof VarNode) {
+                init.accept(this);
+                init = ((VarNode)init).getName();
+            }
+
+            load(modify);
+            assert modify.getType().isObject();
+            method.invoke(forNode.isForEach() ? ScriptRuntime.TO_VALUE_ITERATOR : ScriptRuntime.TO_PROPERTY_ITERATOR);
+            method.store(iter);
+            method._goto(continueLabel);
+            method.label(loopLabel);
+
+            new Store<Node>(init) {
+                @Override
+                protected void evaluate() {
+                    method.load(iter);
+                    method.invoke(interfaceCallNoLookup(Iterator.class, "next", Object.class));
+                }
+            }.store();
+
+            body.accept(this);
+
+            method.label(continueLabel);
+            method.load(iter);
+            method.invoke(interfaceCallNoLookup(Iterator.class, "hasNext", boolean.class));
+            method.ifne(loopLabel);
+            method.label(breakLabel);
+        } else {
+            if (init != null) {
+                init.accept(this);
+            }
+
+            final Label testLabel = new Label("test");
+
+            method._goto(testLabel);
+            method.label(loopLabel);
+            body.accept(this);
+            method.label(continueLabel);
+
+            if (!body.isTerminal() && modify != null) {
+                load(modify);
+            }
+
+            method.label(testLabel);
+            if (test != null) {
+                new BranchOptimizer(this, method).execute(test, loopLabel, true);
+            } else {
+                method._goto(loopLabel);
+            }
+
+            method.label(breakLabel);
+        }
+
+        return null;
+    }
+
+    private void initLocals(final Block block) {
+        initLocals(block, null);
+    }
+
+    /**
+     * Initialize the slots in a frame to undefined.
+     *
+     * @param block block with local vars.
+     */
+    private void initLocals(final Block block, final AccessSpecializer accessSpecializer) {
+        final FunctionNode function       = block.getFunction();
+        final boolean      isFunctionNode = block == function;
+
+        /*
+         * Get the symbols from the frame and realign the frame so that all
+         * slots get correct numbers. The slot numbering is not fixed until
+         * after initLocals has been run
+         */
+        final Frame        frame   = block.getFrame();
+        final List<Symbol> symbols = frame.getSymbols();
+
+        /* Fix the predefined slots so they have numbers >= 0, like varargs. */
+        frame.realign();
+
+        /*
+         * Determine if block needs scope, if not, just do initSymbols for this block.
+         */
+        if (block.needsScope()) {
+            /*
+             * Determine if function is varargs and consequently variables have to
+             * be in the scope.
+             */
+            final boolean isVarArg    = function.isVarArg();
+            final boolean varsInScope = function.varsInScope();
+
+            // TODO for LET we can do better: if *block* does not contain any eval/with, we don't need its vars in scope.
+
+            final List<String> nameList = new ArrayList<>();
+            final List<Symbol> locals   = new ArrayList<>();
+
+            // note that in the case of a varargs vector the arguments in the vector should NOT have local slots
+            // this was a bug: see NASHORN-21
+            if (isVarArg) {
+                for (final IdentNode param : function.getParameters()) {
+                    param.getSymbol().setNeedsSlot(false);
+                }
+            }
+
+            // If there are variable arguments, we need to load them (functions only).
+            if (isFunctionNode && isVarArg) {
+                method.loadVarArgs();
+                method.loadCallee();
+                method.load(function.getParameters().size());
+                globalAllocateArguments();
+                method.storeArguments();
+            }
+
+            // Initalize symbols and values
+            final List<Symbol> newSymbols = new ArrayList<>();
+            final List<Symbol> values     = new ArrayList<>();
+
+            for (final Symbol symbol : symbols) {
+                if (symbol.isInternal() || symbol.isThis()) {
+                    continue;
+                }
+
+                if (symbol.isVar() && (varsInScope || symbol.isScope())) {
+                    nameList.add(symbol.getName());
+                    newSymbols.add(symbol);
+                    values.add(null);
+                    symbol.setIsScope();
+                    symbol.setNeedsSlot(false);
+                } else if (symbol.isVar()) {
+                    assert symbol.hasSlot() : symbol + " should have a slot only, no scope";
+                    locals.add(symbol);
+                } else if (symbol.isParam() && (varsInScope || isVarArg || symbol.isScope())) {
+                    nameList.add(symbol.getName());
+                    newSymbols.add(symbol);
+                    values.add(isVarArg ? null : symbol);
+                    symbol.setIsScope();
+                    if (isVarArg) {
+                        symbol.setNeedsSlot(false);
+                    }
+                }
+            }
+
+            /* Correct slot numbering again */
+            frame.realign();
+
+            // we may have locals that need to be initialized
+            initSymbols(locals);
+
+            if (isFunctionNode) {
+                initScope();
+            }
+
+            if (accessSpecializer != null) {
+                ((FunctionNode)block).accept(accessSpecializer);
+            }
+
+            /*
+             * Create a new object based on the symbols and values, generate
+             * bootstrap code for object
+             */
+            final FieldObjectCreator<Symbol> foc = new FieldObjectCreator<Symbol>(this, nameList, newSymbols, values, true, isVarArg) {
+                @Override
+                protected Type getValueType(final Symbol value) {
+                    return value.getSymbolType();
+                }
+
+                @Override
+                protected void loadValue(final Symbol value) {
+                    method.load(value);
+                }
+            };
+            foc.makeObject(method);
+
+            // runScript(): merge scope into global
+            if (isFunctionNode && function.isScript()) {
+                method.invoke(ScriptRuntime.MERGE_SCOPE);
+            }
+
+            method.storeScope();
+        } else {
+            initSymbols(symbols);
+
+            if (isFunctionNode) {
+                initScope();
+            }
+        }
+
+        // Debugging: print symbols? @see --print-symbols flag
+        printSymbols(block, (isFunctionNode ? "Function " : "Block in ") + (function.getIdent() == null ? "<anonymous>" : function.getIdent().getName()));
+    }
+
+    private void initScope() {
+        method.loadCallee();
+        method.invoke(ScriptFunction.GET_SCOPE);
+        method.storeScope();
+    }
+
+    @Override
+    public Node enter(final FunctionNode functionNode) {
+        if (functionNode.testResolved()) {
+            return null;
+        }
+
+        compileUnit = functionNode.getCompileUnit();
+        assert compileUnit != null;
+
+        method = compileUnit.getClassEmitter().method(functionNode);
+        functionNode.setMethodEmitter(method);
+        // Mark end for variable tables.
+        method.begin();
+        method.label(functionNode.getEntryLabel());
+
+        initLocals(functionNode, new AccessSpecializer());
+
+        return functionNode;
+    }
+
+    @Override
+    public Node leave(final FunctionNode functionNode) {
+        // Mark end for variable tables.
+        method.label(functionNode.getBreakLabel());
+
+        if (!functionNode.needsScope()) {
+            method.markerVariable(LEAF.tag(), functionNode.getEntryLabel(), functionNode.getBreakLabel());
+        }
+
+        symbolInfo(functionNode);
+        try {
+            method.end(); // wrap up this method
+        } catch (final Throwable t) {
+            Context.printStackTrace(t);
+            final VerifyError e = new VerifyError("Code generation bug in \"" + functionNode.getName() + "\": likely stack misaligned: " + t + " " + functionNode.getSource().getName());
+            e.initCause(t);
+            throw e;
+        }
+
+        return functionNode;
+    }
+
+    @Override
+    public Node enter(final IdentNode identNode) {
+        return null;
+    }
+
+    @Override
+    public Node enter(final IfNode ifNode) {
+        if (ifNode.testResolved()) {
+            return null;
+        }
+
+        final Node  test = ifNode.getTest();
+        final Block pass = ifNode.getPass();
+        final Block fail = ifNode.getFail();
+
+        final Label failLabel  = new Label("if_fail");
+        final Label afterLabel = fail == null ? failLabel : new Label("if_done");
+
+        new BranchOptimizer(this, method).execute(test, failLabel, false);
+
+        boolean passTerminal = false;
+        boolean failTerminal = false;
+
+        pass.accept(this);
+        if (!pass.hasTerminalFlags()) {
+            method._goto(afterLabel); //don't fallthru to fail block
+        } else {
+            passTerminal = pass.isTerminal();
+        }
+
+        if (fail != null) {
+            method.label(failLabel);
+            fail.accept(this);
+            failTerminal = fail.isTerminal();
+        }
+
+        //if if terminates, put the after label there
+        if (!passTerminal || !failTerminal) {
+            method.label(afterLabel);
+        }
+
+        return null;
+    }
+
+    @Override
+    public Node enter(final IndexNode indexNode) {
+        if (indexNode.testResolved()) {
+            return null;
+        }
+
+        load(indexNode);
+
+        return null;
+    }
+
+    @Override
+    public Node enter(final LineNumberNode lineNumberNode) {
+        if (lineNumberNode.testResolved()) {
+            return null;
+        }
+
+        final Label label = new Label("line:" + lineNumberNode.getLineNumber() + " (" + getCurrentFunctionNode().getName() + ")");
+        method.label(label);
+        method.lineNumber(lineNumberNode.getLineNumber(), label);
+
+        return null;
+    }
+
+    /**
+     * Load a list of nodes as an array of a specific type
+     * The array will contain the visited nodes.
+     *
+     * @param arrayLiteralNode the array of contents
+     * @param arrayType        the type of the array, e.g. ARRAY_NUMBER or ARRAY_OBJECT
+     *
+     * @return the method generator that was used
+     */
+    private MethodEmitter loadArray(final ArrayLiteralNode arrayLiteralNode, final ArrayType arrayType) {
+        assert arrayType == Type.INT_ARRAY || arrayType == Type.NUMBER_ARRAY || arrayType == Type.OBJECT_ARRAY;
+
+        final Node[]          nodes    = arrayLiteralNode.getValue();
+        final Object          presets  = arrayLiteralNode.getPresets();
+        final int[]           postsets = arrayLiteralNode.getPostsets();
+        final Class<?>        type     = arrayType.getTypeClass();
+        final List<ArrayUnit> units    = arrayLiteralNode.getUnits();
+
+        loadConstant(presets);
+
+        final Type elementType = arrayType.getElementType();
+
+        if (units != null) {
+            final CompileUnit   savedCompileUnit = compileUnit;
+            final MethodEmitter savedMethod      = method;
+
+            try {
+                for (final ArrayUnit unit : units) {
+                    compileUnit = unit.getCompileUnit();
+
+                    final String className = compileUnit.getUnitClassName();
+                    final String name      = compiler.uniqueName(SPLIT_PREFIX.tag());
+                    final String signature = methodDescriptor(type, Object.class, ScriptFunction.class, ScriptObject.class, type);
+
+                    method = compileUnit.getClassEmitter().method(EnumSet.of(Flag.PUBLIC, Flag.STATIC), name, signature);
+                    method.setFunctionNode(getCurrentFunctionNode());
+                    method.begin();
+
+                    fixScopeSlot();
+
+                    method.load(arrayType, SPLIT_ARRAY_ARG.slot());
+
+                    for (int i = unit.getLo(); i < unit.getHi(); i++) {
+                        storeElement(nodes, elementType, postsets[i]);
+                    }
+
+                    method._return();
+                    method.end();
+
+                    savedMethod.loadThis();
+                    savedMethod.swap();
+                    savedMethod.loadCallee();
+                    savedMethod.swap();
+                    savedMethod.loadScope();
+                    savedMethod.swap();
+                    savedMethod.invokeStatic(className, name, signature);
+                }
+            } finally {
+                compileUnit = savedCompileUnit;
+                method      = savedMethod;
+            }
+
+            return method;
+        }
+
+        for (final int postset : postsets) {
+            storeElement(nodes, elementType, postset);
+        }
+
+        return method;
+    }
+
+    private void storeElement(final Node[] nodes, final Type elementType, final int index) {
+        method.dup();
+        method.load(index);
+
+        final Node element = nodes[index];
+
+        if (element == null) {
+            method.loadEmpty(elementType);
+        } else {
+            assert elementType.isEquivalentTo(element.getType()) : "array element type doesn't match array type";
+            load(element);
+        }
+
+        method.arraystore();
+    }
+
+    private MethodEmitter loadArgsArray(final List<Node> args) {
+        final Object[] array = new Object[args.size()];
+        loadConstant(array);
+
+        for (int i = 0; i < args.size(); i++) {
+            method.dup();
+            method.load(i);
+            load(args.get(i)).convert(Type.OBJECT); //has to be upcast to object or we fail
+            method.arraystore();
+        }
+
+        return method;
+    }
+
+    /**
+     * Load a constant from the constant array. This is only public to be callable from the objects
+     * subpackage. Do not call directly.
+     *
+     * @param string string to load
+     */
+    public void loadConstant(final String string) {
+        final String       unitClassName = compileUnit.getUnitClassName();
+        final ClassEmitter classEmitter  = compileUnit.getClassEmitter();
+        final int          index         = compiler.getConstantData().add(string);
+
+        method.load(index);
+        method.invokeStatic(unitClassName, GET_STRING.tag(), methodDescriptor(String.class, int.class));
+        classEmitter.needGetConstantMethod(String.class);
+    }
+
+    /**
+     * Load a constant from the constant array. This is only public to be callable from the objects
+     * subpackage. Do not call directly.
+     *
+     * @param object object to load
+     */
+    public void loadConstant(final Object object) {
+        final String       unitClassName = compileUnit.getUnitClassName();
+        final ClassEmitter classEmitter  = compileUnit.getClassEmitter();
+        final int          index         = compiler.getConstantData().add(object);
+        final Class<?>     cls           = object.getClass();
+
+        if (cls == PropertyMap.class) {
+            method.load(index);
+            method.invokeStatic(unitClassName, GET_MAP.tag(), methodDescriptor(PropertyMap.class, int.class));
+            classEmitter.needGetConstantMethod(PropertyMap.class);
+        } else if (cls.isArray()) {
+            method.load(index);
+            final String methodName = ClassEmitter.getArrayMethodName(cls);
+            method.invokeStatic(unitClassName, methodName, methodDescriptor(cls, int.class));
+            classEmitter.needGetConstantMethod(cls);
+        } else {
+            method.loadConstants(unitClassName).load(index).arrayload();
+            if (cls != Object.class) {
+                method.checkcast(cls);
+            }
+        }
+    }
+
+    // literal values
+    private MethodEmitter load(final LiteralNode<?> node) {
+        final Object value = node.getValue();
+
+        if (value == null) {
+            method.loadNull();
+        } else if (value instanceof Undefined) {
+            method.loadUndefined(Type.OBJECT);
+        } else if (value instanceof String) {
+            final String string = (String)value;
+
+            if (string.length() > (MethodEmitter.LARGE_STRING_THRESHOLD / 3)) { // 3 == max bytes per encoded char
+                loadConstant(string);
+            } else {
+                method.load(string);
+            }
+        } else if (value instanceof RegexToken) {
+            loadRegex((RegexToken)value);
+        } else if (value instanceof Boolean) {
+            method.load((Boolean)value);
+        } else if (value instanceof Integer) {
+            method.load((Integer)value);
+        } else if (value instanceof Long) {
+            method.load((Long)value);
+        } else if (value instanceof Double) {
+            method.load((Double)value);
+        } else if (node instanceof ArrayLiteralNode) {
+            final ArrayType type = (ArrayType)node.getType();
+            loadArray((ArrayLiteralNode)node, type);
+            globalAllocateArray(type);
+        } else {
+            assert false : "Unknown literal for " + node.getClass() + " " + value.getClass() + " " + value;
+        }
+
+        return method;
+    }
+
+    private MethodEmitter loadRegexToken(final RegexToken value) {
+        method.load(value.getExpression());
+        method.load(value.getOptions());
+        return globalNewRegExp();
+    }
+
+    private MethodEmitter loadRegex(final RegexToken regexToken) {
+        if (regexFieldCount > MAX_REGEX_FIELDS) {
+            return loadRegexToken(regexToken);
+        }
+        // emit field
+        final String       regexName    = compiler.uniqueName(REGEX_PREFIX.tag());
+        final ClassEmitter classEmitter = compileUnit.getClassEmitter();
+
+        classEmitter.field(EnumSet.of(PRIVATE, STATIC), regexName, Object.class);
+        regexFieldCount++;
+
+        // get field, if null create new regex, finally clone regex object
+        method.getStatic(compileUnit.getUnitClassName(), regexName, typeDescriptor(Object.class));
+        method.dup();
+        final Label cachedLabel = new Label("cached");
+        method.ifnonnull(cachedLabel);
+
+        method.pop();
+        loadRegexToken(regexToken);
+        method.dup();
+        method.putStatic(compileUnit.getUnitClassName(), regexName, typeDescriptor(Object.class));
+
+        method.label(cachedLabel);
+        globalRegExpCopy();
+
+        return method;
+    }
+
+    @SuppressWarnings("rawtypes")
+    @Override
+    public Node enter(final LiteralNode literalNode) {
+        load(literalNode).store(literalNode.getSymbol());
+        return null;
+    }
+
+    @Override
+    public Node enter(final ObjectNode objectNode) {
+        if (objectNode.testResolved()) {
+            return null;
+        }
+
+        final List<Node> elements = objectNode.getElements();
+        final int        size     = elements.size();
+
+        final List<String> keys    = new ArrayList<>();
+        final List<Symbol> symbols = new ArrayList<>();
+        final List<Node>   values  = new ArrayList<>();
+
+        boolean hasGettersSetters = false;
+
+        for (int i = 0; i < size; i++) {
+            final PropertyNode propertyNode = (PropertyNode)elements.get(i);
+            final Node         value        = propertyNode.getValue();
+            final String       key          = propertyNode.getKeyName();
+            final Symbol       symbol       = value == null ? null : propertyNode.getSymbol();
+
+            if (value == null) {
+                hasGettersSetters = true;
+            }
+
+            keys.add(key);
+            symbols.add(symbol);
+            values.add(value);
+        }
+
+        new FieldObjectCreator<Node>(this, keys, symbols, values) {
+            @Override
+            protected Type getValueType(final Node node) {
+                return node.getType();
+            }
+
+            @Override
+            protected void loadValue(final Node node) {
+                load(node);
+            }
+
+            /**
+             * Ensure that the properties start out as object types so that
+             * we can do putfield initializations instead of dynamicSetIndex
+             * which would be the case to determine initial property type
+             * otherwise.
+             *
+             * Use case, it's very expensive to do a million var x = {a:obj, b:obj}
+             * just to have to invalidate them immediately on initialization
+             *
+             * see NASHORN-594
+             */
+            @Override
+            protected MapCreator newMapCreator(final Class<?> fieldObjectClass) {
+                return new ObjectMapCreator(fieldObjectClass, keys, symbols);
+            }
+
+        }.makeObject(method);
+
+        method.dup();
+        globalObjectPrototype();
+        method.invoke(ScriptObject.SET_PROTO);
+
+        if (!hasGettersSetters) {
+            method.store(objectNode.getSymbol());
+            return null;
+        }
+
+        for (final Node element : elements) {
+            final PropertyNode  propertyNode = (PropertyNode)element;
+            final Object        key          = propertyNode.getKey();
+            final ReferenceNode getter       = (ReferenceNode)propertyNode.getGetter();
+            final ReferenceNode setter       = (ReferenceNode)propertyNode.getSetter();
+
+            if (getter == null && setter == null) {
+                continue;
+            }
+
+            method.dup().loadKey(key);
+
+            if (getter == null) {
+                method.loadNull();
+            } else {
+                getter.accept(this);
+            }
+
+            if (setter == null) {
+                method.loadNull();
+            } else {
+                setter.accept(this);
+            }
+
+            method.invoke(ScriptObject.SET_USER_ACCESSORS);
+        }
+
+        method.store(objectNode.getSymbol());
+
+        return null;
+    }
+
+    @Override
+    public Node enter(final ReferenceNode referenceNode) {
+        if (referenceNode.testResolved()) {
+            return null;
+        }
+
+        newFunctionObject(referenceNode.getReference());
+
+        return null;
+    }
+
+    @Override
+    public Node enter(final ReturnNode returnNode) {
+        if (returnNode.testResolved()) {
+            return null;
+        }
+
+        // Set the split return flag in the scope if this is a split method fragment.
+        if (method.getSplitNode() != null) {
+            assert method.getSplitNode().hasReturn() : "unexpected return in split node";
+
+            method.loadScope();
+            method.checkcast(Scope.class);
+            method.load(0);
+            method.invoke(Scope.SET_SPLIT_STATE);
+        }
+
+        final Node expression = returnNode.getExpression();
+        if (expression != null) {
+            load(expression);
+        } else {
+            method.loadUndefined(getCurrentFunctionNode().getReturnType());
+        }
+
+        method._return(getCurrentFunctionNode().getReturnType());
+
+        return null;
+    }
+
+    private static boolean isNullLiteral(final Node node) {
+        return node instanceof LiteralNode<?> && ((LiteralNode<?>) node).isNull();
+    }
+
+    private boolean nullCheck(final RuntimeNode runtimeNode, final List<Node> args, final String signature) {
+        final Request request = runtimeNode.getRequest();
+
+        if (!Request.isEQ(request) && !Request.isNE(request)) {
+            return false;
+        }
+
+        assert args.size() == 2 : "EQ or NE or TYPEOF need two args";
+
+        Node lhs = args.get(0);
+        Node rhs = args.get(1);
+
+        if (isNullLiteral(lhs)) {
+            final Node tmp = lhs;
+            lhs = rhs;
+            rhs = tmp;
+        }
+
+        if (isNullLiteral(rhs)) {
+            final Label trueLabel  = new Label("trueLabel");
+            final Label falseLabel = new Label("falseLabel");
+            final Label endLabel   = new Label("end");
+
+            load(lhs);
+            method.dup();
+            if (Request.isEQ(request)) {
+                method.ifnull(trueLabel);
+            } else if (Request.isNE(request)) {
+                method.ifnonnull(trueLabel);
+            } else {
+                assert false : "Invalid request " + request;
+            }
+
+            method.label(falseLabel);
+            load(rhs);
+            method.invokeStatic(CompilerConstants.className(ScriptRuntime.class), request.toString(), signature);
+            method._goto(endLabel);
+
+            method.label(trueLabel);
+            // if NE (not strict) this can be "undefined != null" which is supposed to be false
+            if (request == Request.NE) {
+                method.loadUndefined(Type.OBJECT);
+                final Label isUndefined = new Label("isUndefined");
+                final Label afterUndefinedCheck = new Label("afterUndefinedCheck");
+                method.if_acmpeq(isUndefined);
+                // not undefined
+                method.load(true);
+                method._goto(afterUndefinedCheck);
+                method.label(isUndefined);
+                method.load(false);
+                method.label(afterUndefinedCheck);
+            } else {
+                method.pop();
+                method.load(true);
+            }
+            method.label(endLabel);
+            method.convert(runtimeNode.getType());
+            method.store(runtimeNode.getSymbol());
+
+            return true;
+        }
+
+        return false;
+    }
+
+    private boolean specializationCheck(final RuntimeNode.Request request, final Node node, final List<Node> args) {
+        if (!request.canSpecialize()) {
+            return false;
+        }
+
+        assert args.size() == 2;
+        final Node lhs = args.get(0);
+        final Node rhs = args.get(1);
+
+        final Type returnType = node.getType();
+        load(lhs);
+        load(rhs);
+
+        Request finalRequest = request;
+
+        final Request reverse = Request.reverse(request);
+        if (method.peekType().isObject() && reverse != null) {
+            if (!method.peekType(1).isObject()) {
+                method.swap();
+                finalRequest = reverse;
+            }
+        }
+
+        method.dynamicRuntimeCall(
+                new SpecializedRuntimeNode(
+                    finalRequest,
+                    new Type[] {
+                        method.peekType(1),
+                        method.peekType()
+                    },
+                    returnType).getInitialName(),
+                returnType,
+                finalRequest);
+
+        method.convert(node.getType());
+        method.store(node.getSymbol());
+
+        return true;
+    }
+
+    @Override
+    public Node enter(final RuntimeNode runtimeNode) {
+        if (runtimeNode.testResolved()) {
+            return null;
+        }
+
+        /*
+         * First check if this should be something other than a runtime node
+         * AccessSpecializer might have changed the type
+         */
+        if (runtimeNode.isPrimitive()) {
+
+            final Node lhs = runtimeNode.getArgs().get(0);
+            Node rhs = null;
+
+            if (runtimeNode.getArgs().size() > 1) {
+                rhs = runtimeNode.getArgs().get(1);
+            }
+
+            final Type   type   = runtimeNode.getType();
+            final Symbol symbol = runtimeNode.getSymbol();
+
+            switch (runtimeNode.getRequest()) {
+            case EQ:
+            case EQ_STRICT:
+                return enterCmp(lhs, rhs, Condition.EQ, type, symbol);
+            case NE:
+            case NE_STRICT:
+                return enterCmp(lhs, rhs, Condition.NE, type, symbol);
+            case LE:
+                return enterCmp(lhs, rhs, Condition.LE, type, symbol);
+            case LT:
+                return enterCmp(lhs, rhs, Condition.LT, type, symbol);
+            case GE:
+                return enterCmp(lhs, rhs, Condition.GE, type, symbol);
+            case GT:
+                return enterCmp(lhs, rhs, Condition.GT, type, symbol);
+            case ADD:
+                return enterNumericAdd(lhs, rhs, type, symbol);
+            default:
+                // it's ok to send this one on with only primitive arguments, maybe INSTANCEOF(true, true) or similar
+                // assert false : runtimeNode + " has all primitive arguments. This is an inconsistent state";
+                break;
+            }
+        }
+
+        // Get the request arguments.
+        final List<Node> args = runtimeNode.getArgs();
+
+        if (nullCheck(runtimeNode, args, new FunctionSignature(false, runtimeNode.getType(), args).toString())) {
+            return null;
+        }
+
+        if (specializationCheck(runtimeNode.getRequest(), runtimeNode, args)) {
+            return null;
+        }
+
+        for (final Node arg : runtimeNode.getArgs()) {
+            load(arg).convert(Type.OBJECT); //TODO this should not be necessary below Lower
+        }
+
+        method.invokeStatic(
+            CompilerConstants.className(ScriptRuntime.class),
+            runtimeNode.getRequest().toString(),
+            new FunctionSignature(
+                false,
+                runtimeNode.getType(),
+                runtimeNode.getArgs().size()).toString());
+        method.convert(runtimeNode.getType());
+        method.store(runtimeNode.getSymbol());
+
+        return null;
+    }
+
+    @Override
+    public Node enter(final SplitNode splitNode) {
+        if (splitNode.testResolved()) {
+            return null;
+        }
+
+        final CompileUnit splitCompileUnit = splitNode.getCompileUnit();
+
+        final FunctionNode fn   = getCurrentFunctionNode();
+        final String className  = splitCompileUnit.getUnitClassName();
+        final String name       = splitNode.getName();
+
+        final Class<?>   rtype  = fn.getReturnType().getTypeClass();
+        final Class<?>[] ptypes = fn.isVarArg() ?
+                new Class<?>[] {Object.class, ScriptFunction.class, ScriptObject.class, Object.class} :
+                new Class<?>[] {Object.class, ScriptFunction.class, ScriptObject.class};
+
+        setCurrentCompileUnit(splitCompileUnit);
+        splitNode.setCompileUnit(splitCompileUnit);
+
+        final Call splitCall = staticCallNoLookup(
+            className,
+            name,
+            methodDescriptor(rtype, ptypes));
+
+        setCurrentMethodEmitter(
+            splitCompileUnit.getClassEmitter().method(
+                EnumSet.of(Flag.PUBLIC, Flag.STATIC),
+                name,
+                rtype,
+                ptypes));
+
+        method.setFunctionNode(fn);
+        method.setSplitNode(splitNode);
+        splitNode.setMethodEmitter(method);
+
+        final MethodEmitter caller = splitNode.getCaller();
+        caller.loadThis();
+        caller.loadCallee();
+        caller.loadScope();
+        if (fn.isVarArg()) {
+            caller.loadArguments();
+        }
+        caller.invoke(splitCall);
+        caller.storeResult();
+
+        method.begin();
+
+        method.loadUndefined(fn.getReturnType());
+        method.storeResult();
+
+        fixScopeSlot();
+
+        return splitNode;
+    }
+
+    private void fixScopeSlot() {
+        if (getCurrentFunctionNode().getScopeNode().getSymbol().getSlot() != SCOPE.slot()) {
+            // TODO hack to move the scope to the expected slot (that's needed because split methods reuse the same slots as the root method)
+            method.load(Type.typeFor(ScriptObject.class), SCOPE.slot());
+            method.storeScope();
+        }
+    }
+
+    @Override
+    public Node leave(final SplitNode splitNode) {
+        try {
+            // Wrap up this method.
+            method.loadResult();
+            method._return(getCurrentFunctionNode().getReturnType());
+            method.end();
+        } catch (final Throwable t) {
+            Context.printStackTrace(t);
+            final VerifyError e = new VerifyError("Code generation bug in \"" + splitNode.getName() + "\": likely stack misaligned: " + t + " " + compiler.getSource().getName());
+            e.initCause(t);
+            throw e;
+        }
+
+        // Handle return from split method if there was one.
+        final MethodEmitter caller      = splitNode.getCaller();
+        final List<Label>   targets     = splitNode.getExternalTargets();
+        final int           targetCount = targets.size();
+
+        if (splitNode.hasReturn() || targetCount > 0) {
+
+            caller.loadScope();
+            caller.checkcast(Scope.class);
+            caller.invoke(Scope.GET_SPLIT_STATE);
+
+            // Split state is -1 for no split state, 0 for return, 1..n+1 for break/continue
+            final Label   breakLabel = new Label("no_split_state");
+            final int     low        = splitNode.hasReturn() ? 0 : 1;
+            final int     labelCount = targetCount + 1 - low;
+            final Label[] labels     = new Label[labelCount];
+
+            for (int i = 0; i < labelCount; i++) {
+                labels[i] = new Label("split_state_" + i);
+            }
+
+            caller.tableSwitch(low, targetCount, breakLabel, labels);
+            for (int i = low; i <= targetCount; i++) {
+                caller.label(labels[i - low]);
+                if (i == 0) {
+                    caller.loadResult();
+                    caller._return(getCurrentFunctionNode().getReturnType());
+                } else {
+                    // Clear split state.
+                    caller.loadScope();
+                    caller.checkcast(Scope.class);
+                    caller.load(-1);
+                    caller.invoke(Scope.SET_SPLIT_STATE);
+                    caller.splitAwareGoto(targets.get(i - 1));
+                }
+            }
+
+            caller.label(breakLabel);
+        }
+
+        return splitNode;
+    }
+
+    @Override
+    public Node enter(final SwitchNode switchNode) {
+        if (switchNode.testResolved()) {
+            return null;
+        }
+
+        final Node           expression  = switchNode.getExpression();
+        final Symbol         tag         = switchNode.getTag();
+        final boolean        allInteger  = tag.getSymbolType().isInteger();
+        final List<CaseNode> cases       = switchNode.getCases();
+        final CaseNode       defaultCase = switchNode.getDefaultCase();
+        final Label          breakLabel  = switchNode.getBreakLabel();
+
+        Label defaultLabel = breakLabel;
+        boolean hasDefault = false;
+
+        if (defaultCase != null) {
+            defaultLabel = defaultCase.getEntry();
+            hasDefault = true;
+        }
+
+        if (cases.isEmpty()) {
+            method.label(breakLabel);
+            return null;
+        }
+
+        if (allInteger) {
+            // Tree for sorting values.
+            final TreeMap<Integer, Label> tree = new TreeMap<>();
+
+            // Build up sorted tree.
+            for (final CaseNode caseNode : cases) {
+                final Node test = caseNode.getTest();
+
+                if (test != null) {
+                    final Integer value = (Integer)((LiteralNode<?>) test).getValue();
+                    final Label   entry = caseNode.getEntry();
+
+                    // Take first duplicate.
+                    if (!(tree.containsKey(value))) {
+                        tree.put(value, entry);
+                    }
+                }
+            }
+
+            // Copy values and labels to arrays.
+            final int       size   = tree.size();
+            final Integer[] values = tree.keySet().toArray(new Integer[size]);
+            final Label[]   labels = tree.values().toArray(new Label[size]);
+
+            // Discern low, high and range.
+            final int lo    = values[0];
+            final int hi    = values[size - 1];
+            final int range = hi - lo + 1;
+
+            // Find an unused value for default.
+            int deflt = Integer.MIN_VALUE;
+            for (final int value : values) {
+                if (deflt == value) {
+                    deflt++;
+                } else if (deflt < value) {
+                    break;
+                }
+            }
+
+            // Load switch expression.
+            load(expression);
+            final Type type = expression.getType();
+
+            // If expression not int see if we can convert, if not use deflt to trigger default.
+            if (!type.isInteger()) {
+                method.load(deflt);
+                method.invoke(staticCallNoLookup(ScriptRuntime.class, "switchTagAsInt", int.class, type.getTypeClass(), int.class));
+            }
+
+            // If reasonable size and not too sparse (80%), use table otherwise use lookup.
+            if (range > 0 && range < 4096 && range < (size * 5 / 4)) {
+                final Label[] table = new Label[range];
+                Arrays.fill(table, defaultLabel);
+
+                for (int i = 0; i < size; i++) {
+                    final int value = values[i];
+                    table[value - lo] = labels[i];
+                }
+
+                method.tableSwitch(lo, hi, defaultLabel, table);
+            } else {
+                final int[] ints = new int[size];
+
+                for (int i = 0; i < size; i++) {
+                    ints[i] = values[i];
+                }
+
+                method.lookupSwitch(defaultLabel, ints, labels);
+            }
+        } else {
+            load(expression);
+
+            if (expression.getType().isInteger()) {
+                method.convert(Type.NUMBER).dup();
+                method.store(tag);
+                method.conditionalJump(MethodEmitter.Condition.NE, true, defaultLabel);
+            } else {
+                method.store(tag);
+            }
+
+            for (final CaseNode caseNode : cases) {
+                final Node test = caseNode.getTest();
+
+                if (test != null) {
+                    method.load(tag);
+                    load(test);
+                    method.invoke(ScriptRuntime.EQ_STRICT);
+                    method.ifne(caseNode.getEntry());
+                }
+            }
+
+            method._goto(hasDefault ? defaultLabel : breakLabel);
+        }
+
+        for (final CaseNode caseNode : cases) {
+            method.label(caseNode.getEntry());
+            caseNode.getBody().accept(this);
+        }
+
+        if (!switchNode.isTerminal()) {
+            method.label(breakLabel);
+        }
+
+        return null;
+    }
+
+    @Override
+    public Node enter(final ThrowNode throwNode) {
+        if (throwNode.testResolved()) {
+            return null;
+        }
+
+        method._new(ECMAException.class).dup();
+
+        final Node   expression = throwNode.getExpression();
+        final Source source     = compiler.getSource();
+        final int    position   = throwNode.position();
+        final int    line       = source.getLine(position);
+        final int    column     = source.getColumn(position);
+
+        load(expression);
+        assert expression.getType().isObject();
+
+        method.load(source.getName());
+        method.load(line);
+        method.load(column);
+        method.invoke(ECMAException.THROW_INIT);
+
+        method.athrow();
+
+        return null;
+    }
+
+    @Override
+    public Node enter(final TryNode tryNode) {
+        if (tryNode.testResolved()) {
+            return null;
+        }
+
+        final Block       body        = tryNode.getBody();
+        final List<Block> catchBlocks = tryNode.getCatchBlocks();
+        final Symbol      symbol      = tryNode.getException();
+        final Label       entry       = new Label("try");
+        final Label       recovery    = new Label("catch");
+        final Label       exit        = tryNode.getExit();
+        final Label       skip        = new Label("skip");
+
+        method.label(entry);
+
+        body.accept(this);
+
+        if (!body.hasTerminalFlags()) {
+            method._goto(skip);
+        }
+
+        method.label(exit);
+
+        method._catch(recovery);
+        method.store(symbol);
+
+        for (int i = 0; i < catchBlocks.size(); i++) {
+            final Block saveBlock = getCurrentBlock();
+            final Block catchBlock = catchBlocks.get(i);
+
+            setCurrentBlock(catchBlock);
+
+            try {
+                enter(catchBlock);
+
+                final CatchNode catchNode          = (CatchNode)catchBlocks.get(i).getStatements().get(0);
+                final IdentNode exception          = catchNode.getException();
+                final Node      exceptionCondition = catchNode.getExceptionCondition();
+                final Block     catchBody          = catchNode.getBody();
+
+                if (catchNode.isSyntheticRethrow()) {
+                    // Generate catch body (inlined finally) and rethrow exception
+                    catchBody.accept(this);
+                    method.load(symbol).athrow();
+                    continue;
+                }
+
+                new Store<IdentNode>(exception) {
+                    @Override
+                    protected void evaluate() {
+                        /*
+                         * If caught object is an instance of ECMAException, then
+                         * bind obj.thrown to the script catch var. Or else bind the
+                         * caught object itself to the script catch var.
+                         */
+                        final Label notEcmaException = new Label("no_ecma_exception");
+
+                        method.load(symbol).dup()._instanceof(ECMAException.class).ifeq(notEcmaException);
+                        method.checkcast(ECMAException.class); //TODO is this necessary?
+                        method.getField(ECMAException.THROWN);
+                        method.label(notEcmaException);
+                    }
+                }.store();
+
+                final Label next;
+
+                if (exceptionCondition != null) {
+                    next = new Label("next");
+                    load(exceptionCondition).convert(Type.BOOLEAN).ifeq(next);
+                } else {
+                    next = null;
+                }
+
+                catchBody.accept(this);
+
+                if (i + 1 != catchBlocks.size() && !catchBody.hasTerminalFlags()) {
+                    method._goto(skip);
+                }
+
+                if (next != null) {
+                    if (i + 1 == catchBlocks.size()) {
+                        // no next catch block - rethrow if condition failed
+                        method._goto(skip);
+                        method.label(next);
+                        method.load(symbol).athrow();
+                    } else {
+                        method.label(next);
+                    }
+                }
+
+                leave(catchBlock);
+            } finally {
+                setCurrentBlock(saveBlock);
+            }
+        }
+
+        method.label(skip);
+        method._try(entry, exit, recovery, Throwable.class);
+
+        // Finally body is always inlined elsewhere so it doesn't need to be emitted
+
+        return null;
+    }
+
+    @Override
+    public Node enter(final VarNode varNode) {
+        final Node init = varNode.getInit();
+
+        if (varNode.testResolved() || init == null) {
+            return null;
+        }
+
+        final Symbol varSymbol = varNode.getSymbol();
+
+        assert varSymbol != null : "variable node " + varNode + " requires a symbol";
+
+        assert method != null;
+
+        final boolean needsScope = varSymbol.isScope();
+        if (needsScope) {
+            method.loadScope();
+        }
+
+        load(init);
+
+        if (needsScope) {
+            int flags = CALLSITE_SCOPE | getCallSiteFlags();
+            if (varNode.isFunctionVarNode()) {
+                flags |= CALLSITE_FUNCTION_DECLARATION;
+            }
+            final IdentNode identNode = varNode.getName();
+            final Type type = identNode.getType();
+            if(varSymbol.isFastScope(getCurrentFunctionNode())) {
+                storeFastScopeVar(type, varSymbol, flags);
+            } else {
+                method.dynamicSet(type, identNode.getName(), flags);
+            }
+        } else {
+            assert varNode.getType() == varNode.getName().getType() : "varNode type=" + varNode.getType() + " nametype=" + varNode.getName().getType() + " inittype=" + init.getType();
+
+            method.convert(varNode.getType()); // aw: convert moved here
+            method.store(varSymbol);
+        }
+
+        return null;
+    }
+
+    @Override
+    public Node enter(final WhileNode whileNode) {
+        if (whileNode.testResolved()) {
+            return null;
+        }
+
+        final Node  test          = whileNode.getTest();
+        final Block body          = whileNode.getBody();
+        final Label breakLabel    = whileNode.getBreakLabel();
+        final Label continueLabel = whileNode.getContinueLabel();
+        final Label loopLabel     = new Label("loop");
+
+        if (!(whileNode instanceof DoWhileNode)) {
+            method._goto(continueLabel);
+        }
+
+        method.label(loopLabel);
+        body.accept(this);
+        if (!whileNode.isTerminal()) {
+            method.label(continueLabel);
+            new BranchOptimizer(this, method).execute(test, loopLabel, true);
+            method.label(breakLabel);
+        }
+
+        return null;
+    }
+
+    private void closeWith() {
+        method.loadScope();
+        method.invoke(ScriptRuntime.CLOSE_WITH);
+        method.storeScope();
+    }
+
+    @Override
+    public Node enter(final WithNode withNode) {
+        if (withNode.testResolved()) {
+            return null;
+        }
+
+        final Node expression = withNode.getExpression();
+        final Node body       = withNode.getBody();
+
+        final Label tryLabel   = new Label("with_try");
+        final Label endLabel   = new Label("with_end");
+        final Label catchLabel = new Label("with_catch");
+        final Label exitLabel  = new Label("with_exit");
+
+        method.label(tryLabel);
+
+        method.loadScope();
+        load(expression);
+
+        assert expression.getType().isObject() : "with expression needs to be object: " + expression;
+
+        method.invoke(ScriptRuntime.OPEN_WITH);
+        method.storeScope();
+
+        body.accept(this);
+
+        if (!body.isTerminal()) {
+            closeWith();
+            method._goto(exitLabel);
+        }
+
+        method.label(endLabel);
+
+        method._catch(catchLabel);
+        closeWith();
+        method.athrow();
+
+        method.label(exitLabel);
+
+        method._try(tryLabel, endLabel, catchLabel);
+
+        return null;
+    }
+
+    @Override
+    public Node enterADD(final UnaryNode unaryNode) {
+        if (unaryNode.testResolved()) {
+            return null;
+        }
+
+        load(unaryNode.rhs());
+        assert unaryNode.rhs().getType().isNumber();
+        method.store(unaryNode.getSymbol());
+
+        return null;
+    }
+
+    @Override
+    public Node enterBIT_NOT(final UnaryNode unaryNode) {
+        if (unaryNode.testResolved()) {
+            return null;
+        }
+
+        load(unaryNode.rhs()).convert(Type.INT).load(-1).xor().store(unaryNode.getSymbol());
+
+        return null;
+    }
+
+    // do this better with convert calls to method. TODO
+    @Override
+    public Node enterCONVERT(final UnaryNode unaryNode) {
+        if (unaryNode.testResolved()) {
+            return null;
+        }
+
+        final Node rhs = unaryNode.rhs();
+        final Type to  = unaryNode.getType();
+
+        if (to.isObject() && rhs instanceof LiteralNode) {
+            final LiteralNode<?> literalNode = (LiteralNode<?>)rhs;
+            final Object value = literalNode.getValue();
+
+            if (value instanceof Number) {
+                assert !to.isArray() : "type hygiene - cannot convert number to array: (" + to.getTypeClass().getSimpleName() + ')' + value;
+                if (value instanceof Integer) {
+                    method.load((Integer)value);
+                } else if (value instanceof Long) {
+                    method.load((Long)value);
+                } else if (value instanceof Double) {
+                    method.load((Double)value);
+                } else {
+                    assert false;
+                }
+                method.convert(Type.OBJECT);
+            } else if (value instanceof Boolean) {
+                method.getField(staticField(Boolean.class, value.toString().toUpperCase(), Boolean.class));
+            } else {
+                load(rhs);
+                method.convert(unaryNode.getType());
+            }
+        } else {
+            load(rhs);
+            method.convert(unaryNode.getType());
+        }
+
+        method.store(unaryNode.getSymbol());
+
+        return null;
+    }
+
+    @Override
+    public Node enterDECINC(final UnaryNode unaryNode) {
+        if (unaryNode.testResolved()) {
+            return null;
+        }
+
+        final Node      rhs         = unaryNode.rhs();
+        final Type      type        = unaryNode.getType();
+        final TokenType tokenType   = unaryNode.tokenType();
+        final boolean   isPostfix   = tokenType == TokenType.DECPOSTFIX || tokenType == TokenType.INCPOSTFIX;
+        final boolean   isIncrement = tokenType == TokenType.INCPREFIX || tokenType == TokenType.INCPOSTFIX;
+
+        assert !type.isObject();
+
+        new SelfModifyingStore<UnaryNode>(unaryNode, rhs) {
+
+            @Override
+            protected void evaluate() {
+                load(rhs, true);
+
+                method.convert(type);
+                if (!isPostfix) {
+                    if (type.isInteger()) {
+                        method.load(isIncrement ? 1 : -1);
+                    } else if (type.isLong()) {
+                        method.load(isIncrement ? 1L : -1L);
+                    } else {
+                        method.load(isIncrement ? 1.0 : -1.0);
+                    }
+                    method.add();
+                }
+            }
+
+            @Override
+            protected void storeNonDiscard() {
+                super.storeNonDiscard();
+                if (isPostfix) {
+                    if (type.isInteger()) {
+                        method.load(isIncrement ? 1 : -1);
+                    } else if (type.isLong()) {
+                        method.load(isIncrement ? 1L : 1L);
+                    } else {
+                        method.load(isIncrement ? 1.0 : -1.0);
+                    }
+                    method.add();
+                }
+            }
+        }.store();
+
+        return null;
+    }
+
+    @Override
+    public Node enterDISCARD(final UnaryNode unaryNode) {
+        if (unaryNode.testResolved()) {
+            return null;
+        }
+
+        final Node rhs = unaryNode.rhs();
+
+        load(rhs);
+
+        if (rhs.shouldDiscard()) {
+            method.pop();
+        }
+
+        return null;
+    }
+
+    @Override
+    public Node enterNEW(final UnaryNode unaryNode) {
+        if (unaryNode.testResolved()) {
+            return null;
+        }
+
+        final CallNode callNode = (CallNode)unaryNode.rhs();
+        final List<Node> args   = callNode.getArgs();
+
+        // Load function reference.
+        load(callNode.getFunction()).convert(Type.OBJECT); // must detect type error
+
+        // Load arguments.
+        loadArgs(args);
+
+        method.dynamicNew(args.size(), getCallSiteFlags());
+        method.store(unaryNode.getSymbol());
+
+        return null;
+    }
+
+    @Override
+    public Node enterNOT(final UnaryNode unaryNode) {
+        if (unaryNode.testResolved()) {
+            return null;
+        }
+
+        final Node rhs = unaryNode.rhs();
+
+        load(rhs);
+
+        final Label trueLabel  = new Label("true");
+        final Label afterLabel = new Label("after");
+
+        method.convert(Type.BOOLEAN);
+        method.ifne(trueLabel);
+        method.load(true);
+        method._goto(afterLabel);
+        method.label(trueLabel);
+        method.load(false);
+        method.label(afterLabel);
+        method.store(unaryNode.getSymbol());
+
+        return null;
+    }
+
+    @Override
+    public Node enterSUB(final UnaryNode unaryNode) {
+        if (unaryNode.testResolved()) {
+            return null;
+        }
+
+        load(unaryNode.rhs()).neg().store(unaryNode.getSymbol());
+
+        return null;
+    }
+
+    private Node enterNumericAdd(final Node lhs, final Node rhs, final Type type, final Symbol symbol) {
+        assert lhs.getType().equals(rhs.getType()) && lhs.getType().equals(type);
+        load(lhs);
+        load(rhs);
+        method.add();
+        method.store(symbol);
+
+        return null;
+    }
+
+    @Override
+    public Node enterADD(final BinaryNode binaryNode) {
+        if (binaryNode.testResolved()) {
+            return null;
+        }
+
+        final Node lhs = binaryNode.lhs();
+        final Node rhs = binaryNode.rhs();
+
+        final Type type = binaryNode.getType();
+        if (type.isNumeric()) {
+            enterNumericAdd(lhs, rhs, type, binaryNode.getSymbol());
+        } else {
+            load(lhs).convert(Type.OBJECT);
+            load(rhs).convert(Type.OBJECT);
+            method.add();
+            method.store(binaryNode.getSymbol());
+        }
+
+        return null;
+    }
+
+    private Node enterAND_OR(final BinaryNode binaryNode) {
+        if (binaryNode.testResolved()) {
+            return null;
+        }
+
+        final Node lhs = binaryNode.lhs();
+        final Node rhs = binaryNode.rhs();
+
+        final Label skip = new Label("skip");
+
+        load(lhs).convert(Type.OBJECT).dup().convert(Type.BOOLEAN);
+
+        if (binaryNode.tokenType() == TokenType.AND) {
+            method.ifeq(skip);
+        } else {
+            method.ifne(skip);
+        }
+
+        method.pop();
+        load(rhs).convert(Type.OBJECT);
+        method.label(skip);
+        method.store(binaryNode.getSymbol());
+
+        return null;
+    }
+
+    @Override
+    public Node enterAND(final BinaryNode binaryNode) {
+        return enterAND_OR(binaryNode);
+    }
+
+    @Override
+    public Node enterASSIGN(final BinaryNode binaryNode) {
+        if (binaryNode.testResolved()) {
+            return null;
+        }
+
+        final Node lhs = binaryNode.lhs();
+        final Node rhs = binaryNode.rhs();
+
+        final Type lhsType = lhs.getType();
+        final Type rhsType = rhs.getType();
+
+        if (!lhsType.isEquivalentTo(rhsType)) {
+            //this is OK if scoped, only locals are wrong
+            assert !(lhs instanceof IdentNode) || lhs.getSymbol().isScope() : new ASTWriter(binaryNode);
+        }
+
+        new Store<BinaryNode>(binaryNode, lhs) {
+            @Override
+            protected void evaluate() {
+                load(rhs);
+            }
+        }.store();
+
+        return null;
+    }
+
+    /**
+     * Helper class for assignment ops, e.g. *=, += and so on..
+     */
+    private abstract class AssignOp extends SelfModifyingStore<BinaryNode> {
+
+        /** The type of the resulting operation */
+        private final Type opType;
+
+        /**
+         * Constructor
+         *
+         * @param node the assign op node
+         */
+        AssignOp(final BinaryNode node) {
+            this(node.getType(), node);
+        }
+
+        /**
+         * Constructor
+         *
+         * @param opType type of the computation - overriding the type of the node
+         * @param node the assign op node
+         */
+        AssignOp(final Type opType, final BinaryNode node) {
+            super(node, node.lhs());
+            this.opType = opType;
+        }
+
+        @Override
+        public void store() {
+            if (assignNode.testResolved()) {
+                return;
+            }
+            super.store();
+        }
+
+        protected abstract void op();
+
+        @Override
+        protected void evaluate() {
+            load(assignNode.lhs(), true).convert(opType);
+            load(assignNode.rhs()).convert(opType);
+            op();
+            method.convert(assignNode.getType());
+        }
+    }
+
+    @Override
+    public Node enterASSIGN_ADD(final BinaryNode binaryNode) {
+        assert RuntimeNode.Request.ADD.canSpecialize();
+        final boolean specialize = binaryNode.getType() == Type.OBJECT;
+
+        new AssignOp(binaryNode) {
+            @Override
+            protected boolean isSelfModifying() {
+                return !specialize;
+            }
+
+            @Override
+            protected void op() {
+                method.add();
+            }
+
+            @Override
+            protected void evaluate() {
+                if (specialize && specializationCheck(Request.ADD, assignNode, Arrays.asList(assignNode.lhs(), assignNode.rhs()))) {
+                    return;
+                }
+                super.evaluate();
+            }
+        }.store();
+
+        return null;
+    }
+
+    @Override
+    public Node enterASSIGN_BIT_AND(final BinaryNode binaryNode) {
+        new AssignOp(Type.INT, binaryNode) {
+            @Override
+            protected void op() {
+                method.and();
+            }
+        }.store();
+
+        return null;
+    }
+
+    @Override
+    public Node enterASSIGN_BIT_OR(final BinaryNode binaryNode) {
+        new AssignOp(Type.INT, binaryNode) {
+            @Override
+            protected void op() {
+                method.or();
+            }
+        }.store();
+
+        return null;
+    }
+
+    @Override
+    public Node enterASSIGN_BIT_XOR(final BinaryNode binaryNode) {
+        new AssignOp(Type.INT, binaryNode) {
+            @Override
+            protected void op() {
+                method.xor();
+            }
+        }.store();
+
+        return null;
+    }
+
+    @Override
+    public Node enterASSIGN_DIV(final BinaryNode binaryNode) {
+        new AssignOp(binaryNode) {
+            @Override
+            protected void op() {
+                method.div();
+            }
+        }.store();
+
+        return null;
+    }
+
+    @Override
+    public Node enterASSIGN_MOD(final BinaryNode binaryNode) {
+        new AssignOp(binaryNode) {
+            @Override
+            protected void op() {
+                method.rem();
+            }
+        }.store();
+
+        return null;
+    }
+
+    @Override
+    public Node enterASSIGN_MUL(final BinaryNode binaryNode) {
+        new AssignOp(binaryNode) {
+            @Override
+            protected void op() {
+                method.mul();
+            }
+        }.store();
+
+        return null;
+    }
+
+    @Override
+    public Node enterASSIGN_SAR(final BinaryNode binaryNode) {
+        new AssignOp(Type.INT, binaryNode) {
+            @Override
+            protected void op() {
+                method.sar();
+            }
+        }.store();
+
+        return null;
+    }
+
+    @Override
+    public Node enterASSIGN_SHL(final BinaryNode binaryNode) {
+        new AssignOp(Type.INT, binaryNode) {
+            @Override
+            protected void op() {
+                method.shl();
+            }
+        }.store();
+
+        return null;
+    }
+
+    @Override
+    public Node enterASSIGN_SHR(final BinaryNode binaryNode) {
+        new AssignOp(Type.INT, binaryNode) {
+            @Override
+            protected void op() {
+                method.shr();
+                method.convert(Type.LONG).load(0xffff_ffffL).and();
+            }
+        }.store();
+
+        return null;
+    }
+
+    @Override
+    public Node enterASSIGN_SUB(final BinaryNode binaryNode) {
+        new AssignOp(binaryNode) {
+            @Override
+            protected void op() {
+                method.sub();
+            }
+        }.store();
+
+        return null;
+    }
+
+    /**
+     * Helper class for binary arithmetic ops
+     */
+    private abstract class BinaryArith {
+
+        protected abstract void op();
+
+        protected void evaluate(final BinaryNode node) {
+            if (node.testResolved()) {
+                return;
+            }
+            load(node.lhs());
+            load(node.rhs());
+            op();
+            method.store(node.getSymbol());
+        }
+    }
+
+    @Override
+    public Node enterBIT_AND(final BinaryNode binaryNode) {
+        new BinaryArith() {
+            @Override
+            protected void op() {
+                method.and();
+            }
+        }.evaluate(binaryNode);
+
+        return null;
+    }
+
+    @Override
+    public Node enterBIT_OR(final BinaryNode binaryNode) {
+        new BinaryArith() {
+            @Override
+            protected void op() {
+                method.or();
+            }
+        }.evaluate(binaryNode);
+
+        return null;
+    }
+
+    @Override
+    public Node enterBIT_XOR(final BinaryNode binaryNode) {
+        new BinaryArith() {
+            @Override
+            protected void op() {
+                method.xor();
+            }
+        }.evaluate(binaryNode);
+
+        return null;
+    }
+
+    private Node enterComma(final BinaryNode binaryNode) {
+        if (binaryNode.testResolved()) {
+            return null;
+        }
+
+        final Node lhs = binaryNode.lhs();
+        final Node rhs = binaryNode.rhs();
+
+        load(lhs);
+        load(rhs);
+        method.store(binaryNode.getSymbol());
+
+        return null;
+    }
+
+    @Override
+    public Node enterCOMMARIGHT(final BinaryNode binaryNode) {
+        return enterComma(binaryNode);
+    }
+
+    @Override
+    public Node enterCOMMALEFT(final BinaryNode binaryNode) {
+        return enterComma(binaryNode);
+    }
+
+    @Override
+    public Node enterDIV(final BinaryNode binaryNode) {
+        new BinaryArith() {
+            @Override
+            protected void op() {
+                method.div();
+            }
+        }.evaluate(binaryNode);
+
+        return null;
+    }
+
+    private Node enterCmp(final Node lhs, final Node rhs, final Condition cond, final Type type, final Symbol symbol) {
+        final Type lhsType = lhs.getType();
+        final Type rhsType = rhs.getType();
+
+        final Type widest = Type.widest(lhsType, rhsType);
+        assert widest.isNumeric() || widest.isBoolean() : widest;
+
+        load(lhs);
+        method.convert(widest);
+        load(rhs);
+        method.convert(widest);
+
+        final Label trueLabel  = new Label("trueLabel");
+        final Label afterLabel = new Label("skip");
+
+        method.conditionalJump(cond, trueLabel);
+
+        method.load(Boolean.FALSE);
+        method._goto(afterLabel);
+        method.label(trueLabel);
+        method.load(Boolean.TRUE);
+        method.label(afterLabel);
+
+        method.convert(type);
+        method.store(symbol);
+
+        return null;
+    }
+
+    private Node enterCmp(final BinaryNode binaryNode, final Condition cond) {
+        if (binaryNode.testResolved()) {
+            return null;
+        }
+        return enterCmp(binaryNode.lhs(), binaryNode.rhs(), cond, binaryNode.getType(), binaryNode.getSymbol());
+    }
+
+    @Override
+    public Node enterEQ(final BinaryNode binaryNode) {
+        return enterCmp(binaryNode, Condition.EQ);
+    }
+
+    @Override
+    public Node enterEQ_STRICT(final BinaryNode binaryNode) {
+        return enterCmp(binaryNode, Condition.EQ);
+    }
+
+    @Override
+    public Node enterGE(final BinaryNode binaryNode) {
+        return enterCmp(binaryNode, Condition.GE);
+    }
+
+    @Override
+    public Node enterGT(final BinaryNode binaryNode) {
+        return enterCmp(binaryNode, Condition.GT);
+    }
+
+    @Override
+    public Node enterLE(final BinaryNode binaryNode) {
+        return enterCmp(binaryNode, Condition.LE);
+    }
+
+    @Override
+    public Node enterLT(final BinaryNode binaryNode) {
+        return enterCmp(binaryNode, Condition.LT);
+    }
+
+    @Override
+    public Node enterMOD(final BinaryNode binaryNode) {
+        new BinaryArith() {
+            @Override
+            protected void op() {
+                method.rem();
+            }
+        }.evaluate(binaryNode);
+
+        return null;
+    }
+
+    @Override
+    public Node enterMUL(final BinaryNode binaryNode) {
+        new BinaryArith() {
+            @Override
+            protected void op() {
+                method.mul();
+            }
+        }.evaluate(binaryNode);
+
+        return null;
+    }
+
+    @Override
+    public Node enterNE(final BinaryNode binaryNode) {
+        return enterCmp(binaryNode, Condition.NE);
+    }
+
+    @Override
+    public Node enterNE_STRICT(final BinaryNode binaryNode) {
+        return enterCmp(binaryNode, Condition.NE);
+    }
+
+    @Override
+    public Node enterOR(final BinaryNode binaryNode) {
+        return enterAND_OR(binaryNode);
+    }
+
+    @Override
+    public Node enterSAR(final BinaryNode binaryNode) {
+        new BinaryArith() {
+            @Override
+            protected void op() {
+                method.sar();
+            }
+        }.evaluate(binaryNode);
+
+        return null;
+    }
+
+    @Override
+    public Node enterSHL(final BinaryNode binaryNode) {
+        new BinaryArith() {
+            @Override
+            protected void op() {
+                method.shl();
+            }
+        }.evaluate(binaryNode);
+
+        return null;
+    }
+
+    @Override
+    public Node enterSHR(final BinaryNode binaryNode) {
+        new BinaryArith() {
+            @Override
+            protected void op() {
+                method.shr();
+                method.convert(Type.LONG).load(0xffff_ffffL).and();
+            }
+        }.evaluate(binaryNode);
+
+        return null;
+    }
+
+    @Override
+    public Node enterSUB(final BinaryNode binaryNode) {
+        new BinaryArith() {
+            @Override
+            protected void op() {
+                method.sub();
+            }
+        }.evaluate(binaryNode);
+
+        return null;
+    }
+
+    /*
+     * Ternary visits.
+     */
+    @Override
+    public Node enter(final TernaryNode ternaryNode) {
+        if (ternaryNode.testResolved()) {
+            return null;
+        }
+
+        final Node lhs   = ternaryNode.lhs();
+        final Node rhs   = ternaryNode.rhs();
+        final Node third = ternaryNode.third();
+
+        final Symbol symbol     = ternaryNode.getSymbol();
+        final Label  falseLabel = new Label("ternary_false");
+        final Label  exitLabel  = new Label("ternary_exit");
+
+        final Type widest = Type.widest(rhs.getType(), third.getType());
+
+        load(lhs);
+        assert lhs.getType().isBoolean() : "lhs in ternary must be boolean";
+
+        // we still keep the conversion here as the AccessSpecializer can have separated the types, e.g. var y = x ? x=55 : 17
+        // will left as (Object)x=55 : (Object)17 by Lower. Then the first term can be {I}x=55 of type int, which breaks the
+        // symmetry for the temporary slot for this TernaryNode. This is evidence that we assign types and explicit conversions
+        // to early, or Apply the AccessSpecializer too late. We are mostly probably looking for a separate type pass to
+        // do this property. Then we never need any conversions in CodeGenerator
+        method.ifeq(falseLabel);
+        load(rhs);
+        method.convert(widest);
+        method._goto(exitLabel);
+        method.label(falseLabel);
+        load(third);
+        method.convert(widest);
+        method.label(exitLabel);
+        method.store(symbol);
+
+        return null;
+    }
+
+    /**
+     * Generate all shared scope calls generated during codegen.
+     */
+    protected void generateScopeCalls() {
+        for (final SharedScopeCall scopeAccess : scopeCalls.values()) {
+            scopeAccess.generateScopeCall();
+        }
+    }
+
+    /**
+     * Get a shared static method representing a dynamic scope callsite.
+     *
+     * @param symbol the symbol
+     * @param valueType the value type of the symbol
+     * @param returnType the return type
+     * @param paramTypes the parameter types
+     * @param flags the callsite flags
+     * @return an object representing a shared scope call
+     */
+    private SharedScopeCall getScopeCall(final Symbol symbol, final Type valueType, final Type returnType,
+                                         final Type[] paramTypes, final int flags) {
+
+        final SharedScopeCall scopeCall = new SharedScopeCall(symbol, valueType, returnType, paramTypes, flags);
+        if (scopeCalls.containsKey(scopeCall)) {
+            return scopeCalls.get(scopeCall);
+        }
+        scopeCall.setClassAndName(compileUnit, compiler);
+        scopeCalls.put(scopeCall, scopeCall);
+        return scopeCall;
+    }
+
+    /**
+     * Get a shared static method representing a dynamic scope get access.
+     *
+     * @param type the type of the variable
+     * @param symbol the symbol
+     * @param flags the callsite flags
+     * @return an object representing a shared scope call
+     */
+    private SharedScopeCall getScopeGet(final Type type, final Symbol symbol, final int flags) {
+
+        final SharedScopeCall scopeCall = new SharedScopeCall(symbol, type, type, null, flags);
+        if (scopeCalls.containsKey(scopeCall)) {
+            return scopeCalls.get(scopeCall);
+        }
+        scopeCall.setClassAndName(compileUnit, compiler);
+        scopeCalls.put(scopeCall, scopeCall);
+        return scopeCall;
+    }
+
+    /**
+     * Debug code used to print symbols
+     *
+     * @param block the block we are in
+     * @param ident identifier for block or function where applicable
+     */
+    private void printSymbols(final Block block, final String ident) {
+        if (!context._print_symbols) {
+            return;
+        }
+
+        @SuppressWarnings("resource")
+        final PrintWriter out = context.getErr();
+        out.println("[BLOCK in '" + ident + "']");
+        if (!block.printSymbols(out)) {
+            out.println("<no symbols>");
+        }
+        out.println();
+    }
+
+
+    /**
+     * The difference between a store and a self modifying store is that
+     * the latter may load part of the target on the stack, e.g. the base
+     * of an AccessNode or the base and index of an IndexNode. These are used
+     * both as target and as an extra source. Previously it was problematic
+     * for self modifying stores if the target/lhs didn't belong to one
+     * of three trivial categories: IdentNode, AcessNodes, IndexNodes. In that
+     * case it was evaluated and tagged as "resolved", which meant at the second
+     * time the lhs of this store was read (e.g. in a = a (second) + b for a += b,
+     * it would be evaluated to a nop in the scope and cause stack underflow
+     *
+     * see NASHORN-703
+     *
+     * @param <T>
+     */
+    private abstract class SelfModifyingStore<T extends Node> extends Store<T> {
+        protected SelfModifyingStore(final T assignNode, final Node target) {
+            super(assignNode, target);
+        }
+
+        @Override
+        protected boolean isSelfModifying() {
+            return true;
+        }
+    }
+
+    /**
+     * Helper class to generate stores
+     */
+    private abstract class Store<T extends Node> {
+
+        /** An assignment node, e.g. x += y */
+        protected final T assignNode;
+
+        /** The target node to store to, e.g. x */
+        private final Node target;
+
+        /** Should the result always be discarded, no matter what? */
+        private final boolean alwaysDiscard;
+
+        /** How deep on the stack do the arguments go if this generates an indy call */
+        private int depth;
+
+        /** If we have too many arguments, we need temporary storage, this is stored in 'quick' */
+        private Symbol quick;
+
+        /**
+         * Constructor
+         *
+         * @param assignNode the node representing the whole assignment
+         * @param target     the target node of the assignment (destination)
+         */
+        protected Store(final T assignNode, final Node target) {
+            this.assignNode = assignNode;
+            this.target = target;
+            this.alwaysDiscard = assignNode == target;
+        }
+
+        /**
+         * Constructor
+         *
+         * @param assignNode the node representing the whole assignment
+         */
+        protected Store(final T assignNode) {
+            this(assignNode, assignNode);
+        }
+
+        /**
+         * Is this a self modifying store operation, e.g. *= or ++
+         * @return true if self modifying store
+         */
+        protected boolean isSelfModifying() {
+            return false;
+        }
+
+        private void prologue() {
+            final Symbol targetSymbol = target.getSymbol();
+            final Symbol scopeSymbol  = getCurrentFunctionNode().getScopeNode().getSymbol();
+
+            /**
+             * This loads the parts of the target, e.g base and index. they are kept
+             * on the stack throughout the store and used at the end to execute it
+             */
+
+            target.accept(new NodeVisitor(compileUnit, method) {
+                @Override
+                public Node enter(final IdentNode node) {
+                    if (targetSymbol.isScope()) {
+                        method.load(scopeSymbol);
+                        depth++;
+                    }
+                    return null;
+                }
+
+                private void enterBaseNode() {
+                    assert target instanceof BaseNode : "error - base node " + target + " must be instanceof BaseNode";
+                    final BaseNode baseNode = (BaseNode)target;
+                    final Node     base     = baseNode.getBase();
+
+                    load(base);
+                    method.convert(Type.OBJECT);
+                    depth += Type.OBJECT.getSlots();
+
+                    if (isSelfModifying()) {
+                        method.dup();
+                    }
+                }
+
+                @Override
+                public Node enter(final AccessNode node) {
+                    enterBaseNode();
+                    return null;
+                }
+
+                @Override
+                public Node enter(final IndexNode node) {
+                    enterBaseNode();
+
+                    final Node index = node.getIndex();
+                    // could be boolean here as well
+                    load(index);
+                    if (!index.getType().isNumeric()) {
+                        method.convert(Type.OBJECT);
+                    }
+                    depth += index.getType().getSlots();
+
+                    if (isSelfModifying()) {
+                        //convert "base base index" to "base index base index"
+                        method.dup(1);
+                    }
+
+                    return null;
+                }
+
+            });
+        }
+
+        private Symbol quickSymbol(final Type type) {
+            return quickSymbol(type, QUICK_PREFIX.tag());
+        }
+
+        /**
+         * Quick symbol generates an extra local variable, always using the same
+         * slot, one that is available after the end of the frame.
+         *
+         * @param type the type of the symbol
+         * @param prefix the prefix for the variable name for the symbol
+         *
+         * @return the quick symbol
+         */
+        private Symbol quickSymbol(final Type type, final String prefix) {
+            final String name = compiler.uniqueName(prefix);
+            final Symbol symbol = new Symbol(name, IS_TEMP | IS_INTERNAL, null, null);
+
+            symbol.setType(type);
+            symbol.setSlot(getCurrentBlock().getFrame().getSlotCount());
+
+            return symbol;
+        }
+
+        // store the result that "lives on" after the op, e.g. "i" in i++ postfix.
+        protected void storeNonDiscard() {
+            if (assignNode.shouldDiscard() || alwaysDiscard) {
+                assignNode.setDiscard(false);
+                return;
+            }
+
+            final Symbol symbol = assignNode.getSymbol();
+            if (symbol.hasSlot()) {
+                method.dup().store(symbol);
+                return;
+            }
+
+            if (method.dup(depth) == null) {
+                method.dup();
+                this.quick = quickSymbol(method.peekType());
+                method.store(quick);
+            }
+        }
+
+        private void epilogue() {
+            final Symbol targetSymbol = target.getSymbol();
+            final FunctionNode currentFunction = getCurrentFunctionNode();
+
+            /**
+             * Take the original target args from the stack and use them
+             * together with the value to be stored to emit the store code
+             */
+            if (targetSymbol.hasSlot()) {
+                method.convert(target.getType());
+            }
+
+            target.accept(new NodeVisitor(compileUnit, method) {
+                @Override
+                public Node enter(final IdentNode node) {
+                    final Symbol symbol = target.getSymbol();
+                    if (symbol.isScope()) {
+                        if(symbol.isFastScope(currentFunction)) {
+                            storeFastScopeVar(target.getType(), symbol, CALLSITE_SCOPE | getCallSiteFlags());
+                        } else {
+                            method.dynamicSet(target.getType(), node.getName(), CALLSITE_SCOPE | getCallSiteFlags());
+                        }
+                    } else {
+                        assert targetSymbol != null;
+                        method.store(targetSymbol);
+                    }
+                    return null;
+
+                }
+
+                @Override
+                public Node enter(final AccessNode node) {
+                    method.dynamicSet(node.getProperty().getType(), node.getProperty().getName(), getCallSiteFlags());
+                    return null;
+                }
+
+                @Override
+                public Node enter(final IndexNode node) {
+                    method.dynamicSetIndex(getCallSiteFlags());
+                    return null;
+                }
+            });
+
+
+            // whatever is on the stack now is the final answer
+        }
+
+        protected abstract void evaluate();
+
+        void store() {
+            prologue();
+            evaluate(); // leaves an operation of whatever the operationType was on the stack
+            storeNonDiscard();
+            epilogue();
+            if (quick != null) {
+                method.load(quick);
+            }
+        }
+
+    }
+
+    /*
+     * Globals are special. We cannot refer to any Global (or NativeObject) class by .class, as they are different
+     * for different contexts. As far as I can tell, the only NativeObject that we need to deal with like this
+     * is from the code pipeline is Global
+     */
+    private MethodEmitter globalInstance() {
+        return method.invokeStatic(Compiler.GLOBAL_OBJECT, "instance", "()L" + Compiler.GLOBAL_OBJECT + ';');
+    }
+
+    private MethodEmitter globalObjectPrototype() {
+        return method.invokeStatic(Compiler.GLOBAL_OBJECT, "objectPrototype", methodDescriptor(ScriptObject.class));
+    }
+
+    private MethodEmitter globalAllocateArguments() {
+        return method.invokeStatic(Compiler.GLOBAL_OBJECT, "allocateArguments", methodDescriptor(Object.class, Object[].class, Object.class, int.class));
+    }
+
+    private MethodEmitter globalNewRegExp() {
+        return method.invokeStatic(Compiler.GLOBAL_OBJECT, "newRegExp", methodDescriptor(Object.class, String.class, String.class));
+    }
+
+    private MethodEmitter globalRegExpCopy() {
+        return method.invokeStatic(Compiler.GLOBAL_OBJECT, "regExpCopy", methodDescriptor(Object.class, Object.class));
+    }
+
+    private MethodEmitter globalAllocateArray(final ArrayType type) {
+        //make sure the native array is treated as an array type
+        return method.invokeStatic(Compiler.GLOBAL_OBJECT, "allocate", methodDescriptor(Object.class, type.getTypeClass()), type);
+    }
+
+    private MethodEmitter globalIsEval() {
+        return method.invokeStatic(Compiler.GLOBAL_OBJECT, "isEval", methodDescriptor(boolean.class, Object.class));
+    }
+
+    private MethodEmitter globalDirectEval() {
+        return method.invokeStatic(Compiler.GLOBAL_OBJECT, "directEval",
+                methodDescriptor(Object.class, Object.class, Object.class, Object.class, Object.class, Object.class));
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CompileUnit.java b/nashorn/src/jdk/nashorn/internal/codegen/CompileUnit.java
new file mode 100644
index 00000000000..676348e1b19
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CompileUnit.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.codegen;
+
+/**
+ * Used to track split class compilation.
+ */
+public class CompileUnit {
+    /** Current class name */
+    private final String className;
+
+    /** Current class generator */
+    private final ClassEmitter classEmitter;
+
+    private long weight;
+
+    CompileUnit(final String className, final ClassEmitter classEmitter) {
+        this(className, classEmitter, 0L);
+    }
+
+    CompileUnit(final String className, final ClassEmitter classEmitter, final long initialWeight) {
+        this.className    = className;
+        this.classEmitter = classEmitter;
+        this.weight       = initialWeight;
+    }
+
+    /**
+     * Add weight to this compile unit
+     * @param w weight to add
+     */
+    public void addWeight(final long w) {
+        this.weight += w;
+    }
+
+    /**
+     * Get the current weight of the compile unit.
+     * @return the unit's weight
+     */
+    public long getWeight() {
+        return weight;
+    }
+
+    /**
+     * Check if this compile unit can hold {@code weight} more units of weight
+     * @param w weight to check if can be added
+     * @return true if weight fits in this compile unit
+     */
+    public boolean canHold(final long w) {
+        return (this.weight + w) < Splitter.SPLIT_THRESHOLD;
+    }
+
+    /**
+     * Get the class emitter for this compile unit
+     * @return class emitter
+     */
+    public ClassEmitter getClassEmitter() {
+        return classEmitter;
+    }
+
+    /**
+     * Get the class name for this compile unit
+     * @return the class name
+     */
+    public String getUnitClassName() {
+        return className;
+    }
+
+    @Override
+    public String toString() {
+        return "[classname=" + className + " weight=" + weight + '/' + Splitter.SPLIT_THRESHOLD + ']';
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java b/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
new file mode 100644
index 00000000000..f7ddfd32ca5
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
@@ -0,0 +1,685 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.codegen;
+
+import static jdk.nashorn.internal.codegen.CompilerConstants.CONSTANTS;
+import static jdk.nashorn.internal.codegen.CompilerConstants.DEFAULT_SCRIPT_NAME;
+import static jdk.nashorn.internal.codegen.CompilerConstants.RUN_SCRIPT;
+import static jdk.nashorn.internal.codegen.CompilerConstants.SCOPE;
+import static jdk.nashorn.internal.codegen.CompilerConstants.SOURCE;
+import static jdk.nashorn.internal.codegen.CompilerConstants.THIS;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.EnumSet;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.TreeMap;
+import jdk.nashorn.internal.codegen.ClassEmitter.Flag;
+import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.ir.FunctionNode;
+import jdk.nashorn.internal.ir.Node;
+import jdk.nashorn.internal.ir.debug.ASTWriter;
+import jdk.nashorn.internal.ir.debug.PrintVisitor;
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.parser.Parser;
+import jdk.nashorn.internal.runtime.CodeInstaller;
+import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.runtime.DebugLogger;
+import jdk.nashorn.internal.runtime.ECMAErrors;
+import jdk.nashorn.internal.runtime.ErrorManager;
+import jdk.nashorn.internal.runtime.Source;
+import jdk.nashorn.internal.runtime.linker.Mangler;
+import jdk.nashorn.internal.runtime.options.Options;
+
+/**
+ * Responsible for converting JavaScripts to java byte code. Main entry
+ * point for code generator
+ */
+public final class Compiler {
+
+    /** Compiler states available */
+    public enum State {
+        /** compiler is ready */
+        INITIALIZED,
+        /** method has been parsed */
+        PARSED,
+        /** method has been lowered */
+        LOWERED,
+        /** method has been emitted to bytecode */
+        EMITTED
+    }
+
+    /** Current context */
+    private final Context context;
+
+    /** Currently compiled source */
+    private final Source source;
+
+    /** Current error manager */
+    private final ErrorManager errors;
+
+    /** Names uniqueName for this compile. */
+    private final Namespace namespace;
+
+    /** Current function node, or null if compiling from source until parsed */
+    private FunctionNode functionNode;
+
+    /** Current compiler state */
+    private final EnumSet<State> state;
+
+    /** Name of the scripts package */
+    public static final String SCRIPTS_PACKAGE = "jdk/nashorn/internal/scripts";
+
+    /** Name of the objects package */
+    public static final String OBJECTS_PACKAGE = "jdk/nashorn/internal/objects";
+
+    /** Name of the Global object, cannot be referred to as .class, @see CodeGenerator */
+    public static final String GLOBAL_OBJECT = OBJECTS_PACKAGE + '/' + "Global";
+
+    /** Name of the ScriptObjectImpl, cannot be referred to as .class @see FunctionObjectCreator */
+    public static final String SCRIPTOBJECT_IMPL_OBJECT = OBJECTS_PACKAGE + '/' + "ScriptFunctionImpl";
+
+    /** Name of the Trampoline, cannot be referred to as .class @see FunctionObjectCreator */
+    public static final String TRAMPOLINE_OBJECT = OBJECTS_PACKAGE + '/' + "Trampoline";
+
+    /** Compile unit (class) table. */
+    private final Set<CompileUnit> compileUnits;
+
+    /** All the "complex" constants used in the code. */
+    private final ConstantData constantData;
+
+    static final DebugLogger LOG = new DebugLogger("compiler");
+
+    /** Script name */
+    private String scriptName;
+
+    /** Should we dump classes to disk and compile only? */
+    private final boolean dumpClass;
+
+    /** Code map class name -> byte code for all classes generated from this Source or FunctionNode */
+    private Map<String, byte[]> code;
+
+    /** Are we compiling in strict mode? */
+    private boolean strict;
+
+    /** Is this a lazy compilation - i.e. not from source, but jitting a previously parsed FunctionNode? */
+    private boolean isLazy;
+
+    /** Lazy jitting is disabled by default */
+    private static final boolean LAZY_JIT = false;
+
+    /**
+     * Should we use integers for literals and all operations
+     * that are based in constant and parameter assignment as
+     * long as they can be proven not to overflow? With this enabled
+     * var x = 17 would tag x as an integer, rather than a double,
+     * but as soon as it is used in an operation that may potentially
+     * overflow, such as an add, we conservatively widen it to double
+     * (number type). This is because overflow checks in the code
+     * are likely much more expensive that method specialization
+     *
+     * @return true if numbers should start as ints, false if they should
+     *   start as doubles
+     */
+    static boolean shouldUseIntegers() {
+        return USE_INTS;
+    }
+
+    private static final boolean USE_INTS;
+
+    /**
+     * Should we use integers for arithmetic operations as well?
+     * TODO: We currently generate no overflow checks so this is
+     * disabled
+     *
+     * @see #shouldUseIntegers()
+     *
+     * @return true if arithmetic operations should not widen integer
+     *   operands by default.
+     */
+    static boolean shouldUseIntegerArithmetic() {
+        return Compiler.shouldUseIntegers() && USE_INT_ARITH;
+    }
+
+    private static final boolean USE_INT_ARITH;
+
+    static {
+        USE_INTS       = !Options.getBooleanProperty("nashorn.compiler.ints.disable");
+        USE_INT_ARITH  =  Options.getBooleanProperty("nashorn.compiler.intarithmetic");
+
+        assert !USE_INT_ARITH : "Integer arithmetic is not enabled";
+    }
+
+    /**
+     * Factory method for compiler that should compile from source to bytecode
+     *
+     * @param source  the source
+     * @param context context
+     *
+     * @return compiler instance
+     */
+    public static Compiler compiler(final Source source, final Context context) {
+        return Compiler.compiler(source, context, context.getErrors(), context._strict);
+    }
+
+    /**
+     * Factory method to get a compiler that goes from from source to bytecode
+     *
+     * @param source  source code
+     * @param context context
+     * @param errors  error manager
+     * @param strict  compilation in strict mode?
+     *
+     * @return compiler instance
+     */
+    public static Compiler compiler(final Source source, final Context context, final ErrorManager errors, final boolean strict) {
+        return new Compiler(source, context, errors, strict);
+    }
+
+    /**
+     * Factory method to get a compiler that goes from FunctionNode (parsed) to bytecode
+     * Requires previous compiler for state
+     *
+     * @param compiler primordial compiler
+     * @param functionNode functionNode to compile
+     *
+     * @return compiler
+     */
+    public static Compiler compiler(final Compiler compiler, final FunctionNode functionNode) {
+        assert false : "lazy jit - not implemented";
+        final Compiler newCompiler = new Compiler(compiler);
+        newCompiler.state.add(State.PARSED);
+        newCompiler.functionNode = functionNode;
+        newCompiler.isLazy = true;
+        return compiler;
+    }
+
+    private Compiler(final Compiler compiler) {
+        this(compiler.source, compiler.context, compiler.errors, compiler.strict);
+    }
+
+    /**
+     * Constructor
+     *
+     * @param source  the source to compile
+     * @param context context
+     * @param errors  error manager
+     * @param strict  compile in strict mode
+     */
+    private Compiler(final Source source, final Context context, final ErrorManager errors, final boolean strict) {
+        this.source       = source;
+        this.context      = context;
+        this.errors       = errors;
+        this.strict       = strict;
+        this.namespace    = new Namespace(context.getNamespace());
+        this.compileUnits = new HashSet<>();
+        this.constantData = new ConstantData();
+        this.state        = EnumSet.of(State.INITIALIZED);
+        this.dumpClass    = context._compile_only && context._dest_dir != null;
+    }
+
+    private String scriptsPackageName() {
+        return dumpClass ? "" : (SCRIPTS_PACKAGE + '/');
+    }
+
+    private int nextCompileUnitIndex() {
+        return compileUnits.size() + 1;
+    }
+
+    private String firstCompileUnitName() {
+        return scriptsPackageName() + scriptName;
+    }
+
+    private String nextCompileUnitName() {
+        return firstCompileUnitName() + '$' + nextCompileUnitIndex();
+    }
+
+    private CompileUnit addCompileUnit(final long initialWeight) {
+        return addCompileUnit(nextCompileUnitName(), initialWeight);
+    }
+
+    private CompileUnit addCompileUnit(final String unitClassName, final long initialWeight) {
+        final CompileUnit compileUnit = initCompileUnit(unitClassName, initialWeight);
+        compileUnits.add(compileUnit);
+        LOG.info("Added compile unit " + compileUnit);
+        return compileUnit;
+    }
+
+    private CompileUnit initCompileUnit(final String unitClassName, final long initialWeight) {
+        final ClassEmitter classEmitter = new ClassEmitter(this, unitClassName, strict);
+        final CompileUnit  compileUnit  = new CompileUnit(unitClassName, classEmitter, initialWeight);
+
+        classEmitter.begin();
+
+        final MethodEmitter initMethod = classEmitter.init(EnumSet.of(Flag.PRIVATE));
+        initMethod.begin();
+        initMethod.load(Type.OBJECT, 0);
+        initMethod.newInstance(jdk.nashorn.internal.scripts.JS$.class);
+        initMethod.returnVoid();
+        initMethod.end();
+
+        return compileUnit;
+    }
+
+    /**
+     * Perform compilation
+     *
+     * @return true if successful, false otherwise - if false check the error manager
+     */
+    public boolean compile() {
+        assert state.contains(State.INITIALIZED);
+
+        /** do we need to parse source? */
+        if (!state.contains(State.PARSED)) {
+            assert this.functionNode == null;
+            this.functionNode = new Parser(this, strict).parse(RUN_SCRIPT.tag());
+
+            state.add(State.PARSED);
+            debugPrintParse();
+
+            if (errors.hasErrors() || context._parse_only) {
+                return false;
+            }
+
+            assert !isLazy;
+            //tag lazy nodes for later code generation and trampolines
+            functionNode.accept(new NodeVisitor() {
+                @Override
+                public Node enter(final FunctionNode node) {
+                    if (LAZY_JIT) {
+                        node.setIsLazy(!node.isScript());
+                    }
+                    return node;
+                }
+            });
+        } else {
+            assert isLazy;
+            functionNode.accept(new NodeVisitor() {
+                @Override
+                public Node enter(final FunctionNode node) {
+                    node.setIsLazy(false);
+                    return null; //TODO do we want to do this recursively? then return "node" instead
+                }
+            });
+        }
+
+        assert functionNode != null;
+        final boolean oldStrict = strict;
+
+        try {
+            strict |= functionNode.isStrictMode();
+
+            if (!state.contains(State.LOWERED)) {
+                debugPrintAST();
+                functionNode.accept(new Lower(this));
+                state.add(State.LOWERED);
+
+                if (errors.hasErrors()) {
+                    return false;
+                }
+            }
+
+            scriptName = computeNames();
+
+            // Main script code always goes to this compile unit. Note that since we start this with zero weight
+            // and add script code last this class may end up slightly larger than others, but reserving one class
+            // just for the main script seems wasteful.
+            final CompileUnit scriptCompileUnit = addCompileUnit(firstCompileUnitName(), 0l);
+            new Splitter(this, functionNode, scriptCompileUnit).split();
+            assert functionNode.getCompileUnit() == scriptCompileUnit;
+
+            /** Compute compile units */
+            assert strict == functionNode.isStrictMode() : "strict == " + strict + " but functionNode == " + functionNode.isStrictMode();
+            if (functionNode.isStrictMode()) {
+                strict = true;
+            }
+
+            try {
+                final CodeGenerator codegen = new CodeGenerator(this);
+                functionNode.accept(codegen);
+                codegen.generateScopeCalls();
+                debugPrintAST();
+                debugPrintParse();
+            } catch (final VerifyError e) {
+                if (context._verify_code || context._print_code) {
+                    context.getErr().println(e.getClass().getSimpleName() + ": " + e.getMessage());
+                    if (context._dump_on_error) {
+                        e.printStackTrace(context.getErr());
+                    }
+                } else {
+                    throw e;
+                }
+            }
+
+            state.add(State.EMITTED);
+
+            code = new TreeMap<>();
+            for (final CompileUnit compileUnit : compileUnits) {
+                final ClassEmitter classEmitter = compileUnit.getClassEmitter();
+                classEmitter.end();
+
+                if (!errors.hasErrors()) {
+                    final byte[] bytecode = classEmitter.toByteArray();
+                    if (bytecode != null) {
+                        code.put(compileUnit.getUnitClassName(), bytecode);
+                        debugDisassemble();
+                        debugVerify();
+                    }
+               }
+            }
+
+            if (code.isEmpty()) {
+                return false;
+            }
+
+            try {
+                dumpClassFiles();
+            } catch (final IOException e) {
+                throw new RuntimeException(e);
+            }
+
+            return true;
+        } finally {
+            strict = oldStrict;
+        }
+    }
+
+    /**
+     * Install compiled classes into a given loader
+     * @param installer that takes the generated classes and puts them in the system
+     * @return root script class - if there are several compile units they will also be installed
+     */
+    public Class<?> install(final CodeInstaller installer) {
+        assert state.contains(State.EMITTED);
+        assert scriptName != null;
+
+        Class<?> rootClass = null;
+
+        for (final Entry<String, byte[]> entry : code.entrySet()) {
+            final String     className = entry.getKey();
+            LOG.info("Installing class " + className);
+
+            final byte[]     bytecode  = entry.getValue();
+            final Class<?>   clazz     = installer.install(Compiler.binaryName(className), bytecode);
+
+            if (rootClass == null && firstCompileUnitName().equals(className)) {
+                rootClass = clazz;
+            }
+
+            try {
+                //use reflection to write source and constants table to installed classes
+                clazz.getField(SOURCE.tag()).set(null, source);
+                clazz.getField(CONSTANTS.tag()).set(null, constantData.toArray());
+            } catch (final NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        LOG.info("Root class: " + rootClass);
+
+        return rootClass;
+    }
+
+    /**
+     * Find a unit that will hold a node of the specified weight.
+     *
+     * @param weight Weight of a node
+     * @return Unit to hold node.
+     */
+    CompileUnit findUnit(final long weight) {
+        for (final CompileUnit unit : compileUnits) {
+            if (unit.canHold(weight)) {
+                unit.addWeight(weight);
+                return unit;
+            }
+        }
+
+        return addCompileUnit(weight);
+    }
+
+    /**
+     * Generate a uniqueName name. Public as {@link Parser} is using this to
+     * create symbols in a different package
+     *
+     * @param  name to base unique name on
+     * @return unique name
+     */
+    public String uniqueName(final String name) {
+        return namespace.uniqueName(name);
+    }
+
+    /**
+     * Internal function to compute reserved names and base names for class to
+     * be generated
+     *
+     * @return scriptName
+     */
+    private String computeNames() {
+        // Reserve internally used names.
+        addReservedNames();
+
+        if (dumpClass) {
+            // get source file name and remove ".js"
+            final String baseName = getSource().getName();
+            final int    index    = baseName.lastIndexOf(".js");
+            if (index != -1) {
+                return baseName.substring(0, index);
+            }
+            return baseName;
+        }
+
+        return namespace.getParent().uniqueName(
+            DEFAULT_SCRIPT_NAME.tag() +
+            '$' +
+            safeSourceName(source) +
+            (isLazy ? CompilerConstants.LAZY.tag() : "")
+        );
+    }
+
+    private static String safeSourceName(final Source source) {
+        String baseName = new File(source.getName()).getName();
+        final int index = baseName.lastIndexOf(".js");
+        if (index != -1) {
+            baseName = baseName.substring(0, index);
+        }
+
+        baseName = baseName.replace('.', '_').replace('-', '_');
+        final String mangled = Mangler.mangle(baseName);
+
+        baseName = mangled != null ? mangled : baseName;
+        return baseName;
+    }
+
+    static void verify(final Context context, final byte[] code) {
+        context.verify(code);
+    }
+
+    /**
+     * Fill in the namespace with internally reserved names.
+     */
+    private void addReservedNames() {
+        namespace.uniqueName(SCOPE.tag());
+        namespace.uniqueName(THIS.tag());
+    }
+
+    /**
+     * Get the constant data for this Compiler
+     *
+     * @return the constant data
+     */
+    public ConstantData getConstantData() {
+        return constantData;
+    }
+
+    /**
+     * Get the Context used for Compilation
+     * @see Context
+     * @return the context
+     */
+    public Context getContext() {
+        return context;
+    }
+
+    /**
+     * Get the Source being compiled
+     * @see Source
+     * @return the source
+     */
+    public Source getSource() {
+        return source;
+    }
+
+    /**
+     * Get the error manager used for this compiler
+     * @return the error manager
+     */
+    public ErrorManager getErrors() {
+        return errors;
+    }
+
+    /**
+     * Get the namespace used for this Compiler
+     * @see Namespace
+     * @return the namespace
+     */
+    public Namespace getNamespace() {
+        return namespace;
+    }
+
+    /*
+     * Debugging
+     */
+
+    /**
+     * Print the AST before or after lowering, see --print-ast, --print-lower-ast
+     */
+    private void debugPrintAST() {
+        assert functionNode != null;
+        if (context._print_lower_ast && state.contains(State.LOWERED) ||
+            context._print_ast && !state.contains(State.LOWERED)) {
+            context.getErr().println(new ASTWriter(functionNode));
+        }
+    }
+
+    /**
+     * Print the parsed code before or after lowering, see --print-parse, --print-lower-parse
+     */
+    private boolean debugPrintParse() {
+        if (errors.hasErrors()) {
+            return false;
+        }
+
+        assert functionNode != null;
+
+        if (context._print_lower_parse && state.contains(State.LOWERED) ||
+             context._print_parse && !state.contains(State.LOWERED)) {
+            final PrintVisitor pv = new PrintVisitor();
+            functionNode.accept(pv);
+            context.getErr().print(pv);
+            context.getErr().flush();
+        }
+
+        return true;
+    }
+
+    private void debugDisassemble() {
+        assert code != null;
+        if (context._print_code) {
+            for (final Map.Entry<String, byte[]> entry : code.entrySet()) {
+                context.getErr().println("CLASS: " + entry.getKey());
+                context.getErr().println();
+                ClassEmitter.disassemble(context, entry.getValue());
+                context.getErr().println("======");
+            }
+        }
+    }
+
+    private void debugVerify() {
+        if (context._verify_code) {
+            for (final Map.Entry<String, byte[]> entry : code.entrySet()) {
+                Compiler.verify(context, entry.getValue());
+            }
+        }
+    }
+
+    /**
+     * Implements the "-d" option - dump class files from script to specified output directory
+     *
+     * @throws IOException if classes cannot be written
+     */
+    private void dumpClassFiles() throws IOException {
+        if (context._dest_dir == null) {
+            return;
+        }
+
+        assert code != null;
+
+        for (final Entry<String, byte[]> entry : code.entrySet()) {
+            final String className = entry.getKey();
+            final String fileName  = className.replace('.', File.separatorChar) + ".class";
+            final int    index     = fileName.lastIndexOf(File.separatorChar);
+
+            if (index != -1) {
+                final File dir = new File(fileName.substring(0, index));
+                if (!dir.exists() && !dir.mkdirs()) {
+                    throw new IOException(ECMAErrors.getMessage("io.error.cant.write", dir.toString()));
+                }
+            }
+
+            final byte[] bytecode = entry.getValue();
+            final File outFile = new File(context._dest_dir, fileName);
+            try (final FileOutputStream fos = new FileOutputStream(outFile)) {
+                fos.write(bytecode);
+            }
+        }
+    }
+
+    /**
+     * Convert a package/class name to a binary name.
+     *
+     * @param name Package/class name.
+     * @return Binary name.
+     */
+    public static String binaryName(final String name) {
+        return name.replace('/', '.');
+    }
+
+    /**
+     * Convert a binary name to a package/class name.
+     *
+     * @param name Binary name.
+     * @return Package/class name.
+     */
+    public static String pathName(final String name) {
+        return name.replace('.', '/');
+    }
+
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CompilerConstants.java b/nashorn/src/jdk/nashorn/internal/codegen/CompilerConstants.java
new file mode 100644
index 00000000000..7da72cdc6ed
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CompilerConstants.java
@@ -0,0 +1,687 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.codegen;
+
+import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.runtime.ScriptFunction;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * This class represents constant names of variables, methods and fields in
+ * the compiler
+ */
+
+public enum CompilerConstants {
+    /** the __FILE__ variable */
+    __FILE__,
+
+    /** the __DIR__ variable */
+    __DIR__,
+
+    /** the __LINE__ variable */
+    __LINE__,
+
+    /** lazy prefix for classes of jitted methods */
+    LAZY("Lazy"),
+
+    /** leaf tag used for functions that require no scope */
+    LEAF("__leaf__"),
+
+    /** constructor name */
+    INIT("<init>"),
+
+    /** static initializer name */
+    CLINIT("<clinit>"),
+
+    /** eval name */
+    EVAL("eval"),
+
+    /** source name and class */
+    SOURCE("source", Source.class),
+
+    /** constants name and class */
+    CONSTANTS("constants", Object[].class),
+
+    /** strict mode field name and type */
+    STRICT_MODE("strictMode", boolean.class),
+
+    /** default script name */
+    DEFAULT_SCRIPT_NAME("Script"),
+
+    /** function prefix for anonymous functions */
+    FUNCTION_PREFIX("function$"),
+
+    /** method name for Java method that is script entry point */
+    RUN_SCRIPT("runScript"),
+
+    /** this name and slot */
+    THIS("this", 0),
+
+    /** this debugger symbol */
+    THIS_DEBUGGER("__this__"),
+
+    /** scope name, type and slot */
+    SCOPE("__scope__", ScriptObject.class, 2),
+
+    /** the return value variable name were intermediate results are stored for scripts */
+    SCRIPT_RETURN("__return__"),
+
+    /** the callee value variable when necessary */
+    CALLEE("__callee__", ScriptFunction.class, 1),
+
+    /** the varargs variable when necessary */
+    VARARGS("__varargs__"),
+
+    /** the arguments vector when necessary and the slot */
+    ARGUMENTS("arguments", Object.class, 2),
+
+    /** prefix for iterators for for (x in ...) */
+    ITERATOR_PREFIX("$iter"),
+
+    /** prefix for tag variable used for switch evaluation */
+    SWITCH_TAG_PREFIX("$tag"),
+
+    /** prefix for all exceptions */
+    EXCEPTION_PREFIX("$exception"),
+
+    /** prefix for quick slots generated in Store */
+    QUICK_PREFIX("$quick"),
+
+    /** prefix for temporary variables */
+    TEMP_PREFIX("$temp"),
+
+    /** prefix for literals */
+    LITERAL_PREFIX("$lit"),
+
+    /** prefix for map */
+    MAP("$map", 1),
+
+    /** prefix for regexps */
+    REGEX_PREFIX("$regex"),
+
+    /** init scope */
+    INIT_SCOPE("$scope", 2),
+
+    /** init arguments */
+    INIT_ARGUMENTS("$arguments", 3),
+
+    /** prefix for all ScriptObject subclasses with fields, @see ObjectGenerator */
+    JS_OBJECT_PREFIX("JO$"),
+
+    /** name for allocate method in JO$ objects */
+    ALLOCATE("allocate"),
+
+    /** prefix for split methods, @see Splitter */
+    SPLIT_PREFIX("$split"),
+
+    /** prefix for split array method and slot */
+    SPLIT_ARRAY_ARG("split_array", 3),
+
+    /** get string from constant pool */
+    GET_STRING("$getString"),
+
+    /** get map */
+    GET_MAP("$getMap"),
+
+    /** get map */
+    SET_MAP("$setMap"),
+
+    /** get array prefix */
+    GET_ARRAY_PREFIX("$get"),
+
+    /** get array suffix */
+    GET_ARRAY_SUFFIX("$array");
+
+    private final String tag;
+    private final Class<?> type;
+    private final int slot;
+
+    private CompilerConstants() {
+        this.tag = name();
+        this.type = null;
+        this.slot = -1;
+    }
+
+    private CompilerConstants(final String tag) {
+        this(tag, -1);
+    }
+
+    private CompilerConstants(final String tag, final int slot) {
+        this(tag, null, slot);
+    }
+
+    private CompilerConstants(final String tag, final Class<?> type) {
+        this(tag, type, -1);
+    }
+
+    private CompilerConstants(final String tag, final Class<?> type, final int slot) {
+        this.tag  = tag;
+        this.type = type;
+        this.slot = slot;
+    }
+
+    /**
+     * Return the tag for this compile constant. Deliberately avoiding "name" here
+     * not to conflate with enum implementation. This is the master string for the
+     * constant - every constant has one.
+     *
+     * @return the tag
+     */
+    public final String tag() {
+        return tag;
+    }
+
+    /**
+     * Return the type for this compile constant
+     *
+     * @return type for this constant's instances, or null if N/A
+     */
+    public final Class<?> type() {
+        return type;
+    }
+
+    /**
+     * Return the slot for this compile constant
+     *
+     * @return byte code slot where constant is stored or -1 if N/A
+     */
+    public final int slot() {
+        return slot;
+    }
+
+    /**
+     * Return a descriptor for this compile constant. Only relevant if it has
+     * a type
+     *
+     * @return descriptor the descriptor
+     */
+    public final String descriptor() {
+        assert type != null : " asking for descriptor of typeless constant";
+        return typeDescriptor(type);
+    }
+
+    /**
+     * Get the internal class name for a type
+     *
+     * @param type a type
+     * @return  the internal name for this type
+     */
+    public static String className(final Class<?> type) {
+        return Type.getInternalName(type);
+    }
+
+    /**
+     * Get the method descriptor for a given method type collection
+     *
+     * @param rtype  return type
+     * @param ptypes parameter types
+     *
+     * @return internal descriptor for this method
+     */
+    public static String methodDescriptor(final Class<?> rtype, final Class<?>... ptypes) {
+        return Type.getMethodDescriptor(rtype, ptypes);
+    }
+
+    /**
+     * Get the type descriptor for a type
+     *
+     * @param clazz a type
+     *
+     * @return the internal descriptor for this type
+     */
+    public static String typeDescriptor(final Class<?> clazz) {
+        return Type.getDescriptor(clazz);
+    }
+
+    /**
+     * Create a call representing a void constructor for a given type. Don't
+     * attempt to look this up at compile time
+     *
+     * @param clazz the class
+     *
+     * @return Call representing void constructor for type
+     */
+    public static Call constructorNoLookup(final Class<?> clazz) {
+        return specialCallNoLookup(clazz, INIT.tag(), void.class);
+    }
+
+    /**
+     * Create a call representing a constructor for a given type. Don't
+     * attempt to look this up at compile time
+     *
+     * @param className the type class name
+     * @param ptypes    the parameter types for the constructor
+     *
+     * @return Call representing constructor for type
+     */
+    public static Call constructorNoLookup(final String className, final Class<?>... ptypes) {
+        return specialCallNoLookup(className, INIT.tag(), methodDescriptor(void.class, ptypes));
+    }
+
+    /**
+     * Create a call representing a constructor for a given type. Don't
+     * attempt to look this up at compile time
+     *
+     * @param clazz  the class name
+     * @param ptypes the parameter types for the constructor
+     *
+     * @return Call representing constructor for type
+     */
+    public static Call constructorNoLookup(final Class<?> clazz, final Class<?>... ptypes) {
+        return specialCallNoLookup(clazz, INIT.tag(), void.class, ptypes);
+    }
+
+    /**
+     * Create a call representing an invokespecial to a given method. Don't
+     * attempt to look this up at compile time
+     *
+     * @param className the class name
+     * @param name      the method name
+     * @param desc      the descriptor
+     *
+     * @return Call representing specified invokespecial call
+     */
+    public static Call specialCallNoLookup(final String className, final String name, final String desc) {
+        return new Call(null, className, name, desc) {
+            @Override
+            public MethodEmitter invoke(final MethodEmitter method) {
+                return method.invokeSpecial(className, name, descriptor);
+            }
+        };
+    }
+
+    /**
+     * Create a call representing an invokespecial to a given method. Don't
+     * attempt to look this up at compile time
+     *
+     * @param clazz  the class
+     * @param name   the method name
+     * @param rtype  the return type
+     * @param ptypes the parameter types
+     *
+     * @return Call representing specified invokespecial call
+     */
+    public static Call specialCallNoLookup(final Class<?> clazz, final String name, final Class<?> rtype, final Class<?>... ptypes) {
+        return specialCallNoLookup(className(clazz), name, methodDescriptor(rtype, ptypes));
+    }
+
+    /**
+     * Create a call representing an invokestatic to a given method. Don't
+     * attempt to look this up at compile time
+     *
+     * @param className the class name
+     * @param name      the method name
+     * @param desc      the descriptor
+     *
+     * @return Call representing specified invokestatic call
+     */
+    public static Call staticCallNoLookup(final String className, final String name, final String desc) {
+        return new Call(null, className, name, desc) {
+            @Override
+            public MethodEmitter invoke(final MethodEmitter method) {
+                return method.invokeStatic(className, name, descriptor);
+            }
+        };
+    }
+
+    /**
+     * Create a call representing an invokestatic to a given method. Don't
+     * attempt to look this up at compile time
+     *
+     * @param clazz  the class
+     * @param name   the method name
+     * @param rtype  the return type
+     * @param ptypes the parameter types
+     *
+     * @return Call representing specified invokestatic call
+     */
+    public static Call staticCallNoLookup(final Class<?> clazz, final String name, final Class<?> rtype, final Class<?>... ptypes) {
+        return staticCallNoLookup(className(clazz), name, methodDescriptor(rtype, ptypes));
+    }
+
+    /**
+     * Create a call representing an invokevirtual to a given method. Don't
+     * attempt to look this up at compile time
+     *
+     * @param clazz  the class
+     * @param name   the method name
+     * @param rtype  the return type
+     * @param ptypes the parameter types
+     *
+     * @return Call representing specified invokevirtual call
+     */
+    public static Call virtualCallNoLookup(final Class<?> clazz, final String name, final Class<?> rtype, final Class<?>... ptypes) {
+        return new Call(null, className(clazz), name, methodDescriptor(rtype, ptypes)) {
+            @Override
+            public MethodEmitter invoke(final MethodEmitter method) {
+                return method.invokeVirtual(className, name, descriptor);
+            }
+        };
+    }
+
+    /**
+     * Create a call representing an invokeinterface to a given method. Don't
+     * attempt to look this up at compile time
+     *
+     * @param clazz  the class
+     * @param name   the method name
+     * @param rtype  the return type
+     * @param ptypes the parameter types
+     *
+     * @return Call representing specified invokeinterface call
+     */
+    public static Call interfaceCallNoLookup(final Class<?> clazz, final String name, final Class<?> rtype, final Class<?>... ptypes) {
+        return new Call(null, className(clazz), name, methodDescriptor(rtype, ptypes)) {
+            @Override
+            public MethodEmitter invoke(final MethodEmitter method) {
+                return method.invokeInterface(className, name, descriptor);
+            }
+        };
+    }
+
+    /**
+     * Create a FieldAccess representing a virtual field, that can be subject to put
+     * or get operations
+     *
+     * @param className name of the class where the field is a member
+     * @param name      name of the field
+     * @param desc      type descriptor of the field
+     *
+     * @return a field access object giving access code generation method for the virtual field
+     */
+    public static FieldAccess virtualField(final String className, final String name, final String desc) {
+        return new FieldAccess(className, name, desc) {
+            @Override
+            public MethodEmitter get(final MethodEmitter method) {
+                return method.getField(className, name, descriptor);
+            }
+
+            @Override
+            public void put(final MethodEmitter method) {
+                method.putField(className, name, descriptor);
+            }
+        };
+    }
+
+    /**
+     * Create a FieldAccess representing a virtual field, that can be subject to put
+     * or get operations
+     *
+     * @param clazz class where the field is a member
+     * @param name  name of the field
+     * @param type  type of the field
+     *
+     * @return a field access object giving access code generation method for the virtual field
+     */
+    public static FieldAccess virtualField(final Class<?> clazz, final String name, final Class<?> type) {
+        return virtualField(className(clazz), name, typeDescriptor(type));
+    }
+
+    /**
+     * Create a FieldAccess representing a static field, that can be subject to put
+     * or get operations
+     *
+     * @param className name of the class where the field is a member
+     * @param name      name of the field
+     * @param desc      type descriptor of the field
+     *
+     * @return a field access object giving access code generation method for the static field
+     */
+    public static FieldAccess staticField(final String className, final String name, final String desc) {
+        return new FieldAccess(className, name, desc) {
+            @Override
+            public MethodEmitter get(final MethodEmitter method) {
+                return method.getStatic(className, name, descriptor);
+            }
+
+            @Override
+            public void put(final MethodEmitter method) {
+                method.putStatic(className, name, descriptor);
+            }
+        };
+    }
+
+    /**
+     * Create a FieldAccess representing a static field, that can be subject to put
+     * or get operations
+     *
+     * @param clazz class where the field is a member
+     * @param name  name of the field
+     * @param type  type of the field
+     *
+     * @return a field access object giving access code generation method for the virtual field
+     */
+    public static FieldAccess staticField(final Class<?> clazz, final String name, final Class<?> type) {
+        return staticField(className(clazz), name, typeDescriptor(type));
+    }
+
+    /**
+     * Create a static call, looking up the method handle for it at the same time
+     *
+     * @param clazz  the class
+     * @param name   the name of the method
+     * @param rtype  the return type of the method
+     * @param ptypes the parameter types of the method
+     *
+     * @return the call object representing the static call
+     */
+    public static Call staticCall(final Class<?> clazz, final String name, final Class<?> rtype, final Class<?>... ptypes) {
+        return staticCall(MethodHandles.publicLookup(), clazz, name, rtype, ptypes);
+    }
+
+    /**
+     * Create a static call, given an explicit lookup, looking up the method handle for it at the same time
+     *
+     * @param lookup the lookup
+     * @param clazz  the class
+     * @param name   the name of the method
+     * @param rtype  the return type
+     * @param ptypes the parameter types
+     *
+     * @return the call object representing the static call
+     */
+    public static Call staticCall(final MethodHandles.Lookup lookup, final Class<?> clazz, final String name, final Class<?> rtype, final Class<?>... ptypes) {
+        return new Call(MH.findStatic(lookup, clazz, name, MH.type(rtype, ptypes)), className(clazz), name, methodDescriptor(rtype, ptypes)) {
+            @Override
+            public MethodEmitter invoke(final MethodEmitter method) {
+                return method.invokeStatic(className, name, descriptor);
+            }
+        };
+    }
+
+    /**
+     * Create a virtual call, looking up the method handle for it at the same time
+     *
+     * @param clazz  the class
+     * @param name   the name of the method
+     * @param rtype  the return type of the method
+     * @param ptypes the parameter types of the method
+     *
+     * @return the call object representing the virtual call
+     */
+    public static Call virtualCall(final Class<?> clazz, final String name, final Class<?> rtype, final Class<?>... ptypes) {
+        return virtualCall(MethodHandles.publicLookup(), clazz, name, rtype, ptypes);
+    }
+
+    /**
+     * Create a virtual call, given an explicit lookup, looking up the method handle for it at the same time
+     *
+     * @param lookup the lookup
+     * @param clazz  the class
+     * @param name   the name of the method
+     * @param rtype  the return type
+     * @param ptypes the parameter types
+     *
+     * @return the call object representing the virtual call
+     */
+    public static Call virtualCall(final MethodHandles.Lookup lookup, final Class<?> clazz, final String name, final Class<?> rtype, final Class<?>... ptypes) {
+        return new Call(MH.findVirtual(lookup, clazz, name, MH.type(rtype, ptypes)), className(clazz), name, methodDescriptor(rtype, ptypes)) {
+            @Override
+            public MethodEmitter invoke(final MethodEmitter method) {
+                return method.invokeVirtual(className, name, descriptor);
+            }
+        };
+    }
+
+    /**
+     * Private class representing an access. This can generate code into a method code or
+     * a field access.
+     */
+    private abstract static class Access {
+        protected final MethodHandle methodHandle;
+        protected final String       className;
+        protected final String       name;
+        protected final String       descriptor;
+
+        /**
+         * Constructor
+         *
+         * @param methodHandle methodHandle or null if none
+         * @param className    class name for access
+         * @param name         field or method name for access
+         * @param descriptor   descriptor for access field or method
+         */
+        protected Access(final MethodHandle methodHandle, final String className, final String name, final String descriptor) {
+            this.methodHandle = methodHandle;
+            this.className    = className;
+            this.name         = name;
+            this.descriptor   = descriptor;
+        }
+
+        /**
+         * Get the method handle, or null if access hasn't been looked up
+         *
+         * @return method handle
+         */
+        public MethodHandle methodHandle() {
+            return methodHandle;
+        }
+
+        /**
+         * Get the class name of the access
+         *
+         * @return the class name
+         */
+        public String className() {
+            return className;
+        }
+
+        /**
+         * Get the field name or method name of the access
+         *
+         * @return the name
+         */
+        public String name() {
+            return name;
+        }
+
+        /**
+         * Get the descriptor of the method or field of the access
+         *
+         * @return the descriptor
+         */
+        public String descriptor() {
+            return descriptor;
+        }
+    }
+
+    /**
+     * Field access - this can be used for generating code for static or
+     * virtual field accesses
+     */
+    public abstract static class FieldAccess extends Access {
+        /**
+         * Constructor
+         *
+         * @param className  name of the class where the field is
+         * @param name       name of the field
+         * @param descriptor descriptor of the field
+         */
+        protected FieldAccess(final String className, final String name, final String descriptor) {
+            super(null, className, name, descriptor);
+        }
+
+        /**
+         * Generate get code for the field
+         *
+         * @param emitter a method emitter
+         *
+         * @return the method emitter
+         */
+        protected abstract MethodEmitter get(final MethodEmitter emitter);
+
+        /**
+         * Generate put code for the field
+         *
+         * @param emitter a method emitter
+         */
+        protected abstract void put(final MethodEmitter emitter);
+    }
+
+    /**
+     * Call - this can be used for generating code for different types of calls
+     */
+    public abstract static class Call extends Access {
+
+        /**
+         * Constructor
+         *
+         * @param className  class name for the method of the call
+         * @param name       method name
+         * @param descriptor method descriptor
+         */
+        protected Call(final String className, final String name, final String descriptor) {
+            super(null, className, name, descriptor);
+        }
+
+        /**
+         * Constructor
+         *
+         * @param methodHandle method handle for the call if resolved
+         * @param className    class name for the method of the call
+         * @param name         method name
+         * @param descriptor   method descriptor
+         */
+        protected Call(final MethodHandle methodHandle, final String className, final String name, final String descriptor) {
+            super(methodHandle, className, name, descriptor);
+        }
+
+        /**
+         * Generate invocation code for the method
+         *
+         * @param emitter a method emitter
+         *
+         * @return the method emitter
+         */
+        protected abstract MethodEmitter invoke(final MethodEmitter emitter);
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/ConstantData.java b/nashorn/src/jdk/nashorn/internal/codegen/ConstantData.java
new file mode 100644
index 00000000000..f02144a67b1
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/ConstantData.java
@@ -0,0 +1,165 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.codegen;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Manages constants needed by code generation.  Objects are maintained in an
+ * interning maps to remove duplicates.
+ */
+public class ConstantData {
+    /** Constant table. */
+    final List<Object> constants;
+
+    /** Constant table string interning map. */
+    final Map<String, Integer> stringMap;
+
+    /** Constant table object interning map. */
+    final Map<Object, Integer> objectMap;
+
+    private static class ArrayWrapper {
+        private final Object array;
+        private final int    hashCode;
+
+        public ArrayWrapper(final Object array) {
+            this.array    = array;
+            this.hashCode = calcHashCode();
+        }
+
+        /**
+         * Calculate a shallow hashcode for the array.
+         * @return Hashcode with elements factored in.
+         */
+        private int calcHashCode() {
+            final Class<?> cls = array.getClass();
+
+            if (cls == Object[].class) {
+                return Arrays.hashCode((Object[])array);
+            } else if (cls == double[].class) {
+                return Arrays.hashCode((double[])array);
+            } if (cls == long[].class) {
+                return Arrays.hashCode((long[])array);
+            } if (cls == int[].class) {
+                return Arrays.hashCode((int[])array);
+            }
+
+            throw new AssertionError("ConstantData doesn't support " + cls);
+        }
+
+        @Override
+        public boolean equals(final Object other) {
+            if (!(other instanceof ArrayWrapper)) {
+                return false;
+            }
+
+            final Object otherArray = ((ArrayWrapper)other).array;
+
+            if (array == otherArray) {
+                return true;
+            }
+
+            final Class<?> cls = array.getClass();
+
+            if (cls == otherArray.getClass()) {
+                if (cls == Object[].class) {
+                    return Arrays.equals((Object[])array, (Object[])otherArray);
+                } else if (cls == double[].class) {
+                    return Arrays.equals((double[])array, (double[])otherArray);
+                } else if (cls == long[].class) {
+                    return Arrays.equals((long[])array, (long[])otherArray);
+                } else if (cls == int[].class) {
+                    return Arrays.equals((int[])array, (int[])otherArray);
+                }
+            }
+
+            return false;
+        }
+
+        @Override
+        public int hashCode() {
+            return hashCode;
+        }
+    }
+
+    /**
+     * Constructor
+     */
+    ConstantData() {
+        this.constants = new ArrayList<>();
+        this.stringMap = new HashMap<>();
+        this.objectMap = new HashMap<>();
+    }
+
+    /**
+     * Add a string to the constant data
+     *
+     * @param string the string to add
+     * @return the index in the constant pool that the string was given
+     */
+    public int add(final String string) {
+        final Integer value = stringMap.get(string);
+
+        if (value != null) {
+            return value.intValue();
+        }
+
+        constants.add(string);
+        final int index = constants.size() - 1;
+        stringMap.put(string, index);
+
+        return index;
+    }
+
+    /**
+     * Add an object to the constant data
+     *
+     * @param object the string to add
+     * @return the index in the constant pool that the object was given
+     */
+    public int add(final Object object) {
+        final Object  entry = object.getClass().isArray() ? new ArrayWrapper(object) : object;
+        final Integer value = objectMap.get(entry);
+
+        if (value != null) {
+            return value.intValue();
+        }
+
+        constants.add(object);
+        final int index = constants.size() - 1;
+        objectMap.put(entry, index);
+
+        return index;
+    }
+
+    Object[] toArray() {
+        return constants.toArray();
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Emitter.java b/nashorn/src/jdk/nashorn/internal/codegen/Emitter.java
new file mode 100644
index 00000000000..a17b38bb276
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Emitter.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.codegen;
+
+/**
+ * Interface for anything that interacts with a low level bytecode
+ * generation module, for example ASM.
+ * <p>
+ * This is pretty generic, i.e. it can be a ClassEmitter, MethodEmitter
+ * or potentially even more fine grained stuff.
+ *
+ */
+public interface Emitter {
+
+    /**
+     * Register the start of emission for this CodeEmitter
+     */
+    public void begin();
+
+    /**
+     * Register the end of emission for this CodeEmitter.
+     * This is typically required before generated code can
+     * be requested from it
+     */
+    public void end();
+}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Frame.java b/nashorn/src/jdk/nashorn/internal/codegen/Frame.java
new file mode 100644
index 00000000000..4ec6f89563d
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Frame.java
@@ -0,0 +1,196 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.codegen;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import jdk.nashorn.internal.ir.Symbol;
+
+/**
+ * Tracks the variable area state.
+ *
+ */
+public final class Frame {
+    /** Previous frame. */
+    private Frame previous;
+
+    /** Current variables. */
+    private final ArrayList<Symbol> symbols;
+
+    /** Number of slots in previous frame. */
+    private int baseCount;
+
+    /** Number of slots in this frame. */
+    private int count;
+
+    /**
+     * Constructor.
+     *
+     * @param previous frame, the parent variable frame
+     */
+    public Frame(final Frame previous) {
+        this.previous  = previous;
+        this.symbols   = new ArrayList<>();
+        this.baseCount = getBaseCount();
+        this.count     = 0;
+    }
+
+    /**
+     * Copy constructor
+     * @param frame
+     * @param symbols
+     */
+    private Frame(final Frame frame, final List<Symbol> symbols) {
+        this.previous  = frame.getPrevious() == null ? null : new Frame(frame.getPrevious(), frame.getPrevious().getSymbols());
+        this.symbols   = new ArrayList<>(frame.getSymbols());
+        this.baseCount = frame.getBaseCount();
+        this.count     = frame.getCount();
+    }
+
+    /**
+     * Copy the frame
+     *
+     * @return a new frame with the identical contents
+     */
+    public Frame copy() {
+        return new Frame(this, getSymbols());
+    }
+
+    /**
+     * Add a new variable to the frame.
+     * @param symbol Symbol representing variable.
+     */
+    public void addSymbol(final Symbol symbol) {
+        final int slot = symbol.getSlot();
+        if (slot < 0) {
+            symbols.add(symbol);
+            count += symbol.slotCount();
+        }
+    }
+
+    /**
+     * Realign slot numbering prior to code generation.
+     * @return Number of slots in frame.
+     */
+    public int realign() {
+        baseCount = getBaseCount();
+        count     = 0;
+
+        for (final Symbol symbol : symbols) {
+            if (symbol.hasSlot()) {
+                symbol.setSlot(baseCount + count);
+                count += symbol.slotCount();
+            }
+        }
+
+        return count;
+    }
+
+    /**
+     * Return the slot count of previous frames.
+     * @return Number of slots in previous frames.
+     */
+    private int getBaseCount() {
+        return previous != null ? previous.getSlotCount() : 0;
+    }
+
+    /**
+     * Determine the number of slots to top of frame.
+     * @return Number of slots in total.
+     */
+    public int getSlotCount() {
+        return baseCount + count;
+    }
+
+    @Override
+    public String toString() {
+        final StringBuilder sb = new StringBuilder();
+        Frame f = this;
+        boolean hasPrev = false;
+        int pos = 0;
+
+        do {
+            if (hasPrev) {
+                sb.append("\n");
+            }
+
+            sb.append("#").
+                append(pos++).
+                append(" {baseCount:").
+                append(baseCount).
+                append(", ").
+                append("count:").
+                append(count).
+                append("} ");
+
+            for (final Symbol var : f.getSymbols()) {
+                sb.append('[').
+                    append(var.toString()).
+                    append(' ').
+                    append(var.hashCode()).
+                    append("] ");
+            }
+
+            f = f.getPrevious();
+            hasPrev = true;
+        } while (f != null);
+
+        return sb.toString();
+    }
+
+    /**
+     * Get variable count for this frame
+     * @return variable count
+     */
+    public int getCount() {
+        return count;
+    }
+
+    /**
+     * Get previous frame
+     * @return previous frame
+     */
+    public Frame getPrevious() {
+        return previous;
+    }
+
+    /**
+     * Set previous frame
+     * @param previous previous frame
+     */
+    public void setPrevious(final Frame previous) {
+        this.previous = previous;
+    }
+
+    /**
+     * Get symbols in frame
+     * @return a list of symbols in this frame
+     */
+    public List<Symbol> getSymbols() {
+        return Collections.unmodifiableList(symbols);
+    }
+ }
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/FunctionSignature.java b/nashorn/src/jdk/nashorn/internal/codegen/FunctionSignature.java
new file mode 100644
index 00000000000..df5874419e9
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/FunctionSignature.java
@@ -0,0 +1,209 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.codegen;
+
+import static jdk.nashorn.internal.codegen.CompilerConstants.CALLEE;
+import static jdk.nashorn.internal.codegen.CompilerConstants.THIS;
+
+import java.util.List;
+import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.ir.FunctionNode;
+import jdk.nashorn.internal.ir.Node;
+import jdk.nashorn.internal.runtime.ScriptFunction;
+import jdk.nashorn.internal.runtime.linker.LinkerCallSite;
+
+/**
+ * Class that generates function signatures for dynamic calls
+ */
+public final class FunctionSignature {
+
+    /** parameter types that ASM can understand */
+    private final Type[] paramTypes;
+
+    /** return type that ASM can understand */
+    private final Type returnType;
+
+    /** valid Java descriptor string for function */
+    private final String descriptor;
+
+    /**
+     * Constructor
+     *
+     * Create a FunctionSignature given arguments as AST Nodes
+     *
+     * @param hasSelf does the function have a self slot?
+     * @param retType what is the return type
+     * @param args    argument list of AST Nodes
+     */
+    public FunctionSignature(final boolean hasSelf, final Type retType, final List<? extends Node> args) {
+        this(hasSelf, false, retType, FunctionSignature.typeArray(args));
+    }
+
+    /**
+     * Constructor
+     *
+     * Create a FunctionSignature given arguments as AST Nodes
+     *
+     * @param hasSelf   does the function have a self slot?
+     * @param hasCallee does the function need a callee variable
+     * @param retType   what is the return type
+     * @param args      argument list of AST Nodes
+     */
+    public FunctionSignature(final boolean hasSelf, final boolean hasCallee, final Type retType, final List<? extends Node> args) {
+        this(hasSelf, hasCallee, retType, FunctionSignature.typeArray(args));
+    }
+
+    /**
+     * Constructor
+     *
+     * Create a FunctionSignature given arguments as AST Nodes
+     *
+     * @param hasSelf does the function have a self slot?
+     * @param retType what is the return type
+     * @param nArgs   number of arguments
+     */
+    public FunctionSignature(final boolean hasSelf, final Type retType, final int nArgs) {
+        this(hasSelf, false, retType, FunctionSignature.objectArgs(nArgs));
+    }
+
+    /**
+     * Constructor
+     *
+     * Create a FunctionSignature given argument types only
+     *
+     * @param hasSelf   does the function have a self slot?
+     * @param hasCallee does the function have a callee slot?
+     * @param retType   what is the return type
+     * @param argTypes  argument list of AST Nodes
+     */
+    public FunctionSignature(final boolean hasSelf, final boolean hasCallee, final Type retType, final Type... argTypes) {
+        final boolean isVarArg;
+
+        int count = 1;
+
+        if (argTypes == null) {
+            isVarArg = true;
+        } else {
+            isVarArg = argTypes.length > LinkerCallSite.ARGLIMIT;
+            count    = isVarArg ? 1 : argTypes.length;
+        }
+
+        int first = 0;
+
+        if (hasSelf) {
+            count++;
+            first++;
+        }
+        if (hasCallee) {
+            count++;
+            first++;
+        }
+
+        paramTypes = new Type[count];
+
+        if (hasSelf) {
+            paramTypes[THIS.slot()] = Type.OBJECT;
+        }
+        if (hasCallee) {
+            paramTypes[CALLEE.slot()] = Type.typeFor(ScriptFunction.class);
+        }
+
+        if (isVarArg) {
+            paramTypes[first] = Type.OBJECT_ARRAY;
+        } else if (argTypes != null) {
+            for (int i = first, j = 0; i < count; i++, j++) {
+                paramTypes[i] = argTypes[j];
+                if (paramTypes[i].isObject()) {
+                    paramTypes[i] = Type.OBJECT; //TODO: for now, turn java/lang/String into java/lang/Object as we aren't as specific.
+                }
+            }
+        } else {
+            assert false : "isVarArgs cannot be false when argTypes are null";
+        }
+
+        returnType = retType;
+        descriptor = Type.getMethodDescriptor(returnType, paramTypes);
+    }
+
+    /**
+     * Internal function that converts an array of nodes to their Types
+     *
+     * @param args node arg list
+     *
+     * @return the array of types
+     */
+    private static Type[] typeArray(final List<? extends Node> args) {
+        if (args == null) {
+            return null;
+        }
+
+        final Type[] typeArray = new Type[args.size()];
+
+        int pos = 0;
+        for (final Node arg : args) {
+            typeArray[pos++] = arg.getType();
+        }
+
+        return typeArray;
+    }
+
+    @Override
+    public String toString() {
+        return descriptor;
+    }
+
+    /**
+     * @return the number of param types
+     */
+    public int size() {
+        return paramTypes.length;
+    }
+
+    /**
+     * Returns the generic signature of the function being compiled.
+     *
+     * @param functionNode function being compiled.
+     * @return function signature.
+     */
+    public static String functionSignature(final FunctionNode functionNode) {
+        return new FunctionSignature(
+            true,
+            functionNode.needsCallee(),
+            functionNode.getReturnType(),
+            (functionNode.isVarArg() && !functionNode.isScript()) ?
+                null :
+                functionNode.getParameters()).toString();
+    }
+
+    private static Type[] objectArgs(final int nArgs) {
+        final Type[] array = new Type[nArgs];
+        for (int i = 0; i < nArgs; i++) {
+            array[i] = Type.OBJECT;
+        }
+        return array;
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Lower.java b/nashorn/src/jdk/nashorn/internal/codegen/Lower.java
new file mode 100644
index 00000000000..20ed637b707
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Lower.java
@@ -0,0 +1,3057 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.codegen;
+
+import static jdk.nashorn.internal.codegen.CompilerConstants.ARGUMENTS;
+import static jdk.nashorn.internal.codegen.CompilerConstants.CALLEE;
+import static jdk.nashorn.internal.codegen.CompilerConstants.EVAL;
+import static jdk.nashorn.internal.codegen.CompilerConstants.EXCEPTION_PREFIX;
+import static jdk.nashorn.internal.codegen.CompilerConstants.ITERATOR_PREFIX;
+import static jdk.nashorn.internal.codegen.CompilerConstants.SCOPE;
+import static jdk.nashorn.internal.codegen.CompilerConstants.SCRIPT_RETURN;
+import static jdk.nashorn.internal.codegen.CompilerConstants.SWITCH_TAG_PREFIX;
+import static jdk.nashorn.internal.codegen.CompilerConstants.THIS;
+import static jdk.nashorn.internal.codegen.CompilerConstants.VARARGS;
+import static jdk.nashorn.internal.ir.RuntimeNode.Request.ADD;
+import static jdk.nashorn.internal.ir.RuntimeNode.Request.DELETE;
+import static jdk.nashorn.internal.ir.RuntimeNode.Request.EQ;
+import static jdk.nashorn.internal.ir.RuntimeNode.Request.EQ_STRICT;
+import static jdk.nashorn.internal.ir.RuntimeNode.Request.FAIL_DELETE;
+import static jdk.nashorn.internal.ir.RuntimeNode.Request.GE;
+import static jdk.nashorn.internal.ir.RuntimeNode.Request.GT;
+import static jdk.nashorn.internal.ir.RuntimeNode.Request.IN;
+import static jdk.nashorn.internal.ir.RuntimeNode.Request.INSTANCEOF;
+import static jdk.nashorn.internal.ir.RuntimeNode.Request.LE;
+import static jdk.nashorn.internal.ir.RuntimeNode.Request.LT;
+import static jdk.nashorn.internal.ir.RuntimeNode.Request.NE;
+import static jdk.nashorn.internal.ir.RuntimeNode.Request.NE_STRICT;
+import static jdk.nashorn.internal.ir.RuntimeNode.Request.TYPEOF;
+import static jdk.nashorn.internal.ir.RuntimeNode.Request.VOID;
+import static jdk.nashorn.internal.ir.Symbol.IS_GLOBAL;
+import static jdk.nashorn.internal.ir.Symbol.IS_INTERNAL;
+import static jdk.nashorn.internal.ir.Symbol.IS_LET;
+import static jdk.nashorn.internal.ir.Symbol.IS_PARAM;
+import static jdk.nashorn.internal.ir.Symbol.IS_THIS;
+import static jdk.nashorn.internal.ir.Symbol.IS_VAR;
+import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Deque;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.ir.AccessNode;
+import jdk.nashorn.internal.ir.Assignment;
+import jdk.nashorn.internal.ir.BinaryNode;
+import jdk.nashorn.internal.ir.Block;
+import jdk.nashorn.internal.ir.BreakNode;
+import jdk.nashorn.internal.ir.CallNode;
+import jdk.nashorn.internal.ir.CaseNode;
+import jdk.nashorn.internal.ir.CatchNode;
+import jdk.nashorn.internal.ir.ContinueNode;
+import jdk.nashorn.internal.ir.DoWhileNode;
+import jdk.nashorn.internal.ir.EmptyNode;
+import jdk.nashorn.internal.ir.ExecuteNode;
+import jdk.nashorn.internal.ir.ForNode;
+import jdk.nashorn.internal.ir.FunctionNode;
+import jdk.nashorn.internal.ir.IdentNode;
+import jdk.nashorn.internal.ir.IfNode;
+import jdk.nashorn.internal.ir.IndexNode;
+import jdk.nashorn.internal.ir.LabelNode;
+import jdk.nashorn.internal.ir.LineNumberNode;
+import jdk.nashorn.internal.ir.LiteralNode;
+import jdk.nashorn.internal.ir.LiteralNode.ArrayLiteralNode;
+import jdk.nashorn.internal.ir.Node;
+import jdk.nashorn.internal.ir.ObjectNode;
+import jdk.nashorn.internal.ir.PropertyNode;
+import jdk.nashorn.internal.ir.ReferenceNode;
+import jdk.nashorn.internal.ir.ReturnNode;
+import jdk.nashorn.internal.ir.RuntimeNode;
+import jdk.nashorn.internal.ir.RuntimeNode.Request;
+import jdk.nashorn.internal.ir.SwitchNode;
+import jdk.nashorn.internal.ir.Symbol;
+import jdk.nashorn.internal.ir.TernaryNode;
+import jdk.nashorn.internal.ir.ThrowNode;
+import jdk.nashorn.internal.ir.TryNode;
+import jdk.nashorn.internal.ir.UnaryNode;
+import jdk.nashorn.internal.ir.VarNode;
+import jdk.nashorn.internal.ir.WhileNode;
+import jdk.nashorn.internal.ir.WithNode;
+import jdk.nashorn.internal.ir.visitor.NodeOperatorVisitor;
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.parser.Token;
+import jdk.nashorn.internal.parser.TokenType;
+import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.runtime.DebugLogger;
+import jdk.nashorn.internal.runtime.ECMAException;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.Property;
+import jdk.nashorn.internal.runtime.PropertyMap;
+import jdk.nashorn.internal.runtime.ScriptFunction;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
+import jdk.nashorn.internal.runtime.Source;
+import jdk.nashorn.internal.runtime.Undefined;
+
+/**
+ * Lower to more primitive operations. After lowering, an AST has symbols and
+ * types. Lowering may also add specialized versions of methods to the script if
+ * the optimizer is turned on.
+ *
+ * Any expression that requires temporary storage as part of computation will
+ * also be detected here and give a temporary symbol
+ */
+
+final class Lower extends NodeOperatorVisitor {
+    /** Current compiler. */
+    private final Compiler compiler;
+
+    /** Current source. */
+    private final Source source;
+
+    /** List of lowered statements */
+    private List<Node> statements;
+
+    /** All symbols that are declared locally in a function node */
+    private List<Symbol> declaredSymbolsLocal;
+
+    /**
+     * Local definitions in current block (to discriminate from function
+     * declarations always defined in the function scope. This is for
+     * "can be undefined" analysis.
+     */
+    private Set<String> localDefs;
+
+    /**
+     * Local definitions in current block to guard against cases like
+     * NASHORN-467 when things can be undefined as they are used before
+     * their local var definition. *sigh* JavaScript...
+     */
+    private Set<String> localUses;
+
+    /**
+     * Nesting level stack. Currently just used for loops to avoid the problem
+     * with terminal bodies that end with throw/return but still do continues to
+     * outer loops or same loop.
+     */
+    private final Deque<Node> nesting;
+
+    private static final DebugLogger LOG   = new DebugLogger("lower");
+    private static final boolean     DEBUG = LOG.isEnabled();
+
+    /**
+     * Constructor.
+     *
+     * @param compiler the compiler
+     */
+    Lower(final Compiler compiler) {
+        this.compiler   = compiler;
+        this.source     = compiler.getSource();
+        this.statements = new ArrayList<>();
+        this.nesting    = new ArrayDeque<>();
+    }
+
+    private void nest(final Node node) {
+        nesting.push(node);
+    }
+
+    private void unnest() {
+        nesting.pop();
+    }
+
+    static void debug(final String str) {
+        if (DEBUG) {
+            LOG.info(str);
+        }
+    }
+
+    @Override
+    public Node leave(final AccessNode accessNode) {
+        //accessNode.setBase(convert(accessNode.getBase(), Type.OBJECT));
+        getCurrentFunctionNode().newTemporary(Type.OBJECT, accessNode); //This is not always an object per se, but currently the narrowing logic resides in AccessSpecializer. @see AccessSpecializer!
+
+        return accessNode;
+    }
+
+    @Override
+    public Node enter(final Block block) {
+        /*
+         * Save the statement list from the outer construct we are currently
+         * generating and push frame
+         */
+        final List<Node>  savedStatements = statements;
+        final Set<String> savedDefs       = localDefs;
+        final Set<String> savedUses       = localUses;
+
+        block.setFrame(getCurrentFunctionNode().pushFrame());
+
+        try {
+            /*
+             * Reset the statement instance var, new block
+             */
+            statements = new ArrayList<>();
+            localDefs  = new HashSet<>(savedDefs);
+            localUses  = new HashSet<>(savedUses);
+
+            for (final Node statement : block.getStatements()) {
+                statement.accept(this);
+                /*
+                 * This is slightly unsound, for example if we have a loop with
+                 * a guarded statement like if (x) continue in the body and the
+                 * body ends with TERMINAL, e.g. return; we removed the continue
+                 * before we had the loop stack, as all we cared about was a
+                 * return last in the loop.
+                 *
+                 * @see NASHORN-285
+                 */
+                final Node lastStatement = Node.lastStatement(statements);
+                if (lastStatement != null && lastStatement.isTerminal()) {
+                    block.copyTerminalFlags(lastStatement);
+                    break;
+                }
+            }
+
+            block.setStatements(statements);
+        } finally {
+            /*
+             * Restore the saved statements after block ends and pop frame
+             */
+            statements = savedStatements;
+            localDefs  = savedDefs;
+            localUses  = savedUses;
+
+            getCurrentFunctionNode().popFrame();
+        }
+
+        return null;
+    }
+
+    /**
+     * Determine if Try block is inside target block.
+     *
+     * @param tryNode Try node to test.
+     * @param target  Target block.
+     *
+     * @return true if try block is inside the target, false otherwise.
+     */
+    private boolean isNestedTry(final TryNode tryNode, final Block target) {
+        for (Block current = getCurrentBlock(); current != target; current = current.getParent()) {
+            if (tryNode.getBody() == current) {
+                return true;
+            }
+
+            for (final Block catchBlock : tryNode.getCatchBlocks()) {
+                if (catchBlock == current) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Clones the body of the try finallys up to the target block.
+     *
+     * @param node       first try node in the chain.
+     * @param targetNode target block of the break/continue statement or null for return
+     *
+     * @return true if terminates.
+     */
+    private boolean copyFinally(final TryNode node, final Node targetNode) {
+        Block target = null;
+
+        if (targetNode instanceof Block) {
+            target = (Block)targetNode;
+        }
+
+        for (TryNode tryNode = node; tryNode != null; tryNode = tryNode.getNext()) {
+            if (target != null && !isNestedTry(tryNode, target)) {
+                return false;
+            }
+
+            Block finallyBody = tryNode.getFinallyBody();
+            if (finallyBody == null) {
+                continue;
+            }
+
+            finallyBody = (Block)finallyBody.clone();
+            final boolean hasTerminalFlags = finallyBody.hasTerminalFlags();
+
+            new ExecuteNode(source, finallyBody.getToken(), finallyBody.getFinish(), finallyBody).accept(this);
+
+            if (hasTerminalFlags) {
+                getCurrentBlock().copyTerminalFlags(finallyBody);
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public Node enter(final BreakNode breakNode) {
+        final TryNode tryNode = breakNode.getTryChain();
+
+        if (tryNode != null && copyFinally(tryNode, breakNode.getTargetNode())) {
+            return null;
+        }
+
+        statements.add(breakNode);
+
+        return null;
+    }
+
+    /**
+     * Blesses nodes with an expectant type, converting if necessary.
+     *
+     * @param node Node to be blest.
+     * @param type Type class expected.
+     *
+     * @return Converted node or original node if no conversion is needed.
+     */
+    private Node convert(final Node node, final Type type) {
+
+        final Symbol       symbol       = node.getSymbol();
+        final FunctionNode functionNode = getCurrentFunctionNode();
+
+        assert !type.isUnknown() : "unknown";
+
+        /*
+         * Conversions are now mandatory, have to be placed at code time and
+         * cannot be removed as there might be cases like:
+         *
+         * var x = 17; if (x + 1) { ... }
+         *
+         * x = Number(4711); if (x + 1) { ... }
+         *
+         * In the old world this behaved as follows:
+         *
+         * Here, x is originally inferred type to a number, then the if does a
+         * double add without a cast. However, the next statement turns x into
+         * an object, and this messes up the original. If we would now suddenly
+         * need an explicit cast for the first addition, given that we don't do
+         * fancy stuff like splitting live range.
+         *
+         * Even worse is the case where we have an eval that modifies local
+         * variables in the middle of a function and may widen a type suspected
+         * to be at most e.g. NUMBER to e.g. OBJECT.
+         *
+         * There are a few local optimizations we can do. If we want to do an
+         * OBJECT to OBJECT cast, for example, we can skip it as already is
+         * maximally wide, except if we are in a method with an eval where
+         * everything is possible...
+         *
+         * @see test/test262/test/suite/ch07/7.2/S7.2_A1.4_T2.js for an example
+         * of this.
+         */
+
+        assert symbol != null : "no symbol for " + node;
+
+        /* check object to object cast */
+        if (!functionNode.hasEval() && node.getType().isEquivalentTo(Type.OBJECT) && type.isEquivalentTo(Type.OBJECT)) {
+            return node;
+        }
+
+        Node resultNode = node;
+
+        // Literal nodes may be converted directly
+
+        if (node instanceof LiteralNode) {
+            final LiteralNode<?> convertedLiteral = new LiteralNodeConstantEvaluator((LiteralNode<?>)node, type).eval();
+            if (convertedLiteral != null) {
+                resultNode = newLiteral(convertedLiteral);
+            }
+            // object literals still need the cast
+            if (type.isObject()) {
+                resultNode = new UnaryNode(source, Token.recast(node.getToken(), TokenType.CONVERT), node);
+            }
+        } else {
+            if (resultNode.getSymbol().isParam()) {
+                resultNode.getSymbol().setType(type);
+            }
+             resultNode = new UnaryNode(source, Token.recast(node.getToken(), TokenType.CONVERT), resultNode);
+        }
+
+        functionNode.newTemporary(type, resultNode);
+        resultNode.copyTerminalFlags(node);
+
+        return resultNode;
+    }
+
+    /**
+     * Accept and convert all arguments to type Object. If we have a
+     * specialization profile for this function, we instead try to specialize
+     * the arguments before the casts based on their current types and values.
+     *
+     * @param callNode function call
+     * @return return type for call
+     */
+    private Type acceptArgs(final CallNode callNode) {
+        final List<Node> oldArgs = callNode.getArgs();
+        final List<Node> acceptedArgs = new ArrayList<>(oldArgs.size());
+
+        for (final Node arg : oldArgs) {
+            //acceptedArgs.add(convert(arg.accept(this), OBJECT));
+            acceptedArgs.add(arg.accept(this));
+        }
+        callNode.setArgs(acceptedArgs);
+
+        return Type.OBJECT;
+    }
+
+    private static String evalLocation(final IdentNode node) {
+        final StringBuilder sb = new StringBuilder(node.getSource().getName());
+
+        sb.append('#');
+        sb.append(node.getSource().getLine(node.position()));
+        sb.append("<eval>");
+
+        return sb.toString();
+    }
+
+    private void checkEval(final CallNode callNode) {
+        if (callNode.getFunction() instanceof IdentNode) {
+
+            final List<Node> args   = callNode.getArgs();
+            final IdentNode  callee = (IdentNode)callNode.getFunction();
+
+            // 'eval' call with atleast one argument
+            if (args.size() >= 1 && EVAL.tag().equals(callee.getName())) {
+                final CallNode.EvalArgs evalArgs = new CallNode.EvalArgs();
+                // code that is evaluated
+                evalArgs.code = args.get(0).clone();
+                evalArgs.code.accept(this);
+                // 'this' to be passed to evaluated code
+                evalArgs.evalThis = new IdentNode(getCurrentFunctionNode().getThisNode());
+                // location string of the eval call
+                evalArgs.location = evalLocation(callee);
+                // strict mode context or not?
+                evalArgs.strictMode = getCurrentFunctionNode().isStrictMode();
+                callNode.setEvalArgs(evalArgs);
+            }
+        }
+    }
+
+    private static Node markerFunction(final Node function) {
+        if (function instanceof IdentNode) {
+            return new IdentNode((IdentNode)function) {
+                @Override
+                public boolean isFunction() {
+                    return true;
+                }
+            };
+        } else if (function instanceof AccessNode) {
+            return new AccessNode((AccessNode)function) {
+                @Override
+                public boolean isFunction() {
+                    return true;
+                }
+            };
+        } else if (function instanceof IndexNode) {
+            return new IndexNode((IndexNode)function) {
+                @Override
+                public boolean isFunction() {
+                    return true;
+                }
+            };
+        }
+
+        return function;
+    }
+
+    @Override
+    public Node enter(final CallNode callNode) {
+        final Node function       = callNode.getFunction();
+        final Node markedFunction = markerFunction(function);
+
+        callNode.setFunction(markedFunction.accept(this));
+
+        checkEval(callNode);
+
+        final Type returnType = acceptArgs(callNode);
+        getCurrentFunctionNode().newTemporary(returnType, callNode);
+        callNode.getFunction().getSymbol().setType(returnType);
+
+        return null;
+    }
+
+    @Override
+    public Node leave(final CaseNode caseNode) {
+        caseNode.copyTerminalFlags(caseNode.getBody());
+
+        return caseNode;
+    }
+
+    @Override
+    public Node enter(final CatchNode catchNode) {
+        final IdentNode ident = catchNode.getException();
+        final Block     block = getCurrentBlock();
+
+        // define block-local exception variable
+        block.defineSymbol(ident.getName(), IS_VAR | IS_LET, ident).setType(Type.OBJECT);
+        localDefs.add(ident.getName());
+
+        return catchNode;
+    }
+
+    @Override
+    public Node leave(final CatchNode catchNode) {
+        final Node exceptionCondition = catchNode.getExceptionCondition();
+        if (exceptionCondition != null) {
+            catchNode.setExceptionCondition(convert(exceptionCondition, Type.BOOLEAN));
+        }
+
+        catchNode.copyTerminalFlags(catchNode.getBody());
+
+        statements.add(catchNode);
+
+        return catchNode;
+    }
+
+    @Override
+    public Node enter(final ContinueNode continueNode) {
+        final TryNode tryNode = continueNode.getTryChain();
+        final Node target = continueNode.getTargetNode();
+
+        if (tryNode != null && copyFinally(tryNode, target)) {
+            return null;
+        }
+
+        statements.add(continueNode);
+
+        return null;
+    }
+
+    @Override
+    public Node enter(final DoWhileNode whileNode) {
+        return enter((WhileNode)whileNode);
+    }
+
+    @Override
+    public Node leave(final DoWhileNode whileNode) {
+        return leave((WhileNode)whileNode);
+    }
+
+    @Override
+    public Node enter(final EmptyNode emptyNode) {
+        return null;
+    }
+
+    /**
+     * Is this an assignment to the special variable that hosts scripting eval
+     * results?
+     *
+     * @param expression expression to check whether it is $evalresult = X
+     *
+     * @return true if an assignment to eval result, false otherwise
+     */
+    private boolean isEvalResultAssignment(final Node expression) {
+        Node e = expression;
+        if (e.tokenType() == TokenType.DISCARD) {
+            e = ((UnaryNode)expression).rhs();
+        }
+        final Node resultNode = getCurrentFunctionNode().getResultNode();
+        return e instanceof BinaryNode && ((BinaryNode)e).lhs().equals(resultNode);
+    }
+
+    /**
+     * An internal expression has a symbol that is tagged internal. Check if
+     * this is such a node
+     *
+     * @param expression expression to check for internal symbol
+     * @return true if internal, false otherwise
+     */
+    private static boolean isInternalExpression(final Node expression) {
+        final Symbol symbol = expression.getSymbol();
+        return symbol != null && symbol.isInternal();
+    }
+
+    /**
+     * Discard the result of the expression.
+     *
+     * @param expression Expression to discard.
+     *
+     * @return Discard node.
+     */
+    private Node discard(final Node expression) {
+        expression.setDiscard(true);
+
+        if (expression.getSymbol() != null) {
+            final Node discard = new UnaryNode(source, Token.recast(expression.getToken(), TokenType.DISCARD), expression);
+            discard.copyTerminalFlags(expression);
+
+            return discard;
+        }
+
+        return expression;
+    }
+
+    /**
+     * ExecuteNodes are needed to actually generate code, with a few exceptions
+     * such as ReturnNodes and ThrowNodes and various control flow that can
+     * standalone. Every other kind of statement needs to be wrapped in an
+     * ExecuteNode in order to become code
+     *
+     * @param executeNode  the execute node to visit
+     */
+    @Override
+    public Node leave(final ExecuteNode executeNode) {
+
+        Node expression = executeNode.getExpression();
+
+        /*
+         * Handle the eval result for scripts. Every statement has to write its
+         * return value to a special variable that is the result of the script.
+         */
+        if (getCurrentFunctionNode().isScript() && !(expression instanceof Block) && !isEvalResultAssignment(expression) && !isInternalExpression(expression)) {
+            final Node resultNode = getCurrentFunctionNode().getResultNode();
+            expression = new BinaryNode(source, Token.recast(executeNode.getToken(), TokenType.ASSIGN), resultNode, convert(expression, resultNode.getType()));
+
+            getCurrentFunctionNode().newTemporary(Type.OBJECT, expression);
+        }
+
+        expression = discard(expression);
+        executeNode.setExpression(expression);
+        executeNode.copyTerminalFlags(expression);
+
+        statements.add(executeNode);
+
+        return executeNode;
+    }
+
+    /**
+     * Helper that given a loop body makes sure that it is not terminal if it
+     * has a continue that leads to the loop header or to outer loops' loop
+     * headers. This means that, even if the body ends with a terminal
+     * statement, we cannot tag it as terminal
+     *
+     * @param loopBody the loop body to check
+     */
+    private boolean controlFlowEscapes(final Node loopBody) {
+        final List<Node> escapes = new ArrayList<>();
+
+        loopBody.accept(new NodeVisitor() {
+            @Override
+            public Node leave(final BreakNode node) {
+                escapes.add(node);
+                return node;
+            }
+
+            @Override
+            public Node leave(final ContinueNode node) {
+                // all inner loops have been popped.
+                if (nesting.contains(node.getTargetNode())) {
+                    escapes.add(node);
+                }
+                return node;
+            }
+        });
+
+        return !escapes.isEmpty();
+    }
+
+    @Override
+    public Node enter(final ForNode forNode) {
+        // push the loop to the loop context
+        nest(forNode);
+        return forNode;
+    }
+
+    private static boolean conservativeAlwaysTrue(final Node node) {
+        return node == null || ((node instanceof LiteralNode) && Boolean.TRUE.equals(((LiteralNode<?>)node).getValue()));
+    }
+
+    @Override
+    public Node leave(final ForNode forNode) {
+        final Node init   = forNode.getInit();
+        final Node test   = forNode.getTest();
+        final Node modify = forNode.getModify();
+
+        if (forNode.isForIn()) {
+            final String name = compiler.uniqueName(ITERATOR_PREFIX.tag());
+            // DEFINE SYMBOL: may be any type, not local var
+            final Symbol iter = getCurrentFunctionNode().defineSymbol(name, IS_VAR | IS_INTERNAL, null);
+            iter.setType(Type.OBJECT); // NASHORN-73
+            forNode.setIterator(iter);
+            forNode.setModify(convert(forNode.getModify(), Type.OBJECT)); // NASHORN-400
+
+            /*
+             * Iterators return objects, so we need to widen the scope of the
+             * init variable if it, for example, has been assigned double type
+             * see NASHORN-50
+             */
+            forNode.getInit().getSymbol().setType(Type.OBJECT);
+        } else {
+            /* Normal for node, not for in */
+
+            if (init != null) {
+                forNode.setInit(discard(init));
+            }
+
+            if (test != null) {
+                forNode.setTest(convert(test, Type.BOOLEAN));
+            } else {
+                forNode.setHasGoto();
+            }
+
+            if (modify != null) {
+                forNode.setModify(discard(modify));
+            }
+        }
+
+        final Block body = forNode.getBody();
+
+        final boolean escapes = controlFlowEscapes(body);
+        if (escapes) {
+            body.setIsTerminal(false);
+        }
+
+        // pop the loop from the loop context
+        unnest();
+
+        if (!forNode.isForIn() && conservativeAlwaysTrue(test)) {
+            forNode.setTest(null);
+            forNode.setIsTerminal(!escapes);
+        }
+
+        statements.add(forNode);
+
+        return forNode;
+    }
+
+    /**
+     * Initialize this symbol and variable for function node
+     *
+     * @param functionNode the function node
+     */
+    private void initThis(final FunctionNode functionNode) {
+        final long token = functionNode.getToken();
+        final int finish = functionNode.getFinish();
+
+        final Symbol thisSymbol = functionNode.defineSymbol(THIS.tag(), IS_PARAM | IS_THIS, null);
+        final IdentNode thisNode = new IdentNode(source, token, finish, thisSymbol.getName());
+
+        thisSymbol.setType(Type.OBJECT);
+        thisSymbol.setNeedsSlot(true);
+
+        thisNode.setSymbol(thisSymbol);
+
+        functionNode.setThisNode(thisNode);
+    }
+
+    /**
+     * Initialize scope symbol and variable for function node
+     *
+     * @param functionNode the function node
+     */
+    private void initScope(final FunctionNode functionNode) {
+        final long token = functionNode.getToken();
+        final int finish = functionNode.getFinish();
+
+        final Symbol scopeSymbol = functionNode.defineSymbol(SCOPE.tag(), IS_VAR | IS_INTERNAL, null);
+        final IdentNode scopeNode = new IdentNode(source, token, finish, scopeSymbol.getName());
+
+        scopeSymbol.setType(ScriptObject.class);
+        scopeSymbol.setNeedsSlot(true);
+
+        scopeNode.setSymbol(scopeSymbol);
+
+        functionNode.setScopeNode(scopeNode);
+    }
+
+    /**
+     * Initialize return symbol and variable for function node
+     *
+     * @param functionNode the function node
+     */
+    private void initReturn(final FunctionNode functionNode) {
+        final long token = functionNode.getToken();
+        final int finish = functionNode.getFinish();
+
+        final Symbol returnSymbol = functionNode.defineSymbol(SCRIPT_RETURN.tag(), IS_VAR | IS_INTERNAL, null);
+        final IdentNode returnNode = new IdentNode(source, token, finish, returnSymbol.getName());
+
+        returnSymbol.setType(Object.class);
+        returnSymbol.setNeedsSlot(true);
+
+        returnNode.setSymbol(returnSymbol);
+
+        functionNode.setResultNode(returnNode);
+    }
+
+    /**
+     * Initialize varargs for function node, if applicable
+     *
+     * @param functionNode
+     */
+    private void initVarArg(final FunctionNode functionNode) {
+        final long token  = functionNode.getToken();
+        final int  finish = functionNode.getFinish();
+
+        assert functionNode.getCalleeNode() != null;
+
+        final Symbol    varArgsSymbol = functionNode.defineSymbol(VARARGS.tag(), IS_PARAM | IS_INTERNAL, null);
+        final IdentNode varArgsNode   = new IdentNode(source, token, finish, varArgsSymbol.getName());
+
+        varArgsSymbol.setType(Type.OBJECT_ARRAY);
+        varArgsSymbol.setNeedsSlot(true);
+
+        varArgsNode.setSymbol(varArgsSymbol);
+
+        functionNode.setVarArgsNode(varArgsNode);
+
+        final String    argumentsName    = ARGUMENTS.tag();
+        final String    name             = functionNode.hideArguments() ? functionNode.uniqueName("$" + argumentsName) : argumentsName;
+        final Symbol    argumentsSymbol  = functionNode.defineSymbol(name, IS_PARAM | IS_INTERNAL, null);
+        final IdentNode argumentsNode    = new IdentNode(source, token, finish, argumentsSymbol.getName());
+
+        argumentsSymbol.setType(Type.OBJECT);
+        argumentsSymbol.setNeedsSlot(true);
+
+        argumentsNode.setSymbol(argumentsSymbol);
+
+        functionNode.setArgumentsNode(argumentsNode);
+    }
+
+    private void initCallee(final FunctionNode functionNode) {
+        if (functionNode.getCalleeNode() != null) {
+            return;
+        }
+
+        final long token = functionNode.getToken();
+        final int finish = functionNode.getFinish();
+
+        final Symbol    calleeSymbol = functionNode.defineSymbol(CALLEE.tag(), IS_PARAM | IS_INTERNAL, null);
+        final IdentNode calleeNode   = new IdentNode(source, token, finish, calleeSymbol.getName());
+
+        calleeSymbol.setType(ScriptFunction.class);
+        calleeSymbol.setNeedsSlot(true);
+
+        calleeNode.setSymbol(calleeSymbol);
+
+        functionNode.setCalleeNode(calleeNode);
+    }
+
+    /**
+     * Initialize parameters for function node. This may require specializing
+     * types if a specialization profile is known
+     *
+     * @param functionNode the function node
+     */
+    private void initParameters(final FunctionNode functionNode) {
+        /*
+         * If a function is specialized, we don't need to tag either it return
+         * type or its parameters with the widest (OBJECT) type for safety.
+         */
+        functionNode.setReturnType(Type.UNKNOWN);
+
+        for (final IdentNode ident : functionNode.getParameters()) {
+            localDefs.add(ident.getName());
+            final Symbol paramSymbol = functionNode.defineSymbol(ident.getName(), IS_PARAM, ident);
+            if (paramSymbol != null) {
+                paramSymbol.setType(Type.UNKNOWN);
+            }
+        }
+    }
+
+    /**
+     * This has to run before fix assignment types, store any type specializations for
+     * paramters, then turn then to objects for the generic version of this method
+     *
+     * @param functionNode functionNode
+     */
+    private static void fixParameters(final FunctionNode functionNode) {
+        boolean nonObjectParams = false;
+        List<Type> paramSpecializations = new ArrayList<>();
+
+        for (final IdentNode ident : functionNode.getParameters()) {
+            final Symbol paramSymbol = ident.getSymbol();
+            if (paramSymbol != null) {
+                Type type = paramSymbol.getSymbolType();
+                if (type.isUnknown()) {
+                    type = Type.OBJECT;
+                }
+                paramSpecializations.add(type);
+                if (!type.isObject()) {
+                    nonObjectParams = true;
+                }
+                paramSymbol.setType(Type.OBJECT);
+            }
+        }
+
+        if (!nonObjectParams) {
+            paramSpecializations = null;
+            /*
+             * Later, when resolving a call to this method, the linker can say "I have a double, an int and an object" as parameters
+             * here. If the callee has parameter specializations, we can regenerate it with those particular types for speed.
+             */
+        } else {
+            LOG.info("parameter specialization possible: " + functionNode.getName() + " " + paramSpecializations);
+        }
+    }
+
+    private LiteralNode<Undefined> undefined() {
+        return LiteralNode.newInstance(source, 0, 0, UNDEFINED);
+    }
+
+    private void guaranteeReturn(final FunctionNode functionNode) {
+        Node resultNode;
+
+        if (functionNode.isScript()) {
+            resultNode = functionNode.getResultNode();
+        } else {
+            final Node lastStatement = Node.lastStatement(functionNode.getStatements());
+            if (lastStatement != null && (lastStatement.isTerminal() || lastStatement instanceof ReturnNode)) {
+                return; // return already in place, as it should be for a non-undefined returning function
+            }
+            resultNode = undefined().accept(this);
+        }
+
+        new ReturnNode(source, functionNode.getLastToken(), functionNode.getFinish(), resultNode, null).accept(this);
+
+        functionNode.setReturnType(Type.OBJECT);
+    }
+
+    /**
+     * Fix return types for a node. The return type is the widest of all known
+     * return expressions in the function, and has to be the same for all return
+     * nodes, thus we need to traverse all of them in case some of them must be
+     * upcast
+     *
+     * @param node function node to scan return types for
+     */
+    private void fixReturnTypes(final FunctionNode node) {
+
+        if (node.getReturnType().isUnknown()) {
+            node.setReturnType(Type.OBJECT); // for example, infinite loops
+        }
+
+        node.accept(new NodeVisitor() {
+            @Override
+            public Node enter(final FunctionNode subFunction) {
+                //leave subfunctions alone. their return values are already specialized and should not
+                //be touched.
+                return null;
+            }
+            @Override
+            public Node leave(final ReturnNode returnNode) {
+                if (returnNode.hasExpression()) {
+                    returnNode.setExpression(convert(returnNode.getExpression(), node.getReturnType()));
+                }
+                return returnNode;
+            }
+        });
+    }
+
+    /**
+     * Augment assignments with casts after traversing a function node.
+     * Assignment nodes are special, as they require entire scope for type
+     * inference.
+     *
+     * Consider e.g.
+     *
+     * var x = 18.5; //double
+     * for (...) {
+     *      var y = x; //initially y is inferred to be double y = func(x) //y changes to object, but above assignment is unaware that it needs to be var y = (object)x instaed
+     */
+
+    private void fixAssignmentTypes(final FunctionNode node, final List<Symbol> declaredSymbols) {
+
+        // Make sure all unknown symbols are OBJECT types now. No UNKNOWN may survive lower.
+        for (final Symbol symbol : declaredSymbols) {
+            if (symbol.getSymbolType().isUnknown()) {
+                LOG.finest("fixAssignmentTypes: widening " + symbol + " to object " + symbol + " in " + getCurrentFunctionNode());
+                symbol.setType(Type.OBJECT);
+                symbol.setCanBeUndefined();
+            }
+
+            if (symbol.canBeUndefined()) {
+                /*
+                 * Ideally we'd like to only widen to the narrowest
+                 * possible type that supports local variables, i.e. doubles for
+                 * numerics, but
+                 *
+                 * var x;
+                 *
+                 * if (x !== undefined) do something
+                 *
+                 * x++;
+                 *
+                 * Screws this up, as x is determined to be a double even though
+                 * the use is undefined This can be fixed with better use
+                 * analysis in the IdentNode visitor.
+                 *
+                 * This actually seems to be superseded with calls to ensureTypeNotUnknown
+                 */
+                if (!Type.areEquivalent(symbol.getSymbolType(), Type.OBJECT)) {
+                    debug(symbol + " in " + getCurrentFunctionNode() + " can be undefined. Widening to object");
+                    symbol.setType(Type.OBJECT);
+                }
+            }
+        }
+
+        node.accept(new NodeVisitor() {
+
+            private void fix(final Assignment<? extends Node> assignment) {
+                final Node src  = assignment.getAssignmentSource();
+                final Node dest = assignment.getAssignmentDest();
+
+                if (src == null) {
+                    return;
+                }
+
+                //we don't know about scope yet so this is too conservative. AccessSpecialized will remove casts that are not required
+
+                final Type srcType  = src.getType();
+                Type destType = dest.getType();
+
+                //we can only narrow an operation type if the variable doesn't have a slot
+                if (!dest.getSymbol().hasSlot() && !node.hasDeepWithOrEval()) {
+                    destType = Type.narrowest(((Node)assignment).getWidestOperationType(), destType);
+                }
+
+                if (!Type.areEquivalent(destType, srcType)) {
+                    LOG.finest("fixAssignment " + assignment + " type = " + src.getType() + "=>" + dest.getType());
+                    assignment.setAssignmentSource(convert(src, destType));
+                }
+            }
+
+            private Node checkAssignment(final Node assignNode) {
+                if (!assignNode.isAssignment()) {
+                    return assignNode;
+                }
+                fix((Assignment<?>)assignNode);
+                return assignNode;
+            }
+
+
+            @Override
+            public Node leave(final UnaryNode unaryNode) {
+                return checkAssignment(unaryNode);
+            }
+
+            @Override
+            public Node leave(final BinaryNode binaryNode) {
+                return checkAssignment(binaryNode);
+            }
+
+            @Override
+            public Node leave(final VarNode varNode) {
+                return checkAssignment(varNode);
+            }
+        });
+    }
+
+    /*
+     * For a script, add scope symbols as defined in the property map
+     */
+    private static void initFromPropertyMap(final FunctionNode functionNode) {
+        assert functionNode.isScript();
+
+        final PropertyMap map = Context.getGlobal().getMap();
+
+        for (final Property property : map.getProperties()) {
+            final String key = property.getKey();
+            functionNode.defineSymbol(key, IS_GLOBAL, null).setType(Type.OBJECT);
+        }
+    }
+
+    @Override
+    public Node enter(final FunctionNode functionNode) {
+
+        Node initialEvalResult = undefined();
+
+        nest(functionNode);
+
+        localDefs = new HashSet<>();
+        localUses = new HashSet<>();
+
+        functionNode.setFrame(functionNode.pushFrame());
+
+        initThis(functionNode);
+        initCallee(functionNode);
+        if (functionNode.isVarArg()) {
+            initVarArg(functionNode);
+        }
+
+        initParameters(functionNode);
+        initScope(functionNode);
+        initReturn(functionNode);
+
+        /*
+         * Add all nested functions as symbols in this function
+         */
+        for (final FunctionNode nestedFunction : functionNode.getFunctions()) {
+            final IdentNode ident = nestedFunction.getIdent();
+
+            // for initial eval result is the last declared function
+            if (ident != null && nestedFunction.isStatement()) {
+                final Symbol functionSymbol = functionNode.defineSymbol(ident.getName(), IS_VAR, nestedFunction);
+
+                functionSymbol.setType(ScriptFunction.class);
+                initialEvalResult = new IdentNode(ident);
+            }
+        }
+
+        if (functionNode.isScript()) {
+            initFromPropertyMap(functionNode);
+        }
+
+        // Add function name as local symbol
+        if (!functionNode.isStatement() && !functionNode.isAnonymous() && !functionNode.isScript()) {
+            final Symbol selfSymbol = functionNode.defineSymbol(functionNode.getIdent().getName(), IS_VAR, functionNode);
+            selfSymbol.setType(Type.OBJECT);
+            selfSymbol.setNode(functionNode);
+        }
+
+        /*
+         * As we are evaluating a nested structure, we need to store the
+         * statement list for the surrounding block and restore it when the
+         * function is done
+         */
+        final List<Node> savedStatements = statements;
+        statements = new ArrayList<>();
+
+        /*
+         * This pushes all declarations (except for non-statements, i.e. for
+         * node temporaries) to the top of the function scope. This way we can
+         * get around problems like
+         *
+         * while (true) {
+         *   break;
+         *   if (true) {
+         *     var s;
+         *   }
+         * }
+         *
+         * to an arbitrary nesting depth.
+         *
+         * @see NASHORN-73
+         */
+
+        final List<Symbol> declaredSymbols = new ArrayList<>();
+        for (final VarNode decl : functionNode.getDeclarations()) {
+            final IdentNode ident = decl.getName();
+            // any declared symbols that aren't visited need to be typed as
+            // well, hence the list
+            declaredSymbols.add(functionNode.defineSymbol(ident.getName(), IS_VAR, new IdentNode(ident)));
+        }
+
+        declaredSymbolsLocal = new ArrayList<>();
+
+        /*
+         * Main function code lowering
+         */
+        try {
+            /*
+             * Every nested function needs a definition in the outer function
+             * with its name. Add these.
+             */
+            for (final FunctionNode nestedFunction : functionNode.getFunctions()) {
+                final VarNode varNode = nestedFunction.getFunctionVarNode();
+                if (varNode != null) {
+                    final LineNumberNode lineNumberNode = nestedFunction.getFunctionVarLineNumberNode();
+                    if (lineNumberNode != null) {
+                        lineNumberNode.accept(this);
+                    }
+                    varNode.accept(this);
+                    varNode.setIsFunctionVarNode();
+                }
+            }
+
+            if (functionNode.isScript()) {
+                new ExecuteNode(source, functionNode.getFirstToken(), functionNode.getFinish(), initialEvalResult).accept(this);
+            }
+
+            /*
+             * Now we do the statements. This fills the block with code
+             */
+            for (final Node statement : functionNode.getStatements()) {
+                statement.accept(this);
+
+                final Node lastStatement = Node.lastStatement(statements);
+                if (lastStatement != null && lastStatement.hasTerminalFlags()) {
+                    functionNode.copyTerminalFlags(lastStatement);
+                    break;
+                }
+            }
+
+            functionNode.setStatements(statements);
+
+            /*
+             * If there are unusedterminated enpoints in the function, we need
+             * to add a "return undefined" in those places for correct semantics
+             */
+            if (!functionNode.isTerminal()) {
+                guaranteeReturn(functionNode);
+            }
+
+            /*
+             * Emit all nested functions
+             */
+            for (final FunctionNode nestedFunction : functionNode.getFunctions()) {
+                nestedFunction.accept(this);
+            }
+
+            fixReturnTypes(functionNode);
+
+            if (functionNode.needsSelfSymbol()) {
+                final IdentNode selfSlotNode = new IdentNode(functionNode.getIdent());
+                selfSlotNode.setSymbol(functionNode.findSymbol(functionNode.getIdent().getName()));
+                final Node functionRef = new IdentNode(functionNode.getCalleeNode());
+                statements.add(0, new VarNode(source, functionNode.getToken(), functionNode.getFinish(), selfSlotNode, functionRef, false).accept(this));
+            }
+        } finally {
+            /*
+             * Restore statement for outer block that we were working on
+             */
+            statements = savedStatements;
+        }
+
+        unnest();
+
+        fixParameters(functionNode);
+
+        /*
+         * Fix assignment issues. assignments are troublesome as they can be on
+         * the form "dest = dest op source" where the type is different for the
+         * two dest:s: right now this is a post pass that handles putting casts
+         * in the correct places, but it can be implemented as a bottom up AST
+         * traversal on the fly. TODO.
+         */
+        fixAssignmentTypes(functionNode, declaredSymbols);
+
+        /*
+         * Set state of function to lowered and pop the frame
+         */
+        functionNode.setIsLowered(true);
+        functionNode.popFrame();
+
+        return null;
+    }
+
+    @Override
+    public Node enter(final IdentNode identNode) {
+        final String name = identNode.getName();
+
+        if (identNode.isPropertyName()) {
+            // assign a pseudo symbol to property name
+            identNode.setSymbol(new Symbol(name, 0, Type.OBJECT));
+            return null;
+        }
+
+        final Block block = getCurrentBlock();
+        final Symbol oldSymbol = identNode.getSymbol();
+        Symbol symbol = block.findSymbol(name);
+
+        /*
+         * If an existing symbol with the name is found, use that otherwise,
+         * declare a new one
+         */
+
+        if (symbol != null) {
+            if (isFunctionExpressionSelfReference(symbol)) {
+                ((FunctionNode) symbol.getNode()).setNeedsSelfSymbol();
+            }
+
+            if (!identNode.isInitializedHere()) { // NASHORN-448
+                // here is a use outside the local def scope
+                if (!localDefs.contains(name)) {
+                    symbol.setType(Type.OBJECT);
+                    symbol.setCanBeUndefined();
+                }
+            }
+
+            identNode.setSymbol(symbol);
+            if (!getCurrentFunctionNode().isLocal(symbol)) {
+                // non-local: we need to put symbol in scope (if it isn't already)
+                if (!symbol.isScope()) {
+                    final List<Block> lookupBlocks = findLookupBlocksHelper(getCurrentFunctionNode(), symbol.findFunction());
+                    for (final Block lookupBlock : lookupBlocks) {
+                        final Symbol refSymbol = lookupBlock.findSymbol(name);
+                        refSymbol.setIsScope();
+                    }
+                }
+            }
+        } else {
+            symbol = block.useSymbol(name, identNode);
+            // we have never seen this before, it can be undefined
+            symbol.setType(Type.OBJECT); // TODO unknown -we have explicit casts anyway?
+            symbol.setCanBeUndefined();
+        }
+
+        if (symbol != oldSymbol && !identNode.isInitializedHere()) {
+            symbol.increaseUseCount();
+        }
+        localUses.add(identNode.getName());
+
+        return null;
+    }
+
+    private static List<Block> findLookupBlocksHelper(final FunctionNode currentFunction, final FunctionNode topFunction) {
+        if (currentFunction.findParentFunction() == topFunction) {
+            final List<Block> blocks = new LinkedList<>();
+
+            blocks.add(currentFunction.getParent());
+            blocks.addAll(currentFunction.getReferencingParentBlocks());
+            return blocks;
+        }
+        /**
+         * assumption: all parent blocks of an inner function will always be in the same outer function;
+         * therefore we can simply skip through intermediate functions.
+         * @see FunctionNode#addReferencingParentBlock(Block)
+         */
+        return findLookupBlocksHelper(currentFunction.findParentFunction(), topFunction);
+    }
+
+    private static boolean isFunctionExpressionSelfReference(final Symbol symbol) {
+        if (symbol.isVar() && symbol.getNode() == symbol.getBlock() && symbol.getNode() instanceof FunctionNode) {
+            return ((FunctionNode) symbol.getNode()).getIdent().getName().equals(symbol.getName());
+        }
+        return false;
+    }
+
+    @Override
+    public Node enter(final IfNode ifNode) {
+        nest(ifNode);
+        return ifNode;
+    }
+
+    @Override
+    public Node leave(final IfNode ifNode) {
+
+        final Node test = convert(ifNode.getTest(), Type.BOOLEAN);
+
+        /*
+         * constant if checks should short circuit into just one of the
+         * pass/fail blocks
+         */
+        if (test.getSymbol().isConstant()) {
+            assert test instanceof LiteralNode<?>;
+            final Block shortCut = ((LiteralNode<?>)test).isTrue() ? ifNode.getPass() : ifNode.getFail();
+            if (shortCut != null) {
+                for (final Node statement : shortCut.getStatements()) {
+                    statements.add(statement);
+                }
+            }
+            return null;
+        }
+
+        final Node pass = ifNode.getPass();
+        final Node fail = ifNode.getFail();
+
+        if (pass.isTerminal() && fail != null && fail.isTerminal()) {
+            ifNode.setIsTerminal(true);
+        }
+
+        ifNode.setTest(test);
+        statements.add(ifNode);
+
+        unnest();
+
+        return ifNode;
+    }
+
+    @Override
+    public Node leave(final IndexNode indexNode) {
+        getCurrentFunctionNode().newTemporary(Type.OBJECT, indexNode);
+
+        return indexNode;
+    }
+
+    @Override
+    public Node enter(final LabelNode labeledNode) {
+        // Don't want a symbol for label.
+        final Block body = labeledNode.getBody();
+        body.accept(this);
+        labeledNode.copyTerminalFlags(body);
+        statements.add(labeledNode);
+
+        return null;
+    }
+
+    @Override
+    public Node enter(final LineNumberNode lineNumberNode) {
+        statements.add(lineNumberNode);
+        return null;
+    }
+
+    /**
+     * Generate a new literal symbol.
+     *
+     * @param literalNode LiteralNode needing symbol.
+     * @return The literal node augmented with the symbol
+     */
+    private LiteralNode<?> newLiteral(final LiteralNode<?> literalNode) {
+        return newLiteral(getCurrentFunctionNode(), literalNode);
+    }
+
+    private static LiteralNode<?> newLiteral(final FunctionNode functionNode, final LiteralNode<?> literalNode) {
+        functionNode.newLiteral(literalNode);
+        return literalNode;
+    }
+
+    @SuppressWarnings("rawtypes")
+    @Override
+    public Node enter(final LiteralNode literalNode) {
+        if (literalNode.isTokenType(TokenType.THIS)) {
+            literalNode.setSymbol(getCurrentFunctionNode().getThisNode().getSymbol());
+            return null;
+        }
+
+        if (literalNode instanceof ArrayLiteralNode) {
+            final ArrayLiteralNode arrayLiteralNode = (ArrayLiteralNode)literalNode;
+            final Node[] array = arrayLiteralNode.getValue();
+
+            for (int i = 0; i < array.length; i++) {
+                final Node element = array[i];
+                if (element != null) {
+                    array[i] = array[i].accept(this);
+                }
+            }
+
+            arrayLiteralNode.analyze();
+            final Type elementType = arrayLiteralNode.getElementType();
+
+            // we only have types after all elements are accepted
+            for (int i = 0; i < array.length; i++) {
+                final Node element = array[i];
+                if (element != null) {
+                    array[i] = convert(element, elementType);
+                }
+            }
+        } else {
+            final Object value = literalNode.getValue();
+
+            if (value instanceof Node) {
+                final Node node = ((Node)value).accept(this);
+                if (node != null) {
+                    return newLiteral(LiteralNode.newInstance(source, node.getToken(), node.getFinish(), node));
+                }
+            }
+        }
+
+        newLiteral(literalNode);
+
+        return null;
+    }
+
+    @Override
+    public Node leave(final ObjectNode objectNode) {
+        getCurrentFunctionNode().newTemporary(Type.OBJECT, objectNode);
+        return objectNode;
+    }
+
+    @Override
+    public Node enter(final PropertyNode propertyNode) {
+        // assign a pseudo symbol to property name, see NASHORN-710
+        propertyNode.setSymbol(new Symbol(propertyNode.getKeyName(), 0, Type.OBJECT));
+        return propertyNode;
+    }
+
+    @Override
+    public Node enter(final ReferenceNode referenceNode) {
+        final FunctionNode fn = referenceNode.getReference();
+        if (fn != null) {
+            fn.addReferencingParentBlock(getCurrentBlock());
+        }
+        return referenceNode;
+    }
+
+    @Override
+    public Node leave(final ReferenceNode referenceNode) {
+        getCurrentFunctionNode().newTemporary(Type.OBJECT, referenceNode);
+        return referenceNode;
+    }
+
+    /**
+     * For each return node we need to set a return expression of the correct
+     * type. In the non-specializing world, we can always upcast to object and
+     * ignore the rest, but in the specializing world we have to keep track of
+     * the widest return type so far, which is the common one for this method.
+     *
+     * @param returnNode  the return node we are generating
+     * @param expression  the expression to return from this code
+     */
+    private void setReturnExpression(final ReturnNode returnNode, final Node expression) {
+        final FunctionNode functionNode = getCurrentFunctionNode();
+
+        returnNode.setExpression(expression);
+
+        final Symbol symbol = expression.getSymbol();
+        if (expression.getType().isUnknown() && symbol.isParam()) {
+            symbol.setType(Type.OBJECT);
+        }
+        functionNode.setReturnType(Type.widest(expression.getType(), functionNode.getReturnType()));
+    }
+
+    @Override
+    public Node enter(final ReturnNode returnNode) {
+        final TryNode tryNode = returnNode.getTryChain();
+        final Node expression = returnNode.getExpression();
+
+        if (tryNode != null) {
+            if (expression != null) {
+                final long token = returnNode.getToken();
+                final Node resultNode = getCurrentFunctionNode().getResultNode();
+                new ExecuteNode(source, token, Token.descPosition(token), new BinaryNode(source, Token.recast(token, TokenType.ASSIGN), resultNode, expression)).accept(this);
+
+                if (copyFinally(tryNode, null)) {
+                    return null;
+                }
+
+                setReturnExpression(returnNode, resultNode);
+            } else if (copyFinally(tryNode, null)) {
+                return null;
+            }
+        } else if (expression != null) {
+            setReturnExpression(returnNode, expression.accept(this));
+        }
+
+        statements.add(returnNode);
+
+        return null;
+    }
+
+    @Override
+    public Node leave(final RuntimeNode runtimeNode) {
+        for (final Node arg : runtimeNode.getArgs()) {
+            ensureTypeNotUnknown(arg);
+        }
+
+        getCurrentFunctionNode().newTemporary(runtimeNode.getRequest().getReturnType(), runtimeNode);
+
+        return runtimeNode;
+    }
+
+    @Override
+    public Node enter(final SwitchNode switchNode) {
+        nest(switchNode);
+        return switchNode;
+    }
+
+    @Override
+    public Node leave(final SwitchNode switchNode) {
+        unnest();
+
+        final Node           expression  = switchNode.getExpression();
+        final List<CaseNode> cases       = switchNode.getCases();
+        final CaseNode       defaultCase = switchNode.getDefaultCase();
+        final boolean        hasDefault  = defaultCase != null;
+        final int            n           =  cases.size() + (hasDefault ? -1 : 0);
+
+        boolean allTerminal = !cases.isEmpty();
+        boolean allInteger  = n > 1;
+
+        for (final CaseNode caseNode : cases) {
+            allTerminal &= caseNode.isTerminal();
+            final Node test = caseNode.getTest();
+
+            // Skip default.
+            if (test == null) {
+                continue;
+            }
+
+            // If not a number.
+            if (!(test instanceof LiteralNode) || !test.getType().isNumeric()) {
+                allInteger = false;
+                continue;
+            }
+
+            final LiteralNode<?> testLiteral = (LiteralNode<?>)test;
+
+            // If a potential integer.
+            if (!(testLiteral.getValue() instanceof Integer)) {
+                // If not an integer value.
+                if (!JSType.isRepresentableAsInt(testLiteral.getNumber())) {
+                    allInteger = false;
+                    continue;
+                }
+
+                // Guarantee all case literals are Integers (simplifies sorting in code gen.)
+                caseNode.setTest(newLiteral(LiteralNode.newInstance(source, testLiteral.getToken(), testLiteral.getFinish(), testLiteral.getInt32())));
+            }
+        }
+
+        if (allTerminal && defaultCase != null && defaultCase.isTerminal()) {
+            switchNode.setIsTerminal(true);
+        }
+
+        if (!allInteger) {
+            switchNode.setExpression(convert(expression, Type.OBJECT));
+
+            for (final CaseNode caseNode : cases) {
+                final Node test = caseNode.getTest();
+
+                if (test != null) {
+                    caseNode.setTest(convert(test, Type.OBJECT));
+                }
+            }
+        }
+
+        final String name = compiler.uniqueName(SWITCH_TAG_PREFIX.tag());
+        final Symbol tag  = getCurrentFunctionNode().defineSymbol(name, IS_VAR | IS_INTERNAL, null);
+
+        tag.setType(allInteger ? Type.INT : Type.OBJECT);
+        switchNode.setTag(tag);
+
+        statements.add(switchNode);
+
+        return switchNode;
+    }
+
+    @Override
+    public Node leave(final ThrowNode throwNode) {
+        throwNode.setExpression(convert(throwNode.getExpression(), Type.OBJECT));
+        statements.add(throwNode);
+
+        return throwNode;
+    }
+
+    @Override
+    public Node enter(final TryNode tryNode) {
+        final Block  finallyBody   = tryNode.getFinallyBody();
+        final Source tryNodeSource = tryNode.getSource();
+        final long   token         = tryNode.getToken();
+        final int    finish        = tryNode.getFinish();
+
+        nest(tryNode);
+
+        if (finallyBody == null) {
+            return tryNode;
+        }
+
+        /**
+         * We have a finally clause.
+         *
+         * Transform to do finally tail duplication as follows:
+         *
+         * <pre>
+         *  try {
+         *    try_body
+         *  } catch e1 {
+         *    catchbody_1
+         *  }
+         *  ...
+         *  } catch en {
+         *    catchbody_n
+         *  } finally {
+         *    finally_body
+         *  }
+         *
+         *  (where e1 ... en are optional)
+         *
+         *  turns into
+         *
+         *  try {
+         *    try {
+         *      try_body
+         *    } catch e1 {
+         *      catchbody1
+         *      //nothing inlined explicitly here, return, break other
+         *      //terminals may inline the finally body
+         *      ...
+         *    } catch en {
+         *      catchbody2
+         *      //nothing inlined explicitly here, return, break other
+         *      //terminals may inline the finally body
+         *    }
+         *  } catch all ex {
+         *      finally_body_inlined
+         *      rethrow ex
+         *  }
+         *  finally_body_inlined
+         * </pre>
+         *
+         * If tries are catches are terminal, visitors for return, break &
+         * continue will handle the tail duplications. Throw needs to be
+         * treated specially with the catchall as described in the above
+         * ASCII art.
+         *
+         * If the try isn't terminal we do the finally_body_inlined at the
+         * end. If the try is terminated with continue/break/return the
+         * existing visitor logic will inline the finally before that
+         * operation. if the try is terminated with a throw, the catches e1
+         * ... en will have a chance to process the exception. If the
+         * appropriate catch e1..en is non terminal we fall through to the
+         * last finally_body_inlined. if the catch e1...en IS terminal with
+         * continue/break/return existing visitor logic will fix it. If they
+         * are terminal with another throw it goes to the catchall and the
+         * finally_body_inlined marked (*) will fix it before rethrowing
+         * whatever problem there was for identical semantic.
+         */
+
+        // if try node does not contain a catch we can skip creation of a new
+        // try node and just append our synthetic catch to the existing try node.
+        if (!tryNode.getCatchBlocks().isEmpty()) {
+            // insert an intermediate try-catch* node, where we move the body and all catch blocks.
+            // the original try node become a try-finally container for the new try-catch* node.
+            // because we don't clone (to avoid deep copy), we have to fix the block chain in the end.
+            final TryNode innerTryNode = new TryNode(tryNodeSource, token, finish, tryNode.getNext());
+            innerTryNode.setBody(tryNode.getBody());
+            innerTryNode.setCatchBlocks(tryNode.getCatchBlocks());
+
+            // set outer tryNode's body to innerTryNode
+            final Block outerBody = new Block(tryNodeSource, token, finish, tryNode.getBody().getParent(), getCurrentFunctionNode());
+            outerBody.setStatements(new ArrayList<Node>(Arrays.asList(innerTryNode)));
+            tryNode.setBody(outerBody);
+            tryNode.setCatchBlocks(null);
+
+            // now before we go on, we have to fix the block parents
+            // (we repair the block tree after the insertion so that all references are intact)
+            innerTryNode.getBody().setParent(tryNode.getBody());
+            for (final Block block : innerTryNode.getCatchBlocks()) {
+                block.setParent(tryNode.getBody());
+            }
+        }
+
+        // create a catch-all that inlines finally and rethrows
+        final String name = compiler.uniqueName(EXCEPTION_PREFIX.tag());
+
+        final IdentNode exception = new IdentNode(tryNodeSource, token, finish, name);
+        exception.accept(this);
+
+        final Block catchBlock      = new Block(tryNodeSource, token, finish, getCurrentBlock(), getCurrentFunctionNode());
+        final Block catchBody       = new Block(tryNodeSource, token, finish, catchBlock, getCurrentFunctionNode());
+        final Node  catchAllFinally = finallyBody.clone();
+
+        catchBody.addStatement(new ExecuteNode(tryNodeSource, finallyBody.getToken(), finallyBody.getFinish(), catchAllFinally));
+        catchBody.setIsTerminal(true);
+
+        final CatchNode catchNode = new CatchNode(tryNodeSource, token, finish, new IdentNode(exception), null, catchBody);
+        catchNode.setIsSyntheticRethrow();
+        getCurrentFunctionNode().setHasThrows(true);
+        catchBlock.addStatement(catchNode);
+
+        // replace all catches of outer tryNode with the catch-all
+        tryNode.setCatchBlocks(new ArrayList<>(Arrays.asList(catchBlock)));
+
+        /*
+         * We leave the finally block for the original try in place for now
+         * so that children visitations will work. It is removed and placed
+         * afterwards in the else case below, after all children are visited
+         */
+
+        return tryNode;
+    }
+
+    @Override
+    public Node leave(final TryNode tryNode) {
+        final Block finallyBody   = tryNode.getFinallyBody();
+
+        boolean allTerminal = tryNode.getBody().isTerminal() && (finallyBody == null || finallyBody.isTerminal());
+
+        for (final Block catchBlock : tryNode.getCatchBlocks()) {
+            allTerminal &= catchBlock.isTerminal();
+        }
+
+        tryNode.setIsTerminal(allTerminal);
+
+        final String name      = compiler.uniqueName(EXCEPTION_PREFIX.tag());
+        final Symbol exception = getCurrentFunctionNode().defineSymbol(name, IS_VAR | IS_INTERNAL, null);
+
+        exception.setType(ECMAException.class);
+        tryNode.setException(exception);
+
+        statements.add(tryNode);
+
+        unnest();
+
+        // if finally body is present, place it after the tryNode
+        if (finallyBody != null) {
+            tryNode.setFinallyBody(null);
+            statements.add(finallyBody);
+        }
+
+        return tryNode;
+    }
+
+    @Override
+    public Node enter(final VarNode varNode) {
+        final IdentNode ident = varNode.getName();
+        final String    name  = ident.getName();
+
+        final Symbol symbol = getCurrentBlock().defineSymbol(name, IS_VAR, ident);
+        assert symbol != null;
+
+        varNode.setSymbol(symbol);
+        declaredSymbolsLocal.add(symbol);
+
+        // NASHORN-467 - use before definition of vars - conservative
+        if (localUses.contains(ident.getName())) {
+            symbol.setType(Type.OBJECT);
+            symbol.setCanBeUndefined();
+        }
+
+        return varNode;
+    }
+
+    private static boolean isScopeOrGlobal(final Symbol symbol) {
+        return symbol.getBlock().getFunction().isScript(); //we can't do explicit isScope checks as early as lower, which is why AccessSpecializer is afterwards as well.
+    }
+
+    @Override
+    public Node leave(final VarNode varNode) {
+        final Node      init  = varNode.getInit();
+        final IdentNode ident = varNode.getName();
+        final String    name  = ident.getName();
+
+        if (init != null) {
+            localDefs.add(name);
+        }
+
+        if (varNode.shouldAppend()) {
+            statements.add(varNode);
+        }
+
+        if (init == null) {
+            // var x; with no init will be treated like a use of x by
+            // visit(IdentNode) unless we remove the name
+            // from the localdef list.
+            localDefs.remove(name);
+            return varNode;
+        }
+
+        final Symbol symbol = varNode.getSymbol();
+        if ((init.getType().isNumeric() || init.getType().isBoolean()) && !isScopeOrGlobal(symbol)) { //see NASHORN-56
+            // Forbid integers as local vars for now as we have no way to treat them as undefined
+            final Type type = Compiler.shouldUseIntegers() ? init.getType() : Type.NUMBER;
+            varNode.setInit(convert(init, type));
+            symbol.setType(type);
+        } else {
+            symbol.setType(Type.OBJECT); // var x = obj;, x is an "object" //TODO too conservative now?
+        }
+
+        return varNode;
+    }
+
+    @Override
+    public Node enter(final WhileNode whileNode) {
+        // push the loop to the loop context
+        nest(whileNode);
+
+        return whileNode;
+    }
+
+    @Override
+    public Node leave(final WhileNode whileNode) {
+        final Node test = whileNode.getTest();
+
+        if (test != null) {
+            whileNode.setTest(convert(test, Type.BOOLEAN));
+        } else {
+            whileNode.setHasGoto();
+        }
+
+        Node returnNode = whileNode;
+
+        final Block   body    = whileNode.getBody();
+        final boolean escapes = controlFlowEscapes(body);
+        if (escapes) {
+            body.setIsTerminal(false);
+        }
+
+        if (body.isTerminal()) {
+            if (whileNode instanceof DoWhileNode) {
+                whileNode.setIsTerminal(true);
+            } else if (conservativeAlwaysTrue(test)) {
+                returnNode = new ForNode(source, whileNode.getToken(), whileNode.getFinish());
+                ((ForNode)returnNode).setBody(body);
+                returnNode.setIsTerminal(!escapes);
+            }
+        }
+
+        // pop the loop from the loop context
+        unnest();
+        statements.add(returnNode);
+
+        return returnNode;
+    }
+
+    @Override
+    public Node leave(final WithNode withNode) {
+        withNode.setExpression(convert(withNode.getExpression(), Type.OBJECT));
+
+        if (withNode.getBody().isTerminal()) {
+            withNode.setIsTerminal(true);
+        }
+
+        statements.add(withNode);
+
+        return withNode;
+    }
+
+    /*
+     * Unary visits.
+     */
+
+    /**
+     * Visit unary node and set symbols and inferred type
+     *
+     * @param unaryNode  unary node to visit
+     * @param type       The narrowest allowed type for this node
+     *
+     * @return the final node, or replacement thereof
+     */
+    public Node leaveUnary(final UnaryNode unaryNode, final Type type) {
+        /* Try to eliminate the unary node if the expression is constant */
+        final LiteralNode<?> literalNode = new UnaryNodeConstantEvaluator(unaryNode).eval();
+        if (literalNode != null) {
+            return newLiteral(literalNode);
+        }
+
+        /* Add explicit conversion */
+        unaryNode.setRHS(convert(unaryNode.rhs(), type));
+        getCurrentFunctionNode().newTemporary(type, unaryNode);
+
+        return unaryNode;
+    }
+
+    @Override
+    public Node leaveADD(final UnaryNode unaryNode) {
+        return leaveUnary(unaryNode, Type.NUMBER);
+    }
+
+    @Override
+    public Node leaveBIT_NOT(final UnaryNode unaryNode) {
+        return leaveUnary(unaryNode, Type.INT);
+    }
+
+    @Override
+    public Node leaveCONVERT(final UnaryNode unaryNode) {
+        final Node rhs = unaryNode.rhs();
+
+        if (rhs.isTokenType(TokenType.CONVERT)) {
+            rhs.setSymbol(unaryNode.getSymbol());
+            return rhs;
+        }
+
+        return unaryNode;
+    }
+
+    /**
+     * In an assignment, recursively make sure that there are slots for
+     * everything that has to be laid out as temporary storage, which is the
+     * case if we are assign-op:ing a BaseNode subclass. This has to be
+     * recursive to handle things like multi dimensional arrays as lhs
+     *
+     * see NASHORN-258
+     *
+     * @param functionNode   the current function node (has to be passed as it changes in the visitor below)
+     * @param assignmentDest the destination node of the assignment, e.g. lhs for binary nodes
+     */
+    private static void ensureAssignmentSlots(final FunctionNode functionNode, final Node assignmentDest) {
+
+        assignmentDest.accept(new NodeVisitor() {
+
+            @Override
+            public Node leave(final AccessNode accessNode) {
+                final Node base = accessNode.getBase();
+                if (base.getSymbol().isThis()) {
+                    functionNode.addThisProperty(accessNode.getProperty().getName(), accessNode);
+                }
+
+                return accessNode;
+            }
+
+            @Override
+            public Node leave(final IndexNode indexNode) {
+                final Node index = indexNode.getIndex();
+                index.getSymbol().setNeedsSlot(!index.getSymbol().isConstant());
+
+                return indexNode;
+            }
+
+        });
+    }
+
+    @Override
+    public Node leaveDECINC(final UnaryNode unaryNode) {
+        // @see assignOffset
+        ensureAssignmentSlots(getCurrentFunctionNode(), unaryNode.rhs());
+        final Type type = Compiler.shouldUseIntegerArithmetic() ? Type.INT : Type.NUMBER;
+
+        unaryNode.rhs().getSymbol().setType(type);
+        getCurrentFunctionNode().newTemporary(type, unaryNode);
+
+        return unaryNode;
+    }
+
+    /**
+     * Helper class for wrapping a result
+     */
+    private abstract static class ResultNodeVisitor extends NodeVisitor {
+
+        private Node resultNode;
+
+        ResultNodeVisitor(final Node resultNode) {
+            this.resultNode = resultNode;
+        }
+
+        Node getResultNode() {
+            return resultNode;
+        }
+
+        void setResultNode(final Node resultNode) {
+            this.resultNode = resultNode;
+        }
+    }
+
+    @Override
+    public Node leaveDELETE(final UnaryNode unaryNode) {
+        final boolean              strictMode     = getCurrentFunctionNode().isStrictMode();
+        final Node                 rhs            = unaryNode.rhs();
+        final long                 token          = unaryNode.getToken();
+        final int                  finish         = unaryNode.getFinish();
+        final LiteralNode<Boolean> trueNode       = LiteralNode.newInstance(source, token, finish, true);
+        final LiteralNode<Boolean> strictFlagNode = LiteralNode.newInstance(source, token, finish, strictMode);
+
+        newLiteral(trueNode);
+        newLiteral(strictFlagNode);
+
+        final NodeVisitor  lower = this;
+        final FunctionNode currentFunctionNode = getCurrentFunctionNode();
+
+        final ResultNodeVisitor visitor = new ResultNodeVisitor(trueNode) {
+
+            private void initRuntimeNode(final RuntimeNode node) {
+                node.accept(lower);
+                currentFunctionNode.newTemporary(Type.BOOLEAN, unaryNode);
+                node.setSymbol(unaryNode.getSymbol());
+
+                setResultNode(node);
+            }
+
+            @Override
+            public Node enter(final IdentNode node) {
+                // If this is a declared variable or a function parameter, delete always fails (except for globals).
+                final boolean failDelete =
+                        strictMode ||
+                        node.getSymbol().isParam() ||
+                        (node.getSymbol().isVar() && !node.getSymbol().isTopLevel());
+
+                final Node literalNode =
+                    newLiteral(
+                        currentFunctionNode,
+                        LiteralNode.newInstance(
+                            source,
+                            node.getToken(),
+                            node.getFinish(),
+                            node.getName()));
+
+                if (failDelete) {
+                    if (THIS.tag().equals(node.getName())) {
+                        statements.add(new ExecuteNode(source, token, finish, discard(node)));
+                        currentFunctionNode.newTemporary(Type.BOOLEAN, trueNode);
+                        return null; //trueNode it is
+                    }
+                }
+
+                final List<Node> args = new ArrayList<>();
+                args.add(convert(currentFunctionNode.getScopeNode(), Type.OBJECT));
+                args.add(convert(literalNode, Type.OBJECT));
+                args.add(strictFlagNode);
+
+                initRuntimeNode(
+                    new RuntimeNode(
+                        source,
+                        token,
+                        finish,
+                        failDelete ? FAIL_DELETE : DELETE,
+                        args));
+
+                return null;
+            }
+
+            @Override
+            public Node enter(final AccessNode node) {
+                final IdentNode property = node.getProperty();
+
+                initRuntimeNode(
+                    new RuntimeNode(
+                        source,
+                        token,
+                        finish,
+                        DELETE,
+                        convert(node.getBase(), Type.OBJECT),
+                        convert(
+                            newLiteral(
+                                currentFunctionNode,
+                                LiteralNode.newInstance(
+                                    source,
+                                    property.getToken(),
+                                    property.getFinish(),
+                                    property.getName())),
+                            Type.OBJECT),
+                        strictFlagNode));
+
+                return null;
+            }
+
+            @Override
+            public Node enter(final IndexNode node) {
+                initRuntimeNode(
+                    new RuntimeNode(
+                        source,
+                        token,
+                        finish,
+                        DELETE,
+                        convert(node.getBase(), Type.OBJECT),
+                        convert(node.getIndex(), Type.OBJECT),
+                        strictFlagNode));
+
+                return null;
+            }
+
+            @Override
+            public Node enterDefault(final Node node) {
+                statements.add(new ExecuteNode(source, token, finish, discard(node)));
+                currentFunctionNode.newTemporary(Type.BOOLEAN, trueNode);
+                //just return trueNode which is the default
+                return null;
+            }
+        };
+
+        rhs.accept(visitor);
+
+        return visitor.getResultNode();
+    }
+
+    @Override
+    public Node enterNEW(final UnaryNode unaryNode) {
+        final CallNode callNode = (CallNode)unaryNode.rhs();
+
+        callNode.setIsNew();
+
+        final Node function = callNode.getFunction();
+        final Node markedFunction = markerFunction(function);
+
+        callNode.setFunction(markedFunction.accept(this));
+
+        acceptArgs(callNode);
+
+        getCurrentFunctionNode().newTemporary(Type.OBJECT, unaryNode);
+
+        return null;
+    }
+
+    @Override
+    public Node leaveNOT(final UnaryNode unaryNode) {
+        return leaveUnary(unaryNode, Type.BOOLEAN);
+    }
+
+    /**
+     * Create a null literal
+     *
+     * @param parent node to inherit token from.
+     * @return the new null literal
+     */
+    private LiteralNode<?> newNullLiteral(final Node parent) {
+        return newLiteral(LiteralNode.newInstance(parent.getSource(), parent.getToken(), parent.getFinish()));
+    }
+
+    @Override
+    public Node leaveTYPEOF(final UnaryNode unaryNode) {
+        final Node rhs    = unaryNode.rhs();
+        final long token  = unaryNode.getToken();
+        final int  finish = unaryNode.getFinish();
+
+        RuntimeNode runtimeNode;
+
+        if (rhs instanceof IdentNode) {
+            final IdentNode ident = (IdentNode)rhs;
+
+            if (ident.getSymbol().isParam() || ident.getSymbol().isVar()) {
+                runtimeNode = new RuntimeNode(
+                    source,
+                    token,
+                    finish,
+                    TYPEOF,
+                    convert(
+                        rhs,
+                        Type.OBJECT),
+                    newNullLiteral(unaryNode));
+            } else {
+                runtimeNode = new RuntimeNode(
+                    source,
+                    token,
+                    finish,
+                    TYPEOF,
+                    convert(
+                        getCurrentFunctionNode().getScopeNode(),
+                        Type.OBJECT),
+                    convert(
+                        newLiteral(
+                            LiteralNode.newInstance(
+                                source,
+                                ident.getToken(),
+                                ident.getFinish(),
+                                ident.getName())),
+                    Type.OBJECT));
+            }
+        }  else {
+            runtimeNode = new RuntimeNode(
+                source,
+                token,
+                finish,
+                TYPEOF,
+                convert(
+                    rhs,
+                    Type.OBJECT),
+                newNullLiteral(unaryNode));
+        }
+
+        runtimeNode.accept(this);
+
+        getCurrentFunctionNode().newTemporary(Type.OBJECT, unaryNode);
+        runtimeNode.setSymbol(unaryNode.getSymbol());
+
+        return runtimeNode;
+    }
+
+    @Override
+    public Node leaveSUB(final UnaryNode unaryNode) {
+        return leaveUnary(unaryNode, Type.NUMBER);
+    }
+
+    @Override
+    public Node leaveVOID(final UnaryNode unaryNode) {
+        final Node rhs = unaryNode.rhs();
+        getCurrentFunctionNode().newTemporary(Type.OBJECT, unaryNode);
+
+        // Set up request.
+        final RuntimeNode runtimeNode = new RuntimeNode(source, unaryNode.getToken(), unaryNode.getFinish(), VOID, convert(rhs, Type.OBJECT));
+
+        // Use same symbol as unary node.
+        runtimeNode.setSymbol(unaryNode.getSymbol());
+
+        return runtimeNode;
+    }
+
+    /**
+     * Compute the narrowest possible type for a binaryNode, based on its
+     * contents.
+     *
+     * @param binaryNode the binary node
+     * @return the narrowest possible type
+     */
+    private static Type binaryType(final BinaryNode binaryNode) {
+        final Node lhs = binaryNode.lhs();
+        assert lhs.hasType();
+
+        final Node rhs = binaryNode.rhs();
+        assert rhs.hasType();
+
+        // actually bitwise assignments are ok for ints. TODO
+        switch (binaryNode.tokenType()) {
+        case ASSIGN_BIT_AND:
+        case ASSIGN_BIT_OR:
+        case ASSIGN_BIT_XOR:
+        case ASSIGN_SHL:
+        case ASSIGN_SAR:
+            return Compiler.shouldUseIntegers() ? Type.widest(lhs.getType(), rhs.getType(), Type.INT) : Type.INT;
+        case ASSIGN_SHR:
+            return Type.LONG;
+        case ASSIGN:
+            return Compiler.shouldUseIntegers() ? Type.widest(lhs.getType(), rhs.getType(), Type.NUMBER) : Type.NUMBER;
+        default:
+            return binaryArithType(lhs.getType(), rhs.getType());
+        }
+    }
+
+    private static Type binaryArithType(final Type lhsType, final Type rhsType) {
+         if (!Compiler.shouldUseIntegerArithmetic()) {
+             return Type.NUMBER;
+         }
+         return Type.widest(lhsType, rhsType, Type.NUMBER);
+     }
+
+    /**
+     * Visit binary node and set symbols and inferred type
+     *
+     * @param binaryNode unary node to visit
+     * @param type       The narrowest allowed type for this node
+     *
+     * @return the final node, or replacement thereof
+     */
+    private Node leaveBinary(final BinaryNode binaryNode, final Type type) {
+        return leaveBinary(binaryNode, type, type, type);
+    }
+
+    /**
+     * Visit a binary node, specifying types for rhs, rhs and destType.
+     *
+     * @param binaryNode the binary node
+     * @param destType destination type
+     * @param lhsType type for left hand side
+     * @param rhsType type for right hand side
+     *
+     * @return resulting binary node
+     */
+    private Node leaveBinary(final BinaryNode binaryNode, final Type destType, final Type lhsType, final Type rhsType) {
+        /* Attempt to turn this binary expression into a constant */
+        final LiteralNode<?> literalNode = new BinaryNodeConstantEvaluator(binaryNode).eval();
+        if (literalNode != null) {
+            return newLiteral(literalNode);
+        }
+
+        if (lhsType != null) {
+            binaryNode.setLHS(convert(binaryNode.lhs(), lhsType));
+        }
+
+        if (rhsType != null) {
+            binaryNode.setRHS(convert(binaryNode.rhs(), rhsType));
+        }
+
+        getCurrentFunctionNode().newTemporary(destType, binaryNode);
+
+        return binaryNode;
+    }
+
+    /**
+     * Determine if the outcome of + operator is a string.
+     *
+     * @param node
+     *            Node to test.
+     * @return true if a string result.
+     */
+    private boolean isAddString(final Node node) {
+        if (node instanceof BinaryNode && node.isTokenType(TokenType.ADD)) {
+            final BinaryNode binaryNode = (BinaryNode)node;
+            final Node lhs = binaryNode.lhs();
+            final Node rhs = binaryNode.rhs();
+
+            return isAddString(lhs) || isAddString(rhs);
+        }
+
+        return node instanceof LiteralNode<?> && ((LiteralNode<?>)node).getObject() instanceof String;
+    }
+
+    /**
+     * Helper for creating a new runtime node from a parent node, inheriting its
+     * types and tokens
+     *
+     * @param parent   Parent node.
+     * @param args     Runtime request arguments.
+     * @param request  Runtime request type.
+     * @return New {@link RuntimeNode}.
+     */
+
+    private RuntimeNode newRuntime(final Node parent, final List<Node> args, final Request request) {
+        final RuntimeNode runtimeNode = new RuntimeNode(source, parent.getToken(), parent.getFinish(), request, args);
+        runtimeNode.setStart(parent.getStart());
+        runtimeNode.setFinish(parent.getFinish());
+
+        // Use same symbol as parent node.
+        runtimeNode.accept(this);
+        runtimeNode.setSymbol(parent.getSymbol());
+
+        return runtimeNode;
+    }
+
+    /**
+     * Helper for creating a new runtime node from a binary node
+     *
+     * @param binaryNode {@link RuntimeNode} expression.
+     * @param request    Runtime request type.
+     * @return New {@link RuntimeNode}.
+     */
+    private RuntimeNode newRuntime(final BinaryNode binaryNode, final Request request) {
+        return newRuntime(binaryNode, Arrays.asList(new Node[] { binaryNode.lhs(), binaryNode.rhs() }), request);
+    }
+
+    /**
+     * Add is a special binary, as it works not only on arithmetic, but for
+     * strings etc as well.
+     */
+    @Override
+    public Node leaveADD(final BinaryNode binaryNode) {
+        final Node lhs = binaryNode.lhs();
+        final Node rhs = binaryNode.rhs();
+
+        //parameters must be blown up to objects
+        ensureTypeNotUnknown(lhs);
+        ensureTypeNotUnknown(rhs);
+
+        if ((lhs.getType().isNumeric() || lhs.getType().isBoolean()) && (rhs.getType().isNumeric() || rhs.getType().isBoolean())) {
+            return leaveBinary(binaryNode, binaryType(binaryNode));
+        } else if (isAddString(binaryNode)) {
+            binaryNode.setLHS(convert(lhs, Type.OBJECT));
+            binaryNode.setRHS(convert(rhs, Type.OBJECT));
+            getCurrentFunctionNode().newTemporary(Type.OBJECT, binaryNode);
+        } else {
+            getCurrentFunctionNode().newTemporary(Type.OBJECT, binaryNode);
+            return newRuntime(binaryNode, ADD);
+        }
+
+        return binaryNode;
+    }
+
+    @Override
+    public Node leaveAND(final BinaryNode binaryNode) {
+        return leaveBinary(binaryNode, Type.OBJECT, null, null);
+    }
+
+    /**
+     * This is a helper called before an assignment.
+     * @param binaryNode assignment node
+     */
+    private Node enterAssign(final BinaryNode binaryNode) {
+        final Node lhs = binaryNode.lhs();
+
+        if (!(lhs instanceof IdentNode)) {
+            return binaryNode;
+        }
+
+        final Block     block = getCurrentBlock();
+        final IdentNode ident = (IdentNode)lhs;
+        final String    name  = ident.getName();
+
+        Symbol symbol = getCurrentBlock().findSymbol(name);
+
+        if (symbol == null) {
+            symbol = block.defineSymbol(name, IS_GLOBAL, ident);
+            binaryNode.setSymbol(symbol);
+        } else if (!getCurrentFunctionNode().isLocal(symbol)) {
+            symbol.setIsScope();
+        }
+
+        localDefs.add(name);
+
+        return binaryNode;
+    }
+
+    /**
+     * This assign helper is called after an assignment, when all children of
+     * the assign has been processed. It fixes the types and recursively makes
+     * sure that everyhing has slots that should have them in the chain.
+     *
+     * @param binaryNode assignment node
+     * @param destType   destination type of assignment
+     */
+    private Node leaveAssign(final BinaryNode binaryNode, final Type destType) {
+        binaryNode.lhs().getSymbol().setType(destType); // lhs inherits dest type
+        getCurrentFunctionNode().newTemporary(destType, binaryNode); // as does destination
+
+        ensureAssignmentSlots(getCurrentFunctionNode(), binaryNode.lhs());
+        return binaryNode;
+    }
+
+    @Override
+    public Node enterASSIGN(final BinaryNode binaryNode) {
+        return enterAssign(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN(final BinaryNode binaryNode) {
+        final Node lhs = binaryNode.lhs();
+        final Node rhs = binaryNode.rhs();
+
+        if (rhs.getType().isNumeric()) {
+            final Symbol lhsSymbol = lhs.getSymbol();
+            final Type lhsType = Type.widest(lhs.getType(), binaryType(binaryNode));
+
+            // for index nodes, we can set anything
+            lhsSymbol.setType(lhsType);
+            getCurrentFunctionNode().newTemporary(lhs.getType(), binaryNode);
+            if (!(lhs instanceof IndexNode)) {
+                binaryNode.setRHS(convert(rhs, lhsType));
+            }
+        } else {
+            // Force symbol to be object if not numeric assignment.
+            binaryNode.setRHS(convert(rhs, Type.OBJECT));
+            getCurrentFunctionNode().newTemporary(Type.OBJECT, binaryNode);
+
+            if (lhs instanceof IdentNode) {
+                lhs.getSymbol().setType(Type.OBJECT);
+            }
+        }
+
+        if (lhs instanceof AccessNode) {
+            final Node baseNode = ((AccessNode)lhs).getBase();
+
+            if (baseNode.getSymbol().isThis()) {
+                final IdentNode property = ((AccessNode)lhs).getProperty();
+                getCurrentFunctionNode().addThisProperty(property.getName(), property);
+            }
+        }
+
+        return binaryNode;
+    }
+
+    @Override
+    public Node enterASSIGN_ADD(final BinaryNode binaryNode) {
+        return enterAssign(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_ADD(final BinaryNode binaryNode) {
+        final Node lhs = binaryNode.lhs();
+        final Node rhs = binaryNode.rhs();
+        final boolean bothNumeric = lhs.getType().isNumeric() && rhs.getType().isNumeric();
+
+        /*
+         * In the case of bothNumeric,
+         * compute type for lhs += rhs. Assign type to lhs. Assign type to
+         * temporary for this node. Convert rhs from whatever it was to this
+         * type. Legacy wise dest has always been narrowed. It should
+         * actually only be the lhs that is the double, or other narrower
+         * type than OBJECT
+         */
+        return leaveAssign(binaryNode, bothNumeric ? binaryType(binaryNode) : Type.OBJECT);
+    }
+
+    @Override
+    public Node enterASSIGN_BIT_AND(final BinaryNode binaryNode) {
+        return enterAssign(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_BIT_AND(final BinaryNode binaryNode) {
+        return leaveAssign(binaryNode, binaryType(binaryNode));
+    }
+
+    @Override
+    public Node enterASSIGN_BIT_OR(final BinaryNode binaryNode) {
+        return enterAssign(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_BIT_OR(final BinaryNode binaryNode) {
+        return leaveAssign(binaryNode, binaryType(binaryNode));
+    }
+
+    @Override
+    public Node enterASSIGN_BIT_XOR(final BinaryNode binaryNode) {
+        return enterAssign(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_BIT_XOR(final BinaryNode binaryNode) {
+        return leaveAssign(binaryNode, binaryType(binaryNode));
+    }
+
+    @Override
+    public Node enterASSIGN_DIV(final BinaryNode binaryNode) {
+        return enterAssign(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_DIV(final BinaryNode binaryNode) {
+        return leaveAssign(binaryNode, binaryType(binaryNode));
+    }
+
+    @Override
+    public Node enterASSIGN_MOD(final BinaryNode binaryNode) {
+        return enterAssign(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_MOD(final BinaryNode binaryNode) {
+        return leaveAssign(binaryNode, binaryType(binaryNode));
+    }
+
+    @Override
+    public Node enterASSIGN_MUL(final BinaryNode binaryNode) {
+        return enterAssign(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_MUL(final BinaryNode binaryNode) {
+        return leaveAssign(binaryNode, binaryType(binaryNode));
+    }
+
+    @Override
+    public Node enterASSIGN_SAR(final BinaryNode binaryNode) {
+        return enterAssign(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_SAR(final BinaryNode binaryNode) {
+        return leaveAssign(binaryNode, binaryType(binaryNode));
+    }
+
+    @Override
+    public Node enterASSIGN_SHL(final BinaryNode binaryNode) {
+        return enterAssign(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_SHL(final BinaryNode binaryNode) {
+        return leaveAssign(binaryNode, binaryType(binaryNode));
+    }
+
+    @Override
+    public Node enterASSIGN_SHR(final BinaryNode binaryNode) {
+        return enterAssign(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_SHR(final BinaryNode binaryNode) {
+        return leaveAssign(binaryNode, binaryType(binaryNode));
+    }
+
+    @Override
+    public Node enterASSIGN_SUB(final BinaryNode binaryNode) {
+        return enterAssign(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_SUB(final BinaryNode binaryNode) {
+        return leaveAssign(binaryNode, binaryType(binaryNode));
+    }
+
+    @Override
+    public Node leaveBIT_AND(final BinaryNode binaryNode) {
+        return leaveBinary(binaryNode, Type.INT);
+    }
+
+    @Override
+    public Node leaveBIT_OR(final BinaryNode binaryNode) {
+        return leaveBinary(binaryNode, Type.INT);
+    }
+
+    @Override
+    public Node leaveBIT_XOR(final BinaryNode binaryNode) {
+        return leaveBinary(binaryNode, Type.INT);
+    }
+
+    @Override
+    public Node leaveCOMMARIGHT(final BinaryNode binaryNode) {
+        binaryNode.setLHS(discard(binaryNode.lhs()));
+        getCurrentFunctionNode().newTemporary(binaryNode.rhs().getType(), binaryNode);
+
+        return binaryNode;
+    }
+
+    @Override
+    public Node leaveCOMMALEFT(final BinaryNode binaryNode) {
+        binaryNode.setRHS(discard(binaryNode.rhs()));
+        getCurrentFunctionNode().newTemporary(binaryNode.lhs().getType(), binaryNode);
+
+        return binaryNode;
+    }
+
+    @Override
+    public Node leaveDIV(final BinaryNode binaryNode) {
+        return leaveBinary(binaryNode, binaryType(binaryNode));
+    }
+
+    @Override
+    public Node leaveEQ(final BinaryNode binaryNode) {
+        return leaveCmp(binaryNode, EQ);
+    }
+
+    @Override
+    public Node leaveEQ_STRICT(final BinaryNode binaryNode) {
+        return leaveCmp(binaryNode, EQ_STRICT);
+    }
+
+    private Node leaveCmp(final BinaryNode binaryNode, final RuntimeNode.Request request) {
+        final Node lhs = binaryNode.lhs();
+        final Node rhs = binaryNode.rhs();
+
+        /* Attempt to turn this comparison into a constant and collapse it */
+        final LiteralNode<?> literalNode = new BinaryNodeConstantEvaluator(binaryNode).eval();
+        if (literalNode != null) {
+            return newLiteral(literalNode);
+        }
+
+        // another case where dest != source operand types always a boolean
+        getCurrentFunctionNode().newTemporary(request.getReturnType(), binaryNode);
+
+        ensureTypeNotUnknown(lhs);
+        ensureTypeNotUnknown(rhs);
+        final Type type = Type.widest(lhs.getType(), rhs.getType());
+
+        if (type.isObject()) {
+            return newRuntime(binaryNode, request);
+        }
+
+        if ((request.equals(EQ_STRICT) || request.equals(NE_STRICT)) && lhs.getType().isBoolean() != rhs.getType().isBoolean()) {
+            // special case: number compared against boolean => never equal. must not convert!
+            final boolean              result     = request.equals(NE_STRICT);
+            final LiteralNode<Boolean> resultNode = LiteralNode.newInstance(source, 0, 0, result);
+            final boolean              canSkipLHS = (lhs instanceof LiteralNode);
+            final boolean              canSkipRHS = (rhs instanceof LiteralNode);
+
+            if (canSkipLHS && canSkipRHS) {
+                return resultNode.accept(this);
+            }
+
+            final Node argNode;
+
+            if (!canSkipLHS && !canSkipRHS) {
+                argNode = new BinaryNode(source, Token.recast(binaryNode.getToken(), TokenType.COMMARIGHT), lhs, rhs);
+            } else {
+                argNode = !canSkipLHS ? lhs : rhs;
+            }
+
+            return new BinaryNode(source, Token.recast(binaryNode.getToken(), TokenType.COMMARIGHT), argNode, resultNode).accept(this);
+        }
+
+        binaryNode.setLHS(convert(lhs, type));
+        binaryNode.setRHS(convert(rhs, type));
+
+        return binaryNode;
+    }
+
+    @Override
+    public Node leaveGE(final BinaryNode binaryNode) {
+        return leaveCmp(binaryNode, GE);
+    }
+
+    @Override
+    public Node leaveGT(final BinaryNode binaryNode) {
+        return leaveCmp(binaryNode, GT);
+    }
+
+    private Node exitIN_INSTANCEOF(final BinaryNode binaryNode, final Request request) {
+        getCurrentFunctionNode().newTemporary(request.getReturnType(), binaryNode);
+        return newRuntime(binaryNode, request);
+    }
+
+    @Override
+    public Node leaveIN(final BinaryNode binaryNode) {
+        return exitIN_INSTANCEOF(binaryNode, IN);
+    }
+
+    @Override
+    public Node leaveINSTANCEOF(final BinaryNode binaryNode) {
+        return exitIN_INSTANCEOF(binaryNode, INSTANCEOF);
+    }
+
+    @Override
+    public Node leaveLE(final BinaryNode binaryNode) {
+        return leaveCmp(binaryNode, LE);
+    }
+
+    @Override
+    public Node leaveLT(final BinaryNode binaryNode) {
+        return leaveCmp(binaryNode, LT);
+    }
+
+    @Override
+    public Node leaveMOD(final BinaryNode binaryNode) {
+        return leaveBinary(binaryNode, binaryType(binaryNode));
+    }
+
+    @Override
+    public Node leaveMUL(final BinaryNode binaryNode) {
+        return leaveBinary(binaryNode,  binaryType(binaryNode));
+    }
+
+    @Override
+    public Node leaveNE(final BinaryNode binaryNode) {
+        return leaveCmp(binaryNode, NE);
+    }
+
+    @Override
+    public Node leaveNE_STRICT(final BinaryNode binaryNode) {
+        return leaveCmp(binaryNode, NE_STRICT);
+    }
+
+    @Override
+    public Node leaveOR(final BinaryNode binaryNode) {
+        return leaveBinary(binaryNode, Type.OBJECT, null, null);
+    }
+
+    @Override
+    public Node leaveSAR(final BinaryNode binaryNode) {
+        return leaveBinary(binaryNode, Type.INT);
+    }
+
+    @Override
+    public Node leaveSHL(final BinaryNode binaryNode) {
+        return leaveBinary(binaryNode, Type.INT);
+    }
+
+    @Override
+    public Node leaveSHR(final BinaryNode binaryNode) {
+        return leaveBinary(binaryNode, Type.LONG, Type.INT, Type.INT);
+    }
+
+    @Override
+    public Node leaveSUB(final BinaryNode binaryNode) {
+        return leaveBinary(binaryNode, binaryType(binaryNode));
+    }
+
+    @Override
+    public Node leave(final TernaryNode ternaryNode) {
+        final Node test = ternaryNode.lhs();
+        final Node lhs  = ternaryNode.rhs();
+        final Node rhs  = ternaryNode.third();
+
+        ensureTypeNotUnknown(lhs);
+        ensureTypeNotUnknown(rhs);
+        final Type type = Type.widest(lhs.getType(), rhs.getType());
+
+        ternaryNode.setRHS(convert(lhs, type));
+        ternaryNode.setThird(convert(rhs, type));
+
+        // optimize away the ternary if the test is constant.
+        if (test.getSymbol().isConstant()) {
+            return ((LiteralNode<?>)test).isTrue() ? lhs : rhs;
+        }
+
+        ternaryNode.setLHS(convert(test, Type.BOOLEAN));
+
+        getCurrentFunctionNode().newTemporary(type, ternaryNode);
+
+        return ternaryNode;
+    }
+
+    private static void ensureTypeNotUnknown(final Node node) {
+        final Symbol symbol = node.getSymbol();
+
+        /*
+         * Note that not just unknowns, but params need to be blown
+         * up to objects, because we can have something like
+         *
+         * function f(a) {
+         *    var b = ~a; //b and a are inferred to be int
+         *    return b;
+         * }
+         *
+         * In this case, it would be correct to say that "if you have
+         * an int at the callsite, just pass it".
+         *
+         * However
+         *
+         * function f(a) {
+         *    var b = ~a;      //b and a are inferred to be int
+         *    return b == 17;  //b is still inferred to be int.
+         * }
+         *
+         * can be called with f("17") and if we assume that b is an
+         * int and don't blow it up to an object in the comparison, we
+         * are screwed. I hate JavaScript.
+         *
+         * This check has to be done for any operation that might take
+         * objects as parameters, for example +, but not *, which is known
+         * to coerce types into doubles
+         */
+        if (node.getType().isUnknown() || symbol.isParam()) {
+            symbol.setType(Type.OBJECT);
+            symbol.setCanBeUndefined();
+         }
+    }
+
+    /**
+     * Helper class to evaluate constant expressions at compile time This is
+     * also a simplifier used by BinaryNode visits, UnaryNode visits and
+     * conversions.
+     */
+    private abstract static class ConstantEvaluator<T extends Node> {
+        protected T            parent;
+        protected final Source source;
+        protected final long   token;
+        protected final int    finish;
+
+        protected ConstantEvaluator(final T parent) {
+            this.parent  = parent;
+            this.source  = parent.getSource();
+            this.token   = parent.getToken();
+            this.finish  = parent.getFinish();
+        }
+
+        /**
+         * Returns a literal node that replaces the given parent node, or null if replacement
+         * is impossible
+         * @return the literal node
+         */
+        protected abstract LiteralNode<?> eval();
+    }
+
+    static class LiteralNodeConstantEvaluator extends ConstantEvaluator<LiteralNode<?>> {
+        private final Type type;
+
+        LiteralNodeConstantEvaluator(final LiteralNode<?> parent, final Type type) {
+            super(parent);
+            this.type = type;
+        }
+
+        @Override
+        protected LiteralNode<?> eval() {
+            final Object value = ((LiteralNode<?>)parent).getValue();
+
+            LiteralNode<?> literalNode = null;
+
+            if (type.isString()) {
+                literalNode = LiteralNode.newInstance(source, token, finish, JSType.toString(value));
+            } else if (type.isBoolean()) {
+                literalNode = LiteralNode.newInstance(source, token, finish, JSType.toBoolean(value));
+            } else if (type.isInteger()) {
+                literalNode = LiteralNode.newInstance(source, token, finish, JSType.toInt32(value));
+            } else if (type.isLong()) {
+                literalNode = LiteralNode.newInstance(source, token, finish, JSType.toLong(value));
+            } else if (type.isNumber() || parent.getType().isNumeric() && !parent.getType().isNumber()) {
+                literalNode = LiteralNode.newInstance(source, token, finish, JSType.toNumber(value));
+            }
+
+            return literalNode;
+        }
+    }
+
+    private static class UnaryNodeConstantEvaluator extends ConstantEvaluator<UnaryNode> {
+        UnaryNodeConstantEvaluator(final UnaryNode parent) {
+            super(parent);
+        }
+
+        @Override
+        protected LiteralNode<?> eval() {
+            final Node rhsNode = parent.rhs();
+
+            if (!rhsNode.getSymbol().isConstant()) {
+                return null;
+            }
+
+            final LiteralNode<?> rhs = (LiteralNode<?>)rhsNode;
+            final boolean rhsInteger = rhs.getType().isInteger();
+
+            LiteralNode<?> literalNode;
+
+            switch (parent.tokenType()) {
+            case ADD:
+                if (rhsInteger) {
+                    literalNode = LiteralNode.newInstance(source, token, finish, rhs.getInt32());
+                } else {
+                    literalNode = LiteralNode.newInstance(source, token, finish, rhs.getNumber());
+                }
+                break;
+            case SUB:
+                if (rhsInteger && rhs.getInt32() != 0) { // @see test/script/basic/minuszero.js
+                    literalNode = LiteralNode.newInstance(source, token, finish, -rhs.getInt32());
+                } else {
+                    literalNode = LiteralNode.newInstance(source, token, finish, -rhs.getNumber());
+                }
+                break;
+            case NOT:
+                literalNode = LiteralNode.newInstance(source, token, finish, !rhs.getBoolean());
+                break;
+            case BIT_NOT:
+                literalNode = LiteralNode.newInstance(source, token, finish, ~rhs.getInt32());
+                break;
+            default:
+                return null;
+            }
+
+            return literalNode;
+        }
+    }
+
+    private static class BinaryNodeConstantEvaluator extends ConstantEvaluator<BinaryNode> {
+        BinaryNodeConstantEvaluator(final BinaryNode parent) {
+            super(parent);
+        }
+
+        @Override
+        protected LiteralNode<?> eval() {
+
+            if (!parent.lhs().getSymbol().isConstant() || !parent.rhs().getSymbol().isConstant()) {
+                return null;
+            }
+
+            final LiteralNode<?> lhs = (LiteralNode<?>)parent.lhs();
+            final LiteralNode<?> rhs = (LiteralNode<?>)parent.rhs();
+
+            final Type widest = Type.widest(lhs.getType(), rhs.getType());
+
+            boolean isInteger = widest.isInteger();
+            boolean isLong    = widest.isLong();
+
+            double value;
+
+            switch (parent.tokenType()) {
+            case AND:
+                return JSType.toBoolean(lhs.getObject()) ? rhs : lhs;
+            case OR:
+                return JSType.toBoolean(lhs.getObject()) ? lhs : rhs;
+            case DIV:
+                value = lhs.getNumber() / rhs.getNumber();
+                break;
+            case ADD:
+                value = lhs.getNumber() + rhs.getNumber();
+                break;
+            case MUL:
+                value = lhs.getNumber() * rhs.getNumber();
+                break;
+            case MOD:
+                value = lhs.getNumber() % rhs.getNumber();
+                break;
+            case SUB:
+                value = lhs.getNumber() - rhs.getNumber();
+                break;
+            case SHR:
+                return LiteralNode.newInstance(source, token, finish, (lhs.getInt32() >>> rhs.getInt32()) & 0xffff_ffffL);
+            case SAR:
+                return LiteralNode.newInstance(source, token, finish, lhs.getInt32() >> rhs.getInt32());
+            case SHL:
+                return LiteralNode.newInstance(source, token, finish, lhs.getInt32() << rhs.getInt32());
+            case BIT_XOR:
+                return LiteralNode.newInstance(source, token, finish, lhs.getInt32() ^ rhs.getInt32());
+            case BIT_AND:
+                return LiteralNode.newInstance(source, token, finish, lhs.getInt32() & rhs.getInt32());
+            case BIT_OR:
+                return LiteralNode.newInstance(source, token, finish, lhs.getInt32() | rhs.getInt32());
+            case GE:
+                return LiteralNode.newInstance(source, token, finish, ScriptRuntime.GE(lhs.getObject(), rhs.getObject()));
+            case LE:
+                return LiteralNode.newInstance(source, token, finish, ScriptRuntime.LE(lhs.getObject(), rhs.getObject()));
+            case GT:
+                return LiteralNode.newInstance(source, token, finish, ScriptRuntime.GT(lhs.getObject(), rhs.getObject()));
+            case LT:
+                return LiteralNode.newInstance(source, token, finish, ScriptRuntime.LT(lhs.getObject(), rhs.getObject()));
+            case NE:
+                return LiteralNode.newInstance(source, token, finish, ScriptRuntime.NE(lhs.getObject(), rhs.getObject()));
+            case NE_STRICT:
+                return LiteralNode.newInstance(source, token, finish, ScriptRuntime.NE_STRICT(lhs.getObject(), rhs.getObject()));
+            case EQ:
+                return LiteralNode.newInstance(source, token, finish, ScriptRuntime.EQ(lhs.getObject(), rhs.getObject()));
+            case EQ_STRICT:
+                return LiteralNode.newInstance(source, token, finish, ScriptRuntime.EQ_STRICT(lhs.getObject(), rhs.getObject()));
+            default:
+                return null;
+            }
+
+            isInteger &= value != 0.0 && JSType.isRepresentableAsInt(value);
+            isLong    &= value != 0.0 && JSType.isRepresentableAsLong(value);
+
+            if (isInteger) {
+                return LiteralNode.newInstance(source, token, finish, JSType.toInt32(value));
+            } else if (isLong) {
+                return LiteralNode.newInstance(source, token, finish, JSType.toLong(value));
+            }
+
+            return LiteralNode.newInstance(source, token, finish, value);
+        }
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java b/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java
new file mode 100644
index 00000000000..3f7d35588a7
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java
@@ -0,0 +1,2349 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.codegen;
+
+import static jdk.internal.org.objectweb.asm.Opcodes.ATHROW;
+import static jdk.internal.org.objectweb.asm.Opcodes.CHECKCAST;
+import static jdk.internal.org.objectweb.asm.Opcodes.DUP2;
+import static jdk.internal.org.objectweb.asm.Opcodes.GETFIELD;
+import static jdk.internal.org.objectweb.asm.Opcodes.GETSTATIC;
+import static jdk.internal.org.objectweb.asm.Opcodes.GOTO;
+import static jdk.internal.org.objectweb.asm.Opcodes.H_INVOKESTATIC;
+import static jdk.internal.org.objectweb.asm.Opcodes.IFEQ;
+import static jdk.internal.org.objectweb.asm.Opcodes.IFGE;
+import static jdk.internal.org.objectweb.asm.Opcodes.IFGT;
+import static jdk.internal.org.objectweb.asm.Opcodes.IFLE;
+import static jdk.internal.org.objectweb.asm.Opcodes.IFLT;
+import static jdk.internal.org.objectweb.asm.Opcodes.IFNE;
+import static jdk.internal.org.objectweb.asm.Opcodes.IFNONNULL;
+import static jdk.internal.org.objectweb.asm.Opcodes.IFNULL;
+import static jdk.internal.org.objectweb.asm.Opcodes.IF_ACMPEQ;
+import static jdk.internal.org.objectweb.asm.Opcodes.IF_ACMPNE;
+import static jdk.internal.org.objectweb.asm.Opcodes.IF_ICMPEQ;
+import static jdk.internal.org.objectweb.asm.Opcodes.IF_ICMPGE;
+import static jdk.internal.org.objectweb.asm.Opcodes.IF_ICMPGT;
+import static jdk.internal.org.objectweb.asm.Opcodes.IF_ICMPLE;
+import static jdk.internal.org.objectweb.asm.Opcodes.IF_ICMPLT;
+import static jdk.internal.org.objectweb.asm.Opcodes.IF_ICMPNE;
+import static jdk.internal.org.objectweb.asm.Opcodes.INSTANCEOF;
+import static jdk.internal.org.objectweb.asm.Opcodes.INVOKEINTERFACE;
+import static jdk.internal.org.objectweb.asm.Opcodes.INVOKESPECIAL;
+import static jdk.internal.org.objectweb.asm.Opcodes.INVOKESTATIC;
+import static jdk.internal.org.objectweb.asm.Opcodes.INVOKEVIRTUAL;
+import static jdk.internal.org.objectweb.asm.Opcodes.NEW;
+import static jdk.internal.org.objectweb.asm.Opcodes.PUTFIELD;
+import static jdk.internal.org.objectweb.asm.Opcodes.PUTSTATIC;
+import static jdk.internal.org.objectweb.asm.Opcodes.RETURN;
+import static jdk.nashorn.internal.codegen.CompilerConstants.CONSTANTS;
+import static jdk.nashorn.internal.codegen.CompilerConstants.THIS;
+import static jdk.nashorn.internal.codegen.CompilerConstants.THIS_DEBUGGER;
+import static jdk.nashorn.internal.codegen.CompilerConstants.className;
+import static jdk.nashorn.internal.codegen.CompilerConstants.constructorNoLookup;
+import static jdk.nashorn.internal.codegen.CompilerConstants.methodDescriptor;
+import static jdk.nashorn.internal.codegen.CompilerConstants.staticField;
+import static jdk.nashorn.internal.codegen.CompilerConstants.virtualCallNoLookup;
+
+import java.io.PrintStream;
+import java.lang.reflect.Array;
+import java.util.ArrayDeque;
+import java.util.EnumSet;
+import java.util.Iterator;
+import jdk.internal.org.objectweb.asm.Handle;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.nashorn.internal.codegen.ClassEmitter.Flag;
+import jdk.nashorn.internal.codegen.CompilerConstants.Call;
+import jdk.nashorn.internal.codegen.CompilerConstants.FieldAccess;
+import jdk.nashorn.internal.codegen.types.ArrayType;
+import jdk.nashorn.internal.codegen.types.BitwiseType;
+import jdk.nashorn.internal.codegen.types.NumericType;
+import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.ir.FunctionNode;
+import jdk.nashorn.internal.ir.IdentNode;
+import jdk.nashorn.internal.ir.LiteralNode;
+import jdk.nashorn.internal.ir.RuntimeNode;
+import jdk.nashorn.internal.ir.SplitNode;
+import jdk.nashorn.internal.ir.Symbol;
+import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.runtime.DebugLogger;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.Scope;
+import jdk.nashorn.internal.runtime.linker.Bootstrap;
+import jdk.nashorn.internal.runtime.options.Options;
+import org.dynalang.dynalink.support.NameCodec;
+
+/**
+ * This is the main function responsible for emitting method code
+ * in a class. It maintains a type stack and keeps track of control
+ * flow to make sure that the registered instructions don't violate
+ * byte code verification.
+ *
+ * Running Nashorn with -ea will assert as soon as a type stack
+ * becomes corrupt, for easier debugging
+ *
+ * Running Nashorn with -Dnashorn.codegen.debug=true will print
+ * all generated bytecode and labels to stderr, for easier debugging,
+ * including bytecode stack contents
+ */
+public class MethodEmitter implements Emitter {
+    /** The ASM MethodVisitor we are plugged into */
+    private final MethodVisitor method;
+
+    /** Current type stack for current evaluation */
+    protected ArrayDeque<Type> stack;
+
+    /** Parent classEmitter representing the class of this method */
+    private final ClassEmitter classEmitter;
+
+    /** FunctionNode representing this method, or null if none exists */
+    private FunctionNode functionNode;
+
+    /** SplitNode representing the current split, or null if none exists */
+    private SplitNode splitNode;
+
+    /** The context */
+    private final Context context;
+
+    /** Threshold in chars for when string constants should be split */
+    static final int LARGE_STRING_THRESHOLD = 32 * 1024;
+
+    /** Debug flag, should we dump all generated bytecode along with stacks? */
+    private static final DebugLogger LOG   = new DebugLogger("codegen", "nashorn.codegen.debug");
+    private static final boolean     DEBUG = LOG.isEnabled();
+
+    /** dump stack on a particular line, or -1 if disabled */
+    private static final int DEBUG_TRACE_LINE;
+
+    static {
+        final String tl = Options.getStringProperty("nashorn.codegen.debug.trace", "-1");
+        int line = -1;
+        try {
+            line = Integer.parseInt(tl);
+        } catch (final NumberFormatException e) {
+            //fallthru
+        }
+        DEBUG_TRACE_LINE = line;
+    }
+
+    /** Bootstrap for normal indy:s */
+    private static final Handle LINKERBOOTSTRAP  = new Handle(H_INVOKESTATIC, Bootstrap.BOOTSTRAP.className(), Bootstrap.BOOTSTRAP.name(), Bootstrap.BOOTSTRAP.descriptor());
+
+    /** Bootstrap for runtime node indy:s */
+    private static final Handle RUNTIMEBOOTSTRAP = new Handle(H_INVOKESTATIC, RuntimeCallSite.BOOTSTRAP.className(), RuntimeCallSite.BOOTSTRAP.name(), RuntimeCallSite.BOOTSTRAP.descriptor());
+
+    /**
+     * Constructor - internal use from ClassEmitter only
+     * @see ClassEmitter.method
+     *
+     * @param classEmitter the class emitter weaving the class this method is in
+     * @param method       a method visitor
+     */
+    MethodEmitter(final ClassEmitter classEmitter, final MethodVisitor method) {
+        this(classEmitter, method, null);
+    }
+
+    /**
+     * Constructor - internal use from ClassEmitter only
+     * @see ClassEmitter.method
+     *
+     * @param classEmitter the class emitter weaving the class this method is in
+     * @param method       a method visitor
+     * @param functionNode a function node representing this method
+     */
+    MethodEmitter(final ClassEmitter classEmitter, final MethodVisitor method, final FunctionNode functionNode) {
+        this.context      = classEmitter.getContext();
+        this.classEmitter = classEmitter;
+        this.method       = method;
+        this.functionNode = functionNode;
+        this.stack        = null;
+    }
+
+    /**
+     * Begin a method
+     * @see Emitter
+     */
+    @Override
+    public void begin() {
+        classEmitter.beginMethod(this);
+        stack = new ArrayDeque<>();
+        method.visitCode();
+    }
+
+    /**
+     * End a method
+     * @see Emitter
+     */
+    @Override
+    public void end() {
+        method.visitMaxs(0, 0);
+        method.visitEnd();
+
+        classEmitter.endMethod(this);
+    }
+
+    @Override
+    public String toString() {
+        return "methodEmitter: " + (functionNode == null ? method : functionNode.getName()).toString();
+    }
+
+    /**
+     * Push a type to the existing stack
+     * @param type the type
+     */
+    private void pushType(final Type type) {
+        if (type != null) {
+            stack.push(type);
+        }
+    }
+
+    /**
+     * Pop a type from the existing stack
+     *
+     * @param expected expected type - will assert if wrong
+     *
+     * @return the type that was retrieved
+     */
+    private Type popType(final Type expected) {
+        final Type type = stack.pop();
+        assert type.isObject() && expected.isObject() ||
+            type.isEquivalentTo(expected) : type + " is not compatible with " + expected;
+        return type;
+    }
+
+    /**
+     * Pop a type from the existing stack, no matter what it is.
+     *
+     * @return the type
+     */
+    private Type popType() {
+        return stack.pop();
+    }
+
+    /**
+     * Pop a type from the existing stack, ensuring that it is numeric,
+     * assert if not
+     *
+     * @return the type
+     */
+    private NumericType popNumeric() {
+        final Type type = stack.pop();
+        assert type.isNumeric() : type + " is not numeric";
+        return (NumericType)type;
+    }
+
+    /**
+     * Pop a type from the existing stack, ensuring that it is an integer type
+     * (integer or long), assert if not
+     *
+     * @return the type
+     */
+    private BitwiseType popInteger() {
+        final Type type = stack.pop();
+        assert type.isInteger() || type.isLong() : type + " is not an integer or long";
+        return (BitwiseType)type;
+    }
+
+    /**
+     * Pop a type from the existing stack, ensuring that it is an array type,
+     * assert if not
+     *
+     * @return the type
+     */
+    private ArrayType popArray() {
+        final Type type = stack.pop();
+        assert type.isArray();
+        return (ArrayType)type;
+    }
+
+    /**
+     * Peek a given number of slots from the top of the stack and return the
+     * type in that slot
+     *
+     * @param pos the number of positions from the top, 0 is the top element
+     *
+     * @return the type at position "pos" on the stack
+     */
+    public final Type peekType(final int pos) {
+        final Iterator<Type> iter = stack.iterator();
+        for (int i = 0; i < pos; i++) {
+            iter.next();
+        }
+        return iter.next();
+    }
+
+    /**
+     * Peek at the type at the top of the stack
+     *
+     * @return the type at the top of the stack
+     */
+    public final Type peekType() {
+        return stack.peek();
+    }
+
+    /**
+     * Generate code a for instantiating a new object and push the
+     * object type on the stack
+     *
+     * @param classDescriptor class descriptor for the object type
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter _new(final String classDescriptor) {
+        method.visitTypeInsn(NEW, classDescriptor);
+        pushType(Type.OBJECT);
+        return this;
+    }
+
+    /**
+     * Generate code a for instantiating a new object and push the
+     * object type on the stack
+     *
+     * @param clazz class type to instatiate
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter _new(final Class<?> clazz) {
+        return _new(className(clazz));
+    }
+
+    /**
+     * Generate code to call the empty constructor for a class
+     *
+     * @param clazz class type to instatiate
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter newInstance(final Class<?> clazz) {
+        return invoke(constructorNoLookup(clazz));
+    }
+
+    /**
+     * Perform a dup, that is, duplicate the top element and
+     * push the duplicate down a given number of positions
+     * on the stack. This is totally type agnostic.
+     *
+     * @param depth the depth on which to put the copy
+     *
+     * @return the method emitter, or null if depth is illegal and
+     *  has no instruction equivalent.
+     */
+    public MethodEmitter dup(final int depth) {
+        if (peekType().dup(method, depth) == null) {
+            return null;
+        }
+
+        debug("dup", depth);
+
+        switch (depth) {
+        case 0:
+            pushType(peekType());
+            break;
+        case 1: {
+            final Type p0 = popType();
+            final Type p1 = popType();
+            pushType(p0);
+            pushType(p1);
+            pushType(p0);
+            break;
+        }
+        case 2: {
+            final Type p0 = popType();
+            final Type p1 = popType();
+            final Type p2 = popType();
+            pushType(p0);
+            pushType(p2);
+            pushType(p1);
+            pushType(p0);
+            break;
+        }
+        default:
+            assert false : "illegal dup depth = " + depth;
+            return null;
+        }
+
+        return this;
+    }
+
+    /**
+     * Perform a dup2, that is, duplicate the top element if it
+     * is a category 2 type, or two top elements if they are category
+     * 1 types, and push them on top of the stack
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter dup2() {
+        debug("dup2");
+
+        if (peekType().isCategory2()) {
+            pushType(peekType());
+        } else {
+            final Type type = get2();
+            pushType(type);
+            pushType(type);
+            pushType(type);
+            pushType(type);
+        }
+        method.visitInsn(DUP2);
+        return this;
+    }
+
+    /**
+     * Duplicate the top element on the stack and push it
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter dup() {
+        return dup(0);
+    }
+
+    /**
+     * Pop the top element of the stack and throw it away
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter pop() {
+        debug("pop", peekType());
+        popType().pop(method);
+        return this;
+    }
+
+    /**
+     * Pop the top element of the stack if category 2 type, or the two
+     * top elements of the stack if category 1 types
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter pop2() {
+        if (peekType().isCategory2()) {
+            popType();
+        } else {
+            get2n();
+        }
+        return this;
+    }
+
+    /**
+     * Swap the top two elements of the stack. This is totally
+     * type agnostic and works for all types
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter swap() {
+        debug("swap");
+
+        final Type p0 = popType();
+        final Type p1 = popType();
+        p0.swap(method, p1);
+
+        pushType(p0);
+        pushType(p1);
+        debug("after ", p0, p1);
+        return this;
+    }
+
+    /**
+     * Add a local variable. This is a nop if the symbol has no slot
+     *
+     * @param symbol symbol for the local variable
+     * @param start  start of scope
+     * @param end    end of scope
+     */
+    public void localVariable(final Symbol symbol, final Label start, final Label end) {
+        if (!symbol.hasSlot()) {
+            return;
+        }
+
+        String name = symbol.getName();
+
+        if (name.equals(THIS.tag())) {
+            name = THIS_DEBUGGER.tag();
+        }
+
+        method.visitLocalVariable(name, symbol.getSymbolType().getDescriptor(), null, start, end, symbol.getSlot());
+    }
+
+    /**
+     * Create a new string builder, call the constructor and push the instance to the stack.
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter newStringBuilder() {
+        return invoke(constructorNoLookup(StringBuilder.class)).dup();
+    }
+
+    /**
+     * Pop a string and a StringBuilder from the top of the stack and call the append
+     * function of the StringBuilder, appending the string. Pushes the StringBuilder to
+     * the stack when finished.
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter stringBuilderAppend() {
+        convert(Type.STRING);
+        return invoke(virtualCallNoLookup(StringBuilder.class, "append", StringBuilder.class, String.class));
+    }
+
+    /**
+     * Associate a variable with a given range
+     *
+     * @param name  name of the variable
+     * @param start start
+     * @param end   end
+     */
+    public void markerVariable(final String name, final Label start, final Label end) {
+        method.visitLocalVariable(name, Type.OBJECT.getDescriptor(), null, start, end, 0);
+    }
+
+    /**
+     * Pops two integer types from the stack, performs a bitwise and and pushes
+     * the result
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter and() {
+        debug("and");
+        pushType(get2i().and(method));
+        return this;
+    }
+
+    /**
+     * Pops two integer types from the stack, performs a bitwise or and pushes
+     * the result
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter or() {
+        debug("or");
+        pushType(get2i().or(method));
+        return this;
+    }
+
+    /**
+     * Pops two integer types from the stack, performs a bitwise xor and pushes
+     * the result
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter xor() {
+        debug("xor");
+        pushType(get2i().xor(method));
+        return this;
+    }
+
+    /**
+     * Pops two integer types from the stack, performs a bitwise logic shift right and pushes
+     * the result. The shift count, the first element, must be INT.
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter shr() {
+        debug("shr");
+        popType(Type.INT);
+        pushType(popInteger().shr(method));
+        return this;
+    }
+
+    /**
+     * Pops two integer types from the stack, performs a bitwise shift left and and pushes
+     * the result. The shift count, the first element, must be INT.
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter shl() {
+        debug("shl");
+        popType(Type.INT);
+        pushType(popInteger().shl(method));
+        return this;
+    }
+
+    /**
+     * Pops two integer types from the stack, performs a bitwise arithetic shift right and pushes
+     * the result. The shift count, the first element, must be INT.
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter sar() {
+        debug("sar");
+        popType(Type.INT);
+        pushType(popInteger().sar(method));
+        return this;
+    }
+
+    /**
+     * Pops a numeric type from the stack, negates it and pushes the result
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter neg() {
+        debug("neg");
+        pushType(popNumeric().neg(method));
+        return this;
+    }
+
+    /**
+     * Add label for the start of a catch block and push the exception to the
+     * stack
+     *
+     * @param recovery label pointing to start of catch block
+     */
+    public void _catch(final Label recovery) {
+        stack.clear();
+        stack.push(Type.OBJECT);
+        label(recovery);
+    }
+
+    /**
+     * Start a try/catch block.
+     *
+     * @param entry          start label for try
+     * @param exit           end label for try
+     * @param recovery       start label for catch
+     * @param typeDescriptor type descriptor for exception
+     */
+    public void _try(final Label entry, final Label exit, final Label recovery, final String typeDescriptor) {
+        method.visitTryCatchBlock(entry, exit, recovery, typeDescriptor);
+    }
+
+    /**
+     * Start a try/catch block.
+     *
+     * @param entry    start label for try
+     * @param exit     end label for try
+     * @param recovery start label for catch
+     * @param clazz    exception class
+     */
+    public void _try(final Label entry, final Label exit, final Label recovery, final Class<?> clazz) {
+        method.visitTryCatchBlock(entry, exit, recovery, CompilerConstants.className(clazz));
+    }
+
+    /**
+     * Start a try/catch block. The catch is "Throwable" - i.e. catch-all
+     *
+     * @param entry    start label for try
+     * @param exit     end label for try
+     * @param recovery start label for catch
+     */
+    public void _try(final Label entry, final Label exit, final Label recovery) {
+        _try(entry, exit, recovery, (String)null);
+    }
+
+
+    /**
+     * Load the constants array
+     * @param unitClassName name of the compile unit from which to load constants
+     * @return this method emitter
+     */
+    public MethodEmitter loadConstants(final String unitClassName) {
+        getStatic(unitClassName, CONSTANTS.tag(), CONSTANTS.descriptor());
+        assert peekType().isArray() : peekType();
+        return this;
+    }
+
+    /**
+     * Push the undefined value for the given type, i.e.
+     * UNDEFINED or UNDEFINEDNUMBER. Currently we have no way of
+     * representing UNDEFINED for INTs and LONGs, so they are not
+     * allowed to be local variables (yet)
+     *
+     * @param type the type for which to push UNDEFINED
+     * @return the method emitter
+     */
+    public MethodEmitter loadUndefined(final Type type) {
+        debug("load undefined " + type);
+        pushType(type.loadUndefined(method));
+        return this;
+    }
+
+    /**
+     * Push the empty value for the given type, i.e. EMPTY.
+     *
+     * @param type the type
+     * @return the method emitter
+     */
+    public MethodEmitter loadEmpty(final Type type) {
+        debug("load empty " + type);
+        pushType(type.loadEmpty(method));
+        return this;
+    }
+
+    /**
+     * Push null to stack
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter loadNull() {
+        debug("aconst_null");
+        pushType(Type.OBJECT.ldc(method, null));
+        return this;
+    }
+
+    /**
+     * Push a handle representing this class top stack
+     *
+     * @param className name of the class
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter loadType(final String className) {
+        debug("load type", className);
+        method.visitLdcInsn(jdk.internal.org.objectweb.asm.Type.getObjectType(className));
+        pushType(Type.OBJECT);
+        return this;
+    }
+
+    /**
+     * Push a boolean constant to the stack.
+     *
+     * @param b value of boolean
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter load(final boolean b) {
+        debug("load boolean", b);
+        pushType(Type.BOOLEAN.ldc(method, b));
+        return this;
+    }
+
+    /**
+     * Push an int constant to the stack
+     *
+     * @param i value of the int
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter load(final int i) {
+        debug("load int", i);
+        pushType(Type.INT.ldc(method, i));
+        return this;
+    }
+
+    /**
+     * Push a double constant to the stack
+     *
+     * @param d value of the double
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter load(final double d) {
+        debug("load double", d);
+        pushType(Type.NUMBER.ldc(method, d));
+        return this;
+    }
+
+    /**
+     * Push an long constant to the stack
+     *
+     * @param l value of the long
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter load(final long l) {
+        debug("load long", l);
+        pushType(Type.LONG.ldc(method, l));
+        return this;
+    }
+
+    /**
+     * Fetch the length of an array.
+     * @return Array length.
+     */
+    public MethodEmitter arraylength() {
+        debug("arraylength");
+        popType(Type.OBJECT);
+        pushType(Type.OBJECT_ARRAY.arraylength(method));
+        return this;
+    }
+
+    /**
+     * Push a String constant to the stack
+     *
+     * @param s value of the String
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter load(final String s) {
+        debug("load string", s);
+
+        if (s == null) {
+            loadNull();
+            return this;
+        }
+
+        //NASHORN-142 - split too large string
+        final int length = s.length();
+        if (length > LARGE_STRING_THRESHOLD) {
+
+            _new(StringBuilder.class);
+            dup();
+            load(length);
+            invoke(constructorNoLookup(StringBuilder.class, int.class));
+
+            for (int n = 0; n < length; n += LARGE_STRING_THRESHOLD) {
+                final String part = s.substring(n, Math.min(n + LARGE_STRING_THRESHOLD, length));
+                load(part);
+                stringBuilderAppend();
+            }
+
+            invoke(virtualCallNoLookup(StringBuilder.class, "toString", String.class));
+
+            return this;
+        }
+
+        pushType(Type.OBJECT.ldc(method, s));
+        return this;
+    }
+
+    /**
+     * Push an local variable to the stack. If the symbol representing
+     * the local variable doesn't have a slot, this is a NOP
+     *
+     * @param symbol the symbol representing the local variable.
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter load(final Symbol symbol) {
+        assert symbol != null;
+        if (symbol.hasSlot()) {
+            debug("load symbol", symbol.getName() + " slot=" + symbol.getSlot());
+            pushType(symbol.getSymbolType().load(method, symbol.getSlot()));
+        }
+        return this;
+    }
+
+    /**
+     * Push a local variable to the stack, given an explicit bytecode slot
+     * This is used e.g. for stub generation where we know where items like
+     * "this" and "scope" reside.
+     *
+     * @param type  the type of the variable
+     * @param slot  the slot the variable is in
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter load(final Type type, final int slot) {
+        debug("explicit load", type, slot);
+        pushType(type.load(method, slot));
+        return this;
+    }
+
+    /**
+     * Push the this object to the stack.
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter loadThis() {
+        load(functionNode.getThisNode().getSymbol());
+        return this;
+    }
+
+    /**
+     * Push the scope object to the stack.
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter loadScope() {
+        if (peekType() == Type.SCOPE) {
+            dup();
+            return this;
+        }
+        load(functionNode.getScopeNode().getSymbol());
+        return this;
+    }
+
+    /**
+     * Push the return object to the stack.
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter loadResult() {
+        load(functionNode.getResultNode().getSymbol());
+        return this;
+    }
+
+
+    /**
+     * Push a method handle to the stack
+     *
+     * @param className  class name
+     * @param methodName method name
+     * @param descName   descriptor
+     * @param flags      flags that describe this handle, e.g. invokespecial new, or invoke virtual
+     *
+     * @see ClassEmitter.Flag
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter loadHandle(final String className, final String methodName, final String descName, final EnumSet<Flag> flags) {
+        debug("load handle ");
+        pushType(Type.OBJECT.ldc(method, new Handle(Flag.getValue(flags), className, methodName, descName)));
+        return this;
+    }
+
+    /**
+     * Push the varargs object to the stack
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter loadVarArgs() {
+        debug("load var args " + functionNode.getVarArgsNode().getSymbol());
+        return load(functionNode.getVarArgsNode().getSymbol());
+    }
+
+    /**
+     * Push the arguments array to the stack
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter loadArguments() {
+        debug("load arguments " + functionNode.getVarArgsNode().getSymbol());
+        assert functionNode.getArgumentsNode().getSymbol().getSlot() != 0;
+        return load(functionNode.getArgumentsNode().getSymbol());
+    }
+
+    /**
+     * Push the callee object to the stack
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter loadCallee() {
+        debug("load callee " + functionNode.getCalleeNode().getSymbol());
+        assert functionNode.getCalleeNode().getSymbol().getSlot() != 0;
+
+        return load(functionNode.getCalleeNode().getSymbol());
+    }
+
+    /**
+     * Pop the scope from the stack and store it in its predefined slot
+     */
+    public void storeScope() {
+        debug("store scope");
+        store(functionNode.getScopeNode().getSymbol());
+    }
+
+    /**
+     * Pop the return from the stack and store it in its predefined slot
+     */
+    public void storeResult() {
+        debug("store result");
+        store(functionNode.getResultNode().getSymbol());
+    }
+
+    /**
+     * Pop the arguments array from the stack and store it in its predefined slot
+     */
+    public void storeArguments() {
+        debug("store arguments");
+        store(functionNode.getArgumentsNode().getSymbol());
+    }
+
+    /**
+     * Load an element from an array, determining type automatically
+     * @return the method emitter
+     */
+    public MethodEmitter arrayload() {
+        debug("Xaload");
+        popType(Type.INT);
+        pushType(popArray().aload(method));
+        return this;
+    }
+
+    /**
+     * Pop a value, an index and an array from the stack and store
+     * the value at the given index in the array.
+     */
+    public void arraystore() {
+        debug("Xastore");
+        final Type value = popType();
+        final Type index = popType(Type.INT);
+        assert index.isInteger() : "array index is not integer, but " + index;
+        final ArrayType array = popArray();
+
+        assert value.isEquivalentTo(array.getElementType()) : "Storing "+value+" into "+array;
+        assert array.isObject();
+        array.astore(method);
+    }
+
+    /**
+     * Pop a value from the stack and store it in a local variable represented
+     * by the given symbol. If the symbol has no slot, this is a NOP
+     *
+     * @param symbol symbol to store stack to
+     */
+    public void store(final Symbol symbol) {
+        assert symbol != null;
+        if (symbol.hasSlot()) {
+            debug("store", symbol);
+            popType(symbol.getSymbolType()).store(method, symbol.getSlot());
+        }
+    }
+
+    /**
+     * Pop a value from the stack and store it in a given local variable
+     * slot.
+     *
+     * @param type the type to pop
+     * @param slot the slot
+     */
+    public void store(final Type type, final int slot) {
+        popType(type);
+        type.store(method, slot);
+    }
+
+    /**
+     * Increment/Decrement a local integer by the given value.
+     *
+     * @param slot the int slot
+     * @param increment the amount to increment
+     */
+    public void iinc(final int slot, final int increment) {
+        debug("iinc");
+        method.visitIincInsn(slot, increment);
+    }
+
+    /**
+     * Pop an exception object from the stack and generate code
+     * for throwing it
+     */
+    public void athrow() {
+        debug("athrow");
+        final Type receiver = popType(Type.OBJECT);
+        assert receiver.isObject();
+        method.visitInsn(ATHROW);
+        stack = null;
+    }
+
+    /**
+     * Pop an object from the stack and perform an instanceof
+     * operation, given a classDescriptor to compare it to.
+     * Push the boolean result 1/0 as an int to the stack
+     *
+     * @param classDescriptor descriptor of the class to type check against
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter _instanceof(final String classDescriptor) {
+        debug("instanceof", classDescriptor);
+        popType(Type.OBJECT);
+        method.visitTypeInsn(INSTANCEOF, classDescriptor);
+        pushType(Type.INT);
+        return this;
+    }
+
+    /**
+     * Pop an object from the stack and perform an instanceof
+     * operation, given a classDescriptor to compare it to.
+     * Push the boolean result 1/0 as an int to the stack
+     *
+     * @param clazz the type to check instanceof against
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter _instanceof(final Class<?> clazz) {
+        return _instanceof(CompilerConstants.className(clazz));
+    }
+
+    /**
+     * Perform a checkcast operation on the object at the top of the
+     * stack.
+     *
+     * @param classDescriptor descriptor of the class to type check against
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter checkcast(final String classDescriptor) {
+        debug("checkcast", classDescriptor);
+        assert peekType().isObject();
+        method.visitTypeInsn(CHECKCAST, classDescriptor);
+        return this;
+    }
+
+    /**
+     * Perform a checkcast operation on the object at the top of the
+     * stack.
+     *
+     * @param clazz class to checkcast against
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter checkcast(final Class<?> clazz) {
+        return checkcast(CompilerConstants.className(clazz));
+    }
+
+    /**
+     * Instantiate a new array given a length that is popped
+     * from the stack and the array type
+     *
+     * @param arrayType the type of the array
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter newarray(final ArrayType arrayType) {
+        debug("newarray ", "arrayType=" + arrayType);
+        popType(Type.INT); //LENGTH
+        pushType(arrayType.newarray(method));
+        return this;
+    }
+
+    /**
+     * Instantiate a multidimensional array with a given number of dimensions.
+     * On the stack are dim lengths of the sub arrays.
+     *
+     * @param arrayType type of the array
+     * @param dims      number of dimensions
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter multinewarray(final ArrayType arrayType, final int dims) {
+        debug("multianewarray ", arrayType, dims);
+        for (int i = 0; i < dims; i++) {
+            popType(Type.INT); //LENGTH
+        }
+        pushType(arrayType.newarray(method, dims));
+        return this;
+    }
+
+    /**
+     * Helper function to pop and type check the appropriate arguments
+     * from the stack given a method signature
+     *
+     * @param signature method signature
+     *
+     * @return return type of method
+     */
+    private Type fixParamStack(final String signature) {
+        final Type[] params = Type.getMethodArguments(signature);
+        for (int i = params.length - 1; i >= 0; i--) {
+            popType(params[i]);
+        }
+        final Type returnType = Type.getMethodReturnType(signature);
+        return returnType;
+    }
+
+    /**
+     * Generate an invocation to a Call structure
+     * @see CompilerConstants
+     *
+     * @param call the call object
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter invoke(final Call call) {
+        return call.invoke(this);
+    }
+
+    private MethodEmitter invoke(final int opcode, final String className, final String methodName, final String methodDescriptor, final boolean hasReceiver) {
+        final Type returnType = fixParamStack(methodDescriptor);
+
+        if (hasReceiver) {
+            popType(Type.OBJECT);
+        }
+
+        method.visitMethodInsn(opcode, className, methodName, methodDescriptor);
+
+        if (returnType != null) {
+            pushType(returnType);
+        }
+
+        return this;
+    }
+
+    /**
+     * Pop receiver from stack, perform an invoke special
+     *
+     * @param className        class name
+     * @param methodName       method name
+     * @param methodDescriptor descriptor
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter invokeSpecial(final String className, final String methodName, final String methodDescriptor) {
+        debug("invokespecial", className + "." + methodName + methodDescriptor);
+        return invoke(INVOKESPECIAL, className, methodName, methodDescriptor, true);
+    }
+
+    /**
+     * Pop receiver from stack, perform an invoke virtual, push return value if any
+     *
+     * @param className        class name
+     * @param methodName       method name
+     * @param methodDescriptor descriptor
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter invokeVirtual(final String className, final String methodName, final String methodDescriptor) {
+        debug("invokevirtual", className + "." + methodName + methodDescriptor + " " + stack);
+        return invoke(INVOKEVIRTUAL, className, methodName, methodDescriptor, true);
+    }
+
+    /**
+     * Perform an invoke static and push the return value if any
+     *
+     * @param className        class name
+     * @param methodName       method name
+     * @param methodDescriptor descriptor
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter invokeStatic(final String className, final String methodName, final String methodDescriptor) {
+        debug("invokestatic", className + "." + methodName + methodDescriptor);
+        invoke(INVOKESTATIC, className, methodName, methodDescriptor, false);
+        return this;
+    }
+
+    /**
+     * Perform an invoke static and replace the return type if we know better, e.g. Global.allocate
+     * that allocates an array should return an ObjectArray type as a NativeArray counts as that
+     *
+     * @param className        class name
+     * @param methodName       method name
+     * @param methodDescriptor descriptor
+     * @param returnType       return type override
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter invokeStatic(final String className, final String methodName, final String methodDescriptor, final Type returnType) {
+        invokeStatic(className, methodName, methodDescriptor);
+        popType();
+        pushType(returnType);
+        return this;
+    }
+
+    /**
+     * Pop receiver from stack, perform an invoke interface and push return value if any
+     *
+     * @param className        class name
+     * @param methodName       method name
+     * @param methodDescriptor descriptor
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter invokeInterface(final String className, final String methodName, final String methodDescriptor) {
+        debug("invokeinterface", className + "." + methodName + methodDescriptor);
+        return invoke(INVOKEINTERFACE, className, methodName, methodDescriptor, true);
+    }
+
+    /**
+     * Generate a lookup switch, popping the switch value from the stack
+     *
+     * @param defaultLabel default label
+     * @param values       case values for the table
+     * @param table        default label
+     */
+    public void lookupSwitch(final Label defaultLabel, final int[] values, final Label[] table) {
+        debug("lookupswitch", peekType());
+        popType(Type.INT);
+        method.visitLookupSwitchInsn(defaultLabel, values, table);
+    }
+
+    /**
+     * Generate a table switch
+     * @param lo            low value
+     * @param hi            high value
+     * @param defaultLabel  default label
+     * @param table         label table
+     */
+    public void tableSwitch(final int lo, final int hi, final Label defaultLabel, final Label[] table) {
+        debug("tableswitch", peekType());
+        popType(Type.INT);
+        method.visitTableSwitchInsn(lo, hi, defaultLabel, table);
+    }
+
+    /**
+     * Abstraction for performing a conditional jump of any type
+     *
+     * @see MethodEmitter.Condition
+     *
+     * @param cond      the condition to test
+     * @param trueLabel the destination label is condition is true
+     */
+    void conditionalJump(final Condition cond, final Label trueLabel) {
+        conditionalJump(cond, cond != Condition.GT && cond != Condition.GE, trueLabel);
+    }
+
+    /**
+     * Abstraction for performing a conditional jump of any type,
+     * including a dcmpg/dcmpl semantic for doubles.
+     *
+     * @param cond      the condition to test
+     * @param isCmpG    is this a dcmpg for numbers, false if it's a dcmpl
+     * @param trueLabel the destination label if condition is true
+     */
+    void conditionalJump(final Condition cond, final boolean isCmpG, final Label trueLabel) {
+        if (peekType().isCategory2()) {
+            debug("[ld]cmp isCmpG=" + isCmpG);
+            pushType(get2n().cmp(method, isCmpG));
+            jump(Condition.toUnary(cond), trueLabel, 1);
+        } else {
+            debug("if" + cond);
+            jump(Condition.toBinary(cond, peekType().isObject()), trueLabel, 2);
+        }
+    }
+
+    /**
+     * Perform a non void return, popping the type from the stack
+     *
+     * @param type the type for the return
+     */
+    public void _return(final Type type) {
+        debug("return", type);
+        assert stack.size() == 1 : "Only return value on stack allowed at return point - depth=" + stack.size() + " stack = " + stack;
+        final Type stackType = peekType();
+        if (!Type.areEquivalent(type, stackType)) {
+            convert(type);
+        }
+        popType(type)._return(method);
+        stack = null;
+    }
+
+    /**
+     * Perform a return using the stack top value as the guide for the type
+     */
+    public void _return() {
+        _return(peekType());
+    }
+
+    /**
+     * Perform a void return.
+     */
+    public void returnVoid() {
+        debug("return [void]");
+        assert stack.isEmpty() : stack;
+        method.visitInsn(RETURN);
+        stack = null;
+    }
+
+    /**
+     * Goto, possibly when splitting is taking place. If
+     * a splitNode exists, we need to handle the case that the
+     * jump target is another method
+     *
+     * @param label destination label
+     */
+    public void splitAwareGoto(final Label label) {
+
+        if (splitNode != null) {
+            final int index = splitNode.getExternalTargets().indexOf(label);
+
+            if (index > -1) {
+                loadScope();
+                checkcast(Scope.class);
+                load(index + 1);
+                invoke(Scope.SET_SPLIT_STATE);
+                loadUndefined(Type.OBJECT);
+                _return(functionNode.getReturnType());
+                return;
+            }
+        }
+
+        _goto(label);
+    }
+
+    /**
+     * Perform a comparison of two number types that are popped from the stack
+     *
+     * @param isCmpG is this a dcmpg semantic, false if it's a dcmpl semantic
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter cmp(final boolean isCmpG) {
+        pushType(get2n().cmp(method, isCmpG));
+        return this;
+    }
+
+    /**
+     * Helper function for jumps, conditional or not
+     * @param opcode  opcode for jump
+     * @param label   destination
+     * @param n       elements on stack to compare, 0-2
+     */
+    private void jump(final int opcode, final Label label, final int n) {
+        for (int i = 0; i < n; i++) {
+            assert peekType().isInteger() || peekType().isBoolean() || peekType().isObject() : "expecting integer type or object for jump, but found " + peekType();
+            popType();
+        }
+        mergeStackTo(label);
+        method.visitJumpInsn(opcode, label);
+    }
+
+    /**
+     * Generate an if_acmpeq
+     *
+     * @param label label to true case
+     */
+    public void if_acmpeq(final Label label) {
+        debug("if_acmpeq", label);
+        jump(IF_ACMPEQ, label, 2);
+    }
+
+    /**
+     * Generate an if_acmpne
+     *
+     * @param label label to true case
+     */
+    public void if_acmpne(final Label label) {
+        debug("if_acmpne", label);
+        jump(IF_ACMPNE, label, 2);
+    }
+
+    /**
+     * Generate an ifnull
+     *
+     * @param label label to true case
+     */
+    public void ifnull(final Label label) {
+        debug("ifnull", label);
+        jump(IFNULL, label, 1);
+    }
+
+    /**
+     * Generate an ifnonnull
+     *
+     * @param label label to true case
+     */
+    public void ifnonnull(final Label label) {
+        debug("ifnonnull", label);
+        jump(IFNONNULL, label, 1);
+    }
+
+    /**
+     * Generate an ifeq
+     *
+     * @param label label to true case
+     */
+    public void ifeq(final Label label) {
+        debug("ifeq ", label);
+        jump(IFEQ, label, 1);
+    }
+
+    /**
+     * Generate an if_icmpeq
+     *
+     * @param label label to true case
+     */
+    public void if_icmpeq(final Label label) {
+        debug("if_icmpeq", label);
+        jump(IF_ICMPEQ, label, 2);
+    }
+
+    /**
+     * Generate an if_ne
+     *
+     * @param label label to true case
+     */
+
+    public void ifne(final Label label) {
+        debug("ifne", label);
+        jump(IFNE, label, 1);
+    }
+
+    /**
+     * Generate an if_icmpne
+     *
+     * @param label label to true case
+     */
+    public void if_icmpne(final Label label) {
+        debug("if_icmpne", label);
+        jump(IF_ICMPNE, label, 2);
+    }
+
+    /**
+     * Generate an iflt
+     *
+     * @param label label to true case
+     */
+    public void iflt(final Label label) {
+        debug("iflt", label);
+        jump(IFLT, label, 1);
+    }
+
+    /**
+     * Generate an ifle
+     *
+     * @param label label to true case
+     */
+    public void ifle(final Label label) {
+        debug("ifle", label);
+        jump(IFLE, label, 1);
+    }
+
+    /**
+     * Generate an ifgt
+     *
+     * @param label label to true case
+     */
+    public void ifgt(final Label label) {
+        debug("ifgt", label);
+        jump(IFGT, label, 1);
+    }
+
+    /**
+     * Generate an ifge
+     *
+     * @param label label to true case
+     */
+    public void ifge(final Label label) {
+        debug("ifge", label);
+        jump(IFGE, label, 1);
+    }
+
+    /**
+     * Unconditional jump to a label
+     *
+     * @param label destination label
+     */
+    public void _goto(final Label label) {
+        debug("goto", label);
+        jump(GOTO, label, 0);
+        stack = null;
+    }
+
+    /**
+     * Examine two stacks and make sure they are of the same size and their
+     * contents are equivalent to each other
+     * @param s0 first stack
+     * @param s1 second stack
+     *
+     * @return true if stacks are equivalent, false otherwise
+     */
+    private boolean stacksEquivalent(final ArrayDeque<Type> s0, final ArrayDeque<Type> s1) {
+        if (s0.size() != s1.size()) {
+            debug("different stack sizes", s0, s1);
+            return false;
+        }
+
+        final Type[] s0a = s0.toArray(new Type[s0.size()]);
+        final Type[] s1a = s1.toArray(new Type[s1.size()]);
+        for (int i = 0; i < s0.size(); i++) {
+            if (!s0a[i].isEquivalentTo(s1a[i])) {
+                debug("different stack element", s0a[i], s1a[i]);
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * A join in control flow - helper function that makes sure all entry stacks
+     * discovered for the join point so far are equivalent
+     * @param label
+     */
+    private void mergeStackTo(final Label label) {
+        final ArrayDeque<Type> labelStack = label.getStack();
+        //debug(labelStack == null ? " >> Control flow - first visit " + label : " >> Control flow - JOIN with " + labelStack + " at " + label);
+        if (labelStack == null) {
+            assert stack != null;
+            label.setStack(stack.clone());
+            return;
+        }
+        assert stacksEquivalent(stack, labelStack);
+    }
+
+    /**
+     * Register a new label, enter it here.
+     *
+     * @param label the label
+     */
+    public void label(final Label label) {
+        /*
+         * If stack == null, this means that we came here not through a fallthrough.
+         * E.g. a label after an athrow. Then we create a new stack if one doesn't exist
+         * for this location already.
+         */
+        if (stack == null) {
+            stack = label.getStack();
+            if (stack == null) {
+                stack = new ArrayDeque<>(); //we don't have a stack at this point.
+            }
+        }
+        debug_label(label);
+
+        mergeStackTo(label); //we have to merge our stack to whatever is in the label
+
+        method.visitLabel(label);
+    }
+
+    /**
+     * Pop element from stack, convert to given type
+     *
+     * @param to type to convert to
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter convert(final Type to) {
+        final Type type = peekType().convert(method, to);
+        if (type != null) {
+            if (peekType() != to) {
+                debug("convert", peekType(), "->", to);
+            }
+            popType();
+            pushType(type);
+        }
+        return this;
+    }
+
+    /**
+     * Helper function - expect two types that are equivalent
+     *
+     * @return common type
+     */
+    private Type get2() {
+        final Type p0 = popType();
+        final Type p1 = popType();
+        assert p0.isEquivalentTo(p1) : "expecting equivalent types on stack but got " + p0 + " and " + p1;
+        return p0;
+    }
+
+    /**
+     * Helper function - expect two types that are integer types and equivalent
+     *
+     * @return common type
+     */
+    private BitwiseType get2i() {
+        final BitwiseType p0 = popInteger();
+        final BitwiseType p1 = popInteger();
+        assert p0.isEquivalentTo(p1) : "expecting equivalent types on stack but got " + p0 + " and " + p1;
+        return p0;
+    }
+
+    /**
+     * Helper function - expect two types that are numbers and equivalent
+     *
+     * @return common type
+     */
+    private NumericType get2n() {
+        final NumericType p0 = popNumeric();
+        final NumericType p1 = popNumeric();
+        assert p0.isEquivalentTo(p1) : "expecting equivalent types on stack but got " + p0 + " and " + p1;
+        return p0;
+    }
+
+    /**
+     * Pop two numbers, perform addition and push result
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter add() {
+        debug("add");
+        pushType(get2().add(method));
+        return this;
+    }
+
+    /**
+     * Pop two numbers, perform subtraction and push result
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter sub() {
+        debug("sub");
+        pushType(get2n().sub(method));
+        return this;
+    }
+
+    /**
+     * Pop two numbers, perform multiplication and push result
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter mul() {
+        debug("mul ");
+        pushType(get2n().mul(method));
+        return this;
+    }
+
+    /**
+     * Pop two numbers, perform division and push result
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter div() {
+        debug("div");
+        pushType(get2n().div(method));
+        return this;
+    }
+
+    /**
+     * Pop two numbers, calculate remainder and push result
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter rem() {
+        debug("rem");
+        pushType(get2n().rem(method));
+        return this;
+    }
+
+    /**
+     * Retrieve the top <tt>count</tt> types on the stack without modifying it.
+     *
+     * @param count number of types to return
+     * @return array of Types
+     */
+    protected Type[] getTypesFromStack(final int count) {
+        final Iterator<Type> iter  = stack.iterator();
+        final Type[]         types = new Type[count];
+
+        for (int i = count - 1; i >= 0; i--) {
+            types[i] = iter.next();
+        }
+
+        return types;
+    }
+
+    /**
+     * Helper function to generate a function signature based on stack contents
+     * and argument count and return type
+     *
+     * @param returnType return type
+     * @param argCount   argument count
+     *
+     * @return function signature for stack contents
+     */
+    private String getDynamicSignature(final Type returnType, final int argCount, final boolean hasSelf) {
+        final Iterator<Type> iter     = stack.iterator();
+        final Type[]         argTypes = new Type[argCount];
+
+        for (int i = argCount - 1; i >= 0; i--) {
+            argTypes[i] = iter.next();
+        }
+
+        final FunctionSignature sig = new FunctionSignature(hasSelf, false, returnType, argTypes);
+        for (int i = 0; i < argCount; i++) {
+            popType(argTypes[argCount - i - 1]);
+        }
+        for (int i = 0 ; i < sig.size() - argTypes.length; i++) {
+            popType(Type.OBJECT);
+        }
+
+        return sig.toString();
+    }
+
+    /**
+     * Generate a dynamic new
+     *
+     * @param argCount  number of arguments
+     * @param flags     callsite flags
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter dynamicNew(final int argCount, final int flags) {
+        debug("dynamic_new", "argcount=" + argCount);
+        final String signature = getDynamicSignature(Type.OBJECT, argCount, true);
+        method.visitInvokeDynamicInsn("dyn:new", signature, LINKERBOOTSTRAP, flags);
+        pushType(Type.OBJECT); //TODO fix result type
+        return this;
+    }
+
+    /**
+     * Generate a dynamic call
+     *
+     * @param returnType return type
+     * @param argCount   number of arguments
+     * @param flags      callsite flags
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter dynamicCall(final Type returnType, final int argCount, final int flags) {
+        debug("dynamic_call", "args=" + argCount, "returnType=" + returnType);
+        final String signature = getDynamicSignature(returnType, argCount + 1, true);
+        debug("   signature", signature);
+        method.visitInvokeDynamicInsn("dyn:call", signature, LINKERBOOTSTRAP, flags);
+        pushType(returnType);
+
+        return this;
+    }
+
+    /**
+     * Generate a dynamic call for a runtime node
+     *
+     * @param name       tag for the invoke dynamic for this runtime node
+     * @param returnType return type
+     * @param request    RuntimeNode request
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter dynamicRuntimeCall(final String name, final Type returnType, final RuntimeNode.Request request) {
+        debug("dynamic_runtime_call", name, "args=" + request.getArity(), "returnType=" + returnType);
+        final String signature = getDynamicSignature(returnType, request.getArity(), false);
+        debug("   signature", signature);
+        method.visitInvokeDynamicInsn(name, signature, RUNTIMEBOOTSTRAP);
+        pushType(returnType);
+
+        return this;
+    }
+
+    /**
+     * Generate dynamic getter. Pop scope from stack. Push result
+     *
+     * @param valueType type of the value to set
+     * @param name      name of property
+     * @param flags     call site flags
+     * @param isMethod  should it prefer retrieving methods
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter dynamicGet(final Type valueType, final String name, final int flags, final boolean isMethod) {
+        debug("dynamic_get", name, valueType);
+
+        Type type = valueType;
+        if (type.isObject() || type.isBoolean()) {
+            type = Type.OBJECT; //promote e.g strings to object generic setter
+        }
+
+        popType(Type.SCOPE);
+        method.visitInvokeDynamicInsn((isMethod ? "dyn:getMethod|getProp|getElem:" : "dyn:getProp|getElem|getMethod:") +
+                NameCodec.encode(name), Type.getMethodDescriptor(type, Type.OBJECT), LINKERBOOTSTRAP, flags);
+
+        pushType(type);
+
+        convert(valueType); //most probably a nop
+
+        return this;
+    }
+
+    /**
+     * Generate dynamic setter. Pop receiver and property from stack.
+     *
+     * @param valueType the type of the value to set
+     * @param name      name of property
+     * @param flags     call site flags
+     */
+     public void dynamicSet(final Type valueType, final String name, final int flags) {
+        debug("dynamic_set", name, peekType());
+
+        Type type = valueType;
+        if (type.isObject() || type.isBoolean()) { //promote strings to objects etc
+            type = Type.OBJECT;
+            convert(Type.OBJECT); //TODO bad- until we specialize boolean setters,
+        }
+
+        popType(type);
+        popType(Type.SCOPE);
+
+        method.visitInvokeDynamicInsn("dyn:setProp|setElem:" + NameCodec.encode(name), methodDescriptor(void.class, Object.class, type.getTypeClass()), LINKERBOOTSTRAP, flags);
+    }
+
+     /**
+     * Dynamic getter for indexed structures. Pop index and receiver from stack,
+     * generate appropriate signatures based on types
+     *
+     * @param result result type for getter
+     * @param flags call site flags for getter
+     * @param isMethod should it prefer retrieving methods
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter dynamicGetIndex(final Type result, final int flags, final boolean isMethod) {
+        debug("dynamic_get_index", peekType(1) + "[" + peekType() + "]");
+
+        Type resultType = result;
+        if (result.isBoolean()) {
+            resultType = Type.OBJECT; // INT->OBJECT to avoid another dimension of cross products in the getters. TODO
+        }
+
+        Type index = peekType();
+        if (index.isObject() || index.isBoolean()) {
+            index = Type.OBJECT; //e.g. string->object
+            convert(Type.OBJECT);
+        }
+        popType();
+
+        popType(Type.OBJECT);
+
+        final String signature = Type.getMethodDescriptor(resultType, Type.OBJECT /*e.g STRING->OBJECT*/, index);
+
+        method.visitInvokeDynamicInsn(isMethod ? "dyn:getMethod|getElem|getProp" : "dyn:getElem|getProp|getMethod",
+                signature, LINKERBOOTSTRAP, flags);
+        pushType(resultType);
+
+        if (result.isBoolean()) {
+            convert(Type.BOOLEAN);
+        }
+
+        return this;
+    }
+
+    /**
+     * Dynamic setter for indexed structures. Pop value, index and receiver from
+     * stack, generate appropriate signature based on types
+     *
+     * @param flags call site flags for setter
+     */
+    public void dynamicSetIndex(final int flags) {
+        debug("dynamic_set_index", peekType(2) + "[" + peekType(1) + "] =", peekType());
+
+        Type value = peekType();
+        if (value.isObject() || value.isBoolean()) {
+            value = Type.OBJECT; //e.g. STRING->OBJECT - one descriptor for all object types
+            convert(Type.OBJECT);
+        }
+        popType();
+
+        Type index = peekType();
+        if (index.isObject() || index.isBoolean()) {
+            index = Type.OBJECT; //e.g. string->object
+            convert(Type.OBJECT);
+        }
+        popType(index);
+
+        final Type receiver = popType(Type.OBJECT);
+        assert receiver.isObject();
+
+        method.visitInvokeDynamicInsn("dyn:setElem|setProp", methodDescriptor(void.class, receiver.getTypeClass(), index.getTypeClass(), value.getTypeClass()), LINKERBOOTSTRAP, flags);
+    }
+
+    /**
+     * Load a key value in the proper form.
+     *
+     * @param key
+     */
+    //TODO move this and break it apart
+    MethodEmitter loadKey(final Object key) {
+        if (key instanceof IdentNode) {
+            method.visitLdcInsn(((IdentNode) key).getName());
+        } else if (key instanceof LiteralNode) {
+            method.visitLdcInsn(((LiteralNode<?>)key).getString());
+        } else {
+            method.visitLdcInsn(JSType.toString(key));
+        }
+        pushType(Type.OBJECT); //STRING
+        return this;
+    }
+
+     @SuppressWarnings("fallthrough")
+     private static Type fieldType(final String desc) {
+         switch (desc) {
+         case "Z":
+         case "B":
+         case "C":
+         case "S":
+         case "I":
+             return Type.INT;
+         case "F":
+             assert false;
+         case "D":
+             return Type.NUMBER;
+         case "J":
+             return Type.LONG;
+         default:
+             assert desc.startsWith("[") || desc.startsWith("L") : desc + " is not an object type";
+             switch (desc.charAt(0)) {
+             case 'L':
+                 return Type.OBJECT;
+             case '[':
+                 return Type.typeFor(Array.newInstance(fieldType(desc.substring(1)).getTypeClass(), 0).getClass());
+             default:
+                 assert false;
+             }
+             return Type.OBJECT;
+         }
+     }
+
+     /**
+      * Generate get for a field access
+      *
+      * @param fa the field access
+      *
+      * @return the method emitter
+      */
+    public MethodEmitter getField(final FieldAccess fa) {
+        return fa.get(this);
+    }
+
+     /**
+      * Generate set for a field access
+      *
+      * @param fa the field access
+      */
+    public void putField(final FieldAccess fa) {
+        fa.put(this);
+    }
+
+    /**
+     * Get the value of a non-static field, pop the receiver from the stack,
+     * push value to the stack
+     *
+     * @param className        class
+     * @param fieldName        field name
+     * @param fieldDescriptor  field descriptor
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter getField(final String className, final String fieldName, final String fieldDescriptor) {
+        debug("getfield", "receiver=" + peekType(), className + "." + fieldName + fieldDescriptor);
+        final Type receiver = popType();
+        assert receiver.isObject();
+        method.visitFieldInsn(GETFIELD, className, fieldName, fieldDescriptor);
+        pushType(fieldType(fieldDescriptor));
+        return this;
+    }
+
+    /**
+     * Get the value of a static field, push it to the stack
+     *
+     * @param className        class
+     * @param fieldName        field name
+     * @param fieldDescriptor  field descriptor
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter getStatic(final String className, final String fieldName, final String fieldDescriptor) {
+        debug("getstatic", className + "." + fieldName + "." + fieldDescriptor);
+        method.visitFieldInsn(GETSTATIC, className, fieldName, fieldDescriptor);
+        pushType(fieldType(fieldDescriptor));
+        return this;
+    }
+
+    /**
+     * Pop value and field from stack and write to a non-static field
+     *
+     * @param className       class
+     * @param fieldName       field name
+     * @param fieldDescriptor field descriptor
+     */
+    public void putField(final String className, final String fieldName, final String fieldDescriptor) {
+        debug("putfield", "receiver=" + peekType(1), "value=" + peekType());
+        popType(fieldType(fieldDescriptor));
+        popType(Type.OBJECT);
+        method.visitFieldInsn(PUTFIELD, className, fieldName, fieldDescriptor);
+    }
+
+    /**
+     * Pop value from stack and write to a static field
+     *
+     * @param className       class
+     * @param fieldName       field name
+     * @param fieldDescriptor field descriptor
+     */
+    public void putStatic(final String className, final String fieldName, final String fieldDescriptor) {
+        debug("putfield", "value=" + peekType());
+        popType(fieldType(fieldDescriptor));
+        method.visitFieldInsn(PUTSTATIC, className, fieldName, fieldDescriptor);
+    }
+
+    /**
+     * Register line number at a label
+     *
+     * @param line  line number
+     * @param label label
+     */
+    public void lineNumber(final int line, final Label label) {
+        method.visitLineNumber(line, label);
+    }
+
+    /*
+     * Debugging below
+     */
+
+    private final FieldAccess ERR_STREAM       = staticField(System.class, "err", PrintStream.class);
+    private final Call        PRINT            = virtualCallNoLookup(PrintStream.class, "print", void.class, Object.class);
+    private final Call        PRINTLN          = virtualCallNoLookup(PrintStream.class, "println", void.class, Object.class);
+    private final Call        PRINT_STACKTRACE = virtualCallNoLookup(Throwable.class, "printStackTrace", void.class);
+
+    /**
+     * Emit a System.err.print statement of whatever is on top of the bytecode stack
+     */
+     public void print() {
+         getField(ERR_STREAM);
+         swap();
+         convert(Type.OBJECT);
+         invoke(PRINT);
+     }
+
+    /**
+     * Emit a System.err.println statement of whatever is on top of the bytecode stack
+     */
+     public void println() {
+         getField(ERR_STREAM);
+         swap();
+         convert(Type.OBJECT);
+         invoke(PRINTLN);
+     }
+
+     /**
+      * Emit a System.err.print statement
+      * @param string string to print
+      */
+     public void print(final String string) {
+         getField(ERR_STREAM);
+         load(string);
+         invoke(PRINT);
+     }
+
+     /**
+      * Emit a System.err.println statement
+      * @param string string to print
+      */
+     public void println(final String string) {
+         getField(ERR_STREAM);
+         load(string);
+         invoke(PRINTLN);
+     }
+
+     /**
+      * Print a stacktrace to S
+      */
+     public void stacktrace() {
+         _new(Throwable.class);
+         dup();
+         invoke(constructorNoLookup(Throwable.class));
+         invoke(PRINT_STACKTRACE);
+     }
+
+    private static int linePrefix = 0;
+
+    /**
+     * Debug function that outputs generated bytecode and stack contents
+     *
+     * @param args debug information to print
+     */
+    private void debug(final Object... args) {
+        debug(30, args);
+    }
+
+    /**
+     * Debug function that outputs generated bytecode and stack contents
+     * for a label - indentation is currently the only thing that differs
+     *
+     * @param args debug information to print
+     */
+    private void debug_label(final Object... args) {
+        debug(26, args);
+    }
+
+    private void debug(final int padConstant, final Object... args) {
+        if (DEBUG) {
+            final StringBuilder sb = new StringBuilder();
+            int pad;
+
+            sb.append('#');
+            sb.append(++linePrefix);
+
+            pad = 5 - sb.length();
+            while (pad > 0) {
+                sb.append(' ');
+                pad--;
+            }
+
+            if (!stack.isEmpty()) {
+                sb.append("{");
+                sb.append(stack.size());
+                sb.append(":");
+                for (final Iterator<Type> iter = stack.iterator(); iter.hasNext();) {
+                    final Type t = iter.next();
+
+                    if (t == Type.SCOPE) {
+                        sb.append("scope");
+                    } else if (t == Type.THIS) {
+                        sb.append("this");
+                    } else if (t.isObject()) {
+                        String desc = t.getDescriptor();
+                        final int slash = desc.lastIndexOf('/');
+                        if (slash != -1) {
+                            desc = desc.substring(slash + 1, desc.length() - 1);
+                        }
+                        if ("Object".equals(desc)) {
+                            sb.append('O');
+                        } else {
+                            sb.append(desc);
+                        }
+                    } else {
+                        sb.append(t.getDescriptor());
+                    }
+
+                    if (iter.hasNext()) {
+                        sb.append(' ');
+                    }
+                }
+                sb.append('}');
+                sb.append(' ');
+            }
+
+            pad = padConstant - sb.length();
+            while (pad > 0) {
+                sb.append(' ');
+                pad--;
+            }
+
+            for (final Object arg : args) {
+                sb.append(arg);
+                sb.append(' ');
+            }
+
+            if (context != null) { //early bootstrap code doesn't have inited context yet
+                LOG.info(sb.toString());
+                if (DEBUG_TRACE_LINE == linePrefix) {
+                    new Throwable().printStackTrace(LOG.getOutputStream());
+                }
+            }
+
+        }
+    }
+
+
+    /**
+     * Abstraction for labels, separating a label from the underlying
+     * byte code emitter. Also augmenting label with e.g. a name
+     * for easier debugging and reading code
+     *
+     * see -Dnashorn.codegen.debug, --log=codegen
+     */
+    public static class Label extends jdk.internal.org.objectweb.asm.Label {
+        /** Name of this label */
+        private final String name;
+
+        /** Type stack at this label */
+        private ArrayDeque<Type> stack;
+
+        /**
+         * Constructor
+         *
+         * @param name name of this label
+         */
+        public Label(final String name) {
+            super();
+            this.name = name;
+        }
+
+        /**
+         * Copy constructor
+         *
+         * @param label a label to clone
+         */
+        public Label(final Label label) {
+            super();
+            name = label.name;
+        }
+
+        ArrayDeque<Type> getStack() {
+            return stack;
+        }
+
+        void setStack(final ArrayDeque<Type> stack) {
+            this.stack = stack;
+        }
+
+        @Override
+        public String toString() {
+            final StringBuilder sb = new StringBuilder();
+            String s = super.toString();
+            s = s.substring(1, s.length());
+            sb.append(name).append('_').append(Long.toHexString(Long.parseLong(s)));
+
+            return sb.toString();
+        }
+    }
+
+    /**
+     * Condition enum used for all kinds of jumps, regardless of type
+     */
+    static enum Condition {
+        EQ,
+        NE,
+        LE,
+        LT,
+        GE,
+        GT;
+
+        public static Condition forRuntimeRequest(final RuntimeNode.Request request) {
+            try {
+                final String reqString = request.toString().replace("_STRICT", "");
+                return Condition.valueOf(reqString);
+            } catch (final IllegalArgumentException e) {
+                return null;
+            }
+        }
+
+        public static int toUnary(final Condition c) {
+            switch (c) {
+            case EQ:
+                return IFEQ;
+            case NE:
+                return IFNE;
+            case LE:
+                return IFLE;
+            case LT:
+                return IFLT;
+            case GE:
+                return IFGE;
+            case GT:
+                return IFGT;
+            default:
+                assert false;
+                return -1;
+            }
+        }
+
+        public static int toBinary(final Condition c) {
+            return toBinary(c, false);
+        }
+
+        public static int toBinary(final Condition c, final boolean isObject) {
+            switch (c) {
+            case EQ:
+                return isObject ? IF_ACMPEQ : IF_ICMPEQ;
+            case NE:
+                return isObject ? IF_ACMPNE : IF_ICMPNE;
+            case LE:
+                return IF_ICMPLE;
+            case LT:
+                return IF_ICMPLT;
+            case GE:
+                return IF_ICMPGE;
+            case GT:
+                return IF_ICMPGT;
+            default:
+                assert false;
+                return -1;
+            }
+        }
+    }
+
+    /**
+     * Set the current function node being emitted
+     * @param functionNode the function node
+     */
+    public void setFunctionNode(final FunctionNode functionNode) {
+        this.functionNode = functionNode;
+    }
+
+    /**
+     * Get the split node for this method emitter, if this is code
+     * generation due to splitting large methods
+     *
+     * @return split node
+     */
+    public SplitNode getSplitNode() {
+        return splitNode;
+    }
+
+    /**
+     * Set the split node for this method emitter
+     * @param splitNode split node
+     */
+    public void setSplitNode(final SplitNode splitNode) {
+        this.splitNode = splitNode;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Namespace.java b/nashorn/src/jdk/nashorn/internal/codegen/Namespace.java
new file mode 100644
index 00000000000..639dc7f3b50
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Namespace.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.codegen;
+
+import java.util.HashMap;
+
+/**
+ * A name space hierarchy, where each level holds a name directory with
+ * names that may be unique for each level.
+ */
+
+public class Namespace {
+    /** Parent namespace. */
+    private final Namespace parent;
+
+    /** Name directory - version count for each name */
+    private final HashMap<String, Integer> directory;
+
+    /**
+     * Constructor
+     */
+    public Namespace() {
+        this(null);
+    }
+
+    /**
+     * Constructor
+     *
+     * @param parent parent name space
+     */
+    public Namespace(final Namespace parent) {
+        this.parent    = parent;
+        directory = new HashMap<>();
+    }
+
+    /**
+     * Return the parent Namespace of this space.
+     *
+     * @return parent name space
+     */
+    public Namespace getParent() {
+        return parent;
+    }
+
+    private HashMap<String, Integer> getDirectory() {
+        return directory;
+    }
+
+    /**
+     * Create a uniqueName name in the namespace in the form base$n where n varies
+     * .
+     * @param base Base of name.  Base will be returned if uniqueName.
+     *
+     * @return Generated uniqueName name.
+     */
+    public String uniqueName(final String base) {
+        for (Namespace namespace = this; namespace != null; namespace = namespace.getParent()) {
+            final HashMap<String, Integer> namespaceDirectory = namespace.getDirectory();
+            final Integer                  counter            = namespaceDirectory.get(base);
+
+            if (counter != null) {
+                final int count = counter + 1;
+                namespaceDirectory.put(base, count);
+
+                return base + "$" + count;
+            }
+        }
+
+        directory.put(base, 0);
+
+        return base;
+    }
+
+    @Override
+    public String toString() {
+        return directory.toString();
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/RuntimeCallSite.java b/nashorn/src/jdk/nashorn/internal/codegen/RuntimeCallSite.java
new file mode 100644
index 00000000000..921c1f66083
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/RuntimeCallSite.java
@@ -0,0 +1,701 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.codegen;
+
+import static jdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
+import static jdk.nashorn.internal.codegen.types.Type.BOOLEAN;
+import static jdk.nashorn.internal.codegen.types.Type.INT;
+import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+
+import java.lang.invoke.CallSite;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.lang.invoke.MutableCallSite;
+import java.util.HashMap;
+import java.util.Map;
+import jdk.nashorn.internal.codegen.CompilerConstants.Call;
+import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.ir.RuntimeNode;
+import jdk.nashorn.internal.ir.RuntimeNode.Request;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
+import jdk.nashorn.internal.runtime.linker.Lookup;
+import jdk.nashorn.internal.runtime.linker.MethodHandleFactory;
+
+/**
+ * Optimistic call site that assumes its Object arguments to be of a boxed type.
+ * Gradually reverts to wider boxed types if the assumption for the RuntimeNode
+ * is proven wrong. Finally reverts to the generic ScriptRuntime method.
+ *
+ * This is used from the CodeGenerator when we have a runtime node, but 1 or more
+ * primitive arguments. This class generated appropriate specializations, for example
+ * {@code Object a === int b} is a good idea to specialize to {@code ((Integer)a).intValue() == b}
+ * surrounded by catch blocks that will try less narrow specializations
+ */
+public class RuntimeCallSite extends MutableCallSite {
+    static final Call BOOTSTRAP = staticCallNoLookup(RuntimeCallSite.class, "bootstrap", CallSite.class, MethodHandles.Lookup.class, String.class, MethodType.class);
+
+    private static final MethodHandle NEXT = findOwnMH("next",  MethodHandle.class);
+
+    private final RuntimeNode.Request request;
+
+    private String name;
+
+    /**
+     * A specialized runtime node, i.e. on where we know at least one more specific type than object
+     */
+    static final class SpecializedRuntimeNode {
+        private static final char REQUEST_SEPARATOR = ':';
+
+        private final RuntimeNode.Request request;
+
+        private final Type[] parameterTypes;
+
+        private final Type   returnType;
+
+        /**
+         * Constructor.
+         *
+         * @param request        runtime node request to specialize
+         * @param parameterTypes parameter types of the call site
+         * @param returnType     return type of the call site
+         */
+        SpecializedRuntimeNode(final RuntimeNode.Request request, final Type[] parameterTypes, final Type returnType) {
+            this.request        = request;
+            this.parameterTypes = parameterTypes;
+            this.returnType     = returnType;
+        }
+
+        /**
+         * The first type to try to use for this genrated runtime node
+         *
+         * @return a type
+         */
+        public Type firstTypeGuess() {
+            Type widest = Type.UNKNOWN;
+            for (final Type type : parameterTypes) {
+                if (type.isObject()) {
+                    continue;
+                }
+                widest = Type.widest(type, widest);
+            }
+            widest = Type.widest(widest, firstTypeGuessForObject(request));
+
+            return widest;
+        }
+
+        private static Type firstTypeGuessForObject(final Request request) {
+            switch (request) {
+            case ADD:
+                return INT;
+            default:
+                return BOOLEAN;
+            }
+        }
+
+        Request getRequest() {
+            return request;
+        }
+
+        Type[] getParameterTypes() {
+            return parameterTypes;
+        }
+
+        Type getReturnType() {
+            return returnType;
+        }
+
+        private static char descFor(final Type type) {
+            if (type.isObject()) {
+                return 'O';
+            }
+            return type.getDescriptor().charAt(0);
+        }
+
+        @Override
+        public boolean equals(final Object other) {
+            if (other instanceof SpecializedRuntimeNode) {
+                final SpecializedRuntimeNode otherNode = (SpecializedRuntimeNode)other;
+
+                if (!otherNode.getReturnType().equals(getReturnType())) {
+                    return false;
+                }
+
+                if (getParameterTypes().length != otherNode.getParameterTypes().length) {
+                    return false;
+                }
+
+                for (int i = 0; i < getParameterTypes().length; i++) {
+                    if (!Type.areEquivalent(getParameterTypes()[i], otherNode.getParameterTypes()[i])) {
+                        return false;
+                    }
+                }
+
+                return otherNode.getRequest().equals(getRequest());
+            }
+
+            return false;
+        }
+
+        @Override
+        public int hashCode() {
+            int hashCode = getRequest().toString().hashCode();
+            hashCode ^= getReturnType().hashCode();
+            for (final Type type : getParameterTypes()) {
+                hashCode ^= type.hashCode();
+            }
+            return hashCode;
+        }
+
+        @Override
+        public String toString() {
+            final StringBuilder sb = new StringBuilder();
+            sb.append(getRequest().toString());
+            sb.append(REQUEST_SEPARATOR);
+            sb.append(descFor(getReturnType()));
+
+            for (final Type type : getParameterTypes()) {
+                sb.append(descFor(type));
+            }
+
+            return sb.toString();
+        }
+
+        String getName(final Type extraType) {
+            return toString() + "_" + descFor(extraType);
+        }
+
+        String getInitialName() {
+            return getName(firstTypeGuess());
+        }
+    }
+
+
+    /**
+     * Constructor
+     *
+     * @param type method type for call site
+     * @param name name of runtime call
+     */
+    RuntimeCallSite(final MethodType type, final String name) {
+        super(type);
+        this.name    = name;
+        this.request = Request.valueOf(name.substring(0, name.indexOf(SpecializedRuntimeNode.REQUEST_SEPARATOR)));
+        setTarget(makeMethod(name));
+    }
+
+    /**
+     * Bootstrapper for a specialized Runtime call
+     *
+     * @param lookup       lookup
+     * @param initialName  initial name for callsite
+     * @param type         method type for call site
+     *
+     * @return callsite for a runtime node
+     */
+    public static CallSite bootstrap(final MethodHandles.Lookup lookup, final String initialName, final MethodType type) {
+        return new RuntimeCallSite(type, initialName);
+    }
+
+    private String nextName(final String requestName) {
+        if (requestName.equals(request.toString())) {
+            return null;
+        }
+
+        final char[] c = requestName.toCharArray();
+        final int last = c.length - 1;
+
+        if (c[last - 1] != '_') {
+            return null;
+        }
+
+        switch (c[last]) {
+        case 'Z':
+            c[last] = 'I';
+            break;
+        case 'I':
+            c[last] = 'J';
+            break;
+        case 'J':
+            c[last] = 'D';
+            break;
+        case 'D':
+        default:
+            return request.toString();
+        }
+
+        return new String(c);
+    }
+
+    private boolean isSpecialized(final String requestName) {
+        return nextName(requestName) != null;
+    }
+
+    private MethodHandle makeMethod(final String requestName) {
+        MethodHandle mh;
+
+        if (isSpecialized(requestName)) {
+            final Class<?> boxedType;
+            final Class<?> primitiveType;
+
+            switch (requestName.charAt(requestName.length() - 1)) {
+            case 'Z':
+                boxedType = Boolean.class;
+                primitiveType = int.class;
+                break;
+            case 'I':
+                boxedType = Integer.class;
+                primitiveType = int.class;
+                break;
+            case 'J':
+                boxedType = Long.class;
+                primitiveType = long.class;
+                break;
+            case 'D':
+                boxedType = Number.class;
+                primitiveType = double.class;
+                break;
+            default:
+                throw new RuntimeException("should not reach here");
+            }
+
+            final boolean isStrictCmp = (request == Request.EQ_STRICT || request == Request.NE_STRICT);
+
+            if (isStrictCmp &&
+                    (boxedType != Boolean.class &&
+                        (type().parameterType(0) == boolean.class ||
+                         type().parameterType(1) == boolean.class))) {
+                // number and boolean are never strictly equal, e.g. 0 !== false
+                mh = MH.dropArguments(MH.constant(boolean.class, request == Request.NE_STRICT), 0, type().parameterArray());
+            } else {
+                mh = METHODS.get(request.name().replace("_STRICT", "") + primitiveType.getSimpleName());
+                // unbox objects
+
+                for (int i = 0; i < type().parameterCount(); i++) {
+                    if (!type().parameterType(i).isPrimitive()) {
+                        mh = MH.filterArguments(mh, i, UNBOX.get(boxedType));
+                    }
+                }
+
+                mh = Lookup.filterReturnType(mh, type().returnType());
+                mh = MH.explicitCastArguments(mh, type());
+            }
+
+            final MethodHandle fallback = MH.foldArguments(MethodHandles.exactInvoker(type()), MH.bindTo(NEXT, this));
+
+            MethodHandle guard;
+            if (type().parameterType(0).isPrimitive()) {
+                guard = MH.insertArguments(
+                            MH.dropArguments(CHECKCAST, 1, type().parameterType(0)), 0, boxedType);
+            } else if (type().parameterType(1).isPrimitive()) {
+                guard = MH.insertArguments(
+                            MH.dropArguments(CHECKCAST, 2, type().parameterType(1)), 0, boxedType);
+            } else {
+                assert !type().parameterType(0).isPrimitive() && !type().parameterType(1).isPrimitive();
+                guard = MH.insertArguments(CHECKCAST2, 0, boxedType);
+            }
+
+            if (request == Request.ADD && boxedType == Integer.class) {
+                // int add needs additional overflow check
+                MethodHandle addcheck = ADDCHECK;
+                for (int i = 0; i < type().parameterCount(); i++) {
+                    if (!type().parameterType(i).isPrimitive()) {
+                        addcheck = MH.filterArguments(addcheck, i, UNBOX.get(boxedType));
+                    }
+                }
+                addcheck = MH.explicitCastArguments(addcheck, type().changeReturnType(boolean.class));
+                guard    = MH.guardWithTest(guard, addcheck,
+                                MH.dropArguments(MH.constant(boolean.class, false), 0, type().parameterArray()));
+            }
+
+            return MH.guardWithTest(guard, mh, fallback);
+        }
+
+        // generic fallback
+        return MH.explicitCastArguments(Lookup.filterReturnType(GENERIC_METHODS.get(request.name()), type().returnType()), type());
+    }
+
+    /**
+     * This is public just so that the generated specialization code can
+     * use it to get the next wider typed method
+     *
+     * Do not call directly
+     *
+     * @return next wider specialization method for this RuntimeCallSite
+     */
+    public MethodHandle next() {
+        this.name = nextName(name);
+        final MethodHandle next = makeMethod(name);
+        setTarget(next);
+        return next;
+    }
+
+    @Override
+    public String toString() {
+        return super.toString() + " " + name;
+    }
+
+    /** Method cache */
+    private static final Map<String, MethodHandle> METHODS;
+
+    /** Generic method cache */
+    private static final Map<String, MethodHandle> GENERIC_METHODS;
+
+    /** Unbox cache */
+    private static final Map<Class<?>, MethodHandle> UNBOX;
+
+    private static final MethodHandle CHECKCAST  = findOwnMH("checkcast", boolean.class, Class.class, Object.class);
+    private static final MethodHandle CHECKCAST2 = findOwnMH("checkcast", boolean.class, Class.class, Object.class, Object.class);
+    private static final MethodHandle ADDCHECK   = findOwnMH("ADDcheck",  boolean.class, int.class, int.class);
+
+    /**
+     * Build maps of correct boxing operations
+     */
+    static {
+        UNBOX = new HashMap<>();
+        UNBOX.put(Boolean.class, findOwnMH("unboxZ", int.class, Object.class));
+        UNBOX.put(Integer.class, findOwnMH("unboxI", int.class, Object.class));
+        UNBOX.put(Long.class,    findOwnMH("unboxJ", long.class, Object.class));
+        UNBOX.put(Number.class,  findOwnMH("unboxD", double.class, Object.class));
+
+        METHODS = new HashMap<>();
+
+        for (final Request req : Request.values()) {
+            if (req.canSpecialize()) {
+                if (req.name().endsWith("_STRICT")) {
+                    continue;
+                }
+
+                final boolean isCmp = Request.isComparison(req);
+
+                METHODS.put(req.name() + "int",    findOwnMH(req.name(), (isCmp ? boolean.class : int.class),  int.class, int.class));
+                METHODS.put(req.name() + "long",   findOwnMH(req.name(), (isCmp ? boolean.class : long.class), long.class, long.class));
+                METHODS.put(req.name() + "double", findOwnMH(req.name(), (isCmp ? boolean.class : double.class), double.class, double.class));
+            }
+        }
+
+        GENERIC_METHODS = new HashMap<>();
+        for (final Request req : Request.values()) {
+            if (req.canSpecialize()) {
+                GENERIC_METHODS.put(req.name(), MH.findStatic(MethodHandles.lookup(), ScriptRuntime.class, req.name(),
+                        MH.type(req.getReturnType().getTypeClass(), Object.class, Object.class)));
+            }
+        }
+    }
+
+    /**
+     * Specialized version of != operator for two int arguments. Do not call directly.
+     * @param a int
+     * @param b int
+     * @return a != b
+     */
+    public static boolean NE(final int a, final int b) {
+        return a != b;
+    }
+
+    /**
+     * Specialized version of != operator for two double arguments. Do not call directly.
+     * @param a double
+     * @param b double
+     * @return a != b
+     */
+    public static boolean NE(final double a, final double b) {
+        return a != b;
+    }
+
+    /**
+     * Specialized version of != operator for two long arguments. Do not call directly.
+     * @param a long
+     * @param b long
+     * @return a != b
+     */
+    public static boolean NE(final long a, final long b) {
+        return a != b;
+    }
+
+    /**
+     * Specialized version of == operator for two int arguments. Do not call directly.
+     * @param a int
+     * @param b int
+     * @return a == b
+     */
+    public static boolean EQ(final int a, final int b) {
+        return a == b;
+    }
+
+    /**
+     * Specialized version of == operator for two double arguments. Do not call directly.
+     * @param a double
+     * @param b double
+     * @return a == b
+     */
+    public static boolean EQ(final double a, final double b) {
+        return a == b;
+    }
+
+    /**
+     * Specialized version of == operator for two long arguments. Do not call directly.
+     * @param a long
+     * @param b long
+     * @return a == b
+     */
+    public static boolean EQ(final long a, final long b) {
+        return a == b;
+    }
+
+    /**
+     * Specialized version of < operator for two int arguments. Do not call directly.
+     * @param a int
+     * @param b int
+     * @return a < b
+     */
+    public static boolean LT(final int a, final int b) {
+        return a < b;
+    }
+
+    /**
+     * Specialized version of < operator for two double arguments. Do not call directly.
+     * @param a double
+     * @param b double
+     * @return a < b
+     */
+    public static boolean LT(final double a, final double b) {
+        return a < b;
+    }
+
+    /**
+     * Specialized version of < operator for two long arguments. Do not call directly.
+     * @param a long
+     * @param b long
+     * @return a < b
+     */
+    public static boolean LT(final long a, final long b) {
+        return a < b;
+    }
+
+    /**
+     * Specialized version of <= operator for two int arguments. Do not call directly.
+     * @param a int
+     * @param b int
+     * @return a <= b
+     */
+    public static boolean LE(final int a, final int b) {
+        return a <= b;
+    }
+
+    /**
+     * Specialized version of <= operator for two double arguments. Do not call directly.
+     * @param a double
+     * @param b double
+     * @return a <= b
+     */
+    public static boolean LE(final double a, final double b) {
+        return a <= b;
+    }
+
+    /**
+     * Specialized version of <= operator for two long arguments. Do not call directly.
+     * @param a long
+     * @param b long
+     * @return a <= b
+     */
+    public static boolean LE(final long a, final long b) {
+        return a <= b;
+    }
+
+    /**
+     * Specialized version of > operator for two int arguments. Do not call directly.
+     * @param a int
+     * @param b int
+     * @return a > b
+     */
+    public static boolean GT(final int a, final int b) {
+        return a > b;
+    }
+
+    /**
+     * Specialized version of > operator for two double arguments. Do not call directly.
+     * @param a double
+     * @param b double
+     * @return a > b
+     */
+    public static boolean GT(final double a, final double b) {
+        return a > b;
+    }
+
+    /**
+     * Specialized version of > operator for two long arguments. Do not call directly.
+     * @param a long
+     * @param b long
+     * @return a > b
+     */
+    public static boolean GT(final long a, final long b) {
+        return a > b;
+    }
+
+    /**
+     * Specialized version of >= operator for two int arguments. Do not call directly.
+     * @param a int
+     * @param b int
+     * @return a >= b
+     */
+    public static boolean GE(final int a, final int b) {
+        return a >= b;
+    }
+
+    /**
+     * Specialized version of >= operator for two double arguments. Do not call directly.
+     * @param a double
+     * @param b double
+     * @return a >= b
+     */
+    public static boolean GE(final double a, final double b) {
+        return a >= b;
+    }
+
+    /**
+     * Specialized version of >= operator for two long arguments. Do not call directly.
+     * @param a long
+     * @param b long
+     * @return a >= b
+     */
+    public static boolean GE(final long a, final long b) {
+        return a >= b;
+    }
+
+    /**
+     * Specialized version of + operator for two int arguments. Do not call directly.
+     * @param a int
+     * @param b int
+     * @return a + b
+     */
+    public static int ADD(final int a, final int b) {
+        return a + b;
+    }
+
+    /**
+     * Specialized version of + operator for two long arguments. Do not call directly.
+     * @param a long
+     * @param b long
+     * @return a + b
+     */
+    public static long ADD(final long a, final long b) {
+        return a + b;
+    }
+
+    /**
+     * Specialized version of + operator for two double arguments. Do not call directly.
+     * @param a double
+     * @param b double
+     * @return a + b
+     */
+    public static double ADD(final double a, final double b) {
+        return a + b;
+    }
+
+    /**
+     * Check that ints are addition compatible, i.e. their sum is equal to the sum
+     * of them cast to long. Otherwise the addition will overflow. Do not call directly.
+     *
+     * @param a int
+     * @param b int
+     *
+     * @return true if addition does not overflow
+     */
+    public static boolean ADDcheck(final int a, final int b) {
+        return (a + b == (long)a + (long)b);
+    }
+
+    /**
+     * Checkcast used for specialized ops. Do not call directly
+     *
+     * @param type to to check against
+     * @param obj  object to check for type
+     *
+     * @return true if type check holds
+     */
+    public static boolean checkcast(final Class<?> type, final Object obj) {
+        return type.isInstance(obj);
+    }
+
+    /**
+     * Checkcast used for specialized ops. Do not call directly
+     *
+     * @param type type to check against
+     * @param objA first object to check against type
+     * @param objB second object to check against type
+     *
+     * @return true if type check holds for both objects
+     */
+    public static boolean checkcast(final Class<?> type, final Object objA, final Object objB) {
+        return type.isInstance(objA) && type.isInstance(objB);
+    }
+
+    /**
+     * Unbox a java.lang.Boolean. Do not call directly
+     * @param obj object to cast to int and unbox
+     * @return an int value for the boolean, 1 is true, 0 is false
+     */
+    public static int unboxZ(final Object obj) {
+        return (boolean)obj ? 1 : 0;
+    }
+
+    /**
+     * Unbox a java.lang.Integer. Do not call directly
+     * @param obj object to cast to int and unbox
+     * @return an int
+     */
+    public static int unboxI(final Object obj) {
+        return (int)obj;
+    }
+
+    /**
+     * Unbox a java.lang.Long. Do not call directly
+     * @param obj object to cast to long and unbox
+     * @return a long
+     */
+    public static long unboxJ(final Object obj) {
+        return (long)obj;
+    }
+
+    /**
+     * Unbox a java.lang.Number. Do not call directly
+     * @param obj object to cast to Number and unbox
+     * @return a double
+     */
+    public static double unboxD(final Object obj) {
+        return ((Number)obj).doubleValue();
+    }
+
+    private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
+        try {
+            return MH.findStatic(MethodHandles.lookup(), RuntimeCallSite.class, name, MH.type(rtype, types));
+        } catch (final MethodHandleFactory.LookupException e) {
+            return MH.findVirtual(MethodHandles.lookup(), RuntimeCallSite.class, name, MH.type(rtype, types));
+        }
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/SharedScopeCall.java b/nashorn/src/jdk/nashorn/internal/codegen/SharedScopeCall.java
new file mode 100644
index 00000000000..376416deb3d
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/SharedScopeCall.java
@@ -0,0 +1,192 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.codegen;
+
+import java.util.Arrays;
+import java.util.EnumSet;
+import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.ir.Symbol;
+import jdk.nashorn.internal.runtime.ScriptObject;
+
+/**
+ * A scope call or get operation that can be shared by several callsites. This generates a static
+ * method that wraps the invokedynamic instructions to get or call scope variables.
+ * The rationale for this is that initial linking of invokedynamic callsites is expensive,
+ * so by sharing them we can reduce startup overhead and allow very large scripts to run that otherwise wouldn't.
+ *
+ * <p>Static methods generated by this class expect two parameters in addition to the parameters of the
+ * function call: The current scope object and the depth of the target scope relative to the scope argument
+ * for when this is known at compile-time (fast-scope access).</p>
+ *
+ * <p>The second argument may be -1 for non-fast-scope symbols, in which case the scope chain is checked
+ * for each call. This may cause callsite invalidation when the shared method is used from different
+ * scopes, but such sharing of non-fast scope calls may still be necessary for very large scripts.</p>
+ *
+ * <p>Scope calls must not be shared between normal callsites and callsites contained in a <tt>with</tt>
+ * statement as this condition is not handled by current guards and will cause a runtime error.</p>
+ */
+public class SharedScopeCall {
+
+    /** Threshold for using shared scope calls with fast scope access. */
+    public static final int FAST_SCOPE_CALL_THRESHOLD = 4;
+    /** Threshold for using shared scope calls with slow scope access. */
+    public static final int SLOW_SCOPE_CALL_THRESHOLD = 500;
+    /** Threshold for using shared scope gets with fast scope access. */
+    public static final int FAST_SCOPE_GET_THRESHOLD  = 200;
+
+    final Type valueType;
+    final Symbol symbol;
+    final Type returnType;
+    final Type[] paramTypes;
+    final int flags;
+    final boolean isCall;
+    private CompileUnit compileUnit;
+    private String methodName;
+    private String staticSignature;
+
+    /**
+     * Constructor.
+     *
+     * @param symbol the symbol
+     * @param valueType the type of the value
+     * @param returnType the return type
+     * @param paramTypes the function parameter types
+     * @param flags the callsite flags
+     */
+    SharedScopeCall(final Symbol symbol, final Type valueType, final Type returnType, final Type[] paramTypes, final int flags) {
+        this.symbol = symbol;
+        this.valueType = valueType;
+        this.returnType = returnType;
+        this.paramTypes = paramTypes;
+        this.flags = flags;
+        // If paramTypes is not null this is a call, otherwise it's just a get.
+        this.isCall = paramTypes != null;
+    }
+
+    @Override
+    public int hashCode() {
+        return symbol.hashCode() ^ returnType.hashCode() ^ Arrays.hashCode(paramTypes) ^ flags;
+    }
+
+    @Override
+    public boolean equals(final Object obj) {
+        if (obj instanceof SharedScopeCall) {
+            final SharedScopeCall c = (SharedScopeCall) obj;
+            return symbol.equals(c.symbol)
+                    && flags == c.flags
+                    && returnType.equals(c.returnType)
+                    && Arrays.equals(paramTypes, c.paramTypes);
+        }
+        return false;
+    }
+
+    /**
+     * Set the compile unit and method name.
+     * @param compileUnit the compile unit
+     * @param compiler the compiler to generate a unique method name
+     */
+    protected void setClassAndName(final CompileUnit compileUnit, final Compiler compiler) {
+        this.compileUnit = compileUnit;
+        this.methodName = compiler.uniqueName("scopeCall");
+    }
+
+    /**
+     * Generate the invoke instruction for this shared scope call.
+     * @param method the method emitter
+     */
+    public void generateInvoke(final MethodEmitter method) {
+        method.invokeStatic(compileUnit.getUnitClassName(), methodName, getStaticSignature());
+    }
+
+    /**
+     * Generate the method that implements the scope get or call.
+     */
+    protected void generateScopeCall() {
+        final ClassEmitter classEmitter = compileUnit.getClassEmitter();
+        final EnumSet<ClassEmitter.Flag> methodFlags = EnumSet.of(ClassEmitter.Flag.STATIC);
+
+        // This method expects two fixed parameters in addition to any parameters that may be
+        // passed on to the function: A ScriptObject representing the caller's current scope object,
+        // and an int specifying the distance to the target scope containing the symbol we want to
+        // access, or -1 if this is not known at compile time (e.g. because of a "with" or "eval").
+
+        final MethodEmitter method = classEmitter.method(methodFlags, methodName, getStaticSignature());
+        method.begin();
+
+        // Load correct scope by calling getProto() on the scope argument as often as specified
+        // by the second argument.
+        final MethodEmitter.Label parentLoopStart = new MethodEmitter.Label("parent_loop_start");
+        final MethodEmitter.Label parentLoopDone = new MethodEmitter.Label("parent_loop_done");
+        method.load(Type.OBJECT, 0);
+        method.label(parentLoopStart);
+        method.load(Type.INT, 1);
+        method.iinc(1, -1);
+        method.ifle(parentLoopDone);
+        method.invoke(ScriptObject.GET_PROTO);
+        method._goto(parentLoopStart);
+        method.label(parentLoopDone);
+
+        method.dynamicGet(valueType, symbol.getName(), flags, isCall);
+
+        // If this is a get we're done, otherwise call the value as function.
+        if (isCall) {
+            method.convert(Type.OBJECT);
+            // ScriptFunction will see CALLSITE_SCOPE and will bind scope accordingly.
+            method.loadNull();
+            int slot = 2;
+            for (final Type type : paramTypes) {
+                method.load(type, slot++);
+                if (type == Type.NUMBER || type == Type.LONG) slot++;
+            }
+            method.dynamicCall(returnType, paramTypes.length, flags);
+        }
+
+        method._return(returnType);
+        method.end();
+    }
+
+    private String getStaticSignature() {
+        if (staticSignature == null) {
+            if (paramTypes == null) {
+                staticSignature = Type.getMethodDescriptor(returnType, Type.typeFor(ScriptObject.class), Type.INT);
+            } else {
+                final Type[] params = new Type[paramTypes.length + 2];
+                params[0] = Type.typeFor(ScriptObject.class);
+                params[1] = Type.INT;
+                int i = 2;
+                for (Type type : paramTypes)  {
+                    if (type.isObject()) {
+                        type = Type.OBJECT;
+                    }
+                    params[i++] = type;
+                }
+                staticSignature = Type.getMethodDescriptor(returnType, params);
+            }
+        }
+        return staticSignature;
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Splitter.java b/nashorn/src/jdk/nashorn/internal/codegen/Splitter.java
new file mode 100644
index 00000000000..f6053a707d2
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Splitter.java
@@ -0,0 +1,403 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.codegen;
+
+import static jdk.nashorn.internal.codegen.CompilerConstants.SPLIT_PREFIX;
+
+import java.util.ArrayList;
+import java.util.Deque;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import jdk.nashorn.internal.ir.Block;
+import jdk.nashorn.internal.ir.BreakNode;
+import jdk.nashorn.internal.ir.ContinueNode;
+import jdk.nashorn.internal.ir.DoWhileNode;
+import jdk.nashorn.internal.ir.ForNode;
+import jdk.nashorn.internal.ir.FunctionNode;
+import jdk.nashorn.internal.ir.LabelNode;
+import jdk.nashorn.internal.ir.LiteralNode;
+import jdk.nashorn.internal.ir.LiteralNode.ArrayLiteralNode;
+import jdk.nashorn.internal.ir.LiteralNode.ArrayLiteralNode.ArrayUnit;
+import jdk.nashorn.internal.ir.Node;
+import jdk.nashorn.internal.ir.ReturnNode;
+import jdk.nashorn.internal.ir.SplitNode;
+import jdk.nashorn.internal.ir.SwitchNode;
+import jdk.nashorn.internal.ir.WhileNode;
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * Split the IR into smaller compile units.
+ */
+public class Splitter extends NodeVisitor {
+    /** Current compiler. */
+    private final Compiler compiler;
+
+    /** IR to be broken down. */
+    private final FunctionNode functionNode;
+
+    /** Compile unit for the main script. */
+    private final CompileUnit scriptCompileUnit;
+
+    /** Cache for calculated block weights. */
+    private final Map<Node, Long> weightCache = new HashMap<>();
+
+    /** Weight threshold for when to start a split. */
+    public static final long SPLIT_THRESHOLD  = 32 * 1024;
+
+    /**
+     * Constructor.
+     *
+     * @param compiler     the compiler
+     * @param functionNode function node to split
+     */
+    public Splitter(final Compiler compiler, final FunctionNode functionNode, final CompileUnit compileUnit) {
+        this.compiler     = compiler;
+        this.functionNode = functionNode;
+        this.scriptCompileUnit = compileUnit;
+    }
+
+    /**
+     * Execute the split
+     */
+    void split() {
+        long weight = WeighNodes.weigh(functionNode);
+
+        if (weight >= SPLIT_THRESHOLD) {
+
+            functionNode.accept(this);
+
+            if (functionNode.isSplit()) {
+                // Weight has changed so weigh again, this time using block weight cache
+                weight = WeighNodes.weigh(functionNode, weightCache);
+            }
+
+            if (weight >= SPLIT_THRESHOLD) {
+                weight = splitBlock(functionNode);
+            }
+
+            if (functionNode.isSplit()) {
+                functionNode.accept(new SplitFlowAnalyzer());
+            }
+        }
+
+        assert functionNode.getCompileUnit() == null : "compile unit already set";
+
+        if (functionNode.isScript()) {
+            assert scriptCompileUnit != null : "script compile unit is null";
+
+            functionNode.setCompileUnit(scriptCompileUnit);
+            scriptCompileUnit.addWeight(weight + WeighNodes.FUNCTION_WEIGHT);
+        } else {
+            functionNode.setCompileUnit(findUnit(weight));
+        }
+
+        // Recursively split nested functions
+        final List<FunctionNode> functions = functionNode.getFunctions();
+
+        for (final FunctionNode function : functions) {
+            new Splitter(compiler, function, scriptCompileUnit).split();
+        }
+    }
+
+    /**
+     * Override this logic to look up compile units in a different way
+     * @param weight weight needed
+     * @return compile unit
+     */
+    protected CompileUnit findUnit(final long weight) {
+        return compiler.findUnit(weight);
+    }
+
+    /**
+     * Split a block into sub methods.
+     *
+     * @param block Block or function to split.
+     *
+     * @return new weight for the resulting block.
+     */
+    private long splitBlock(final Block block) {
+        functionNode.setIsSplit();
+
+        final List<Node> splits = new ArrayList<>();
+        List<Node> statements = new ArrayList<>();
+        long statementsWeight = 0;
+
+        for (final Node statement : block.getStatements()) {
+            final long weight = WeighNodes.weigh(statement, weightCache);
+
+            if (statementsWeight + weight >= SPLIT_THRESHOLD || statement.isTerminal()) {
+                if (!statements.isEmpty()) {
+                    splits.add(createBlockSplitNode(block, statements, statementsWeight));
+                    statements = new ArrayList<>();
+                    statementsWeight = 0;
+                }
+
+            }
+
+            if (statement.isTerminal()) {
+                splits.add(statement);
+            } else {
+                statements.add(statement);
+                statementsWeight += weight;
+            }
+        }
+
+        if (!statements.isEmpty()) {
+            splits.add(createBlockSplitNode(block, statements, statementsWeight));
+        }
+
+        block.setStatements(splits);
+
+        return WeighNodes.weigh(block, weightCache);
+    }
+
+    /**
+     * Create a new split node from statements contained in a parent block.
+     *
+     * @param parent     Parent block.
+     * @param statements Statements to include.
+     *
+     * @return New split node.
+     */
+    private SplitNode createBlockSplitNode(final Block parent, final List<Node> statements, final long weight) {
+        final Source source = parent.getSource();
+        final long   token  = parent.getToken();
+        final int    finish = parent.getFinish();
+        final String name   = compiler.uniqueName(SPLIT_PREFIX.tag());
+
+        final Block newBlock = new Block(source, token, finish, parent, functionNode);
+        newBlock.setFrame(new Frame(parent.getFrame()));
+        newBlock.setStatements(statements);
+
+        final SplitNode splitNode = new SplitNode(name, functionNode, newBlock);
+
+        splitNode.setCompileUnit(compiler.findUnit(weight + WeighNodes.FUNCTION_WEIGHT));
+
+        return splitNode;
+    }
+
+    @Override
+    public Node enter(final Block block) {
+        if (block.isCatchBlock()) {
+            return null;
+        }
+
+        final long weight = WeighNodes.weigh(block, weightCache);
+
+        if (weight < SPLIT_THRESHOLD) {
+            weightCache.put(block, weight);
+            return null;
+        }
+
+        return block;
+    }
+
+    @Override
+    public Node leave(final Block block) {
+        assert !block.isCatchBlock();
+
+        // Block was heavier than SLIT_THRESHOLD in enter, but a sub-block may have
+        // been split already, so weigh again before splitting.
+        long weight = WeighNodes.weigh(block, weightCache);
+        if (weight >= SPLIT_THRESHOLD) {
+            weight = splitBlock(block);
+        }
+        weightCache.put(block, weight);
+
+        return block;
+    }
+
+    @SuppressWarnings("rawtypes")
+    @Override
+    public Node leave(final LiteralNode literal) {
+        long weight = WeighNodes.weigh(literal);
+
+        if (weight < SPLIT_THRESHOLD) {
+            return literal;
+        }
+
+        functionNode.setIsSplit();
+
+        if (literal instanceof ArrayLiteralNode) {
+            final ArrayLiteralNode arrayLiteralNode = (ArrayLiteralNode) literal;
+            final Node[]           value            = arrayLiteralNode.getValue();
+            final int[]            postsets         = arrayLiteralNode.getPostsets();
+            final List<ArrayUnit>  units            = new ArrayList<>();
+
+            long totalWeight = 0;
+            int  lo          = 0;
+
+            for (int i = 0; i < postsets.length; i++) {
+                final int  postset = postsets[i];
+                final Node element = value[postset];
+
+                weight = WeighNodes.weigh(element);
+                totalWeight += weight;
+
+                if (totalWeight >= SPLIT_THRESHOLD) {
+                    final CompileUnit unit = compiler.findUnit(totalWeight - weight);
+                    units.add(new ArrayUnit(unit, lo, i));
+                    lo = i;
+                    totalWeight = weight;
+                }
+            }
+
+            if (lo != postsets.length) {
+                final CompileUnit unit = compiler.findUnit(totalWeight);
+                units.add(new ArrayUnit(unit, lo, postsets.length));
+            }
+
+            arrayLiteralNode.setUnits(units);
+        }
+
+        return literal;
+    }
+
+    @Override
+    public Node enter(final FunctionNode node) {
+        final List<Node> statements = node.getStatements();
+
+        for (final Node statement : statements) {
+            statement.accept(this);
+        }
+
+        return null;
+    }
+
+    static class SplitFlowAnalyzer extends NodeVisitor {
+
+        /** Stack of visited Split nodes, deepest node first. */
+        private final Deque<SplitNode> splitStack;
+
+        /** Map of possible jump targets to containing split node */
+        private final Map<Node,SplitNode> targetNodes = new HashMap<>();
+
+        SplitFlowAnalyzer() {
+            this.splitStack = new LinkedList<>();
+        }
+
+        @Override
+        public Node enter(final LabelNode labelNode) {
+            registerJumpTarget(labelNode.getBreakNode());
+            registerJumpTarget(labelNode.getContinueNode());
+            return labelNode;
+        }
+
+        @Override
+        public Node enter(final WhileNode whileNode) {
+            registerJumpTarget(whileNode);
+            return whileNode;
+        }
+
+        @Override
+        public Node enter(final DoWhileNode doWhileNode) {
+            registerJumpTarget(doWhileNode);
+            return doWhileNode;
+        }
+
+        @Override
+        public Node enter(final ForNode forNode) {
+            registerJumpTarget(forNode);
+            return forNode;
+        }
+
+        @Override
+        public Node enter(final SwitchNode switchNode) {
+            registerJumpTarget(switchNode);
+            return switchNode;
+        }
+
+        @Override
+        public Node enter(final ReturnNode returnNode) {
+            for (final SplitNode split : splitStack) {
+                split.setHasReturn(true);
+            }
+            return returnNode;
+        }
+
+        @Override
+        public Node enter(final ContinueNode continueNode) {
+            searchJumpTarget(continueNode.getTargetNode(), continueNode.getTargetLabel());
+            return continueNode;
+        }
+
+        @Override
+        public Node enter(final BreakNode breakNode) {
+            searchJumpTarget(breakNode.getTargetNode(), breakNode.getTargetLabel());
+            return breakNode;
+        }
+
+        @Override
+        public Node enter(final SplitNode splitNode) {
+            splitStack.addFirst(splitNode);
+            return splitNode;
+        }
+
+        @Override
+        public Node leave(final SplitNode splitNode) {
+            assert splitNode == splitStack.peekFirst();
+            splitStack.removeFirst();
+            return splitNode;
+        }
+
+        /**
+         * Register the split node containing a potential jump target.
+         * @param targetNode a potential target node.
+         */
+        private void registerJumpTarget(final Node targetNode) {
+            final SplitNode splitNode = splitStack.peekFirst();
+            if (splitNode != null) {
+                targetNodes.put(targetNode, splitNode);
+            }
+        }
+
+        /**
+         * Check if a jump target is outside the current split node and its parent split nodes.
+         * @param targetNode the jump target node.
+         * @param targetLabel the jump target label.
+         */
+        private void searchJumpTarget(final Node targetNode, final MethodEmitter.Label targetLabel) {
+
+            final SplitNode targetSplit = targetNodes.get(targetNode);
+            // Note that targetSplit may be null, indicating that targetNode is in top level method.
+            // In this case we have to add the external jump target to all split nodes.
+
+            for (final SplitNode split : splitStack) {
+                if (split == targetSplit) {
+                    break;
+                }
+                final List<MethodEmitter.Label> externalTargets = split.getExternalTargets();
+                if (!externalTargets.contains(targetLabel)) {
+                    split.addExternalTarget(targetLabel);
+                }
+            }
+        }
+    }
+}
+
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Transform.java b/nashorn/src/jdk/nashorn/internal/codegen/Transform.java
new file mode 100644
index 00000000000..d250102c5df
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Transform.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.codegen;
+
+/**
+ * Code generation transform
+ */
+public interface Transform {
+    //empty
+}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/WeighNodes.java b/nashorn/src/jdk/nashorn/internal/codegen/WeighNodes.java
new file mode 100644
index 00000000000..040907dc723
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/WeighNodes.java
@@ -0,0 +1,308 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.codegen;
+
+import java.util.List;
+import java.util.Map;
+import jdk.nashorn.internal.ir.AccessNode;
+import jdk.nashorn.internal.ir.BinaryNode;
+import jdk.nashorn.internal.ir.Block;
+import jdk.nashorn.internal.ir.BreakNode;
+import jdk.nashorn.internal.ir.CallNode;
+import jdk.nashorn.internal.ir.CatchNode;
+import jdk.nashorn.internal.ir.ContinueNode;
+import jdk.nashorn.internal.ir.DoWhileNode;
+import jdk.nashorn.internal.ir.ExecuteNode;
+import jdk.nashorn.internal.ir.ForNode;
+import jdk.nashorn.internal.ir.FunctionNode;
+import jdk.nashorn.internal.ir.IdentNode;
+import jdk.nashorn.internal.ir.IfNode;
+import jdk.nashorn.internal.ir.IndexNode;
+import jdk.nashorn.internal.ir.LiteralNode;
+import jdk.nashorn.internal.ir.LiteralNode.ArrayLiteralNode;
+import jdk.nashorn.internal.ir.LiteralNode.ArrayLiteralNode.ArrayUnit;
+import jdk.nashorn.internal.ir.Node;
+import jdk.nashorn.internal.ir.PropertyNode;
+import jdk.nashorn.internal.ir.ReferenceNode;
+import jdk.nashorn.internal.ir.ReturnNode;
+import jdk.nashorn.internal.ir.RuntimeNode;
+import jdk.nashorn.internal.ir.SplitNode;
+import jdk.nashorn.internal.ir.SwitchNode;
+import jdk.nashorn.internal.ir.ThrowNode;
+import jdk.nashorn.internal.ir.TryNode;
+import jdk.nashorn.internal.ir.VarNode;
+import jdk.nashorn.internal.ir.WhileNode;
+import jdk.nashorn.internal.ir.WithNode;
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.parser.TokenType;
+
+/**
+ * Computes the "byte code" weight of an AST segment. This is used
+ * for Splitting too large class files
+ */
+public class WeighNodes extends NodeVisitor {
+    /*
+     * Weight constants.
+     */
+            static final long FUNCTION_WEIGHT  = 40;
+    private static final long ACCESS_WEIGHT    = 4;
+    private static final long ADD_WEIGHT       = 10;
+    private static final long BREAK_WEIGHT     = 1;
+    private static final long CALL_WEIGHT      = 10;
+    private static final long CATCH_WEIGHT     = 10;
+    private static final long CONTINUE_WEIGHT  = 1;
+    private static final long IF_WEIGHT        = 2;
+    private static final long LITERAL_WEIGHT   = 10;
+    private static final long LOOP_WEIGHT      = 4;
+    private static final long REFERENCE_WEIGHT = 20;
+    private static final long RETURN_WEIGHT    = 2;
+    private static final long SPLIT_WEIGHT     = 40;
+    private static final long SWITCH_WEIGHT    = 8;
+    private static final long THROW_WEIGHT     = 2;
+    private static final long VAR_WEIGHT       = 40;
+    private static final long WITH_WEIGHT      = 8;
+
+    /** Accumulated weight. */
+    private long weight;
+
+    /** Optional cache for weight of block nodes. */
+    private final Map<Node, Long> weightCache;
+
+    /*
+     * Constructor
+     *
+     * @param weightCache cache of already calculated block weights
+     */
+    private WeighNodes(final Map<Node, Long> weightCache) {
+        super(null, null);
+        this.weightCache = weightCache;
+    }
+
+    static long weigh(final Node node) {
+        final WeighNodes weighNodes = new WeighNodes(null);
+        node.accept(weighNodes);
+        return weighNodes.weight;
+    }
+
+    static long weigh(final Node node, final Map<Node, Long> weightCache) {
+        final WeighNodes weighNodes = new WeighNodes(weightCache);
+        node.accept(weighNodes);
+        return weighNodes.weight;
+    }
+
+    @Override
+    public Node leave(final AccessNode accessNode) {
+        weight += ACCESS_WEIGHT;
+        return accessNode;
+    }
+
+    @Override
+    public Node leave(final BinaryNode binaryNode) {
+        final TokenType tokenType = binaryNode.tokenType();
+
+        if (tokenType == TokenType.ADD || tokenType == TokenType.ASSIGN_ADD) {
+            weight += ADD_WEIGHT;
+        } else {
+            weight += 1;
+        }
+
+        return binaryNode;
+    }
+
+    @Override
+    public Node enter(final Block block) {
+
+        if (weightCache != null && weightCache.containsKey(block)) {
+            weight += weightCache.get(block);
+            return null;
+        }
+
+        return block;
+    }
+
+    @Override
+    public Node leave(final BreakNode breakNode) {
+        weight += BREAK_WEIGHT;
+        return breakNode;
+    }
+
+    @Override
+    public Node leave(final CallNode callNode) {
+        weight += CALL_WEIGHT;
+        return callNode;
+    }
+
+    @Override
+    public Node leave(final CatchNode catchNode) {
+        weight += CATCH_WEIGHT;
+        return catchNode;
+    }
+
+    @Override
+    public Node leave(final ContinueNode continueNode) {
+        weight += CONTINUE_WEIGHT;
+        return continueNode;
+    }
+
+    @Override
+    public Node leave(final DoWhileNode doWhileNode) {
+        weight += LOOP_WEIGHT;
+        return doWhileNode;
+    }
+
+    @Override
+    public Node leave(final ExecuteNode executeNode) {
+        return executeNode;
+    }
+
+    @Override
+    public Node leave(final ForNode forNode) {
+        weight += LOOP_WEIGHT;
+        return forNode;
+    }
+
+    @Override
+    public Node enter(final FunctionNode functionNode) {
+        final List<Node> statements = functionNode.getStatements();
+
+        for (final Node statement : statements) {
+            statement.accept(this);
+        }
+
+        return null;
+    }
+
+    @Override
+    public Node leave(final IdentNode identNode) {
+        weight += ACCESS_WEIGHT + identNode.getName().length() * 2;
+        return identNode;
+    }
+
+    @Override
+    public Node leave(final IfNode ifNode) {
+        weight += IF_WEIGHT;
+        return ifNode;
+    }
+
+    @Override
+    public Node leave(final IndexNode indexNode) {
+        weight += ACCESS_WEIGHT;
+        return indexNode;
+    }
+
+    @SuppressWarnings("rawtypes")
+    @Override
+    public Node enter(final LiteralNode literalNode) {
+        weight += LITERAL_WEIGHT;
+
+        if (literalNode instanceof ArrayLiteralNode) {
+            final ArrayLiteralNode arrayLiteralNode = (ArrayLiteralNode)literalNode;
+            final Node[]           value            = arrayLiteralNode.getValue();
+            final int[]            postsets         = arrayLiteralNode.getPostsets();
+            final List<ArrayUnit>  units            = arrayLiteralNode.getUnits();
+
+            if (units == null) {
+                for (final int postset : postsets) {
+                    final Node element = value[postset];
+
+                    if (element != null) {
+                        element.accept(this);
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        return literalNode;
+    }
+
+    @Override
+    public Node leave(final PropertyNode propertyNode) {
+        weight += LITERAL_WEIGHT;
+        return propertyNode;
+    }
+
+    @Override
+    public Node leave(final ReferenceNode referenceNode) {
+        weight += REFERENCE_WEIGHT;
+        return referenceNode;
+    }
+
+    @Override
+    public Node leave(final ReturnNode returnNode) {
+        weight += RETURN_WEIGHT;
+        return returnNode;
+    }
+
+    @Override
+    public Node leave(final RuntimeNode runtimeNode) {
+        weight += CALL_WEIGHT;
+        return runtimeNode;
+    }
+
+    @Override
+    public Node enter(final SplitNode splitNode) {
+        weight += SPLIT_WEIGHT;
+        return null;
+    }
+
+    @Override
+    public Node leave(final SwitchNode switchNode) {
+        weight += SWITCH_WEIGHT;
+        return switchNode;
+    }
+
+    @Override
+    public Node leave(final ThrowNode throwNode) {
+        weight += THROW_WEIGHT;
+        return throwNode;
+    }
+
+    @Override
+    public Node leave(final TryNode tryNode) {
+        weight += THROW_WEIGHT;
+        return tryNode;
+    }
+
+    @Override
+    public Node leave(final VarNode varNode) {
+        weight += VAR_WEIGHT;
+        return varNode;
+    }
+
+    @Override
+    public Node leave(final WhileNode whileNode) {
+        weight += LOOP_WEIGHT;
+        return whileNode;
+    }
+
+    @Override
+    public Node leave(final WithNode withNode) {
+        weight += WITH_WEIGHT;
+        return withNode;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/objects/FieldObjectCreator.java b/nashorn/src/jdk/nashorn/internal/codegen/objects/FieldObjectCreator.java
new file mode 100644
index 00000000000..9d04ca1bae9
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/objects/FieldObjectCreator.java
@@ -0,0 +1,186 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.codegen.objects;
+
+import static jdk.nashorn.internal.codegen.CompilerConstants.ARGUMENTS;
+import static jdk.nashorn.internal.codegen.CompilerConstants.constructorNoLookup;
+import static jdk.nashorn.internal.codegen.CompilerConstants.typeDescriptor;
+import static jdk.nashorn.internal.codegen.types.Type.OBJECT;
+
+import java.util.Iterator;
+import java.util.List;
+import jdk.nashorn.internal.codegen.CodeGenerator;
+import jdk.nashorn.internal.codegen.MethodEmitter;
+import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.ir.Symbol;
+import jdk.nashorn.internal.runtime.PropertyMap;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.arrays.ArrayIndex;
+
+/**
+ * Analyze an object's characteristics for appropriate code generation. This
+ * is used for functions and for objects. A field object take a set of values which
+ * to assign to the various fields in the object. This is done by the generated code
+ *
+ * @param <T> the value type for the fields being written on object creation, e.g. Node
+ * @see jdk.nashorn.internal.ir.Node
+ */
+public abstract class FieldObjectCreator<T> extends ObjectCreator {
+    /** array of corresponding values to symbols (null for no values) */
+    private final List<T> values;
+
+    /** call site flags to be used for invocations */
+    private final int     callSiteFlags;
+
+    /**
+     * Constructor
+     *
+     * @param codegen  code generator
+     * @param keys     keys for fields in object
+     * @param symbols  symbols for fields in object
+     * @param values   list of values corresponding to keys
+     */
+    public FieldObjectCreator(final CodeGenerator codegen, final List<String> keys, final List<Symbol> symbols, final List<T> values) {
+        this(codegen, keys, symbols, values, false, false);
+    }
+
+    /**
+     * Constructor
+     *
+     * @param codegen  code generator
+     * @param keys     keys for fields in object
+     * @param symbols  symbols for fields in object
+     * @param values   values (or null where no value) to be written to the fields
+     * @param isScope  is this a scope object
+     * @param isVarArg is this a vararg object
+     */
+    public FieldObjectCreator(final CodeGenerator codegen, final List<String> keys, final List<Symbol> symbols, final List<T> values, final boolean isScope, final boolean isVarArg) {
+        super(codegen, keys, symbols, isScope, isVarArg);
+        this.values        = values;
+        this.callSiteFlags = codegen.getCallSiteFlags();
+    }
+
+    /**
+     * Construct an object.
+     *
+     * @param method the method emitter
+     */
+    @Override
+    public void makeObject(final MethodEmitter method) {
+        makeMap();
+
+        method._new(getClassName()).dup(); // create instance
+        loadMap(method); //load the map
+
+        if (isScope()) {
+            method.loadScope();
+
+            if (isVarArg()) {
+                method.loadArguments();
+                method.invoke(constructorNoLookup(getClassName(), PropertyMap.class, ScriptObject.class, ARGUMENTS.type()));
+            } else {
+                method.invoke(constructorNoLookup(getClassName(), PropertyMap.class, ScriptObject.class));
+            }
+        } else {
+            method.invoke(constructorNoLookup(getClassName(), PropertyMap.class));
+        }
+
+        // Set values.
+        final Iterator<Symbol> symbolIter = symbols.iterator();
+        final Iterator<String> keyIter    = keys.iterator();
+        final Iterator<T>      valueIter  = values.iterator();
+
+        while (symbolIter.hasNext()) {
+            final Symbol symbol = symbolIter.next();
+            final String key    = keyIter.next();
+            final T      value  = valueIter.next();
+
+            if (symbol != null && value != null) {
+                final int index = ArrayIndex.getArrayIndexNoThrow(key);
+
+                if (index < 0) {
+                    putField(method, key, symbol.getFieldIndex(), value);
+                } else {
+                    putSlot(method, index, value);
+                }
+            }
+        }
+    }
+
+    /**
+     * Technique for loading an initial value. Defined by anonymous subclasses in code gen.
+     *
+     * @param value Value to load.
+     */
+    protected abstract void loadValue(T value);
+
+    /**
+     * Determine the type of a value. Defined by anonymous subclasses in code gen.
+     *
+     * @param value Value to inspect.
+     *
+     * @return Value type.
+     */
+    protected abstract Type getValueType(T value);
+
+    /**
+     * Store a value in a field of the generated class object.
+     *
+     * @param method      Script method.
+     * @param key         Property key.
+     * @param fieldIndex  Field number.
+     * @param value       Value to store.
+     */
+    private void putField(final MethodEmitter method, final String key, final int fieldIndex, final T value) {
+        method.dup();
+
+        loadValue(value);
+
+        final Type valueType = getValueType(value);
+        // for example when we have a with scope
+        if (valueType.isObject() || valueType.isBoolean()) {
+            method.convert(OBJECT);
+        }
+
+        method.convert(OBJECT);
+        method.putField(getClassName(), ObjectClassGenerator.getFieldName(fieldIndex, Type.OBJECT), typeDescriptor(Object.class));
+    }
+
+    /**
+     * Store a value in an indexed slot of a generated class object.
+     *
+     * @param method Script method.
+     * @param index  Slot index.
+     * @param value  Value to store.
+     */
+    private void putSlot(final MethodEmitter method, final int index, final T value) {
+        method.dup();
+        method.load(index);
+        loadValue(value);
+        method.dynamicSetIndex(callSiteFlags);
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/objects/FunctionObjectCreator.java b/nashorn/src/jdk/nashorn/internal/codegen/objects/FunctionObjectCreator.java
new file mode 100644
index 00000000000..31635f312fe
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/objects/FunctionObjectCreator.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.codegen.objects;
+
+import static jdk.nashorn.internal.codegen.ClassEmitter.Flag.HANDLE_STATIC;
+import static jdk.nashorn.internal.codegen.Compiler.SCRIPTOBJECT_IMPL_OBJECT;
+import static jdk.nashorn.internal.codegen.CompilerConstants.ALLOCATE;
+import static jdk.nashorn.internal.codegen.CompilerConstants.SOURCE;
+import static jdk.nashorn.internal.codegen.CompilerConstants.constructorNoLookup;
+import static jdk.nashorn.internal.codegen.CompilerConstants.methodDescriptor;
+
+import java.lang.invoke.MethodHandle;
+import java.util.EnumSet;
+import java.util.List;
+import jdk.nashorn.internal.codegen.CodeGenerator;
+import jdk.nashorn.internal.codegen.FunctionSignature;
+import jdk.nashorn.internal.codegen.MethodEmitter;
+import jdk.nashorn.internal.ir.FunctionNode;
+import jdk.nashorn.internal.ir.IdentNode;
+import jdk.nashorn.internal.ir.Symbol;
+import jdk.nashorn.internal.parser.Token;
+import jdk.nashorn.internal.parser.TokenType;
+import jdk.nashorn.internal.runtime.PropertyMap;
+import jdk.nashorn.internal.runtime.ScriptFunction;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * Analyze a function object's characteristics for appropriate code
+ * generation. This generates code for the instantiation of ScriptFunction:s
+ */
+public class FunctionObjectCreator extends ObjectCreator {
+
+    private final FunctionNode functionNode;
+
+    /**
+     * Constructor
+     *
+     * @param codegen      the code generator
+     * @param functionNode the function node to turn into a ScriptFunction implementation
+     * @param keys         initial keys for the object map
+     * @param symbols      corresponding initial symbols for object map
+     */
+    public FunctionObjectCreator(final CodeGenerator codegen, final FunctionNode functionNode, final List<String> keys, final List<Symbol> symbols) {
+        super(codegen, keys, symbols, false, false);
+        this.functionNode = functionNode;
+    }
+
+    private void loadHandle(final MethodEmitter method, final String signature) {
+    method.loadHandle(functionNode.getCompileUnit().getUnitClassName(), functionNode.getName(), signature, EnumSet.of(HANDLE_STATIC)); // function
+    }
+
+    /**
+     * Emit code for creating the object
+     *
+     * @param method the method emitter
+     */
+    @Override
+    public void makeObject(final MethodEmitter method) {
+        makeMap();
+
+        final IdentNode identNode  = functionNode.getIdent();
+        final String    signature  = new FunctionSignature(true, functionNode.needsCallee(), functionNode.getReturnType(), functionNode.isVarArg() ? null : functionNode.getParameters()).toString();
+        final long      firstToken = functionNode.getFirstToken();
+        final long      lastToken  = functionNode.getLastToken();
+        final int       position   = Token.descPosition(firstToken);
+        final int       length     = Token.descPosition(lastToken) - position + Token.descLength(lastToken);
+        final long      token      = Token.toDesc(TokenType.FUNCTION, position, length);
+
+        /*
+         * Instantiate the function object, must be referred to by name as
+         * class is not available at compile time
+         */
+        method._new(SCRIPTOBJECT_IMPL_OBJECT).dup();
+        method.load(functionNode.isAnonymous() ? "" : identNode.getName());
+        loadHandle(method, signature);
+        method.loadScope();
+        method.getStatic(compileUnit.getUnitClassName(), SOURCE.tag(), SOURCE.descriptor());
+        method.load(token);
+        method.loadHandle(getClassName(), ALLOCATE.tag(), methodDescriptor(ScriptObject.class, PropertyMap.class), EnumSet.of(HANDLE_STATIC));
+
+        /*
+         * Emit code for the correct property map for the object
+         */
+        loadMap(method);
+
+        /*
+         * Invoke the constructor
+         */
+        method.load(functionNode.needsCallee());
+        method.load(functionNode.isStrictMode());
+        method.invoke(constructorNoLookup(SCRIPTOBJECT_IMPL_OBJECT,
+                    String.class,
+                    MethodHandle.class,
+                    ScriptObject.class,
+                    Source.class,
+                    long.class,
+                    MethodHandle.class,
+                    PropertyMap.class,
+                    boolean.class,
+                    boolean.class));
+
+
+        if (functionNode.isVarArg()) {
+            method.dup();
+            method.load(functionNode.getParameters().size());
+            method.invoke(ScriptFunction.SET_ARITY);
+        }
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/objects/MapCreator.java b/nashorn/src/jdk/nashorn/internal/codegen/objects/MapCreator.java
new file mode 100644
index 00000000000..9483666bd30
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/objects/MapCreator.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.codegen.objects;
+
+import static jdk.nashorn.internal.codegen.objects.ObjectClassGenerator.OBJECT_FIELDS_ONLY;
+import static jdk.nashorn.internal.codegen.objects.ObjectClassGenerator.PRIMITIVE_TYPE;
+import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.util.ArrayList;
+import java.util.List;
+import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.ir.Symbol;
+import jdk.nashorn.internal.runtime.AccessorProperty;
+import jdk.nashorn.internal.runtime.Property;
+import jdk.nashorn.internal.runtime.PropertyMap;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.arrays.ArrayIndex;
+
+/**
+ * Class that creates PropertyMap sent to script object constructors.
+ */
+public class MapCreator {
+    /** Object structure for objects associated with this map */
+    private final Class<?> structure;
+
+    /** key set for object map */
+    private final String[] keys;
+
+    /** corresponding symbol set for object map */
+    private final Symbol[] symbols;
+
+    /**
+     * Constructor
+     *
+     * @param structure structure to generate map for (a JO$ subclass)
+     * @param keys      list of keys for map
+     * @param symbols   list of symbols for map
+     */
+    public MapCreator(final Class<?> structure, final List<String> keys, final List<Symbol> symbols) {
+        final int size   = keys.size();
+
+        this.structure = structure;
+        this.keys      = keys.toArray(new String[size]);
+        this.symbols   = symbols.toArray(new Symbol[size]);
+    }
+
+    /**
+     * Constructs a property map based on a set of fields.
+     *
+     * @param isVarArg is this a vararg object map
+     *
+     * @return New map populated with accessor properties.
+     */
+    public PropertyMap makeMap(final boolean isVarArg) {
+        final List<Property> properties = new ArrayList<>();
+
+        assert keys != null;
+
+        for (int i = 0; i < keys.length; i++) {
+            final String key    = keys[i];
+            final Symbol symbol = symbols[i];
+
+            if (symbol != null && !ArrayIndex.isIndexKey(key)) {
+                final Property property = initHandle(key, symbol.getFieldIndex(), symbol, isVarArg);
+                properties.add(property);
+            }
+        }
+
+        return PropertyMap.newMap(structure, properties);
+    }
+
+    private Property initHandle(final String key, final int fieldIndex, final Symbol symbol, final boolean isVarArg) {
+        assert symbol != null;
+        final boolean isParam = symbol.isParam();
+
+        final String fieldNameObject    = ObjectClassGenerator.getFieldName(fieldIndex, Type.OBJECT);
+        final String fieldNamePrimitive = ObjectClassGenerator.getFieldName(fieldIndex, ObjectClassGenerator.PRIMITIVE_TYPE);
+
+        MethodHandle primitiveGetter = null;
+        MethodHandle primitiveSetter = null;
+        MethodHandle objectGetter;
+        MethodHandle objectSetter;
+
+        final MethodHandles.Lookup lookup = MethodHandles.lookup();
+
+        if (isParam && isVarArg) {
+            final MethodHandle arguments   = MH.getter(MethodHandles.lookup(), structure, "arguments", Object.class);
+            final MethodHandle argumentsSO = MH.asType(arguments, arguments.type().changeReturnType(ScriptObject.class));
+            objectGetter = MH.insertArguments(MH.filterArguments(ScriptObject.GET_ARGUMENT.methodHandle(), 0, argumentsSO), 1, fieldIndex);
+            objectSetter = MH.insertArguments(MH.filterArguments(ScriptObject.SET_ARGUMENT.methodHandle(), 0, argumentsSO), 1, fieldIndex);
+        } else {
+            objectGetter = MH.getter(lookup, structure, fieldNameObject, Type.OBJECT.getTypeClass());
+            objectSetter = MH.setter(lookup, structure, fieldNameObject, Type.OBJECT.getTypeClass());
+            if (!OBJECT_FIELDS_ONLY) {
+                primitiveGetter = MH.getter(lookup, structure, fieldNamePrimitive, PRIMITIVE_TYPE.getTypeClass());
+                primitiveSetter = MH.setter(lookup, structure, fieldNamePrimitive, PRIMITIVE_TYPE.getTypeClass());
+            }
+        }
+
+        return new AccessorProperty(key, getPropertyFlags(symbol, isVarArg), objectGetter, objectSetter, primitiveGetter, primitiveSetter);
+    }
+
+    /**
+     * Compute property flags given local state of a field. Maybe be overridden and extended,
+     * as is the case in {@link ObjectMapCreator}
+     *
+     * @param symbol   symbol to check
+     * @param isVarArg is this a vararg
+     *
+     * @return flags to use for fields
+     */
+    protected int getPropertyFlags(final Symbol symbol, final boolean isVarArg) {
+        final boolean isParam = symbol.isParam();
+        int flags = 0;
+
+        if (isParam || isVarArg) {
+            flags |= Property.IS_ALWAYS_OBJECT;
+            if (isParam) {
+                flags |= Property.IS_PARAMETER;
+            }
+        }
+
+        if (symbol.isScope()) {
+            flags |= Property.NOT_CONFIGURABLE;
+        }
+
+        if (symbol.canBePrimitive()) {
+            flags |= Property.CAN_BE_PRIMITIVE;
+        }
+
+        if (symbol.canBeUndefined()) {
+            flags |= Property.CAN_BE_UNDEFINED;
+        }
+
+        return flags;
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectClassGenerator.java b/nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectClassGenerator.java
new file mode 100644
index 00000000000..881a8337459
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectClassGenerator.java
@@ -0,0 +1,762 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.codegen.objects;
+
+import static jdk.nashorn.internal.codegen.Compiler.SCRIPTS_PACKAGE;
+import static jdk.nashorn.internal.codegen.CompilerConstants.ALLOCATE;
+import static jdk.nashorn.internal.codegen.CompilerConstants.INIT_ARGUMENTS;
+import static jdk.nashorn.internal.codegen.CompilerConstants.INIT_SCOPE;
+import static jdk.nashorn.internal.codegen.CompilerConstants.JS_OBJECT_PREFIX;
+import static jdk.nashorn.internal.codegen.CompilerConstants.MAP;
+import static jdk.nashorn.internal.codegen.CompilerConstants.THIS;
+import static jdk.nashorn.internal.codegen.CompilerConstants.className;
+import static jdk.nashorn.internal.codegen.CompilerConstants.constructorNoLookup;
+import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import jdk.nashorn.internal.codegen.ClassEmitter;
+import jdk.nashorn.internal.codegen.ClassEmitter.Flag;
+import jdk.nashorn.internal.codegen.MethodEmitter;
+import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.runtime.AccessorProperty;
+import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.runtime.DebugLogger;
+import jdk.nashorn.internal.runtime.FunctionScope;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.PropertyMap;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
+import jdk.nashorn.internal.runtime.options.Options;
+
+/**
+ * Generates the ScriptObject subclass structure with fields for a user objects.
+ */
+public final class ObjectClassGenerator {
+
+    /**
+     * Marker for scope parameters.
+     */
+    public static final String SCOPE_MARKER = "P";
+
+    /**
+     * Debug field logger
+     * Should we print debugging information for fields when they are generated and getters/setters are called?
+     */
+    public static final DebugLogger LOG          = new DebugLogger("fields", "nashorn.fields.debug");
+
+    /**
+     * is field debugging enabled. Several modules in codegen and properties use this, hence
+     * public access.
+     */
+    public static final boolean     DEBUG_FIELDS = LOG.isEnabled();
+
+    /**
+     * Should the runtime only use java.lang.Object slots for fields? If this is false, the representation
+     * will be a primitive 64-bit long value used for all primitives and a java.lang.Object for references.
+     * This introduces a larger number of method handles in the system, as we need to have different getters
+     * and setters for the different fields. Currently this introduces significant overhead in Hotspot.
+     *
+     * This is engineered to plug into the TaggedArray implementation, when it's done.
+     */
+    public static final boolean OBJECT_FIELDS_ONLY = !Options.getBooleanProperty("nashorn.fields.dual");
+
+    /** The field types in the system */
+    private static final List<Type> FIELD_TYPES = new LinkedList<>();
+
+    /** What type is the primitive type in dual representation */
+    public static final Type PRIMITIVE_TYPE = Type.LONG;
+
+    /**
+     * The list of field types that we support - one type creates one field. This is currently either
+     * LONG + OBJECT or just OBJECT for classic mode.
+     */
+    static {
+        if (!OBJECT_FIELDS_ONLY) {
+            System.err.println("WARNING!!! Running with primitive fields - there is untested functionality!");
+            FIELD_TYPES.add(PRIMITIVE_TYPE);
+        }
+        FIELD_TYPES.add(Type.OBJECT);
+    }
+
+    /** The context */
+    private final Context context;
+
+    /**
+     * The list of available accessor types in width order. This order is used for type guesses narrow->wide
+     *  in the dual--fields world
+     */
+    public static final List<Type> ACCESSOR_TYPES = Collections.unmodifiableList(
+            Arrays.asList(
+                Type.INT,
+                Type.LONG,
+                Type.NUMBER,
+                Type.OBJECT));
+
+    //these are hard coded for speed and so that we can switch on them
+    private static final int TYPE_INT_INDEX    = 0; //getAccessorTypeIndex(int.class);
+    private static final int TYPE_LONG_INDEX   = 1; //getAccessorTypeIndex(long.class);
+    private static final int TYPE_DOUBLE_INDEX = 2; //getAccessorTypeIndex(double.class);
+    private static final int TYPE_OBJECT_INDEX = 3; //getAccessorTypeIndex(Object.class);
+
+    /**
+     * Constructor
+     *
+     * @param context a context
+     */
+    public ObjectClassGenerator(final Context context) {
+        this.context = context;
+        assert context != null;
+    }
+
+    /**
+     * Given a type of an accessor, return its index in [0..getNumberOfAccessorTypes())
+     *
+     * @param type the type
+     *
+     * @return the accessor index, or -1 if no accessor of this type exists
+     */
+    public static int getAccessorTypeIndex(final Type type) {
+        return getAccessorTypeIndex(type.getTypeClass());
+    }
+
+    /**
+     * Given a class of an accessor, return its index in [0..getNumberOfAccessorTypes())
+     *
+     * Note that this is hardcoded with respect to the dynamic contents of the accessor
+     * types array for speed. Hotspot got stuck with this as 5% of the runtime in
+     * a benchmark when it looped over values and increased an index counter. :-(
+     *
+     * @param type the type
+     *
+     * @return the accessor index, or -1 if no accessor of this type exists
+     */
+    public static int getAccessorTypeIndex(final Class<?> type) {
+        if (type == int.class) {
+            return 0;
+        } else if (type == long.class) {
+            return 1;
+        } else if (type == double.class) {
+            return 2;
+        } else if (!type.isPrimitive()) {
+            return 3;
+        }
+        return -1;
+    }
+
+    /**
+     * Return the number of accessor types available.
+     *
+     * @return number of accessor types in system
+     */
+    public static int getNumberOfAccessorTypes() {
+        return ACCESSOR_TYPES.size();
+    }
+
+    /**
+     * Return the accessor type based on its index in [0..getNumberOfAccessorTypes())
+     * Indexes are ordered narrower->wider / optimistic->pessimistic. Invalidations always
+     * go to a type of higher index
+     *
+     * @param index accessor type index
+     *
+     * @return a type corresponding to the index.
+     */
+
+    public static Type getAccessorType(final int index) {
+        return ACCESSOR_TYPES.get(index);
+    }
+
+    /**
+     * Returns the class name for JavaScript objects with fieldCount fields.
+     *
+     * @param fieldCount Number of fields to allocate.
+     *
+     * @return The class name.
+     */
+    public static String getClassName(final int fieldCount) {
+        return fieldCount != 0 ? SCRIPTS_PACKAGE + '/' + JS_OBJECT_PREFIX.tag() + fieldCount :
+                                 SCRIPTS_PACKAGE + '/' + JS_OBJECT_PREFIX.tag();
+    }
+
+    /**
+     * Returns the class name for JavaScript scope with fieldCount fields and
+     * paramCount parameters.
+     *
+     * @param fieldCount Number of fields to allocate.
+     * @param paramCount Number of parameters to allocate
+     *
+     * @return The class name.
+     */
+    public static String getClassName(final int fieldCount, final int paramCount) {
+        return SCRIPTS_PACKAGE + '/' + JS_OBJECT_PREFIX.tag() + fieldCount + SCOPE_MARKER + paramCount;
+    }
+
+    /**
+     * Returns the name of a field based on number and type.
+     *
+     * @param fieldIndex Ordinal of field.
+     * @param type       Type of field.
+     *
+     * @return The field name.
+     */
+    public static String getFieldName(final int fieldIndex, final Type type) {
+        return type.getDescriptor().substring(0, 1) + fieldIndex;
+    }
+
+    /**
+     * In the world of Object fields, we also have no undefined SwitchPoint, to reduce as much potential
+     * MethodHandle overhead as possible. In that case, we explicitly need to assign undefined to fields
+     * when we initialize them.
+     *
+     * @param init       constructor to generate code in
+     * @param className  name of class
+     * @param fieldNames fields to initialize to undefined, where applicable
+     */
+    private static void initializeToUndefined(final MethodEmitter init, final String className, final List<String> fieldNames) {
+        if (fieldNames.isEmpty()) {
+            return;
+        }
+
+        // always initialize fields to undefined, even with --dual-fields. Then it's ok to
+        // remember things like "widest set type" in properties, and if it's object, don't
+        // add any special "return undefined" getters, saving an invalidation
+        init.load(Type.OBJECT, THIS.slot());
+        init.loadUndefined(Type.OBJECT);
+
+        final Iterator<String> iter = fieldNames.iterator();
+        while (iter.hasNext()) {
+            final String fieldName = iter.next();
+            if (iter.hasNext()) {
+                init.dup2();
+            }
+            init.putField(className, fieldName, Type.OBJECT.getDescriptor());
+        }
+    }
+
+    /**
+     * Generate the byte codes for a JavaScript object class or scope.
+     * Class name is a function of number of fields and number of param
+     * fields
+     *
+     * @param descriptor Descriptor pulled from class name.
+     *
+     * @return Byte codes for generated class.
+     */
+    public byte[] generate(final String descriptor) {
+        final String[] counts     = descriptor.split(SCOPE_MARKER);
+        final int      fieldCount = Integer.valueOf(counts[0]);
+
+        if (counts.length == 1) {
+            return generate(fieldCount);
+        }
+
+        final int paramCount = Integer.valueOf(counts[1]);
+
+        return generate(fieldCount, paramCount);
+    }
+
+    /**
+     * Generate the byte codes for a JavaScript object class with fieldCount fields.
+     *
+     * @param fieldCount Number of fields in the JavaScript object.
+     *
+     * @return Byte codes for generated class.
+     */
+    public byte[] generate(final int fieldCount) {
+        final String       className    = getClassName(fieldCount);
+        final String       superName    = className(ScriptObject.class);
+        final ClassEmitter classEmitter = newClassEmitter(className, superName);
+        final List<String> initFields   = addFields(classEmitter, fieldCount);
+
+        final MethodEmitter init = newInitMethod(classEmitter);
+        initializeToUndefined(init, className, initFields);
+        init.returnVoid();
+        init.end();
+
+        newEmptyInit(classEmitter, className);
+        newAllocate(classEmitter, className);
+
+        return toByteArray(classEmitter);
+    }
+
+    /**
+     * Generate the byte codes for a JavaScript scope class with fieldCount fields
+     * and paramCount parameters.
+     *
+     * @param fieldCount Number of fields in the JavaScript scope.
+     * @param paramCount Number of parameters in the JavaScript scope
+     * .
+     * @return Byte codes for generated class.
+     */
+    public byte[] generate(final int fieldCount, final int paramCount) {
+        final String className          = getClassName(fieldCount, paramCount);
+        final String superName          = className(FunctionScope.class);
+        final ClassEmitter classEmitter = newClassEmitter(className, superName);
+        final List<String> initFields   = addFields(classEmitter, fieldCount);
+
+        final MethodEmitter init = newInitScopeMethod(classEmitter);
+        initializeToUndefined(init, className, initFields);
+        init.returnVoid();
+        init.end();
+
+        final MethodEmitter initWithArguments = newInitScopeWithArgumentsMethod(classEmitter);
+        initializeToUndefined(initWithArguments, className, initFields);
+        initWithArguments.returnVoid();
+        initWithArguments.end();
+
+        return toByteArray(classEmitter);
+    }
+
+    /**
+     * Generates the needed fields.
+     *
+     * @param classEmitter Open class emitter.
+     * @param fieldCount   Number of fields.
+     *
+     * @return List fields that need to be initialized.
+     */
+    private static List<String> addFields(final ClassEmitter classEmitter, final int fieldCount) {
+        final List<String> initFields = new LinkedList<>();
+
+        for (int i = 0; i < fieldCount; i++) {
+            for (final Type type : FIELD_TYPES) {
+                final String fieldName = getFieldName(i, type);
+                classEmitter.field(fieldName, type.getTypeClass());
+
+                if (type == Type.OBJECT) {
+                    initFields.add(fieldName);
+                }
+            }
+        }
+
+        return initFields;
+    }
+
+    /**
+     * Allocate and initialize a new class emitter.
+     *
+     * @param className Name of JavaScript class.
+     *
+     * @return Open class emitter.
+     */
+    private ClassEmitter newClassEmitter(final String className, final String superName) {
+        final ClassEmitter classEmitter = new ClassEmitter(context, className, superName);
+        classEmitter.begin();
+
+        return classEmitter;
+    }
+
+    /**
+     * Allocate and initialize a new <init> method.
+     *
+     * @param classEmitter  Open class emitter.
+     *
+     * @return Open method emitter.
+     */
+    private static MethodEmitter newInitMethod(final ClassEmitter classEmitter) {
+        final MethodEmitter init = classEmitter.init(PropertyMap.class);
+        init.begin();
+        init.load(Type.OBJECT, THIS.slot());
+        init.load(Type.OBJECT, MAP.slot());
+        init.invoke(constructorNoLookup(ScriptObject.class, PropertyMap.class));
+
+        return init;
+    }
+
+    /**
+     * Allocate and initialize a new <init> method for scopes.
+     * @param classEmitter  Open class emitter.
+     * @return Open method emitter.
+     */
+    private static MethodEmitter newInitScopeMethod(final ClassEmitter classEmitter) {
+        final MethodEmitter init = classEmitter.init(PropertyMap.class, ScriptObject.class);
+        init.begin();
+        init.load(Type.OBJECT, THIS.slot());
+        init.load(Type.OBJECT, MAP.slot());
+        init.load(Type.OBJECT, INIT_SCOPE.slot());
+        init.invoke(constructorNoLookup(FunctionScope.class, PropertyMap.class, ScriptObject.class));
+
+        return init;
+    }
+
+    /**
+     * Allocate and initialize a new <init> method for scopes with arguments.
+     * @param classEmitter  Open class emitter.
+     * @return Open method emitter.
+     */
+    private static MethodEmitter newInitScopeWithArgumentsMethod(final ClassEmitter classEmitter) {
+        final MethodEmitter init = classEmitter.init(PropertyMap.class, ScriptObject.class, Object.class);
+        init.begin();
+        init.load(Type.OBJECT, THIS.slot());
+        init.load(Type.OBJECT, MAP.slot());
+        init.load(Type.OBJECT, INIT_SCOPE.slot());
+        init.load(Type.OBJECT, INIT_ARGUMENTS.slot());
+        init.invoke(constructorNoLookup(FunctionScope.class, PropertyMap.class, ScriptObject.class, Object.class));
+
+        return init;
+    }
+
+    /**
+     * Add an empty <init> method to the JavaScript class.
+     *
+     * @param classEmitter Open class emitter.
+     * @param className    Name of JavaScript class.
+     */
+    private static void newEmptyInit(final ClassEmitter classEmitter, final String className) {
+        final MethodEmitter emptyInit = classEmitter.init();
+        emptyInit.begin();
+        emptyInit.load(Type.OBJECT, THIS.slot());
+        emptyInit.loadNull();
+        emptyInit.invoke(constructorNoLookup(className, PropertyMap.class));
+        emptyInit.returnVoid();
+        emptyInit.end();
+    }
+
+    /**
+     * Add an empty <init> method to the JavaScript class.
+     *
+     * @param classEmitter Open class emitter.
+     * @param className    Name of JavaScript class.
+     */
+    private static void newAllocate(final ClassEmitter classEmitter, final String className) {
+        final MethodEmitter allocate = classEmitter.method(EnumSet.of(Flag.PUBLIC, Flag.STATIC), ALLOCATE.tag(), ScriptObject.class, PropertyMap.class);
+        allocate.begin();
+        allocate._new(className);
+        allocate.dup();
+        allocate.load(Type.typeFor(PropertyMap.class), 0);
+        allocate.invoke(constructorNoLookup(className, PropertyMap.class));
+        allocate._return();
+        allocate.end();
+    }
+
+    /**
+     * Collects the byte codes for a generated JavaScript class.
+     *
+     * @param classEmitter Open class emitter.
+     * @return Byte codes for the class.
+     */
+    private byte[] toByteArray(final ClassEmitter classEmitter) {
+        classEmitter.end();
+
+        final byte[] code = classEmitter.toByteArray();
+
+        if (context != null && context._print_code) {
+            ClassEmitter.disassemble(context, code);
+        }
+
+        if (context != null && context._verify_code) {
+            ClassEmitter.verify(context, code);
+        }
+
+        return code;
+    }
+
+    /** Double to long bits, used with --dual-fields for primitive double values */
+    private static final MethodHandle PACK_DOUBLE =
+        MH.explicitCastArguments(MH.findStatic(MethodHandles.publicLookup(), Double.class, "doubleToRawLongBits", MH.type(long.class, double.class)), MH.type(long.class, double.class));
+
+    /** double bits to long, used with --dual-fields for primitive double values */
+    private static MethodHandle UNPACK_DOUBLE =
+        MH.findStatic(MethodHandles.publicLookup(), Double.class, "longBitsToDouble", MH.type(double.class, long.class));
+
+    /** object conversion quickies with JS semantics - used for return value and parameter filter */
+    private static MethodHandle[] CONVERT_OBJECT = {
+        JSType.TO_INT32.methodHandle(),
+        JSType.TO_UINT32.methodHandle(),
+        JSType.TO_NUMBER.methodHandle(),
+        null
+    };
+
+    /**
+     * Given a primitiveGetter (optional for non dual fields) and an objectSetter that retrieve
+     * the primitive and object version of a field respectively, return one with the correct
+     * method type and the correct filters. For example, if the value is stored as a double
+     * and we want an Object getter, in the dual fields world we'd pick the primitiveGetter,
+     * which reads a long, use longBitsToDouble on the result to unpack it, and then change the
+     * return type to Object, boxing it. In the objects only world there are only object fields,
+     * primtives are boxed when asked for them and we don't need to bother with primitive encoding
+     * (or even undefined, which if forType==null) representation, so we just return whatever is
+     * in the object field. The object field is always initiated to Undefined, so here, where we have
+     * the representation for Undefined in all our bits, this is not a problem.
+     * <p>
+     * Representing undefined in a primitive is hard, for an int there aren't enough bits, for a long
+     * we could limit the width of a representation, and for a double (as long as it is stored as long,
+     * as all NaNs will turn into QNaN on ia32, which is one bit pattern, we should use a special NaN).
+     * Naturally we could have special undefined values for all types which mean "go look in a wider field",
+     * but the guards needed on every getter took too much time.
+     * <p>
+     * To see how this is used, look for example in {@link AccessorProperty#getGetter}
+     * <p>
+     * @param forType         representation of the underlying type in the field, null if undefined
+     * @param type            type to retrieve it as
+     * @param primitiveGetter getter to read the primitive version of this field (null if Objects Only)
+     * @param objectGetter    getter to read the object version of this field
+     *
+     * @return getter for the given representation that returns the given type
+     */
+    public static MethodHandle createGetter(final Class<?> forType, final Class<?> type, final MethodHandle primitiveGetter, final MethodHandle objectGetter) {
+        final int fti = forType == null ? -1 : getAccessorTypeIndex(forType);
+        final int ti  = getAccessorTypeIndex(type);
+
+        if (fti == TYPE_OBJECT_INDEX || OBJECT_FIELDS_ONLY) {
+            if (ti == TYPE_OBJECT_INDEX) {
+                return objectGetter;
+            }
+
+            return MH.filterReturnValue(objectGetter, CONVERT_OBJECT[ti]);
+        }
+
+        assert !OBJECT_FIELDS_ONLY;
+        if (forType == null) {
+            return GET_UNDEFINED[ti];
+        }
+
+        final MethodType pmt = primitiveGetter.type();
+
+        switch (fti) {
+        case TYPE_INT_INDEX:
+        case TYPE_LONG_INDEX:
+            switch (ti) {
+            case TYPE_INT_INDEX:
+                //get int while an int, truncating cast of long value
+                return MH.explicitCastArguments(primitiveGetter, pmt.changeReturnType(int.class));
+            case TYPE_LONG_INDEX:
+                return primitiveGetter;
+            default:
+                return MH.asType(primitiveGetter, pmt.changeReturnType(type));
+            }
+        case TYPE_DOUBLE_INDEX:
+            final MethodHandle getPrimitiveAsDouble = MH.filterReturnValue(primitiveGetter, UNPACK_DOUBLE);
+            switch (ti) {
+            case TYPE_INT_INDEX:
+            case TYPE_LONG_INDEX:
+                return MH.explicitCastArguments(getPrimitiveAsDouble, pmt.changeReturnType(type));
+            case TYPE_DOUBLE_INDEX:
+                return getPrimitiveAsDouble;
+            default:
+                return MH.asType(getPrimitiveAsDouble, pmt.changeReturnType(Object.class));
+            }
+        default:
+            assert false;
+            return null;
+        }
+    }
+
+    private static final MethodHandle IS_TYPE_GUARD = findOwnMH("isType", boolean.class, Class.class, Object.class);
+
+    @SuppressWarnings("unused")
+    private static boolean isType(final Class<?> boxedForType, final Object x) {
+        return x.getClass() == boxedForType;
+    }
+
+    private static Class<? extends Number> getBoxedType(final Class<?> forType) {
+        if (forType == int.class) {
+            return Integer.class;
+        }
+
+        if (forType == long.class) {
+            return Long.class;
+        }
+
+        if (forType == double.class) {
+            return Double.class;
+        }
+
+        assert false;
+        return null;
+    }
+
+    /**
+     * If we are setting boxed types (because the compiler couldn't determine which they were) to
+     * a primitive field, we can reuse the primitive field getter, as long as we are setting an element
+     * of the same boxed type as the primitive type representation
+     *
+     * @param forType           the current type
+     * @param primitiveSetter   primitive setter for the current type with an element of the current type
+     * @param objectSetter      the object setter
+     *
+     * @return method handle that checks if the element to be set is of the currenttype, even though it's boxed
+     *  and instead of using the generic object setter, that would blow up the type and invalidate the map,
+     *  unbox it and call the primitive setter instead
+     */
+    public static MethodHandle createGuardBoxedPrimitiveSetter(final Class<?> forType, final MethodHandle primitiveSetter, final MethodHandle objectSetter) {
+        final Class<? extends Number> boxedForType = getBoxedType(forType);
+        //object setter that checks for primitive if current type is primitive
+
+        return MH.guardWithTest(
+            MH.insertArguments(
+                MH.dropArguments(
+                    IS_TYPE_GUARD,
+                    1,
+                    Object.class),
+                0,
+                boxedForType),
+                MH.asType(
+                    primitiveSetter,
+                    objectSetter.type()),
+                objectSetter);
+    }
+
+    /**
+     * This is similar to the {@link ObjectClassGenerator#createGetter} function. Performs
+     * the necessary operations to massage a setter operand of type {@code type} to
+     * fit into the primitive field (if primitive and dual fields is enabled) or into
+     * the object field (box if primitive and dual fields is disabled)
+     *
+     * @param forType         representation of the underlying object
+     * @param type            representation of field to write, and setter signature
+     * @param primitiveSetter setter that writes to the primitive field (null if Objects Only)
+     * @param objectSetter    setter that writes to the object field
+     *
+     * @return the setter for the given representation that takes a {@code type}
+     */
+    public static MethodHandle createSetter(final Class<?> forType, final Class<?> type, final MethodHandle primitiveSetter, final MethodHandle objectSetter) {
+        assert forType != null;
+
+        final int fti = getAccessorTypeIndex(forType);
+        final int ti  = getAccessorTypeIndex(type);
+
+        if (fti == TYPE_OBJECT_INDEX || OBJECT_FIELDS_ONLY) {
+            if (ti == TYPE_OBJECT_INDEX) {
+                return objectSetter;
+            }
+
+            return MH.asType(objectSetter, objectSetter.type().changeParameterType(1, type));
+        }
+
+        assert !OBJECT_FIELDS_ONLY;
+
+        final MethodType pmt = primitiveSetter.type();
+
+        switch (fti) {
+        case TYPE_INT_INDEX:
+        case TYPE_LONG_INDEX:
+            switch (ti) {
+            case TYPE_INT_INDEX:
+                return MH.asType(primitiveSetter, pmt.changeParameterType(1, int.class));
+            case TYPE_LONG_INDEX:
+                return primitiveSetter;
+            case TYPE_DOUBLE_INDEX:
+                return MH.filterArguments(primitiveSetter, 1, PACK_DOUBLE);
+            default:
+                return objectSetter;
+            }
+        case TYPE_DOUBLE_INDEX:
+            if (ti == TYPE_OBJECT_INDEX) {
+                return objectSetter;
+            }
+            return MH.asType(MH.filterArguments(primitiveSetter, 1, PACK_DOUBLE), pmt.changeParameterType(1, type));
+        default:
+            assert false;
+            return null;
+        }
+    }
+
+    //
+    // Provide generic getters and setters for undefined types. If a type is undefined, all
+    // and marshals the set to the correct setter depending on the type of the value being set.
+    // Note that there are no actual undefined versions of int, long and double in JavaScript,
+    // but executing toInt32, toLong and toNumber always returns a working result, 0, 0L or NaN
+    //
+
+    /** The value of Undefined cast to an int32 */
+    public static final int    UNDEFINED_INT    = 0;
+    /** The value of Undefined cast to a long */
+    public static final long   UNDEFINED_LONG   = 0L;
+    /** The value of Undefined cast to a double */
+    public static final double UNDEFINED_DOUBLE = Double.NaN;
+
+    /**
+     * Compute type name for correct undefined getter
+     * @param type the type
+     * @return name of getter
+     */
+    private static String typeName(final Type type) {
+        String name = type.getTypeClass().getName();
+        final int dot = name.lastIndexOf('.');
+        if (dot != -1) {
+            name = name.substring(dot + 1);
+        }
+        return Character.toUpperCase(name.charAt(0)) + name.substring(1);
+    }
+
+    /**
+     * Handles for undefined getters of the different types
+     */
+    private static final MethodHandle[] GET_UNDEFINED = new MethodHandle[ObjectClassGenerator.getNumberOfAccessorTypes()];
+
+    /**
+     * Used to wrap getters for undefined values, where this matters. Currently only in dual fields.
+     * If an object starts out as undefined it needs special getters until it has been assigned
+     * something the first time
+     *
+     * @param returnType type to cast the undefined to
+     *
+     * @return undefined as returnType
+     */
+    public static MethodHandle getUndefined(final Class<?> returnType) {
+        return GET_UNDEFINED[ObjectClassGenerator.getAccessorTypeIndex(returnType)];
+    }
+
+    static {
+        int pos = 0;
+        for (final Type type : ACCESSOR_TYPES) {
+            GET_UNDEFINED[pos++] = findOwnMH("getUndefined" + typeName(type), type.getTypeClass(), Object.class);
+        }
+    }
+
+    @SuppressWarnings("unused")
+    private static int getUndefinedInt(final Object obj) {
+        return UNDEFINED_INT;
+    }
+
+    @SuppressWarnings("unused")
+    private static long getUndefinedLong(final Object obj) {
+        return UNDEFINED_LONG;
+    }
+
+    @SuppressWarnings("unused")
+    private static double getUndefinedDouble(final Object obj) {
+        return UNDEFINED_DOUBLE;
+    }
+
+    @SuppressWarnings("unused")
+    private static Object getUndefinedObject(final Object obj) {
+        return ScriptRuntime.UNDEFINED;
+    }
+
+    private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
+        return MH.findStatic(MethodHandles.lookup(), ObjectClassGenerator.class, name, MH.type(rtype, types));
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectCreator.java b/nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectCreator.java
new file mode 100644
index 00000000000..c812bb7fc3f
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectCreator.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.codegen.objects;
+
+import java.util.List;
+import jdk.nashorn.internal.codegen.CodeGenerator;
+import jdk.nashorn.internal.codegen.CompileUnit;
+import jdk.nashorn.internal.codegen.Compiler;
+import jdk.nashorn.internal.codegen.MethodEmitter;
+import jdk.nashorn.internal.ir.Symbol;
+import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.runtime.PropertyMap;
+
+/**
+ * Base class for object creation code generation.
+ */
+public abstract class ObjectCreator {
+
+    /** Compile unit for this ObjectCreator, see CompileUnit */
+    protected final CompileUnit   compileUnit;
+
+    /** List of keys to initiate in this ObjectCreator */
+    protected final List<String>  keys;
+
+    /** List of symbols to initiate in this ObjectCreator */
+    protected final List<Symbol>  symbols;
+
+    /** Code generator */
+    protected final CodeGenerator codegen;
+
+    private   final boolean       isScope;
+    private   final boolean       isVarArg;
+    private         int           fieldCount;
+    private         int           paramCount;
+    private         String        fieldObjectClassName;
+    private         Class<?>      fieldObjectClass;
+    private         PropertyMap   propertyMap;
+
+    /**
+     * Constructor
+     *
+     * @param codegen  the code generator
+     * @param keys     the keys
+     * @param symbols  the symbols corresponding to keys, same index
+     * @param isScope  is this object scope
+     * @param isVarArg is this object var arg
+     */
+    protected ObjectCreator(final CodeGenerator codegen, final List<String> keys, final List<Symbol> symbols, final boolean isScope, final boolean isVarArg) {
+        this.codegen       = codegen;
+        this.compileUnit   = codegen.getCurrentCompileUnit();
+        this.keys          = keys;
+        this.symbols       = symbols;
+        this.isScope       = isScope;
+        this.isVarArg      = isVarArg;
+
+        countFields();
+        findClass();
+    }
+
+    /**
+     * Tally the number of fields and parameters.
+     */
+    private void countFields() {
+        for (final Symbol symbol : this.symbols) {
+            if (symbol != null) {
+                if (isVarArg() && symbol.isParam()) {
+                    symbol.setFieldIndex(paramCount++);
+                } else {
+                    symbol.setFieldIndex(fieldCount++);
+                }
+            }
+        }
+    }
+
+    /**
+     * Locate (or indirectly create) the object container class.
+     */
+    private void findClass() {
+        fieldObjectClassName = isScope() ?
+            ObjectClassGenerator.getClassName(fieldCount, paramCount) :
+            ObjectClassGenerator.getClassName(fieldCount);
+
+        try {
+            this.fieldObjectClass = Context.forStructureClass(Compiler.binaryName(fieldObjectClassName));
+        } catch (final ClassNotFoundException e) {
+            throw new AssertionError("Nashorn has encountered an internal error.  Structure can not be created.");
+        }
+    }
+
+    /**
+     * Generate code for making the object.
+     * @param method Script method.
+     */
+    public abstract void makeObject(final MethodEmitter method);
+
+    /**
+     * Create a new MapCreator
+     * @param clazz type of MapCreator
+     * @return map creator instantiated by type
+     */
+    protected MapCreator newMapCreator(final Class<?> clazz) {
+        return new MapCreator(clazz, keys, symbols);
+    }
+
+    /**
+     * Construct the property map appropriate for the object.
+     */
+    protected void makeMap() {
+        if (keys.isEmpty()) { //empty map
+            propertyMap = PropertyMap.newMap(fieldObjectClass);
+            return;
+        }
+
+        propertyMap = newMapCreator(fieldObjectClass).makeMap(isVarArg());
+    }
+
+    /**
+     * Emit the correct map for the object.
+     * @param method method emitter
+     * @return the method emitter
+     */
+    protected MethodEmitter loadMap(final MethodEmitter method) {
+        codegen.loadConstant(propertyMap);
+        return method;
+    }
+
+    /**
+     * Get the class name for the object class,
+     * e.g. {@code com.nashorn.oracle.scripts.JO$2P0}
+     *
+     * @return script class name
+     */
+    public String getClassName() {
+        return fieldObjectClassName;
+    }
+
+    /**
+     * Is this a scope object
+     * @return true if scope
+     */
+    protected boolean isScope() {
+        return isScope;
+    }
+
+    /**
+     * Is this a vararg object
+     * @return true if vararg
+     */
+    protected boolean isVarArg() {
+        return isVarArg;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectMapCreator.java b/nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectMapCreator.java
new file mode 100644
index 00000000000..9da97241f58
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectMapCreator.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.codegen.objects;
+
+import java.util.List;
+import jdk.nashorn.internal.ir.Symbol;
+import jdk.nashorn.internal.runtime.Property;
+
+/**
+ * This map creator is used to guarantee that all properties start out as
+ * object types. Only semantically significant in the -Dnashorn.fields.dual=true world,
+ * where we want to avoid invalidation upon initialization e.g. for var x = {a:"str"};
+ */
+
+public class ObjectMapCreator extends MapCreator {
+    /**
+     * Constructor
+     *
+     * @param structure structure for object class
+     * @param keys      keys in object
+     * @param symbols   symbols in object corresponding to keys
+     */
+    public ObjectMapCreator(final Class<?> structure, final List<String> keys, final List<Symbol> symbols) {
+        super(structure, keys, symbols);
+    }
+
+    @Override
+    protected int getPropertyFlags(final Symbol symbol, final boolean isVarArg) {
+        return super.getPropertyFlags(symbol, isVarArg) | Property.IS_ALWAYS_OBJECT;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/ArrayType.java b/nashorn/src/jdk/nashorn/internal/codegen/types/ArrayType.java
new file mode 100644
index 00000000000..d6e477b7385
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/types/ArrayType.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.codegen.types;
+
+import static jdk.internal.org.objectweb.asm.Opcodes.AALOAD;
+import static jdk.internal.org.objectweb.asm.Opcodes.AASTORE;
+import static jdk.internal.org.objectweb.asm.Opcodes.ALOAD;
+import static jdk.internal.org.objectweb.asm.Opcodes.ANEWARRAY;
+import static jdk.internal.org.objectweb.asm.Opcodes.ARRAYLENGTH;
+
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+
+/**
+ * This is an array type, i.e. OBJECT_ARRAY, NUMBER_ARRAY.
+ */
+public class ArrayType extends ObjectType implements BytecodeArrayOps {
+
+    /**
+     * Constructor
+     *
+     * @param clazz the Java class representation of the array
+     */
+    protected ArrayType(final Class<?> clazz) {
+        super(clazz);
+    }
+
+    /**
+     * Get the element type of the array elements e.g. for OBJECT_ARRAY, this is OBJECT
+     *
+     * @return the element type
+     */
+    public Type getElementType() {
+        return Type.typeFor(getTypeClass().getComponentType());
+    }
+
+    @Override
+    public void astore(final MethodVisitor method) {
+        method.visitInsn(AASTORE);
+    }
+
+    @Override
+    public Type aload(final MethodVisitor method) {
+        method.visitInsn(AALOAD);
+        return getElementType();
+    }
+
+    @Override
+    public Type arraylength(final MethodVisitor method) {
+        method.visitInsn(ARRAYLENGTH);
+        return INT;
+    }
+
+    @Override
+    public Type newarray(final MethodVisitor method) {
+        method.visitTypeInsn(ANEWARRAY, getElementType().getInternalName());
+        return this;
+    }
+
+    @Override
+    public Type newarray(final MethodVisitor method, final int dims) {
+        method.visitMultiANewArrayInsn(getInternalName(), dims);
+        return this;
+    }
+
+    @Override
+    public Type load(final MethodVisitor method, final int slot) {
+        assert slot != -1;
+        method.visitVarInsn(ALOAD, slot);
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "array<elementType=" + getElementType().getTypeClass().getSimpleName() + '>';
+    }
+
+    @Override
+    public Type convert(final MethodVisitor method, final Type to) {
+        assert to.isObject();
+        assert !to.isArray() || ((ArrayType)to).getElementType() == getElementType();
+        return to;
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/BitwiseType.java b/nashorn/src/jdk/nashorn/internal/codegen/types/BitwiseType.java
new file mode 100644
index 00000000000..b0194ef4e30
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/types/BitwiseType.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.codegen.types;
+
+/**
+ * This class represents a numeric type that can be used for bit operations.
+ */
+public abstract class BitwiseType extends NumericType implements BytecodeBitwiseOps {
+
+    /**
+     * Constructor
+     *
+     * @param name   name of type
+     * @param clazz  Java class used to represent type
+     * @param weight weight of type
+     * @param slots  number of bytecode slots this type takes up
+     */
+    protected BitwiseType(final String name, final Class<?> clazz, final int weight, final int slots) {
+        super(name, clazz, weight, slots);
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/BooleanType.java b/nashorn/src/jdk/nashorn/internal/codegen/types/BooleanType.java
new file mode 100644
index 00000000000..f576aff384a
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/types/BooleanType.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.codegen.types;
+
+import static jdk.internal.org.objectweb.asm.Opcodes.ICONST_0;
+import static jdk.internal.org.objectweb.asm.Opcodes.ICONST_1;
+import static jdk.internal.org.objectweb.asm.Opcodes.ILOAD;
+import static jdk.internal.org.objectweb.asm.Opcodes.IRETURN;
+import static jdk.internal.org.objectweb.asm.Opcodes.ISTORE;
+import static jdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
+
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.nashorn.internal.codegen.CompilerConstants;
+import jdk.nashorn.internal.codegen.objects.ObjectClassGenerator;
+import jdk.nashorn.internal.runtime.JSType;
+
+/**
+ * The boolean type class
+ */
+public final class BooleanType extends Type {
+
+    private static final CompilerConstants.Call VALUE_OF = staticCallNoLookup(Boolean.class, "valueOf", Boolean.class, boolean.class);
+
+    /**
+     * Constructor
+     */
+    protected BooleanType() {
+        super("boolean", boolean.class, 1, 1);
+    }
+
+    @Override
+    public Type nextWider() {
+        return INT;
+    }
+
+    @Override
+    public Class<?> getBoxedType() {
+        return Boolean.class;
+    }
+
+    @Override
+    public Type loadUndefined(final MethodVisitor method) {
+        method.visitLdcInsn(ObjectClassGenerator.UNDEFINED_INT);
+        return BOOLEAN;
+    }
+
+    @Override
+    public Type loadEmpty(final MethodVisitor method) {
+        assert false : "unsupported operation";
+        return null;
+    }
+
+    @Override
+    public void _return(final MethodVisitor method) {
+        method.visitInsn(IRETURN);
+    }
+
+    @Override
+    public Type load(final MethodVisitor method, final int slot) {
+        assert slot != -1;
+        method.visitVarInsn(ILOAD, slot);
+        return BOOLEAN;
+    }
+
+    @Override
+    public void store(final MethodVisitor method, final int slot) {
+        assert slot != -1;
+        method.visitVarInsn(ISTORE, slot);
+    }
+
+    @Override
+    public Type ldc(final MethodVisitor method, final Object c) {
+        assert c instanceof Boolean;
+        method.visitInsn((Boolean) c ? ICONST_1 : ICONST_0);
+        return BOOLEAN;
+    }
+
+    @Override
+    public Type convert(final MethodVisitor method, final Type to) {
+        if (isEquivalentTo(to)) {
+            return to;
+        }
+
+        if (to.isNumber()) {
+            convert(method, OBJECT);
+            invokeStatic(method, JSType.TO_NUMBER);
+        } else if (to.isInteger()) {
+            return to; // do nothing.
+        } else if (to.isLong()) {
+            convert(method, OBJECT);
+            invokeStatic(method, JSType.TO_UINT32);
+        } else if (to.isLong()) {
+            convert(method, OBJECT);
+            invokeStatic(method, JSType.TO_LONG);
+        } else if (to.isString()) {
+            invokeStatic(method, VALUE_OF);
+            invokeStatic(method, JSType.TO_PRIMITIVE);
+            invokeStatic(method, JSType.TO_STRING);
+        } else if (to.isObject()) {
+            invokeStatic(method, VALUE_OF);
+        } else {
+            assert false : "Illegal conversion " + this + " -> " + to;
+        }
+
+        return to;
+    }
+
+    @Override
+    public Type add(final MethodVisitor method) {
+        assert false : "unsupported operation";
+        return null;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeArrayOps.java b/nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeArrayOps.java
new file mode 100644
index 00000000000..915b5459d02
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeArrayOps.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.codegen.types;
+
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+
+/**
+ * Array operations, not supported by all ops
+ */
+interface BytecodeArrayOps {
+
+    /**
+     * Load an array element given that the array and its index are already on
+     * the stack
+     *
+     * @param method method visitor
+     * @return the array element type
+     *
+     */
+    Type aload(MethodVisitor method);
+
+    /**
+     * Store an array element given that the array and its index and the element
+     * are on the stack
+     *
+     * @param method method visitor
+     */
+    void astore(MethodVisitor method);
+
+    /**
+     * Generate an array length operation
+     *
+     * @param method method method visitor
+     * @return length of the array
+     */
+    Type arraylength(MethodVisitor method);
+
+    /**
+     * Create a new array of this array type and length on stack
+     *
+     * @param method method visitor
+     * @return the type of the array
+     */
+    Type newarray(MethodVisitor method);
+
+    /**
+     * Create a new multi array of this array type and allocate the number of
+     * dimensions given
+     *
+     * @param method method visitor
+     * @param dims   number of dimensions
+     * @return the type of the new array
+     */
+    Type newarray(MethodVisitor method, int dims);
+}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeBitwiseOps.java b/nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeBitwiseOps.java
new file mode 100644
index 00000000000..d7d7bff4aaa
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeBitwiseOps.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.codegen.types;
+
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+
+/**
+ * Bitwise operations not supported by all types
+ */
+interface BytecodeBitwiseOps {
+
+    /**
+     * Pop and logically shift the two values on top of the stack (steps, value)
+     * right and push the result on the stack
+     *
+     * @param method method visitor
+     * @return result type
+     */
+    Type shr(MethodVisitor method);
+
+    /**
+     * Pop and arithmetically shift of the two values on top of the stack
+     * (steps, value) right and push the result on the stack
+     *
+     * @param method method visitor
+     * @return result type
+     */
+    Type sar(MethodVisitor method);
+
+    /**
+     * Pop and logically shift of the two values on top of the stack (steps,
+     * value) left and push the result on the stack
+     *
+     * @param method method visitor
+     * @return result type
+     */
+    Type shl(MethodVisitor method);
+
+    /**
+     * Pop and AND the two values on top of the stack and push the result on the
+     * stack
+     *
+     * @param method method visitor
+     * @return result type
+     */
+    Type and(MethodVisitor method);
+
+    /**
+     * Pop and OR the two values on top of the stack and push the result on the
+     * stack
+     *
+     * @param method method visitor
+     * @return result type
+     */
+    Type or(MethodVisitor method);
+
+    /**
+     * Pop and XOR the two values on top of the stack and push the result on the
+     * stack
+     *
+     * @param method method visitor
+     * @return result type
+     */
+    Type xor(MethodVisitor method);
+
+    /**
+     * Comparison with int return value, e.g. LCMP.
+     *
+     * @param method the method visitor
+     * @return int return value
+     */
+    Type cmp(MethodVisitor method);
+}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeNumericOps.java b/nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeNumericOps.java
new file mode 100644
index 00000000000..9a6716e9578
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeNumericOps.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.codegen.types;
+
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+
+/**
+ * Numeric operations, not supported by all types
+ */
+interface BytecodeNumericOps {
+
+    /**
+     * Pop and negate the value on top of the stack and push the result
+     *
+     * @param method method visitor
+     *
+     * @return result type
+     */
+    Type neg(MethodVisitor method);
+
+    /**
+     * Pop two values on top of the stack and subtract the first from the
+     * second, pushing the result on the stack
+     *
+     * @param method method visitor
+     *
+     * @return result type
+     */
+    Type sub(MethodVisitor method);
+
+    /**
+     * Pop and multiply the two values on top of the stack and push the result
+     * on the stack
+     *
+     * @param method method visitor
+     *
+     * @return result type
+     */
+    Type mul(MethodVisitor method);
+
+    /**
+     * Pop two values on top of the stack and divide the first with the second,
+     * pushing the result on the stack
+     *
+     * @param method method visitor
+     *
+     * @return result type
+     */
+    Type div(MethodVisitor method);
+
+    /**
+     * Pop two values on top of the stack and compute the modulo of the first
+     * with the second, pushing the result on the stack
+     *
+     * @param method method visitor
+     *
+     * @return result type
+     */
+    Type rem(MethodVisitor method);
+
+    /**
+     * Comparison with int return value, e.g. LCMP, DCMP.
+     *
+     * @param method the method visitor
+     * @param isCmpG is this a double style cmpg
+     *
+     * @return int return value
+     */
+    Type cmp(MethodVisitor method, boolean isCmpG);
+}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeOps.java b/nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeOps.java
new file mode 100644
index 00000000000..6f073875014
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeOps.java
@@ -0,0 +1,158 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.codegen.types;
+
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+
+
+/**
+ * Interface for byte code generation for all runtime types. Each
+ * type implements this interface and provides the type specific
+ * operations to do the generic things described herein.
+ *
+ * The bytecode ops are coupled to a MethodVisitor from ASM for
+ * byte code generation. They know nothing about our MethodGenerator,
+ * which is the abstraction for working with Nashorn JS types
+ * For exmaple, anything like "two or one slots" for a type, which
+ * is represented in bytecode and ASM, is abstracted away in the
+ * MethodGenerator. There you just say "dup" or "store".
+ *
+ * @see Type
+ * @see MethodVisitor
+ */
+interface BytecodeOps {
+
+    /**
+     * Duplicate top entry of stack. If a too large depth is
+     * given, so that there are no possible bytecode instructions
+     * available to generate the dup sequence, null is returned.
+     *
+     * @param method  method visitor
+     * @param depth   how far should the copy be pushed down
+     *
+     * @return        the type at the top of the stack or null
+     */
+    Type dup(MethodVisitor method, int depth);
+
+    /**
+     * Pop an entry of this type from the top of the bytecode
+     * stack. This works regardless of what category this type
+     * is
+     *
+     * @param method  method visitor
+     *
+     * @return the popped type
+     */
+    Type pop(MethodVisitor method);
+
+    /**
+     * Swap this type with the bytecode stack with the one below
+     * Generate appropriate code no matter the categories of the
+     * two types
+     *
+     * @param method  method visitor
+     * @param other   the type below this one on the stack
+     *
+     * @return        the other type
+     */
+    Type swap(MethodVisitor method, Type other);
+
+    /**
+     * Pop two values on top of the stack and add the
+     * first to the second, pushing the result on the stack
+     *
+     * @param method  method visitor
+     * @return result type
+     */
+    Type add(MethodVisitor method);
+
+    /**
+     * Load a variable from a local slot to the stack
+     *
+     * @param method method visitor
+     * @param slot   the slot to load
+     *
+     * @return       the type that was loaded
+     */
+    Type load(MethodVisitor method, int slot);
+
+    /**
+     * Store a variable from the stack to a local slot
+     *
+     * @param method  method visitor
+     * @param slot    the slot to store to
+     */
+    void store(MethodVisitor method, int slot);
+
+    /**
+     * Load a constant to the stack.
+     *
+     * @param method  method visitor
+     * @param c       the value of the constant
+     *
+     * @return        the type at the top of the stack after load
+     */
+    Type ldc(MethodVisitor method, Object c);
+
+    /**
+     * Load the "undefined" value to the stack. Note that
+     * there may be different representations of this for
+     * e.g. doubles and objects. Abstraction removes this
+     *
+     * @param  method  method visitor.
+     *
+     * @return the undefined type at the top of the stack
+     */
+    Type loadUndefined(MethodVisitor method);
+
+    /**
+     * Load the "empty" value to the stack.
+     *
+     * @param  method  method visitor.
+     * @return the undefined type at the top of the stack
+     */
+    Type loadEmpty(MethodVisitor method);
+
+    /**
+     * Generate code that pops and casts the element on top of the
+     * stack to another type, given as parameter
+     *
+     * @param method  method visitor
+     * @param to      the type to cast to
+     *
+     * @return the to type
+     */
+    Type convert(MethodVisitor method, Type to);
+
+    /**
+     * Return the parameter on top of the stack
+     * from a method
+     *
+     * @param method the method visitor
+     */
+    void _return(MethodVisitor method);
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/IntType.java b/nashorn/src/jdk/nashorn/internal/codegen/types/IntType.java
new file mode 100644
index 00000000000..f9e6c5a00fc
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/types/IntType.java
@@ -0,0 +1,260 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.codegen.types;
+
+import static jdk.internal.org.objectweb.asm.Opcodes.BIPUSH;
+import static jdk.internal.org.objectweb.asm.Opcodes.I2D;
+import static jdk.internal.org.objectweb.asm.Opcodes.I2L;
+import static jdk.internal.org.objectweb.asm.Opcodes.IADD;
+import static jdk.internal.org.objectweb.asm.Opcodes.IAND;
+import static jdk.internal.org.objectweb.asm.Opcodes.ICONST_0;
+import static jdk.internal.org.objectweb.asm.Opcodes.ICONST_1;
+import static jdk.internal.org.objectweb.asm.Opcodes.ICONST_2;
+import static jdk.internal.org.objectweb.asm.Opcodes.ICONST_3;
+import static jdk.internal.org.objectweb.asm.Opcodes.ICONST_4;
+import static jdk.internal.org.objectweb.asm.Opcodes.ICONST_5;
+import static jdk.internal.org.objectweb.asm.Opcodes.ICONST_M1;
+import static jdk.internal.org.objectweb.asm.Opcodes.IDIV;
+import static jdk.internal.org.objectweb.asm.Opcodes.ILOAD;
+import static jdk.internal.org.objectweb.asm.Opcodes.IMUL;
+import static jdk.internal.org.objectweb.asm.Opcodes.INEG;
+import static jdk.internal.org.objectweb.asm.Opcodes.IOR;
+import static jdk.internal.org.objectweb.asm.Opcodes.IREM;
+import static jdk.internal.org.objectweb.asm.Opcodes.IRETURN;
+import static jdk.internal.org.objectweb.asm.Opcodes.ISHL;
+import static jdk.internal.org.objectweb.asm.Opcodes.ISHR;
+import static jdk.internal.org.objectweb.asm.Opcodes.ISTORE;
+import static jdk.internal.org.objectweb.asm.Opcodes.ISUB;
+import static jdk.internal.org.objectweb.asm.Opcodes.IUSHR;
+import static jdk.internal.org.objectweb.asm.Opcodes.IXOR;
+import static jdk.internal.org.objectweb.asm.Opcodes.SIPUSH;
+import static jdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
+
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.nashorn.internal.codegen.CompilerConstants;
+import jdk.nashorn.internal.codegen.objects.ObjectClassGenerator;
+
+/**
+ * Type class: INT
+ */
+class IntType extends BitwiseType {
+
+    private static final CompilerConstants.Call TO_STRING = staticCallNoLookup(Integer.class, "toString", String.class, int.class);
+    private static final CompilerConstants.Call VALUE_OF  = staticCallNoLookup(Integer.class, "valueOf", Integer.class, int.class);
+
+    protected IntType() {
+        super("int", int.class, 2, 1);
+    }
+
+    @Override
+    public Type nextWider() {
+        return LONG;
+    }
+
+    @Override
+    public Class<?> getBoxedType() {
+        return Integer.class;
+    }
+
+    @Override
+    public Type ldc(final MethodVisitor method, final Object c) {
+        assert c instanceof Integer;
+
+        final int value = ((Integer) c).intValue();
+
+        switch (value) {
+            case -1:
+                method.visitInsn(ICONST_M1);
+                break;
+            case 0:
+                method.visitInsn(ICONST_0);
+                break;
+            case 1:
+                method.visitInsn(ICONST_1);
+                break;
+            case 2:
+                method.visitInsn(ICONST_2);
+                break;
+            case 3:
+                method.visitInsn(ICONST_3);
+                break;
+            case 4:
+                method.visitInsn(ICONST_4);
+                break;
+            case 5:
+                method.visitInsn(ICONST_5);
+                break;
+            default:
+                if (value == (byte) value) {
+                    method.visitIntInsn(BIPUSH, value);
+                } else if (value == (short) value) {
+                    method.visitIntInsn(SIPUSH, value);
+                } else {
+                    method.visitLdcInsn(c);
+                }
+                break;
+        }
+
+        return Type.INT;
+    }
+
+    @Override
+    public Type convert(final MethodVisitor method, final Type to) {
+        if (to.isEquivalentTo(this)) {
+            return to;
+        }
+
+        if (to.isNumber()) {
+            method.visitInsn(I2D);
+        } else if (to.isLong()) {
+            method.visitInsn(I2L);
+        } else if (to.isBoolean()) {
+            //nop
+        } else if (to.isString()) {
+            invokeStatic(method, TO_STRING);
+        } else if (to.isObject()) {
+            invokeStatic(method, VALUE_OF);
+        } else {
+            assert false : "Illegal conversion " + this + " -> " + to;
+        }
+
+        return to;
+    }
+
+    @Override
+    public Type add(final MethodVisitor method) {
+        method.visitInsn(IADD);
+        return INT;
+    }
+
+    @Override
+    public Type shr(final MethodVisitor method) {
+        method.visitInsn(IUSHR);
+        return INT;
+    }
+
+    @Override
+    public Type sar(final MethodVisitor method) {
+        method.visitInsn(ISHR);
+        return INT;
+    }
+
+    @Override
+    public Type shl(final MethodVisitor method) {
+        method.visitInsn(ISHL);
+        return INT;
+    }
+
+    @Override
+    public Type and(final MethodVisitor method) {
+        method.visitInsn(IAND);
+        return INT;
+    }
+
+    @Override
+    public Type or(final MethodVisitor method) {
+        method.visitInsn(IOR);
+        return INT;
+    }
+
+    @Override
+    public Type xor(final MethodVisitor method) {
+        method.visitInsn(IXOR);
+        return INT;
+    }
+
+    @Override
+    public Type load(final MethodVisitor method, final int slot) {
+        assert slot != -1;
+        method.visitVarInsn(ILOAD, slot);
+        return INT;
+    }
+
+    @Override
+    public void store(final MethodVisitor method, final int slot) {
+        assert slot != -1;
+        method.visitVarInsn(ISTORE, slot);
+    }
+
+    @Override
+    public Type sub(final MethodVisitor method) {
+        method.visitInsn(ISUB);
+        return INT;
+    }
+
+    @Override
+    public Type mul(final MethodVisitor method) {
+        method.visitInsn(IMUL);
+        return INT;
+    }
+
+    @Override
+    public Type div(final MethodVisitor method) {
+        method.visitInsn(IDIV);
+        return INT;
+    }
+
+    @Override
+    public Type rem(final MethodVisitor method) {
+        method.visitInsn(IREM);
+        return INT;
+    }
+
+    @Override
+    public Type neg(final MethodVisitor method) {
+        method.visitInsn(INEG);
+        return INT;
+    }
+
+    @Override
+    public void _return(final MethodVisitor method) {
+        method.visitInsn(IRETURN);
+    }
+
+    @Override
+    public Type loadUndefined(final MethodVisitor method) {
+        method.visitLdcInsn(ObjectClassGenerator.UNDEFINED_INT);
+        return INT;
+    }
+
+    @Override
+    public Type loadEmpty(final MethodVisitor method) {
+        assert false : "unsupported operation";
+        return null;
+    }
+
+    @Override
+    public Type cmp(final MethodVisitor method, final boolean isCmpG) {
+        assert false : "unsupported operation";
+        return null;
+    }
+
+    @Override
+    public Type cmp(final MethodVisitor method) {
+        assert false : "unsupported operation";
+        return null;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/LongType.java b/nashorn/src/jdk/nashorn/internal/codegen/types/LongType.java
new file mode 100644
index 00000000000..5eea3e0c08c
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/types/LongType.java
@@ -0,0 +1,229 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.codegen.types;
+
+import static jdk.internal.org.objectweb.asm.Opcodes.L2D;
+import static jdk.internal.org.objectweb.asm.Opcodes.L2I;
+import static jdk.internal.org.objectweb.asm.Opcodes.LADD;
+import static jdk.internal.org.objectweb.asm.Opcodes.LAND;
+import static jdk.internal.org.objectweb.asm.Opcodes.LCMP;
+import static jdk.internal.org.objectweb.asm.Opcodes.LCONST_0;
+import static jdk.internal.org.objectweb.asm.Opcodes.LCONST_1;
+import static jdk.internal.org.objectweb.asm.Opcodes.LDIV;
+import static jdk.internal.org.objectweb.asm.Opcodes.LLOAD;
+import static jdk.internal.org.objectweb.asm.Opcodes.LMUL;
+import static jdk.internal.org.objectweb.asm.Opcodes.LNEG;
+import static jdk.internal.org.objectweb.asm.Opcodes.LOR;
+import static jdk.internal.org.objectweb.asm.Opcodes.LREM;
+import static jdk.internal.org.objectweb.asm.Opcodes.LRETURN;
+import static jdk.internal.org.objectweb.asm.Opcodes.LSHL;
+import static jdk.internal.org.objectweb.asm.Opcodes.LSHR;
+import static jdk.internal.org.objectweb.asm.Opcodes.LSTORE;
+import static jdk.internal.org.objectweb.asm.Opcodes.LSUB;
+import static jdk.internal.org.objectweb.asm.Opcodes.LUSHR;
+import static jdk.internal.org.objectweb.asm.Opcodes.LXOR;
+import static jdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
+
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.nashorn.internal.codegen.CompilerConstants;
+import jdk.nashorn.internal.codegen.objects.ObjectClassGenerator;
+
+/**
+ * Type class: LONG
+ */
+class LongType extends BitwiseType {
+
+    private static final CompilerConstants.Call VALUE_OF = staticCallNoLookup(Long.class, "valueOf", Long.class, long.class);
+
+    protected LongType(final String name) {
+        super(name, long.class, 3, 2);
+    }
+
+    protected LongType() {
+        this("long");
+    }
+
+    @Override
+    public Type nextWider() {
+        return NUMBER;
+    }
+
+    @Override
+    public Class<?> getBoxedType() {
+        return Long.class;
+    }
+
+    @Override
+    public Type cmp(final MethodVisitor method) {
+        method.visitInsn(LCMP);
+        return INT;
+    }
+
+    @Override
+    public Type load(final MethodVisitor method, final int slot) {
+        assert slot != -1;
+        method.visitVarInsn(LLOAD, slot);
+        return LONG;
+    }
+
+    @Override
+    public void store(final MethodVisitor method, final int slot) {
+        assert slot != -1;
+        method.visitVarInsn(LSTORE, slot);
+    }
+
+    @Override
+    public Type ldc(final MethodVisitor method, final Object c) {
+        assert c instanceof Long;
+
+        final long value = (Long) c;
+
+        if (value == 0L) {
+            method.visitInsn(LCONST_0);
+        } else if (value == 1L) {
+            method.visitInsn(LCONST_1);
+        } else {
+            method.visitLdcInsn(c);
+        }
+
+        return Type.LONG;
+    }
+
+    @Override
+    public Type convert(final MethodVisitor method, final Type to) {
+        if (isEquivalentTo(to)) {
+            return to;
+        }
+
+        if (to.isNumber()) {
+            method.visitInsn(L2D);
+        } else if (to.isInteger()) {
+            method.visitInsn(L2I);
+        } else if (to.isBoolean()) {
+            method.visitInsn(L2I);
+        } else if (to.isObject()) {
+            invokeStatic(method, VALUE_OF);
+        } else {
+            assert false : "Illegal conversion " + this + " -> " + to;
+        }
+
+        return to;
+    }
+
+    @Override
+    public Type add(final MethodVisitor method) {
+        method.visitInsn(LADD);
+        return LONG;
+    }
+
+    @Override
+    public Type sub(final MethodVisitor method) {
+        method.visitInsn(LSUB);
+        return LONG;
+    }
+
+    @Override
+    public Type mul(final MethodVisitor method) {
+        method.visitInsn(LMUL);
+        return LONG;
+    }
+
+    @Override
+    public Type div(final MethodVisitor method) {
+        method.visitInsn(LDIV);
+        return LONG;
+    }
+
+    @Override
+    public Type rem(final MethodVisitor method) {
+        method.visitInsn(LREM);
+        return LONG;
+    }
+
+    @Override
+    public Type shr(final MethodVisitor method) {
+        method.visitInsn(LUSHR);
+        return LONG;
+    }
+
+    @Override
+    public Type sar(final MethodVisitor method) {
+        method.visitInsn(LSHR);
+        return LONG;
+    }
+
+    @Override
+    public Type shl(final MethodVisitor method) {
+        method.visitInsn(LSHL);
+        return LONG;
+    }
+
+    @Override
+    public Type and(final MethodVisitor method) {
+        method.visitInsn(LAND);
+        return LONG;
+    }
+
+    @Override
+    public Type or(final MethodVisitor method) {
+        method.visitInsn(LOR);
+        return LONG;
+    }
+
+    @Override
+    public Type xor(final MethodVisitor method) {
+        method.visitInsn(LXOR);
+        return LONG;
+    }
+
+    @Override
+    public Type neg(final MethodVisitor method) {
+        method.visitInsn(LNEG);
+        return LONG;
+    }
+
+    @Override
+    public void _return(final MethodVisitor method) {
+        method.visitInsn(LRETURN);
+    }
+
+    @Override
+    public Type loadUndefined(final MethodVisitor method) {
+        method.visitLdcInsn(ObjectClassGenerator.UNDEFINED_LONG);
+        return LONG;
+    }
+
+    @Override
+    public Type loadEmpty(final MethodVisitor method) {
+        assert false : "unsupported operation";
+        return null;
+    }
+
+    @Override
+    public Type cmp(final MethodVisitor method, final boolean isCmpG) {
+        return cmp(method);
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/NumberType.java b/nashorn/src/jdk/nashorn/internal/codegen/types/NumberType.java
new file mode 100644
index 00000000000..cafc5118bb9
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/types/NumberType.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.codegen.types;
+
+import static jdk.internal.org.objectweb.asm.Opcodes.DADD;
+import static jdk.internal.org.objectweb.asm.Opcodes.DCMPG;
+import static jdk.internal.org.objectweb.asm.Opcodes.DCMPL;
+import static jdk.internal.org.objectweb.asm.Opcodes.DCONST_0;
+import static jdk.internal.org.objectweb.asm.Opcodes.DCONST_1;
+import static jdk.internal.org.objectweb.asm.Opcodes.DDIV;
+import static jdk.internal.org.objectweb.asm.Opcodes.DLOAD;
+import static jdk.internal.org.objectweb.asm.Opcodes.DMUL;
+import static jdk.internal.org.objectweb.asm.Opcodes.DNEG;
+import static jdk.internal.org.objectweb.asm.Opcodes.DREM;
+import static jdk.internal.org.objectweb.asm.Opcodes.DRETURN;
+import static jdk.internal.org.objectweb.asm.Opcodes.DSTORE;
+import static jdk.internal.org.objectweb.asm.Opcodes.DSUB;
+import static jdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
+
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.nashorn.internal.codegen.CompilerConstants;
+import jdk.nashorn.internal.codegen.objects.ObjectClassGenerator;
+import jdk.nashorn.internal.runtime.JSType;
+
+class NumberType extends NumericType {
+
+    private static final CompilerConstants.Call VALUE_OF = staticCallNoLookup(Double.class, "valueOf", Double.class, double.class);
+
+    protected NumberType() {
+        super("double", double.class, 4, 2);
+    }
+
+    @Override
+    public Type nextWider() {
+        return OBJECT;
+    }
+
+    @Override
+    public Class<?> getBoxedType() {
+        return Double.class;
+    }
+
+    @Override
+    public Type cmp(final MethodVisitor method, final boolean isCmpG) {
+        method.visitInsn(isCmpG ? DCMPG : DCMPL);
+        return INT;
+    }
+
+    @Override
+    public Type load(final MethodVisitor method, final int slot) {
+        assert slot != -1;
+        method.visitVarInsn(DLOAD, slot);
+        return NUMBER;
+    }
+
+    @Override
+    public void store(final MethodVisitor method, final int slot) {
+        assert slot != -1;
+        method.visitVarInsn(DSTORE, slot);
+    }
+
+    @Override
+    public Type loadUndefined(final MethodVisitor method) {
+        method.visitLdcInsn(ObjectClassGenerator.UNDEFINED_DOUBLE);
+        return NUMBER;
+    }
+
+    @Override
+    public Type loadEmpty(final MethodVisitor method) {
+        assert false : "unsupported operation";
+        return null;
+    }
+
+    @Override
+    public Type ldc(final MethodVisitor method, final Object c) {
+        assert c instanceof Double;
+
+        final double value = (Double) c;
+
+        if (Double.doubleToLongBits(value) == 0L) { // guard against -0.0
+            method.visitInsn(DCONST_0);
+        } else if (value == 1.0) {
+            method.visitInsn(DCONST_1);
+        } else {
+            method.visitLdcInsn(value);
+        }
+
+        return NUMBER;
+    }
+
+    @Override
+    public Type convert(final MethodVisitor method, final Type to) {
+        if (isEquivalentTo(to)) {
+            return null;
+        }
+
+        if (to.isInteger()) {
+            invokeStatic(method, JSType.TO_INT32_D);
+        } else if (to.isLong()) {
+            invokeStatic(method, JSType.TO_INT64_D);
+        } else if (to.isBoolean()) {
+            invokeStatic(method, JSType.TO_BOOLEAN_D);
+        } else if (to.isString()) {
+            invokeStatic(method, JSType.TO_STRING_D);
+        } else if (to.isObject()) {
+            invokeStatic(method, VALUE_OF);
+        } else {
+            assert false : "Illegal conversion " + this + " -> " + to;
+        }
+
+        return to;
+    }
+
+    @Override
+    public Type add(final MethodVisitor method) {
+        method.visitInsn(DADD);
+        return NUMBER;
+    }
+
+    @Override
+    public Type sub(final MethodVisitor method) {
+        method.visitInsn(DSUB);
+        return NUMBER;
+    }
+
+    @Override
+    public Type mul(final MethodVisitor method) {
+        method.visitInsn(DMUL);
+        return NUMBER;
+    }
+
+    @Override
+    public Type div(final MethodVisitor method) {
+        method.visitInsn(DDIV);
+        return NUMBER;
+    }
+
+    @Override
+    public Type rem(final MethodVisitor method) {
+        method.visitInsn(DREM);
+        return NUMBER;
+    }
+
+    @Override
+    public Type neg(final MethodVisitor method) {
+        method.visitInsn(DNEG);
+        return NUMBER;
+    }
+
+    @Override
+    public void _return(final MethodVisitor method) {
+        method.visitInsn(DRETURN);
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/NumericType.java b/nashorn/src/jdk/nashorn/internal/codegen/types/NumericType.java
new file mode 100644
index 00000000000..4ae928b9cdb
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/types/NumericType.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.codegen.types;
+
+/**
+ * This is a numeric type, i.e. NUMBER, LONG, INT, INT32.
+ */
+public abstract class NumericType extends Type implements BytecodeNumericOps {
+    /**
+     * Constructor
+     *
+     * @param name   name of type
+     * @param clazz  Java class used to represent type
+     * @param weight weight of type
+     * @param slots  number of bytecode slots this type takes up
+     */
+    protected NumericType(final String name, final Class<?> clazz, final int weight, final int slots) {
+        super(name, clazz, weight, slots);
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/ObjectType.java b/nashorn/src/jdk/nashorn/internal/codegen/types/ObjectType.java
new file mode 100644
index 00000000000..cb14f771a96
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/types/ObjectType.java
@@ -0,0 +1,174 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.codegen.types;
+
+import static jdk.internal.org.objectweb.asm.Opcodes.ACONST_NULL;
+import static jdk.internal.org.objectweb.asm.Opcodes.ALOAD;
+import static jdk.internal.org.objectweb.asm.Opcodes.ARETURN;
+import static jdk.internal.org.objectweb.asm.Opcodes.ASTORE;
+import static jdk.internal.org.objectweb.asm.Opcodes.CHECKCAST;
+import static jdk.internal.org.objectweb.asm.Opcodes.GETSTATIC;
+import static jdk.nashorn.internal.codegen.CompilerConstants.className;
+import static jdk.nashorn.internal.codegen.CompilerConstants.typeDescriptor;
+
+import java.lang.invoke.MethodHandle;
+import jdk.internal.org.objectweb.asm.Handle;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.nashorn.internal.codegen.CompilerConstants;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
+import jdk.nashorn.internal.runtime.Undefined;
+
+/**
+ * Type class: OBJECT This is the object type, used for all object types. It can
+ * contain a class that is a more specialized object
+ */
+class ObjectType extends Type {
+
+    protected ObjectType() {
+        this(Object.class);
+    }
+
+    protected ObjectType(final Class<?> clazz) {
+        super("object",
+                clazz,
+                clazz == Object.class ? Type.MAX_WEIGHT : 10,
+                1);
+    }
+
+    @Override
+    public String toString() {
+        return "object" + (getTypeClass() != Object.class ? "<type=" + getTypeClass().getSimpleName() + '>' : "");
+    }
+
+    @Override
+    public Type add(final MethodVisitor method) {
+        invokeStatic(method, ScriptRuntime.ADD);
+        return Type.OBJECT;
+    }
+
+    @Override
+    public Type load(final MethodVisitor method, final int slot) {
+        assert slot != -1;
+        method.visitVarInsn(ALOAD, slot);
+
+        if (slot == CompilerConstants.THIS.slot()) {
+            return Type.THIS;
+        }
+
+        return Type.OBJECT;
+    }
+
+    @Override
+    public void store(final MethodVisitor method, final int slot) {
+        assert slot != -1;
+        method.visitVarInsn(ASTORE, slot);
+    }
+
+    @Override
+    public Type loadUndefined(final MethodVisitor method) {
+        method.visitFieldInsn(GETSTATIC, className(ScriptRuntime.class), "UNDEFINED", typeDescriptor(Undefined.class));
+        return OBJECT;
+    }
+
+    @Override
+    public Type loadEmpty(final MethodVisitor method) {
+        method.visitFieldInsn(GETSTATIC, className(ScriptRuntime.class), "EMPTY", typeDescriptor(Undefined.class));
+        return OBJECT;
+    }
+
+    @Override
+    public Type ldc(final MethodVisitor method, final Object c) {
+        if (c == null) {
+            method.visitInsn(ACONST_NULL);
+        } else if (c instanceof Undefined) {
+            return loadUndefined(method);
+        } else if (c instanceof String) {
+            method.visitLdcInsn(c);
+            return STRING;
+        } else if (c instanceof Handle) {
+            method.visitLdcInsn(c);
+            return Type.typeFor(MethodHandle.class);
+        } else {
+            assert false : "implementation missing for class " + c.getClass() + " value=" + c;
+        }
+
+        return OBJECT;
+    }
+
+    @Override
+    public Type convert(final MethodVisitor method, final Type to) {
+        final boolean toString = to.isString();
+        if (!toString) {
+            if (to.isArray()) {
+                final Type elemType = ((ArrayType)to).getElementType();
+
+                //note that if this an array, things won't work. see {link @ArrayType} subclass.
+                //we also have the unpleasant case of NativeArray which looks like an Object, but is
+                //an array to the type system. This is treated specially at the known load points
+
+                if (elemType.isString()) {
+                    method.visitTypeInsn(CHECKCAST, CompilerConstants.className(String[].class));
+                } else if (elemType.isNumber()) {
+                    method.visitTypeInsn(CHECKCAST, CompilerConstants.className(double[].class));
+                } else if (elemType.isLong()) {
+                    method.visitTypeInsn(CHECKCAST, CompilerConstants.className(long[].class));
+                } else if (elemType.isInteger()) {
+                    method.visitTypeInsn(CHECKCAST, CompilerConstants.className(int[].class));
+                } else {
+                    method.visitTypeInsn(CHECKCAST, CompilerConstants.className(Object[].class));
+                }
+                return to;
+            } else if (to.isObject()) {
+                return to;
+            }
+        } else if (isString()) {
+            return to;
+        }
+
+        if (to.isInteger()) {
+            invokeStatic(method, JSType.TO_INT32);
+        } else if (to.isNumber()) {
+            invokeStatic(method, JSType.TO_NUMBER);
+        } else if (to.isLong()) {
+            invokeStatic(method, JSType.TO_INT64);
+        } else if (to.isBoolean()) {
+            invokeStatic(method, JSType.TO_BOOLEAN);
+        } else if (to.isString()) {
+            invokeStatic(method, JSType.TO_PRIMITIVE);
+            invokeStatic(method, JSType.TO_STRING);
+        } else {
+            assert false : "Illegal conversion " + this + " -> " + to + " " + isString() + " " + toString;
+        }
+
+        return to;
+    }
+
+    @Override
+    public void _return(final MethodVisitor method) {
+        method.visitInsn(ARETURN);
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/Type.java b/nashorn/src/jdk/nashorn/internal/codegen/types/Type.java
new file mode 100644
index 00000000000..67bb302832f
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/types/Type.java
@@ -0,0 +1,882 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.codegen.types;
+
+import static jdk.internal.org.objectweb.asm.Opcodes.DALOAD;
+import static jdk.internal.org.objectweb.asm.Opcodes.DASTORE;
+import static jdk.internal.org.objectweb.asm.Opcodes.DUP;
+import static jdk.internal.org.objectweb.asm.Opcodes.DUP2;
+import static jdk.internal.org.objectweb.asm.Opcodes.DUP2_X1;
+import static jdk.internal.org.objectweb.asm.Opcodes.DUP2_X2;
+import static jdk.internal.org.objectweb.asm.Opcodes.DUP_X1;
+import static jdk.internal.org.objectweb.asm.Opcodes.DUP_X2;
+import static jdk.internal.org.objectweb.asm.Opcodes.IALOAD;
+import static jdk.internal.org.objectweb.asm.Opcodes.IASTORE;
+import static jdk.internal.org.objectweb.asm.Opcodes.INVOKESTATIC;
+import static jdk.internal.org.objectweb.asm.Opcodes.LASTORE;
+import static jdk.internal.org.objectweb.asm.Opcodes.NEWARRAY;
+import static jdk.internal.org.objectweb.asm.Opcodes.POP;
+import static jdk.internal.org.objectweb.asm.Opcodes.POP2;
+import static jdk.internal.org.objectweb.asm.Opcodes.SWAP;
+import static jdk.internal.org.objectweb.asm.Opcodes.T_DOUBLE;
+import static jdk.internal.org.objectweb.asm.Opcodes.T_INT;
+
+import java.lang.invoke.MethodHandle;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.nashorn.internal.codegen.CompilerConstants.Call;
+
+
+/**
+ * This is the representation of a JavaScript type, disassociated from java
+ * Classes, with the basis for conversion weight, mapping to ASM types
+ * and implementing the ByteCodeOps interface which tells this type
+ * how to generate code for various operations.
+ *
+ * Except for ClassEmitter, this is the only class that has to know
+ * about the underlying byte code generation system.
+ *
+ * The different types know how to generate bytecode for the different
+ * operations, inherited from BytecodeOps, that they support. This avoids
+ * if/else chains depending on type in several cases and allows for
+ * more readable and shorter code
+ *
+ * The Type class also contains logic used by the type inference and
+ * for comparing types against each other, as well as the concepts
+ * of narrower to wider types. The widest type is an object. Ideally we
+ * would like as narrow types as possible for code to be efficient, e.g
+ * INTs rather than OBJECTs
+ */
+
+public abstract class Type implements Comparable<Type>, BytecodeOps {
+
+    /** Human readable name for type */
+    private final String name;
+
+    /** Descriptor for type */
+    private final String descriptor;
+
+    /** The "weight" of the type. Used for picking widest/least specific common type */
+    private final int weight;
+
+    /** How many bytecode slots does this type occupy */
+    private final int slots;
+
+    /** The class for this type */
+    private final Class<?> clazz;
+
+    /** Weights are used to decide which types are "wider" than other types */
+    protected static final int MIN_WEIGHT = -1;
+
+    /** Set way below Integer.MAX_VALUE to prevent overflow when adding weights. Objects are still heaviest. */
+    protected static final int MAX_WEIGHT = 20;
+
+    /**
+     * Constructor
+     *
+     * @param clazz       class for type
+     * @param weight      weight - higher is more generic
+     * @param slots       how many bytecode slots the type takes up
+     */
+    Type(final String name, final Class<?> clazz, final int weight, final int slots) {
+        this.name       = name;
+        this.clazz      = clazz;
+        this.descriptor = Type.getDescriptor(clazz);
+        this.weight     = weight;
+        assert weight >= MIN_WEIGHT && weight <= MAX_WEIGHT : "illegal type weight: " + weight;
+        this.slots      = slots;
+    }
+
+    /**
+     * Return an internal descriptor for a type
+     *
+     * @param type the type
+     * @return descriptor string
+     */
+    public static String getDescriptor(final Class<?> type) {
+        return jdk.internal.org.objectweb.asm.Type.getDescriptor(type);
+    }
+
+    /**
+     * Get the weight of this type - use this e.g. for sorting method descriptors
+     * @return the weight
+     */
+    public int getWeight() {
+        return weight;
+    }
+
+    /**
+     * Get the Class representing this type
+     * @return the class for this type
+     */
+    public Class<?> getTypeClass() {
+        return clazz;
+    }
+
+    /**
+     * For specialization, return the next, slightly more difficulty, type
+     * to test.
+     *
+     * @return the next Type
+     */
+    public Type nextWider() {
+        return null;
+    }
+
+    /**
+     * Get the boxed type for this class
+     * @return the boxed version of this type or null if N/A
+     */
+    public Class<?> getBoxedType() {
+        assert !getTypeClass().isPrimitive();
+        return null;
+    }
+
+    /**
+     * Generate a method descriptor given a return type and a param array
+     *
+     * @param returnType return type
+     * @param types      parameters
+     *
+     * @return a descriptor string
+     */
+    public static String getMethodDescriptor(final Type returnType, final Type... types) {
+        final jdk.internal.org.objectweb.asm.Type[] itypes = new jdk.internal.org.objectweb.asm.Type[types.length];
+        for (int i = 0; i < types.length; i++) {
+            itypes[i] = types[i].getInternalType();
+        }
+        return jdk.internal.org.objectweb.asm.Type.getMethodDescriptor(returnType.getInternalType(), itypes);
+    }
+
+    /**
+     * Generate a method descriptor given a return type and a param array
+     *
+     * @param returnType return type
+     * @param types      parameters
+     *
+     * @return a descriptor string
+     */
+    public static String getMethodDescriptor(final Class<?> returnType, final Class<?>... types) {
+        final jdk.internal.org.objectweb.asm.Type[] itypes = new jdk.internal.org.objectweb.asm.Type[types.length];
+        for (int i = 0; i < types.length; i++) {
+            itypes[i] = getInternalType(types[i]);
+        }
+        return jdk.internal.org.objectweb.asm.Type.getMethodDescriptor(getInternalType(returnType), itypes);
+    }
+
+    /**
+     * Return the type for an internal type, package private - do not use
+     * outside code gen
+     *
+     * @param itype internal type
+     * @return Nashorn type
+     */
+    @SuppressWarnings("fallthrough")
+    static Type typeFor(final jdk.internal.org.objectweb.asm.Type itype) {
+        switch (itype.getSort()) {
+        case jdk.internal.org.objectweb.asm.Type.BOOLEAN:
+            return BOOLEAN;
+        case jdk.internal.org.objectweb.asm.Type.INT:
+            return INT;
+        case jdk.internal.org.objectweb.asm.Type.LONG:
+            return LONG;
+        case jdk.internal.org.objectweb.asm.Type.DOUBLE:
+            return NUMBER;
+        case jdk.internal.org.objectweb.asm.Type.OBJECT:
+            return OBJECT;
+        case jdk.internal.org.objectweb.asm.Type.VOID:
+            return null;
+        case jdk.internal.org.objectweb.asm.Type.ARRAY:
+            switch (itype.getElementType().getSort()) {
+            case jdk.internal.org.objectweb.asm.Type.DOUBLE:
+                return NUMBER_ARRAY;
+            case jdk.internal.org.objectweb.asm.Type.INT:
+                return INT_ARRAY;
+            case jdk.internal.org.objectweb.asm.Type.LONG:
+                return LONG_ARRAY;
+            default:
+                assert false;
+            case jdk.internal.org.objectweb.asm.Type.OBJECT:
+                return OBJECT_ARRAY;
+            }
+
+        default:
+            assert false : "Unknown itype : " + itype + " sort " + itype.getSort();
+            break;
+        }
+        return null;
+    }
+
+    /**
+     * Get the return type for a method
+     *
+     * @param methodDescriptor method descriptor
+     * @return return type
+     */
+    public static Type getMethodReturnType(final String methodDescriptor) {
+        return Type.typeFor(jdk.internal.org.objectweb.asm.Type.getReturnType(methodDescriptor));
+    }
+
+    /**
+     * Get type array representing arguments of a method in order
+     *
+     * @param methodDescriptor method descriptor
+     * @return parameter type array
+     */
+    public static Type[] getMethodArguments(final String methodDescriptor) {
+        final jdk.internal.org.objectweb.asm.Type itypes[] = jdk.internal.org.objectweb.asm.Type.getArgumentTypes(methodDescriptor);
+        final Type types[] = new Type[itypes.length];
+        for (int i = 0; i < itypes.length; i++) {
+            types[i] = Type.typeFor(itypes[i]);
+        }
+        return types;
+    }
+
+    static jdk.internal.org.objectweb.asm.Type getInternalType(final String className) {
+        return jdk.internal.org.objectweb.asm.Type.getType(className);
+    }
+
+    private jdk.internal.org.objectweb.asm.Type getInternalType() {
+        return jdk.internal.org.objectweb.asm.Type.getType(getTypeClass());
+    }
+
+    private static jdk.internal.org.objectweb.asm.Type getInternalType(final Class<?> type) {
+        return jdk.internal.org.objectweb.asm.Type.getType(type);
+    }
+
+    static void invokeStatic(final MethodVisitor method, final Call call) {
+        method.visitMethodInsn(INVOKESTATIC, call.className(), call.name(), call.descriptor());
+    }
+
+    /**
+     * Get the internal JVM name of a type
+     * @return the internal name
+     */
+    public String getInternalName() {
+        return jdk.internal.org.objectweb.asm.Type.getInternalName(getTypeClass());
+    }
+
+    /**
+     * Get the internal JVM name of type type represented by a given Java class
+     * @param clazz the class
+     * @return the internal name
+     */
+    public static String getInternalName(final Class<?> clazz) {
+        return jdk.internal.org.objectweb.asm.Type.getInternalName(clazz);
+    }
+
+    /**
+     * Determines whether a type is the UNKNOWN type, i.e. not set yet
+     * Used for type inference.
+     *
+     * @return true if UNKNOWN, false otherwise
+     */
+    public boolean isUnknown() {
+        return this.equals(Type.UNKNOWN);
+    }
+
+    /**
+     * Determines whether a type is the BOOLEAN type
+     * @return true if BOOLEAN, false otherwise
+     */
+    public boolean isBoolean() {
+        return this.equals(Type.BOOLEAN);
+    }
+
+    /**
+     * Determines whether a type is the INT type
+     * @return true if INTEGER, false otherwise
+     */
+    public boolean isInteger() {
+        return this.equals(Type.INT);
+    }
+
+    /**
+     * Determines whether a type is the LONG type
+     * @return true if LONG, false otherwise
+     */
+    public boolean isLong() {
+        return this.equals(Type.LONG);
+    }
+
+    /**
+     * Determines whether a type is the NUMBER type
+     * @return true if NUMBER, false otherwise
+     */
+    public boolean isNumber() {
+        return this.equals(Type.NUMBER);
+    }
+
+    /**
+     * Determines whether a type is numeric, i.e. NUMBER,
+     * INT, LONG.
+     *
+     * @return true if numeric, false otherwise
+     */
+    public boolean isNumeric() {
+        return this instanceof NumericType;
+    }
+
+    /**
+     * Determines whether a type is an array type, i.e.
+     * OBJECT_ARRAY or NUMBER_ARRAY (for now)
+     *
+     * @return true if an array type, false otherwise
+     */
+    public boolean isArray() {
+        return this instanceof ArrayType;
+    }
+
+    /**
+     * Determines if a type takes up two bytecode slots or not
+     *
+     * @return true if type takes up two bytecode slots rather than one
+     */
+    public boolean isCategory2() {
+        return getSlots() == 2;
+    }
+
+    /**
+     * Determines whether a type is an OBJECT type, e.g. OBJECT, STRING,
+     * NUMBER_ARRAY etc.
+     *
+     * @return true if object type, false otherwise
+     */
+    public boolean isObject() {
+        return this instanceof ObjectType;
+    }
+
+    /**
+     * Determines whether a type is a STRING type
+     *
+     * @return true if object type, false otherwise
+     */
+    public boolean isString() {
+        return this.equals(Type.STRING);
+    }
+
+    /**
+     * Determine if two types are equivalent, i.e. need no conversion
+     *
+     * @param type the second type to check
+     *
+     * @return true if types are equivalent, false otherwise
+     */
+    public boolean isEquivalentTo(final Type type) {
+        return this.weight() == type.weight() || (isObject() && type.isObject());
+    }
+
+    /**
+     * Determine if a type can be assigned to from another
+     *
+     * @param type0 the first type to check
+     * @param type1 the second type to check
+     *
+     * @return true if type1 can be written to type2, false otherwise
+     */
+    public static boolean isAssignableFrom(final Type type0, final Type type1) {
+        if (type0.isObject() && type1.isObject()) {
+            return type0.weight() >= type1.weight();
+        }
+
+        return type0.weight() == type1.weight();
+    }
+
+    /**
+     * Determine if this type is assignable from another type
+     * @param type the type to check against
+     *
+     * @return true if "type" can be written to this type, false otherwise
+     */
+    public boolean isAssignableFrom(final Type type) {
+        return Type.isAssignableFrom(this, type);
+    }
+
+    /**
+     * Determines is this type is equivalent to another, i.e. needs no conversion
+     * to be assigned to it.
+     *
+     * @param type0 the first type to check
+     * @param type1 the second type to check
+     *
+     * @return true if this type is equivalent to type, false otherwise
+     */
+    public static boolean areEquivalent(final Type type0, final Type type1) {
+        return type0.isEquivalentTo(type1);
+    }
+
+    /**
+     * Determine the number of bytecode slots a type takes up
+     *
+     * @return the number of slots for this type, 1 or 2.
+     */
+    public int getSlots() {
+        return slots;
+    }
+    /**
+     * Returns the widest or most common of two types
+     *
+     * @param type0 type one
+     * @param type1 type two
+     *
+     * @return the widest type
+     */
+    public static Type widest(final Type type0, final Type type1) {
+        if (type0.isArray() && type1.isArray()) {
+            return ((ArrayType)type0).getElementType() == ((ArrayType)type1).getElementType() ? type0 : Type.OBJECT;
+        } else if (type0.isArray() != type1.isArray()) {
+            return Type.OBJECT; //array and non array is always object, widest(Object[], int) NEVER returns Object[], which has most weight. that does not make sense
+        }
+        return type0.weight() > type1.weight() ? type0 : type1;
+    }
+
+    /**
+     * Returns the narrowest or least common of two types
+     *
+     * @param type0 type one
+     * @param type1 type two
+     *
+     * @return the widest type
+     */
+    public static Type narrowest(final Type type0, final Type type1) {
+        return type0.weight() < type1.weight() ? type0 : type1;
+    }
+
+    /**
+     * Returns the widest or most common of two types, but no wider than "limit"
+     *
+     * @param type0 type one
+     * @param type1 type two
+     * @param limit limiting type
+     *
+     * @return the widest type, but no wider than limit
+     */
+    public static Type widest(final Type type0, final Type type1, final Type limit) {
+        final Type type = Type.widest(type0,  type1);
+        if (type.weight() > limit.weight()) {
+            return limit;
+        }
+        return type;
+    }
+
+    /**
+     * Returns the widest or most common of two types, but no narrower than "limit"
+     *
+     * @param type0 type one
+     * @param type1 type two
+     * @param limit limiting type
+     *
+     * @return the widest type, but no wider than limit
+     */
+    public static Type narrowest(final Type type0, final Type type1, final Type limit) {
+        final Type type = type0.weight() < type1.weight() ? type0 : type1;
+        if (type.weight() < limit.weight()) {
+            return limit;
+        }
+        return type;
+    }
+
+    /**
+     * Returns the narrowest of this type and another
+     *
+     * @param  other type to compare against
+     *
+     * @return the widest type
+     */
+    public Type narrowest(final Type other) {
+        return Type.narrowest(this, other);
+    }
+
+    /**
+     * Returns the widest of this type and another
+     *
+     * @param  other type to compare against
+     *
+     * @return the widest type
+     */
+    public Type widest(final Type other) {
+        return Type.widest(this, other);
+    }
+
+    /**
+     * Returns the weight of a type, used for type comparison
+     * between wider and narrower types
+     *
+     * @return the weight
+     */
+    int weight() {
+        return weight;
+    }
+
+    /**
+     * Return the descriptor of a type, used for e.g. signature
+     * generation
+     *
+     * @return the descriptor
+     */
+    public String getDescriptor() {
+        return descriptor;
+    }
+
+    @Override
+    public String toString() {
+        return name;
+    }
+
+    /**
+     * Return the (possibly cached) Type object for this class
+     *
+     * @param clazz the class to check
+     *
+     * @return the Type representing this class
+     */
+    public static Type typeFor(final Class<?> clazz) {
+        Type type = cache.get(clazz);
+
+        if (type == null) {
+            assert !clazz.isPrimitive() || clazz == void.class;
+            if (clazz.isArray()) {
+                type = new ArrayType(clazz);
+            } else {
+                type = new ObjectType(clazz);
+            }
+            cache.put(clazz, type);
+        }
+
+        return type;
+    }
+
+    @Override
+    public int compareTo(final Type o) {
+        return o.weight() - weight();
+    }
+
+    /**
+     * Common logic for implementing dup for all types
+     *
+     * @param method method visitor
+     * @param depth dup depth
+     *
+     * @return the type at the top of the stack afterwards
+     */
+    @Override
+    public Type dup(final MethodVisitor method, final int depth) {
+        return Type.dup(method, this, depth);
+    }
+
+    /**
+     * Common logic for implementing swap for all types
+     *
+     * @param method method visitor
+     * @param other  the type to swap with
+     *
+     * @return the type at the top of the stack afterwards, i.e. other
+     */
+    @Override
+    public Type swap(final MethodVisitor method, final Type other) {
+        Type.swap(method, this, other);
+        return other;
+    }
+
+    /**
+     * Common logic for implementing pop for all types
+     *
+     * @param method method visitor
+     *
+     * @return the type that was popped
+     */
+    @Override
+    public Type pop(final MethodVisitor method) {
+        Type.pop(method, this);
+        return this;
+    }
+
+    /**
+     * Superclass logic for pop for all types
+     *
+     * @param method method emitter
+     * @param type   type to pop
+     */
+    protected static void pop(final MethodVisitor method, final Type type) {
+        method.visitInsn(type.isCategory2() ? POP2 : POP);
+    }
+
+    private static Type dup(final MethodVisitor method, final Type type, final int depth) {
+        final boolean       cat2 = type.isCategory2();
+
+        switch (depth) {
+        case 0:
+            method.visitInsn(cat2 ? DUP2 : DUP);
+            break;
+        case 1:
+            method.visitInsn(cat2 ? DUP2_X1 : DUP_X1);
+            break;
+        case 2:
+            method.visitInsn(cat2 ? DUP2_X2 : DUP_X2);
+            break;
+        default:
+            return null; //invalid depth
+        }
+
+        return type;
+    }
+
+    private static void swap(final MethodVisitor method, final Type above, final Type below) {
+        final MethodVisitor mv = method;
+        if (below.isCategory2()) {
+            if (above.isCategory2()) {
+                mv.visitInsn(DUP2_X2);
+                mv.visitInsn(POP2);
+            } else {
+                mv.visitInsn(DUP_X2);
+                mv.visitInsn(POP);
+            }
+        } else {
+            if (above.isCategory2()) {
+                mv.visitInsn(DUP2_X1);
+                mv.visitInsn(POP2);
+            } else {
+                mv.visitInsn(SWAP);
+            }
+        }
+
+    }
+
+    /**
+     * This is the boolean singleton, used for all boolean types
+     */
+    public static final Type BOOLEAN = new BooleanType();
+
+    /**
+     * This is an integer type, i.e INT, INT32.
+     */
+    public static final Type INT = new IntType();
+
+    /**
+     * This is the number singleton, used for all number types
+     */
+    public static final Type NUMBER = new NumberType();
+
+    /**
+     * This is the long singleton, used for all long types
+     */
+    public static final Type LONG = new LongType();
+
+    /**
+     * A string singleton
+     */
+    public static final Type STRING = new ObjectType(String.class);
+
+    /**
+     * This is the object singleton, used for all object types
+     */
+    public static final Type OBJECT = new ObjectType();
+
+    /**
+     * This is the singleton for integer arrays
+     */
+    public static final ArrayType INT_ARRAY = new ArrayType(int[].class) {
+        @Override
+        public void astore(final MethodVisitor method) {
+            method.visitInsn(IASTORE);
+        }
+
+        @Override
+        public Type aload(final MethodVisitor method) {
+            method.visitInsn(IALOAD);
+            return INT;
+        }
+
+        @Override
+        public Type newarray(final MethodVisitor method) {
+            method.visitIntInsn(NEWARRAY, T_INT);
+            return this;
+        }
+
+        @Override
+        public Type getElementType() {
+            return INT;
+        }
+    };
+
+    /**
+     * This is the singleton for long arrays
+     */
+    public static final ArrayType LONG_ARRAY = new ArrayType(long[].class) {
+        @Override
+        public void astore(final MethodVisitor method) {
+            method.visitInsn(LASTORE);
+        }
+
+        @Override
+        public Type aload(final MethodVisitor method) {
+            method.visitInsn(IALOAD);
+            return INT;
+        }
+
+        @Override
+        public Type newarray(final MethodVisitor method) {
+            method.visitIntInsn(NEWARRAY, T_INT);
+            return this;
+        }
+
+        @Override
+        public Type getElementType() {
+            return INT;
+        }
+    };
+
+    /**
+     * This is the singleton for numeric arrays
+     */
+    public static final ArrayType NUMBER_ARRAY = new ArrayType(double[].class) {
+        @Override
+        public void astore(final MethodVisitor method) {
+            method.visitInsn(DASTORE);
+        }
+
+        @Override
+        public Type aload(final MethodVisitor method) {
+            method.visitInsn(DALOAD);
+            return NUMBER;
+        }
+
+        @Override
+        public Type newarray(final MethodVisitor method) {
+            method.visitIntInsn(NEWARRAY, T_DOUBLE);
+            return this;
+        }
+
+        @Override
+        public Type getElementType() {
+            return NUMBER;
+        }
+    };
+
+    /** Singleton for method handle arrays used for properties etc. */
+    public static final ArrayType METHODHANDLE_ARRAY = new ArrayType(new MethodHandle[0].getClass());
+
+    /** This is the singleton for string arrays */
+    public static final ArrayType STRING_ARRAY = new ArrayType(new String[0].getClass());
+
+    /** This is the singleton for object arrays */
+    public static final ArrayType OBJECT_ARRAY = new ArrayType(new Object[0].getClass());
+
+    /** This type, always an object type, just a toString override */
+    public static final Type THIS = new ObjectType() {
+        @Override
+        public String toString() {
+            return "this";
+        }
+    };
+
+    /** Scope type, always an object type, just a toString override */
+    public static final Type SCOPE = new ObjectType() {
+        @Override
+        public String toString() {
+            return "scope";
+        }
+    };
+
+    private static interface Unknown {
+        // EMPTY - used as a class that is absolutely not compatible with a type to represent "unknown"
+    }
+
+    /**
+     * This is the unknown type which is used as initial type for type
+     * inference. It has the minimum type width
+     */
+    public static final Type UNKNOWN = new Type("<unknown>", Unknown.class, MIN_WEIGHT, 1) {
+
+        @Override
+        public String getDescriptor() {
+            return "<unknown>";
+        }
+
+        @Override
+        public Type load(final MethodVisitor method, final int slot) {
+            assert false : "unsupported operation";
+            return null;
+        }
+
+        @Override
+        public void store(final MethodVisitor method, final int slot) {
+            assert false : "unsupported operation";
+        }
+
+        @Override
+        public Type ldc(final MethodVisitor method, final Object c) {
+            assert false : "unsupported operation";
+            return null;
+        }
+
+        @Override
+        public Type loadUndefined(final MethodVisitor method) {
+            assert false : "unsupported operation";
+            return null;
+        }
+
+        @Override
+        public Type loadEmpty(final MethodVisitor method) {
+            assert false : "unsupported operation";
+            return null;
+        }
+
+        @Override
+        public Type convert(final MethodVisitor method, final Type to) {
+            assert false : "unsupported operation";
+            return null;
+        }
+
+        @Override
+        public void _return(final MethodVisitor method) {
+            assert false : "unsupported operation";
+        }
+
+        @Override
+        public Type add(final MethodVisitor method) {
+            assert false : "unsupported operation";
+            return null;
+        }
+    };
+
+    /** Mappings between java classes and their Type singletons */
+    private static final Map<Class<?>, Type> cache = Collections.synchronizedMap(new HashMap<Class<?>, Type>());
+
+    //TODO may need to be cleared, as all types are retained throughout code generation
+    static {
+        cache.put(BOOLEAN.getTypeClass(), BOOLEAN);
+        cache.put(INT.getTypeClass(),     INT);
+        cache.put(LONG.getTypeClass(),    LONG);
+        cache.put(NUMBER.getTypeClass(),  NUMBER);
+        cache.put(STRING.getTypeClass(),  STRING);
+        cache.put(OBJECT.getTypeClass(),  OBJECT);
+        cache.put(OBJECT_ARRAY.getTypeClass(), OBJECT_ARRAY);
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/AccessNode.java b/nashorn/src/jdk/nashorn/internal/ir/AccessNode.java
new file mode 100644
index 00000000000..b45ae8ffeb4
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/AccessNode.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir;
+
+import static jdk.nashorn.internal.codegen.objects.ObjectClassGenerator.DEBUG_FIELDS;
+
+import jdk.nashorn.internal.codegen.objects.ObjectClassGenerator;
+import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * IR representation of a property access (period operator.)
+ *
+ */
+public class AccessNode extends BaseNode implements TypeOverride {
+    /** Property ident. */
+    private IdentNode property;
+
+    /** Does this node have a type override */
+    private boolean hasCallSiteType;
+
+    /**
+     * Constructor
+     *
+     * @param source    source code
+     * @param token     token
+     * @param finish    finish
+     * @param base      base node
+     * @param property  property
+     */
+    public AccessNode(final Source source, final long token, final int finish, final Node base, final IdentNode property) {
+        super(source, token, finish, base);
+
+        this.start    = base.getStart();
+        this.property = property;
+
+        this.property.setIsPropertyName();
+    }
+
+    /**
+     * Copy constructor
+     *
+     * @param accessNode  source node
+     */
+    public AccessNode(final AccessNode accessNode) {
+        this(accessNode, new CopyState());
+    }
+
+    /**
+     * Internal copy constructor
+     *
+     * @param accessNode  source node
+     * @param cs          copy state
+     */
+    protected AccessNode(final AccessNode accessNode, final CopyState cs) {
+        super(accessNode, cs);
+        this.property = (IdentNode)cs.existingOrCopy(accessNode.getProperty());
+    }
+
+    @Override
+    protected Node copy(final CopyState cs) {
+        return new AccessNode(this, cs);
+    }
+
+    @Override
+    public boolean equals(final Object other) {
+        if (!super.equals(other)) {
+            return false;
+        }
+        final AccessNode accessNode = (AccessNode)other;
+        return property.equals(accessNode.getProperty());
+    }
+
+    @Override
+    public int hashCode() {
+        return super.hashCode() ^ property.hashCode();
+    }
+
+    /**
+     * Assist in IR navigation.
+     * @param visitor IR navigating visitor.
+     */
+    @Override
+    public Node accept(final NodeVisitor visitor) {
+        if (visitor.enter(this) != null) {
+            base = base.accept(visitor);
+            property = (IdentNode)property.accept(visitor);
+            return visitor.leave(this);
+        }
+
+        return this;
+    }
+
+    @Override
+    public void toString(final StringBuilder sb) {
+        final boolean needsParen = tokenType().needsParens(getBase().tokenType(), true);
+
+        if (hasCallSiteType) {
+            sb.append('{');
+            final String desc = getType().getDescriptor();
+            sb.append(desc.charAt(desc.length() - 1) == ';' ? "O" : getType().getDescriptor());
+            sb.append('}');
+        }
+
+        if (needsParen) {
+            sb.append('(');
+        }
+
+        base.toString(sb);
+
+        if (needsParen) {
+            sb.append(')');
+        }
+        sb.append('.');
+
+        sb.append(property.getName());
+    }
+
+    /**
+     * Get the property
+     *
+     * @return the property IdentNode
+     */
+    public IdentNode getProperty() {
+        return property;
+    }
+
+    @Override
+    public void setType(final Type type) {
+        if (DEBUG_FIELDS && !Type.areEquivalent(getSymbol().getSymbolType(), type)) {
+            ObjectClassGenerator.LOG.info(getClass().getName() + " " + this + " => " + type + " instead of " + getType());
+        }
+        property.setType(type);
+        getSymbol().setTypeOverride(type); //always a temp so this is fine.
+        hasCallSiteType = true;
+    }
+
+    @Override
+    public boolean canHaveCallSiteType() {
+        return true; //carried by the symbol and always the same nodetype==symboltype
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/Assignment.java b/nashorn/src/jdk/nashorn/internal/ir/Assignment.java
new file mode 100644
index 00000000000..eb590874c2d
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/Assignment.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir;
+
+/**
+ * Can a node be an assignment under certain circumstances?
+ * Then it should implement this interface
+ *
+ * @param <D> the destination type
+ */
+public interface Assignment<D extends Node> {
+
+    /**
+     * Get assignment destination
+     *
+     * @return get the assignment destination node
+     */
+    public D getAssignmentDest();
+
+    /**
+     * Get the assignment source
+     *
+     * @return get the assignment source node
+     */
+    public Node getAssignmentSource();
+
+    /**
+     * Reset the assignment source
+     *
+     * @param newSource new source node
+     */
+    public void setAssignmentSource(final Node newSource);
+
+    /**
+     * Reset the assignment destination
+     *
+     * @param newDest new destination node
+     */
+    public void setAssignmentDest(final D newDest);
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/BaseNode.java b/nashorn/src/jdk/nashorn/internal/ir/BaseNode.java
new file mode 100644
index 00000000000..12c56a2902c
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/BaseNode.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir;
+
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * IR base for accessing/indexing nodes.
+ *
+ * @see AccessNode
+ * @see IndexNode
+ */
+public abstract class BaseNode extends Node implements FunctionCall {
+
+    /** Base Node. */
+    protected Node base;
+
+    /**
+     * Constructor
+     *
+     * @param source source code
+     * @param token  token
+     * @param finish finish
+     * @param base   base node
+     */
+    public BaseNode(final Source source, final long token, final int finish, final Node base) {
+        super(source, token, finish);
+        this.base = base;
+        setStart(base.getStart());
+    }
+
+    /**
+     * Copy constructor
+     *
+     * @param baseNode the base node
+     * @param cs       a copy state
+     */
+    protected BaseNode(final BaseNode baseNode, final CopyState cs) {
+        super(baseNode);
+        base = cs.existingOrCopy(baseNode.getBase());
+        setStart(base.getStart());
+    }
+
+    @Override
+    public boolean equals(final Object other) {
+        if (!super.equals(other)) {
+            return false;
+        }
+        final BaseNode baseNode = (BaseNode)other;
+        return base.equals(baseNode.getBase());
+    }
+
+    @Override
+    public int hashCode() {
+        return base.hashCode();
+    }
+
+    /**
+     * Get the base node for this access
+     * @return the base node
+     */
+    public Node getBase() {
+        return base;
+    }
+
+    /**
+     * Reset the base node for this access
+     * @param base new base node
+     */
+    public void setBase(final Node base) {
+        this.base = base;
+    }
+
+    @Override
+    public boolean isFunction() {
+        return false;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/BinaryNode.java b/nashorn/src/jdk/nashorn/internal/ir/BinaryNode.java
new file mode 100644
index 00000000000..0d14174540b
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/BinaryNode.java
@@ -0,0 +1,246 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir;
+
+import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.parser.TokenType;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * BinaryNode nodes represent two operand operations.
+ */
+public class BinaryNode extends UnaryNode {
+    /** Left hand side argument. */
+    protected Node lhs;
+
+    /**
+     * Constructor
+     *
+     * @param source source code
+     * @param token  token
+     * @param lhs    left hand side
+     * @param rhs    right hand side
+     */
+    public BinaryNode(final Source source, final long token, final Node lhs, final Node rhs) {
+        super(source, token, rhs);
+
+        start  = lhs.getStart();
+        finish = rhs.getFinish();
+
+        this.lhs = lhs;
+    }
+
+    /**
+     * Copy constructor
+     *
+     * @param binaryNode the binary node
+     * @param cs         copy state
+     */
+    protected BinaryNode(final BinaryNode binaryNode, final CopyState cs) {
+        super(binaryNode, cs);
+        lhs = cs.existingOrCopy(binaryNode.lhs);
+    }
+
+    @Override
+    protected Node copy(final CopyState cs) {
+        return new BinaryNode(this, cs);
+    }
+
+    /**
+     * Return the widest possible type for this operation. This is used for compile time
+     * static type inference
+     *
+     * @return Type
+     */
+    @Override
+    public Type getWidestOperationType() {
+        switch (tokenType()) {
+        case SHR:
+        case ASSIGN_SHR:
+            return Type.LONG;
+        case ASSIGN_SAR:
+        case ASSIGN_SHL:
+        case ASSIGN_BIT_AND:
+        case ASSIGN_BIT_OR:
+        case ASSIGN_BIT_XOR:
+        case SAR:
+        case SHL:
+            return Type.INT;
+        case DIV:
+        case MOD:
+        case MUL:
+        case ASSIGN_DIV:
+        case ASSIGN_MOD:
+        case ASSIGN_MUL:
+        case ASSIGN_SUB:
+            return Type.NUMBER;
+        default:
+            return Type.OBJECT;
+        }
+    }
+
+    /**
+     * Check if this node is an assigment
+     *
+     * @return true if this node assigns a value
+     */
+    @Override
+    public boolean isAssignment() {
+        switch (tokenType()) {
+        case ASSIGN:
+        case ASSIGN_ADD:
+        case ASSIGN_BIT_AND:
+        case ASSIGN_BIT_OR:
+        case ASSIGN_BIT_XOR:
+        case ASSIGN_DIV:
+        case ASSIGN_MOD:
+        case ASSIGN_MUL:
+        case ASSIGN_SAR:
+        case ASSIGN_SHL:
+        case ASSIGN_SHR:
+        case ASSIGN_SUB:
+           return true;
+        default:
+           return false;
+        }
+    }
+
+    @Override
+    public boolean isSelfModifying() {
+        return isAssignment() && tokenType() != TokenType.ASSIGN;
+    }
+
+    @Override
+    public Node getAssignmentDest() {
+        return isAssignment() ? lhs() : null;
+    }
+
+    @Override
+    public void setAssignmentDest(final Node node) {
+        setLHS(node);
+    }
+
+    @Override
+    public Node getAssignmentSource() {
+        return rhs();
+    }
+
+    @Override
+    public void setAssignmentSource(final Node source) {
+        setRHS(source);
+    }
+
+    @Override
+    public boolean equals(final Object other) {
+        if (!super.equals(other)) {
+            return false;
+        }
+        return lhs.equals(((BinaryNode)other).lhs());
+    }
+
+    @Override
+    public int hashCode() {
+        return super.hashCode() ^ lhs().hashCode();
+    }
+
+    /**
+     * Assist in IR navigation.
+     * @param visitor IR navigating visitor.
+     */
+    @Override
+    public Node accept(final NodeVisitor visitor) {
+        if (visitor.enter(this) != null) {
+            lhs = lhs.accept(visitor);
+            rhs = rhs.accept(visitor);
+            return visitor.leave(this);
+        }
+
+        return this;
+    }
+
+    @Override
+    public void toString(final StringBuilder sb) {
+        final TokenType type = tokenType();
+
+        final boolean lhsParen = type.needsParens(lhs().tokenType(), true);
+        final boolean rhsParen = type.needsParens(rhs().tokenType(), false);
+
+        if (lhsParen) {
+            sb.append('(');
+        }
+
+        lhs().toString(sb);
+
+        if (lhsParen) {
+            sb.append(')');
+        }
+
+        sb.append(' ');
+
+        switch (type) {
+        case COMMALEFT:
+            sb.append(",<");
+            break;
+        case COMMARIGHT:
+            sb.append(",>");
+            break;
+        case INCPREFIX:
+        case DECPREFIX:
+            sb.append("++");
+            break;
+        default:
+            sb.append(type.getName());
+            break;
+        }
+
+        sb.append(' ');
+
+        if (rhsParen) {
+            sb.append('(');
+        }
+        rhs().toString(sb);
+        if (rhsParen) {
+            sb.append(')');
+        }
+    }
+
+    /**
+     * Get the left hand side expression for this node
+     * @return the left hand side expression
+     */
+    public Node lhs() {
+        return lhs;
+    }
+
+    /**
+     * Set the left hand side expression for this node
+     * @param lhs new left hand side expression
+     */
+    public void setLHS(final Node lhs) {
+        this.lhs = lhs;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/Block.java b/nashorn/src/jdk/nashorn/internal/ir/Block.java
new file mode 100644
index 00000000000..f9e48c0d959
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/Block.java
@@ -0,0 +1,591 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir;
+
+import static jdk.nashorn.internal.ir.Symbol.IS_GLOBAL;
+import static jdk.nashorn.internal.ir.Symbol.IS_INTERNAL;
+import static jdk.nashorn.internal.ir.Symbol.IS_LET;
+import static jdk.nashorn.internal.ir.Symbol.IS_PARAM;
+import static jdk.nashorn.internal.ir.Symbol.IS_SCOPE;
+import static jdk.nashorn.internal.ir.Symbol.IS_VAR;
+import static jdk.nashorn.internal.ir.Symbol.KINDMASK;
+
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import jdk.nashorn.internal.codegen.Frame;
+import jdk.nashorn.internal.codegen.MethodEmitter.Label;
+import jdk.nashorn.internal.ir.annotations.Ignore;
+import jdk.nashorn.internal.ir.annotations.ParentNode;
+import jdk.nashorn.internal.ir.annotations.Reference;
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * IR representation for a list of statements and functions. All provides the
+ * basis for script body.
+ *
+ */
+public class Block extends Node {
+    /** Parent context */
+    @ParentNode @Reference
+    private Block parent;
+
+    /** Owning function. */
+    @Ignore @Reference
+    protected FunctionNode function;
+
+    /** List of statements */
+    protected List<Node> statements;
+
+    /** Symbol table. */
+    protected final HashMap<String, Symbol> symbols;
+
+    /** Variable frame. */
+    protected Frame frame;
+
+    /** Entry label. */
+    protected final Label entryLabel;
+
+    /** Break label. */
+    protected final Label breakLabel;
+
+    /** Does the block/function need a new scope? */
+    protected boolean needsScope;
+
+    /**
+     * Constructor
+     *
+     * @param source   source code
+     * @param token    token
+     * @param finish   finish
+     * @param parent   reference to parent block
+     * @param function function node this block is in
+     */
+    public Block(final Source source, final long token, final int finish, final Block parent, final FunctionNode function) {
+        super(source, token, finish);
+
+        this.parent     = parent;
+        this.function   = function;
+        this.statements = new ArrayList<>();
+        this.symbols    = new HashMap<>();
+        this.frame      = null;
+        this.entryLabel = new Label("block_entry");
+        this.breakLabel = new Label("block_break");
+    }
+
+    /**
+     * Internal copy constructor
+     *
+     * @param block the source block
+     * @param cs    the copy state
+     */
+    protected Block(final Block block, final CopyState cs) {
+        super(block);
+
+        parent     = block.parent;
+        function   = block.function;
+        statements = new ArrayList<>();
+        for (final Node statement : block.getStatements()) {
+            statements.add(cs.existingOrCopy(statement));
+        }
+        symbols    = new HashMap<>();
+        frame      = block.frame == null ? null : block.frame.copy();
+        entryLabel = new Label(block.entryLabel);
+        breakLabel = new Label(block.breakLabel);
+
+        assert block.symbols.isEmpty() : "must not clone with symbols";
+    }
+
+    @Override
+    protected Node copy(final CopyState cs) {
+        return fixBlockChain(new Block(this, cs));
+    }
+
+    /**
+     * Whenever a clone that contains a hierarchy of blocks is created,
+     * this function has to be called to ensure that the parents point
+     * to the correct parent blocks or two different ASTs would not
+     * be completely separated.
+     *
+     * @return the argument
+     */
+    static Block fixBlockChain(final Block root) {
+        root.accept(new NodeVisitor() {
+            private Block        parent   = root.getParent();
+            private final FunctionNode function = root.getFunction();
+
+            @Override
+            public Node enter(final Block block) {
+                assert block.getFunction() == function;
+                block.setParent(parent);
+                parent = block;
+
+                return block;
+            }
+
+            @Override
+            public Node leave(final Block block) {
+                parent = block.getParent();
+
+                return block;
+            }
+
+            @Override
+            public Node enter(final FunctionNode functionNode) {
+                assert functionNode.getFunction() == function;
+
+                return enter((Block)functionNode);
+            }
+
+            @Override
+            public Node leave(final FunctionNode functionNode) {
+                assert functionNode.getFunction() == function;
+
+                return leave((Block)functionNode);
+            }
+
+        });
+
+        return root;
+    }
+
+    /**
+     * Add a new statement to the statement list.
+     *
+     * @param statement Statement node to add.
+     */
+    public void addStatement(final Node statement) {
+        if (statement != null) {
+            statements.add(statement);
+        }
+    }
+
+    /**
+     * Prepend a statement to the statement list
+     *
+     * @param statement Statement node to add
+     */
+    public void prependStatement(final Node statement) {
+        if (statement != null) {
+            final List<Node> newStatements = new ArrayList<>();
+            newStatements.add(statement);
+            newStatements.addAll(statements);
+            setStatements(newStatements);
+        }
+    }
+
+    /**
+     * Add a list of statements to the statement list.
+     *
+     * @param statementList Statement nodes to add.
+     */
+    public void addStatements(final List<Node> statementList) {
+        statements.addAll(statementList);
+    }
+
+    /**
+     * Add a new function to the function list.
+     *
+     * @param functionNode Function node to add.
+     */
+    public void addFunction(final FunctionNode functionNode) {
+        assert parent != null : "Parent context missing.";
+
+        parent.addFunction(functionNode);
+    }
+
+    /**
+     * Add a list of functions to the function list.
+     *
+     * @param functionNodes Function nodes to add.
+     */
+    public void addFunctions(final List<FunctionNode> functionNodes) {
+        assert parent != null : "Parent context missing.";
+
+        parent.addFunctions(functionNodes);
+    }
+
+    /**
+     * Set the function list to a new one
+     *
+     * @param functionNodes the nodes to set
+     */
+    public void setFunctions(final List<FunctionNode> functionNodes) {
+        assert parent != null : "Parent context missing.";
+
+        parent.setFunctions(functionNodes);
+    }
+
+    /**
+     * Assist in IR navigation.
+     *
+     * @param visitor IR navigating visitor.
+     * @return new or same node
+     */
+    @Override
+    public Node accept(final NodeVisitor visitor) {
+        final Block saveBlock = visitor.getCurrentBlock();
+        visitor.setCurrentBlock(this);
+
+        try {
+            // Ignore parent to avoid recursion.
+
+            if (visitor.enter(this) != null) {
+                for (int i = 0, count = statements.size(); i < count; i++) {
+                    final Node statement = statements.get(i);
+                    statements.set(i, statement.accept(visitor));
+                }
+
+                return visitor.leave(this);
+            }
+        } finally {
+            visitor.setCurrentBlock(saveBlock);
+        }
+
+        return this;
+    }
+
+    /**
+     * Search for symbol.
+     *
+     * @param name Symbol name.
+     *
+     * @return Found symbol or null if not found.
+     */
+    public Symbol findSymbol(final String name) {
+        // Search up block chain to locate symbol.
+
+        for (Block block = this; block != null; block = block.getParent()) {
+            // Find name.
+            final Symbol symbol = block.getSymbols().get(name);
+            // If found then we are good.
+            if (symbol != null) {
+                return symbol;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Search for symbol in current function.
+     *
+     * @param name Symbol name.
+     *
+     * @return Found symbol or null if not found.
+     */
+    public Symbol findLocalSymbol(final String name) {
+        // Search up block chain to locate symbol.
+        for (Block block = this; block != null; block = block.getParent()) {
+            // Find name.
+            final Symbol symbol = block.getSymbols().get(name);
+            // If found then we are good.
+            if (symbol != null) {
+                return symbol;
+            }
+
+            // If searched function then we are done.
+            if (block == block.function) {
+                break;
+            }
+        }
+
+        // Not found.
+        return null;
+    }
+
+    /**
+     * Test if this block represents a <tt>catch</tt> block in a <tt>try</tt> statement.
+     * This is used by the Splitter as catch blocks are not be subject to splitting.
+     *
+     * @return true if this block represents a catch block in a try statement.
+     */
+    public boolean isCatchBlock() {
+        return statements.size() == 1 && statements.get(0) instanceof CatchNode;
+    }
+
+    /**
+     * Test to see if a symbol is local to the function.
+     *
+     * @param symbol Symbol to test.
+     * @return True if a local symbol.
+     */
+    public boolean isLocal(final Symbol symbol) {
+        // some temp symbols have no block, so can be assumed local
+        final Block block = symbol.getBlock();
+        return block == null || block.getFunction() == function;
+    }
+
+    /**
+     * Declare the definition of a new symbol.
+     *
+     * @param name         Name of symbol.
+     * @param symbolFlags  Symbol flags.
+     * @param node         Defining Node.
+     *
+     * @return Symbol for given name or null for redefinition.
+     */
+    public Symbol defineSymbol(final String name, final int symbolFlags, final Node node) {
+        int    flags  = symbolFlags;
+        Symbol symbol = findSymbol(name); // Locate symbol.
+
+        if ((flags & KINDMASK) == IS_GLOBAL) {
+            flags |= IS_SCOPE;
+        }
+
+        if (symbol != null) {
+            // Symbol was already defined. Check if it needs to be redefined.
+            if ((flags & KINDMASK) == IS_PARAM) {
+                if (!function.isLocal(symbol)) {
+                    // Not defined in this function. Create a new definition.
+                    symbol = null;
+                } else if (symbol.isParam()) {
+                    // Duplicate parameter. Null return will force an error.
+                    assert false : "duplicate parameter";
+                    return null;
+                }
+            } else if ((flags & KINDMASK) == IS_VAR) {
+                if ((flags & IS_INTERNAL) == IS_INTERNAL || (flags & Symbol.IS_LET) == Symbol.IS_LET) {
+                    assert !((flags & IS_LET) == IS_LET && symbol.getBlock() == this) : "duplicate let variable in block";
+                    // Always create a new definition.
+                    symbol = null;
+                } else {
+                    // Not defined in this function. Create a new definition.
+                    if (!function.isLocal(symbol) || symbol.less(IS_VAR)) {
+                        symbol = null;
+                    }
+                }
+            }
+        }
+
+        if (symbol == null) {
+            // If not found, then create a new one.
+            Block symbolBlock;
+
+            // Determine where to create it.
+            if ((flags & Symbol.KINDMASK) == IS_VAR && ((flags & IS_INTERNAL) == IS_INTERNAL || (flags & IS_LET) == IS_LET)) {
+                symbolBlock = this;
+            } else {
+                symbolBlock = getFunction();
+            }
+
+            // Create and add to appropriate block.
+            symbol = new Symbol(name, flags, node, symbolBlock);
+            symbolBlock.putSymbol(name, symbol);
+
+            if ((flags & Symbol.KINDMASK) != IS_GLOBAL) {
+                symbolBlock.getFrame().addSymbol(symbol);
+                symbol.setNeedsSlot(true);
+            }
+        } else if (symbol.less(flags)) {
+            symbol.setFlags(flags);
+        }
+
+        if (node != null) {
+            node.setSymbol(symbol);
+        }
+
+        return symbol;
+    }
+
+    /**
+     * Declare the use of a symbol.
+     *
+     * @param name Name of symbol.
+     * @param node Using node
+     *
+     * @return Symbol for given name.
+     */
+    public Symbol useSymbol(final String name, final Node node) {
+        Symbol symbol = findSymbol(name);
+
+        if (symbol == null) {
+            // If not found, declare as a free var.
+            symbol = defineSymbol(name, IS_GLOBAL, node);
+        } else {
+            node.setSymbol(symbol);
+        }
+
+        return symbol;
+    }
+
+    /**
+     * Add parent name to the builder.
+     *
+     * @param sb String bulder.
+     */
+    public void addParentName(final StringBuilder sb) {
+        if (parent != null) {
+            parent.addParentName(sb);
+        }
+    }
+
+    @Override
+    public void toString(final StringBuilder sb) {
+        for (final Node statement : statements) {
+            statement.toString(sb);
+            sb.append(';');
+        }
+    }
+
+    /**
+     * Print symbols in block (debugging.)
+     *
+     * @param stream print writer to output symbols to
+     *
+     * @return true if symbols were found
+     */
+    public boolean printSymbols(final PrintWriter stream) {
+        final Collection<Symbol> values = symbols.values();
+
+        for (final Symbol symbol : values) {
+            symbol.print(stream);
+        }
+
+        return !values.isEmpty();
+    }
+
+    /**
+     * Get the break label for this block
+     * @return the break label
+     */
+    public Label getBreakLabel() {
+        return breakLabel;
+    }
+
+    /**
+     * Get the entry label for this block
+     * @return the entry label
+     */
+    public Label getEntryLabel() {
+        return entryLabel;
+    }
+
+    /**
+     * Get the frame for this block
+     * @return the frame
+     */
+    public Frame getFrame() {
+        return frame;
+    }
+
+    /**
+     * Get the FunctionNode for this block, i.e. the function it
+     * belongs to
+     *
+     * @return the function node
+     */
+    public FunctionNode getFunction() {
+        return function;
+    }
+
+    /**
+     * Reset the frame for this block
+     *
+     * @param frame  the new frame
+     */
+    public void setFrame(final Frame frame) {
+        this.frame = frame;
+    }
+
+    /**
+     * Get the parent block
+     *
+     * @return parent block, or null if none exists
+     */
+    public Block getParent() {
+        return parent;
+    }
+
+    /**
+     * Set the parent block
+     *
+     * @param parent the new parent block
+     */
+    public void setParent(final Block parent) {
+        this.parent = parent;
+    }
+
+    /**
+     * Get the list of statements in this block
+     *
+     * @return a list of statements
+     */
+    public List<Node> getStatements() {
+        return Collections.unmodifiableList(statements);
+    }
+
+    /**
+     * Reset the statement list for this block
+     *
+     * @param statements  new statement list
+     */
+    public void setStatements(final List<Node> statements) {
+        this.statements = statements;
+    }
+
+    /**
+     * Add or overwrite an existing symbol in the block
+     *
+     * @param name   name of symbol
+     * @param symbol symbol
+     */
+    public void putSymbol(final String name, final Symbol symbol) {
+        symbols.put(name, symbol);
+    }
+
+    /**
+     * Get the symbol table for this block
+     *
+     * @return a symbol table, which is a map from symbol name to symbol.
+     */
+    private Map<String, Symbol> getSymbols() {
+        return symbols;
+    }
+
+    /**
+     * Check whether scope is necessary for this Block
+     *
+     * @return true if this function needs a scope
+     */
+    public boolean needsScope() {
+        return needsScope;
+    }
+
+    /**
+     * Reset the needs scope flag.
+     *
+     * @param needsScope  new needs scope flag
+     */
+    public void setNeedsScope(final boolean needsScope) {
+        this.needsScope = needsScope;
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/BreakNode.java b/nashorn/src/jdk/nashorn/internal/ir/BreakNode.java
new file mode 100644
index 00000000000..4e7f2ce2b70
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/BreakNode.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir;
+
+import jdk.nashorn.internal.codegen.MethodEmitter;
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * IR representation for {@code break} statements.
+ */
+public class BreakNode extends LabeledNode {
+
+     /**
+     * Constructor
+     *
+     * @param source     source code
+     * @param token      token
+     * @param finish     finish
+     * @param labelNode  break label
+     * @param targetNode node to break to
+     * @param tryChain   surrounding try chain
+     */
+    public BreakNode(final Source source, final long token, final int finish, final LabelNode labelNode, final Node targetNode, final TryNode tryChain) {
+        super(source, token, finish, labelNode, targetNode, tryChain);
+        setHasGoto();
+    }
+
+    private BreakNode(final BreakNode breakNode, final CopyState cs) {
+        super(breakNode, cs);
+    }
+
+    @Override
+    protected Node copy(final CopyState cs) {
+        return new BreakNode(this, cs);
+    }
+
+    /**
+     * Assist in IR navigation.
+     * @param visitor IR navigating visitor.
+     */
+    @Override
+    public Node accept(final NodeVisitor visitor) {
+        if (visitor.enter(this) != null) {
+            return visitor.leave(this);
+        }
+
+        return this;
+    }
+
+    /**
+     * Return the target label of this break node.
+     * @return the target label.
+     */
+    public MethodEmitter.Label getTargetLabel() {
+        if (targetNode instanceof BreakableNode) {
+            return ((BreakableNode)targetNode).getBreakLabel();
+        } else if (targetNode instanceof Block) {
+            return ((Block)targetNode).getBreakLabel();
+        }
+
+        throw new AssertionError("Invalid break target " + targetNode.getClass());
+    }
+
+    @Override
+    public void toString(final StringBuilder sb) {
+        sb.append("break");
+
+        if (labelNode != null) {
+            sb.append(' ');
+            labelNode.getLabel().toString(sb);
+        }
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/BreakableNode.java b/nashorn/src/jdk/nashorn/internal/ir/BreakableNode.java
new file mode 100644
index 00000000000..12d8b38ef65
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/BreakableNode.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir;
+
+import jdk.nashorn.internal.codegen.MethodEmitter;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * This class represents a node from which control flow can execute
+ * a {@code break} statement
+ */
+public abstract class BreakableNode extends Node {
+
+    /** break label. */
+    protected MethodEmitter.Label breakLabel;
+
+    /**
+     * Constructor
+     *
+     * @param source   source code
+     * @param token    token
+     * @param finish   finish
+     */
+    public BreakableNode(final Source source, final long token, final int finish) {
+        super(source, token, finish);
+    }
+
+    /**
+     * Copy constructor
+     *
+     * @param breakableNode source node
+     */
+    protected BreakableNode(final BreakableNode breakableNode) {
+        super(breakableNode);
+    }
+
+    /**
+     * Return the break label, i.e. the location to go to on break.
+     * @return the break label
+     */
+    public MethodEmitter.Label getBreakLabel() {
+        return breakLabel;
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/CallNode.java b/nashorn/src/jdk/nashorn/internal/ir/CallNode.java
new file mode 100644
index 00000000000..a6998196125
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/CallNode.java
@@ -0,0 +1,271 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * IR representation for a function call.
+ *
+ */
+public class CallNode extends Node implements TypeOverride {
+
+    private Type type;
+
+    /** Function identifier or function body. */
+    private Node function;
+
+    /** Call arguments. */
+    private List<Node> args;
+
+    /** flag - is new expression */
+    private boolean isNew;
+
+    /** flag - is in with block */
+    private boolean inWithBlock;
+
+    /**
+     * Arguments to be passed to builtin {@code eval} function
+     */
+    public static class EvalArgs {
+        /** evaluated code */
+        public Node    code;
+        /** 'this' passed to evaluated code */
+        public Node    evalThis;
+        /** location string for the eval call */
+        public String  location;
+        /** is this call from a strict context? */
+        public boolean strictMode;
+    }
+
+    /** arguments for 'eval' call. Non-null only if this call node is 'eval' */
+    private EvalArgs evalArgs;
+
+    /**
+     * Constructors
+     *
+     * @param source   the source
+     * @param token    token
+     * @param finish   finish
+     * @param function the function to call
+     * @param args     args to the call
+     */
+    public CallNode(final Source source, final long token, final int finish, final Node function, final List<Node> args) {
+        super(source, token, finish);
+
+        setStart(function.getStart());
+
+        this.function     = function;
+        this.args         = args;
+    }
+
+    private CallNode(final CallNode callNode, final CopyState cs) {
+        super(callNode);
+
+        final List<Node> newArgs = new ArrayList<>();
+
+        for (final Node arg : callNode.args) {
+            newArgs.add(cs.existingOrCopy(arg));
+        }
+
+        function     = cs.existingOrCopy(callNode.function);     //TODO existing or same?
+        args         = newArgs;
+        isNew        = callNode.isNew;
+        inWithBlock  = callNode.inWithBlock;
+    }
+
+
+    @Override
+    public Type getType() {
+        if (hasCallSiteType()) {
+            return type;
+        }
+        assert !function.getType().isUnknown();
+        return function.getType();
+    }
+
+    @Override
+    public void setType(final Type type) {
+        this.type = type;
+    }
+
+    private boolean hasCallSiteType() {
+        return this.type != null;
+    }
+
+    @Override
+    public boolean canHaveCallSiteType() {
+        return true;
+    }
+
+    @Override
+    protected Node copy(final CopyState cs) {
+        return new CallNode(this, cs);
+    }
+
+    /**
+     * Assist in IR navigation.
+     *
+     * @param visitor IR navigating visitor.
+     *
+     * @return node or replacement
+     */
+    @Override
+    public Node accept(final NodeVisitor visitor) {
+        if (visitor.enter(this) != null) {
+            function = function.accept(visitor);
+
+            for (int i = 0, count = args.size(); i < count; i++) {
+                args.set(i, args.get(i).accept(visitor));
+            }
+
+            return visitor.leave(this);
+        }
+
+        return this;
+    }
+
+    @Override
+    public void toString(final StringBuilder sb) {
+        if (hasCallSiteType()) {
+            sb.append('{');
+            final String desc = getType().getDescriptor();
+            sb.append(desc.charAt(desc.length() - 1) == ';' ? "O" : getType().getDescriptor());
+            sb.append('}');
+        }
+
+        function.toString(sb);
+
+        sb.append('(');
+
+        boolean first = true;
+
+        for (final Node arg : args) {
+            if (!first) {
+                sb.append(", ");
+            } else {
+                first = false;
+            }
+
+            arg.toString(sb);
+        }
+
+        sb.append(')');
+    }
+
+    /**
+     * Get the arguments for the call
+     * @return a list of arguments
+     */
+    public List<Node> getArgs() {
+        return Collections.unmodifiableList(args);
+    }
+
+    /**
+     * Reset the arguments for the call
+     * @param args new arguments list
+     */
+    public void setArgs(final List<Node> args) {
+        this.args = args;
+    }
+
+    /**
+     * If this call is an {@code eval} call, get its EvalArgs structure
+     * @return EvalArgs for call
+     */
+    public EvalArgs getEvalArgs() {
+        return evalArgs;
+    }
+
+    /**
+     * Set the EvalArgs structure for this call, if it has been determined it is an
+     * {@code eval}
+     *
+     * @param evalArgs eval args
+     */
+    public void setEvalArgs(final EvalArgs evalArgs) {
+        this.evalArgs = evalArgs;
+    }
+
+    /**
+     * Check if this call is a call to {@code eval}
+     * @return true if this is a call to {@code eval}
+     */
+    public boolean isEval() {
+        return evalArgs != null;
+    }
+
+    /**
+     * Return the function expression that this call invokes
+     * @return the function
+     */
+    public Node getFunction() {
+        return function;
+    }
+
+    /**
+     * Reset the function expression that this call invokes
+     * @param node the function
+     */
+    public void setFunction(final Node node) {
+        function = node;
+    }
+
+    /**
+     * Check if this call is a new operation
+     * @return true if this a new operation
+     */
+    public boolean isNew() {
+        return isNew;
+    }
+
+    /**
+     * Flag this call as a new operation
+     */
+    public void setIsNew() {
+        this.isNew = true;
+    }
+
+    /**
+     * Check if this call is inside a {@code with} block
+     * @return true if the call is inside a {@code with} block
+     */
+    public boolean inWithBlock() {
+        return inWithBlock;
+    }
+
+    /**
+     * Flag this call to be inside a {@code with} block
+     */
+    public void setInWithBlock() {
+        this.inWithBlock = true;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/CaseNode.java b/nashorn/src/jdk/nashorn/internal/ir/CaseNode.java
new file mode 100644
index 00000000000..0bd34563d1c
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/CaseNode.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir;
+
+import jdk.nashorn.internal.codegen.MethodEmitter.Label;
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * IR representation of CASE clause.
+ *
+ */
+public class CaseNode extends BreakableNode {
+    /** Test expression. */
+    private Node test;
+
+    /** Statements. */
+    private Block body;
+
+    /** Case entry label. */
+    private final Label entry;
+
+    /**
+     * Constructors
+     *
+     * @param source   the source
+     * @param token    token
+     * @param finish   finish
+     * @param test     case test node, can be any node in JavaScript
+     * @param body     case body
+     */
+    public CaseNode(final Source source, final long token, final int finish, final Node test, final Block body) {
+        super(source, token, finish);
+
+        this.test  = test;
+        this.body  = body;
+        this.entry = new Label("entry");
+    }
+
+    private CaseNode(final CaseNode caseNode, final CopyState cs) {
+        super(caseNode);
+
+        this.test  = cs.existingOrCopy(caseNode.test);
+        this.body  = (Block)cs.existingOrCopy(caseNode.body);
+        this.entry = new Label(caseNode.entry);
+    }
+
+    @Override
+    protected Node copy(final CopyState cs) {
+        return new CaseNode(this, cs);
+    }
+
+    /**
+     * Assist in IR navigation.
+     * @param visitor IR navigating visitor.
+     */
+    @Override
+    public Node accept(final NodeVisitor visitor) {
+        if (visitor.enter(this) != null) {
+            if (test != null) {
+                test = test.accept(visitor);
+            }
+            if (body != null) {
+                body = (Block)body.accept(visitor);
+            }
+
+            return visitor.leave(this);
+        }
+
+        return this;
+    }
+
+    @Override
+    public void toString(final StringBuilder sb) {
+        if (test != null) {
+            sb.append("case ");
+            test.toString(sb);
+            sb.append(':');
+        } else {
+            sb.append("default:");
+        }
+    }
+
+    /**
+     * Get the body for this case node
+     * @return the body
+     */
+    public Block getBody() {
+        return body;
+    }
+
+    /**
+     * Get the entry label for this case node
+     * @return the entry label
+     */
+    public Label getEntry() {
+        return entry;
+    }
+
+    /**
+     * Get the test expression for this case node
+     * @return the test
+     */
+    public Node getTest() {
+        return test;
+    }
+
+    /**
+     * Reset the test expression for this case node
+     * @param test new test expression
+     */
+    public void setTest(final Node test) {
+        this.test = test;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/CatchNode.java b/nashorn/src/jdk/nashorn/internal/ir/CatchNode.java
new file mode 100644
index 00000000000..100ca150810
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/CatchNode.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir;
+
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * IR representation of a catch clause.
+ *
+ */
+public class CatchNode extends Node {
+    /** Exception identifier. */
+    private IdentNode exception;
+
+    /** Exception condition. */
+    private Node exceptionCondition;
+
+    /** Catch body. */
+    private Block body;
+
+    /** Is rethrow - e.g. synthetic catch block for e.g. finallies, the parser case where
+     * there has to be at least on catch for syntactic validity */
+    private boolean isSyntheticRethrow;
+
+    /**
+     * Constructors
+     *
+     * @param source             the source
+     * @param token              token
+     * @param finish             finish
+     * @param exception          variable name of exception
+     * @param exceptionCondition exception condition
+     * @param body               catch body
+     */
+    public CatchNode(final Source source, final long token, final int finish, final IdentNode exception, final Node exceptionCondition, final Block body) {
+        super (source, token, finish);
+
+        this.exception          = exception;
+        this.exceptionCondition = exceptionCondition;
+        this.body               = body;
+    }
+
+    private CatchNode(final CatchNode catchNode, final CopyState cs) {
+        super(catchNode);
+
+        exception          = (IdentNode)cs.existingOrCopy(catchNode.exception);
+        exceptionCondition = cs.existingOrCopy(catchNode.exceptionCondition);
+        body               = (Block)cs.existingOrCopy(catchNode.body);
+        isSyntheticRethrow = catchNode.isSyntheticRethrow;
+     }
+
+    @Override
+    protected Node copy(final CopyState cs) {
+        return new CatchNode(this, cs);
+    }
+
+    /**
+     * Assist in IR navigation.
+     * @param visitor IR navigating visitor.
+     */
+    @Override
+    public Node accept(final NodeVisitor visitor) {
+        if (visitor.enter(this) != null) {
+            exception = (IdentNode)exception.accept(visitor);
+
+            if (exceptionCondition != null) {
+                exceptionCondition = exceptionCondition.accept(visitor);
+            }
+
+            body = (Block)body.accept(visitor);
+            return visitor.leave(this);
+        }
+
+        return this;
+    }
+
+    @Override
+    public void toString(final StringBuilder sb) {
+        sb.append(" catch (");
+        exception.toString(sb);
+
+        if (exceptionCondition != null) {
+            sb.append(" if ");
+            exceptionCondition.toString(sb);
+        }
+        sb.append(')');
+    }
+
+    /**
+     * Check if this catch is a synthetic rethrow
+     * @return true if this is a synthetic rethrow
+     */
+    public boolean isSyntheticRethrow() {
+        return isSyntheticRethrow;
+    }
+
+    /**
+     * Flag this as deliberatly generated catch all that rethrows the
+     * caught exception. This is used for example for generating finally
+     * expressions
+     */
+    public void setIsSyntheticRethrow() {
+        this.isSyntheticRethrow = true;
+    }
+
+    /**
+     * Get the identifier representing the exception thrown
+     * @return the exception identifier
+     */
+    public IdentNode getException() {
+        return exception;
+    }
+
+    /**
+     * Get the exception condition for this catch block
+     * @return the exception condition
+     */
+    public Node getExceptionCondition() {
+        return exceptionCondition;
+    }
+
+    /**
+     * Reset the exception condition for this catch block
+     * @param exceptionCondition the new exception condition
+     */
+    public void setExceptionCondition(final Node exceptionCondition) {
+        this.exceptionCondition = exceptionCondition;
+    }
+
+    /**
+     * Get the body for this catch block
+     * @return the catch block body
+     */
+    public Block getBody() {
+        return body;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/ContinueNode.java b/nashorn/src/jdk/nashorn/internal/ir/ContinueNode.java
new file mode 100644
index 00000000000..017a24ecef1
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/ContinueNode.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir;
+
+import jdk.nashorn.internal.codegen.MethodEmitter;
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * IR representation for CONTINUE statements.
+ *
+ */
+public class ContinueNode extends LabeledNode {
+
+    /**
+     * Constructor
+     *
+     * @param source     the source
+     * @param token      token
+     * @param finish     finish
+     * @param labelNode  the continue label
+     * @param targetNode node to continue to
+     * @param tryChain   surrounding try chain
+     */
+    public ContinueNode(final Source source, final long token, final int finish, final LabelNode labelNode, final Node targetNode, final TryNode tryChain) {
+        super(source, token, finish, labelNode, targetNode, tryChain);
+        setHasGoto();
+    }
+
+    private ContinueNode(final ContinueNode continueNode, final CopyState cs) {
+        super(continueNode, cs);
+    }
+
+    @Override
+    protected Node copy(final CopyState cs) {
+        return new ContinueNode(this, cs);
+    }
+
+    @Override
+    public Node accept(final NodeVisitor visitor) {
+        if (visitor.enter(this) != null) {
+            return visitor.leave(this);
+        }
+
+        return this;
+    }
+
+    /**
+     * Return the target label of this continue node.
+     * @return the target label.
+     */
+    public MethodEmitter.Label getTargetLabel() {
+        assert targetNode instanceof WhileNode : "continue target must be a while node";
+        return ((WhileNode)targetNode).getContinueLabel();
+    }
+
+    @Override
+    public void toString(final StringBuilder sb) {
+        sb.append("continue");
+
+        if (labelNode != null) {
+            sb.append(' ');
+            labelNode.getLabel().toString(sb);
+        }
+    }
+}
+
diff --git a/nashorn/src/jdk/nashorn/internal/ir/DoWhileNode.java b/nashorn/src/jdk/nashorn/internal/ir/DoWhileNode.java
new file mode 100644
index 00000000000..c57d232c8b8
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/DoWhileNode.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir;
+
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * Loop representing do while loops. This is mostly split from WhileNode
+ * because of the different order of the Phi Traversals
+ *
+ */
+public class DoWhileNode extends WhileNode {
+
+    /**
+     * Constructor
+     *
+     * @param source     the source
+     * @param token      token
+     * @param finish     finish
+     */
+    public DoWhileNode(final Source source, final long token, final int finish) {
+        super(source, token, finish);
+    }
+
+    /**
+     * Copy constructor
+     *
+     * @param doWhileNode source node
+     * @param cs          copy state
+     */
+    protected DoWhileNode(final DoWhileNode doWhileNode, final CopyState cs) {
+        super(doWhileNode, cs);
+    }
+
+    @Override
+    protected Node copy(final CopyState cs) {
+        return new DoWhileNode(this, cs);
+    }
+
+    @Override
+    public Node accept(final NodeVisitor visitor) {
+        if (visitor.enter(this) != null) {
+            body = (Block)body.accept(visitor);
+            test = test.accept(visitor);
+
+            return visitor.leave(this);
+        }
+
+        return this;
+    }
+
+    @Override
+    public void toString(final StringBuilder sb) {
+        sb.append("while (");
+        test.toString(sb);
+        sb.append(')');
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/EmptyNode.java b/nashorn/src/jdk/nashorn/internal/ir/EmptyNode.java
new file mode 100644
index 00000000000..4fff4be2363
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/EmptyNode.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir;
+
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * IR representation for an empty statement.
+ *
+ */
+public class EmptyNode extends Node {
+
+    /**
+     * Constructor
+     *
+     * @param node node to wrap
+     */
+    public EmptyNode(final Node node) {
+        super(node);
+    }
+
+    /**
+     * Constructor
+     *
+     * @param source     the source
+     * @param token      token
+     * @param finish     finish
+     */
+    public EmptyNode(final Source source, final long token, final int finish) {
+        super(source, token, finish);
+    }
+
+
+    @Override
+    public Node accept(final NodeVisitor visitor) {
+        if (visitor.enter(this) != null) {
+            return visitor.leave(this);
+        }
+        return this;
+    }
+
+    @Override
+    public void toString(final StringBuilder sb) {
+        sb.append(';');
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/ExecuteNode.java b/nashorn/src/jdk/nashorn/internal/ir/ExecuteNode.java
new file mode 100644
index 00000000000..8211d4da49b
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/ExecuteNode.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir;
+
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * IR representation for executing bare expressions. Basically, an expression
+ * node means "this code will be executed" and evaluating it results in
+ * statements being added to the IR
+ */
+public class ExecuteNode extends Node {
+    /** Expression to execute. */
+    private Node expression;
+
+    /**
+     * Constructor
+     *
+     * @param source     the source
+     * @param token      token
+     * @param finish     finish
+     * @param expression the expression to execute
+     */
+    public ExecuteNode(final Source source, final long token, final int finish, final Node expression) {
+        super(source, token, finish);
+
+        this.expression = expression;
+    }
+
+    private ExecuteNode(final ExecuteNode executeNode, final CopyState cs) {
+        super(executeNode);
+
+        expression = cs.existingOrCopy(executeNode.expression);
+    }
+
+    @Override
+    protected Node copy(final CopyState cs) {
+        return new ExecuteNode(this, cs);
+    }
+
+    @Override
+    public boolean equals(final Object other) {
+        if (!super.equals(other)) {
+            return false;
+        }
+        return expression.equals(((ExecuteNode)other).getExpression());
+    }
+
+    @Override
+    public int hashCode() {
+        return super.hashCode() ^ expression.hashCode();
+    }
+
+    @Override
+    public Node accept(final NodeVisitor visitor) {
+        if (visitor.enter(this) != null) {
+            setExpression(expression.accept(visitor));
+            return visitor.leave(this);
+        }
+
+        return this;
+    }
+
+    @Override
+    public void toString(final StringBuilder sb) {
+        expression.toString(sb);
+    }
+
+    /**
+     * Return the expression to be executed
+     * @return the expression
+     */
+    public Node getExpression() {
+        return expression;
+    }
+
+    /**
+     * Reset the expression to be executed
+     * @param expression the expression
+     */
+    public void setExpression(final Node expression) {
+        this.expression = expression;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/ForNode.java b/nashorn/src/jdk/nashorn/internal/ir/ForNode.java
new file mode 100644
index 00000000000..71f92e84acc
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/ForNode.java
@@ -0,0 +1,213 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir;
+
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * IR representing a FOR statement.
+ *
+ */
+public class ForNode extends WhileNode {
+    /** Initialize expression. */
+    private Node init;
+
+    /** Test expression. */
+    private Node modify;
+
+    /** Iterator symbol. */
+    private Symbol iterator;
+
+    /** is for in */
+    private boolean isForIn;
+
+    /** is for each */
+    private boolean isForEach;
+
+    /**
+     * Constructor
+     *
+     * @param source     the source
+     * @param token      token
+     * @param finish     finish
+     */
+    public ForNode(final Source source, final long token, final int finish) {
+        super(source, token, finish);
+    }
+
+    private ForNode(final ForNode forNode, final CopyState cs) {
+        super(forNode, cs);
+
+        this.init      = cs.existingOrCopy(forNode.init);
+        this.modify    = cs.existingOrCopy(forNode.modify);
+        this.iterator  = forNode.iterator;
+        this.isForIn   = forNode.isForIn;
+        this.isForEach = forNode.isForEach;
+    }
+
+    @Override
+    protected Node copy(final CopyState cs) {
+        return new ForNode(this, cs);
+    }
+
+    @Override
+    public Node accept(final NodeVisitor visitor) {
+        if (visitor.enter(this) != null) {
+            if (init != null) {
+                init = init.accept(visitor);
+            }
+
+            if (test != null) {
+                test = test.accept(visitor);
+            }
+
+            if (modify != null) {
+                modify = modify.accept(visitor);
+            }
+
+            body = (Block)body.accept(visitor);
+
+            return visitor.leave(this);
+        }
+
+        return this;
+    }
+
+    @Override
+    public void toString(final StringBuilder sb) {
+        sb.append("for (");
+
+        if (isForIn()) {
+            init.toString(sb);
+            sb.append(" in ");
+            modify.toString(sb);
+        } else {
+            if (init != null) {
+                init.toString(sb);
+            }
+            sb.append("; ");
+            if (test != null) {
+                test.toString(sb);
+            }
+            sb.append("; ");
+            if (modify != null) {
+                modify.toString(sb);
+            }
+        }
+
+        sb.append(')');
+    }
+
+    /**
+     * Get the initialization expression for this for loop
+     * @return the initialization expression
+     */
+    public Node getInit() {
+        return init;
+    }
+
+    /**
+     * Reset the initialization expression for this for loop
+     * @param init new initialization expression
+     */
+    public void setInit(final Node init) {
+        this.init = init;
+    }
+
+    /**
+     * Is this a for in construct rather than a standard init;condition;modification one
+     * @return true if this is a for in constructor
+     */
+    public boolean isForIn() {
+        return isForIn;
+    }
+
+    /**
+     * Flag this to be a for in construct
+     */
+    public void setIsForIn() {
+        this.isForIn = true;
+    }
+
+    /**
+     * Is this a for each construct, known from e.g. Rhino. This will be a for of construct
+     * in ECMAScript 6
+     * @return true if this is a for each construct
+     */
+    public boolean isForEach() {
+        return isForEach;
+    }
+
+    /**
+     * Flag this to be a for each construct
+     */
+    public void setIsForEach() {
+        this.isForEach = true;
+    }
+
+    /**
+     * If this is a for in or for each construct, there is an iterator symbol
+     * @return the symbol for the iterator to be used, or null if none exists
+     */
+    public Symbol getIterator() {
+        return iterator;
+    }
+
+    /**
+     * Assign an iterator symbol to this ForNode. Used for for in and for each constructs
+     * @param iterator the iterator symbol
+     */
+    public void setIterator(final Symbol iterator) {
+        this.iterator = iterator;
+    }
+
+    /**
+     * Get the modification expression for this ForNode
+     * @return the modification expression
+     */
+    public Node getModify() {
+        return modify;
+    }
+
+    /**
+     * Reset the modification expression for this ForNode
+     * @param modify new modification expression
+     */
+    public void setModify(final Node modify) {
+        this.modify = modify;
+    }
+
+    @Override
+    public Node getTest() {
+        return test;
+    }
+
+    @Override
+    public void setTest(final Node test) {
+        this.test = test;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/FunctionCall.java b/nashorn/src/jdk/nashorn/internal/ir/FunctionCall.java
new file mode 100644
index 00000000000..2830fe1bf82
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/FunctionCall.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir;
+
+/**
+ * Interface used by AccessNodes, IndexNodes and IdentNodes to signal
+ * that they are function calls
+ */
+public interface FunctionCall {
+    /**
+     * Return true if this function call implementor is a function
+     *
+     * @return true if implements a function call
+     */
+    public boolean isFunction();
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java b/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java
new file mode 100644
index 00000000000..6d40eae98ec
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java
@@ -0,0 +1,1242 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir;
+
+import static jdk.nashorn.internal.codegen.CompilerConstants.LITERAL_PREFIX;
+import static jdk.nashorn.internal.codegen.CompilerConstants.TEMP_PREFIX;
+import static jdk.nashorn.internal.ir.Symbol.IS_CONSTANT;
+import static jdk.nashorn.internal.ir.Symbol.IS_TEMP;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Stack;
+import jdk.nashorn.internal.codegen.CompileUnit;
+import jdk.nashorn.internal.codegen.Compiler;
+import jdk.nashorn.internal.codegen.Frame;
+import jdk.nashorn.internal.codegen.MethodEmitter;
+import jdk.nashorn.internal.codegen.Namespace;
+import jdk.nashorn.internal.codegen.Splitter;
+import jdk.nashorn.internal.codegen.Transform;
+import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.ir.annotations.Ignore;
+import jdk.nashorn.internal.ir.annotations.Reference;
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.parser.Parser;
+import jdk.nashorn.internal.runtime.Source;
+import jdk.nashorn.internal.runtime.UserAccessorProperty;
+
+/**
+ * IR representation for function (or script.)
+ *
+ */
+public class FunctionNode extends Block {
+
+    /** Function kinds */
+    public enum Kind {
+        /** a normal function - nothing special */
+        NORMAL,
+        /** a script function */
+        SCRIPT,
+        /** a getter, @see {@link UserAccessorProperty} */
+        GETTER,
+        /** a setter, @see {@link UserAccessorProperty} */
+        SETTER
+    }
+
+    /** External function identifier. */
+    @Ignore
+    private IdentNode ident;
+
+    /** Internal function name. */
+    private String name;
+
+    /** Compilation unit. */
+    private CompileUnit compileUnit;
+
+    /** Method emitter for current method. */
+    private MethodEmitter method;
+
+    /** Function kind. */
+    private Kind kind;
+
+    /** List of parameters. */
+    private List<IdentNode> parameters;
+
+    /** List of nested functions. */
+    private List<FunctionNode> functions;
+
+    /** First token of function. **/
+    private long firstToken;
+
+    /** Last token of function. **/
+    private long lastToken;
+
+    /** Variable frames. */
+    private Frame frames;
+
+    /** Method's namespace. */
+    private final Namespace namespace;
+
+    /** Node representing current this. */
+    @Ignore
+    private IdentNode thisNode;
+
+    /** Node representing current scope. */
+    @Ignore
+    private IdentNode scopeNode;
+
+    /** Node representing return value. */
+    @Ignore
+    private IdentNode resultNode;
+
+    /** Node representing current arguments. */
+    @Ignore
+    private IdentNode argumentsNode;
+
+    /** Node representing callee */
+    @Ignore
+    private IdentNode calleeNode;
+
+    /** Node representing varargs */
+    @Ignore
+    private IdentNode varArgsNode;
+
+    /** this access properties. */
+    private final LinkedHashMap<String, Node> thisProperties;
+
+    /** Pending label list. */
+    private final Stack<LabelNode> labelStack;
+
+    /** Pending control list. */
+    private final Stack<Node> controlStack;
+
+    /** Variable declarations in the function's scope */
+    @Ignore
+    private final List<VarNode> declarations;
+
+    /** VarNode for this function statement */
+    @Reference @Ignore //this is explicit code anyway and should not be traverseda after lower
+    private VarNode funcVarNode;
+
+    /** Line number for function declaration */
+    @Reference @Ignore
+    private LineNumberNode funcVarLineNumberNode;
+
+    /** Function flags. */
+    private int flags;
+
+    /** Is anonymous function flag. */
+    private static final int IS_ANONYMOUS            = 0b0000_0000_0000_0001;
+    /** Is statement flag */
+    private static final int IS_STATEMENT            = 0b0000_0000_0000_0010;
+    /** is this a strict mode function? */
+    private static final int IS_STRICT_MODE          = 0b0000_0000_0000_0100;
+    /** is this is a vararg function? */
+    private static final int IS_VAR_ARG              = 0b0000_0000_0000_1000;
+    /** Are we lowered ? */
+    private static final int IS_LOWERED              = 0b0000_0000_0001_0000;
+    /** Has this node been split because it was too large? */
+    private static final int IS_SPLIT                = 0b0000_0000_0010_0000;
+    /** Is this function lazily compiled? */
+    private static final int IS_LAZY                 = 0b0000_0000_0100_0000;
+    /** Do we have throws ? */
+    private static final int HAS_THROWS              = 0b0000_0000_1000_0000;
+    /** Do we have calls ? */
+    private static final int HAS_CALLS               = 0b0000_0001_0000_0000;
+    /** Has yield flag */
+    private static final int HAS_YIELD               = 0b0000_0010_0000_0000;
+    /** Does the function contain eval? */
+    private static final int HAS_EVAL                = 0b0000_0100_0000_0000;
+    /** Does the function contain a with block ? */
+    private static final int HAS_WITH                = 0b0000_1000_0000_0000;
+    /** Does a child function contain a with or eval? */
+    private static final int HAS_CHILD_WITH_OR_EVAL  = 0b0001_0000_0000_0000;
+    /** Hide arguments? */
+    private static final int HIDE_ARGS               = 0b0010_0000_0000_0000;
+    /** Does the function need a self symbol? */
+    private static final int NEEDS_SELF_SYMBOL       = 0b0100_0000_0000_0000;
+
+    /** Does this function or any nested functions contain a with or an eval? */
+    private static final int HAS_DEEP_WITH_OR_EVAL = HAS_EVAL | HAS_WITH | HAS_CHILD_WITH_OR_EVAL;
+    /** Does this function need to store all its variables in scope? */
+    private static final int HAS_ALL_VARS_IN_SCOPE = HAS_DEEP_WITH_OR_EVAL | IS_SPLIT;
+    /** Does this function need a scope object? */
+    private static final int NEEDS_SCOPE           = HAS_ALL_VARS_IN_SCOPE | IS_VAR_ARG;
+
+
+    /** What is the return type of this function? */
+    private Type returnType = Type.OBJECT;
+
+    /** Transforms that have been applied to this function, a list as some transforms conceivably can run many times */
+    @Ignore
+    private final List<Class<? extends Transform>> appliedTransforms;
+
+    /**
+     * Used to keep track of a function's parent blocks.
+     * This is needed when a (finally body) block is cloned than contains inner functions.
+     * Does not include function.getParent().
+     */
+    @Ignore
+    private List<Block> referencingParentBlocks;
+
+    /**
+     * Constructor
+     *
+     * @param source   the source
+     * @param token    token
+     * @param finish   finish
+     * @param compiler the compiler
+     * @param parent   the parent block
+     * @param ident    the identifier
+     * @param name     the name of the function
+     */
+    @SuppressWarnings("LeakingThisInConstructor")
+    public FunctionNode(final Source source, final long token, final int finish, final Compiler compiler, final Block parent, final IdentNode ident, final String name) {
+        super(source, token, finish, parent, null);
+
+        this.ident             = ident;
+        this.name              = name;
+        this.kind              = Kind.NORMAL;
+        this.parameters        = new ArrayList<>();
+        this.functions         = new ArrayList<>();
+        this.firstToken        = token;
+        this.lastToken         = token;
+        this.namespace         = new Namespace(compiler.getNamespace().getParent());
+        this.thisProperties    = new LinkedHashMap<>();
+        this.labelStack        = new Stack<>();
+        this.controlStack      = new Stack<>();
+        this.declarations      = new ArrayList<>();
+        this.appliedTransforms = new ArrayList<>();
+        // my block -> function is this. We added @SuppressWarnings("LeakingThisInConstructor") as NetBeans identifies
+        // it as such a leak - this is a false positive as we're setting this into a field of the object being
+        // constructed, so it can't be seen from other threads.
+        this.function          = this;
+    }
+
+    @SuppressWarnings("LeakingThisInConstructor")
+    private FunctionNode(final FunctionNode functionNode, final CopyState cs) {
+        super(functionNode, cs);
+
+        this.ident = (IdentNode)cs.existingOrCopy(functionNode.ident);
+        this.name  = functionNode.name;
+        this.kind  = functionNode.kind;
+
+        this.parameters = new ArrayList<>();
+        for (final IdentNode param : functionNode.getParameters()) {
+            this.parameters.add((IdentNode) cs.existingOrCopy(param));
+        }
+
+        this.functions         = new ArrayList<>();
+        this.firstToken        = functionNode.firstToken;
+        this.lastToken         = functionNode.lastToken;
+        this.namespace         = functionNode.getNamespace();
+        this.thisNode          = (IdentNode)cs.existingOrCopy(functionNode.thisNode);
+        this.scopeNode         = (IdentNode)cs.existingOrCopy(functionNode.scopeNode);
+        this.resultNode        = (IdentNode)cs.existingOrCopy(functionNode.resultNode);
+        this.argumentsNode     = (IdentNode)cs.existingOrCopy(functionNode.argumentsNode);
+        this.varArgsNode       = (IdentNode)cs.existingOrCopy(functionNode.varArgsNode);
+        this.calleeNode        = (IdentNode)cs.existingOrCopy(functionNode.calleeNode);
+        this.thisProperties    = new LinkedHashMap<>();
+        this.labelStack        = new Stack<>();
+        this.controlStack      = new Stack<>();
+        this.declarations      = new ArrayList<>();
+        this.appliedTransforms = new ArrayList<>();
+
+        for (final VarNode decl : functionNode.getDeclarations()) {
+            declarations.add((VarNode) cs.existingOrCopy(decl)); //TODO same?
+        }
+
+        this.flags = functionNode.flags;
+
+        this.funcVarNode = (VarNode)cs.existingOrCopy(functionNode.funcVarNode);
+        /** VarNode for this function statement */
+
+        // my block -> function is this. We added @SuppressWarnings("LeakingThisInConstructor") as NetBeans identifies
+        // it as such a leak - this is a false positive as we're setting this into a field of the object being
+        // constructed, so it can't be seen from other threads.
+        this.function = this;
+    }
+
+    @Override
+    protected Node copy(final CopyState cs) {
+        // deep clone all parent blocks
+        return fixBlockChain(new FunctionNode(this, cs));
+    }
+
+    @Override
+    public Node accept(final NodeVisitor visitor) {
+        final FunctionNode saveFunctionNode = visitor.getCurrentFunctionNode();
+        final Block        saveBlock        = visitor.getCurrentBlock();
+
+        visitor.setCurrentFunctionNode(this);
+        visitor.setCurrentCompileUnit(getCompileUnit());
+        visitor.setCurrentMethodEmitter(getMethodEmitter());
+        visitor.setCurrentBlock(this);
+
+        try {
+            if (visitor.enter(this) != null) {
+                if (ident != null) {
+                    ident = (IdentNode)ident.accept(visitor);
+                }
+
+                for (int i = 0, count = parameters.size(); i < count; i++) {
+                    parameters.set(i, (IdentNode)parameters.get(i).accept(visitor));
+                }
+
+                for (int i = 0, count = functions.size(); i < count; i++) {
+                    functions.set(i, (FunctionNode)functions.get(i).accept(visitor));
+                }
+
+                for (int i = 0, count = statements.size(); i < count; i++) {
+                    statements.set(i, statements.get(i).accept(visitor));
+                }
+
+                return visitor.leave(this);
+            }
+        } finally {
+            visitor.setCurrentBlock(saveBlock);
+            visitor.setCurrentFunctionNode(saveFunctionNode);
+            visitor.setCurrentCompileUnit(saveFunctionNode != null ? saveFunctionNode.getCompileUnit() : null);
+            visitor.setCurrentMethodEmitter(saveFunctionNode != null ? saveFunctionNode.getMethodEmitter() : null);
+        }
+
+        return this;
+    }
+
+    /**
+     * Locate the parent function.
+     *
+     * @return Parent function.
+     */
+    public FunctionNode findParentFunction() {
+        return getParent() != null ? getParent().getFunction() : null;
+    }
+
+    /**
+     * Add parent name to the builder.
+     *
+     * @param sb String builder.
+     */
+    @Override
+    public void addParentName(final StringBuilder sb) {
+        if (!isScript()) {
+            sb.append(getName());
+            sb.append("$");
+        }
+    }
+
+    /*
+     * Frame management.
+     */
+
+    /**
+     * Push a new block frame.
+     *
+     * @return the new frame
+     */
+    public final Frame pushFrame() {
+        frames = new Frame(frames);
+        return frames;
+    }
+
+    /**
+     * Pop a block frame.
+     */
+    public final void popFrame() {
+        frames = frames.getPrevious();
+    }
+
+    /**
+     * return a unique name in the scope of the function.
+     *
+     * @param base Base string.
+     *
+     * @return Unique name.
+     */
+    public String uniqueName(final String base) {
+        return namespace.uniqueName(base);
+    }
+
+    /**
+     * Create a temporary variable to the current frame.
+     *
+     * @param type  Strong type of symbol.
+     * @param node  Primary node to use symbol.
+     *
+     * @return Symbol used.
+     */
+    public Symbol newTemporary(final Type type, final Node node) {
+        Symbol sym = node.getSymbol();
+
+        // If no symbol already present.
+        if (sym == null) {
+            final String uname = uniqueName(TEMP_PREFIX.tag());
+            sym = new Symbol(uname, IS_TEMP, type);
+            sym.setNode(node);
+        }
+
+        // Assign a slot if it doesn't have one.
+        if (!sym.hasSlot()) {
+            frames.addSymbol(sym);
+        }
+
+        // Set symbol to node.
+        node.setSymbol(sym);
+
+        return sym;
+    }
+
+    /**
+     * Create a virtual symbol for a literal.
+     *
+     * @param literalNode Primary node to use symbol.
+     *
+     * @return Symbol used.
+     */
+    public Symbol newLiteral(final LiteralNode<?> literalNode) {
+        final String uname = uniqueName(LITERAL_PREFIX.tag());
+        final Symbol sym = new Symbol(uname, IS_CONSTANT, literalNode.getType());
+        sym.setNode(literalNode);
+        literalNode.setSymbol(sym);
+
+        return sym;
+    }
+
+    /**
+     * Add a property to the constructor (function) based on this.x usage.
+     *
+     * @param key  Name of property.
+     * @param node Value node (has type.)
+     */
+    public void addThisProperty(final String key, final Node node) {
+        if (node == null) {
+            return;
+        }
+
+        thisProperties.put(key, node);
+    }
+
+    @Override
+    public void toString(final StringBuilder sb) {
+        sb.append("function");
+
+        if (ident != null) {
+            sb.append(' ');
+            ident.toString(sb);
+        }
+
+        sb.append('(');
+        boolean first = true;
+
+        for (final IdentNode parameter : parameters) {
+            if (!first) {
+                sb.append(", ");
+            } else {
+                first = false;
+            }
+
+            parameter.toString(sb);
+        }
+
+        sb.append(')');
+    }
+
+    /**
+     * Determine if script function.
+     *
+     * @return True if script function.
+     */
+    public boolean isScript() {
+        return getParent() == null;
+    }
+
+    /**
+     * Get the control stack. Used when parsing to establish nesting depths of
+     * different control structures
+     *
+     * @return the control stack
+     */
+    public Stack<Node> getControlStack() {
+        return controlStack;
+    }
+
+    /**
+     * Should this function node be lazily code generated, i.e. first at link time
+     * @return true if lazy
+     */
+    public boolean isLazy() {
+        return (flags & IS_LAZY) != 0;
+    }
+
+    /**
+     * Set if this function should be lazily generated
+     * @param isLazy is lazy
+     */
+    public void setIsLazy(final boolean isLazy) {
+        this.flags = isLazy ? flags | IS_LAZY : flags & ~IS_LAZY;
+    }
+
+    /**
+     * Check if the {@code with} keyword is used in this function
+     *
+     * @return true if {@code with} is used
+     */
+    public boolean hasWith() {
+        return (flags & HAS_WITH) != 0;
+    }
+
+    /**
+     * Flag this function as using the {@code with} keyword
+     */
+    public void setHasWith() {
+        this.flags |= HAS_WITH;
+        // with requires scope in parents.
+        FunctionNode parentFunction = findParentFunction();
+        while (parentFunction != null) {
+            parentFunction.setHasNestedWithOrEval();
+            parentFunction = parentFunction.findParentFunction();
+        }
+    }
+
+    /**
+     * Check if the {@code eval} keyword is used in this function
+     *
+     * @return true if {@code eval} is used
+     */
+    public boolean hasEval() {
+        return (flags & HAS_EVAL) != 0;
+    }
+
+    /**
+     * Flag this function as using the {@code eval} keyword
+     */
+    public void setHasEval() {
+        this.flags |= HAS_EVAL;
+        // eval requires scope in parents.
+        FunctionNode parentFunction = findParentFunction();
+        while (parentFunction != null) {
+            parentFunction.setHasNestedWithOrEval();
+            parentFunction = parentFunction.findParentFunction();
+        }
+    }
+
+    private void setHasNestedWithOrEval() {
+        flags |= HAS_CHILD_WITH_OR_EVAL;
+    }
+
+    /**
+     * Test whether this function or any of its nested functions contains a <tt>with</tt> statement
+     * or an <tt>eval</tt> call.
+     *
+     * @see #hasWith()
+     * @see #hasEval()
+     * @return true if this or a nested function contains with or eval
+     */
+    public boolean hasDeepWithOrEval() {
+        return (flags & HAS_DEEP_WITH_OR_EVAL) != 0;
+    }
+
+    /**
+     * Get the first token for this function
+     * @return the first token
+     */
+    public long getFirstToken() {
+        return firstToken;
+    }
+
+    /**
+     * Set the first token for this function
+     * @param firstToken the first token
+     */
+    public void setFirstToken(final long firstToken) {
+        this.firstToken = firstToken;
+    }
+
+    /**
+     * Get all nested functions
+     * @return list of nested functions in this function
+     */
+    public List<FunctionNode> getFunctions() {
+        return Collections.unmodifiableList(functions);
+    }
+
+    /**
+     * Get the label stack. This is used by the parser to establish
+     * label nesting depth
+     *
+     * @return the label stack
+     */
+    public Stack<LabelNode> getLabelStack() {
+        return labelStack;
+    }
+
+    /**
+     * Check if this function has a {@code yield} usage
+     *
+     * @return true if function uses {@code yield}
+     */
+    public boolean hasYield() {
+        return (flags & HAS_YIELD) != 0;
+    }
+
+    /**
+     * Flag this function as using the {@code yield} keyword
+     */
+    public void setHasYield() {
+        this.flags |= HAS_YIELD;
+    }
+
+    /**
+     * If this function needs to use var args, return the identifier to the node used
+     * for the var args structure
+     *
+     * @return IdentNode representing the var args structure
+     */
+    public IdentNode getVarArgsNode() {
+        return varArgsNode;
+    }
+
+    /**
+     * Set the identifier to the node used for the var args structure
+     *
+     * @param varArgsNode IdentNode representing the var args
+     */
+    public void setVarArgsNode(final IdentNode varArgsNode) {
+        this.varArgsNode = varArgsNode;
+    }
+
+    /**
+     * If this function uses the {@code callee} variable, return the node used
+     * as this variable
+     *
+     * @return an IdentNode representing the {@code callee} variable
+     */
+    public IdentNode getCalleeNode() {
+        return calleeNode;
+    }
+
+    /**
+     * If this function uses the {@code callee} variable, set the node representing the
+     * callee
+     * @param calleeNode an IdentNode representing the callee
+     */
+    public void setCalleeNode(final IdentNode calleeNode) {
+        this.calleeNode = calleeNode;
+    }
+
+    /**
+     * Check if this function needs the {@code callee} parameter
+     * @return true if the function uses {@code callee}
+     */
+    public boolean needsCallee() {
+        return getCalleeNode() != null;
+    }
+
+    /**
+     * If this is a function where {@code arguments} is used, return the node used as the {@code arguments}
+     * variable
+     * @return an IdentNode representing {@code arguments}
+     */
+    public IdentNode getArgumentsNode() {
+        return argumentsNode;
+    }
+
+    /**
+     * If this is a Function where {@code arguments} is used, an identifier to the node representing
+     * the {@code arguments} value has to be supplied by the compiler
+     *
+     * @param argumentsNode IdentNode that represents {@code arguments}
+     */
+    public void setArgumentsNode(final IdentNode argumentsNode) {
+        this.argumentsNode = argumentsNode;
+    }
+
+    /**
+     * Get the identifier for this function
+     * @return the identifier as an IdentityNode
+     */
+    public IdentNode getIdent() {
+        return ident;
+    }
+
+    /**
+     * Reset the identifier for this function
+     * @param ident IdentNode for new identifier
+     */
+    public void setIdent(final IdentNode ident) {
+        this.ident = ident;
+    }
+
+    /**
+     * Check if this function needs to use var args, which is the case for
+     * e.g. {@code eval} and functions where {@code arguments} is used
+     *
+     * @return true if the function needs to use var args
+     */
+    public boolean isVarArg() {
+        return (flags & IS_VAR_ARG) != 0 && !isScript();
+    }
+
+    /**
+     * Flag this function as needing to use var args vector
+     */
+    public void setIsVarArg() {
+        this.flags |= IS_VAR_ARG;
+    }
+
+    /**
+     * Ugly special case:
+     * Tells the compiler if {@code arguments} variable should be hidden and given
+     * a unique name, for example if it is used as an explicit parameter name
+     * @return true of {@code arguments} should be hidden
+     */
+    public boolean hideArguments() {
+        return (flags & HIDE_ARGS) != 0;
+    }
+
+    /**
+     * Flag this function as needing to hide the {@code arguments} vectir
+     */
+    public void setHideArguments() {
+        this.flags |= HIDE_ARGS;
+    }
+
+    /**
+     * Return the kind of this function
+     * @see FunctionNode.Kind
+     * @return the kind
+     */
+    public Kind getKind() {
+        return kind;
+    }
+
+    /**
+     * Set the kind of this function
+     * @see FunctionNode.Kind
+     * @param kind the kind
+     */
+    public void setKind(final Kind kind) {
+        this.kind = kind;
+    }
+
+    /**
+     * Return the last token for this function's code
+     * @return last token
+     */
+    public long getLastToken() {
+        return lastToken;
+    }
+
+    /**
+     * Set the last token for this function's code
+     * @param lastToken the last token
+     */
+    public void setLastToken(final long lastToken) {
+        this.lastToken = lastToken;
+    }
+
+    /**
+     * Get the name of this function
+     * @return the name
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Set the name of this function
+     * @param name the name
+     */
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+    @Override
+    public boolean needsScope() {
+        return needsScope || isScript() || (flags & NEEDS_SCOPE) != 0;
+    }
+
+    /**
+     * Check if this function should have all its variables in scope, regardless
+     * of other properties.
+     *
+     * @return true if all variables should be in scope
+     */
+    public boolean varsInScope() {
+        return isScript() || (flags & HAS_ALL_VARS_IN_SCOPE) != 0;
+    }
+
+    /**
+     * Check if a {@link Transform} has been taken place to this method.
+     * @param transform to check for
+     * @return true if transform has been applied
+     */
+    public boolean isTransformApplied(final Class<? extends Transform> transform) {
+        return appliedTransforms.contains(transform);
+    }
+
+    /**
+     * Tag this function with an applied transform
+     * @param transform the transform
+     */
+    public void registerTransform(final Class<? extends Transform> transform) {
+        appliedTransforms.add(transform);
+    }
+
+    /**
+     * Checks if this function is a sub-function generated by splitting a larger one
+     * @see Splitter
+     *
+     * @return true if this function is split from a larger one
+     */
+    public boolean isSplit() {
+        return (flags & IS_SPLIT) != 0;
+    }
+
+    /**
+     * Flag this function node as being a sub-function generated by the splitter
+     * @see Splitter
+     */
+    public void setIsSplit() {
+        this.flags |= IS_SPLIT;
+    }
+
+    /**
+     * Get the parameters to this function
+     * @return a list of IdentNodes which represent the function parameters, in order
+     */
+    public List<IdentNode> getParameters() {
+        return Collections.unmodifiableList(parameters);
+    }
+
+    /**
+     * Set the paremeters to this function
+     * @param parameters a list of IdentNodes representing parameters in left to right order
+     */
+    public void setParameters(final List<IdentNode> parameters) {
+        this.parameters = parameters;
+    }
+
+    /**
+     * Get the identifier for the variable in which the function return value
+     * should be stored
+     * @return an IdentNode representing the return value
+     */
+    public IdentNode getResultNode() {
+        return resultNode;
+    }
+
+    /**
+     * Set the identifier representing the variable in which the function return
+     * value should be stored
+     * @param resultNode an IdentNode representing the return value
+     */
+    public void setResultNode(final IdentNode resultNode) {
+        this.resultNode = resultNode;
+    }
+
+    /**
+     * Get the identifier representing this function's scope
+     * @return an IdentNode representing this function's scope
+     */
+    public IdentNode getScopeNode() {
+        return scopeNode;
+    }
+
+    /**
+     * Set the identifier representing this function's scope
+     * @param scopeNode an IdentNode representing this function's scope
+     */
+    public void setScopeNode(final IdentNode scopeNode) {
+        this.scopeNode = scopeNode;
+    }
+
+    /**
+     * Check if this function is a statement
+     * @return true if function is a statement
+     */
+    public boolean isStatement() {
+        return (flags & IS_STATEMENT) != 0;
+    }
+
+    /**
+     * Flag this function as a statement
+     * @see Parser
+     */
+    public void setIsStatement() {
+        this.flags |= IS_STATEMENT;
+    }
+
+    /**
+     * Check if this function is anonymous
+     * @return true if function is anonymous
+     */
+    public boolean isAnonymous() {
+        return (flags & IS_ANONYMOUS) != 0;
+    }
+
+    /**
+     * Flag this function as an anonymous function.
+     * @see Parser
+     */
+    public void setIsAnonymous() {
+        this.flags |= IS_ANONYMOUS;
+    }
+
+    /**
+     * Does this function need a self symbol - this is needed only for self
+     * referring functions
+     * @return true if function needs a symbol for self
+     */
+    public boolean needsSelfSymbol() {
+        return (flags & NEEDS_SELF_SYMBOL) != 0;
+    }
+
+    /**
+     * Flag the function as needing a self symbol. This is needed only for
+     * self referring functions
+     */
+    public void setNeedsSelfSymbol() {
+        this.flags |= NEEDS_SELF_SYMBOL;
+    }
+
+    /**
+     * Return the node representing {@code this} in this function
+     * @return IdentNode representing {@code this}
+     */
+    public IdentNode getThisNode() {
+        return thisNode;
+    }
+
+    /**
+     * Set the node representing {@code this} in this function
+     * @param thisNode identifier representing {@code this}
+     */
+    public void setThisNode(final IdentNode thisNode) {
+        this.thisNode = thisNode;
+    }
+
+    /**
+     * Every function declared as {@code function x()} is internally hoisted
+     * and represented as {@code var x = function()  ... }. This getter returns
+     * the VarNode representing this virtual assignment
+     *
+     * @return the var node emitted for setting this function symbol
+     */
+    public VarNode getFunctionVarNode() {
+        return funcVarNode;
+    }
+
+    /**
+     * Set the virtual VarNode assignment for this function.
+     * @see FunctionNode#getFunctionVarNode()
+     *
+     * @param varNode the virtual var node assignment
+     */
+    public void setFunctionVarNode(final VarNode varNode) {
+        funcVarNode = varNode;
+    }
+
+    /**
+     * The line number information where the function was declared must be propagated
+     * to the virtual {@code var x = function() ... } assignment described in
+     * {@link FunctionNode#getFunctionVarNode()}
+     * This maintains the line number of the declaration
+     *
+     * @return a line number node representing the line this function was declared
+     */
+    public LineNumberNode getFunctionVarLineNumberNode() {
+        return funcVarLineNumberNode;
+    }
+
+    /**
+     * Set the virtual VarNode assignment for this function, along with
+     * a line number node for tracking the original start line of the function
+     * declaration
+     *
+     * @param varNode    the virtual var node assignment
+     * @param lineNumber the line number node for the function declaration
+     */
+    public void setFunctionVarNode(final VarNode varNode, final LineNumberNode lineNumber) {
+        funcVarNode           = varNode;
+        funcVarLineNumberNode = lineNumber;
+    }
+
+    /**
+     * Get a all properties accessed with {@code this} used as a base in this
+     * function - the map is ordered upon assignment order in the control flow
+     *
+     * @return map a map of property name to node mapping for this accesses
+     */
+    public Map<String, Node> getThisProperties() {
+        return Collections.unmodifiableMap(thisProperties);
+    }
+
+    /**
+     * Get the namespace this function uses for its symbols
+     * @return the namespace
+     */
+    public Namespace getNamespace() {
+        return namespace;
+    }
+
+    @Override
+    public Type getType() {
+        return getReturnType();
+    }
+
+    /**
+     * Get the return type for this function. Return types can be specialized
+     * if the compiler knows them, but parameters cannot, as they need to go through
+     * appropriate object conversion
+     *
+     * @return the return type
+     */
+    public Type getReturnType() {
+        return returnType;
+    }
+
+    /**
+     * Set the function return type
+     *
+     * @param returnType new return type
+     */
+    public void setReturnType(final Type returnType) {
+        //we never bother with object types narrower than objects, that will lead to byte code verification errors
+        //as for instance even if we know we are returning a string from a method, the code generator will always
+        //treat it as an object, at least for now
+        this.returnType = returnType.isObject() ? Type.OBJECT : returnType;
+        // Adjust type of result node symbol
+        if (returnType != Type.UNKNOWN) {
+            resultNode.getSymbol().setTypeOverride(this.returnType);
+        }
+    }
+
+    /**
+     * Set strict mode on or off for this function
+     *
+     * @param isStrictMode true if strict mode should be enabled
+     */
+    public void setStrictMode(final boolean isStrictMode) {
+        flags = isStrictMode ? flags | IS_STRICT_MODE : flags & ~IS_STRICT_MODE;
+    }
+
+    /**
+     * Check if the function is generated in strict mode
+     * @return true if strict mode enabled for function
+     */
+    public boolean isStrictMode() {
+        return (flags & IS_STRICT_MODE) != 0;
+    }
+
+    /**
+     * Set the lowered state
+     *
+     * @param isLowered lowered state
+     */
+    public void setIsLowered(final boolean isLowered) {
+        flags = isLowered ? flags | IS_LOWERED : flags & ~IS_LOWERED;
+    }
+
+    /**
+     * Get the lowered
+     *
+     * @return true if function is lowered
+     */
+    public boolean isLowered() {
+        return (flags & IS_LOWERED) != 0;
+    }
+
+    /**
+     * Set if function has calls
+     *
+     * @param hasCalls does the function have calls?
+     */
+    public void setHasCalls(final boolean hasCalls) {
+        flags = hasCalls ? flags | HAS_CALLS : flags & ~HAS_CALLS;
+    }
+
+    /**
+     * Check if function has calls
+     *
+     * @return true if function has calls
+     */
+    public boolean hasCalls() {
+        return (flags & HAS_CALLS) != 0;
+    }
+
+    /**
+     * Set if the function has throws
+     *
+     * @param hasThrows does the function have throw statements
+     */
+    public void setHasThrows(final boolean hasThrows) {
+        flags = hasThrows ? flags | HAS_THROWS : flags & ~HAS_THROWS;
+    }
+
+    /**
+     * Can the function throw exceptioons
+     *
+     * @return true if function throws exceptions
+     */
+    public boolean hasThrows() {
+        return (flags & HAS_THROWS) != 0;
+    }
+
+    /**
+     * Add a new function to the function list.
+     *
+     * @param functionNode Function node to add.
+     */
+    @Override
+    public void addFunction(final FunctionNode functionNode) {
+        assert functionNode != null;
+        functions.add(functionNode);
+    }
+
+    /**
+     * Add a list of functions to the function list.
+     *
+     * @param functionNodes  Function nodes to add.
+     */
+    @Override
+    public void addFunctions(final List<FunctionNode> functionNodes) {
+        functions.addAll(functionNodes);
+    }
+
+    /**
+     * Set a function list
+     *
+     * @param functionNodes to set
+     */
+    @Override
+    public void setFunctions(final List<FunctionNode> functionNodes) {
+        this.functions = functionNodes;
+    }
+
+    /**
+     * Add a variable declaration that should be visible to the entire function
+     * scope. Parser does this.
+     *
+     * @param varNode a var node
+     */
+    public void addDeclaration(final VarNode varNode) {
+        declarations.add(varNode);
+    }
+
+    /**
+     * Return all variable declarations from this function scope
+     *
+     * @return all VarNodes in scope
+     */
+    public List<VarNode> getDeclarations() {
+        return Collections.unmodifiableList(declarations);
+    }
+
+    /**
+     * @return the unit index
+     */
+//    public int getUnit() {
+ //       return unit;
+ //   }
+
+    /**
+     * Set the index of this function's compile unit. Used by splitter.
+     * @see Splitter
+     * @param unit the unit index
+     */
+//    public void setUnit(final int unit) {
+//        this.unit = unit;
+//    }
+
+    /**
+     * Get the compile unit used to compile this function
+     * @see Compiler
+     * @see Splitter
+     * @return the compile unit
+     */
+    public CompileUnit getCompileUnit() {
+        return compileUnit;
+    }
+
+    /**
+     * Reset the compile unit used to compile this function
+     * @see Compiler
+     * @see Splitter
+     * @param compileUnit the compile unit
+     */
+    public void setCompileUnit(final CompileUnit compileUnit) {
+        this.compileUnit = compileUnit;
+    }
+
+    /**
+     * Return the method emitter used to write bytecode for this function
+     * @return the method emitter
+     */
+    public MethodEmitter getMethodEmitter() {
+        return method;
+    }
+
+    /**
+     * Set the method emitter that is to be used to write bytecode for this function
+     * @param method a method emitter
+     */
+    public void setMethodEmitter(final MethodEmitter method) {
+        this.method = method;
+    }
+
+    /**
+     * Each FunctionNode maintains a list of reference to its parent blocks.
+     * Add a parent block to this function.
+     *
+     * @param parentBlock  a block to remember as parent
+     */
+    public void addReferencingParentBlock(final Block parentBlock) {
+        assert parentBlock.getFunction() == function.findParentFunction(); // all parent blocks must be in the same function
+        if (parentBlock != function.getParent()) {
+            if (referencingParentBlocks == null) {
+                referencingParentBlocks = new LinkedList<>();
+            }
+            referencingParentBlocks.add(parentBlock);
+        }
+    }
+
+    /**
+     * Get the known parent blocks to this function
+     *
+     * @return list of parent blocks
+     */
+    public List<Block> getReferencingParentBlocks() {
+        if (referencingParentBlocks == null) {
+            return Collections.emptyList();
+        }
+        return Collections.unmodifiableList(referencingParentBlocks);
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/IdentNode.java b/nashorn/src/jdk/nashorn/internal/ir/IdentNode.java
new file mode 100644
index 00000000000..e9e9dec8341
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/IdentNode.java
@@ -0,0 +1,221 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir;
+
+import static jdk.nashorn.internal.codegen.CompilerConstants.__DIR__;
+import static jdk.nashorn.internal.codegen.CompilerConstants.__FILE__;
+import static jdk.nashorn.internal.codegen.CompilerConstants.__LINE__;
+import static jdk.nashorn.internal.codegen.objects.ObjectClassGenerator.DEBUG_FIELDS;
+
+import jdk.nashorn.internal.codegen.objects.ObjectClassGenerator;
+import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * IR representation for an identifier.
+ */
+public class IdentNode extends Node implements PropertyKey, TypeOverride, FunctionCall {
+    /** Identifier. */
+    private final String name;
+
+    /** Type for a callsite, e.g. X in a get()X or a set(X)V */
+    private Type callSiteType;
+
+    /** flag for an ident that is the property name of an AccessNode. */
+    private boolean isPropertyName;
+
+    /** flag for an ident on the left hand side of <code>var lhs = rhs;</code>. */
+    private boolean isInitializedHere;
+
+    /**
+     * Constructor
+     *
+     * @param source  the source
+     * @param token   token
+     * @param finish  finish position
+     * @param name    name of identifier
+     */
+    public IdentNode(final Source source, final long token, final int finish, final String name) {
+        super(source, token, finish);
+        this.name = name;
+    }
+
+    /**
+     * Copy constructor - create a new IdentNode for the same location
+     *
+     * @param identNode  identNode
+     */
+    public IdentNode(final IdentNode identNode) {
+        super(identNode);
+        this.name              = identNode.getName();
+        this.isPropertyName    = identNode.isPropertyName;
+        this.isInitializedHere = identNode.isInitializedHere;
+    }
+
+    @Override
+    public Type getType() {
+        return callSiteType == null ? super.getType() : callSiteType;
+    }
+
+    @Override
+    public boolean isAtom() {
+        return true;
+    }
+
+    private boolean hasCallSiteType() {
+        //this is an identity that's part of a getter or setter
+        return callSiteType != null;
+    }
+
+    @Override
+    public void setType(final Type type) {
+        if (DEBUG_FIELDS && getSymbol() != null && !Type.areEquivalent(getSymbol().getSymbolType(), type)) {
+            ObjectClassGenerator.LOG.info(getClass().getName() + " " + this + " => " + type + " instead of " + getType());
+        }
+        this.callSiteType = type;
+        // do NOT, repeat NOT touch the symbol here. it might be a local variable or whatever. This is the override if it isn't
+    }
+
+    @Override
+    protected Node copy(final CopyState cs) {
+        return new IdentNode(this);
+    }
+
+    /**
+     * Test to see if two IdentNode are the same.
+     *
+     * @param other Other ident.
+     * @return true if the idents are the same.
+     */
+    @Override
+    public boolean equals(final Object other) {
+        if (other instanceof IdentNode) {
+            return name.equals(((IdentNode)other).name);
+        }
+        return false;
+    }
+
+    @Override
+    public int hashCode() {
+        return name.hashCode();
+    }
+
+    /**
+     * Assist in IR navigation.
+     *
+     * @param visitor IR navigating visitor.
+     */
+    @Override
+    public Node accept(final NodeVisitor visitor) {
+        if (visitor.enter(this) != null) {
+            return visitor.leave(this);
+        }
+
+        return this;
+    }
+
+    @Override
+    public void toString(final StringBuilder sb) {
+        if (hasCallSiteType()) {
+            sb.append('{');
+            final String desc = getType().getDescriptor();
+            sb.append(desc.charAt(desc.length() - 1) == ';' ? "O" : getType().getDescriptor());
+            sb.append('}');
+        }
+
+        sb.append(name);
+    }
+
+    /**
+     * Get the name of the identifier
+     * @return  IdentNode name
+     */
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public String getPropertyName() {
+        return getName();
+    }
+
+    /**
+     * We can only override type if the symbol lives in the scope, otherwise
+     * it is strongly determined by the local variable already allocated
+     *
+     * @return true if can have callsite type
+     */
+    @Override
+    public boolean canHaveCallSiteType() {
+        return getSymbol() != null && getSymbol().isScope();
+    }
+
+    /**
+     * Check if this IdentNode is a property name
+     * @return true if this is a property name
+     */
+    public boolean isPropertyName() {
+        return isPropertyName;
+    }
+
+    /**
+     * Flag this IdentNode as a property name
+     */
+    public void setIsPropertyName() {
+        isPropertyName = true;
+    }
+
+    /**
+     * Helper function for local def analysis.
+     * @return true if IdentNode is initialized on creation
+     */
+    public boolean isInitializedHere() {
+        return isInitializedHere;
+    }
+
+    /**
+     * Flag IdentNode to be initialized on creation
+     */
+    public void setIsInitializedHere() {
+        isInitializedHere = true;
+    }
+
+    /**
+     * Check if this IdentNode is a special identity, currently __DIR__, __FILE__
+     * or __LINE__
+     *
+     * @return true if this IdentNode is special
+     */
+    public boolean isSpecialIdentity() {
+        return name.equals(__DIR__.tag()) || name.equals(__FILE__.tag()) || name.equals(__LINE__.tag());
+    }
+
+    @Override
+    public boolean isFunction() {
+        return false;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/IfNode.java b/nashorn/src/jdk/nashorn/internal/ir/IfNode.java
new file mode 100644
index 00000000000..a51b8e78e0e
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/IfNode.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir;
+
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * IR representation for an IF statement.
+ *
+ */
+public class IfNode extends Node {
+    /** Test expression. */
+    private Node test;
+
+    /** Pass statements. */
+    private Block pass;
+
+    /** Fail statements. */
+    private Block fail;
+
+    /**
+     * Constructor
+     *
+     * @param source  the source
+     * @param token   token
+     * @param finish  finish
+     * @param test    test
+     * @param pass    block to execute when test passes
+     * @param fail    block to execute when test fails or null
+     */
+    public IfNode(final Source source, final long token, final int finish, final Node test, final Block pass, final Block fail) {
+        super(source, token, finish);
+
+        this.test = test;
+        this.pass = pass;
+        this.fail = fail;
+    }
+
+    private IfNode(final IfNode ifNode, final CopyState cs) {
+        super(ifNode);
+
+        this.test = cs.existingOrCopy(ifNode.test);
+        this.pass = (Block)cs.existingOrCopy(ifNode.pass);
+        this.fail = (Block)cs.existingOrCopy(ifNode.fail);
+    }
+
+    @Override
+    protected Node copy(final CopyState cs) {
+        return new IfNode(this, cs);
+    }
+
+    @Override
+    public Node accept(final NodeVisitor visitor) {
+        if (visitor.enter(this) != null) {
+            test = test.accept(visitor);
+
+            pass = (Block)pass.accept(visitor);
+
+            if (fail != null) {
+                fail = (Block)fail.accept(visitor);
+            }
+
+            return visitor.leave(this);
+        }
+
+        return this;
+    }
+
+    @Override
+    public void toString(final StringBuilder sb) {
+        sb.append("if (");
+        test.toString(sb);
+        sb.append(')');
+    }
+
+    /**
+     * Get the else block of this IfNode
+     * @return the else block, or null if none exists
+     */
+    public Block getFail() {
+        return fail;
+    }
+
+    /**
+     * Get the then block for this IfNode
+     * @return the then block
+     */
+    public Block getPass() {
+        return pass;
+    }
+
+    /**
+     * Get the test expression for this IfNode
+     * @return the test expression
+     */
+    public Node getTest() {
+        return test;
+    }
+
+    /**
+     * Reset the test expression for this IfNode
+     * @param test a new test expression
+     */
+    public void setTest(final Node test) {
+        this.test = test;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/IndexNode.java b/nashorn/src/jdk/nashorn/internal/ir/IndexNode.java
new file mode 100644
index 00000000000..fdd0e25b7b8
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/IndexNode.java
@@ -0,0 +1,160 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir;
+
+import static jdk.nashorn.internal.codegen.objects.ObjectClassGenerator.DEBUG_FIELDS;
+
+import jdk.nashorn.internal.codegen.objects.ObjectClassGenerator;
+import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * IR representation of an indexed access (brackets operator.)
+ *
+ */
+public class IndexNode extends BaseNode implements TypeOverride {
+    /** Property ident. */
+    private Node index;
+
+    private boolean hasCallSiteType;
+
+    /**
+     * Constructors
+     *
+     * @param source  the source
+     * @param token   token
+     * @param finish  finish
+     * @param base    base node for access
+     * @param index   index for access
+     */
+    public IndexNode(final Source source, final long token, final int finish, final Node base, final Node index) {
+        super(source, token, finish, base);
+
+        this.index = index;
+    }
+
+    /**
+     * Copy constructor
+     *
+     * @param indexNode source node
+     */
+    public IndexNode(final IndexNode indexNode) {
+        this(indexNode, new CopyState());
+    }
+
+    private IndexNode(final IndexNode indexNode, final CopyState cs) {
+        super(indexNode, cs);
+
+        index = cs.existingOrCopy(indexNode.index);
+    }
+
+    @Override
+    protected Node copy(final CopyState cs) {
+        return new IndexNode(this, cs);
+    }
+
+    @Override
+    public boolean equals(final Object other) {
+        if (!super.equals(other)) {
+            return false;
+        }
+        return index.equals(((IndexNode)other).getIndex());
+    }
+
+    @Override
+    public int hashCode() {
+        return super.hashCode() ^ getIndex().hashCode();
+    }
+
+    @Override
+    public Node accept(final NodeVisitor visitor) {
+        if (visitor.enter(this) != null) {
+            base = base.accept(visitor);
+            index = index.accept(visitor);
+            return visitor.leave(this);
+        }
+
+        return this;
+    }
+
+    @Override
+    public void toString(final StringBuilder sb) {
+        final boolean needsParen = tokenType().needsParens(base.tokenType(), true);
+
+        if (hasCallSiteType) {
+            sb.append('{');
+            final String desc = getType().getDescriptor();
+            sb.append(desc.charAt(desc.length() - 1) == ';' ? "O" : getType().getDescriptor());
+            sb.append('}');
+        }
+
+        if (needsParen) {
+            sb.append('(');
+        }
+
+        base.toString(sb);
+
+        if (needsParen) {
+            sb.append(')');
+        }
+
+        sb.append('[');
+        index.toString(sb);
+        sb.append(']');
+    }
+
+    /**
+     * Get the index expression for this IndexNode
+     * @return the index
+     */
+    public Node getIndex() {
+        return index;
+    }
+
+    /**
+     * Reset the index expression for this IndexNode
+     * @param index a new index expression
+     */
+    public void setIndex(final Node index) {
+        this.index = index;
+    }
+
+    @Override
+    public void setType(final Type type) {
+        if (DEBUG_FIELDS && !Type.areEquivalent(getSymbol().getSymbolType(), type)) {
+            ObjectClassGenerator.LOG.info(getClass().getName() + " " + this + " => " + type + " instead of " + getType());
+        }
+        hasCallSiteType = true;
+        getSymbol().setTypeOverride(type);
+    }
+
+    @Override
+    public boolean canHaveCallSiteType() {
+        return true; //carried by the symbol and always the same nodetype==symboltype
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/LabelNode.java b/nashorn/src/jdk/nashorn/internal/ir/LabelNode.java
new file mode 100644
index 00000000000..23802b0ffac
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/LabelNode.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir;
+
+import jdk.nashorn.internal.ir.annotations.Reference;
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * IR representation for a labeled statement.
+ *
+ */
+
+public class LabelNode extends Node {
+    /** Label ident. */
+    private IdentNode label;
+
+    /** Statements. */
+    private Block body;
+
+    /** Node to break from. */
+    @Reference
+    private Node breakNode;
+
+    /** Node to continue. */
+    @Reference
+    private Node continueNode;
+
+    /**
+     * Constructor
+     *
+     * @param source the source
+     * @param token  token
+     * @param finish finish
+     * @param label  label identifier
+     * @param body   body of label node
+     */
+    public LabelNode(final Source source, final long token, final int finish, final IdentNode label, final Block body) {
+        super(source, token, finish);
+
+        this.label = label;
+        this.body  = body;
+    }
+
+    private LabelNode(final LabelNode labelNode, final CopyState cs) {
+        super(labelNode);
+
+        label        = (IdentNode)cs.existingOrCopy(labelNode.label);
+        body         = (Block)cs.existingOrCopy(labelNode.body);
+        breakNode    = cs.existingOrSame(labelNode.breakNode);
+        continueNode = cs.existingOrSame(labelNode.continueNode);
+    }
+
+    @Override
+    protected Node copy(final CopyState cs) {
+        return new LabelNode(this, cs);
+    }
+
+    @Override
+    public Node accept(final NodeVisitor visitor) {
+        if (visitor.enter(this) != null) {
+            label = (IdentNode)label.accept(visitor);
+            body  = (Block)body.accept(visitor);
+            return visitor.leave(this);
+        }
+
+        return this;
+    }
+
+    @Override
+    public void toString(final StringBuilder sb) {
+        label.toString(sb);
+        sb.append(':');
+    }
+
+    /**
+     * Get the body of the node
+     * @return the body
+     */
+    public Block getBody() {
+        return body;
+    }
+
+    /**
+     * Reset the body of the node
+     * @param body new body
+     */
+    public void setBody(final Block body) {
+        this.body = body;
+    }
+
+    /**
+     * Get the break node for this node
+     * @return the break node
+     */
+    public Node getBreakNode() {
+        return breakNode;
+    }
+
+    /**
+     * Reset the break node for this node
+     * @param breakNode the break node
+     */
+    public void setBreakNode(final Node breakNode) {
+        this.breakNode = breakNode;
+    }
+
+    /**
+     * Get the continue node for this node
+     * @return the continue node
+     */
+    public Node getContinueNode() {
+        return continueNode;
+    }
+
+    /**
+     * Reset the continue node for this node
+     * @param continueNode the continue node
+     */
+    public void setContinueNode(final Node continueNode) {
+        this.continueNode = continueNode;
+    }
+
+    /**
+     * Get the identifier representing the label name
+     * @return the label
+     */
+    public IdentNode getLabel() {
+        return label;
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/LabeledNode.java b/nashorn/src/jdk/nashorn/internal/ir/LabeledNode.java
new file mode 100644
index 00000000000..84bd0019cde
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/LabeledNode.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir;
+
+import jdk.nashorn.internal.ir.annotations.Ignore;
+import jdk.nashorn.internal.ir.annotations.Reference;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * IR base class for break and continue.
+ *
+ */
+public abstract class LabeledNode extends Node {
+    /** Optional label. */
+    @Ignore
+    protected final LabelNode labelNode;
+
+    /** Target control node. */
+    @Reference @Ignore
+    protected final Node targetNode;
+
+    /** Try chain. */
+    @Reference
+    protected final TryNode tryChain;
+
+    /** scope nesting level */
+    protected int scopeNestingLevel;
+
+    /**
+     * Constructor
+     *
+     * @param source     the source
+     * @param token      token
+     * @param finish     finish
+     * @param labelNode  the label node
+     * @param targetNode the place to break to
+     * @param tryChain   the try chain
+     */
+    public LabeledNode(final Source source, final long token, final int finish, final LabelNode labelNode, final Node targetNode, final TryNode tryChain) {
+        super(source, token, finish);
+
+        this.labelNode  = labelNode;
+        this.targetNode = targetNode;
+        this.tryChain   = tryChain;
+    }
+
+    /**
+     * Copy constructor
+     *
+     * @param labeledNode source node
+     * @param cs          copy state
+     */
+    protected LabeledNode(final LabeledNode labeledNode, final CopyState cs) {
+        super(labeledNode);
+
+        this.labelNode         = (LabelNode)cs.existingOrCopy(labeledNode.labelNode);
+        this.targetNode        = cs.existingOrSame(labeledNode.targetNode);
+        this.tryChain          = (TryNode)cs.existingOrSame(labeledNode.tryChain);
+        this.scopeNestingLevel = labeledNode.scopeNestingLevel;
+    }
+
+    /**
+     * Get the label
+     * @return the label
+     */
+    public LabelNode getLabel() {
+        return labelNode;
+    }
+
+    /**
+     * Get the target node
+     * @return the target node
+     */
+    public Node getTargetNode() {
+        return targetNode;
+    }
+
+    /**
+     * Get the surrounding try chain
+     * @return the try chain
+     */
+    public TryNode getTryChain() {
+        return tryChain;
+    }
+
+    /**
+     * Get the scope nesting level
+     * @return nesting level
+     */
+    public int getScopeNestingLevel() {
+        return scopeNestingLevel;
+    }
+
+    /**
+     * Set scope nesting level
+     * @param level the new level
+     */
+    public void setScopeNestingLevel(final int level) {
+        scopeNestingLevel = level;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/LineNumberNode.java b/nashorn/src/jdk/nashorn/internal/ir/LineNumberNode.java
new file mode 100644
index 00000000000..8912218291a
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/LineNumberNode.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir;
+
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.parser.Token;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * IR Node representing a line number
+ */
+
+public class LineNumberNode extends Node {
+    /** Line number */
+    private final int lineNumber;
+
+    /**
+     * Constructor
+     *
+     * @param source     the source
+     * @param token      token
+     * @param lineNumber the line number
+     */
+    public LineNumberNode(final Source source, final long token, final int lineNumber) {
+        super(source, token, Token.descPosition(token));
+
+        this.lineNumber = lineNumber;
+    }
+
+   private LineNumberNode(final LineNumberNode lineNumberNode) {
+        super(lineNumberNode);
+
+        lineNumber = lineNumberNode.getLineNumber();
+    }
+
+    @Override
+    protected Node copy(final CopyState cs) {
+        return new LineNumberNode(this);
+    }
+
+    @Override
+    public Node accept(final NodeVisitor visitor) {
+        if (visitor.enter(this) != null) {
+            return visitor.leave(this);
+        }
+
+        return this;
+    }
+
+    @Override
+    public void toString(final StringBuilder sb) {
+        sb.append("[|");
+        sb.append(lineNumber);
+        sb.append("|]");
+    }
+
+    @Override
+    public boolean isAtom() {
+        return true;
+    }
+
+    /**
+     * Get the line number
+     * @return line number
+     */
+    public int getLineNumber() {
+        return lineNumber;
+    }
+
+    @Override
+    public boolean isDebug() {
+        return true;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/LiteralNode.java b/nashorn/src/jdk/nashorn/internal/ir/LiteralNode.java
new file mode 100644
index 00000000000..648f496b1f9
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/LiteralNode.java
@@ -0,0 +1,785 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import jdk.nashorn.internal.codegen.CompileUnit;
+import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.parser.Lexer.LexerToken;
+import jdk.nashorn.internal.parser.TokenType;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.Source;
+import jdk.nashorn.internal.runtime.Undefined;
+
+/**
+ * Literal nodes represent JavaScript values.
+ *
+ * @param <T> the literal type
+ */
+public abstract class LiteralNode<T> extends Node implements PropertyKey {
+    /** Literal value */
+    protected T value;
+
+     /**
+     * Constructor
+     *
+     * @param source  the source
+     * @param token   token
+     * @param finish  finish
+     * @param value   the value of the literal
+     */
+    protected LiteralNode(final Source source, final long token, final int finish, final T value) {
+        super(source, token, finish);
+        this.value = value;
+    }
+
+    /**
+     * Copy constructor
+     *
+     * @param literalNode source node
+     */
+    protected LiteralNode(final LiteralNode<T> literalNode) {
+        super(literalNode);
+        this.value = literalNode.value;
+    }
+
+    @Override
+    public boolean isAtom() {
+        return true;
+    }
+
+    /**
+     * Check if the literal value is null
+     * @return true if literal value is null
+     */
+    public boolean isNull() {
+        return value == null;
+    }
+
+    @Override
+    public int hashCode() {
+        return value == null ? 0 : value.hashCode();
+    }
+
+    @Override
+    public boolean equals(final Object other) {
+        if (!(other instanceof LiteralNode<?>)) {
+            return false;
+        }
+        final LiteralNode<?> otherNode = (LiteralNode<?>)other;
+        if (otherNode.isNull()) {
+            return isNull();
+        }
+        return ((LiteralNode<?>)other).getValue().equals(value);
+    }
+
+    /**
+     * Check if the literal value is boolean true
+     * @return true if literal value is boolean true
+     */
+    public boolean isTrue() {
+        return JSType.toBoolean(value);
+    }
+
+    @Override
+    public Type getType() {
+        return Type.typeFor(value.getClass());
+    }
+
+    @Override
+    public String getPropertyName() {
+        return JSType.toString(getObject());
+    }
+
+    /**
+     * Fetch boolean value of node.
+     *
+     * @return boolean value of node.
+     */
+    public boolean getBoolean() {
+        return JSType.toBoolean(value);
+    }
+
+    /**
+     * Fetch int32 value of node.
+     *
+     * @return Int32 value of node.
+     */
+    public int getInt32() {
+        return JSType.toInt32(value);
+    }
+
+    /**
+     * Fetch uint32 value of node.
+     *
+     * @return uint32 value of node.
+     */
+    public long getUint32() {
+        return JSType.toUint32(value);
+    }
+
+    /**
+     * Fetch long value of node
+     *
+     * @return long value of node
+     */
+    public long getLong() {
+        return JSType.toLong(value);
+    }
+
+    /**
+     * Fetch double value of node.
+     *
+     * @return double value of node.
+     */
+    public double getNumber() {
+        return JSType.toNumber(value);
+    }
+
+    /**
+     * Get the array value of the node
+     *
+     * @return the array value
+     */
+    public Node[] getArray() {
+        assert false : "not an array node";
+        return null;
+    }
+
+    /**
+     * Fetch String value of node.
+     *
+     * @return String value of node.
+     */
+    public String getString() {
+        return JSType.toString(value);
+    }
+
+    /**
+     * Fetch Object value of node.
+     *
+     * @return Object value of node.
+     */
+    public Object getObject() {
+        return value;
+    }
+
+    /**
+     * Test if the value is a string.
+     *
+     * @return True if value is a string.
+     */
+    public boolean isString() {
+        return value instanceof String;
+    }
+
+    /**
+     * Assist in IR navigation.
+     *
+     * @param visitor IR navigating visitor.
+     */
+    @Override
+    public Node accept(final NodeVisitor visitor) {
+        if (visitor.enter(this) != null) {
+            return visitor.leave(this);
+        }
+
+        return this;
+    }
+
+    @Override
+    public void toString(final StringBuilder sb) {
+        if (value == null) {
+            sb.append("null");
+        } else {
+            sb.append(value.toString());
+        }
+    }
+
+    /**
+     * Get the literal node value
+     * @return the value
+     */
+    public T getValue() {
+        return value;
+    }
+
+    /**
+     * Create a new null literal
+     *
+     * @param source  the source
+     * @param token   token
+     * @param finish  finish
+     *
+     * @return the new literal node
+     */
+    public static LiteralNode<Node> newInstance(final Source source, final long token, final int finish) {
+        return new LiteralNode<Node>(source, token, finish, null) {
+            @Override
+            protected Node copy(final CopyState cs) {
+                return LiteralNode.newInstance(getSource(), getToken(), getFinish());
+            }
+            @Override
+            public Type getType() {
+                return Type.OBJECT;
+            }
+        };
+    }
+
+    /**
+     * Create a new boolean literal
+     *
+     * @param source  the source
+     * @param token   token
+     * @param finish  finish
+     * @param value   true or false
+     *
+     * @return the new literal node
+     */
+    public static LiteralNode<Boolean> newInstance(final Source source, final long token, final int finish, final boolean value) {
+        return new LiteralNode<Boolean>(source, token, finish, value) {
+            @Override
+            protected Node copy(final CopyState cs) {
+                return LiteralNode.newInstance(getSource(), getToken(), getFinish(), getValue());
+            }
+
+            @Override
+            public boolean isTrue() {
+                return value;
+            }
+
+            @Override
+            public Type getType() {
+                return Type.BOOLEAN;
+            }
+
+            @Override
+            public Type getWidestOperationType() {
+                return Type.BOOLEAN;
+            }
+        };
+    }
+
+    /**
+     * Create a new number literal
+     *
+     * @param source  the source
+     * @param token   token
+     * @param finish  finish
+     * @param value   literal value
+     *
+     * @return the new literal node
+     */
+    public static LiteralNode<Number> newInstance(final Source source, final long token, final int finish, final Number value) {
+        return new LiteralNode<Number>(source, token, finish, value) {
+
+            private Type numberGetType(final Number number) {
+                if (number instanceof Integer) {
+                    return Type.INT;
+                } else if (number instanceof Long) {
+                    return Type.LONG;
+                } else if (number instanceof Double) {
+                    return Type.NUMBER;
+                } else {
+                    assert false;
+                }
+
+                return null;
+            }
+
+            private final Type type = numberGetType(value);
+
+            @Override
+            protected Node copy(final CopyState cs) {
+                return LiteralNode.newInstance(getSource(), getToken(), getFinish(), getValue());
+            }
+
+            @Override
+            public Type getType() {
+                return type;
+            }
+
+            @Override
+            public Type getWidestOperationType() {
+                return getType();
+            }
+
+        };
+    }
+
+    /**
+     * Create a new undefined literal
+     *
+     * @param source  the source
+     * @param token   token
+     * @param finish  finish
+     * @param value   undefined value, passed only for polymorphisism discrimination
+     *
+     * @return the new literal node
+     */
+    public static LiteralNode<Undefined> newInstance(final Source source, final long token, final int finish, final Undefined value) {
+        return new LiteralNode<Undefined>(source, token, finish, value) {
+            @Override
+            protected Node copy(final CopyState cs) {
+                return LiteralNode.newInstance(getSource(), getToken(), getFinish(), getValue());
+            }
+        };
+    }
+
+    /**
+     * Create a new string literal
+     *
+     * @param source  the source
+     * @param token   token
+     * @param finish  finish
+     * @param value   string value
+     *
+     * @return the new literal node
+     */
+    public static LiteralNode<String> newInstance(final Source source, final long token, final int finish, final String value) {
+        return new LiteralNode<String>(source, token, finish, value) {
+            @Override
+            protected Node copy(final CopyState cs) {
+                return LiteralNode.newInstance(getSource(), getToken(), getFinish(), getValue());
+            }
+
+            @Override
+            public void toString(final StringBuilder sb) {
+                sb.append('\"');
+                sb.append(value);
+                sb.append('\"');
+            }
+        };
+    }
+
+    /**
+     * Create a new literal node for a lexer token
+     *
+     * @param source  the source
+     * @param token   token
+     * @param finish  finish
+     * @param value   lexer token value
+     *
+     * @return the new literal node
+     */
+    public static LiteralNode<LexerToken> newInstance(final Source source, final long token, final int finish, final LexerToken value) {
+        return new LiteralNode<LexerToken>(source, token, finish, value) {
+            @Override
+            protected Node copy(final CopyState cs) {
+                return LiteralNode.newInstance(getSource(), getToken(), getFinish(), getValue());
+            }
+
+
+            @Override
+            public void toString(final StringBuilder sb) {
+                sb.append(value.toString());
+            }
+        };
+    }
+
+    /**
+     * Create a new array for an arbitrary node
+     *
+     * @param source  the source
+     * @param token   token
+     * @param finish  finish
+     * @param value   the literal value node
+     *
+     * @return the new literal node
+     */
+    public static LiteralNode<Node> newInstance(final Source source, final long token, final int finish, final Node value) {
+        return new LiteralNode<Node>(source, token, finish, value) {
+            @Override
+            protected Node copy(final CopyState cs) {
+                return LiteralNode.newInstance(getSource(), getToken(), getFinish(), getValue());
+            }
+
+            @Override
+            public Node accept(final NodeVisitor visitor) {
+                if (visitor.enter(this) != null) {
+                    value = value.accept(visitor);
+                    return visitor.leave(this);
+                }
+
+                return this;
+            }
+
+            @Override
+            public void toString(final StringBuilder sb) {
+                value.toString(sb);
+            }
+
+            @Override
+            public Type getWidestOperationType() {
+                return value.getWidestOperationType();
+            }
+
+        };
+    }
+
+    /**
+     * Array literal node class.
+     */
+    public static class ArrayLiteralNode extends LiteralNode<Node[]> {
+        private static class PostsetMarker {
+            //empty
+        }
+
+        private static PostsetMarker POSTSET_MARKER = new PostsetMarker();
+
+        /** Array element type. */
+        private Type elementType;
+
+        /** Preset constant array. */
+        private Object presets;
+
+        /** Indices of array elements requiring computed post sets. */
+        private int[] postsets;
+
+        private List<ArrayUnit> units;
+
+        /**
+         * An ArrayUnit is a range in an ArrayLiteral. ArrayLiterals can
+         * be split if they are too large, for bytecode generation reasons
+         */
+        public static class ArrayUnit {
+            /** Compile unit associated with the postsets range. */
+            private final CompileUnit compileUnit;
+
+            /** postsets range associated with the unit (hi not inclusive). */
+            private final int lo, hi;
+
+            /**
+             * Constructor
+             * @param compileUnit compile unit
+             * @param lo lowest array index in unit
+             * @param hi highest array index in unit + 1
+             */
+            public ArrayUnit(final CompileUnit compileUnit, final int lo, final int hi) {
+                this.compileUnit = compileUnit;
+                this.lo   = lo;
+                this.hi   = hi;
+            }
+
+            /**
+             * Get the high index position of the ArrayUnit (non inclusive)
+             * @return high index position
+             */
+            public int getHi() {
+                return hi;
+            }
+
+            /**
+             * Get the low index position of the ArrayUnit (inclusive)
+             * @return low index position
+             */
+            public int getLo() {
+                return lo;
+            }
+
+            /**
+             * The array compile unit
+             * @return array compile unit
+             */
+            public CompileUnit getCompileUnit() {
+                return compileUnit;
+            }
+        }
+
+        /**
+         * Constructor
+         *
+         * @param source  the source
+         * @param token   token
+         * @param finish  finish
+         * @param value   array literal value, a Node array
+         */
+        protected ArrayLiteralNode(final Source source, final long token, final int finish, final Node[] value) {
+            super(source, token, finish, value);
+
+            this.elementType = Type.UNKNOWN;
+        }
+
+        /**
+         * Copy constructor
+         * @param node source array literal node
+         */
+        protected ArrayLiteralNode(final LiteralNode<Node[]> node) {
+            super(node);
+        }
+
+        @Override
+        protected Node copy(final CopyState cs) {
+            return LiteralNode.newInstance(getSource(), getToken(), getFinish(), getValue());
+        }
+
+        /**
+         * Compute things like widest element type needed. Internal use from compiler only
+         */
+        public void analyze() {
+            elementType = Type.INT;
+            analyzeElements();
+
+            if (elementType == Type.INT) {
+                presetIntArray();
+            } else if (elementType.isNumeric()) {
+                presetNumberArray();
+            } else {
+                presetObjectArray();
+            }
+        }
+
+        private void presetIntArray() {
+            final int[] array = new int[value.length];
+            final int[] computed = new int[value.length];
+            int nComputed = 0;
+
+            for (int i = 0; i < value.length; i++) {
+                final Object element = objectAsConstant(value[i]);
+
+                if (element instanceof Number) {
+                    array[i] = ((Number)element).intValue();
+                } else {
+                    computed[nComputed++] = i;
+                }
+            }
+
+            presets = array;
+            postsets = Arrays.copyOf(computed, nComputed);
+        }
+
+        private void presetNumberArray() {
+            final double[] array = new double[value.length];
+            final int[] computed = new int[value.length];
+            int nComputed = 0;
+
+            for (int i = 0; i < value.length; i++) {
+                final Object element = objectAsConstant(value[i]);
+
+                if (element instanceof Number) {
+                    array[i] = ((Number)element).doubleValue();
+                } else {
+                    computed[nComputed++] = i;
+                }
+            }
+
+            presets = array;
+            postsets = Arrays.copyOf(computed, nComputed);
+        }
+
+        private void presetObjectArray() {
+            final Object[] array = new Object[value.length];
+            final int[] computed = new int[value.length];
+            int nComputed = 0;
+
+            for (int i = 0; i < value.length; i++) {
+                final Node node = value[i];
+
+                if (node == null) {
+                    computed[nComputed++] = i;
+                } else {
+                    final Object element = objectAsConstant(node);
+
+                    if (element != POSTSET_MARKER) {
+                        array[i] = element;
+                    } else {
+                        computed[nComputed++] = i;
+                    }
+                }
+            }
+
+            presets = array;
+            postsets = Arrays.copyOf(computed, nComputed);
+        }
+
+        private void analyzeElements() {
+            for (final Node node : value) {
+                if (node == null) {
+                    elementType = elementType.widest(Type.OBJECT); //no way to represent undefined as number
+                    break;
+                }
+
+                final Symbol symbol = node.getSymbol();
+                assert symbol != null; //don't run this on unresolved nodes or you are in trouble
+                Type symbolType = symbol.getSymbolType();
+                if (symbolType.isUnknown()) {
+                    symbolType = Type.OBJECT;
+                }
+
+                if (symbolType.isBoolean()) {
+                    elementType = elementType.widest(Type.OBJECT);
+                    break;
+                }
+
+                elementType = elementType.widest(symbolType);
+
+                if (elementType.isObject()) {
+                    break;
+                }
+            }
+        }
+
+        private Object objectAsConstant(final Object object) {
+            if (object == null) {
+                return null;
+            } else if (object instanceof Number || object instanceof String || object instanceof Boolean) {
+                return object;
+            } else if (object instanceof LiteralNode) {
+                return objectAsConstant(((LiteralNode<?>)object).getValue());
+            } else if (object instanceof UnaryNode) {
+                final UnaryNode unaryNode = (UnaryNode)object;
+
+                if (unaryNode.isTokenType(TokenType.CONVERT) && unaryNode.getType().isObject()) {
+                    return objectAsConstant(unaryNode.rhs());
+                }
+            }
+
+            return POSTSET_MARKER;
+        }
+
+        @Override
+        public Node[] getArray() {
+            return value;
+        }
+
+        @Override
+        public Type getType() {
+            if (elementType.isInteger()) {
+                return Type.INT_ARRAY;
+            } else if (elementType.isNumeric()) {
+                return Type.NUMBER_ARRAY;
+            } else {
+                return Type.OBJECT_ARRAY;
+            }
+        }
+
+        /**
+         * Get the element type of this array literal
+         * @return element type
+         */
+        public Type getElementType() {
+            return elementType;
+        }
+
+        /**
+         * Get indices of arrays containing computed post sets
+         * @return post set indices
+         */
+        public int[] getPostsets() {
+            return postsets;
+        }
+
+        /**
+         * Get presets constant array
+         * @return presets array, always returns an array type
+         */
+        public Object getPresets() {
+            return presets;
+        }
+
+        /**
+         * Get the array units that make up this ArrayLiteral
+         * @see ArrayUnit
+         * @return list of array units
+         */
+        public List<ArrayUnit> getUnits() {
+            return units == null ? null : Collections.unmodifiableList(units);
+        }
+
+        /**
+         * Set the ArrayUnits that make up this ArrayLiteral
+         * @see ArrayUnit
+         * @param units list of array units
+         */
+        public void setUnits(final List<ArrayUnit> units) {
+            this.units = units;
+        }
+
+        @Override
+        public Node accept(final NodeVisitor visitor) {
+            if (visitor.enter(this) != null) {
+                for (int i = 0; i < value.length; i++) {
+                    final Node element = value[i];
+                    if (element != null) {
+                        value[i] = element.accept(visitor);
+                    }
+                }
+                return visitor.leave(this);
+            }
+            return this;
+        }
+
+        @Override
+        public void toString(final StringBuilder sb) {
+            sb.append('[');
+            boolean first = true;
+            for (final Node node : value) {
+                if (!first) {
+                    sb.append(',');
+                    sb.append(' ');
+                }
+                if (node == null) {
+                    sb.append("undefined");
+                } else {
+                    node.toString(sb);
+                }
+                first = false;
+            }
+            sb.append(']');
+        }
+    }
+
+    /**
+     * Create a new array literal of Nodes from a list of Node values
+     *
+     * @param source  the source
+     * @param token   token
+     * @param finish  finish
+     * @param value   literal value list
+     *
+     * @return the new literal node
+     */
+    public static LiteralNode<Node[]> newInstance(final Source source, final long token, final int finish, final List<Node> value) {
+        return new ArrayLiteralNode(source, token, finish, value.toArray(new Node[value.size()]));
+    }
+
+    /**
+     * Create a new array literal of Nodes
+     *
+     * @param source  the source
+     * @param token   token
+     * @param finish  finish
+     * @param value   literal value array
+     *
+     * @return the new literal node
+     */
+    public static LiteralNode<Node[]> newInstance(final Source source, final long token, final int finish, final Node[] value) {
+        return new ArrayLiteralNode(source, token, finish, value);
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/Location.java b/nashorn/src/jdk/nashorn/internal/ir/Location.java
new file mode 100644
index 00000000000..d374bf8878e
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/Location.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir;
+
+import java.util.Objects;
+import jdk.nashorn.internal.parser.Token;
+import jdk.nashorn.internal.parser.TokenType;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * Used to locate an entity back to it's source file.
+ *
+ */
+
+public class Location implements Cloneable {
+    /** Source of entity. */
+    private final Source source;
+
+    /** Token descriptor. */
+    private final long token;
+
+    /**
+     * Constructor
+     *
+     * @param source the source
+     * @param token  token
+     */
+    public Location(final Source source, final long token) {
+        this.source = source;
+        this.token = token;
+    }
+
+    /**
+     * Copy constructor
+     *
+     * @param location source node
+     */
+    protected Location(final Location location) {
+        this.source = location.source;
+        this.token = location.token;
+    }
+
+    @Override
+    protected Object clone() {
+        return new Location(this);
+    }
+
+    @Override
+    public boolean equals(final Object other) {
+        if (other == null) {
+            return false;
+        }
+
+        if (other.getClass() != this.getClass()) {
+            return false;
+        }
+
+        final Location loc = (Location)other;
+        return token == loc.token && Objects.equals(source, loc.source);
+    }
+
+    @Override
+    public int hashCode() {
+        return Token.hashCode(token) ^ Objects.hashCode(source);
+    }
+
+    /**
+     * Return token position from a token descriptor.
+     *
+     * @return Start position of the token in the source.
+     */
+    public int position() {
+        return Token.descPosition(token);
+    }
+
+    /**
+     * Return token length from a token descriptor.
+     *
+     * @return Length of the token.
+     */
+    public int length() {
+        return Token.descLength(token);
+    }
+
+    /**
+     * Return token tokenType from a token descriptor.
+     *
+     * @return Type of token.
+     */
+    public TokenType tokenType() {
+        return Token.descType(token);
+    }
+
+    /**
+     * Test token tokenType.
+     *
+     * @param type a type to check this token against
+     * @return true if token types match.
+     */
+    public boolean isTokenType(final TokenType type) {
+        return Token.descType(token) == type;
+    }
+
+    /**
+     * Get the source for this location
+     * @return the source
+     */
+    public Source getSource() {
+        return source;
+    }
+
+    /**
+     * Get the token for this location
+     * @return the token
+     */
+    public long getToken() {
+        return token;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/Node.java b/nashorn/src/jdk/nashorn/internal/ir/Node.java
new file mode 100644
index 00000000000..51fc7031331
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/Node.java
@@ -0,0 +1,432 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir;
+
+import java.util.IdentityHashMap;
+import java.util.List;
+import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.parser.Token;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * Nodes are used to compose Abstract Syntax Trees.
+ *
+ */
+public abstract class Node extends Location {
+    /** Node symbol. */
+    private Symbol nodeSymbol;
+
+    /** Start of source range. */
+    protected int start;
+
+    /** End of source range. */
+    protected int finish;
+
+    /** Has this node been resolved - i.e. emitted code already */
+    private boolean isResolved;
+
+    /** Is this node terminal */
+    private boolean isTerminal;
+
+    /** Is this a goto node */
+    private boolean hasGoto;
+
+    /** Is this a discard */
+    private boolean shouldDiscard;
+
+    /**
+     * Constructor
+     *
+     * @param source the source
+     * @param token  token
+     * @param finish finish
+     */
+    public Node(final Source source, final long token, final int finish) {
+        super(source, token);
+
+        start  = Token.descPosition(token);
+        this.finish = finish;
+    }
+
+    /**
+     * Copy constructor
+     *
+     * @param node source node
+     */
+    protected Node(final Node node) {
+        super(node);
+
+        this.nodeSymbol    = node.nodeSymbol;
+        this.isResolved    = node.isResolved;
+        this.isTerminal    = node.isTerminal;
+        this.hasGoto       = node.hasGoto;
+        this.shouldDiscard = node.shouldDiscard;
+        this.start         = node.start;
+        this.finish        = node.finish;
+    }
+
+    /**
+     * Check if the node has a type. The default behavior is to go into the symbol
+     * and check the symbol type, but there may be overrides, for example in
+     * getters that require a different type than the internal representation
+     *
+     * @return true if a type exists
+     */
+    public boolean hasType() {
+        return getSymbol() != null;
+    }
+
+    /**
+     * Returns the type of the node. Typically this is the symbol type. No types
+     * are stored in the node itself, unless it implements TypeOverride
+     *
+     * @return the type of the node.
+     */
+    public Type getType() {
+        assert hasType();
+        return nodeSymbol.getSymbolType();
+    }
+
+    /**
+     * Is this an atom node - for example a literal or an identity
+     *
+     * @return true if atom
+     */
+    public boolean isAtom() {
+        return false;
+    }
+
+    /**
+     * Is this a loop node?
+     *
+     * @return true if atom
+     */
+    public boolean isLoop() {
+        return false;
+    }
+
+    /**
+     * Is this an assignment node - for example a var node with an init
+     * or a binary node that writes to a destination
+     *
+     * @return true if assignment
+     */
+    public boolean isAssignment() {
+        return false;
+    }
+
+    /**
+     * Is this a self modifying assignment?
+     * @return true if self modifying, e.g. a++, or a*= 17
+     */
+    public boolean isSelfModifying() {
+        return false;
+    }
+
+    /**
+     * Returns widest operation type of this operation.
+     *
+     * @return the widest type for this operation
+     */
+    public Type getWidestOperationType() {
+        return Type.OBJECT;
+    }
+
+    /**
+     * Test to see if code been generated for this node. Set isResolved if not.
+     *
+     * @return True if node has already been resolved.
+     */
+    public boolean testResolved() {
+        if (isResolved()) {
+            return true;
+        }
+
+        setIsResolved();
+
+        return false;
+    }
+
+    /**
+     * Is this a debug info node like LineNumberNode etc?
+     *
+     * @return true if this is a debug node
+     */
+    public boolean isDebug() {
+        return false;
+    }
+
+    /**
+     * Helper class used for node cloning
+     */
+    public static final class CopyState {
+        private final IdentityHashMap<Node, Node> cloneMap = new IdentityHashMap<>();
+
+        /**
+         * Find existing or create new copy of the node.
+         *
+         * @param node Node to copy.
+         *
+         * @return New object.
+         */
+        public Node existingOrCopy(final Node node) {
+            if (node != null) {
+                Node copy = cloneMap.get(node);
+
+                if (copy == null) {
+                    copy = node.copy(this);
+                    cloneMap.put(node, copy);
+                }
+
+                return copy;
+            }
+
+            return node;
+        }
+
+        /**
+         * Find existing or use old copy of the node.
+         *
+         * @param node Node to copy.
+         *
+         * @return new object.
+         */
+        public Node existingOrSame(final Node node) {
+            if (node != null) {
+                Node copy = cloneMap.get(node);
+
+                if (copy == null) {
+                    copy = node;
+                }
+
+                return copy;
+            }
+
+            return node;
+        }
+    }
+
+    /**
+     * Deep copy the node.
+     *
+     * @return Deep copy of the  Node.
+     */
+    @Override
+    public final Node clone() {
+        return copy(new CopyState());
+    }
+
+    /**
+     * Deep copy the node.
+     *
+     * @param cs CopyState passed around to re-use certain nodes.
+     * @return Deep copy of the  Node.
+     */
+    protected Node copy(final CopyState cs) {
+        return cs.existingOrCopy(this);
+    }
+
+    /**
+     * Provides a means to navigate the IR.
+     * @param visitor Node visitor.
+     * @return node the node or its replacement after visitation, null if no further visitations are required
+     */
+    public abstract Node accept(NodeVisitor visitor);
+
+    @Override
+    public String toString() {
+        final StringBuilder sb = new StringBuilder();
+        toString(sb);
+        return sb.toString();
+    }
+
+    /**
+     * String conversion helper. Fills a {@link StringBuilder} with the
+     * string version of this node
+     *
+     * @param sb a StringBuilder
+     */
+    public abstract void toString(StringBuilder sb);
+
+    /**
+     * Check if this node has terminal flags, i.e. ends or breaks control flow
+     *
+     * @return true if terminal
+     */
+    public boolean hasTerminalFlags() {
+        return isTerminal || hasGoto;
+    }
+
+    /**
+     * Copy the terminal flags state of a node to another node
+     *
+     * @param other source node
+     */
+    public void copyTerminalFlags(final Node other) {
+        isTerminal = other.isTerminal;
+        hasGoto    = other.hasGoto;
+    }
+
+    /**
+     * Check if the return value of this expression should be discarded
+     * @return true if return value is discarded
+     */
+    public boolean shouldDiscard() {
+        return shouldDiscard;
+    }
+
+    /**
+     * Setter that determines whether this node's return value should be discarded
+     * or not
+     *
+     * @param shouldDiscard true if return value is discarded, false otherwise
+     */
+    public void setDiscard(final boolean shouldDiscard) {
+        this.shouldDiscard = shouldDiscard;
+    }
+
+    /**
+     * Get the finish position for this node in the source string
+     * @return finish
+     */
+    public int getFinish() {
+        return finish;
+    }
+
+    /**
+     * Set finish position for this node in the source string
+     * @param finish finish
+     */
+    public void setFinish(final int finish) {
+        this.finish = finish;
+    }
+
+    /**
+     * Check if this function repositions control flow with goto like
+     * semantics, for example {@link BreakNode} or a {@link ForNode} with no test
+     * @return true if node has goto semantics
+     */
+    public boolean hasGoto() {
+        return hasGoto;
+    }
+
+    /**
+     * Flag this node as having goto semantics as described in {@link Node#hasGoto()}
+     */
+    public void setHasGoto() {
+        this.hasGoto = true;
+    }
+
+    /**
+     * Check whether this node is resolved, i.e. code has been generated for it
+     * @return true if node is resolved
+     */
+    public boolean isResolved() {
+        return isResolved;
+    }
+
+    /**
+     * Flag this node as resolved, i.e. code has been generated for it
+     */
+    public void setIsResolved() {
+        this.isResolved = true;
+    }
+
+    /**
+     * Get start position for node
+     * @return start position
+     */
+    public int getStart() {
+        return start;
+    }
+
+    /**
+     * Set start position for node
+     * @param start start position
+     */
+    public void setStart(final int start) {
+        this.start = start;
+    }
+
+    /**
+     * Return the Symbol the compiler has assigned to this Node. The symbol
+     * is the place where it's expression value is stored after evaluation
+     *
+     * @return the symbol
+     */
+    public Symbol getSymbol() {
+        return nodeSymbol;
+    }
+
+    /**
+     * Assign a symbol to this node. See {@link Node#getSymbol()} for explanation
+     * of what a symbol is
+     *
+     * @param symbol the symbol
+     */
+    public void setSymbol(final Symbol symbol) {
+        nodeSymbol = symbol;
+    }
+
+    /**
+     * Is this a terminal Node, i.e. does it end control flow like a throw or return
+     * expression does?
+     *
+     * @return true if this node is terminal
+     */
+    public boolean isTerminal() {
+        return isTerminal;
+    }
+
+    /**
+     * Set this to be a terminal node, i.e. it terminates control flow as described
+     * in {@link Node#isTerminal()}
+     *
+     * @param isTerminal true if this is a terminal node, false otherwise
+     */
+    public void setIsTerminal(final boolean isTerminal) {
+        this.isTerminal = isTerminal;
+    }
+
+    /**
+     * Return last node in a statement list.
+     *
+     * @param statements Statement list.
+     *
+     * @return Last (non-debug) statement or null if empty block.
+     */
+    public static Node lastStatement(final List<Node> statements) {
+        for (int lastIndex = statements.size() - 1; lastIndex >= 0; lastIndex--) {
+            final Node node = statements.get(lastIndex);
+            if (!node.isDebug()) {
+                return node;
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/ObjectNode.java b/nashorn/src/jdk/nashorn/internal/ir/ObjectNode.java
new file mode 100644
index 00000000000..071ffc2ab9b
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/ObjectNode.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import jdk.nashorn.internal.ir.annotations.Ignore;
+import jdk.nashorn.internal.ir.annotations.Reference;
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * IR representation of an object literal.
+ */
+public class ObjectNode extends Node {
+    /** Literal context. */
+    @Reference @Ignore
+    private Block context;
+
+    /** Literal elements. */
+    private final List<Node> elements;
+
+    /**
+     * Constructor
+     *
+     * @param source   the source
+     * @param token    token
+     * @param finish   finish
+     * @param context  the block for this ObjectNode
+     * @param elements the elements used to initialize this ObjectNode
+     */
+    public ObjectNode(final Source source, final long token, final int finish, final Block context, final List<Node> elements) {
+        super(source, token, finish);
+
+        this.context  = context;
+        this.elements = elements;
+    }
+
+    private ObjectNode(final ObjectNode objectNode, final CopyState cs) {
+        super(objectNode);
+
+        final List<Node> newElements = new ArrayList<>();
+
+        for (final Node element : objectNode.elements) {
+            newElements.add(cs.existingOrCopy(element));
+        }
+
+        context  = (Block)cs.existingOrCopy(objectNode.context);
+        elements = newElements;
+    }
+
+    @Override
+    protected Node copy(final CopyState cs) {
+        return new ObjectNode(this, cs);
+    }
+
+    @Override
+    public Node accept(final NodeVisitor visitor) {
+        if (visitor.enter(this) != null) {
+            if (context != null) {
+                context = (Block)context.accept(visitor);
+            }
+
+            for (int i = 0, count = elements.size(); i < count; i++) {
+                elements.set(i, elements.get(i).accept(visitor));
+            }
+
+            return visitor.leave(this);
+        }
+
+        return this;
+    }
+
+    @Override
+    public void toString(final StringBuilder sb) {
+        sb.append('{');
+
+        if (!elements.isEmpty()) {
+            sb.append(' ');
+
+            boolean first = true;
+            for (final Node element : elements) {
+                if (!first) {
+                    sb.append(", ");
+                }
+                first = false;
+
+                element.toString(sb);
+            }
+            sb.append(' ');
+        }
+
+        sb.append('}');
+    }
+
+    /**
+     * Get the block that is this ObjectNode's literal context
+     * @return the block
+     */
+    public Block getContext() {
+        return context;
+    }
+
+    /**
+     * Get the elements of this literal node
+     * @return a list of elements
+     */
+    public List<Node> getElements() {
+        return Collections.unmodifiableList(elements);
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/PropertyKey.java b/nashorn/src/jdk/nashorn/internal/ir/PropertyKey.java
new file mode 100644
index 00000000000..cee863084e3
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/PropertyKey.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir;
+
+/**
+ * Any node that can be a property key inherits this
+ */
+public interface PropertyKey {
+
+    /**
+     * Get the property name
+     *
+     * @return the property name
+     */
+    public abstract String getPropertyName();
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/PropertyNode.java b/nashorn/src/jdk/nashorn/internal/ir/PropertyNode.java
new file mode 100644
index 00000000000..e8f39b38172
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/PropertyNode.java
@@ -0,0 +1,190 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir;
+
+import jdk.nashorn.internal.ir.annotations.Reference;
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * IR representation of an object literal property.
+ */
+public class PropertyNode extends Node {
+
+    /** Property key. */
+    private PropertyKey key;
+
+    /** Property value. */
+    private Node value;
+
+    /** Property getter. */
+    @Reference
+    private Node getter;
+
+    /** Property getter. */
+    @Reference
+    private Node setter;
+
+    /**
+     * Constructor
+     *
+     * @param source  the source
+     * @param token   token
+     * @param finish  finish
+     * @param key     the key of this property
+     * @param value   the value of this property
+     */
+    public PropertyNode(final Source source, final long token, final int finish, final PropertyKey key, final Node value) {
+        super(source, token, finish);
+
+        this.key    = key;
+        this.value  = value;
+    }
+
+    private PropertyNode(final PropertyNode propertyNode, final CopyState cs) {
+        super(propertyNode);
+
+        this.key    = (PropertyKey)cs.existingOrCopy((Node)propertyNode.key);
+        this.value  = cs.existingOrCopy(propertyNode.value);
+        this.getter = cs.existingOrSame(propertyNode.getter);
+        this.setter = cs.existingOrSame(propertyNode.setter);
+    }
+
+    @Override
+    protected Node copy(final CopyState cs) {
+        return new PropertyNode(this, cs);
+    }
+
+    /**
+     * Get the name of the property key
+     * @return key name
+     */
+    public String getKeyName() {
+        return key.getPropertyName();
+    }
+
+    @Override
+    public Node accept(final NodeVisitor visitor) {
+        if (visitor.enter(this) != null) {
+            key = (PropertyKey)((Node)key).accept(visitor);
+
+            if (value != null) {
+                value = value.accept(visitor);
+            }
+
+            if (getter != null) {
+                getter = getter.accept(visitor);
+            }
+
+            if (setter != null) {
+                setter = setter.accept(visitor);
+            }
+
+            return visitor.leave(this);
+        }
+
+        return this;
+    }
+
+    @Override
+    public void toString(final StringBuilder sb) {
+        if (value instanceof FunctionNode && ((FunctionNode)value).getIdent() != null) {
+            value.toString(sb);
+        }
+
+        if (value != null) {
+            ((Node)key).toString(sb);
+            sb.append(": ");
+            value.toString(sb);
+        }
+
+        if (getter != null) {
+            sb.append(' ');
+            getter.toString(sb);
+        }
+
+        if (setter != null) {
+            sb.append(' ');
+            setter.toString(sb);
+        }
+    }
+
+    /**
+     * Get the getter for this property
+     * @return getter or null if none exists
+     */
+    public Node getGetter() {
+        return getter;
+    }
+
+    /**
+     * Set the getter of this property, null if none
+     * @param getter getter
+     */
+    public void setGetter(final Node getter) {
+        this.getter = getter;
+    }
+
+    /**
+     * Return the key for this property node
+     * @return the key
+     */
+    public Node getKey() {
+        return (Node)key;
+    }
+
+    /**
+     * Get the setter for this property
+     * @return setter or null if none exists
+     */
+    public Node getSetter() {
+        return setter;
+    }
+
+    /**
+     * Set the setter for this property, null if none
+     * @param setter setter
+     */
+    public void setSetter(final Node setter) {
+        this.setter = setter;
+    }
+
+    /**
+     * Get the value of this property
+     * @return property value
+     */
+    public Node getValue() {
+        return value;
+    }
+
+    /**
+     * Set the value of this property
+     * @param value new value
+     */
+    public void setValue(final Node value) {
+        this.value = value;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/ReferenceNode.java b/nashorn/src/jdk/nashorn/internal/ir/ReferenceNode.java
new file mode 100644
index 00000000000..01b287b17d6
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/ReferenceNode.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir;
+
+import jdk.nashorn.internal.ir.annotations.Ignore;
+import jdk.nashorn.internal.ir.annotations.Reference;
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * IR representation of a reference to another entity (function.)
+ */
+public class ReferenceNode extends Node {
+    /** Node referenced. */
+    @Reference @Ignore
+    private final FunctionNode reference;
+
+    /**
+     * Constructor
+     *
+     * @param source the source
+     * @param token  token
+     * @param finish finish
+     * @param reference the function node to reference
+     */
+    public ReferenceNode(final Source source, final long token, final int finish, final FunctionNode reference) {
+        super(source, token, finish);
+
+        this.reference = reference;
+    }
+
+    private ReferenceNode(final ReferenceNode referenceNode) {
+        super(referenceNode);
+
+        this.reference = referenceNode.reference;
+    }
+
+    @Override
+    protected Node copy(final CopyState cs) {
+        return new ReferenceNode(this);
+    }
+
+    @Override
+    public Node accept(final NodeVisitor visitor) {
+        if (visitor.enter(this) != null) {
+            return visitor.leave(this);
+        }
+
+        return this;
+    }
+
+    @Override
+    public void toString(final StringBuilder sb) {
+        if (reference == null) {
+            sb.append("null");
+        } else {
+            reference.toString(sb);
+        }
+    }
+
+    /**
+     * Get there function node reference that this node points tp
+     * @return a function node reference
+     */
+    public FunctionNode getReference() {
+        return reference;
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/ReturnNode.java b/nashorn/src/jdk/nashorn/internal/ir/ReturnNode.java
new file mode 100644
index 00000000000..14367d189f2
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/ReturnNode.java
@@ -0,0 +1,167 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir;
+
+import static jdk.nashorn.internal.parser.TokenType.RETURN;
+import static jdk.nashorn.internal.parser.TokenType.YIELD;
+
+import jdk.nashorn.internal.ir.annotations.Ignore;
+import jdk.nashorn.internal.ir.annotations.Reference;
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * IR representation for RETURN or YIELD statements.
+ *
+ */
+public class ReturnNode extends Node {
+    /** Optional expression. */
+    private Node expression;
+
+    /** Try chain. */
+    @Reference @Ignore
+    private final TryNode tryChain;
+
+    /**
+     * Constructor
+     *
+     * @param source     the source
+     * @param token      token
+     * @param finish     finish
+     * @param expression expression to return
+     * @param tryChain   surrounding try chain.
+     */
+    public ReturnNode(final Source source, final long token, final int finish, final Node expression, final TryNode tryChain) {
+        super(source, token, finish);
+
+        this.expression = expression;
+        this.tryChain   = tryChain;
+
+        setIsTerminal(true);
+    }
+
+    private ReturnNode(final ReturnNode returnNode, final CopyState cs) {
+        super(returnNode);
+
+        expression = cs.existingOrCopy(returnNode.expression);
+        tryChain   = (TryNode)cs.existingOrSame(returnNode.tryChain);
+    }
+
+    @Override
+    protected Node copy(final CopyState cs) {
+        return new ReturnNode(this, cs);
+    }
+
+    /**
+     * Return true if is a RETURN node.
+     * @return true if is RETURN node.
+     */
+    public boolean isReturn() {
+        return isTokenType(RETURN);
+    }
+
+    /**
+     * Check if this return node has an expression
+     * @return true if not a void return
+     */
+    public boolean hasExpression() {
+        return expression != null;
+    }
+
+    /**
+     * Return true if is a YIELD node.
+     * @return TRUE if is YIELD node.
+     */
+    public boolean isYield() {
+        return isTokenType(YIELD);
+    }
+
+    @Override
+    public Node accept(final NodeVisitor visitor) {
+        if (visitor.enter(this) != null) {
+            if (expression != null) {
+                expression = expression.accept(visitor);
+            }
+
+            return visitor.leave(this);
+        }
+
+        return this;
+    }
+
+
+    @Override
+    public void toString(final StringBuilder sb) {
+        sb.append(isYield() ? "yield" : "return ");
+
+        if (expression != null) {
+            expression.toString(sb);
+        }
+    }
+
+    @Override
+    public boolean equals(final Object other) {
+        if (other instanceof ReturnNode) {
+            final ReturnNode otherReturn = (ReturnNode)other;
+            if (hasExpression() != otherReturn.hasExpression()) {
+                return false;
+            } else if (hasExpression()) {
+                return otherReturn.getExpression().equals(getExpression());
+            }
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public int hashCode() {
+        return 0x4711_17 ^ (expression == null ? 0 : expression.hashCode());
+    }
+
+    /**
+     * Get the expression this node returns
+     * @return return expression, or null if void return
+     */
+    public Node getExpression() {
+        return expression;
+    }
+
+    /**
+     * Reset the expression this node returns
+     * @param expression new expression, or null if void return
+     */
+    public void setExpression(final Node expression) {
+        this.expression = expression;
+    }
+
+    /**
+     * Get the surrounding try chain for this return node
+     * @return try chain
+     */
+    public TryNode getTryChain() {
+        return tryChain;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/RuntimeNode.java b/nashorn/src/jdk/nashorn/internal/ir/RuntimeNode.java
new file mode 100644
index 00000000000..6e7d2221069
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/RuntimeNode.java
@@ -0,0 +1,395 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.parser.TokenType;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * IR representation for a runtime call.
+ *
+ */
+public class RuntimeNode extends Node implements TypeOverride {
+
+    /**
+     * Request enum used for meta-information about the runtime request
+     */
+    public enum Request {
+        /** An addition with at least one object */
+        ADD(TokenType.ADD, Type.OBJECT, 2, true),
+        /** Request to enter debugger */
+        DEBUGGER,
+        /** New operator */
+        NEW,
+        /** Typeof operator */
+        TYPEOF,
+        /** void type */
+        VOID,
+        /** Reference error type */
+        REFERENCE_ERROR,
+        /** Delete operator */
+        DELETE(TokenType.DELETE, Type.BOOLEAN, 1),
+        /** Delete operator that always fails -- see Lower */
+        FAIL_DELETE(TokenType.DELETE, Type.BOOLEAN, 1, false),
+        /** === operator with at least one object */
+        EQ_STRICT(TokenType.EQ_STRICT, Type.BOOLEAN, 2, true),
+        /** == operator with at least one object */
+        EQ(TokenType.EQ, Type.BOOLEAN, 2, true),
+        /** >= operator with at least one object */
+        GE(TokenType.GE, Type.BOOLEAN, 2, true),
+        /** > operator with at least one object */
+        GT(TokenType.GT, Type.BOOLEAN, 2, true),
+        /** in operator */
+        IN(TokenType.IN, Type.BOOLEAN, 2),
+        /** instanceof operator */
+        INSTANCEOF(TokenType.INSTANCEOF, Type.BOOLEAN, 2),
+        /** <= operator with at least one object */
+        LE(TokenType.LE, Type.BOOLEAN, 2, true),
+        /** < operator with at least one object */
+        LT(TokenType.LT, Type.BOOLEAN, 2, true),
+        /** !== operator with at least one object */
+        NE_STRICT(TokenType.NE_STRICT, Type.BOOLEAN, 2, true),
+        /** != operator with at least one object */
+        NE(TokenType.NE, Type.BOOLEAN, 2, true);
+
+        /** token type */
+        private final TokenType tokenType;
+
+        /** return type for request */
+        private final Type returnType;
+
+        /** arity of request */
+        private final int arity;
+
+        /** Can the specializer turn this into something that works with 1 or more primitives? */
+        private final boolean canSpecialize;
+
+        private Request() {
+            this(TokenType.VOID, Type.OBJECT, 0);
+        }
+
+        private Request(final TokenType tokenType, final Type returnType, final int arity) {
+            this(tokenType, returnType, arity, false);
+        }
+
+        private Request(final TokenType tokenType, final Type returnType, final int arity, final boolean canSpecialize) {
+            this.tokenType     = tokenType;
+            this.returnType    = returnType;
+            this.arity         = arity;
+            this.canSpecialize = canSpecialize;
+        }
+
+        /**
+         * Can this request type be specialized?
+         *
+         * @return true if request can be specialized
+         */
+        public boolean canSpecialize() {
+            return canSpecialize;
+        }
+
+        /**
+         * Get arity
+         *
+         * @return the arity of the request
+         */
+        public int getArity() {
+            return arity;
+        }
+
+        /**
+         * Get the return type
+         *
+         * @return return type for request
+         */
+        public Type getReturnType() {
+            return returnType;
+        }
+
+        /**
+         * Get token type
+         *
+         * @return token type for request
+         */
+        public TokenType getTokenType() {
+            return tokenType;
+        }
+
+        /**
+         * Is this an EQ or EQ_STRICT?
+         *
+         * @param request a request
+         *
+         * @return true if EQ or EQ_STRICT
+         */
+        public static boolean isEQ(final Request request) {
+            return request == EQ || request == EQ_STRICT;
+        }
+
+        /**
+         * Is this an NE or NE_STRICT?
+         *
+         * @param request a request
+         *
+         * @return true if NE or NE_STRICT
+         */
+        public static boolean isNE(final Request request) {
+            return request == NE || request == NE_STRICT;
+        }
+
+        /**
+         * If this request can be reversed, return the reverse request
+         * Eq EQ -> NE.
+         *
+         * @param request request to reverse
+         *
+         * @return reversed request or null if not applicable
+         */
+        public static Request reverse(final Request request) {
+            switch (request) {
+            case EQ:
+            case EQ_STRICT:
+            case NE:
+            case NE_STRICT:
+                return request;
+            case LE:
+                return GE;
+            case LT:
+                return GT;
+            case GE:
+                return LE;
+            case GT:
+                return LT;
+            default:
+                return null;
+            }
+        }
+
+        /**
+         * Invert the request, only for non equals comparisons.
+         *
+         * @param request a request
+         *
+         * @return the inverted rquest, or null if not applicable
+         */
+        public static Request invert(final Request request) {
+            switch (request) {
+            case EQ:
+                return NE;
+            case EQ_STRICT:
+                return NE_STRICT;
+            case NE:
+                return EQ;
+            case NE_STRICT:
+                return EQ_STRICT;
+            case LE:
+                return GT;
+            case LT:
+                return GE;
+            case GE:
+                return LT;
+            case GT:
+                return LE;
+            default:
+                return null;
+            }
+        }
+
+        /**
+         * Check if this is a comparison
+         *
+         * @param request a request
+         *
+         * @return true if this is a comparison, null otherwise
+         */
+        public static boolean isComparison(final Request request) {
+            switch (request) {
+            case EQ:
+            case EQ_STRICT:
+            case NE:
+            case NE_STRICT:
+            case LE:
+            case LT:
+            case GE:
+            case GT:
+                return true;
+            default:
+                return false;
+            }
+        }
+    }
+
+    /** Runtime request. */
+    private final Request request;
+
+    /** Call arguments. */
+    private final List<Node> args;
+
+    /** Call site override - e.g. we know that a ScriptRuntime.ADD will return an int */
+    private Type callSiteType;
+
+    /**
+     * Constructor
+     *
+     * @param source  the source
+     * @param token   token
+     * @param finish  finish
+     * @param request the request
+     * @param args    arguments to request
+     */
+    public RuntimeNode(final Source source, final long token, final int finish, final Request request, final List<Node> args) {
+        super(source, token, finish);
+
+        this.request      = request;
+        this.args         = args;
+    }
+
+    /**
+     * Constructor
+     *
+     * @param source  the source
+     * @param token   token
+     * @param finish  finish
+     * @param request the request
+     * @param args    arguments to request
+     */
+    public RuntimeNode(final Source source, final long token, final int finish, final Request request, final Node... args) {
+        this(source, token, finish, request, Arrays.asList(args));
+    }
+
+    private RuntimeNode(final RuntimeNode runtimeNode, final CopyState cs) {
+        super(runtimeNode);
+
+        final List<Node> newArgs = new ArrayList<>();
+
+        for (final Node arg : runtimeNode.args) {
+            newArgs.add(cs.existingOrCopy(arg));
+        }
+
+        this.request      = runtimeNode.request;
+        this.args         = newArgs;
+        this.callSiteType = runtimeNode.callSiteType;
+    }
+
+    @Override
+    protected Node copy(final CopyState cs) {
+        return new RuntimeNode(this, cs);
+    }
+
+    /**
+     * Return type for the ReferenceNode
+     */
+    @Override
+    public Type getType() {
+        return hasCallSiteType() ? callSiteType : request.getReturnType();
+    }
+
+    @Override
+    public void setType(final Type type) {
+        this.callSiteType = type;
+    }
+
+    @Override
+    public boolean canHaveCallSiteType() {
+        return request == Request.ADD;
+    }
+
+    private boolean hasCallSiteType() {
+        return callSiteType != null;
+    }
+
+    @Override
+    public Node accept(final NodeVisitor visitor) {
+        if (visitor.enter(this) != null) {
+            for (int i = 0, count = args.size(); i < count; i++) {
+                args.set(i, args.get(i).accept(visitor));
+            }
+
+            return visitor.leave(this);
+        }
+
+        return this;
+    }
+
+    @Override
+    public void toString(final StringBuilder sb) {
+        sb.append("ScriptRuntime.");
+        sb.append(request);
+        sb.append('(');
+
+        boolean first = true;
+
+        for (final Node arg : args) {
+            if (!first) {
+                sb.append(", ");
+            } else {
+                first = false;
+            }
+
+            arg.toString(sb);
+        }
+
+        sb.append(')');
+    }
+
+    /**
+     * Get the arguments for this runtime node
+     * @return argument list
+     */
+    public List<Node> getArgs() {
+        return Collections.unmodifiableList(args);
+    }
+
+    /**
+     * Get the request that this runtime node implements
+     * @return the request
+     */
+    public Request getRequest() {
+        return request;
+    }
+
+    /**
+     * Is this runtime node, engineered to handle the "at least one object" case of the defined
+     * requests and specialize on demand, really primitive. This can happen e.g. after AccessSpecializer
+     * In that case it can be turned into a simpler primitive form in CodeGenerator
+     *
+     * @return true if all arguments now are primitive
+     */
+    public boolean isPrimitive() {
+        for (final Node arg : args) {
+            if (arg.getType().isObject()) {
+                return false;
+            }
+        }
+        return true;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/SplitNode.java b/nashorn/src/jdk/nashorn/internal/ir/SplitNode.java
new file mode 100644
index 00000000000..f4ced601662
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/SplitNode.java
@@ -0,0 +1,221 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import jdk.nashorn.internal.codegen.CompileUnit;
+import jdk.nashorn.internal.codegen.MethodEmitter;
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+
+
+/**
+ * Node indicating code is split across classes.
+ */
+public class SplitNode extends Node {
+    /** Split node method name. */
+    private final String name;
+
+    /** Compilation unit. */
+    private CompileUnit compileUnit;
+
+    /** Method emitter for current method. */
+    private MethodEmitter method;
+
+    /** Method emitter for caller method. */
+    private MethodEmitter caller;
+
+    /** Containing function. */
+    private final FunctionNode functionNode;
+
+    /** A list of target labels in parent methods this split node may encounter. */
+    private final List<MethodEmitter.Label> externalTargets;
+
+    /** True if this split node or any of its children contain a return statement. */
+    private boolean hasReturn;
+
+    /** Body of split code. */
+    private Node body;
+
+    /**
+     * Constructor
+     *
+     * @param name          name of split node
+     * @param functionNode  function node to split in
+     * @param body          body of split code
+     */
+    public SplitNode(final String name, final FunctionNode functionNode, final Node body) {
+        super(body.getSource(), body.getToken(), body.getFinish());
+
+        this.name         = name;
+        this.functionNode = functionNode;
+        this.body         = body;
+        this.externalTargets = new ArrayList<>();
+    }
+
+    private SplitNode(final SplitNode splitNode, final CopyState cs) {
+        super(splitNode);
+
+        name         = splitNode.name;
+        functionNode = (FunctionNode)cs.existingOrSame(splitNode.functionNode);
+        body         = cs.existingOrCopy(splitNode.body);
+        externalTargets = new ArrayList<>();
+    }
+
+    @Override
+    protected Node copy(final CopyState cs) {
+        return new SplitNode(this, cs);
+    }
+
+    @Override
+    public Node accept(final NodeVisitor visitor) {
+        final CompileUnit   saveCompileUnit = visitor.getCurrentCompileUnit();
+        final MethodEmitter saveMethod      = visitor.getCurrentMethodEmitter();
+
+        setCaller(saveMethod);
+
+        visitor.setCurrentCompileUnit(getCompileUnit());
+        visitor.setCurrentMethodEmitter(getMethodEmitter());
+
+        try {
+            if (visitor.enter(this) != null) {
+                body = body.accept(visitor);
+
+                return visitor.leave(this);
+            }
+        } finally {
+            visitor.setCurrentCompileUnit(saveCompileUnit);
+            visitor.setCurrentMethodEmitter(saveMethod);
+        }
+
+        return this;
+    }
+
+    @Override
+    public void toString(final StringBuilder sb) {
+        sb.append("<split>(");
+        sb.append(compileUnit.getClass().getSimpleName());
+        sb.append(") ");
+        body.toString(sb);
+    }
+
+    /**
+     * Get the method emitter of the caller for this split node
+     * @return caller method emitter
+     */
+    public MethodEmitter getCaller() {
+        return caller;
+    }
+
+    /**
+     * Set the caller method emitter for this split node
+     * @param caller method emitter
+     */
+    public void setCaller(final MethodEmitter caller) {
+        this.caller = caller;
+    }
+
+    /**
+     * Get the name for this split node
+     * @return name
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Get the compile unit for this split node
+     * @return compile unit
+     */
+    public CompileUnit getCompileUnit() {
+        return compileUnit;
+    }
+
+    /**
+     * Set the compile unit for this split node
+     * @param compileUnit compile unit
+     */
+    public void setCompileUnit(final CompileUnit compileUnit) {
+        this.compileUnit = compileUnit;
+    }
+
+    /**
+     * Get the method emitter for this split node
+     * @return method emitter
+     */
+    public MethodEmitter getMethodEmitter() {
+        return method;
+    }
+
+    /**
+     * Set the method emitter for this split node
+     * @param method method emitter
+     */
+    public void setMethodEmitter(final MethodEmitter method) {
+        this.method = method;
+    }
+
+    /**
+     * Get the function node this SplitNode splits
+     * @return function node reference
+     */
+    public FunctionNode getFunctionNode() {
+        return functionNode;
+    }
+
+    /**
+     * Get the external targets for this SplitNode
+     * @return list of external targets
+     */
+    public List<MethodEmitter.Label> getExternalTargets() {
+        return Collections.unmodifiableList(externalTargets);
+    }
+
+    /**
+     * Add an external target for this SplitNode
+     * @param targetLabel target label
+     */
+    public void addExternalTarget(final MethodEmitter.Label targetLabel) {
+        externalTargets.add(targetLabel);
+    }
+
+    /**
+     * Check whether this SplitNode returns a value
+     * @return true if return
+     */
+    public boolean hasReturn() {
+        return hasReturn;
+    }
+
+    /**
+     * Set whether this SplitNode returns a value or not
+     * @param hasReturn true if return exists, false otherwise
+     */
+    public void setHasReturn(final boolean hasReturn) {
+        this.hasReturn = hasReturn;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/SwitchNode.java b/nashorn/src/jdk/nashorn/internal/ir/SwitchNode.java
new file mode 100644
index 00000000000..d7542fb847f
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/SwitchNode.java
@@ -0,0 +1,182 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import jdk.nashorn.internal.codegen.MethodEmitter.Label;
+import jdk.nashorn.internal.ir.annotations.Ignore;
+import jdk.nashorn.internal.ir.annotations.Reference;
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * IR representation of a SWITCH statement.
+ */
+public class SwitchNode extends BreakableNode {
+    /** Switch expression. */
+    private Node expression;
+
+    /** Tag symbol. */
+    private Symbol tag;
+
+    /** Switch cases. */
+    private List<CaseNode> cases;
+
+    /** Switch default. */
+    @Reference @Ignore //points to one of the members in the list above, don't traverse twice
+    private CaseNode defaultCase;
+
+    /**
+     * Constructor
+     *
+     * @param source  the source
+     * @param token   token
+     * @param finish  finish
+     */
+    public SwitchNode(final Source source, final long token, final int finish) {
+        super(source, token, finish);
+
+        expression  = null;
+        tag         = null;
+        cases       = null;
+        defaultCase = null;
+        breakLabel  = new Label("switch_break");
+    }
+
+    private SwitchNode(final SwitchNode switchNode, final CopyState cs) {
+        super(switchNode);
+
+        final List<CaseNode> newCases = new ArrayList<>();
+
+        for (final CaseNode caseNode : switchNode.getCases()) {
+           newCases.add((CaseNode)cs.existingOrCopy(caseNode));
+        }
+
+        expression  = cs.existingOrCopy(switchNode.getExpression());
+        tag         = switchNode.getTag();
+        cases       = newCases;
+        defaultCase = (CaseNode)cs.existingOrCopy(switchNode.getDefaultCase());
+        breakLabel  = new Label(switchNode.getBreakLabel());
+    }
+
+    @Override
+    protected Node copy(final CopyState cs) {
+        return new SwitchNode(this, cs);
+    }
+
+    @Override
+    public Node accept(final NodeVisitor visitor) {
+        if (visitor.enter(this) != null) {
+            expression = expression.accept(visitor);
+
+            for (int i = 0, count = cases.size(); i < count; i++) {
+                cases.set(i, (CaseNode)cases.get(i).accept(visitor));
+            }
+
+            //the default case is in the cases list and should not be explicitly traversed!
+
+            return visitor.leave(this);
+        }
+
+        return this;
+    }
+
+    @Override
+    public void toString(final StringBuilder sb) {
+        sb.append("switch (");
+        expression.toString(sb);
+        sb.append(')');
+    }
+
+    /**
+     * Get the cases in this switch
+     * @return a list of case nodes
+     */
+    public List<CaseNode> getCases() {
+        return Collections.unmodifiableList(cases);
+    }
+
+    /**
+     * Set or reset the list of cases in this switch
+     * @param cases a list of cases, case nodes
+     */
+    public void setCases(final List<CaseNode> cases) {
+        this.cases = cases;
+    }
+
+    /**
+     * Get the default case for this switch
+     * @return default case node
+     */
+    public CaseNode getDefaultCase() {
+        return defaultCase;
+    }
+
+    /**
+     * Set the default case for this switch
+     * @param defaultCase default case node
+     */
+    public void setDefaultCase(final CaseNode defaultCase) {
+        this.defaultCase = defaultCase;
+    }
+
+    /**
+     * Return the expression to switch on
+     * @return switch expression
+     */
+    public Node getExpression() {
+        return expression;
+    }
+
+    /**
+     * Set or reset the expression to switch on
+     * @param expression switch expression
+     */
+    public void setExpression(final Node expression) {
+        this.expression = expression;
+    }
+
+    /**
+     * Get the tag symbol for this switch. The tag symbol is where
+     * the switch expression result is stored
+     * @return tag symbol
+     */
+    public Symbol getTag() {
+        return tag;
+    }
+
+    /**
+     * Set the tag symbol for this switch. The tag symbol is where
+     * the switch expression result is stored
+     * @param tag a symbol
+     */
+    public void setTag(final Symbol tag) {
+        this.tag = tag;
+    }
+}
+
diff --git a/nashorn/src/jdk/nashorn/internal/ir/Symbol.java b/nashorn/src/jdk/nashorn/internal/ir/Symbol.java
new file mode 100644
index 00000000000..9d1481eb109
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/Symbol.java
@@ -0,0 +1,610 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir;
+
+import java.io.PrintWriter;
+import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.runtime.options.Options;
+
+/**
+ * Maps a name to specific data.
+ */
+
+public final class Symbol implements Comparable<Symbol> {
+    /** Symbol flags. Kind ordered by precedence. */
+    public static final int IS_TEMP     = 0b0000_0001;
+    /** Is this Global */
+    public static final int IS_GLOBAL   = 0b0000_0010;
+    /** Is this a variable */
+    public static final int IS_VAR      = 0b0000_0011;
+    /** Is this a parameter */
+    public static final int IS_PARAM    = 0b0000_0100;
+    /** Is this a constant */
+    public static final int IS_CONSTANT = 0b0000_0101;
+
+    static final int KINDMASK    = 0b0000_1111;
+
+    /** Is this scope */
+    public static final int IS_SCOPE         = 0b0000_0001_0000;
+    /** Is this a this symbol */
+    public static final int IS_THIS          = 0b0000_0010_0000;
+    /** Can this symbol ever be undefined */
+    public static final int CAN_BE_UNDEFINED = 0b0000_0100_0000;
+    /** Can this symbol ever have primitive types */
+    public static final int CAN_BE_PRIMITIVE = 0b0000_1000_0000;
+    /** Is this a let */
+    public static final int IS_LET           = 0b0001_0000_0000;
+    /** Is this an internal symbol, never represented explicitly in source code */
+    public static final int IS_INTERNAL      = 0b0010_0000_0000;
+
+    /** Null or name identifying symbol. */
+    private final String name;
+
+    /** Symbol flags. */
+    private int flags;
+
+    /** Defining node. */
+    private Node node;
+
+    /** Definition block. */
+    private final Block block;
+
+    /** Type of symbol. */
+    private Type type;
+
+    /** Local variable slot. -1 indicates external property. */
+    private int slot;
+
+    /** Field number in scope or property. */
+    private int fieldIndex;
+
+    /** Number of times this symbol is used in code */
+    private int useCount;
+
+    /** Debugging option - dump info and stack trace when a symbol with a given name is manipulated */
+    private static final String TRACE_SYMBOL = Options.getStringProperty("nashorn.compiler.symbol.trace", null);
+
+    /**
+     * Constructor
+     *
+     * @param name  name of symbol
+     * @param flags symbol flags
+     * @param node  node this symbol is in
+     * @param block block this symbol is in
+     * @param type  type of this symbol
+     * @param slot  bytecode slot for this symbol
+     */
+    protected Symbol(final String name, final int flags, final Node node, final Block block, final Type type, final int slot) {
+        this.name       = name;
+        this.flags      = flags;
+        this.node       = node;
+        this.block      = block;
+        this.type       = type;
+        this.slot       = slot;
+        this.fieldIndex = -1;
+    }
+
+    /**
+     * Constructor
+     *
+     * @param name  name of symbol
+     * @param flags symbol flags
+     * @param node  node this symbol is in
+     * @param block block this symbol is in
+     */
+    public Symbol(final String name, final int flags, final Node node, final Block block) {
+        this(name, flags, node, block, Type.UNKNOWN, -1);
+    }
+
+    /**
+     * Constructor
+     *
+     * @param name  name of symbol
+     * @param flags symbol flags
+     * @param type  type of this symbol
+     */
+    public Symbol(final String name, final int flags, final Type type) {
+        this(name, flags, null, null, type, -1);
+    }
+
+    private static String align(final String string, final int max) {
+        final StringBuilder sb = new StringBuilder();
+        sb.append(string.substring(0, Math.min(string.length(), max)));
+
+        while (sb.length () < max) {
+            sb.append(' ');
+        }
+        return sb.toString();
+    }
+
+    /**
+     * Return the type for this symbol. Normally, if there is no type override,
+     * this is where any type for any node is stored. If the node has a TypeOverride,
+     * it may override this, e.g. when asking for a scoped field as a double
+     *
+     * @return symbol type
+     */
+    public final Type getSymbolType() {
+        return type;
+    }
+
+    /**
+     * Debugging .
+     *
+     * @param stream Stream to print to.
+     */
+
+    void print(final PrintWriter stream) {
+        final String printName = align(name, 20);
+        final String printType = align(type.toString(), 10);
+        final String printSlot = align(slot == -1 ? "none" : "" + slot, 10);
+        String printFlags = "";
+
+        switch (flags & KINDMASK) {
+        case IS_TEMP:
+            printFlags = "temp " + printFlags;
+            break;
+        case IS_GLOBAL:
+            printFlags = "global " + printFlags;
+            break;
+        case IS_VAR:
+            printFlags = "var " + printFlags;
+            break;
+        case IS_PARAM:
+            printFlags = "param " + printFlags;
+            break;
+        case IS_CONSTANT:
+            printFlags = "CONSTANT " + printFlags;
+            break;
+        default:
+            break;
+        }
+
+        if (isScope()) {
+            printFlags += "scope ";
+        }
+
+        if (isInternal()) {
+            printFlags += "internal ";
+        }
+
+        if (isLet()) {
+            printFlags += "let ";
+        }
+
+        if (isThis()) {
+            printFlags += "this ";
+        }
+
+        if (!canBeUndefined()) {
+            printFlags += "always_def ";
+        }
+
+        if (canBePrimitive()) {
+            printFlags += "can_be_prim ";
+        }
+
+        stream.print(printName + ": " + printType + ", " + printSlot + ", " + printFlags);
+        stream.println();
+    }
+
+    /**
+     * Compare the the symbol kind with another.
+     *
+     * @param other Other symbol's flags.
+     * @return True if symbol has less kind.
+     */
+    public boolean less(final int other) {
+        return (flags & KINDMASK) < (other & KINDMASK);
+    }
+
+    /**
+     * Allocate a slot for this symbol.
+     *
+     * @param needsSlot True if symbol needs a slot.
+     */
+    public void setNeedsSlot(final boolean needsSlot) {
+        setSlot(needsSlot ? 0 : -1);
+    }
+
+    /**
+     * Return the number of slots required for the symbol.
+     *
+     * @return Number of slots.
+     */
+    public int slotCount() {
+        return type.isCategory2() ? 2 : 1;
+    }
+
+    /**
+     * Return the defining function (scope.)
+     *
+     * @return Defining function.
+     */
+    public FunctionNode findFunction() {
+        return block != null ? block.getFunction() : null;
+    }
+
+    @Override
+    public boolean equals(final Object other) {
+        if (!(other instanceof Symbol)) {
+            return false;
+        }
+        final Symbol symbol = (Symbol) other;
+        return name.equals(symbol.name) && block.equals(symbol.block);
+    }
+
+    @Override
+    public int hashCode() {
+        return name.hashCode() ^ block.hashCode();
+    }
+
+    @Override
+    public String toString() {
+        final StringBuilder sb   = new StringBuilder();
+        final String        desc = getSymbolType().getDescriptor();
+
+        sb.append(name).
+            append(' ').
+            append("(type=").
+            append(desc.charAt(desc.length() - 1) == ';' ? 'O' : desc).
+            append(')');
+
+        if (hasSlot()) {
+            sb.append(' ').
+                append('(').
+                append("slot=").
+                append(slot).
+                append(')');
+        }
+
+        if (isScope()) {
+            sb.append(" S");
+        }
+
+        if (canBePrimitive()) {
+            sb.append(" P?");
+        }
+
+        return sb.toString();
+    }
+
+    @Override
+    public int compareTo(final Symbol other) {
+        return name.compareTo(other.name);
+    }
+
+    /**
+     * Does this symbol have an allocated bytecode slot. If not, it is scope
+     * and must be loaded from memory upon access
+     *
+     * @return true if this symbol has a local bytecode slot
+     */
+    public boolean hasSlot() {
+        return slot >= 0;
+    }
+
+    /**
+     * Check if this is a temporary symbol
+     * @return true if temporary
+     */
+    public boolean isTemp() {
+        return (flags & KINDMASK) == IS_TEMP;
+    }
+
+    /**
+     * Check if this is a symbol in scope. Scope symbols cannot, for obvious reasons
+     * be stored in byte code slots on the local frame
+     *
+     * @return true if this is scoped
+     */
+    public boolean isScope() {
+        assert ((flags & KINDMASK) != IS_GLOBAL) || ((flags & IS_SCOPE) == IS_SCOPE) : "global without scope flag";
+        return (flags & IS_SCOPE) == IS_SCOPE;
+    }
+
+    /**
+     * Flag this symbol as scope as described in {@link Symbol#isScope()}
+     */
+    public void setIsScope() {
+        flags |= IS_SCOPE;
+        getBlock().setNeedsScope(true);
+    }
+
+    /**
+     * Check if this symbol is a variable
+     * @return true if variable
+     */
+    public boolean isVar() {
+        return (flags & KINDMASK) == IS_VAR;
+    }
+
+    /**
+     * Check if this symbol is a global (undeclared) variable
+     * @return true if global
+     */
+    public boolean isGlobal() {
+        return (flags & KINDMASK) == IS_GLOBAL;
+    }
+
+    /**
+     * Check if this symbol is a function parameter
+     * @return true if parameter
+     */
+    public boolean isParam() {
+        return (flags & KINDMASK) == IS_PARAM;
+    }
+
+    /**
+     * Check whether this symbol ever has primitive assignments. Conservative
+     * @return true if primitive assignments exist
+     */
+    public boolean canBePrimitive() {
+        return (flags & CAN_BE_PRIMITIVE) == CAN_BE_PRIMITIVE;
+    }
+
+    /**
+     * Check if this symbol can ever be undefined
+     * @return true if can be undefined
+     */
+    public boolean canBeUndefined() {
+        return (flags & CAN_BE_UNDEFINED) == CAN_BE_UNDEFINED;
+    }
+
+    /**
+     * Flag this symbol as potentially undefined in parts of the program
+     */
+    public void setCanBeUndefined() {
+        assert type.isObject() : type;
+        flags |= CAN_BE_UNDEFINED;
+    }
+
+    /**
+     * Flag this symbol as potentially primitive
+     * @param type the primitive type it occurs with, currently unused but can be used for width guesses
+     */
+    public void setCanBePrimitive(final Type type) {
+        flags |= CAN_BE_PRIMITIVE;
+    }
+
+    /**
+     * Check if this symbol is a constant
+     * @return true if a constant
+     */
+    public boolean isConstant() {
+        return (flags & KINDMASK) == IS_CONSTANT;
+    }
+
+    /**
+     * Check if this is an internal symbol, without an explicit JavaScript source
+     * code equivalent
+     * @return true if internal
+     */
+    public boolean isInternal() {
+        return (flags & IS_INTERNAL) != 0;
+    }
+
+    /**
+     * Check if this symbol represents {@code this}
+     * @return true if this
+     */
+    public boolean isThis() {
+        return (flags & IS_THIS) != 0;
+    }
+
+    /**
+     * Check if this symbol is a let
+     * @return true if let
+     */
+    public boolean isLet() {
+        return (flags & IS_LET) == IS_LET;
+    }
+
+    /**
+     * Flag this symbol as a let
+     */
+    public void setIsLet() {
+        flags |= IS_LET;
+    }
+
+    /**
+     * Check if this symbol can be accessed directly with a putfield or getfield or dynamic load
+     *
+     * @param currentFunction function to check for fast scope
+     * @return true if fast scope
+     */
+    public boolean isFastScope(final FunctionNode currentFunction) {
+        if (!isScope() || !block.needsScope()) {
+            return false;
+        }
+        // Allow fast scope access if no parent function contains with or eval
+        FunctionNode func = currentFunction;
+        while (func != null) {
+            if (func.hasWith() || func.hasEval()) {
+                return false;
+            }
+            func = func.findParentFunction();
+        }
+        return true;
+    }
+
+    /**
+     * Get the block in which the symbol is defined
+     * @return a block
+     */
+    public Block getBlock() {
+        return block;
+    }
+
+    /**
+     * Get the index of the field used to store this symbol, should it be an AccessorProperty
+     * and get allocated in a JO$-prefixed ScriptObject subclass.
+     *
+     * @return field index
+     */
+    public int getFieldIndex() {
+        assert fieldIndex != -1 : "fieldIndex must be initialized";
+        return fieldIndex;
+    }
+
+    /**
+     * Set the index of the field used to store this symbol, should it be an AccessorProperty
+     * and get allocated in a JO$-prefixed ScriptObject subclass.
+     *
+     * @param fieldIndex field index - a positive integer
+     */
+    public void setFieldIndex(final int fieldIndex) {
+        assert this.fieldIndex == -1 : "fieldIndex must be initialized only once";
+        this.fieldIndex = fieldIndex;
+    }
+
+    /**
+     * Get the symbol flags
+     * @return flags
+     */
+    public int getFlags() {
+        return flags;
+    }
+
+    /**
+     * Set the symbol flags
+     * @param flags flags
+     */
+    public void setFlags(final int flags) {
+        this.flags = flags;
+    }
+
+    /**
+     * Get the node this symbol stores the result for
+     * @return node
+     */
+    public Node getNode() {
+        return node;
+    }
+
+    /**
+     * Set the node this symbol stores the result for
+     * @param node node
+     */
+    public void setNode(final Node node) {
+        this.node = node;
+    }
+
+    /**
+     * Get the name of this symbol
+     * @return symbol name
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Get the byte code slot for this symbol
+     * @return byte code slot, or -1 if no slot allocated/possible
+     */
+    public int getSlot() {
+        return slot;
+    }
+
+    /**
+     * Increase the symbol's use count by one.
+     */
+    public void increaseUseCount() {
+        useCount++;
+    }
+
+    /**
+     * Get the symbol's use count
+     * @return the number of times the symbol is used in code.
+     */
+    public int getUseCount() {
+        return useCount;
+    }
+
+    /**
+     * Set the bytecode slot for this symbol
+     * @param slot valid bytecode slot, or -1 if not available
+     */
+    public void setSlot(final int slot) {
+        if (TRACE_SYMBOL != null) {
+            if (TRACE_SYMBOL.equals(name)) {
+                System.err.println(name + " gets slot " + slot);
+                new Throwable().printStackTrace();
+            }
+        }
+        this.slot = slot;
+    }
+
+    /**
+     * Assign a specific subclass of Object to the symbol
+     *
+     * @param type  the type
+     */
+    public void setType(final Class<?> type) {
+        assert !type.isPrimitive() && !Number.class.isAssignableFrom(type) : "Class<?> types can only be subclasses of object";
+        setType(Type.typeFor(type));
+    }
+
+    /**
+     * Assign a type to the symbol
+     *
+     * @param type the type
+     */
+    public void setType(final Type type) {
+        if (TRACE_SYMBOL == null) {
+            setTypeOverride(Type.widest(this.type, type));
+        } else {
+            final boolean check = TRACE_SYMBOL.equals(getName());
+            final Type from = this.type;
+            setTypeOverride(Type.widest(this.type, type));
+
+            if (check) {
+                System.err.println(getName() + " " + from + "=>" + type + " == " + this.type);
+                new Throwable().printStackTrace();
+            }
+        }
+    }
+
+    /**
+     * Only use this if you know about an existing type
+     * constraint - otherwise a type can only be
+     * widened
+     *
+     * @param type  the type
+     */
+    public void setTypeOverride(final Type type) {
+        this.type = type;
+    }
+
+    /**
+     * Check if this symbol is in the global scope, i.e. it is on the outermost level
+     * in the script
+     * @return true if this this is a global scope symbol
+     */
+    public boolean isTopLevel() {
+        return block instanceof FunctionNode && ((FunctionNode) block).isScript();
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/TernaryNode.java b/nashorn/src/jdk/nashorn/internal/ir/TernaryNode.java
new file mode 100644
index 00000000000..1df74b6ea9d
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/TernaryNode.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir;
+
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * TernaryNode nodes represent three operand operations (?:).
+ */
+public class TernaryNode extends BinaryNode {
+    /** Third argument. */
+    private Node third;
+
+    /**
+     * Constructor
+     *
+     * @param source the source
+     * @param token  token
+     * @param lhs    left hand side node
+     * @param rhs    right hand side node
+     * @param third  third node
+     */
+    public TernaryNode(final Source source, final long token, final Node lhs, final Node rhs, final Node third) {
+        super(source, token, lhs, rhs);
+
+        this.finish = third.getFinish();
+        this.third = third;
+    }
+
+    private TernaryNode(final TernaryNode ternaryNode, final CopyState cs) {
+        super(ternaryNode, cs);
+
+        third = cs.existingOrCopy(ternaryNode.third);
+    }
+
+    @Override
+    protected Node copy(final CopyState cs) {
+        return new TernaryNode(this, cs);
+    }
+
+    @Override
+    public boolean equals(final Object other) {
+        if (!super.equals(other)) {
+            return false;
+        }
+        return third.equals(((TernaryNode)other).third());
+    }
+
+    @Override
+    public int hashCode() {
+        return super.hashCode() ^ third().hashCode();
+    }
+
+    @Override
+    public Node accept(final NodeVisitor visitor) {
+        if (visitor.enter(this) != null) {
+            lhs = lhs.accept(visitor);
+            rhs = rhs.accept(visitor);
+            third = third.accept(visitor);
+            return visitor.leave(this);
+        }
+
+        return this;
+    }
+
+    @Override
+    public void toString(final StringBuilder sb) {
+        final boolean lhsParen   = tokenType().needsParens(lhs().tokenType(), true);
+        final boolean rhsParen   = tokenType().needsParens(rhs().tokenType(), false);
+        final boolean thirdParen = tokenType().needsParens(third().tokenType(), false);
+
+        if (lhsParen) {
+            sb.append('(');
+        }
+        lhs().toString(sb);
+        if (lhsParen) {
+            sb.append(')');
+        }
+
+        sb.append(" ? ");
+
+        if (rhsParen) {
+            sb.append('(');
+        }
+        rhs().toString(sb);
+        if (rhsParen) {
+            sb.append(')');
+        }
+
+        sb.append(" : ");
+
+        if (thirdParen) {
+            sb.append('(');
+        }
+        third().toString(sb);
+        if (thirdParen) {
+            sb.append(')');
+        }
+    }
+
+    /**
+     * Get the "third" node for this ternary expression, i.e. "z" in x ? y : z
+     * @return a node
+     */
+    public Node third() {
+        return third;
+    }
+
+    /**
+     * Reset the "third" node for this ternary expression, i.e. "z" in x ? y : z
+     * @param third a node
+     */
+    public void setThird(final Node third) {
+        this.third = third;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/ThrowNode.java b/nashorn/src/jdk/nashorn/internal/ir/ThrowNode.java
new file mode 100644
index 00000000000..f87886acbfd
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/ThrowNode.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir;
+
+import jdk.nashorn.internal.ir.annotations.Ignore;
+import jdk.nashorn.internal.ir.annotations.Reference;
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * IR representation for THROW statements.
+ */
+public class ThrowNode extends Node {
+    /** Exception expression. */
+    private Node expression;
+
+    /** Try chain. */
+    @Reference @Ignore
+    private final TryNode tryChain;
+
+    /**
+     * Constructor
+     *
+     * @param source     the source
+     * @param token      token
+     * @param finish     finish
+     * @param expression expression to throw
+     * @param tryChain   surrounding try chain
+     */
+    public ThrowNode(final Source source, final long token, final int finish, final Node expression, final TryNode tryChain) {
+        super(source, token, finish);
+
+        this.expression = expression;
+        this.tryChain = tryChain;
+        setIsTerminal(true);
+    }
+
+    private ThrowNode(final ThrowNode throwNode, final CopyState cs) {
+        super(throwNode);
+
+        expression = cs.existingOrCopy(throwNode.expression);
+        tryChain = (TryNode)cs.existingOrSame(throwNode.tryChain);
+    }
+
+    @Override
+    protected Node copy(final CopyState cs) {
+        return new ThrowNode(this, cs);
+    }
+
+    /**
+     * Assist in IR navigation.
+     * @param visitor IR navigating visitor.
+     */
+    @Override
+    public Node accept(final NodeVisitor visitor) {
+        if (visitor.enter(this) != null) {
+            setExpression(expression.accept(visitor));
+            return visitor.leave(this);
+        }
+
+        return this;
+    }
+
+    @Override
+    public void toString(final StringBuilder sb) {
+        sb.append("throw ");
+
+        if (expression != null) {
+            expression.toString(sb);
+        }
+    }
+
+    /**
+     * Get the expression that is being thrown by this node
+     * @return expression
+     */
+    public Node getExpression() {
+        return expression;
+    }
+
+    /**
+     * Reset the expression being thrown by this node
+     * @param expression new expression
+     */
+    public void setExpression(final Node expression) {
+        this.expression = expression;
+    }
+
+    /**
+     * Get surrounding tryChain for this node
+     * @return try chain
+     */
+    public TryNode getTryChain() {
+        return tryChain;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/TryNode.java b/nashorn/src/jdk/nashorn/internal/ir/TryNode.java
new file mode 100644
index 00000000000..68201b63771
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/TryNode.java
@@ -0,0 +1,233 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import jdk.nashorn.internal.codegen.MethodEmitter.Label;
+import jdk.nashorn.internal.ir.annotations.Reference;
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * IR representation of a TRY statement.
+ */
+public class TryNode extends Node {
+    /** Try chain. */
+    @Reference
+    private TryNode next;
+
+    /** Try statements. */
+    private Block body;
+
+    /** List of catch clauses. */
+    private List<Block> catchBlocks;
+
+    /** Finally clause. */
+    private Block finallyBody;
+
+    /** Exit label. */
+    private Label exit;
+
+    /** Exception symbol. */
+    private Symbol exception;
+
+    /**
+     * Constructor
+     *
+     * @param source  the source
+     * @param token   token
+     * @param finish  finish
+     * @param next    next try node in chain
+     */
+    public TryNode(final Source source, final long token, final int finish, final TryNode next) {
+        super(source, token, finish);
+
+        this.next = next;
+        this.exit = new Label("exit");
+    }
+
+    private TryNode(final TryNode tryNode, final CopyState cs) {
+        super(tryNode);
+
+        final List<Block> newCatchBlocks = new ArrayList<>();
+
+        for (final Block block : tryNode.catchBlocks) {
+            newCatchBlocks.add((Block)cs.existingOrCopy(block));
+        }
+
+        this.next        = (TryNode)cs.existingOrSame(tryNode.getNext());
+        this.body        = (Block)cs.existingOrCopy(tryNode.getBody());
+        this.catchBlocks = newCatchBlocks;
+        this.finallyBody = (Block)cs.existingOrCopy(tryNode.getFinallyBody());
+        this.exit        = new Label(tryNode.getExit());
+    }
+
+    @Override
+    protected Node copy(final CopyState cs) {
+        return new TryNode(this, cs);
+    }
+
+    /**
+     * Assist in IR navigation.
+     * @param visitor IR navigating visitor.
+     */
+    @Override
+    public Node accept(final NodeVisitor visitor) {
+        if (visitor.enter(this) != null) {
+            // Need to do first for termination analysis.
+            if (finallyBody != null) {
+                finallyBody = (Block)finallyBody.accept(visitor);
+            }
+
+            body = (Block)body.accept(visitor);
+
+            final List<Block> newCatchBlocks = new ArrayList<>(catchBlocks.size());
+            for (final Block catchBlock : catchBlocks) {
+                newCatchBlocks.add((Block)catchBlock.accept(visitor));
+            }
+            this.catchBlocks = newCatchBlocks;
+
+            return visitor.leave(this);
+        }
+
+        return this;
+    }
+
+    @Override
+    public void toString(final StringBuilder sb) {
+        sb.append("try");
+    }
+
+    /**
+     * Get the body for this try block
+     * @return body
+     */
+    public Block getBody() {
+        return body;
+    }
+
+    /**
+     * Reset the body of this try block
+     * @param body new body
+     */
+    public void setBody(final Block body) {
+        this.body = body;
+    }
+
+    /**
+     * Get the catches for this try block
+     * @return a list of catch nodes
+     */
+    public List<CatchNode> getCatches() {
+        final List<CatchNode> catches = new ArrayList<>(catchBlocks.size());
+        for (final Block catchBlock : catchBlocks) {
+            catches.add((CatchNode)catchBlock.getStatements().get(0));
+        }
+        return catches;
+    }
+
+    /**
+     * Get the catch blocks for this try block
+     * @return a list of blocks
+     */
+    public List<Block> getCatchBlocks() {
+        return Collections.unmodifiableList(catchBlocks);
+    }
+
+    /**
+     * Set the catch blocks of this try
+     * @param catchBlocks list of catch blocks
+     */
+    public void setCatchBlocks(final List<Block> catchBlocks) {
+        this.catchBlocks = catchBlocks;
+    }
+
+    /**
+     * Get the exception symbol for this try block
+     * @return a symbol for the compiler to store the exception in
+     */
+    public Symbol getException() {
+        return exception;
+    }
+
+    /**
+     * Set the exception symbol for this try block
+     * @param exception a symbol for the compiler to store the exception in
+     */
+    public void setException(final Symbol exception) {
+        this.exception = exception;
+    }
+
+    /**
+     * Get the exit label for this try block
+     * @return exit label
+     */
+    public Label getExit() {
+        return exit;
+    }
+
+    /**
+     * Set the exit label for this try block
+     * @param exit label
+     */
+    public void setExit(final Label exit) {
+        this.exit = exit;
+    }
+
+    /**
+     * Get the body of the finally clause for this try
+     * @return finally body, or null if no finally
+     */
+    public Block getFinallyBody() {
+        return finallyBody;
+    }
+
+    /**
+     * Set the finally body of this try
+     * @param finallyBody new finally body
+     */
+    public void setFinallyBody(final Block finallyBody) {
+        this.finallyBody = finallyBody;
+    }
+
+    /**
+     * Get next try node in try chain
+     * @return next try node
+     */
+    public TryNode getNext() {
+        return next;
+    }
+
+    /**
+     * Set next try node in try chain
+     * @param next next try node
+     */
+    public void setNext(final TryNode next) {
+        this.next = next;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/TypeOverride.java b/nashorn/src/jdk/nashorn/internal/ir/TypeOverride.java
new file mode 100644
index 00000000000..e7449c9574e
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/TypeOverride.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir;
+
+import jdk.nashorn.internal.codegen.types.Type;
+
+/**
+ * A type override makes it possible to change the return type of a node, if we know
+ * that the linker can provide it directly. For example, an identity node that is
+ * in the scope, can very well look like an object to the compiler of the method it
+ * is in, but if someone does (int)x, it make senses to ask for it directly
+ * with an int getter instead of loading it as an object and explicitly converting it
+ * by using JSType.toInt32. Especially in scenarios where the field is already stored
+ * as a primitive, this will be much faster than the "object is all I see" scope
+ * available in the method
+ */
+
+public interface TypeOverride {
+    /**
+     * Set the override type
+     *
+     * @param type  the type
+     */
+    public void setType(final Type type);
+
+    /**
+     * Returns true if this node can have a callsite override, e.g. all scope ident nodes
+     * which lead to dynamic getters can have it, local variable nodes (slots) can't.
+     * Call nodes can have it unconditionally and so on
+     *
+     * @return true if it is possible to assign a type override to this node
+     */
+    public boolean canHaveCallSiteType();
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/UnaryNode.java b/nashorn/src/jdk/nashorn/internal/ir/UnaryNode.java
new file mode 100644
index 00000000000..3286fa3a936
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/UnaryNode.java
@@ -0,0 +1,233 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir;
+
+import static jdk.nashorn.internal.parser.TokenType.BIT_NOT;
+import static jdk.nashorn.internal.parser.TokenType.CONVERT;
+import static jdk.nashorn.internal.parser.TokenType.DECPOSTFIX;
+import static jdk.nashorn.internal.parser.TokenType.INCPOSTFIX;
+
+import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.parser.Token;
+import jdk.nashorn.internal.parser.TokenType;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * UnaryNode nodes represent single operand operations.
+ */
+public class UnaryNode extends Node implements Assignment<Node> {
+    /** Right hand side argument. */
+    protected Node rhs;
+
+    /**
+     * Constructor
+     *
+     * @param source the source
+     * @param token  token
+     * @param rhs    expression
+     */
+    public UnaryNode(final Source source, final long token, final Node rhs) {
+        super(source, token, Token.descPosition(token));
+
+        this.start  = Math.min(rhs.getStart(), Token.descPosition(token));
+        this.finish = Math.max(Token.descPosition(token) + Token.descLength(token), rhs.getFinish());
+        this.rhs    = rhs;
+    }
+
+    /**
+     * Copy constructor
+     *
+     * @param unaryNode source node
+     * @param cs        copy state
+     */
+    protected UnaryNode(final UnaryNode unaryNode, final CopyState cs) {
+        super(unaryNode);
+
+        rhs = cs.existingOrCopy(unaryNode.rhs);
+    }
+
+    /**
+     * Is this an assignment - i.e. that mutates something such as a++
+     *
+     * @return true if assignment
+     */
+    @Override
+    public boolean isAssignment() {
+        switch (tokenType()) {
+        case DECPOSTFIX:
+        case DECPREFIX:
+        case INCPOSTFIX:
+        case INCPREFIX:
+            return true;
+        default:
+            return false;
+        }
+    }
+
+    @Override
+    public boolean isSelfModifying() {
+        return isAssignment();
+    }
+
+    @Override
+    public Type getWidestOperationType() {
+        return isAssignment() ? Type.NUMBER : Type.OBJECT;
+    }
+
+    @Override
+    public Node getAssignmentDest() {
+        return isAssignment() ? rhs() : null;
+    }
+
+    @Override
+    public Node getAssignmentSource() {
+        return getAssignmentDest();
+    }
+
+    @Override
+    public void setAssignmentSource(final Node source) {
+        setAssignmentDest(source);
+    }
+
+    @Override
+    public void setAssignmentDest(final Node source) {
+        setRHS(source);
+    }
+
+    @Override
+    public boolean equals(final Object other) {
+        if (!super.equals(other)) {
+            return false;
+        }
+        return rhs.equals(((UnaryNode)other).rhs());
+    }
+
+    @Override
+    public int hashCode() {
+        return super.hashCode() ^ rhs().hashCode();
+    }
+
+    @Override
+    protected Node copy(final CopyState cs) {
+        return new UnaryNode(this, cs);
+    }
+
+    /**
+     * Assist in IR navigation.
+     * @param visitor IR navigating visitor.
+     */
+    @Override
+    public Node accept(final NodeVisitor visitor) {
+        if (visitor.enter(this) != null) {
+            rhs = rhs.accept(visitor);
+            return visitor.leave(this);
+        }
+
+        return this;
+    }
+
+    @Override
+    public void toString(final StringBuilder sb) {
+        final TokenType type      = tokenType();
+        final String    name      = type.getName();
+        final boolean   isPostfix = type == DECPOSTFIX || type == INCPOSTFIX;
+        final boolean   isConvert = type == CONVERT && getSymbol() != null;
+
+        boolean rhsParen   = type.needsParens(rhs().tokenType(), false);
+        int     convertPos = 0;
+
+        if (isConvert) {
+            convertPos = sb.length();
+            sb.append("((");
+            sb.append(getType());
+            sb.append(")");
+        }
+
+        if (!isPostfix && !isConvert) {
+            if (name == null) {
+                sb.append(type.name());
+                rhsParen = true;
+            } else {
+                sb.append(name);
+
+                if (type.ordinal() > BIT_NOT.ordinal()) {
+                    sb.append(' ');
+                }
+            }
+        }
+
+        if (rhsParen) {
+            sb.append('(');
+        }
+        rhs().toString(sb);
+        if (rhsParen) {
+            sb.append(')');
+        }
+
+        if (isPostfix) {
+            sb.append(type == DECPOSTFIX ? "--" : "++");
+        }
+
+        if (isConvert) {
+            // strip extra cast parenthesis which makes the printout harder to read
+            final boolean endsWithParenthesis = sb.charAt(sb.length() - 1) == ')';
+            if (!endsWithParenthesis) {
+                sb.append(')');
+            } else {
+                sb.setCharAt(convertPos, ' ');
+            }
+        }
+
+        //TODO - conversions still have too many parenthesis - makes --print-lower-parse hard to read
+    }
+
+    /**
+     * Get the right hand side of this if it is inherited by a binary expression,
+     * or just the expression itself if still Unary
+     *
+     * @see BinaryNode
+     *
+     * @return right hand side or expression node
+     */
+    public Node rhs() {
+        return rhs;
+    }
+
+    /**
+     * Reset the right hand side of this if it is inherited by a binary expression,
+     * or just the expression itself if still Unary
+     *
+     * @see BinaryNode
+     *
+     * @param rhs right hand side or expression node
+     */
+    public void setRHS(final Node rhs) {
+        this.rhs = rhs;
+    }
+
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/VarNode.java b/nashorn/src/jdk/nashorn/internal/ir/VarNode.java
new file mode 100644
index 00000000000..706de7775f1
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/VarNode.java
@@ -0,0 +1,249 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir;
+
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * Node represents a var/let declaration.
+ */
+public class VarNode extends Node implements Assignment<IdentNode> {
+    /** Var name. */
+    private IdentNode name;
+
+    /** Initialization expression. */
+    private Node init;
+
+    /** Is this a function var node */
+    private boolean isFunctionVarNode;
+
+    /** Should append VarNode to statement list? */
+    private final boolean shouldAppend;
+
+    /**
+     * Constructor
+     *
+     * @param source the source
+     * @param token  token
+     * @param finish finish
+     * @param name   name of variable
+     * @param init   init node or null if just a declaration
+     */
+    public VarNode(final Source source, final long token, final int finish, final IdentNode name, final Node init) {
+        this(source, token, finish, name, init, true);
+    }
+
+    /**
+     * Constructor
+     *
+     * @param source the source
+     * @param token  token
+     * @param finish finish
+     * @param name   name of variable
+     * @param init   init node or null if just a declaration
+     * @param shouldAppend should this turn into explicit code, like if it were an ExecuteNode
+     */
+    public VarNode(final Source source, final long token, final int finish, final IdentNode name, final Node init, final boolean shouldAppend) {
+        super(source, token, finish);
+
+        this.name  = name;
+        this.init  = init;
+        this.shouldAppend = shouldAppend;
+        if (init != null) {
+            this.name.setIsInitializedHere();
+        }
+    }
+
+    private VarNode(final VarNode varNode, final CopyState cs) {
+        super(varNode);
+
+        this.name = (IdentNode)cs.existingOrCopy(varNode.name);
+        this.init = cs.existingOrCopy(varNode.init);
+        this.shouldAppend = varNode.shouldAppend;
+    }
+
+    @Override
+    protected Node copy(final CopyState cs) {
+        return new VarNode(this, cs);
+    }
+
+    @Override
+    public boolean isAssignment() {
+        return hasInit();
+    }
+
+    @Override
+    public IdentNode getAssignmentDest() {
+        return isAssignment() ? name : null;
+    }
+
+    @Override
+    public void setAssignmentDest(final IdentNode node) {
+        setName(name);
+    }
+
+    @Override
+    public Node getAssignmentSource() {
+        return isAssignment() ? getInit() : null;
+    }
+
+    @Override
+    public void setAssignmentSource(final Node source) {
+        setInit(source);
+    }
+
+
+    /**
+     * Does this variable declaration have an init value
+     * @return true if an init exists, false otherwise
+     */
+    public boolean hasInit() {
+        return init != null;
+    }
+
+    /**
+     * Test to see if two VarNodes are the same.
+     * @param other Other VarNode.
+     * @return True if the VarNodes are the same.
+     */
+    @Override
+    public boolean equals(final Object other) {
+        if (other instanceof VarNode) {
+            final VarNode otherNode    = (VarNode)other;
+            final boolean nameMatches  = name.equals(otherNode.name);
+            if (hasInit() != otherNode.hasInit()) {
+                return false;
+            } else if (init == null) {
+                return nameMatches;
+            } else {
+                return nameMatches && init.equals(otherNode.init);
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public int hashCode() {
+        return name.hashCode() ^ (init == null ? 0 : init.hashCode());
+    }
+
+    /**
+     * Assist in IR navigation.
+     * @param visitor IR navigating visitor.
+     */
+    @Override
+    public Node accept(final NodeVisitor visitor) {
+        if (visitor.enter(this) != null) {
+            name = (IdentNode)name.accept(visitor);
+
+            if (init != null) {
+                init = init.accept(visitor);
+            }
+
+            return visitor.leave(this);
+        }
+
+        return this;
+    }
+
+    @Override
+    public void toString(final StringBuilder sb) {
+        sb.append("var ");
+        name.toString(sb);
+
+        if (init != null) {
+            sb.append(" = ");
+            init.toString(sb);
+        }
+    }
+
+    /**
+     * If this is an assignment of the form {@code var x = init;}, get the init part.
+     * @return the expression to initialize the variable to, null if just a declaration
+     */
+    public Node getInit() {
+        return init;
+    }
+
+    /**
+     * Reset the initialization expression
+     * @param init new initialization expression
+     */
+    public void setInit(final Node init) {
+        this.init = init;
+    }
+
+    /**
+     * Get the identifier for the variable
+     * @return IdentNode representing the variable being set or declared
+     */
+    public IdentNode getName() {
+        return name;
+    }
+
+    /**
+     * Reset the identifier for this VarNode
+     * @param name new IdentNode representing the variable being set or declared
+     */
+    public void setName(final IdentNode name) {
+        this.name = name;
+    }
+
+    /**
+     * Check if this is a virtual assignment of a function node. Function nodes declared
+     * with a name are hoisted to the top of the scope and appear as symbols too. This is
+     * implemented by representing them as virtual VarNode assignments added to the code
+     * during lowering
+     *
+     * @see FunctionNode
+     *
+     * @return true if this is a virtual function declaration
+     */
+    public boolean isFunctionVarNode() {
+        return isFunctionVarNode;
+    }
+
+    /**
+     * Flag this var node as a virtual function var node assignment as described in
+     * {@link VarNode#isFunctionVarNode()}
+     */
+    public void setIsFunctionVarNode() {
+        this.isFunctionVarNode = true;
+    }
+
+    /**
+     * Is this the var for a for-in node or other construct that means
+     * manual or no appends of this varNode to the statement list in
+     * Lower? The default is yes as most VarNodes are auto-append to
+     * the end of the statement list when lowered
+     *
+     * @return should compiler append var node to statement list
+     */
+    public boolean shouldAppend() {
+        return shouldAppend;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/WhileNode.java b/nashorn/src/jdk/nashorn/internal/ir/WhileNode.java
new file mode 100644
index 00000000000..592cea21390
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/WhileNode.java
@@ -0,0 +1,164 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir;
+
+import jdk.nashorn.internal.codegen.MethodEmitter.Label;
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * IR representation for a WHILE statement. This is the superclass of all
+ * loop nodes
+ */
+public class WhileNode extends BreakableNode {
+    /** Test expression. */
+    protected Node test;
+
+    /** For body. */
+    protected Block body;
+
+    /** loop continue label. */
+    protected Label continueLabel;
+
+    /**
+     * Constructor
+     *
+     * @param source  the source
+     * @param token   token
+     * @param finish  finish
+     */
+    public WhileNode(final Source source, final long token, final int finish) {
+        super(source, token, finish);
+
+        test          = null;
+        body          = null;
+        breakLabel    = new Label("while_break");
+        continueLabel = new Label("while_continue");
+    }
+
+    /**
+     * Copy constructor
+     *
+     * @param whileNode source node
+     * @param cs        copy state
+     */
+    protected WhileNode(final WhileNode whileNode, final CopyState cs) {
+        super(whileNode);
+
+        test          = cs.existingOrCopy(whileNode.test);
+        body          = (Block)cs.existingOrCopy(whileNode.body);
+        breakLabel    = new Label(whileNode.breakLabel);
+        continueLabel = new Label(whileNode.continueLabel);
+    }
+
+    @Override
+    protected Node copy(final CopyState cs) {
+        return new WhileNode(this, cs);
+    }
+
+    @Override
+    public boolean isLoop() {
+        return true;
+    }
+
+    /**
+     * Assist in IR navigation.
+     * @param visitor IR navigating visitor.
+     */
+    @Override
+    public Node accept(final NodeVisitor visitor) {
+        if (visitor.enter(this) != null) {
+            test = test.accept(visitor);
+            body = (Block)body.accept(visitor);
+
+            return visitor.leave(this);
+        }
+        return this;
+    }
+
+    @Override
+    public void toString(final StringBuilder sb) {
+        sb.append("while (");
+        test.toString(sb);
+        sb.append(')');
+    }
+
+    /**
+     * Get the loop body
+     * @return body
+     */
+    public Block getBody() {
+        return body;
+    }
+
+    /**
+     * Reset the loop body
+     * @param body new body
+     */
+    public void setBody(final Block body) {
+        this.body = body;
+    }
+
+    /**
+     * Set the break label (described in {@link WhileNode#getBreakLabel()} for this while node
+     * @param breakLabel break label
+     */
+    public void setBreakLabel(final Label breakLabel) {
+        this.breakLabel = breakLabel;
+    }
+
+    /**
+     * Get the continue label for this while node, i.e. location to go to on continue
+     * @return continue label
+     */
+    public Label getContinueLabel() {
+        return continueLabel;
+    }
+
+    /**
+     * Set the continue label (described in {@link WhileNode#getContinueLabel()} for this while node
+     * @param continueLabel continue label
+     */
+    public void setContinueLabel(final Label continueLabel) {
+        this.continueLabel = continueLabel;
+    }
+
+    /**
+     * Get the test expression for this loop, that upon evaluation to true does another iteration
+     * @return test expression
+     */
+    public Node getTest() {
+        return test;
+    }
+
+    /**
+     * Set the test expression for this loop
+     * @param test test expression, null if infinite loop
+     */
+    public void setTest(final Node test) {
+        this.test = test;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/WithNode.java b/nashorn/src/jdk/nashorn/internal/ir/WithNode.java
new file mode 100644
index 00000000000..22698f382f2
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/WithNode.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir;
+
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * IR representation for {@code with} statements.
+ */
+public class WithNode extends Node {
+   /** This expression. */
+    private Node expression;
+
+    /** Statements. */
+    private Block body;
+
+    /**
+     * Constructor
+     *
+     * @param source     the source
+     * @param token      token
+     * @param finish     finish
+     * @param expression expression in parenthesis
+     * @param body       with node body
+     */
+    public WithNode(final Source source, final long token, final int finish, final Node expression, final Block body) {
+        super(source, token, finish);
+
+        this.expression = expression;
+        this.body       = body;
+    }
+
+    private WithNode(final WithNode withNode, final CopyState cs) {
+        super(withNode);
+
+        expression = cs.existingOrCopy(withNode.expression);
+        body       = (Block)cs.existingOrCopy(withNode.body);
+    }
+
+    @Override
+    protected Node copy(final CopyState cs) {
+        return new WithNode(this, cs);
+    }
+
+    /**
+     * Assist in IR navigation.
+     *
+     * @param visitor IR navigating visitor.
+     */
+    @Override
+    public Node accept(final NodeVisitor visitor) {
+        if (visitor.enter(this) != null) {
+            expression = expression.accept(visitor);
+            body = (Block)body.accept(visitor);
+            return visitor.leave(this);
+        }
+
+        return this;
+    }
+
+    @Override
+    public void toString(final StringBuilder sb) {
+        sb.append("with (");
+        expression.toString(sb);
+        sb.append(')');
+    }
+
+    /**
+     * Get the body of this WithNode
+     * @return the body
+     */
+    public Block getBody() {
+        return body;
+    }
+
+    /**
+     * Reset the body of this with node
+     * @param body new body
+     */
+    public void setBody(final Block body) {
+        this.body = body;
+    }
+
+    /**
+     * Get the expression of this WithNode
+     * @return the expression
+     */
+    public Node getExpression() {
+        return expression;
+    }
+
+    /**
+     * Reset the expression of this with node
+     * @param expression new expression
+     */
+    public void setExpression(final Node expression) {
+        this.expression = expression;
+    }
+}
+
diff --git a/nashorn/src/jdk/nashorn/internal/ir/annotations/ChildNode.java b/nashorn/src/jdk/nashorn/internal/ir/annotations/ChildNode.java
new file mode 100644
index 00000000000..05e290ee445
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/annotations/ChildNode.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir.annotations;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * This is a child node, a real node, not a reference, to an IR node that should
+ * be traversed.
+ * <p>
+ * TODO Currently not in use.  Would make e.g. accept methods simple and unified
+ * @see jdk.nashorn.internal.ir.Node
+ */
+@Retention(value=RetentionPolicy.RUNTIME)
+public @interface ChildNode {
+    /** order of traversal compared to other children */
+    public int order() default -1;
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/annotations/Ignore.java b/nashorn/src/jdk/nashorn/internal/ir/annotations/Ignore.java
new file mode 100644
index 00000000000..609c33165d4
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/annotations/Ignore.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir.annotations;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import jdk.nashorn.internal.ir.debug.ASTWriter;
+
+/**
+ * This signifies a node that should be ignored in traversal, for example
+ * a reference to an already traversed node, or various metadata that
+ * has no actual IR representations, but yet reside in the node.
+ *
+ * @see ASTWriter
+ * @see jdk.nashorn.internal.ir.Node
+ */
+@Retention(value=RetentionPolicy.RUNTIME)
+public @interface Ignore {
+    // Empty
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/annotations/ParentNode.java b/nashorn/src/jdk/nashorn/internal/ir/annotations/ParentNode.java
new file mode 100644
index 00000000000..65d1e572e6f
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/annotations/ParentNode.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir.annotations;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * Signifies a parent of a node, i.e. node that should not be traversed if we
+ * go down the AST. In automatic parsing this can be handled by @Reference
+ * annotations instead, as all parents are references.
+ * <p>
+ * TODO The use case is automating and creating one implementation of something like
+ * Node.getParent()
+ *
+ * @see jdk.nashorn.internal.ir.Node
+ */
+@Retention(value=RetentionPolicy.RUNTIME)
+public @interface ParentNode {
+    // EMPTY
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/annotations/Reference.java b/nashorn/src/jdk/nashorn/internal/ir/annotations/Reference.java
new file mode 100644
index 00000000000..ed1f74f2903
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/annotations/Reference.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir.annotations;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * Reference node in AST, i.e. anything not a copy. Important for
+ * AST traversal and cloning. Cloning currently as a rule uses
+ * existingOrSame for references and otherwise existingOrCopy
+ * <p>
+ * TODO this could probably be automated using the @Reference annotation.
+ */
+
+@Retention(value=RetentionPolicy.RUNTIME)
+public @interface Reference {
+    // EMPTY
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/debug/ASTWriter.java b/nashorn/src/jdk/nashorn/internal/ir/debug/ASTWriter.java
new file mode 100644
index 00000000000..dae7afa97dd
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/debug/ASTWriter.java
@@ -0,0 +1,244 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir.debug;
+
+import java.lang.reflect.Field;
+import java.util.ArrayDeque;
+import java.util.Collection;
+import java.util.Deque;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import jdk.nashorn.internal.ir.BinaryNode;
+import jdk.nashorn.internal.ir.Node;
+import jdk.nashorn.internal.ir.TernaryNode;
+import jdk.nashorn.internal.ir.annotations.Ignore;
+import jdk.nashorn.internal.ir.annotations.ParentNode;
+import jdk.nashorn.internal.ir.annotations.Reference;
+import jdk.nashorn.internal.parser.Token;
+import jdk.nashorn.internal.runtime.Context;
+
+/**
+ * AST-as-text visualizer. Sometimes you want tree form and not source
+ * code. This works for both lowered and unlowered IR
+ *
+ * see the flags --print-ast and --print-ast-lower
+ */
+
+public final class ASTWriter {
+    /** Root node from which to start the traversal */
+    private final Node root;
+
+    private static final int TABWIDTH = 4;
+
+    /**
+     * Constructor
+     * @param root root of the AST to visualize
+     */
+    public ASTWriter(final Node root) {
+        this.root = root;
+    }
+
+    /**
+     * Use the ASTWriter by instantiating it and retrieving its String
+     * representation
+     *
+     * @return the string representation of the AST
+     */
+    @Override
+    public String toString() {
+        final StringBuilder sb = new StringBuilder();
+        printAST(sb, "root", root, 0);
+        return sb.toString();
+    }
+
+    @SuppressWarnings("unchecked")
+    private void printAST(final StringBuilder sb, final String name, final Node node, final int indent) {
+        ASTWriter.indent(sb, indent);
+        if (node == null) {
+            sb.append("[Object ");
+            sb.append(name);
+            sb.append(" null]\n");
+            return;
+        }
+
+        Class<?> clazz = node.getClass();
+        String type    = clazz.getName();
+        type = type.substring(type.lastIndexOf('.') + 1, type.length());
+ //       type += "@" + Debug.id(node) + "#" + node.getSymbol();
+
+        final List<Field> children = new LinkedList<>();
+        final Deque<Class<?>> stack = new ArrayDeque<>();
+
+        /**
+         * Here is some ugliness that can be overcome by proper ChildNode annotations
+         * with proper orders. Right now we basically sort all classes up to Node
+         * with super class first, as this often is the natural order, e.g. base
+         * before index for an IndexNode.
+         *
+         * Also there are special cases as this is not true for UnaryNodes(lhs) and
+         * BinaryNodes extends UnaryNode (with lhs), and TernaryNodes.
+         *
+         * TODO - generalize traversal with an order built on annotations and this
+         * will go away.
+         */
+        do {
+            stack.push(clazz);
+            clazz = clazz.getSuperclass();
+        } while (clazz != null);
+
+        if (node instanceof TernaryNode) {
+            // HACK juggle "third"
+            stack.push(stack.removeLast());
+        }
+        // HACK change operator order for BinaryNodes to get lhs first.
+        final Iterator<Class<?>> iter = node instanceof BinaryNode ? stack.descendingIterator() : stack.iterator();
+
+        while (iter.hasNext()) {
+            final Class<?> c = iter.next();
+            for (final Field f : c.getDeclaredFields()) {
+                try {
+                    f.setAccessible(true);
+                    final Object child = f.get(node);
+                    if (child == null) {
+                        continue;
+                    }
+
+                    if (child instanceof Node) {
+                        children.add(f);
+                    } else if (child instanceof Collection) {
+                        if (!((Collection<?>)child).isEmpty()) {
+                            children.add(f);
+                        }
+                    }
+                } catch (final IllegalArgumentException | IllegalAccessException e) {
+                    return;
+                }
+            }
+        }
+
+        String status = "";
+
+        if (node.shouldDiscard()) {
+            status += " Discard";
+        }
+
+        if (node.isTerminal()) {
+            status += " Terminal";
+        }
+
+        if (node.hasGoto()) {
+            status += " Goto ";
+        }
+
+        if (node.getSymbol() != null && node.getSymbol().hasSlot()) {
+            status += " Slot " + node.getSymbol();
+        }
+
+        status = status.trim();
+        if (!"".equals(status)) {
+            status = " [" + status + "]";
+        }
+
+        if (node.getSymbol() != null) {
+            String tname = node.getType().toString();
+            if (tname.indexOf('.') != -1) {
+                tname = tname.substring(tname.lastIndexOf('.') + 1, tname.length());
+            }
+            status += " (" + tname + ")";
+        }
+
+        if (children.isEmpty()) {
+            sb.append("[").
+                append(type).
+                append(' ').
+                append(name).
+                append(" = '").
+                append(node).
+                append("'").
+                append(status).
+                append("] ").
+                append('\n');
+        } else {
+            sb.append("[").
+                append(type).
+                append(' ').
+                append(name).
+                append(' ').
+                append(Token.toString(node.getToken())).
+                append(status).
+                append("]").
+                append('\n');
+
+            for (final Field field : children) {
+
+                if (field.getAnnotation(ParentNode.class) != null) {
+                    continue;
+                }
+                if (field.getAnnotation(Ignore.class) != null) {
+                    continue;
+                }
+                if (field.getAnnotation(Reference.class) != null) {
+                    continue;
+                }
+
+                Object value;
+                try {
+                    value = field.get(node);
+                } catch (final IllegalArgumentException | IllegalAccessException e) {
+                    Context.printStackTrace(e);
+                    return;
+                }
+
+                if (value instanceof Node) {
+                    printAST(sb, field.getName(), (Node)value, indent + 1);
+                } else if (value instanceof Collection) {
+                    int pos = 0;
+                    ASTWriter.indent(sb, indent + 1);
+                    sb.append("[Collection ").
+                        append(field.getName()).
+                        append("[0..").
+                        append(((Collection<Node>)value).size()).
+                        append("]]").
+                        append('\n');
+
+                    for (final Node child : (Collection<Node>)value) {
+                        printAST(sb, field.getName() + "[" + pos++ + "]", child, indent + 2);
+                    }
+                }
+            }
+        }
+    }
+
+    private static void indent(final StringBuilder sb, final int indent) {
+        for (int i = 0; i < indent; i++) {
+            for (int j = 0 ; j < TABWIDTH ; j++) {
+                sb.append(' ');
+            }
+        }
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/debug/JSONWriter.java b/nashorn/src/jdk/nashorn/internal/ir/debug/JSONWriter.java
new file mode 100644
index 00000000000..dbf8383fd32
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/debug/JSONWriter.java
@@ -0,0 +1,1012 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir.debug;
+
+import java.util.Arrays;
+import java.util.List;
+import jdk.nashorn.internal.codegen.Compiler;
+import jdk.nashorn.internal.codegen.CompilerConstants;
+import jdk.nashorn.internal.ir.AccessNode;
+import jdk.nashorn.internal.ir.BinaryNode;
+import jdk.nashorn.internal.ir.Block;
+import jdk.nashorn.internal.ir.BreakNode;
+import jdk.nashorn.internal.ir.CallNode;
+import jdk.nashorn.internal.ir.CaseNode;
+import jdk.nashorn.internal.ir.CatchNode;
+import jdk.nashorn.internal.ir.ContinueNode;
+import jdk.nashorn.internal.ir.DoWhileNode;
+import jdk.nashorn.internal.ir.EmptyNode;
+import jdk.nashorn.internal.ir.ExecuteNode;
+import jdk.nashorn.internal.ir.ForNode;
+import jdk.nashorn.internal.ir.FunctionNode;
+import jdk.nashorn.internal.ir.IdentNode;
+import jdk.nashorn.internal.ir.IfNode;
+import jdk.nashorn.internal.ir.IndexNode;
+import jdk.nashorn.internal.ir.LabelNode;
+import jdk.nashorn.internal.ir.LineNumberNode;
+import jdk.nashorn.internal.ir.LiteralNode;
+import jdk.nashorn.internal.ir.Node;
+import jdk.nashorn.internal.ir.ObjectNode;
+import jdk.nashorn.internal.ir.PropertyNode;
+import jdk.nashorn.internal.ir.ReturnNode;
+import jdk.nashorn.internal.ir.RuntimeNode;
+import jdk.nashorn.internal.ir.SplitNode;
+import jdk.nashorn.internal.ir.SwitchNode;
+import jdk.nashorn.internal.ir.TernaryNode;
+import jdk.nashorn.internal.ir.ThrowNode;
+import jdk.nashorn.internal.ir.TryNode;
+import jdk.nashorn.internal.ir.UnaryNode;
+import jdk.nashorn.internal.ir.VarNode;
+import jdk.nashorn.internal.ir.WhileNode;
+import jdk.nashorn.internal.ir.WithNode;
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.parser.JSONParser;
+import jdk.nashorn.internal.parser.Lexer.RegexToken;
+import jdk.nashorn.internal.parser.Parser;
+import jdk.nashorn.internal.parser.TokenType;
+import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.runtime.ParserException;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * This IR writer produces a JSON string that represents AST as a JSON string.
+ */
+public final class JSONWriter extends NodeVisitor {
+    /**
+     * Returns AST as JSON compatible string.
+     *
+     * @param code code to be parsed
+     * @param name name of the code source (used for location)
+     * @param includeLoc tells whether to include location information for nodes or not
+     * @return JSON string representation of AST of the supplied code
+     */
+    public static String parse(final String code, final String name, final boolean includeLoc) {
+        final ScriptObject global     = Context.getGlobal();
+        final Context      context    = global.getContext();
+        final Compiler     compiler   = Compiler.compiler(new Source(name, code), context, new Context.ThrowErrorManager(), context._strict);
+        final Parser       parser     = new Parser(compiler, context._strict);
+        final JSONWriter   jsonWriter = new JSONWriter(includeLoc);
+        try {
+            final FunctionNode functionNode = parser.parse(CompilerConstants.RUN_SCRIPT.tag());
+            functionNode.accept(jsonWriter);
+            return jsonWriter.getString();
+        } catch (final ParserException e) {
+            e.throwAsEcmaException(global);
+            return null;
+        }
+    }
+
+    @Override
+    protected Node enterDefault(final Node node) {
+        objectStart();
+        location(node);
+
+        return node;
+    }
+
+    @Override
+    protected Node leaveDefault(final Node node) {
+        objectEnd();
+        return null;
+    }
+
+    @Override
+    public Node enter(final AccessNode accessNode) {
+        enterDefault(accessNode);
+
+        type("MemberExpression");
+        comma();
+
+        property("object");
+        accessNode.getBase().accept(this);
+        comma();
+
+        property("property");
+        accessNode.getProperty().accept(this);
+        comma();
+
+        property("computed", false);
+
+        return leaveDefault(accessNode);
+    }
+
+    @Override
+    public Node enter(final Block block) {
+        enterDefault(block);
+
+        type("BlockStatement");
+        comma();
+
+        array("body", block.getStatements());
+
+        return leaveDefault(block);
+    }
+
+    private static boolean isLogical(final TokenType tt) {
+        switch (tt) {
+            case AND:
+            case OR:
+                return true;
+            default:
+                return false;
+        }
+    }
+
+    @Override
+    public Node enter(final BinaryNode binaryNode) {
+        enterDefault(binaryNode);
+
+        final String name;
+        if (binaryNode.isAssignment()) {
+            name = "AssignmentExpression";
+        } else if (isLogical(binaryNode.tokenType())) {
+            name = "LogicalExpression";
+        } else {
+            name = "BinaryExpression";
+        }
+
+        type(name);
+        comma();
+
+        property("operator", binaryNode.tokenType().getName());
+        comma();
+
+        property("left");
+        binaryNode.lhs().accept(this);
+        comma();
+
+        property("right");
+        binaryNode.rhs().accept(this);
+
+        return leaveDefault(binaryNode);
+    }
+
+    @Override
+    public Node enter(final BreakNode breakNode) {
+        enterDefault(breakNode);
+
+        type("BreakStatement");
+        comma();
+
+        final LabelNode label = breakNode.getLabel();
+        if (label != null) {
+            property("label", label.getLabel().getName());
+        } else {
+            property("label");
+            nullValue();
+        }
+
+        return leaveDefault(breakNode);
+    }
+
+    @Override
+    public Node enter(final CallNode callNode) {
+        enterDefault(callNode);
+
+        type("CallExpression");
+        comma();
+
+        property("callee");
+        callNode.getFunction().accept(this);
+        comma();
+
+        array("arguments", callNode.getArgs());
+
+        return leaveDefault(callNode);
+    }
+
+    @Override
+    public Node enter(final CaseNode caseNode) {
+        enterDefault(caseNode);
+
+        type("SwitchCase");
+        comma();
+
+        final Node test = caseNode.getTest();
+        property("test");
+        if (test != null) {
+            test.accept(this);
+        } else {
+            nullValue();
+        }
+        comma();
+
+        array("consequent", caseNode.getBody().getStatements());
+
+        return leaveDefault(caseNode);
+    }
+
+    @Override
+    public Node enter(final CatchNode catchNode) {
+        enterDefault(catchNode);
+
+        type("CatchClause");
+        comma();
+
+        property("param");
+        catchNode.getException().accept(this);
+        comma();
+
+        final Node guard = catchNode.getExceptionCondition();
+        property("guard");
+        if (guard != null) {
+            guard.accept(this);
+        } else {
+            nullValue();
+        }
+        comma();
+
+        property("body");
+        catchNode.getBody().accept(this);
+
+        return leaveDefault(catchNode);
+    }
+
+    @Override
+    public Node enter(final ContinueNode continueNode) {
+        enterDefault(continueNode);
+
+        type("ContinueStatement");
+        comma();
+
+        final LabelNode label = continueNode.getLabel();
+        if (label != null) {
+            property("label", label.getLabel().getName());
+        } else {
+            property("label");
+            nullValue();
+        }
+
+        return leaveDefault(continueNode);
+    }
+
+    @Override
+    public Node enter(final DoWhileNode doWhileNode) {
+        enterDefault(doWhileNode);
+
+        type("DoWhileStatement");
+        comma();
+
+        property("body");
+        doWhileNode.getBody().accept(this);
+        comma();
+
+        property("test");
+        doWhileNode.getTest().accept(this);
+
+        return leaveDefault(doWhileNode);
+    }
+
+    @Override
+    public Node enter(final EmptyNode emptyNode) {
+        enterDefault(emptyNode);
+
+        type("EmptyStatement");
+
+        return leaveDefault(emptyNode);
+    }
+
+    @Override
+    public Node enter(final ExecuteNode executeNode) {
+        enterDefault(executeNode);
+
+        type("ExpressionStatement");
+        comma();
+
+        property("expression");
+        executeNode.getExpression().accept(this);
+
+        return leaveDefault(executeNode);
+    }
+
+    @Override
+    public Node enter(final ForNode forNode) {
+        enterDefault(forNode);
+
+        if (forNode.isForIn() || forNode.isForEach()) {
+            type("ForInStatement");
+            comma();
+
+            property("left");
+            forNode.getInit().accept(this);
+            comma();
+
+            property("right");
+            forNode.getModify().accept(this);
+            comma();
+
+            property("body");
+            forNode.getBody().accept(this);
+            comma();
+
+            property("each", forNode.isForEach());
+        } else {
+            type("ForStatement");
+            comma();
+
+            final Node init = forNode.getInit();
+            property("init");
+            if (init != null) {
+                init.accept(this);
+            } else {
+                nullValue();
+            }
+            comma();
+
+            final Node test = forNode.getTest();
+            property("test");
+            if (test != null) {
+                test.accept(this);
+            } else {
+                nullValue();
+            }
+            comma();
+
+            final Node update = forNode.getModify();
+            property("update");
+            if (update != null) {
+                update.accept(this);
+            } else {
+                nullValue();
+            }
+            comma();
+
+            property("body");
+            forNode.getBody().accept(this);
+        }
+
+        return leaveDefault(forNode);
+    }
+
+    @Override
+    public Node enter(final FunctionNode functionNode) {
+        enterDefault(functionNode);
+
+        final boolean program = functionNode.isScript();
+        final String name;
+        if (program) {
+            name = "Program";
+        } else if (functionNode.isStatement()) {
+            name = "FunctionDeclaration";
+        } else {
+            name = "FunctionExpression";
+        }
+        type(name);
+        comma();
+
+        if (! program) {
+            property("id");
+            if (functionNode.isAnonymous()) {
+                nullValue();
+            } else {
+                functionNode.getIdent().accept(this);
+            }
+            comma();
+        }
+
+        property("rest");
+        nullValue();
+        comma();
+
+        if (!program) {
+            array("params", functionNode.getParameters());
+            comma();
+        }
+
+        // body consists of nested functions and statements
+        final List<FunctionNode> funcs = functionNode.getFunctions();
+        final List<Node> stats = functionNode.getStatements();
+        final int size = stats.size() + funcs.size();
+        int idx = 0;
+        arrayStart("body");
+
+        for (final Node func : funcs) {
+            func.accept(this);
+            if (idx != (size - 1)) {
+                comma();
+            }
+            idx++;
+        }
+
+        for (final Node stat : stats) {
+            if (! stat.isDebug()) {
+                stat.accept(this);
+                if (idx != (size - 1)) {
+                    comma();
+                }
+            }
+            idx++;
+        }
+        arrayEnd();
+
+        return leaveDefault(functionNode);
+    }
+
+    @Override
+    public Node enter(final IdentNode identNode) {
+        enterDefault(identNode);
+
+        final String name = identNode.getName();
+        if ("this".equals(name)) {
+            type("ThisExpression");
+        } else {
+            type("Identifier");
+            comma();
+            property("name", identNode.getName());
+        }
+
+        return leaveDefault(identNode);
+    }
+
+    @Override
+    public Node enter(final IfNode ifNode) {
+        enterDefault(ifNode);
+
+        type("IfStatement");
+        comma();
+
+        property("test");
+        ifNode.getTest().accept(this);
+        comma();
+
+        property("consequent");
+        ifNode.getPass().accept(this);
+        final Node elsePart = ifNode.getFail();
+        comma();
+
+        property("alternate");
+        if (elsePart != null) {
+            elsePart.accept(this);
+        } else {
+            nullValue();
+        }
+
+        return leaveDefault(ifNode);
+    }
+
+    @Override
+    public Node enter(final IndexNode indexNode) {
+        enterDefault(indexNode);
+
+        type("MemberExpression");
+        comma();
+
+        property("object");
+        indexNode.getBase().accept(this);
+        comma();
+
+        property("property");
+        indexNode.getIndex().accept(this);
+        comma();
+
+        property("computed", true);
+
+        return leaveDefault(indexNode);
+    }
+
+    @Override
+    public Node enter(final LabelNode labelNode) {
+        enterDefault(labelNode);
+
+        type("LabeledStatement");
+        comma();
+
+        property("label");
+        labelNode.getLabel().accept(this);
+        comma();
+
+        property("body");
+        labelNode.getBody().accept(this);
+
+        return leaveDefault(labelNode);
+    }
+
+    @Override
+    public Node enter(final LineNumberNode lineNumberNode) {
+        return null;
+    }
+
+    @SuppressWarnings("rawtypes")
+    @Override
+    public Node enter(final LiteralNode literalNode) {
+        enterDefault(literalNode);
+
+        if (literalNode instanceof LiteralNode.ArrayLiteralNode) {
+            type("ArrayExpression");
+            comma();
+
+            final Node[] value = (Node[])literalNode.getValue();
+            array("elements", Arrays.asList(value));
+        } else {
+            type("Literal");
+            comma();
+
+            property("value");
+            final Object value = literalNode.getValue();
+            if (value instanceof RegexToken) {
+                // encode RegExp literals as Strings of the form /.../<flags>
+                final RegexToken regex = (RegexToken)value;
+                final StringBuilder regexBuf = new StringBuilder();
+                regexBuf.append('/');
+                regexBuf.append(regex.getExpression());
+                regexBuf.append('/');
+                regexBuf.append(regex.getOptions());
+                buf.append(quote(regexBuf.toString()));
+            } else {
+                final String str = literalNode.getString();
+                // encode every String literal with prefix '$' so that script
+                // can differentiate b/w RegExps as Strings and Strings.
+                buf.append(literalNode.isString()? quote("$" + str) : str);
+            }
+        }
+
+        return leaveDefault(literalNode);
+    }
+
+    @Override
+    public Node enter(final ObjectNode objectNode) {
+        enterDefault(objectNode);
+
+        type("ObjectExpression");
+        comma();
+
+        array("properties", objectNode.getElements());
+
+        return leaveDefault(objectNode);
+    }
+
+    @Override
+    public Node enter(final PropertyNode propertyNode) {
+        final Node key = propertyNode.getKey();
+
+        final Node value = propertyNode.getValue();
+        if (value != null) {
+            objectStart();
+            location(propertyNode);
+
+            property("key");
+            key.accept(this);
+            comma();
+
+            property("value");
+            value.accept(this);
+            comma();
+
+            property("kind", "init");
+
+            objectEnd();
+        } else {
+            // getter
+            final Node getter = propertyNode.getGetter();
+            if (getter != null) {
+                objectStart();
+                location(propertyNode);
+
+                property("key");
+                key.accept(this);
+                comma();
+
+                property("value");
+                getter.accept(this);
+                comma();
+
+                property("kind", "get");
+
+                objectEnd();
+            }
+
+            // setter
+            final Node setter = propertyNode.getSetter();
+            if (setter != null) {
+                objectStart();
+                location(propertyNode);
+
+                property("key");
+                key.accept(this);
+                comma();
+
+                property("value");
+                setter.accept(this);
+                comma();
+
+                property("kind", "set");
+
+                objectEnd();
+            }
+        }
+
+        return null;
+    }
+
+    @Override
+    public Node enter(final ReturnNode returnNode) {
+        enterDefault(returnNode);
+
+        type("ReturnStatement");
+        comma();
+
+        final Node arg = returnNode.getExpression();
+        property("argument");
+        if (arg != null) {
+            arg.accept(this);
+        } else {
+            nullValue();
+        }
+
+        return leaveDefault(returnNode);
+    }
+
+    @Override
+    public Node enter(final RuntimeNode runtimeNode) {
+        final RuntimeNode.Request req = runtimeNode.getRequest();
+
+        if (req == RuntimeNode.Request.DEBUGGER) {
+            enterDefault(runtimeNode);
+
+            type("DebuggerStatement");
+
+            return leaveDefault(runtimeNode);
+        }
+
+        return null;
+    }
+
+    @Override
+    public Node enter(final SplitNode splitNode) {
+        return null;
+    }
+
+    @Override
+    public Node enter(final SwitchNode switchNode) {
+        enterDefault(switchNode);
+
+        type("SwitchStatement");
+        comma();
+
+        property("discriminant");
+        switchNode.getExpression().accept(this);
+        comma();
+
+        array("cases", switchNode.getCases());
+
+        return leaveDefault(switchNode);
+    }
+
+    @Override
+    public Node enter(final TernaryNode ternaryNode) {
+        enterDefault(ternaryNode);
+
+        type("ConditionalExpression");
+        comma();
+
+        property("test");
+        ternaryNode.lhs().accept(this);
+        comma();
+
+        property("consequent");
+        ternaryNode.rhs().accept(this);
+        comma();
+
+        property("alternate");
+        ternaryNode.third().accept(this);
+
+        return leaveDefault(ternaryNode);
+    }
+
+    @Override
+    public Node enter(final ThrowNode throwNode) {
+        enterDefault(throwNode);
+
+        type("ThrowStatement");
+        comma();
+
+        property("argument");
+        throwNode.getExpression().accept(this);
+
+        return leaveDefault(throwNode);
+    }
+
+    @Override
+    public Node enter(final TryNode tryNode) {
+        enterDefault(tryNode);
+
+        type("TryStatement");
+        comma();
+
+        property("block");
+        tryNode.getBody().accept(this);
+        comma();
+
+        array("handlers", tryNode.getCatches());
+        comma();
+
+        property("finalizer");
+        final Node finallyNode = tryNode.getFinallyBody();
+        if (finallyNode != null) {
+            finallyNode.accept(this);
+        } else {
+            nullValue();
+        }
+
+        return leaveDefault(tryNode);
+    }
+
+    @Override
+    public Node enter(final UnaryNode unaryNode) {
+        enterDefault(unaryNode);
+
+        final TokenType tokenType = unaryNode.tokenType();
+        if (tokenType == TokenType.NEW) {
+            type("NewExpression");
+            comma();
+
+            final CallNode callNode = (CallNode)unaryNode.rhs();
+            property("callee");
+            callNode.getFunction().accept(this);
+            comma();
+
+            array("arguments", callNode.getArgs());
+        } else {
+            final boolean prefix;
+            final String operator;
+            switch (tokenType) {
+                case DECPOSTFIX:
+                    prefix = false;
+                    operator = "++";
+                    break;
+                case INCPOSTFIX:
+                    prefix = false;
+                    operator = "--";
+                    break;
+                case INCPREFIX:
+                    operator = "++";
+                    prefix = true;
+                    break;
+                case DECPREFIX:
+                    operator = "--";
+                    prefix = true;
+                    break;
+                default:
+                    prefix = false;
+                    operator = tokenType.getName();
+            }
+
+            type(unaryNode.isAssignment()? "UpdateExpression" : "UnaryExpression");
+            comma();
+
+            property("operator", operator);
+            comma();
+
+            property("prefix", prefix);
+            comma();
+
+            property("argument");
+            unaryNode.rhs().accept(this);
+        }
+
+        return leaveDefault(unaryNode);
+    }
+
+    @Override
+    public Node enter(final VarNode varNode) {
+        enterDefault(varNode);
+
+        type("VariableDeclaration");
+        comma();
+
+        arrayStart("declarations");
+
+        // VariableDeclarator
+        objectStart();
+        location(varNode.getName());
+
+        type("VariableDeclarator");
+        comma();
+
+        property("id", varNode.getName().toString());
+        comma();
+
+        property("init");
+        final Node init = varNode.getInit();
+        if (init != null) {
+            init.accept(this);
+        } else {
+            nullValue();
+        }
+
+        // VariableDeclarator
+        objectEnd();
+
+        // declarations
+        arrayEnd();
+
+        return leaveDefault(varNode);
+    }
+
+    @Override
+    public Node enter(final WhileNode whileNode) {
+        enterDefault(whileNode);
+
+        type("WhileStatement");
+        comma();
+
+        property("test");
+        whileNode.getTest().accept(this);
+        comma();
+
+        property("block");
+        whileNode.getBody().accept(this);
+
+        return leaveDefault(whileNode);
+    }
+
+    @Override
+    public Node enter(final WithNode withNode) {
+        enterDefault(withNode);
+
+        type("WithStatement");
+        comma();
+
+        property("object");
+        withNode.getExpression().accept(this);
+        comma();
+
+        property("body");
+        withNode.getBody().accept(this);
+
+        return leaveDefault(withNode);
+    }
+
+    // Internals below
+
+    private JSONWriter(final boolean includeLocation) {
+        this.buf = new StringBuilder();
+        this.includeLocation = includeLocation;
+    }
+
+    private final StringBuilder buf;
+    private final boolean includeLocation;
+
+    private String getString() {
+        return buf.toString();
+    }
+
+    private void property(final String key, final String value) {
+        buf.append('"');
+        buf.append(key);
+        buf.append("\":");
+        if (value != null) {
+            buf.append('"');
+            buf.append(value);
+            buf.append('"');
+        }
+    }
+
+    private void property(final String key, final boolean value) {
+        property(key, Boolean.toString(value));
+    }
+
+    private void property(final String key, final int value) {
+        property(key, Integer.toString(value));
+    }
+
+    private void property(final String key) {
+        property(key, null);
+    }
+
+    private void type(final String value) {
+        property("type", value);
+    }
+
+    private void objectStart(final String name) {
+        buf.append('"');
+        buf.append(name);
+        buf.append("\":{");
+    }
+
+    private void objectStart() {
+        buf.append('{');
+    }
+
+    private void objectEnd() {
+        buf.append('}');
+    }
+
+    private void array(final String name, final List<? extends Node> nodes) {
+        // The size, idx comparison is just to avoid trailing comma..
+        final int size = nodes.size();
+        int idx = 0;
+        arrayStart(name);
+        for (final Node node : nodes) {
+            if (! node.isDebug()) {
+                node.accept(this);
+                if (idx != (size - 1)) {
+                    comma();
+                }
+            }
+            idx++;
+        }
+        arrayEnd();
+    }
+
+    private void arrayStart(final String name) {
+        buf.append('"');
+        buf.append(name);
+        buf.append('"');
+        buf.append(':');
+        buf.append('[');
+    }
+
+    private void arrayEnd() {
+        buf.append(']');
+    }
+
+    private void comma() {
+        buf.append(',');
+    }
+
+    private void nullValue() {
+        buf.append("null");
+    }
+
+    private void location(final Node node) {
+        if (includeLocation) {
+            objectStart("loc");
+
+            // source name
+            final Source src = node.getSource();
+            property("source", src.getName());
+            comma();
+
+            // start position
+            objectStart("start");
+            final int start = node.getStart();
+            property("line", src.getLine(start));
+            comma();
+            property("column", src.getColumn(start));
+            objectEnd();
+            comma();
+
+            // end position
+            objectStart("end");
+            final int end = node.getFinish();
+            property("line", src.getLine(end));
+            comma();
+            property("column", src.getColumn(end));
+            objectEnd();
+
+            // end 'loc'
+            objectEnd();
+
+            comma();
+        }
+    }
+
+    private static String quote(final String str) {
+        return JSONParser.quote(str);
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/debug/PrintVisitor.java b/nashorn/src/jdk/nashorn/internal/ir/debug/PrintVisitor.java
new file mode 100644
index 00000000000..354ee91eb04
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/debug/PrintVisitor.java
@@ -0,0 +1,436 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir.debug;
+
+import java.util.List;
+import jdk.nashorn.internal.ir.AccessNode;
+import jdk.nashorn.internal.ir.Block;
+import jdk.nashorn.internal.ir.BreakNode;
+import jdk.nashorn.internal.ir.CallNode;
+import jdk.nashorn.internal.ir.CaseNode;
+import jdk.nashorn.internal.ir.CatchNode;
+import jdk.nashorn.internal.ir.ContinueNode;
+import jdk.nashorn.internal.ir.DoWhileNode;
+import jdk.nashorn.internal.ir.ExecuteNode;
+import jdk.nashorn.internal.ir.ForNode;
+import jdk.nashorn.internal.ir.FunctionNode;
+import jdk.nashorn.internal.ir.IfNode;
+import jdk.nashorn.internal.ir.IndexNode;
+import jdk.nashorn.internal.ir.LabelNode;
+import jdk.nashorn.internal.ir.LineNumberNode;
+import jdk.nashorn.internal.ir.Node;
+import jdk.nashorn.internal.ir.ReferenceNode;
+import jdk.nashorn.internal.ir.ReturnNode;
+import jdk.nashorn.internal.ir.RuntimeNode;
+import jdk.nashorn.internal.ir.SplitNode;
+import jdk.nashorn.internal.ir.SwitchNode;
+import jdk.nashorn.internal.ir.Symbol;
+import jdk.nashorn.internal.ir.ThrowNode;
+import jdk.nashorn.internal.ir.TryNode;
+import jdk.nashorn.internal.ir.UnaryNode;
+import jdk.nashorn.internal.ir.VarNode;
+import jdk.nashorn.internal.ir.WhileNode;
+import jdk.nashorn.internal.ir.WithNode;
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+
+/**
+ * Print out the AST as human readable source code.
+ * This works both on lowered and unlowered ASTs
+ *
+ * see the flags --print-parse and --print-lower-parse
+ */
+public final class PrintVisitor extends NodeVisitor {
+    /** Tab width */
+    private static final int TABWIDTH = 1;
+
+    /** Composing buffer. */
+    private final StringBuilder sb;
+
+    /** Indentation factor. */
+    private int indent;
+
+    /** Line separator. */
+    private final String EOLN;
+
+    /** Print line numbers */
+    private final boolean printLineNumbers;
+
+    /**
+     * Constructor.
+     */
+    public PrintVisitor() {
+        this(true);
+    }
+
+    /**
+     * Constructor
+     *
+     * @param printLineNumbers  should line number nodes be included in the output?
+     */
+    public PrintVisitor(final boolean printLineNumbers) {
+        this.EOLN             = System.lineSeparator();
+        this.sb               = new StringBuilder();
+        this.printLineNumbers = printLineNumbers;
+    }
+
+    /**
+     * Constructor
+     *
+     * @param root  a node from which to start printing code
+     */
+    public PrintVisitor(final Node root) {
+        this(root, true);
+    }
+
+    /**
+     * Constructor
+     *
+     * @param root              a node from which to start printing code
+     * @param printLineNumbers  should line numbers nodes be included in the output?
+     */
+    public PrintVisitor(final Node root, final boolean printLineNumbers) {
+        this(printLineNumbers);
+        visit(root);
+    }
+
+    private void visit(final Node root) {
+        root.accept(this);
+    }
+
+    @Override
+    public String toString() {
+        return sb.append(EOLN).toString();
+    }
+
+    /**
+     * Insert spaces before a statement.
+     */
+    private void indent() {
+        for (int i = indent; i > 0; i--) {
+            sb.append(' ');
+        }
+    }
+
+    /*
+     * Visits.
+     */
+    @Override
+    public Node enter(final AccessNode accessNode) {
+        accessNode.toString(sb);
+        return null;
+    }
+
+    @Override
+    public Node enter(final Block block) {
+        sb.append(' ');
+        sb.append('{');
+
+        indent += TABWIDTH;
+
+        final boolean isFunction = block instanceof FunctionNode;
+
+        if (isFunction) {
+            final FunctionNode       function  = (FunctionNode)block;
+            final List<FunctionNode> functions = function.getFunctions();
+
+            for (final FunctionNode f : functions) {
+                sb.append(EOLN);
+                indent();
+                f.accept(this);
+            }
+
+            if (!functions.isEmpty()) {
+                sb.append(EOLN);
+            }
+        }
+
+        final List<Node> statements = block.getStatements();
+
+        boolean lastLineNumber = false;
+
+        for (final Node statement : statements) {
+            if (printLineNumbers || !lastLineNumber) {
+                sb.append(EOLN);
+                indent();
+            }
+
+            if (statement instanceof UnaryNode) {
+                statement.toString(sb);
+            } else {
+                statement.accept(this);
+            }
+
+            lastLineNumber = statement instanceof LineNumberNode;
+
+            final Symbol symbol = statement.getSymbol();
+
+            if (symbol != null) {
+                sb.append("  [");
+                sb.append(symbol.toString());
+                sb.append(']');
+            }
+
+            final char lastChar = sb.charAt(sb.length() - 1);
+
+            if (lastChar != '}' && lastChar != ';') {
+                if (printLineNumbers || !lastLineNumber) {
+                    sb.append(';');
+                }
+            }
+
+            if (statement.hasGoto()) {
+                sb.append(" [GOTO]");
+            }
+
+            if (statement.isTerminal()) {
+                sb.append(" [TERMINAL]");
+            }
+        }
+
+        indent -= TABWIDTH;
+
+        sb.append(EOLN);
+        indent();
+        sb.append("}");
+
+        if (isFunction) {
+            sb.append(EOLN);
+        }
+
+        return null;
+    }
+
+    @Override
+    public Node enter(final BreakNode breakNode) {
+        breakNode.toString(sb);
+        return null;
+    }
+
+    @Override
+    public Node enter(final CallNode callNode) {
+        callNode.toString(sb);
+        return null;
+    }
+
+    @Override
+    public Node enter(final ContinueNode continueNode) {
+        continueNode.toString(sb);
+        return null;
+    }
+
+    @Override
+    public Node enter(final DoWhileNode doWhileNode) {
+        sb.append("do");
+        doWhileNode.getBody().accept(this);
+        sb.append(' ');
+        doWhileNode.toString(sb);
+
+        return null;
+    }
+
+    @Override
+    public Node enter(final ExecuteNode executeNode) {
+        final Node expression = executeNode.getExpression();
+
+        if (expression instanceof UnaryNode) {
+            expression.toString(sb);
+        } else {
+            expression.accept(this);
+        }
+
+        return null;
+    }
+
+    @Override
+    public Node enter(final ForNode forNode) {
+        forNode.toString(sb);
+        forNode.getBody().accept(this);
+
+        return null;
+    }
+
+    @Override
+    public Node enter(final FunctionNode functionNode) {
+        functionNode.toString(sb);
+        enter((Block)functionNode);
+
+        return null;
+    }
+
+    @Override
+    public Node enter(final IfNode ifNode) {
+        ifNode.toString(sb);
+        ifNode.getPass().accept(this);
+
+        final Block fail = ifNode.getFail();
+
+        if (fail != null) {
+            sb.append(" else ");
+            fail.accept(this);
+        }
+
+        return null;
+    }
+
+    @Override
+    public Node enter(final IndexNode indexNode) {
+        indexNode.toString(sb);
+        return null;
+    }
+
+    @Override
+    public Node enter(final LabelNode labeledNode) {
+        indent -= TABWIDTH;
+        indent();
+        indent += TABWIDTH;
+        labeledNode.toString(sb);
+        labeledNode.getBody().accept(this);
+
+        return null;
+    }
+
+    @Override
+    public Node enter(final LineNumberNode lineNumberNode) {
+        if (printLineNumbers) {
+            lineNumberNode.toString(sb);
+        }
+
+        return null;
+    }
+
+
+    @Override
+    public Node enter(final ReferenceNode referenceNode) {
+        referenceNode.toString(sb);
+        return null;
+    }
+
+    @Override
+    public Node enter(final ReturnNode returnNode) {
+        returnNode.toString(sb);
+        return null;
+    }
+
+    @Override
+    public Node enter(final RuntimeNode runtimeNode) {
+        runtimeNode.toString(sb);
+        return null;
+    }
+
+    @Override
+    public Node enter(final SplitNode splitNode) {
+        splitNode.toString(sb);
+        sb.append(EOLN);
+        indent += TABWIDTH;
+        indent();
+        return splitNode;
+    }
+
+    @Override
+    public Node leave(final SplitNode splitNode) {
+        sb.append("</split>");
+        sb.append(EOLN);
+        indent -= TABWIDTH;
+        indent();
+        return splitNode;
+    }
+
+    @Override
+    public Node enter(final SwitchNode switchNode) {
+        switchNode.toString(sb);
+        sb.append(" {");
+
+        final List<CaseNode> cases = switchNode.getCases();
+
+        for (final CaseNode caseNode : cases) {
+            sb.append(EOLN);
+            indent();
+            caseNode.toString(sb);
+            indent += TABWIDTH;
+            caseNode.getBody().accept(this);
+            indent -= TABWIDTH;
+            sb.append(EOLN);
+        }
+
+        sb.append(EOLN);
+        indent();
+        sb.append("}");
+
+        return null;
+   }
+
+    @Override
+    public Node enter(final ThrowNode throwNode) {
+        throwNode.toString(sb);
+        return null;
+    }
+
+    @Override
+    public Node enter(final TryNode tryNode) {
+        tryNode.toString(sb);
+        tryNode.getBody().accept(this);
+
+        final List<Block> catchBlocks = tryNode.getCatchBlocks();
+
+        for (final Block catchBlock : catchBlocks) {
+            final CatchNode catchNode = (CatchNode) catchBlock.getStatements().get(0);
+            catchNode.toString(sb);
+            catchNode.getBody().accept(this);
+        }
+
+        final Block finallyBody = tryNode.getFinallyBody();
+
+        if (finallyBody != null) {
+            sb.append(" finally ");
+            finallyBody.accept(this);
+        }
+
+        return null;
+    }
+
+    @Override
+    public Node enter(final VarNode varNode) {
+        varNode.toString(sb);
+        return null;
+    }
+
+    @Override
+    public Node enter(final WhileNode whileNode) {
+        whileNode.toString(sb);
+        whileNode.getBody().accept(this);
+
+        return null;
+    }
+
+    @Override
+    public Node enter(final WithNode withNode) {
+        withNode.toString(sb);
+        withNode.getBody().accept(this);
+
+        return null;
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/visitor/NodeOperatorVisitor.java b/nashorn/src/jdk/nashorn/internal/ir/visitor/NodeOperatorVisitor.java
new file mode 100644
index 00000000000..d76dfb8b886
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/visitor/NodeOperatorVisitor.java
@@ -0,0 +1,1287 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir.visitor;
+
+import jdk.nashorn.internal.codegen.CompileUnit;
+import jdk.nashorn.internal.codegen.MethodEmitter;
+import jdk.nashorn.internal.ir.BinaryNode;
+import jdk.nashorn.internal.ir.Node;
+import jdk.nashorn.internal.ir.UnaryNode;
+
+/**
+ * Like NodeVisitor but navigating further into operators.
+ */
+public class NodeOperatorVisitor extends NodeVisitor {
+    /**
+     * Constructor
+     */
+    public NodeOperatorVisitor() {
+        super();
+    }
+
+    /**
+     * Constructor
+     *
+     * @param compileUnit compile unit
+     * @param method      method emitter
+     */
+    public NodeOperatorVisitor(final CompileUnit compileUnit, final MethodEmitter method) {
+        super(compileUnit, method);
+    }
+
+    @Override
+    public final Node enter(final UnaryNode unaryNode) {
+        switch (unaryNode.tokenType()) {
+        case ADD:
+            return enterADD(unaryNode);
+        case BIT_NOT:
+            return enterBIT_NOT(unaryNode);
+        case CONVERT:
+            return enterCONVERT(unaryNode);
+        case DELETE:
+            return enterDELETE(unaryNode);
+        case DISCARD:
+            return enterDISCARD(unaryNode);
+        case NEW:
+            return enterNEW(unaryNode);
+        case NOT:
+            return enterNOT(unaryNode);
+        case SUB:
+            return enterSUB(unaryNode);
+        case TYPEOF:
+            return enterTYPEOF(unaryNode);
+        case VOID:
+            return enterVOID(unaryNode);
+        case DECPREFIX:
+        case DECPOSTFIX:
+        case INCPREFIX:
+        case INCPOSTFIX:
+            return enterDECINC(unaryNode);
+        default:
+            return super.enter(unaryNode);
+        }
+    }
+
+    @Override
+    public final Node leave(final UnaryNode unaryNode) {
+        switch (unaryNode.tokenType()) {
+        case ADD:
+            return leaveADD(unaryNode);
+        case BIT_NOT:
+            return leaveBIT_NOT(unaryNode);
+        case CONVERT:
+            return leaveCONVERT(unaryNode);
+        case DELETE:
+            return leaveDELETE(unaryNode);
+        case DISCARD:
+            return leaveDISCARD(unaryNode);
+        case NEW:
+            return leaveNEW(unaryNode);
+        case NOT:
+            return leaveNOT(unaryNode);
+        case SUB:
+            return leaveSUB(unaryNode);
+        case TYPEOF:
+            return leaveTYPEOF(unaryNode);
+        case VOID:
+            return leaveVOID(unaryNode);
+        case DECPREFIX:
+        case DECPOSTFIX:
+        case INCPREFIX:
+        case INCPOSTFIX:
+            return leaveDECINC(unaryNode);
+        default:
+            return super.leave(unaryNode);
+        }
+    }
+
+    @Override
+    public final Node enter(final BinaryNode binaryNode) {
+        switch (binaryNode.tokenType()) {
+        case ADD:
+            return enterADD(binaryNode);
+        case AND:
+            return enterAND(binaryNode);
+        case ASSIGN:
+            return enterASSIGN(binaryNode);
+        case ASSIGN_ADD:
+            return enterASSIGN_ADD(binaryNode);
+        case ASSIGN_BIT_AND:
+            return enterASSIGN_BIT_AND(binaryNode);
+        case ASSIGN_BIT_OR:
+            return enterASSIGN_BIT_OR(binaryNode);
+        case ASSIGN_BIT_XOR:
+            return enterASSIGN_BIT_XOR(binaryNode);
+        case ASSIGN_DIV:
+            return enterASSIGN_DIV(binaryNode);
+        case ASSIGN_MOD:
+            return enterASSIGN_MOD(binaryNode);
+        case ASSIGN_MUL:
+            return enterASSIGN_MUL(binaryNode);
+        case ASSIGN_SAR:
+            return enterASSIGN_SAR(binaryNode);
+        case ASSIGN_SHL:
+            return enterASSIGN_SHL(binaryNode);
+        case ASSIGN_SHR:
+            return enterASSIGN_SHR(binaryNode);
+        case ASSIGN_SUB:
+            return enterASSIGN_SUB(binaryNode);
+        case BIND:
+            return enterBIND(binaryNode);
+         case BIT_AND:
+            return enterBIT_AND(binaryNode);
+        case BIT_OR:
+            return enterBIT_OR(binaryNode);
+        case BIT_XOR:
+            return enterBIT_XOR(binaryNode);
+        case COMMARIGHT:
+            return enterCOMMARIGHT(binaryNode);
+        case COMMALEFT:
+            return enterCOMMALEFT(binaryNode);
+        case DIV:
+            return enterDIV(binaryNode);
+        case EQ:
+            return enterEQ(binaryNode);
+        case EQ_STRICT:
+            return enterEQ_STRICT(binaryNode);
+        case GE:
+            return enterGE(binaryNode);
+        case GT:
+            return enterGT(binaryNode);
+        case IN:
+            return enterIN(binaryNode);
+        case INSTANCEOF:
+            return enterINSTANCEOF(binaryNode);
+        case LE:
+            return enterLE(binaryNode);
+        case LT:
+            return enterLT(binaryNode);
+        case MOD:
+            return enterMOD(binaryNode);
+        case MUL:
+            return enterMUL(binaryNode);
+        case NE:
+            return enterNE(binaryNode);
+        case NE_STRICT:
+            return enterNE_STRICT(binaryNode);
+        case OR:
+            return enterOR(binaryNode);
+        case SAR:
+            return enterSAR(binaryNode);
+        case SHL:
+            return enterSHL(binaryNode);
+        case SHR:
+            return enterSHR(binaryNode);
+        case SUB:
+            return enterSUB(binaryNode);
+        default:
+            return super.enter(binaryNode);
+        }
+    }
+
+    @Override
+    public final Node leave(final BinaryNode binaryNode) {
+        switch (binaryNode.tokenType()) {
+        case ADD:
+            return leaveADD(binaryNode);
+        case AND:
+            return leaveAND(binaryNode);
+        case ASSIGN:
+            return leaveASSIGN(binaryNode);
+        case ASSIGN_ADD:
+            return leaveASSIGN_ADD(binaryNode);
+        case ASSIGN_BIT_AND:
+            return leaveASSIGN_BIT_AND(binaryNode);
+        case ASSIGN_BIT_OR:
+            return leaveASSIGN_BIT_OR(binaryNode);
+        case ASSIGN_BIT_XOR:
+            return leaveASSIGN_BIT_XOR(binaryNode);
+        case ASSIGN_DIV:
+            return leaveASSIGN_DIV(binaryNode);
+        case ASSIGN_MOD:
+            return leaveASSIGN_MOD(binaryNode);
+        case ASSIGN_MUL:
+            return leaveASSIGN_MUL(binaryNode);
+        case ASSIGN_SAR:
+            return leaveASSIGN_SAR(binaryNode);
+        case ASSIGN_SHL:
+            return leaveASSIGN_SHL(binaryNode);
+        case ASSIGN_SHR:
+            return leaveASSIGN_SHR(binaryNode);
+        case ASSIGN_SUB:
+            return leaveASSIGN_SUB(binaryNode);
+        case BIND:
+            return leaveBIND(binaryNode);
+        case BIT_AND:
+            return leaveBIT_AND(binaryNode);
+        case BIT_OR:
+            return leaveBIT_OR(binaryNode);
+        case BIT_XOR:
+            return leaveBIT_XOR(binaryNode);
+        case COMMARIGHT:
+            return leaveCOMMARIGHT(binaryNode);
+        case COMMALEFT:
+            return leaveCOMMALEFT(binaryNode);
+        case DIV:
+            return leaveDIV(binaryNode);
+        case EQ:
+            return leaveEQ(binaryNode);
+        case EQ_STRICT:
+            return leaveEQ_STRICT(binaryNode);
+        case GE:
+            return leaveGE(binaryNode);
+        case GT:
+            return leaveGT(binaryNode);
+        case IN:
+            return leaveIN(binaryNode);
+        case INSTANCEOF:
+            return leaveINSTANCEOF(binaryNode);
+        case LE:
+            return leaveLE(binaryNode);
+        case LT:
+            return leaveLT(binaryNode);
+        case MOD:
+            return leaveMOD(binaryNode);
+        case MUL:
+            return leaveMUL(binaryNode);
+        case NE:
+            return leaveNE(binaryNode);
+        case NE_STRICT:
+            return leaveNE_STRICT(binaryNode);
+        case OR:
+            return leaveOR(binaryNode);
+        case SAR:
+            return leaveSAR(binaryNode);
+        case SHL:
+            return leaveSHL(binaryNode);
+        case SHR:
+            return leaveSHR(binaryNode);
+        case SUB:
+            return leaveSUB(binaryNode);
+        default:
+            return super.leave(binaryNode);
+        }
+    }
+
+    /*
+    @Override
+    public Node enter(final TernaryNode ternaryNode) {
+        return enterDefault(ternaryNode);
+    }
+
+    @Override
+    public Node leave(final TernaryNode ternaryNode) {
+        return leaveDefault(ternaryNode);
+    }*/
+
+    /*
+     * Unary entries and exists.
+     */
+
+    /**
+     * Unary enter - callback for entering a unary +
+     *
+     * @param  unaryNode the node
+     * @return processed node
+     */
+    public Node enterADD(final UnaryNode unaryNode) {
+        return enterDefault(unaryNode);
+    }
+
+    /**
+     * Unary leave - callback for leaving a unary +
+     *
+     * @param  unaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+     public Node leaveADD(final UnaryNode unaryNode) {
+        return leaveDefault(unaryNode);
+    }
+
+    /**
+     * Unary enter - callback for entering a ~ operator
+     *
+     * @param  unaryNode the node
+     * @return processed node
+     */
+    public Node enterBIT_NOT(final UnaryNode unaryNode) {
+        return enterDefault(unaryNode);
+    }
+
+    /**
+     * Unary leave - callback for leaving a unary ~
+     *
+     * @param  unaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leaveBIT_NOT(final UnaryNode unaryNode) {
+        return leaveDefault(unaryNode);
+    }
+
+    /**
+     * Unary enter - callback for entering a conversion
+     *
+     * @param  unaryNode the node
+     * @return processed node
+     */
+    public Node enterCONVERT(final UnaryNode unaryNode) {
+        return enterDefault(unaryNode);
+    }
+
+    /**
+     * Unary leave - callback for leaving a conversion
+     *
+     * @param  unaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leaveCONVERT(final UnaryNode unaryNode) {
+        return leaveDefault(unaryNode);
+    }
+
+    /**
+     * Unary enter - callback for entering a ++ or -- operator
+     *
+     * @param  unaryNode the node
+     * @return processed node
+     */
+    public Node enterDECINC(final UnaryNode unaryNode) {
+        return enterDefault(unaryNode);
+    }
+
+    /**
+     * Unary leave - callback for leaving a ++ or -- operator
+     *
+     * @param  unaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+     public Node leaveDECINC(final UnaryNode unaryNode) {
+        return leaveDefault(unaryNode);
+    }
+
+    /**
+     * Unary enter - callback for entering a delete operator
+     *
+     * @param  unaryNode the node
+     * @return processed node
+     */
+    public Node enterDELETE(final UnaryNode unaryNode) {
+        return enterDefault(unaryNode);
+    }
+
+    /**
+     * Unary leave - callback for leaving a delete operator
+     *
+     * @param  unaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+     public Node leaveDELETE(final UnaryNode unaryNode) {
+        return leaveDefault(unaryNode);
+    }
+
+    /**
+     * Unary enter - callback for entering a discard operator
+     *
+     * @param  unaryNode the node
+     * @return processed node
+     */
+    public Node enterDISCARD(final UnaryNode unaryNode) {
+        return enterDefault(unaryNode);
+    }
+
+    /**
+     * Unary leave - callback for leaving a discard operator
+     *
+     * @param  unaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+     public Node leaveDISCARD(final UnaryNode unaryNode) {
+        return leaveDefault(unaryNode);
+    }
+
+    /**
+     * Unary enter - callback for entering a new operator
+     *
+     * @param  unaryNode the node
+     * @return processed node
+     */
+    public Node enterNEW(final UnaryNode unaryNode) {
+        return enterDefault(unaryNode);
+    }
+
+    /**
+     * Unary leave - callback for leaving a new operator
+     *
+     * @param  unaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+     public Node leaveNEW(final UnaryNode unaryNode) {
+        return leaveDefault(unaryNode);
+    }
+
+    /**
+     * Unary enter - callback for entering a ! operator
+     *
+     * @param  unaryNode the node
+     * @return processed node
+     */
+    public Node enterNOT(final UnaryNode unaryNode) {
+        return enterDefault(unaryNode);
+    }
+
+    /**
+     * Unary leave - callback for leaving a ! operator
+     *
+     * @param  unaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+     public Node leaveNOT(final UnaryNode unaryNode) {
+        return leaveDefault(unaryNode);
+    }
+
+    /**
+     * Unary enter - callback for entering a unary -
+     *
+     * @param  unaryNode the node
+     * @return processed node
+     */
+    public Node enterSUB(final UnaryNode unaryNode) {
+        return enterDefault(unaryNode);
+    }
+
+    /**
+     * Unary leave - callback for leaving a unary -
+     *
+     * @param  unaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leaveSUB(final UnaryNode unaryNode) {
+        return leaveDefault(unaryNode);
+    }
+
+    /**
+     * Unary enter - callback for entering a typeof
+     *
+     * @param  unaryNode the node
+     * @return processed node
+     */
+    public Node enterTYPEOF(final UnaryNode unaryNode) {
+        return enterDefault(unaryNode);
+    }
+
+    /**
+     * Unary leave - callback for leaving a typeof operator
+     *
+     * @param  unaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+     public Node leaveTYPEOF(final UnaryNode unaryNode) {
+        return leaveDefault(unaryNode);
+    }
+
+    /**
+     * Unary enter - callback for entering a void
+     *
+     * @param  unaryNode the node
+     * @return processed node
+     */
+    public Node enterVOID(final UnaryNode unaryNode) {
+        return enterDefault(unaryNode);
+    }
+
+    /**
+     * Unary leave - callback for leaving a void
+     *
+     * @param  unaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+     public Node leaveVOID(final UnaryNode unaryNode) {
+        return leaveDefault(unaryNode);
+    }
+
+    /**
+     * Binary enter - callback for entering + operator
+     *
+     * @param  binaryNode the node
+     * @return processed node
+     */
+    public Node enterADD(final BinaryNode binaryNode) {
+        return enterDefault(binaryNode);
+    }
+
+    /**
+     * Binary leave - callback for leaving a + operator
+     *
+     * @param  binaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+     public Node leaveADD(final BinaryNode binaryNode) {
+        return leaveDefault(binaryNode);
+    }
+
+    /**
+     * Binary enter - callback for entering && operator
+     *
+     * @param  binaryNode the node
+     * @return processed node
+     */
+    public Node enterAND(final BinaryNode binaryNode) {
+        return enterDefault(binaryNode);
+    }
+
+    /**
+     * Binary leave - callback for leaving a && operator
+     *
+     * @param  binaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leaveAND(final BinaryNode binaryNode) {
+        return leaveDefault(binaryNode);
+    }
+
+    /**
+     * Binary enter - callback for entering an assignment
+     *
+     * @param  binaryNode the node
+     * @return processed node
+     */
+    public Node enterASSIGN(final BinaryNode binaryNode) {
+        return enterDefault(binaryNode);
+    }
+
+    /**
+     * Binary leave - callback for leaving an assignment
+     *
+     * @param  binaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leaveASSIGN(final BinaryNode binaryNode) {
+        return leaveDefault(binaryNode);
+    }
+
+    /**
+     * Binary enter - callback for entering += operator
+     *
+     * @param  binaryNode the node
+     * @return processed node
+     */
+    public Node enterASSIGN_ADD(final BinaryNode binaryNode) {
+        return enterDefault(binaryNode);
+    }
+
+    /**
+     * Binary leave - callback for leaving a += operator
+     *
+     * @param  binaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leaveASSIGN_ADD(final BinaryNode binaryNode) {
+        return leaveDefault(binaryNode);
+    }
+
+    /**
+     * Binary enter - callback for entering &= operator
+     *
+     * @param  binaryNode the node
+     * @return processed node
+     */
+    public Node enterASSIGN_BIT_AND(final BinaryNode binaryNode) {
+        return enterDefault(binaryNode);
+    }
+
+    /**
+     * Binary leave - callback for leaving a &= operator
+     *
+     * @param  binaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leaveASSIGN_BIT_AND(final BinaryNode binaryNode) {
+        return leaveDefault(binaryNode);
+    }
+
+    /**
+     * Binary enter - callback for entering |= operator
+     *
+     * @param  binaryNode the node
+     * @return processed node
+     */
+    public Node enterASSIGN_BIT_OR(final BinaryNode binaryNode) {
+        return enterDefault(binaryNode);
+    }
+
+    /**
+     * Binary leave - callback for leaving a |= operator
+     *
+     * @param  binaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leaveASSIGN_BIT_OR(final BinaryNode binaryNode) {
+        return leaveDefault(binaryNode);
+    }
+
+    /**
+     * Binary enter - callback for entering ^= operator
+     *
+     * @param  binaryNode the node
+     * @return processed node
+     */
+    public Node enterASSIGN_BIT_XOR(final BinaryNode binaryNode) {
+        return enterDefault(binaryNode);
+    }
+
+    /**
+     * Binary leave - callback for leaving a ^= operator
+     *
+     * @param  binaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leaveASSIGN_BIT_XOR(final BinaryNode binaryNode) {
+        return leaveDefault(binaryNode);
+    }
+
+    /**
+     * Binary enter - callback for entering /= operator
+     *
+     * @param  binaryNode the node
+     * @return processed node
+     */
+    public Node enterASSIGN_DIV(final BinaryNode binaryNode) {
+        return enterDefault(binaryNode);
+    }
+
+    /**
+     * Binary leave - callback for leaving a /= operator
+     *
+     * @param  binaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leaveASSIGN_DIV(final BinaryNode binaryNode) {
+        return leaveDefault(binaryNode);
+    }
+
+    /**
+     * Binary enter - callback for entering %= operator
+     *
+     * @param  binaryNode the node
+     * @return processed node
+     */
+    public Node enterASSIGN_MOD(final BinaryNode binaryNode) {
+        return enterDefault(binaryNode);
+    }
+
+    /**
+     * Binary leave - callback for leaving a %= operator
+     *
+     * @param  binaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leaveASSIGN_MOD(final BinaryNode binaryNode) {
+        return leaveDefault(binaryNode);
+    }
+
+    /**
+     * Binary enter - callback for entering *= operator
+     *
+     * @param  binaryNode the node
+     * @return processed node
+     */
+    public Node enterASSIGN_MUL(final BinaryNode binaryNode) {
+        return enterDefault(binaryNode);
+    }
+
+    /**
+     * Binary leave - callback for leaving a *= operator
+     *
+     * @param  binaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leaveASSIGN_MUL(final BinaryNode binaryNode) {
+        return leaveDefault(binaryNode);
+    }
+
+    /**
+     * Binary enter - callback for entering >>= operator
+     *
+     * @param  binaryNode the node
+     * @return processed node
+     */
+    public Node enterASSIGN_SAR(final BinaryNode binaryNode) {
+        return enterDefault(binaryNode);
+    }
+
+    /**
+     * Binary leave - callback for leaving a >>= operator
+     *
+     * @param  binaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leaveASSIGN_SAR(final BinaryNode binaryNode) {
+        return leaveDefault(binaryNode);
+    }
+
+    /**
+     * Binary enter - callback for entering a <<= operator
+     *
+     * @param  binaryNode the node
+     * @return processed node
+     */
+    public Node enterASSIGN_SHL(final BinaryNode binaryNode) {
+        return enterDefault(binaryNode);
+    }
+
+    /**
+     * Binary leave - callback for leaving a <<= operator
+     *
+     * @param  binaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leaveASSIGN_SHL(final BinaryNode binaryNode) {
+        return leaveDefault(binaryNode);
+    }
+
+    /**
+     * Binary enter - callback for entering >>>= operator
+     *
+     * @param  binaryNode the node
+     * @return processed node
+     */
+    public Node enterASSIGN_SHR(final BinaryNode binaryNode) {
+        return enterDefault(binaryNode);
+    }
+
+    /**
+     * Binary leave - callback for leaving a >>>= operator
+     *
+     * @param  binaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leaveASSIGN_SHR(final BinaryNode binaryNode) {
+        return leaveDefault(binaryNode);
+    }
+
+    /**
+     * Binary enter - callback for entering -= operator
+     *
+     * @param  binaryNode the node
+     * @return processed node
+     */
+    public Node enterASSIGN_SUB(final BinaryNode binaryNode) {
+        return enterDefault(binaryNode);
+    }
+
+    /**
+     * Binary leave - callback for leaving a -= operator
+     *
+     * @param  binaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leaveASSIGN_SUB(final BinaryNode binaryNode) {
+        return leaveDefault(binaryNode);
+    }
+
+    /**
+     * Binary enter - callback for entering a bind operator
+     *
+     * @param  binaryNode the node
+     * @return processed node
+     */
+    public Node enterBIND(final BinaryNode binaryNode) {
+        return enterDefault(binaryNode);
+    }
+
+    /**
+     * Binary leave - callback for leaving a bind operator
+     *
+     * @param  binaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leaveBIND(final BinaryNode binaryNode) {
+        return leaveDefault(binaryNode);
+    }
+
+    /**
+     * Binary enter - callback for entering & operator
+     *
+     * @param  binaryNode the node
+     * @return processed node
+     */
+    public Node enterBIT_AND(final BinaryNode binaryNode) {
+        return enterDefault(binaryNode);
+    }
+
+    /**
+     * Binary leave - callback for leaving a & operator
+     *
+     * @param  binaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leaveBIT_AND(final BinaryNode binaryNode) {
+        return leaveDefault(binaryNode);
+    }
+
+    /**
+     * Binary enter - callback for entering | operator
+     *
+     * @param  binaryNode the node
+     * @return processed node
+     */
+    public Node enterBIT_OR(final BinaryNode binaryNode) {
+        return enterDefault(binaryNode);
+    }
+
+    /**
+     * Binary leave - callback for leaving a | operator
+     *
+     * @param  binaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leaveBIT_OR(final BinaryNode binaryNode) {
+        return leaveDefault(binaryNode);
+    }
+
+    /**
+     * Binary enter - callback for entering ^ operator
+     *
+     * @param  binaryNode the node
+     * @return processed node
+     */
+    public Node enterBIT_XOR(final BinaryNode binaryNode) {
+        return enterDefault(binaryNode);
+    }
+
+    /**
+     * Binary leave - callback for leaving a  operator
+     *
+     * @param  binaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leaveBIT_XOR(final BinaryNode binaryNode) {
+        return leaveDefault(binaryNode);
+    }
+
+    /**
+     * Binary enter - callback for entering comma left operator
+     * (a, b) where the result is a
+     *
+     * @param  binaryNode the node
+     * @return processed node
+     */
+    public Node enterCOMMALEFT(final BinaryNode binaryNode) {
+        return enterDefault(binaryNode);
+    }
+
+    /**
+     * Binary leave - callback for leaving a comma left operator
+     * (a, b) where the result is a
+     *
+     * @param  binaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leaveCOMMALEFT(final BinaryNode binaryNode) {
+        return leaveDefault(binaryNode);
+    }
+
+    /**
+     * Binary enter - callback for entering comma right operator
+     * (a, b) where the result is b
+     *
+     * @param  binaryNode the node
+     * @return processed node
+     */
+    public Node enterCOMMARIGHT(final BinaryNode binaryNode) {
+        return enterDefault(binaryNode);
+    }
+
+    /**
+     * Binary leave - callback for leaving a comma left operator
+     * (a, b) where the result is b
+     *
+     * @param  binaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leaveCOMMARIGHT(final BinaryNode binaryNode) {
+        return leaveDefault(binaryNode);
+    }
+
+    /**
+     * Binary enter - callback for entering a division
+     *
+     * @param  binaryNode the node
+     * @return processed node
+     */
+    public Node enterDIV(final BinaryNode binaryNode) {
+        return enterDefault(binaryNode);
+    }
+
+    /**
+     * Binary leave - callback for leaving a division
+     *
+     * @param  binaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leaveDIV(final BinaryNode binaryNode) {
+        return leaveDefault(binaryNode);
+    }
+
+    /**
+     * Binary enter - callback for entering == operator
+     *
+     * @param  binaryNode the node
+     * @return processed node
+     */
+    public Node enterEQ(final BinaryNode binaryNode) {
+        return enterDefault(binaryNode);
+    }
+
+    /**
+     * Binary leave - callback for leaving == operator
+     *
+     * @param  binaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leaveEQ(final BinaryNode binaryNode) {
+        return leaveDefault(binaryNode);
+    }
+
+    /**
+     * Binary enter - callback for entering === operator
+     *
+     * @param  binaryNode the node
+     * @return processed node
+     */
+    public Node enterEQ_STRICT(final BinaryNode binaryNode) {
+        return enterDefault(binaryNode);
+    }
+
+    /**
+     * Binary leave - callback for leaving === operator
+     *
+     * @param  binaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leaveEQ_STRICT(final BinaryNode binaryNode) {
+        return leaveDefault(binaryNode);
+    }
+
+    /**
+     * Binary enter - callback for entering >= operator
+     *
+     * @param  binaryNode the node
+     * @return processed node
+     */
+    public Node enterGE(final BinaryNode binaryNode) {
+        return enterDefault(binaryNode);
+    }
+
+    /**
+     * Binary leave - callback for leaving >= operator
+     *
+     * @param  binaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leaveGE(final BinaryNode binaryNode) {
+        return leaveDefault(binaryNode);
+    }
+
+    /**
+     * Binary enter - callback for entering > operator
+     *
+     * @param  binaryNode the node
+     * @return processed node
+     */
+    public Node enterGT(final BinaryNode binaryNode) {
+        return enterDefault(binaryNode);
+    }
+
+    /**
+     * Binary leave - callback for leaving > operator
+     *
+     * @param  binaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leaveGT(final BinaryNode binaryNode) {
+        return leaveDefault(binaryNode);
+    }
+
+    /**
+     * Binary enter - callback for entering in operator
+     *
+     * @param  binaryNode the node
+     * @return processed node
+     */
+    public Node enterIN(final BinaryNode binaryNode) {
+        return enterDefault(binaryNode);
+    }
+
+    /**
+     * Binary leave - callback for leaving in operator
+     *
+     * @param  binaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leaveIN(final BinaryNode binaryNode) {
+        return leaveDefault(binaryNode);
+    }
+
+    /**
+     * Binary enter - callback for entering instanceof operator
+     *
+     * @param  binaryNode the node
+     * @return processed node
+     */
+    public Node enterINSTANCEOF(final BinaryNode binaryNode) {
+        return enterDefault(binaryNode);
+    }
+
+    /**
+     * Binary leave - callback for leaving instanceof operator
+     *
+     * @param  binaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leaveINSTANCEOF(final BinaryNode binaryNode) {
+        return leaveDefault(binaryNode);
+    }
+
+    /**
+     * Binary enter - callback for entering <= operator
+     *
+     * @param  binaryNode the node
+     * @return processed node
+     */
+    public Node enterLE(final BinaryNode binaryNode) {
+        return enterDefault(binaryNode);
+    }
+
+    /**
+     * Binary leave - callback for leaving <= operator
+     *
+     * @param  binaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leaveLE(final BinaryNode binaryNode) {
+        return leaveDefault(binaryNode);
+    }
+
+    /**
+     * Binary enter - callback for entering < operator
+     *
+     * @param  binaryNode the node
+     * @return processed node
+     */
+    public Node enterLT(final BinaryNode binaryNode) {
+        return enterDefault(binaryNode);
+    }
+
+    /**
+     * Binary leave - callback for leaving < operator
+     *
+     * @param  binaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leaveLT(final BinaryNode binaryNode) {
+        return leaveDefault(binaryNode);
+    }
+    /**
+     * Binary enter - callback for entering % operator
+     *
+     * @param  binaryNode the node
+     * @return processed node
+     */
+    public Node enterMOD(final BinaryNode binaryNode) {
+        return enterDefault(binaryNode);
+    }
+
+    /**
+     * Binary leave - callback for leaving % operator
+     *
+     * @param  binaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leaveMOD(final BinaryNode binaryNode) {
+        return leaveDefault(binaryNode);
+    }
+
+    /**
+     * Binary enter - callback for entering * operator
+     *
+     * @param  binaryNode the node
+     * @return processed node
+     */
+    public Node enterMUL(final BinaryNode binaryNode) {
+        return enterDefault(binaryNode);
+    }
+
+    /**
+     * Binary leave - callback for leaving * operator
+     *
+     * @param  binaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leaveMUL(final BinaryNode binaryNode) {
+        return leaveDefault(binaryNode);
+    }
+
+    /**
+     * Binary enter - callback for entering != operator
+     *
+     * @param  binaryNode the node
+     * @return processed node
+     */
+    public Node enterNE(final BinaryNode binaryNode) {
+        return enterDefault(binaryNode);
+    }
+
+    /**
+     * Binary leave - callback for leaving != operator
+     *
+     * @param  binaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leaveNE(final BinaryNode binaryNode) {
+        return leaveDefault(binaryNode);
+    }
+
+    /**
+     * Binary enter - callback for entering a !== operator
+     *
+     * @param  binaryNode the node
+     * @return processed node
+     */
+    public Node enterNE_STRICT(final BinaryNode binaryNode) {
+        return enterDefault(binaryNode);
+    }
+
+    /**
+     * Binary leave - callback for leaving !== operator
+     *
+     * @param  binaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leaveNE_STRICT(final BinaryNode binaryNode) {
+        return leaveDefault(binaryNode);
+    }
+
+    /**
+     * Binary enter - callback for entering || operator
+     *
+     * @param  binaryNode the node
+     * @return processed node
+     */
+    public Node enterOR(final BinaryNode binaryNode) {
+        return enterDefault(binaryNode);
+    }
+
+    /**
+     * Binary leave - callback for leaving || operator
+     *
+     * @param  binaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leaveOR(final BinaryNode binaryNode) {
+        return leaveDefault(binaryNode);
+    }
+
+    /**
+     * Binary enter - callback for entering >> operator
+     *
+     * @param  binaryNode the node
+     * @return processed node
+     */
+    public Node enterSAR(final BinaryNode binaryNode) {
+        return enterDefault(binaryNode);
+    }
+
+    /**
+     * Binary leave - callback for leaving >> operator
+     *
+     * @param  binaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leaveSAR(final BinaryNode binaryNode) {
+        return leaveDefault(binaryNode);
+    }
+
+    /**
+     * Binary enter - callback for entering << operator
+     *
+     * @param  binaryNode the node
+     * @return processed node
+     */
+    public Node enterSHL(final BinaryNode binaryNode) {
+        return enterDefault(binaryNode);
+    }
+
+    /**
+     * Binary leave - callback for leaving << operator
+     *
+     * @param  binaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leaveSHL(final BinaryNode binaryNode) {
+        return leaveDefault(binaryNode);
+    }
+    /**
+     * Binary enter - callback for entering >>> operator
+     *
+     * @param  binaryNode the node
+     * @return processed node
+     */
+    public Node enterSHR(final BinaryNode binaryNode) {
+        return enterDefault(binaryNode);
+    }
+
+    /**
+     * Binary leave - callback for leaving >>> operator
+     *
+     * @param  binaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leaveSHR(final BinaryNode binaryNode) {
+        return leaveDefault(binaryNode);
+    }
+
+    /**
+     * Binary enter - callback for entering - operator
+     *
+     * @param  binaryNode the node
+     * @return processed node
+     */
+    public Node enterSUB(final BinaryNode binaryNode) {
+        return enterDefault(binaryNode);
+    }
+
+    /**
+     * Binary leave - callback for leaving - operator
+     *
+     * @param  binaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leaveSUB(final BinaryNode binaryNode) {
+        return leaveDefault(binaryNode);
+    }
+
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/visitor/NodeVisitor.java b/nashorn/src/jdk/nashorn/internal/ir/visitor/NodeVisitor.java
new file mode 100644
index 00000000000..9b9c1c825bd
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/ir/visitor/NodeVisitor.java
@@ -0,0 +1,882 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.ir.visitor;
+
+import jdk.nashorn.internal.codegen.CompileUnit;
+import jdk.nashorn.internal.codegen.MethodEmitter;
+import jdk.nashorn.internal.ir.AccessNode;
+import jdk.nashorn.internal.ir.BinaryNode;
+import jdk.nashorn.internal.ir.Block;
+import jdk.nashorn.internal.ir.BreakNode;
+import jdk.nashorn.internal.ir.CallNode;
+import jdk.nashorn.internal.ir.CaseNode;
+import jdk.nashorn.internal.ir.CatchNode;
+import jdk.nashorn.internal.ir.ContinueNode;
+import jdk.nashorn.internal.ir.DoWhileNode;
+import jdk.nashorn.internal.ir.EmptyNode;
+import jdk.nashorn.internal.ir.ExecuteNode;
+import jdk.nashorn.internal.ir.ForNode;
+import jdk.nashorn.internal.ir.FunctionNode;
+import jdk.nashorn.internal.ir.IdentNode;
+import jdk.nashorn.internal.ir.IfNode;
+import jdk.nashorn.internal.ir.IndexNode;
+import jdk.nashorn.internal.ir.LabelNode;
+import jdk.nashorn.internal.ir.LineNumberNode;
+import jdk.nashorn.internal.ir.LiteralNode;
+import jdk.nashorn.internal.ir.Node;
+import jdk.nashorn.internal.ir.ObjectNode;
+import jdk.nashorn.internal.ir.PropertyNode;
+import jdk.nashorn.internal.ir.ReferenceNode;
+import jdk.nashorn.internal.ir.ReturnNode;
+import jdk.nashorn.internal.ir.RuntimeNode;
+import jdk.nashorn.internal.ir.SplitNode;
+import jdk.nashorn.internal.ir.SwitchNode;
+import jdk.nashorn.internal.ir.TernaryNode;
+import jdk.nashorn.internal.ir.ThrowNode;
+import jdk.nashorn.internal.ir.TryNode;
+import jdk.nashorn.internal.ir.UnaryNode;
+import jdk.nashorn.internal.ir.VarNode;
+import jdk.nashorn.internal.ir.WhileNode;
+import jdk.nashorn.internal.ir.WithNode;
+
+/**
+ * Visitor used to navigate the IR.
+ */
+public abstract class NodeVisitor {
+    /** Current functionNode. */
+    private FunctionNode currentFunctionNode;
+
+    /** Current compile unit used for class generation. */
+    protected CompileUnit compileUnit;
+
+    /**
+     * Current method visitor used for method generation.
+     * <p>
+     * TODO: protected is just for convenience and readability, so that
+     * subclasses can directly use 'method' - might want to change that
+     */
+    protected MethodEmitter method;
+
+    /** Current block. */
+    private Block currentBlock;
+
+    /**
+     * Constructor.
+     */
+    public NodeVisitor() {
+        this(null, null);
+    }
+
+    /**
+     * Constructor
+     *
+     * @param compileUnit compile unit for this node visitor
+     * @param method method emitter for this node visitor
+     */
+    public NodeVisitor(final CompileUnit compileUnit, final MethodEmitter method) {
+        super();
+
+        this.compileUnit = compileUnit;
+        this.method      = method;
+    }
+
+    /**
+     * Override this method to do a double inheritance pattern, e.g. avoid
+     * using
+     * <p>
+     * if (x instanceof NodeTypeA) {
+     *    ...
+     * } else if (x instanceof NodeTypeB) {
+     *    ...
+     * } else {
+     *    ...
+     * }
+     * <p>
+     * Use a NodeVisitor instead, and this method contents forms the else case.
+     *
+     * @see NodeVisitor#leaveDefault(Node)
+     * @param node the node to visit
+     * @return the node
+     */
+    protected Node enterDefault(final Node node) {
+        return node;
+    }
+
+    /**
+     * Override this method to do a double inheritance pattern, e.g. avoid
+     * using
+     * <p>
+     * if (x instanceof NodeTypeA) {
+     *    ...
+     * } else if (x instanceof NodeTypeB) {
+     *    ...
+     * } else {
+     *    ...
+     * }
+     * <p>
+     * Use a NodeVisitor instead, and this method contents forms the else case.
+     *
+     * @see NodeVisitor#enterDefault(Node)
+     * @param node the node to visit
+     * @return the node
+     */
+    protected Node leaveDefault(final Node node) {
+        return node;
+    }
+
+    /**
+     * Callback for entering an AccessNode
+     *
+     * @param  accessNode the node
+     * @return processed node, null if traversal should end, null if traversal should end
+     */
+    public Node enter(final AccessNode accessNode) {
+        return enterDefault(accessNode);
+    }
+
+    /**
+     * Callback for entering an AccessNode
+     *
+     * @param  accessNode the node
+     * @return processed node, null if traversal should end
+     */
+    public Node leave(final AccessNode accessNode) {
+        return leaveDefault(accessNode);
+    }
+
+    /**
+     * Callback for entering a Block
+     *
+     * @param  block     the node
+     * @return processed node, null if traversal should end
+     */
+    public Node enter(final Block block) {
+        return enterDefault(block);
+    }
+
+    /**
+     * Callback for leaving a Block
+     *
+     * @param  block the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leave(final Block block) {
+        return leaveDefault(block);
+    }
+
+    /**
+     * Callback for entering a BinaryNode
+     *
+     * @param  binaryNode  the node
+     * @return processed   node
+     */
+    public Node enter(final BinaryNode binaryNode) {
+        return enterDefault(binaryNode);
+    }
+
+    /**
+     * Callback for leaving a BinaryNode
+     *
+     * @param  binaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leave(final BinaryNode binaryNode) {
+        return leaveDefault(binaryNode);
+    }
+
+    /**
+     * Callback for entering a BreakNode
+     *
+     * @param  breakNode the node
+     * @return processed node, null if traversal should end
+     */
+    public Node enter(final BreakNode breakNode) {
+        return enterDefault(breakNode);
+    }
+
+    /**
+     * Callback for leaving a BreakNode
+     *
+     * @param  breakNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leave(final BreakNode breakNode) {
+        return leaveDefault(breakNode);
+    }
+
+    /**
+     * Callback for entering a CallNode
+     *
+     * @param  callNode  the node
+     * @return processed node, null if traversal should end
+     */
+    public Node enter(final CallNode callNode) {
+        return enterDefault(callNode);
+    }
+
+    /**
+     * Callback for leaving a CallNode
+     *
+     * @param  callNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leave(final CallNode callNode) {
+        return leaveDefault(callNode);
+    }
+
+    /**
+     * Callback for entering a CaseNode
+     *
+     * @param  caseNode  the node
+     * @return processed node, null if traversal should end
+     */
+    public Node enter(final CaseNode caseNode) {
+        return enterDefault(caseNode);
+    }
+
+    /**
+     * Callback for leaving a CaseNode
+     *
+     * @param  caseNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leave(final CaseNode caseNode) {
+        return leaveDefault(caseNode);
+    }
+
+    /**
+     * Callback for entering a CatchNode
+     *
+     * @param  catchNode the node
+     * @return processed node, null if traversal should end
+     */
+    public Node enter(final CatchNode catchNode) {
+        return enterDefault(catchNode);
+    }
+
+    /**
+     * Callback for leaving a CatchNode
+     *
+     * @param  catchNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leave(final CatchNode catchNode) {
+        return leaveDefault(catchNode);
+    }
+
+    /**
+     * Callback for entering a ContinueNode
+     *
+     * @param  continueNode the node
+     * @return processed node, null if traversal should end
+     */
+    public Node enter(final ContinueNode continueNode) {
+        return enterDefault(continueNode);
+    }
+
+    /**
+     * Callback for leaving a ContinueNode
+     *
+     * @param  continueNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leave(final ContinueNode continueNode) {
+        return leaveDefault(continueNode);
+    }
+
+    /**
+     * Callback for entering a DoWhileNode
+     *
+     * @param  doWhileNode the node
+     * @return processed   node
+     */
+    public Node enter(final DoWhileNode doWhileNode) {
+        return enterDefault(doWhileNode);
+    }
+
+    /**
+     * Callback for leaving a DoWhileNode
+     *
+     * @param  doWhileNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leave(final DoWhileNode doWhileNode) {
+        return leaveDefault(doWhileNode);
+    }
+
+    /**
+     * Callback for entering an EmptyNode
+     *
+     * @param  emptyNode   the node
+     * @return processed   node
+     */
+    public Node enter(final EmptyNode emptyNode) {
+        return enterDefault(emptyNode);
+    }
+
+    /**
+     * Callback for leaving an EmptyNode
+     *
+     * @param  emptyNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leave(final EmptyNode emptyNode) {
+        return leaveDefault(emptyNode);
+    }
+
+    /**
+     * Callback for entering an ExecuteNode
+     *
+     * @param  executeNode the node
+     * @return processed node, null if traversal should end
+     */
+    public Node enter(final ExecuteNode executeNode) {
+        return enterDefault(executeNode);
+    }
+
+    /**
+     * Callback for leaving an ExecuteNode
+     *
+     * @param  executeNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leave(final ExecuteNode executeNode) {
+        return leaveDefault(executeNode);
+    }
+
+    /**
+     * Callback for entering a ForNode
+     *
+     * @param  forNode   the node
+     * @return processed node, null if traversal should end
+     */
+    public Node enter(final ForNode forNode) {
+        return enterDefault(forNode);
+    }
+
+    /**
+     * Callback for leaving a ForNode
+     *
+     * @param  forNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leave(final ForNode forNode) {
+        return leaveDefault(forNode);
+    }
+
+    /**
+     * Callback for entering a FunctionNode
+     *
+     * @param  functionNode the node
+     * @return processed    node
+     */
+    public Node enter(final FunctionNode functionNode) {
+        return enterDefault(functionNode);
+    }
+
+    /**
+     * Callback for leaving a FunctionNode
+     *
+     * @param  functionNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leave(final FunctionNode functionNode) {
+        return leaveDefault(functionNode);
+    }
+
+    /**
+     * Callback for entering an IdentNode
+     *
+     * @param  identNode the node
+     * @return processed node, null if traversal should end
+     */
+    public Node enter(final IdentNode identNode) {
+        return enterDefault(identNode);
+    }
+
+    /**
+     * Callback for leaving an IdentNode
+     *
+     * @param  identNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leave(final IdentNode identNode) {
+        return leaveDefault(identNode);
+    }
+
+    /**
+     * Callback for entering an IfNode
+     *
+     * @param  ifNode    the node
+     * @return processed node, null if traversal should end
+     */
+    public Node enter(final IfNode ifNode) {
+        return enterDefault(ifNode);
+    }
+
+    /**
+     * Callback for leaving an IfNode
+     *
+     * @param  ifNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leave(final IfNode ifNode) {
+        return leaveDefault(ifNode);
+    }
+
+    /**
+     * Callback for entering an IndexNode
+     *
+     * @param  indexNode  the node
+     * @return processed node, null if traversal should end
+     */
+    public Node enter(final IndexNode indexNode) {
+        return enterDefault(indexNode);
+    }
+
+    /**
+     * Callback for leaving an IndexNode
+     *
+     * @param  indexNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leave(final IndexNode indexNode) {
+        return leaveDefault(indexNode);
+    }
+
+    /**
+     * Callback for entering a LabelNode
+     *
+     * @param  labelNode the node
+     * @return processed node, null if traversal should end
+     */
+    public Node enter(final LabelNode labelNode) {
+        return enterDefault(labelNode);
+    }
+
+    /**
+     * Callback for leaving a LabelNode
+     *
+     * @param  labelNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leave(final LabelNode labelNode) {
+        return leaveDefault(labelNode);
+    }
+
+    /**
+     * Callback for entering a LineNumberNode
+     *
+     * @param  lineNumberNode the node
+     * @return processed node, null if traversal should end
+     */
+    public Node enter(final LineNumberNode lineNumberNode) {
+        return enterDefault(lineNumberNode);
+    }
+
+    /**
+     * Callback for leaving a LineNumberNode
+     *
+     * @param  lineNumberNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leave(final LineNumberNode lineNumberNode) {
+        return leaveDefault(lineNumberNode);
+    }
+
+    /**
+     * Callback for entering a LiteralNode
+     *
+     * @param  literalNode the node
+     * @return processed   node
+     */
+    @SuppressWarnings("rawtypes")
+    public Node enter(final LiteralNode literalNode) {
+        return enterDefault(literalNode);
+    }
+
+    /**
+     * Callback for leaving a LiteralNode
+     *
+     * @param  literalNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    @SuppressWarnings("rawtypes")
+    public Node leave(final LiteralNode literalNode) {
+        return leaveDefault(literalNode);
+    }
+
+    /**
+     * Callback for entering an ObjectNode
+     *
+     * @param  objectNode the node
+     * @return processed  node
+     */
+    public Node enter(final ObjectNode objectNode) {
+        return enterDefault(objectNode);
+    }
+
+    /**
+     * Callback for leaving an ObjectNode
+     *
+     * @param  objectNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leave(final ObjectNode objectNode) {
+        return leaveDefault(objectNode);
+    }
+
+    /**
+     * Callback for entering a PropertyNode
+     *
+     * @param  propertyNode the node
+     * @return processed node, null if traversal should end
+     */
+    public Node enter(final PropertyNode propertyNode) {
+        return enterDefault(propertyNode);
+    }
+
+    /**
+     * Callback for leaving a PropertyNode
+     *
+     * @param  propertyNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leave(final PropertyNode propertyNode) {
+        return leaveDefault(propertyNode);
+    }
+
+    /**
+     * Callback for entering a ReferenceNode
+     *
+     * @param  referenceNode the node
+     * @return processed node, null if traversal should end
+     */
+    public Node enter(final ReferenceNode referenceNode) {
+        return enterDefault(referenceNode);
+    }
+
+    /**
+     * Callback for leaving a ReferenceNode
+     *
+     * @param  referenceNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leave(final ReferenceNode referenceNode) {
+        return leaveDefault(referenceNode);
+    }
+
+    /**
+     * Callback for entering a ReturnNode
+     *
+     * @param  returnNode the node
+     * @return processed node, null if traversal should end
+     */
+    public Node enter(final ReturnNode returnNode) {
+        return enterDefault(returnNode);
+    }
+
+    /**
+     * Callback for leaving a ReturnNode
+     *
+     * @param  returnNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leave(final ReturnNode returnNode) {
+        return leaveDefault(returnNode);
+    }
+
+    /**
+     * Callback for entering a RuntimeNode
+     *
+     * @param  runtimeNode the node
+     * @return processed node, null if traversal should end
+     */
+    public Node enter(final RuntimeNode runtimeNode) {
+        return enterDefault(runtimeNode);
+    }
+
+    /**
+     * Callback for leaving a RuntimeNode
+     *
+     * @param  runtimeNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leave(final RuntimeNode runtimeNode) {
+        return leaveDefault(runtimeNode);
+    }
+
+    /**
+     * Callback for entering a SplitNode
+     *
+     * @param  splitNode the node
+     * @return processed node, null if traversal should end
+     */
+    public Node enter(final SplitNode splitNode) {
+        return enterDefault(splitNode);
+    }
+
+    /**
+     * Callback for leaving a SplitNode
+     *
+     * @param  splitNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leave(final SplitNode splitNode) {
+        return leaveDefault(splitNode);
+    }
+
+    /**
+     * Callback for entering a SwitchNode
+     *
+     * @param  switchNode the node
+     * @return processed node, null if traversal should end
+     */
+    public Node enter(final SwitchNode switchNode) {
+        return enterDefault(switchNode);
+    }
+
+    /**
+     * Callback for leaving a SwitchNode
+     *
+     * @param  switchNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leave(final SwitchNode switchNode) {
+        return leaveDefault(switchNode);
+    }
+
+    /**
+     * Callback for entering a TernaryNode
+     *
+     * @param  ternaryNode the node
+     * @return processed node, null if traversal should end
+     */
+    public Node enter(final TernaryNode ternaryNode) {
+        return enterDefault(ternaryNode);
+    }
+
+    /**
+     * Callback for leaving a TernaryNode
+     *
+     * @param  ternaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leave(final TernaryNode ternaryNode) {
+        return leaveDefault(ternaryNode);
+    }
+
+    /**
+     * Callback for entering a ThrowNode
+     *
+     * @param  throwNode the node
+     * @return processed node, null if traversal should end
+     */
+    public Node enter(final ThrowNode throwNode) {
+        return enterDefault(throwNode);
+    }
+
+    /**
+     * Callback for leaving a ThrowNode
+     *
+     * @param  throwNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leave(final ThrowNode throwNode) {
+        return leaveDefault(throwNode);
+    }
+
+    /**
+     * Callback for entering a TryNode
+     *
+     * @param  tryNode the node
+     * @return processed node, null if traversal should end
+     */
+    public Node enter(final TryNode tryNode) {
+        return enterDefault(tryNode);
+    }
+
+    /**
+     * Callback for leaving a TryNode
+     *
+     * @param  tryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leave(final TryNode tryNode) {
+        return leaveDefault(tryNode);
+    }
+
+    /**
+     * Callback for entering a UnaryNode
+     *
+     * @param  unaryNode the node
+     * @return processed node, null if traversal should end
+     */
+    public Node enter(final UnaryNode unaryNode) {
+        return enterDefault(unaryNode);
+    }
+
+    /**
+     * Callback for leaving a UnaryNode
+     *
+     * @param  unaryNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leave(final UnaryNode unaryNode) {
+        return leaveDefault(unaryNode);
+    }
+
+    /**
+     * Callback for entering a VarNode
+     *
+     * @param  varNode   the node
+     * @return processed node, null if traversal should end
+     */
+    public Node enter(final VarNode varNode) {
+        return enterDefault(varNode);
+    }
+
+    /**
+     * Callback for leaving a VarNode
+     *
+     * @param  varNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leave(final VarNode varNode) {
+        return leaveDefault(varNode);
+    }
+
+    /**
+     * Callback for entering a WhileNode
+     *
+     * @param  whileNode the node
+     * @return processed node, null if traversal should end
+     */
+    public Node enter(final WhileNode whileNode) {
+        return enterDefault(whileNode);
+    }
+
+    /**
+     * Callback for leaving a WhileNode
+     *
+     * @param  whileNode the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leave(final WhileNode whileNode) {
+        return leaveDefault(whileNode);
+    }
+
+    /**
+     * Callback for entering a WithNode
+     *
+     * @param  withNode  the node
+     * @return processed node, null if traversal should end
+     */
+    public Node enter(final WithNode withNode) {
+        return enterDefault(withNode);
+    }
+
+    /**
+     * Callback for leaving a WithNode
+     *
+     * @param  withNode  the node
+     * @return processed node, which will replace the original one, or the original node
+     */
+    public Node leave(final WithNode withNode) {
+        return leaveDefault(withNode);
+    }
+
+    /**
+     * Get the current function node for this NodeVisitor
+     * @see FunctionNode
+     * @return the function node being visited
+     */
+    public FunctionNode getCurrentFunctionNode() {
+        return currentFunctionNode;
+    }
+
+    /**
+     * Reset the current function node being visited for this NodeVisitor
+     * @see FunctionNode
+     * @param currentFunctionNode a new function node to traverse
+     */
+    public void setCurrentFunctionNode(final FunctionNode currentFunctionNode) {
+        this.currentFunctionNode = currentFunctionNode;
+    }
+
+    /**
+     * Get the current compile unit for this NodeVisitor
+     * @see CompileUnit
+     * @return a compile unit, or null if not a compiling NodeVisitor
+     */
+    public CompileUnit getCurrentCompileUnit() {
+        return compileUnit;
+    }
+
+    /**
+     * Set the current compile unit for this NodeVisitor
+     * @see CompileUnit
+     * @param compileUnit a new compile unit
+     */
+    public void setCurrentCompileUnit(final CompileUnit compileUnit) {
+        this.compileUnit = compileUnit;
+    }
+
+    /**
+     * Get the current method emitter for this NodeVisitor
+     * @see MethodEmitter
+     * @return the method emitter
+     */
+    public MethodEmitter getCurrentMethodEmitter() {
+        return method;
+    }
+
+    /**
+     * Reset the current method emitter for this NodeVisitor
+     * @see MethodEmitter
+     * @param method a new method emitter
+     */
+    public void setCurrentMethodEmitter(final MethodEmitter method) {
+        this.method = method;
+    }
+
+    /**
+     * Get the current Block being traversed for this NodeVisitor
+     * @return the current block
+     */
+    public Block getCurrentBlock() {
+        return currentBlock;
+    }
+
+    /**
+     * Reset the Block to be traversed for this NodeVisitor
+     * @param currentBlock the new current block
+     */
+    public void setCurrentBlock(final Block currentBlock) {
+        this.currentBlock = currentBlock;
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java b/nashorn/src/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java
new file mode 100644
index 00000000000..0ad759e7a92
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java
@@ -0,0 +1,210 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static jdk.nashorn.internal.runtime.ScriptRuntime.sameValue;
+
+import java.util.Objects;
+import jdk.nashorn.internal.objects.annotations.Property;
+import jdk.nashorn.internal.objects.annotations.ScriptClass;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.PropertyDescriptor;
+import jdk.nashorn.internal.runtime.ScriptFunction;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
+
+/**
+ * Accessor Property descriptor is used to represent attributes an object property
+ * that either has a getter or a setter.
+ *
+ * See ECMA 8.10 The Property Descriptor and Property Identifier Specification Types
+ *
+ */
+@ScriptClass("AccessorPropertyDescriptor")
+public final class AccessorPropertyDescriptor extends ScriptObject implements PropertyDescriptor {
+    /** is this property configurable? */
+    @Property
+    public Object configurable;
+
+    /** is this property enumerable? */
+    @Property
+    public Object enumerable;
+
+    /** getter for property */
+    @Property
+    public Object get;
+
+    /** setter for property */
+    @Property
+    public Object set;
+
+    AccessorPropertyDescriptor() {
+        this(false, false, UNDEFINED, UNDEFINED);
+    }
+
+    AccessorPropertyDescriptor(final boolean configurable, final boolean enumerable, final Object get, final Object set) {
+        this.configurable = configurable;
+        this.enumerable   = enumerable;
+        this.get          = get;
+        this.set          = set;
+        setProto(Global.objectPrototype());
+    }
+
+    @Override
+    public boolean isConfigurable() {
+        return JSType.toBoolean(configurable);
+    }
+
+    @Override
+    public boolean isEnumerable() {
+        return JSType.toBoolean(enumerable);
+    }
+
+    @Override
+    public boolean isWritable() {
+        // Not applicable for this. But simplifies flag calculations.
+        return true;
+    }
+
+    @Override
+    public Object getValue() {
+        throw new UnsupportedOperationException("value");
+    }
+
+    @Override
+    public ScriptFunction getGetter() {
+        return (get instanceof ScriptFunction) ? (ScriptFunction)get : null;
+    }
+
+    @Override
+    public ScriptFunction getSetter() {
+        return (set instanceof ScriptFunction) ? (ScriptFunction)set : null;
+    }
+
+    @Override
+    public void setConfigurable(final boolean flag) {
+        this.configurable = flag;
+    }
+
+    @Override
+    public void setEnumerable(final boolean flag) {
+        this.enumerable = flag;
+    }
+
+    @Override
+    public void setWritable(final boolean flag) {
+        throw new UnsupportedOperationException("set writable");
+    }
+
+    @Override
+    public void setValue(final Object value) {
+        throw new UnsupportedOperationException("set value");
+    }
+
+    @Override
+    public void setGetter(final Object getter) {
+        this.get = getter;
+    }
+
+    @Override
+    public void setSetter(final Object setter) {
+        this.set = setter;
+    }
+
+    @Override
+    public PropertyDescriptor fillFrom(final ScriptObject sobj) {
+        final boolean strict = getContext()._strict;
+
+        if (sobj.has(CONFIGURABLE)) {
+            this.configurable = JSType.toBoolean(sobj.get(CONFIGURABLE));
+        } else {
+            delete(CONFIGURABLE, strict);
+        }
+
+        if (sobj.has(ENUMERABLE)) {
+            this.enumerable = JSType.toBoolean(sobj.get(ENUMERABLE));
+        } else {
+            delete(ENUMERABLE, strict);
+        }
+
+        if (sobj.has(GET)) {
+            final Object getter = sobj.get(GET);
+            if (getter == UNDEFINED || getter instanceof ScriptFunction) {
+                this.get = getter;
+            } else {
+                typeError(Global.instance(), "not.a.function", ScriptRuntime.safeToString(getter));
+            }
+        } else {
+            delete(GET, strict);
+        }
+
+        if (sobj.has(SET)) {
+            final Object setter = sobj.get(SET);
+            if (setter == UNDEFINED || setter instanceof ScriptFunction) {
+                this.set = setter;
+            } else {
+                typeError(Global.instance(), "not.a.function", ScriptRuntime.safeToString(setter));
+            }
+        } else {
+            delete(SET, strict);
+        }
+
+        return this;
+    }
+
+    @Override
+    public int type() {
+        return ACCESSOR;
+    }
+
+    @Override
+    public boolean equals(final Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (! (obj instanceof AccessorPropertyDescriptor)) {
+            return false;
+        }
+
+        final AccessorPropertyDescriptor other = (AccessorPropertyDescriptor)obj;
+        return sameValue(configurable, other.configurable) &&
+               sameValue(enumerable, other.enumerable) &&
+               sameValue(get, other.get) &&
+               sameValue(set, other.set);
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 7;
+        hash = 41 * hash + Objects.hashCode(this.configurable);
+        hash = 41 * hash + Objects.hashCode(this.enumerable);
+        hash = 41 * hash + Objects.hashCode(this.get);
+        hash = 41 * hash + Objects.hashCode(this.set);
+        return hash;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/ArrayBufferView.java b/nashorn/src/jdk/nashorn/internal/objects/ArrayBufferView.java
new file mode 100644
index 00000000000..35616a11f0d
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/ArrayBufferView.java
@@ -0,0 +1,370 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+import jdk.nashorn.internal.objects.annotations.Attribute;
+import jdk.nashorn.internal.objects.annotations.Getter;
+import jdk.nashorn.internal.objects.annotations.ScriptClass;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
+import jdk.nashorn.internal.runtime.arrays.ArrayData;
+
+@ScriptClass("ArrayBufferView")
+abstract class ArrayBufferView extends ScriptObject {
+
+    ArrayBufferView(final NativeArrayBuffer buffer, final int byteOffset, final int elementLength) {
+        checkConstructorArgs(buffer, byteOffset, elementLength);
+        this.setProto(getPrototype());
+        this.setArray(factory().createArrayData(buffer, byteOffset, elementLength));
+    }
+
+    private void checkConstructorArgs(final NativeArrayBuffer buffer, final int byteOffset, final int elementLength) {
+        if (byteOffset < 0 || elementLength < 0) {
+            throw new RuntimeException("byteOffset or length must not be negative");
+        }
+        if (byteOffset + elementLength * bytesPerElement() > buffer.getByteLength()) {
+            throw new RuntimeException("byteOffset + byteLength out of range");
+        }
+        if (byteOffset % bytesPerElement() != 0) {
+            throw new RuntimeException("byteOffset must be a multiple of the element size");
+        }
+    }
+
+    private int bytesPerElement() {
+        return factory().bytesPerElement;
+    }
+
+    @Getter(attributes = Attribute.NOT_ENUMERABLE | Attribute.NOT_WRITABLE | Attribute.NOT_CONFIGURABLE)
+    public static Object BYTES_PER_ELEMENT(final Object self) {
+        return ((ArrayBufferView)self).bytesPerElement();
+    }
+
+    @Getter(attributes = Attribute.NOT_ENUMERABLE | Attribute.NOT_WRITABLE | Attribute.NOT_CONFIGURABLE)
+    public static Object buffer(final Object self) {
+        return ((ArrayDataImpl)((ArrayBufferView)self).getArray()).buffer;
+    }
+
+    @Getter(attributes = Attribute.NOT_ENUMERABLE | Attribute.NOT_WRITABLE | Attribute.NOT_CONFIGURABLE)
+    public static Object byteOffset(final Object self) {
+        return ((ArrayDataImpl)((ArrayBufferView)self).getArray()).byteOffset;
+    }
+
+    @Getter(attributes = Attribute.NOT_ENUMERABLE | Attribute.NOT_WRITABLE | Attribute.NOT_CONFIGURABLE)
+    public static Object byteLength(final Object self) {
+        final ArrayBufferView view = (ArrayBufferView)self;
+        return ((ArrayDataImpl)view.getArray()).elementLength * view.bytesPerElement();
+    }
+
+    @Getter(attributes = Attribute.NOT_ENUMERABLE | Attribute.NOT_WRITABLE | Attribute.NOT_CONFIGURABLE)
+    public static Object length(final Object self) {
+        return ((ArrayBufferView)self).elementLength();
+    }
+
+    @Override
+    public final Object getLength() {
+        return elementLength();
+    }
+
+    private int elementLength() {
+        return ((ArrayDataImpl)getArray()).elementLength;
+    }
+
+    protected static abstract class ArrayDataImpl extends ArrayData {
+        protected final NativeArrayBuffer buffer;
+        protected final int byteOffset;
+        private final int elementLength;
+
+        protected ArrayDataImpl(final NativeArrayBuffer buffer, final int byteOffset, final int elementLength) {
+            super(elementLength);
+            this.buffer = buffer;
+            this.byteOffset = byteOffset;
+            this.elementLength = elementLength;
+        }
+
+        @Override
+        public Object[] asObjectArray() {
+            final Object[] array = new Object[elementLength];
+            for (int i = 0; i < elementLength; i++) {
+                array[i] = getObjectImpl(i);
+            }
+            return array;
+        }
+
+        @Override
+        public ArrayData ensure(final long safeIndex) {
+            return this;
+        }
+
+        @Override
+        public void setLength(final long length) {
+            //empty?
+            //TODO is this right?
+        }
+
+        @Override
+        public ArrayData shrink(final long newLength) {
+            return this;
+        }
+
+        @Override
+        public ArrayData set(final int index, final Object value, final boolean strict) {
+            if (has(index)) {
+                setImpl(index, value);
+            }
+            return this;
+        }
+
+        @Override
+        public ArrayData set(final int index, final int value, final boolean strict) {
+            if (has(index)) {
+                setImpl(index, value);
+            }
+            return this;
+        }
+
+        @Override
+        public ArrayData set(final int index, final long value, final boolean strict) {
+            if (has(index)) {
+                setImpl(index, value);
+            }
+            return this;
+        }
+
+        @Override
+        public ArrayData set(final int index, final double value, final boolean strict) {
+            if (has(index)) {
+                setImpl(index, value);
+            }
+            return this;
+        }
+
+        @Override
+        public int getInt(final int index) {
+            return getIntImpl(index);
+        }
+
+        @Override
+        public long getLong(final int index) {
+            return getLongImpl(index);
+        }
+
+        @Override
+        public double getDouble(final int index) {
+            return getDoubleImpl(index);
+        }
+
+        @Override
+        public Object getObject(final int index) {
+            return getObjectImpl(index);
+        }
+
+        @Override
+        public boolean has(final int index) {
+            return index >= 0 && index < elementLength;
+        }
+
+        @Override
+        public boolean canDelete(final int index, final boolean strict) {
+            return false;
+        }
+
+        @Override
+        public boolean canDelete(final long fromIndex, final long toIndex, final boolean strict) {
+            return false;
+        }
+
+        @Override
+        public ArrayData delete(final int index) {
+            return this;
+        }
+
+        @Override
+        public ArrayData delete(final long fromIndex, final long toIndex) {
+            return this;
+        }
+
+        @Override
+        protected ArrayData convert(final Class<?> type) {
+            return this;
+        }
+
+        @Override
+        public void shiftLeft(final int by) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public ArrayData shiftRight(final int by) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public Object pop() {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public ArrayData slice(final long from, final long to) {
+            throw new UnsupportedOperationException();
+        }
+
+        protected abstract int getIntImpl(int key);
+
+        protected long getLongImpl(final int key) {
+            return getIntImpl(key);
+        }
+
+        protected double getDoubleImpl(final int key) {
+            return getIntImpl(key);
+        }
+
+        protected Object getObjectImpl(final int key) {
+            return getIntImpl(key);
+        }
+
+        protected abstract void setImpl(int key, int value);
+
+        protected void setImpl(final int key, final long value) {
+            setImpl(key, (int)value);
+        }
+
+        protected void setImpl(final int key, final double value) {
+            setImpl(key, JSType.toInt32(value));
+        }
+
+        protected void setImpl(final int key, final Object value) {
+            setImpl(key, JSType.toInt32(value));
+        }
+
+        protected abstract int byteIndex(int index);
+    }
+
+    protected static abstract class Factory {
+        final int bytesPerElement;
+
+        public Factory(final int bytesPerElement) {
+            this.bytesPerElement = bytesPerElement;
+        }
+
+        public final ArrayBufferView construct(final int elementLength) {
+            return construct(new NativeArrayBuffer(elementLength * bytesPerElement), 0, elementLength);
+        }
+
+        public abstract ArrayBufferView construct(NativeArrayBuffer buffer, int byteOffset, int elementLength);
+
+        public abstract ArrayData createArrayData(NativeArrayBuffer buffer, int byteOffset, int elementLength);
+    }
+
+    protected abstract Factory factory();
+
+    protected abstract ScriptObject getPrototype();
+
+    protected boolean isFloatArray() {
+        return false;
+    }
+
+    protected static ArrayBufferView constructorImpl(final Object[] args, final Factory factory) {
+        final Object arg0 = args.length != 0 ? args[0] : 0;
+        final ArrayBufferView dst;
+        final int length;
+        if (arg0 instanceof NativeArrayBuffer) {
+            // Constructor(ArrayBuffer buffer, optional unsigned long byteOffset, optional unsigned long length)
+            final NativeArrayBuffer buffer = (NativeArrayBuffer) arg0;
+            final int byteOffset = args.length > 1 ? JSType.toInt32(args[1]) : 0;
+            if (args.length > 2) {
+                length = JSType.toInt32(args[2]);
+            } else {
+                if ((buffer.getByteLength() - byteOffset) % factory.bytesPerElement != 0) {
+                    throw new RuntimeException("buffer.byteLength - byteOffset must be a multiple of the element size");
+                }
+                length = (buffer.getByteLength() - byteOffset) / factory.bytesPerElement;
+            }
+            return factory.construct(buffer, byteOffset, length);
+        } else if (arg0 instanceof ArrayBufferView) {
+            // Constructor(TypedArray array)
+            length = ((ArrayBufferView)arg0).elementLength();
+            dst = factory.construct(length);
+        } else if (arg0 instanceof NativeArray) {
+            // Constructor(type[] array)
+            length = (int) (((NativeArray) arg0).getArray().length() & 0x7fff_ffff);
+            dst = factory.construct(length);
+        } else {
+            // Constructor(unsigned long length)
+            length = JSType.toInt32(arg0);
+            return factory.construct(length);
+        }
+
+        copyElements(dst, length, (ScriptObject)arg0, 0);
+        return dst;
+    }
+
+    protected static Object setImpl(final Object self, final Object array, final Object offset0) {
+        final ArrayBufferView dest = ((ArrayBufferView)self);
+        final int length;
+        if (array instanceof ArrayBufferView) {
+            // void set(TypedArray array, optional unsigned long offset)
+            length = ((ArrayBufferView)array).elementLength();
+        } else if (array instanceof NativeArray) {
+            // void set(type[] array, optional unsigned long offset)
+            length = (int) (((NativeArray) array).getArray().length() & 0x7fff_ffff);
+        } else {
+            throw new RuntimeException("argument is not of array type");
+        }
+
+        final ScriptObject source = (ScriptObject) array;
+        final int offset = JSType.toInt32(offset0); // default=0
+
+        if (dest.elementLength() < length + offset || offset < 0) {
+            throw new RuntimeException("offset or array length out of bounds");
+        }
+
+        copyElements(dest, length, source, offset);
+
+        return ScriptRuntime.UNDEFINED;
+    }
+
+    private static void copyElements(final ArrayBufferView dest, final int length, final ScriptObject source, final int offset) {
+        if (!dest.isFloatArray()) {
+            for (int i = 0, j = offset; i < length; i++, j++) {
+                dest.set(j, source.getInt(i), false);
+            }
+        } else {
+            for (int i = 0, j = offset; i < length; i++, j++) {
+                dest.set(j, source.getDouble(i), false);
+            }
+        }
+    }
+
+    protected static Object subarrayImpl(final Object self, final Object begin0, final Object end0) {
+        final ArrayBufferView arrayView = ((ArrayBufferView)self);
+        final int elementLength = arrayView.elementLength();
+        final int begin = NativeArrayBuffer.adjustIndex(JSType.toInt32(begin0), elementLength);
+        final int end = NativeArrayBuffer.adjustIndex(end0 != ScriptRuntime.UNDEFINED ? JSType.toInt32(end0) : elementLength, elementLength);
+        final ArrayDataImpl arrayData = (ArrayDataImpl)arrayView.getArray();
+        return arrayView.factory().construct(arrayData.buffer, arrayData.byteIndex(begin), Math.max(end - begin, 0));
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/DataPropertyDescriptor.java b/nashorn/src/jdk/nashorn/internal/objects/DataPropertyDescriptor.java
new file mode 100644
index 00000000000..13863e59975
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/DataPropertyDescriptor.java
@@ -0,0 +1,197 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static jdk.nashorn.internal.runtime.ScriptRuntime.sameValue;
+
+import java.util.Objects;
+import jdk.nashorn.internal.objects.annotations.Property;
+import jdk.nashorn.internal.objects.annotations.ScriptClass;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.PropertyDescriptor;
+import jdk.nashorn.internal.runtime.ScriptFunction;
+import jdk.nashorn.internal.runtime.ScriptObject;
+
+/**
+ * Data Property descriptor is used to represent attributes an object property
+ * that has data value (instead of a getter or setter function).
+ *
+ * See ECMA 8.10 The Property Descriptor and Property Identifier Specification Types
+ *
+ */
+@ScriptClass("DataPropertyDescriptor")
+public final class DataPropertyDescriptor extends ScriptObject implements PropertyDescriptor {
+    /** is this property configurable */
+    @Property
+    public Object configurable;
+
+    /** is this property enumerable */
+    @Property
+    public Object enumerable;
+
+    /** is this property writable */
+    @Property
+    public Object writable;
+
+    /** value of this property */
+    @Property
+    public Object value;
+
+    DataPropertyDescriptor() {
+        this(false, false, false, UNDEFINED);
+    }
+
+    DataPropertyDescriptor(final boolean configurable, final boolean enumerable, final boolean writable, final Object value) {
+        this.configurable = configurable;
+        this.enumerable   = enumerable;
+        this.writable     = writable;
+        this.value        = value;
+        setProto(Global.objectPrototype());
+    }
+
+
+    @Override
+    public boolean isConfigurable() {
+        return JSType.toBoolean(configurable);
+    }
+
+    @Override
+    public boolean isEnumerable() {
+        return JSType.toBoolean(enumerable);
+    }
+
+    @Override
+    public boolean isWritable() {
+        return JSType.toBoolean(writable);
+    }
+
+    @Override
+    public Object getValue() {
+        return value;
+    }
+
+    @Override
+    public ScriptFunction getGetter() {
+        throw new UnsupportedOperationException("getter");
+    }
+
+    @Override
+    public ScriptFunction getSetter() {
+        throw new UnsupportedOperationException("setter");
+    }
+
+    @Override
+    public void setConfigurable(final boolean flag) {
+        this.configurable = flag;
+    }
+
+    @Override
+    public void setEnumerable(final boolean flag) {
+        this.enumerable = flag;
+    }
+
+    @Override
+    public void setWritable(final boolean flag) {
+        this.writable = flag;
+    }
+
+    @Override
+    public void setValue(final Object value) {
+        this.value = value;
+    }
+
+    @Override
+    public void setGetter(final Object getter) {
+        throw new UnsupportedOperationException("set getter");
+    }
+
+    @Override
+    public void setSetter(final Object setter) {
+        throw new UnsupportedOperationException("set setter");
+    }
+
+    @Override
+    public PropertyDescriptor fillFrom(final ScriptObject sobj) {
+        final boolean strict = getContext()._strict;
+        if (sobj.has(CONFIGURABLE)) {
+            this.configurable = JSType.toBoolean(sobj.get(CONFIGURABLE));
+        } else {
+            delete(CONFIGURABLE, strict);
+        }
+
+        if (sobj.has(ENUMERABLE)) {
+            this.enumerable = JSType.toBoolean(sobj.get(ENUMERABLE));
+        } else {
+            delete(ENUMERABLE, strict);
+        }
+
+        if (sobj.has(WRITABLE)) {
+            this.writable = JSType.toBoolean(sobj.get(WRITABLE));
+        } else {
+            delete(WRITABLE, strict);
+        }
+
+        if (sobj.has(VALUE)) {
+            this.value = sobj.get(VALUE);
+        } else {
+            delete(VALUE, strict);
+        }
+
+        return this;
+    }
+
+    @Override
+    public int type() {
+        return DATA;
+    }
+
+    @Override
+    public boolean equals(final Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (! (obj instanceof DataPropertyDescriptor)) {
+            return false;
+        }
+
+        final DataPropertyDescriptor other = (DataPropertyDescriptor)obj;
+        return sameValue(configurable, other.configurable) &&
+               sameValue(enumerable, other.enumerable) &&
+               sameValue(writable, other.writable) &&
+               sameValue(value, other.value);
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 5;
+        hash = 43 * hash + Objects.hashCode(this.configurable);
+        hash = 43 * hash + Objects.hashCode(this.enumerable);
+        hash = 43 * hash + Objects.hashCode(this.writable);
+        hash = 43 * hash + Objects.hashCode(this.value);
+        return hash;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/DateParser.java b/nashorn/src/jdk/nashorn/internal/objects/DateParser.java
new file mode 100644
index 00000000000..c5e17a86f7e
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/DateParser.java
@@ -0,0 +1,705 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+import static java.lang.Character.DECIMAL_DIGIT_NUMBER;
+import static java.lang.Character.LOWERCASE_LETTER;
+import static java.lang.Character.OTHER_PUNCTUATION;
+import static java.lang.Character.SPACE_SEPARATOR;
+import static java.lang.Character.UPPERCASE_LETTER;
+
+import java.util.HashMap;
+
+/**
+ * JavaScript date parser. This class first tries to parse a date string
+ * according to the extended ISO 8601 format specified in ES5 15.9.1.15.
+ * If that fails, it falls back to legacy mode in which it accepts a range
+ * of different formats.
+ *
+ * <p>This class is neither thread-safe nor reusable. Calling the
+ * <tt>parse()</tt> method more than once will yield undefined results.</p>
+ */
+public class DateParser {
+
+    /** Constant for index position of parsed year value. */
+    public final static int YEAR        = 0;
+    /** Constant for index position of parsed month value. */
+    public final static int MONTH       = 1;
+    /** Constant for index position of parsed day value. */
+    public final static int DAY         = 2;
+    /** Constant for index position of parsed hour value. */
+    public final static int HOUR        = 3;
+    /** Constant for index position of parsed minute value. */
+    public final static int MINUTE      = 4;
+    /** Constant for index position of parsed second value. */
+    public final static int SECOND      = 5;
+    /** Constant for index position of parsed millisecond value. */
+    public final static int MILLISECOND = 6;
+    /** Constant for index position of parsed time zone offset value. */
+    public final static int TIMEZONE    = 7;
+
+    private enum Token {
+        UNKNOWN, NUMBER, SEPARATOR, PARENTHESIS, NAME, SIGN, END
+    }
+
+    private final String string;
+    private final int length;
+    private final Integer[] fields;
+    private int pos = 0;
+    private Token token;
+    private int tokenLength;
+    private Name nameValue;
+    private int numValue;
+    private int currentField = YEAR;
+    private int yearSign = 0;
+    private boolean namedMonth = false;
+
+    private final static HashMap<String,Name> names = new HashMap<>();
+
+    static {
+        addName("monday", Name.DAY_OF_WEEK, 0);
+        addName("tuesday", Name.DAY_OF_WEEK, 0);
+        addName("wednesday", Name.DAY_OF_WEEK, 0);
+        addName("thursday", Name.DAY_OF_WEEK, 0);
+        addName("friday", Name.DAY_OF_WEEK, 0);
+        addName("saturday", Name.DAY_OF_WEEK, 0);
+        addName("sunday", Name.DAY_OF_WEEK, 0);
+        addName("january", Name.MONTH_NAME, 1);
+        addName("february", Name.MONTH_NAME, 2);
+        addName("march", Name.MONTH_NAME, 3);
+        addName("april", Name.MONTH_NAME, 4);
+        addName("may", Name.MONTH_NAME, 5);
+        addName("june", Name.MONTH_NAME, 6);
+        addName("july", Name.MONTH_NAME, 7);
+        addName("august", Name.MONTH_NAME, 8);
+        addName("september", Name.MONTH_NAME, 9);
+        addName("october", Name.MONTH_NAME, 10);
+        addName("november", Name.MONTH_NAME, 11);
+        addName("december", Name.MONTH_NAME, 12);
+        addName("am", Name.AM_PM, 0);
+        addName("pm", Name.AM_PM, 12);
+        addName("z", Name.TIMEZONE_ID, 0);
+        addName("gmt", Name.TIMEZONE_ID, 0);
+        addName("ut", Name.TIMEZONE_ID, 0);
+        addName("utc", Name.TIMEZONE_ID, 0);
+        addName("est", Name.TIMEZONE_ID, -5 * 60);
+        addName("edt", Name.TIMEZONE_ID, -4 * 60);
+        addName("cst", Name.TIMEZONE_ID, -6 * 60);
+        addName("cdt", Name.TIMEZONE_ID, -5 * 60);
+        addName("mst", Name.TIMEZONE_ID, -7 * 60);
+        addName("mdt", Name.TIMEZONE_ID, -6 * 60);
+        addName("pst", Name.TIMEZONE_ID, -8 * 60);
+        addName("pdt", Name.TIMEZONE_ID, -7 * 60);
+        addName("t", Name.TIME_SEPARATOR, 0);
+    }
+
+    /**
+     * Construct a new <tt>DateParser</tt> instance for parsing the given string.
+     * @param string the string to be parsed
+     */
+    public DateParser(final String string) {
+        this.string = string;
+        this.length = string.length();
+        this.fields = new Integer[TIMEZONE + 1];
+    }
+
+    /**
+     * Try parsing the given string as date according to the extended ISO 8601 format
+     * specified in ES5 15.9.1.15. Fall back to legacy mode if that fails.
+     * This method returns <tt>true</tt> if the string could be parsed.
+     * @return true if the string could be parsed as date
+     */
+    public boolean parse() {
+        return parseEcmaDate() || parseLegacyDate();
+    }
+
+    /**
+     * Try parsing the date string according to the rules laid out in ES5 15.9.1.15.
+     * The date string must conform to the following format:
+     *
+     * <pre>  [('-'|'+')yy]yyyy[-MM[-dd]][hh:mm[:ss[.sss]][Z|(+|-)hh:mm]] </pre>
+     *
+     * <p>If the string does not contain a time zone offset, the <tt>TIMEZONE</tt> field
+     * is set to <tt>0</tt> (GMT).</p>
+     * @return true if string represents a valid ES5 date string.
+     */
+    public boolean parseEcmaDate() {
+
+        if (token == null) {
+            token = next();
+        }
+
+        while (token != Token.END) {
+
+            switch (token) {
+                case NUMBER:
+                    if (currentField == YEAR && yearSign != 0) {
+                        // 15.9.1.15.1 Extended year must have six digits
+                        if (tokenLength != 6) {
+                            return false;
+                        }
+                        numValue *= yearSign;
+                    } else if (!checkEcmaField(currentField, numValue)) {
+                        return false;
+                    }
+                    if (!skipEcmaDelimiter()) {
+                        return false;
+                    }
+                    if (currentField < TIMEZONE) {
+                        set(currentField++, numValue);
+                    }
+                    break;
+
+                case NAME:
+                    if (nameValue == null) {
+                        return false;
+                    }
+                    switch (nameValue.type) {
+                        case Name.TIME_SEPARATOR:
+                            if (currentField == YEAR || currentField > HOUR) {
+                                return false;
+                            }
+                            currentField = HOUR;
+                            break;
+                        case Name.TIMEZONE_ID:
+                            if (!nameValue.key.equals("z") || !setTimezone(nameValue.value, false)) {
+                                return false;
+                            }
+                            break;
+                        default:
+                            return false;
+                    }
+                    break;
+
+                case SIGN:
+                    if (currentField == YEAR) {
+                        yearSign = numValue;
+                    } else if (currentField < SECOND || !setTimezone(readTimeZoneOffset(), true)) {
+                        // Note: Spidermonkey won't parse timezone unless time includes seconds and milliseconds
+                        return false;
+                    }
+                    break;
+
+                default:
+                    return false;
+            }
+            token = next();
+        }
+
+        return patchResult(true);
+    }
+
+    /**
+     * Try parsing the date using a fuzzy algorithm that can handle a variety of formats.
+     *
+     * <p>Numbers separated by <tt>':'</tt> are treated as time values, optionally followed by a
+     * millisecond value separated by <tt>'.'</tt>. Other number values are treated as date values.
+     * The exact sequence of day, month, and year values to apply is determined heuristically.</p>
+     *
+     * <p>English month names and selected time zone names as well as AM/PM markers are recognized
+     * and handled properly. Additionally, numeric time zone offsets such as <tt>(+|-)hh:mm</tt> or
+     * <tt></tt>(+|-)hhmm</tt> are recognized. If the string does not contain a time zone offset
+     * the <tt>TIMEZONE</tt>field is left undefined, meaning the local time zone should be applied.</p>
+     *
+     * <p>English weekday names are recognized but ignored. All text in parentheses is ignored as well.
+     * All other text causes parsing to fail.</p>
+     *
+     * @return true if the string could be parsed
+     */
+    public boolean parseLegacyDate() {
+
+        if (yearSign != 0 || currentField > DAY) {
+            // we don't support signed years in legacy mode
+            return false;
+        }
+        if (token == null) {
+            token = next();
+        }
+
+        while (token != Token.END) {
+
+            switch (token) {
+                case NUMBER:
+                    if (skip(':')) {
+                        // A number followed by ':' is parsed as time
+                        if (!setTimeField(numValue)) {
+                            return false;
+                        }
+                        // consume remaining time tokens
+                        do {
+                            token = next();
+                            if (token != Token.NUMBER || !setTimeField(numValue)) {
+                                return false;
+                            }
+                        } while (skip(isSet(SECOND) ? '.' : ':'));
+
+                    } else {
+                        // Parse as date token
+                        if (!setDateField(numValue)) {
+                            return false;
+                        }
+                        skip('-');
+                    }
+                    break;
+
+                case NAME:
+                    if (nameValue == null) {
+                        return false;
+                    }
+                    switch (nameValue.type) {
+                        case Name.AM_PM:
+                            if (!setAmPm(nameValue.value)) {
+                                return false;
+                            }
+                            break;
+                        case Name.MONTH_NAME:
+                            if (!setMonth(nameValue.value)) {
+                                return false;
+                            }
+                            break;
+                        case Name.TIMEZONE_ID:
+                            if (!setTimezone(nameValue.value, false)) {
+                                return false;
+                            }
+                            break;
+                        case Name.TIME_SEPARATOR:
+                            return false;
+                        default:
+                            break;
+                    }
+                    if (nameValue.type != Name.TIMEZONE_ID) {
+                        skip('-');
+                    }
+                    break;
+
+                case SIGN:
+                    if (!setTimezone(readTimeZoneOffset(), true)) {
+                        return false;
+                    }
+                    break;
+
+                case PARENTHESIS:
+                    if (!skipParentheses()) {
+                        return false;
+                    }
+                    break;
+
+                case SEPARATOR:
+                    break;
+
+                default:
+                    return false;
+            }
+            token = next();
+        }
+
+        return patchResult(false);
+    }
+
+    /**
+     * Get the parsed date and time fields as an array of <tt>Integers</tt>.
+     *
+     * <p>If parsing was successful, all fields are guaranteed to be set except for the
+     * <tt>TIMEZONE</tt> field which may be <tt>null</tt>, meaning that local time zone
+     * offset should be applied.</p>
+     *
+     * @return the parsed date fields
+     */
+    public Integer[] getDateFields() {
+        return fields;
+    }
+
+    private boolean isSet(final int field) {
+        return fields[field] != null;
+    }
+
+    private Integer get(final int field) {
+        return fields[field];
+    }
+
+    private void set(final int field, final int value) {
+        fields[field] = value;
+    }
+
+    private int peek() {
+        return pos < length ? string.charAt(pos) : -1;
+    }
+
+    private boolean skip(final char c) {
+        if (pos < length && string.charAt(pos) == c) {
+            token = null;
+            pos++;
+            return true;
+        }
+        return false;
+    }
+
+    private Token next() {
+        if (pos >= length) {
+            tokenLength = 0;
+            return Token.END;
+        }
+
+        final char c = string.charAt(pos);
+
+        if (c > 0x80) {
+            tokenLength = 1;
+            pos++;
+            return Token.UNKNOWN; // We only deal with ASCII here
+        }
+
+        final int type = Character.getType(c);
+        switch (type) {
+            case DECIMAL_DIGIT_NUMBER:
+                numValue = readNumber(6);
+                return Token.NUMBER;
+            case SPACE_SEPARATOR :
+            case OTHER_PUNCTUATION:
+                tokenLength = 1;
+                pos++;
+                return Token.SEPARATOR;
+            case UPPERCASE_LETTER:
+            case LOWERCASE_LETTER:
+                nameValue = readName();
+                return Token.NAME;
+            default:
+                tokenLength = 1;
+                pos++;
+                switch (c) {
+                    case '(':
+                        return Token.PARENTHESIS;
+                    case '-':
+                    case '+':
+                        numValue = c == '-' ? -1 : 1;
+                        return Token.SIGN;
+                    default:
+                        return Token.UNKNOWN;
+                }
+        }
+    }
+
+    private static boolean checkLegacyField(final int field, final int value) {
+        switch (field) {
+            case HOUR:
+                return isHour(value);
+            case MINUTE:
+            case SECOND:
+                return isMinuteOrSecond(value);
+            case MILLISECOND:
+                return isMillisecond(value);
+            default:
+                // skip validation on other legacy fields as we don't know what's what
+                return true;
+        }
+    }
+
+    private boolean checkEcmaField(final int field, final int value) {
+        switch (field) {
+            case YEAR:
+                return tokenLength == 4;
+            case MONTH:
+                return tokenLength == 2 && isMonth(value);
+            case DAY:
+                return tokenLength == 2 && isDay(value);
+            case HOUR:
+                return tokenLength == 2 && isHour(value);
+            case MINUTE:
+            case SECOND:
+                return tokenLength == 2 && isMinuteOrSecond(value);
+            case MILLISECOND:
+                // we allow millisecond to be less than 3 digits
+                return tokenLength < 4 && isMillisecond(value);
+            default:
+                return true;
+        }
+    }
+
+    private boolean skipEcmaDelimiter() {
+        switch (currentField) {
+            case YEAR:
+            case MONTH:
+                return skip('-') || peek() == 'T' || peek() == -1;
+            case DAY:
+                return peek() == 'T' || peek() == -1;
+            case HOUR:
+            case MINUTE:
+                return skip(':') || endOfTime();
+            case SECOND:
+                return skip('.') || endOfTime();
+            default:
+                return true;
+        }
+    }
+
+    private boolean endOfTime() {
+        final int c = peek();
+        return c == -1 || c == 'Z' || c == '-' || c == '+' || c == ' ';
+    }
+
+    private static boolean isAsciiLetter(final char ch) {
+        return ('A' <= ch && ch <= 'Z') || ('a' <= ch && ch <= 'z');
+    }
+
+    private static boolean isAsciiDigit(final char ch) {
+        return '0' <= ch && ch <= '9';
+    }
+
+    private int readNumber(final int maxDigits) {
+        final int start = pos;
+        int n = 0;
+        final int max = Math.min(length, pos + maxDigits);
+        while (pos < max && isAsciiDigit(string.charAt(pos))) {
+            n = n * 10 + string.charAt(pos++) - '0';
+        }
+        tokenLength = pos - start;
+        return n;
+    }
+
+    private Name readName() {
+        final int start = pos;
+        final int limit = Math.min(pos + 3, length);
+
+        // first read up to the key length
+        while (pos < limit && isAsciiLetter(string.charAt(pos))) {
+            pos++;
+        }
+        final String key = string.substring(start, pos).toLowerCase();
+        final Name name = names.get(key);
+        // then advance to end of name
+        while (pos < length && isAsciiLetter(string.charAt(pos))) {
+            pos++;
+        }
+
+        tokenLength = pos - start;
+        // make sure we have the full name or a prefix
+        if (name != null && name.matches(string, start, tokenLength)) {
+            return name;
+        }
+        return null;
+    }
+
+    private int readTimeZoneOffset() {
+        final int sign = string.charAt(pos - 1) == '+' ? 1 : -1;
+        int offset = readNumber(2);
+        skip(':');
+        offset = offset * 60 + readNumber(2);
+        return sign * offset;
+    }
+
+    private boolean skipParentheses() {
+        int parenCount = 1;
+        while (pos < length && parenCount != 0) {
+            final char c = string.charAt(pos++);
+            if (c == '(') {
+                parenCount++;
+            } else if (c == ')') {
+                parenCount--;
+            }
+        }
+        return true;
+    }
+
+    private static int getDefaultValue(final int field) {
+        switch (field) {
+            case MONTH:
+            case DAY:
+                return 1;
+            default:
+                return 0;
+        }
+    }
+
+    private static boolean isDay(final int n) {
+        return 1 <= n && n <= 31;
+    }
+
+    private static boolean isMonth(final int n) {
+        return 1 <= n && n <= 12;
+    }
+
+    private static boolean isHour(final int n) {
+        return 0 <= n && n <= 24;
+    }
+
+    private static boolean isMinuteOrSecond(final int n) {
+        return 0 <= n && n < 60;
+    }
+
+    private static boolean isMillisecond(final int n) {
+        return 0<= n && n < 1000;
+    }
+
+    private boolean setMonth(final int m) {
+        if (!isSet(MONTH)) {
+            namedMonth = true;
+            set(MONTH, m);
+            return true;
+        }
+        return false;
+    }
+
+    private boolean setDateField(final int n) {
+        for (int field = YEAR; field != HOUR; field++) {
+            if (!isSet(field)) {
+                // no validation on legacy date fields
+                set(field, n);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private boolean setTimeField(final int n) {
+        for (int field = HOUR; field != TIMEZONE; field++) {
+            if (!isSet(field)) {
+                if (checkLegacyField(field, n)) {
+                    set(field, n);
+                    return true;
+                }
+                return false;
+            }
+        }
+        return false;
+    }
+
+    private boolean setTimezone(final int offset, final boolean asNumericOffset) {
+        if (!isSet(TIMEZONE) || (asNumericOffset && get(TIMEZONE) == 0)) {
+            set(TIMEZONE, offset);
+            return true;
+        }
+        return false;
+    }
+
+    private boolean setAmPm(final int offset) {
+        if (!isSet(HOUR)) {
+            return false;
+        }
+        final int hour = get(HOUR);
+        if (hour >= 0 && hour <= 12) {
+            set(HOUR, hour + offset);
+        }
+        return true;
+    }
+
+    private boolean patchResult(final boolean strict) {
+        // sanity checks - make sure we have something
+        if (!isSet(YEAR) && !isSet(HOUR)) {
+            return false;
+        }
+        if (isSet(HOUR) && !isSet(MINUTE)) {
+            return false;
+        }
+        // fill in default values for unset fields except timezone
+        for (int field = YEAR; field <= TIMEZONE; field++) {
+            if (get(field) == null) {
+                if (field == TIMEZONE && !strict) {
+                    // We only use UTC as default timezone for dates parsed complying with
+                    // the format specified in ES5 15.9.1.15. Otherwise the slot is left empty
+                    // and local timezone is used.
+                    continue;
+                }
+                final int value = getDefaultValue(field);
+                set(field, value);
+            }
+        }
+
+        if (!strict) {
+            // swap year, month, and day if it looks like the right thing to do
+            if (isDay(get(YEAR))) {
+                final int d = get(YEAR);
+                set(YEAR, get(DAY));
+                if (namedMonth) {
+                    // d-m-y
+                    set(DAY, d);
+                } else {
+                    // m-d-y
+                    final int d2 = get(MONTH);
+                    set(MONTH, d);
+                    set(DAY, d2);
+                }
+            }
+            // sanity checks now that we know what's what
+            if (!isMonth(get(MONTH)) || !isDay(get(DAY))) {
+                return false;
+            }
+
+            // add 1900 or 2000 to year if it's between 0 and 100
+            final int year = get(YEAR);
+            if (year >= 0 && year < 100) {
+                set(YEAR, year >= 50 ? 1900 + year : 2000 + year);
+            }
+        } else {
+            // 24 hour value is only allowed if all other time values are zero
+            if (get(HOUR) == 24 &&
+                    (get(MINUTE) != 0 || get(SECOND) != 0 || get(MILLISECOND) != 0)) {
+                return false;
+            }
+        }
+
+        // set month to 0-based
+        set(MONTH, get(MONTH) - 1);
+        return true;
+    }
+
+    private static void addName(final String str, final int type, final int value) {
+        final Name name = new Name(str, type, value);
+        names.put(name.key, name);
+    }
+
+    private static class Name {
+        final String name;
+        final String key;
+        final int value;
+        final int type;
+
+        final static int DAY_OF_WEEK    = -1;
+        final static int MONTH_NAME     = 0;
+        final static int AM_PM          = 1;
+        final static int TIMEZONE_ID    = 2;
+        final static int TIME_SEPARATOR = 3;
+
+        Name(final String name, final int type, final int value) {
+            assert name != null;
+            assert name.equals(name.toLowerCase());
+
+            this.name = name;
+            // use first three characters as lookup key
+            this.key = name.substring(0, Math.min(3, name.length()));
+            this.type = type;
+            this.value = value;
+        }
+
+        public boolean matches(final String str, final int offset, final int len) {
+            return name.regionMatches(true, 0, str, offset, len);
+        }
+
+        @Override
+        public String toString() {
+            return name;
+        }
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/GenericPropertyDescriptor.java b/nashorn/src/jdk/nashorn/internal/objects/GenericPropertyDescriptor.java
new file mode 100644
index 00000000000..6fc696324e0
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/GenericPropertyDescriptor.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+import java.util.Objects;
+import jdk.nashorn.internal.objects.annotations.Property;
+import jdk.nashorn.internal.objects.annotations.ScriptClass;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.PropertyDescriptor;
+import jdk.nashorn.internal.runtime.ScriptFunction;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
+
+/**
+ * Generic Property descriptor is used to represent attributes an object property
+ * that is neither a data property descriptor nor an accessor property descriptor.
+ *
+ * See ECMA 8.10 The Property Descriptor and Property Identifier Specification Types
+ *
+ */
+@ScriptClass("GenericPropertyDescriptor")
+public final class GenericPropertyDescriptor extends ScriptObject implements PropertyDescriptor {
+    /** Is the property configurable? */
+    @Property
+    public Object configurable;
+
+    /** Is the property writable? */
+    @Property
+    public Object enumerable;
+
+    GenericPropertyDescriptor() {
+        this(false, false);
+    }
+
+    GenericPropertyDescriptor(final boolean configurable, final boolean enumerable) {
+        this.configurable = configurable;
+        this.enumerable   = enumerable;
+        setProto(Global.objectPrototype());
+    }
+
+    @Override
+    public boolean isConfigurable() {
+        return JSType.toBoolean(configurable);
+    }
+
+    @Override
+    public boolean isEnumerable() {
+        return JSType.toBoolean(enumerable);
+    }
+
+    @Override
+    public boolean isWritable() {
+        // Not applicable for this. But simplifies flag calculations.
+        return false;
+    }
+
+    @Override
+    public Object getValue() {
+        throw new UnsupportedOperationException("value");
+    }
+
+    @Override
+    public ScriptFunction getGetter() {
+        throw new UnsupportedOperationException("get");
+    }
+
+    @Override
+    public ScriptFunction getSetter() {
+        throw new UnsupportedOperationException("set");
+    }
+
+    @Override
+    public void setConfigurable(final boolean flag) {
+        this.configurable = flag;
+    }
+
+    @Override
+    public void setEnumerable(final boolean flag) {
+        this.enumerable = flag;
+    }
+
+    @Override
+    public void setWritable(final boolean flag) {
+        throw new UnsupportedOperationException("set writable");
+    }
+
+    @Override
+    public void setValue(final Object value) {
+        throw new UnsupportedOperationException("set value");
+    }
+
+    @Override
+    public void setGetter(final Object getter) {
+        throw new UnsupportedOperationException("set getter");
+    }
+
+    @Override
+    public void setSetter(final Object setter) {
+        throw new UnsupportedOperationException("set setter");
+    }
+
+    @Override
+    public PropertyDescriptor fillFrom(final ScriptObject sobj) {
+        final boolean strict = getContext()._strict;
+        if (sobj.has(CONFIGURABLE)) {
+            this.configurable = JSType.toBoolean(sobj.get(CONFIGURABLE));
+        } else {
+            delete(CONFIGURABLE, strict);
+        }
+
+        if (sobj.has(ENUMERABLE)) {
+            this.enumerable = JSType.toBoolean(sobj.get(ENUMERABLE));
+        } else {
+            delete(ENUMERABLE, strict);
+        }
+
+        return this;
+    }
+
+    @Override
+    public int type() {
+        return GENERIC;
+    }
+
+    @Override
+    public boolean equals(final Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (!(obj instanceof AccessorPropertyDescriptor)) {
+            return false;
+        }
+
+        final AccessorPropertyDescriptor other = (AccessorPropertyDescriptor)obj;
+        return ScriptRuntime.sameValue(configurable, other.configurable) &&
+               ScriptRuntime.sameValue(enumerable, other.enumerable);
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 7;
+        hash = 97 * hash + Objects.hashCode(this.configurable);
+        hash = 97 * hash + Objects.hashCode(this.enumerable);
+        return hash;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/Global.java b/nashorn/src/jdk/nashorn/internal/objects/Global.java
new file mode 100644
index 00000000000..39528960233
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/Global.java
@@ -0,0 +1,1663 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.ref.SoftReference;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import jdk.nashorn.internal.objects.annotations.Attribute;
+import jdk.nashorn.internal.objects.annotations.Property;
+import jdk.nashorn.internal.objects.annotations.ScriptClass;
+import jdk.nashorn.internal.runtime.ConsString;
+import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.runtime.GlobalFunctions;
+import jdk.nashorn.internal.runtime.GlobalObject;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.NativeJavaPackage;
+import jdk.nashorn.internal.runtime.PropertyDescriptor;
+import jdk.nashorn.internal.runtime.Scope;
+import jdk.nashorn.internal.runtime.ScriptFunction;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
+import jdk.nashorn.internal.runtime.ScriptingFunctions;
+import jdk.nashorn.internal.runtime.Source;
+import jdk.nashorn.internal.runtime.linker.InvokeByName;
+import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
+import jdk.nashorn.internal.scripts.JO$;
+import org.dynalang.dynalink.linker.GuardedInvocation;
+
+/**
+ * Representation of global scope.
+ */
+@ScriptClass("Global")
+public final class Global extends ScriptObject implements GlobalObject, Scope {
+    private static final InvokeByName TO_STRING = new InvokeByName("toString", ScriptObject.class);
+    private static final InvokeByName VALUE_OF  = new InvokeByName("valueOf",  ScriptObject.class);
+
+    /** ECMA 15.1.2.2 parseInt (string , radix) */
+    @Property(attributes = Attribute.NOT_ENUMERABLE)
+    public Object parseInt;
+
+    /** ECMA 15.1.2.3 parseFloat (string) */
+    @Property(attributes = Attribute.NOT_ENUMERABLE)
+    public Object parseFloat;
+
+    /** ECMA 15.1.2.4 isNaN (number) */
+    @Property(attributes = Attribute.NOT_ENUMERABLE)
+    public Object isNaN;
+
+    /** ECMA 15.1.2.5 isFinite (number) */
+    @Property(attributes = Attribute.NOT_ENUMERABLE)
+    public Object isFinite;
+
+    /** ECMA 15.1.3.3 encodeURI */
+    @Property(attributes = Attribute.NOT_ENUMERABLE)
+    public Object encodeURI;
+
+    /** ECMA 15.1.3.4 encodeURIComponent */
+    @Property(attributes = Attribute.NOT_ENUMERABLE)
+    public Object encodeURIComponent;
+
+    /** ECMA 15.1.3.1 decodeURI */
+    @Property(attributes = Attribute.NOT_ENUMERABLE)
+    public Object decodeURI;
+
+    /** ECMA 15.1.3.2 decodeURIComponent */
+    @Property(attributes = Attribute.NOT_ENUMERABLE)
+    public Object decodeURIComponent;
+
+    /** ECMA B.2.1 escape (string) */
+    @Property(attributes = Attribute.NOT_ENUMERABLE)
+    public Object escape;
+
+    /** ECMA B.2.2 unescape (string) */
+    @Property(attributes = Attribute.NOT_ENUMERABLE)
+    public Object unescape;
+
+    /** Nashorn extension: global.print */
+    @Property(attributes = Attribute.NOT_ENUMERABLE)
+    public Object print;
+
+    /** Nashorn extension: global.load */
+    @Property(attributes = Attribute.NOT_ENUMERABLE)
+    public Object load;
+
+    /** Value property NaN of the Global Object - ECMA 15.1.1.1 NaN */
+    @Property(attributes = Attribute.NON_ENUMERABLE_CONSTANT)
+    public final Object NaN = Double.NaN;
+
+    /** Value property Infinity of the Global Object - ECMA 15.1.1.2 Infinity */
+    @Property(attributes = Attribute.NON_ENUMERABLE_CONSTANT)
+    public final Object Infinity = Double.POSITIVE_INFINITY;
+
+    /** Value property Undefined of the Global Object - ECMA 15.1.1.3 Undefined */
+    @Property(attributes = Attribute.NON_ENUMERABLE_CONSTANT)
+    public final Object undefined = UNDEFINED;
+
+    /** ECMA 15.1.2.1 eval(x) */
+    @Property(attributes = Attribute.NOT_ENUMERABLE)
+    public Object eval;
+
+    /** ECMA 15.1.4.1 Object constructor. */
+    @Property(name = "Object", attributes = Attribute.NOT_ENUMERABLE)
+    public volatile Object object;
+
+    /** ECMA 15.1.4.2 Function constructor. */
+    @Property(name = "Function", attributes = Attribute.NOT_ENUMERABLE)
+    public volatile Object function;
+
+    /** ECMA 15.1.4.3 Array constructor. */
+    @Property(name = "Array", attributes = Attribute.NOT_ENUMERABLE)
+    public volatile Object array;
+
+    /** ECMA 15.1.4.4 String constructor */
+    @Property(name = "String", attributes = Attribute.NOT_ENUMERABLE)
+    public volatile Object string;
+
+    /** ECMA 15.1.4.5 Boolean constructor */
+    @Property(name = "Boolean", attributes = Attribute.NOT_ENUMERABLE)
+    public volatile Object _boolean;
+
+    /** ECMA 15.1.4.6 - Number constructor */
+    @Property(name = "Number", attributes = Attribute.NOT_ENUMERABLE)
+    public volatile Object number;
+
+    /** ECMA 15.1.4.7 Date constructor */
+    @Property(name = "Date", attributes = Attribute.NOT_ENUMERABLE)
+    public volatile Object date;
+
+    /** ECMA 15.1.4.8 RegExp constructor */
+    @Property(name = "RegExp", attributes = Attribute.NOT_ENUMERABLE)
+    public volatile Object regexp;
+
+    /** ECMA 15.12 - The JSON object */
+    @Property(name = "JSON", attributes = Attribute.NOT_ENUMERABLE)
+    public volatile Object json;
+
+    /** Nashorn extension: global.JSAdapter */
+    @Property(name = "JSAdapter", attributes = Attribute.NOT_ENUMERABLE)
+    public volatile Object jsadapter;
+
+    /** ECMA 15.8 - The Math object */
+    @Property(name = "Math", attributes = Attribute.NOT_ENUMERABLE)
+    public volatile Object math;
+
+    /** Error object */
+    @Property(name = "Error", attributes = Attribute.NOT_ENUMERABLE)
+    public volatile Object error;
+
+    /** EvalError object */
+    @Property(name = "EvalError", attributes = Attribute.NOT_ENUMERABLE)
+    public volatile Object evalError;
+
+    /** RangeError object */
+    @Property(name = "RangeError", attributes = Attribute.NOT_ENUMERABLE)
+    public volatile Object rangeError;
+
+    /** ReferenceError object */
+    @Property(name = "ReferenceError", attributes = Attribute.NOT_ENUMERABLE)
+    public volatile Object referenceError;
+
+    /** SyntaxError object */
+    @Property(name = "SyntaxError", attributes = Attribute.NOT_ENUMERABLE)
+    public volatile Object syntaxError;
+
+    /** TypeError object */
+    @Property(name = "TypeError", attributes = Attribute.NOT_ENUMERABLE)
+    public volatile Object typeError;
+
+    /** URIError object */
+    @Property(name = "URIError", attributes = Attribute.NOT_ENUMERABLE)
+    public volatile Object uriError;
+
+    /** ArrayBuffer object */
+    @Property(name = "ArrayBuffer", attributes = Attribute.NOT_ENUMERABLE)
+    public volatile Object arrayBuffer;
+
+    /** TypedArray (int8) */
+    @Property(name = "Int8Array", attributes = Attribute.NOT_ENUMERABLE)
+    public volatile Object int8Array;
+
+    /** TypedArray (uint8) */
+    @Property(name = "Uint8Array", attributes = Attribute.NOT_ENUMERABLE)
+    public volatile Object uint8Array;
+
+    /** TypedArray (uint8) - Clamped */
+    @Property(name = "Uint8ClampedArray", attributes = Attribute.NOT_ENUMERABLE)
+    public volatile Object uint8ClampedArray;
+
+    /** TypedArray (int16) */
+    @Property(name = "Int16Array", attributes = Attribute.NOT_ENUMERABLE)
+    public volatile Object int16Array;
+
+    /** TypedArray (uint16) */
+    @Property(name = "Uint16Array", attributes = Attribute.NOT_ENUMERABLE)
+    public volatile Object uint16Array;
+
+    /** TypedArray (int32) */
+    @Property(name = "Int32Array", attributes = Attribute.NOT_ENUMERABLE)
+    public volatile Object int32Array;
+
+    /** TypedArray (uint32) */
+    @Property(name = "Uint32Array", attributes = Attribute.NOT_ENUMERABLE)
+    public volatile Object uint32Array;
+
+    /** TypedArray (float32) */
+    @Property(name = "Float32Array", attributes = Attribute.NOT_ENUMERABLE)
+    public volatile Object float32Array;
+
+    /** TypedArray (float64) */
+    @Property(name = "Float64Array", attributes = Attribute.NOT_ENUMERABLE)
+    public volatile Object float64Array;
+
+    /** Nashorn extension: Java access - global.Packages */
+    @Property(name = "Packages", attributes = Attribute.NOT_ENUMERABLE)
+    public volatile Object packages;
+
+    /** Nashorn extension: Java access - global.java */
+    @Property(attributes = Attribute.NOT_ENUMERABLE)
+    public volatile Object java;
+
+    /** Nashorn extension: Java access - global.javax */
+    @Property(attributes = Attribute.NOT_ENUMERABLE)
+    public Object javax;
+
+    /** Nashorn extension: Java access - global.javaImporter */
+    @Property(name = "JavaImporter", attributes = Attribute.NOT_ENUMERABLE)
+    public volatile Object javaImporter;
+
+    /** Nashorn extension: global.Java Object constructor. */
+    @Property(name = "Java", attributes = Attribute.NOT_ENUMERABLE)
+    public volatile Object javaApi;
+
+    /** Nashorn extension: current script's file name */
+    @Property(name = "__FILE__", attributes = Attribute.NON_ENUMERABLE_CONSTANT)
+    public Object __FILE__;
+
+    /** Nashorn extension: current script's directory */
+    @Property(name = "__DIR__", attributes = Attribute.NON_ENUMERABLE_CONSTANT)
+    public Object __DIR__;
+
+    /** Nashorn extension: current source line number being executed */
+    @Property(name = "__LINE__", attributes = Attribute.NON_ENUMERABLE_CONSTANT)
+    public Object __LINE__;
+
+    /** Used as Date.prototype's default value */
+    public NativeDate   DEFAULT_DATE;
+
+    /** Used as RegExp.prototype's default value */
+    public NativeRegExp DEFAULT_REGEXP;
+
+    /*
+     * Built-in constructor objects: Even if user changes dynamic values of
+     * "Object", "Array" etc., we still want to keep original values of these
+     * constructors here. For example, we need to be able to create array,
+     * regexp literals even after user overwrites global "Array" or "RegExp"
+     * constructor - see also ECMA 262 spec. Annex D.
+     */
+    private ScriptFunction builtinFunction;
+    private ScriptFunction builtinObject;
+    private ScriptFunction builtinArray;
+    private ScriptFunction builtinBoolean;
+    private ScriptFunction builtinDate;
+    private ScriptObject   builtinJSON;
+    private ScriptFunction builtinJSAdapter;
+    private ScriptObject   builtinMath;
+    private ScriptFunction builtinNumber;
+    private ScriptFunction builtinRegExp;
+    private ScriptFunction builtinString;
+    private ScriptFunction builtinError;
+    private ScriptFunction builtinEval;
+    private ScriptFunction builtinEvalError;
+    private ScriptFunction builtinRangeError;
+    private ScriptFunction builtinReferenceError;
+    private ScriptFunction builtinSyntaxError;
+    private ScriptFunction builtinTypeError;
+    private ScriptFunction builtinURIError;
+    private ScriptObject   builtinPackages;
+    private ScriptObject   builtinJava;
+    private ScriptObject   builtinJavax;
+    private ScriptObject   builtinJavaImporter;
+    private ScriptObject   builtinJavaApi;
+    private ScriptObject   builtinArrayBuffer;
+    private ScriptObject   builtinInt8Array;
+    private ScriptObject   builtinUint8Array;
+    private ScriptObject   builtinUint8ClampedArray;
+    private ScriptObject   builtinInt16Array;
+    private ScriptObject   builtinUint16Array;
+    private ScriptObject   builtinInt32Array;
+    private ScriptObject   builtinUint32Array;
+    private ScriptObject   builtinFloat32Array;
+    private ScriptObject   builtinFloat64Array;
+
+    // Flag to indicate that a split method issued a return statement
+    private int splitState = -1;
+
+    // class cache
+    private ClassCache classCache;
+
+    private static final MethodHandle EVAL    = findOwnMH("eval",    Object.class, Object.class, Object.class);
+    private static final MethodHandle PRINT   = findOwnMH("print",   Object.class, Object.class, Object[].class);
+    private static final MethodHandle PRINTLN = findOwnMH("println", Object.class, Object.class, Object[].class);
+    private static final MethodHandle LOAD    = findOwnMH("load",    Object.class, Object.class, Object.class);
+
+    /**
+     * Constructor
+     */
+    public Global() {
+        this.setIsScope();
+        /*
+         * Duplicate global's map and use it. This way the initial Map filled
+         * by nasgen (referenced from static field in this class) is retained
+         * 'as is'. This allows multiple globals to be used within a context.
+         */
+        this.setMap(getMap().duplicate());
+
+        final int cacheSize = getContext()._class_cache_size;
+        if (cacheSize > 0) {
+            classCache = new ClassCache(cacheSize);
+        }
+    }
+
+    /**
+     * Script access to unique context specific Global instance
+     *
+     * @return the global singleton
+     */
+    public static Global instance() {
+        return (Global)Context.getGlobal();
+    }
+
+    /**
+     * Script access to {@link Context}
+     *
+     * @return the context
+     */
+    public static Context getThisContext() {
+        return instance().getContext();
+    }
+
+    /**
+     * Script access check for strict mode
+     *
+     * @return true if strict mode enabled in {@link Global#getThisContext()}
+     */
+    public static boolean isStrict() {
+        return getThisContext()._strict;
+    }
+
+    // GlobalObject interface implementation
+
+    @Override
+    public void initBuiltinObjects() {
+        if (this.builtinObject != null) {
+            // already initialized, just return
+            return;
+        }
+
+        final ScriptObject oldGlobal = Context.getGlobal();
+        Context.setGlobal(this);
+        try {
+            init();
+        } finally {
+            Context.setGlobal(oldGlobal);
+        }
+    }
+
+    @Override
+    public ScriptFunction newScriptFunction(final String name, final MethodHandle handle, final ScriptObject scope, final boolean strict) {
+        return new ScriptFunctionImpl(name, handle, scope, strict, null);
+    }
+
+    @Override
+    public Object wrapAsObject(final Object obj) {
+        if (obj instanceof Boolean) {
+            return new NativeBoolean((Boolean)obj);
+        } else if (obj instanceof Number) {
+            return new NativeNumber(((Number)obj).doubleValue());
+        } else if (obj instanceof String || obj instanceof ConsString) {
+            return new NativeString((CharSequence)obj);
+        } else if (obj instanceof Object[]) { // extension
+            return new NativeArray((Object[])obj);
+        } else if (obj instanceof double[]) { // extension
+            return new NativeArray((double[])obj);
+        } else if (obj instanceof long[]) {
+            return new NativeArray((long[])obj);
+        } else if (obj instanceof int[]) {
+            return new NativeArray((int[])obj);
+        } else {
+            // FIXME: more special cases? Map? List?
+            return obj;
+        }
+    }
+
+    @Override
+    public GuardedInvocation numberLookup(final NashornCallSiteDescriptor callSite, final Number self) {
+        return NativeNumber.lookupPrimitive(callSite, self);
+    }
+
+    @Override
+    public GuardedInvocation stringLookup(final NashornCallSiteDescriptor callSite, final CharSequence self) {
+        return NativeString.lookupPrimitive(callSite, self);
+    }
+
+    @Override
+    public GuardedInvocation booleanLookup(final NashornCallSiteDescriptor callSite, final Boolean self) {
+        return NativeBoolean.lookupPrimitive(callSite, self);
+    }
+
+    @Override
+    public ScriptObject newObject() {
+        return newEmptyInstance();
+    }
+
+    @Override
+    public Object getDefaultValue(final ScriptObject sobj, final Class<?> typeHint) {
+        // When the [[DefaultValue]] internal method of O is called with no hint,
+        // then it behaves as if the hint were Number, unless O is a Date object
+        // in which case it behaves as if the hint were String.
+        Class<?> hint = typeHint;
+        if (hint == null) {
+            hint = Number.class;
+        }
+
+        try {
+            if (hint == String.class) {
+
+                final Object toString = TO_STRING.getGetter().invokeExact(sobj);
+                if (toString instanceof ScriptFunction) {
+                    final Object value = TO_STRING.getInvoker().invokeExact(toString, sobj);
+                    if (JSType.isPrimitive(value)) {
+                        return value;
+                    }
+                }
+
+                final Object valueOf = VALUE_OF.getGetter().invokeExact(sobj);
+                if (valueOf instanceof ScriptFunction) {
+                    final Object value = VALUE_OF.getInvoker().invokeExact(valueOf, sobj);
+                    if (JSType.isPrimitive(value)) {
+                        return value;
+                    }
+                }
+                typeError(this, "cannot.get.default.string");
+            }
+
+            if (hint == Number.class) {
+                final Object valueOf = VALUE_OF.getGetter().invokeExact(sobj);
+                if (valueOf instanceof ScriptFunction) {
+                    final Object value = VALUE_OF.getInvoker().invokeExact(valueOf, sobj);
+                    if (JSType.isPrimitive(value)) {
+                        return value;
+                    }
+                }
+
+                final Object toString = TO_STRING.getGetter().invokeExact(sobj);
+                if (toString instanceof ScriptFunction) {
+                    final Object value = TO_STRING.getInvoker().invokeExact(toString, sobj);
+                    if (JSType.isPrimitive(value)) {
+                        return value;
+                    }
+                }
+
+                typeError(this, "cannot.get.default.number");
+            }
+        } catch (final RuntimeException | Error e) {
+            throw e;
+        } catch (final Throwable t) {
+            throw new RuntimeException(t);
+        }
+
+        return UNDEFINED;
+    }
+
+    @Override
+    public boolean isError(final ScriptObject sobj) {
+        final ScriptObject errorProto = getErrorPrototype();
+        ScriptObject proto = sobj.getProto();
+        while (proto != null) {
+            if (proto == errorProto) {
+                return true;
+            }
+            proto = proto.getProto();
+        }
+        return false;
+    }
+
+    @Override
+    public ScriptObject newError(final String msg) {
+        return new NativeError(msg);
+    }
+
+    @Override
+    public ScriptObject newEvalError(final String msg) {
+        return new NativeEvalError(msg);
+    }
+
+    @Override
+    public ScriptObject newRangeError(final String msg) {
+        return new NativeRangeError(msg);
+    }
+
+    @Override
+    public ScriptObject newReferenceError(final String msg) {
+        return new NativeReferenceError(msg);
+    }
+
+    @Override
+    public ScriptObject newSyntaxError(final String msg) {
+        return new NativeSyntaxError(msg);
+    }
+
+    @Override
+    public ScriptObject newTypeError(final String msg) {
+        return new NativeTypeError(msg);
+    }
+
+    @Override
+    public ScriptObject newURIError(final String msg) {
+        return new NativeURIError(msg);
+    }
+
+    @Override
+    public PropertyDescriptor newGenericDescriptor(final boolean configurable, final boolean enumerable) {
+        return new GenericPropertyDescriptor(configurable, enumerable);
+    }
+
+    @Override
+    public PropertyDescriptor newDataDescriptor(final Object value, final boolean configurable, final boolean enumerable, final boolean writable) {
+        return new DataPropertyDescriptor(configurable, enumerable, writable, value);
+    }
+
+    @Override
+    public PropertyDescriptor newAccessorDescriptor(final Object get, final Object set, final boolean configurable, final boolean enumerable) {
+        final AccessorPropertyDescriptor desc = new AccessorPropertyDescriptor(configurable, enumerable, get == null ? UNDEFINED : get, set == null ? UNDEFINED : set);
+
+        final boolean strict = getContext()._strict;
+
+        if (get == null) {
+            desc.delete(PropertyDescriptor.GET, strict);
+        }
+
+        if (set == null) {
+            desc.delete(PropertyDescriptor.SET, strict);
+        }
+
+        return desc;
+    }
+
+
+    /**
+     * Cache for compiled script classes.
+     */
+    @SuppressWarnings("serial")
+    private static class ClassCache extends LinkedHashMap<Source, SoftReference<Class<?>>> {
+        private final int size;
+
+        ClassCache(int size) {
+            super(size, 0.75f, true);
+            this.size = size;
+        }
+
+        @Override
+        protected boolean removeEldestEntry(final Map.Entry<Source, SoftReference<Class<?>>> eldest) {
+            return size() >= size;
+        }
+    }
+
+    // Class cache management
+    @Override
+    public Class<?> findCachedClass(final Source source) {
+        assert classCache != null : "Class cache used without being initialized";
+        SoftReference<Class<?>> ref = classCache.get(source);
+        if (ref != null) {
+            final Class<?> clazz = ref.get();
+            if (clazz == null) {
+                classCache.remove(source);
+            }
+            return clazz;
+        }
+
+        return null;
+    }
+
+    @Override
+    public void cacheClass(final Source source, final Class<?> clazz) {
+        assert classCache != null : "Class cache used without being initialized";
+        classCache.put(source, new SoftReference<Class<?>>(clazz));
+    }
+
+    /**
+     * This is the eval used when 'indirect' eval call is made.
+     *
+     * var global = this;
+     * global.eval("print('hello')");
+     *
+     * @param self  eval scope
+     * @param str   eval string
+     *
+     * @return the result of eval
+     */
+    public static Object eval(final Object self, final Object str) {
+        return directEval(self, str, UNDEFINED, UNDEFINED, UNDEFINED);
+    }
+
+    /**
+     * Direct eval
+     *
+     * @param self     The scope of eval passed as 'self'
+     * @param str      Evaluated code
+     * @param callThis "this" to be passed to the evaluated code
+     * @param location location of the eval call
+     * @param strict   is eval called a strict mode code?
+     *
+     * @return the return value of the eval
+     *
+     * This is directly invoked from generated when eval(code) is called in user code
+     */
+    public static Object directEval(final Object self, final Object str, final Object callThis, final Object location, final Object strict) {
+        if (!(str instanceof String || str instanceof ConsString)) {
+            return str;
+        }
+        final ScriptObject scope = (self instanceof ScriptObject) ? (ScriptObject)self : Global.instance();
+
+        return Global.getThisContext().eval(scope, str.toString(), callThis, location, Boolean.TRUE.equals(strict));
+    }
+
+    /**
+     * Global print implementation - Nashorn extension
+     *
+     * @param self    scope
+     * @param objects arguments to print
+     *
+     * @return result of print (undefined)
+     */
+    public static Object print(final Object self, final Object... objects) {
+        return printImpl(false, objects);
+    }
+
+    /**
+     * Global println implementation - Nashorn extension
+     *
+     * @param self    scope
+     * @param objects arguments to print
+     *
+     * @return result of println (undefined)
+     */
+    public static Object println(final Object self, final Object... objects) {
+        return printImpl(true, objects);
+    }
+
+    /**
+     * Global load implementation - Nashorn extension
+     *
+     * @param self    scope
+     * @param source  source to load
+     *
+     * @return result of load (undefined)
+     *
+     * @throws IOException if source could not be read
+     */
+    public static Object load(final Object self, final Object source) throws IOException {
+        final ScriptObject scope = (self instanceof ScriptObject) ? (ScriptObject)self : Global.instance();
+        return getThisContext().load(scope, source);
+    }
+
+    ScriptObject getFunctionPrototype() {
+        return ScriptFunction.getPrototype(builtinFunction);
+    }
+
+    ScriptObject getObjectPrototype() {
+        return ScriptFunction.getPrototype(builtinObject);
+    }
+
+    ScriptObject getArrayPrototype() {
+        return ScriptFunction.getPrototype(builtinArray);
+    }
+
+    ScriptObject getBooleanPrototype() {
+        return ScriptFunction.getPrototype(builtinBoolean);
+    }
+
+    ScriptObject getNumberPrototype() {
+        return ScriptFunction.getPrototype(builtinNumber);
+    }
+
+    ScriptObject getDatePrototype() {
+        return ScriptFunction.getPrototype(builtinDate);
+    }
+
+    ScriptObject getRegExpPrototype() {
+        return ScriptFunction.getPrototype(builtinRegExp);
+    }
+
+    ScriptObject getStringPrototype() {
+        return ScriptFunction.getPrototype(builtinString);
+    }
+
+    ScriptObject getErrorPrototype() {
+        return ScriptFunction.getPrototype(builtinError);
+    }
+
+    ScriptObject getEvalErrorPrototype() {
+        return ScriptFunction.getPrototype(builtinEvalError);
+    }
+
+    ScriptObject getRangeErrorPrototype() {
+        return ScriptFunction.getPrototype(builtinRangeError);
+    }
+
+    ScriptObject getReferenceErrorPrototype() {
+        return ScriptFunction.getPrototype(builtinReferenceError);
+    }
+
+    ScriptObject getSyntaxErrorPrototype() {
+        return ScriptFunction.getPrototype(builtinSyntaxError);
+    }
+
+    ScriptObject getTypeErrorPrototype() {
+        return ScriptFunction.getPrototype(builtinTypeError);
+    }
+
+    ScriptObject getURIErrorPrototype() {
+        return ScriptFunction.getPrototype(builtinURIError);
+    }
+
+    ScriptObject getJavaImporterPrototype() {
+        return ScriptFunction.getPrototype(builtinJavaImporter);
+    }
+
+    ScriptObject getJSAdapterPrototype() {
+        return ScriptFunction.getPrototype(builtinJSAdapter);
+    }
+
+    ScriptObject getArrayBufferPrototype() {
+        return ScriptFunction.getPrototype(builtinArrayBuffer);
+    }
+
+    ScriptObject getInt8ArrayPrototype() {
+        return ScriptFunction.getPrototype(builtinInt8Array);
+    }
+
+    ScriptObject getUint8ArrayPrototype() {
+        return ScriptFunction.getPrototype(builtinUint8Array);
+    }
+
+    ScriptObject getUint8ClampedArrayPrototype() {
+        return ScriptFunction.getPrototype(builtinUint8ClampedArray);
+    }
+
+    ScriptObject getInt16ArrayPrototype() {
+        return ScriptFunction.getPrototype(builtinInt16Array);
+    }
+
+    ScriptObject getUint16ArrayPrototype() {
+        return ScriptFunction.getPrototype(builtinUint16Array);
+    }
+
+    ScriptObject getInt32ArrayPrototype() {
+        return ScriptFunction.getPrototype(builtinInt32Array);
+    }
+
+    ScriptObject getUint32ArrayPrototype() {
+        return ScriptFunction.getPrototype(builtinUint32Array);
+    }
+
+    ScriptObject getFloat32ArrayPrototype() {
+        return ScriptFunction.getPrototype(builtinFloat32Array);
+    }
+
+    ScriptObject getFloat64ArrayPrototype() {
+        return ScriptFunction.getPrototype(builtinFloat64Array);
+    }
+
+    private ScriptFunction getBuiltinArray() {
+        return builtinArray;
+    }
+
+
+    /**
+     * Called from compiled script code to test if builtin has been overridden
+     *
+     * @return true if builtin array has not been overridden
+     */
+    public static boolean isBuiltinArray() {
+        final Global instance = Global.instance();
+        return instance.array == instance.getBuiltinArray();
+    }
+
+    private ScriptFunction getBuiltinBoolean() {
+        return builtinBoolean;
+    }
+
+    /**
+     * Called from compiled script code to test if builtin has been overridden
+     *
+     * @return true if builtin boolean has not been overridden
+     */
+    public static boolean isBuiltinBoolean() {
+        final Global instance = Global.instance();
+        return instance._boolean == instance.getBuiltinBoolean();
+    }
+
+    private ScriptFunction getBuiltinDate() {
+        return builtinDate;
+    }
+
+    /**
+     * Called from compiled script code to test if builtin has been overridden
+     *
+     * @return true if builtin date has not been overridden
+     */
+    public static boolean isBuiltinDate() {
+        final Global instance = Global.instance();
+        return instance.date == instance.getBuiltinDate();
+    }
+
+    private ScriptFunction getBuiltinError() {
+        return builtinError;
+    }
+
+    /**
+     * Called from compiled script code to test if builtin has been overridden
+     *
+     * @return true if builtin error has not been overridden
+     */
+    public static boolean isBuiltinError() {
+        final Global instance = Global.instance();
+        return instance.error == instance.getBuiltinError();
+    }
+
+    private ScriptFunction getBuiltinEvalError() {
+        return builtinEvalError;
+    }
+
+    /**
+     * Called from compiled script code to test if builtin has been overridden
+     *
+     * @return true if builtin eval error has not been overridden
+     */
+    public static boolean isBuiltinEvalError() {
+        final Global instance = Global.instance();
+        return instance.evalError == instance.getBuiltinEvalError();
+    }
+
+    private ScriptFunction getBuiltinFunction() {
+        return builtinFunction;
+    }
+
+    /**
+     * Called from compiled script code to test if builtin has been overridden
+     *
+     * @return true if builtin function has not been overridden
+     */
+    public static boolean isBuiltinFunction() {
+        final Global instance = Global.instance();
+        return instance.function == instance.getBuiltinFunction();
+    }
+
+    private ScriptFunction getBuiltinJSAdapter() {
+        return builtinJSAdapter;
+    }
+
+    /**
+     * Called from compiled script code to test if builtin has been overridden
+     *
+     * @return true if builtin JSAdapter has not been overridden
+     */
+    public static boolean isBuiltinJSAdapter() {
+        final Global instance = Global.instance();
+        return instance.jsadapter == instance.getBuiltinJSAdapter();
+    }
+
+    private ScriptObject getBuiltinJSON() {
+        return builtinJSON;
+    }
+
+    /**
+     * Called from compiled script code to test if builtin has been overridden
+     *
+     * @return true if builtin JSON has has not been overridden
+     */
+    public static boolean isBuiltinJSON() {
+        final Global instance = Global.instance();
+        return instance.json == instance.getBuiltinJSON();
+    }
+
+    private ScriptObject getBuiltinJava() {
+        return builtinJava;
+    }
+
+    /**
+     * Called from compiled script code to test if builtin has been overridden
+     *
+     * @return true if builtin Java has not been overridden
+     */
+    public static boolean isBuiltinJava() {
+        final Global instance = Global.instance();
+        return instance.java == instance.getBuiltinJava();
+    }
+
+    private ScriptObject getBuiltinJavax() {
+        return builtinJavax;
+    }
+
+    /**
+     * Called from compiled script code to test if builtin has been overridden
+     *
+     * @return true if builtin Javax has not been overridden
+     */
+    public static boolean isBuiltinJavax() {
+        final Global instance = Global.instance();
+        return instance.javax == instance.getBuiltinJavax();
+    }
+
+    private ScriptObject getBuiltinJavaImporter() {
+        return builtinJavaImporter;
+    }
+
+    /**
+     * Called from compiled script code to test if builtin has been overridden
+     *
+     * @return true if builtin Java importer has not been overridden
+     */
+    public static boolean isBuiltinJavaImporter() {
+        final Global instance = Global.instance();
+        return instance.javaImporter == instance.getBuiltinJavaImporter();
+    }
+
+    private ScriptObject getBuiltinMath() {
+        return builtinMath;
+    }
+
+    /**
+     * Called from compiled script code to test if builtin has been overridden
+     *
+     * @return true if builtin math has not been overridden
+     */
+    public static boolean isBuiltinMath() {
+        final Global instance = Global.instance();
+        return instance.math == instance.getBuiltinMath();
+    }
+
+    private ScriptFunction getBuiltinNumber() {
+        return builtinNumber;
+    }
+
+    /**
+     * Called from compiled script code to test if builtin has been overridden
+     *
+     * @return true if builtin number has not been overridden
+     */
+    public static boolean isBuiltinNumber() {
+        final Global instance = Global.instance();
+        return instance.number == instance.getBuiltinNumber();
+    }
+
+    private ScriptFunction getBuiltinObject() {
+        return builtinObject;
+    }
+
+    /**
+     * Called from compiled script code to test if builtin has been overridden
+     *
+     * @return true if builtin object has not been overridden
+     */
+    public static boolean isBuiltinObject() {
+        final Global instance = Global.instance();
+        return instance.object == instance.getBuiltinObject();
+    }
+
+    private ScriptObject getBuiltinPackages() {
+        return builtinPackages;
+    }
+
+    /**
+     * Called from compiled script code to test if builtin has been overridden
+     *
+     * @return true if builtin package has not been overridden
+     */
+    public static boolean isBuiltinPackages() {
+        final Global instance = Global.instance();
+        return instance.packages == instance.getBuiltinPackages();
+    }
+
+    private ScriptFunction getBuiltinRangeError() {
+        return builtinRangeError;
+    }
+
+    /**
+     * Called from compiled script code to test if builtin has been overridden
+     *
+     * @return true if builtin range error has not been overridden
+     */
+    public static boolean isBuiltinRangeError() {
+        final Global instance = Global.instance();
+        return instance.rangeError == instance.getBuiltinRangeError();
+    }
+
+    private ScriptFunction getBuiltinReferenceError() {
+        return builtinReferenceError;
+    }
+
+    /**
+     * Called from compiled script code to test if builtin has been overridden
+     *
+     * @return true if builtin reference error has not been overridden
+     */
+    public static boolean isBuiltinReferenceError() {
+        final Global instance = Global.instance();
+        return instance.referenceError == instance.getBuiltinReferenceError();
+    }
+
+    private ScriptFunction getBuiltinRegExp() {
+        return builtinRegExp;
+    }
+
+    /**
+     * Called from compiled script code to test if builtin has been overridden
+     *
+     * @return true if builtin regexp has not been overridden
+     */
+    public static boolean isBuiltinRegExp() {
+        final Global instance = Global.instance();
+        return instance.regexp == instance.getBuiltinRegExp();
+    }
+
+    private ScriptFunction getBuiltinString() {
+        return builtinString;
+    }
+
+    /**
+     * Called from compiled script code to test if builtin has been overridden
+     *
+     * @return true if builtin Java has not been overridden
+     */
+    public static boolean isBuiltinString() {
+        final Global instance = Global.instance();
+        return instance.string == instance.getBuiltinString();
+    }
+
+    private ScriptFunction getBuiltinSyntaxError() {
+        return builtinSyntaxError;
+    }
+
+    /**
+     * Called from compiled script code to test if builtin has been overridden
+     *
+     * @return true if builtin syntax error has not been overridden
+     */
+    public static boolean isBuiltinSyntaxError() {
+        final Global instance = Global.instance();
+        return instance.syntaxError == instance.getBuiltinSyntaxError();
+    }
+
+    private ScriptFunction getBuiltinTypeError() {
+        return builtinTypeError;
+    }
+
+    /**
+     * Called from compiled script code to test if builtin has been overridden
+     *
+     * @return true if builtin type error has not been overridden
+     */
+    public static boolean isBuiltinTypeError() {
+        final Global instance = Global.instance();
+        return instance.typeError == instance.getBuiltinTypeError();
+    }
+
+    private ScriptFunction getBuiltinURIError() {
+        return builtinURIError;
+    }
+
+    /**
+     * Called from compiled script code to test if builtin has been overridden
+     *
+     * @return true if builtin URI error has not been overridden
+     */
+    public static boolean isBuiltinURIError() {
+        final Global instance = Global.instance();
+        return instance.uriError == instance.getBuiltinURIError();
+    }
+
+    @Override
+    public String getClassName() {
+        return "global";
+    }
+
+    /**
+     * Copy function used to clone NativeRegExp objects.
+     *
+     * @param regexp a NativeRegExp to clone
+     *
+     * @return copy of the given regexp object
+     */
+    public static Object regExpCopy(final Object regexp) {
+        return new NativeRegExp((NativeRegExp)regexp);
+    }
+
+    /**
+     * Convert given object to NativeRegExp type.
+     *
+     * @param obj object to be converted
+     * @return NativeRegExp instance
+     */
+    public static NativeRegExp toRegExp(final Object obj) {
+        if (obj instanceof NativeRegExp) {
+            return (NativeRegExp)obj;
+        }
+        return new NativeRegExp(JSType.toString(obj));
+    }
+
+    /**
+     * ECMA 9.9 ToObject implementation
+     *
+     * @param obj  an item for which to run ToObject
+     * @return ToObject version of given item
+     */
+    public static Object toObject(final Object obj) {
+        if (obj == null || obj == UNDEFINED) {
+            typeError(instance(), "not.an.object", ScriptRuntime.safeToString(obj));
+        }
+
+        if (obj instanceof ScriptObject) {
+            return obj;
+        }
+
+        return instance().wrapAsObject(obj);
+    }
+
+    /**
+     * Allocate a new object array.
+     *
+     * @param initial object values.
+     * @return the new array
+     */
+    public static Object allocate(final Object[] initial) {
+        return new NativeArray(initial);
+    }
+
+    /**
+     * Allocate a new number array.
+     *
+     * @param initial number values.
+     * @return the new array
+     */
+    public static Object allocate(final double[] initial) {
+        return new NativeArray(initial);
+    }
+
+    /**
+     * Allocate a new long array.
+     *
+     * @param initial number values.
+     * @return the new array
+     */
+    public static Object allocate(final long[] initial) {
+        return new NativeArray(initial);
+    }
+
+    /**
+     * Allocate a new integer array.
+     *
+     * @param initial number values.
+     * @return the new array
+     */
+    public static Object allocate(final int[] initial) {
+        return new NativeArray(initial);
+    }
+
+    /**
+     * Allocate a new object array for arguments.
+     *
+     * @param arguments initial arguments passed.
+     * @param callee reference to the function that uses arguments object
+     * @param numParams actual number of declared parameters
+     *
+     * @return the new array
+     */
+    public static Object allocateArguments(final Object[] arguments, final Object callee, final int numParams) {
+        return NativeArguments.allocate(arguments, (ScriptFunction)callee, numParams);
+    }
+
+    /**
+     * Called from generated to check if given function is the builtin 'eval'. If
+     * eval is used in a script, a lot of optimizations and assumptions cannot be done.
+     *
+     * @param  fn function object that is checked
+     * @return true if fn is the builtin eval
+     */
+    public static boolean isEval(final Object fn) {
+        return fn == Global.instance().builtinEval;
+    }
+
+    /**
+     * Create a new RegExp object.
+     *
+     * @param expression Regular expression.
+     * @param options    Search options.
+     *
+     * @return New RegExp object.
+     */
+    public static Object newRegExp(final String expression, final String options) {
+        if (options == null) {
+            return new NativeRegExp(expression);
+        }
+        return new NativeRegExp(expression, options);
+    }
+
+    /**
+     * Get the object prototype
+     *
+     * @return the object prototype
+     */
+    public static ScriptObject objectPrototype() {
+        return Global.instance().getObjectPrototype();
+    }
+
+    /**
+     * Create a new empty object instance.
+     *
+     * @return New empty object.
+     */
+    public static ScriptObject newEmptyInstance() {
+        final ScriptObject sobj = new JO$();
+        sobj.setProto(objectPrototype());
+        return sobj;
+    }
+
+    /**
+     * Check if a given object is a ScriptObject, raises an exception if this is
+     * not the case
+     *
+     * @param obj and object to check
+     */
+    public static void checkObject(final Object obj) {
+        if (!(obj instanceof ScriptObject)) {
+            typeError(instance(), "not.an.object", ScriptRuntime.safeToString(obj));
+        }
+    }
+
+    /**
+     * ECMA 9.10 - implementation of CheckObjectCoercible, i.e. raise an exception
+     * if this object is null or undefined.
+     *
+     * @param obj an object to check
+     */
+    public static void checkObjectCoercible(final Object obj) {
+        if (obj == null || obj == UNDEFINED) {
+            typeError(instance(), "not.an.object", ScriptRuntime.safeToString(obj));
+        }
+    }
+
+    /**
+     * Get the current split state.
+     *
+     * @return current split state
+     */
+    @Override
+    public int getSplitState() {
+        return splitState;
+    }
+
+    /**
+     * Set the current split state.
+     *
+     * @param state current split state
+     */
+    @Override
+    public void setSplitState(final int state) {
+        splitState = state;
+    }
+
+    private void init() {
+        // initialize Function and Object constructor
+        initFunctionAndObject();
+
+        // Now fix Global's own proto.
+        this.setProto(getObjectPrototype());
+
+        // initialize global function properties
+        this.eval = this.builtinEval = ScriptFunctionImpl.makeFunction("eval", EVAL);
+        ((ScriptFunction)this.eval).setArity(1);
+
+        this.parseInt           = ScriptFunctionImpl.makeFunction("parseInt",   GlobalFunctions.PARSEINT);
+        this.parseFloat         = ScriptFunctionImpl.makeFunction("parseFloat", GlobalFunctions.PARSEFLOAT);
+        this.isNaN              = ScriptFunctionImpl.makeFunction("isNaN",      GlobalFunctions.IS_NAN);
+        this.isFinite           = ScriptFunctionImpl.makeFunction("isFinite",   GlobalFunctions.IS_FINITE);
+        this.encodeURI          = ScriptFunctionImpl.makeFunction("encodeURI",  GlobalFunctions.ENCODE_URI);
+        this.encodeURIComponent = ScriptFunctionImpl.makeFunction("encodeURIComponent", GlobalFunctions.ENCODE_URICOMPONENT);
+        this.decodeURI          = ScriptFunctionImpl.makeFunction("decodeURI",  GlobalFunctions.DECODE_URI);
+        this.decodeURIComponent = ScriptFunctionImpl.makeFunction("decodeURIComponent", GlobalFunctions.DECODE_URICOMPONENT);
+        this.escape             = ScriptFunctionImpl.makeFunction("escape",     GlobalFunctions.ESCAPE);
+        this.unescape           = ScriptFunctionImpl.makeFunction("unescape",   GlobalFunctions.UNESCAPE);
+        this.print              = ScriptFunctionImpl.makeFunction("print",      getContext()._print_no_newline ? PRINT : PRINTLN);
+        this.load               = ScriptFunctionImpl.makeFunction("load",       LOAD);
+
+        // built-in constructors
+        this.builtinArray     = (ScriptFunction)initConstructor("Array");
+        this.builtinBoolean   = (ScriptFunction)initConstructor("Boolean");
+        this.builtinDate      = (ScriptFunction)initConstructor("Date");
+        this.builtinJSON      = initConstructor("JSON");
+        this.builtinJSAdapter = (ScriptFunction)initConstructor("JSAdapter");
+        this.builtinMath      = initConstructor("Math");
+        this.builtinNumber    = (ScriptFunction)initConstructor("Number");
+        this.builtinRegExp    = (ScriptFunction)initConstructor("RegExp");
+        this.builtinString    = (ScriptFunction)initConstructor("String");
+
+        // initialize String.prototype.length to 0
+        // add String.prototype.length
+        final ScriptObject stringPrototype = getStringPrototype();
+        stringPrototype.addOwnProperty("length", Attribute.NON_ENUMERABLE_CONSTANT, 0.0);
+
+        // add Array.prototype.length
+        final ScriptObject arrayPrototype = getArrayPrototype();
+        arrayPrototype.addOwnProperty("length", Attribute.NON_ENUMERABLE_CONSTANT, 0.0);
+
+        this.DEFAULT_DATE = new NativeDate(Double.NaN);
+
+        // initialize default regexp object
+        this.DEFAULT_REGEXP = new NativeRegExp("(?:)");
+
+        // RegExp.prototype should behave like a RegExp object. So copy the
+        // properties.
+        final ScriptObject regExpProto = getRegExpPrototype();
+        regExpProto.addBoundProperties(DEFAULT_REGEXP);
+
+        // Error stuff
+        initErrorObjects();
+
+        // java access
+        initJavaAccess();
+
+        initTypedArray();
+
+        if (getContext()._scripting) {
+            initScripting();
+        }
+
+        if (Context.DEBUG) {
+            initDebug();
+        }
+
+        copyBuiltins();
+
+        // initialized with strings so that typeof will work as expected.
+        this.__FILE__ = "";
+        this.__DIR__  = "";
+        this.__LINE__ = 0.0;
+
+        // expose script (command line) arguments as "arguments" property of global
+        final List<String> arguments = getContext().getOptions().getArguments();
+        final Object argsObj = wrapAsObject(arguments.toArray());
+
+        addOwnProperty("arguments", Attribute.NOT_ENUMERABLE, argsObj);
+        if (getContext()._scripting) {
+            // synonym for "arguments" in scripting mode
+            addOwnProperty("$ARG", Attribute.NOT_ENUMERABLE, argsObj);
+        }
+    }
+
+    private void initErrorObjects() {
+        // Error objects
+        this.builtinError = (ScriptFunction)initConstructor("Error");
+        final ScriptObject errorProto = getErrorPrototype();
+        final boolean strict = Global.isStrict();
+
+        // Nashorn specific accessors on Error.prototype - stack, lineNumber, columnNumber and fileName
+        final ScriptFunction getStack = ScriptFunctionImpl.makeFunction("getStack", NativeError.GET_STACK);
+        final ScriptFunction setStack = ScriptFunctionImpl.makeFunction("setStack", NativeError.SET_STACK);
+        errorProto.addOwnProperty("stack", Attribute.NOT_ENUMERABLE, getStack, setStack);
+        final ScriptFunction getLineNumber = ScriptFunctionImpl.makeFunction("getLineNumber", NativeError.GET_LINENUMBER);
+        final ScriptFunction setLineNumber = ScriptFunctionImpl.makeFunction("setLineNumber", NativeError.SET_LINENUMBER);
+        errorProto.addOwnProperty("lineNumber", Attribute.NOT_ENUMERABLE, getLineNumber, setLineNumber);
+        final ScriptFunction getColumnNumber = ScriptFunctionImpl.makeFunction("getColumnNumber", NativeError.GET_COLUMNNUMBER);
+        final ScriptFunction setColumnNumber = ScriptFunctionImpl.makeFunction("setColumnNumber", NativeError.SET_COLUMNNUMBER);
+        errorProto.addOwnProperty("columnNumber", Attribute.NOT_ENUMERABLE, getColumnNumber, setColumnNumber);
+        final ScriptFunction getFileName = ScriptFunctionImpl.makeFunction("getFileName", NativeError.GET_FILENAME);
+        final ScriptFunction setFileName = ScriptFunctionImpl.makeFunction("setFileName", NativeError.SET_FILENAME);
+        errorProto.addOwnProperty("fileName", Attribute.NOT_ENUMERABLE, getFileName, setFileName);
+
+        // ECMA 15.11.4.2 Error.prototype.name
+        // Error.prototype.name = "Error";
+        errorProto.set(NativeError.NAME, "Error", strict);
+        // ECMA 15.11.4.3 Error.prototype.message
+        // Error.prototype.message = "";
+        errorProto.set(NativeError.MESSAGE, "", strict);
+
+        this.builtinEvalError = initErrorSubtype("EvalError", errorProto);
+        this.builtinRangeError = initErrorSubtype("RangeError", errorProto);
+        this.builtinReferenceError = initErrorSubtype("ReferenceError", errorProto);
+        this.builtinSyntaxError = initErrorSubtype("SyntaxError", errorProto);
+        this.builtinTypeError = initErrorSubtype("TypeError", errorProto);
+        this.builtinURIError = initErrorSubtype("URIError", errorProto);
+    }
+
+    private ScriptFunction initErrorSubtype(final String name, final ScriptObject errorProto) {
+        final ScriptObject cons = initConstructor(name);
+        final ScriptObject prototype = ScriptFunction.getPrototype(cons);
+        final boolean strict = Global.isStrict();
+        prototype.set(NativeError.NAME, name, strict);
+        prototype.set(NativeError.MESSAGE, "", strict);
+        prototype.setProto(errorProto);
+        return (ScriptFunction)cons;
+    }
+
+    private void initJavaAccess() {
+        final ScriptObject objectProto = getObjectPrototype();
+        this.builtinPackages = new NativeJavaPackage("", objectProto);
+        this.builtinJava = new NativeJavaPackage("java", objectProto);
+        this.builtinJavax = new NativeJavaPackage("javax", objectProto);
+        this.builtinJavaImporter = initConstructor("JavaImporter");
+        this.builtinJavaApi = initConstructor("Java");
+    }
+
+    private void initScripting() {
+        Object value;
+        value = ScriptFunctionImpl.makeFunction("readLine", ScriptingFunctions.READLINE);
+        addOwnProperty("readLine", Attribute.NOT_ENUMERABLE, value);
+
+        value = ScriptFunctionImpl.makeFunction("read", ScriptingFunctions.READ);
+        addOwnProperty("read", Attribute.NOT_ENUMERABLE, value);
+
+        value = ScriptFunctionImpl.makeFunction("quit", ScriptingFunctions.QUIT);
+        addOwnProperty("quit", Attribute.NOT_ENUMERABLE, value);
+
+        // Nashorn extension: global.echo (scripting-mode-only)
+        // alias for "print"
+        value = get("print");
+        addOwnProperty("echo", Attribute.NOT_ENUMERABLE, value);
+
+        // Nashorn extension: global.$OPTIONS (scripting-mode-only)
+        // expose current Context to access command line options
+        value = this.getContext();
+        addOwnProperty("$OPTIONS", Attribute.NOT_ENUMERABLE, value);
+    }
+
+    private void initTypedArray() {
+        this.builtinArrayBuffer       = initConstructor("ArrayBuffer");
+        this.builtinInt8Array         = initConstructor("Int8Array");
+        this.builtinUint8Array        = initConstructor("Uint8Array");
+        this.builtinUint8ClampedArray = initConstructor("Uint8ClampedArray");
+        this.builtinInt16Array        = initConstructor("Int16Array");
+        this.builtinUint16Array       = initConstructor("Uint16Array");
+        this.builtinInt32Array        = initConstructor("Int32Array");
+        this.builtinUint32Array       = initConstructor("Uint32Array");
+        this.builtinFloat32Array      = initConstructor("Float32Array");
+        this.builtinFloat64Array      = initConstructor("Float64Array");
+    }
+
+    private void copyBuiltins() {
+        this.array             = this.builtinArray;
+        this._boolean          = this.builtinBoolean;
+        this.date              = this.builtinDate;
+        this.error             = this.builtinError;
+        this.evalError         = this.builtinEvalError;
+        this.function          = this.builtinFunction;
+        this.jsadapter         = this.builtinJSAdapter;
+        this.json              = this.builtinJSON;
+        this.java              = this.builtinJava;
+        this.javax             = this.builtinJavax;
+        this.javaImporter      = this.builtinJavaImporter;
+        this.javaApi           = this.builtinJavaApi;
+        this.math              = this.builtinMath;
+        this.number            = this.builtinNumber;
+        this.object            = this.builtinObject;
+        this.packages          = this.builtinPackages;
+        this.rangeError        = this.builtinRangeError;
+        this.referenceError    = this.builtinReferenceError;
+        this.regexp            = this.builtinRegExp;
+        this.string            = this.builtinString;
+        this.syntaxError       = this.builtinSyntaxError;
+        this.typeError         = this.builtinTypeError;
+        this.uriError          = this.builtinURIError;
+        this.arrayBuffer       = this.builtinArrayBuffer;
+        this.int8Array         = this.builtinInt8Array;
+        this.uint8Array        = this.builtinUint8Array;
+        this.uint8ClampedArray = this.builtinUint8ClampedArray;
+        this.int16Array        = this.builtinInt16Array;
+        this.uint16Array       = this.builtinUint16Array;
+        this.int32Array        = this.builtinInt32Array;
+        this.uint32Array       = this.builtinUint32Array;
+        this.float32Array      = this.builtinFloat32Array;
+        this.float64Array      = this.builtinFloat64Array;
+    }
+
+    private void initDebug() {
+        this.addOwnProperty("Debug", Attribute.NOT_ENUMERABLE, initConstructor("Debug"));
+    }
+
+    @SuppressWarnings("resource")
+    private static Object printImpl(final boolean newLine, final Object... objects) {
+        final PrintWriter out = Global.getThisContext().getOut();
+
+        boolean first = true;
+        for (final Object object : objects) {
+            if (first) {
+                first = false;
+            } else {
+                out.print(' ');
+            }
+
+            out.print(JSType.toString(object));
+        }
+
+        if (newLine) {
+            out.println();
+        }
+
+        out.flush();
+
+        return UNDEFINED;
+    }
+
+    /**
+     * These classes are generated by nasgen tool and so we have to use
+     * reflection to load and create new instance of these classes.
+     */
+    private ScriptObject initConstructor(final String name) {
+        try {
+            // Assuming class name pattern for built-in JS constructors.
+            final StringBuilder sb = new StringBuilder("jdk.nashorn.internal.objects.");
+
+            sb.append("Native");
+            sb.append(name);
+            sb.append("$Constructor");
+
+            final Class<?>     funcClass = Class.forName(sb.toString());
+            final ScriptObject res       = (ScriptObject)funcClass.newInstance();
+
+            if (res instanceof ScriptFunction) {
+                // All global constructor prototypes are not-writable,
+                // not-enumerable and not-configurable.
+                final ScriptFunction func = (ScriptFunction)res;
+                func.modifyOwnProperty(func.getProperty("prototype"), Attribute.NON_ENUMERABLE_CONSTANT);
+            }
+
+            if (res.getProto() == null) {
+                res.setProto(getObjectPrototype());
+            }
+
+            return res;
+
+        } catch (final ClassNotFoundException | InstantiationException | IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    // Function and Object constructors are inter-dependent. Also,
+    // Function.prototype
+    // functions are not properly initialized. We fix the references here.
+    // NOTE: be careful if you want to re-order the operations here. You may
+    // have
+    // to play with object references carefully!!
+    private void initFunctionAndObject() {
+        // First-n-foremost is Function
+        this.builtinFunction = (ScriptFunction)initConstructor("Function");
+
+        // create global anonymous function
+        final ScriptFunction anon = ScriptFunctionImpl.newAnonymousFunction();
+        // need to copy over members of Function.prototype to anon function
+        anon.addBoundProperties(getFunctionPrototype());
+
+        // Function.prototype === Object.getPrototypeOf(Function) ===
+        // <anon-function>
+        builtinFunction.setProto(anon);
+        builtinFunction.setPrototype(anon);
+        anon.set("constructor", builtinFunction, anon.isStrict());
+        anon.deleteOwnProperty(anon.getMap().findProperty("prototype"));
+
+        // now initialize Object
+        this.builtinObject = (ScriptFunction)initConstructor("Object");
+        final ScriptObject ObjectPrototype = getObjectPrototype();
+        // Object.getPrototypeOf(Function.prototype) === Object.prototype
+        anon.setProto(ObjectPrototype);
+
+        // Function valued properties of Function.prototype were not properly
+        // initialized. Because, these were created before global.function and
+        // global.object were not initialized.
+        jdk.nashorn.internal.runtime.Property[] properties = getFunctionPrototype().getMap().getProperties();
+        for (final jdk.nashorn.internal.runtime.Property property : properties) {
+            final Object key = property.getKey();
+            final Object value = builtinFunction.get(key);
+
+            if (value instanceof ScriptFunction && value != anon) {
+                final ScriptFunction func = (ScriptFunction)value;
+                func.setProto(getFunctionPrototype());
+                final ScriptObject prototype = ScriptFunction.getPrototype(func);
+                if (prototype != null) {
+                    prototype.setProto(ObjectPrototype);
+                }
+            }
+        }
+
+        // For function valued properties of Object and Object.prototype, make
+        // sure prototype's proto chain ends with Object.prototype
+        for (final jdk.nashorn.internal.runtime.Property property : builtinObject.getMap().getProperties()) {
+            final Object key = property.getKey();
+            final Object value = builtinObject.get(key);
+
+            if (value instanceof ScriptFunction) {
+                final ScriptFunction func = (ScriptFunction)value;
+                final ScriptObject prototype = ScriptFunction.getPrototype(func);
+                if (prototype != null) {
+                    prototype.setProto(ObjectPrototype);
+                }
+            }
+        }
+
+        properties = getObjectPrototype().getMap().getProperties();
+        for (final jdk.nashorn.internal.runtime.Property property : properties) {
+            final Object key   = property.getKey();
+            final Object value = ObjectPrototype.get(key);
+
+            if (key.equals("constructor")) {
+                continue;
+            }
+
+            if (value instanceof ScriptFunction) {
+                final ScriptFunction func = (ScriptFunction)value;
+                final ScriptObject prototype = ScriptFunction.getPrototype(func);
+                if (prototype != null) {
+                    prototype.setProto(ObjectPrototype);
+                }
+            }
+        }
+    }
+
+
+    private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
+        return MH.findStatic(MethodHandles.lookup(), Global.class, name, MH.type(rtype, types));
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeArguments.java b/nashorn/src/jdk/nashorn/internal/objects/NativeArguments.java
new file mode 100644
index 00000000000..f6ef19b98ef
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeArguments.java
@@ -0,0 +1,625 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static jdk.nashorn.internal.runtime.arrays.ArrayIndex.getArrayIndexNoThrow;
+import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.util.Arrays;
+import java.util.BitSet;
+import jdk.nashorn.internal.runtime.Property;
+import jdk.nashorn.internal.runtime.PropertyDescriptor;
+import jdk.nashorn.internal.runtime.PropertyMap;
+import jdk.nashorn.internal.runtime.ScriptFunction;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
+import jdk.nashorn.internal.runtime.arrays.ArrayData;
+import jdk.nashorn.internal.runtime.arrays.ArrayIndex;
+import jdk.nashorn.internal.runtime.linker.Lookup;
+
+/**
+ * ECMA 10.6 Arguments Object.
+ *
+ * Arguments object used for non-strict mode functions. For strict mode, we use
+ * a different implementation (@see NativeStrictArguments). In non-strict mode,
+ * named argument access and index argument access (arguments[i]) are linked.
+ * Modifications reflect on each other access -- till arguments indexed element
+ * is deleted. After delete, there is no link between named access and indexed
+ * access for that deleted index alone.
+ */
+public final class NativeArguments extends ScriptObject {
+
+    private static final MethodHandle G$LENGTH = findOwnMH("G$length", Object.class, Object.class);
+    private static final MethodHandle S$LENGTH = findOwnMH("S$length", void.class, Object.class, Object.class);
+    private static final MethodHandle G$CALLEE = findOwnMH("G$callee", Object.class, Object.class);
+    private static final MethodHandle S$CALLEE = findOwnMH("S$callee", void.class, Object.class, Object.class);
+
+    private static final PropertyMap nasgenmap$;
+
+    static {
+        PropertyMap map = PropertyMap.newMap(NativeArguments.class);
+        map = Lookup.newProperty(map, "length", Property.NOT_ENUMERABLE, G$LENGTH, S$LENGTH);
+        map = Lookup.newProperty(map, "callee", Property.NOT_ENUMERABLE, G$CALLEE, S$CALLEE);
+        nasgenmap$ = map;
+    }
+
+    private Object length;
+    private Object callee;
+    private ArrayData namedArgs;
+    // This is lazily initialized - only when delete is invoked at all
+    private BitSet deleted;
+
+    NativeArguments(final Object[] arguments, final Object callee, final int numParams) {
+        super(nasgenmap$);
+        setIsArguments();
+
+        setArray(ArrayData.allocate(arguments));
+        this.length = arguments.length;
+        this.callee = callee;
+
+        /**
+         * Declared number of parameters may be more or less than the actual passed
+         * runtime arguments count. We need to truncate or extend with undefined values.
+         *
+         * Example:
+         *
+         * // less declared params
+         * (function (x) { print(arguments); })(20, 44);
+         *
+         * // more declared params
+         * (function (x, y) { print(arguments); })(3);
+         */
+        final Object[] newValues = new Object[numParams];
+        if (numParams > arguments.length) {
+            Arrays.fill(newValues, UNDEFINED);
+        }
+        System.arraycopy(arguments, 0, newValues, 0, Math.min(newValues.length, arguments.length));
+        this.namedArgs = ArrayData.allocate(newValues);
+
+        // set Object.prototype as __proto__
+        this.setProto(Global.objectPrototype());
+    }
+
+    @Override
+    public String getClassName() {
+        return "Arguments";
+    }
+
+    /**
+     * getArgument is used for named argument access.
+     */
+    @Override
+    public Object getArgument(final int key) {
+        return namedArgs.has(key) ? namedArgs.getObject(key) : UNDEFINED;
+    }
+
+    /**
+     * setArgument is used for named argument set.
+     */
+    @Override
+    public void setArgument(final int key, final Object value) {
+        if (namedArgs.has(key)) {
+            namedArgs.set(key, value, false);
+        }
+    }
+
+    @Override
+    public int getInt(final Object key) {
+        final int index = getArrayIndexNoThrow(key);
+        return isMapped(index) ? namedArgs.getInt(index) : super.getInt(key);
+    }
+
+    @Override
+    public int getInt(final double key) {
+        final int index = getArrayIndexNoThrow(key);
+        return isMapped(index) ? namedArgs.getInt(index) : super.getInt(key);
+    }
+
+    @Override
+    public int getInt(final long key) {
+        final int index = getArrayIndexNoThrow(key);
+        return isMapped(index) ? namedArgs.getInt(index) : super.getInt(key);
+    }
+
+    @Override
+    public int getInt(final int key) {
+        final int index = getArrayIndexNoThrow(key);
+        return isMapped(index) ? namedArgs.getInt(index) : super.getInt(key);
+    }
+
+    @Override
+    public long getLong(final Object key) {
+        final int index = getArrayIndexNoThrow(key);
+        return isMapped(index) ? namedArgs.getLong(index) : super.getLong(key);
+    }
+
+    @Override
+    public long getLong(final double key) {
+        final int index = getArrayIndexNoThrow(key);
+        return isMapped(index) ? namedArgs.getLong(index) : super.getLong(key);
+    }
+
+    @Override
+    public long getLong(final long key) {
+        final int index = getArrayIndexNoThrow(key);
+        return isMapped(index) ? namedArgs.getLong(index) : super.getLong(key);
+    }
+
+    @Override
+    public long getLong(final int key) {
+        final int index = getArrayIndexNoThrow(key);
+        return isMapped(index) ? namedArgs.getLong(index) : super.getLong(key);
+    }
+
+    @Override
+    public double getDouble(final Object key) {
+        final int index = getArrayIndexNoThrow(key);
+        return isMapped(index) ? namedArgs.getDouble(index) : super.getDouble(key);
+    }
+
+    @Override
+    public double getDouble(final double key) {
+        final int index = getArrayIndexNoThrow(key);
+        return isMapped(index) ? namedArgs.getDouble(index) : super.getDouble(key);
+    }
+
+    @Override
+    public double getDouble(final long key) {
+        final int index = getArrayIndexNoThrow(key);
+        return isMapped(index) ? namedArgs.getDouble(index) : super.getDouble(key);
+    }
+
+    @Override
+    public double getDouble(final int key) {
+        final int index = getArrayIndexNoThrow(key);
+        return isMapped(index) ? namedArgs.getDouble(index) : super.getDouble(key);
+    }
+
+    @Override
+    public Object get(final Object key) {
+        final int index = getArrayIndexNoThrow(key);
+        return isMapped(index) ? namedArgs.getObject(index) : super.get(key);
+    }
+
+    @Override
+    public Object get(final double key) {
+        final int index = getArrayIndexNoThrow(key);
+        return isMapped(index) ? namedArgs.getObject(index) : super.get(key);
+    }
+
+    @Override
+    public Object get(final long key) {
+        final int index = getArrayIndexNoThrow(key);
+        return isMapped(index) ? namedArgs.getObject(index) : super.get(key);
+    }
+
+    @Override
+    public Object get(final int key) {
+        final int index = getArrayIndexNoThrow(key);
+        return isMapped(index) ? namedArgs.getObject(index) : super.get(key);
+    }
+
+    @Override
+    public void set(final Object key, final int value, final boolean strict) {
+        final int index = getArrayIndexNoThrow(key);
+        if (isMapped(index)) {
+            namedArgs = namedArgs.set(index, value, strict);
+        } else {
+            super.set(key, value, strict);
+        }
+    }
+
+    @Override
+    public void set(final Object key, final long value, final boolean strict) {
+        final int index = getArrayIndexNoThrow(key);
+        if (isMapped(index)) {
+            namedArgs = namedArgs.set(index, value, strict);
+        } else {
+            super.set(key, value, strict);
+        }
+    }
+
+    @Override
+    public void set(final Object key, final double value, final boolean strict) {
+        final int index = getArrayIndexNoThrow(key);
+        if (isMapped(index)) {
+            namedArgs = namedArgs.set(index, value, strict);
+        } else {
+            super.set(key, value, strict);
+        }
+    }
+
+    @Override
+    public void set(final Object key, final Object value, final boolean strict) {
+        final int index = getArrayIndexNoThrow(key);
+        if (isMapped(index)) {
+            namedArgs = namedArgs.set(index, value, strict);
+        } else {
+            super.set(key, value, strict);
+        }
+    }
+
+    @Override
+    public void set(final double key, final int value, final boolean strict) {
+        final int index = getArrayIndexNoThrow(key);
+        if (isMapped(index)) {
+            namedArgs = namedArgs.set(index, value, strict);
+        } else {
+            super.set(key, value, strict);
+        }
+    }
+
+    @Override
+    public void set(final double key, final long value, final boolean strict) {
+        final int index = getArrayIndexNoThrow(key);
+        if (isMapped(index)) {
+            namedArgs = namedArgs.set(index, value, strict);
+        } else {
+            super.set(key, value, strict);
+        }
+    }
+
+    @Override
+    public void set(final double key, final double value, final boolean strict) {
+        final int index = getArrayIndexNoThrow(key);
+        if (isMapped(index)) {
+            namedArgs = namedArgs.set(index, value, strict);
+        } else {
+            super.set(key, value, strict);
+        }
+    }
+
+    @Override
+    public void set(final double key, final Object value, final boolean strict) {
+        final int index = getArrayIndexNoThrow(key);
+        if (isMapped(index)) {
+            namedArgs = namedArgs.set(index, value, strict);
+        } else {
+            super.set(key, value, strict);
+        }
+    }
+
+    @Override
+    public void set(final long key, final int value, final boolean strict) {
+        final int index = getArrayIndexNoThrow(key);
+        if (isMapped(index)) {
+            namedArgs = namedArgs.set(index, value, strict);
+        } else {
+            super.set(key, value, strict);
+        }
+    }
+
+    @Override
+    public void set(final long key, final long value, final boolean strict) {
+        final int index = getArrayIndexNoThrow(key);
+        if (isMapped(index)) {
+            namedArgs = namedArgs.set(index, value, strict);
+        } else {
+            super.set(key, value, strict);
+        }
+    }
+
+    @Override
+    public void set(final long key, final double value, final boolean strict) {
+        final int index = getArrayIndexNoThrow(key);
+        if (isMapped(index)) {
+            namedArgs = namedArgs.set(index, value, strict);
+        } else {
+            super.set(key, value, strict);
+        }
+    }
+
+    @Override
+    public void set(final long key, final Object value, final boolean strict) {
+        final int index = getArrayIndexNoThrow(key);
+        if (isMapped(index)) {
+            namedArgs = namedArgs.set(index, value, strict);
+        } else {
+            super.set(key, value, strict);
+        }
+    }
+
+    @Override
+    public void set(final int key, final int value, final boolean strict) {
+        final int index = getArrayIndexNoThrow(key);
+        if (isMapped(index)) {
+            namedArgs = namedArgs.set(index, value, strict);
+        } else {
+            super.set(key, value, strict);
+        }
+    }
+
+    @Override
+    public void set(final int key, final long value, final boolean strict) {
+        final int index = getArrayIndexNoThrow(key);
+        if (isMapped(index)) {
+            namedArgs = namedArgs.set(index, value, strict);
+        } else {
+            super.set(key, value, strict);
+        }
+    }
+
+    @Override
+    public void set(final int key, final double value, final boolean strict) {
+        final int index = getArrayIndexNoThrow(key);
+        if (isMapped(index)) {
+            namedArgs = namedArgs.set(index, value, strict);
+        } else {
+            super.set(key, value, strict);
+        }
+    }
+
+    @Override
+    public void set(final int key, final Object value, final boolean strict) {
+        final int index = getArrayIndexNoThrow(key);
+        if (isMapped(index)) {
+            namedArgs = namedArgs.set(index, value, strict);
+        } else {
+            super.set(key, value, strict);
+        }
+    }
+
+    @Override
+    public boolean has(final Object key) {
+        final int index = getArrayIndexNoThrow(key);
+        return isMapped(index) || super.has(key);
+    }
+
+    @Override
+    public boolean has(final double key) {
+        final int index = getArrayIndexNoThrow(key);
+        return isMapped(index) || super.has(key);
+    }
+
+    @Override
+    public boolean has(final long key) {
+        final int index = getArrayIndexNoThrow(key);
+        return isMapped(index) || super.has(key);
+    }
+
+    @Override
+    public boolean has(final int key) {
+        final int index = getArrayIndexNoThrow(key);
+        return isMapped(index) || super.has(key);
+    }
+
+    @Override
+    public boolean hasOwnProperty(final Object key) {
+        final int index = getArrayIndexNoThrow(key);
+        return isMapped(index) || super.hasOwnProperty(key);
+    }
+
+    @Override
+    public boolean hasOwnProperty(final int key) {
+        final int index = getArrayIndexNoThrow(key);
+        return isMapped(index) || super.hasOwnProperty(key);
+    }
+
+    @Override
+    public boolean hasOwnProperty(final long key) {
+        final int index = getArrayIndexNoThrow(key);
+        return isMapped(index) || super.hasOwnProperty(key);
+    }
+
+    @Override
+    public boolean hasOwnProperty(final double key) {
+        final int index = getArrayIndexNoThrow(key);
+        return isMapped(index) || super.hasOwnProperty(key);
+    }
+
+    @Override
+    public boolean delete(final int key, final boolean strict) {
+        final int index = getArrayIndexNoThrow(key);
+        final boolean success = super.delete(key, strict);
+        if (success && namedArgs.has(index)) {
+            setDeleted(index);
+        }
+        return success;
+    }
+
+    @Override
+    public boolean delete(final long key, final boolean strict) {
+        final int index = getArrayIndexNoThrow(key);
+        final boolean success = super.delete(key, strict);
+        if (success && namedArgs.has(index)) {
+            setDeleted(index);
+        }
+        return success;
+    }
+
+    @Override
+    public boolean delete(final double key, final boolean strict) {
+        final int index = getArrayIndexNoThrow(key);
+        final boolean success = super.delete(key, strict);
+        if (success && namedArgs.has(index)) {
+            setDeleted(index);
+        }
+        return success;
+    }
+
+    @Override
+    public boolean delete(final Object key, final boolean strict) {
+        final int index = getArrayIndexNoThrow(key);
+        final boolean success = super.delete(key, strict);
+        if (success && namedArgs.has(index)) {
+            setDeleted(index);
+        }
+        return success;
+    }
+
+    /**
+     * ECMA 15.4.5.1 [[DefineOwnProperty]] ( P, Desc, Throw ) as specialized in
+     * ECMA 10.6 for Arguments object.
+     */
+    @Override
+    public boolean defineOwnProperty(final String key, final Object propertyDesc, final boolean reject) {
+        final int index = ArrayIndex.getArrayIndexNoThrow(key);
+        if (index >= 0) {
+            final boolean allowed = super.defineOwnProperty(key, propertyDesc, false);
+            if (!allowed) {
+                if (reject) {
+                    typeError(Global.instance(), "cant.redefine.property",  key, ScriptRuntime.safeToString(this));
+                }
+                return false;
+            }
+
+            if (isMapped(index)) {
+                // When mapped argument is redefined, if new descriptor is accessor property
+                // or data-non-writable property, we have to "unmap" (unlink).
+                final PropertyDescriptor desc = toPropertyDescriptor(Global.instance(), propertyDesc);
+                if (desc.type() == PropertyDescriptor.ACCESSOR) {
+                    setDeleted(index);
+                } else {
+                    // set "value" from new descriptor to named args
+                    if (desc.has(PropertyDescriptor.VALUE)) {
+                        namedArgs = namedArgs.set(index, desc.getValue(), false);
+                    }
+
+                    if (desc.has(PropertyDescriptor.WRITABLE) && !desc.isWritable()) {
+                        setDeleted(index);
+                    }
+                }
+            }
+
+            return true;
+        }
+
+        return super.defineOwnProperty(key, propertyDesc, reject);
+    }
+
+    // Internals below this point
+
+    // We track deletions using a bit set (delete arguments[index])
+    private boolean isDeleted(final int index) {
+        return (deleted != null) ? deleted.get(index) : false;
+    }
+
+    private void setDeleted(final int index) {
+        if (deleted == null) {
+            deleted = new BitSet((int)namedArgs.length());
+        }
+        deleted.set(index, true);
+    }
+
+    /**
+     * Are arguments[index] and corresponding named parameter linked?
+     *
+     * In non-strict mode, arguments[index] and corresponding named param
+     * are "linked" or "mapped". Modifications are tacked b/w each other - till
+     * (delete arguments[index]) is used. Once deleted, the corresponding arg
+     * is no longer 'mapped'. Please note that delete can happen only through
+     * the arguments array - named param can not be deleted. (delete is one-way).
+     */
+    private boolean isMapped(final int index) {
+        // in named args and not marked as "deleted"
+        return namedArgs.has(index) && !isDeleted(index);
+    }
+
+        /**
+     * Factory to create correct Arguments object based on strict mode.
+     *
+     * @param arguments the actual arguments array passed
+     * @param callee the callee function that uses arguments object
+     * @param numParams the number of declared (named) function parameters
+     * @return Arguments Object
+     */
+    public static ScriptObject allocate(final Object[] arguments, final ScriptFunction callee, final int numParams) {
+        final boolean isStrict = callee.isStrict();
+        return isStrict ? new NativeStrictArguments(arguments, numParams) : new NativeArguments(arguments, callee, numParams);
+    }
+
+    /**
+     * Length getter
+     * @param self self reference
+     * @return length property value
+     */
+    public static Object G$length(final Object self) {
+        if (self instanceof NativeArguments) {
+            return ((NativeArguments)self).getArgumentsLength();
+        }
+
+        return 0;
+    }
+
+    /**
+     * Length setter
+     * @param self self reference
+     * @param value value for length property
+     */
+    public static void S$length(final Object self, final Object value) {
+        if (self instanceof NativeArguments) {
+            ((NativeArguments)self).setArgumentsLength(value);
+        }
+    }
+
+    /**
+     * Callee getter
+     * @param self self reference
+     * @return value for callee property
+     */
+    public static Object G$callee(final Object self) {
+        if (self instanceof NativeArguments) {
+            return ((NativeArguments)self).getCallee();
+        }
+        return UNDEFINED;
+    }
+
+    /**
+     * Callee setter
+     * @param self self reference
+     * @param value value for callee property
+     */
+    public static void S$callee(final Object self, final Object value) {
+        if (self instanceof NativeArguments) {
+            ((NativeArguments)self).setCallee(value);
+        }
+    }
+
+    private Object getArgumentsLength() {
+        return length;
+    }
+
+    private void setArgumentsLength(final Object length) {
+        this.length = length;
+    }
+
+    private Object getCallee() {
+        return callee;
+    }
+
+    private void setCallee(final Object callee) {
+        this.callee = callee;
+    }
+
+    private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
+        return MH.findStatic(MethodHandles.lookup(), NativeArguments.class, name, MH.type(rtype, types));
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeArray.java b/nashorn/src/jdk/nashorn/internal/objects/NativeArray.java
new file mode 100644
index 00000000000..1a4ff783aa4
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeArray.java
@@ -0,0 +1,1281 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+import static jdk.nashorn.internal.runtime.ECMAErrors.rangeError;
+import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static jdk.nashorn.internal.runtime.PropertyDescriptor.VALUE;
+import static jdk.nashorn.internal.runtime.PropertyDescriptor.WRITABLE;
+import static jdk.nashorn.internal.runtime.arrays.ArrayLikeIterator.arrayLikeIterator;
+import static jdk.nashorn.internal.runtime.arrays.ArrayLikeIterator.reverseArrayLikeIterator;
+
+import java.lang.invoke.MethodHandle;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import jdk.nashorn.internal.objects.annotations.Attribute;
+import jdk.nashorn.internal.objects.annotations.Constructor;
+import jdk.nashorn.internal.objects.annotations.Function;
+import jdk.nashorn.internal.objects.annotations.Getter;
+import jdk.nashorn.internal.objects.annotations.ScriptClass;
+import jdk.nashorn.internal.objects.annotations.Setter;
+import jdk.nashorn.internal.objects.annotations.SpecializedConstructor;
+import jdk.nashorn.internal.objects.annotations.Where;
+import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.PropertyDescriptor;
+import jdk.nashorn.internal.runtime.ScriptFunction;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
+import jdk.nashorn.internal.runtime.Undefined;
+import jdk.nashorn.internal.runtime.arrays.ArrayData;
+import jdk.nashorn.internal.runtime.arrays.ArrayIndex;
+import jdk.nashorn.internal.runtime.arrays.ArrayLikeIterator;
+import jdk.nashorn.internal.runtime.arrays.IteratorAction;
+import jdk.nashorn.internal.runtime.linker.Bootstrap;
+import jdk.nashorn.internal.runtime.linker.InvokeByName;
+
+/**
+ * Runtime representation of a JavaScript array. NativeArray only holds numeric
+ * keyed values. All other values are stored in spill.
+ */
+@ScriptClass("Array")
+public final class NativeArray extends ScriptObject {
+    private static final InvokeByName JOIN = new InvokeByName("join", ScriptObject.class);
+
+    private static final MethodHandle EVERY_CALLBACK_INVOKER   = createIteratorCallbackInvoker(boolean.class);
+    private static final MethodHandle SOME_CALLBACK_INVOKER    = createIteratorCallbackInvoker(boolean.class);
+    private static final MethodHandle FOREACH_CALLBACK_INVOKER = createIteratorCallbackInvoker(void.class);
+    private static final MethodHandle MAP_CALLBACK_INVOKER     = createIteratorCallbackInvoker(Object.class);
+    private static final MethodHandle FILTER_CALLBACK_INVOKER  = createIteratorCallbackInvoker(boolean.class);
+
+    private static final MethodHandle REDUCE_CALLBACK_INVOKER = Bootstrap.createDynamicInvoker("dyn:call", Object.class,
+            Object.class, Undefined.class, Object.class, Object.class, int.class, Object.class);
+    private static final MethodHandle CALL_CMP                = Bootstrap.createDynamicInvoker("dyn:call", int.class,
+            ScriptFunction.class, Object.class, Object.class, Object.class);
+
+    private static final InvokeByName TO_LOCALE_STRING = new InvokeByName("toLocaleString", ScriptObject.class, String.class);
+
+
+    /*
+     * Constructors.
+     */
+    NativeArray() {
+        this(ArrayData.initialArray());
+    }
+
+    NativeArray(final long length) {
+        // TODO assert valid index in long before casting
+        this(ArrayData.allocate((int) length));
+    }
+
+    NativeArray(final int[] array) {
+        this(ArrayData.allocate(array));
+    }
+
+    NativeArray(final long[] array) {
+        this(ArrayData.allocate(array));
+    }
+
+    NativeArray(final double[] array) {
+        this(ArrayData.allocate(array));
+    }
+
+    NativeArray(final Object[] array) {
+        this(ArrayData.allocate(array.length));
+
+        ArrayData arrayData = this.getArray();
+        arrayData.ensure(array.length - 1);
+
+        for (int index = 0; index < array.length; index++) {
+            final Object value = array[index];
+
+            if (value == ScriptRuntime.EMPTY) {
+                arrayData = arrayData.delete(index);
+            } else {
+                arrayData = arrayData.set(index, value, getContext()._strict);
+            }
+        }
+
+        this.setArray(arrayData);
+    }
+
+    private NativeArray(final ArrayData arrayData) {
+        setProto(Global.instance().getArrayPrototype());
+        this.setArray(arrayData);
+        this.setIsArray();
+    }
+
+    @Override
+    public String getClassName() {
+        return "Array";
+    }
+
+    @Override
+    public Object getLength() {
+        return getArray().length() & JSType.MAX_UINT;
+    }
+
+    /**
+     * ECMA 15.4.5.1 [[DefineOwnProperty]] ( P, Desc, Throw )
+     */
+    @Override
+    public boolean defineOwnProperty(final String key, final Object propertyDesc, final boolean reject) {
+        final PropertyDescriptor desc = toPropertyDescriptor(Global.instance(), propertyDesc);
+
+        // never be undefined as "length" is always defined and can't be deleted for arrays
+        // Step 1
+        final PropertyDescriptor oldLenDesc = (PropertyDescriptor) super.getOwnPropertyDescriptor("length");
+
+        // Step 2
+        // get old length and convert to long
+        long oldLen = NativeArray.validLength(oldLenDesc.getValue(), true);
+
+        // Step 3
+        if ("length".equals(key)) {
+            // Step 3a
+            if (!desc.has(VALUE)) {
+                return super.defineOwnProperty("length", propertyDesc, reject);
+            }
+
+            // Step 3b
+            final PropertyDescriptor newLenDesc = desc;
+
+            // Step 3c and 3d - get new length and convert to long
+            final long newLen = NativeArray.validLength(newLenDesc.getValue(), true);
+
+            // Step 3e
+            newLenDesc.setValue(newLen);
+
+            // Step 3f
+            // increasing array length - just need to set new length value (and attributes if any) and return
+            if (newLen >= oldLen) {
+                return super.defineOwnProperty("length", newLenDesc, reject);
+            }
+
+            // Step 3g
+            if (!oldLenDesc.isWritable()) {
+                if (reject) {
+                    typeError(Global.instance(), "property.not.writable", "length", ScriptRuntime.safeToString(this));
+                }
+                return false;
+            }
+
+            // Step 3h and 3i
+            final boolean newWritable = (!newLenDesc.has(WRITABLE) || newLenDesc.isWritable());
+            if (!newWritable) {
+                newLenDesc.setWritable(true);
+            }
+
+            // Step 3j and 3k
+            final boolean succeeded = super.defineOwnProperty("length", newLenDesc, reject);
+            if (!succeeded) {
+                return false;
+            }
+
+            // Step 3l
+            // make sure that length is set till the point we can delete the old elements
+            while (newLen < oldLen) {
+                oldLen--;
+                final boolean deleteSucceeded = delete(oldLen, false);
+                if (!deleteSucceeded) {
+                    newLenDesc.setValue(oldLen + 1);
+                    if (!newWritable) {
+                        newLenDesc.setWritable(false);
+                    }
+                    super.defineOwnProperty("length", newLenDesc, false);
+                    if (reject) {
+                        typeError(Global.instance(), "property.not.writable", "length", ScriptRuntime.safeToString(this));
+                    }
+                    return false;
+                }
+            }
+
+            // Step 3m
+            if (!newWritable) {
+                // make 'length' property not writable
+                final ScriptObject newDesc = Global.newEmptyInstance();
+                newDesc.set(WRITABLE, false, false);
+                return super.defineOwnProperty("length", newDesc, false);
+            }
+
+            return true;
+        }
+
+        // Step 4a
+        final int index = ArrayIndex.getArrayIndexNoThrow(key);
+        if (ArrayIndex.isValidArrayIndex(index)) {
+            final long longIndex = ArrayIndex.toLongIndex(index);
+            // Step 4b
+            // setting an element beyond current length, but 'length' is not writable
+            if (longIndex >= oldLen && !oldLenDesc.isWritable()) {
+                if (reject) {
+                    typeError(Global.instance(), "property.not.writable", Long.toString(longIndex), ScriptRuntime.safeToString(this));
+                }
+                return false;
+            }
+
+            // Step 4c
+            // set the new array element
+            final boolean succeeded = super.defineOwnProperty(key, propertyDesc, false);
+
+            // Step 4d
+            if (!succeeded) {
+                if (reject) {
+                    typeError(Global.instance(), "cant.redefine.property", key, ScriptRuntime.safeToString(this));
+                }
+                return false;
+            }
+
+            // Step 4e -- adjust new length based on new element index that is set
+            if (longIndex >= oldLen) {
+                oldLenDesc.setValue(longIndex + 1);
+                super.defineOwnProperty("length", oldLenDesc, false);
+            }
+
+            // Step 4f
+            return true;
+        }
+
+        // not an index property
+        return super.defineOwnProperty(key, propertyDesc, reject);
+    }
+
+    /**
+     * Return the array contents upcasted as an ObjectArray, regardless of
+     * representation
+     *
+     * @return an object array
+     */
+    public Object[] asObjectArray() {
+        return getArray().asObjectArray();
+    }
+
+    /**
+     * ECMA 15.4.3.2 Array.isArray ( arg )
+     *
+     * @param self self reference
+     * @param arg  argument - object to check
+     * @return true if argument is an array
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object isArray(final Object self, final Object arg) {
+        return isArray(arg) || (arg == Global.instance().getArrayPrototype())
+                || (arg instanceof NativeRegExpExecResult);
+    }
+
+    /**
+     * Length getter
+     * @param self self reference
+     * @return the length of the object
+     */
+    @Getter(attributes = Attribute.NOT_ENUMERABLE | Attribute.NOT_CONFIGURABLE)
+    public static Object length(final Object self) {
+        if (isArray(self)) {
+            return ((NativeArray) self).getArray().length() & JSType.MAX_UINT;
+        }
+
+        return 0;
+    }
+
+    /**
+     * Length setter
+     * @param self   self reference
+     * @param length new length property
+     */
+    @Setter(attributes = Attribute.NOT_ENUMERABLE | Attribute.NOT_CONFIGURABLE)
+    public static void length(final Object self, final Object length) {
+        if (isArray(self)) {
+            ((NativeArray) self).setLength(validLength(length, true));
+        }
+    }
+
+    static long validLength(final Object length, final boolean reject) {
+        final double doubleLength = JSType.toNumber(length);
+        if (!Double.isNaN(doubleLength) && JSType.isRepresentableAsLong(doubleLength)) {
+            final long len = (long) doubleLength;
+            if (len >= 0 && len <= JSType.MAX_UINT) {
+                return len;
+            }
+        }
+        if (reject) {
+            rangeError(Global.instance(), "inappropriate.array.length", ScriptRuntime.safeToString(length));
+        }
+        return -1;
+    }
+
+    /**
+     * ECMA 15.4.4.2 Array.prototype.toString ( )
+     *
+     * @param self self reference
+     * @return string representation of array
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object toString(final Object self) {
+        if (self instanceof ScriptObject) {
+            final ScriptObject sobj = (ScriptObject) self;
+            try {
+                final Object join = JOIN.getGetter().invokeExact(sobj);
+                if (join instanceof ScriptFunction) {
+                    return JOIN.getInvoker().invokeExact(join, sobj);
+                }
+            } catch (final RuntimeException | Error e) {
+                throw e;
+            } catch (final Throwable t) {
+                throw new RuntimeException(t);
+            }
+        }
+
+        // FIXME: should lookup Object.prototype.toString and call that?
+        return ScriptRuntime.builtinObjectToString(self);
+    }
+
+    /**
+     * ECMA 15.4.4.3 Array.prototype.toLocaleString ( )
+     *
+     * @param self self reference
+     * @return locale specific string representation for array
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object toLocaleString(final Object self) {
+        final StringBuilder sb = new StringBuilder();
+        final Iterator<Object> iter = arrayLikeIterator(self, true);
+
+        while (iter.hasNext()) {
+            final Object obj = iter.next();
+
+            if (obj != null && obj != ScriptRuntime.UNDEFINED) {
+                final Object val = JSType.toObject(Global.instance(), obj);
+
+                try {
+                    if (val instanceof ScriptObject) {
+                        final ScriptObject sobj           = (ScriptObject)val;
+                        final Object       toLocaleString = TO_LOCALE_STRING.getGetter().invokeExact(sobj);
+
+                        if (toLocaleString instanceof ScriptFunction) {
+                            sb.append((String)TO_LOCALE_STRING.getInvoker().invokeExact(toLocaleString, sobj));
+                        } else {
+                            typeError(Global.instance(), "not.a.function", "toLocaleString");
+                        }
+                    }
+                } catch (final Error|RuntimeException t) {
+                    throw t;
+                } catch (final Throwable t) {
+                    throw new RuntimeException(t);
+                }
+            }
+
+            if (iter.hasNext()) {
+                sb.append(",");
+            }
+        }
+
+        return sb.toString();
+    }
+
+    /**
+     * ECMA 15.4.2.2 new Array (len)
+     *
+     * @param newObj was the new operator used to instantiate this array
+     * @param self   self reference
+     * @param args   arguments (length)
+     * @return the new NativeArray
+     */
+    @Constructor(arity = 1)
+    public static Object construct(final boolean newObj, final Object self, final Object... args) {
+        switch (args.length) {
+        case 0:
+            return new NativeArray(0);
+        case 1:
+            final Object len = args[0];
+            if (len instanceof Number) {
+                long length;
+                if (len instanceof Integer || len instanceof Long) {
+                    length = ((Number) len).longValue();
+                    if (length >= 0 && length < 0xffff_ffffL) {
+                        return new NativeArray(length);
+                    }
+                }
+
+                length = JSType.toUint32(len);
+
+                /*
+                 * If the argument len is a Number and ToUint32(len) is equal to
+                 * len, then the length property of the newly constructed object
+                 * is set to ToUint32(len). If the argument len is a Number and
+                 * ToUint32(len) is not equal to len, a RangeError exception is
+                 * thrown.
+                 */
+                final double numberLength = ((Number) len).doubleValue();
+                if (length != numberLength) {
+                    rangeError(Global.instance(), "inappropriate.array.length", JSType.toString(numberLength));
+                }
+
+                return new NativeArray(length);
+            }
+            /*
+             * If the argument len is not a Number, then the length property of
+             * the newly constructed object is set to 1 and the 0 property of
+             * the newly constructed object is set to len
+             */
+            return new NativeArray(new Object[]{args[0]});
+            //fallthru
+        default:
+            return new NativeArray(args);
+        }
+    }
+
+    /**
+     * ECMA 15.4.2.2 new Array (len)
+     *
+     * Specialized constructor for zero arguments - empty array
+     *
+     * @param newObj was the new operator used to instantiate this array
+     * @param self   self reference
+     * @return the new NativeArray
+     */
+    @SpecializedConstructor
+    public static Object construct(final boolean newObj, final Object self) {
+        return new NativeArray(0);
+    }
+
+    /**
+     * ECMA 15.4.2.2 new Array (len)
+     *
+     * Specialized constructor for one integer argument (length)
+     *
+     * @param newObj was the new operator used to instantiate this array
+     * @param self   self reference
+     * @param length array length
+     * @return the new NativeArray
+     */
+    @SpecializedConstructor
+    public static Object construct(final boolean newObj, final Object self, final int length) {
+        if (length >= 0) {
+            return new NativeArray(length);
+        }
+
+        return construct(newObj, self, new Object[]{length});
+    }
+
+    /**
+     * ECMA 15.4.2.2 new Array (len)
+     *
+     * Specialized constructor for one long argument (length)
+     *
+     * @param newObj was the new operator used to instantiate this array
+     * @param self   self reference
+     * @param length array length
+     * @return the new NativeArray
+     */
+    @SpecializedConstructor
+    public static Object construct(final boolean newObj, final Object self, final long length) {
+        if (length >= 0L && length <= JSType.MAX_UINT) {
+            return new NativeArray(length);
+        }
+
+        return construct(newObj, self, new Object[]{length});
+    }
+
+    /**
+     * ECMA 15.4.2.2 new Array (len)
+     *
+     * Specialized constructor for one double argument (length)
+     *
+     * @param newObj was the new operator used to instantiate this array
+     * @param self   self reference
+     * @param length array length
+     * @return the new NativeArray
+     */
+    @SpecializedConstructor
+    public static Object construct(final boolean newObj, final Object self, final double length) {
+        final long uint32length = JSType.toUint32(length);
+
+        if (uint32length == length) {
+            return new NativeArray(uint32length);
+        }
+
+        return construct(newObj, self, new Object[]{length});
+    }
+
+    /**
+     * ECMA 15.4.4.4 Array.prototype.concat ( [ item1 [ , item2 [ , ... ] ] ] )
+     *
+     * @param self self reference
+     * @param args arguments to concat
+     * @return resulting NativeArray
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
+    public static Object concat(final Object self, final Object... args) {
+        final ArrayList<Object> list = new ArrayList<>();
+        final Object selfToObject = Global.toObject(self);
+
+        if (isArray(selfToObject)) {
+            final Iterator<Object> iter = arrayLikeIterator(selfToObject, true);
+            while (iter.hasNext()) {
+                list.add(iter.next());
+            }
+        } else {
+            // single element, add it
+            list.add(selfToObject);
+        }
+
+        for (final Object obj : args) {
+            if (isArray(obj) || obj instanceof Iterable || (obj != null && obj.getClass().isArray())) {
+                final Iterator<Object> iter = arrayLikeIterator(obj, true);
+                if (iter.hasNext()) {
+                    while (iter.hasNext()) {
+                        list.add(iter.next());
+                    }
+                } else if (!isArray(obj)) {
+                    list.add(obj); // add empty object, but not an empty array
+                }
+            } else {
+                // single element, add it
+                list.add(obj);
+            }
+        }
+
+        return new NativeArray(list.toArray());
+    }
+
+    /**
+     * ECMA 15.4.4.5 Array.prototype.join (separator)
+     *
+     * @param self      self reference
+     * @param separator element separator
+     * @return string representation after join
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object join(final Object self, final Object separator) {
+        final String           sep  = separator == ScriptRuntime.UNDEFINED ? "," : JSType.toString(separator);
+        final StringBuilder    sb   = new StringBuilder();
+        final Iterator<Object> iter = arrayLikeIterator(self, true);
+
+        while (iter.hasNext()) {
+            final Object obj = iter.next();
+
+            if (obj != null && obj != ScriptRuntime.UNDEFINED) {
+                sb.append(JSType.toString(obj));
+            }
+
+            if (iter.hasNext()) {
+                sb.append(sep);
+            }
+        }
+
+        return sb.toString();
+    }
+
+    /**
+     * ECMA 15.4.4.6 Array.prototype.pop ()
+     *
+     * @param self self reference
+     * @return array after pop
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object pop(final Object self) {
+        try {
+            final ScriptObject sobj = (ScriptObject)self;
+            final boolean strict    = sobj.getContext()._strict;
+
+            if (bulkable(sobj)) {
+                return ((NativeArray)sobj).getArray().pop();
+            }
+
+            final long len = JSType.toUint32(sobj.getLength());
+
+            if (len == 0) {
+                sobj.set("length", 0, strict);
+                return ScriptRuntime.UNDEFINED;
+            }
+
+            final long   index   = len - 1;
+            final Object element = sobj.get(index);
+
+            sobj.delete(index, strict);
+            sobj.set("length", index, strict);
+
+            return element;
+        } catch (final ClassCastException | NullPointerException e) {
+            typeError(Global.instance(), "not.an.object", ScriptRuntime.safeToString(self));
+            return ScriptRuntime.UNDEFINED;
+        }
+    }
+
+    /**
+     * ECMA 15.4.4.7 Array.prototype.push (args...)
+     *
+     * @param self self reference
+     * @param args arguments to push
+     * @return array after pushes
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
+    public static Object push(final Object self, final Object... args) {
+        try {
+            final ScriptObject sobj   = (ScriptObject)self;
+            final boolean      strict = sobj.getContext()._strict;
+
+            if (bulkable(sobj)) {
+                final NativeArray nativeArray = (NativeArray)sobj;
+                if (nativeArray.getArray().length() + args.length <= JSType.MAX_UINT) {
+                    final ArrayData newData = nativeArray.getArray().push(nativeArray.getContext()._strict, args);
+                    nativeArray.setArray(newData);
+                    return newData.length();
+                }
+                //fallthru
+            }
+
+            long len = JSType.toUint32(sobj.getLength());
+            for (final Object element : args) {
+                sobj.set(len++, element, strict);
+            }
+            sobj.set("length", len, strict);
+
+            return len;
+        } catch (final ClassCastException | NullPointerException e) {
+            typeError(Global.instance(), "not.an.object", ScriptRuntime.safeToString(self));
+            return ScriptRuntime.UNDEFINED;
+        }
+    }
+
+    /**
+     * ECMA 15.4.4.8 Array.prototype.reverse ()
+     *
+     * @param self self reference
+     * @return reversed array
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object reverse(final Object self) {
+        try {
+            final ScriptObject sobj   = (ScriptObject)self;
+            final boolean      strict = sobj.getContext()._strict;
+            final long         len    = JSType.toUint32(sobj.getLength());
+            final long         middle = len / 2;
+
+            for (long lower = 0; lower != middle; lower++) {
+                final long    upper       = len - lower - 1;
+                final Object  lowerValue  = sobj.get(lower);
+                final Object  upperValue  = sobj.get(upper);
+                final boolean lowerExists = sobj.has(lower);
+                final boolean upperExists = sobj.has(upper);
+
+                if (lowerExists && upperExists) {
+                    sobj.set(lower, upperValue, strict);
+                    sobj.set(upper, lowerValue, strict);
+                } else if (!lowerExists && upperExists) {
+                    sobj.set(lower, upperValue, strict);
+                    sobj.delete(upper, strict);
+                } else if (lowerExists && !upperExists) {
+                    sobj.delete(lower, strict);
+                    sobj.set(upper, lowerValue, strict);
+                }
+            }
+            return sobj;
+        } catch (final ClassCastException | NullPointerException e) {
+            typeError(Global.instance(), "not.an.object", ScriptRuntime.safeToString(self));
+            return ScriptRuntime.UNDEFINED;
+        }
+    }
+
+    /**
+     * ECMA 15.4.4.9 Array.prototype.shift ()
+     *
+     * @param self self reference
+     * @return shifted array
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object shift(final Object self) {
+        final Object obj = Global.toObject(self);
+
+        Object first = ScriptRuntime.UNDEFINED;
+
+        if (!(obj instanceof ScriptObject)) {
+            return first;
+        }
+
+        final ScriptObject sobj   = (ScriptObject) obj;
+        final boolean      strict = Global.isStrict();
+
+        long len = JSType.toUint32(sobj.getLength());
+
+        if (len > 0) {
+            first = sobj.get(0);
+
+            if (bulkable(sobj)) {
+                ((NativeArray) sobj).getArray().shiftLeft(1);
+            } else {
+                for (long k = 1; k < len; k++) {
+                    sobj.set(k - 1, sobj.get(k), strict);
+                }
+            }
+            sobj.delete(--len, strict);
+        } else {
+            len = 0;
+        }
+
+        sobj.set("length", len, strict);
+
+        return first;
+    }
+
+    /**
+     * ECMA 15.4.4.10 Array.prototype.slice ( start [ , end ] )
+     *
+     * @param self  self reference
+     * @param start start of slice (inclusive)
+     * @param end   end of slice (optional, exclusive)
+     * @return sliced array
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object slice(final Object self, final Object start, final Object end) {
+        final Object       obj                 = Global.toObject(self);
+        final ScriptObject sobj                = (ScriptObject)obj;
+        final long         len                 = JSType.toUint32(sobj.getLength());
+        final long         relativeStartUint32 = JSType.toUint32(start);
+        final long         relativeStart       = JSType.toInteger(start);
+
+        long k = relativeStart < 0 ?
+                Math.max(len + relativeStart, 0) :
+                Math.min(
+                    Math.max(relativeStartUint32, relativeStart),
+                    len);
+
+        final long relativeEndUint32 = end == ScriptRuntime.UNDEFINED ? len : JSType.toUint32(end);
+        final long relativeEnd       = end == ScriptRuntime.UNDEFINED ? len : JSType.toInteger(end);
+
+        final long finale = relativeEnd < 0 ?
+                Math.max(len + relativeEnd, 0) :
+                Math.min(
+                    Math.max(relativeEndUint32, relativeEnd),
+                    len);
+
+        if (k >= finale) {
+            return new NativeArray(0);
+        }
+
+        if (bulkable(sobj)) {
+            final NativeArray narray = (NativeArray) sobj;
+            return new NativeArray(narray.getArray().slice(k, finale));
+        }
+
+        final NativeArray copy = new NativeArray(0);
+        for (long n = 0; k < finale; n++, k++) {
+            copy.defineOwnProperty((int) n, sobj.get(k));
+        }
+
+        return copy;
+    }
+
+    private static ScriptFunction compareFunction(final Object comparefn) {
+        try {
+            return (ScriptFunction)comparefn;
+        } catch (final ClassCastException e) {
+            return null; //undefined or null
+        }
+    }
+
+    private static Object[] sort(final Object[] array, final Object comparefn) {
+        final ScriptFunction cmp = compareFunction(comparefn);
+
+        final List<Object> list = Arrays.asList(array);
+        final Object cmpThis = cmp == null || cmp.isStrict() ? ScriptRuntime.UNDEFINED : Context.getGlobal();
+
+        Collections.sort(list, new Comparator<Object>() {
+            @Override
+            public int compare(final Object x, final Object y) {
+                if (x == ScriptRuntime.UNDEFINED && y == ScriptRuntime.UNDEFINED) {
+                    return 0;
+                } else if (x == ScriptRuntime.UNDEFINED) {
+                    return 1;
+                } else if (y == ScriptRuntime.UNDEFINED) {
+                    return -1;
+                }
+
+                if (cmp != null) {
+                    try {
+                        return (int)CALL_CMP.invokeExact(cmp, cmpThis, x, y);
+                    } catch (final RuntimeException | Error e) {
+                        throw e;
+                    } catch (final Throwable t) {
+                        throw new RuntimeException(t);
+                    }
+                }
+
+                return JSType.toString(x).compareTo(JSType.toString(y));
+            }
+        });
+
+        return list.toArray(new Object[array.length]);
+    }
+
+    /**
+     * ECMA 15.4.4.11 Array.prototype.sort ( comparefn )
+     *
+     * @param self       self reference
+     * @param comparefn  element comparison function
+     * @return sorted array
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object sort(final Object self, final Object comparefn) {
+        try {
+            final ScriptObject sobj    = (ScriptObject) self;
+            final Context      context = sobj.getContext();
+            final boolean      strict  = context._strict;
+            final long         len     = JSType.toUint32(sobj.getLength());
+
+            if (len > 1) {
+                final Object[] src = new Object[(int) len];
+                for (int i = 0; i < src.length; i++) {
+                    src[i] = sobj.get(i);
+                }
+
+                final Object[] sorted = sort(src, comparefn);
+                assert sorted.length == src.length;
+
+                for (int i = 0; i < sorted.length; i++) {
+                    sobj.set(i, sorted[i], strict);
+                }
+            }
+
+            return sobj;
+        } catch (final ClassCastException | NullPointerException e) {
+            typeError(Global.instance(), "not.an.object", ScriptRuntime.safeToString(self));
+            return ScriptRuntime.UNDEFINED;
+        }
+    }
+
+    /**
+     * ECMA 15.4.4.12 Array.prototype.splice ( start, deleteCount [ item1 [ , item2 [ , ... ] ] ] )
+     *
+     * @param self self reference
+     * @param args arguments
+     * @return result of splice
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 2)
+    public static Object splice(final Object self, final Object... args) {
+        final Object obj = Global.toObject(self);
+
+        if (!(obj instanceof ScriptObject)) {
+            return ScriptRuntime.UNDEFINED;
+        }
+
+        final Object start = (args.length > 0) ? args[0] : ScriptRuntime.UNDEFINED;
+        final Object deleteCount = (args.length > 1) ? args[1] : ScriptRuntime.UNDEFINED;
+
+        Object[] items;
+
+        if (args.length > 2) {
+            items = new Object[args.length - 2];
+            System.arraycopy(args, 2, items, 0, items.length);
+        } else {
+            items = ScriptRuntime.EMPTY_ARRAY;
+        }
+
+        final ScriptObject sobj                = (ScriptObject)obj;
+        final boolean      strict              = Global.isStrict();
+        final long         len                 = JSType.toUint32(sobj.getLength());
+        final long         relativeStartUint32 = JSType.toUint32(start);
+        final long         relativeStart       = JSType.toInteger(start);
+
+        //TODO: workaround overflow of relativeStart for start > Integer.MAX_VALUE
+        final long actualStart = relativeStart < 0 ?
+            Math.max(len + relativeStart, 0) :
+            Math.min(
+                Math.max(relativeStartUint32, relativeStart),
+                len);
+
+        final long actualDeleteCount =
+            Math.min(
+                Math.max(JSType.toInteger(deleteCount), 0),
+                len - actualStart);
+
+        final NativeArray array = new NativeArray(actualDeleteCount);
+
+        for (long k = 0; k < actualDeleteCount; k++) {
+            final long from = actualStart + k;
+
+            if (sobj.has(from)) {
+                array.defineOwnProperty((int) k, sobj.get(from));
+            }
+        }
+
+        if (items.length < actualDeleteCount) {
+            for (long k = actualStart; k < (len - actualDeleteCount); k++) {
+                final long from = k + actualDeleteCount;
+                final long to   = k + items.length;
+
+                if (sobj.has(from)) {
+                    sobj.set(to, sobj.get(from), strict);
+                } else {
+                    sobj.delete(to, strict);
+                }
+            }
+
+            for (long k = len; k > (len - actualDeleteCount + items.length); k--) {
+                sobj.delete(k - 1, strict);
+            }
+        } else if (items.length > actualDeleteCount) {
+            for (long k = len - actualDeleteCount; k > actualStart; k--) {
+                final long from = k + actualDeleteCount - 1;
+                final long to   = k + items.length - 1;
+
+                if (sobj.has(from)) {
+                    final Object fromValue = sobj.get(from);
+                    sobj.set(to, fromValue, strict);
+                } else {
+                    sobj.delete(to, strict);
+                }
+            }
+        }
+
+        long k = actualStart;
+        for (int i = 0; i < items.length; i++, k++) {
+            sobj.set(k, items[i], strict);
+        }
+
+        final long newLength = len - actualDeleteCount + items.length;
+        sobj.set("length", newLength, strict);
+
+        return array;
+    }
+
+    /**
+     * ECMA 15.4.4.13 Array.prototype.unshift ( [ item1 [ , item2 [ , ... ] ] ] )
+     *
+     * @param self  self reference
+     * @param items items for unshift
+     * @return unshifted array
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
+    public static Object unshift(final Object self, final Object... items) {
+        final Object obj = Global.toObject(self);
+
+        if (!(obj instanceof ScriptObject)) {
+            return ScriptRuntime.UNDEFINED;
+        }
+
+        final ScriptObject sobj   = (ScriptObject)obj;
+        final boolean      strict = Global.isStrict();
+        final long         len    = JSType.toUint32(sobj.getLength());
+
+        if (items == null) {
+            return ScriptRuntime.UNDEFINED;
+        }
+
+        if (bulkable(sobj)) {
+            final NativeArray nativeArray = (NativeArray) sobj;
+            nativeArray.getArray().shiftRight(items.length);
+
+            for (int j = 0; j < items.length; j++) {
+                nativeArray.setArray(nativeArray.getArray().set(j, items[j], sobj.getContext()._strict));
+            }
+        } else {
+            for (long k = len; k > 0; k--) {
+                final long from = k - 1;
+                final long to = k + items.length - 1;
+
+                if (sobj.has(from)) {
+                    final Object fromValue = sobj.get(from);
+                    sobj.set(to, fromValue, strict);
+                } else {
+                    sobj.delete(to, strict);
+                }
+            }
+
+            for (int j = 0; j < items.length; j++) {
+                sobj.set(j, items[j], strict);
+            }
+        }
+
+        final long newLength = len + items.length;
+        sobj.set("length", newLength, strict);
+
+        return newLength;
+    }
+
+    /**
+     * ECMA 15.4.4.14 Array.prototype.indexOf ( searchElement [ , fromIndex ] )
+     *
+     * @param self           self reference
+     * @param searchElement  element to search for
+     * @param fromIndex      start index of search
+     * @return index of element, or -1 if not found
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
+    public static Object indexOf(final Object self, final Object searchElement, final Object fromIndex) {
+        try {
+            final ScriptObject sobj = (ScriptObject)Global.toObject(self);
+            final long         len  = JSType.toUint32(sobj.getLength());
+            final long         n    = JSType.toLong(fromIndex);
+
+            if (len == 0 || n >= len) {
+                return -1;
+            }
+
+            for (long k = Math.max(0, (n < 0) ? (len - Math.abs(n)) : n); k < len; k++) {
+                if (sobj.has(k)) {
+                    if (ScriptRuntime.EQ_STRICT(sobj.get(k), searchElement)) {
+                        return k;
+                    }
+                }
+            }
+        } catch (final ClassCastException | NullPointerException e) {
+            //fallthru
+        }
+
+        return -1;
+    }
+
+    /**
+     * ECMA 15.4.4.15 Array.prototype.lastIndexOf ( searchElement [ , fromIndex ] )
+     *
+     * @param self self reference
+     * @param args arguments: element to search for and optional from index
+     * @return index of element, or -1 if not found
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
+    public static Object lastIndexOf(final Object self, final Object... args) {
+        try {
+            final ScriptObject sobj = (ScriptObject)Global.toObject(self);
+            final long         len  = JSType.toUint32(sobj.getLength());
+
+            if (len == 0) {
+                return -1;
+            }
+
+            final Object searchElement = (args.length > 0) ? args[0] : ScriptRuntime.UNDEFINED;
+            final long   n             = (args.length > 1) ? JSType.toLong(args[1]) : (len - 1);
+
+            for (long k = (n < 0) ? (len - Math.abs(n)) : Math.min(n, len - 1); k >= 0; k--) {
+                if (sobj.has(k)) {
+                    if (ScriptRuntime.EQ_STRICT(sobj.get(k), searchElement)) {
+                        return k;
+                    }
+                }
+            }
+        } catch (final ClassCastException | NullPointerException e) {
+            typeError(Global.instance(), "not.an.object", ScriptRuntime.safeToString(self));
+        }
+
+        return -1;
+    }
+
+    /**
+     * ECMA 15.4.4.16 Array.prototype.every ( callbackfn [ , thisArg ] )
+     *
+     * @param self        self reference
+     * @param callbackfn  callback function per element
+     * @param thisArg     this argument
+     * @return true if callback function return true for every element in the array, false otherwise
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
+    public static Object every(final Object self, final Object callbackfn, final Object thisArg) {
+        return applyEvery(Global.toObject(self), callbackfn, thisArg);
+    }
+
+    private static boolean applyEvery(final Object self, final Object callbackfn, final Object thisArg) {
+        return new IteratorAction<Boolean>(Global.toObject(self), callbackfn, thisArg, true) {
+            @Override
+            protected boolean forEach(final Object val, final int i) throws Throwable {
+                return (result = (boolean)EVERY_CALLBACK_INVOKER.invokeExact(callbackfn, thisArg, val, i, self));
+            }
+        }.apply();
+    }
+
+    /**
+     * ECMA 15.4.4.17 Array.prototype.some ( callbackfn [ , thisArg ] )
+     *
+     * @param self        self reference
+     * @param callbackfn  callback function per element
+     * @param thisArg     this argument
+     * @return true if callback function returned true for any element in the array, false otherwise
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
+    public static Object some(final Object self, final Object callbackfn, final Object thisArg) {
+        return new IteratorAction<Boolean>(Global.toObject(self), callbackfn, thisArg, false) {
+            @Override
+            protected boolean forEach(final Object val, final int i) throws Throwable {
+                return !(result = (boolean)SOME_CALLBACK_INVOKER.invokeExact(callbackfn, thisArg, val, i, self));
+            }
+        }.apply();
+    }
+
+    /**
+     * ECMA 15.4.4.18 Array.prototype.forEach ( callbackfn [ , thisArg ] )
+     *
+     * @param self        self reference
+     * @param callbackfn  callback function per element
+     * @param thisArg     this argument
+     * @return undefined
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
+    public static Object forEach(final Object self, final Object callbackfn, final Object thisArg) {
+        return new IteratorAction<Object>(Global.toObject(self), callbackfn, thisArg, ScriptRuntime.UNDEFINED) {
+            @Override
+            protected boolean forEach(final Object val, final int i) throws Throwable {
+                FOREACH_CALLBACK_INVOKER.invokeExact(callbackfn, thisArg, val, i, self);
+                return true;
+            }
+        }.apply();
+    }
+
+    /**
+     * ECMA 15.4.4.19 Array.prototype.map ( callbackfn [ , thisArg ] )
+     *
+     * @param self        self reference
+     * @param callbackfn  callback function per element
+     * @param thisArg     this argument
+     * @return array with elements transformed by map function
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
+    public static Object map(final Object self, final Object callbackfn, final Object thisArg) {
+        return new IteratorAction<NativeArray>(Global.toObject(self), callbackfn, thisArg, null) {
+            @Override
+            protected boolean forEach(final Object val, final int i) throws Throwable {
+                final Object r = MAP_CALLBACK_INVOKER.invokeExact(callbackfn, thisArg, val, i, self);
+                result.defineOwnProperty(index, r);
+                return true;
+            }
+
+            @Override
+            public void applyLoopBegin(final ArrayLikeIterator<Object> iter0) {
+                // map return array should be of same length as source array
+                // even if callback reduces source array length
+                result = new NativeArray(iter0.getLength());
+            }
+        }.apply();
+    }
+
+    /**
+     * ECMA 15.4.4.20 Array.prototype.filter ( callbackfn [ , thisArg ] )
+     *
+     * @param self        self reference
+     * @param callbackfn  callback function per element
+     * @param thisArg     this argument
+     * @return filtered array
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
+    public static Object filter(final Object self, final Object callbackfn, final Object thisArg) {
+        return new IteratorAction<NativeArray>(Global.toObject(self), callbackfn, thisArg, new NativeArray()) {
+            private int to = 0;
+
+            @Override
+            protected boolean forEach(final Object val, final int i) throws Throwable {
+                if ((boolean)FILTER_CALLBACK_INVOKER.invokeExact(callbackfn, thisArg, val, i, self)) {
+                    result.defineOwnProperty(to++, val);
+                }
+                return true;
+            }
+        }.apply();
+    }
+
+    private static Object reduceInner(final ArrayLikeIterator<Object> iter, final Object self, final Object... args) {
+        final Object  callbackfn          = args.length > 0 ? args[0] : ScriptRuntime.UNDEFINED;
+        final boolean initialValuePresent = args.length > 1;
+
+        Object initialValue = initialValuePresent ? args[1] : ScriptRuntime.UNDEFINED;
+
+        if (callbackfn == ScriptRuntime.UNDEFINED) {
+            typeError(Global.instance(), "not.a.function", "undefined");
+        }
+
+        if (!initialValuePresent) {
+            if (iter.hasNext()) {
+                initialValue = iter.next();
+            } else {
+                typeError(Global.instance(), "array.reduce.invalid.init");
+            }
+        }
+
+        //if initial value is ScriptRuntime.UNDEFINED - step forward once.
+        return new IteratorAction<Object>(Global.toObject(self), callbackfn, ScriptRuntime.UNDEFINED, initialValue, iter) {
+            @Override
+            protected boolean forEach(final Object val, final int i) throws Throwable {
+                // TODO: why can't I declare the second arg as Undefined.class?
+                result = REDUCE_CALLBACK_INVOKER.invokeExact(callbackfn, ScriptRuntime.UNDEFINED, result, val, i, self);
+                return true;
+            }
+        }.apply();
+    }
+
+    /**
+     * ECMA 15.4.4.21 Array.prototype.reduce ( callbackfn [ , initialValue ] )
+     *
+     * @param self self reference
+     * @param args arguments to reduce
+     * @return accumulated result
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
+    public static Object reduce(final Object self, final Object... args) {
+        return reduceInner(arrayLikeIterator(self), self, args);
+    }
+
+    /**
+     * ECMA 15.4.4.22 Array.prototype.reduceRight ( callbackfn [ , initialValue ] )
+     *
+     * @param self        self reference
+     * @param args arguments to reduce
+     * @return accumulated result
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
+    public static Object reduceRight(final Object self, final Object... args) {
+        return reduceInner(reverseArrayLikeIterator(self), self, args);
+    }
+
+    /**
+     * Determine if Java bulk array operations may be used on the underlying
+     * storage. This is possible only if the object's prototype chain is empty
+     * or each of the prototypes in the chain is empty.
+     *
+     * @param self the object to examine
+     * @return true if optimizable
+     */
+    private static boolean bulkable(final ScriptObject self) {
+        return self.isArray() && !hasInheritedArrayEntries(self);
+    }
+
+    private static boolean hasInheritedArrayEntries(final ScriptObject self) {
+        ScriptObject proto = self.getProto();
+        while (proto != null) {
+            if (proto.hasArrayEntries()) {
+                return true;
+            }
+            proto = proto.getProto();
+        }
+
+        return false;
+    }
+
+    private static MethodHandle createIteratorCallbackInvoker(final Class<?> rtype) {
+        return Bootstrap.createDynamicInvoker("dyn:call", rtype, Object.class, Object.class, Object.class,
+                int.class, Object.class);
+
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeArrayBuffer.java b/nashorn/src/jdk/nashorn/internal/objects/NativeArrayBuffer.java
new file mode 100644
index 00000000000..3899760a09d
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeArrayBuffer.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+import java.util.Arrays;
+import jdk.nashorn.internal.objects.annotations.Attribute;
+import jdk.nashorn.internal.objects.annotations.Constructor;
+import jdk.nashorn.internal.objects.annotations.Function;
+import jdk.nashorn.internal.objects.annotations.Getter;
+import jdk.nashorn.internal.objects.annotations.ScriptClass;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
+
+@ScriptClass("ArrayBuffer")
+class NativeArrayBuffer extends ScriptObject {
+    private final byte[] buffer;
+
+    @Constructor(arity = 1)
+    public static Object constructor(final boolean newObj, final Object self, final Object... args) {
+        if (args.length == 0) {
+            throw new RuntimeException("missing length argument");
+        }
+
+        return new NativeArrayBuffer(JSType.toInt32(args[0]));
+    }
+
+    protected NativeArrayBuffer(final byte[] byteArray) {
+        this.buffer = byteArray;
+        this.setProto(Global.instance().getArrayBufferPrototype());
+    }
+
+    protected NativeArrayBuffer(final int byteLength) {
+        this(new byte[byteLength]);
+    }
+
+    protected NativeArrayBuffer(final NativeArrayBuffer other, final int begin, final int end) {
+        this(Arrays.copyOfRange(other.buffer, begin, end));
+    }
+
+    @Getter(attributes = Attribute.NOT_ENUMERABLE | Attribute.NOT_WRITABLE | Attribute.NOT_CONFIGURABLE)
+    public static Object byteLength(final Object self) {
+        return ((NativeArrayBuffer)self).buffer.length;
+    }
+
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object slice(final Object self, final Object begin0, final Object end0) {
+        final NativeArrayBuffer arrayBuffer = (NativeArrayBuffer)self;
+        int begin = JSType.toInt32(begin0);
+        int end = end0 != ScriptRuntime.UNDEFINED ? JSType.toInt32(end0) : arrayBuffer.getByteLength();
+        begin = adjustIndex(begin, arrayBuffer.getByteLength());
+        end = adjustIndex(end, arrayBuffer.getByteLength());
+        return new NativeArrayBuffer((NativeArrayBuffer) self, begin, Math.max(end, begin));
+    }
+
+    /**
+     * If index is negative, it refers to an index from the end of the array, as
+     * opposed to from the beginning. The index is clamped to the valid index
+     * range for the array.
+     *
+     * @param index  The index.
+     * @param length The length of the array.
+     * @return valid index index in the range [0, length).
+     */
+    static int adjustIndex(final int index, final int length) {
+        if (index < 0) {
+            return clamp(index + length, length);
+        }
+        return clamp(index, length);
+    }
+
+    /**
+     * Clamp index into the range [0, length).
+     */
+    private static int clamp(final int index, final int length) {
+        if (index < 0) {
+            return 0;
+        } else if (index > length) {
+            return length;
+        }
+        return index;
+    }
+
+    public byte[] getByteArray() {
+        return buffer;
+    }
+
+    public int getByteLength() {
+        return buffer.length;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeBoolean.java b/nashorn/src/jdk/nashorn/internal/objects/NativeBoolean.java
new file mode 100644
index 00000000000..6b47a66e3fa
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeBoolean.java
@@ -0,0 +1,181 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import jdk.nashorn.internal.objects.annotations.Attribute;
+import jdk.nashorn.internal.objects.annotations.Constructor;
+import jdk.nashorn.internal.objects.annotations.Function;
+import jdk.nashorn.internal.objects.annotations.ScriptClass;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
+import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
+import jdk.nashorn.internal.runtime.linker.PrimitiveLookup;
+import org.dynalang.dynalink.linker.GuardedInvocation;
+
+/**
+ * ECMA 15.6 Boolean Objects.
+ */
+
+@ScriptClass("Boolean")
+public final class NativeBoolean extends ScriptObject {
+    private final boolean value;
+
+    private final static MethodHandle WRAPFILTER = findWrapFilter();
+
+    NativeBoolean(final boolean value) {
+        this(value, Global.instance().getBooleanPrototype());
+    }
+
+    private NativeBoolean(final boolean value, final ScriptObject proto) {
+        this.value = value;
+        this.setProto(proto);
+    }
+
+    @Override
+    public String safeToString() {
+        return "[Boolean " + toString() + "]";
+    }
+
+    @Override
+    public String toString() {
+        return Boolean.toString(getValue());
+    }
+
+    /**
+     * Get the value for this NativeBoolean
+     * @return true or false
+     */
+    public boolean getValue() {
+        return booleanValue();
+    }
+
+    /**
+     * Get the value for this NativeBoolean
+     * @return true or false
+     */
+    public boolean booleanValue() {
+        return value;
+    }
+
+    @Override
+    public String getClassName() {
+        return "Boolean";
+    }
+
+    /**
+     * ECMA 15.6.4.2 Boolean.prototype.toString ( )
+     *
+     * @param self self reference
+     * @return string representation of this boolean
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object toString(final Object self) {
+        return getBoolean(self).toString();
+    }
+
+    /**
+     * ECMA 15.6.4.3 Boolean.prototype.valueOf ( )
+     *
+     * @param self self reference
+     * @return value of this boolean
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object valueOf(final Object self) {
+        return getBoolean(self);
+    }
+
+    /**
+     * ECMA 15.6.2.1 new Boolean (value)
+     *
+     * @param newObj is the new operator used to instantiate this NativeBoolean
+     * @param self   self reference
+     * @param value  value of boolean
+     * @return the new NativeBoolean
+     */
+    @Constructor(arity = 1)
+    public static Object constructor(final boolean newObj, final Object self, final Object value) {
+        final boolean flag = JSType.toBoolean(value);
+
+        if (newObj) {
+            final ScriptObject proto = (self instanceof ScriptObject) ?
+                ((ScriptObject)self).getProto() :
+                Global.instance().getBooleanPrototype();
+
+            return new NativeBoolean(flag, proto);
+        }
+
+        return flag;
+    }
+
+    private static Boolean getBoolean(final Object self) {
+        if (self instanceof Boolean) {
+            return ((Boolean)self);
+        } else if (self instanceof NativeBoolean) {
+            return ((NativeBoolean)self).getValue();
+        } else if (self != null && self == Global.instance().getBooleanPrototype()) {
+            return false;
+        } else {
+            typeError(Global.instance(), "not.a.boolean", ScriptRuntime.safeToString(self));
+            return false;
+        }
+    }
+
+    /**
+     * Lookup the appropriate method for an invoke dynamic call.
+     *
+     * @param desc     The invoke dynamic callsite descriptor.
+     * @param receiver The receiver for the call
+     * @return Link to be invoked at call site.
+     */
+    public static GuardedInvocation lookupPrimitive(final NashornCallSiteDescriptor desc, final Object receiver) {
+        return PrimitiveLookup.lookupPrimitive(desc, Boolean.class, new NativeBoolean((Boolean)receiver), WRAPFILTER);
+    }
+
+    /**
+     * Wrap a native string in a NativeString object.
+     *
+     * @param receiver Native string.
+     * @return Wrapped object.
+     */
+    @SuppressWarnings("unused")
+    private static NativeBoolean wrapFilter(final Object receiver) {
+        return new NativeBoolean((Boolean)receiver);
+    }
+
+    private static MethodHandle findWrapFilter() {
+        try {
+            return MethodHandles.lookup().findStatic(NativeBoolean.class, "wrapFilter", MH.type(NativeBoolean.class, Object.class));
+        } catch (NoSuchMethodException | IllegalAccessException e) {
+            throw new AssertionError(e);
+        }
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeDate.java b/nashorn/src/jdk/nashorn/internal/objects/NativeDate.java
new file mode 100644
index 00000000000..d9812cb2680
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeDate.java
@@ -0,0 +1,1335 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+import static java.lang.Double.NaN;
+import static java.lang.Double.isInfinite;
+import static java.lang.Double.isNaN;
+import static jdk.nashorn.internal.runtime.ECMAErrors.rangeError;
+import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+
+import java.util.Locale;
+import java.util.TimeZone;
+import jdk.nashorn.internal.objects.annotations.Attribute;
+import jdk.nashorn.internal.objects.annotations.Constructor;
+import jdk.nashorn.internal.objects.annotations.Function;
+import jdk.nashorn.internal.objects.annotations.ScriptClass;
+import jdk.nashorn.internal.objects.annotations.SpecializedConstructor;
+import jdk.nashorn.internal.objects.annotations.Where;
+import jdk.nashorn.internal.runtime.ConsString;
+import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.ScriptFunction;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
+import jdk.nashorn.internal.runtime.linker.InvokeByName;
+
+/**
+ * ECMA 15.9 Date Objects
+ *
+ */
+@ScriptClass("Date")
+public final class NativeDate extends ScriptObject {
+
+    private static final String INVALID_DATE = "Invalid Date";
+
+    private static final int YEAR        = 0;
+    private static final int MONTH       = 1;
+    private static final int DAY         = 2;
+    private static final int HOUR        = 3;
+    private static final int MINUTE      = 4;
+    private static final int SECOND      = 5;
+    private static final int MILLISECOND = 6;
+
+    private static final int FORMAT_DATE_TIME       = 0;
+    private static final int FORMAT_DATE            = 1;
+    private static final int FORMAT_TIME            = 2;
+    private static final int FORMAT_LOCAL_DATE_TIME = 3;
+    private static final int FORMAT_LOCAL_DATE      = 4;
+    private static final int FORMAT_LOCAL_TIME      = 5;
+
+    // Constants defined in ECMA 15.9.1.10
+    private static final double hoursPerDay      = 24;
+    private static final double minutesPerHour   = 60;
+    private static final double secondsPerMinute = 60;
+    private static final double msPerSecond   = 1_000;
+    private static final double msPerMinute  = 60_000;
+    private static final double msPerHour = 3_600_000;
+    private static final double msPerDay = 86_400_000;
+
+    private static int[][] firstDayInMonth = {
+            {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}, // normal year
+            {0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335}  // leap year
+    };
+
+    private static String[] weekDays = {
+            "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
+    };
+
+    private static String[] months = {
+            "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
+    };
+
+    private static final InvokeByName TO_ISO_STRING = new InvokeByName("toISOString", ScriptObject.class, Object.class,
+            Object.class);
+
+    private double time;
+    private final TimeZone timezone;
+
+    NativeDate() {
+        this(System.currentTimeMillis());
+    }
+
+    NativeDate(final double time) {
+        final Context context = Global.getThisContext();
+
+        this.time = time;
+        this.timezone = context.getTimeZone();
+        this.setProto(Global.instance().getDatePrototype());
+    }
+
+    @Override
+    public String getClassName() {
+        return "Date";
+    }
+
+    // ECMA 8.12.8 [[DefaultValue]] (hint)
+    @Override
+    public Object getDefaultValue(final Class<?> hint) {
+        // When the [[DefaultValue]] internal method of O is called with no hint,
+        // then it behaves as if the hint were Number, unless O is a Date object
+        // in which case it behaves as if the hint were String.
+        return super.getDefaultValue(hint == null ? String.class : hint);
+    }
+
+    /**
+     * Constructor - ECMA 15.9.3.1 new Date
+     *
+     * @param isNew is this Date constructed with the new operator
+     * @param self  self references
+     * @return Date representing now
+     */
+    @SpecializedConstructor
+    public static Object construct(final boolean isNew, final Object self) {
+        final NativeDate result = new NativeDate();
+        return isNew ? result : toStringImpl(result, FORMAT_DATE_TIME);
+    }
+
+    /**
+     * Constructor - ECMA 15.9.3.1 new Date (year, month [, date [, hours [, minutes [, seconds [, ms ] ] ] ] ] )
+     *
+     * @param isNew is this Date constructed with the new operator
+     * @param self  self reference
+     * @param args  arguments
+     * @return new Date
+     */
+    @Constructor(arity = 7)
+    public static Object construct(final boolean isNew, final Object self, final Object... args) {
+        NativeDate result;
+        switch (args.length) {
+        case 0:
+            result = new NativeDate();
+            break;
+
+        case 1:
+            double num;
+            final Object arg = JSType.toPrimitive(args[0]);
+            if (arg instanceof String || arg instanceof ConsString) {
+                num = parseDateString(arg.toString());
+            } else {
+                num = timeClip(JSType.toNumber(args[0]));
+            }
+            result = new NativeDate(num);
+            break;
+
+        default:
+            result = new NativeDate(0);
+            final double[] d = convertCtorArgs(args);
+            if (d == null) {
+                result.setTime(Double.NaN);
+            } else {
+                final double time = timeClip(utc(makeDate(d), result.getTimeZone()));
+                result.setTime(time);
+            }
+            break;
+         }
+
+         return isNew ? result : toStringImpl(new NativeDate(), FORMAT_DATE_TIME);
+    }
+
+    @Override
+    public String safeToString() {
+        return "[Date " + toISOStringImpl(this) + "]";
+    }
+
+    @Override
+    public String toString() {
+        return isValidDate() ? toString(this).toString() : INVALID_DATE;
+    }
+
+    /**
+     * ECMA 15.9.4.2 Date.parse (string)
+     *
+     * @param self self reference
+     * @param string string to parse as date
+     * @return Date interpreted from the string, or NaN for illegal values
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object parse(final Object self, final Object string) {
+        return parseDateString(JSType.toString(string));
+    }
+
+    /**
+     * ECMA 15.9.4.3 Date.UTC (year, month [, date [, hours [, minutes [, seconds [, ms ] ] ] ] ] )
+     *
+     * @param self self reference
+     * @param args mandatory args are year, month. Optional are date, hours, minutes, seconds and milliseconds
+     * @return a time clip according to the ECMA specification
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 7, where = Where.CONSTRUCTOR)
+    public static Object UTC(final Object self, final Object... args) {
+        final NativeDate nd = new NativeDate(0);
+        final double[] d = convertCtorArgs(args);
+        final double time = d == null ? Double.NaN : timeClip(makeDate(d));
+        nd.setTime(time);
+        return time;
+    }
+
+    /**
+     * ECMA 15.9.4.4 Date.now ( )
+     *
+     * @param self self reference
+     * @return a Date that points to the current moment in time
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object now(final Object self) {
+        return (double)System.currentTimeMillis();
+    }
+
+    /**
+     * ECMA 15.9.5.2 Date.prototype.toString ( )
+     *
+     * @param self self reference
+     * @return string value that represents the Date in the current time zone
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object toString(final Object self) {
+        return toStringImpl(self, FORMAT_DATE_TIME);
+    }
+
+    /**
+     * ECMA 15.9.5.3 Date.prototype.toDateString ( )
+     *
+     * @param self self reference
+     * @return string value with the "date" part of the Date in the current time zone
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object toDateString(final Object self) {
+        return toStringImpl(self, FORMAT_DATE);
+    }
+
+    /**
+     * ECMA 15.9.5.4 Date.prototype.toTimeString ( )
+     *
+     * @param self self reference
+     * @return string value with "time" part of Date in the current time zone
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object toTimeString(final Object self) {
+        return toStringImpl(self, FORMAT_TIME);
+    }
+
+    /**
+     * ECMA 15.9.5.5 Date.prototype.toLocaleString ( )
+     *
+     * @param self self reference
+     * @return string value that represents the Data in the current time zone and locale
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object toLocaleString(final Object self) {
+        return toStringImpl(self, FORMAT_LOCAL_DATE_TIME);
+    }
+
+    /**
+     * ECMA 15.9.5.6 Date.prototype.toLocaleDateString ( )
+     *
+     * @param self self reference
+     * @return string value with the "date" part of the Date in the current time zone and locale
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object toLocaleDateString(final Object self) {
+        return toStringImpl(self, FORMAT_LOCAL_DATE);
+    }
+
+    /**
+     * ECMA 15.9.5.7 Date.prototype.toLocaleTimeString ( )
+     *
+     * @param self self reference
+     * @return string value with the "time" part of Date in the current time zone and locale
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object toLocaleTimeString(final Object self) {
+        return toStringImpl(self, FORMAT_LOCAL_TIME);
+    }
+
+    /**
+     * ECMA 15.9.5.8 Date.prototype.valueOf ( )
+     *
+     * @param self self reference
+     * @return valueOf - a number which is this time value
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object valueOf(final Object self) {
+        final NativeDate nd = getNativeDate(self);
+        return (nd != null) ? nd.getTime() : Double.NaN;
+    }
+
+    /**
+     * ECMA 15.9.5.9 Date.prototype.getTime ( )
+     *
+     * @param self self reference
+     * @return time
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object getTime(final Object self) {
+        final NativeDate nd = getNativeDate(self);
+        return (nd != null) ? nd.getTime() : Double.NaN;
+    }
+
+    /**
+     * ECMA 15.9.5.10 Date.prototype.getFullYear ( )
+     *
+     * @param self self reference
+     * @return full year
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object getFullYear(final Object self) {
+        return getField(self, YEAR);
+    }
+
+    /**
+     * ECMA 15.9.5.11 Date.prototype.getUTCFullYear( )
+     *
+     * @param self self reference
+     * @return UTC full year
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object getUTCFullYear(final Object self) {
+        return getUTCField(self, YEAR);
+    }
+
+    /**
+     * B.2.4 Date.prototype.getYear ( )
+     *
+     * @param self self reference
+     * @return year
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object getYear(final Object self) {
+        final NativeDate nd = getNativeDate(self);
+        return (nd != null && nd.isValidDate()) ? (yearFromTime(nd.getLocalTime()) - 1900) : Double.NaN;
+    }
+
+    /**
+     * ECMA 15.9.5.12 Date.prototype.getMonth ( )
+     *
+     * @param self self reference
+     * @return month
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object getMonth(final Object self) {
+        return getField(self, MONTH);
+    }
+
+    /**
+     * ECMA 15.9.5.13 Date.prototype.getUTCMonth ( )
+     *
+     * @param self self reference
+     * @return UTC month
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object getUTCMonth(final Object self) {
+        return getUTCField(self, MONTH);
+    }
+
+    /**
+     * ECMA 15.9.5.14 Date.prototype.getDate ( )
+     *
+     * @param self self reference
+     * @return date
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object getDate(final Object self) {
+        return getField(self, DAY);
+    }
+
+    /**
+     * ECMA 15.9.5.15 Date.prototype.getUTCDate ( )
+     *
+     * @param self self reference
+     * @return UTC Date
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object getUTCDate(final Object self) {
+        return getUTCField(self, DAY);
+    }
+
+    /**
+     * ECMA 15.9.5.16 Date.prototype.getDay ( )
+     *
+     * @param self self reference
+     * @return day
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object getDay(final Object self) {
+        final NativeDate nd = getNativeDate(self);
+        return (nd != null && nd.isValidDate()) ? weekDay(nd.getLocalTime()) : Double.NaN;
+    }
+
+    /**
+     * ECMA 15.9.5.17 Date.prototype.getUTCDay ( )
+     *
+     * @param self self reference
+     * @return UTC day
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object getUTCDay(final Object self) {
+        final NativeDate nd = getNativeDate(self);
+        return (nd != null && nd.isValidDate()) ? weekDay(nd.getTime()) : Double.NaN;
+    }
+
+    /**
+     * ECMA 15.9.5.18 Date.prototype.getHours ( )
+     *
+     * @param self self reference
+     * @return hours
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object getHours(final Object self) {
+        return getField(self, HOUR);
+    }
+
+    /**
+     * ECMA 15.9.5.19 Date.prototype.getUTCHours ( )
+     *
+     * @param self self reference
+     * @return UTC hours
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object getUTCHours(final Object self) {
+        return getUTCField(self, HOUR);
+    }
+
+    /**
+     * ECMA 15.9.5.20 Date.prototype.getMinutes ( )
+     *
+     * @param self self reference
+     * @return minutes
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object getMinutes(final Object self) {
+        return getField(self, MINUTE);
+    }
+
+    /**
+     * ECMA 15.9.5.21 Date.prototype.getUTCMinutes ( )
+     *
+     * @param self self reference
+     * @return UTC minutes
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object getUTCMinutes(final Object self) {
+        return getUTCField(self, MINUTE);
+    }
+
+    /**
+     * ECMA 15.9.5.22 Date.prototype.getSeconds ( )
+     *
+     * @param self self reference
+     * @return seconds
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object getSeconds(final Object self) {
+        return getField(self, SECOND);
+    }
+
+    /**
+     * ECMA 15.9.5.23 Date.prototype.getUTCSeconds ( )
+     *
+     * @param self self reference
+     * @return UTC seconds
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object getUTCSeconds(final Object self) {
+        return getUTCField(self, SECOND);
+    }
+
+    /**
+     * ECMA 15.9.5.24 Date.prototype.getMilliseconds ( )
+     *
+     * @param self self reference
+     * @return milliseconds
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object getMilliseconds(final Object self) {
+        return getField(self, MILLISECOND);
+    }
+
+    /**
+     * ECMA 15.9.5.25 Date.prototype.getUTCMilliseconds ( )
+     *
+     * @param self self reference
+     * @return UTC milliseconds
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object getUTCMilliseconds(final Object self) {
+        return getUTCField(self, MILLISECOND);
+    }
+
+    /**
+     * ECMA 15.9.5.26 Date.prototype.getTimezoneOffset ( )
+     *
+     * @param self self reference
+     * @return time zone offset or NaN if N/A
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object getTimezoneOffset(final Object self) {
+        final NativeDate nd = getNativeDate(self);
+        if (nd != null) {
+            final long msec = (long) nd.getTime();
+            return - nd.getTimeZone().getOffset(msec) / msPerMinute;
+        }
+        return Double.NaN;
+    }
+
+    /**
+     * ECMA 15.9.5.27 Date.prototype.setTime (time)
+     *
+     * @param self self reference
+     * @param time time
+     * @return time
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object setTime(final Object self, final Object time) {
+        final double     num = timeClip(JSType.toNumber(time));
+        final NativeDate nd  = getNativeDate(self);
+        nd.setTime(num);
+        return num;
+    }
+
+    /**
+     * ECMA 15.9.5.28 Date.prototype.setMilliseconds (ms)
+     *
+     * @param self self reference
+     * @param args milliseconds
+     * @return time
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
+    public static Object setMilliseconds(final Object self, final Object... args) {
+        final NativeDate nd = getNativeDate(self);
+        if (nd.isValidDate()) {
+            setFields(nd, MILLISECOND, args, true);
+        }
+        return nd.getTime();
+    }
+
+    /**
+     * ECMA 15.9.5.29 Date.prototype.setUTCMilliseconds (ms)
+     *
+     * @param self self reference
+     * @param args utc milliseconds
+     * @return time
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
+    public static Object setUTCMilliseconds(final Object self, final Object... args) {
+        final NativeDate nd = getNativeDate(self);
+        if (nd.isValidDate()) {
+            setFields(nd, MILLISECOND, args, false);
+        }
+        return nd.getTime();
+    }
+
+    /**
+     * ECMA 15.9.5.30 Date.prototype.setSeconds (sec [, ms ] )
+     *
+     * @param self self reference
+     * @param args seconds (milliseconds optional second argument)
+     * @return time
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 2)
+    public static Object setSeconds(final Object self, final Object... args) {
+        final NativeDate nd = getNativeDate(self);
+        if (nd.isValidDate()) {
+            setFields(nd, SECOND, args, true);
+        }
+        return nd.getTime();
+    }
+
+    /**
+     * ECMA 15.9.5.31 Date.prototype.setUTCSeconds (sec [, ms ] )
+     *
+     * @param self self reference
+     * @param args UTC seconds (milliseconds optional second argument)
+     * @return time
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 2)
+    public static Object setUTCSeconds(final Object self, final Object... args) {
+        final NativeDate nd = getNativeDate(self);
+        if (nd.isValidDate()) {
+            setFields(nd, SECOND, args, false);
+        }
+        return nd.getTime();
+    }
+
+    /**
+     * ECMA 15.9.5.32 Date.prototype.setMinutes (min [, sec [, ms ] ] )
+     *
+     * @param self self reference
+     * @param args minutes (seconds and milliseconds are optional second and third arguments)
+     * @return time
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 3)
+    public static Object setMinutes(final Object self, final Object... args) {
+        final NativeDate nd = getNativeDate(self);
+        if (nd.isValidDate()) {
+            setFields(nd, MINUTE, args, true);
+        }
+        return nd.getTime();
+    }
+
+    /**
+     * ECMA 15.9.5.33 Date.prototype.setUTCMinutes (min [, sec [, ms ] ] )
+     *
+     * @param self self reference
+     * @param args minutes (seconds and milliseconds are optional second and third arguments)
+     * @return time
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 3)
+    public static Object setUTCMinutes(final Object self, final Object... args) {
+        final NativeDate nd = getNativeDate(self);
+        if (nd.isValidDate()) {
+            setFields(nd, MINUTE, args, false);
+        }
+        return nd.getTime();
+    }
+
+    /**
+     * ECMA 15.9.5.34 Date.prototype.setHours (hour [, min [, sec [, ms ] ] ] )
+     *
+     * @param self self reference
+     * @param args hour (optional arguments after are minutes, seconds, milliseconds)
+     * @return time
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 4)
+    public static Object setHours(final Object self, final Object... args) {
+        final NativeDate nd = getNativeDate(self);
+        if (nd.isValidDate()) {
+            setFields(nd, HOUR, args, true);
+        }
+        return nd.getTime();
+    }
+
+    /**
+     * ECMA 15.9.5.35 Date.prototype.setUTCHours (hour [, min [, sec [, ms ] ] ] )
+     *
+     * @param self self reference
+     * @param args hour (optional arguments after are minutes, seconds, milliseconds)
+     * @return time
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 4)
+    public static Object setUTCHours(final Object self, final Object... args) {
+        final NativeDate nd = getNativeDate(self);
+        if (nd.isValidDate()) {
+            setFields(nd, HOUR, args, false);
+        }
+        return nd.getTime();
+    }
+
+    /**
+     * ECMA 15.9.5.36 Date.prototype.setDate (date)
+     *
+     * @param self self reference
+     * @param args date
+     * @return time
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
+    public static Object setDate(final Object self, final Object... args) {
+        final NativeDate nd = getNativeDate(self);
+        if (nd.isValidDate()) {
+            setFields(nd, DAY, args, true);
+        }
+        return nd.getTime();
+    }
+
+    /**
+     * ECMA 15.9.5.37 Date.prototype.setUTCDate (date)
+     *
+     * @param self self reference
+     * @param args UTC date
+     * @return time
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
+    public static Object setUTCDate(final Object self, final Object... args) {
+        final NativeDate nd = getNativeDate(self);
+        if (nd.isValidDate()) {
+            setFields(nd, DAY, args, false);
+        }
+        return nd.getTime();
+    }
+
+    /**
+     * ECMA 15.9.5.38 Date.prototype.setMonth (month [, date ] )
+     *
+     * @param self self reference
+     * @param args month (optional second argument is date)
+     * @return time
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 2)
+    public static Object setMonth(final Object self, final Object... args) {
+        final NativeDate nd = getNativeDate(self);
+        if (nd.isValidDate()) {
+            setFields(nd, MONTH, args, true);
+        }
+        return nd.getTime();
+    }
+
+    /**
+     * ECMA 15.9.5.39 Date.prototype.setUTCMonth (month [, date ] )
+     *
+     * @param self self reference
+     * @param args UTC month (optional second argument is date)
+     * @return time
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 2)
+    public static Object setUTCMonth(final Object self, final Object... args) {
+        final NativeDate nd = ensureNativeDate(self);
+        if (nd.isValidDate()) {
+            setFields(nd, MONTH, args, false);
+        }
+        return nd.getTime();
+    }
+
+    /**
+     * ECMA 15.9.5.40 Date.prototype.setFullYear (year [, month [, date ] ] )
+     *
+     * @param self self reference
+     * @param args year (optional second and third arguments are month and date)
+     * @return time
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 3)
+    public static Object setFullYear(final Object self, final Object... args) {
+        final NativeDate nd   = ensureNativeDate(self);
+        if (nd.isValidDate()) {
+            setFields(nd, YEAR, args, true);
+        } else {
+            final double[] d = convertArgs(args, 0, YEAR, YEAR, 3);
+            nd.setTime(timeClip(utc(makeDate(makeDay(d[0], d[1], d[2]), 0), nd.getTimeZone())));
+        }
+        return nd.getTime();
+    }
+
+    /**
+     * ECMA 15.9.5.41 Date.prototype.setUTCFullYear (year [, month [, date ] ] )
+     *
+     * @param self self reference
+     * @param args UTC full year (optional second and third arguments are month and date)
+     * @return time
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 3)
+    public static Object setUTCFullYear(final Object self, final Object... args) {
+        final NativeDate nd   = ensureNativeDate(self);
+        if (nd.isValidDate()) {
+            setFields(nd, YEAR, args, false);
+        } else {
+            final double[] d = convertArgs(args, 0, YEAR, YEAR, 3);
+            nd.setTime(timeClip(makeDate(makeDay(d[0], d[1], d[2]), 0)));
+        }
+        return nd.getTime();
+    }
+
+    /**
+     * ECMA B.2.5 Date.prototype.setYear (year)
+     *
+     * @param self self reference
+     * @param year year
+     * @return NativeDate
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object setYear(final Object self, final Object year) {
+        final NativeDate nd = getNativeDate(self);
+        if (isNaN(nd.getTime())) {
+            return null;
+        }
+
+        final double yearNum = JSType.toNumber(year);
+        if (isNaN(yearNum)) {
+            nd.setTime(NaN);
+            return nd;
+        }
+        int yearInt = JSType.toInteger(yearNum);
+        if (0 <= yearInt && yearInt <= 99) {
+            yearInt += 1900;
+        }
+        setFields(nd, YEAR, new Object[] {yearInt}, true);
+
+        return nd;
+    }
+
+    /**
+     * ECMA 15.9.5.42 Date.prototype.toUTCString ( )
+     *
+     * @param self self reference
+     * @return string representation of date
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object toUTCString(final Object self) {
+        return toGMTStringImpl(self);
+    }
+
+    /**
+     * ECMA B.2.6 Date.prototype.toGMTString ( )
+     *
+     * See {@link NativeDate#toUTCString(Object)}
+     *
+     * @param self self reference
+     * @return string representation of date
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object toGMTString(final Object self) {
+        return toGMTStringImpl(self);
+    }
+
+    /**
+     * ECMA 15.9.5.43 Date.prototype.toISOString ( )
+     *
+     * @param self self reference
+     * @return string representation of date
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object toISOString(final Object self) {
+        return toISOStringImpl(self);
+    }
+
+    /**
+     * ECMA 15.9.5.44 Date.prototype.toJSON ( key )
+     *
+     * Provides a string representation of this Date for use by {@link NativeJSON#stringify(Object, Object, Object, Object)}
+     *
+     * @param self self reference
+     * @param key ignored
+     * @return JSON representation of this date
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object toJSON(final Object self, final Object key) {
+        if (self instanceof NativeDate) {
+            final NativeDate nd = (NativeDate)self;
+            return (isNaN(nd.getTime())) ? null : toISOStringImpl(nd);
+        }
+        // NOTE: Date.prototype.toJSON is generic. Accepts other objects as well.
+        final Object selfObj = Global.toObject(self);
+        if (!(selfObj instanceof ScriptObject)) {
+            return null;
+        }
+        final ScriptObject sobj  = (ScriptObject)selfObj;
+        final Object       value = sobj.getDefaultValue(Number.class);
+
+        final double num = (value instanceof Number) ? ((Number)value).doubleValue() : NaN;
+
+        if (isInfinite(num) || isNaN(num)) {
+            return null;
+        }
+
+        try {
+            final Object func = TO_ISO_STRING.getGetter().invokeExact(sobj);
+            if (func instanceof ScriptFunction) {
+                return TO_ISO_STRING.getInvoker().invokeExact(func, sobj, key);
+            }
+            typeError(Global.instance(), "not.a.function", ScriptRuntime.safeToString(func));
+        } catch (final RuntimeException | Error e) {
+            throw e;
+        } catch (final Throwable t) {
+            throw new RuntimeException(t);
+        }
+
+        return null;
+    }
+
+    // -- Internals below this point
+
+    private static double parseDateString(final String str) {
+
+        final DateParser parser = new DateParser(str);
+        if (parser.parse()) {
+            final Integer[] fields = parser.getDateFields();
+            double d = makeDate(fields);
+            if (fields[DateParser.TIMEZONE] != null) {
+                d -= fields[DateParser.TIMEZONE] * 60000;
+            } else {
+                d = utc(d, Global.getThisContext().getTimeZone());
+            }
+            d = timeClip(d);
+            return d;
+        }
+
+        return Double.NaN;
+    }
+
+    private static void zeroPad(final StringBuilder sb, final int n, final int length) {
+        for (int l = 1, d = 10; l < length; l++, d *= 10) {
+            if (n < d) {
+                sb.append('0');
+            }
+        }
+        sb.append(n);
+    }
+
+    private static String toStringImpl(final Object self, final int format) {
+        final NativeDate nd = getNativeDate(self);
+
+        if (nd != null && nd.isValidDate()) {
+            final StringBuilder sb = new StringBuilder(40);
+            final double t = nd.getLocalTime();
+
+            switch (format) {
+
+                case FORMAT_DATE_TIME:
+                case FORMAT_DATE :
+                case FORMAT_LOCAL_DATE_TIME:
+                    // EEE MMM dd yyyy
+                    sb.append(weekDays[(int) weekDay(t)])
+                            .append(' ')
+                            .append(months[(int) monthFromTime(t)])
+                            .append(' ');
+                    zeroPad(sb, (int) dayFromTime(t), 2);
+                    sb.append(' ');
+                    zeroPad(sb, (int) yearFromTime(t), 4);
+                    if (format == FORMAT_DATE) {
+                        break;
+                    }
+                    sb.append(' ');
+
+                    //$FALL-THROUGH$
+                case FORMAT_TIME:
+                    final TimeZone tz = nd.getTimeZone();
+                    final double utcTime = nd.getTime();
+                    int offset = tz.getOffset((long) utcTime) / 60000;
+                    final boolean inDaylightTime = offset != tz.getRawOffset() / 60000;
+                    // Convert minutes to HHmm timezone offset
+                    offset = (offset / 60) * 100 + offset % 60;
+
+                    // HH:mm:ss GMT+HHmm
+                    zeroPad(sb, (int) hourFromTime(t), 2);
+                    sb.append(':');
+                    zeroPad(sb, (int) minFromTime(t), 2);
+                    sb.append(':');
+                    zeroPad(sb, (int) secFromTime(t), 2);
+                    sb.append(" GMT")
+                            .append(offset < 0 ? '-' : '+');
+                    zeroPad(sb, Math.abs(offset), 4);
+                    sb.append(" (")
+                            .append(tz.getDisplayName(inDaylightTime, TimeZone.SHORT, Locale.US))
+                            .append(')');
+                    break;
+
+                case FORMAT_LOCAL_DATE:
+                    // yyyy-MM-dd
+                    zeroPad(sb, (int) yearFromTime(t), 4);
+                    sb.append('-');
+                    zeroPad(sb, (int) monthFromTime(t) + 1, 2);
+                    sb.append('-');
+                    zeroPad(sb, (int) dayFromTime(t), 2);
+                    break;
+
+                case FORMAT_LOCAL_TIME:
+                    // HH:mm:ss
+                    zeroPad(sb, (int) hourFromTime(t), 2);
+                    sb.append(':');
+                    zeroPad(sb, (int) minFromTime(t), 2);
+                    sb.append(':');
+                    zeroPad(sb, (int) secFromTime(t), 2);
+                    break;
+
+                default:
+                    throw new IllegalArgumentException("format: " + format);
+            }
+
+            return sb.toString();
+        }
+
+        return INVALID_DATE;
+    }
+
+    private static String toGMTStringImpl(final Object self) {
+        final NativeDate nd = getNativeDate(self);
+
+        if (nd != null && nd.isValidDate()) {
+            final StringBuilder sb = new StringBuilder(29);
+            final double t = nd.getTime();
+            // EEE, dd MMM yyyy HH:mm:ss z
+            sb.append(weekDays[(int) weekDay(t)])
+                    .append(", ");
+            zeroPad(sb, (int) dayFromTime(t), 2);
+            sb.append(' ')
+                    .append(months[(int) monthFromTime(t)])
+                    .append(' ');
+            zeroPad(sb, (int) yearFromTime(t), 4);
+            sb.append(' ');
+            zeroPad(sb, (int) hourFromTime(t), 2);
+            sb.append(':');
+            zeroPad(sb, (int) minFromTime(t), 2);
+            sb.append(':');
+            zeroPad(sb, (int) secFromTime(t), 2);
+            sb.append(" GMT");
+            return sb.toString();
+        }
+
+        rangeError(Global.instance(), "invalid.date");
+
+        return INVALID_DATE;
+    }
+
+    private static String toISOStringImpl(final Object self) {
+        final NativeDate nd = getNativeDate(self);
+
+        if (nd != null && nd.isValidDate()) {
+            final StringBuilder sb = new StringBuilder(24);
+            final double t = nd.getTime();
+            // yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
+            zeroPad(sb, (int) yearFromTime(t), 4);
+            sb.append('-');
+            zeroPad(sb, (int) monthFromTime(t) + 1, 2);
+            sb.append('-');
+            zeroPad(sb, (int) dayFromTime(t), 2);
+            sb.append('T');
+            zeroPad(sb, (int) hourFromTime(t), 2);
+            sb.append(':');
+            zeroPad(sb, (int) minFromTime(t), 2);
+            sb.append(':');
+            zeroPad(sb, (int) secFromTime(t), 2);
+            sb.append('.');
+            zeroPad(sb, (int) msFromTime(t), 3);
+            sb.append("Z");
+            return sb.toString();
+        }
+
+        rangeError(Global.instance(), "invalid.date");
+
+        return INVALID_DATE;
+    }
+
+    // ECMA 15.9.1.2 Day (t)
+    private static double day(final double t) {
+        return Math.floor(t / msPerDay);
+    }
+
+    // ECMA 15.9.1.2 TimeWithinDay (t)
+    private static double timeWithinDay(final double t) {
+        return t % msPerDay;
+    }
+
+    // ECMA 15.9.1.3 InLeapYear (t)
+    private static boolean isLeapYear(final int y) {
+        return y % 4 == 0 && (y % 100 != 0 || y % 400 == 0);
+    }
+
+    // ECMA 15.9.1.3 DaysInYear (y)
+    private static int daysInYear(final int y) {
+        return isLeapYear(y) ? 366 : 365;
+    }
+
+    // ECMA 15.9.1.3 DayFromYear (y)
+    private static double dayFromYear(final double y) {
+        return 365 * (y - 1970)
+                + Math.floor((y -1969) / 4.0)
+                - Math.floor((y - 1901) / 100.0)
+                + Math.floor((y - 1601) / 400.0);
+    }
+
+    // ECMA 15.9.1.3 Year Number
+    private static double timeFromYear(final double y) {
+        return dayFromYear(y) * msPerDay;
+    }
+
+    private static double yearFromTime(final double t) {
+        double y = Math.floor(t / (msPerDay * 365.2425)) + 1970;
+        final double t2 = timeFromYear(y);
+        if (t2 > t) {
+            y--;
+        } else if (t2 + msPerDay * daysInYear((int) y) <= t) {
+            y++;
+        }
+        return y;
+    }
+
+    private static double dayWithinYear(final double t, final double year) {
+        return day(t) - dayFromYear(year);
+    }
+
+    private static double monthFromTime(final double t) {
+        final double year = yearFromTime(t);
+        final double day = dayWithinYear(t, year);
+        final int[] firstDay = firstDayInMonth[isLeapYear((int) year) ? 1 : 0];
+        int month = 0;
+
+        while (month < 11 && firstDay[month + 1] <= day) {
+            month++;
+        }
+        return month;
+    }
+
+    private static double dayFromTime(final double t)  {
+        final double year = yearFromTime(t);
+        final double day = dayWithinYear(t, year);
+        final int[] firstDay = firstDayInMonth[isLeapYear((int) year) ? 1 : 0];
+        int month = 0;
+
+        while (month < 11 && firstDay[month + 1] <= day) {
+            month++;
+        }
+        return 1 + day - firstDay[month];
+    }
+
+    private static int dayFromMonth(final int month, final int year) {
+        assert(month >= 0 && month <= 11);
+        final int[] firstDay = firstDayInMonth[isLeapYear(year) ? 1 : 0];
+        return firstDay[month];
+    }
+
+    private static double weekDay(final double time) {
+        if (isNaN(time)) {
+            return NaN;
+        }
+        final double day = (day(time) + 4) % 7;
+        return day < 0 ? day + 7 : day;
+    }
+
+    // ECMA 15.9.1.9 LocalTime
+    private static double localTime(final double time, final TimeZone tz) {
+        return time + tz.getOffset((long) time);
+    }
+
+    // ECMA 15.9.1.9 UTC
+    private static double utc(final double time, final TimeZone tz) {
+        return time - tz.getOffset((long) (time - tz.getRawOffset()));
+    }
+
+    // ECMA 15.9.1.10 Hours, Minutes, Second, and Milliseconds
+    private static double hourFromTime(final double t) {
+        final double h = Math.floor(t / msPerHour) % hoursPerDay;
+        return h < 0 ? h + hoursPerDay: h;
+    }
+    private static double minFromTime(final double t) {
+        final double m = Math.floor(t / msPerMinute) % minutesPerHour;
+        return m < 0 ? m + minutesPerHour : m;
+    }
+
+    private static double secFromTime(final double t) {
+        final double s = Math.floor(t / msPerSecond) % secondsPerMinute;
+        return s < 0 ? s + secondsPerMinute : s;
+    }
+
+    private static double msFromTime(final double t) {
+        final double m = t % msPerSecond;
+        return m < 0 ? m + msPerSecond : m;
+    }
+
+    private static double valueFromTime(final int unit, final double t) {
+        switch (unit) {
+            case YEAR: return yearFromTime(t);
+            case MONTH: return monthFromTime(t);
+            case DAY: return dayFromTime(t);
+            case HOUR: return hourFromTime(t);
+            case MINUTE: return minFromTime(t);
+            case SECOND: return secFromTime(t);
+            case MILLISECOND: return msFromTime(t);
+            default: throw new IllegalArgumentException(Integer.toString(unit));
+        }
+    }
+
+    // ECMA 15.9.1.11 MakeTime (hour, min, sec, ms)
+    private static double makeTime(final double hour, final double min, final double sec, final double ms) {
+        return hour * 3600000 + min * 60000 + sec * 1000 + ms;
+    }
+
+    // ECMA 15.9.1.12 MakeDay (year, month, date)
+    private static double makeDay(final double year, final double month, final double date) {
+        final double y = year + Math.floor(month / 12);
+        double m = month % 12;
+        if (m < 0) {
+            m += 12;
+        }
+        double d = Math.floor(dayFromYear(y));
+        d += dayFromMonth((int) m, (int) y);
+
+        return d + date - 1;
+    }
+
+    // ECMA 15.9.1.13 MakeDate (day, time)
+    private static double makeDate(final double day, final double time) {
+        return day * msPerDay + time;
+    }
+
+
+    private static double makeDate(final Integer[] d) {
+        final double time = makeDay(d[0], d[1], d[2]) * msPerDay;
+        return time + makeTime(d[3], d[4], d[5], d[6]);
+    }
+
+    private static double makeDate(final double[] d) {
+        final double time = makeDay(d[0], d[1], d[2]) * msPerDay;
+        return time + makeTime(d[3], d[4], d[5], d[6]);
+    }
+
+    // Convert Date constructor args, checking for NaN, filling in defaults etc.
+    private static double[] convertCtorArgs(final Object[] args) {
+        final double[] d = new double[7];
+
+        for (int i = 0; i < d.length; i++) {
+            if (i < args.length) {
+                final double darg = JSType.toNumber(args[i]);
+                if (isNaN(darg) || isInfinite(darg)) {
+                    return null;
+                }
+                d[i] = (long)darg;
+            } else {
+                d[i] = i == 2 ? 1 : 0; // day in month defaults to 1
+            }
+        }
+
+        if (0 <= d[0] && d[0] <= 99) {
+            d[0] += 1900;
+        }
+
+        return d;
+    }
+
+    // This method does the hard work for all setter methods: If a value is provided
+    // as argument it is used, otherwise the value is calculated from the existing time value.
+    private static double[] convertArgs(final Object[] args, final double time, final int fieldId, final int start, final int length) {
+        final double[] d = new double[length];
+
+        for (int i = start; i < start + length; i++) {
+            if (fieldId <= i && i < fieldId + args.length) {
+                final double darg = JSType.toNumber(args[i - fieldId]);
+                if (isNaN(darg) || isInfinite(darg)) {
+                    return null;
+                }
+                d[i - start] = (long) darg;
+            } else {
+                // Date.prototype.set* methods require first argument to be defined
+                if (i == fieldId) {
+                    return null;
+                }
+                d[i - start] = valueFromTime(i, time);
+            }
+        }
+        return d;
+
+    }
+
+    // ECMA 15.9.1.14 TimeClip (time)
+    private static double timeClip(final double time) {
+        if (isInfinite(time) || isNaN(time) || Math.abs(time) > 8.64e15) {
+            return Double.NaN;
+        }
+        return (long)time;
+    }
+
+    private static NativeDate ensureNativeDate(final Object self) {
+        return getNativeDate(self);
+    }
+
+    private static NativeDate getNativeDate(final Object self) {
+        if (self instanceof NativeDate) {
+            return (NativeDate)self;
+        } else if (self != null && self == Global.instance().getDatePrototype()) {
+            return Global.instance().DEFAULT_DATE;
+        } else {
+            typeError(Global.instance(), "not.a.date", ScriptRuntime.safeToString(self));
+            return null;
+        }
+    }
+
+    private static Object getField(final Object self, final int field) {
+        final NativeDate nd = getNativeDate(self);
+        return (nd != null && nd.isValidDate()) ? valueFromTime(field, nd.getLocalTime()) : Double.NaN;
+    }
+
+    private static Object getUTCField(final Object self, final int field) {
+        final NativeDate nd = getNativeDate(self);
+        return (nd != null && nd.isValidDate()) ? valueFromTime(field, nd.getTime()) : Double.NaN;
+    }
+
+    private static void setFields(final NativeDate nd, final int fieldId, final Object[] args, final boolean local) {
+        int start, length;
+        if (fieldId < HOUR) {
+            start = YEAR;
+            length = 3;
+        } else {
+            start = HOUR;
+            length = 4;
+        }
+        final double time = local ? nd.getLocalTime() : nd.getTime();
+        final double d[] = convertArgs(args, time, fieldId, start, length);
+
+        double newTime;
+        if (d == null) {
+            newTime = NaN;
+        } else {
+            if (start == YEAR) {
+                newTime = makeDate(makeDay(d[0], d[1], d[2]), timeWithinDay(time));
+            } else {
+                newTime = makeDate(day(time), makeTime(d[0], d[1], d[2], d[3]));
+            }
+            if (local) {
+                newTime = utc(newTime, nd.getTimeZone());
+            }
+            newTime = timeClip(newTime);
+        }
+        nd.setTime(newTime);
+    }
+
+    private boolean isValidDate() {
+        return !isNaN(time);
+    }
+
+    private double getLocalTime() {
+        return localTime(time, timezone);
+    }
+
+    private double getTime() {
+        return time;
+    }
+
+    private void setTime(final double time) {
+        this.time = time;
+    }
+
+    private TimeZone getTimeZone() {
+        return timezone;
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeDebug.java b/nashorn/src/jdk/nashorn/internal/objects/NativeDebug.java
new file mode 100644
index 00000000000..3c11e3ded60
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeDebug.java
@@ -0,0 +1,274 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+
+import java.io.PrintStream;
+import java.util.Objects;
+import jdk.nashorn.internal.objects.annotations.Attribute;
+import jdk.nashorn.internal.objects.annotations.Function;
+import jdk.nashorn.internal.objects.annotations.ScriptClass;
+import jdk.nashorn.internal.objects.annotations.Where;
+import jdk.nashorn.internal.runtime.PropertyListenerManager;
+import jdk.nashorn.internal.runtime.PropertyMap;
+import jdk.nashorn.internal.runtime.ScriptFunction;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.linker.LinkerCallSite;
+
+/**
+ * Nashorn specific debug utils. This is meant for Nashorn developers.
+ * The interface is subject to change without notice!!
+ *
+ */
+@ScriptClass("Debug")
+public class NativeDebug extends ScriptObject {
+    NativeDebug() {
+        this.setProto(Global.objectPrototype());
+    }
+
+    @Override
+    public String getClassName() {
+        return "Debug";
+    }
+
+    /**
+     * Nashorn extension: get context, context utility
+     *
+     * @param self self reference
+     * @return context
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object getContext(final Object self) {
+        return Global.getThisContext();
+    }
+
+    /**
+     * Nashorn extension: get map from {@link ScriptObject}
+     *
+     * @param self self reference
+     * @param obj script object
+     * @return the map for the current ScriptObject
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object map(final Object self, final Object obj) {
+        if (obj instanceof ScriptObject) {
+            return ((ScriptObject)obj).getMap();
+        }
+        return UNDEFINED;
+    }
+
+    /**
+     * Nashorn extension: get embed0 from {@link ScriptObject}
+     *
+     * @param self self reference
+     * @param obj script object
+     * @return the embed0 property value for the given ScriptObject
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object embed0(final Object self, final Object obj) {
+        if (obj instanceof ScriptObject) {
+            return ((ScriptObject)obj).embed0;
+        }
+        return UNDEFINED;
+    }
+
+    /**
+     * Nashorn extension: get embed1 from {@link ScriptObject}
+     *
+     * @param self self reference
+     * @param obj script object
+     * @return the embed1 property value for the given ScriptObject
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object embed1(final Object self, final Object obj) {
+        if (obj instanceof ScriptObject) {
+            return ((ScriptObject)obj).embed1;
+        }
+        return UNDEFINED;
+    }
+
+    /**
+     * Nashorn extension: get embed2 from {@link ScriptObject}
+     *
+     * @param self self reference
+     * @param obj script object
+     * @return the embed2 property value for the given ScriptObject
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object embed2(final Object self, final Object obj) {
+        if (obj instanceof ScriptObject) {
+            return ((ScriptObject)obj).embed2;
+        }
+        return UNDEFINED;
+    }
+
+    /**
+     * Nashorn extension: get embed3 from {@link ScriptObject}
+     *
+     * @param self self reference
+     * @param obj script object
+     * @return the embed3 property value for the given ScriptObject
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object embed3(final Object self, final Object obj) {
+        if (obj instanceof ScriptObject) {
+            return ((ScriptObject)obj).embed3;
+        }
+        return UNDEFINED;
+    }
+
+    /**
+     * Nashorn extension: get spill vector from {@link ScriptObject}
+     *
+     * @param self self reference
+     * @param obj script object
+     * @return the spill vector for the given ScriptObject
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object spill(final Object self, final Object obj) {
+        if (obj instanceof ScriptObject) {
+            return ((ScriptObject)obj).spill;
+        }
+        return UNDEFINED;
+    }
+
+    /**
+     * Nashorn extension: get invocation handle from {@link ScriptFunction}
+     *
+     * @param self self reference
+     * @param obj script function
+     * @return the invocation handle for the given ScriptFunction
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object methodHandle(final Object self, final Object obj) {
+        if (obj instanceof ScriptFunction) {
+            return ((ScriptFunction)obj).getInvokeHandle();
+        }
+        return UNDEFINED;
+    }
+
+    /**
+     * Check object identity comparison regardless of type
+     *
+     * @param self self reference
+     * @param obj1 first object in comparison
+     * @param obj2 second object in comparison
+     * @return true if reference identity
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object identical(final Object self, final Object obj1, final Object obj2) {
+        return obj1 == obj2;
+    }
+
+    /**
+     * Object util - getClass
+     *
+     * @param self self reference
+     * @param obj  object
+     * @return class of {@code obj}
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object getClass(final Object self, final Object obj) {
+        if (obj != null) {
+            return obj.getClass();
+        }
+        return UNDEFINED;
+    }
+
+    /**
+     * Object util - equals
+     *
+     * @param self self reference
+     * @param obj1 first object in comparison
+     * @param obj2 second object in comparison
+     * @return return {@link Object#equals(Object)} for objects.
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object equals(final Object self, final Object obj1, final Object obj2) {
+        return (obj1 != null) ? obj1.equals(obj2) : false;
+    }
+
+    /**
+     * Object util - toJavaString
+     *
+     * @param self self reference
+     * @param obj  object to represent as a string
+     * @return Java string representation of {@code obj}
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object toJavaString(final Object self, final Object obj) {
+        return Objects.toString(obj);
+    }
+
+    /**
+     * Do not call overridden toString -- use default toString impl
+     *
+     * @param self self reference
+     * @param obj  object to represent as a string
+     * @return string representation
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object toIdentString(final Object self, final Object obj) {
+        if (obj == null) {
+            return "null";
+        }
+
+        final int hash = System.identityHashCode(obj);
+        return obj.getClass() + "@" + Integer.toHexString(hash);
+    }
+
+    /**
+     * Dump all Nashorn debug mode counters. Calling this may be better if
+     * you want to print all counters. This way you can avoid too many callsites
+     * due to counter access itself!!
+     * @param self self reference
+     * @return undefined
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object dumpCounters(final Object self) {
+        final PrintStream out = System.err;
+        out.println("ScriptObject count " + ScriptObject.getCount());
+        out.println("Scope count " + ScriptObject.getScopeCount());
+        out.println("ScriptObject listeners added " + PropertyListenerManager.getListenersAdded());
+        out.println("ScriptObject listeners removed " + PropertyListenerManager.getListenersRemoved());
+        out.println("ScriptObject listeners dead " + PropertyListenerManager.getListenersDead());
+        out.println("ScriptFunction count " + ScriptObject.getCount());
+        out.println("ScriptFunction invokes " + ScriptFunction.getInvokes());
+        out.println("ScriptFunction allocations " + ScriptFunction.getAllocations());
+        out.println("PropertyMap count " + PropertyMap.getCount());
+        out.println("PropertyMap cloned " + PropertyMap.getClonedCount());
+        out.println("PropertyMap history hit " + PropertyMap.getHistoryHit());
+        out.println("PropertyMap proto invalidations " + PropertyMap.getProtoInvalidations());
+        out.println("PropertyMap proto history hit " + PropertyMap.getProtoHistoryHit());
+        out.println("PropertyMap setProtoNewMapCount " + PropertyMap.getSetProtoNewMapCount());
+        out.println("Callsite count " + LinkerCallSite.getCount());
+        out.println("Callsite misses " + LinkerCallSite.getMissCount());
+        out.println("Callsite misses by site at " + LinkerCallSite.getMissSamplingPercentage() + "%");
+        LinkerCallSite.getMissCounts(out);
+        return UNDEFINED;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeError.java b/nashorn/src/jdk/nashorn/internal/objects/NativeError.java
new file mode 100644
index 00000000000..7f4350f02ad
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeError.java
@@ -0,0 +1,325 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.util.ArrayList;
+import java.util.List;
+import jdk.nashorn.internal.objects.annotations.Attribute;
+import jdk.nashorn.internal.objects.annotations.Constructor;
+import jdk.nashorn.internal.objects.annotations.Function;
+import jdk.nashorn.internal.objects.annotations.Property;
+import jdk.nashorn.internal.objects.annotations.ScriptClass;
+import jdk.nashorn.internal.objects.annotations.Where;
+import jdk.nashorn.internal.runtime.ECMAException;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
+
+/**
+ * ECMA 15.11 Error Objects
+ */
+@ScriptClass("Error")
+public class NativeError extends ScriptObject {
+
+    static final MethodHandle GET_COLUMNNUMBER = findOwnMH("getColumnNumber", Object.class, Object.class);
+    static final MethodHandle SET_COLUMNNUMBER = findOwnMH("setColumnNumber", Object.class, Object.class, Object.class);
+    static final MethodHandle GET_LINENUMBER   = findOwnMH("getLineNumber", Object.class, Object.class);
+    static final MethodHandle SET_LINENUMBER   = findOwnMH("setLineNumber", Object.class, Object.class, Object.class);
+    static final MethodHandle GET_FILENAME     = findOwnMH("getFileName", Object.class, Object.class);
+    static final MethodHandle SET_FILENAME     = findOwnMH("setFileName", Object.class, Object.class, Object.class);
+    static final MethodHandle GET_STACK        = findOwnMH("getStack", Object.class, Object.class);
+    static final MethodHandle SET_STACK        = findOwnMH("setStack", Object.class, Object.class, Object.class);
+
+    // message property name
+    static final String MESSAGE = "message";
+    // name property name
+    static final String NAME = "name";
+    // stack property name
+    static final String STACK = "__stack__";
+    // lineNumber property name
+    static final String LINENUMBER = "__lineNumber__";
+    // columnNumber property name
+    static final String COLUMNNUMBER = "__columnNumber__";
+    // fileName property name
+    static final String FILENAME = "__fileName__";
+
+    /** Message property name */
+    @Property(name = NativeError.MESSAGE)
+    public Object instMessage;
+
+    /** ECMA 15.11.4.2 Error.prototype.name */
+    @Property(attributes = Attribute.NOT_ENUMERABLE, where = Where.PROTOTYPE)
+    public Object name;
+
+    /** ECMA 15.11.4.3 Error.prototype.message */
+    @Property(attributes = Attribute.NOT_ENUMERABLE, where = Where.PROTOTYPE)
+    public Object message;
+
+    NativeError(final Object msg) {
+        this.setProto(Global.instance().getErrorPrototype());
+        if (msg != UNDEFINED) {
+            this.instMessage = JSType.toString(msg);
+        } else {
+            this.delete(NativeError.MESSAGE, Global.isStrict());
+        }
+    }
+
+    @Override
+    public String getClassName() {
+        return "Error";
+    }
+
+    /**
+     * ECMA 15.11.2 The Error Constructor
+     *
+     * @param newObj true if this is being instantiated with a new
+     * @param self   self reference
+     * @param msg    error message
+     *
+     * @return NativeError instance
+     */
+    @Constructor
+    public static Object constructor(final boolean newObj, final Object self, final Object msg) {
+        return new NativeError(msg);
+    }
+
+    /**
+     * Nashorn extension: Error.dumpStack
+     * dumps the stack of the current thread.
+     *
+     * @param self self reference
+     *
+     * @return undefined
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object dumpStack(final Object self) {
+        Thread.dumpStack();
+        return UNDEFINED;
+    }
+
+    /**
+     * Nashorn extension: Error.prototype.printStackTrace
+     * prints stack trace associated with the exception (if available).
+     * to the standard error stream.
+     *
+     * @param self self reference
+     *
+     * @return result of {@link ECMAException#printStackTrace(ScriptObject)}, which is typically undefined
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object printStackTrace(final Object self) {
+        Global.checkObject(self);
+        return ECMAException.printStackTrace((ScriptObject)self);
+    }
+
+    /**
+     * Nashorn extension: Error.prototype.lineNumber
+     *
+     * @param self self reference
+     *
+     * @return line number from which error was thrown
+     */
+    public static Object getLineNumber(final Object self) {
+        Global.checkObject(self);
+        final ScriptObject sobj = (ScriptObject)self;
+        return sobj.has(LINENUMBER) ? sobj.get(LINENUMBER) : ECMAException.getLineNumber(sobj);
+    }
+
+    /**
+     * Nashorn extension: Error.prototype.lineNumber
+     *
+     * @param self  self reference
+     * @param value value of line number
+     *
+     * @return value that was set
+     */
+    public static Object setLineNumber(final Object self, final Object value) {
+        Global.checkObject(self);
+        final ScriptObject sobj = (ScriptObject)self;
+        sobj.set(LINENUMBER, value, Global.isStrict());
+        return value;
+    }
+
+    /**
+     * Nashorn extension: Error.prototype.columnNumber
+     *
+     * @param self self reference
+     *
+     * @return column number from which error was thrown
+     */
+    public static Object getColumnNumber(final Object self) {
+        Global.checkObject(self);
+        final ScriptObject sobj = (ScriptObject)self;
+        return sobj.has(COLUMNNUMBER) ? sobj.get(COLUMNNUMBER) : ECMAException.getColumnNumber((ScriptObject)self);
+    }
+
+    /**
+     * Nashorn extension: Error.prototype.columnNumber
+     *
+     * @param self  self reference
+     * @param value value of column number
+     *
+     * @return value that was set
+     */
+    public static Object setColumnNumber(final Object self, final Object value) {
+        Global.checkObject(self);
+        final ScriptObject sobj = (ScriptObject)self;
+        sobj.set(COLUMNNUMBER, value, Global.isStrict());
+        return value;
+    }
+
+    /**
+     * Nashorn extension: Error.prototype.fileName
+     *
+     * @param self self reference
+     *
+     * @return file name from which error was thrown
+     */
+    public static Object getFileName(final Object self) {
+        Global.checkObject(self);
+        final ScriptObject sobj = (ScriptObject)self;
+        return sobj.has(FILENAME) ? sobj.get(FILENAME) : ECMAException.getFileName((ScriptObject)self);
+    }
+
+    /**
+     * Nashorn extension: Error.prototype.fileName
+     *
+     * @param self  self reference
+     * @param value value of file name
+     *
+     * @return value that was set
+     */
+    public static Object setFileName(final Object self, final Object value) {
+        Global.checkObject(self);
+        final ScriptObject sobj = (ScriptObject)self;
+        sobj.set(FILENAME, value, Global.isStrict());
+        return value;
+    }
+
+    /**
+     * Nashorn extension: Error.prototype.stack
+     * "stack" property is an array typed value containing {@link StackTraceElement}
+     * objects of JavaScript stack frames.
+     *
+     * @param self  self reference
+     *
+     * @return      value of "stack" property
+     */
+    public static Object getStack(final Object self) {
+        Global.checkObject(self);
+        final ScriptObject sobj = (ScriptObject)self;
+        if (sobj.has(STACK)) {
+            return sobj.get(STACK);
+        }
+
+        final Object exception = ECMAException.getException(sobj);
+        Object[] res;
+        if (exception instanceof Throwable) {
+            final StackTraceElement[] frames = ((Throwable)exception).getStackTrace();
+            final List<StackTraceElement> filtered = new ArrayList<>();
+            for (final StackTraceElement st : frames) {
+                if (ECMAException.isScriptFrame(st)) {
+                    filtered.add(st);
+                }
+            }
+            res = filtered.toArray();
+        } else {
+            res = ScriptRuntime.EMPTY_ARRAY;
+        }
+
+        return new NativeArray(res);
+    }
+
+    /**
+     * Nashorn extension
+     * Accessed from {@link Global} while setting up the Error.prototype
+     *
+     * @param self   self reference
+     * @param value  value to set "stack" property to, must be {@code ScriptObject}
+     *
+     * @return value that was set
+     */
+    public static Object setStack(final Object self, final Object value) {
+        Global.checkObject(self);
+        final ScriptObject sobj = (ScriptObject)self;
+        sobj.set(STACK, value, Global.isStrict());
+        return value;
+    }
+
+    /**
+     * ECMA 15.11.4.4 Error.prototype.toString ( )
+     *
+     * @param self  self reference
+     *
+     * @return this NativeError as a string
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object toString(final Object self) {
+        // Step 1 and 2 : check if 'self' is object it not throw TypeError
+        Global.checkObject(self);
+
+        final ScriptObject sobj = (ScriptObject)self;
+
+        // Step 3 & 4 : get "name" and convert to String.
+        // But if message is undefined make it "Error".
+        Object name = sobj.get("name");
+        if (name == UNDEFINED) {
+            name = "Error";
+        } else {
+            name = JSType.toString(name);
+        }
+
+        // Steps 5, 6, & 7 : get "message" and convert to String.
+        // if 'message' is undefined make it "" (empty String).
+        Object msg = sobj.get("message");
+        if (msg == UNDEFINED) {
+            msg = "";
+        } else {
+            msg = JSType.toString(msg);
+        }
+
+        // Step 8 : if name is empty, return msg
+        if (((String)name).isEmpty()) {
+            return msg;
+        }
+
+        // Step 9 : if message is empty, return name
+        if (((String)msg).isEmpty()) {
+            return name;
+        }
+        // Step 10 : return name + ": " + msg
+        return (String)name + ": " + (String)msg;
+    }
+
+    private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
+        return MH.findStatic(MethodHandles.lookup(), NativeError.class, name, MH.type(rtype, types));
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeEvalError.java b/nashorn/src/jdk/nashorn/internal/objects/NativeEvalError.java
new file mode 100644
index 00000000000..d8583eac013
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeEvalError.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+
+import jdk.nashorn.internal.objects.annotations.Attribute;
+import jdk.nashorn.internal.objects.annotations.Constructor;
+import jdk.nashorn.internal.objects.annotations.Property;
+import jdk.nashorn.internal.objects.annotations.ScriptClass;
+import jdk.nashorn.internal.objects.annotations.Where;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.ScriptObject;
+
+/**
+ * ECMA 15.11.6.1 EvalError
+ *
+ */
+@ScriptClass("Error")
+public class NativeEvalError extends ScriptObject {
+
+    /** message property in instance */
+    @Property(name = NativeError.MESSAGE)
+    public Object instMessage;
+
+    /** error name property */
+    @Property(attributes = Attribute.NOT_ENUMERABLE, where = Where.PROTOTYPE)
+    public Object name;
+
+    /** ECMA 15.1.1.1 message property */
+    @Property(attributes = Attribute.NOT_ENUMERABLE, where = Where.PROTOTYPE)
+
+    public Object message;
+    NativeEvalError(final Object msg) {
+        this.setProto(Global.instance().getEvalErrorPrototype());
+        if (msg != UNDEFINED) {
+            this.instMessage = JSType.toString(msg);
+        } else {
+            this.delete(NativeError.MESSAGE, Global.isStrict());
+        }
+    }
+
+    @Override
+    public String getClassName() {
+        return "Error";
+    }
+
+
+    /**
+     * ECMA 15.11.6.1 EvalError
+     *
+     * Constructor
+     *
+     * @param newObj was this error instantiated with the new operator
+     * @param self   self reference
+     * @param msg    error message
+     *
+     * @return new EvalError
+     */
+    @Constructor(name = "EvalError")
+    public static Object constructor(final boolean newObj, final Object self, final Object msg) {
+        return new NativeEvalError(msg);
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeFloat32Array.java b/nashorn/src/jdk/nashorn/internal/objects/NativeFloat32Array.java
new file mode 100644
index 00000000000..a325762a929
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeFloat32Array.java
@@ -0,0 +1,186 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+import jdk.nashorn.internal.objects.annotations.Attribute;
+import jdk.nashorn.internal.objects.annotations.Constructor;
+import jdk.nashorn.internal.objects.annotations.Function;
+import jdk.nashorn.internal.objects.annotations.ScriptClass;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.arrays.ArrayData;
+
+/**
+ * Float32 array for the TypedArray extension
+ */
+@ScriptClass("Float32Array")
+public class NativeFloat32Array extends ArrayBufferView {
+    private static final int BYTES_PER_ELEMENT = 4;
+    private static final Factory FACTORY = new Factory(BYTES_PER_ELEMENT) {
+        @Override
+        public ArrayBufferView construct(final NativeArrayBuffer buffer, final int byteOffset, final int length) {
+            return new NativeFloat32Array(buffer, byteOffset, length);
+        }
+        @Override
+        public ArrayData createArrayData(final NativeArrayBuffer buffer, final int byteOffset, final int length) {
+            return new Float32ArrayData(buffer, byteOffset, length);
+        }
+    };
+
+    private static final class Float32ArrayData extends ArrayDataImpl {
+        private Float32ArrayData(final NativeArrayBuffer buffer, final int byteOffset, final int elementLength) {
+            super(buffer, byteOffset, elementLength);
+        }
+
+        @Override
+        protected int byteIndex(final int index) {
+            return index * BYTES_PER_ELEMENT + byteOffset;
+        }
+
+        @Override
+        protected double getDoubleImpl(final int index) {
+            final int byteIndex = byteIndex(index);
+            final byte[] byteArray = buffer.getByteArray();
+            final int bits = byteArray[byteIndex  ]       & 0x0000_00ff |
+                             byteArray[byteIndex+1] <<  8 & 0x0000_ff00 |
+                             byteArray[byteIndex+2] << 16 & 0x00ff_0000 |
+                             byteArray[byteIndex+3] << 24 & 0xff00_0000 ;
+            return Float.intBitsToFloat(bits);
+        }
+
+        @Override
+        protected int getIntImpl(final int index) {
+            return (int)getDoubleImpl(index);
+        }
+
+        @Override
+        protected long getLongImpl(final int key) {
+            return (long)getDoubleImpl(key);
+        }
+
+        @Override
+        protected Object getObjectImpl(final int key) {
+            return getDoubleImpl(key);
+        }
+
+        @Override
+        protected void setImpl(final int index, final double value) {
+            final int bits = Float.floatToRawIntBits((float)value);
+            final int byteIndex = byteIndex(index);
+            @SuppressWarnings("MismatchedReadAndWriteOfArray")
+            final byte[] byteArray = buffer.getByteArray();
+            byteArray[byteIndex  ] = (byte)(bits        & 0xff);
+            byteArray[byteIndex+1] = (byte)(bits >>>  8 & 0xff);
+            byteArray[byteIndex+2] = (byte)(bits >>> 16 & 0xff);
+            byteArray[byteIndex+3] = (byte)(bits >>> 24 & 0xff);
+        }
+
+        @Override
+        protected void setImpl(final int key, final int value) {
+            setImpl(key, (double)value);
+        }
+
+        @Override
+        protected void setImpl(final int key, final long value) {
+            setImpl(key, (double)value);
+        }
+
+        @Override
+        protected void setImpl(final int key, final Object value) {
+            setImpl(key, JSType.toNumber(value));
+        }
+    }
+
+    /**
+     * Constructor
+     *
+     * @param newObj is this typed array instantiated with the new operator
+     * @param self   self reference
+     * @param args   args
+     *
+     * @return new typed array
+     */
+    @Constructor(arity = 1)
+    public static Object constructor(final boolean newObj, final Object self, final Object... args) {
+        return constructorImpl(args, FACTORY);
+    }
+
+    NativeFloat32Array(final NativeArrayBuffer buffer, final int byteOffset, final int length) {
+        super(buffer, byteOffset, length);
+    }
+
+    @Override
+    protected Factory factory() {
+        return FACTORY;
+    }
+
+    @Override
+    protected boolean isFloatArray() {
+        return true;
+    }
+
+    /**
+     * Set values
+     * @param self   self reference
+     * @param array  multiple values of array's type to set
+     * @param offset optional start index, interpreted  0 if undefined
+     * @return undefined
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    protected static Object set(final Object self, final Object array, final Object offset) {
+        return ArrayBufferView.setImpl(self, array, offset);
+    }
+
+    /**
+     * Returns a new TypedArray view of the ArrayBuffer store for this TypedArray,
+     * referencing the elements at begin, inclusive, up to end, exclusive. If either
+     * begin or end is negative, it refers to an index from the end of the array,
+     * as opposed to from the beginning.
+     * <p>
+     * If end is unspecified, the subarray contains all elements from begin to the end
+     * of the TypedArray. The range specified by the begin and end values is clamped to
+     * the valid index range for the current array. If the computed length of the new
+     * TypedArray would be negative, it is clamped to zero.
+     * <p>
+     * The returned TypedArray will be of the same type as the array on which this
+     * method is invoked.
+     *
+     * @param self self reference
+     * @param begin begin position
+     * @param end end position
+     *
+     * @return sub array
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    protected static Object subarray(final Object self, final Object begin, final Object end) {
+        return ArrayBufferView.subarrayImpl(self, begin, end);
+    }
+
+    @Override
+    protected ScriptObject getPrototype() {
+        return Global.instance().getFloat32ArrayPrototype();
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeFloat64Array.java b/nashorn/src/jdk/nashorn/internal/objects/NativeFloat64Array.java
new file mode 100644
index 00000000000..a340d3c1bca
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeFloat64Array.java
@@ -0,0 +1,196 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+import jdk.nashorn.internal.objects.annotations.Attribute;
+import jdk.nashorn.internal.objects.annotations.Constructor;
+import jdk.nashorn.internal.objects.annotations.Function;
+import jdk.nashorn.internal.objects.annotations.ScriptClass;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.arrays.ArrayData;
+
+/**
+ * Float64 array for the TypedArray extension
+ */
+@ScriptClass("Float64Array")
+public class NativeFloat64Array extends ArrayBufferView {
+    private static final int BYTES_PER_ELEMENT = 8;
+    private static final Factory FACTORY = new Factory(BYTES_PER_ELEMENT) {
+        @Override
+        public ArrayBufferView construct(final NativeArrayBuffer buffer, final int byteOffset, final int length) {
+            return new NativeFloat64Array(buffer, byteOffset, length);
+        }
+        @Override
+        public ArrayData createArrayData(final NativeArrayBuffer buffer, final int byteOffset, final int length) {
+            return new Float64ArrayData(buffer, byteOffset, length);
+        }
+    };
+
+    private static final class Float64ArrayData extends ArrayDataImpl {
+        private Float64ArrayData(final NativeArrayBuffer buffer,
+                final int byteOffset, final int elementLength) {
+            super(buffer, byteOffset, elementLength);
+        }
+
+        @Override
+        protected int byteIndex(final int index) {
+            return index * BYTES_PER_ELEMENT + byteOffset;
+        }
+
+        @Override
+        protected double getDoubleImpl(final int index) {
+            final int byteIndex = byteIndex(index);
+            final byte[] byteArray = buffer.getByteArray();
+            final long bits;
+            bits =       byteArray[byteIndex  ]       & 0x0000_0000_0000_00ffL |
+                   (long)byteArray[byteIndex+1] <<  8 & 0x0000_0000_0000_ff00L |
+                   (long)byteArray[byteIndex+2] << 16 & 0x0000_0000_00ff_0000L |
+                   (long)byteArray[byteIndex+3] << 24 & 0x0000_0000_ff00_0000L |
+                   (long)byteArray[byteIndex+4] << 32 & 0x0000_00ff_0000_0000L |
+                   (long)byteArray[byteIndex+5] << 40 & 0x0000_ff00_0000_0000L |
+                   (long)byteArray[byteIndex+6] << 48 & 0x00ff_0000_0000_0000L |
+                   (long)byteArray[byteIndex+7] << 56 & 0xff00_0000_0000_0000L ;
+            return Double.longBitsToDouble(bits);
+        }
+
+        @Override
+        protected int getIntImpl(final int index) {
+            return (int)getDoubleImpl(index);
+        }
+
+        @Override
+        protected long getLongImpl(final int key) {
+            return (long)getDoubleImpl(key);
+        }
+
+        @Override
+        protected Object getObjectImpl(final int key) {
+            return getDoubleImpl(key);
+        }
+
+        @Override
+        protected void setImpl(final int index, final double value) {
+            final long bits = Double.doubleToRawLongBits(value);
+            final int byteIndex = byteIndex(index);
+            @SuppressWarnings("MismatchedReadAndWriteOfArray")
+            final byte[] byteArray = buffer.getByteArray();
+            byteArray[byteIndex  ] = (byte)(bits        & 0xff);
+            byteArray[byteIndex+1] = (byte)(bits >>>  8 & 0xff);
+            byteArray[byteIndex+2] = (byte)(bits >>> 16 & 0xff);
+            byteArray[byteIndex+3] = (byte)(bits >>> 24 & 0xff);
+            byteArray[byteIndex+4] = (byte)(bits >>> 32 & 0xff);
+            byteArray[byteIndex+5] = (byte)(bits >>> 40 & 0xff);
+            byteArray[byteIndex+6] = (byte)(bits >>> 48 & 0xff);
+            byteArray[byteIndex+7] = (byte)(bits >>> 56 & 0xff);
+        }
+
+        @Override
+        protected void setImpl(final int key, final int value) {
+            setImpl(key, (double)value);
+        }
+
+        @Override
+        protected void setImpl(final int key, final long value) {
+            setImpl(key, (double)value);
+        }
+
+        @Override
+        protected void setImpl(final int key, final Object value) {
+            setImpl(key, JSType.toNumber(value));
+        }
+    }
+
+    /**
+     * Constructor
+     *
+     * @param newObj is this typed array instantiated with the new operator
+     * @param self   self reference
+     * @param args   args
+     *
+     * @return new typed array
+     */
+    @Constructor(arity = 1)
+    public static Object constructor(final boolean newObj, final Object self, final Object... args) {
+        return constructorImpl(args, FACTORY);
+    }
+
+    NativeFloat64Array(final NativeArrayBuffer buffer, final int byteOffset, final int length) {
+        super(buffer, byteOffset, length);
+    }
+
+    @Override
+    protected Factory factory() {
+        return FACTORY;
+    }
+
+    @Override
+    protected boolean isFloatArray() {
+        return true;
+    }
+
+    /**
+     * Set values
+     * @param self   self reference
+     * @param array  multiple values of array's type to set
+     * @param offset optional start index, interpreted  0 if undefined
+     * @return undefined
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    protected static Object set(final Object self, final Object array, final Object offset) {
+        return ArrayBufferView.setImpl(self, array, offset);
+    }
+
+    /**
+     * Returns a new TypedArray view of the ArrayBuffer store for this TypedArray,
+     * referencing the elements at begin, inclusive, up to end, exclusive. If either
+     * begin or end is negative, it refers to an index from the end of the array,
+     * as opposed to from the beginning.
+     * <p>
+     * If end is unspecified, the subarray contains all elements from begin to the end
+     * of the TypedArray. The range specified by the begin and end values is clamped to
+     * the valid index range for the current array. If the computed length of the new
+     * TypedArray would be negative, it is clamped to zero.
+     * <p>
+     * The returned TypedArray will be of the same type as the array on which this
+     * method is invoked.
+     *
+     * @param self self reference
+     * @param begin begin position
+     * @param end end position
+     *
+     * @return sub array
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    protected static Object subarray(final Object self, final Object begin, final Object end) {
+        return ArrayBufferView.subarrayImpl(self, begin, end);
+    }
+
+    @Override
+    protected ScriptObject getPrototype() {
+        return Global.instance().getFloat64ArrayPrototype();
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeFunction.java b/nashorn/src/jdk/nashorn/internal/objects/NativeFunction.java
new file mode 100644
index 00000000000..20a26035e52
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeFunction.java
@@ -0,0 +1,252 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+
+import java.util.List;
+import jdk.nashorn.internal.objects.annotations.Attribute;
+import jdk.nashorn.internal.objects.annotations.Constructor;
+import jdk.nashorn.internal.objects.annotations.Function;
+import jdk.nashorn.internal.objects.annotations.ScriptClass;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.ScriptFunction;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
+
+/**
+ * ECMA 15.3 Function Objects
+ *
+ * Note: instances of this class are never created. This class is not even a
+ * subclass of ScriptObject. But, we use this class to generate prototype and
+ * constructor for "Function".
+ */
+@ScriptClass("Function")
+public final class NativeFunction {
+    // do *not* create me!
+    private NativeFunction() {
+    }
+
+    /**
+     * ECMA 15.3.4.2 Function.prototype.toString ( )
+     *
+     * @param self self reference
+     * @return string representation of Function
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object toString(final Object self) {
+        if (!(self instanceof ScriptFunction)) {
+            typeError(Global.instance(), "not.a.function", ScriptRuntime.safeToString(self));
+            return UNDEFINED;
+        }
+        return ((ScriptFunction)self).toSource();
+    }
+
+    private static Object convertThis(final ScriptFunction func, final Object thiz) {
+        if (!(thiz instanceof ScriptObject) && !func.isStrict() && !func.isBuiltin()) {
+            if (thiz == UNDEFINED || thiz == null) {
+                return Global.instance();
+            }
+            return JSType.toObject(Global.instance(), thiz);
+        }
+
+        return thiz;
+    }
+
+    /**
+     * ECMA 15.3.4.3 Function.prototype.apply (thisArg, argArray)
+     *
+     * @param self   self reference
+     * @param thiz   {@code this} arg for apply
+     * @param array  array of argument for apply
+     * @return result of apply
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object apply(final Object self, final Object thiz, final Object array) {
+        if (!(self instanceof ScriptFunction)) {
+            typeError(Global.instance(), "not.a.function", ScriptRuntime.safeToString(self));
+            return UNDEFINED;
+        }
+
+        Object[] args = null;
+
+        if (ScriptObject.isArray(array)) {
+            args = ((NativeArray)array).asObjectArray();
+        } else if (array instanceof ScriptObject) {
+            // look for array-like object
+            final ScriptObject sobj = (ScriptObject)array;
+            final Object       len  = sobj.getLength();
+
+            if (len == UNDEFINED || len == null) {
+                typeError(Global.instance(), "function.apply.expects.array");
+            }
+
+            final int n = (int)JSType.toUint32(len);
+            if (n != JSType.toNumber(len)) {
+                typeError(Global.instance(), "function.apply.expects.array");
+            }
+
+            args = new Object[(int)JSType.toUint32(len)];
+            for (int i = 0; i < args.length; i++) {
+                args[i] = sobj.get(i);
+            }
+        } else if (array instanceof Object[]) {
+            args = (Object[])array;
+        } else if (array instanceof List) {
+            final List<?> list = (List<?>)array;
+            list.toArray(args = new Object[list.size()]);
+        } else if (array == null || array == UNDEFINED) {
+            args = ScriptRuntime.EMPTY_ARRAY;
+        } else {
+            typeError(Global.instance(), "function.apply.expects.array");
+        }
+
+        final ScriptFunction func = (ScriptFunction)self;
+        // As per ECMA 5.1 spec, "this" is passed "as is". But the spec.
+        // says 'this' is transformed when callee frame is created if callee
+        // is a non-strict function. So, we convert 'this' here if callee is
+        // not strict and not builtin function.
+        return ScriptRuntime.apply(func, convertThis(func, thiz), args);
+    }
+
+    /**
+     * ECMA 15.3.4.4 Function.prototype.call (thisArg [ , arg1 [ , arg2, ... ] ] )
+     *
+     * @param self self reference
+     * @param args arguments for call
+     * @return result of call
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
+    public static Object call(final Object self, final Object... args) {
+        if (!(self instanceof ScriptFunction)) {
+            typeError(Global.instance(), "not.a.function", ScriptRuntime.safeToString(self));
+            return UNDEFINED;
+        }
+
+        Object thiz = (args.length == 0) ? UNDEFINED : args[0];
+        Object[] arguments;
+
+        if (args.length > 1) {
+            arguments = new Object[args.length - 1];
+            System.arraycopy(args, 1, arguments, 0, arguments.length);
+        } else {
+            arguments = ScriptRuntime.EMPTY_ARRAY;
+        }
+
+        final ScriptFunction func = (ScriptFunction)self;
+
+        // As per ECMA 5.1 spec, "this" is passed "as is". But the spec.
+        // says 'this' is transformed when callee frame is created if callee
+        // is a non-strict function. So, we convert 'this' here if callee is
+        // not strict and not builtin function.
+        thiz = convertThis(func, thiz);
+
+        return ScriptRuntime.apply(func, thiz, arguments);
+    }
+
+    /**
+     * ECMA 15.3.4.5 Function.prototype.bind (thisArg [, arg1 [, arg2, ...]])
+     *
+     * @param self self reference
+     * @param args arguments for bind
+     * @return function with bound arguments
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
+    public static Object bind(final Object self, final Object... args) {
+        if (!(self instanceof ScriptFunction)) {
+            typeError(Global.instance(), "not.a.function", ScriptRuntime.safeToString(self));
+            return UNDEFINED;
+        }
+
+        // As per ECMA 5.1 spec, "this" is passed "as is". But the spec.
+        // says 'this' is transformed when callee frame is created if callee
+        // is a non-strict function. So, we convert 'this' here if callee is
+        // not strict. Note that all builtin functions are marked as strict and
+        // so 'this' transformation is not done for such functions.
+        final Object thiz = convertThis((ScriptFunction)self, (args.length == 0) ? UNDEFINED : args[0]);
+
+        Object[] arguments;
+        if (args.length > 1) {
+            arguments = new Object[args.length - 1];
+            System.arraycopy(args, 1, arguments, 0, arguments.length);
+        } else {
+            arguments = ScriptRuntime.EMPTY_ARRAY;
+        }
+
+        return ((ScriptFunction)self).makeBoundFunction(thiz, arguments);
+    }
+
+    /**
+     * Nashorn extension: Function.prototype.toSource
+     *
+     * @param self self reference
+     * @return source for function
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object toSource(final Object self) {
+        if (!(self instanceof ScriptFunction)) {
+            typeError(Global.instance(), "not.a.function", ScriptRuntime.safeToString(self));
+            return UNDEFINED;
+        }
+        return ((ScriptFunction)self).toSource();
+    }
+
+    /**
+     * ECMA 15.3.2.1 new Function (p1, p2, ... , pn, body)
+     *
+     * Constructor
+     *
+     * @param newObj is the new operator used for constructing this function
+     * @param self   self reference
+     * @param args   arguments
+     * @return new NativeFunction
+     */
+    @Constructor(arity = 1)
+    public static Object function(final boolean newObj, final Object self, final Object... args) {
+        final StringBuilder sb = new StringBuilder();
+
+        sb.append("(function (");
+        if (args.length > 0) {
+            for (int i = 0; i < args.length - 1; i++) {
+                sb.append(JSType.toString(args[i]));
+                if (i < args.length - 2) {
+                    sb.append(",");
+                }
+            }
+        }
+        sb.append(") {\n");
+        if (args.length > 0) {
+            sb.append(JSType.toString(args[args.length - 1]));
+            sb.append('\n');
+        }
+        sb.append("})");
+
+        final Global global = Global.instance();
+
+        return Global.directEval(global, sb.toString(), global, "<function>", Global.isStrict());
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeInt16Array.java b/nashorn/src/jdk/nashorn/internal/objects/NativeInt16Array.java
new file mode 100644
index 00000000000..a58af75ada3
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeInt16Array.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+import jdk.nashorn.internal.objects.annotations.Attribute;
+import jdk.nashorn.internal.objects.annotations.Constructor;
+import jdk.nashorn.internal.objects.annotations.Function;
+import jdk.nashorn.internal.objects.annotations.ScriptClass;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.arrays.ArrayData;
+
+/**
+ * Int16 array for the TypedArray extension
+ */
+@ScriptClass("Int16Array")
+public class NativeInt16Array extends ArrayBufferView {
+    private static final int BYTES_PER_ELEMENT = 2;
+    private static final Factory FACTORY = new Factory(BYTES_PER_ELEMENT) {
+        @Override
+        public ArrayBufferView construct(final NativeArrayBuffer buffer, final int byteOffset, final int length) {
+            return new NativeInt16Array(buffer, byteOffset, length);
+        }
+        @Override
+        public ArrayData createArrayData(final NativeArrayBuffer buffer, final int byteOffset, final int length) {
+            return new Int16ArrayData(buffer, byteOffset, length);
+        }
+    };
+
+    private static final class Int16ArrayData extends ArrayDataImpl {
+        private Int16ArrayData(final NativeArrayBuffer buffer, final int byteOffset, final int elementLength) {
+            super(buffer, byteOffset, elementLength);
+        }
+
+        @Override
+        protected int byteIndex(final int index) {
+            return index * BYTES_PER_ELEMENT + byteOffset;
+        }
+
+        @Override
+        protected int getIntImpl(final int index) {
+            final int byteIndex = byteIndex(index);
+            final byte[] byteArray = buffer.getByteArray();
+            return byteArray[byteIndex  ]       & (short)0x00ff |
+                   byteArray[byteIndex+1] <<  8 & (short)0xff00 ;
+        }
+
+        @Override
+        protected void setImpl(final int index, final int value) {
+            final int byteIndex = byteIndex(index);
+            @SuppressWarnings("MismatchedReadAndWriteOfArray")
+            final byte[] byteArray = buffer.getByteArray();
+            byteArray[byteIndex  ] = (byte)(value       & 0xff);
+            byteArray[byteIndex+1] = (byte)(value >>> 8 & 0xff);
+        }
+    }
+
+    /**
+     * Constructor
+     *
+     * @param newObj is this typed array instantiated with the new operator
+     * @param self   self reference
+     * @param args   args
+     *
+     * @return new typed array
+     */
+    @Constructor(arity = 1)
+    public static Object constructor(final boolean newObj, final Object self, final Object... args) {
+        return constructorImpl(args, FACTORY);
+    }
+
+    NativeInt16Array(final NativeArrayBuffer buffer, final int byteOffset, final int byteLength) {
+        super(buffer, byteOffset, byteLength);
+    }
+
+    @Override
+    protected Factory factory() {
+        return FACTORY;
+    }
+
+    /**
+     * Set values
+     * @param self   self reference
+     * @param array  multiple values of array's type to set
+     * @param offset optional start index, interpreted  0 if undefined
+     * @return undefined
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    protected static Object set(final Object self, final Object array, final Object offset) {
+        return ArrayBufferView.setImpl(self, array, offset);
+    }
+
+    /**
+     * Returns a new TypedArray view of the ArrayBuffer store for this TypedArray,
+     * referencing the elements at begin, inclusive, up to end, exclusive. If either
+     * begin or end is negative, it refers to an index from the end of the array,
+     * as opposed to from the beginning.
+     * <p>
+     * If end is unspecified, the subarray contains all elements from begin to the end
+     * of the TypedArray. The range specified by the begin and end values is clamped to
+     * the valid index range for the current array. If the computed length of the new
+     * TypedArray would be negative, it is clamped to zero.
+     * <p>
+     * The returned TypedArray will be of the same type as the array on which this
+     * method is invoked.
+     *
+     * @param self self reference
+     * @param begin begin position
+     * @param end end position
+     *
+     * @return sub array
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    protected static Object subarray(final Object self, final Object begin, final Object end) {
+        return ArrayBufferView.subarrayImpl(self, begin, end);
+    }
+
+    @Override
+    protected ScriptObject getPrototype() {
+        return Global.instance().getInt16ArrayPrototype();
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeInt32Array.java b/nashorn/src/jdk/nashorn/internal/objects/NativeInt32Array.java
new file mode 100644
index 00000000000..280ba4914db
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeInt32Array.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+import jdk.nashorn.internal.objects.annotations.Attribute;
+import jdk.nashorn.internal.objects.annotations.Constructor;
+import jdk.nashorn.internal.objects.annotations.Function;
+import jdk.nashorn.internal.objects.annotations.ScriptClass;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.arrays.ArrayData;
+
+/**
+ * Int32 array for the TypedArray extension
+ */
+@ScriptClass("Int32Array")
+public class NativeInt32Array extends ArrayBufferView {
+    private static final int BYTES_PER_ELEMENT = 4;
+    private static final Factory FACTORY = new Factory(BYTES_PER_ELEMENT) {
+        @Override
+        public ArrayBufferView construct(final NativeArrayBuffer buffer, final int byteOffset, final int length) {
+            return new NativeInt32Array(buffer, byteOffset, length);
+        }
+        @Override
+        public ArrayData createArrayData(final NativeArrayBuffer buffer, final int byteOffset, final int length) {
+            return new Int32ArrayData(buffer, byteOffset, length);
+        }
+    };
+
+    private static final class Int32ArrayData extends ArrayDataImpl {
+        private Int32ArrayData(final NativeArrayBuffer buffer, final int byteOffset, final int elementLength) {
+            super(buffer, byteOffset, elementLength);
+        }
+
+        @Override
+        protected int byteIndex(final int index) {
+            return index * BYTES_PER_ELEMENT + byteOffset;
+        }
+
+        @Override
+        protected int getIntImpl(final int index) {
+            final int byteIndex = byteIndex(index);
+            final byte[] byteArray = buffer.getByteArray();
+            return byteArray[byteIndex  ]       & 0x0000_00ff |
+                   byteArray[byteIndex+1] <<  8 & 0x0000_ff00 |
+                   byteArray[byteIndex+2] << 16 & 0x00ff_0000 |
+                   byteArray[byteIndex+3] << 24 & 0xff00_0000 ;
+        }
+
+        @Override
+        protected void setImpl(final int index, final int value) {
+            final int byteIndex = byteIndex(index);
+            @SuppressWarnings("MismatchedReadAndWriteOfArray")
+            final byte[] byteArray = buffer.getByteArray();
+            byteArray[byteIndex  ] = (byte)(value        & 0xff);
+            byteArray[byteIndex+1] = (byte)(value >>>  8 & 0xff);
+            byteArray[byteIndex+2] = (byte)(value >>> 16 & 0xff);
+            byteArray[byteIndex+3] = (byte)(value >>> 24 & 0xff);
+        }
+    }
+
+    /**
+     * Constructor
+     *
+     * @param newObj is this typed array instantiated with the new operator
+     * @param self   self reference
+     * @param args   args
+     *
+     * @return new typed array
+     */
+    @Constructor(arity = 1)
+    public static Object constructor(final boolean newObj, final Object self, final Object... args) {
+        return constructorImpl(args, FACTORY);
+    }
+
+    NativeInt32Array(final NativeArrayBuffer buffer, final int byteOffset, final int length) {
+        super(buffer, byteOffset, length);
+    }
+
+    @Override
+    protected Factory factory() {
+        return FACTORY;
+    }
+
+    /**
+     * Set values
+     * @param self   self reference
+     * @param array  multiple values of array's type to set
+     * @param offset optional start index, interpreted  0 if undefined
+     * @return undefined
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    protected static Object set(final Object self, final Object array, final Object offset) {
+        return ArrayBufferView.setImpl(self, array, offset);
+    }
+
+    /**
+     * Returns a new TypedArray view of the ArrayBuffer store for this TypedArray,
+     * referencing the elements at begin, inclusive, up to end, exclusive. If either
+     * begin or end is negative, it refers to an index from the end of the array,
+     * as opposed to from the beginning.
+     * <p>
+     * If end is unspecified, the subarray contains all elements from begin to the end
+     * of the TypedArray. The range specified by the begin and end values is clamped to
+     * the valid index range for the current array. If the computed length of the new
+     * TypedArray would be negative, it is clamped to zero.
+     * <p>
+     * The returned TypedArray will be of the same type as the array on which this
+     * method is invoked.
+     *
+     * @param self self reference
+     * @param begin begin position
+     * @param end end position
+     *
+     * @return sub array
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    protected static Object subarray(final Object self, final Object begin, final Object end) {
+        return ArrayBufferView.subarrayImpl(self, begin, end);
+    }
+
+    @Override
+    protected ScriptObject getPrototype() {
+        return Global.instance().getInt32ArrayPrototype();
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeInt8Array.java b/nashorn/src/jdk/nashorn/internal/objects/NativeInt8Array.java
new file mode 100644
index 00000000000..58fcb7575dd
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeInt8Array.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+import jdk.nashorn.internal.objects.annotations.Attribute;
+import jdk.nashorn.internal.objects.annotations.Constructor;
+import jdk.nashorn.internal.objects.annotations.Function;
+import jdk.nashorn.internal.objects.annotations.ScriptClass;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.arrays.ArrayData;
+
+/**
+ * Int8Array for the TypedArray extension
+ */
+@ScriptClass("Int8Array")
+public class NativeInt8Array extends ArrayBufferView {
+    private static final int BYTES_PER_ELEMENT = 1;
+    private static final Factory FACTORY = new Factory(BYTES_PER_ELEMENT) {
+        @Override
+        public ArrayBufferView construct(final NativeArrayBuffer buffer, final int byteOffset, final int length) {
+            return new NativeInt8Array(buffer, byteOffset, length);
+        }
+
+        @Override
+        public ArrayData createArrayData(final NativeArrayBuffer buffer, final int byteOffset, final int length) {
+            return new Int8ArrayData(buffer, byteOffset, length);
+        }
+    };
+
+    private static final class Int8ArrayData extends ArrayDataImpl {
+        private Int8ArrayData(final NativeArrayBuffer buffer, final int byteOffset, final int elementLength) {
+            super(buffer, byteOffset, elementLength);
+        }
+
+        @Override
+        protected int byteIndex(final int index) {
+            return index * BYTES_PER_ELEMENT + byteOffset;
+        }
+
+        @Override
+        protected int getIntImpl(final int index) {
+            return buffer.getByteArray()[byteIndex(index)];
+        }
+
+        @Override
+        protected void setImpl(final int index, final int value) {
+            buffer.getByteArray()[byteIndex(index)] = (byte)value;
+        }
+    }
+
+    /**
+     * Constructor
+     *
+     * @param newObj is this typed array instantiated with the new operator
+     * @param self   self reference
+     * @param args   args
+     *
+     * @return new typed array
+     */
+    @Constructor(arity = 1)
+    public static Object constructor(final boolean newObj, final Object self, final Object... args) {
+        return constructorImpl(args, FACTORY);
+    }
+
+    NativeInt8Array(final NativeArrayBuffer buffer, final int byteOffset, final int length) {
+        super(buffer, byteOffset, length);
+    }
+
+    @Override
+    protected Factory factory() {
+        return FACTORY;
+    }
+
+    /**
+     * Set values
+     * @param self   self reference
+     * @param array  multiple values of array's type to set
+     * @param offset optional start index, interpreted  0 if undefined
+     * @return undefined
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    protected static Object set(final Object self, final Object array, final Object offset) {
+        return ArrayBufferView.setImpl(self, array, offset);
+    }
+
+    /**
+     * Returns a new TypedArray view of the ArrayBuffer store for this TypedArray,
+     * referencing the elements at begin, inclusive, up to end, exclusive. If either
+     * begin or end is negative, it refers to an index from the end of the array,
+     * as opposed to from the beginning.
+     * <p>
+     * If end is unspecified, the subarray contains all elements from begin to the end
+     * of the TypedArray. The range specified by the begin and end values is clamped to
+     * the valid index range for the current array. If the computed length of the new
+     * TypedArray would be negative, it is clamped to zero.
+     * <p>
+     * The returned TypedArray will be of the same type as the array on which this
+     * method is invoked.
+     *
+     * @param self self reference
+     * @param begin begin position
+     * @param end end position
+     *
+     * @return sub array
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    protected static Object subarray(final Object self, final Object begin, final Object end) {
+        return ArrayBufferView.subarrayImpl(self, begin, end);
+    }
+
+    @Override
+    protected ScriptObject getPrototype() {
+        return Global.instance().getInt8ArrayPrototype();
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java b/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java
new file mode 100644
index 00000000000..2dae18f02bb
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java
@@ -0,0 +1,739 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import jdk.nashorn.internal.objects.annotations.Constructor;
+import jdk.nashorn.internal.objects.annotations.ScriptClass;
+import jdk.nashorn.internal.runtime.FindProperty;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.ScriptFunction;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
+import jdk.nashorn.internal.runtime.arrays.ArrayLikeIterator;
+import jdk.nashorn.internal.runtime.linker.Lookup;
+import org.dynalang.dynalink.CallSiteDescriptor;
+import org.dynalang.dynalink.linker.GuardedInvocation;
+
+/**
+ * This class is the implementation of the Nashorn-specific global object named {@code JSAdapter}. It can be
+ * thought of as the {@link java.lang.reflect.Proxy} equivalent for JavaScript. NativeJSAdapter calls specially named
+ * JavaScript methods on an adaptee object when property access/update/call/new/delete is attempted on it. Example:
+ *<pre>
+ *    var y = {
+ *                __get__    : function (name) { ... }
+ *                __has__    : function (name) { ... }
+ *                __put__    : function (name, value) {...}
+ *                __call__   : function (name, arg1, arg2) {...}
+ *                __new__    : function (arg1, arg2) {...}
+ *                __delete__ : function (name) { ... }
+ *                __getIds__ : function () { ... }
+ *            };
+ *
+ *    var x = new JSAdapter(y);
+ *
+ *    x.i;                        // calls y.__get__
+ *    x.foo();                    // calls y.__call__
+ *    new x();                    // calls y.__new__
+ *    i in x;                     // calls y.__has__
+ *    x.p = 10;                   // calls y.__put__
+ *    delete x.p;                 // calls y.__delete__
+ *    for (i in x) { print(i); }  // calls y.__getIds__
+ * </pre>
+ * JavaScript caller of adapter object is isolated from the fact that the property access/mutation/deletion are really
+ * calls to JavaScript methods on adaptee.
+ * </p><p>
+ * JSAdapter constructor can optionally receive an "overrides" object. Properties of overrides object is copied to
+ * JSAdapter instance. When user accessed property is one of these, then adaptee's methods like {@code __get__},
+ * {@code __put__} etc. are not called for those. This can be used to make certain "preferred" properties that can be
+ * accessed in the usual/faster way avoiding proxy mechanism. Example:
+ * <pre>
+ *     var x = new JSAdapter({ foo: 444, bar: 6546 }) {
+ *          __get__: function(name) { return name; }
+ *      };
+ *
+ *     x.foo;           // 444 directly retrieved without __get__ call
+ *     x.bar = 'hello'; // "bar" directly set without __put__ call
+ *     x.prop           // calls __get__("prop") as 'prop' is not overridden
+ * </pre>
+ * It is possible to pass a specific prototype for JSAdapter instance by passing three arguments to JSAdapter
+ * constructor. So exact signature of JSAdapter constructor is as follows:
+ * <pre>
+ *     JSAdapter([proto], [overrides], adaptee);
+ * </pre>
+ * Both proto and overrides are optional - but adaptee is not. When proto is not passed {@code JSAdapter.prototype} is
+ * used.
+ */
+@ScriptClass("JSAdapter")
+public final class NativeJSAdapter extends ScriptObject {
+    /** object get operation */
+    public static final String __get__       = "__get__";
+    /** object out operation */
+    public static final String __put__       = "__put__";
+    /** object call operation */
+    public static final String __call__      = "__call__";
+    /** object new operation */
+    public static final String __new__       = "__new__";
+    /** object getIds operation */
+    public static final String __getIds__    = "__getIds__";
+    /** object getKeys operation */
+    public static final String __getKeys__   = "__getKeys__";
+    /** object getValues operation */
+    public static final String __getValues__ = "__getValues__";
+    /** object has operation */
+    public static final String __has__       = "__has__";
+    /** object delete operation */
+    public static final String __delete__    = "__delete__";
+
+    // the new extensibility, sealing and freezing operations
+
+    /** prevent extensions operation */
+    public static final String __preventExtensions__ = "__preventExtensions__";
+    /** isExtensible extensions operation */
+    public static final String __isExtensible__      = "__isExtensible__";
+    /** seal operation */
+    public static final String __seal__              = "__seal__";
+    /** isSealed extensions operation */
+    public static final String __isSealed__          = "__isSealed__";
+    /** freeze operation */
+    public static final String __freeze__            = "__freeze__";
+    /** isFrozen extensions operation */
+    public static final String __isFrozen__          = "__isFrozen__";
+
+    private final ScriptObject adaptee;
+    private final boolean overrides;
+
+    private static final MethodHandle IS_JSADAPTOR = findOwnMH("isJSAdaptor", boolean.class, Object.class, Object.class, MethodHandle.class, Object.class, ScriptFunction.class);
+
+    NativeJSAdapter(final ScriptObject proto, final Object overrides, final ScriptObject adaptee) {
+        this.adaptee = wrapAdaptee(adaptee);
+        this.setProto(proto);
+        if (overrides instanceof ScriptObject) {
+            this.overrides = true;
+            final ScriptObject sobj = (ScriptObject)overrides;
+            final Iterator<String> iter = sobj.propertyIterator();
+            while (iter.hasNext()) {
+                final String prop = iter.next();
+                super.set(prop, sobj.get(prop), false);
+            }
+        } else {
+            this.overrides = false;
+        }
+    }
+
+    private static ScriptObject wrapAdaptee(final ScriptObject adaptee) {
+        final ScriptObject sobj = new jdk.nashorn.internal.scripts.JO$();
+        sobj.setProto(adaptee);
+        return sobj;
+    }
+
+    @Override
+    public String getClassName() {
+        return "JSAdapter";
+    }
+
+    @Override
+    public int getInt(final Object key) {
+        return (overrides && super.hasOwnProperty(key)) ? super.getInt(key) : callAdapteeInt(__get__, key);
+    }
+
+    @Override
+    public int getInt(final double key) {
+        return (overrides && super.hasOwnProperty(key)) ? super.getInt(key) : callAdapteeInt(__get__, key);
+    }
+
+    @Override
+    public int getInt(final long key) {
+        return (overrides && super.hasOwnProperty(key)) ? super.getInt(key) : callAdapteeInt(__get__, key);
+    }
+
+    @Override
+    public int getInt(final int key) {
+        return (overrides && super.hasOwnProperty(key)) ? super.getInt(key) : callAdapteeInt(__get__, key);
+    }
+
+    @Override
+    public long getLong(final Object key) {
+        return (overrides && super.hasOwnProperty(key)) ? super.getLong(key) : callAdapteeLong(__get__, key);
+    }
+
+    @Override
+    public long getLong(final double key) {
+        return (overrides && super.hasOwnProperty(key)) ? super.getLong(key) : callAdapteeLong(__get__, key);
+    }
+
+    @Override
+    public long getLong(final long key) {
+        return (overrides && super.hasOwnProperty(key)) ? super.getLong(key) : callAdapteeLong(__get__, key);
+    }
+
+    @Override
+    public long getLong(final int key) {
+        return (overrides && super.hasOwnProperty(key)) ? super.getLong(key) : callAdapteeLong(__get__, key);
+    }
+
+    @Override
+    public double getDouble(final Object key) {
+        return (overrides && super.hasOwnProperty(key)) ? super.getDouble(key) : callAdapteeDouble(__get__, key);
+    }
+
+    @Override
+    public double getDouble(final double key) {
+        return (overrides && super.hasOwnProperty(key)) ? super.getDouble(key) : callAdapteeDouble(__get__, key);
+    }
+
+    @Override
+    public double getDouble(final long key) {
+        return (overrides && super.hasOwnProperty(key)) ? super.getDouble(key) : callAdapteeDouble(__get__, key);
+    }
+
+    @Override
+    public double getDouble(final int key) {
+        return (overrides && super.hasOwnProperty(key)) ? super.getDouble(key) : callAdapteeDouble(__get__, key);
+    }
+
+    @Override
+    public Object get(final Object key) {
+        return (overrides && super.hasOwnProperty(key)) ? super.get(key) : callAdaptee(__get__, key);
+    }
+
+    @Override
+    public Object get(final double key) {
+        return (overrides && super.hasOwnProperty(key)) ? super.get(key) : callAdaptee(__get__, key);
+    }
+
+    @Override
+    public Object get(final long key) {
+        return (overrides && super.hasOwnProperty(key)) ? super.get(key) : callAdaptee(__get__, key);
+    }
+
+    @Override
+    public Object get(final int key) {
+        return (overrides && super.hasOwnProperty(key)) ? super.get(key) : callAdaptee(__get__, key);
+    }
+
+    @Override
+    public void set(final Object key, final int value, final boolean strict) {
+        if (overrides && super.hasOwnProperty(key)) {
+            super.set(key, value, strict);
+        } else {
+            callAdaptee(__put__, key, value, strict);
+        }
+    }
+
+    @Override
+    public void set(final Object key, final long value, final boolean strict) {
+        if (overrides && super.hasOwnProperty(key)) {
+            super.set(key, value, strict);
+        } else {
+            callAdaptee(__put__, key, value, strict);
+        }
+    }
+
+    @Override
+    public void set(final Object key, final double value, final boolean strict) {
+        if (overrides && super.hasOwnProperty(key)) {
+            super.set(key, value, strict);
+        } else {
+            callAdaptee(__put__, key, value, strict);
+        }
+    }
+
+    @Override
+    public void set(final Object key, final Object value, final boolean strict) {
+        if (overrides && super.hasOwnProperty(key)) {
+            super.set(key, value, strict);
+        } else {
+            callAdaptee(__put__, key, value, strict);
+        }
+    }
+
+    @Override
+    public void set(final double key, final int value, final boolean strict) {
+        if (overrides && super.hasOwnProperty(key)) {
+            super.set(key, value, strict);
+        } else {
+            callAdaptee(__put__, key, value, strict);
+        }
+    }
+
+    @Override
+    public void set(final double key, final long value, final boolean strict) {
+        if (overrides && super.hasOwnProperty(key)) {
+            super.set(key, value, strict);
+        } else {
+            callAdaptee(__put__, key, value, strict);
+        }
+    }
+
+    @Override
+    public void set(final double key, final double value, final boolean strict) {
+        if (overrides && super.hasOwnProperty(key)) {
+            super.set(key, value, strict);
+        } else {
+            callAdaptee(__put__, key, value, strict);
+        }
+    }
+
+    @Override
+    public void set(final double key, final Object value, final boolean strict) {
+        if (overrides && super.hasOwnProperty(key)) {
+            super.set(key, value, strict);
+        } else {
+            callAdaptee(__put__, key, value, strict);
+        }
+    }
+
+    @Override
+    public void set(final long key, final int value, final boolean strict) {
+        if (overrides && super.hasOwnProperty(key)) {
+            super.set(key, value, strict);
+        } else {
+            callAdaptee(__put__, key, value, strict);
+        }
+    }
+
+    @Override
+    public void set(final long key, final long value, final boolean strict) {
+        if (overrides && super.hasOwnProperty(key)) {
+            super.set(key, value, strict);
+        } else {
+            callAdaptee(__put__, key, value, strict);
+        }
+    }
+
+    @Override
+    public void set(final long key, final double value, final boolean strict) {
+        if (overrides && super.hasOwnProperty(key)) {
+            super.set(key, value, strict);
+        } else {
+            callAdaptee(__put__, key, value, strict);
+        }
+    }
+
+    @Override
+    public void set(final long key, final Object value, final boolean strict) {
+        if (overrides && super.hasOwnProperty(key)) {
+            super.set(key, value, strict);
+        } else {
+            callAdaptee(__put__, key, value, strict);
+        }
+    }
+
+    @Override
+    public void set(final int key, final int value, final boolean strict) {
+        if (overrides && super.hasOwnProperty(key)) {
+            super.set(key, value, strict);
+        } else {
+            callAdaptee(__put__, key, value, strict);
+        }
+    }
+
+    @Override
+    public void set(final int key, final long value, final boolean strict) {
+        if (overrides && super.hasOwnProperty(key)) {
+            super.set(key, value, strict);
+        } else {
+            callAdaptee(__put__, key, value, strict);
+        }
+    }
+
+    @Override
+    public void set(final int key, final double value, final boolean strict) {
+        if (overrides && super.hasOwnProperty(key)) {
+            super.set(key, value, strict);
+        } else {
+            callAdaptee(__put__, key, value, strict);
+        }
+    }
+
+    @Override
+    public void set(final int key, final Object value, final boolean strict) {
+        if (overrides && super.hasOwnProperty(key)) {
+            super.set(key, value, strict);
+        } else {
+            callAdaptee(__put__, key, value, strict);
+        }
+    }
+
+    @Override
+    public boolean has(final Object key) {
+        if (overrides && super.hasOwnProperty(key)) {
+            return true;
+        }
+
+        return JSType.toBoolean(callAdaptee(Boolean.FALSE, __has__, key));
+    }
+
+    @Override
+    public boolean has(final int key) {
+        if (overrides && super.hasOwnProperty(key)) {
+            return true;
+        }
+
+        return JSType.toBoolean(callAdaptee(Boolean.FALSE, __has__, key));
+    }
+
+    @Override
+    public boolean has(final long key) {
+        if (overrides && super.hasOwnProperty(key)) {
+            return true;
+        }
+
+        return JSType.toBoolean(callAdaptee(Boolean.FALSE, __has__, key));
+    }
+
+    @Override
+    public boolean has(final double key) {
+        if (overrides && super.hasOwnProperty(key)) {
+            return true;
+        }
+
+        return JSType.toBoolean(callAdaptee(Boolean.FALSE, __has__, key));
+    }
+
+    @Override
+    public boolean delete(final int key, final boolean strict) {
+        if (overrides && super.hasOwnProperty(key)) {
+            return super.delete(key, strict);
+        }
+
+        return JSType.toBoolean(callAdaptee(Boolean.TRUE, __delete__, key, strict));
+    }
+
+    @Override
+    public boolean delete(final long key, final boolean strict) {
+        if (overrides && super.hasOwnProperty(key)) {
+            return super.delete(key, strict);
+        }
+
+        return JSType.toBoolean(callAdaptee(Boolean.TRUE, __delete__, key, strict));
+    }
+
+    @Override
+    public boolean delete(final double key, final boolean strict) {
+        if (overrides && super.hasOwnProperty(key)) {
+            return super.delete(key, strict);
+        }
+
+        return JSType.toBoolean(callAdaptee(Boolean.TRUE, __delete__, key, strict));
+    }
+
+    @Override
+    public boolean delete(final Object key, final boolean strict) {
+        if (overrides && super.hasOwnProperty(key)) {
+            return super.delete(key, strict);
+        }
+
+        return JSType.toBoolean(callAdaptee(Boolean.TRUE, __delete__, key, strict));
+    }
+
+    @Override
+    public Iterator<String> propertyIterator() {
+        // Try __getIds__ first, if not found then try __getKeys__
+        // In jdk6, we had added "__getIds__" so this is just for compatibility.
+        Object func = adaptee.get(__getIds__);
+        if (!(func instanceof ScriptFunction)) {
+            func = adaptee.get(__getKeys__);
+        }
+
+        Object obj;
+        if (func instanceof ScriptFunction) {
+            obj = ScriptRuntime.apply((ScriptFunction)func, adaptee);
+        } else {
+            obj = new NativeArray(0);
+        }
+
+        final List<String> array = new ArrayList<>();
+        for (final Iterator<Object> iter = ArrayLikeIterator.arrayLikeIterator(obj); iter.hasNext(); ) {
+            array.add((String)iter.next());
+        }
+
+        return array.iterator();
+    }
+
+
+    @Override
+    public Iterator<Object> valueIterator() {
+        final Object obj = callAdaptee(new NativeArray(0), __getValues__);
+        return ArrayLikeIterator.arrayLikeIterator(obj);
+    }
+
+    @Override
+    public ScriptObject preventExtensions() {
+        callAdaptee(__preventExtensions__);
+        return this;
+    }
+
+    @Override
+    public boolean isExtensible() {
+        return JSType.toBoolean(callAdaptee(Boolean.TRUE, __isExtensible__));
+    }
+
+    @Override
+    public ScriptObject seal() {
+        callAdaptee(__seal__);
+        return this;
+    }
+
+    @Override
+    public boolean isSealed() {
+        return JSType.toBoolean(callAdaptee(Boolean.FALSE, __isSealed__));
+    }
+
+    @Override
+    public ScriptObject freeze() {
+        callAdaptee(__freeze__);
+        return this;
+    }
+
+    @Override
+    public boolean isFrozen() {
+        return JSType.toBoolean(callAdaptee(Boolean.FALSE, __isFrozen__));
+    }
+
+    /**
+     * Constructor
+     *
+     * @param isNew is this NativeJSAdapter instantiated with the new operator
+     * @param self  self reference
+     * @param args  arguments ([adaptee], [overrides, adaptee] or [proto, overrides, adaptee]
+     * @return new NativeJSAdapter
+     */
+    @Constructor
+    public static Object construct(final boolean isNew, final Object self, final Object... args) {
+        Object proto     = UNDEFINED;
+        Object overrides = UNDEFINED;
+        Object adaptee;
+
+        if (args == null || args.length == 0) {
+            typeError(Global.instance(), "not.an.object", "null");
+            return null; //won't reach, but fixed warning
+        }
+
+        switch (args.length) {
+        case 1:
+            adaptee = args[0];
+            break;
+
+        case 2:
+            overrides = args[0];
+            adaptee   = args[1];
+            break;
+
+        default:
+            //fallthru
+        case 3:
+            proto = args[0];
+            overrides = args[1];
+            adaptee = args[2];
+            break;
+        }
+
+        if (!(adaptee instanceof ScriptObject)) {
+            typeError(Global.instance(), "not.an.object", ScriptRuntime.safeToString(adaptee));
+        }
+
+        if (proto != null && !(proto instanceof ScriptObject)) {
+            proto = Global.instance().getJSAdapterPrototype();
+        }
+
+        return new NativeJSAdapter((ScriptObject)proto, overrides, (ScriptObject)adaptee);
+    }
+
+    @Override
+    protected GuardedInvocation findNewMethod(final CallSiteDescriptor desc) {
+        return findHook(desc, __new__, false);
+    }
+
+    @Override
+    protected GuardedInvocation findCallMethodMethod(final CallSiteDescriptor desc, final boolean megaMorphic) {
+        if (overrides && super.hasOwnProperty(desc.getNameToken(2))) {
+            try {
+                final GuardedInvocation inv = super.findCallMethodMethod(desc, megaMorphic);
+                if (inv != null) {
+                    return inv;
+                }
+            } catch (final Exception e) {
+                //ignored
+            }
+        }
+
+        return findHook(desc, __call__);
+    }
+
+    @Override
+    protected GuardedInvocation findGetMethod(final CallSiteDescriptor desc, final boolean megaMorphic, final String operation) {
+        final String name = desc.getNameToken(CallSiteDescriptor.NAME_OPERAND);
+        if (overrides && super.hasOwnProperty(name)) {
+            try {
+                final GuardedInvocation inv = super.findGetMethod(desc, megaMorphic, operation);
+                if (inv != null) {
+                    return inv;
+                }
+            } catch (final Exception e) {
+                //ignored
+            }
+        }
+
+        switch(operation) {
+        case "getProp":
+        case "getElem":
+            return findHook(desc, __get__);
+        case "getMethod":
+            final FindProperty find = adaptee.findProperty(__call__, true);
+            if (find != null) {
+                final ScriptFunction func = (ScriptFunction)getObjectValue(find);
+                // TODO: It's a shame we need to produce a function bound to this and name, when we'd only need it bound
+                // to name. Probably not a big deal, but if we can ever make it leaner, it'd be nice.
+                return new GuardedInvocation(MH.dropArguments(MH.constant(Object.class,
+                        func.makeBoundFunction(this, new Object[] { name })), 0, Object.class),
+                        adaptee.getMap().getProtoGetSwitchPoint(__call__), testJSAdaptor(adaptee, null, null, null));
+            }
+            typeError(Global.instance(), "no.such.function", desc.getNameToken(2), ScriptRuntime.safeToString(this));
+            break;
+        default:
+            break;
+        }
+
+        throw new AssertionError("should not reach here");
+    }
+
+    @Override
+    protected GuardedInvocation findSetMethod(final CallSiteDescriptor desc, final boolean megaMorphic) {
+        if (overrides && super.hasOwnProperty(desc.getNameToken(CallSiteDescriptor.NAME_OPERAND))) {
+            try {
+                final GuardedInvocation inv = super.findSetMethod(desc, megaMorphic);
+                if (inv != null) {
+                    return inv;
+                }
+            } catch (final Exception e) {
+                //ignored
+            }
+        }
+
+        return findHook(desc, __put__);
+    }
+
+    // -- Internals only below this point
+    private Object callAdaptee(final String name, final Object... args) {
+        return callAdaptee(UNDEFINED, name, args);
+    }
+
+    private double callAdapteeDouble(final String name, final Object... args) {
+        return JSType.toNumber(callAdaptee(name, args));
+    }
+
+    private long callAdapteeLong(final String name, final Object... args) {
+        return JSType.toLong(callAdaptee(name, args));
+    }
+
+    private int callAdapteeInt(final String name, final Object... args) {
+        return JSType.toInt32(callAdaptee(name, args));
+    }
+
+    private Object callAdaptee(final Object retValue, final String name, final Object... args) {
+        final Object func = adaptee.get(name);
+        if (func instanceof ScriptFunction) {
+            return ScriptRuntime.apply((ScriptFunction)func, adaptee, args);
+        }
+        return retValue;
+    }
+
+    private GuardedInvocation findHook(final CallSiteDescriptor desc, final String hook) {
+        return findHook(desc, hook, true);
+    }
+
+    private GuardedInvocation findHook(final CallSiteDescriptor desc, final String hook, final boolean useName) {
+        final FindProperty findData = adaptee.findProperty(hook, true);
+        final MethodType type = desc.getMethodType();
+        if (findData != null) {
+            final String name = desc.getNameTokenCount() > 2 ? desc.getNameToken(2) : null;
+            final ScriptFunction func = (ScriptFunction)getObjectValue(findData);
+
+            final MethodHandle methodHandle = getCallMethodHandle(findData, type,
+                    useName ? name : null);
+            if (methodHandle != null) {
+                return new GuardedInvocation(
+                        methodHandle,
+                        adaptee.getMap().getProtoGetSwitchPoint(hook),
+                        testJSAdaptor(adaptee, findData.getGetter(Object.class), findData.getOwner(), func));
+            }
+        }
+
+        switch (hook) {
+        case __call__:
+            typeError(Global.instance(), "no.such.function", desc.getNameToken(2), ScriptRuntime.safeToString(this));
+            throw new AssertionError("should not reach here");
+        default:
+            final MethodHandle methodHandle = hook.equals(__put__) ?
+            MH.asType(Lookup.EMPTY_SETTER, type) :
+            Lookup.emptyGetter(type.returnType());
+            return new GuardedInvocation(methodHandle, adaptee.getMap().getProtoGetSwitchPoint(hook), testJSAdaptor(adaptee, null, null, null));
+        }
+    }
+
+    private static MethodHandle testJSAdaptor(final Object adaptee, final MethodHandle getter, final Object where, final ScriptFunction func) {
+        return MH.insertArguments(IS_JSADAPTOR, 1, adaptee, getter, where, func);
+    }
+
+    @SuppressWarnings("unused")
+    private static boolean isJSAdaptor(final Object self, final Object adaptee, final MethodHandle getter, final Object where, final ScriptFunction func) {
+        final boolean res = self instanceof NativeJSAdapter && ((NativeJSAdapter)self).getAdaptee() == adaptee;
+        if (res && getter != null) {
+            try {
+                return getter.invokeExact(where) == func;
+            } catch (final RuntimeException | Error e) {
+                throw e;
+            } catch (final Throwable t) {
+                throw new RuntimeException(t);
+            }
+        }
+
+        return res;
+    }
+
+    /**
+     * Get the adaptee
+     * @return adaptee ScriptObject
+     */
+    public ScriptObject getAdaptee() {
+        return adaptee;
+    }
+
+    private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
+        return MH.findStatic(MethodHandles.lookup(), NativeJSAdapter.class, name, MH.type(rtype, types));
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeJSON.java b/nashorn/src/jdk/nashorn/internal/objects/NativeJSON.java
new file mode 100644
index 00000000000..88164ee756b
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeJSON.java
@@ -0,0 +1,545 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+import static jdk.nashorn.internal.runtime.ECMAErrors.syntaxError;
+import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+
+import java.lang.invoke.MethodHandle;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.IdentityHashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import jdk.nashorn.internal.ir.LiteralNode;
+import jdk.nashorn.internal.ir.LiteralNode.ArrayLiteralNode;
+import jdk.nashorn.internal.ir.Node;
+import jdk.nashorn.internal.ir.ObjectNode;
+import jdk.nashorn.internal.ir.PropertyNode;
+import jdk.nashorn.internal.ir.UnaryNode;
+import jdk.nashorn.internal.objects.annotations.Attribute;
+import jdk.nashorn.internal.objects.annotations.Function;
+import jdk.nashorn.internal.objects.annotations.ScriptClass;
+import jdk.nashorn.internal.objects.annotations.Where;
+import jdk.nashorn.internal.parser.JSONParser;
+import jdk.nashorn.internal.parser.TokenType;
+import jdk.nashorn.internal.runtime.ConsString;
+import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.ParserException;
+import jdk.nashorn.internal.runtime.ScriptFunction;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.Source;
+import jdk.nashorn.internal.runtime.arrays.ArrayLikeIterator;
+import jdk.nashorn.internal.runtime.linker.Bootstrap;
+import jdk.nashorn.internal.runtime.linker.InvokeByName;
+
+/**
+ * ECMAScript 262 Edition 5, Section 15.12 The NativeJSON Object
+ *
+ */
+@ScriptClass("JSON")
+public final class NativeJSON extends ScriptObject {
+    private static final InvokeByName TO_JSON = new InvokeByName("toJSON", ScriptObject.class, Object.class, Object.class);
+    private static final MethodHandle REPLACER_INVOKER = Bootstrap.createDynamicInvoker("dyn:call", Object.class,
+            ScriptFunction.class, ScriptObject.class, Object.class, Object.class);
+    private static final MethodHandle REVIVER_INVOKER = Bootstrap.createDynamicInvoker("dyn:call", Object.class,
+            ScriptFunction.class, ScriptObject.class, String.class, Object.class);
+
+
+    NativeJSON() {
+        this.setProto(Global.objectPrototype());
+    }
+
+    /**
+     * ECMA 15.12.2 parse ( text [ , reviver ] )
+     *
+     * @param self     self reference
+     * @param text     a JSON formatted string
+     * @param reviver  optional value: function that takes two parameters (key, value)
+     *
+     * @return an ECMA script value
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object parse(final Object self, final Object text, final Object reviver) {
+        final String     str     = JSType.toString(text);
+        final Context    context = Global.getThisContext();
+        final JSONParser parser  = new JSONParser(
+                new Source("<json>", str),
+                new Context.ThrowErrorManager(),
+                (context != null) ?
+                    context._strict :
+                    false);
+
+        Node node;
+
+        try {
+            node = parser.parse();
+        } catch (final ParserException e) {
+            syntaxError(Global.instance(), e, "invalid.json", e.getMessage());
+            return UNDEFINED;
+        }
+
+        final Object unfiltered = convertNode(node);
+
+        return applyReviver(unfiltered, reviver);
+    }
+
+    /**
+     * ECMA 15.12.3 stringify ( value [ , replacer [ , space ] ] )
+     *
+     * @param self     self reference
+     * @param value    ECMA script value (usually object or array)
+     * @param replacer either a function or an array of strings and numbers
+     * @param space    optional parameter - allows result to have whitespace injection
+     *
+     * @return a string in JSON format
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object stringify(final Object self, final Object value, final Object replacer, final Object space) {
+        // The stringify method takes a value and an optional replacer, and an optional
+        // space parameter, and returns a JSON text. The replacer can be a function
+        // that can replace values, or an array of strings that will select the keys.
+
+        // A default replacer method can be provided. Use of the space parameter can
+        // produce text that is more easily readable.
+
+        final StringifyState state = new StringifyState();
+
+        // If there is a replacer, it must be a function or an array.
+        if (replacer instanceof ScriptFunction) {
+            state.replacerFunction = (ScriptFunction) replacer;
+        } else if (isArray(replacer) ||
+                replacer instanceof Iterable ||
+                (replacer != null && replacer.getClass().isArray())) {
+
+            state.propertyList = new ArrayList<>();
+
+            final Iterator<Object> iter = ArrayLikeIterator.arrayLikeIterator(replacer);
+
+            while (iter.hasNext()) {
+                String item = null;
+                final Object v = iter.next();
+
+                if (v instanceof String) {
+                    item = (String) v;
+                } else if (v instanceof ConsString) {
+                    item = v.toString();
+                } else if (v instanceof Number ||
+                        v instanceof NativeNumber ||
+                        v instanceof NativeString) {
+                    item = JSType.toString(v);
+                }
+
+                if (item != null) {
+                    state.propertyList.add(item);
+                }
+            }
+        }
+
+        // If the space parameter is a number, make an indent
+        // string containing that many spaces.
+
+        String gap;
+
+        if (space instanceof Number || space instanceof NativeNumber) {
+            int indent;
+            if (space instanceof NativeNumber) {
+                indent = ((NativeNumber)space).intValue();
+            } else {
+                indent = ((Number)space).intValue();
+            }
+
+            final StringBuilder sb = new StringBuilder();
+            for (int i = 0; i < Math.min(10, indent); i++) {
+                sb.append(' ');
+            }
+            gap = sb.toString();
+
+        } else if (space instanceof String || space instanceof ConsString || space instanceof NativeString) {
+            final String str = (space instanceof String) ? (String)space : space.toString();
+            gap = str.substring(0, Math.min(10, str.length()));
+        } else {
+            gap = "";
+        }
+
+        state.gap = gap;
+
+        final ScriptObject wrapper = Global.newEmptyInstance();
+        wrapper.set("", value, Global.isStrict());
+
+        return str("", wrapper, state);
+    }
+
+    // -- Internals only below this point
+
+    // parse helpers
+
+    // apply 'reviver' function if available
+    private static Object applyReviver(final Object unfiltered, final Object reviver) {
+        if (reviver instanceof ScriptFunction) {
+            final ScriptObject root = Global.newEmptyInstance();
+            root.set("", unfiltered, Global.isStrict());
+            return walk(root, "", (ScriptFunction)reviver);
+        }
+        return unfiltered;
+    }
+
+    // This is the abstract "Walk" operation from the spec.
+    private static Object walk(final ScriptObject holder, final Object name, final ScriptFunction reviver) {
+        final Object val = holder.get(name);
+        if (val == UNDEFINED) {
+            return val;
+        } else if (val instanceof ScriptObject) {
+            final ScriptObject     valueObj = (ScriptObject)val;
+            final boolean          strict   = Global.isStrict();
+            final Iterator<String> iter     = valueObj.propertyIterator();
+
+            while (iter.hasNext()) {
+                final String key        = iter.next();
+                final Object newElement = walk(valueObj, key, reviver);
+
+                if (newElement == UNDEFINED) {
+                    valueObj.delete(key, strict);
+                } else {
+                    valueObj.set(key, newElement, strict);
+                }
+            }
+
+            return valueObj;
+        } else if (isArray(val)) {
+            final NativeArray      valueArray = (NativeArray)val;
+            final boolean          strict     = Global.isStrict();
+            final Iterator<String> iter       = valueArray.propertyIterator();
+
+            while (iter.hasNext()) {
+                final String key        = iter.next();
+                final Object newElement = walk(valueArray, valueArray.get(key), reviver);
+
+                if (newElement == UNDEFINED) {
+                    valueArray.delete(key, strict);
+                } else {
+                    valueArray.set(key, newElement, strict);
+                }
+            }
+            return valueArray;
+        } else {
+            try {
+                // Object.class, ScriptFunction.class, ScriptObject.class, String.class, Object.class);
+                return REVIVER_INVOKER.invokeExact(reviver, holder, JSType.toString(name), val);
+            } catch(Error|RuntimeException t) {
+                throw t;
+            } catch(final Throwable t) {
+                throw new RuntimeException(t);
+            }
+        }
+    }
+
+    // Converts IR node to runtime value
+    private static Object convertNode(final Node node) {
+
+       if (node instanceof LiteralNode) {
+            // check for array literal
+            if (node.tokenType() == TokenType.LBRACKET) {
+                assert node instanceof ArrayLiteralNode;
+                final Node[] elements = ((ArrayLiteralNode)node).getValue();
+
+                // NOTE: We cannot use LiteralNode.isNumericArray() here as that
+                // method uses symbols of element nodes. Since we don't do lower
+                // pass, there won't be any symbols!
+                if (isNumericArray(elements)) {
+                    final double[] values = new double[elements.length];
+                    int   index = 0;
+
+                    for (final Node elem : elements) {
+                        values[index++] = JSType.toNumber(convertNode(elem));
+                    }
+                    return Global.allocate(values);
+                }
+
+                final Object[] values = new Object[elements.length];
+                int   index = 0;
+
+                for (final Node elem : elements) {
+                    values[index++] = convertNode(elem);
+                }
+
+                return Global.allocate(values);
+            }
+
+            return ((LiteralNode<?>)node).getValue();
+
+        } else if (node instanceof ObjectNode) {
+            final ObjectNode   objNode  = (ObjectNode) node;
+            final ScriptObject object   = Global.newEmptyInstance();
+            final boolean      strict   = Global.isStrict();
+            final List<Node>   elements = objNode.getElements();
+
+            for (final Node elem : elements) {
+                final PropertyNode pNode     = (PropertyNode) elem;
+                final Node         valueNode = pNode.getValue();
+
+                object.set(pNode.getKeyName(), convertNode(valueNode), strict);
+            }
+
+            return object;
+        } else if (node instanceof UnaryNode) {
+            // UnaryNode used only to represent negative number JSON value
+            final UnaryNode unaryNode = (UnaryNode)node;
+            return -((LiteralNode<?>)unaryNode.rhs()).getNumber();
+        } else {
+            return null;
+        }
+    }
+
+    // does the given IR node represent a numeric array?
+    private static boolean isNumericArray(final Node[] values) {
+        for (final Node node : values) {
+            if (node instanceof LiteralNode && ((LiteralNode<?>)node).getValue() instanceof Number) {
+                continue;
+            }
+            return false;
+        }
+        return true;
+    }
+
+    // stringify helpers.
+
+    private static class StringifyState {
+        final Map<ScriptObject, ScriptObject> stack = new IdentityHashMap<>();
+
+        StringBuilder  indent = new StringBuilder();
+        String         gap = "";
+        List<String>   propertyList = null;
+        ScriptFunction replacerFunction = null;
+    }
+
+    // Spec: The abstract operation Str(key, holder).
+    private static Object str(final Object key, final ScriptObject holder, final StringifyState state) {
+        Object value = holder.get(key);
+
+        try {
+            if (value instanceof ScriptObject) {
+                final ScriptObject svalue = (ScriptObject)value;
+                final Object toJSON = TO_JSON.getGetter().invokeExact(svalue);
+                if (toJSON instanceof ScriptFunction) {
+                    value = TO_JSON.getInvoker().invokeExact(toJSON, svalue, key);
+                }
+            }
+
+            if (state.replacerFunction != null) {
+                value = REPLACER_INVOKER.invokeExact(state.replacerFunction, holder, key, value);
+            }
+        } catch(Error|RuntimeException t) {
+            throw t;
+        } catch(final Throwable t) {
+            throw new RuntimeException(t);
+        }
+        final boolean isObj = (value instanceof ScriptObject);
+        if (isObj) {
+            if (value instanceof NativeNumber) {
+                value = JSType.toNumber(value);
+            } else if (value instanceof NativeString) {
+                value = JSType.toString(value);
+            } else if (value instanceof NativeBoolean) {
+                value = ((NativeBoolean)value).booleanValue();
+            }
+        }
+
+        if (value == null) {
+            return "null";
+        } else if (Boolean.TRUE.equals(value)) {
+            return "true";
+        } else if (Boolean.FALSE.equals(value)) {
+            return "false";
+        }
+
+        if (value instanceof String) {
+            return JSONParser.quote((String)value);
+        } else if (value instanceof ConsString) {
+            return JSONParser.quote(value.toString());
+        }
+
+        if (value instanceof Number) {
+            return JSType.isFinite(((Number)value).doubleValue()) ? JSType.toString(value) : "null";
+        }
+
+        final JSType type = JSType.of(value);
+        if (type == JSType.OBJECT) {
+            if (isArray(value)) {
+                return JA((NativeArray)value, state);
+            } else if (value instanceof ScriptObject) {
+                return JO((ScriptObject)value, state);
+            }
+        }
+
+        return UNDEFINED;
+    }
+
+    // Spec: The abstract operation JO(value) serializes an object.
+    private static String JO(final ScriptObject value, final StringifyState state) {
+        if (state.stack.containsKey(value)) {
+            typeError(Global.instance(), "JSON.stringify.cyclic");
+        }
+
+        state.stack.put(value, value);
+        final StringBuilder stepback = new StringBuilder(state.indent.toString());
+        state.indent.append(state.gap);
+
+        final StringBuilder finalStr = new StringBuilder();
+        final List<Object>  partial  = new ArrayList<>();
+        final List<String>  k        = state.propertyList == null ? Arrays.asList(value.getOwnKeys(false)) : state.propertyList;
+
+        for (final Object p : k) {
+            final Object strP = str(p, value, state);
+
+            if (strP != UNDEFINED) {
+                final StringBuilder member = new StringBuilder();
+
+                member.append(JSONParser.quote(p.toString())).append(':');
+                if (!state.gap.isEmpty()) {
+                    member.append(' ');
+                }
+
+                member.append(strP);
+                partial.add(member);
+            }
+        }
+
+        if (partial.isEmpty()) {
+            finalStr.append("{}");
+        } else {
+            if (state.gap.isEmpty()) {
+                final int size = partial.size();
+                int       index = 0;
+
+                finalStr.append('{');
+
+                for (final Object str : partial) {
+                    finalStr.append(str);
+                    if (index < size - 1) {
+                        finalStr.append(',');
+                    }
+                    index++;
+                }
+
+                finalStr.append('}');
+            } else {
+                final int size  = partial.size();
+                int       index = 0;
+
+                finalStr.append("{\n");
+                finalStr.append(state.indent);
+
+                for (final Object str : partial) {
+                    finalStr.append(str);
+                    if (index < size - 1) {
+                        finalStr.append(",\n");
+                        finalStr.append(state.indent);
+                    }
+                    index++;
+                }
+
+                finalStr.append('\n');
+                finalStr.append(stepback);
+                finalStr.append('}');
+            }
+        }
+
+        state.stack.remove(value);
+        state.indent = stepback;
+
+        return finalStr.toString();
+    }
+
+    // Spec: The abstract operation JA(value) serializes an array.
+    private static Object JA(final NativeArray value, final StringifyState state) {
+        if (state.stack.containsKey(value)) {
+            typeError(Global.instance(), "JSON.stringify.cyclic");
+        }
+
+        state.stack.put(value, value);
+        final StringBuilder stepback = new StringBuilder(state.indent.toString());
+        state.indent.append(state.gap);
+        final List<Object> partial = new ArrayList<>();
+
+        final int length = JSType.toInteger(value.getLength());
+        int index = 0;
+
+        while (index < length) {
+            Object strP = str(index, value, state);
+            if (strP == UNDEFINED) {
+                strP = "null";
+            }
+            partial.add(strP);
+            index++;
+        }
+
+        final StringBuilder finalStr = new StringBuilder();
+        if (partial.isEmpty()) {
+            finalStr.append("[]");
+        } else {
+            if (state.gap.isEmpty()) {
+                final int size = partial.size();
+                index = 0;
+                finalStr.append('[');
+                for (final Object str : partial) {
+                    finalStr.append(str);
+                    if (index < size - 1) {
+                        finalStr.append(',');
+                    }
+                    index++;
+                }
+
+                finalStr.append(']');
+            } else {
+                final int size = partial.size();
+                index = 0;
+                finalStr.append("[\n");
+                finalStr.append(state.indent);
+                for (final Object str : partial) {
+                    finalStr.append(str);
+                    if (index < size - 1) {
+                        finalStr.append(",\n");
+                        finalStr.append(state.indent);
+                    }
+                    index++;
+                }
+
+                finalStr.append('\n');
+                finalStr.append(stepback);
+                finalStr.append(']');
+            }
+        }
+
+        state.stack.remove(value);
+        state.indent = stepback;
+
+        return finalStr.toString();
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java b/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java
new file mode 100644
index 00000000000..e38ed6f0554
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java
@@ -0,0 +1,385 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+
+import java.lang.reflect.Array;
+import java.util.Collection;
+import jdk.nashorn.internal.objects.annotations.Attribute;
+import jdk.nashorn.internal.objects.annotations.Function;
+import jdk.nashorn.internal.objects.annotations.ScriptClass;
+import jdk.nashorn.internal.objects.annotations.Where;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.linker.JavaAdapterFactory;
+import org.dynalang.dynalink.beans.StaticClass;
+import org.dynalang.dynalink.support.TypeUtilities;
+
+/**
+ * This class is the implementation for the {@code Java} global object exposed to programs running under Nashorn. This
+ * object acts as the API entry point to Java platform specific functionality, dealing with creating new instances of
+ * Java classes, subclassing Java classes, implementing Java interfaces, converting between Java arrays and ECMAScript
+ * arrays, and so forth.
+ */
+@ScriptClass("Java")
+public class NativeJava {
+
+    private NativeJava() {
+    }
+
+    /**
+     * Returns true if the specified object is a Java type object, that is an instance of {@link StaticClass}.
+     * @param self not used
+     * @param type the object that is checked if it is a type object or not
+     * @return tells whether given object is a Java type object or not.
+     * @see #type(Object, Object)
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object isType(final Object self, final Object type) {
+        return type instanceof StaticClass;
+    }
+
+    /**
+     * Given a name of a Java type, returns an object representing that type in Nashorn. The Java class of the objects
+     * used to represent Java types in Nashorn is not {@link java.lang.Class} but rather {@link StaticClass}. They are
+     * the objects that you can use with the {@code new} operator to create new instances of the class as well as to
+     * access static members of the class. In Nashorn, {@code Class} objects are just regular Java objects that aren't
+     * treated specially. Instead of them, {@link StaticClass} instances - which we sometimes refer to as "Java type
+     * objects" are used as constructors with the {@code new} operator, and they expose static fields, properties, and
+     * methods. While this might seem confusing at first, it actually closely matches the Java language: you use a
+     * different expression (e.g. {@code java.io.File}) as an argument in "new" and to address statics, and it is
+     * distinct from the {@code Class} object (e.g. {@code java.io.File.class}). Below we cover in details the
+     * properties of the type objects.
+     * <h2>Constructing Java objects</h2>
+     * Examples:
+     * <pre>
+     * var arrayListType = Java.type("java.util.ArrayList")
+     * var intType = Java.type("int")
+     * var stringArrayType = Java.type("java.lang.String[]")
+     * var int2DArrayType = Java.type("int[][]")
+     * </pre>
+     * Note that the name of the type is always a string for a fully qualified name. You can use any of these types to
+     * create new instances, e.g.:
+     * <pre>
+     * var anArrayList = new Java.type("java.util.ArrayList")
+     * </pre>
+     * or
+     * <pre>
+     * var ArrayList = Java.type("java.util.ArrayList")
+     * var anArrayList = new ArrayList
+     * var anArrayListWithSize = new ArrayList(16)
+     * </pre>
+     * In the special case of inner classes, you need to use the JVM fully qualified name, meaning using {@code $} sign
+     * in the class name:
+     * <pre>
+     * var ftype = Java.type("java.awt.geom.Arc2D$Float")
+     * </pre>
+     * However, once you retrieved the outer class, you can access the inner class as a property on it:
+     * <pre>
+     * var arctype = Java.type("java.awt.geom.Arc2D")
+     * var ftype = arctype.Float
+     * </pre>
+     * You can access both static and non-static inner classes. If you want to create an instance of a non-static
+     * inner class, remember to pass an instance of its outer class as the first argument to the constructor.
+     * </p><p>
+     * If the type is abstract, you can instantiate an anonymous subclass of it using an argument list that is
+     * applicable to any of its public or protected constructors, but inserting a JavaScript object with functions
+     * properties that provide JavaScript implementations of the abstract methods. If method names are overloaded, the
+     * JavaScript function will provide implementation for all overloads. E.g.:
+     * <pre>
+     * var TimerTask =  Java.type("java.util.TimerTask")
+     * var task = new TimerTask({ run: function() { print("Hello World!") } })
+     * </pre>
+     * Nashorn supports a syntactic extension where a "new" expression followed by an argument is identical to
+     * invoking the constructor and passing the argument to it, so you can write the above example also as:
+     * <pre>
+     * var task = new TimerTask {
+     *     run: function() {
+     *       print("Hello World!")
+     *     }
+     * }
+     * </pre>
+     * which is very similar to Java anonymous inner class definition. On the other hand, if the type is an abstract
+     * type with a single abstract method (commonly referred to as a "SAM type") or all abstract methods it has share
+     * the same overloaded name), then instead of an object, you can just pass a function, so the above example can
+     * become even more simplified to:
+     * <pre>
+     * var task = new TimerTask(function() { print("Hello World!") })
+     * </pre>
+     * Note that in every one of these cases if you are trying to instantiate an abstract class that has constructors
+     * that take some arguments, you can invoke those simply by specifying the arguments after the initial
+     * implementation object or function.
+     * </p><p>The use of functions can be taken even further; if you are invoking a Java method that takes a SAM type,
+     * you can just pass in a function object, and Nashorn will know what you meant:
+     * <pre>
+     * var timer = new Java.type("java.util.Timer")
+     * timer.schedule(function() { print("Hello World!") })
+     * </pre>
+     * Here, {@code Timer.schedule()} expects a {@code TimerTask} as its argument, so Nashorn creates an instance of a
+     * {@code TimerTask} subclass and uses the passed function to implement its only abstract method, {@code run()}. In
+     * this usage though, you can't use non-default constructors; the type must be either an interface, or must have a
+     * protected or public no-arg constructor.
+     * </p><p>
+     * You can also subclass non-abstract classes; for that you will need to use the {@link #extend(Object, Object)}
+     * method.
+     * <h2>Accessing static members</h2>
+     * Examples:
+     * <pre>
+     * var File = Java.type("java.io.File")
+     * var pathSep = File.pathSeparator
+     * var tmpFile1 = File.createTempFile("abcdefg", ".tmp")
+     * var tmpFile2 = File.createTempFile("abcdefg", ".tmp", new File("/tmp"))
+     * </pre>
+     * Actually, you can even assign static methods to variables, so the above example can be rewritten as:
+     * <pre>
+     * var File = Java.type("java.io.File")
+     * var createTempFile = File.createTempFile
+     * var tmpFile1 = createTempFile("abcdefg", ".tmp")
+     * var tmpFile2 = createTempFile("abcdefg", ".tmp", new File("/tmp"))
+     * </pre>
+     * If you need to access the actual {@code java.lang.Class} object for the type, you can use the {@code class}
+     * property on the object representing the type:
+     * <pre>
+     * var File = Java.type("java.io.File")
+     * var someFile = new File("blah")
+     * print(File.class === someFile.getClass()) // prints true
+     * </pre>
+     * Of course, you can also use the {@code getClass()} method or its equivalent {@code class} property on any
+     * instance of the class. Other way round, you can use the synthetic {@code static} property on any
+     * {@code java.lang.Class} object to retrieve its type-representing object:
+     * <pre>
+     * var File = Java.type("java.io.File")
+     * print(File.class.static === File) // prints true
+     * </pre>
+     * <h2>{@code instanceof} operator</h2>
+     * The standard ECMAScript {@code instanceof} operator is extended to recognize Java objects and their type objects:
+     * <pre>
+     * var File = Java.type("java.io.File")
+     * var aFile = new File("foo")
+     * print(aFile instanceof File) // prints true
+     * print(aFile instanceof File.class) // prints false - Class objects aren't type objects.
+     * </pre>
+     * @param self not used
+     * @param objTypeName the object whose JS string value represents the type name. You can use names of primitive Java
+     * types to obtain representations of them, and you can use trailing square brackets to represent Java array types.
+     * @return the object representing the named type
+     * @throws ClassNotFoundException if the class is not found
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object type(final Object self, final Object objTypeName) throws ClassNotFoundException {
+        return type(objTypeName);
+    }
+
+    private static StaticClass type(final Object objTypeName) throws ClassNotFoundException {
+        return StaticClass.forClass(type(JSType.toString(objTypeName)));
+    }
+
+    private static Class<?> type(final String typeName) throws ClassNotFoundException {
+        if (typeName.endsWith("[]")) {
+            return arrayType(typeName);
+        }
+
+        return simpleType(typeName);
+    }
+
+    /**
+     * Given a JavaScript array and a Java type, returns a Java array with the same initial contents, and with the
+     * specified component type. Example:
+     * <pre>
+     * var anArray = [1, "13", false]
+     * var javaIntArray = Java.toJavaArray(anArray, "int")
+     * print(javaIntArray[0]) // prints 1
+     * print(javaIntArray[1]) // prints 13, as string "13" was converted to number 13 as per ECMAScript ToNumber conversion
+     * print(javaIntArray[2]) // prints 0, as boolean false was converted to number 0 as per ECMAScript ToNumber conversion
+     * </pre>
+     * @param self not used
+     * @param objArray the JavaScript array. Can be null.
+     * @param objType either a {@link #type(Object, Object) type object} or a String describing the component type of
+     * the Java array to create. Can not be null. If undefined, Object is assumed (allowing the argument to be omitted).
+     * @return a Java array with the copy of JavaScript array's contents, converted to the appropriate Java component
+     * type. Returns null if objArray is null.
+     * @throws ClassNotFoundException if the class described by objType is not found
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object toJavaArray(final Object self, final Object objArray, final Object objType) throws ClassNotFoundException {
+        final StaticClass componentType =
+            objType instanceof StaticClass ?
+                (StaticClass)objType :
+                objType == UNDEFINED ?
+                    StaticClass.forClass(Object.class) :
+                    type(objType);
+
+        if (objArray == null) {
+            return null;
+        }
+
+        Global.checkObject(objArray);
+
+        return ((ScriptObject)objArray).getArray().asArrayOfType(componentType.getRepresentedClass());
+    }
+
+    /**
+     * Given a Java array or {@link Collection}, returns a JavaScript array with a shallow copy of its contents. Note
+     * that in most cases, you can use Java arrays and lists natively in Nashorn; in cases where for some reason you
+     * need to have an actual JavaScript native array (e.g. to work with the array comprehensions functions), you will
+     * want to use this method. Example:
+     * <pre>
+     * var File = Java.type("java.io.File")
+     * var listHomeDir = new File("~").listFiles()
+     * var jsListHome = Java.toJavaScriptArray(listHomeDir)
+     * var jpegModifiedDates = jsListHome
+     *     .filter(function(val) { return val.getName().endsWith(".jpg") })
+     *     .map(function(val) { return val.lastModified() })
+     * </pre>
+     * @param self not used
+     * @param objArray the java array or collection. Can be null.
+     * @return a JavaScript array with the copy of Java array's or collection's contents. Returns null if objArray is
+     * null.
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object toJavaScriptArray(final Object self, final Object objArray) {
+        if (objArray == null) {
+            return null;
+        } else if (objArray instanceof Collection) {
+            return new NativeArray(((Collection<?>)objArray).toArray());
+        } else if (objArray instanceof Object[]) {
+            return new NativeArray(((Object[])objArray).clone());
+        } else if (objArray instanceof int[]) {
+            return new NativeArray(((int[])objArray).clone());
+        } else if (objArray instanceof double[]) {
+            return new NativeArray(((double[])objArray).clone());
+        } else if (objArray instanceof long[]) {
+            return new NativeArray(((long[])objArray).clone());
+        } else if (objArray instanceof byte[]) {
+            return new NativeArray(copyArray((byte[])objArray));
+        } else if (objArray instanceof short[]) {
+            return new NativeArray(copyArray((short[])objArray));
+        } else if (objArray instanceof char[]) {
+            return new NativeArray(copyArray((char[])objArray));
+        } else if (objArray instanceof float[]) {
+            return new NativeArray(copyArray((float[])objArray));
+        } else if (objArray instanceof boolean[]) {
+            return new NativeArray(copyArray((boolean[])objArray));
+        }
+
+        typeError(Global.instance(), "cant.convert.to.javascript.array", objArray.getClass().getName());
+
+        throw new AssertionError();
+    }
+
+    private static int[] copyArray(final byte[] in) {
+        final int[] out = new int[in.length];
+        for(int i = 0; i < in.length; ++i) {
+            out[i] = in[i];
+        }
+        return out;
+    }
+
+    private static int[] copyArray(final short[] in) {
+        final int[] out = new int[in.length];
+        for(int i = 0; i < in.length; ++i) {
+            out[i] = in[i];
+        }
+        return out;
+    }
+
+    private static int[] copyArray(final char[] in) {
+        final int[] out = new int[in.length];
+        for(int i = 0; i < in.length; ++i) {
+            out[i] = in[i];
+        }
+        return out;
+    }
+
+    private static double[] copyArray(final float[] in) {
+        final double[] out = new double[in.length];
+        for(int i = 0; i < in.length; ++i) {
+            out[i] = in[i];
+        }
+        return out;
+    }
+
+    private static Object[] copyArray(final boolean[] in) {
+        final Object[] out = new Object[in.length];
+        for(int i = 0; i < in.length; ++i) {
+            out[i] = in[i];
+        }
+        return out;
+    }
+
+    private static Class<?> simpleType(final String typeName) throws ClassNotFoundException {
+        final Class<?> primClass = TypeUtilities.getPrimitiveTypeByName(typeName);
+        return primClass != null ? primClass : Global.instance().getContext().findClass(typeName);
+    }
+
+    private static Class<?> arrayType(final String typeName) throws ClassNotFoundException {
+        return Array.newInstance(type(typeName.substring(0, typeName.length() - 2)), 0).getClass();
+    }
+
+    /**
+     * Returns a type object for a subclass of the specified Java class (or implementation of the specified interface)
+     * that acts as a script-to-Java adapter for it. See {@link #type(Object, Object)} for a discussion of type objects,
+     * and see {@link JavaAdapterFactory} for details on script-to-Java adapters. Note that you can also implement
+     * interfaces and subclass abstract classes using {@code new} operator on a type object for an interface or abstract
+     * class. However, to extend a non-abstract class, you will have to use this method. Example:
+     * <pre>
+     * var ArrayList = Java.type("java.util.ArrayList")
+     * var ArrayListExtender = Java.extend(ArrayList)
+     * var printSizeInvokedArrayList = new ArrayListExtender() {
+     *     function size() { print("size invoked!"); }
+     * }
+     * var printAddInvokedArrayList = new ArrayListExtender() {
+     *     function add(x, y) {
+     *       if(typeof(y) === "undefined") {
+     *           print("add(e) invoked!");
+     *       } else {
+     *           print("add(i, e) invoked!");
+     *       }
+     * }
+     * </pre>
+     * We can see several important concepts in the above example:
+     * <ul>
+     * <li>Every Java class will have exactly one extender subclass in Nashorn - repeated invocations of {@code extend}
+     * for the same type will yield the same extender type. It's a generic adapter that delegates to whatever JavaScript
+     * functions its implementation object has on a per-instance basis.</li>
+     * <li>If the Java method is overloaded (as in the above example {@code List.add()}), then your JavaScript adapter
+     * must be prepared to deal with all overloads.</li>
+     * <li>You can't invoke {@code super.*()} from adapters for now.</li>
+     * @param self not used
+     * @param type the original type. Must be a Java type object of class {@link StaticClass} representing either a
+     * public interface or a non-final public class with at least one public or protected constructor.
+     * @return a new {@link StaticClass} that represents the adapter for the original type.
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object extend(final Object self, final Object type) {
+        if(!(type instanceof StaticClass)) {
+            typeError(Global.instance(), "extend.expects.java.type");
+        }
+        return JavaAdapterFactory.getAdapterClassFor((StaticClass)type);
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeJavaImporter.java b/nashorn/src/jdk/nashorn/internal/objects/NativeJavaImporter.java
new file mode 100644
index 00000000000..49b6dc78799
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeJavaImporter.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+import jdk.nashorn.internal.objects.annotations.Attribute;
+import jdk.nashorn.internal.objects.annotations.Constructor;
+import jdk.nashorn.internal.objects.annotations.Function;
+import jdk.nashorn.internal.objects.annotations.ScriptClass;
+import jdk.nashorn.internal.runtime.NativeJavaPackage;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import org.dynalang.dynalink.CallSiteDescriptor;
+import org.dynalang.dynalink.beans.StaticClass;
+import org.dynalang.dynalink.linker.GuardedInvocation;
+
+/**
+ * This is "JavaImporter" constructor. This constructor allows you to use Java types omitting explicit package names.
+ * Objects of this constructor are used along with {@code "with"} statements and as such are not usable in ECMAScript
+ * strict mode. Example:
+ * <pre>
+ *     var imports = new JavaImporter(java.util, java.io);
+ *     with (imports) {
+ *         var m = new HashMap(); // java.util.HashMap
+ *         var f = new File("."); // java.io.File
+ *         ...
+ *     }
+ * </pre>
+ * Note however that the preferred way for accessing Java types in Nashorn is through the use of
+ * {@link NativeJava#type(Object, Object) Java.type()} method.
+ */
+@ScriptClass("JavaImporter")
+public class NativeJavaImporter extends ScriptObject {
+    private final Object[] args;
+
+    NativeJavaImporter(final Object[] args) {
+        this.args = args;
+        this.setProto(Global.instance().getJavaImporterPrototype());
+    }
+
+    @Override
+    public String getClassName() {
+        return "JavaImporter";
+    }
+
+    /**
+     * Constructor
+     * @param isNew is the new operator used for instantiating this NativeJavaImporter
+     * @param self self reference
+     * @param args arguments
+     * @return NativeJavaImporter instance
+     */
+    @Constructor(arity = 1)
+    public static Object constructor(final boolean isNew, final Object self, final Object... args) {
+        return new NativeJavaImporter(args);
+    }
+
+    /**
+     * "No such property" call placeholder.
+     *
+     * This can never be called as we override {@link ScriptObject#noSuchProperty}. We do declare it here as it's a signal
+     * to {@link jdk.nashorn.internal.runtime.WithObject} that it's worth trying doing a {@code noSuchProperty} on this object.
+     *
+     * @param self self reference
+     * @param name property name
+     * @return never returns
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object __noSuchProperty__(final Object self, final Object name) {
+        throw new AssertionError("__noSuchProperty__ placeholder called");
+    }
+
+    /**
+     * "No such method call" placeholder
+     *
+     * This can never be called as we override {@link ScriptObject#noSuchMethod}. We do declare it here as it's a signal
+     * to {@link jdk.nashorn.internal.runtime.WithObject} that it's worth trying doing a noSuchProperty on this object.
+     *
+     * @param self self reference
+     * @param args arguments to method
+     * @return never returns
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object __noSuchMethod__(final Object self, final Object... args) {
+        throw new AssertionError("__noSuchMethod__ placeholder called");
+    }
+
+    @Override
+    public GuardedInvocation noSuchProperty(final CallSiteDescriptor desc) {
+        return createAndSetProperty(desc) ? super.lookup(desc) : super.noSuchProperty(desc);
+    }
+
+    @Override
+    public GuardedInvocation noSuchMethod(final CallSiteDescriptor desc) {
+        return createAndSetProperty(desc) ? super.lookup(desc) : super.noSuchMethod(desc);
+    }
+
+    private boolean createAndSetProperty(final CallSiteDescriptor desc) {
+        final String name = desc.getNameToken(CallSiteDescriptor.NAME_OPERAND);
+        final Object value = createProperty(name);
+        if(value != null) {
+            set(name, value, getContext()._strict);
+            return true;
+        }
+        return false;
+    }
+
+    private Object createProperty(final String name) {
+        final int len = args.length;
+
+        for (int i = len - 1; i > -1; i--) {
+            final Object obj = args[i];
+
+            if (obj instanceof StaticClass) {
+                if (((StaticClass)obj).getRepresentedClass().getSimpleName().equals(name)) {
+                    return obj;
+                }
+            } else if (obj instanceof NativeJavaPackage) {
+                final String pkgName  = ((NativeJavaPackage)obj).getName();
+                final String fullName = pkgName.isEmpty() ? name : (pkgName + "." + name);
+                try {
+                    return StaticClass.forClass(Class.forName(fullName));
+                } catch (final ClassNotFoundException e) {
+                    // IGNORE
+                }
+            }
+        }
+        return null;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeMath.java b/nashorn/src/jdk/nashorn/internal/objects/NativeMath.java
new file mode 100644
index 00000000000..94d1883bbad
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeMath.java
@@ -0,0 +1,700 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+import jdk.nashorn.internal.objects.annotations.Attribute;
+import jdk.nashorn.internal.objects.annotations.Function;
+import jdk.nashorn.internal.objects.annotations.Property;
+import jdk.nashorn.internal.objects.annotations.ScriptClass;
+import jdk.nashorn.internal.objects.annotations.SpecializedFunction;
+import jdk.nashorn.internal.objects.annotations.Where;
+import jdk.nashorn.internal.runtime.GlobalFunctions;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.ScriptObject;
+
+/**
+ * ECMA 15.8 The Math Object
+ *
+ */
+@ScriptClass("Math")
+public final class NativeMath extends ScriptObject {
+
+    NativeMath() {
+        this.setProto(Global.objectPrototype());
+    }
+
+    /** ECMA 15.8.1.1 - E, always a double constant. Not writable or configurable */
+    @Property(attributes = Attribute.NON_ENUMERABLE_CONSTANT, where = Where.CONSTRUCTOR)
+    public static final double E = Math.E;
+
+    /** ECMA 15.8.1.2 - LN10, always a double constant. Not writable or configurable */
+    @Property(attributes = Attribute.NON_ENUMERABLE_CONSTANT, where = Where.CONSTRUCTOR)
+    public static final double LN10 = 2.302585092994046;
+
+    /** ECMA 15.8.1.3 - LN2, always a double constant. Not writable or configurable */
+    @Property(attributes = Attribute.NON_ENUMERABLE_CONSTANT, where = Where.CONSTRUCTOR)
+    public static final double LN2 = 0.6931471805599453;
+
+    /** ECMA 15.8.1.4 - LOG2E, always a double constant. Not writable or configurable */
+    @Property(attributes = Attribute.NON_ENUMERABLE_CONSTANT, where = Where.CONSTRUCTOR)
+    public static final double LOG2E = 1.4426950408889634;
+
+    /** ECMA 15.8.1.5 - LOG10E, always a double constant. Not writable or configurable */
+    @Property(attributes = Attribute.NON_ENUMERABLE_CONSTANT, where = Where.CONSTRUCTOR)
+    public static final double LOG10E = 0.4342944819032518;
+
+    /** ECMA 15.8.1.6 - PI, always a double constant. Not writable or configurable */
+    @Property(attributes = Attribute.NON_ENUMERABLE_CONSTANT, where = Where.CONSTRUCTOR)
+    public static final double PI = Math.PI;
+
+    /** ECMA 15.8.1.7 - SQRT1_2, always a double constant. Not writable or configurable */
+    @Property(attributes = Attribute.NON_ENUMERABLE_CONSTANT, where = Where.CONSTRUCTOR)
+    public static final double SQRT1_2 = 0.7071067811865476;
+
+    /** ECMA 15.8.1.8 - SQRT2, always a double constant. Not writable or configurable */
+    @Property(attributes = Attribute.NON_ENUMERABLE_CONSTANT, where = Where.CONSTRUCTOR)
+    public static final double SQRT2 = 1.4142135623730951;
+
+    /**
+     * ECMA 15.8.2.1 abs(x)
+     *
+     * @param self  self reference
+     * @param x     argument
+     *
+     * @return abs of value
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object abs(final Object self, final Object x) {
+        return Math.abs(JSType.toNumber(x));
+    }
+
+    /**
+     * ECMA 15.8.2.1 abs(x) - specialization for int values
+     *
+     * @param self  self reference
+     * @param x     argument
+     *
+     * @return abs of argument
+     */
+    @SpecializedFunction
+    public static int abs(final Object self, final int x) {
+        return Math.abs(x);
+    }
+
+    /**
+     * ECMA 15.8.2.1 abs(x) - specialization for long values
+     *
+     * @param self  self reference
+     * @param x     argument
+     *
+     * @return abs of argument
+     */
+    @SpecializedFunction
+    public static long abs(final Object self, final long x) {
+        return Math.abs(x);
+    }
+
+    /**
+     * ECMA 15.8.2.1 abs(x) - specialization for double values
+     *
+     * @param self  self reference
+     * @param x     argument
+     *
+     * @return abs of argument
+     */
+    @SpecializedFunction
+    public static double abs(final Object self, final double x) {
+        return Math.abs(x);
+    }
+
+    /**
+     * ECMA 15.8.2.2 acos(x)
+     *
+     * @param self  self reference
+     * @param x     argument
+     *
+     * @return acos of argument
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object acos(final Object self, final Object x) {
+        return Math.acos(JSType.toNumber(x));
+    }
+
+    /**
+     * ECMA 15.8.2.2 acos(x) - specialization for double values
+     *
+     * @param self  self reference
+     * @param x     argument
+     *
+     * @return acos of argument
+     */
+    @SpecializedFunction
+    public static double acos(final Object self, final double x) {
+        return Math.acos(x);
+    }
+
+    /**
+     * ECMA 15.8.2.3 asin(x)
+     *
+     * @param self  self reference
+     * @param x     argument
+     *
+     * @return asin of argument
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object asin(final Object self, final Object x) {
+        return Math.asin(JSType.toNumber(x));
+    }
+
+    /**
+     * ECMA 15.8.2.3 asin(x) - specialization for double values
+     *
+     * @param self  self reference
+     * @param x     argument
+     *
+     * @return asin of argument
+     */
+    @SpecializedFunction
+    public static double asin(final Object self, final double x) {
+        return Math.asin(x);
+    }
+
+    /**
+     * ECMA 15.8.2.4 atan(x)
+     *
+     * @param self  self reference
+     * @param x     argument
+     *
+     * @return atan of argument
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object atan(final Object self, final Object x) {
+        return Math.atan(JSType.toNumber(x));
+    }
+
+    /**
+     * ECMA 15.8.2.4 atan(x) - specialization for double values
+     *
+     * @param self  self reference
+     * @param x     argument
+     *
+     * @return atan of argument
+     */
+    @SpecializedFunction
+    public static double atan(final Object self, final double x) {
+        return Math.atan(x);
+    }
+
+    /**
+     * ECMA 15.8.2.5 atan2(x,y)
+     *
+     * @param self  self reference
+     * @param x     first argument
+     * @param y     second argument
+     *
+     * @return atan2 of x and y
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object atan2(final Object self, final Object y, final Object x) {
+        return Math.atan2(JSType.toNumber(y), JSType.toNumber(x));
+    }
+
+    /**
+     * ECMA 15.8.2.5 atan2(x,y) - specialization for double values
+     *
+     * @param self  self reference
+     * @param x     first argument
+     * @param y     second argument
+     *
+     * @return atan2 of x and y
+     */
+    @SpecializedFunction
+    public static double atan2(final Object self, final double y, final double x) {
+        return Math.atan2(y,x);
+    }
+
+    /**
+     * ECMA 15.8.2.6 ceil(x)
+     *
+     * @param self  self reference
+     * @param x     argument
+     *
+     * @return ceil of argument
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object ceil(final Object self, final Object x) {
+        return Math.ceil(JSType.toNumber(x));
+    }
+
+    /**
+     * ECMA 15.8.2.6 ceil(x) - specialized version for ints
+     *
+     * @param self  self reference
+     * @param x     argument
+     *
+     * @return ceil of argument
+     */
+    @SpecializedFunction
+    public static int ceil(final Object self, final int x) {
+        return x;
+    }
+
+    /**
+     * ECMA 15.8.2.6 ceil(x) - specialized version for longs
+     *
+     * @param self  self reference
+     * @param x     argument
+     *
+     * @return ceil of argument
+     */
+    @SpecializedFunction
+    public static long ceil(final Object self, final long x) {
+        return x;
+    }
+
+    /**
+     * ECMA 15.8.2.6 ceil(x) - specialized version for doubles
+     *
+     * @param self  self reference
+     * @param x     argument
+     *
+     * @return ceil of argument
+     */
+    @SpecializedFunction
+    public static double ceil(final Object self, final double x) {
+        return Math.ceil(x);
+    }
+
+    /**
+     * ECMA 15.8.2.7 cos(x)
+     *
+     * @param self  self reference
+     * @param x     argument
+     *
+     * @return cos of argument
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object cos(final Object self, final Object x) {
+        return Math.cos(JSType.toNumber(x));
+    }
+
+    /**
+     * ECMA 15.8.2.7 cos(x) - specialized version for doubles
+     *
+     * @param self  self reference
+     * @param x     argument
+     *
+     * @return cos of argument
+     */
+    @SpecializedFunction
+    public static double cos(final Object self, final double x) {
+        return Math.cos(x);
+    }
+
+    /**
+     * ECMA 15.8.2.8 exp(x)
+     *
+     * @param self  self reference
+     * @param x     argument
+     *
+     * @return exp of argument
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object exp(final Object self, final Object x) {
+        return Math.exp(JSType.toNumber(x));
+    }
+
+    /**
+     * ECMA 15.8.2.9 floor(x)
+     *
+     * @param self  self reference
+     * @param x     argument
+     *
+     * @return floor of argument
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object floor(final Object self, final Object x) {
+        return Math.floor(JSType.toNumber(x));
+    }
+
+    /**
+     * ECMA 15.8.2.9 floor(x) - specialized version for ints
+     *
+     * @param self  self reference
+     * @param x     argument
+     *
+     * @return floor of argument
+     */
+    @SpecializedFunction
+    public static int floor(final Object self, final int x) {
+        return x;
+    }
+
+    /**
+     * ECMA 15.8.2.9 floor(x) - specialized version for longs
+     *
+     * @param self  self reference
+     * @param x     argument
+     *
+     * @return floor of argument
+     */
+    @SpecializedFunction
+    public static long floor(final Object self, final long x) {
+        return x;
+    }
+
+    /**
+     * ECMA 15.8.2.9 floor(x) - specialized version for doubles
+     *
+     * @param self  self reference
+     * @param x     argument
+     *
+     * @return floor of argument
+     */
+    @SpecializedFunction
+    public static double floor(final Object self, final double x) {
+        return Math.floor(x);
+    }
+
+    /**
+     * ECMA 15.8.2.10 log(x)
+     *
+     * @param self  self reference
+     * @param x     argument
+     *
+     * @return log of argument
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object log(final Object self, final Object x) {
+        return Math.log(JSType.toNumber(x));
+    }
+
+    /**
+     * ECMA 15.8.2.10 log(x) - specialized version for doubles
+     *
+     * @param self  self reference
+     * @param x     argument
+     *
+     * @return log of argument
+     */
+    @SpecializedFunction
+    public static double log(final Object self, final double x) {
+        return Math.log(x);
+    }
+
+    /**
+     * ECMA 15.8.2.11 max(x)
+     *
+     * @param self  self reference
+     * @param args  arguments
+     *
+     * @return the largest of the arguments, {@link Double#NEGATIVE_INFINITY} if no args given, or identity if one arg is given
+     */
+    @Function(arity = 2, attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object max(final Object self, final Object... args) {
+        switch (args.length) {
+        case 0:
+            return Double.NEGATIVE_INFINITY;
+        case 1:
+            return JSType.toNumber(args[0]);
+        default:
+            double res = JSType.toNumber(args[0]);
+            for (int i = 1; i < args.length; i++) {
+                res = Math.max(res, JSType.toNumber(args[i]));
+            }
+            return res;
+        }
+    }
+
+    /**
+     * ECMA 15.8.2.11 max(x) - specialized no args version
+     *
+     * @param self  self reference
+     *
+     * @return {@link Double#NEGATIVE_INFINITY}
+     */
+    @SpecializedFunction
+    public static double max(final Object self) {
+        return Double.NEGATIVE_INFINITY;
+    }
+
+    /**
+     * ECMA 15.8.2.11 max(x) - specialized version for ints
+     *
+     * @param self  self reference
+     * @param x     first argument
+     * @param y     second argument
+     *
+     * @return largest value of x and y
+     */
+    @SpecializedFunction
+    public static int max(final Object self, final int x, final int y) {
+        return Math.max(x, y);
+    }
+
+    /**
+     * ECMA 15.8.2.11 max(x) - specialized version for longs
+     *
+     * @param self  self reference
+     * @param x     first argument
+     * @param y     second argument
+     *
+     * @return largest value of x and y
+     */
+    @SpecializedFunction
+    public static long max(final Object self, final long x, final long y) {
+        return Math.max(x, y);
+    }
+
+    /**
+     * ECMA 15.8.2.11 max(x) - specialized version for doubles
+     *
+     * @param self  self reference
+     * @param x     first argument
+     * @param y     second argument
+     *
+     * @return largest value of x and y
+     */
+    @SpecializedFunction
+    public static double max(final Object self, final double x, final double y) {
+        return Math.max(x, y);
+    }
+
+    /**
+     * ECMA 15.8.2.12 min(x)
+     *
+     * @param self  self reference
+     * @param args  arguments
+     *
+     * @return the smallest of the arguments, {@link Double#NEGATIVE_INFINITY} if no args given, or identity if one arg is given
+     */
+    @Function(arity = 2, attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object min(final Object self, final Object... args) {
+        switch (args.length) {
+        case 0:
+            return Double.POSITIVE_INFINITY;
+        case 1:
+            return JSType.toNumber(args[0]);
+        default:
+            double res = JSType.toNumber(args[0]);
+            for (int i = 1; i < args.length; i++) {
+                res = Math.min(res, JSType.toNumber(args[i]));
+            }
+            return res;
+        }
+    }
+
+    /**
+     * ECMA 15.8.2.11 min(x) - specialized no args version
+     *
+     * @param self  self reference
+     *
+     * @return {@link Double#POSITIVE_INFINITY}
+     */
+    @SpecializedFunction
+    public static double min(final Object self) {
+        return Double.POSITIVE_INFINITY;
+    }
+
+    /**
+     * ECMA 15.8.2.12 min(x) - specialized version for ints
+     *
+     * @param self  self reference
+     * @param x     first argument
+     * @param y     second argument
+     *
+     * @return smallest value of x and y
+     */
+    @SpecializedFunction
+    public static int min(final Object self, final int x, final int y) {
+        return Math.min(x, y);
+    }
+
+    /**
+     * ECMA 15.8.2.12 min(x) - specialized version for longs
+     *
+     * @param self  self reference
+     * @param x     first argument
+     * @param y     second argument
+     *
+     * @return smallest value of x and y
+     */
+    @SpecializedFunction
+    public static long min(final Object self, final long x, final long y) {
+        return Math.min(x, y);
+    }
+
+    /**
+     * ECMA 15.8.2.12 min(x) - specialized version for doubles
+     *
+     * @param self  self reference
+     * @param x     first argument
+     * @param y     second argument
+     *
+     * @return smallest value of x and y
+     */
+    @SpecializedFunction
+    public static double min(final Object self, final double x, final double y) {
+        return Math.min(x, y);
+    }
+
+    /**
+     * ECMA 15.8.2.13 pow(x,y)
+     *
+     * @param self  self reference
+     * @param x     first argument
+     * @param y     second argument
+     *
+     * @return x raised to the power of y
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object pow(final Object self, final Object x, final Object y) {
+        return Math.pow(JSType.toNumber(x), JSType.toNumber(y));
+    }
+
+    /**
+     * ECMA 15.8.2.13 pow(x,y) - specialized version for doubles
+     *
+     * @param self  self reference
+     * @param x     first argument
+     * @param y     second argument
+     *
+     * @return x raised to the power of y
+     */
+    @SpecializedFunction
+    public static double pow(final Object self, final double x, final double y) {
+        return Math.pow(x, y);
+    }
+
+    /**
+     * ECMA 15.8.2.14 random()
+     *
+     * @param self  self reference
+     *
+     * @return random number in the range [0..1)
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object random(final Object self) {
+        return Math.random();
+    }
+
+    /**
+     * ECMA 15.8.2.15 round(x)
+     *
+     * @param self  self reference
+     * @param x     argument
+     *
+     * @return x rounded
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object round(final Object self, final Object x) {
+        if (GlobalFunctions.isNaN(self, x)) {
+            return Double.NaN;
+        } else if (!GlobalFunctions.isFinite(self, x)) {
+            return x;
+        }
+
+        return Math.round(JSType.toNumber(x));
+    }
+
+    /**
+     * ECMA 15.8.2.16 sin(x)
+     *
+     * @param self  self reference
+     * @param x     argument
+     *
+     * @return sin of x
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object sin(final Object self, final Object x) {
+        return Math.sin(JSType.toNumber(x));
+    }
+
+    /**
+     * ECMA 15.8.2.16 sin(x) - specialized version for doubles
+     *
+     * @param self  self reference
+     * @param x     argument
+     *
+     * @return sin of x
+     */
+    @SpecializedFunction
+    public static double sin(final Object self, final double x) {
+        return Math.sin(x);
+    }
+
+    /**
+     * ECMA 15.8.2.17 sqrt(x)
+     *
+     * @param self  self reference
+     * @param x     argument
+     *
+     * @return sqrt of x
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object sqrt(final Object self, final Object x) {
+        return Math.sqrt(JSType.toNumber(x));
+    }
+
+    /**
+     * ECMA 15.8.2.17 sqrt(x) - specialized version for doubles
+     *
+     * @param self  self reference
+     * @param x     argument
+     *
+     * @return sqrt of x
+     */
+    @SpecializedFunction
+    public static double sqrt(final Object self, final double x) {
+        return Math.sqrt(x);
+    }
+
+    /**
+     * ECMA 15.8.2.18 tan(x)
+     *
+     * @param self  self reference
+     * @param x     argument
+     *
+     * @return tan of x
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where=Where.CONSTRUCTOR)
+    public static Object tan(final Object self, final Object x) {
+        return Math.tan(JSType.toNumber(x));
+    }
+
+    /**
+     * ECMA 15.8.2.18 tan(x) - specialized version for doubles
+     *
+     * @param self  self reference
+     * @param x     argument
+     *
+     * @return tan of x
+     */
+    @SpecializedFunction
+    public static double tan(final Object self, final double x) {
+        return Math.tan(x);
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java b/nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java
new file mode 100644
index 00000000000..1fdeb29336d
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java
@@ -0,0 +1,388 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+import static jdk.nashorn.internal.runtime.ECMAErrors.rangeError;
+import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static jdk.nashorn.internal.runtime.JSType.isRepresentableAsInt;
+import static jdk.nashorn.internal.runtime.JSType.isRepresentableAsLong;
+import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.text.NumberFormat;
+import java.util.Locale;
+import jdk.nashorn.internal.objects.annotations.Attribute;
+import jdk.nashorn.internal.objects.annotations.Constructor;
+import jdk.nashorn.internal.objects.annotations.Function;
+import jdk.nashorn.internal.objects.annotations.Property;
+import jdk.nashorn.internal.objects.annotations.ScriptClass;
+import jdk.nashorn.internal.objects.annotations.Where;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
+import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
+import jdk.nashorn.internal.runtime.linker.PrimitiveLookup;
+import org.dynalang.dynalink.linker.GuardedInvocation;
+
+/**
+ * ECMA 15.7 Number Objects.
+ *
+ */
+@ScriptClass("Number")
+public final class NativeNumber extends ScriptObject {
+
+    private static final MethodHandle WRAPFILTER = findWrapFilter();
+
+    /** ECMA 15.7.3.2 largest positive finite value */
+    @Property(attributes = Attribute.NON_ENUMERABLE_CONSTANT, where = Where.CONSTRUCTOR)
+    public static final double MAX_VALUE = Double.MAX_VALUE;
+
+    /** ECMA 15.7.3.3 smallest positive finite value */
+    @Property(attributes = Attribute.NON_ENUMERABLE_CONSTANT, where = Where.CONSTRUCTOR)
+    public static final double MIN_VALUE = Double.MIN_VALUE;
+
+    /** ECMA 15.7.3.4 NaN */
+    @Property(attributes = Attribute.NON_ENUMERABLE_CONSTANT, where = Where.CONSTRUCTOR)
+    public static final double NaN = Double.NaN;
+
+    /** ECMA 15.7.3.5 negative infinity */
+    @Property(attributes = Attribute.NON_ENUMERABLE_CONSTANT, where = Where.CONSTRUCTOR)
+    public static final double NEGATIVE_INFINITY = Double.NEGATIVE_INFINITY;
+
+    /** ECMA 15.7.3.5 positive infinity */
+    @Property(attributes = Attribute.NON_ENUMERABLE_CONSTANT, where = Where.CONSTRUCTOR)
+    public static final double POSITIVE_INFINITY = Double.POSITIVE_INFINITY;
+
+    private final double  value;
+    private final boolean isInt;
+    private final boolean isLong;
+
+    NativeNumber(final double value) {
+        this(value, Global.instance().getNumberPrototype());
+    }
+
+    private NativeNumber(final double value, final ScriptObject proto) {
+        this.value = value;
+        this.isInt  = isRepresentableAsInt(value);
+        this.isLong = isRepresentableAsLong(value);
+        this.setProto(proto);
+    }
+
+    @Override
+    public String safeToString() {
+        return "[Number " + toString() + "]";
+    }
+
+    @Override
+    public String toString() {
+        return Double.toString(getValue());
+    }
+
+    /**
+     * Get the value of this Number
+     * @return a {@code double} representing the Number value
+     */
+    public double getValue() {
+        return doubleValue();
+    }
+
+    /**
+     * Get the value of this Number
+     * @return a {@code double} representing the Number value
+     */
+    public double doubleValue() {
+        return value;
+    }
+
+    /**
+     * Get the value of this Number as a {@code int}
+     * @return an {@code int} representing the Number value
+     * @throws ClassCastException If number is not representable as an {@code int}
+     */
+    public int intValue() throws ClassCastException {
+        if (isInt) {
+            return (int)value;
+        }
+        throw new ClassCastException();
+    }
+
+    /**
+     * Get the value of this Number as a {@code long}
+     * @return a {@code long} representing the Number value
+     * @throws ClassCastException If number is not representable as an {@code long}
+     */
+    public long longValue() throws ClassCastException {
+        if (isLong) {
+            return (long)value;
+        }
+        throw new ClassCastException();
+    }
+
+    @Override
+    public String getClassName() {
+        return "Number";
+    }
+
+    /**
+     * ECMA 15.7.2 - The Number constructor
+     *
+     * @param newObj is this Number instantiated with the new operator
+     * @param self   self reference
+     * @param args   value of number
+     * @return the Number instance (internally represented as a {@code NativeNumber})
+     */
+    @Constructor(arity = 1)
+    public static Object constructor(final boolean newObj, final Object self, final Object... args) {
+        final double num = (args.length > 0) ? JSType.toNumber(args[0]) : 0.0;
+
+        if (newObj) {
+            final ScriptObject proto =
+                (self instanceof ScriptObject) ?
+                    ((ScriptObject)self).getProto() :
+                    Global.instance().getNumberPrototype();
+
+            return new NativeNumber(num, proto);
+        }
+
+        return num;
+    }
+
+    /**
+     * ECMA 15.7.4.5 Number.prototype.toFixed (fractionDigits)
+     *
+     * @param self           self reference
+     * @param fractionDigits how many digits should be after the decimal point, 0 if undefined
+     *
+     * @return number in decimal fixed point notation
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object toFixed(final Object self, final Object fractionDigits) {
+        final int f = JSType.toInteger(fractionDigits);
+        if (f < 0 || f > 20) {
+            rangeError(Global.instance(), "invalid.fraction.digits", "toFixed");
+            return UNDEFINED;
+        }
+
+        final double x = getNumberValue(self);
+        if (Double.isNaN(x)) {
+            return "NaN";
+        }
+
+        if (Math.abs(x) >= 1e21) {
+            return JSType.toString(x);
+        }
+
+        final NumberFormat format = NumberFormat.getNumberInstance(Locale.US);
+        format.setMinimumFractionDigits(f);
+        format.setMaximumFractionDigits(f);
+        format.setGroupingUsed(false);
+
+        return format.format(x);
+    }
+
+    /**
+     * ECMA 15.7.4.6 Number.prototype.toExponential (fractionDigits)
+     *
+     * @param self           self reference
+     * @param fractionDigits how many digital should be after the significand's decimal point. If undefined, use as many as necessary to uniquely specify number.
+     *
+     * @return number in decimal exponential notation
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object toExponential(final Object self, final Object fractionDigits) {
+        final double  x         = getNumberValue(self);
+        final boolean trimZeros = fractionDigits == UNDEFINED;
+        final int     f         = trimZeros ? 16 : JSType.toInteger(fractionDigits);
+
+        if (Double.isNaN(x)) {
+            return "NaN";
+        } else if (Double.isInfinite(x)) {
+            return x > 0? "Infinity" : "-Infinity";
+        }
+
+        if (fractionDigits != UNDEFINED && (f < 0 || f > 20)) {
+            rangeError(Global.instance(), "invalid.fraction.digits", "toExponential");
+            return UNDEFINED;
+        }
+
+        final String res = String.format(Locale.US, "%1." + f + "e", x);
+        return fixExponent(res, trimZeros);
+    }
+
+    /**
+     * ECMA 15.7.4.7 Number.prototype.toPrecision (precision)
+     *
+     * @param self      self reference
+     * @param precision use {@code precision - 1} digits after the significand's decimal point or call {@link NativeDate#toString} if undefined
+     *
+     * @return number in decimal exponentiation notation or decimal fixed notation depending on {@code precision}
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object toPrecision(final Object self, final Object precision) {
+        final double x = getNumberValue(self);
+        if (precision == UNDEFINED) {
+            return JSType.toString(x);
+        }
+
+        final int p = JSType.toInteger(precision);
+        if (Double.isNaN(x)) {
+            return "NaN";
+        } else if (Double.isInfinite(x)) {
+            return x > 0? "Infinity" : "-Infinity";
+        }
+
+        if (p < 1 || p > 21) {
+            rangeError(Global.instance(), "invalid.precision");
+            return UNDEFINED;
+        }
+
+        // workaround for http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6469160
+        if (x == 0.0 && p <= 1) {
+            return "0";
+        }
+
+        return fixExponent(String.format(Locale.US, "%." + p + "g", x), false);
+    }
+
+    /**
+     * ECMA 15.7.4.2 Number.prototype.toString ( [ radix ] )
+     *
+     * @param self  self reference
+     * @param radix radix to use for string conversion
+     * @return string representation of this Number in the given radix
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object toString(final Object self, final Object radix) {
+        if (radix != UNDEFINED) {
+            final int intRadix = JSType.toInteger(radix);
+            if (intRadix != 10) {
+                if (intRadix < 2 || intRadix > 36) {
+                    rangeError(Global.instance(), "invalid.radix");
+                }
+                return JSType.toString(getNumberValue(self), intRadix);
+            }
+        }
+
+        return JSType.toString(getNumberValue(self));
+    }
+
+    /**
+     * ECMA 15.7.4.3 Number.prototype.toLocaleString()
+     *
+     * @param self self reference
+     * @return localized string for this Number
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object toLocaleString(final Object self) {
+        return JSType.toString(getNumberValue(self));
+    }
+
+
+    /**
+     * ECMA 15.7.4.4 Number.prototype.valueOf ( )
+     *
+     * @param self self reference
+     * @return boxed number value for this Number
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object valueOf(final Object self) {
+        return getNumberValue(self);
+    }
+
+    /**
+     * Lookup the appropriate method for an invoke dynamic call.
+     * @param desc The call site descriptor.
+     * @param receiver receiver of call
+     * @return Link to be invoked at call site.
+     */
+    public static GuardedInvocation lookupPrimitive(final NashornCallSiteDescriptor desc, final Object receiver) {
+        return PrimitiveLookup.lookupPrimitive(desc, Number.class, new NativeNumber(((Number)receiver).doubleValue()), WRAPFILTER);
+    }
+
+    @SuppressWarnings("unused")
+    private static NativeNumber wrapFilter(final Object receiver) {
+        return new NativeNumber(((Number)receiver).doubleValue());
+    }
+
+    private static double getNumberValue(final Object self) {
+        if (self instanceof Number) {
+            return ((Number)self).doubleValue();
+        } else if (self instanceof NativeNumber) {
+            return ((NativeNumber)self).getValue();
+        } else if (self != null && self == Global.instance().getNumberPrototype()) {
+            return 0.0;
+        } else {
+            typeError(Global.instance(), "not.a.number", ScriptRuntime.safeToString(self));
+            return Double.NaN;
+        }
+    }
+
+    // Exponent of Java "e" or "E" formatter is always 2 digits and zero
+    // padded if needed (e+01, e+00, e+12 etc.) JS expects exponent to contain
+    // exact number of digits e+1, e+0, e+12 etc. Fix the exponent here.
+    //
+    // Additionally, if trimZeros is true, this cuts trailing zeros in the
+    // fraction part for calls to toExponential() with undefined fractionDigits
+    // argument.
+    private static String fixExponent(final String str, final boolean trimZeros) {
+        final int index = str.indexOf('e');
+        if (index < 1) {
+            // no exponent, do nothing..
+            return str;
+        }
+
+        // check if character after e+ or e- is 0
+        final int expPadding = str.charAt(index + 2) == '0' ? 3 : 2;
+        // check if there are any trailing zeroes we should remove
+
+        int fractionOffset = index;
+        if (trimZeros) {
+            assert fractionOffset > 0;
+            char c = str.charAt(fractionOffset - 1);
+            while (fractionOffset > 1 && (c == '0' || c == '.')) {
+                c = str.charAt(--fractionOffset - 1);
+            }
+
+        }
+        // if anything needs to be done compose a new string
+        if (fractionOffset < index || expPadding == 3) {
+            return str.substring(0, fractionOffset)
+                    + str.substring(index, index + 2)
+                    + str.substring(index + expPadding);
+        }
+        return str;
+    }
+
+    private static MethodHandle findWrapFilter() {
+        try {
+            return MethodHandles.lookup().findStatic(NativeNumber.class, "wrapFilter", MH.type(NativeNumber.class, Object.class));
+        } catch (final NoSuchMethodException | IllegalAccessException e) {
+            throw new AssertionError(e);
+        }
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeObject.java b/nashorn/src/jdk/nashorn/internal/objects/NativeObject.java
new file mode 100644
index 00000000000..a26dadf7733
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeObject.java
@@ -0,0 +1,412 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+
+import jdk.nashorn.internal.objects.annotations.Attribute;
+import jdk.nashorn.internal.objects.annotations.Constructor;
+import jdk.nashorn.internal.objects.annotations.Function;
+import jdk.nashorn.internal.objects.annotations.ScriptClass;
+import jdk.nashorn.internal.objects.annotations.Where;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.ScriptFunction;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
+import jdk.nashorn.internal.runtime.linker.InvokeByName;
+
+/**
+ * ECMA 15.2 Object objects
+ *
+ * JavaScript Object constructor/prototype. Note: instances of this class are
+ * never created. This class is not even a subclass of ScriptObject. But, we use
+ * this class to generate prototype and constructor for "Object".
+ *
+ */
+@ScriptClass("Object")
+public final class NativeObject {
+    private static final InvokeByName TO_STRING = new InvokeByName("toString", ScriptObject.class);
+
+    private NativeObject() {
+    }
+
+    /**
+     * ECMA 15.2.3.2 Object.getPrototypeOf ( O )
+     *
+     * @param  self self reference
+     * @param  obj object to get prototype from
+     * @return the prototype of an object
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object getPrototypeOf(final Object self, final Object obj) {
+        Global.checkObject(obj);
+
+        return ((ScriptObject)obj).getProto();
+    }
+
+    /**
+     * ECMA 15.2.3.3 Object.getOwnPropertyDescriptor ( O, P )
+     *
+     * @param self  self reference
+     * @param obj   object from which to get property descriptor for {@code ToString(prop)}
+     * @param prop  property descriptor
+     * @return property descriptor
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object getOwnPropertyDescriptor(final Object self, final Object obj, final Object prop) {
+        Global.checkObject(obj);
+
+        final String       key  = JSType.toString(prop);
+        final ScriptObject sobj = (ScriptObject)obj;
+
+        return sobj.getOwnPropertyDescriptor(key);
+    }
+
+    /**
+     * ECMA 15.2.3.4 Object.getOwnPropertyNames ( O )
+     *
+     * @param self self reference
+     * @param obj  object to query for property names
+     * @return array of property names
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object getOwnPropertyNames(final Object self, final Object obj) {
+        Global.checkObject(obj);
+
+        return new NativeArray(((ScriptObject)obj).getOwnKeys(true));
+    }
+
+    /**
+     * ECMA 15.2.3.5 Object.create ( O [, Properties] )
+     *
+     * @param self  self reference
+     * @param proto prototype object
+     * @param props properties to define
+     * @return object created
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object create(final Object self, final Object proto, final Object props) {
+        if (proto != null) {
+            Global.checkObject(proto);
+        }
+
+        // FIXME: should we create a proper object with correct number of
+        // properties?
+        final ScriptObject newObj = Global.newEmptyInstance();
+        newObj.setProtoCheck(proto);
+        if (props != UNDEFINED) {
+            NativeObject.defineProperties(self, newObj, props);
+        }
+
+        return newObj;
+    }
+
+    /**
+     * ECMA 15.2.3.6 Object.defineProperty ( O, P, Attributes )
+     *
+     * @param self self reference
+     * @param obj  object in which to define a property
+     * @param prop property to define
+     * @param attr attributes for property descriptor
+     * @return object
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object defineProperty(final Object self, final Object obj, final Object prop, final Object attr) {
+        Global.checkObject(obj);
+        ((ScriptObject)obj).defineOwnProperty(JSType.toString(prop), attr, true);
+        return obj;
+    }
+
+    /**
+     * ECMA 5.2.3.7 Object.defineProperties ( O, Properties )
+     *
+     * @param self  self reference
+     * @param obj   object in which to define properties
+     * @param props properties
+     * @return object
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object defineProperties(final Object self, final Object obj, final Object props) {
+        Global.checkObject(obj);
+
+        final ScriptObject sobj     = (ScriptObject)obj;
+        final Object       propsObj = Global.toObject(props);
+
+        if (propsObj instanceof ScriptObject) {
+            final Object[] keys = ((ScriptObject)propsObj).getOwnKeys(false);
+            for (final Object key : keys) {
+                final String prop = JSType.toString(key);
+                sobj.defineOwnProperty(prop, ((ScriptObject)propsObj).get(prop), true);
+            }
+        }
+        return sobj;
+    }
+
+    /**
+     * ECMA 15.2.3.8 Object.seal ( O )
+     *
+     * @param self self reference
+     * @param obj  object to seal
+     * @return sealed object
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object seal(final Object self, final Object obj) {
+        Global.checkObject(obj);
+        return ((ScriptObject)obj).seal();
+    }
+
+
+    /**
+     * ECMA 15.2.3.9 Object.freeze ( O )
+     *
+     * @param self self reference
+     * @param obj object to freeze
+     * @return frozen object
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object freeze(final Object self, final Object obj) {
+        Global.checkObject(obj);
+        return ((ScriptObject)obj).freeze();
+    }
+
+    /**
+     * ECMA 15.2.3.10 Object.preventExtensions ( O )
+     *
+     * @param self self reference
+     * @param obj  object, for which to set the internal extensible property to false
+     * @return object
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object preventExtensions(final Object self, final Object obj) {
+        Global.checkObject(obj);
+        return ((ScriptObject)obj).preventExtensions();
+    }
+
+    /**
+     * ECMA 15.2.3.11 Object.isSealed ( O )
+     *
+     * @param self self reference
+     * @param obj check whether an object is sealed
+     * @return true if sealed, false otherwise
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object isSealed(final Object self, final Object obj) {
+        Global.checkObject(obj);
+        return ((ScriptObject)obj).isSealed();
+    }
+
+    /**
+     * ECMA 15.2.3.12 Object.isFrozen ( O )
+     *
+     * @param self self reference
+     * @param obj check whether an object
+     * @return true if object is frozen, false otherwise
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object isFrozen(final Object self, final Object obj) {
+        Global.checkObject(obj);
+        return ((ScriptObject)obj).isFrozen();
+    }
+
+    /**
+     * ECMA 15.2.3.13 Object.isExtensible ( O )
+     *
+     * @param self self reference
+     * @param obj check whether an object is extensible
+     * @return true if object is extensible, false otherwise
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object isExtensible(final Object self, final Object obj) {
+        Global.checkObject(obj);
+        return ((ScriptObject)obj).isExtensible();
+    }
+
+    /**
+     * ECMA 15.2.3.14 Object.keys ( O )
+     *
+     * @param self self reference
+     * @param obj  object from which to extract keys
+     * @return array of keys in object
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
+    public static Object keys(final Object self, final Object obj) {
+        Global.checkObject(obj);
+        final ScriptObject sobj = (ScriptObject)obj;
+        return new NativeArray(sobj.getOwnKeys(false));
+    }
+
+    /**
+     * ECMA 15.2.2.1 , 15.2.1.1 new Object([value]) and Object([value])
+     *
+     * Constructor
+     *
+     * @param newObj is the new object instantiated with the new operator
+     * @param self   self reference
+     * @param value  value of object to be instantiated
+     * @return the new NativeObject
+     */
+    @Constructor
+    public static Object construct(final boolean newObj, final Object self, final Object value) {
+        final JSType type = JSType.of(value);
+
+        // Object(null), Object(undefined), Object() are same as "new Object()"
+
+        if (newObj || (type == JSType.NULL || type == JSType.UNDEFINED)) {
+            switch (type) {
+            case BOOLEAN:
+            case NUMBER:
+            case STRING:
+                return Global.toObject(value);
+            case OBJECT:
+            case FUNCTION:
+                return value;
+            case NULL:
+            case UNDEFINED:
+                // fall through..
+            default:
+                break;
+            }
+
+            return Global.newEmptyInstance();
+        }
+
+        return Global.toObject(value);
+    }
+
+    /**
+     * ECMA 15.2.4.2 Object.prototype.toString ( )
+     *
+     * @param self self reference
+     * @return ToString of object
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object toString(final Object self) {
+        return ScriptRuntime.builtinObjectToString(self);
+    }
+
+    /**
+     * ECMA 15.2.4.3 Object.prototype.toLocaleString ( )
+     *
+     * @param self self reference
+     * @return localized ToString
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object toLocaleString(final Object self) {
+        final Object obj = JSType.toObject(Global.instance(), self);
+        if (obj instanceof ScriptObject) {
+            final ScriptObject sobj = (ScriptObject)self;
+            try {
+                final Object toString = TO_STRING.getGetter().invokeExact(sobj);
+
+                if (toString instanceof ScriptFunction) {
+                    return TO_STRING.getInvoker().invokeExact(toString, sobj);
+                }
+            } catch (final RuntimeException | Error e) {
+                throw e;
+            } catch (final Throwable t) {
+                throw new RuntimeException(t);
+            }
+
+            typeError(Global.instance(), "not.a.function", "toString");
+            throw new AssertionError(); // never reached
+        }
+
+        return ScriptRuntime.builtinObjectToString(self);
+    }
+
+    /**
+     * ECMA 15.2.4.4 Object.prototype.valueOf ( )
+     *
+     * @param self self reference
+     * @return value of object
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object valueOf(final Object self) {
+        return Global.toObject(self);
+    }
+
+    /**
+     * ECMA 15.2.4.5 Object.prototype.hasOwnProperty (V)
+     *
+     * @param self self reference
+     * @param v property to check for
+     * @return true if property exists in object
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object hasOwnProperty(final Object self, final Object v) {
+        final String str = JSType.toString(v);
+        final Object obj = Global.toObject(self);
+
+        return (obj instanceof ScriptObject) && ((ScriptObject)obj).hasOwnProperty(str);
+    }
+
+    /**
+     * ECMA 15.2.4.6 Object.prototype.isPrototypeOf (V)
+     *
+     * @param self self reference
+     * @param v v prototype object to check against
+     * @return true if object is prototype of v
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object isPrototypeOf(final Object self, final Object v) {
+        if (!(v instanceof ScriptObject)) {
+            return false;
+        }
+
+        final Object obj   = Global.toObject(self);
+        ScriptObject proto = (ScriptObject)v;
+
+        do {
+            proto = proto.getProto();
+            if (proto == obj) {
+                return true;
+            }
+        } while (proto != null);
+
+        return false;
+    }
+
+    /**
+     * ECMA 15.2.4.7 Object.prototype.propertyIsEnumerable (V)
+     *
+     * @param self self reference
+     * @param v property to check if enumerable
+     * @return true if property is enumerable
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object propertyIsEnumerable(final Object self, final Object v) {
+        final String str = JSType.toString(v);
+        final Object obj = Global.toObject(self);
+
+        if (obj instanceof ScriptObject) {
+            final jdk.nashorn.internal.runtime.Property property = ((ScriptObject)obj).getMap().findProperty(str);
+            return property != null && property.isEnumerable();
+        }
+
+        return false;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeRangeError.java b/nashorn/src/jdk/nashorn/internal/objects/NativeRangeError.java
new file mode 100644
index 00000000000..af80f38ec72
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeRangeError.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+
+import jdk.nashorn.internal.objects.annotations.Attribute;
+import jdk.nashorn.internal.objects.annotations.Constructor;
+import jdk.nashorn.internal.objects.annotations.Property;
+import jdk.nashorn.internal.objects.annotations.ScriptClass;
+import jdk.nashorn.internal.objects.annotations.Where;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.ScriptObject;
+
+/**
+ * ECMA 15.11.6.2 RangeError
+ *
+ */
+@ScriptClass("Error")
+public class NativeRangeError extends ScriptObject {
+
+    /** message property in instance */
+    @Property(name = NativeError.MESSAGE)
+    public Object instMessage;
+
+    /** error name property */
+    @Property(attributes = Attribute.NOT_ENUMERABLE, where = Where.PROTOTYPE)
+    public Object name;
+
+    /** ECMA 15.1.1.1 message property */
+    @Property(attributes = Attribute.NOT_ENUMERABLE, where = Where.PROTOTYPE)
+    public Object message;
+
+    NativeRangeError(final Object msg) {
+        setProto(Global.instance().getRangeErrorPrototype());
+        if (msg != UNDEFINED) {
+            this.instMessage = JSType.toString(msg);
+        } else {
+            this.delete(NativeError.MESSAGE, Global.isStrict());
+        }
+    }
+
+    @Override
+    public String getClassName() {
+        return "Error";
+    }
+
+    /**
+     * ECMA 15.11.6.2 RangeError
+     *
+     * Constructor
+     *
+     * @param newObj was this error instantiated with the new operator
+     * @param self   self reference
+     * @param msg    error message
+     *
+     * @return new RangeError
+     */
+    @Constructor(name = "RangeError")
+    public static Object constructor(final boolean newObj, final Object self, final Object msg) {
+        return new NativeRangeError(msg);
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeReferenceError.java b/nashorn/src/jdk/nashorn/internal/objects/NativeReferenceError.java
new file mode 100644
index 00000000000..5ac50daeea7
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeReferenceError.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+
+import jdk.nashorn.internal.objects.annotations.Attribute;
+import jdk.nashorn.internal.objects.annotations.Constructor;
+import jdk.nashorn.internal.objects.annotations.Property;
+import jdk.nashorn.internal.objects.annotations.ScriptClass;
+import jdk.nashorn.internal.objects.annotations.Where;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.ScriptObject;
+
+/**
+ * ECMA 15.11.6.3 ReferenceError
+ *
+ */
+@ScriptClass("Error")
+public class NativeReferenceError extends ScriptObject {
+
+    /** message property in instance */
+    @Property(name = NativeError.MESSAGE)
+    public Object instMessage;
+
+    /** error name property */
+    @Property(attributes = Attribute.NOT_ENUMERABLE, where = Where.PROTOTYPE)
+    public Object name;
+
+    /** ECMA 15.1.1.1 message property */
+    @Property(attributes = Attribute.NOT_ENUMERABLE, where = Where.PROTOTYPE)
+    public Object message;
+
+    NativeReferenceError(final Object msg) {
+        this.setProto(Global.instance().getReferenceErrorPrototype());
+        if (msg != UNDEFINED) {
+            this.instMessage = JSType.toString(msg);
+        } else {
+            this.delete(NativeError.MESSAGE, Global.isStrict());
+        }
+    }
+
+    @Override
+    public String getClassName() {
+        return "Error";
+    }
+
+    /**
+     * ECMA 15.11.6.3 ReferenceError
+     *
+     * Constructor
+     *
+     * @param newObj was this error instantiated with the new operator
+     * @param self   self reference
+     * @param msg    error message
+     *
+     * @return new ReferenceError
+     */
+    @Constructor(name = "ReferenceError")
+    public static Object constructor(final boolean newObj, final Object self, final Object msg) {
+        return new NativeReferenceError(msg);
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java b/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java
new file mode 100644
index 00000000000..b3ca9a8d5de
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java
@@ -0,0 +1,772 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import jdk.nashorn.internal.objects.annotations.Attribute;
+import jdk.nashorn.internal.objects.annotations.Constructor;
+import jdk.nashorn.internal.objects.annotations.Function;
+import jdk.nashorn.internal.objects.annotations.Getter;
+import jdk.nashorn.internal.objects.annotations.Property;
+import jdk.nashorn.internal.objects.annotations.ScriptClass;
+import jdk.nashorn.internal.objects.annotations.SpecializedConstructor;
+import jdk.nashorn.internal.parser.RegExp;
+import jdk.nashorn.internal.runtime.BitVector;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.ParserException;
+import jdk.nashorn.internal.runtime.RegExpMatch;
+import jdk.nashorn.internal.runtime.ScriptFunction;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
+
+/**
+ * ECMA 15.10 RegExp Objects.
+ */
+@ScriptClass("RegExp")
+public final class NativeRegExp extends ScriptObject {
+    /** ECMA 15.10.7.5 lastIndex property */
+    @Property(attributes = Attribute.NOT_ENUMERABLE | Attribute.NOT_CONFIGURABLE)
+    public Object lastIndex;
+
+    /** Pattern string. */
+    private String input;
+
+    /** Global search flag for this regexp. */
+    private boolean global;
+
+    /** Case insensitive flag for this regexp */
+    private boolean ignoreCase;
+
+    /** Multi-line flag for this regexp */
+    private boolean multiline;
+
+    /** Java regex pattern to use for match. We compile to one of these */
+    private Pattern pattern;
+
+    private BitVector groupsInNegativeLookahead;
+
+    /*
+    public NativeRegExp() {
+        init();
+    }*/
+
+    NativeRegExp(final String input, final String flagString) {
+        RegExp regExp = null;
+        try {
+            regExp = new RegExp(input, flagString);
+        } catch (final ParserException e) {
+            // translate it as SyntaxError object and throw it
+            e.throwAsEcmaException(Global.instance());
+            throw new AssertionError(); //guard against null warnings below
+        }
+
+        this.setLastIndex(0);
+        this.input = regExp.getInput();
+        this.global = regExp.isGlobal();
+        this.ignoreCase = regExp.isIgnoreCase();
+        this.multiline = regExp.isMultiline();
+        this.pattern = regExp.getPattern();
+        this.groupsInNegativeLookahead = regExp.getGroupsInNegativeLookahead();
+
+        init();
+    }
+
+    NativeRegExp(final String string) {
+        this(string, "");
+    }
+
+    NativeRegExp(final NativeRegExp regExp) {
+        this.input      = regExp.getInput();
+        this.global     = regExp.getGlobal();
+        this.multiline  = regExp.getMultiline();
+        this.ignoreCase = regExp.getIgnoreCase();
+        this.lastIndex  = regExp.getLastIndexObject();
+        this.pattern    = regExp.getPattern();
+        this.groupsInNegativeLookahead = regExp.getGroupsInNegativeLookahead();
+
+        init();
+    }
+
+    NativeRegExp(final Pattern pattern) {
+        this.input      = pattern.pattern();
+        this.multiline  = (pattern.flags() & Pattern.MULTILINE) != 0;
+        this.ignoreCase = (pattern.flags() & Pattern.CASE_INSENSITIVE) != 0;
+        this.lastIndex  = 0;
+        this.pattern    = pattern;
+
+        init();
+    }
+
+    @Override
+    public String getClassName() {
+        return "RegExp";
+    }
+
+    /**
+     * ECMA 15.10.4
+     *
+     * Constructor
+     *
+     * @param isNew is the new operator used for instantiating this regexp
+     * @param self  self reference
+     * @param args  arguments (optional: pattern and flags)
+     * @return new NativeRegExp
+     */
+    @Constructor(arity = 2)
+    public static Object constructor(final boolean isNew, final Object self, final Object... args) {
+        if (args.length > 1) {
+            return newRegExp(args[0], args[1]);
+        } else if (args.length > 0) {
+            return newRegExp(args[0], UNDEFINED);
+        }
+
+        return newRegExp(UNDEFINED, UNDEFINED);
+    }
+
+    /**
+     * ECMA 15.10.4
+     *
+     * Constructor - specialized version, no args, empty regexp
+     *
+     * @param isNew is the new operator used for instantiating this regexp
+     * @param self  self reference
+     * @return new NativeRegExp
+     */
+    @SpecializedConstructor
+    public static Object constructor(final boolean isNew, final Object self) {
+        return new NativeRegExp("", "");
+    }
+
+    /**
+     * ECMA 15.10.4
+     *
+     * Constructor - specialized version, pattern, no flags
+     *
+     * @param isNew is the new operator used for instantiating this regexp
+     * @param self  self reference
+     * @param pattern pattern
+     * @return new NativeRegExp
+     */
+    @SpecializedConstructor
+    public static Object constructor(final boolean isNew, final Object self, final Object pattern) {
+        return newRegExp(pattern, UNDEFINED);
+    }
+
+    /**
+     * ECMA 15.10.4
+     *
+     * Constructor - specialized version, pattern and flags
+     *
+     * @param isNew is the new operator used for instantiating this regexp
+     * @param self  self reference
+     * @param pattern pattern
+     * @param flags  flags
+     * @return new NativeRegExp
+     */
+    @SpecializedConstructor
+    public static Object constructor(final boolean isNew, final Object self, final Object pattern, final Object flags) {
+        return newRegExp(pattern, flags);
+    }
+
+    /**
+     * External constructor used in generated code created by {@link jdk.nashorn.internal.codegen.CodeGenerator}, which
+     * explain the {@code public} access.
+     *
+     * @param regexp regexp
+     * @param flags  flags
+     * @return new NativeRegExp
+     */
+    public static NativeRegExp newRegExp(final Object regexp, final Object flags) {
+        String  patternString = "";
+        String  flagString    = "";
+        boolean flagsDefined  = false;
+
+        if (flags != UNDEFINED) {
+            flagsDefined = true;
+            flagString = JSType.toString(flags);
+        }
+
+        if (regexp != UNDEFINED) {
+            if (regexp instanceof NativeRegExp) {
+                if (!flagsDefined) {
+                    return (NativeRegExp)regexp; // 15.10.3.1 - undefined flags and regexp as
+                }
+                typeError(Global.instance(), "regex.cant.supply.flags");
+            }
+            patternString = JSType.toString(regexp);
+        }
+
+        return new NativeRegExp(patternString, flagString);
+    }
+
+    private String getFlagString() {
+        final StringBuilder sb = new StringBuilder();
+
+        if (global) {
+            sb.append('g');
+        }
+        if (ignoreCase) {
+            sb.append('i');
+        }
+        if (multiline) {
+            sb.append('m');
+        }
+
+        return sb.toString();
+    }
+
+    @Override
+    public String safeToString() {
+        return "[RegExp " + toString() + "]";
+    }
+
+    @Override
+    public String toString() {
+        return "/" + input + "/" + getFlagString();
+    }
+
+    /**
+     * Nashorn extension: RegExp.prototype.compile - everybody implements this!
+     *
+     * @param self    self reference
+     * @param pattern pattern
+     * @param flags   flags
+     * @return new NativeRegExp
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object compile(final Object self, final Object pattern, final Object flags) {
+        final NativeRegExp regExp   = checkRegExp(self);
+        final NativeRegExp compiled = newRegExp(pattern, flags);
+        // copy over fields to 'self'
+        regExp.setInput(compiled.getInput());
+        regExp.setGlobal(compiled.getGlobal());
+        regExp.setIgnoreCase(compiled.getIgnoreCase());
+        regExp.setMultiline(compiled.getMultiline());
+        regExp.setPattern(compiled.getPattern());
+        regExp.setGroupsInNegativeLookahead(compiled.getGroupsInNegativeLookahead());
+
+        // Some implementations return undefined. Some return 'self'. Since return
+        // value is most likely be ignored, we can play safe and return 'self'.
+        return regExp;
+    }
+
+    /**
+     * ECMA 15.10.6.2 RegExp.prototype.exec(string)
+     *
+     * @param self   self reference
+     * @param string string to match against regexp
+     * @return array containing the matches or {@code null} if no match
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object exec(final Object self, final Object string) {
+        return checkRegExp(self).exec(JSType.toString(string));
+    }
+
+    /**
+     * ECMA 15.10.6.3 RegExp.prototype.test(string)
+     *
+     * @param self   self reference
+     * @param string string to test for matches against regexp
+     * @return true if matches found, false otherwise
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object test(final Object self, final Object string) {
+        return checkRegExp(self).test(JSType.toString(string));
+    }
+
+    /**
+     * ECMA 15.10.6.4 RegExp.prototype.toString()
+     *
+     * @param self self reference
+     * @return string version of regexp
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object toString(final Object self) {
+        return checkRegExp(self).toString();
+    }
+
+    /**
+     * ECMA 15.10.7.1 source
+     *
+     * @param self self reference
+     * @return the input string for the regexp
+     */
+    @Getter(attributes = Attribute.NOT_ENUMERABLE | Attribute.NOT_CONFIGURABLE | Attribute.NOT_WRITABLE)
+    public static Object source(final Object self) {
+        return checkRegExp(self).input;
+    }
+
+    /**
+     * ECMA 15.10.7.2 global
+     *
+     * @param self self reference
+     * @return true if this regexp is flagged global, false otherwise
+     */
+    @Getter(attributes = Attribute.NOT_ENUMERABLE | Attribute.NOT_CONFIGURABLE | Attribute.NOT_WRITABLE)
+    public static Object global(final Object self) {
+        return checkRegExp(self).global;
+    }
+
+    /**
+     * ECMA 15.10.7.3 ignoreCase
+     *
+     * @param self self reference
+     * @return true if this regexp if flagged to ignore case, false otherwise
+     */
+    @Getter(attributes = Attribute.NOT_ENUMERABLE | Attribute.NOT_CONFIGURABLE | Attribute.NOT_WRITABLE)
+    public static Object ignoreCase(final Object self) {
+        return checkRegExp(self).ignoreCase;
+    }
+
+    /**
+     * ECMA 15.10.7.4 multiline
+     *
+     * @param self self reference
+     * @return true if this regexp is flagged to be multiline, false otherwise
+     */
+    @Getter(attributes = Attribute.NOT_ENUMERABLE | Attribute.NOT_CONFIGURABLE | Attribute.NOT_WRITABLE)
+    public static Object multiline(final Object self) {
+        return checkRegExp(self).multiline;
+    }
+
+    private RegExpMatch execInner(final String string) {
+        if (this.pattern == null) {
+            return null; // never matches or similar, e.g. a[]
+        }
+
+        final Matcher matcher = pattern.matcher(string);
+        final int start = this.global ? getLastIndex() : 0;
+
+        if (start < 0 || start > string.length()) {
+            setLastIndex(0);
+            return null;
+        }
+
+        if (!matcher.find(start)) {
+            setLastIndex(0);
+            return null;
+        }
+
+        if (global) {
+            setLastIndex(matcher.end());
+        }
+
+        return new RegExpMatch(string, matcher.start(), groups(matcher));
+    }
+
+    /**
+     * Convert java.util.regex.Matcher groups to JavaScript groups.
+     * That is, replace null and groups that didn't match with undefined.
+     */
+    private Object[] groups(final Matcher matcher) {
+        final int groupCount = matcher.groupCount();
+        final Object[] groups = new Object[groupCount + 1];
+        for (int i = 0, lastGroupStart = matcher.start(); i <= groupCount; i++) {
+            final int groupStart = matcher.start(i);
+            if (lastGroupStart > groupStart
+                    || (groupsInNegativeLookahead != null && groupsInNegativeLookahead.isSet(i))) {
+                // (1) ECMA 15.10.2.5 NOTE 3: need to clear Atom's captures each time Atom is repeated.
+                // (2) ECMA 15.10.2.8 NOTE 3: Backreferences to captures in (?!Disjunction) from elsewhere
+                // in the pattern always return undefined because the negative lookahead must fail.
+                groups[i] = UNDEFINED;
+                continue;
+            }
+            final String group = matcher.group(i);
+            groups[i] = group == null ? UNDEFINED : group;
+            lastGroupStart = groupStart;
+        }
+        return groups;
+    }
+
+    /**
+     * Executes a search for a match within a string based on a regular
+     * expression. It returns an array of information or null if no match is
+     * found.
+     *
+     * @param string String to match.
+     * @return NativeArray of matches, string or null.
+     */
+    public Object exec(final String string) {
+        final RegExpMatch m = execInner(string);
+        // the input string
+        if (m == null) {
+            return null;
+        }
+
+        return new NativeRegExpExecResult(m);
+    }
+
+    /**
+     * Executes a search for a match within a string based on a regular
+     * expression.
+     *
+     * @param string String to match.
+     * @return True if a match is found.
+     */
+    public Object test(final String string) {
+        return exec(string) != null;
+    }
+
+    /**
+     * Searches and replaces the regular expression portion (match) with the
+     * replaced text instead. For the "replacement text" parameter, you can use
+     * the keywords $1 to $2 to replace the original text with values from
+     * sub-patterns defined within the main pattern.
+     *
+     * @param string String to match.
+     * @param replacement Replacement string.
+     * @return String with substitutions.
+     */
+    Object replace(final String string, final String replacement, final ScriptFunction function) {
+        final Matcher matcher = pattern.matcher(string);
+        /*
+         * $$ -> $
+         * $& -> the matched substring
+         * $` -> the portion of string that preceeds matched substring
+         * $' -> the portion of string that follows the matched substring
+         * $n -> the nth capture, where n is [1-9] and $n is NOT followed by a decimal digit
+         * $nn -> the nnth capture, where nn is a two digit decimal number [01-99].
+         */
+        String replace = replacement;
+
+        if (!global) {
+            if (!matcher.find()) {
+                return string;
+            }
+
+            final StringBuilder sb = new StringBuilder();
+            if (function != null) {
+                replace = callReplaceValue(function, matcher, string);
+            }
+            appendReplacement(matcher, string, replace, sb, 0);
+            sb.append(string, matcher.end(), string.length());
+            return sb.toString();
+        }
+
+        int end = 0; // a.k.a. lastAppendPosition
+        setLastIndex(0);
+
+        boolean found;
+        try {
+            found = matcher.find(end);
+        } catch (final IndexOutOfBoundsException e) {
+            found = false;
+        }
+
+        if (!found) {
+            return string;
+        }
+
+        int previousLastIndex = 0;
+        final StringBuilder sb = new StringBuilder();
+        do {
+            if (function != null) {
+                replace = callReplaceValue(function, matcher, string);
+            }
+            appendReplacement(matcher, string, replace, sb, end);
+            end = matcher.end();
+
+            // ECMA 15.5.4.10 String.prototype.match(regexp)
+            final int thisIndex = end;
+            if (thisIndex == previousLastIndex) {
+                setLastIndex(thisIndex + 1);
+                previousLastIndex = thisIndex + 1;
+            } else {
+                previousLastIndex = thisIndex;
+            }
+        } while (matcher.find());
+
+        sb.append(string, end, string.length());
+
+        return sb.toString();
+    }
+
+    private void appendReplacement(final Matcher matcher, final String text, final String replacement, final StringBuilder sb, final int lastAppendPosition) {
+        // Process substitution string to replace group references with groups
+        int cursor = 0;
+        final StringBuilder result = new StringBuilder();
+        Object[] groups = null;
+
+        while (cursor < replacement.length()) {
+            char nextChar = replacement.charAt(cursor);
+            if (nextChar == '$') {
+                // Skip past $
+                cursor++;
+                nextChar = replacement.charAt(cursor);
+                final int firstDigit = nextChar - '0';
+
+                if (firstDigit >= 0 && firstDigit <= 9 && firstDigit <= matcher.groupCount()) {
+                    // $0 is not supported, but $01 is. implementation-defined: if n>m, ignore second digit.
+                    int refNum = firstDigit;
+                    cursor++;
+                    if (cursor < replacement.length() && firstDigit < matcher.groupCount()) {
+                        final int secondDigit = replacement.charAt(cursor) - '0';
+                        if ((secondDigit >= 0) && (secondDigit <= 9)) {
+                            final int newRefNum = (firstDigit * 10) + secondDigit;
+                            if (newRefNum <= matcher.groupCount() && newRefNum > 0) {
+                                // $nn ($01-$99)
+                                refNum = newRefNum;
+                                cursor++;
+                            }
+                        }
+                    }
+                    if (refNum > 0) {
+                        if (groups == null) {
+                            groups = groups(matcher);
+                        }
+                        // Append group if matched.
+                        if (groups[refNum] != UNDEFINED) {
+                            result.append((String) groups[refNum]);
+                        }
+                    } else { // $0. ignore.
+                        assert refNum == 0;
+                        result.append("$0");
+                    }
+                } else if (nextChar == '$') {
+                    result.append('$');
+                    cursor++;
+                } else if (nextChar == '&') {
+                    result.append(matcher.group());
+                    cursor++;
+                } else if (nextChar == '`') {
+                    result.append(text.substring(0, matcher.start()));
+                    cursor++;
+                } else if (nextChar == '\'') {
+                    result.append(text.substring(matcher.end()));
+                    cursor++;
+                } else {
+                    // unknown substitution or $n with n>m. skip.
+                    result.append('$');
+                }
+            } else {
+                result.append(nextChar);
+                cursor++;
+            }
+        }
+        // Append the intervening text
+        sb.append(text, lastAppendPosition, matcher.start());
+        // Append the match substitution
+        sb.append(result);
+    }
+
+    private String callReplaceValue(final ScriptFunction function, final Matcher matcher, final String string) {
+        final Object[] groups = groups(matcher);
+        final Object[] args   = Arrays.copyOf(groups, groups.length + 2);
+
+        args[groups.length]     = matcher.start();
+        args[groups.length + 1] = string;
+
+        final Object self = function.isStrict() ? UNDEFINED : Global.instance();
+
+        return JSType.toString(ScriptRuntime.apply(function, self, args));
+    }
+
+    /**
+     * Breaks up a string into an array of substrings based on a regular
+     * expression or fixed string.
+     *
+     * @param string String to match.
+     * @param limit  Split limit.
+     * @return Array of substrings.
+     */
+    Object split(final String string, final long limit) {
+        return split(this, string, limit);
+    }
+
+    private static Object split(final NativeRegExp regexp0, final String input, final long limit) {
+        final List<Object> matches = new ArrayList<>();
+
+        final NativeRegExp regexp = new NativeRegExp(regexp0);
+        regexp.setGlobal(true);
+
+        if (limit == 0L) {
+            return new NativeArray();
+        }
+
+        RegExpMatch match;
+        final int inputLength = input.length();
+        int lastLength = -1;
+        int lastLastIndex = 0;
+
+        while ((match = regexp.execInner(input)) != null) {
+            final int lastIndex = match.getIndex() + match.length();
+
+            if (lastIndex > lastLastIndex) {
+                matches.add(input.substring(lastLastIndex, match.getIndex()));
+                if (match.getGroups().length > 1 && match.getIndex() < inputLength) {
+                    matches.addAll(Arrays.asList(match.getGroups()).subList(1, match.getGroups().length));
+                }
+
+                lastLength = match.length();
+                lastLastIndex = lastIndex;
+
+                if (matches.size() >= limit) {
+                    break;
+                }
+            }
+
+            // bump the index to avoid infinite loop
+            if (regexp.getLastIndex() == match.getIndex()) {
+                regexp.setLastIndex(match.getIndex() + 1);
+            }
+        }
+
+        if (matches.size() < limit) {
+            // check special case if we need to append an empty string at the
+            // end of the match
+            // if the lastIndex was the entire string
+            if (lastLastIndex == input.length()) {
+                if (lastLength > 0 || regexp.test("") == Boolean.FALSE) {
+                    matches.add("");
+                }
+            } else {
+                matches.add(input.substring(lastLastIndex, inputLength));
+            }
+        }
+
+        return new NativeArray(matches.toArray());
+    }
+
+    /**
+     * Tests for a match in a string. It returns the index of the match, or -1
+     * if not found.
+     *
+     * @param string String to match.
+     * @return Index of match.
+     */
+    Object search(final String string) {
+        final Matcher matcher = pattern.matcher(string);
+
+        int start = 0;
+        if (global) {
+            start = getLastIndex();
+        }
+
+        start = matcher.find(start) ? matcher.start() : -1;
+
+        if (global) {
+            setLastIndex(matcher.end());
+        }
+
+        return start;
+    }
+
+    /**
+     * Fast lastIndex getter
+     * @return last index property as int
+     */
+    public int getLastIndex() {
+        return JSType.toInt32(lastIndex);
+    }
+
+    /**
+     * Fast lastIndex getter
+     * @return last index property as boxed integer
+     */
+    public Object getLastIndexObject() {
+        return lastIndex;
+    }
+
+    /**
+     * Fast lastIndex setter
+     * @param lastIndex lastIndex
+     */
+    public void setLastIndex(final int lastIndex) {
+        this.lastIndex = JSType.toObject(lastIndex);
+    }
+
+    private void init() {
+        this.setProto(Global.instance().getRegExpPrototype());
+    }
+
+    private static NativeRegExp checkRegExp(final Object self) {
+        Global.checkObjectCoercible(self);
+        if (self instanceof NativeRegExp) {
+            return (NativeRegExp)self;
+        } else if (self != null && self == Global.instance().getRegExpPrototype()) {
+            return Global.instance().DEFAULT_REGEXP;
+        } else {
+            typeError(Global.instance(), "not.a.regexp", ScriptRuntime.safeToString(self));
+            return null;
+        }
+    }
+
+    private String getInput() {
+        return input;
+    }
+
+    private void setInput(final String input) {
+        this.input = input;
+    }
+
+    boolean getGlobal() {
+        return global;
+    }
+
+    private void setGlobal(final boolean global) {
+        this.global = global;
+    }
+
+    private boolean getIgnoreCase() {
+        return ignoreCase;
+    }
+
+    private void setIgnoreCase(final boolean ignoreCase) {
+        this.ignoreCase = ignoreCase;
+    }
+
+    private boolean getMultiline() {
+        return multiline;
+    }
+
+    private void setMultiline(final boolean multiline) {
+        this.multiline = multiline;
+    }
+
+    private Pattern getPattern() {
+        return pattern;
+    }
+
+    private void setPattern(final Pattern pattern) {
+        this.pattern = pattern;
+    }
+
+    private BitVector getGroupsInNegativeLookahead() {
+        return groupsInNegativeLookahead;
+    }
+
+    private void setGroupsInNegativeLookahead(final BitVector groupsInNegativeLookahead) {
+        this.groupsInNegativeLookahead = groupsInNegativeLookahead;
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeRegExpExecResult.java b/nashorn/src/jdk/nashorn/internal/objects/NativeRegExpExecResult.java
new file mode 100644
index 00000000000..2f2bdff8b73
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeRegExpExecResult.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+import jdk.nashorn.internal.objects.annotations.Attribute;
+import jdk.nashorn.internal.objects.annotations.Getter;
+import jdk.nashorn.internal.objects.annotations.Property;
+import jdk.nashorn.internal.objects.annotations.ScriptClass;
+import jdk.nashorn.internal.objects.annotations.Setter;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.RegExpMatch;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.arrays.ArrayData;
+
+/**
+ * Objects of this class are used to represent return values from
+ * RegExp.prototype.exec method.
+ */
+@ScriptClass("RegExpExecResult")
+public class NativeRegExpExecResult extends ScriptObject {
+    /** index property */
+    @Property
+    public Object index;
+
+    /** input property */
+    @Property
+    public Object input;
+
+    NativeRegExpExecResult(final RegExpMatch match) {
+        setProto(Global.instance().getArrayPrototype());
+        this.setArray(ArrayData.allocate(match.getGroups().clone()));
+        this.index = match.getIndex();
+        this.input = match.getInput();
+    }
+
+    /**
+     * Length getter
+     * @param self self reference
+     * @return length property value
+     */
+    @Getter(attributes = Attribute.NOT_ENUMERABLE | Attribute.NOT_CONFIGURABLE)
+    public static Object length(final Object self) {
+        if (self instanceof ScriptObject) {
+            return ((ScriptObject)self).getArray().length() & JSType.MAX_UINT;
+        }
+
+        return 0;
+    }
+
+    /**
+     * Length setter
+     * @param self self reference
+     * @param length property value
+     */
+    @Setter(attributes = Attribute.NOT_ENUMERABLE | Attribute.NOT_CONFIGURABLE)
+    public static void length(final Object self, final Object length) {
+        if (self instanceof ScriptObject) {
+            ((ScriptObject)self).setLength(NativeArray.validLength(length, true));
+        }
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeStrictArguments.java b/nashorn/src/jdk/nashorn/internal/objects/NativeStrictArguments.java
new file mode 100644
index 00000000000..c32ea2736d9
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeStrictArguments.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.util.Arrays;
+import jdk.nashorn.internal.runtime.Property;
+import jdk.nashorn.internal.runtime.PropertyMap;
+import jdk.nashorn.internal.runtime.ScriptFunction;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.arrays.ArrayData;
+import jdk.nashorn.internal.runtime.linker.Lookup;
+
+/**
+ * ECMA 10.6 Arguments Object.
+ *
+ * Arguments object for strict mode functions.
+ */
+public final class NativeStrictArguments extends ScriptObject {
+
+    private static final MethodHandle G$LENGTH = findOwnMH("G$length", Object.class, Object.class);
+
+    private static final MethodHandle S$LENGTH = findOwnMH("S$length", void.class, Object.class, Object.class);
+
+    // property map for strict mode arguments object
+    private static final PropertyMap nasgenmap$;
+
+    static {
+        PropertyMap map = PropertyMap.newMap(NativeStrictArguments.class);
+        map = Lookup.newProperty(map, "length", Property.NOT_ENUMERABLE, G$LENGTH, S$LENGTH);
+        // In strict mode, the caller and callee properties should throw TypeError
+        map = ScriptFunctionImpl.newThrowerProperty(map, "caller", Property.NOT_ENUMERABLE | Property.NOT_CONFIGURABLE);
+        map = ScriptFunctionImpl.newThrowerProperty(map, "callee", Property.NOT_ENUMERABLE | Property.NOT_CONFIGURABLE);
+        nasgenmap$ = map;
+    }
+
+    private Object   length;
+    private final Object[] namedArgs;
+
+    NativeStrictArguments(final Object[] values, final int numParams) {
+        super(nasgenmap$);
+        setIsArguments();
+
+        final ScriptFunction func = ScriptFunctionImpl.getTypeErrorThrower();
+        // We have to fill user accessor functions late as these are stored
+        // in this object rather than in the PropertyMap of this object.
+        setUserAccessors("caller", func, func);
+        setUserAccessors("callee", func, func);
+
+        setArray(ArrayData.allocate(values));
+        this.length = values.length;
+
+        // extend/truncate named arg array as needed and copy values
+        this.namedArgs = new Object[numParams];
+        if (numParams > values.length) {
+            Arrays.fill(namedArgs, UNDEFINED);
+        }
+        System.arraycopy(values, 0, namedArgs, 0, Math.min(namedArgs.length, values.length));
+
+        this.setProto(Global.objectPrototype());
+    }
+
+    @Override
+    public String getClassName() {
+        return "Arguments";
+    }
+
+    /**
+     * getArgument is used for named argument access.
+     */
+    @Override
+    public Object getArgument(final int key) {
+        return (key >=0 && key < namedArgs.length) ? namedArgs[key] : UNDEFINED;
+    }
+
+    /**
+     * setArgument is used for named argument set.
+     */
+    @Override
+    public void setArgument(final int key, final Object value) {
+        if (key >= 0 && key < namedArgs.length) {
+            namedArgs[key] = value;
+        }
+    }
+
+    /**
+     * Length getter
+     * @param self self reference
+     * @return length property value
+     */
+    public static Object G$length(final Object self) {
+        if (self instanceof NativeStrictArguments) {
+            return ((NativeStrictArguments)self).getArgumentsLength();
+        }
+        return 0;
+    }
+
+    /**
+     * Length setter
+     * @param self self reference
+     * @param value value for length property
+     */
+    public static void S$length(final Object self, final Object value) {
+        if (self instanceof NativeStrictArguments) {
+            ((NativeStrictArguments)self).setArgumentsLength(value);
+        }
+    }
+
+    private Object getArgumentsLength() {
+        return length;
+    }
+
+    private void setArgumentsLength(final Object length) {
+        this.length = length;
+    }
+
+    private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
+        return MH.findStatic(MethodHandles.lookup(), NativeStrictArguments.class, name, MH.type(rtype, types));
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeString.java b/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
new file mode 100644
index 00000000000..99a594cf3ad
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
@@ -0,0 +1,937 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static jdk.nashorn.internal.runtime.JSType.isRepresentableAsInt;
+import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static jdk.nashorn.internal.runtime.arrays.ArrayIndex.getArrayIndexNoThrow;
+import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.text.Collator;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.regex.Pattern;
+import jdk.nashorn.internal.objects.annotations.Attribute;
+import jdk.nashorn.internal.objects.annotations.Constructor;
+import jdk.nashorn.internal.objects.annotations.Function;
+import jdk.nashorn.internal.objects.annotations.Getter;
+import jdk.nashorn.internal.objects.annotations.ScriptClass;
+import jdk.nashorn.internal.objects.annotations.SpecializedConstructor;
+import jdk.nashorn.internal.objects.annotations.SpecializedFunction;
+import jdk.nashorn.internal.objects.annotations.Where;
+import jdk.nashorn.internal.parser.Lexer;
+import jdk.nashorn.internal.runtime.ConsString;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.ScriptFunction;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
+import jdk.nashorn.internal.runtime.arrays.ArrayIndex;
+import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
+import jdk.nashorn.internal.runtime.linker.NashornGuards;
+import jdk.nashorn.internal.runtime.linker.PrimitiveLookup;
+import org.dynalang.dynalink.linker.GuardedInvocation;
+
+
+/**
+ * ECMA 15.5 String Objects.
+ */
+@ScriptClass("String")
+public final class NativeString extends ScriptObject {
+
+    private final CharSequence value;
+
+    private static final MethodHandle WRAPFILTER = findWrapFilter();
+
+    NativeString(final CharSequence value) {
+        this(value, Global.instance().getStringPrototype());
+    }
+
+    private NativeString(final CharSequence value, final ScriptObject proto) {
+        assert value instanceof String || value instanceof ConsString;
+        this.value = value;
+        this.setProto(proto);
+    }
+
+    @Override
+    public String safeToString() {
+        return "[String " + toString() + "]";
+    }
+
+    @Override
+    public String toString() {
+        return getStringValue();
+    }
+
+    @Override
+    public boolean equals(final Object other) {
+        if (other instanceof NativeString) {
+            return getStringValue().equals(((NativeString) other).getStringValue());
+        }
+
+        return false;
+    }
+
+    @Override
+    public int hashCode() {
+        return getStringValue().hashCode();
+    }
+
+    private String getStringValue() {
+        return value instanceof String ? (String) value : value.toString();
+    }
+
+    private CharSequence getValue() {
+        return value;
+    }
+
+    @Override
+    public String getClassName() {
+        return "String";
+    }
+
+    @Override
+    public Object getLength() {
+        return value.length();
+    }
+
+    // String characters can be accessed with array-like indexing..
+    @Override
+    public Object get(final Object key) {
+        final int index = getArrayIndexNoThrow(key);
+        if (index >= 0 && index < value.length()) {
+            return String.valueOf(value.charAt(index));
+        }
+        return super.get(key);
+    }
+
+    @Override
+    public Object get(final double key) {
+        if (isRepresentableAsInt(key)) {
+            return get((int)key);
+        }
+        return super.get(key);
+    }
+
+    @Override
+    public Object get(final long key) {
+        if (key >= 0 && key < value.length()) {
+            return String.valueOf(value.charAt((int)key));
+        }
+        return super.get(key);
+    }
+
+    @Override
+    public Object get(final int key) {
+        if (key >= 0 && key < value.length()) {
+            return String.valueOf(value.charAt(key));
+        }
+        return super.get(key);
+    }
+
+    @Override
+    public int getInt(final Object key) {
+        return JSType.toInt32(get(key));
+    }
+
+    @Override
+    public int getInt(final double key) {
+        return JSType.toInt32(get(key));
+    }
+
+    @Override
+    public int getInt(final long key) {
+        return JSType.toInt32(get(key));
+    }
+
+    @Override
+    public int getInt(final int key) {
+        return JSType.toInt32(get(key));
+    }
+
+    @Override
+    public long getLong(final Object key) {
+        return JSType.toUint32(get(key));
+    }
+
+    @Override
+    public long getLong(final double key) {
+        return JSType.toUint32(get(key));
+    }
+
+    @Override
+    public long getLong(final long key) {
+        return JSType.toUint32(get(key));
+    }
+
+    @Override
+    public long getLong(final int key) {
+        return JSType.toUint32(get(key));
+    }
+
+    @Override
+    public double getDouble(final Object key) {
+        return JSType.toNumber(get(key));
+    }
+
+    @Override
+    public double getDouble(final double key) {
+        return JSType.toNumber(get(key));
+    }
+
+    @Override
+    public double getDouble(final long key) {
+        return JSType.toNumber(get(key));
+    }
+
+    @Override
+    public double getDouble(final int key) {
+        return JSType.toNumber(get(key));
+    }
+
+    @Override
+    public boolean has(final Object key) {
+        final int index = getArrayIndexNoThrow(key);
+        return isValid(index) || super.has(key);
+    }
+
+    @Override
+    public boolean has(final int key) {
+        return isValid(key) || super.has(key);
+    }
+
+    @Override
+    public boolean has(final long key) {
+        final int index = getArrayIndexNoThrow(key);
+        return isValid(index) || super.has(key);
+    }
+
+    @Override
+    public boolean has(final double key) {
+        final int index = getArrayIndexNoThrow(key);
+        return isValid(index) || super.has(key);
+    }
+
+    @Override
+    public boolean hasOwnProperty(final Object key) {
+        final int index = getArrayIndexNoThrow(key);
+        return isValid(index) || super.hasOwnProperty(key);
+    }
+
+    @Override
+    public boolean hasOwnProperty(final int key) {
+        return isValid(key) || super.hasOwnProperty(key);
+    }
+
+    @Override
+    public boolean hasOwnProperty(final long key) {
+        final int index = getArrayIndexNoThrow(key);
+        return isValid(index) || super.hasOwnProperty(key);
+    }
+
+    @Override
+    public boolean hasOwnProperty(final double key) {
+        final int index = getArrayIndexNoThrow(key);
+        return isValid(index) || super.hasOwnProperty(key);
+    }
+
+    @Override
+    public boolean delete(final int key, final boolean strict) {
+        return checkDeleteIndex(key, strict)? false : super.delete(key, strict);
+    }
+
+    @Override
+    public boolean delete(final long key, final boolean strict) {
+        final int index = getArrayIndexNoThrow(key);
+        return checkDeleteIndex(index, strict)? false : super.delete(key, strict);
+    }
+
+    @Override
+    public boolean delete(final double key, final boolean strict) {
+        final int index = getArrayIndexNoThrow(key);
+        return checkDeleteIndex(index, strict)? false : super.delete(key, strict);
+    }
+
+    @Override
+    public boolean delete(final Object key, final boolean strict) {
+        final int index = getArrayIndexNoThrow(key);
+        return checkDeleteIndex(index, strict)? false : super.delete(key, strict);
+    }
+
+    private boolean checkDeleteIndex(final int index, final boolean strict) {
+        if (isValid(index)) {
+            if (strict) {
+                typeError(Global.instance(), "cant.delete.property", Integer.toString(index), ScriptRuntime.safeToString(this));
+            }
+            return true;
+        }
+
+        return false;
+    }
+
+    @Override
+    public Object getOwnPropertyDescriptor(final String key) {
+        final int index = ArrayIndex.getArrayIndexNoThrow(key);
+        if (index >= 0 && index < value.length()) {
+            final Global global = Global.instance();
+            return global.newDataDescriptor(String.valueOf(value.charAt(index)), false, true, false);
+        }
+
+        return super.getOwnPropertyDescriptor(key);
+    }
+
+    /**
+     * return a List of own keys associated with the object.
+     * @param all True if to include non-enumerable keys.
+     * @return Array of keys.
+     */
+    @Override
+    public String[] getOwnKeys(final boolean all) {
+        final List<Object> keys = new ArrayList<>();
+
+        // add string index keys
+        for (int i = 0; i < value.length(); i++) {
+            keys.add(JSType.toString(i));
+        }
+
+        // add super class properties
+        keys.addAll(Arrays.asList(super.getOwnKeys(all)));
+        return keys.toArray(new String[keys.size()]);
+    }
+
+    /**
+     * ECMA 15.5.3 String.length
+     * @param self self reference
+     * @return     value of length property for string
+     */
+    @Getter(attributes = Attribute.NOT_ENUMERABLE | Attribute.NOT_WRITABLE | Attribute.NOT_CONFIGURABLE)
+    public static Object length(final Object self) {
+        return getCharSequence(self).length();
+    }
+
+    /**
+     * ECMA 15.5.3.2 String.fromCharCode ( [ char0 [ , char1 [ , ... ] ] ] )
+     * @param self  self reference
+     * @param args  array of arguments to be interpreted as char
+     * @return string with arguments translated to charcodes
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1, where = Where.CONSTRUCTOR)
+    public static Object fromCharCode(final Object self, final Object... args) {
+        final char[] buf = new char[args.length];
+        int index = 0;
+        for (final Object arg : args) {
+            buf[index++] = (char)JSType.toUint16(arg);
+        }
+        return new String(buf);
+    }
+
+    /**
+     * ECMA 15.5.3.2 - specialization for one char
+     * @param self  self reference
+     * @param value one argument to be interpreted as char
+     * @return string with one charcode
+     */
+    @SpecializedFunction
+    public static Object fromCharCode(final Object self, final Object value) {
+        try {
+            return "" + (char)JSType.toUint16(((Number)value).doubleValue());
+        } catch (final ClassCastException e) {
+            return fromCharCode(self, new Object[] { value });
+        }
+    }
+
+    /**
+     * ECMA 15.5.3.2 - specialization for one char of int type
+     * @param self  self reference
+     * @param value one argument to be interpreted as char
+     * @return string with one charcode
+     */
+    @SpecializedFunction
+    public static Object fromCharCode(final Object self, final int value) {
+        return "" + (char)(value & 0xffff);
+    }
+
+    /**
+     * ECMA 15.5.3.2 - specialization for one char of long type
+     * @param self  self reference
+     * @param value one argument to be interpreted as char
+     * @return string with one charcode
+     */
+    @SpecializedFunction
+    public static Object fromCharCode(final Object self, final long value) {
+        return "" + (char)((int)value & 0xffff);
+    }
+
+    /**
+     * ECMA 15.5.3.2 - specialization for one char of double type
+     * @param self  self reference
+     * @param value one argument to be interpreted as char
+     * @return string with one charcode
+     */
+    @SpecializedFunction
+    public static Object fromCharCode(final Object self, final double value) {
+        return "" + (char)JSType.toUint16(value);
+    }
+
+    /**
+     * ECMA 15.5.4.2 String.prototype.toString ( )
+     * @param self self reference
+     * @return self as string
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object toString(final Object self) {
+        return getString(self);
+    }
+
+    /**
+     * ECMA 15.5.4.3 String.prototype.valueOf ( )
+     * @param self self reference
+     * @return self as string
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object valueOf(final Object self) {
+        return getString(self);
+    }
+
+    /**
+     * ECMA 15.5.4.4 String.prototype.charAt (pos)
+     * @param self self reference
+     * @param pos  position in string
+     * @return string representing the char at the given position
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object charAt(final Object self, final Object pos) {
+        try {
+            return String.valueOf(((String)self).charAt(((Number)pos).intValue()));
+        } catch (final ClassCastException | IndexOutOfBoundsException | NullPointerException e) {
+            Global.checkObjectCoercible(self);
+            final String str = JSType.toString(self);
+            final int    at  = JSType.toInteger(pos);
+            if (at < 0 || at >= str.length()) {
+                return "";
+            }
+            return String.valueOf(str.charAt(at));
+        }
+    }
+
+    /**
+     * ECMA 15.5.4.5 String.prototype.charCodeAt (pos)
+     * @param self self reference
+     * @param pos  position in string
+     * @return number representing charcode at position
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object charCodeAt(final Object self, final Object pos) {
+        try {
+            return (int)((String)self).charAt(((Number)pos).intValue());
+        } catch (final ClassCastException | IndexOutOfBoundsException | NullPointerException e) {
+            Global.checkObjectCoercible(self);
+            final String str = JSType.toString(self);
+            final int at     = JSType.toInteger(pos);
+            if (at < 0 || at >= str.length()) {
+                return Double.NaN;
+            }
+
+            return JSType.toObject(str.charAt(at));
+        }
+    }
+
+    /**
+     * ECMA 15.5.4.6 String.prototype.concat ( [ string1 [ , string2 [ , ... ] ] ] )
+     * @param self self reference
+     * @param args list of string to concatenate
+     * @return concatenated string
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
+    public static Object concat(final Object self, final Object... args) {
+        Global.checkObjectCoercible(self);
+        final StringBuilder sb = new StringBuilder(JSType.toString(self));
+        if (args != null) {
+            for (final Object obj : args) {
+                sb.append(JSType.toString(obj));
+            }
+        }
+        return sb.toString();
+    }
+
+    /**
+     * ECMA 15.5.4.7 String.prototype.indexOf (searchString, position)
+     * @param self   self reference
+     * @param search string to search for
+     * @param pos    position to start search
+     * @return position of first match or -1
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
+    public static Object indexOf(final Object self, final Object search, final Object pos) {
+        try {
+            return ((String)self).indexOf((String)search, ((Number)pos).intValue()); //assuming that the conversions really mean "toInteger" and not "toInt32" this is ok.
+        } catch (final ClassCastException | IndexOutOfBoundsException | NullPointerException e) {
+            Global.checkObjectCoercible(self);
+            return JSType.toString(self).indexOf(JSType.toString(search), JSType.toInteger(pos));
+        }
+    }
+
+    /**
+     * ECMA 15.5.4.8 String.prototype.lastIndexOf (searchString, position)
+     * @param self   self reference
+     * @param search string to search for
+     * @param pos    position to start search
+     * @return last position of match or -1
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
+    public static Object lastIndexOf(final Object self, final Object search, final Object pos) {
+        Global.checkObjectCoercible(self);
+
+        final String str       = JSType.toString(self);
+        final String searchStr = JSType.toString(search);
+
+        int from;
+
+        if (pos == UNDEFINED) {
+            from = str.length();
+        } else {
+            final double numPos = JSType.toNumber(pos);
+            from = !Double.isNaN(numPos) ? (int)numPos : (int)Double.POSITIVE_INFINITY;
+        }
+
+        return str.lastIndexOf(searchStr, from);
+    }
+
+    /**
+     * ECMA 15.5.4.9 String.prototype.localeCompare (that)
+     * @param self self reference
+     * @param that comparison object
+     * @return result of locale sensitive comparison operation between {@code self} and {@code that}
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object localeCompare(final Object self, final Object that) {
+        Global.checkObjectCoercible(self);
+
+        final String   str      = JSType.toString(self);
+        final Collator collator = Collator.getInstance(Global.getThisContext().getLocale());
+
+        collator.setStrength(Collator.IDENTICAL);
+        collator.setDecomposition(Collator.CANONICAL_DECOMPOSITION);
+
+        return (double)collator.compare(str, JSType.toString(that));
+    }
+
+    /**
+     * ECMA 15.5.4.10 String.prototype.match (regexp)
+     * @param self   self reference
+     * @param regexp regexp expression
+     * @return array of regexp matches
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object match(final Object self, final Object regexp) {
+        Global.checkObjectCoercible(self);
+
+        final String str = JSType.toString(self);
+
+        NativeRegExp nativeRegExp;
+        if (regexp == UNDEFINED) {
+            nativeRegExp = new NativeRegExp("");
+        } else {
+            nativeRegExp = Global.toRegExp(regexp);
+        }
+
+        if (!nativeRegExp.getGlobal()) {
+            return nativeRegExp.exec(str);
+        }
+
+        nativeRegExp.setLastIndex(0);
+
+        int previousLastIndex = 0;
+        final List<Object> matches = new ArrayList<>();
+
+        Object result;
+        while ((result = nativeRegExp.exec(str)) != null) {
+            final int thisIndex = nativeRegExp.getLastIndex();
+            if (thisIndex == previousLastIndex) {
+                nativeRegExp.setLastIndex(thisIndex + 1);
+                previousLastIndex = thisIndex + 1;
+            } else {
+                previousLastIndex = thisIndex;
+            }
+            matches.add(((ScriptObject)result).get(0));
+        }
+
+        if (matches.isEmpty()) {
+            return null;
+        }
+
+        return new NativeArray(matches.toArray());
+    }
+
+    /**
+     * ECMA 15.5.4.11 String.prototype.replace (searchValue, replaceValue)
+     * @param self        self reference
+     * @param string      item to replace
+     * @param replacement item to replace it with
+     * @return string after replacement
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object replace(final Object self, final Object string, final Object replacement) {
+        Global.checkObjectCoercible(self);
+
+        final String str = JSType.toString(self);
+
+        final NativeRegExp nativeRegExp;
+        if (string instanceof NativeRegExp) {
+            nativeRegExp = (NativeRegExp) string;
+        } else {
+            nativeRegExp = new NativeRegExp(Pattern.compile(JSType.toString(string), Pattern.LITERAL));
+        }
+
+        if (replacement instanceof ScriptFunction) {
+            return nativeRegExp.replace(str, "", (ScriptFunction)replacement);
+        }
+
+        return nativeRegExp.replace(str, JSType.toString(replacement), null);
+    }
+
+    /**
+     * ECMA 15.5.4.12 String.prototype.search (regexp)
+     *
+     * @param self    self reference
+     * @param string  string to search for
+     * @return offset where match occurred
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object search(final Object self, final Object string) {
+        Global.checkObjectCoercible(self);
+
+        final String       str          = JSType.toString(self);
+        final NativeRegExp nativeRegExp = Global.toRegExp(string == UNDEFINED ? "" : string);
+
+        return nativeRegExp.search(str);
+    }
+
+    /**
+     * ECMA 15.5.4.13 String.prototype.slice (start, end)
+     *
+     * @param self  self reference
+     * @param start start position for slice
+     * @param end   end position for slice
+     * @return sliced out substring
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object slice(final Object self, final Object start, final Object end) {
+        Global.checkObjectCoercible(self);
+
+        final String str      = JSType.toString(self);
+        final int    len      = str.length();
+        final int    intStart = JSType.toInteger(start);
+        final int    intEnd   = (end == UNDEFINED) ? len : JSType.toInteger(end);
+
+        int from;
+
+        if (intStart < 0) {
+            from = Math.max(len + intStart, 0);
+        } else {
+            from = Math.min(intStart, len);
+        }
+
+        int to;
+
+        if (intEnd < 0) {
+            to = Math.max(len + intEnd,0);
+        } else {
+            to = Math.min(intEnd, len);
+        }
+
+        return str.substring(Math.min(from,  to), to);
+    }
+
+    /**
+     * ECMA 15.5.4.14 String.prototype.split (separator, limit)
+     *
+     * @param self      self reference
+     * @param separator separator for split
+     * @param limit     limit for splits
+     * @return array object in which splits have been placed
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object split(final Object self, final Object separator, final Object limit) {
+        Global.checkObjectCoercible(self);
+
+        final String str = JSType.toString(self);
+
+        if (separator == UNDEFINED) {
+            return new NativeArray(new Object[]{str});
+        }
+
+        final long lim = (limit == UNDEFINED) ? JSType.MAX_UINT : JSType.toUint32(limit);
+
+        if (separator instanceof NativeRegExp) {
+            return ((NativeRegExp) separator).split(str, lim);
+        }
+
+        // when separator is a string, it has to be treated as a
+        // literal search string to be used for splitting.
+        return new NativeRegExp(Pattern.compile(JSType.toString(separator), Pattern.LITERAL)).split(str, lim);
+    }
+
+    /**
+     * ECMA B.2.3 String.prototype.substr (start, length)
+     *
+     * @param self   self reference
+     * @param start  start position
+     * @param length length of section
+     * @return substring given start and length of section
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object substr(final Object self, final Object start, final Object length) {
+        final String str       = JSType.toString(self);
+        final int    strLength = str.length();
+
+        int intStart = JSType.toInteger(start);
+        if (intStart < 0) {
+            intStart = Math.max(intStart + strLength, 0);
+        }
+
+        final int intLen = Math.min(Math.max((length == UNDEFINED) ? Integer.MAX_VALUE : JSType.toInteger(length), 0), strLength - intStart);
+
+        return intLen <= 0 ? "" : str.substring(intStart, intStart + intLen);
+    }
+
+    /**
+     * ECMA 15.5.4.15 String.prototype.substring (start, end)
+     *
+     * @param self  self reference
+     * @param start start position of substring
+     * @param end   end position of substring
+     * @return substring given start and end indexes
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object substring(final Object self, final Object start, final Object end) {
+        Global.checkObjectCoercible(self);
+
+        final String str        = JSType.toString(self);
+        final int    len        = str.length();
+        final int    intStart   = JSType.toInteger(start);
+        final int    intEnd     = (end == UNDEFINED) ? len : JSType.toInteger(end);
+        final int    finalStart = Math.min((intStart < 0) ? 0 : intStart, len);
+        final int    finalEnd   = Math.min((intEnd < 0) ? 0 : intEnd, len);
+
+        int from, to;
+
+        if (finalStart < finalEnd) {
+            from = finalStart;
+            to = finalEnd;
+        } else {
+            from = finalEnd;
+            to = finalStart;
+        }
+        return str.substring(from, to);
+    }
+
+    /**
+     * ECMA 15.5.4.16 String.prototype.toLowerCase ( )
+     * @param self self reference
+     * @return string to lower case
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object toLowerCase(final Object self) {
+        Global.checkObjectCoercible(self);
+        return JSType.toString(self).toLowerCase();
+    }
+
+    /**
+     * ECMA 15.5.4.17 String.prototype.toLocaleLowerCase ( )
+     * @param self self reference
+     * @return string to locale sensitive lower case
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object toLocaleLowerCase(final Object self) {
+        Global.checkObjectCoercible(self);
+        return JSType.toString(self).toLowerCase(Global.getThisContext().getLocale());
+    }
+
+    /**
+     * ECMA 15.5.4.18 String.prototype.toUpperCase ( )
+     * @param self self reference
+     * @return string to upper case
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object toUpperCase(final Object self) {
+        Global.checkObjectCoercible(self);
+        return JSType.toString(self).toUpperCase();
+    }
+
+    /**
+     * ECMA 15.5.4.19 String.prototype.toLocaleUpperCase ( )
+     * @param self self reference
+     * @return string to locale sensitive upper case
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object toLocaleUpperCase(final Object self) {
+        Global.checkObjectCoercible(self);
+        return JSType.toString(self).toUpperCase(Global.getThisContext().getLocale());
+    }
+
+    /**
+     * ECMA 15.5.4.20 String.prototype.trim ( )
+     * @param self self reference
+     * @return string trimmed from whitespace
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object trim(final Object self) {
+        Global.checkObjectCoercible(self);
+
+        final String str = JSType.toString(self);
+
+        int start = 0;
+        int end   = str.length() - 1;
+
+        while (start <= end && Lexer.isJSWhitespace(str.charAt(start))) {
+            start++;
+        }
+        while (end > start && Lexer.isJSWhitespace(str.charAt(end))) {
+            end--;
+        }
+
+        return str.substring(start, end + 1);
+    }
+
+    private static Object newObj(final Object self, final CharSequence str) {
+        if (self instanceof ScriptObject) {
+            return new NativeString(str, ((ScriptObject)self).getProto());
+        }
+        return new NativeString(str, Global.instance().getStringPrototype());
+    }
+
+    /**
+     * ECMA 15.5.2.1 new String ( [ value ] )
+     *
+     * Constructor
+     *
+     * @param newObj is this constructor invoked with the new operator
+     * @param self   self reference
+     * @param args   arguments (a value)
+     *
+     * @return new NativeString, empty string if no args, extraneous args ignored
+     */
+    @Constructor(arity = 1)
+    public static Object constructor(final boolean newObj, final Object self, final Object... args) {
+        final CharSequence str = (args.length > 0) ? JSType.toCharSequence(args[0]) : "";
+        return newObj ? newObj(self, str) : str.toString();
+    }
+
+    /**
+     * ECMA 15.5.2.1 new String ( [ value ] ) - special version with no args
+     *
+     * Constructor
+     *
+     * @param newObj is this constructor invoked with the new operator
+     * @param self   self reference
+     *
+     * @return new NativeString ("")
+     */
+    @SpecializedConstructor
+    public static Object constructor(final boolean newObj, final Object self) {
+        return newObj ? newObj(self, "") : "";
+    }
+
+    //TODO - why is there no String with one String arg constructor?
+
+    /**
+     * ECMA 15.5.2.1 new String ( [ value ] ) - special version with exactly one {@code int} arg
+     *
+     * Constructor
+     *
+     * @param newObj is this constructor invoked with the new operator
+     * @param self   self reference
+     * @param arg    the arg
+     *
+     * @return new NativeString containing the string representation of the arg
+     */
+    @SpecializedConstructor
+    public static Object constructor(final boolean newObj, final Object self, final int arg) {
+        final CharSequence str = JSType.toCharSequence(arg);
+        return newObj ? newObj(self, str) : str;
+    }
+
+    /**
+     * Lookup the appropriate method for an invoke dynamic call.
+     *
+     * @param desc the call site descriptor
+     * @param receiver receiver of call
+     * @return Link to be invoked at call site.
+     */
+    public static GuardedInvocation lookupPrimitive(final NashornCallSiteDescriptor desc, final Object receiver) {
+        final MethodHandle guard = NashornGuards.getInstanceOf2Guard(String.class, ConsString.class);
+        return PrimitiveLookup.lookupPrimitive(desc, guard, new NativeString((CharSequence)receiver), WRAPFILTER);
+    }
+
+    @SuppressWarnings("unused")
+    private static NativeString wrapFilter(final Object receiver) {
+        return new NativeString((CharSequence)receiver);
+    }
+
+    private static CharSequence getCharSequence(final Object self) {
+        if (self instanceof String || self instanceof ConsString) {
+            return (CharSequence)self;
+        } else if (self instanceof NativeString) {
+            return ((NativeString)self).getValue();
+        } else if (self != null && self == Global.instance().getStringPrototype()) {
+            return "";
+        } else {
+            typeError(Global.instance(), "not.a.string", ScriptRuntime.safeToString(self));
+            return null;
+        }
+    }
+
+    private static String getString(final Object self) {
+        if (self instanceof String) {
+            return (String)self;
+        } else if (self instanceof ConsString) {
+            return self.toString();
+        } else if (self instanceof NativeString) {
+            return ((NativeString)self).getStringValue();
+        } else if (self != null && self == Global.instance().getStringPrototype()) {
+            return "";
+        } else {
+            typeError(Global.instance(), "not.a.string", ScriptRuntime.safeToString(self));
+            return null;
+        }
+    }
+
+    private boolean isValid(final int key) {
+        return key >= 0 && key < value.length();
+    }
+
+    private static MethodHandle findWrapFilter() {
+        try {
+            return MethodHandles.lookup().findStatic(NativeString.class, "wrapFilter", MH.type(NativeString.class, Object.class));
+        } catch (final NoSuchMethodException | IllegalAccessException e) {
+            throw new AssertionError(e);
+        }
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeSyntaxError.java b/nashorn/src/jdk/nashorn/internal/objects/NativeSyntaxError.java
new file mode 100644
index 00000000000..25c16b07c7a
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeSyntaxError.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+
+import jdk.nashorn.internal.objects.annotations.Attribute;
+import jdk.nashorn.internal.objects.annotations.Constructor;
+import jdk.nashorn.internal.objects.annotations.Property;
+import jdk.nashorn.internal.objects.annotations.ScriptClass;
+import jdk.nashorn.internal.objects.annotations.Where;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.ScriptObject;
+
+/**
+ * ECMA 15.11.6.4 SyntaxError
+ *
+ */
+@ScriptClass("Error")
+public class NativeSyntaxError extends ScriptObject {
+
+    /** message property in instance */
+    @Property(name = NativeError.MESSAGE)
+    public Object instMessage;
+
+    /** error name property */
+    @Property(attributes = Attribute.NOT_ENUMERABLE, where = Where.PROTOTYPE)
+    public Object name;
+
+    /** ECMA 15.1.1.1 message property */
+    @Property(attributes = Attribute.NOT_ENUMERABLE, where = Where.PROTOTYPE)
+    public Object message;
+
+    NativeSyntaxError(final Object msg) {
+        this.setProto(Global.instance().getSyntaxErrorPrototype());
+        if (msg != UNDEFINED) {
+            this.instMessage = JSType.toString(msg);
+        } else {
+            this.delete(NativeError.MESSAGE, Global.isStrict());
+        }
+    }
+
+    @Override
+    public String getClassName() {
+        return "Error";
+    }
+
+    /**
+     * ECMA 15.11.6.4 SyntaxError
+     *
+     * Constructor
+     *
+     * @param newObj was this error instantiated with the new operator
+     * @param self   self reference
+     * @param msg    error message
+     *
+     * @return new SyntaxError
+     */
+    @Constructor(name = "SyntaxError")
+    public static Object constructor(final boolean newObj, final Object self, final Object msg) {
+        return new NativeSyntaxError(msg);
+    }
+}
+
+
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeTypeError.java b/nashorn/src/jdk/nashorn/internal/objects/NativeTypeError.java
new file mode 100644
index 00000000000..93b61bc02ae
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeTypeError.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+
+import jdk.nashorn.internal.objects.annotations.Attribute;
+import jdk.nashorn.internal.objects.annotations.Constructor;
+import jdk.nashorn.internal.objects.annotations.Property;
+import jdk.nashorn.internal.objects.annotations.ScriptClass;
+import jdk.nashorn.internal.objects.annotations.Where;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.ScriptObject;
+
+/**
+ * ECMA 15.11.6.5 TypeError
+ *
+ */
+@ScriptClass("Error")
+public class NativeTypeError extends ScriptObject {
+
+    /** message property in instance */
+    @Property(name = NativeError.MESSAGE)
+    public Object instMessage;
+
+    /** error name property */
+    @Property(attributes = Attribute.NOT_ENUMERABLE, where = Where.PROTOTYPE)
+    public Object name;
+
+    /** ECMA 15.1.1.1 message property */
+    @Property(attributes = Attribute.NOT_ENUMERABLE, where = Where.PROTOTYPE)
+    public Object message;
+
+    NativeTypeError(final Object msg) {
+        this.setProto(Global.instance().getTypeErrorPrototype());
+        if (msg != UNDEFINED) {
+            this.instMessage = JSType.toString(msg);
+        } else {
+            delete(NativeError.MESSAGE, Global.isStrict());
+        }
+    }
+
+    @Override
+    public String getClassName() {
+        return "Error";
+    }
+
+    /**
+     * ECMA 15.11.6.5 TypeError
+     *
+     * Constructor
+     *
+     * @param newObj was this error instantiated with the new operator
+     * @param self   self reference
+     * @param msg    error message
+     *
+     * @return new TypeError
+     */
+    @Constructor(name = "TypeError")
+    public static Object constructor(final boolean newObj, final Object self, final Object msg) {
+        return new NativeTypeError(msg);
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeURIError.java b/nashorn/src/jdk/nashorn/internal/objects/NativeURIError.java
new file mode 100644
index 00000000000..61eb257a373
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeURIError.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+
+import jdk.nashorn.internal.objects.annotations.Attribute;
+import jdk.nashorn.internal.objects.annotations.Constructor;
+import jdk.nashorn.internal.objects.annotations.Property;
+import jdk.nashorn.internal.objects.annotations.ScriptClass;
+import jdk.nashorn.internal.objects.annotations.Where;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.ScriptObject;
+
+/**
+ * ECMA 15.11.6.6 URIError
+ */
+@ScriptClass("Error")
+public class NativeURIError extends ScriptObject {
+
+    /** message property in instance */
+    @Property(name = NativeError.MESSAGE)
+    public Object instMessage;
+
+    /** error name property */
+    @Property(attributes = Attribute.NOT_ENUMERABLE, where = Where.PROTOTYPE)
+    public Object name;
+
+    /** ECMA 15.1.1.1 message property */
+    @Property(attributes = Attribute.NOT_ENUMERABLE, where = Where.PROTOTYPE)
+    public Object message;
+
+    NativeURIError(final Object msg) {
+        this.setProto(Global.instance().getURIErrorPrototype());
+        if (msg != UNDEFINED) {
+            this.instMessage = JSType.toString(msg);
+        } else {
+            this.delete(NativeError.MESSAGE, Global.isStrict());
+        }
+    }
+
+    @Override
+    public String getClassName() {
+        return "Error";
+    }
+
+    /**
+     * ECMA 15.11.6.6 URIError
+     *
+     * Constructor
+     *
+     * @param newObj was this error instantiated with the new operator
+     * @param self   self reference
+     * @param msg    error message
+     *
+     * @return new URIError
+     */
+    @Constructor(name = "URIError")
+    public static Object constructor(final boolean newObj, final Object self, final Object msg) {
+        return new NativeURIError(msg);
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeUint16Array.java b/nashorn/src/jdk/nashorn/internal/objects/NativeUint16Array.java
new file mode 100644
index 00000000000..22b671cb8f3
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeUint16Array.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+import jdk.nashorn.internal.objects.annotations.Attribute;
+import jdk.nashorn.internal.objects.annotations.Constructor;
+import jdk.nashorn.internal.objects.annotations.Function;
+import jdk.nashorn.internal.objects.annotations.ScriptClass;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.arrays.ArrayData;
+
+/**
+ * Uint16 array for TypedArray extension
+ */
+@ScriptClass("Uint16Array")
+public class NativeUint16Array extends ArrayBufferView {
+    private static final int BYTES_PER_ELEMENT = 2;
+    private static final Factory FACTORY = new Factory(BYTES_PER_ELEMENT) {
+        @Override
+        public ArrayBufferView construct(final NativeArrayBuffer buffer, final int byteOffset, final int length) {
+            return new NativeUint16Array(buffer, byteOffset, length);
+        }
+        @Override
+        public ArrayData createArrayData(final NativeArrayBuffer buffer, final int byteOffset, final int length) {
+            return new Uint16ArrayData(buffer, byteOffset, length);
+        }
+    };
+
+    private static final class Uint16ArrayData extends ArrayDataImpl {
+        private Uint16ArrayData(final NativeArrayBuffer buffer, final int byteOffset, final int elementLength) {
+            super(buffer, byteOffset, elementLength);
+        }
+
+        @Override
+        protected int byteIndex(final int index) {
+            return index * BYTES_PER_ELEMENT + byteOffset;
+        }
+
+        @Override
+        protected int getIntImpl(final int index) {
+            final int byteIndex = byteIndex(index);
+            final byte[] byteArray = buffer.getByteArray();
+            return byteArray[byteIndex  ]       & 0x0000_00ff |
+                   byteArray[byteIndex+1] <<  8 & 0x0000_ff00 ;
+        }
+
+        @Override
+        protected void setImpl(final int index, final int value) {
+            final int byteIndex = byteIndex(index);
+            @SuppressWarnings("MismatchedReadAndWriteOfArray")
+            final byte[] byteArray = buffer.getByteArray();
+            byteArray[byteIndex  ] = (byte)(value       & 0xff);
+            byteArray[byteIndex+1] = (byte)(value >>> 8 & 0xff);
+        }
+    }
+
+    /**
+     * Constructor
+     *
+     * @param newObj is this typed array instantiated with the new operator
+     * @param self   self reference
+     * @param args   args
+     *
+     * @return new typed array
+     */
+    @Constructor(arity = 1)
+    public static Object constructor(final boolean newObj, final Object self, final Object... args) {
+        return constructorImpl(args, FACTORY);
+    }
+
+    NativeUint16Array(final NativeArrayBuffer buffer, final int byteOffset, final int length) {
+        super(buffer, byteOffset, length);
+    }
+
+    @Override
+    protected Factory factory() {
+        return FACTORY;
+    }
+
+    /**
+     * Set values
+     * @param self   self reference
+     * @param array  multiple values of array's type to set
+     * @param offset optional start index, interpreted  0 if undefined
+     * @return undefined
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    protected static Object set(final Object self, final Object array, final Object offset) {
+        return ArrayBufferView.setImpl(self, array, offset);
+    }
+
+    /**
+     * Returns a new TypedArray view of the ArrayBuffer store for this TypedArray,
+     * referencing the elements at begin, inclusive, up to end, exclusive. If either
+     * begin or end is negative, it refers to an index from the end of the array,
+     * as opposed to from the beginning.
+     * <p>
+     * If end is unspecified, the subarray contains all elements from begin to the end
+     * of the TypedArray. The range specified by the begin and end values is clamped to
+     * the valid index range for the current array. If the computed length of the new
+     * TypedArray would be negative, it is clamped to zero.
+     * <p>
+     * The returned TypedArray will be of the same type as the array on which this
+     * method is invoked.
+     *
+     * @param self self reference
+     * @param begin begin position
+     * @param end end position
+     *
+     * @return sub array
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    protected static Object subarray(final Object self, final Object begin, final Object end) {
+        return ArrayBufferView.subarrayImpl(self, begin, end);
+    }
+
+    @Override
+    protected ScriptObject getPrototype() {
+        return Global.instance().getUint16ArrayPrototype();
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeUint32Array.java b/nashorn/src/jdk/nashorn/internal/objects/NativeUint32Array.java
new file mode 100644
index 00000000000..068eb2e8144
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeUint32Array.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+import jdk.nashorn.internal.objects.annotations.Attribute;
+import jdk.nashorn.internal.objects.annotations.Constructor;
+import jdk.nashorn.internal.objects.annotations.Function;
+import jdk.nashorn.internal.objects.annotations.ScriptClass;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.arrays.ArrayData;
+
+/**
+ * Uint32 array for TypedArray extension
+ */
+@ScriptClass("Uint32Array")
+public class NativeUint32Array extends ArrayBufferView {
+    private static final int BYTES_PER_ELEMENT = 4;
+    private static final Factory FACTORY = new Factory(BYTES_PER_ELEMENT) {
+        @Override
+        public ArrayBufferView construct(final NativeArrayBuffer buffer, final int byteBegin, final int length) {
+            return new NativeUint32Array(buffer, byteBegin, length);
+        }
+        @Override
+        public ArrayData createArrayData(final NativeArrayBuffer buffer, final int byteOffset, final int length) {
+            return new Uint32ArrayData(buffer, byteOffset, length);
+        }
+    };
+
+    private static final class Uint32ArrayData extends ArrayDataImpl {
+        private Uint32ArrayData(final NativeArrayBuffer buffer, final int byteOffset, final int elementLength) {
+            super(buffer, byteOffset, elementLength);
+        }
+
+        @Override
+        protected int byteIndex(final int index) {
+            return index * BYTES_PER_ELEMENT + byteOffset;
+        }
+
+        @Override
+        protected int getIntImpl(final int index) {
+            final int byteIndex = byteIndex(index);
+            final byte[] byteArray = buffer.getByteArray();
+            return byteArray[byteIndex  ]       & 0x0000_00ff |
+                   byteArray[byteIndex+1] <<  8 & 0x0000_ff00 |
+                   byteArray[byteIndex+2] << 16 & 0x00ff_0000 |
+                   byteArray[byteIndex+3] << 24 & 0xff00_0000 ;
+        }
+
+        @Override
+        protected long getLongImpl(final int key) {
+            return getIntImpl(key) & 0xffff_ffffL;
+        }
+
+        @Override
+        protected double getDoubleImpl(final int key) {
+            return getIntImpl(key) & 0xffff_ffffL;
+        }
+
+        @Override
+        protected Object getObjectImpl(final int key) {
+            return getIntImpl(key) & 0xffff_ffffL;
+        }
+
+        @Override
+        protected void setImpl(final int index, final int value) {
+            final int byteIndex = byteIndex(index);
+            final byte[] byteArray = buffer.getByteArray();
+            byteArray[byteIndex  ] = (byte)(value        & 0xff);
+            byteArray[byteIndex+1] = (byte)(value >>>  8 & 0xff);
+            byteArray[byteIndex+2] = (byte)(value >>> 16 & 0xff);
+            byteArray[byteIndex+3] = (byte)(value >>> 24 & 0xff);
+        }
+    }
+
+    /**
+     * Constructor
+     *
+     * @param newObj is this typed array instantiated with the new operator
+     * @param self   self reference
+     * @param args   args
+     *
+     * @return new typed array
+     */
+    @Constructor(arity = 1)
+    public static Object constructor(final boolean newObj, final Object self, final Object... args) {
+        return constructorImpl(args, FACTORY);
+    }
+
+    NativeUint32Array(final NativeArrayBuffer buffer, final int byteOffset, final int length) {
+        super(buffer, byteOffset, length);
+    }
+
+    @Override
+    protected Factory factory() {
+        return FACTORY;
+    }
+
+    /**
+     * Set values
+     * @param self   self reference
+     * @param array  multiple values of array's type to set
+     * @param offset optional start index, interpreted  0 if undefined
+     * @return undefined
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    protected static Object set(final Object self, final Object array, final Object offset) {
+        return ArrayBufferView.setImpl(self, array, offset);
+    }
+
+    /**
+     * Returns a new TypedArray view of the ArrayBuffer store for this TypedArray,
+     * referencing the elements at begin, inclusive, up to end, exclusive. If either
+     * begin or end is negative, it refers to an index from the end of the array,
+     * as opposed to from the beginning.
+     * <p>
+     * If end is unspecified, the subarray contains all elements from begin to the end
+     * of the TypedArray. The range specified by the begin and end values is clamped to
+     * the valid index range for the current array. If the computed length of the new
+     * TypedArray would be negative, it is clamped to zero.
+     * <p>
+     * The returned TypedArray will be of the same type as the array on which this
+     * method is invoked.
+     *
+     * @param self self reference
+     * @param begin begin position
+     * @param end end position
+     *
+     * @return sub array
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    protected static Object subarray(final Object self, final Object begin, final Object end) {
+        return ArrayBufferView.subarrayImpl(self, begin, end);
+    }
+
+    @Override
+    protected ScriptObject getPrototype() {
+        return Global.instance().getUint32ArrayPrototype();
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeUint8Array.java b/nashorn/src/jdk/nashorn/internal/objects/NativeUint8Array.java
new file mode 100644
index 00000000000..96395c4008f
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeUint8Array.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+import jdk.nashorn.internal.objects.annotations.Attribute;
+import jdk.nashorn.internal.objects.annotations.Constructor;
+import jdk.nashorn.internal.objects.annotations.Function;
+import jdk.nashorn.internal.objects.annotations.ScriptClass;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.arrays.ArrayData;
+
+/**
+ * Uint8 array for TypedArray extension
+ */
+@ScriptClass("Uint8Array")
+public class NativeUint8Array extends ArrayBufferView {
+    private static final int BYTES_PER_ELEMENT = 1;
+    private static final Factory FACTORY = new Factory(BYTES_PER_ELEMENT) {
+        @Override
+        public ArrayBufferView construct(final NativeArrayBuffer buffer, final int byteOffset, final int length) {
+            return new NativeUint8Array(buffer, byteOffset, length);
+        }
+        @Override
+        public ArrayData createArrayData(final NativeArrayBuffer buffer, final int byteOffset, final int length) {
+            return new Uint8ArrayData(buffer, byteOffset, length);
+        }
+    };
+
+    private static final class Uint8ArrayData extends ArrayDataImpl {
+        private Uint8ArrayData(final NativeArrayBuffer buffer, final int byteOffset, final int elementLength) {
+            super(buffer, byteOffset, elementLength);
+        }
+
+        @Override
+        protected int byteIndex(final int index) {
+            return index * BYTES_PER_ELEMENT + byteOffset;
+        }
+
+        @Override
+        protected int getIntImpl(final int index) {
+            return buffer.getByteArray()[byteIndex(index)] & 0xff;
+        }
+
+        @Override
+        protected void setImpl(final int index, final int value) {
+            buffer.getByteArray()[byteIndex(index)] = (byte)value;
+        }
+    }
+
+    /**
+     * Constructor
+     *
+     * @param newObj is this typed array instantiated with the new operator
+     * @param self   self reference
+     * @param args   args
+     *
+     * @return new typed array
+     */
+    @Constructor(arity = 1)
+    public static Object constructor(final boolean newObj, final Object self, final Object... args) {
+        return constructorImpl(args, FACTORY);
+    }
+
+    NativeUint8Array(final NativeArrayBuffer buffer, final int byteOffset, final int length) {
+        super(buffer, byteOffset, length);
+    }
+
+    @Override
+    protected Factory factory() {
+        return FACTORY;
+    }
+
+    /**
+     * Set values
+     * @param self   self reference
+     * @param array  multiple values of array's type to set
+     * @param offset optional start index, interpreted  0 if undefined
+     * @return undefined
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    protected static Object set(final Object self, final Object array, final Object offset) {
+        return ArrayBufferView.setImpl(self, array, offset);
+    }
+
+    /**
+     * Returns a new TypedArray view of the ArrayBuffer store for this TypedArray,
+     * referencing the elements at begin, inclusive, up to end, exclusive. If either
+     * begin or end is negative, it refers to an index from the end of the array,
+     * as opposed to from the beginning.
+     * <p>
+     * If end is unspecified, the subarray contains all elements from begin to the end
+     * of the TypedArray. The range specified by the begin and end values is clamped to
+     * the valid index range for the current array. If the computed length of the new
+     * TypedArray would be negative, it is clamped to zero.
+     * <p>
+     * The returned TypedArray will be of the same type as the array on which this
+     * method is invoked.
+     *
+     * @param self self reference
+     * @param begin begin position
+     * @param end end position
+     *
+     * @return sub array
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    protected static Object subarray(final Object self, final Object begin, final Object end) {
+        return ArrayBufferView.subarrayImpl(self, begin, end);
+    }
+
+    @Override
+    protected ScriptObject getPrototype() {
+        return Global.instance().getUint8ArrayPrototype();
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeUint8ClampedArray.java b/nashorn/src/jdk/nashorn/internal/objects/NativeUint8ClampedArray.java
new file mode 100644
index 00000000000..4c2079ffb7d
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeUint8ClampedArray.java
@@ -0,0 +1,154 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+import jdk.nashorn.internal.objects.annotations.Attribute;
+import jdk.nashorn.internal.objects.annotations.Constructor;
+import jdk.nashorn.internal.objects.annotations.Function;
+import jdk.nashorn.internal.objects.annotations.ScriptClass;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.arrays.ArrayData;
+
+/**
+ * Uint8 clamped array for TypedArray extension
+ */
+@ScriptClass("Uint8ClampedArray")
+public class NativeUint8ClampedArray extends ArrayBufferView {
+    private static final int BYTES_PER_ELEMENT = 1;
+    private static final Factory FACTORY = new Factory(BYTES_PER_ELEMENT) {
+        @Override
+        public ArrayBufferView construct(final NativeArrayBuffer buffer, final int byteOffset, final int length) {
+            return new NativeUint8ClampedArray(buffer, byteOffset, length);
+        }
+        @Override
+        public ArrayData createArrayData(final NativeArrayBuffer buffer, final int byteOffset, final int length) {
+            return new Uint8ClampedArrayData(buffer, byteOffset, length);
+        }
+    };
+
+    private static final class Uint8ClampedArrayData extends ArrayDataImpl {
+        private Uint8ClampedArrayData(final NativeArrayBuffer buffer, final int byteOffset, final int elementLength) {
+            super(buffer, byteOffset, elementLength);
+        }
+
+        @Override
+        protected int byteIndex(final int index) {
+            return index * BYTES_PER_ELEMENT + byteOffset;
+        }
+
+        @Override
+        protected int getIntImpl(final int index) {
+            return buffer.getByteArray()[byteIndex(index)] & 0xff;
+        }
+
+        @Override
+        protected void setImpl(final int index, final int value) {
+            final byte clamped;
+            if ((value & 0xffff_ff00) == 0) {
+                clamped = (byte) value;
+            } else {
+                clamped = value < 0 ? 0 : (byte)0xff;
+            }
+            buffer.getByteArray()[byteIndex(index)] = clamped;
+        }
+
+        @Override
+        protected void setImpl(final int key, final double value) {
+            setImpl(key, (int)Math.rint(value));
+        }
+
+        @Override
+        protected void setImpl(final int key, final Object value) {
+            setImpl(key, JSType.toNumber(value));
+        }
+    }
+
+    /**
+     * Constructor
+     *
+     * @param newObj is this typed array instantiated with the new operator
+     * @param self   self reference
+     * @param args   args
+     *
+     * @return new typed array
+     */
+    @Constructor(arity = 1)
+    public static Object constructor(final boolean newObj, final Object self, final Object... args) {
+        return constructorImpl(args, FACTORY);
+    }
+
+    NativeUint8ClampedArray(final NativeArrayBuffer buffer, final int byteOffset, final int length) {
+        super(buffer, byteOffset, length);
+    }
+
+    @Override
+    protected Factory factory() {
+        return FACTORY;
+    }
+
+    /**
+     * Set values
+     * @param self   self reference
+     * @param array  multiple values of array's type to set
+     * @param offset optional start index, interpreted  0 if undefined
+     * @return undefined
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    protected static Object set(final Object self, final Object array, final Object offset) {
+        return ArrayBufferView.setImpl(self, array, offset);
+    }
+
+    /**
+     * Returns a new TypedArray view of the ArrayBuffer store for this TypedArray,
+     * referencing the elements at begin, inclusive, up to end, exclusive. If either
+     * begin or end is negative, it refers to an index from the end of the array,
+     * as opposed to from the beginning.
+     * <p>
+     * If end is unspecified, the subarray contains all elements from begin to the end
+     * of the TypedArray. The range specified by the begin and end values is clamped to
+     * the valid index range for the current array. If the computed length of the new
+     * TypedArray would be negative, it is clamped to zero.
+     * <p>
+     * The returned TypedArray will be of the same type as the array on which this
+     * method is invoked.
+     *
+     * @param self self reference
+     * @param begin begin position
+     * @param end end position
+     *
+     * @return sub array
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    protected static Object subarray(final Object self, final Object begin, final Object end) {
+        return ArrayBufferView.subarrayImpl(self, begin, end);
+    }
+
+    @Override
+    protected ScriptObject getPrototype() {
+        return Global.instance().getUint8ClampedArrayPrototype();
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/PrototypeObject.java b/nashorn/src/jdk/nashorn/internal/objects/PrototypeObject.java
new file mode 100644
index 00000000000..273321cc37e
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/PrototypeObject.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import jdk.nashorn.internal.runtime.Property;
+import jdk.nashorn.internal.runtime.PropertyMap;
+import jdk.nashorn.internal.runtime.ScriptFunction;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.linker.Lookup;
+
+/**
+ * Instances of this class serve as "prototype" object for script functions.
+ * The purpose is to expose "constructor" property from "prototype". Also, nasgen
+ * generated prototype classes extend from this class.
+ *
+ */
+public class PrototypeObject extends ScriptObject {
+    private static final PropertyMap nasgenmap$;
+
+    private Object constructor;
+
+    private static final MethodHandle GET_CONSTRUCTOR = findOwnMH("getConstructor", Object.class, Object.class);
+    private static final MethodHandle SET_CONSTRUCTOR = findOwnMH("setConstructor", void.class, Object.class, Object.class);
+
+    static {
+        PropertyMap map = PropertyMap.newMap(PrototypeObject.class);
+        map = Lookup.newProperty(map, "constructor", Property.NOT_ENUMERABLE, GET_CONSTRUCTOR, SET_CONSTRUCTOR);
+        nasgenmap$ = map;
+    }
+
+    PrototypeObject() {
+        this(nasgenmap$);
+    }
+
+    /**
+     * PropertyObject constructor
+     *
+     * @param map property map
+     */
+    public PrototypeObject(final PropertyMap map) {
+        super(map != nasgenmap$ ? map.addAll(nasgenmap$) : nasgenmap$);
+        setProto(Global.objectPrototype());
+    }
+
+    PrototypeObject(final ScriptFunction func) {
+        this();
+        this.constructor = func;
+    }
+
+    /**
+     * Get the constructor for this {@code PrototypeObject}
+     * @param self self reference
+     * @return constructor, probably, but not necessarily, a {@link ScriptFunction}
+     */
+    public static Object getConstructor(final Object self) {
+        return (self instanceof PrototypeObject) ?
+            ((PrototypeObject)self).getConstructor() :
+            UNDEFINED;
+    }
+
+    /**
+     * Reset the constructor for this {@code PrototypeObject}
+     * @param self self reference
+     * @param constructor constructor, probably, but not necessarily, a {@link ScriptFunction}
+     */
+    public static void setConstructor(final Object self, final Object constructor) {
+        if (self instanceof PrototypeObject) {
+            ((PrototypeObject)self).setConstructor(constructor);
+        }
+    }
+
+    private Object getConstructor() {
+        return constructor;
+    }
+
+    private void setConstructor(final Object constructor) {
+        this.constructor = constructor;
+    }
+
+    private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
+        return MH.findStatic(MethodHandles.lookup(), PrototypeObject.class, name, MH.type(rtype, types));
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java b/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
new file mode 100644
index 00000000000..23765916938
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
@@ -0,0 +1,345 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import jdk.nashorn.internal.codegen.objects.FunctionObjectCreator;
+import jdk.nashorn.internal.runtime.GlobalFunctions;
+import jdk.nashorn.internal.runtime.Property;
+import jdk.nashorn.internal.runtime.PropertyMap;
+import jdk.nashorn.internal.runtime.ScriptFunction;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
+import jdk.nashorn.internal.runtime.Source;
+import jdk.nashorn.internal.runtime.linker.Lookup;
+
+/**
+ * Concrete implementation of ScriptFunction. This sets correct map for the
+ * function objects -- to expose properties like "prototype", "length" etc.
+ */
+public class ScriptFunctionImpl extends ScriptFunction {
+    // per-function object flags
+    private static final int IS_STRICT  = 0b0000_0001;
+    private static final int IS_BUILTIN = 0b0000_0010;
+
+    // set this function to be a builtin function
+    private void setIsBuiltin() {
+        flags |= IS_BUILTIN;
+    }
+
+    // set this function to be a ECMAScript strict function
+    private void setIsStrict() {
+        flags |= IS_STRICT;
+    }
+
+    private static final MethodHandle BOUND_FUNCTION    = findOwnMH("boundFunction",    Object.class, ScriptFunction.class, Object.class, Object[].class, Object.class, Object[].class);
+    private static final MethodHandle BOUND_CONSTRUCTOR = findOwnMH("boundConstructor", Object.class, ScriptFunction.class, Object[].class, Object.class, Object[].class);
+
+    private static final PropertyMap nasgenmap$;
+
+    private int flags;
+
+    /**
+     * Constructor
+     *
+     * Called by Nasgen generated code, no membercount, use the default map
+     * Creates builtin functions only
+     *
+     * @param name name of function
+     * @param invokeHandle handle for invocation
+     * @param specs specialized versions of this method, if available, null otherwise
+     */
+    ScriptFunctionImpl(final String name, final MethodHandle invokeHandle, final MethodHandle[] specs) {
+        this(name, invokeHandle, nasgenmap$, specs);
+    }
+
+    /**
+     * Constructor
+     *
+     * Called by Nasgen generated code, no membercount, use the default map
+     * Creates builtin functions only
+     *
+     * @param name name of function
+     * @param methodHandle handle for invocation
+     * @param map initial property map
+     * @param specs specialized versions of this method, if available, null otherwise
+     */
+    ScriptFunctionImpl(final String name, final MethodHandle methodHandle, final PropertyMap map, final MethodHandle[] specs) {
+        super(name, methodHandle, (nasgenmap$ == map) ? nasgenmap$ : map.addAll(nasgenmap$), null, null, 0, false, specs);
+        this.setIsBuiltin();
+        init();
+    }
+
+    /**
+     * Constructor
+     *
+     * Called by Global.newScriptFunction (runtime)
+     *
+     * @param name name of function
+     * @param methodHandle handle for invocation
+     * @param scope scope object
+     * @param strict are we in strict mode
+     * @param specs specialized versions of this method, if available, null otherwise
+     */
+    ScriptFunctionImpl(final String name, final MethodHandle methodHandle, final ScriptObject scope, final boolean strict, final MethodHandle[] specs) {
+        super(name, methodHandle, getMap(strict), scope, specs);
+        if (strict) {
+            this.setIsStrict();
+        }
+        init();
+    }
+
+    /**
+     * Constructor
+     *
+     * Called by (compiler) generated code for {@link ScriptObject}s. Code is
+     * generated by {@link FunctionObjectCreator}
+     *
+     * TODO this is a horrible constructor - can we do it with fewer args?
+     *
+     * @param name name of function
+     * @param methodHandle handle for invocation
+     * @param scope scope object
+     * @param source source
+     * @param token token
+     * @param allocator instance constructor for function
+     * @param allocatorMap initial map that constructor will keep reference to for future instantiations
+     * @param needCallee does the function use the {@code callee} variable
+     * @param strict are we in strict mode
+     */
+    public ScriptFunctionImpl(
+            final String name,
+            final MethodHandle methodHandle,
+            final ScriptObject scope,
+            final Source source,
+            final long token,
+            final MethodHandle allocator,
+            final PropertyMap allocatorMap,
+            final boolean needCallee,
+            final boolean strict) {
+        super(name, methodHandle, getMap(strict), scope, source, token, allocator, allocatorMap, needCallee, null);
+        if (strict) {
+            this.setIsStrict();
+        }
+        init();
+    }
+
+    static {
+        PropertyMap map = PropertyMap.newMap(ScriptFunctionImpl.class);
+        map = Lookup.newProperty(map, "prototype", Property.NOT_ENUMERABLE | Property.NOT_CONFIGURABLE, G$PROTOTYPE, S$PROTOTYPE);
+        map = Lookup.newProperty(map, "length",    Property.NOT_ENUMERABLE | Property.NOT_CONFIGURABLE | Property.NOT_WRITABLE, G$LENGTH, null);
+        map = Lookup.newProperty(map, "name",      Property.NOT_ENUMERABLE | Property.NOT_CONFIGURABLE | Property.NOT_WRITABLE, G$NAME, null);
+        nasgenmap$ = map;
+    }
+
+    // function object representing TypeErrorThrower
+    private static ScriptFunction typeErrorThrower;
+
+    static synchronized ScriptFunction getTypeErrorThrower() {
+        if (typeErrorThrower == null) {
+            //name handle
+            final ScriptFunctionImpl func = new ScriptFunctionImpl("TypeErrorThrower", Lookup.TYPE_ERROR_THROWER_SETTER, null, false, null);
+            // clear constructor handle...
+            func.constructHandle = null;
+            func.prototype       = UNDEFINED;
+            typeErrorThrower     = func;
+        }
+
+        return typeErrorThrower;
+    }
+
+    // add a new property that throws TypeError on get as well as set
+    static synchronized PropertyMap newThrowerProperty(final PropertyMap map, final String name, final int flags) {
+        return map.newProperty(name, flags, Lookup.TYPE_ERROR_THROWER_GETTER, Lookup.TYPE_ERROR_THROWER_SETTER);
+    }
+
+    // property map for strict mode functions - lazily initialized
+    private static PropertyMap strictmodemap$;
+
+    // Choose the map based on strict mode!
+    private static PropertyMap getMap(final boolean strict) {
+        if (strict) {
+            synchronized (ScriptFunctionImpl.class) {
+                if (strictmodemap$ == null) {
+                    // In strict mode, the following properties should throw TypeError
+                    strictmodemap$ = nasgenmap$;
+                    strictmodemap$ = newThrowerProperty(strictmodemap$, "arguments", Property.NOT_ENUMERABLE | Property.NOT_CONFIGURABLE);
+                    strictmodemap$ = newThrowerProperty(strictmodemap$, "caller",    Property.NOT_ENUMERABLE | Property.NOT_CONFIGURABLE);
+                }
+            }
+            return strictmodemap$;
+        }
+
+        return nasgenmap$;
+    }
+
+    // Instance of this class is used as global anonymous function which
+    // serves as Function.prototype object.
+    private static class AnonymousFunction extends ScriptFunctionImpl {
+        private static final PropertyMap nasgenmap$$ = PropertyMap.newMap(AnonymousFunction.class);
+
+        AnonymousFunction() {
+            super("", GlobalFunctions.ANONYMOUS, nasgenmap$$, null);
+        }
+    }
+
+    static ScriptFunctionImpl newAnonymousFunction() {
+        return new AnonymousFunction();
+    }
+
+    @Override
+    public final boolean isStrict() {
+        return (flags & IS_STRICT) != 0;
+    }
+
+    @Override
+    public final boolean isBuiltin() {
+        return (flags & IS_BUILTIN) != 0;
+    }
+
+    /**
+     * Factory method for non-constructor functions
+     *
+     * @param name   function name
+     * @param methodHandle handle for invocation
+     * @param specs  specialized versions of function if available, null otherwise
+     * @param strict are we in strict mode
+     * @return new ScriptFunction
+     */
+    public static ScriptFunction makeFunction(final String name, final MethodHandle methodHandle, final MethodHandle[] specs, final boolean strict) {
+        final ScriptFunctionImpl func = new ScriptFunctionImpl(name, methodHandle, null, strict, specs);
+
+        func.setIsBuiltin();
+        func.setConstructHandle(null);
+        func.setPrototype(UNDEFINED);
+
+        return func;
+    }
+
+    /**
+     * Factory method for non-constructor functions
+     *
+     * @param name   function name
+     * @param methodHandle handle for invocation
+     * @param specs  specialized versions of function if available, null otherwise
+     * @return new ScriptFunction
+     */
+    public static ScriptFunction makeFunction(final String name, final MethodHandle methodHandle, final MethodHandle[] specs) {
+        return makeFunction(name, methodHandle, specs, false);
+    }
+
+    /**
+     * Factory method for non-constructor functions
+     *
+     * @param name   function name
+     * @param methodHandle handle for invocation
+     * @return new ScriptFunction
+     */
+    public static ScriptFunction makeFunction(final String name, final MethodHandle methodHandle) {
+        return makeFunction(name, methodHandle, null);
+    }
+
+    /**
+     * This method is used to create a bound function. See also
+     * {@link NativeFunction#bind(Object, Object...)} method implementation.
+     *
+     * @param thiz this reference to bind
+     * @param args arguments to bind
+     */
+    @Override
+    public ScriptFunction makeBoundFunction(final Object thiz, final Object[] args) {
+        Object[] allArgs = args;
+
+        if (allArgs == null) {
+            allArgs = ScriptRuntime.EMPTY_ARRAY;
+        }
+
+        final MethodHandle   boundMethod = MH.insertArguments(BOUND_FUNCTION, 0, this, thiz, allArgs);
+        final ScriptFunction boundFunc   = makeFunction("", boundMethod, null, true);
+
+        MethodHandle consHandle  = this.getConstructHandle();
+
+        if (consHandle != null) {
+            consHandle = MH.insertArguments(BOUND_CONSTRUCTOR, 0, this, allArgs);
+        }
+
+        boundFunc.setConstructHandle(consHandle);
+        int newArity = this.getArity();
+        if (newArity != -1) {
+            newArity -= Math.min(newArity, allArgs.length);
+        }
+        boundFunc.setArity(newArity);
+
+        return boundFunc;
+    }
+
+    @SuppressWarnings("unused")
+    private static Object boundFunction(final ScriptFunction wrapped, final Object boundThiz, final Object[] boundArgs, final Object thiz, final Object[] args) {
+        final Object[] allArgs = new Object[boundArgs.length + args.length];
+
+        System.arraycopy(boundArgs, 0, allArgs, 0, boundArgs.length);
+        System.arraycopy(args, 0, allArgs, boundArgs.length, args.length);
+
+        return ScriptRuntime.apply(wrapped, boundThiz, allArgs);
+    }
+
+    @SuppressWarnings("unused")
+    private static Object boundConstructor(final ScriptFunction wrapped, final Object[] boundArgs, final Object thiz, final Object[] args) {
+        final Object[] allArgs = new Object[boundArgs.length + args.length];
+        System.arraycopy(boundArgs, 0, allArgs, 0, boundArgs.length);
+        System.arraycopy(args, 0, allArgs, boundArgs.length, args.length);
+
+        return ScriptRuntime.construct(wrapped, allArgs);
+    }
+
+    // return Object.prototype - used by "allocate"
+    @Override
+    protected final ScriptObject getObjectPrototype() {
+        return Global.objectPrototype();
+    }
+
+    // Internals below..
+    private void init() {
+        this.setProto(Global.instance().getFunctionPrototype());
+        this.setPrototype(new PrototypeObject(this));
+
+        if (isStrict()) {
+            final ScriptFunction func = getTypeErrorThrower();
+            // We have to fill user accessor functions late as these are stored
+            // in this object rather than in the PropertyMap of this object.
+            setUserAccessors("arguments", func, func);
+            setUserAccessors("caller", func, func);
+        }
+    }
+
+    private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
+        return MH.findStatic(MethodHandles.lookup(), ScriptFunctionImpl.class, name, MH.type(rtype, types));
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/annotations/Attribute.java b/nashorn/src/jdk/nashorn/internal/objects/annotations/Attribute.java
new file mode 100644
index 00000000000..91c92673287
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/annotations/Attribute.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects.annotations;
+
+/**
+ * Attributes for JavaScript properties. The negative logic "NOT_xxx" is because the
+ * common case is to be writable, enumerable and configurable
+ */
+
+public interface Attribute {
+    /** flag for non writable objects */
+    public static final int NOT_WRITABLE     = jdk.nashorn.internal.runtime.Property.NOT_WRITABLE;
+
+    /** flag for non enumerable objects */
+    public static final int NOT_ENUMERABLE   = jdk.nashorn.internal.runtime.Property.NOT_ENUMERABLE;
+
+    /** flag for non configurable objects */
+    public static final int NOT_CONFIGURABLE = jdk.nashorn.internal.runtime.Property.NOT_CONFIGURABLE;
+
+    /** read-only, non-configurable property */
+    public static final int CONSTANT = NOT_WRITABLE | NOT_CONFIGURABLE;
+
+    /** non-enumerable, read-only, non-configurable property */
+    public static final int NON_ENUMERABLE_CONSTANT = NOT_ENUMERABLE | CONSTANT;
+
+    /** by default properties are writable, enumerable and configurable */
+    public static final int DEFAULT_ATTRIBUTES = 0;
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/annotations/Constructor.java b/nashorn/src/jdk/nashorn/internal/objects/annotations/Constructor.java
new file mode 100644
index 00000000000..b9739257636
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/annotations/Constructor.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Specifies a specific method to be the JavaScript "constructor" function.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface Constructor {
+    /**
+     * Name of the constructor function. If empty, the name is inferred.
+     */
+    public String name() default "";
+
+    /**
+     * The arity of the function. By default computed from the method signature.
+     * Note that -1 means varargs. So, -2 is used as invalid arity.
+     */
+    public int arity() default -2;
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/annotations/Function.java b/nashorn/src/jdk/nashorn/internal/objects/annotations/Function.java
new file mode 100644
index 00000000000..7e06a5e11fa
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/annotations/Function.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects.annotations;
+
+import static jdk.nashorn.internal.objects.annotations.Attribute.DEFAULT_ATTRIBUTES;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotation to specify a JavaScript "function" property.
+ * Note that -1 means varargs. So, -2 is used as invalid arity.
+ *
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface Function {
+    /**
+     * Name of the property. If empty, the name is inferred.
+     */
+    public String name() default "";
+
+    /**
+     * Attribute flags for this function.
+     */
+    public int attributes() default DEFAULT_ATTRIBUTES;
+
+    /**
+     * The arity of the function. By default computed from the method signature
+     */
+    public int arity() default -2;
+
+    /**
+     * where this function lives
+     */
+    public Where where() default Where.PROTOTYPE;
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/annotations/Getter.java b/nashorn/src/jdk/nashorn/internal/objects/annotations/Getter.java
new file mode 100644
index 00000000000..7f853e00d32
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/annotations/Getter.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects.annotations;
+
+import static jdk.nashorn.internal.objects.annotations.Attribute.DEFAULT_ATTRIBUTES;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotation to specify the getter method for a JavaScript "data" property.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface Getter {
+    /**
+     * Name of the property. If empty, the name is inferred.
+     */
+    public String name() default "";
+
+    /**
+     * Attribute flags for this setter.
+     */
+    public int attributes() default DEFAULT_ATTRIBUTES;
+
+    /**
+     * Where this getter lives?
+     */
+    public Where where() default Where.INSTANCE;
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/annotations/Property.java b/nashorn/src/jdk/nashorn/internal/objects/annotations/Property.java
new file mode 100644
index 00000000000..55672a06fcf
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/annotations/Property.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects.annotations;
+
+import static jdk.nashorn.internal.objects.annotations.Attribute.DEFAULT_ATTRIBUTES;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotation to specify a JavaScript "data" property.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+public @interface Property {
+    /**
+     * Name of the script property. If empty, the name is inferred.
+     */
+    public String name() default "";
+
+    /**
+     * Attribute flags for this function.
+     */
+    public int attributes() default DEFAULT_ATTRIBUTES;
+
+    /**
+     * Initialize this property with the object of given class.
+     */
+    public String clazz() default "";
+
+    /**
+     * Where this property lives?
+     */
+    public Where where() default Where.INSTANCE;
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/annotations/ScriptClass.java b/nashorn/src/jdk/nashorn/internal/objects/annotations/ScriptClass.java
new file mode 100644
index 00000000000..88ae0e3f4f2
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/annotations/ScriptClass.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotation to specify that the annotated Java class is a JavaScript "class".
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface ScriptClass {
+    /**
+     * Name of the script class. By default, the name is derived from
+     * the Java class name.
+     */
+    public String value() default "";
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/annotations/Setter.java b/nashorn/src/jdk/nashorn/internal/objects/annotations/Setter.java
new file mode 100644
index 00000000000..43f1556475d
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/annotations/Setter.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects.annotations;
+
+import static jdk.nashorn.internal.objects.annotations.Attribute.DEFAULT_ATTRIBUTES;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotation to specify the setter method for a JavaScript "data" property.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface Setter {
+    /**
+     * Name of the script property. If empty, the name is inferred.
+     */
+    public String name() default "";
+
+    /**
+     * Attribute flags for this setter.
+     */
+    public int attributes() default DEFAULT_ATTRIBUTES;
+
+    /**
+     * Where this setter lives?
+     */
+    public Where where() default Where.INSTANCE;
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/annotations/SpecializedConstructor.java b/nashorn/src/jdk/nashorn/internal/objects/annotations/SpecializedConstructor.java
new file mode 100644
index 00000000000..d4dec35c281
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/annotations/SpecializedConstructor.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * The SpecializedConstructor annotation is used to flag more type specific constructors than the standard one in
+ * Native objects. For example {@link jdk.nashorn.internal.objects.NativeArray#construct} takes an arbitrary number of
+ * Object elements as an array. Call this constructor, including the varargs collector that allocates the array
+ * upon each invocation, is much more expensive than calling a specialized constructor that takes one arguments
+ * of, e.g. int type from the call site, such as
+ * {@link jdk.nashorn.internal.objects.NativeArray#construct(boolean, Object, int)}.
+ * {@link jdk.nashorn.internal.runtime.ScriptFunction} will try to look up the most specific function when
+ * linking the callsite.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface SpecializedConstructor {
+    //empty
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/annotations/SpecializedFunction.java b/nashorn/src/jdk/nashorn/internal/objects/annotations/SpecializedFunction.java
new file mode 100644
index 00000000000..48cdd23bc00
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/annotations/SpecializedFunction.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * The SpecializedFunction annotation is used to flag more type specific functions than the standard one in
+ * Native objects. For example {@link jdk.nashorn.internal.objects.NativeMath#max} takes an arbitrary number of
+ * Object elements as an array. Call this function, including the varargs collector that allocates the array
+ * upon each invocation, is much more expensive than calling a specialized function that takes two arguments
+ * of, e.g. int type from the call site, such as {@link jdk.nashorn.internal.objects.NativeMath#max(Object, int, int)}.
+ * {@link jdk.nashorn.internal.runtime.ScriptFunction} will try to look up the most specific function when
+ * linking the callsite.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface SpecializedFunction {
+    //empty
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/annotations/Where.java b/nashorn/src/jdk/nashorn/internal/objects/annotations/Where.java
new file mode 100644
index 00000000000..22e06652c04
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/annotations/Where.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects.annotations;
+
+/**
+ * Enum to tell where a Function or Property belongs.
+ */
+public enum Where {
+    /** this means that the item belongs in the Constructor of an object */
+    CONSTRUCTOR,
+    /** this means that the item belongs in the Prototype of an object */
+    PROTOTYPE,
+    /** this means that the item belongs in the Instance of an object */
+    INSTANCE
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/package-info.java b/nashorn/src/jdk/nashorn/internal/objects/package-info.java
new file mode 100644
index 00000000000..652eadf69b6
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/package-info.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+/**
+ * Classes from this package should never be directly referred from
+ * Nashorn runtime code. These classes can be referred by nasgen though.
+ * Runtime code should use (or extend) GlobalObject interface to access
+ * Global object.
+ */
diff --git a/nashorn/src/jdk/nashorn/internal/parser/AbstractParser.java b/nashorn/src/jdk/nashorn/internal/parser/AbstractParser.java
new file mode 100644
index 00000000000..413e1181572
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/parser/AbstractParser.java
@@ -0,0 +1,458 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.parser;
+
+import static jdk.nashorn.internal.parser.TokenType.EOF;
+import static jdk.nashorn.internal.parser.TokenType.EOL;
+import static jdk.nashorn.internal.parser.TokenType.IDENT;
+
+import jdk.nashorn.internal.ir.IdentNode;
+import jdk.nashorn.internal.ir.LiteralNode;
+import jdk.nashorn.internal.parser.Lexer.LexerToken;
+import jdk.nashorn.internal.parser.Lexer.RegexToken;
+import jdk.nashorn.internal.runtime.ECMAErrors;
+import jdk.nashorn.internal.runtime.ErrorManager;
+import jdk.nashorn.internal.runtime.JSErrorType;
+import jdk.nashorn.internal.runtime.ParserException;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * Base class for parsers.
+ */
+public abstract class AbstractParser {
+    /** Source to parse. */
+    protected final Source source;
+
+    /** Error manager to report errors. */
+    protected final ErrorManager errors;
+
+    /** Stream of lex tokens to parse. */
+    protected TokenStream stream;
+
+    /** Index of current token. */
+    protected int k;
+
+    /** Descriptor of current token. */
+    protected long token;
+
+    /** Type of current token. */
+    protected TokenType type;
+
+    /** Type of last token. */
+    protected TokenType last;
+
+    /** Start position of current token. */
+    protected int start;
+
+    /** Finish position of previous token. */
+    protected int finish;
+
+    /** Current line number. */
+    protected int line;
+
+    /** Position of last EOL + 1. */
+    protected int linePosition;
+
+    /** Lexer used to scan source content. */
+    protected Lexer lexer;
+
+    /** Is this parser running under strict mode? */
+    protected boolean isStrictMode;
+
+    /**
+     * Construct a parser.
+     *
+     * @param source  Source to parse.
+     * @param errors  Error reporting manager.
+     * @param strict  True if we are in strict mode
+     */
+    protected AbstractParser(final Source source, final ErrorManager errors, final boolean strict) {
+        this.source       = source;
+        this.errors       = errors;
+        this.k            = -1;
+        this.token        = Token.toDesc(EOL, 0, 1);
+        this.type         = EOL;
+        this.last         = EOL;
+        this.start        = 0;
+        this.finish       = 0;
+        this.line         = 0;
+        this.linePosition = 0;
+        this.lexer        = null;
+        this.isStrictMode = strict;
+    }
+
+    /**
+     * Get the Source
+     *
+     * @return the Source
+     */
+    public Source getSource() {
+        return source;
+    }
+
+    /**
+     * Get the ith token.
+     *
+     * @param i Index of token.
+     *
+     * @return  the token
+     */
+    protected final long getToken(final int i) {
+        // Make sure there are enough tokens available.
+        while (i > stream.last()) {
+            // If we need to buffer more for lookahead.
+            if (stream.isFull()) {
+                stream.grow();
+            }
+
+            // Get more tokens.
+            lexer.lexify();
+        }
+
+        return stream.get(i);
+    }
+
+    /**
+     * Return the tokenType of the ith token.
+     *
+     * @param i Index of token
+     *
+     * @return the token type
+     */
+    protected final TokenType T(final int i) {
+        // Get token descriptor and extract tokenType.
+        return Token.descType(getToken(i));
+    }
+
+    /**
+     * Seek next token that is not an EOL.
+     *
+     * @return tokenType of next token.
+     */
+    protected final TokenType next() {
+        do {
+            nextOrEOL();
+        } while (type == EOL);
+
+        return type;
+    }
+
+    /**
+     * Seek next token.
+     *
+     * @return tokenType of next token.
+     */
+    protected final TokenType nextOrEOL() {
+        // Capture last token tokenType.
+        last = type;
+        if (type != EOF) {
+
+            // Set up next token.
+            k++;
+            final long lastToken = token;
+            token = getToken(k);
+            type = Token.descType(token);
+
+            // do this before the start is changed below
+            if (last != EOL) {
+                finish = start + Token.descLength(lastToken);
+            }
+
+            if (type == EOL) {
+                line = Token.descLength(token);
+                linePosition = Token.descPosition(token);
+            } else {
+                start = Token.descPosition(token);
+            }
+
+        }
+
+        return type;
+    }
+
+    /**
+     * Get the message string for a message ID and arguments
+     *
+     * @param msgId The Message ID
+     * @param args  The arguments
+     *
+     * @return The message string
+     */
+    protected static String message(final String msgId, final String... args) {
+        return ECMAErrors.getMessage("parser.error." + msgId, args);
+    }
+
+    /**
+     * Report an error.
+     *
+     * @param message    Error message.
+     * @param errorToken Offending token.
+     */
+    protected final void error(final String message, final long errorToken) {
+        error(JSErrorType.SYNTAX_ERROR, message, errorToken);
+    }
+
+    /**
+     * Report an error.
+     *
+     * @param errorType  The error type
+     * @param message    Error message.
+     * @param errorToken Offending token.
+     */
+    protected final void error(final JSErrorType errorType, final String message, final long errorToken) {
+        final int position  = Token.descPosition(errorToken);
+        final int lineNum   = source.getLine(position);
+        final int columnNum = source.getColumn(position);
+        final String formatted = ErrorManager.format(message, source, lineNum, columnNum, errorToken);
+        final ParserException exp = new ParserException(formatted, source, lineNum, columnNum, errorToken);
+        exp.setErrorType(errorType);
+        throw exp;
+    }
+
+    /**
+     * Report an error.
+     *
+     * @param message Error message.
+     */
+    protected final void error(final String message) {
+        error(JSErrorType.SYNTAX_ERROR, message);
+    }
+
+    /**
+     * Report an error.
+     *
+     * @param errorType  The error type
+     * @param message    Error message.
+     */
+    protected final void error(final JSErrorType errorType, final String message) {
+        // TODO - column needs to account for tabs.
+        final int position = Token.descPosition(token);
+        final int column = position - linePosition;
+        final String formatted = ErrorManager.format(message, source, line, column, token);
+        final ParserException exp = new ParserException(formatted, source, line, column, token);
+        exp.setErrorType(errorType);
+        throw exp;
+    }
+
+    /**
+     * Generate 'expected' message.
+     *
+     * @param expected Expected tokenType.
+     *
+     * @return the message string
+     */
+    protected final String expectMessage(final TokenType expected) {
+        final String tokenString = Token.toString(source, token, false);
+        String msg;
+
+        if (expected == null) {
+            msg = AbstractParser.message("expected.stmt", tokenString);
+        } else {
+            final String expectedName = expected.getNameOrType();
+            msg = AbstractParser.message("expected", expectedName, tokenString);
+        }
+
+        return msg;
+    }
+
+    /**
+     * Check next token and advance.
+     *
+     * @param expected Expected tokenType.
+     *
+     * @throws ParserException on unexpected token type
+     */
+    protected final void expect(final TokenType expected) throws ParserException {
+        if (type != expected) {
+            error(expectMessage(expected));
+        }
+
+        next();
+    }
+
+    /**
+     * Check next token, get its value and advance.
+     *
+     * @param  expected Expected tokenType.
+     * @return The JavaScript value of the token
+     * @throws ParserException on unexpected token type
+     */
+    protected final Object expectValue(final TokenType expected) throws ParserException {
+        if (type != expected) {
+            error(expectMessage(expected));
+        }
+
+        final Object value = getValue();
+
+        next();
+
+        return value;
+    }
+
+    /**
+     * Get the value of the current token.
+     *
+     * @return JavaScript value of the token.
+     */
+    protected final Object getValue() {
+        return getValue(token);
+    }
+
+    /**
+     * Get the value of a specific token
+     *
+     * @param valueToken the token
+     *
+     * @return JavaScript value of the token
+     */
+    protected final Object getValue(final long valueToken) {
+        try {
+            return lexer.getValueOf(valueToken, isStrictMode);
+        } catch (final ParserException e) {
+            errors.error(e);
+        }
+
+        return null;
+    }
+
+    /**
+     * Certain future reserved words can be used as identifiers in
+     * non-strict mode. Check if the current token is one such.
+     *
+     * @return true if non strict mode identifier
+     */
+    protected final boolean isNonStrictModeIdent() {
+        return !isStrictMode && type.getKind() == TokenKind.FUTURESTRICT;
+    }
+
+    /**
+     * Get ident.
+     *
+     * @return Ident node.
+     */
+    protected final IdentNode getIdent() {
+        // Capture IDENT token.
+        long identToken = token;
+
+        if (isNonStrictModeIdent()) {
+            // Fake out identifier.
+            identToken = Token.recast(token, IDENT);
+            // Get IDENT.
+            final String ident = (String)getValue(identToken);
+
+            next();
+
+            // Create IDENT node.
+            return new IdentNode(source, identToken, finish, ident);
+        }
+
+        // Get IDENT.
+        final String ident = (String)expectValue(IDENT);
+        if (ident == null) {
+            return null;
+        }
+        // Create IDENT node.
+        return new IdentNode(source, identToken, finish, ident);
+    }
+
+    /**
+     * Check if current token is in identifier name
+     *
+     * @return true if current token is an identifier name
+     */
+    protected final boolean isIdentifierName() {
+        final TokenKind kind = type.getKind();
+        if (kind == TokenKind.KEYWORD || kind == TokenKind.FUTURE || kind == TokenKind.FUTURESTRICT) {
+            return true;
+        }
+        // Fake out identifier.
+        final long identToken = Token.recast(token, IDENT);
+        // Get IDENT.
+        final String ident = (String)getValue(identToken);
+        return !ident.isEmpty() && Character.isJavaIdentifierStart(ident.charAt(0));
+    }
+
+    /**
+     * Create an IdentNode from the current token
+     *
+     * @return an IdentNode representing the current token
+     */
+    protected final IdentNode getIdentifierName() {
+        if (type == IDENT) {
+            return getIdent();
+        } else if (isIdentifierName()) {
+            // Fake out identifier.
+            final long identToken = Token.recast(token, IDENT);
+            // Get IDENT.
+            final String ident = (String)getValue(identToken);
+            next();
+            // Create IDENT node.
+            return new IdentNode(source, identToken, finish, ident);
+        } else {
+            expect(IDENT);
+            return null;
+        }
+    }
+
+    /**
+     * Create a LiteralNode from the current token
+     *
+     * @return LiteralNode representing the current token
+     * @throws ParserException if any literals fails to parse
+     */
+    protected final LiteralNode<?> getLiteral() throws ParserException {
+        // Capture LITERAL token.
+        final long literalToken = token;
+
+        // Create literal node.
+        final Object value = getValue();
+
+        LiteralNode<?> node = null;
+
+        if (value == null) {
+            node = LiteralNode.newInstance(source, literalToken, finish);
+        } else if (value instanceof Number) {
+            node = LiteralNode.newInstance(source, literalToken, finish, (Number)value);
+        } else if (value instanceof String) {
+            node = LiteralNode.newInstance(source, literalToken, finish, (String)value);
+        } else if (value instanceof LexerToken) {
+            if (value instanceof RegexToken) {
+                final RegexToken regex = (RegexToken)value;
+                try {
+                    RegExp.validate(regex.getExpression(), regex.getOptions());
+                } catch (final ParserException e) {
+                    error(e.getMessage());
+                }
+            }
+            node = LiteralNode.newInstance(source, literalToken, finish, (LexerToken)value);
+        } else {
+            assert false : "unknown type for LiteralNode: " + value.getClass();
+        }
+
+        next();
+        return node;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/parser/JSONParser.java b/nashorn/src/jdk/nashorn/internal/parser/JSONParser.java
new file mode 100644
index 00000000000..0f3459dd783
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/parser/JSONParser.java
@@ -0,0 +1,346 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.parser;
+
+import static jdk.nashorn.internal.parser.TokenType.COLON;
+import static jdk.nashorn.internal.parser.TokenType.COMMARIGHT;
+import static jdk.nashorn.internal.parser.TokenType.EOF;
+import static jdk.nashorn.internal.parser.TokenType.ESCSTRING;
+import static jdk.nashorn.internal.parser.TokenType.RBRACE;
+import static jdk.nashorn.internal.parser.TokenType.RBRACKET;
+import static jdk.nashorn.internal.parser.TokenType.STRING;
+
+import java.util.ArrayList;
+import java.util.List;
+import jdk.nashorn.internal.ir.LiteralNode;
+import jdk.nashorn.internal.ir.Node;
+import jdk.nashorn.internal.ir.ObjectNode;
+import jdk.nashorn.internal.ir.PropertyNode;
+import jdk.nashorn.internal.ir.UnaryNode;
+import jdk.nashorn.internal.runtime.ErrorManager;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * Parses JSON text and returns the corresponding IR node. This is derived from the objectLiteral production of the main parser.
+ *
+ * See: 15.12.1.2 The JSON Syntactic Grammar
+ */
+public class JSONParser extends AbstractParser {
+
+    /**
+     * Constructor
+     * @param source  the source
+     * @param errors  the error manager
+     * @param strict  are we in strict mode
+     */
+    public JSONParser(final Source source, final ErrorManager errors, final boolean strict) {
+        super(source, errors, strict);
+    }
+
+    /**
+     * Implementation of the Quote(value) operation as defined in the ECMA script spec
+     * It wraps a String value in double quotes and escapes characters within in
+     *
+     * @param value string to quote
+     *
+     * @return quoted and escaped string
+     */
+    public static String quote(final String value) {
+
+        final StringBuilder product = new StringBuilder();
+
+        product.append("\"");
+
+        for (final char ch : value.toCharArray()) {
+            // TODO: should use a table?
+            switch (ch) {
+            case '\\':
+                product.append("\\\\");
+                break;
+            case '"':
+                product.append("\\\"");
+                break;
+            case '\b':
+                product.append("\\b");
+                break;
+            case '\f':
+                product.append("\\f");
+                break;
+            case '\n':
+                product.append("\\n");
+                break;
+            case '\r':
+                product.append("\\r");
+                break;
+            case '\t':
+                product.append("\\t");
+                break;
+            default:
+                if (ch < ' ') {
+                    product.append(Lexer.unicodeEscape(ch));
+                    break;
+                }
+
+                product.append(ch);
+                break;
+            }
+        }
+
+        product.append("\"");
+
+        return product.toString();
+    }
+
+    /**
+     * Public parsed method - start lexing a new token stream for
+     * a JSON script
+     *
+     * @return the JSON literal
+     */
+    public Node parse() {
+        stream = new TokenStream();
+
+        lexer = new Lexer(source, stream) {
+
+            @Override
+            protected boolean skipComments() {
+                return false;
+            }
+
+            @Override
+            protected boolean isStringDelimiter(final char ch) {
+                return ch == '\"';
+            }
+
+            @Override
+            protected boolean isWhitespace(final char ch) {
+                return Lexer.isJsonWhitespace(ch);
+            }
+
+            @Override
+            protected boolean isEOL(final char ch) {
+                return Lexer.isJsonEOL(ch);
+            }
+        };
+
+        k = -1;
+
+        next();
+
+        final Node resultNode = jsonLiteral();
+        expect(EOF);
+
+        return resultNode;
+    }
+
+    @SuppressWarnings("fallthrough")
+    private LiteralNode<?> getStringLiteral() {
+        final LiteralNode<?> literal = getLiteral();
+        final String         str     = (String)literal.getValue();
+
+        for (int i = 0; i < str.length(); i++) {
+            final char ch = str.charAt(i);
+            switch (ch) {
+            default:
+                if (ch > 0x001f) {
+                    break;
+                }
+            case '"':
+            case '\\':
+                error(AbstractParser.message("unexpected.token", str));
+                break;
+            }
+        }
+
+        return literal;
+    }
+
+    /**
+     * Parse a JSON literal from the token stream
+     * @return the JSON literal as a Node
+     */
+    private Node jsonLiteral() {
+        final long literalToken = token;
+
+        switch (type) {
+        case STRING:
+            return getStringLiteral();
+        case ESCSTRING:
+        case DECIMAL:
+        case FLOATING:
+            return getLiteral();
+        case FALSE:
+            next();
+            return LiteralNode.newInstance(source, literalToken, finish, false);
+        case TRUE:
+            next();
+            return LiteralNode.newInstance(source, literalToken, finish, true);
+        case NULL:
+            next();
+            return LiteralNode.newInstance(source, literalToken, finish);
+        case LBRACKET:
+            return arrayLiteral();
+        case LBRACE:
+            return objectLiteral();
+        /*
+         * A.8.1 JSON Lexical Grammar
+         *
+         * JSONNumber :: See 15.12.1.1
+         *    -opt DecimalIntegerLiteral JSONFractionopt ExponentPartopt
+         */
+        case SUB:
+            next();
+
+            final long realToken = token;
+            final Object value = getValue();
+
+            if (value instanceof Number) {
+                next();
+                return new UnaryNode(source, literalToken, LiteralNode.newInstance(source, realToken, finish, (Number)value));
+            }
+
+            error(AbstractParser.message("expected", "number", type.getNameOrType()));
+            break;
+        default:
+            break;
+        }
+
+        error(AbstractParser.message("expected", "json literal", type.getNameOrType()));
+        return null;
+    }
+
+    /**
+     * Parse an array literal from the token stream
+     * @return the array literal as a Node
+     */
+    private Node arrayLiteral() {
+        // Unlike JavaScript array literals, elison is not permitted in JSON.
+
+        // Capture LBRACKET token.
+        final long arrayToken = token;
+        // LBRACKET tested in caller.
+        next();
+
+        Node result = null;
+        // Prepare to accummulating elements.
+        final List<Node> elements = new ArrayList<>();
+
+loop:
+        while (true) {
+            switch (type) {
+            case RBRACKET:
+                next();
+                result = LiteralNode.newInstance(source, arrayToken, finish, elements);
+                break loop;
+
+            case COMMARIGHT:
+                next();
+                break;
+
+            default:
+                // Add expression element.
+                elements.add(jsonLiteral());
+                // Comma between array elements is mandatory in JSON.
+                if (type != COMMARIGHT && type != RBRACKET) {
+                    error(AbstractParser.message("expected", ", or ]", type.getNameOrType()));
+                }
+                break;
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * Parse an object literal from the token stream
+     * @return the object literal as a Node
+     */
+    private Node objectLiteral() {
+        // Capture LBRACE token.
+        final long objectToken = token;
+        // LBRACE tested in caller.
+        next();
+
+        // Prepare to accumulate elements.
+        final List<Node> elements = new ArrayList<>();
+
+        // Create a block for the object literal.
+loop:
+        while (true) {
+            switch (type) {
+            case RBRACE:
+                next();
+                break loop;
+
+            case COMMARIGHT:
+                next();
+                break;
+
+            default:
+                // Get and add the next property.
+                final Node property = propertyAssignment();
+                elements.add(property);
+
+                // Comma between property assigments is mandatory in JSON.
+                if (type != RBRACE && type != COMMARIGHT) {
+                    error(AbstractParser.message("expected", ", or }", type.getNameOrType()));
+                }
+                break;
+            }
+        }
+
+        // Construct new object literal.
+        return new ObjectNode(source, objectToken, finish, null, elements);
+    }
+
+    /**
+     * Parse a property assignment from the token stream
+     * @return the property assignment as a Node
+     */
+    private Node propertyAssignment() {
+        // Capture firstToken.
+        final long propertyToken = token;
+        LiteralNode<?> name = null;
+
+        if (type == STRING) {
+            name = getStringLiteral();
+        } else if (type == ESCSTRING) {
+            name = getLiteral();
+        }
+
+        if (name != null) {
+            expect(COLON);
+            final Node value = jsonLiteral();
+            return new PropertyNode(source, propertyToken, value.getFinish(), name, value);
+        }
+
+        // Raise an error.
+        error(AbstractParser.message("expected", "string", type.getNameOrType()));
+
+        return null;
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/parser/Lexer.java b/nashorn/src/jdk/nashorn/internal/parser/Lexer.java
new file mode 100644
index 00000000000..4d99cf3ace0
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/parser/Lexer.java
@@ -0,0 +1,1647 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.parser;
+
+import static jdk.nashorn.internal.parser.TokenType.ADD;
+import static jdk.nashorn.internal.parser.TokenType.DECIMAL;
+import static jdk.nashorn.internal.parser.TokenType.EOF;
+import static jdk.nashorn.internal.parser.TokenType.EOL;
+import static jdk.nashorn.internal.parser.TokenType.ERROR;
+import static jdk.nashorn.internal.parser.TokenType.ESCSTRING;
+import static jdk.nashorn.internal.parser.TokenType.FLOATING;
+import static jdk.nashorn.internal.parser.TokenType.HEXADECIMAL;
+import static jdk.nashorn.internal.parser.TokenType.LBRACE;
+import static jdk.nashorn.internal.parser.TokenType.LPAREN;
+import static jdk.nashorn.internal.parser.TokenType.OCTAL;
+import static jdk.nashorn.internal.parser.TokenType.REGEX;
+import static jdk.nashorn.internal.parser.TokenType.RPAREN;
+import static jdk.nashorn.internal.parser.TokenType.STRING;
+import static jdk.nashorn.internal.parser.TokenType.XML;
+
+import jdk.nashorn.internal.runtime.ECMAErrors;
+import jdk.nashorn.internal.runtime.ErrorManager;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.ParserException;
+import jdk.nashorn.internal.runtime.Source;
+import jdk.nashorn.internal.runtime.options.Options;
+
+/**
+ * Responsible for converting source content into a stream of tokens.
+ *
+ */
+@SuppressWarnings("fallthrough")
+public class Lexer extends Scanner {
+    private static final boolean XML_LITERALS = Options.getBooleanProperty("nashorn.lexer.xmlliterals");
+
+    /** Content source. */
+    private final Source source;
+
+    /** Buffered stream for tokens. */
+    private final TokenStream stream;
+
+    /** True if here and edit strings are supported. */
+    private final boolean scripting;
+
+    /** True if a nested scan. (scan to completion, no EOF.) */
+    private final boolean nested;
+
+    /** Pending new line number and position. */
+    private int pendingLine;
+
+    /** Position of last EOL + 1. */
+    private int linePosition;
+
+    /** Type of last token added. */
+    private TokenType last;
+
+    private static final String JAVASCRIPT_WHITESPACE;
+    private static final String JAVASCRIPT_WHITESPACE_EOL;
+    private static final String JAVASCRIPT_WHITESPACE_IN_REGEXP;
+
+    private static final String JSON_WHITESPACE;
+    private static final String JSON_WHITESPACE_EOL;
+
+    static String unicodeEscape(final char ch) {
+        final StringBuilder sb = new StringBuilder();
+
+        sb.append("\\u");
+
+        final String hex = Integer.toHexString(ch);
+        for (int i = hex.length(); i < 4; i++) {
+            sb.append('0');
+        }
+        sb.append(hex);
+
+        return sb.toString();
+    }
+
+    static {
+        final StringBuilder ws       = new StringBuilder();
+        final StringBuilder wsEOL    = new StringBuilder();
+        final StringBuilder wsRegExp = new StringBuilder();
+        final StringBuilder jsonWs   = new StringBuilder();
+
+        jsonWs.append((char)0x000a);
+        jsonWs.append((char)0x000d);
+        JSON_WHITESPACE_EOL = jsonWs.toString();
+
+        jsonWs.append((char)0x0009);
+        jsonWs.append((char)0x0020);
+        JSON_WHITESPACE = jsonWs.toString();
+
+        for (int i = 0; i <= 0xffff; i++) {
+           switch (i) {
+            case 0x000a: // line feed
+            case 0x000d: // carriage return (ctrl-m)
+            case 0x2028: // line separator
+            case 0x2029: // paragraph separator
+                wsEOL.append((char)i);
+            case 0x0009: // tab
+            case 0x0020: // ASCII space
+            case 0x000b: // tabulation line
+            case 0x000c: // ff (ctrl-l)
+            case 0x00a0: // Latin-1 space
+            case 0x1680: // Ogham space mark
+            case 0x180e: // separator, Mongolian vowel
+            case 0x2000: // en quad
+            case 0x2001: // em quad
+            case 0x2002: // en space
+            case 0x2003: // em space
+            case 0x2004: // three-per-em space
+            case 0x2005: // four-per-em space
+            case 0x2006: // six-per-em space
+            case 0x2007: // figure space
+            case 0x2008: // punctuation space
+            case 0x2009: // thin space
+            case 0x200a: // hair space
+            case 0x202f: // narrow no-break space
+            case 0x205f: // medium mathematical space
+            case 0x3000: // ideographic space
+            case 0xfeff: // byte order mark
+                ws.append((char)i);
+
+                wsRegExp.append(Lexer.unicodeEscape((char)i));
+                break;
+
+            default:
+                break;
+            }
+        }
+
+        JAVASCRIPT_WHITESPACE = ws.toString();
+        JAVASCRIPT_WHITESPACE_EOL = wsEOL.toString();
+        JAVASCRIPT_WHITESPACE_IN_REGEXP = wsRegExp.toString();
+
+    }
+
+    /**
+     * Constructor
+     *
+     * @param source    the source
+     * @param stream    the token stream to lex
+     */
+    public Lexer(final Source source, final TokenStream stream) {
+        this(source, stream, false);
+    }
+
+    /**
+     * Constructor
+     *
+     * @param source    the source
+     * @param stream    the token stream to lex
+     * @param scripting are we in scripting mode
+     */
+    public Lexer(final Source source, final TokenStream stream, final boolean scripting) {
+        super(source.getContent(), 1, 0, source.getLength());
+
+        this.source      = source;
+        this.stream      = stream;
+        this.scripting   = scripting;
+        this.nested      = false;
+        this.pendingLine = 1;
+        this.last        = EOL;
+    }
+
+    private Lexer(final Lexer lexer, final State state) {
+        super(lexer, state);
+
+        source = lexer.source;
+        stream = lexer.stream;
+        scripting = lexer.scripting;
+        nested = true;
+
+        pendingLine = state.pendingLine;
+        linePosition = state.linePosition;
+        last = EOL;
+    }
+
+    static class State extends Scanner.State {
+        /** Pending new line number and position. */
+        public final int pendingLine;
+
+        /** Position of last EOL + 1. */
+        public final int linePosition;
+
+        /** Type of last token added. */
+        public final TokenType last;
+
+        /*
+         * Constructor.
+         */
+
+        State(final int position, final int limit, final int line, final int pendingLine, final int linePosition, final TokenType last) {
+            super(position, limit, line);
+
+            this.pendingLine = pendingLine;
+            this.linePosition = linePosition;
+            this.last = last;
+        }
+    }
+
+    /**
+     * Save the state of the scan.
+     *
+     * @return Captured state.
+     */
+    @Override
+    State saveState() {
+        return new State(position, limit, line, pendingLine, linePosition, last);
+    }
+
+    /**
+     * Restore the state of the scan.
+     *
+     * @param state
+     *            Captured state.
+     */
+    void restoreState(final State state) {
+        super.restoreState(state);
+
+        pendingLine = state.pendingLine;
+        linePosition = state.linePosition;
+        last = state.last;
+    }
+
+    /**
+     * Add a new token to the stream.
+     *
+     * @param type
+     *            Token type.
+     * @param start
+     *            Start position.
+     * @param end
+     *            End position.
+     */
+    protected void add(final TokenType type, final int start, final int end) {
+        // Record last token.
+        last = type;
+
+        // Only emit the last EOL in a cluster.
+        if (type == EOL) {
+            pendingLine = end;
+            linePosition = start;
+        } else {
+            // Write any pending EOL to stream.
+            if (pendingLine != -1) {
+                stream.put(Token.toDesc(EOL, linePosition, pendingLine));
+                pendingLine = -1;
+            }
+
+            // Write token to stream.
+            stream.put(Token.toDesc(type, start, end - start));
+        }
+    }
+
+    /**
+     * Add a new token to the stream.
+     *
+     * @param type
+     *            Token type.
+     * @param start
+     *            Start position.
+     */
+    protected void add(final TokenType type, final int start) {
+        add(type, start, position);
+    }
+
+    static String getWhitespaceRegExp() {
+        return JAVASCRIPT_WHITESPACE_IN_REGEXP;
+    }
+
+    /**
+     * Skip end of line.
+     *
+     * @param addEOL true if EOL token should be recorded.
+     */
+    private void skipEOL(final boolean addEOL) {
+
+        if (ch0 == '\r') { // detect \r\n pattern
+            skip(1);
+            if (ch0 == '\n') {
+                skip(1);
+            }
+        } else { // all other space, ch0 is guaranteed to be EOL or \0
+            skip(1);
+        }
+
+        // bump up line count
+        line++;
+
+        if (addEOL) {
+            // Add an EOL token.
+            add(EOL, position, line);
+        }
+    }
+
+    /**
+     * Skip over rest of line including end of line.
+     *
+     * @param addEOL true if EOL token should be recorded.
+     */
+    private void skipLine(final boolean addEOL) {
+        // Ignore characters.
+        while (!isEOL(ch0) && !atEOF()) {
+            skip(1);
+        }
+        // Skip over end of line.
+        skipEOL(addEOL);
+    }
+
+    /**
+     * Test whether a char is valid JavaScript whitespace
+     * @param ch a char
+     * @return true if valid JavaScript whitespace
+     */
+    public static boolean isJSWhitespace(final char ch) {
+        return JAVASCRIPT_WHITESPACE.indexOf(ch) != -1;
+    }
+
+    /**
+     * Test whether a char is valid JavaScript end of line
+     * @param ch a char
+     * @return true if valid JavaScript end of line
+     */
+    public static boolean isJSEOL(final char ch) {
+        return JAVASCRIPT_WHITESPACE_EOL.indexOf(ch) != -1;
+    }
+
+    /**
+     * Test whether a char is valid JSON whitespace
+     * @param ch a char
+     * @return true if valid JSON whitespace
+     */
+    public static boolean isJsonWhitespace(final char ch) {
+        return JSON_WHITESPACE.indexOf(ch) != -1;
+    }
+
+    /**
+     * Test whether a char is valid JSON end of line
+     * @param ch a char
+     * @return true if valid JSON end of line
+     */
+    public static boolean isJsonEOL(final char ch) {
+        return JSON_WHITESPACE_EOL.indexOf(ch) != -1;
+    }
+
+    /**
+     * Test if char is a string delimiter, e.g. '\' or '"'
+     * @param ch a char
+     * @return true if string delimiter
+     */
+    protected boolean isStringDelimiter(final char ch) {
+        return ch == '\'' || ch == '"';
+    }
+
+    /**
+     * Test whether a char is valid JavaScript whitespace
+     * @param ch a char
+     * @return true if valid JavaScript whitespace
+     */
+    protected boolean isWhitespace(final char ch) {
+        return Lexer.isJSWhitespace(ch);
+    }
+
+    /**
+     * Test whether a char is valid JavaScript end of line
+     * @param ch a char
+     * @return true if valid JavaScript end of line
+     */
+    protected boolean isEOL(final char ch) {
+        return Lexer.isJSEOL(ch);
+    }
+
+    /**
+     * Skip over whitespace and detect end of line, adding EOL tokens if
+     * encountered.
+     *
+     * @param addEOL true if EOL tokens should be recorded.
+     */
+    private void skipWhitespace(final boolean addEOL) {
+        while (isWhitespace(ch0)) {
+            if (isEOL(ch0)) {
+                skipEOL(addEOL);
+            } else {
+                skip(1);
+            }
+        }
+    }
+
+    /**
+     * Skip over comments.
+     *
+     * @return True if a comment.
+     */
+    protected boolean skipComments() {
+        if (ch0 == '/') {
+            // Is it a // comment.
+            if (ch1 == '/') {
+                // Skip over //.
+                skip(2);
+                // Scan for EOL.
+                while (!atEOF() && !isEOL(ch0)) {
+                    skip(1);
+                }
+                // Did detect a comment.
+                return true;
+            } else if (ch1 == '*') {
+                // Record beginning of comment.
+                final int start = position;
+                // Skip over /*.
+                skip(2);
+                // Scan for */.
+                while (!atEOF() && !(ch0 == '*' && ch1 == '/')) {
+                    // If end of line handle else skip character.
+                    if (isEOL(ch0)) {
+                        skipEOL(true);
+                    } else {
+                        skip(1);
+                    }
+                }
+
+                if (atEOF()) {
+                    // TODO - Report closing */ missing in parser.
+                    add(ERROR, start);
+                } else {
+                    // Skip */.
+                    skip(2);
+                }
+
+                // Did detect a comment.
+                return true;
+            }
+        }
+
+        if (scripting && ch0 == '#') {
+            // shell style comment
+            // Skip over #.
+            skip(1);
+            // Scan for EOL.
+            while (!atEOF() && !isEOL(ch0)) {
+                skip(1);
+            }
+            // Did detect a comment.
+            return true;
+        }
+
+        // Not a comment.
+        return false;
+    }
+
+    /**
+     * Convert a regex token to a token object.
+     *
+     * @param start  Position in source content.
+     * @param length Length of regex token.
+     * @return Regex token object.
+     */
+    public RegexToken valueOfPattern(final int start, final int length) {
+        // Save the current position.
+        final int savePosition = position;
+        // Reset to beginning of content.
+        reset(start);
+        // Buffer for recording characters.
+        final StringBuilder sb = new StringBuilder(length);
+
+        // Skip /.
+        skip(1);
+        boolean inBrackets = false;
+        // Scan for closing /, stopping at end of line.
+        while (!atEOF() && ch0 != '/' && !isEOL(ch0) || inBrackets) {
+            // Skip over escaped character.
+            if (ch0 == '\\') {
+                sb.append(ch0);
+                sb.append(ch1);
+                skip(2);
+            } else {
+                if (ch0 == '[') {
+                    inBrackets = true;
+                } else if (ch0 == ']') {
+                    inBrackets = false;
+                }
+
+                // Skip literal character.
+                sb.append(ch0);
+                skip(1);
+            }
+        }
+
+        // Get pattern as string.
+        final String regex = sb.toString();
+
+        // Skip /.
+        skip(1);
+
+        // Options as string.
+        final String options = source.getString(position, scanIdentifier());
+
+        reset(savePosition);
+
+        // Compile the pattern.
+        return new RegexToken(regex, options);
+    }
+
+    /**
+     * Return true if the given token can be the beginning of a literal.
+     *
+     * @param token a token
+     * @return true if token can start a literal.
+     */
+    public boolean canStartLiteral(final TokenType token) {
+        return token.startsWith('/') || ((scripting || XML_LITERALS) && token.startsWith('<'));
+    }
+
+    /**
+     * Check whether the given token represents the beginning of a literal. If so scan
+     * the literal and return <tt>true</tt>, otherwise return false.
+     *
+     * @param token the token.
+     * @param startTokenType the token type.
+     * @return True if a literal beginning with startToken was found and scanned.
+     */
+    protected boolean scanLiteral(final long token, final TokenType startTokenType) {
+        // Check if it can be a literal.
+        if (!canStartLiteral(startTokenType)) {
+            return false;
+        }
+        // We break on ambiguous tokens so if we already moved on it can't be a literal.
+        if (stream.get(stream.last()) != token) {
+            return false;
+        }
+        // Rewind to token start position
+        reset(Token.descPosition(token));
+
+        if (ch0 == '/') {
+            return scanRegEx();
+        } else if (ch0 == '<') {
+            if (ch1 == '<') {
+                return scanHereString();
+            } else if (Character.isJavaIdentifierStart(ch1)) {
+                return scanXMLLiteral();
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Scan over regex literal.
+     *
+     * @return True if a regex literal.
+     */
+    private boolean scanRegEx() {
+        assert ch0 == '/';
+        // Make sure it's not a comment.
+        if (ch1 != '/' && ch1 != '*') {
+            // Record beginning of literal.
+            final int start = position;
+            // Skip /.
+            skip(1);
+            boolean inBrackets = false;
+
+            // Scan for closing /, stopping at end of line.
+            while (!atEOF() && (ch0 != '/' || inBrackets) && !isEOL(ch0)) {
+                // Skip over escaped character.
+                if (ch0 == '\\') {
+                    skip(1);
+                    if (isEOL(ch0)) {
+                        reset(start);
+                        return false;
+                    }
+                    skip(1);
+                } else {
+                    if (ch0 == '[') {
+                        inBrackets = true;
+                    } else if (ch0 == ']') {
+                        inBrackets = false;
+                    }
+
+                    // Skip literal character.
+                    skip(1);
+                }
+            }
+
+            // If regex literal.
+            if (ch0 == '/') {
+                // Skip /.
+                skip(1);
+
+                // Skip over options.
+                while (!atEOF() && Character.isJavaIdentifierPart(ch0) || ch0 == '\\' && ch1 == 'u') {
+                    skip(1);
+                }
+
+                // Add regex token.
+                add(REGEX, start);
+                // Regex literal detected.
+                return true;
+            }
+
+            // False start try again.
+            reset(start);
+        }
+
+        // Regex literal not detected.
+        return false;
+    }
+
+    /**
+     * Convert a digit to a integer.  Can't use Character.digit since we are
+     * restricted to ASCII by the spec.
+     *
+     * @param ch   Character to convert.
+     * @param base Numeric base.
+     *
+     * @return The converted digit or -1 if invalid.
+     */
+    private static int convertDigit(final char ch, final int base) {
+        int digit;
+
+        if ('0' <= ch && ch <= '9') {
+            digit = ch - '0';
+        } else if ('A' <= ch && ch <= 'Z') {
+            digit = ch - 'A' + 10;
+        } else if ('a' <= ch && ch <= 'z') {
+            digit = ch - 'a' + 10;
+        } else {
+            return -1;
+        }
+
+        return digit < base ? digit : -1;
+    }
+
+
+    /**
+     * Get the value of a numeric sequence.
+     *
+     * @param base  Numeric base.
+     * @param max   Maximum number of digits.
+     * @param skip  Skip over escape first.
+     * @param check Tells whether to throw error if a digit is invalid for the given base.
+     * @param type  Type of token to report against.
+     *
+     * @return Value of sequence or < 0 if no digits.
+     */
+    private int valueOfSequence(final int base, final int max, final boolean skip, final boolean check, final TokenType type) {
+        assert base == 16 || base == 8 : "base other than 16 or 8";
+        final boolean isHex = base == 16;
+        final int shift = isHex ? 4 : 3;
+        int value = 0;
+
+        if (skip) {
+            skip(2);
+        }
+
+        for (int i = 0; i < max; i++) {
+            final int digit = convertDigit(ch0, base);
+
+            if (digit == -1) {
+                if (check) {
+                    error(Lexer.message("invalid." + (isHex ? "hex" : "octal")), type, position, limit);
+                }
+                return i == 0 ? -1 : value;
+            }
+
+            value = value << shift | digit;
+            skip(1);
+        }
+
+        return value;
+    }
+
+    /**
+     * Convert a string to a JavaScript identifier.
+     *
+     * @param start  Position in source content.
+     * @param length Length of token.
+     * @return Ident string or null if an error.
+     */
+    private String valueOfIdent(final int start, final int length) throws RuntimeException {
+        // Save the current position.
+        final int savePosition = position;
+        // End of scan.
+        final int end = start + length;
+        // Reset to beginning of content.
+        reset(start);
+        // Buffer for recording characters.
+        final StringBuilder sb = new StringBuilder(length);
+
+        // Scan until end of line or end of file.
+        while (!atEOF() && position < end && !isEOL(ch0)) {
+            // If escape character.
+            if (ch0 == '\\' && ch1 == 'u') {
+                final int ch = valueOfSequence(16, 4, true, true, TokenType.IDENT);
+                if (isWhitespace((char)ch)) {
+                    return null;
+                }
+                if (ch < 0) {
+                    sb.append('\\');
+                    sb.append('u');
+                } else {
+                    sb.append((char)ch);
+                }
+            } else {
+                // Add regular character.
+                sb.append(ch0);
+                skip(1);
+            }
+        }
+
+        // Restore position.
+        reset(savePosition);
+
+        return sb.toString();
+    }
+
+    /**
+     * Scan over and identifier or keyword. Handles identifiers containing
+     * encoded Unicode chars.
+     *
+     * Example:
+     *
+     * var \u0042 = 44;
+     */
+    private void scanIdentifierOrKeyword() {
+        // Record beginning of identifier.
+        final int start = position;
+        // Scan identifier.
+        final int length = scanIdentifier();
+        // Check to see if it is a keyword.
+        final TokenType type = TokenLookup.lookupKeyword(content, start, length);
+        // Add keyword or identifier token.
+        add(type, start);
+    }
+
+    /**
+     * Convert a string to a JavaScript string object.
+     *
+     * @param start  Position in source content.
+     * @param length Length of token.
+     * @return JavaScript string object.
+     */
+    private String valueOfString(final int start, final int length, final boolean strict) throws RuntimeException {
+        // Save the current position.
+        final int savePosition = position;
+        // Calculate the end position.
+        final int end = start + length;
+        // Reset to beginning of string.
+        reset(start);
+
+        // Buffer for recording characters.
+        final StringBuilder sb = new StringBuilder(length);
+
+        // Scan until end of string.
+        while (position < end) {
+            // If escape character.
+            if (ch0 == '\\') {
+                skip(1);
+
+                final char next = ch0;
+                final int afterSlash = position;
+
+                skip(1);
+
+                // Special characters.
+                switch (next) {
+                case '0':
+                case '1':
+                case '2':
+                case '3':
+                case '4':
+                case '5':
+                case '6':
+                case '7': {
+                    if (strict) {
+                        // "\0" itself is allowed in strict mode. Only other 'real'
+                        // octal escape sequences are not allowed (eg. "\02", "\31").
+                        // See section 7.8.4 String literals production EscapeSequence
+                        if (next != '0' || (ch0 >= '0' && ch0 <= '9')) {
+                            error(Lexer.message("strict.no.octal"), STRING, position, limit);
+                        }
+                    }
+                    reset(afterSlash);
+                    // Octal sequence.
+                    final int ch = valueOfSequence(8, 3, false, false, STRING);
+
+                    if (ch < 0) {
+                        sb.append('\\');
+                        sb.append('x');
+                    } else {
+                        sb.append((char)ch);
+                    }
+                    break;
+                }
+                case 'n':
+                    sb.append('\n');
+                    break;
+                case 't':
+                    sb.append('\t');
+                    break;
+                case 'b':
+                    sb.append('\b');
+                    break;
+                case 'f':
+                    sb.append('\f');
+                    break;
+                case 'r':
+                    sb.append('\r');
+                    break;
+                case '\'':
+                    sb.append('\'');
+                    break;
+                case '\"':
+                    sb.append('\"');
+                    break;
+                case '\\':
+                    sb.append('\\');
+                    break;
+                case '\r': // CR | CRLF
+                    if (ch0 == '\n') {
+                        skip(1);
+                    }
+                    // fall through
+                case '\n': // LF
+                case '\u2028': // LS
+                case '\u2029': // PS
+                    // continue on the next line, slash-return continues string
+                    // literal
+                    break;
+                case 'x': {
+                    // Hex sequence.
+                    final int ch = valueOfSequence(16, 2, false, true, STRING);
+
+                    if (ch < 0) {
+                        sb.append('\\');
+                        sb.append('x');
+                    } else {
+                        sb.append((char)ch);
+                    }
+                }
+                    break;
+                case 'u': {
+                    // Unicode sequence.
+                    final int ch = valueOfSequence(16, 4, false, true, STRING);
+
+                    if (ch < 0) {
+                        sb.append('\\');
+                        sb.append('u');
+                    } else {
+                        sb.append((char)ch);
+                    }
+                }
+                    break;
+                case 'v':
+                    sb.append('\u000B');
+                    break;
+                // All other characters.
+                default:
+                    sb.append(next);
+                    break;
+                }
+            } else {
+                // Add regular character.
+                sb.append(ch0);
+                skip(1);
+            }
+        }
+
+        // Restore position.
+        reset(savePosition);
+
+        return sb.toString();
+    }
+
+    /**
+     * Scan over a string literal.
+     */
+    private void scanString(final boolean add) {
+        // Type of string.
+        TokenType type = STRING;
+        // Record starting quote.
+        final char quote = ch0;
+        // Skip over quote.
+        skip(1);
+
+        // Record beginning of string content.
+        final State stringState = saveState();
+
+        // Scan until close quote or end of line.
+        while (!atEOF() && ch0 != quote && !isEOL(ch0)) {
+            // Skip over escaped character.
+            if (ch0 == '\\') {
+                type = ESCSTRING;
+                skip(1);
+                if (isEOL(ch0)) {
+                    // Multiline string literal
+                    skipEOL(false);
+                    continue;
+                }
+            }
+            // Skip literal character.
+            skip(1);
+        }
+
+        // If close quote.
+        if (ch0 == quote) {
+            // Skip close quote.
+            skip(1);
+        } else {
+            error(Lexer.message("missing.close.quote"), STRING, position, limit);
+        }
+
+        // If not just scanning.
+        if (add) {
+            // Record end of string.
+            stringState.setLimit(position - 1);
+
+            // Only edit double quoted strings.
+            if (scripting && quote == '\"' && !stringState.isEmpty()) {
+                // Edit string.
+                editString(type, stringState);
+            } else {
+                // Add string token.
+                add(type, stringState.position, stringState.limit);
+            }
+        }
+    }
+
+    /**
+     * Convert string to number.
+     *
+     * @param valueString  String to convert.
+     * @param radix        Numeric base.
+     * @return Converted number.
+     */
+    private static Number valueOf(final String valueString, final int radix) throws NumberFormatException {
+        try {
+            return Integer.valueOf(valueString, radix);
+        } catch (final NumberFormatException e) {
+            try {
+                return Long.valueOf(valueString, radix);
+            } catch (final NumberFormatException e2) {
+                if (radix == 10) {
+                    return Double.valueOf(valueString);
+                }
+
+                double value = 0.0;
+
+                for (int i = 0; i < valueString.length(); i++) {
+                    final char ch = valueString.charAt(i);
+                    // Preverified, should always be a valid digit.
+                    final int digit = convertDigit(ch, radix);
+                    value *= radix;
+                    value += digit;
+                }
+
+                return value;
+            }
+        }
+    }
+
+    /**
+     * Convert string to number.
+     *
+     * @param valueString String to convert.
+     * @return Converted number.
+     */
+    private static Number valueOf(final String valueString) throws NumberFormatException {
+        return JSType.narrowestIntegerRepresentation(Double.valueOf(valueString));
+    }
+
+    /**
+     * Scan a number.
+     */
+    private void scanNumber() {
+        // Record beginning of number.
+        final int start = position;
+        // Assume value is a decimal.
+        TokenType type = DECIMAL;
+
+        // First digit of number.
+        int digit = convertDigit(ch0, 10);
+
+        // If number begins with 0x.
+        if (digit == 0 && (ch1 == 'x' || ch1 == 'X') && convertDigit(ch2, 16) != -1) {
+            // Skip over 0xN.
+            skip(3);
+            // Skip over remaining digits.
+            while (convertDigit(ch0, 16) != -1) {
+                skip(1);
+            }
+
+            type = HEXADECIMAL;
+        } else {
+            // Check for possible octal constant.
+            boolean octal = digit == 0;
+            // Skip first digit if not leading '.'.
+            if (digit != -1) {
+                skip(1);
+            }
+
+            // Skip remaining digits.
+            while ((digit = convertDigit(ch0, 10)) != -1) {
+                // Check octal only digits.
+                octal = octal && digit < 8;
+                // Skip digit.
+                skip(1);
+            }
+
+            if (octal && position - start > 1) {
+                type = OCTAL;
+            } else if (ch0 == '.' || ch0 == 'E' || ch0 == 'e') {
+                // Must be a double.
+                if (ch0 == '.') {
+                    // Skip period.
+                    skip(1);
+                    // Skip mantissa.
+                    while (convertDigit(ch0, 10) != -1) {
+                        skip(1);
+                    }
+                }
+
+                // Detect exponent.
+                if (ch0 == 'E' || ch0 == 'e') {
+                    // Skip E.
+                    skip(1);
+                    // Detect and skip exponent sign.
+                    if (ch0 == '+' || ch0 == '-') {
+                        skip(1);
+                    }
+                    // Skip exponent.
+                    while (convertDigit(ch0, 10) != -1) {
+                        skip(1);
+                    }
+                }
+
+                type = FLOATING;
+            }
+        }
+
+        // Add number token.
+        add(type, start);
+    }
+
+    /**
+     * Convert a regex token to a token object.
+     *
+     * @param start  Position in source content.
+     * @param length Length of regex token.
+     * @return Regex token object.
+     */
+    XMLToken valueOfXML(final int start, final int length) {
+        return new XMLToken(source.getString(start, length));
+    }
+
+    /**
+     * Scan over a XML token.
+     *
+     * @return TRUE if is an XML literal.
+     */
+    private boolean scanXMLLiteral() {
+        assert ch0 == '<' && Character.isJavaIdentifierStart(ch1);
+        if (XML_LITERALS) {
+            // Record beginning of xml expression.
+            final int start = position;
+
+            int openCount = 0;
+
+            do {
+                if (ch0 == '<') {
+                    if (ch1 == '/' && Character.isJavaIdentifierStart(ch2)) {
+                        skip(3);
+                        openCount--;
+                    } else if (Character.isJavaIdentifierStart(ch1)) {
+                        skip(2);
+                        openCount++;
+                    } else if (ch1 == '?') {
+                        skip(2);
+                    } else if (ch1 == '!' && ch2 == '-' && ch3 == '-') {
+                        skip(4);
+                    } else {
+                        reset(start);
+                        return false;
+                    }
+
+                    while (!atEOF() && ch0 != '>') {
+                        if (ch0 == '/' && ch1 == '>') {
+                            openCount--;
+                            skip(1);
+                            break;
+                        } else if (ch0 == '\"' || ch0 == '\'') {
+                            scanString(false);
+                        } else {
+                            skip(1);
+                        }
+                    }
+
+                    if (ch0 != '>') {
+                        reset(start);
+                        return false;
+                    }
+
+                    skip(1);
+                } else if (atEOF()) {
+                    reset(start);
+                    return false;
+                } else {
+                    skip(1);
+                }
+            } while (openCount > 0);
+
+            add(XML, start);
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Scan over identifier characters.
+     *
+     * @return Length of identifier or zero if none found.
+     */
+    private int scanIdentifier() {
+        final int start = position;
+
+        // Make sure first character is valid start character.
+        if (ch0 == '\\' && ch1 == 'u') {
+            final int ch = valueOfSequence(16, 4, true, true, TokenType.IDENT);
+
+            if (!Character.isJavaIdentifierStart(ch)) {
+                error(Lexer.message("illegal.identifier.character"), TokenType.IDENT, start, position);
+            }
+        } else if (!Character.isJavaIdentifierStart(ch0)) {
+            // Not an identifier.
+            return 0;
+        }
+
+        // Make sure remaining characters are valid part characters.
+        while (!atEOF()) {
+            if (ch0 == '\\' && ch1 == 'u') {
+                final int ch = valueOfSequence(16, 4, true, true, TokenType.IDENT);
+
+                if (!Character.isJavaIdentifierPart(ch)) {
+                    error(Lexer.message("illegal.identifier.character"), TokenType.IDENT, start, position);
+                }
+            } else if (Character.isJavaIdentifierPart(ch0)) {
+                skip(1);
+            } else {
+                break;
+            }
+        }
+
+        // Length of identifier sequence.
+        return position - start;
+    }
+
+    /**
+     * Compare two identifiers (in content) for equality.
+     *
+     * @param aStart  Start of first identifier.
+     * @param aLength Length of first identifier.
+     * @param bStart  Start of second identifier.
+     * @param bLength Length of second identifier.
+     * @return True if equal.
+     */
+    private boolean identifierEqual(final int aStart, final int aLength, final int bStart, final int bLength) {
+        if (aLength == bLength) {
+            for (int i = 0; i < aLength; i++) {
+                if (content[aStart + i] != content[bStart + i]) {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Detect if a line starts with a marker identifier.
+     *
+     * @param identStart  Start of identifier.
+     * @param identLength Length of identifier.
+     * @return True if detected.
+     */
+    private boolean hasHereMarker(final int identStart, final int identLength) {
+        // Skip any whitespace.
+        skipWhitespace(false);
+
+        return identifierEqual(identStart, identLength, position, scanIdentifier());
+    }
+
+    /**
+     * Lexer to service edit strings.
+     */
+    private static class EditStringLexer extends Lexer {
+        /** Type of string literals to emit. */
+        final TokenType stringType;
+
+        /*
+         * Constructor.
+         */
+
+        EditStringLexer(final Lexer lexer, final TokenType stringType, final State stringState) {
+            super(lexer, stringState);
+
+            this.stringType = stringType;
+        }
+
+        /**
+         * Lexify the contents of the string.
+         */
+        @Override
+        public void lexify() {
+            // Record start of string position.
+            int stringStart = position;
+            // Indicate that the priming first string has not been emitted.
+            boolean primed = false;
+
+            while (true) {
+                // Detect end of content.
+                if (atEOF()) {
+                    break;
+                }
+
+                // Honour escapes (should be well formed.)
+                if (ch0 == '\\' && stringType == ESCSTRING) {
+                    skip(2);
+
+                    continue;
+                }
+
+                // If start of expression.
+                if (ch0 == '$' && ch1 == '{') {
+                    if (!primed || stringStart != position) {
+                        if (primed) {
+                            add(ADD, stringStart, stringStart + 1);
+                        }
+
+                        add(stringType, stringStart, position);
+                        primed = true;
+                    }
+
+                    // Skip ${
+                    skip(2);
+
+                    // Save expression state.
+                    final State expressionState = saveState();
+
+                    // Start with one open brace.
+                    int braceCount = 1;
+
+                    // Scan for the rest of the string.
+                    while (!atEOF()) {
+                        // If closing brace.
+                        if (ch0 == '}') {
+                            // Break only only if matching brace.
+                            if (--braceCount == 0) {
+                                break;
+                            }
+                        } else if (ch0 == '{') {
+                            // Bump up the brace count.
+                            braceCount++;
+                        }
+
+                        // Skip to next character.
+                        skip(1);
+                    }
+
+                    // If braces don't match then report an error.
+                    if (braceCount != 0) {
+                        error(Lexer.message("edit.string.missing.brace"), LBRACE, expressionState.position - 1, 1);
+                    }
+
+                    // Mark end of expression.
+                    expressionState.setLimit(position);
+                    // Skip closing brace.
+                    skip(1);
+
+                    // Start next string.
+                    stringStart = position;
+
+                    // Concatenate expression.
+                    add(ADD, expressionState.position, expressionState.position + 1);
+                    add(LPAREN, expressionState.position, expressionState.position + 1);
+
+                    // Scan expression.
+                    final Lexer lexer = new Lexer(this, expressionState);
+                    lexer.lexify();
+
+                    // Close out expression parenthesis.
+                    add(RPAREN, position - 1, position);
+
+                    continue;
+                }
+
+                // Next character in string.
+                skip(1);
+            }
+
+            // If there is any unemitted string portion.
+            if (stringStart != limit) {
+                // Concatenate remaining string.
+                if (primed) {
+                    add(ADD, stringStart, 1);
+                }
+
+                add(stringType, stringStart, limit);
+            }
+        }
+
+    }
+
+    /**
+     * Edit string for nested expressions.
+     *
+     * @param stringType  Type of string literals to emit.
+     * @param stringState State of lexer at start of string.
+     */
+    private void editString(final TokenType stringType, final State stringState) {
+        // Use special lexer to scan string.
+        final EditStringLexer lexer = new EditStringLexer(this, stringType, stringState);
+        lexer.lexify();
+
+        // Need to keep lexer informed.
+        last = stringType;
+    }
+
+    /**
+     * Scan over a here string.
+     *
+     * @return TRUE if is a here string.
+     */
+    private boolean scanHereString() {
+        assert ch0 == '<' && ch1 == '<';
+        if (scripting) {
+            // Record beginning of here string.
+            final State saved = saveState();
+
+            // << or <<<
+            final boolean excludeLastEOL = ch2 != '<';
+
+            if (excludeLastEOL) {
+                skip(2);
+            } else {
+                skip(3);
+            }
+
+            // Scan identifier.
+            final int identStart = position;
+            final int identLength = scanIdentifier();
+
+            // Check for identifier.
+            if (identLength == 0) {
+                // Treat as shift.
+                restoreState(saved);
+
+                return false;
+            }
+
+            // Record rest of line.
+            final State restState = saveState();
+            skipLine(false);
+            restState.setLimit(position);
+
+            // Record beginning of string.
+            final State stringState = saveState();
+            int stringEnd = position;
+
+            // Hunt down marker.
+            while (!atEOF()) {
+                // Skip any whitespace.
+                skipWhitespace(false);
+
+                if (hasHereMarker(identStart, identLength)) {
+                    break;
+                }
+
+                skipLine(false);
+                stringEnd = position;
+            }
+
+            // Record end of string.
+            stringState.setLimit(stringEnd);
+
+            // If marker is missing.
+            if (stringState.isEmpty() || atEOF()) {
+                error(Lexer.message("here.missing.end.marker", source.getString(identStart, identLength)), last, position, position);
+                restoreState(saved);
+
+                return false;
+            }
+
+            // Remove last end of line if specified.
+            if (excludeLastEOL) {
+                // Handles \n.
+                if (content[stringEnd - 1] == '\n') {
+                    stringEnd--;
+                }
+
+                // Handles \r and \r\n.
+                if (content[stringEnd - 1] == '\r') {
+                    stringEnd--;
+                }
+
+                // Update end of string.
+                stringState.setLimit(stringEnd);
+            }
+
+            // Edit string if appropriate.
+            if (scripting && !stringState.isEmpty()) {
+                editString(STRING, stringState);
+            } else {
+                // Add here string.
+                add(STRING, stringState.position, stringState.limit);
+            }
+
+            // Scan rest of original line.
+            final Lexer restLexer = new Lexer(this, restState);
+
+            restLexer.lexify();
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Breaks source content down into lex units, adding tokens to the token
+     * stream. The routine scans until the stream buffer is full. Can be called
+     * repeatedly until EOF is detected.
+     */
+    public void lexify() {
+        while (!stream.isFull() || nested) {
+            // Skip over whitespace.
+            skipWhitespace(true);
+
+            // Detect end of file.
+            if (atEOF()) {
+                if (!nested) {
+                    // Add an EOF token at the end.
+                    add(EOF, position);
+                }
+
+                break;
+            }
+
+            // Check for comments. Note that we don't scan for regexp and other literals here as
+            // we may not have enough context to distinguish them from similar looking operators.
+            // Instead we break on ambiguous operators below and let the parser decide.
+            if (ch0 == '/' && skipComments()) {
+                continue;
+            }
+
+            if (scripting && ch0 == '#' && skipComments()) {
+                continue;
+            }
+
+            // TokenType for lookup of delimiter or operator.
+            TokenType type;
+
+            if (ch0 == '.' && convertDigit(ch1, 10) != -1) {
+                // '.' followed by digit.
+                // Scan and add a number.
+                scanNumber();
+            } else if ((type = TokenLookup.lookupOperator(ch0, ch1, ch2, ch3)) != null) {
+                // Get the number of characters in the token.
+                final int typeLength = type.getLength();
+                // Skip that many characters.
+                skip(typeLength);
+                // Add operator token.
+                add(type, position - typeLength);
+                // Some operator tokens also mark the beginning of regexp, XML, or here string literals.
+                // We break to let the parser decide what it is.
+                if (canStartLiteral(type)) {
+                    break;
+                }
+            } else if (Character.isJavaIdentifierStart(ch0) || ch0 == '\\' && ch1 == 'u') {
+                // Scan and add identifier or keyword.
+                scanIdentifierOrKeyword();
+            } else if (isStringDelimiter(ch0)) {
+                // Scan and add a string.
+                scanString(true);
+            } else if (Character.isDigit(ch0)) {
+                // Scan and add a number.
+                scanNumber();
+            } else {
+                // Don't recognize this character.
+                skip(1);
+                add(ERROR, position - 1);
+            }
+        }
+    }
+
+    /**
+     * Return value of token given its token descriptor.
+     *
+     * @param token  Token descriptor.
+     * @return JavaScript value.
+     */
+    Object getValueOf(final long token, final boolean strict) {
+        final int start = Token.descPosition(token);
+        final int len = Token.descLength(token);
+
+        switch (Token.descType(token)) {
+        case DECIMAL:
+            return Lexer.valueOf(source.getString(start, len), 10); // number
+        case OCTAL:
+            return Lexer.valueOf(source.getString(start, len), 8); // number
+        case HEXADECIMAL:
+            return Lexer.valueOf(source.getString(start + 2, len - 2), 16); // number
+        case FLOATING:
+            return Lexer.valueOf(source.getString(start, len)); // number
+        case STRING:
+            return source.getString(start, len); // String
+        case ESCSTRING:
+            return valueOfString(start, len, strict); // String
+        case IDENT:
+            return valueOfIdent(start, len); // String
+        case REGEX:
+            return valueOfPattern(start, len); // RegexToken::LexerToken
+        case XML:
+            return valueOfXML(start, len); // XMLToken::LexerToken
+        default:
+            break;
+        }
+
+        return null;
+    }
+
+    private static String message(final String msgId, final String... args) {
+        return ECMAErrors.getMessage("lexer.error." + msgId, args);
+    }
+
+    /**
+     * Generate a runtime exception
+     *
+     * @param message       error message
+     * @param type          token type
+     * @param start         start position of lexed error
+     * @param length        length of lexed error
+     * @throws ParserException  unconditionally
+     */
+    protected void error(final String message, final TokenType type, final int start, final int length) throws ParserException {
+        final long token     = Token.toDesc(type, start, length);
+        final int  pos       = Token.descPosition(token);
+        final int  lineNum   = source.getLine(pos);
+        final int  columnNum = source.getColumn(pos);
+        final String formatted = ErrorManager.format(message, source, lineNum, columnNum, token);
+        throw new ParserException(formatted, source, lineNum, columnNum, token);
+    }
+
+    /**
+     * Helper class for Lexer tokens, e.g XML or RegExp tokens.
+     * This is the abstract superclass
+     */
+    public static abstract class LexerToken {
+        private final String expression;
+
+        /**
+         * Constructor
+         * @param expression token expression
+         */
+        protected LexerToken(final String expression) {
+            this.expression = expression;
+        }
+
+        /**
+         * Get the expression
+         * @return expression
+         */
+        public String getExpression() {
+            return expression;
+        }
+    }
+
+    /**
+     * Temporary container for regular expressions.
+     */
+    public static class RegexToken extends LexerToken {
+        /** Options. */
+        private final String options;
+
+        /**
+         * Constructor.
+         *
+         * @param expression  regexp expression
+         * @param options     regexp options
+         */
+        public RegexToken(final String expression, final String options) {
+            super(expression);
+            this.options = options;
+        }
+
+        /**
+         * Get regexp options
+         * @return options
+         */
+        public String getOptions() {
+            return options;
+        }
+
+        @Override
+        public String toString() {
+            return '/' + getExpression() + '/' + options;
+        }
+    }
+
+    /**
+     * Temporary container for XML expression.
+     */
+    public static class XMLToken extends LexerToken {
+
+        /**
+         * Constructor.
+         *
+         * @param expression  XML expression
+         */
+        public XMLToken(final String expression) {
+            super(expression);
+        }
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/parser/Parser.java b/nashorn/src/jdk/nashorn/internal/parser/Parser.java
new file mode 100644
index 00000000000..c2ca6662377
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/parser/Parser.java
@@ -0,0 +1,2981 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.parser;
+
+import static jdk.nashorn.internal.codegen.CompilerConstants.ARGUMENTS;
+import static jdk.nashorn.internal.codegen.CompilerConstants.EVAL;
+import static jdk.nashorn.internal.codegen.CompilerConstants.FUNCTION_PREFIX;
+import static jdk.nashorn.internal.codegen.CompilerConstants.RUN_SCRIPT;
+import static jdk.nashorn.internal.parser.TokenType.ASSIGN;
+import static jdk.nashorn.internal.parser.TokenType.CASE;
+import static jdk.nashorn.internal.parser.TokenType.CATCH;
+import static jdk.nashorn.internal.parser.TokenType.COLON;
+import static jdk.nashorn.internal.parser.TokenType.COMMARIGHT;
+import static jdk.nashorn.internal.parser.TokenType.DECPOSTFIX;
+import static jdk.nashorn.internal.parser.TokenType.DECPREFIX;
+import static jdk.nashorn.internal.parser.TokenType.ELSE;
+import static jdk.nashorn.internal.parser.TokenType.EOF;
+import static jdk.nashorn.internal.parser.TokenType.EOL;
+import static jdk.nashorn.internal.parser.TokenType.FINALLY;
+import static jdk.nashorn.internal.parser.TokenType.FUNCTION;
+import static jdk.nashorn.internal.parser.TokenType.IDENT;
+import static jdk.nashorn.internal.parser.TokenType.IF;
+import static jdk.nashorn.internal.parser.TokenType.INCPOSTFIX;
+import static jdk.nashorn.internal.parser.TokenType.LBRACE;
+import static jdk.nashorn.internal.parser.TokenType.LPAREN;
+import static jdk.nashorn.internal.parser.TokenType.RBRACE;
+import static jdk.nashorn.internal.parser.TokenType.RBRACKET;
+import static jdk.nashorn.internal.parser.TokenType.RPAREN;
+import static jdk.nashorn.internal.parser.TokenType.SEMICOLON;
+import static jdk.nashorn.internal.parser.TokenType.TERNARY;
+import static jdk.nashorn.internal.parser.TokenType.WHILE;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Stack;
+import jdk.nashorn.internal.codegen.Compiler;
+import jdk.nashorn.internal.ir.AccessNode;
+import jdk.nashorn.internal.ir.BinaryNode;
+import jdk.nashorn.internal.ir.Block;
+import jdk.nashorn.internal.ir.BreakNode;
+import jdk.nashorn.internal.ir.BreakableNode;
+import jdk.nashorn.internal.ir.CallNode;
+import jdk.nashorn.internal.ir.CaseNode;
+import jdk.nashorn.internal.ir.CatchNode;
+import jdk.nashorn.internal.ir.ContinueNode;
+import jdk.nashorn.internal.ir.DoWhileNode;
+import jdk.nashorn.internal.ir.EmptyNode;
+import jdk.nashorn.internal.ir.ExecuteNode;
+import jdk.nashorn.internal.ir.ForNode;
+import jdk.nashorn.internal.ir.FunctionNode;
+import jdk.nashorn.internal.ir.IdentNode;
+import jdk.nashorn.internal.ir.IfNode;
+import jdk.nashorn.internal.ir.IndexNode;
+import jdk.nashorn.internal.ir.LabelNode;
+import jdk.nashorn.internal.ir.LineNumberNode;
+import jdk.nashorn.internal.ir.LiteralNode;
+import jdk.nashorn.internal.ir.Node;
+import jdk.nashorn.internal.ir.ObjectNode;
+import jdk.nashorn.internal.ir.PropertyKey;
+import jdk.nashorn.internal.ir.PropertyNode;
+import jdk.nashorn.internal.ir.ReferenceNode;
+import jdk.nashorn.internal.ir.ReturnNode;
+import jdk.nashorn.internal.ir.RuntimeNode;
+import jdk.nashorn.internal.ir.SwitchNode;
+import jdk.nashorn.internal.ir.TernaryNode;
+import jdk.nashorn.internal.ir.ThrowNode;
+import jdk.nashorn.internal.ir.TryNode;
+import jdk.nashorn.internal.ir.UnaryNode;
+import jdk.nashorn.internal.ir.VarNode;
+import jdk.nashorn.internal.ir.WhileNode;
+import jdk.nashorn.internal.ir.WithNode;
+import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.runtime.JSErrorType;
+import jdk.nashorn.internal.runtime.ParserException;
+import jdk.nashorn.internal.runtime.linker.LinkerCallSite;
+
+/**
+ * Builds the IR.
+ *
+ */
+public class Parser extends AbstractParser {
+    /** Code generator. */
+    private final Compiler compiler;
+
+    private final Context context;
+
+    /** Top level script being compiled. */
+    private FunctionNode script;
+
+    /** Current function being compiled. */
+    private FunctionNode function;
+
+    /** Current parsing block. */
+    private Block block;
+
+    /**
+     * Construct a parser.
+     * @param compiler Compiler state used to parse.
+     */
+    public Parser(final Compiler compiler) {
+        this(compiler, compiler.getContext()._strict);
+    }
+
+    /**
+     * Construct a parser.
+     * @param compiler Compiler state used to parse.
+     * @param strict parser created with strict mode enabled.
+     */
+    public Parser(final Compiler compiler, final boolean strict) {
+        super(compiler.getSource(), compiler.getErrors(), strict);
+
+        this.compiler = compiler;
+        this.context  = compiler.getContext();
+    }
+
+    /**
+     * Parse source content.
+     * @param scriptName file name for script
+     * @return Top level function (script).
+     */
+    public FunctionNode parse(final String scriptName) {
+        try {
+            stream = new TokenStream();
+            lexer  = new Lexer(source, stream, context._scripting);
+
+            // Set up first token (skips opening EOL.)
+            k = -1;
+            next();
+
+            // Begin parse.
+            return program(scriptName);
+        } catch (final Exception e) {
+            // Extract message from exception.  The message will be in error
+            // message format.
+            String message = e.getMessage();
+
+            // If empty message.
+            if (message == null) {
+                message = e.toString();
+            }
+
+            // Issue message.
+            if (e instanceof ParserException) {
+                errors.error((ParserException)e);
+            } else {
+                errors.error(message);
+            }
+
+            if (context._dump_on_error) {
+                e.printStackTrace(context.getErr());
+            }
+
+            return null;
+         }
+    }
+
+    /**
+     * Skip to a good parsing recovery point.
+     */
+    private void recover(final Exception e) {
+        if (e != null) {
+            // Extract message from exception.  The message will be in error
+            // message format.
+            String message = e.getMessage();
+
+            // If empty message.
+            if (message == null) {
+                message = e.toString();
+            }
+
+            // Issue message.
+            if (e instanceof ParserException) {
+                errors.error((ParserException)e);
+            } else {
+                errors.error(message);
+            }
+
+            if (context._dump_on_error) {
+                e.printStackTrace(context.getErr());
+            }
+        }
+
+        // Skip to a recovery point.
+loop:
+        while (true) {
+            switch (type) {
+            case EOF:
+                // Can not go any further.
+                break loop;
+            case EOL:
+            case SEMICOLON:
+            case RBRACE:
+                // Good recovery points.
+                next();
+                break loop;
+            default:
+                // So we can recover after EOL.
+                nextOrEOL();
+                break;
+            }
+        }
+    }
+
+    /**
+     * Set up a new block.
+     *
+     * @return New block.
+     */
+    private Block newBlock() {
+        return block = new Block(source, token, Token.descPosition(token), block, function);
+    }
+
+    /**
+     * Set up a new function block.
+     *
+     * @param ident Name of function.
+     * @return New block.
+     */
+    private FunctionNode newFunctionBlock(final IdentNode ident) {
+        // Build function name.
+        final StringBuilder sb = new StringBuilder();
+
+        if (block != null) {
+            block.addParentName(sb);
+        }
+
+        sb.append(ident != null ? ident.getName() : FUNCTION_PREFIX.tag());
+        final String name = compiler.uniqueName(sb.toString());
+        assert function != null || name.equals(RUN_SCRIPT.tag())  : "name = " + name;// must not rename runScript().
+
+        // Start new block.
+        final FunctionNode functionBlock = new FunctionNode(source, token, Token.descPosition(token), compiler, block, ident, name);
+        block = function = functionBlock;
+        function.setStrictMode(isStrictMode);
+
+        return functionBlock;
+    }
+
+    /**
+     * Restore the current block.
+     */
+    private void restoreBlock() {
+        block = block.getParent();
+        function = block.getFunction();
+    }
+
+    /**
+     * Get the statements in a block.
+     * @return Block statements.
+     */
+    private Block getBlock(final boolean needsBraces) {
+        // Set up new block. Captures LBRACE.
+        final Block newBlock = newBlock();
+        pushControlNode(newBlock);
+
+        // Block opening brace.
+        if (needsBraces) {
+            expect(LBRACE);
+        }
+
+        try {
+            // Accumulate block statements.
+            statementList();
+        } finally {
+            restoreBlock();
+            popControlNode();
+        }
+
+    final int possibleEnd = Token.descPosition(token) + Token.descLength(token);
+
+        // Block closing brace.
+        if (needsBraces) {
+            expect(RBRACE);
+        }
+
+        newBlock.setFinish(possibleEnd);
+
+        return newBlock;
+    }
+
+    /**
+     * Get all the statements generated by a single statement.
+     * @return Statements.
+     */
+    private Block getStatement() {
+        if (type == LBRACE) {
+            return getBlock(true);
+        }
+        // Set up new block. Captures first token.
+        final Block newBlock = newBlock();
+
+        try {
+            // Accumulate statements.
+            statement();
+        } finally {
+            restoreBlock();
+        }
+
+        return newBlock;
+    }
+
+    /**
+     * Detect calls to special functions.
+     * @param ident Called function.
+     */
+    private void detectSpecialFunction(final IdentNode ident) {
+        final String name = ident.getName();
+
+        if (EVAL.tag().equals(name)) {
+            function.setHasEval();
+            function.setIsVarArg();
+        }
+    }
+
+    /**
+     * Detect use of special properties.
+     * @param ident Referenced property.
+     */
+    private void detectSpecialProperty(final IdentNode ident) {
+        final String name = ident.getName();
+
+        if (ARGUMENTS.tag().equals(name)) {
+            function.setIsVarArg();
+        }
+    }
+
+    /**
+     * Tells whether a IdentNode can be used as L-value of an assignment
+     *
+     * @param ident IdentNode to be checked
+     * @return whether the ident can be used as L-value
+     */
+    private static boolean checkIdentLValue(final IdentNode ident) {
+        return Token.descType(ident.getToken()).getKind() != TokenKind.KEYWORD;
+    }
+
+    /**
+     * Verify an assignment expression.
+     * @param op  Operation token.
+     * @param lhs Left hand side expression.
+     * @param rhs Right hand side expression.
+     * @return Verified expression.
+     */
+    private Node verifyAssignment(final long op, final Node lhs, final Node rhs) {
+        final TokenType opType = Token.descType(op);
+
+        switch (opType) {
+        case ASSIGN:
+        case ASSIGN_ADD:
+        case ASSIGN_BIT_AND:
+        case ASSIGN_BIT_OR:
+        case ASSIGN_BIT_XOR:
+        case ASSIGN_DIV:
+        case ASSIGN_MOD:
+        case ASSIGN_MUL:
+        case ASSIGN_SAR:
+        case ASSIGN_SHL:
+        case ASSIGN_SHR:
+        case ASSIGN_SUB:
+            if (!(lhs instanceof AccessNode ||
+                  lhs instanceof IndexNode ||
+                  lhs instanceof IdentNode)) {
+                if (context._early_lvalue_error) {
+                    error(JSErrorType.REFERENCE_ERROR, AbstractParser.message("invalid.lvalue"), lhs.getToken());
+                }
+                return referenceError(lhs, rhs);
+            }
+
+            if (lhs instanceof IdentNode) {
+                if (! checkIdentLValue((IdentNode)lhs)) {
+                    return referenceError(lhs, rhs);
+                }
+                verifyStrictIdent((IdentNode)lhs, "assignment");
+            }
+            break;
+
+        default:
+            break;
+        }
+
+        // Build up node.
+        return new BinaryNode(source, op, lhs, rhs);
+    }
+
+    /**
+     * Reduce increment/decrement to simpler operations.
+     * @param firstToken First token.
+     * @param tokenType  Operation token (INCPREFIX/DEC.)
+     * @param expression Left hand side expression.
+     * @param isPostfix  Prefix or postfix.
+     * @return           Reduced expression.
+     */
+    private Node incDecExpression(final long firstToken, final TokenType tokenType, final Node expression, final boolean isPostfix) {
+        long incDecToken = firstToken;
+        if (isPostfix) {
+            incDecToken = Token.recast(incDecToken, tokenType == DECPREFIX ? DECPOSTFIX : INCPOSTFIX);
+        }
+
+        final UnaryNode node = new UnaryNode(source, incDecToken, expression);
+        if (isPostfix) {
+            node.setStart(expression.getStart());
+            node.setFinish(Token.descPosition(incDecToken) + Token.descLength(incDecToken));
+        }
+
+        return node;
+    }
+
+    /**
+     * Find a label node in the label stack.
+     * @param ident Ident to find.
+     * @return null or the found label node.
+     */
+    private LabelNode findLabel(final IdentNode ident) {
+        for (final LabelNode labelNode : function.getLabelStack()) {
+            if (labelNode.getLabel().equals(ident)) {
+                return labelNode;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Add a label to the label stack.
+     * @param labelNode Label to add.
+     */
+    private void pushLabel(final LabelNode labelNode) {
+        function.getLabelStack().push(labelNode);
+    }
+
+    /**
+      * Remove a label from the label stack.
+      */
+    private void popLabel() {
+        function.getLabelStack().pop();
+    }
+
+    /**
+     * Track the current nesting of controls for break and continue.
+     * @param node For, while, do or switch node.
+     */
+    private void pushControlNode(final Node node) {
+        final boolean isLoop = node instanceof WhileNode;
+        function.getControlStack().push(node);
+
+        for (final LabelNode labelNode : function.getLabelStack()) {
+            if (labelNode.getBreakNode() == null) {
+                labelNode.setBreakNode(node);
+            }
+
+            if (isLoop && labelNode.getContinueNode() == null) {
+                labelNode.setContinueNode(node);
+            }
+        }
+    }
+
+    /**
+     * Finish with control.
+     */
+    private void popControlNode() {
+        // Get control stack.
+        final Stack<Node> controlStack = function.getControlStack();
+
+        // Can be empty if missing brace.
+        if (!controlStack.isEmpty()) {
+            controlStack.pop();
+        }
+    }
+
+    private void popControlNode(final Node node) {
+        // Get control stack.
+        final Stack<Node> controlStack = function.getControlStack();
+
+        // Can be empty if missing brace.
+        if (!controlStack.isEmpty() && controlStack.peek() == node) {
+            controlStack.pop();
+        }
+    }
+
+    private boolean isInWithBlock() {
+        final Stack<Node> controlStack = function.getControlStack();
+        for (int i = controlStack.size() - 1; i >= 0; i--) {
+            final Node node = controlStack.get(i);
+
+            if (node instanceof WithNode) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private <T extends Node> T findControl(final Class<T> ctype) {
+        final Stack<Node> controlStack = function.getControlStack();
+        for (int i = controlStack.size() - 1; i >= 0; i--) {
+            final Node node = controlStack.get(i);
+
+            if (ctype.isAssignableFrom(node.getClass())) {
+                return ctype.cast(node);
+            }
+        }
+
+        return null;
+    }
+
+    private <T extends Node> List<T> findControls(final Class<T> ctype, final Node to) {
+        final List<T> nodes = new ArrayList<>();
+        final Stack<Node> controlStack = function.getControlStack();
+        for (int i = controlStack.size() - 1; i >= 0; i--) {
+            final Node node = controlStack.get(i);
+
+            if (to == node) {
+                break; //stop looking
+            }
+
+            if (ctype.isAssignableFrom(node.getClass())) {
+                nodes.add(ctype.cast(node));
+            }
+        }
+
+        return nodes;
+    }
+
+    private <T extends Node> int countControls(final Class<T> ctype, final Node to) {
+        return findControls(ctype, to).size();
+    }
+
+
+    /**
+     * -----------------------------------------------------------------------
+     *
+     * Grammar based on
+     *
+     *      ECMAScript Language Specification
+     *      ECMA-262 5th Edition / December 2009
+     *
+     * -----------------------------------------------------------------------
+     */
+
+    /**
+     * Program :
+     *      SourceElements?
+     *
+     * See 14
+     *
+     * Parse the top level script.
+     */
+    private FunctionNode program(final String scriptName) {
+        // Make a fake token for the script.
+        final long functionToken = Token.toDesc(FUNCTION, 0, source.getLength());
+        // Set up the script to append elements.
+        script = newFunctionBlock(new IdentNode(source, functionToken, Token.descPosition(functionToken), scriptName));
+        // set kind to be SCRIPT
+        script.setKind(FunctionNode.Kind.SCRIPT);
+        // Set the first token of the script.
+        script.setFirstToken(functionToken);
+        // Gather source elements.
+        sourceElements();
+        expect(EOF);
+        // Set the last token of the script.
+        script.setLastToken(token);
+        script.setFinish(source.getLength() - 1);
+
+        block.addStatement(lineNumber());
+
+        return script;
+    }
+
+    /**
+     * Directive value or null if statement is not a directive.
+     *
+     * @param stmt Statement to be checked
+     * @return Directive value if the given statement is a directive
+     */
+    private String getDirective(final Node stmt) {
+        if (stmt instanceof ExecuteNode) {
+            final Node expr = ((ExecuteNode)stmt).getExpression();
+            if (expr instanceof LiteralNode) {
+                final LiteralNode<?> lit = (LiteralNode<?>)expr;
+                final long litToken = lit.getToken();
+                final TokenType tt = Token.descType(litToken);
+                // A directive is either a string or an escape string
+                if (tt == TokenType.STRING || tt == TokenType.ESCSTRING) {
+                    // Make sure that we don't unescape anything. Return as seen in source!
+                    return source.getString(lit.getStart(), Token.descLength(litToken));
+                }
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * SourceElements :
+     *      SourceElement
+     *      SourceElements SourceElement
+     *
+     * See 14
+     *
+     * Parse the elements of the script or function.
+     */
+    private void sourceElements() {
+        List<Node>    directiveStmts = null;
+        boolean       checkDirective = true;
+        final boolean oldStrictMode = isStrictMode;
+
+        try {
+            // If is a script, then process until the end of the script.
+            while (type != EOF) {
+                // Break if the end of a code block.
+                if (type == RBRACE) {
+                    break;
+                }
+
+                try {
+                    // Get the next element.
+                    statement(true);
+
+                    // check for directive prologues
+                    if (checkDirective) {
+                        // skip any debug statement like line number to get actual first line
+                        final Node lastStatement = Node.lastStatement(block.getStatements());
+
+                        // get directive prologue, if any
+                        final String directive = getDirective(lastStatement);
+
+                        // If we have seen first non-directive statement,
+                        // no more directive statements!!
+                        checkDirective = directive != null;
+
+                        if (checkDirective) {
+                            if (!oldStrictMode) {
+                                if (directiveStmts == null) {
+                                    directiveStmts = new ArrayList<>();
+                                }
+                                directiveStmts.add(lastStatement);
+                            }
+
+                            // handle use strict directive
+                            if ("use strict".equals(directive)) {
+                                isStrictMode = true;
+                                function.setStrictMode(true);
+
+                                // We don't need to check these, if lexical environment is already strict
+                                if (!oldStrictMode && directiveStmts != null) {
+                                    // check that directives preceding this one do not violate strictness
+                                    for (final Node statement : directiveStmts) {
+                                        // the get value will force unescape of preceeding
+                                        // escaped string directives
+                                        getValue(statement.getToken());
+                                    }
+
+                                    // verify that function name as well as parameter names
+                                    // satisfystrict mode restrictions.
+                                    verifyStrictIdent(function.getIdent(), "function name");
+                                    for (final IdentNode param : function.getParameters()) {
+                                        verifyStrictIdent(param, "function parameter");
+                                    }
+                                }
+                            }
+                        }
+                    }
+                } catch (final Exception e) {
+                    // Recover parsing.
+                    recover(e);
+                }
+
+                // No backtracking from here on.
+                stream.commit(k);
+            }
+        } finally {
+            isStrictMode = oldStrictMode;
+        }
+    }
+
+    /**
+     * Statement :
+     *      Block
+     *      VariableStatement
+     *      EmptyStatement
+     *      ExpressionStatement
+     *      IfStatement
+     *      IterationStatement
+     *      ContinueStatement
+     *      BreakStatement
+     *      ReturnStatement
+     *      WithStatement
+     *      LabelledStatement
+     *      SwitchStatement
+     *      ThrowStatement
+     *      TryStatement
+     *      DebuggerStatement
+     *
+     * see 12
+     *
+     * Parse any of the basic statement types.
+     */
+    private void statement() {
+        statement(false);
+    }
+
+    /**
+     * @param topLevel does this statement occur at the "top level" of a script or a function?
+     */
+    private void statement(final boolean topLevel) {
+        final LineNumberNode lineNumberNode = lineNumber();
+
+        if (type == FUNCTION) {
+            // As per spec (ECMA section 12), function declarations as arbitrary statement
+            // is not "portable". Implementation can issue a warning or disallow the same.
+            if (isStrictMode && !topLevel) {
+                error(AbstractParser.message("strict.no.func.here"), token);
+            }
+            functionExpression(true);
+            return;
+        }
+
+        block.addStatement(lineNumberNode);
+
+        switch (type) {
+        case LBRACE:
+            block();
+            break;
+        case RBRACE:
+            break;
+        case VAR:
+            variableStatement(true);
+            break;
+        case SEMICOLON:
+            emptyStatement();
+            break;
+        case IF:
+            ifStatement();
+            break;
+        case FOR:
+            forStatement();
+            break;
+        case WHILE:
+            whileStatement();
+            break;
+        case DO:
+            doStatement();
+            break;
+        case CONTINUE:
+            continueStatement();
+            break;
+        case BREAK:
+            breakStatement();
+            break;
+        case RETURN:
+            returnStatement();
+            break;
+        case YIELD:
+            yieldStatement();
+            break;
+        case WITH:
+            withStatement();
+            break;
+        case SWITCH:
+            switchStatement();
+            break;
+        case THROW:
+            throwStatement();
+            break;
+        case TRY:
+            tryStatement();
+            break;
+        case DEBUGGER:
+            debuggerStatement();
+            break;
+        case RPAREN:
+        case RBRACKET:
+        case EOF:
+            expect(SEMICOLON);
+            break;
+        default:
+            if (type == IDENT || isNonStrictModeIdent()) {
+                if (T(k + 1) == COLON) {
+                    labelStatement();
+                    return;
+                }
+            }
+
+            expressionStatement();
+            break;
+        }
+    }
+
+    /**
+     * block :
+     *      { StatementList? }
+     *
+     * see 12.1
+     *
+     * Parse a statement block.
+     */
+    private void block() {
+        // Get statements in block.
+        final Block newBlock = getBlock(true);
+
+        // Force block execution.
+        final ExecuteNode executeNode = new ExecuteNode(source, newBlock.getToken(), finish, newBlock);
+
+        block.addStatement(executeNode);
+    }
+
+    /**
+     * StatementList :
+     *      Statement
+     *      StatementList Statement
+     *
+     * See 12.1
+     *
+     * Parse a list of statements.
+     */
+    private void statementList() {
+        // Accumulate statements until end of list. */
+loop:
+        while (type != EOF) {
+            switch (type) {
+            case EOF:
+            case CASE:
+            case DEFAULT:
+            case RBRACE:
+                break loop;
+            default:
+                break;
+            }
+
+            // Get next statement.
+            statement();
+        }
+    }
+
+    /**
+     * Make sure that in strict mode, the identifier name used is allowed.
+     *
+     * @param ident         Identifier that is verified
+     * @param contextString String used in error message to give context to the user
+     */
+    @SuppressWarnings("fallthrough")
+    private void verifyStrictIdent(final IdentNode ident, final String contextString) {
+        if (isStrictMode) {
+            switch (ident.getName()) {
+            case "eval":
+            case "arguments":
+                error(AbstractParser.message("strict.name", ident.getName(), contextString), ident.getToken());
+            default:
+                break;
+            }
+        }
+    }
+
+    /**
+     * VariableStatement :
+     *      var VariableDeclarationList ;
+     *
+     * VariableDeclarationList :
+     *      VariableDeclaration
+     *      VariableDeclarationList , VariableDeclaration
+     *
+     * VariableDeclaration :
+     *      Identifier Initializer?
+     *
+     * Initializer :
+     *      = AssignmentExpression
+     *
+     * See 12.2
+     *
+     * Parse a VAR statement.
+     * @param isStatement True if a statement (not used in a FOR.)
+     */
+    private List<VarNode> variableStatement(final boolean isStatement) {
+        // VAR tested in caller.
+        next();
+
+        final List<VarNode> vars = new ArrayList<>();
+
+        while (true) {
+            // Get starting token.
+            final long varToken = token;
+            // Get name of var.
+            final IdentNode name = getIdent();
+            verifyStrictIdent(name, "variable name");
+
+            // Assume no init.
+            Node init = null;
+
+            // Look for initializer assignment.
+            if (type == ASSIGN) {
+                next();
+
+                // Get initializer expression. Suppress IN if not statement.
+                init = assignmentExpression(!isStatement);
+            }
+
+            // Allocate var node.
+            final VarNode var = new VarNode(source, varToken, finish, name, init);
+            if (isStatement) {
+                function.addDeclaration(var);
+            }
+
+            vars.add(var);
+            // Add to current block.
+            block.addStatement(var);
+
+            if (type != COMMARIGHT) {
+                break;
+            }
+            next();
+        }
+
+        // If is a statement then handle end of line.
+        if (isStatement) {
+            endOfLine();
+        }
+
+        return vars;
+    }
+
+    /**
+     * EmptyStatement :
+     *      ;
+     *
+     * See 12.3
+     *
+     * Parse an empty statement.
+     */
+    private void emptyStatement() {
+        if (context._empty_statements) {
+            block.addStatement(new EmptyNode(source, token, Token.descPosition(token)));
+        }
+
+        // SEMICOLON checked in caller.
+        next();
+    }
+
+    /**
+     * ExpressionStatement :
+     *      Expression ; // [lookahead ~( or  function )]
+     *
+     * See 12.4
+     *
+     * Parse an expression used in a statement block.
+     */
+    private void expressionStatement() {
+        // Lookahead checked in caller.
+        final long expressionToken = token;
+
+        // Get expression and add as statement.
+        final Node expression = expression();
+
+        ExecuteNode executeNode = null;
+        if (expression != null) {
+            executeNode = new ExecuteNode(source, expressionToken, finish, expression);
+            block.addStatement(executeNode);
+        } else {
+            expect(null);
+        }
+
+        endOfLine();
+
+        if (executeNode != null) {
+            executeNode.setFinish(finish);
+        }
+    }
+
+    /**
+     * IfStatement :
+     *      if ( Expression ) Statement else Statement
+     *      if ( Expression ) Statement
+     *
+     * See 12.5
+     *
+     * Parse an IF statement.
+     */
+    private void ifStatement() {
+        // Capture IF token.
+        final long ifToken = token;
+         // IF tested in caller.
+        next();
+
+        expect(LPAREN);
+
+        // Get the test expression.
+        final Node test = expression();
+
+        expect(RPAREN);
+
+        // Get the pass statement.
+        final Block pass = getStatement();
+
+        // Assume no else.
+        Block fail = null;
+
+        if (type == ELSE) {
+            next();
+
+            // Get the else block.
+            fail = getStatement();
+        }
+
+        // Construct and add new if node.
+        final IfNode ifNode = new IfNode(source, ifToken, fail != null ? fail.getFinish() : pass.getFinish(), test, pass, fail);
+
+        block.addStatement(ifNode);
+    }
+
+    /**
+     * ... IterationStatement:
+     *           ...
+     *           for ( Expression[NoIn]?; Expression? ; Expression? ) Statement
+     *           for ( var VariableDeclarationList[NoIn]; Expression? ; Expression? ) Statement
+     *           for ( LeftHandSideExpression in Expression ) Statement
+     *           for ( var VariableDeclaration[NoIn] in Expression ) Statement
+     *
+     * See 12.6
+     *
+     * Parse a FOR statement.
+     */
+    private void forStatement() {
+        // Create FOR node, capturing FOR token.
+        final ForNode forNode = new ForNode(source, token, Token.descPosition(token));
+
+        pushControlNode(forNode);
+
+        // Set up new block for scope of vars. Captures first token.
+        final Block outer = newBlock();
+
+        try {
+            // FOR tested in caller.
+            next();
+
+            // Nashorn extension: for each expression.
+            // iterate property values rather than property names.
+            if (type == IDENT && "each".equals(getValue())) {
+                forNode.setIsForEach();
+                next();
+            }
+
+            expect(LPAREN);
+
+            /// Capture control information.
+            forControl(forNode);
+
+            expect(RPAREN);
+
+            // Set the for body.
+            final Block body = getStatement();
+            forNode.setBody(body);
+            forNode.setFinish(body.getFinish());
+            outer.setFinish(body.getFinish());
+
+            // Add for to current block.
+            block.addStatement(forNode);
+        } finally {
+            restoreBlock();
+            popControlNode();
+        }
+
+        block.addStatement(new ExecuteNode(source, outer.getToken(), outer.getFinish(), outer));
+     }
+
+    /**
+     * ... IterationStatement :
+     *           ...
+     *           Expression[NoIn]?; Expression? ; Expression?
+     *           var VariableDeclarationList[NoIn]; Expression? ; Expression?
+     *           LeftHandSideExpression in Expression
+     *           var VariableDeclaration[NoIn] in Expression
+     *
+     * See 12.6
+     *
+     * Parse the control section of a FOR statement.  Also used for
+     * comprehensions.
+     * @param forNode Owning FOR.
+     */
+    private void forControl(final ForNode forNode) {
+        List<VarNode> vars = null;
+
+        switch (type) {
+        case VAR:
+            // Var statements captured in for outer block.
+            vars = variableStatement(false);
+            break;
+
+        case SEMICOLON:
+            break;
+
+        default:
+            final Node expression = expression(unaryExpression(), COMMARIGHT.getPrecedence(), true);
+            forNode.setInit(expression);
+        }
+
+        switch (type) {
+        case SEMICOLON:
+            // for (init; test; modify)
+            expect(SEMICOLON);
+
+            // Get the test expression.
+            if (type != SEMICOLON) {
+                forNode.setTest(expression());
+            }
+
+            expect(SEMICOLON);
+
+            // Get the modify expression.
+            if (type != RPAREN) {
+                final Node expression = expression();
+                forNode.setModify(expression);
+            }
+
+            break;
+
+        case IN:
+            forNode.setIsForIn();
+
+            if (vars != null) {
+                // for (var i in obj)
+                if (vars.size() == 1) {
+                    forNode.setInit(new IdentNode(vars.get(0).getName()));
+                } else {
+                    // for (var i, j in obj) is invalid
+                    error(AbstractParser.message("many.vars.in.for.in.loop"), vars.get(1).getToken());
+                }
+
+            } else {
+                // for (expr in obj)
+                final Node init = forNode.getInit();
+                assert init != null : "for..in init expression can not be null here";
+
+                // check if initial expression is a valid L-value
+                if (!(init instanceof AccessNode ||
+                      init instanceof IndexNode ||
+                      init instanceof IdentNode)) {
+                    error(AbstractParser.message("not.lvalue.for.in.loop"), init.getToken());
+                }
+
+                if (init instanceof IdentNode) {
+                    if (! checkIdentLValue((IdentNode)init)) {
+                        error(AbstractParser.message("not.lvalue.for.in.loop"), init.getToken());
+                    }
+                    verifyStrictIdent((IdentNode)init, "for-in iterator");
+                }
+            }
+
+            next();
+
+            // Get the collection expression.
+            forNode.setModify(expression());
+            break;
+
+        default:
+            expect(SEMICOLON);
+            break;
+        }
+
+    }
+
+    /**
+     * ...IterationStatement :
+     *           ...
+     *           while ( Expression ) Statement
+     *           ...
+     *
+     * See 12.6
+     *
+     * Parse while statement.
+     */
+    private void whileStatement() {
+        // Capture WHILE token.
+        final long whileToken = token;
+        // WHILE tested in caller.
+        next();
+
+        // Construct WHILE node.
+        final WhileNode whileNode = new WhileNode(source, whileToken, Token.descPosition(whileToken));
+        pushControlNode(whileNode);
+
+        try {
+            expect(LPAREN);
+
+            // Get the test expression.
+            final Node test = expression();
+            whileNode.setTest(test);
+
+            expect(RPAREN);
+
+            // Get WHILE body.
+            final Block statements = getStatement();
+            whileNode.setBody(statements);
+            whileNode.setFinish(statements.getFinish());
+
+            // Add WHILE node.
+            block.addStatement(whileNode);
+        } finally {
+            popControlNode();
+        }
+    }
+
+    /**
+     * ...IterationStatement :
+     *           ...
+     *           do Statement while( Expression ) ;
+     *           ...
+     *
+     * See 12.6
+     *
+     * Parse DO WHILE statement.
+     */
+    private void doStatement() {
+        // Capture DO token.
+        final long doToken = token;
+        // DO tested in the caller.
+        next();
+
+        final WhileNode doWhileNode = new DoWhileNode(source, doToken, Token.descPosition(doToken));
+        pushControlNode(doWhileNode);
+
+        try {
+           // Get DO body.
+            final Block statements = getStatement();
+            doWhileNode.setBody(statements);
+
+            expect(WHILE);
+
+            expect(LPAREN);
+
+            // Get the test expression.
+            final Node test = expression();
+            doWhileNode.setTest(test);
+
+            expect(RPAREN);
+
+            if (type == SEMICOLON) {
+                endOfLine();
+            }
+
+            doWhileNode.setFinish(finish);
+
+            // Add DO node.
+            block.addStatement(doWhileNode);
+        } finally {
+            popControlNode();
+        }
+    }
+
+    /**
+     * ContinueStatement :
+     *      continue Identifier? ; // [no LineTerminator here]
+     *
+     * See 12.7
+     *
+     * Parse CONTINUE statement.
+     */
+    private void continueStatement() {
+        // Capture CONTINUE token.
+        final long continueToken = token;
+        // CONTINUE tested in caller.
+        nextOrEOL();
+
+        LabelNode labelNode = null;
+
+        // SEMICOLON or label.
+        switch (type) {
+        case RBRACE:
+        case SEMICOLON:
+        case EOL:
+            break;
+
+        default:
+            final IdentNode ident = getIdent();
+            labelNode = findLabel(ident);
+
+            if (labelNode == null) {
+                error(AbstractParser.message("undefined.label", ident.getName()), ident.getToken());
+            }
+
+            break;
+        }
+
+        final Node targetNode = labelNode != null ? labelNode.getContinueNode() : findControl(WhileNode.class);
+
+        if (targetNode == null) {
+            error(AbstractParser.message("illegal.continue.stmt"), continueToken);
+        }
+
+        endOfLine();
+
+        // Construct and add CONTINUE node.
+        final ContinueNode continueNode = new ContinueNode(source, continueToken, finish, labelNode, targetNode, findControl(TryNode.class));
+        continueNode.setScopeNestingLevel(countControls(WithNode.class, targetNode));
+
+        block.addStatement(continueNode);
+    }
+
+    /**
+     * BreakStatement :
+     *      break Identifier? ; // [no LineTerminator here]
+     *
+     * See 12.8
+     *
+     */
+    private void breakStatement() {
+        // Capture BREAK token.
+        final long breakToken = token;
+        // BREAK tested in caller.
+        nextOrEOL();
+
+        LabelNode labelNode = null;
+
+        // SEMICOLON or label.
+        switch (type) {
+        case RBRACE:
+        case SEMICOLON:
+        case EOL:
+            break;
+
+        default:
+            final IdentNode ident = getIdent();
+            labelNode = findLabel(ident);
+
+            if (labelNode == null) {
+                error(AbstractParser.message("undefined.label", ident.getName()), ident.getToken());
+            }
+
+            break;
+        }
+
+        final Node targetNode = labelNode != null ? labelNode.getBreakNode() : findControl(BreakableNode.class);
+
+        if (targetNode == null) {
+            error(AbstractParser.message("illegal.break.stmt"), breakToken);
+        }
+
+        endOfLine();
+
+        // Construct and add BREAK node.
+        final BreakNode breakNode = new BreakNode(source, breakToken, finish, labelNode, targetNode, findControl(TryNode.class));
+        breakNode.setScopeNestingLevel(countControls(WithNode.class, targetNode));
+
+        block.addStatement(breakNode);
+    }
+
+    /**
+     * ReturnStatement :
+     *      return Expression? ; // [no LineTerminator here]
+     *
+     * See 12.9
+     *
+     * Parse RETURN statement.
+     */
+    private void returnStatement() {
+        // check for return outside function
+        if (function.getKind() == FunctionNode.Kind.SCRIPT) {
+            error(AbstractParser.message("invalid.return"));
+        }
+
+        // Capture RETURN token.
+        final long returnToken = token;
+        // RETURN tested in caller.
+        nextOrEOL();
+
+        Node expression = null;
+
+        // SEMICOLON or expression.
+        switch (type) {
+        case RBRACE:
+        case SEMICOLON:
+        case EOL:
+            break;
+
+        default:
+            expression = expression();
+            break;
+        }
+
+        endOfLine();
+
+        // Construct and add RETURN node.
+        final ReturnNode returnNode = new ReturnNode(source, returnToken, finish, expression, findControl(TryNode.class));
+        block.addStatement(returnNode);
+    }
+
+    /**
+     * YieldStatement :
+     *      yield Expression? ; // [no LineTerminator here]
+     *
+     * JavaScript 1.8
+     *
+     * Parse YIELD statement.
+     */
+    private void yieldStatement() {
+        // Capture YIELD token.
+        final long yieldToken = token;
+        // YIELD tested in caller.
+        nextOrEOL();
+
+        Node expression = null;
+
+        // SEMICOLON or expression.
+        switch (type) {
+        case RBRACE:
+        case SEMICOLON:
+        case EOL:
+            break;
+
+        default:
+            expression = expression();
+            break;
+        }
+
+        endOfLine();
+
+        // Construct and add YIELD node.
+        final ReturnNode yieldNode = new ReturnNode(source, yieldToken, finish, expression, findControl(TryNode.class));
+        block.addStatement(yieldNode);
+
+        // Note that this function contains a yield.
+        function.setHasYield();
+    }
+
+    /**
+     * WithStatement :
+     *      with ( Expression ) Statement
+     *
+     * See 12.10
+     *
+     * Parse WITH statement.
+     */
+    private void withStatement() {
+        // Capture WITH token.
+        final long withToken = token;
+        // WITH tested in caller.
+        next();
+
+        // ECMA 12.10.1 strict mode restrictions
+        if (isStrictMode) {
+            error(AbstractParser.message("strict.no.with"), withToken);
+        }
+
+        // Get WITH expression.
+        final WithNode withNode = new WithNode(source, withToken, finish, null, null);
+        function.setHasWith();
+
+        try {
+            pushControlNode(withNode);
+
+            expect(LPAREN);
+
+            final Node expression = expression();
+            withNode.setExpression(expression);
+
+            expect(RPAREN);
+
+            // Get WITH body.
+            final Block statements = getStatement();
+            withNode.setBody(statements);
+            withNode.setFinish(finish);
+        } finally {
+            popControlNode(withNode);
+        }
+
+        block.addStatement(withNode);
+    }
+
+    /**
+     * SwitchStatement :
+     *      switch ( Expression ) CaseBlock
+     *
+     * CaseBlock :
+     *      { CaseClauses? }
+     *      { CaseClauses? DefaultClause CaseClauses }
+     *
+     * CaseClauses :
+     *      CaseClause
+     *      CaseClauses CaseClause
+     *
+     * CaseClause :
+     *      case Expression : StatementList?
+     *
+     * DefaultClause :
+     *      default : StatementList?
+     *
+     * See 12.11
+     *
+     * Parse SWITCH statement.
+     */
+    private void switchStatement() {
+        // Capture SWITCH token.
+        final long switchToken = token;
+        // SWITCH tested in caller.
+        next();
+
+        // Create and add switch statement.
+        final SwitchNode switchNode = new SwitchNode(source, switchToken, Token.descPosition(switchToken));
+        pushControlNode(switchNode);
+
+        try {
+            expect(LPAREN);
+
+            // Get switch expression.
+            final Node switchExpression = expression();
+            switchNode.setExpression(switchExpression);
+
+            expect(RPAREN);
+
+            expect(LBRACE);
+
+            // Prepare to accumulate cases.
+            final List<CaseNode> cases = new ArrayList<>();
+            CaseNode defaultCase = null;
+
+            while (type != RBRACE) {
+                // Prepare for next case.
+                Node caseExpression = null;
+                final long caseToken = token;
+
+                switch (type) {
+                case CASE:
+                    next();
+
+                    // Get case expression.
+                    caseExpression = expression();
+
+                    break;
+
+                case DEFAULT:
+                    if (defaultCase != null) {
+                        error(AbstractParser.message("duplicate.default.in.switch"));
+                    }
+
+                    next();
+
+                    break;
+
+                default:
+                    // Force an error.
+                    expect(CASE);
+                    break;
+                }
+
+                expect(COLON);
+
+                // Get CASE body.
+                final Block statements = getBlock(false);
+                final CaseNode caseNode = new CaseNode(source, caseToken, finish, caseExpression, statements);
+
+                if (caseExpression == null) {
+                    defaultCase = caseNode;
+                }
+
+                cases.add(caseNode);
+            }
+
+            switchNode.setCases(cases);
+            switchNode.setDefaultCase(defaultCase);
+
+            next();
+
+            switchNode.setFinish(finish);
+
+            block.addStatement(switchNode);
+        } finally {
+            popControlNode();
+        }
+    }
+
+    /**
+     * LabelledStatement :
+     *      Identifier : Statement
+     *
+     * See 12.12
+     *
+     * Parse label statement.
+     */
+    private void labelStatement() {
+        // Capture label token.
+        final long labelToken = token;
+        // Get label ident.
+        final IdentNode ident = getIdent();
+
+        expect(COLON);
+
+        if (findLabel(ident) != null) {
+            error(AbstractParser.message("duplicate.label", ident.getName()), labelToken);
+        }
+
+        try {
+            // Create and add label.
+            final LabelNode labelNode = new LabelNode(source, labelToken, finish, ident, null);
+            pushLabel(labelNode);
+            // Get and save body.
+            final Block statements = getStatement();
+            labelNode.setBody(statements);
+            labelNode.setFinish(finish);
+
+            block.addStatement(labelNode);
+        } finally {
+            // Remove label.
+            popLabel();
+        }
+    }
+
+   /**
+     * ThrowStatement :
+     *      throw Expression ; // [no LineTerminator here]
+     *
+     * See 12.13
+     *
+     * Parse throw statement.
+     */
+    private void throwStatement() {
+        // Capture THROW token.
+        final long throwToken = token;
+        // THROW tested in caller.
+        nextOrEOL();
+
+        Node expression = null;
+
+        // SEMICOLON or expression.
+        switch (type) {
+        case RBRACE:
+        case SEMICOLON:
+        case EOL:
+            break;
+
+        default:
+            expression = expression();
+            break;
+        }
+
+        if (expression == null) {
+            error(AbstractParser.message("expected.operand", type.getNameOrType()));
+        }
+
+        endOfLine();
+
+        // Construct and add THROW node.
+        final ThrowNode throwNode = new ThrowNode(source, throwToken, finish, expression, findControl(TryNode.class));
+        function.setHasThrows(true);
+        block.addStatement(throwNode);
+    }
+
+    /**
+     * TryStatement :
+     *      try Block Catch
+     *      try Block Finally
+     *      try Block Catch Finally
+     *
+     * Catch :
+     *      catch( Identifier if Expression ) Block
+     *      catch( Identifier ) Block
+     *
+     * Finally :
+     *      finally Block
+     *
+     * See 12.14
+     *
+     * Parse TRY statement.
+     */
+    private void tryStatement() {
+        // Capture TRY token.
+        final long tryToken = token;
+        // TRY tested in caller.
+        next();
+
+        // Create try.
+        final TryNode tryNode = new TryNode(source, tryToken, Token.descPosition(tryToken), findControl(TryNode.class));
+        pushControlNode(tryNode);
+
+        try {
+            // Get TRY body.
+            final Block tryBody = getBlock(true);
+
+            // Prepare to accumulate catches.
+            final List<Block> catchBlocks = new ArrayList<>();
+
+            while (type == CATCH) {
+                // Capture CATCH token.
+                final long catchToken = token;
+                next();
+
+                expect(LPAREN);
+
+                // Get exception ident.
+                final IdentNode exception = getIdent();
+
+                // ECMA 12.4.1 strict mode restrictions
+                verifyStrictIdent(exception, "catch argument");
+
+                // Check for conditional catch.
+                Node ifExpression = null;
+
+                if (type == IF) {
+                    next();
+
+                    // Get the exception condition.
+                    ifExpression = expression();
+                }
+
+                expect(RPAREN);
+
+                try {
+                    final Block catchBlock = newBlock();
+
+                    // Get CATCH body.
+                    final Block catchBody = getBlock(true);
+
+                    // Create and add catch.
+                    final CatchNode catchNode = new CatchNode(source, catchToken, finish, exception, ifExpression, catchBody);
+                    block.addStatement(catchNode);
+                    catchBlocks.add(catchBlock);
+                } finally {
+                    restoreBlock();
+                }
+
+                // If unconditional catch then should to be the end.
+                if (ifExpression == null) {
+                    break;
+                }
+            }
+
+            popControlNode();
+
+            // Prepare to capture finally statement.
+            Block finallyStatements = null;
+
+            if (type == FINALLY) {
+                next();
+
+                // Get FINALLY body.
+                finallyStatements = getBlock(true);
+            }
+
+            // Need at least one catch or a finally.
+            if (catchBlocks.isEmpty() && finallyStatements == null) {
+                error(AbstractParser.message("missing.catch.or.finally"), tryToken);
+            }
+
+            tryNode.setBody(tryBody);
+            tryNode.setCatchBlocks(catchBlocks);
+            tryNode.setFinallyBody(finallyStatements);
+            tryNode.setFinish(finish);
+
+            // Add try.
+            block.addStatement(tryNode);
+        } finally {
+            popControlNode(tryNode);
+        }
+    }
+
+    /**
+     * DebuggerStatement :
+     *      debugger ;
+     *
+     * See 12.15
+     *
+     * Parse debugger statement.
+     */
+    private void  debuggerStatement() {
+        // Capture DEBUGGER token.
+        final long debuggerToken = token;
+        // DEBUGGER tested in caller.
+        next();
+
+        endOfLine();
+
+        final RuntimeNode runtimeNode = new RuntimeNode(source, debuggerToken, finish, RuntimeNode.Request.DEBUGGER, new ArrayList<Node>());
+        block.addStatement(runtimeNode);
+    }
+
+    /**
+     * PrimaryExpression :
+     *      this
+     *      Identifier
+     *      Literal
+     *      ArrayLiteral
+     *      ObjectLiteral
+     *      ( Expression )
+     *
+     *  See 11.1
+     *
+     * Parse primary expression.
+     * @return Expression node.
+     */
+    @SuppressWarnings("fallthrough")
+    private Node primaryExpression() {
+        // Capture first token.
+        final long primaryToken = token;
+
+        switch (type) {
+        case THIS:
+            final String name = type.getName();
+            next();
+            return new IdentNode(source, primaryToken, finish, name);
+        case IDENT:
+            final IdentNode ident = getIdent();
+            if (ident == null) {
+                break;
+            }
+            detectSpecialProperty(ident);
+            return ident;
+        case OCTAL:
+            if (isStrictMode) {
+               error(AbstractParser.message("strict.no.octal"), token);
+            }
+        case STRING:
+        case ESCSTRING:
+        case DECIMAL:
+        case HEXADECIMAL:
+        case FLOATING:
+        case REGEX:
+        case XML:
+            return getLiteral();
+        case FALSE:
+            next();
+            return LiteralNode.newInstance(source, primaryToken, finish, false);
+        case TRUE:
+            next();
+            return LiteralNode.newInstance(source, primaryToken, finish, true);
+        case NULL:
+            next();
+            return LiteralNode.newInstance(source, primaryToken, finish);
+        case LBRACKET:
+            return arrayLiteral();
+        case LBRACE:
+            return objectLiteral();
+        case LPAREN:
+            next();
+
+            final Node expression = expression();
+
+            expect(RPAREN);
+
+            return expression;
+
+        default:
+            // In this context some operator tokens mark the start of a literal.
+            if (lexer.scanLiteral(primaryToken, type)) {
+                next();
+                return getLiteral();
+            }
+            if (isNonStrictModeIdent()) {
+                return getIdent();
+            }
+            break;
+        }
+
+        return null;
+    }
+
+
+    /**
+     * ArrayLiteral :
+     *      [ Elision? ]
+     *      [ ElementList ]
+     *      [ ElementList , Elision? ]
+     *      [ expression for (LeftHandExpression in expression) ( (if ( Expression ) )? ]
+     *
+     * ElementList : Elision? AssignmentExpression
+     *      ElementList , Elision? AssignmentExpression
+     *
+     * Elision :
+     *      ,
+     *      Elision ,
+     *
+     * See 12.1.4
+     * JavaScript 1.8
+     *
+     * Parse array literal.
+     * @return Expression node.
+     */
+    private Node arrayLiteral() {
+        // Capture LBRACKET token.
+        final long arrayToken = token;
+        // LBRACKET tested in caller.
+        next();
+
+        // Prepare to accummulating elements.
+        final List<Node> elements = new ArrayList<>();
+        // Track elisions.
+        boolean elision = true;
+loop:
+        while (true) {
+             switch (type) {
+            case RBRACKET:
+                next();
+
+                break loop;
+
+            case COMMARIGHT:
+                next();
+
+                // If no prior expression
+                if (elision) {
+                    elements.add(null);
+                }
+
+                elision = true;
+
+                break;
+
+            default:
+                if (! elision) {
+                    error(AbstractParser.message("expected.comma", type.getNameOrType()));
+                }
+                // Add expression element.
+                final Node expression = assignmentExpression(false);
+
+                if (expression != null) {
+                    elements.add(expression);
+                } else {
+                    expect(RBRACKET);
+                }
+
+                elision = false;
+                break;
+            }
+        }
+
+        return LiteralNode.newInstance(source, arrayToken, finish, elements);
+    }
+
+    /**
+     * ObjectLiteral :
+     *      { }
+     *      { PropertyNameAndValueList } { PropertyNameAndValueList , }
+     *
+     * PropertyNameAndValueList :
+     *      PropertyAssignment
+     *      PropertyNameAndValueList , PropertyAssignment
+     *
+     * See 11.1.5
+     *
+     * Parse an object literal.
+     * @return Expression node.
+     */
+    private Node objectLiteral() {
+        // Capture LBRACE token.
+        final long objectToken = token;
+        // LBRACE tested in caller.
+        next();
+
+        // Object context.
+        Block objectContext = null;
+        // Prepare to accumulate elements.
+        final List<Node> elements = new ArrayList<>();
+        final Map<Object, PropertyNode> map = new HashMap<>();
+
+        try {
+            // Create a block for the object literal.
+            objectContext = newBlock();
+
+            boolean commaSeen = true;
+loop:
+            while (true) {
+                switch (type) {
+                case RBRACE:
+                    next();
+                    break loop;
+
+                case COMMARIGHT:
+                    next();
+                    commaSeen = true;
+                    break;
+
+                default:
+                    if (! commaSeen) {
+                        error(AbstractParser.message("expected.comma", type.getNameOrType()));
+                    }
+
+                    commaSeen = false;
+                    // Get and add the next property.
+                    final PropertyNode property = propertyAssignment();
+                    final Object key = property.getKeyName();
+                    final PropertyNode existingProperty = map.get(key);
+
+                    if (existingProperty != null) {
+                        // ECMA section 11.1.5 Object Initialiser
+                        // point # 4 on property assignment production
+                        final Node value  = property.getValue();
+                        final Node getter = property.getGetter();
+                        final Node setter = property.getSetter();
+
+                        final Node prevValue  = existingProperty.getValue();
+                        final Node prevGetter = existingProperty.getGetter();
+                        final Node prevSetter = existingProperty.getSetter();
+
+                        boolean redefinitionOk = true;
+                        // ECMA 11.1.5 strict mode restrictions
+                        if (isStrictMode) {
+                            if (value != null && prevValue != null) {
+                                redefinitionOk = false;
+                            }
+                        }
+
+                        final boolean isPrevAccessor = prevGetter != null || prevSetter != null;
+                        final boolean isAccessor = getter != null || setter != null;
+
+                        // data property redefined as accessor property
+                        if (prevValue != null && isAccessor) {
+                            redefinitionOk = false;
+                        }
+
+                        // accessor property redefined as data
+                        if (isPrevAccessor && value != null) {
+                            redefinitionOk = false;
+                        }
+
+                        if (isAccessor && isPrevAccessor) {
+                            if (getter != null && prevGetter != null ||
+                                setter != null && prevSetter != null) {
+                                redefinitionOk = false;
+                            }
+                        }
+
+                        if (! redefinitionOk) {
+                            error(AbstractParser.message("property.redefinition", key.toString()), property.getToken());
+                        }
+
+                        if (value != null) {
+                            final Node existingValue = existingProperty.getValue();
+
+                            if (existingValue == null) {
+                                existingProperty.setValue(value);
+                            } else {
+                                final long propertyToken = Token.recast(existingProperty.getToken(), COMMARIGHT);
+                                existingProperty.setValue(new BinaryNode(source, propertyToken, existingValue, value));
+                            }
+
+                            existingProperty.setGetter(null);
+                            existingProperty.setSetter(null);
+                        }
+
+                        if (getter != null) {
+                            existingProperty.setGetter(getter);
+                        }
+
+                        if (setter != null) {
+                            existingProperty.setSetter(setter);
+                        }
+                    } else {
+                        map.put(key, property);
+                        elements.add(property);
+                    }
+
+                    break;
+                }
+            }
+        } finally {
+            restoreBlock();
+        }
+
+        // Construct new object literal.
+        objectContext.setFinish(finish);
+        objectContext.setStart(Token.descPosition(objectToken));
+
+        return new ObjectNode(source, objectToken, finish, objectContext, elements);
+    }
+
+    /**
+     * PropertyName :
+     *      IdentifierName
+     *      StringLiteral
+     *      NumericLiteral
+     *
+     * See 11.1.5
+     *
+     * @return PropertyName node
+     */
+    @SuppressWarnings("fallthrough")
+    private PropertyKey propertyName() {
+        switch (type) {
+        case IDENT:
+            return getIdent();
+        case OCTAL:
+            if (isStrictMode) {
+                error(AbstractParser.message("strict.no.octal"), token);
+            }
+        case STRING:
+        case ESCSTRING:
+        case DECIMAL:
+        case HEXADECIMAL:
+        case FLOATING:
+            return getLiteral();
+        default:
+            return getIdentifierName();
+        }
+    }
+
+    /**
+     * PropertyAssignment :
+     *      PropertyName : AssignmentExpression
+     *      get PropertyName ( ) { FunctionBody }
+     *      set PropertyName ( PropertySetParameterList ) { FunctionBody }
+     *
+     * PropertySetParameterList :
+     *      Identifier
+     *
+     * PropertyName :
+     *      IdentifierName
+     *      StringLiteral
+     *      NumericLiteral
+     *
+     * See 11.1.5
+     *
+     * Parse an object literal property.
+     * @return Property or reference node.
+     */
+    private PropertyNode propertyAssignment() {
+        // Capture firstToken.
+        final long propertyToken = token;
+
+        FunctionNode functionNode;
+        List<IdentNode> parameters;
+        PropertyNode propertyNode;
+        PropertyKey propertyName;
+
+        if (type == IDENT) {
+            // Get IDENT.
+            final String ident = (String)expectValue(IDENT);
+
+            if (type != COLON) {
+                final long getSetToken = token;
+
+                switch (ident) {
+                case "get":
+                    final PropertyKey getIdent = propertyName();
+                    final String getterName = getIdent.getPropertyName();
+                    final IdentNode getNameNode = new IdentNode(source, ((Node)getIdent).getToken(), finish, "get " + getterName);
+                    expect(LPAREN);
+                    expect(RPAREN);
+                    parameters = new ArrayList<>();
+                    functionNode = functionBody(getSetToken, getNameNode, parameters, FunctionNode.Kind.GETTER);
+                    propertyNode = new PropertyNode(source, propertyToken, finish, getIdent, null);
+                    propertyNode.setGetter(new ReferenceNode(source, propertyToken, finish, functionNode));
+                    return propertyNode;
+
+                case "set":
+                    final PropertyKey setIdent = propertyName();
+                    final String setterName = setIdent.getPropertyName();
+                    final IdentNode setNameNode = new IdentNode(source, ((Node)setIdent).getToken(), finish, "set " + setterName);
+                    expect(LPAREN);
+                    final IdentNode argIdent = getIdent();
+                    verifyStrictIdent(argIdent, "setter argument");
+                    expect(RPAREN);
+                    parameters = new ArrayList<>();
+                    parameters.add(argIdent);
+                    functionNode = functionBody(getSetToken, setNameNode, parameters, FunctionNode.Kind.SETTER);
+                    propertyNode = new PropertyNode(source, propertyToken, finish, setIdent, null);
+                    propertyNode.setSetter(new ReferenceNode(source, propertyToken, finish, functionNode));
+                    return propertyNode;
+
+                default:
+                    break;
+                }
+            }
+
+            propertyName =  new IdentNode(source, propertyToken, finish, ident);
+        } else {
+            propertyName = propertyName();
+        }
+
+        expect(COLON);
+
+        final Node value = assignmentExpression(false);
+        propertyNode =  new PropertyNode(source, propertyToken, finish, propertyName, value);
+        return propertyNode;
+    }
+
+    /**
+     * LeftHandSideExpression :
+     *      NewExpression
+     *      CallExpression
+     *
+     * CallExpression :
+     *      MemberExpression Arguments
+     *      CallExpression Arguments
+     *      CallExpression [ Expression ]
+     *      CallExpression . IdentifierName
+     *
+     * See 11.2
+     *
+     * Parse left hand side expression.
+     * @return Expression node.
+     */
+    private Node leftHandSideExpression() {
+        long callToken = token;
+
+        Node lhs = memberExpression();
+
+        if (type == LPAREN) {
+            final List<Node> arguments = argumentList();
+
+            // Catch special functions.
+            if (lhs instanceof IdentNode) {
+                detectSpecialFunction((IdentNode)lhs);
+            }
+
+            lhs = new CallNode(source, callToken, finish, lhs, arguments);
+            if (isInWithBlock()) {
+                ((CallNode)lhs).setInWithBlock();
+            }
+
+            function.setHasCalls(true);
+        }
+
+loop:
+        while (true) {
+            // Capture token.
+            callToken = token;
+
+            switch (type) {
+            case LPAREN:
+                // Get NEW or FUNCTION arguments.
+                final List<Node> arguments = argumentList();
+
+                // Create call node.
+                lhs = new CallNode(source, callToken, finish, lhs, arguments);
+                if (isInWithBlock()) {
+                    ((CallNode)lhs).setInWithBlock();
+                }
+
+                function.setHasCalls(true);
+
+                break;
+
+            case LBRACKET:
+                next();
+
+                // Get array index.
+                final Node rhs = expression();
+
+                expect(RBRACKET);
+
+                // Create indexing node.
+                lhs = new IndexNode(source, callToken, finish, lhs, rhs);
+
+                break;
+
+            case PERIOD:
+                next();
+
+                final IdentNode property = getIdentifierName();
+
+                // Create property access node.
+                lhs = new AccessNode(source, callToken, finish, lhs, property);
+
+                break;
+
+            default:
+                break loop;
+            }
+        }
+
+        return lhs;
+    }
+
+    /**
+     * NewExpression :
+     *      MemberExpression
+     *      new NewExpression
+     *
+     * See 11.2
+     *
+     * Parse new expression.
+     * @return Expression node.
+     */
+    private Node newExpression() {
+        final long newToken = token;
+        // NEW is tested in caller.
+        next();
+
+        // Get function base.
+        final Node constructor = memberExpression();
+        if (constructor == null) {
+            return null;
+        }
+        // Get arguments.
+        List<Node> arguments;
+
+        // Allow for missing arguments.
+        if (type == LPAREN) {
+            arguments = argumentList();
+        } else {
+            arguments = new ArrayList<>();
+        }
+
+        // This is to support the following interface impl. syntax:
+        //
+        //     var r = new java.lang.Runnable() {
+        //         run: function() { println("run"); }
+        //     };
+        //
+        // The object literal following the "new Constructor()" expresssion
+        // is passed as an additional (last) argument to the constructor.
+
+        if (type == LBRACE) {
+            arguments.add(objectLiteral());
+        }
+
+        function.setHasCalls(true);
+        final CallNode callNode = new CallNode(source, constructor.getToken(), finish, constructor, arguments);
+        if (isInWithBlock()) {
+            callNode.setInWithBlock();
+        }
+
+        return new UnaryNode(source, newToken, callNode);
+    }
+
+    /**
+     * MemberExpression :
+     *      PrimaryExpression
+     *      FunctionExpression
+     *      MemberExpression [ Expression ]
+     *      MemberExpression . IdentifierName
+     *      new MemberExpression Arguments
+     *
+     * See 11.2
+     *
+     * Parse member expression.
+     * @return Expression node.
+     */
+    private Node memberExpression() {
+        // Prepare to build operation.
+        Node lhs;
+
+        switch (type) {
+        case NEW:
+            // Get new exppression.
+            lhs = newExpression();
+            break;
+
+        case FUNCTION:
+            // Get function expression.
+            lhs = functionExpression(false);
+            break;
+
+        default:
+            // Get primary expression.
+            lhs = primaryExpression();
+            break;
+        }
+
+loop:
+        while (true) {
+            // Capture token.
+            final long callToken = token;
+
+            switch (type) {
+            case LBRACKET:
+                next();
+
+                // Get array index.
+                final Node index = expression();
+
+                expect(RBRACKET);
+
+                // Create indexing node.
+                lhs = new IndexNode(source, callToken, finish, lhs, index);
+
+                break;
+
+            case PERIOD:
+                if (lhs == null) {
+                    error(AbstractParser.message("expected.operand", type.getNameOrType()));
+                    return null;
+                }
+
+                next();
+
+                final IdentNode property = getIdentifierName();
+
+                // Create property access node.
+                lhs = new AccessNode(source, callToken, finish, lhs, property);
+
+                break;
+
+            default:
+                break loop;
+            }
+        }
+
+        return lhs;
+    }
+
+    /**
+     * Arguments :
+     *      ( )
+     *      ( ArgumentList )
+     *
+     * ArgumentList :
+     *      AssignmentExpression
+     *      ArgumentList , AssignmentExpression
+     *
+     * See 11.2
+     *
+     * Parse function call arguments.
+     * @return Argument list.
+     */
+    private List<Node> argumentList() {
+        // Prepare to accumulate list of arguments.
+        final List<Node> nodeList = new ArrayList<>();
+        // LPAREN tested in caller.
+        next();
+
+        // Track commas.
+        boolean first = true;
+
+        while (type != RPAREN) {
+            // Comma prior to every argument except the first.
+            if (!first) {
+                expect(COMMARIGHT);
+            } else {
+                first = false;
+            }
+
+            // Get argument expression.
+            nodeList.add(assignmentExpression(false));
+        }
+
+        expect(RPAREN);
+
+        return nodeList;
+   }
+
+    /**
+     * FunctionDeclaration :
+     *      function Identifier ( FormalParameterList? ) { FunctionBody }
+     *
+     * FunctionExpression :
+     *      function Identifier? ( FormalParameterList? ) { FunctionBody }
+     *
+     * See 13
+     *
+     * Parse function declaration.
+     * @param isStatement True if for is a statement.
+     *
+     * @return Expression node.
+     */
+    private Node functionExpression(final boolean isStatement) {
+        final LineNumberNode lineNumber = lineNumber();
+
+        final long functionToken = token;
+        // FUNCTION is tested in caller.
+        next();
+
+        IdentNode name = null;
+
+        if (type == IDENT || isNonStrictModeIdent()) {
+            name = getIdent();
+            verifyStrictIdent(name, "function name");
+        } else if (isStatement && !context._anon_functions) {
+            expect(IDENT);
+        }
+
+        // name is null, generate anonymous name
+        boolean isAnonymous = false;
+        if (name == null) {
+            final String tmpName = "_L" + source.getLine(Token.descPosition(token));
+            name = new IdentNode(source, functionToken, Token.descPosition(functionToken), tmpName);
+            isAnonymous = true;
+        }
+
+        expect(LPAREN);
+
+        final List<IdentNode> parameters = formalParameterList();
+
+        expect(RPAREN);
+
+        final FunctionNode functionNode = functionBody(functionToken, name, parameters, FunctionNode.Kind.NORMAL);
+
+        if (isStatement) {
+            functionNode.setIsStatement();
+        }
+
+        if (isAnonymous) {
+            functionNode.setIsAnonymous();
+        }
+
+        final ReferenceNode referenceNode = new ReferenceNode(source, functionToken, finish, functionNode);
+
+        final int arity = parameters.size();
+
+        final boolean strict = functionNode.isStrictMode();
+        if (arity > 1) {
+            final HashSet<String> parametersSet = new HashSet<>(arity);
+
+            for (int i = arity - 1; i >= 0; i--) {
+                final IdentNode parameter = parameters.get(i);
+                String parameterName = parameter.getName();
+
+                if (ARGUMENTS.tag().equals(parameterName)) {
+                    functionNode.setHideArguments();
+                }
+
+                if (parametersSet.contains(parameterName)) {
+                    // redefinition of parameter name
+                    if (strict) {
+                        error(AbstractParser.message("strict.param.redefinition", parameterName), parameter.getToken());
+                    } else {
+                        // rename in non-strict mode
+                        parameterName = functionNode.uniqueName(parameterName);
+                        final long parameterToken = parameter.getToken();
+                        parameters.set(i, new IdentNode(source, parameterToken, Token.descPosition(parameterToken), functionNode.uniqueName(parameterName)));
+                    }
+                }
+
+                parametersSet.add(parameterName);
+            }
+        } else if (arity == 1) {
+            if (ARGUMENTS.tag().equals(parameters.get(0).getName())) {
+                functionNode.setHideArguments();
+            }
+        }
+
+        if (arity > LinkerCallSite.ARGLIMIT) {
+            functionNode.setIsVarArg();
+        }
+
+        if (isStatement) {
+            functionNode.setFunctionVarNode(new VarNode(source, functionToken, finish, name, referenceNode), lineNumber);
+        }
+
+        return referenceNode;
+    }
+
+    /**
+     * FormalParameterList :
+     *      Identifier
+     *      FormalParameterList , Identifier
+     *
+     * See 13
+     *
+     * Parse function parameter list.
+     * @return List of parameter nodes.
+     */
+    private List<IdentNode> formalParameterList() {
+        // Prepare to gather parameters.
+        final List<IdentNode> parameters = new ArrayList<>();
+        // Track commas.
+        boolean first = true;
+
+        while (type != RPAREN) {
+            // Comma prior to every argument except the first.
+            if (!first) {
+                expect(COMMARIGHT);
+            } else {
+                first = false;
+            }
+
+            // Get and add parameter.
+            final IdentNode ident = getIdent();
+
+            // ECMA 13.1 strict mode restrictions
+            verifyStrictIdent(ident, "function parameter");
+
+            parameters.add(ident);
+        }
+
+        return parameters;
+    }
+
+    /**
+     * FunctionBody :
+     *      SourceElements?
+     *
+     * See 13
+     *
+     * Parse function body.
+     * @return function node (body.)
+     */
+    private FunctionNode functionBody(final long firstToken, final IdentNode ident, final List<IdentNode> parameters, final FunctionNode.Kind kind) {
+        FunctionNode functionNode = null;
+
+        try {
+            // Create a new function block.
+            functionNode = newFunctionBlock(ident);
+            functionNode.setParameters(parameters);
+            functionNode.setKind(kind);
+            functionNode.setFirstToken(firstToken);
+
+            // Nashorn extension: expression closures
+            if (type != LBRACE) {
+                /*
+                 * Example:
+                 *
+                 * function square(x) x * x;
+                 * print(square(3));
+                 */
+
+                // just expression as function body
+                final Node expr = expression();
+
+                // create a return statement
+                final ReturnNode  returnNode  = new ReturnNode(source, expr.getToken(), finish, expr, null);
+                final ExecuteNode executeNode = new ExecuteNode(source, returnNode.getToken(), finish, returnNode);
+
+                // add the return statement
+                functionNode.addStatement(executeNode);
+                functionNode.setLastToken(token);
+                functionNode.setFinish(Token.descPosition(token) + Token.descLength(token));
+
+            } else {
+                expect(LBRACE);
+
+                // Gather the function elements.
+                sourceElements();
+
+                functionNode.setLastToken(token);
+                expect(RBRACE);
+                functionNode.setFinish(finish);
+
+            }
+
+            block.addStatement(lineNumber());
+        } finally {
+            restoreBlock();
+        }
+
+        // Add the body of the function to the current block.
+        block.addFunction(functionNode);
+
+        return functionNode;
+    }
+
+    private RuntimeNode referenceError(final Node lhs, final Node rhs) {
+        final ArrayList<Node> args = new ArrayList<>();
+        args.add(lhs);
+        if (rhs == null) {
+            args.add(LiteralNode.newInstance(source, lhs.getToken(), lhs.getFinish()));
+        } else {
+            args.add(rhs);
+        }
+        args.add(LiteralNode.newInstance(source, lhs.getToken(), lhs.getFinish(), lhs.toString()));
+        final RuntimeNode runtimeNode = new RuntimeNode(source, lhs.getToken(),
+                      lhs.getFinish(), RuntimeNode.Request.REFERENCE_ERROR, args);
+        return runtimeNode;
+    }
+
+    /*
+     * parse LHS [a, b, ..., c].
+     *
+     * JavaScript 1.8.
+     */
+    //private Node destructureExpression() {
+    //    return null;
+    //}
+
+    /**
+     * PostfixExpression :
+     *      LeftHandSideExpression
+     *      LeftHandSideExpression ++ // [no LineTerminator here]
+     *      LeftHandSideExpression -- // [no LineTerminator here]
+     *
+     * See 11.3
+     *
+     * UnaryExpression :
+     *      PostfixExpression
+     *      delete UnaryExpression
+     *      Node UnaryExpression
+     *      typeof UnaryExpression
+     *      ++ UnaryExpression
+     *      -- UnaryExpression
+     *      + UnaryExpression
+     *      - UnaryExpression
+     *      ~ UnaryExpression
+     *      ! UnaryExpression
+     *
+     * See 11.4
+     *
+     * Parse unary expression.
+     * @return Expression node.
+     */
+    private Node unaryExpression() {
+        final long unaryToken = token;
+
+        switch (type) {
+        case DELETE:
+        case VOID:
+        case TYPEOF:
+        case ADD:
+        case SUB:
+        case BIT_NOT:
+        case NOT:
+            next();
+
+            final Node expr = unaryExpression();
+
+            /*
+             // Not sure if "delete <ident>" is a compile-time error or a
+             // runtime error in strict mode.
+
+             if (isStrictMode) {
+                 if (unaryTokenType == DELETE && expr instanceof IdentNode) {
+                     error(message("strict.cant.delete.ident", ((IdentNode)expr).getName()), expr.getToken());
+                 }
+             }
+             */
+            return new UnaryNode(source, unaryToken, expr);
+
+        case INCPREFIX:
+        case DECPREFIX:
+            final TokenType opType = type;
+            next();
+
+            final Node lhs = leftHandSideExpression();
+            // ++, -- without operand..
+            if (lhs == null) {
+                // error would have been issued when looking for 'lhs'
+                return null;
+            }
+            if (!(lhs instanceof AccessNode ||
+                  lhs instanceof IndexNode ||
+                  lhs instanceof IdentNode)) {
+                return referenceError(lhs, null);
+            }
+
+            if (lhs instanceof IdentNode) {
+                if (! checkIdentLValue((IdentNode)lhs)) {
+                    return referenceError(lhs, null);
+                }
+                verifyStrictIdent((IdentNode)lhs, "operand for " + opType.getName() + " operator");
+            }
+
+            return incDecExpression(unaryToken, opType, lhs, false);
+
+        default:
+            break;
+        }
+
+        Node expression = leftHandSideExpression();
+
+        if (last != EOL) {
+            switch (type) {
+            case INCPREFIX:
+            case DECPREFIX:
+                final TokenType opType = type;
+                final Node lhs = expression;
+                if (!(lhs instanceof AccessNode ||
+                   lhs instanceof IndexNode ||
+                   lhs instanceof IdentNode)) {
+                    next();
+                    return referenceError(lhs, null);
+                }
+                if (lhs instanceof IdentNode) {
+                    if (! checkIdentLValue((IdentNode)lhs)) {
+                        next();
+                        return referenceError(lhs, null);
+                    }
+                    verifyStrictIdent((IdentNode)lhs, "operand for " + opType.getName() + " operator");
+                }
+                expression = incDecExpression(token, type, expression, true);
+                next();
+                break;
+            default:
+                break;
+            }
+        }
+
+        if (expression == null) {
+            error(AbstractParser.message("expected.operand", type.getNameOrType()));
+        }
+
+        return expression;
+    }
+
+    /**
+     * MultiplicativeExpression :
+     *      UnaryExpression
+     *      MultiplicativeExpression * UnaryExpression
+     *      MultiplicativeExpression / UnaryExpression
+     *      MultiplicativeExpression % UnaryExpression
+     *
+     * See 11.5
+     *
+     * AdditiveExpression :
+     *      MultiplicativeExpression
+     *      AdditiveExpression + MultiplicativeExpression
+     *      AdditiveExpression - MultiplicativeExpression
+     *
+     * See 11.6
+     *
+     * ShiftExpression :
+     *      AdditiveExpression
+     *      ShiftExpression << AdditiveExpression
+     *      ShiftExpression >> AdditiveExpression
+     *      ShiftExpression >>> AdditiveExpression
+     *
+     * See 11.7
+     *
+     * RelationalExpression :
+     *      ShiftExpression
+     *      RelationalExpression < ShiftExpression
+     *      RelationalExpression > ShiftExpression
+     *      RelationalExpression <= ShiftExpression
+     *      RelationalExpression >= ShiftExpression
+     *      RelationalExpression instanceof ShiftExpression
+     *      RelationalExpression in ShiftExpression // if !noIf
+     *
+     * See 11.8
+     *
+     *      RelationalExpression
+     *      EqualityExpression == RelationalExpression
+     *      EqualityExpression != RelationalExpression
+     *      EqualityExpression === RelationalExpression
+     *      EqualityExpression !== RelationalExpression
+     *
+     * See 11.9
+     *
+     * BitwiseANDExpression :
+     *      EqualityExpression
+     *      BitwiseANDExpression & EqualityExpression
+     *
+     * BitwiseXORExpression :
+     *      BitwiseANDExpression
+     *      BitwiseXORExpression ^ BitwiseANDExpression
+     *
+     * BitwiseORExpression :
+     *      BitwiseXORExpression
+     *      BitwiseORExpression | BitwiseXORExpression
+     *
+     * See 11.10
+     *
+     * LogicalANDExpression :
+     *      BitwiseORExpression
+     *      LogicalANDExpression && BitwiseORExpression
+     *
+     * LogicalORExpression :
+     *      LogicalANDExpression
+     *      LogicalORExpression || LogicalANDExpression
+     *
+     * See 11.11
+     *
+     * ConditionalExpression :
+     *      LogicalORExpression
+     *      LogicalORExpression ? AssignmentExpression : AssignmentExpression
+     *
+     * See 11.12
+     *
+     * AssignmentExpression :
+     *      ConditionalExpression
+     *      LeftHandSideExpression AssignmentOperator AssignmentExpression
+     *
+     * AssignmentOperator :
+     *      = *= /= %= += -= <<= >>= >>>= &= ^= |=
+     *
+     * See 11.13
+     *
+     * Expression :
+     *      AssignmentExpression
+     *      Expression , AssignmentExpression
+     *
+     * See 11.14
+     *
+     * Parse expression.
+     * @return Expression node.
+     */
+    private Node expression() {
+        // TODO - Destructuring array.
+        // Include commas in expression parsing.
+        return expression(unaryExpression(), COMMARIGHT.getPrecedence(), false);
+    }
+    private Node expression(final Node exprLhs, final int minPrecedence, final boolean noIn) {
+        // Get the precedence of the next operator.
+        int precedence = type.getPrecedence();
+        Node lhs = exprLhs;
+
+        // While greater precedence.
+        while (type.isOperator(noIn) && precedence >= minPrecedence) {
+            // Capture the operator token.
+            final long op = token;
+
+            if (type == TERNARY) {
+                // Skip operator.
+                next();
+
+                // Pass expression. Middle expression of a conditional expression can be a "in"
+                // expression - even in the contexts where "in" is not permitted.
+                final Node rhs = expression(unaryExpression(), ASSIGN.getPrecedence(), false);
+
+                expect(COLON);
+
+                // Fail expression.
+                final Node third = expression(unaryExpression(), ASSIGN.getPrecedence(), noIn);
+
+                // Build up node.
+                lhs = new TernaryNode(source, op, lhs, rhs, third);
+            } else {
+                // Skip operator.
+                next();
+
+                 // Get the next primary expression.
+                Node rhs = unaryExpression();
+
+                // Get precedence of next operator.
+                int nextPrecedence = type.getPrecedence();
+
+                // Subtask greater precedence.
+                while (type.isOperator(noIn) &&
+                       (nextPrecedence > precedence ||
+                       nextPrecedence == precedence && !type.isLeftAssociative())) {
+                    rhs = expression(rhs, nextPrecedence, noIn);
+                    nextPrecedence = type.getPrecedence();
+                }
+
+                lhs = verifyAssignment(op, lhs, rhs);
+            }
+
+            precedence = type.getPrecedence();
+        }
+
+        return lhs;
+    }
+
+    private Node assignmentExpression(final boolean noIn) {
+        // TODO - Handle decompose.
+        // Exclude commas in expression parsing.
+        return expression(unaryExpression(), ASSIGN.getPrecedence(), noIn);
+    }
+
+    /**
+     * Parse an end of line.
+     */
+    private void endOfLine() {
+        switch (type) {
+        case SEMICOLON:
+        case EOL:
+            next();
+            break;
+        case RPAREN:
+        case RBRACKET:
+        case RBRACE:
+        case EOF:
+            break;
+        default:
+            if (last != EOL) {
+                expect(SEMICOLON);
+            }
+            break;
+        }
+    }
+
+    /**
+     * Add a line number node at current position
+     */
+    private LineNumberNode lineNumber() {
+        if (context._debug_lines) {
+            return new LineNumberNode(source, token, line);
+        }
+        return null;
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/parser/RegExp.java b/nashorn/src/jdk/nashorn/internal/parser/RegExp.java
new file mode 100644
index 00000000000..f711a4c6bb4
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/parser/RegExp.java
@@ -0,0 +1,180 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.parser;
+
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import static java.util.regex.Pattern.MULTILINE;
+import static java.util.regex.Pattern.UNICODE_CASE;
+
+import java.util.HashSet;
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
+import jdk.nashorn.internal.runtime.BitVector;
+import jdk.nashorn.internal.runtime.ECMAErrors;
+import jdk.nashorn.internal.runtime.ParserException;
+
+/**
+ * This class is used to represent a parsed regular expression. Accepts input
+ * pattern string and flagString. This is used by AbstractParser to validate
+ * RegExp literals as well as by NativeRegExp to parse RegExp constructor arguments.
+ */
+public final class RegExp {
+    /** Pattern string. */
+    private final String input;
+
+    /** Global search flag for this regexp.*/
+    private boolean global;
+
+    /** Case insensitive flag for this regexp */
+    private boolean ignoreCase;
+
+    /** Multi-line flag for this regexp */
+    private boolean multiline;
+
+    /** Java regexp pattern to use for match. We compile to one of these */
+    private Pattern pattern;
+
+    /** BitVector that keeps track of groups in negative lookahead */
+    private BitVector groupsInNegativeLookahead;
+
+    /**
+     * Creates RegExpLiteral object from given input and flagString.
+     *
+     * @param input RegExp pattern string
+     * @param flagString RegExp flags
+     * @throws ParserException if flagString is invalid or input string has syntax error.
+     */
+    public RegExp(final String input, final String flagString) throws ParserException {
+        this.input = input;
+        final HashSet<Character> usedFlags = new HashSet<>();
+        int flags = 0;
+
+        for (final char ch : flagString.toCharArray()) {
+            if (usedFlags.contains(ch)) {
+                throwParserException("repeated.flag", Character.toString(ch));
+            }
+
+            switch (ch) {
+            case 'g':
+                this.global = true;
+                usedFlags.add(ch);
+                break;
+            case 'i':
+                this.ignoreCase = true;
+                flags |= CASE_INSENSITIVE | UNICODE_CASE;
+                usedFlags.add(ch);
+                break;
+            case 'm':
+                this.multiline = true;
+                flags |= MULTILINE;
+                usedFlags.add(ch);
+                break;
+            default:
+                throwParserException("unsupported.flag", Character.toString(ch));
+            }
+        }
+
+        try {
+            RegExpScanner parsed;
+
+            try {
+                parsed = RegExpScanner.scan(input);
+            } catch (final PatternSyntaxException e) {
+                // refine the exception with a better syntax error, if this
+                // passes, just rethrow what we have
+                Pattern.compile(input, flags);
+                throw e;
+            }
+
+            if (parsed != null) {
+                this.pattern = Pattern.compile(parsed.getJavaPattern(), flags);
+                this.groupsInNegativeLookahead = parsed.getGroupsInNegativeLookahead();
+            }
+        } catch (final PatternSyntaxException e2) {
+            throwParserException("syntax", e2.getMessage());
+        }
+
+    }
+
+    /**
+     * @return the input
+     */
+    public String getInput() {
+        return input;
+    }
+
+    /**
+     * @return the global
+     */
+    public boolean isGlobal() {
+        return global;
+    }
+
+    /**
+     * @return the ignoreCase
+     */
+    public boolean isIgnoreCase() {
+        return ignoreCase;
+    }
+
+    /**
+     * @return the multiline
+     */
+    public boolean isMultiline() {
+        return multiline;
+    }
+
+    /**
+     * @return the pattern
+     */
+    public Pattern getPattern() {
+        return pattern;
+    }
+
+    /**
+     * @return the groupsInNegativeLookahead
+     */
+    public BitVector getGroupsInNegativeLookahead() {
+        return groupsInNegativeLookahead;
+    }
+
+    /**
+     * Validation method for RegExp input and flagString - we don't care about the RegExp object
+     *
+     * @param input        regexp input
+     * @param flagString   flag string
+     *
+     * @throws ParserException if invalid regexp and flags
+     */
+    @SuppressWarnings({"unused", "ResultOfObjectAllocationIgnored"})
+    public static void validate(final String input, final String flagString) throws ParserException {
+        new RegExp(input, flagString);
+    }
+
+    private static void throwParserException(final String key, final String str) throws ParserException {
+        throw new ParserException(ECMAErrors.getMessage("parser.error.regex." + key, str));
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/parser/RegExpScanner.java b/nashorn/src/jdk/nashorn/internal/parser/RegExpScanner.java
new file mode 100644
index 00000000000..aeb32ec3218
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/parser/RegExpScanner.java
@@ -0,0 +1,1414 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.parser;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.PatternSyntaxException;
+import jdk.nashorn.internal.runtime.BitVector;
+
+/**
+ * Scan a JavaScript regexp, converting to Java regex if necessary.
+ *
+ */
+public class RegExpScanner extends Scanner {
+
+    /**
+     * String builder to accumulate the result - this contains verbatim parsed JavaScript.
+     * to get the java equivalent we need to create a Pattern token and return its toString()
+     */
+    private final StringBuilder sb;
+
+    /** An optional error message if one occurred during parse. */
+    private String errorMessage;
+
+    /** Is this the special case of a regexp that never matches anything */
+    private boolean neverMatches;
+
+    /** The resulting java.util.regex pattern string. */
+    private String javaPattern;
+
+    /** Expected token table */
+    private final Map<Character, Integer> expected = new HashMap<>();
+
+    /** Capturing parenthesis that have been found so far. */
+    private final List<Capture> caps = new LinkedList<>();
+
+    /** Forward references to capturing parenthesis to be resolved later.*/
+    private final Map<Integer, Token> forwardReferences = new LinkedHashMap<>();
+
+    /** Current level of zero-width negative lookahead assertions. */
+    private int negativeLookaheadLevel;
+
+    private static final String NON_IDENT_ESCAPES = "$^*+(){}[]|\\.?";
+
+    private static class Capture {
+        /**
+         * Zero-width negative lookaheads enclosing the capture.
+         */
+        private final int negativeLookaheadLevel;
+        /**
+         * Captures that live inside a negative lookahead are dead after the
+         * lookahead and will be undefined if referenced from outside.
+         */
+        private boolean isDead;
+
+        Capture(final int negativeLookaheadLevel) {
+            this.negativeLookaheadLevel = negativeLookaheadLevel;
+        }
+
+        public int getNegativeLookaheadLevel() {
+            return negativeLookaheadLevel;
+        }
+
+        public boolean isDead() {
+            return isDead;
+        }
+
+        public void setDead() {
+            this.isDead = true;
+        }
+    }
+
+    /**
+     * This is a token - the JavaScript regexp is scanned into a token tree
+     * A token has other tokens as children as well as "atoms", i.e. Strings.
+     *
+     */
+    private static class Token {
+
+        private enum Type {
+            PATTERN,
+            DISJUNCTION,
+            ALTERNATIVE,
+            TERM,
+            ASSERTION,
+            QUANTIFIER,
+            QUANTIFIER_PREFIX,
+            ATOM,
+            PATTERN_CHARACTER,
+            ATOM_ESCAPE,
+            CHARACTER_ESCAPE,
+            CONTROL_ESCAPE,
+            CONTROL_LETTER,
+            IDENTITY_ESCAPE,
+            DECIMAL_ESCAPE,
+            CHARACTERCLASS_ESCAPE,
+            CHARACTERCLASS,
+            CLASSRANGES,
+            NON_EMPTY_CLASSRANGES,
+            NON_EMPTY_CLASSRANGES_NODASH,
+            CLASSATOM,
+            CLASSATOM_NODASH,
+            CLASS_ESCAPE,
+            DECIMALDIGITS,
+            HEX_ESCAPESEQUENCE,
+            UNICODE_ESCAPESEQUENCE,
+        }
+
+        /**
+         * Token tyoe
+         */
+        private final Token.Type type;
+
+        /**
+         * Child nodes
+         */
+        private final List<Object> children;
+
+        /**
+         * Parent node
+         */
+        private Token parent;
+
+        /**
+         * Dead code flag
+         */
+        private boolean isDead;
+
+        private static final Map<Type, ToString> toStringMap = new HashMap<>();
+        private static final ToString DEFAULT_TOSTRING = new ToString();
+
+        private static String unicode(final int value) {
+            final StringBuilder sb = new StringBuilder();
+            final String hex = Integer.toHexString(value);
+            sb.append('u');
+            for (int i = 0; i < 4 - hex.length(); i++) {
+                sb.append('0');
+            }
+            sb.append(hex);
+
+            return sb.toString();
+        }
+
+        static {
+            toStringMap.put(Type.CHARACTERCLASS, new ToString() {
+                @Override
+                public String toString(final Token token) {
+                    return super.toString(token).replace("\\b", "\b");
+                }
+            });
+
+            // for some reason java regexps don't like control characters on the
+            // form "\\ca".match([string with ascii 1 at char0]). Translating
+            // them to unicode does it though.
+            toStringMap.put(Type.CHARACTER_ESCAPE, new ToString() {
+                @Override
+                public String toString(final Token token) {
+                    final String str = super.toString(token);
+                    if (str.length() == 2) {
+                        return Token.unicode(Character.toLowerCase(str.charAt(1)) - 'a' + 1);
+                    }
+                    return str;
+                }
+            });
+
+            toStringMap.put(Type.DECIMAL_ESCAPE, new ToString() {
+                @Override
+                public String toString(final Token token) {
+                    final String str = super.toString(token);
+
+                    if ("\0".equals(str)) {
+                        return str;
+                    }
+
+                    int value;
+
+                    if (!token.hasParentOfType(Type.CLASSRANGES)) {
+                        return str;
+                    }
+
+                    value = Integer.parseInt(str, 8); //throws exception that leads to SyntaxError if not octal
+                    if (value > 0xff) {
+                        throw new NumberFormatException(str);
+                    }
+
+                    return Token.unicode(value);
+                }
+            });
+
+        }
+
+        /**
+         * JavaScript Token to Java regex substring framework.
+         *
+         */
+        private static class ToString {
+            String toString(final Token token) {
+                final StringBuilder sb = new StringBuilder();
+                for (final Object child : token.getChildren()) {
+                    sb.append(child);
+                }
+
+                //perform global substitutions that hold true for any evaluated form
+                String str = sb.toString();
+                switch (str) {
+                case "\\s":
+                    str = "[" + Lexer.getWhitespaceRegExp() + "]";
+                    break;
+                case "\\S":
+                    str = "[^" + Lexer.getWhitespaceRegExp() + "]";
+                    break;
+                case "[^]":
+                    str = "[\\s\\S]";
+                    break;
+                default:
+                    break;
+                }
+                return str;
+            }
+        }
+
+        /**
+         * Token iterator. Doesn't return "atom" children. i.e. string representations,
+         * just tokens
+         *
+         */
+        private static class TokenIterator implements Iterator<Token> {
+            private final List<Token> preorder;
+
+            private void init(final Token root) {
+                preorder.add(root);
+                for (final Object child : root.getChildren()) {
+                    if (child instanceof Token) {
+                        init((Token)child);
+                    }
+                }
+            }
+
+            TokenIterator(final Token root) {
+                preorder = new ArrayList<>();
+                init(root);
+            }
+
+            @Override
+            public boolean hasNext() {
+                return !preorder.isEmpty();
+            }
+
+            @Override
+            public Token next() {
+                return preorder.remove(0);
+            }
+
+            @Override
+            public void remove() {
+                next();
+            }
+        }
+
+        /**
+         * Constructor
+         * @param type the token type
+         */
+        Token(final Token.Type type) {
+            this.type = type;
+            children = new ArrayList<>();
+        }
+
+        /**
+         * Add a an "atom" child to a token
+         * @param child the child to add
+         * @return the token (for chaining)
+         */
+        public Token add(final String child) {
+            children.add(child);
+            return this;
+        }
+
+        /**
+         * Add a child to a token
+         * @param child the child
+         * @return the token (for chaining)
+         */
+        public Token add(final Token child) {
+            if (child != null) {
+                children.add(child);
+                child.setParent(this);
+            }
+            return this;
+        }
+
+        /**
+         * Remove a child from a token
+         * @param child the child to remove
+         * @return true if successful
+         */
+        public boolean remove(final Token child) {
+            return children.remove(child);
+        }
+
+        /**
+         * Remove the last child from a token
+         * @return the removed child
+         */
+        public Object removeLast() {
+            return children.remove(children.size() - 1);
+        }
+
+        /**
+         * Flag this token as dead code
+         * @param isDead is it dead or not
+         */
+        private void setIsDead(final boolean isDead) {
+            this.isDead = isDead;
+        }
+
+        /**
+         * Is this token dead code
+         * @return boolean
+         */
+        private boolean getIsDead() {
+            return isDead;
+        }
+
+        /**
+         * Get the parent of this token
+         * @return parent token
+         */
+        public Token getParent() {
+            return parent;
+        }
+
+        public boolean hasParentOfType(final Token.Type parentType) {
+            for (Token p = getParent(); p != null; p = p.getParent()) {
+                if (p.getType() == parentType) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        public boolean hasChildOfType(final Token.Type childType) {
+            for (final Iterator<Token> iter = iterator() ; iter.hasNext() ; ) {
+                if (iter.next().getType() == childType) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        /**
+         * Set the parent of this token
+         * @param parent
+         */
+        private void setParent(final Token parent) {
+            this.parent = parent;
+        }
+
+        /**
+         * Get the children of this token
+         * @return an array of children, never null
+         */
+        public Object[] getChildren() {
+            return children.toArray();
+        }
+
+        /**
+         * Reset this token, remove all children
+         */
+        public void reset() {
+            children.clear();
+        }
+
+        /**
+         * Get a preorder token iterator with this token as root
+         * @return an iterator
+         */
+        public Iterator<Token> iterator() {
+            return new TokenIterator(this);
+        }
+
+        /**
+         * Get the type of this token
+         * @return type
+         */
+        public Type getType() {
+            return type;
+        }
+
+        /**
+         * Turn this token into Java regexp compatible text
+         * @return part of a java regexp
+         */
+        @Override
+        public String toString() {
+            ToString t = toStringMap.get(getType());
+            if (t == null) {
+                t = DEFAULT_TOSTRING;
+            }
+            return t.toString(this);
+        }
+    }
+
+    /**
+     * Constructor
+     * @param string the JavaScript regexp to parse
+     */
+    private RegExpScanner(final String string) {
+        super(string);
+        sb = new StringBuilder(limit);
+        reset(0);
+        expected.put(']', 0);
+        expected.put('}', 0);
+    }
+
+    private void processForwardReferences() {
+        if (neverMatches()) {
+            return;
+        }
+
+        for (final Map.Entry<Integer, Token> fwdRef : forwardReferences.entrySet()) {
+            if (fwdRef.getKey().intValue() > caps.size()) {
+                neverMatches = true;
+                break;
+            }
+
+            fwdRef.getValue().setIsDead(true);
+        }
+
+        forwardReferences.clear();
+    }
+
+    /**
+     * Scan a JavaScript regexp string returning a Java safe regex string.
+     *
+     * @param string
+     *            JavaScript regexp string.
+     * @return Java safe regex string.
+     */
+    public static RegExpScanner scan(final String string) {
+        final RegExpScanner scanner = new RegExpScanner(string);
+
+        Token pattern;
+
+        try {
+            pattern = scanner.pattern();
+        } catch (final Exception e) {
+            throw new PatternSyntaxException(e.getMessage(), string, scanner.sb.length());
+        }
+
+        scanner.processForwardReferences();
+        if (scanner.neverMatches()) {
+            return null; // never matches
+        }
+
+        // go over the code and remove dead code
+        final Iterator<Token> iter = pattern.iterator();
+        while (iter.hasNext()) {
+            final Token next = iter.next();
+            if (next.getIsDead()) {
+                next.getParent().remove(next);
+            }
+        }
+
+        // turn the pattern into a string, p, the java equivalent string for our js regexp
+        final String p = pattern.toString();
+        // if builder contains all tokens that were sent in, we know
+        // we correctly parsed the entire JavaScript regexp without syntax errors
+        if (!string.equals(scanner.getStringBuilder().toString())) {
+            throw new PatternSyntaxException(string, p, p.length() + 1);
+        }
+
+        scanner.javaPattern = p;
+        return scanner;
+     }
+
+    /**
+     * Does this regexp ever match anything? Use of e.g. [], which is legal in JavaScript,
+     * is an example where we never match
+     *
+     * @return boolean
+     */
+    private boolean neverMatches() {
+        return neverMatches;
+    }
+
+    /**
+     * This is used to set better error messages that can be reused
+     * in NativeRegExp for augmenting e.g. SyntaxErrors.
+     *
+     * @return an error message or null if no extra info
+     */
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+
+    final StringBuilder getStringBuilder() {
+        return sb;
+    }
+
+    String getJavaPattern() {
+        return javaPattern;
+    }
+
+    BitVector getGroupsInNegativeLookahead() {
+        BitVector vec = null;
+        for (int i = 0; i < caps.size(); i++) {
+            final Capture cap = caps.get(i);
+            if (cap.getNegativeLookaheadLevel() > 0) {
+                if (vec == null) {
+                    vec = new BitVector(caps.size() + 1);
+                }
+                vec.set(i + 1);
+            }
+        }
+        return vec;
+    }
+
+    /**
+     * Commit n characters to the builder and to a given token
+     * @param token Uncommitted token.
+     * @param n     Number of characters.
+     * @return Committed token
+     */
+    private Token commit(final Token token, final int n) {
+        final int startIn = position;
+
+        switch (n) {
+        case 1:
+            sb.append(ch0);
+            skip(1);
+            break;
+        case 2:
+            sb.append(ch0);
+            sb.append(ch1);
+            skip(2);
+            break;
+        case 3:
+            sb.append(ch0);
+            sb.append(ch1);
+            sb.append(ch2);
+            skip(3);
+            break;
+        default:
+            assert false : "Should not reach here";
+        }
+
+        if (token == null) {
+            return null;
+        }
+
+        return token.add(sb.substring(startIn, sb.length()));
+    }
+
+    /**
+     * Restart the buffers back at an earlier position.
+     *
+     * @param startIn
+     *            Position in the input stream.
+     * @param startOut
+     *            Position in the output stream.
+     */
+    private void restart(final int startIn, final int startOut) {
+        reset(startIn);
+        sb.setLength(startOut);
+    }
+
+    private void push(final char ch) {
+        expected.put(ch, expected.get(ch) + 1);
+    }
+
+    private void pop(final char ch) {
+        expected.put(ch, Math.min(0, expected.get(ch) - 1));
+    }
+
+    /*
+     * Recursive descent tokenizer starts below.
+     */
+
+    /*
+     * Pattern ::
+     *      Disjunction
+     */
+    private Token pattern() {
+        final Token token = new Token(Token.Type.PATTERN);
+
+        final Token child = disjunction();
+        if (child != null) {
+            return token.add(child);
+        }
+
+        return null;
+    }
+
+    /*
+     * Disjunction ::
+     *      Alternative
+     *      Alternative | Disjunction
+     */
+    private Token disjunction() {
+        final Token token = new Token(Token.Type.DISJUNCTION);
+
+        while (true) {
+            token.add(alternative());
+
+            if (ch0 == '|') {
+                commit(token, 1);
+            } else {
+                break;
+            }
+        }
+
+        return token;
+    }
+
+    /*
+     * Alternative ::
+     *      [empty]
+     *      Alternative Term
+     */
+    private Token alternative() {
+        final Token token = new Token(Token.Type.ALTERNATIVE);
+
+        Token child;
+        while ((child = term()) != null) {
+            token.add(child);
+        }
+
+        return token;
+    }
+
+    /*
+     * Term ::
+     *      Assertion
+     *      Atom
+     *      Atom Quantifier
+     */
+    private Token term() {
+        final int startIn  = position;
+        final int startOut = sb.length();
+        final Token token  = new Token(Token.Type.TERM);
+        Token child;
+
+        child = assertion();
+        if (child != null) {
+            return token.add(child);
+        }
+
+        child = atom();
+        if (child != null) {
+            boolean emptyCharacterClass = false;
+            if ("[]".equals(child.toString())) {
+                emptyCharacterClass = true;
+            }
+
+            token.add(child);
+
+            final Token quantifier = quantifier();
+            if (quantifier != null) {
+                token.add(quantifier);
+            }
+
+            if (emptyCharacterClass) {
+                if (quantifier == null) {
+                    neverMatches = true; //never matches ever.
+                } else {
+                    //if we can get away with max zero, remove this entire token
+                    final String qs = quantifier.toString();
+                    if ("+".equals(qs) || "*".equals(qs) || qs.startsWith("{0,")) {
+                        token.setIsDead(true);
+                    }
+                }
+            }
+
+            return token;
+        }
+
+        restart(startIn, startOut);
+        return null;
+    }
+
+    /*
+     * Assertion ::
+     *      ^
+     *      $
+     *      \b
+     *      \B
+     *      ( ? = Disjunction )
+     *      ( ? ! Disjunction )
+     */
+    private Token assertion() {
+        final int startIn  = position;
+        final int startOut = sb.length();
+        final Token token  = new Token(Token.Type.ASSERTION);
+
+        switch (ch0) {
+        case '^':
+        case '$':
+            return commit(token, 1);
+
+        case '\\':
+            if (ch1 == 'b' || ch1 == 'B') {
+                return commit(token, 2);
+            }
+            break;
+
+        case '(':
+            if (ch1 != '?') {
+                break;
+            }
+            if (ch2 != '=' && ch2 != '!') {
+                break;
+            }
+            final boolean isNegativeLookahead = (ch2 == '!');
+            commit(token, 3);
+
+            if (isNegativeLookahead) {
+                negativeLookaheadLevel++;
+            }
+            final Token disjunction = disjunction();
+            if (isNegativeLookahead) {
+                for (final Capture cap : caps) {
+                    if (cap.getNegativeLookaheadLevel() >= negativeLookaheadLevel) {
+                        cap.setDead();
+                    }
+                }
+                negativeLookaheadLevel--;
+            }
+
+            if (disjunction != null && ch0 == ')') {
+                token.add(disjunction);
+                return commit(token, 1);
+            }
+            break;
+
+        default:
+            break;
+        }
+
+        restart(startIn, startOut);
+
+        return null;
+    }
+
+    /*
+     * Quantifier ::
+     *      QuantifierPrefix
+     *      QuantifierPrefix ?
+     */
+    private Token quantifier() {
+        final Token token = new Token(Token.Type.QUANTIFIER);
+        final Token child = quantifierPrefix();
+        if (child != null) {
+            token.add(child);
+            if (ch0 == '?') {
+                commit(token, 1);
+            }
+            return token;
+        }
+        return null;
+    }
+
+    /*
+     * QuantifierPrefix ::
+     *      *
+     *      +
+     *      ?
+     *      { DecimalDigits }
+     *      { DecimalDigits , }
+     *      { DecimalDigits , DecimalDigits }
+     */
+    private Token quantifierPrefix() {
+        final int startIn  = position;
+        final int startOut = sb.length();
+        final Token token  = new Token(Token.Type.QUANTIFIER_PREFIX);
+
+        switch (ch0) {
+        case '*':
+        case '+':
+        case '?':
+            return commit(token, 1);
+
+        case '{':
+            commit(token, 1);
+
+            final Token child = decimalDigits();
+            if (child == null) {
+                break; // not a quantifier - back out
+            }
+            push('}');
+            token.add(child);
+
+            if (ch0 == ',') {
+                commit(token, 1);
+                token.add(decimalDigits());
+            }
+
+            if (ch0 == '}') {
+                pop('}');
+                commit(token, 1);
+            }
+
+            return token;
+
+        default:
+            break;
+        }
+
+        restart(startIn, startOut);
+        return null;
+    }
+
+    /*
+     * Atom ::
+     *      PatternCharacter
+     *      .
+     *      \ AtomEscape
+     *      CharacterClass
+     *      ( Disjunction )
+     *      ( ? : Disjunction )
+     *
+     */
+    private Token atom() {
+        final int startIn  = position;
+        final int startOut = sb.length();
+        final Token token  = new Token(Token.Type.ATOM);
+        Token child;
+
+        child = patternCharacter();
+        if (child != null) {
+            return token.add(child);
+        }
+
+        if (ch0 == '.') {
+            return commit(token, 1);
+        }
+
+        if (ch0 == '\\') {
+            commit(token, 1);
+            child = atomEscape();
+
+            if (child != null) {
+                if (child.hasChildOfType(Token.Type.IDENTITY_ESCAPE)) {
+                    final char idEscape = child.toString().charAt(0);
+                    if (NON_IDENT_ESCAPES.indexOf(idEscape) == -1) {
+                        token.reset();
+                    }
+                }
+
+                token.add(child);
+
+                // forward backreferences always match empty. JavaScript != Java
+                if (child.hasChildOfType(Token.Type.DECIMAL_ESCAPE) && !"\u0000".equals(child.toString())) {
+                    final int refNum = Integer.parseInt(child.toString());
+
+                    if (refNum - 1 < caps.size() && caps.get(refNum - 1).isDead()) {
+                        // reference to dead in-negative-lookahead capture
+                        token.setIsDead(true);
+                    } else if (caps.size() < refNum) {
+                        // forward reference: always matches against empty string (dead token).
+                        // invalid reference (non-existant capture): pattern never matches.
+                        forwardReferences.put(refNum, token);
+                    }
+                }
+
+                return token;
+            }
+        }
+
+        child = characterClass();
+        if (child != null) {
+            return token.add(child);
+        }
+
+        if (ch0 == '(') {
+            boolean capturingParens = true;
+            commit(token, 1);
+            if (ch0 == '?' && ch1 == ':') {
+                capturingParens = false;
+                commit(token, 2);
+            }
+
+            child = disjunction();
+            if (child != null) {
+                token.add(child);
+                if (ch0 == ')') {
+                    final Token atom = commit(token, 1);
+                    if (capturingParens) {
+                        caps.add(new Capture(negativeLookaheadLevel));
+                    }
+                    return atom;
+                }
+            }
+        }
+
+        restart(startIn, startOut);
+        return null;
+    }
+
+    /*
+     * PatternCharacter ::
+     *      SourceCharacter but not any of: ^$\.*+?()[]{}|
+     */
+    @SuppressWarnings("fallthrough")
+    private Token patternCharacter() {
+        if (atEOF()) {
+            return null;
+        }
+
+        switch (ch0) {
+        case '^':
+        case '$':
+        case '\\':
+        case '.':
+        case '*':
+        case '+':
+        case '?':
+        case '(':
+        case ')':
+        case '[':
+        case '|':
+            return null;
+
+        case '}':
+        case ']':
+            final int n = expected.get(ch0);
+            if (n != 0) {
+                return null;
+            }
+
+       case '{':
+           // if not a valid quantifier escape curly brace to match itself
+           // this ensures compatibility with other JS implementations
+           final Token quant = quantifierPrefix();
+           return (quant == null) ? commit(new Token(Token.Type.PATTERN_CHARACTER).add("\\"), 1) : null;
+
+        default:
+            return commit(new Token(Token.Type.PATTERN_CHARACTER), 1); // SOURCECHARACTER
+        }
+    }
+
+    /*
+     * AtomEscape ::
+     *      DecimalEscape
+     *      CharacterEscape
+     *      CharacterClassEscape
+     */
+    private Token atomEscape() {
+        final Token token = new Token(Token.Type.ATOM_ESCAPE);
+        Token child;
+
+        child = decimalEscape();
+        if (child != null) {
+            return token.add(child);
+        }
+
+        child = characterClassEscape();
+        if (child != null) {
+            return token.add(child);
+        }
+
+        child = characterEscape();
+        if (child != null) {
+            return token.add(child);
+        }
+
+
+        return null;
+    }
+
+    /*
+     * CharacterEscape ::
+     *      ControlEscape
+     *      c ControlLetter
+     *      HexEscapeSequence
+     *      UnicodeEscapeSequence
+     *      IdentityEscape
+     */
+    private Token characterEscape() {
+        final int startIn  = position;
+        final int startOut = sb.length();
+
+        final Token token = new Token(Token.Type.CHARACTER_ESCAPE);
+        Token child;
+
+        child = controlEscape();
+        if (child != null) {
+            return token.add(child);
+        }
+
+        if (ch0 == 'c') {
+            commit(token, 1);
+            child = controlLetter();
+            if (child != null) {
+                return token.add(child);
+            }
+            restart(startIn, startOut);
+        }
+
+        child = hexEscapeSequence();
+        if (child != null) {
+            return token.add(child);
+        }
+
+        child = unicodeEscapeSequence();
+        if (child != null) {
+            return token.add(child);
+        }
+
+        child = identityEscape();
+        if (child != null) {
+            return token.add(child);
+        }
+
+        restart(startIn, startOut);
+
+        return null;
+    }
+
+    private boolean scanEscapeSequence(final char leader, final int length, final Token token) {
+        final int startIn  = position;
+        final int startOut = sb.length();
+
+        if (ch0 != leader) {
+            return false;
+        }
+
+        commit(token, 1);
+        for (int i = 0; i < length; i++) {
+            final char ch0l = Character.toLowerCase(ch0);
+            if ((ch0l >= 'a' && ch0l <= 'f') || isDecimalDigit(ch0)) {
+                commit(token, 1);
+            } else {
+                restart(startIn, startOut);
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    private Token hexEscapeSequence() {
+        final Token token = new Token(Token.Type.HEX_ESCAPESEQUENCE);
+        if (scanEscapeSequence('x', 2, token)) {
+            return token;
+        }
+        return null;
+    }
+
+    private Token unicodeEscapeSequence() {
+        final Token token = new Token(Token.Type.UNICODE_ESCAPESEQUENCE);
+        if (scanEscapeSequence('u', 4, token)) {
+            return token;
+        }
+        return null;
+    }
+
+    /*
+     * ControlEscape ::
+     *      one of fnrtv
+     */
+    private Token controlEscape() {
+        switch (ch0) {
+        case 'f':
+        case 'n':
+        case 'r':
+        case 't':
+        case 'v':
+            return commit(new Token(Token.Type.CONTROL_ESCAPE), 1);
+
+        default:
+            return null;
+        }
+    }
+
+    /*
+     * ControlLetter ::
+     *      one of abcdefghijklmnopqrstuvwxyz
+     *      ABCDEFGHIJKLMNOPQRSTUVWXYZ
+     */
+    private Token controlLetter() {
+        final char c = Character.toUpperCase(ch0);
+        if (c >= 'A' && c <= 'Z') {
+            final Token token = new Token(Token.Type.CONTROL_LETTER);
+            commit(token, 1);
+            return token;
+        }
+        return null;
+        /*
+        Token token = new Token(Token.Type.CONTROL_LETTER);
+        commit(null, 1);//add original char to builder not to token
+        this.neverMatches = c < 'A' || c > 'Z';
+        return token.add(""+c);*/
+    }
+
+    /*
+     * IdentityEscape ::
+     *      SourceCharacter but not IdentifierPart
+     *      <ZWJ>  (200c)
+     *      <ZWNJ> (200d)
+     */
+    private Token identityEscape() {
+        final Token token = new Token(Token.Type.IDENTITY_ESCAPE);
+        commit(token, 1);
+        return token;
+    }
+
+    /*
+     * DecimalEscape ::
+     *      DecimalIntegerLiteral [lookahead DecimalDigit]
+     */
+    private Token decimalEscape() {
+        final Token token = new Token(Token.Type.DECIMAL_ESCAPE);
+        final int startIn  = position;
+        final int startOut = sb.length();
+
+        if (ch0 == '0' && !isDecimalDigit(ch1)) {
+            commit(token, 1);
+            token.removeLast();
+            //  DecimalEscape :: 0. If i is zero, return the EscapeValue consisting of a <NUL> character (Unicodevalue0000);
+            return token.add("\u0000");
+        }
+
+        if (isDecimalDigit(ch0)) {
+            while (isDecimalDigit(ch0)) {
+                commit(token, 1);
+            }
+            return token;
+        }
+
+        restart(startIn, startOut);
+
+        return null;
+    }
+
+    /*
+     * CharacterClassEscape ::
+     *  one of dDsSwW
+     */
+    private Token characterClassEscape() {
+        switch (ch0) {
+        case 's':
+        case 'S':
+        case 'd':
+        case 'D':
+        case 'w':
+        case 'W':
+            return commit(new Token(Token.Type.CHARACTERCLASS_ESCAPE), 1);
+
+        default:
+            return null;
+        }
+    }
+
+    /*
+     * CharacterClass ::
+     *      [ [lookahead {^}] ClassRanges ]
+     *      [ ^ ClassRanges ]
+     */
+    private Token characterClass() {
+        final int startIn  = position;
+        final int startOut = sb.length();
+        final Token token  = new Token(Token.Type.CHARACTERCLASS);
+
+        if (ch0 == '[') {
+            push(']');
+            commit(token, 1);
+
+            if (ch0 == '^') {
+                commit(token, 1);
+            }
+
+            final Token child = classRanges();
+            if (child != null && ch0 == ']') {
+                pop(']');
+                token.add(child);
+                return commit(token, 1);
+            }
+        }
+
+        restart(startIn, startOut);
+        return null;
+    }
+
+    /*
+     * ClassRanges ::
+     *      [empty]
+     *      NonemptyClassRanges
+     */
+    private Token classRanges() {
+        return new Token(Token.Type.CLASSRANGES).add(nonemptyClassRanges());
+    }
+
+    /*
+     * NonemptyClassRanges ::
+     *      ClassAtom
+     *      ClassAtom NonemptyClassRangesNoDash
+     *      ClassAtom - ClassAtom ClassRanges
+     */
+    private Token nonemptyClassRanges() {
+        final int startIn  = position;
+        final int startOut = sb.length();
+        final Token token  = new Token(Token.Type.NON_EMPTY_CLASSRANGES);
+        Token child;
+
+        child = classAtom();
+        if (child != null) {
+            token.add(child);
+
+            if (ch0 == '-') {
+                commit(token, 1);
+
+                final Token child1 = classAtom();
+                final Token child2 = classRanges();
+                if (child1 != null && child2 != null) {
+                    token.add(child1);
+                    token.add(child2);
+
+                    return token;
+                }
+            }
+
+            child = nonemptyClassRangesNoDash();
+            if (child != null) {
+                token.add(child);
+                return token;
+            }
+
+            return token;
+        }
+
+        restart(startIn, startOut);
+        return null;
+    }
+
+    /*
+     * NonemptyClassRangesNoDash ::
+     *      ClassAtom
+     *      ClassAtomNoDash NonemptyClassRangesNoDash
+     *      ClassAtomNoDash - ClassAtom ClassRanges
+     */
+    private Token nonemptyClassRangesNoDash() {
+        final int startIn  = position;
+        final int startOut = sb.length();
+        final Token token  = new Token(Token.Type.NON_EMPTY_CLASSRANGES_NODASH);
+        Token child;
+
+        child = classAtomNoDash();
+        if (child != null) {
+            token.add(child);
+
+            // need to check dash first, as for e.g. [a-b|c-d] will otherwise parse - as an atom
+            if (ch0 == '-') {
+               commit(token, 1);
+
+               final Token child1 = classAtom();
+               final Token child2 = classRanges();
+               if (child1 != null && child2 != null) {
+                   token.add(child1);
+                   return token.add(child2);
+               }
+               //fallthru
+           }
+
+            child = nonemptyClassRangesNoDash();
+            if (child != null) {
+                token.add(child);
+            }
+            return token; // still a class atom
+        }
+
+        child = classAtom();
+        if (child != null) {
+            return token.add(child);
+        }
+
+        restart(startIn, startOut);
+        return null;
+    }
+
+    /*
+     * ClassAtom : - ClassAtomNoDash
+     */
+    private Token classAtom() {
+        final Token token = new Token(Token.Type.CLASSATOM);
+
+        if (ch0 == '-') {
+            return commit(token, 1);
+        }
+
+        final Token child = classAtomNoDash();
+        if (child != null) {
+            return token.add(child);
+        }
+
+        return null;
+    }
+
+    /*
+     * ClassAtomNoDash ::
+     *      SourceCharacter but not one of \ or ] or -
+     *      \ ClassEscape
+     */
+    private Token classAtomNoDash() {
+        final int startIn  = position;
+        final int startOut = sb.length();
+        final Token token  = new Token(Token.Type.CLASSATOM_NODASH);
+
+        switch (ch0) {
+        case ']':
+        case '-':
+        case '\0':
+            return null;
+
+        case '[':
+            // unescaped left square bracket - add escape
+            return commit(token.add("\\"), 1);
+
+        case '\\':
+            commit(token, 1);
+            final Token child = classEscape();
+            if (child != null) {
+                return token.add(child);
+            }
+
+            restart(startIn, startOut);
+            return null;
+
+        default:
+            return commit(token, 1);
+        }
+    }
+
+    /*
+     * ClassEscape ::
+     *      DecimalEscape
+     *      b
+     *      CharacterEscape
+     *      CharacterClassEscape
+     */
+    private Token classEscape() {
+        final Token token = new Token(Token.Type.CLASS_ESCAPE);
+        Token child;
+
+        child = decimalEscape();
+        if (child != null) {
+            return token.add(child);
+        }
+
+        if (ch0 == 'b') {
+            return commit(token, 1);
+        }
+
+        child = characterEscape();
+        if (child != null) {
+            return token.add(child);
+        }
+
+        child = characterClassEscape();
+        if (child != null) {
+            return token.add(child);
+        }
+
+        return null;
+    }
+
+    /*
+     * DecimalDigits
+     */
+    private Token decimalDigits() {
+        if (!isDecimalDigit(ch0)) {
+            return null;
+        }
+
+        final Token token = new Token(Token.Type.DECIMALDIGITS);
+        while (isDecimalDigit(ch0)) {
+            commit(token, 1);
+        }
+
+        return token;
+    }
+
+    private static boolean isDecimalDigit(final char ch) {
+        return ch >= '0' && ch <= '9';
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/parser/Scanner.java b/nashorn/src/jdk/nashorn/internal/parser/Scanner.java
new file mode 100644
index 00000000000..444bc4d3923
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/parser/Scanner.java
@@ -0,0 +1,193 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.parser;
+
+/**
+ * Utility for scanning thru a char array.
+ *
+ */
+public class Scanner {
+    /** Characters to scan. */
+    protected final char[] content;
+
+    /** Position in content. */
+    protected int position;
+
+    /** Scan limit. */
+    protected final int limit;
+
+    /** Current line number. */
+    protected int line;
+
+    /** Current character in stream */
+    protected char ch0;
+    /** 1 character lookahead */
+    protected char ch1;
+    /** 2 character lookahead */
+    protected char ch2;
+    /** 3 character lookahead */
+    protected char ch3;
+
+    /**
+     * Constructor
+     *
+     * @param content content to scan
+     * @param line    start line number
+     * @param start   position index in content where to start
+     * @param length  length of input
+     */
+    public Scanner(final char[] content, final int line, final int start, final int length) {
+        this.content  = content;
+        this.position = start;
+        this.limit    = start + length;
+        this.line     = line;
+
+        reset(position);
+    }
+
+    /**
+     * Constructor
+     *
+     * Scan content from beginning to end. Content given as a string
+     *
+     * @param content content to scan
+     */
+    public Scanner(final String content) {
+        this(content.toCharArray(), 0, 0, content.length());
+    }
+
+    /**
+     * Copy constructor
+     *
+     * @param scanner  scanner
+     * @param state    state, the state is a tuple {position, limit, line} only visible internally
+     */
+    Scanner(final Scanner scanner, final State state) {
+        content  = scanner.content;
+        position = state.position;
+        limit    = state.limit;
+        line     = state.line;
+
+        reset(position);
+   }
+
+    /**
+     * Information needed to restore previous state.
+     */
+    static class State {
+        /** Position in content. */
+        public final int position;
+
+        /** Scan limit. */
+        public int limit;
+
+        /** Current line number. */
+        public final int line;
+
+        State(final int position, final int limit, final int line) {
+            this.position = position;
+            this.limit    = limit;
+            this.line     = line;
+        }
+
+        /**
+         * Change the limit for a new scanner.
+         * @param limit New limit.
+         */
+        void setLimit(final int limit) {
+            this.limit = limit;
+        }
+
+        boolean isEmpty() {
+            return position == limit;
+        }
+    }
+
+    /**
+     * Save the state of the scan.
+     * @return Captured state.
+     */
+    State saveState() {
+        return new State(position, limit, line);
+    }
+
+    /**
+     * Restore the state of the scan.
+     * @param state Captured state.
+     */
+    void restoreState(final State state) {
+        position = state.position;
+        line     = state.line;
+
+        reset(position);
+    }
+
+    /**
+     * Returns true of scanner is at end of input
+     * @return true if no more input
+     */
+    protected final boolean atEOF() {
+        return position == limit;
+    }
+
+    /**
+     * Get the ith character from the content.
+     * @param i Index of character.
+     * @return ith character or '\0' if beyond limit.
+     */
+    protected final char charAt(final int i) {
+        // Get a character from the content, '\0' if beyond the end of file.
+        return i < limit ? content[i] : '\0';
+    }
+
+    /**
+     * Reset to a character position.
+     * @param i Position in content.
+     */
+    protected final void reset(final int i) {
+        ch0 = charAt(i);
+        ch1 = charAt(i + 1);
+        ch2 = charAt(i + 2);
+        ch3 = charAt(i + 3);
+        position = i < limit? i : limit;
+    }
+
+    /**
+     * Skip ahead a number of characters.
+     * @param n Number of characters to skip.
+     */
+    protected final void skip(final int n) {
+        if (n == 1 && !atEOF()) {
+            ch0 = ch1;
+            ch1 = ch2;
+            ch2 = ch3;
+            ch3 = charAt(position + 4);
+            position++;
+        } else if (n != 0) {
+            reset(position + n);
+        }
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/parser/Token.java b/nashorn/src/jdk/nashorn/internal/parser/Token.java
new file mode 100644
index 00000000000..484ce99ea48
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/parser/Token.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.parser;
+
+import static jdk.nashorn.internal.parser.TokenKind.LITERAL;
+
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * Basic parse/lex unit.
+ *
+ */
+public class Token {
+
+    private Token() {
+    }
+
+    /**
+     * Create a compact form of token information.
+     * @param type     Type of token.
+     * @param position Start position of the token in the source.
+     * @param length   Length of the token.
+     * @return Token descriptor.
+     */
+    public static long toDesc(final TokenType type, final int position, final int length) {
+        return (long)position << 32 |
+               (long)length   << 8  |
+               type.ordinal();
+    }
+
+    /**
+     * Extract token position from a token descriptor.
+     * @param token Token descriptor.
+     * @return Start position of the token in the source.
+     */
+    public static int descPosition(final long token) {
+        return (int)(token >>> 32);
+    }
+
+    /**
+     * Extract token length from a token descriptor.
+     * @param token Token descriptor.
+     * @return Length of the token.
+     */
+    public static int descLength(final long token) {
+        return (int)token >>> 8;
+    }
+
+    /**
+     * Extract token type from a token descriptor.
+     * @param token Token descriptor.
+     * @return Type of token.
+     */
+    public static TokenType descType(final long token) {
+        return TokenType.getValues()[(int)token & 0xff];
+    }
+
+    /**
+     * Change the token to use a new type.
+     *
+     * @param token   The original token.
+     * @param newType The new token type.
+     * @return The recast token.
+     */
+    public static long recast(final long token, final TokenType newType) {
+        return token & ~0xFFL | newType.ordinal();
+    }
+
+    /**
+     * Return a string representation of a token.
+     * @param source  Token source.
+     * @param token   Token descriptor.
+     * @param verbose True to include details.
+     * @return String representation.
+     */
+    public static String toString(final Source source, final long token, final boolean verbose) {
+        final TokenType type = Token.descType(token);
+        String result;
+
+        if (source != null && type.getKind() == LITERAL) {
+            result = source.getString(token);
+        } else {
+            result = type.getNameOrType();
+        }
+
+        if (verbose) {
+            final int position = Token.descPosition(token);
+            final int length = Token.descLength(token);
+            result += " (" + position + ", " + length + ")";
+        }
+
+        return result;
+    }
+
+    /**
+     * String conversion of token
+     *
+     * @param source the source
+     * @param token  the token
+     *
+     * @return token as string
+     */
+    public static String toString(final Source source, final long token) {
+        return Token.toString(source, token, false);
+    }
+
+    /**
+     * String conversion of token - version without source given
+     *
+     * @param token  the token
+     *
+     * @return token as string
+     */
+    public static String toString(final long token) {
+        return Token.toString(null, token, false);
+    }
+
+    /**
+     * Static hash code computation function token
+     *
+     * @param token a token
+     *
+     * @return hash code for token
+     */
+    public static int hashCode(final long token) {
+        return (int)(token ^ token >>> 32);
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/parser/TokenKind.java b/nashorn/src/jdk/nashorn/internal/parser/TokenKind.java
new file mode 100644
index 00000000000..893bae9ddff
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/parser/TokenKind.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.parser;
+
+/**
+ * Classification of token types.
+ */
+public enum TokenKind {
+    /** Error, EOF, EOL...*/
+    SPECIAL,
+    /** Unary operators. */
+    UNARY,
+    /** Binary operators. */
+    BINARY,
+    /** [] () {} */
+    BRACKET,
+    /** String recognized as a keyword. */
+    KEYWORD,
+    /** Literal constant. */
+    LITERAL,
+    /** IR only token. */
+    IR,
+    /** Token reserved for future usage. */
+    FUTURE,
+    /** Token reserved for future in strict mode. */
+    FUTURESTRICT
+}
diff --git a/nashorn/src/jdk/nashorn/internal/parser/TokenLookup.java b/nashorn/src/jdk/nashorn/internal/parser/TokenLookup.java
new file mode 100644
index 00000000000..e53986ed2f6
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/parser/TokenLookup.java
@@ -0,0 +1,222 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.parser;
+
+import static jdk.nashorn.internal.parser.TokenKind.SPECIAL;
+import static jdk.nashorn.internal.parser.TokenType.IDENT;
+
+/**
+ * Fast lookup of operators and keywords.
+ *
+ */
+public class TokenLookup {
+    /**
+     * Lookup table for tokens.
+     */
+    private static final TokenType[] table;
+
+    /**
+     * Table base character.
+     */
+    private static final int tableBase = ' ';
+
+    /**
+     * Table base character.
+     */
+    private static final int tableLimit = '~';
+
+    /**
+     * Table size.
+     */
+    private static final int tableLength = tableLimit - tableBase + 1;
+
+    static {
+        // Construct the table.
+        table = new TokenType[tableLength];
+
+        // For each token type.
+        for (final TokenType tokenType : TokenType.getValues()) {
+            // Get the name.
+            final String name = tokenType.getName();
+
+            // Filter tokens.
+            if (name == null) {
+                continue;
+            }
+
+            // Ignore null and special.
+            if (tokenType.getKind() != SPECIAL) {
+                // Get the first character of the name.
+                final char first = name.charAt(0);
+                // Translate that character into a table index.
+                final int index = first - tableBase;
+                assert index < tableLength : "Token name does not fit lookup table";
+
+                // Get the length of the token so that the longest come first.
+                final int length = tokenType.getLength();
+                // Prepare for table insert.
+                TokenType prev = null;
+                TokenType next = table[index];
+
+                // Find the right spot in the table.
+                while(next != null && next.getLength() > length) {
+                    prev = next;
+                    next = next.getNext();
+                }
+
+                // Insert in table.
+                tokenType.setNext(next);
+
+                if (prev == null) {
+                    table[index] = tokenType;
+                } else {
+                    prev.setNext(tokenType);
+                }
+            }
+        }
+    }
+
+    private TokenLookup() {
+    }
+
+    /**
+     * Lookup keyword.
+     *
+     * @param content parse content char array
+     * @param position index of position to start looking
+     * @param length   max length to scan
+     *
+     * @return token type for keyword
+     */
+    public static TokenType lookupKeyword(final char[] content, final int position, final int length) {
+        assert table != null : "Token lookup table is not initialized";
+
+        // First character of keyword.
+        final char first = content[position];
+
+        // Must be lower case character.
+        if ('a' <= first && first <= 'z') {
+            // Convert to table index.
+            final int index = first - tableBase;
+            // Get first bucket entry.
+            TokenType tokenType = table[index];
+
+            // Search bucket list.
+            while (tokenType != null) {
+                final int tokenLength = tokenType.getLength();
+
+                // if we have a length match maybe a keyword.
+                if (tokenLength == length) {
+                    // Do an exact compare of string.
+                    final String name = tokenType.getName();
+                    int i;
+                    for (i = 0; i < length; i++) {
+                        if (content[position + i] != name.charAt(i)) {
+                            break;
+                        }
+                    }
+
+                    if (i == length) {
+                        // Found a match.
+                        return tokenType;
+                    }
+                } else if (tokenLength < length) {
+                    // Rest of tokens are shorter.
+                    break;
+                }
+
+                // Try next token.
+                tokenType = tokenType.getNext();
+            }
+        }
+
+        // Not found.
+        return IDENT;
+    }
+
+
+    /**
+     * Lookup operator.
+     *
+     * @param ch0 0th char in stream
+     * @param ch1 1st char in stream
+     * @param ch2 2nd char in stream
+     * @param ch3 3rd char in stream
+     *
+     * @return the token type for the operator
+     */
+    public static TokenType lookupOperator(final char ch0, final char ch1, final char ch2, final char ch3) {
+        assert table != null : "Token lookup table is not initialized";
+
+        // Ignore keyword entries.
+        if (tableBase < ch0 && ch0 <= tableLimit && !('a' <= ch0 && ch0 <= 'z')) {
+            // Convert to index.
+            final int index = ch0 - tableBase;
+            // Get first bucket entry.
+            TokenType tokenType = table[index];
+
+            // Search bucket list.
+            while (tokenType != null) {
+                final String name = tokenType.getName();
+
+                switch (name.length()) {
+                case 1:
+                    // One character entry.
+                    return tokenType;
+                case 2:
+                    // Two character entry.
+                    if (name.charAt(1) == ch1) {
+                        return tokenType;
+                    }
+                    break;
+                case 3:
+                    // Three character entry.
+                    if (name.charAt(1) == ch1 &&
+                        name.charAt(2) == ch2) {
+                        return tokenType;
+                    }
+                    break;
+                case 4:
+                    // Four character entry.
+                    if (name.charAt(1) == ch1 &&
+                        name.charAt(2) == ch2 &&
+                        name.charAt(3) == ch3) {
+                        return tokenType;
+                    }
+                    break;
+                default:
+                    break;
+                }
+
+                // Try next token.
+                tokenType = tokenType.getNext();
+            }
+        }
+
+        // Not found.
+        return null;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/parser/TokenStream.java b/nashorn/src/jdk/nashorn/internal/parser/TokenStream.java
new file mode 100644
index 00000000000..e229579bb65
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/parser/TokenStream.java
@@ -0,0 +1,212 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.parser;
+
+/**
+ *
+ */
+
+/**
+ * Handles streaming of tokens between lexer and parser.
+ *
+ */
+public class TokenStream {
+    /** Buffer growth factor. */
+    private static final int growth = 256;
+
+    /** Token buffer. */
+    private long[] buffer;
+
+    /** Token count. */
+    private int count;
+
+    /** Cursor to write position in buffer */
+    private int in;
+
+    /** Cursor to read position in buffer */
+    private int out;
+
+    /** Base index in buffer */
+    private int base;
+
+    /**
+     * Constructor.
+     */
+    public TokenStream() {
+        buffer = new long[growth];
+        count = 0;
+        in = 0;
+        out = 0;
+        base = 0;
+    }
+
+    /**
+     * Get the next position in the buffer.
+     * @param position Current position in buffer.
+     * @return Next position in buffer.
+     */
+    private int next(final int position) {
+        // Next position.
+        int next = position + 1;
+
+        // If exceeds buffer length.
+        if (next >= buffer.length) {
+            // Wrap around.
+            next = 0;
+        }
+
+        return next;
+    }
+
+     /**
+     * Get the index position in the buffer.
+     * @param k Seek position.
+     * @return Position in buffer.
+     */
+    private int index(final int k) {
+        // Bias k.
+        int index = k - (base - out);
+
+        // If wrap around.
+        if (index >= buffer.length) {
+            index -= buffer.length;
+        }
+
+        return index;
+    }
+
+    /**
+     * Test to see if stream is empty.
+     * @return True if stream is empty.
+     */
+    public boolean isEmpty() {
+        return count == 0;
+    }
+
+    /**
+     * Test to see if stream is full.
+     * @return True if stream is full.
+     */
+    public boolean isFull() {
+        return count == buffer.length;
+    }
+
+    /**
+     * Get the number of tokens in the buffer.
+     * @return Number of tokens.
+     */
+    public int count() {
+        return count;
+    }
+
+    /**
+     * Get the index of the first token in the stream.
+     * @return Index of first buffered token in the stream.
+     */
+    public int first() {
+        return base;
+    }
+
+    /**
+     * Get the index of the last token in the stream.
+     * @return Index of last buffered token in the stream.
+     */
+    public int last() {
+        return base + count - 1;
+    }
+
+    /**
+     * Remove the last token in the stream.
+     */
+    public void removeLast() {
+        if (count != 0) {
+            count--;
+            in--;
+
+            if (in < 0) {
+                in = buffer.length - 1;
+            }
+        }
+    }
+
+    /**
+     * Put a token descriptor to the stream.
+     * @param token Token descriptor to add.
+     */
+    public void put(final long token) {
+        if (count == buffer.length) {
+            grow();
+        }
+
+        buffer[in] = token;
+        count++;
+        in = next(in);
+    }
+
+    /**
+     * Get the kth token descriptor from the stream.
+     * @param k index
+     * @return Token descriptor.
+     */
+    public long get(final int k) {
+        return buffer[index(k)];
+    }
+
+    /**
+     * Advances the base of the stream.
+     * @param k Position of token to be the new base.
+     */
+    public void commit(final int k) {
+        // Advance out.
+        out = index(k);
+        // Adjust count.
+        count -= k - base;
+        // Set base.
+        base = k;
+    }
+
+    /**
+     * Grow the buffer to accommodate more token descriptors.
+     */
+    public void grow() {
+        // Allocate new buffer.
+        final long[] newBuffer = new long[buffer.length + growth];
+
+        // If single chunk.
+        if (in > out) {
+            System.arraycopy(buffer, out, newBuffer, 0, count);
+        } else {
+            final int portion = buffer.length - out;
+            System.arraycopy(buffer, out, newBuffer, 0, portion);
+            System.arraycopy(buffer, 0, newBuffer, portion, count - portion);
+        }
+
+        // Update buffer and indices.
+        out = 0;
+        in = count;
+        buffer = newBuffer;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/parser/TokenType.java b/nashorn/src/jdk/nashorn/internal/parser/TokenType.java
new file mode 100644
index 00000000000..1e564abc567
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/parser/TokenType.java
@@ -0,0 +1,284 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.parser;
+
+import static jdk.nashorn.internal.parser.TokenKind.BINARY;
+import static jdk.nashorn.internal.parser.TokenKind.BRACKET;
+import static jdk.nashorn.internal.parser.TokenKind.FUTURE;
+import static jdk.nashorn.internal.parser.TokenKind.FUTURESTRICT;
+import static jdk.nashorn.internal.parser.TokenKind.IR;
+import static jdk.nashorn.internal.parser.TokenKind.KEYWORD;
+import static jdk.nashorn.internal.parser.TokenKind.LITERAL;
+import static jdk.nashorn.internal.parser.TokenKind.SPECIAL;
+import static jdk.nashorn.internal.parser.TokenKind.UNARY;
+
+/**
+ * Description of all the JavaScript tokens.
+ */
+@SuppressWarnings("javadoc")
+public enum TokenType {
+    ERROR          (SPECIAL,  null),
+    EOF            (SPECIAL,  null),
+    EOL            (SPECIAL,  null),
+
+    NOT            (UNARY,   "!",    14, false),
+    NE             (BINARY,  "!=",    9, true),
+    NE_STRICT      (BINARY,  "!==",   9, true),
+    MOD            (BINARY,  "%",    13, true),
+    ASSIGN_MOD     (BINARY,  "%=",    2, false),
+    BIT_AND        (BINARY,  "&",     8, true),
+    AND            (BINARY,  "&&",    5, true),
+    ASSIGN_BIT_AND (BINARY,  "&=",    2, false),
+    LPAREN         (BRACKET, "(",    16, true),
+    RPAREN         (BRACKET, ")",     0, true),
+    MUL            (BINARY,  "*",    13, true),
+    ASSIGN_MUL     (BINARY,  "*=",    2, false),
+    ADD            (BINARY,  "+",    12, true),
+    INCPREFIX      (UNARY,   "++",   15, true),
+    ASSIGN_ADD     (BINARY,  "+=",    2, false),
+    COMMARIGHT     (BINARY,  ",",     1, true),
+    SUB            (BINARY,  "-",    12, true),
+    DECPREFIX      (UNARY,   "--",   15, true),
+    ASSIGN_SUB     (BINARY,  "-=",    2, false),
+    PERIOD         (BRACKET, ".",    17, true),
+    DIV            (BINARY,  "/",    13, true),
+    ASSIGN_DIV     (BINARY,  "/=",    2, false),
+    COLON          (BINARY,  ":"),
+    SEMICOLON      (BINARY,  ";"),
+    LT             (BINARY,  "<",    10, true),
+    SHL            (BINARY,  "<<",   11, true),
+    ASSIGN_SHL     (BINARY,  "<<=",   2, false),
+    LE             (BINARY,  "<=",   10, true),
+    ASSIGN         (BINARY,  "=",     2, false),
+    EQ             (BINARY,  "==",    9, true),
+    EQ_STRICT      (BINARY,  "===",   9, true),
+    BIND           (BINARY,  "=>",    9, true),
+    GT             (BINARY,  ">",    10, true),
+    GE             (BINARY,  ">=",   10, true),
+    SAR            (BINARY,  ">>",   11, true),
+    ASSIGN_SAR     (BINARY,  ">>=",   2, false),
+    SHR            (BINARY,  ">>>",  11, true),
+    ASSIGN_SHR     (BINARY,  ">>>=",  2, false),
+    TERNARY        (BINARY,  "?",     3, false),
+    LBRACKET       (BRACKET, "[",    17, true),
+    RBRACKET       (BRACKET, "]",     0, true),
+    BIT_XOR        (BINARY,  "^",     7, true),
+    ASSIGN_BIT_XOR (BINARY,  "^=",    2, false),
+    LBRACE         (BRACKET,  "{"),
+    BIT_OR         (BINARY,  "|",     6, true),
+    ASSIGN_BIT_OR  (BINARY,  "|=",    2, false),
+    OR             (BINARY,  "||",    4, true),
+    RBRACE         (BRACKET, "}"),
+    BIT_NOT        (BINARY,  "~",    14, false),
+
+    // ECMA 7.6.1.1 Keywords, 7.6.1.2 Future Reserved Words.
+    // All other Java keywords are commented out.
+
+//  ABSTRACT       (FUTURE,   "abstract"),
+//  BOOLEAN        (FUTURE,   "boolean"),
+    BREAK          (KEYWORD,  "break"),
+//  BYTE           (FUTURE,   "byte"),
+    CASE           (KEYWORD,  "case"),
+    CATCH          (KEYWORD,  "catch"),
+//  CHAR           (FUTURE,   "char"),
+    CLASS          (FUTURE,   "class"),
+    CONST          (FUTURE,  "const"),
+    CONTINUE       (KEYWORD,  "continue"),
+    DEBUGGER       (KEYWORD,  "debugger"),
+    DEFAULT        (KEYWORD,  "default"),
+    DELETE         (UNARY,    "delete",     14, false),
+    DO             (KEYWORD,  "do"),
+//  DOUBLE         (FUTURE,   "double"),
+//  EACH           (KEYWORD,  "each"),  // Contextual.
+    ELSE           (KEYWORD,  "else"),
+    ENUM           (FUTURE,   "enum"),
+    EXPORT         (FUTURE,   "export"),
+    EXTENDS        (FUTURE,   "extends"),
+    FALSE          (LITERAL,  "false"),
+//  FINAL          (FUTURE,   "final"),
+    FINALLY        (KEYWORD,  "finally"),
+//  FLOAT          (FUTURE,   "float"),
+    FOR            (KEYWORD,  "for"),
+    FUNCTION       (KEYWORD,  "function"),
+//  GET            (KEYWORD,  "get"), // Contextual.
+//  GOTO           (FUTURE,   "goto"),
+    IF             (KEYWORD,   "if"),
+    IMPLEMENTS     (FUTURESTRICT,   "implements"),
+    IMPORT         (FUTURE,   "import"),
+    IN             (BINARY,   "in",         10, true),
+    INSTANCEOF     (BINARY,   "instanceof", 10, true),
+//  INT            (FUTURE,   "int"),
+    INTERFACE      (FUTURESTRICT,   "interface"),
+    LET            (FUTURESTRICT,   "let"),
+//  LONG           (FUTURE,   "long"),
+//  NATIVE         (FUTURE,   "native"),
+    NEW            (UNARY,    "new",        17, false),
+    NULL           (LITERAL,  "null"),
+    PACKAGE        (FUTURESTRICT,   "package"),
+    PRIVATE        (FUTURESTRICT,   "private"),
+    PROTECTED      (FUTURESTRICT,   "protected"),
+    PUBLIC         (FUTURESTRICT,   "public"),
+    RETURN         (KEYWORD,  "return"),
+//  SET            (KEYWORD,  "set"), // Contextual.
+//  SHORT          (FUTURE,   "short"),
+    STATIC         (FUTURESTRICT,   "static"),
+    SUPER          (FUTURE,   "super"),
+    SWITCH         (KEYWORD,  "switch"),
+//  SYNCHRONIZED   (FUTURE,   "synchronized"),
+    THIS           (KEYWORD,  "this"),
+    THROW          (KEYWORD,  "throw"),
+//  THROWS         (FUTURE,   "throws"),
+//  TRANSIENT      (FUTURE,   "transient"),
+    TRUE           (LITERAL,  "true"),
+    TRY            (KEYWORD,  "try"),
+    TYPEOF         (UNARY,    "typeof",     14, false),
+    VAR            (KEYWORD,  "var"),
+    VOID           (UNARY,    "void",       14, false),
+//  VOLATILE       (FUTURE,   "volatile"),
+    WHILE          (KEYWORD,  "while"),
+    WITH           (KEYWORD,  "with"),
+    YIELD          (FUTURESTRICT,  "yield"),
+
+    DECIMAL        (LITERAL,  null),
+    OCTAL          (LITERAL,  null),
+    HEXADECIMAL    (LITERAL,  null),
+    FLOATING       (LITERAL,  null),
+    STRING         (LITERAL,  null),
+    ESCSTRING      (LITERAL,  null),
+    IDENT          (LITERAL,  null),
+    REGEX          (LITERAL,  null),
+    XML            (LITERAL,  null),
+
+    COMMALEFT      (IR,       null),
+    CONVERT        (IR,       null),
+    DISCARD        (IR,       null),
+    DECPOSTFIX     (IR,       null),
+    INCPOSTFIX     (IR,       null);
+
+    /** Next token kind in token lookup table. */
+    private TokenType next;
+
+    /** Classification of token. */
+    private final TokenKind kind;
+
+    /** Printable name of token. */
+    private final String name;
+
+    /** Operator precedence. */
+    private final int precedence;
+
+    /** Left associativity */
+    private final boolean isLeftAssociative;
+
+    /** Cache values to avoid cloning. */
+    private static final TokenType[] values;
+
+    TokenType(final TokenKind kind, final String name) {
+        next              = null;
+        this.kind         = kind;
+        this.name         = name;
+        precedence        = 0;
+        isLeftAssociative = false;
+    }
+
+    TokenType(final TokenKind kind, final String name, final int precedence, final boolean isLeftAssociative) {
+        next                   = null;
+        this.kind              = kind;
+        this.name              = name;
+        this.precedence        = precedence;
+        this.isLeftAssociative = isLeftAssociative;
+    }
+
+    /**
+     * Determines if the token has greater precedence than other.
+     * @param other  Compare token.
+     * @param isLeft Is to the left of the other.
+     * @return True if greater precedence.
+     */
+    public boolean needsParens(final TokenType other, final boolean isLeft) {
+        return other.precedence != 0 &&
+               (precedence > other.precedence ||
+               precedence == other.precedence && isLeftAssociative && !isLeft);
+    }
+
+    /**
+     * Determines if the type is a valid operator.
+     * @param noIn TRUE if IN operator should be ignored.
+     * @return TRUE if valid operator.
+     */
+    public boolean isOperator(final boolean noIn) {
+        return kind == BINARY && (!noIn || this != IN) && precedence != 0;
+    }
+
+    /**
+     * Accessors.
+     */
+    public int getLength() {
+        assert name != null : "Token name not set";
+        return name.length();
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getNameOrType() {
+        return name == null ? super.name().toLowerCase() : name;
+    }
+
+    public TokenType getNext() {
+        return next;
+    }
+
+    public void setNext(final TokenType next) {
+        this.next = next;
+    }
+
+    public TokenKind getKind() {
+        return kind;
+    }
+
+    public int getPrecedence() {
+        return precedence;
+    }
+
+    public boolean isLeftAssociative() {
+        return isLeftAssociative;
+    }
+
+    boolean startsWith(final char c) {
+        return name != null && name.length() > 0 && name.charAt(0) == c;
+    }
+
+    public static TokenType[] getValues() {
+       return values;
+    }
+
+    static {
+        // Avoid cloning of enumeration.
+        values = TokenType.values();
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/AccessorProperty.java b/nashorn/src/jdk/nashorn/internal/runtime/AccessorProperty.java
new file mode 100644
index 00000000000..0ec4668bd1a
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/AccessorProperty.java
@@ -0,0 +1,353 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import static jdk.nashorn.internal.codegen.objects.ObjectClassGenerator.ACCESSOR_TYPES;
+import static jdk.nashorn.internal.codegen.objects.ObjectClassGenerator.DEBUG_FIELDS;
+import static jdk.nashorn.internal.codegen.objects.ObjectClassGenerator.LOG;
+import static jdk.nashorn.internal.codegen.objects.ObjectClassGenerator.OBJECT_FIELDS_ONLY;
+import static jdk.nashorn.internal.codegen.objects.ObjectClassGenerator.createGetter;
+import static jdk.nashorn.internal.codegen.objects.ObjectClassGenerator.createGuardBoxedPrimitiveSetter;
+import static jdk.nashorn.internal.codegen.objects.ObjectClassGenerator.createSetter;
+import static jdk.nashorn.internal.codegen.objects.ObjectClassGenerator.getAccessorType;
+import static jdk.nashorn.internal.codegen.objects.ObjectClassGenerator.getAccessorTypeIndex;
+import static jdk.nashorn.internal.codegen.objects.ObjectClassGenerator.getNumberOfAccessorTypes;
+import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+import static jdk.nashorn.internal.runtime.linker.MethodHandleFactory.stripName;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.runtime.linker.Lookup;
+import jdk.nashorn.internal.runtime.linker.MethodHandleFactory;
+
+/**
+ * An AccessorProperty is the most generic property type. An AccessorProperty is
+ * represented as fields in a ScriptObject class.
+ *
+ * @see SpillProperty
+ */
+public class AccessorProperty extends Property {
+    private static final MethodHandle REPLACE_MAP = findOwnMH("replaceMap", Object.class, Object.class, PropertyMap.class, String.class, Class.class, Class.class);
+
+    private static final int NOOF_TYPES = getNumberOfAccessorTypes();
+
+    /** Property getter cache */
+    private MethodHandle[] getters = new MethodHandle[NOOF_TYPES];
+
+    private static final MethodType[] ACCESSOR_GETTER_TYPES = new MethodType[NOOF_TYPES];
+    private static final MethodType[] ACCESSOR_SETTER_TYPES = new MethodType[NOOF_TYPES];
+
+    /** Seed getter for the primitive version of this field (in -Dnashorn.fields.dual=true mode) */
+    private MethodHandle primitiveGetter;
+
+    /** Seed setter for the primitive version of this field (in -Dnashorn.fields.dual=true mode) */
+    private MethodHandle primitiveSetter;
+
+    /** Seed getter for the Object version of this field */
+    private MethodHandle objectGetter;
+
+    /** Seed setter for the Object version of this field */
+    private MethodHandle objectSetter;
+
+    /**
+     * Current type of this object, in object only mode, this is an Object.class. In dual-fields mode
+     * null means undefined, and primitive types are allowed. The reason a special type is used for
+     * undefined, is that are no bits left to represent it in primitive types
+     */
+    private Class<?> currentType;
+
+    static {
+        for (int i = 0; i < NOOF_TYPES; i++) {
+            final Type type = ACCESSOR_TYPES.get(i);
+            ACCESSOR_GETTER_TYPES[i] = MH.type(type.getTypeClass(), Object.class);
+            ACCESSOR_SETTER_TYPES[i] = MH.type(void.class, Object.class, type.getTypeClass());
+        }
+    }
+
+    /**
+     * Constructor
+     *
+     * primitiveGetter and setter are only used in dual fields mode. Setting them to null also
+     * works in dual field mode, it only means that the property never has a primitive
+     * representation
+     *
+     * @param key              property key
+     * @param flags            property flags
+     * @param objectGetter     seed getter for object field
+     * @param objectSetter     seed setter for object field
+     * @param primitiveGetter  seed getter for primitive field (in dual field mode)
+     * @param primitiveSetter  seed setter for primitive field (in dual field mode)
+     */
+    public AccessorProperty(final String key, final int flags, final MethodHandle objectGetter, final MethodHandle objectSetter, final MethodHandle primitiveGetter, final MethodHandle primitiveSetter) {
+        super(key, flags);
+
+        this.objectGetter    = objectGetter;
+        this.objectSetter    = objectSetter;
+        this.primitiveGetter = primitiveGetter;
+        this.primitiveSetter = primitiveSetter;
+
+        Class<?> initialType = null;
+
+        if (OBJECT_FIELDS_ONLY || isAlwaysObject()) {
+            initialType = Object.class;
+        } else {
+            if (!canBePrimitive()) {
+                info(key + " cannot be primitive");
+                initialType = Object.class;
+            } else {
+                info(key + " CAN be primitive");
+                if (!canBeUndefined()) {
+                    info(key + " is always defined");
+                    initialType = int.class; //double works too for less type invalidation, but this requires experimentation, e.g. var x = 17; x += 2 will turn it into double now because of lack of range analysis
+                }
+            }
+        }
+
+        // is always object means "is never initialized to undefined, and always of object type
+        setCurrentType(initialType);
+    }
+
+    /**
+     * Delegate constructor. This is used when adding properties to the Global scope, which
+     * is necessary for outermost levels in a script (the ScriptObject is represented by
+     * a JO$-prefixed ScriptObject class, but the properties need to be in the Global scope
+     * and are thus rebound with that as receiver
+     *
+     * @param property  accessor property to rebind
+     * @param delegate  delegate script object to rebind receiver to
+     */
+    public AccessorProperty(final AccessorProperty property, final ScriptObject delegate) {
+        this(property);
+
+        this.getters = new MethodHandle[NOOF_TYPES];
+
+        this.primitiveGetter = bindTo(primitiveGetter, delegate);
+        this.primitiveSetter = bindTo(primitiveSetter, delegate);
+        this.objectGetter    = bindTo(objectGetter, delegate);
+        this.objectSetter    = bindTo(objectSetter, delegate);
+
+        setCurrentType(property.getCurrentType());
+    }
+
+    /**
+     * Constructor. Similar to the constructor with both primitive getters and setters, the difference
+     * here being that only one getter and setter (setter is optional for non writable fields) is given
+     * to the constructor, and the rest are created from those. Used e.g. by Nasgen classes
+     *
+     * @param key    the property key
+     * @param flags  the property flags
+     * @param getter the property getter
+     * @param setter the property setter or null if non writable, non configurable
+     */
+    public AccessorProperty(final String key, final int flags, final MethodHandle getter, final MethodHandle setter) {
+        super(key, flags);
+
+        // we don't need to prep the setters these will never be invalidated as this is a nasgen
+        // or known type getter/setter. No invalidations will take place
+
+        final Class<?> getterType = getter.type().returnType();
+        final Class<?> setterType = setter == null ? null : setter.type().parameterType(1);
+
+        assert setterType == null || setterType == getterType;
+
+        if (getterType.isPrimitive()) {
+            for (int i = 0; i < NOOF_TYPES; i++) {
+                getters[i] = MH.asType(
+                    Lookup.filterReturnType(
+                        getter,
+                        getAccessorType(i).getTypeClass()),
+                    ACCESSOR_GETTER_TYPES[i]);
+            }
+        } else {
+            //this will work as the object setter and getter will be converted appropriately
+            objectGetter = getter;
+            objectSetter = setter;
+        }
+
+        setCurrentType(getterType);
+    }
+
+    /**
+     * Copy constructor
+     *
+     * @param property  source property
+     */
+    protected AccessorProperty(final AccessorProperty property) {
+        super(property);
+
+        this.getters         = property.getters;
+        this.primitiveGetter = property.primitiveGetter;
+        this.primitiveSetter = property.primitiveSetter;
+        this.objectGetter    = property.objectGetter;
+        this.objectSetter    = property.objectSetter;
+
+        setCurrentType(property.getCurrentType());
+    }
+
+    private static MethodHandle bindTo(final MethodHandle mh, final Object receiver) {
+        if (mh == null) {
+            return null;
+        }
+
+        return MH.dropArguments(MH.bindTo(mh, receiver), 0, Object.class);
+    }
+
+    @Override
+    protected Property copy() {
+        return new AccessorProperty(this);
+    }
+
+    @Override
+    public MethodHandle getGetter(final Class<?> type) {
+        final int i = getAccessorTypeIndex(type);
+        if (getters[i] == null) {
+            getters[i] = debug(
+                MH.asType(
+                    createGetter(
+                        currentType,
+                        type,
+                        primitiveGetter,
+                        objectGetter),
+                    ACCESSOR_GETTER_TYPES[i]),
+                currentType,
+                type,
+                "get");
+        }
+
+        return getters[i];
+    }
+
+    private Property getWiderProperty(final Class<?> type) {
+        final AccessorProperty newProperty = new AccessorProperty(this);
+        newProperty.invalidate(type);
+        return newProperty;
+    }
+
+    private PropertyMap getWiderMap(final PropertyMap oldMap, final Property newProperty) {
+        final PropertyMap newMap = oldMap.replaceProperty(this, newProperty);
+        assert oldMap.size() > 0;
+        assert newMap.size() == oldMap.size();
+        return newMap;
+    }
+
+    // the final three arguments are for debug printout purposes only
+    @SuppressWarnings("unused")
+    private static Object replaceMap(final Object sobj, final PropertyMap newMap, final String key, final Class<?> oldType, final Class<?> newType) {
+        if (DEBUG_FIELDS) {
+            final PropertyMap oldMap = ((ScriptObject)sobj).getMap();
+            info("Type change for '" + key + "' " + oldType + "=>" + newType);
+            finest("setting map " + sobj + " from " + Debug.id(oldMap) + " to " + Debug.id(newMap) + " " + oldMap + " => " + newMap);
+        }
+        ((ScriptObject)sobj).setMap(newMap);
+        return sobj;
+    }
+
+    private MethodHandle generateSetter(final Class<?> forType, final Class<?> type) {
+        MethodHandle mh = createSetter(forType, type, primitiveSetter, objectSetter);
+        mh = MH.asType(mh, ACCESSOR_SETTER_TYPES[getAccessorTypeIndex(type)]); //has to be the case for invokeexact to work in ScriptObject
+        mh = debug(mh, currentType, type, "set");
+        return mh;
+    }
+
+    @Override
+    public MethodHandle getSetter(final Class<?> type, final PropertyMap currentMap) {
+        final int i            = getAccessorTypeIndex(type);
+        final int ci           = currentType == null ? -1 : getAccessorTypeIndex(currentType);
+        final Class<?> forType = currentType == null ? type : currentType;
+
+        //if we are asking for an object setter, but are still a primitive type, we might try to box it
+
+        if (needsInvalidator(i, ci)) {
+            final Property     newProperty = getWiderProperty(type);
+            final PropertyMap  newMap      = getWiderMap(currentMap, newProperty);
+            final MethodHandle widerSetter = newProperty.getSetter(type, newMap);
+            final MethodHandle explodeTypeSetter = MH.filterArguments(widerSetter, 0, MH.insertArguments(REPLACE_MAP, 1, newMap, getKey(), currentType, type));
+            if (currentType != null && currentType.isPrimitive() && type == Object.class) {
+                //might try a box check on this to avoid widening field to object storage
+                return createGuardBoxedPrimitiveSetter(currentType, generateSetter(currentType, currentType), explodeTypeSetter);
+            }
+            return explodeTypeSetter;
+        }
+
+        return generateSetter(forType, type);
+    }
+
+    @Override
+    public boolean canChangeType() {
+        if (OBJECT_FIELDS_ONLY) {
+            return false;
+        }
+        return currentType != Object.class && (isConfigurable() || isWritable());
+    }
+
+    private boolean needsInvalidator(final int ti, final int fti) {
+        return canChangeType() && ti > fti;
+    }
+
+    private void invalidate(final Class<?> newType) {
+        getters = new MethodHandle[NOOF_TYPES];
+        setCurrentType(newType);
+    }
+
+    private static void finest(final String str) {
+        if (DEBUG_FIELDS) {
+            LOG.finest(str);
+        }
+    }
+
+    private static void info(final String str) {
+        if (DEBUG_FIELDS) {
+            LOG.info(str);
+        }
+    }
+
+    private MethodHandle debug(final MethodHandle mh, final Class<?> forType, final Class<?> type, final String tag) {
+        if (DEBUG_FIELDS) {
+           final MethodHandle mhd = MethodHandleFactory.addDebugPrintout(
+               LOG,
+               mh,
+               tag + " '" + getKey() + "' (property="+ Debug.id(this) + ", forType=" + stripName(forType) + ", type=" + stripName(type) + ')');
+           return mhd;
+        }
+        return mh;
+    }
+
+    private void setCurrentType(final Class<?> currentType) {
+        this.currentType = currentType;
+    }
+
+    @Override
+    public Class<?> getCurrentType() {
+        return currentType;
+    }
+
+    private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
+        return MH.findStatic(MethodHandles.lookup(), AccessorProperty.class, name, MH.type(rtype, types));
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/BitVector.java b/nashorn/src/jdk/nashorn/internal/runtime/BitVector.java
new file mode 100644
index 00000000000..f5c7c6f03fe
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/BitVector.java
@@ -0,0 +1,278 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import java.util.Arrays;
+
+/**
+ * Faster implementation of BitSet
+ */
+public class BitVector implements Cloneable {
+    /** Number of bits per slot. */
+    private static final int BITSPERSLOT = 64;
+
+    /** Growth quanta when resizing. */
+    private static final int SLOTSQUANTA = 4;
+
+    /** Shift for indexing. */
+    private static final int BITSHIFT = 6;
+
+    /** Mask for indexing. */
+    private static final int BITMASK = BITSPERSLOT - 1;
+
+    /** Bit area. */
+    private long[] bits;
+
+    /**
+     * Constructor.
+     */
+    public BitVector() {
+        this.bits = new long[SLOTSQUANTA];
+    }
+
+    /**
+     * Constructor
+     * @param length initial length in bits
+     */
+    public BitVector(final long length) {
+        final int need = (int)growthNeeded(length);
+        this.bits = new long[need];
+    }
+
+    /**
+     * Copy constructor
+     * @param bits a bits array from another bit vector
+     */
+    public BitVector(final long[] bits) {
+        this.bits = bits;
+    }
+
+    /**
+     * Copy another BitVector into this one
+     * @param other the source
+     */
+    public void copy(final BitVector other) {
+        bits = Arrays.copyOf(other.bits, other.bits.length);
+    }
+
+    /**
+     * Calculate the number of slots need for the specified length of bits.
+     * @param length Number of bits required.
+     * @return Number of slots needed.
+     */
+    private static long slotsNeeded(final long length) {
+        return (length + BITMASK) >> BITSHIFT;
+    }
+
+    /**
+     * Calculate the number of slots need for the specified length of bits
+     * rounded to allocation quanta.
+     * @param length Number of bits required.
+     * @return Number of slots needed rounded to allocation quanta.
+     */
+    private static long growthNeeded(final long length) {
+        return (slotsNeeded(length) + SLOTSQUANTA - 1) / SLOTSQUANTA * SLOTSQUANTA;
+    }
+
+    /**
+     * Return a slot from bits, zero if slot is beyond length.
+     * @param index Slot index.
+     * @return Slot value.
+     */
+    private long slot(final int index) {
+        return 0 <= index && index < bits.length ? bits[index] : 0L;
+    }
+
+    /**
+     * Resize the bit vector to accommodate the new length.
+     * @param length Number of bits required.
+     */
+    public void resize(final long length) {
+        final int need = (int)growthNeeded(length);
+
+        if (bits.length != need) {
+            bits = Arrays.copyOf(bits, need);
+        }
+
+        final int shift = (int)(length & BITMASK);
+        int slot = (int)(length >> BITSHIFT);
+
+        if (shift != 0) {
+            bits[slot] &= (1L << shift) - 1;
+            slot++;
+        }
+
+        for ( ; slot < bits.length; slot++) {
+            bits[slot] = 0;
+        }
+    }
+
+    /**
+     * Set a bit in the bit vector.
+     * @param bit Bit number.
+     */
+    public void set(final long bit) {
+        bits[(int)(bit >> BITSHIFT)] |= (1L << (int)(bit & BITMASK));
+    }
+
+    /**
+     * Clear a bit in the bit vector.
+     * @param bit Bit number.
+     */
+    public void clear(final long bit) {
+        bits[(int)(bit >> BITSHIFT)] &= ~(1L << (int)(bit & BITMASK));
+    }
+
+    /**
+     * Toggle a bit in the bit vector.
+     * @param bit Bit number.
+     */
+    public void toggle(final long bit) {
+        bits[(int)(bit >> BITSHIFT)] ^= (1L << (int)(bit & BITMASK));
+    }
+
+    /**
+     * Sets all bits in the vector up to the length.
+     *
+     * @param length max bit where to stop setting bits
+     */
+    public void setTo(final long length) {
+        if (0 < length) {
+            final int lastWord = (int)(length >> BITSHIFT);
+            final long lastBits = (1L << (int)(length & BITMASK)) - 1L;
+            Arrays.fill(bits, 0, lastWord, ~0L);
+
+            if (lastBits != 0L) {
+                bits[lastWord] |= lastBits;
+            }
+        }
+    }
+
+    /**
+     * Clears all bits in the vector.
+     */
+    public void clearAll() {
+        Arrays.fill(bits, 0L);
+    }
+
+    /**
+     * Test if bit is set in the bit vector.
+     * @param bit Bit number.
+     * @return true if bit in question is set
+     */
+    public boolean isSet(final long bit) {
+        return (bits[(int)(bit >> BITSHIFT)] & (1L << (int)(bit & BITMASK))) != 0;
+    }
+
+    /**
+     * Test if a bit is clear in the bit vector.
+     * @param bit Bit number.
+     * @return true if bit in question is clear
+     */
+    public boolean isClear(final long bit) {
+        return (bits[(int)(bit >> BITSHIFT)] & (1L << (int)(bit & BITMASK))) == 0;
+    }
+
+    /**
+     * Shift bits to the left by shift.
+     * @param shift  Amount of shift.
+     * @param length Length of vector after shift.
+     */
+    public void shiftLeft(final long shift, final long length) {
+        if (shift != 0) {
+            final int leftShift  = (int)(shift & BITMASK);
+            final int rightShift = BITSPERSLOT - leftShift;
+            final int slotShift  = (int)(shift >> BITSHIFT);
+            final int slotCount  = bits.length - slotShift;
+            int slot, from;
+
+            if (leftShift == 0) {
+                for (slot = 0, from = slotShift; slot < slotCount; slot++, from++) {
+                    bits[slot] = slot(from);
+                }
+            } else {
+                for (slot = 0, from = slotShift; slot < slotCount; slot++) {
+                    bits[slot] = (slot(from) >>>  leftShift) | (slot(++from) <<  rightShift);
+                }
+            }
+        }
+
+        resize(length);
+    }
+
+    /**
+     * Shift bits to the right by shift.
+     * @param shift  Amount of shift.
+     * @param length Length of vector after shift.
+     */
+    public void shiftRight(final long shift, final long length) {
+        // Make room.
+        resize(length);
+
+        if (shift != 0) {
+            final int rightShift  = (int)(shift & BITMASK);
+            final int leftShift = BITSPERSLOT - rightShift;
+            final int slotShift  = (int)(shift >> BITSHIFT);
+            int slot, from;
+
+            if (leftShift == 0) {
+                for (slot = bits.length, from = slot - slotShift; slot >= slotShift;) {
+                    slot--; from--;
+                    bits[slot] = slot(from);
+                }
+            } else {
+                for (slot = bits.length, from = slot - slotShift; slot > 0;) {
+                    slot--; from--;
+                    bits[slot] = (slot(from - 1) >>>  leftShift) | (slot(from) <<  rightShift);
+                }
+            }
+        }
+
+        // Mask out surplus.
+        resize(length);
+    }
+
+    /**
+     * Set a bit range.
+     * @param fromIndex  from index (inclusive)
+     * @param toIndex    to index (exclusive)
+     */
+    public void setRange(final long fromIndex, final long toIndex) {
+        if (fromIndex < toIndex) {
+            final int firstWord = (int)(fromIndex >> BITSHIFT);
+            final int lastWord = (int)(toIndex - 1 >> BITSHIFT);
+            final long firstBits = (~0L << fromIndex);
+            final long lastBits = (~0L >>> -toIndex);
+            if (firstWord == lastWord) {
+                bits[firstWord] |= firstBits & lastBits;
+            } else {
+                bits[firstWord] |= firstBits;
+                Arrays.fill(bits, firstWord + 1, lastWord, ~0L);
+                bits[lastWord] |= lastBits;
+            }
+        }
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/CodeInstaller.java b/nashorn/src/jdk/nashorn/internal/runtime/CodeInstaller.java
new file mode 100644
index 00000000000..13c5a37efdd
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/CodeInstaller.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+/**
+ * Interface for installing classes passed to the compiler.
+ * As only the code generating package (i.e. Context) knows about
+ * the ScriptLoader and it would be a security hazard otherwise
+ * the Compiler is given an installation interface for its code.
+ * <p>>
+ * The compiler still retains most of the state around code emission
+ * and management internally, so this is to avoid passing around any
+ * logic that isn't directly related to installing a class
+ *
+ */
+public interface CodeInstaller {
+    /**
+     * Install a class
+     * @param className name of the class with / separation
+      * @param bytecode  bytecode
+      * @return the installed class
+     */
+    public Class<?> install(final String className, final byte[] bytecode);
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ConsString.java b/nashorn/src/jdk/nashorn/internal/runtime/ConsString.java
new file mode 100644
index 00000000000..32e284b80d3
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ConsString.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import java.util.ArrayDeque;
+import java.util.Deque;
+
+/**
+ * This class represents a string composed of two parts which may themselves be
+ * instances of <tt>ConsString</tt> or {@link String}. Copying of characters to
+ * a proper string is delayed until it becomes necessary.
+ */
+public class ConsString implements CharSequence {
+
+    private CharSequence left, right;
+    final private int length;
+    private boolean flat = false;
+
+    /**
+     * Constructor
+     *
+     * Takes two {@link CharSequence} instances that, concatenated, forms this {@code ConsString}
+     *
+     * @param left  left char sequence
+     * @param right right char sequence
+     */
+    public ConsString(final CharSequence left, final CharSequence right) {
+        assert left instanceof String || left instanceof ConsString;
+        assert right instanceof String || right instanceof ConsString;
+        this.left = left;
+        this.right = right;
+        length = left.length() + right.length();
+    }
+
+    @Override
+    public String toString() {
+        if (!flat) {
+            flatten();
+        }
+        return (String) left;
+    }
+
+    @Override
+    public int length() {
+        return length;
+    }
+
+    @Override
+    public char charAt(final int index) {
+        if (!flat) {
+            flatten();
+        }
+        return left.charAt(index);
+    }
+
+    @Override
+    public CharSequence subSequence(final int start, final int end) {
+        if (!flat) {
+            flatten();
+        }
+        return left.subSequence(start, end);
+    }
+
+    private void flatten() {
+        // We use iterative traversal as recursion may exceed the stack size limit.
+        final char[] chars = new char[length];
+        int pos = length;
+        // Strings are most often composed by appending to the end, which causes ConsStrings
+        // to be very unbalanced, with mostly single string elements on the right and a long
+        // linear list on the left. Traversing from right to left helps to keep the stack small
+        // in this scenario.
+        final Deque<CharSequence> stack = new ArrayDeque<>();
+        stack.addFirst(left);
+        CharSequence cs = right;
+
+        do {
+            if (cs instanceof ConsString) {
+                final ConsString cons = (ConsString) cs;
+                stack.addFirst(cons.left);
+                cs = cons.right;
+            } else {
+                final String str = (String) cs;
+                pos -= str.length();
+                str.getChars(0, str.length(), chars, pos);
+                cs = stack.isEmpty() ? null : stack.pollFirst();
+            }
+        } while (cs != null);
+
+        left = new String(chars);
+        right = "";
+        flat = true;
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Context.java b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
new file mode 100644
index 00000000000..534e11a630e
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
@@ -0,0 +1,872 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import static jdk.nashorn.internal.codegen.CompilerConstants.RUN_SCRIPT;
+import static jdk.nashorn.internal.codegen.CompilerConstants.STRICT_MODE;
+import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.security.AccessController;
+import java.security.CodeSigner;
+import java.security.CodeSource;
+import java.security.PrivilegedAction;
+import java.util.Locale;
+import java.util.TimeZone;
+import jdk.internal.org.objectweb.asm.ClassReader;
+import jdk.internal.org.objectweb.asm.util.CheckClassAdapter;
+import jdk.nashorn.internal.codegen.ClassEmitter;
+import jdk.nashorn.internal.codegen.Compiler;
+import jdk.nashorn.internal.codegen.Namespace;
+import jdk.nashorn.internal.codegen.objects.ObjectClassGenerator;
+import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
+import jdk.nashorn.internal.runtime.options.KeyValueOption;
+import jdk.nashorn.internal.runtime.options.Option;
+import jdk.nashorn.internal.runtime.options.Options;
+
+/**
+ * This class manages the global state of execution. Context is immutable.
+ */
+public final class Context {
+
+    /** Is Context global debug mode enabled ? */
+    public static final boolean DEBUG = Options.getBooleanProperty("nashorn.debug");
+
+    private static final ThreadLocal<ScriptObject> currentGlobal =
+        new ThreadLocal<ScriptObject>() {
+            @Override
+            protected ScriptObject initialValue() {
+                 return null;
+            }
+        };
+
+    /**
+     * Return the current global scope
+     * @return current global scope
+     */
+    public static ScriptObject getGlobal() {
+        return currentGlobal.get();
+    }
+
+    /**
+     * Set the current global scope
+     * @param global the global scope
+     */
+    public static void setGlobal(final ScriptObject global) {
+        final SecurityManager sm = System.getSecurityManager();
+        if (sm != null) {
+            sm.checkPermission(new RuntimePermission("setNashornGlobal"));
+        }
+
+        if (global != null && !(global instanceof GlobalObject)) {
+            throw new IllegalArgumentException("global does not implement GlobalObject!");
+        }
+
+        currentGlobal.set(global);
+    }
+
+    /**
+     * Get context of the current global
+     * @return current global scope's context.
+     */
+    public static Context getContext() {
+        return Context.getGlobal().getContext();
+    }
+
+    /**
+     * Output text to this Context's error stream
+     * @param str text to write
+     */
+    public static void err(final String str) {
+        err(str, true);
+    }
+
+    /**
+     * Output text to this Context's error stream, optionally with
+     * a newline afterwards
+     *
+     * @param str  text to write
+     * @param crlf write a carriage return/new line after text
+     */
+    public static void err(final String str, final boolean crlf) {
+        try (final PrintWriter err = Context.getContext().getErr()) {
+            if (err != null) {
+                if (crlf) {
+                    err.println(str);
+                } else {
+                    err.print(str);
+                }
+            } else {
+                if (crlf) {
+                    System.err.println(str);
+                } else {
+                    System.err.println();
+                }
+            }
+        }
+    }
+
+    /** Class loader to load classes from -classpath option, if set. */
+    private final ClassLoader  classPathLoader;
+
+    /** Class loader to load classes compiled from scripts. */
+    private final ScriptLoader scriptLoader;
+
+    /** Top level namespace. */
+    private final Namespace namespace;
+
+    /** Current options. */
+    private final Options options;
+
+    /** Current error manager. */
+    private final ErrorManager errors;
+
+    /** Output writer for this context */
+    private final PrintWriter out;
+
+    /** Error writer for this context */
+    private final PrintWriter err;
+
+    /** Local for error messages */
+    private final Locale locale;
+
+    /** Empty map used for seed map for JO$ objects */
+    final PropertyMap emptyMap = PropertyMap.newEmptyMap(this);
+
+    // cache fields for "well known" options.
+    // see jdk.nashorn.internal.runtime.Resources
+
+    /** Always allow functions as statements */
+    public final boolean _anon_functions;
+
+    /** Size of the per-global Class cache size */
+    public final int     _class_cache_size;
+
+    /** Only compile script, do not run it or generate other ScriptObjects */
+    public final boolean _compile_only;
+
+    /** Accumulated callsite flags that will be used when boostrapping script callsites */
+    public final int     _callsite_flags;
+
+    /** Genereate line number table in class files */
+    public final boolean _debug_lines;
+
+    /** Package to which generated class files are added */
+    public final String  _dest_dir;
+
+    /** Display stack trace upon error, default is false */
+    public final boolean _dump_on_error;
+
+    /** Invalid lvalue expressions should be reported as early errors */
+    public final boolean _early_lvalue_error;
+
+    /** Empty statements should be preserved in the AST */
+    public final boolean _empty_statements;
+
+    /** Show full Nashorn version */
+    public final boolean _fullversion;
+
+    /** Create a new class loaded for each compilation */
+    public final boolean _loader_per_compile;
+
+    /** Package to which generated class files are added */
+    public final String  _package;
+
+    /** Only parse the source code, do not compile */
+    public final boolean _parse_only;
+
+    /** Print the AST before lowering */
+    public final boolean _print_ast;
+
+    /** Print the AST after lowering */
+    public final boolean _print_lower_ast;
+
+    /** Print resulting bytecode for script */
+    public final boolean _print_code;
+
+    /** Print function will no print newline characters */
+    public final boolean _print_no_newline;
+
+    /** Print AST in more human readable form */
+    public final boolean _print_parse;
+
+    /** Print AST in more human readable form after Lowering */
+    public final boolean _print_lower_parse;
+
+    /** print symbols and their contents for the script */
+    public final boolean _print_symbols;
+
+    /** is this context in scripting mode? */
+    public final boolean _scripting;
+
+    /** is this context in strict mode? */
+    public final boolean _strict;
+
+    /** print version info of Nashorn */
+    public final boolean _version;
+
+    /** should code verification be done of generated bytecode */
+    public final boolean _verify_code;
+
+    /** time zone for this context */
+    public final TimeZone _timezone;
+
+    private static final StructureLoader sharedLoader;
+
+    static {
+        sharedLoader = AccessController.doPrivileged(new PrivilegedAction<StructureLoader>() {
+            @Override
+            public StructureLoader run() {
+                return new StructureLoader(Context.class.getClassLoader(), null);
+            }
+        });
+    }
+
+    /**
+     * ThrowErrorManager that throws ParserException upon error conditions.
+     */
+    public static class ThrowErrorManager extends ErrorManager {
+        @Override
+        public void error(final String message) {
+            throw new ParserException(message);
+        }
+
+        @Override
+        public void error(final ParserException e) {
+            throw e;
+        }
+    }
+
+    /**
+     * Constructor
+     *
+     * @param options options from command line or Context creator
+     * @param errors  error manger
+     */
+    public Context(final Options options, final ErrorManager errors) {
+        this(options, errors, new PrintWriter(System.out, true), new PrintWriter(System.err, true));
+    }
+
+    /**
+     * Constructor
+     *
+     * @param options options from command line or Context creator
+     * @param errors  error manger
+     * @param out     output writer for this Context
+     * @param err     error writer for this Context
+     */
+    public Context(final Options options, final ErrorManager errors, final PrintWriter out, final PrintWriter err) {
+        final SecurityManager sm = System.getSecurityManager();
+        if (sm != null) {
+            sm.checkPermission(new RuntimePermission("createNashornContext"));
+        }
+
+        this.scriptLoader = (ScriptLoader)AccessController.doPrivileged(
+             new PrivilegedAction<ClassLoader>() {
+                @Override
+                public ClassLoader run() {
+                    final ClassLoader structureLoader = new StructureLoader(sharedLoader, Context.this);
+                    return new ScriptLoader(structureLoader, Context.this);
+                }
+             });
+
+        this.namespace = new Namespace();
+        this.options   = options;
+        this.errors    = errors;
+        this.locale    = Locale.getDefault();
+        this.out       = out;
+        this.err       = err;
+
+        _anon_functions     = options.getBoolean("anon.functions");
+        _class_cache_size   = options.getInteger("class.cache.size");
+        _compile_only       = options.getBoolean("compile.only");
+        _debug_lines        = options.getBoolean("debug.lines");
+        _dest_dir           = options.getString("d");
+        _dump_on_error      = options.getBoolean("doe");
+        _early_lvalue_error = options.getBoolean("early.lvalue.error");
+        _empty_statements   = options.getBoolean("empty.statements");
+        _fullversion        = options.getBoolean("fullversion");
+        _loader_per_compile = options.getBoolean("loader.per.compile");
+        _package            = options.getString("package");
+        _parse_only         = options.getBoolean("parse.only");
+        _print_ast          = options.getBoolean("print.ast");
+        _print_lower_ast    = options.getBoolean("print.lower.ast");
+        _print_code         = options.getBoolean("print.code");
+        _print_no_newline   = options.getBoolean("print.no.newline");
+        _print_parse        = options.getBoolean("print.parse");
+        _print_lower_parse  = options.getBoolean("print.lower.parse");
+        _print_symbols      = options.getBoolean("print.symbols");
+        _scripting          = options.getBoolean("scripting");
+        _strict             = options.getBoolean("strict");
+        _version            = options.getBoolean("version");
+        _verify_code        = options.getBoolean("verify.code");
+
+        int callSiteFlags = 0;
+        if (options.getBoolean("profile.callsites")) {
+            callSiteFlags |= NashornCallSiteDescriptor.CALLSITE_PROFILE;
+        }
+
+        if (options.get("trace.callsites") instanceof KeyValueOption) {
+            callSiteFlags |= NashornCallSiteDescriptor.CALLSITE_TRACE;
+            final KeyValueOption kv = (KeyValueOption)options.get("trace.callsites");
+            if (kv.hasValue("miss")) {
+                callSiteFlags |= NashornCallSiteDescriptor.CALLSITE_TRACE_MISSES;
+            }
+            if (kv.hasValue("enterexit") || (callSiteFlags & NashornCallSiteDescriptor.CALLSITE_TRACE_MISSES) == 0) {
+                callSiteFlags |= NashornCallSiteDescriptor.CALLSITE_TRACE_ENTEREXIT;
+            }
+            if (kv.hasValue("objects")) {
+                callSiteFlags |= NashornCallSiteDescriptor.CALLSITE_TRACE_VALUES;
+            }
+            if (kv.hasValue("scope")) {
+                callSiteFlags |= NashornCallSiteDescriptor.CALLSITE_TRACE_SCOPE;
+            }
+        }
+        this._callsite_flags = callSiteFlags;
+
+        final Option<?> option = options.get("timezone");
+        if (option != null) {
+            this._timezone = (TimeZone)option.getValue();
+        } else {
+            this._timezone  = TimeZone.getDefault();
+        }
+
+        // if user passed -classpath option, make a class loader with that and set it as
+        // thread context class loader so that script can access classes from that path.
+        final String classPath = options.getString("classpath");
+        if (! _compile_only && classPath != null && !classPath.isEmpty()) {
+            // make sure that caller can create a class loader.
+            if (sm != null) {
+                sm.checkPermission(new RuntimePermission("createClassLoader"));
+            }
+            this.classPathLoader = NashornLoader.createClassLoader(classPath);
+        } else {
+            this.classPathLoader = null;
+        }
+
+        // print version info if asked.
+        if (_version) {
+            getErr().println("nashorn " + Version.version());
+        }
+
+        if (_fullversion) {
+            getErr().println("nashorn full version " + Version.fullVersion());
+        }
+    }
+
+    /**
+     * Get the error manager for this context
+     * @return error manger
+     */
+    public ErrorManager getErrors() {
+        return errors;
+    }
+
+    /**
+     * Get the output stream for this context
+     * @return output print writer
+     */
+    public PrintWriter getOut() {
+        return out;
+    }
+
+    /**
+     * Get the error stream for this context
+     * @return error print writer
+     */
+    public PrintWriter getErr() {
+        return err;
+    }
+
+    /**
+     * Get the namespace for this context
+     * @return namespace
+     */
+    public Namespace getNamespace() {
+        return namespace;
+    }
+
+    /**
+     * Get the options given to this context
+     * @return options
+     */
+    public Options getOptions() {
+        return options;
+    }
+
+    /**
+     * Get the locale for this context
+     * @return locale
+     */
+    public Locale getLocale() {
+        return locale;
+    }
+
+    /**
+     * Get the time zone for this context
+     * @return time zone
+     */
+    public TimeZone getTimeZone() {
+        return _timezone;
+    }
+
+    /**
+     * Compile a top level script.
+     *
+     * @param source the source
+     * @param scope  the scope
+     * @param strict are we in strict mode
+     *
+     * @return top level function for script
+     */
+    public ScriptFunction compileScript(final Source source, final ScriptObject scope, final boolean strict) {
+        return compileScript(source, scope, this.errors, strict);
+    }
+
+    /**
+     * Compile a top level script - no Source given, but an URL to
+     * load it from
+     *
+     * @param name    name of script/source
+     * @param url     URL to source
+     * @param scope   the scope
+     * @param strict  are we in strict mode
+     *
+     * @return top level function for the script
+     *
+     * @throws IOException if URL cannot be resolved
+     */
+    public ScriptFunction compileScript(final String name, final URL url, final ScriptObject scope, final boolean strict) throws IOException {
+        return compileScript(name, url, scope, this.errors, strict);
+    }
+
+    /**
+     * Entry point for {@code eval}
+     *
+     * @param initialScope The scope of this eval call
+     * @param string       Evaluated code as a String
+     * @param callThis     "this" to be passed to the evaluated code
+     * @param location     location of the eval call
+     * @param strict       is this {@code eval} call from a strict mode code?
+     *
+     * @return the return value of the {@code eval}
+     */
+    public Object eval(final ScriptObject initialScope, final String string, final Object callThis, final Object location, final boolean strict) {
+        final String  file       = (location == UNDEFINED || location == null) ? "<eval>" : location.toString();
+        final Source  source     = new Source(file, string);
+        final boolean directEval = location != UNDEFINED; // is this direct 'eval' call or indirectly invoked eval?
+        final ScriptObject global = Context.getGlobal();
+
+        ScriptObject scope = initialScope;
+
+        // ECMA section 10.1.1 point 2 says eval code is strict if it begins
+        // with "use strict" directive or eval direct call itself is made
+        // from from strict mode code. We are passed with caller's strict mode.
+        boolean strictFlag = directEval && strict;
+
+        Class<?> clazz = null;
+        try {
+            clazz = compile(source, new ThrowErrorManager(), strictFlag);
+        } catch (final ParserException e) {
+            e.throwAsEcmaException(global);
+            return null;
+        }
+
+        if (!strictFlag) {
+            // We need to get strict mode flag from compiled class. This is
+            // because eval code may start with "use strict" directive.
+            try {
+                strictFlag = clazz.getField(STRICT_MODE.tag()).getBoolean(null);
+            } catch (final NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException e) {
+                //ignored
+                strictFlag = false;
+            }
+        }
+
+        // In strict mode, eval does not instantiate variables and functions
+        // in the caller's environment. A new environment is created!
+        if (strictFlag) {
+            // Create a new scope object
+            final ScriptObject strictEvalScope = ((GlobalObject)global).newObject();
+
+            // bless it as a "scope"
+            strictEvalScope.setIsScope();
+
+            // set given scope to be it's proto so that eval can still
+            // access caller environment vars in the new environment.
+            strictEvalScope.setProto(scope);
+            scope = strictEvalScope;
+        }
+
+        ScriptFunction func = getRunScriptFunction(clazz, scope);
+        Object evalThis;
+        if (directEval) {
+            evalThis = (callThis instanceof ScriptObject || strictFlag) ? callThis : global;
+        } else {
+            evalThis = global;
+        }
+
+        return ScriptRuntime.apply(func, evalThis);
+    }
+
+    /**
+     * Implementation of {@code load} Nashorn extension. Load a script file from a source
+     * expression
+     *
+     * @param scope  the scope
+     * @param source source expression for script
+     *
+     * @return return value for load call (undefined)
+     *
+     * @throws IOException if source cannot be found or loaded
+     */
+    public Object load(final ScriptObject scope, final Object source) throws IOException {
+        Object src = source;
+        URL url = null;
+        String srcName = null;
+
+        if (src instanceof ConsString) {
+            src = src.toString();
+        }
+        if (src instanceof String) {
+            srcName = (String)src;
+            final File file = new File((String)src);
+            if (file.isFile()) {
+                url = file.toURI().toURL();
+            } else if (srcName.indexOf(':') != -1) {
+                try {
+                    url = new URL((String)src);
+                } catch (final MalformedURLException e) {
+                    // fallback URL - nashorn:foo.js - check under jdk/nashorn/internal/runtime/resources
+                    String str = (String)src;
+                    if (str.startsWith("nashorn:")) {
+                        str = "resources/" + str.substring("nashorn:".length());
+                        url = Context.class.getResource(str);
+                        if (url == null) {
+                            throw e;
+                        }
+                    } else {
+                        throw e;
+                    }
+                }
+            }
+            src = url;
+        }
+
+        if (src instanceof File && ((File)src).isFile()) {
+            final File file = (File)src;
+            url = file.toURI().toURL();
+            if (srcName == null) {
+                srcName = file.getCanonicalPath();
+            }
+        } else if (src instanceof URL) {
+            url = (URL)src;
+            if (srcName == null) {
+                srcName = url.toString();
+            }
+        }
+
+        if (url != null) {
+            assert srcName != null : "srcName null here!";
+            return evaluateSource(srcName, url, scope, scope);
+        } else if (src instanceof ScriptObject) {
+            final ScriptObject sobj = (ScriptObject)src;
+            if (sobj.has("script") && sobj.has("name")) {
+                final String script = JSType.toString(sobj.get("script"));
+                final String name   = JSType.toString(sobj.get("name"));
+                return evaluateSource(new Source(name, script), scope, scope);
+            }
+        }
+
+        typeError(Context.getGlobal(), "cant.load.script", ScriptRuntime.safeToString(source));
+
+        return UNDEFINED;
+    }
+
+    /**
+     * Load or get a structure class. Structure class names are based on the number of parameter fields
+     * and {@link AccessorProperty} fields in them. Structure classes are used to represent ScriptObjects
+     *
+     * @see ObjectClassGenerator
+     * @see AccessorProperty
+     * @see ScriptObject
+     *
+     * @param fullName  full name of class, e.g. jdk.nashorn.internal.objects.JO$2P1 contains 2 fields and 1 parameter.
+     *
+     * @return the Class<?> for this structure
+     *
+     * @throws ClassNotFoundException if structure class cannot be resolved
+     */
+    public static Class<?> forStructureClass(final String fullName) throws ClassNotFoundException {
+        return Class.forName(fullName, true, sharedLoader);
+    }
+
+    /**
+     * Lookup a Java class. This is used for JSR-223 stuff linking in from
+     * {@link jdk.nashorn.internal.objects.NativeJava} and {@link jdk.nashorn.internal.runtime.NativeJavaPackage}
+     *
+     * @param fullName full name of class to load
+     *
+     * @return the Class<?> for the name
+     *
+     * @throws ClassNotFoundException if class cannot be resolved
+     */
+    public Class<?> findClass(final String fullName) throws ClassNotFoundException {
+        // check package access as soon as possible!
+        final int index = fullName.lastIndexOf('.');
+        if (index != -1) {
+            final SecurityManager sm = System.getSecurityManager();
+            if (sm != null) {
+                sm.checkPackageAccess(fullName.substring(0, index));
+            }
+        }
+
+        // try script loader first
+        try {
+            return Class.forName(fullName, true, scriptLoader);
+        } catch (final ClassNotFoundException e) {
+            // ignored, continue search
+        }
+
+        // try script -classpath loader, if set
+        if (classPathLoader != null) {
+            try {
+                return Class.forName(fullName, true, classPathLoader);
+            } catch (final ClassNotFoundException e) {
+                // ignore, continue search
+            }
+        }
+
+        // This helps in finding using "app" loader - which is typically set as thread context loader
+        try {
+            return Class.forName(fullName, true, Thread.currentThread().getContextClassLoader());
+        } catch (final ClassNotFoundException e) {
+            throw e;
+        }
+    }
+
+    /**
+     * Hook to print stack trace for a {@link Throwable} that occurred during
+     * execution
+     *
+     * TODO: use Context.err
+     * .
+     * @param t throwable for which to dump stack
+     */
+    public static void printStackTrace(final Throwable t) {
+        if (Context.DEBUG) {
+            t.printStackTrace();
+        }
+    }
+
+    /**
+     * Verify generated bytecode before emission. This is called back from the
+     * {@link ClassEmitter} or the {@link Compiler}. If the "--verify-code" parameter
+     * hasn't been given, this is a nop
+     *
+     * Note that verification may load classes -- we don't want to do that unless
+     * user specified verify option. We check it here even though caller
+     * may have already checked that flag
+     *
+     * @param bytecode bytecode to verify
+     */
+    public void verify(final byte[] bytecode) {
+        if (_verify_code) {
+            // No verification when security manager is around as verifier
+            // may load further classes - which should be avoided.
+            if (System.getSecurityManager() == null) {
+                CheckClassAdapter.verify(new ClassReader(bytecode), scriptLoader, false, new PrintWriter(System.err, true));
+            }
+        }
+    }
+
+    /**
+     * Create global script object
+     * @return the global script object
+     */
+    public ScriptObject createGlobal() {
+        final ScriptObject global = newGlobal();
+
+        // Need only minimal global object, if we are just compiling.
+        if (!_compile_only) {
+            // initialize global scope with builtin global objects
+            ((GlobalObject)global).initBuiltinObjects();
+        }
+
+        return global;
+    }
+
+    /**
+     * Try to infer Context instance from the Class. If we cannot,
+     * then get it from the thread local variable.
+     *
+     * @param clazz the class
+     * @return context
+     */
+    static Context fromClass(final Class<?> clazz) {
+        final ClassLoader loader = clazz.getClassLoader();
+
+        Context context = null;
+        if (loader instanceof NashornLoader) {
+            context = ((NashornLoader)loader).getContext();
+        }
+
+        return (context != null) ? context : Context.getContext();
+    }
+
+    private Object evaluateSource(final String name, final URL url, final ScriptObject scope, final ScriptObject thiz) throws IOException {
+        ScriptFunction script = null;
+
+        try {
+            script = compileScript(name, url, scope, new Context.ThrowErrorManager(), _strict);
+        } catch (final ParserException e) {
+            e.throwAsEcmaException(Context.getGlobal());
+        }
+
+        return ScriptRuntime.apply(script, thiz);
+    }
+
+    private Object evaluateSource(final Source source, final ScriptObject scope, final ScriptObject thiz) {
+        ScriptFunction script = null;
+
+        try {
+            script = compileScript(source, scope, new Context.ThrowErrorManager(), _strict);
+        } catch (final ParserException e) {
+            e.throwAsEcmaException(Context.getGlobal());
+        }
+
+        return ScriptRuntime.apply(script, thiz);
+    }
+
+    private static ScriptFunction getRunScriptFunction(final Class<?> script, final ScriptObject scope) {
+        if (script == null) {
+            return null;
+        }
+
+        // Get run method - the entry point to the script
+        final MethodHandle runMethodHandle =
+                MH.findStatic(
+                    MethodHandles.lookup(),
+                    script,
+                    RUN_SCRIPT.tag(),
+                    MH.type(
+                        Object.class,
+                        Object.class,
+                        ScriptFunction.class));
+
+        boolean strict;
+
+        try {
+            strict = script.getField(STRICT_MODE.tag()).getBoolean(null);
+        } catch (final NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException e) {
+            strict = false;
+        }
+
+        // Package as a JavaScript function and pass function back to shell.
+        return ((GlobalObject)Context.getGlobal()).newScriptFunction(RUN_SCRIPT.tag(), runMethodHandle, scope, strict);
+    }
+
+    private ScriptFunction compileScript(final String name, final URL url, final ScriptObject scope, final ErrorManager errMan, final boolean strict) throws IOException {
+        return getRunScriptFunction(compile(new Source(name, url), url, errMan, strict), scope);
+    }
+
+    private ScriptFunction compileScript(final Source source, final ScriptObject scope, final ErrorManager errMan, final boolean strict) {
+        return getRunScriptFunction(compile(source, null, errMan, strict), scope);
+    }
+
+    private Class<?> compile(final Source source, final ErrorManager errMan, final boolean strict) {
+        return compile(source, null, errMan, strict);
+    }
+
+   private synchronized Class<?> compile(final Source source, final URL url, final ErrorManager errMan, final boolean strict) {
+        // start with no errors, no warnings.
+        errMan.reset();
+
+        GlobalObject global = null;
+        Class<?> script;
+
+        if (_class_cache_size > 0) {
+            global = (GlobalObject)Context.getGlobal();
+            script = global.findCachedClass(source);
+            if (script != null) {
+                return script;
+            }
+        }
+
+        final Compiler compiler = Compiler.compiler(source, this, errMan, strict);
+
+        if (!compiler.compile()) {
+            return null;
+        }
+
+        final ScriptLoader loader = _loader_per_compile ? createNewLoader() : scriptLoader;
+        final CodeSource   cs     = url == null ? null : new CodeSource(url, (CodeSigner[])null);
+
+        script = compiler.install(new CodeInstaller() {
+            @Override
+            public Class<?> install(final String className, final byte[] bytecode) {
+                return loader.installClass(className, bytecode, cs);
+            }
+        });
+
+        if (global != null) {
+            global.cacheClass(source, script);
+        }
+
+        return script;
+    }
+
+    private ScriptLoader createNewLoader() {
+        return AccessController.doPrivileged(
+             new PrivilegedAction<ScriptLoader>() {
+                @Override
+                public ScriptLoader run() {
+                    // Generated code won't refer to any class generated by context
+                    // script loader and so parent loader can be the structure
+                    // loader -- which is parent of the context script loader.
+                    return new ScriptLoader(scriptLoader.getParent(), Context.this);
+                }
+             });
+    }
+
+    private ScriptObject newGlobal() {
+        try {
+            final Class<?> clazz = Class.forName("jdk.nashorn.internal.objects.Global", true, scriptLoader);
+            return (ScriptObject) clazz.newInstance();
+        } catch (final ClassNotFoundException | SecurityException | InstantiationException | IllegalAccessException | IllegalArgumentException e) {
+            printStackTrace(e);
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Debug.java b/nashorn/src/jdk/nashorn/internal/runtime/Debug.java
new file mode 100644
index 00000000000..463736d8a97
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Debug.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import static jdk.nashorn.internal.parser.TokenType.EOF;
+
+import jdk.nashorn.internal.parser.Lexer;
+import jdk.nashorn.internal.parser.Token;
+import jdk.nashorn.internal.parser.TokenStream;
+import jdk.nashorn.internal.parser.TokenType;
+
+/**
+ * Utilities for debugging Nashorn.
+ *
+ */
+public class Debug {
+    private Debug() {
+    }
+
+    /**
+     * Return the system identity hashcode for an object as a human readable
+     * string
+     *
+     * @param x object
+     * @return system identity hashcode as string
+     */
+    public static String id(final Object x) {
+        return "0x" + Integer.toHexString(System.identityHashCode(x));
+    }
+
+    /**
+     * Return a stack trace element description at a depth from where we are not
+     *
+     * @param depth depth
+     * @return stack trace element as string
+     */
+    public static String stackTraceElementAt(final int depth) {
+        return new Throwable().getStackTrace()[depth + 1].toString(); // add 1 to compensate for this method
+    }
+
+    /**
+     * Determine caller for tracing purposes.
+     * @param depth depth to trace
+     * @param count max depth
+     * @param ignores elements to ignore in stack trace
+     * @return caller
+     */
+    public static String caller(final int depth, final int count, final String... ignores) {
+        String result = "";
+        final StackTraceElement[] callers = Thread.currentThread().getStackTrace();
+
+        int c = count;
+loop:
+        for (int i = depth + 1; i < callers.length && c != 0; i++) {
+            final StackTraceElement element = callers[i];
+            final String method = element.getMethodName();
+
+            for (final String ignore : ignores) {
+                if (method.compareTo(ignore) == 0) {
+                    continue loop;
+                }
+            }
+
+            result += (method + ":" + element.getLineNumber() +
+                       "                              ").substring(0, 30);
+            c--;
+        }
+
+        return result.isEmpty() ? "<no caller>" : result;
+    }
+
+    /**
+     * Dump a token stream to stdout
+     *
+     * TODO: most other bugging goes to stderr, change?
+     *
+     * @param source the source
+     * @param lexer  the lexer
+     * @param stream the stream to dump
+     */
+    public static void dumpTokens(final Source source, final Lexer lexer, final TokenStream stream) {
+        TokenType type;
+        int k = 0;
+        do {
+            while (k > stream.last()) {
+                // Get more tokens.
+                lexer.lexify();
+            }
+
+            final long token = stream.get(k);
+            type = Token.descType(token);
+            System.out.println("" + k + ": " + Token.toString(source, token, true));
+            k++;
+        } while(type != EOF);
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/DebugLogger.java b/nashorn/src/jdk/nashorn/internal/runtime/DebugLogger.java
new file mode 100644
index 00000000000..ac925b4f63c
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/DebugLogger.java
@@ -0,0 +1,187 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import java.io.PrintWriter;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import jdk.nashorn.internal.runtime.options.Options;
+
+/**
+ * Wrapper class for Logging system. This is how you are supposed to register a logger and use it
+ */
+
+public class DebugLogger {
+    @SuppressWarnings("NonConstantLogger")
+    private final Logger  logger;
+    private final boolean isEnabled;
+
+    private int indent;
+
+    /**
+     * Constructor
+     *
+     * @param loggerName name of logger - this is the unique key with which it can be identified
+     */
+    public DebugLogger(final String loggerName) {
+        this(loggerName, null);
+    }
+
+    /**
+     * Constructor
+     *
+     * A logger can be paired with a property, e.g. {@code --log:codegen:info} is equivalent to {@code -Dnashorn.codegen.log}
+     *
+     * @param loggerName name of logger - this is the unique key with which it can be identified
+     * @param property   system property activating the logger on {@code info} level
+     */
+    public DebugLogger(final String loggerName, final String property) {
+        this.logger    = Logging.getLogger(loggerName);
+        this.isEnabled = logger.getLevel() != Level.OFF || (property != null && Options.getBooleanProperty(property));
+    }
+
+    /**
+     * Get the output writer for the logger. Loggers always default to
+     * stderr for output as they are used mainly to output debug info
+     *
+     * @return print writer for log output.
+     */
+    public PrintWriter getOutputStream() {
+        return Context.getContext().getErr();
+    }
+
+    /**
+     * Check if the logger is enabled
+     * @return true if enabled
+     */
+    public boolean isEnabled() {
+        return isEnabled;
+    }
+
+    /**
+     * If you want to change the indent level of your logger, call indent with a new position.
+     * Positions start at 0 and are increased by one for a new "tab"
+     *
+     * @param pos indent position
+     */
+    public void indent(final int pos) {
+        if (isEnabled) {
+           indent += pos * 4;
+        }
+    }
+
+    /**
+     * Check if the logger is above of the level of detail given
+     * @see java.util.logging.Level
+     *
+     * @param level logging level
+     * @return true if level is above the given one
+     */
+    public boolean levelAbove(final Level level) {
+        return logger.getLevel().intValue() > level.intValue();
+    }
+
+    /**
+     * Shorthand for outputting a log string as log level {@link java.util.logging.Level#FINEST} on this logger
+     * @param str the string to log
+     */
+    public void finest(final String str) {
+        log(str, Level.FINEST);
+    }
+
+    /**
+     * Shorthand for outputting a log string as log level
+     * {@link java.util.logging.Level#FINER} on this logger
+     * @param str the string to log
+     */
+    public void finer(final String str) {
+        log(str, Level.FINER);
+    }
+
+    /**
+     * Shorthand for outputting a log string as log level
+     * {@link java.util.logging.Level#FINE} on this logger
+     * @param str the string to log
+     */
+    public void fine(final String str) {
+        log(str, Level.FINE);
+    }
+
+    /**
+     * Shorthand for outputting a log string as log level
+     * {@link java.util.logging.Level#CONFIG} on this logger
+     * @param str the string to log
+     */
+    public void config(final String str) {
+        log(str, Level.CONFIG);
+    }
+
+    /**
+     * Shorthand for outputting a log string as log level
+     * {@link java.util.logging.Level#INFO} on this logger
+     * @param str the string to log
+     */
+    public void info(final String str) {
+        log(str, Level.INFO);
+    }
+
+    /**
+     * Shorthand for outputting a log string as log level
+     * {@link java.util.logging.Level#WARNING} on this logger
+     * @param str the string to log
+     */
+    public void warning(final String str) {
+        log(str, Level.WARNING);
+    }
+
+    /**
+     * Shorthand for outputting a log string as log level
+     * {@link java.util.logging.Level#SEVERE} on this logger
+     * @param str the string to log
+     */
+    public void severe(final String str) {
+        log(str, Level.SEVERE);
+    }
+
+    /**
+     * Output log line on this logger at a given level of verbosity
+     * @see java.util.logging.Level
+     *
+     * @param str   string to log
+     * @param level minimum log level required for logging to take place
+     */
+    public void log(final String str, final Level level) {
+        if (isEnabled) {
+            final StringBuilder sb = new StringBuilder();
+
+            for (int i = 0 ; i < indent ; i++) {
+                sb.append(' ');
+            }
+            sb.append(str);
+            logger.log(level, sb.toString());
+        }
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/DefaultPropertyAccess.java b/nashorn/src/jdk/nashorn/internal/runtime/DefaultPropertyAccess.java
new file mode 100644
index 00000000000..43b6a6d7502
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/DefaultPropertyAccess.java
@@ -0,0 +1,243 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+/**
+ * If your ScriptObject or similar PropertyAccess implementation only provides the most
+ * generic getters and setters and does nothing fancy with other, more primitive, types,
+ * then it is convenient to inherit this class and just fill out the methods left
+ * abstract
+ */
+public abstract class DefaultPropertyAccess implements PropertyAccess {
+
+    @Override
+    public int getInt(final Object key) {
+        return JSType.toInt32(get(key));
+    }
+
+    @Override
+    public int getInt(final double key) {
+        return getInt(JSType.toObject(key));
+    }
+
+    @Override
+    public int getInt(final long key) {
+        return getInt(JSType.toObject(key));
+    }
+
+    @Override
+    public int getInt(final int key) {
+        return getInt(JSType.toObject(key));
+    }
+
+    @Override
+    public long getLong(final Object key) {
+        return JSType.toLong(get(key));
+    }
+
+    @Override
+    public long getLong(final double key) {
+        return getLong(JSType.toObject(key));
+    }
+
+    @Override
+    public long getLong(final long key) {
+        return getLong(JSType.toObject(key));
+    }
+
+    @Override
+    public long getLong(final int key) {
+        return getLong(JSType.toObject(key));
+    }
+
+    @Override
+    public double getDouble(final Object key) {
+        return JSType.toNumber(get(key));
+    }
+
+    @Override
+    public double getDouble(final double key) {
+        return getDouble(JSType.toObject(key));
+    }
+
+    @Override
+    public double getDouble(final long key) {
+        return getDouble(JSType.toObject(key));
+    }
+
+    @Override
+    public double getDouble(final int key) {
+        return getDouble(JSType.toObject(key));
+    }
+
+    @Override
+    public abstract Object get(Object key);
+
+    @Override
+    public Object get(final double key) {
+        return get(JSType.toObject(key));
+    }
+
+    @Override
+    public Object get(final long key) {
+        return get(JSType.toObject(key));
+    }
+
+    @Override
+    public Object get(final int key) {
+        return get(JSType.toObject(key));
+    }
+
+    @Override
+    public void set(final double key, final int value, final boolean strict) {
+        set(JSType.toObject(key), JSType.toObject(value), strict);
+    }
+
+    @Override
+    public void set(final double key, final long value, final boolean strict) {
+        set(JSType.toObject(key), JSType.toObject(value), strict);
+    }
+
+    @Override
+    public void set(final double key, final double value, final boolean strict) {
+        set(JSType.toObject(key), JSType.toObject(value), strict);
+    }
+
+    @Override
+    public void set(final double key, final Object value, final boolean strict) {
+        set(JSType.toObject(key), JSType.toObject(value), strict);
+    }
+
+    @Override
+    public void set(final long key, final int value, final boolean strict) {
+        set(JSType.toObject(key), JSType.toObject(value), strict);
+    }
+
+    @Override
+    public void set(final long key, final long value, final boolean strict) {
+        set(JSType.toObject(key), JSType.toObject(value), strict);
+    }
+
+    @Override
+    public void set(final long key, final double value, final boolean strict) {
+        set(JSType.toObject(key), JSType.toObject(value), strict);
+    }
+
+    @Override
+    public void set(final long key, final Object value, final boolean strict) {
+        set(JSType.toObject(key), value, strict);
+    }
+
+    @Override
+    public void set(final int key, final int value, final boolean strict) {
+        set(JSType.toObject(key), JSType.toObject(value), strict);
+    }
+
+    @Override
+    public void set(final int key, final long value, final boolean strict) {
+        set(JSType.toObject(key), JSType.toObject(value), strict);
+    }
+
+    @Override
+    public void set(final int key, final double value, final boolean strict) {
+        set(JSType.toObject(key), JSType.toObject(value), strict);
+    }
+
+    @Override
+    public void set(final int key, final Object value, final boolean strict) {
+        set(JSType.toObject(key), value, strict);
+    }
+
+    @Override
+    public void set(final Object key, final int value, final boolean strict) {
+        set(key, JSType.toObject(value), strict);
+    }
+
+    @Override
+    public void set(final Object key, final long value, final boolean strict) {
+        set(key, JSType.toObject(value), strict);
+    }
+
+    @Override
+    public void set(final Object key, final double value, final boolean strict) {
+        set(key, JSType.toObject(value), strict);
+    }
+
+    @Override
+    public abstract void set(Object key, Object value, boolean strict);
+
+    @Override
+    public abstract boolean has(Object key);
+
+    @Override
+    public boolean has(final int key) {
+        return has(JSType.toObject(key));
+    }
+
+    @Override
+    public boolean has(final long key) {
+        return has(JSType.toObject(key));
+    }
+
+    @Override
+    public boolean has(final double key) {
+        return has(JSType.toObject(key));
+    }
+
+    @Override
+    public boolean hasOwnProperty(final int key) {
+        return hasOwnProperty(JSType.toObject(key));
+    }
+
+    @Override
+    public boolean hasOwnProperty(final long key) {
+        return hasOwnProperty(JSType.toObject(key));
+    }
+
+    @Override
+    public boolean hasOwnProperty(final double key) {
+        return hasOwnProperty(JSType.toObject(key));
+    }
+
+    @Override
+    public abstract boolean hasOwnProperty(Object key);
+
+    @Override
+    public boolean delete(final int key, final boolean strict) {
+        return delete(JSType.toObject(key), strict);
+    }
+
+    @Override
+    public boolean delete(final long key, final boolean strict) {
+        return delete(JSType.toObject(key), strict);
+    }
+
+    @Override
+    public boolean delete(final double key, final boolean strict) {
+        return delete(JSType.toObject(key), strict);
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ECMAErrors.java b/nashorn/src/jdk/nashorn/internal/runtime/ECMAErrors.java
new file mode 100644
index 00000000000..3cb6dadd38d
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ECMAErrors.java
@@ -0,0 +1,242 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.text.MessageFormat;
+import java.util.Locale;
+import java.util.ResourceBundle;
+
+/**
+ * Helper class to throw various standard "ECMA error" exceptions such as Error, ReferenceError, TypeError etc.
+ */
+public final class ECMAErrors {
+    private static final String MESSAGES_RESOURCE = "jdk.nashorn.internal.runtime.resources.Messages";
+
+    // Without do privileged, under security manager messages can not be loaded.
+    private static final ResourceBundle MESSAGES_BUNDLE = AccessController.doPrivileged(
+        new PrivilegedAction<ResourceBundle>() {
+            @Override
+            public ResourceBundle run() {
+                return ResourceBundle.getBundle(MESSAGES_RESOURCE, Locale.getDefault());
+            }
+        });
+
+    private ECMAErrors() {
+    }
+
+    private static void throwError(final Object thrown, final Throwable cause) {
+        throw new ECMAException(thrown, cause);
+    }
+
+    /**
+     * Error dispatch mechanism.
+     * Throw a {@link ParserException} as the correct JavaScript error
+     *
+     * @param global global scope object
+     * @param e {@code ParserException} for error dispatcher
+     */
+    public static void throwAsEcmaException(final ScriptObject global, final ParserException e) {
+        final JSErrorType errorType = e.getErrorType();
+        if (errorType == null) {
+            // no errorType set, throw ParserException object 'as is'
+            throw e;
+        }
+
+        final GlobalObject globalObj = (GlobalObject)global;
+        final String       msg    = e.getMessage();
+
+        // translate to ECMAScript Error object using error type
+        switch (errorType) {
+        case ERROR:
+            throwError(globalObj.newError(msg), e);
+            break;
+        case EVAL_ERROR:
+            throwError(globalObj.newEvalError(msg), e);
+            break;
+        case RANGE_ERROR:
+            throwError(globalObj.newRangeError(msg), e);
+            break;
+        case REFERENCE_ERROR:
+            throwError(globalObj.newReferenceError(msg), e);
+            break;
+        case SYNTAX_ERROR:
+            throwError(globalObj.newSyntaxError(msg), e);
+            break;
+        case TYPE_ERROR:
+            throwError(globalObj.newTypeError(msg), e);
+            break;
+        case URI_ERROR:
+            throwError(globalObj.newURIError(msg), e);
+            break;
+        default:
+            break;
+        }
+
+        // should not happen - perhaps unknown error type?
+        throw e;
+    }
+
+    /**
+     * Throw a syntax error (ECMA 15.11.6.4)
+     *
+     * @param global  global scope object
+     * @param msgId   resource tag for error message
+     * @param args    arguments to resource
+     */
+    public static void syntaxError(final ScriptObject global, final String msgId, final String... args) {
+        syntaxError(global, null, msgId, args);
+    }
+
+    /**
+     * Throw a syntax error (ECMA 15.11.6.4)
+     *
+     * @param global  global scope object
+     * @param cause   native Java {@code Throwable} that is the cause of error
+     * @param msgId   resource tag for error message
+     * @param args    arguments to resource
+     */
+    public static void syntaxError(final ScriptObject global, final Throwable cause, final String msgId, final String... args) {
+        final String msg = getMessage("syntax.error." + msgId, args);
+        throwError(((GlobalObject)global).newSyntaxError(msg), cause);
+    }
+
+    /**
+     * Throw a type error (ECMA 15.11.6.5)
+     *
+     * @param global  global scope object
+     * @param msgId   resource tag for error message
+     * @param args    arguments to resource
+     */
+    public static void typeError(final ScriptObject global, final String msgId, final String... args) {
+        typeError(global, null, msgId, args);
+    }
+
+    /**
+     * Throw a type error (ECMA 15.11.6.5)
+     *
+     * @param global  global scope object
+     * @param cause   native Java {@code Throwable} that is the cause of error
+     * @param msgId   resource tag for error message
+     * @param args    arguments to resource
+     */
+    public static void typeError(final ScriptObject global, final Throwable cause, final String msgId, final String... args) {
+        final String msg = getMessage("type.error." + msgId, args);
+        throwError(((GlobalObject)global).newTypeError(msg), cause);
+    }
+
+    /**
+     * Throw a range error (ECMA 15.11.6.2)
+     *
+     * @param global  global scope object
+     * @param msgId   resource tag for error message
+     * @param args    arguments to resource
+     */
+    public static void rangeError(final ScriptObject global, final String msgId, final String... args) {
+        rangeError(global, null, msgId, args);
+    }
+
+    /**
+     * Throw a range error (ECMA 15.11.6.2)
+     *
+     * @param global  global scope object
+     * @param cause   native Java {@code Throwable} that is the cause of error
+     * @param msgId   resource tag for error message
+     * @param args    arguments to resource
+     */
+    public static void rangeError(final ScriptObject global, final Throwable cause, final String msgId, final String... args) {
+        final String msg = getMessage("range.error." + msgId, args);
+        throwError(((GlobalObject)global).newRangeError(msg), cause);
+    }
+
+    /**
+     * Throw a reference error (ECMA 15.11.6.3)
+     *
+     * @param global  global scope object
+     * @param msgId   resource tag for error message
+     * @param args    arguments to resource
+     */
+    public static void referenceError(final ScriptObject global, final String msgId, final String... args) {
+        referenceError(global, null, msgId, args);
+    }
+
+    /**
+     * Throw a reference error (ECMA 15.11.6.3)
+     *
+     * @param global  global scope object
+     * @param cause   native Java {@code Throwable} that is the cause of error
+     * @param msgId   resource tag for error message
+     * @param args    arguments to resource
+     */
+    public static void referenceError(final ScriptObject global, final Throwable cause, final String msgId, final String... args) {
+        final String msg = getMessage("reference.error." + msgId, args);
+        throwError(((GlobalObject)global).newReferenceError(msg), cause);
+    }
+
+    /**
+     * Throw a URI error (ECMA 15.11.6.6)
+     *
+     * @param global  global scope object
+     * @param msgId   resource tag for error message
+     * @param args    arguments to resource
+     */
+    public static void uriError(final ScriptObject global, final String msgId, final String... args) {
+        uriError(global, null, msgId, args);
+    }
+
+    /**
+     * Throw a URI error (ECMA 15.11.6.6)
+     *
+     * @param global  global scope object
+     * @param cause   native Java {@code Throwable} that is the cause of error
+     * @param msgId   resource tag for error message
+     * @param args    arguments to resource
+     */
+    public static void uriError(final ScriptObject global, final Throwable cause, final String msgId, final String... args) {
+        final String msg = getMessage("uri.error." + msgId, args);
+        throwError(((GlobalObject)global).newURIError(msg), cause);
+    }
+
+    /**
+     * Get the exception message by placing the args in the resource defined
+     * by the resource tag. This is visible to, e.g. the {@link jdk.nashorn.internal.parser.Parser}
+     * can use it to generate compile time messages with the correct locale
+     *
+     * @param msgId the resource tag (message id)
+     * @param args  arguments to error string
+     *
+     * @return the filled out error string
+     */
+    public static String getMessage(final String msgId, final String... args) {
+        try {
+            return new MessageFormat(MESSAGES_BUNDLE.getString(msgId)).format(args);
+        } catch (final java.util.MissingResourceException e) {
+            throw new RuntimeException("no message resource found for message id: "+ msgId);
+        }
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ECMAException.java b/nashorn/src/jdk/nashorn/internal/runtime/ECMAException.java
new file mode 100644
index 00000000000..253dbeb4e54
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ECMAException.java
@@ -0,0 +1,326 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import static jdk.nashorn.internal.codegen.CompilerConstants.constructorNoLookup;
+import static jdk.nashorn.internal.codegen.CompilerConstants.virtualField;
+import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+
+import javax.script.ScriptException;
+import jdk.nashorn.api.scripting.NashornException;
+import jdk.nashorn.api.scripting.NashornScriptEngine;
+import jdk.nashorn.internal.codegen.CompilerConstants.Call;
+import jdk.nashorn.internal.codegen.CompilerConstants.FieldAccess;
+import jdk.nashorn.internal.scripts.JS$;
+
+/**
+ * Exception used to implement ECMAScript "throw" from scripts. The actual thrown
+ * object from script need not be a Java exception and so it is wrapped as an
+ * instance field called "thrown" here. This exception class is also used to
+ * represent ECMA errors thrown from runtime code (for example, TypeError,
+ * ReferenceError thrown from Nashorn engine runtime).
+ */
+@SuppressWarnings("serial")
+public final class ECMAException extends NashornException {
+    /**
+     * Method handle pointing to the constructor {@link ECMAException#ECMAException(Object, String, int, int)},
+     * used from {@link jdk.nashorn.internal.codegen.CodeGenerator}
+     */
+    public static final Call THROW_INIT = constructorNoLookup(ECMAException.class, Object.class, String.class, int.class, int.class);
+
+    /** Field handle to the{@link ECMAException#thrown} field, so that it can be accessed from generated code */
+    public static final FieldAccess THROWN = virtualField(ECMAException.class, "thrown", Object.class);
+
+    private static final String EXCEPTION_PROPERTY = "nashornException";
+
+    /** We assume that compiler generates script classes into the known package. */
+    private static final String scriptPackage;
+
+    /** Package (internal) name where Nashorn script engine implementation lives */
+    private static final String enginePackageInternal;
+
+    static {
+        String name = JS$.class.getName();
+        scriptPackage = name.substring(0, name.lastIndexOf('.'));
+        name = NashornScriptEngine.class.getName();
+        enginePackageInternal = name.substring(0, name.lastIndexOf('.')).replace(".", "/");
+    }
+
+    /** Object thrown. */
+    public final Object thrown;
+
+    /**
+     * Constructor. This is called from generated code to implement the {@code throw}
+     * instruction from generated script code
+     *
+     * @param thrown    object to be thrown
+     * @param fileName  script file name
+     * @param line      line number of throw
+     * @param column    column number of throw
+     */
+    public ECMAException(final Object thrown, final String fileName, final int line, final int column) {
+        super(ScriptRuntime.safeToString(thrown), asThrowable(thrown));
+        setFileName(fileName);
+        setLineNumber(line);
+        setColumnNumber(column);
+        this.thrown = thrown;
+        setExceptionToThrown();
+    }
+
+    /**
+     * Constructor. This is called from runtime code in Nashorn to throw things like
+     * type errors.
+     *
+     * @param thrown   object to be thrown
+     * @param cause    Java exception that triggered this throw
+     */
+    public ECMAException(final Object thrown, final Throwable cause) {
+        super(ScriptRuntime.safeToString(thrown), cause);
+        this.thrown = thrown;
+        setExceptionToThrown();
+        // location is not directly available, get it from stack trace
+        setLocationFromStack();
+    }
+
+    /**
+     * Get the thrown object
+     * @return thrown object
+     */
+    public Object getThrown() {
+        return thrown;
+    }
+
+    @Override
+    public String toString() {
+        final StringBuilder sb = new StringBuilder();
+        final String fileName = getFileName();
+        final int line = getLineNumber();
+        final int column = getColumnNumber();
+
+        if (fileName != null) {
+            sb.append(fileName);
+            if (line >= 0) {
+                sb.append(':');
+                sb.append(line);
+            }
+            if (column >= 0) {
+                sb.append(':');
+                sb.append(column);
+            }
+            sb.append(' ');
+        } else {
+            sb.append("ECMAScript Exception: ");
+        }
+
+        sb.append(getMessage());
+        return sb.toString();
+    }
+
+    /**
+     * Get the {@link ECMAException}, i.e. the underlying Java object for the
+     * JavaScript error object from a {@link ScriptObject} representing an error
+     *
+     * @param errObj the error object
+     * @return a {@link ECMAException}
+     */
+    public static Object getException(final ScriptObject errObj) {
+        return errObj.get(ECMAException.EXCEPTION_PROPERTY);
+    }
+
+    /**
+     * Check if a stack trace element is in JavaScript
+     *
+     * @param frame frame
+     *
+     * @return true if frame is in the script
+     */
+    public static boolean isScriptFrame(final StackTraceElement frame) {
+        final String className = frame.getClassName();
+
+        // Look for script package in class name (into which compiler puts generated code)
+        if (className.startsWith(scriptPackage)) {
+            final String source = frame.getFileName();
+            /*
+             * Make sure that it is not some Java code that Nashorn has in that package!
+             * also, we don't want to report JavaScript code that lives in script engine implementation
+             * We want to report only user's own scripts and not any of our own scripts like "engine.js"
+             */
+            return source != null && !source.endsWith(".java") && !source.contains(enginePackageInternal);
+        }
+        return false;
+    }
+
+    /**
+     * Print the stack trace for a {@code ScriptObject} representing an error
+     *
+     * @param errObj the error object
+     * @return undefined
+     */
+    public static Object printStackTrace(final ScriptObject errObj) {
+        final Object exception = getException(errObj);
+        //TODO context err instead of System.err default
+        if (exception instanceof Throwable) {
+            ((Throwable)exception).printStackTrace();
+        } else {
+            System.err.println("<stack trace not available>");
+        }
+        return UNDEFINED;
+    }
+
+    /**
+     * Get the line number for a {@code ScriptObject} representing an error
+     *
+     * @param errObj the error object
+     * @return the line number, or undefined if wrapped exception is not a ParserException
+     */
+    public static Object getLineNumber(final ScriptObject errObj) {
+        final Object e = getException(errObj);
+        if (e instanceof NashornException) {
+            return ((NashornException)e).getLineNumber();
+        } else if (e instanceof ScriptException) {
+            return ((ScriptException)e).getLineNumber();
+        }
+
+        return UNDEFINED;
+    }
+
+    /**
+     * Get the column number for a {@code ScriptObject} representing an error
+     *
+     * @param errObj the error object
+     * @return the column number, or undefined if wrapped exception is not a ParserException
+     */
+    public static Object getColumnNumber(final ScriptObject errObj) {
+        final Object e = getException(errObj);
+        if (e instanceof NashornException) {
+            return ((NashornException)e).getColumnNumber();
+        } else if (e instanceof ScriptException) {
+            return ((ScriptException)e).getColumnNumber();
+        }
+
+        return UNDEFINED;
+    }
+
+    /**
+     * Get the file name for a {@code ScriptObject} representing an error
+     *
+     * @param errObj the error object
+     * @return the file name, or undefined if wrapped exception is not a ParserException
+     */
+    public static Object getFileName(final ScriptObject errObj) {
+        final Object e = getException(errObj);
+        if (e instanceof NashornException) {
+            return ((NashornException)e).getFileName();
+        } else if (e instanceof ScriptException) {
+            return ((ScriptException)e).getFileName();
+        }
+
+        return UNDEFINED;
+    }
+
+    /**
+     * Stateless string conversion for an error object
+     *
+     * @param errObj the error object
+     * @return string representation of {@code errObj}
+     */
+    public static String safeToString(final ScriptObject errObj) {
+        Object name = UNDEFINED;
+        try {
+            name = errObj.get("name");
+        } catch (final Exception e) {
+            //ignored
+        }
+
+        if (name == UNDEFINED) {
+            name = "Error";
+        } else {
+            name = ScriptRuntime.safeToString(name);
+        }
+
+        Object msg = UNDEFINED;
+        try {
+            msg = errObj.get("message");
+        } catch (final Exception e) {
+            //ignored
+        }
+
+        if (msg == UNDEFINED) {
+            msg = "";
+        } else {
+            msg = ScriptRuntime.safeToString(msg);
+        }
+
+        if (((String)name).isEmpty()) {
+            return (String)msg;
+        }
+
+        if (((String)msg).isEmpty()) {
+            return (String)name;
+        }
+
+        return (String)name + ": " + (String)msg;
+    }
+
+    private static Throwable asThrowable(final Object obj) {
+        return (obj instanceof Throwable)? (Throwable)obj : null;
+    }
+
+    private void setExceptionToThrown() {
+        /*
+         * Nashorn extension: errorObject.nashornException
+         * Expose this exception via "nashornException" property of on the
+         * thrown object. This exception object can be used to print stack
+         * trace and fileName, line number etc. from script code.
+         */
+
+        if (thrown instanceof ScriptObject) {
+            final ScriptObject sobj = (ScriptObject)thrown;
+            if (!sobj.has(EXCEPTION_PROPERTY)) {
+                sobj.addOwnProperty(EXCEPTION_PROPERTY, Property.NOT_ENUMERABLE, this);
+            }
+        }
+    }
+
+    private void setLocationFromStack() {
+        // This is not so pretty - but it gets the job done. Note that the stack
+        // trace has been already filled by "fillInStackTrace" call from Throwable
+        // constructor and so we don't pay additional cost for it.
+
+        // Find the first JavaScript frame by walking and set file, line from it
+        // Usually, we should be able to find it in just few frames depth.
+        for (final StackTraceElement ste : getStackTrace()) {
+            if (isScriptFrame(ste)) {
+                // Whatever here is compiled from JavaScript code
+                setFileName(ste.getFileName());
+                setLineNumber(ste.getLineNumber());
+                // Hard luck - no column number info
+                setColumnNumber(-1);
+                break;
+            }
+        }
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ErrorManager.java b/nashorn/src/jdk/nashorn/internal/runtime/ErrorManager.java
new file mode 100644
index 00000000000..3e08a7c6670
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ErrorManager.java
@@ -0,0 +1,236 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import static jdk.nashorn.internal.runtime.ECMAErrors.rangeError;
+
+import java.io.PrintWriter;
+import jdk.nashorn.internal.parser.Token;
+
+/**
+ * Handles JavaScript error reporting.
+ */
+public class ErrorManager {
+    // TODO - collect and sort/collapse error messages.
+    // TODO - property based error messages.
+    /** Reporting writer. */
+    private final PrintWriter writer;
+
+    /** Error count. */
+    private int errors;
+
+    /** Warning count */
+    private int warnings;
+
+    /** Limit of the number of messages. */
+    private int limit;
+
+    /** Treat warnings as errors. */
+    private boolean warningsAsErrors;
+
+    /**
+     * Constructor
+     */
+    public ErrorManager() {
+        this(new PrintWriter(System.err, true));
+    }
+
+    /**
+     * Constructor.
+     * @param writer I/O writer to report on.
+     */
+    public ErrorManager(final PrintWriter writer) {
+        this.writer           = writer;
+        this.limit            = 100;
+        this.warningsAsErrors = false;
+    }
+
+    /**
+     * Check to see if number of errors exceed limit.
+     */
+    private void checkLimit() {
+        int count = errors;
+
+        if (warningsAsErrors) {
+            count += warnings;
+        }
+
+        if (limit != 0 && count > limit) {
+            rangeError(Context.getGlobal(), "too.many.errors", Integer.toString(limit));
+        }
+    }
+
+    /**
+     * Format an error message to include source and line information.
+     * @param message Error message string.
+     * @param source  Source file information.
+     * @param line    Source line number.
+     * @param column  Source column number.
+     * @param token   Offending token descriptor.
+     * @return formatted string
+     */
+    public static String format(final String message, final Source source, final int line, final int column, final long token) {
+        final String        eoln     = System.lineSeparator();
+        final int           position = Token.descPosition(token);
+        final StringBuilder sb       = new StringBuilder();
+
+        // Source description and message.
+        sb.append(source.getName()).
+            append(':').
+            append(line).
+            append(':').
+            append(column).
+            append(' ').
+            append(message).
+            append(eoln);
+
+        // Source content.
+        final String sourceLine = source.getSourceLine(position);
+        sb.append(sourceLine).append(eoln);
+
+        // Pointer to column.
+        for (int i = 0; i < column; i++) {
+            if (sourceLine.charAt(i) == '\t') {
+                sb.append('\t');
+            } else {
+                sb.append(' ');
+            }
+        }
+
+        sb.append('^');
+        // Use will append eoln.
+        // buffer.append(eoln);
+
+        return sb.toString();
+    }
+
+    /**
+     * Report an error using information provided by the ParserException
+     *
+     * @param e ParserException object
+     */
+
+    public void error(final ParserException e) {
+        error(e.getMessage());
+    }
+
+    /**
+     * Report an error message provided
+     *
+     * @param message Error message string.
+     */
+    public void error(final String message) {
+        writer.println(message);
+        writer.flush();
+        errors++;
+        checkLimit();
+    }
+
+    /**
+     * Report a warning using information provided by the ParserException
+     *
+     * @param e ParserException object
+     */
+    public void warning(final ParserException e) {
+        warning(e.getMessage());
+    }
+
+    /**
+     * Report a warning message provided
+     *
+     * @param message Error message string.
+     */
+    public void warning(final String message) {
+        writer.println(message);
+        writer.flush();
+        warnings++;
+        checkLimit();
+    }
+
+    /**
+     * Test to see if errors have occurred.
+     * @return True if errors.
+     */
+    public boolean hasErrors() {
+        return errors != 0;
+    }
+
+    /**
+     * Get the message limit
+     * @return max number of messages
+     */
+    public int getLimit() {
+        return limit;
+    }
+
+    /**
+     * Set the message limit
+     * @param limit max number of messages
+     */
+    public void setLimit(final int limit) {
+        this.limit = limit;
+    }
+
+    /**
+     * Check whether warnings should be treated like errors
+     * @return true if warnings should be treated like errors
+     */
+    public boolean isWarningsAsErrors() {
+        return warningsAsErrors;
+    }
+
+    /**
+     * Set warnings to be treated as errors
+     * @param warningsAsErrors true if warnings should be treated as errors, false otherwise
+     */
+    public void setWarningsAsErrors(final boolean warningsAsErrors) {
+        this.warningsAsErrors = warningsAsErrors;
+    }
+
+    /**
+     * Get the number of errors
+     * @return number of errors
+     */
+    public int getNumberOfErrors() {
+        return errors;
+    }
+
+    /**
+     * Get number of warnings
+     * @return number of warnings
+     */
+    public int getNumberOfWarnings() {
+        return warnings;
+    }
+
+    /**
+     * Clear warnings and error count.
+     */
+    void reset() {
+        warnings = 0;
+        errors = 0;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/FindProperty.java b/nashorn/src/jdk/nashorn/internal/runtime/FindProperty.java
new file mode 100644
index 00000000000..1fb75569f60
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/FindProperty.java
@@ -0,0 +1,209 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+
+import java.lang.invoke.MethodHandle;
+import jdk.nashorn.internal.codegen.objects.ObjectClassGenerator;
+
+/**
+ * This class represents the result from a find property search.
+ */
+public final class FindProperty {
+    private final ScriptObject self;
+    private final ScriptObject prototype;
+    private final PropertyMap  map;
+    private final Property     property;
+    private final int          depth;
+    private final boolean      isScope;
+
+    /**
+     * Constructor
+     *
+     * @param self      script object where property was found
+     * @param prototype prototype where property was found, may be {@code self} if not inherited
+     * @param map       property map for script object
+     * @param property  property that was search result
+     * @param depth     depth walked in property chain to find result
+     */
+    public FindProperty(final ScriptObject self, final ScriptObject prototype, final PropertyMap map, final Property property, final int depth) {
+        this.self      = self;
+        this.prototype = prototype;
+        this.map       = map;
+        this.property  = property;
+        this.depth     = depth;
+        this.isScope   = prototype.isScope();
+    }
+
+    /**
+     * Get ScriptObject for search
+     * @return script object
+     */
+    public ScriptObject getSelf() {
+        return self;
+    }
+
+    /**
+     * Get search depth
+     * @return depth
+     */
+    public int getDepth() {
+        return depth;
+    }
+
+    /**
+     * Get flags for property that was found
+     * @return property flags for property returned in {@link FindProperty#getProperty()}
+     */
+    public int getFlags() {
+        return property.getFlags();
+    }
+
+    /**
+     * Ask for a getter that returns the given type. The type has nothing to do with the
+     * internal representation of the property. It may be an Object (boxing primitives) or
+     * a primitive (primitive fields with -Dnashorn.fields.dual=true)
+     * @see ObjectClassGenerator
+     *
+     * @param type type of getter, e.g. int.class if we want a function with {@code get()I} signature
+     * @return method handle for the getter
+     */
+    public MethodHandle getGetter(final Class<?> type) {
+        MethodHandle getter = property.getGetter(type);
+        if (property instanceof UserAccessorProperty) {
+            final UserAccessorProperty uc = (UserAccessorProperty)property;
+            getter = MH.insertArguments(getter, 0, isInherited() ? getOwner() : null, uc.getGetterSlot());
+        }
+        return getter;
+    }
+
+    /**
+     * In certain properties, such as {@link UserAccessorProperty}, getter and setter functions
+     * are present. This function gets the getter function as a {@code ScriptFunction}
+     * @return getter function, or null if not present
+     */
+    public ScriptFunction getGetterFunction() {
+        return property.getGetterFunction(getOwner());
+    }
+
+    /**
+     * Return the property map where the property was found
+     * @return property map
+     */
+    public PropertyMap getMap() {
+        return map;
+    }
+
+    /**
+     * Return the property that was found
+     * @return property
+     */
+    public Property getProperty() {
+        return property;
+    }
+
+    /**
+     * Check if the property found was inherited, i.e. not directly in the self
+     * @return true if inherited property
+     */
+    public boolean isInherited() {
+        return self != prototype;
+    }
+
+    /**
+     * Check if the property found was NOT inherited, i.e. defined in the script
+     * object, rather than in the prototype
+     * @return true if not inherited
+     */
+    public boolean isSelf() {
+        return self == prototype;
+    }
+
+    /**
+     * Check if the property is in the scope
+     * @return true if on scope
+     */
+    public boolean isScope() {
+        return isScope;
+    }
+
+    /**
+     * Return the {@code ScriptObject} owning of the property:  this means the prototype.
+     * @return owner of property
+     */
+    public ScriptObject getOwner() {
+        return prototype;
+    }
+
+    /**
+     * Ask for a setter that sets the given type. The type has nothing to do with the
+     * internal representation of the property. It may be an Object (boxing primitives) or
+     * a primitive (primitive fields with -Dnashorn.fields.dual=true)
+     * @see ObjectClassGenerator
+     *
+     * @param type type of setter, e.g. int.class if we want a function with {@code set(I)V} signature
+     * @param strict are we in strict mode
+     *
+     * @return method handle for the getter
+     */
+    public MethodHandle getSetter(final Class<?> type, final boolean strict) {
+        MethodHandle setter = property.getSetter(type, getOwner().getMap());
+        if (property instanceof UserAccessorProperty) {
+            final UserAccessorProperty uc = (UserAccessorProperty) property;
+            setter = MH.insertArguments(setter, 0, (isInherited() ? getOwner() : null),
+                    uc.getSetterSlot(), strict? property.getKey() : null);
+        }
+
+        return setter;
+    }
+
+    /**
+     * In certain properties, such as {@link UserAccessorProperty}, getter and setter functions
+     * are present. This function gets the setter function as a {@code ScriptFunction}
+     * @return setter function, or null if not present
+     */
+    public ScriptFunction getSetterFunction() {
+        return property.getSetterFunction(getOwner());
+    }
+
+    /**
+     * Check if the property found is configurable
+     * @return true if configurable
+     */
+    public boolean isConfigurable() {
+        return property.isConfigurable();
+    }
+
+    /**
+     * Check if the property found is writable
+     * @return true if writable
+     */
+    public boolean isWritable() {
+        return property.isWritable();
+    }
+}
+
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/FunctionScope.java b/nashorn/src/jdk/nashorn/internal/runtime/FunctionScope.java
new file mode 100644
index 00000000000..c6a0e110b31
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/FunctionScope.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+/**
+ * This is the base class for function scopes.  Subclasses of this class are
+ * produced by the ObjectClassGenerator along with additional fields for storing
+ * local vars.  The number of fields required is determined by ObjectCreator.
+ *
+ * The scope is also responsible for handling the var arg 'arguments' object,
+ * though most of the access is via generated code.
+ *
+ * The constructor of this class is responsible for any function prologue
+ * involving the scope.
+ *
+ * TODO see NASHORN-715.
+ */
+public class FunctionScope extends ScriptObject implements Scope {
+
+    /** Area to store scope arguments. (public for access from scripts.) */
+    public final Object arguments;
+
+    /** Flag to indicate that a split method issued a return statement */
+    private int splitState = -1;
+
+    /**
+     * Constructor
+     *
+     * @param map         property map
+     * @param callerScope caller scope
+     * @param arguments   arguments
+     */
+    public FunctionScope(final PropertyMap map, final ScriptObject callerScope, final Object arguments) {
+        super(map);
+        this.arguments = arguments;
+        setProto(callerScope);
+        setIsScope();
+    }
+
+    /**
+     * Constructor
+     *
+     * @param map         property map
+     * @param callerScope caller scope
+     */
+    public FunctionScope(final PropertyMap map, final ScriptObject callerScope) {
+        super(map);
+        this.arguments = null;
+        setProto(callerScope);
+        setIsScope();
+    }
+
+    /**
+     * Get the current split state.
+     * @return current split state
+     */
+    @Override
+    public int getSplitState() {
+        return splitState;
+    }
+
+    /**
+     * Set the current split state.
+     * @param state current split state
+     */
+    @Override
+    public void setSplitState(final int state) {
+        splitState = state;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/GlobalFunctions.java b/nashorn/src/jdk/nashorn/internal/runtime/GlobalFunctions.java
new file mode 100644
index 00000000000..ae08959880e
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/GlobalFunctions.java
@@ -0,0 +1,460 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import static jdk.nashorn.internal.runtime.JSType.digit;
+import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+
+/**
+ * Utilities used by Global class.
+ *
+ * These are actual implementation methods for functions exposed by global
+ * scope. The code lives here to share the code across the contexts.
+ */
+public class GlobalFunctions {
+
+    /** Methodhandle to implementation of ECMA 15.1.2.2, parseInt */
+    public static final MethodHandle PARSEINT = findOwnMH("parseInt",   double.class, Object.class, Object.class, Object.class);
+
+    /** Methodhandle to implementation of ECMA 15.1.2.3, parseFloat */
+    public static final MethodHandle PARSEFLOAT = findOwnMH("parseFloat", double.class, Object.class, Object.class);
+
+    /** Methodhandle to implementation of ECMA 15.1.2.4, isNaN */
+    public static final MethodHandle IS_NAN = findOwnMH("isNaN",      boolean.class, Object.class, Object.class);
+
+    /** Methodhandle to implementation of ECMA 15.1.2.5, isFinite */
+    public static final MethodHandle IS_FINITE = findOwnMH("isFinite",   boolean.class, Object.class, Object.class);
+
+    /** Methodhandle to implementation of ECMA 15.1.3.3, encodeURI */
+    public static final MethodHandle ENCODE_URI = findOwnMH("encodeURI",  Object.class, Object.class, Object.class);
+
+    /** Methodhandle to implementation of ECMA 15.1.3.4, encodeURIComponent */
+    public static final MethodHandle ENCODE_URICOMPONENT = findOwnMH("encodeURIComponent", Object.class, Object.class, Object.class);
+
+    /** Methodhandle to implementation of ECMA 15.1.3.1, decodeURI */
+    public static final MethodHandle DECODE_URI = findOwnMH("decodeURI", Object.class, Object.class, Object.class);
+
+    /** Methodhandle to implementation of ECMA 15.1.3.2, decodeURIComponent */
+    public static final MethodHandle DECODE_URICOMPONENT = findOwnMH("decodeURIComponent", Object.class, Object.class, Object.class);
+
+    /** Methodhandle to implementation of ECMA B.2.1, escape */
+    public static final MethodHandle ESCAPE = findOwnMH("escape",    String.class, Object.class, Object.class);
+
+    /** Methodhandle to implementation of ECMA B.2.2, unescape */
+    public static final MethodHandle UNESCAPE = findOwnMH("unescape",  String.class, Object.class, Object.class);
+
+    /** Methodhandle to implementation of ECMA 15.3.4, "anonymous" - Properties of the Function Prototype Object. */
+    public static final MethodHandle ANONYMOUS = findOwnMH("anonymous", Object.class, Object.class);
+
+    private static final String UNESCAPED = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789@*_+-./";
+
+    private GlobalFunctions() {
+    }
+
+    /**
+     * ECMA 15.1.2.2 parseInt implementation
+     *
+     * TODO: specialize
+     *
+     * @param self   self reference
+     * @param string string to parse
+     * @param rad    radix
+     *
+     * @return numeric type representing string contents as an int (TODO: specialize for int case)
+     */
+    //TODO specialize
+    public static double parseInt(final Object self, final Object string, final Object rad) {
+        final String str    = JSType.trimLeft(JSType.toString(string));
+        final int    length = str.length();
+
+        // empty string is not valid
+        if (length == 0) {
+            return Double.NaN;
+        }
+
+        boolean negative = false;
+        int idx = 0;
+
+        // checking for the sign character
+        final char firstChar = str.charAt(idx);
+        if (firstChar < '0') {
+            // Possible leading "+" or "-"
+            if (firstChar == '-') {
+                negative = true;
+            } else if (firstChar != '+') {
+                return Double.NaN;
+            }
+            // skip the sign character
+            idx++;
+        }
+
+        boolean stripPrefix = true;
+        int     radix = JSType.toInt32(rad);
+
+        if (radix != 0) {
+            if (radix < 2 || radix > 36) {
+                return Double.NaN;
+            }
+            if (radix != 16) {
+                stripPrefix = false;
+            }
+        } else {
+            // default radix
+            radix = 10;
+        }
+        // strip "0x" or "0X" and treat radix as 16
+        if (stripPrefix && ((idx + 1) < length)) {
+            final char c1 = str.charAt(idx);
+            final char c2 = str.charAt(idx + 1);
+            if (c1 == '0' && (c2 == 'x' || c2 == 'X')) {
+                radix = 16;
+                // skip "0x" or "0X"
+                idx += 2;
+            }
+        }
+
+        double result = 0.0;
+        int digit;
+        // we should see atleast one valid digit
+        boolean entered = false;
+        while (idx < length) {
+            digit = digit(str.charAt(idx++), radix, true);
+            if (digit < 0) {
+                break;
+            }
+            // we have seen atleast one valid digit in the specified radix
+            entered = true;
+            result *= radix;
+            result += digit;
+        }
+
+        return entered ? (negative ? -result : result) : Double.NaN;
+    }
+
+    /**
+     * ECMA 15.1.2.3 parseFloat implementation
+     *
+     * @param self   self reference
+     * @param string string to parse
+     *
+     * @return numeric type representing string contents
+     */
+    public static double parseFloat(final Object self, final Object string) {
+        final String str    = JSType.trimLeft(JSType.toString(string));
+        final int    length = str.length();
+
+        // empty string is not valid
+        if (length == 0) {
+            return Double.NaN;
+        }
+
+        int     start    = 0;
+        boolean negative = false;
+        char    ch       = str.charAt(0);
+
+        if (ch == '-') {
+            start++;
+            negative = true;
+        } else if (ch == '+') {
+            start++;
+        } else if (ch == 'N') {
+            if (str.startsWith("NaN")) {
+                return Double.NaN;
+            }
+        }
+
+        if (start == length) {
+            // just the sign character
+            return Double.NaN;
+        }
+
+        ch = str.charAt(start);
+        if (ch == 'I') {
+            if (str.substring(start).startsWith("Infinity")) {
+                return negative? Double.NEGATIVE_INFINITY : Double.POSITIVE_INFINITY;
+            }
+        }
+
+        boolean dotSeen    = false;
+        boolean exponentOk = false;
+        int exponentOffset = -1;
+        int end;
+
+loop:
+        for (end = start; end < length; end++) {
+            ch = str.charAt(end);
+
+            switch (ch) {
+            case '.':
+                // dot allowed only once
+                if (dotSeen) {
+                    break loop;
+                }
+                dotSeen = true;
+                break;
+
+            case 'e':
+            case 'E':
+                // 'e'/'E' allow only once
+                if (exponentOffset != -1) {
+                    break loop;
+                }
+                exponentOffset = end;
+                break;
+
+            case '+':
+            case '-':
+                // Sign of the exponent. But allowed only if the
+                // previous char in the string was 'e' or 'E'.
+                if (exponentOffset != end - 1) {
+                    break loop;
+                }
+                break;
+
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+                if (exponentOffset != -1) {
+                    // seeing digit after 'e' or 'E'
+                    exponentOk = true;
+                }
+                break;
+
+            default: // ignore garbage at the end
+                break loop;
+            }
+        }
+
+        // ignore 'e'/'E' followed by '+/-' if not real exponent found
+        if (exponentOffset != -1 && !exponentOk) {
+            end = exponentOffset;
+        }
+
+        if (start == end) {
+            return Double.NaN;
+        }
+
+        try {
+            final double result = Double.valueOf(str.substring(start, end));
+            return negative ? -result : result;
+        } catch (final NumberFormatException e) {
+            return Double.NaN;
+        }
+    }
+
+    /**
+     * ECMA 15.1.2.4, isNaN implementation
+     *
+     * @param self    self reference
+     * @param number  number to check
+     *
+     * @return true if number is NaN
+     */
+    public static boolean isNaN(final Object self, final Object number) {
+        return Double.isNaN(JSType.toNumber(number));
+    }
+
+    /**
+     * ECMA 15.1.2.5, isFinite implementation
+     *
+     * @param self   self reference
+     * @param number number to check
+     *
+     * @return true if number is infinite
+     */
+    public static boolean isFinite(final Object self, final Object number) {
+        final double value = JSType.toNumber(number);
+        return ! (Double.isInfinite(value) || Double.isNaN(value));
+    }
+
+
+    /**
+     * ECMA 15.1.3.3, encodeURI implementation
+     *
+     * @param self  self reference
+     * @param uri   URI to encode
+     *
+     * @return encoded URI
+     */
+    public static Object encodeURI(final Object self, final Object uri) {
+        return URIUtils.encodeURI(self, JSType.toString(uri));
+    }
+
+    /**
+     * ECMA 15.1.3.4, encodeURIComponent implementation
+     *
+     * @param self  self reference
+     * @param uri   URI component to encode
+     *
+     * @return encoded URIComponent
+     */
+    public static Object encodeURIComponent(final Object self, final Object uri) {
+        return URIUtils.encodeURIComponent(self, JSType.toString(uri));
+    }
+
+    /**
+     * ECMA 15.1.3.1, decodeURI implementation
+     *
+     * @param self  self reference
+     * @param uri   URI to decode
+     *
+     * @return decoded URI
+     */
+    public static Object decodeURI(final Object self, final Object uri) {
+        return URIUtils.decodeURI(self, JSType.toString(uri));
+    }
+
+    /**
+     * ECMA 15.1.3.2, decodeURIComponent implementation
+     *
+     * @param self  self reference
+     * @param uri   URI component to encode
+     *
+     * @return decoded URI
+     */
+    public static Object decodeURIComponent(final Object self, final Object uri) {
+        return URIUtils.decodeURIComponent(self, JSType.toString(uri));
+    }
+
+    /**
+     * ECMA B.2.1, escape implementation
+     *
+     * @param self    self reference
+     * @param string  string to escape
+     *
+     * @return escaped string
+     */
+    public static String escape(final Object self, final Object string) {
+        final String str = JSType.toString(string);
+        final int length = str.length();
+
+        if (length == 0) {
+            return str;
+        }
+
+        final StringBuilder sb = new StringBuilder();
+        for (int k = 0; k < length; k++) {
+            final char ch = str.charAt(k);
+            if (UNESCAPED.indexOf(ch) != -1) {
+                sb.append(ch);
+            } else if (ch < 256) {
+                sb.append('%');
+                final byte b = (byte)ch;
+                sb.append(Integer.toHexString(b & 0xFF).toUpperCase());
+            } else {
+                sb.append("%u");
+                sb.append(Integer.toHexString(ch & 0xFFFF).toUpperCase());
+            }
+        }
+
+        return sb.toString();
+    }
+
+    /**
+     * ECMA B.2.2, unescape implementation
+     *
+     * @param self    self reference
+     * @param string  string to unescape
+     *
+     * @return unescaped string
+     */
+    public static String unescape(final Object self, final Object string) {
+        final String str    = JSType.toString(string);
+        final int    length = str.length();
+
+        if (length == 0) {
+            return str;
+        }
+
+        final StringBuilder sb = new StringBuilder();
+        for (int k = 0; k < length; k++) {
+            char ch = str.charAt(k);
+            if (ch != '%') {
+                sb.append(ch);
+            } else {
+                if (k < (length - 5)) {
+                   if (str.charAt(k + 1) == 'u') {
+                       try {
+                           ch = (char) Integer.parseInt(str.substring(k + 2, k + 6), 16);
+                           sb.append(ch);
+                           k += 5;
+                           continue;
+                       } catch (final NumberFormatException e) {
+                           //ignored
+                       }
+                   }
+                }
+
+                if (k < (length - 2)) {
+                    try {
+                        ch = (char) Integer.parseInt(str.substring(k + 1, k + 3), 16);
+                        sb.append(ch);
+                        k += 2;
+                        continue;
+                    } catch (final NumberFormatException e) {
+                        //ignored
+                    }
+                }
+
+                // everything fails
+                sb.append(ch);
+            }
+        }
+
+        return sb.toString();
+    }
+
+
+    /**
+     * ECMA 15.3.4 Properties of the Function Prototype Object.
+     * The Function prototype object is itself a Function object
+     * (its [[Class]] is "Function") that, when invoked, accepts
+     * any arguments and returns undefined. This method is used to
+     * implement that anonymous function.
+     *
+     * @param self  self reference
+     *
+     * @return undefined
+     */
+    public static Object anonymous(final Object self) {
+        return ScriptRuntime.UNDEFINED;
+    }
+
+    private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
+        return MH.findStatic(MethodHandles.lookup(), GlobalFunctions.class, name, MH.type(rtype, types));
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/GlobalObject.java b/nashorn/src/jdk/nashorn/internal/runtime/GlobalObject.java
new file mode 100644
index 00000000000..b8e2450a613
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/GlobalObject.java
@@ -0,0 +1,238 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import java.lang.invoke.MethodHandle;
+import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
+import org.dynalang.dynalink.linker.GuardedInvocation;
+
+/**
+ * Runtime interface to the global scope of the current context.
+ * NOTE: never access {@code jdk.nashorn.internal.objects.Global} class directly
+ * from runtime/parser/codegen/ir etc. Always go through this interface.
+ * <p>
+ * The reason for this is that all objects in the @{code jdk.nashorn.internal.objects.*} package
+ * are different per Context and loaded separately by each Context class loader. Attempting
+ * to directly refer to an object in this package from the rest of the runtime
+ * will lead to {@code ClassNotFoundException} thrown upon link time
+ */
+
+public interface GlobalObject {
+    /**
+     * Initialize standard builtin objects like "Object", "Array", "Function" etc.
+     * as well as our extension builtin objects like "Java", "JSAdapter" as properties
+     * of the global scope object.
+     */
+    public void initBuiltinObjects();
+
+    /**
+     * Wrapper for {@link jdk.nashorn.internal.objects.Global#newScriptFunction(String, MethodHandle, ScriptObject, boolean)}
+     *
+     * @param name   function name
+     * @param handle invocation handle for function
+     * @param scope  the scope
+     * @param strict are we in strict mode
+     *
+     * @return new script function
+     */
+   public ScriptFunction newScriptFunction(String name, MethodHandle handle, ScriptObject scope, boolean strict);
+
+    /**
+     * Wrapper for {@link jdk.nashorn.internal.objects.Global#wrapAsObject(Object)}
+     *
+     * @param obj object to wrap
+     * @return    wrapped object
+     */
+   public Object wrapAsObject(Object obj);
+
+    /**
+     * Wrapper for {@link jdk.nashorn.internal.objects.Global#numberLookup(NashornCallSiteDescriptor, Number)}
+     *
+     * @param callSite call site descriptor
+     * @param self     self reference
+     *
+     * @return guarded invocation
+     */
+   public GuardedInvocation numberLookup(NashornCallSiteDescriptor callSite, Number self);
+
+    /**
+     * Wrapper for {@link jdk.nashorn.internal.objects.Global#stringLookup(NashornCallSiteDescriptor, CharSequence)}
+     *
+     * @param callSite call site descriptor
+     * @param self     self reference
+     *
+     * @return guarded invocation
+     */
+   public GuardedInvocation stringLookup(NashornCallSiteDescriptor callSite, CharSequence self);
+
+    /**
+     * Wrapper for {@link jdk.nashorn.internal.objects.Global#booleanLookup(NashornCallSiteDescriptor, Boolean)}
+     *
+     * @param callSite call site descriptor
+     * @param self     self reference
+     *
+     * @return guarded invocation
+     */
+   public GuardedInvocation booleanLookup(NashornCallSiteDescriptor callSite, Boolean self);
+
+    /**
+     * Wrapper for {@link jdk.nashorn.internal.objects.Global#newObject()}
+     *
+     * @return the new ScriptObject
+     */
+   public ScriptObject newObject();
+
+    /**
+     * Wrapper for {@link jdk.nashorn.internal.objects.Global#isError(ScriptObject)}
+     *
+     * @param sobj to check if it is an error object
+     * @return true if error object
+     */
+   public boolean isError(ScriptObject sobj);
+
+    /**
+     * Wrapper for {@link jdk.nashorn.internal.objects.Global#newError(String)}
+     *
+     * @param msg the error message
+     *
+     * @return the new ScriptObject representing the error
+     */
+   public ScriptObject newError(String msg);
+
+    /**
+     * Wrapper for {@link jdk.nashorn.internal.objects.Global#newEvalError(String)}
+     *
+     * @param msg the error message
+     *
+     * @return the new ScriptObject representing the eval error
+     */
+   public ScriptObject newEvalError(String msg);
+
+    /**
+     * Wrapper for {@link jdk.nashorn.internal.objects.Global#newRangeError(String)}
+     *
+     * @param msg the error message
+     *
+     * @return the new ScriptObject representing the range error
+     */
+   public ScriptObject newRangeError(String msg);
+
+    /**
+     * Wrapper for {@link jdk.nashorn.internal.objects.Global#newReferenceError(String)}
+     *
+     * @param msg the error message
+     *
+     * @return the new ScriptObject representing the reference error
+     */
+   public ScriptObject newReferenceError(String msg);
+
+    /**
+     * Wrapper for {@link jdk.nashorn.internal.objects.Global#newSyntaxError(String)}
+     *
+     * @param msg the error message
+     *
+     * @return the new ScriptObject representing the syntax error
+     */
+   public ScriptObject newSyntaxError(String msg);
+
+    /**
+     * Wrapper for {@link jdk.nashorn.internal.objects.Global#newTypeError(String)}
+     *
+     * @param msg the error message
+     *
+     * @return the new ScriptObject representing the type error
+     */
+   public ScriptObject newTypeError(String msg);
+
+    /**
+     * Wrapper for {@link jdk.nashorn.internal.objects.Global#newURIError(String)}
+     *
+     * @param msg the error message
+     *
+     * @return the new ScriptObject representing the URI error
+     */
+    public ScriptObject newURIError(String msg);
+
+    /**
+     * Wrapper for {@link jdk.nashorn.internal.objects.Global#newGenericDescriptor(boolean, boolean)}
+     *
+     * @param configurable is the described property configurable
+     * @param enumerable   is the described property enumerable
+     *
+     * @return property descriptor
+     */
+    public PropertyDescriptor newGenericDescriptor(boolean configurable, boolean enumerable);
+
+    /**
+     * Wrapper for {@link jdk.nashorn.internal.objects.Global#newDataDescriptor(Object, boolean, boolean, boolean)}
+     *
+     * @param value        data value
+     * @param configurable is the described property configurable
+     * @param enumerable   is the described property enumerable
+     * @param writable     is the described property writable
+     *
+     * @return property descriptor
+     */
+    public PropertyDescriptor newDataDescriptor(Object value, boolean configurable, boolean enumerable, boolean writable);
+
+    /**
+     * Wrapper for {@link jdk.nashorn.internal.objects.Global#newAccessorDescriptor(Object, Object, boolean, boolean)}
+     *
+     * @param get          property getter, or null if none
+     * @param set          property setter, or null if none
+     * @param configurable is the described property configurable
+     * @param enumerable   is the described property enumerable
+     *
+     * @return property descriptor
+     */
+    public PropertyDescriptor newAccessorDescriptor(Object get, Object set, boolean configurable, boolean enumerable);
+
+    /**
+     * Wrapper for {@link jdk.nashorn.internal.objects.Global#getDefaultValue(ScriptObject, Class)}
+     *
+     * @param sobj     script object
+     * @param typeHint type hint
+     *
+     * @return default value
+     */
+    public Object getDefaultValue(ScriptObject sobj, Class<?> typeHint);
+
+    /**
+     * Find the compiled Class for the given script source, if available
+     *
+     * @param source Source object of the script
+     * @return compiled Class object or null
+     */
+    public Class<?> findCachedClass(Source source);
+
+    /**
+     * Put the Source associated Class object in the Source-to-Class cache
+     *
+     * @param source Source of the script
+     * @param clazz compiled Class object for the source
+     */
+    public void cacheClass(Source source, Class<?> clazz);
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/JSErrorType.java b/nashorn/src/jdk/nashorn/internal/runtime/JSErrorType.java
new file mode 100644
index 00000000000..89362403c6b
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/JSErrorType.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+/**
+ * Native ECMAScript Error types.
+ */
+public enum JSErrorType {
+    /** Generic error */
+    ERROR,
+    /** EvalError */
+    EVAL_ERROR,
+    /** RangeError */
+    RANGE_ERROR,
+    /** Reference Error */
+    REFERENCE_ERROR,
+    /** Syntax Error */
+    SYNTAX_ERROR,
+    /** Type Error */
+    TYPE_ERROR,
+    /** URI Error */
+    URI_ERROR
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/JSType.java b/nashorn/src/jdk/nashorn/internal/runtime/JSType.java
new file mode 100644
index 00000000000..b3d0b7e7a96
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/JSType.java
@@ -0,0 +1,928 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import static jdk.nashorn.internal.codegen.CompilerConstants.staticCall;
+import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+
+import jdk.nashorn.internal.codegen.CompilerConstants.Call;
+import jdk.nashorn.internal.parser.Lexer;
+import org.dynalang.dynalink.beans.StaticClass;
+
+/**
+ * Representation for ECMAScript types - this maps directly to the ECMA script standard
+ */
+public enum JSType {
+    /** The undefined type */
+    UNDEFINED,
+
+    /** The null type */
+    NULL,
+
+    /** The boolean type */
+    BOOLEAN,
+
+    /** The number type */
+    NUMBER,
+
+    /** The string type */
+    STRING,
+
+    /** The object type */
+    OBJECT,
+
+    /** The function type */
+    FUNCTION;
+
+    /** Max value for an uint32 in JavaScript */
+    public static final long MAX_UINT = 0xFFFF_FFFFL;
+
+    /** JavaScript compliant conversion function from Object to boolean */
+    public static final Call TO_BOOLEAN = staticCall(JSType.class, "toBoolean", boolean.class, Object.class);
+
+    /** JavaScript compliant conversion function from number to boolean */
+    public static final Call TO_BOOLEAN_D = staticCall(JSType.class, "toBoolean", boolean.class, double.class);
+
+    /** JavaScript compliant conversion function from Object to integer */
+    public static final Call TO_INTEGER = staticCall(JSType.class, "toInteger", int.class, Object.class);
+
+    /** JavaScript compliant conversion function from Object to long */
+    public static final Call TO_LONG = staticCall(JSType.class, "toLong", long.class, Object.class);
+
+    /** JavaScript compliant conversion function from Object to number */
+    public static final Call TO_NUMBER = staticCall(JSType.class, "toNumber", double.class, Object.class);
+
+    /** JavaScript compliant conversion function from Object to int32 */
+    public static final Call TO_INT32 = staticCall(JSType.class, "toInt32", int.class, Object.class);
+
+    /** JavaScript compliant conversion function from double to int32 */
+    public static final Call TO_INT32_D = staticCall(JSType.class, "toInt32", int.class, double.class);
+
+    /** JavaScript compliant conversion function from Object to uint32 */
+    public static final Call TO_UINT32 = staticCall(JSType.class, "toUint32", long.class, Object.class);
+
+    /** JavaScript compliant conversion function from number to uint32 */
+    public static final Call TO_UINT32_D = staticCall(JSType.class, "toUint32", long.class, double.class);
+
+    /** JavaScript compliant conversion function from Object to int64 */
+    public static final Call TO_INT64 = staticCall(JSType.class, "toInt64", long.class, Object.class);
+
+    /** JavaScript compliant conversion function from number to int64 */
+    public static final Call TO_INT64_D = staticCall(JSType.class, "toInt64", long.class, double.class);
+
+    /** JavaScript compliant conversion function from Object to String */
+    public static final Call TO_STRING = staticCall(JSType.class, "toString", String.class, Object.class);
+
+    /** JavaScript compliant conversion function from number to String */
+    public static final Call TO_STRING_D = staticCall(JSType.class, "toString", String.class, double.class);
+
+    /** JavaScript compliant conversion function from Object to primitive */
+    public static final Call TO_PRIMITIVE = staticCall(JSType.class, "toPrimitive", Object.class,  Object.class);
+
+    /**
+     * The external type name as returned by ECMAScript "typeof" operator
+     *
+     * @return type name for this type
+     */
+    public final String typeName() {
+        // For NULL, "object" has to be returned!
+        return ((this == NULL) ? OBJECT : this).name().toLowerCase();
+    }
+
+    /**
+     * Return the JSType for a given object
+     *
+     * @param obj an object
+     *
+     * @return the JSType for the object
+     */
+    public static JSType of(final Object obj) {
+        if (obj == ScriptRuntime.UNDEFINED) {
+            return JSType.UNDEFINED;
+        }
+
+        if (obj == null) {
+            return JSType.NULL;
+        }
+
+        if (obj instanceof Boolean) {
+            return JSType.BOOLEAN;
+        }
+
+        if (obj instanceof Number) {
+            return JSType.NUMBER;
+        }
+
+        if (obj instanceof String || obj instanceof ConsString) {
+            return JSType.STRING;
+        }
+
+        if (obj instanceof ScriptObject) {
+            return (obj instanceof ScriptFunction) ? JSType.FUNCTION : JSType.OBJECT;
+        }
+
+        if (obj instanceof StaticClass) {
+            return JSType.FUNCTION;
+        }
+
+        return JSType.OBJECT;
+    }
+
+    /**
+     * Returns true if double number can be represented as an int
+     *
+     * @param number a long to inspect
+     *
+     * @return true for int representable longs
+     */
+    public static boolean isRepresentableAsInt(final long number) {
+        return (int)number == number;
+    }
+
+    /**
+     * Returns true if double number can be represented as an int
+     *
+     * @param number a double to inspect
+     *
+     * @return true for int representable doubles
+     */
+    public static boolean isRepresentableAsInt(final double number) {
+        return (int)number == number;
+    }
+
+    /**
+     * Returns true if double number can be represented as a long
+     *
+     * @param number a double to inspect
+     * @return true for long representable doubles
+     */
+    public static boolean isRepresentableAsLong(final double number) {
+        return (long)number == number;
+    }
+
+    /**
+     * Get the smallest integer representation of a number. Returns an Integer
+     * for something that is int representable, and Long for something that
+     * is long representable. If the number needs to be a double, this is an
+     * identity function
+     *
+     * @param number number to check
+     *
+     * @return Number instanceof the narrowest possible integer representation for number
+     */
+    public static Number narrowestIntegerRepresentation(final double number) {
+        if (isRepresentableAsInt(number)) {
+            return (int)number;
+        } else if (isRepresentableAsLong(number)) {
+            return (long)number;
+        } else {
+            return number;
+        }
+    }
+
+    /**
+     * Check whether an object is primitive
+     *
+     * @param obj an object
+     *
+     * @return true if object is primitive (includes null and undefined)
+     */
+   public static boolean isPrimitive(final Object obj) {
+        return obj == null ||
+               obj == ScriptRuntime.UNDEFINED ||
+               obj instanceof Boolean ||
+               obj instanceof Number ||
+               obj instanceof String ||
+               obj instanceof ConsString;
+    }
+
+   /**
+    * Primitive converter for an object
+    *
+    * @param obj an object
+    *
+    * @return primitive form of the object
+    */
+    public static Object toPrimitive(final Object obj) {
+        return toPrimitive(obj, null);
+    }
+
+    /**
+     * Primitive converter for an object including type hint
+     * See ECMA 9.1 ToPrimitive
+     *
+     * @param obj  an object
+     * @param hint a type hint
+     *
+     * @return the primitive form of the object
+     */
+    public static Object toPrimitive(final Object obj, final Class<?> hint) {
+        if (!(obj instanceof ScriptObject)) {
+            return obj;
+        }
+
+        final ScriptObject sobj   = (ScriptObject)obj;
+        final Object       result = sobj.getDefaultValue(hint);
+
+        if (!isPrimitive(result)) {
+            typeError(Context.getGlobal(), "bad.default.value", result.toString());
+        }
+
+        return result;
+    }
+
+    /**
+     * JavaScript compliant conversion of number to boolean
+     *
+     * @param num a number
+     *
+     * @return a boolean
+     */
+    public static boolean toBoolean(final double num) {
+        return num != 0 && !Double.isNaN(num);
+    }
+
+    /**
+     * JavaScript compliant conversion of Object to boolean
+     * See ECMA 9.2 ToBoolean
+     *
+     * @param obj an object
+     *
+     * @return a boolean
+     */
+    public static boolean toBoolean(final Object obj) {
+        if (obj instanceof Boolean) {
+            return (Boolean)obj;
+        }
+
+        if (nullOrUndefined(obj)) {
+            return false;
+        }
+
+        if (obj instanceof Number) {
+            final double num = ((Number)obj).doubleValue();
+            return num != 0 && !Double.isNaN(num);
+        }
+
+        if (obj instanceof String || obj instanceof ConsString) {
+            return ((CharSequence)obj).length() > 0;
+        }
+
+        return true;
+    }
+
+
+    /**
+     * JavaScript compliant converter of Object to String
+     * See ECMA 9.8 ToString
+     *
+     * @param obj an object
+     *
+     * @return a string
+     */
+    public static String toString(final Object obj) {
+        return toStringImpl(obj, false);
+    }
+
+    /**
+     * If obj is an instance of {@link ConsString} cast to CharSequence, else return
+     * result of {@link #toString(Object)}.
+     *
+     * @param obj an object
+     * @return an instance of String or ConsString
+     */
+    public static CharSequence toCharSequence(final Object obj) {
+        if (obj instanceof ConsString) {
+            return (CharSequence) obj;
+        }
+        return toString(obj);
+    }
+
+    /**
+     * Check whether a string is representable as a JavaScript number
+     *
+     * @param str  a string
+     *
+     * @return     true if string can be represented as a number
+     */
+    public static boolean isNumber(final String str) {
+        try {
+            Double.parseDouble(str);
+            return true;
+        } catch (final NumberFormatException e) {
+            return false;
+        }
+    }
+
+    /**
+     * JavaScript compliant conversion of integer to String
+     *
+     * @param num an integer
+     *
+     * @return a string
+     */
+    public static String toString(final int num) {
+        return Integer.toString(num);
+    }
+
+    /**
+     * JavaScript compliant conversion of number to String
+     * See ECMA 9.8.1
+     *
+     * @param num a number
+     *
+     * @return a string
+     */
+    public static String toString(final double num) {
+        if (isRepresentableAsInt(num)) {
+            return Integer.toString((int)num);
+        }
+
+        if (num == Double.POSITIVE_INFINITY) {
+            return "Infinity";
+        }
+
+        if (num == Double.NEGATIVE_INFINITY) {
+            return "-Infinity";
+        }
+
+        if (Double.isNaN(num)) {
+            return "NaN";
+        }
+
+        return NumberToString.stringFor(num);
+    }
+
+    /**
+     * JavaScript compliant conversion of number to String
+     *
+     * @param num   a number
+     * @param radix a radix for the conversion
+     *
+     * @return a string
+     */
+    public static String toString(final double num, final int radix) {
+        assert radix >= 2 && radix <= 36 : "invalid radix";
+
+        if (isRepresentableAsInt(num)) {
+            return Integer.toString((int)num, radix);
+        }
+
+        if (num == Double.POSITIVE_INFINITY) {
+            return "Infinity";
+        }
+
+        if (num == Double.NEGATIVE_INFINITY) {
+            return "-Infinity";
+        }
+
+        if (Double.isNaN(num)) {
+            return "NaN";
+        }
+
+        if (num == 0.0) {
+            return "0";
+        }
+
+        final String chars     = "0123456789abcdefghijklmnopqrstuvwxyz";
+        final StringBuilder sb = new StringBuilder();
+
+        final boolean negative  = num < 0.0;
+        final double  signedNum = negative ? -num : num;
+
+        double intPart = Math.floor(signedNum);
+        double decPart = signedNum - intPart;
+
+        // encode integer part from least significant digit, then reverse
+        do {
+            sb.append(chars.charAt((int) (intPart % radix)));
+            intPart /= radix;
+        } while (intPart >= 1.0);
+
+        if (negative) {
+            sb.append('-');
+        }
+        sb.reverse();
+
+        // encode decimal part
+        if (decPart > 0.0) {
+            final int dot = sb.length();
+            sb.append('.');
+            do {
+                decPart *= radix;
+                final double d = Math.floor(decPart);
+                sb.append(chars.charAt((int)d));
+                decPart -= d;
+            } while (decPart > 0.0 && sb.length() - dot < 1100);
+            // somewhat arbitrarily use same limit as V8
+        }
+
+        return sb.toString();
+    }
+
+    /**
+     * JavaScript compliant conversion of Object to number
+     * See ECMA 9.3 ToNumber
+     *
+     * @param obj  an object
+     *
+     * @return a number
+     */
+    public static double toNumber(final Object obj) {
+        if (obj instanceof Number) {
+            return ((Number)obj).doubleValue();
+        }
+        return toNumberGeneric(obj);
+    }
+
+    /**
+     * Digit representation for a character
+     *
+     * @param ch     a character
+     * @param radix  radix
+     *
+     * @return the digit for this character
+     */
+    public static int digit(final char ch, final int radix) {
+        return digit(ch, radix, false);
+    }
+
+    /**
+     * Digit representation for a character
+     *
+     * @param ch             a character
+     * @param radix          radix
+     * @param onlyIsoLatin1  iso latin conversion only
+     *
+     * @return the digit for this character
+     */
+    public static int digit(final char ch, final int radix, final boolean onlyIsoLatin1) {
+        final char maxInRadix = (char)('a' + (radix - 1) - 10);
+        final char c          = Character.toLowerCase(ch);
+
+        if (c >= 'a' && c <= maxInRadix) {
+            return Character.digit(ch, radix);
+        }
+
+        if (Character.isDigit(ch)) {
+            if (!onlyIsoLatin1 || ch >= '0' && ch <= '9') {
+                return Character.digit(ch, radix);
+            }
+        }
+
+        return -1;
+    }
+
+    /**
+     * JavaScript compliant String to number conversion
+     *
+     * @param str  a string
+     *
+     * @return a number
+     */
+    public static double toNumber(final String str) {
+        int end = str.length();
+        if (end == 0) {
+            return 0.0; // Empty string
+        }
+
+        int  start = 0;
+        char f     = str.charAt(0);
+
+        while (Lexer.isJSWhitespace(f)) {
+            if (++start == end) {
+                return 0.0d; // All whitespace string
+            }
+            f = str.charAt(start);
+        }
+
+        // Guaranteed to terminate even without start >= end check, as the previous loop found at least one
+        // non-whitespace character.
+        while (Lexer.isJSWhitespace(str.charAt(end - 1))) {
+            end--;
+        }
+
+        final boolean negative;
+        if (f == '-') {
+            if(++start == end) {
+                return Double.NaN; // Single-char "-" string
+            }
+            f = str.charAt(start);
+            negative = true;
+        } else {
+            if (f == '+') {
+                if (++start == end) {
+                    return Double.NaN; // Single-char "+" string
+                }
+                f = str.charAt(start);
+            }
+            negative = false;
+        }
+
+        final double value;
+        if (start + 1 < end && f == '0' && Character.toLowerCase(str.charAt(start + 1)) == 'x') {
+            //decode hex string
+            value = parseRadix(str.toCharArray(), start + 2, end, 16);
+        } else {
+            // Fast (no NumberFormatException) path to NaN for non-numeric strings. We allow those starting with "I" or
+            // "N" to allow for parsing "NaN" and "Infinity" correctly.
+            if ((f < '0' || f > '9') && f != '.' && f != 'I' && f != 'N') {
+                return Double.NaN;
+            }
+            try {
+                value = Double.parseDouble(str.substring(start, end));
+            } catch (final NumberFormatException e) {
+                return Double.NaN;
+            }
+        }
+
+        return negative ? -value : value;
+    }
+
+    /**
+     * JavaScript compliant Object to integer conversion
+     * See ECMA 9.4 ToInteger
+     *
+     * @param obj  an object
+     * @return an integer
+     */
+    public static int toInteger(final Object obj) {
+        return (int)toNumber(obj);
+    }
+
+    /**
+     * JavaScript compliant Object to long conversion
+     * See ECMA 9.4 ToInteger
+     *
+     * @param obj  an object
+     * @return a long
+     */
+    public static long toLong(final Object obj) {
+        return (long)toNumber(obj);
+    }
+
+    /**
+     * JavaScript compliant Object to int32 conversion
+     * See ECMA 9.5 ToInt32
+     *
+     * @param obj an object
+     * @return an int32
+     */
+    public static int toInt32(final Object obj) {
+        return toInt32(toNumber(obj));
+    }
+
+    /**
+     * JavaScript compliant long to int32 conversion
+     *
+     * @param num a long
+     * @return an int32
+     */
+    public static int toInt32(final long num) {
+        return (int)num;
+    }
+
+    /**
+     * JavaScript compliant number to int32 conversion
+     *
+     * @param num a number
+     * @return an int32
+     */
+    public static int toInt32(final double num) {
+        if (Double.isInfinite(num)) {
+            return 0;
+        }
+        return (int)(long)num;
+    }
+
+    /**
+     * JavaScript compliant Object to int64 conversion
+     *
+     * @param obj an object
+     * @return an int64
+     */
+    public static long toInt64(final Object obj) {
+        return toInt64(toNumber(obj));
+    }
+
+    /**
+     * JavaScript compliant number to int64 conversion
+     *
+     * @param num a number
+     * @return an int64
+     */
+    public static long toInt64(final double num) {
+        if (Double.isInfinite(num)) {
+            return 0L;
+        }
+        return (long)num;
+    }
+
+    /**
+     * JavaScript compliant Object to uint32 conversion
+     *
+     * @param obj an object
+     * @return a uint32
+     */
+    public static long toUint32(final Object obj) {
+        return toUint32(toNumber(obj));
+    }
+
+    /**
+     * JavaScript compliant number to uint32 conversion
+     *
+     * @param num a number
+     * @return a uint32
+     */
+    public static long toUint32(final double num) {
+        if (Double.isInfinite(num)) {
+            return 0L;
+        }
+        return ((long)num) & 0xffff_ffffL;
+    }
+
+    /**
+     * JavaScript compliant Object to uint16 conversion
+     * ECMA 9.7 ToUint16: (Unsigned 16 Bit Integer)
+     *
+     * @param obj an object
+     * @return a uint16
+     */
+    public static int toUint16(final Object obj) {
+        return toUint16(toNumber(obj));
+    }
+
+    /**
+     * JavaScript compliant number to uint16 conversion
+     *
+     * @param num a number
+     * @return a uint16
+     */
+    public static int toUint16(final int num) {
+        return num & 0xffff;
+    }
+
+    /**
+     * JavaScript compliant number to uint16 conversion
+     *
+     * @param num a number
+     * @return a uint16
+     */
+    public static int toUint16(final long num) {
+        return ((int)num) & 0xffff;
+    }
+
+    /**
+     * JavaScript compliant number to uint16 conversion
+     *
+     * @param num a number
+     * @return a uint16
+     */
+    public static int toUint16(final double num) {
+        if (Double.isInfinite(num)) {
+            return 0;
+        }
+        return ((int)(long)num) & 0xffff;
+    }
+
+    /**
+     * Check whether a number is finite
+     *
+     * @param num a number
+     * @return true if finite
+     */
+    public static boolean isFinite(final double num) {
+        return !Double.isInfinite(num) && !Double.isNaN(num);
+    }
+
+    /**
+     * Convert a primitive to a double
+     *
+     * @param num a double
+     * @return a boxed double
+     */
+    public static Double toDouble(final double num) {
+        return num;
+    }
+
+    /**
+     * Convert a primitive to a double
+     *
+     * @param num a long
+     * @return a boxed double
+     */
+    public static Double toDouble(final long num) {
+        return (double)num;
+    }
+
+    /**
+     * Convert a primitive to a double
+     *
+     * @param num an int
+     * @return a boxed double
+     */
+    public static Double toDouble(final int num) {
+        return (double)num;
+    }
+
+    /**
+     * Convert a boolean to an Object
+     *
+     * @param bool a boolean
+     * @return a boxed boolean, its Object representation
+     */
+    public static Object toObject(final boolean bool) {
+        return bool;
+    }
+
+    /**
+     * Convert a number to an Object
+     *
+     * @param num an integer
+     * @return the boxed number
+     */
+    public static Object toObject(final int num) {
+        return num;
+    }
+
+    /**
+     * Convert a number to an Object
+     *
+     * @param num a long
+     * @return the boxed number
+     */
+    public static Object toObject(final long num) {
+        return num;
+    }
+
+    /**
+     * Convert a number to an Object
+     *
+     * @param num a double
+     * @return the boxed number
+     */
+    public static Object toObject(final double num) {
+        return num;
+    }
+
+    /**
+     * Identity converter for objects.
+     *
+     * @param obj an object
+     * @return the boxed number
+     */
+    public static Object toObject(final Object obj) {
+        return obj;
+    }
+
+    /**
+     * Object conversion. This is used to convert objects and numbers to their corresponding
+     * NativeObject type
+     * See ECMA 9.9 ToObject
+     *
+     * @param global  the global object
+     * @param obj     the object to convert
+     *
+     * @return the wrapped object
+     */
+    public static Object toObject(final ScriptObject global, final Object obj) {
+        if (nullOrUndefined(obj)) {
+            typeError(global, "not.an.object", ScriptRuntime.safeToString(obj));
+        }
+
+        if (obj instanceof ScriptObject) {
+            return obj;
+        }
+
+        return ((GlobalObject)global).wrapAsObject(obj);
+    }
+
+    /**
+     * Check if an object is null or undefined
+     *
+     * @param obj object to check
+     *
+     * @return true if null or undefined
+     */
+    public static boolean nullOrUndefined(final Object obj) {
+        return obj == null || obj == ScriptRuntime.UNDEFINED;
+    }
+
+    static String toStringImpl(final Object obj, final boolean safe) {
+        if (obj instanceof String) {
+            return (String)obj;
+        }
+
+        if (obj instanceof Number) {
+            return toString(((Number)obj).doubleValue());
+        }
+
+        if (obj == ScriptRuntime.UNDEFINED) {
+            return "undefined";
+        }
+
+        if (obj == null) {
+            return "null";
+        }
+
+        if (obj instanceof ScriptObject) {
+            if (safe) {
+                final ScriptObject sobj = (ScriptObject)obj;
+                final GlobalObject gobj = (GlobalObject)Context.getGlobal();
+                return gobj.isError(sobj) ?
+                    ECMAException.safeToString(sobj) :
+                    sobj.safeToString();
+            }
+
+            return toString(toPrimitive(obj, String.class));
+        }
+
+        if (obj instanceof StaticClass) {
+            return "[JavaClass " + ((StaticClass)obj).getRepresentedClass().getName() + "]";
+        }
+
+        return obj.toString();
+    }
+
+    // trim from left for JS whitespaces.
+    static String trimLeft(final String str) {
+        int start = 0;
+
+        while (start < str.length() && Lexer.isJSWhitespace(str.charAt(start))) {
+            start++;
+        }
+
+        return str.substring(start);
+    }
+
+    private static double parseRadix(final char chars[], final int start, final int length, final int radix) {
+        int pos = 0;
+
+        for (int i = start; i < length ; i++) {
+            if (digit(chars[i], radix) == -1) {
+                break;
+            }
+            pos++;
+        }
+
+        if (pos == 0) {
+            return Double.NaN;
+        }
+
+        double value = 0.0;
+        for (int i = start; i < start + pos; i++) {
+            value *= radix;
+            value += digit(chars[i], radix);
+        }
+
+        return value;
+    }
+
+    private static double toNumberGeneric(final Object obj) {
+        if (obj == null) {
+            return +0.0;
+        }
+
+        if (obj instanceof String) {
+            return toNumber((String)obj);
+        }
+
+        if (obj instanceof ConsString) {
+            return toNumber(obj.toString());
+        }
+
+        if (obj instanceof Boolean) {
+            return (Boolean)obj ? 1 : +0.0;
+        }
+
+        if (obj instanceof ScriptObject) {
+            return toNumber(toPrimitive(obj, Number.class));
+        }
+
+        return Double.NaN;
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Logging.java b/nashorn/src/jdk/nashorn/internal/runtime/Logging.java
new file mode 100644
index 00000000000..761d7202550
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Logging.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.logging.ConsoleHandler;
+import java.util.logging.Formatter;
+import java.util.logging.Handler;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+import java.util.logging.Logger;
+
+/**
+ * Logging system for getting loggers for arbitrary subsystems as
+ * specified on the command line. Supports all standard log levels
+ *
+ */
+public class Logging {
+
+    private Logging() {
+    }
+
+    /** Loggers */
+
+    private static final Logger disabledLogger = Logger.getLogger("disabled");
+
+    static {
+        try {
+            Logging.disabledLogger.setLevel(Level.OFF);
+        } catch (final SecurityException e) {
+            //ignored
+        }
+    }
+
+    /** Maps logger name to loggers. Names are typically per package */
+    private static final Map<String, Logger> loggers = new HashMap<>();
+
+    private static String lastPart(final String packageName) {
+        final String[] parts = packageName.split("\\.");
+        if (parts.length == 0) {
+            return packageName;
+        }
+        return parts[parts.length - 1];
+    }
+
+    /**
+     * Get a logger for a given class, generating a logger name based on the
+     * class name
+     *
+     * @param clazz the class
+     * @return the logger
+     */
+    public static Logger getLogger0(final Class<?> clazz) {
+        return Logging.getLogger(Logging.lastPart(clazz.getPackage().getName()));
+    }
+
+    /**
+     * Get a logger for a given name
+     *
+     * @param name the name to use as key
+     * @return the logger
+     */
+    public static Logger getLogger(final String name) {
+        final Logger logger = Logging.loggers.get(name);
+        if (logger != null) {
+            return logger;
+        }
+        return Logging.disabledLogger;
+    }
+
+    /**
+     * Initialization function that is called to instantiate the logging system. It takes
+     * logger names (keys) and logging labels respectively
+     *
+     * @param map a map where the key is a logger name and the value a logging level
+     * @throws IllegalArgumentException if level or names cannot be parsed
+     */
+    public static void initialize(final Map<String, String> map) throws IllegalArgumentException {
+        try {
+            for (final Entry<String, String> entry : map.entrySet()) {
+                Level level;
+
+                final String key   = entry.getKey();
+                final String value = entry.getValue();
+                if ("".equals(value)) {
+                    level = Level.INFO;
+                } else {
+                    level = Level.parse(value.toUpperCase());
+                }
+
+                final String name = Logging.lastPart(key);
+
+                final Logger logger = java.util.logging.Logger.getLogger(name);
+                for (final Handler h : logger.getHandlers()) {
+                    logger.removeHandler(h);
+                }
+
+                logger.setLevel(level);
+                logger.setUseParentHandlers(false);
+                final Handler c = new ConsoleHandler();
+
+                c.setFormatter(new Formatter() {
+                    @Override
+                    public String format(final LogRecord record) {
+                        final StringBuilder sb = new StringBuilder();
+
+                        sb.append('[')
+                           .append(record.getLoggerName())
+                           .append("] ")
+                           .append(record.getMessage())
+                           .append('\n');
+
+                        return sb.toString();
+                    }
+                });
+                logger.addHandler(c);
+                c.setLevel(level);
+
+                Logging.loggers.put(name, logger);
+            }
+        } catch (final IllegalArgumentException | SecurityException e) {
+            throw e;
+        }
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/NashornLoader.java b/nashorn/src/jdk/nashorn/internal/runtime/NashornLoader.java
new file mode 100644
index 00000000000..38eacf7ccbb
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/NashornLoader.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.security.SecureClassLoader;
+import jdk.nashorn.tools.Shell;
+
+/**
+ * Superclass for Nashorn class loader classes. This stores Context
+ * instance as an instance field. The current context can be
+ * efficiently accessed from a given Class via it's ClassLoader.
+ *
+ */
+abstract class NashornLoader extends SecureClassLoader {
+    private final Context context;
+
+    final Context getContext() {
+        return context;
+    }
+
+    NashornLoader(final ClassLoader parent, final Context context) {
+        super(parent);
+        this.context = context;
+    }
+
+    /**
+     * Override loadClass so that we can checkPackageAccess.
+     */
+    @Override
+    public Class<?> loadClass(final String name) throws ClassNotFoundException {
+        checkPackageAccess(name);
+        return super.loadClass(name);
+    }
+
+    protected static void checkPackageAccess(final String name) {
+        final int i = name.lastIndexOf('.');
+        if (i != -1) {
+            final SecurityManager sm = System.getSecurityManager();
+            if (sm != null) {
+                sm.checkPackageAccess(name.substring(0, i));
+            }
+        }
+    }
+
+    /**
+     * Create a secure URL class loader for the given classpath
+     * @param classPath classpath for the loader to search from
+     * @return the class loader
+     */
+    static ClassLoader createClassLoader(final String classPath) {
+        final ClassLoader parent = Shell.class.getClassLoader();
+        final URL[] urls = pathToURLs(classPath);
+        return URLClassLoader.newInstance(urls, parent);
+    }
+
+    /*
+     * Utility method for converting a search path string to an array
+     * of directory and JAR file URLs.
+     *
+     * @param path the search path string
+     * @return the resulting array of directory and JAR file URLs
+     */
+    private static URL[] pathToURLs(final String path) {
+        final String[] components = path.split(File.pathSeparator);
+        URL[] urls = new URL[components.length];
+        int count = 0;
+        while(count < components.length) {
+            final URL url = fileToURL(new File(components[count]));
+            if (url != null) {
+                urls[count++] = url;
+            }
+        }
+        if (urls.length != count) {
+            final URL[] tmp = new URL[count];
+            System.arraycopy(urls, 0, tmp, 0, count);
+            urls = tmp;
+        }
+        return urls;
+    }
+
+    /*
+     * Returns the directory or JAR file URL corresponding to the specified
+     * local file name.
+     *
+     * @param file the File object
+     * @return the resulting directory or JAR file URL, or null if unknown
+     */
+    private static URL fileToURL(final File file) {
+        String name;
+        try {
+            name = file.getCanonicalPath();
+        } catch (final IOException e) {
+            name = file.getAbsolutePath();
+        }
+        name = name.replace(File.separatorChar, '/');
+        if (!name.startsWith("/")) {
+            name = "/" + name;
+        }
+        // If the file does not exist, then assume that it's a directory
+        if (!file.isFile()) {
+            name = name + "/";
+        }
+        try {
+            return new URL("file", "", name);
+        } catch (final MalformedURLException e) {
+            throw new IllegalArgumentException("file");
+        }
+    }
+}
+
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/NativeJavaPackage.java b/nashorn/src/jdk/nashorn/internal/runtime/NativeJavaPackage.java
new file mode 100644
index 00000000000..1688c006d33
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/NativeJavaPackage.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import jdk.nashorn.internal.objects.NativeJava;
+import jdk.nashorn.internal.objects.annotations.Attribute;
+import jdk.nashorn.internal.objects.annotations.Function;
+import org.dynalang.dynalink.CallSiteDescriptor;
+import org.dynalang.dynalink.beans.StaticClass;
+import org.dynalang.dynalink.linker.GuardedInvocation;
+
+/**
+ * An object that exposes Java packages and classes as its properties. Packages are exposed as objects that have further
+ * sub-packages and classes as their properties. Normally, three instances of this class are exposed as built-in objects
+ * in Nashorn: {@code "Packages"}, {@code "java"}, and {@code "javax"}. Typical usages are:
+ * <pre>
+ * var list = new java.util.ArrayList()
+ * var sprocket = new Packages.com.acme.Sprocket()
+ * </pre>
+ * or you can store the type objects in a variable for later reuse:
+ * <pre>
+ * var ArrayList = java.util.ArrayList
+ * var list = new ArrayList
+ * </pre>
+ * You can also use {@link NativeJava#type(Object, Object)} to access Java classes. These two statements are mostly
+ * equivalent:
+ * <pre>
+ * var listType1 = java.util.ArrayList
+ * var listType2 = Java.type("java.util.ArrayList")
+ * </pre>
+ * The difference is that {@code Java.type()} will throw an error if the class does not exist, while the first
+ * expression will return an empty object, as it must treat all non-existent classes as potentially being further
+ * subpackages. As such, {@code Java.type()} has the potential to catch typos earlier. A further difference is that
+ * {@code Java.type()} doesn't recognize {@code .} (dot) as the separator between outer class name and inner class name,
+ * it only recognizes the dollar sign. These are equivalent:
+ * <pre>
+ * var ftype1 = java.awt.geom.Arc2D$Float
+ * var ftype2 = java.awt.geom.Arc2D.Float
+ * var ftype3 = Java.asType("java.awt.geom.Arc2D$Float")
+ * var ftype4 = Java.asType("java.awt.geom.Arc2D").Float
+ * </pre>
+ */
+public class NativeJavaPackage extends ScriptObject {
+    /** Full name of package (includes path.) */
+    private final String name;
+
+    /**
+     * Public constructor to be accessible from {@link jdk.nashorn.internal.objects.Global}
+     * @param name  package name
+     * @param proto proto
+     */
+    public NativeJavaPackage(final String name, final ScriptObject proto) {
+        this.name = name;
+        this.setProto(proto);
+    }
+
+    @Override
+    public String getClassName() {
+        return "JavaPackage";
+    }
+
+    @Override
+    public boolean equals(final Object other) {
+        if (other instanceof NativeJavaPackage) {
+            return name.equals(((NativeJavaPackage)other).name);
+        }
+        return false;
+    }
+
+    @Override
+    public int hashCode() {
+        return name == null ? 0 : name.hashCode();
+    }
+
+    /**
+     * Get the full name of the package
+     * @return the name
+     */
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public String safeToString() {
+        return toString();
+    }
+
+    @Override
+    public String toString() {
+        return "[JavaPackage " + name + "]";
+    }
+
+    @Override
+    public Object getDefaultValue(final Class<?> hint) {
+        if (hint == String.class) {
+            return toString();
+        }
+
+        return super.getDefaultValue(hint);
+    }
+
+    /**
+     * "No such property" call placeholder.
+     *
+     * This can never be called as we override {@link ScriptObject#noSuchProperty}. We do declare it here as it's a signal
+     * to {@link WithObject} that it's worth trying doing a {@code noSuchProperty} on this object.
+     *
+     * @param self self reference
+     * @param name property name
+     * @return never returns
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object __noSuchProperty__(final Object self, final Object name) {
+        throw new AssertionError("__noSuchProperty__ placeholder called");
+    }
+
+    /**
+     * "No such method call" placeholder
+     *
+     * This can never be called as we override {@link ScriptObject#noSuchMethod}. We do declare it here as it's a signal
+     * to {@link WithObject} that it's worth trying doing a noSuchProperty on this object.
+     *
+     * @param self self reference
+     * @param args arguments to method
+     * @return never returns
+     */
+    @Function(attributes = Attribute.NOT_ENUMERABLE)
+    public static Object __noSuchMethod__(final Object self, final Object... args) {
+        throw new AssertionError("__noSuchMethod__ placeholder called");
+    }
+
+    /**
+     * Handle creation of new attribute.
+     * @param desc the call site descriptor
+     * @return Link to be invoked at call site.
+     */
+    @Override
+    public GuardedInvocation noSuchProperty(final CallSiteDescriptor desc) {
+        final String propertyName = desc.getNameToken(2);
+        final String fullName     = name.isEmpty() ? propertyName : name + "." + propertyName;
+
+        final Context context = getContext();
+        final boolean strict  = context._strict;
+
+        Class<?> javaClass = null;
+        try {
+            javaClass = context.findClass(fullName);
+        } catch (final ClassNotFoundException e) {
+            //ignored
+        }
+
+        if (javaClass == null) {
+            set(propertyName, new NativeJavaPackage(fullName, getProto()), strict);
+        } else {
+            set(propertyName, StaticClass.forClass(javaClass), strict);
+        }
+
+        return super.lookup(desc);
+    }
+
+    @Override
+    public GuardedInvocation noSuchMethod(final CallSiteDescriptor desc) {
+        return noSuchProperty(desc);
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/NumberToString.java b/nashorn/src/jdk/nashorn/internal/runtime/NumberToString.java
new file mode 100644
index 00000000000..e5452b7e5cc
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/NumberToString.java
@@ -0,0 +1,786 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import java.math.BigInteger;
+
+/**
+ * JavaScript number to string conversion, refinement of sun.misc.FloatingDecimal.
+ */
+public final class NumberToString {
+    /** Is not a number flag */
+    private final boolean isNaN;
+
+    /** Is a negative number flag. */
+    private boolean isNegative;
+
+    /** Decimal exponent value (for E notation.) */
+    private int decimalExponent;
+
+    /** Actual digits. */
+    private char digits[];
+
+    /** Number of digits to use. (nDigits <= digits.length). */
+    private int nDigits;
+
+    /*
+     * IEEE-754 constants.
+     */
+
+    //private static final long   signMask           = 0x8000000000000000L;
+    private static final int    expMask            = 0x7FF;
+    private static final long   fractMask          = 0x000F_FFFF_FFFF_FFFFL;
+    private static final int    expShift           = 52;
+    private static final int    expBias            = 1_023;
+    private static final long   fractHOB           = (1L << expShift);
+    private static final long   expOne             = ((long)expBias) << expShift;
+    private static final int    maxSmallBinExp     = 62;
+    private static final int    minSmallBinExp     = -(63 / 3);
+
+    /** Powers of 5 fitting a long. */
+    private static final long powersOf5[] = {
+        1L,
+        5L,
+        5L * 5,
+        5L * 5 * 5,
+        5L * 5 * 5 * 5,
+        5L * 5 * 5 * 5 * 5,
+        5L * 5 * 5 * 5 * 5 * 5,
+        5L * 5 * 5 * 5 * 5 * 5 * 5,
+        5L * 5 * 5 * 5 * 5 * 5 * 5 * 5,
+        5L * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
+        5L * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
+        5L * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
+        5L * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
+        5L * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
+        5L * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
+        5L * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
+        5L * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
+        5L * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
+        5L * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
+        5L * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
+        5L * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
+        5L * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
+        5L * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
+        5L * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
+        5L * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
+        5L * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
+        5L * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5
+    };
+
+    // Approximately ceil(log2(longPowers5[i])).
+    private static final int nBitsPowerOf5[] = {
+        0,
+        3,
+        5,
+        7,
+        10,
+        12,
+        14,
+        17,
+        19,
+        21,
+        24,
+        26,
+        28,
+        31,
+        33,
+        35,
+        38,
+        40,
+        42,
+        45,
+        47,
+        49,
+        52,
+        54,
+        56,
+        59,
+        61
+    };
+
+    /** Digits used for infinity result. */
+    private static final char infinityDigits[]   = { 'I', 'n', 'f', 'i', 'n', 'i', 't', 'y' };
+
+    /** Digits used for NaN result. */
+    private static final char nanDigits[]        = { 'N', 'a', 'N' };
+
+    /** Zeros used to pad result. */
+    private static final char zeroes[]           = { '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0' };
+
+
+    /**
+     * Convert a number into a JavaScript string.
+     * @param value Double to convert.
+     * @return JavaScript formated number.
+     */
+    public static String stringFor(final double value) {
+        return new NumberToString(value).toString();
+    }
+
+    /*
+     * Constructor.
+     */
+
+    private NumberToString(final double value) {
+        // Double as bits.
+        long bits = Double.doubleToLongBits(value);
+
+        // Get upper word.
+        final int upper = (int)(bits >> 32);
+
+        // Detect sign.
+        isNegative = upper < 0;
+
+        // Extract exponent.
+        int exponent = (upper >> (expShift - 32)) & expMask;
+
+        // Clear sign and exponent.
+        bits &= fractMask;
+
+        // Detect NaN.
+        if (exponent == expMask) {
+            isNaN = true;
+
+            // Detect Infinity.
+            if (bits == 0L) {
+                digits =  infinityDigits;
+            } else {
+                digits = nanDigits;
+                isNegative = false;
+            }
+
+            nDigits = digits.length;
+
+            return;
+        }
+
+        // We have a working double.
+        isNaN = false;
+
+        int nSignificantBits;
+
+        // Detect denormalized value.
+        if (exponent == 0) {
+            // Detect zero value.
+            if (bits == 0L) {
+                decimalExponent = 0;
+                digits = zeroes;
+                nDigits = 1;
+
+                return;
+            }
+
+            // Normalize value, using highest significant bit as HOB.
+            while ((bits & fractHOB) == 0L) {
+                bits <<= 1;
+                exponent -= 1;
+            }
+
+            // Compute number of significant bits.
+            nSignificantBits = expShift + exponent +1;
+            // Bias exponent by HOB.
+            exponent += 1;
+        } else {
+            // Add implicit HOB.
+            bits |= fractHOB;
+            // Compute number of significant bits.
+            nSignificantBits = expShift + 1;
+        }
+
+        // Unbias exponent (represents bit shift).
+        exponent -= expBias;
+
+        // Determine the number of significant bits in the fraction.
+        final int nFractBits = countSignificantBits(bits);
+
+        // Number of bits to the right of the decimal.
+        final int nTinyBits = Math.max(0, nFractBits - exponent - 1);
+
+        // Computed decimal exponent.
+        int decExponent;
+
+        if (exponent <= maxSmallBinExp && exponent >= minSmallBinExp) {
+            // Look more closely at the number to decide if,
+            // with scaling by 10^nTinyBits, the result will fit in
+            // a long.
+            if (nTinyBits < powersOf5.length && (nFractBits + nBitsPowerOf5[nTinyBits]) < 64) {
+                /*
+                 * We can do this:
+                 * take the fraction bits, which are normalized.
+                 * (a) nTinyBits == 0: Shift left or right appropriately
+                 *     to align the binary point at the extreme right, i.e.
+                 *     where a long int point is expected to be. The integer
+                 *     result is easily converted to a string.
+                 * (b) nTinyBits > 0: Shift right by expShift - nFractBits,
+                 *     which effectively converts to long and scales by
+                 *     2^nTinyBits. Then multiply by 5^nTinyBits to
+                 *     complete the scaling. We know this won't overflow
+                 *     because we just counted the number of bits necessary
+                 *     in the result. The integer you get from this can
+                 *     then be converted to a string pretty easily.
+                 */
+
+                if (nTinyBits == 0) {
+                    long halfULP;
+
+                    if (exponent > nSignificantBits) {
+                        halfULP = 1L << (exponent - nSignificantBits - 1);
+                    } else {
+                        halfULP = 0L;
+                    }
+
+                    if (exponent >= expShift) {
+                        bits <<= exponent - expShift;
+                    } else {
+                        bits >>>= expShift - exponent;
+                    }
+
+                    // Discard non-significant low-order bits, while rounding,
+                    // up to insignificant value.
+                    int i;
+                    for (i = 0; halfULP >= 10L; i++) {
+                        halfULP /= 10L;
+                    }
+
+                    /**
+                     * This is the easy subcase --
+                     * all the significant bits, after scaling, are held in bits.
+                     * isNegative and decExponent tell us what processing and scaling
+                     * has already been done. Exceptional cases have already been
+                     * stripped out.
+                     * In particular:
+                     *      bits is a finite number (not Infinite, nor NaN)
+                     *      bits > 0L (not zero, nor negative).
+                     *
+                     * The only reason that we develop the digits here, rather than
+                     * calling on Long.toString() is that we can do it a little faster,
+                     * and besides want to treat trailing 0s specially. If Long.toString
+                     * changes, we should re-evaluate this strategy!
+                     */
+
+                    int decExp = 0;
+
+                    if (i != 0) {
+                         // 10^i == 5^i * 2^i
+                        final long powerOf10 = powersOf5[i] << i;
+                        final long residue = bits % powerOf10;
+                        bits /= powerOf10;
+                        decExp += i;
+
+                        if (residue >= (powerOf10 >> 1)) {
+                            // Round up based on the low-order bits we're discarding.
+                            bits++;
+                        }
+                    }
+
+                    int ndigits = 20;
+                    final char[] digits0 = new char[26];
+                    int digitno = ndigits - 1;
+                    int c = (int)(bits % 10L);
+                    bits /= 10L;
+
+                    while (c == 0) {
+                        decExp++;
+                        c = (int)(bits % 10L);
+                        bits /= 10L;
+                    }
+
+                    while (bits != 0L) {
+                        digits0[digitno--] = (char)(c + '0');
+                        decExp++;
+                        c = (int)(bits % 10L);
+                        bits /= 10;
+                    }
+
+                    digits0[digitno] = (char)(c + '0');
+
+                    ndigits -= digitno;
+                    final char[] result = new char[ndigits];
+                    System.arraycopy(digits0, digitno, result, 0, ndigits);
+
+                    this.digits          = result;
+                    this.decimalExponent = decExp + 1;
+                    this.nDigits         = ndigits;
+
+                    return;
+                }
+            }
+        }
+
+        /*
+         * This is the hard case. We are going to compute large positive
+         * integers B and S and integer decExp, s.t.
+         *      d = (B / S) * 10^decExp
+         *      1 <= B / S < 10
+         * Obvious choices are:
+         *      decExp = floor(log10(d))
+         *      B      = d * 2^nTinyBits * 10^max(0, -decExp)
+         *      S      = 10^max(0, decExp) * 2^nTinyBits
+         * (noting that nTinyBits has already been forced to non-negative)
+         * I am also going to compute a large positive integer
+         *      M      = (1/2^nSignificantBits) * 2^nTinyBits * 10^max(0, -decExp)
+         * i.e. M is (1/2) of the ULP of d, scaled like B.
+         * When we iterate through dividing B/S and picking off the
+         * quotient bits, we will know when to stop when the remainder
+         * is <= M.
+         *
+         * We keep track of powers of 2 and powers of 5.
+         */
+
+        /*
+         * Estimate decimal exponent. (If it is small-ish,
+         * we could double-check.)
+         *
+         * First, scale the mantissa bits such that 1 <= d2 < 2.
+         * We are then going to estimate
+         *          log10(d2) ~=~  (d2-1.5)/1.5 + log(1.5)
+         * and so we can estimate
+         *      log10(d) ~=~ log10(d2) + binExp * log10(2)
+         * take the floor and call it decExp.
+         */
+        final double d2 = Double.longBitsToDouble(expOne | (bits & ~fractHOB));
+        decExponent = (int)Math.floor((d2 - 1.5D) * 0.289529654D + 0.176091259D + exponent * 0.301029995663981D);
+
+        // Powers of 2 and powers of 5, respectively, in B.
+        final int B5 = Math.max(0, -decExponent);
+        int B2 = B5 + nTinyBits + exponent;
+
+        // Powers of 2 and powers of 5, respectively, in S.
+        final int S5 = Math.max(0, decExponent);
+        int S2 = S5 + nTinyBits;
+
+        // Powers of 2 and powers of 5, respectively, in M.
+        final int M5 = B5;
+        int M2 = B2 - nSignificantBits;
+
+        /*
+         * The long integer fractBits contains the (nFractBits) interesting
+         * bits from the mantissa of d (hidden 1 added if necessary) followed
+         * by (expShift + 1 - nFractBits) zeros. In the interest of compactness,
+         * I will shift out those zeros before turning fractBits into a
+         * BigInteger. The resulting whole number will be
+         *      d * 2^(nFractBits - 1 - binExp).
+         */
+
+        bits >>>= expShift + 1 - nFractBits;
+        B2 -= nFractBits - 1;
+        final int common2factor = Math.min(B2, S2);
+        B2 -= common2factor;
+        S2 -= common2factor;
+        M2 -= common2factor;
+
+        /*
+         * HACK!!For exact powers of two, the next smallest number
+         * is only half as far away as we think (because the meaning of
+         * ULP changes at power-of-two bounds) for this reason, we
+         * hack M2. Hope this works.
+         */
+        if (nFractBits == 1) {
+            M2 -= 1;
+        }
+
+        if (M2 < 0) {
+            // Oops.  Since we cannot scale M down far enough,
+            // we must scale the other values up.
+            B2 -= M2;
+            S2 -= M2;
+            M2 =  0;
+        }
+
+        /*
+         * Construct, Scale, iterate.
+         * Some day, we'll write a stopping test that takes
+         * account of the asymmetry of the spacing of floating-point
+         * numbers below perfect powers of 2
+         * 26 Sept 96 is not that day.
+         * So we use a symmetric test.
+         */
+
+        final char digits0[] = this.digits = new char[32];
+        int  ndigit;
+        boolean low, high;
+        long lowDigitDifference;
+        int  q;
+
+        /*
+         * Detect the special cases where all the numbers we are about
+         * to compute will fit in int or long integers.
+         * In these cases, we will avoid doing BigInteger arithmetic.
+         * We use the same algorithms, except that we "normalize"
+         * our FDBigInts before iterating. This is to make division easier,
+         * as it makes our fist guess (quotient of high-order words)
+         * more accurate!
+         */
+
+        // Binary digits needed to represent B, approx.
+        final int Bbits = nFractBits + B2 + ((B5 < nBitsPowerOf5.length) ? nBitsPowerOf5[B5] : (B5*3));
+        // Binary digits needed to represent 10*S, approx.
+        final int tenSbits = S2 + 1 + (((S5 + 1) < nBitsPowerOf5.length) ? nBitsPowerOf5[(S5 + 1)] : ((S5 + 1) * 3));
+
+        if (Bbits < 64 && tenSbits < 64) {
+            long b = (bits * powersOf5[B5]) << B2;
+            final long s = powersOf5[S5] << S2;
+            long m = powersOf5[M5] << M2;
+            final long tens = s * 10L;
+
+            /*
+             * Unroll the first iteration. If our decExp estimate
+             * was too high, our first quotient will be zero. In this
+             * case, we discard it and decrement decExp.
+             */
+
+            ndigit = 0;
+            q = (int)(b / s);
+            b = 10L * (b % s);
+            m *= 10L;
+            low  = b <  m;
+            high = (b + m) > tens;
+
+            if (q == 0 && !high) {
+                // Ignore leading zero.
+                decExponent--;
+            } else {
+                digits0[ndigit++] = (char)('0' + q);
+            }
+
+            if (decExponent < -3 || decExponent >= 8) {
+                high = low = false;
+            }
+
+            while (!low && !high) {
+                q = (int)(b / s);
+                b = 10 * (b % s);
+                m *= 10;
+
+                if (m > 0L) {
+                    low  = b < m;
+                    high = (b + m) > tens;
+                } else {
+                    low = true;
+                    high = true;
+                }
+
+                if (low && q == 0) {
+                    break;
+                }
+                digits0[ndigit++] = (char)('0' + q);
+            }
+
+            lowDigitDifference = (b << 1) - tens;
+        } else {
+            /*
+             * We must do BigInteger arithmetic.
+             * First, construct our BigInteger initial values.
+             */
+
+            BigInteger Bval = multiplyPowerOf5And2(BigInteger.valueOf(bits), B5, B2);
+            BigInteger Sval = constructPowerOf5And2(S5, S2);
+            BigInteger Mval = constructPowerOf5And2(M5, M2);
+
+
+            // Normalize so that BigInteger division works better.
+            final int shiftBias = Long.numberOfLeadingZeros(bits) - 4;
+            Bval = Bval.shiftLeft(shiftBias);
+            Mval = Mval.shiftLeft(shiftBias);
+            Sval = Sval.shiftLeft(shiftBias);
+            final BigInteger tenSval = Sval.multiply(BigInteger.TEN);
+
+            /*
+             * Unroll the first iteration. If our decExp estimate
+             * was too high, our first quotient will be zero. In this
+             * case, we discard it and decrement decExp.
+             */
+
+            ndigit = 0;
+
+            BigInteger[] quoRem = Bval.divideAndRemainder(Sval);
+            q    = quoRem[0].intValue();
+            Bval = quoRem[1].multiply(BigInteger.TEN);
+            Mval = Mval.multiply(BigInteger.TEN);
+            low  = (Bval.compareTo(Mval) < 0);
+            high = (Bval.add(Mval).compareTo(tenSval) > 0);
+
+            if (q == 0 && !high) {
+                // Ignore leading zero.
+                decExponent--;
+            } else {
+                digits0[ndigit++] = (char)('0' + q);
+            }
+
+            if (decExponent < -3 || decExponent >= 8) {
+                high = low = false;
+            }
+
+            while(!low && !high) {
+                quoRem = Bval.divideAndRemainder(Sval);
+                q = quoRem[0].intValue();
+                Bval = quoRem[1].multiply(BigInteger.TEN);
+                Mval = Mval.multiply(BigInteger.TEN);
+                low  = (Bval.compareTo(Mval) < 0);
+                high = (Bval.add(Mval).compareTo(tenSval) > 0);
+
+                if (low && q == 0) {
+                    break;
+                }
+                digits0[ndigit++] = (char)('0' + q);
+            }
+
+            if (high && low) {
+                Bval = Bval.shiftLeft(1);
+                lowDigitDifference = Bval.compareTo(tenSval);
+            } else {
+                lowDigitDifference = 0L;
+            }
+        }
+
+        this.decimalExponent = decExponent + 1;
+        this.digits          = digits0;
+        this.nDigits         = ndigit;
+
+        /*
+         * Last digit gets rounded based on stopping condition.
+         */
+
+        if (high) {
+            if (low) {
+                if (lowDigitDifference == 0L) {
+                    // it's a tie!
+                    // choose based on which digits we like.
+                    if ((digits0[nDigits - 1] & 1) != 0) {
+                        roundup();
+                    }
+                } else if (lowDigitDifference > 0) {
+                    roundup();
+                }
+            } else {
+                roundup();
+            }
+        }
+    }
+
+    /**
+     * Count number of significant bits.
+     * @param bits Double's fraction.
+     * @return Number of significant bits.
+     */
+    private static int countSignificantBits(final long bits) {
+        if (bits != 0) {
+            return 64 - Long.numberOfLeadingZeros(bits) - Long.numberOfTrailingZeros(bits);
+        }
+
+        return 0;
+    }
+
+    /*
+     * Cache big powers of 5 handy for future reference.
+     */
+    private static BigInteger powerOf5Cache[];
+
+    /**
+     * Determine the largest power of 5 needed (as BigInteger.)
+     * @param power Power of 5.
+     * @return BigInteger of power of 5.
+     */
+    private static BigInteger bigPowerOf5(final int power) {
+        if (powerOf5Cache == null) {
+            powerOf5Cache = new BigInteger[power + 1];
+        } else if (powerOf5Cache.length <= power) {
+            final BigInteger t[] = new BigInteger[ power+1 ];
+            System.arraycopy(powerOf5Cache, 0, t, 0, powerOf5Cache.length);
+            powerOf5Cache = t;
+        }
+
+        if (powerOf5Cache[power] != null) {
+            return powerOf5Cache[power];
+        } else if (power < powersOf5.length) {
+            return powerOf5Cache[power] = BigInteger.valueOf(powersOf5[power]);
+        } else {
+            // Construct the value recursively.
+            // in order to compute 5^p,
+            // compute its square root, 5^(p/2) and square.
+            // or, let q = p / 2, r = p -q, then
+            // 5^p = 5^(q+r) = 5^q * 5^r
+            final int q = power >> 1;
+            final int r = power - q;
+            BigInteger bigQ = powerOf5Cache[q];
+
+            if (bigQ == null) {
+                bigQ = bigPowerOf5(q);
+            }
+
+            if (r < powersOf5.length) {
+                return (powerOf5Cache[power] = bigQ.multiply(BigInteger.valueOf(powersOf5[r])));
+            }
+            BigInteger bigR = powerOf5Cache[ r ];
+
+            if (bigR == null) {
+                bigR = bigPowerOf5(r);
+            }
+
+            return (powerOf5Cache[power] = bigQ.multiply(bigR));
+        }
+    }
+
+    /**
+     * Multiply BigInteger by powers of 5 and 2 (i.e., 10)
+     * @param value Value to multiply.
+     * @param p5    Power of 5.
+     * @param p2    Power of 2.
+     * @return Result.
+     */
+    private static BigInteger multiplyPowerOf5And2(final BigInteger value, final int p5, final int p2) {
+        BigInteger returnValue = value;
+
+        if (p5 != 0) {
+            returnValue = returnValue.multiply(bigPowerOf5(p5));
+        }
+
+        if (p2 != 0) {
+            returnValue = returnValue.shiftLeft(p2);
+        }
+
+        return returnValue;
+    }
+
+    /**
+     * Construct a BigInteger power of 5 and 2 (i.e., 10)
+     * @param p5    Power of 5.
+     * @param p2    Power of 2.
+     * @return Result.
+     */
+    private static BigInteger constructPowerOf5And2(final int p5, final int p2) {
+        BigInteger v = bigPowerOf5(p5);
+
+        if (p2 != 0) {
+            v = v.shiftLeft(p2);
+        }
+
+        return v;
+    }
+
+    /**
+     * Round up last digit by adding one to the least significant digit.
+     * In the unlikely event there is a carry out, deal with it.
+     * assert that this will only happen where there
+     * is only one digit, e.g. (float)1e-44 seems to do it.
+     */
+    private void roundup() {
+        int i;
+        int q = digits[ i = (nDigits-1)];
+
+        while (q == '9' && i > 0) {
+            if (decimalExponent < 0) {
+                nDigits--;
+            } else {
+                digits[i] = '0';
+            }
+
+            q = digits[--i];
+        }
+
+        if (q == '9') {
+            // Carryout! High-order 1, rest 0s, larger exp.
+            decimalExponent += 1;
+            digits[0] = '1';
+
+            return;
+        }
+
+        digits[i] = (char)(q + 1);
+    }
+
+    /**
+     * Format final number string.
+     * @return Formatted string.
+     */
+    @Override
+    public String toString() {
+        final StringBuilder sb = new StringBuilder(32);
+
+        if (isNegative) {
+            sb.append('-');
+        }
+
+        if (isNaN) {
+            sb.append(digits, 0, nDigits);
+        } else {
+            if (decimalExponent > 0 && decimalExponent <= 21) {
+                final int charLength = Math.min(nDigits, decimalExponent);
+                sb.append(digits, 0, charLength);
+
+                if (charLength < decimalExponent) {
+                    sb.append(zeroes, 0, decimalExponent - charLength);
+                } else if (charLength < nDigits) {
+                    sb.append('.');
+                    sb.append(digits, charLength, nDigits - charLength);
+                }
+            } else if (decimalExponent <=0 && decimalExponent > -6) {
+                sb.append('0');
+                sb.append('.');
+
+                if (decimalExponent != 0) {
+                    sb.append(zeroes, 0, -decimalExponent);
+                }
+
+                sb.append(digits, 0, nDigits);
+            } else {
+                sb.append(digits[0]);
+
+                if (nDigits > 1) {
+                    sb.append('.');
+                    sb.append(digits, 1, nDigits - 1);
+                }
+
+                sb.append('e');
+                final int exponent;
+                int e;
+
+                if (decimalExponent <= 0) {
+                    sb.append('-');
+                    exponent = e = -decimalExponent + 1;
+                } else {
+                    sb.append('+');
+                    exponent = e = decimalExponent - 1;
+                }
+
+                if (exponent > 99) {
+                    sb.append((char)(e / 100 + '0'));
+                    e %= 100;
+                }
+
+                if (exponent > 9) {
+                    sb.append((char)(e / 10 + '0'));
+                    e %= 10;
+                }
+
+                sb.append((char)(e + '0'));
+            }
+        }
+
+        return sb.toString();
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ParserException.java b/nashorn/src/jdk/nashorn/internal/runtime/ParserException.java
new file mode 100644
index 00000000000..461bc8b516f
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ParserException.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import jdk.nashorn.api.scripting.NashornException;
+import jdk.nashorn.internal.parser.Token;
+
+/**
+ * ECMAScript parser exceptions.
+ */
+@SuppressWarnings("serial")
+public final class ParserException extends NashornException {
+    // Source from which this ParserException originated
+    private Source source;
+    // token responsible for this exception
+    private long token;
+    // if this is traslated as ECMA error, which type should be used?
+    private JSErrorType errorType;
+
+    /**
+     * Constructor
+     *
+     * @param msg exception message for this parser error.
+     */
+    public ParserException(final String msg) {
+        this(msg, null, -1, -1, -1);
+    }
+
+    /**
+     * Constructor
+     *
+     * @param msg      exception message
+     * @param source   source from which this exception originates
+     * @param line     line number of exception
+     * @param column   column number of exception
+     * @param token    token from which this exception originates
+     *
+     */
+    public ParserException(final String msg, final Source source, final int line, final int column, final long token) {
+        super(msg);
+        setSource(source);
+        if (source != null) {
+            setFileName(source.getName());
+        }
+        setLineNumber(line);
+        setColumnNumber(column);
+        setToken(token);
+        setErrorType(JSErrorType.SYNTAX_ERROR);
+    }
+
+    /**
+     * Get the {@code Source} of this {@code ParserException}
+     * @return source
+     */
+    public Source getSource() {
+        return source;
+    }
+
+    /**
+     * Set the {@code Source} of this {@code ParserException}
+     * @param source script source
+     */
+    public void setSource(Source source) {
+        this.source = source;
+    }
+
+    /**
+     * Get the token responsible for this {@code ParserException}
+     * @return token
+     */
+    public long getToken() {
+        return token;
+    }
+
+    /**
+     * Set the errand token of this {@code ParserException}
+     * @param token token responsible for this ParserException
+     */
+    public void setToken(final long token) {
+        this.token = token;
+    }
+
+    /**
+     * Get token position within source where the error originated.
+     * @return token position if available, else -1
+     */
+    public int getPosition() {
+        return Token.descPosition(token);
+    }
+
+    /**
+     * Get the {@code JSErrorType} of this {@code ParserException}
+     * @return error type
+     */
+    public JSErrorType getErrorType() {
+        return errorType;
+    }
+
+    /**
+     * Set the {@code JSErrorType} of this {@code ParserException}
+     * @param errorType error type
+     */
+    public void setErrorType(final JSErrorType errorType) {
+        this.errorType = errorType;
+    }
+
+    /**
+     * Throw this {@code ParserException} as one of the 7 native JavaScript errors
+     * @param global global scope object
+     */
+    public void throwAsEcmaException(final ScriptObject global) {
+        ECMAErrors.throwAsEcmaException(global, this);
+    }
+}
+
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Property.java b/nashorn/src/jdk/nashorn/internal/runtime/Property.java
new file mode 100644
index 00000000000..bf4f1bef604
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Property.java
@@ -0,0 +1,477 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import static jdk.nashorn.internal.runtime.PropertyDescriptor.CONFIGURABLE;
+import static jdk.nashorn.internal.runtime.PropertyDescriptor.ENUMERABLE;
+import static jdk.nashorn.internal.runtime.PropertyDescriptor.WRITABLE;
+
+import java.lang.invoke.MethodHandle;
+import java.util.Objects;
+import jdk.nashorn.internal.codegen.objects.ObjectClassGenerator;
+import jdk.nashorn.internal.codegen.types.Type;
+
+/**
+ * This is the abstract superclass representing a JavaScript Property.
+ * The {@link PropertyMap} map links keys to properties, and consequently
+ * instances of this class make up the values in the PropertyMap
+ *
+ * @see PropertyMap
+ * @see AccessorProperty
+ * @see SpillProperty
+ * @see UserAccessorProperty
+ */
+public abstract class Property {
+    /*
+     * ECMA 8.6.1 Property Attributes
+     *
+     * We use negative flags because most properties are expected to
+     * be 'writable', 'configurable' and 'enumerable'. With negative flags,
+     * we can use leave flag byte initialized with (the default) zero value.
+     */
+
+    /** ECMA 8.6.1 - Is this property not writable? */
+    public static final int NOT_WRITABLE     = 0b0000_0000_0001;
+
+    /** ECMA 8.6.1 - Is this property not enumerable? */
+    public static final int NOT_ENUMERABLE   = 0b0000_0000_0010;
+
+    /** ECMA 8.6.1 - Is this property not configurable? */
+    public static final int NOT_CONFIGURABLE = 0b0000_0000_0100;
+
+    private static final int MODIFY_MASK     = 0b0000_0000_1111;
+
+    /** Is this a spill property? See {@link SpillProperty} */
+    public static final int IS_SPILL         = 0b0000_0001_0000;
+
+    /** Is this a function parameter ? */
+    public static final int IS_PARAMETER     = 0b0000_0010_0000;
+
+    /** Is this property always represented as an Object? See {@link ObjectClassGenerator} and dual fields flag. */
+    public static final int IS_ALWAYS_OBJECT = 0b0000_0100_0000;
+
+    /** Can this property be primitive? */
+    public static final int CAN_BE_PRIMITIVE = 0b0000_1000_0000;
+
+    /** Can this property be undefined? */
+    public static final int CAN_BE_UNDEFINED = 0b0001_0000_0000;
+
+    /** Property key. */
+    private final String key;
+
+    /** Property flags. */
+    protected int flags;
+
+    /**
+     * Constructor
+     *
+     * @param key   property key
+     * @param flags property flags
+     */
+    public Property(final String key, final int flags) {
+        this.key   = key;
+        this.flags = flags;
+    }
+
+    /**
+     * Copy constructor
+     *
+     * @param property source property
+     */
+    protected Property(final Property property) {
+        this.key   = property.key;
+        this.flags = property.flags;
+    }
+
+    /**
+     * Copy function
+     *
+     * @return cloned property
+     */
+    protected abstract Property copy();
+
+    /**
+     * Property flag utility method for {@link PropertyDescriptor}s. Given two property descriptors,
+     * return the result of merging their flags.
+     *
+     * @param oldDesc  first property descriptor
+     * @param newDesc  second property descriptor
+     * @return merged flags.
+     */
+    static int mergeFlags(final PropertyDescriptor oldDesc, final PropertyDescriptor newDesc) {
+        int     propFlags = 0;
+        boolean value;
+
+        value = newDesc.has(CONFIGURABLE) ? newDesc.isConfigurable() : oldDesc.isConfigurable();
+        if (!value) {
+            propFlags |= NOT_CONFIGURABLE;
+        }
+
+        value = newDesc.has(ENUMERABLE) ? newDesc.isEnumerable() : oldDesc.isEnumerable();
+        if (!value) {
+            propFlags |= NOT_ENUMERABLE;
+        }
+
+        value = newDesc.has(WRITABLE) ? newDesc.isWritable() : oldDesc.isWritable();
+        if (!value) {
+            propFlags |= NOT_WRITABLE;
+        }
+
+        return propFlags;
+    }
+
+    /**
+     * Property flag utility method for {@link PropertyDescriptor}. Get the property flags
+     * conforming to any Property using this PropertyDescriptor
+     *
+     * @param desc property descriptor
+     * @return flags for properties that conform to property descriptor
+     */
+    static int toFlags(final PropertyDescriptor desc) {
+        int propFlags = 0;
+
+        if (!desc.isConfigurable()) {
+            propFlags |= NOT_CONFIGURABLE;
+        }
+        if (!desc.isEnumerable()) {
+            propFlags |= NOT_ENUMERABLE;
+        }
+        if (!desc.isWritable()) {
+            propFlags |= NOT_WRITABLE;
+        }
+
+        return propFlags;
+    }
+
+    /**
+     * Check whether this property has a user defined getter function. See {@link UserAccessorProperty}
+     * @return true if getter function exists, false is default
+     */
+    public boolean hasGetterFunction() {
+        return false;
+    }
+
+    /**
+     * Check whether this property has a user defined setter function. See {@link UserAccessorProperty}
+     * @return true if getter function exists, false is default
+     */
+    public boolean hasSetterFunction() {
+        return false;
+    }
+
+    /**
+     * Check whether this property is writable (see ECMA 8.6.1)
+     * @return true if writable
+     */
+    public boolean isWritable() {
+        return (flags & NOT_WRITABLE) == 0;
+    }
+
+    /**
+     * Check whether this property is writable (see ECMA 8.6.1)
+     * @return true if configurable
+     */
+    public boolean isConfigurable() {
+        return (flags & NOT_CONFIGURABLE) == 0;
+    }
+
+    /**
+     * Check whether this property is enumerable (see ECMA 8.6.1)
+     * @return true if enumerable
+     */
+    public boolean isEnumerable() {
+        return (flags & NOT_ENUMERABLE) == 0;
+    }
+
+    /**
+     * Check whether this property is used as a function parameter
+     * @return true if parameter
+     */
+    public boolean isParameter() {
+        return (flags & IS_PARAMETER) == IS_PARAMETER;
+    }
+
+    /**
+     * Check whether this is a spill property, i.e. one that will not
+     * be stored in a specially generated field in the property class.
+     * The spill pool is maintained separately, as a growing Object array
+     * in the {@link ScriptObject}.
+     *
+     * @return true if spill property
+     */
+    public boolean isSpill() {
+        return (flags & IS_SPILL) == IS_SPILL;
+    }
+
+    /**
+     * Does this property use any slots in the spill array described in
+     * {@link Property#isSpill}? In that case how many. Currently a property
+     * only uses max one spill slot, but this may change in future representations
+     * Only {@link SpillProperty} instances use spill slots
+     *
+     * @return number of spill slots a property is using
+     */
+    public int getSpillCount() {
+        return isSpill() ? 1 : 0;
+    }
+
+    /**
+     * Add more property flags to the property. Properties are immutable here,
+     * so any property change that results in a larger flag set results in the
+     * property being cloned. Use only the return value
+     *
+     * @param propertyFlags flags to be OR:ed to the existing property flags
+     * @return new property if property set was changed, {@code this} otherwise
+     */
+    public Property addFlags(final int propertyFlags) {
+        if ((this.flags & propertyFlags) != propertyFlags) {
+            final Property cloned = this.copy();
+            cloned.flags |= propertyFlags;
+            return cloned;
+        }
+        return this;
+    }
+
+    /**
+     * Get the flags for this property
+     * @return property flags
+     */
+    public int getFlags() {
+        return flags;
+    }
+
+    /**
+     * Get the modify flags for this property. The modify flags are the ECMA 8.6.1
+     * flags that decide if the Property is writable, configurable and/or enumerable.
+     *
+     * @return modify flags for property
+     */
+    public int getModifyFlags() {
+        return flags & MODIFY_MASK;
+    }
+
+    /**
+     * Remove property flags from the property. Properties are immutable here,
+     * so any property change that results in a smaller flag set results in the
+     * property being cloned. Use only the return value
+     *
+     * @param propertyFlags flags to be subtracted from the existing property flags
+     * @return new property if property set was changed, {@code this} otherwise
+     */
+    public Property removeFlags(final int propertyFlags) {
+        if ((this.flags & propertyFlags) != 0) {
+            final Property cloned = this.copy();
+            cloned.flags &= ~propertyFlags;
+            return cloned;
+        }
+        return this;
+    }
+
+    /**
+     * Reset the property for this property. Properties are immutable here,
+     * so any property change that results in a different flag sets results in the
+     * property being cloned. Use only the return value
+     *
+     * @param propertyFlags flags that are replacing from the existing property flags
+     * @return new property if property set was changed, {@code this} otherwise
+     */
+    public Property setFlags(final int propertyFlags) {
+        if (this.flags != propertyFlags) {
+            final Property cloned = this.copy();
+            cloned.flags &= ~MODIFY_MASK;
+            cloned.flags |= propertyFlags & MODIFY_MASK;
+            return cloned;
+        }
+        return this;
+    }
+
+    /**
+     * Abstract method for retrieving the getter for the property. We do not know
+     * anything about the internal representation when we request the getter, we only
+     * know that the getter will return the property as the given type.
+     *
+     * @param type getter return value type
+     * @return a getter for this property as {@code type}
+     */
+    public abstract MethodHandle getGetter(final Class<?> type);
+
+    /**
+     * Get the key for this property. This key is an ordinary string. The "name".
+     * @return key for property
+     */
+    public String getKey() {
+        return key;
+    }
+
+    /**
+     * Abstract method for retrieving the setter for the property. We do not know
+     * anything about the internal representation when we request the setter, we only
+     * know that the setter will take the property as a parameter of the given type.
+     * <p>
+     * Note that we have to pass the current property map from which we retrieved
+     * the property here. This is necessary for map guards if, e.g. the internal
+     * representation of the field, and consequently also the setter, changes. Then
+     * we automatically get a map guard that relinks the call site so that the
+     * older setter will never be used again.
+     * <p>
+     * see {@link ObjectClassGenerator#createSetter(Class, Class, MethodHandle, MethodHandle)}
+     * if you are interested in the internal details of this. Note that if you
+     * are running in default mode, with {@code -Dnashorn.fields.dual=true}, disabled, the setters
+     * will currently never change, as all properties are represented as Object field,
+     * the Object fields are Initialized to {@code ScriptRuntime.UNDEFINED} and primitives are
+     * boxed/unboxed upon every access, which is not necessarily optimal
+     *
+     * @param type setter parameter type
+     * @param currentMap current property map for property
+     * @return a getter for this property as {@code type}
+     */
+    public abstract MethodHandle getSetter(final Class<?> type, final PropertyMap currentMap);
+
+    /**
+     * Get the user defined getter function if one exists. Only {@link UserAccessorProperty} instances
+     * can have user defined getters
+     * @param obj the script object
+     * @return user defined getter function, or {@code null} if none exists
+     */
+    public ScriptFunction getGetterFunction(final ScriptObject obj) {
+        return null;
+    }
+
+    /**
+     * Get the user defined setter function if one exists. Only {@link UserAccessorProperty} instances
+     * can have user defined getters
+     * @param obj the script object
+     * @return user defined getter function, or {@code null} if none exists
+     */
+    public ScriptFunction getSetterFunction(final ScriptObject obj) {
+        return null;
+    }
+
+    /**
+     * Get the spill slot as described in {@link Property#getSpillCount()}.
+     * @return spill slot, -1 if none exists
+     */
+    public int getSlot() {
+        return -1;
+    }
+
+    @Override
+    public int hashCode() {
+        final Class<?> type = getCurrentType();
+        return Objects.hashCode(this.key) ^ flags ^ (type == null ? 0 : type.hashCode());
+    }
+
+    @Override
+    public boolean equals(final Object other) {
+        if (this == other) {
+            return true;
+        }
+
+        if (!(other instanceof Property)) {
+            return false;
+        }
+
+        final Property otherProperty = (Property)other;
+        final Object otherKey = otherProperty.key;
+        final Class<?> otherType = otherProperty.getCurrentType();
+
+        return flags == otherProperty.flags &&
+               (key == null ? otherKey == null : key.equals(otherKey)) &&
+               (getCurrentType() == otherType);
+    }
+
+    @Override
+    public String toString() {
+        final StringBuilder sb   = new StringBuilder();
+        final Class<?>      type = getCurrentType();
+
+        sb.append(getKey()).
+            append("(0x").
+            append(Integer.toHexString(flags)).
+            append(") ").
+            append(getClass().getSimpleName()).
+            append(" {").
+            append(type == null ? "UNDEFINED" : Type.typeFor(type).getDescriptor()).
+            append('}');
+
+        return sb.toString();
+    }
+
+    /**
+     * Get the current type of this field. If you are not running with dual fields enabled,
+     * this will always be Object.class. See the value representation explanation in
+     * {@link Property#getSetter(Class, PropertyMap)} and {@link ObjectClassGenerator}
+     * for more information.
+     *
+     * @return current type of property, null means undefined
+     */
+    public Class<?> getCurrentType() {
+        return Object.class;
+    }
+
+    /**
+     * Check whether this Property can ever change its type. The default is false, and if
+     * you are not running with dual fields, the type is always object and can never change
+     * @return true if this property can change types
+     */
+    public boolean canChangeType() {
+        return false;
+    }
+
+    /**
+     * Check whether this Property is ever used as anything but an Object. If this is used only
+     * as an object, dual fields mode need not even try to represent it as a primitive at any
+     * callsite, saving map rewrites for performance.
+     *
+     * @return true if representation should always be an object field
+     */
+    public boolean isAlwaysObject() {
+        return (flags & IS_ALWAYS_OBJECT) == IS_ALWAYS_OBJECT;
+    }
+
+    /**
+     * Check whether this property can be primitive. This is a conservative
+     * analysis result, so {@code false} might mean that it can still be
+     * primitive
+     *
+     * @return can be primitive status
+     */
+    public boolean canBePrimitive() {
+        return (flags & CAN_BE_PRIMITIVE) == CAN_BE_PRIMITIVE;
+    }
+
+    /**
+     * Check whether this property can be primitive. This is a conservative
+     * analysis result, so {@code true} might mean that it can still be
+     * defined, but it will never say that a property can not be undefined
+     * if it can
+     *
+     * @return can be undefined status
+     */
+    public boolean canBeUndefined() {
+        return (flags & CAN_BE_UNDEFINED) == CAN_BE_UNDEFINED;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/PropertyAccess.java b/nashorn/src/jdk/nashorn/internal/runtime/PropertyAccess.java
new file mode 100644
index 00000000000..be5e36e7ea8
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/PropertyAccess.java
@@ -0,0 +1,365 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+/**
+ * Interface for getting and setting properties from script objects
+ * This can be a plugin point for e.g. tagged values or alternative
+ * array property getters.
+ *
+ * The interface is engineered with the combinatorially exhaustive
+ * combination of types by purpose, for speed, as currently HotSpot is not
+ * good enough at removing boxing.
+ */
+public interface PropertyAccess {
+    /**
+     * Get the value for a given key and return it as an int
+     * @param key the key
+     * @return the value
+     */
+    public int getInt(Object key);
+
+    /**
+     * Get the value for a given key and return it as an int
+     * @param key the key
+     * @return the value
+     */
+    public int getInt(double key);
+
+    /**
+     * Get the value for a given key and return it as an int
+     * @param key the key
+     * @return the value
+     */
+    public int getInt(final long key);
+
+    /**
+     * Get the value for a given key and return it as an int
+     * @param key the key
+     * @return the value
+     */
+    public int getInt(int key);
+
+    /**
+     * Get the value for a given key and return it as a long
+     * @param key the key
+     * @return the value
+     */
+    public long getLong(Object key);
+
+    /**
+     * Get the value for a given key and return it as a long
+     * @param key the key
+     * @return the value
+     */
+    public long getLong(double key);
+
+    /**
+     * Get the value for a given key and return it as a long
+     * @param key the key
+     * @return the value
+     */
+    public long getLong(long key);
+
+    /**
+     * Get the value for a given key and return it as a long
+     * @param key the key
+     * @return the value
+     */
+    public long getLong(int key);
+
+    /**
+     * Get the value for a given key and return it as a double
+     * @param key the key
+     * @return the value
+     */
+    public double getDouble(Object key);
+
+    /**
+     * Get the value for a given key and return it as a double
+     * @param key the key
+     * @return the value
+     */
+    public double getDouble(double key);
+
+    /**
+     * Get the value for a given key and return it as a double
+     * @param key the key
+     * @return the value
+     */
+    public double getDouble(long key);
+
+    /**
+     * Get the value for a given key and return it as a double
+     * @param key the key
+     * @return the value
+     */
+    public double getDouble(int key);
+
+    /**
+     * Get the value for a given key and return it as an Object
+     * @param key the key
+     * @return the value
+     */
+    public Object get(Object key);
+
+    /**
+     * Get the value for a given key and return it as an Object
+     * @param key the key
+     * @return the value
+     */
+    public Object get(double key);
+
+    /**
+     * Get the value for a given key and return it as an Object
+     * @param key the key
+     * @return the value
+     */
+    public Object get(long key);
+
+    /**
+     * Get the value for a given key and return it as an Object
+     * @param key the key
+     * @return the value
+     */
+    public Object get(int key);
+
+    /**
+     * Set the value of a given key
+     * @param key     the key
+     * @param value   the value
+     * @param strict  are we in strict mode
+     */
+    public void set(Object key, int value, boolean strict);
+
+    /**
+     * Set the value of a given key
+     * @param key     the key
+     * @param value   the value
+     * @param strict  are we in strict mode
+     */
+    public void set(Object key, long value, boolean strict);
+
+    /**
+     * Set the value of a given key
+     * @param key     the key
+     * @param value   the value
+     * @param strict  are we in strict mode
+     */
+    public void set(Object key, double value, boolean strict);
+
+    /**
+     * Set the value of a given key
+     * @param key     the key
+     * @param value   the value
+     * @param strict  are we in strict mode
+     */
+    public void set(Object key, Object value, boolean strict);
+
+    /**
+     * Set the value of a given key
+     * @param key     the key
+     * @param value   the value
+     * @param strict  are we in strict mode
+     */
+    public void set(double key, int value, boolean strict);
+
+    /**
+     * Set the value of a given key
+     * @param key     the key
+     * @param value   the value
+     * @param strict  are we in strict mode
+     */
+    public void set(double key, long value, boolean strict);
+
+    /**
+     * Set the value of a given key
+     * @param key     the key
+     * @param value   the value
+     * @param strict  are we in strict mode
+     */
+    public void set(double key, double value, boolean strict);
+
+    /**
+     * Set the value of a given key
+     * @param key     the key
+     * @param value   the value
+     * @param strict  are we in strict mode
+     */
+    public void set(double key, Object value, boolean strict);
+
+    /**
+     * Set the value of a given key
+     * @param key     the key
+     * @param value   the value
+     * @param strict  are we in strict mode
+     */
+    public void set(long key, int value, boolean strict);
+
+    /**
+     * Set the value of a given key
+     * @param key     the key
+     * @param value   the value
+     * @param strict  are we in strict mode
+     */
+    public void set(long key, long value, boolean strict);
+
+    /**
+     * Set the value of a given key
+     * @param key     the key
+     * @param value   the value
+     * @param strict  are we in strict mode
+     */
+    public void set(long key, double value, boolean strict);
+
+    /**
+     * Set the value of a given key
+     * @param key     the key
+     * @param value   the value
+     * @param strict  are we in strict mode
+     */
+    public void set(long key, Object value, boolean strict);
+
+    /**
+     * Set the value of a given key
+     * @param key     the key
+     * @param value   the value
+     * @param strict  are we in strict mode
+     */
+    public void set(int key, int value, boolean strict);
+
+    /**
+     * Set the value of a given key
+     * @param key     the key
+     * @param value   the value
+     * @param strict  are we in strict mode
+     */
+    public void set(int key, long value, boolean strict);
+
+    /**
+     * Set the value of a given key
+     * @param key     the key
+     * @param value   the value
+     * @param strict  are we in strict mode
+     */
+    public void set(int key, double value, boolean strict);
+
+    /**
+     * Set the value of a given key
+     * @param key     the key
+     * @param value   the value
+     * @param strict  are we in strict mode
+     */
+    public void set(int key, Object value, boolean strict);
+
+    /**
+     * Check if the given key exists anywhere in the proto chain
+     * @param key the key
+     * @return true if key exists
+     */
+    public boolean has(Object key);
+
+    /**
+     * Check if the given key exists anywhere in the proto chain
+     * @param key the key
+     * @return true if key exists
+     */
+    public boolean has(int key);
+
+    /**
+     * Check if the given key exists anywhere in the proto chain
+     * @param key the key
+     * @return true if key exists
+     */
+    public boolean has(long key);
+
+    /**
+     * Check if the given key exists anywhere in the proto chain
+     * @param key the key
+     * @return true if key exists
+     */
+    public boolean has(double key);
+
+    /**
+     * Check if the given key exists directly in the implementor
+     * @param key the key
+     * @return true if key exists
+     */
+    public boolean hasOwnProperty(Object key);
+
+    /**
+     * Check if the given key exists directly in the implementor
+     * @param key the key
+     * @return true if key exists
+     */
+    public boolean hasOwnProperty(int key);
+
+    /**
+     * Check if the given key exists directly in the implementor
+     * @param key the key
+     * @return true if key exists
+     */
+    public boolean hasOwnProperty(long key);
+
+    /**
+     * Check if the given key exists directly in the implementor
+     * @param key the key
+     * @return true if key exists
+     */
+    public boolean hasOwnProperty(double key);
+
+    /**
+     * Delete a property with the given key from the implementor
+     * @param key    the key
+     * @param strict are we in strict mode
+     * @return true if deletion succeeded, false otherwise
+     */
+    public boolean delete(int key, boolean strict);
+
+    /**
+     * Delete a property with the given key from the implementor
+     * @param key    the key
+     * @param strict are we in strict mode
+     * @return true if deletion succeeded, false otherwise
+     */
+    public boolean delete(long key, boolean strict);
+
+    /**
+     * Delete a property with the given key from the implementor
+     * @param key    the key
+     * @param strict are we in strict mode
+     * @return true if deletion succeeded, false otherwise
+     */
+    public boolean delete(double key, boolean strict);
+
+    /**
+     * Delete a property with the given key from the implementor
+     * @param key    the key
+     * @param strict are we in strict mode
+     * @return true if deletion succeeded, false otherwise
+     */
+    public boolean delete(Object key, boolean strict);
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/PropertyDescriptor.java b/nashorn/src/jdk/nashorn/internal/runtime/PropertyDescriptor.java
new file mode 100644
index 00000000000..5f3c05b7459
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/PropertyDescriptor.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+/**
+ * Describes attributes of a specific property of a script object.
+ */
+public interface PropertyDescriptor {
+
+    /** Type: generic property descriptor - TODO this should be an enum */
+    public static final int GENERIC  = 0;
+
+    /** Type: data property descriptor - TODO this should be an enum */
+    public static final int DATA     = 1;
+
+    /** Type: accessor property descriptor - TODO this should be an enum */
+    public static final int ACCESSOR = 2;
+
+    /** descriptor for configurable property */
+    public static final String CONFIGURABLE = "configurable";
+
+    /** descriptor for enumerable property */
+    public static final String ENUMERABLE = "enumerable";
+
+    /** descriptor for writable property */
+    public static final String WRITABLE = "writable";
+
+    /** descriptor for value */
+    public static final String VALUE = "value";
+
+    /** descriptor for getter */
+    public static final String GET = "get";
+
+    /** descriptor for setter */
+    public static final String SET = "set";
+
+    /**
+     * Check if this {@code PropertyDescriptor} describes a configurable property
+     * @return true if configurable
+     */
+    public boolean isConfigurable();
+
+    /**
+     * Check if this {@code PropertyDescriptor} describes an enumerable property
+     * @return true if enumerable
+     */
+    public boolean isEnumerable();
+
+    /**
+     * Check if this {@code PropertyDescriptor} describes a wriable property
+     * @return true if writable
+     */
+    public boolean isWritable();
+
+    /**
+     * Get the property value as given by this {@code PropertyDescriptor}
+     * @return property value
+     */
+    public Object getValue();
+
+    /**
+     * Get the {@link UserAccessorProperty} getter as given by this {@code PropertyDescriptor}
+     * @return getter, or null if not available
+     */
+    public ScriptFunction getGetter();
+
+    /**
+     * Get the {@link UserAccessorProperty} setter as given by this {@code PropertyDescriptor}
+     * @return setter, or null if not available
+     */
+    public ScriptFunction getSetter();
+
+    /**
+     * Set whether this {@code PropertyDescriptor} describes a configurable property
+     * @param flag true if configurable, false otherwise
+     */
+    public void setConfigurable(boolean flag);
+
+    /**
+     * Set whether this {@code PropertyDescriptor} describes an enumerable property
+     * @param flag true if enumerable, false otherwise
+     */
+    public void setEnumerable(boolean flag);
+
+    /**
+     * Set whether this {@code PropertyDescriptor} describes a writable property
+     * @param flag true if writable, false otherwise
+     */
+    public void setWritable(boolean flag);
+
+    /**
+     * Set the property value for this {@code PropertyDescriptor}
+     * @param value property value
+     */
+    public void setValue(Object value);
+
+    /**
+     * Assign a {@link UserAccessorProperty} getter as given to this {@code PropertyDescriptor}
+     * @param getter getter, or null if not available
+     */
+    public void setGetter(Object getter);
+
+    /**
+     * Assign a {@link UserAccessorProperty} setter as given to this {@code PropertyDescriptor}
+     * @param setter setter, or null if not available
+     */
+    public void setSetter(Object setter);
+
+    /**
+     * Fill in this {@code PropertyDescriptor} from the properties of a given {@link ScriptObject}
+     *
+     * @param obj the script object
+     * @return filled in {@code PropertyDescriptor}
+     *
+     */
+    public PropertyDescriptor fillFrom(ScriptObject obj);
+
+    /**
+     * Get the type of this property descriptor.
+     * @return property descriptor type, one of {@link PropertyDescriptor#GENERIC}, {@link PropertyDescriptor#DATA} and {@link PropertyDescriptor#ACCESSOR}
+     */
+    public int type();
+
+    /**
+     * Wrapper for {@link ScriptObject#has(Object)}
+     *
+     * @param key property key
+     * @return true if property exists in implementor
+     */
+    public boolean has(Object key);
+}
+
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/PropertyHashMap.java b/nashorn/src/jdk/nashorn/internal/runtime/PropertyHashMap.java
new file mode 100644
index 00000000000..f6b7b63f8a3
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/PropertyHashMap.java
@@ -0,0 +1,649 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Immutable hash map implementation for properties.  Properties are keyed on strings.
+ * Copying and cloning is avoided by relying on immutability.
+ * <p>
+ * When adding an element to a hash table, only the head of a bin list is updated, thus
+ * an add only requires the cloning of the bins array and adding an element to the head
+ * of the bin list.  Similarly for removal, only a portion of a bin list is updated.
+ * <p>
+ * A separate chronological list is kept for quick generation of keys and values, and,
+ * for rehashing.
+ * <p>
+ * Details:
+ * <p>
+ * The main goal is to be able to retrieve properties from a map quickly, keying on
+ * the property name (String.)  A secondary, but important goal, is to keep maps
+ * immutable, so that a map can be shared by multiple objects in a context.
+ * Sharing maps allows objects to be categorized as having similar properties, a
+ * fact that call site guards rely on.  In this discussion, immutability allows us
+ * to significantly reduce the amount of duplication we have in our maps.
+ * <p>
+ * The simplest of immutable maps is a basic singly linked list.  New properties
+ * are simply added to the head of the list.  Ancestor maps are not affected by the
+ * addition, since they continue to refer to their own head.  Searching is done by
+ * walking linearly though the elements until a match is found, O(N).
+ * <p>
+ * A hash map can be thought of as an optimization of a linked list map, where the
+ * linked list is broken into fragments based on hashCode(key) .  An array is use
+ * to quickly reference these fragments, indexing on hashCode(key) mod tableSize
+ * (tableSize is typically a power of 2 so that the mod is a fast masking
+ * operation.)  If the size of the table is sufficient large, then search time
+ * approaches O(1).  In fact, most bins in a hash table are typically empty or
+ * contain a one element list.
+ * <p>
+ * For immutable hash maps, we can think of the hash map as an array of the shorter
+ * linked list maps.  If we add an element to the head of one of those lists,  it
+ * doesn't affect any ancestor maps.  Thus adding an element to an immutable hash
+ * map only requires cloning the array and inserting an element at the head of one
+ * of the bins.
+ * <p>
+ * Using Java HashMaps we don't have enough control over the entries to allow us to
+ * implement this technique, so we are forced to clone the entire hash map.
+ * <p>
+ * Removing elements is done similarly.  We clone the array and then only modify
+ * the bin containing the removed element.  More often than not, the list contains
+ * only one element (or is very short), so this is not very costly.  When the list
+ * has several items, we need to clone the list portion prior to the removed item.
+ * <p>
+ * Another requirement of property maps is that we need to be able to gather all
+ * properties in chronological (add) order.  We have been using LinkedHashMap to
+ * provide this.  For the implementation of immutable hash map, we use a singly
+ * linked list that is linked in reverse chronological order.  This means we simply
+ * add new entries to the head of the list.  If we need to work with the list in
+ * forward order, it's simply a matter of allocating an array (size is known) and
+ * back filling in reverse order.  Removal of elements from the chronological list
+ * is trickier.  LinkedHashMap uses a doubly linked list to give constant time
+ * removal. Immutable hash maps can't do that and maintain immutability.  So we
+ * manage the chronological list the same way we manage the bins, cloning up to the
+ * point of removal.  Don't panic.  This cost is more than offset by the cost of
+ * cloning an entire LinkedHashMap.  Plus removal is far more rare than addition.
+ * <p>
+ * One more optimization.  Maps with a small number of entries don't use the hash
+ * map at all, the chronological list is used instead.
+ * <p>
+ * So the benefits from immutable arrays are; fewer objects and less copying.  For
+ * immutable hash map, when no removal is involved, the number of elements per
+ * property is two (bin + chronological elements).  For LinkedHashMap it is one
+ * (larger element) times the number of maps that refer to the property.  For
+ * immutable hash map, addition is constant time.  For LinkedHashMap it's O(N+C)
+ * since we have to clone the older map.
+ */
+public final class PropertyHashMap implements Map <String, Property> {
+    /** Number of initial bins. Power of 2. */
+    private static final int INITIAL_BINS = 16;
+
+    /** Threshold before using bins. */
+    private static final int LIST_THRESHOLD = 4;
+
+    /** Initial map. */
+    public static final PropertyHashMap EMPTY_MAP = new PropertyHashMap();
+
+    /** Number of properties in the map. */
+    private final int size;
+
+    /** Threshold before growing the bins. */
+    private final int threshold;
+
+    /** Reverse list of all properties. */
+    private final Element list;
+
+    /** Hash map bins. */
+    private final Element[] bins;
+
+    /** All properties as an array (lazy). */
+    private Property[] properties;
+
+    /**
+     * Empty map constructor.
+     */
+    private PropertyHashMap() {
+        this.size      = 0;
+        this.threshold = 0;
+        this.bins      = null;
+        this.list      = null;
+    }
+
+    /**
+     * Clone Constructor
+     *
+     * @param map Original {@link PropertyHashMap}.
+     */
+    private PropertyHashMap(final PropertyHashMap map) {
+        this.size      = map.size;
+        this.threshold = map.threshold;
+        this.bins      = map.bins;
+        this.list      = map.list;
+    }
+
+    /**
+     * Constructor used internally to extend a map
+     *
+     * @param size Size of the new {@link PropertyHashMap}.
+     * @param bins The hash bins.
+     * @param list The {@link Property} list.
+     */
+    private PropertyHashMap(final int size, final Element[] bins, final Element list) {
+        this.size      = size;
+        this.threshold = bins != null ? threeQuarters(bins.length) : 0;
+        this.bins      = bins;
+        this.list      = list;
+    }
+
+    /**
+     * Clone a {@link PropertyHashMap} and add a {@link Property}.
+     *
+     * @param property {@link Property} to add.
+     *
+     * @return New {@link PropertyHashMap}.
+     */
+    public PropertyHashMap immutableAdd(final Property property) {
+        final int newSize = size + 1;
+        PropertyHashMap newMap = cloneMap(newSize);
+        newMap = newMap.addNoClone(property);
+        return newMap;
+    }
+
+    /**
+     * Clone a {@link PropertyHashMap} and add an array of properties.
+     *
+     * @param newProperties Properties to add.
+     *
+     * @return New {@link PropertyHashMap}.
+     */
+    public PropertyHashMap immutableAdd(final Property... newProperties) {
+        final int newSize = size + newProperties.length;
+        PropertyHashMap newMap = cloneMap(newSize);
+        for (final Property property : newProperties) {
+            newMap = newMap.addNoClone(property);
+        }
+        return newMap;
+    }
+
+    /**
+     * Clone a {@link PropertyHashMap} and add a collection of properties.
+     *
+     * @param newProperties Properties to add.
+     *
+     * @return New {@link PropertyHashMap}.
+     */
+    public PropertyHashMap immutableAdd(final Collection<Property> newProperties) {
+        if (newProperties != null) {
+            final int newSize = size + newProperties.size();
+            PropertyHashMap newMap = cloneMap(newSize);
+            for (final Property property : newProperties) {
+                newMap = newMap.addNoClone(property);
+            }
+            return newMap;
+        }
+        return this;
+    }
+
+    /**
+     * Clone a {@link PropertyHashMap} and remove a {@link Property}.
+     *
+     * @param property {@link Property} to remove.
+     *
+     * @return New {@link PropertyHashMap}.
+     */
+    public PropertyHashMap immutableRemove(final Property property) {
+        return immutableRemove(property.getKey());
+    }
+
+    /**
+     * Clone a {@link PropertyHashMap} and remove a {@link Property} based on its key.
+     *
+     * @param key Key of {@link Property} to remove.
+     *
+     * @return New {@link PropertyHashMap}.
+     */
+    public PropertyHashMap immutableRemove(final String key) {
+        if (bins != null) {
+            final int binIndex = binIndex(bins, key);
+            final Element bin = bins[binIndex];
+            if (findElement(bin, key) != null) {
+                final int newSize = size - 1;
+                Element[] newBins = null;
+                if (newSize >= LIST_THRESHOLD) {
+                    newBins = bins.clone();
+                    newBins[binIndex] = removeFromList(bin, key);
+                }
+                final Element newList = removeFromList(list, key);
+                return new PropertyHashMap(newSize, newBins, newList);
+            }
+        } else if (findElement(list, key) != null) {
+            final int newSize = size - 1;
+            return newSize != 0 ? new PropertyHashMap(newSize, null, removeFromList(list, key)) : EMPTY_MAP;
+        }
+        return this;
+    }
+
+    /**
+     * Find a {@link Property} in the {@link PropertyHashMap}.
+     *
+     * @param key Key of {@link Property} to find.
+     *
+     * @return {@link Property} matching key or {@code null} if not found.
+     */
+    public Property find(final String key) {
+        final Element element = findElement(key);
+        return element != null ? element.getProperty() : null;
+    }
+
+    /**
+     * Return an array of properties in chronological order of adding.
+     *
+     * @return Array of all properties.
+     */
+    public Property[] getProperties() {
+        if (properties == null) {
+            final Property[] array = new Property[size];
+            int i = size;
+            for (Element element = list; element != null; element = element.getLink()) {
+                array[--i] = element.getProperty();
+            }
+            properties = array;
+        }
+        return properties;
+    }
+
+    /**
+     * Returns the bin index from the key.
+     *
+     * @param bins     The bins array.
+     * @param key      {@link Property} key.
+     *
+     * @return The bin index.
+     */
+    private static int binIndex(final Element[] bins, final String key) {
+        return  key.hashCode() & (bins.length - 1);
+    }
+
+    /**
+     * Calculate the number of bins needed to contain n properties.
+     *
+     * @param n Number of elements.
+     *
+     * @return Number of bins required.
+     */
+    private static int binsNeeded(final int n) {
+        // Allow for 25% padding.
+        return 1 << (32 - Integer.numberOfLeadingZeros((n + oneQuarter(n)) | (INITIAL_BINS - 1)));
+    }
+
+    /**
+     * Used to calculate the current capacity of the bins.
+     *
+     * @param n Number of bin slots.
+     *
+     * @return 75% of n.
+     */
+    private static int threeQuarters(final int n) {
+        return (n >>> 1) + (n >>> 2);
+    }
+
+    /**
+     * Used to calculate the current capacity of the bins.
+     *
+     * @param n Number of bin slots.
+     *
+     * @return 25% of n.
+     */
+    private static int oneQuarter(final int n) {
+        return n >>> 2;
+    }
+
+    /**
+     * Regenerate the bin table after changing the number of bins.
+     *
+     * @param list    // List of all properties.
+     * @param newSize // New size of {@link PropertyHashMap}.
+     *
+     * @return Populated bins.
+     */
+    private static Element[] rehash(final Element list, final int newSize) {
+        final int binsNeeded = binsNeeded(newSize);
+        final Element[] newBins = new Element[binsNeeded];
+        for (Element element = list; element != null; element = element.getLink()) {
+            final Property property = element.getProperty();
+            final String key = property.getKey();
+            final int binIndex = binIndex(newBins, key);
+            newBins[binIndex] = new Element(newBins[binIndex], property);
+        }
+        return newBins;
+    }
+
+    /**
+     * Locate an element based on key.
+     *
+     * @param key {@link Element} key.
+     *
+     * @return {@link Element} matching key or {@code null} if not found.
+     */
+    private Element findElement(final String key) {
+        if (bins != null) {
+            final int binIndex = binIndex(bins, key);
+            return findElement(bins[binIndex], key);
+        }
+        return findElement(list, key);
+    }
+
+    /**
+     * Locate an {@link Element} based on key from a specific list.
+     *
+     * @param elementList Head of {@link Element} list
+     * @param key         {@link Element} key.
+     * @return {@link Element} matching key or {@code null} if not found.
+     */
+    private static Element findElement(final Element elementList, final String key) {
+        final int hashCode = key.hashCode();
+        for (Element element = elementList; element != null; element = element.getLink()) {
+            if (element.match(key, hashCode)) {
+                return element;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Clone {@link PropertyHashMap} to accommodate new size.
+     *
+     * @param newSize New size of {@link PropertyHashMap}.
+     *
+     * @return Cloned {@link PropertyHashMap} with new size.
+     */
+    private PropertyHashMap cloneMap(final int newSize) {
+        Element[] newBins;
+        if (bins == null && newSize <= LIST_THRESHOLD) {
+            newBins = null;
+        } else if (newSize > threshold) {
+            newBins = rehash(list, newSize);
+        } else {
+            newBins = bins.clone();
+        }
+        return new PropertyHashMap(newSize, newBins, list);
+    }
+
+    /**
+     * Add a {@link Property} to a temporary {@link PropertyHashMap}, that has
+     * been already cloned.  Removes duplicates if necessary.
+     *
+     * @param property {@link Property} to add.
+     *
+     * @return New {@link PropertyHashMap}.
+     */
+    private PropertyHashMap addNoClone(final Property property) {
+        int newSize = size;
+        final String key = property.getKey();
+        Element newList = list;
+        if (bins != null) {
+            final int binIndex = binIndex(bins, key);
+            Element bin = bins[binIndex];
+            if (findElement(bin, key) != null) {
+                newSize--;
+                bin = removeFromList(bin, key);
+                newList = removeFromList(list, key);
+            }
+            bins[binIndex] = new Element(bin, property);
+        } else {
+            if (findElement(list, key) != null) {
+                newSize--;
+                newList = removeFromList(list, key);
+            }
+        }
+        newList = new Element(newList, property);
+        return new PropertyHashMap(newSize, bins, newList);
+    }
+
+    /**
+     * Removes an {@link Element} from a specific list, avoiding duplication.
+     *
+     * @param list List to remove from.
+     * @param key  Key of {@link Element} to remove.
+     *
+     * @return New list with {@link Element} removed.
+     */
+    private static Element removeFromList(final Element list, final String key) {
+        if (list == null) {
+            return null;
+        }
+        final int hashCode = key.hashCode();
+        if (list.match(key, hashCode)) {
+            return list.getLink();
+        }
+        final Element head = new Element(null, list.getProperty());
+        Element previous = head;
+        for (Element element = list.getLink(); element != null; element = element.getLink()) {
+            if (element.match(key, hashCode)) {
+                previous.setLink(element.getLink());
+                return head;
+            }
+            final Element next = new Element(null, element.getProperty());
+            previous.setLink(next);
+            previous = next;
+        }
+        return list;
+    }
+
+    /*
+     * Map implementation
+     */
+
+    @Override
+    public int size() {
+        return size;
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return size == 0;
+    }
+
+    @Override
+    public boolean containsKey(final Object key) {
+        if (key instanceof String) {
+            return findElement((String)key) != null;
+        }
+        assert key instanceof String;
+        return false;
+    }
+
+    /**
+     * Check if the map contains a key.
+     *
+     * @param key {@link Property} key.
+     *
+     * @return {@code true} of key is in {@link PropertyHashMap}.
+     */
+    public boolean containsKey(final String key) {
+        return findElement(key) != null;
+    }
+
+    @Override
+    public boolean containsValue(final Object value) {
+        if (value instanceof Property) {
+            final Property property = (Property) value;
+            final Element element = findElement(property.getKey());
+            return element != null && element.getProperty().equals(value);
+        }
+        return false;
+    }
+
+    @Override
+    public Property get(final Object key) {
+        if (key instanceof String) {
+            final Element element = findElement((String)key);
+            return element != null ? element.getProperty() : null;
+        }
+        assert key instanceof String;
+        return null;
+    }
+
+    /**
+     * Get the {@link Property} given a key that is an explicit {@link String}.
+     * See also {@link PropertyHashMap#get(Object)}
+     *
+     * @param key {@link Property} key.
+     *
+     * @return {@link Property}, or {@code null} if no property with that key was found.
+     */
+    public Property get(final String key) {
+        final Element element = findElement(key);
+        return element != null ? element.getProperty() : null;
+    }
+
+    @Override
+    public Property put(final String key, final Property value) {
+        throw new UnsupportedOperationException("Immutable map.");
+    }
+
+    @Override
+    public Property remove(final Object key) {
+        throw new UnsupportedOperationException("Immutable map.");
+    }
+
+    @Override
+    public void putAll(final Map<? extends String, ? extends Property> m) {
+        throw new UnsupportedOperationException("Immutable map.");
+    }
+
+    @Override
+    public void clear() {
+        throw new UnsupportedOperationException("Immutable map.");
+    }
+
+    @Override
+    public Set<String> keySet() {
+        final HashSet<String> set = new HashSet<>();
+        for (Element element = list; element != null; element = element.getLink()) {
+            set.add(element.getKey());
+        }
+        return Collections.unmodifiableSet(set);
+    }
+
+    @Override
+    public Collection<Property> values() {
+        return Collections.unmodifiableList(Arrays.asList(getProperties()));
+    }
+
+    @Override
+    public Set<Entry<String, Property>> entrySet() {
+        final HashSet<Entry<String, Property>> set = new HashSet<>();
+        for (Element element = list; element != null; element = element.getLink()) {
+            set.add(element);
+        }
+        return Collections.unmodifiableSet(set);
+    }
+
+    /**
+     * List map element.
+     */
+    static final class Element implements Entry<String, Property> {
+        /** Link for list construction. */
+        private Element link;
+
+        /** Element property. */
+        private final Property property;
+
+        /** Element key. Kept separate for performance.) */
+        private final String key;
+
+        /** Element key hash code. */
+        private final int hashCode;
+
+        /*
+         * Constructors
+         */
+
+        Element(final Element link, final Property property) {
+            this.link     = link;
+            this.property = property;
+            this.key      = property.getKey();
+            this.hashCode = this.key.hashCode();
+        }
+
+        boolean match(final String otherKey, final int otherHashCode) {
+            return this.hashCode == otherHashCode && this.key.equals(otherKey);
+        }
+
+        /*
+         * Entry implmentation.
+         */
+
+        @Override
+        public boolean equals(final Object other) {
+            assert property != null && other != null;
+            return other instanceof Property && property.equals(other);
+        }
+
+        @Override
+        public String getKey() {
+            return key;
+        }
+
+        @Override
+        public Property getValue() {
+            return property;
+        }
+
+        @Override
+        public int hashCode() {
+            return hashCode;
+        }
+
+        @Override
+        public Property setValue(final Property value) {
+            throw new UnsupportedOperationException("Immutable map.");
+        }
+
+        /*
+         * Accessors
+         */
+
+        Element getLink() {
+            return link;
+        }
+
+        void setLink(final Element link) {
+            this.link = link;
+        }
+
+        Property getProperty() {
+            return property;
+        }
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/PropertyListener.java b/nashorn/src/jdk/nashorn/internal/runtime/PropertyListener.java
new file mode 100644
index 00000000000..2c4d368f9af
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/PropertyListener.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+/**
+ * Property change listener gets notified whenever properties are added/deleted/modified.
+ */
+public interface PropertyListener {
+    /**
+     * A new property is being added.
+     *
+     * @param object The ScriptObject to which property was added.
+     * @param prop The new Property added.
+     */
+    public void propertyAdded(ScriptObject object, Property prop);
+
+    /**
+     * An existing property is being deleted.
+     *
+     * @param object The ScriptObject whose property is being deleted.
+     * @param prop The property being deleted.
+     */
+    public void propertyDeleted(ScriptObject object, Property prop);
+
+    /**
+     * An existing Property is being replaced with a new Property.
+     *
+     * @param object The ScriptObject whose property is being modified.
+     * @param oldProp The old property that is being replaced.
+     * @param newProp The new property that replaces the old property.
+     *
+     */
+    public void propertyModified(ScriptObject object, Property oldProp, Property newProp);
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/PropertyListenerManager.java b/nashorn/src/jdk/nashorn/internal/runtime/PropertyListenerManager.java
new file mode 100644
index 00000000000..b2b55183666
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/PropertyListenerManager.java
@@ -0,0 +1,192 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * Helper class to manage property listeners and notification.
+ */
+public class PropertyListenerManager implements PropertyListener {
+
+    // These counters are updated in debug mode
+    private static int listenersAdded;
+    private static int listenersRemoved;
+    private static int listenersDead;
+
+    /**
+     * @return the listenersAdded
+     */
+    public static int getListenersAdded() {
+        return listenersAdded;
+    }
+
+    /**
+     * @return the listenersRemoved
+     */
+    public static int getListenersRemoved() {
+        return listenersRemoved;
+    }
+
+    /**
+     * @return the listenersDead
+     */
+    public static int getListenersDead() {
+        return listenersDead;
+    }
+
+    /** property listeners for this object. */
+    private List<WeakReference<PropertyListener>> listeners;
+
+    // Property listener management methods
+
+    /**
+     * Add a property listener to this object.
+     *
+     * @param listener The property listener that is added.
+     */
+    public final void addPropertyListener(final PropertyListener listener) {
+        if (listeners == null) {
+            listeners = new ArrayList<>();
+        }
+        if (Context.DEBUG) {
+            listenersAdded++;
+        }
+        listeners.add(new WeakReference<>(listener));
+    }
+
+    /**
+     * Remove a property listener from this object.
+     *
+     * @param listener The property listener that is removed.
+     */
+    public final void removePropertyListener(final PropertyListener listener) {
+        if (listeners != null) {
+            final Iterator<WeakReference<PropertyListener>> iter = listeners.iterator();
+            while (iter.hasNext()) {
+                if (iter.next().get() == listener) {
+                    if (Context.DEBUG) {
+                        listenersRemoved++;
+                    }
+                    iter.remove();
+                }
+            }
+        }
+    }
+
+    /**
+     * This method can be called to notify property addition to this object's listeners.
+     *
+     * @param object The ScriptObject to which property was added.
+     * @param prop The property being added.
+     */
+    protected final void notifyPropertyAdded(final ScriptObject object, final Property prop) {
+        if (listeners != null) {
+            final Iterator<WeakReference<PropertyListener>> iter = listeners.iterator();
+            while (iter.hasNext()) {
+                final WeakReference<PropertyListener> weakRef = iter.next();
+                final PropertyListener listener = weakRef.get();
+                if (listener == null) {
+                    if (Context.DEBUG) {
+                        listenersDead++;
+                    }
+                    iter.remove();
+                } else {
+                    listener.propertyAdded(object, prop);
+                }
+            }
+        }
+    }
+
+    /**
+     * This method can be called to notify property deletion to this object's listeners.
+     *
+     * @param object The ScriptObject from which property was deleted.
+     * @param prop The property being deleted.
+     */
+    protected final void notifyPropertyDeleted(final ScriptObject object, final Property prop) {
+        if (listeners != null) {
+            final Iterator<WeakReference<PropertyListener>> iter = listeners.iterator();
+            while (iter.hasNext()) {
+                final WeakReference<PropertyListener> weakRef = iter.next();
+                final PropertyListener listener = weakRef.get();
+                if (listener == null) {
+                    if (Context.DEBUG) {
+                        listenersDead++;
+                    }
+                    iter.remove();
+                } else {
+                    listener.propertyDeleted(object, prop);
+                }
+            }
+        }
+    }
+
+    /**
+     * This method can be called to notify property modification to this object's listeners.
+     *
+     * @param object The ScriptObject to which property was modified.
+     * @param oldProp The old property being replaced.
+     * @param newProp The new property that replaces the old property.
+     */
+    protected final void notifyPropertyModified(final ScriptObject object, final Property oldProp, final Property newProp) {
+        if (listeners != null) {
+            final Iterator<WeakReference<PropertyListener>> iter = listeners.iterator();
+            while (iter.hasNext()) {
+                final WeakReference<PropertyListener> weakRef = iter.next();
+                final PropertyListener listener = weakRef.get();
+                if (listener == null) {
+                    if (Context.DEBUG) {
+                        listenersDead++;
+                    }
+                    iter.remove();
+                } else {
+                    listener.propertyModified(object, oldProp, newProp);
+                }
+            }
+        }
+    }
+
+    // PropertyListener methods
+
+    @Override
+    public final void propertyAdded(final ScriptObject object, final Property prop) {
+        notifyPropertyAdded(object, prop);
+    }
+
+    @Override
+    public final void propertyDeleted(final ScriptObject object, final Property prop) {
+        notifyPropertyDeleted(object, prop);
+    }
+
+    @Override
+    public final void propertyModified(final ScriptObject object, final Property oldProp, final Property newProp) {
+        notifyPropertyModified(object, oldProp, newProp);
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java b/nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java
new file mode 100644
index 00000000000..29a838bf633
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java
@@ -0,0 +1,919 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import static jdk.nashorn.internal.runtime.PropertyHashMap.EMPTY_MAP;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.SwitchPoint;
+import java.lang.ref.WeakReference;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.WeakHashMap;
+
+/**
+ * Map of object properties. The PropertyMap is the "template" for JavaScript object
+ * layouts. It contains a map with prototype names as keys and {@link Property} instances
+ * as values. A PropertyMap is typically passed to the {@link ScriptObject} constructor
+ * to form the seed map for the ScriptObject.
+ * <p>
+ * All property maps are immutable. If a property is added, modified or removed, the mutator
+ * will return a new map.
+ */
+public final class PropertyMap implements Iterable<Object>, PropertyListener {
+    /** Is this a prototype PropertyMap? */
+    public static final int IS_PROTOTYPE          = 0b0000_0001;
+    /** Used for non extensible PropertyMaps, negative logic as the normal case is extensible. See {@link ScriptObject#preventExtensions()} */
+    public static final int NOT_EXTENSIBLE        = 0b0000_0010;
+    /** This mask is used to preserve certain flags when cloning the PropertyMap. Others should not be copied */
+    private static final int CLONEABLE_FLAGS_MASK = 0b0000_1111;
+    /** Has a listener been added to this property map. This flag is not copied when cloning a map. See {@link PropertyListener} */
+    public static final int IS_LISTENER_ADDED     = 0b0001_0000;
+
+    /** Map status flags. */
+    private int flags;
+
+    /** Class of object referenced.*/
+    private final Class<?> structure;
+
+    /** Context associated with this {@link PropertyMap}. */
+    private final Context context;
+
+    /** Map of properties. */
+    private final PropertyHashMap properties;
+
+    /** objects proto. */
+    private ScriptObject proto;
+
+    /** Length of spill in use. */
+    private int spillLength;
+
+    /** {@link SwitchPoint}s for gets on inherited properties. */
+    private Map<String, SwitchPoint> protoGetSwitches;
+
+    /** History of maps, used to limit map duplication. */
+    private HashMap<Property, PropertyMap> history;
+
+    /** History of prototypes, used to limit map duplication. */
+    private WeakHashMap<ScriptObject, WeakReference<PropertyMap>> protoHistory;
+
+    /** Cache for hashCode */
+    private int hashCode;
+
+    /**
+     * Constructor.
+     *
+     * @param structure  Class the map's {@link AccessorProperty}s apply to.
+     * @param context    Context associated with this {@link PropertyMap}.
+     * @param properties A {@link PropertyHashMap} with initial contents.
+     */
+    PropertyMap(final Class<?> structure, final Context context, final PropertyHashMap properties) {
+        this.structure  = structure;
+        this.context    = context;
+        this.properties = properties;
+        this.hashCode   = computeHashCode();
+
+        if (Context.DEBUG) {
+            count++;
+        }
+    }
+
+    /**
+     * Cloning constructor.
+     *
+     * @param propertyMap Existing property map.
+     * @param properties  A {@link PropertyHashMap} with a new set of properties.
+     */
+    private PropertyMap(final PropertyMap propertyMap, final PropertyHashMap properties) {
+        this.structure   = propertyMap.structure;
+        this.context     = propertyMap.context;
+        this.properties  = properties;
+        this.flags       = propertyMap.getClonedFlags();
+        this.proto       = propertyMap.proto;
+        this.spillLength = propertyMap.spillLength;
+        this.hashCode    = computeHashCode();
+
+        if (Context.DEBUG) {
+            count++;
+            clonedCount++;
+        }
+    }
+
+    /**
+     * Duplicates this PropertyMap instance. This is used by nasgen generated
+     * prototype and constructor classes. {@link PropertyMap} used for singletons
+     * like these (and global instance) are duplicated using this method and used.
+     * The original filled map referenced by static fields of prototype and
+     * constructor classes are not touched. This allows multiple independent global
+     * instances to be used within a single context instance.
+     *
+     * @return Duplicated {@link PropertyMap}.
+     */
+    public PropertyMap duplicate() {
+        return new PropertyMap(this.structure, this.context, this.properties);
+    }
+
+    /**
+     * Public property map allocator.
+     *
+     * @param structure  Class the map's {@link AccessorProperty}s apply to.
+     * @param properties Collection of initial properties.
+     *
+     * @return New {@link PropertyMap}.
+     */
+    public static PropertyMap newMap(final Class<?> structure, final Collection<Property> properties) {
+        final Context context = Context.fromClass(structure);
+
+        // Reduce the number of empty maps in the context.
+        if (structure == jdk.nashorn.internal.scripts.JO$.class) {
+            return context.emptyMap;
+        }
+
+        PropertyHashMap newProperties = EMPTY_MAP.immutableAdd(properties);
+
+        return new PropertyMap(structure, context, newProperties);
+    }
+
+    /**
+     * Public property map factory allocator
+     *
+     * @param structure  Class the map's {@link AccessorProperty}s apply to.
+     *
+     * @return New {@link PropertyMap}.
+     */
+    public static PropertyMap newMap(final Class<?> structure) {
+        return newMap(structure, null);
+    }
+
+    /**
+     * Return a sharable empty map.
+     *
+     * @return New empty {@link PropertyMap}.
+     */
+    public static PropertyMap newEmptyMap(Context context) {
+        return new PropertyMap(jdk.nashorn.internal.scripts.JO$.class, context, EMPTY_MAP);
+    }
+
+    /**
+     * Return number of properties in the map.
+     *
+     * @return Number of properties.
+     */
+    public int size() {
+        return properties.size();
+    }
+
+    /**
+     * Return a SwitchPoint used to track changes of a property in a prototype.
+     *
+     * @param key {@link Property} key.
+     *
+     * @return A shared {@link SwitchPoint} for the property.
+     */
+    public SwitchPoint getProtoGetSwitchPoint(final String key) {
+        if (proto == null) {
+            return null;
+        }
+
+        if (protoGetSwitches == null) {
+            protoGetSwitches = new HashMap<>();
+            if (! isListenerAdded()) {
+                proto.addPropertyListener(this);
+                setIsListenerAdded();
+            }
+        }
+
+        if (protoGetSwitches.containsKey(key)) {
+            return protoGetSwitches.get(key);
+        }
+
+        final SwitchPoint switchPoint = new SwitchPoint();
+        protoGetSwitches.put(key, switchPoint);
+
+        return switchPoint;
+    }
+
+    /**
+     * Indicate that a prototype property hash changed.
+     *
+     * @param property {@link Property} to invalidate.
+     */
+    private void invalidateProtoGetSwitchPoint(final Property property) {
+        if (protoGetSwitches != null) {
+            final String key = property.getKey();
+            final SwitchPoint sp = protoGetSwitches.get(key);
+            if (sp != null) {
+                protoGetSwitches.put(key, new SwitchPoint());
+                if (Context.DEBUG) {
+                    protoInvalidations++;
+                }
+                SwitchPoint.invalidateAll(new SwitchPoint[] { sp });
+            }
+        }
+    }
+
+    /**
+     * Add a property to the map.
+     *
+     * @param property {@link Property} being added.
+     *
+     * @return New {@link PropertyMap} with {@link Property} added.
+     */
+    public PropertyMap newProperty(final Property property) {
+        return addProperty(property);
+    }
+
+    /**
+     * Add a property to the map, re-binding its getters and setters,
+     * if available, to a given receiver. This is typically the global scope. See
+     * {@link ScriptObject#addBoundProperties(ScriptObject)}
+     *
+     * @param property {@link Property} being added.
+     * @param bindTo   Object to bind to.
+     *
+     * @return New {@link PropertyMap} with {@link Property} added.
+     */
+    PropertyMap newPropertyBind(final AccessorProperty property, final ScriptObject bindTo) {
+        return newProperty(new AccessorProperty(property, bindTo));
+    }
+
+    /**
+     * Add a new accessor property to the map.
+     *
+     * @param key           {@link Property} key.
+     * @param propertyFlags {@link Property} flags.
+     * @param getter        {@link Property} get accessor method.
+     * @param setter        {@link Property} set accessor method.
+     *
+     * @return  New {@link PropertyMap} with {@link AccessorProperty} added.
+     */
+    public PropertyMap newProperty(final String key, final int propertyFlags, final MethodHandle getter, final MethodHandle setter) {
+        return newProperty(new AccessorProperty(key, propertyFlags, getter, setter));
+    }
+
+    /**
+     * Add a property to the map.  Cloning or using an existing map if available.
+     *
+     * @param property {@link Property} being added.
+     *
+     * @return New {@link PropertyMap} with {@link Property} added.
+     */
+    PropertyMap addProperty(final Property property) {
+        PropertyMap newMap = checkHistory(property);
+
+        if (newMap == null) {
+            final PropertyHashMap newProperties = properties.immutableAdd(property);
+            newMap = new PropertyMap(this, newProperties);
+            addToHistory(property, newMap);
+            newMap.spillLength += property.getSpillCount();
+        }
+
+        return newMap;
+    }
+
+    /**
+     * Remove a property from a map. Cloning or using an existing map if available.
+     *
+     * @param property {@link Property} being removed.
+     *
+     * @return New {@link PropertyMap} with {@link Property} removed or {@code null} if not found.
+     */
+    PropertyMap deleteProperty(final Property property) {
+        PropertyMap newMap = checkHistory(property);
+        final String key = property.getKey();
+
+        if (newMap == null && properties.containsKey(key)) {
+            final PropertyHashMap newProperties = properties.immutableRemove(key);
+            newMap = new PropertyMap(this, newProperties);
+            addToHistory(property, newMap);
+        }
+
+        return newMap;
+    }
+
+    /**
+     * Replace an existing property with a new one.
+     *
+     * @param oldProperty Property to replace.
+     * @param newProperty New {@link Property}.
+     *
+     * @return New {@link PropertyMap} with {@link Property} replaced.
+     */
+    PropertyMap replaceProperty(final Property oldProperty, final Property newProperty) {
+        // Add replaces existing property.
+        final PropertyHashMap newProperties = properties.immutableAdd(newProperty);
+        final PropertyMap newMap = new PropertyMap(this, newProperties);
+
+        /*
+         * See ScriptObject.modifyProperty and ScriptObject.setUserAccessors methods.
+         *
+         * This replaceProperty method is called only for the following three cases:
+         *
+         *   1. To change flags OR TYPE of an old (cloned) property. We use the same spill slots.
+         *   2. To change one UserAccessor property with another - user getter or setter changed via
+         *      Object.defineProperty function. Again, same spill slots are re-used.
+         *   3. Via ScriptObject.setUserAccessors method to set user getter and setter functions
+         *      replacing the dummy AccessorProperty with null method handles (added during map init).
+         *
+         * In case (1) and case(2), the property type of old and new property is same. For case (3),
+         * the old property is an AccessorProperty and the new one is a UserAccessorProperty property.
+         */
+
+        final boolean sameType = (oldProperty.getClass() == newProperty.getClass());
+        assert sameType ||
+                (oldProperty instanceof AccessorProperty &&
+                newProperty instanceof UserAccessorProperty) : "arbitrary replaceProperty attempted";
+
+        newMap.flags = getClonedFlags();
+        newMap.proto = proto;
+
+        /*
+         * spillLength remains same in case (1) and (2) because of slot reuse. Only for case (3), we need
+         * to add spill count of the newly added UserAccessorProperty property.
+         */
+        newMap.spillLength = spillLength + (sameType? 0 : newProperty.getSpillCount());
+        return newMap;
+    }
+
+    /**
+     * Find a property in the map.
+     *
+     * @param key Key to search for.
+     *
+     * @return {@link Property} matching key.
+     */
+    public Property findProperty(final String key) {
+        return properties.find(key);
+    }
+
+    /**
+     * Adds all map properties from another map.
+     *
+     * @param other The source of properties.
+     *
+     * @return New {@link PropertyMap} with added properties.
+     */
+    public PropertyMap addAll(final PropertyMap other) {
+        final Property[] otherProperties = other.properties.getProperties();
+        final PropertyHashMap newProperties = properties.immutableAdd(otherProperties);
+
+        final PropertyMap newMap = new PropertyMap(this, newProperties);
+        for (final Property property : otherProperties) {
+            newMap.spillLength += property.getSpillCount();
+        }
+
+        return newMap;
+    }
+
+    /**
+     * Return an array of all properties.
+     *
+     * @return Properties as an array.
+     */
+    public Property[] getProperties() {
+        return properties.getProperties();
+    }
+
+    /**
+     * Prevents the map from having additional properties.
+     *
+     * @return New map with {@link #NOT_EXTENSIBLE} flag set.
+     */
+    PropertyMap preventExtensions() {
+        final PropertyMap newMap = new PropertyMap(this, this.properties);
+        newMap.flags |= NOT_EXTENSIBLE;
+        return newMap;
+    }
+
+    /**
+     * Prevents properties in map from being modified.
+     *
+     * @return New map with {@link NOT_EXTENSIBLE} flag set and properties with
+     * {@link Property.NOT_CONFIGURABLE} set.
+     */
+    PropertyMap seal() {
+        PropertyHashMap newProperties = EMPTY_MAP;
+
+        for (final Property oldProperty :  properties.getProperties()) {
+            newProperties = newProperties.immutableAdd(oldProperty.addFlags(Property.NOT_CONFIGURABLE));
+        }
+
+        final PropertyMap newMap = new PropertyMap(this, newProperties);
+        newMap.flags |= NOT_EXTENSIBLE;
+
+        return newMap;
+    }
+
+    /**
+     * Prevents properties in map from being modified or written to.
+     *
+     * @return New map with {@link #NOT_EXTENSIBLE} flag set and properties with
+     * {@link Property.NOT_CONFIGURABLE} and {@link Property.NOT_WRITABLE} set.
+     */
+    PropertyMap freeze() {
+        PropertyHashMap newProperties = EMPTY_MAP;
+
+        for (Property oldProperty : properties.getProperties()) {
+            int propertyFlags = Property.NOT_CONFIGURABLE;
+
+            if (!(oldProperty instanceof UserAccessorProperty)) {
+                propertyFlags |= Property.NOT_WRITABLE;
+            }
+
+            newProperties = newProperties.immutableAdd(oldProperty.addFlags(propertyFlags));
+        }
+
+        final PropertyMap newMap = new PropertyMap(this, newProperties);
+        newMap.flags |= NOT_EXTENSIBLE;
+
+        return newMap;
+    }
+
+    /**
+     * Check for any configurable properties.
+     *
+     * @return {@code true} if any configurable.
+     */
+    private boolean anyConfigurable() {
+        for (final Property property : properties.getProperties()) {
+            if (property.isConfigurable()) {
+               return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Check if all properties are frozen.
+     *
+     * @return {@code true} if all are frozen.
+     */
+    private boolean allFrozen() {
+        for (final Property property : properties.getProperties()) {
+            // check if it is a data descriptor
+            if (!(property instanceof UserAccessorProperty)) {
+                if (property.isWritable()) {
+                    return false;
+                }
+            }
+            if (property.isConfigurable()) {
+               return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Check prototype history for an existing property map with specified prototype.
+     *
+     * @param newProto New prototype object.
+     *
+     * @return Existing {@link PropertyMap} or {@code null} if not found.
+     */
+    private PropertyMap checkProtoHistory(final ScriptObject newProto) {
+        final PropertyMap cachedMap;
+        if (protoHistory != null) {
+            final WeakReference<PropertyMap> weakMap = protoHistory.get(newProto);
+            cachedMap = (weakMap != null ? weakMap.get() : null);
+        } else {
+            cachedMap = null;
+        }
+
+        if (Context.DEBUG && cachedMap != null) {
+            protoHistoryHit++;
+        }
+
+        return cachedMap;
+    }
+
+    /**
+     * Add a map to the prototype history.
+     *
+     * @param newProto Prototype to add (key.)
+     * @param newMap   {@link PropertyMap} associated with prototype.
+     */
+    private void addToProtoHistory(final ScriptObject newProto, final PropertyMap newMap) {
+        if (protoHistory == null) {
+            protoHistory = new WeakHashMap<>();
+        }
+
+        protoHistory.put(newProto, new WeakReference<>(newMap));
+    }
+
+    /**
+     * Track the modification of the map.
+     *
+     * @param property Mapping property.
+     * @param newMap   Modified {@link PropertyMap}.
+     */
+    private void addToHistory(final Property property, final PropertyMap newMap) {
+        if (history == null) {
+            history = new LinkedHashMap<>();
+        }
+
+        history.put(property, newMap);
+    }
+
+    /**
+     * Check the history for a map that already has the given property added.
+     *
+     * @param property {@link Property} to add.
+     *
+     * @return Existing map or {@code null} if not found.
+     */
+    private PropertyMap checkHistory(final Property property) {
+        if (history != null) {
+            PropertyMap historicMap = history.get(property);
+
+            if (historicMap != null) {
+                if (Context.DEBUG) {
+                    historyHit++;
+                }
+
+                return historicMap;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Calculate the hash code for the map.
+     *
+     * @return Computed hash code.
+     */
+    private int computeHashCode() {
+        int hash = structure.hashCode();
+
+        if (proto != null) {
+            hash ^= proto.hashCode();
+        }
+
+        for (final Property property : getProperties()) {
+            hash = hash << 7 ^ hash >> 7;
+            hash ^= property.hashCode();
+        }
+
+        return hash;
+    }
+
+    @Override
+    public int hashCode() {
+        return hashCode;
+    }
+
+    @Override
+    public boolean equals(final Object other) {
+        if (!(other instanceof PropertyMap)) {
+            return false;
+        }
+
+        final PropertyMap otherMap = (PropertyMap)other;
+
+        if (structure != otherMap.structure ||
+            proto != otherMap.proto ||
+            properties.size() != otherMap.properties.size()) {
+            return false;
+        }
+
+        final Iterator<Property> iter      = properties.values().iterator();
+        final Iterator<Property> otherIter = otherMap.properties.values().iterator();
+
+        while (iter.hasNext() && otherIter.hasNext()) {
+            if (!iter.next().equals(otherIter.next())) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        final StringBuilder sb = new StringBuilder();
+
+        sb.append(" [");
+        boolean isFirst = true;
+
+        for (final Property property : properties.values()) {
+            if (!isFirst) {
+                sb.append(", ");
+            }
+
+            isFirst = false;
+
+            sb.append(ScriptRuntime.safeToString(property.getKey()));
+            final Class<?> ctype = property.getCurrentType();
+            sb.append(" <" + property.getClass().getSimpleName() + ":" + (ctype == null ? "undefined" : ctype.getSimpleName()) + ">");
+        }
+
+        sb.append(']');
+
+        return sb.toString();
+    }
+
+    @Override
+    public Iterator<Object> iterator() {
+        return new PropertyMapIterator(this);
+    }
+
+    /**
+     * Return map's {@link Context}.
+     *
+     * @return The {@link Context} where the map originated.
+     */
+    Context getContext() {
+        return context;
+    }
+
+    /**
+     * Check if this map is a prototype
+     *
+     * @return {@code true} if is prototype
+     */
+    public boolean isPrototype() {
+        return (flags & IS_PROTOTYPE) != 0;
+    }
+
+    /**
+     * Flag this map as having a prototype.
+     */
+    private void setIsPrototype() {
+        flags |= IS_PROTOTYPE;
+    }
+
+    /**
+     * Check whether a {@link PropertyListener} has been added to this map.
+     *
+     * @return {@code true} if {@link PropertyListener} exists
+     */
+    public boolean isListenerAdded() {
+        return (flags & IS_LISTENER_ADDED) != 0;
+    }
+
+    /**
+     * Test to see if {@link PropertyMap} is extensible.
+     *
+     * @return {@code true} if {@link PropertyMap} can be added to.
+     */
+    boolean isExtensible() {
+        return (flags & NOT_EXTENSIBLE) == 0;
+    }
+
+    /**
+     * Test to see if {@link PropertyMap} is not extensible or any properties
+     * can not be modified.
+     *
+     * @return {@code true} if {@link PropertyMap} is sealed.
+     */
+    boolean isSealed() {
+        return !isExtensible() && !anyConfigurable();
+    }
+
+    /**
+     * Test to see if {@link PropertyMap} is not extensible or all properties
+     * can not be modified.
+     *
+     * @return {@code true} if {@link PropertyMap} is frozen.
+     */
+    boolean isFrozen() {
+        return !isExtensible() && allFrozen();
+    }
+
+    /**
+     * Get length of spill area associated with this {@link PropertyMap}.
+     *
+     * @return Length of spill area.
+     */
+    int getSpillLength() {
+        return spillLength;
+    }
+
+    /**
+     * Return the prototype of objects associated with this {@link PropertyMap}.
+     *
+     * @return Prototype object.
+     */
+    ScriptObject getProto() {
+        return proto;
+    }
+
+    /**
+     * Set the prototype of objects associated with this {@link PropertyMap}.
+     *
+     * @param newProto Prototype object to use.
+     *
+     * @return New {@link PropertyMap} with prototype changed.
+     */
+    PropertyMap setProto(final ScriptObject newProto) {
+        final ScriptObject oldProto = this.proto;
+
+        if (oldProto == newProto) {
+            return this;
+        }
+
+        final PropertyMap nextMap = checkProtoHistory(newProto);
+        if (nextMap != null) {
+            return nextMap;
+        }
+
+        if (Context.DEBUG) {
+            incrementSetProtoNewMapCount();
+        }
+        final PropertyMap newMap = new PropertyMap(this, this.properties);
+        addToProtoHistory(newProto, newMap);
+
+        newMap.proto = newProto;
+
+        if (oldProto != null && newMap.isListenerAdded()) {
+            oldProto.removePropertyListener(newMap);
+        }
+
+        if (newProto != null) {
+            newProto.getMap().setIsPrototype();
+        }
+
+        return newMap;
+    }
+
+    /**
+     * Indicate that the map has listeners.
+     */
+    private void setIsListenerAdded() {
+        flags |= IS_LISTENER_ADDED;
+    }
+
+    /**
+     * Return only the flags that should be copied during cloning.
+     *
+     * @return Subset of flags that should be copied.
+     */
+    private int getClonedFlags() {
+        return flags & CLONEABLE_FLAGS_MASK;
+    }
+
+    /**
+     * {@link PropertyMap} iterator.
+     */
+    private static class PropertyMapIterator implements Iterator<Object> {
+        /** Property iterator. */
+        final Iterator<Property> iter;
+
+        /** Current Property. */
+        Property property;
+
+        /**
+         * Constructor.
+         *
+         * @param propertyMap {@link PropertyMap} to iterate over.
+         */
+        PropertyMapIterator(final PropertyMap propertyMap) {
+            iter = Arrays.asList(propertyMap.properties.getProperties()).iterator();
+            property = iter.hasNext() ? iter.next() : null;
+            skipNotEnumerable();
+        }
+
+        /**
+         * Ignore properties that are not enumerable.
+         */
+        private void skipNotEnumerable() {
+            while (property != null && !property.isEnumerable()) {
+                property = iter.hasNext() ? iter.next() : null;
+            }
+        }
+
+        @Override
+        public boolean hasNext() {
+            return property != null;
+        }
+
+        @Override
+        public Object next() {
+            if (property == null) {
+                throw new NoSuchElementException();
+            }
+
+            final Object key = property.getKey();
+            property = iter.next();
+            skipNotEnumerable();
+
+            return key;
+        }
+
+        @Override
+        public void remove() {
+            throw new UnsupportedOperationException();
+        }
+    }
+
+    /*
+     * PropertyListener implementation.
+     */
+
+    @Override
+    public void propertyAdded(final ScriptObject object, final Property prop) {
+        invalidateProtoGetSwitchPoint(prop);
+    }
+
+    @Override
+    public void propertyDeleted(final ScriptObject object, final Property prop) {
+        invalidateProtoGetSwitchPoint(prop);
+    }
+
+    @Override
+    public void propertyModified(final ScriptObject object, final Property oldProp, final Property newProp) {
+        invalidateProtoGetSwitchPoint(oldProp);
+    }
+
+    /*
+     * Debugging and statistics.
+     */
+
+    // counters updated only in debug mode
+    private static int count;
+    private static int clonedCount;
+    private static int historyHit;
+    private static int protoInvalidations;
+    private static int protoHistoryHit;
+    private static int setProtoNewMapCount;
+
+    /**
+     * @return Total number of maps.
+     */
+    public static int getCount() {
+        return count;
+    }
+
+    /**
+     * @return The number of maps that were cloned.
+     */
+    public static int getClonedCount() {
+        return clonedCount;
+    }
+
+    /**
+     * @return The number of times history was successfully used.
+     */
+    public static int getHistoryHit() {
+        return historyHit;
+    }
+
+    /**
+     * @return The number of times prototype changes caused invalidation.
+     */
+    public static int getProtoInvalidations() {
+        return protoInvalidations;
+    }
+
+    /**
+     * @return The number of times proto history was successfully used.
+     */
+    public static int getProtoHistoryHit() {
+        return protoHistoryHit;
+    }
+
+    /**
+     * @return The number of times prototypes were modified.
+     */
+    public static int getSetProtoNewMapCount() {
+        return setProtoNewMapCount;
+    }
+
+    /**
+     * Increment the prototype set count.
+     */
+    private static void incrementSetProtoNewMapCount() {
+        setProtoNewMapCount++;
+    }
+}
+
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/QuotedStringTokenizer.java b/nashorn/src/jdk/nashorn/internal/runtime/QuotedStringTokenizer.java
new file mode 100644
index 00000000000..619d6d7bae8
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/QuotedStringTokenizer.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import java.util.LinkedList;
+import java.util.Stack;
+import java.util.StringTokenizer;
+
+/**
+ * A string tokenizer that supports entries with quotes and nested quotes. If
+ * the separators are quoted either by ' and ", or whatever quotes the user
+ * supplies they will be ignored and considered part of another token
+ */
+public class QuotedStringTokenizer {
+    private final LinkedList<String> tokens;
+
+    private final char quotes[];
+
+    /**
+     * Constructor
+     *
+     * @param str string to tokenize
+     */
+    public QuotedStringTokenizer(final String str) {
+        this(str, " ");
+    }
+
+    /**
+     * Create a quoted string tokenizer
+     *
+     * @param str
+     *            a string to tokenize
+     * @param delim
+     *            delimiters between tokens
+     *
+     */
+    public QuotedStringTokenizer(final String str, final String delim) {
+        this(str, delim, new char[] { '"', '\'' });
+    }
+
+    /**
+     * Create a quoted string tokenizer
+     *
+     * @param str
+     *            a string to tokenize
+     * @param delim
+     *            delimiters between tokens
+     * @param quotes
+     *            all the characters that should be accepted as quotes, default
+     *            is ' or "
+     */
+    public QuotedStringTokenizer(final String str, final String delim, final char[] quotes) {
+        this.quotes = quotes;
+
+        boolean delimIsWhitespace = true;
+        for (int i = 0; i < delim.length(); i++) {
+            if (!Character.isWhitespace(delim.charAt(i))) {
+                delimIsWhitespace = false;
+                break;
+            }
+        }
+
+        final StringTokenizer st = new StringTokenizer(str, delim);
+        tokens = new LinkedList<>();
+        while (st.hasMoreTokens()) {
+            String token = st.nextToken();
+
+            while (unmatchedQuotesIn(token)) {
+                if (!st.hasMoreTokens()) {
+                    throw new IndexOutOfBoundsException(token);
+                }
+                token += (delimIsWhitespace ? " " : delim) + st.nextToken();
+            }
+            tokens.add(stripQuotes(token));
+        }
+    }
+
+    /**
+     * @return the number of tokens in the tokenizer
+     */
+    public int countTokens() {
+        return tokens.size();
+    }
+
+    /**
+     * @return true if there are tokens left
+     */
+    public boolean hasMoreTokens() {
+        return countTokens() > 0;
+    }
+
+    /**
+     * @return the next token in the tokenizer
+     */
+    public String nextToken() {
+        return tokens.removeFirst();
+    }
+
+    private String stripQuotes(final String value0) {
+        String value = value0.trim();
+        for (final char q : quotes) {
+            if (value.length() >= 2 && value.startsWith("" + q) && value.endsWith("" + q)) {
+                // also go over the value and remove \q sequences. they are just
+                // plain q now
+                value = value.substring(1, value.length() - 1);
+                value = value.replace("\\" + q, "" + q);
+            }
+        }
+        return value;
+    }
+
+    private boolean unmatchedQuotesIn(final String str) {
+        final Stack<Character> quoteStack = new Stack<>();
+        for (int i = 0; i < str.length(); i++) {
+            final char c = str.charAt(i);
+            for (final char q : this.quotes) {
+                if (c == q) {
+                    if (quoteStack.isEmpty()) {
+                        quoteStack.push(c);
+                    } else {
+                        final char top = quoteStack.pop();
+                        if (top != c) {
+                            quoteStack.push(top);
+                            quoteStack.push(c);
+                        }
+                    }
+                }
+            }
+        }
+
+        return !quoteStack.isEmpty();
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/RegExpMatch.java b/nashorn/src/jdk/nashorn/internal/runtime/RegExpMatch.java
new file mode 100644
index 00000000000..9b7b962c5dd
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/RegExpMatch.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+/**
+ * Match tuple to keep track of ongoing regexp match.
+ */
+public final class RegExpMatch {
+    final Object[] groups;
+    final int      index;
+    final String   input;
+
+    /**
+     * Constructor
+     *
+     * @param input  regexp input
+     * @param index  index of match
+     * @param groups groups vector
+     */
+    public RegExpMatch(final String input, final int index, final Object[] groups) {
+        this.input  = input;
+        this.index  = index;
+        this.groups = groups;
+    }
+
+    /**
+     * Get the groups for the match
+     * @return group vector
+     */
+    public Object[] getGroups() {
+        return groups;
+    }
+
+    /**
+     * Get the input for the map
+     * @return input
+     */
+    public String getInput() {
+        return input;
+    }
+
+    /**
+     * Get the index for the match
+     * @return index
+     */
+    public int getIndex() {
+        return index;
+    }
+
+    /**
+     * Get the length of the match
+     * @return length
+     */
+    public int length() {
+        return ((String)groups[0]).length();
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Scope.java b/nashorn/src/jdk/nashorn/internal/runtime/Scope.java
new file mode 100644
index 00000000000..6075ce08a38
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Scope.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import static jdk.nashorn.internal.codegen.CompilerConstants.interfaceCallNoLookup;
+
+import jdk.nashorn.internal.codegen.CodeGenerator;
+import jdk.nashorn.internal.codegen.CompilerConstants;
+
+/**
+ * Interface implemented by {@link ScriptObject}s that act as scope.
+ */
+public interface Scope {
+
+    /** Method handle that points to {@link Scope#getSplitState}. Used by {@link CodeGenerator} */
+    public static final CompilerConstants.Call GET_SPLIT_STATE = interfaceCallNoLookup(Scope.class, "getSplitState", int.class);
+
+    /** Method handle that points to {@link Scope#setSplitState(int)}. Used by {@link CodeGenerator} */
+    public static final CompilerConstants.Call SET_SPLIT_STATE = interfaceCallNoLookup(Scope.class, "setSplitState", void.class, int.class);
+
+    /**
+     * Get the scope's split method state.
+     * @return the current state
+     */
+    public int getSplitState();
+
+    /**
+     * Set the scope's split method state.
+     * @param state the new state.
+     */
+    public void setSplitState(int state);
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
new file mode 100644
index 00000000000..8ab202e7579
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
@@ -0,0 +1,1002 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import static jdk.nashorn.internal.codegen.CompilerConstants.virtualCallNoLookup;
+import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import jdk.nashorn.internal.codegen.CompilerConstants.Call;
+import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.objects.annotations.SpecializedConstructor;
+import jdk.nashorn.internal.objects.annotations.SpecializedFunction;
+import jdk.nashorn.internal.parser.Token;
+import jdk.nashorn.internal.runtime.linker.MethodHandleFactory;
+import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
+import jdk.nashorn.internal.runtime.linker.NashornGuards;
+import jdk.nashorn.internal.runtime.options.Options;
+import org.dynalang.dynalink.CallSiteDescriptor;
+import org.dynalang.dynalink.linker.GuardedInvocation;
+
+/**
+ * Runtime representation of a JavaScript function.
+ */
+public abstract class ScriptFunction extends ScriptObject {
+
+    /** Method handle for prototype getter for this ScriptFunction */
+    public static final MethodHandle G$PROTOTYPE  = findOwnMH("G$prototype",  Object.class, Object.class);
+
+    /** Method handle for prototype setter for this ScriptFunction */
+    public static final MethodHandle S$PROTOTYPE  = findOwnMH("S$prototype",  void.class, Object.class, Object.class);
+
+    /** Method handle for length getter for this ScriptFunction */
+    public static final MethodHandle G$LENGTH     = findOwnMH("G$length",     int.class, Object.class);
+
+    /** Method handle for name getter for this ScriptFunction */
+    public static final MethodHandle G$NAME       = findOwnMH("G$name",       Object.class, Object.class);
+
+    /** Method handle for invokehelper for this ScriptFunction - used from applies */
+    public static final MethodHandle INVOKEHELPER = findOwnMH("invokeHelper", Object.class, Object.class, Object.class, Object[].class);
+
+    /** Method handle for allocate function for this ScriptFunction */
+    public static final MethodHandle ALLOCATE     = findOwnMH("allocate", Object.class);
+
+    private static final MethodHandle NEWFILTER = findOwnMH("newFilter", Object.class, Object.class, Object.class);
+
+    /** method handle to arity setter for this ScriptFunction */
+    public static final Call SET_ARITY = virtualCallNoLookup(ScriptFunction.class, "setArity", void.class, int.class);
+    /** method handle to scope getter for this ScriptFunction */
+    public static final Call GET_SCOPE = virtualCallNoLookup(ScriptFunction.class, "getScope", ScriptObject.class);
+
+    /** Should specialized function and specialized constructors for the builtin be used if available? */
+    private static final boolean DISABLE_SPECIALIZATION = Options.getBooleanProperty("nashorn.scriptfunction.specialization.disable");
+
+    /** Name of function or null. */
+    private final String name;
+
+    /** Source of function. */
+    private final Source source;
+
+    /** Start position and length in source. */
+    private final long token;
+
+    /** Reference to code for this method. */
+    private final MethodHandle invokeHandle;
+
+    /** Reference to code for this method when called to create "new" object */
+    protected MethodHandle constructHandle;
+
+    /** Reference to constructor prototype. */
+    protected Object prototype;
+
+    /** Constructor to create a new instance. */
+    private MethodHandle allocator;
+
+    /** Map for new instance constructor. */
+    private PropertyMap allocatorMap;
+
+    /** The parent scope. */
+    private final ScriptObject scope;
+
+    /** Specializations - see @SpecializedFunction */
+    private MethodHandle[] invokeSpecializations;
+
+    /** Specializations - see @SpecializedFunction */
+    private MethodHandle[] constructSpecializations;
+
+    /** This field is either computed in constructor or set explicitly by calling setArity method. */
+    private int arity;
+
+    /**
+     * Constructor
+     *
+     * @param name          function name
+     * @param methodHandle  method handle to function (if specializations are present, assumed to be most generic)
+     * @param map           property map
+     * @param scope         scope
+     * @param specs         specialized version of this function - other method handles
+     */
+    protected ScriptFunction(
+            final String name,
+            final MethodHandle methodHandle,
+            final PropertyMap map,
+            final ScriptObject scope,
+            final MethodHandle[] specs) {
+        this(name, methodHandle, map, scope, null, 0, false, specs);
+    }
+
+    /**
+     * Constructor
+     *
+     * @param name          function name
+     * @param methodHandle  method handle to function (if specializations are present, assumed to be most generic)
+     * @param map           property map
+     * @param scope         scope
+     * @param source        the source
+     * @param token         token
+     * @param allocator     method handle to this function's allocator - see JO$ classes
+     * @param allocatorMap  property map to be used for all constructors
+     * @param needsCallee   does this method use the {@code callee} variable
+     * @param specs         specialized version of this function - other method handles
+     */
+    protected ScriptFunction(
+            final String name,
+            final MethodHandle methodHandle,
+            final PropertyMap map,
+            final ScriptObject scope,
+            final Source source,
+            final long token,
+            final MethodHandle allocator,
+            final PropertyMap allocatorMap,
+            final boolean needsCallee,
+            final MethodHandle[] specs) {
+
+        this(name, methodHandle, map, scope, source, token, needsCallee, specs);
+
+        //this is the internal constructor
+
+        this.allocator    = allocator;
+        this.allocatorMap = allocatorMap;
+    }
+
+    /**
+     * Constructor
+     *
+     * @param name              function name
+     * @param methodHandle      method handle to function (if specializations are present, assumed to be most generic)
+     * @param map               property map
+     * @param scope             scope
+     * @param source            the source
+     * @param token             token
+     * @param needsCallee       does this method use the {@code callee} variable
+     * @param specs             specialized version of this function - other method handles
+     */
+    protected ScriptFunction(
+            final String name,
+            final MethodHandle methodHandle,
+            final PropertyMap map,
+            final ScriptObject scope,
+            final Source source,
+            final long token,
+            final boolean needsCallee,
+            final MethodHandle[] specs) {
+
+        super(map);
+
+        if (Context.DEBUG) {
+            constructorCount++;
+        }
+
+        // needCallee => scope != null
+        assert !needsCallee || scope != null;
+        this.name   = name;
+        this.source = source;
+        this.token  = token;
+        this.scope  = scope;
+
+        final MethodType type       = methodHandle.type();
+        final int        paramCount = type.parameterCount();
+        final boolean    isVarArg   = type.parameterType(paramCount - 1).isArray();
+
+        final MethodHandle mh = MH.asType(methodHandle, adaptType(type, scope != null, isVarArg));
+
+        this.arity = isVarArg ? -1 : paramCount - 1; //drop the self param for arity
+
+        if (scope != null) {
+            if (needsCallee) {
+                if (!isVarArg) {
+                    this.arity--;
+                }
+            }
+            this.invokeHandle    = mh;
+            this.constructHandle = mh;
+        } else if (isConstructor(mh)) {
+            if (!isVarArg) {
+                this.arity--;    // drop the boolean flag for arity
+            }
+            /*
+             * We insert a boolean argument to tell if the method was invoked as
+             * constructor or not if the method handle's first argument is boolean.
+             */
+            this.invokeHandle    = MH.insertArguments(mh, 0, false);
+            this.constructHandle = MH.insertArguments(mh, 0, true);
+
+            if (specs != null) {
+                this.invokeSpecializations    = new MethodHandle[specs.length];
+                this.constructSpecializations = new MethodHandle[specs.length];
+                for (int i = 0; i < specs.length; i++) {
+                    this.invokeSpecializations[i]    = MH.insertArguments(specs[i], 0, false);
+                    this.constructSpecializations[i] = MH.insertArguments(specs[i], 0, true);
+                }
+            }
+        } else {
+            this.invokeHandle             = mh;
+            this.constructHandle          = mh;
+            this.invokeSpecializations    = specs;
+            this.constructSpecializations = specs;
+        }
+    }
+
+    /**
+     * Takes a method type, and returns a (potentially different method type) that the method handles used by
+     * ScriptFunction must conform to in order to be usable in {@link #invoke(Object, Object...)} and
+     * {@link #construct(Object, Object...)}. The returned method type will be sure to return {@code Object}, and will
+     * have all its parameters turned into {@code Object} as well, except for the following ones:
+     * <ul>
+     * <li>an optional first {@code boolean} parameter, used for some functions to distinguish method and constructor
+     * invocation,</li>
+     * <li>a last parameter of type {@code Object[]} which is used for vararg functions,</li>
+     * <li>the second (or, in presence of boolean parameter, third) argument, which is forced to be
+     * {@link ScriptFunction}, in case the function receives itself (callee) as an argument</li>
+     * @param type the original type
+     * @param hasCallee true if the function uses the callee argument
+     * @param isVarArg if the function is a vararg
+     * @return the new type, conforming to the rules above.
+     */
+    private static MethodType adaptType(final MethodType type, final boolean hasCallee, final boolean isVarArg) {
+        // Generify broadly
+        MethodType newType = type.generic().changeReturnType(Object.class);
+        if(isVarArg) {
+            // Change back to vararg if we over-generified it
+            newType = newType.changeParameterType(type.parameterCount() - 1, Object[].class);
+        }
+        final boolean hasBoolean = type.parameterType(0) == boolean.class;
+        if(hasBoolean) {
+            // Restore the initial boolean argument
+            newType = newType.changeParameterType(0, boolean.class);
+        }
+        if(hasCallee) {
+            // Restore the ScriptFunction argument
+            newType = newType.changeParameterType(hasBoolean ? 2 : 1, ScriptFunction.class);
+        }
+        return newType;
+    }
+
+    @Override
+    public String getClassName() {
+        return "Function";
+    }
+
+    /**
+     * ECMA 15.3.5.3 [[HasInstance]] (V)
+     * Step 3 if "prototype" value is not an Object, throw TypeError
+     */
+    @Override
+    public boolean isInstance(final ScriptObject instance) {
+        if (!(prototype instanceof ScriptObject)) {
+            typeError(Context.getGlobal(), "prototype.not.an.object", ScriptRuntime.safeToString(this), ScriptRuntime.safeToString(prototype));
+        }
+
+        for (ScriptObject proto = instance.getProto(); proto != null; proto = proto.getProto()) {
+            if (proto == prototype) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Get the arity of this ScriptFunction
+     * @return arity
+     */
+    public final int getArity() {
+        return arity;
+    }
+
+    /**
+     * Set the arity of this ScriptFunction
+     * @param arity arity
+     */
+    public final void setArity(final int arity) {
+        this.arity = arity;
+    }
+
+    /**
+     * Is this a ECMAScript 'use strict' function?
+     * @return true if function is in strict mode
+     */
+    public abstract boolean isStrict();
+
+    /**
+     * Is this a ECMAScript built-in function (like parseInt, Array.isArray) ?
+     * @return true if built-in
+     */
+    public abstract boolean isBuiltin();
+
+    /**
+     * Execute this script function.
+     * @param self  Target object.
+     * @param arguments  Call arguments.
+     * @return ScriptFunction result.
+     * @throws Throwable if there is an exception/error with the invocation or thrown from it
+     */
+    public Object invoke(final Object self, final Object... arguments) throws Throwable {
+        if (Context.DEBUG) {
+            invokes++;
+        }
+
+        final Object[] args = arguments == null ? ScriptRuntime.EMPTY_ARRAY : arguments;
+
+        if (isVarArg(invokeHandle)) {
+            if (hasCalleeParameter()) {
+                return invokeHandle.invokeExact(self, this, args);
+            }
+            return invokeHandle.invokeExact(self, args);
+        }
+
+        final int paramCount = invokeHandle.type().parameterCount();
+        if (hasCalleeParameter()) {
+            switch (paramCount) {
+            case 2:
+                return invokeHandle.invokeExact(self, this);
+            case 3:
+                return invokeHandle.invokeExact(self, this, getArg(args, 0));
+            case 4:
+                return invokeHandle.invokeExact(self, this, getArg(args, 0), getArg(args, 1));
+            case 5:
+                return invokeHandle.invokeExact(self, this, getArg(args, 0), getArg(args, 1), getArg(args, 2));
+            default:
+                return invokeHandle.invokeWithArguments(withArguments(self, this, paramCount, args));
+            }
+        }
+
+        switch (paramCount) {
+        case 1:
+            return invokeHandle.invokeExact(self);
+        case 2:
+            return invokeHandle.invokeExact(self, getArg(args, 0));
+        case 3:
+            return invokeHandle.invokeExact(self, getArg(args, 0), getArg(args, 1));
+        case 4:
+            return invokeHandle.invokeExact(self, getArg(args, 0), getArg(args, 1), getArg(args, 2));
+        default:
+            return invokeHandle.invokeWithArguments(withArguments(self, null, paramCount, args));
+        }
+    }
+
+    private static Object getArg(final Object[] args, final int i) {
+        return i < args.length ? args[i] : UNDEFINED;
+    }
+
+    /**
+     * Helper function used for implementation of apply
+     * @param func       script function
+     * @param self       reference to {@code this} for apply
+     * @param args       arguments to apply
+     * @return           result of apply
+     * @throws Throwable if invocation throws an error or exception
+     */
+    public static Object invokeHelper(final Object func, final Object self, final Object... args) throws Throwable {
+        if (func instanceof ScriptFunction) {
+            return ((ScriptFunction)func).invoke(self, args);
+        }
+
+        typeError(Context.getGlobal(), "not.a.function", ScriptRuntime.safeToString(func));
+
+        return UNDEFINED;
+    }
+
+    /**
+     * Construct new object using this constructor.
+     * @param self  Target object.
+     * @param args  Call arguments.
+     * @return ScriptFunction result.
+     * @throws Throwable if there is an exception/error with the constructor invocation or thrown from it
+     */
+    public Object construct(final Object self, final Object... args) throws Throwable {
+        if (constructHandle == null) {
+            typeError(Context.getGlobal(), "not.a.constructor", ScriptRuntime.safeToString(this));
+        }
+
+        if (isVarArg(constructHandle)) {
+            if (hasCalleeParameter()) {
+                return constructHandle.invokeExact(self, this, args);
+            }
+            return constructHandle.invokeExact(self, args);
+        }
+
+        final int paramCount = constructHandle.type().parameterCount();
+        if (hasCalleeParameter()) {
+            switch (paramCount) {
+            case 2:
+                return constructHandle.invokeExact(self, this);
+            case 3:
+                return constructHandle.invokeExact(self, this, getArg(args, 0));
+            case 4:
+                return constructHandle.invokeExact(self, this, getArg(args, 0), getArg(args, 1));
+            case 5:
+                return constructHandle.invokeExact(self, this, getArg(args, 0), getArg(args, 1), getArg(args, 2));
+            default:
+                return constructHandle.invokeWithArguments(withArguments(self, this, args));
+            }
+        }
+
+        switch(paramCount) {
+        case 1:
+            return constructHandle.invokeExact(self);
+        case 2:
+            return constructHandle.invokeExact(self, getArg(args, 0));
+        case 3:
+            return constructHandle.invokeExact(self, getArg(args, 0), getArg(args, 1));
+        case 4:
+            return constructHandle.invokeExact(self, getArg(args, 0), getArg(args, 1), getArg(args, 2));
+        default:
+            return constructHandle.invokeWithArguments(withArguments(self, null, args));
+        }
+    }
+
+    private static Object[] withArguments(final Object self, final ScriptFunction function, final Object... args) {
+        return withArguments(self, function, args.length + (function == null ? 1 : 2), args); // + 2 to include self and function
+    }
+
+    private static Object[] withArguments(final Object self, final ScriptFunction function, final int paramCount, final Object... args) {
+        final Object[] finalArgs = new Object[paramCount];
+
+        finalArgs[0] = self;
+        int nextArg = 1;
+        if (function != null) {
+            finalArgs[nextArg++] = function;
+        }
+
+        //don't add more args that there is paramcount in the handle (including self)
+        final int maxArgs = Math.min(args.length, paramCount - (function == null ? 1 : 2));
+        for (int i = 0; i < maxArgs;) {
+            finalArgs[nextArg++] = args[i++];
+        }
+
+        //if we have fewer params than paramcount, pad undefined
+        while (nextArg < paramCount) {
+            finalArgs[nextArg++] = UNDEFINED;
+        }
+
+        return finalArgs;
+    }
+
+    /**
+     * Allocate function. Called from generated {@link ScriptObject} code
+     * for allocation as a factory method
+     *
+     * @return a new instance of the {@link ScriptObject} whose allocator this is
+     */
+    public Object allocate() {
+        if (Context.DEBUG) {
+            allocations++;
+        }
+
+        if (getConstructHandle() == null) {
+            typeError(Context.getGlobal(), "not.a.constructor", ScriptRuntime.safeToString(this));
+        }
+
+        ScriptObject object = null;
+
+        if (allocator != null) {
+            try {
+                object = (ScriptObject)allocator.invokeExact(allocatorMap);
+            } catch (final RuntimeException | Error e) {
+                throw e;
+            } catch (final Throwable t) {
+                throw new RuntimeException(t);
+            }
+        }
+
+        if (object != null) {
+            if (prototype instanceof ScriptObject) {
+                object.setProto((ScriptObject)prototype);
+            }
+
+            if (object.getProto() == null) {
+                object.setProto(getObjectPrototype());
+            }
+        }
+
+        return object;
+    }
+
+    /**
+     * Return Object.prototype - used by "allocate"
+     * @return Object.prototype
+     */
+    protected abstract ScriptObject getObjectPrototype();
+
+    /**
+     * Creates a version of this function bound to a specific "self" and other argumentss
+     * @param self the self to bind the function to
+     * @param args other arguments (beside self) to bind the function to
+     * @return the bound function
+     */
+    public abstract ScriptFunction makeBoundFunction(Object self, Object[] args);
+
+    /**
+     * Test if a methodHandle refers to a constructor.
+     * @param methodHandle MethodHandle to test.
+     * @return True if method is a constructor.
+     */
+    private static boolean isConstructor(final MethodHandle methodHandle) {
+        return methodHandle.type().parameterCount() >= 1 && methodHandle.type().parameterType(0) == boolean.class;
+    }
+
+    /**
+     * Test if a methodHandle refers to a variable argument method.
+     * @param methodHandle MethodHandle to test.
+     * @return True if variable arguments.
+     */
+    public boolean isVarArg(final MethodHandle methodHandle) {
+        return hasCalleeParameter()
+                ? methodHandle.type().parameterCount() == 3 && methodHandle.type().parameterType(2).isArray()
+                : methodHandle.type().parameterCount() == 2 && methodHandle.type().parameterType(1).isArray();
+    }
+
+    @Override
+    public final String safeToString() {
+        return toSource();
+    }
+
+    @Override
+    public String toString() {
+        final StringBuilder sb = new StringBuilder();
+
+        sb.append(super.toString())
+            .append(" [ ")
+            .append(invokeHandle)
+            .append(", ")
+            .append((name == null || name.isEmpty()) ? "<anonymous>" : name);
+
+        if (source != null) {
+            sb.append(" @ ")
+               .append(source.getName())
+               .append(':')
+               .append(source.getLine(Token.descPosition(token)));
+        }
+        sb.append(" ]");
+
+        return sb.toString();
+    }
+
+    /**
+     * Get this function as a String containing its source code. If no source code
+     * exists in this ScriptFunction, its contents will be displayed as {@code [native code]}
+     * @return string representation of this function's source
+     */
+    public final String toSource() {
+        if (source != null && token != 0) {
+            return source.getString(Token.descPosition(token), Token.descLength(token));
+        }
+
+        return "function " + (name == null ? "" : name) + "() { [native code] }";
+    }
+
+    /**
+     * Get the prototype object for this function
+     * @return prototype
+     */
+    public final Object getPrototype() {
+        return prototype;
+    }
+
+    /**
+     * Set the prototype object for this function
+     * @param prototype new prototype object
+     * @return the prototype parameter
+     */
+    public final Object setPrototype(final Object prototype) {
+        this.prototype = prototype;
+        return prototype;
+    }
+
+    private static int weigh(final MethodType t) {
+        int weight = Type.typeFor(t.returnType()).getWeight();
+        for (final Class<?> paramType : t.parameterArray()) {
+            final int pweight = Type.typeFor(paramType).getWeight();
+            weight += pweight;
+        }
+        return weight;
+    }
+
+    private static boolean typeCompatible(final MethodType desc, final MethodType spec) {
+        //spec must fit in desc
+        final Class<?>[] dparray = desc.parameterArray();
+        final Class<?>[] sparray = spec.parameterArray();
+
+        if (dparray.length != sparray.length) {
+            return false;
+        }
+
+        for (int i = 0; i < dparray.length; i++) {
+            final Type dp = Type.typeFor(dparray[i]);
+            final Type sp = Type.typeFor(sparray[i]);
+
+            if (dp.isBoolean()) {
+                return false; //don't specialize on booleans, we have the "true" vs int 1 ambiguity in resolution
+            }
+
+            //specialization arguments must be at least as wide as dp, if not wider
+            if (Type.widest(dp, sp) != sp) {
+                //e.g. specialization takes double and callsite says "object". reject.
+                //but if specialization says double and callsite says "int" or "long" or "double", that's fine
+                return false;
+            }
+        }
+
+        return true; // anything goes for return type, take the convenient one and it will be upcasted thru dynalink magic.
+    }
+
+    private MethodHandle candidateWithLowestWeight(final MethodType descType, final MethodHandle initialCandidate, final MethodHandle[] specs) {
+        if (DISABLE_SPECIALIZATION || specs == null) {
+            return initialCandidate;
+        }
+
+        int          minimumWeight = Integer.MAX_VALUE;
+        MethodHandle candidate     = initialCandidate;
+
+        for (final MethodHandle spec : specs) {
+            final MethodType specType = spec.type();
+
+            if (!typeCompatible(descType, specType)) {
+                continue;
+            }
+
+            //return type is ok. we want a wider or equal one for our callsite.
+            final int specWeight = weigh(specType);
+            if (specWeight < minimumWeight) {
+                candidate = spec;
+                minimumWeight = specWeight;
+            }
+        }
+
+        if (DISABLE_SPECIALIZATION && candidate != initialCandidate) {
+            Context.err("### Specializing builtin " + getName() + " -> " + candidate + "?");
+        }
+
+        return candidate;
+    }
+
+    /**
+     * Return the most appropriate invoke handle if there are specializations
+     * @param type most specific method type to look for invocation with
+     * @return invoke method handle
+     */
+    public final MethodHandle getBestSpecializedInvokeHandle(final MethodType type) {
+        return candidateWithLowestWeight(type, getInvokeHandle(), invokeSpecializations);
+    }
+
+    /**
+     * Get the invoke handle - the most generic (and if no specializations are in place, only) invocation
+     * method handle for this ScriptFunction
+     * @see SpecializedFunction
+     * @return invokeHandle
+     */
+    public final MethodHandle getInvokeHandle() {
+        return invokeHandle;
+    }
+
+    /**
+     * Return the invoke handle bound to a given ScriptObject self reference.
+     * If callee parameter is required result is rebound to this.
+     *
+     * @param self self reference
+     * @return bound invoke handle
+     */
+    public final MethodHandle getBoundInvokeHandle(final ScriptObject self) {
+        final MethodHandle bound = MH.bindTo(getInvokeHandle(), self);
+        return hasCalleeParameter() ? MH.bindTo(bound, this) : bound;
+    }
+
+    private boolean hasCalleeParameter() {
+        return scope != null;
+    }
+
+    /**
+     * Get the construct handle - the most generic (and if no specializations are in place, only) constructor
+     * method handle for this ScriptFunction
+     * @see SpecializedConstructor
+     * @param type type for wanted constructor
+     * @return construct handle
+     */
+    public final MethodHandle getConstructHandle(final MethodType type) {
+        return candidateWithLowestWeight(type, getConstructHandle(), constructSpecializations);
+    }
+
+    /**
+     * Get a method handle to the constructor for this function
+     * @return constructor handle
+     */
+    public final MethodHandle getConstructHandle() {
+        return constructHandle;
+    }
+
+    /**
+     * Set a method handle to the constructor for this function
+     * @param constructHandle constructor handle
+     */
+    public final void setConstructHandle(final MethodHandle constructHandle) {
+        this.constructHandle = constructHandle;
+        this.constructSpecializations = null;
+    }
+
+    /**
+     * Get the name for this function
+     * @return the name
+     */
+    public final String getName() {
+        return name;
+    }
+
+    /**
+     * Does this script function need to be compiled. This determined by
+     * null checking invokeHandle
+     *
+     * @return true if this needs compilation
+     */
+    public final boolean needsCompilation() {
+        return invokeHandle == null;
+    }
+
+    /**
+     * Get token for this function
+     * @return token
+     */
+    public final long getToken() {
+        return token;
+    }
+
+    /**
+     * Get the scope for this function
+     * @return the scope
+     */
+    public final ScriptObject getScope() {
+        return scope;
+    }
+
+    /**
+     * Prototype getter for this ScriptFunction - follows the naming convention
+     * used by Nasgen and the code generator
+     *
+     * @param self  self reference
+     * @return self's prototype
+     */
+    public static Object G$prototype(final Object self) {
+        return (self instanceof ScriptFunction) ?
+            ((ScriptFunction)self).getPrototype() :
+            UNDEFINED;
+    }
+
+    /**
+     * Prototype setter for this ScriptFunction - follows the naming convention
+     * used by Nasgen and the code generator
+     *
+     * @param self  self reference
+     * @param prototype prototype to set
+     */
+    public static void S$prototype(final Object self, final Object prototype) {
+        if (self instanceof ScriptFunction) {
+            ((ScriptFunction)self).setPrototype(prototype);
+        }
+    }
+
+    /**
+     * Length getter - ECMA 15.3.3.2: Function.length
+     * @param self self reference
+     * @return length
+     */
+    public static int G$length(final Object self) {
+        if (self instanceof ScriptFunction) {
+            return ((ScriptFunction)self).getArity();
+        }
+
+        return 0;
+    }
+
+    /**
+     * Name getter - ECMA Function.name
+     * @param self self refence
+     * @return the name, or undefined if none
+     */
+    public static Object G$name(final Object self) {
+        if (self instanceof ScriptFunction) {
+            return ((ScriptFunction)self).getName();
+        }
+
+        return UNDEFINED;
+    }
+
+    /**
+     * Get the prototype for this ScriptFunction
+     * @param constructor constructor
+     * @return prototype, or null if given constructor is not a ScriptFunction
+     */
+    public static ScriptObject getPrototype(final Object constructor) {
+        if (constructor instanceof ScriptFunction) {
+            final Object proto = ((ScriptFunction)constructor).getPrototype();
+            if (proto instanceof ScriptObject) {
+                return (ScriptObject)proto;
+            }
+        }
+
+        return null;
+    }
+
+    // These counters are updated only in debug mode.
+    private static int constructorCount;
+    private static int invokes;
+    private static int allocations;
+
+    /**
+     * @return the constructorCount
+     */
+    public static int getConstructorCount() {
+        return constructorCount;
+    }
+
+    /**
+     * @return the invokes
+     */
+    public static int getInvokes() {
+        return invokes;
+    }
+
+    /**
+     * @return the allocations
+     */
+    public static int getAllocations() {
+        return allocations;
+    }
+
+    @Override
+    protected GuardedInvocation findNewMethod(final CallSiteDescriptor desc) {
+        final MethodType type = desc.getMethodType();
+        MethodHandle constructor = getConstructHandle(type);
+
+        if (constructor == null) {
+            typeError(Context.getGlobal(), "not.a.constructor", ScriptRuntime.safeToString(this));
+            return null;
+        }
+
+        final MethodType ctorType = constructor.type();
+
+        // guard against primitive constructor return types
+        constructor = MH.asType(constructor, constructor.type().changeReturnType(Object.class));
+
+        // apply new filter
+        final Class<?>[] ctorArgs = ctorType.dropParameterTypes(0, 1).parameterArray(); // drop self
+        MethodHandle handle = MH.foldArguments(MH.dropArguments(NEWFILTER, 2, ctorArgs), constructor);
+
+        if (hasCalleeParameter()) {
+            final MethodHandle allocate = MH.bindTo(MethodHandles.exactInvoker(ALLOCATE.type()), ScriptFunction.ALLOCATE);
+            handle = MH.foldArguments(handle, allocate);
+            handle = MH.asType(handle, handle.type().changeParameterType(0, Object.class)); // ScriptFunction => Object
+        } else {
+            final MethodHandle allocate = MH.dropArguments(MH.bindTo(ScriptFunction.ALLOCATE, this), 0, Object.class);
+            handle = MH.filterArguments(handle, 0, allocate);
+        }
+
+        final MethodHandle filterIn = MH.asType(pairArguments(handle, type), type);
+        return new GuardedInvocation(filterIn, null, NashornGuards.getFunctionGuard(this));
+    }
+
+    @SuppressWarnings("unused")
+    private static Object newFilter(final Object result, final Object allocation) {
+        return result instanceof ScriptObject ? result : allocation;
+    }
+
+    /**
+     * dyn:call call site signature: (callee, thiz, [args...])
+     * generated method signature:   (thiz, callee, [args...])
+     *
+     * cases:
+     * (a) method has callee parameter
+     *   (1) for local/scope calls, we just bind thiz and drop the second argument.
+     *   (2) for normal this-calls, we have to swap thiz and callee to get matching signatures.
+     * (b) method doesn't have callee parameter (builtin functions)
+     *   (3) for local/scope calls, bind thiz and drop both callee and thiz.
+     *   (4) for normal this-calls, drop callee.
+     */
+    @Override
+    protected GuardedInvocation findCallMethod(final CallSiteDescriptor desc, final boolean megaMorphic) {
+        final MethodType type = desc.getMethodType();
+
+        if(megaMorphic) {
+            // (this, callee, args...) => (this, callee, args[])
+            final MethodHandle collector = MH.asCollector(ScriptRuntime.APPLY.methodHandle(), Object[].class,
+                    type.parameterCount() - 2);
+
+            return new GuardedInvocation(collector,
+                    desc.getMethodType().parameterType(0) == ScriptFunction.class ? null : NashornGuards.getScriptFunctionGuard());
+        }
+
+        MethodHandle boundHandle;
+        if (hasCalleeParameter()) {
+            final MethodHandle callHandle = getBestSpecializedInvokeHandle(type);
+
+            if(NashornCallSiteDescriptor.isScope(desc)) {
+                // (this, callee, args...) => (callee, args...) => (callee, [this], args...)
+                boundHandle = MH.bindTo(callHandle, isStrict() || isBuiltin()? ScriptRuntime.UNDEFINED : Context.getGlobal());
+                boundHandle = MH.dropArguments(boundHandle, 1, Object.class);
+            } else {
+                // (this, callee, args...) permute => (callee, this, args...) which is what we get in
+                final MethodType oldType = callHandle.type();
+                final int[] reorder = new int[oldType.parameterCount()];
+                for (int i = 2; i < reorder.length; i++) {
+                    reorder[i] = i;
+                }
+                reorder[0] = 1;
+                assert reorder[1] == 0;
+                final MethodType newType = oldType.changeParameterType(0, oldType.parameterType(1)).changeParameterType(1, oldType.parameterType(0));
+                boundHandle = MethodHandles.permuteArguments(callHandle, newType, reorder);
+            }
+        } else {
+            final MethodHandle callHandle = getBestSpecializedInvokeHandle(type.dropParameterTypes(0, 1));
+
+            if(NashornCallSiteDescriptor.isScope(desc)) {
+                boundHandle = MH.bindTo(callHandle, isStrict() || isBuiltin()? ScriptRuntime.UNDEFINED : Context.getGlobal());
+                boundHandle = MH.dropArguments(boundHandle, 0, Object.class, Object.class);
+            } else {
+                boundHandle = MH.dropArguments(callHandle, 0, Object.class);
+            }
+        }
+
+        boundHandle = pairArguments(boundHandle, type);
+        return new GuardedInvocation(boundHandle, NashornGuards.getFunctionGuard(this));
+    }
+
+    /**
+     * Used for noSuchMethod/noSuchProperty and JSAdapter hooks.
+     *
+     * These don't want a callee parameter, so bind that. Name binding is optional.
+     */
+    MethodHandle getCallMethodHandle(final MethodType type, final String bindName) {
+        MethodHandle methodHandle = getBestSpecializedInvokeHandle(type);
+
+        if (bindName != null) {
+            if (hasCalleeParameter()) {
+                methodHandle = MH.insertArguments(methodHandle, 1, this, bindName);
+            } else {
+                methodHandle = MH.insertArguments(methodHandle, 1, bindName);
+            }
+        } else {
+            if (hasCalleeParameter()) {
+                methodHandle = MH.insertArguments(methodHandle, 1, this);
+            }
+        }
+
+        return pairArguments(methodHandle, type);
+    }
+
+    private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
+        final Class<?>   own = ScriptFunction.class;
+        final MethodType mt  = MH.type(rtype, types);
+        try {
+            return MH.findStatic(MethodHandles.lookup(), own, name, mt);
+        } catch (final MethodHandleFactory.LookupException e) {
+            return MH.findVirtual(MethodHandles.lookup(), own, name, mt);
+        }
+    }
+}
+
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptLoader.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptLoader.java
new file mode 100644
index 00000000000..e5ffe149f2e
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptLoader.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import java.security.CodeSource;
+
+/**
+ * Responsible for loading generated and disk based classes.
+ *
+ */
+final class ScriptLoader extends NashornLoader {
+    /**
+     * Constructor.
+     */
+    ScriptLoader(final ClassLoader parent, final Context context) {
+        super(parent, context);
+    }
+
+    @Override
+    protected synchronized Class<?> loadClass(final String name, final boolean resolve) throws ClassNotFoundException {
+        checkPackageAccess(name);
+
+        // check the cache first
+        Class<?> cl = findLoadedClass(name);
+        if (cl == null) {
+            cl = getParent().loadClass(name);
+        }
+
+        if (resolve) {
+            resolveClass(cl);
+        }
+
+        return cl;
+    }
+
+    // package-private and private stuff below this point
+
+    /**
+     * Install a class for use by the Nashorn runtime
+     *
+     * @param name Binary name of class.
+     * @param data Class data bytes.
+     * @param cs CodeSource code source of the class bytes.
+     *
+     * @return Installed class.
+     */
+    synchronized Class<?> installClass(final String name, final byte[] data, final CodeSource cs) {
+        return defineClass(name, data, 0, data.length, cs);
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
new file mode 100644
index 00000000000..74f3b6439ed
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
@@ -0,0 +1,3427 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import static jdk.nashorn.internal.codegen.CompilerConstants.staticCall;
+import static jdk.nashorn.internal.codegen.CompilerConstants.virtualCall;
+import static jdk.nashorn.internal.codegen.CompilerConstants.virtualCallNoLookup;
+import static jdk.nashorn.internal.runtime.ECMAErrors.referenceError;
+import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static jdk.nashorn.internal.runtime.PropertyDescriptor.CONFIGURABLE;
+import static jdk.nashorn.internal.runtime.PropertyDescriptor.ENUMERABLE;
+import static jdk.nashorn.internal.runtime.PropertyDescriptor.GET;
+import static jdk.nashorn.internal.runtime.PropertyDescriptor.SET;
+import static jdk.nashorn.internal.runtime.PropertyDescriptor.VALUE;
+import static jdk.nashorn.internal.runtime.PropertyDescriptor.WRITABLE;
+import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static jdk.nashorn.internal.runtime.arrays.ArrayIndex.getArrayIndexNoThrow;
+import static jdk.nashorn.internal.runtime.arrays.ArrayIndex.isValidArrayIndex;
+import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.util.AbstractMap;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import jdk.nashorn.internal.codegen.CompilerConstants.Call;
+import jdk.nashorn.internal.codegen.objects.ObjectClassGenerator;
+import jdk.nashorn.internal.objects.AccessorPropertyDescriptor;
+import jdk.nashorn.internal.objects.DataPropertyDescriptor;
+import jdk.nashorn.internal.runtime.arrays.ArrayData;
+import jdk.nashorn.internal.runtime.linker.Bootstrap;
+import jdk.nashorn.internal.runtime.linker.Lookup;
+import jdk.nashorn.internal.runtime.linker.MethodHandleFactory;
+import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
+import jdk.nashorn.internal.runtime.linker.NashornGuardedInvocation;
+import jdk.nashorn.internal.runtime.linker.NashornGuards;
+import org.dynalang.dynalink.CallSiteDescriptor;
+import org.dynalang.dynalink.linker.GuardedInvocation;
+import org.dynalang.dynalink.support.CallSiteDescriptorFactory;
+import org.dynalang.dynalink.support.Guards;
+
+/**
+ * Base class for generic JavaScript objects.
+ * <p>
+ * Notes:
+ * <ul>
+ * <li>The map is used to identify properties in the object.</li>
+ * <li>If the map is modified then it must be cloned and replaced.  This notifies
+ *     any code that made assumptions about the object that things have changed.
+ *     Ex. CallSites that have been validated must check to see if the map has
+ *     changed (or a map from a different object type) and hence relink the method
+ *     to call.</li>
+ * <li>Modifications of the map include adding/deleting attributes or changing a
+ *     function field value.</li>
+ * </ul>
+ */
+
+
+public abstract class ScriptObject extends PropertyListenerManager implements PropertyAccess, Map<Object, Object> {
+
+    /** Search fall back routine name for "no such method" */
+    static final String NO_SUCH_METHOD_NAME   = "__noSuchMethod__";
+
+    /** Search fall back routine name for "no such property" */
+    static final String NO_SUCH_PROPERTY_NAME = "__noSuchProperty__";
+
+    /** Per ScriptObject flag - is this a scope object? */
+    public static final int IS_SCOPE       = 0b0000_0001;
+
+    /** Per ScriptObject flag - is this an array object? */
+    public static final int IS_ARRAY       = 0b0000_0010;
+
+    /** Per ScriptObject flag - is this an arguments object? */
+    public static final int IS_ARGUMENTS   = 0b0000_0100;
+
+    /** Spill growth rate - by how many elements does {@link ScriptObject#spill} when full */
+    public static final int SPILL_RATE = 8;
+
+    /** Map to property information and accessor functions. Ordered by insertion. */
+    private PropertyMap map;
+
+    /** Object flags. */
+    private int flags;
+
+    /** Area for properties added to object after instantiation, see {@link SpillProperty} */
+    public Object[] spill;
+
+    /** Local embed area position 0 - used for {@link SpillProperty} before {@link ScriptObject#spill} */
+    public Object embed0;
+
+    /** Local embed area position 1 - used for {@link SpillProperty} before {@link ScriptObject#spill} */
+    public Object embed1;
+
+    /** Local embed area position 2 - used for {@link SpillProperty} before {@link ScriptObject#spill} */
+    public Object embed2;
+
+    /** Local embed area position 3 - used for {@link SpillProperty} before {@link ScriptObject#spill} */
+    public Object embed3;
+
+    /** Indexed array data. */
+    private ArrayData arrayData;
+
+    private static final MethodHandle SETEMBED           = findOwnMH("setEmbed",         void.class, CallSiteDescriptor.class, PropertyMap.class, PropertyMap.class, MethodHandle.class, int.class, Object.class, Object.class);
+    private static final MethodHandle SETSPILL           = findOwnMH("setSpill",         void.class, CallSiteDescriptor.class, PropertyMap.class, PropertyMap.class, int.class, Object.class, Object.class);
+    private static final MethodHandle SETSPILLWITHNEW    = findOwnMH("setSpillWithNew",  void.class, CallSiteDescriptor.class, PropertyMap.class, PropertyMap.class, int.class, Object.class, Object.class);
+    private static final MethodHandle SETSPILLWITHGROW   = findOwnMH("setSpillWithGrow", void.class, CallSiteDescriptor.class, PropertyMap.class, PropertyMap.class, int.class, int.class, Object.class, Object.class);
+    private static final MethodHandle TRUNCATINGFILTER   = findOwnMH("truncatingFilter", Object[].class, int.class, Object[].class);
+    private static final MethodHandle KNOWNFUNCPROPGUARD = findOwnMH("knownFunctionPropertyGuard", boolean.class, Object.class, PropertyMap.class, MethodHandle.class, Object.class, ScriptFunction.class);
+
+    /** Method handle for getting a function argument at a given index. Used from MapCreator */
+    public static final Call GET_ARGUMENT       = virtualCall(ScriptObject.class, "getArgument", Object.class, int.class);
+
+    /** Method handle for setting a function argument at a given index. Used from MapCreator */
+    public static final Call SET_ARGUMENT       = virtualCall(ScriptObject.class, "setArgument", void.class, int.class, Object.class);
+
+    /** Method handle for getting the proto of a ScriptObject - used by {@link jdk.nashorn.internal.codegen.CodeGenerator} */
+    public static final Call GET_PROTO          = virtualCallNoLookup(ScriptObject.class, "getProto", ScriptObject.class);
+
+    /** Method handle for setting the proto of a ScriptObject - used by {@link jdk.nashorn.internal.codegen.CodeGenerator} */
+    public static final Call SET_PROTO          = virtualCallNoLookup(ScriptObject.class, "setProto", void.class, ScriptObject.class);
+
+    /** Method handle for setting the user accessors of a ScriptObject - used by {@link jdk.nashorn.internal.codegen.CodeGenerator} */
+    public static final Call SET_USER_ACCESSORS = virtualCall(ScriptObject.class, "setUserAccessors", void.class, String.class, ScriptFunction.class, ScriptFunction.class);
+
+    /** Method handle for getter for {@link UserAccessorProperty}, given a slot */
+    static final Call USER_ACCESSOR_GETTER = staticCall(MethodHandles.lookup(), ScriptObject.class, "userAccessorGetter", Object.class, ScriptObject.class, int.class, Object.class);
+
+    /** Method handle for setter for {@link UserAccessorProperty}, given a slot */
+    static final Call USER_ACCESSOR_SETTER = staticCall(MethodHandles.lookup(), ScriptObject.class, "userAccessorSetter", void.class, ScriptObject.class, int.class, String.class, Object.class, Object.class);
+
+    private static final MethodHandle INVOKE_UA_GETTER = Bootstrap.createDynamicInvoker("dyn:call", Object.class,
+            Object.class, Object.class);
+    private static final MethodHandle INVOKE_UA_SETTER = Bootstrap.createDynamicInvoker("dyn:call", void.class,
+            Object.class, Object.class, Object.class);
+
+    /**
+     * Constructor
+     */
+    public ScriptObject() {
+        this(null);
+    }
+
+    /**
+    * Constructor
+    *
+    * @param map {@link PropertyMap} used to create the initial object
+    */
+    public ScriptObject(final PropertyMap map) {
+        if (Context.DEBUG) {
+            ScriptObject.count++;
+        }
+
+        this.arrayData = ArrayData.EMPTY_ARRAY;
+
+        if (map == null) {
+            this.setMap(PropertyMap.newMap(getClass()));
+            return;
+        }
+
+        this.setMap(map);
+    }
+
+    /**
+     * Copy all properties from the source object with their receiver bound to the source.
+     * This function was known as mergeMap
+     *
+     * @param source The source object to copy from.
+     */
+    public void addBoundProperties(final ScriptObject source) {
+        PropertyMap newMap = this.getMap();
+
+        for (final Property property : source.getMap().getProperties()) {
+            final String key = property.getKey();
+
+            if (newMap.findProperty(key) == null) {
+                if (property instanceof UserAccessorProperty) {
+                    final UserAccessorProperty prop = this.newUserAccessors(key, property.getFlags(), property.getGetterFunction(source), property.getSetterFunction(source));
+                    newMap = newMap.addProperty(prop);
+                } else {
+                    newMap = newMap.newPropertyBind((AccessorProperty)property, source);
+                }
+            }
+        }
+
+        this.setMap(newMap);
+    }
+
+    /**
+     * Bind the method handle to the specified receiver.
+     * @param methodHandle Method handle to bind to.
+     * @param receiver     Object to bind.
+     * @return Bound method handle.
+     */
+    private static MethodHandle bindTo(final MethodHandle methodHandle, final Object receiver) {
+        return MH.dropArguments(MH.bindTo(methodHandle, receiver), 0, Object.class);
+    }
+
+    /**
+     * Return a property iterator.
+     * @return Property iterator.
+     */
+    public Iterator<String> propertyIterator() {
+        return new KeyIterator(this);
+    }
+
+    /**
+     * Return a property value iterator.
+     * @return Property value iterator.
+     */
+    public Iterator<Object> valueIterator() {
+        return new ValueIterator(this);
+    }
+
+    /**
+     * ECMA 8.10.1 IsAccessorDescriptor ( Desc )
+     * @return true if this has a {@link AccessorPropertyDescriptor} with a getter or a setter
+     */
+    public final boolean isAccessorDescriptor() {
+        return has(GET) || has(SET);
+    }
+
+    /**
+     * ECMA 8.10.2 IsDataDescriptor ( Desc )
+     * @return true if this has a {@link DataPropertyDescriptor}, i.e. the object has a property value and is writable
+     */
+    public final boolean isDataDescriptor() {
+        return has(VALUE) || has(WRITABLE);
+    }
+
+    /**
+     * ECMA 8.10.3 IsGenericDescriptor ( Desc )
+     * @return true if this has a descriptor describing an {@link AccessorPropertyDescriptor} or {@link DataPropertyDescriptor}
+     */
+    public final boolean isGenericDescriptor() {
+        return isAccessorDescriptor() || isDataDescriptor();
+    }
+
+    /**
+      * ECMA 8.10.5 ToPropertyDescriptor ( Obj )
+      *
+      * @return property descriptor
+      */
+    public final PropertyDescriptor toPropertyDescriptor() {
+        final GlobalObject global = (GlobalObject) Context.getGlobal();
+
+        final PropertyDescriptor desc;
+        if (isDataDescriptor()) {
+            if (has(SET) || has(GET)) {
+                typeError((ScriptObject)global, "inconsistent.property.descriptor");
+            }
+
+            desc = global.newDataDescriptor(UNDEFINED, false, false, false);
+        } else if (isAccessorDescriptor()) {
+            if (has(VALUE) || has(WRITABLE)) {
+                typeError((ScriptObject)global, "inconsistent.property.descriptor");
+            }
+
+            desc = global.newAccessorDescriptor(UNDEFINED, UNDEFINED, false, false);
+        } else {
+            desc = global.newGenericDescriptor(false, false);
+        }
+
+        return desc.fillFrom(this);
+    }
+
+    /**
+     * ECMA 8.10.5 ToPropertyDescriptor ( Obj )
+     *
+     * @param global  global scope object
+     * @param obj object to create property descriptor from
+     *
+     * @return property descriptor
+     */
+    public static PropertyDescriptor toPropertyDescriptor(final ScriptObject global, final Object obj) {
+        if (obj instanceof ScriptObject) {
+            return ((ScriptObject)obj).toPropertyDescriptor();
+        }
+
+        typeError(global, "not.an.object", ScriptRuntime.safeToString(obj));
+        return null;
+    }
+
+    /**
+     * ECMA 8.12.1 [[GetOwnProperty]] (P)
+     *
+     * @param key property key
+     *
+     * @return Returns the Property Descriptor of the named own property of this
+     * object, or undefined if absent.
+     */
+    public Object getOwnPropertyDescriptor(final String key) {
+        final Property property = getMap().findProperty(key);
+
+        final GlobalObject global = (GlobalObject)Context.getGlobal();
+
+        if (property != null) {
+            final ScriptFunction get   = property.getGetterFunction(this);
+            final ScriptFunction set   = property.getSetterFunction(this);
+
+            final boolean configurable = property.isConfigurable();
+            final boolean enumerable   = property.isEnumerable();
+            final boolean writable     = property.isWritable();
+
+            if (property instanceof UserAccessorProperty) {
+                return global.newAccessorDescriptor(
+                    (get != null) ?
+                        get :
+                        UNDEFINED,
+                    (set != null) ?
+                        set :
+                        UNDEFINED,
+                    configurable,
+                    enumerable);
+            }
+
+            return global.newDataDescriptor(getWithProperty(property), configurable, enumerable, writable);
+        }
+
+        final int index = getArrayIndexNoThrow(key);
+        final ArrayData array = getArray();
+
+        if (array.has(index)) {
+            return array.getDescriptor(global, index);
+        }
+
+        return UNDEFINED;
+    }
+
+    /**
+     * ECMA 8.12.2 [[GetProperty]] (P)
+     *
+     * @param key property key
+     *
+     * @return Returns the fully populated Property Descriptor of the named property
+     * of this object, or undefined if absent.
+     */
+    public Object getPropertyDescriptor(final String key) {
+        final Object res = getOwnPropertyDescriptor(key);
+
+        if (res != UNDEFINED) {
+            return res;
+        } else if (getProto() != null) {
+            return getProto().getOwnPropertyDescriptor(key);
+        } else {
+            return UNDEFINED;
+        }
+    }
+
+    /**
+     * ECMA 8.12.9 [[DefineOwnProperty]] (P, Desc, Throw)
+     *
+     * @param key the property key
+     * @param propertyDesc the property descriptor
+     * @param reject is the property extensible - true means new definitions are rejected
+     *
+     * @return true if property was successfully defined
+     */
+    public boolean defineOwnProperty(final String key, final Object propertyDesc, final boolean reject) {
+        final ScriptObject       global  = Context.getGlobal();
+        final PropertyDescriptor desc    = toPropertyDescriptor(global, propertyDesc);
+        final Object             current = getOwnPropertyDescriptor(key);
+        final String             name    = JSType.toString(key);
+
+        if (current == UNDEFINED) {
+            if (isExtensible()) {
+                // add a new own property
+                addOwnProperty(key, desc);
+                return true;
+            }
+            // new property added to non-extensible object
+            if (reject) {
+                typeError(global, "object.non.extensible", name, ScriptRuntime.safeToString(this));
+            }
+            return false;
+        }
+        // modifying an existing property
+        final PropertyDescriptor currentDesc = (PropertyDescriptor) current;
+        final PropertyDescriptor newDesc     = desc;
+
+        if (newDesc.type() == PropertyDescriptor.GENERIC &&
+            ! newDesc.has(CONFIGURABLE) && ! newDesc.has(ENUMERABLE)) {
+            // every descriptor field is absent
+            return true;
+        }
+
+        if (currentDesc.equals(newDesc)) {
+            // every descriptor field of the new is same as the current
+            return true;
+        }
+
+        if (! currentDesc.isConfigurable()) {
+            if (newDesc.has(CONFIGURABLE) && newDesc.isConfigurable()) {
+                // not configurable can not be made configurable
+                if (reject) {
+                    typeError(global, "cant.redefine.property", name, ScriptRuntime.safeToString(this));
+                }
+                return false;
+            }
+
+            if (newDesc.has(ENUMERABLE) &&
+                currentDesc.isEnumerable() != newDesc.isEnumerable()) {
+                // cannot make non-enumerable as enumerable or vice-versa
+                if (reject) {
+                    typeError(global, "cant.redefine.property", name, ScriptRuntime.safeToString(this));
+                }
+                return false;
+            }
+        }
+
+        int propFlags = Property.mergeFlags(currentDesc, newDesc);
+        Property property = getMap().findProperty(key);
+
+        if (currentDesc.type() == PropertyDescriptor.DATA &&
+            (newDesc.type() == PropertyDescriptor.DATA || newDesc.type() == PropertyDescriptor.GENERIC)) {
+            if (! currentDesc.isConfigurable() && ! currentDesc.isWritable()) {
+                if (newDesc.has(WRITABLE) && newDesc.isWritable() ||
+                    newDesc.has(VALUE) && ! ScriptRuntime.sameValue(currentDesc.getValue(), newDesc.getValue())) {
+                    if (reject) {
+                        typeError(global, "cant.redefine.property", name, ScriptRuntime.safeToString(this));
+                    }
+                    return false;
+                }
+            }
+
+            final boolean newValue = newDesc.has(VALUE);
+            final Object value     = newValue? newDesc.getValue() : currentDesc.getValue();
+            if (newValue && property != null) {
+                // Temporarily clear flags.
+                property = modifyOwnProperty(property, 0);
+                set(key, value, getContext()._strict);
+            }
+
+            if (property == null) {
+                // promoting an arrayData value to actual property
+                addOwnProperty(key, propFlags, value);
+                removeArraySlot(key);
+            } else {
+                // Now set the new flags
+                modifyOwnProperty(property, propFlags);
+            }
+        } else if (currentDesc.type() == PropertyDescriptor.ACCESSOR &&
+                   (newDesc.type() == PropertyDescriptor.ACCESSOR ||
+                    newDesc.type() == PropertyDescriptor.GENERIC)) {
+            if (! currentDesc.isConfigurable()) {
+                if (newDesc.has(PropertyDescriptor.GET) && ! ScriptRuntime.sameValue(currentDesc.getGetter(), newDesc.getGetter()) ||
+                    newDesc.has(PropertyDescriptor.SET) && ! ScriptRuntime.sameValue(currentDesc.getSetter(), newDesc.getSetter())) {
+                    if (reject) {
+                        typeError(global, "cant.redefine.property", name, ScriptRuntime.safeToString(this));
+                    }
+                    return false;
+                }
+            }
+
+            // New set the new features.
+            modifyOwnProperty(property, propFlags,
+                                      newDesc.has(GET) ? newDesc.getGetter() : currentDesc.getGetter(),
+                                      newDesc.has(SET) ? newDesc.getSetter() : currentDesc.getSetter());
+        } else {
+            // changing descriptor type
+            if (! currentDesc.isConfigurable()) {
+                // not configurable can not be made configurable
+                if (reject) {
+                    typeError(global, "cant.redefine.property", name, ScriptRuntime.safeToString(this));
+                }
+                return false;
+            }
+
+            propFlags = 0;
+
+            // Preserve only configurable and enumerable from current desc
+            // if those are not overridden in the new property descriptor.
+            boolean value = newDesc.has(CONFIGURABLE)? newDesc.isConfigurable() : currentDesc.isConfigurable();
+            if (!value) {
+                propFlags |= Property.NOT_CONFIGURABLE;
+            }
+            value = newDesc.has(ENUMERABLE)? newDesc.isEnumerable() : currentDesc.isEnumerable();
+            if (!value) {
+                propFlags |= Property.NOT_ENUMERABLE;
+            }
+
+            final int type = newDesc.type();
+            if (type == PropertyDescriptor.DATA) {
+                // get writable from the new descriptor
+                value = newDesc.has(WRITABLE) && newDesc.isWritable();
+                if (! value) {
+                    propFlags |= Property.NOT_WRITABLE;
+                }
+
+                // delete the old property
+                deleteOwnProperty(property);
+                // add new data property
+                addOwnProperty(key, propFlags, newDesc.getValue());
+            } else if (type == PropertyDescriptor.ACCESSOR) {
+                if (property == null) {
+                    addOwnProperty(key, propFlags,
+                                     newDesc.has(GET) ? newDesc.getGetter() : null,
+                                     newDesc.has(SET) ? newDesc.getSetter() : null);
+                } else {
+                    // Modify old property with the new features.
+                    modifyOwnProperty(property, propFlags,
+                                        newDesc.has(GET) ? newDesc.getGetter() : null,
+                                        newDesc.has(SET) ? newDesc.getSetter() : null);
+                }
+            }
+        }
+
+        checkIntegerKey(key);
+
+        return true;
+    }
+
+    /**
+     * Spec. mentions use of [[DefineOwnProperty]] for indexed properties in
+     * certain places (eg. Array.prototype.map, filter). We can not use ScriptObject.set
+     * method in such cases. This is because set method uses inherited setters (if any)
+     * from any object in proto chain such as Array.prototype, Object.prototype.
+     * This method directly sets a particular element value in the current object.
+     *
+     * @param index index key for property
+     * @param value value to define
+     */
+    protected final void defineOwnProperty(final int index, final Object value) {
+        if (index >= getArray().length()) {
+            // make array big enough to hold..
+            setArray(getArray().ensure(index));
+        }
+        setArray(getArray().set(index, value, false));
+    }
+
+    private void checkIntegerKey(final String key) {
+        final int index = getArrayIndexNoThrow(key);
+
+        if (isValidArrayIndex(index)) {
+            final ArrayData data = getArray();
+
+            if (data.has(index)) {
+                setArray(data.delete(index));
+            }
+        }
+    }
+
+    private void removeArraySlot(final String key) {
+        final int index = getArrayIndexNoThrow(key);
+        final ArrayData array = getArray();
+
+        if (array.has(index)) {
+            setArray(array.delete(index));
+        }
+    }
+
+    /**
+      * Add a new property to the object.
+      *
+      * @param key          property key
+      * @param propertyDesc property descriptor for property
+      */
+    public final void addOwnProperty(final String key, final PropertyDescriptor propertyDesc) {
+        // Already checked that there is no own property with that key.
+        PropertyDescriptor pdesc = propertyDesc;
+
+        final int propFlags = Property.toFlags(pdesc);
+
+        if (pdesc.type() == PropertyDescriptor.GENERIC) {
+            final GlobalObject global = (GlobalObject) Context.getGlobal();
+            final PropertyDescriptor dDesc = global.newDataDescriptor(UNDEFINED, false, false, false);
+
+            dDesc.fillFrom((ScriptObject)pdesc);
+            pdesc = dDesc;
+        }
+
+        final int type = pdesc.type();
+        if (type == PropertyDescriptor.DATA) {
+            addOwnProperty(key, propFlags, pdesc.getValue());
+        } else if (type == PropertyDescriptor.ACCESSOR) {
+            addOwnProperty(key, propFlags,
+                    pdesc.has(GET) ? pdesc.getGetter() : null,
+                    pdesc.has(SET) ? pdesc.getSetter() : null);
+        }
+
+        checkIntegerKey(key);
+    }
+
+    /**
+     * Low level property API (not using property descriptors)
+     * <p>
+     * Find a property in the prototype hierarchy. Note: this is final and not
+     * a good idea to override. If you have to, use
+     * {jdk.nashorn.internal.objects.NativeArray{@link #getProperty(String)} or
+     * {jdk.nashorn.internal.objects.NativeArray{@link #getPropertyDescriptor(String)} as the
+     * overriding way to find array properties
+     *
+     * @see jdk.nashorn.internal.objects.NativeArray
+     *
+     * @param key  Property key.
+     * @param deep Whether the search should look up proto chain.
+     *
+     * @return FindPropertyData or null if not found.
+     */
+    public final FindProperty findProperty(final String key, final boolean deep) {
+        int depth = 0;
+
+        for (ScriptObject self = this; self != null; self = self.getProto()) {
+            final PropertyMap selfMap  = self.getMap();
+            final Property    property = selfMap.findProperty(key);
+
+            if (property != null) {
+                return new FindProperty(this, self, selfMap, property, depth);
+            } else if (!deep) {
+                return null;
+            }
+
+            depth++;
+        }
+
+        return null;
+    }
+
+    /**
+     * Add a new property to the object.
+     * <p>
+     * This a more "low level" way that doesn't involve {@link PropertyDescriptor}s
+     *
+     * @param key             Property key.
+     * @param propertyFlags   Property flags.
+     * @param getter          Property getter, or null if not defined
+     * @param setter          Property setter, or null if not defined
+     *
+     * @return New property.
+     */
+    public final Property addOwnProperty(final String key, final int propertyFlags, final ScriptFunction getter, final ScriptFunction setter) {
+        return addOwnProperty(newUserAccessors(key, propertyFlags, getter, setter));
+    }
+
+    /**
+     * Add a new property to the object.
+     * <p>
+     * This a more "low level" way that doesn't involve {@link PropertyDescriptor}s
+     *
+     * @param key             Property key.
+     * @param propertyFlags   Property flags.
+     * @param value           Value of property
+     *
+     * @return New property.
+     */
+    public final Property addOwnProperty(final String key, final int propertyFlags, final Object value) {
+        final MethodHandle setter = addSpill(key, propertyFlags);
+
+        try {
+            setter.invokeExact((Object)this, value);
+        } catch (final Error|RuntimeException e) {
+            throw e;
+        } catch (final Throwable e) {
+            throw new RuntimeException(e);
+        }
+
+        return getMap().findProperty(key);
+    }
+
+    /**
+     * Add a new property to the object.
+     * <p>
+     * This a more "low level" way that doesn't involve {@link PropertyDescriptor}s
+     *
+     * @param newProperty property to add
+     *
+     * @return New property.
+     */
+    public final Property addOwnProperty(final Property newProperty) {
+        PropertyMap oldMap = getMap();
+
+        while (true) {
+            final PropertyMap newMap = oldMap.addProperty(newProperty);
+
+            if (!compareAndSetMap(oldMap, newMap)) {
+                oldMap = getMap();
+                final Property oldProperty = oldMap.findProperty(newProperty.getKey());
+
+                if (oldProperty != null) {
+                    return oldProperty;
+                }
+            } else {
+                return newProperty;
+            }
+        }
+    }
+
+    private void erasePropertyValue(final Property property) {
+        // Erase the property field value with undefined. If the property is defined
+        // by user-defined accessors, we don't want to call the setter!!
+        if (!(property instanceof UserAccessorProperty)) {
+            try {
+                // make the property value to be undefined
+                //TODO specproperties
+                property.getSetter(Object.class, getMap()).invokeExact((Object)this, (Object)UNDEFINED);
+            } catch (final RuntimeException | Error e) {
+                throw e;
+            } catch (final Throwable t) {
+                throw new RuntimeException(t);
+            }
+        }
+    }
+
+    /**
+     * Delete a property from the object.
+     *
+     * @param property Property to delete.
+     *
+     * @return true if deleted.
+     */
+    public final boolean deleteOwnProperty(final Property property) {
+        erasePropertyValue(property);
+        PropertyMap oldMap = getMap();
+
+        while (true) {
+            final PropertyMap newMap = oldMap.deleteProperty(property);
+
+            if (newMap == null) {
+                return false;
+            }
+
+            if (!compareAndSetMap(oldMap, newMap)) {
+                oldMap = getMap();
+            } else {
+                // delete getter and setter function references so that we don't leak
+                if (property instanceof UserAccessorProperty) {
+                    final UserAccessorProperty uc = (UserAccessorProperty) property;
+                    setEmbedOrSpill(uc.getGetterSlot(), null);
+                    setEmbedOrSpill(uc.getSetterSlot(), null);
+                }
+                return true;
+            }
+        }
+    }
+
+    /**
+     * Modify a property in the object
+     *
+     * @param oldProperty    property to modify
+     * @param propertyFlags  new property flags
+     * @param getter         getter for {@link UserAccessorProperty}, null if not present or N/A
+     * @param setter         setter for {@link UserAccessorProperty}, null if not present or N/A
+     *
+     * @return new property
+     */
+    public final Property modifyOwnProperty(final Property oldProperty, final int propertyFlags, final ScriptFunction getter, final ScriptFunction setter) {
+        Property newProperty;
+        if (oldProperty instanceof UserAccessorProperty) {
+            // re-use the slots of the old user accessor property.
+            final UserAccessorProperty uc = (UserAccessorProperty) oldProperty;
+
+            int getterSlot = uc.getGetterSlot();
+            // clear the old getter and set the new getter
+            setEmbedOrSpill(getterSlot, getter);
+            // if getter function is null, flag the slot to be negative (less by 1)
+            if (getter == null) {
+                getterSlot = -getterSlot - 1;
+            }
+
+            int setterSlot = uc.getSetterSlot();
+            // clear the old setter and set the new setter
+            setEmbedOrSpill(setterSlot, setter);
+            // if setter function is null, flag the slot to be negative (less by 1)
+            if (setter == null) {
+                setterSlot = -setterSlot - 1;
+            }
+
+            newProperty = new UserAccessorProperty(oldProperty.getKey(), propertyFlags, getterSlot, setterSlot);
+            // if just flipping getter and setter with new functions, no need to change property or map
+            if (oldProperty.equals(newProperty)) {
+                return oldProperty;
+            }
+        } else {
+            // erase old property value and create new user accessor property
+            erasePropertyValue(oldProperty);
+            newProperty = newUserAccessors(oldProperty.getKey(), propertyFlags, getter, setter);
+        }
+
+        notifyPropertyModified(this, oldProperty, newProperty);
+
+        return modifyOwnProperty(oldProperty, newProperty);
+    }
+
+    /**
+      * Modify a property in the object
+      *
+      * @param oldProperty    property to modify
+      * @param propertyFlags  new property flags
+      *
+      * @return new property
+      */
+    public final Property modifyOwnProperty(final Property oldProperty, final int propertyFlags) {
+        return modifyOwnProperty(oldProperty, oldProperty.setFlags(propertyFlags));
+    }
+
+    /**
+     * Modify a property in the object, replacing a property with a new one
+     *
+     * @param oldProperty   property to replace
+     * @param newProperty   property to replace it with
+     *
+     * @return new property
+     */
+    private Property modifyOwnProperty(final Property oldProperty, final Property newProperty) {
+        assert newProperty.getKey().equals(oldProperty.getKey()) : "replacing property with different key";
+
+        PropertyMap oldMap = getMap();
+
+        while (true) {
+            final PropertyMap newMap = oldMap.replaceProperty(oldProperty, newProperty);
+
+            if (!compareAndSetMap(oldMap, newMap)) {
+                oldMap = getMap();
+                final Property oldPropertyLookup = oldMap.findProperty(oldProperty.getKey());
+
+                if (oldPropertyLookup != null && oldPropertyLookup.equals(newProperty)) {
+                    return oldPropertyLookup;
+                }
+            } else {
+                return newProperty;
+            }
+        }
+    }
+
+    /**
+     * Update getter and setter in an object literal.
+     *
+     * @param key    Property key.
+     * @param getter {@link UserAccessorProperty} defined getter, or null if none
+     * @param setter {@link UserAccessorProperty} defined setter, or null if none
+     */
+    public final void setUserAccessors(final String key, final ScriptFunction getter, final ScriptFunction setter) {
+        final Property oldProperty = getMap().findProperty(key);
+        if (oldProperty != null) {
+            final UserAccessorProperty newProperty = newUserAccessors(oldProperty.getKey(), oldProperty.getFlags(), getter, setter);
+            modifyOwnProperty(oldProperty, newProperty);
+        } else {
+            final UserAccessorProperty newProperty = newUserAccessors(key, 0, getter, setter);
+            addOwnProperty(newProperty);
+        }
+    }
+
+    private static int getIntValue(final FindProperty find) {
+        final MethodHandle getter = find.getGetter(int.class);
+        if (getter != null) {
+            try {
+                return (int)getter.invokeExact((Object)find.getOwner());
+            } catch (final Error|RuntimeException e) {
+                throw e;
+            } catch (final Throwable e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        return ObjectClassGenerator.UNDEFINED_INT;
+    }
+
+    private static long getLongValue(final FindProperty find) {
+        final MethodHandle getter = find.getGetter(long.class);
+        if (getter != null) {
+            try {
+                return (long)getter.invokeExact((Object)find.getOwner());
+            } catch (final Error|RuntimeException e) {
+                throw e;
+            } catch (final Throwable e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        return ObjectClassGenerator.UNDEFINED_LONG;
+    }
+
+    private static double getDoubleValue(final FindProperty find) {
+        final MethodHandle getter = find.getGetter(double.class);
+        if (getter != null) {
+            try {
+                return (double)getter.invokeExact((Object)find.getOwner());
+            } catch (final Error|RuntimeException e) {
+                throw e;
+            } catch (final Throwable e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        return ObjectClassGenerator.UNDEFINED_DOUBLE;
+    }
+
+    /**
+      * Get the object value of a property
+      *
+      * @param find {@link FindProperty} lookup result
+      *
+      * @return the value of the property
+      */
+    protected static Object getObjectValue(final FindProperty find) {
+        final MethodHandle getter = find.getGetter(Object.class);
+        if (getter != null) {
+            try {
+                return getter.invokeExact((Object)find.getOwner());
+            } catch (final Error|RuntimeException e) {
+                throw e;
+            } catch (final Throwable e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        return UNDEFINED;
+    }
+
+    /**
+     * Return methodHandle of value function for call.
+     *
+     * @param find      data from find property.
+     * @param type      method type of function.
+     * @param bindName  null or name to bind to second argument (property not found method.)
+     *
+     * @return value of property as a MethodHandle or null.
+     *
+     */
+    @SuppressWarnings("static-method")
+    protected MethodHandle getCallMethodHandle(final FindProperty find, final MethodType type, final String bindName) {
+        return getCallMethodHandle(getObjectValue(find), type, bindName);
+    }
+
+    /**
+     * Return methodHandle of value function for call.
+     *
+     * @param value     value of receiver, it not a {@link ScriptFunction} this will return null.
+     * @param type      method type of function.
+     * @param bindName  null or name to bind to second argument (property not found method.)
+     *
+     * @return value of property as a MethodHandle or null.
+     */
+    protected static MethodHandle getCallMethodHandle(final Object value, final MethodType type, final String bindName) {
+        return value instanceof ScriptFunction ? ((ScriptFunction)value).getCallMethodHandle(type, bindName) : null;
+    }
+
+    /**
+     * Get value using found property.
+     *
+     * @param property Found property.
+     *
+     * @return Value of property.
+     */
+    public final Object getWithProperty(final Property property) {
+        return getObjectValue(new FindProperty(this, this, getMap(), property, 0));
+    }
+
+    /**
+     * Get a property given a key
+     *
+     * @param key property key
+     *
+     * @return property for key
+     */
+    public final Property getProperty(final String key) {
+        return getMap().findProperty(key);
+    }
+
+    static String convertKey(final Object key) {
+        return (key instanceof String) ? (String)key : JSType.toString(key);
+    }
+
+    /**
+     * Overridden by {@link jdk.nashorn.internal.objects.NativeArguments} class (internal use.)
+     * Used for argument access in a vararg function using parameter name.
+     * Returns the argument at a given key (index)
+     *
+     * @param key argument index
+     *
+     * @return the argument at the given position, or undefined if not present
+     */
+    public Object getArgument(final int key) {
+        return get(key);
+    }
+
+    /**
+     * Overridden by {@link jdk.nashorn.internal.objects.NativeArguments} class (internal use.)
+     * Used for argument access in a vararg function using parameter name.
+     * Returns the argument at a given key (index)
+     *
+     * @param key   argument index
+     * @param value the value to write at the given index
+     */
+    public void setArgument(final int key, final Object value) {
+        set(key, value, getContext()._strict);
+    }
+
+    /**
+     * Return the current context from the object's map.
+     * @return Current context.
+     */
+    public final Context getContext() {
+        return getMap().getContext();
+    }
+
+    /**
+     * Return the map of an object.
+     * @return PropertyMap object.
+     */
+    public final PropertyMap getMap() {
+        return map;
+    }
+
+    /**
+     * Set the initial map.
+     * @param map Initial map.
+     */
+    public final void setMap(final PropertyMap map) {
+        this.map = map;
+    }
+
+    /**
+     * Conditionally set the new map if the old map is the same.
+     * @param oldMap Map prior to manipulation.
+     * @param newMap Replacement map.
+     * @return true if the operation succeeded.
+     */
+    protected synchronized final boolean compareAndSetMap(final PropertyMap oldMap, final PropertyMap newMap) {
+        final boolean update = oldMap == this.map;
+
+        if (update) {
+            this.map = newMap;
+        }
+
+        return update;
+     }
+
+    /**
+     * Return the __proto__ of an object.
+     * @return __proto__ object.
+     */
+    public final ScriptObject getProto() {
+        return getMap().getProto();
+    }
+
+    /**
+     * Check if this is a prototype
+     * @return true if {@link PropertyMap#isPrototype()} is true for this ScriptObject
+     */
+    public final boolean isPrototype() {
+        return getMap().isPrototype();
+    }
+
+    /**
+     * Set the __proto__ of an object.
+     * @param newProto new __proto__ to set.
+     */
+    public final void setProto(final ScriptObject newProto) {
+        PropertyMap  oldMap   = getMap();
+        ScriptObject oldProto = getProto();
+
+        while (oldProto != newProto) {
+            final PropertyMap newMap = oldMap.setProto(newProto);
+
+            if (!compareAndSetMap(oldMap, newMap)) {
+                oldMap = getMap();
+                oldProto = getProto();
+            } else {
+                if (isPrototype()) {
+
+                    if (oldProto != null) {
+                        oldProto.removePropertyListener(this);
+                    }
+
+                    if (newProto != null) {
+                        newProto.addPropertyListener(this);
+                    }
+                }
+
+                return;
+            }
+        }
+    }
+
+    /**
+     * Set the __proto__ of an object with checks.
+     * @param newProto Prototype to set.
+     */
+    public final void setProtoCheck(final Object newProto) {
+        if (newProto == null || newProto instanceof ScriptObject) {
+            setProto((ScriptObject)newProto);
+        } else {
+            final ScriptObject global = Context.getGlobal();
+            final Object  newProtoObject = JSType.toObject(global, newProto);
+
+            if (newProtoObject instanceof ScriptObject) {
+                setProto((ScriptObject)newProtoObject);
+            } else {
+                typeError(global, "cant.set.proto.to.non.object", ScriptRuntime.safeToString(this), ScriptRuntime.safeToString(newProto));
+            }
+        }
+    }
+
+    /**
+     * return a List of own keys associated with the object.
+     * @param all True if to include non-enumerable keys.
+     * @return Array of keys.
+     */
+    public String[] getOwnKeys(final boolean all) {
+        final List<Object> keys    = new ArrayList<>();
+        final PropertyMap  selfMap = this.getMap();
+
+        final ArrayData array  = getArray();
+        final long length      = array.length();
+
+        for (long i = 0; i < length; i = array.nextIndex(i)) {
+            if (array.has((int)i)) {
+                keys.add(JSType.toString(i));
+            }
+        }
+
+        for (final Property property : selfMap.getProperties()) {
+            if (all || property.isEnumerable()) {
+                keys.add(property.getKey());
+            }
+        }
+
+        return keys.toArray(new String[keys.size()]);
+    }
+
+    /**
+     * Check if this ScriptObject has array entries. This means that someone has
+     * set values with numeric keys in the object.
+     *
+     * Note: this can be O(n) up to the array length
+     *
+     * @return true if array entries exists.
+     */
+    public boolean hasArrayEntries() {
+        final ArrayData array = getArray();
+        final long length = array.length();
+
+        for (long i = 0; i < length; i++) {
+            if (array.has((int)i)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Return the valid JavaScript type name descriptor
+     *
+     * @return "Object"
+     */
+    public String getClassName() {
+        return "Object";
+    }
+
+    /**
+     * {@code length} is a well known property. This is its getter.
+     * Note that this *may* be optimized by other classes
+     *
+     * @return length property value for this ScriptObject
+     */
+    public Object getLength() {
+        return get("length");
+    }
+
+    /**
+     * Stateless toString for ScriptObjects.
+     *
+     * @return string description of this object, e.g. {@code [object Object]}
+     */
+    public String safeToString() {
+        return "[object " + getClassName() + "]";
+    }
+
+    /**
+     * Return the default value of the object with a given preferred type hint.
+     * The preferred type hints are String.class for type String, Number.class
+     * for type Number. <p>
+     *
+     * A <code>hint</code> of null means "no hint".
+     *
+     * ECMA 8.12.8 [[DefaultValue]](hint)
+     *
+     * @param typeHint the preferred type hint
+     * @return the default value
+     */
+    public Object getDefaultValue(final Class<?> typeHint) {
+        // We delegate to GlobalObject, as the implementation uses dynamic call sites to invoke object's "toString" and
+        // "valueOf" methods, and in order to avoid those call sites from becoming megamorphic when multiple contexts
+        // are being executed in a long-running program, we move the code and their associated dynamic call sites
+        // (Global.TO_STRING and Global.VALUE_OF) into per-context code.
+        return ((GlobalObject)Context.getGlobal()).getDefaultValue(this, typeHint);
+    }
+
+    /**
+     * Checking whether a script object is an instance of another. Used
+     * in {@link ScriptFunction} for hasInstance implementation, walks
+     * the proto chain
+     *
+     * @param instance instace to check
+     * @return true if instance of instance
+     */
+    public boolean isInstance(final ScriptObject instance) {
+        return false;
+    }
+
+    /**
+     * Flag this ScriptObject as non extensible
+     *
+     * @return the object after being made non extensible
+     */
+    public ScriptObject preventExtensions() {
+        PropertyMap oldMap = getMap();
+
+        while (true) {
+            final PropertyMap newMap = getMap().preventExtensions();
+
+            if (!compareAndSetMap(oldMap, newMap)) {
+                oldMap = getMap();
+            } else {
+                return this;
+            }
+        }
+    }
+
+    /**
+     * Check whether if an Object (not just a ScriptObject) represents JavaScript array
+     *
+     * @param obj object to check
+     *
+     * @return true if array
+     */
+    public static boolean isArray(final Object obj) {
+        return (obj instanceof ScriptObject) && ((ScriptObject)obj).isArray();
+    }
+
+    /**
+     * Check if this ScriptObject is an array
+     * @return true if array
+     */
+    public final boolean isArray() {
+        return (flags & IS_ARRAY) != 0;
+    }
+
+    /**
+     * Flag this ScriptObject as being an array
+     */
+    public final void setIsArray() {
+        flags |= IS_ARRAY;
+    }
+
+    /**
+     * Check if this ScriptObject is an {@code arguments} vector
+     * @return true if arguments vector
+     */
+    public final boolean isArguments() {
+        return (flags & IS_ARGUMENTS) != 0;
+    }
+
+    /**
+     * Flag this ScriptObject as being an {@code arguments} vector
+     */
+    public final void setIsArguments() {
+        flags |= IS_ARGUMENTS;
+    }
+
+    /**
+     * Get the {@link ArrayData} for this ScriptObject if it is an array
+     * @return array data
+     */
+    public final ArrayData getArray() {
+        return arrayData;
+    }
+
+    /**
+     * Set the {@link ArrayData} for this ScriptObject if it is to be an array
+     * @param arrayData the array data
+     */
+    public final void setArray(final ArrayData arrayData) {
+        this.arrayData = arrayData;
+    }
+
+    /**
+     * Check if this ScriptObject is extensible
+     * @return true if extensible
+     */
+    public boolean isExtensible() {
+        return getMap().isExtensible();
+    }
+
+    /**
+     * ECMAScript 15.2.3.8 - seal implementation
+     * @return the sealed ScriptObject
+     */
+    public ScriptObject seal() {
+        PropertyMap oldMap = getMap();
+
+        while (true) {
+            final PropertyMap newMap = getMap().seal();
+
+            if (!compareAndSetMap(oldMap, newMap)) {
+                oldMap = getMap();
+            } else {
+                setArray(ArrayData.seal(getArray()));
+                return this;
+            }
+        }
+    }
+
+    /**
+     * Check whether this ScriptObject is sealed
+     * @return true if sealed
+     */
+    public boolean isSealed() {
+        return getMap().isSealed();
+    }
+
+    /**
+     * ECMA 15.2.39 - freeze implementation. Freeze this ScriptObject
+     * @return the frozen ScriptObject
+     */
+    public ScriptObject freeze() {
+        PropertyMap oldMap = getMap();
+
+        while (true) {
+            final PropertyMap newMap = getMap().freeze();
+
+            if (!compareAndSetMap(oldMap, newMap)) {
+                oldMap = getMap();
+            } else {
+                setArray(ArrayData.freeze(getArray()));
+                return this;
+            }
+        }
+    }
+
+    /**
+     * Check whether this ScriptObject is frozen
+     * @return true if frozed
+     */
+    public boolean isFrozen() {
+        return getMap().isFrozen();
+    }
+
+
+    /**
+     * Flag this ScriptObject as scope
+     */
+    public final void setIsScope() {
+        if (Context.DEBUG) {
+            scopeCount++;
+        }
+        flags |= IS_SCOPE;
+    }
+
+    /**
+     * Check whether this ScriptObject is scope
+     * @return true if scope
+     */
+    public final boolean isScope() {
+        return (flags & IS_SCOPE) != 0;
+    }
+
+    @Override
+    public void clear() {
+        final boolean strict = getContext()._strict;
+        final Iterator<String> iter = propertyIterator();
+        while (iter.hasNext()) {
+            delete(iter.next(), strict);
+        }
+    }
+
+    @Override
+    public boolean containsKey(final Object key) {
+        return has(key);
+    }
+
+    @Override
+    public boolean containsValue(final Object value) {
+        final Iterator<Object> iter = valueIterator();
+        while (iter.hasNext()) {
+            if (iter.next().equals(value)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public Set<Map.Entry<Object, Object>> entrySet() {
+        final Iterator<String> iter = propertyIterator();
+        final Set<Map.Entry<Object, Object>> entries = new HashSet<>();
+        while (iter.hasNext()) {
+            final Object key = iter.next();
+            entries.add(new AbstractMap.SimpleImmutableEntry<>(key, get(key)));
+        }
+        return Collections.unmodifiableSet(entries);
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return !propertyIterator().hasNext();
+    }
+
+    @Override
+    public Set<Object> keySet() {
+        final Iterator<String> iter = propertyIterator();
+        final Set<Object> keySet = new HashSet<>();
+        while (iter.hasNext()) {
+            keySet.add(iter.next());
+        }
+        return Collections.unmodifiableSet(keySet);
+    }
+
+    @Override
+    public Object put(final Object key, final Object value) {
+        final Object oldValue = get(key);
+        set(key, value, getContext()._strict);
+        return oldValue;
+    }
+
+    @Override
+    public void putAll(final Map<?, ?> otherMap) {
+        final boolean strict = getContext()._strict;
+        for (final Map.Entry<?, ?> entry : otherMap.entrySet()) {
+            set(entry.getKey(), entry.getValue(), strict);
+        }
+    }
+
+    @Override
+    public Object remove(final Object key) {
+        final Object oldValue = get(key);
+        delete(key, getContext()._strict);
+        return oldValue;
+    }
+
+    @Override
+    public int size() {
+        int n = 0;
+        for (final Iterator<String> iter = propertyIterator(); iter.hasNext(); iter.next()) {
+            n++;
+        }
+        return n;
+    }
+
+    @Override
+    public Collection<Object> values() {
+        final List<Object>     values = new ArrayList<>(size());
+        final Iterator<Object> iter   = valueIterator();
+        while (iter.hasNext()) {
+            values.add(iter.next());
+        }
+        return Collections.unmodifiableList(values);
+    }
+
+    /**
+     * Lookup method that, given a CallSiteDescriptor, looks up the target
+     * MethodHandle and creates a GuardedInvocation
+     * with the appropriate guard(s).
+     *
+     * @param desc call site descriptor
+     *
+     * @return GuardedInvocation for the callsite
+     */
+    public final GuardedInvocation lookup(final CallSiteDescriptor desc) {
+        return lookup(desc, false);
+    }
+
+    /**
+     * Lookup the appropriate method for an invoke dynamic call.
+     *
+     * @param desc The descriptor of the call site.
+     * @param megaMorphic if the call site is considered megamorphic
+     *
+     * @return GuardedInvocation to be invoked at call site.
+     */
+    public GuardedInvocation lookup(final CallSiteDescriptor desc, final boolean megaMorphic) {
+        final int c = desc.getNameTokenCount();
+        // JavaScript is "immune" to all currently defined Dynalink composite operation - getProp is the same as getElem
+        // is the same as getMethod as JavaScript objects have a single namespace for all three. Therefore, we don't
+        // care about them, and just link to whatever is the first operation.
+        final String operator = CallSiteDescriptorFactory.tokenizeOperators(desc).get(0);
+        // NOTE: we support getElem and setItem as JavaScript doesn't distinguish items from properties. Nashorn itself
+        // emits "dyn:getProp:identifier" for "<expr>.<identifier>" and "dyn:getElem" for "<expr>[<expr>]", but we are
+        // more flexible here and dispatch not on operation name (getProp vs. getElem), but rather on whether the
+        // operation has an associated name or not.
+        switch (operator) {
+        case "getProp":
+        case "getElem":
+        case "getMethod":
+            return c > 2 ? findGetMethod(desc, megaMorphic, operator) : findGetIndexMethod(desc);
+        case "setProp":
+        case "setElem":
+            return c > 2 ? findSetMethod(desc, megaMorphic) : findSetIndexMethod(desc);
+        case "call":
+            return findCallMethod(desc, megaMorphic);
+        case "new":
+            return findNewMethod(desc);
+        case "callMethod":
+            return findCallMethodMethod(desc, megaMorphic);
+        default:
+            return null;
+        }
+    }
+
+    /**
+     * Find the appropriate New method for an invoke dynamic call.
+     *
+     * @param desc The invoke dynamic call site descriptor.
+     *
+     * @return GuardedInvocation to be invoked at call site.
+     */
+    protected GuardedInvocation findNewMethod(final CallSiteDescriptor desc) {
+        return notAFunction();
+    }
+
+    /**
+     * Find the appropriate CALL method for an invoke dynamic call.
+     * This generates "not a function" always
+     *
+     * @param desc        the call site descriptor.
+     * @param megaMorphic is this call site megaMorphic, as reported by Dynalink - then just do apply
+     *
+     * @return GuardedInvocation to be invoed at call site.
+     */
+    protected GuardedInvocation findCallMethod(final CallSiteDescriptor desc, final boolean megaMorphic) {
+        return notAFunction();
+    }
+
+    private GuardedInvocation notAFunction() {
+        typeError(Context.getGlobal(), "not.a.function", ScriptRuntime.safeToString(this));
+        return null;
+    }
+
+    /**
+     * Find the appropriate CALL method for an invoke dynamic call.
+     *
+     * @param desc The call site descriptor.
+     * @param megaMorphic is this call site megaMorphic, as reported by Dynalink - then just do apply
+     *
+     * @return GuardedInvocation to be invoked at call site.
+     */
+    protected GuardedInvocation findCallMethodMethod(final CallSiteDescriptor desc, final boolean megaMorphic) {
+        final String       name     = desc.getNameToken(2);
+        final MethodType   callType = desc.getMethodType();
+        final FindProperty find     = findProperty(name, true);
+
+        if (find == null) {
+            return createNoSuchMethodInvocation(desc);
+        }
+
+        if (find.getProperty().hasGetterFunction()) {
+            final GuardedInvocation link   = findGetMethod(CallSiteDescriptorFactory.changeReturnType(desc, Object.class), megaMorphic, "getMethod");
+            final MethodHandle      getter = link.getInvocation(); //this cannot be anything but an object as this is the function
+
+            MethodHandle invoker = ScriptFunction.INVOKEHELPER;
+            invoker = MH.asCollector(invoker, Object[].class, callType.parameterCount() - 1); //deduct self
+            invoker = MH.foldArguments(invoker, MH.asType(getter, getter.type().changeReturnType(Object.class))); //getter->func to first arguments. self and object parameters remain
+
+            return new GuardedInvocation(invoker, link.getSwitchPoint(), link.getGuard());
+        }
+
+        //retrieve the appropriate scriptfunction
+        final Object value = getObjectValue(find);
+
+        MethodHandle methodHandle = getCallMethodHandle(value, callType, null);
+
+        if (methodHandle != null) {
+            if (find.isScope()) {
+                final boolean strictCallee = ((ScriptFunction)value).isStrict();
+                if (strictCallee && NashornCallSiteDescriptor.isScope(desc)) {
+                    methodHandle = bindTo(methodHandle, UNDEFINED);
+                } else {
+                    methodHandle = bindTo(methodHandle, Context.getGlobal());
+                }
+            }
+
+            final MethodHandle guard       = find.isSelf() ? Guards.getIdentityGuard(this) : NashornGuards.getMapGuard(getMap());
+            final int          invokeFlags = ((ScriptFunction)value).isStrict()? NashornCallSiteDescriptor.CALLSITE_STRICT : 0;
+
+            return new NashornGuardedInvocation(methodHandle, null, guard, invokeFlags);
+        }
+
+        typeError(Context.getGlobal(), "no.such.function", name, ScriptRuntime.safeToString(this));
+
+        throw new AssertionError("should not reach here");
+    }
+
+    /**
+     * Find the appropriate GET method for an invoke dynamic call.
+     *
+     * @param desc         the call site descriptor
+     * @param megaMorphic  is this call site megaMorphic, as reported by Dynalink - then just do apply
+     * @param operator     operator for get: getProp, getMethod, getElem etc
+     *
+     * @return GuardedInvocation to be invoked at call site.
+     */
+    protected GuardedInvocation findGetMethod(final CallSiteDescriptor desc, final boolean megaMorphic, final String operator) {
+        final String name = desc.getNameToken(2);
+
+        if (megaMorphic) {
+            return findMegaMorphicGetMethod(desc, name);
+        }
+
+        final FindProperty find = findProperty(name, true);
+
+        MethodHandle methodHandle;
+
+        if (find == null) {
+            if ("getProp".equals(operator)) {
+                return noSuchProperty(desc);
+            } else if ("getMethod".equals(operator)) {
+                return noSuchMethod(desc);
+            } else if ("getElem".equals(operator)) {
+                return createEmptyGetter(desc, name);
+            }
+            throw new AssertionError(); // never invoked with any other operation
+        }
+
+        final Class<?> returnType = desc.getMethodType().returnType();
+        final Property property = find.getProperty();
+        methodHandle = find.getGetter(returnType);
+
+        // getMap() is fine as we have the prototype switchpoint depending on where the property was found
+        final MethodHandle guard = NashornGuards.getMapGuard(getMap());
+
+        int invokeFlags = 0;
+
+        if (methodHandle != null) {
+            assert methodHandle.type().returnType().equals(returnType);
+            final ScriptFunction getter = find.getGetterFunction();
+            invokeFlags = (getter != null && getter.isStrict()) ? NashornCallSiteDescriptor.CALLSITE_STRICT : 0;
+            if (find.isSelf()) {
+                return new NashornGuardedInvocation(methodHandle, null, ObjectClassGenerator.OBJECT_FIELDS_ONLY &&
+                        NashornCallSiteDescriptor.isFastScope(desc) && !property.canChangeType() ? null : guard,
+                                invokeFlags);
+            }
+
+            final ScriptObject prototype = find.getOwner();
+
+            if (!property.hasGetterFunction()) {
+                methodHandle = bindTo(methodHandle, prototype);
+            }
+            return new NashornGuardedInvocation(methodHandle, getMap().getProtoGetSwitchPoint(name), guard, invokeFlags);
+        }
+
+        assert !NashornCallSiteDescriptor.isFastScope(desc);
+        return new NashornGuardedInvocation(Lookup.emptyGetter(returnType), getMap().getProtoGetSwitchPoint(name), guard, invokeFlags);
+    }
+
+    private static GuardedInvocation findMegaMorphicGetMethod(final CallSiteDescriptor desc, final String name) {
+        final GuardedInvocation inv = findGetIndexMethod(desc.getMethodType().insertParameterTypes(1, Object.class));
+        return inv.replaceMethods(MH.insertArguments(inv.getInvocation(), 1, name), inv.getGuard());
+    }
+
+    /**
+     * Find the appropriate GETINDEX method for an invoke dynamic call.
+     *
+     * @param desc the call site descriptor
+     *
+     * @return GuardedInvocation to be invoked at call site.
+     */
+    private static GuardedInvocation findGetIndexMethod(final CallSiteDescriptor desc) {
+        return findGetIndexMethod(desc.getMethodType());
+    }
+
+    /**
+     * Find the appropriate GETINDEX method for an invoke dynamic call.
+     *
+     * @param callType the call site method type
+     * @return GuardedInvocation to be invoked at call site.
+     */
+    private static GuardedInvocation findGetIndexMethod(final MethodType callType) {
+        final Class<?> returnClass = callType.returnType();
+        final Class<?> keyClass    = callType.parameterType(1);
+
+        String name = "get";
+        if (returnClass.isPrimitive()) {
+            //turn e.g. get with a double into getDouble
+            final String returnTypeName = returnClass.getName();
+            name += Character.toUpperCase(returnTypeName.charAt(0)) + returnTypeName.substring(1, returnTypeName.length());
+        }
+
+        return new GuardedInvocation(findOwnMH(name, returnClass, keyClass), getScriptObjectGuard(callType));
+    }
+
+    private static MethodHandle getScriptObjectGuard(final MethodType type) {
+        return ScriptObject.class.isAssignableFrom(type.parameterType(0)) ? null : NashornGuards.getScriptObjectGuard();
+    }
+
+    /**
+     * Find the appropriate SET method for an invoke dynamic call.
+     *
+     * @param desc the call site descriptor
+     * @param megaMorphic  is this call site megaMorphic, as reported by Dynalink - then just do apply
+     *
+     * @return GuardedInvocation to be invoked at call site.
+     */
+    protected GuardedInvocation findSetMethod(final CallSiteDescriptor desc, final boolean megaMorphic) {
+        final String      name     = desc.getNameToken(2);
+        if(megaMorphic) {
+            return findMegaMorphicSetMethod(desc, name);
+        }
+
+        final MethodType  callType = desc.getMethodType();
+        final PropertyMap oldMap   = getMap();
+        final Class<?>    type     = callType.parameterType(1);
+
+        FindProperty find = findProperty(name, true);
+        if (!isScope()) {
+            // not a scope search. We don't want any inherited a property
+            // unless it happens to be a user defined accessor property.
+            if (find != null && find.isInherited()) {
+               final Property inherited = find.getProperty();
+               if (!(inherited instanceof UserAccessorProperty)) {
+                   // we should only use inherited user accessor property
+                   find = null;
+                   // but we should still check if inherited data property is not writable!
+                   if (isExtensible() && !inherited.isWritable()) {
+                       if (NashornCallSiteDescriptor.isStrict(desc)) {
+                           typeError(Context.getGlobal(), "property.not.writable", name, ScriptRuntime.safeToString((this)));
+                       }
+                       assert !NashornCallSiteDescriptor.isFastScope(desc);
+                       return new GuardedInvocation(Lookup.EMPTY_SETTER, oldMap.getProtoGetSwitchPoint(name),
+                               NashornGuards.getMapGuard(oldMap));
+                   }
+               }
+            }
+        }
+
+        MethodHandle methodHandle = null;
+        Property     property     = null;
+        int          invokeFlags  = 0;
+
+        if (find != null) {
+            if (!find.isWritable()) {
+                if (NashornCallSiteDescriptor.isStrict(desc)) {
+                    typeError(Context.getGlobal(), "property.not.writable", name, ScriptRuntime.safeToString(this));
+                }
+
+                return new GuardedInvocation(Lookup.EMPTY_SETTER, oldMap.getProtoGetSwitchPoint(name),
+                        NashornGuards.getMapGuard(oldMap));
+            }
+
+            property     = find.getProperty();
+            methodHandle = find.getSetter(type, NashornCallSiteDescriptor.isStrict(desc));
+
+            assert methodHandle != null;
+            assert property     != null;
+
+            final ScriptFunction setter = find.getSetterFunction();
+
+            invokeFlags = 0;
+            if (setter != null && setter.isStrict()) {
+                invokeFlags = NashornCallSiteDescriptor.CALLSITE_STRICT;
+            }
+
+            if (!property.hasSetterFunction() && find.isInherited()) {
+                methodHandle = bindTo(methodHandle, find.getOwner());
+            }
+        } else if (!isExtensible()) {
+            if (NashornCallSiteDescriptor.isStrict(desc)) {
+                typeError(Context.getGlobal(), "object.non.extensible", name, ScriptRuntime.safeToString(this));
+            }
+
+            assert !NashornCallSiteDescriptor.isFastScope(desc);
+            return new GuardedInvocation(Lookup.EMPTY_SETTER, oldMap.getProtoGetSwitchPoint(name), NashornGuards.getMapGuard(oldMap));
+        }
+
+        if (methodHandle == null) {
+            // In strict mode, assignment can not create a new variable.
+            // See also ECMA Annex C item 4. ReferenceError is thrown.
+            if (NashornCallSiteDescriptor.isScope(desc) && NashornCallSiteDescriptor.isStrict(desc)) {
+                referenceError(Context.getGlobal(), "not.defined", name);
+            }
+
+            if (isScope()) {
+                final ScriptObject global = Context.getGlobal();
+                methodHandle = global.addSpill(name);
+                methodHandle = bindTo(methodHandle, global);
+            } else {
+                int i = findEmbed();
+
+                if (i >= EMBED_SIZE) {
+                    i = oldMap.getSpillLength();
+
+                    final MethodHandle getter =
+                        MH.asType(
+                            MH.insertArguments(
+                                MH.arrayElementGetter(Object[].class),
+                                1,
+                                i),
+                            Lookup.GET_OBJECT_TYPE);
+                    final MethodHandle setter =
+                        MH.asType(
+                            MH.insertArguments(
+                            MH.arrayElementSetter(Object[].class),
+                            1,
+                            i),
+                            Lookup.SET_OBJECT_TYPE);
+
+                    property = new SpillProperty(name, Property.IS_SPILL, i, getter, setter);
+
+                    final PropertyMap newMap = oldMap.addProperty(property);
+
+                    i = property.getSlot();
+
+                    if (spill == null) {
+                        methodHandle = MH.insertArguments(SETSPILLWITHNEW,  0, desc, oldMap, newMap, i);
+                    } else if (i < spill.length) {
+                        methodHandle = MH.insertArguments(SETSPILL,         0, desc, oldMap, newMap, i);
+                    } else {
+                        final int newLength = (i + SPILL_RATE) / SPILL_RATE * SPILL_RATE;
+                        methodHandle = MH.insertArguments(SETSPILLWITHGROW, 0, desc, oldMap, newMap, i, newLength);
+                    }
+                } else {
+                    useEmbed(i);
+                    property = new SpillProperty(name, 0, i, GET_EMBED[i], SET_EMBED[i]);
+                    final PropertyMap newMap = oldMap.addProperty(property);
+                    //TODO specfields
+                    methodHandle = MH.insertArguments(SETEMBED, 0, desc, oldMap, newMap, property.getSetter(Object.class, getMap()), i);
+                }
+
+                notifyPropertyAdded(this, property);
+            }
+        }
+
+        // the guard has to use old map because the setter is valid only for incoming object with this map
+        return new NashornGuardedInvocation(methodHandle, null, ObjectClassGenerator.OBJECT_FIELDS_ONLY &&
+                NashornCallSiteDescriptor.isFastScope(desc) && (property == null || !property.canChangeType()) ?
+                    null : NashornGuards.getMapGuard(oldMap), invokeFlags);
+    }
+
+    @SuppressWarnings("unused")
+    private static void setEmbed(final CallSiteDescriptor desc, final PropertyMap oldMap, final PropertyMap newMap, final MethodHandle setter, final int i, final Object self, final Object value) throws Throwable {
+        final ScriptObject obj = (ScriptObject)self;
+        if(obj.trySetEmbedOrSpill(desc, oldMap, newMap, value)) {
+            obj.useEmbed(i);
+            setter.invokeExact(self, value);
+        }
+    }
+
+    @SuppressWarnings("unused")
+    private static void setSpill(final CallSiteDescriptor desc, final PropertyMap oldMap, final PropertyMap newMap, final int index, final Object self, final Object value) {
+        final ScriptObject obj = (ScriptObject)self;
+        if(obj.trySetEmbedOrSpill(desc, oldMap, newMap, value)) {
+            obj.spill[index] = value;
+        }
+    }
+
+    private boolean trySetEmbedOrSpill(final CallSiteDescriptor desc, final PropertyMap oldMap, final PropertyMap newMap, final Object value) {
+        final boolean isStrict = NashornCallSiteDescriptor.isStrict(desc);
+        if (!isExtensible() && isStrict) {
+            typeError(Context.getGlobal(), "object.non.extensible", desc.getNameToken(2), ScriptRuntime.safeToString(this));
+            throw new AssertionError(); // never reached
+        } else if (compareAndSetMap(oldMap, newMap)) {
+            return true;
+        } else {
+            set(desc.getNameToken(CallSiteDescriptor.NAME_OPERAND), value, isStrict);
+            return false;
+        }
+    }
+
+    @SuppressWarnings("unused")
+    private static void setSpillWithNew(final CallSiteDescriptor desc, final PropertyMap oldMap, final PropertyMap newMap, final int index, final Object self, final Object value) {
+        final ScriptObject obj      = (ScriptObject)self;
+        final boolean      isStrict = NashornCallSiteDescriptor.isStrict(desc);
+
+        if (!obj.isExtensible()) {
+            if (isStrict) {
+                typeError(Context.getGlobal(), "object.non.extensible", desc.getNameToken(2), ScriptRuntime.safeToString(obj));
+            }
+        } else if (obj.compareAndSetMap(oldMap, newMap)) {
+            obj.spill = new Object[SPILL_RATE];
+            obj.spill[index] = value;
+        } else {
+            obj.set(desc.getNameToken(2), value, isStrict);
+        }
+    }
+
+    @SuppressWarnings("unused")
+    private static void setSpillWithGrow(final CallSiteDescriptor desc, final PropertyMap oldMap, final PropertyMap newMap, final int index, final int newLength, final Object self, final Object value) {
+        final ScriptObject obj      = (ScriptObject)self;
+        final boolean      isStrict = NashornCallSiteDescriptor.isStrict(desc);
+
+        if (!obj.isExtensible()) {
+            if (isStrict) {
+                typeError(Context.getGlobal(), "object.non.extensible", desc.getNameToken(2), ScriptRuntime.safeToString(obj));
+            }
+        } else if (obj.compareAndSetMap(oldMap, newMap)) {
+            final int oldLength = obj.spill.length;
+            final Object[] newSpill = new Object[newLength];
+            System.arraycopy(obj.spill, 0, newSpill, 0, oldLength);
+            obj.spill = newSpill;
+            obj.spill[index] = value;
+        } else {
+            obj.set(desc.getNameToken(2), value, isStrict);
+        }
+    }
+
+    private static GuardedInvocation findMegaMorphicSetMethod(final CallSiteDescriptor desc, final String name) {
+        final GuardedInvocation inv = findSetIndexMethod(desc.getMethodType().insertParameterTypes(1, Object.class),
+                NashornCallSiteDescriptor.isStrict(desc));
+        return inv.replaceMethods(MH.insertArguments(inv.getInvocation(), 1, name), inv.getGuard());
+    }
+
+    private static GuardedInvocation findSetIndexMethod(final CallSiteDescriptor desc) { // array, index, value
+        return findSetIndexMethod(desc.getMethodType(), NashornCallSiteDescriptor.isStrict(desc));
+    }
+
+    /**
+     * Find the appropriate SETINDEX method for an invoke dynamic call.
+     *
+     * @param callType the method type at the call site
+     * @param isStrict are we in strict mode?
+     *
+     * @return GuardedInvocation to be invoked at call site.
+     */
+    private static GuardedInvocation findSetIndexMethod(final MethodType callType, final boolean isStrict) {
+        assert callType.parameterCount() == 3;
+
+        final Class<?>   keyClass   = callType.parameterType(1);
+        final Class<?>   valueClass = callType.parameterType(2);
+
+        MethodHandle methodHandle = findOwnMH("set", void.class, keyClass, valueClass, boolean.class);
+        methodHandle = MH.asType(methodHandle, methodHandle.type().changeParameterType(0, Object.class));
+        methodHandle = MH.insertArguments(methodHandle, 3, isStrict);
+
+        return new GuardedInvocation(methodHandle, getScriptObjectGuard(callType));
+    }
+
+    /**
+     * Fall back if a function property is not found.
+     * @param desc The call site descriptor
+     * @return GuardedInvocation to be invoked at call site.
+     */
+    public GuardedInvocation noSuchMethod(final CallSiteDescriptor desc) {
+        final String       name      = desc.getNameToken(2);
+        final FindProperty find      = findProperty(NO_SUCH_METHOD_NAME, true);
+        final boolean      scopeCall = isScope() && NashornCallSiteDescriptor.isScope(desc);
+
+        if (find == null) {
+            if (scopeCall) {
+                ECMAErrors.referenceError(Context.getGlobal(), "not.defined", name);
+                throw new AssertionError(); // never reached
+            }
+            return createEmptyGetter(desc, name);
+        }
+
+        final ScriptFunction func = (ScriptFunction)getObjectValue(find);
+        final Object thiz = scopeCall && func.isStrict() ? ScriptRuntime.UNDEFINED : this;
+        // TODO: It'd be awesome if we could bind "name" without binding "this".
+        return new GuardedInvocation(MH.dropArguments(MH.constant(ScriptFunction.class,
+                func.makeBoundFunction(thiz, new Object[] { name })), 0, Object.class),
+                null, NashornGuards.getMapGuard(getMap()));
+    }
+
+    /**
+     * Create an invocation that will raise NoSuchMethod error
+     *
+     * @param desc call site descriptor
+     *
+     * @return Guarded invocation to be invoked at the call site
+     */
+    public GuardedInvocation createNoSuchMethodInvocation(final CallSiteDescriptor desc) {
+        final String name = desc.getNameToken(2);
+        final FindProperty find = findProperty(NO_SUCH_METHOD_NAME, true);
+        final boolean scopeCall = isScope() && NashornCallSiteDescriptor.isScope(desc);
+
+        if (find != null) {
+            final ScriptFunction func = (ScriptFunction)getObjectValue(find);
+            MethodHandle methodHandle = getCallMethodHandle(func, desc.getMethodType(), name);
+
+            if (methodHandle != null) {
+                if (scopeCall && func.isStrict()) {
+                    methodHandle = bindTo(methodHandle, UNDEFINED);
+                }
+                return new GuardedInvocation(methodHandle,
+                        find.isInherited()? getMap().getProtoGetSwitchPoint(NO_SUCH_PROPERTY_NAME) : null,
+                        getKnownFunctionPropertyGuard(getMap(), find.getGetter(Object.class), find.getOwner(), func));
+            }
+        }
+
+        if (scopeCall) {
+            referenceError(Context.getGlobal(), "not.defined", name);
+        } else {
+            typeError(Context.getGlobal(), "no.such.function", name, ScriptRuntime.safeToString(this));
+        }
+
+        return null;
+    }
+
+    /**
+     * Fall back if a property is not found.
+     * @param desc the call site descriptor.
+     * @return GuardedInvocation to be invoked at call site.
+     */
+    public GuardedInvocation noSuchProperty(final CallSiteDescriptor desc) {
+        final String name = desc.getNameToken(2);
+        final FindProperty find = findProperty(NO_SUCH_PROPERTY_NAME, true);
+        final boolean scopeAccess = isScope() && NashornCallSiteDescriptor.isScope(desc);
+
+        if (find != null) {
+            final ScriptFunction func = (ScriptFunction)getObjectValue(find);
+            MethodHandle methodHandle = getCallMethodHandle(func, desc.getMethodType(), name);
+
+            if (methodHandle != null) {
+                if (scopeAccess && func.isStrict()) {
+                    methodHandle = bindTo(methodHandle, UNDEFINED);
+                }
+                return new GuardedInvocation(methodHandle,
+                        find.isInherited()? getMap().getProtoGetSwitchPoint(NO_SUCH_PROPERTY_NAME) : null,
+                        getKnownFunctionPropertyGuard(getMap(), find.getGetter(Object.class), find.getOwner(), func));
+            }
+        }
+
+        if (scopeAccess) {
+            referenceError(Context.getGlobal(), "not.defined", name);
+        }
+
+        return createEmptyGetter(desc, name);
+    }
+
+    private GuardedInvocation createEmptyGetter(final CallSiteDescriptor desc, final String name) {
+        return new GuardedInvocation(Lookup.emptyGetter(desc.getMethodType().returnType()), getMap().getProtoGetSwitchPoint(name), NashornGuards.getMapGuard(getMap()));
+    }
+
+    private abstract static class ScriptObjectIterator <T extends Object> implements Iterator<T> {
+        protected T[] values;
+        protected final ScriptObject object;
+        private int index;
+
+        ScriptObjectIterator(final ScriptObject object) {
+            this.object = object;
+        }
+
+        protected abstract void init();
+
+        @Override
+        public boolean hasNext() {
+            if (values == null) {
+                init();
+            }
+            return index < values.length;
+        }
+
+        @Override
+        public T next() {
+            if (values == null) {
+                init();
+            }
+            return values[index++];
+        }
+
+        @Override
+        public void remove() {
+            throw new UnsupportedOperationException();
+        }
+    }
+
+    private static class KeyIterator extends ScriptObjectIterator<String> {
+        KeyIterator(final ScriptObject object) {
+            super(object);
+        }
+
+        @Override
+        protected void init() {
+            final Set<String> keys = new LinkedHashSet<>();
+            for (ScriptObject self = object; self != null; self = self.getProto()) {
+                keys.addAll(Arrays.asList(self.getOwnKeys(false)));
+            }
+            this.values = keys.toArray(new String[keys.size()]);
+        }
+    }
+
+    private static class ValueIterator extends ScriptObjectIterator<Object> {
+        ValueIterator(final ScriptObject object) {
+            super(object);
+        }
+
+        @Override
+        protected void init() {
+            final ArrayList<Object> valueList = new ArrayList<>();
+            for (ScriptObject self = object; self != null; self = self.getProto()) {
+                for (final String key : self.getOwnKeys(false)) {
+                    valueList.add(self.get(key));
+                }
+            }
+            this.values = valueList.toArray(new Object[valueList.size()]);
+        }
+    }
+
+    /**
+     * Add a spill property for the given key.
+     * @param key           Property key.
+     * @param propertyFlags Property flags.
+     * @return Added property.
+     */
+    private Property addSpillProperty(final String key, final int propertyFlags) {
+        int i = findEmbed();
+        Property spillProperty;
+
+        if (i >= EMBED_SIZE) {
+            i = getMap().getSpillLength();
+            MethodHandle getter = MH.arrayElementGetter(Object[].class);
+            MethodHandle setter = MH.arrayElementSetter(Object[].class);
+            getter = MH.asType(MH.insertArguments(getter, 1, i), Lookup.GET_OBJECT_TYPE);
+            setter = MH.asType(MH.insertArguments(setter, 1, i), Lookup.SET_OBJECT_TYPE);
+            spillProperty = new SpillProperty(key, propertyFlags | Property.IS_SPILL, i, getter, setter);
+            notifyPropertyAdded(this, spillProperty);
+            spillProperty = addOwnProperty(spillProperty);
+            i = spillProperty.getSlot();
+
+            final int newLength = (i + SPILL_RATE) / SPILL_RATE * SPILL_RATE;
+            final Object[] newSpill = new Object[newLength];
+
+            if (spill != null) {
+                System.arraycopy(spill, 0, newSpill, 0, spill.length);
+            }
+
+            spill = newSpill;
+         } else {
+            useEmbed(i);
+            spillProperty = new SpillProperty(key, propertyFlags, i, GET_EMBED[i], SET_EMBED[i]);
+            notifyPropertyAdded(this, spillProperty);
+            spillProperty = addOwnProperty(spillProperty);
+        }
+
+        return spillProperty;
+    }
+
+
+    /**
+     * Add a spill entry for the given key.
+     * @param key           Property key.
+     * @param propertyFlags Property flags.
+     * @return Setter method handle.
+     */
+    private MethodHandle addSpill(final String key, final int propertyFlags) {
+        final Property spillProperty = addSpillProperty(key, propertyFlags);
+        final Class<?> type = Object.class;
+        return spillProperty.getSetter(type, getMap()); //TODO specfields
+    }
+
+    private MethodHandle addSpill(final String key) {
+        return addSpill(key, 0);
+    }
+
+    /**
+     * Make sure arguments are paired correctly, with respect to more parameters than declared,
+     * fewer parameters than declared and other things that JavaScript allows. This might involve
+     * creating collectors.
+     *
+     * @param methodHandle method handle for invoke
+     * @param callType     type of the call
+     *
+     * @return method handle with adjusted arguments
+     */
+    protected static MethodHandle pairArguments(final MethodHandle methodHandle, final MethodType callType) {
+        return pairArguments(methodHandle, callType, null);
+    }
+
+    /**
+     * Make sure arguments are paired correctly, with respect to more parameters than declared,
+     * fewer parameters than declared and other things that JavaScript allows. This might involve
+     * creating collectors.
+     *
+     * Make sure arguments are paired correctly.
+     * @param methodHandle MethodHandle to adjust.
+     * @param callType     MethodType of caller.
+     * @param callerVarArg true if the caller is vararg, false otherwise, null if it should be inferred.
+     *
+     * @return method handle with adjusted arguments
+     */
+    public static MethodHandle pairArguments(final MethodHandle methodHandle, final MethodType callType, final Boolean callerVarArg) {
+
+        final MethodType methodType = methodHandle.type();
+        if (methodType.equals(callType)) {
+            return methodHandle;
+        }
+
+        final int parameterCount = methodType.parameterCount();
+        final int callCount      = callType.parameterCount();
+
+        final boolean isCalleeVarArg = parameterCount > 1 && methodType.parameterType(parameterCount - 1).isArray();
+        final boolean isCallerVarArg = callerVarArg != null ? callerVarArg.booleanValue() : (callCount > 1 &&
+                callType.parameterType(callCount - 1).isArray());
+
+        if (callCount < parameterCount) {
+            final int      missingArgs = parameterCount - callCount;
+            final Object[] fillers     = new Object[missingArgs];
+
+            Arrays.fill(fillers, UNDEFINED);
+
+            if (isCalleeVarArg) {
+                fillers[missingArgs - 1] = new Object[0];
+            }
+
+            return MH.insertArguments(
+                methodHandle,
+                parameterCount - missingArgs,
+                fillers);
+        }
+
+        if (isCalleeVarArg) {
+            return isCallerVarArg ?
+                methodHandle :
+                MH.asCollector(methodHandle, Object[].class, callCount - parameterCount + 1);
+        }
+
+        if (isCallerVarArg) {
+            final int spreadArgs = parameterCount - callCount + 1;
+            return MH.filterArguments(
+                MH.asSpreader(
+                    methodHandle,
+                    Object[].class,
+                    spreadArgs),
+                callCount - 1,
+                MH.insertArguments(
+                    TRUNCATINGFILTER,
+                    0,
+                    spreadArgs)
+                );
+        }
+
+        if (callCount > parameterCount) {
+            final int discardedArgs = callCount - parameterCount;
+
+            final Class<?>[] discards = new Class<?>[discardedArgs];
+            Arrays.fill(discards, Object.class);
+
+            return MH.dropArguments(methodHandle, callCount - discardedArgs, discards);
+        }
+
+        return methodHandle;
+    }
+
+    @SuppressWarnings("unused")
+    private static Object[] truncatingFilter(final int n, final Object[] array) {
+        final int length = array == null ? 0 : array.length;
+        if (n == length) {
+            return array == null ? new Object[0] : array;
+        }
+
+        final Object[] newArray = new Object[n];
+
+        if (array != null) {
+            for (int i = 0; i < n && i < length; i++) {
+                newArray[i] = array[i];
+            }
+        }
+
+        if (length < n) {
+            final Object fill = UNDEFINED;
+
+            for (int i = length; i < n; i++) {
+                newArray[i] = fill;
+            }
+        }
+
+        return newArray;
+    }
+
+    /**
+      * Numeric length setter for length property
+      *
+      * @param newLength new length to set
+      */
+    public final void setLength(final long newLength) {
+       final long arrayLength = getArray().length();
+       if (newLength == arrayLength) {
+           return;
+       }
+
+       final boolean isStrict = getContext()._strict;
+
+       if (newLength > arrayLength) {
+           setArray(getArray().ensure(newLength - 1));
+            if (getArray().canDelete(arrayLength, (newLength - 1), isStrict)) {
+               setArray(getArray().delete(arrayLength, (newLength - 1)));
+           }
+           return;
+       }
+
+       if (newLength < arrayLength) {
+           setArray(getArray().shrink(newLength));
+           getArray().setLength(newLength);
+       }
+   }
+
+    @Override
+    public int getInt(final Object key) {
+        final int index = getArrayIndexNoThrow(key);
+
+        if (getArray().has(index)) {
+            return getArray().getInt(index);
+        }
+
+        final FindProperty find = findProperty(convertKey(key), false);
+
+        if (find != null) {
+            return getIntValue(find);
+        }
+
+        final ScriptObject proto = this.getProto();
+
+        return proto != null ? proto.getInt(key) : 0;
+    }
+
+    @Override
+    public int getInt(final double key) {
+        final int index = getArrayIndexNoThrow(key);
+
+        if (getArray().has(index)) {
+            return getArray().getInt(index);
+        }
+
+        final FindProperty find = findProperty(convertKey(key), false);
+
+        if (find != null) {
+            return getIntValue(find);
+        }
+
+        final ScriptObject proto = this.getProto();
+
+        return proto != null ? proto.getInt(key) : 0;
+    }
+
+    @Override
+    public int getInt(final long key) {
+        final int index = getArrayIndexNoThrow(key);
+
+        if (getArray().has(index)) {
+            return getArray().getInt(index);
+        }
+
+        final FindProperty find = findProperty(convertKey(key), false);
+
+        if (find != null) {
+            return getIntValue(find);
+        }
+
+        final ScriptObject proto = this.getProto();
+
+        return proto != null ? proto.getInt(key) : 0;
+    }
+
+    @Override
+    public int getInt(final int key) {
+        final int index = getArrayIndexNoThrow(key);
+
+        if (getArray().has(index)) {
+            return getArray().getInt(index);
+        }
+
+        final FindProperty find = findProperty(convertKey(key), false);
+
+        if (find != null) {
+            return getIntValue(find);
+        }
+
+        final ScriptObject proto = this.getProto();
+
+        return proto != null ? proto.getInt(key) : 0;
+    }
+
+    @Override
+    public long getLong(final Object key) {
+        final int index = getArrayIndexNoThrow(key);
+
+        if (getArray().has(index)) {
+            return getArray().getLong(index);
+        }
+
+        final FindProperty find = findProperty(convertKey(key), false);
+
+        if (find != null) {
+            return getLongValue(find);
+        }
+
+        final ScriptObject proto = this.getProto();
+
+        return proto != null ? proto.getLong(key) : 0L;
+    }
+
+    @Override
+    public long getLong(final double key) {
+        final int index = getArrayIndexNoThrow(key);
+
+        if (getArray().has(index)) {
+            return getArray().getLong(index);
+        }
+
+        final FindProperty find = findProperty(convertKey(key), false);
+
+        if (find != null) {
+            return getLongValue(find);
+        }
+
+        final ScriptObject proto = this.getProto();
+
+        return proto != null ? proto.getLong(key) : 0L;
+    }
+
+    @Override
+    public long getLong(final long key) {
+        final int index = getArrayIndexNoThrow(key);
+
+        if (getArray().has(index)) {
+            return getArray().getLong(index);
+        }
+
+        final FindProperty find = findProperty(convertKey(key), false);
+
+        if (find != null) {
+            return getLongValue(find);
+        }
+
+        final ScriptObject proto = this.getProto();
+
+        return proto != null ? proto.getLong(key) : 0L;
+    }
+
+    @Override
+    public long getLong(final int key) {
+        final int index = getArrayIndexNoThrow(key);
+
+        if (getArray().has(index)) {
+            return getArray().getLong(index);
+        }
+
+        final FindProperty find = findProperty(convertKey(key), false);
+
+        if (find != null) {
+            return getLongValue(find);
+        }
+
+        final ScriptObject proto = this.getProto();
+
+        return proto != null ? proto.getLong(key) : 0L;
+    }
+
+    @Override
+    public double getDouble(final Object key) {
+        final int index = getArrayIndexNoThrow(key);
+
+        if (getArray().has(index)) {
+            return getArray().getDouble(index);
+        }
+
+        final FindProperty find = findProperty(convertKey(key), false);
+
+        if (find != null) {
+            return getDoubleValue(find);
+        }
+
+        final ScriptObject proto = this.getProto();
+
+        return proto != null ? proto.getDouble(key) : Double.NaN;
+    }
+
+    @Override
+    public double getDouble(final double key) {
+        final int index = getArrayIndexNoThrow(key);
+
+        if (getArray().has(index)) {
+            return getArray().getDouble(index);
+        }
+
+        final FindProperty find = findProperty(convertKey(key), false);
+
+        if (find != null) {
+            return getDoubleValue(find);
+        }
+
+        final ScriptObject proto = this.getProto();
+
+        return proto != null ? proto.getDouble(key) : Double.NaN;
+    }
+
+    @Override
+    public double getDouble(final long key) {
+        final int index = getArrayIndexNoThrow(key);
+
+        if (getArray().has(index)) {
+            return getArray().getDouble(index);
+        }
+
+        final FindProperty find = findProperty(convertKey(key), false);
+
+        if (find != null) {
+            return getDoubleValue(find);
+        }
+
+        final ScriptObject proto = this.getProto();
+
+        return proto != null ? proto.getDouble(key) : Double.NaN;
+    }
+
+    @Override
+    public double getDouble(final int key) {
+        final int index = getArrayIndexNoThrow(key);
+
+        if (getArray().has(index)) {
+            return getArray().getDouble(index);
+        }
+
+        final FindProperty find = findProperty(convertKey(key), false);
+
+        if (find != null) {
+            return getDoubleValue(find);
+        }
+
+        final ScriptObject proto = this.getProto();
+
+        return proto != null ? proto.getDouble(key) : Double.NaN;
+    }
+
+    @Override
+    public Object get(final Object key) {
+        final int index = getArrayIndexNoThrow(key);
+
+        if (getArray().has(index)) {
+            return getArray().getObject(index);
+        }
+
+        final FindProperty find = findProperty(convertKey(key), false);
+
+        if (find != null) {
+            return getObjectValue(find);
+        }
+
+        final ScriptObject proto = this.getProto();
+
+        return proto != null ? proto.get(key) : UNDEFINED;
+    }
+
+    @Override
+    public Object get(final double key) {
+        final int index = getArrayIndexNoThrow(key);
+
+        if (getArray().has(index)) {
+            return getArray().getObject(index);
+        }
+
+        final FindProperty find = findProperty(convertKey(key), false);
+
+        if (find != null) {
+            return getObjectValue(find);
+        }
+
+        final ScriptObject proto = this.getProto();
+
+        return proto != null ? proto.get(key) : UNDEFINED;
+    }
+
+    @Override
+    public Object get(final long key) {
+        final int index = getArrayIndexNoThrow(key);
+
+        if (getArray().has(index)) {
+            return getArray().getObject(index);
+        }
+
+        final FindProperty find = findProperty(convertKey(key), false);
+
+        if (find != null) {
+            return getObjectValue(find);
+        }
+
+        final ScriptObject proto = this.getProto();
+
+        return proto != null ? proto.get(key) : UNDEFINED;
+    }
+
+    @Override
+    public Object get(final int key) {
+        final int index = getArrayIndexNoThrow(key);
+
+        if (getArray().has(index)) {
+            return getArray().getObject(index);
+        }
+
+        final FindProperty find = findProperty(convertKey(key), false);
+
+        if (find != null) {
+            return getObjectValue(find);
+        }
+
+        final ScriptObject proto = this.getProto();
+
+        return proto != null ? proto.get(key) : UNDEFINED;
+    }
+
+    /**
+     * Handle when an array doesn't have a slot - possibly grow and/or convert array.
+     *
+     * @param index  key as index
+     * @param value  element value
+     * @param strict are we in strict mode
+     */
+    private void doesNotHave(final int index, final Object value, final boolean strict) {
+        final long oldLength = getArray().length();
+        final long longIndex = index & 0xffff_ffffL;
+
+        if (!getArray().has(index)) {
+            final String key = convertKey(longIndex);
+            final FindProperty find = findProperty(key, true);
+
+            if (find != null) {
+                setObject(find, strict, key, value);
+                return;
+            }
+        }
+
+        if (longIndex >= oldLength) {
+            if (!isExtensible()) {
+                if (strict) {
+                    typeError(Context.getGlobal(), "object.non.extensible", JSType.toString(index), ScriptRuntime.safeToString(this));
+                }
+                return;
+            }
+            setArray(getArray().ensure(longIndex));
+        }
+
+        if (value instanceof Integer) {
+            setArray(getArray().set(index, (int)value, strict));
+        } else if (value instanceof Long) {
+            setArray(getArray().set(index, (long)value, strict));
+        } else if (value instanceof Double) {
+            setArray(getArray().set(index, (double)value, strict));
+        } else {
+            setArray(getArray().set(index, value, strict));
+        }
+
+        if (longIndex > oldLength) {
+            ArrayData array = getArray();
+
+            if (array.canDelete(oldLength, (longIndex - 1), strict)) {
+                array = array.delete(oldLength, (longIndex - 1));
+            }
+
+            setArray(array);
+        }
+    }
+
+    /**
+     * This is the most generic of all Object setters. Most of the others use this in some form.
+     * TODO: should be further specialized
+     *
+     * @param find    found property
+     * @param strict  are we in strict mode
+     * @param key     property key
+     * @param value   property value
+     */
+    public final void setObject(final FindProperty find, final boolean strict, final String key, final Object value) {
+        FindProperty f = find;
+
+        if (f != null && f.isInherited() && !(f.getProperty() instanceof UserAccessorProperty)) {
+            f = null;
+        }
+
+        MethodHandle setter;
+
+        if (f != null) {
+            if (!f.isWritable()) {
+                if (strict) {
+                    typeError(Context.getGlobal(), "property.not.writable", key, ScriptRuntime.safeToString(this));
+                }
+
+                return;
+            }
+
+            setter = f.getSetter(Object.class, strict); //TODO specfields
+            try {
+                setter.invokeExact((Object)f.getOwner(), value);
+            } catch (final Error|RuntimeException e) {
+                throw e;
+            } catch (final Throwable e) {
+                throw new RuntimeException(e);
+            }
+        } else if (!isExtensible()) {
+            if (strict) {
+                typeError(Context.getGlobal(), "object.non.extensible", key, ScriptRuntime.safeToString(this));
+            }
+        } else {
+            spill(key, value);
+        }
+    }
+
+    private void spill(final String key, final Object value) {
+        try {
+            addSpill(key).invokeExact((Object)this, value);
+        } catch (final Error|RuntimeException e) {
+            throw e;
+        } catch (final Throwable e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+
+    @Override
+    public void set(final Object key, final int value, final boolean strict) {
+        final int index = getArrayIndexNoThrow(key);
+
+        if (isValidArrayIndex(index)) {
+            if (getArray().has(index)) {
+                setArray(getArray().set(index, value, strict));
+            } else {
+                doesNotHave(index, value, strict);
+            }
+
+            return;
+        }
+
+        set(key, JSType.toObject(value), strict);
+    }
+
+    @Override
+    public void set(final Object key, final long value, final boolean strict) {
+        final int index = getArrayIndexNoThrow(key);
+
+        if (isValidArrayIndex(index)) {
+            if (getArray().has(index)) {
+                setArray(getArray().set(index, value, strict));
+            } else {
+                doesNotHave(index, value, strict);
+            }
+
+            return;
+        }
+
+        set(key, JSType.toObject(value), strict);
+    }
+
+    @Override
+    public void set(final Object key, final double value, final boolean strict) {
+        final int index = getArrayIndexNoThrow(key);
+
+        if (isValidArrayIndex(index)) {
+            if (getArray().has(index)) {
+                setArray(getArray().set(index, value, strict));
+            } else {
+                doesNotHave(index, value, strict);
+            }
+
+            return;
+        }
+
+        set(key, JSType.toObject(value), strict);
+    }
+
+    @Override
+    public void set(final Object key, final Object value, final boolean strict) {
+        final int index = getArrayIndexNoThrow(key);
+
+        if (isValidArrayIndex(index)) {
+            if (getArray().has(index)) {
+                setArray(getArray().set(index, value, strict));
+            } else {
+                doesNotHave(index, value, strict);
+            }
+
+            return;
+        }
+
+        final String       propName = convertKey(key);
+        final FindProperty find     = findProperty(propName, true);
+
+        setObject(find, strict, propName, value);
+    }
+
+    @Override
+    public void set(final double key, final int value, final boolean strict) {
+        final int index = getArrayIndexNoThrow(key);
+
+        if (isValidArrayIndex(index)) {
+            if (getArray().has(index)) {
+                setArray(getArray().set(index, value, strict));
+            } else {
+                doesNotHave(index, value, strict);
+            }
+
+            return;
+        }
+
+        set(JSType.toObject(key), JSType.toObject(value), strict);
+    }
+
+    @Override
+    public void set(final double key, final long value, final boolean strict) {
+        final int index = getArrayIndexNoThrow(key);
+
+        if (isValidArrayIndex(index)) {
+            if (getArray().has(index)) {
+                setArray(getArray().set(index, value, strict));
+            } else {
+                doesNotHave(index, value, strict);
+            }
+
+            return;
+        }
+
+        set(JSType.toObject(key), JSType.toObject(value), strict);
+    }
+
+    @Override
+    public void set(final double key, final double value, final boolean strict) {
+        final int index = getArrayIndexNoThrow(key);
+
+        if (isValidArrayIndex(index)) {
+            if (getArray().has(index)) {
+                setArray(getArray().set(index, value, strict));
+            } else {
+                doesNotHave(index, value, strict);
+            }
+
+            return;
+        }
+
+        set(JSType.toObject(key), JSType.toObject(value), strict);
+    }
+
+    @Override
+    public void set(final double key, final Object value, final boolean strict) {
+        final int index = getArrayIndexNoThrow(key);
+
+        if (isValidArrayIndex(index)) {
+            if (getArray().has(index)) {
+                setArray(getArray().set(index, value, strict));
+            } else {
+                doesNotHave(index, value, strict);
+            }
+
+            return;
+        }
+
+        set(JSType.toObject(key), value, strict);
+    }
+
+    @Override
+    public void set(final long key, final int value, final boolean strict) {
+        final int index = getArrayIndexNoThrow(key);
+
+        if (isValidArrayIndex(index)) {
+            if (getArray().has(index)) {
+                setArray(getArray().set(index, value, strict));
+            } else {
+                doesNotHave(index, value, strict);
+            }
+
+            return;
+        }
+
+        set(JSType.toObject(key), JSType.toObject(value), strict);
+    }
+
+    @Override
+    public void set(final long key, final long value, final boolean strict) {
+        final int index = getArrayIndexNoThrow(key);
+
+        if (isValidArrayIndex(index)) {
+            if (getArray().has(index)) {
+                setArray(getArray().set(index, value, strict));
+            } else {
+                doesNotHave(index, value, strict);
+            }
+
+            return;
+        }
+
+        set(JSType.toObject(key), JSType.toObject(value), strict);
+    }
+
+    @Override
+    public void set(final long key, final double value, final boolean strict) {
+        final int index = getArrayIndexNoThrow(key);
+
+        if (isValidArrayIndex(index)) {
+            if (getArray().has(index)) {
+                setArray(getArray().set(index, value, strict));
+            } else {
+                doesNotHave(index, value, strict);
+            }
+
+            return;
+        }
+
+        set(JSType.toObject(key), JSType.toObject(value), strict);
+    }
+
+    @Override
+    public void set(final long key, final Object value, final boolean strict) {
+        final int index = getArrayIndexNoThrow(key);
+
+        if (isValidArrayIndex(index)) {
+            if (getArray().has(index)) {
+                setArray(getArray().set(index, value, strict));
+            } else {
+                doesNotHave(index, value, strict);
+            }
+
+            return;
+        }
+
+        set(JSType.toObject(key), value, strict);
+    }
+
+    @Override
+    public void set(final int key, final int value, final boolean strict) {
+        final int index = getArrayIndexNoThrow(key);
+
+        if (isValidArrayIndex(index)) {
+            if (getArray().has(index)) {
+                setArray(getArray().set(index, value, strict));
+            } else {
+                doesNotHave(index, value, strict);
+            }
+
+            return;
+        }
+
+        set(JSType.toObject(key), JSType.toObject(value), strict);
+    }
+
+    @Override
+    public void set(final int key, final long value, final boolean strict) {
+        final int index = getArrayIndexNoThrow(key);
+
+        if (isValidArrayIndex(index)) {
+            if (getArray().has(index)) {
+                setArray(getArray().set(index, value, strict));
+            } else {
+                doesNotHave(index, value, strict);
+            }
+
+            return;
+        }
+
+        set(JSType.toObject(key), JSType.toObject(value), strict);
+    }
+
+    @Override
+    public void set(final int key, final double value, final boolean strict) {
+        final int index = getArrayIndexNoThrow(key);
+
+        if (isValidArrayIndex(index)) {
+            if (getArray().has(index)) {
+                setArray(getArray().set(index, value, strict));
+            } else {
+                doesNotHave(index, value, strict);
+            }
+
+            return;
+        }
+
+        set(JSType.toObject(key), JSType.toObject(value), strict);
+    }
+
+    @Override
+    public void set(final int key, final Object value, final boolean strict) {
+        final int index = getArrayIndexNoThrow(key);
+
+        if (isValidArrayIndex(index)) {
+            if (getArray().has(index)) {
+                setArray(getArray().set(index, value, strict));
+            } else {
+                doesNotHave(index, value, strict);
+            }
+
+            return;
+        }
+
+        set(JSType.toObject(key), value, strict);
+    }
+
+    @Override
+    public boolean has(final Object key) {
+        final int index = getArrayIndexNoThrow(key);
+
+        if (isValidArrayIndex(index)) {
+            for (ScriptObject self = this; self != null; self = self.getProto()) {
+                if (self.getArray().has(index)) {
+                    return true;
+                }
+            }
+        }
+
+        final FindProperty find = findProperty(convertKey(key), true);
+
+        return find != null;
+    }
+
+    @Override
+    public boolean has(final double key) {
+        final int index = getArrayIndexNoThrow(key);
+
+        if (isValidArrayIndex(index)) {
+            for (ScriptObject self = this; self != null; self = self.getProto()) {
+                if (self.getArray().has(index)) {
+                    return true;
+                }
+            }
+        }
+
+        final FindProperty find = findProperty(convertKey(key), true);
+
+        return find != null;
+    }
+
+    @Override
+    public boolean has(final long key) {
+        final int index = getArrayIndexNoThrow(key);
+
+        if (isValidArrayIndex(index)) {
+            for (ScriptObject self = this; self != null; self = self.getProto()) {
+                if (self.getArray().has(index)) {
+                    return true;
+                }
+            }
+        }
+
+        final FindProperty find = findProperty(convertKey(key), true);
+
+        return find != null;
+    }
+
+    @Override
+    public boolean has(final int key) {
+        final int index = getArrayIndexNoThrow(key);
+
+        if (isValidArrayIndex(index)) {
+            for (ScriptObject self = this; self != null; self = self.getProto()) {
+                if (self.getArray().has(index)) {
+                    return true;
+                }
+            }
+        }
+
+        final FindProperty find = findProperty(convertKey(key), true);
+
+        return find != null;
+    }
+
+    @Override
+    public boolean hasOwnProperty(final Object key) {
+        final int index = getArrayIndexNoThrow(key);
+
+        if (getArray().has(index)) {
+            return true;
+        }
+
+        final FindProperty find = findProperty(convertKey(key), false);
+
+        return find != null;
+    }
+
+    @Override
+    public boolean hasOwnProperty(final int key) {
+        final int index = getArrayIndexNoThrow(key);
+
+        if (getArray().has(index)) {
+            return true;
+        }
+
+        final FindProperty find = findProperty(convertKey(key), false);
+
+        return find != null;
+    }
+
+    @Override
+    public boolean hasOwnProperty(final long key) {
+        final int index = getArrayIndexNoThrow(key);
+
+        if (getArray().has(index)) {
+            return true;
+        }
+
+        final FindProperty find = findProperty(convertKey(key), false);
+
+        return find != null;
+    }
+
+    @Override
+    public boolean hasOwnProperty(final double key) {
+        final int index = getArrayIndexNoThrow(key);
+
+        if (getArray().has(index)) {
+            return true;
+        }
+
+        final FindProperty find = findProperty(convertKey(key), false);
+
+        return find != null;
+    }
+
+    @Override
+    public boolean delete(final int key, final boolean strict) {
+        final int index = getArrayIndexNoThrow(key);
+        final ArrayData array = getArray();
+
+        if (array.has(index)) {
+            if (array.canDelete(index, strict)) {
+                setArray(array.delete(index));
+                return true;
+            }
+            return false;
+        }
+
+        return deleteObject(JSType.toObject(key), strict);
+    }
+
+    @Override
+    public boolean delete(final long key, final boolean strict) {
+        final int index = getArrayIndexNoThrow(key);
+        final ArrayData array = getArray();
+
+        if (array.has(index)) {
+            if (array.canDelete(index, strict)) {
+                setArray(array.delete(index));
+                return true;
+            }
+            return false;
+        }
+
+        return deleteObject(JSType.toObject(key), strict);
+    }
+
+    @Override
+    public boolean delete(final double key, final boolean strict) {
+        final int index = getArrayIndexNoThrow(key);
+        final ArrayData array = getArray();
+
+        if (array.has(index)) {
+            if (array.canDelete(index, strict)) {
+                setArray(array.delete(index));
+                return true;
+            }
+            return false;
+        }
+
+        return deleteObject(JSType.toObject(key), strict);
+    }
+
+    @Override
+    public boolean delete(final Object key, final boolean strict) {
+        final int index = getArrayIndexNoThrow(key);
+        final ArrayData array = getArray();
+
+        if (array.has(index)) {
+            if (array.canDelete(index, strict)) {
+                setArray(array.delete(index));
+                return true;
+            }
+            return false;
+        }
+
+        return deleteObject(key, strict);
+    }
+
+    private boolean deleteObject(final Object key, final boolean strict) {
+        final String propName = convertKey(key);
+        final FindProperty find = findProperty(propName, false);
+
+        if (find == null) {
+            return true;
+        }
+
+        if (!find.isConfigurable()) {
+            if (strict) {
+                typeError(Context.getGlobal(), "cant.delete.property", propName, ScriptRuntime.safeToString(this));
+            }
+            return false;
+        }
+
+        final Property prop = find.getProperty();
+        notifyPropertyDeleted(this, prop);
+        deleteOwnProperty(prop);
+
+        return true;
+    }
+
+    /*
+     * Embed management
+     */
+
+    /** Number of embed slots */
+    public static final int EMBED_SIZE   = 4;
+    /** Embed offset */
+    public static final int EMBED_OFFSET = 32 - EMBED_SIZE;
+
+    private static final MethodHandle[] GET_EMBED;
+    private static final MethodHandle[] SET_EMBED;
+
+    static {
+        GET_EMBED = new MethodHandle[EMBED_SIZE];
+        SET_EMBED = new MethodHandle[EMBED_SIZE];
+
+        for (int i = 0; i < EMBED_SIZE; i++) {
+            final String name = "embed" + i;
+            GET_EMBED[i] = MH.asType(MH.getter(MethodHandles.lookup(), ScriptObject.class, name, Object.class), Lookup.GET_OBJECT_TYPE);
+            SET_EMBED[i] = MH.asType(MH.setter(MethodHandles.lookup(), ScriptObject.class, name, Object.class), Lookup.SET_OBJECT_TYPE);
+        }
+    }
+
+    private void useEmbed(final int i) {
+        flags |= 1 << (EMBED_OFFSET + i);
+    }
+
+    private int findEmbed() {
+        final int bits  = ~(flags >>> EMBED_OFFSET);
+        final int least = bits ^ -bits;
+        final int index = Integer.numberOfTrailingZeros(least) - 1;
+
+        return index;
+    }
+
+    /*
+     * Make a new UserAccessorProperty property. getter and setter functions are stored in
+     * this ScriptObject and slot values are used in property object.
+     */
+    private UserAccessorProperty newUserAccessors(final String key, final int propertyFlags, final ScriptFunction getter, final ScriptFunction setter) {
+        int oldSpillLength = getMap().getSpillLength();
+
+        int getterSlot = findEmbed();
+        if (getterSlot >= EMBED_SIZE) {
+            getterSlot = oldSpillLength + EMBED_SIZE;
+            ++oldSpillLength;
+        } else {
+            useEmbed(getterSlot);
+        }
+        setEmbedOrSpill(getterSlot, getter);
+        // if getter function is null, flag the slot to be negative (less by 1)
+        if (getter == null) {
+            getterSlot = -getterSlot - 1;
+        }
+
+        int setterSlot = findEmbed();
+        if (setterSlot >= EMBED_SIZE) {
+            setterSlot = oldSpillLength + EMBED_SIZE;
+        } else {
+            useEmbed(setterSlot);
+        }
+        setEmbedOrSpill(setterSlot, setter);
+        // if setter function is null, flag the slot to be negative (less by 1)
+        if (setter == null) {
+            setterSlot = -setterSlot - 1;
+        }
+
+        return new UserAccessorProperty(key, propertyFlags, getterSlot, setterSlot);
+    }
+
+    private void setEmbedOrSpill(final int slot, final Object value) {
+        switch (slot) {
+        case 0:
+            embed0 = value;
+            break;
+        case 1:
+            embed1 = value;
+            break;
+        case 2:
+            embed2 = value;
+            break;
+        case 3:
+            embed3 = value;
+            break;
+        default:
+            if (slot >= 0) {
+                final int index = (slot - EMBED_SIZE);
+                if (spill == null) {
+                    // create new spill.
+                    spill = new Object[Math.max(index + 1, SPILL_RATE)];
+                } else if (index >= spill.length) {
+                    // grow spill as needed
+                    final Object[] newSpill = new Object[index + 1];
+                    System.arraycopy(spill, 0, newSpill, 0, spill.length);
+                    spill = newSpill;
+                }
+
+                spill[index] = value;
+            }
+            break;
+        }
+    }
+
+    // user accessors are either stored in embed fields or spill array slots
+    // get the accessor value using slot number. Note that slot is either embed
+    // field number or (spill array index + embedSize).
+    Object getEmbedOrSpill(final int slot) {
+        switch (slot) {
+        case 0:
+            return embed0;
+        case 1:
+            return embed1;
+        case 2:
+            return embed2;
+        case 3:
+            return embed3;
+        default:
+            final int index = (slot - EMBED_SIZE);
+            return (index < 0 || (index >= spill.length)) ? null : spill[index];
+        }
+    }
+
+    // User defined getter and setter are always called by "dyn:call". Note that the user
+    // getter/setter may be inherited. If so, proto is bound during lookup. In either
+    // inherited or self case, slot is also bound during lookup. Actual ScriptFunction
+    // to be called is retrieved everytime and applied.
+    @SuppressWarnings("unused")
+    private static Object userAccessorGetter(final ScriptObject proto, final int slot, final Object self) {
+        final ScriptObject container = (proto != null) ? proto : (ScriptObject)self;
+        final Object       func      = container.getEmbedOrSpill(slot);
+
+        if (func instanceof ScriptFunction) {
+            try {
+                return INVOKE_UA_GETTER.invokeExact(func, self);
+            } catch(final Error|RuntimeException t) {
+                throw t;
+            } catch(final Throwable t) {
+                throw new RuntimeException(t);
+            }
+        }
+
+        return UNDEFINED;
+    }
+
+    @SuppressWarnings("unused")
+    private static void userAccessorSetter(final ScriptObject proto, final int slot, final String name, final Object self, final Object value) {
+        final ScriptObject container = (proto != null) ? proto : (ScriptObject)self;
+        final Object       func      = container.getEmbedOrSpill(slot);
+
+        if (func instanceof ScriptFunction) {
+            try {
+                INVOKE_UA_SETTER.invokeExact(func, self, value);
+            } catch(final Error|RuntimeException t) {
+                throw t;
+            } catch(final Throwable t) {
+                throw new RuntimeException(t);
+            }
+        }  else if (name != null) {
+            typeError(Context.getGlobal(), "property.has.no.setter", name, ScriptRuntime.safeToString(self));
+        }
+    }
+
+    private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
+        final Class<?>   own = ScriptObject.class;
+        final MethodType mt  = MH.type(rtype, types);
+        try {
+            return MH.findStatic(MethodHandles.lookup(), own, name, mt);
+        } catch (final MethodHandleFactory.LookupException e) {
+            return MH.findVirtual(MethodHandles.lookup(), own, name, mt);
+        }
+    }
+
+    private static MethodHandle getKnownFunctionPropertyGuard(final PropertyMap map, final MethodHandle getter, final Object where, final ScriptFunction func) {
+        return MH.insertArguments(KNOWNFUNCPROPGUARD, 1, map, getter, where, func);
+    }
+
+    @SuppressWarnings("unused")
+    private static boolean knownFunctionPropertyGuard(final Object self, final PropertyMap map, final MethodHandle getter, final Object where, final ScriptFunction func) {
+        if (self instanceof ScriptObject && ((ScriptObject)self).getMap() == map) {
+            try {
+                return getter.invokeExact(where) == func;
+            } catch (final RuntimeException | Error e) {
+                throw e;
+            } catch (final Throwable t) {
+                throw new RuntimeException(t);
+            }
+        }
+
+        return false;
+    }
+
+    /** This is updated only in debug mode - counts number of {@code ScriptObject} instances created */
+    protected static int count;
+
+    /** This is updated only in debug mode - counts number of {@code ScriptObject} instances created that are scope */
+    protected static int scopeCount;
+
+    /**
+     * Get number of {@code ScriptObject} instances created. If not running in debug
+     * mode this is always 0
+     *
+     * @return number of ScriptObjects created
+     */
+    public static int getCount() {
+        return count;
+    }
+
+    /**
+     * Get number of scope {@code ScriptObject} instances created. If not running in debug
+     * mode this is always 0
+     *
+     * @return number of scope ScriptObjects created
+     */
+    public static int getScopeCount() {
+        return scopeCount;
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java
new file mode 100644
index 00000000000..71bea73122f
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java
@@ -0,0 +1,876 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import static jdk.nashorn.internal.codegen.CompilerConstants.staticCall;
+import static jdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
+import static jdk.nashorn.internal.runtime.ECMAErrors.referenceError;
+import static jdk.nashorn.internal.runtime.ECMAErrors.syntaxError;
+import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static jdk.nashorn.internal.runtime.JSType.isRepresentableAsInt;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.reflect.Array;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Objects;
+import jdk.nashorn.internal.codegen.CompilerConstants.Call;
+import jdk.nashorn.internal.runtime.linker.Bootstrap;
+import org.dynalang.dynalink.beans.StaticClass;
+
+
+/**
+ * Utilities to be called by JavaScript runtime API and generated classes.
+ */
+
+public final class ScriptRuntime {
+    private ScriptRuntime() {
+    }
+
+    /** Singleton representing the empty array object '[]' */
+    public static final Object[] EMPTY_ARRAY = new Object[0];
+
+    /** Unique instance of undefined. */
+    public static final Undefined UNDEFINED = Undefined.getUndefined();
+
+    /**
+     * Unique instance of undefined used to mark empty array slots.
+     * Can't escape the array.
+     */
+    public static final Undefined EMPTY = Undefined.getEmpty();
+
+    /** Method handle to generic + operator, operating on objects */
+    public static final Call ADD = staticCallNoLookup(ScriptRuntime.class, "ADD", Object.class, Object.class, Object.class);
+
+    /** Method handle to generic === operator, operating on objects */
+    public static final Call EQ_STRICT = staticCallNoLookup(ScriptRuntime.class, "EQ_STRICT", boolean.class, Object.class, Object.class);
+
+    /** Method handle used to enter a {@code with} scope at runtime. Used from {@link jdk.nashorn.internal.codegen.CodeGenerator} */
+    public static final Call OPEN_WITH = staticCallNoLookup(ScriptRuntime.class, "openWith", ScriptObject.class, ScriptObject.class, Object.class);
+
+    /** Method handle used to exit a {@code with} scope at runtime. Used from {@link jdk.nashorn.internal.codegen.CodeGenerator} */
+    public static final Call CLOSE_WITH = staticCallNoLookup(ScriptRuntime.class, "closeWith", ScriptObject.class, ScriptObject.class);
+
+    /**
+     * Method used to place a scope's variable into the Global scope, which has to be done for the
+     * properties declared at outermost script level. Used from {@link jdk.nashorn.internal.codegen.CodeGenerator}
+     */
+    public static final Call MERGE_SCOPE = staticCallNoLookup(ScriptRuntime.class, "mergeScope", ScriptObject.class, ScriptObject.class);
+
+    /**
+     * Return an appropriate iterator for the elements in a for-in construct
+     * Used from {@link jdk.nashorn.internal.codegen.CodeGenerator}
+     */
+    public static final Call TO_PROPERTY_ITERATOR = staticCallNoLookup(ScriptRuntime.class, "toPropertyIterator", Iterator.class, Object.class);
+
+    /**
+     * Return an appropriate iterator for the elements in a for-each construct
+     * Used from {@link jdk.nashorn.internal.codegen.CodeGenerator}
+     */
+    public static final Call TO_VALUE_ITERATOR = staticCallNoLookup(ScriptRuntime.class, "toValueIterator", Iterator.class, Object.class);
+
+    /**
+      * Method handle for apply. Used from {@link ScriptFunction} for looking up calls to
+      * call sites that are known to be megamorphic. Using an invoke dynamic here would
+      * lead to the JVM deoptimizing itself to death
+      */
+    public static final Call APPLY = staticCall(ScriptRuntime.class, "apply", Object.class, ScriptFunction.class, Object.class, Object[].class);
+
+    /**
+     * Converts a switch tag value to a simple integer. deflt value if it can't.
+     *
+     * @param tag   Switch statement tag value.
+     * @param deflt default to use if not convertible.
+     * @return int tag value (or deflt.)
+     */
+    public static int switchTagAsInt(final Object tag, final int deflt) {
+        if (tag instanceof Number) {
+            final double d = ((Number)tag).doubleValue();
+            if (isRepresentableAsInt(d)) {
+                return (int)d;
+            }
+        }
+
+        return deflt;
+    }
+
+    /**
+     * Converts a switch tag value to a simple integer. deflt value if it can't.
+     *
+     * @param tag   Switch statement tag value.
+     * @param deflt default to use if not convertible.
+     * @return int tag value (or deflt.)
+     */
+    public static int switchTagAsInt(final long tag, final int deflt) {
+        return isRepresentableAsInt(tag) ? (int)tag : deflt;
+    }
+
+    /**
+     * Converts a switch tag value to a simple integer. deflt value if it can't.
+     *
+     * @param tag   Switch statement tag value.
+     * @param deflt default to use if not convertible.
+     * @return int tag value (or deflt.)
+     */
+    public static int switchTagAsInt(final double tag, final int deflt) {
+        return isRepresentableAsInt(tag) ? (int)tag : deflt;
+    }
+
+    /**
+     * This is the builtin implementation of {@code Object.prototype.toString}
+     * @param self reference
+     * @return string representation as object
+     */
+    public static String builtinObjectToString(final Object self) {
+        String className;
+        // Spec tells us to convert primitives by ToObject..
+        // But we don't need to -- all we need is the right class name
+        // of the corresponding primitive wrapper type.
+
+        final JSType type = JSType.of(self);
+
+        switch (type) {
+        case BOOLEAN:
+            className = "Boolean";
+            break;
+        case NUMBER:
+            className = "Number";
+            break;
+        case STRING:
+            className = "String";
+            break;
+        // special case of null and undefined
+        case NULL:
+            className = "Null";
+            break;
+        case UNDEFINED:
+            className = "Undefined";
+            break;
+        case OBJECT:
+        case FUNCTION:
+            if (self instanceof ScriptObject) {
+                className = ((ScriptObject)self).getClassName();
+            } else {
+                className = self.getClass().getName();
+            }
+            break;
+        default:
+            // Nashorn extension: use Java class name
+            className = self.getClass().getName();
+            break;
+        }
+
+        final StringBuilder sb = new StringBuilder();
+        sb.append("[object ");
+        sb.append(className);
+        sb.append(']');
+
+        return sb.toString();
+    }
+
+    /**
+     * This is called whenever runtime wants to throw an error and wants to provide
+     * meaningful information about an object. We don't want to call toString which
+     * ends up calling "toString" from script world which may itself throw error.
+     * When we want to throw an error, we don't additional error from script land
+     * -- which may sometimes lead to infinite recursion.
+     *
+     * @param obj Object to converted to String safely (without calling user script)
+     * @return safe String representation of the given object
+     */
+    public static String safeToString(final Object obj) {
+        return JSType.toStringImpl(obj, true);
+    }
+
+    /**
+     * Used to determine property iterator used in for in.
+     * @param obj Object to iterate on.
+     * @return Iterator.
+     */
+    public static Iterator<String> toPropertyIterator(final Object obj) {
+        if (obj instanceof ScriptObject) {
+            return ((ScriptObject)obj).propertyIterator();
+        }
+
+        if (obj != null && obj.getClass().isArray()) {
+            final int length = Array.getLength(obj);
+
+            return new Iterator<String>() {
+                private int index = 0;
+
+                @Override
+                public boolean hasNext() {
+                    return index < length;
+                }
+
+                @Override
+                public String next() {
+                    return "" + index++; //TODO numeric property iterator?
+                }
+
+                @Override
+                public void remove() {
+                    throw new UnsupportedOperationException();
+                }
+            };
+        }
+
+        return Collections.emptyIterator();
+    }
+
+    /**
+     * Used to determine property value iterator used in for each in.
+     * @param obj Object to iterate on.
+     * @return Iterator.
+     */
+    public static Iterator<?> toValueIterator(final Object obj) {
+        if (obj instanceof ScriptObject) {
+            return ((ScriptObject)obj).valueIterator();
+        }
+
+        if (obj != null && obj.getClass().isArray()) {
+            final Object array  = obj;
+            final int    length = Array.getLength(obj);
+
+            return new Iterator<Object>() {
+                private int index = 0;
+
+                @Override
+                public boolean hasNext() {
+                    return index < length;
+                }
+
+                @Override
+                public Object next() {
+                    return Array.get(array, index++);
+                }
+
+                @Override
+                public void remove() {
+                    throw new UnsupportedOperationException();
+                }
+            };
+        }
+
+        if (obj instanceof Iterable) {
+            return ((Iterable<?>)obj).iterator();
+        }
+
+        return Collections.emptyIterator();
+    }
+
+    /**
+     * Merge a scope into its prototype's map.
+     * Merge a scope into its prototype.
+     *
+     * @param scope Scope to merge.
+     * @return prototype object after merge
+     */
+    public static ScriptObject mergeScope(final ScriptObject scope) {
+        final ScriptObject global = scope.getProto();
+        global.addBoundProperties(scope);
+        return global;
+    }
+
+    /**
+     * Call a function given self and args. If the number of the arguments is known in advance, you can likely achieve
+     * better performance by {@link Bootstrap#createDynamicInvoker(String, Class, Class...) creating a dynamic invoker}
+     * for operation {@code "dyn:call"}, then using its {@link MethodHandle#invokeExact(Object...)} method instead.
+     *
+     * @param target ScriptFunction object.
+     * @param self   Receiver in call.
+     * @param args   Call arguments.
+     * @return Call result.
+     */
+    public static Object apply(final ScriptFunction target, final Object self, final Object... args) {
+        try {
+            return target.invoke(self, args);
+        } catch (final RuntimeException | Error e) {
+            throw e;
+        } catch (final Throwable t) {
+            throw new RuntimeException(t);
+        }
+    }
+
+    /**
+     * Constructor new object using given constructor function
+     * @param target ScriptFunction object.
+     * @param args   Constructor arguments.
+     * @return newly constructed object.
+     */
+    public static Object construct(final ScriptFunction target, final Object... args) {
+        try {
+            final ScriptObject allocation = (ScriptObject)target.allocate();
+            final Object result = target.construct(allocation, args);
+            return result instanceof ScriptObject ? result : allocation;
+        } catch (final RuntimeException | Error e) {
+            throw e;
+        } catch (final Throwable t) {
+            throw new RuntimeException(t);
+        }
+    }
+
+    /**
+     * Generic implementation of ECMA 9.12 - SameValue algorithm
+     *
+     * @param x first value to compare
+     * @param y second value to compare
+     *
+     * @return true if both objects have the same value
+     */
+    public static boolean sameValue(final Object x, final Object y) {
+        final JSType xType = JSType.of(x);
+        final JSType yType = JSType.of(y);
+
+        if (xType != yType) {
+            return false;
+        }
+
+        if (xType == JSType.UNDEFINED || xType == JSType.NULL) {
+            return true;
+        }
+
+        if (xType == JSType.NUMBER) {
+            final double xVal = ((Number)x).doubleValue();
+            final double yVal = ((Number)y).doubleValue();
+
+            if (Double.isNaN(xVal) && Double.isNaN(yVal)) {
+                return true;
+            }
+
+            // checking for xVal == -0.0 and yVal == +0.0 or vice versa
+            if (xVal == 0.0 && (Double.doubleToLongBits(xVal) != Double.doubleToLongBits(yVal))) {
+                return false;
+            }
+
+            return xVal == yVal;
+        }
+
+        if (xType == JSType.STRING || yType == JSType.BOOLEAN) {
+            return x.equals(y);
+        }
+
+        return (x == y);
+    }
+
+    /**
+     * Entering a {@code with} node requires new scope. This is the implementation
+     *
+     * @param scope      existing scope
+     * @param expression expression in with
+     *
+     * @return {@link WithObject} that is the new scope
+     */
+    public static ScriptObject openWith(final ScriptObject scope, final Object expression) {
+        final ScriptObject global = Context.getGlobal();
+        if (expression == UNDEFINED) {
+            typeError(global, "cant.apply.with.to.undefined");
+        } else if (expression == null) {
+            typeError(global, "cant.apply.with.to.null");
+        }
+
+        final ScriptObject withObject = new WithObject(scope, JSType.toObject(global, expression));
+
+        return withObject;
+    }
+
+    /**
+     * Exiting a {@code with} node requires restoring scope. This is the implementation
+     *
+     * @param scope existing scope
+     *
+     * @return restored scope
+     */
+    public static ScriptObject closeWith(final ScriptObject scope) {
+        if (scope instanceof WithObject) {
+            return scope.getProto();
+        }
+        return scope;
+    }
+
+    /**
+     * ECMA 11.6.1 - The addition operator (+) - generic implementation
+     * Compiler specializes using {@link jdk.nashorn.internal.codegen.RuntimeCallSite}
+     * if any type information is available for any of the operands
+     *
+     * @param x  first term
+     * @param y  second term
+     *
+     * @return result of addition
+     */
+    public static Object ADD(final Object x, final Object y) {
+        // This prefix code to handle Number special is for optimization.
+        final boolean xIsNumber = x instanceof Number;
+        final boolean yIsNumber = y instanceof Number;
+
+        if (xIsNumber && yIsNumber) {
+             return ((Number)x).doubleValue() + ((Number)y).doubleValue();
+        }
+
+        final boolean xIsUndefined = x == UNDEFINED;
+        final boolean yIsUndefined = y == UNDEFINED;
+
+        if ((xIsNumber && yIsUndefined) || (xIsUndefined && yIsNumber) || (xIsUndefined && yIsUndefined)) {
+            return Double.NaN;
+        }
+
+        // code below is as per the spec.
+        final Object xPrim = JSType.toPrimitive(x);
+        final Object yPrim = JSType.toPrimitive(y);
+
+        if (xPrim instanceof String || yPrim instanceof String
+                || xPrim instanceof ConsString || yPrim instanceof ConsString) {
+            return new ConsString(JSType.toCharSequence(xPrim), JSType.toCharSequence(yPrim));
+        }
+
+        return JSType.toNumber(xPrim) + JSType.toNumber(yPrim);
+    }
+
+    /**
+     * Debugger hook.
+     * TODO: currently unimplemented
+     *
+     * @return undefined
+     */
+    public static Object DEBUGGER() {
+        return UNDEFINED;
+    }
+
+    /**
+     * New hook
+     *
+     * @param clazz type for the clss
+     * @param args  constructor arguments
+     *
+     * @return undefined
+     */
+    public static Object NEW(final Object clazz, final Object... args) {
+        return UNDEFINED;
+    }
+
+    /**
+     * ECMA 11.4.3 The typeof Operator - generic implementation
+     *
+     * @param object   the object from which to retrieve property to type check
+     * @param property property in object to check
+     *
+     * @return type name
+     */
+    public static Object TYPEOF(final Object object, final Object property) {
+        Object obj = object;
+
+        if (property != null) {
+            if (obj instanceof ScriptObject) {
+                obj = ((ScriptObject)obj).get(property);
+            } else if (object instanceof Undefined) {
+                obj = ((Undefined)obj).get(property);
+            } else if (object == null) {
+                typeError(Context.getGlobal(), "cant.get.property", safeToString(property), "null");
+            } else if (JSType.isPrimitive(obj)) {
+                obj = ((ScriptObject)JSType.toObject(Context.getGlobal(), obj)).get(property);
+            } else {
+                obj = UNDEFINED;
+            }
+        }
+
+        return JSType.of(obj).typeName();
+    }
+
+    /**
+     * ECMA 11.4.2 - void operator
+     *
+     * @param object object to evaluate
+     *
+     * @return Undefined as the object type
+     */
+    public static Object VOID(final Object object) {
+        if (object instanceof Number) {
+            if (Double.isNaN(((Number)object).doubleValue())) {
+                return Double.NaN;
+            }
+        }
+
+        return UNDEFINED;
+    }
+
+    /**
+     * Throw ReferenceError when LHS of assignment or increment/decrement
+     * operator is not an assignable node (say a literal)
+     *
+     * @param lhs Evaluated LHS
+     * @param rhs Evaluated RHS
+     * @param msg Additional LHS info for error message
+     * @return undefined
+     */
+    public static Object REFERENCE_ERROR(final Object lhs, final Object rhs, final Object msg) {
+        referenceError(Context.getGlobal(), "cant.be.used.as.lhs", Objects.toString(msg));
+        return UNDEFINED;
+    }
+
+    /**
+     * ECMA 11.4.1 - delete operation, generic implementation
+     *
+     * @param obj       object with property to delete
+     * @param property  property to delete
+     * @param strict    are we in strict mode
+     *
+     * @return true if property was successfully found and deleted
+     */
+    public static boolean DELETE(final Object obj, final Object property, final Object strict) {
+        if (obj instanceof ScriptObject) {
+            return ((ScriptObject)obj).delete(property, Boolean.TRUE.equals(strict));
+        }
+
+        if (obj instanceof Undefined) {
+            return ((Undefined)obj).delete(property, false);
+        }
+
+        if (obj == null) {
+            typeError(Context.getGlobal(), "cant.delete.property", safeToString(property), "null");
+        }
+
+        if (JSType.isPrimitive(obj)) {
+            return ((ScriptObject) JSType.toObject(Context.getGlobal(), obj)).delete(property, Boolean.TRUE.equals(strict));
+        }
+
+        // if object is not reference type, vacuously delete is successful.
+        return true;
+    }
+
+    /**
+     * ECMA 11.4.1 - delete operator, special case
+     *
+     * This is 'delete' that always fails. We have to check strict mode and throw error.
+     * That is why this is a runtime function. Or else we could have inlined 'false'.
+     *
+     * @param obj       object with property to delete
+     * @param property  property to delete
+     * @param strict    are we in strict mode
+     *
+     * @return false always
+     */
+    public static boolean FAIL_DELETE(final Object obj, final Object property, final Object strict) {
+        if (Boolean.TRUE.equals(strict)) {
+            syntaxError(Context.getGlobal(), "strict.cant.delete", safeToString(property));
+        }
+        return false;
+    }
+
+    /**
+     * ECMA 11.9.1 - The equals operator (==) - generic implementation
+     *
+     * @param x first object to compare
+     * @param y second object to compare
+     *
+     * @return true if type coerced versions of objects are equal
+     */
+    public static boolean EQ(final Object x, final Object y) {
+        return equals(x, y);
+    }
+
+    /**
+     * ECMA 11.9.2 - The does-not-equal operator (==) - generic implementation
+     *
+     * @param x first object to compare
+     * @param y second object to compare
+     *
+     * @return true if type coerced versions of objects are not equal
+     */
+    public static boolean NE(final Object x, final Object y) {
+        return !EQ(x, y);
+    }
+
+    /** ECMA 11.9.3 The Abstract Equality Comparison Algorithm */
+    private static boolean equals(final Object x, final Object y) {
+        final JSType xType = JSType.of(x);
+        final JSType yType = JSType.of(y);
+
+        if (xType == yType) {
+
+            if (xType == JSType.UNDEFINED || xType == JSType.NULL) {
+                return true;
+            }
+
+            if (xType == JSType.NUMBER) {
+                final double xVal = ((Number)x).doubleValue();
+                final double yVal = ((Number)y).doubleValue();
+                if (Double.isNaN(xVal) || Double.isNaN(yVal)) {
+                    return false;
+                }
+
+                return xVal == yVal;
+            }
+
+            if (xType == JSType.STRING) {
+                // String may be represented by ConsString
+                return x.toString().equals(y.toString());
+            }
+
+            if (xType == JSType.BOOLEAN) {
+                // Boolean comparison
+                return x.equals(y);
+            }
+
+            return x == y;
+        }
+
+        if ((xType == JSType.UNDEFINED && yType == JSType.NULL) ||
+            (xType == JSType.NULL && yType == JSType.UNDEFINED)) {
+            return true;
+        }
+
+        if (xType == JSType.NUMBER && yType == JSType.STRING) {
+            return EQ(x, JSType.toNumber(y));
+        }
+
+        if (xType == JSType.STRING && yType == JSType.NUMBER) {
+            return EQ(JSType.toNumber(x), y);
+        }
+
+        if (xType == JSType.BOOLEAN) {
+            return EQ(JSType.toNumber(x), y);
+        }
+
+        if (yType == JSType.BOOLEAN) {
+            return EQ(x, JSType.toNumber(y));
+        }
+
+        if ((xType == JSType.STRING || xType == JSType.NUMBER) &&
+             (y instanceof ScriptObject))  {
+            return EQ(x, JSType.toPrimitive(y));
+        }
+
+        if ((x instanceof ScriptObject) &&
+            (yType == JSType.STRING || yType == JSType.NUMBER)) {
+            return EQ(JSType.toPrimitive(x), y);
+        }
+
+        return false;
+    }
+
+    /**
+     * ECMA 11.9.4 - The strict equal operator (===) - generic implementation
+     *
+     * @param x first object to compare
+     * @param y second object to compare
+     *
+     * @return true if objects are equal
+     */
+    public static boolean EQ_STRICT(final Object x, final Object y) {
+        return strictEquals(x, y);
+    }
+
+    /**
+     * ECMA 11.9.5 - The strict non equal operator (!==) - generic implementation
+     *
+     * @param x first object to compare
+     * @param y second object to compare
+     *
+     * @return true if objects are not equal
+     */
+    public static boolean NE_STRICT(final Object x, final Object y) {
+        return !EQ_STRICT(x, y);
+    }
+
+    /** ECMA 11.9.6 The Strict Equality Comparison Algorithm */
+    private static boolean strictEquals(final Object x, final Object y) {
+        final JSType xType = JSType.of(x);
+        final JSType yType = JSType.of(y);
+
+        if (xType != yType) {
+            return false;
+        }
+
+        if (xType == JSType.UNDEFINED || xType == JSType.NULL) {
+            return true;
+        }
+
+        if (xType == JSType.NUMBER) {
+            final double xVal = ((Number)x).doubleValue();
+            final double yVal = ((Number)y).doubleValue();
+
+            if (Double.isNaN(xVal) || Double.isNaN(yVal)) {
+                return false;
+            }
+
+            return xVal == yVal;
+        }
+
+        if (xType == JSType.STRING) {
+            // String may be represented by ConsString
+            return x.toString().equals(y.toString());
+        }
+
+        if (xType == JSType.BOOLEAN) {
+            return x.equals(y);
+        }
+
+        // finally, the object identity comparison
+        return x == y;
+    }
+
+    /**
+     * ECMA 11.8.6 - The in operator - generic implementation
+     *
+     * @param property property to check for
+     * @param obj object in which to check for property
+     *
+     * @return true if objects are equal
+     */
+    public static boolean IN(final Object property, final Object obj) {
+        final JSType rvalType = JSType.of(obj);
+
+        if (rvalType == JSType.OBJECT || rvalType == JSType.FUNCTION) {
+            if (obj instanceof ScriptObject) {
+                return ((ScriptObject)obj).has(property);
+            }
+
+            return false;
+        }
+
+        typeError(Context.getGlobal(), "in.with.non.object", rvalType.toString().toLowerCase());
+
+        return false;
+    }
+
+    /**
+     * ECMA 11.8.6 - The strict instanceof operator - generic implementation
+     *
+     * @param obj first object to compare
+     * @param clazz type to check against
+     *
+     * @return true if {@code obj} is an instanceof {@code clazz}
+     */
+    public static boolean INSTANCEOF(final Object obj, final Object clazz) {
+        if (clazz instanceof ScriptFunction) {
+            if (obj instanceof ScriptObject) {
+                return ((ScriptObject)clazz).isInstance((ScriptObject)obj);
+            }
+            return false;
+        }
+
+        if (clazz instanceof StaticClass) {
+            return ((StaticClass)clazz).getRepresentedClass().isInstance(obj);
+        }
+
+        typeError(Context.getGlobal(), "instanceof.on.non.object");
+
+        return false;
+    }
+
+    /**
+     * ECMA 11.8.1 - The less than operator (<) - generic implementation
+     *
+     * @param x first object to compare
+     * @param y second object to compare
+     *
+     * @return true if x is less than y
+     */
+    public static boolean LT(final Object x, final Object y) {
+        final Object value = lessThan(x, y, true);
+        return (value == UNDEFINED) ? false : (Boolean)value;
+    }
+
+    /**
+     * ECMA 11.8.2 - The greater than operator (>) - generic implementation
+     *
+     * @param x first object to compare
+     * @param y second object to compare
+     *
+     * @return true if x is greater than y
+     */
+    public static boolean GT(final Object x, final Object y) {
+        final Object value = lessThan(y, x, false);
+        return (value == UNDEFINED) ? false : (Boolean)value;
+    }
+
+    /**
+     * ECMA 11.8.3 - The less than or equal operator (<=) - generic implementation
+     *
+     * @param x first object to compare
+     * @param y second object to compare
+     *
+     * @return true if x is less than or equal to y
+     */
+    public static boolean LE(final Object x, final Object y) {
+        final Object value = lessThan(y, x, false);
+        return (!(Boolean.TRUE.equals(value) || value == UNDEFINED));
+    }
+
+    /**
+     * ECMA 11.8.4 - The greater than or equal operator (>=) - generic implementation
+     *
+     * @param x first object to compare
+     * @param y second object to compare
+     *
+     * @return true if x is greater than or equal to y
+     */
+    public static boolean GE(final Object x, final Object y) {
+        final Object value = lessThan(x, y, true);
+        return (!(Boolean.TRUE.equals(value) || value == UNDEFINED));
+    }
+
+    /** ECMA 11.8.5 The Abstract Relational Comparison Algorithm */
+    private static Object lessThan(final Object x, final Object y, final boolean leftFirst) {
+        Object px, py;
+
+        //support e.g. x < y should throw exception correctly if x or y are not numeric
+        if (leftFirst) {
+            px = JSType.toPrimitive(x, Number.class);
+            py = JSType.toPrimitive(y, Number.class);
+        } else {
+            py = JSType.toPrimitive(y, Number.class);
+            px = JSType.toPrimitive(x, Number.class);
+        }
+
+        if (JSType.of(px) == JSType.STRING && JSType.of(py) == JSType.STRING) {
+            // May be String or ConsString
+            return (px.toString()).compareTo(py.toString()) < 0;
+        }
+
+        final double nx = JSType.toNumber(px);
+        final double ny = JSType.toNumber(py);
+
+        if (Double.isNaN(nx) || Double.isNaN(ny)) {
+            return UNDEFINED;
+        }
+
+        if (nx == ny) {
+            return false;
+        }
+
+        if (nx > 0 && ny > 0 && Double.isInfinite(nx) && Double.isInfinite(ny)) {
+            return false;
+        }
+
+        if (nx < 0 && ny < 0 && Double.isInfinite(nx) && Double.isInfinite(ny)) {
+            return false;
+        }
+
+        return nx < ny;
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java
new file mode 100644
index 00000000000..f0662347449
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+
+/**
+ * Global functions supported only in scripting mode.
+ */
+public class ScriptingFunctions {
+
+    /** Handle to implementation of {@link ScriptingFunctions#read} - Nashorn extension */
+    public static final MethodHandle READLINE = findOwnMH("readLine", Object.class, Object.class);
+
+    /** Handle to implementation of {@link ScriptingFunctions#read} - Nashorn extension */
+    public static final MethodHandle READ = findOwnMH("read",     Object.class, Object.class, Object.class);
+
+    /** Handle to implementation of {@link ScriptingFunctions#read} - Nashorn extension */
+    public static final MethodHandle QUIT = findOwnMH("quit",     Object.class, Object.class, Object.class);
+
+    private ScriptingFunctions() {
+    }
+
+    /**
+     * Nashorn extension: global.readLine (scripting-mode-only)
+     * Read one line of input from the standard input.
+     *
+     * @param self self reference
+     *
+     * @return line that was read
+     *
+     * @throws IOException if an exception occurs
+     */
+    public static Object readLine(final Object self) throws IOException {
+        final BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
+        return reader.readLine();
+    }
+
+    /**
+     * Nashorn extension: Read the entire contents of a text file and return as String.
+     *
+     * @param self self reference
+     * @param file The input file whose content is read.
+     *
+     * @return String content of the input file.
+     *
+     * @throws IOException if an exception occurs
+     */
+    public static Object read(final Object self, final Object file) throws IOException {
+        File f = null;
+
+        if (file instanceof File) {
+            f = (File)file;
+        } else if (file instanceof String) {
+            f = new java.io.File((String)file);
+        }
+
+        if (f == null || !f.isFile()) {
+            typeError(Context.getGlobal(), "not.a.file", ScriptRuntime.safeToString(file));
+            return UNDEFINED;
+        }
+
+        return new String(Source.readFully(f));
+    }
+
+    /**
+     * Nashorn extension: perform a {@code System.exit} call from the script
+     *
+     * @param self  self reference
+     * @param code  exit code
+     *
+     * @return undefined (will never be reacheD)
+     */
+    public static Object quit(final Object self, final Object code) {
+        System.exit(JSType.toInt32(code));
+        return UNDEFINED;
+    }
+
+    private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
+        return MH.findStatic(MethodHandles.lookup(), ScriptingFunctions.class, name, MH.type(rtype, types));
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Source.java b/nashorn/src/jdk/nashorn/internal/runtime/Source.java
new file mode 100644
index 00000000000..90bf06fb99d
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Source.java
@@ -0,0 +1,436 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOError;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.Objects;
+import jdk.nashorn.internal.parser.Token;
+
+/**
+ * Source objects track the origin of JavaScript entities.
+ *
+ */
+public final class Source {
+    /**
+     * Descriptive name of the source as supplied by the user. Used for error
+     * reporting to the user. For example, SyntaxError will use this to print message.
+     * Used to implement __FILE__. Also used for SourceFile in .class for debugger usage.
+     */
+    private final String name;
+
+    /**
+     * Base directory the File or base part of the URL. Used to implement __DIR__.
+     * Used to load scripts relative to the 'directory' or 'base' URL of current script.
+     * This will be null when it can't be computed.
+     */
+    private final String base;
+
+    /** Cached source content. */
+    private final char[] content;
+
+    /** Length of source content. */
+    private final int length;
+
+    /** Cached hash code */
+    private int hash;
+
+    private static final int BUFSIZE = 8 * 1024;
+
+    private Source(final String name, final String base, final char[] content) {
+        this.name    = name;
+        this.base    = base;
+        this.content = content;
+        this.length  = content.length;
+    }
+
+    /**
+     * Constructor
+     *
+     * @param name    source name
+     * @param content contents as char array
+     */
+    public Source(final String name, final char[] content) {
+        this(name, baseName(name, null), content);
+    }
+
+    /**
+     * Constructor
+     *
+     * @param name    source name
+     * @param content contents as string
+     */
+    public Source(final String name, final String content) {
+        this(name, content.toCharArray());
+    }
+
+    /**
+     * Constructor
+     *
+     * @param name  source name
+     * @param url   url from which source can be loaded
+     *
+     * @throws IOException if source cannot be loaded
+     */
+    public Source(final String name, final URL url) throws IOException {
+        this(name, baseURL(url, null), readFully(url.openStream()));
+    }
+
+    /**
+     * Constructor
+     *
+     * @param name  source name
+     * @param file  file from which source can be loaded
+     *
+     * @throws IOException if source cannot be loaded
+     */
+    public Source(final String name, final File file) throws IOException {
+        this(name, dirName(file, null), readFully(file));
+    }
+
+    @Override
+    public boolean equals(final Object obj) {
+        if (this == obj) {
+            return true;
+        }
+
+        if (!(obj instanceof Source)) {
+            return false;
+        }
+
+        final Source src = (Source)obj;
+        // Only compare content as a last resort measure
+        return length == src.length && Objects.equals(name, src.name) && Arrays.equals(content, src.content);
+    }
+
+    @Override
+    public int hashCode() {
+        int h = hash;
+        if (h == 0) {
+            h = hash = Arrays.hashCode(content) ^ Objects.hashCode(name);
+        }
+        return h;
+    }
+
+    /**
+     * Fetch source content.
+     * @return Source content.
+     */
+    public String getString() {
+        return new String(content, 0, length);
+    }
+
+    /**
+     * Get the user supplied name of this script.
+     * @return User supplied source name.
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Get the "directory" part of the file or "base" of the URL.
+     * @return base of file or URL.
+     */
+    public String getBase() {
+        return base;
+    }
+
+    /**
+     * Fetch a portion of source content.
+     * @param start start index in source
+     * @param len length of portion
+     * @return Source content portion.
+     */
+    public String getString(final int start, final int len) {
+        return new String(content, start, len);
+    }
+
+    /**
+     * Fetch a portion of source content associated with a token.
+     * @param token Token descriptor.
+     * @return Source content portion.
+     */
+    public String getString(final long token) {
+        final int start = Token.descPosition(token);
+        final int len = Token.descLength(token);
+        return new String(content, start, len);
+    }
+
+    /**
+     * Fetch a portion of source content associated with a range of tokens.
+     * @param startTokenDesc Starting token descriptor.
+     * @param endTokenDesc   Ending token descriptor.
+     * @return Source content portion.
+     */
+    public String getString(final long startTokenDesc, final long endTokenDesc) {
+        final int start = Token.descPosition(startTokenDesc);
+        final int end   = Token.descPosition(endTokenDesc) + Token.descLength(endTokenDesc);
+        return new String(content, start, end - start);
+    }
+
+    /**
+     * Find the beginning of the line containing position.
+     * @param position Index to offending token.
+     * @return Index of first character of line.
+     */
+    private int findBOLN(final int position) {
+        for (int i = position - 1; i > 0; i--) {
+            final char ch = content[i];
+
+            if (ch == '\n' || ch == '\r') {
+                return i + 1;
+            }
+        }
+
+        return 0;
+    }
+
+    /**
+     * Find the end of the line containing position.
+     * @param position Index to offending token.
+     * @return Index of last character of line.
+     */
+    private int findEOLN(final int position) {
+         for (int i = position; i < length; i++) {
+            final char ch = content[i];
+
+            if (ch == '\n' || ch == '\r') {
+                return i - 1;
+            }
+        }
+
+        return length - 1;
+    }
+
+    /**
+     * Return line number of character position.
+     * @param position Position of character in source content.
+     * @return Line number.
+     */
+    public int getLine(final int position) {
+        // Line count starts at 1.
+        int line = 1;
+
+        for (int i = 0; i < position; i++) {
+            final char ch = content[i];
+            // Works for both \n and \r\n.
+            if (ch == '\n') {
+                line++;
+            }
+        }
+
+        return line;
+    }
+
+    /**
+     * Return column number of character position.
+     * @param position Position of character in source content.
+     * @return Column number.
+     */
+    public int getColumn(final int position) {
+        // TODO - column needs to account for tabs.
+        return position - findBOLN(position);
+    }
+
+    /**
+     * Return line text including character position.
+     * @param position Position of character in source content.
+     * @return Line text.
+     */
+    public String getSourceLine(final int position) {
+        // Find end of previous line.
+        final int first = findBOLN(position);
+        // Find end of this line.
+        final int last = findEOLN(position);
+
+        return new String(content, first, last - first + 1);
+    }
+
+    /**
+     * Get the content of this source as a char array
+     * @return content
+     */
+    public char[] getContent() {
+        return content;
+    }
+
+    /**
+     * Get the length in chars for this source
+     * @return length
+     */
+    public int getLength() {
+        return length;
+    }
+
+    /**
+     * Read all of the source until end of file. Return it as char array
+     *
+     * @param reader  reader opened to source stream
+     * @return source as content
+     *
+     * @throws IOException if source could not be read
+     */
+    public static char[] readFully(final Reader reader) throws IOException {
+        final char[]        arr = new char[BUFSIZE];
+        final StringBuilder sb  = new StringBuilder();
+
+        try {
+            int numChars;
+            while ((numChars = reader.read(arr, 0, arr.length)) > 0) {
+                sb.append(arr, 0, numChars);
+            }
+        } finally {
+            reader.close();
+        }
+
+        return sb.toString().toCharArray();
+    }
+
+    /**
+     * Read all of the source until end of file. Return it as char array
+     *
+     * @param file  source file
+     * @return source as content
+     *
+     * @throws IOException if source could not be read
+     */
+    public static char[] readFully(final File file) throws IOException {
+        if (!file.isFile()) {
+            throw new IOException(file + " is not a file"); //TODO localize?
+        }
+        return byteToCharArray(Files.readAllBytes(file.toPath()));
+    }
+
+    /**
+     * Get the base url. This is currently used for testing only
+     * @param url a URL
+     * @return base URL for url
+     */
+    public static String baseURL(final URL url) {
+        return baseURL(url, null);
+    }
+
+    private static String baseURL(final URL url, final String defaultValue) {
+        if (url.getProtocol().equals("file")) {
+            try {
+                final Path path = Paths.get(url.toURI());
+                final Path parent = path.getParent();
+                return (parent != null) ? (parent + File.separator) : defaultValue;
+            } catch (final SecurityException | URISyntaxException | IOError e) {
+                return defaultValue;
+            }
+        }
+
+        // FIXME: is there a better way to find 'base' URL of a given URL?
+        String path = url.getPath();
+        if (path.isEmpty()) {
+            return defaultValue;
+        }
+        path = path.substring(0, path.lastIndexOf('/') + 1);
+        final int port = url.getPort();
+        try {
+            return new URL(url.getProtocol(), url.getHost(), port, path).toString();
+        } catch (final MalformedURLException e) {
+            return defaultValue;
+        }
+    }
+
+    private static String dirName(final File file, final String defaultValue) {
+        final String res = file.getParent();
+        return (res != null)? (res + File.separator) : defaultValue;
+    }
+
+    // fake directory like name
+    private static String baseName(final String name, final String defaultValue) {
+        int idx = name.lastIndexOf('/');
+        if (idx == -1) {
+            idx = name.lastIndexOf('\\');
+        }
+        return (idx != -1)? name.substring(0, idx + 1) : defaultValue;
+    }
+
+    private static char[] readFully(final InputStream is) throws IOException {
+        return byteToCharArray(readBytes(is));
+    }
+
+    private static char[] byteToCharArray(final byte[] bytes) {
+        Charset cs = StandardCharsets.UTF_8;
+        int start = 0;
+        // BOM detection.
+        if (bytes.length > 1 && bytes[0] == (byte)0xFE && bytes[1] == (byte)0xFF) {
+            start = 2;
+            cs = StandardCharsets.UTF_16BE;
+        } else if (bytes.length > 1 && bytes[0] == (byte)0xFF && bytes[1] == (byte)0xFE) {
+            start = 2;
+            cs = StandardCharsets.UTF_16LE;
+        } else if (bytes.length > 2 && bytes[0] == (byte)0xEF && bytes[1] == (byte)0xBB && bytes[2] == (byte)0xBF) {
+            start = 3;
+            cs = StandardCharsets.UTF_8;
+        } else if (bytes.length > 3 && bytes[0] == (byte)0xFF && bytes[1] == (byte)0xFE && bytes[2] == 0 && bytes[3] == 0) {
+            start = 4;
+            cs = Charset.forName("UTF-32LE");
+        } else if (bytes.length > 3 && bytes[0] == 0 && bytes[1] == 0 && bytes[2] == (byte)0xFE && bytes[3] == (byte)0xFF) {
+            start = 4;
+            cs = Charset.forName("UTF-32BE");
+        }
+
+        return new String(bytes, start, bytes.length - start, cs).toCharArray();
+    }
+
+    static byte[] readBytes(final InputStream is) throws IOException {
+        final byte[] arr = new byte[BUFSIZE];
+        try {
+            try (ByteArrayOutputStream buf = new ByteArrayOutputStream()) {
+                int numBytes;
+                while ((numBytes = is.read(arr, 0, arr.length)) > 0) {
+                    buf.write(arr, 0, numBytes);
+                }
+                return buf.toByteArray();
+            }
+        } finally {
+            is.close();
+        }
+    }
+
+    @Override
+    public String toString() {
+        return getName();
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/SpillProperty.java b/nashorn/src/jdk/nashorn/internal/runtime/SpillProperty.java
new file mode 100644
index 00000000000..0d3d6a0764c
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/SpillProperty.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import jdk.nashorn.internal.runtime.linker.Lookup;
+
+/**
+ * The SpillProperty is a subclass of AccessorProperties. Anything not in the initial property map
+ * will end up in the embed fields of the ScriptObject or in the Spill, which currently is a growing
+ * Object only array in ScriptObject
+ *
+ * @see AccessorProperty
+ * @see ScriptObject
+ */
+public final class SpillProperty extends AccessorProperty {
+    private static final MethodHandle SPILLGETTER = MH.asType(MH.getter(MethodHandles.lookup(), ScriptObject.class, "spill", Object[].class), Lookup.GET_OBJECT_TYPE);
+
+    /** Property slot in spill */
+    int slot;
+
+    /**
+     * Constructor
+     *
+     * @param key    property key
+     * @param flags  property flags
+     * @param slot   property slot/index
+     * @param getter getter for property
+     * @param setter setter for property, or null if not configurable and writable
+     */
+    public SpillProperty(final String key, final int flags, final int slot, final MethodHandle getter, final MethodHandle setter) {
+        super(key, flags, getter, setter);
+        this.slot = slot;
+    }
+
+    private SpillProperty(final SpillProperty property) {
+        super(property);
+
+        this.slot = property.slot;
+    }
+
+    @Override
+    protected Property copy() {
+        return new SpillProperty(this);
+    }
+
+    @Override
+    public MethodHandle getGetter(final Class<?> type) {
+        if (isSpill()) {
+            return MH.filterArguments(super.getGetter(type), 0, SPILLGETTER);
+        }
+
+        return super.getGetter(type);
+    }
+
+    @Override
+    public MethodHandle getSetter(final Class<?> type, final PropertyMap currentMap) {
+        if (isSpill()) {
+            return MH.filterArguments(super.getSetter(type, currentMap), 0, SPILLGETTER);
+        }
+
+        return super.getSetter(type, currentMap);
+    }
+
+    @Override
+    public int getSlot() {
+        return slot;
+    }
+
+    @Override
+    public String toString() {
+        return super.toString() + '[' + slot + ']';
+    }
+
+    @Override
+    public int hashCode() {
+        return super.hashCode() ^ slot;
+    }
+
+    @Override
+    public boolean equals(final Object other) {
+        if (this == other) {
+            return true;
+        }
+
+        if (other instanceof SpillProperty) {
+            return super.equals(other) && slot == ((SpillProperty) other).slot;
+        }
+
+        return false;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/StructureLoader.java b/nashorn/src/jdk/nashorn/internal/runtime/StructureLoader.java
new file mode 100644
index 00000000000..ae708b2d934
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/StructureLoader.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import static jdk.nashorn.internal.codegen.Compiler.OBJECTS_PACKAGE;
+import static jdk.nashorn.internal.codegen.Compiler.SCRIPTS_PACKAGE;
+import static jdk.nashorn.internal.codegen.Compiler.binaryName;
+import static jdk.nashorn.internal.codegen.CompilerConstants.JS_OBJECT_PREFIX;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.security.AccessController;
+import java.security.CodeSigner;
+import java.security.CodeSource;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import jdk.nashorn.internal.codegen.objects.ObjectClassGenerator;
+
+/**
+ * Responsible for on the fly construction of structure classes as well
+ * as loading jdk.nashorn.internal.objects.* classes.
+ *
+ */
+final class StructureLoader extends NashornLoader {
+    private static final String JS_OBJECT_PREFIX_EXTERNAL = binaryName(SCRIPTS_PACKAGE) + '.' + JS_OBJECT_PREFIX.tag();
+    private static final String OBJECTS_PACKAGE_EXTERNAL  = binaryName(OBJECTS_PACKAGE);
+
+    /**
+     * Constructor.
+     */
+    StructureLoader(final ClassLoader parent, final Context context) {
+        super(parent, context);
+    }
+
+    @Override
+    protected synchronized Class<?> loadClass(final String name, final boolean resolve) throws ClassNotFoundException {
+        checkPackageAccess(name);
+
+        // check the cache first
+        final Class<?> loadedClass = findLoadedClass(name);
+        if (loadedClass != null) {
+            if (resolve) {
+                resolveClass(loadedClass);
+            }
+            return loadedClass;
+        }
+
+        if (name.startsWith(binaryName(OBJECTS_PACKAGE_EXTERNAL))) {
+            try {
+                return AccessController.doPrivileged(new PrivilegedExceptionAction<Class<?>>() {
+                    @Override
+                    public Class<?> run() throws ClassNotFoundException {
+                        final String      source  = name.replace('.','/') + ".clazz";
+                        final URL         url     = getResource(source);
+                        try (final InputStream is = getResourceAsStream(source)) {
+                            if (is == null) {
+                                throw new ClassNotFoundException(name);
+                            }
+
+                            byte[] code;
+                            try {
+                                code = Source.readBytes(is);
+                            } catch (final IOException e) {
+                                Context.printStackTrace(e);
+                                throw new ClassNotFoundException(name, e);
+                            }
+
+                            final Class<?> cl = defineClass(name, code, 0, code.length, new CodeSource(url, (CodeSigner[])null));
+                            if (resolve) {
+                                resolveClass(cl);
+                            }
+                            return cl;
+                        } catch (final IOException e) {
+                            throw new RuntimeException(e);
+                        }
+                    }
+                });
+            } catch (final PrivilegedActionException  e) {
+                throw new ClassNotFoundException(name, e);
+            }
+        }
+
+        return super.loadClass(name, resolve);
+    }
+
+
+    @Override
+    protected Class<?> findClass(final String name) throws ClassNotFoundException {
+        if (name.startsWith(JS_OBJECT_PREFIX_EXTERNAL)) {
+            final int start = name.indexOf(JS_OBJECT_PREFIX.tag()) + JS_OBJECT_PREFIX.tag().length();
+            return generateClass(name, name.substring(start, name.length()));
+        }
+        return super.findClass(name);
+    }
+
+    private static final boolean IS_JAVA_7 = System.getProperty("java.version").indexOf("1.7") != -1;
+
+    /**
+     * Generate a layout class.
+     * @param name       Name of class.
+     * @param descriptor Layout descriptor.
+     * @return Generated class.
+     */
+    private Class<?> generateClass(final String name, final String descriptor) {
+        Context context = getContext();
+
+        if (context == null) {
+            context = Context.getContext();
+        }
+
+        final byte[] code = new ObjectClassGenerator(context).generate(descriptor);
+
+        try {
+            return IS_JAVA_7 ? sun.misc.Unsafe.getUnsafe().defineClass(name, code, 0, code.length) : defineClass(name, code, 0, code.length);
+        } catch (final SecurityException e) {
+            throw new AssertionError("Nashorn needs to run in the bootclasspath when using Java7, or the NoClassDefFoundError bug in Java7 will trigger." +
+                                     "(This may not be enough - it has been known to happen anyway. Please use Java8)");
+        }
+
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/URIUtils.java b/nashorn/src/jdk/nashorn/internal/runtime/URIUtils.java
new file mode 100644
index 00000000000..a74c9202fdb
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/URIUtils.java
@@ -0,0 +1,297 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import static jdk.nashorn.internal.runtime.ECMAErrors.uriError;
+
+import java.io.UnsupportedEncodingException;
+
+/**
+ * URI handling global functions. ECMA 15.1.3 URI Handling Function Properties
+ *
+ */
+public final class URIUtils {
+
+    private URIUtils() {
+    }
+
+    static String encodeURI(final Object self, final String string) {
+        return encode(self, string, false);
+    }
+
+    static String encodeURIComponent(final Object self, final String string) {
+        return encode(self, string, true);
+    }
+
+    static String decodeURI(final Object self, final String string) {
+        return decode(self, string, false);
+    }
+
+    static String decodeURIComponent(final Object self, final String string) {
+        return decode(self, string, true);
+    }
+
+    // abstract encode function
+    private static String encode(final Object self, final String string, final boolean component) {
+        if (string.isEmpty()) {
+            return string;
+        }
+
+        final int len = string.length();
+        final StringBuilder sb = new StringBuilder();
+
+        for (int k = 0; k < len; k++) {
+            final char C = string.charAt(k);
+            if (isUnescaped(C, component)) {
+                sb.append(C);
+                continue;
+            }
+
+            if (C >= 0xDC00 && C <= 0xDFFF) {
+                return error(Context.getGlobal(), string, k);
+            }
+
+            int V;
+            if (C < 0xD800 || C > 0xDBFF) {
+                V = C;
+            } else {
+                k++;
+                if (k == len) {
+                    return error(Context.getGlobal(), string, k);
+                }
+
+                final char kChar = string.charAt(k);
+                if (kChar < 0xDC00 || kChar > 0xDFFF) {
+                    return error(Context.getGlobal(), string, k);
+                }
+                V = ((C - 0xD800) * 0x400 + (kChar - 0xDC00) + 0x10000);
+            }
+
+            try {
+                sb.append(toHexEscape(V));
+            } catch (final Exception e) {
+                uriError(Context.getGlobal(), e, "bad.uri", string, Integer.toString(k));
+                return null;
+            }
+        }
+
+        return sb.toString();
+    }
+
+    // abstract decode function
+    private static String decode(final Object self, final String string, final boolean component) {
+        if (string.isEmpty()) {
+            return string;
+        }
+
+        final int           len = string.length();
+        final StringBuilder sb  = new StringBuilder();
+
+        for (int k = 0; k < len; k++) {
+            final char ch = string.charAt(k);
+            if (ch != '%') {
+                sb.append(ch);
+                continue;
+            }
+            final int start = k;
+            if (k + 2 >= len) {
+                return error(Context.getGlobal(), string, k);
+            }
+
+            int B = toHexByte(string.charAt(k + 1), string.charAt(k + 2));
+            if (B < 0) {
+                return error(Context.getGlobal(), string, k + 1);
+            }
+
+            k += 2;
+            char C;
+            if ((B & 0x80) == 0) {
+                C = (char) B;
+                if (!component && URI_RESERVED.indexOf(C) >= 0) {
+                    for (int j = start; j <= k; j++) {
+                        sb.append(string.charAt(j));
+                    }
+                } else {
+                    sb.append(C);
+                }
+            } else {
+                int n;
+                for (n = 1; n < 6; n++) {
+                    if (((B << n) & 0x80) == 0) {
+                        break;
+                    }
+                }
+
+                if (n == 1 || n > 4) {
+                    return error(Context.getGlobal(), string, k);
+                }
+
+                if ((k + (3 * (n - 1))) >= len) {
+                    return error(Context.getGlobal(), string, k);
+                }
+
+                final byte[] bbuf = new byte[n];
+                bbuf[0] = (byte) B;
+
+                for (int j = 1; j < n; j++) {
+                    k++;
+                    if (string.charAt(k) != '%') {
+                        return error(Context.getGlobal(), string, k);
+                    }
+
+                    if (k + 2 == len) {
+                        return error(Context.getGlobal(), string, k);
+                    }
+
+                    B = toHexByte(string.charAt(k + 1), string.charAt(k + 2));
+                    if (B < 0 || (B & 0xC0) != 0x80) {
+                        return error(Context.getGlobal(), string, k + 1);
+                    }
+
+                    k += 2;
+                    bbuf[j] = (byte) B;
+                }
+
+                int V;
+                try {
+                    V = ucs4Char(bbuf);
+                } catch (final Exception e) {
+                    uriError(Context.getGlobal(), e, "bad.uri", string, Integer.toString(k));
+                    return null;
+                }
+                if (V < 0x10000) {
+                    C = (char) V;
+                    if (!component && URI_RESERVED.indexOf(C) >= 0) {
+                        for (int j = start; j != k; j++) {
+                            sb.append(string.charAt(j));
+                        }
+                    } else {
+                        sb.append(C);
+                    }
+                } else { // V >= 0x10000
+                    if (V > 0x10FFFF) {
+                        return error(Context.getGlobal(), string, k);
+                    }
+                    final int L = ((V - 0x10000) & 0x3FF) + 0xDC00;
+                    final int H = (((V - 0x10000) >> 10) & 0x3FF) + 0xD800;
+                    sb.append((char) H);
+                    sb.append((char) L);
+                }
+            }
+        }
+
+        return sb.toString();
+    }
+
+    private static int hexDigit(final char ch) {
+        final char chu = Character.toUpperCase(ch);
+        if (chu >= '0' && chu <= '9') {
+            return (chu - '0');
+        } else if (chu >= 'A' && chu <= 'F') {
+            return (chu - 'A' + 10);
+        } else {
+            return -1;
+        }
+    }
+
+    private static int toHexByte(final char ch1, final char ch2) {
+        final int i1 = hexDigit(ch1);
+        final int i2 = hexDigit(ch2);
+        if (i1 >= 0 && i2 >= 0) {
+            return (i1 << 4) | i2;
+        }
+        return -1;
+    }
+
+    private static int ucs4Char(final byte[] utf8) throws UnsupportedEncodingException {
+        return new String(utf8, "UTF-8").codePointAt(0);
+    }
+
+    private static String toHexEscape(final int u0) {
+        int u = u0;
+        int len;
+        final byte[] b = new byte[6];
+
+        if (u <= 0x7f) {
+            b[0] = (byte) u;
+            len = 1;
+        } else {
+            // > 0x7ff -> length 2
+            // > 0xffff -> length 3
+            // and so on. each new length is an additional 5 bits from the
+            // original 11
+            // the final mask is 8-len zeros in the low part.
+            len = 2;
+            for (int mask = u >>> 11; mask != 0; mask >>>= 5) {
+                len++;
+            }
+            for (int i = len - 1; i > 0; i--) {
+                b[i] = (byte) (0x80 | (u & 0x3f));
+                u >>>= 6; // 64 bits per octet.
+            }
+
+            b[0] = (byte) (~((1 << (8 - len)) - 1) | u);
+        }
+
+        final StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < len; i++) {
+            sb.append('%');
+            if ((b[i] & 0xff) < 0x10) {
+                sb.append('0');
+            }
+            sb.append(Integer.toHexString(b[i] & 0xff).toUpperCase());
+        }
+
+        return sb.toString();
+    }
+
+    private static String error(final ScriptObject global, final String string, final int index) {
+        uriError(global, "bad.uri", string, Integer.toString(index));
+        return null;
+    }
+
+    // 'uriEscaped' except for alphanumeric chars
+    private static final String URI_UNESCAPED_NONALPHANUMERIC = "-_.!~*'()";
+    // 'uriReserved' + '#'
+    private static final String URI_RESERVED = ";/?:@&=+$,#";
+
+    private static boolean isUnescaped(final char ch, final boolean component) {
+        if (('A' <= ch && ch <= 'Z') || ('a' <= ch && ch <= 'z')
+                || ('0' <= ch && ch <= '9')) {
+            return true;
+        }
+
+        if (URI_UNESCAPED_NONALPHANUMERIC.indexOf(ch) >= 0) {
+            return true;
+        }
+
+        if (!component) {
+            return URI_RESERVED.indexOf(ch) >= 0;
+        }
+
+        return false;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Undefined.java b/nashorn/src/jdk/nashorn/internal/runtime/Undefined.java
new file mode 100644
index 00000000000..448976e57ac
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Undefined.java
@@ -0,0 +1,205 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import org.dynalang.dynalink.CallSiteDescriptor;
+import org.dynalang.dynalink.linker.GuardedInvocation;
+import org.dynalang.dynalink.support.CallSiteDescriptorFactory;
+import org.dynalang.dynalink.support.Guards;
+
+/**
+ * Unique instance of this class is used to represent JavaScript undefined.
+ */
+public final class Undefined extends DefaultPropertyAccess {
+
+    private Undefined() {
+    }
+
+    private static final Undefined UNDEFINED = new Undefined();
+    private static final Undefined EMPTY     = new Undefined();
+
+    // Guard used for indexed property access/set on the Undefined instance
+    private static final MethodHandle UNDEFINED_GUARD = Guards.getIdentityGuard(UNDEFINED);
+
+    /**
+     * Get the value of {@code undefined}, this is represented as a global singleton
+     * instance of this class. It can always be reference compared
+     *
+     * @return the undefined object
+     */
+    public static Undefined getUndefined() {
+        return UNDEFINED;
+    }
+
+    /**
+     * Get the value of {@code empty}. This is represented as a global singleton
+     * instanceof this class. It can always be reference compared.
+     * <p>
+     * We need empty to differentiate behavior in things like array iterators
+     * <p>
+     * @return the empty object
+     */
+    public static Undefined getEmpty() {
+        return EMPTY;
+    }
+
+    /**
+     * Get the class name of Undefined
+     * @return "Undefined"
+     */
+    @SuppressWarnings("static-method")
+    public String getClassName() {
+        return "Undefined";
+    }
+
+    @Override
+    public String toString() {
+        return "undefined";
+    }
+
+    /**
+     * Lookup the appropriate method for an invoke dynamic call.
+     * @param desc The invoke dynamic callsite descriptor.
+     * @return GuardedInvocation to be invoked at call site.
+     */
+    public static GuardedInvocation lookup(final CallSiteDescriptor desc) {
+        final String operator = CallSiteDescriptorFactory.tokenizeOperators(desc).get(0);
+
+        switch (operator) {
+        case "new":
+        case "call":
+            lookupTypeError("cant.call.undefined", desc);
+            break;
+        case "callMethod":
+            lookupTypeError("cant.read.property.of.undefined", desc);
+        // NOTE: we support getElem and setItem as JavaScript doesn't distinguish items from properties. Nashorn itself
+        // emits "dyn:getProp:identifier" for "<expr>.<identifier>" and "dyn:getElem" for "<expr>[<expr>]", but we are
+        // more flexible here and dispatch not on operation name (getProp vs. getElem), but rather on whether the
+        // operation has an associated name or not.
+            break;
+        case "getProp":
+        case "getElem":
+        case "getMethod":
+            if (desc.getNameTokenCount() < 3) {
+                return findGetIndexMethod(desc);
+            }
+            lookupTypeError("cant.read.property.of.undefined", desc);
+            break;
+        case "setProp":
+        case "setElem":
+            if (desc.getNameTokenCount() < 3) {
+                return findSetIndexMethod(desc);
+            }
+            lookupTypeError("cant.set.property.of.undefined", desc);
+            break;
+        default:
+            break;
+        }
+
+        return null;
+    }
+
+    private static void lookupTypeError(final String msg, final CallSiteDescriptor desc) {
+        typeError(Context.getGlobal(), msg, desc.getNameTokenCount() > 2 ? desc.getNameToken(2) : null);
+    }
+
+    /**
+     * Find the appropriate GETINDEX method for an invoke dynamic call.
+     * @param desc The invoke dynamic callsite descriptor
+     * @param args arguments
+     * @return GuardedInvocation to be invoked at call site.
+     */
+    private static GuardedInvocation findGetIndexMethod(final CallSiteDescriptor desc, final Object... args) {
+        final MethodType callType  = desc.getMethodType();
+        final Class<?> returnClass = callType.returnType();
+        final Class<?> keyClass    = callType.parameterType(1);
+
+        String name = "get";
+        if (returnClass.isPrimitive()) {
+            //turn e.g. get with a double into getDouble
+            final String returnTypeName = returnClass.getName();
+            name += Character.toUpperCase(returnTypeName.charAt(0)) + returnTypeName.substring(1, returnTypeName.length());
+        }
+        MethodHandle methodHandle = findOwnMH(name, returnClass, keyClass);
+        methodHandle = MH.asType(methodHandle, methodHandle.type().changeParameterType(0, Object.class));
+
+        return new GuardedInvocation(methodHandle, UNDEFINED_GUARD);
+    }
+
+    /**
+     * Find the appropriate SETINDEX method for an invoke dynamic call.
+     * @param desc The invoke dynamic callsite descriptor
+     * @return GuardedInvocation to be invoked at call site.
+     */
+    private static GuardedInvocation findSetIndexMethod(final CallSiteDescriptor desc) {
+        final MethodType callType   = desc.getMethodType();
+        final Class<?>   keyClass   = callType.parameterType(1);
+        final Class<?>   valueClass = callType.parameterType(2);
+
+        MethodHandle methodHandle = findOwnMH("set", void.class, keyClass, valueClass, boolean.class);
+        methodHandle = MH.asType(methodHandle, methodHandle.type().changeParameterType(0, Object.class));
+        methodHandle = MH.insertArguments(methodHandle, 3, false);
+
+        return new GuardedInvocation(methodHandle, UNDEFINED_GUARD);
+    }
+
+    @Override
+    public Object get(final Object key) {
+        typeError(Context.getGlobal(), "cant.read.property.of.undefined", ScriptRuntime.safeToString(key));
+        return ScriptRuntime.UNDEFINED;
+    }
+
+    @Override
+    public void set(final Object key, final Object value, final boolean strict) {
+        typeError(Context.getGlobal(), "cant.set.property.of.undefined", ScriptRuntime.safeToString(key));
+    }
+
+    @Override
+    public boolean delete(final Object key, final boolean strict) {
+        typeError(Context.getGlobal(), "cant.delete.property.of.undefined", ScriptRuntime.safeToString(key));
+        return false;
+    }
+
+    @Override
+    public boolean has(final Object key) {
+        return false;
+    }
+
+    @Override
+    public boolean hasOwnProperty(final Object key) {
+        return false;
+    }
+
+    private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
+        return MH.findVirtual(MethodHandles.lookup(), Undefined.class, name, MH.type(rtype, types));
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/UserAccessorProperty.java b/nashorn/src/jdk/nashorn/internal/runtime/UserAccessorProperty.java
new file mode 100644
index 00000000000..c5a375a26ef
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/UserAccessorProperty.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import java.lang.invoke.MethodHandle;
+import jdk.nashorn.internal.runtime.linker.Lookup;
+
+/**
+ * Property with user defined getters/setters. Actual getter and setter
+ * functions are stored in underlying ScriptObject. Only the 'slot' info is
+ * stored in the property.
+ *
+ * The slots here denote either ScriptObject embed field number or spill
+ * array index. For spill array index, we use slot value of
+ * (index + ScriptObject.embedSize). See also ScriptObject.getEmbedOrSpill
+ * method. Negative slot value means that the corresponding getter or setter
+ * is null. Note that always two slots are allocated in ScriptObject - but
+ * negative (less by 1) slot number is stored for null getter or setter.
+ * This is done so that when the property is redefined with a different
+ * getter and setter (say, both non-null), we'll have spill slots to store
+ * those. When a slot is negative, (-slot - 1) is the embed/spill index.
+ */
+public final class UserAccessorProperty extends Property {
+
+    /** User defined getter function slot. */
+    private final int getterSlot;
+
+    /** User defined setter function slot. */
+    private final int setterSlot;
+
+    /**
+     * Constructor
+     *
+     * @param key        property key
+     * @param flags      property flags
+     * @param getterSlot getter slot, starting at first embed
+     * @param setterSlot setter slot, starting at first embed
+     */
+    public UserAccessorProperty(final String key, final int flags, final int getterSlot, final int setterSlot) {
+        super(key, flags);
+        this.getterSlot = getterSlot;
+        this.setterSlot = setterSlot;
+    }
+
+    private UserAccessorProperty(final UserAccessorProperty property) {
+        super(property);
+
+        this.getterSlot = property.getterSlot;
+        this.setterSlot = property.setterSlot;
+    }
+
+    /**
+     * Return getter slot for this UserAccessorProperty. Slots start with first embed field.
+     * @return getter slot
+     */
+    public int getGetterSlot() {
+        return getterSlot < 0 ? -getterSlot - 1 : getterSlot;
+    }
+
+    /**
+     * Return setter slot for this UserAccessorProperty. Slots start with first embed field.
+     * @return setter slot
+     */
+    public int getSetterSlot() {
+        return setterSlot < 0 ? -setterSlot - 1 : setterSlot;
+    }
+
+    @Override
+    protected Property copy() {
+        return new UserAccessorProperty(this);
+    }
+
+    @Override
+    public boolean equals(final Object other) {
+        if (this == other) {
+            return true;
+        }
+
+        if (other instanceof UserAccessorProperty) {
+            final UserAccessorProperty uc = (UserAccessorProperty) other;
+            return super.equals(other) && getterSlot == uc.getterSlot && setterSlot == uc.setterSlot;
+        }
+
+        return false;
+    }
+
+    @Override
+    public int hashCode() {
+        return super.hashCode() ^ getterSlot ^ setterSlot;
+    }
+
+    /*
+     * Accessors.
+     */
+    @Override
+    public int getSpillCount() {
+        // calculate how many spill array slots used by this propery.
+        int count = 0;
+        if (getGetterSlot() >= ScriptObject.EMBED_SIZE) {
+            count++;
+        }
+        if (getSetterSlot() >= ScriptObject.EMBED_SIZE) {
+            count++;
+        }
+        return count;
+    }
+
+    @Override
+    public boolean hasGetterFunction() {
+        return getterSlot > -1;
+    }
+
+    @Override
+    public boolean hasSetterFunction() {
+        return setterSlot > -1;
+    }
+
+    @Override
+    public MethodHandle getGetter(final Class<?> type) {
+        return Lookup.filterReturnType(ScriptObject.USER_ACCESSOR_GETTER.methodHandle(), type);
+    }
+
+    @Override
+    public ScriptFunction getGetterFunction(final ScriptObject obj) {
+        final Object value = obj.getEmbedOrSpill(getterSlot);
+        return (value instanceof ScriptFunction) ? (ScriptFunction) value : null;
+    }
+
+    @Override
+    public MethodHandle getSetter(final Class<?> type, final PropertyMap currentMap) {
+        return ScriptObject.USER_ACCESSOR_SETTER.methodHandle();
+    }
+
+    @Override
+    public ScriptFunction getSetterFunction(final ScriptObject obj) {
+        final Object value = obj.getEmbedOrSpill(setterSlot);
+        return (value instanceof ScriptFunction) ? (ScriptFunction) value : null;
+
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Version.java b/nashorn/src/jdk/nashorn/internal/runtime/Version.java
new file mode 100644
index 00000000000..0c8387ad973
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Version.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+/**
+ * Class to handle version strings for Nashorn.
+ */
+public final class Version {
+    // Don't create me!
+    private Version() {
+    }
+
+    /**
+     * The current version number as a string.
+     * @return version string
+     */
+    public static String version() {
+        return version("release");  // mm.nn.oo[-milestone]
+    }
+
+    /**
+     * The current full version number as a string.
+     * @return full version string
+     */
+    public static String fullVersion() {
+        return version("full"); // mm.mm.oo[-milestone]-build
+    }
+
+    private static final String   VERSION_RB_NAME = "jdk.nashorn.internal.runtime.resources.version";
+    private static ResourceBundle versionRB;
+
+    private static String version(final String key) {
+        if (versionRB == null) {
+            try {
+                versionRB = ResourceBundle.getBundle(VERSION_RB_NAME);
+            } catch (final MissingResourceException e) {
+                return "version not available";
+            }
+        }
+        try {
+            return versionRB.getString(key);
+        }
+        catch (final MissingResourceException e) {
+            return "version not available";
+        }
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java b/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java
new file mode 100644
index 00000000000..5bba23b43ef
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java
@@ -0,0 +1,274 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
+import org.dynalang.dynalink.CallSiteDescriptor;
+import org.dynalang.dynalink.linker.GuardedInvocation;
+import org.dynalang.dynalink.support.CallSiteDescriptorFactory;
+
+
+/**
+ * This class supports the handling of scope in a with body.
+ *
+ */
+public class WithObject extends ScriptObject implements Scope {
+
+    private static final MethodHandle WITHEXPRESSIONFILTER = findOwnMH("withFilterExpression", Object.class, Object.class);
+    private static final MethodHandle WITHSCOPEFILTER      = findOwnMH("withFilterScope",      Object.class, Object.class);
+    private static final MethodHandle BIND_TO_EXPRESSION   = findOwnMH("bindToExpression",     Object.class, Object.class, Object.class);
+
+    /** With expression object. */
+    private final Object expression;
+
+    /**
+     * Constructor
+     *
+     * @param scope scope object
+     * @param expression with expression
+     */
+    public WithObject(final ScriptObject scope, final Object expression) {
+        super();
+
+        setIsScope();
+        setProto(scope);
+        this.expression = expression;
+    }
+
+    /**
+     * Delete a property based on a key.
+     * @param key Any valid JavaScript value.
+     * @param strict strict mode execution.
+     * @return True if deleted.
+     */
+    @Override
+    public boolean delete(final Object key, final boolean strict) {
+        if (expression instanceof ScriptObject) {
+            final ScriptObject self = (ScriptObject)expression;
+            final String propName = ScriptObject.convertKey(key);
+
+            final FindProperty find = self.findProperty(propName, true);
+
+            if (find != null) {
+                return self.delete(propName, strict);
+            }
+        }
+
+        return false;
+    }
+
+
+    @Override
+    public GuardedInvocation lookup(final CallSiteDescriptor desc, final boolean megaMorphic) {
+        // With scopes can never be observed outside of Nashorn code, so all call sites that can address it will of
+        // necessity have a Nashorn descriptor - it is safe to cast.
+        final NashornCallSiteDescriptor ndesc = (NashornCallSiteDescriptor)desc;
+        FindProperty find = null;
+        GuardedInvocation link = null;
+        ScriptObject self = null;
+
+        final boolean isNamedOperation;
+        final String name;
+        if(desc.getNameTokenCount() > 2) {
+            isNamedOperation = true;
+            name = desc.getNameToken(CallSiteDescriptor.NAME_OPERAND);
+        } else {
+            isNamedOperation = false;
+            name = null;
+        }
+
+        if (expression instanceof ScriptObject) {
+            self = (ScriptObject)expression;
+            if (isNamedOperation) {
+                find = self.findProperty(name, true);
+            }
+
+            if (find != null) {
+                link = self.lookup(desc);
+
+                if (link != null) {
+                    return fixExpressionCallSite(ndesc, link);
+                }
+            }
+        }
+
+        final ScriptObject scope = getProto();
+        if (isNamedOperation) {
+            find = scope.findProperty(name, true);
+        }
+
+        if (find != null) {
+            return fixScopeCallSite(scope.lookup(desc));
+        }
+
+        // the property is not found - now check for
+        // __noSuchProperty__ and __noSuchMethod__ in expression
+        if (self != null) {
+            String fallBack;
+
+            final String operator = CallSiteDescriptorFactory.tokenizeOperators(desc).get(0);
+
+            switch (operator) {
+            case "callMethod":
+            case "getMethod":
+                fallBack = NO_SUCH_METHOD_NAME;
+                break;
+            case "getProp":
+            case "getElem":
+                fallBack = NO_SUCH_PROPERTY_NAME;
+                break;
+            default:
+                fallBack = null;
+                break;
+            }
+
+            if (fallBack != null) {
+                find = self.findProperty(fallBack, true);
+                if (find != null) {
+                    switch (operator) {
+                    case "callMethod":
+                        link = self.createNoSuchMethodInvocation(desc);
+                        break;
+                    case "getMethod":
+                        link = self.noSuchMethod(desc);
+                        break;
+                    case "getProp":
+                    case "getElem":
+                        link = self.noSuchProperty(desc);
+                        break;
+                    default:
+                        break;
+                    }
+                }
+            }
+
+            if (link != null) {
+                return fixExpressionCallSite(ndesc, link);
+            }
+        }
+
+        // still not found, may be scope can handle with it's own
+        // __noSuchProperty__, __noSuchMethod__ etc.
+        link = scope.lookup(desc);
+
+        if (link != null) {
+            return fixScopeCallSite(link);
+        }
+
+        return null;
+    }
+
+    @Override
+    public void setSplitState(final int state) {
+        getNonWithParent().setSplitState(state);
+    }
+
+    @Override
+    public int getSplitState() {
+        return getNonWithParent().getSplitState();
+    }
+
+    /**
+     * Get first parent scope that is not an instance of WithObject.
+     */
+    private Scope getNonWithParent() {
+        ScriptObject proto = getProto();
+
+        while (proto != null && proto instanceof WithObject) {
+            proto = proto.getProto();
+        }
+
+        assert proto instanceof Scope : "with scope without parent scope";
+        return (Scope) proto;
+    }
+
+    private static GuardedInvocation fixExpressionCallSite(final NashornCallSiteDescriptor desc, final GuardedInvocation link) {
+        // If it's not a getMethod, just add an expression filter that converts WithObject in "this" position to its
+        // expression.
+        if(!"getMethod".equals(desc.getFirstOperator())) {
+            return link.filterArguments(0, WITHEXPRESSIONFILTER);
+        }
+
+        return link.replaceMethods(
+                // Make sure getMethod will bind the script functions it receives to WithObject.expression
+                MH.foldArguments(BIND_TO_EXPRESSION, filter(link.getInvocation(), WITHEXPRESSIONFILTER)),
+                // No clever things for the guard -- it is still identically filtered.
+                filterGuard(link, WITHEXPRESSIONFILTER));
+    }
+
+    private static GuardedInvocation fixScopeCallSite(final GuardedInvocation link) {
+        return link.replaceMethods(filter(link.getInvocation(), WITHSCOPEFILTER), filterGuard(link, WITHSCOPEFILTER));
+    }
+
+    private static MethodHandle filterGuard(final GuardedInvocation link, final MethodHandle filter) {
+        final MethodHandle test = link.getGuard();
+        return test == null ? null : filter(test, filter);
+    }
+
+    private static MethodHandle filter(final MethodHandle mh, final MethodHandle filter) {
+        return MH.filterArguments(mh, 0, filter);
+    }
+
+    /**
+     * Drops the WithObject wrapper from the expression.
+     * @param receiver WithObject wrapper.
+     * @return The with expression.
+     */
+    public static Object withFilterExpression(final Object receiver) {
+        return ((WithObject)receiver).expression;
+    }
+
+
+    @SuppressWarnings("unused")
+    private static Object bindToExpression(final Object fn, final Object receiver) {
+        return fn instanceof ScriptFunction ? ((ScriptFunction) fn).makeBoundFunction(withFilterExpression(receiver), new Object[0]) : fn;
+    }
+
+    /**
+     * Drops the WithObject wrapper from the scope.
+     * @param receiver WithObject wrapper.
+     * @return The with scope.
+     */
+    public static Object withFilterScope(final Object receiver) {
+        return ((WithObject)receiver).getProto();
+    }
+
+    /**
+     * Get the with expression for this {@code WithObject}
+     * @return the with expression
+     */
+    public Object getExpression() {
+        return expression;
+    }
+
+    private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
+        return MH.findStatic(MethodHandles.lookup(), WithObject.class, name, MH.type(rtype, types));
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayData.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayData.java
new file mode 100644
index 00000000000..d4012534d5c
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayData.java
@@ -0,0 +1,507 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.arrays;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.reflect.Array;
+import jdk.nashorn.internal.runtime.GlobalObject;
+import jdk.nashorn.internal.runtime.PropertyDescriptor;
+import jdk.nashorn.internal.runtime.linker.Bootstrap;
+
+/**
+ * ArrayData - abstraction for wrapping array elements
+ */
+public abstract class ArrayData {
+
+    /** Minimum chunk size for underlying arrays */
+    protected static final int CHUNK_SIZE = 16;
+
+    /** Mask for getting a chunk */
+    protected static final int CHUNK_MASK = CHUNK_SIZE - 1;
+
+    /**
+     * Immutable empty array to get ScriptObjects started.
+     */
+    public static final ArrayData EMPTY_ARRAY = new NoTypeArrayData();
+
+    /**
+     * Length of the array data. Not necessarily length of the wrapped array.
+     */
+    private long length;
+
+    /**
+     * Constructor
+     * @param length Virtual length of the array.
+     */
+    public ArrayData(final long length) {
+        this.length = length;
+    }
+
+    /**
+     * Factory method for unspecified array - start as int
+     * @return ArrayData
+     */
+    public static ArrayData initialArray() {
+        return new IntArrayData();
+    }
+
+    /**
+     * Factory method for unspecified array with given length - start as int array data
+     *
+     * @param length the initial length
+     * @return ArrayData
+     */
+    public static ArrayData allocate(final int length) {
+        final ArrayData arrayData = new IntArrayData(length);
+        return length == 0 ? arrayData : new DeletedRangeArrayFilter(arrayData, 0, length - 1);
+    }
+
+    /**
+     * Factory method for unspecified given an array object
+     *
+     * @param  array the array
+     * @return ArrayData wrapping this array
+     */
+    public static ArrayData allocate(final Object array) {
+        final Class<?> clazz = array.getClass();
+
+        if (clazz == int[].class) {
+            return new IntArrayData((int[])array, ((int[])array).length);
+        } else if (clazz == long[].class) {
+            return new LongArrayData((long[])array, ((long[])array).length);
+        } else if (clazz == double[].class) {
+            return new NumberArrayData((double[])array, ((double[])array).length);
+        } else {
+            return new ObjectArrayData((Object[])array, ((Object[])array).length);
+        }
+    }
+
+    /**
+     * Allocate an ArrayData wrapping a given array
+     *
+     * @param array the array to use for initial elements
+     * @return the ArrayData
+     */
+    public static ArrayData allocate(final int[] array) {
+         return new IntArrayData(array, array.length);
+    }
+
+    /**
+     * Allocate an ArrayData wrapping a given array
+     *
+     * @param array the array to use for initial elements
+     * @return the ArrayData
+     */
+    public static ArrayData allocate(final long[] array) {
+        return new LongArrayData(array, array.length);
+    }
+
+    /**
+     * Allocate an ArrayData wrapping a given array
+     *
+     * @param array the array to use for initial elements
+     * @return the ArrayData
+     */
+    public static ArrayData allocate(final double[] array) {
+        return new NumberArrayData(array, array.length);
+    }
+
+    /**
+     * Allocate an ArrayData wrapping a given array
+     *
+     * @param array the array to use for initial elements
+     * @return the ArrayData
+     */
+    public static ArrayData allocate(final Object[] array) {
+        return new ObjectArrayData(array, array.length);
+    }
+
+    /**
+     * Apply a freeze filter to an ArrayData.
+     *
+     * @param underlying  the underlying ArrayData to wrap in the freeze filter
+     * @return the frozen ArrayData
+     */
+    public static ArrayData freeze(final ArrayData underlying) {
+        return new FrozenArrayFilter(underlying);
+    }
+
+    /**
+     * Apply a seal filter to an ArrayData.
+     *
+     * @param underlying  the underlying ArrayData to wrap in the seal filter
+     * @return the sealed ArrayData
+     */
+    public static ArrayData seal(final ArrayData underlying) {
+        return new SealedArrayFilter(underlying);
+    }
+
+    /**
+     * Return the length of the array data. This may differ from the actual
+     * length of the array this wraps as length may be set or gotten as any
+     * other JavaScript Property
+     *
+     * Even though a JavaScript array length may be a long, we only store
+     * int parts for the optimized array access. For long lengths there
+     * are special cases anyway.
+     *
+     * TODO: represent arrays with "long" lengths as a special ArrayData
+     * that basically maps to the ScriptObject directly for better abstraction
+     *
+     * @return the length of the data
+     */
+    public final long length() {
+        return length;
+    }
+
+    /**
+     * Return a copy of the array data as an Object array.
+     *
+     * @return an Object array
+     */
+    public abstract Object[] asObjectArray();
+
+    /**
+     * Return a copy of the array data as an array of the specified type.
+     *
+     * @param componentType  the type of elements in the array
+     * @return and array of the given type
+     */
+    public Object asArrayOfType(final Class<?> componentType) {
+        final Object[] src = asObjectArray();
+        final int l = src.length;
+        final Object dst = Array.newInstance(componentType, l);
+        final MethodHandle converter = Bootstrap.getLinkerServices().getTypeConverter(Object.class, componentType);
+        try {
+            for (int i = 0; i < src.length; i++) {
+                Array.set(dst, i, invoke(converter, src[i]));
+            }
+        } catch (final RuntimeException | Error e) {
+            throw e;
+        } catch (final Throwable t) {
+            throw new RuntimeException(t);
+        }
+        return dst;
+    }
+
+    /**
+     * Set the length of the data array
+     *
+     * @param length the new length for the data array
+     */
+    public void setLength(final long length) {
+        this.length = length;
+    }
+
+    /**
+     * Shift the array data left
+     *
+     * TODO: explore start at an index and not at zero, to make these operations
+     * even faster. Offset everything from the index. Costs memory but is probably
+     * worth it
+     *
+     * @param by offset to shift
+     */
+    public abstract void shiftLeft(int by);
+
+    /**
+     * Shift the array right
+     *
+     * @param by offset to shift
+
+     * @return New arraydata (or same)
+     */
+    public abstract ArrayData shiftRight(int by);
+
+    /**
+     * Ensure that the given index exists and won't fail subsequent
+     *
+     * @param safeIndex the index to ensure wont go out of bounds
+     * @return new array data (or same)
+     */
+    public abstract ArrayData ensure(long safeIndex);
+
+    /**
+     * Shrink the array to a new length, may or may not retain the
+     * inner array
+     *
+     * @param newLength new max length
+     *
+     * @return new array data (or same)
+     */
+    public abstract ArrayData shrink(long newLength);
+
+    /**
+     * Set an object value at a given index
+     *
+     * @param index the index
+     * @param value the value
+     * @param strict are we in strict mode
+     * @return new array data (or same)
+     */
+    public abstract ArrayData set(int index, Object value, boolean strict);
+
+    /**
+     * Set an int value at a given index
+     *
+     * @param index the index
+     * @param value the value
+     * @param strict are we in strict mode
+     * @return new array data (or same)
+     */
+    public abstract ArrayData set(int index, int value, boolean strict);
+
+    /**
+     * Set a long value at a given index
+     *
+     * @param index the index
+     * @param value the value
+     * @param strict are we in strict mode
+     * @return new array data (or same)
+     */
+    public abstract ArrayData set(int index, long value, boolean strict);
+
+    /**
+     * Set an double value at a given index
+     *
+     * @param index the index
+     * @param value the value
+     * @param strict are we in strict mode
+     * @return new array data (or same)
+     */
+    public abstract ArrayData set(int index, double value, boolean strict);
+
+    /**
+     * Get an int value from a given index
+     *
+     * @param index the index
+     * @return the value
+     */
+    public abstract int getInt(int index);
+
+    /**
+     * Get a long value from a given index
+     *
+     * @param index the index
+     * @return the value
+     */
+    public abstract long getLong(int index);
+
+    /**
+     * Get a double value from a given index
+     *
+     * @param index the index
+     * @return the value
+     */
+    public abstract double getDouble(int index);
+
+    /**
+     * Get an Object value from a given index
+     *
+     * @param index the index
+     * @return the value
+     */
+    public abstract Object getObject(int index);
+
+    /**
+     * Tests to see if an entry exists (avoids boxing.)
+     * @param index the index
+     * @return true if entry exists
+     */
+    public abstract boolean has(int index);
+
+    /**
+     * Returns if element at specific index can be deleted or not.
+     *
+     * @param index the index of the element
+     * @param strict are we in strict mode
+     *
+     * @return true if element can be deleted
+     */
+    public boolean canDelete(final int index, final boolean strict) {
+        return true;
+    }
+
+    /**
+     * Returns if element at specific index range can be deleted or not.
+     *
+     * @param fromIndex  the start index
+     * @param toIndex    the end index
+     * @param strict     are we in strict mode
+     *
+     * @return true if range can be deleted
+     */
+    public boolean canDelete(final long fromIndex, final long toIndex, final boolean strict) {
+        return true;
+    }
+
+    /**
+     * Returns property descriptor for element at a given index
+     *
+     * @param global the global object
+     * @param index  the index
+     *
+     * @return property descriptor for element
+     */
+    public PropertyDescriptor getDescriptor(final GlobalObject global, final int index) {
+        return global.newDataDescriptor(getObject(index), true, true, true);
+    }
+
+    /**
+     * Delete an array value at the given index, substituting
+     * for an undefined
+     *
+     * @param index the index
+     * @return new array data (or same)
+     */
+    public abstract ArrayData delete(int index);
+
+    /**
+     * Delete a given range from this array;
+     *
+     * @param fromIndex  from index (inclusive)
+     * @param toIndex    to index (inclusive)
+     *
+     * @return new ArrayData after deletion
+     */
+    public abstract ArrayData delete(long fromIndex, long toIndex);
+
+    /**
+     * Convert the ArrayData to one with a different element type
+     * Currently Arrays are not collapsed to narrower types, just to
+     * wider ones. Attempting to narrow an array will assert
+     *
+     * @param type new element type
+     * @return new array data
+     */
+    protected abstract ArrayData convert(Class<?> type);
+
+    /**
+     * Push an array of items to the end of the array
+     *
+     * @param strict are we in strict mode
+     * @param items  the items
+     * @return new array data (or same)
+     */
+    public ArrayData push(final boolean strict, final Object... items) {
+        if (items.length == 0) {
+            return this;
+        }
+
+        final Class<?>  widest  = widestType(items);
+
+        ArrayData newData = convert(widest);
+        long      pos     = newData.length();
+        for (final Object item : items) {
+            newData = newData.ensure(pos); //avoid sparse array
+            newData.set((int)pos++, item, strict);
+        }
+        return newData;
+    }
+
+    /**
+     * Pop an element from the end of the array
+     *
+     * @return the popped element
+     */
+    public abstract Object pop();
+
+    /**
+     * Slice out a section of the array and return that
+     * subsection as a new array data: [from, to)
+     *
+     * @param from start index
+     * @param to   end index + 1
+     * @return new array data
+     */
+    public abstract ArrayData slice(long from, long to);
+
+    private static Class<?> widestType(final Object... items) {
+        assert items.length > 0;
+
+        Class<?> widest = Integer.class;
+
+        for (final Object item : items) {
+            final Class<?> itemClass = item == null ? null : item.getClass();
+            if (itemClass == Long.class) {
+                if (widest == Integer.class) {
+                    widest = Long.class;
+                }
+            } else if (itemClass == Double.class) {
+                if (widest == Integer.class || widest == Long.class) {
+                    widest = Double.class;
+                }
+            } else if (!(item instanceof Number)) {
+                widest = Object.class;
+                break;
+            }
+        }
+
+        return widest;
+    }
+
+    /**
+     * Exponential growth function for array size when in
+     * need of resizing.
+     *
+     * @param size current size
+     * @return next size to allocate for internal array
+     */
+    protected static int nextSize(final int size) {
+        if (size == 0) {
+            return CHUNK_SIZE;
+        }
+
+        int i = size;
+        while ((i & CHUNK_MASK) != 0) {
+            i++;
+        }
+
+        return i << 1;
+    }
+
+    /**
+     * Return the next valid index from a given one. Subclassed for various
+     * array representation
+     *
+     * @param index the current index
+     *
+     * @return the next index
+     */
+    public long nextIndex(final long index) {
+        return index + 1;
+    }
+
+    static Object invoke(final MethodHandle mh, final Object arg) {
+        try {
+            return mh.invoke(arg);
+        } catch (final RuntimeException | Error e) {
+            throw e;
+        } catch (final Throwable t) {
+            throw new RuntimeException(t);
+        }
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayFilter.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayFilter.java
new file mode 100644
index 00000000000..3c066866f06
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayFilter.java
@@ -0,0 +1,194 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.arrays;
+
+import jdk.nashorn.internal.runtime.ScriptRuntime;
+import jdk.nashorn.internal.runtime.Undefined;
+import jdk.nashorn.internal.runtime.linker.Bootstrap;
+
+/**
+ * Base class for array filters. Implements all core routines so that the
+ * filter only has to implement those needed.
+ */
+abstract class ArrayFilter extends ArrayData {
+    /** Underlying array. */
+    protected ArrayData underlying;
+
+    ArrayFilter(final ArrayData underlying) {
+        super(underlying.length());
+        this.underlying = underlying;
+    }
+
+    /**
+     * Get the underlying {@link ArrayData} that this filter wraps
+     * @return array data
+     */
+    protected ArrayData getUnderlying() {
+        return underlying;
+    }
+
+    @Override
+    public void setLength(final long length) {
+        super.setLength(length);
+        underlying.setLength(length);
+    }
+
+    @Override
+    public Object[] asObjectArray() {
+        return underlying.asObjectArray();
+    }
+
+    @Override
+    public Object asArrayOfType(final Class<?> componentType) {
+        return underlying.asArrayOfType(componentType);
+    }
+
+    @Override
+    public void shiftLeft(final int by) {
+        underlying.shiftLeft(by);
+        setLength(underlying.length());
+    }
+
+    @Override
+    public ArrayData shiftRight(final int by) {
+        underlying = underlying.shiftRight(by);
+        setLength(underlying.length());
+
+        return this;
+    }
+
+    @Override
+    public ArrayData ensure(final long safeIndex) {
+        underlying = underlying.ensure(safeIndex);
+        setLength(underlying.length());
+
+        return this;
+    }
+
+    @Override
+    public ArrayData shrink(final long newLength) {
+        underlying = underlying.shrink(newLength);
+        setLength(underlying.length());
+
+        return this;
+    }
+
+    @Override
+    public ArrayData set(final int index, final Object value, final boolean strict) {
+        underlying = underlying.set(index, value, strict);
+        setLength(underlying.length());
+
+        return this;
+    }
+
+    @Override
+    public ArrayData set(final int index, final int value, final boolean strict) {
+        underlying = underlying.set(index, value, strict);
+        setLength(underlying.length());
+
+        return this;
+    }
+
+    @Override
+    public ArrayData set(final int index, final long value, final boolean strict) {
+        underlying = underlying.set(index, value, strict);
+        setLength(underlying.length());
+
+        return this;
+    }
+
+    @Override
+    public ArrayData set(final int index, final double value, final boolean strict) {
+        underlying = underlying.set(index, value, strict);
+        setLength(underlying.length());
+
+        return this;
+    }
+
+    @Override
+    public int getInt(final int index) {
+        return underlying.getInt(index);
+    }
+
+    @Override
+    public long getLong(final int index) {
+        return underlying.getLong(index);
+    }
+
+    @Override
+    public double getDouble(final int index) {
+        return underlying.getDouble(index);
+    }
+
+    @Override
+    public Object getObject(final int index) {
+        return underlying.getObject(index);
+    }
+
+    @Override
+    public boolean has(final int index) {
+        return underlying.has(index);
+    }
+
+    @Override
+    public ArrayData delete(final int index) {
+        underlying = underlying.delete(index);
+        setLength(underlying.length());
+        return this;
+    }
+
+    @Override
+    public ArrayData delete(final long from, final long to) {
+        underlying = underlying.delete(from, to);
+        setLength(underlying.length());
+        return this;
+    }
+
+    @Override
+    protected ArrayData convert(final Class<?> type) {
+        underlying = underlying.convert(type);
+        setLength(underlying.length());
+        return this;
+    }
+
+    @Override
+    public Object pop() {
+        final Object value = underlying.pop();
+        setLength(underlying.length());
+
+        return value;
+    }
+
+    @Override
+    public long nextIndex(final long index) {
+        return underlying.nextIndex(index);
+    }
+
+    static Object convertUndefinedValue(final Class<?> targetType) {
+        return invoke(Bootstrap.getLinkerServices().getTypeConverter(Undefined.class, targetType),
+                ScriptRuntime.UNDEFINED);
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayIndex.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayIndex.java
new file mode 100644
index 00000000000..5b342fd8424
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayIndex.java
@@ -0,0 +1,247 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.arrays;
+
+import jdk.nashorn.internal.runtime.ConsString;
+import jdk.nashorn.internal.runtime.JSType;
+
+/**
+ * Array index computation helpers. that both throw exceptions or return
+ * invalid values.
+ *
+ */
+public final class ArrayIndex {
+
+    private static final int  INVALID_ARRAY_INDEX = -1;
+    private static final long MAX_ARRAY_INDEX = 0xfffffffeL;
+
+    private ArrayIndex() {
+    }
+
+    /**
+     * Fast conversion of non-negative integer string to long.
+     * @param key Key as a string.
+     * @return long value of string or -1.
+     */
+    private static long fromString(final String key) {
+        long value = 0;
+        final int length = key.length();
+
+        // Check for empty string or leading 0
+        if (length == 0 || (length > 1 && key.charAt(0) == '0')) {
+            return -1;
+        }
+
+        // Fast toNumber.
+        for (int i = 0; i < length; i++) {
+            final char digit = key.charAt(i);
+
+            // If not a digit.
+            if (digit < '0' || digit > '9') {
+                return -1;
+            }
+
+            // Insert digit.
+            value = value * 10 + digit - '0';
+
+            // Check for overflow (need to catch before wrap around.)
+            if (value > MAX_ARRAY_INDEX) {
+                return -1;
+            }
+        }
+
+        return value;
+    }
+
+    /**
+     * Returns a valid array index in an int, if the object represents one. This
+     * routine needs to perform quickly since all keys are tested with it.
+     *
+     * @param  key key to check for array index
+     * @return valid array index, or negative value if not valid
+     */
+    public static int getArrayIndexNoThrow(final Object key) {
+        if (key instanceof Number) {
+            return getArrayIndexNoThrow(((Number)key).doubleValue());
+        } else if (key instanceof String) {
+            return (int)fromString((String)key);
+        } else if (key instanceof ConsString) {
+            return (int)fromString(key.toString());
+        }
+
+        return -1;
+    }
+
+    /**
+     * Returns a valid array index in an int, if the object represents one
+     *
+     * @param key key to check
+     * @return array index for key
+     * @throws InvalidArrayIndexException if not a valid array index key
+     */
+    public static int getArrayIndex(final Object key) throws InvalidArrayIndexException {
+        final int index = getArrayIndexNoThrow(key);
+        if (index != -1) {
+            return index;
+        }
+
+        throw new InvalidArrayIndexException(key);
+    }
+
+    /**
+     * Returns a valid array index in an int, if the long represents one
+     *
+     * @param key key to check
+     * @return valid index or a negative value if long is not a valid array index
+     */
+    public static int getArrayIndexNoThrow(final long key) {
+        if (key >= 0 && key <= MAX_ARRAY_INDEX) {
+            return (int)key;
+        }
+
+        return -1;
+    }
+
+    /**
+     * Returns a valid array index in an int, if the long represents one
+     *
+     * @param key key to check
+     * @return valid index for the long
+     * @throws InvalidArrayIndexException if long is not a valid array index
+     */
+    public static int getArrayIndex(final long key) throws InvalidArrayIndexException {
+        final int index = getArrayIndexNoThrow(key);
+        if (index != -1) {
+            return index;
+        }
+
+        throw new InvalidArrayIndexException(key);
+    }
+
+
+    /**
+     * Return a valid index for this double, if it represents one
+     *
+     * Doubles that aren't representable exactly as longs/ints aren't working
+     * array indexes, however, array[1.1] === array["1.1"] in JavaScript.
+     *
+     * @param key the key to check
+     * @return the array index this double represents or a negative value if this isn't an index
+     */
+    public static int getArrayIndexNoThrow(final double key) {
+        if (JSType.isRepresentableAsInt(key)) {
+            final int intKey = (int)key;
+            if (intKey >= 0) {
+                return intKey;
+            }
+        } else if (JSType.isRepresentableAsLong(key)) {
+            return getArrayIndexNoThrow((long)key);
+        }
+
+        return -1;
+    }
+
+    /**
+     * Return a valid array index for this double, if it represents one
+     *
+     * Doubles that aren't representable exactly as longs/ints aren't working
+     * array indexes, however, array[1.1] === array["1.1"] in JavaScript.
+     *
+     * @param key the key to check
+     * @return the array index this double represents
+     * @throws InvalidArrayIndexException if this isn't an array index
+     */
+    public static int getArrayIndex(final double key) throws InvalidArrayIndexException {
+        final int index = getArrayIndexNoThrow(key);
+        if (index != -1) {
+            return index;
+        }
+
+        throw new InvalidArrayIndexException(key);
+    }
+
+    /**
+     * Return a valid array index for this string, if it represents one
+     *
+     * @param key the key to check
+     * @return the array index this string represents or a negative value if this isn't an index
+     */
+    public static int getArrayIndexNoThrow(final String key) {
+        return (int)fromString(key);
+    }
+
+    /**
+     * Return a valid array index for this string, if it represents one
+     *
+     * @param key the key to check
+     * @return the array index this string represents
+     * @throws InvalidArrayIndexException if the string isn't an array index
+     */
+    public static int getArrayIndex(final String key) throws InvalidArrayIndexException {
+        final int index = getArrayIndexNoThrow(key);
+        if (index != -1) {
+            return index;
+        }
+
+        throw new InvalidArrayIndexException(key);
+    }
+
+    /**
+     * Check whether an index is valid as an array index. This check only tests if
+     * it is the special "invalid array index" type, not if it is e.g. less than zero
+     * or corrupt in some other way
+     *
+     * @param index index to test
+     * @return true if {@code index} is not the special invalid array index type
+     */
+    public static boolean isValidArrayIndex(final int index) {
+        return index != INVALID_ARRAY_INDEX;
+    }
+
+    /**
+     * Convert an index to a long value. This basically amounts to ANDing it
+     * with {@link JSType#MAX_UINT}, as the maximum array index in JavaScript
+     * is 0xffffffff
+     *
+     * @param index index to convert to long form
+     * @return index as uint32 in a long
+     */
+    public static long toLongIndex(final int index) {
+        return index & JSType.MAX_UINT;
+    }
+
+    /**
+     * Check whether a key string can be used as a valid numeric array index in
+     * JavaScript
+     *
+     * @param key the key
+     * @return true if key works as a valid numeric array index
+     */
+    public static boolean isIndexKey(final String key) {
+       return ArrayIndex.getArrayIndexNoThrow(key) >= 0;
+    }
+}
+
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayIterator.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayIterator.java
new file mode 100644
index 00000000000..5b9e1c20847
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayIterator.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.arrays;
+
+import jdk.nashorn.internal.runtime.ScriptObject;
+
+/**
+ * Iterator over a NativeArray
+ */
+public class ArrayIterator extends ArrayLikeIterator<Object> {
+
+    /** Array {@link ScriptObject} to iterate over */
+    protected final ScriptObject array;
+
+    /** length of array */
+    protected final int length;
+
+    /**
+     * Constructor
+     * @param array array to iterate over
+     * @param includeUndefined should undefined elements be included in iteration
+     */
+    protected ArrayIterator(final ScriptObject array, final boolean includeUndefined) {
+        super(includeUndefined);
+        this.array = array;
+        this.length = (int) array.getArray().length();
+    }
+
+    /**
+     * Is the current index still inside the array
+     * @return true if inside the array
+     */
+    protected boolean indexInArray() {
+        return index < length;
+    }
+
+    @Override
+    public Object next() {
+        return array.get(bumpIndex());
+    }
+
+    @Override
+    public int getLength() {
+        return length;
+    }
+
+    @Override
+    public boolean hasNext() {
+        if (!includeUndefined) {
+            while (indexInArray()) {
+                if (array.has(index)) {
+                    break;
+                }
+                bumpIndex();
+            }
+        }
+
+        return indexInArray();
+    }
+
+    @Override
+    public void remove() {
+        array.delete(index, array.getContext()._strict);
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayLikeIterator.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayLikeIterator.java
new file mode 100644
index 00000000000..283ca26eb14
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayLikeIterator.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.arrays;
+
+import java.util.Iterator;
+import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.ScriptObject;
+
+/**
+ * Superclass for array iterators
+ * TODO: rewrite these
+ *
+ * @param <T> element type
+ */
+abstract public class ArrayLikeIterator<T> implements Iterator<T> {
+
+    /** current element index in iteration */
+    protected int index;
+
+    /** should undefined elements be included in the iteration? */
+    protected final boolean includeUndefined;
+
+    /**
+     * Constructor
+     *
+     * @param includeUndefined should undefined elements be included in the iteration?
+     */
+    protected ArrayLikeIterator(final boolean includeUndefined) {
+        this.includeUndefined = includeUndefined;
+        this.index = 0;
+    }
+
+    /**
+     * Is this a reverse order iteration?
+     * @return true if reverse
+     */
+    @SuppressWarnings("static-method")
+    public boolean isReverse() {
+        return false;
+    }
+
+    /**
+     * Go the the next valid element index of the iterator
+     * @return next index
+     */
+    protected int bumpIndex() {
+        return index++;
+    }
+
+    /**
+     * Return the next valid element index of the iterator
+     * @return next index
+     */
+    public int nextIndex() {
+        return index;
+    }
+
+    @Override
+    public void remove() {
+        throw new UnsupportedOperationException("remove");
+    }
+
+    /**
+     * Get the length of the iteration
+     * @return length
+     */
+    public abstract int getLength();
+
+    /**
+     * ArrayLikeIterator factory
+     *
+     * @param object object over which to do element iteration
+     * @return iterator
+     */
+    public static ArrayLikeIterator<Object> arrayLikeIterator(final Object object) {
+        return arrayLikeIterator(object, false);
+    }
+
+    /**
+     * ArrayLikeIterator factory (reverse order)
+     * @param object object over which to do reverse element iteration
+     * @return iterator
+     */
+    public static ArrayLikeIterator<Object> reverseArrayLikeIterator(final Object object) {
+        return reverseArrayLikeIterator(object, false);
+    }
+
+    /**
+     * ArrayLikeIterator factory
+     * @param object object over which to do reverse element iteration
+     * @param includeUndefined should undefined elements be included in the iteration
+     * @return iterator
+     */
+    public static ArrayLikeIterator<Object> arrayLikeIterator(final Object object, final boolean includeUndefined) {
+        Object obj = object;
+
+        if (ScriptObject.isArray(obj)) {
+            return new ArrayIterator((ScriptObject) obj, includeUndefined);
+        }
+
+        obj = JSType.toObject(Context.getGlobal(), obj);
+        if (obj instanceof ScriptObject) {
+            return new MapIterator((ScriptObject)obj, includeUndefined);
+        }
+
+        return new EmptyArrayLikeIterator();
+    }
+
+    /**
+     * ArrayLikeIterator factory (reverse order)
+     * @param object object over which to do reverse element iteration
+     * @param includeUndefined should undefined elements be included in the iteration
+     * @return iterator
+     */
+    public static ArrayLikeIterator<Object> reverseArrayLikeIterator(final Object object, final boolean includeUndefined) {
+        Object obj = object;
+
+        if (ScriptObject.isArray(obj)) {
+            return new ReverseArrayIterator((ScriptObject) obj, includeUndefined);
+        }
+
+        obj = JSType.toObject(Context.getGlobal(), obj);
+        if (obj instanceof ScriptObject) {
+            return new ReverseMapIterator((ScriptObject)obj, includeUndefined);
+        }
+
+        assert !obj.getClass().isArray();
+
+        return new EmptyArrayLikeIterator();
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/DeletedArrayFilter.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/DeletedArrayFilter.java
new file mode 100644
index 00000000000..2a378ddbbaf
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/DeletedArrayFilter.java
@@ -0,0 +1,182 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.arrays;
+
+import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+
+import java.lang.reflect.Array;
+import jdk.nashorn.internal.runtime.BitVector;
+
+/**
+ * This filter handles the deletion of array elements.
+ */
+final class DeletedArrayFilter extends ArrayFilter {
+    /** Bit vector tracking deletions. */
+    private final BitVector deleted;
+
+    DeletedArrayFilter(final ArrayData underlying) {
+        super(underlying);
+
+        this.deleted = new BitVector(underlying.length());
+    }
+
+    @Override
+    public Object[] asObjectArray() {
+        final Object[] value = super.asObjectArray();
+
+        for (int i = 0; i < value.length; i++) {
+            if (deleted.isSet(i)) {
+                value[i] = UNDEFINED;
+            }
+        }
+
+        return value;
+    }
+
+    @Override
+    public Object asArrayOfType(final Class<?> componentType) {
+        final Object value = super.asArrayOfType(componentType);
+        final Object undefValue = convertUndefinedValue(componentType);
+        final int l = Array.getLength(value);
+        for (int i = 0; i < l; i++) {
+            if (deleted.isSet(i)) {
+                Array.set(value, i, undefValue);
+            }
+        }
+
+        return value;
+    }
+
+    @Override
+    public void shiftLeft(final int by) {
+        super.shiftLeft(by);
+        deleted.shiftLeft(by, length());
+    }
+
+    @Override
+    public ArrayData shiftRight(final int by) {
+        super.shiftRight(by);
+        deleted.shiftRight(by, length());
+
+        return this;
+    }
+
+    @Override
+    public ArrayData ensure(final long safeIndex) {
+        if (safeIndex >= SparseArrayData.MAX_DENSE_LENGTH && safeIndex >= length()) {
+            return new SparseArrayData(this, safeIndex + 1);
+        }
+
+        super.ensure(safeIndex);
+        deleted.resize(length());
+
+        return this;
+    }
+
+    @Override
+    public ArrayData shrink(final long newLength) {
+        super.shrink(newLength);
+        deleted.resize(length());
+
+        return this;
+    }
+
+    @Override
+    public ArrayData set(final int index, final Object value, final boolean strict) {
+        deleted.clear(ArrayIndex.toLongIndex(index));
+
+        return super.set(index, value, strict);
+    }
+
+    @Override
+    public ArrayData set(final int index, final int value, final boolean strict) {
+        deleted.clear(ArrayIndex.toLongIndex(index));
+
+        return super.set(index, value, strict);
+    }
+
+    @Override
+    public ArrayData set(final int index, final long value, final boolean strict) {
+        deleted.clear(ArrayIndex.toLongIndex(index));
+
+        return super.set(index, value, strict);
+    }
+
+    @Override
+    public ArrayData set(final int index, final double value, final boolean strict) {
+        deleted.clear(ArrayIndex.toLongIndex(index));
+
+        return super.set(index, value, strict);
+    }
+
+    @Override
+    public boolean has(final int index) {
+        return super.has(index) && deleted.isClear(ArrayIndex.toLongIndex(index));
+    }
+
+    @Override
+    public ArrayData delete(final int index) {
+        final long longIndex = ArrayIndex.toLongIndex(index);
+        assert longIndex >= 0 && longIndex < length();
+        deleted.set(longIndex);
+        return this;
+    }
+
+    @Override
+    public ArrayData delete(final long fromIndex, final long toIndex) {
+        assert fromIndex >= 0 && fromIndex <= toIndex && toIndex < length();
+        deleted.setRange(fromIndex, toIndex + 1);
+        return this;
+    }
+
+    @Override
+    public Object pop() {
+        final long index = length() - 1;
+
+        if (super.has((int)index)) {
+            final boolean isDeleted = deleted.isSet(index);
+            final Object value = super.pop();
+
+            return isDeleted ? UNDEFINED : value;
+        }
+
+        return super.pop();
+    }
+
+    @Override
+    public ArrayData slice(final long from, final long to) {
+        final ArrayData newArray = underlying.slice(from, to);
+        final DeletedArrayFilter newFilter = new DeletedArrayFilter(newArray);
+        newFilter.getDeleted().copy(deleted);
+        newFilter.getDeleted().shiftLeft(from, newFilter.length());
+
+        return newFilter;
+    }
+
+    private BitVector getDeleted() {
+        return deleted;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/DeletedRangeArrayFilter.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/DeletedRangeArrayFilter.java
new file mode 100644
index 00000000000..05d59ed15d9
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/DeletedRangeArrayFilter.java
@@ -0,0 +1,245 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.arrays;
+
+import java.lang.reflect.Array;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
+
+/**
+ * This filter handles the deletion of array elements.
+ */
+final class DeletedRangeArrayFilter extends ArrayFilter {
+    /** Range (inclusive) tracking deletions */
+    private long lo, hi;
+
+    DeletedRangeArrayFilter(final ArrayData underlying, final long lo, final long hi) {
+        super(underlying);
+        this.lo = lo;
+        this.hi = hi;
+    }
+
+    private boolean isEmpty() {
+        return lo > hi;
+    }
+
+    private boolean isDeleted(final int index) {
+        return lo <= index && index <= hi;
+    }
+
+    @Override
+    public Object[] asObjectArray() {
+        final Object[] value = super.asObjectArray();
+
+        if (lo <= Integer.MAX_VALUE) {
+            final int intHi = (int)Math.min(hi, Integer.MAX_VALUE);
+            for (int i = (int)lo; i <= intHi; i++) {
+                value[i] = ScriptRuntime.UNDEFINED;
+            }
+        }
+
+        return value;
+    }
+
+    @Override
+    public Object asArrayOfType(final Class<?> componentType) {
+        final Object value = super.asArrayOfType(componentType);
+        final Object undefValue = convertUndefinedValue(componentType);
+
+        if (lo <= Integer.MAX_VALUE) {
+            final int intHi = (int)Math.min(hi, Integer.MAX_VALUE);
+            for (int i = (int)lo; i <= intHi; i++) {
+                Array.set(value, i, undefValue);
+            }
+        }
+
+        return value;
+    }
+
+    @Override
+    public ArrayData ensure(final long safeIndex) {
+        if (safeIndex >= SparseArrayData.MAX_DENSE_LENGTH && safeIndex >= length()) {
+            return new SparseArrayData(this, safeIndex + 1);
+        }
+
+        return super.ensure(safeIndex);
+    }
+
+    @Override
+    public void shiftLeft(final int by) {
+        super.shiftLeft(by);
+        lo = Math.max(0, lo - by);
+        hi = Math.max(-1, hi - by);
+    }
+
+    @Override
+    public ArrayData shiftRight(final int by) {
+        super.shiftRight(by);
+        lo = Math.min(length(), lo + by);
+        hi = Math.min(length() - 1, hi + by);
+
+        return isEmpty() ? getUnderlying() : this;
+    }
+
+    @Override
+    public ArrayData shrink(final long newLength) {
+        super.shrink(newLength);
+        lo = Math.min(newLength, lo);
+        hi = Math.min(newLength - 1, hi);
+
+        return isEmpty() ? getUnderlying() : this;
+    }
+
+    @Override
+    public ArrayData set(final int index, final Object value, final boolean strict) {
+        final long longIndex = ArrayIndex.toLongIndex(index);
+        if (longIndex < lo || longIndex > hi) {
+            return super.set(index, value, strict);
+        } else if (longIndex > lo && longIndex < hi) {
+            return getDeletedArrayFilter().set(index, value, strict);
+        }
+        if (longIndex == lo) {
+            lo++;
+        } else {
+            assert longIndex == hi;
+            hi--;
+        }
+
+        return isEmpty() ? getUnderlying().set(index, value, strict) : super.set(index, value, strict);
+    }
+
+    @Override
+    public ArrayData set(final int index, final int value, final boolean strict) {
+        final long longIndex = ArrayIndex.toLongIndex(index);
+        if (longIndex < lo || longIndex > hi) {
+            return super.set(index, value, strict);
+        } else if (longIndex > lo && longIndex < hi) {
+            return getDeletedArrayFilter().set(index, value, strict);
+        }
+        if (longIndex == lo) {
+            lo++;
+        } else {
+            assert longIndex == hi;
+            hi--;
+        }
+
+        return isEmpty() ? getUnderlying().set(index, value, strict) : super.set(index, value, strict);
+    }
+
+    @Override
+    public ArrayData set(final int index, final long value, final boolean strict) {
+        final long longIndex = ArrayIndex.toLongIndex(index);
+        if (longIndex < lo || longIndex > hi) {
+            return super.set(index, value, strict);
+        } else if (longIndex > lo && longIndex < hi) {
+            return getDeletedArrayFilter().set(index, value, strict);
+        }
+        if (longIndex == lo) {
+            lo++;
+        } else {
+            assert longIndex == hi;
+            hi--;
+        }
+
+        return isEmpty() ? getUnderlying().set(index, value, strict) : super.set(index, value, strict);
+    }
+
+    @Override
+    public ArrayData set(final int index, final double value, final boolean strict) {
+        final long longIndex = ArrayIndex.toLongIndex(index);
+        if (longIndex < lo || longIndex > hi) {
+            return super.set(index, value, strict);
+        } else if (longIndex > lo && longIndex < hi) {
+            return getDeletedArrayFilter().set(index, value, strict);
+        }
+        if (longIndex == lo) {
+            lo++;
+        } else {
+            assert longIndex == hi;
+            hi--;
+        }
+
+        return isEmpty() ? getUnderlying().set(index, value, strict) : super.set(index, value, strict);
+    }
+
+    @Override
+    public boolean has(final int index) {
+        return super.has(index) && !isDeleted(index);
+    }
+
+    private ArrayData getDeletedArrayFilter() {
+        final ArrayData deleteFilter = new DeletedArrayFilter(getUnderlying());
+
+        for (long i = lo; i <= hi; i++) {
+            deleteFilter.delete((int) i);
+        }
+
+        return deleteFilter;
+    }
+
+    @Override
+    public ArrayData delete(final int index) {
+        final long longIndex = ArrayIndex.toLongIndex(index);
+        if (longIndex + 1 == lo) {
+            lo = longIndex;
+        } else if (longIndex - 1 == hi) {
+            hi = longIndex;
+        } else if (longIndex < lo || hi < longIndex) {
+           return getDeletedArrayFilter().delete(index);
+        }
+
+        return this;
+    }
+
+    @Override
+    public ArrayData delete(final long fromIndex, final long toIndex) {
+        if (fromIndex > hi + 1  || toIndex < lo - 1) {
+            return getDeletedArrayFilter().delete(fromIndex, toIndex);
+        }
+        lo = Math.min(fromIndex, lo);
+        hi = Math.max(toIndex, hi);
+        return this;
+    }
+
+    @Override
+    public Object pop() {
+        final int index = (int)(length() - 1);
+        if (super.has(index)) {
+            final boolean isDeleted = isDeleted(index);
+            final Object value      = super.pop();
+
+            lo = Math.min(index + 1, lo);
+            hi = Math.min(index, hi);
+            return isDeleted ? ScriptRuntime.UNDEFINED : value;
+        }
+
+        return super.pop();
+    }
+
+    @Override
+    public ArrayData slice(final long from, final long to) {
+        return new DeletedRangeArrayFilter(underlying.slice(from, to), Math.max(0, lo - from), Math.max(0, hi - from));
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/EmptyArrayLikeIterator.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/EmptyArrayLikeIterator.java
new file mode 100644
index 00000000000..37aeede12fc
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/EmptyArrayLikeIterator.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.arrays;
+
+/**
+ * Dummy array iterator that has no elements
+ */
+final class EmptyArrayLikeIterator extends ArrayLikeIterator<Object> {
+
+    EmptyArrayLikeIterator() {
+        super(false);
+    }
+
+    @Override
+    public boolean hasNext() {
+        return false;
+    }
+
+    @Override
+    public Object next() {
+        return null;
+    }
+
+    @Override
+    public int getLength() {
+        return 0;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/FrozenArrayFilter.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/FrozenArrayFilter.java
new file mode 100644
index 00000000000..0568849ed72
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/FrozenArrayFilter.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.arrays;
+
+import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+
+import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.runtime.GlobalObject;
+import jdk.nashorn.internal.runtime.PropertyDescriptor;
+
+/**
+ * ArrayData after the array has been frozen by Object.freeze call.
+ */
+final class FrozenArrayFilter extends SealedArrayFilter {
+    FrozenArrayFilter(final ArrayData underlying) {
+        super(underlying);
+    }
+
+    @Override
+    public PropertyDescriptor getDescriptor(final GlobalObject global, final int index) {
+        return global.newDataDescriptor(getObject(index), false, true, false);
+    }
+
+    @Override
+    public ArrayData set(final int index, final int value, final boolean strict) {
+        if (strict) {
+            typeError(Context.getGlobal(), "cant.set.property", Integer.toString(index), "frozen array");
+        }
+        return this;
+    }
+
+    @Override
+    public ArrayData set(final int index, final long value, final boolean strict) {
+        if (strict) {
+            typeError(Context.getGlobal(), "cant.set.property", Integer.toString(index), "frozen array");
+        }
+        return this;
+    }
+
+    @Override
+    public ArrayData set(final int index, final double value, final boolean strict) {
+        if (strict) {
+            typeError(Context.getGlobal(), "cant.set.property", Integer.toString(index), "frozen array");
+        }
+        return this;
+    }
+
+    @Override
+    public ArrayData set(final int index, final Object value, final boolean strict) {
+        if (strict) {
+            typeError(Context.getGlobal(), "cant.set.property", Integer.toString(index), "frozen array");
+        }
+        return this;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/IntArrayData.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/IntArrayData.java
new file mode 100644
index 00000000000..e37440d1e19
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/IntArrayData.java
@@ -0,0 +1,274 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.arrays;
+
+import java.util.Arrays;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
+
+/**
+ * Implementation of {@link ArrayData} as soon as an int has been
+ * written to the array. This is the default data for new arrays
+ */
+public final class IntArrayData extends ArrayData {
+    /**
+     * The wrapped array
+     */
+    private int[] array;
+
+    IntArrayData() {
+        this(new int[ArrayData.CHUNK_SIZE], 0);
+    }
+
+    IntArrayData(final int length) {
+        super(length);
+        this.array  = new int[ArrayData.nextSize(length)];
+    }
+
+    /**
+     * Constructor
+     * @param array an int array
+     * @param length a length, not necessarily array.length
+     */
+    IntArrayData(final int array[], final int length) {
+        super(length);
+        this.array = array;
+        if (array.length > length) {
+            Arrays.fill(array, length, array.length, 0);
+        }
+    }
+
+    @Override
+    public Object[] asObjectArray() {
+        return toObjectArray(array, (int) length());
+    }
+
+    @Override
+    public Object asArrayOfType(final Class<?> componentType) {
+        if(componentType == int.class) {
+            return array.length == length() ? array.clone() : Arrays.copyOf(array, (int) length());
+        }
+        return super.asArrayOfType(componentType);
+    }
+
+    private static Object[] toObjectArray(final int[] array, final int length) {
+        final Object[] oarray = new Object[length];
+        for (int index = 0; index < length; index++) {
+            oarray[index] = Integer.valueOf(array[index]);
+        }
+
+        return oarray;
+    }
+
+    private static double[] toDoubleArray(final int[] array) {
+        final double[] darray = new double[array.length];
+        for (int index = 0; index < array.length; index++) {
+            darray[index] = array[index];
+        }
+
+        return darray;
+    }
+
+    private static long[] toLongArray(final int[] array) {
+        final long[] larray = new long[array.length];
+        for (int index = 0; index < array.length; index++) {
+            larray[index] = array[index];
+        }
+
+        return larray;
+    }
+
+    @Override
+    public ArrayData convert(final Class<?> type) {
+        if (type == Integer.class) {
+            return this;
+        } else if (type == Long.class) {
+            return new LongArrayData(IntArrayData.toLongArray(array), (int) length());
+        } else if (type == Double.class) {
+            return new NumberArrayData(IntArrayData.toDoubleArray(array), (int) length());
+        } else {
+            return new ObjectArrayData(IntArrayData.toObjectArray(array, array.length), (int) length());
+        }
+    }
+
+    @Override
+    public void shiftLeft(final int by) {
+        System.arraycopy(array, by, array, 0, array.length - by);
+    }
+
+    @Override
+    public ArrayData shiftRight(final int by) {
+        final ArrayData newData = ensure(by + length() - 1);
+        if (newData != this) {
+            newData.shiftRight(by);
+            return newData;
+        }
+        System.arraycopy(array, 0, array, by, array.length - by);
+
+        return this;
+    }
+
+    @Override
+    public ArrayData ensure(final long safeIndex) {
+        if (safeIndex >= SparseArrayData.MAX_DENSE_LENGTH && safeIndex >= array.length) {
+            return new SparseArrayData(this, safeIndex + 1);
+        }
+
+        int newLength = array.length;
+
+        while (newLength <= safeIndex) {
+            newLength = ArrayData.nextSize(newLength);
+        }
+
+        if (array.length <= safeIndex) {
+            array = Arrays.copyOf(array, newLength);
+        }
+
+        setLength(safeIndex + 1);
+
+        return this;
+    }
+
+    @Override
+    public ArrayData shrink(final long newLength) {
+        Arrays.fill(array, (int) newLength, array.length, 0);
+
+        return this;
+    }
+
+    @Override
+    public ArrayData set(final int index, final Object value, final boolean strict) {
+        try {
+            final int intValue = ((Integer)value).intValue();
+            array[index] = intValue;
+            setLength(Math.max(index + 1, length()));
+            return this;
+        } catch (final NullPointerException | ClassCastException e) {
+            if (value instanceof Short || value instanceof Byte) {
+                final int intValue = ((Number)value).intValue();
+                array[index] = intValue;
+                setLength(Math.max(index + 1, length()));
+                return this;
+            }
+
+            if (value == ScriptRuntime.UNDEFINED) {
+                return new UndefinedArrayFilter(this).set(index, value, strict);
+            }
+        }
+
+        final ArrayData newData = convert(value == null ? Object.class : value.getClass());
+
+        return newData.set(index, value, strict);
+    }
+
+    @Override
+    public ArrayData set(final int index, final int value, final boolean strict) {
+        array[index] = value;
+        setLength(Math.max(index + 1, length()));
+
+        return this;
+    }
+
+    @Override
+    public ArrayData set(final int index, final long value, final boolean strict) {
+        final int intValue = (int)value;
+        if (intValue == value) {
+            array[index] = intValue;
+            setLength(Math.max(index + 1, length()));
+            return this;
+        }
+
+        return convert(Long.class).set(index, value, strict);
+    }
+
+    @Override
+    public ArrayData set(final int index, final double value, final boolean strict) {
+        if (JSType.isRepresentableAsInt(value)) {
+            array[index] = (int)(long)value;
+            setLength(Math.max(index + 1, length()));
+            return this;
+        }
+
+        return convert(Double.class).set(index, value, strict);
+    }
+
+    @Override
+    public int getInt(final int index) {
+        return array[index];
+    }
+
+    @Override
+    public long getLong(final int index) {
+        return array[index];
+    }
+
+    @Override
+    public double getDouble(final int index) {
+        return array[index];
+    }
+
+    @Override
+    public Object getObject(final int index) {
+        return array[index];
+    }
+
+    @Override
+    public boolean has(final int index) {
+        return 0 <= index && index < length();
+    }
+
+    @Override
+    public ArrayData delete(final int index) {
+        return new DeletedRangeArrayFilter(this, index, index);
+    }
+
+    @Override
+    public ArrayData delete(final long fromIndex, final long toIndex) {
+        return new DeletedRangeArrayFilter(this, fromIndex, toIndex);
+    }
+
+    @Override
+    public Object pop() {
+        if (length() == 0) {
+            return ScriptRuntime.UNDEFINED;
+        }
+
+        final int newLength = (int) length() - 1;
+        final int elem = array[newLength];
+        array[newLength] = 0;
+        setLength(newLength);
+
+        return elem;
+    }
+
+    @Override
+    public ArrayData slice(final long from, final long to) {
+        final long start     = from < 0 ? (from + length()) : from;
+        final long newLength = to - start;
+
+        return new IntArrayData(Arrays.copyOfRange(array, (int)from, (int)to), (int)newLength);
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/InvalidArrayIndexException.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/InvalidArrayIndexException.java
new file mode 100644
index 00000000000..b9e42a36ed1
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/InvalidArrayIndexException.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.arrays;
+
+/**
+ * Mechanism for communicating that something isn't a plain
+ * numeric integer array index. This enables things like
+ * array getters for the fast case in a try, basically
+ * just consisting of an "array[index]" access without
+ * any checks of boundary conditions that rarely happen
+ */
+@SuppressWarnings("serial")
+class InvalidArrayIndexException extends Exception {
+
+    private final Object index;
+
+    InvalidArrayIndexException(final Object index) {
+        super(index == null ? "null" : index.toString());
+        this.index = index;
+    }
+
+    InvalidArrayIndexException(final int index) {
+        this(Integer.valueOf(index));
+    }
+
+    InvalidArrayIndexException(final long index) {
+        this(Long.valueOf(index));
+    }
+
+    InvalidArrayIndexException(final double index) {
+        this(Double.valueOf(index));
+    }
+
+    @Override
+    public String toString() {
+        return index.toString();
+    }
+
+    Object getIndex() {
+        return index;
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/IteratorAction.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/IteratorAction.java
new file mode 100644
index 00000000000..fe7de5af7f9
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/IteratorAction.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.arrays;
+
+import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+
+import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.runtime.ScriptFunction;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
+
+/**
+ * Helper class for the various map/apply functions in {@link jdk.nashorn.internal.objects.NativeArray}.
+ * @param <T> element type of results from application callback
+ */
+public abstract class IteratorAction<T> {
+    /** Self object */
+    protected final Object self;
+
+    /** This for the callback invocation */
+    protected Object thisArg;
+
+    /** Callback function to be applied to elements */
+    protected final Object callbackfn;
+
+    /** Result of array iteration */
+    protected T result;
+
+    /** Current array index of iterator */
+    protected int index;
+
+    /** Iterator object */
+    private final ArrayLikeIterator<Object> iter;
+
+    /**
+     * Constructor
+     *
+     * @param self          self reference to array object
+     * @param callbackfn    callback function for each element
+     * @param thisArg       the reference
+     * @param initialResult result accumulator initialization
+     */
+    public IteratorAction(final Object self, final Object callbackfn, final Object thisArg, final T initialResult) {
+        this(self, callbackfn, thisArg, initialResult, ArrayLikeIterator.arrayLikeIterator(self));
+    }
+
+    /**
+     * Constructor
+     *
+     * @param self          self reference to array object
+     * @param callbackfn    callback function for each element
+     * @param thisArg       the reference
+     * @param initialResult result accumulator initialization
+     * @param iter          custom element iterator
+     */
+    public IteratorAction(final Object self, final Object callbackfn, final Object thisArg, final T initialResult, final ArrayLikeIterator<Object> iter) {
+        this.self       = self;
+        this.callbackfn = callbackfn;
+        this.result     = initialResult;
+        this.iter       = iter;
+        this.thisArg    = thisArg;
+    }
+
+    /**
+     * An action to be performed once at the start of the apply loop
+     * @param iterator array element iterator
+     */
+    protected void applyLoopBegin(final ArrayLikeIterator<Object> iterator) {
+        //empty
+    }
+
+    /**
+     * Apply action main loop.
+     * @return result of apply
+     */
+    public final T apply() {
+        if (!(callbackfn instanceof ScriptFunction)) {
+            typeError(Context.getGlobal(), "not.a.function", ScriptRuntime.safeToString(callbackfn));
+            return result;
+        }
+        final ScriptFunction func = ((ScriptFunction)callbackfn);
+        // for non-strict callback, need to translate undefined thisArg to be global object
+        thisArg = (thisArg == ScriptRuntime.UNDEFINED && !func.isStrict()) ? Context.getGlobal() : thisArg;
+
+        applyLoopBegin(iter);
+        final boolean reverse = iter.isReverse();
+        while (iter.hasNext()) {
+
+            final Object val = iter.next();
+            index = iter.nextIndex() + (reverse ? 1 : -1);
+
+            try {
+                if (!forEach(val, index)) {
+                    return result;
+                }
+            } catch (final RuntimeException | Error e) {
+                throw e;
+            } catch (final Throwable t) {
+                throw new RuntimeException(t);
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * For each callback
+     *
+     * @param val value
+     * @param i   position of value
+     *
+     * @return true if callback invocation return true
+     *
+     * @throws Throwable if invocation throws an exception/error
+     */
+    protected abstract boolean forEach(final Object val, final int i) throws Throwable;
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/LongArrayData.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/LongArrayData.java
new file mode 100644
index 00000000000..1a59f85858e
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/LongArrayData.java
@@ -0,0 +1,236 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.arrays;
+
+import java.util.Arrays;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
+
+/**
+ * Implementation of {@link ArrayData} as soon as a long has been
+ * written to the array
+ */
+final class LongArrayData extends ArrayData {
+    /**
+     * The wrapped array
+     */
+    private long[] array;
+
+    /**
+     * Constructor
+     * @param array an int array
+     * @param length a length, not necessarily array.length
+     */
+    LongArrayData(final long array[], final int length) {
+        super(length);
+        this.array  = array;
+    }
+
+    @Override
+    public Object[] asObjectArray() {
+        return toObjectArray(array, (int) length());
+    }
+
+    private static Object[] toObjectArray(final long[] array, final int length) {
+        final Object[] oarray = new Object[length];
+        for (int index = 0; index < length; index++) {
+            oarray[index] = Long.valueOf(array[index]);
+        }
+
+        return oarray;
+    }
+
+    @Override
+    public Object asArrayOfType(final Class<?> componentType) {
+        if(componentType == long.class) {
+            return array.length == length() ? array.clone() : Arrays.copyOf(array, (int) length());
+        }
+        return super.asArrayOfType(componentType);
+    }
+
+    private static double[] toDoubleArray(final long[] array) {
+        final double[] darray = new double[array.length];
+        for (int index = 0; index < array.length; index++) {
+            darray[index] = array[index];
+        }
+
+        return darray;
+    }
+
+    @Override
+    public ArrayData convert(final Class<?> type) {
+        if (type == Long.class) {
+            return this;
+        } else if (type == Double.class) {
+            return new NumberArrayData(LongArrayData.toDoubleArray(array), (int) length());
+        } else {
+            return new ObjectArrayData(LongArrayData.toObjectArray(array, array.length), (int) length());
+        }
+    }
+
+    @Override
+    public void shiftLeft(final int by) {
+        System.arraycopy(array, by, array, 0, array.length - by);
+    }
+
+    @Override
+    public ArrayData shiftRight(final int by) {
+        final ArrayData newData = ensure(by + length() - 1);
+        if (newData != this) {
+            newData.shiftRight(by);
+            return newData;
+        }
+        System.arraycopy(array, 0, array, by, array.length - by);
+
+        return this;
+    }
+
+    @Override
+    public ArrayData ensure(final long safeIndex) {
+        if (safeIndex >= SparseArrayData.MAX_DENSE_LENGTH && safeIndex >= array.length) {
+            return new SparseArrayData(this, safeIndex + 1);
+        }
+
+        int newLength = array.length;
+
+        while (newLength <= safeIndex) {
+            newLength = ArrayData.nextSize(newLength);
+        }
+
+        if (array.length <= safeIndex) {
+            array = Arrays.copyOf(array, newLength);
+        }
+
+        setLength(safeIndex + 1);
+
+        return this;
+    }
+
+    @Override
+    public ArrayData shrink(final long newLength) {
+        Arrays.fill(array, (int) newLength, array.length, 0);
+
+        return this;
+    }
+
+    @Override
+    public ArrayData set(final int index, final Object value, final boolean strict) {
+        try {
+            final long longValue = ((Long)value).longValue();
+            array[index] = longValue;
+            setLength(Math.max(index + 1, length()));
+            return this;
+        } catch (final NullPointerException | ClassCastException e) {
+            if (value == ScriptRuntime.UNDEFINED) {
+                return new UndefinedArrayFilter(this).set(index, value, strict);
+            }
+        }
+
+        final ArrayData newData = convert(value == null ? Object.class : value.getClass());
+
+        return newData.set(index, value, strict);
+    }
+
+    @Override
+    public ArrayData set(final int index, final int value, final boolean strict) {
+        array[index] = value;
+        setLength(Math.max(index + 1, length()));
+        return this;
+    }
+
+    @Override
+    public ArrayData set(final int index, final long value, final boolean strict) {
+        array[index] = value;
+        setLength(Math.max(index + 1, length()));
+        return this;
+    }
+
+    @Override
+    public ArrayData set(final int index, final double value, final boolean strict) {
+        if (JSType.isRepresentableAsLong(value)) {
+            array[index] = (long)value;
+            setLength(Math.max(index + 1, length()));
+            return this;
+        }
+        return convert(Double.class).set(index, value, strict);
+    }
+
+    @Override
+    public int getInt(final int index) {
+        return (int)array[index];
+    }
+
+    @Override
+    public long getLong(final int index) {
+        return array[index];
+    }
+
+    @Override
+    public double getDouble(final int index) {
+        return array[index];
+    }
+
+    @Override
+    public Object getObject(final int index) {
+        return array[index];
+    }
+
+    @Override
+    public boolean has(final int index) {
+        return 0 <= index && index < length();
+    }
+
+    @Override
+    public ArrayData delete(final int index) {
+        return new DeletedRangeArrayFilter(this, index, index);
+    }
+
+    @Override
+    public ArrayData delete(final long fromIndex, final long toIndex) {
+        return new DeletedRangeArrayFilter(this, fromIndex, toIndex);
+    }
+
+    @Override
+    public Object pop() {
+        if (length() == 0) {
+            return ScriptRuntime.UNDEFINED;
+        }
+
+        final int newLength = (int) (length() - 1);
+        final long elem = array[newLength];
+        array[newLength] = 0;
+        setLength(newLength);
+
+        return elem;
+    }
+
+    @Override
+    public ArrayData slice(final long from, final long to) {
+        final long start     = from < 0 ? (from + length()) : from;
+        final long newLength = to - start;
+        return new LongArrayData(Arrays.copyOfRange(array, (int)from, (int)to), (int)newLength);
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/MapIterator.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/MapIterator.java
new file mode 100644
index 00000000000..4e5f279de66
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/MapIterator.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.arrays;
+
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.ScriptObject;
+
+/**
+ * Iterator over a map
+ */
+class MapIterator extends ArrayLikeIterator<Object> {
+
+    protected final ScriptObject obj;
+    private final long length;
+
+    MapIterator(final ScriptObject obj, final boolean includeUndefined) {
+        super(includeUndefined);
+        this.obj    = obj;
+        this.length = JSType.toUint32(obj.getLength());
+        this.index  = 0;
+    }
+
+    protected boolean indexInArray() {
+        return index < length;
+    }
+
+    @Override
+    public int getLength() {
+        return (int) length;
+    }
+
+    @Override
+    public boolean hasNext() {
+        if (length == 0L) {
+            return false; //return empty string if toUint32(length) == 0
+        }
+
+        while (indexInArray()) {
+            if (obj.has(index) || includeUndefined) {
+                break;
+            }
+            bumpIndex();
+        }
+
+        // special case - balk at iterating to infinity or MAX_UINT
+        return (length != JSType.MAX_UINT) && indexInArray();
+    }
+
+    @Override
+    public Object next() {
+        return indexInArray() ? obj.get(bumpIndex()) : null;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/NoTypeArrayData.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/NoTypeArrayData.java
new file mode 100644
index 00000000000..e495ea5e298
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/NoTypeArrayData.java
@@ -0,0 +1,181 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.arrays;
+
+import java.lang.reflect.Array;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
+
+/**
+ * Place holding array data for non-array objects.  Activates a true array when
+ * accessed.  Should only exist as a singleton defined in ArrayData.
+ */
+final class NoTypeArrayData extends ArrayData {
+    NoTypeArrayData() {
+        super(0);
+    }
+
+    NoTypeArrayData(final long length) {
+         super(length);
+    }
+
+    @Override
+    public Object[] asObjectArray() {
+        return new Object[0];
+    }
+
+    @Override
+    public Object asArrayOfType(final Class<?> componentType) {
+        return Array.newInstance(componentType, 0);
+    }
+
+    @Override
+    public ArrayData convert(final Class<?> type) {
+        final long length = length();
+        final ArrayData arrayData;
+        if (type == Long.class) {
+            arrayData = new LongArrayData(new long[ArrayData.nextSize((int)length)], (int)length);
+        } else if (type == Double.class) {
+            arrayData = new NumberArrayData(new double[ArrayData.nextSize((int)length)], (int)length);
+        } else if (type == Integer.class) {
+            arrayData = new IntArrayData(new int[ArrayData.nextSize((int)length)], (int)length);
+        } else {
+            assert !type.isPrimitive();
+            arrayData = new ObjectArrayData(new Object[ArrayData.nextSize((int)length)], (int)length);
+        }
+        return length == 0 ? arrayData : new DeletedRangeArrayFilter(arrayData, 0, length - 1);
+    }
+
+    @Override
+    public void shiftLeft(final int by) {
+        //empty
+    }
+
+    @Override
+    public ArrayData shiftRight(final int by) {
+        return this;
+    }
+
+    @Override
+    public ArrayData ensure(final long safeIndex) {
+        if (safeIndex >= SparseArrayData.MAX_DENSE_LENGTH) {
+            return new SparseArrayData(this, safeIndex + 1);
+        }
+
+        // Don't trample the shared EMPTY_ARRAY.
+        if (length() == 0) {
+            return new NoTypeArrayData(Math.max(safeIndex + 1, length()));
+        }
+
+        setLength(Math.max(safeIndex + 1, length()));
+        return this;
+    }
+
+    @Override
+    public ArrayData shrink(final long newLength) {
+        return this;
+    }
+
+    @Override
+    public ArrayData set(final int index, final Object value, final boolean strict) {
+        ArrayData newData;
+
+        if (value instanceof Double) {
+            newData = convert(Double.class);
+        } else if (value instanceof Long) {
+            newData = convert(Long.class);
+        } else if (value instanceof Integer) {
+            newData = convert(Integer.class);
+        } else {
+            assert !(value instanceof Number);
+            newData = convert(value == null ? Object.class : value.getClass());
+        }
+
+        return newData.set(index, value, strict);
+    }
+
+    @Override
+    public ArrayData set(final int index, final int value, final boolean strict) {
+        final ArrayData newData = convert(Integer.class);
+        return newData.set(index, value, strict);
+    }
+
+    @Override
+    public ArrayData set(final int index, final long value, final boolean strict) {
+        final ArrayData newData = convert(Long.class);
+        return newData.set(index, value, strict);
+    }
+
+    @Override
+    public ArrayData set(final int index, final double value, final boolean strict) {
+        final ArrayData newData = convert(Double.class);
+        return newData.set(index, value, strict);
+    }
+
+    @Override
+    public int getInt(final int index) {
+        throw new ArrayIndexOutOfBoundsException(index);
+    }
+
+    @Override
+    public long getLong(final int index) {
+        throw new ArrayIndexOutOfBoundsException(index);
+    }
+
+    @Override
+    public double getDouble(final int index) {
+        throw new ArrayIndexOutOfBoundsException(index);
+    }
+
+    @Override
+    public Object getObject(final int index) {
+        throw new ArrayIndexOutOfBoundsException(index);
+    }
+
+    @Override
+    public boolean has(final int index) {
+        return false;
+    }
+
+    @Override
+    public ArrayData delete(final int index) {
+        return new DeletedRangeArrayFilter(this, index, index);
+    }
+
+    @Override
+    public ArrayData delete(final long fromIndex, final long toIndex) {
+        return new DeletedRangeArrayFilter(this, fromIndex, toIndex);
+    }
+
+    @Override
+    public Object pop() {
+        return ScriptRuntime.UNDEFINED;
+    }
+
+    @Override
+    public ArrayData slice(final long from, final long to) {
+        return this;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/NumberArrayData.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/NumberArrayData.java
new file mode 100644
index 00000000000..776600a9c4a
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/NumberArrayData.java
@@ -0,0 +1,219 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.arrays;
+
+import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+
+import java.util.Arrays;
+
+/**
+ * Implementation of {@link ArrayData} as soon as a double has been
+ * written to the array
+ */
+final class NumberArrayData extends ArrayData {
+    /**
+     * The wrapped array
+     */
+    private double[] array;
+
+    /**
+     * Constructor
+     * @param array an int array
+     * @param length a length, not necessarily array.length
+     */
+    NumberArrayData(final double array[], final int length) {
+        super(length);
+        this.array  = array;
+        if (array.length > length) {
+            Arrays.fill(array, length, array.length, 0.0);
+        }
+    }
+
+    @Override
+    public Object[] asObjectArray() {
+        return toObjectArray(array, (int) length());
+    }
+
+    private static Object[] toObjectArray(final double[] array, final int length) {
+        final Object[] oarray = new Object[length];
+        for (int index = 0; index < length; index++) {
+            oarray[index] = Double.valueOf(array[index]);
+        }
+        return oarray;
+    }
+
+    @Override
+    public Object asArrayOfType(final Class<?> componentType) {
+        if(componentType == double.class) {
+            return array.length == length() ? array.clone() : Arrays.copyOf(array, (int) length());
+        }
+        return super.asArrayOfType(componentType);
+    }
+
+    @Override
+    public ArrayData convert(final Class<?> type) {
+        if (type != Double.class && type != Integer.class && type != Long.class) {
+            return new ObjectArrayData(NumberArrayData.toObjectArray(array, array.length), (int) length());
+        }
+        return this;
+    }
+
+    @Override
+    public void shiftLeft(final int by) {
+        System.arraycopy(array, by, array, 0, array.length - by);
+    }
+
+    @Override
+    public ArrayData shiftRight(final int by) {
+        final ArrayData newData = ensure(by + length() - 1);
+        if (newData != this) {
+            newData.shiftRight(by);
+            return newData;
+        }
+        System.arraycopy(array, 0, array, by, array.length - by);
+        return this;
+    }
+
+    @Override
+    public ArrayData ensure(final long safeIndex) {
+        if (safeIndex >= SparseArrayData.MAX_DENSE_LENGTH && safeIndex >= array.length) {
+            return new SparseArrayData(this, safeIndex + 1);
+        }
+
+        int newLength = array.length;
+
+        while (newLength <= safeIndex) {
+            newLength = ArrayData.nextSize(newLength);
+        }
+
+        if (array.length <= safeIndex) {
+            array = Arrays.copyOf(array, newLength);
+            Arrays.fill(array, (int) length(), newLength, Double.NaN);
+        }
+
+        setLength(safeIndex + 1);
+
+        return this;
+    }
+
+    @Override
+    public ArrayData shrink(final long newLength) {
+        Arrays.fill(array, (int) newLength, array.length, 0.0);
+        return this;
+    }
+
+    @Override
+    public ArrayData set(final int index, final Object value, final boolean strict) {
+        try {
+            final double doubleValue = ((Number)value).doubleValue();
+            array[index] = doubleValue;
+            setLength(Math.max(index + 1, length()));
+            return this;
+        } catch (final NullPointerException | ClassCastException e) {
+            if (value == UNDEFINED) {
+                return new UndefinedArrayFilter(this).set(index, value, strict);
+            }
+        }
+        final ArrayData newData = convert(value == null ? Object.class : value.getClass());
+        return newData.set(index, value, strict);
+    }
+
+    @Override
+    public ArrayData set(final int index, final int value, final boolean strict) {
+        array[index] = value;
+        setLength(Math.max(index + 1, length()));
+        return this;
+    }
+
+    @Override
+    public ArrayData set(final int index, final long value, final boolean strict) {
+        array[index] = value;
+        setLength(Math.max(index + 1, length()));
+        return this;
+    }
+
+    @Override
+    public ArrayData set(final int index, final double value, final boolean strict) {
+        array[index] = value;
+        setLength(Math.max(index + 1, length()));
+        return this;
+    }
+
+    @Override
+    public int getInt(final int index) {
+        return (int)array[index];
+    }
+
+    @Override
+    public long getLong(final int index) {
+        return (long)array[index];
+    }
+
+    @Override
+    public double getDouble(final int index) {
+        return array[index];
+    }
+
+    @Override
+    public Object getObject(final int index) {
+        return array[index];
+    }
+
+    @Override
+    public boolean has(final int index) {
+        return 0 <= index && index < length();
+    }
+
+    @Override
+    public ArrayData delete(final int index) {
+        return new DeletedRangeArrayFilter(this, index, index);
+    }
+
+    @Override
+    public ArrayData delete(final long fromIndex, final long toIndex) {
+        return new DeletedRangeArrayFilter(this, fromIndex, toIndex);
+    }
+
+    @Override
+    public Object pop() {
+        if (length() == 0) {
+            return UNDEFINED;
+        }
+
+        final int newLength = (int) (length() - 1);
+        final double elem = array[newLength];
+        array[newLength] = 0;
+        setLength(newLength);
+        return elem;
+    }
+
+    @Override
+    public ArrayData slice(final long from, final long to) {
+        final long start     = from < 0 ? (from + length()) : from;
+        final long newLength = to - start;
+        return new NumberArrayData(Arrays.copyOfRange(array, (int)from, (int)to), (int)newLength);
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ObjectArrayData.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ObjectArrayData.java
new file mode 100644
index 00000000000..5d156ed162c
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ObjectArrayData.java
@@ -0,0 +1,195 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.arrays;
+
+import java.util.Arrays;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
+
+/**
+ * Implementation of {@link ArrayData} as soon as an Object has been
+ * written to the array
+ */
+final class ObjectArrayData extends ArrayData {
+
+    /**
+     * The wrapped array
+     */
+    private Object[] array;
+
+    /**
+     * Constructor
+     * @param array an int array
+     * @param length a length, not necessarily array.length
+     */
+    ObjectArrayData(final Object array[], final int length) {
+        super(length);
+        this.array  = array;
+        if (array.length > length) {
+            Arrays.fill(array, length, array.length, ScriptRuntime.UNDEFINED);
+        }
+    }
+
+    @Override
+    public Object[] asObjectArray() {
+        return Arrays.copyOf(array, (int) length());
+    }
+
+    @Override
+    public ArrayData convert(final Class<?> type) {
+        return this;
+    }
+
+    @Override
+    public void shiftLeft(final int by) {
+        System.arraycopy(array, by, array, 0, array.length - by);
+    }
+
+    @Override
+    public ArrayData shiftRight(final int by) {
+        final ArrayData newData = ensure(by + length() - 1);
+        if (newData != this) {
+            newData.shiftRight(by);
+            return newData;
+        }
+        System.arraycopy(array, 0, array, by, array.length - by);
+        return this;
+    }
+
+    @Override
+    public ArrayData ensure(final long safeIndex) {
+        if (safeIndex >= SparseArrayData.MAX_DENSE_LENGTH && safeIndex >= array.length) {
+            return new SparseArrayData(this, safeIndex + 1);
+        }
+
+        int newLength = array.length;
+
+        while (newLength <= safeIndex) {
+            newLength = ArrayData.nextSize(newLength);
+        }
+
+        if (array.length <= safeIndex) {
+            array = Arrays.copyOf(array, newLength);
+            Arrays.fill(array, (int) length(), newLength, ScriptRuntime.UNDEFINED);
+        }
+
+        setLength(safeIndex + 1);
+
+        return this;
+    }
+
+    @Override
+    public ArrayData shrink(final long newLength) {
+        Arrays.fill(array, (int) newLength, array.length, ScriptRuntime.UNDEFINED);
+        return this;
+    }
+
+    @Override
+    public ArrayData set(final int index, final Object value, final boolean strict) {
+        if (value == ScriptRuntime.UNDEFINED) {
+            return new UndefinedArrayFilter(this).set(index, value, strict);
+        }
+        array[index] = value;
+        setLength(Math.max(index + 1, length()));
+        return this;
+    }
+
+    @Override
+    public ArrayData set(final int index, final int value, final boolean strict) {
+        array[index] = value;
+        setLength(Math.max(index + 1, length()));
+        return this;
+    }
+
+    @Override
+    public ArrayData set(final int index, final long value, final boolean strict) {
+        array[index] = value;
+        setLength(Math.max(index + 1, length()));
+        return this;
+    }
+
+    @Override
+    public ArrayData set(final int index, final double value, final boolean strict) {
+        array[index] = value;
+        setLength(Math.max(index + 1, length()));
+        return this;
+    }
+
+    @Override
+    public int getInt(final int index) {
+        return JSType.toInt32(array[index]);
+    }
+
+    @Override
+    public long getLong(final int index) {
+        return JSType.toLong(array[index]);
+    }
+
+    @Override
+    public double getDouble(final int index) {
+        return JSType.toNumber(array[index]);
+    }
+
+    @Override
+    public Object getObject(final int index) {
+        return array[index];
+    }
+
+    @Override
+    public boolean has(final int index) {
+        return 0 <= index && index < length();
+    }
+
+    @Override
+    public ArrayData delete(final int index) {
+        return new DeletedRangeArrayFilter(this, index, index);
+    }
+
+    @Override
+    public ArrayData delete(final long fromIndex, final long toIndex) {
+        return new DeletedRangeArrayFilter(this, fromIndex, toIndex);
+    }
+
+    @Override
+    public Object pop() {
+        if (length() == 0) {
+            return ScriptRuntime.UNDEFINED;
+        }
+
+        final int newLength = (int) (length() - 1);
+        final Object elem = array[newLength];
+        array[newLength] = 0;
+        setLength(newLength);
+        return elem;
+    }
+
+    @Override
+    public ArrayData slice(final long from, final long to) {
+        final long start     = from < 0 ? (from + length()) : from;
+        final long newLength = to - start;
+        return new ObjectArrayData(Arrays.copyOfRange(array, (int)from, (int)to), (int)newLength);
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseArrayIterator.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseArrayIterator.java
new file mode 100644
index 00000000000..01c99ef0f47
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseArrayIterator.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.arrays;
+
+import jdk.nashorn.internal.runtime.ScriptObject;
+
+/**
+ * Reverse iterator over a NativeArray
+ */
+public final class ReverseArrayIterator extends ArrayIterator {
+
+    /**
+     * Constructor
+     * @param array array to iterate over
+     * @param includeUndefined should undefined elements be included in iteration
+     */
+    public ReverseArrayIterator(final ScriptObject array, final boolean includeUndefined) {
+        super(array, includeUndefined);
+        this.index = (int) (array.getArray().length() - 1);
+    }
+
+    @Override
+    public boolean isReverse() {
+        return true;
+    }
+
+    @Override
+    protected boolean indexInArray() {
+        return index >= 0;
+    }
+
+    @Override
+    protected int bumpIndex() {
+        return index--;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseMapIterator.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseMapIterator.java
new file mode 100644
index 00000000000..ab56e5578c9
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseMapIterator.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.arrays;
+
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.ScriptObject;
+
+/**
+ * Reverse iterator over a map
+ */
+final class ReverseMapIterator extends MapIterator {
+
+    ReverseMapIterator(final ScriptObject obj, final boolean includeUndefined) {
+        super(obj, includeUndefined);
+        this.index = JSType.toInt32(obj.getLength()) - 1;
+    }
+
+    @Override
+    public boolean isReverse() {
+        return true;
+    }
+
+    @Override
+    protected boolean indexInArray() {
+        return index >= 0;
+    }
+
+    @Override
+    protected int bumpIndex() {
+        return index--;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/SealedArrayFilter.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/SealedArrayFilter.java
new file mode 100644
index 00000000000..60da2d990d0
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/SealedArrayFilter.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.arrays;
+
+import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+
+import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.runtime.GlobalObject;
+import jdk.nashorn.internal.runtime.PropertyDescriptor;
+
+/**
+ * ArrayData after the array has been sealed by Object.seal call.
+ */
+class SealedArrayFilter extends ArrayFilter {
+    SealedArrayFilter(final ArrayData underlying) {
+        super(underlying);
+    }
+
+    @Override
+    public ArrayData slice(final long from, final long to) {
+        return getUnderlying().slice(from, to);
+    }
+
+    @Override
+    public boolean canDelete(final int index, final boolean strict) {
+        if (strict) {
+            typeError(Context.getGlobal(), "cant.delete.property", Integer.toString(index), "sealed array");
+        }
+        return false;
+    }
+
+    @Override
+    public boolean canDelete(final long fromIndex, final long toIndex, final boolean strict) {
+        return canDelete((int) fromIndex, strict);
+    }
+
+    @Override
+    public PropertyDescriptor getDescriptor(final GlobalObject global, final int index) {
+        return global.newDataDescriptor(getObject(index), false, true, true);
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/SparseArrayData.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/SparseArrayData.java
new file mode 100644
index 00000000000..b8fb30c8264
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/SparseArrayData.java
@@ -0,0 +1,336 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.arrays;
+
+import java.util.Arrays;
+import java.util.Map;
+import java.util.TreeMap;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
+
+/**
+ * Handle arrays where the index is very large.
+ */
+class SparseArrayData extends ArrayData {
+    static final long MAX_DENSE_LENGTH = 512 * 1024;
+
+    /** Underlying array. */
+    private ArrayData underlying;
+
+    /** Maximum length to be stored in the array. */
+
+    private final long maxDenseLength;
+
+    /** Sparse elements. */
+    private TreeMap<Long, Object> sparseMap = new TreeMap<>();
+
+    SparseArrayData(final ArrayData underlying) {
+        super(underlying.length());
+        this.underlying = underlying;
+        this.maxDenseLength = Math.max(MAX_DENSE_LENGTH, underlying.length());
+    }
+
+    SparseArrayData(final ArrayData array, final long length) {
+        this(array);
+        assert array.length() <= length;
+        super.setLength(length);
+    }
+
+    @Override
+    public Object[] asObjectArray() {
+        final Object[] objArray = new Object[Math.min((int) length(), Integer.MAX_VALUE)];
+
+        for (int i = 0; i < underlying.length(); i++) {
+            objArray[i] = underlying.getObject(i);
+        }
+
+        Arrays.fill(objArray, (int) underlying.length(), objArray.length, ScriptRuntime.UNDEFINED);
+
+        for (final Map.Entry<Long, Object> entry : sparseMap.entrySet()) {
+            final long key = entry.getKey();
+            if (key <= Integer.MAX_VALUE) {
+                objArray[(int)key] = entry.getValue();
+            } else {
+                break; // ascending key order
+            }
+        }
+
+        return objArray;
+    }
+
+    @Override
+    public void shiftLeft(final int by) {
+        underlying.shiftLeft(by);
+
+        final TreeMap<Long, Object> newSparseMap = new TreeMap<>();
+
+        for (final Map.Entry<Long, Object> entry : sparseMap.entrySet()) {
+            final long newIndex = entry.getKey().longValue() - by;
+            if (newIndex < maxDenseLength) {
+                underlying = underlying.set((int) newIndex, entry.getValue(), false);
+            } else if (newIndex >= 0) {
+                newSparseMap.put(Long.valueOf(newIndex), entry.getValue());
+            }
+        }
+
+        sparseMap = newSparseMap;
+        setLength(Math.max(length() - by, 0));
+    }
+
+    @Override
+    public ArrayData shiftRight(final int by) {
+        final TreeMap<Long, Object> newSparseMap = new TreeMap<>();
+        if (underlying.length() + by > maxDenseLength) {
+            for (long i = maxDenseLength - by; i < underlying.length(); i++) {
+                if (underlying.has((int) i)) {
+                    newSparseMap.put(Long.valueOf(i + by), underlying.getObject((int) i));
+                }
+            }
+            underlying = underlying.shrink((int) (maxDenseLength - by));
+        }
+
+        underlying.shiftRight(by);
+
+        for (final Map.Entry<Long, Object> entry : sparseMap.entrySet()) {
+            final long newIndex = entry.getKey().longValue() + by;
+            newSparseMap.put(Long.valueOf(newIndex), entry.getValue());
+        }
+
+        sparseMap = newSparseMap;
+        setLength(length() + by);
+
+        return this;
+    }
+
+    @Override
+    public ArrayData ensure(final long safeIndex) {
+        if (safeIndex < maxDenseLength && underlying.length() <= safeIndex) {
+            underlying = underlying.ensure(safeIndex);
+        }
+        setLength(Math.max(safeIndex + 1, length()));
+        return this;
+    }
+
+    @Override
+    public ArrayData shrink(final long newLength) {
+        if (newLength < underlying.length()) {
+            underlying = underlying.shrink(newLength);
+            underlying.setLength(newLength);
+            sparseMap.clear();
+            setLength(newLength);
+        }
+
+        sparseMap.subMap(Long.valueOf(newLength), Long.MAX_VALUE).clear();
+        setLength(newLength);
+        return this;
+    }
+
+    @Override
+    public ArrayData set(final int index, final Object value, final boolean strict) {
+        if (index >= 0 && index < maxDenseLength) {
+            ensure(index);
+            underlying = underlying.set(index, value, strict);
+            setLength(Math.max(underlying.length(), length()));
+        } else {
+            sparseMap.put(indexToKey(index), value);
+            setLength(Math.max(index + 1, length()));
+        }
+
+        return this;
+    }
+
+    @Override
+    public ArrayData set(final int index, final int value, final boolean strict) {
+        if (index >= 0 && index < maxDenseLength) {
+            ensure(index);
+            underlying = underlying.set(index, value, strict);
+            setLength(Math.max(underlying.length(), length()));
+        } else {
+            sparseMap.put(indexToKey(index), value);
+            setLength(Math.max(index + 1, length()));
+        }
+        return this;
+    }
+
+    @Override
+    public ArrayData set(final int index, final long value, final boolean strict) {
+        if (index >= 0 && index < maxDenseLength) {
+            ensure(index);
+            underlying = underlying.set(index, value, strict);
+            setLength(Math.max(underlying.length(), length()));
+        } else {
+            sparseMap.put(indexToKey(index), value);
+            setLength(Math.max(index + 1, length()));
+        }
+        return this;
+    }
+
+    @Override
+    public ArrayData set(final int index, final double value, final boolean strict) {
+        if (index >= 0 && index < maxDenseLength) {
+            ensure(index);
+            underlying = underlying.set(index, value, strict);
+            setLength(Math.max(underlying.length(), length()));
+        } else {
+            sparseMap.put(indexToKey(index), value);
+            setLength(Math.max(index + 1, length()));
+        }
+        return this;
+    }
+
+    @Override
+    public int getInt(final int index) {
+        if (index >= 0 && index < maxDenseLength) {
+            return underlying.getInt(index);
+        }
+        return JSType.toInt32(sparseMap.get(indexToKey(index)));
+    }
+
+    @Override
+    public long getLong(final int index) {
+        if (index >= 0 && index < maxDenseLength) {
+            return underlying.getLong(index);
+        }
+        return JSType.toLong(sparseMap.get(indexToKey(index)));
+    }
+
+    @Override
+    public double getDouble(final int index) {
+        if (index >= 0 && index < maxDenseLength) {
+            return underlying.getDouble(index);
+        }
+        return JSType.toNumber(sparseMap.get(indexToKey(index)));
+    }
+
+    @Override
+    public Object getObject(final int index) {
+        if (index >= 0 && index < maxDenseLength) {
+            return underlying.getObject(index);
+        }
+
+        final Long key = indexToKey(index);
+        if (sparseMap.containsKey(key)) {
+            return sparseMap.get(key);
+        }
+
+        return ScriptRuntime.UNDEFINED;
+    }
+
+    @Override
+    public boolean has(final int index) {
+        if (index >= 0 && index < maxDenseLength) {
+            return index < underlying.length() && underlying.has(index);
+        }
+
+        return sparseMap.containsKey(indexToKey(index));
+    }
+
+    @Override
+    public ArrayData delete(final int index) {
+        if (index >= 0 && index < maxDenseLength) {
+            if (index < underlying.length()) {
+                underlying = underlying.delete(index);
+            }
+        } else {
+            sparseMap.remove(indexToKey(index));
+        }
+
+        return this;
+    }
+
+    @Override
+    public ArrayData delete(final long fromIndex, final long toIndex) {
+        if (fromIndex < maxDenseLength && fromIndex < underlying.length()) {
+            underlying = underlying.delete(fromIndex, Math.min(toIndex, underlying.length() - 1));
+        }
+        if (toIndex >= maxDenseLength) {
+            sparseMap.subMap(fromIndex, true, toIndex, true).clear();
+        }
+        return this;
+    }
+
+    private static Long indexToKey(final int index) {
+        return Long.valueOf(index & 0xffff_ffffL);
+    }
+
+    @Override
+    protected ArrayData convert(final Class<?> type) {
+        underlying = underlying.convert(type);
+        return this;
+    }
+
+    @Override
+    public Object pop() {
+        if (length() == 0) {
+            return ScriptRuntime.UNDEFINED;
+        }
+        if (length() == underlying.length()) {
+            final Object result = underlying.pop();
+            setLength(underlying.length());
+            return result;
+        }
+        setLength(length() - 1);
+        final Long key = Long.valueOf(length());
+        return sparseMap.containsKey(key) ? sparseMap.remove(key) : ScriptRuntime.UNDEFINED;
+    }
+
+    @Override
+    public ArrayData slice(final long from, final long to) {
+        assert to <= length();
+        final long start = from < 0 ? (from + length()) : from;
+        final long newLength = to - start;
+
+        if (start >= 0 && to <= maxDenseLength) {
+            if (newLength <= underlying.length()) {
+                return underlying.slice(from, to);
+            }
+            return underlying.slice(from, to).ensure(newLength - 1).delete(underlying.length(), newLength);
+        }
+
+        ArrayData sliced = EMPTY_ARRAY;
+        sliced = sliced.ensure(newLength - 1);
+        for (long i = start; i < to; i = nextIndex(i)) {
+            if (has((int)i)) {
+                sliced = sliced.set((int)(i - start), getObject((int)i), false);
+            }
+        }
+        assert sliced.length() == newLength;
+        return sliced;
+    }
+
+    @Override
+    public long nextIndex(final long index) {
+        if (index < underlying.length() - 1) {
+            return underlying.nextIndex(index);
+        }
+
+        final Long nextKey = sparseMap.higherKey(index);
+        if (nextKey != null) {
+            return nextKey;
+        }
+        return length();
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/UndefinedArrayFilter.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/UndefinedArrayFilter.java
new file mode 100644
index 00000000000..a3671070636
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/UndefinedArrayFilter.java
@@ -0,0 +1,210 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.arrays;
+
+import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+
+import java.lang.reflect.Array;
+import jdk.nashorn.internal.runtime.BitVector;
+
+/**
+ * This filter handles the presence of undefined array elements.
+ */
+final class UndefinedArrayFilter extends ArrayFilter {
+    /** Bit vector tracking undefines. */
+    private final BitVector undefined;
+
+    UndefinedArrayFilter(final ArrayData underlying) {
+        super(underlying);
+
+        this.undefined = new BitVector(underlying.length());
+    }
+
+    @Override
+    public Object[] asObjectArray() {
+        final Object[] value = super.asObjectArray();
+
+        for (int i = 0; i < value.length; i++) {
+            if (undefined.isSet(i)) {
+                value[i] = UNDEFINED;
+            }
+        }
+
+        return value;
+    }
+
+    @Override
+    public Object asArrayOfType(final Class<?> componentType) {
+        final Object value = super.asArrayOfType(componentType);
+        final Object undefValue = convertUndefinedValue(componentType);
+        final int l = Array.getLength(value);
+        for (int i = 0; i < l; i++) {
+            if (undefined.isSet(i)) {
+                Array.set(value, i,undefValue);
+            }
+        }
+
+        return value;
+    }
+
+    @Override
+    public void shiftLeft(final int by) {
+        super.shiftLeft(by);
+        undefined.shiftLeft(by, length());
+    }
+
+    @Override
+    public ArrayData shiftRight(final int by) {
+        super.shiftRight(by);
+        undefined.shiftRight(by, length());
+
+        return this;
+    }
+
+    @Override
+    public ArrayData ensure(final long safeIndex) {
+        if (safeIndex >= SparseArrayData.MAX_DENSE_LENGTH && safeIndex >= length()) {
+            return new SparseArrayData(this, safeIndex + 1);
+        }
+
+        super.ensure(safeIndex);
+        undefined.resize(length());
+
+        return this;
+    }
+
+    @Override
+    public ArrayData shrink(final long newLength) {
+        super.shrink(newLength);
+        undefined.resize(length());
+
+        return this;
+    }
+
+    @Override
+    public ArrayData set(final int index, final Object value, final boolean strict) {
+        undefined.clear(index);
+
+        if (value == UNDEFINED) {
+            undefined.set(index);
+            return this;
+        }
+
+        return super.set(index, value, strict);
+    }
+
+    @Override
+    public ArrayData set(final int index, final int value, final boolean strict) {
+        undefined.clear(index);
+
+        return super.set(index, value, strict);
+    }
+
+    @Override
+    public ArrayData set(final int index, final long value, final boolean strict) {
+        undefined.clear(index);
+
+        return super.set(index, value, strict);
+    }
+
+    @Override
+    public ArrayData set(final int index, final double value, final boolean strict) {
+        undefined.clear(index);
+
+        return super.set(index, value, strict);
+    }
+
+    @Override
+    public int getInt(final int index) {
+        if (undefined.isSet(index)) {
+            return 0;
+        }
+
+        return super.getInt(index);
+    }
+
+    @Override
+    public long getLong(final int index) {
+        if (undefined.isSet(index)) {
+            return 0L;
+        }
+
+        return super.getLong(index);
+    }
+
+    @Override
+    public double getDouble(final int index) {
+        if (undefined.isSet(index)) {
+            return Double.NaN;
+        }
+
+        return super.getDouble(index);
+    }
+
+    @Override
+    public Object getObject(final int index) {
+        if (undefined.isSet(index)) {
+            return UNDEFINED;
+        }
+
+        return super.getObject(index);
+    }
+
+    @Override
+    public ArrayData delete(final int index) {
+        undefined.clear(index);
+
+        return super.delete(index);
+    }
+
+    @Override
+    public Object pop() {
+        final long index = length() - 1;
+
+        if (super.has((int)index)) {
+            final boolean isUndefined = undefined.isSet(index);
+            final Object value = super.pop();
+
+            return isUndefined ? UNDEFINED : value;
+        }
+
+        return super.pop();
+    }
+
+    @Override
+    public ArrayData slice(final long from, final long to) {
+        final ArrayData newArray = underlying.slice(from, to);
+        final UndefinedArrayFilter newFilter = new UndefinedArrayFilter(newArray);
+        newFilter.getUndefined().copy(undefined);
+        newFilter.getUndefined().shiftLeft(from, newFilter.length());
+
+        return newFilter;
+    }
+
+    private BitVector getUndefined() {
+        return undefined;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/Bootstrap.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/Bootstrap.java
new file mode 100644
index 00000000000..59165f4fd66
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/Bootstrap.java
@@ -0,0 +1,208 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.linker;
+
+import static jdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
+
+import java.lang.invoke.CallSite;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles.Lookup;
+import java.lang.invoke.MethodType;
+import jdk.nashorn.internal.codegen.CompilerConstants.Call;
+import jdk.nashorn.internal.runtime.options.Options;
+import org.dynalang.dynalink.CallSiteDescriptor;
+import org.dynalang.dynalink.DynamicLinker;
+import org.dynalang.dynalink.DynamicLinkerFactory;
+import org.dynalang.dynalink.beans.BeansLinker;
+import org.dynalang.dynalink.linker.GuardedInvocation;
+import org.dynalang.dynalink.linker.LinkerServices;
+
+/**
+ * This class houses bootstrap method for invokedynamic instructions generated by compiler.
+ */
+public final class Bootstrap {
+    /** Reference to the seed boostrap function */
+    public static final Call BOOTSTRAP = staticCallNoLookup(Bootstrap.class, "bootstrap", CallSite.class, Lookup.class, String.class, MethodType.class, int.class);
+
+    // do not create me!!
+    private Bootstrap() {
+    }
+
+    private static final DynamicLinker dynamicLinker;
+    static {
+        final DynamicLinkerFactory factory = new DynamicLinkerFactory();
+        factory.setPrioritizedLinkers(new NashornLinker(), new NashornPrimitiveLinker(), new JSObjectLinker());
+        factory.setFallbackLinkers(new BeansLinker(), new NashornBottomLinker());
+        factory.setSyncOnRelink(true);
+        final int relinkThreshold = Options.getIntProperty("nashorn.unstable.relink.threshold", -1);
+        if (relinkThreshold > -1) {
+            factory.setUnstableRelinkThreshold(relinkThreshold);
+        }
+        dynamicLinker = factory.createLinker();
+    }
+
+    /**
+     * Create a call site and link it for Nashorn. This version of the method conforms to the invokedynamic bootstrap
+     * method expected signature and is referenced from Nashorn generated bytecode as the bootstrap method for all
+     * invokedynamic instructions.
+     * @param lookup MethodHandle lookup. Ignored as Nashorn only uses public lookup.
+     * @param opDesc Dynalink dynamic operation descriptor.
+     * @param type   Method type.
+     * @param flags  flags for call type, trace/profile etc.
+     * @return CallSite with MethodHandle to appropriate method or null if not found.
+     */
+    public static CallSite bootstrap(final Lookup lookup, final String opDesc, final MethodType type, final int flags) {
+        return dynamicLinker.link(LinkerCallSite.newLinkerCallSite(opDesc, type, flags));
+    }
+
+    /**
+     * Return a dynamic invoker for a specified dynamic operation. You can use this method to create a method handle
+     * that when invoked acts completely as if it were a Nashorn-linked call site. An overview of available dynamic
+     * operations can be found in the <a href="https://github.com/szegedi/dynalink/wiki/User-Guide-0.4">Dynalink User Guide</a>,
+     * but we'll show few examples here:
+     * <ul>
+     *   <li>Get a named property with fixed name:
+     *     <pre>
+     * MethodHandle getColor = Boostrap.createDynamicInvoker("dyn:getProp:color", Object.class, Object.class);
+     * Object obj = ...; // somehow obtain the object
+     * Object color = getColor.invokeExact(obj);
+     *     </pre>
+     *   </li>
+     *   <li>Get a named property with variable name:
+     *     <pre>
+     * MethodHandle getProperty = Boostrap.createDynamicInvoker("dyn:getElem", Object.class, Object.class, String.class);
+     * Object obj = ...; // somehow obtain the object
+     * Object color = getProperty.invokeExact(obj, "color");
+     * Object shape = getProperty.invokeExact(obj, "shape");
+     * MethodHandle getNumProperty = Boostrap.createDynamicInvoker("dyn:getElem", Object.class, Object.class, int.class);
+     * Object elem42 = getNumProperty.invokeExact(obj, 42);
+     *     </pre>
+     *   </li>
+     *   <li>Set a named property with fixed name:
+     *     <pre>
+     * MethodHandle setColor = Boostrap.createDynamicInvoker("dyn:setProp:color", void.class, Object.class, Object.class);
+     * Object obj = ...; // somehow obtain the object
+     * setColor.invokeExact(obj, Color.BLUE);
+     *     </pre>
+     *   </li>
+     *   <li>Set a property with variable name:
+     *     <pre>
+     * MethodHandle setProperty = Boostrap.createDynamicInvoker("dyn:setElem", void.class, Object.class, String.class, Object.class);
+     * Object obj = ...; // somehow obtain the object
+     * setProperty.invokeExact(obj, "color", Color.BLUE);
+     * setProperty.invokeExact(obj, "shape", Shape.CIRCLE);
+     *     </pre>
+     *   </li>
+     *   <li>Call a function on an object; two-step variant. This is the actual variant used by Nashorn-generated code:
+     *     <pre>
+     * MethodHandle findFooFunction = Boostrap.createDynamicInvoker("dyn:getMethod:foo", Object.class, Object.class);
+     * Object obj = ...; // somehow obtain the object
+     * Object foo_fn = findFooFunction.invokeExact(obj);
+     * MethodHandle callFunctionWithTwoArgs = Boostrap.createDynamicInvoker("dyn:call", Object.class, Object.class, Object.class, Object.class, Object.class);
+     * // Note: "call" operation takes a function, then a "this" value, then the arguments:
+     * Object foo_retval = callFunctionWithTwoArgs.invokeExact(foo_fn, obj, arg1, arg2);
+     *     </pre>
+     *   </li>
+     *   <li>Call a function on an object; single-step variant. Although Nashorn doesn't use this variant and never
+     *   emits any INVOKEDYNAMIC instructions with {@code dyn:getMethod}, it still supports this standard Dynalink
+     *   operation:
+     *     <pre>
+     * MethodHandle callFunctionFooWithTwoArgs = Boostrap.createDynamicInvoker("dyn:callMethod:foo", Object.class, Object.class, Object.class, Object.class);
+     * Object obj = ...; // somehow obtain the object
+     * Object foo_retval = callFunctionFooWithTwoArgs.invokeExact(obj, arg1, arg2);
+     *     </pre>
+     *   </li>
+     * </ul>
+     * Few additional remarks:
+     * <ul>
+     * <li>Just as Nashorn works with any Java object, the invokers returned from this method can also be applied to
+     * arbitrary Java objects in addition to Nashorn JavaScript objects.</li>
+     * <li>For invoking a named function on an object, you can also use the {@link InvokeByName} convenience class.</li>
+     * <li>For Nashorn objects {@code getElem}, {@code getProp}, and {@code getMethod} are handled almost identically,
+     * since JavaScript doesn't distinguish between different kinds of properties on an object. Either can be used with
+     * fixed property name or a variable property name. The only significant difference is handling of missing
+     * properties: {@code getMethod} for a missing member will link to a potential invocation of
+     * {@code __noSuchMethod__} on the object, {@code getProp} for a missing member will link to a potential invocation
+     * of {@code __noSuchProperty__}, while {@code getElem} for a missing member will link to an empty getter.</li>
+     * <li>In similar vein, {@code setElem} and {@code setProp} are handled identically on Nashorn objects.</li>
+     * <li>There's no rule that the variable property identifier has to be a {@code String} for {@code getProp/setProp}
+     * and {@code int} for {@code getElem/setElem}. You can declare their type to be {@code int}, {@code double},
+     * {@code Object}, and so on regardless of the kind of the operation.</li>
+     * <li>You can be as specific in parameter types as you want. E.g. if you know that the receiver of the operation
+     * will always be {@code ScriptObject}, you can pass {@code ScriptObject.class} as its parameter type. If you happen
+     * to link to a method that expects different types, (you can use these invokers on POJOs too, after all, and end up
+     * linking with their methods that have strongly-typed signatures), all necessary conversions allowed by either Java
+     * or JavaScript will be applied: if invoked methods specify either primitive or wrapped Java numeric types, or
+     * {@code String} or {@code boolean/Boolean}, then the parameters might be subjected to standard ECMAScript
+     * {@code ToNumber}, {@code ToString}, and {@code ToBoolean} conversion, respectively. Less obviously, if the
+     * expected parameter type is a SAM type, and you pass a JavaScript function, a proxy object implementing the SAM
+     * type and delegating to the function will be passed. Linkage can often be optimized when linkers have more
+     * specific type information than "everything can be an object".</li>
+     * <li>You can also be as specific in return types as you want. For return types any necessary type conversion
+     * available in either Java or JavaScript will be automatically applied, similar to the process described for
+     * parameters, only in reverse direction:  if you specify any either primitive or wrapped Java numeric type, or
+     * {@code String} or {@code boolean/Boolean}, then the return values will be subjected to standard ECMAScript
+     * {@code ToNumber}, {@code ToString}, and {@code ToBoolean} conversion, respectively. Less obviously, if the return
+     * type is a SAM type, and the return value is a JavaScript function, a proxy object implementing the SAM type and
+     * delegating to the function will be returned.</li>
+     * </ul>
+     * @param opDesc Dynalink dynamic operation descriptor.
+     * @param rtype return type of the operation
+     * @param ptypes parameter types of the operation
+     * @return MethodHandle for invoking the operation.
+     */
+    public static MethodHandle createDynamicInvoker(final String opDesc, final Class<?> rtype, final Class<?>... ptypes) {
+        return bootstrap(null, opDesc, MethodType.methodType(rtype, ptypes), 0).dynamicInvoker();
+    }
+
+    /**
+     * Returns the Nashorn's internally used dynamic linker's services object. Note that in code that is processing a
+     * linking request, you will normally use the {@code LinkerServices} object passed by whatever top-level linker
+     * invoked the linking (if the call site is in Nashorn-generated code, you'll get this object anyway). You should
+     * only resort to retrieving a linker services object using this method when you need some linker services (e.g.
+     * type converter method handles) outside of a code path that is linking a call site.
+     * @return Nashorn's internal dynamic linker's services object.
+     */
+    public static LinkerServices getLinkerServices() {
+        return dynamicLinker.getLinkerServices();
+    }
+
+    /**
+     * Takes a guarded invocation, and ensures its method and guard conform to the type of the call descriptor, using
+     * all type conversions allowed by the linker's services. This method is used by Nashorn's linkers as a last step
+     * before returning guarded invocations to the callers. Most of the code used to produce the guarded invocations
+     * does not make an effort to coordinate types of the methods, and so a final type adjustment before a guarded
+     * invocation is returned is the responsibility of the linkers themselves.
+     * @param inv the guarded invocation that needs to be type-converted. Can be null.
+     * @param linkerServices the linker services object providing the type conversions.
+     * @param desc the call site descriptor to whose method type the invocation needs to conform.
+     * @return the type-converted guarded invocation. If input is null, null is returned. If the input invocation
+     * already conforms to the requested type, it is returned unchanged.
+     */
+    static GuardedInvocation asType(final GuardedInvocation inv, final LinkerServices linkerServices, final CallSiteDescriptor desc) {
+        return inv == null ? null : inv.asType(linkerServices, desc.getMethodType());
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/InvokeByName.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/InvokeByName.java
new file mode 100644
index 00000000000..5537ab8aed9
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/InvokeByName.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.linker;
+
+import java.lang.invoke.MethodHandle;
+
+/**
+ * A tuple of method handles, one for dynamically getting function as a property of an object, and another for invoking
+ * a function with a given signature. A typical use for this class is to create method handles that can be used to
+ * efficiently recreate dynamic invocation of a method on an object from Java code. E.g. if you would have a call site
+ * in JavaScript that says
+ * <pre>
+ *     value = obj.toJSON(key)
+ * </pre>
+ * then the efficient way to code an exact equivalent of this in Java would be:
+ * <pre>
+ *     private static final InvokeByName TO_JSON = new InvokeByName("toJSON", Object.class, Object.class, Object.class);
+ *     ...
+ *     final Object toJSONFn = TO_JSON.getGetter().invokeExact(obj);
+ *     value = TO_JSON.getInvoker().invokeExact(toJSON, obj, key);
+ * </pre>
+ * In practice, you can have stronger type assumptions if it makes sense for your code, just remember that you must use
+ * the same parameter types as the formal types of the arguments for {@code invokeExact} to work:
+ * <pre>
+ *     private static final InvokeByName TO_JSON = new InvokeByName("toJSON", ScriptObject.class, Object.class, Object.class);
+ *     ...
+ *     final ScriptObject sobj = (ScriptObject)obj;
+ *     final Object toJSONFn = TO_JSON.getGetter().invokeExact(sobj);
+ *     if(toJSONFn instanceof ScriptFunction) {
+ *         value = TO_JSON.getInvoker().invokeExact(toJSON, sobj, key);
+ *     }
+ * </pre>
+ * Note that in general you will not want to reuse a single instance of this class for implementing more than one call
+ * site - that would increase the risk of them becoming megamorphic or otherwise hard to optimize by the JVM. Even if
+ * you dynamically invoke a function with the same name from multiple places in your code, it is advisable to create a
+ * separate instance of this class for every place.
+ */
+public class InvokeByName {
+    private final MethodHandle getter;
+    private final MethodHandle invoker;
+
+    /**
+     * Creates a getter and invoker for a function of the given name that takes no arguments and has a return type of
+     * {@code Object}.
+     * @param name the name of the function
+     * @param targetClass the target class it is invoked on; e.g. {@code Object} or {@code ScriptObject}.
+     */
+    public InvokeByName(final String name, final Class<?> targetClass) {
+        this(name, targetClass, Object.class);
+    }
+
+    /**
+     * Creates a getter and invoker for a function of the given name with given parameter types and a given return type
+     * of {@code Object}.
+     * @param name the name of the function
+     * @param targetClass the target class it is invoked on; e.g. {@code Object} or {@code ScriptObject}.
+     * @param rtype the return type of the function
+     * @param ptypes the parameter types of the function.
+     */
+    public InvokeByName(final String name, final Class<?> targetClass, final Class<?> rtype, final Class<?>... ptypes) {
+        getter  = Bootstrap.createDynamicInvoker("dyn:getMethod|getProp|getItem:" + name, Object.class, targetClass);
+
+        final Class<?>[] finalPtypes;
+        final int plength = ptypes.length;
+        if(plength == 0) {
+            finalPtypes = new Class<?>[] { Object.class, targetClass };
+        } else {
+            finalPtypes = new Class[plength + 2];
+            finalPtypes[0] = Object.class;
+            finalPtypes[1] = targetClass;
+            System.arraycopy(ptypes, 0, finalPtypes, 2, plength);
+        }
+        invoker = Bootstrap.createDynamicInvoker("dyn:call", rtype, finalPtypes);
+    }
+
+    /**
+     * Returns the property getter that can be invoked on an object to retrieve the function object that will be
+     * subsequently invoked by the invoker returned by {@link #getInvoker()}.
+     * @return the property getter method handle for the function.
+     */
+    public MethodHandle getGetter() {
+        return getter;
+    }
+
+    /**
+     * Returns the function invoker that can be used to invoke a function object previously retrieved by invoking
+     * the getter retrieved with {@link #getGetter()} on the target object.
+     * @return the invoker method handle for the function.
+     */
+    public MethodHandle getInvoker() {
+        return invoker;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java
new file mode 100644
index 00000000000..285cac19b15
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java
@@ -0,0 +1,232 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.linker;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.util.Objects;
+import jdk.nashorn.internal.runtime.JSType;
+import netscape.javascript.JSObject;
+import org.dynalang.dynalink.CallSiteDescriptor;
+import org.dynalang.dynalink.linker.GuardedInvocation;
+import org.dynalang.dynalink.linker.LinkRequest;
+import org.dynalang.dynalink.linker.LinkerServices;
+import org.dynalang.dynalink.linker.TypeBasedGuardingDynamicLinker;
+import org.dynalang.dynalink.support.CallSiteDescriptorFactory;
+
+/**
+ * A Dynalink linker to handle web browser built-in JS (DOM etc.) objects as well
+ * as ScriptObjects from other Nashorn contexts.
+ */
+public final class JSObjectLinker implements TypeBasedGuardingDynamicLinker {
+   /**
+     * Instances of this class are used to represent a method member of a JSObject
+     */
+    private static final class JSObjectMethod {
+        // The name of the JSObject method property
+        private final String name;
+
+        JSObjectMethod(final String name) {
+            this.name = name;
+        }
+
+        String getName() {
+            return name;
+        }
+
+        static GuardedInvocation lookup(final CallSiteDescriptor desc) {
+            final String operator = CallSiteDescriptorFactory.tokenizeOperators(desc).get(0);
+            switch (operator) {
+                case "call": {
+                    // collect everything except the first two - JSObjectMethod instance and the actual 'self'
+                    final int paramCount = desc.getMethodType().parameterCount();
+                    final MethodHandle caller = MH.asCollector(JSOBJECTMETHOD_CALL, Object[].class, paramCount - 2);
+                    return new GuardedInvocation(caller, null, IS_JSOBJECTMETHOD_GUARD);
+                }
+                default:
+                    return null;
+            }
+        }
+    }
+
+    @Override
+    public boolean canLinkType(final Class<?> type) {
+        return canLinkTypeStatic(type);
+    }
+
+    static boolean canLinkTypeStatic(final Class<?> type) {
+        // can link JSObject and JSObjectMethod
+        return JSObject.class.isAssignableFrom(type) || JSObjectMethod.class.isAssignableFrom(type);
+    }
+
+    @Override
+    public GuardedInvocation getGuardedInvocation(final LinkRequest request, final LinkerServices linkerServices) throws Exception {
+        final LinkRequest requestWithoutContext = request.withoutRuntimeContext(); // Nashorn has no runtime context
+        final Object self = requestWithoutContext.getReceiver();
+        final CallSiteDescriptor desc = requestWithoutContext.getCallSiteDescriptor();
+
+        if (desc.getNameTokenCount() < 2 || !"dyn".equals(desc.getNameToken(CallSiteDescriptor.SCHEME))) {
+            // We only support standard "dyn:*[:*]" operations
+            return null;
+        }
+
+        final GuardedInvocation inv;
+        if (self instanceof JSObject) {
+            inv = lookup(desc);
+        } else if (self instanceof JSObjectMethod) {
+            inv = JSObjectMethod.lookup(desc);
+        } else {
+            throw new AssertionError(); // Should never reach here.
+        }
+
+        return Bootstrap.asType(inv, linkerServices, desc);
+    }
+
+    private static GuardedInvocation lookup(final CallSiteDescriptor desc) {
+        final String operator = CallSiteDescriptorFactory.tokenizeOperators(desc).get(0);
+        final int c = desc.getNameTokenCount();
+        switch (operator) {
+            case "getProp":
+            case "getElem":
+            case "getMethod":
+                return c > 2 ? findGetMethod(desc, operator) : findGetIndexMethod();
+            case "setProp":
+            case "setElem":
+                return c > 2 ? findSetMethod(desc) : findSetIndexMethod();
+            case "call":
+            case "callMethod":
+                return findCallMethod(desc, operator);
+            case "new":
+            default:
+                return null;
+        }
+    }
+
+    private static GuardedInvocation findGetMethod(final CallSiteDescriptor desc, final String operator) {
+        // if "getMethod" then return JSObjectMethod object - which just holds the name of the method
+        // subsequently, link on dyn:call for JSObjectMethod will actually call that method
+        final MethodHandle getter = MH.insertArguments("getMethod".equals(operator)? JSOBJECT_GETMETHOD : JSOBJECT_GET, 1, desc.getNameToken(2));
+        return new GuardedInvocation(getter, null, IS_JSOBJECT_GUARD);
+    }
+
+    private static GuardedInvocation findGetIndexMethod() {
+        return new GuardedInvocation(JSOBJECT_GET, null, IS_JSOBJECT_GUARD);
+    }
+
+    private static GuardedInvocation findSetMethod(final CallSiteDescriptor desc) {
+        final MethodHandle getter = MH.insertArguments(JSOBJECT_PUT, 1, desc.getNameToken(2));
+        return new GuardedInvocation(getter, null, IS_JSOBJECT_GUARD);
+    }
+
+    private static GuardedInvocation findSetIndexMethod() {
+        return new GuardedInvocation(JSOBJECT_PUT, null, IS_JSOBJECT_GUARD);
+    }
+
+    private static GuardedInvocation findCallMethod(final CallSiteDescriptor desc, final String operator) {
+        // if operator is "call", then 'self' is a JSObject function object already. Use 'call' as the method name
+        final String methodName = "callMethod".equals(operator)? desc.getNameToken(2) : "call";
+        MethodHandle func = MH.insertArguments(JSOBJECT_CALL, 1, methodName);
+        func = MH.asCollector(func, Object[].class, desc.getMethodType().parameterCount() - 1);
+        return new GuardedInvocation(func, null, IS_JSOBJECT_GUARD);
+    }
+
+    @SuppressWarnings("unused")
+    private static boolean isJSObjectMethod(final Object self) {
+        return self instanceof JSObjectMethod;
+    }
+
+    @SuppressWarnings("unused")
+    private static boolean isJSObject(final Object self) {
+        return self instanceof JSObject;
+    }
+
+
+    @SuppressWarnings("unused")
+    private static Object getMethod(final Object jsobj, final Object key) {
+        return new JSObjectMethod(Objects.toString(key));
+    }
+
+    @SuppressWarnings("unused")
+    private static Object get(final Object jsobj, final Object key) {
+        if (key instanceof String) {
+            return ((JSObject)jsobj).getMember((String)key);
+        } else if (key instanceof Number) {
+            final int index = getIndex((Number)key);
+            if (index > -1) {
+                return ((JSObject)jsobj).getSlot(index);
+            }
+        }
+        return null;
+    }
+
+    @SuppressWarnings("unused")
+    private static void put(final Object jsobj, final Object key, final Object value) {
+        if (key instanceof String) {
+            ((JSObject)jsobj).setMember((String)key, value);
+        } else if (key instanceof Number) {
+            ((JSObject)jsobj).setSlot(getIndex((Number)key), value);
+        }
+    }
+
+    @SuppressWarnings("unused")
+    private static Object call(final Object jsobj, final Object method, final Object... args) {
+        return ((JSObject)jsobj).call(Objects.toString(method), args);
+    }
+
+    @SuppressWarnings("unused")
+    private static Object jsObjectMethodCall(final Object jsObjMethod, final Object jsobj, final Object... args) {
+        // we have JSObjectMethod, JSObject and args. Get method name from JSObjectMethod instance
+        final String methodName = ((JSObjectMethod)jsObjMethod).getName();
+        // call the method on JSObject
+        return ((JSObject)jsobj).call(methodName, args);
+    }
+
+    private static int getIndex(final Number n) {
+        final double value = n.doubleValue();
+        return JSType.isRepresentableAsInt(value) ? (int)value : -1;
+    }
+
+    private static final MethodHandleFunctionality MH = MethodHandleFactory.getFunctionality();
+
+    private static final MethodHandle IS_JSOBJECTMETHOD_GUARD = findOwnMH("isJSObjectMethod", boolean.class, Object.class);
+    private static final MethodHandle IS_JSOBJECT_GUARD = findOwnMH("isJSObject", boolean.class, Object.class);
+    private static final MethodHandle JSOBJECT_GETMETHOD = findOwnMH("getMethod", Object.class, Object.class, Object.class);
+    private static final MethodHandle JSOBJECT_GET = findOwnMH("get", Object.class, Object.class, Object.class);
+    private static final MethodHandle JSOBJECT_PUT = findOwnMH("put", Void.TYPE, Object.class, Object.class, Object.class);
+    private static final MethodHandle JSOBJECT_CALL = findOwnMH("call", Object.class, Object.class, Object.class, Object[].class);
+    private static final MethodHandle JSOBJECTMETHOD_CALL = findOwnMH("jsObjectMethodCall", Object.class, Object.class, Object.class, Object[].class);
+
+    private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
+        final Class<?>   own = JSObjectLinker.class;
+        final MethodType mt  = MH.type(rtype, types);
+        try {
+            return MH.findStatic(MethodHandles.lookup(), own, name, mt);
+        } catch (final MethodHandleFactory.LookupException e) {
+            return MH.findVirtual(MethodHandles.lookup(), own, name, mt);
+        }
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
new file mode 100644
index 00000000000..462a02fb02a
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
@@ -0,0 +1,1061 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.linker;
+
+import static jdk.internal.org.objectweb.asm.Opcodes.ACC_FINAL;
+import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PRIVATE;
+import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PUBLIC;
+import static jdk.internal.org.objectweb.asm.Opcodes.ACC_STATIC;
+import static jdk.internal.org.objectweb.asm.Opcodes.ACC_SUPER;
+import static jdk.internal.org.objectweb.asm.Opcodes.ACC_VARARGS;
+import static jdk.internal.org.objectweb.asm.Opcodes.ACONST_NULL;
+import static jdk.internal.org.objectweb.asm.Opcodes.ALOAD;
+import static jdk.internal.org.objectweb.asm.Opcodes.ARETURN;
+import static jdk.internal.org.objectweb.asm.Opcodes.ASTORE;
+import static jdk.internal.org.objectweb.asm.Opcodes.DUP;
+import static jdk.internal.org.objectweb.asm.Opcodes.IFNONNULL;
+import static jdk.internal.org.objectweb.asm.Opcodes.ILOAD;
+import static jdk.internal.org.objectweb.asm.Opcodes.ISTORE;
+import static jdk.internal.org.objectweb.asm.Opcodes.RETURN;
+import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodType;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.security.AccessController;
+import java.security.AllPermission;
+import java.security.CodeSigner;
+import java.security.CodeSource;
+import java.security.Permissions;
+import java.security.PrivilegedAction;
+import java.security.ProtectionDomain;
+import java.security.SecureClassLoader;
+import java.security.SecureRandom;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Random;
+import java.util.Set;
+import jdk.internal.org.objectweb.asm.ClassWriter;
+import jdk.internal.org.objectweb.asm.Label;
+import jdk.internal.org.objectweb.asm.Opcodes;
+import jdk.internal.org.objectweb.asm.Type;
+import jdk.internal.org.objectweb.asm.commons.InstructionAdapter;
+import jdk.nashorn.internal.objects.NativeJava;
+import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.runtime.ECMAException;
+import jdk.nashorn.internal.runtime.ScriptFunction;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.Undefined;
+import org.dynalang.dynalink.beans.StaticClass;
+import org.dynalang.dynalink.support.LinkRequestImpl;
+
+/**
+ * A factory class that generates adapter classes. Adapter classes allow implementation of Java interfaces and
+ * extending of Java classes from JavaScript. For every original Class object, exactly one adapter Class is generated
+ * that either extends the original class or - if the original Class represents an interface - extends Object and
+ * implements the interface represented by the original Class.
+ * </p><p>
+ * The adapter class is generated in a new secure class loader that inherits Nashorn's protection domain, and has either
+ * the original Class' class loader or the Nashorn's class loader as its parent - the parent class loader is chosen so
+ * that both the original Class and the Nashorn core classes are visible from it (as the adapter will have constant pool
+ * references to ScriptObject and ScriptFunction classes). In case neither candidate class loader has visibility into
+ * the other set of classes, an error is thrown.
+ * </p><p>
+ * For every protected or public constructor in the extended class (which is either the original class, or Object when
+ * an interface is implemented), the adapter class will have one or two public constructors (visibility of protected
+ * constructors in the extended class is promoted to public). In every case, for every original constructor, a new
+ * constructor taking an initial ScriptObject argument followed by original constructor arguments is present on the
+ * adapter class. When such a constructor is invoked, the passed ScriptObject's member functions are used to implement
+ * and/or override methods on the original class, dispatched by name. A single JavaScript function will act as the
+ * implementation for all overloaded methods of the same name. When methods on an adapter instance are invoked, the
+ * functions are invoked having the ScriptObject passed in the instance constructor as their "this". Subsequent changes
+ * to the ScriptObject (reassignment or removal of its functions) are not reflected in the adapter instance; the method
+ * implementations are bound to functions at constructor invocation time. {@code java.lang.Object} methods
+ * {@code equals}, {@code hashCode}, and {@code toString} can also be overridden (from interface implementations too).
+ * The only restriction is that since every JavaScript object already has a {@code toString} function through the
+ * {@code Object.prototype}, the {@code toString} in the adapter is only overridden if the passed ScriptObject has a
+ * {@code toString} function as its own property, and not inherited from a prototype. All other adapter methods can be
+ * implemented or overridden through a prototype-inherited function of the ScriptObject passed to the constructor too.
+ * </p><p>
+ * For abstract classes or interfaces that only have one abstract method, or have several of them, but all share the
+ * same name, an additional constructor is provided for every original constructor; this one takes a ScriptFunction as
+ * its first argument followed by original constructor arguments. This constructor will use the passed function as the
+ * implementation for all abstract methods. For consistency, any concrete methods sharing the single abstract method
+ * name will also be overridden by the function. When methods on the adapter instance are invoked, the ScriptFunction is
+ * invoked with {@code null} as its "this".
+ * </p><p>If the superclass has a protected or public default constructor, then a generated constructor that only takes
+ * a ScriptFunction is also implicitly used as an automatic conversion whenever a ScriptFunction is passed in an
+ * invocation of any Java method that expects such SAM type.
+ * </p><p>
+ * For adapter methods that return values, all the JavaScript-to-Java conversions supported by Nashorn will be in effect
+ * to coerce the JavaScript function return value to the expected Java return type.
+ * </p><p>
+ * You normally don't use this class directly, but rather either create adapters from script using
+ * {@link NativeJava#extend(Object, Object)}, using the {@code new} operator on abstract classes and interfaces (see
+ * {@link NativeJava#type(Object, Object)}), or implicitly when passing script functions to Java methods expecting SAM
+ * types.
+ * </p>
+ */
+
+public class JavaAdapterFactory {
+    private static final Type SCRIPT_FUNCTION_TYPE = Type.getType(ScriptFunction.class);
+    private static final Type SCRIPT_OBJECT_TYPE = Type.getType(ScriptObject.class);
+    private static final Type OBJECT_TYPE = Type.getType(Object.class);
+    private static final Type STRING_TYPE = Type.getType(String.class);
+    private static final Type CONTEXT_TYPE = Type.getType(Context.class);
+    private static final Type METHOD_TYPE_TYPE = Type.getType(MethodType.class);
+    private static final Type METHOD_HANDLE_TYPE = Type.getType(MethodHandle.class);
+    private static final String GET_HANDLE_OBJECT_DESCRIPTOR = Type.getMethodDescriptor(METHOD_HANDLE_TYPE,
+            SCRIPT_OBJECT_TYPE, STRING_TYPE, METHOD_TYPE_TYPE, Type.BOOLEAN_TYPE);
+    private static final String GET_HANDLE_FUNCTION_DESCRIPTOR = Type.getMethodDescriptor(METHOD_HANDLE_TYPE,
+            SCRIPT_FUNCTION_TYPE, METHOD_TYPE_TYPE, Type.BOOLEAN_TYPE);
+    private static final Type RUNTIME_EXCEPTION_TYPE = Type.getType(RuntimeException.class);
+    private static final Type THROWABLE_TYPE = Type.getType(Throwable.class);
+    private static final Type PRIVILEGED_ACTION_TYPE = Type.getType(PrivilegedAction.class);
+    private static final Type UNSUPPORTED_OPERATION_TYPE = Type.getType(UnsupportedOperationException.class);
+
+    private static final String THIS_CLASS_TYPE_NAME = Type.getInternalName(JavaAdapterFactory.class);
+    private static final String RUNTIME_EXCEPTION_TYPE_NAME = RUNTIME_EXCEPTION_TYPE.getInternalName();
+    private static final String ERROR_TYPE_NAME = Type.getInternalName(Error.class);
+    private static final String THROWABLE_TYPE_NAME = THROWABLE_TYPE.getInternalName();
+    private static final String CONTEXT_TYPE_NAME = CONTEXT_TYPE.getInternalName();
+    private static final String OBJECT_TYPE_NAME = OBJECT_TYPE.getInternalName();
+    private static final String PRIVILEGED_ACTION_TYPE_NAME = PRIVILEGED_ACTION_TYPE.getInternalName();
+    private static final String UNSUPPORTED_OPERATION_TYPE_NAME = UNSUPPORTED_OPERATION_TYPE.getInternalName();
+
+    private static final String METHOD_HANDLE_TYPE_DESCRIPTOR = METHOD_HANDLE_TYPE.getDescriptor();
+    private static final String SCRIPT_OBJECT_TYPE_DESCRIPTOR = SCRIPT_OBJECT_TYPE.getDescriptor();
+    private static final String GET_GLOBAL_METHOD_DESCRIPTOR = Type.getMethodDescriptor(SCRIPT_OBJECT_TYPE);
+    private static final String SET_GLOBAL_METHOD_DESCRIPTOR = Type.getMethodDescriptor(Type.VOID_TYPE, SCRIPT_OBJECT_TYPE);
+    private static final String GET_CLASS_METHOD_DESCRIPTOR = Type.getMethodDescriptor(Type.getType(Class.class));
+    private static final String PRIVILEGED_RUN_METHOD_DESCRIPTOR = Type.getMethodDescriptor(OBJECT_TYPE);
+
+    // Package used when the adapter can't be defined in the adaptee's package (either because it's sealed, or because
+    // it's a java.* package.
+    private static final String ADAPTER_PACKAGE_PREFIX = "jdk/nashorn/internal/javaadapters/";
+    // Class name suffix used to append to the adaptee class name, when it can be defined in the adaptee's package.
+    private static final String ADAPTER_CLASS_NAME_SUFFIX = "$$NashornJavaAdapter";
+
+    private static final String JAVA_PACKAGE_PREFIX = "java/";
+    private static final String INIT = "<init>";
+    private static final String VOID_NOARG = Type.getMethodDescriptor(Type.VOID_TYPE);
+    private static final String GLOBAL_FIELD_NAME = "global";
+
+    /**
+     * Contains various outcomes for attempting to generate an adapter class. These are stored in AdapterInfo instances.
+     * We have a successful outcome (adapter class was generated) and three possible error outcomes: a class is final,
+     * a class is not public, and the class has no public or protected constructor. We don't throw exceptions when we
+     * try to generate the adapter, but rather just record these error conditions as they are still useful as partial
+     * outcomes, as Nashorn's linker can still successfully check whether the class can be autoconverted from a script
+     * function even when it is not possible to generate an adapter for it.
+     */
+    private enum AdaptationOutcome {
+        SUCCESS,
+        ERROR_FINAL_CLASS,
+        ERROR_NON_PUBLIC_CLASS,
+        ERROR_NO_ACCESSIBLE_CONSTRUCTOR
+    }
+
+    /**
+     * Collection of methods we never override: Object.clone(), Object.finalize().
+     */
+    private static final Collection<MethodInfo> EXCLUDED = getExcludedMethods();
+
+    /**
+     * A mapping from an original Class object to AdapterInfo representing the adapter for the class it represents.
+     */
+    private static final ClassValue<AdapterInfo> ADAPTER_INFOS = new ClassValue<AdapterInfo>() {
+        @Override
+        protected AdapterInfo computeValue(final Class<?> type) {
+            return createAdapterInfo(type);
+        }
+    };
+
+    private static final Random random = new SecureRandom();
+    private static final ProtectionDomain GENERATED_PROTECTION_DOMAIN = createGeneratedProtectionDomain();
+
+    // This is the supertype for our generated adapter. It's either Object if we're implementing an interface, or same
+    // as originalType if we're extending a class.
+    private final Class<?> superType;
+    // Class loader used as the parent for the class loader we'll create to load the generated class. It will be a class
+    // loader that has the visibility of both the original type and of the Nashorn classes.
+    private final ClassLoader commonLoader;
+
+    // Binary name of the superType
+    private final String superTypeName;
+    // Binary name of the generated class.
+    private final String generatedTypeName;
+    private final String globalSetterClassName;
+    private final Set<String> usedFieldNames = new HashSet<>();
+    private final Set<String> abstractMethodNames = new HashSet<>();
+    private final String samName;
+    private final Set<MethodInfo> finalMethods = new HashSet<>(EXCLUDED);
+    private final Set<MethodInfo> methodInfos = new HashSet<>();
+    private boolean autoConvertibleFromFunction = false;
+
+    private final ClassWriter cw;
+
+    /**
+     * Creates a factory that will produce the adapter type for the specified original type.
+     * @param originalType the type for which this factory will generate the adapter type.
+     * @throws AdaptationException if the adapter can not be generated for some reason.
+     */
+    private JavaAdapterFactory(final Class<?> originalType) throws AdaptationException {
+        this.commonLoader = findCommonLoader(originalType);
+        cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS) {
+            @Override
+            protected String getCommonSuperClass(final String type1, final String type2) {
+                // We need to override ClassWriter.getCommonSuperClass to use this factory's commonLoader as a class
+                // loader to find the common superclass of two types when needed.
+                return JavaAdapterFactory.this.getCommonSuperClass(type1, type2);
+            }
+        };
+        final String originalTypeName = Type.getInternalName(originalType);
+        final String[] interfaces;
+        final boolean isInterface = originalType.isInterface();
+        if (isInterface) {
+            superType = Object.class;
+            interfaces = new String[] { originalTypeName };
+        } else {
+            superType = originalType;
+            interfaces = null;
+        }
+        superTypeName = Type.getInternalName(superType);
+        final Package pkg = originalType.getPackage();
+        if (originalTypeName.startsWith(JAVA_PACKAGE_PREFIX) || pkg == null || pkg.isSealed()) {
+            // Can't define new classes in java.* packages
+            generatedTypeName = ADAPTER_PACKAGE_PREFIX + originalTypeName;
+        } else {
+            generatedTypeName = originalTypeName + ADAPTER_CLASS_NAME_SUFFIX;
+        }
+        // Randomize the name of the privileged global setter, to make it non-feasible to find.
+        final long l;
+        synchronized(random) {
+            l = random.nextLong();
+        }
+        globalSetterClassName = generatedTypeName.concat("$" + Long.toHexString(l & Long.MAX_VALUE));
+        cw.visit(Opcodes.V1_7, ACC_PUBLIC | ACC_SUPER | ACC_FINAL, generatedTypeName, null, superTypeName, interfaces);
+        cw.visitField(ACC_PRIVATE | ACC_FINAL, GLOBAL_FIELD_NAME, SCRIPT_OBJECT_TYPE_DESCRIPTOR, null, null).visitEnd();
+        usedFieldNames.add(GLOBAL_FIELD_NAME);
+
+        gatherMethods(originalType);
+        if (isInterface) {
+            // Add ability to override Object methods if implementing an interface
+            gatherMethods(Object.class);
+        }
+        samName = abstractMethodNames.size() == 1 ? abstractMethodNames.iterator().next() : null;
+        generateFields();
+        generateConstructors();
+        generateMethods();
+        // }
+        cw.visitEnd();
+    }
+
+    /**
+     * Utility method used by few other places in the code. Tests if the class has the abstract modifier and is not an
+     * array class. For some reason, array classes have the abstract modifier set in HotSpot JVM, and we don't want to
+     * treat array classes as abstract.
+     * @param clazz the inspected class
+     * @return true if the class is abstract and is not an array type.
+     */
+    static boolean isAbstractClass(final Class<?> clazz) {
+        return Modifier.isAbstract(clazz.getModifiers()) && !clazz.isArray();
+    }
+
+    /**
+     * Returns an adapter class for the specified original class. The adapter class extends/implements the original
+     * class/interface.
+     * @param originalClass the original class/interface to extend/implement.
+     * @return an adapter class. See this class' documentation for details on the generated adapter class.
+     * @throws ECMAException with a TypeError if the adapter class can not be generated because the original class is
+     * final, non-public, or has no public or protected constructors.
+     */
+    public static StaticClass getAdapterClassFor(final StaticClass originalClass) {
+        return getAdapterClassFor(originalClass.getRepresentedClass());
+    }
+
+    static StaticClass getAdapterClassFor(final Class<?> originalClass) {
+        final AdapterInfo adapterInfo = ADAPTER_INFOS.get(originalClass);
+        final StaticClass clazz = adapterInfo.adapterClass;
+        if (clazz != null) {
+            return clazz;
+        }
+        assert adapterInfo.adaptationOutcome != AdaptationOutcome.SUCCESS;
+        typeError(Context.getGlobal(), "extend." + adapterInfo.adaptationOutcome, originalClass.getName());
+
+        throw new AssertionError();
+    }
+
+    /**
+     * Returns whether an instance of the specified class/interface can be generated from a ScriptFunction. Returns true
+     * iff: the adapter for the class/interface can be created, it is abstract (this includes interfaces), it has at
+     * least one abstract method, all the abstract methods share the same name, and it has a public or protected default
+     * constructor. Note that invoking this class will most likely result in the adapter class being defined in the JVM
+     * if it hasn't been already.
+     * @param clazz the inspected class
+     * @return true iff an instance of the specified class/interface can be generated from a ScriptFunction.
+     */
+    static boolean isAutoConvertibleFromFunction(final Class<?> clazz) {
+        return ADAPTER_INFOS.get(clazz).autoConvertibleFromFunction;
+    }
+
+    /**
+     * Returns a method handle representing a constructor that takes a single argument of the source type (which,
+     * really, should be one of {@link ScriptObject}, {@link ScriptFunction}, or {@link Object}, and returns an instance
+     * of the adapter for the target type. Used to implement the function autoconverters as well as the Nashorn's
+     * JSR-223 script engine's {@code getInterface()} method.
+     * @param sourceType the source type; should be either {@link ScriptObject}, {@link ScriptFunction}, or
+     * {@link Object}. In case of {@code Object}, it will return a method handle that dispatches to either the script
+     * object or function constructor at invocation based on the actual argument.
+     * @param targetType the target type, for which adapter instances will be created
+     * @return the constructor method handle.
+     * @throws Exception if anything goes wrong
+     */
+    public static MethodHandle getConstructor(final Class<?> sourceType, final Class<?> targetType) throws Exception {
+        final StaticClass adapterClass = getAdapterClassFor(targetType);
+        return MH.bindTo(Bootstrap.getLinkerServices().getGuardedInvocation(new LinkRequestImpl(NashornCallSiteDescriptor.get(
+                "dyn:new", MethodType.methodType(targetType, StaticClass.class, sourceType), 0), false,
+                adapterClass, null)).getInvocation(), adapterClass);
+    }
+
+    /**
+     * Finishes the bytecode generation for the adapter class that was started in the constructor, and loads the
+     * bytecode as a new class into the JVM.
+     * @return the generated adapter class
+     */
+    private Class<?> generateClass() {
+        final String binaryName = generatedTypeName.replace('/', '.');
+        try {
+            return Class.forName(binaryName, true, createClassLoader(commonLoader, binaryName, cw.toByteArray(),
+                    globalSetterClassName.replace('/', '.')));
+        } catch (final ClassNotFoundException e) {
+            throw new AssertionError(e); // cannot happen
+        }
+    }
+
+    // Creation of class loader is in a separate static method so that it doesn't retain a reference to the factory
+    // instance. Note that the adapter class is created in the protection domain of the class/interface being
+    // extended/implemented, and only the privileged global setter action class is generated in the protection domain
+    // of Nashorn itself. Also note that the creation and loading of the global setter is deferred until it is
+    // required by JVM linker, which will only happen on first invocation of any of the adapted method. We could defer
+    // it even more by separating its invocation into a separate static method on the adapter class, but then someone
+    // with ability to introspect on the class and use setAccessible(true) on it could invoke the method. It's a
+    // security tradeoff...
+    private static ClassLoader createClassLoader(final ClassLoader parentLoader, final String className,
+            final byte[] classBytes, final String privilegedActionClassName) {
+        return new SecureClassLoader(parentLoader) {
+            @Override
+            protected Class<?> findClass(final String name) throws ClassNotFoundException {
+                if(name.equals(className)) {
+                    final byte[] bytes = classBytes;
+                    return defineClass(name, bytes, 0, bytes.length, GENERATED_PROTECTION_DOMAIN);
+                } else if(name.equals(privilegedActionClassName)) {
+                    final byte[] bytes = generatePrivilegedActionClassBytes(privilegedActionClassName.replace('.', '/'));
+                    return defineClass(name, bytes, 0, bytes.length, getClass().getProtectionDomain());
+                } else {
+                    throw new ClassNotFoundException(name);
+                }
+            }
+        };
+    }
+
+    /**
+     * Generates a PrivilegedAction implementation class for invoking {@link Context#setGlobal(ScriptObject)} from the
+     * adapter class.
+     */
+    private static byte[] generatePrivilegedActionClassBytes(final String className) {
+        final ClassWriter w = new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS);
+        // class GlobalSetter implements PrivilegedAction {
+        w.visit(Opcodes.V1_7, ACC_SUPER | ACC_FINAL, className, null, OBJECT_TYPE_NAME, new String[] {
+                PRIVILEGED_ACTION_TYPE_NAME
+        });
+
+        // private final ScriptObject global;
+        w.visitField(ACC_PRIVATE | ACC_FINAL, GLOBAL_FIELD_NAME, SCRIPT_OBJECT_TYPE_DESCRIPTOR, null, null).visitEnd();
+
+        // private ContextSetter(ScriptObject global) {
+        InstructionAdapter mv = new InstructionAdapter(w.visitMethod(ACC_PRIVATE, INIT,
+                SET_GLOBAL_METHOD_DESCRIPTOR, null, new String[0]));
+        mv.visitCode();
+        // super();
+        mv.visitVarInsn(ALOAD, 0);
+        mv.invokespecial(OBJECT_TYPE_NAME, INIT, VOID_NOARG);
+        // this.global = global;
+        mv.visitVarInsn(ALOAD, 0);
+        mv.visitVarInsn(ALOAD, 1);
+        mv.putfield(className, GLOBAL_FIELD_NAME, SCRIPT_OBJECT_TYPE_DESCRIPTOR);
+
+        mv.visitInsn(RETURN);
+        mv.visitEnd();
+        mv.visitMaxs(0, 0);
+
+        // public Object run() {
+        mv = new InstructionAdapter(w.visitMethod(ACC_PUBLIC, "run", PRIVILEGED_RUN_METHOD_DESCRIPTOR, null,
+                new String[0]));
+        mv.visitCode();
+        // Context.setGlobal(this.global);
+        mv.visitVarInsn(ALOAD, 0);
+        mv.getfield(className, GLOBAL_FIELD_NAME, SCRIPT_OBJECT_TYPE_DESCRIPTOR);
+        mv.invokestatic(CONTEXT_TYPE_NAME, "setGlobal", SET_GLOBAL_METHOD_DESCRIPTOR);
+        // return null;
+        mv.visitInsn(ACONST_NULL);
+        mv.visitInsn(ARETURN);
+
+        mv.visitEnd();
+        mv.visitMaxs(0, 0);
+
+        // static void setGlobal(ScriptObject global) {
+        mv = new InstructionAdapter(w.visitMethod(ACC_STATIC, "setGlobal", SET_GLOBAL_METHOD_DESCRIPTOR, null,
+                new String[0]));
+        mv.visitCode();
+        // new GlobalSetter(ScriptObject global)
+        mv.anew(Type.getType("L" + className + ";"));
+        mv.dup();
+        mv.visitVarInsn(ALOAD, 0);
+        mv.invokespecial(className, INIT, SET_GLOBAL_METHOD_DESCRIPTOR);
+        // AccessController.doPrivileged(...)
+        mv.invokestatic(Type.getInternalName(AccessController.class), "doPrivileged", Type.getMethodDescriptor(
+                OBJECT_TYPE, PRIVILEGED_ACTION_TYPE));
+        mv.pop();
+        mv.visitInsn(RETURN);
+
+        mv.visitEnd();
+        mv.visitMaxs(0, 0);
+
+        return w.toByteArray();
+    }
+
+    private void generateFields() {
+        for (final MethodInfo mi: methodInfos) {
+            cw.visitField(ACC_PRIVATE | ACC_FINAL, mi.methodHandleFieldName, METHOD_HANDLE_TYPE_DESCRIPTOR, null, null).visitEnd();
+        }
+    }
+
+    private void generateConstructors() throws AdaptationException {
+        boolean gotCtor = false;
+        for (final Constructor<?> ctor: superType.getDeclaredConstructors()) {
+            final int modifier = ctor.getModifiers();
+            if((modifier & (Modifier.PUBLIC | Modifier.PROTECTED)) != 0) {
+                generateConstructor(ctor);
+                gotCtor = true;
+            }
+        }
+        if(!gotCtor) {
+            throw new AdaptationException(AdaptationOutcome.ERROR_NO_ACCESSIBLE_CONSTRUCTOR);
+        }
+    }
+
+    boolean isAutoConvertibleFromFunction() {
+        return autoConvertibleFromFunction;
+    }
+
+    private void generateConstructor(final Constructor<?> ctor) {
+        // Generate a constructor that delegates to ctor, but takes an additional ScriptObject parameter at the
+        // beginning of its parameter list.
+        generateConstructor(ctor, false);
+
+        if (samName != null) {
+            if (!autoConvertibleFromFunction && ctor.getParameterTypes().length == 0) {
+                // If the original type only has a single abstract method name, as well as a default ctor, then it can
+                // be automatically converted from JS function.
+                autoConvertibleFromFunction = true;
+            }
+            // If all our abstract methods have a single name, generate an additional constructor, one that takes a
+            // ScriptFunction as its first parameter and assigns it as the implementation for all abstract methods.
+            generateConstructor(ctor, true);
+        }
+    }
+
+    /**
+     * Generates a constructor for the adapter class. This constructor will take the same arguments as the supertype
+     * constructor passed as the argument here, and delegate to it. However, it will take an additional argument of
+     * either ScriptObject or ScriptFunction type (based on the value of the "fromFunction" parameter), and initialize
+     * all the method handle fields of the adapter instance with functions from the script object (or the script
+     * function itself, if that's what's passed). There is one method handle field in the adapter class for every method
+     * that can be implemented or overridden; the name of every field is same as the name of the method, with a number
+     * suffix that makes it unique in case of overloaded methods. The generated constructor will invoke
+     * {@link #getHandle(ScriptFunction, MethodType, boolean)} or {@link #getHandle(ScriptObject, String, MethodType,
+     * boolean)} to obtain the method handles; these methods make sure to add the necessary conversions and arity
+     * adjustments so that the resulting method handles can be invoked from generated methods using {@code invokeExact}.
+     * The constructor that takes a script function will only initialize the abstract methods
+     * The constructor will also store the Nashorn global that was current at the constructor invocation time in a
+     * field named "global". The generated constructor will be public, regardless of whether the supertype constructor
+     * was public or protected.
+     * @param ctor the supertype constructor that is serving as the base for the generated constructor.
+     * @param fromFunction true if a
+     */
+    private void generateConstructor(final Constructor<?> ctor, final boolean fromFunction) {
+        final Type originalCtorType = Type.getType(ctor);
+        final Type[] originalArgTypes = originalCtorType.getArgumentTypes();
+        final int argLen = originalArgTypes.length;
+        final Type[] newArgTypes = new Type[argLen + 1];
+
+        // Insert ScriptFunction|ScriptObject as the frontmost argument to the constructor
+        final Type extraArgumentType = fromFunction ? SCRIPT_FUNCTION_TYPE : SCRIPT_OBJECT_TYPE;
+        newArgTypes[0] = extraArgumentType;
+        System.arraycopy(originalArgTypes, 0, newArgTypes, 1, argLen);
+
+        // All constructors must be public, even if in the superclass they were protected.
+        // Existing super constructor <init>(this, args...) triggers generating <init>(this, scriptObj, args...).
+        final InstructionAdapter mv = new InstructionAdapter(cw.visitMethod(ACC_PUBLIC | (ctor.isVarArgs() ?
+                ACC_VARARGS : 0), INIT, Type.getMethodDescriptor(originalCtorType.getReturnType(), newArgTypes),
+                null, null));
+
+        mv.visitCode();
+        // First, invoke super constructor with shifted arguments. If the form of the constructor we're generating is
+        // <init>(this, scriptFn, args...), then we're invoking super.<init>(this, args...).
+        mv.visitVarInsn(ALOAD, 0);
+        final Class<?>[] argTypes = ctor.getParameterTypes();
+        int offset = 2; // First arg is at position 2, after this and scriptFn.
+        for (int i = 0; i < argLen; ++i) {
+            final Type argType = Type.getType(argTypes[i]);
+            mv.load(offset, argType);
+            offset += argType.getSize();
+        }
+        mv.invokespecial(superTypeName, INIT, originalCtorType.getDescriptor());
+
+        // Get a descriptor to the appropriate "JavaAdapterFactory.getHandle" method.
+        final String getHandleDescriptor = fromFunction ? GET_HANDLE_FUNCTION_DESCRIPTOR : GET_HANDLE_OBJECT_DESCRIPTOR;
+
+        // Assign MethodHandle fields through invoking getHandle()
+        for (final MethodInfo mi : methodInfos) {
+            mv.visitVarInsn(ALOAD, 0);
+            if (fromFunction && !mi.getName().equals(samName)) {
+                // Constructors initializing from a ScriptFunction only initialize methods with the SAM name.
+                // NOTE: if there's a concrete overloaded method sharing the SAM name, it'll be overriden too. This
+                // is a deliberate design choice. All other method handles are initialized to null.
+                mv.visitInsn(ACONST_NULL);
+            } else {
+                mv.visitVarInsn(ALOAD, 1);
+                if(!fromFunction) {
+                    mv.aconst(mi.getName());
+                }
+                mv.aconst(Type.getMethodType(mi.type.toMethodDescriptorString()));
+                mv.iconst(mi.method.isVarArgs() ? 1 : 0);
+                mv.invokestatic(THIS_CLASS_TYPE_NAME, "getHandle", getHandleDescriptor);
+            }
+            mv.putfield(generatedTypeName, mi.methodHandleFieldName, METHOD_HANDLE_TYPE_DESCRIPTOR);
+        }
+
+        // Assign "this.global = Context.getGlobal()"
+        mv.visitVarInsn(ALOAD, 0);
+        invokeGetGlobal(mv);
+        mv.dup();
+        mv.invokevirtual(OBJECT_TYPE_NAME, "getClass", GET_CLASS_METHOD_DESCRIPTOR); // check against null Context
+        mv.pop();
+        mv.putfield(generatedTypeName, GLOBAL_FIELD_NAME, SCRIPT_OBJECT_TYPE_DESCRIPTOR);
+
+        // Wrap up
+        mv.visitInsn(RETURN);
+        mv.visitMaxs(0, 0);
+        mv.visitEnd();
+    }
+
+    private static void invokeGetGlobal(final InstructionAdapter mv) {
+        mv.invokestatic(CONTEXT_TYPE_NAME, "getGlobal", GET_GLOBAL_METHOD_DESCRIPTOR);
+    }
+
+    private void invokeSetGlobal(final InstructionAdapter mv) {
+        mv.invokestatic(globalSetterClassName, "setGlobal", SET_GLOBAL_METHOD_DESCRIPTOR);
+    }
+
+    /**
+     * Given a JS script function, binds it to null JS "this", and adapts its parameter types, return types, and arity
+     * to the specified type and arity. This method is public mainly for implementation reasons, so the adapter classes
+     * can invoke it from their constructors that take a ScriptFunction in its first argument to obtain the method
+     * handles for their abstract method implementations.
+     * @param fn the script function
+     * @param type the method type it has to conform to
+     * @param varArg if the Java method for which the function is being adapted is a variable arity method
+     * @return the appropriately adapted method handle for invoking the script function.
+     */
+    public static MethodHandle getHandle(final ScriptFunction fn, final MethodType type, final boolean varArg) {
+        // JS "this" will be null for SAMs
+        return adaptHandle(fn.getBoundInvokeHandle(null), type, varArg);
+    }
+
+    /**
+     * Given a JS script object, retrieves a function from it by name, binds it to the script object as its "this", and
+     * adapts its parameter types, return types, and arity to the specified type and arity. This method is public mainly
+     * for implementation reasons, so the adapter classes can invoke it from their constructors that take a ScriptObject
+     * in its first argument to obtain the method handles for their method implementations.
+     * @param obj the script obj
+     * @param name the name of the property that contains the function
+     * @param type the method type it has to conform to
+     * @param varArg if the Java method for which the function is being adapted is a variable arity method
+     * @return the appropriately adapted method handle for invoking the script function, or null if the value of the
+     * property is either null or undefined, or "toString" was requested as the name, but the object doesn't directly
+     * define it but just inherits it through prototype.
+     */
+    public static MethodHandle getHandle(final ScriptObject obj, final String name, final MethodType type, final boolean varArg) {
+        // Since every JS Object has a toString, we only override "String toString()" it if it's explicitly specified
+        if ("toString".equals(name) && !obj.hasOwnProperty("toString")) {
+            return null;
+        }
+
+        final Object fnObj = obj.get(name);
+        if (fnObj instanceof ScriptFunction) {
+            return adaptHandle(((ScriptFunction)fnObj).getBoundInvokeHandle(obj), type, varArg);
+        } else if(fnObj == null || fnObj instanceof Undefined) {
+            return null;
+        } else {
+            typeError(Context.getGlobal(), "not.a.function", name);
+            throw new AssertionError();
+        }
+    }
+
+    private static MethodHandle adaptHandle(final MethodHandle handle, final MethodType type, final boolean varArg) {
+        return Bootstrap.getLinkerServices().asType(ScriptObject.pairArguments(handle, type, varArg), type);
+    }
+
+    /**
+     * Encapsulation of the information used to generate methods in the adapter classes. Basically, a wrapper around the
+     * reflective Method object, a cached MethodType, and the name of the field in the adapter class that will hold the
+     * method handle serving as the implementation of this method in adapter instances.
+     *
+     */
+    private static class MethodInfo {
+        private final Method method;
+        private final MethodType type;
+        private String methodHandleFieldName;
+
+        private MethodInfo(final Class<?> clazz, final String name, final Class<?>... argTypes) throws NoSuchMethodException {
+            this(clazz.getDeclaredMethod(name, argTypes));
+        }
+
+        private MethodInfo(final Method method) {
+            this.method = method;
+            this.type   = MH.type(method.getReturnType(), method.getParameterTypes());
+        }
+
+        @Override
+        public boolean equals(final Object obj) {
+            return obj instanceof MethodInfo && equals((MethodInfo)obj);
+        }
+
+        private boolean equals(final MethodInfo other) {
+            // Only method name and type are used for comparison; method handle field name is not.
+            return getName().equals(other.getName()) && type.equals(other.type);
+        }
+
+        String getName() {
+            return method.getName();
+        }
+
+        @Override
+        public int hashCode() {
+            return getName().hashCode() ^ type.hashCode();
+        }
+
+        void setIsCanonical(final Set<String> usedFieldNames) {
+            int i = 0;
+            String fieldName = getName();
+            while(!usedFieldNames.add(fieldName)) {
+                fieldName = getName() + (i++);
+            }
+            methodHandleFieldName = fieldName;
+        }
+    }
+
+    private void generateMethods() {
+        for(final MethodInfo mi: methodInfos) {
+            generateMethod(mi);
+        }
+    }
+
+    /**
+     * Generates a method in the adapter class that adapts a method from the original class. The generated methods will
+     * inspect the method handle field assigned to them. If it is null (the JS object doesn't provide an implementation
+     * for the method) then it will either invoke its version in the supertype, or if it is abstract, throw an
+     * {@link UnsupportedOperationException}. Otherwise, if the method handle field's value is not null, the handle is
+     * invoked using invokeExact (signature polymorphic invocation as per JLS 15.12.3). Before the invocation, the
+     * current Nashorn {@link Context} is checked, and if it is different than the global used to create the adapter
+     * instance, the creating global is set to be the current global. In this case, the previously current global is
+     * restored after the invocation. If invokeExact results in a Throwable that is not one of the method's declared
+     * exceptions, and is not an unchecked throwable, then it is wrapped into a {@link RuntimeException} and the runtime
+     * exception is thrown. The method handle retrieved from the field is guaranteed to exactly match the signature of
+     * the method; this is guaranteed by the way constructors of the adapter class obtain them using
+     * {@link #getHandle(ScriptObject, String, MethodType, boolean)}.
+     * @param mi the method info describing the method to be generated.
+     */
+    private void generateMethod(final MethodInfo mi) {
+        final Method method = mi.method;
+        final int mod = method.getModifiers();
+        final int access = ACC_PUBLIC | (method.isVarArgs() ? ACC_VARARGS : 0);
+        final Class<?>[] exceptions = method.getExceptionTypes();
+        final String[] exceptionNames = new String[exceptions.length];
+        for (int i = 0; i < exceptions.length; ++i) {
+            exceptionNames[i] = Type.getInternalName(exceptions[i]);
+        }
+        final MethodType type = mi.type;
+        final String methodDesc = type.toMethodDescriptorString();
+        final String name = mi.getName();
+
+        final Type asmType = Type.getMethodType(methodDesc);
+        final Type[] asmArgTypes = asmType.getArgumentTypes();
+
+        // Determine the first index for a local variable
+        int nextLocalVar = 1; // this
+        for(final Type t: asmArgTypes) {
+            nextLocalVar += t.getSize();
+        }
+
+        final InstructionAdapter mv = new InstructionAdapter(cw.visitMethod(access, name, methodDesc, null,
+                exceptionNames));
+        mv.visitCode();
+
+        final Label methodHandleNotNull = new Label();
+        final Label methodEnd = new Label();
+
+        final Type returnType = Type.getType(type.returnType());
+
+        // Get the method handle
+        mv.visitVarInsn(ALOAD, 0);
+        mv.getfield(generatedTypeName, mi.methodHandleFieldName, METHOD_HANDLE_TYPE_DESCRIPTOR);
+        mv.visitInsn(DUP); // It'll remain on the stack all the way until the invocation
+        // Check if the method handle is null
+        mv.visitJumpInsn(IFNONNULL, methodHandleNotNull);
+        if(Modifier.isAbstract(mod)) {
+            // If it's null, and the method is abstract, throw an exception
+            mv.anew(UNSUPPORTED_OPERATION_TYPE);
+            mv.dup();
+            mv.invokespecial(UNSUPPORTED_OPERATION_TYPE_NAME, INIT, VOID_NOARG);
+            mv.athrow();
+        } else {
+            // If it's null, and the method is not abstract, delegate to super method.
+            mv.visitVarInsn(ALOAD, 0);
+            int nextParam = 1;
+            for(final Type t: asmArgTypes) {
+                mv.load(nextParam, t);
+                nextParam += t.getSize();
+            }
+            mv.invokespecial(superTypeName, name, methodDesc);
+            mv.areturn(returnType);
+        }
+
+        mv.visitLabel(methodHandleNotNull);
+        final int currentGlobalVar = nextLocalVar++;
+        final int globalsDifferVar = nextLocalVar++;
+
+        // Emit code for switching to the creating global
+        // ScriptObject currentGlobal = Context.getGlobal();
+        invokeGetGlobal(mv);
+        mv.dup();
+        mv.visitVarInsn(ASTORE, currentGlobalVar);
+        // if(this.global == currentGlobal) {
+        loadGlobalOnStack(mv);
+        final Label globalsDiffer = new Label();
+        mv.ifacmpne(globalsDiffer);
+        //     globalsDiffer = false
+        mv.iconst(0); // false
+        final Label proceed = new Label();
+        mv.goTo(proceed);
+        mv.visitLabel(globalsDiffer);
+        // } else {
+        //     Context.setGlobal(this.global);
+        loadGlobalOnStack(mv);
+        invokeSetGlobal(mv);
+        //     globalsDiffer = true
+        mv.iconst(1);
+
+        mv.visitLabel(proceed);
+        mv.visitVarInsn(ISTORE, globalsDifferVar);
+
+        // Load all parameters back on stack for dynamic invocation.
+        int varOffset = 1;
+        for (final Type t : asmArgTypes) {
+            mv.load(varOffset, t);
+            varOffset += t.getSize();
+        }
+
+        // Invoke the target method handle
+        final Label tryBlockStart = new Label();
+        mv.visitLabel(tryBlockStart);
+        mv.invokevirtual(METHOD_HANDLE_TYPE.getInternalName(), "invokeExact", type.toMethodDescriptorString());
+        final Label tryBlockEnd = new Label();
+        mv.visitLabel(tryBlockEnd);
+        emitFinally(mv, currentGlobalVar, globalsDifferVar);
+        mv.areturn(returnType);
+
+        // If Throwable is not declared, we need an adapter from Throwable to RuntimeException
+        final boolean throwableDeclared = isThrowableDeclared(exceptions);
+        final Label throwableHandler;
+        if (!throwableDeclared) {
+            // Add "throw new RuntimeException(Throwable)" handler for Throwable
+            throwableHandler = new Label();
+            mv.visitLabel(throwableHandler);
+            mv.anew(RUNTIME_EXCEPTION_TYPE);
+            mv.dupX1();
+            mv.swap();
+            mv.invokespecial(RUNTIME_EXCEPTION_TYPE_NAME, INIT, Type.getMethodDescriptor(Type.VOID_TYPE, THROWABLE_TYPE));
+            // Fall through to rethrow handler
+        } else {
+            throwableHandler = null;
+        }
+        final Label rethrowHandler = new Label();
+        mv.visitLabel(rethrowHandler);
+        // Rethrow handler for RuntimeException, Error, and all declared exception types
+        emitFinally(mv, currentGlobalVar, globalsDifferVar);
+        mv.athrow();
+        mv.visitLabel(methodEnd);
+
+        mv.visitLocalVariable("currentGlobal", SCRIPT_OBJECT_TYPE_DESCRIPTOR, null, methodHandleNotNull, methodEnd, currentGlobalVar);
+        mv.visitLocalVariable("globalsDiffer", Type.INT_TYPE.getDescriptor(), null, methodHandleNotNull, methodEnd, globalsDifferVar);
+
+        if(throwableDeclared) {
+            mv.visitTryCatchBlock(tryBlockStart, tryBlockEnd, rethrowHandler, THROWABLE_TYPE_NAME);
+            assert throwableHandler == null;
+        } else {
+            mv.visitTryCatchBlock(tryBlockStart, tryBlockEnd, rethrowHandler, RUNTIME_EXCEPTION_TYPE_NAME);
+            mv.visitTryCatchBlock(tryBlockStart, tryBlockEnd, rethrowHandler, ERROR_TYPE_NAME);
+            for(final String excName: exceptionNames) {
+                mv.visitTryCatchBlock(tryBlockStart, tryBlockEnd, rethrowHandler, excName);
+            }
+            mv.visitTryCatchBlock(tryBlockStart, tryBlockEnd, throwableHandler, THROWABLE_TYPE_NAME);
+        }
+        mv.visitMaxs(0, 0);
+        mv.visitEnd();
+    }
+
+    /**
+     * Emit code to restore the previous Nashorn Context when needed.
+     * @param mv the instruction adapter
+     * @param currentGlobalVar index of the local variable holding the reference to the current global at method
+     * entry.
+     * @param globalsDifferVar index of the boolean local variable that is true if the global needs to be restored.
+     */
+    private void emitFinally(final InstructionAdapter mv, final int currentGlobalVar, final int globalsDifferVar) {
+        // Emit code to restore the previous Nashorn global if needed
+        mv.visitVarInsn(ILOAD, globalsDifferVar);
+        final Label skip = new Label();
+        mv.ifeq(skip);
+        mv.visitVarInsn(ALOAD, currentGlobalVar);
+        invokeSetGlobal(mv);
+        mv.visitLabel(skip);
+    }
+
+    private void loadGlobalOnStack(final InstructionAdapter mv) {
+        mv.visitVarInsn(ALOAD, 0);
+        mv.getfield(generatedTypeName, GLOBAL_FIELD_NAME, SCRIPT_OBJECT_TYPE_DESCRIPTOR);
+    }
+
+    private static boolean isThrowableDeclared(final Class<?>[] exceptions) {
+        for (final Class<?> exception : exceptions) {
+            if (exception == Throwable.class) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Gathers methods that can be implemented or overridden from the specified type into this factory's
+     * {@link #methodInfos} set. It will add all non-final, non-static methods that are either public or protected from
+     * the type if the type itself is public. If the type is a class, the method will recursively invoke itself for its
+     * superclass and the interfaces it implements, and add further methods that were not directly declared on the
+     * class.
+     * @param type the type defining the methods.
+     */
+    private void gatherMethods(final Class<?> type) {
+        if (Modifier.isPublic(type.getModifiers())) {
+            final Method[] typeMethods = type.isInterface() ? type.getMethods() : type.getDeclaredMethods();
+
+            for (final Method typeMethod: typeMethods) {
+                final int m = typeMethod.getModifiers();
+                if (Modifier.isStatic(m)) {
+                    continue;
+                }
+                if (Modifier.isPublic(m) || Modifier.isProtected(m)) {
+                    final MethodInfo mi = new MethodInfo(typeMethod);
+                    if (Modifier.isFinal(m)) {
+                        finalMethods.add(mi);
+                    } else if (!finalMethods.contains(mi) && methodInfos.add(mi)) {
+                        if (Modifier.isAbstract(m)) {
+                            abstractMethodNames.add(mi.getName());
+                        }
+                        mi.setIsCanonical (usedFieldNames);
+                    }
+                }
+            }
+        }
+        // If the type is a class, visit its superclasses and declared interfaces. If it's an interface, we're done.
+        // Needing to invoke the method recursively for a non-interface Class object is the consequence of needing to
+        // see all declared protected methods, and Class.getDeclaredMethods() doesn't provide those declared in a
+        // superclass. For interfaces, we used Class.getMethods(), as we're only interested in public ones there, and
+        // getMethods() does provide those declared in a superinterface.
+        if (!type.isInterface()) {
+            final Class<?> superClass = type.getSuperclass();
+            if (superClass != null) {
+                gatherMethods(superClass);
+            }
+            for (final Class<?> itf: type.getInterfaces()) {
+                gatherMethods(itf);
+            }
+        }
+    }
+
+    /**
+     * Creates a collection of methods that are not final, but we still never allow them to be overridden in adapters,
+     * as explicitly declaring them automatically is a bad idea. Currently, this means {@code Object.finalize()} and
+     * {@code Object.clone()}.
+     * @return a collection of method infos representing those methods that we never override in adapter classes.
+     */
+    private static Collection<MethodInfo> getExcludedMethods() {
+        return AccessController.doPrivileged(new PrivilegedAction<Collection<MethodInfo>>() {
+            @Override
+            public Collection<MethodInfo> run() {
+                try {
+                    return Arrays.asList(
+                            new MethodInfo(Object.class, "finalize"),
+                            new MethodInfo(Object.class, "clone"));
+                } catch (final NoSuchMethodException e) {
+                    throw new AssertionError(e);
+                }
+            }
+        });
+    }
+
+    private static ProtectionDomain createGeneratedProtectionDomain() {
+        // Generated classes need to have AllPermission. Since we require the "createClassLoader" RuntimePermission, we
+        // can create a class loader that'll load new classes with any permissions. Our generated classes are just
+        // delegating adapters, so having AllPermission can't cause anything wrong; the effective set of permissions for
+        // the executing script functions will still be limited by the permissions of the caller and the permissions of
+        // the script.
+        final Permissions permissions = new Permissions();
+        permissions.add(new AllPermission());
+        return new ProtectionDomain(new CodeSource(null, (CodeSigner[])null), permissions);
+    }
+
+    private static class AdapterInfo {
+        final StaticClass adapterClass;
+        final boolean autoConvertibleFromFunction;
+        final AdaptationOutcome adaptationOutcome;
+
+        AdapterInfo(final StaticClass adapterClass, final boolean autoConvertibleFromFunction) {
+            this.adapterClass = adapterClass;
+            this.autoConvertibleFromFunction = autoConvertibleFromFunction;
+            this.adaptationOutcome = AdaptationOutcome.SUCCESS;
+        }
+
+        AdapterInfo(final AdaptationOutcome outcome) {
+            this.adapterClass = null;
+            this.autoConvertibleFromFunction = false;
+            this.adaptationOutcome = outcome;
+        }
+    }
+
+    /**
+     * For a given class, create its adapter class and associated info.
+     * @param type the class for which the adapter is created
+     * @return the adapter info for the class.
+     */
+    private static AdapterInfo createAdapterInfo(final Class<?> type) {
+        final int mod = type.getModifiers();
+        if (Modifier.isFinal(mod)) {
+            return new AdapterInfo(AdaptationOutcome.ERROR_FINAL_CLASS);
+        }
+        if (!Modifier.isPublic(mod)) {
+            return new AdapterInfo(AdaptationOutcome.ERROR_NON_PUBLIC_CLASS);
+        }
+        return AccessController.doPrivileged(new PrivilegedAction<AdapterInfo>() {
+            @Override
+            public AdapterInfo run() {
+                try {
+                    final JavaAdapterFactory factory = new JavaAdapterFactory(type);
+                    return new AdapterInfo(StaticClass.forClass(factory.generateClass()),
+                            factory.isAutoConvertibleFromFunction());
+                } catch (final AdaptationException e) {
+                    return new AdapterInfo(e.outcome);
+                }
+            }
+        });
+    }
+
+    @SuppressWarnings("serial")
+    private static class AdaptationException extends Exception {
+        private final AdaptationOutcome outcome;
+        AdaptationException(final AdaptationOutcome outcome) {
+            this.outcome = outcome;
+        }
+    }
+
+    private String getCommonSuperClass(final String type1, final String type2) {
+        try {
+            final Class<?> c1 = Class.forName(type1.replace('/', '.'), false, commonLoader);
+            final Class<?> c2 = Class.forName(type2.replace('/', '.'), false, commonLoader);
+            if (c1.isAssignableFrom(c2)) {
+                return type1;
+            }
+            if (c2.isAssignableFrom(c1)) {
+                return type2;
+            }
+            if (c1.isInterface() || c2.isInterface()) {
+                return "java/lang/Object";
+            }
+            return assignableSuperClass(c1, c2).getName().replace('.', '/');
+        } catch(final ClassNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private static Class<?> assignableSuperClass(final Class<?> c1, final Class<?> c2) {
+        final Class<?> superClass = c1.getSuperclass();
+        return superClass.isAssignableFrom(c2) ? superClass : assignableSuperClass(superClass, c2);
+    }
+
+    /**
+     * Finds a class loader that sees both the specified class and Nashorn classes.
+     * @param clazz the class that needs to be visible from the found class loader.
+     * @return the class loader that sees both the specified class and Nashorn classes.
+     * @throws IllegalStateException if no such class loader is found.
+     */
+    private static ClassLoader findCommonLoader(final Class<?> clazz) {
+        final ClassLoader clazzLoader = clazz.getClassLoader();
+        if (canSeeClass(clazzLoader, ScriptObject.class)) {
+            return clazzLoader;
+        }
+
+        final ClassLoader nashornLoader = ScriptObject.class.getClassLoader();
+        if(canSeeClass(nashornLoader, clazz)) {
+            return nashornLoader;
+        }
+
+        throw new IllegalStateException("Can't find a common class loader for ScriptObject and " +
+                    clazz.getName());
+    }
+
+    private static boolean canSeeClass(final ClassLoader cl, final Class<?> clazz) {
+        try {
+            return Class.forName(clazz.getName(), false, cl) == clazz;
+        } catch (final ClassNotFoundException e) {
+            return false;
+        }
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java
new file mode 100644
index 00000000000..03ad5dae6f0
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java
@@ -0,0 +1,302 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.linker;
+
+import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.util.HashMap;
+import java.util.Map;
+import jdk.nashorn.internal.runtime.ConsString;
+import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import org.dynalang.dynalink.support.TypeUtilities;
+
+/**
+ * Utility class shared by {@link NashornLinker} and {@code NashornPrimitiveLinker} for converting JS values to Java
+ * types.
+ */
+public class JavaArgumentConverters {
+
+    private static final MethodHandle TO_BOOLEAN        = findOwnMH("toBoolean", Boolean.class, Object.class);
+    private static final MethodHandle TO_STRING         = findOwnMH("toString", String.class, Object.class);
+    private static final MethodHandle TO_DOUBLE         = findOwnMH("toDouble", Double.class, Object.class);
+    private static final MethodHandle TO_NUMBER         = findOwnMH("toNumber", Number.class, Object.class);
+    private static final MethodHandle TO_LONG           = findOwnMH("toLong", Long.class, Object.class);
+    private static final MethodHandle TO_LONG_PRIMITIVE = findOwnMH("toLongPrimitive", long.class, Object.class);
+    private static final MethodHandle TO_CHAR           = findOwnMH("toChar", Character.class, Object.class);
+    private static final MethodHandle TO_CHAR_PRIMITIVE = findOwnMH("toCharPrimitive", char.class, Object.class);
+
+    private JavaArgumentConverters() {
+    }
+
+    static MethodHandle getConverter(final Class<?> targetType) {
+        return CONVERTERS.get(targetType);
+    }
+
+    @SuppressWarnings("unused")
+    private static Boolean toBoolean(final Object obj) {
+        if (obj instanceof Boolean) {
+            return (Boolean) obj;
+        }
+
+        if (obj == null) {
+            // NOTE: FindBugs complains here about the NP_BOOLEAN_RETURN_NULL pattern: we're returning null from a
+            // method that has a return type of Boolean, as it is worried about a NullPointerException if there's a
+            // conversion to a primitive boolean. We know what we're doing, though. We're using a separate method when
+            // we're converting Object to a primitive boolean - see how the CONVERTERS map is populated. We specifically
+            // want to have null and Undefined to be converted to a (Boolean)null when being passed to a Java method
+            // that expects a Boolean argument.
+            // TODO: if/when we're allowed to use FindBugs at build time, we can use annotations to disable this warning
+            return null;
+        }
+
+        if (obj == UNDEFINED) {
+            // NOTE: same reasoning for FindBugs NP_BOOLEAN_RETURN_NUL warning as in the preceding comment.
+            return null;
+        }
+
+        if (obj instanceof Number) {
+            final double num = ((Number) obj).doubleValue();
+            return num != 0 && !Double.isNaN(num);
+        }
+
+        if (obj instanceof String || obj instanceof ConsString) {
+            return ((CharSequence) obj).length() > 0;
+        }
+
+        if (obj instanceof ScriptObject) {
+            return true;
+        }
+
+        throw assertUnexpectedType(obj);
+    }
+
+    private static Character toChar(final Object o) {
+        if (o == null) {
+            return null;
+        }
+
+        if (o instanceof Number) {
+            final int ival = ((Number)o).intValue();
+            if (ival >= Character.MIN_VALUE && ival <= Character.MAX_VALUE) {
+                return Character.valueOf((char) ival);
+            }
+
+            typeError(Context.getGlobal(), "cant.convert.number.to.char");
+        }
+
+        final String s = toString(o);
+        if (s == null) {
+            return null;
+        }
+
+        if (s.length() != 1) {
+            typeError(Context.getGlobal(), "cant.convert.string.to.char");
+        }
+
+        return s.charAt(0);
+    }
+
+    @SuppressWarnings("unused")
+    private static char toCharPrimitive(final Object obj0) {
+        final Character c = toChar(obj0);
+        return c == null ? (char)0 : c;
+    }
+
+    // Almost identical to ScriptRuntime.toString, but doesn't handle StaticClass specially, and it returns null for
+    // null instead of the string "null".
+    private static String toString(final Object obj0) {
+        for (Object obj = obj0; ;) {
+            if (obj == null) {
+                return null;
+            } else if (obj instanceof String) {
+                return (String) obj;
+            } else if (obj instanceof ConsString) {
+                return obj.toString();
+            } else if (obj instanceof Number) {
+                return JSType.toString(((Number)obj).doubleValue());
+            } else if (obj instanceof Boolean) {
+                return ((Boolean) obj).toString();
+            } else if (obj == UNDEFINED) {
+                return "undefined";
+            } else if (obj instanceof ScriptObject) {
+                obj = JSType.toPrimitive(obj, String.class);
+                continue;
+            }
+            throw assertUnexpectedType(obj);
+        }
+    }
+
+    @SuppressWarnings("unused")
+    private static Double toDouble(final Object obj0) {
+        // TODO - Order tests for performance.
+        for (Object obj = obj0; ;) {
+            if (obj == null) {
+                return null;
+            } else if (obj instanceof Double) {
+                return (Double) obj;
+            } else if (obj instanceof Number) {
+                return ((Number)obj).doubleValue();
+            } else if (obj instanceof String) {
+                return JSType.toNumber((String) obj);
+            } else if (obj instanceof ConsString) {
+                return JSType.toNumber(obj.toString());
+            } else if (obj instanceof Boolean) {
+                return (Boolean) obj ? 1 : +0.0;
+            } else if (obj instanceof ScriptObject) {
+                obj = JSType.toPrimitive(obj, Number.class);
+                continue;
+            } else if (obj == UNDEFINED) {
+                return Double.NaN;
+            }
+            throw assertUnexpectedType(obj);
+        }
+    }
+
+    @SuppressWarnings("unused")
+    private static Number toNumber(final Object obj0) {
+        // TODO - Order tests for performance.
+        for (Object obj = obj0; ;) {
+            if (obj == null) {
+                return null;
+            } else if (obj instanceof Number) {
+                return (Number) obj;
+            } else if (obj instanceof String) {
+                return JSType.toNumber((String) obj);
+            } else if (obj instanceof ConsString) {
+                return JSType.toNumber(obj.toString());
+            } else if (obj instanceof Boolean) {
+                return (Boolean) obj ? 1 : +0.0;
+            } else if (obj instanceof ScriptObject) {
+                obj = JSType.toPrimitive(obj, Number.class);
+                continue;
+            } else if (obj == UNDEFINED) {
+                return Double.NaN;
+            }
+            throw assertUnexpectedType(obj);
+        }
+    }
+
+    private static Long toLong(final Object obj0) {
+        // TODO - Order tests for performance.
+        for (Object obj = obj0; ;) {
+            if (obj == null) {
+                return null;
+            } else if (obj instanceof Long) {
+                return (Long) obj;
+            } else if (obj instanceof Number) {
+                return ((Number)obj).longValue();
+            } else if (obj instanceof String || obj instanceof ConsString) {
+                return JSType.toLong(obj);
+            } else if (obj instanceof Boolean) {
+                return (Boolean)obj ? 1L : 0L;
+            } else if (obj instanceof ScriptObject) {
+                obj = JSType.toPrimitive(obj, Number.class);
+                continue;
+            } else if (obj == UNDEFINED) {
+                return null; // null or 0L?
+            }
+            throw assertUnexpectedType(obj);
+        }
+    }
+
+    private static AssertionError assertUnexpectedType(final Object obj) {
+        return new AssertionError("Unexpected type" + obj.getClass().getName() + ". Guards should have prevented this");
+    }
+
+    @SuppressWarnings("unused")
+    private static long toLongPrimitive(final Object obj0) {
+        final Long l = toLong(obj0);
+        return l == null ? 0L : l;
+    }
+
+    private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
+        return MH.findStatic(MethodHandles.lookup(), JavaArgumentConverters.class, name, MH.type(rtype, types));
+    }
+
+    private static final Map<Class<?>, MethodHandle> CONVERTERS = new HashMap<>();
+
+    static {
+        CONVERTERS.put(Number.class, TO_NUMBER);
+        CONVERTERS.put(String.class, TO_STRING);
+
+        CONVERTERS.put(boolean.class, JSType.TO_BOOLEAN.methodHandle());
+        CONVERTERS.put(Boolean.class, TO_BOOLEAN);
+
+        CONVERTERS.put(char.class, TO_CHAR_PRIMITIVE);
+        CONVERTERS.put(Character.class, TO_CHAR);
+
+        CONVERTERS.put(double.class, JSType.TO_NUMBER.methodHandle());
+        CONVERTERS.put(Double.class, TO_DOUBLE);
+
+        CONVERTERS.put(long.class, TO_LONG_PRIMITIVE);
+        CONVERTERS.put(Long.class, TO_LONG);
+
+        putLongConverter(Byte.class);
+        putLongConverter(Short.class);
+        putLongConverter(Integer.class);
+        putDoubleConverter(Float.class);
+
+    }
+
+    private static void putDoubleConverter(final Class<?> targetType) {
+        final Class<?> primitive = TypeUtilities.getPrimitiveType(targetType);
+        CONVERTERS.put(primitive,  MH.explicitCastArguments(JSType.TO_NUMBER.methodHandle(), JSType.TO_NUMBER.methodHandle().type().changeReturnType(primitive)));
+        CONVERTERS.put(targetType, MH.filterReturnValue(TO_DOUBLE, findOwnMH(primitive.getName() + "Value", targetType, Double.class)));
+    }
+
+    private static void putLongConverter(final Class<?> targetType) {
+        final Class<?> primitive = TypeUtilities.getPrimitiveType(targetType);
+        CONVERTERS.put(primitive,  MH.explicitCastArguments(TO_LONG_PRIMITIVE, TO_LONG_PRIMITIVE.type().changeReturnType(primitive)));
+        CONVERTERS.put(targetType, MH.filterReturnValue(TO_LONG, findOwnMH(primitive.getName() + "Value", targetType, Long.class)));
+    }
+
+    @SuppressWarnings("unused")
+    private static Byte byteValue(final Long l) {
+        return l == null ? null : l.byteValue();
+    }
+
+    @SuppressWarnings("unused")
+    private static Short shortValue(final Long l) {
+        return l == null ? null : l.shortValue();
+    }
+
+    @SuppressWarnings("unused")
+    private static Integer intValue(final Long l) {
+        return l == null ? null : l.intValue();
+    }
+
+    @SuppressWarnings("unused")
+    private static Float floatValue(final Double d) {
+        return d == null ? null : d.floatValue();
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java
new file mode 100644
index 00000000000..5f88f53a15e
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java
@@ -0,0 +1,540 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.linker;
+
+import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Random;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.runtime.Debug;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
+import jdk.nashorn.internal.runtime.options.Options;
+import org.dynalang.dynalink.ChainedCallSite;
+import org.dynalang.dynalink.DynamicLinker;
+import org.dynalang.dynalink.linker.GuardedInvocation;
+
+
+/**
+ * Relinkable form of call site.
+ */
+public class LinkerCallSite extends ChainedCallSite {
+    /** Maximum number of arguments passed directly. */
+    public static final int ARGLIMIT = 250;
+
+    private static final String PROFILEFILE = Options.getStringProperty("nashorn.profilefile", "NashornProfile.txt");
+
+    private static final MethodHandle INCREASE_MISS_COUNTER = findOwnMH("increaseMissCount", Object.class, String.class, Object.class);
+
+    LinkerCallSite(final NashornCallSiteDescriptor descriptor) {
+        super(descriptor);
+        if (Context.DEBUG) {
+            LinkerCallSite.count++;
+        }
+    }
+
+    /**
+     * Construct a new linker call site.
+     * @param name     Name of method.
+     * @param type     Method type.
+     * @param flags    Call site specific flags.
+     * @return New LinkerCallSite.
+     */
+    static LinkerCallSite newLinkerCallSite(final String name, final MethodType type, final int flags) {
+        final NashornCallSiteDescriptor desc = NashornCallSiteDescriptor.get(name, type, flags);
+
+        if (desc.isProfile()) {
+            return ProfilingLinkerCallSite.newProfilingLinkerCallSite(desc);
+        }
+
+        if (desc.isTrace()) {
+            return new TracingLinkerCallSite(desc);
+        }
+
+        return new LinkerCallSite(desc);
+    }
+
+    @Override
+    public String toString() {
+        return getDescriptor().toString();
+    }
+
+    /**
+     * Get the descriptor for this callsite
+     * @return a {@link NashornCallSiteDescriptor}
+     */
+    public NashornCallSiteDescriptor getNashornDescriptor() {
+        return (NashornCallSiteDescriptor)getDescriptor();
+    }
+
+    @Override
+    public void relink(final GuardedInvocation invocation, final MethodHandle relink) {
+        super.relink(invocation, getDebuggingRelink(relink));
+    }
+
+    @Override
+    public void resetAndRelink(final GuardedInvocation invocation, final MethodHandle relink) {
+        super.resetAndRelink(invocation, getDebuggingRelink(relink));
+    }
+
+    private MethodHandle getDebuggingRelink(final MethodHandle relink) {
+        if (Context.DEBUG) {
+            return MH.filterArguments(relink, 0, getIncreaseMissCounter(relink.type().parameterType(0)));
+        }
+        return relink;
+    }
+
+    private MethodHandle getIncreaseMissCounter(final Class<?> type) {
+        final MethodHandle missCounterWithDesc = MH.bindTo(INCREASE_MISS_COUNTER, getDescriptor().getName() + " @ " + getScriptLocation());
+        if (type == Object.class) {
+            return missCounterWithDesc;
+        }
+        return MH.asType(missCounterWithDesc, missCounterWithDesc.type().changeParameterType(0, type).changeReturnType(type));
+    }
+
+    private static String getScriptLocation() {
+        final StackTraceElement caller = DynamicLinker.getRelinkedCallSiteLocation();
+        return caller == null ? "unknown location" : (caller.getFileName() + ":" + caller.getLineNumber());
+    }
+
+    /**
+     * Instrumentation - increase the miss count when a callsite misses. Used as filter
+     * @param desc descriptor for table entry
+     * @param self self reference
+     * @return self reference
+     */
+    public static Object increaseMissCount(final String desc, final Object self) {
+        ++missCount;
+        if(r.nextInt(100) < missSamplingPercentage) {
+            AtomicInteger i = missCounts.get(desc);
+            if(i == null) {
+                i = new AtomicInteger(1);
+                missCounts.put(desc, i);
+            } else {
+                i.incrementAndGet();
+            }
+        }
+        return self;
+    }
+
+    private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
+        try {
+            return MH.findStatic(MethodHandles.lookup(), LinkerCallSite.class, name, MH.type(rtype, types));
+        } catch (final MethodHandleFactory.LookupException e) {
+            return MH.findVirtual(MethodHandles.lookup(), LinkerCallSite.class, name, MH.type(rtype, types));
+        }
+    }
+
+    /*
+     * Debugging call sites.
+     */
+
+    private static class ProfilingLinkerCallSite extends LinkerCallSite {
+        /** List of all profiled call sites. */
+        private static LinkedList<ProfilingLinkerCallSite> profileCallSites = null;
+
+        /** Start time when entered at zero depth. */
+        private long startTime;
+
+        /** Depth of nested calls. */
+        private int depth;
+
+        /** Total time spent in this call site. */
+        private long totalTime;
+
+        /** Total number of times call site entered. */
+        private long hitCount;
+
+        private static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup();
+
+        private static final MethodHandle PROFILEENTRY    = MH.findVirtual(LOOKUP, ProfilingLinkerCallSite.class, "profileEntry",    MH.type(Object.class, Object.class));
+        private static final MethodHandle PROFILEEXIT     = MH.findVirtual(LOOKUP, ProfilingLinkerCallSite.class, "profileExit",     MH.type(Object.class, Object.class));
+        private static final MethodHandle PROFILEVOIDEXIT = MH.findVirtual(LOOKUP, ProfilingLinkerCallSite.class, "profileVoidExit", MH.type(void.class));
+
+        /*
+         * Constructor
+         */
+
+        ProfilingLinkerCallSite(final NashornCallSiteDescriptor desc) {
+           super(desc);
+        }
+
+        public static ProfilingLinkerCallSite newProfilingLinkerCallSite(final NashornCallSiteDescriptor desc) {
+            if (profileCallSites == null) {
+                profileCallSites = new LinkedList<>();
+
+                final Thread profileDumperThread = new Thread(new ProfileDumper());
+                Runtime.getRuntime().addShutdownHook(profileDumperThread);
+            }
+
+            final ProfilingLinkerCallSite callSite = new ProfilingLinkerCallSite(desc);
+            profileCallSites.add(callSite);
+
+            return callSite;
+        }
+
+        @Override
+        public void setTarget(final MethodHandle newTarget) {
+            final MethodType type   = type();
+            final boolean    isVoid = type.returnType() == void.class;
+
+            MethodHandle methodHandle = MH.filterArguments(newTarget, 0, MH.bindTo(PROFILEENTRY, this));
+
+            if (isVoid) {
+                methodHandle = MH.filterReturnValue(methodHandle, MH.bindTo(PROFILEVOIDEXIT, this));
+            } else {
+                final MethodType filter = MH.type(type.returnType(), type.returnType());
+                methodHandle = MH.filterReturnValue(methodHandle, MH.asType(MH.bindTo(PROFILEEXIT, this), filter));
+            }
+
+            super.setTarget(methodHandle);
+        }
+
+        /**
+         * Start the clock for a profile entry and increase depth
+         * @param self argument to filter
+         * @return preserved argument
+         */
+        @SuppressWarnings("unused")
+        public Object profileEntry(final Object self) {
+            if (depth == 0) {
+                startTime = System.nanoTime();
+            }
+
+            depth++;
+            hitCount++;
+
+            return self;
+        }
+
+        /**
+         * Decrease depth and stop the clock for a profile entry
+         * @param result return value to filter
+         * @return preserved argument
+         */
+        @SuppressWarnings("unused")
+        public Object profileExit(final Object result) {
+            depth--;
+
+            if (depth == 0) {
+                totalTime += System.nanoTime() - startTime;
+            }
+
+            return result;
+        }
+
+        /**
+         * Decrease depth without return value filter
+         */
+        @SuppressWarnings("unused")
+        public void profileVoidExit() {
+            depth--;
+
+            if (depth == 0) {
+                totalTime += System.nanoTime() - startTime;
+            }
+        }
+
+        static class ProfileDumper implements Runnable {
+            @Override
+            public void run() {
+                OutputStream out;
+
+                try {
+                    out = new FileOutputStream(PROFILEFILE);
+                } catch (final FileNotFoundException e) {
+                    out = new PrintStream(System.err); //TODO abstraction break- why is this hard coded to System.err when everything else uses the context
+                }
+
+                try (PrintStream stream = new PrintStream(out)) {
+                    int index = 0;
+                    for (final ProfilingLinkerCallSite callSite : profileCallSites) {
+                       stream.println("" + (index++) + '\t' +
+                                      callSite.getDescriptor().getName() + '\t' +
+                                      callSite.totalTime + '\t' +
+                                      callSite.hitCount);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Debug subclass for LinkerCallSite that allows tracing
+     */
+    private static class TracingLinkerCallSite extends LinkerCallSite {
+
+        private static final MethodHandle TRACEOBJECT = findOwnMH("traceObject", Object.class, MethodHandle.class, Object[].class);
+        private static final MethodHandle TRACEVOID   = findOwnMH("traceVoid", void.class, MethodHandle.class, Object[].class);
+        private static final MethodHandle TRACEMISS   = findOwnMH("traceMiss", void.class, Object[].class);
+
+        private static final PrintStream out = System.err; //TODO abstraction break- why is this hard coded to System.err when everything else uses the context
+
+        /*
+         * Constructor
+         */
+
+        TracingLinkerCallSite(final NashornCallSiteDescriptor desc) {
+           super(desc);
+        }
+
+        @Override
+        public void setTarget(final MethodHandle newTarget) {
+            if (!getNashornDescriptor().isTraceEnterExit()) {
+                super.setTarget(newTarget);
+                return;
+            }
+
+            final MethodType type = type();
+            final boolean isVoid = type.returnType() == void.class;
+
+            MethodHandle traceMethodHandle = isVoid ? TRACEVOID : TRACEOBJECT;
+            traceMethodHandle = MH.bindTo(traceMethodHandle, this);
+            traceMethodHandle = MH.bindTo(traceMethodHandle, newTarget);
+            traceMethodHandle = MH.asCollector(traceMethodHandle, Object[].class, type.parameterCount());
+            traceMethodHandle = MH.asType(traceMethodHandle, type);
+
+            super.setTarget(traceMethodHandle);
+        }
+
+        @Override
+        public void initialize(final MethodHandle relinkAndInvoke) {
+            super.initialize(getFallbackLoggingRelink(relinkAndInvoke));
+        }
+
+        @Override
+        public void relink(final GuardedInvocation invocation, final MethodHandle relink) {
+            super.relink(invocation, getFallbackLoggingRelink(relink));
+        }
+
+        @Override
+        public void resetAndRelink(final GuardedInvocation invocation, final MethodHandle relink) {
+            super.resetAndRelink(invocation, getFallbackLoggingRelink(relink));
+        }
+
+        private MethodHandle getFallbackLoggingRelink(final MethodHandle relink) {
+            if (!getNashornDescriptor().isTraceMisses()) {
+                // If we aren't tracing misses, just return relink as-is
+                return relink;
+            }
+            final MethodType type = relink.type();
+            return MH.foldArguments(relink, MH.asType(MH.asCollector(MH.bindTo(TRACEMISS, this), Object[].class, type.parameterCount()), type.changeReturnType(void.class)));
+        }
+
+        private void printObject(final Object arg) {
+            if (!getNashornDescriptor().isTraceObjects()) {
+                out.print((arg instanceof ScriptObject) ? "ScriptObject" : arg);
+                return;
+            }
+
+            if (arg instanceof ScriptObject) {
+                final ScriptObject object = (ScriptObject)arg;
+
+                boolean isFirst = true;
+                final Set<Object> keySet = object.keySet();
+
+                if (keySet.isEmpty()) {
+                    out.print(ScriptRuntime.safeToString(arg));
+                } else {
+                    out.print("{ ");
+
+                    for (final Object key : keySet) {
+                        if (!isFirst) {
+                            out.print(", ");
+                        }
+
+                        out.print(key);
+                        out.print(":");
+
+                        final Object value = object.get(key);
+
+                        if (value instanceof ScriptObject) {
+                            out.print("...");
+                        } else {
+                            printObject(value);
+                        }
+
+                        isFirst = false;
+                    }
+
+                    out.print(" }");
+                }
+             } else {
+                out.print(ScriptRuntime.safeToString(arg));
+            }
+        }
+
+        private void tracePrint(final String tag, final Object[] args, final Object result) {
+            //boolean isVoid = type().returnType() == void.class;
+            out.print(Debug.id(this) + " TAG " + tag);
+            out.print(getDescriptor().getName() + "(");
+
+            if (args.length > 0) {
+                printObject(args[0]);
+                for (int i = 1; i < args.length; i++) {
+                    final Object arg = args[i];
+                    out.print(", ");
+
+                    if (getNashornDescriptor().isTraceScope() || !(arg instanceof ScriptObject && ((ScriptObject)arg).isScope())) {
+                        printObject(arg);
+                    } else {
+                        out.print("SCOPE");
+                    }
+                }
+            }
+
+            out.print(")");
+
+            if (tag.equals("EXIT  ")) {
+                out.print(" --> ");
+                printObject(result);
+            }
+
+            out.println();
+        }
+
+        /**
+         * Trace event. Wrap an invocation with a return value
+         *
+         * @param mh     invocation handle
+         * @param args   arguments to call
+         *
+         * @return return value from invocation
+         *
+         * @throws Throwable if invocation fails or throws exception/error
+         */
+        @SuppressWarnings("unused")
+        public Object traceObject(final MethodHandle mh, final Object... args) throws Throwable {
+            tracePrint("ENTER ", args, null);
+            final Object result = mh.invokeWithArguments(args);
+            tracePrint("EXIT  ", args, result);
+
+            return result;
+        }
+
+        /**
+         * Trace event. Wrap an invocation that returns void
+         *
+         * @param mh     invocation handle
+         * @param args   arguments to call
+         *
+         * @throws Throwable if invocation fails or throws exception/error
+         */
+        @SuppressWarnings("unused")
+        public void traceVoid(final MethodHandle mh, final Object... args) throws Throwable {
+            tracePrint("ENTER ", args, null);
+            mh.invokeWithArguments(args);
+            tracePrint("EXIT  ", args, null);
+        }
+
+        /**
+         * Tracer function that logs a callsite miss
+         *
+         * @param args arguments to function
+         *
+         * @throws Throwable if invocation failes or throws exception/error
+         */
+        @SuppressWarnings("unused")
+        public void traceMiss(final Object... args) throws Throwable {
+            tracePrint("MISS ", args, null);
+        }
+
+        private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
+            try {
+                return MH.findStatic(MethodHandles.lookup(), TracingLinkerCallSite.class, name, MH.type(rtype, types));
+            } catch (final MethodHandleFactory.LookupException e) {
+                return MH.findVirtual(MethodHandles.lookup(), TracingLinkerCallSite.class, name, MH.type(rtype, types));
+            }
+        }
+    }
+
+    // counters updated in debug mode
+    private static int count;
+    private static final HashMap<String, AtomicInteger> missCounts = new HashMap<>();
+    private static int missCount;
+    private static final Random r = new Random();
+    private static final int missSamplingPercentage = Options.getIntProperty("nashorn.tcs.miss.samplePercent", 1);
+
+    /**
+     * Get the callsite count
+     * @return the count
+     */
+    public static int getCount() {
+        return count;
+    }
+
+    /**
+     * Get the callsite miss count
+     * @return the missCount
+     */
+    public static int getMissCount() {
+        return missCount;
+    }
+
+    /**
+     * Get given miss sampling percentage for sampler. Default is 1%. Specified with -Dnashorn.tcs.miss.samplePercent=x
+     * @return miss sampling percentage
+     */
+    public static int getMissSamplingPercentage() {
+        return missSamplingPercentage;
+    }
+
+    /**
+     * Dump the miss counts collected so far to a given output stream
+     * @param out print stream
+     */
+    public static void getMissCounts(final PrintStream out) {
+        final ArrayList<Entry<String, AtomicInteger>> entries = new ArrayList<>(missCounts.entrySet());
+
+        Collections.sort(entries, new Comparator<Map.Entry<String, AtomicInteger>>() {
+            @Override
+            public int compare(final Entry<String, AtomicInteger> o1, final Entry<String, AtomicInteger> o2) {
+                return o2.getValue().get() - o1.getValue().get();
+            }
+        });
+
+        for (final Entry<String, AtomicInteger> entry : entries) {
+            out.println("  " + entry.getKey() + "\t" + entry.getValue().get());
+        }
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/Lookup.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/Lookup.java
new file mode 100644
index 00000000000..9055aafa9c9
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/Lookup.java
@@ -0,0 +1,214 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.linker;
+
+import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.Property;
+import jdk.nashorn.internal.runtime.PropertyMap;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
+
+/**
+ * MethodHandle Lookup management for Nashorn.
+ */
+public final class Lookup {
+
+    /**
+     * A global singleton that points to the {@link MethodHandleFunctionality}. This is basically
+     * a collection of wrappers to the standard methods in {@link MethodHandle}, {@link MethodHandles} and
+     * {@link java.lang.invoke.MethodHandles.Lookup}, but instrumentation and debugging purposes we need
+     * intercept points.
+     * <p>
+     * All method handle operations in Nashorn should go through this field, not directly to the classes
+     * in {@code java.lang.invoke}
+     */
+    public static final MethodHandleFunctionality MH = MethodHandleFactory.getFunctionality();
+
+    /** Method handle to the empty getter */
+    public static final MethodHandle EMPTY_GETTER = findOwnMH("emptyGetter", Object.class, Object.class);
+
+    /** Method handle to the empty setter */
+    public static final MethodHandle EMPTY_SETTER = findOwnMH("emptySetter", void.class, Object.class, Object.class);
+
+    /** Method handle to a getter that only throws type error */
+    public static final MethodHandle TYPE_ERROR_THROWER_GETTER = findOwnMH("typeErrorThrowerGetter", Object.class, Object.class);
+
+    /** Method handle to a setter that only throws type error */
+    public static final MethodHandle TYPE_ERROR_THROWER_SETTER = findOwnMH("typeErrorThrowerSetter", void.class, Object.class, Object.class);
+
+    /** Method handle to the most generic of getters, the one that returns an Object */
+    public static final MethodType GET_OBJECT_TYPE = MH.type(Object.class, Object.class);
+
+    /** Method handle to the most generic of setters, the one that takes an Object */
+    public static final MethodType SET_OBJECT_TYPE = MH.type(void.class, Object.class, Object.class);
+
+    private Lookup() {
+    }
+
+    /**
+     * Empty getter implementation. Nop
+     * @param self self reference
+     * @return undefined
+     */
+    public static Object emptyGetter(final Object self) {
+        return UNDEFINED;
+    }
+
+    /**
+     * Empty setter implementation. Nop
+     * @param self  self reference
+     * @param value value (ignored)
+     */
+    public static void emptySetter(final Object self, final Object value) {
+        // do nothing!!
+    }
+
+    /**
+     * Return a method handle to the empty getter, with a different
+     * return type value. It will still be undefined cast to whatever
+     * return value property was specified
+     *
+     * @param type return value type
+     *
+     * @return undefined as return value type
+     */
+    public static MethodHandle emptyGetter(final Class<?> type) {
+        return filterReturnType(EMPTY_GETTER, type);
+    }
+
+    /**
+     * Getter function that always throws type error
+     *
+     * @param self  self reference
+     * @return undefined (but throws error before return point)
+     */
+    public static Object typeErrorThrowerGetter(final Object self) {
+        typeError(Context.getGlobal(), "strict.getter.setter.poison", ScriptRuntime.safeToString(self));
+        return UNDEFINED;
+    }
+
+    /**
+     * Getter function that always throws type error
+     *
+     * @param self  self reference
+     * @param value (ignored)
+     */
+    public static void typeErrorThrowerSetter(final Object self, final Object value) {
+        typeError(Context.getGlobal(), "strict.getter.setter.poison", ScriptRuntime.safeToString(self));
+    }
+
+    /**
+     * Create a new {@link Property}
+     *
+     * @param map             property map
+     * @param key             property key
+     * @param flags           property flags
+     * @param propertyGetter  getter for property if available, null otherwise
+     * @param propertySetter  setter for property if available, null otherwise
+     *
+     * @return new property map, representing {@code PropertyMap} with the new property added to it
+     */
+    @SuppressWarnings("fallthrough")
+    public static PropertyMap newProperty(final PropertyMap map, final String key, final int flags, final MethodHandle propertyGetter, final MethodHandle propertySetter) {
+        MethodHandle getter = propertyGetter;
+        MethodHandle setter = propertySetter;
+
+        // TODO: this is temporary code. This code exists to support reflective
+        // field reader/writer handles generated by "unreflect" lookup.
+
+        switch (getter.type().parameterCount()) {
+        case 0:
+            // A static field reader, so drop the 'self' argument.
+            getter = MH.dropArguments(getter, 0, Object.class);
+            if (setter != null) {
+                setter = MH.dropArguments(setter, 0, Object.class);
+            }
+        // fall through
+        case 1:
+            // standard getter that accepts 'self'.
+            break;
+        default:
+            // Huh!! something wrong..
+            throw new IllegalArgumentException("getter/setter has wrong arguments");
+        }
+
+        return map.newProperty(key, flags, getter, setter);
+    }
+
+    /**
+     * This method filters primitive return types using JavaScript semantics. For example,
+     * an (int) cast of a double in Java land is not the same thing as invoking toInt32 on it.
+     * If you are returning values to JavaScript that have to be of a specific type, this is
+     * the correct return value filter to use, as the explicitCastArguments just uses the
+     * Java boxing equivalents
+     *
+     * @param mh   method handle for which to filter return value
+     * @param type new return type
+     * @return method handle for appropriate return type conversion
+     */
+    public static MethodHandle filterReturnType(final MethodHandle mh, final Class<?> type) {
+        final Class<?> retType = mh.type().returnType();
+
+        if (retType == int.class) {
+            //fallthru
+        } else if (retType == long.class) {
+            //fallthru
+        } else if (retType == double.class) {
+            if (type == int.class) {
+                return MH.filterReturnValue(mh, JSType.TO_INT32_D.methodHandle());
+            } else if (type == long.class) {
+                return MH.filterReturnValue(mh, JSType.TO_UINT32_D.methodHandle());
+            }
+            //fallthru
+        } else if (!retType.isPrimitive()) {
+            if (type == int.class) {
+                return MH.filterReturnValue(mh, JSType.TO_INT32.methodHandle());
+            } else if (type == long.class) {
+                return MH.filterReturnValue(mh, JSType.TO_UINT32.methodHandle());
+            } else if (type == double.class) {
+                return MH.filterReturnValue(mh, JSType.TO_NUMBER.methodHandle());
+            } else if (!type.isPrimitive()) {
+                return mh;
+            }
+
+            assert false : "unsupported Lookup.filterReturnType type " + retType + " -> " + type;
+        }
+
+        //use a standard cast - we don't need to check JavaScript special cases
+        return MH.explicitCastArguments(mh, mh.type().changeReturnType(type));
+    }
+
+    private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
+        return MH.findStatic(MethodHandles.lookup(), Lookup.class, name, MH.type(rtype, types));
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/Mangler.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/Mangler.java
new file mode 100644
index 00000000000..dd5726708c3
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/Mangler.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.linker;
+
+import java.util.Arrays;
+
+/**
+ * Used to mangle java visible names. Currently used only to transform script file
+ * name to be safely used as part of generated Script class name.
+ */
+public class Mangler {
+    /** Beginning of escape sequence (mu as in municode.) */
+    private static final char ESCAPE = '\u03BC';
+
+    /** Hexadecimal base. */
+    private static final char hexBase = 'A';
+
+    /** Hexadecimal characters. */
+    private static final char[] hexCharacters = new char[] {
+        '0',
+        '1',
+        '2',
+        '3',
+        '4',
+        '5',
+        '6',
+        '7',
+        '8',
+        '9',
+        hexBase + 0,
+        hexBase + 1,
+        hexBase + 2,
+        hexBase + 3,
+        hexBase + 4,
+        hexBase + 5
+    };
+
+    private Mangler() {
+    }
+
+    /**
+     * Mangles a user supplied name so it is java identifier safe.
+     * @param name Name to be mangled
+     * @return Mangled name or null if not mangled.
+     */
+    public static String mangle(final String name) {
+        final int length = name.length();
+        final char[] buffer = new char[length * 5];
+        boolean mangled = false;
+        int pos = 0;
+
+        for (int i = 0; i < length; i++) {
+            final char ch = name.charAt(i);
+
+            if (! Character.isJavaIdentifierPart(ch)) {
+                buffer[pos++] = ESCAPE;
+                buffer[pos++] = hexCharacters[(ch >>> 12) & 0xF];
+                buffer[pos++] = hexCharacters[(ch >>>  8) & 0xF];
+                buffer[pos++] = hexCharacters[(ch >>>  4) & 0xF];
+                buffer[pos++] = hexCharacters[ ch         & 0xF];
+                mangled = true;
+            } else if (ch == ESCAPE) {
+                buffer[pos++] = ESCAPE;
+                buffer[pos++] = ESCAPE;
+                mangled = true;
+            } else {
+                buffer[pos++] = ch;
+            }
+        }
+
+        return mangled ? new String(Arrays.copyOf(buffer, pos)) : null;
+    }
+
+    /**
+     * Convert a character to a hexadecimal digit. Assumes [0-9A-F].
+     * @param ch Character to convert.
+     * @return Hexadecimal digit.
+     */
+    private static int fromHex(final char ch) {
+        return ch >= hexBase ? ch - hexBase + 10 : ch - '0';
+    }
+
+    /**
+     * Unmangles a name. Assumes name mangled by this package.
+     * @param name Mangled name.
+     * @return Unmangled name.
+     */
+    public static String unmangle(final String name) {
+        final int length = name.length();
+        char[] buffer = new char[length];
+        int pos = 0;
+
+        for (int i = 0; i < length; ) {
+            char ch = name.charAt(i++);
+
+            if (ch == ESCAPE) {
+                final char ch0 = name.charAt(i++);
+
+                if (ch0 == ESCAPE) {
+                    // pass thru
+                } else {
+                     final char ch1 = name.charAt(i++);
+                     final char ch2 = name.charAt(i++);
+                     final char ch3 = name.charAt(i++);
+
+                     ch = (char)(fromHex(ch0) << 12 | fromHex(ch1) << 8 | fromHex(ch2) << 4 | fromHex(ch3));
+                }
+            }
+
+            buffer[pos++] = ch;
+        }
+
+        buffer = Arrays.copyOf(buffer, pos);
+
+        return new String(buffer);
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/MethodHandleFactory.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/MethodHandleFactory.java
new file mode 100644
index 00000000000..f6bf0a94cc0
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/MethodHandleFactory.java
@@ -0,0 +1,633 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.linker;
+
+import java.io.PrintStream;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.lang.invoke.SwitchPoint;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.logging.Level;
+import jdk.nashorn.internal.runtime.ConsString;
+import jdk.nashorn.internal.runtime.Debug;
+import jdk.nashorn.internal.runtime.DebugLogger;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.options.Options;
+
+/**
+ * This class is abstraction for all method handle, switchpoint and method type
+ * operations. This enables the functionality interface to be subclassed and
+ * instrumented, as it has been proven vital to keep the number of method
+ * handles in the system down.
+ * <p>
+ * All operations of the above type should go through this class, and not
+ * directly into java.lang.invoke
+ */
+public final class MethodHandleFactory {
+
+    private static final MethodHandles.Lookup PUBLIC_LOOKUP = MethodHandles.publicLookup();
+    private static final MethodHandles.Lookup LOOKUP        = MethodHandles.lookup();
+
+    private static PrintStream ERR = System.err;
+
+    private static final Level TRACE_LEVEL = Level.FINEST;
+
+    private MethodHandleFactory() {
+    }
+
+    /**
+     * Runtime exception that collects every reason that a method handle lookup operation can go wrong
+     */
+    @SuppressWarnings("serial")
+    public static class LookupException extends RuntimeException {
+        /**
+         * Constructor
+         * @param e causing exception
+         */
+        public LookupException(final Exception e) {
+            super(e);
+        }
+    }
+
+    /**
+     * Helper function that takes a class or an object with a toString override
+     * and shortens it to notation after last dot. This is used to facilitiate
+     * pretty printouts in various debug loggers - internal only
+     *
+     * @param obj class or object
+     *
+     * @return pretty version of object as string
+     */
+    public static String stripName(final Object obj) {
+        if (obj == null) {
+            return "null";
+        }
+
+        if (obj instanceof Class) {
+            return ((Class<?>)obj).getSimpleName();
+        }
+        return obj.toString();
+    }
+
+    private static final MethodHandleFunctionality STANDARD = new StandardMethodHandleFunctionality();
+    private static final MethodHandleFunctionality FUNC     =
+        Options.getBooleanProperty("nashorn.methodhandles.debug") ?
+            (Options.getStringProperty("nashorn.methodhandles.debug","").equals("create") ?
+                new TraceCreateMethodHandleFunctionality() :
+                new TraceMethodHandleFunctionality())
+            : STANDARD;
+
+    private static final boolean PRINT_STACKTRACE = Options.getBooleanProperty("nashorn.methodhandles.debug.stacktrace");
+
+    /**
+     * Return the method handle functionality used for all method handle operations
+     * @return a method handle functionality implementation
+     */
+    public static MethodHandleFunctionality getFunctionality() {
+        return FUNC;
+    }
+
+    private static final MethodHandle TRACE        = STANDARD.findStatic(LOOKUP, MethodHandleFactory.class, "traceArgs",   MethodType.methodType(void.class, DebugLogger.class, String.class, int.class, Object[].class));
+    private static final MethodHandle TRACE_RETURN = STANDARD.findStatic(LOOKUP, MethodHandleFactory.class, "traceReturn", MethodType.methodType(Object.class, DebugLogger.class, Object.class));
+
+    /**
+     * Tracer that is applied before a value is returned from the traced function. It will output the return
+     * value and its class
+     *
+     * @param value return value for filter
+     * @return return value unmodified
+     */
+    static Object traceReturn(final DebugLogger logger, final Object value) {
+        final String str = "\treturn: " + stripName(value) + " [type=" + (value == null ? "null" : stripName(value.getClass()) + ']');
+        if (logger != null) {
+            logger.log(str, TRACE_LEVEL);
+        } else {
+            ERR.println(str);
+        }
+        return value;
+    }
+
+    /**
+     * Tracer that is applied before a function is called, printing the arguments
+     *
+     * @param tag  tag to start the debug printout string
+     * @param paramStart param index to start outputting from
+     * @param args arguments to the function
+     */
+    static void traceArgs(final DebugLogger logger, final String tag, final int paramStart, final Object... args) {
+        final StringBuilder sb = new StringBuilder();
+
+        sb.append(tag);
+
+        for (int i = paramStart; i < args.length; i++) {
+            if (i == paramStart) {
+                sb.append(" => args: ");
+            }
+
+            sb.append('\'').
+                append(stripName(argString(args[i]))).
+                append('\'').
+                append(' ').
+                append('[').
+                append("type=").
+                append(args[i] == null ? "null" : stripName(args[i].getClass())).
+                append(']');
+
+            if (i + 1 < args.length) {
+                sb.append(", ");
+            }
+        }
+
+        if (logger != null) {
+            logger.log(sb.toString(), TRACE_LEVEL);
+        } else {
+            ERR.print(sb);
+            if (PRINT_STACKTRACE) {
+                new Throwable().printStackTrace(ERR);
+            }
+        }
+    }
+
+    private static String argString(final Object arg) {
+        if (arg == null) {
+            return "null";
+        }
+
+        if (arg.getClass().isArray()) {
+            final List<Object> list = new ArrayList<>();
+            for (final Object elem : (Object[])arg) {
+                list.add('\'' + argString(elem) + '\'');
+            }
+
+            return list.toString();
+        }
+
+        if (arg instanceof ScriptObject) {
+            return arg.toString() +
+                " (map=" + Debug.id((((ScriptObject)arg).getMap())) +
+                ")";
+        }
+
+        return arg.toString();
+    }
+
+    /**
+     * Add a debug printout to a method handle, tracing parameters and return values. Output
+     * will be written to stderr.
+     *
+     * @param mh  method handle to trace
+     * @param tag start of trace message
+     * @return traced method handle
+     */
+    public static MethodHandle addDebugPrintout0(final MethodHandle mh, final Object tag) {
+        return addDebugPrintout(null, mh, 0, true, tag);
+    }
+
+    /**
+     * Add a debug printout to a method handle, tracing parameters and return values
+     *
+     * @param logger a specific logger to which to write the output
+     * @param mh  method handle to trace
+     * @param tag start of trace message
+     * @return traced method handle
+     */
+    public static MethodHandle addDebugPrintout(final DebugLogger logger, final MethodHandle mh, final Object tag) {
+        return addDebugPrintout(logger, mh, 0, true, tag);
+    }
+
+
+    /**
+     * Add a debug printout to a method handle, tracing parameters and return values
+     *
+     * @param logger a specific logger to which to write the output
+     * @param mh  method handle to trace
+     * @param paramStart first param to print/trace
+     * @param printReturnValue should we print/trace return value if available?
+     * @param tag start of trace message
+     * @return  traced method handle
+     */
+    public static MethodHandle addDebugPrintout(final DebugLogger logger, final MethodHandle mh, final int paramStart, final boolean printReturnValue, final Object tag) {
+        final MethodType type = mh.type();
+
+        if (logger != null && logger.levelAbove(TRACE_LEVEL)) {
+            return mh;
+        }
+
+        assert TRACE != null;
+
+        MethodHandle trace = MethodHandles.insertArguments(TRACE, 0, logger, tag, paramStart);
+
+        trace = MethodHandles.foldArguments(
+                mh,
+                trace.asCollector(
+                    Object[].class,
+                    type.parameterCount()).
+                asType(type.changeReturnType(void.class)));
+
+        final Class<?> retType = type.returnType();
+        if (retType != void.class && printReturnValue) {
+            final MethodHandle traceReturn = MethodHandles.insertArguments(TRACE_RETURN, 0, logger);
+            trace = MethodHandles.filterReturnValue(trace,
+                    traceReturn.asType(
+                        traceReturn.type().changeParameterType(0, retType).changeReturnType(retType)));
+        }
+
+        return trace;
+    }
+
+    /**
+     * The standard class that marshals all method handle operations to the java.lang.invoke
+     * package. This exists only so that it can be subclassed and method handles created from
+     * Nashorn made possible to instrument.
+     *
+     * All Nashorn classes should use the MethodHandleFactory for their method handle operations
+     */
+    private static class StandardMethodHandleFunctionality implements MethodHandleFunctionality {
+
+        @Override
+        public MethodHandle filterArguments(final MethodHandle target, final int pos, final MethodHandle... filters) {
+            return MethodHandles.filterArguments(target, pos, filters);
+        }
+
+        @Override
+        public MethodHandle filterReturnValue(final MethodHandle target, final MethodHandle filter) {
+            return MethodHandles.filterReturnValue(target, filter);
+        }
+
+        @Override
+        public MethodHandle guardWithTest(final MethodHandle test, final MethodHandle target, final MethodHandle fallback) {
+            return MethodHandles.guardWithTest(test, target, fallback);
+        }
+
+        @Override
+        public MethodHandle insertArguments(final MethodHandle target, final int pos, final Object... values) {
+            return MethodHandles.insertArguments(target, pos, values);
+        }
+
+        @Override
+        public MethodHandle dropArguments(final MethodHandle target, final int pos, final Class<?>... valueTypes) {
+            return MethodHandles.dropArguments(target, pos, valueTypes);
+        }
+
+        @Override
+        public MethodHandle asType(final MethodHandle handle, final MethodType type) {
+            return handle.asType(type);
+        }
+
+        @Override
+        public MethodHandle bindTo(final MethodHandle handle, final Object x) {
+            return handle.bindTo(x);
+        }
+
+        @Override
+        public MethodHandle foldArguments(final MethodHandle target, final MethodHandle combiner) {
+            return MethodHandles.foldArguments(target, combiner);
+        }
+
+        @Override
+        public MethodHandle explicitCastArguments(final MethodHandle target, final MethodType type) {
+            return MethodHandles.explicitCastArguments(target, type);
+        }
+
+        @Override
+        public MethodHandle arrayElementGetter(final Class<?> type) {
+            return MethodHandles.arrayElementGetter(type);
+        }
+
+        @Override
+        public MethodHandle arrayElementSetter(final Class<?> type) {
+            return MethodHandles.arrayElementSetter(type);
+        }
+
+        @Override
+        public MethodHandle throwException(final Class<?> returnType, final Class<? extends Throwable> exType) {
+            return MethodHandles.throwException(returnType, exType);
+        }
+
+        @Override
+        public MethodHandle constant(final Class<?> type, final Object value) {
+            return MethodHandles.constant(type, value);
+        }
+
+        @Override
+        public MethodHandle asCollector(final MethodHandle handle, final Class<?> arrayType, final int arrayLength) {
+            return handle.asCollector(arrayType, arrayLength);
+        }
+
+        @Override
+        public MethodHandle asSpreader(final MethodHandle handle, final Class<?> arrayType, final int arrayLength) {
+            return handle.asSpreader(arrayType, arrayLength);
+        }
+
+        @Override
+        public MethodHandle getter(final MethodHandles.Lookup explicitLookup, final Class<?> clazz, final String name, final Class<?> type) {
+            try {
+                return explicitLookup.findGetter(clazz, name, type);
+            } catch (final NoSuchFieldException | IllegalAccessException e) {
+                throw new LookupException(e);
+            }
+        }
+
+        @Override
+        public MethodHandle staticGetter(final MethodHandles.Lookup explicitLookup, final Class<?> clazz, final String name, final Class<?> type) {
+            try {
+                return explicitLookup.findStaticGetter(clazz, name, type);
+            } catch (final NoSuchFieldException | IllegalAccessException e) {
+                throw new LookupException(e);
+            }
+        }
+
+
+        @Override
+        public MethodHandle setter(final MethodHandles.Lookup explicitLookup, final Class<?> clazz, final String name, final Class<?> type) {
+            try {
+                return explicitLookup.findSetter(clazz, name, type);
+            } catch (final NoSuchFieldException | IllegalAccessException e) {
+                throw new LookupException(e);
+            }
+        }
+
+        @Override
+        public MethodHandle staticSetter(final MethodHandles.Lookup explicitLookup, final Class<?> clazz, final String name, final Class<?> type) {
+            try {
+                return explicitLookup.findStaticSetter(clazz, name, type);
+            } catch (final NoSuchFieldException | IllegalAccessException e) {
+                throw new LookupException(e);
+            }
+        }
+
+        @Override
+        public MethodHandle find(final Method method) {
+            try {
+                return PUBLIC_LOOKUP.unreflect(method);
+            } catch (final IllegalAccessException e) {
+                throw new LookupException(e);
+            }
+        }
+
+        @Override
+        public MethodHandle findStatic(final MethodHandles.Lookup explicitLookup, final Class<?> clazz, final String name, final MethodType type) {
+            try {
+                return explicitLookup.findStatic(clazz, name, type);
+            } catch (final NoSuchMethodException | IllegalAccessException e) {
+                throw new LookupException(e);
+            }
+        }
+
+        @Override
+        public MethodHandle findVirtual(final MethodHandles.Lookup explicitLookup, final Class<?> clazz, final String name, final MethodType type) {
+            try {
+                return explicitLookup.findVirtual(clazz, name, type);
+            } catch (final NoSuchMethodException | IllegalAccessException e) {
+                throw new LookupException(e);
+            }
+        }
+
+        @Override
+        public SwitchPoint createSwitchPoint() {
+            return new SwitchPoint();
+        }
+
+        @Override
+        public MethodHandle guardWithTest(final SwitchPoint sp, final MethodHandle before, final MethodHandle after) {
+            return sp.guardWithTest(before, after);
+        }
+
+        @Override
+        public MethodType type(final Class<?> returnType, final Class<?>... paramTypes) {
+            return MethodType.methodType(returnType, paramTypes);
+        }
+
+    }
+
+    /**
+     * Class used for instrumenting and debugging Nashorn generated method handles
+     */
+    private static class TraceMethodHandleFunctionality extends StandardMethodHandleFunctionality {
+
+        protected static String describe(final Object... data) {
+            final StringBuilder sb = new StringBuilder();
+
+            for (int i = 0; i < data.length; i++) {
+                final Object d = data[i];
+                if (d == null) {
+                    sb.append("<null> ");
+                } else if (d instanceof String || d instanceof ConsString) {
+                    sb.append(d.toString());
+                    sb.append(' ');
+                } else if (d.getClass().isArray()) {
+                    sb.append("[ ");
+                    for (final Object da : (Object[])d) {
+                        sb.append(describe(new Object[]{ da })).append(' ');
+                    }
+                    sb.append("] ");
+                } else {
+                    sb.append(d)
+                        .append('{')
+                        .append(Integer.toHexString(System.identityHashCode(d)))
+                        .append('}');
+                }
+
+                if (i + 1 < data.length) {
+                    sb.append(", ");
+                }
+            }
+
+            return sb.toString();
+        }
+
+        public MethodHandle debug(final MethodHandle master, final String str, final Object... args) {
+            return addDebugPrintout(null, master, Integer.MAX_VALUE, false, str + ' ' + describe(args));
+        }
+
+        @Override
+        public MethodHandle filterArguments(final MethodHandle target, final int pos, final MethodHandle... filters) {
+            final MethodHandle mh = super.filterArguments(target, pos, filters);
+            return debug(mh, "filterArguments", target, pos, filters);
+        }
+
+        @Override
+        public MethodHandle filterReturnValue(final MethodHandle target, final MethodHandle filter) {
+            final MethodHandle mh = super.filterReturnValue(target, filter);
+            return debug(mh, "filterReturnValue", target, filter);
+        }
+
+        @Override
+        public MethodHandle guardWithTest(final MethodHandle test, final MethodHandle target, final MethodHandle fallback) {
+            final MethodHandle mh = super.guardWithTest(test, target, fallback);
+            return debug(mh, "guardWithTest", test, target, fallback);
+        }
+
+        @Override
+        public MethodHandle insertArguments(final MethodHandle target, final int pos, final Object... values) {
+            final MethodHandle mh = super.insertArguments(target, pos, values);
+            return debug(mh, "insertArguments", target, pos, values);
+        }
+
+        @Override
+        public MethodHandle dropArguments(final MethodHandle target, final int pos, final Class<?>... values) {
+            final MethodHandle mh = super.dropArguments(target, pos, values);
+            return debug(mh, "dropArguments", target, pos, values);
+        }
+
+        @Override
+        public MethodHandle asType(final MethodHandle handle, final MethodType type) {
+            final MethodHandle mh = super.asType(handle, type);
+            return debug(mh, "asType", handle, type);
+        }
+
+        @Override
+        public MethodHandle bindTo(final MethodHandle handle, final Object x) {
+            final MethodHandle mh = super.bindTo(handle, x);
+            return debug(mh, "bindTo", handle, x);
+        }
+
+        @Override
+        public MethodHandle foldArguments(final MethodHandle target, final MethodHandle combiner) {
+            final MethodHandle mh = super.foldArguments(target, combiner);
+            return debug(mh, "foldArguments", target, combiner);
+        }
+
+        @Override
+        public MethodHandle explicitCastArguments(final MethodHandle target, final MethodType type) {
+            final MethodHandle mh = super.explicitCastArguments(target, type);
+            return debug(mh, "explicitCastArguments", target, type);
+        }
+
+        @Override
+        public MethodHandle arrayElementGetter(final Class<?> type) {
+            final MethodHandle mh = super.arrayElementGetter(type);
+            return debug(mh, "arrayElementGetter", type);
+        }
+
+        @Override
+        public MethodHandle arrayElementSetter(final Class<?> type) {
+            final MethodHandle mh = super.arrayElementSetter(type);
+            return debug(mh, "arrayElementSetter", type);
+        }
+
+        @Override
+        public MethodHandle throwException(final Class<?> returnType, final Class<? extends Throwable> exType) {
+            final MethodHandle mh = super.throwException(returnType, exType);
+            return debug(mh, "throwException", returnType, exType);
+        }
+
+        @Override
+        public MethodHandle constant(final Class<?> type, final Object value) {
+            final MethodHandle mh = super.constant(type, value);
+            return debug(mh, "constant", type, value);
+        }
+
+        @Override
+        public MethodHandle asCollector(final MethodHandle handle, final Class<?> arrayType, final int arrayLength) {
+            final MethodHandle mh = super.asCollector(handle, arrayType, arrayLength);
+            return debug(mh, "asCollector", handle, arrayType, arrayLength);
+        }
+
+        @Override
+        public MethodHandle asSpreader(final MethodHandle handle, final Class<?> arrayType, final int arrayLength) {
+            final MethodHandle mh = super.asCollector(handle, arrayType, arrayLength);
+            return debug(mh, "asSpreader", handle, arrayType, arrayLength);
+        }
+
+        @Override
+        public MethodHandle getter(final MethodHandles.Lookup explicitLookup, final Class<?> clazz, final String name, final Class<?> type) {
+            final MethodHandle mh = super.getter(explicitLookup, clazz, name, type);
+            return debug(mh, "getter", explicitLookup, clazz, name, type);
+        }
+
+        @Override
+        public MethodHandle staticGetter(final MethodHandles.Lookup explicitLookup, final Class<?> clazz, final String name, final Class<?> type) {
+            final MethodHandle mh = super.staticGetter(explicitLookup, clazz, name, type);
+            return debug(mh, "static getter", explicitLookup, clazz, name, type);
+        }
+
+        @Override
+        public MethodHandle setter(final MethodHandles.Lookup explicitLookup, final Class<?> clazz, final String name, final Class<?> type) {
+            final MethodHandle mh = super.setter(explicitLookup, clazz, name, type);
+            return debug(mh, "setter", explicitLookup, clazz, name, type);
+        }
+
+        @Override
+        public MethodHandle staticSetter(final MethodHandles.Lookup explicitLookup, final Class<?> clazz, final String name, final Class<?> type) {
+            final MethodHandle mh = super.staticSetter(explicitLookup, clazz, name, type);
+            return debug(mh, "static setter", explicitLookup, clazz, name, type);
+        }
+
+        @Override
+        public MethodHandle find(final Method method) {
+            final MethodHandle mh = super.find(method);
+            return debug(mh, "find", method);
+        }
+
+        @Override
+        public MethodHandle findStatic(final MethodHandles.Lookup explicitLookup, final Class<?> clazz, final String name, final MethodType type) {
+            final MethodHandle mh = super.findStatic(explicitLookup, clazz, name, type);
+            return debug(mh, "findStatic", explicitLookup, clazz, name, type);
+        }
+
+        @Override
+        public MethodHandle findVirtual(final MethodHandles.Lookup explicitLookup, final Class<?> clazz, final String name, final MethodType type) {
+            final MethodHandle mh = super.findVirtual(explicitLookup, clazz, name, type);
+            return debug(mh, "findVirtual", explicitLookup, clazz, name, type);
+        }
+
+        @Override
+        public SwitchPoint createSwitchPoint() {
+            final SwitchPoint sp = super.createSwitchPoint();
+            ERR.println("createSwitchPoint " + sp);
+            return sp;
+        }
+
+        @Override
+        public MethodHandle guardWithTest(final SwitchPoint sp, final MethodHandle before, final MethodHandle after) {
+            final MethodHandle mh = super.guardWithTest(sp, before, after);
+            return debug(mh, "guardWithTest", sp, before, after);
+        }
+
+        @Override
+        public MethodType type(final Class<?> returnType, final Class<?>... paramTypes) {
+            final MethodType mt = super.type(returnType, paramTypes);
+            ERR.println("methodType " + returnType + ' ' + Arrays.toString(paramTypes) + ' ' + mt);
+            return mt;
+        }
+    }
+
+    /**
+     * Class used for debugging Nashorn generated method handles
+     */
+    private static class TraceCreateMethodHandleFunctionality extends TraceMethodHandleFunctionality {
+        @Override
+        public MethodHandle debug(final MethodHandle master, final String str, final Object... args) {
+            ERR.println(str + ' ' + describe(args));
+            return master;
+        }
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/MethodHandleFunctionality.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/MethodHandleFunctionality.java
new file mode 100644
index 00000000000..06d50a77138
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/MethodHandleFunctionality.java
@@ -0,0 +1,305 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.linker;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.lang.invoke.SwitchPoint;
+import java.lang.reflect.Method;
+
+/**
+ * Wrapper for all method handle related functions used in Nashorn. This interface only exists
+ * so that instrumentation can be added to all method handle operations.
+ */
+
+public interface MethodHandleFunctionality {
+    /**
+     * Wrapper for {@link MethodHandles#filterArguments(MethodHandle, int, MethodHandle...)}
+     *
+     * @param target  target method handle
+     * @param pos     start argument index
+     * @param filters filters
+     *
+     * @return filtered handle
+     */
+    public MethodHandle filterArguments(MethodHandle target, int pos, MethodHandle... filters);
+
+    /**
+     * Wrapper for {@link MethodHandles#filterReturnValue(MethodHandle, MethodHandle)}
+     *
+     * @param target  target method handle
+     * @param filter  filter
+     *
+     * @return filtered handle
+     */
+    public MethodHandle filterReturnValue(MethodHandle target, MethodHandle filter);
+
+    /**
+     * Wrapper for {@link MethodHandles#guardWithTest(MethodHandle, MethodHandle, MethodHandle)}
+     *
+     * @param test     test method handle
+     * @param target   target method handle when test is true
+     * @param fallback fallback method handle when test is false
+     *
+     * @return guarded handles
+     */
+    public MethodHandle guardWithTest(MethodHandle test, MethodHandle target, MethodHandle fallback);
+
+    /**
+     * Wrapper for {@link MethodHandles#insertArguments(MethodHandle, int, Object...)}
+     *
+     * @param target target method handle
+     * @param pos    start argument index
+     * @param values values to insert
+     *
+     * @return handle with bound arguments
+     */
+    public MethodHandle insertArguments(MethodHandle target, int pos, Object... values);
+
+    /**
+     * Wrapper for {@link MethodHandles#dropArguments(MethodHandle, int, Class...)}
+     *
+     * @param target     target method handle
+     * @param pos        start argument index
+     * @param valueTypes valueTypes of arguments to drop
+     *
+     * @return handle with dropped arguments
+     */
+    public MethodHandle dropArguments(MethodHandle target, int pos, Class<?>... valueTypes);
+
+    /**
+     * Wrapper for {@link MethodHandles#foldArguments(MethodHandle, MethodHandle)}
+     *
+     * @param target   target method handle
+     * @param combiner combiner to apply for fold
+     *
+     * @return folded method handle
+     */
+    public MethodHandle foldArguments(MethodHandle target, MethodHandle combiner);
+
+    /**
+     * Wrapper for {@link MethodHandles#explicitCastArguments(MethodHandle, MethodType)}
+     *
+     * @param target  target method handle
+     * @param type    type to cast to
+     *
+     * @return modified method handle
+     */
+    public MethodHandle explicitCastArguments(MethodHandle target, MethodType type);
+
+    /**
+     * Wrapper for {@link java.lang.invoke.MethodHandles#arrayElementGetter(Class)}
+     *
+     * @param arrayClass class for array
+     *
+     * @return array element getter
+     */
+    public MethodHandle arrayElementGetter(Class<?> arrayClass);
+
+    /**
+     * Wrapper for {@link java.lang.invoke.MethodHandles#arrayElementSetter(Class)}
+     *
+     * @param arrayClass class for array
+     *
+     * @return array element setter
+     */
+    public MethodHandle arrayElementSetter(Class<?> arrayClass);
+
+    /**
+     * Wrapper for {@link java.lang.invoke.MethodHandles#throwException(Class, Class)}
+     *
+     * @param returnType ignored, but method signature will use it
+     * @param exType     exception type that will be thrown
+     *
+     * @return exception thrower method handle
+     */
+    public MethodHandle throwException(Class<?> returnType, Class<? extends Throwable> exType);
+
+    /**
+     * Wrapper for {@link java.lang.invoke.MethodHandles#constant(Class, Object)}
+     *
+     * @param type  type of constant
+     * @param value constant value
+     *
+     * @return method handle that returns said constant
+     */
+    public MethodHandle constant(Class<?> type, Object value);
+
+    /**
+     * Wrapper for {@link java.lang.invoke.MethodHandle#asType(MethodType)}
+     *
+     * @param handle  method handle for type conversion
+     * @param type    type to convert to
+     *
+     * @return method handle with given type conversion applied
+     */
+    public MethodHandle asType(MethodHandle handle, MethodType type);
+
+    /**
+     * Wrapper for {@link java.lang.invoke.MethodHandle#asCollector(Class, int)}
+     *
+     * @param handle      handle to convert
+     * @param arrayType   array type for collector array
+     * @param arrayLength length of collector array
+     *
+     * @return method handle with collector
+     */
+    public MethodHandle asCollector(MethodHandle handle, Class<?> arrayType, int arrayLength);
+
+    /**
+     * Wrapper for {@link java.lang.invoke.MethodHandle#asSpreader(Class, int)}
+     *
+     * @param handle      handle to convert
+     * @param arrayType   array type for spread
+     * @param arrayLength length of spreader
+     *
+     * @return method handle as spreader
+     */
+    public MethodHandle asSpreader(MethodHandle handle, Class<?> arrayType, int arrayLength);
+
+    /**
+     * Wrapper for {@link java.lang.invoke.MethodHandle#bindTo(Object)}
+     *
+     * @param handle a handle to which to bind a receiver
+     * @param x      the receiver
+     *
+     * @return the bound handle
+     */
+    public MethodHandle bindTo(MethodHandle handle, Object x);
+
+    /**
+     * Wrapper for {@link java.lang.invoke.MethodHandles.Lookup#findGetter(Class, String, Class)}
+      *
+     * @param explicitLookup explicit lookup to be used
+     * @param clazz          class to look in
+     * @param name           name of field
+     * @param type           type of field
+     *
+     * @return getter method handle for virtual field
+     */
+    public MethodHandle getter(MethodHandles.Lookup explicitLookup, Class<?> clazz, String name, Class<?> type);
+
+    /**
+     * Wrapper for {@link java.lang.invoke.MethodHandles.Lookup#findStaticGetter(Class, String, Class)}
+      *
+     * @param explicitLookup explicit lookup to be used
+     * @param clazz          class to look in
+     * @param name           name of field
+     * @param type           type of field
+     *
+     * @return getter method handle for static field
+     */
+    public MethodHandle staticGetter(MethodHandles.Lookup explicitLookup, Class<?> clazz, String name, Class<?> type);
+
+    /**
+     * Wrapper for {@link java.lang.invoke.MethodHandles.Lookup#findSetter(Class, String, Class)}
+      *
+     * @param explicitLookup explicit lookup to be used
+     * @param clazz          class to look in
+     * @param name           name of field
+     * @param type           type of field
+     *
+     * @return setter method handle for virtual field
+     */
+    public MethodHandle setter(MethodHandles.Lookup explicitLookup, Class<?> clazz, String name, Class<?> type);
+
+    /**
+     * Wrapper for {@link java.lang.invoke.MethodHandles.Lookup#findStaticSetter(Class, String, Class)}
+      *
+     * @param explicitLookup explicit lookup to be used
+     * @param clazz          class to look in
+     * @param name           name of field
+     * @param type           type of field
+     *
+     * @return setter method handle for static field
+     */
+    public MethodHandle staticSetter(MethodHandles.Lookup explicitLookup, Class<?> clazz, String name, Class<?> type);
+
+    /**
+     * Wrapper for {@link java.lang.invoke.MethodHandles.Lookup#unreflect(Method)}
+     *
+     * Unreflect a method as a method handle
+     *
+     * @param method method to unreflect
+     * @return unreflected method as method handle
+     */
+    public MethodHandle find(Method method);
+
+    /**
+     * Wrapper for {@link java.lang.invoke.MethodHandles.Lookup#findStatic(Class, String, MethodType)}
+     *
+     * @param explicitLookup explicit lookup to be used
+     * @param clazz          class to look in
+     * @param name           name of method
+     * @param type           method type
+     *
+     * @return method handle for static method
+     */
+    public MethodHandle findStatic(MethodHandles.Lookup explicitLookup, Class<?> clazz, String name, MethodType type);
+
+    /**
+     * Wrapper for {@link java.lang.invoke.MethodHandles.Lookup#findVirtual(Class, String, MethodType)}
+     *
+     * @param explicitLookup explicit lookup to be used
+     * @param clazz          class to look in
+     * @param name           name of method
+     * @param type           method type
+     *
+     * @return method handle for virtual method
+     */
+    public MethodHandle findVirtual(MethodHandles.Lookup explicitLookup, Class<?> clazz, String name, MethodType type);
+
+    /**
+     * Wrapper for SwitchPoint creation. Just like {@code new SwitchPoint()} but potentially
+     * tracked
+     *
+     * @return new switch point
+     */
+    public SwitchPoint createSwitchPoint();
+
+    /**
+     * Wrapper for {@link SwitchPoint#guardWithTest(MethodHandle, MethodHandle)}
+     *
+     * @param sp     switch point
+     * @param before method handle when switchpoint is valid
+     * @param after  method handle when switchpoint is invalidated
+     *
+     * @return guarded method handle
+     */
+    public MethodHandle guardWithTest(SwitchPoint sp, MethodHandle before, MethodHandle after);
+
+    /**
+     * Wrapper for {@link MethodType#methodType(Class, Class...)}
+     *
+     * @param returnType  return type for method type
+     * @param paramTypes  parameter types for method type
+     *
+     * @return the method type
+     */
+    public MethodType type(Class<?> returnType, Class<?>... paramTypes);
+}
+
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java
new file mode 100644
index 00000000000..2d5a52f5bb2
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java
@@ -0,0 +1,172 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.linker;
+
+import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+
+import java.lang.invoke.MethodHandle;
+import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
+import org.dynalang.dynalink.CallSiteDescriptor;
+import org.dynalang.dynalink.linker.GuardedInvocation;
+import org.dynalang.dynalink.linker.GuardingDynamicLinker;
+import org.dynalang.dynalink.linker.LinkRequest;
+import org.dynalang.dynalink.linker.LinkerServices;
+import org.dynalang.dynalink.support.Guards;
+
+/**
+ * Nashorn bottom linker; used as a last-resort catch-all linker for all linking requests that fall through all other
+ * linkers (see how {@link Bootstrap} class configures the dynamic linker in its static initializer). It will throw
+ * appropriate ECMAScript errors for attempts to invoke operations on {@code null}, link no-op property getters and
+ * setters for Java objects that couldn't be linked by any other linker, and throw appropriate ECMAScript errors for
+ * attempts to invoke arbitrary Java objects as functions or constructors.
+ */
+class NashornBottomLinker implements GuardingDynamicLinker {
+
+    @Override
+    public GuardedInvocation getGuardedInvocation(final LinkRequest linkRequest, final LinkerServices linkerServices)
+            throws Exception {
+        final Object self = linkRequest.getReceiver();
+
+        if (self == null) {
+            return linkNull(linkRequest);
+        }
+
+        // None of the objects that can be linked by NashornLinker should ever reach here. Basically, anything below
+        // this point is a generic Java bean. Therefore, reaching here with a ScriptObject is a Nashorn bug.
+        assert isExpectedObject(self) : "Couldn't link " + linkRequest.getCallSiteDescriptor() + " for " + self.getClass().getName();
+
+        return linkBean(linkRequest, linkerServices);
+    }
+
+    private static final MethodHandle EMPTY_PROP_GETTER =
+            MH.dropArguments(MH.constant(Object.class, UNDEFINED), 0, Object.class);
+    private static final MethodHandle EMPTY_ELEM_GETTER =
+            MH.dropArguments(EMPTY_PROP_GETTER, 0, Object.class);
+    private static final MethodHandle EMPTY_PROP_SETTER =
+            MH.asType(EMPTY_ELEM_GETTER, EMPTY_ELEM_GETTER.type().changeReturnType(void.class));
+    private static final MethodHandle EMPTY_ELEM_SETTER =
+            MH.dropArguments(EMPTY_PROP_SETTER, 0, Object.class);
+
+    private static GuardedInvocation linkBean(final LinkRequest linkRequest, final LinkerServices linkerServices) {
+        final NashornCallSiteDescriptor desc = (NashornCallSiteDescriptor)linkRequest.getCallSiteDescriptor();
+        final Object self = linkRequest.getReceiver();
+        final String operator = desc.getFirstOperator();
+        switch (operator) {
+        case "new":
+            if(isJavaDynamicMethod(self)) {
+                typeError(Context.getGlobal(), "method.not.constructor", ScriptRuntime.safeToString(self));
+            } else {
+                typeError(Context.getGlobal(), "not.a.function", ScriptRuntime.safeToString(self));
+            }
+            break;
+        case "call":
+            if(isJavaDynamicMethod(self)) {
+                typeError(Context.getGlobal(), "no.method.matches.args", ScriptRuntime.safeToString(self));
+            } else {
+                typeError(Context.getGlobal(), "not.a.function", ScriptRuntime.safeToString(self));
+            }
+            break;
+        case "callMethod":
+        case "getMethod":
+            typeError(Context.getGlobal(), "no.such.function", getArgument(linkRequest), ScriptRuntime.safeToString(self));
+            break;
+        case "getProp":
+        case "getElem":
+            if (desc.getOperand() != null) {
+                return getInvocation(EMPTY_PROP_GETTER, self, linkerServices, desc);
+            }
+            return getInvocation(EMPTY_ELEM_GETTER, self, linkerServices, desc);
+        case "setProp":
+        case "setElem":
+            if (desc.getOperand() != null) {
+                return getInvocation(EMPTY_PROP_SETTER, self, linkerServices, desc);
+            }
+            return getInvocation(EMPTY_ELEM_SETTER, self, linkerServices, desc);
+        default:
+            break;
+        }
+        throw new AssertionError("unknown call type " + desc);
+    }
+
+    /**
+     * Returns true if the object is a Dynalink dynamic method. Unfortunately, the dynamic method classes are package
+     * private in Dynalink, so this is the closest we can get to determining it.
+     * @param obj the object we want to test for being a dynamic method
+     * @return true if it is a dynamic method, false otherwise.
+     */
+    private static boolean isJavaDynamicMethod(Object obj) {
+        return obj.getClass().getName().endsWith("DynamicMethod");
+    }
+
+    private static GuardedInvocation getInvocation(final MethodHandle handle, final Object self, final LinkerServices linkerServices, final CallSiteDescriptor desc) {
+        return Bootstrap.asType(new GuardedInvocation(handle, Guards.getClassGuard(self.getClass())), linkerServices, desc);
+    }
+
+    // Used solely in an assertion to figure out if the object we get here is something we in fact expect. Objects
+    // linked by NashornLinker should never reach here.
+    private static boolean isExpectedObject(final Object obj) {
+        return !(NashornLinker.canLinkTypeStatic(obj.getClass()));
+    }
+
+    private static GuardedInvocation linkNull(final LinkRequest linkRequest) {
+        final ScriptObject global = Context.getGlobal();
+        final NashornCallSiteDescriptor desc = (NashornCallSiteDescriptor)linkRequest.getCallSiteDescriptor();
+        final String operator = desc.getFirstOperator();
+        switch (operator) {
+        case "new":
+        case "call":
+            typeError(global, "not.a.function", "null");
+            break;
+        case "callMethod":
+        case "getMethod":
+            typeError(global, "no.such.function", getArgument(linkRequest), "null");
+            break;
+        case "getProp":
+        case "getElem":
+            typeError(global, "cant.get.property", getArgument(linkRequest), "null");
+            break;
+        case "setProp":
+        case "setElem":
+            typeError(global, "cant.set.property", getArgument(linkRequest), "null");
+            break;
+        default:
+            break;
+        }
+        throw new AssertionError("unknown call type " + desc);
+    }
+
+    private static String getArgument(final LinkRequest linkRequest) {
+        final CallSiteDescriptor desc = linkRequest.getCallSiteDescriptor();
+        if (desc.getNameTokenCount() > 2) {
+            return desc.getNameToken(2);
+        }
+        return ScriptRuntime.safeToString(linkRequest.getArguments()[1]);
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java
new file mode 100644
index 00000000000..df05651a1ca
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java
@@ -0,0 +1,287 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.linker;
+
+import java.lang.invoke.MethodType;
+import java.lang.ref.WeakReference;
+import java.util.WeakHashMap;
+import org.dynalang.dynalink.CallSiteDescriptor;
+import org.dynalang.dynalink.support.AbstractCallSiteDescriptor;
+import org.dynalang.dynalink.support.CallSiteDescriptorFactory;
+
+/**
+ * Nashorn-specific implementation of Dynalink's {@link CallSiteDescriptor}. The reason we have our own subclass is that
+ * we can have a more compact representation, as we know that we're always only using {@code "dyn:*"} operations; also
+ * we're storing flags in an additional primitive field.
+ */
+public class NashornCallSiteDescriptor extends AbstractCallSiteDescriptor {
+    /** Flags that the call site references a scope variable (it's an identifier reference or a var declaration, not a
+     * property access expression. */
+    public static final int CALLSITE_SCOPE                = 0x01;
+    /** Flags that the call site is in code that uses ECMAScript strict mode. */
+    public static final int CALLSITE_STRICT               = 0x02;
+    /** Flags that a property setter call site is part of a function declaration that assigns the function object to a name. */
+    public static final int CALLSITE_FUNCTION_DECLARATION = 0x04;
+    /** Flags that a property getter or setter call site references a scope variable that is not in the global scope
+     * (it is in a function lexical scope), and the function's scope object class is fixed and known in advance. Such
+     * getters and setters can often be linked more optimally using these assumptions. */
+    public static final int CALLSITE_FAST_SCOPE    = 0x400;
+
+    /** Flags that the call site is profiled; Contexts that have {@code "profile.callsites"} boolean property set emit
+     * code where call sites have this flag set. */
+    public static final int CALLSITE_PROFILE          = 0x10;
+    /** Flags that the call site is traced; Contexts that have {@code "trace.callsites"} property set emit code where
+     * call sites have this flag set. */
+    public static final int CALLSITE_TRACE            = 0x20;
+    /** Flags that the call site linkage miss (and thus, relinking) is traced; Contexts that have the keyword
+     * {@code "miss"} in their {@code "trace.callsites"} property emit code where call sites have this flag set. */
+    public static final int CALLSITE_TRACE_MISSES     = 0x40;
+    /** Flags that entry/exit to/from the method linked at call site are traced; Contexts that have the keyword
+     * {@code "enterexit"} in their {@code "trace.callsites"} property emit code where call sites have this flag
+     * set. */
+    public static final int CALLSITE_TRACE_ENTEREXIT  = 0x80;
+    /** Flags that values passed as arguments to and returned from the method linked at call site are traced; Contexts
+     * that have the keyword {@code "values"} in their {@code "trace.callsites"} property emit code where call sites
+     * have this flag set. */
+    public static final int CALLSITE_TRACE_VALUES    = 0x100;
+    /** Ordinarily, when {@link #CALLSITE_TRACE_VALUES} is set, scope objects are not printed in the trace but instead
+     * the word {@code "SCOPE"} is printed instead With this flag, scope objects are also printed. Contexts that have
+     * the keyword {@code "scope"} in their {@code "trace.callsites"} property emit code where call sites have this flag
+     * set. */
+    public static final int CALLSITE_TRACE_SCOPE      = 0x200;
+
+    private static final WeakHashMap<NashornCallSiteDescriptor, WeakReference<NashornCallSiteDescriptor>> canonicals =
+            new WeakHashMap<>();
+
+    private final String operator;
+    private final String operand;
+    private final MethodType methodType;
+    private final int flags;
+
+    /**
+     * Retrieves a Nashorn call site descriptor with the specified values. Since call site descriptors are immutable
+     * this method is at liberty to retrieve canonicalized instances (although it is not guaranteed it will do so).
+     * @param name the name at the call site, e.g. {@code "dyn:getProp|getElem|getMethod:color"}.
+     * @param methodType the method type at the call site
+     * @param flags Nashorn-specific call site flags
+     * @return a call site descriptor with the specified values.
+     */
+    public static NashornCallSiteDescriptor get(final String name, final MethodType methodType, final int flags) {
+        final String[] tokenizedName = CallSiteDescriptorFactory.tokenizeName(name);
+        assert tokenizedName.length == 2 || tokenizedName.length == 3;
+        assert "dyn".equals(tokenizedName[0]);
+        assert tokenizedName[1] != null;
+        // TODO: see if we can move mangling/unmangling into Dynalink
+        return get(tokenizedName[1], tokenizedName.length == 3 ? tokenizedName[2].intern() : null,
+                methodType, flags);
+    }
+
+    private static NashornCallSiteDescriptor get(final String operator, final String operand, final MethodType methodType, final int flags) {
+        final NashornCallSiteDescriptor csd = new NashornCallSiteDescriptor(operator, operand, methodType, flags);
+        // Many of these call site descriptors are identical (e.g. every getter for a property color will be
+        // "dyn:getProp:color(Object)Object", so it makes sense canonicalizing them in a weak map
+        synchronized(canonicals) {
+            final WeakReference<NashornCallSiteDescriptor> ref = canonicals.get(csd);
+            if(ref != null) {
+                final NashornCallSiteDescriptor canonical = ref.get();
+                if(canonical != null) {
+                    return canonical;
+                }
+            }
+            canonicals.put(csd, new WeakReference<>(csd));
+        }
+        return csd;
+    }
+
+    private NashornCallSiteDescriptor(final String operator, final String operand, final MethodType methodType, final int flags) {
+        this.operator = operator;
+        this.operand = operand;
+        this.methodType = methodType;
+        this.flags = flags;
+    }
+
+    @Override
+    public int getNameTokenCount() {
+        return operand == null ? 2 : 3;
+    }
+
+    @Override
+    public String getNameToken(final int i) {
+        switch(i) {
+        case 0: return "dyn";
+        case 1: return operator;
+        case 2:
+            if(operand != null) {
+                return operand;
+            }
+            break;
+        default:
+            break;
+        }
+        throw new IndexOutOfBoundsException(String.valueOf(i));
+    }
+
+    @Override
+    public boolean equals(final CallSiteDescriptor csd) {
+        return super.equals(csd) && flags == getFlags(csd);
+    }
+
+    @Override
+    public MethodType getMethodType() {
+        return methodType;
+    }
+
+    /**
+     * Returns the operator (e.g. {@code "getProp"}) in this call site descriptor's name. Equivalent to
+     * {@code getNameToken(CallSiteDescriptor.OPERATOR)}. The returned operator can be composite.
+     * @return the operator in this call site descriptor's name.
+     */
+    public String getOperator() {
+        return operator;
+    }
+
+    /**
+     * Returns the first operator in this call site descriptor's name. E.g. if this call site descriptor has a composite
+     * operation {@code "getProp|getMethod|getElem"}, it will return {@code "getProp"}. Nashorn - being a ECMAScript
+     * engine - does not distinguish between property, element, and method namespace; ECMAScript objects just have one
+     * single property namespace for all these, therefore it is largely irrelevant what the composite operation is
+     * structured like; if the first operation can't be satisfied, neither can the others. The first operation is
+     * however sometimes used to slightly alter the semantics; for example, a distinction between {@code "getProp"} and
+     * {@code "getMethod"} being the first operation can translate into whether {@code "__noSuchProperty__"} or
+     * {@code "__noSuchMethod__"} will be executed in case the property is not found.
+     * @return the first operator in this call site descriptor's name.
+     */
+    public String getFirstOperator() {
+        final int delim = operator.indexOf(CallSiteDescriptor.OPERATOR_DELIMITER);
+        return delim == -1 ? operator : operator.substring(0, delim);
+    }
+
+    /**
+     * Returns the named operand in this descriptor's name. Equivalent to
+     * {@code getNameToken(CallSiteDescriptor.NAME_OPERAND)}. E.g. for operation {@code "dyn:getProp:color"}, returns
+     * {@code "color"}. For call sites without named operands (e.g. {@link "dyn:new"}) returns null.
+     * @return the named operand in this descriptor's name.
+     */
+    public String getOperand() {
+        return operand;
+    }
+
+    /**
+     * Returns the Nashorn-specific flags for this call site descriptor.
+     * @param desc the descriptor. It can be any kind of a call site descriptor, not necessarily a
+     * {@code NashornCallSiteDescriptor}. This allows for graceful interoperability when linking Nashorn with code
+     * generated outside of Nashorn.
+     * @return the Nashorn-specific flags for the call site, or 0 if the passed descriptor is not a Nashorn call site
+     * descriptor.
+     */
+    private static int getFlags(final CallSiteDescriptor desc) {
+        return desc instanceof NashornCallSiteDescriptor ? ((NashornCallSiteDescriptor)desc).flags : 0;
+    }
+
+    /**
+     * Returns true if this descriptor has the specified flag set, see {@code CALLSITE_*} constants in this class.
+     * @param flag the tested flag
+     * @return true if the flag is set, false otherwise
+     */
+    private boolean isFlag(final int flag) {
+        return (flags & flag) != 0;
+    }
+
+    /**
+     * Returns true if this descriptor has the specified flag set, see {@code CALLSITE_*} constants in this class.
+     * @param desc the descriptor. It can be any kind of a call site descriptor, not necessarily a
+     * {@code NashornCallSiteDescriptor}. This allows for graceful interoperability when linking Nashorn with code
+     * generated outside of Nashorn.
+     * @param flag the tested flag
+     * @return true if the flag is set, false otherwise (it will be false if the decriptor is not a Nashorn call site
+     * descriptor).
+     */
+    private static boolean isFlag(final CallSiteDescriptor desc, final int flag) {
+        return (getFlags(desc) & flag) != 0;
+    }
+
+    /**
+     * Returns true if this descriptor is a Nashorn call site descriptor and has the {@link  #CALLSITE_SCOPE} flag set.
+     * @param desc the descriptor. It can be any kind of a call site descriptor, not necessarily a
+     * {@code NashornCallSiteDescriptor}. This allows for graceful interoperability when linking Nashorn with code
+     * generated outside of Nashorn.
+     * @return true if the descriptor is a Nashorn call site descriptor, and the flag is set, false otherwise.
+     */
+    public static boolean isScope(final CallSiteDescriptor desc) {
+        return isFlag(desc, CALLSITE_SCOPE);
+    }
+
+    /**
+     * Returns true if this descriptor is a Nashorn call site descriptor and has the {@link  #CALLSITE_FAST_SCOPE} flag set.
+     * @param desc the descriptor. It can be any kind of a call site descriptor, not necessarily a
+     * {@code NashornCallSiteDescriptor}. This allows for graceful interoperability when linking Nashorn with code
+     * generated outside of Nashorn.
+     * @return true if the descriptor is a Nashorn call site descriptor, and the flag is set, false otherwise.
+     */
+    public static boolean isFastScope(final CallSiteDescriptor desc) {
+        return isFlag(desc, CALLSITE_FAST_SCOPE);
+    }
+
+    /**
+     * Returns true if this descriptor is a Nashorn call site descriptor and has the {@link  #CALLSITE_STRICT} flag set.
+     * @param desc the descriptor. It can be any kind of a call site descriptor, not necessarily a
+     * {@code NashornCallSiteDescriptor}. This allows for graceful interoperability when linking Nashorn with code
+     * generated outside of Nashorn.
+     * @return true if the descriptor is a Nashorn call site descriptor, and the flag is set, false otherwise.
+     */
+    public static boolean isStrict(final CallSiteDescriptor desc) {
+        return isFlag(desc, CALLSITE_STRICT);
+    }
+
+    boolean isProfile() {
+        return isFlag(CALLSITE_PROFILE);
+    }
+
+    boolean isTrace() {
+        return isFlag(CALLSITE_TRACE);
+    }
+
+    boolean isTraceMisses() {
+        return isFlag(CALLSITE_TRACE_MISSES);
+    }
+
+    boolean isTraceEnterExit() {
+        return isFlag(CALLSITE_TRACE_ENTEREXIT);
+    }
+
+    boolean isTraceObjects() {
+        return isFlag(CALLSITE_TRACE_VALUES);
+    }
+
+    boolean isTraceScope() {
+        return isFlag(CALLSITE_TRACE_SCOPE);
+    }
+
+    @Override
+    public CallSiteDescriptor changeMethodType(final MethodType newMethodType) {
+        return get(operator, operand, newMethodType, flags);
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornGuardedInvocation.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornGuardedInvocation.java
new file mode 100644
index 00000000000..725975cd374
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornGuardedInvocation.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.linker;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.SwitchPoint;
+import org.dynalang.dynalink.linker.GuardedInvocation;
+
+/**
+ * Guarded invocation with Nashorn specific bits.
+ */
+public class NashornGuardedInvocation extends GuardedInvocation {
+    private final int flags;
+
+    /**
+     * Constructor
+     *
+     * @param invocation  invocation target
+     * @param switchPoint SwitchPoint that will, when invalidated, require relinking callsite, null if no SwitchPoint
+     * @param guard       guard that will, when failed, require relinking callsite, null if no guard
+     * @param flags       callsite flags
+     */
+    public NashornGuardedInvocation(final MethodHandle invocation, final SwitchPoint switchPoint, final MethodHandle guard, final int flags) {
+        super(invocation, switchPoint, guard);
+        this.flags = flags;
+
+    }
+
+    /**
+     * Is this invocation created from a callsite with strict semantics
+     * @return true if strict
+     */
+    public boolean isStrict() {
+        return (flags & NashornCallSiteDescriptor.CALLSITE_STRICT) != 0;
+    }
+
+    /**
+     * Check whether a GuardedInvocation is created from a callsite with strict semantics
+     * @param inv guarded invocation
+     * @return true if strict
+     */
+    public static boolean isStrict(final GuardedInvocation inv) {
+        return (inv instanceof NashornGuardedInvocation)? ((NashornGuardedInvocation)inv).isStrict() : false;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornGuards.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornGuards.java
new file mode 100644
index 00000000000..05c626bb12b
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornGuards.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.linker;
+
+import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import jdk.nashorn.internal.runtime.PropertyMap;
+import jdk.nashorn.internal.runtime.ScriptFunction;
+import jdk.nashorn.internal.runtime.ScriptObject;
+
+/**
+ * Constructor of method handles used to guard call sites.
+ */
+public final class NashornGuards {
+    private static final MethodHandle IS_SCRIPTOBJECT          = findOwnMH("isScriptObject", boolean.class, Object.class);
+    private static final MethodHandle IS_SCRIPTFUNCTION        = findOwnMH("isScriptFunction", boolean.class, Object.class);
+    private static final MethodHandle IS_MAP                   = findOwnMH("isMap", boolean.class, Object.class, PropertyMap.class);
+    private static final MethodHandle IS_FUNCTION_MH           = findOwnMH("isFunctionMH", boolean.class, Object.class, MethodHandle.class);
+    private static final MethodHandle IS_INSTANCEOF_2          = findOwnMH("isInstanceOf2", boolean.class, Object.class, Class.class, Class.class);
+
+    // don't create me!
+    private NashornGuards() {
+    }
+
+    /**
+     * Get the guard that checks if an item is a {@code ScriptObject}
+     * @return method handle for guard
+     */
+    public static MethodHandle getScriptObjectGuard() {
+        return IS_SCRIPTOBJECT;
+    }
+
+    /**
+     * Get the guard that checks if an item is a {@code ScriptFunction}
+     * @return method handle for guard
+     */
+    public static MethodHandle getScriptFunctionGuard() {
+        return IS_SCRIPTFUNCTION;
+    }
+
+    /**
+     * Get the guard that checks if a {@link PropertyMap} is equal to
+     * a known map, using reference comparison
+     *
+     * @param map The map to check against. This will be bound to the guard method handle
+     *
+     * @return method handle for guard
+     */
+    public static MethodHandle getMapGuard(final PropertyMap map) {
+        return MH.insertArguments(IS_MAP, 1, map);
+    }
+
+    /**
+     * Get a guard that checks if in item is an instance of either of two classes.
+     *
+     * @param class1 the first class
+     * @param class2 the second class
+     * @return method handle for guard
+     */
+    public static MethodHandle getInstanceOf2Guard(final Class<?> class1, final Class<?> class2) {
+        return MH.insertArguments(IS_INSTANCEOF_2, 1, class1, class2);
+    }
+
+    /**
+     * Get the guard that checks if a {@link ScriptFunction} is equal to
+     * a known ScriptFunction, using reference comparison
+     *
+     * @param function The ScriptFunction to check against. This will be bound to the guard method handle
+     *
+     * @return method handle for guard
+     */
+    public static MethodHandle getFunctionGuard(final ScriptFunction function) {
+        assert function.getInvokeHandle() != null;
+        return MH.insertArguments(IS_FUNCTION_MH, 1, function.getInvokeHandle());
+    }
+
+    @SuppressWarnings("unused")
+    private static boolean isScriptObject(final Object self) {
+        return self instanceof ScriptObject;
+    }
+
+    @SuppressWarnings("unused")
+    private static boolean isScriptFunction(final Object self) {
+        return self instanceof ScriptFunction;
+    }
+
+    @SuppressWarnings("unused")
+    private static boolean isMap(final Object self, final PropertyMap map) {
+        return self instanceof ScriptObject && ((ScriptObject)self).getMap() == map;
+    }
+
+    @SuppressWarnings("unused")
+    private static boolean isFunctionMH(final Object self, final MethodHandle mh) {
+        return self instanceof ScriptFunction && ((ScriptFunction)self).getInvokeHandle() == mh;
+    }
+
+    @SuppressWarnings("unused")
+    private static boolean isInstanceOf2(final Object self, final Class<?> class1, final Class<?> class2) {
+        return class1.isInstance(self) || class2.isInstance(self);
+    }
+
+    private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
+        return MH.findStatic(MethodHandles.lookup(), NashornGuards.class, name, MH.type(rtype, types));
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornLinker.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornLinker.java
new file mode 100644
index 00000000000..06534c945af
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornLinker.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.linker;
+
+import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import jdk.nashorn.internal.runtime.ScriptFunction;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.Undefined;
+import org.dynalang.dynalink.CallSiteDescriptor;
+import org.dynalang.dynalink.linker.ConversionComparator;
+import org.dynalang.dynalink.linker.GuardedInvocation;
+import org.dynalang.dynalink.linker.GuardingTypeConverterFactory;
+import org.dynalang.dynalink.linker.LinkRequest;
+import org.dynalang.dynalink.linker.LinkerServices;
+import org.dynalang.dynalink.linker.TypeBasedGuardingDynamicLinker;
+import org.dynalang.dynalink.support.Guards;
+
+/**
+ * This is the main dynamic linker for Nashorn. It is used for linking all {@link ScriptObject} and its subclasses (this
+ * includes {@link ScriptFunction} and its subclasses) as well as {@link Undefined}. This linker is exported to other
+ * language runtimes by being declared in {@code META-INF/services/org.dynalang.dynalink.linker.GuardingDynamicLinker}
+ * file of Nashorn's distribution.
+ */
+public class NashornLinker implements TypeBasedGuardingDynamicLinker, GuardingTypeConverterFactory, ConversionComparator {
+    /**
+     * Returns true if {@code ScriptObject} is assignable from {@code type}, or it is {@code Undefined}.
+     */
+    @Override
+    public boolean canLinkType(final Class<?> type) {
+        return canLinkTypeStatic(type);
+    }
+
+    static boolean canLinkTypeStatic(final Class<?> type) {
+        return ScriptObject.class.isAssignableFrom(type) || Undefined.class == type;
+    }
+
+    @Override
+    public GuardedInvocation getGuardedInvocation(final LinkRequest request, final LinkerServices linkerServices) throws Exception {
+        final LinkRequest requestWithoutContext = request.withoutRuntimeContext(); // Nashorn has no runtime context
+        final Object self = requestWithoutContext.getReceiver();
+        final CallSiteDescriptor desc = requestWithoutContext.getCallSiteDescriptor();
+
+        if (desc.getNameTokenCount() < 2 || !"dyn".equals(desc.getNameToken(CallSiteDescriptor.SCHEME))) {
+            // We only support standard "dyn:*[:*]" operations
+            return null;
+        }
+
+        final GuardedInvocation inv;
+        if (self instanceof ScriptObject) {
+            inv = ((ScriptObject)self).lookup(desc, request.isCallSiteUnstable());
+        } else if (self instanceof Undefined) {
+            inv = Undefined.lookup(desc);
+        } else {
+            throw new AssertionError(); // Should never reach here.
+        }
+
+        return Bootstrap.asType(inv, linkerServices, desc);
+    }
+
+    @Override
+    public GuardedInvocation convertToType(final Class<?> sourceType, final Class<?> targetType) throws Exception {
+        final MethodHandle mh = JavaArgumentConverters.getConverter(targetType);
+        final GuardedInvocation gi;
+        if (mh != null) {
+            gi = new GuardedInvocation(mh, canLinkTypeStatic(sourceType) ? null : IS_NASHORN_OR_UNDEFINED_TYPE);
+        } else if (isAutoConvertibleFromFunction(targetType)) {
+            final MethodHandle ctor = JavaAdapterFactory.getConstructor(ScriptFunction.class, targetType);
+            assert ctor != null; // if JavaAdapterFactory.isAutoConvertible() returned true, then ctor must exist.
+            if(ScriptFunction.class.isAssignableFrom(sourceType)) {
+                gi = new GuardedInvocation(ctor, null);
+            } else if(sourceType == Object.class) {
+                gi = new GuardedInvocation(ctor, IS_SCRIPT_FUNCTION);
+            } else {
+                return null;
+            }
+        } else {
+            return null;
+        }
+        return gi.asType(MH.type(targetType, sourceType));
+    }
+
+    private static boolean isAutoConvertibleFromFunction(final Class<?> clazz) {
+        return JavaAdapterFactory.isAbstractClass(clazz) && !ScriptObject.class.isAssignableFrom(clazz) &&
+                JavaAdapterFactory.isAutoConvertibleFromFunction(clazz);
+    }
+
+    @Override
+    public Comparison compareConversion(final Class<?> sourceType, final Class<?> targetType1, final Class<?> targetType2) {
+        if(ScriptObject.class.isAssignableFrom(sourceType)) {
+            if(targetType1.isInterface()) {
+                if(!targetType2.isInterface()) {
+                    return Comparison.TYPE_1_BETTER;
+                }
+            } else if(targetType2.isInterface()) {
+                return Comparison.TYPE_2_BETTER;
+            }
+        }
+        return Comparison.INDETERMINATE;
+    }
+
+    private static final MethodHandle IS_SCRIPT_FUNCTION = Guards.isInstance(ScriptFunction.class, MH.type(Boolean.TYPE, Object.class));
+
+    private static final MethodHandle IS_NASHORN_OR_UNDEFINED_TYPE = findOwnMH("isNashornTypeOrUndefined",
+            Boolean.TYPE, Object.class);
+
+    @SuppressWarnings("unused")
+    private static boolean isNashornTypeOrUndefined(final Object obj) {
+        return obj instanceof ScriptObject || obj instanceof Undefined;
+    }
+
+    private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
+        return MH.findStatic(MethodHandles.lookup(), NashornLinker.class, name, MH.type(rtype, types));
+    }
+}
+
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java
new file mode 100644
index 00000000000..4fc658742ee
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java
@@ -0,0 +1,228 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.linker;
+
+import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import jdk.nashorn.internal.runtime.ConsString;
+import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.runtime.ECMAErrors;
+import jdk.nashorn.internal.runtime.GlobalObject;
+import org.dynalang.dynalink.beans.BeansLinker;
+import org.dynalang.dynalink.beans.StaticClass;
+import org.dynalang.dynalink.linker.ConversionComparator;
+import org.dynalang.dynalink.linker.GuardedInvocation;
+import org.dynalang.dynalink.linker.GuardingDynamicLinker;
+import org.dynalang.dynalink.linker.GuardingTypeConverterFactory;
+import org.dynalang.dynalink.linker.LinkRequest;
+import org.dynalang.dynalink.linker.LinkerServices;
+import org.dynalang.dynalink.linker.TypeBasedGuardingDynamicLinker;
+import org.dynalang.dynalink.support.Guards;
+import org.dynalang.dynalink.support.TypeUtilities;
+
+/**
+ * Internal linker for String, Boolean, Number, and {@link StaticClass} objects, only ever used by Nashorn engine and
+ * not exposed to other engines. It is used for treatment of strings, boolean, and numbers, as JavaScript primitives,
+ * as well as for extending the "new" operator on StaticClass in order to be able to instantiate interfaces and abstract
+ * classes by passing a ScriptObject or ScriptFunction as their implementation, e.g.:
+ * <pre>
+ *   var r = new Runnable() { run: function() { print("Hello World" } }
+ * </pre>
+ * or even, for SAM types:
+ * <pre>
+ *   var r = new Runnable(function() { print("Hello World" })
+ * </pre>
+ */
+class NashornPrimitiveLinker implements TypeBasedGuardingDynamicLinker, GuardingTypeConverterFactory, ConversionComparator {
+    private static final GuardingDynamicLinker staticClassLinker = BeansLinker.getLinkerForClass(StaticClass.class);
+
+    @Override
+    public boolean canLinkType(final Class<?> type) {
+        return canLinkTypeStatic(type);
+    }
+
+    private static boolean canLinkTypeStatic(final Class<?> type) {
+        return type == String.class || type == Boolean.class || type == StaticClass.class ||
+                type == ConsString.class || Number.class.isAssignableFrom(type);
+    }
+
+    @Override
+    public GuardedInvocation getGuardedInvocation(final LinkRequest origRequest, final LinkerServices linkerServices)
+            throws Exception {
+        final LinkRequest request = origRequest.withoutRuntimeContext(); // Nashorn has no runtime context
+
+        final Object self = request.getReceiver();
+        final GlobalObject global = (GlobalObject) Context.getGlobal();
+        final NashornCallSiteDescriptor desc = (NashornCallSiteDescriptor) request.getCallSiteDescriptor();
+
+        if (self instanceof Number) {
+            return Bootstrap.asType(global.numberLookup(desc, (Number) self), linkerServices, desc);
+        } else if (self instanceof String || self instanceof ConsString) {
+           return Bootstrap.asType(global.stringLookup(desc, (CharSequence) self), linkerServices, desc);
+        } else if (self instanceof Boolean) {
+            return Bootstrap.asType(global.booleanLookup(desc, (Boolean) self), linkerServices, desc);
+        } else if (self instanceof StaticClass) {
+            // We intercept "new" on StaticClass instances to provide additional capabilities
+            if ("new".equals(desc.getOperator())) {
+                final Class<?> receiverClass = ((StaticClass) self).getRepresentedClass();
+                // Is the class abstract? (This includes interfaces.)
+                if (JavaAdapterFactory.isAbstractClass(receiverClass)) {
+                    // Change this link request into a link request on the adapter class.
+                    final Object[] args = request.getArguments();
+                    args[0] = JavaAdapterFactory.getAdapterClassFor(receiverClass);
+                    final LinkRequest adapterRequest = request.replaceArguments(request.getCallSiteDescriptor(), args);
+                    final GuardedInvocation gi = checkNullConstructor(
+                            staticClassLinker.getGuardedInvocation(adapterRequest, linkerServices), receiverClass);
+                    // Finally, modify the guard to test for the original abstract class.
+                    return gi.replaceMethods(gi.getInvocation(), Guards.getIdentityGuard(self));
+                }
+                // If the class was not abstract, just link to the ordinary constructor. Make an additional check to
+                // ensure we have a constructor. We could just fall through to the next "return" statement, except we
+                // also insert a call to checkNullConstructor() which throws an error with a more intuitive message when
+                // no suitable constructor is found.
+                return checkNullConstructor(staticClassLinker.getGuardedInvocation(request, linkerServices), receiverClass);
+            }
+            // In case this was not a "new" operation, just link with the standard StaticClass linker.
+            return staticClassLinker.getGuardedInvocation(request, linkerServices);
+        }
+
+        throw new AssertionError(); // Can't reach here
+    }
+
+    private static GuardedInvocation checkNullConstructor(final GuardedInvocation ctorInvocation, final Class<?> receiverClass) {
+        if(ctorInvocation == null) {
+            ECMAErrors.typeError(Context.getGlobal(), "no.constructor.matches.args", receiverClass.getName());
+        }
+        return ctorInvocation;
+    }
+
+    /**
+     * This implementation of type converter factory will pretty much allow implicit conversions of anything to anything
+     * else that's allowed among JavaScript primitive types (string to number, boolean to string, etc.)
+     * @param sourceType the type to convert from
+     * @param targetType the type to convert to
+     * @return a conditional converter from source to target type
+     */
+    @Override
+    public GuardedInvocation convertToType(final Class<?> sourceType, final Class<?> targetType) {
+        final MethodHandle mh = JavaArgumentConverters.getConverter(targetType);
+        if (mh == null) {
+            return null;
+        }
+
+        return new GuardedInvocation(mh, canLinkTypeStatic(sourceType) ? null : GUARD_PRIMITIVE).asType(mh.type().changeParameterType(0, sourceType));
+    }
+
+    /**
+     * Implements the somewhat involved prioritization of JavaScript primitive types conversions. Instead of explaining
+     * it here in prose, just follow the source code comments.
+     * @param sourceType the source type to convert from
+     * @param targetType1 one candidate target type
+     * @param targetType2 another candidate target type
+     * @return one of {@link org.dynalang.dynalink.linker.ConversionComparator.Comparison} values signifying which target type should be favored for conversion.
+     */
+    @Override
+    public Comparison compareConversion(final Class<?> sourceType, final Class<?> targetType1, final Class<?> targetType2) {
+        final Class<?> wrapper1 = getWrapperTypeOrSelf(targetType1);
+        if (sourceType == wrapper1) {
+            // Source type exactly matches target 1
+            return Comparison.TYPE_1_BETTER;
+        }
+        final Class<?> wrapper2 = getWrapperTypeOrSelf(targetType2);
+        if (sourceType == wrapper2) {
+            // Source type exactly matches target 2
+            return Comparison.TYPE_2_BETTER;
+        }
+
+        if (Number.class.isAssignableFrom(sourceType)) {
+            // If exactly one of the targets is a number, pick it.
+            if (Number.class.isAssignableFrom(wrapper1)) {
+                if (!Number.class.isAssignableFrom(wrapper2)) {
+                    return Comparison.TYPE_1_BETTER;
+                }
+            } else if (Number.class.isAssignableFrom(wrapper2)) {
+                return Comparison.TYPE_2_BETTER;
+            }
+
+            // If exactly one of the targets is a character, pick it. Numbers can be reasonably converted to chars using
+            // the UTF-16 values.
+            if (Character.class == wrapper1) {
+                return Comparison.TYPE_1_BETTER;
+            } else if (Character.class == wrapper2) {
+                return Comparison.TYPE_2_BETTER;
+            }
+
+            // For all other cases, we fall through to the next if statement - not that we repeat the condition in it
+            // too so if we entered this branch, we'll enter the below if statement too.
+        }
+
+        if (sourceType == String.class || sourceType == Boolean.class || Number.class.isAssignableFrom(sourceType)) {
+            // Treat wrappers as primitives.
+            final Class<?> primitiveType1 = getPrimitiveTypeOrSelf(targetType1);
+            final Class<?> primitiveType2 = getPrimitiveTypeOrSelf(targetType2);
+            // Basically, choose the widest possible primitive type. (First "if" returning TYPE_2_BETTER is correct;
+            // when faced with a choice between double and int, choose double).
+            if (TypeUtilities.isMethodInvocationConvertible(primitiveType1, primitiveType2)) {
+                return Comparison.TYPE_2_BETTER;
+            } else if (TypeUtilities.isMethodInvocationConvertible(primitiveType2, primitiveType1)) {
+                return Comparison.TYPE_1_BETTER;
+            }
+            // Ok, at this point we're out of possible number conversions, so try strings. A String can represent any
+            // value without loss, so if one of the potential targets is string, go for it.
+            if (targetType1 == String.class) {
+                return Comparison.TYPE_1_BETTER;
+            }
+            if (targetType2 == String.class) {
+                return Comparison.TYPE_2_BETTER;
+            }
+        }
+
+        return Comparison.INDETERMINATE;
+    }
+
+    private static Class<?> getPrimitiveTypeOrSelf(final Class<?> type) {
+        final Class<?> primitive = TypeUtilities.getPrimitiveType(type);
+        return primitive == null ? type : primitive;
+    }
+
+    private static Class<?> getWrapperTypeOrSelf(final Class<?> type) {
+        final Class<?> wrapper = TypeUtilities.getWrapperType(type);
+        return wrapper == null ? type : wrapper;
+    }
+
+    @SuppressWarnings("unused")
+    private static boolean isJavaScriptPrimitive(final Object o) {
+        return o instanceof String || o instanceof Boolean || o instanceof Number || o instanceof ConsString || o == null;
+    }
+
+    private static final MethodHandle GUARD_PRIMITIVE = findOwnMH("isJavaScriptPrimitive", boolean.class, Object.class);
+
+    private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
+        return MH.findStatic(MethodHandles.lookup(), NashornPrimitiveLinker.class, name, MH.type(rtype, types));
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java
new file mode 100644
index 00000000000..e8ca39d1ab8
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.linker;
+
+import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodType;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import org.dynalang.dynalink.CallSiteDescriptor;
+import org.dynalang.dynalink.linker.GuardedInvocation;
+import org.dynalang.dynalink.support.CallSiteDescriptorFactory;
+import org.dynalang.dynalink.support.Guards;
+
+/**
+ * Implements lookup of methods to link for dynamic operations on JavaScript primitive values (booleans, strings, and
+ * numbers). This class is only public so it can be accessed by classes in the {@code jdk.nashorn.internal.objects}
+ * package.
+ */
+public class PrimitiveLookup {
+
+    private PrimitiveLookup() {
+    }
+
+    /**
+     * Returns a guarded invocation representing the linkage for a dynamic operation on a primitive Java value.
+     * @param desc the descriptor of the call site identifying the dynamic operation.
+     * @param receiverClass the class of the receiver value (e.g., {@link java.lang.Boolean}, {@link java.lang.String} etc.)
+     * @param wrappedReceiver a transient JavaScript native wrapper object created as the object proxy for the primitive
+     * value; see ECMAScript 5.1, section 8.7.1 for discussion of using {@code [[Get]]} on a property reference with a
+     * primitive base value. This instance will be used to delegate actual lookup.
+     * @param wrapFilter A method handle that takes a primitive value of type specified in the {@code receiverClass} and
+     * creates a transient native wrapper of the same type as {@code wrappedReceiver} for subsequent invocations of the
+     * method - it will be combined into the returned invocation as an argument filter on the receiver.
+     * @return a guarded invocation representing the operation at the call site when performed on a JavaScript primitive
+     * type {@code receiverClass}.
+     */
+    public static GuardedInvocation lookupPrimitive(final CallSiteDescriptor desc, final Class<?> receiverClass,
+                                                    final ScriptObject wrappedReceiver, final MethodHandle wrapFilter) {
+        return lookupPrimitive(desc, Guards.getInstanceOfGuard(receiverClass), wrappedReceiver, wrapFilter);
+    }
+
+    /**
+     * Returns a guarded invocation representing the linkage for a dynamic operation on a primitive Java value.
+     * @param desc the descriptor of the call site identifying the dynamic operation.
+     * @param guard an explicit guard that will be used for the returned guarded invocation.
+     * @param wrappedReceiver a transient JavaScript native wrapper object created as the object proxy for the primitive
+     * value; see ECMAScript 5.1, section 8.7.1 for discussion of using {@code [[Get]]} on a property reference with a
+     * primitive base value. This instance will be used to delegate actual lookup.
+     * @param wrapFilter A method handle that takes a primitive value of type guarded by the {@code guard} and
+     * creates a transient native wrapper of the same type as {@code wrappedReceiver} for subsequent invocations of the
+     * method - it will be combined into the returned invocation as an argument filter on the receiver.
+     * @return a guarded invocation representing the operation at the call site when performed on a JavaScript primitive
+     * type (that is implied by both {@code guard} and {@code wrappedReceiver}).
+     */
+    public static GuardedInvocation lookupPrimitive(final CallSiteDescriptor desc, final MethodHandle guard,
+                                                    final ScriptObject wrappedReceiver, final MethodHandle wrapFilter) {
+        final String operator = CallSiteDescriptorFactory.tokenizeOperators(desc).get(0);
+        if ("setProp".equals(operator) && desc.getNameTokenCount() > 2) {
+            return new GuardedInvocation(MH.asType(Lookup.EMPTY_SETTER, MH.type(void.class, Object.class,
+                    desc.getMethodType().parameterType(1))), guard);
+        }
+
+        if(desc.getNameTokenCount() > 2) {
+            final String name = desc.getNameToken(CallSiteDescriptor.NAME_OPERAND);
+            if(wrappedReceiver.findProperty(name, true) == null) {
+                // Give up early, give chance to BeanLinker and NashornBottomLinker to deal with it.
+                return null;
+            }
+        }
+        final GuardedInvocation link = wrappedReceiver.lookup(desc);
+        if (link != null) {
+            MethodHandle method = link.getInvocation();
+            if (!NashornGuardedInvocation.isStrict(link)) {
+                final MethodType wrapType = wrapFilter.type();
+                final Class<?> methodReceiverType = method.type().parameterType(0);
+                assert methodReceiverType.isAssignableFrom(wrapType.returnType());
+                method = MH.filterArguments(method, 0, MH.asType(wrapFilter, wrapType.changeReturnType(methodReceiverType)));
+            }
+            return new GuardedInvocation(method, guard, link.getSwitchPoint());
+        }
+        assert desc.getNameTokenCount() <= 2; // Named operations would hit the return null after findProperty
+        return null;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/options/KeyValueOption.java b/nashorn/src/jdk/nashorn/internal/runtime/options/KeyValueOption.java
new file mode 100644
index 00000000000..2d2c63244f5
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/options/KeyValueOption.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.options;
+
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.StringTokenizer;
+
+/**
+ * Key Value option such as logger. It comes on the format
+ * such as:
+ *
+ * {@code --log=module1:level1,module2:level2... }
+ */
+public class KeyValueOption extends Option<String> {
+    /**
+     * Map of keys given
+     */
+    protected Map<String, String> map;
+
+    KeyValueOption(final String value) {
+        super(value);
+        initialize();
+    }
+
+    Map<String, String> getValues() {
+        return Collections.unmodifiableMap(map);
+    }
+
+    /**
+     * Check if the key value option has a value or if it has not
+     * been initialized
+     * @param key the key
+     * @return value, or null if not initialized
+     */
+    public boolean hasValue(final String key) {
+        return map != null && map.get(key) != null;
+    }
+
+    String getValue(final String key) {
+        if (map == null) {
+            return null;
+        }
+        final String val = map.get(key);
+        return "".equals(val) ? null : val;
+    }
+
+    private void initialize() {
+        if (getValue() == null) {
+            return;
+        }
+
+        map = new LinkedHashMap<>();
+
+        final StringTokenizer st = new StringTokenizer(getValue(), ",");
+        while (st.hasMoreElements()) {
+            final String   token    = st.nextToken();
+            final String[] keyValue = token.split(":");
+
+            if (keyValue.length == 1) {
+                map.put(keyValue[0], "");
+            } else if (keyValue.length == 2) {
+                map.put(keyValue[0], keyValue[1]);
+            } else {
+                throw new IllegalArgumentException(token);
+            }
+        }
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/options/Option.java b/nashorn/src/jdk/nashorn/internal/runtime/options/Option.java
new file mode 100644
index 00000000000..1e7a5ba58bb
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/options/Option.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.options;
+
+/**
+ * This is an option class that at its most primitive level just wraps a
+ * boolean or String. However, it is conceivable that the option, when set
+ * should run some initializations (for example, the logger system) or carry
+ * some other kind of payload, arrays, Collections, etc. In that case, this
+ * should be subclassed
+ *
+ * @param <T> option value type, for example a boolean or something more complex
+ */
+public class Option<T> {
+    /** the option value */
+    protected T value;
+
+    Option(final T value) {
+       this.value = value;
+    }
+
+    void setValue(final T value) {
+        this.value = value;
+    }
+
+    /**
+     * Return the value of an option
+     * @return the option value
+     */
+    public T getValue() {
+        return value;
+    }
+
+    @Override
+    public String toString() {
+        return getValue() + " [" + getValue().getClass() + "]";
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/options/OptionTemplate.java b/nashorn/src/jdk/nashorn/internal/runtime/options/OptionTemplate.java
new file mode 100644
index 00000000000..4d5f25dc92b
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/options/OptionTemplate.java
@@ -0,0 +1,367 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.options;
+
+import java.util.TimeZone;
+import jdk.nashorn.internal.runtime.QuotedStringTokenizer;
+
+/**
+ * This describes the valid input for an option, as read from the resource
+ * bundle file. Metainfo such as parameters and description is here as well
+ * for context sensitive help generation.
+ */
+public class OptionTemplate implements Comparable<OptionTemplate> {
+    /** Resource, e.g. "nashorn" for this option */
+    private final String resource;
+
+    /** Key in the resource bundle */
+    private final String key;
+
+    /** Is this option a help option? */
+    private final boolean isHelp;
+
+    /** Is this option a extended help option? */
+    private final boolean isXHelp;
+
+    /** Name - for example --dump-on-error (usually prefixed with --) */
+    private String name;
+
+    /** Short name - for example -doe (usually prefixed with -) */
+    private String shortName;
+
+    /** Params - a parameter template string */
+    private String params;
+
+    /** Type - e.g. "boolean". */
+    private String type;
+
+    /** Does this option have a default value? */
+    private String defaultValue;
+
+    /** Does this option activate another option when set? */
+    private String dependency;
+
+    /** Does this option conflict with another? */
+    private String conflict;
+
+    /** Is this a documented option that should show up in help? */
+    private boolean isUndocumented;
+
+    /** A longer description of what this option does */
+    private String description;
+
+    /** is the option value specified as next argument? */
+    private boolean valueNextArg;
+
+    OptionTemplate(final String resource, final String key, final String value, final boolean isHelp, final boolean isXHelp) {
+        this.resource = resource;
+        this.key = key;
+        this.isHelp = isHelp;
+        this.isXHelp = isXHelp;
+        parse(value);
+    }
+
+    /**
+     * Is this the special help option, used to generate help for
+     * all the others
+     *
+     * @return true if this is the help option
+     */
+    public boolean isHelp() {
+        return this.isHelp;
+    }
+
+    /**
+     * Is this the special extended help option, used to generate extended help for
+     * all the others
+     *
+     * @return true if this is the extended help option
+     */
+    public boolean isXHelp() {
+        return this.isXHelp;
+    }
+
+    /**
+     * Get the resource name used to prefix this option set, e.g. "nashorn"
+     *
+     * @return the name of the resource
+     */
+    public String getResource() {
+        return this.resource;
+    }
+
+    /**
+     * Get the type of this option
+     *
+     * @return the type of the option
+     */
+    public String getType() {
+        return this.type;
+    }
+
+    /**
+     * Get the key of this option
+     *
+     * @return the key
+     */
+    public String getKey() {
+        return this.key;
+    }
+
+    /**
+     * Get the default value for this option
+     *
+     * @return the default value as a string
+     */
+    public String getDefaultValue() {
+        switch (getType()) {
+        case "boolean":
+            if (this.defaultValue == null) {
+                this.defaultValue = "false";
+            }
+            break;
+        case "integer":
+            if (this.defaultValue == null) {
+                this.defaultValue = "0";
+            }
+            break;
+        case "timezone":
+            this.defaultValue = TimeZone.getDefault().getID();
+            break;
+        default:
+            break;
+        }
+        return this.defaultValue;
+    }
+
+    /**
+     * Does this option automatically enable another option, i.e. a dependency.
+     * @return the dependecy or null if non exists
+     */
+    public String getDependency() {
+        return this.dependency;
+    }
+
+    /**
+     * Is this option in conflict with another option so that both can't be enabled
+     * at the same time
+     *
+     * @return the conflicting option or null if none exists
+     */
+    public String getConflict() {
+        return this.conflict;
+    }
+
+    /**
+     * Is this option undocumented, i.e. should not show up in the standard help output
+     *
+     * @return true if option is undocumented
+     */
+    public boolean isUndocumented() {
+        return this.isUndocumented;
+    }
+
+    /**
+     * Get the short version of this option name if one exists, e.g. "-co" for "--compile-only"
+     *
+     * @return the short name
+     */
+    public String getShortName() {
+        return this.shortName;
+    }
+
+    /**
+     * Get the name of this option, e.g. "--compile-only". A name always exists
+     *
+     * @return the name of the option
+     */
+    public String getName() {
+        return this.name;
+    }
+
+    /**
+     * Get the description of this option.
+     *
+     * @return the description
+     */
+    public String getDescription() {
+        return this.description;
+    }
+
+    /**
+     * Is value of this option passed as next argument?
+     * @return boolean
+     */
+    public boolean isValueNextArg() {
+        return valueNextArg;
+    }
+
+    private static String strip(final String value, final char start, final char end) {
+        final int len = value.length();
+        if (len > 1 && value.charAt(0) == start && value.charAt(len - 1) == end) {
+            return value.substring(1, len - 1);
+        }
+        return null;
+    }
+
+    private void parse(final String origValue) {
+        String value = origValue.trim();
+
+        try {
+            value = OptionTemplate.strip(value, '{', '}');
+            final QuotedStringTokenizer keyValuePairs = new QuotedStringTokenizer(value, ",");
+
+            while (keyValuePairs.hasMoreTokens()) {
+                final String                keyValue = keyValuePairs.nextToken();
+                final QuotedStringTokenizer st       = new QuotedStringTokenizer(keyValue, "=");
+                final String                keyToken = st.nextToken();
+                final String                arg      = st.nextToken();
+
+                switch (keyToken) {
+                case "is_undocumented":
+                    this.isUndocumented = Boolean.parseBoolean(arg);
+                    break;
+                case "name":
+                    if (!arg.startsWith("-")) {
+                        throw new IllegalArgumentException(arg);
+                    }
+                    this.name = arg;
+                    break;
+                case "short_name":
+                    if (!arg.startsWith("-")) {
+                        throw new IllegalArgumentException(arg);
+                    }
+                    this.shortName = arg;
+                    break;
+                case "desc":
+                    this.description = arg;
+                    break;
+                case "params":
+                    this.params = arg;
+                    break;
+                case "type":
+                    this.type = arg.toLowerCase();
+                    break;
+                case "default":
+                    this.defaultValue = arg;
+                    break;
+                case "dependency":
+                    this.dependency = arg;
+                    break;
+                case "conflict":
+                    this.conflict = arg;
+                    break;
+                case "value_next_arg":
+                    this.valueNextArg = Boolean.parseBoolean(arg);
+                    break;
+                default:
+                    throw new IllegalArgumentException();
+                }
+            }
+
+            // default to boolean if no type is given
+            if (this.type == null) {
+                this.type = "boolean";
+            }
+
+            if (this.params == null && "boolean".equals(this.type)) {
+                this.params = "[true|false]";
+            }
+
+        } catch (final Exception e) {
+            throw new IllegalArgumentException(origValue);
+        }
+
+        if (name == null && shortName == null) {
+            throw new IllegalArgumentException(origValue);
+        }
+    }
+
+    boolean matches(final String key0) {
+        return key0.equals(this.shortName) || key0.equals(this.name);
+    }
+
+    private static final int LINE_BREAK = 64;
+
+    @Override
+    public String toString() {
+        final StringBuilder sb = new StringBuilder();
+
+        sb.append('\t');
+
+        if (shortName != null) {
+            sb.append(shortName);
+            if (name != null) {
+                sb.append(", ");
+            }
+        }
+
+        if (name != null) {
+            sb.append(name);
+        }
+
+        if (description != null) {
+            final int indent = sb.length();
+            sb.append(' ');
+            sb.append('(');
+            int pos = 0;
+            for (final char c : description.toCharArray()) {
+                sb.append(c);
+                pos++;
+                if (pos >= LINE_BREAK && Character.isWhitespace(c)) {
+                    pos = 0;
+                    sb.append("\n\t");
+                    for (int i = 0; i < indent; i++) {
+                        sb.append(' ');
+                    }
+                }
+            }
+            sb.append(')');
+        }
+
+        if (params != null) {
+            sb.append('\n');
+            sb.append('\t');
+            sb.append('\t');
+            sb.append(Options.getMsg("nashorn.options.param")).append(": ");
+            sb.append(params);
+            sb.append("   ");
+            final Object def = this.getDefaultValue();
+            if (def != null) {
+                sb.append(Options.getMsg("nashorn.options.default")).append(": ");
+                sb.append(this.getDefaultValue());
+            }
+        }
+
+
+        return sb.toString();
+    }
+
+    @Override
+    public int compareTo(final OptionTemplate o) {
+        return this.getKey().compareTo(o.getKey());
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/options/Options.java b/nashorn/src/jdk/nashorn/internal/runtime/options/Options.java
new file mode 100644
index 00000000000..26e22b58778
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/options/Options.java
@@ -0,0 +1,657 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.options;
+
+import java.io.PrintWriter;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+import java.util.StringTokenizer;
+import java.util.TimeZone;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import jdk.nashorn.internal.runtime.Logging;
+import jdk.nashorn.internal.runtime.QuotedStringTokenizer;
+
+/**
+ * Manages global runtime options.
+ *
+ */
+public final class Options {
+    /** Resource tag. */
+    private final String resource;
+
+    /** Error writer. */
+    private final PrintWriter errors;
+
+    /** File list. */
+    private final List<String> files;
+
+    /** Arguments list */
+    private final List<String> arguments;
+
+    /** The options map of enabled options */
+    private final TreeMap<String, Option<?>> options;
+
+    /**
+     * Constructor.
+     *
+     * @param resource resource prefix for options e.g. "nashorn"
+     * @param errors   error stream for reporting parse errors
+     */
+    public Options(final String resource, final PrintWriter errors) {
+        this.resource  = resource;
+        this.errors    = errors;
+        this.files     = new ArrayList<>();
+        this.arguments = new ArrayList<>();
+        this.options   = new TreeMap<>();
+
+        // set all default values
+        for (final OptionTemplate t : Options.validOptions) {
+            if (t.getDefaultValue() != null) {
+                // populate from system properties
+                final String v = getStringProperty(t.getKey(), null);
+                if (v != null) {
+                    set(t.getKey(), createOption(t, v));
+                } else if (t.getDefaultValue() != null) {
+                     set(t.getKey(), createOption(t, t.getDefaultValue()));
+                 }
+            }
+        }
+    }
+
+    /**
+     * Constructor
+     *
+     * @param resource  e.g. "nashorn"
+     */
+    public Options(final String resource) {
+        this(resource, new PrintWriter(System.err, true));
+    }
+
+    /**
+     * Get the resource for this Options set, e.g. "nashorn"
+     * @return the resource
+     */
+    public String getResource() {
+        return resource;
+    }
+
+    @Override
+    public String toString() {
+        return options.toString();
+    }
+
+    /**
+     * Convenience function for getting system properties in a safe way
+
+     * @param name of boolean property
+     * @return true if set to true, false if unset or set to false
+     */
+    public static boolean getBooleanProperty(final String name) {
+        name.getClass(); // null check
+        if (!name.startsWith("nashorn.")) {
+            throw new IllegalArgumentException(name);
+        }
+
+        return AccessController.doPrivileged(
+                new PrivilegedAction<Boolean>() {
+                    @Override
+                    public Boolean run() {
+                        try {
+                            final String property = System.getProperty(name);
+                            return property != null && !"false".equalsIgnoreCase(property);
+                        } catch (final SecurityException e) {
+                            // if no permission to read, assume false
+                            return false;
+                        }
+                    }
+                });
+    }
+
+    /**
+     * Convenience function for getting system properties in a safe way
+     *
+     * @param name of string property
+     * @param defValue the default value if unset
+     * @return string property if set or default value
+     */
+    public static String getStringProperty(final String name, final String defValue) {
+        name.getClass(); // null check
+        if (! name.startsWith("nashorn.")) {
+            throw new IllegalArgumentException(name);
+        }
+
+        return AccessController.doPrivileged(
+                new PrivilegedAction<String>() {
+                    @Override
+                    public String run() {
+                        try {
+                            return System.getProperty(name, defValue);
+                        } catch (final SecurityException e) {
+                            // if no permission to read, assume the default value
+                            return defValue;
+                        }
+                    }
+                });
+    }
+
+    /**
+     * Convenience function for getting system properties in a safe way
+     *
+     * @param name of integer property
+     * @param defValue the default value if unset
+     * @return integer property if set or default value
+     */
+    public static int getIntProperty(final String name, final int defValue) {
+        name.getClass(); // null check
+        if (! name.startsWith("nashorn.")) {
+            throw new IllegalArgumentException(name);
+        }
+
+        return AccessController.doPrivileged(
+                new PrivilegedAction<Integer>() {
+                    @Override
+                    public Integer run() {
+                        try {
+                            return Integer.getInteger(name, defValue);
+                        } catch (final SecurityException e) {
+                            // if no permission to read, assume the default value
+                            return defValue;
+                        }
+                    }
+                });
+    }
+
+    /**
+     * Return an option given its resource key. If the key doesn't begin with
+     * <resource>.option it will be completed using the resource from this
+     * instance
+     *
+     * @param key key for option
+     * @return an option value
+     */
+    public Option<?> get(final String key) {
+        return options.get(key(key));
+    }
+
+    /**
+     * Return an option as a boolean
+     *
+     * @param key key for option
+     * @return an option value
+     */
+    public boolean getBoolean(final String key) {
+        final Option<?> option = get(key);
+        return option != null ? (Boolean)option.getValue() : false;
+    }
+
+    /**
+     * Return an option as a integer
+     *
+     * @param key key for option
+     * @return an option value
+     */
+    public int getInteger(final String key) {
+        final Option<?> option = get(key);
+        return option != null ? (Integer)option.getValue() : 0;
+    }
+
+    /**
+     * Return an option as a String
+     *
+     * @param key key for option
+     * @return an option value
+     */
+    public String getString(final String key) {
+        final Option<?> option = get(key);
+        return option != null ? (String)option.getValue() : null;
+    }
+
+    /**
+     * Set an option, overwriting an existing state if one exists
+     *
+     * @param key    option key
+     * @param option option
+     */
+    public void set(final String key, final Option<?> option) {
+        options.put(key(key), option);
+    }
+
+    /**
+     * Set an option as a boolean value, overwriting an existing state if one exists
+     *
+     * @param key    option key
+     * @param option option
+     */
+    public void set(final String key, final boolean option) {
+        set(key, new Option<>(option));
+    }
+
+    /**
+     * Set an option as a String value, overwriting an existing state if one exists
+     *
+     * @param key    option key
+     * @param option option
+     */
+    public void set(final String key, final String option) {
+        set(key, new Option<>(option));
+    }
+
+    /**
+     * Return the user arguments to the program, i.e. those trailing "--" after
+     * the filename
+     *
+     * @return a list of user arguments
+     */
+    public List<String> getArguments() {
+        return Collections.unmodifiableList(this.arguments);
+    }
+
+    /**
+     * Return the JavaScript files passed to the program
+     *
+     * @return a list of files
+     */
+    public List<String> getFiles() {
+        return Collections.unmodifiableList(files);
+    }
+
+    /**
+     * Return the option templates for all the valid option supported.
+     *
+     * @return a collection of OptionTemplate objects.
+     */
+    public static Collection<OptionTemplate> getValidOptions() {
+        return Collections.unmodifiableCollection(validOptions);
+    }
+
+    /**
+     * Make sure a key is fully qualified for table lookups
+     *
+     * @param shortKey key for option
+     * @return fully qualified key
+     */
+    private String key(final String shortKey) {
+        String key = shortKey;
+        while (key.startsWith("-")) {
+            key = key.substring(1, key.length());
+        }
+        key = key.replace("-", ".");
+        final String keyPrefix = this.resource + ".option.";
+        if (key.startsWith(keyPrefix)) {
+            return key;
+        }
+        return keyPrefix + key;
+    }
+
+    static String getMsg(final String msgId, final String... args) {
+        try {
+            final String msg = Options.bundle.getString(msgId);
+            if (args.length == 0) {
+                return msg;
+            }
+            return new MessageFormat(msg).format(args);
+        } catch (final MissingResourceException e) {
+            throw new IllegalArgumentException(e);
+        }
+    }
+
+    /**
+     * Display context sensitive help
+     *
+     * @param e  exception that caused a parse error
+     */
+    public void displayHelp(final IllegalArgumentException e) {
+        if (e instanceof IllegalOptionException) {
+            final OptionTemplate template = ((IllegalOptionException)e).getTemplate();
+            if (template.isXHelp()) {
+                // display extended help information
+                displayHelp(true);
+            } else {
+                errors.println(((IllegalOptionException)e).getTemplate());
+            }
+            return;
+        }
+
+        if (e != null && e.getMessage() != null) {
+            errors.println(getMsg("option.error.invalid.option",
+                    e.getMessage(),
+                    helpOptionTemplate.getShortName(),
+                    helpOptionTemplate.getName()));
+            errors.println();
+            return;
+        }
+
+        displayHelp(false);
+    }
+
+    /**
+     * Display full help
+     *
+     * @param extended show the extended help for all options, including undocumented ones
+     */
+    public void displayHelp(final boolean extended) {
+        for (final OptionTemplate t : Options.validOptions) {
+            if ((extended || !t.isUndocumented()) && t.getResource().equals(resource)) {
+                errors.println(t);
+                errors.println();
+            }
+        }
+    }
+
+    /**
+     * Processes the arguments and stores their information. Throws
+     * IllegalArgumentException on error. The message can be analyzed by the
+     * displayHelp function to become more context sensitive
+     *
+     * @param args arguments from command line
+     */
+    public void process(final String[] args) {
+        final LinkedList<String> argList = new LinkedList<>();
+        Collections.addAll(argList, args);
+
+        while (!argList.isEmpty()) {
+            final String arg = argList.remove(0);
+
+            // skip empty args
+            if (arg.isEmpty()) {
+                continue;
+            }
+
+            // user arguments to the script
+            if ("--".equals(arg)) {
+                arguments.addAll(argList);
+                argList.clear();
+                continue;
+            }
+
+            // if it doesn't start with -, it's a file
+            if (!arg.startsWith("-")) {
+                files.add(arg);
+                continue;
+            }
+
+            if (arg.startsWith(definePropPrefix)) {
+                final String value = arg.substring(definePropPrefix.length());
+                final int eq = value.indexOf('=');
+                if (eq != -1) {
+                    // -Dfoo=bar Set System property "foo" with value "bar"
+                    System.setProperty(value.substring(0, eq), value.substring(eq + 1));
+                } else {
+                    // -Dfoo is fine. Set System property "foo" with "" as it's value
+                    if (!value.equals("")) {
+                        System.setProperty(value, "");
+                    } else {
+                        // do not allow empty property name
+                        throw new IllegalOptionException(definePropTemplate);
+                    }
+                }
+                continue;
+            }
+
+            // it is an argument,  it and assign key, value and template
+            final ParsedArg parg = new ParsedArg(arg);
+
+            // check if the value of this option is passed as next argument
+            if (parg.template.isValueNextArg()) {
+                if (argList.isEmpty()) {
+                    throw new IllegalOptionException(parg.template);
+                }
+                parg.value = argList.remove(0);
+            }
+
+            // -h [args...]
+            if (parg.template.isHelp()) {
+                // check if someone wants help on an explicit arg
+                if (!argList.isEmpty()) {
+                    try {
+                        final OptionTemplate t = new ParsedArg(argList.get(0)).template;
+                        throw new IllegalOptionException(t);
+                    } catch (final IllegalArgumentException e) {
+                        throw e;
+                    }
+                }
+                throw new IllegalArgumentException(); // show help for
+                // everything
+            }
+
+            if (parg.template.isXHelp()) {
+                throw new IllegalOptionException(parg.template);
+            }
+
+            set(parg.template.getKey(), createOption(parg.template, parg.value));
+
+            // Arg may have a dependency to set other args, e.g.
+            // scripting->anon.functions
+            if (parg.template.getDependency() != null) {
+                argList.addFirst(parg.template.getDependency());
+            }
+        }
+    }
+
+    private static OptionTemplate getOptionTemplate(final String key) {
+        for (final OptionTemplate t : Options.validOptions) {
+            if (t.matches(key)) {
+                return t;
+            }
+        }
+        return null;
+    }
+
+    private static Option<?> createOption(final OptionTemplate t, final String value) {
+        switch (t.getType()) {
+        case "string":
+            // default value null
+            return new Option<>(value);
+        case "timezone":
+            // default value "TimeZone.getDefault()"
+            return new Option<>(TimeZone.getTimeZone(value));
+        case "keyvalues":
+            return new KeyValueOption(value);
+        case "values":
+            return new ValueOption(value);
+        case "log":
+            final KeyValueOption kv = new KeyValueOption(value);
+            Logging.initialize(kv.getValues());
+            return kv;
+        case "boolean":
+            return new Option<>(value != null && Boolean.parseBoolean(value));
+        case "integer":
+            try {
+                return new Option<>((Integer)((value == null)? 0 : Integer.parseInt(value)));
+            } catch (final NumberFormatException nfe) {
+                throw new IllegalOptionException(t);
+            }
+        case "properties":
+            //swallow the properties and set them
+            initProps(new KeyValueOption(value));
+            return null;
+        default:
+            break;
+        }
+        throw new IllegalArgumentException(value);
+    }
+
+    private static void initProps(final KeyValueOption kv) {
+        for (final Map.Entry<String, String> entry : kv.getValues().entrySet()) {
+            System.setProperty(entry.getKey(), entry.getValue());
+        }
+    }
+
+    /**
+     * Resource name for properties file
+     */
+    private static final String MESSAGES_RESOURCE = "jdk.nashorn.internal.runtime.resources.Options";
+
+    /**
+     * Resource bundle for properties file
+     */
+    private static ResourceBundle bundle;
+
+    /**
+     * Usages per resource from properties file
+     */
+    private static HashMap<Object, Object> usage;
+
+    /**
+     * Valid options from templates in properties files
+     */
+    private static Collection<OptionTemplate> validOptions;
+
+    /**
+     * Help option
+     */
+    private static OptionTemplate helpOptionTemplate;
+
+    /**
+     * Define property option template.
+     */
+    private static OptionTemplate definePropTemplate;
+
+    /**
+     * Prefix of "define property" option.
+     */
+    private static String definePropPrefix;
+
+    static {
+        // Without do privileged, under security manager messages can not be
+        // loaded.
+        Options.bundle = AccessController.doPrivileged(new PrivilegedAction<ResourceBundle>() {
+            @Override
+            public ResourceBundle run() {
+                return ResourceBundle.getBundle(Options.MESSAGES_RESOURCE, Locale.getDefault());
+            }
+        });
+
+        Options.validOptions = new TreeSet<>();
+        Options.usage        = new HashMap<>();
+
+        for (final Enumeration<String> keys = Options.bundle.getKeys(); keys.hasMoreElements(); ) {
+            final String key = keys.nextElement();
+            final StringTokenizer st = new StringTokenizer(key, ".");
+            String resource = null;
+            String type = null;
+
+            if (st.countTokens() > 0) {
+                resource = st.nextToken(); // e.g. "nashorn"
+            }
+
+            if (st.countTokens() > 0) {
+                type = st.nextToken(); // e.g. "option"
+            }
+
+            if ("option".equals(type)) {
+                String helpKey = null;
+                String xhelpKey = null;
+                String definePropKey = null;
+                try {
+                    helpKey = Options.bundle.getString(resource + ".options.help.key");
+                    xhelpKey = Options.bundle.getString(resource + ".options.xhelp.key");
+                    definePropKey = Options.bundle.getString(resource + ".options.D.key");
+                } catch (final MissingResourceException e) {
+                    //ignored: no help
+                }
+                final boolean        isHelp = key.equals(helpKey);
+                final boolean        isXHelp = key.equals(xhelpKey);
+                final OptionTemplate t      = new OptionTemplate(resource, key, Options.bundle.getString(key), isHelp, isXHelp);
+
+                Options.validOptions.add(t);
+                if (isHelp) {
+                    helpOptionTemplate = t;
+                }
+
+                if (key.equals(definePropKey)) {
+                    definePropPrefix = t.getName();
+                    definePropTemplate = t;
+                }
+            } else if (resource != null && "options".equals(type)) {
+                Options.usage.put(resource, Options.bundle.getObject(key));
+            }
+        }
+    }
+
+    @SuppressWarnings("serial")
+    private static class IllegalOptionException extends IllegalArgumentException {
+        private final OptionTemplate template;
+
+        IllegalOptionException(final OptionTemplate t) {
+            super();
+            this.template = t;
+        }
+
+        OptionTemplate getTemplate() {
+            return this.template;
+        }
+    }
+
+    /**
+     * This is a resolved argument of the form key=value
+     */
+    private static class ParsedArg {
+        /** The resolved option template this argument corresponds to */
+        OptionTemplate template;
+
+        /** The value of the argument */
+        String value;
+
+        ParsedArg(final String argument) {
+            final QuotedStringTokenizer st = new QuotedStringTokenizer(argument, "=");
+            if (!st.hasMoreTokens()) {
+                throw new IllegalArgumentException();
+            }
+
+            final String token = st.nextToken();
+            this.template = Options.getOptionTemplate(token);
+            if (this.template == null) {
+                throw new IllegalArgumentException(argument);
+            }
+
+            value = "";
+            if (st.hasMoreTokens()) {
+                while (st.hasMoreTokens()) {
+                    value += st.nextToken();
+                    if (st.hasMoreTokens()) {
+                        value += ':';
+                    }
+                }
+            } else if ("boolean".equals(this.template.getType())) {
+                value = "true";
+            }
+        }
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/options/ValueOption.java b/nashorn/src/jdk/nashorn/internal/runtime/options/ValueOption.java
new file mode 100644
index 00000000000..9d7d7c60047
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/options/ValueOption.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.options;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.StringTokenizer;
+
+/**
+ * This option represents a collection of comma separated values
+ */
+public class ValueOption extends Option<String> {
+
+    private Collection<String> values;
+
+    ValueOption(final String value) {
+        super(value);
+        if (value != null) {
+            values = new LinkedHashSet<>();
+            final StringTokenizer st = new StringTokenizer(getValue(), ",");
+            while (st.hasMoreElements()) {
+                values.add(st.nextToken());
+            }
+        }
+    }
+
+    /**
+     * Get the values in the option
+     * @return collection of strings
+     */
+    public Collection<String> getValues() {
+        return Collections.unmodifiableCollection(values);
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/Messages.properties b/nashorn/src/jdk/nashorn/internal/runtime/resources/Messages.properties
new file mode 100644
index 00000000000..f969ec309f2
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/resources/Messages.properties
@@ -0,0 +1,137 @@
+#
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+lexer.error.edit.string.missing.brace=Edit string expression missing closing brace
+lexer.error.here.missing.end.marker=Here string missing end marker "{0}"
+lexer.error.missing.close.quote=Missing close quote
+lexer.error.invalid.hex=Invalid hex digit
+lexer.error.invalid.octal=Invalid octal digit
+lexer.error.strict.no.octal=cannot use octal escapes in strict mode
+lexer.error.illegal.identifier.character=Illegal character in identifier
+
+parser.error.illegal.continue.stmt=Illegal continue statement
+parser.error.illegal.break.stmt=Illegal break statement
+parser.error.invalid.lvalue=Invalid left hand side for assignment
+parser.error.undefined.label=Undefined Label "{0}"
+parser.error.duplicate.label=Duplicate Label "{0}"
+parser.error.duplicate.default.in.switch=Switch already has default case
+parser.error.expected.literal=Expected a literal but found {0}
+parser.error.expected.operand=Expected an operand but found {0}
+parser.error.expected.stmt=Expected statement but found {0}
+parser.error.expected.comma=Expected comma but found {0}
+parser.error.expected=Expected {0} but found {1}
+parser.error.invalid.return=Invalid return statement
+parser.error.property.redefinition=Property "{0}" already defined
+parser.error.unexpected.token=Unexpected token: {0}
+parser.error.many.vars.in.for.in.loop=Only one variable allowed in for..in loop
+parser.error.not.lvalue.for.in.loop=Invalid left side value of for..in loop
+parser.error.missing.catch.or.finally=Missing catch or finally after try
+parser.error.regex.unsupported.flag=Unsupported RegExp flag: {0}
+parser.error.regex.repeated.flag=Repeated RegExp flag: {0}
+parser.error.regex.syntax={0}
+
+# strict mode error messages
+parser.error.strict.no.with="with" statement cannot be used in strict mode
+parser.error.strict.name="{0}" cannot be used as {1} in strict mode
+parser.error.strict.cant.delete.ident=cannot delete identifier "{0}" in strict mode
+parser.error.strict.param.redefinition=strict mode function cannot have duplicate parameter name "{0}"
+parser.error.strict.no.octal=cannot use octal value in strict mode
+parser.error.strict.no.func.here=In strict mode, functions can only be declared at top-level or immediately within a function
+type.error.strict.getter.setter.poison=In strict mode, "caller", "callee", and "arguments" properties can not be accessed on functions or the arguments object
+
+# not the expected type in a given context
+type.error.not.an.object={0} is not an Object
+type.error.not.a.boolean={0} is not a Boolean
+type.error.not.a.date={0} is not a Date
+type.error.not.a.number={0} is not a Number
+type.error.not.a.regexp={0} is not a RegExp
+type.error.not.a.string={0} is not a String
+type.error.not.a.function={0} is not a function
+type.error.not.a.constructor={0} is not a constructor function
+type.error.not.a.file={0} is not a File
+
+# operations not permitted on undefined
+type.error.cant.call.undefined=Cannot call undefined
+type.error.cant.read.property.of.undefined=Cannot read property "{0}" from undefined
+type.error.cant.set.property.of.undefined=Cannot set property "{0}" of undefined
+type.error.cant.delete.property.of.undefined=Cannot delete property "{0}" of undefined
+
+# other wrong usages of property
+type.error.property.has.no.setter=Cannot set property "{0}" of {1} that has only a getter
+type.error.cant.set.proto.to.non.object=Cannot set Object {0}'s __proto__ to be a non-object like {1}
+type.error.no.such.function={1} has no such function "{0}"
+type.error.cant.get.property=Cannot get property "{0}" of {1}
+type.error.cant.set.property=Cannot set property "{0}" of {1}
+type.error.cant.delete.property=Cannot delete property "{0}" of {1}
+type.error.cant.redefine.property=Cannot redefine property "{0}" of {1}
+type.error.property.not.writable="{0}" is not a writable property of {1}
+type.error.object.non.extensible=Cannot add new property "{0}" to non-extensible {1}
+
+# miscellaneous
+type.error.regex.cant.supply.flags=Cannot supply flags when constructing one RegExp from another
+type.error.inconsistent.property.descriptor=inconsistent property descriptor
+type.error.bad.default.value=bad default value: {0}
+type.error.function.apply.expects.array=Function.prototype.apply expects an Array for second argument
+type.error.instanceof.on.non.object=instanceof cannot be used on objects without [[HasInstance]]
+type.error.cannot.convert.to.interface=object {0} cannot be converted to {1} due to "{2}"
+type.error.array.reduce.invalid.init=invalid initialValue for Array.prototype.reduce
+type.error.array.reduceright.invalid.init=invalid initialValue for Array.prototype.reduceRight
+type.error.cannot.get.default.string=Cannot get default string value
+type.error.cannot.get.default.number=Cannot get default number value
+type.error.cant.apply.with.to.null=Cannot apply "with" to null
+type.error.cant.apply.with.to.undefined=Cannot apply "with" to undefined
+type.error.in.with.non.object=Right hand side of "in" cannot be non-Object, found {0}
+type.error.prototype.not.an.object="prototype" of {0} is not an Object, it is {1}
+type.error.cant.load.script=Cannot load script from {0}
+type.error.JSON.stringify.cyclic=JSON.stringify got a cyclic data structure
+type.error.cant.convert.string.to.char=Cannot convert string to character; its length must be exactly 1
+type.error.cant.convert.number.to.char=Cannot convert number to character; it's out of 0-65535 range
+type.error.cant.convert.to.java.string=Cannot convert object of type {0} to a Java argument of string type
+type.error.cant.convert.to.java.number=Cannot convert object of type {0} to a Java argument of number type
+type.error.cant.convert.to.javascript.array=Can only convert Java arrays and lists to JavaScript arrays. Can't convert object of type {0}.
+type.error.extend.expects.java.type=Java.extend needs a Java type as its argument.
+type.error.extend.ERROR_FINAL_CLASS=Can not extend final class {0}.
+type.error.extend.ERROR_NON_PUBLIC_CLASS=Can not extend/implement non-public class/interface {0}.
+type.error.extend.ERROR_NO_ACCESSIBLE_CONSTRUCTOR=Can not extend class {0} as it has no public or protected constructors.
+type.error.no.constructor.matches.args=Can not construct {0} with the passed arguments; they do not match any of its constructor signatures.
+type.error.no.method.matches.args=Can not invoke method {0} with the passed arguments; they do not match any of its method signatures.
+type.error.method.not.constructor=Java method {0} can't be used as a constructor.
+range.error.inappropriate.array.length=inappropriate array length: {0}
+range.error.invalid.fraction.digits=fractionDigits argument to {0} must be in [0, 20]
+range.error.invalid.precision=precision argument toPrecision() must be in [1, 21]
+range.error.invalid.radix=radix argument must be in [2, 36]
+range.error.invalid.date=Invalid Date
+range.error.too.many.errors=Script contains too many errors: {0} errors
+
+reference.error.not.defined="{0}" is not defined
+reference.error.cant.be.used.as.lhs="{0}" can not be used as the left-hand side of assignment
+
+syntax.error.invalid.json=Invalid JSON: {0}
+syntax.error.strict.cant.delete=cannot delete "{0}" in strict mode
+
+io.error.cant.write=cannot write "{0}"
+config.error.no.dest=no destination directory supplied
+
+uri.error.bad.uri=Bad URI "{0}" near offset {1}
+
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/Options.properties b/nashorn/src/jdk/nashorn/internal/runtime/resources/Options.properties
new file mode 100644
index 00000000000..e743953ba6a
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/resources/Options.properties
@@ -0,0 +1,301 @@
+#
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+option.error.invalid.option="{0}" is not a recognized option. Use "{1}" or "{2}" to see a list of all supported options.
+
+nashorn.options = Usage: jjs [option=value]* [filename.js]+ [-- options...]\n\
+                \n\
+                Valid options are:
+
+#
+# Localized meta descriptions
+#
+nashorn.options.param = param
+nashorn.options.default = default
+
+#
+# Which option is "help".
+#
+nashorn.options.help.key = nashorn.option.help
+
+#
+# Which option is "xhelp".
+#
+nashorn.options.xhelp.key = nashorn.option.xhelp
+
+#
+# Which option is "D".
+#
+nashorn.options.D.key = nashorn.option.D
+
+##
+## Grammar: at least short or long form. Arguments are optional, in that case they are given as
+##
+## params - a description of the parameters for command line usage
+## name - the name of the option, e.g. "--long-name"
+## short_name - the short name of the option, e.g. "-l"
+## type - the type of the option, currently allowed: boolean, integer, string, log, timezone. defaults to boolean if left out
+## is_undocumented - should this option never appear in the online help. defaults to no.
+## desc - description of what the option does
+## default - default value of the option. e.g. debug.lines is true by default. Not set means option not available by default
+## dependency - does this arg imply another arg, e.g. scripting -> anon-functions
+## confict - does this arg conflict with another arg e.g trace && instrument
+## value_next_arg - is the opton's value passed as next argument in command line?
+##
+## At least short_name or name needs to be in place for an argument descriptor to be valid.
+
+nashorn.option.help = {                       \
+    name="-help",                             \
+    short_name="-h",                          \
+    desc="Print help for command line flags." \
+}
+
+nashorn.option.xhelp = {                               \
+    name="-xhelp",                                     \
+    is_undocumented=true,                              \
+    desc="Print extended help for command line flags." \
+}
+
+nashorn.option.anon.functions = {                \
+    name="--anon-functions",                     \
+    short_name="-af",                            \
+    is_undocumented=true,                        \
+    desc="Always allow functions as statements." \
+}
+
+nashorn.option.class.cache.size ={                            \
+    name="--class-cache-size",                                \
+    short_name="--ccs",                                       \
+    desc="Size of the Class cache size per global scope.",    \
+    is_undocumented=true,                                     \
+    type=Integer                                              \
+}
+
+nashorn.option.classpath ={                                   \
+    name="-classpath",                                        \
+    short_name="-cp",                                         \
+    desc="-cp path. Specify where to find user class files.", \
+    value_next_arg=true,                                      \
+    type=String                                               \
+}
+
+nashorn.option.compile.only = {       \
+    name="--compile-only",			  \
+    short_name="-co",                 \
+    is_undocumented=true,             \
+    desc="Compile without running.",  \
+    type=Boolean                      \
+}
+
+nashorn.option.d = {                                             \
+    name="--dump-debug-dir",                                     \
+    short_name="-d",                                             \
+    is_undocumented=true,                                        \
+    params="<path>",                                             \
+    desc="specify a destination directory to dump class files.", \
+    type=String                                                  \
+}
+
+nashorn.option.doe                = {   \
+    name="-dump-on-error",              \
+    short_name="-doe",                  \
+    desc="Dump a stack trace on errors."\
+}
+
+nashorn.option.empty.statements = {          \
+    name="--empty-statements",               \
+    is_undocumented=true,                    \
+    desc="Preserve empty statements in AST." \
+}
+
+nashorn.option.early.lvalue.error = {                                      \
+    name="--early-lvalue-error",                                           \
+    is_undocumented=true,                                                  \
+    desc="invalid lvalue expressions should be reported as early errors.", \
+    type=Boolean,                                                          \
+    default=true                                                           \
+}
+
+nashorn.option.fullversion = {                 \
+    name="-fullversion",                       \
+    short_name="-fv",                          \
+    desc="Print full version info of Nashorn." \
+}
+
+nashorn.option.log = {                                                       \
+    name="--log",                                                            \
+    is_undocumented=true,                                                    \
+    params="<module:level>,*",                                               \
+    desc="Enable logging of a given level for a given number of sub systems. \
+        [for example: --log=fields:finest,codegen:info]",                    \
+    type=Log                                                                 \
+}
+
+nashorn.option.debug.lines = {                          \
+    name="--debug-lines",                               \
+    is_undocumented=true,                               \
+    desc="Generate line number table in .class files.", \
+    default=true                                        \
+}
+
+nashorn.option.debug.locals = {                           \
+    name="--debug-locals",                                \
+    is_undocumented=true,                                 \
+    desc="Generate local variable table in .class files." \
+}
+
+nashorn.option.loader.per.compile = {              \
+    name="--loader-per-compile",                   \
+    is_undocumented=true,                          \
+    desc="Create a new class loader per compile.", \
+    default=true                                   \
+}
+
+nashorn.option.package = {                                     \
+    name="--package",                                          \
+    is_undocumented=true,                                      \
+    desc="Package to which generated .class files are added.", \
+    params="<package>",                                        \
+    type=String,                                               \
+    default=""                                                 \
+}
+
+nashorn.option.parse.only = {       \
+    name="--parse-only", 			\
+    is_undocumented=true,           \
+    desc="Parse without compiling." \
+}
+
+nashorn.option.profile.callsites = {   \
+    name="--profile-callsites",        \
+    short_name="-pcs",                 \
+    is_undocumented=true,              \
+    desc="Dump callsite profile data." \
+}
+
+nashorn.option.print.ast = {            \
+    name="--print-ast",                 \
+    is_undocumented=true,               \
+    desc="Print abstract syntax tree."  \
+}
+
+nashorn.option.print.lower.ast = {              \
+    name="--print-lower-ast",                   \
+    is_undocumented=true,                       \
+    desc="Print lowered abstract syntax tree."  \
+}
+
+nashorn.option.print.code = { \
+    name="--print-code",      \
+    is_undocumented=true,     \
+    desc="Print bytecode."    \
+}
+
+nashorn.option.print.no.newline = {                     \
+    name="--print-no-newline",                          \
+    is_undocumented=true,                               \
+    desc="Print function will not print new line char." \
+}
+
+nashorn.option.print.parse = {   \
+    name="--print-parse",        \
+    is_undocumented=true,        \
+    desc="Print the parse tree." \
+}
+
+nashorn.option.print.lower.parse = {            \
+    name="--print-lower-parse",                 \
+    is_undocumented=true,                       \
+    desc="Print the parse tree after lowering." \
+}
+
+nashorn.option.print.symbols = {   \
+    name="--print-symbols",        \
+    is_undocumented=true,          \
+    desc="Print the symbol table." \
+}
+
+nashorn.option.D = {                                                          \
+    name="-D",                                                                \
+    desc="-Dname=value. Set a system property. This option can be repeated.", \
+    type=String                                                               \
+}
+
+nashorn.option.strict = {              \
+    name="-strict",                    \
+    desc="Run scripts in strict mode." \
+}
+
+nashorn.option.scripting = {            \
+    name="-scripting",                  \
+    desc="Enable scripting features.",	\
+    dependency="--anon-functions=true"  \
+}
+
+nashorn.option.timezone = {                    \
+    name="-timezone",                          \
+    short_name="-t",                           \
+    params="<timezone>",                       \
+    desc="Set timezone for script execution.", \
+    type=TimeZone                              \
+}
+
+nashorn.option.stdout = {                                               \
+    name="--stdout",                                                    \
+    is_undocumented=true,                                               \
+    type=String,                                                        \
+    params="<output console>",                                          \
+    desc="Redirect stdout to a filename or to another tty, e.g. stderr" \
+}
+
+nashorn.option.stderr = {                                               \
+    name="--stderr",                                                    \
+    is_undocumented=true,                                               \
+    type=String,                                                        \
+    params="<output console>",                                          \
+    desc="Redirect stderr to a filename or to another tty, e.g. stdout" \
+}
+
+nashorn.option.trace.callsites = {                                              \
+    name="--trace-callsites",                                                   \
+    short_name="-tcs",                                                          \
+    is_undocumented=true,                                                       \
+    type=keyvalues,                                                             \
+    params="[=[option,]*]",                                                     \
+    desc="Enable callsite trace mode. Options are: miss [trace callsite misses] \
+    enterexit [trace callsite enter/exit], objects [print object properties]"   \
+}
+
+nashorn.option.verify.code = {              \
+    name="--verify-code",                   \
+    is_undocumented=true,                   \
+    desc="Verify byte code before running." \
+}
+
+nashorn.option.version = {                \
+    name="-version",                      \
+    short_name="-v",                      \
+    desc="Print version info of Nashorn." \
+}
+
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js b/nashorn/src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js
new file mode 100644
index 00000000000..2e3be699319
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js
@@ -0,0 +1,301 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * This script contains non-standard, Mozilla compatibility functionality on
+ * the standard global objects. Please note that it is incomplete. Only the most
+ * often used functionality is supported.
+ */
+
+// Object.prototype.__defineGetter__
+Object.defineProperty(Object.prototype, "__defineGetter__", {
+    configurable: true, enumerable: false, writable: true,
+    value: function(name, func) {
+        Object.defineProperty(this, name, {
+            configurable: true, enumerable: true, get: func });
+    }
+});
+
+// Object.prototype.__defineSetter__
+Object.defineProperty(Object.prototype, "__defineSetter__", {
+    configurable: true, enumerable: false, writable: true,
+    value: function(name, func) {
+        Object.defineProperty(this, name, {
+            configurable: true, enumerable: true, set: func });
+    }
+});
+
+// Object.prototype.__lookupGetter__
+Object.defineProperty(Object.prototype, "__lookupGetter__", {
+    configurable: true, enumerable: false, writable: true,
+    value: function(name) {
+        var obj = this;
+        while (obj) {
+            var desc = Object.getOwnPropertyDescriptor(obj, name);
+            if (desc) return desc.get;
+            obj = Object.getPrototypeOf(obj);
+        }
+        return undefined;
+    }
+});
+
+// Object.prototype.__lookupSetter__
+Object.defineProperty(Object.prototype, "__lookupSetter__", {
+    configurable: true, enumerable: false, writable: true,
+    value: function(name) {
+        var obj = this;
+        while (obj) {
+            var desc = Object.getOwnPropertyDescriptor(obj, name);
+            if (desc) return desc.set;
+            obj = Object.getPrototypeOf(obj);
+        }
+        return undefined;
+    }
+});
+
+// Object.prototype.__proto__ (read-only)
+Object.defineProperty(Object.prototype, "__proto__", {
+    configurable: true, enumerable: false,
+    get: function() {
+        return Object.getPrototypeOf(this);
+    },
+    set: function(x) {
+        throw new TypeError("__proto__ set not supported");
+    }
+});
+
+// Object.prototype.toSource
+Object.defineProperty(Object.prototype, "toSource", {
+    configurable: true, enumerable: false, writable: true,
+    value: function(state) {
+        if (! state) {
+            state = java.util.Collections.newSetFromMap(new java.util.IdentityHashMap());
+        }
+        if (state.contains(this)) {
+            return "{}";
+        }
+        state.add(this);
+        var str = new java.lang.StringBuffer('({');
+        for (i in this) {
+            str.append(i);
+            str.append(':');
+            if (this[i] instanceof Object && typeof(this[i].toSource) == 'function') {
+                str.append(this[i].toSource(state));
+            } else {
+                str.append(String(this[i]));
+            }
+            str.append(', ');
+        }
+        // delete last extra command and space
+        str = str.deleteCharAt(str.length() - 1);
+        str = str.deleteCharAt(str.length() - 1);
+        str.append('})');
+        return str.toString();
+    }
+});
+
+// Boolean.prototype.toSource
+Object.defineProperty(Boolean.prototype, "toSource", {
+    configurable: true, enumerable: false, writable: true,
+    value: function() {
+        return '(new Boolean(' + this.toString() + '))';
+    }
+});
+
+// Date.prototype.toSource
+Object.defineProperty(Date.prototype, "toSource", {
+    configurable: true, enumerable: false, writable: true,
+    value: function() {
+        return '(new Date(' + this.valueOf() + '))';
+    }
+});
+
+// Function.prototype.toSource -- already implemented in nashorn
+
+// Number.prototype.toSource
+Object.defineProperty(Number.prototype, "toSource", {
+    configurable: true, enumerable: false, writable: true,
+    value: function() {
+        return '(new Number(' + this.toString() + '))';
+    }
+});
+
+// RegExp.prototype.toSource
+Object.defineProperty(RegExp.prototype, "toSource", {
+    configurable: true, enumerable: false, writable: true,
+    value: function() {
+        return this.toString();
+    }
+});
+
+// String.prototype.toSource
+Object.defineProperty(String.prototype, "toSource", {
+    configurable: true, enumerable: false, writable: true,
+    value: function() {
+        return '(new String(' + this.quote() + '))';
+    }
+});
+
+// Error.prototype.toSource
+Object.defineProperty(Error.prototype, "toSource", {
+    configurable: true, enumerable: false, writable: true,
+    value: function() {
+        var msg = this.message? String(this.message).quote() : "''";
+        return '(new ' + this.name + '(' + msg + '))';
+    }
+});
+
+// Function.prototype.arity
+Object.defineProperty(Function.prototype, "arity", {
+    configurable: true, enumerable: false,
+    get: function() { return this.length; },
+    set: function(x) {
+        throw new TypeError("Function arity can not be modified");
+    }
+});
+
+// String.prototype.quote
+Object.defineProperty(String.prototype, "quote", {
+    configurable: true, enumerable: false, writable: true,
+    value: function() {
+        return JSON.stringify(this);
+    }
+});
+
+// HTML generation methods of String.prototype
+
+// String.prototype.anchor
+Object.defineProperty(String.prototype, "anchor", {
+    configurable: true, enumerable: false, writable: true,
+    value: function(name) {
+        return '<a name="' + name + '">' + this + '</a>';
+    }
+});
+
+// String.prototype.big
+Object.defineProperty(String.prototype, "big", {
+    configurable: true, enumerable: false, writable: true,
+    value: function() {
+        return '<big>' + this + '</big>';
+    }
+});
+
+// String.prototype.blink
+Object.defineProperty(String.prototype, "blink", {
+    configurable: true, enumerable: false, writable: true,
+    value: function() {
+        return '<blink>' + this + '</blink>';
+    }
+});
+
+// String.prototype.bold
+Object.defineProperty(String.prototype, "bold", {
+    configurable: true, enumerable: false, writable: true,
+    value: function() {
+        return '<b>' + this + '</b>';
+    }
+});
+
+// String.prototype.fixed
+Object.defineProperty(String.prototype, "fixed", {
+    configurable: true, enumerable: false, writable: true,
+    value: function() {
+        return '<tt>' + this + '</tt>';
+    }
+});
+
+// String.prototype.fontcolor
+Object.defineProperty(String.prototype, "fontcolor", {
+    configurable: true, enumerable: false, writable: true,
+    value: function(clr) {
+        return '<font color="' + clr + '">' + this + '</font>';
+    }
+});
+
+// String.prototype.fontsize
+Object.defineProperty(String.prototype, "fontsize", {
+    configurable: true, enumerable: false, writable: true,
+    value: function(size) {
+        return '<font size="' + size + '">' + this + '</font>';
+    }
+});
+
+// String.prototype.italics
+Object.defineProperty(String.prototype, "italics", {
+    configurable: true, enumerable: false, writable: true,
+    value: function() {
+        return '<i>' + this + '</i>';
+    }
+});
+
+// String.prototype.link
+Object.defineProperty(String.prototype, "link", {
+    configurable: true, enumerable: false, writable: true,
+    value: function(url) {
+        return '<a href="' + url + '">' + this + '</a>';
+    }
+});
+
+// String.prototype.small
+Object.defineProperty(String.prototype, "small", {
+    configurable: true, enumerable: false, writable: true,
+    value: function() {
+        return '<small>' + this + '</small>';
+    }
+});
+
+// String.prototype.strike
+Object.defineProperty(String.prototype, "strike", {
+    configurable: true, enumerable: false, writable: true,
+    value: function() {
+        return '<strike>' + this + '</strike>';
+    }
+});
+
+// String.prototype.sub
+Object.defineProperty(String.prototype, "sub", {
+    configurable: true, enumerable: false, writable: true,
+    value: function() {
+        return '<sub>' + this + '</sub>';
+    }
+});
+
+// String.prototype.sup
+Object.defineProperty(String.prototype, "sup", {
+    configurable: true, enumerable: false, writable: true,
+    value: function() {
+        return '<sup>' + this + '</sup>';
+    }
+});
+
+// Rhino: global.importClass
+Object.defineProperty(this, "importClass", {
+    configurable: true, enumerable: false, writable: true,
+    value: function(clazz) {
+        if (Java.isType(clazz)) {
+            this[clazz.class.getSimpleName()] = clazz;
+        } else {
+            throw new TypeError(clazz + " is not a Java class");
+        }
+    }
+});
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/parser.js b/nashorn/src/jdk/nashorn/internal/runtime/resources/parser.js
new file mode 100644
index 00000000000..4d977f348a9
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/resources/parser.js
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Parse function returns a JSON object representing ECMAScript code passed.
+ * name is optional name for the code source and location param tells whether to
+ * include location information for AST nodes or not.
+ *
+ * Example:
+ *
+ *    load("nashorn:parser.js");
+ *    try {
+ *        var json = parse("print('hello')");
+ *        print(JSON.stringify(json));
+ *    } catch (e) {
+ *        print(e);
+ *    }
+ */
+function parse(/*code, [name], [location]*/) {
+    var code, name = "<unknown>", location = false;
+    switch (arguments.length) {
+        case 3:
+            location = arguments[2];
+        case 2:
+            name = arguments[1];
+        case 1:
+            code = arguments[0];
+    }
+
+    var jsonStr = Packages.jdk.nashorn.internal.ir.debug.JSONWriter.parse(code, name, location);
+    return JSON.parse(jsonStr,
+        function (prop, value) {
+            if (typeof(value) == 'string' && prop == "value") {
+                // handle regexps and strings - both are encoded as strings but strings
+                // do not start with '/'. If regexp, then eval it to make RegExp object
+                return value.startsWith('/')? eval(value) : value.substring(1);
+            } else {
+                // anythin else is returned "as is""
+                return value;
+            }
+        });
+}
+
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/version.properties-template b/nashorn/src/jdk/nashorn/internal/runtime/resources/version.properties-template
new file mode 100644
index 00000000000..a737a0c1b1e
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/resources/version.properties-template
@@ -0,0 +1,27 @@
+#
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+full=$(FULL_VERSION)
+release=$(RELEASE)
diff --git a/nashorn/src/jdk/nashorn/internal/scripts/JO$.java b/nashorn/src/jdk/nashorn/internal/scripts/JO$.java
new file mode 100644
index 00000000000..70f88fa8927
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/scripts/JO$.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.scripts;
+
+import jdk.nashorn.internal.runtime.PropertyMap;
+import jdk.nashorn.internal.runtime.ScriptObject;
+
+/**
+ * Empty object class.
+ */
+public class JO$ extends ScriptObject {
+
+    /**
+     * Constructor
+     */
+    public JO$() {
+        super();
+    }
+
+    /**
+     * Constructor given an initial property map
+     *
+     * @param map the property map
+     */
+    public JO$(final PropertyMap map) {
+        super(map);
+    }
+
+    /**
+     * Used by FunctionObjectCreator. A method handle of this method is passed to the ScriptFunction constructor.
+     *
+     * @param map  the property map to use for allocatorMap
+     *
+     * @return newly allocated ScriptObject
+     */
+    public static ScriptObject allocate(final PropertyMap map) {
+        return new JO$(map);
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/scripts/JS$.java b/nashorn/src/jdk/nashorn/internal/scripts/JS$.java
new file mode 100644
index 00000000000..3ea72980a27
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/scripts/JS$.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.scripts;
+
+/**
+ * Root of script classes.
+ */
+public class JS$ {
+    // Empty
+}
diff --git a/nashorn/src/jdk/nashorn/tools/Shell.java b/nashorn/src/jdk/nashorn/tools/Shell.java
new file mode 100644
index 00000000000..44ece060572
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/tools/Shell.java
@@ -0,0 +1,396 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.tools;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.List;
+import java.util.Locale;
+import java.util.ResourceBundle;
+import jdk.nashorn.api.scripting.NashornException;
+import jdk.nashorn.internal.codegen.Compiler;
+import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.runtime.ErrorManager;
+import jdk.nashorn.internal.runtime.ScriptFunction;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
+import jdk.nashorn.internal.runtime.Source;
+import jdk.nashorn.internal.runtime.options.Options;
+
+/**
+ * Command line Shell for processing JavaScript files.
+ */
+public class Shell {
+
+    /**
+     * Resource name for properties file
+     */
+    private static final String MESSAGE_RESOURCE = "jdk.nashorn.tools.resources.Shell";
+    /**
+     * Shell message bundle.
+     */
+    private static ResourceBundle bundle;
+
+    static {
+        // Without do privileged, under security manager messages can not be
+        // loaded.
+        bundle = AccessController.doPrivileged(new PrivilegedAction<ResourceBundle>() {
+            @Override
+            public ResourceBundle run() {
+                return ResourceBundle.getBundle(MESSAGE_RESOURCE, Locale.getDefault());
+            }
+        });
+    }
+
+    /**
+     * Exit code for command line tool - successful
+     */
+    public static final int SUCCESS = 0;
+    /**
+     * Exit code for command line tool - error on command line
+     */
+    public static final int COMMANDLINE_ERROR = 100;
+    /**
+     * Exit code for command line tool - error compiling script
+     */
+    public static final int COMPILATION_ERROR = 101;
+    /**
+     * Exit code for command line tool - error during runtime
+     */
+    public static final int RUNTIME_ERROR = 102;
+    /**
+     * Exit code for command line tool - i/o error
+     */
+    public static final int IO_ERROR = 103;
+    /**
+     * Exit code for command line tool - internal error
+     */
+    public static final int INTERNAL_ERROR = 104;
+
+    /**
+     * Constructor
+     */
+    protected Shell() {
+    }
+
+    /**
+     * Main entry point with the default input, output and error streams.
+     *
+     * @param args The command line arguments
+     */
+    public static void main(final String[] args) {
+        try {
+            System.exit(main(System.in, System.out, System.err, args));
+        } catch (final IOException e) {
+            System.err.println(e);
+            System.exit(IO_ERROR);
+        }
+    }
+
+    /**
+     * Starting point for executing a {@code Shell}. Starts a shell with the
+     * given arguments and streams and lets it run until exit.
+     *
+     * @param in input stream for Shell
+     * @param out output stream for Shell
+     * @param err error stream for Shell
+     * @param args arguments to Shell
+     *
+     * @return exit code
+     *
+     * @throws IOException if there's a problem setting up the streams
+     */
+    public static int main(final InputStream in, final OutputStream out, final OutputStream err, final String[] args) throws IOException {
+        return new Shell().run(in, out, err, args);
+    }
+
+    /**
+     * Run method logic.
+     *
+     * @param in input stream for Shell
+     * @param out output stream for Shell
+     * @param err error stream for Shell
+     * @param args arguments to Shell
+     *
+     * @return exit code
+     *
+     * @throws IOException if there's a problem setting up the streams
+     */
+    protected int run(final InputStream in, final OutputStream out, final OutputStream err, final String[] args) throws IOException {
+        final Context context = makeContext(in, out, err, args);
+        if (context == null) {
+            return COMMANDLINE_ERROR;
+        }
+
+        final ScriptObject global = context.createGlobal();
+        final List<String> files = context.getOptions().getFiles();
+        if (files.isEmpty()) {
+            return readEvalPrint(global);
+        }
+
+        if (context._compile_only) {
+            return compileScripts(global, files);
+        }
+
+        return runScripts(global, files);
+    }
+
+    /**
+     * Make a new Nashorn Context to compile and/or run JavaScript files.
+     *
+     * @param in input stream for Shell
+     * @param out output stream for Shell
+     * @param err error stream for Shell
+     * @param args arguments to Shell
+     *
+     * @return null if there are problems with option parsing.
+     */
+    @SuppressWarnings("resource")
+    protected Context makeContext(final InputStream in, final OutputStream out, final OutputStream err, final String[] args) {
+        final PrintStream pout = out instanceof PrintStream ? (PrintStream) out : new PrintStream(out);
+        final PrintStream perr = err instanceof PrintStream ? (PrintStream) err : new PrintStream(err);
+        final PrintWriter wout = new PrintWriter(pout, true);
+        final PrintWriter werr = new PrintWriter(perr, true);
+
+        // Set up error handler.
+        final ErrorManager errors = new ErrorManager(werr);
+        // Set up options.
+        final Options options = new Options("nashorn", werr);
+
+        // parse options
+        try {
+            options.process(args);
+        } catch (final IllegalArgumentException e) {
+            werr.println(bundle.getString("shell.usage"));
+            options.displayHelp(e);
+            return null;
+        }
+
+        // detect scripting mode by any source's first character being '#'
+        if (!options.getBoolean("scripting")) {
+            for (final String fileName : options.getFiles()) {
+                final File firstFile = new File(fileName);
+                if (firstFile.isFile()) {
+                    try (final FileReader fr = new FileReader(firstFile)) {
+                        final int firstChar = fr.read();
+                        // starts with '#
+                        if (firstChar == '#') {
+                            options.set("scripting", true);
+                            break;
+                        }
+                    } catch (final IOException e) {
+                        // ignore this. File IO errors will be reported later anyway
+                    }
+                }
+            }
+        }
+
+        return new Context(options, errors, wout, werr);
+    }
+
+    /**
+     * Compiles the given script files in the command line
+     *
+     * @param global the global scope
+     * @param files the list of script files to compile
+     *
+     * @return error code
+     * @throws IOException when any script file read results in I/O error
+     */
+    protected int compileScripts(final ScriptObject global, final List<String> files) throws IOException {
+        final Context context = global.getContext();
+        final ScriptObject oldGlobal = Context.getGlobal();
+        final boolean globalChanged = (oldGlobal != global);
+        try {
+            if (globalChanged) {
+                Context.setGlobal(global);
+            }
+            final ErrorManager errors = context.getErrors();
+
+            // For each file on the command line.
+            for (final String fileName : files) {
+                final File file = new File(fileName);
+                final Source source = new Source(fileName, file);
+                final Compiler compiler = Compiler.compiler(source, context);
+                compiler.compile();
+                if (errors.getNumberOfErrors() != 0) {
+                    return COMPILATION_ERROR;
+                }
+            }
+        } finally {
+            context.getOut().flush();
+            context.getErr().flush();
+            if (globalChanged) {
+                Context.setGlobal(oldGlobal);
+            }
+        }
+
+        return SUCCESS;
+    }
+
+    /**
+     * Runs the given JavaScript files in the command line
+     *
+     * @param global the global scope
+     * @param files the list of script files to run
+     *
+     * @return error code
+     * @throws IOException when any script file read results in I/O error
+     */
+    protected int runScripts(final ScriptObject global, final List<String> files) throws IOException {
+        final Context context = global.getContext();
+        final ScriptObject oldGlobal = Context.getGlobal();
+        final boolean globalChanged = (oldGlobal != global);
+        try {
+            if (globalChanged) {
+                Context.setGlobal(global);
+            }
+            final ErrorManager errors = context.getErrors();
+
+            // For each file on the command line.
+            for (final String fileName : files) {
+                final File file = new File(fileName);
+                ScriptFunction script = context.compileScript(fileName, file.toURI().toURL(), global, context._strict);
+                if (script == null || errors.getNumberOfErrors() != 0) {
+                    return COMPILATION_ERROR;
+                }
+
+                try {
+                    apply(script, global);
+                } catch (final NashornException e) {
+                    errors.error(e.toString());
+                    if (context._dump_on_error) {
+                        e.printStackTrace(context.getErr());
+                    }
+
+                    return RUNTIME_ERROR;
+                }
+            }
+        } finally {
+            context.getOut().flush();
+            context.getErr().flush();
+            if (globalChanged) {
+                Context.setGlobal(oldGlobal);
+            }
+        }
+
+        return SUCCESS;
+    }
+
+    /**
+     * Hook to ScriptFunction "apply". A performance metering shell may
+     * introduce enter/exit timing here.
+     *
+     * @param target target function for apply
+     * @param self self reference for apply
+     *
+     * @return result of the function apply
+     */
+    protected Object apply(final ScriptFunction target, final Object self) {
+        return ScriptRuntime.apply(target, self);
+    }
+
+    /**
+     * read-eval-print loop for Nashorn shell.
+     *
+     * @param global  global scope object to use
+     * @return return code
+     */
+    @SuppressWarnings("resource")
+    protected int readEvalPrint(final ScriptObject global) {
+        final Context context = global.getContext();
+        final String prompt = bundle.getString("shell.prompt");
+        final BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
+        final PrintWriter err = context.getErr();
+        final ScriptObject oldGlobal = Context.getGlobal();
+        final boolean globalChanged = (oldGlobal != global);
+
+        try {
+            if (globalChanged) {
+                Context.setGlobal(global);
+            }
+
+            // initialize with "shell.js" script
+            try {
+                final Source source = new Source("<shell.js>", Shell.class.getResource("resources/shell.js"));
+                context.eval(global, source.getString(), global, "<shell.js>", false);
+            } catch (final Exception e) {
+                err.println(e);
+                if (context._dump_on_error) {
+                    e.printStackTrace(err);
+                }
+
+                return INTERNAL_ERROR;
+            }
+
+            while (true) {
+                err.print(prompt);
+                err.flush();
+
+                String source = "";
+                try {
+                    source = in.readLine();
+                } catch (final IOException ioe) {
+                    err.println(ioe.toString());
+                }
+
+                if (source == null) {
+                    break;
+                }
+
+                Object res;
+                try {
+                    res = context.eval(global, source, global, "<shell>", context._strict);
+                } catch (final Exception e) {
+                    err.println(e);
+                    if (context._dump_on_error) {
+                        e.printStackTrace(err);
+                    }
+                    continue;
+                }
+
+                if (res != null && res != ScriptRuntime.UNDEFINED) {
+                    err.println(ScriptRuntime.safeToString(res));
+                }
+            }
+        } finally {
+            if (globalChanged) {
+                Context.setGlobal(global);
+            }
+        }
+
+        return SUCCESS;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/tools/resources/Shell.properties b/nashorn/src/jdk/nashorn/tools/resources/Shell.properties
new file mode 100644
index 00000000000..108ae07ab26
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/tools/resources/Shell.properties
@@ -0,0 +1,32 @@
+#
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# Error messages for Shell tool
+
+shell.usage=jjs [<options>] <files> [-- <arguments>]
+
+shell.prompt=jjs> 
+
+
diff --git a/nashorn/src/jdk/nashorn/tools/resources/shell.js b/nashorn/src/jdk/nashorn/tools/resources/shell.js
new file mode 100644
index 00000000000..5103ee00b8f
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/tools/resources/shell.js
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * Initialization script for shell when running in interactive mode.
+ */
+
+/**
+ * Reads zero or more lines from standard input and returns concatenated string
+ * 
+ * @param endMarker marker string that signals end of input
+ * @param prompt prompt printed for each line
+ */
+function input(endMarker, prompt) {
+    if (!endMarker) {
+        endMarker = "";
+    }
+    
+    if (!prompt) {
+        prompt = " >> ";
+    }
+    
+    var imports = new JavaImporter(java.io, java.lang);
+    var str = "";
+    with (imports) {
+        var reader = new BufferedReader(new InputStreamReader(System['in']));
+        var line;
+        while (true) {
+            System.out.print(prompt);
+            line = reader.readLine();
+            if (line == null || line == endMarker) {
+                break;
+            }
+            str += line + "\n";
+        }
+    }
+    
+    return str;
+}
+
+/**
+ * Reads zero or more lines from standard input and evaluates the concatenated
+ * string as code
+ * 
+ * @param endMarker marker string that signals end of input
+ * @param prompt prompt printed for each line
+ */
+function evalinput(endMarker, prompt) {
+    var code = input(endMarker, prompt);
+    // make sure everything is evaluated in global scope!
+    return this.eval(code);
+}
diff --git a/nashorn/src/netscape/javascript/JSObject.java b/nashorn/src/netscape/javascript/JSObject.java
new file mode 100644
index 00000000000..42cfd78a8a9
--- /dev/null
+++ b/nashorn/src/netscape/javascript/JSObject.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package netscape.javascript;
+
+import java.applet.Applet;
+
+/**
+ * Stub for JSObject to get compilation going.
+ */
+public abstract class JSObject {
+
+    /**
+     * Get the window for an {@link Applet}. Not supported
+     * by Nashorn
+     *
+     * @param a applet
+     * @return the window instance
+     */
+    public static JSObject getWindow(final Applet a) {
+        throw new UnsupportedOperationException("getWindow");
+    }
+
+    /**
+     * Call a JavaScript method
+     *
+     * @param methodName name of method
+     * @param args arguments to method
+     * @return result of call
+     */
+    public abstract Object call(String methodName, Object args[]);
+
+    /**
+     * Evaluate a JavaScript expression
+     *
+     * @param s JavaScript expression to evaluate
+     * @return evaluation result
+     */
+    public abstract Object eval(String s);
+
+    /**
+     * Retrieves a named member of a JavaScript object.
+     *
+     * @param name of member
+     * @return member
+     */
+    public abstract Object getMember(String name);
+
+    /**
+     * Retrieves an indexed member of a JavaScript object.
+     *
+     * @param index index of member slot
+     * @return member
+     */
+    public abstract Object getSlot(int index);
+
+    /**
+     * Remove a named member from a JavaScript object
+     *
+     * @param name name of member
+     */
+    public abstract void removeMember(String name);
+
+    /**
+     * Set a named member in a JavaScript object
+     *
+     * @param name  name of member
+     * @param value value of member
+     */
+    public abstract void setMember(String name, Object value);
+
+    /**
+     * Set an indexed member in a JavaScript object
+     *
+     * @param index index of member slot
+     * @param value value of member
+     */
+    public abstract void setSlot(int index, Object value);
+}
diff --git a/nashorn/src/overview.html b/nashorn/src/overview.html
new file mode 100644
index 00000000000..fac1d7e11c4
--- /dev/null
+++ b/nashorn/src/overview.html
@@ -0,0 +1,113 @@
+<!-- 
+ Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+
+ This code is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 2 only, as
+ published by the Free Software Foundation.  Oracle designates this
+ particular file as subject to the "Classpath" exception as provided
+ by Oracle in the LICENSE file that accompanied this code.
+
+ This code is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ version 2 for more details (a copy is included in the LICENSE file that
+ accompanied this code).
+
+ You should have received a copy of the GNU General Public License version
+ 2 along with this work; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ or visit www.oracle.com if you need additional information or have any
+ questions.
+-->
+<body>
+<p>
+Nashorn is a runtime environment for programs written in ECMAScript 5.1.
+</p>
+<h1>Usage</h1>
+<p>
+The recommended way to use Nashorn is through the <a href="http://jcp.org/en/jsr/detail?id=223" target="_top">JSR-223
+"Scripting for the Java Platform"</a> APIs found in the {@link javax.script} package. Usually, you'll obtain a
+{@link javax.script.ScriptEngine} instance for Nashorn using:
+<pre>
+import javax.script.*;
+...
+ScriptEngine nashornEngine = new ScriptEngineManager().getEngineByName("nashorn");
+</pre>
+and then use it just as you would any other JSR-223 script engine. See
+<a href="jdk/nashorn/api/scripting/package-summary.html">{@code jdk.nashorn.api.scripting}</a> package
+for details.
+<p>
+<h1>Compatibility</h1>
+Nashorn is 100% compliant with the <a href="http://www.ecma-international.org/publications/standards/Ecma-262.htm"
+target="_top">ECMA-262 Standard, Edition 5.1</a>. It requires a Java Virtual Machine that implements the
+<a href="http://jcp.org/en/jsr/detail?id=292" target="_top">JSR-292 "Supporting Dynamically Typed Languages on the Java
+Platform"</a> specification (often referred to as "invokedynamic"), as well as the already mentioned JSR-223.
+<h1>Interoperability with the Java platform</h1>
+<p>
+In addition to being a 100% ECMAScript 5.1 runtime, Nashorn provides features for interoperability of the ECMAScript
+programs with the Java platform. In general, any Java object put into the script engine's context will be visible from
+the script. In terms of the standard, such Java objects are not considered "native objects", but rather "host objects",
+as defined in section 4.3.8. This distinction allows certain semantical differences in handling them compared to native
+objects. For most purposes, Java objects behave just as native objects do: you can invoke their methods, get and set
+their properties. In most cases, though, you can't add arbitrary properties to them, nor can you remove existing
+properties.
+<p>
+<h2>Java collection handling</h2>
+<p>
+Native Java arrays and {@link java.util.List}s support indexed access to their elements through the property accessors,
+and {@link java.util.Map}s support both property and element access through both dot and square-bracket property
+accessors, with the difference being that dot operator gives precedence to object properties (its fields and properties
+defined as {@code getXxx} and {@code setXxx} methods) while the square bracket operator gives precedence to map
+elements. Native Java arrays expose the {@code length} property.
+<p>
+<h2>ECMAScript primitive types</h2>
+<p>
+ECMAScript primitive types for number, string, and boolean are represented with {@link java.lang.Number},
+{@link java.lang.CharSequence}, and {@link java.lang.Boolean} objects. While the most often used number type is
+{@link java.lang.Double} and the most often used string type is {@link java.lang.String}, don't rely on it as various
+internal optimizations cause other subclasses of {@code Number} and internal implementations of {@code CharSequence} to
+be used.
+<p>
+<h2>Type conversions</h2>
+<p>
+When a method on a Java object is invoked, the arguments are converted to the formal parameter types of the Java method
+using all allowed ECMAScript conversions. This can be surprising, as in general, conversions from string to number will
+succeed according to Standard's section 9.3 "ToNumber" and so on; string to boolean, number to boolean, Object to
+number, Object to string all work. Note that if the Java method's declared parameter type is {@code java.lang.Object},
+Nashorn objects are passed without any conversion whatsoever; specifically if the JavaScript value being passed is of
+primitive string type, you can only rely on it being a {@code java.lang.CharSequence}, and if the value is a number, you
+can only rely on it being a {@code java.lang.Number}. If the Java method declared parameter type is more specific (e.g.
+{@code java.lang.String} or {@code java.lang.Double}), then Nashorn will of course ensure the required type is passed.
+<p>
+<h2>SAM types</h2>
+<p>
+As a special extension when invoking Java methods, ECMAScript function objects can be passed in place of an argument
+whose Java type is so-called "single abstract method" or "SAM" type. While this name usually covers single-method
+interfaces, Nashorn is a bit more versatile, and it recognizes a type as a SAM type if all its abstract methods are
+overloads of the same name, and it is either an interface, or it is an abstract class with
+a no-arg constructor. The type itself must be public, while the constructor and the methods can be either public or
+protected. If there are multiple abstract overloads of the same name, the single function will serve as the shared
+implementation for all of them, <em>and additionally it will also override any non-abstract methods of the same name</em>.
+This is done to be consistent with the fact that ECMAScript does not have the concept of overloaded methods.
+<p>
+<h2>The {@code Java} object</h2>
+Nashorn exposes a non-standard global object named {@code Java} that is the primary API entry point into Java
+platform-specific functionality. You can use it to create instances of Java classes, convert from Java arrays to native
+arrays and back, and so on. The methods on the objects are directly implemented by public static methods on the class
+<a href="jdk/nashorn/internal/objects/NativeJava.html">{@code NativeJava}</a>, see that class for details on what
+functionality is available.
+<h2>Representations of Java types</h2>
+The method <a href="jdk/nashorn/internal/objects/NativeJava.html#type(java.lang.Object,%20java.lang.Object)">
+{@code Java.type(typeName)}</a> takes a name of a type, and returns an object representing a Java type. You can
+use that object to both create new instances of Java classes, as well as to access static fields and methods on them.
+The type object is distinct from the {@code java.lang.Class} object, which represents the reflective run-time type
+identity and doesn't carry i.e. static members. Again, see the link for {@code NativeJava} above for details.
+<h2>Other non-standard built-in objects</h2>
+In addition to {@code Java}, Nashorn also exposes some other non-standard built-in objects:
+<a href="jdk/nashorn/internal/objects/NativeJSAdapter.html">{@code JSAdapter}</a>,
+<a href="jdk/nashorn/internal/objects/NativeJavaImporter.html">{@code JavaImporter},
+<a href="jdk/nashorn/internal/runtime/NativeJavaPackage.html">{@code Packages}.</a>
+</body>
\ No newline at end of file
diff --git a/nashorn/test/README b/nashorn/test/README
new file mode 100644
index 00000000000..ff41be2f3fe
--- /dev/null
+++ b/nashorn/test/README
@@ -0,0 +1,78 @@
+Nashorn tests are TestNG based. Running tests requires downloading the TestNG
+library and placing its jar file into the lib subdirectory:
+
+   # download and install TestNG
+   wget http://testng.org/testng-x.y.z.zip
+   unzip testng-x.y.z.zip
+   cp testng-x.y.z/testng-x.y.z.jar lib/testng.jar
+
+   # run tests
+   cd ..
+   ant test
+
+This will fail with a message like
+
+    taskdef class org.testng.TestNGAntTask cannot be found
+
+if the TestNG jar file is not installed properly or if the wrong
+version is present. (Check build.xml to find the version of TestNG
+that is required.)  Only the jar file is necessary. The unzipped
+hierarchy can be removed.
+
+We have tested using TestNG 6.7 as well ad TestNG 6.8. TestNG 6.7's jar file
+is also available as part of jtreg 4.1 b05 which can be downloaded at
+http://download.java.net/openjdk/jtreg/
+
+ECMAScript script test framework:
+
+* Test tags for test framework:
+
+The test runner crawls these directories for .js files and looks for JTReg-style
+@foo comments to identify tests.
+
+    * @test - A test is tagged with @test.
+
+    * @test/fail - Tests that are supposed to fail (compiling, see @run/fail
+      for runtime) are tagged with @test/fail.
+
+    * @test/compile-error - Test expects compilation to fail, compares
+      output.
+
+    * @test/warning - Test expects compiler warnings, compares output.
+
+    * @test/nocompare - Test expects to compile [and/or run?]
+      successfully(may be warnings), does not compare output.
+
+    * @subtest - denotes necessary file for a main test file; itself is not
+      a test.
+
+    * @run - A test that should be run is also tagged with @run (otherwise
+      the test runner only compiles the test).
+
+    * @runif - A test that should be run only if a specific System property
+      is defined (Example: @runif external.v8)
+
+    * @run/fail - A test that should compile but fail with a runtime error.
+
+    * @run/param - specify runtime arguments to script.
+
+    * @run/ignore-std-error - script may produce output on stderr, ignore
+      this output.
+
+    * @compilearg \ - pass arg to compiler, sample.
+
+/**
+ * @compilearg --dump-ir-graph
+ * @test/warning
+ */
+
+    * @compilefirst foo.js - foo.js being a necessary file for a test; it
+      may or may not itself be a test. These are compiled separately before
+      main test file.
+
+    * @compile/fail foo.js - foo.js being a necessary file for a test; it
+      may or may not itself be a test, compile should fail. These are compile
+      with main file.
+
+    * @compile bar.js - bar.js being a necessary file for a test; it may or
+      may not itself be a test. These are compiled with main file.
diff --git a/nashorn/test/examples/dual-fields-micro.js b/nashorn/test/examples/dual-fields-micro.js
new file mode 100644
index 00000000000..f9f0b99fb88
--- /dev/null
+++ b/nashorn/test/examples/dual-fields-micro.js
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. 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 with the distribution.
+ * 
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+function b(x,y) {
+    return x * y; //this one always returns a double
+}
+
+var sum = 1;
+function bench() {    
+    var d = new Date;
+
+    for (var iter = 0; iter <4*50e6; iter++) {
+	sum *= 20 * b(21,22);
+    }
+
+    print("time = " +(new Date-d));
+    print(sum);    
+}
+
+bench();
diff --git a/nashorn/test/examples/innerbench.js b/nashorn/test/examples/innerbench.js
new file mode 100644
index 00000000000..e676e1853d7
--- /dev/null
+++ b/nashorn/test/examples/innerbench.js
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. 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 with the distribution.
+ * 
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+function bench() {
+   var N = 10000000;
+
+   function empty() {}
+
+   function outer1() {
+       function inner() {}
+   }
+
+   function outer2() {
+       function inner() {}
+       inner();
+   }
+
+   for (var i = 0, d = Date.now(); i < N; i++) {
+      empty();
+   }
+   print("empty :", Date.now() - d);
+   for (var i = 0, d = Date.now(); i < N; i++) {
+      outer1();
+   }
+   print("outer1:", Date.now() - d);
+   for (var i = 0, d = Date.now(); i < N; i++) {
+      outer2();
+   }
+   print("outer2:", Date.now() - d);
+}
+bench();
+
diff --git a/nashorn/test/examples/typechain.js b/nashorn/test/examples/typechain.js
new file mode 100644
index 00000000000..4eba6dde377
--- /dev/null
+++ b/nashorn/test/examples/typechain.js
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. 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 with the distribution.
+ * 
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+print("Starting type chain test, x is undefined");
+var x;
+//loop once to ensure that the callsites have been rewritten and retargeted
+for (var i = 0; i < 5; i++) {
+    print("LAP " + i);
+    print(x);
+    x = 17;
+    print(x);
+    x = 17.4711;
+    print(x);
+    x += "string ";
+    print(x);
+}
+
+
diff --git a/nashorn/test/lib/benchmark.js b/nashorn/test/lib/benchmark.js
new file mode 100644
index 00000000000..5c67a1c36d8
--- /dev/null
+++ b/nashorn/test/lib/benchmark.js
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * A simple benchmark module that can be loaded
+ * in order to time how many times a method executes
+ * in a fixed number of seconds
+ */
+
+var benchmark = function(method, timeInMillis, args) {
+    var hz,
+    period,
+    startTime = new Date,
+    runs = 0;
+    do {
+	method.apply(args);
+	runs++;
+	totalTime = new Date - startTime;
+    } while (totalTime < timeInMillis);
+    
+    // convert ms to seconds
+    totalTime /= 1000;
+    
+    // period → how long per operation
+    period = totalTime / runs;
+
+    // hz → the number of operations per second
+    hz = 1 / period;
+
+    return hz;
+};
+
diff --git a/nashorn/test/opt/add.js b/nashorn/test/opt/add.js
new file mode 100644
index 00000000000..4a96cc430f9
--- /dev/null
+++ b/nashorn/test/opt/add.js
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Example of an add function that gets specialized to doubles
+ * if run with --optimize flag set 
+ */
+
+function add(a,b) {
+    return a + b;
+}
+
+
+function bench() {
+    var sum = 1;
+    for (var x = 0 ; x < 10e8/2 ; x ++) {
+	sum *= add(x,x + 1);
+    }
+    return sum;
+}
+
+print("doing first run");
+var d = new Date;
+print(bench());
+d = new Date - d;
+print("first run took " + d + " ms");
+
+// invalidate add, replace it with something else
+add = function(a,b) {
+    return b + a;
+}
+
+print("doing second run");
+var d = new Date;
+print(bench());
+d = new Date - d;
+print("second run took " + d + " ms");
+
diff --git a/nashorn/test/opt/add_constant.js b/nashorn/test/opt/add_constant.js
new file mode 100644
index 00000000000..ffc5596b04e
--- /dev/null
+++ b/nashorn/test/opt/add_constant.js
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Example of an add function that gets specialized to doubles
+ * if run with --optimize flag set 
+ */
+
+function add(a,b) {
+    return a + b;
+}
+
+
+function bench() {
+    var sum = 1;
+    for (var x = 0 ; x < 5e7 ; x++) {
+	sum *= add(x, 17);
+    }
+    return sum;
+}
+
+var d = new Date;
+print(bench());
+d = new Date - d;
+print("took " + d + " ms");
diff --git a/nashorn/test/opt/add_reuse_callsite.js b/nashorn/test/opt/add_reuse_callsite.js
new file mode 100644
index 00000000000..70b2e58dabf
--- /dev/null
+++ b/nashorn/test/opt/add_reuse_callsite.js
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Example of an add function that gets specialized to doubles
+ * if run with --optimize flag set 
+ */
+
+function add(a,b) {
+    return a + b;
+}
+
+
+function bench() {
+    var sum = 1;
+    for (var x = 0 ; x < 5e7 ; x++) {
+	sum *= add(x,x + 1);
+    }
+    for (var x = 0; x < 5e7 ; x++) {
+	sum *= add(x + 2, x + 3);
+    }
+    return sum;
+}
+
+var d = new Date;
+print(bench());
+d = new Date - d;
+print("took " + d + " ms");
diff --git a/nashorn/test/opt/add_revert2.js b/nashorn/test/opt/add_revert2.js
new file mode 100644
index 00000000000..c42b79bfc34
--- /dev/null
+++ b/nashorn/test/opt/add_revert2.js
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Example of an add function that gets specialized to doubles
+ * if run with --optimize flag set 
+ */
+
+function add(a,b) {
+    return a + b;
+}
+
+
+function bench() {
+    var sum = 1;
+    for (var x = 0 ; x < 5e7 ; x++) {
+	sum *= add(x, 17);
+	sum *= add(x, x); //can use same revert as 17?
+    }
+    return sum;
+}
+
+var d = new Date;
+print(bench());
+d = new Date - d;
+print("took " + d + " ms");
diff --git a/nashorn/test/opt/cascade_specialize.js b/nashorn/test/opt/cascade_specialize.js
new file mode 100644
index 00000000000..b7b02a77c1b
--- /dev/null
+++ b/nashorn/test/opt/cascade_specialize.js
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+function add3(a,b,c) {
+    return add2(a, b) + c;
+}
+
+function add2(a,b) {
+    return a + b;
+}
+
+function test() {
+    var x = 17;
+    var y = 18;
+    var z = 19;
+    add3(x,y,z);
+}
+
+test();
+ 
diff --git a/nashorn/test/script/assert.js b/nashorn/test/script/assert.js
new file mode 100644
index 00000000000..7f57cc9917d
--- /dev/null
+++ b/nashorn/test/script/assert.js
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * This is not a test - but a framework to run other tests.
+ *
+ * @subtest
+ */
+
+// Assert is TestNG's Assert class
+Object.defineProperty(this, "Assert", { 
+    configuable: true,
+    enumerable: false,
+    writable: true,
+    value: Packages.org.testng.Assert
+});
+
+// fail function to call TestNG Assert.fail
+Object.defineProperty(this, "fail", {
+    configuable: true,
+    enumerable: false,
+    writable: true,
+    // 'error' is optional. if present it has to be 
+    // an ECMAScript Error object or java Throwable object
+    value: function (message, error) {
+        var throwable = null;
+        if (typeof error != 'undefined') {
+            if (error instanceof java.lang.Throwable) {
+                throwable = error;
+            } else if (error.nashornException instanceof java.lang.Throwable) {
+                throwable = error.nashornException;
+            }
+        }
+
+        if (throwable != null) {
+            // call the fail version that accepts Throwable argument
+            Assert.fail(message, throwable);
+        } else {
+            // call the fail version that accepts just message
+            Assert.fail(message);
+        }
+    }
+});
diff --git a/nashorn/test/script/basic/NASHORN-100.js b/nashorn/test/script/basic/NASHORN-100.js
new file mode 100644
index 00000000000..40e3780b1b2
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-100.js
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-100 :  return statement that is not within a FunctionBody should result in syntax error.
+ *
+ * @test
+ * @run
+ */
+
+try {
+    eval("return;");
+    fail("#1 expected SyntaxError got here!");
+} catch (e) {
+    if (! (e instanceof SyntaxError)) {
+        fail("#2 expected SyntaxError got " + e);
+    }
+    print(e.toString().replace(/\\/g, '/'));
+}
diff --git a/nashorn/test/script/basic/NASHORN-100.js.EXPECTED b/nashorn/test/script/basic/NASHORN-100.js.EXPECTED
new file mode 100644
index 00000000000..d183bb33cc8
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-100.js.EXPECTED
@@ -0,0 +1,3 @@
+SyntaxError: test/script/basic/NASHORN-100.js#32<eval>:1:0 Invalid return statement
+return;
+^
diff --git a/nashorn/test/script/basic/NASHORN-101.js b/nashorn/test/script/basic/NASHORN-101.js
new file mode 100644
index 00000000000..33a162b8230
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-101.js
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-101:  switch statement should use === rather than == to compare case values against switch expression.
+ *
+ * @test
+ * @run
+ */
+
+function func(x) {
+    switch(x) {
+        case 0:
+            print("x === 0"); break;
+        case 1:
+            print("x === 1"); break;
+        case true:
+            print("x === true"); break;
+        case false:
+            print("x === false"); break;
+        case null:
+            print("x === null"); break;
+        case undefined:
+            print("x === undefined"); break;
+        default:
+            print("default case x " + x); break;
+    }
+}
+
+func(0);
+func(1);
+func(2);
+func("hello");
+func(null);
+func(undefined);
+func(true);
+func(false);
+func({});
diff --git a/nashorn/test/script/basic/NASHORN-101.js.EXPECTED b/nashorn/test/script/basic/NASHORN-101.js.EXPECTED
new file mode 100644
index 00000000000..7692a07afb4
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-101.js.EXPECTED
@@ -0,0 +1,9 @@
+x === 0
+x === 1
+default case x 2
+default case x hello
+x === null
+x === undefined
+x === true
+x === false
+default case x [object Object]
diff --git a/nashorn/test/script/basic/NASHORN-102.js b/nashorn/test/script/basic/NASHORN-102.js
new file mode 100644
index 00000000000..8359d979eec
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-102.js
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-102 :  if "prototype" property is not an Object, [[HasInstance]] should throw TypeError.
+ *
+ * @test
+ * @run
+ */
+
+function func() {
+}
+func.prototype ="hello";
+
+try {
+    print({} instanceof func);
+    fail("#1 should have thrown TypeError");
+} catch (e) {
+    if (! (e instanceof TypeError)) {
+        fail("#2 TypeError expected got " + e);
+    }
+    print(e);
+}
diff --git a/nashorn/test/script/basic/NASHORN-102.js.EXPECTED b/nashorn/test/script/basic/NASHORN-102.js.EXPECTED
new file mode 100644
index 00000000000..96a77094db1
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-102.js.EXPECTED
@@ -0,0 +1,2 @@
+TypeError: "prototype" of function func() {
+} is not an Object, it is hello
diff --git a/nashorn/test/script/basic/NASHORN-103.js b/nashorn/test/script/basic/NASHORN-103.js
new file mode 100644
index 00000000000..4518d8bb9d2
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-103.js
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-103 :  "Object" called as function with 'undefined' or 'null' argument should work like new Object().
+ *
+ * @test
+ * @run
+ */
+
+function check(obj) {
+    if (obj === null || obj === undefined) {
+        throw new Error("new Object() should have been called");
+    }
+}
+
+check(Object(null));
+check(Object(undefined));
+check(Object());
diff --git a/nashorn/test/script/basic/NASHORN-104.js b/nashorn/test/script/basic/NASHORN-104.js
new file mode 100644
index 00000000000..7dc973ffda9
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-104.js
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-104 :  number type inferred for a global var for a local assignment
+ *
+ * @test
+ * @run
+ */
+
+var p = { toString: function() { p = 1; return "hello" } };
+print("typeof(p) = " + typeof p);
+print(p.toString());
+print("typeof(p) = " + typeof p);
+print("p = " + p);
diff --git a/nashorn/test/script/basic/NASHORN-104.js.EXPECTED b/nashorn/test/script/basic/NASHORN-104.js.EXPECTED
new file mode 100644
index 00000000000..da4259242f4
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-104.js.EXPECTED
@@ -0,0 +1,4 @@
+typeof(p) = object
+hello
+typeof(p) = number
+p = 1
diff --git a/nashorn/test/script/basic/NASHORN-105.js b/nashorn/test/script/basic/NASHORN-105.js
new file mode 100644
index 00000000000..f87d856142a
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-105.js
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-105 :  parseFloat function is not spec. compliant.
+ * 
+ * @test
+ * @run
+ */
+
+print(parseFloat("3.14xyz"));
+print(parseFloat("2.18 43.4543"));
+print(parseFloat("2.9e8E-45"));
+print(parseFloat("55654.6756.4546"));
+print(parseFloat("343e"));
+print(parseFloat("343e+"));
+print(parseFloat("343e-"));
+print(parseFloat("343e+35"));
+print(parseFloat("Infinity1"));
+print(parseFloat("-Infinity1"));
+print(parseFloat("1ex"));
+print(parseFloat("2343+"));
+print(parseFloat("2ex"));
+
+// invalid stuff
+print(parseFloat(""));
+print(parseFloat("+"));
+print(parseFloat("-"));
+print(parseFloat("e"));
+print(parseFloat("sjdfhdsj"));
diff --git a/nashorn/test/script/basic/NASHORN-105.js.EXPECTED b/nashorn/test/script/basic/NASHORN-105.js.EXPECTED
new file mode 100644
index 00000000000..19ef4a843b7
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-105.js.EXPECTED
@@ -0,0 +1,18 @@
+3.14
+2.18
+290000000
+55654.6756
+343
+343
+343
+3.43e+37
+Infinity
+-Infinity
+1
+2343
+2
+NaN
+NaN
+NaN
+NaN
+NaN
diff --git a/nashorn/test/script/basic/NASHORN-106.js b/nashorn/test/script/basic/NASHORN-106.js
new file mode 100644
index 00000000000..3dc6e325051
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-106.js
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-106 :  parseInt function is not spec. compliant
+ *
+ * @test
+ * @run
+ */
+
+print(parseInt("23432"));
+print(parseInt("234jdhfdjs"));
+print(parseInt("0xFEEE"));
+print(parseInt("0xFFgarbage"));
+print(parseInt("\u0009-1"));
+print(parseInt("2343.34534.34534"));
+print(parseInt("23", Number.POSITIVE_INFINITY));
+print(parseInt("23", 8));
+print(parseInt("11111", 2));
diff --git a/nashorn/test/script/basic/NASHORN-106.js.EXPECTED b/nashorn/test/script/basic/NASHORN-106.js.EXPECTED
new file mode 100644
index 00000000000..2b05b0a9299
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-106.js.EXPECTED
@@ -0,0 +1,9 @@
+23432
+234
+65262
+255
+-1
+2343
+23
+19
+31
diff --git a/nashorn/test/script/basic/NASHORN-107.js b/nashorn/test/script/basic/NASHORN-107.js
new file mode 100644
index 00000000000..f55bd72661d
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-107.js
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-107 :  toJSON of undefined should be "undefined"
+ *
+ * @test
+ * @run
+ */
+
+if (JSON.stringify(undefined) !== undefined) {
+    fail("JSON.stringify(undefined) is not undefined");
+}
diff --git a/nashorn/test/script/basic/NASHORN-108.js b/nashorn/test/script/basic/NASHORN-108.js
new file mode 100644
index 00000000000..75066cd87e2
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-108.js
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-109 :  line number in stack trace is incorrect in exceptions from scripts loaded via load()
+ *
+ *
+ * @test
+ * @run
+ */
+
+load(__DIR__ + "NASHORN-109.js");
diff --git a/nashorn/test/script/basic/NASHORN-108.js.EXPECTED b/nashorn/test/script/basic/NASHORN-108.js.EXPECTED
new file mode 100644
index 00000000000..59e90f646e0
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-108.js.EXPECTED
@@ -0,0 +1,3 @@
+runScript 33
+runScript 32
+done
diff --git a/nashorn/test/script/basic/NASHORN-109.js b/nashorn/test/script/basic/NASHORN-109.js
new file mode 100644
index 00000000000..9b41b9b23c2
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-109.js
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-109 :  line number in stack trace is incorrect in exceptions from scripts loaded via load()
+ *
+ * @test
+ * @run
+ */
+
+try {
+    if (typeof foo == 'undefined') {
+        throw new Error("error");
+    }
+} catch (e) {
+    for (i in e.stack) { 
+        print(e.stack[i].methodName + ' ' + e.stack[i].lineNumber);
+    }
+}
+
+// just some code at the end.. original test involved
+// line numer of the last line always. Just to check the same..
+print("done");
diff --git a/nashorn/test/script/basic/NASHORN-109.js.EXPECTED b/nashorn/test/script/basic/NASHORN-109.js.EXPECTED
new file mode 100644
index 00000000000..fca137e214b
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-109.js.EXPECTED
@@ -0,0 +1,2 @@
+runScript 33
+done
diff --git a/nashorn/test/script/basic/NASHORN-11.js b/nashorn/test/script/basic/NASHORN-11.js
new file mode 100644
index 00000000000..a4b01b7a64b
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-11.js
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-11 :  undefined == null |- false
+ *
+ * @test
+ * @run
+ */
+
+var data;
+print("data = " + data);
+if (data == null)  {
+    print("data == null");
+} else {
+    print("FAIL: data != null !");
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-11.js.EXPECTED b/nashorn/test/script/basic/NASHORN-11.js.EXPECTED
new file mode 100644
index 00000000000..5d47de54f64
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-11.js.EXPECTED
@@ -0,0 +1,2 @@
+data = undefined
+data == null
diff --git a/nashorn/test/script/basic/NASHORN-111.js b/nashorn/test/script/basic/NASHORN-111.js
new file mode 100644
index 00000000000..e0aba6f6d20
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-111.js
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-111 :  ClassCastException from JSON.stringify
+ *
+ * @test
+ * @run
+ */
+
+try {
+    throw new TypeError("type error");
+} catch (e) {
+    // This used to throw ClassCastException 
+    // ThrowException cannot be cast to ScriptObject
+    print(JSON.stringify(e));
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-111.js.EXPECTED b/nashorn/test/script/basic/NASHORN-111.js.EXPECTED
new file mode 100644
index 00000000000..287f25580c4
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-111.js.EXPECTED
@@ -0,0 +1 @@
+{"message":"type error"}
diff --git a/nashorn/test/script/basic/NASHORN-113.js b/nashorn/test/script/basic/NASHORN-113.js
new file mode 100644
index 00000000000..1bc5ac1ca73
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-113.js
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-113: variable declaration with initialization should set type to non void
+ *
+ * @test
+ * @run
+ */
+
+var value = "hello";
+print(value);
+value = 12;
+print(value);
diff --git a/nashorn/test/script/basic/NASHORN-113.js.EXPECTED b/nashorn/test/script/basic/NASHORN-113.js.EXPECTED
new file mode 100644
index 00000000000..eeeb0084b7a
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-113.js.EXPECTED
@@ -0,0 +1,2 @@
+hello
+12
diff --git a/nashorn/test/script/basic/NASHORN-114.js b/nashorn/test/script/basic/NASHORN-114.js
new file mode 100644
index 00000000000..83c14538162
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-114.js
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-114 :  String.fromCharCode should use ToUInt16 as per the spec.
+ *
+ * @test
+ * @run
+ */
+
+if (String.fromCharCode(4294967294).charCodeAt(0) !== 65534) {
+    fail("String.fromCharCode(4294967294).charCodeAt(0) !== 65534");
+}
+
+if (String.fromCharCode(Number.POSITIVE_INFINITY).charCodeAt(0) !== 0) {
+    fail("String.fromCharCode(Number.POSITIVE_INFINITY).charCodeAt(0) !== 0");
+}
+
+if (String.fromCharCode(0x0000).charCodeAt(0) !== 0) {
+    fail("String.fromCharCode(0x0000).charCodeAt(0) !== 0");
+}
+
+if (String.fromCharCode(65, 66, 67, 68) !== "ABCD") {
+    fail("String.fromCharCode(65, 66, 67, 68) !== 'ABCD'");
+}
diff --git a/nashorn/test/script/basic/NASHORN-115.js b/nashorn/test/script/basic/NASHORN-115.js
new file mode 100644
index 00000000000..aba73cc5c3e
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-115.js
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-115 :  "this" in eval'-ed code refers to wrong object
+ *
+ * @test
+ * @run
+ */
+
+function func() {
+   eval("print(this)");
+}
+
+func();
+
+var obj = {};
+obj.func = func;
+obj.func();
+
+var f = new Function("print(this)");
+f();
+
+obj.f = f;
+obj.f();
+
+// eval of nothing
+print(eval());
diff --git a/nashorn/test/script/basic/NASHORN-115.js.EXPECTED b/nashorn/test/script/basic/NASHORN-115.js.EXPECTED
new file mode 100644
index 00000000000..f99e8b621d8
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-115.js.EXPECTED
@@ -0,0 +1,5 @@
+[object global]
+[object Object]
+[object global]
+[object Object]
+undefined
diff --git a/nashorn/test/script/basic/NASHORN-117.js b/nashorn/test/script/basic/NASHORN-117.js
new file mode 100644
index 00000000000..0278c98966e
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-117.js
@@ -0,0 +1,160 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-117 :  StackOverflowError because of recursive class loading involving LayoutGenerator
+ *
+ * @test
+ * @run
+ */
+
+// The following code results in StackOverflowError 
+
+var i0 = "";
+var o0 = "";
+var i1 = "";
+var o1 = "";
+var i2 = "";
+var o2 = "";
+var i3 = "";
+var o3 = "";
+var i4 = "";
+var o4 = "";
+var i5 = "";
+var o5 = "";
+var i6 = "";
+var o6 = "";
+var i7 = "";
+var o7 = "";
+var i8 = "";
+var o8 = "";
+var i9 = "";
+var o9 = "";
+var i10 = "";
+var o10 = "";
+var i11 = "";
+var o11 = "";
+var i12 = "";
+var o12 = "";
+var i13 = "";
+var o13 = "";
+var i14 = "";
+var o14 = "";
+var i15 = "";
+var o15 = "";
+var i16 = "";
+var o16 = "";
+var i17 = "";
+var o17 = "";
+var i18 = "";
+var o18 = "";
+var i19 = "";
+var o19 = "";
+var i20 = "";
+var o20 = "";
+var i21 = "";
+var o21 = "";
+var i22 = "";
+var o22 = "";
+var i23 = "";
+var o23 = "";
+var i24 = "";
+var o24 = "";
+var i25 = "";
+var o25 = "";
+var i26 = "";
+var o26 = "";
+var i27 = "";
+var o27 = "";
+var i28 = "";
+var o28 = "";
+var i29 = "";
+var o29 = "";
+var i30 = "";
+var o30 = "";
+var i31 = "";
+var o31 = "";
+var i32 = "";
+var o32 = "";
+var i33 = "";
+var o33 = "";
+var i34 = "";
+var o34 = "";
+var i35 = "";
+var o35 = "";
+var i36 = "";
+var o36 = "";
+var i37 = "";
+var o37 = "";
+var i38 = "";
+var o38 = "";
+var i39 = "";
+var o39 = "";
+var i40 = "";
+var o40 = "";
+var i41 = "";
+var o41 = "";
+var i42 = "";
+var o42 = "";
+var i43 = "";
+var o43 = "";
+var i44 = "";
+var o44 = "";
+var i45 = "";
+var o45 = "";
+var i46 = "";
+var o46 = "";
+var i47 = "";
+var o47 = "";
+var i48 = "";
+var o48 = "";
+var i49 = "";
+var o49 = "";
+var i50 = "";
+var o50 = "";
+var i51 = "";
+var o51 = "";
+var i52 = "";
+var o52 = "";
+var i53 = "";
+var o53 = "";
+var i54 = "";
+var o54 = "";
+var i55 = "";
+var o55 = "";
+var i56 = "";
+var o56 = "";
+var i57 = "";
+var o57 = "";
+var i58 = "";
+var o58 = "";
+var i59 = "";
+var o59 = "";
+var i60 = "";
+var o60 = "";
+var i61 = "";
+var o61 = "";
+var i62 = "";
+var o62 = "";
+var i63 = "";
+var o63 = "";
diff --git a/nashorn/test/script/basic/NASHORN-118.js b/nashorn/test/script/basic/NASHORN-118.js
new file mode 100644
index 00000000000..ce1b1a804fb
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-118.js
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-118 :  Function.prototype.apply should accept "arguments" object 
+ * of another function as second argument.
+ *
+ * @test
+ * @run
+ */
+
+function func(x, y, z) {
+    print("x " + x);
+    print("y " + y);
+    print("z " + z);
+}
+
+
+(function (){
+    func.apply(this,arguments);
+})("hello", "world", "great!");
+
+
diff --git a/nashorn/test/script/basic/NASHORN-118.js.EXPECTED b/nashorn/test/script/basic/NASHORN-118.js.EXPECTED
new file mode 100644
index 00000000000..fd53376625d
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-118.js.EXPECTED
@@ -0,0 +1,3 @@
+x hello
+y world
+z great!
diff --git a/nashorn/test/script/basic/NASHORN-119.js b/nashorn/test/script/basic/NASHORN-119.js
new file mode 100644
index 00000000000..561f3e1ba28
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-119.js
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-119 :  Function.prototype.apply should accept any array-like object as second argument
+ *
+ * @test
+ * @run
+ */
+
+function func(x, y, z) {
+    print(x);
+    print(y);
+    print(z);
+}
+
+func.apply(this, { length: 3, 0: "thus", 1: "spoke", 2: "zarathustra" });
diff --git a/nashorn/test/script/basic/NASHORN-119.js.EXPECTED b/nashorn/test/script/basic/NASHORN-119.js.EXPECTED
new file mode 100644
index 00000000000..8ff1946cfb8
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-119.js.EXPECTED
@@ -0,0 +1,3 @@
+thus
+spoke
+zarathustra
diff --git a/nashorn/test/script/basic/NASHORN-12.js b/nashorn/test/script/basic/NASHORN-12.js
new file mode 100644
index 00000000000..284e1e5db69
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-12.js
@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-12 :  Number does not have methods toFixed, toPrecision, and toExponential.
+ *
+ * @test
+ * @run
+ */
+
+// checks for Number.prototype.toFixed
+
+if (NaN.toFixed() !== "NaN") {
+    fail("#1 NaN.toFixed() is not NaN");
+}
+
+if (new Number(1e21).toFixed(12) !== String(1e21)) {
+    fail("#2 new Number(1e21).toFixed(12) is not String(1e21)");
+}
+
+if (new Number(1.2).toFixed(3) !== "1.200") {
+    fail("#3 new Number(1.2).toFixed(3) is not '1.200'");
+}
+
+if (new Number(1.2542).toFixed(3) !== "1.254") {
+    fail("#4 Number(1.2542).toFixed(3) is not '1.254'");
+}
+
+try {
+    453.334.toFixed(31);
+    fail("#5 toFixed(31) should have thrown RangeError");
+} catch (e) {
+    if (! (e instanceof RangeError)) {
+        fail("#6 toFixed(31) should throw RangeError, got " + e);
+    }
+}
+
+try {
+    3.14.toFixed(-1);
+    fail("#7 toFixed(-1) should have thrown RangeError");
+} catch (e) {
+    if (! (e instanceof RangeError)) {
+        fail("#8 toFixed(-1) should throw RangeError, got " + e);
+    }
+}
+
+
+// checks for Number.prototype.toPrecision
+
+var num = new Number(0.0);
+
+try {
+    num.toPrecision(0);
+    fail("#9: num.toPrecision(0) should have been thrown RangeError");
+} catch (e) {
+    if (! (e instanceof RangeError)) {
+        fail("#10: RangeError expected, got " + e);
+    }
+}
+
+try {
+    num.toPrecision(22);
+    fail("#11: num.toPrecision(22) should have been thrown RangeError");
+} catch (e) {
+    if (! (e instanceof RangeError)) {
+        fail("#12: RangeError expected, got " + e);
+    }
+}
+
+num = new Number(23.4718);
+
+if (num.toPrecision(1) != "2e+1") {
+    fail("#13: toPrecision(1) gives " + num.toPrecision(1));
+}
+
+if (num.toPrecision(2) != "23") {
+    fail("#14: toPrecision(2) gives " + num.toPrecision(2));
+}
+
+if (num.toPrecision(3) != "23.5") {
+    fail("#15: toPrecision(3) gives " + num.toPrecision(3));
+}
+
+if (num.toPrecision(11) != "23.471800000") {
+    fail("#16: toPrecision(11) gives " + num.toPrecision(11));
+}
+
+if (Infinity.toPrecision(1) != "Infinity") {
+    fail("#17: Infinity.toPrecision(1) gives " + Infinity.toPrecision(1));
+}
+
+if (-Infinity.toPrecision(1) != "-Infinity") {
+    fail("#18: -Infinity.toPrecision(1) gives " + -Infinity.toPrecision(1));
+}
+
+// checks for Number.prototype.toExponential
+
+if (num.toExponential(1) != "2.3e+1") {
+    fail("#20: toExponential(1) gives " + num.toExponential(1));
+}
+
+if (num.toExponential(2) != "2.35e+1") {
+    fail("#21: toExponential(2) gives " + num.toExponential(2));
+}
+
+if (num.toExponential(3) != "2.347e+1") {
+    fail("#22: toExponential(3) gives " + num.toExponential(3));
+}
+
+if (num.toExponential(11) != "2.34718000000e+1") {
+    fail("#23: toExponential(11) gives " + num.toExponential(11));
+}
+
+if (Infinity.toExponential(1) != "Infinity") {
+    fail("#24: Infinity.toExponential(1) gives " + Infinity.toExponential(1));
+}
+
+if (-Infinity.toExponential(1) != "-Infinity") {
+    fail("#25: -Infinity.toExponential(1) gives " + -Infinity.toExponential(1));
+}
+
+if (NaN.toExponential(1) != "NaN") {
+    fail("#26: NaN.toExponential(1) gives " + NaN.toExponential(1));
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-120.js b/nashorn/test/script/basic/NASHORN-120.js
new file mode 100644
index 00000000000..59872c7862a
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-120.js
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-120 :  String.prototype.split does not convert the input arguments in the order specified
+ *
+ * @test
+ * @run
+ */
+
+var obj1 = {
+    toString: function() {
+        throw "inside obj1.toString";
+    }
+};
+
+var obj2 = {
+    valueOf: function() {
+        throw "inside obj2.valueOf";
+    }
+};
+
+try {
+    "hello".split(obj1, obj2);
+    fail('#1: split not throwing exception on input conversion');
+} catch (e) {
+    if (e !== "inside obj2.valueOf") {
+        fail('#2: Exception === "obj2.valueOf" got: '+e);
+    }
+}
+
+try {
+    "hello".split(obj1, 10);
+    fail('#3: split not throwing exception on input conversion');
+} catch (e) {
+    if (e !== "inside obj1.toString") {
+        fail('#4: Exception === "obj1.toString" got: '+e);
+    }
+}
diff --git a/nashorn/test/script/basic/NASHORN-122.js b/nashorn/test/script/basic/NASHORN-122.js
new file mode 100644
index 00000000000..b8337092be7
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-122.js
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-122 :  Hex string to number conversion does not work as expected
+ *
+ * @test
+ * @run
+ */
+
+function num(str) { print("Number('" + str + "') = " + Number(str)); }
+
+num("0x00007");
+num("0xCAFEBABE");
+num("0xFE");
+num("0xEF");
diff --git a/nashorn/test/script/basic/NASHORN-122.js.EXPECTED b/nashorn/test/script/basic/NASHORN-122.js.EXPECTED
new file mode 100644
index 00000000000..0d573a039d7
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-122.js.EXPECTED
@@ -0,0 +1,4 @@
+Number('0x00007') = 7
+Number('0xCAFEBABE') = 3405691582
+Number('0xFE') = 254
+Number('0xEF') = 239
diff --git a/nashorn/test/script/basic/NASHORN-126.js b/nashorn/test/script/basic/NASHORN-126.js
new file mode 100644
index 00000000000..b657304d523
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-126.js
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-126 - number to ascii conversion
+ *
+ * @test
+ * @run
+ */ 
+
+print(String(1000000000000000000000) === "1e+21");
+print(String(0.000000000100000000000) === "1e-10");
+
+    
diff --git a/nashorn/test/script/basic/NASHORN-126.js.EXPECTED b/nashorn/test/script/basic/NASHORN-126.js.EXPECTED
new file mode 100644
index 00000000000..bb101b641b9
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-126.js.EXPECTED
@@ -0,0 +1,2 @@
+true
+true
diff --git a/nashorn/test/script/basic/NASHORN-127.js b/nashorn/test/script/basic/NASHORN-127.js
new file mode 100644
index 00000000000..74695b10b5c
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-127.js
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-127 :  Exceptions erroneously inherit messages from the last exception thrown.
+ *
+ * @test
+ * @run
+ */
+
+try {
+    try { 
+        throw ReferenceError(17);
+    } catch (e) { 
+        print(e); 
+        throw TypeError(4711); 
+    }
+} catch (e) { print(e); 
+}
diff --git a/nashorn/test/script/basic/NASHORN-127.js.EXPECTED b/nashorn/test/script/basic/NASHORN-127.js.EXPECTED
new file mode 100644
index 00000000000..aa703626779
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-127.js.EXPECTED
@@ -0,0 +1,2 @@
+ReferenceError: 17
+TypeError: 4711
diff --git a/nashorn/test/script/basic/NASHORN-130.js b/nashorn/test/script/basic/NASHORN-130.js
new file mode 100644
index 00000000000..a9b548844a7
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-130.js
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-130 :  prototype comparison throws java class cast exception
+ *
+ * @test
+ * @run
+ */
+
+function Func() {
+}
+
+Func.prototype = Object;
+var f = new Func();
+if (f.prototype !== Object.prototype) {
+    fail("f.prototype should be Object.prototype");
+}
diff --git a/nashorn/test/script/basic/NASHORN-132.js b/nashorn/test/script/basic/NASHORN-132.js
new file mode 100644
index 00000000000..8bb1e682ece
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-132.js
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-132 : Implementation of __FILE__ and __LINE__ in lower is incorrect.
+ *
+ * @test
+ * @run
+ */
+
+function printFile() {
+    var idx = __FILE__.lastIndexOf(java.io.File.separator);
+    if (idx < 0) {
+        // separator is "/" when running under ant on windows
+        idx = __FILE__.lastIndexOf("/");
+    }
+    var file = (idx != -1)? __FILE__.substring(idx + 1) : __FILE__;
+    print("file: " + file);
+}
+
+// assignment to global read-only __FILE__ ignored
+__FILE__ = 454;
+printFile();
+
+// assignment to global read-only __LINE__ ignored
+__LINE__ = "hello";
+print("line: " + __LINE__);
+
+var obj = { __FILE__: "obj.__FILE__", __LINE__: "obj.__LINE__" };
+
+// obj.__FILE__ is different from global __FILE__
+print(obj.__FILE__);
+printFile();
+
+// obj.__LINE__ is different from global __LINE__
+print(obj.__LINE__);
+print("line: " + __LINE__);
+
+function func() {
+   // can have local variable of that name
+   var __FILE__ = "local __FILE__ value";
+   print(__FILE__);
+
+   var __LINE__ = "local __LINE__ value";
+   print(__LINE__);
+}
+
+func();
+printFile();
+print("line: " + __LINE__);
diff --git a/nashorn/test/script/basic/NASHORN-132.js.EXPECTED b/nashorn/test/script/basic/NASHORN-132.js.EXPECTED
new file mode 100644
index 00000000000..78f7e48246d
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-132.js.EXPECTED
@@ -0,0 +1,10 @@
+file: NASHORN-132.js
+line: 47
+obj.__FILE__
+file: NASHORN-132.js
+obj.__LINE__
+line: 57
+local __FILE__ value
+local __LINE__ value
+file: NASHORN-132.js
+line: 70
diff --git a/nashorn/test/script/basic/NASHORN-133.js b/nashorn/test/script/basic/NASHORN-133.js
new file mode 100644
index 00000000000..9f7d4622706
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-133.js
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-133 :  esacpe and unescape global functions are not implemented
+ *
+ * @test
+ * @run
+ */
+
+
+print("escape is " + (typeof escape) + " with arity " + escape.length);
+print("unescape is " + (typeof unescape) + " with arity " + unescape.length);
+
+// escape tests
+
+print(escape("This is great!"));
+print(escape("What is going on here??"));
+print(escape("\uFFFF\uFFFE\u1FFF"));
+
+// unescape tests
+print(unescape("This%20is%20great%21"));
+print(unescape("What%20is%20going%20on%20here%3F%3F"));
+if (unescape("%uFFFF%uFFFE%u1FFF") != "\uFFFF\uFFFE\u1FFF") {
+    fail("unescape('%uFFFF%uFFFE%u1FFF') does not work");
+}
diff --git a/nashorn/test/script/basic/NASHORN-133.js.EXPECTED b/nashorn/test/script/basic/NASHORN-133.js.EXPECTED
new file mode 100644
index 00000000000..5ba986fc68e
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-133.js.EXPECTED
@@ -0,0 +1,7 @@
+escape is function with arity 1
+unescape is function with arity 1
+This%20is%20great%21
+What%20is%20going%20on%20here%3F%3F
+%uFFFF%uFFFE%u1FFF
+This is great!
+What is going on here??
diff --git a/nashorn/test/script/basic/NASHORN-135.js b/nashorn/test/script/basic/NASHORN-135.js
new file mode 100644
index 00000000000..dc7eb5fb9f8
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-135.js
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-135 : With statements are forbidden in strict mode
+ *
+ * @test
+ * @run
+ */
+
+try {
+    eval("'use strict'; with ({}) {}");
+    fail("should have thrown SyntaxError for 'with'");
+} catch (e) {
+    if (! (e instanceof SyntaxError)) {
+        fail("expected SyntaxError but got " + e);
+    }
+}
+
+
+try {
+    var f = new Function("func", "'use strict'; with ({}) {}");
+    fail("should have thrown SyntaxError for 'with'");
+} catch (e) {
+    if (! (e instanceof SyntaxError)) {
+        fail("expected SyntaxError but got " + e);
+    }
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-136.js b/nashorn/test/script/basic/NASHORN-136.js
new file mode 100644
index 00000000000..beefc8ad305
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-136.js
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-136 :  binary addition operator does not work as per the spec.
+ *
+ * @test
+ * @run
+ */
+
+var obj1 = {
+    valueOf: function() {
+        print("obj1.valueOf");
+        return 1;
+    }, 
+
+    toString: function() {
+        print("obj1.toString");
+        return 0;
+    }
+};
+
+print("obj1 is " + obj1);
+print(obj1 + 10);
+
+var obj2 = {
+    valueOf: function() {
+        print("obj2.valueOf");
+        return 2;
+    },
+
+    toString: function() {
+        print("obj2.toString");
+        return "hello";
+    }
+};
+
+print("obj2 is " + obj2);
+print(obj2 + 22);
+
+// valueOf on each object and then add
+print(obj1 + obj2);
+
+var obj3 = {
+    toString: function() {
+        print("obj3.toString");
+        return "world";
+    }
+};
+
+print(obj3 + 12);
+print("hello " + obj3);
+
+print(obj1 + obj3);
+print(obj2 + obj3);
+print(obj3 + obj3);
+
diff --git a/nashorn/test/script/basic/NASHORN-136.js.EXPECTED b/nashorn/test/script/basic/NASHORN-136.js.EXPECTED
new file mode 100644
index 00000000000..f09beae30a1
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-136.js.EXPECTED
@@ -0,0 +1,24 @@
+obj1.valueOf
+obj1 is 1
+obj1.valueOf
+11
+obj2.valueOf
+obj2 is 2
+obj2.valueOf
+24
+obj1.valueOf
+obj2.valueOf
+3
+obj3.toString
+world12
+obj3.toString
+hello world
+obj1.valueOf
+obj3.toString
+1world
+obj2.valueOf
+obj3.toString
+2world
+obj3.toString
+obj3.toString
+worldworld
diff --git a/nashorn/test/script/basic/NASHORN-14.js b/nashorn/test/script/basic/NASHORN-14.js
new file mode 100644
index 00000000000..34abb7ce41c
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-14.js
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/**
+ * NASHORN-14 :  Function.apply and call do not work with varargs in callee.
+ *
+ * @test
+ * @run
+ */
+
+
+function callback() { 
+    print('callback with args ' + Array.prototype.join.apply(arguments))
+}
+
+var cb = callback;
+cb.call(this, 's', 10, 13.1, true, false, null, {}, [], [1,2,{}]);
+cb.apply(this, ['s', 10, 13.1, true, false, null, {}, [], [1,2,{}]]);
diff --git a/nashorn/test/script/basic/NASHORN-14.js.EXPECTED b/nashorn/test/script/basic/NASHORN-14.js.EXPECTED
new file mode 100644
index 00000000000..e7f5de39ab0
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-14.js.EXPECTED
@@ -0,0 +1,2 @@
+callback with args s,10,13.1,true,false,,[object Object],,1,2,[object Object]
+callback with args s,10,13.1,true,false,,[object Object],,1,2,[object Object]
diff --git a/nashorn/test/script/basic/NASHORN-148.js b/nashorn/test/script/basic/NASHORN-148.js
new file mode 100644
index 00000000000..44cc0cd6c37
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-148.js
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-148 :  arguments element deletion/resurrection does not work as expected
+ * 
+ * @test
+ * @run
+ */
+
+
+function func(x) { 
+    print("func.x = " + x);
+    print("func.arguments[0] = " + arguments[0]);
+
+    arguments[0] = "world";
+
+    print("func.x = " + x);
+    print("func.arguments[0] = " + arguments[0]);
+
+    x = "changed x";
+    print("func.x = " + x);
+    print("func.arguments[0] = " + arguments[0]);
+
+    // delete arguments[0]
+    delete arguments[0]; 
+    print("func.x = " + x);
+    print("func.arguments[0] = " + arguments[0]);
+
+    // resurrect arguments[0]
+    arguments[0] = 42;
+    print("func.x = " + x);
+    print("func.arguments[0] = " + arguments[0]);
+
+    x = 33;
+    print("func.x = " + x);
+    print("func.arguments[0] = " + arguments[0]);
+}
+
+func(3.14);
+
+
+// deletion and resurrection of different argument
+function func2(x, y) {
+   delete arguments[0];
+   arguments[0] = 3434;
+   print("func2.x = " + x);
+   print("func2.arguments[0] = " + arguments[0]);
+
+   print("func2.y = " + y);
+   print("func2.arguments[1] = " + arguments[1]);
+
+   y = 54;
+   print("func2.y = " + y);
+   print("func2.arguments[1] = " + arguments[1]);
+
+   arguments[1] = 67;
+   print("func2.y = " + y);
+   print("func2.arguments[1] = " + arguments[1]);
+}
+
+func2(1, 3);
+
diff --git a/nashorn/test/script/basic/NASHORN-148.js.EXPECTED b/nashorn/test/script/basic/NASHORN-148.js.EXPECTED
new file mode 100644
index 00000000000..d2f81f95bbb
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-148.js.EXPECTED
@@ -0,0 +1,20 @@
+func.x = 3.14
+func.arguments[0] = 3.14
+func.x = world
+func.arguments[0] = world
+func.x = changed x
+func.arguments[0] = changed x
+func.x = changed x
+func.arguments[0] = undefined
+func.x = changed x
+func.arguments[0] = 42
+func.x = 33
+func.arguments[0] = 42
+func2.x = 1
+func2.arguments[0] = 3434
+func2.y = 3
+func2.arguments[1] = 3
+func2.y = 54
+func2.arguments[1] = 54
+func2.y = 67
+func2.arguments[1] = 67
diff --git a/nashorn/test/script/basic/NASHORN-15.js b/nashorn/test/script/basic/NASHORN-15.js
new file mode 100644
index 00000000000..5a470cd6f5f
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-15.js
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-15 :  JSAdapter __call__ does not accept more than 7 args
+ *
+ * @test
+ * @run
+ */
+
+var x = new JSAdapter() {
+    __call__: function(a, b, c, d, e, f, g , h, i, j) {
+        print(a);
+        print(b);
+        print(c);
+        print(d);
+        print(e);
+        print(f);
+        print(g);
+        print(h);
+        print(i);
+        print(j);
+   }
+}
+
+x.foo(11, 12, 13, 14, 15, 16, 17, 18, 19);
diff --git a/nashorn/test/script/basic/NASHORN-15.js.EXPECTED b/nashorn/test/script/basic/NASHORN-15.js.EXPECTED
new file mode 100644
index 00000000000..781dba279e8
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-15.js.EXPECTED
@@ -0,0 +1,10 @@
+foo
+11
+12
+13
+14
+15
+16
+17
+18
+19
diff --git a/nashorn/test/script/basic/NASHORN-153.js b/nashorn/test/script/basic/NASHORN-153.js
new file mode 100644
index 00000000000..63565db25ad
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-153.js
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-153 : When using property name with a '.' we get ClassFormatError
+ *
+ * @test
+ * @run
+ */
+
+var obj = { "foo.bar" : 344 };
+if (obj["foo.bar"] !== 344) {
+    fail("foo.bar !== 344");
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-156.js b/nashorn/test/script/basic/NASHORN-156.js
new file mode 100644
index 00000000000..da37f0d9486
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-156.js
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-156 :  object literal getter function fails only with -scripting mode.
+ *
+ * @test
+ * @option -scripting
+ * @run
+ */
+
+var obj = { 
+    get foo() { return 3; } 
+};
+
+if (obj.foo != 3) {
+    throw new Error("obj.foo should be 3 got " + obj.foo);
+}
diff --git a/nashorn/test/script/basic/NASHORN-157.js b/nashorn/test/script/basic/NASHORN-157.js
new file mode 100644
index 00000000000..461128f58f6
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-157.js
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-157 :  undefined ident as lhs of comma expression should result in ReferenceError
+ *
+ * @test
+ * @run
+ */
+
+try { 
+    print((x, 1));
+    fail("#1 ReferenceError should have been thrown");
+} catch (e) {
+    if (! (e instanceof ReferenceError)) {
+        fail("#2 ReferenceError expected");
+    }
+}
diff --git a/nashorn/test/script/basic/NASHORN-163.js b/nashorn/test/script/basic/NASHORN-163.js
new file mode 100644
index 00000000000..2e6b8ae5cb0
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-163.js
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-163 :  Object.keys(o) should only enumerate o's own properties
+ * 
+ * @test
+ * @run
+ */
+
+print(Object.keys({0:'a'}));
+print(Object.keys({0:'a',26:'z'}));
+
+print(Object.keys(['a']));
+print(Object.keys(['a','b',,,'z']));
+
+print(Object.getOwnPropertyNames({0:'a'}));
+print(Object.getOwnPropertyNames({0:'a',26:'z'}));
+
+print(Object.getOwnPropertyNames(['a']));
+print(Object.getOwnPropertyNames(['a','b',,,'z']));
diff --git a/nashorn/test/script/basic/NASHORN-163.js.EXPECTED b/nashorn/test/script/basic/NASHORN-163.js.EXPECTED
new file mode 100644
index 00000000000..4708cc69f7c
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-163.js.EXPECTED
@@ -0,0 +1,8 @@
+0
+0,26
+0
+0,1,4
+0
+0,26
+0,length
+0,1,4,length
\ No newline at end of file
diff --git a/nashorn/test/script/basic/NASHORN-164.js b/nashorn/test/script/basic/NASHORN-164.js
new file mode 100644
index 00000000000..a7ca1476cac
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-164.js
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-164 :  JSON.stringify should serialize only own properties of an object (like Object.keys)
+ *
+ * @test
+ * @run
+ */
+
+var obj2 = { bar: 'hello' };
+var obj = Object.create(obj2);
+obj.foo = 22; 
+
+if (JSON.stringify(obj) != '{"foo":22}') {
+    throw Error("expected '{\"foo\":22}' got " + JSON.stringify(obj));
+}
diff --git a/nashorn/test/script/basic/NASHORN-165.js b/nashorn/test/script/basic/NASHORN-165.js
new file mode 100644
index 00000000000..7c453a7bc5b
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-165.js
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-165 :  Date.prototype.getTimezoneOffset does not return correct value.
+ *
+ * @test
+ * @option -timezone=Asia/Calcutta
+ * @run
+ */
+
+var d = new Date(0);
+if (d.getTimezoneOffset() != -330) {
+    fail("getTimezoneOffset for Asia/Calcutta should be -330");
+}
diff --git a/nashorn/test/script/basic/NASHORN-166.js b/nashorn/test/script/basic/NASHORN-166.js
new file mode 100644
index 00000000000..e0e41fa0453
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-166.js
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-166 : Parameter of nested catch should not be shared with enclosing catch.
+ *
+ * @test
+ * @run
+ */
+
+try {
+    throw "ex1";
+} catch(ex){
+    try {
+        throw "ex2";
+    } catch(ex) {
+    }
+
+    if (ex !== "ex1") {
+        fail('#1 expected that (ex === "ex1")');
+    }
+
+    if (ex === "ex2") {
+        fail('#2 expected that (ex !== "ex2")');
+    }
+}
diff --git a/nashorn/test/script/basic/NASHORN-168.js b/nashorn/test/script/basic/NASHORN-168.js
new file mode 100644
index 00000000000..5bdb70341c7
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-168.js
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-168 :  Object.prototype.toString does not work as per the spec.
+ *
+ * @test
+ * @run
+ */
+
+function printToString(obj) {
+    print(Object.prototype.toString.call(obj));
+}
+
+printToString(null);
+printToString(undefined);
+(function () {
+    printToString(arguments);
+})();
+printToString([]);
+printToString(new Boolean(false));
+printToString(new Date(0));
+printToString(Object);
+printToString(JSON);
+printToString(Math);
+printToString(new Number(0));
+printToString({});
+printToString(/js/);
+printToString(new String(''));
+
+// check the primitives too
+printToString(false);
+printToString(3.14);
+printToString('js');
diff --git a/nashorn/test/script/basic/NASHORN-168.js.EXPECTED b/nashorn/test/script/basic/NASHORN-168.js.EXPECTED
new file mode 100644
index 00000000000..2b564afb91c
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-168.js.EXPECTED
@@ -0,0 +1,16 @@
+[object Null]
+[object Undefined]
+[object Arguments]
+[object Array]
+[object Boolean]
+[object Date]
+[object Function]
+[object JSON]
+[object Math]
+[object Number]
+[object Object]
+[object RegExp]
+[object String]
+[object Boolean]
+[object Number]
+[object String]
diff --git a/nashorn/test/script/basic/NASHORN-169.js b/nashorn/test/script/basic/NASHORN-169.js
new file mode 100644
index 00000000000..51a5b10141d
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-169.js
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-169 :  Array.prototype has 'length' property with the initial value of 0.
+ *
+ * @test
+ * @run
+ */
+
+if (Array.prototype.length != 0.0) {
+    fail("Array.prototype.length should be 0.0");
+}
diff --git a/nashorn/test/script/basic/NASHORN-172.js b/nashorn/test/script/basic/NASHORN-172.js
new file mode 100644
index 00000000000..1db2a85e761
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-172.js
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-172 :  delete of undeclared global variable returns false.
+ *
+ * @test
+ * @run
+ */
+
+if (delete x !== true) { 
+    fail('#1: delete x === true');
+}
+
+if (delete this.x !== true) { 
+    fail('#2: delete this.x === true'); 
+}
+
+var y = 23;
+if (delete y != false) {
+    fail('#3: can delete declared var y');
+}
+
+if (delete this.y != false) {
+    fail('#4: can delete declared var using this.y');
+}
+
+foo = 'hello';
+if (delete foo != true) {
+    fail('#5: can not delete "foo"');
+}
+
+if (typeof foo != 'undefined') {
+    fail('#6: huh? "foo" is not undefined');
+}
diff --git a/nashorn/test/script/basic/NASHORN-173.js b/nashorn/test/script/basic/NASHORN-173.js
new file mode 100644
index 00000000000..7c5ae8c5f87
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-173.js
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * NASHORN-173 : radix is ignored in Number.toString(radix).
+ * @test
+ * @run
+ */
+
+function printNumber(n) {
+    print(n);
+    print(n.toString(10));
+    print(n.toString(undefined));
+    print(n.toString(2));
+    print(n.toString(5));
+    print(n.toString(8));
+    print(n.toString(12));
+    print(n.toString(16));
+    print(n.toString(21));
+    print(n.toString(32));
+    print(n.toString(36));
+    try {
+      n.toString(0);
+    } catch (e) {
+      print(e.name);
+    }
+    try {
+      n.toString(37);
+    } catch (e) {
+      print(e.name);
+    }
+}
+
+printNumber(0);
+printNumber(1);
+printNumber(-10);
+printNumber(255);
+printNumber(255.5);
+printNumber(255.55);
+printNumber(4988883874234);
+printNumber(342234.2);
+printNumber(-32423423.2342);
+printNumber(837423.234765892);
+printNumber(2342344660903453345345);
+printNumber(-0.138789879520123);
+printNumber(10.5);
+printNumber(-10.22);
+printNumber(-32.44);
+printNumber(0.435235);
+printNumber(0.5);
+printNumber(5);
+printNumber(7.5);
diff --git a/nashorn/test/script/basic/NASHORN-173.js.EXPECTED b/nashorn/test/script/basic/NASHORN-173.js.EXPECTED
new file mode 100644
index 00000000000..a0781a88894
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-173.js.EXPECTED
@@ -0,0 +1,247 @@
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+RangeError
+RangeError
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+RangeError
+RangeError
+-10
+-10
+-10
+-1010
+-20
+-12
+-a
+-a
+-a
+-a
+-a
+RangeError
+RangeError
+255
+255
+255
+11111111
+2010
+377
+193
+ff
+c3
+7v
+73
+RangeError
+RangeError
+255.5
+255.5
+255.5
+11111111.1
+2010.2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222
+377.4
+193.6
+ff.8
+c3.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+7v.g
+73.i
+RangeError
+RangeError
+255.55
+255.55
+255.55
+11111111.10001100110011001100110011001100110011001101
+2010.2333333333333333333440411420102434041342101041104034013001143430224314314301310104420320003202133421100122004104230444342000330231241324044130122233321334130023440110312044001444303340044410444304021211144032141232022022424112320434100322341303404213222221310110402124214431112112332411023434014304103002212144411141131133023143003244042433323031241103240111400401413411302040044220204120404110040211000132132102021403143342312114213423444210402143320040002200103321132001414102222414121043324141144413423040212044222332333423242104332221204211320030001321441100421000433432414133023323030331302132442444300104222413131313121314202311001010442334040222122442423112344101244234204140224132411112141040321031221043334030133440131340114433001243241124424310333144231341430314413143110444143410334204034402342412420420342010044240033122330340102033421133123130423130122232323041240404343420224342114300141020244220214230001124424040140440142221414221020131130222240101204022212444110341333232431442243120203222021143041341344044221304120304224323221133101041202404211234401203104412231404322342013233241
+377.431463146314632
+193.672497249724a996835599
+ff.8cccccccccd
+c3.bbbbbbbbbbfb3eddce5086cf31jb62fjfe8c02h53ia5d3he85e29f8j5e9j81ag47hjfa84kk6d2khic3a05kg4ii75dgf3kgfbka9439dki0870efe2502ig30h04ah3eb51edcc5f7j17akh7d9hkfcd77487hgi906j20ffcfebf21f37ea658kb3930e70kdga97889ee41f7fe17h5b23j95ikd6gjc0ad32832bdf4590d31b2ahjf31g5032d9gabjkeggka51e31fc4b1275fe2074ii990814g86gkj533j3i3i6hhei22a68e7b9c6af6e5j25dk6c4jbi33hh78198ai82ffc8ga05id48be71hakg3bf8a19a7jj450h5eh1f45dche56a5k6g540j4cgch49740b8ei98hidd8b0f89c1h4idjc3d9gbd9kb60jceg5b6908d5kigd035ahekgbgh7ga52ggbf0cdg160k49i9ij4049gf5hi9ej1ig8hca822a3925gckica5cacd3hac5425j7kg8h17j7j6c7g32fd6047hjdh499ik4ibbdcd77bccff10i0dghggdgc62aea53cigkj9fj624fbhk9ab282g600j5bkd5825086j9j28d874fh1g3bf57aedjh597e7i95ib02dih1j14k76ik149hg33h14i5gec4cb582dfeac2jaeh21k16cc80dbj54iih1ja6k14g011ge6gk1db89k4f7de690fhaac9gbi07fj2835ec1d9e9h04igfd4dcd6b9dg70844a6c8eff0ci412gg0e9ddd863e8fk2dc396bhhik3jb1724i4c172b94309c8efabadj905eahj08ae68ia2e31f3id3gbfk1cc16h10ei09abi5825j7i9jcb96he0ajcjg7de877kig9jh409448kikdb0b20hc678ck8fgkcjjkc2429fgcjd5060g4f6h7744g136g3a346c47ge6b83geiea3j31fija70b81a12f3dj48dfk92268jhc08k94g46df775cciab
+7v.hj6cpj6cq
+73.jssssssstyd5yiwdkxd2t9
+RangeError
+RangeError
+4988883874234
+4988883874234
+4988883874234
+1001000100110010000101001101011000110111010
+1123214213232433414
+110462051530672
+686a6714744a
+48990a6b1ba
+65ij9h9371
+4h68adcdq
+1rnv0ndtm
+RangeError
+RangeError
+342234.2
+342234.2
+342234.2
+1010011100011011010.0011001100110011001100110011001101
+41422414.1000000000000001342010241433444114200132142432402041303144343124404314033411124402321233000412232441103142322421312040313431310141214320111032300332321314244142011033124332134441101413234130443424400441233124103312033344003342031231234004244402400103432441142213041201433143121103302113122214430000232033101142143232322031310211204324000203442332222442230234414230330201023210241014324233433022223341341403404434420441302002000143300411213113341344303444314220004113043133331123013122213114031022233034004243233324442402122203341303321120020131122443421211431014141344142303334034113430420232300030243332131321000213131132210242121302243000244143430144034410410310333414334401133412022003214041043220244020113243011340032342024231112340001321111000042220022343003001310103422110424001033133244313142444321401142214440241100304431011230002202334033340442023132032232310123314123211012140312421213202230400041202243240400441102411231034014420431143303230342223041232043023020403022240123231123103132103110311113310141431301310423222431201020424232441144221403314130421420031301430231330013043003341141
+1234332.146314631464
+146076.249724972562bb6b3
+538da.333333334
+1fk0i.44444444d97k67a746f6926cg2eckb5iibk9bbkh4be8h77i5c82e2he8ei4cg575kg9bfef8d1hjg1k4b5j0jbi6c9hf9ec274k9kb1f771d78k513i32f2453a9a3ab0g3fg52d9agcd4hkbecgd29g2k1ba6e2kdd0j45be0c4i95ak52kc33dg37aii60ck54970hfcjd3198f1hj8gc9d90bid3eid86e32h974c546dg6b0hc4f5fdc89h358gd3f7gbcecg08ech6jgdek48e4376geibcgfeji2aj0fj947h9aehd019ed69af93jd95a3jf83fe51akca0b24e5219cd76ca1d5b795e182j4e2c99hg9b329kgk1c16ff2446k1738f40ki99kk6543d3fek25fbe6acdac8d580ef1g16j7g6817fcbd64e1b98fak99116ah0jh6i685c1kffjec9b0ckb6ad85h8243ggjckfeg5gb7gee06h59ki7hejk59062c92k87d8ekchfjfgjb14775h0c7df336i3g63h9dh5i135kcbi60hiec2b8k52ki5dfd7hfi510aji48f78759d44h3g92h4dfb3k29668j8b72e2f8d608d63f73ga51c45i7g2169agi53e0jbcbeek35ah5e3gc88076657c612j29c2ih1a3c10h35ie59724gjh707h1761gigcac1d3j88909g31h46aja99jh14814h4f422cbcg174bi6f4c05h09eadek08997a7eca2ed5123ghha50i9kj87736hi82e598gc1bc0392g0338132j21hakc7d3a5ah7715651fa175e76dj72k08a4ai428fihc404h7h609b6efa90jk34c378aag183g4d85gg4g7cf0fcai83b19k2714ihhk5i8617d6jd6ddacg29haig74bbgi169i5751g3b04f4ba07e3d5i01326ia025i166j6318i07j1g176efd7e7k9jc92b251fjcaf30ki7fi9735i2hbdje4a9ba4721249d
+ae6q.6cpj6cq
+7c2i.777777841ihi1kyb9
+RangeError
+RangeError
+-32423423.2342
+-32423423.2342
+-32423423.2342
+-1111011101011110111111111.001110111111010010001
+-31300022143.1041141414142400343343342124342141443422002404311420331343043121034332120113013302202303114112140133023421311010433313022224321030130044112330044314031130144100343321412100113001124330301133342444202100010421122434042210202201004132433113333204244311104103024240321140342210022041421300324030121344242131411312002021441104031133014220123042031340323133032133342334301423334442030003033330332320110142244341301214132244301044311134413421332313401240412011031141341202123031121301021400334412010003232122440242231222213422313422210243202140233421113312332102110440331304201134233140133124441114314111014201232432324212032023003112040410430124142043300121010234010221214113223144223014004031000300432441141430132413010441301422443024430410042303330243040042104322220132441423104024103242231142241112003210134030200223101230414042240213314443023023244410124112204242433421231210234304111240434113222222333104100322402030404003404044414111332412134233114041131443204134200013002121041041022000344022230044211240203322412313332003340204304404204121024204042234203121404441301233120042444213423104320001033
+-173536777.1677221
+-aa3767b.29884555646
+-1eebdff.3bf488
+-7jf1ab.4j5j99ce458e7383fdkgh8k20fh07278fd3bgc2d0ii3ce6ece41ega2cbk0afdiee94jj8a1d9993fi8b5iii5bhkf6fhkb221jja956a3ahdef35558e68h02j1966ji2ef64jf907h234hh2354ce9d3g9ad64kba76gb7a007b28a4hc8a37ghhjj0k8k976gc213d299jc51a9bi9k9he38916f35b4113a3i7e36bfcck1e40kc2230be3g9222fkh84fe8e0j1c72gd7j02e3eb0ghk110ec1ge5a500fa8cf4gk52fia8k8c7h80fhj584j1d6b4i1fhkegkjkf24igb712165073ie9ccb83cgb16j39h40263dfd42dhi73dcd2i148kef9e5fe56413bjcbe4hea57adc521ed4aa3fifc60e1ak7ihb7hfi1f9h6j6chg63g4bg33j89377kd9gbe0kh6b2i3addi4fcc1ika38a6dgfh98g6bia1ec3ke42j03k5764a00hb94e9g90g6b10k367h55idai56ji3969hedgb9h715jb46i46jh1h2f6c0hjba4849211ace3a1jbgeii0ibe9h64a08d2fcddba0ig11j0527e7k29eadgh3d9687j237019d69hbe9i0gdd3ba5edi9b2ci4eifa9h6f4j892cgh0ei42jkc8a13170e2k82jfd3b8gb6dje8be451d70cka59if47258h7k4jki5d5dj413hi4jb64bf097ikihj1c26b08kagfbd02k6g7jag78ked4jfj8a4cg2i496aj6hb1c95e45di87da43e9j169cgb4e0944hckf4eh7bi2d35jgeea8ghdha09ddbc5d5i7e1h888227d00afkjeh4946j83i194afag8e6g4ghkddicik9g528k9cid7dfc6c3be82e84i07j80290027gg8b30173fe86kijh2i829ggae87b88kbd3e35k2fed4021782e5d6j55dfg1k3jeag0ja10992k3i3chdgi8cf6dj3dde85493d9c705
+-utffv.7fq8g
+-jay2n.8fiu2gr2j4i
+RangeError
+RangeError
+837423.234765892
+837423.234765892
+837423.234765892
+11001100011100101111.001111000001100110011110000101001
+203244143.1041331020313011020141012144343424004432324444123214111330012003020411412444130434430234014141001014030004013421431340423043243430334044344010114312304212344313122223100333121042212214144443012140012404202123102304232203144231420223022143412411110220404413330002012023342142200012143401143221103143123303203424423424402344232320322114033210421113011043103034420133011321302403444201021402240331414301404102000141340430140441203242110340313202403241214140042301311201231330432444123302124020343203214342403201201120231444423411123002433333023143423323214443143443014020333210044011442400104304044231203234101200333401233121222133144041133201333432132210142001323311322114432101141144434100300003420103423441110412224340004340431344232402000211133412443112210242413321341013234234044230020223121342231401343444343341040102343414102042211122032004420304401204024230432224422021334140402404400210142431320221023221032234212401203221312043133313002102414041014114332140004000433431341240242141010214333444444333114224331041340033441220314132301110103040040022220121420204304402313414402301142334134300341
+3143457.17014636051
+344753.29981324504a97046
+cc72f.3c199e148
+468j6.4jb3acik2k824ca6dbfaec22565g2k80733f9f806k45kee4kcia6bd9ggh968h5c94e419f2e74gg2gjc66ifa847hee53hi76a86h6f8ei123bg4j25g79bkkb6462hhci123f2hf58j2ebf31c4jig1929k02k5hc8j5a217di6812ckd4c0c97jfh14b994e13hh3c29d6731ij6i38212fj3khe6ab4g4fce6044h92hjkia5hcgje4g2hb711be5g7facc9f2hcbg3724keh09kg3g21e239h64jka8ejf5j73jf9fb3dcc1idjke9ihg4hffj997jdd732390hhjeb4040c08h7be09214a054ej7j61f01h031ck511i3i2fkje4d5926bg7fj852aejkdh560hia2a6gceij35d002g5g7g23d1iffkdbgeagdh43jfb93b35f88a11db1301cfc0je79e7ghdb65h58ki47bad490kf5bg26h87cdfk2d54fji5476d8hb133dfhhk1dbb3ce8h04kdi61h7b0093b47b715fi1dejefj95i704ad6365ebhe1a2g7iibea89d35bc1a6fg9gb05kkcgb49k15gjc6a79g04g4e12gb9c9jkdcg6kebf1ecc4507je0dh9734hk1ja69e9k95iif197igdgfch59kk2gchfiec442d7kei8dgaahg872fi0ac2i7ggk5h8b1a69fc6hdake6cjjd3bj9j03ehjic65k7hhk85ce423h1g9df3ii075907d2123kgggjb2f44ib2hgf76djke64gj979h5fh99hddc7a1fd3444dekkfj3j59fh2ji5ahagf31h7a24ddc0kd28j19kb19hb7kdhi2e07229bj4ecakb39h98df2c687kfb8i0ce92i3ided7e95i0je25275addb63cb9j3bf7f86i23fakd7d34gg5fhiceh9b1513f9c19a2037k3h9jffikg2dbh1bk2jddeij1jh3jb77343k1cc3e9hf622fj32ba0if3ie113e832hj82a59gg9
+phpf.7gcps54
+hy5r.8g98jqvgcr700ms4i
+RangeError
+RangeError
+2.3423446609034533e+21
+2.3423446609034533e+21
+2.3423446609034533e+21
+11111101111101010001111111010101101000101011011001001000000000000000000
+2224143002343343220233144213324
+375752177255053311000000
+73b92b9962990aa44400
+7efa8fead15b240000
+1d81ai80e3cf15796
+1vfl3vaq5di8000
+dqc1bgb40jcw40
+RangeError
+RangeError
+-0.138789879520123
+-0.138789879520123
+-0.138789879520123
+-0.001000111000011110111011110010011000111000000001011
+-0.0321332434424311014042334422402031444214321023400022213242301114144143134413344420443303400242303240024043410344014342403423220334422212130303123300411101233141233101431031024121444404404324321222020102433310040201042101103203021431223030313320312241214202321210202203333441321311241222243324003403310114234014423331001203123014342232004042244033303001213114434344301030121322443344321244440220243342223333300332300301023431402123244140123031203432034404131124430140121324243442201304201233444122134303114122201243020323203212023203331433204433042242442432222121012414332221304304001231410103032232034031410142301433442200443112321443311022320143141103434434312241423332110331412002024221433133133012044224211302103311444200331224131341130012303041003122412222404110330034302114441000413204120411014222440440232102230124112331130102040223242420401220143031233040404312211244411033301103012310130344024132220423204401443011330402340200030210033034134234130012204341313102300211334341231400221031023403422142232404240234033424134201412233424314433320224443122340040002230140320200132121343133402342111
+-0.10703673623070013
+-0.17b9b44394a2921a2643aa1946
+-0.2387bbc98e016
+-0.2j46kicch4ae28bi7i4a3hekb78b060iaekkbe1gafgdfe8799hg7062475f91c010eb5gghj8jab9bjjg3ch6aa36e43k5ci442c9bchcf4dej8bkeicghi7igfe7bc455jei2683g2i069254aa3ha0h7i9j14j8g24g5fi4di7961ii4f48bi11gh02a1668cg631kak99i2gi96eceea0gjc76d04jb6c0d1bjj97bjk0h1kci9gh1d6hje7kc81kd1khdg5e5217hi571206c0ah3g66c310c8402jb45gc62210d5700991kch3ffgiaj392ga98j5a5ad1ehifb3de79bgj7j6d05575d4h226ajijg052fgd616062d82cbj912545jkbekb0f596i78hd37deb4aige6ah581beg72kd7jf6a48kegk7422a55ad58kci3i08khf1hgd5c6bg9854g62d2k03i2034214h1fj1ddahk04h130a5j9dgib2d7k421g1ab0223bbage89cj9k15g6je32cj81i4c4h90gdj1cfgk09egbcd22kg7g0e2k8387553hh93b972abebhf7kd760fech0jd8bgkf2f40e9b803gk7j7i0d54dekf6e1e0d9e1644idk3ch7ih17h01abja798e194cj119160ab4b9h77c86j5ef9k7418jjija5c97kd312064c6b86d93c6ggb4h5i4e2ef118cek0bjcjdd55k1d18b45fc2ai7eb7g9f189i2267g52gc3eh8fcbd33g79ah2j6c4d268ghg6941fh8bg2d3k2gf6g5ddhc881a78hkjkick9760dc2471g0103fci341gaji196egkj2hbi34hcjhkhk1c16c5553ihef87ai164510b9h8480k5agfici9a0kf1e0fikfkihj0bige0j9jeh960hk79a09heg605e1j65hi613eh0b7gjg948k7hdfed880efhbkfcbafi4cedcgacdg05bdheje09dk9hb0chf88g8gcj0j82f9181a1kg5ije4493d1f
+-0.4e3rnice05g
+-0.4zvdpa5kudb144bi51yl6dpldi
+RangeError
+RangeError
+10.5
+10.5
+10.5
+1010.1
+20.2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222
+12.4
+a.6
+a.8
+a.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+a.g
+a.i
+RangeError
+RangeError
+-10.22
+-10.22
+-10.22
+-1010.0011100001010001111010111000010100011110101110001
+-20.1022222222222222222224003020122323033300441442220203301203144402343140242430210221111202304121331330403042243413420432141114301142321112234231230243243403034304420413041103023243301222242320410310203042422131344321000021412200213432012023330343142214331443441422020304334441242130124344031300310203021033122344414122434323234322113443422202440342102304430413104122434244432402024014012432011410002030410320143312441041304222324442210411300433042140030032330434203141212110341042404224034202123402003000013423013022223420022223301424141002413330420211223241221322243303141331100021444200213023432403144122314024134134241121031130022231213411000013302031044443224142134012040001334312210142032023331411403214324241410221101420413344123022122343020212031002144044412014234100120044343004013201212013323401121041023212443302403430014402124314212043424113420040213031230243231414102302042433031132143104204133340001111313232212030443444311440404212031424012100423413404003104400131234421420430331431213102441041312020324322313422223402123424403011331430423143114202040240231012022003422233243022320404011
+-12.16050753412172704
+-a.2781b05915343aa9902400346
+-a.3851eb851eb88
+-a.4d08h4d08h4hf45d3bg4kakgi4f0cjfh4d50h019kaki7b8i4k6a7ff23765kje1kejb7gbk6d37427b8kkgg70504h52g23jhe8b62fj40f799c818k20k3200ef465ah24g979g8bfadgja0c92kid34g5fb6ih95f740ggcj1jcaggaadf020759j4i0i4eh5b9140kig25601hee42igd58hea5hfbgee2b75j2ch560ig96e7j13hhhjc7ke85f7b6e5ik7hb63aegdd9djh9g1aik942gcaede776314272c7j1i9jb6c1ee0fi0b3fj53gfk45961jckh70c0j0a9ie54716b9bba9g356g2668k74abkejfgead0116i3i6b5f9204hhk06fic33a1aj8i88i8efh29fh0ce5j7536e52h1d1eeh445hi9h01e50jk7c2bh108kh4h9i7d9eb5hf1c7fe9cba8ehj5k6fa0e657dh3aca2774i6kk7j6i0377b8ij3dk4gbc5c485jfeeabd10kkg1f7i47cikij29eec9a3c8014g4ebc6404egbga840f950fjaa903febjg25hca14a3afh65gag2bbda62g44aif3ebcg65ad578k9b7djcbf142ee1i0k6f9i5e0ha9kgfeb21d4j03e996f3gjajghb7j3jec178k9c6jdhcj8gb27akkchgk96790g71c079kgie65k3773976ii3kb65ik40fjf993k49i1486jdhd627j55ak77gkj386e341dd3kj6d141d29kihc8447jj3739kiikb5e2493dae4279c26j2h435dkfcb927cii9d4c50hgeb9565faag9275934j8g4298jf6j0k95k5gdkfb7i2hfbh28j5c9bg429f8c5ijd3c5g619b22h64d40gd3aa56bfdkfg6k5e09f033k878fk8jek1fj3g4e52b28cbci61f77ib56e23djgai8c4578jdhhie2gadcb1h39ke2h2hk811ffcbb5afega0545hjic9ihciaf5ja79h6fie18
+-a.718un18un2
+-a.7x4bipx4bl239d7o5wh5s714i
+RangeError
+RangeError
+-32.44
+-32.44
+-32.44
+-100000.01110000101000111101011100001010001111010111
+-112.2044444444444444444434242141323034424144123224222424432033213440310401401403202322341301333013114441223321132422410233344133300310204200423420321110001144420330434322302123433133402444323342233402431212213430114210131131040422101234423301044202442412011111202322243120411340222122100042230434431402423033112113342214220220031014033003424040001030204223004322143243141442203124323411312421242422324312233320120123131143013444102121411440433412243114001324333113323001220133141423111041421224000414213341441024312123411100044441004122400111212412201330333201134223241233234440041420031001030300203120034033403322411042020202021201413102233232234044424311121034041022043423203404412414310420042222114224301230211223444430314434320144321340033204004220340402300013410144140301342014022233413442244412424343044042041241244132323404330021100244323124441220021020241020321110101024204242343441310344121403314231303411311410333220340424314234314111141411231320220311104323212431112033422244200010040134104021313011131214024144143423411202421302410401011220023224213042412204343213022342110142401044132010004
+-40.341217270243656
+-28.5343a0b62a68752a7b3853
+-20.70a3d70a3d7
+-1b.950hd950hd896ch4d4ab9id46f7da6gg005d76gaag564ekci64b145bih139jdcae3g011abbe8j77k929ba7867g5ih4027844k116ai077ji5jh006ijj7gf2kfehgah0ijch4ha89k71dbc5h57k00d1e69i7kg5ba3b3000cchcf702a05621796dj74a2k0855a19i04af8a0071c652ek5a7fh5kg0fdd2b1aj94ceii30ajdb0kbgj6kijj6h5854k3483k122h2b44j0jf5igh2fe67g59fe2iki5kfg22ag27j3e7kcg6j9a5ci9591hgicig2eck1habhc2ag81e2i197i6ggh9gdfec0ae0h1f80jkj5019b599k3aefc6482gj208kciidebe866b7eh84gadiafd9gk9dkc08i53019d6keg4bhah58509bda7390420idji4ebbkh76edc4784kg9khij840gjh8gfa7369c13bj3258463g58bjbki3h99jb129f640bc0ded54h6c54ij2ebi785c71bi7e91caj88ifei7k4c69dg367hd8h8ia0h9002jg74c7kgckha6hh1228k8339cbif6893fi10j9j8632k64k0a9jab9ibhk6i4e1eggb429465hh07c65a05g5a7hff4bkf7fabe5k7b69c42agb67igchad521b088dd6g103jb371h91b8hbiik7gb39a372432jc8e837095dfj01d061743hhh9c93fe43b1aih0f8i058323c88j090a514ca31aehid5cggjh7j2j843058h4e1j49gfj8hai1hc3g36bhfa2eg692ib0i26fdh9h010hh39fechg7fe10617hj8f2gj3d284kk2h92ic7303fdhhc21b1k5g57d515kcjhg0bge4ci5i77gdfkeji269fg34db96jg91i9h79ggbd37bd6j2dggd38ijifcace81e6acb6e86df260ei84a51agcg49ag2b43bhib95f9b6gj4bj18gfi2f617c4ji35acae8gia20d3dd
+-10.e2hte2hte
+-w.fu8n1fu8mt4kep0q30izfr
+RangeError
+RangeError
+0.435235
+0.435235
+0.435235
+0.011011110110101110001111100110110001001100010110010111
+0.2042002331344301041220203140412320301240114400312321030032133114041040142100334302144143210444241330412231341101412000422031433310121423140022103342420132431220032042211341303201430132313042414304001213201230122234413022332141014234233132324304113111042302404214401300331133124222424300222122420443413401442340023133002200020010143330420204000311104002122302211032043110124334330121333402122024024412132334110342310302133023034130131142343042020204100323331434114302144002404131404102303030203441240131212110114320012404112242434421223231130032204414411210101344312013202421211441012322110211403031222013010100020232020121302312133403443012424240120323240224403344140204200004140413421404233143233324300042042401300204220040024244013231030021424120410234321221031310233040320142340220022332201434034040242133203223241011142401040020414024034023343403233230401221403342420421121002224244222443404321103424310340003433431314324431404112320113343221102011321003314010443240141031311241040102013202143024011413244033444203220203104324111010441233002030441124131241013231313040140211402430114240420114104
+0.336656174661142627
+0.5281048b56048493b540683183
+0.6f6b8f9b13165c
+0.92jejee2ke6bagb157913kd7dbi4h8j1ka7h65433d7kbgf7hf5djb64di03g887kjf0ka9a9eh6f39ji77kjk1ik9e87fd4c5ha35h928hhhb50610e3jc4d0e42j95e1h67g664ifdk4b6d1g6fa4gicfjkebe45f22da6k9b886h2kf67kii2ghag3b7giek3bfbj69jhec2gbkbhh5jk37817hb8a13e2bi466b9ffd8e93ifhd31710gc73be4f6672j96hifh677384faj04114igeigb87bfj8f9109bb7fh7he79a8ek60cj6efc2fei2i4gg0i1kj27e2713c75a3ig25agh27ckjdee2c61f1dc16aabf4aic9j8gjh90i83h599eeg8f8beejkfhia0h25k5he7b8diji47a9g82h3a64ie002dhcb90gi95c2aadfeak12fkj0daaa0i44k292e0hg23bef5id5j383ieb96ji0kfg1j27akj62f6j6cgkfk190170c4aj3ga93afg6c6h14jga694eaaa1810k9b5i24k67dik74ca43h66i2d1h6kd0449f84e5cfhjgg9fdj3g646g2g2a1ijj4ka3ih9hgdfdihg2fbec3jjj6ckj1c7ch4eg4eje9b0bkfbghjb67f1e07e0ifkek3g36d49kc377b8bc4afibja31c6df6621f6ae38hgf821gek8bd931b2e14765bhf7bc27higb1baf8255hke85ae067k7d7gj2jb0h58kdj24e6jj7b5j14f3j58b59k57k4ffk61d08e02deb19aiaje4940d5f95bk433hcb5d37dfb1ckdkajji6i34c3ddgig528hbe5eeji5ab0ic9h4694jcj6bkei1gc0e73366fh40hc5fce47eke9483a5j7h3i2bhd041213i0hkf39ckba51hhkd3h95d2jf0ha478ei5i57dh2c5b9j3234ihe7e0g5dbkgb94khjee5ag3ha986888i278i317cbd0j274b3bjcc2e0c7j5e3k1ejd5k2575k0eh3c2
+0.dtlov6oj2pe
+0.fo2bo40bm1biel61z7tp7rpb9
+RangeError
+RangeError
+0.5
+0.5
+0.5
+0.1
+0.2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222
+0.4
+0.6
+0.8
+0.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+0.g
+0.i
+RangeError
+RangeError
+5
+5
+5
+101
+10
+5
+5
+5
+5
+5
+5
+RangeError
+RangeError
+7.5
+7.5
+7.5
+111.1
+12.2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222
+7.4
+7.6
+7.8
+7.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+7.g
+7.i
+RangeError
+RangeError
diff --git a/nashorn/test/script/basic/NASHORN-174.js b/nashorn/test/script/basic/NASHORN-174.js
new file mode 100644
index 00000000000..4483afcfa06
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-174.js
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-174 :  String.prototype.split does not work properly when separator is a string
+ *
+ * @test
+ * @run
+ */
+
+var nums = "24.45.8.78".split('.');
+
+if (nums.length != 4) {
+    fail("#1: split result expected to be of length 4");
+}
+   
+function check(index, value) {
+    if (nums[index] != value) {
+        fail("expected value @ " + index + " is " + value);
+    }
+}
+
+check(0, '24');
+check(1, '45');
+check(2, '8');
+check(3, '78');
+
diff --git a/nashorn/test/script/basic/NASHORN-175.js b/nashorn/test/script/basic/NASHORN-175.js
new file mode 100644
index 00000000000..6843e7afc92
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-175.js
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-175 :  nashorn lexer does not like if '\0' appears in source code.
+ *
+ * @test
+ * @run
+ */
+
+eval("/* This is a comment " + String.fromCharCode('\u0000') + " */");
diff --git a/nashorn/test/script/basic/NASHORN-176.js b/nashorn/test/script/basic/NASHORN-176.js
new file mode 100644
index 00000000000..410a825321f
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-176.js
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-176 :  Parser is not parse string with escaped new line.
+ *
+ * @test
+ * @run
+ */
+
+function func(str) {}
+
+func("first\
+second\
+");
+
+try {
+    func(eval("\"first\\\nsecond\\\n\n\""));
+    print("error expected!");
+} catch (e) {}
diff --git a/nashorn/test/script/basic/NASHORN-177.js b/nashorn/test/script/basic/NASHORN-177.js
new file mode 100644
index 00000000000..591c9acfec8
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-177.js
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-177 : null array elements become undefined on assignment 
+ *
+ * @test
+ * @run
+ */
+
+var n=[null];
+print(n[0]);
+
+var u=[];
+u[0] = n[0];
+print(u[0]);
+
diff --git a/nashorn/test/script/basic/NASHORN-177.js.EXPECTED b/nashorn/test/script/basic/NASHORN-177.js.EXPECTED
new file mode 100644
index 00000000000..c1e4b6c175a
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-177.js.EXPECTED
@@ -0,0 +1,2 @@
+null
+null
diff --git a/nashorn/test/script/basic/NASHORN-178.js b/nashorn/test/script/basic/NASHORN-178.js
new file mode 100644
index 00000000000..7547ce720fc
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-178.js
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-178 : arguments.length is incorrect for arguments of function called using apply()
+ *
+ * @test
+ * @run
+ */
+
+function f1() {
+    print(arguments.length);
+    for (var i=0; i < arguments.length; i++) {
+        print(' '+i+': '+arguments[i]);
+    }
+}
+
+function f2() {
+    var args = [];
+    for(var i=0; i < arguments.length; i++) {
+        args[i] = arguments[i];
+    }
+    f1.apply(this, args);
+}
+
+f2(1, 2, 3);
diff --git a/nashorn/test/script/basic/NASHORN-178.js.EXPECTED b/nashorn/test/script/basic/NASHORN-178.js.EXPECTED
new file mode 100644
index 00000000000..319f30079f6
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-178.js.EXPECTED
@@ -0,0 +1,4 @@
+3
+ 0: 1
+ 1: 2
+ 2: 3
diff --git a/nashorn/test/script/basic/NASHORN-179.js b/nashorn/test/script/basic/NASHORN-179.js
new file mode 100644
index 00000000000..df6b609d2b0
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-179.js
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-179 :  post increment/decrement does not work as expected with small values such as 0.1
+ *
+ * @test
+ * @run
+ */
+
+var x = 0.1;
+
+if (x++ !== 0.1) {
+    fail("x++ !== 0.1");
+}
+
+var y = 0.1;
+
+if (y-- !== 0.1) {
+    fail("y-- !== 0.1");
+}
diff --git a/nashorn/test/script/basic/NASHORN-18.js b/nashorn/test/script/basic/NASHORN-18.js
new file mode 100644
index 00000000000..4478d0858b0
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-18.js
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-18: try-do-with fails with VerifyError.
+ *
+ * @test
+ * @run
+ */
+var obj = {};
+
+try {
+    do {
+        with(obj) {
+            throw "abc";
+        }
+    } while(false);
+} catch(e) {
+    print(e);
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-18.js.EXPECTED b/nashorn/test/script/basic/NASHORN-18.js.EXPECTED
new file mode 100644
index 00000000000..8baef1b4abc
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-18.js.EXPECTED
@@ -0,0 +1 @@
+abc
diff --git a/nashorn/test/script/basic/NASHORN-181.js b/nashorn/test/script/basic/NASHORN-181.js
new file mode 100644
index 00000000000..d2b93c9f4a6
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-181.js
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-181 :  Object.create throws UnsupportedOperationException.
+ *
+ * @test
+ * @run
+ */
+
+var props = { foo: { } };
+
+try {
+    var obj = Object.create({}, props);
+    if (! obj.hasOwnProperty("foo")) { 
+        fail("obj does not have 'foo' property");
+    }
+} catch (e) {
+    fail("Object.create failed", e);
+}
diff --git a/nashorn/test/script/basic/NASHORN-182.js b/nashorn/test/script/basic/NASHORN-182.js
new file mode 100644
index 00000000000..b989f29632d
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-182.js
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-182 :  Array.prototype.reduce does not exit early when a getter function throws error.
+ *
+ * @test
+ * @run
+ */
+
+function callback(prev, cur, idx, obj) {
+    fail("callback with " + idx);
+}     
+
+// array-like object
+var obj = { 1: 1, 2: 2, length: 3 };
+
+Object.defineProperty(obj, "0", {
+    get: function () {
+        throw new RangeError("exception from getter for '0'");
+    },
+ });
+
+obj.reduce = Array.prototype.reduce;
+
+try {
+    obj.reduce(callback);
+    fail("should have thrown RangeError");
+} catch (ex) {
+    if (! (ex instanceof RangeError)) {
+        fail("RangeException expected, got " + ex);
+    }
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-183.js b/nashorn/test/script/basic/NASHORN-183.js
new file mode 100644
index 00000000000..2dec08e97ec
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-183.js
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-183 :  Array.prototype.reduce does not work for array-like objects
+ *
+ * @test
+ * @run
+ */
+
+function callback(acc, newVal) {
+    return acc + newVal;
+}
+
+function func() {
+    return Array.prototype.reduce.call(arguments, callback);
+}
+
+var val = func(232, 334, 454);
+if (val != (232 + 334 + 454)) {
+    fail("expecting " + (232 + 334 + 454));
+}
+
+var arr = [3, 4, 5, 6];
+var obj = Object.create(arr);
+val = Array.prototype.reduce.call(obj, callback);
+
+var val2 = 0;
+for (i in arr) {
+    val2 += arr[i];
+}
+
+if (val != val2) {
+    fail("val != val2, val2 is " + val2);
+}
diff --git a/nashorn/test/script/basic/NASHORN-184.js b/nashorn/test/script/basic/NASHORN-184.js
new file mode 100644
index 00000000000..fa37d5a1f83
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-184.js
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-184 :  Array.prototype.reduce and other generic array functions should accept strings
+ *
+ * @test
+ * @run
+ */
+
+var str = "java";
+
+function callback(acc, prev, idx) {
+    print(acc + ' ' + prev + ' ' + idx);
+    return prev;
+}
+
+Array.prototype.reduce.call(str, callback);
diff --git a/nashorn/test/script/basic/NASHORN-184.js.EXPECTED b/nashorn/test/script/basic/NASHORN-184.js.EXPECTED
new file mode 100644
index 00000000000..b37043fe3b0
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-184.js.EXPECTED
@@ -0,0 +1,3 @@
+j a 1
+a v 2
+v a 3
diff --git a/nashorn/test/script/basic/NASHORN-185.js b/nashorn/test/script/basic/NASHORN-185.js
new file mode 100644
index 00000000000..81055e0eef3
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-185.js
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-180 : RuntimeError from Array.shift
+ *
+ * @test
+ * @run
+ */
+
+
+function f() {
+  return Array.prototype.shift.apply(arguments);
+}
+
+print(f('a', 'b', 'c'));
+
diff --git a/nashorn/test/script/basic/NASHORN-185.js.EXPECTED b/nashorn/test/script/basic/NASHORN-185.js.EXPECTED
new file mode 100644
index 00000000000..78981922613
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-185.js.EXPECTED
@@ -0,0 +1 @@
+a
diff --git a/nashorn/test/script/basic/NASHORN-187.js b/nashorn/test/script/basic/NASHORN-187.js
new file mode 100644
index 00000000000..1686a012ba6
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-187.js
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-187 :  Accessor property descriptor with undefined 'set' or 'get' property results in TypeError.
+ *
+ * @test
+ * @run
+ */
+
+var obj = {};
+
+try {
+    Object.defineProperty(obj, "foo", { 
+         get: function() { return 22; }, 
+         set: undefined 
+    });
+} catch (e) {
+    fail("failed", e);
+}
+
+try {
+    Object.defineProperty(obj, "bar", { 
+        get: undefined
+    });
+} catch (e) {
+    fail("failed", e);
+}
diff --git a/nashorn/test/script/basic/NASHORN-188.js b/nashorn/test/script/basic/NASHORN-188.js
new file mode 100644
index 00000000000..9a64995ccf2
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-188.js
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * NASHORN-188 : Nashorn uses locale for Number.prototype.toPrecision()
+ *
+ * @test
+ * @run
+ */
+
+function format(value) {
+    print(value.toFixed());
+    print(value.toFixed(1));
+    print(value.toFixed(2));
+    print(value.toFixed(3));
+    print(value.toFixed(10));
+
+    print(value.toExponential());
+    print(value.toExponential(1));
+    print(value.toExponential(2));
+    print(value.toExponential(3));
+    print(value.toExponential(10));
+
+    print(value.toPrecision());
+    print(value.toPrecision(1));
+    print(value.toPrecision(2));
+    print(value.toPrecision(3));
+    print(value.toPrecision(10));
+
+    print();
+}
+
+format(0);
+format(1/10);
+format(1/12);
+format(1);
+format(123456789000);
+format(123456.123456);
+format(-1/10);
+format(-1/12);
+format(-1);
+format(-123456789000);
+format(-123456.123456);
+format(NaN);
+format(Infinity);
diff --git a/nashorn/test/script/basic/NASHORN-188.js.EXPECTED b/nashorn/test/script/basic/NASHORN-188.js.EXPECTED
new file mode 100644
index 00000000000..8bf6c01cee1
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-188.js.EXPECTED
@@ -0,0 +1,208 @@
+0
+0.0
+0.00
+0.000
+0.0000000000
+0e+0
+0.0e+0
+0.00e+0
+0.000e+0
+0.0000000000e+0
+0
+0
+0.0
+0.00
+0.000000000
+
+0
+0.1
+0.10
+0.100
+0.1000000000
+1e-1
+1.0e-1
+1.00e-1
+1.000e-1
+1.0000000000e-1
+0.1
+0.1
+0.10
+0.100
+0.1000000000
+
+0
+0.1
+0.08
+0.083
+0.0833333333
+8.333333333333333e-2
+8.3e-2
+8.33e-2
+8.333e-2
+8.3333333333e-2
+0.08333333333333333
+0.08
+0.083
+0.0833
+0.08333333333
+
+1
+1.0
+1.00
+1.000
+1.0000000000
+1e+0
+1.0e+0
+1.00e+0
+1.000e+0
+1.0000000000e+0
+1
+1
+1.0
+1.00
+1.000000000
+
+123456789000
+123456789000.0
+123456789000.00
+123456789000.000
+123456789000.0000000000
+1.23456789e+11
+1.2e+11
+1.23e+11
+1.235e+11
+1.2345678900e+11
+123456789000
+1e+11
+1.2e+11
+1.23e+11
+1.234567890e+11
+
+123456
+123456.1
+123456.12
+123456.123
+123456.1234560000
+1.23456123456e+5
+1.2e+5
+1.23e+5
+1.235e+5
+1.2345612346e+5
+123456.123456
+1e+5
+1.2e+5
+1.23e+5
+123456.1235
+
+-0
+-0.1
+-0.10
+-0.100
+-0.1000000000
+-1e-1
+-1.0e-1
+-1.00e-1
+-1.000e-1
+-1.0000000000e-1
+-0.1
+-0.1
+-0.10
+-0.100
+-0.1000000000
+
+-0
+-0.1
+-0.08
+-0.083
+-0.0833333333
+-8.333333333333333e-2
+-8.3e-2
+-8.33e-2
+-8.333e-2
+-8.3333333333e-2
+-0.08333333333333333
+-0.08
+-0.083
+-0.0833
+-0.08333333333
+
+-1
+-1.0
+-1.00
+-1.000
+-1.0000000000
+-1e+0
+-1.0e+0
+-1.00e+0
+-1.000e+0
+-1.0000000000e+0
+-1
+-1
+-1.0
+-1.00
+-1.000000000
+
+-123456789000
+-123456789000.0
+-123456789000.00
+-123456789000.000
+-123456789000.0000000000
+-1.23456789e+11
+-1.2e+11
+-1.23e+11
+-1.235e+11
+-1.2345678900e+11
+-123456789000
+-1e+11
+-1.2e+11
+-1.23e+11
+-1.234567890e+11
+
+-123456
+-123456.1
+-123456.12
+-123456.123
+-123456.1234560000
+-1.23456123456e+5
+-1.2e+5
+-1.23e+5
+-1.235e+5
+-1.2345612346e+5
+-123456.123456
+-1e+5
+-1.2e+5
+-1.23e+5
+-123456.1235
+
+NaN
+NaN
+NaN
+NaN
+NaN
+NaN
+NaN
+NaN
+NaN
+NaN
+NaN
+NaN
+NaN
+NaN
+NaN
+
+Infinity
+Infinity
+Infinity
+Infinity
+Infinity
+Infinity
+Infinity
+Infinity
+Infinity
+Infinity
+Infinity
+Infinity
+Infinity
+Infinity
+Infinity
+
diff --git a/nashorn/test/script/basic/NASHORN-19.js b/nashorn/test/script/basic/NASHORN-19.js
new file mode 100644
index 00000000000..f45df164ebd
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-19.js
@@ -0,0 +1,279 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-19:  with blocks in various scopes and breaking from them if they are inloops
+ * (also continues)
+ *
+ * @test
+ * @run
+ */
+
+
+var myvalue = "hello";
+
+var myscope = {
+    myvalue: 11
+};
+
+do {
+    with(myscope) {
+	myvalue = 12;
+	break;
+    }
+} while (false);
+
+if (myvalue != 'hello') {
+    throw "expecting to be hello";
+} else {
+    print("value is 'hello' as expected");
+}
+
+print("\n");
+
+function ten() {
+    return 0xa;
+}
+
+//make sure the scope works outside functions too
+print("starting 0");
+var value = "hello";
+var scope = {value:10};
+var scope2 = {value:20};
+while (true) {
+    with (scope) {
+	print(value);
+	value = 11;
+	print(value);
+	with (scope2) {
+	    print(value);
+	    value = 21;
+	    print(value);
+	    break;
+	}
+    }
+}
+
+print(value);
+print("\n");
+
+//two level scope
+function test1() {
+    var value = "hello";
+    var scope = {value:10};
+    var scope2 = {value:20};
+    while (true) {
+	with (scope) {
+	    print(value);
+	    value = 11;
+	    print(value);
+	    with (scope2) {
+		print(value);
+		value = 21;
+		print(value);
+		break;
+	    }
+	}
+    }
+    
+    print(value);
+}
+
+//one level scope
+function test2() {
+    var value = "hello";
+    var scope = {value:10};
+    while (true) {
+	with (scope) {
+	    print(value);
+	    value = 11;
+	    print(value);
+	    if (value > ten()) {
+		break;
+	    }
+	}
+    }
+    print(value);
+}
+
+//continue two levels
+function test3() {
+    var value = "hello";
+    var scope = {value:10};
+    var scope2 = {value:20};
+    var outer = 0;
+    while (outer < 5) {
+	var i=0;
+	while (i < 10) {
+	    with(scope) {
+		print("loop header "+i);
+		with (scope2) {
+		    value = 11;
+		    i++;
+		    if ((i & 1) != 0) {
+			print("continue");
+			continue;
+		    }
+		}
+	    }
+	    print(value);
+	}
+	outer++;
+    }
+} 
+
+//continue one level
+function test4() {
+    var value = "hello";
+    var scope = {value:10};
+    var i=0;
+    while (i < 10) {
+	print("loop header "+i);
+	with (scope) {
+	    value = 11;
+	    i++;
+	    if ((i & 1) != 0) {
+		print("continue");
+		continue;
+	    }
+	}
+    }
+    print(value);
+}
+
+
+//labelled continue;
+function test5() {
+    var value = "hello";
+    var scope = {value:10};
+    var scope2 = {value:20};
+    var outer = 0;
+    outer_label:
+    while (outer < 5) {
+	var i=0;
+	while (i < 10) {
+	    with(scope) {
+		print("loop header "+i);
+		with (scope2) {
+		    value = 11;
+		    i++;
+		    if ((i & 1) != 0) {
+			print("continue");
+			outer++;
+			continue outer_label;
+		    }
+		}
+	    }
+	    print(value);
+	}
+    }
+} 
+
+//labelled break
+function test6() {
+    var value = "hello";
+    var scope = {value:10};
+    var scope2 = {value:20};
+    outer:
+    {
+	var i=0;
+	while (i < 10) {
+	    with(scope) {
+		print("loop header "+i);
+		with (scope2) {
+		    value = 11;
+		    i++;
+		    if ((i & 1) != 0) {
+			print("break");
+			break outer;
+		    }
+		}
+	    }
+	    print(value);
+	}
+    }
+}
+
+//exceptions in one scope and then the other
+function test7() {
+    var value = "hello";
+    var scope = {value:10};
+    var scope2 = {value:20};    
+    var global = false;
+    try {
+	with(scope) {
+	    try {
+		print(value);
+		value = 4711;
+		print(value);
+		with(scope2) {
+		    print(value);
+		    value = 17;
+		    print(value);
+		    global = true;
+		    throw "inner";
+		}
+	    } catch (ei) {
+		print(ei);
+		print(value);
+		if (global) {
+		    throw "outer";
+		}
+	    }
+	}
+    } catch (eo) {
+	print(eo);
+	print(value);
+    }
+    print(value);
+}
+
+
+print("starting 1");
+test1();
+print("\n");
+
+print("starting 2");
+test2();
+print("\n");
+
+print("starting 3");
+test3();
+print("\n");
+
+print("starting 4");
+test4();
+print("\n");
+
+print("starting 5");
+test5();
+print("\n");
+
+print("starting 6");
+test6();
+print("\n");
+
+print("starting 7");
+test7();
+print("\n");
+
diff --git a/nashorn/test/script/basic/NASHORN-19.js.EXPECTED b/nashorn/test/script/basic/NASHORN-19.js.EXPECTED
new file mode 100644
index 00000000000..ce3aca109e5
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-19.js.EXPECTED
@@ -0,0 +1,177 @@
+value is 'hello' as expected
+
+
+starting 0
+10
+11
+20
+21
+hello
+
+
+starting 1
+10
+11
+20
+21
+hello
+
+
+starting 2
+10
+11
+hello
+
+
+starting 3
+loop header 0
+continue
+loop header 1
+hello
+loop header 2
+continue
+loop header 3
+hello
+loop header 4
+continue
+loop header 5
+hello
+loop header 6
+continue
+loop header 7
+hello
+loop header 8
+continue
+loop header 9
+hello
+loop header 0
+continue
+loop header 1
+hello
+loop header 2
+continue
+loop header 3
+hello
+loop header 4
+continue
+loop header 5
+hello
+loop header 6
+continue
+loop header 7
+hello
+loop header 8
+continue
+loop header 9
+hello
+loop header 0
+continue
+loop header 1
+hello
+loop header 2
+continue
+loop header 3
+hello
+loop header 4
+continue
+loop header 5
+hello
+loop header 6
+continue
+loop header 7
+hello
+loop header 8
+continue
+loop header 9
+hello
+loop header 0
+continue
+loop header 1
+hello
+loop header 2
+continue
+loop header 3
+hello
+loop header 4
+continue
+loop header 5
+hello
+loop header 6
+continue
+loop header 7
+hello
+loop header 8
+continue
+loop header 9
+hello
+loop header 0
+continue
+loop header 1
+hello
+loop header 2
+continue
+loop header 3
+hello
+loop header 4
+continue
+loop header 5
+hello
+loop header 6
+continue
+loop header 7
+hello
+loop header 8
+continue
+loop header 9
+hello
+
+
+starting 4
+loop header 0
+continue
+loop header 1
+loop header 2
+continue
+loop header 3
+loop header 4
+continue
+loop header 5
+loop header 6
+continue
+loop header 7
+loop header 8
+continue
+loop header 9
+hello
+
+
+starting 5
+loop header 0
+continue
+loop header 0
+continue
+loop header 0
+continue
+loop header 0
+continue
+loop header 0
+continue
+
+
+starting 6
+loop header 0
+break
+
+
+starting 7
+10
+4711
+20
+17
+inner
+4711
+outer
+hello
+hello
+
+
diff --git a/nashorn/test/script/basic/NASHORN-190.js b/nashorn/test/script/basic/NASHORN-190.js
new file mode 100644
index 00000000000..5d1157c6b8b
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-190.js
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-190 :  Object property keys should be Strings
+ *
+ * @test
+ * @run
+ */
+
+var obj = { 
+    20: 'world', "2.3": 'hello'
+};
+
+obj[true] = 30;
+obj[null] = 'java';
+obj[undefined] = 'js';
+
+if (obj[20] !== 'world') {
+    fail("obj[20] !== 'world'");
+}
+
+if (obj['20'] !== 'world') {
+    fail("obj['20'] !== 'world'");
+}
+
+if (obj[2.3] !== 'hello') {
+    fail("obj[2.3] !== 'hello'");
+}
+
+if (obj['2.3'] !== 'hello') {
+    fail("obj['2.3'] !== 'hello'");
+}
+
+if (obj[true] !== 30) {
+    fail("obj[true] !== 30");
+}
+
+if (obj['true'] !== 30) {
+    fail("obj['true'] !== 30");
+}
+
+if (obj[null] !== 'java') {
+    fail("obj[null] !== 'java'");
+}
+
+if (obj['null'] !== 'java') {
+    fail("obj['null'] !== 'java'");
+}
+
+if (obj[undefined] !== 'js') {
+    fail("obj[undefined] !== 'js'");
+}
+
+if (obj['undefined'] !== 'js') {
+    fail("obj['undefined'] !== 'js'");
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-192.js b/nashorn/test/script/basic/NASHORN-192.js
new file mode 100644
index 00000000000..7f1f87c7480
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-192.js
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-192 :  User defined property setter or getter with extra arguments or lesser argument fails by throwing exception
+ * 
+ * @test
+ * @run
+ */
+
+var obj = {};
+Object.defineProperty(obj, "foo", {
+    get: function(obj) {
+        return 'hello';
+    }
+});
+
+try {
+    if (obj.foo !== 'hello') {
+        fail("getter with extra argument does not work");
+    }
+} catch (e) {
+    fail("failed to get with " + e);
+}
+
+Object.defineProperty(obj, "bar", {
+    set: function() {
+        // do nothing
+    }
+});
+
+try {
+    obj.bar = 33;
+} catch (e) {
+    fail("failed to set with " + e);
+}
+
+Object.defineProperty(obj, "prop", {
+    set: function(obj1, obj2, obj3) {
+        this.val = obj1;
+    }
+}); 
+
+try {
+    obj.prop = 33;
+    if (obj.val !== 33) {
+        fail("set with extra argument does not work");
+    }
+} catch (e) {
+    fail("failed to set with " + e);
+}
diff --git a/nashorn/test/script/basic/NASHORN-194.js b/nashorn/test/script/basic/NASHORN-194.js
new file mode 100644
index 00000000000..2615d1c30c8
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-194.js
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-194 :  VM crash with SIGSERV executing S15.3.4.3_A5_T1.js
+ *
+ * @test
+ * @run
+ */
+
+var obj = "hello";
+obj.foo = "world";
+if (obj.foo !== undefined) {
+    fail("obj.foo should be undefined");
+}
+
+obj = 445;
+obj.foo = 42;
+if (obj.foo !== undefined) {
+    fail("obj.foo should be undefined");
+}
+
+obj = true;
+obj.foo = 34;
+if (obj.foo !== undefined) {
+    fail("obj.foo should be undefined");
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-196.js b/nashorn/test/script/basic/NASHORN-196.js
new file mode 100644
index 00000000000..ce92f6de77e
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-196.js
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-196 :  RangeError thrown when array length is set to -0.0
+ *
+ * @test
+ * @run
+ */
+
+var arr = [0, 1];
+
+Object.defineProperty(arr, "length", {
+    value: -0
+});
+        
+if (arr.length !== 0) {
+    fail("array length is not zero!");
+}
diff --git a/nashorn/test/script/basic/NASHORN-198.js b/nashorn/test/script/basic/NASHORN-198.js
new file mode 100644
index 00000000000..a2df804af25
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-198.js
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-198 :  JSON.parse does not handle empty arrays property
+ *
+ * @test
+ * @run
+ */
+
+var x = JSON.parse('{"foo":[]}');
+
+if (! (x.foo instanceof Array)) {
+    fail("x.foo should be an Array");
+}
+
+if (x.foo.length !== 0) {
+    fail("x.foo.length should be zero");
+}
diff --git a/nashorn/test/script/basic/NASHORN-20.js b/nashorn/test/script/basic/NASHORN-20.js
new file mode 100644
index 00000000000..c2a09359e80
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-20.js
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-20:  typeof of undefined variable should not result in ReferenceError.
+ *
+ * @test
+ * @run
+ */
+
+if (typeof abc == 'undefined') {
+   print("yes, typeof 'abc' is undefined as expected");
+}
diff --git a/nashorn/test/script/basic/NASHORN-20.js.EXPECTED b/nashorn/test/script/basic/NASHORN-20.js.EXPECTED
new file mode 100644
index 00000000000..457a9010879
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-20.js.EXPECTED
@@ -0,0 +1 @@
+yes, typeof 'abc' is undefined as expected
diff --git a/nashorn/test/script/basic/NASHORN-201.js b/nashorn/test/script/basic/NASHORN-201.js
new file mode 100644
index 00000000000..92e8ad08126
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-201.js
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-201:  Date constructors does not work properly when a single String argument is passed.
+ *
+ * @test
+ * @run
+ */
+
+var expected = "1970-01-01T00:00:00.000Z";
+var d = new Date("1970");
+var str = d.toISOString();
+if (expected !== str) {
+    throw new Error("expected " + expected + ", got " + str);
+}
diff --git a/nashorn/test/script/basic/NASHORN-202.js b/nashorn/test/script/basic/NASHORN-202.js
new file mode 100644
index 00000000000..521c3544b4b
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-202.js
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-202 :  Date.prototype.toJSON should accept one (unused) argument
+ *
+ * @test
+ * @run
+ */
+
+if (Date.prototype.toJSON.length !== 1) {
+    throw new Error("Date.prototype.toJSON.length !== 1");
+}
diff --git a/nashorn/test/script/basic/NASHORN-203.js b/nashorn/test/script/basic/NASHORN-203.js
new file mode 100644
index 00000000000..4d626b9d22b
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-203.js
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-203:  Date.prototype.toISOString should throw RangeError on invalid date.
+ *
+ * @test
+ * @run
+ */
+
+var date = new Date(-Infinity, Infinity);
+
+try {
+    date.toISOString();
+    fail("toISOString should have thrown RangeError");
+} catch (ex) {
+    if (! (ex instanceof RangeError)) {
+        fail("expected RangeError but got " + ex);
+    }
+}
diff --git a/nashorn/test/script/basic/NASHORN-204.js b/nashorn/test/script/basic/NASHORN-204.js
new file mode 100644
index 00000000000..3a1c5340c0b
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-204.js
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-204 :  Adding two empty arrays should result in empty String but nashorn gives NaN
+ *
+ * @test
+ * @run
+ */
+
+if ([] + [] !== '') {
+    fail("[] + [] is not empty string");
+}
+
+// other related checks
+if ({} + {} !== '[object Object][object Object]') {
+    fail("{} + {} is not [object Object][object Object]");
+}
+
+if ({} + [] !== '[object Object]') {
+    fail("{} + [] is not [object Object]");
+}
+
+if ([] + {} !== '[object Object]') {
+    fail("[] + {} is not [object Object]");
+}
diff --git a/nashorn/test/script/basic/NASHORN-205.js b/nashorn/test/script/basic/NASHORN-205.js
new file mode 100644
index 00000000000..af36c7d2008
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-205.js
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-205 :  Cannot convert read-only accessor property into a data property with a new value
+ *
+ * @test
+ * @run
+ */
+
+var obj = {};
+
+Object.defineProperty(obj, "foo", {
+    get: function() { return 23; },
+    set: undefined,
+    enumerable: true,
+    configurable: true
+});
+
+var desc = Object.getOwnPropertyDescriptor(obj, "foo");
+if (! desc.hasOwnProperty("get")) {
+    fail("'get' missing!!");
+}
+
+if (obj.foo !== 23) {
+    fail("obj.foo !== 23");
+}
+
+try {
+    // modify to use "value" property
+    Object.defineProperty(obj, "foo", {
+        value: 100
+    });
+} catch (e) {
+    fail("failed", e);
+}
+  
+var newDesc = Object.getOwnPropertyDescriptor(obj, "foo");
+if (! newDesc.hasOwnProperty("value")) {
+    fail("'value' missing!!");
+}
+
+if (obj.foo !== 100) {
+    fail("obj.foo !== 100");
+}
diff --git a/nashorn/test/script/basic/NASHORN-206.js b/nashorn/test/script/basic/NASHORN-206.js
new file mode 100644
index 00000000000..ebcf8311f35
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-206.js
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-206 : Trailing extra characters are ignored by parser/lexer.
+ *
+ * @test
+ * @run
+ */
+
+try {
+    eval("print('hello');\n} } ) )");
+    fail("should have thrown SyntaxError");
+} catch (e) {
+    if (! (e instanceof SyntaxError)) {
+        fail("expected SyntaxError but got " + e);
+    }
+}
diff --git a/nashorn/test/script/basic/NASHORN-207.js b/nashorn/test/script/basic/NASHORN-207.js
new file mode 100644
index 00000000000..4a2f3bdc926
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-207.js
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-207 : implement strict mode
+ *
+ * @test
+ * @run
+ */
+
+'use strict';
+
+// cannot delete a variable
+try {
+    eval("var fooVar = 3; delete fooVar;");
+    fail("#1 should have thrown SyntaxError");
+} catch (e) {
+    if (! (e instanceof SyntaxError)) {
+        fail("#2 SyntaxError expected but got " + e);
+    } 
+}
+
+// cannot delete function parameter variable
+try {
+    eval("function func(a) { delete a; }; func(2);");
+    fail("#3 should have thrown SyntaxError");
+} catch(e) {
+    if (! (e instanceof SyntaxError)) {
+        fail("#4 SyntaxError expected but got " + e);
+    } 
+}
+
+// assignment can't be used to define as new variable
+try {
+    bar = 3;
+    fail("#5 should have thrown ReferenceError");
+} catch (e) {
+    if (! (e instanceof ReferenceError)) {
+        fail("#6 ReferenceError expected but got " + e);
+    }
+}
+
+// repeated property definition is not allowed in an object literal
+try {
+    eval("var obj = { foo: 33, foo: 44 }");
+    fail("#7 should have thrown SyntaxError");
+} catch(e) {
+    if (! (e instanceof SyntaxError)) {
+        fail("#8 SyntaxError expected but got " + e);
+    }
+}
+
+// can't assign to "eval"
+try {
+    eval("var eval = 3");
+    fail("#9 should have thrown SyntaxError");
+} catch(e) {
+    if (! (e instanceof SyntaxError)) {
+        fail("#10 SyntaxError expected but got " + e);
+    }
+}
+
+// can't assign to 'arguments'
+try {
+    eval("function func() { arguments = 34; }");
+    fail("#11 should have thrown SyntaxError");
+} catch(e) {
+    if (! (e instanceof SyntaxError)) {
+        fail("#12 SyntaxError expected but got " + e);
+    }
+}
+
+// can't delete non-configurable properties
+try {
+    delete Object.prototype;
+    fail("#13 should have thrown TypeError");
+} catch (e) {
+    if (! (e instanceof TypeError)) {
+        fail("#14 TypeError expected but got " + e);
+    }
+}
+
+// cannot re-use function parameter name
+try {
+    eval("function func(a, a) {}");
+    fail("#15 should have thrown SyntaxError");
+} catch (e) {
+    if (! (e instanceof SyntaxError)) {
+        fail("#16 SyntaxError expected but got " + e);
+    }
+}
+
+// strict eval creates own scope and caller's scope is untouched!
+eval("var myVar = 4;");
+if (typeof myVar !== 'undefined') {
+    fail("#17 eval var 'myVar' created in global scope");
+}
+
+eval("function myNewFunc() {}");
+if (typeof myNewFunc !== 'undefined') {
+    fail("#18 eval function 'myNewFunc' created in global scope");
+}
+
+// no octal in strict mode
+try {
+    eval("var x = 010;");
+    fail("#19 should have thrown SyntaxError");
+} catch (e) {
+    if (! (e instanceof SyntaxError)) {
+        fail("#20 SyntaxError expected but got " + e);
+    }
+}
diff --git a/nashorn/test/script/basic/NASHORN-207_2.js b/nashorn/test/script/basic/NASHORN-207_2.js
new file mode 100644
index 00000000000..af8e8dcd295
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-207_2.js
@@ -0,0 +1,237 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-207 : Implement strict mode.
+ *
+ * @test
+ * @run
+ */
+
+// make sure that 'use strict' as first directive inside eval
+// also works the same way (as eval called from strict mode caller).
+
+try {
+    eval("'use strict'; foo = 4;");
+    fail("#1 should have thrown ReferenceError");
+} catch (e) {
+    if (! (e instanceof ReferenceError)) {
+        fail("#2 expected ReferenceError but got " + e);
+    }
+}
+
+if (typeof foo !== 'undefined') {
+    fail("#3 strict mode eval defined var in global scope!");
+}
+
+try {
+    eval("'use strict'; var let = 23;");
+    fail("#4 should have thrown SyntaxError");
+} catch (e) {
+    if (! (e instanceof SyntaxError)) {
+        fail("#5 SyntaxError expected but got " + e);
+    }
+}
+
+// non-strict mode, some of the future reserved words can be used
+// as identifiers. These include "let", "implements", "yield" etc.
+var let = 30;
+var implements = "hello";
+function yield() {}
+function public() {}
+var private = false;
+var protected = "hello";
+var interface = "interface";
+function f(package) {}
+function static() {}
+
+// in strict mode, arguments does not alias named access
+function func(x, y) {
+    'use strict';
+
+    if (x !== arguments[0]) {
+        fail("#6 arguments[0] !== x");
+    }
+
+    if (y !== arguments[1]) {
+        fail("#7 arguments[1] !== y");
+    }
+
+    arguments[0] = 1;
+    arguments[1] = 2;
+
+    if (x === arguments[0]) {
+        fail("#8 arguments[0] === x after assignment to it");
+    }
+
+    if (y === arguments[1]) {
+        fail("#9 arguments[1] === y after assignment to it ");
+    }
+}
+
+func();
+
+// functions can not be declared everywhere!!
+try {
+    eval("'use strict'; if (true) { function func() {} }");
+    fail("#10 should have thrown SyntaxError");
+} catch (e) {
+    if (! (e instanceof SyntaxError)) {
+        fail("#11 SyntaxError expected got " + e);
+    }
+}
+
+// arguments.caller and arguments.callee can't read or written in strict mode
+function func2() {
+    'use strict';
+
+    try {
+        print(arguments.callee);
+        fail("#12 arguments.callee should have thrown TypeError");
+    } catch (e) {
+        if (! (e instanceof TypeError)) {
+            fail("#13 TypeError expected, got " + e);
+        }
+    }
+
+    try {
+        print(arguments.caller);
+        fail("#14 arguments.caller should have thrown TypeError");
+    } catch (e) {
+        if (! (e instanceof TypeError)) {
+            fail("#15 TypeError expected, got " + e);
+        }
+    }
+
+    try {
+        arguments.caller = 10;
+        fail("#16 arguments.caller assign should have thrown TypeError");
+    } catch (e) {
+        if (! (e instanceof TypeError)) {
+            fail("#17 TypeError expected, got " + e);
+        }
+    }
+
+    try {
+        arguments.callee = true;
+        fail("#18 arguments.callee assign should have thrown TypeError");
+    } catch (e) {
+        if (! (e instanceof TypeError)) {
+            fail("#19 TypeError expected, got " + e);
+        }
+    }
+}
+
+func2();
+
+// func.caller and func.arguments can't read or written in strict mode
+function func3() {
+    'use strict';
+
+    try {
+        print(func3.arguments);
+        fail("#20 func.arguments should have thrown TypeError");
+    } catch (e) {
+        if (! (e instanceof TypeError)) {
+            fail("#21 TypeError expected, got " + e);
+        }
+    }
+
+    try {
+        print(func3.caller);
+        fail("#22 func3.caller should have thrown TypeError");
+    } catch (e) {
+        if (! (e instanceof TypeError)) {
+            fail("#23 TypeError expected, got " + e);
+        }
+    }
+
+    try {
+        func3.arguments = 10;
+        fail("#24 func3.arguments assign should have thrown TypeError");
+    } catch (e) {
+        if (! (e instanceof TypeError)) {
+            fail("#25 TypeError expected, got " + e);
+        }
+    }
+
+    try {
+        func3.caller = true;
+        fail("#26 func3.caller assign should have thrown TypeError");
+    } catch (e) {
+        if (! (e instanceof TypeError)) {
+            fail("#27 TypeError expected, got " + e);
+        }
+    }
+}
+
+func3();
+
+try {
+    eval("function eval() { 'use strict'; }");
+    fail("#28 should have thrown SyntaxError");
+} catch (e) {
+    if (! (e instanceof SyntaxError)) {
+        fail("#29 SyntaxError expected, got " + e);
+    }
+}
+
+function func4() {
+  'use \
+strict';
+
+    // The use strict directive can't contain line continuation.
+    // So this is not a strict mode function!!
+    with({}) {}
+}
+
+func4();
+
+function func5() {
+   'use\u2028strict';
+
+    // The use strict directive can't contain unicode whitespace escapes
+    // So this is not a strict mode function!!
+    with({}) {}
+}
+
+func5();
+
+function func6() {
+   'use\u2029strict';
+
+    // The use strict directive can't contain unicode whitespace escapes
+    // So this is not a strict mode function!!
+    with({}) {}
+}
+
+func6();
+
+try {
+    eval("'bogus directive'; 'use strict'; eval = 10");
+    fail("#30 SyntaxError expected from eval");
+} catch (e) {
+    if (! (e instanceof SyntaxError)) {
+        fail("#31 SyntaxError expected but got " + e);
+    }
+}
diff --git a/nashorn/test/script/basic/NASHORN-208.js b/nashorn/test/script/basic/NASHORN-208.js
new file mode 100644
index 00000000000..6e2c78af033
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-208.js
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-208  
+ *
+ * @test
+ * @run
+ */
+
+var inspect = function(x) { return x; }
+
+var formatRegExp = /%[sdj%]/g;
+
+var format = function(f) {
+  if (typeof f !== 'string') {
+    var objects = [];
+    for (var i = 0; i < arguments.length; i++) {
+      objects.push(inspect(arguments[i]));
+    }
+    return objects.join(' ');
+  }
+
+  var i = 1;
+  var args = arguments;
+  var len = args.length;
+  var str = String(f).replace(formatRegExp, function(x) {
+    if (i >= len) return x;
+    switch (x) {
+      case '%s': return String(args[i++]);
+      case '%d': return Number(args[i++]);
+      case '%j': return JSON.stringify(args[i++]);
+      case '%%': return '%';
+      default:
+        return x;
+    }
+  });
+  for (var x = args[i]; i < len; x = args[++i]) {
+    if (x === null || typeof x !== 'object') {
+      str += ' ' + x;
+    } else {
+      str += ' ' + inspect(x);
+    }
+  }
+  return str;
+};
+
+var s = format('%s %s', 'foo', 'bar', 'hop');
+print(s);
+
diff --git a/nashorn/test/script/basic/NASHORN-208.js.EXPECTED b/nashorn/test/script/basic/NASHORN-208.js.EXPECTED
new file mode 100644
index 00000000000..89a9f681392
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-208.js.EXPECTED
@@ -0,0 +1 @@
+foo bar hop
diff --git a/nashorn/test/script/basic/NASHORN-209.js b/nashorn/test/script/basic/NASHORN-209.js
new file mode 100644
index 00000000000..0cfcf6a7123
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-209.js
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-209 :  IdentifierName is different from Identifier as per spec.
+ *
+ * @test
+ * @run
+ */
+
+var obj  = { 
+    in: 11, class: 'hello', try: false, 
+    typeof: 456, instanceof: 'world',
+    catch: function() { print("catch called"); }
+};
+
+print("obj.in = " + obj.in);
+print("obj.class = " + obj.class);
+print("obj.try = " + obj.try);
+print("obj.typeof = " + obj.typeof);
+print("obj.instanceof = " + obj.instanceof);
+obj.catch();
diff --git a/nashorn/test/script/basic/NASHORN-209.js.EXPECTED b/nashorn/test/script/basic/NASHORN-209.js.EXPECTED
new file mode 100644
index 00000000000..def58d3b52f
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-209.js.EXPECTED
@@ -0,0 +1,6 @@
+obj.in = 11
+obj.class = hello
+obj.try = false
+obj.typeof = 456
+obj.instanceof = world
+catch called
diff --git a/nashorn/test/script/basic/NASHORN-21.js b/nashorn/test/script/basic/NASHORN-21.js
new file mode 100644
index 00000000000..106c19a7537
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-21.js
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-21: changed, but deleted function argument can not be returned as result
+ *
+ * @test
+ * @run
+ */
+
+function func(arg){
+    arg++;
+    delete arguments[0];
+    if (arguments[0] !== undefined) {
+        print("ERROR: arguments[0] should be undefined");
+    } else {
+        print("yes, arguments[0] is undefined");
+    }
+    return arg;
+}
+
+if (func(1) !== 2) {
+    print("ERROR: func should have returned 2");
+} else {
+    print("yes, function returned 2");
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-21.js.EXPECTED b/nashorn/test/script/basic/NASHORN-21.js.EXPECTED
new file mode 100644
index 00000000000..a4c8b1df477
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-21.js.EXPECTED
@@ -0,0 +1,2 @@
+yes, arguments[0] is undefined
+yes, function returned 2
diff --git a/nashorn/test/script/basic/NASHORN-211.js b/nashorn/test/script/basic/NASHORN-211.js
new file mode 100644
index 00000000000..a24e32821e0
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-211.js
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-211 :  Comparison operators > and <= are not ECMA edition 5.1 compliant
+ *
+ * @test
+ * @run
+ */
+
+var x = { valueOf: function() { throw "x"; } };
+var y = { valueOf: function() { throw "y"; } };
+
+try {
+    x > y;
+    fail("expected exception with x > y");
+} catch (e) {
+    if (e !== 'x') {
+        fail("'x' expected to be thrown with x > y");
+    }
+}
+
+try {
+    x <= y;
+    fail("expected exception with x <= y");
+} catch (e) {
+    if (e !== 'x') {
+        fail("'x' expected to be thrown with x <= y");
+    }
+}
diff --git a/nashorn/test/script/basic/NASHORN-212.js b/nashorn/test/script/basic/NASHORN-212.js
new file mode 100644
index 00000000000..9e3287d43d3
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-212.js
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-212 :  Object literal property redefinition restrictions are not implemented
+ *
+ * @test
+ * @run
+ */
+
+try {
+    eval("obj = { x : 3, get x() { return 42; }");
+    fail("data property redefined as accessor");
+} catch (e) {
+    if (! (e instanceof SyntaxError)) {
+        fail("SyntaxError expected got " + e);
+    }
+}
+
+try {
+    eval("obj = { get x() { return 42; }, x: 'hello'");
+    fail("accessor property redefined as data");
+} catch (e) {
+    if (! (e instanceof SyntaxError)) {
+        fail("SyntaxError expected got " + e);
+    }
+}
+
+try {
+    eval("obj = { get x() { return 42; }, get x() { return 'hello' }");
+    fail("accessor property redefined with different getter");
+} catch (e) {
+    if (! (e instanceof SyntaxError)) {
+        fail("SyntaxError expected got " + e);
+    }
+}
+
+try {
+    eval("obj = { set x(val) { }, set x(val) { }");
+    fail("accessor property redefined with different setter");
+} catch (e) {
+    if (! (e instanceof SyntaxError)) {
+        fail("SyntaxError expected got " + e);
+    }
+}
+
+// data redefinition is fine
+obj = { x: 44, x: 'hello' };
+
+// can define getter and setter
+obj = { get x() { return 3; }, set x(val) {} };
+
diff --git a/nashorn/test/script/basic/NASHORN-213.js b/nashorn/test/script/basic/NASHORN-213.js
new file mode 100644
index 00000000000..24e2440d2ec
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-213.js
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-213 :  double valued array indices don't work as expected
+ *
+ * @test
+ * @run
+ */
+
+var x = [];
+x[1.1] = 33;
+
+if (x[1.1] !== 33) {
+    fail("x[1.1] !== 33");
+}
+
+if (x[1] === 33) {
+    fail("x[1] === 33");
+}
diff --git a/nashorn/test/script/basic/NASHORN-215.js b/nashorn/test/script/basic/NASHORN-215.js
new file mode 100644
index 00000000000..d09e751af1b
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-215.js
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-215 : Exception parameter should be local to the catch block.
+ *
+ * @test
+ * @run
+ */
+
+var exp = new Error("Error!");
+try {
+   throw exp;
+} catch (e) {
+   print("1 " + e.message);
+   try {
+      throw new Error("Nested error");
+   } catch (e) {
+      print("2 " + e.message);
+   }
+   print("3 " + e.message);
+};
+
+try {
+   print(e);
+   print("should not reach here");
+} catch (e1) {
+   print("4 success");
+}
+
+function f() {
+    var x = 4;
+    try {
+       throw exp;
+    } catch (e) {
+       print("5 " + e.message);
+       (function() {
+           try {
+              throw new Error("Nested error.");
+           } catch (e) {
+              try {
+                print("6 " + e.message);
+                throw new Error("error in catch");
+              } catch (e) {
+                 print("7 " + e.message);
+              }
+              (function() { print("8 " + e.message); })();
+              print("9 " + e.message);
+           }
+          print("a " + e.message);
+       })();
+       print("b " + e.message);
+    };
+    return function() { return x; }();
+}
+f();
+
+try {
+  throw "asdf1";
+} catch (ex) {
+  (function() {
+    var o = {};
+    with (o) {
+      print(ex);
+    }
+  })();
+  try {
+    throw "asdf2";
+  } catch (ex) {
+    (function() {
+      var o = {};
+      with (o) {
+        print(ex);
+        ex = "asdf3";
+      }
+    })();
+    print(ex);
+  }
+  print(ex);
+}
diff --git a/nashorn/test/script/basic/NASHORN-215.js.EXPECTED b/nashorn/test/script/basic/NASHORN-215.js.EXPECTED
new file mode 100644
index 00000000000..5baec988fc3
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-215.js.EXPECTED
@@ -0,0 +1,15 @@
+1 Error!
+2 Nested error
+3 Error!
+4 success
+5 Error!
+6 Nested error.
+7 error in catch
+8 Nested error.
+9 Nested error.
+a Error!
+b Error!
+asdf1
+asdf2
+asdf3
+asdf1
diff --git a/nashorn/test/script/basic/NASHORN-216.js b/nashorn/test/script/basic/NASHORN-216.js
new file mode 100644
index 00000000000..187107dd2de
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-216.js
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-216 :  eval inside a 'with' does not get proper scope
+ *
+ * @test
+ * @run
+ */
+
+var obj = { foo: 13 };
+
+with (obj) {
+    try {
+        if (eval('foo') !== 13) {
+            fail("eval('foo') !== 13");
+        }
+    } catch (e) {
+        fail("with " + e);
+    }
+}
diff --git a/nashorn/test/script/basic/NASHORN-217.js b/nashorn/test/script/basic/NASHORN-217.js
new file mode 100644
index 00000000000..3c400580644
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-217.js
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-217 :  getter and setter name in object literal could be string, number, reserved word as well
+ *
+ * @test
+ * @run
+ */
+
+var obj = {
+   get class() { return 44; },
+   get in() { return 'hello' },
+   get typeof() { return false; },
+   set class(x) { print('class ' + x); },
+   set in(x) { print('in ' + x); },
+   set typeof(x) { print('typeof ' + x); },
+   get 14() { return 14; },
+   set 14(x) { print("14 " + x); },
+   get 'foo prop'() { return 'foo prop value' },
+   set 'foo prop'(x) { print('foo prop ' + x); }
+};
+
+print('obj.class ' + obj.class);
+print('obj.in ' + obj.in);
+print('obj.typeof ' + obj.typeof);
+print('obj[14] ' + obj[14]);
+print("obj['foo prop'] " + obj['foo prop']);
+
+obj.class = 3;
+obj.in = 'world';
+obj.typeof = 34;
+obj[14] = 34;
+obj['foo prop'] = 'new foo prop';
diff --git a/nashorn/test/script/basic/NASHORN-217.js.EXPECTED b/nashorn/test/script/basic/NASHORN-217.js.EXPECTED
new file mode 100644
index 00000000000..37131887e78
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-217.js.EXPECTED
@@ -0,0 +1,10 @@
+obj.class 44
+obj.in hello
+obj.typeof false
+obj[14] 14
+obj['foo prop'] foo prop value
+class 3
+in world
+typeof 34
+14 34
+foo prop new foo prop
diff --git a/nashorn/test/script/basic/NASHORN-219.js b/nashorn/test/script/basic/NASHORN-219.js
new file mode 100644
index 00000000000..68d551c3862
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-219.js
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-219 :  load function should accept string script and script name
+ *
+ * @test
+ * @run
+ */
+
+load({ script: 'print(__FILE__)', name: 'foo-script'});
diff --git a/nashorn/test/script/basic/NASHORN-219.js.EXPECTED b/nashorn/test/script/basic/NASHORN-219.js.EXPECTED
new file mode 100644
index 00000000000..fa4ac11e821
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-219.js.EXPECTED
@@ -0,0 +1 @@
+foo-script
diff --git a/nashorn/test/script/basic/NASHORN-22.js b/nashorn/test/script/basic/NASHORN-22.js
new file mode 100644
index 00000000000..14420c83a44
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-22.js
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-22: For a global function with multiple definitions, the "last" definition should be used for invocations.
+ *
+ * @test
+ * @run
+ */
+
+
+function func() {
+    print("func, first def");
+}
+
+func();
+
+function func() {
+    print("func, second def");
+}
+
+func();
diff --git a/nashorn/test/script/basic/NASHORN-22.js.EXPECTED b/nashorn/test/script/basic/NASHORN-22.js.EXPECTED
new file mode 100644
index 00000000000..59503f29eaa
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-22.js.EXPECTED
@@ -0,0 +1,2 @@
+func, second def
+func, second def
diff --git a/nashorn/test/script/basic/NASHORN-221.js b/nashorn/test/script/basic/NASHORN-221.js
new file mode 100644
index 00000000000..80a699b74a5
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-221.js
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-221 : Error and subtypes should not have "message" property if constructor was called without message argument
+ *
+ * @test
+ * @run
+ */
+
+function check(name) {
+    var e = new this[name]();
+    if (e.hasOwnProperty("message")) {
+        fail(name + " has 'message' property");
+    }
+
+    e = new this[name]("error!!");
+    if (! e.hasOwnProperty("message")) {
+        fail(name + " does not have 'message' property");
+    }
+}
+
+check("Error");
+check("EvalError");
+check("RangeError");
+check("ReferenceError");
+check("SyntaxError");
+check("TypeError");
+check("URIError");
+
+
diff --git a/nashorn/test/script/basic/NASHORN-222.js b/nashorn/test/script/basic/NASHORN-222.js
new file mode 100644
index 00000000000..7a7f995aff7
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-222.js
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-222 :  Wrong typeof value for properties of primitive values
+ *
+ * @test
+ * @run
+ */
+
+var x = 2;
+if (typeof x.foo !== 'undefined') {
+    fail("#1 x.foo is not undefined");
+}
+
+x = 'hello';
+if (typeof x.foo !== 'undefined') {
+    fail("#2 x.foo is not undefined");
+}
+
+x = true;
+if (typeof x.foo !== 'undefined') {
+    fail("#3 x.foo is not undefined");
+}
diff --git a/nashorn/test/script/basic/NASHORN-223.js b/nashorn/test/script/basic/NASHORN-223.js
new file mode 100644
index 00000000000..1607450025d
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-223.js
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-223 : Function.prototype.bind fails when the function uses "arguments" object
+ *
+ * @test
+ * @run
+ */
+
+function sum() {
+    var res = 0.0;
+    for (i in arguments) res += arguments[i];
+    return res;
+}
+
+var f = sum.bind(this, 1, 2, 3);
+if (f(4) !== 10) {
+    fail("f(4) !== 10");
+}
diff --git a/nashorn/test/script/basic/NASHORN-225.js b/nashorn/test/script/basic/NASHORN-225.js
new file mode 100644
index 00000000000..3aa67a417e5
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-225.js
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-225 :  Object.isFrozen does not handle accessor properties as per the spec
+ *
+ * @test
+ * @run
+ */
+
+var obj = {};
+Object.defineProperty(obj, "foo", {
+    get: function() { return 'hello' },
+    configurable: true
+});
+
+Object.preventExtensions(obj);
+if (Object.isFrozen(obj)) {
+    fail("obj should not be frozen!");
+}
diff --git a/nashorn/test/script/basic/NASHORN-226.js b/nashorn/test/script/basic/NASHORN-226.js
new file mode 100644
index 00000000000..e279369ff58
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-226.js
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-226 : Error.prototype.toString does not confirm to spec.
+ *
+ * @test
+ * @run
+ */
+
+var e = new Error();
+if (e.toString() !== "Error") {
+    fail("#1 expected 'Error', got " + e.toString());
+}
+
+e.message = "";
+if (e.toString() !== "Error") {
+    fail("#2 expected 'Error', got " + e.toString());
+}
+
+e.message = { toString: function() { return '' } };
+if (e.toString() !== "Error") {
+    fail("#3 expected 'Error', got " + e.toString());
+}
+
+e.name = "MyError";
+e.message = "";
+if (e.toString() !== "MyError") {
+    fail("#4 expected 'MyError', got " + e.toString());
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-227.js b/nashorn/test/script/basic/NASHORN-227.js
new file mode 100644
index 00000000000..e1b3a9744ab
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-227.js
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-227 :  When a bound function is used as constructor, arguments are not passed as expected
+ *
+ * @test
+ * @run
+ */
+
+var func = function (x, y, z) {
+   var obj = {};
+   obj.res = "";
+   for (i in  arguments) {
+       obj.res += arguments[i];
+   }
+   return obj;
+};
+
+var MyCons = func.bind({}, "a", "b", "c");
+var newObj = new MyCons("d", "e");
+
+if (newObj.res !== "abcde") {
+    fail("newObj.res !=== 'abcde', it is " + newObj.res);
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-228.js b/nashorn/test/script/basic/NASHORN-228.js
new file mode 100644
index 00000000000..6c268ab7ce7
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-228.js
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-228 : Array, arguments keys should be strings and not numbers
+ *
+ * @test
+ * @run
+ */
+
+function func() {
+    for (i in arguments) {
+        if (typeof i !== 'string') {
+            fail("typeof key of arguments is not 'string'");
+        }
+    }
+}
+
+func(1);
+
+var x = [1];
+for (i in x) {
+    if (typeof i !== 'string') {
+        fail("typeof key of an array is not 'string'");
+    }
+}
+
+var str = "h";
+for (i in x) {
+    if (typeof i !== 'string') {
+        fail("typeof key of a string is not 'string'");
+    }
+}
+    
diff --git a/nashorn/test/script/basic/NASHORN-229.js b/nashorn/test/script/basic/NASHORN-229.js
new file mode 100644
index 00000000000..0af7bbfaa0e
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-229.js
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-229 : Strange interaction of two scripts
+ *
+ * @test
+ * @run
+ */
+
+function func1() {
+    var obj  = {};
+    obj.foo = 0;
+    return (obj.foo === 0);
+}
+
+if (! func1()) {
+    fail("func1() returned non-true value");
+}
+
+load(__DIR__ + 'NASHORN-229_subtest.js');
+    
diff --git a/nashorn/test/script/basic/NASHORN-229_subtest.js b/nashorn/test/script/basic/NASHORN-229_subtest.js
new file mode 100644
index 00000000000..c394bd750a8
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-229_subtest.js
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-229 :  Strange interaction of two scripts
+ *
+ * @subtest
+ */
+
+function func2() {
+    var obj2 = {
+        get bar() { return 343; }
+    }; 
+
+    return (obj2.bar === 343);
+}
+
+if (! func2()) {
+    fail("func2() returned non-true value");
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-23.js b/nashorn/test/script/basic/NASHORN-23.js
new file mode 100644
index 00000000000..3ce79ecbfaf
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-23.js
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-23:  calling function valued global variable before it is initialized should fail.
+ * 
+ * @test
+ * @run
+ */
+
+
+try {
+    func();
+    print("huh!! we can call undefined variable as function!");
+} catch (e) {
+    if (! (e instanceof TypeError)) {
+        print("TypeError expected");
+    }
+}
+
+// define now..
+var func = function() {
+  print("hello");
+}
+
+func(); // should be able to invoke now..
diff --git a/nashorn/test/script/basic/NASHORN-23.js.EXPECTED b/nashorn/test/script/basic/NASHORN-23.js.EXPECTED
new file mode 100644
index 00000000000..ce013625030
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-23.js.EXPECTED
@@ -0,0 +1 @@
+hello
diff --git a/nashorn/test/script/basic/NASHORN-232.js b/nashorn/test/script/basic/NASHORN-232.js
new file mode 100644
index 00000000000..07cd03dac9a
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-232.js
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-232 : Property with user defined getter but no corresponding setter should not be allowed to be assigned.
+ *
+ * @test
+ * @run
+ */
+
+'use strict';
+
+var obj = {
+   get foo() { return 32; }
+};
+
+try {
+    obj.foo = 33;
+    fail("getter only property 'foo' can be set");
+} catch (e) {
+    if (! (e instanceof TypeError)) {
+        fail("TypeError expected, got " + e);
+    }
+}
diff --git a/nashorn/test/script/basic/NASHORN-234.js b/nashorn/test/script/basic/NASHORN-234.js
new file mode 100644
index 00000000000..2460b7bed7c
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-234.js
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-234 : Inherited accessor property is not handled as per the spec.
+ *
+ * @test
+ * @run
+ */
+
+function MyCons() {};
+
+var setterCalled = false;
+Object.defineProperty(MyCons.prototype, 'foo', {
+    set: function(x) { setterCalled = true; },
+    get: function() { return  42; }
+});
+
+var myObj = new MyCons();
+
+myObj.foo = 34; // has to call setter for inherited 'foo'
+if (myObj.hasOwnProperty("foo")) {
+    fail("'foo' is own property of myObj");
+}
+if (! setterCalled) {
+    fail("inherited setter not called");
+}
+
+// Now try 'dynamic' property access.
+setterCalled = false;
+var propName = "foo";
+myObj[propName] = 42; // has to call setter for inherited 'foo'
+if (myObj.hasOwnProperty("foo")) {
+    fail("'foo' is own property of myObj");
+}
+if (! setterCalled) {
+    fail("inherited setter not called");
+}
diff --git a/nashorn/test/script/basic/NASHORN-235.js b/nashorn/test/script/basic/NASHORN-235.js
new file mode 100644
index 00000000000..65807f2ce2a
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-235.js
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-235 : Cannot set stack property of an Error object
+ *
+ * @test
+ * @run
+ */
+
+var e = new Error('error messsage');
+e.stack = [];
+
+if (! (e.stack instanceof Array)) {
+    fail("e.stack is not an Array");
+}
+
+if (e.stack.length !== 0) {
+    fail("e.stack.length !== 0");
+}
+
+e.stack = "no stack";
+if (e.stack !== "no stack") {
+    fail("e.stack !== 'no stack'");
+}
diff --git a/nashorn/test/script/basic/NASHORN-236.js b/nashorn/test/script/basic/NASHORN-236.js
new file mode 100644
index 00000000000..394713e63df
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-236.js
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/// This is a file with utf8 BOM
+/**
+ * NASHORN0-236 :  Source file with UTF8 BOM fails to parse
+ *
+ * @test
+ * @run
+ */
diff --git a/nashorn/test/script/basic/NASHORN-237.js b/nashorn/test/script/basic/NASHORN-237.js
new file mode 100644
index 00000000000..aecdf44fcaa
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-237.js
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-237 : JSON.parse and JSON.stringify don't have proper arity.
+ *
+ * @test
+ * @run
+ */
+
+if (JSON.parse.length !== 2) {
+    fail("JSON.parse.length !== 2, but " + JSON.parse.length);
+}
+
+if (JSON.stringify.length !== 3) {
+    fail("JSON.stringify.length !== 3, but " + JSON.stringify.length);
+}
diff --git a/nashorn/test/script/basic/NASHORN-239.js b/nashorn/test/script/basic/NASHORN-239.js
new file mode 100644
index 00000000000..9c78b50c7e8
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-239.js
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-239 : JSON.stringify eats backslashes
+ *
+ * @test
+ * @run
+ */
+
+var val = JSON.stringify({slashes: '\\\\'});
+if (val !== '{"slashes":"\\\\\\\\"}') {
+    fail("JSON.stringify eats backslahes");
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-24.js b/nashorn/test/script/basic/NASHORN-24.js
new file mode 100644
index 00000000000..eb38081b154
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-24.js
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-24: function local var assignments should resolve to 'with' scope if found in scope.
+ * 
+ * @test
+ * @run
+ */
+
+var scope = { x: 44 };
+
+function func() {
+    with (scope) {
+        // this should change scope.x
+        var x = 55;
+    }
+}
+
+// should print 44
+print("scope.x == " + scope.x);
+
+// call func -- which effectively changes scope.x
+func();
+
+// should print 55
+print("scope.x == " + scope.x);
diff --git a/nashorn/test/script/basic/NASHORN-24.js.EXPECTED b/nashorn/test/script/basic/NASHORN-24.js.EXPECTED
new file mode 100644
index 00000000000..51a592457ec
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-24.js.EXPECTED
@@ -0,0 +1,2 @@
+scope.x == 44
+scope.x == 55
diff --git a/nashorn/test/script/basic/NASHORN-241.js b/nashorn/test/script/basic/NASHORN-241.js
new file mode 100644
index 00000000000..21b63fc3ad6
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-241.js
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-241 : regression: "new 1" does not throw TypeError
+ *
+ * @test
+ * @run
+ */
+
+try {
+    new 1;
+    fail('new "1" should have thrown TypeError');	
+} catch (e) {
+    if (! (e instanceof TypeError)) {
+        fail('expected TypeError, got ' + e, e);
+    }
+}
+
+try {
+    var x = "1";
+    new x;
+    fail('var x = "1"; new x should have thrown TypeError');	
+} catch (e) {
+    if (! (e instanceof TypeError)) {
+        fail('var x = "1"; new x - expected TypeError, got ' + e, e);
+    }
+}
+
+try {
+    var x = "1";
+    new x();
+    fail('var x = "1"; new x() should have thrown TypeError'); 
+} catch (e) {
+    if (! (e instanceof TypeError)) {
+        fail('var x = "1"; new x() - expected TypeError, got ' + e); 
+    }
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-242.js b/nashorn/test/script/basic/NASHORN-242.js
new file mode 100644
index 00000000000..a9fc805c7b8
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-242.js
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-242 : regression: eval inside with statement should use with scope variable
+ *
+ * @test
+ * @run
+ */
+
+(function () {
+    var obj = { str: "o.str" };
+    var str = "local.str";
+
+    with (obj) {
+        if (! eval("str === 'o.str'")) {
+            fail("o.str is not used inside eval");
+        }
+    }
+})();
diff --git a/nashorn/test/script/basic/NASHORN-245.js b/nashorn/test/script/basic/NASHORN-245.js
new file mode 100644
index 00000000000..d15559c34d6
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-245.js
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-245 : regression : StackOverflowError when accessing inherited accessor property
+ *
+ * @test
+ * @run
+ */
+
+var obj = {};
+Object.defineProperty(obj, "name", {
+    get: function () {
+        return 32;
+    }
+});
+
+var obj2 = Object.create(obj);
+
+var obj3 = Object.create(obj2);
+
+// StackOverflowError on obj3.name
+if (obj3.name !== 32) {
+    fail("obj3.name !== 32");
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-247.js b/nashorn/test/script/basic/NASHORN-247.js
new file mode 100644
index 00000000000..94befc936c9
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-247.js
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-247 : Object gets stale value when inherited accessor property changes to a data property
+ *
+ * @test
+ * @run
+ */
+
+var data = "foo1";
+var obj = {
+  get foo() { return data; },
+  set foo(value) { data = value; }
+};
+
+var obj2 = Object.create(obj);
+
+function checkObjFoo(expected) {
+    if (obj2.foo !== expected) {
+        fail("obj2.foo has to be " + expected);
+    }
+}
+
+checkObjFoo("foo1");
+
+obj2.foo = "foo2";
+checkObjFoo("foo2");
+
+// change the property to data property
+Object.defineProperty(obj, "foo", {
+   value: "foo3"
+});
+checkObjFoo("foo3");
+
diff --git a/nashorn/test/script/basic/NASHORN-25.js b/nashorn/test/script/basic/NASHORN-25.js
new file mode 100644
index 00000000000..c669b05e6ef
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-25.js
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-25 :  A function's prototype can be non-object
+ *
+ * @test
+ * @run
+ */
+
+function MyConstructor() {
+}
+
+MyConstructor.prototype = 1;
+
+if (typeof MyConstructor.prototype != 'number') {
+    print("ERROR: expect MyConstructor.prototype to be number type");
+} else {
+    print("yes, MyConstructor.prototype is a number");
+}
+
+var myObj = new MyConstructor();
+
+if (Object.getPrototypeOf(myObj) !== Object.prototype) {
+    print("ERROR: Object.getPrototypeOf(myObj) is not Object.prototype");
+} else {
+    print("yes, Object.getPrototypeOf(myObj) is Object.prototype");
+}
diff --git a/nashorn/test/script/basic/NASHORN-25.js.EXPECTED b/nashorn/test/script/basic/NASHORN-25.js.EXPECTED
new file mode 100644
index 00000000000..a22232989b5
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-25.js.EXPECTED
@@ -0,0 +1,2 @@
+yes, MyConstructor.prototype is a number
+yes, Object.getPrototypeOf(myObj) is Object.prototype
diff --git a/nashorn/test/script/basic/NASHORN-251.js b/nashorn/test/script/basic/NASHORN-251.js
new file mode 100644
index 00000000000..921671b799c
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-251.js
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-251 : Global built-in constructor prototypes are destroyed by user assignments.
+ *
+ * @test
+ * @run
+ */
+
+// assign to global "Array"
+Array = 3;
+// we can create literal array
+x = [23, 33];
+if (x.join("-") !== '23-33') {
+    fail("x.join('-') !== '23-33'");
+}
+
+try {
+    new Array();
+    fail("should have thrown TypeError for 'Array' constructor!");
+} catch (e) {
+    if (! (e instanceof TypeError)) {
+        fail("should have thrown TypeError, got " + e);
+    }
+}
+
+// assign to global "RegExp"
+RegExp = true;
+// we can still create RegExp literal
+y = /foo/;
+if (! y.test("foo")) {
+   fail("y.test('foo') is not true");
+}
+
+try {
+    new RegExp();
+    fail("should have thrown TypeError for 'RegExp' constructor!");
+} catch (e) {
+    if (! (e instanceof TypeError)) {
+        fail("should have thrown TypeError, got " + e);
+    }
+}
+
+TypeError = "foo";
+try {
+    var foo = 3;
+    foo();
+} catch(e) {
+    if (! (e instanceof Error)) {
+        fail("Error subtype expected, got " + e);
+    }
+
+    if (e.name !== 'TypeError') {
+        fail("e is not of type 'TypeError'");
+    }
+}
+
+SyntaxError = 234;
+try {
+    eval("344**++33");
+} catch(e) {
+    if (! (e instanceof Error)) {
+        fail("Error subtype expected, got " + e);
+    }
+
+    if (e.name !== 'SyntaxError') {
+        fail("e is not of type 'SyntaxError'");
+    }
+}
+
+ReferenceError = "foo";
+try {
+    print(unknown);
+} catch(e) {
+    if (! (e instanceof Error)) {
+        fail("Error subtype expected, got " + e);
+    }
+
+    if (e.name !== 'ReferenceError') {
+        fail("e is not of type 'ReferenceError'");
+    }
+}
diff --git a/nashorn/test/script/basic/NASHORN-252.js b/nashorn/test/script/basic/NASHORN-252.js
new file mode 100644
index 00000000000..fa17be8a2b4
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-252.js
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-252 : Nashorn has trouble with positive and negative infinities
+ *
+ * @test
+ * @run
+ */
+
+var y = -0;
+y = +y;
+if ((1/y) !== -Infinity) {
+    fail("expected -Infinity but got " + (1/y));
+}
+
+y = 0;
+y = -y;
+if ((1/y) !== -Infinity) {
+    fail("expected -Infinity but got " + (1/y));
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-253.js b/nashorn/test/script/basic/NASHORN-253.js
new file mode 100644
index 00000000000..e52d7c5872d
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-253.js
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-253 :
+ *
+ * @test
+ * @run
+ */
+
+try {
+    foo();
+    fail("#1 expected error!!");
+} catch (e) {
+    if (! (e instanceof ReferenceError)) {
+        fail("#2 expected ReferenceError, got " + e);
+    }
+}
+
+try {
+    this.foo();
+    fail("#3 expected error!!");
+} catch (e) {
+    if (! (e instanceof TypeError)) {
+        fail("#4 expected ReferenceError, got " + e);
+    }
+}
+
+try {
+    new foo();
+    fail("#5 expected error!!");
+} catch (e) {
+    if (! (e instanceof ReferenceError)) {
+        fail("#6 expected ReferenceError, got " + e);
+    }
+}
+
+try {
+    new this.foo();
+    fail("#7 expected error!!");
+} catch (e) {
+    if (! (e instanceof TypeError)) {
+        fail("#8 expected ReferenceError, got " + e);
+    }
+}
+
+try {
+    var x = foo;
+    fail("#9 expected error!!");
+} catch (e) {
+    if (! (e instanceof ReferenceError)) {
+        fail("#10 expected ReferenceError, got " + e);
+    }
+}
diff --git a/nashorn/test/script/basic/NASHORN-256.js b/nashorn/test/script/basic/NASHORN-256.js
new file mode 100644
index 00000000000..c043b34a7b6
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-256.js
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-256 : should be able to delete global builtin objects like JSON, Math etc.
+ *
+ * @test
+ * @run
+ */
+
+function deleteAndCheck(name) {
+    if (! (delete this[name])) {
+        fail("cannot delete " + name);
+    } else {
+        if (typeof this[name] !== 'undefined') {
+            fail(name + " is not undefined after delete!");
+        }
+    }
+}
+
+deleteAndCheck("Object");
+deleteAndCheck("Function");
+deleteAndCheck("Array");
+deleteAndCheck("Boolean");
+deleteAndCheck("Date");
+deleteAndCheck("JSON");
+deleteAndCheck("JSAdapter");
+deleteAndCheck("Math");
+deleteAndCheck("Number");
+deleteAndCheck("RegExp");
+deleteAndCheck("String");
+deleteAndCheck("Error");
+deleteAndCheck("Error");
+deleteAndCheck("RangeError");
+deleteAndCheck("ReferenceError");
+deleteAndCheck("SyntaxError");
+deleteAndCheck("TypeError");
+deleteAndCheck("URIError");
+
+function deleteFailCheck(name) {
+    if (delete this[name]) {
+        fail("can delete " + name);
+    } else {
+        if (typeof this[name] === 'undefined') {
+            fail(name + " was deleted!");
+        }
+    }
+}
+
+deleteFailCheck("NaN");
+deleteFailCheck("Infinity");
+if (delete undefined) {
+    fail("can delete 'undefined'");
+}
diff --git a/nashorn/test/script/basic/NASHORN-258.js b/nashorn/test/script/basic/NASHORN-258.js
new file mode 100644
index 00000000000..1fc7466a908
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-258.js
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-258 : Broken slot assignments to non constant members of multidimensional arrays in OP=
+ *
+ * @test
+ * @run
+ */
+
+function test3(a) {
+    for (var i = 0; i < a.length ; i++) {
+	for (var j = 0; j < a[i].length ; j++) {
+	    for (var k = 0; k < a[i][j].length ; k++) {
+		a[i][j][k] *= 8;
+	    }
+	}
+    }
+}
+
+var array = [ [[1,1,1],[1,1,1],[1,1,1]],
+	      [[1,1,1],[1,1,1],[1,1,1]],
+	      [[1,1,1],[1,1,1],[1,1,1]] ];
+	      
+test3(array);
+print(array);
+
+
+function outer() {
+    
+    var array2 = [ [[1,1,1],[1,1,1],[1,1,1]],
+		   [[1,1,1],[1,1,1],[1,1,1]],
+		   [[1,1,1],[1,1,1],[1,1,1]] ];
+    
+    var f =  function inner() {
+	for (var i = 0; i < array2.length ; i++) {
+	    for (var j = 0; j < array2[i].length ; j++) {
+		array2[i][j][2] *= 8;
+	    }
+	}	
+    };
+
+    f();
+    print(array2);
+}
+
+outer();
diff --git a/nashorn/test/script/basic/NASHORN-258.js.EXPECTED b/nashorn/test/script/basic/NASHORN-258.js.EXPECTED
new file mode 100644
index 00000000000..8c95c914b48
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-258.js.EXPECTED
@@ -0,0 +1,2 @@
+8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8
+1,1,8,1,1,8,1,1,8,1,1,8,1,1,8,1,1,8,1,1,8,1,1,8,1,1,8
diff --git a/nashorn/test/script/basic/NASHORN-26.js b/nashorn/test/script/basic/NASHORN-26.js
new file mode 100644
index 00000000000..6f2b4e323ce
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-26.js
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-26:  String concatenation does not work with += operator.
+ *
+ * @test
+ * @run
+ */
+
+var x = "hello";
+x += ", world";
+print(x);
+
+var y = "hello ";
+y += {};
+print(y);
+
+var z = "number is ";
+z += 42;
+print(z);
+
+var a = 2;
+a += " is the only even prime!";
+print(a);
+
+var b = true;
+b += " is beauty";
+print(b);
+
+var c = {};
+c += {};
+print(c);
diff --git a/nashorn/test/script/basic/NASHORN-26.js.EXPECTED b/nashorn/test/script/basic/NASHORN-26.js.EXPECTED
new file mode 100644
index 00000000000..d0aedad5493
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-26.js.EXPECTED
@@ -0,0 +1,6 @@
+hello, world
+hello [object Object]
+number is 42
+2 is the only even prime!
+true is beauty
+[object Object][object Object]
diff --git a/nashorn/test/script/basic/NASHORN-260.js b/nashorn/test/script/basic/NASHORN-260.js
new file mode 100644
index 00000000000..24710552d18
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-260.js
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-260 : builtin constructor (Array, RegExp) inlining is broken inside 'with' statements
+ *
+ * @test
+ * @run
+ */
+
+var globalArray = Array;
+var reachedWithArray = false;
+with ({ Array: function func() { reachedWithArray = true; } }) {
+    var v = new Array();
+
+    if (! reachedWithArray) {
+        fail("didn't reach with scope's Array func");
+    }
+
+    if (v instanceof globalArray) {
+        fail("should not have been global's Array");
+    }
+}
+
+var reached = false;
+with ({ Array: function () { reached = true } }) {
+   with({}) { }
+
+  var f = new Array();
+}
+
+if (! reached) {
+    fail("not calling with's Array");
+}
diff --git a/nashorn/test/script/basic/NASHORN-261.js b/nashorn/test/script/basic/NASHORN-261.js
new file mode 100644
index 00000000000..26167b67e23
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-261.js
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-261 : All 'eval' calls assumed to be global builtin eval calls
+ *
+ * @test
+ * @run
+ */
+
+// call eval with no args
+if (eval() !== undefined) {
+    fail("eval with no arg should return undefined");
+}
+
+// call eval with extra (ignored) args
+function func() {
+    'use strict';
+
+    try {
+        // we pass hidden args after first arg which is code. Make sure
+        // those stay intact even when user passes extra args.
+        // Example: strict mode flag is passed as hidden arg...
+
+        eval("eval = 3", "hello", "world", "nashorn");
+        fail("SyntaxError expected!");
+    } catch (e) {
+        if (! (e instanceof SyntaxError)) {
+            fail("SyntaxError expected, got " + e);
+        }
+    }
+}
+
+func();
+
+// try calling 'eval' -- but from with scope rather than builtin one
+with ( {
+    eval: function() {
+        if (arguments.length != 1) {
+            fail("arguments.length !== 1, it is " + arguments.length);
+            for (i in arguments) { print(arguments[i]); }
+        }
+    }
+}) {
+
+    eval("hello");
+}
+
+// finally, overwrite builtin 'eval'
+var reached = false;
+eval = function() {
+    reached = true;
+    for (i in arguments) {
+        print(arguments[i]);
+    }
+}
+
+// pass no args to our overwritten eval 
+// the new eval should not print anything (no hidden args passed)
+eval();
+
+// make sure our modified eval was called
+if (! reached) {
+    fail("modified eval was not called");
+}
diff --git a/nashorn/test/script/basic/NASHORN-262.js b/nashorn/test/script/basic/NASHORN-262.js
new file mode 100644
index 00000000000..7c4dd7e1638
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-262.js
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-262 : for statement iterator variable is not checked in strict mode
+ * 
+ * @test
+ * @run
+ */
+
+'use strict';
+
+try {
+    eval("for (var eval in [2, 4]) {}");
+    fail("should have thrown SyntaxError");
+} catch (e) {
+    if (! (e instanceof SyntaxError)) {
+        fail("expected SyntaxError got " + e);
+    }
+}
diff --git a/nashorn/test/script/basic/NASHORN-263.js b/nashorn/test/script/basic/NASHORN-263.js
new file mode 100644
index 00000000000..4dc461bdfc7
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-263.js
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-263 : delete of function param or caller scope var should throw SyntaxError in strict mode
+ *
+ * @test
+ * @run
+ */
+
+function func() {
+    "use strict";
+    var obj = new Boolean(false);
+
+    try {
+        eval("delete obj;");
+        fail("#1 should have thrown SyntaxError");
+    } catch (e) {
+        if (! (e instanceof SyntaxError)) {
+            fail("#2 SyntaxError expected got " + e);
+        }
+    }
+}
+
+func();
+
+function func2(y) {
+    'use strict';
+    try {
+        eval("delete y");
+        fail("#3 should have thrown SyntaxError");
+    } catch (e) {
+        if (! (e instanceof SyntaxError)) {
+            fail("#4 SyntaxError expected got " + e);
+        }
+    }
+}
+
+func2(2);
diff --git a/nashorn/test/script/basic/NASHORN-264.js b/nashorn/test/script/basic/NASHORN-264.js
new file mode 100644
index 00000000000..fd5b8d53401
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-264.js
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-264 : If the value of user getter property is used as function when it is not, we get ClassCastException instead of TypeError
+ *
+ * @test
+ * @run
+ */
+
+function func() {
+    var obj = {};
+    Object.defineProperty(obj, "bar", {
+        get: function()  { return 'hello'; }
+    });
+
+    try {
+        obj.bar();
+        fail("should have thrown TypeError, obj.bar is not a function");
+    } catch(e) {
+        if (! (e instanceof TypeError)) {
+            fail("expected TypeError got " + e);
+        }
+    }
+}
+
+func();
diff --git a/nashorn/test/script/basic/NASHORN-265.js b/nashorn/test/script/basic/NASHORN-265.js
new file mode 100644
index 00000000000..566e5b49c3e
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-265.js
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/** 
+ * NASHORN-265 with scope access within a nested function can't access global var
+ *
+ * @test
+ * @run
+ */
+
+var x = 0;
+
+var obj = { x: "obj.x" };
+
+function func() {
+
+   function func2() {
+       with (obj) {
+           print(x);
+       }
+   }
+
+   func2();
+}
+
+func();
diff --git a/nashorn/test/script/basic/NASHORN-265.js.EXPECTED b/nashorn/test/script/basic/NASHORN-265.js.EXPECTED
new file mode 100644
index 00000000000..3d20c3acf14
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-265.js.EXPECTED
@@ -0,0 +1 @@
+obj.x
diff --git a/nashorn/test/script/basic/NASHORN-266.js b/nashorn/test/script/basic/NASHORN-266.js
new file mode 100644
index 00000000000..006440e41bf
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-266.js
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-266 : Strict mode functions see scope call 'this' as undefined
+ *
+ * @test
+ * @run
+ */
+
+
+function func() {
+    'use strict';
+    return this;
+}
+
+if (func() !== undefined) {
+    fail("#1 'this' should be undefined");
+}
+
+if (this.func() !== this) {
+    fail("#2 'this' should be global");
+}
+
+function func2() {
+    return this;
+}
+
+if (func2() === undefined) {
+    fail("#3 'this' should not be undefined");
+}
+
+if (this.func2() !== this) {
+    fail("#4 'this' should be global");
+}
+
+// strict calling non-strict
+function func3() {
+    'use strict';
+
+    if (func2() === undefined) {
+        fail("#5 'this' should not be undefined");
+    }
+}
+
+func3();
diff --git a/nashorn/test/script/basic/NASHORN-269.js b/nashorn/test/script/basic/NASHORN-269.js
new file mode 100644
index 00000000000..ba9754918e0
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-269.js
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-269 : Global constructor inlining breaks when a builtin constructor is deleted
+ *
+ * @test
+ * @run
+ */
+
+delete Array;
+
+try {
+    print(new Array(3));
+    fail("#1 should have thrown ReferenceError");
+} catch (e) {
+    if (! (e instanceof ReferenceError)) {
+        fail("#2 expected ReferenceError, got " + e);
+    }
+}
+
+Object.defineProperty(this, "Array", {
+    get: function() { return 63; }
+});
+
+try {
+    print(new Array(2));
+    fail("#3 should have thrown TypeError");
+} catch (e) {
+    if (! (e instanceof TypeError)) {
+        fail("#4 expected TypeError, got " + e);
+    }
+}
+
+Object.defineProperty(this, "RegExp", {
+    get: function() { return 23; }
+});
+
+
+try {
+    print(new RegExp("abc"));
+    fail("#5 should have thrown TypeError");
+} catch (e) {
+    if (! (e instanceof TypeError)) {
+        fail("#6 expected TypeError, got " + e);
+    }
+}
diff --git a/nashorn/test/script/basic/NASHORN-27.js b/nashorn/test/script/basic/NASHORN-27.js
new file mode 100644
index 00000000000..5f285f354d3
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-27.js
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-27 :  String.prototype.substr is undefined
+ *
+ * @test
+ * @run
+ */
+
+print("substr type = " + typeof String.prototype.substr);
+print("substr arity = " + String.prototype.substr.length);
+
+var str = "hello world";
+print(str.substr(0));
+print(str.substr(3));
+print(str.substr(3, 4));
+print(str.substr(0, 3434));
+print(str.substr(-1));
+print(str.substr(-5, 5));
+print(str.substr(-11, 3));
diff --git a/nashorn/test/script/basic/NASHORN-27.js.EXPECTED b/nashorn/test/script/basic/NASHORN-27.js.EXPECTED
new file mode 100644
index 00000000000..424886508be
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-27.js.EXPECTED
@@ -0,0 +1,9 @@
+substr type = function
+substr arity = 2
+hello world
+lo world
+lo w
+hello world
+d
+world
+hel
diff --git a/nashorn/test/script/basic/NASHORN-270.js b/nashorn/test/script/basic/NASHORN-270.js
new file mode 100644
index 00000000000..cc6519e60b2
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-270.js
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-270 : Global is not received as 'this' in a bound function when bind was called with undefined 'thisArg'
+ *
+ * @test
+ * @run
+ */
+
+var global = this;
+
+function f() {
+    if (this !== global) {
+        fail("this !== global");
+    }
+}
+
+(function() {
+    f.bind()();
+})();
+
+(function() {
+    'use strict';
+    f.bind()();
+})();
diff --git a/nashorn/test/script/basic/NASHORN-271.js b/nashorn/test/script/basic/NASHORN-271.js
new file mode 100644
index 00000000000..940a87e1e14
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-271.js
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-271 : JSON.stringify does not return expected value when replacer function returns object or array for primitive value
+ *
+ * @test
+ * @run
+ */
+
+var res = JSON.stringify(23, function(k,v) { 
+    return (v == 23)? [1, 2] : v;
+});
+
+if (res !== "[1,2]") {
+    fail("#1 expected '[1,2]' got " + res);
+}
+
+var res = JSON.stringify(23, function(k,v) { 
+    return (v == 23)? { x: 1, y: 'hello' } : v; 
+});
+
+if (res !== '{"x":1,"y":"hello"}') {
+    fail("#2 expected {\"x\":1,\"y\":\"hello\"}' got " + res);
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-275.js b/nashorn/test/script/basic/NASHORN-275.js
new file mode 100644
index 00000000000..e6d3cf46fac
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-275.js
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-275 : strict eval receives wrong 'this' object
+ *
+ * @test
+ * @run
+ */
+
+var global = this;
+
+function func() {
+    "use strict";
+
+    if (eval("this") === global) {
+        fail("#1 strict eval gets 'global' as 'this'");
+    }
+
+    if (eval ("typeof this") !== 'undefined') {
+        fail("#2 typeof this is not undefined in strict eval");
+    }
+}
+
+func();
+
+var global = this;
+if (eval("\"use strict\";this") !== this) {
+    fail("#3 strict mode eval receives wrong 'this'");
+}
+
+var obj = {
+  func: function() {
+      if (eval('"use strict"; this') !== obj) {
+          fail("#4 strict mode eval receives wrong 'this'");
+      }
+  }
+};
+
+obj.func();
+
+function func2() {
+   'use strict';
+   return eval('this');
+}
+
+func2.call(null);
+if (func2.call(null) !== null) {
+    fail("#5 strict mode eval receives wrong 'this'");
+}
+
+if (func2.call('hello') !== 'hello') {
+    fail("#6 strict mode eval receives wrong 'this'");
+}
+
+// indirect eval
+var my_eval = eval;
+if (my_eval("'use strict'; this; ") !== this) {
+    fail("#7 strict mode eval receives wrong 'this'");
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-276.js b/nashorn/test/script/basic/NASHORN-276.js
new file mode 100644
index 00000000000..56294cb257c
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-276.js
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-276 :  Octal escape sequences should result in SyntaxError in strict mode
+ *
+ * @test
+ * @run
+ */
+
+try {
+    eval('"use strict"; var x = "\\000";');
+    fail("should have thrown SyntaxError");
+} catch (e) {
+    if (! (e instanceof SyntaxError)) {
+        fail("expected SyntaxError, got " + e);
+    }
+}
diff --git a/nashorn/test/script/basic/NASHORN-277.js b/nashorn/test/script/basic/NASHORN-277.js
new file mode 100644
index 00000000000..f44d61af2f2
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-277.js
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-277 : Array.prototype is also an array.
+ *
+ * @test
+ * @run
+ */
+
+if (! Array.isArray(Array.prototype)) {
+    fail("Array.isArray(Array.prototype) is false");
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-278.js b/nashorn/test/script/basic/NASHORN-278.js
new file mode 100644
index 00000000000..1180d001095
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-278.js
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-278 : Other directives should also be checked for strictness in strict mode
+ *
+ * @test
+ * @run
+ */
+
+try {
+    // A directive preceding 'use strict' uses octal escape
+    // This should result in SyntaxError.
+    eval(' "foo\\063"; "use strict"; ');
+    fail("should have thrown SyntaxError");
+} catch (e) {
+    if (! (e instanceof SyntaxError)) {
+        fail("expected SyntaxError, got " + e);
+    }
+}
+
+
diff --git a/nashorn/test/script/basic/NASHORN-28.js b/nashorn/test/script/basic/NASHORN-28.js
new file mode 100644
index 00000000000..df366cffef5
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-28.js
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-28: Issues with String representation of numbers.
+ *
+ * @test
+ * @run
+ */
+
+var str = String(0.0000001);
+if (str != "1e-7") {
+    fail("1e-7 expected, but got " + str);
+} else {
+    print("yes, it is 1e-7");
+}
+
+if (String(-0.000001) !== "-0.000001") {
+    fail('String(-0.000001) === "-0.000001". got ' + (String(-0.000001)));
+} else {
+    print('yes, String(-0.000001) === "-0.000001"');
+}
+
+if (String(-1e-6) !== "-0.000001") {
+    fail('String(-1e-6) === "0.000001". got ' + (String(-1e-6)));
+} else {
+    print('yes, String(-1e-6) === "0.000001"');
+}
+
+if (String(-1E-6) !== "-0.000001") {
+    fail('String(-1E-6) === "0.000001". got ' + (String(-1E-6)));
+} else {
+    print('yes, String(-1E-6) === "0.000001"');
+}
diff --git a/nashorn/test/script/basic/NASHORN-28.js.EXPECTED b/nashorn/test/script/basic/NASHORN-28.js.EXPECTED
new file mode 100644
index 00000000000..4e4b9eb4ea6
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-28.js.EXPECTED
@@ -0,0 +1,4 @@
+yes, it is 1e-7
+yes, String(-0.000001) === "-0.000001"
+yes, String(-1e-6) === "0.000001"
+yes, String(-1E-6) === "0.000001"
diff --git a/nashorn/test/script/basic/NASHORN-281.js b/nashorn/test/script/basic/NASHORN-281.js
new file mode 100644
index 00000000000..45e5e6b85f8
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-281.js
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-281 : ScriptObject embed, spill property usage breaks in strict mode
+ *
+ * @test
+ * @run
+ */
+
+function func(arg) {
+  "use strict";
+  arg.foo = 44;
+}
+
+
+var obj = {};
+func(obj);
+
+if (obj.foo !== 44) {
+    fail("#1 obj.foo should 44, but it is " + obj.foo);
+}
+
+var obj1 = {}
+Object.preventExtensions(obj1);
+
+try {
+    func(obj1);
+    fail("#2 should have thrown TypeError");
+} catch (e) {
+    if (! (e instanceof TypeError)) {
+        fail("#3 expected TypeError, got " + e);
+    }
+}
diff --git a/nashorn/test/script/basic/NASHORN-284.js b/nashorn/test/script/basic/NASHORN-284.js
new file mode 100644
index 00000000000..cffe998bd27
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-284.js
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-284 :  Guard setup in ScriptObject.findGetMethod is wrong for inherited properties
+ *
+ * @test
+ * @run
+ */
+
+var obj1 = { x : 44 };
+
+var obj2 = Object.create(obj1);
+// shadow obj1.x here
+obj2.x = 'hello';
+
+var obj3 = Object.create(obj2);
+
+function func(obj) {
+   print("x = " + obj.x);
+}
+
+// should print obj2.x from obj3
+func(obj3);
+// the following should expose obj1.x on obj3
+delete obj2.x;
+// now, it should print obj1.x
+func(obj3);
diff --git a/nashorn/test/script/basic/NASHORN-284.js.EXPECTED b/nashorn/test/script/basic/NASHORN-284.js.EXPECTED
new file mode 100644
index 00000000000..3114cc47740
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-284.js.EXPECTED
@@ -0,0 +1,2 @@
+x = hello
+x = 44
diff --git a/nashorn/test/script/basic/NASHORN-285.js b/nashorn/test/script/basic/NASHORN-285.js
new file mode 100644
index 00000000000..1b77339fc82
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-285.js
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-258 : loops with continues could be marked terminal
+ *
+ * @test
+ * @run
+ */
+
+function do_not_loop_forever() {   
+    var sum = 0;
+    for (var i = 0; i < 4711; i++) {            
+	sum += i;
+	if (i >= 0) {
+            continue;                                                           
+        }  
+	return sum;
+    }  
+    return sum;
+}
+
+
+function still_tag_terminal() {
+    var sum = 0;
+    for (var i = 0; i < 4711; i++) {            
+	sum += i;
+	for (var j = 0; j < 4712; j++) {
+	    sum += j;
+	    if (j & 1) {
+		continue;
+	    }
+	}
+	return sum;
+    }  
+    return sum;
+}
+
+print(do_not_loop_forever());
+print(still_tag_terminal());
diff --git a/nashorn/test/script/basic/NASHORN-285.js.EXPECTED b/nashorn/test/script/basic/NASHORN-285.js.EXPECTED
new file mode 100644
index 00000000000..1baf624d4c7
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-285.js.EXPECTED
@@ -0,0 +1,2 @@
+11094405
+11099116
diff --git a/nashorn/test/script/basic/NASHORN-288.js b/nashorn/test/script/basic/NASHORN-288.js
new file mode 100644
index 00000000000..23005fd934d
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-288.js
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-288 : Guard setup in ScriptObject.findGetMethod is wrong for inherited properties
+ *
+ * @test
+ * @run
+ */
+
+var obj1 = {};
+obj1.foo = function() {
+}
+
+var obj2 = Object.create(obj1);
+
+// inside function to force same callsite
+function func(o) {
+  o.foo();
+}
+
+func(obj2);
+
+// change proto's property that is called
+obj1.foo = 33;
+
+// try again. should get TypeError as 33 is called
+// as function!
+try {
+    func(obj2);
+    fail("should have thrown TypeError");
+} catch (e) {
+    if (! (e instanceof TypeError)) {
+        fail("should have thrown TypeError");
+    }
+}
diff --git a/nashorn/test/script/basic/NASHORN-29.js b/nashorn/test/script/basic/NASHORN-29.js
new file mode 100644
index 00000000000..a5f48d69ffd
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-29.js
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-29 :  >>> operator does not work with number string literal.
+ *
+ * @test
+ * @run
+ */
+
+if (("-1.234" >>> 0) !== 4294967295) {
+    print('ERROR ("-1.234" >>> 0) === 4294967295. got ' + (("-1.234" >>> 0)));
+} else {
+    print('yes ("-1.234" >>> 0) === 4294967295"');
+}
+
+var x = ("-1.234" >>> 0);
+if (x !== 4294967295) {
+    print('ERROR x === 4294967295. got ' + (x));
+} else {
+    print('yes x === 4294967295');
+}
diff --git a/nashorn/test/script/basic/NASHORN-29.js.EXPECTED b/nashorn/test/script/basic/NASHORN-29.js.EXPECTED
new file mode 100644
index 00000000000..4bb3e8097e0
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-29.js.EXPECTED
@@ -0,0 +1,2 @@
+yes ("-1.234" >>> 0) === 4294967295"
+yes x === 4294967295
diff --git a/nashorn/test/script/basic/NASHORN-293.js b/nashorn/test/script/basic/NASHORN-293.js
new file mode 100644
index 00000000000..e6f374928d4
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-293.js
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-293: Per-context caching of compiled script classes.
+ *
+ * @test
+ * @run
+ */
+
+// Make sure repeated evals are executed correctly
+for (var i = 0; i < 3; i++) {
+    eval("print('hello')");
+}
+
+// Same content should produce same class only with same source name
+var src = "(void 0).foo";
+
+for (var i = 0; i < 3; i++) {
+    try {
+        eval(src);
+    } catch (e) {
+        var location =  e.fileName ? e.fileName.slice(-9) : "unknown source";
+        print(e.name, "@", location);
+    }
+}
+for (var i = 0; i < 3; i++) {
+    try {
+        eval(src);
+    } catch (e) {
+        var location =  e.fileName ? e.fileName.slice(-9) : "unknown source";
+        print(e.name, "@", location);
+    }
+}
diff --git a/nashorn/test/script/basic/NASHORN-293.js.EXPECTED b/nashorn/test/script/basic/NASHORN-293.js.EXPECTED
new file mode 100644
index 00000000000..68278106d32
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-293.js.EXPECTED
@@ -0,0 +1,9 @@
+hello
+hello
+hello
+TypeError @ #41<eval>
+TypeError @ #41<eval>
+TypeError @ #41<eval>
+TypeError @ #49<eval>
+TypeError @ #49<eval>
+TypeError @ #49<eval>
diff --git a/nashorn/test/script/basic/NASHORN-294.js b/nashorn/test/script/basic/NASHORN-294.js
new file mode 100644
index 00000000000..7b9030b70ea
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-294.js
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-294 : NativeString.lookPrimitive guard is wrong
+ *
+ * @test
+ * @run
+ */
+
+function func(s) {
+    return s.charAt(0);
+}
+
+if (func("hello") !== 'h') {
+    fail("expected 'h' here");
+}
+
+String.prototype.charAt = function() {
+    return "foo";
+}
+
+if (func("world") !== 'foo') {
+    fail("expected 'foo' here");
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-296.js b/nashorn/test/script/basic/NASHORN-296.js
new file mode 100644
index 00000000000..b24a8ee56d1
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-296.js
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-296 : load messes file name in some cases
+ *
+ * @test
+ * @run
+ */
+
+function test(name) {
+    try {
+        load({ script: 'throw new Error()', name: name });
+    } catch(e) {
+        // normalize windows path separator to URL style
+        var actual = e.stack[0].fileName;
+        if (actual !== name) {
+            fail("expected file name to be " + name +
+                 ", actually got file name " + actual);
+        }
+    }
+}
+
+// test inexistent file
+test("com/oracle/node/sample.js");
+
+// test filename without file:/ prefix
+try {
+    throw new Error();
+} catch (e) {
+    test(e.stack[0].fileName.substring(6));
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-297.js b/nashorn/test/script/basic/NASHORN-297.js
new file mode 100644
index 00000000000..1cf3fcbb0d0
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-297.js
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-297 : ClassCastException in runcrypto
+ *
+ * @test
+ * @run
+ */
+
+function func(s) {
+    return s.length;
+}
+
+try {
+    if (func(new String("hello")) !== 5) {
+        fail("#1 expected new String('hello').length to be 5");
+    }
+
+    if (func("hello") !== 5) {
+        fail("#2 expected 'hello'.length to be 5");
+    }
+} catch(e) {
+    fail("failed", e);
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-30.js b/nashorn/test/script/basic/NASHORN-30.js
new file mode 100644
index 00000000000..a4c6c2d42b1
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-30.js
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-30 :  < operator with string on LHS does not call valueOf of obj on RHS.
+ *
+ * @test
+ * @run
+ */
+
+var obj = {
+    valueOf: function() {
+        print("valueOf call"); 
+        return -2 
+    },
+
+    toString: function() { 
+        print("toString call");
+        return "-2";
+    }
+};
+
+if ("-1" < obj) {
+    fail("('-1' < obj) should be true");
+} else {
+    print("yes, ('-1' < obj) is true");
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-30.js.EXPECTED b/nashorn/test/script/basic/NASHORN-30.js.EXPECTED
new file mode 100644
index 00000000000..463cb46cc11
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-30.js.EXPECTED
@@ -0,0 +1,2 @@
+valueOf call
+yes, ('-1' < obj) is true
diff --git a/nashorn/test/script/basic/NASHORN-300.js b/nashorn/test/script/basic/NASHORN-300.js
new file mode 100644
index 00000000000..2070fa49797
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-300.js
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-300 : java.lang.VerifyError by node.jar/target/test-classes/simple/test-fs-open.js:25
+ *
+ * @test
+ * @run
+ */
+
+function func1(foo) {
+    if (foo) {  
+       var encoding = arguments[3];
+    }  
+
+    var s = encoding;
+}
+
+function func2() {
+    print(arguments);
+    var x;
+    print(x);
+}
diff --git a/nashorn/test/script/basic/NASHORN-301.js b/nashorn/test/script/basic/NASHORN-301.js
new file mode 100644
index 00000000000..8594b82b489
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-301.js
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-301 : radix was ignored for toString
+ *
+ * @test
+ * @run
+ */
+
+var i = 255;
+for (radix=2; radix<=36; radix++) {
+    print(i.toString(radix));
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-301.js.EXPECTED b/nashorn/test/script/basic/NASHORN-301.js.EXPECTED
new file mode 100644
index 00000000000..764fc93a26b
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-301.js.EXPECTED
@@ -0,0 +1,35 @@
+11111111
+100110
+3333
+2010
+1103
+513
+377
+313
+255
+212
+193
+168
+143
+120
+ff
+f0
+e3
+d8
+cf
+c3
+bd
+b2
+af
+a5
+9l
+9c
+93
+8n
+8f
+87
+7v
+7o
+7h
+7a
+73
diff --git a/nashorn/test/script/basic/NASHORN-304.js b/nashorn/test/script/basic/NASHORN-304.js
new file mode 100644
index 00000000000..3f3e52f78b7
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-304.js
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-304 :
+ *
+ * @test
+ * @run
+ */
+
+function func(x, y, z) {
+    z = arguments[arguments.length - 1];
+    return { length: arguments.length, x : x, y: y, z: z };
+}
+
+var res = func(42);
+
+if (res.length !== 1) {
+    fail("#1 arguments.length !== 1");
+}
+
+if (res.x !== 42) {
+    fail("#2 x != 42");
+}
+
+if (typeof res.y !== 'undefined') {
+    fail("#3 y is not undefined");
+}
+
+if (res.z !== 42) {
+    fail("#3 z != 42");
+}
diff --git a/nashorn/test/script/basic/NASHORN-310.js b/nashorn/test/script/basic/NASHORN-310.js
new file mode 100644
index 00000000000..4dc70c7d726
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-310.js
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-310 : Failed: test-next-tick-errors.js
+ *
+ * @test
+ * @run
+ */
+
+var obj = {};
+Object.defineProperty(obj, "nextTick", {
+    value: function(callback) {
+        (function() {
+            callback();
+        })();
+    }
+});
+
+obj.nextTick(function (foo) {
+    print("callback one");
+});
+
+obj.nextTick(function (foo) {
+    print("callback two");
+});
+
+function func(callback) {
+    (function() {
+        callback();
+     })();
+}
+
+func(function() { print("callback one"); });
+func(function() { print("callback two"); });
+
+
diff --git a/nashorn/test/script/basic/NASHORN-310.js.EXPECTED b/nashorn/test/script/basic/NASHORN-310.js.EXPECTED
new file mode 100644
index 00000000000..8c9b382c7df
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-310.js.EXPECTED
@@ -0,0 +1,4 @@
+callback one
+callback two
+callback one
+callback two
diff --git a/nashorn/test/script/basic/NASHORN-318.js b/nashorn/test/script/basic/NASHORN-318.js
new file mode 100644
index 00000000000..411631ccc43
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-318.js
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-318 : (null == {}) evaluates to true and (null != {}) evaluates to false
+ *
+ * @test
+ * @run
+ */
+
+print("null == {} ? " + (null == {}));
+print("null != {} ? " + (null != {}));
+
+var x = null;
+print("null == x ? " + (null == x));
+print("x == null ? " + (x == null));
diff --git a/nashorn/test/script/basic/NASHORN-318.js.EXPECTED b/nashorn/test/script/basic/NASHORN-318.js.EXPECTED
new file mode 100644
index 00000000000..8b649a4e3a7
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-318.js.EXPECTED
@@ -0,0 +1,4 @@
+null == {} ? false
+null != {} ? true
+null == x ? true
+x == null ? true
diff --git a/nashorn/test/script/basic/NASHORN-32.js b/nashorn/test/script/basic/NASHORN-32.js
new file mode 100644
index 00000000000..fa884e00665
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-32.js
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-32: should not be able to read, write, call properties from null literal.
+ *
+ * @test
+ * @run
+ */
+
+try {
+    print(null["foo"]);
+} catch (e) {
+    print(e instanceof TypeError);
+    print(e);
+}
+
+try {
+    print(null.foo);
+} catch (e) {
+    print(e instanceof TypeError);
+    print(e);
+}
+
+try {
+    null["foo"] = 55;
+} catch (e) {
+    print(e instanceof TypeError);
+    print(e);
+}
+
+try {
+    null.foo = 55;
+} catch (e) {
+    print(e instanceof TypeError);
+    print(e);
+}
+
+try {
+    print(null.foo());
+} catch (e) {
+    print(e instanceof TypeError);
+    print(e);
+}
+
+try {
+    print(new null());
+} catch (e) {
+    print(e instanceof TypeError);
+    print(e);
+}
diff --git a/nashorn/test/script/basic/NASHORN-32.js.EXPECTED b/nashorn/test/script/basic/NASHORN-32.js.EXPECTED
new file mode 100644
index 00000000000..6c086411fca
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-32.js.EXPECTED
@@ -0,0 +1,12 @@
+true
+TypeError: Cannot get property "foo" of null
+true
+TypeError: Cannot get property "foo" of null
+true
+TypeError: Cannot set property "foo" of null
+true
+TypeError: Cannot set property "foo" of null
+true
+TypeError: null has no such function "foo"
+true
+TypeError: null is not a function
diff --git a/nashorn/test/script/basic/NASHORN-321.js b/nashorn/test/script/basic/NASHORN-321.js
new file mode 100644
index 00000000000..d34e873aba2
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-321.js
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-321 : Global function change is not seen by a callsite
+ *
+ * @test
+ * @run
+ */
+
+function func() {
+   print("func one");
+}
+
+function f() { func(); }
+
+f();
+
+func = function() {
+   print("func two");
+}
+
+f();
diff --git a/nashorn/test/script/basic/NASHORN-321.js.EXPECTED b/nashorn/test/script/basic/NASHORN-321.js.EXPECTED
new file mode 100644
index 00000000000..88ac4b6277b
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-321.js.EXPECTED
@@ -0,0 +1,2 @@
+func one
+func two
diff --git a/nashorn/test/script/basic/NASHORN-323.js b/nashorn/test/script/basic/NASHORN-323.js
new file mode 100644
index 00000000000..41ba7222555
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-323.js
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-323 : Broken int EQ/NE
+ *
+ * @test
+ * @run
+ */
+
+function f() {
+    var x = 8;
+    print (x == 4);
+}
+
+f();
+
+
diff --git a/nashorn/test/script/basic/NASHORN-323.js.EXPECTED b/nashorn/test/script/basic/NASHORN-323.js.EXPECTED
new file mode 100644
index 00000000000..c508d5366f7
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-323.js.EXPECTED
@@ -0,0 +1 @@
+false
diff --git a/nashorn/test/script/basic/NASHORN-324.js b/nashorn/test/script/basic/NASHORN-324.js
new file mode 100644
index 00000000000..181cde31e81
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-324.js
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-324 : Array.prototype.reduceRight function broken
+ *
+ * @test
+ * @run
+ */
+
+var called = 0;
+
+function callbackfn(preVal, val, idx, obj) {
+    called++;
+}
+
+var arr = [0, 1, 2, 3];
+Object.defineProperty(arr, "4", {
+    get: function () { arr.length = 2; },
+    configurable: true
+});
+
+arr.reduceRight(callbackfn, "initialValue");
+
+if (called !== 3) {
+    fail("called count !== 3");
+}
diff --git a/nashorn/test/script/basic/NASHORN-33.js b/nashorn/test/script/basic/NASHORN-33.js
new file mode 100644
index 00000000000..13ba60f1e04
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-33.js
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-33 : local variable type inference should take all paths into account.
+ *
+ * @test
+ * @run
+ */
+
+function func(y) {
+   var x;
+
+   if (y == 1) {
+      x = 4.4;
+   }
+
+   return x;
+}
+
+print(typeof(func(1)));
+print(typeof(func(0)));
+
+
+
diff --git a/nashorn/test/script/basic/NASHORN-33.js.EXPECTED b/nashorn/test/script/basic/NASHORN-33.js.EXPECTED
new file mode 100644
index 00000000000..72ce2f4e8e6
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-33.js.EXPECTED
@@ -0,0 +1,2 @@
+number
+undefined
diff --git a/nashorn/test/script/basic/NASHORN-331.js b/nashorn/test/script/basic/NASHORN-331.js
new file mode 100644
index 00000000000..5294a2d60bc
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-331.js
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-331 : Nan compares 
+ *
+ * @test
+ * @run
+ */
+
+print(undefined == null);
+print(undefined != null);
+print(undefined === null);
+print(undefined !== null);
+print(null == undefined);
+print(null != undefined);
+print(null === undefined);
+print(null !== undefined);
+
+var n = Math.NaN;
+var x = 17;
+print(x < n);
+print(x > n);
+print(x >= n);
+print(x <= n);
+print(x == n);
+print(x != n);
+print(x == n);
+print(x !== n);
+
+var u = undefined;
+var y = 18;
+print(x < u);
+print(x > u);
+print(x >= u);
+print(x <= u);
+print(x == u);
+print(x != u);
+print(x == u);
+print(x !== u);
diff --git a/nashorn/test/script/basic/NASHORN-331.js.EXPECTED b/nashorn/test/script/basic/NASHORN-331.js.EXPECTED
new file mode 100644
index 00000000000..7681906b6fe
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-331.js.EXPECTED
@@ -0,0 +1,24 @@
+true
+false
+false
+true
+true
+false
+false
+true
+false
+false
+false
+false
+false
+true
+false
+true
+false
+false
+false
+false
+false
+true
+false
+true
diff --git a/nashorn/test/script/basic/NASHORN-337.js b/nashorn/test/script/basic/NASHORN-337.js
new file mode 100644
index 00000000000..1a5efbe87e4
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-337.js
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-337 - Erroneous DCMPL/DCMPG instructions were generated
+ * 
+ * @test
+ * @run
+ */
+
+var x;
+
+print("Value: " + x);
+print("Numerical Value: " + (+x));
+print("Boolean Value(>0): " + ((+x) > 0));
+print("Boolean Value(<0): " + ((+x) < 0));
+print("Boolean Value(==0): " + ((+x) == 0));
+
+print("NaN > 0? " + (NaN > 0));
+print("NaN < 0? " + (NaN < 0));
+print("NaN == 0? " + (NaN == 0));
+
+
diff --git a/nashorn/test/script/basic/NASHORN-337.js.EXPECTED b/nashorn/test/script/basic/NASHORN-337.js.EXPECTED
new file mode 100644
index 00000000000..e1c2259c461
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-337.js.EXPECTED
@@ -0,0 +1,8 @@
+Value: undefined
+Numerical Value: NaN
+Boolean Value(>0): false
+Boolean Value(<0): false
+Boolean Value(==0): false
+NaN > 0? false
+NaN < 0? false
+NaN == 0? false
diff --git a/nashorn/test/script/basic/NASHORN-34.js b/nashorn/test/script/basic/NASHORN-34.js
new file mode 100644
index 00000000000..78f823206f5
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-34.js
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Extend Java abstract classes using script functions.
+ *
+ * @test
+ * @run
+ */
+
+var task = new java.util.TimerTask({
+    run: function() {
+        print("Inside run function");
+    }
+});
+
+// now call the 'run' method on the extended class
+task.run();
+
+// The following sytax sugar should also be fine..
+
+var task2 = new java.util.TimerTask() {
+   run: function() {
+       print("This is TimerTask.run");
+   }
+};
+
+task2.run();
+
diff --git a/nashorn/test/script/basic/NASHORN-34.js.EXPECTED b/nashorn/test/script/basic/NASHORN-34.js.EXPECTED
new file mode 100644
index 00000000000..221834d3a0d
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-34.js.EXPECTED
@@ -0,0 +1,2 @@
+Inside run function
+This is TimerTask.run
diff --git a/nashorn/test/script/basic/NASHORN-340.js b/nashorn/test/script/basic/NASHORN-340.js
new file mode 100644
index 00000000000..811924334fd
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-340.js
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-340 : Uninitialized variables incorrectly handled in array literals.
+ *
+ * @test
+ * @run
+ */
+
+var x;
+var undef = undefined;
+var a = [ 1, x ];
+var b = [ 3.14, x ];
+var c = [ x ];
+var d = [ 1, undef ];
+var e = [ 1, undefined ];
+var f = [ 1, , ];
+print('"' + a + '"');
+print('"' + b + '"');
+print('"' + c + '"');
+print('"' + d + '"');
+print('"' + e + '"');
+print('"' + f + '"');
diff --git a/nashorn/test/script/basic/NASHORN-340.js.EXPECTED b/nashorn/test/script/basic/NASHORN-340.js.EXPECTED
new file mode 100644
index 00000000000..9324ebfa0b5
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-340.js.EXPECTED
@@ -0,0 +1,6 @@
+"1,"
+"3.14,"
+""
+"1,"
+"1,"
+"1,"
diff --git a/nashorn/test/script/basic/NASHORN-349.js b/nashorn/test/script/basic/NASHORN-349.js
new file mode 100644
index 00000000000..982cca83f9e
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-349.js
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Remove lower optimization to transform obj['foo'] as obj.foo
+ *
+ * @test
+ * @run
+ */
+
+var m = new java.util.HashMap();
+m.put("foo", "hello");
+
+// map allows keys to be accessed using indexed access
+if (m['foo'] !== 'hello') {
+    fail("m['foo'] !== 'hello'");
+}
+
+var prop = 'foo';
+if (m[prop] !== 'hello') {
+    fail("m['foo'] !== 'hello'");
+}
+
+// map keys are accessible as properties when there's no matching bean property.
+if (m.foo !== 'hello') {
+    fail("m.foo !== 'hello'");
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-354.js b/nashorn/test/script/basic/NASHORN-354.js
new file mode 100644
index 00000000000..658cc86a435
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-354.js
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-354
+ *
+ * @test
+ * @run
+ */
+
+function f() {
+    var zero = 0;
+    return zero !== false;
+}
+var i = 0;
+function g() {
+    return (i++) !== false;
+}
+print(f());
+print(g());
+print(i);
diff --git a/nashorn/test/script/basic/NASHORN-354.js.EXPECTED b/nashorn/test/script/basic/NASHORN-354.js.EXPECTED
new file mode 100644
index 00000000000..a46dbf759e3
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-354.js.EXPECTED
@@ -0,0 +1,3 @@
+true
+true
+1
diff --git a/nashorn/test/script/basic/NASHORN-355.js b/nashorn/test/script/basic/NASHORN-355.js
new file mode 100644
index 00000000000..135e1634942
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-355.js
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-355
+ *
+ * @test
+ * @run
+ */
+
+var a = "gorilla";
+
+var c = function() {
+  this.a = "ape";
+  this.m = function() { print("a=" + this.a); };
+}
+
+var o = new c();
+o.m();
+o["m"]();
+var method = "m";
+o[method]();
diff --git a/nashorn/test/script/basic/NASHORN-355.js.EXPECTED b/nashorn/test/script/basic/NASHORN-355.js.EXPECTED
new file mode 100644
index 00000000000..5359eb2cc9d
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-355.js.EXPECTED
@@ -0,0 +1,3 @@
+a=ape
+a=ape
+a=ape
diff --git a/nashorn/test/script/basic/NASHORN-36.js b/nashorn/test/script/basic/NASHORN-36.js
new file mode 100644
index 00000000000..ffe6e2363fe
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-36.js
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-36 : Not all line terminators are accepted for single line comments.
+ *
+ * @test
+ * @run
+ */
+
+// refer to ECMA section 7.3 Line Terminators
+// Table 3 Line Terminator Characters.
+
+// Because line comment ends with any of line terminators
+// the following evals should set global 'x' with values.
+
+eval("// line comment\u000A x = 1;");
+print(x); // should print 1
+
+eval("// line comment\u000D x = 2;");
+print(x); // should print 2
+
+eval("// line comment\u2028 x = 3;");
+print(x); // should print 3
+
+eval("// line comment\u2029 x = 4;");
+print(x); // should print 4
+
diff --git a/nashorn/test/script/basic/NASHORN-36.js.EXPECTED b/nashorn/test/script/basic/NASHORN-36.js.EXPECTED
new file mode 100644
index 00000000000..94ebaf90016
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-36.js.EXPECTED
@@ -0,0 +1,4 @@
+1
+2
+3
+4
diff --git a/nashorn/test/script/basic/NASHORN-365.js b/nashorn/test/script/basic/NASHORN-365.js
new file mode 100644
index 00000000000..857c09390d7
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-365.js
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-365 : JSON.parse should complain about junk at the end of the parsed string
+ *
+ * @test
+ * @run
+ */
+
+function check(str) {
+    try {
+        JSON.parse(str);
+        fail("should have got SyntaxError for " + str);
+    } catch (e) {
+        if (! (e instanceof SyntaxError)) {
+            fail("SyntaxError expected got " + e);
+        }
+    }
+}
+
+check("34\t454");
+check("34  55");
+check("{ 'foo': 34 } 343");
+check("[344, 55] 454");
diff --git a/nashorn/test/script/basic/NASHORN-366.js b/nashorn/test/script/basic/NASHORN-366.js
new file mode 100644
index 00000000000..69f99ece3fc
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-366.js
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-366 : RegExp.prototype is a RegExp object and should support properties like source, global etc.
+ *
+ * @test
+ * @run
+ */
+
+print(typeof RegExp.prototype.lastIndex)
+print(typeof RegExp.prototype.source)
+print(typeof RegExp.prototype.global)
+print(typeof RegExp.prototype.ignoreCase)
+print(typeof RegExp.prototype.multiline)
diff --git a/nashorn/test/script/basic/NASHORN-366.js.EXPECTED b/nashorn/test/script/basic/NASHORN-366.js.EXPECTED
new file mode 100644
index 00000000000..5316ccb2960
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-366.js.EXPECTED
@@ -0,0 +1,5 @@
+number
+string
+boolean
+boolean
+boolean
diff --git a/nashorn/test/script/basic/NASHORN-368.js b/nashorn/test/script/basic/NASHORN-368.js
new file mode 100644
index 00000000000..6799e5f96dd
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-368.js
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-368: RegExp.exec: lastIndex not reset to 0 if lastIndex == string.length()
+ *
+ * @test
+ * @run
+ */
+
+function test() {
+  var r = /regex/g;
+  var str = "regex regex regex";
+  var str2 = "nooooooooooooooooooooo!";
+  for (var i = 0; i < 10; i++) {
+    print(r.exec(i != 6 ? str : str2));
+    print(r.lastIndex);
+  }
+}
+test();
diff --git a/nashorn/test/script/basic/NASHORN-368.js.EXPECTED b/nashorn/test/script/basic/NASHORN-368.js.EXPECTED
new file mode 100644
index 00000000000..75fa806e4a5
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-368.js.EXPECTED
@@ -0,0 +1,20 @@
+regex
+5
+regex
+11
+regex
+17
+null
+0
+regex
+5
+regex
+11
+null
+0
+regex
+5
+regex
+11
+regex
+17
diff --git a/nashorn/test/script/basic/NASHORN-37.js b/nashorn/test/script/basic/NASHORN-37.js
new file mode 100644
index 00000000000..e15eb85fb4b
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-37.js
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-37 :  object and array properties defined with special keys can be accessed be by special or string keys
+ * 
+ * @test
+ * @run
+ */
+
+var obj = {};
+
+obj[true] = "hello";
+print(obj["true"]);
+print(obj[true]);
+
+obj["false"] = 33;
+print(obj[false]);
+print(obj['false']);
+
+obj[null] = "foo";
+print(obj["null"]);
+print(obj[null]);
+
+obj[undefined] = "bar";
+print(obj["undefined"]);
+print(obj["undefined"]);
+
+obj[33] = 343;
+print(obj[33]);
+print(obj['33']);
+
+obj['2'] = 3.14;
+print(obj[2]);
+print(obj['2']);
+
+var key = {
+    toString: function() {
+        print("key.toString called");
+        return 'key';
+    }
+};
+
+obj[key] = 'value';
+print(obj[key]);
+print(obj['key']);
+
+var array = [ "foo", "bar" ];
+
+print(array[0]);
+print(array["0"]);
+
+print(array[1]);
+print(array["1"]);
+
diff --git a/nashorn/test/script/basic/NASHORN-37.js.EXPECTED b/nashorn/test/script/basic/NASHORN-37.js.EXPECTED
new file mode 100644
index 00000000000..1ddbb0542e9
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-37.js.EXPECTED
@@ -0,0 +1,20 @@
+hello
+hello
+33
+33
+foo
+foo
+bar
+bar
+343
+343
+3.14
+3.14
+key.toString called
+key.toString called
+value
+value
+foo
+foo
+bar
+bar
diff --git a/nashorn/test/script/basic/NASHORN-375.js b/nashorn/test/script/basic/NASHORN-375.js
new file mode 100644
index 00000000000..055b94e737c
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-375.js
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-375 : Invalid hex and unicode escapes in strings and identifiers are not reported as error
+ *
+ * @test
+ * @run
+ */
+
+function check(code) {
+    try {
+        eval(code);
+        fail("should have thrown SyntaxError for " + name);
+    } catch (e) {
+        if (! (e instanceof SyntaxError)) {
+            print("Expected SyntaxError for " + name + ", got " + e);
+        }
+    }
+}
+
+// invalid hex escape in string
+check("var str = '\\xzworld';");
+
+// invalid unicode escape in string
+check("var s = '\\uihello';");
+
+// invalid hex escape in string
+check("var str = '\\xzworld';");
+
+if ("\x00" !== "\0") {
+    fail("'\\x00' != '\\0'");
+}
diff --git a/nashorn/test/script/basic/NASHORN-376.js b/nashorn/test/script/basic/NASHORN-376.js
new file mode 100644
index 00000000000..ef16f18175f
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-376.js
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-376 : using 'this' keyword as operand for ++ or -- or as L-value of assignment operator should result in error
+ *
+ * @test
+ * @run
+ */
+
+function check(code) {
+    try {
+        eval(code);
+        fail("should have result in error " + code);
+    } catch (e) {
+        if (! (e instanceof ReferenceError)) {
+            fail("ReferenceError expected for '" + code + "' , got " + e);
+        }
+    }
+}
+
+check("this = 4;");
+check("this++");
+check("++this");
+check("this--");
+check("--this");
diff --git a/nashorn/test/script/basic/NASHORN-377.js b/nashorn/test/script/basic/NASHORN-377.js
new file mode 100644
index 00000000000..12edc91153e
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-377.js
@@ -0,0 +1,226 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * NASHORN-377: Typed arrays.
+ *
+ * @test
+ * @run
+ */
+
+var types = [Int8Array,Uint8Array,Uint8ClampedArray,Int16Array,Uint16Array,Int32Array,Uint32Array,Float32Array,Float64Array];
+
+//---------------------------------------------------------------------------
+// utility functions
+//---------------------------------------------------------------------------
+function tohex(d, w) {
+  var hex = Number(d).toString(16);
+  var pad = (w ? w : 8) - hex.length;
+  hex = "00000000".substr(0, pad) + hex;
+  return hex;
+}
+
+function arrstr(a, n, w) {
+  var s = "";
+  if (typeof n == "undefined") n = a.length;
+  if (typeof w == "undefined") w = a.BYTES_PER_ELEMENT * 2;
+  for (var i = 0; i < n; i++) {
+    s += tohex(a[i], w);
+  }
+  return s;
+}
+function bufstr(b) {
+  if (b.buffer !== undefined) {
+    b = b.buffer;
+  }
+  return arrstr(new Uint8Array(b));
+}
+
+function assertFail(f) {
+  try {
+    f();
+  } catch (e) {
+    //print(e);
+    return;
+  }
+  throw "assertion failed: expected exception";
+}
+
+function assertTrue(f) {
+  if (f() !== true) throw "assertion failed: " + f;
+}
+
+function isUndefined(x) {
+  return typeof x === "undefined";
+}
+
+function fillArray(a, start) {
+  if (typeof start == "undefined") start = 1;
+  for (var i = 0; i < a.length; i++) {
+    a[i] = i + start;
+  }
+  return a;
+}
+
+//---------------------------------------------------------------------------
+// tests
+//---------------------------------------------------------------------------
+(function() {
+  var b = new ArrayBuffer(8);
+  var i8 = new Int8Array(b);
+  print(i8.buffer.byteLength, b.byteLength, i8.buffer === b, b.length);
+  print(b, i8.buffer, i8);
+})();
+
+(function test_attributes() {
+  var b = new ArrayBuffer(8);
+  for (var i in types) {
+    var x = new types[i](b);
+    print(x.byteOffset, x.byteLength, x.length, x.BYTES_PER_ELEMENT);
+    assertTrue(function(){ return x.constructor === types[i] });
+  }
+})();
+
+(function() {
+  var b = new ArrayBuffer(8);
+  var i8 = new Int8Array(b);
+  fillArray(i8, 0x70);
+
+  var i8_2 = new Int8Array(b, 2);
+  var i8_2_4 = new Uint8Array(b, 2, 4);
+
+  i8_2_4[3] = 0x80;
+
+  print(arrstr(i8, 8, 2)  + " " + bufstr(i8));
+  print(arrstr(i8_2, 6)   + " " + i8_2.byteOffset   + " " + i8_2.byteLength);
+  print(arrstr(i8_2_4, 4) + " " + i8_2_4.byteOffset + " " + i8_2_4.byteLength);
+
+  var i8_1_5 = i8.subarray(1, 5);
+  i8_2_4.subarray(1, 5);
+  print(arrstr(i8_1_5, 4) + " " + i8_1_5.byteOffset + " " + i8_1_5.byteLength);
+
+  print(bufstr(b.slice(1,7)));
+})();
+
+(function() {
+  var b = new ArrayBuffer(8);
+  fillArray(new Int8Array(b), 0x70);
+  new Int8Array(b)[5] = 0x80;
+
+  var i32 = new Int32Array(b);
+  var u32 = new Uint32Array(b);
+  print(arrstr(i32), i32[0], i32[1]);
+  i32[1] = 0xfefdfcfb;
+  print(arrstr(i32), i32[0], i32[1]);
+  print(arrstr(u32), u32[0], u32[1]);
+
+  var pi = 3.1415926;
+  var f32 = new Float32Array(b);
+  var f64 = new Float64Array(b);
+  f32[0] = pi;
+  print(bufstr(b), f32.length);
+  f64[0] = pi;
+  print(bufstr(b), f64.length);
+  print(arrstr(u32), u32[0], u32[1]);
+
+  var d = new Int32Array(3);
+  d.set(i32,1);
+  print(bufstr(d));
+
+  var s = new Int16Array(b);
+  var t = new Uint16Array(b);
+  print(arrstr(s), arrstr(t));
+  s[0] = -1; s[1] = 0x80;
+  print(arrstr(s), arrstr(t));
+})();
+
+(function enumerate_properties() {
+  var i8 = new Int8Array(new ArrayBuffer(8));
+  var s = ""; for (var i in i8) { s += i + " "; } print(s.trim());
+})();
+
+// check that ScriptObject fallback is still working
+// DISABLED because correct behavior is unclear
+(function() {
+  // NB: firefox will never set any out-of-bounds or non-array values although it does get both from prototype.
+  var z = new Uint8Array(4);
+  z["asdf"] = "asdf"; print(z["asdf"]);
+  z[0x100000000] = "asdf"; print(z[0x100000000]);
+  z[-1] = "asdf"; print(z[-1]);
+
+  // v8 and nashorn disagree on out-of-bounds uint32 indices: v8 won't go to the prototype.
+  z[0xf0000000] = "asdf"; print(z[0xf0000000]);
+  z[0xffffffff] = "asdf"; print(z[0xffffffff]);
+  z[0x70000000] = "asdf"; print(z[0x70000000]);
+
+  // this will work in firefox and nashorn (not in v8).
+  Uint8Array.prototype[4] = "asdf"; print(z[4]);
+});
+
+(function test_exceptions() {
+  assertFail(function() { new Int32Array(new ArrayBuffer(7)); });
+  assertFail(function() { new Int32Array(new ArrayBuffer(8), 0, 4); });
+  assertFail(function() { new Int32Array(new ArrayBuffer(8),-1, 2); });
+  assertFail(function() { new Int32Array(new ArrayBuffer(8), 0,-1); });
+})();
+
+(function test_subarray() {
+  var x = fillArray(new Int8Array(8));
+  print(arrstr(x));
+  print("subarray(2,4)=" + arrstr(x.subarray(2, 4)), "subarray(-6,-4)=" + arrstr(x.subarray(-6, -4))); // negative index refers from the end of the array
+  print(arrstr(x.subarray(-10, -2))); // negative index clamped to 0
+  assertTrue(function(){ return arrstr(x.subarray(6, 4)) === ""; }); // negative length clamped to 0
+  print(arrstr(x.subarray(1,-1).subarray(1,-1)), arrstr(x.subarray(1,-1).subarray(1,-1).subarray(1,-1))); // subarray of subarray
+})();
+
+(function test_slice() {
+  var b = ArrayBuffer(16);
+  fillArray(new Int8Array(b));
+  print(bufstr(b));
+  print("slice(4,8)=" + bufstr(b.slice(4, 8)), "slice(-8,-4)=" + bufstr(b.slice(-8, -4))); // negative index refers from the end of the array
+  print(bufstr(b.slice(-20, -4))); // negative index clamped to 0
+  assertTrue(function(){ return bufstr(b.slice(8, 4)) === ""; }); // negative length clamped to 0
+  print(arrstr(new Int16Array(b.slice(1,-1).slice(2,-1).slice(1,-2).slice(1,-1)))); // slice of slice
+})();
+
+(function test_clamped() {
+  var a = new Uint8ClampedArray(10);
+  a[0] = -17;       // clamped to 0
+  a[1] = 4711;      // clamped to 255
+  a[2] = 17.5;      // clamped to 18
+  a[3] = 16.5;      // clamped to 16
+  a[4] = 255.9;     // clamped to 255
+  a[5] = Infinity;  // clamped to 255
+  a[6] = -Infinity; // clamped to 0
+  a[7] = NaN;       // 0
+  assertTrue(function(){ return a[0] === 0 && a[1] === 255 && a[2] === 18 && a[3] === 16 && a[4] === 255 && a[5] === 255 && a[6] === 0 && a[7] === 0; });
+})();
+
+(function test_out_of_bounds() {
+  var a = new Int32Array(10);
+  a[10] = 10;
+  a[100] = 100;
+  a[1000] = 1000;
+  assertTrue(function(){ return isUndefined(a[10]) && isUndefined(a[11]) && isUndefined(a[100]) && isUndefined(a[123]) && isUndefined(a[1000]); });
+})();
+
diff --git a/nashorn/test/script/basic/NASHORN-377.js.EXPECTED b/nashorn/test/script/basic/NASHORN-377.js.EXPECTED
new file mode 100644
index 00000000000..76bf14d2287
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-377.js.EXPECTED
@@ -0,0 +1,34 @@
+8 8 true undefined
+[object Object] [object Object] [object Object]
+0 8 8 1
+0 8 8 1
+0 8 8 1
+0 8 4 2
+0 8 4 2
+0 8 2 4
+0 8 2 4
+0 8 2 4
+0 8 1 8
+7071727374-807677 7071727374807677
+727374-807677 2 6
+72737480 2 4
+71727374 1 4
+717273748076
+7372717077768074 1936879984 2004254836
+73727170-1020305 1936879984 -16909061
+73727170fefdfcfb 1936879984 4278058235
+da0f4940fbfcfdfe 2
+4ad8124dfb210940 1
+4d12d84a400921fb 1293080650 1074340347
+000000004ad8124dfb210940
+-27b64d1221fb4009 d84a4d1221fb4009
+00-1008021fb4009 ffff008021fb4009
+0 1 2 3 4 5 6 7
+0102030405060708
+subarray(2,4)=0304 subarray(-6,-4)=0304
+010203040506
+03040506 0405
+0102030405060708090a0b0c0d0e0f10
+slice(4,8)=05060708 slice(-8,-4)=090a0b0c
+0102030405060708090a0b0c
+070609080b0a
diff --git a/nashorn/test/script/basic/NASHORN-378.js b/nashorn/test/script/basic/NASHORN-378.js
new file mode 100644
index 00000000000..61387c6bc99
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-378.js
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-378 : Redefining a configurable accessor property to be a data property on a non-extensible object fails with NPE
+ *
+ * @test
+ * @run
+ */
+
+var obj = {};
+Object.defineProperty(obj, "foo", 
+    { get: function() { return 42; },
+      configurable: true});
+
+if (obj.foo !== 42) {
+    fail("#0 obj.foo !== 42");
+}
+
+Object.preventExtensions(obj);
+Object.defineProperty(obj, "foo", { value: "hello"});
+
+var desc = Object.getOwnPropertyDescriptor(obj, "foo");
+
+if (obj.foo !== "hello") {
+    fail("#1 obj.foo !== 'hello'");
+}
+
+if (desc.get !== undefined) {
+    fail("#2 getter found on a date property");
+}
+
+if (desc.set !== undefined) {
+    fail("#3 setter found on a date property");
+}
+
+if (desc.value !== 'hello') {
+    fail("#4 value property is wrong");
+}
diff --git a/nashorn/test/script/basic/NASHORN-38.js b/nashorn/test/script/basic/NASHORN-38.js
new file mode 100644
index 00000000000..f0c8406a599
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-38.js
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-38 : Nested function is visible from the start of the outer function definition.
+ *
+ * @test
+ * @run
+ */
+
+function func(){
+    // 'f' is visible and it is function
+    // defined later in lexical order (see below)
+    print(typeof f);
+    return f;
+  
+    function f(){
+        print("inside function 'f'");
+    }
+}
+
+// calling the returned function from 'func'
+func()();
diff --git a/nashorn/test/script/basic/NASHORN-38.js.EXPECTED b/nashorn/test/script/basic/NASHORN-38.js.EXPECTED
new file mode 100644
index 00000000000..b1000c25486
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-38.js.EXPECTED
@@ -0,0 +1,2 @@
+function
+inside function 'f'
diff --git a/nashorn/test/script/basic/NASHORN-380.js b/nashorn/test/script/basic/NASHORN-380.js
new file mode 100644
index 00000000000..acbd683bfe0
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-380.js
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-380 : JSAdapter should support 'overrides' feature
+ *
+ * @test
+ * @run
+ */
+
+var obj = new JSAdapter({ foo: 444, bar: 6546 }) {
+   __get__: function(name) { print("in getter"); return name; }
+};
+
+print(obj.func);   // calls __get__('func')
+print(obj.foo);    // just gets 444 as it is a override
+print(obj.bar);    // get 6546 as it is a override
diff --git a/nashorn/test/script/basic/NASHORN-380.js.EXPECTED b/nashorn/test/script/basic/NASHORN-380.js.EXPECTED
new file mode 100644
index 00000000000..0b91e6d6966
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-380.js.EXPECTED
@@ -0,0 +1,4 @@
+in getter
+func
+444
+6546
diff --git a/nashorn/test/script/basic/NASHORN-381.js b/nashorn/test/script/basic/NASHORN-381.js
new file mode 100644
index 00000000000..ec1dd398e54
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-381.js
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-381 : JSAdapter override mechanism should not search properties of it's own proto
+ *
+ * @test
+ * @run
+ */
+
+var toStringAccessed = false;
+
+var obj = new JSAdapter({}) {
+    __get__: function(name) {
+        if (name == 'toString') {
+           toStringAccessed = true;
+        }
+    }
+};
+
+if (obj.toString === Object.prototype.toString) {
+    fail("JSAdapter uses Object.prototype properties");
+}
+
+if (! toStringAccessed) {
+    fail("JSAdapter does not use __get__ for toString access");
+}
diff --git a/nashorn/test/script/basic/NASHORN-382.js b/nashorn/test/script/basic/NASHORN-382.js
new file mode 100644
index 00000000000..65a039b305e
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-382.js
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-382 : We should be able to pass __proto__ to JSAdapter constructor.
+ *
+ * @test
+ * @run
+ */
+
+var obj1 = new JSAdapter() {};
+if (!(obj1 instanceof JSAdapter)) {
+    fail("#1 !(obj1 instanceof JSAdapter)");
+}
+
+function Buffer() {}
+var obj2 = new JSAdapter(Buffer.prototype, {}) {};
+if (!(obj2 instanceof Buffer)) {
+    fail("#2 !(obj2 instanceof Buffer)");
+}
diff --git a/nashorn/test/script/basic/NASHORN-383.js b/nashorn/test/script/basic/NASHORN-383.js
new file mode 100644
index 00000000000..b936826987c
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-383.js
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-383 : JSAdapter __get__ is not called from a callsite exercised earlier by an array object
+ *
+ * @test
+ * @run
+ */
+
+function func(obj) {
+    return obj[0];
+}
+
+var arr = [3, 4];
+if (arr[0] !== func(arr)) {
+    fail("#1 func does not return array element");
+}
+
+var getterCalled = false;
+var res = func(new JSAdapter() {
+   __get__: function(name) {
+       getterCalled = true;
+       return name;
+   }
+});
+
+if (! getterCalled) {
+    fail("#2 __get__ not called");
+}
+
+if (res !== 0) {
+    fail("#3 __get__ did not return '0'");
+}
diff --git a/nashorn/test/script/basic/NASHORN-384.js b/nashorn/test/script/basic/NASHORN-384.js
new file mode 100644
index 00000000000..e62cd52ca9b
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-384.js
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * NASHORN-384 : array pop preceded by shift does not work as expected
+ *
+ * @test
+ * @run
+ */
+
+var a = [1, 2];
+print(a.shift());
+print(a.pop());
+
diff --git a/nashorn/test/script/basic/NASHORN-384.js.EXPECTED b/nashorn/test/script/basic/NASHORN-384.js.EXPECTED
new file mode 100644
index 00000000000..1191247b6d9
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-384.js.EXPECTED
@@ -0,0 +1,2 @@
+1
+2
diff --git a/nashorn/test/script/basic/NASHORN-385.js b/nashorn/test/script/basic/NASHORN-385.js
new file mode 100644
index 00000000000..6556e4e6bbf
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-385.js
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-385 : JSAdapter throws AssertionError when adaptee does not define hook methods like __get__, __put__ etc.
+ *
+ * @test
+ * @run
+ */
+
+var proto = {};
+var o = new JSAdapter(proto);
+
+function checkGetter() {
+    print("o.foo => " + o.foo);
+}
+
+function checkSetter() {
+    o.bar = 44;
+} 
+
+function checkCall() {
+    try {
+        o.func();
+    } catch (e) {
+        print(e);
+    }
+}
+
+checkGetter();
+checkSetter();
+checkCall();
+
+proto.__get__ = function(name) { 
+    print("in __get__: " + name); 
+    return name;
+};
+
+proto.__put__ = function(name) {
+    print("in __put__: " + name);
+}
+
+proto.__call__ = function(name) {
+    print("in __call__: " + name);
+}
+
+checkGetter();
+checkSetter();
+checkCall();
diff --git a/nashorn/test/script/basic/NASHORN-385.js.EXPECTED b/nashorn/test/script/basic/NASHORN-385.js.EXPECTED
new file mode 100644
index 00000000000..5765485cdbf
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-385.js.EXPECTED
@@ -0,0 +1,6 @@
+o.foo => undefined
+TypeError: [object JSAdapter] has no such function "func"
+in __get__: foo
+o.foo => foo
+in __put__: bar
+in __call__: func
diff --git a/nashorn/test/script/basic/NASHORN-389.js b/nashorn/test/script/basic/NASHORN-389.js
new file mode 100644
index 00000000000..d402a5dd5b0
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-389.js
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * NASHORN-389 : number to string conversion issues.
+ *
+ * @test
+ * @run
+ */
+
+print(1000000000000000000000);
+print(0.000000000100000000000);
+print(1e-5);
+var x = -1.23456789e+21;
+var y = -1.23456789e+20;
+print(x.toFixed(9));
+print(y.toFixed(9).indexOf(",") === -1); // no grouping
+//print(y.toFixed(9)); // FIXME expected: -123456788999999995904.000000000
+//print(1000000000000000128); // FIXME expected: 1000000000000000100
+//print((1000000000000000128).toFixed(0)); // FIXME expected: 1000000000000000128
diff --git a/nashorn/test/script/basic/NASHORN-389.js.EXPECTED b/nashorn/test/script/basic/NASHORN-389.js.EXPECTED
new file mode 100644
index 00000000000..5981d962a56
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-389.js.EXPECTED
@@ -0,0 +1,5 @@
+1e+21
+1e-10
+0.00001
+-1.23456789e+21
+true
diff --git a/nashorn/test/script/basic/NASHORN-393.js b/nashorn/test/script/basic/NASHORN-393.js
new file mode 100644
index 00000000000..e12a58b22a7
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-393.js
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * NASHORN-384 : array pop pops incorrect element
+ *
+ * @test
+ * @run
+ */
+
+var a = [1, 2];
+a.length = 4;
+
+print(a);
+a.pop();
+print(a);
+
diff --git a/nashorn/test/script/basic/NASHORN-393.js.EXPECTED b/nashorn/test/script/basic/NASHORN-393.js.EXPECTED
new file mode 100644
index 00000000000..1657afc5393
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-393.js.EXPECTED
@@ -0,0 +1,2 @@
+1,2,,
+1,2,
diff --git a/nashorn/test/script/basic/NASHORN-394.js b/nashorn/test/script/basic/NASHORN-394.js
new file mode 100644
index 00000000000..dc99a0850fc
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-394.js
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * NASHORN-394 : array pop converts undefined into 0
+ *
+ * @test
+ * @run
+ */
+
+var a = [];
+a.length = 2;
+print(a.pop());
+
diff --git a/nashorn/test/script/basic/NASHORN-394.js.EXPECTED b/nashorn/test/script/basic/NASHORN-394.js.EXPECTED
new file mode 100644
index 00000000000..417b7b5370d
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-394.js.EXPECTED
@@ -0,0 +1 @@
+undefined
diff --git a/nashorn/test/script/basic/NASHORN-396.js b/nashorn/test/script/basic/NASHORN-396.js
new file mode 100644
index 00000000000..a85fa1d07b6
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-396.js
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-396 : In strict mode ToObject conversion should not be done on thisArg
+ *
+ * @test
+ * @run
+ */
+ 
+Object.defineProperty(Number.prototype, 
+    "foo", 
+    { get: function () { 'use strict'; return this; }
+}); 
+
+if(!((5).foo === 5)) {
+    fail("#1 ToObject conversion on 'thisArg' for strict getter");
+}
+
+Number.prototype.func = function() { 
+    'use strict';
+    return this;
+};
+
+if ((typeof (34).func()) != 'number') {
+    fail("#2 ToObject called on 'thisArg' when calling strict func");
+}
diff --git a/nashorn/test/script/basic/NASHORN-397.js b/nashorn/test/script/basic/NASHORN-397.js
new file mode 100644
index 00000000000..bf73dc28614
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-397.js
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-397 : typeof on certain member access expressions computes to undefined wrongly
+ *
+ * @test
+ * @run
+ */
+
+Object.defineProperty(Number.prototype, 'x',
+    { get : function() { return 42; } });
+
+if (typeof (5).x !== 'number') {
+    fail("typeof(5).x is not 'number'");
+}
+
+if (typeof (java.lang.System.out) != 'object') {
+    fail("typeof java.lang.System.out is not 'object'");
+}
+
+if (typeof (java.lang.Math.PI) != 'number') {
+    fail("typeof java.lang.Math.PI is not 'number'");
+}
+
+if (typeof (java.io.File.separator) != 'string') {
+    fail("typeof java.io.File.separator is not 'string'");
+}
diff --git a/nashorn/test/script/basic/NASHORN-398.js b/nashorn/test/script/basic/NASHORN-398.js
new file mode 100644
index 00000000000..6c3528612d7
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-398.js
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-398 : Should not be able to set non-existing indexed property if object is not extensible
+ *
+ * @test
+ * @run
+ */
+
+function funcNonStrict(array) {
+    var obj = array? [] : {};
+    Object.preventExtensions(obj);
+    obj[0] = 12;
+    if (obj[0] === 12) {
+        fail("#1 obj[0] has been set");
+    }
+
+    if (obj.hasOwnProperty("0")) {
+        fail("#2 has property '0'");
+    }
+}
+
+funcNonStrict(true);
+funcNonStrict(false);
+
+function funcStrict(array) {
+    'use strict';
+
+    var obj = array? [] : {};
+    Object.preventExtensions(obj);
+    try {
+        obj[0] = 12;
+        fail("#3 should have thrown TypeError");
+    } catch (e) {
+        if (! (e instanceof TypeError)) {
+            fail("#4 TypeError expected, got " + e);
+        }
+    }
+
+    if (obj[0] === 12) {
+        fail("#5 obj[0] has been set");
+    }
+
+    if (obj.hasOwnProperty("0")) {
+        fail("has property '0'");
+    }
+}
+
+funcStrict(true);
+funcStrict(false);
+
diff --git a/nashorn/test/script/basic/NASHORN-40.js b/nashorn/test/script/basic/NASHORN-40.js
new file mode 100644
index 00000000000..f02a6eda2b7
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-40.js
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-40 : Member select expression without the select object expression (nothing before ".") crashes compiler with NPE.
+ *
+ * @test
+ * @run
+ */
+
+try {
+    eval("print(.foo)");
+} catch (e) {
+    print(e.toString().replace(/\\/g, '/'));
+}
+
+try {
+    eval(".bar = 3423;");
+} catch (e) {
+    print(e.toString().replace(/\\/g, '/'));
+}
diff --git a/nashorn/test/script/basic/NASHORN-40.js.EXPECTED b/nashorn/test/script/basic/NASHORN-40.js.EXPECTED
new file mode 100644
index 00000000000..0e03cab3084
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-40.js.EXPECTED
@@ -0,0 +1,6 @@
+SyntaxError: test/script/basic/NASHORN-40.js#32<eval>:1:6 Expected an operand but found .
+print(.foo)
+      ^
+SyntaxError: test/script/basic/NASHORN-40.js#38<eval>:1:0 Expected an operand but found .
+.bar = 3423;
+^
diff --git a/nashorn/test/script/basic/NASHORN-400.js b/nashorn/test/script/basic/NASHORN-400.js
new file mode 100644
index 00000000000..5ae1b8ad6da
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-400.js
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * NASHORN-400 : java.lang.VerifyError with shadow arguments.
+ *
+ * @test
+ * @run
+ */
+
+function test(value, cb) {
+    print(cb(value))
+}
+
+function x (er) {
+    if (!er) {}
+    test("nest", function (er) {
+        if (er) return er
+    });
+}
+x(5);
+
+function inof(a) {
+  if (!a) {}
+  return a instanceof Number;
+}
+inof(42);
+
+function forin(a) {
+  if (!a) {}
+  for (var i in a);
+}
+forin(42);
+
+function forinlocal() {
+ var I = 42;
+ for (var i in I) print(i);
+}
+forinlocal();
+
+function add(d) {
+  if (!d) {}
+  print(d + 10);
+}
+add("3")
+
diff --git a/nashorn/test/script/basic/NASHORN-400.js.EXPECTED b/nashorn/test/script/basic/NASHORN-400.js.EXPECTED
new file mode 100644
index 00000000000..e6257d6b9f3
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-400.js.EXPECTED
@@ -0,0 +1,2 @@
+nest
+310
diff --git a/nashorn/test/script/basic/NASHORN-401.js b/nashorn/test/script/basic/NASHORN-401.js
new file mode 100644
index 00000000000..0cee1cec33a
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-401.js
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-401 : Overloaded method resolution not selecting correctly between double, int, string
+ *
+ * @test
+ * @run
+ */
+
+var t = new Packages.jdk.nashorn.internal.runtime.Nashorn401TestSubject();
+
+print(t.method2(10));
+print(t.method2(10.2));
+print(t.method2("a"));
+
+print(t.method3("10"));
+print(t.method3("10.2"));
+print(t.method3("foo"));
+
+print(t.method4(10));
+print(t.method4(10.2));
+print(t.method4("foo"));
diff --git a/nashorn/test/script/basic/NASHORN-401.js.EXPECTED b/nashorn/test/script/basic/NASHORN-401.js.EXPECTED
new file mode 100644
index 00000000000..a8ee40669b9
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-401.js.EXPECTED
@@ -0,0 +1,9 @@
+int method 2
+double method 2
+string method 2
+double method 3: 10.0
+double method 3: 10.2
+double method 3: NaN
+int method 4: 10
+double method 4: 10.2
+double method 4: NaN
diff --git a/nashorn/test/script/basic/NASHORN-402.js b/nashorn/test/script/basic/NASHORN-402.js
new file mode 100644
index 00000000000..042bb4a8bcb
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-402.js
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-402 : Implement RegExp.prototype.compile function
+ *
+ * @test
+ * @run
+ */
+
+var str = "JavaScript is a scripting language";
+var re = new RegExp;
+re.compile ("\\w+", "g");
+var match;
+while ((match = re.exec(str)) != null) {
+    print(match.index + "-" + re.lastIndex + " " + match[0]);
+    if (! (match instanceof Array)) {
+        fail("RegExp.prototype.exec result has to be an array");
+    }
+    if (! Array.isArray(match)) {
+        fail("RegExp.prototype.exec result has to be an array");
+    }
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-402.js.EXPECTED b/nashorn/test/script/basic/NASHORN-402.js.EXPECTED
new file mode 100644
index 00000000000..cc6b538d931
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-402.js.EXPECTED
@@ -0,0 +1,5 @@
+0-10 JavaScript
+11-13 is
+14-15 a
+16-25 scripting
+26-34 language
diff --git a/nashorn/test/script/basic/NASHORN-404.js b/nashorn/test/script/basic/NASHORN-404.js
new file mode 100644
index 00000000000..9a57041570e
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-404.js
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-404 : Error.prototype and subtypes do not have any enumerable properties
+ *
+ * @test
+ * @run
+ */
+
+function check(name) {
+    var obj = this[name].prototype;
+    for (i in obj) {
+        fail("enumerable property: " + name  + ".prototype." + i);
+    }
+}
+
+check("Error");
+check("EvalError");
+check("RangeError");
+check("ReferenceError");
+check("SyntaxError");
+check("URIError");
diff --git a/nashorn/test/script/basic/NASHORN-405.js b/nashorn/test/script/basic/NASHORN-405.js
new file mode 100644
index 00000000000..8f4c449a68f
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-405.js
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-405 make sure slice does not modify arrays
+ * 
+ * @test
+ * @run
+ */
+
+var x = ['foo', '%zx'];
+var s = x.slice(1); 
+print(s);
+print(x);
+
diff --git a/nashorn/test/script/basic/NASHORN-405.js.EXPECTED b/nashorn/test/script/basic/NASHORN-405.js.EXPECTED
new file mode 100644
index 00000000000..c560c09e891
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-405.js.EXPECTED
@@ -0,0 +1,2 @@
+%zx
+foo,%zx
diff --git a/nashorn/test/script/basic/NASHORN-406.js b/nashorn/test/script/basic/NASHORN-406.js
new file mode 100644
index 00000000000..9089439d43a
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-406.js
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-406 : Property descriptor properties should be enumerable 
+ *
+ * @test
+ * @run
+ */
+
+var obj = {
+    foo : 10,
+    get bar() { return 32; },
+    set bar(x) {},
+};
+
+function checkData() {
+   var desc = Object.getOwnPropertyDescriptor(obj, "foo");
+   var enumSeen = false, writeSeen = false, 
+       configSeen = false, valueSeen = false;
+   for (i in desc) {
+       switch(i) {
+           case 'enumerable':
+               enumSeen = true; break;
+           case 'writable':
+               writeSeen = true; break;
+           case 'configurable':
+               configSeen = true; break;
+           case 'value':
+               valueSeen = true; break;
+       }
+   }
+   
+   return enumSeen && writeSeen && configSeen && valueSeen;
+}
+
+if (!checkData()) {
+    fail("data descriptor check failed");
+}
+
+function checkAccessor() {
+   var desc = Object.getOwnPropertyDescriptor(obj, "bar");
+   var enumSeen = false, getterSeen = false, 
+       configSeen = false, setterSeen = false;
+   for (i in desc) {
+       switch(i) {
+           case 'enumerable':
+               enumSeen = true; break;
+           case 'configurable':
+               configSeen = true; break;
+           case 'get':
+               getterSeen = true; break;
+           case 'set':
+               setterSeen = true; break;
+        }
+   }
+
+   return enumSeen && configSeen && getterSeen && setterSeen;
+}
+
+if (!checkAccessor()) {
+    fail("accessor descriptor check failed");
+}
diff --git a/nashorn/test/script/basic/NASHORN-408.js b/nashorn/test/script/basic/NASHORN-408.js
new file mode 100644
index 00000000000..a25a669d1ed
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-408.js
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-408 :Object.getOwnPropertyDescriptor does not work for String indices
+ *
+ * @test
+ * @run
+ */
+
+var str = new String("hello");
+for (var i = 0; i < str.length; i++) {
+    var desc = Object.getOwnPropertyDescriptor(str, i + '');
+    print("{ configurable: " + desc.configurable + ", " +
+    "enumerable: " + desc.enumerable + ", " +
+    "writable: " + desc.writable + ", " +
+    "value = " + desc.value + " }");
+}
diff --git a/nashorn/test/script/basic/NASHORN-408.js.EXPECTED b/nashorn/test/script/basic/NASHORN-408.js.EXPECTED
new file mode 100644
index 00000000000..0d72a3dd67a
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-408.js.EXPECTED
@@ -0,0 +1,5 @@
+{ configurable: false, enumerable: true, writable: false, value = h }
+{ configurable: false, enumerable: true, writable: false, value = e }
+{ configurable: false, enumerable: true, writable: false, value = l }
+{ configurable: false, enumerable: true, writable: false, value = l }
+{ configurable: false, enumerable: true, writable: false, value = o }
diff --git a/nashorn/test/script/basic/NASHORN-415.js b/nashorn/test/script/basic/NASHORN-415.js
new file mode 100644
index 00000000000..9dff33770aa
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-415.js
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-415 : Object.keys should return String indexes for String objects
+ *
+ * @test
+ * @run
+ */
+
+var str = new String("hello");
+
+print(Object.keys(str));
+str.foo = 33;
+print(Object.keys(str));
diff --git a/nashorn/test/script/basic/NASHORN-415.js.EXPECTED b/nashorn/test/script/basic/NASHORN-415.js.EXPECTED
new file mode 100644
index 00000000000..1e8a3a94a39
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-415.js.EXPECTED
@@ -0,0 +1,2 @@
+0,1,2,3,4
+0,1,2,3,4,foo
diff --git a/nashorn/test/script/basic/NASHORN-416.js b/nashorn/test/script/basic/NASHORN-416.js
new file mode 100644
index 00000000000..5b557271544
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-416.js
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-416 : Setting setter method using defineProperty erases old getter method
+ *
+ * @test
+ * @run
+ */
+
+var obj = {}
+
+function getter() { return 32; }
+
+Object.defineProperty(obj, "foo", 
+  { get: getter, configurable: true });
+
+function setter(x) { print(x); }
+
+Object.defineProperty(obj, "foo",
+ { set: setter });
+
+var desc = Object.getOwnPropertyDescriptor(obj, "foo");
+
+if (desc.get !== getter) {
+    fail("desc.get !== getter");
+}
+
+if (desc.set !== setter) {
+    fail("desc.set !== setter");
+}
diff --git a/nashorn/test/script/basic/NASHORN-417.js b/nashorn/test/script/basic/NASHORN-417.js
new file mode 100644
index 00000000000..db803696cd9
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-417.js
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-417 : Accessor descriptor property with undefined getter and setter is reported as data descriptor property
+ *
+ * @test
+ * @run
+ */
+
+var obj = {};
+Object.defineProperty(obj, "foo", {
+    get: undefined, set: undefined });
+
+var desc = Object.getOwnPropertyDescriptor(obj, "foo");
+if (! ('get' in desc)) {
+    fail("#1 desc does not have 'get'");
+}
+
+if (! ('set' in desc)) {
+    fail("#2 desc does not have 'set'");
+}
+
+if ('value' in desc) {
+    fail("#3 desc has 'value'");
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-418.js b/nashorn/test/script/basic/NASHORN-418.js
new file mode 100644
index 00000000000..9ecea634f10
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-418.js
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-418 : When a data descriptor property is changed to an accessor descriptor property, new configurable, enumerable flags are not set
+ *
+ * @test
+ * @run
+ */
+
+var obj = { foo: 33 };
+
+var oldDesc = Object.getOwnPropertyDescriptor(obj, "foo");
+if (! oldDesc.enumerable) {
+    fail("#1 'foo' is not enumerable");
+}
+
+if (! oldDesc.configurable) {
+    fail("#2 'foo' is not configurable");
+}
+
+Object.defineProperty(obj, "foo", {
+    enumerable: false, configurable: false,
+    get: function() { return 'hello' } });
+
+var newDesc = Object.getOwnPropertyDescriptor(obj, "foo");
+if (newDesc.enumerable) {
+    fail("#3 'foo' is enumerable");
+}
+
+if (newDesc.configurable) {
+    fail("#4 'foo' is configurable");
+}
+
+var obj2 = {};
+
+Object.defineProperty(obj2, "foo", {
+    value : 34, writable: false, configurable: true });
+
+var setterCalled = true;
+// descriptor type change, writable is not inherited
+Object.defineProperty(obj2, "foo", {
+  get: undefined, set: function(x) { setterCalled = true } });
+
+// can still attempt to write
+obj2.foo = 44;
+if (! setterCalled) {
+    fail("#5 obj2.foo setter not called");
+}
+
+var obj3 = {};
+
+Object.defineProperty(obj3, "foo", {
+  get: undefined, set: function(x) { }, configurable: true });
+
+Object.defineProperty(obj3, "foo", { value: 33 });
+
+var desc = Object.getOwnPropertyDescriptor(obj3, "foo");
+if (desc.writable) {
+    fail("#6 obj3.foo is writable");
+}
diff --git a/nashorn/test/script/basic/NASHORN-420.js b/nashorn/test/script/basic/NASHORN-420.js
new file mode 100644
index 00000000000..8b8bf4b08bb
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-420.js
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-420 : When an existing array element attributes are changed by defineProperty, element value becomes undefined
+ *
+ * @test
+ * @run
+ */
+
+var arrObj = [100];
+Object.defineProperty(arrObj, "0", {
+    writable: false,
+    enumerable: false,
+    configurable: false
+});
+
+var desc = Object.getOwnPropertyDescriptor(arrObj, "0");
+if (desc.value !== arrObj[0]) {
+    fail("#1 desc.value !== arrObj[0]");
+}
+
+if (desc.value !== 100) {
+    fail("#2 desc.value !== 100");
+}
diff --git a/nashorn/test/script/basic/NASHORN-421.js b/nashorn/test/script/basic/NASHORN-421.js
new file mode 100644
index 00000000000..057b6442c3b
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-421.js
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-421 : Many Array.prototype functions miss ToObject conversion of 'self' as required by specification
+ *
+ * @test
+ * @run
+ */
+
+function checkUndefined(name) {
+   try {
+       Array.prototype[name].call(undefined);
+       fail( name + " - no TypeError for undefined 'this'");
+       return false;
+    } catch (e) {
+       if (! (e instanceof TypeError)) {
+           throw e;
+       }
+    }
+}
+
+function checkNull(name) {
+   try {
+       Array.prototype[name].call(null);
+       fail(name + " - no TypeError for null 'this'");
+       return false;
+    } catch (e) {
+       if (! (e instanceof TypeError)) {
+           throw e;
+       }
+    }
+}
+
+var methods = [ "concat", "join", "pop", "push", "reverse", 
+    "shift", "unshift", "slice", "sort", "splice",
+    "indexOf", "lastIndexOf", "every", "some", "forEach", 
+    "map", "filter", "reduce", "reduceRight" ];
+
+for (var m in methods) {
+    checkUndefined(methods[m]);
+    checkNull(methods[m]);
+}
diff --git a/nashorn/test/script/basic/NASHORN-423.js b/nashorn/test/script/basic/NASHORN-423.js
new file mode 100644
index 00000000000..37f1cbe7e40
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-423.js
@@ -0,0 +1,4030 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-423 - Large scripts don't fit into a single class file and need to be split.
+ *
+ * @test
+ * @run
+ */
+
+print(0);
+print(1);
+print(2);
+print(3);
+print(4);
+print(5);
+print(6);
+print(7);
+print(8);
+print(9);
+print(10);
+print(11);
+print(12);
+print(13);
+print(14);
+print(15);
+print(16);
+print(17);
+print(18);
+print(19);
+print(20);
+print(21);
+print(22);
+print(23);
+print(24);
+print(25);
+print(26);
+print(27);
+print(28);
+print(29);
+print(30);
+print(31);
+print(32);
+print(33);
+print(34);
+print(35);
+print(36);
+print(37);
+print(38);
+print(39);
+print(40);
+print(41);
+print(42);
+print(43);
+print(44);
+print(45);
+print(46);
+print(47);
+print(48);
+print(49);
+print(50);
+print(51);
+print(52);
+print(53);
+print(54);
+print(55);
+print(56);
+print(57);
+print(58);
+print(59);
+print(60);
+print(61);
+print(62);
+print(63);
+print(64);
+print(65);
+print(66);
+print(67);
+print(68);
+print(69);
+print(70);
+print(71);
+print(72);
+print(73);
+print(74);
+print(75);
+print(76);
+print(77);
+print(78);
+print(79);
+print(80);
+print(81);
+print(82);
+print(83);
+print(84);
+print(85);
+print(86);
+print(87);
+print(88);
+print(89);
+print(90);
+print(91);
+print(92);
+print(93);
+print(94);
+print(95);
+print(96);
+print(97);
+print(98);
+print(99);
+print(100);
+print(101);
+print(102);
+print(103);
+print(104);
+print(105);
+print(106);
+print(107);
+print(108);
+print(109);
+print(110);
+print(111);
+print(112);
+print(113);
+print(114);
+print(115);
+print(116);
+print(117);
+print(118);
+print(119);
+print(120);
+print(121);
+print(122);
+print(123);
+print(124);
+print(125);
+print(126);
+print(127);
+print(128);
+print(129);
+print(130);
+print(131);
+print(132);
+print(133);
+print(134);
+print(135);
+print(136);
+print(137);
+print(138);
+print(139);
+print(140);
+print(141);
+print(142);
+print(143);
+print(144);
+print(145);
+print(146);
+print(147);
+print(148);
+print(149);
+print(150);
+print(151);
+print(152);
+print(153);
+print(154);
+print(155);
+print(156);
+print(157);
+print(158);
+print(159);
+print(160);
+print(161);
+print(162);
+print(163);
+print(164);
+print(165);
+print(166);
+print(167);
+print(168);
+print(169);
+print(170);
+print(171);
+print(172);
+print(173);
+print(174);
+print(175);
+print(176);
+print(177);
+print(178);
+print(179);
+print(180);
+print(181);
+print(182);
+print(183);
+print(184);
+print(185);
+print(186);
+print(187);
+print(188);
+print(189);
+print(190);
+print(191);
+print(192);
+print(193);
+print(194);
+print(195);
+print(196);
+print(197);
+print(198);
+print(199);
+print(200);
+print(201);
+print(202);
+print(203);
+print(204);
+print(205);
+print(206);
+print(207);
+print(208);
+print(209);
+print(210);
+print(211);
+print(212);
+print(213);
+print(214);
+print(215);
+print(216);
+print(217);
+print(218);
+print(219);
+print(220);
+print(221);
+print(222);
+print(223);
+print(224);
+print(225);
+print(226);
+print(227);
+print(228);
+print(229);
+print(230);
+print(231);
+print(232);
+print(233);
+print(234);
+print(235);
+print(236);
+print(237);
+print(238);
+print(239);
+print(240);
+print(241);
+print(242);
+print(243);
+print(244);
+print(245);
+print(246);
+print(247);
+print(248);
+print(249);
+print(250);
+print(251);
+print(252);
+print(253);
+print(254);
+print(255);
+print(256);
+print(257);
+print(258);
+print(259);
+print(260);
+print(261);
+print(262);
+print(263);
+print(264);
+print(265);
+print(266);
+print(267);
+print(268);
+print(269);
+print(270);
+print(271);
+print(272);
+print(273);
+print(274);
+print(275);
+print(276);
+print(277);
+print(278);
+print(279);
+print(280);
+print(281);
+print(282);
+print(283);
+print(284);
+print(285);
+print(286);
+print(287);
+print(288);
+print(289);
+print(290);
+print(291);
+print(292);
+print(293);
+print(294);
+print(295);
+print(296);
+print(297);
+print(298);
+print(299);
+print(300);
+print(301);
+print(302);
+print(303);
+print(304);
+print(305);
+print(306);
+print(307);
+print(308);
+print(309);
+print(310);
+print(311);
+print(312);
+print(313);
+print(314);
+print(315);
+print(316);
+print(317);
+print(318);
+print(319);
+print(320);
+print(321);
+print(322);
+print(323);
+print(324);
+print(325);
+print(326);
+print(327);
+print(328);
+print(329);
+print(330);
+print(331);
+print(332);
+print(333);
+print(334);
+print(335);
+print(336);
+print(337);
+print(338);
+print(339);
+print(340);
+print(341);
+print(342);
+print(343);
+print(344);
+print(345);
+print(346);
+print(347);
+print(348);
+print(349);
+print(350);
+print(351);
+print(352);
+print(353);
+print(354);
+print(355);
+print(356);
+print(357);
+print(358);
+print(359);
+print(360);
+print(361);
+print(362);
+print(363);
+print(364);
+print(365);
+print(366);
+print(367);
+print(368);
+print(369);
+print(370);
+print(371);
+print(372);
+print(373);
+print(374);
+print(375);
+print(376);
+print(377);
+print(378);
+print(379);
+print(380);
+print(381);
+print(382);
+print(383);
+print(384);
+print(385);
+print(386);
+print(387);
+print(388);
+print(389);
+print(390);
+print(391);
+print(392);
+print(393);
+print(394);
+print(395);
+print(396);
+print(397);
+print(398);
+print(399);
+print(400);
+print(401);
+print(402);
+print(403);
+print(404);
+print(405);
+print(406);
+print(407);
+print(408);
+print(409);
+print(410);
+print(411);
+print(412);
+print(413);
+print(414);
+print(415);
+print(416);
+print(417);
+print(418);
+print(419);
+print(420);
+print(421);
+print(422);
+print(423);
+print(424);
+print(425);
+print(426);
+print(427);
+print(428);
+print(429);
+print(430);
+print(431);
+print(432);
+print(433);
+print(434);
+print(435);
+print(436);
+print(437);
+print(438);
+print(439);
+print(440);
+print(441);
+print(442);
+print(443);
+print(444);
+print(445);
+print(446);
+print(447);
+print(448);
+print(449);
+print(450);
+print(451);
+print(452);
+print(453);
+print(454);
+print(455);
+print(456);
+print(457);
+print(458);
+print(459);
+print(460);
+print(461);
+print(462);
+print(463);
+print(464);
+print(465);
+print(466);
+print(467);
+print(468);
+print(469);
+print(470);
+print(471);
+print(472);
+print(473);
+print(474);
+print(475);
+print(476);
+print(477);
+print(478);
+print(479);
+print(480);
+print(481);
+print(482);
+print(483);
+print(484);
+print(485);
+print(486);
+print(487);
+print(488);
+print(489);
+print(490);
+print(491);
+print(492);
+print(493);
+print(494);
+print(495);
+print(496);
+print(497);
+print(498);
+print(499);
+print(500);
+print(501);
+print(502);
+print(503);
+print(504);
+print(505);
+print(506);
+print(507);
+print(508);
+print(509);
+print(510);
+print(511);
+print(512);
+print(513);
+print(514);
+print(515);
+print(516);
+print(517);
+print(518);
+print(519);
+print(520);
+print(521);
+print(522);
+print(523);
+print(524);
+print(525);
+print(526);
+print(527);
+print(528);
+print(529);
+print(530);
+print(531);
+print(532);
+print(533);
+print(534);
+print(535);
+print(536);
+print(537);
+print(538);
+print(539);
+print(540);
+print(541);
+print(542);
+print(543);
+print(544);
+print(545);
+print(546);
+print(547);
+print(548);
+print(549);
+print(550);
+print(551);
+print(552);
+print(553);
+print(554);
+print(555);
+print(556);
+print(557);
+print(558);
+print(559);
+print(560);
+print(561);
+print(562);
+print(563);
+print(564);
+print(565);
+print(566);
+print(567);
+print(568);
+print(569);
+print(570);
+print(571);
+print(572);
+print(573);
+print(574);
+print(575);
+print(576);
+print(577);
+print(578);
+print(579);
+print(580);
+print(581);
+print(582);
+print(583);
+print(584);
+print(585);
+print(586);
+print(587);
+print(588);
+print(589);
+print(590);
+print(591);
+print(592);
+print(593);
+print(594);
+print(595);
+print(596);
+print(597);
+print(598);
+print(599);
+print(600);
+print(601);
+print(602);
+print(603);
+print(604);
+print(605);
+print(606);
+print(607);
+print(608);
+print(609);
+print(610);
+print(611);
+print(612);
+print(613);
+print(614);
+print(615);
+print(616);
+print(617);
+print(618);
+print(619);
+print(620);
+print(621);
+print(622);
+print(623);
+print(624);
+print(625);
+print(626);
+print(627);
+print(628);
+print(629);
+print(630);
+print(631);
+print(632);
+print(633);
+print(634);
+print(635);
+print(636);
+print(637);
+print(638);
+print(639);
+print(640);
+print(641);
+print(642);
+print(643);
+print(644);
+print(645);
+print(646);
+print(647);
+print(648);
+print(649);
+print(650);
+print(651);
+print(652);
+print(653);
+print(654);
+print(655);
+print(656);
+print(657);
+print(658);
+print(659);
+print(660);
+print(661);
+print(662);
+print(663);
+print(664);
+print(665);
+print(666);
+print(667);
+print(668);
+print(669);
+print(670);
+print(671);
+print(672);
+print(673);
+print(674);
+print(675);
+print(676);
+print(677);
+print(678);
+print(679);
+print(680);
+print(681);
+print(682);
+print(683);
+print(684);
+print(685);
+print(686);
+print(687);
+print(688);
+print(689);
+print(690);
+print(691);
+print(692);
+print(693);
+print(694);
+print(695);
+print(696);
+print(697);
+print(698);
+print(699);
+print(700);
+print(701);
+print(702);
+print(703);
+print(704);
+print(705);
+print(706);
+print(707);
+print(708);
+print(709);
+print(710);
+print(711);
+print(712);
+print(713);
+print(714);
+print(715);
+print(716);
+print(717);
+print(718);
+print(719);
+print(720);
+print(721);
+print(722);
+print(723);
+print(724);
+print(725);
+print(726);
+print(727);
+print(728);
+print(729);
+print(730);
+print(731);
+print(732);
+print(733);
+print(734);
+print(735);
+print(736);
+print(737);
+print(738);
+print(739);
+print(740);
+print(741);
+print(742);
+print(743);
+print(744);
+print(745);
+print(746);
+print(747);
+print(748);
+print(749);
+print(750);
+print(751);
+print(752);
+print(753);
+print(754);
+print(755);
+print(756);
+print(757);
+print(758);
+print(759);
+print(760);
+print(761);
+print(762);
+print(763);
+print(764);
+print(765);
+print(766);
+print(767);
+print(768);
+print(769);
+print(770);
+print(771);
+print(772);
+print(773);
+print(774);
+print(775);
+print(776);
+print(777);
+print(778);
+print(779);
+print(780);
+print(781);
+print(782);
+print(783);
+print(784);
+print(785);
+print(786);
+print(787);
+print(788);
+print(789);
+print(790);
+print(791);
+print(792);
+print(793);
+print(794);
+print(795);
+print(796);
+print(797);
+print(798);
+print(799);
+print(800);
+print(801);
+print(802);
+print(803);
+print(804);
+print(805);
+print(806);
+print(807);
+print(808);
+print(809);
+print(810);
+print(811);
+print(812);
+print(813);
+print(814);
+print(815);
+print(816);
+print(817);
+print(818);
+print(819);
+print(820);
+print(821);
+print(822);
+print(823);
+print(824);
+print(825);
+print(826);
+print(827);
+print(828);
+print(829);
+print(830);
+print(831);
+print(832);
+print(833);
+print(834);
+print(835);
+print(836);
+print(837);
+print(838);
+print(839);
+print(840);
+print(841);
+print(842);
+print(843);
+print(844);
+print(845);
+print(846);
+print(847);
+print(848);
+print(849);
+print(850);
+print(851);
+print(852);
+print(853);
+print(854);
+print(855);
+print(856);
+print(857);
+print(858);
+print(859);
+print(860);
+print(861);
+print(862);
+print(863);
+print(864);
+print(865);
+print(866);
+print(867);
+print(868);
+print(869);
+print(870);
+print(871);
+print(872);
+print(873);
+print(874);
+print(875);
+print(876);
+print(877);
+print(878);
+print(879);
+print(880);
+print(881);
+print(882);
+print(883);
+print(884);
+print(885);
+print(886);
+print(887);
+print(888);
+print(889);
+print(890);
+print(891);
+print(892);
+print(893);
+print(894);
+print(895);
+print(896);
+print(897);
+print(898);
+print(899);
+print(900);
+print(901);
+print(902);
+print(903);
+print(904);
+print(905);
+print(906);
+print(907);
+print(908);
+print(909);
+print(910);
+print(911);
+print(912);
+print(913);
+print(914);
+print(915);
+print(916);
+print(917);
+print(918);
+print(919);
+print(920);
+print(921);
+print(922);
+print(923);
+print(924);
+print(925);
+print(926);
+print(927);
+print(928);
+print(929);
+print(930);
+print(931);
+print(932);
+print(933);
+print(934);
+print(935);
+print(936);
+print(937);
+print(938);
+print(939);
+print(940);
+print(941);
+print(942);
+print(943);
+print(944);
+print(945);
+print(946);
+print(947);
+print(948);
+print(949);
+print(950);
+print(951);
+print(952);
+print(953);
+print(954);
+print(955);
+print(956);
+print(957);
+print(958);
+print(959);
+print(960);
+print(961);
+print(962);
+print(963);
+print(964);
+print(965);
+print(966);
+print(967);
+print(968);
+print(969);
+print(970);
+print(971);
+print(972);
+print(973);
+print(974);
+print(975);
+print(976);
+print(977);
+print(978);
+print(979);
+print(980);
+print(981);
+print(982);
+print(983);
+print(984);
+print(985);
+print(986);
+print(987);
+print(988);
+print(989);
+print(990);
+print(991);
+print(992);
+print(993);
+print(994);
+print(995);
+print(996);
+print(997);
+print(998);
+print(999);
+print(1000);
+print(1001);
+print(1002);
+print(1003);
+print(1004);
+print(1005);
+print(1006);
+print(1007);
+print(1008);
+print(1009);
+print(1010);
+print(1011);
+print(1012);
+print(1013);
+print(1014);
+print(1015);
+print(1016);
+print(1017);
+print(1018);
+print(1019);
+print(1020);
+print(1021);
+print(1022);
+print(1023);
+print(1024);
+print(1025);
+print(1026);
+print(1027);
+print(1028);
+print(1029);
+print(1030);
+print(1031);
+print(1032);
+print(1033);
+print(1034);
+print(1035);
+print(1036);
+print(1037);
+print(1038);
+print(1039);
+print(1040);
+print(1041);
+print(1042);
+print(1043);
+print(1044);
+print(1045);
+print(1046);
+print(1047);
+print(1048);
+print(1049);
+print(1050);
+print(1051);
+print(1052);
+print(1053);
+print(1054);
+print(1055);
+print(1056);
+print(1057);
+print(1058);
+print(1059);
+print(1060);
+print(1061);
+print(1062);
+print(1063);
+print(1064);
+print(1065);
+print(1066);
+print(1067);
+print(1068);
+print(1069);
+print(1070);
+print(1071);
+print(1072);
+print(1073);
+print(1074);
+print(1075);
+print(1076);
+print(1077);
+print(1078);
+print(1079);
+print(1080);
+print(1081);
+print(1082);
+print(1083);
+print(1084);
+print(1085);
+print(1086);
+print(1087);
+print(1088);
+print(1089);
+print(1090);
+print(1091);
+print(1092);
+print(1093);
+print(1094);
+print(1095);
+print(1096);
+print(1097);
+print(1098);
+print(1099);
+print(1100);
+print(1101);
+print(1102);
+print(1103);
+print(1104);
+print(1105);
+print(1106);
+print(1107);
+print(1108);
+print(1109);
+print(1110);
+print(1111);
+print(1112);
+print(1113);
+print(1114);
+print(1115);
+print(1116);
+print(1117);
+print(1118);
+print(1119);
+print(1120);
+print(1121);
+print(1122);
+print(1123);
+print(1124);
+print(1125);
+print(1126);
+print(1127);
+print(1128);
+print(1129);
+print(1130);
+print(1131);
+print(1132);
+print(1133);
+print(1134);
+print(1135);
+print(1136);
+print(1137);
+print(1138);
+print(1139);
+print(1140);
+print(1141);
+print(1142);
+print(1143);
+print(1144);
+print(1145);
+print(1146);
+print(1147);
+print(1148);
+print(1149);
+print(1150);
+print(1151);
+print(1152);
+print(1153);
+print(1154);
+print(1155);
+print(1156);
+print(1157);
+print(1158);
+print(1159);
+print(1160);
+print(1161);
+print(1162);
+print(1163);
+print(1164);
+print(1165);
+print(1166);
+print(1167);
+print(1168);
+print(1169);
+print(1170);
+print(1171);
+print(1172);
+print(1173);
+print(1174);
+print(1175);
+print(1176);
+print(1177);
+print(1178);
+print(1179);
+print(1180);
+print(1181);
+print(1182);
+print(1183);
+print(1184);
+print(1185);
+print(1186);
+print(1187);
+print(1188);
+print(1189);
+print(1190);
+print(1191);
+print(1192);
+print(1193);
+print(1194);
+print(1195);
+print(1196);
+print(1197);
+print(1198);
+print(1199);
+print(1200);
+print(1201);
+print(1202);
+print(1203);
+print(1204);
+print(1205);
+print(1206);
+print(1207);
+print(1208);
+print(1209);
+print(1210);
+print(1211);
+print(1212);
+print(1213);
+print(1214);
+print(1215);
+print(1216);
+print(1217);
+print(1218);
+print(1219);
+print(1220);
+print(1221);
+print(1222);
+print(1223);
+print(1224);
+print(1225);
+print(1226);
+print(1227);
+print(1228);
+print(1229);
+print(1230);
+print(1231);
+print(1232);
+print(1233);
+print(1234);
+print(1235);
+print(1236);
+print(1237);
+print(1238);
+print(1239);
+print(1240);
+print(1241);
+print(1242);
+print(1243);
+print(1244);
+print(1245);
+print(1246);
+print(1247);
+print(1248);
+print(1249);
+print(1250);
+print(1251);
+print(1252);
+print(1253);
+print(1254);
+print(1255);
+print(1256);
+print(1257);
+print(1258);
+print(1259);
+print(1260);
+print(1261);
+print(1262);
+print(1263);
+print(1264);
+print(1265);
+print(1266);
+print(1267);
+print(1268);
+print(1269);
+print(1270);
+print(1271);
+print(1272);
+print(1273);
+print(1274);
+print(1275);
+print(1276);
+print(1277);
+print(1278);
+print(1279);
+print(1280);
+print(1281);
+print(1282);
+print(1283);
+print(1284);
+print(1285);
+print(1286);
+print(1287);
+print(1288);
+print(1289);
+print(1290);
+print(1291);
+print(1292);
+print(1293);
+print(1294);
+print(1295);
+print(1296);
+print(1297);
+print(1298);
+print(1299);
+print(1300);
+print(1301);
+print(1302);
+print(1303);
+print(1304);
+print(1305);
+print(1306);
+print(1307);
+print(1308);
+print(1309);
+print(1310);
+print(1311);
+print(1312);
+print(1313);
+print(1314);
+print(1315);
+print(1316);
+print(1317);
+print(1318);
+print(1319);
+print(1320);
+print(1321);
+print(1322);
+print(1323);
+print(1324);
+print(1325);
+print(1326);
+print(1327);
+print(1328);
+print(1329);
+print(1330);
+print(1331);
+print(1332);
+print(1333);
+print(1334);
+print(1335);
+print(1336);
+print(1337);
+print(1338);
+print(1339);
+print(1340);
+print(1341);
+print(1342);
+print(1343);
+print(1344);
+print(1345);
+print(1346);
+print(1347);
+print(1348);
+print(1349);
+print(1350);
+print(1351);
+print(1352);
+print(1353);
+print(1354);
+print(1355);
+print(1356);
+print(1357);
+print(1358);
+print(1359);
+print(1360);
+print(1361);
+print(1362);
+print(1363);
+print(1364);
+print(1365);
+print(1366);
+print(1367);
+print(1368);
+print(1369);
+print(1370);
+print(1371);
+print(1372);
+print(1373);
+print(1374);
+print(1375);
+print(1376);
+print(1377);
+print(1378);
+print(1379);
+print(1380);
+print(1381);
+print(1382);
+print(1383);
+print(1384);
+print(1385);
+print(1386);
+print(1387);
+print(1388);
+print(1389);
+print(1390);
+print(1391);
+print(1392);
+print(1393);
+print(1394);
+print(1395);
+print(1396);
+print(1397);
+print(1398);
+print(1399);
+print(1400);
+print(1401);
+print(1402);
+print(1403);
+print(1404);
+print(1405);
+print(1406);
+print(1407);
+print(1408);
+print(1409);
+print(1410);
+print(1411);
+print(1412);
+print(1413);
+print(1414);
+print(1415);
+print(1416);
+print(1417);
+print(1418);
+print(1419);
+print(1420);
+print(1421);
+print(1422);
+print(1423);
+print(1424);
+print(1425);
+print(1426);
+print(1427);
+print(1428);
+print(1429);
+print(1430);
+print(1431);
+print(1432);
+print(1433);
+print(1434);
+print(1435);
+print(1436);
+print(1437);
+print(1438);
+print(1439);
+print(1440);
+print(1441);
+print(1442);
+print(1443);
+print(1444);
+print(1445);
+print(1446);
+print(1447);
+print(1448);
+print(1449);
+print(1450);
+print(1451);
+print(1452);
+print(1453);
+print(1454);
+print(1455);
+print(1456);
+print(1457);
+print(1458);
+print(1459);
+print(1460);
+print(1461);
+print(1462);
+print(1463);
+print(1464);
+print(1465);
+print(1466);
+print(1467);
+print(1468);
+print(1469);
+print(1470);
+print(1471);
+print(1472);
+print(1473);
+print(1474);
+print(1475);
+print(1476);
+print(1477);
+print(1478);
+print(1479);
+print(1480);
+print(1481);
+print(1482);
+print(1483);
+print(1484);
+print(1485);
+print(1486);
+print(1487);
+print(1488);
+print(1489);
+print(1490);
+print(1491);
+print(1492);
+print(1493);
+print(1494);
+print(1495);
+print(1496);
+print(1497);
+print(1498);
+print(1499);
+print(1500);
+print(1501);
+print(1502);
+print(1503);
+print(1504);
+print(1505);
+print(1506);
+print(1507);
+print(1508);
+print(1509);
+print(1510);
+print(1511);
+print(1512);
+print(1513);
+print(1514);
+print(1515);
+print(1516);
+print(1517);
+print(1518);
+print(1519);
+print(1520);
+print(1521);
+print(1522);
+print(1523);
+print(1524);
+print(1525);
+print(1526);
+print(1527);
+print(1528);
+print(1529);
+print(1530);
+print(1531);
+print(1532);
+print(1533);
+print(1534);
+print(1535);
+print(1536);
+print(1537);
+print(1538);
+print(1539);
+print(1540);
+print(1541);
+print(1542);
+print(1543);
+print(1544);
+print(1545);
+print(1546);
+print(1547);
+print(1548);
+print(1549);
+print(1550);
+print(1551);
+print(1552);
+print(1553);
+print(1554);
+print(1555);
+print(1556);
+print(1557);
+print(1558);
+print(1559);
+print(1560);
+print(1561);
+print(1562);
+print(1563);
+print(1564);
+print(1565);
+print(1566);
+print(1567);
+print(1568);
+print(1569);
+print(1570);
+print(1571);
+print(1572);
+print(1573);
+print(1574);
+print(1575);
+print(1576);
+print(1577);
+print(1578);
+print(1579);
+print(1580);
+print(1581);
+print(1582);
+print(1583);
+print(1584);
+print(1585);
+print(1586);
+print(1587);
+print(1588);
+print(1589);
+print(1590);
+print(1591);
+print(1592);
+print(1593);
+print(1594);
+print(1595);
+print(1596);
+print(1597);
+print(1598);
+print(1599);
+print(1600);
+print(1601);
+print(1602);
+print(1603);
+print(1604);
+print(1605);
+print(1606);
+print(1607);
+print(1608);
+print(1609);
+print(1610);
+print(1611);
+print(1612);
+print(1613);
+print(1614);
+print(1615);
+print(1616);
+print(1617);
+print(1618);
+print(1619);
+print(1620);
+print(1621);
+print(1622);
+print(1623);
+print(1624);
+print(1625);
+print(1626);
+print(1627);
+print(1628);
+print(1629);
+print(1630);
+print(1631);
+print(1632);
+print(1633);
+print(1634);
+print(1635);
+print(1636);
+print(1637);
+print(1638);
+print(1639);
+print(1640);
+print(1641);
+print(1642);
+print(1643);
+print(1644);
+print(1645);
+print(1646);
+print(1647);
+print(1648);
+print(1649);
+print(1650);
+print(1651);
+print(1652);
+print(1653);
+print(1654);
+print(1655);
+print(1656);
+print(1657);
+print(1658);
+print(1659);
+print(1660);
+print(1661);
+print(1662);
+print(1663);
+print(1664);
+print(1665);
+print(1666);
+print(1667);
+print(1668);
+print(1669);
+print(1670);
+print(1671);
+print(1672);
+print(1673);
+print(1674);
+print(1675);
+print(1676);
+print(1677);
+print(1678);
+print(1679);
+print(1680);
+print(1681);
+print(1682);
+print(1683);
+print(1684);
+print(1685);
+print(1686);
+print(1687);
+print(1688);
+print(1689);
+print(1690);
+print(1691);
+print(1692);
+print(1693);
+print(1694);
+print(1695);
+print(1696);
+print(1697);
+print(1698);
+print(1699);
+print(1700);
+print(1701);
+print(1702);
+print(1703);
+print(1704);
+print(1705);
+print(1706);
+print(1707);
+print(1708);
+print(1709);
+print(1710);
+print(1711);
+print(1712);
+print(1713);
+print(1714);
+print(1715);
+print(1716);
+print(1717);
+print(1718);
+print(1719);
+print(1720);
+print(1721);
+print(1722);
+print(1723);
+print(1724);
+print(1725);
+print(1726);
+print(1727);
+print(1728);
+print(1729);
+print(1730);
+print(1731);
+print(1732);
+print(1733);
+print(1734);
+print(1735);
+print(1736);
+print(1737);
+print(1738);
+print(1739);
+print(1740);
+print(1741);
+print(1742);
+print(1743);
+print(1744);
+print(1745);
+print(1746);
+print(1747);
+print(1748);
+print(1749);
+print(1750);
+print(1751);
+print(1752);
+print(1753);
+print(1754);
+print(1755);
+print(1756);
+print(1757);
+print(1758);
+print(1759);
+print(1760);
+print(1761);
+print(1762);
+print(1763);
+print(1764);
+print(1765);
+print(1766);
+print(1767);
+print(1768);
+print(1769);
+print(1770);
+print(1771);
+print(1772);
+print(1773);
+print(1774);
+print(1775);
+print(1776);
+print(1777);
+print(1778);
+print(1779);
+print(1780);
+print(1781);
+print(1782);
+print(1783);
+print(1784);
+print(1785);
+print(1786);
+print(1787);
+print(1788);
+print(1789);
+print(1790);
+print(1791);
+print(1792);
+print(1793);
+print(1794);
+print(1795);
+print(1796);
+print(1797);
+print(1798);
+print(1799);
+print(1800);
+print(1801);
+print(1802);
+print(1803);
+print(1804);
+print(1805);
+print(1806);
+print(1807);
+print(1808);
+print(1809);
+print(1810);
+print(1811);
+print(1812);
+print(1813);
+print(1814);
+print(1815);
+print(1816);
+print(1817);
+print(1818);
+print(1819);
+print(1820);
+print(1821);
+print(1822);
+print(1823);
+print(1824);
+print(1825);
+print(1826);
+print(1827);
+print(1828);
+print(1829);
+print(1830);
+print(1831);
+print(1832);
+print(1833);
+print(1834);
+print(1835);
+print(1836);
+print(1837);
+print(1838);
+print(1839);
+print(1840);
+print(1841);
+print(1842);
+print(1843);
+print(1844);
+print(1845);
+print(1846);
+print(1847);
+print(1848);
+print(1849);
+print(1850);
+print(1851);
+print(1852);
+print(1853);
+print(1854);
+print(1855);
+print(1856);
+print(1857);
+print(1858);
+print(1859);
+print(1860);
+print(1861);
+print(1862);
+print(1863);
+print(1864);
+print(1865);
+print(1866);
+print(1867);
+print(1868);
+print(1869);
+print(1870);
+print(1871);
+print(1872);
+print(1873);
+print(1874);
+print(1875);
+print(1876);
+print(1877);
+print(1878);
+print(1879);
+print(1880);
+print(1881);
+print(1882);
+print(1883);
+print(1884);
+print(1885);
+print(1886);
+print(1887);
+print(1888);
+print(1889);
+print(1890);
+print(1891);
+print(1892);
+print(1893);
+print(1894);
+print(1895);
+print(1896);
+print(1897);
+print(1898);
+print(1899);
+print(1900);
+print(1901);
+print(1902);
+print(1903);
+print(1904);
+print(1905);
+print(1906);
+print(1907);
+print(1908);
+print(1909);
+print(1910);
+print(1911);
+print(1912);
+print(1913);
+print(1914);
+print(1915);
+print(1916);
+print(1917);
+print(1918);
+print(1919);
+print(1920);
+print(1921);
+print(1922);
+print(1923);
+print(1924);
+print(1925);
+print(1926);
+print(1927);
+print(1928);
+print(1929);
+print(1930);
+print(1931);
+print(1932);
+print(1933);
+print(1934);
+print(1935);
+print(1936);
+print(1937);
+print(1938);
+print(1939);
+print(1940);
+print(1941);
+print(1942);
+print(1943);
+print(1944);
+print(1945);
+print(1946);
+print(1947);
+print(1948);
+print(1949);
+print(1950);
+print(1951);
+print(1952);
+print(1953);
+print(1954);
+print(1955);
+print(1956);
+print(1957);
+print(1958);
+print(1959);
+print(1960);
+print(1961);
+print(1962);
+print(1963);
+print(1964);
+print(1965);
+print(1966);
+print(1967);
+print(1968);
+print(1969);
+print(1970);
+print(1971);
+print(1972);
+print(1973);
+print(1974);
+print(1975);
+print(1976);
+print(1977);
+print(1978);
+print(1979);
+print(1980);
+print(1981);
+print(1982);
+print(1983);
+print(1984);
+print(1985);
+print(1986);
+print(1987);
+print(1988);
+print(1989);
+print(1990);
+print(1991);
+print(1992);
+print(1993);
+print(1994);
+print(1995);
+print(1996);
+print(1997);
+print(1998);
+print(1999);
+print(2000);
+print(2001);
+print(2002);
+print(2003);
+print(2004);
+print(2005);
+print(2006);
+print(2007);
+print(2008);
+print(2009);
+print(2010);
+print(2011);
+print(2012);
+print(2013);
+print(2014);
+print(2015);
+print(2016);
+print(2017);
+print(2018);
+print(2019);
+print(2020);
+print(2021);
+print(2022);
+print(2023);
+print(2024);
+print(2025);
+print(2026);
+print(2027);
+print(2028);
+print(2029);
+print(2030);
+print(2031);
+print(2032);
+print(2033);
+print(2034);
+print(2035);
+print(2036);
+print(2037);
+print(2038);
+print(2039);
+print(2040);
+print(2041);
+print(2042);
+print(2043);
+print(2044);
+print(2045);
+print(2046);
+print(2047);
+print(2048);
+print(2049);
+print(2050);
+print(2051);
+print(2052);
+print(2053);
+print(2054);
+print(2055);
+print(2056);
+print(2057);
+print(2058);
+print(2059);
+print(2060);
+print(2061);
+print(2062);
+print(2063);
+print(2064);
+print(2065);
+print(2066);
+print(2067);
+print(2068);
+print(2069);
+print(2070);
+print(2071);
+print(2072);
+print(2073);
+print(2074);
+print(2075);
+print(2076);
+print(2077);
+print(2078);
+print(2079);
+print(2080);
+print(2081);
+print(2082);
+print(2083);
+print(2084);
+print(2085);
+print(2086);
+print(2087);
+print(2088);
+print(2089);
+print(2090);
+print(2091);
+print(2092);
+print(2093);
+print(2094);
+print(2095);
+print(2096);
+print(2097);
+print(2098);
+print(2099);
+print(2100);
+print(2101);
+print(2102);
+print(2103);
+print(2104);
+print(2105);
+print(2106);
+print(2107);
+print(2108);
+print(2109);
+print(2110);
+print(2111);
+print(2112);
+print(2113);
+print(2114);
+print(2115);
+print(2116);
+print(2117);
+print(2118);
+print(2119);
+print(2120);
+print(2121);
+print(2122);
+print(2123);
+print(2124);
+print(2125);
+print(2126);
+print(2127);
+print(2128);
+print(2129);
+print(2130);
+print(2131);
+print(2132);
+print(2133);
+print(2134);
+print(2135);
+print(2136);
+print(2137);
+print(2138);
+print(2139);
+print(2140);
+print(2141);
+print(2142);
+print(2143);
+print(2144);
+print(2145);
+print(2146);
+print(2147);
+print(2148);
+print(2149);
+print(2150);
+print(2151);
+print(2152);
+print(2153);
+print(2154);
+print(2155);
+print(2156);
+print(2157);
+print(2158);
+print(2159);
+print(2160);
+print(2161);
+print(2162);
+print(2163);
+print(2164);
+print(2165);
+print(2166);
+print(2167);
+print(2168);
+print(2169);
+print(2170);
+print(2171);
+print(2172);
+print(2173);
+print(2174);
+print(2175);
+print(2176);
+print(2177);
+print(2178);
+print(2179);
+print(2180);
+print(2181);
+print(2182);
+print(2183);
+print(2184);
+print(2185);
+print(2186);
+print(2187);
+print(2188);
+print(2189);
+print(2190);
+print(2191);
+print(2192);
+print(2193);
+print(2194);
+print(2195);
+print(2196);
+print(2197);
+print(2198);
+print(2199);
+print(2200);
+print(2201);
+print(2202);
+print(2203);
+print(2204);
+print(2205);
+print(2206);
+print(2207);
+print(2208);
+print(2209);
+print(2210);
+print(2211);
+print(2212);
+print(2213);
+print(2214);
+print(2215);
+print(2216);
+print(2217);
+print(2218);
+print(2219);
+print(2220);
+print(2221);
+print(2222);
+print(2223);
+print(2224);
+print(2225);
+print(2226);
+print(2227);
+print(2228);
+print(2229);
+print(2230);
+print(2231);
+print(2232);
+print(2233);
+print(2234);
+print(2235);
+print(2236);
+print(2237);
+print(2238);
+print(2239);
+print(2240);
+print(2241);
+print(2242);
+print(2243);
+print(2244);
+print(2245);
+print(2246);
+print(2247);
+print(2248);
+print(2249);
+print(2250);
+print(2251);
+print(2252);
+print(2253);
+print(2254);
+print(2255);
+print(2256);
+print(2257);
+print(2258);
+print(2259);
+print(2260);
+print(2261);
+print(2262);
+print(2263);
+print(2264);
+print(2265);
+print(2266);
+print(2267);
+print(2268);
+print(2269);
+print(2270);
+print(2271);
+print(2272);
+print(2273);
+print(2274);
+print(2275);
+print(2276);
+print(2277);
+print(2278);
+print(2279);
+print(2280);
+print(2281);
+print(2282);
+print(2283);
+print(2284);
+print(2285);
+print(2286);
+print(2287);
+print(2288);
+print(2289);
+print(2290);
+print(2291);
+print(2292);
+print(2293);
+print(2294);
+print(2295);
+print(2296);
+print(2297);
+print(2298);
+print(2299);
+print(2300);
+print(2301);
+print(2302);
+print(2303);
+print(2304);
+print(2305);
+print(2306);
+print(2307);
+print(2308);
+print(2309);
+print(2310);
+print(2311);
+print(2312);
+print(2313);
+print(2314);
+print(2315);
+print(2316);
+print(2317);
+print(2318);
+print(2319);
+print(2320);
+print(2321);
+print(2322);
+print(2323);
+print(2324);
+print(2325);
+print(2326);
+print(2327);
+print(2328);
+print(2329);
+print(2330);
+print(2331);
+print(2332);
+print(2333);
+print(2334);
+print(2335);
+print(2336);
+print(2337);
+print(2338);
+print(2339);
+print(2340);
+print(2341);
+print(2342);
+print(2343);
+print(2344);
+print(2345);
+print(2346);
+print(2347);
+print(2348);
+print(2349);
+print(2350);
+print(2351);
+print(2352);
+print(2353);
+print(2354);
+print(2355);
+print(2356);
+print(2357);
+print(2358);
+print(2359);
+print(2360);
+print(2361);
+print(2362);
+print(2363);
+print(2364);
+print(2365);
+print(2366);
+print(2367);
+print(2368);
+print(2369);
+print(2370);
+print(2371);
+print(2372);
+print(2373);
+print(2374);
+print(2375);
+print(2376);
+print(2377);
+print(2378);
+print(2379);
+print(2380);
+print(2381);
+print(2382);
+print(2383);
+print(2384);
+print(2385);
+print(2386);
+print(2387);
+print(2388);
+print(2389);
+print(2390);
+print(2391);
+print(2392);
+print(2393);
+print(2394);
+print(2395);
+print(2396);
+print(2397);
+print(2398);
+print(2399);
+print(2400);
+print(2401);
+print(2402);
+print(2403);
+print(2404);
+print(2405);
+print(2406);
+print(2407);
+print(2408);
+print(2409);
+print(2410);
+print(2411);
+print(2412);
+print(2413);
+print(2414);
+print(2415);
+print(2416);
+print(2417);
+print(2418);
+print(2419);
+print(2420);
+print(2421);
+print(2422);
+print(2423);
+print(2424);
+print(2425);
+print(2426);
+print(2427);
+print(2428);
+print(2429);
+print(2430);
+print(2431);
+print(2432);
+print(2433);
+print(2434);
+print(2435);
+print(2436);
+print(2437);
+print(2438);
+print(2439);
+print(2440);
+print(2441);
+print(2442);
+print(2443);
+print(2444);
+print(2445);
+print(2446);
+print(2447);
+print(2448);
+print(2449);
+print(2450);
+print(2451);
+print(2452);
+print(2453);
+print(2454);
+print(2455);
+print(2456);
+print(2457);
+print(2458);
+print(2459);
+print(2460);
+print(2461);
+print(2462);
+print(2463);
+print(2464);
+print(2465);
+print(2466);
+print(2467);
+print(2468);
+print(2469);
+print(2470);
+print(2471);
+print(2472);
+print(2473);
+print(2474);
+print(2475);
+print(2476);
+print(2477);
+print(2478);
+print(2479);
+print(2480);
+print(2481);
+print(2482);
+print(2483);
+print(2484);
+print(2485);
+print(2486);
+print(2487);
+print(2488);
+print(2489);
+print(2490);
+print(2491);
+print(2492);
+print(2493);
+print(2494);
+print(2495);
+print(2496);
+print(2497);
+print(2498);
+print(2499);
+print(2500);
+print(2501);
+print(2502);
+print(2503);
+print(2504);
+print(2505);
+print(2506);
+print(2507);
+print(2508);
+print(2509);
+print(2510);
+print(2511);
+print(2512);
+print(2513);
+print(2514);
+print(2515);
+print(2516);
+print(2517);
+print(2518);
+print(2519);
+print(2520);
+print(2521);
+print(2522);
+print(2523);
+print(2524);
+print(2525);
+print(2526);
+print(2527);
+print(2528);
+print(2529);
+print(2530);
+print(2531);
+print(2532);
+print(2533);
+print(2534);
+print(2535);
+print(2536);
+print(2537);
+print(2538);
+print(2539);
+print(2540);
+print(2541);
+print(2542);
+print(2543);
+print(2544);
+print(2545);
+print(2546);
+print(2547);
+print(2548);
+print(2549);
+print(2550);
+print(2551);
+print(2552);
+print(2553);
+print(2554);
+print(2555);
+print(2556);
+print(2557);
+print(2558);
+print(2559);
+print(2560);
+print(2561);
+print(2562);
+print(2563);
+print(2564);
+print(2565);
+print(2566);
+print(2567);
+print(2568);
+print(2569);
+print(2570);
+print(2571);
+print(2572);
+print(2573);
+print(2574);
+print(2575);
+print(2576);
+print(2577);
+print(2578);
+print(2579);
+print(2580);
+print(2581);
+print(2582);
+print(2583);
+print(2584);
+print(2585);
+print(2586);
+print(2587);
+print(2588);
+print(2589);
+print(2590);
+print(2591);
+print(2592);
+print(2593);
+print(2594);
+print(2595);
+print(2596);
+print(2597);
+print(2598);
+print(2599);
+print(2600);
+print(2601);
+print(2602);
+print(2603);
+print(2604);
+print(2605);
+print(2606);
+print(2607);
+print(2608);
+print(2609);
+print(2610);
+print(2611);
+print(2612);
+print(2613);
+print(2614);
+print(2615);
+print(2616);
+print(2617);
+print(2618);
+print(2619);
+print(2620);
+print(2621);
+print(2622);
+print(2623);
+print(2624);
+print(2625);
+print(2626);
+print(2627);
+print(2628);
+print(2629);
+print(2630);
+print(2631);
+print(2632);
+print(2633);
+print(2634);
+print(2635);
+print(2636);
+print(2637);
+print(2638);
+print(2639);
+print(2640);
+print(2641);
+print(2642);
+print(2643);
+print(2644);
+print(2645);
+print(2646);
+print(2647);
+print(2648);
+print(2649);
+print(2650);
+print(2651);
+print(2652);
+print(2653);
+print(2654);
+print(2655);
+print(2656);
+print(2657);
+print(2658);
+print(2659);
+print(2660);
+print(2661);
+print(2662);
+print(2663);
+print(2664);
+print(2665);
+print(2666);
+print(2667);
+print(2668);
+print(2669);
+print(2670);
+print(2671);
+print(2672);
+print(2673);
+print(2674);
+print(2675);
+print(2676);
+print(2677);
+print(2678);
+print(2679);
+print(2680);
+print(2681);
+print(2682);
+print(2683);
+print(2684);
+print(2685);
+print(2686);
+print(2687);
+print(2688);
+print(2689);
+print(2690);
+print(2691);
+print(2692);
+print(2693);
+print(2694);
+print(2695);
+print(2696);
+print(2697);
+print(2698);
+print(2699);
+print(2700);
+print(2701);
+print(2702);
+print(2703);
+print(2704);
+print(2705);
+print(2706);
+print(2707);
+print(2708);
+print(2709);
+print(2710);
+print(2711);
+print(2712);
+print(2713);
+print(2714);
+print(2715);
+print(2716);
+print(2717);
+print(2718);
+print(2719);
+print(2720);
+print(2721);
+print(2722);
+print(2723);
+print(2724);
+print(2725);
+print(2726);
+print(2727);
+print(2728);
+print(2729);
+print(2730);
+print(2731);
+print(2732);
+print(2733);
+print(2734);
+print(2735);
+print(2736);
+print(2737);
+print(2738);
+print(2739);
+print(2740);
+print(2741);
+print(2742);
+print(2743);
+print(2744);
+print(2745);
+print(2746);
+print(2747);
+print(2748);
+print(2749);
+print(2750);
+print(2751);
+print(2752);
+print(2753);
+print(2754);
+print(2755);
+print(2756);
+print(2757);
+print(2758);
+print(2759);
+print(2760);
+print(2761);
+print(2762);
+print(2763);
+print(2764);
+print(2765);
+print(2766);
+print(2767);
+print(2768);
+print(2769);
+print(2770);
+print(2771);
+print(2772);
+print(2773);
+print(2774);
+print(2775);
+print(2776);
+print(2777);
+print(2778);
+print(2779);
+print(2780);
+print(2781);
+print(2782);
+print(2783);
+print(2784);
+print(2785);
+print(2786);
+print(2787);
+print(2788);
+print(2789);
+print(2790);
+print(2791);
+print(2792);
+print(2793);
+print(2794);
+print(2795);
+print(2796);
+print(2797);
+print(2798);
+print(2799);
+print(2800);
+print(2801);
+print(2802);
+print(2803);
+print(2804);
+print(2805);
+print(2806);
+print(2807);
+print(2808);
+print(2809);
+print(2810);
+print(2811);
+print(2812);
+print(2813);
+print(2814);
+print(2815);
+print(2816);
+print(2817);
+print(2818);
+print(2819);
+print(2820);
+print(2821);
+print(2822);
+print(2823);
+print(2824);
+print(2825);
+print(2826);
+print(2827);
+print(2828);
+print(2829);
+print(2830);
+print(2831);
+print(2832);
+print(2833);
+print(2834);
+print(2835);
+print(2836);
+print(2837);
+print(2838);
+print(2839);
+print(2840);
+print(2841);
+print(2842);
+print(2843);
+print(2844);
+print(2845);
+print(2846);
+print(2847);
+print(2848);
+print(2849);
+print(2850);
+print(2851);
+print(2852);
+print(2853);
+print(2854);
+print(2855);
+print(2856);
+print(2857);
+print(2858);
+print(2859);
+print(2860);
+print(2861);
+print(2862);
+print(2863);
+print(2864);
+print(2865);
+print(2866);
+print(2867);
+print(2868);
+print(2869);
+print(2870);
+print(2871);
+print(2872);
+print(2873);
+print(2874);
+print(2875);
+print(2876);
+print(2877);
+print(2878);
+print(2879);
+print(2880);
+print(2881);
+print(2882);
+print(2883);
+print(2884);
+print(2885);
+print(2886);
+print(2887);
+print(2888);
+print(2889);
+print(2890);
+print(2891);
+print(2892);
+print(2893);
+print(2894);
+print(2895);
+print(2896);
+print(2897);
+print(2898);
+print(2899);
+print(2900);
+print(2901);
+print(2902);
+print(2903);
+print(2904);
+print(2905);
+print(2906);
+print(2907);
+print(2908);
+print(2909);
+print(2910);
+print(2911);
+print(2912);
+print(2913);
+print(2914);
+print(2915);
+print(2916);
+print(2917);
+print(2918);
+print(2919);
+print(2920);
+print(2921);
+print(2922);
+print(2923);
+print(2924);
+print(2925);
+print(2926);
+print(2927);
+print(2928);
+print(2929);
+print(2930);
+print(2931);
+print(2932);
+print(2933);
+print(2934);
+print(2935);
+print(2936);
+print(2937);
+print(2938);
+print(2939);
+print(2940);
+print(2941);
+print(2942);
+print(2943);
+print(2944);
+print(2945);
+print(2946);
+print(2947);
+print(2948);
+print(2949);
+print(2950);
+print(2951);
+print(2952);
+print(2953);
+print(2954);
+print(2955);
+print(2956);
+print(2957);
+print(2958);
+print(2959);
+print(2960);
+print(2961);
+print(2962);
+print(2963);
+print(2964);
+print(2965);
+print(2966);
+print(2967);
+print(2968);
+print(2969);
+print(2970);
+print(2971);
+print(2972);
+print(2973);
+print(2974);
+print(2975);
+print(2976);
+print(2977);
+print(2978);
+print(2979);
+print(2980);
+print(2981);
+print(2982);
+print(2983);
+print(2984);
+print(2985);
+print(2986);
+print(2987);
+print(2988);
+print(2989);
+print(2990);
+print(2991);
+print(2992);
+print(2993);
+print(2994);
+print(2995);
+print(2996);
+print(2997);
+print(2998);
+print(2999);
+print(3000);
+print(3001);
+print(3002);
+print(3003);
+print(3004);
+print(3005);
+print(3006);
+print(3007);
+print(3008);
+print(3009);
+print(3010);
+print(3011);
+print(3012);
+print(3013);
+print(3014);
+print(3015);
+print(3016);
+print(3017);
+print(3018);
+print(3019);
+print(3020);
+print(3021);
+print(3022);
+print(3023);
+print(3024);
+print(3025);
+print(3026);
+print(3027);
+print(3028);
+print(3029);
+print(3030);
+print(3031);
+print(3032);
+print(3033);
+print(3034);
+print(3035);
+print(3036);
+print(3037);
+print(3038);
+print(3039);
+print(3040);
+print(3041);
+print(3042);
+print(3043);
+print(3044);
+print(3045);
+print(3046);
+print(3047);
+print(3048);
+print(3049);
+print(3050);
+print(3051);
+print(3052);
+print(3053);
+print(3054);
+print(3055);
+print(3056);
+print(3057);
+print(3058);
+print(3059);
+print(3060);
+print(3061);
+print(3062);
+print(3063);
+print(3064);
+print(3065);
+print(3066);
+print(3067);
+print(3068);
+print(3069);
+print(3070);
+print(3071);
+print(3072);
+print(3073);
+print(3074);
+print(3075);
+print(3076);
+print(3077);
+print(3078);
+print(3079);
+print(3080);
+print(3081);
+print(3082);
+print(3083);
+print(3084);
+print(3085);
+print(3086);
+print(3087);
+print(3088);
+print(3089);
+print(3090);
+print(3091);
+print(3092);
+print(3093);
+print(3094);
+print(3095);
+print(3096);
+print(3097);
+print(3098);
+print(3099);
+print(3100);
+print(3101);
+print(3102);
+print(3103);
+print(3104);
+print(3105);
+print(3106);
+print(3107);
+print(3108);
+print(3109);
+print(3110);
+print(3111);
+print(3112);
+print(3113);
+print(3114);
+print(3115);
+print(3116);
+print(3117);
+print(3118);
+print(3119);
+print(3120);
+print(3121);
+print(3122);
+print(3123);
+print(3124);
+print(3125);
+print(3126);
+print(3127);
+print(3128);
+print(3129);
+print(3130);
+print(3131);
+print(3132);
+print(3133);
+print(3134);
+print(3135);
+print(3136);
+print(3137);
+print(3138);
+print(3139);
+print(3140);
+print(3141);
+print(3142);
+print(3143);
+print(3144);
+print(3145);
+print(3146);
+print(3147);
+print(3148);
+print(3149);
+print(3150);
+print(3151);
+print(3152);
+print(3153);
+print(3154);
+print(3155);
+print(3156);
+print(3157);
+print(3158);
+print(3159);
+print(3160);
+print(3161);
+print(3162);
+print(3163);
+print(3164);
+print(3165);
+print(3166);
+print(3167);
+print(3168);
+print(3169);
+print(3170);
+print(3171);
+print(3172);
+print(3173);
+print(3174);
+print(3175);
+print(3176);
+print(3177);
+print(3178);
+print(3179);
+print(3180);
+print(3181);
+print(3182);
+print(3183);
+print(3184);
+print(3185);
+print(3186);
+print(3187);
+print(3188);
+print(3189);
+print(3190);
+print(3191);
+print(3192);
+print(3193);
+print(3194);
+print(3195);
+print(3196);
+print(3197);
+print(3198);
+print(3199);
+print(3200);
+print(3201);
+print(3202);
+print(3203);
+print(3204);
+print(3205);
+print(3206);
+print(3207);
+print(3208);
+print(3209);
+print(3210);
+print(3211);
+print(3212);
+print(3213);
+print(3214);
+print(3215);
+print(3216);
+print(3217);
+print(3218);
+print(3219);
+print(3220);
+print(3221);
+print(3222);
+print(3223);
+print(3224);
+print(3225);
+print(3226);
+print(3227);
+print(3228);
+print(3229);
+print(3230);
+print(3231);
+print(3232);
+print(3233);
+print(3234);
+print(3235);
+print(3236);
+print(3237);
+print(3238);
+print(3239);
+print(3240);
+print(3241);
+print(3242);
+print(3243);
+print(3244);
+print(3245);
+print(3246);
+print(3247);
+print(3248);
+print(3249);
+print(3250);
+print(3251);
+print(3252);
+print(3253);
+print(3254);
+print(3255);
+print(3256);
+print(3257);
+print(3258);
+print(3259);
+print(3260);
+print(3261);
+print(3262);
+print(3263);
+print(3264);
+print(3265);
+print(3266);
+print(3267);
+print(3268);
+print(3269);
+print(3270);
+print(3271);
+print(3272);
+print(3273);
+print(3274);
+print(3275);
+print(3276);
+print(3277);
+print(3278);
+print(3279);
+print(3280);
+print(3281);
+print(3282);
+print(3283);
+print(3284);
+print(3285);
+print(3286);
+print(3287);
+print(3288);
+print(3289);
+print(3290);
+print(3291);
+print(3292);
+print(3293);
+print(3294);
+print(3295);
+print(3296);
+print(3297);
+print(3298);
+print(3299);
+print(3300);
+print(3301);
+print(3302);
+print(3303);
+print(3304);
+print(3305);
+print(3306);
+print(3307);
+print(3308);
+print(3309);
+print(3310);
+print(3311);
+print(3312);
+print(3313);
+print(3314);
+print(3315);
+print(3316);
+print(3317);
+print(3318);
+print(3319);
+print(3320);
+print(3321);
+print(3322);
+print(3323);
+print(3324);
+print(3325);
+print(3326);
+print(3327);
+print(3328);
+print(3329);
+print(3330);
+print(3331);
+print(3332);
+print(3333);
+print(3334);
+print(3335);
+print(3336);
+print(3337);
+print(3338);
+print(3339);
+print(3340);
+print(3341);
+print(3342);
+print(3343);
+print(3344);
+print(3345);
+print(3346);
+print(3347);
+print(3348);
+print(3349);
+print(3350);
+print(3351);
+print(3352);
+print(3353);
+print(3354);
+print(3355);
+print(3356);
+print(3357);
+print(3358);
+print(3359);
+print(3360);
+print(3361);
+print(3362);
+print(3363);
+print(3364);
+print(3365);
+print(3366);
+print(3367);
+print(3368);
+print(3369);
+print(3370);
+print(3371);
+print(3372);
+print(3373);
+print(3374);
+print(3375);
+print(3376);
+print(3377);
+print(3378);
+print(3379);
+print(3380);
+print(3381);
+print(3382);
+print(3383);
+print(3384);
+print(3385);
+print(3386);
+print(3387);
+print(3388);
+print(3389);
+print(3390);
+print(3391);
+print(3392);
+print(3393);
+print(3394);
+print(3395);
+print(3396);
+print(3397);
+print(3398);
+print(3399);
+print(3400);
+print(3401);
+print(3402);
+print(3403);
+print(3404);
+print(3405);
+print(3406);
+print(3407);
+print(3408);
+print(3409);
+print(3410);
+print(3411);
+print(3412);
+print(3413);
+print(3414);
+print(3415);
+print(3416);
+print(3417);
+print(3418);
+print(3419);
+print(3420);
+print(3421);
+print(3422);
+print(3423);
+print(3424);
+print(3425);
+print(3426);
+print(3427);
+print(3428);
+print(3429);
+print(3430);
+print(3431);
+print(3432);
+print(3433);
+print(3434);
+print(3435);
+print(3436);
+print(3437);
+print(3438);
+print(3439);
+print(3440);
+print(3441);
+print(3442);
+print(3443);
+print(3444);
+print(3445);
+print(3446);
+print(3447);
+print(3448);
+print(3449);
+print(3450);
+print(3451);
+print(3452);
+print(3453);
+print(3454);
+print(3455);
+print(3456);
+print(3457);
+print(3458);
+print(3459);
+print(3460);
+print(3461);
+print(3462);
+print(3463);
+print(3464);
+print(3465);
+print(3466);
+print(3467);
+print(3468);
+print(3469);
+print(3470);
+print(3471);
+print(3472);
+print(3473);
+print(3474);
+print(3475);
+print(3476);
+print(3477);
+print(3478);
+print(3479);
+print(3480);
+print(3481);
+print(3482);
+print(3483);
+print(3484);
+print(3485);
+print(3486);
+print(3487);
+print(3488);
+print(3489);
+print(3490);
+print(3491);
+print(3492);
+print(3493);
+print(3494);
+print(3495);
+print(3496);
+print(3497);
+print(3498);
+print(3499);
+print(3500);
+print(3501);
+print(3502);
+print(3503);
+print(3504);
+print(3505);
+print(3506);
+print(3507);
+print(3508);
+print(3509);
+print(3510);
+print(3511);
+print(3512);
+print(3513);
+print(3514);
+print(3515);
+print(3516);
+print(3517);
+print(3518);
+print(3519);
+print(3520);
+print(3521);
+print(3522);
+print(3523);
+print(3524);
+print(3525);
+print(3526);
+print(3527);
+print(3528);
+print(3529);
+print(3530);
+print(3531);
+print(3532);
+print(3533);
+print(3534);
+print(3535);
+print(3536);
+print(3537);
+print(3538);
+print(3539);
+print(3540);
+print(3541);
+print(3542);
+print(3543);
+print(3544);
+print(3545);
+print(3546);
+print(3547);
+print(3548);
+print(3549);
+print(3550);
+print(3551);
+print(3552);
+print(3553);
+print(3554);
+print(3555);
+print(3556);
+print(3557);
+print(3558);
+print(3559);
+print(3560);
+print(3561);
+print(3562);
+print(3563);
+print(3564);
+print(3565);
+print(3566);
+print(3567);
+print(3568);
+print(3569);
+print(3570);
+print(3571);
+print(3572);
+print(3573);
+print(3574);
+print(3575);
+print(3576);
+print(3577);
+print(3578);
+print(3579);
+print(3580);
+print(3581);
+print(3582);
+print(3583);
+print(3584);
+print(3585);
+print(3586);
+print(3587);
+print(3588);
+print(3589);
+print(3590);
+print(3591);
+print(3592);
+print(3593);
+print(3594);
+print(3595);
+print(3596);
+print(3597);
+print(3598);
+print(3599);
+print(3600);
+print(3601);
+print(3602);
+print(3603);
+print(3604);
+print(3605);
+print(3606);
+print(3607);
+print(3608);
+print(3609);
+print(3610);
+print(3611);
+print(3612);
+print(3613);
+print(3614);
+print(3615);
+print(3616);
+print(3617);
+print(3618);
+print(3619);
+print(3620);
+print(3621);
+print(3622);
+print(3623);
+print(3624);
+print(3625);
+print(3626);
+print(3627);
+print(3628);
+print(3629);
+print(3630);
+print(3631);
+print(3632);
+print(3633);
+print(3634);
+print(3635);
+print(3636);
+print(3637);
+print(3638);
+print(3639);
+print(3640);
+print(3641);
+print(3642);
+print(3643);
+print(3644);
+print(3645);
+print(3646);
+print(3647);
+print(3648);
+print(3649);
+print(3650);
+print(3651);
+print(3652);
+print(3653);
+print(3654);
+print(3655);
+print(3656);
+print(3657);
+print(3658);
+print(3659);
+print(3660);
+print(3661);
+print(3662);
+print(3663);
+print(3664);
+print(3665);
+print(3666);
+print(3667);
+print(3668);
+print(3669);
+print(3670);
+print(3671);
+print(3672);
+print(3673);
+print(3674);
+print(3675);
+print(3676);
+print(3677);
+print(3678);
+print(3679);
+print(3680);
+print(3681);
+print(3682);
+print(3683);
+print(3684);
+print(3685);
+print(3686);
+print(3687);
+print(3688);
+print(3689);
+print(3690);
+print(3691);
+print(3692);
+print(3693);
+print(3694);
+print(3695);
+print(3696);
+print(3697);
+print(3698);
+print(3699);
+print(3700);
+print(3701);
+print(3702);
+print(3703);
+print(3704);
+print(3705);
+print(3706);
+print(3707);
+print(3708);
+print(3709);
+print(3710);
+print(3711);
+print(3712);
+print(3713);
+print(3714);
+print(3715);
+print(3716);
+print(3717);
+print(3718);
+print(3719);
+print(3720);
+print(3721);
+print(3722);
+print(3723);
+print(3724);
+print(3725);
+print(3726);
+print(3727);
+print(3728);
+print(3729);
+print(3730);
+print(3731);
+print(3732);
+print(3733);
+print(3734);
+print(3735);
+print(3736);
+print(3737);
+print(3738);
+print(3739);
+print(3740);
+print(3741);
+print(3742);
+print(3743);
+print(3744);
+print(3745);
+print(3746);
+print(3747);
+print(3748);
+print(3749);
+print(3750);
+print(3751);
+print(3752);
+print(3753);
+print(3754);
+print(3755);
+print(3756);
+print(3757);
+print(3758);
+print(3759);
+print(3760);
+print(3761);
+print(3762);
+print(3763);
+print(3764);
+print(3765);
+print(3766);
+print(3767);
+print(3768);
+print(3769);
+print(3770);
+print(3771);
+print(3772);
+print(3773);
+print(3774);
+print(3775);
+print(3776);
+print(3777);
+print(3778);
+print(3779);
+print(3780);
+print(3781);
+print(3782);
+print(3783);
+print(3784);
+print(3785);
+print(3786);
+print(3787);
+print(3788);
+print(3789);
+print(3790);
+print(3791);
+print(3792);
+print(3793);
+print(3794);
+print(3795);
+print(3796);
+print(3797);
+print(3798);
+print(3799);
+print(3800);
+print(3801);
+print(3802);
+print(3803);
+print(3804);
+print(3805);
+print(3806);
+print(3807);
+print(3808);
+print(3809);
+print(3810);
+print(3811);
+print(3812);
+print(3813);
+print(3814);
+print(3815);
+print(3816);
+print(3817);
+print(3818);
+print(3819);
+print(3820);
+print(3821);
+print(3822);
+print(3823);
+print(3824);
+print(3825);
+print(3826);
+print(3827);
+print(3828);
+print(3829);
+print(3830);
+print(3831);
+print(3832);
+print(3833);
+print(3834);
+print(3835);
+print(3836);
+print(3837);
+print(3838);
+print(3839);
+print(3840);
+print(3841);
+print(3842);
+print(3843);
+print(3844);
+print(3845);
+print(3846);
+print(3847);
+print(3848);
+print(3849);
+print(3850);
+print(3851);
+print(3852);
+print(3853);
+print(3854);
+print(3855);
+print(3856);
+print(3857);
+print(3858);
+print(3859);
+print(3860);
+print(3861);
+print(3862);
+print(3863);
+print(3864);
+print(3865);
+print(3866);
+print(3867);
+print(3868);
+print(3869);
+print(3870);
+print(3871);
+print(3872);
+print(3873);
+print(3874);
+print(3875);
+print(3876);
+print(3877);
+print(3878);
+print(3879);
+print(3880);
+print(3881);
+print(3882);
+print(3883);
+print(3884);
+print(3885);
+print(3886);
+print(3887);
+print(3888);
+print(3889);
+print(3890);
+print(3891);
+print(3892);
+print(3893);
+print(3894);
+print(3895);
+print(3896);
+print(3897);
+print(3898);
+print(3899);
+print(3900);
+print(3901);
+print(3902);
+print(3903);
+print(3904);
+print(3905);
+print(3906);
+print(3907);
+print(3908);
+print(3909);
+print(3910);
+print(3911);
+print(3912);
+print(3913);
+print(3914);
+print(3915);
+print(3916);
+print(3917);
+print(3918);
+print(3919);
+print(3920);
+print(3921);
+print(3922);
+print(3923);
+print(3924);
+print(3925);
+print(3926);
+print(3927);
+print(3928);
+print(3929);
+print(3930);
+print(3931);
+print(3932);
+print(3933);
+print(3934);
+print(3935);
+print(3936);
+print(3937);
+print(3938);
+print(3939);
+print(3940);
+print(3941);
+print(3942);
+print(3943);
+print(3944);
+print(3945);
+print(3946);
+print(3947);
+print(3948);
+print(3949);
+print(3950);
+print(3951);
+print(3952);
+print(3953);
+print(3954);
+print(3955);
+print(3956);
+print(3957);
+print(3958);
+print(3959);
+print(3960);
+print(3961);
+print(3962);
+print(3963);
+print(3964);
+print(3965);
+print(3966);
+print(3967);
+print(3968);
+print(3969);
+print(3970);
+print(3971);
+print(3972);
+print(3973);
+print(3974);
+print(3975);
+print(3976);
+print(3977);
+print(3978);
+print(3979);
+print(3980);
+print(3981);
+print(3982);
+print(3983);
+print(3984);
+print(3985);
+print(3986);
+print(3987);
+print(3988);
+print(3989);
+print(3990);
+print(3991);
+print(3992);
+print(3993);
+print(3994);
+print(3995);
+print(3996);
+print(3997);
+print(3998);
+print(3999);
diff --git a/nashorn/test/script/basic/NASHORN-423.js.EXPECTED b/nashorn/test/script/basic/NASHORN-423.js.EXPECTED
new file mode 100644
index 00000000000..fb53d5388cf
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-423.js.EXPECTED
@@ -0,0 +1,4000 @@
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99
+100
+101
+102
+103
+104
+105
+106
+107
+108
+109
+110
+111
+112
+113
+114
+115
+116
+117
+118
+119
+120
+121
+122
+123
+124
+125
+126
+127
+128
+129
+130
+131
+132
+133
+134
+135
+136
+137
+138
+139
+140
+141
+142
+143
+144
+145
+146
+147
+148
+149
+150
+151
+152
+153
+154
+155
+156
+157
+158
+159
+160
+161
+162
+163
+164
+165
+166
+167
+168
+169
+170
+171
+172
+173
+174
+175
+176
+177
+178
+179
+180
+181
+182
+183
+184
+185
+186
+187
+188
+189
+190
+191
+192
+193
+194
+195
+196
+197
+198
+199
+200
+201
+202
+203
+204
+205
+206
+207
+208
+209
+210
+211
+212
+213
+214
+215
+216
+217
+218
+219
+220
+221
+222
+223
+224
+225
+226
+227
+228
+229
+230
+231
+232
+233
+234
+235
+236
+237
+238
+239
+240
+241
+242
+243
+244
+245
+246
+247
+248
+249
+250
+251
+252
+253
+254
+255
+256
+257
+258
+259
+260
+261
+262
+263
+264
+265
+266
+267
+268
+269
+270
+271
+272
+273
+274
+275
+276
+277
+278
+279
+280
+281
+282
+283
+284
+285
+286
+287
+288
+289
+290
+291
+292
+293
+294
+295
+296
+297
+298
+299
+300
+301
+302
+303
+304
+305
+306
+307
+308
+309
+310
+311
+312
+313
+314
+315
+316
+317
+318
+319
+320
+321
+322
+323
+324
+325
+326
+327
+328
+329
+330
+331
+332
+333
+334
+335
+336
+337
+338
+339
+340
+341
+342
+343
+344
+345
+346
+347
+348
+349
+350
+351
+352
+353
+354
+355
+356
+357
+358
+359
+360
+361
+362
+363
+364
+365
+366
+367
+368
+369
+370
+371
+372
+373
+374
+375
+376
+377
+378
+379
+380
+381
+382
+383
+384
+385
+386
+387
+388
+389
+390
+391
+392
+393
+394
+395
+396
+397
+398
+399
+400
+401
+402
+403
+404
+405
+406
+407
+408
+409
+410
+411
+412
+413
+414
+415
+416
+417
+418
+419
+420
+421
+422
+423
+424
+425
+426
+427
+428
+429
+430
+431
+432
+433
+434
+435
+436
+437
+438
+439
+440
+441
+442
+443
+444
+445
+446
+447
+448
+449
+450
+451
+452
+453
+454
+455
+456
+457
+458
+459
+460
+461
+462
+463
+464
+465
+466
+467
+468
+469
+470
+471
+472
+473
+474
+475
+476
+477
+478
+479
+480
+481
+482
+483
+484
+485
+486
+487
+488
+489
+490
+491
+492
+493
+494
+495
+496
+497
+498
+499
+500
+501
+502
+503
+504
+505
+506
+507
+508
+509
+510
+511
+512
+513
+514
+515
+516
+517
+518
+519
+520
+521
+522
+523
+524
+525
+526
+527
+528
+529
+530
+531
+532
+533
+534
+535
+536
+537
+538
+539
+540
+541
+542
+543
+544
+545
+546
+547
+548
+549
+550
+551
+552
+553
+554
+555
+556
+557
+558
+559
+560
+561
+562
+563
+564
+565
+566
+567
+568
+569
+570
+571
+572
+573
+574
+575
+576
+577
+578
+579
+580
+581
+582
+583
+584
+585
+586
+587
+588
+589
+590
+591
+592
+593
+594
+595
+596
+597
+598
+599
+600
+601
+602
+603
+604
+605
+606
+607
+608
+609
+610
+611
+612
+613
+614
+615
+616
+617
+618
+619
+620
+621
+622
+623
+624
+625
+626
+627
+628
+629
+630
+631
+632
+633
+634
+635
+636
+637
+638
+639
+640
+641
+642
+643
+644
+645
+646
+647
+648
+649
+650
+651
+652
+653
+654
+655
+656
+657
+658
+659
+660
+661
+662
+663
+664
+665
+666
+667
+668
+669
+670
+671
+672
+673
+674
+675
+676
+677
+678
+679
+680
+681
+682
+683
+684
+685
+686
+687
+688
+689
+690
+691
+692
+693
+694
+695
+696
+697
+698
+699
+700
+701
+702
+703
+704
+705
+706
+707
+708
+709
+710
+711
+712
+713
+714
+715
+716
+717
+718
+719
+720
+721
+722
+723
+724
+725
+726
+727
+728
+729
+730
+731
+732
+733
+734
+735
+736
+737
+738
+739
+740
+741
+742
+743
+744
+745
+746
+747
+748
+749
+750
+751
+752
+753
+754
+755
+756
+757
+758
+759
+760
+761
+762
+763
+764
+765
+766
+767
+768
+769
+770
+771
+772
+773
+774
+775
+776
+777
+778
+779
+780
+781
+782
+783
+784
+785
+786
+787
+788
+789
+790
+791
+792
+793
+794
+795
+796
+797
+798
+799
+800
+801
+802
+803
+804
+805
+806
+807
+808
+809
+810
+811
+812
+813
+814
+815
+816
+817
+818
+819
+820
+821
+822
+823
+824
+825
+826
+827
+828
+829
+830
+831
+832
+833
+834
+835
+836
+837
+838
+839
+840
+841
+842
+843
+844
+845
+846
+847
+848
+849
+850
+851
+852
+853
+854
+855
+856
+857
+858
+859
+860
+861
+862
+863
+864
+865
+866
+867
+868
+869
+870
+871
+872
+873
+874
+875
+876
+877
+878
+879
+880
+881
+882
+883
+884
+885
+886
+887
+888
+889
+890
+891
+892
+893
+894
+895
+896
+897
+898
+899
+900
+901
+902
+903
+904
+905
+906
+907
+908
+909
+910
+911
+912
+913
+914
+915
+916
+917
+918
+919
+920
+921
+922
+923
+924
+925
+926
+927
+928
+929
+930
+931
+932
+933
+934
+935
+936
+937
+938
+939
+940
+941
+942
+943
+944
+945
+946
+947
+948
+949
+950
+951
+952
+953
+954
+955
+956
+957
+958
+959
+960
+961
+962
+963
+964
+965
+966
+967
+968
+969
+970
+971
+972
+973
+974
+975
+976
+977
+978
+979
+980
+981
+982
+983
+984
+985
+986
+987
+988
+989
+990
+991
+992
+993
+994
+995
+996
+997
+998
+999
+1000
+1001
+1002
+1003
+1004
+1005
+1006
+1007
+1008
+1009
+1010
+1011
+1012
+1013
+1014
+1015
+1016
+1017
+1018
+1019
+1020
+1021
+1022
+1023
+1024
+1025
+1026
+1027
+1028
+1029
+1030
+1031
+1032
+1033
+1034
+1035
+1036
+1037
+1038
+1039
+1040
+1041
+1042
+1043
+1044
+1045
+1046
+1047
+1048
+1049
+1050
+1051
+1052
+1053
+1054
+1055
+1056
+1057
+1058
+1059
+1060
+1061
+1062
+1063
+1064
+1065
+1066
+1067
+1068
+1069
+1070
+1071
+1072
+1073
+1074
+1075
+1076
+1077
+1078
+1079
+1080
+1081
+1082
+1083
+1084
+1085
+1086
+1087
+1088
+1089
+1090
+1091
+1092
+1093
+1094
+1095
+1096
+1097
+1098
+1099
+1100
+1101
+1102
+1103
+1104
+1105
+1106
+1107
+1108
+1109
+1110
+1111
+1112
+1113
+1114
+1115
+1116
+1117
+1118
+1119
+1120
+1121
+1122
+1123
+1124
+1125
+1126
+1127
+1128
+1129
+1130
+1131
+1132
+1133
+1134
+1135
+1136
+1137
+1138
+1139
+1140
+1141
+1142
+1143
+1144
+1145
+1146
+1147
+1148
+1149
+1150
+1151
+1152
+1153
+1154
+1155
+1156
+1157
+1158
+1159
+1160
+1161
+1162
+1163
+1164
+1165
+1166
+1167
+1168
+1169
+1170
+1171
+1172
+1173
+1174
+1175
+1176
+1177
+1178
+1179
+1180
+1181
+1182
+1183
+1184
+1185
+1186
+1187
+1188
+1189
+1190
+1191
+1192
+1193
+1194
+1195
+1196
+1197
+1198
+1199
+1200
+1201
+1202
+1203
+1204
+1205
+1206
+1207
+1208
+1209
+1210
+1211
+1212
+1213
+1214
+1215
+1216
+1217
+1218
+1219
+1220
+1221
+1222
+1223
+1224
+1225
+1226
+1227
+1228
+1229
+1230
+1231
+1232
+1233
+1234
+1235
+1236
+1237
+1238
+1239
+1240
+1241
+1242
+1243
+1244
+1245
+1246
+1247
+1248
+1249
+1250
+1251
+1252
+1253
+1254
+1255
+1256
+1257
+1258
+1259
+1260
+1261
+1262
+1263
+1264
+1265
+1266
+1267
+1268
+1269
+1270
+1271
+1272
+1273
+1274
+1275
+1276
+1277
+1278
+1279
+1280
+1281
+1282
+1283
+1284
+1285
+1286
+1287
+1288
+1289
+1290
+1291
+1292
+1293
+1294
+1295
+1296
+1297
+1298
+1299
+1300
+1301
+1302
+1303
+1304
+1305
+1306
+1307
+1308
+1309
+1310
+1311
+1312
+1313
+1314
+1315
+1316
+1317
+1318
+1319
+1320
+1321
+1322
+1323
+1324
+1325
+1326
+1327
+1328
+1329
+1330
+1331
+1332
+1333
+1334
+1335
+1336
+1337
+1338
+1339
+1340
+1341
+1342
+1343
+1344
+1345
+1346
+1347
+1348
+1349
+1350
+1351
+1352
+1353
+1354
+1355
+1356
+1357
+1358
+1359
+1360
+1361
+1362
+1363
+1364
+1365
+1366
+1367
+1368
+1369
+1370
+1371
+1372
+1373
+1374
+1375
+1376
+1377
+1378
+1379
+1380
+1381
+1382
+1383
+1384
+1385
+1386
+1387
+1388
+1389
+1390
+1391
+1392
+1393
+1394
+1395
+1396
+1397
+1398
+1399
+1400
+1401
+1402
+1403
+1404
+1405
+1406
+1407
+1408
+1409
+1410
+1411
+1412
+1413
+1414
+1415
+1416
+1417
+1418
+1419
+1420
+1421
+1422
+1423
+1424
+1425
+1426
+1427
+1428
+1429
+1430
+1431
+1432
+1433
+1434
+1435
+1436
+1437
+1438
+1439
+1440
+1441
+1442
+1443
+1444
+1445
+1446
+1447
+1448
+1449
+1450
+1451
+1452
+1453
+1454
+1455
+1456
+1457
+1458
+1459
+1460
+1461
+1462
+1463
+1464
+1465
+1466
+1467
+1468
+1469
+1470
+1471
+1472
+1473
+1474
+1475
+1476
+1477
+1478
+1479
+1480
+1481
+1482
+1483
+1484
+1485
+1486
+1487
+1488
+1489
+1490
+1491
+1492
+1493
+1494
+1495
+1496
+1497
+1498
+1499
+1500
+1501
+1502
+1503
+1504
+1505
+1506
+1507
+1508
+1509
+1510
+1511
+1512
+1513
+1514
+1515
+1516
+1517
+1518
+1519
+1520
+1521
+1522
+1523
+1524
+1525
+1526
+1527
+1528
+1529
+1530
+1531
+1532
+1533
+1534
+1535
+1536
+1537
+1538
+1539
+1540
+1541
+1542
+1543
+1544
+1545
+1546
+1547
+1548
+1549
+1550
+1551
+1552
+1553
+1554
+1555
+1556
+1557
+1558
+1559
+1560
+1561
+1562
+1563
+1564
+1565
+1566
+1567
+1568
+1569
+1570
+1571
+1572
+1573
+1574
+1575
+1576
+1577
+1578
+1579
+1580
+1581
+1582
+1583
+1584
+1585
+1586
+1587
+1588
+1589
+1590
+1591
+1592
+1593
+1594
+1595
+1596
+1597
+1598
+1599
+1600
+1601
+1602
+1603
+1604
+1605
+1606
+1607
+1608
+1609
+1610
+1611
+1612
+1613
+1614
+1615
+1616
+1617
+1618
+1619
+1620
+1621
+1622
+1623
+1624
+1625
+1626
+1627
+1628
+1629
+1630
+1631
+1632
+1633
+1634
+1635
+1636
+1637
+1638
+1639
+1640
+1641
+1642
+1643
+1644
+1645
+1646
+1647
+1648
+1649
+1650
+1651
+1652
+1653
+1654
+1655
+1656
+1657
+1658
+1659
+1660
+1661
+1662
+1663
+1664
+1665
+1666
+1667
+1668
+1669
+1670
+1671
+1672
+1673
+1674
+1675
+1676
+1677
+1678
+1679
+1680
+1681
+1682
+1683
+1684
+1685
+1686
+1687
+1688
+1689
+1690
+1691
+1692
+1693
+1694
+1695
+1696
+1697
+1698
+1699
+1700
+1701
+1702
+1703
+1704
+1705
+1706
+1707
+1708
+1709
+1710
+1711
+1712
+1713
+1714
+1715
+1716
+1717
+1718
+1719
+1720
+1721
+1722
+1723
+1724
+1725
+1726
+1727
+1728
+1729
+1730
+1731
+1732
+1733
+1734
+1735
+1736
+1737
+1738
+1739
+1740
+1741
+1742
+1743
+1744
+1745
+1746
+1747
+1748
+1749
+1750
+1751
+1752
+1753
+1754
+1755
+1756
+1757
+1758
+1759
+1760
+1761
+1762
+1763
+1764
+1765
+1766
+1767
+1768
+1769
+1770
+1771
+1772
+1773
+1774
+1775
+1776
+1777
+1778
+1779
+1780
+1781
+1782
+1783
+1784
+1785
+1786
+1787
+1788
+1789
+1790
+1791
+1792
+1793
+1794
+1795
+1796
+1797
+1798
+1799
+1800
+1801
+1802
+1803
+1804
+1805
+1806
+1807
+1808
+1809
+1810
+1811
+1812
+1813
+1814
+1815
+1816
+1817
+1818
+1819
+1820
+1821
+1822
+1823
+1824
+1825
+1826
+1827
+1828
+1829
+1830
+1831
+1832
+1833
+1834
+1835
+1836
+1837
+1838
+1839
+1840
+1841
+1842
+1843
+1844
+1845
+1846
+1847
+1848
+1849
+1850
+1851
+1852
+1853
+1854
+1855
+1856
+1857
+1858
+1859
+1860
+1861
+1862
+1863
+1864
+1865
+1866
+1867
+1868
+1869
+1870
+1871
+1872
+1873
+1874
+1875
+1876
+1877
+1878
+1879
+1880
+1881
+1882
+1883
+1884
+1885
+1886
+1887
+1888
+1889
+1890
+1891
+1892
+1893
+1894
+1895
+1896
+1897
+1898
+1899
+1900
+1901
+1902
+1903
+1904
+1905
+1906
+1907
+1908
+1909
+1910
+1911
+1912
+1913
+1914
+1915
+1916
+1917
+1918
+1919
+1920
+1921
+1922
+1923
+1924
+1925
+1926
+1927
+1928
+1929
+1930
+1931
+1932
+1933
+1934
+1935
+1936
+1937
+1938
+1939
+1940
+1941
+1942
+1943
+1944
+1945
+1946
+1947
+1948
+1949
+1950
+1951
+1952
+1953
+1954
+1955
+1956
+1957
+1958
+1959
+1960
+1961
+1962
+1963
+1964
+1965
+1966
+1967
+1968
+1969
+1970
+1971
+1972
+1973
+1974
+1975
+1976
+1977
+1978
+1979
+1980
+1981
+1982
+1983
+1984
+1985
+1986
+1987
+1988
+1989
+1990
+1991
+1992
+1993
+1994
+1995
+1996
+1997
+1998
+1999
+2000
+2001
+2002
+2003
+2004
+2005
+2006
+2007
+2008
+2009
+2010
+2011
+2012
+2013
+2014
+2015
+2016
+2017
+2018
+2019
+2020
+2021
+2022
+2023
+2024
+2025
+2026
+2027
+2028
+2029
+2030
+2031
+2032
+2033
+2034
+2035
+2036
+2037
+2038
+2039
+2040
+2041
+2042
+2043
+2044
+2045
+2046
+2047
+2048
+2049
+2050
+2051
+2052
+2053
+2054
+2055
+2056
+2057
+2058
+2059
+2060
+2061
+2062
+2063
+2064
+2065
+2066
+2067
+2068
+2069
+2070
+2071
+2072
+2073
+2074
+2075
+2076
+2077
+2078
+2079
+2080
+2081
+2082
+2083
+2084
+2085
+2086
+2087
+2088
+2089
+2090
+2091
+2092
+2093
+2094
+2095
+2096
+2097
+2098
+2099
+2100
+2101
+2102
+2103
+2104
+2105
+2106
+2107
+2108
+2109
+2110
+2111
+2112
+2113
+2114
+2115
+2116
+2117
+2118
+2119
+2120
+2121
+2122
+2123
+2124
+2125
+2126
+2127
+2128
+2129
+2130
+2131
+2132
+2133
+2134
+2135
+2136
+2137
+2138
+2139
+2140
+2141
+2142
+2143
+2144
+2145
+2146
+2147
+2148
+2149
+2150
+2151
+2152
+2153
+2154
+2155
+2156
+2157
+2158
+2159
+2160
+2161
+2162
+2163
+2164
+2165
+2166
+2167
+2168
+2169
+2170
+2171
+2172
+2173
+2174
+2175
+2176
+2177
+2178
+2179
+2180
+2181
+2182
+2183
+2184
+2185
+2186
+2187
+2188
+2189
+2190
+2191
+2192
+2193
+2194
+2195
+2196
+2197
+2198
+2199
+2200
+2201
+2202
+2203
+2204
+2205
+2206
+2207
+2208
+2209
+2210
+2211
+2212
+2213
+2214
+2215
+2216
+2217
+2218
+2219
+2220
+2221
+2222
+2223
+2224
+2225
+2226
+2227
+2228
+2229
+2230
+2231
+2232
+2233
+2234
+2235
+2236
+2237
+2238
+2239
+2240
+2241
+2242
+2243
+2244
+2245
+2246
+2247
+2248
+2249
+2250
+2251
+2252
+2253
+2254
+2255
+2256
+2257
+2258
+2259
+2260
+2261
+2262
+2263
+2264
+2265
+2266
+2267
+2268
+2269
+2270
+2271
+2272
+2273
+2274
+2275
+2276
+2277
+2278
+2279
+2280
+2281
+2282
+2283
+2284
+2285
+2286
+2287
+2288
+2289
+2290
+2291
+2292
+2293
+2294
+2295
+2296
+2297
+2298
+2299
+2300
+2301
+2302
+2303
+2304
+2305
+2306
+2307
+2308
+2309
+2310
+2311
+2312
+2313
+2314
+2315
+2316
+2317
+2318
+2319
+2320
+2321
+2322
+2323
+2324
+2325
+2326
+2327
+2328
+2329
+2330
+2331
+2332
+2333
+2334
+2335
+2336
+2337
+2338
+2339
+2340
+2341
+2342
+2343
+2344
+2345
+2346
+2347
+2348
+2349
+2350
+2351
+2352
+2353
+2354
+2355
+2356
+2357
+2358
+2359
+2360
+2361
+2362
+2363
+2364
+2365
+2366
+2367
+2368
+2369
+2370
+2371
+2372
+2373
+2374
+2375
+2376
+2377
+2378
+2379
+2380
+2381
+2382
+2383
+2384
+2385
+2386
+2387
+2388
+2389
+2390
+2391
+2392
+2393
+2394
+2395
+2396
+2397
+2398
+2399
+2400
+2401
+2402
+2403
+2404
+2405
+2406
+2407
+2408
+2409
+2410
+2411
+2412
+2413
+2414
+2415
+2416
+2417
+2418
+2419
+2420
+2421
+2422
+2423
+2424
+2425
+2426
+2427
+2428
+2429
+2430
+2431
+2432
+2433
+2434
+2435
+2436
+2437
+2438
+2439
+2440
+2441
+2442
+2443
+2444
+2445
+2446
+2447
+2448
+2449
+2450
+2451
+2452
+2453
+2454
+2455
+2456
+2457
+2458
+2459
+2460
+2461
+2462
+2463
+2464
+2465
+2466
+2467
+2468
+2469
+2470
+2471
+2472
+2473
+2474
+2475
+2476
+2477
+2478
+2479
+2480
+2481
+2482
+2483
+2484
+2485
+2486
+2487
+2488
+2489
+2490
+2491
+2492
+2493
+2494
+2495
+2496
+2497
+2498
+2499
+2500
+2501
+2502
+2503
+2504
+2505
+2506
+2507
+2508
+2509
+2510
+2511
+2512
+2513
+2514
+2515
+2516
+2517
+2518
+2519
+2520
+2521
+2522
+2523
+2524
+2525
+2526
+2527
+2528
+2529
+2530
+2531
+2532
+2533
+2534
+2535
+2536
+2537
+2538
+2539
+2540
+2541
+2542
+2543
+2544
+2545
+2546
+2547
+2548
+2549
+2550
+2551
+2552
+2553
+2554
+2555
+2556
+2557
+2558
+2559
+2560
+2561
+2562
+2563
+2564
+2565
+2566
+2567
+2568
+2569
+2570
+2571
+2572
+2573
+2574
+2575
+2576
+2577
+2578
+2579
+2580
+2581
+2582
+2583
+2584
+2585
+2586
+2587
+2588
+2589
+2590
+2591
+2592
+2593
+2594
+2595
+2596
+2597
+2598
+2599
+2600
+2601
+2602
+2603
+2604
+2605
+2606
+2607
+2608
+2609
+2610
+2611
+2612
+2613
+2614
+2615
+2616
+2617
+2618
+2619
+2620
+2621
+2622
+2623
+2624
+2625
+2626
+2627
+2628
+2629
+2630
+2631
+2632
+2633
+2634
+2635
+2636
+2637
+2638
+2639
+2640
+2641
+2642
+2643
+2644
+2645
+2646
+2647
+2648
+2649
+2650
+2651
+2652
+2653
+2654
+2655
+2656
+2657
+2658
+2659
+2660
+2661
+2662
+2663
+2664
+2665
+2666
+2667
+2668
+2669
+2670
+2671
+2672
+2673
+2674
+2675
+2676
+2677
+2678
+2679
+2680
+2681
+2682
+2683
+2684
+2685
+2686
+2687
+2688
+2689
+2690
+2691
+2692
+2693
+2694
+2695
+2696
+2697
+2698
+2699
+2700
+2701
+2702
+2703
+2704
+2705
+2706
+2707
+2708
+2709
+2710
+2711
+2712
+2713
+2714
+2715
+2716
+2717
+2718
+2719
+2720
+2721
+2722
+2723
+2724
+2725
+2726
+2727
+2728
+2729
+2730
+2731
+2732
+2733
+2734
+2735
+2736
+2737
+2738
+2739
+2740
+2741
+2742
+2743
+2744
+2745
+2746
+2747
+2748
+2749
+2750
+2751
+2752
+2753
+2754
+2755
+2756
+2757
+2758
+2759
+2760
+2761
+2762
+2763
+2764
+2765
+2766
+2767
+2768
+2769
+2770
+2771
+2772
+2773
+2774
+2775
+2776
+2777
+2778
+2779
+2780
+2781
+2782
+2783
+2784
+2785
+2786
+2787
+2788
+2789
+2790
+2791
+2792
+2793
+2794
+2795
+2796
+2797
+2798
+2799
+2800
+2801
+2802
+2803
+2804
+2805
+2806
+2807
+2808
+2809
+2810
+2811
+2812
+2813
+2814
+2815
+2816
+2817
+2818
+2819
+2820
+2821
+2822
+2823
+2824
+2825
+2826
+2827
+2828
+2829
+2830
+2831
+2832
+2833
+2834
+2835
+2836
+2837
+2838
+2839
+2840
+2841
+2842
+2843
+2844
+2845
+2846
+2847
+2848
+2849
+2850
+2851
+2852
+2853
+2854
+2855
+2856
+2857
+2858
+2859
+2860
+2861
+2862
+2863
+2864
+2865
+2866
+2867
+2868
+2869
+2870
+2871
+2872
+2873
+2874
+2875
+2876
+2877
+2878
+2879
+2880
+2881
+2882
+2883
+2884
+2885
+2886
+2887
+2888
+2889
+2890
+2891
+2892
+2893
+2894
+2895
+2896
+2897
+2898
+2899
+2900
+2901
+2902
+2903
+2904
+2905
+2906
+2907
+2908
+2909
+2910
+2911
+2912
+2913
+2914
+2915
+2916
+2917
+2918
+2919
+2920
+2921
+2922
+2923
+2924
+2925
+2926
+2927
+2928
+2929
+2930
+2931
+2932
+2933
+2934
+2935
+2936
+2937
+2938
+2939
+2940
+2941
+2942
+2943
+2944
+2945
+2946
+2947
+2948
+2949
+2950
+2951
+2952
+2953
+2954
+2955
+2956
+2957
+2958
+2959
+2960
+2961
+2962
+2963
+2964
+2965
+2966
+2967
+2968
+2969
+2970
+2971
+2972
+2973
+2974
+2975
+2976
+2977
+2978
+2979
+2980
+2981
+2982
+2983
+2984
+2985
+2986
+2987
+2988
+2989
+2990
+2991
+2992
+2993
+2994
+2995
+2996
+2997
+2998
+2999
+3000
+3001
+3002
+3003
+3004
+3005
+3006
+3007
+3008
+3009
+3010
+3011
+3012
+3013
+3014
+3015
+3016
+3017
+3018
+3019
+3020
+3021
+3022
+3023
+3024
+3025
+3026
+3027
+3028
+3029
+3030
+3031
+3032
+3033
+3034
+3035
+3036
+3037
+3038
+3039
+3040
+3041
+3042
+3043
+3044
+3045
+3046
+3047
+3048
+3049
+3050
+3051
+3052
+3053
+3054
+3055
+3056
+3057
+3058
+3059
+3060
+3061
+3062
+3063
+3064
+3065
+3066
+3067
+3068
+3069
+3070
+3071
+3072
+3073
+3074
+3075
+3076
+3077
+3078
+3079
+3080
+3081
+3082
+3083
+3084
+3085
+3086
+3087
+3088
+3089
+3090
+3091
+3092
+3093
+3094
+3095
+3096
+3097
+3098
+3099
+3100
+3101
+3102
+3103
+3104
+3105
+3106
+3107
+3108
+3109
+3110
+3111
+3112
+3113
+3114
+3115
+3116
+3117
+3118
+3119
+3120
+3121
+3122
+3123
+3124
+3125
+3126
+3127
+3128
+3129
+3130
+3131
+3132
+3133
+3134
+3135
+3136
+3137
+3138
+3139
+3140
+3141
+3142
+3143
+3144
+3145
+3146
+3147
+3148
+3149
+3150
+3151
+3152
+3153
+3154
+3155
+3156
+3157
+3158
+3159
+3160
+3161
+3162
+3163
+3164
+3165
+3166
+3167
+3168
+3169
+3170
+3171
+3172
+3173
+3174
+3175
+3176
+3177
+3178
+3179
+3180
+3181
+3182
+3183
+3184
+3185
+3186
+3187
+3188
+3189
+3190
+3191
+3192
+3193
+3194
+3195
+3196
+3197
+3198
+3199
+3200
+3201
+3202
+3203
+3204
+3205
+3206
+3207
+3208
+3209
+3210
+3211
+3212
+3213
+3214
+3215
+3216
+3217
+3218
+3219
+3220
+3221
+3222
+3223
+3224
+3225
+3226
+3227
+3228
+3229
+3230
+3231
+3232
+3233
+3234
+3235
+3236
+3237
+3238
+3239
+3240
+3241
+3242
+3243
+3244
+3245
+3246
+3247
+3248
+3249
+3250
+3251
+3252
+3253
+3254
+3255
+3256
+3257
+3258
+3259
+3260
+3261
+3262
+3263
+3264
+3265
+3266
+3267
+3268
+3269
+3270
+3271
+3272
+3273
+3274
+3275
+3276
+3277
+3278
+3279
+3280
+3281
+3282
+3283
+3284
+3285
+3286
+3287
+3288
+3289
+3290
+3291
+3292
+3293
+3294
+3295
+3296
+3297
+3298
+3299
+3300
+3301
+3302
+3303
+3304
+3305
+3306
+3307
+3308
+3309
+3310
+3311
+3312
+3313
+3314
+3315
+3316
+3317
+3318
+3319
+3320
+3321
+3322
+3323
+3324
+3325
+3326
+3327
+3328
+3329
+3330
+3331
+3332
+3333
+3334
+3335
+3336
+3337
+3338
+3339
+3340
+3341
+3342
+3343
+3344
+3345
+3346
+3347
+3348
+3349
+3350
+3351
+3352
+3353
+3354
+3355
+3356
+3357
+3358
+3359
+3360
+3361
+3362
+3363
+3364
+3365
+3366
+3367
+3368
+3369
+3370
+3371
+3372
+3373
+3374
+3375
+3376
+3377
+3378
+3379
+3380
+3381
+3382
+3383
+3384
+3385
+3386
+3387
+3388
+3389
+3390
+3391
+3392
+3393
+3394
+3395
+3396
+3397
+3398
+3399
+3400
+3401
+3402
+3403
+3404
+3405
+3406
+3407
+3408
+3409
+3410
+3411
+3412
+3413
+3414
+3415
+3416
+3417
+3418
+3419
+3420
+3421
+3422
+3423
+3424
+3425
+3426
+3427
+3428
+3429
+3430
+3431
+3432
+3433
+3434
+3435
+3436
+3437
+3438
+3439
+3440
+3441
+3442
+3443
+3444
+3445
+3446
+3447
+3448
+3449
+3450
+3451
+3452
+3453
+3454
+3455
+3456
+3457
+3458
+3459
+3460
+3461
+3462
+3463
+3464
+3465
+3466
+3467
+3468
+3469
+3470
+3471
+3472
+3473
+3474
+3475
+3476
+3477
+3478
+3479
+3480
+3481
+3482
+3483
+3484
+3485
+3486
+3487
+3488
+3489
+3490
+3491
+3492
+3493
+3494
+3495
+3496
+3497
+3498
+3499
+3500
+3501
+3502
+3503
+3504
+3505
+3506
+3507
+3508
+3509
+3510
+3511
+3512
+3513
+3514
+3515
+3516
+3517
+3518
+3519
+3520
+3521
+3522
+3523
+3524
+3525
+3526
+3527
+3528
+3529
+3530
+3531
+3532
+3533
+3534
+3535
+3536
+3537
+3538
+3539
+3540
+3541
+3542
+3543
+3544
+3545
+3546
+3547
+3548
+3549
+3550
+3551
+3552
+3553
+3554
+3555
+3556
+3557
+3558
+3559
+3560
+3561
+3562
+3563
+3564
+3565
+3566
+3567
+3568
+3569
+3570
+3571
+3572
+3573
+3574
+3575
+3576
+3577
+3578
+3579
+3580
+3581
+3582
+3583
+3584
+3585
+3586
+3587
+3588
+3589
+3590
+3591
+3592
+3593
+3594
+3595
+3596
+3597
+3598
+3599
+3600
+3601
+3602
+3603
+3604
+3605
+3606
+3607
+3608
+3609
+3610
+3611
+3612
+3613
+3614
+3615
+3616
+3617
+3618
+3619
+3620
+3621
+3622
+3623
+3624
+3625
+3626
+3627
+3628
+3629
+3630
+3631
+3632
+3633
+3634
+3635
+3636
+3637
+3638
+3639
+3640
+3641
+3642
+3643
+3644
+3645
+3646
+3647
+3648
+3649
+3650
+3651
+3652
+3653
+3654
+3655
+3656
+3657
+3658
+3659
+3660
+3661
+3662
+3663
+3664
+3665
+3666
+3667
+3668
+3669
+3670
+3671
+3672
+3673
+3674
+3675
+3676
+3677
+3678
+3679
+3680
+3681
+3682
+3683
+3684
+3685
+3686
+3687
+3688
+3689
+3690
+3691
+3692
+3693
+3694
+3695
+3696
+3697
+3698
+3699
+3700
+3701
+3702
+3703
+3704
+3705
+3706
+3707
+3708
+3709
+3710
+3711
+3712
+3713
+3714
+3715
+3716
+3717
+3718
+3719
+3720
+3721
+3722
+3723
+3724
+3725
+3726
+3727
+3728
+3729
+3730
+3731
+3732
+3733
+3734
+3735
+3736
+3737
+3738
+3739
+3740
+3741
+3742
+3743
+3744
+3745
+3746
+3747
+3748
+3749
+3750
+3751
+3752
+3753
+3754
+3755
+3756
+3757
+3758
+3759
+3760
+3761
+3762
+3763
+3764
+3765
+3766
+3767
+3768
+3769
+3770
+3771
+3772
+3773
+3774
+3775
+3776
+3777
+3778
+3779
+3780
+3781
+3782
+3783
+3784
+3785
+3786
+3787
+3788
+3789
+3790
+3791
+3792
+3793
+3794
+3795
+3796
+3797
+3798
+3799
+3800
+3801
+3802
+3803
+3804
+3805
+3806
+3807
+3808
+3809
+3810
+3811
+3812
+3813
+3814
+3815
+3816
+3817
+3818
+3819
+3820
+3821
+3822
+3823
+3824
+3825
+3826
+3827
+3828
+3829
+3830
+3831
+3832
+3833
+3834
+3835
+3836
+3837
+3838
+3839
+3840
+3841
+3842
+3843
+3844
+3845
+3846
+3847
+3848
+3849
+3850
+3851
+3852
+3853
+3854
+3855
+3856
+3857
+3858
+3859
+3860
+3861
+3862
+3863
+3864
+3865
+3866
+3867
+3868
+3869
+3870
+3871
+3872
+3873
+3874
+3875
+3876
+3877
+3878
+3879
+3880
+3881
+3882
+3883
+3884
+3885
+3886
+3887
+3888
+3889
+3890
+3891
+3892
+3893
+3894
+3895
+3896
+3897
+3898
+3899
+3900
+3901
+3902
+3903
+3904
+3905
+3906
+3907
+3908
+3909
+3910
+3911
+3912
+3913
+3914
+3915
+3916
+3917
+3918
+3919
+3920
+3921
+3922
+3923
+3924
+3925
+3926
+3927
+3928
+3929
+3930
+3931
+3932
+3933
+3934
+3935
+3936
+3937
+3938
+3939
+3940
+3941
+3942
+3943
+3944
+3945
+3946
+3947
+3948
+3949
+3950
+3951
+3952
+3953
+3954
+3955
+3956
+3957
+3958
+3959
+3960
+3961
+3962
+3963
+3964
+3965
+3966
+3967
+3968
+3969
+3970
+3971
+3972
+3973
+3974
+3975
+3976
+3977
+3978
+3979
+3980
+3981
+3982
+3983
+3984
+3985
+3986
+3987
+3988
+3989
+3990
+3991
+3992
+3993
+3994
+3995
+3996
+3997
+3998
+3999
diff --git a/nashorn/test/script/basic/NASHORN-423a.js b/nashorn/test/script/basic/NASHORN-423a.js
new file mode 100644
index 00000000000..e68209fe022
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-423a.js
@@ -0,0 +1,2030 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-423 - Large scripts don't fit into a single class file and need to be split.
+ *
+ * @test
+ * @run
+ */
+
+function a0(x, y) { print(0); }
+function a1(x, y) { print(1); }
+function a2(x, y) { print(2); }
+function a3(x, y) { print(3); }
+function a4(x, y) { print(4); }
+function a5(x, y) { print(5); }
+function a6(x, y) { print(6); }
+function a7(x, y) { print(7); }
+function a8(x, y) { print(8); }
+function a9(x, y) { print(9); }
+function a10(x, y) { print(10); }
+function a11(x, y) { print(11); }
+function a12(x, y) { print(12); }
+function a13(x, y) { print(13); }
+function a14(x, y) { print(14); }
+function a15(x, y) { print(15); }
+function a16(x, y) { print(16); }
+function a17(x, y) { print(17); }
+function a18(x, y) { print(18); }
+function a19(x, y) { print(19); }
+function a20(x, y) { print(20); }
+function a21(x, y) { print(21); }
+function a22(x, y) { print(22); }
+function a23(x, y) { print(23); }
+function a24(x, y) { print(24); }
+function a25(x, y) { print(25); }
+function a26(x, y) { print(26); }
+function a27(x, y) { print(27); }
+function a28(x, y) { print(28); }
+function a29(x, y) { print(29); }
+function a30(x, y) { print(30); }
+function a31(x, y) { print(31); }
+function a32(x, y) { print(32); }
+function a33(x, y) { print(33); }
+function a34(x, y) { print(34); }
+function a35(x, y) { print(35); }
+function a36(x, y) { print(36); }
+function a37(x, y) { print(37); }
+function a38(x, y) { print(38); }
+function a39(x, y) { print(39); }
+function a40(x, y) { print(40); }
+function a41(x, y) { print(41); }
+function a42(x, y) { print(42); }
+function a43(x, y) { print(43); }
+function a44(x, y) { print(44); }
+function a45(x, y) { print(45); }
+function a46(x, y) { print(46); }
+function a47(x, y) { print(47); }
+function a48(x, y) { print(48); }
+function a49(x, y) { print(49); }
+function a50(x, y) { print(50); }
+function a51(x, y) { print(51); }
+function a52(x, y) { print(52); }
+function a53(x, y) { print(53); }
+function a54(x, y) { print(54); }
+function a55(x, y) { print(55); }
+function a56(x, y) { print(56); }
+function a57(x, y) { print(57); }
+function a58(x, y) { print(58); }
+function a59(x, y) { print(59); }
+function a60(x, y) { print(60); }
+function a61(x, y) { print(61); }
+function a62(x, y) { print(62); }
+function a63(x, y) { print(63); }
+function a64(x, y) { print(64); }
+function a65(x, y) { print(65); }
+function a66(x, y) { print(66); }
+function a67(x, y) { print(67); }
+function a68(x, y) { print(68); }
+function a69(x, y) { print(69); }
+function a70(x, y) { print(70); }
+function a71(x, y) { print(71); }
+function a72(x, y) { print(72); }
+function a73(x, y) { print(73); }
+function a74(x, y) { print(74); }
+function a75(x, y) { print(75); }
+function a76(x, y) { print(76); }
+function a77(x, y) { print(77); }
+function a78(x, y) { print(78); }
+function a79(x, y) { print(79); }
+function a80(x, y) { print(80); }
+function a81(x, y) { print(81); }
+function a82(x, y) { print(82); }
+function a83(x, y) { print(83); }
+function a84(x, y) { print(84); }
+function a85(x, y) { print(85); }
+function a86(x, y) { print(86); }
+function a87(x, y) { print(87); }
+function a88(x, y) { print(88); }
+function a89(x, y) { print(89); }
+function a90(x, y) { print(90); }
+function a91(x, y) { print(91); }
+function a92(x, y) { print(92); }
+function a93(x, y) { print(93); }
+function a94(x, y) { print(94); }
+function a95(x, y) { print(95); }
+function a96(x, y) { print(96); }
+function a97(x, y) { print(97); }
+function a98(x, y) { print(98); }
+function a99(x, y) { print(99); }
+function a100(x, y) { print(100); }
+function a101(x, y) { print(101); }
+function a102(x, y) { print(102); }
+function a103(x, y) { print(103); }
+function a104(x, y) { print(104); }
+function a105(x, y) { print(105); }
+function a106(x, y) { print(106); }
+function a107(x, y) { print(107); }
+function a108(x, y) { print(108); }
+function a109(x, y) { print(109); }
+function a110(x, y) { print(110); }
+function a111(x, y) { print(111); }
+function a112(x, y) { print(112); }
+function a113(x, y) { print(113); }
+function a114(x, y) { print(114); }
+function a115(x, y) { print(115); }
+function a116(x, y) { print(116); }
+function a117(x, y) { print(117); }
+function a118(x, y) { print(118); }
+function a119(x, y) { print(119); }
+function a120(x, y) { print(120); }
+function a121(x, y) { print(121); }
+function a122(x, y) { print(122); }
+function a123(x, y) { print(123); }
+function a124(x, y) { print(124); }
+function a125(x, y) { print(125); }
+function a126(x, y) { print(126); }
+function a127(x, y) { print(127); }
+function a128(x, y) { print(128); }
+function a129(x, y) { print(129); }
+function a130(x, y) { print(130); }
+function a131(x, y) { print(131); }
+function a132(x, y) { print(132); }
+function a133(x, y) { print(133); }
+function a134(x, y) { print(134); }
+function a135(x, y) { print(135); }
+function a136(x, y) { print(136); }
+function a137(x, y) { print(137); }
+function a138(x, y) { print(138); }
+function a139(x, y) { print(139); }
+function a140(x, y) { print(140); }
+function a141(x, y) { print(141); }
+function a142(x, y) { print(142); }
+function a143(x, y) { print(143); }
+function a144(x, y) { print(144); }
+function a145(x, y) { print(145); }
+function a146(x, y) { print(146); }
+function a147(x, y) { print(147); }
+function a148(x, y) { print(148); }
+function a149(x, y) { print(149); }
+function a150(x, y) { print(150); }
+function a151(x, y) { print(151); }
+function a152(x, y) { print(152); }
+function a153(x, y) { print(153); }
+function a154(x, y) { print(154); }
+function a155(x, y) { print(155); }
+function a156(x, y) { print(156); }
+function a157(x, y) { print(157); }
+function a158(x, y) { print(158); }
+function a159(x, y) { print(159); }
+function a160(x, y) { print(160); }
+function a161(x, y) { print(161); }
+function a162(x, y) { print(162); }
+function a163(x, y) { print(163); }
+function a164(x, y) { print(164); }
+function a165(x, y) { print(165); }
+function a166(x, y) { print(166); }
+function a167(x, y) { print(167); }
+function a168(x, y) { print(168); }
+function a169(x, y) { print(169); }
+function a170(x, y) { print(170); }
+function a171(x, y) { print(171); }
+function a172(x, y) { print(172); }
+function a173(x, y) { print(173); }
+function a174(x, y) { print(174); }
+function a175(x, y) { print(175); }
+function a176(x, y) { print(176); }
+function a177(x, y) { print(177); }
+function a178(x, y) { print(178); }
+function a179(x, y) { print(179); }
+function a180(x, y) { print(180); }
+function a181(x, y) { print(181); }
+function a182(x, y) { print(182); }
+function a183(x, y) { print(183); }
+function a184(x, y) { print(184); }
+function a185(x, y) { print(185); }
+function a186(x, y) { print(186); }
+function a187(x, y) { print(187); }
+function a188(x, y) { print(188); }
+function a189(x, y) { print(189); }
+function a190(x, y) { print(190); }
+function a191(x, y) { print(191); }
+function a192(x, y) { print(192); }
+function a193(x, y) { print(193); }
+function a194(x, y) { print(194); }
+function a195(x, y) { print(195); }
+function a196(x, y) { print(196); }
+function a197(x, y) { print(197); }
+function a198(x, y) { print(198); }
+function a199(x, y) { print(199); }
+function a200(x, y) { print(200); }
+function a201(x, y) { print(201); }
+function a202(x, y) { print(202); }
+function a203(x, y) { print(203); }
+function a204(x, y) { print(204); }
+function a205(x, y) { print(205); }
+function a206(x, y) { print(206); }
+function a207(x, y) { print(207); }
+function a208(x, y) { print(208); }
+function a209(x, y) { print(209); }
+function a210(x, y) { print(210); }
+function a211(x, y) { print(211); }
+function a212(x, y) { print(212); }
+function a213(x, y) { print(213); }
+function a214(x, y) { print(214); }
+function a215(x, y) { print(215); }
+function a216(x, y) { print(216); }
+function a217(x, y) { print(217); }
+function a218(x, y) { print(218); }
+function a219(x, y) { print(219); }
+function a220(x, y) { print(220); }
+function a221(x, y) { print(221); }
+function a222(x, y) { print(222); }
+function a223(x, y) { print(223); }
+function a224(x, y) { print(224); }
+function a225(x, y) { print(225); }
+function a226(x, y) { print(226); }
+function a227(x, y) { print(227); }
+function a228(x, y) { print(228); }
+function a229(x, y) { print(229); }
+function a230(x, y) { print(230); }
+function a231(x, y) { print(231); }
+function a232(x, y) { print(232); }
+function a233(x, y) { print(233); }
+function a234(x, y) { print(234); }
+function a235(x, y) { print(235); }
+function a236(x, y) { print(236); }
+function a237(x, y) { print(237); }
+function a238(x, y) { print(238); }
+function a239(x, y) { print(239); }
+function a240(x, y) { print(240); }
+function a241(x, y) { print(241); }
+function a242(x, y) { print(242); }
+function a243(x, y) { print(243); }
+function a244(x, y) { print(244); }
+function a245(x, y) { print(245); }
+function a246(x, y) { print(246); }
+function a247(x, y) { print(247); }
+function a248(x, y) { print(248); }
+function a249(x, y) { print(249); }
+function a250(x, y) { print(250); }
+function a251(x, y) { print(251); }
+function a252(x, y) { print(252); }
+function a253(x, y) { print(253); }
+function a254(x, y) { print(254); }
+function a255(x, y) { print(255); }
+function a256(x, y) { print(256); }
+function a257(x, y) { print(257); }
+function a258(x, y) { print(258); }
+function a259(x, y) { print(259); }
+function a260(x, y) { print(260); }
+function a261(x, y) { print(261); }
+function a262(x, y) { print(262); }
+function a263(x, y) { print(263); }
+function a264(x, y) { print(264); }
+function a265(x, y) { print(265); }
+function a266(x, y) { print(266); }
+function a267(x, y) { print(267); }
+function a268(x, y) { print(268); }
+function a269(x, y) { print(269); }
+function a270(x, y) { print(270); }
+function a271(x, y) { print(271); }
+function a272(x, y) { print(272); }
+function a273(x, y) { print(273); }
+function a274(x, y) { print(274); }
+function a275(x, y) { print(275); }
+function a276(x, y) { print(276); }
+function a277(x, y) { print(277); }
+function a278(x, y) { print(278); }
+function a279(x, y) { print(279); }
+function a280(x, y) { print(280); }
+function a281(x, y) { print(281); }
+function a282(x, y) { print(282); }
+function a283(x, y) { print(283); }
+function a284(x, y) { print(284); }
+function a285(x, y) { print(285); }
+function a286(x, y) { print(286); }
+function a287(x, y) { print(287); }
+function a288(x, y) { print(288); }
+function a289(x, y) { print(289); }
+function a290(x, y) { print(290); }
+function a291(x, y) { print(291); }
+function a292(x, y) { print(292); }
+function a293(x, y) { print(293); }
+function a294(x, y) { print(294); }
+function a295(x, y) { print(295); }
+function a296(x, y) { print(296); }
+function a297(x, y) { print(297); }
+function a298(x, y) { print(298); }
+function a299(x, y) { print(299); }
+function a300(x, y) { print(300); }
+function a301(x, y) { print(301); }
+function a302(x, y) { print(302); }
+function a303(x, y) { print(303); }
+function a304(x, y) { print(304); }
+function a305(x, y) { print(305); }
+function a306(x, y) { print(306); }
+function a307(x, y) { print(307); }
+function a308(x, y) { print(308); }
+function a309(x, y) { print(309); }
+function a310(x, y) { print(310); }
+function a311(x, y) { print(311); }
+function a312(x, y) { print(312); }
+function a313(x, y) { print(313); }
+function a314(x, y) { print(314); }
+function a315(x, y) { print(315); }
+function a316(x, y) { print(316); }
+function a317(x, y) { print(317); }
+function a318(x, y) { print(318); }
+function a319(x, y) { print(319); }
+function a320(x, y) { print(320); }
+function a321(x, y) { print(321); }
+function a322(x, y) { print(322); }
+function a323(x, y) { print(323); }
+function a324(x, y) { print(324); }
+function a325(x, y) { print(325); }
+function a326(x, y) { print(326); }
+function a327(x, y) { print(327); }
+function a328(x, y) { print(328); }
+function a329(x, y) { print(329); }
+function a330(x, y) { print(330); }
+function a331(x, y) { print(331); }
+function a332(x, y) { print(332); }
+function a333(x, y) { print(333); }
+function a334(x, y) { print(334); }
+function a335(x, y) { print(335); }
+function a336(x, y) { print(336); }
+function a337(x, y) { print(337); }
+function a338(x, y) { print(338); }
+function a339(x, y) { print(339); }
+function a340(x, y) { print(340); }
+function a341(x, y) { print(341); }
+function a342(x, y) { print(342); }
+function a343(x, y) { print(343); }
+function a344(x, y) { print(344); }
+function a345(x, y) { print(345); }
+function a346(x, y) { print(346); }
+function a347(x, y) { print(347); }
+function a348(x, y) { print(348); }
+function a349(x, y) { print(349); }
+function a350(x, y) { print(350); }
+function a351(x, y) { print(351); }
+function a352(x, y) { print(352); }
+function a353(x, y) { print(353); }
+function a354(x, y) { print(354); }
+function a355(x, y) { print(355); }
+function a356(x, y) { print(356); }
+function a357(x, y) { print(357); }
+function a358(x, y) { print(358); }
+function a359(x, y) { print(359); }
+function a360(x, y) { print(360); }
+function a361(x, y) { print(361); }
+function a362(x, y) { print(362); }
+function a363(x, y) { print(363); }
+function a364(x, y) { print(364); }
+function a365(x, y) { print(365); }
+function a366(x, y) { print(366); }
+function a367(x, y) { print(367); }
+function a368(x, y) { print(368); }
+function a369(x, y) { print(369); }
+function a370(x, y) { print(370); }
+function a371(x, y) { print(371); }
+function a372(x, y) { print(372); }
+function a373(x, y) { print(373); }
+function a374(x, y) { print(374); }
+function a375(x, y) { print(375); }
+function a376(x, y) { print(376); }
+function a377(x, y) { print(377); }
+function a378(x, y) { print(378); }
+function a379(x, y) { print(379); }
+function a380(x, y) { print(380); }
+function a381(x, y) { print(381); }
+function a382(x, y) { print(382); }
+function a383(x, y) { print(383); }
+function a384(x, y) { print(384); }
+function a385(x, y) { print(385); }
+function a386(x, y) { print(386); }
+function a387(x, y) { print(387); }
+function a388(x, y) { print(388); }
+function a389(x, y) { print(389); }
+function a390(x, y) { print(390); }
+function a391(x, y) { print(391); }
+function a392(x, y) { print(392); }
+function a393(x, y) { print(393); }
+function a394(x, y) { print(394); }
+function a395(x, y) { print(395); }
+function a396(x, y) { print(396); }
+function a397(x, y) { print(397); }
+function a398(x, y) { print(398); }
+function a399(x, y) { print(399); }
+function a400(x, y) { print(400); }
+function a401(x, y) { print(401); }
+function a402(x, y) { print(402); }
+function a403(x, y) { print(403); }
+function a404(x, y) { print(404); }
+function a405(x, y) { print(405); }
+function a406(x, y) { print(406); }
+function a407(x, y) { print(407); }
+function a408(x, y) { print(408); }
+function a409(x, y) { print(409); }
+function a410(x, y) { print(410); }
+function a411(x, y) { print(411); }
+function a412(x, y) { print(412); }
+function a413(x, y) { print(413); }
+function a414(x, y) { print(414); }
+function a415(x, y) { print(415); }
+function a416(x, y) { print(416); }
+function a417(x, y) { print(417); }
+function a418(x, y) { print(418); }
+function a419(x, y) { print(419); }
+function a420(x, y) { print(420); }
+function a421(x, y) { print(421); }
+function a422(x, y) { print(422); }
+function a423(x, y) { print(423); }
+function a424(x, y) { print(424); }
+function a425(x, y) { print(425); }
+function a426(x, y) { print(426); }
+function a427(x, y) { print(427); }
+function a428(x, y) { print(428); }
+function a429(x, y) { print(429); }
+function a430(x, y) { print(430); }
+function a431(x, y) { print(431); }
+function a432(x, y) { print(432); }
+function a433(x, y) { print(433); }
+function a434(x, y) { print(434); }
+function a435(x, y) { print(435); }
+function a436(x, y) { print(436); }
+function a437(x, y) { print(437); }
+function a438(x, y) { print(438); }
+function a439(x, y) { print(439); }
+function a440(x, y) { print(440); }
+function a441(x, y) { print(441); }
+function a442(x, y) { print(442); }
+function a443(x, y) { print(443); }
+function a444(x, y) { print(444); }
+function a445(x, y) { print(445); }
+function a446(x, y) { print(446); }
+function a447(x, y) { print(447); }
+function a448(x, y) { print(448); }
+function a449(x, y) { print(449); }
+function a450(x, y) { print(450); }
+function a451(x, y) { print(451); }
+function a452(x, y) { print(452); }
+function a453(x, y) { print(453); }
+function a454(x, y) { print(454); }
+function a455(x, y) { print(455); }
+function a456(x, y) { print(456); }
+function a457(x, y) { print(457); }
+function a458(x, y) { print(458); }
+function a459(x, y) { print(459); }
+function a460(x, y) { print(460); }
+function a461(x, y) { print(461); }
+function a462(x, y) { print(462); }
+function a463(x, y) { print(463); }
+function a464(x, y) { print(464); }
+function a465(x, y) { print(465); }
+function a466(x, y) { print(466); }
+function a467(x, y) { print(467); }
+function a468(x, y) { print(468); }
+function a469(x, y) { print(469); }
+function a470(x, y) { print(470); }
+function a471(x, y) { print(471); }
+function a472(x, y) { print(472); }
+function a473(x, y) { print(473); }
+function a474(x, y) { print(474); }
+function a475(x, y) { print(475); }
+function a476(x, y) { print(476); }
+function a477(x, y) { print(477); }
+function a478(x, y) { print(478); }
+function a479(x, y) { print(479); }
+function a480(x, y) { print(480); }
+function a481(x, y) { print(481); }
+function a482(x, y) { print(482); }
+function a483(x, y) { print(483); }
+function a484(x, y) { print(484); }
+function a485(x, y) { print(485); }
+function a486(x, y) { print(486); }
+function a487(x, y) { print(487); }
+function a488(x, y) { print(488); }
+function a489(x, y) { print(489); }
+function a490(x, y) { print(490); }
+function a491(x, y) { print(491); }
+function a492(x, y) { print(492); }
+function a493(x, y) { print(493); }
+function a494(x, y) { print(494); }
+function a495(x, y) { print(495); }
+function a496(x, y) { print(496); }
+function a497(x, y) { print(497); }
+function a498(x, y) { print(498); }
+function a499(x, y) { print(499); }
+function a500(x, y) { print(500); }
+function a501(x, y) { print(501); }
+function a502(x, y) { print(502); }
+function a503(x, y) { print(503); }
+function a504(x, y) { print(504); }
+function a505(x, y) { print(505); }
+function a506(x, y) { print(506); }
+function a507(x, y) { print(507); }
+function a508(x, y) { print(508); }
+function a509(x, y) { print(509); }
+function a510(x, y) { print(510); }
+function a511(x, y) { print(511); }
+function a512(x, y) { print(512); }
+function a513(x, y) { print(513); }
+function a514(x, y) { print(514); }
+function a515(x, y) { print(515); }
+function a516(x, y) { print(516); }
+function a517(x, y) { print(517); }
+function a518(x, y) { print(518); }
+function a519(x, y) { print(519); }
+function a520(x, y) { print(520); }
+function a521(x, y) { print(521); }
+function a522(x, y) { print(522); }
+function a523(x, y) { print(523); }
+function a524(x, y) { print(524); }
+function a525(x, y) { print(525); }
+function a526(x, y) { print(526); }
+function a527(x, y) { print(527); }
+function a528(x, y) { print(528); }
+function a529(x, y) { print(529); }
+function a530(x, y) { print(530); }
+function a531(x, y) { print(531); }
+function a532(x, y) { print(532); }
+function a533(x, y) { print(533); }
+function a534(x, y) { print(534); }
+function a535(x, y) { print(535); }
+function a536(x, y) { print(536); }
+function a537(x, y) { print(537); }
+function a538(x, y) { print(538); }
+function a539(x, y) { print(539); }
+function a540(x, y) { print(540); }
+function a541(x, y) { print(541); }
+function a542(x, y) { print(542); }
+function a543(x, y) { print(543); }
+function a544(x, y) { print(544); }
+function a545(x, y) { print(545); }
+function a546(x, y) { print(546); }
+function a547(x, y) { print(547); }
+function a548(x, y) { print(548); }
+function a549(x, y) { print(549); }
+function a550(x, y) { print(550); }
+function a551(x, y) { print(551); }
+function a552(x, y) { print(552); }
+function a553(x, y) { print(553); }
+function a554(x, y) { print(554); }
+function a555(x, y) { print(555); }
+function a556(x, y) { print(556); }
+function a557(x, y) { print(557); }
+function a558(x, y) { print(558); }
+function a559(x, y) { print(559); }
+function a560(x, y) { print(560); }
+function a561(x, y) { print(561); }
+function a562(x, y) { print(562); }
+function a563(x, y) { print(563); }
+function a564(x, y) { print(564); }
+function a565(x, y) { print(565); }
+function a566(x, y) { print(566); }
+function a567(x, y) { print(567); }
+function a568(x, y) { print(568); }
+function a569(x, y) { print(569); }
+function a570(x, y) { print(570); }
+function a571(x, y) { print(571); }
+function a572(x, y) { print(572); }
+function a573(x, y) { print(573); }
+function a574(x, y) { print(574); }
+function a575(x, y) { print(575); }
+function a576(x, y) { print(576); }
+function a577(x, y) { print(577); }
+function a578(x, y) { print(578); }
+function a579(x, y) { print(579); }
+function a580(x, y) { print(580); }
+function a581(x, y) { print(581); }
+function a582(x, y) { print(582); }
+function a583(x, y) { print(583); }
+function a584(x, y) { print(584); }
+function a585(x, y) { print(585); }
+function a586(x, y) { print(586); }
+function a587(x, y) { print(587); }
+function a588(x, y) { print(588); }
+function a589(x, y) { print(589); }
+function a590(x, y) { print(590); }
+function a591(x, y) { print(591); }
+function a592(x, y) { print(592); }
+function a593(x, y) { print(593); }
+function a594(x, y) { print(594); }
+function a595(x, y) { print(595); }
+function a596(x, y) { print(596); }
+function a597(x, y) { print(597); }
+function a598(x, y) { print(598); }
+function a599(x, y) { print(599); }
+function a600(x, y) { print(600); }
+function a601(x, y) { print(601); }
+function a602(x, y) { print(602); }
+function a603(x, y) { print(603); }
+function a604(x, y) { print(604); }
+function a605(x, y) { print(605); }
+function a606(x, y) { print(606); }
+function a607(x, y) { print(607); }
+function a608(x, y) { print(608); }
+function a609(x, y) { print(609); }
+function a610(x, y) { print(610); }
+function a611(x, y) { print(611); }
+function a612(x, y) { print(612); }
+function a613(x, y) { print(613); }
+function a614(x, y) { print(614); }
+function a615(x, y) { print(615); }
+function a616(x, y) { print(616); }
+function a617(x, y) { print(617); }
+function a618(x, y) { print(618); }
+function a619(x, y) { print(619); }
+function a620(x, y) { print(620); }
+function a621(x, y) { print(621); }
+function a622(x, y) { print(622); }
+function a623(x, y) { print(623); }
+function a624(x, y) { print(624); }
+function a625(x, y) { print(625); }
+function a626(x, y) { print(626); }
+function a627(x, y) { print(627); }
+function a628(x, y) { print(628); }
+function a629(x, y) { print(629); }
+function a630(x, y) { print(630); }
+function a631(x, y) { print(631); }
+function a632(x, y) { print(632); }
+function a633(x, y) { print(633); }
+function a634(x, y) { print(634); }
+function a635(x, y) { print(635); }
+function a636(x, y) { print(636); }
+function a637(x, y) { print(637); }
+function a638(x, y) { print(638); }
+function a639(x, y) { print(639); }
+function a640(x, y) { print(640); }
+function a641(x, y) { print(641); }
+function a642(x, y) { print(642); }
+function a643(x, y) { print(643); }
+function a644(x, y) { print(644); }
+function a645(x, y) { print(645); }
+function a646(x, y) { print(646); }
+function a647(x, y) { print(647); }
+function a648(x, y) { print(648); }
+function a649(x, y) { print(649); }
+function a650(x, y) { print(650); }
+function a651(x, y) { print(651); }
+function a652(x, y) { print(652); }
+function a653(x, y) { print(653); }
+function a654(x, y) { print(654); }
+function a655(x, y) { print(655); }
+function a656(x, y) { print(656); }
+function a657(x, y) { print(657); }
+function a658(x, y) { print(658); }
+function a659(x, y) { print(659); }
+function a660(x, y) { print(660); }
+function a661(x, y) { print(661); }
+function a662(x, y) { print(662); }
+function a663(x, y) { print(663); }
+function a664(x, y) { print(664); }
+function a665(x, y) { print(665); }
+function a666(x, y) { print(666); }
+function a667(x, y) { print(667); }
+function a668(x, y) { print(668); }
+function a669(x, y) { print(669); }
+function a670(x, y) { print(670); }
+function a671(x, y) { print(671); }
+function a672(x, y) { print(672); }
+function a673(x, y) { print(673); }
+function a674(x, y) { print(674); }
+function a675(x, y) { print(675); }
+function a676(x, y) { print(676); }
+function a677(x, y) { print(677); }
+function a678(x, y) { print(678); }
+function a679(x, y) { print(679); }
+function a680(x, y) { print(680); }
+function a681(x, y) { print(681); }
+function a682(x, y) { print(682); }
+function a683(x, y) { print(683); }
+function a684(x, y) { print(684); }
+function a685(x, y) { print(685); }
+function a686(x, y) { print(686); }
+function a687(x, y) { print(687); }
+function a688(x, y) { print(688); }
+function a689(x, y) { print(689); }
+function a690(x, y) { print(690); }
+function a691(x, y) { print(691); }
+function a692(x, y) { print(692); }
+function a693(x, y) { print(693); }
+function a694(x, y) { print(694); }
+function a695(x, y) { print(695); }
+function a696(x, y) { print(696); }
+function a697(x, y) { print(697); }
+function a698(x, y) { print(698); }
+function a699(x, y) { print(699); }
+function a700(x, y) { print(700); }
+function a701(x, y) { print(701); }
+function a702(x, y) { print(702); }
+function a703(x, y) { print(703); }
+function a704(x, y) { print(704); }
+function a705(x, y) { print(705); }
+function a706(x, y) { print(706); }
+function a707(x, y) { print(707); }
+function a708(x, y) { print(708); }
+function a709(x, y) { print(709); }
+function a710(x, y) { print(710); }
+function a711(x, y) { print(711); }
+function a712(x, y) { print(712); }
+function a713(x, y) { print(713); }
+function a714(x, y) { print(714); }
+function a715(x, y) { print(715); }
+function a716(x, y) { print(716); }
+function a717(x, y) { print(717); }
+function a718(x, y) { print(718); }
+function a719(x, y) { print(719); }
+function a720(x, y) { print(720); }
+function a721(x, y) { print(721); }
+function a722(x, y) { print(722); }
+function a723(x, y) { print(723); }
+function a724(x, y) { print(724); }
+function a725(x, y) { print(725); }
+function a726(x, y) { print(726); }
+function a727(x, y) { print(727); }
+function a728(x, y) { print(728); }
+function a729(x, y) { print(729); }
+function a730(x, y) { print(730); }
+function a731(x, y) { print(731); }
+function a732(x, y) { print(732); }
+function a733(x, y) { print(733); }
+function a734(x, y) { print(734); }
+function a735(x, y) { print(735); }
+function a736(x, y) { print(736); }
+function a737(x, y) { print(737); }
+function a738(x, y) { print(738); }
+function a739(x, y) { print(739); }
+function a740(x, y) { print(740); }
+function a741(x, y) { print(741); }
+function a742(x, y) { print(742); }
+function a743(x, y) { print(743); }
+function a744(x, y) { print(744); }
+function a745(x, y) { print(745); }
+function a746(x, y) { print(746); }
+function a747(x, y) { print(747); }
+function a748(x, y) { print(748); }
+function a749(x, y) { print(749); }
+function a750(x, y) { print(750); }
+function a751(x, y) { print(751); }
+function a752(x, y) { print(752); }
+function a753(x, y) { print(753); }
+function a754(x, y) { print(754); }
+function a755(x, y) { print(755); }
+function a756(x, y) { print(756); }
+function a757(x, y) { print(757); }
+function a758(x, y) { print(758); }
+function a759(x, y) { print(759); }
+function a760(x, y) { print(760); }
+function a761(x, y) { print(761); }
+function a762(x, y) { print(762); }
+function a763(x, y) { print(763); }
+function a764(x, y) { print(764); }
+function a765(x, y) { print(765); }
+function a766(x, y) { print(766); }
+function a767(x, y) { print(767); }
+function a768(x, y) { print(768); }
+function a769(x, y) { print(769); }
+function a770(x, y) { print(770); }
+function a771(x, y) { print(771); }
+function a772(x, y) { print(772); }
+function a773(x, y) { print(773); }
+function a774(x, y) { print(774); }
+function a775(x, y) { print(775); }
+function a776(x, y) { print(776); }
+function a777(x, y) { print(777); }
+function a778(x, y) { print(778); }
+function a779(x, y) { print(779); }
+function a780(x, y) { print(780); }
+function a781(x, y) { print(781); }
+function a782(x, y) { print(782); }
+function a783(x, y) { print(783); }
+function a784(x, y) { print(784); }
+function a785(x, y) { print(785); }
+function a786(x, y) { print(786); }
+function a787(x, y) { print(787); }
+function a788(x, y) { print(788); }
+function a789(x, y) { print(789); }
+function a790(x, y) { print(790); }
+function a791(x, y) { print(791); }
+function a792(x, y) { print(792); }
+function a793(x, y) { print(793); }
+function a794(x, y) { print(794); }
+function a795(x, y) { print(795); }
+function a796(x, y) { print(796); }
+function a797(x, y) { print(797); }
+function a798(x, y) { print(798); }
+function a799(x, y) { print(799); }
+function a800(x, y) { print(800); }
+function a801(x, y) { print(801); }
+function a802(x, y) { print(802); }
+function a803(x, y) { print(803); }
+function a804(x, y) { print(804); }
+function a805(x, y) { print(805); }
+function a806(x, y) { print(806); }
+function a807(x, y) { print(807); }
+function a808(x, y) { print(808); }
+function a809(x, y) { print(809); }
+function a810(x, y) { print(810); }
+function a811(x, y) { print(811); }
+function a812(x, y) { print(812); }
+function a813(x, y) { print(813); }
+function a814(x, y) { print(814); }
+function a815(x, y) { print(815); }
+function a816(x, y) { print(816); }
+function a817(x, y) { print(817); }
+function a818(x, y) { print(818); }
+function a819(x, y) { print(819); }
+function a820(x, y) { print(820); }
+function a821(x, y) { print(821); }
+function a822(x, y) { print(822); }
+function a823(x, y) { print(823); }
+function a824(x, y) { print(824); }
+function a825(x, y) { print(825); }
+function a826(x, y) { print(826); }
+function a827(x, y) { print(827); }
+function a828(x, y) { print(828); }
+function a829(x, y) { print(829); }
+function a830(x, y) { print(830); }
+function a831(x, y) { print(831); }
+function a832(x, y) { print(832); }
+function a833(x, y) { print(833); }
+function a834(x, y) { print(834); }
+function a835(x, y) { print(835); }
+function a836(x, y) { print(836); }
+function a837(x, y) { print(837); }
+function a838(x, y) { print(838); }
+function a839(x, y) { print(839); }
+function a840(x, y) { print(840); }
+function a841(x, y) { print(841); }
+function a842(x, y) { print(842); }
+function a843(x, y) { print(843); }
+function a844(x, y) { print(844); }
+function a845(x, y) { print(845); }
+function a846(x, y) { print(846); }
+function a847(x, y) { print(847); }
+function a848(x, y) { print(848); }
+function a849(x, y) { print(849); }
+function a850(x, y) { print(850); }
+function a851(x, y) { print(851); }
+function a852(x, y) { print(852); }
+function a853(x, y) { print(853); }
+function a854(x, y) { print(854); }
+function a855(x, y) { print(855); }
+function a856(x, y) { print(856); }
+function a857(x, y) { print(857); }
+function a858(x, y) { print(858); }
+function a859(x, y) { print(859); }
+function a860(x, y) { print(860); }
+function a861(x, y) { print(861); }
+function a862(x, y) { print(862); }
+function a863(x, y) { print(863); }
+function a864(x, y) { print(864); }
+function a865(x, y) { print(865); }
+function a866(x, y) { print(866); }
+function a867(x, y) { print(867); }
+function a868(x, y) { print(868); }
+function a869(x, y) { print(869); }
+function a870(x, y) { print(870); }
+function a871(x, y) { print(871); }
+function a872(x, y) { print(872); }
+function a873(x, y) { print(873); }
+function a874(x, y) { print(874); }
+function a875(x, y) { print(875); }
+function a876(x, y) { print(876); }
+function a877(x, y) { print(877); }
+function a878(x, y) { print(878); }
+function a879(x, y) { print(879); }
+function a880(x, y) { print(880); }
+function a881(x, y) { print(881); }
+function a882(x, y) { print(882); }
+function a883(x, y) { print(883); }
+function a884(x, y) { print(884); }
+function a885(x, y) { print(885); }
+function a886(x, y) { print(886); }
+function a887(x, y) { print(887); }
+function a888(x, y) { print(888); }
+function a889(x, y) { print(889); }
+function a890(x, y) { print(890); }
+function a891(x, y) { print(891); }
+function a892(x, y) { print(892); }
+function a893(x, y) { print(893); }
+function a894(x, y) { print(894); }
+function a895(x, y) { print(895); }
+function a896(x, y) { print(896); }
+function a897(x, y) { print(897); }
+function a898(x, y) { print(898); }
+function a899(x, y) { print(899); }
+function a900(x, y) { print(900); }
+function a901(x, y) { print(901); }
+function a902(x, y) { print(902); }
+function a903(x, y) { print(903); }
+function a904(x, y) { print(904); }
+function a905(x, y) { print(905); }
+function a906(x, y) { print(906); }
+function a907(x, y) { print(907); }
+function a908(x, y) { print(908); }
+function a909(x, y) { print(909); }
+function a910(x, y) { print(910); }
+function a911(x, y) { print(911); }
+function a912(x, y) { print(912); }
+function a913(x, y) { print(913); }
+function a914(x, y) { print(914); }
+function a915(x, y) { print(915); }
+function a916(x, y) { print(916); }
+function a917(x, y) { print(917); }
+function a918(x, y) { print(918); }
+function a919(x, y) { print(919); }
+function a920(x, y) { print(920); }
+function a921(x, y) { print(921); }
+function a922(x, y) { print(922); }
+function a923(x, y) { print(923); }
+function a924(x, y) { print(924); }
+function a925(x, y) { print(925); }
+function a926(x, y) { print(926); }
+function a927(x, y) { print(927); }
+function a928(x, y) { print(928); }
+function a929(x, y) { print(929); }
+function a930(x, y) { print(930); }
+function a931(x, y) { print(931); }
+function a932(x, y) { print(932); }
+function a933(x, y) { print(933); }
+function a934(x, y) { print(934); }
+function a935(x, y) { print(935); }
+function a936(x, y) { print(936); }
+function a937(x, y) { print(937); }
+function a938(x, y) { print(938); }
+function a939(x, y) { print(939); }
+function a940(x, y) { print(940); }
+function a941(x, y) { print(941); }
+function a942(x, y) { print(942); }
+function a943(x, y) { print(943); }
+function a944(x, y) { print(944); }
+function a945(x, y) { print(945); }
+function a946(x, y) { print(946); }
+function a947(x, y) { print(947); }
+function a948(x, y) { print(948); }
+function a949(x, y) { print(949); }
+function a950(x, y) { print(950); }
+function a951(x, y) { print(951); }
+function a952(x, y) { print(952); }
+function a953(x, y) { print(953); }
+function a954(x, y) { print(954); }
+function a955(x, y) { print(955); }
+function a956(x, y) { print(956); }
+function a957(x, y) { print(957); }
+function a958(x, y) { print(958); }
+function a959(x, y) { print(959); }
+function a960(x, y) { print(960); }
+function a961(x, y) { print(961); }
+function a962(x, y) { print(962); }
+function a963(x, y) { print(963); }
+function a964(x, y) { print(964); }
+function a965(x, y) { print(965); }
+function a966(x, y) { print(966); }
+function a967(x, y) { print(967); }
+function a968(x, y) { print(968); }
+function a969(x, y) { print(969); }
+function a970(x, y) { print(970); }
+function a971(x, y) { print(971); }
+function a972(x, y) { print(972); }
+function a973(x, y) { print(973); }
+function a974(x, y) { print(974); }
+function a975(x, y) { print(975); }
+function a976(x, y) { print(976); }
+function a977(x, y) { print(977); }
+function a978(x, y) { print(978); }
+function a979(x, y) { print(979); }
+function a980(x, y) { print(980); }
+function a981(x, y) { print(981); }
+function a982(x, y) { print(982); }
+function a983(x, y) { print(983); }
+function a984(x, y) { print(984); }
+function a985(x, y) { print(985); }
+function a986(x, y) { print(986); }
+function a987(x, y) { print(987); }
+function a988(x, y) { print(988); }
+function a989(x, y) { print(989); }
+function a990(x, y) { print(990); }
+function a991(x, y) { print(991); }
+function a992(x, y) { print(992); }
+function a993(x, y) { print(993); }
+function a994(x, y) { print(994); }
+function a995(x, y) { print(995); }
+function a996(x, y) { print(996); }
+function a997(x, y) { print(997); }
+function a998(x, y) { print(998); }
+function a999(x, y) { print(999); }
+function a1000(x, y) { print(1000); }
+function a1001(x, y) { print(1001); }
+function a1002(x, y) { print(1002); }
+function a1003(x, y) { print(1003); }
+function a1004(x, y) { print(1004); }
+function a1005(x, y) { print(1005); }
+function a1006(x, y) { print(1006); }
+function a1007(x, y) { print(1007); }
+function a1008(x, y) { print(1008); }
+function a1009(x, y) { print(1009); }
+function a1010(x, y) { print(1010); }
+function a1011(x, y) { print(1011); }
+function a1012(x, y) { print(1012); }
+function a1013(x, y) { print(1013); }
+function a1014(x, y) { print(1014); }
+function a1015(x, y) { print(1015); }
+function a1016(x, y) { print(1016); }
+function a1017(x, y) { print(1017); }
+function a1018(x, y) { print(1018); }
+function a1019(x, y) { print(1019); }
+function a1020(x, y) { print(1020); }
+function a1021(x, y) { print(1021); }
+function a1022(x, y) { print(1022); }
+function a1023(x, y) { print(1023); }
+function a1024(x, y) { print(1024); }
+function a1025(x, y) { print(1025); }
+function a1026(x, y) { print(1026); }
+function a1027(x, y) { print(1027); }
+function a1028(x, y) { print(1028); }
+function a1029(x, y) { print(1029); }
+function a1030(x, y) { print(1030); }
+function a1031(x, y) { print(1031); }
+function a1032(x, y) { print(1032); }
+function a1033(x, y) { print(1033); }
+function a1034(x, y) { print(1034); }
+function a1035(x, y) { print(1035); }
+function a1036(x, y) { print(1036); }
+function a1037(x, y) { print(1037); }
+function a1038(x, y) { print(1038); }
+function a1039(x, y) { print(1039); }
+function a1040(x, y) { print(1040); }
+function a1041(x, y) { print(1041); }
+function a1042(x, y) { print(1042); }
+function a1043(x, y) { print(1043); }
+function a1044(x, y) { print(1044); }
+function a1045(x, y) { print(1045); }
+function a1046(x, y) { print(1046); }
+function a1047(x, y) { print(1047); }
+function a1048(x, y) { print(1048); }
+function a1049(x, y) { print(1049); }
+function a1050(x, y) { print(1050); }
+function a1051(x, y) { print(1051); }
+function a1052(x, y) { print(1052); }
+function a1053(x, y) { print(1053); }
+function a1054(x, y) { print(1054); }
+function a1055(x, y) { print(1055); }
+function a1056(x, y) { print(1056); }
+function a1057(x, y) { print(1057); }
+function a1058(x, y) { print(1058); }
+function a1059(x, y) { print(1059); }
+function a1060(x, y) { print(1060); }
+function a1061(x, y) { print(1061); }
+function a1062(x, y) { print(1062); }
+function a1063(x, y) { print(1063); }
+function a1064(x, y) { print(1064); }
+function a1065(x, y) { print(1065); }
+function a1066(x, y) { print(1066); }
+function a1067(x, y) { print(1067); }
+function a1068(x, y) { print(1068); }
+function a1069(x, y) { print(1069); }
+function a1070(x, y) { print(1070); }
+function a1071(x, y) { print(1071); }
+function a1072(x, y) { print(1072); }
+function a1073(x, y) { print(1073); }
+function a1074(x, y) { print(1074); }
+function a1075(x, y) { print(1075); }
+function a1076(x, y) { print(1076); }
+function a1077(x, y) { print(1077); }
+function a1078(x, y) { print(1078); }
+function a1079(x, y) { print(1079); }
+function a1080(x, y) { print(1080); }
+function a1081(x, y) { print(1081); }
+function a1082(x, y) { print(1082); }
+function a1083(x, y) { print(1083); }
+function a1084(x, y) { print(1084); }
+function a1085(x, y) { print(1085); }
+function a1086(x, y) { print(1086); }
+function a1087(x, y) { print(1087); }
+function a1088(x, y) { print(1088); }
+function a1089(x, y) { print(1089); }
+function a1090(x, y) { print(1090); }
+function a1091(x, y) { print(1091); }
+function a1092(x, y) { print(1092); }
+function a1093(x, y) { print(1093); }
+function a1094(x, y) { print(1094); }
+function a1095(x, y) { print(1095); }
+function a1096(x, y) { print(1096); }
+function a1097(x, y) { print(1097); }
+function a1098(x, y) { print(1098); }
+function a1099(x, y) { print(1099); }
+function a1100(x, y) { print(1100); }
+function a1101(x, y) { print(1101); }
+function a1102(x, y) { print(1102); }
+function a1103(x, y) { print(1103); }
+function a1104(x, y) { print(1104); }
+function a1105(x, y) { print(1105); }
+function a1106(x, y) { print(1106); }
+function a1107(x, y) { print(1107); }
+function a1108(x, y) { print(1108); }
+function a1109(x, y) { print(1109); }
+function a1110(x, y) { print(1110); }
+function a1111(x, y) { print(1111); }
+function a1112(x, y) { print(1112); }
+function a1113(x, y) { print(1113); }
+function a1114(x, y) { print(1114); }
+function a1115(x, y) { print(1115); }
+function a1116(x, y) { print(1116); }
+function a1117(x, y) { print(1117); }
+function a1118(x, y) { print(1118); }
+function a1119(x, y) { print(1119); }
+function a1120(x, y) { print(1120); }
+function a1121(x, y) { print(1121); }
+function a1122(x, y) { print(1122); }
+function a1123(x, y) { print(1123); }
+function a1124(x, y) { print(1124); }
+function a1125(x, y) { print(1125); }
+function a1126(x, y) { print(1126); }
+function a1127(x, y) { print(1127); }
+function a1128(x, y) { print(1128); }
+function a1129(x, y) { print(1129); }
+function a1130(x, y) { print(1130); }
+function a1131(x, y) { print(1131); }
+function a1132(x, y) { print(1132); }
+function a1133(x, y) { print(1133); }
+function a1134(x, y) { print(1134); }
+function a1135(x, y) { print(1135); }
+function a1136(x, y) { print(1136); }
+function a1137(x, y) { print(1137); }
+function a1138(x, y) { print(1138); }
+function a1139(x, y) { print(1139); }
+function a1140(x, y) { print(1140); }
+function a1141(x, y) { print(1141); }
+function a1142(x, y) { print(1142); }
+function a1143(x, y) { print(1143); }
+function a1144(x, y) { print(1144); }
+function a1145(x, y) { print(1145); }
+function a1146(x, y) { print(1146); }
+function a1147(x, y) { print(1147); }
+function a1148(x, y) { print(1148); }
+function a1149(x, y) { print(1149); }
+function a1150(x, y) { print(1150); }
+function a1151(x, y) { print(1151); }
+function a1152(x, y) { print(1152); }
+function a1153(x, y) { print(1153); }
+function a1154(x, y) { print(1154); }
+function a1155(x, y) { print(1155); }
+function a1156(x, y) { print(1156); }
+function a1157(x, y) { print(1157); }
+function a1158(x, y) { print(1158); }
+function a1159(x, y) { print(1159); }
+function a1160(x, y) { print(1160); }
+function a1161(x, y) { print(1161); }
+function a1162(x, y) { print(1162); }
+function a1163(x, y) { print(1163); }
+function a1164(x, y) { print(1164); }
+function a1165(x, y) { print(1165); }
+function a1166(x, y) { print(1166); }
+function a1167(x, y) { print(1167); }
+function a1168(x, y) { print(1168); }
+function a1169(x, y) { print(1169); }
+function a1170(x, y) { print(1170); }
+function a1171(x, y) { print(1171); }
+function a1172(x, y) { print(1172); }
+function a1173(x, y) { print(1173); }
+function a1174(x, y) { print(1174); }
+function a1175(x, y) { print(1175); }
+function a1176(x, y) { print(1176); }
+function a1177(x, y) { print(1177); }
+function a1178(x, y) { print(1178); }
+function a1179(x, y) { print(1179); }
+function a1180(x, y) { print(1180); }
+function a1181(x, y) { print(1181); }
+function a1182(x, y) { print(1182); }
+function a1183(x, y) { print(1183); }
+function a1184(x, y) { print(1184); }
+function a1185(x, y) { print(1185); }
+function a1186(x, y) { print(1186); }
+function a1187(x, y) { print(1187); }
+function a1188(x, y) { print(1188); }
+function a1189(x, y) { print(1189); }
+function a1190(x, y) { print(1190); }
+function a1191(x, y) { print(1191); }
+function a1192(x, y) { print(1192); }
+function a1193(x, y) { print(1193); }
+function a1194(x, y) { print(1194); }
+function a1195(x, y) { print(1195); }
+function a1196(x, y) { print(1196); }
+function a1197(x, y) { print(1197); }
+function a1198(x, y) { print(1198); }
+function a1199(x, y) { print(1199); }
+function a1200(x, y) { print(1200); }
+function a1201(x, y) { print(1201); }
+function a1202(x, y) { print(1202); }
+function a1203(x, y) { print(1203); }
+function a1204(x, y) { print(1204); }
+function a1205(x, y) { print(1205); }
+function a1206(x, y) { print(1206); }
+function a1207(x, y) { print(1207); }
+function a1208(x, y) { print(1208); }
+function a1209(x, y) { print(1209); }
+function a1210(x, y) { print(1210); }
+function a1211(x, y) { print(1211); }
+function a1212(x, y) { print(1212); }
+function a1213(x, y) { print(1213); }
+function a1214(x, y) { print(1214); }
+function a1215(x, y) { print(1215); }
+function a1216(x, y) { print(1216); }
+function a1217(x, y) { print(1217); }
+function a1218(x, y) { print(1218); }
+function a1219(x, y) { print(1219); }
+function a1220(x, y) { print(1220); }
+function a1221(x, y) { print(1221); }
+function a1222(x, y) { print(1222); }
+function a1223(x, y) { print(1223); }
+function a1224(x, y) { print(1224); }
+function a1225(x, y) { print(1225); }
+function a1226(x, y) { print(1226); }
+function a1227(x, y) { print(1227); }
+function a1228(x, y) { print(1228); }
+function a1229(x, y) { print(1229); }
+function a1230(x, y) { print(1230); }
+function a1231(x, y) { print(1231); }
+function a1232(x, y) { print(1232); }
+function a1233(x, y) { print(1233); }
+function a1234(x, y) { print(1234); }
+function a1235(x, y) { print(1235); }
+function a1236(x, y) { print(1236); }
+function a1237(x, y) { print(1237); }
+function a1238(x, y) { print(1238); }
+function a1239(x, y) { print(1239); }
+function a1240(x, y) { print(1240); }
+function a1241(x, y) { print(1241); }
+function a1242(x, y) { print(1242); }
+function a1243(x, y) { print(1243); }
+function a1244(x, y) { print(1244); }
+function a1245(x, y) { print(1245); }
+function a1246(x, y) { print(1246); }
+function a1247(x, y) { print(1247); }
+function a1248(x, y) { print(1248); }
+function a1249(x, y) { print(1249); }
+function a1250(x, y) { print(1250); }
+function a1251(x, y) { print(1251); }
+function a1252(x, y) { print(1252); }
+function a1253(x, y) { print(1253); }
+function a1254(x, y) { print(1254); }
+function a1255(x, y) { print(1255); }
+function a1256(x, y) { print(1256); }
+function a1257(x, y) { print(1257); }
+function a1258(x, y) { print(1258); }
+function a1259(x, y) { print(1259); }
+function a1260(x, y) { print(1260); }
+function a1261(x, y) { print(1261); }
+function a1262(x, y) { print(1262); }
+function a1263(x, y) { print(1263); }
+function a1264(x, y) { print(1264); }
+function a1265(x, y) { print(1265); }
+function a1266(x, y) { print(1266); }
+function a1267(x, y) { print(1267); }
+function a1268(x, y) { print(1268); }
+function a1269(x, y) { print(1269); }
+function a1270(x, y) { print(1270); }
+function a1271(x, y) { print(1271); }
+function a1272(x, y) { print(1272); }
+function a1273(x, y) { print(1273); }
+function a1274(x, y) { print(1274); }
+function a1275(x, y) { print(1275); }
+function a1276(x, y) { print(1276); }
+function a1277(x, y) { print(1277); }
+function a1278(x, y) { print(1278); }
+function a1279(x, y) { print(1279); }
+function a1280(x, y) { print(1280); }
+function a1281(x, y) { print(1281); }
+function a1282(x, y) { print(1282); }
+function a1283(x, y) { print(1283); }
+function a1284(x, y) { print(1284); }
+function a1285(x, y) { print(1285); }
+function a1286(x, y) { print(1286); }
+function a1287(x, y) { print(1287); }
+function a1288(x, y) { print(1288); }
+function a1289(x, y) { print(1289); }
+function a1290(x, y) { print(1290); }
+function a1291(x, y) { print(1291); }
+function a1292(x, y) { print(1292); }
+function a1293(x, y) { print(1293); }
+function a1294(x, y) { print(1294); }
+function a1295(x, y) { print(1295); }
+function a1296(x, y) { print(1296); }
+function a1297(x, y) { print(1297); }
+function a1298(x, y) { print(1298); }
+function a1299(x, y) { print(1299); }
+function a1300(x, y) { print(1300); }
+function a1301(x, y) { print(1301); }
+function a1302(x, y) { print(1302); }
+function a1303(x, y) { print(1303); }
+function a1304(x, y) { print(1304); }
+function a1305(x, y) { print(1305); }
+function a1306(x, y) { print(1306); }
+function a1307(x, y) { print(1307); }
+function a1308(x, y) { print(1308); }
+function a1309(x, y) { print(1309); }
+function a1310(x, y) { print(1310); }
+function a1311(x, y) { print(1311); }
+function a1312(x, y) { print(1312); }
+function a1313(x, y) { print(1313); }
+function a1314(x, y) { print(1314); }
+function a1315(x, y) { print(1315); }
+function a1316(x, y) { print(1316); }
+function a1317(x, y) { print(1317); }
+function a1318(x, y) { print(1318); }
+function a1319(x, y) { print(1319); }
+function a1320(x, y) { print(1320); }
+function a1321(x, y) { print(1321); }
+function a1322(x, y) { print(1322); }
+function a1323(x, y) { print(1323); }
+function a1324(x, y) { print(1324); }
+function a1325(x, y) { print(1325); }
+function a1326(x, y) { print(1326); }
+function a1327(x, y) { print(1327); }
+function a1328(x, y) { print(1328); }
+function a1329(x, y) { print(1329); }
+function a1330(x, y) { print(1330); }
+function a1331(x, y) { print(1331); }
+function a1332(x, y) { print(1332); }
+function a1333(x, y) { print(1333); }
+function a1334(x, y) { print(1334); }
+function a1335(x, y) { print(1335); }
+function a1336(x, y) { print(1336); }
+function a1337(x, y) { print(1337); }
+function a1338(x, y) { print(1338); }
+function a1339(x, y) { print(1339); }
+function a1340(x, y) { print(1340); }
+function a1341(x, y) { print(1341); }
+function a1342(x, y) { print(1342); }
+function a1343(x, y) { print(1343); }
+function a1344(x, y) { print(1344); }
+function a1345(x, y) { print(1345); }
+function a1346(x, y) { print(1346); }
+function a1347(x, y) { print(1347); }
+function a1348(x, y) { print(1348); }
+function a1349(x, y) { print(1349); }
+function a1350(x, y) { print(1350); }
+function a1351(x, y) { print(1351); }
+function a1352(x, y) { print(1352); }
+function a1353(x, y) { print(1353); }
+function a1354(x, y) { print(1354); }
+function a1355(x, y) { print(1355); }
+function a1356(x, y) { print(1356); }
+function a1357(x, y) { print(1357); }
+function a1358(x, y) { print(1358); }
+function a1359(x, y) { print(1359); }
+function a1360(x, y) { print(1360); }
+function a1361(x, y) { print(1361); }
+function a1362(x, y) { print(1362); }
+function a1363(x, y) { print(1363); }
+function a1364(x, y) { print(1364); }
+function a1365(x, y) { print(1365); }
+function a1366(x, y) { print(1366); }
+function a1367(x, y) { print(1367); }
+function a1368(x, y) { print(1368); }
+function a1369(x, y) { print(1369); }
+function a1370(x, y) { print(1370); }
+function a1371(x, y) { print(1371); }
+function a1372(x, y) { print(1372); }
+function a1373(x, y) { print(1373); }
+function a1374(x, y) { print(1374); }
+function a1375(x, y) { print(1375); }
+function a1376(x, y) { print(1376); }
+function a1377(x, y) { print(1377); }
+function a1378(x, y) { print(1378); }
+function a1379(x, y) { print(1379); }
+function a1380(x, y) { print(1380); }
+function a1381(x, y) { print(1381); }
+function a1382(x, y) { print(1382); }
+function a1383(x, y) { print(1383); }
+function a1384(x, y) { print(1384); }
+function a1385(x, y) { print(1385); }
+function a1386(x, y) { print(1386); }
+function a1387(x, y) { print(1387); }
+function a1388(x, y) { print(1388); }
+function a1389(x, y) { print(1389); }
+function a1390(x, y) { print(1390); }
+function a1391(x, y) { print(1391); }
+function a1392(x, y) { print(1392); }
+function a1393(x, y) { print(1393); }
+function a1394(x, y) { print(1394); }
+function a1395(x, y) { print(1395); }
+function a1396(x, y) { print(1396); }
+function a1397(x, y) { print(1397); }
+function a1398(x, y) { print(1398); }
+function a1399(x, y) { print(1399); }
+function a1400(x, y) { print(1400); }
+function a1401(x, y) { print(1401); }
+function a1402(x, y) { print(1402); }
+function a1403(x, y) { print(1403); }
+function a1404(x, y) { print(1404); }
+function a1405(x, y) { print(1405); }
+function a1406(x, y) { print(1406); }
+function a1407(x, y) { print(1407); }
+function a1408(x, y) { print(1408); }
+function a1409(x, y) { print(1409); }
+function a1410(x, y) { print(1410); }
+function a1411(x, y) { print(1411); }
+function a1412(x, y) { print(1412); }
+function a1413(x, y) { print(1413); }
+function a1414(x, y) { print(1414); }
+function a1415(x, y) { print(1415); }
+function a1416(x, y) { print(1416); }
+function a1417(x, y) { print(1417); }
+function a1418(x, y) { print(1418); }
+function a1419(x, y) { print(1419); }
+function a1420(x, y) { print(1420); }
+function a1421(x, y) { print(1421); }
+function a1422(x, y) { print(1422); }
+function a1423(x, y) { print(1423); }
+function a1424(x, y) { print(1424); }
+function a1425(x, y) { print(1425); }
+function a1426(x, y) { print(1426); }
+function a1427(x, y) { print(1427); }
+function a1428(x, y) { print(1428); }
+function a1429(x, y) { print(1429); }
+function a1430(x, y) { print(1430); }
+function a1431(x, y) { print(1431); }
+function a1432(x, y) { print(1432); }
+function a1433(x, y) { print(1433); }
+function a1434(x, y) { print(1434); }
+function a1435(x, y) { print(1435); }
+function a1436(x, y) { print(1436); }
+function a1437(x, y) { print(1437); }
+function a1438(x, y) { print(1438); }
+function a1439(x, y) { print(1439); }
+function a1440(x, y) { print(1440); }
+function a1441(x, y) { print(1441); }
+function a1442(x, y) { print(1442); }
+function a1443(x, y) { print(1443); }
+function a1444(x, y) { print(1444); }
+function a1445(x, y) { print(1445); }
+function a1446(x, y) { print(1446); }
+function a1447(x, y) { print(1447); }
+function a1448(x, y) { print(1448); }
+function a1449(x, y) { print(1449); }
+function a1450(x, y) { print(1450); }
+function a1451(x, y) { print(1451); }
+function a1452(x, y) { print(1452); }
+function a1453(x, y) { print(1453); }
+function a1454(x, y) { print(1454); }
+function a1455(x, y) { print(1455); }
+function a1456(x, y) { print(1456); }
+function a1457(x, y) { print(1457); }
+function a1458(x, y) { print(1458); }
+function a1459(x, y) { print(1459); }
+function a1460(x, y) { print(1460); }
+function a1461(x, y) { print(1461); }
+function a1462(x, y) { print(1462); }
+function a1463(x, y) { print(1463); }
+function a1464(x, y) { print(1464); }
+function a1465(x, y) { print(1465); }
+function a1466(x, y) { print(1466); }
+function a1467(x, y) { print(1467); }
+function a1468(x, y) { print(1468); }
+function a1469(x, y) { print(1469); }
+function a1470(x, y) { print(1470); }
+function a1471(x, y) { print(1471); }
+function a1472(x, y) { print(1472); }
+function a1473(x, y) { print(1473); }
+function a1474(x, y) { print(1474); }
+function a1475(x, y) { print(1475); }
+function a1476(x, y) { print(1476); }
+function a1477(x, y) { print(1477); }
+function a1478(x, y) { print(1478); }
+function a1479(x, y) { print(1479); }
+function a1480(x, y) { print(1480); }
+function a1481(x, y) { print(1481); }
+function a1482(x, y) { print(1482); }
+function a1483(x, y) { print(1483); }
+function a1484(x, y) { print(1484); }
+function a1485(x, y) { print(1485); }
+function a1486(x, y) { print(1486); }
+function a1487(x, y) { print(1487); }
+function a1488(x, y) { print(1488); }
+function a1489(x, y) { print(1489); }
+function a1490(x, y) { print(1490); }
+function a1491(x, y) { print(1491); }
+function a1492(x, y) { print(1492); }
+function a1493(x, y) { print(1493); }
+function a1494(x, y) { print(1494); }
+function a1495(x, y) { print(1495); }
+function a1496(x, y) { print(1496); }
+function a1497(x, y) { print(1497); }
+function a1498(x, y) { print(1498); }
+function a1499(x, y) { print(1499); }
+function a1500(x, y) { print(1500); }
+function a1501(x, y) { print(1501); }
+function a1502(x, y) { print(1502); }
+function a1503(x, y) { print(1503); }
+function a1504(x, y) { print(1504); }
+function a1505(x, y) { print(1505); }
+function a1506(x, y) { print(1506); }
+function a1507(x, y) { print(1507); }
+function a1508(x, y) { print(1508); }
+function a1509(x, y) { print(1509); }
+function a1510(x, y) { print(1510); }
+function a1511(x, y) { print(1511); }
+function a1512(x, y) { print(1512); }
+function a1513(x, y) { print(1513); }
+function a1514(x, y) { print(1514); }
+function a1515(x, y) { print(1515); }
+function a1516(x, y) { print(1516); }
+function a1517(x, y) { print(1517); }
+function a1518(x, y) { print(1518); }
+function a1519(x, y) { print(1519); }
+function a1520(x, y) { print(1520); }
+function a1521(x, y) { print(1521); }
+function a1522(x, y) { print(1522); }
+function a1523(x, y) { print(1523); }
+function a1524(x, y) { print(1524); }
+function a1525(x, y) { print(1525); }
+function a1526(x, y) { print(1526); }
+function a1527(x, y) { print(1527); }
+function a1528(x, y) { print(1528); }
+function a1529(x, y) { print(1529); }
+function a1530(x, y) { print(1530); }
+function a1531(x, y) { print(1531); }
+function a1532(x, y) { print(1532); }
+function a1533(x, y) { print(1533); }
+function a1534(x, y) { print(1534); }
+function a1535(x, y) { print(1535); }
+function a1536(x, y) { print(1536); }
+function a1537(x, y) { print(1537); }
+function a1538(x, y) { print(1538); }
+function a1539(x, y) { print(1539); }
+function a1540(x, y) { print(1540); }
+function a1541(x, y) { print(1541); }
+function a1542(x, y) { print(1542); }
+function a1543(x, y) { print(1543); }
+function a1544(x, y) { print(1544); }
+function a1545(x, y) { print(1545); }
+function a1546(x, y) { print(1546); }
+function a1547(x, y) { print(1547); }
+function a1548(x, y) { print(1548); }
+function a1549(x, y) { print(1549); }
+function a1550(x, y) { print(1550); }
+function a1551(x, y) { print(1551); }
+function a1552(x, y) { print(1552); }
+function a1553(x, y) { print(1553); }
+function a1554(x, y) { print(1554); }
+function a1555(x, y) { print(1555); }
+function a1556(x, y) { print(1556); }
+function a1557(x, y) { print(1557); }
+function a1558(x, y) { print(1558); }
+function a1559(x, y) { print(1559); }
+function a1560(x, y) { print(1560); }
+function a1561(x, y) { print(1561); }
+function a1562(x, y) { print(1562); }
+function a1563(x, y) { print(1563); }
+function a1564(x, y) { print(1564); }
+function a1565(x, y) { print(1565); }
+function a1566(x, y) { print(1566); }
+function a1567(x, y) { print(1567); }
+function a1568(x, y) { print(1568); }
+function a1569(x, y) { print(1569); }
+function a1570(x, y) { print(1570); }
+function a1571(x, y) { print(1571); }
+function a1572(x, y) { print(1572); }
+function a1573(x, y) { print(1573); }
+function a1574(x, y) { print(1574); }
+function a1575(x, y) { print(1575); }
+function a1576(x, y) { print(1576); }
+function a1577(x, y) { print(1577); }
+function a1578(x, y) { print(1578); }
+function a1579(x, y) { print(1579); }
+function a1580(x, y) { print(1580); }
+function a1581(x, y) { print(1581); }
+function a1582(x, y) { print(1582); }
+function a1583(x, y) { print(1583); }
+function a1584(x, y) { print(1584); }
+function a1585(x, y) { print(1585); }
+function a1586(x, y) { print(1586); }
+function a1587(x, y) { print(1587); }
+function a1588(x, y) { print(1588); }
+function a1589(x, y) { print(1589); }
+function a1590(x, y) { print(1590); }
+function a1591(x, y) { print(1591); }
+function a1592(x, y) { print(1592); }
+function a1593(x, y) { print(1593); }
+function a1594(x, y) { print(1594); }
+function a1595(x, y) { print(1595); }
+function a1596(x, y) { print(1596); }
+function a1597(x, y) { print(1597); }
+function a1598(x, y) { print(1598); }
+function a1599(x, y) { print(1599); }
+function a1600(x, y) { print(1600); }
+function a1601(x, y) { print(1601); }
+function a1602(x, y) { print(1602); }
+function a1603(x, y) { print(1603); }
+function a1604(x, y) { print(1604); }
+function a1605(x, y) { print(1605); }
+function a1606(x, y) { print(1606); }
+function a1607(x, y) { print(1607); }
+function a1608(x, y) { print(1608); }
+function a1609(x, y) { print(1609); }
+function a1610(x, y) { print(1610); }
+function a1611(x, y) { print(1611); }
+function a1612(x, y) { print(1612); }
+function a1613(x, y) { print(1613); }
+function a1614(x, y) { print(1614); }
+function a1615(x, y) { print(1615); }
+function a1616(x, y) { print(1616); }
+function a1617(x, y) { print(1617); }
+function a1618(x, y) { print(1618); }
+function a1619(x, y) { print(1619); }
+function a1620(x, y) { print(1620); }
+function a1621(x, y) { print(1621); }
+function a1622(x, y) { print(1622); }
+function a1623(x, y) { print(1623); }
+function a1624(x, y) { print(1624); }
+function a1625(x, y) { print(1625); }
+function a1626(x, y) { print(1626); }
+function a1627(x, y) { print(1627); }
+function a1628(x, y) { print(1628); }
+function a1629(x, y) { print(1629); }
+function a1630(x, y) { print(1630); }
+function a1631(x, y) { print(1631); }
+function a1632(x, y) { print(1632); }
+function a1633(x, y) { print(1633); }
+function a1634(x, y) { print(1634); }
+function a1635(x, y) { print(1635); }
+function a1636(x, y) { print(1636); }
+function a1637(x, y) { print(1637); }
+function a1638(x, y) { print(1638); }
+function a1639(x, y) { print(1639); }
+function a1640(x, y) { print(1640); }
+function a1641(x, y) { print(1641); }
+function a1642(x, y) { print(1642); }
+function a1643(x, y) { print(1643); }
+function a1644(x, y) { print(1644); }
+function a1645(x, y) { print(1645); }
+function a1646(x, y) { print(1646); }
+function a1647(x, y) { print(1647); }
+function a1648(x, y) { print(1648); }
+function a1649(x, y) { print(1649); }
+function a1650(x, y) { print(1650); }
+function a1651(x, y) { print(1651); }
+function a1652(x, y) { print(1652); }
+function a1653(x, y) { print(1653); }
+function a1654(x, y) { print(1654); }
+function a1655(x, y) { print(1655); }
+function a1656(x, y) { print(1656); }
+function a1657(x, y) { print(1657); }
+function a1658(x, y) { print(1658); }
+function a1659(x, y) { print(1659); }
+function a1660(x, y) { print(1660); }
+function a1661(x, y) { print(1661); }
+function a1662(x, y) { print(1662); }
+function a1663(x, y) { print(1663); }
+function a1664(x, y) { print(1664); }
+function a1665(x, y) { print(1665); }
+function a1666(x, y) { print(1666); }
+function a1667(x, y) { print(1667); }
+function a1668(x, y) { print(1668); }
+function a1669(x, y) { print(1669); }
+function a1670(x, y) { print(1670); }
+function a1671(x, y) { print(1671); }
+function a1672(x, y) { print(1672); }
+function a1673(x, y) { print(1673); }
+function a1674(x, y) { print(1674); }
+function a1675(x, y) { print(1675); }
+function a1676(x, y) { print(1676); }
+function a1677(x, y) { print(1677); }
+function a1678(x, y) { print(1678); }
+function a1679(x, y) { print(1679); }
+function a1680(x, y) { print(1680); }
+function a1681(x, y) { print(1681); }
+function a1682(x, y) { print(1682); }
+function a1683(x, y) { print(1683); }
+function a1684(x, y) { print(1684); }
+function a1685(x, y) { print(1685); }
+function a1686(x, y) { print(1686); }
+function a1687(x, y) { print(1687); }
+function a1688(x, y) { print(1688); }
+function a1689(x, y) { print(1689); }
+function a1690(x, y) { print(1690); }
+function a1691(x, y) { print(1691); }
+function a1692(x, y) { print(1692); }
+function a1693(x, y) { print(1693); }
+function a1694(x, y) { print(1694); }
+function a1695(x, y) { print(1695); }
+function a1696(x, y) { print(1696); }
+function a1697(x, y) { print(1697); }
+function a1698(x, y) { print(1698); }
+function a1699(x, y) { print(1699); }
+function a1700(x, y) { print(1700); }
+function a1701(x, y) { print(1701); }
+function a1702(x, y) { print(1702); }
+function a1703(x, y) { print(1703); }
+function a1704(x, y) { print(1704); }
+function a1705(x, y) { print(1705); }
+function a1706(x, y) { print(1706); }
+function a1707(x, y) { print(1707); }
+function a1708(x, y) { print(1708); }
+function a1709(x, y) { print(1709); }
+function a1710(x, y) { print(1710); }
+function a1711(x, y) { print(1711); }
+function a1712(x, y) { print(1712); }
+function a1713(x, y) { print(1713); }
+function a1714(x, y) { print(1714); }
+function a1715(x, y) { print(1715); }
+function a1716(x, y) { print(1716); }
+function a1717(x, y) { print(1717); }
+function a1718(x, y) { print(1718); }
+function a1719(x, y) { print(1719); }
+function a1720(x, y) { print(1720); }
+function a1721(x, y) { print(1721); }
+function a1722(x, y) { print(1722); }
+function a1723(x, y) { print(1723); }
+function a1724(x, y) { print(1724); }
+function a1725(x, y) { print(1725); }
+function a1726(x, y) { print(1726); }
+function a1727(x, y) { print(1727); }
+function a1728(x, y) { print(1728); }
+function a1729(x, y) { print(1729); }
+function a1730(x, y) { print(1730); }
+function a1731(x, y) { print(1731); }
+function a1732(x, y) { print(1732); }
+function a1733(x, y) { print(1733); }
+function a1734(x, y) { print(1734); }
+function a1735(x, y) { print(1735); }
+function a1736(x, y) { print(1736); }
+function a1737(x, y) { print(1737); }
+function a1738(x, y) { print(1738); }
+function a1739(x, y) { print(1739); }
+function a1740(x, y) { print(1740); }
+function a1741(x, y) { print(1741); }
+function a1742(x, y) { print(1742); }
+function a1743(x, y) { print(1743); }
+function a1744(x, y) { print(1744); }
+function a1745(x, y) { print(1745); }
+function a1746(x, y) { print(1746); }
+function a1747(x, y) { print(1747); }
+function a1748(x, y) { print(1748); }
+function a1749(x, y) { print(1749); }
+function a1750(x, y) { print(1750); }
+function a1751(x, y) { print(1751); }
+function a1752(x, y) { print(1752); }
+function a1753(x, y) { print(1753); }
+function a1754(x, y) { print(1754); }
+function a1755(x, y) { print(1755); }
+function a1756(x, y) { print(1756); }
+function a1757(x, y) { print(1757); }
+function a1758(x, y) { print(1758); }
+function a1759(x, y) { print(1759); }
+function a1760(x, y) { print(1760); }
+function a1761(x, y) { print(1761); }
+function a1762(x, y) { print(1762); }
+function a1763(x, y) { print(1763); }
+function a1764(x, y) { print(1764); }
+function a1765(x, y) { print(1765); }
+function a1766(x, y) { print(1766); }
+function a1767(x, y) { print(1767); }
+function a1768(x, y) { print(1768); }
+function a1769(x, y) { print(1769); }
+function a1770(x, y) { print(1770); }
+function a1771(x, y) { print(1771); }
+function a1772(x, y) { print(1772); }
+function a1773(x, y) { print(1773); }
+function a1774(x, y) { print(1774); }
+function a1775(x, y) { print(1775); }
+function a1776(x, y) { print(1776); }
+function a1777(x, y) { print(1777); }
+function a1778(x, y) { print(1778); }
+function a1779(x, y) { print(1779); }
+function a1780(x, y) { print(1780); }
+function a1781(x, y) { print(1781); }
+function a1782(x, y) { print(1782); }
+function a1783(x, y) { print(1783); }
+function a1784(x, y) { print(1784); }
+function a1785(x, y) { print(1785); }
+function a1786(x, y) { print(1786); }
+function a1787(x, y) { print(1787); }
+function a1788(x, y) { print(1788); }
+function a1789(x, y) { print(1789); }
+function a1790(x, y) { print(1790); }
+function a1791(x, y) { print(1791); }
+function a1792(x, y) { print(1792); }
+function a1793(x, y) { print(1793); }
+function a1794(x, y) { print(1794); }
+function a1795(x, y) { print(1795); }
+function a1796(x, y) { print(1796); }
+function a1797(x, y) { print(1797); }
+function a1798(x, y) { print(1798); }
+function a1799(x, y) { print(1799); }
+function a1800(x, y) { print(1800); }
+function a1801(x, y) { print(1801); }
+function a1802(x, y) { print(1802); }
+function a1803(x, y) { print(1803); }
+function a1804(x, y) { print(1804); }
+function a1805(x, y) { print(1805); }
+function a1806(x, y) { print(1806); }
+function a1807(x, y) { print(1807); }
+function a1808(x, y) { print(1808); }
+function a1809(x, y) { print(1809); }
+function a1810(x, y) { print(1810); }
+function a1811(x, y) { print(1811); }
+function a1812(x, y) { print(1812); }
+function a1813(x, y) { print(1813); }
+function a1814(x, y) { print(1814); }
+function a1815(x, y) { print(1815); }
+function a1816(x, y) { print(1816); }
+function a1817(x, y) { print(1817); }
+function a1818(x, y) { print(1818); }
+function a1819(x, y) { print(1819); }
+function a1820(x, y) { print(1820); }
+function a1821(x, y) { print(1821); }
+function a1822(x, y) { print(1822); }
+function a1823(x, y) { print(1823); }
+function a1824(x, y) { print(1824); }
+function a1825(x, y) { print(1825); }
+function a1826(x, y) { print(1826); }
+function a1827(x, y) { print(1827); }
+function a1828(x, y) { print(1828); }
+function a1829(x, y) { print(1829); }
+function a1830(x, y) { print(1830); }
+function a1831(x, y) { print(1831); }
+function a1832(x, y) { print(1832); }
+function a1833(x, y) { print(1833); }
+function a1834(x, y) { print(1834); }
+function a1835(x, y) { print(1835); }
+function a1836(x, y) { print(1836); }
+function a1837(x, y) { print(1837); }
+function a1838(x, y) { print(1838); }
+function a1839(x, y) { print(1839); }
+function a1840(x, y) { print(1840); }
+function a1841(x, y) { print(1841); }
+function a1842(x, y) { print(1842); }
+function a1843(x, y) { print(1843); }
+function a1844(x, y) { print(1844); }
+function a1845(x, y) { print(1845); }
+function a1846(x, y) { print(1846); }
+function a1847(x, y) { print(1847); }
+function a1848(x, y) { print(1848); }
+function a1849(x, y) { print(1849); }
+function a1850(x, y) { print(1850); }
+function a1851(x, y) { print(1851); }
+function a1852(x, y) { print(1852); }
+function a1853(x, y) { print(1853); }
+function a1854(x, y) { print(1854); }
+function a1855(x, y) { print(1855); }
+function a1856(x, y) { print(1856); }
+function a1857(x, y) { print(1857); }
+function a1858(x, y) { print(1858); }
+function a1859(x, y) { print(1859); }
+function a1860(x, y) { print(1860); }
+function a1861(x, y) { print(1861); }
+function a1862(x, y) { print(1862); }
+function a1863(x, y) { print(1863); }
+function a1864(x, y) { print(1864); }
+function a1865(x, y) { print(1865); }
+function a1866(x, y) { print(1866); }
+function a1867(x, y) { print(1867); }
+function a1868(x, y) { print(1868); }
+function a1869(x, y) { print(1869); }
+function a1870(x, y) { print(1870); }
+function a1871(x, y) { print(1871); }
+function a1872(x, y) { print(1872); }
+function a1873(x, y) { print(1873); }
+function a1874(x, y) { print(1874); }
+function a1875(x, y) { print(1875); }
+function a1876(x, y) { print(1876); }
+function a1877(x, y) { print(1877); }
+function a1878(x, y) { print(1878); }
+function a1879(x, y) { print(1879); }
+function a1880(x, y) { print(1880); }
+function a1881(x, y) { print(1881); }
+function a1882(x, y) { print(1882); }
+function a1883(x, y) { print(1883); }
+function a1884(x, y) { print(1884); }
+function a1885(x, y) { print(1885); }
+function a1886(x, y) { print(1886); }
+function a1887(x, y) { print(1887); }
+function a1888(x, y) { print(1888); }
+function a1889(x, y) { print(1889); }
+function a1890(x, y) { print(1890); }
+function a1891(x, y) { print(1891); }
+function a1892(x, y) { print(1892); }
+function a1893(x, y) { print(1893); }
+function a1894(x, y) { print(1894); }
+function a1895(x, y) { print(1895); }
+function a1896(x, y) { print(1896); }
+function a1897(x, y) { print(1897); }
+function a1898(x, y) { print(1898); }
+function a1899(x, y) { print(1899); }
+function a1900(x, y) { print(1900); }
+function a1901(x, y) { print(1901); }
+function a1902(x, y) { print(1902); }
+function a1903(x, y) { print(1903); }
+function a1904(x, y) { print(1904); }
+function a1905(x, y) { print(1905); }
+function a1906(x, y) { print(1906); }
+function a1907(x, y) { print(1907); }
+function a1908(x, y) { print(1908); }
+function a1909(x, y) { print(1909); }
+function a1910(x, y) { print(1910); }
+function a1911(x, y) { print(1911); }
+function a1912(x, y) { print(1912); }
+function a1913(x, y) { print(1913); }
+function a1914(x, y) { print(1914); }
+function a1915(x, y) { print(1915); }
+function a1916(x, y) { print(1916); }
+function a1917(x, y) { print(1917); }
+function a1918(x, y) { print(1918); }
+function a1919(x, y) { print(1919); }
+function a1920(x, y) { print(1920); }
+function a1921(x, y) { print(1921); }
+function a1922(x, y) { print(1922); }
+function a1923(x, y) { print(1923); }
+function a1924(x, y) { print(1924); }
+function a1925(x, y) { print(1925); }
+function a1926(x, y) { print(1926); }
+function a1927(x, y) { print(1927); }
+function a1928(x, y) { print(1928); }
+function a1929(x, y) { print(1929); }
+function a1930(x, y) { print(1930); }
+function a1931(x, y) { print(1931); }
+function a1932(x, y) { print(1932); }
+function a1933(x, y) { print(1933); }
+function a1934(x, y) { print(1934); }
+function a1935(x, y) { print(1935); }
+function a1936(x, y) { print(1936); }
+function a1937(x, y) { print(1937); }
+function a1938(x, y) { print(1938); }
+function a1939(x, y) { print(1939); }
+function a1940(x, y) { print(1940); }
+function a1941(x, y) { print(1941); }
+function a1942(x, y) { print(1942); }
+function a1943(x, y) { print(1943); }
+function a1944(x, y) { print(1944); }
+function a1945(x, y) { print(1945); }
+function a1946(x, y) { print(1946); }
+function a1947(x, y) { print(1947); }
+function a1948(x, y) { print(1948); }
+function a1949(x, y) { print(1949); }
+function a1950(x, y) { print(1950); }
+function a1951(x, y) { print(1951); }
+function a1952(x, y) { print(1952); }
+function a1953(x, y) { print(1953); }
+function a1954(x, y) { print(1954); }
+function a1955(x, y) { print(1955); }
+function a1956(x, y) { print(1956); }
+function a1957(x, y) { print(1957); }
+function a1958(x, y) { print(1958); }
+function a1959(x, y) { print(1959); }
+function a1960(x, y) { print(1960); }
+function a1961(x, y) { print(1961); }
+function a1962(x, y) { print(1962); }
+function a1963(x, y) { print(1963); }
+function a1964(x, y) { print(1964); }
+function a1965(x, y) { print(1965); }
+function a1966(x, y) { print(1966); }
+function a1967(x, y) { print(1967); }
+function a1968(x, y) { print(1968); }
+function a1969(x, y) { print(1969); }
+function a1970(x, y) { print(1970); }
+function a1971(x, y) { print(1971); }
+function a1972(x, y) { print(1972); }
+function a1973(x, y) { print(1973); }
+function a1974(x, y) { print(1974); }
+function a1975(x, y) { print(1975); }
+function a1976(x, y) { print(1976); }
+function a1977(x, y) { print(1977); }
+function a1978(x, y) { print(1978); }
+function a1979(x, y) { print(1979); }
+function a1980(x, y) { print(1980); }
+function a1981(x, y) { print(1981); }
+function a1982(x, y) { print(1982); }
+function a1983(x, y) { print(1983); }
+function a1984(x, y) { print(1984); }
+function a1985(x, y) { print(1985); }
+function a1986(x, y) { print(1986); }
+function a1987(x, y) { print(1987); }
+function a1988(x, y) { print(1988); }
+function a1989(x, y) { print(1989); }
+function a1990(x, y) { print(1990); }
+function a1991(x, y) { print(1991); }
+function a1992(x, y) { print(1992); }
+function a1993(x, y) { print(1993); }
+function a1994(x, y) { print(1994); }
+function a1995(x, y) { print(1995); }
+function a1996(x, y) { print(1996); }
+function a1997(x, y) { print(1997); }
+function a1998(x, y) { print(1998); }
+function a1999(x, y) { print(1999); }
diff --git a/nashorn/test/script/basic/NASHORN-424.js b/nashorn/test/script/basic/NASHORN-424.js
new file mode 100644
index 00000000000..ea3bb52894c
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-424.js
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * NASHORN-424: Sparse array cause OutOfMemory exception.
+ *
+ * @test
+ * @run
+ */
+
+if (typeof print === 'undefined') {
+    print = console.log;
+}
+
+var l = -1
+  , LEVEL = { silly   : l++
+            , verbose : l++
+            , info    : l++
+            , "http"  : l++
+            , WARN    : l++
+            , "ERR!"  : l++
+            , ERROR   : "ERR!"
+            , ERR     : "ERR!"
+            , win     : 0x15AAC5
+            , paused  : 0x19790701
+            , silent  : 0xDECAFBAD
+            }
+
+Object.keys(LEVEL).forEach(function (l) {
+  if (typeof LEVEL[l] === "string") LEVEL[l] = LEVEL[LEVEL[l]]
+  else LEVEL[LEVEL[l]] = l
+  LEVEL[l.toLowerCase()] = LEVEL[l]
+  if (l === "silent" || l === "paused") return
+  log[l] = log[l.toLowerCase()] =
+    function (msg, pref, cb) { return log(msg, pref, l, cb) }
+})
+
+function log(msg, pref, level, cb) {
+    print("[" +level + "] " + msg);
+}
+
+Object.keys(LEVEL).forEach(function(l) {
+    log("has value " + LEVEL[l], null, l, null);
+});
+
+
+
+var ar = [ "Hello", "World", 0xDECAFBAD ]
+
+Object.keys(ar).forEach(function(e) {
+    print("ar[" + e + "] = " + ar[e]);
+});
+
+ar[34254236] = 17;
+ar[-1] = "boom";
+ar[0xDECAFBAD] = "ka-boom";
+
+ar[ar[2]] = "bye";
+
+Object.keys(ar).forEach(function(e) {
+    print("ar[" + e + "] = " + ar[e]);
+});
+
diff --git a/nashorn/test/script/basic/NASHORN-424.js.EXPECTED b/nashorn/test/script/basic/NASHORN-424.js.EXPECTED
new file mode 100644
index 00000000000..deb69af46ec
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-424.js.EXPECTED
@@ -0,0 +1,33 @@
+[0] has value verbose
+[1] has value info
+[2] has value http
+[3] has value WARN
+[4] has value ERR!
+[1419973] has value win
+[427362049] has value paused
+[3737844653] has value silent
+[silly] has value -1
+[verbose] has value 0
+[info] has value 1
+[http] has value 2
+[WARN] has value 3
+[ERR!] has value 4
+[ERROR] has value 4
+[ERR] has value 4
+[win] has value 1419973
+[paused] has value 427362049
+[silent] has value 3737844653
+[-1] has value silly
+[warn] has value 3
+[err!] has value 4
+[error] has value 4
+[err] has value 4
+ar[0] = Hello
+ar[1] = World
+ar[2] = 3737844653
+ar[0] = Hello
+ar[1] = World
+ar[2] = 3737844653
+ar[34254236] = 17
+ar[3737844653] = bye
+ar[-1] = boom
diff --git a/nashorn/test/script/basic/NASHORN-425.js b/nashorn/test/script/basic/NASHORN-425.js
new file mode 100644
index 00000000000..513faab1c99
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-425.js
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * NASHORN-425 : can't asynchronously call an immediately-executed function.
+ *
+ * @test
+ * @run
+ */
+
+function callback(cb) {
+  cb()
+}
+
+(function E (ii, ll) {
+  print(ii + "," + ll);
+  if (ii === ll) {
+    return;
+  }
+  callback(function() {
+    return E(ii + 1, ll)
+  });
+})(0, 2)
+
diff --git a/nashorn/test/script/basic/NASHORN-425.js.EXPECTED b/nashorn/test/script/basic/NASHORN-425.js.EXPECTED
new file mode 100644
index 00000000000..e0bd006e5cd
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-425.js.EXPECTED
@@ -0,0 +1,3 @@
+0,2
+1,2
+2,2
diff --git a/nashorn/test/script/basic/NASHORN-426.js b/nashorn/test/script/basic/NASHORN-426.js
new file mode 100644
index 00000000000..bed81e2a3d5
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-426.js
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-426 : User accessor property modification does not work as expected
+ *
+ * @test
+ * @run
+ */
+
+var obj = {};
+
+function getter() {
+   return 12;
+}
+
+var setterCalled = false;
+function setter(value) {
+    setterCalled = true;
+}
+
+Object.defineProperty(obj, "foo", {
+    get: getter,
+    configurable: true
+});
+
+Object.defineProperty(obj, "foo", {
+    set: setter
+});
+
+obj.foo = 44;
+if (! setterCalled) {
+    fail("setter not called");
+}
diff --git a/nashorn/test/script/basic/NASHORN-427.js b/nashorn/test/script/basic/NASHORN-427.js
new file mode 100644
index 00000000000..cf2d7de2308
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-427.js
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-427 : Object.seal and Object.freeze do not work for array objects as expected
+ *
+ * @test
+ * @run
+ */
+
+function checkSeal(arr) {
+    'use strict';
+
+    try {
+        delete arr[0];
+        fail("#1 can delete sealed array element");
+    } catch (e) {
+        if (! (e instanceof TypeError)) {
+            fail("#2 TypeError expected, got " + e);
+        }
+    }
+
+    try {
+        arr[arr.length] = 334;
+        fail("#3 can extend sealed array");
+    } catch (e) {
+        if (! (e instanceof TypeError)) {
+            fail("#4 TypeError expected, got " + e);
+        }
+    }
+}
+
+function checkFreeze(arr) {
+    'use strict';
+    checkSeal(arr);
+
+    try {
+        arr[arr.length - 1] = 34;
+        fail("#5 can assign to frozen array element");
+    } catch (e) {
+        if (! (e instanceof TypeError)) {
+            fail("#6 TypeError expected, got " + e);
+        }
+    }
+}
+
+
+var arr = [ 24 ];
+Object.seal(arr);
+checkSeal(arr);
+
+var arr2 = [ 42 ];
+Object.freeze(arr2);
+checkFreeze(arr2);
+
diff --git a/nashorn/test/script/basic/NASHORN-428.js b/nashorn/test/script/basic/NASHORN-428.js
new file mode 100644
index 00000000000..6e66f099860
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-428.js
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-428 : Redefining a non-configurable property with the "same value" is permitted, but -0.0 and +0.0 are not "same value"
+ *
+ * @test
+ * @run
+ */
+
+var obj = {};
+
+Object.defineProperty(obj, "0", {
+    value: -0,
+    configurable: false
+});
+
+try {
+    Object.defineProperties(obj, {
+        "0": { value: +0 }
+    });
+    fail("#1 expected TypeError");
+} catch (e) {
+    if (! (e instanceof TypeError)) {
+        fail("#2 expected TypeError, got " + e);
+    }
+}
+
+// -0 should be fine.. should not throw any TypeError
+Object.defineProperties(obj, {
+    "0": { value: -0 }
+});
+
diff --git a/nashorn/test/script/basic/NASHORN-429.js b/nashorn/test/script/basic/NASHORN-429.js
new file mode 100644
index 00000000000..209ba7f5b92
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-429.js
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-429 : boolean array element is wrongly converted to number
+ *
+ * @test
+ * @run
+ */
+
+var x = [true];
+
+if (typeof x[0] != 'boolean') {
+    fail("typeof [x] is not boolean it is " + (typeof(x[0])));
+}
+
+if (x[0] !== true) {
+    fail("x[0] !== true, it is " + x[0]);
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-432.js b/nashorn/test/script/basic/NASHORN-432.js
new file mode 100644
index 00000000000..d67417e159e
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-432.js
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-432 : Array iteration for methods like Array.prototype.forEach should not include elements created by callback
+ *
+ * @test
+ * @run
+ */
+
+var arr = [ 5, 55 ];
+
+arr.forEach(function(kVal, k, O) {
+    if (k == 0) { arr[arr.length] = 10; }
+    if (k === 2) {
+        fail("k === 2 with kVal " + kVal);
+    }
+});
+
diff --git a/nashorn/test/script/basic/NASHORN-433.js b/nashorn/test/script/basic/NASHORN-433.js
new file mode 100644
index 00000000000..b22c2f17d38
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-433.js
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-433 : Array iteration for methods like Array.prototype.forEach should compute length before checking whether the callback is a function
+ *
+ * @test
+ * @run
+ */
+
+var obj = { "0": 33, "1": 2 };
+Object.defineProperty(obj, "length", {
+    get: function() { throw new ReferenceError(); }
+});
+
+try {
+    Array.prototype.forEach.call(obj, undefined);
+    fail("should have thrown error");
+} catch (e) {
+    // length should be obtained before checking if callback
+    // is really a function or not. So, we should get error
+    // from length getter rather than TypeError for callback.
+    if (! (e instanceof ReferenceError)) {
+        fail("ReferenceError expected, got " + e);
+    }
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-434.js b/nashorn/test/script/basic/NASHORN-434.js
new file mode 100644
index 00000000000..faf628fdec1
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-434.js
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-434 : Callbacks to array iterator functions like forEach do not receive proper 'this' object
+ *
+ * @test
+ * @run
+ */
+
+var global = this;
+
+function func(val, idx, obj) {
+    if (this !== global) {
+        fail("#1 callback got 'this' different from global");
+    }
+} 
+
+function strictFunc(val, idx, obj) {
+    'use strict';
+
+    if (this === global) {
+        fail("#2 callback got global as 'this'");
+    }
+
+    if (this !== undefined) {
+        fail("#3 callback 'this' is not undefined");
+    }
+}
+
+var arr = [1];
+arr.forEach(func); 
+arr.forEach(strictFunc);
+
+var callbackThis = {};
+arr.forEach(function() {
+    if (this !== callbackThis) {
+        fail("#4 this !== callbackThis");
+    }
+}, callbackThis);
+
diff --git a/nashorn/test/script/basic/NASHORN-435.js b/nashorn/test/script/basic/NASHORN-435.js
new file mode 100644
index 00000000000..c08452d8a6d
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-435.js
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-435 : Array iterator callback is not called for elements with undefined as value
+ *
+ * @test
+ * @run
+ */
+
+var arr = [ undefined ];
+var reachedCallback = false;
+arr.forEach(function(kVal, k, obj) {
+    reachedCallback = true;
+});
+
+if (! reachedCallback) {
+    fail("callback not called for element of 'undefined' value");
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-437.js b/nashorn/test/script/basic/NASHORN-437.js
new file mode 100644
index 00000000000..2da9cd54f46
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-437.js
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-437 : Array.prototype.map should return an array whose length should be same as input array length
+ *
+ * @test
+ * @run
+ */
+
+var callbackCount = 0;
+
+function func(kVal, k, arr) {
+    arr.length = 2;
+    callbackCount++;
+    return 42;
+}
+
+var arr = [ 1, 2, 3, 4];
+var res = arr.map(func);
+if (res.length !== 4) {
+   fail("map's result does not have 4 elements");
+}
+
+if (callbackCount !== 2) {
+    fail("callback should be called only twice");
+}
+
+if (res[2] !== undefined || res[3] !== undefined) {
+    fail("last two elements are not undefined");
+}
diff --git a/nashorn/test/script/basic/NASHORN-44.js b/nashorn/test/script/basic/NASHORN-44.js
new file mode 100644
index 00000000000..4d49ac3f561
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-44.js
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-44: Various loop termination criteria didn't include the for modifier
+ *
+ * @test
+ * @run
+ */
+function loop1() {
+    print("loop1");
+    for (var i = 0; i < 5; i++) { 
+	print(i); 
+	continue;
+    }
+    print(i);
+    print("done1");
+}
+
+function loop2() {
+    print("loop2");
+    for (var i = 0; i < 5; i++) {
+	print(i);
+	break;
+    }
+    print(i);
+    print("done2");
+}
+
+loop1();
+loop2();
+
diff --git a/nashorn/test/script/basic/NASHORN-44.js.EXPECTED b/nashorn/test/script/basic/NASHORN-44.js.EXPECTED
new file mode 100644
index 00000000000..00b915f7511
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-44.js.EXPECTED
@@ -0,0 +1,12 @@
+loop1
+0
+1
+2
+3
+4
+5
+done1
+loop2
+0
+0
+done2
diff --git a/nashorn/test/script/basic/NASHORN-441.js b/nashorn/test/script/basic/NASHORN-441.js
new file mode 100644
index 00000000000..a24f71d7142
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-441.js
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-441 : Line numbers are incorrect in exceptions thrown from within a try block
+ *
+ * @test
+ * @run
+ */
+
+try {
+    print("try 1");
+    throw new Error("try 1");
+} catch (e) {
+    print(e, "thrown in line", e.lineNumber);
+} finally {
+    print("finally 1");
+}
+
+try {
+    try {
+        print("try 2");
+        throw new Error("try 2");
+    } finally {
+        print("finally 2");
+    }
+} catch (e) {
+    print(e, "thrown in line", e.lineNumber);
+}
+
+try {
+    print("try 3");
+} finally {
+    print("finally 3");
+}
+
+try {
+    print("try 4");
+    throw new Error("try 4");
+} catch (e if e instanceof String) {
+    print("wrong");
+}catch (e) {
+    print(e, "thrown in line", e.lineNumber);
+} finally {
+    print("finally 4");
+}
+
+try {
+    try {
+        print("try 5");
+        throw new Error("try 5");
+    } catch (e) {
+        print("rethrow 5");
+        throw e;
+    } finally {
+        print("finally 5");
+    }
+} catch (e if e instanceof Error) {
+    print(e, "thrown in line", e.lineNumber);
+}
+
+while (true) {
+    try {
+        print("try 6");
+        break;
+    } finally {
+        print("finally 6");
+    }
+}
diff --git a/nashorn/test/script/basic/NASHORN-441.js.EXPECTED b/nashorn/test/script/basic/NASHORN-441.js.EXPECTED
new file mode 100644
index 00000000000..de9ea224be4
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-441.js.EXPECTED
@@ -0,0 +1,17 @@
+try 1
+Error: try 1 thrown in line 33
+finally 1
+try 2
+finally 2
+Error: try 2 thrown in line 43
+try 3
+finally 3
+try 4
+Error: try 4 thrown in line 59
+finally 4
+try 5
+rethrow 5
+finally 5
+Error: try 5 thrown in line 71
+try 6
+finally 6
diff --git a/nashorn/test/script/basic/NASHORN-442.js b/nashorn/test/script/basic/NASHORN-442.js
new file mode 100644
index 00000000000..7bcf54e8c57
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-442.js
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-442 : for loop for object properties repeats property names.
+ *
+ * @test
+ * @run
+ */
+
+var proto = { foo : 33 };
+var obj = Object.create(proto);
+obj.foo = 'hello';
+
+var fooSeen = false;
+var count = 0;
+for (i in obj) {
+    count++;
+    if (i === "foo") {
+        if (fooSeen) {
+            fail("foo repeated in for loop");
+        }
+        fooSeen = true;
+    }
+}
+
+if (count !== 1) {
+    fail("only one property expected in for loop");
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-443.js b/nashorn/test/script/basic/NASHORN-443.js
new file mode 100644
index 00000000000..9587ebe01cb
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-443.js
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-443 : Array.prototype.lastIndexOf does not handle the cases where 'fromIndex' is undefined
+ *
+ * @test
+ * @run
+ */
+
+var arr = [ 'hello', 'world', 'hello', undefined ];
+
+if (arr.lastIndexOf('hello') !== 2) {
+    fail("#1 lastIndexOf fails when fromIndex is not passed");
+}
+
+if (arr.lastIndexOf('world', undefined) !== -1) {
+    fail("#2 lastIndexOf fails when fromIndex is undefined");
+}
+
+if (arr.lastIndexOf('hello', undefined) !== 0) {
+    fail("#3 lastIndexOf fails when fromIndex is undefined");
+}
+
+if (arr.lastIndexOf() !== 3) {
+    fail("#4 lastIndexOf fails when searchElement is not passed");
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-444.js b/nashorn/test/script/basic/NASHORN-444.js
new file mode 100644
index 00000000000..7df1a30f300
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-444.js
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * NASHORN-444 : regex returns different result on second invocation.
+ *
+ * @test
+ * @run
+ */
+
+var formatRegExp = /%[sdj%]/g;
+var format = function(f) {
+  if (typeof f !== 'string') {
+    var objects = [];
+    for (var i = 0; i < arguments.length; i++) {
+      objects.push(inspect(arguments[i]));
+    }
+    return objects.join(' ');
+  }
+
+  var i = 1;
+  var args = arguments;
+  var len = args.length;
+  if (formatRegExp.lastIndex !== 0) throw "expected lastIndex === 0, actual: " + formatRegExp.lastIndex;
+  var str = String(f).replace(formatRegExp, function(x) {
+    if (x === '%%') return '%';
+    if (i >= len) return x;
+    switch (x) {
+      case '%s': return String(args[i++]);
+      case '%d': return Number(args[i++]);
+      case '%j': return JSON.stringify(args[i++]);
+      default:
+        return x;
+    }
+  });
+  print(i + ' '+len);
+  if (formatRegExp.lastIndex !== 0) throw "expected lastIndex === 0, actual: " + formatRegExp.lastIndex;
+  return str;
+};
+
+var obj = function() {
+    return {
+        a: 1,
+        b: 2
+    };
+};
+
+var o = obj();
+print(format('obj %j', o));
+print(format('obj %j', o));
+
diff --git a/nashorn/test/script/basic/NASHORN-444.js.EXPECTED b/nashorn/test/script/basic/NASHORN-444.js.EXPECTED
new file mode 100644
index 00000000000..7025f66ab51
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-444.js.EXPECTED
@@ -0,0 +1,4 @@
+2 2
+obj {"a":1,"b":2}
+2 2
+obj {"a":1,"b":2}
diff --git a/nashorn/test/script/basic/NASHORN-445.js b/nashorn/test/script/basic/NASHORN-445.js
new file mode 100644
index 00000000000..f8901e98dc9
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-445.js
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-445 : Array.prototype.map gets confused by index user accessor properties inherited from Array.prototype
+ *
+ * @test
+ * @run
+ */
+
+var arr = [1, 2, 3];
+
+Object.defineProperty(Array.prototype, "0", {
+    get: function () {
+        return "hello"
+    },
+    set: function(x) {
+        print("setter for '0' called with " + x);
+    },
+    enumerable: true
+});
+
+var res = arr.map(function(kVal, k, arr) {
+    return kVal*2;
+});
+
+if (res.length !== arr.length) {
+    fail("map result array is not of right length");
+}
+
+for (var i in res) {
+    if (res[i] !== 2*arr[i]) {
+        fail("map res[" + i + "] does not have right value");
+    }
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-446.js b/nashorn/test/script/basic/NASHORN-446.js
new file mode 100644
index 00000000000..5250f29121b
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-446.js
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-446 : Should be able to set full year using Date.prototype.setFullYear on invalid Date objects
+ *
+ * @test
+ * @run
+ */
+
+var oldFullYear = Date.prototype.getFullYear();
+try {
+    Date.prototype.setFullYear(2012);
+    if (Date.prototype.getFullYear() !== 2012) {
+        fail("Can't set full year on Date.prototype");
+    }
+} finally {
+    Date.prototype.setFullYear(oldFullYear);
+}
+
+var d = new Date(NaN);
+d.setFullYear(1972);
+if (d.getFullYear() !== 1972) {
+    fail("Can't set full year on an invalid date");
+}
diff --git a/nashorn/test/script/basic/NASHORN-447.js b/nashorn/test/script/basic/NASHORN-447.js
new file mode 100644
index 00000000000..03b4210af39
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-447.js
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-447 : Arity of bound function is wrong when more than required number of arguments are passed
+ *
+ * @test
+ * @run
+ */
+
+function func(x, y) {
+    return x + y;
+}
+
+var s = func.bind(this, 23, 44);
+if (s.length !== 0) {
+    fail("#1 bound function has wrong arity: " + s.length);
+}
+
+// supply additional arguments
+var s = func.bind(this, 23, 44, 55);
+// arity should still be zero..
+if (s.length !== 0) {
+    fail("#2 bound function has wrong arity: " + s.length);
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-448.js b/nashorn/test/script/basic/NASHORN-448.js
new file mode 100644
index 00000000000..96dd63b8309
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-448.js
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * NASHORN-448 : VerifyError with uninitialized variable.
+ *
+ * @test
+ * @run
+ */
+
+function a() { var x = x; }
+function b() { var i = 0; return i + 1; }
+function c() { var y = (function(){ return y;})(); }
+
+function test(m) {
+  var msg = typeof m.msg === "string" ? m.msg
+            : msg ? msg.stack || msg.message
+            : util.inspect(m.msg, 0, 4)
+}
+
+var f = function() {
+    var g = g || 0;
+};
+
diff --git a/nashorn/test/script/basic/NASHORN-449.js b/nashorn/test/script/basic/NASHORN-449.js
new file mode 100644
index 00000000000..c64d6e210d2
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-449.js
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-449 :  defineProperty on arguments object does not work element in question was deleted earlier
+ * 
+ * @test
+ * @run
+ */
+
+
+function func() {
+    delete arguments[0];
+    return arguments;
+}
+
+var a = func(334, 55, 33);
+var getterCalled = false;
+Object.defineProperty(a, "0", {
+  get: function() { getterCalled = true; return 22; }
+});
+
+if (a[0] === undefined) {
+    fail("a[0] is undefined");
+}
+
+if (! getterCalled) {
+    fail("getter not called");
+}
+
+if (a[0] !== 22) {
+    fail("a[0] !== 22");
+}
diff --git a/nashorn/test/script/basic/NASHORN-449.js.EXPECTED b/nashorn/test/script/basic/NASHORN-449.js.EXPECTED
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/nashorn/test/script/basic/NASHORN-45.js b/nashorn/test/script/basic/NASHORN-45.js
new file mode 100644
index 00000000000..b88c786b110
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-45.js
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-45 :  StackOverflowError when toString of Number.prototype is assigned to a Date object
+ *
+ * @test
+ * @run
+ */
+
+var d  = new Date(0);
+d.toString = Number.prototype.toString;
+try {
+    print(d.toString());
+} catch (e) {
+    print(e);
+}
+
+var s = new String("hello");
+s.toString = Number.prototype.toString;
+try {
+    print(s.toString());
+} catch (e) {
+    print(e);
+}
+
+var b = new Boolean(false);
+b.toString = Number.prototype.toString;
+try {
+    print(b.toString());
+} catch (e) {
+    print(e);
+}
+
+var obj = {};
+obj.toString = Number.prototype.toString;
+try {
+    print(obj.toString());
+} catch (e) {
+    print(e);
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-45.js.EXPECTED b/nashorn/test/script/basic/NASHORN-45.js.EXPECTED
new file mode 100644
index 00000000000..7dba10aaf85
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-45.js.EXPECTED
@@ -0,0 +1,4 @@
+TypeError: [Date 1970-01-01T00:00:00.000Z] is not a Number
+TypeError: [String hello] is not a Number
+TypeError: [Boolean false] is not a Number
+TypeError: [object Object] is not a Number
diff --git a/nashorn/test/script/basic/NASHORN-450.js b/nashorn/test/script/basic/NASHORN-450.js
new file mode 100644
index 00000000000..c2b5b29f790
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-450.js
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-450 : User setter for arguments element does not work when an element in question was deleted earlier
+ *
+ * @test
+ * @run
+ */
+
+(function() {
+    var setterCalled = false;
+    delete arguments[0];
+
+    Object.defineProperty(arguments, "0",
+        { get: function() { return 32; },
+          set: function(x) { setterCalled = true; }
+        }
+    );
+
+    arguments[0] = 33;
+
+    if (! setterCalled) {
+        fail("setter not called for arguments[0]");
+    }
+
+})(33);
diff --git a/nashorn/test/script/basic/NASHORN-452.js b/nashorn/test/script/basic/NASHORN-452.js
new file mode 100644
index 00000000000..c39bcc48c0d
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-452.js
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-452 : nashorn is able to redefine a global declared variable
+ *
+ * @test
+ * @run
+ */
+
+var env = {};
+try {
+    Object.defineProperty(this, 'env', {
+        get: function() {}
+    });
+    fail("#1 should have thrown TypeError");
+} catch (e) {
+    if (! (e instanceof TypeError)) {
+        fail("#2 TypeError expected, got " + e);
+    }
+}
+
+var desc = Object.getOwnPropertyDescriptor(this, 'env');
+if (desc.configurable) {
+    fail("#3 global var 'env' is configurable");
+}
+
+(function (x) {
+    if (delete x) {
+        fail("#4 can delete function argument");
+    }
+})(3);
+
+(function (x) {
+    // use of 'with'
+    with ({ foo: 2 }) {
+        if (delete x) {
+            fail("#5 can delete function argument");
+        }
+    }
+})(4);
+
+(function (x, y) {
+    // use of 'arguments'
+    var arg = arguments;
+    if (delete x || delete y) {
+        fail("#6 can delete function argument");
+    }
+})(5);
+
+(function (x) {
+    // use of 'eval'
+    eval("x");
+
+    if (delete x) {
+        fail("#7 can delete function argument");
+    }
+})('hello');
+
diff --git a/nashorn/test/script/basic/NASHORN-459.js b/nashorn/test/script/basic/NASHORN-459.js
new file mode 100644
index 00000000000..f7d82c92a14
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-459.js
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-459 : Cannot delete configurable accessor properties of global object
+ *
+ * @test
+ * @run
+ */
+
+var global = this;
+Object.defineProperty(global, "0", {
+    get: function() { return 43; },
+    set: function(x) { print('in setter ' + x); },
+    configurable: true
+});
+
+if ((delete global[0]) !== true) {
+    fail("can not delete configurable property '0' of global");
+}
+
+Object.defineProperty(global, "foo", {
+    get: function() { return 33; },
+    set: function(x) { print('setter foo'); },
+    configurable: true
+});
+
+if ((delete global.foo) !== true) {
+    fail("can not delete configurable property 'foo' of global");
+}
+
+Object.defineProperty(global, "1", {
+    get: function() { return 1 },
+    set: undefined,
+    configurable: true
+});
+
+Object.defineProperty(global, "1", {
+    get: function() { return 11 },
+    set: undefined
+});
+
+if ((delete global[1]) !== true) {
+    fail("can not delete configurable property '1' of global");
+}
+
+
diff --git a/nashorn/test/script/basic/NASHORN-46.js b/nashorn/test/script/basic/NASHORN-46.js
new file mode 100644
index 00000000000..97b7bf0944a
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-46.js
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-46 :  'with' statement can not have 'null' as scope object.
+ *
+ * @test
+ * @run
+ */
+
+try {
+    with(null) {
+        print("TypeError expected!!");
+    }
+} catch (e) {
+    print(e);
+}
+
+try {
+    with(undefined) {
+        print("TypeError expected!!");
+    }
+} catch (e) {
+    print(e);
+}
diff --git a/nashorn/test/script/basic/NASHORN-46.js.EXPECTED b/nashorn/test/script/basic/NASHORN-46.js.EXPECTED
new file mode 100644
index 00000000000..386f26076c1
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-46.js.EXPECTED
@@ -0,0 +1,2 @@
+TypeError: Cannot apply "with" to null
+TypeError: Cannot apply "with" to undefined
diff --git a/nashorn/test/script/basic/NASHORN-462.js b/nashorn/test/script/basic/NASHORN-462.js
new file mode 100644
index 00000000000..c7b152da2ab
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-462.js
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-462 : inherited non-writable properties cannot be overriden.
+ *
+ * @test
+ * @run
+ */
+
+function Foo() {};
+Object.defineProperty(Foo.prototype, "bar", { value: 19 });
+
+var fooObj = new Foo(); 
+fooObj.bar = "overridden"; 
+if (fooObj.hasOwnProperty("bar")) {
+    fail("inherited non-writable property can be overridden");
+}
+
+if (fooObj.bar !== 19) {
+    fail("inherited non-writable property value changed");
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-463.js b/nashorn/test/script/basic/NASHORN-463.js
new file mode 100644
index 00000000000..9ccbe8a2d79
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-463.js
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * NASHORN-463 : array length property is incorrect when an element is set at large index.
+ *
+ * @test
+ * @run
+ */
+
+var arr = [];
+//length is the max value of Uint type
+arr[Math.pow(2, 32) - 2] = true;
+if (arr.length !== 4294967295) {
+    fail("wrong array length : " + arr.length);
+}
diff --git a/nashorn/test/script/basic/NASHORN-468.js b/nashorn/test/script/basic/NASHORN-468.js
new file mode 100644
index 00000000000..17c4c7eb4b8
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-468.js
@@ -0,0 +1,3035 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-468 : "Class file too large" error with dojo library
+ *
+ * @test
+ * @run
+ */
+
+// simple machine generated script with 3000 global vars.
+// results about 40000 constant pool entries.
+
+var var0 = 0
+var var1 = 1
+var var2 = 2
+var var3 = 3
+var var4 = 4
+var var5 = 5
+var var6 = 6
+var var7 = 7
+var var8 = 8
+var var9 = 9
+var var10 = 10
+var var11 = 11
+var var12 = 12
+var var13 = 13
+var var14 = 14
+var var15 = 15
+var var16 = 16
+var var17 = 17
+var var18 = 18
+var var19 = 19
+var var20 = 20
+var var21 = 21
+var var22 = 22
+var var23 = 23
+var var24 = 24
+var var25 = 25
+var var26 = 26
+var var27 = 27
+var var28 = 28
+var var29 = 29
+var var30 = 30
+var var31 = 31
+var var32 = 32
+var var33 = 33
+var var34 = 34
+var var35 = 35
+var var36 = 36
+var var37 = 37
+var var38 = 38
+var var39 = 39
+var var40 = 40
+var var41 = 41
+var var42 = 42
+var var43 = 43
+var var44 = 44
+var var45 = 45
+var var46 = 46
+var var47 = 47
+var var48 = 48
+var var49 = 49
+var var50 = 50
+var var51 = 51
+var var52 = 52
+var var53 = 53
+var var54 = 54
+var var55 = 55
+var var56 = 56
+var var57 = 57
+var var58 = 58
+var var59 = 59
+var var60 = 60
+var var61 = 61
+var var62 = 62
+var var63 = 63
+var var64 = 64
+var var65 = 65
+var var66 = 66
+var var67 = 67
+var var68 = 68
+var var69 = 69
+var var70 = 70
+var var71 = 71
+var var72 = 72
+var var73 = 73
+var var74 = 74
+var var75 = 75
+var var76 = 76
+var var77 = 77
+var var78 = 78
+var var79 = 79
+var var80 = 80
+var var81 = 81
+var var82 = 82
+var var83 = 83
+var var84 = 84
+var var85 = 85
+var var86 = 86
+var var87 = 87
+var var88 = 88
+var var89 = 89
+var var90 = 90
+var var91 = 91
+var var92 = 92
+var var93 = 93
+var var94 = 94
+var var95 = 95
+var var96 = 96
+var var97 = 97
+var var98 = 98
+var var99 = 99
+var var100 = 100
+var var101 = 101
+var var102 = 102
+var var103 = 103
+var var104 = 104
+var var105 = 105
+var var106 = 106
+var var107 = 107
+var var108 = 108
+var var109 = 109
+var var110 = 110
+var var111 = 111
+var var112 = 112
+var var113 = 113
+var var114 = 114
+var var115 = 115
+var var116 = 116
+var var117 = 117
+var var118 = 118
+var var119 = 119
+var var120 = 120
+var var121 = 121
+var var122 = 122
+var var123 = 123
+var var124 = 124
+var var125 = 125
+var var126 = 126
+var var127 = 127
+var var128 = 128
+var var129 = 129
+var var130 = 130
+var var131 = 131
+var var132 = 132
+var var133 = 133
+var var134 = 134
+var var135 = 135
+var var136 = 136
+var var137 = 137
+var var138 = 138
+var var139 = 139
+var var140 = 140
+var var141 = 141
+var var142 = 142
+var var143 = 143
+var var144 = 144
+var var145 = 145
+var var146 = 146
+var var147 = 147
+var var148 = 148
+var var149 = 149
+var var150 = 150
+var var151 = 151
+var var152 = 152
+var var153 = 153
+var var154 = 154
+var var155 = 155
+var var156 = 156
+var var157 = 157
+var var158 = 158
+var var159 = 159
+var var160 = 160
+var var161 = 161
+var var162 = 162
+var var163 = 163
+var var164 = 164
+var var165 = 165
+var var166 = 166
+var var167 = 167
+var var168 = 168
+var var169 = 169
+var var170 = 170
+var var171 = 171
+var var172 = 172
+var var173 = 173
+var var174 = 174
+var var175 = 175
+var var176 = 176
+var var177 = 177
+var var178 = 178
+var var179 = 179
+var var180 = 180
+var var181 = 181
+var var182 = 182
+var var183 = 183
+var var184 = 184
+var var185 = 185
+var var186 = 186
+var var187 = 187
+var var188 = 188
+var var189 = 189
+var var190 = 190
+var var191 = 191
+var var192 = 192
+var var193 = 193
+var var194 = 194
+var var195 = 195
+var var196 = 196
+var var197 = 197
+var var198 = 198
+var var199 = 199
+var var200 = 200
+var var201 = 201
+var var202 = 202
+var var203 = 203
+var var204 = 204
+var var205 = 205
+var var206 = 206
+var var207 = 207
+var var208 = 208
+var var209 = 209
+var var210 = 210
+var var211 = 211
+var var212 = 212
+var var213 = 213
+var var214 = 214
+var var215 = 215
+var var216 = 216
+var var217 = 217
+var var218 = 218
+var var219 = 219
+var var220 = 220
+var var221 = 221
+var var222 = 222
+var var223 = 223
+var var224 = 224
+var var225 = 225
+var var226 = 226
+var var227 = 227
+var var228 = 228
+var var229 = 229
+var var230 = 230
+var var231 = 231
+var var232 = 232
+var var233 = 233
+var var234 = 234
+var var235 = 235
+var var236 = 236
+var var237 = 237
+var var238 = 238
+var var239 = 239
+var var240 = 240
+var var241 = 241
+var var242 = 242
+var var243 = 243
+var var244 = 244
+var var245 = 245
+var var246 = 246
+var var247 = 247
+var var248 = 248
+var var249 = 249
+var var250 = 250
+var var251 = 251
+var var252 = 252
+var var253 = 253
+var var254 = 254
+var var255 = 255
+var var256 = 256
+var var257 = 257
+var var258 = 258
+var var259 = 259
+var var260 = 260
+var var261 = 261
+var var262 = 262
+var var263 = 263
+var var264 = 264
+var var265 = 265
+var var266 = 266
+var var267 = 267
+var var268 = 268
+var var269 = 269
+var var270 = 270
+var var271 = 271
+var var272 = 272
+var var273 = 273
+var var274 = 274
+var var275 = 275
+var var276 = 276
+var var277 = 277
+var var278 = 278
+var var279 = 279
+var var280 = 280
+var var281 = 281
+var var282 = 282
+var var283 = 283
+var var284 = 284
+var var285 = 285
+var var286 = 286
+var var287 = 287
+var var288 = 288
+var var289 = 289
+var var290 = 290
+var var291 = 291
+var var292 = 292
+var var293 = 293
+var var294 = 294
+var var295 = 295
+var var296 = 296
+var var297 = 297
+var var298 = 298
+var var299 = 299
+var var300 = 300
+var var301 = 301
+var var302 = 302
+var var303 = 303
+var var304 = 304
+var var305 = 305
+var var306 = 306
+var var307 = 307
+var var308 = 308
+var var309 = 309
+var var310 = 310
+var var311 = 311
+var var312 = 312
+var var313 = 313
+var var314 = 314
+var var315 = 315
+var var316 = 316
+var var317 = 317
+var var318 = 318
+var var319 = 319
+var var320 = 320
+var var321 = 321
+var var322 = 322
+var var323 = 323
+var var324 = 324
+var var325 = 325
+var var326 = 326
+var var327 = 327
+var var328 = 328
+var var329 = 329
+var var330 = 330
+var var331 = 331
+var var332 = 332
+var var333 = 333
+var var334 = 334
+var var335 = 335
+var var336 = 336
+var var337 = 337
+var var338 = 338
+var var339 = 339
+var var340 = 340
+var var341 = 341
+var var342 = 342
+var var343 = 343
+var var344 = 344
+var var345 = 345
+var var346 = 346
+var var347 = 347
+var var348 = 348
+var var349 = 349
+var var350 = 350
+var var351 = 351
+var var352 = 352
+var var353 = 353
+var var354 = 354
+var var355 = 355
+var var356 = 356
+var var357 = 357
+var var358 = 358
+var var359 = 359
+var var360 = 360
+var var361 = 361
+var var362 = 362
+var var363 = 363
+var var364 = 364
+var var365 = 365
+var var366 = 366
+var var367 = 367
+var var368 = 368
+var var369 = 369
+var var370 = 370
+var var371 = 371
+var var372 = 372
+var var373 = 373
+var var374 = 374
+var var375 = 375
+var var376 = 376
+var var377 = 377
+var var378 = 378
+var var379 = 379
+var var380 = 380
+var var381 = 381
+var var382 = 382
+var var383 = 383
+var var384 = 384
+var var385 = 385
+var var386 = 386
+var var387 = 387
+var var388 = 388
+var var389 = 389
+var var390 = 390
+var var391 = 391
+var var392 = 392
+var var393 = 393
+var var394 = 394
+var var395 = 395
+var var396 = 396
+var var397 = 397
+var var398 = 398
+var var399 = 399
+var var400 = 400
+var var401 = 401
+var var402 = 402
+var var403 = 403
+var var404 = 404
+var var405 = 405
+var var406 = 406
+var var407 = 407
+var var408 = 408
+var var409 = 409
+var var410 = 410
+var var411 = 411
+var var412 = 412
+var var413 = 413
+var var414 = 414
+var var415 = 415
+var var416 = 416
+var var417 = 417
+var var418 = 418
+var var419 = 419
+var var420 = 420
+var var421 = 421
+var var422 = 422
+var var423 = 423
+var var424 = 424
+var var425 = 425
+var var426 = 426
+var var427 = 427
+var var428 = 428
+var var429 = 429
+var var430 = 430
+var var431 = 431
+var var432 = 432
+var var433 = 433
+var var434 = 434
+var var435 = 435
+var var436 = 436
+var var437 = 437
+var var438 = 438
+var var439 = 439
+var var440 = 440
+var var441 = 441
+var var442 = 442
+var var443 = 443
+var var444 = 444
+var var445 = 445
+var var446 = 446
+var var447 = 447
+var var448 = 448
+var var449 = 449
+var var450 = 450
+var var451 = 451
+var var452 = 452
+var var453 = 453
+var var454 = 454
+var var455 = 455
+var var456 = 456
+var var457 = 457
+var var458 = 458
+var var459 = 459
+var var460 = 460
+var var461 = 461
+var var462 = 462
+var var463 = 463
+var var464 = 464
+var var465 = 465
+var var466 = 466
+var var467 = 467
+var var468 = 468
+var var469 = 469
+var var470 = 470
+var var471 = 471
+var var472 = 472
+var var473 = 473
+var var474 = 474
+var var475 = 475
+var var476 = 476
+var var477 = 477
+var var478 = 478
+var var479 = 479
+var var480 = 480
+var var481 = 481
+var var482 = 482
+var var483 = 483
+var var484 = 484
+var var485 = 485
+var var486 = 486
+var var487 = 487
+var var488 = 488
+var var489 = 489
+var var490 = 490
+var var491 = 491
+var var492 = 492
+var var493 = 493
+var var494 = 494
+var var495 = 495
+var var496 = 496
+var var497 = 497
+var var498 = 498
+var var499 = 499
+var var500 = 500
+var var501 = 501
+var var502 = 502
+var var503 = 503
+var var504 = 504
+var var505 = 505
+var var506 = 506
+var var507 = 507
+var var508 = 508
+var var509 = 509
+var var510 = 510
+var var511 = 511
+var var512 = 512
+var var513 = 513
+var var514 = 514
+var var515 = 515
+var var516 = 516
+var var517 = 517
+var var518 = 518
+var var519 = 519
+var var520 = 520
+var var521 = 521
+var var522 = 522
+var var523 = 523
+var var524 = 524
+var var525 = 525
+var var526 = 526
+var var527 = 527
+var var528 = 528
+var var529 = 529
+var var530 = 530
+var var531 = 531
+var var532 = 532
+var var533 = 533
+var var534 = 534
+var var535 = 535
+var var536 = 536
+var var537 = 537
+var var538 = 538
+var var539 = 539
+var var540 = 540
+var var541 = 541
+var var542 = 542
+var var543 = 543
+var var544 = 544
+var var545 = 545
+var var546 = 546
+var var547 = 547
+var var548 = 548
+var var549 = 549
+var var550 = 550
+var var551 = 551
+var var552 = 552
+var var553 = 553
+var var554 = 554
+var var555 = 555
+var var556 = 556
+var var557 = 557
+var var558 = 558
+var var559 = 559
+var var560 = 560
+var var561 = 561
+var var562 = 562
+var var563 = 563
+var var564 = 564
+var var565 = 565
+var var566 = 566
+var var567 = 567
+var var568 = 568
+var var569 = 569
+var var570 = 570
+var var571 = 571
+var var572 = 572
+var var573 = 573
+var var574 = 574
+var var575 = 575
+var var576 = 576
+var var577 = 577
+var var578 = 578
+var var579 = 579
+var var580 = 580
+var var581 = 581
+var var582 = 582
+var var583 = 583
+var var584 = 584
+var var585 = 585
+var var586 = 586
+var var587 = 587
+var var588 = 588
+var var589 = 589
+var var590 = 590
+var var591 = 591
+var var592 = 592
+var var593 = 593
+var var594 = 594
+var var595 = 595
+var var596 = 596
+var var597 = 597
+var var598 = 598
+var var599 = 599
+var var600 = 600
+var var601 = 601
+var var602 = 602
+var var603 = 603
+var var604 = 604
+var var605 = 605
+var var606 = 606
+var var607 = 607
+var var608 = 608
+var var609 = 609
+var var610 = 610
+var var611 = 611
+var var612 = 612
+var var613 = 613
+var var614 = 614
+var var615 = 615
+var var616 = 616
+var var617 = 617
+var var618 = 618
+var var619 = 619
+var var620 = 620
+var var621 = 621
+var var622 = 622
+var var623 = 623
+var var624 = 624
+var var625 = 625
+var var626 = 626
+var var627 = 627
+var var628 = 628
+var var629 = 629
+var var630 = 630
+var var631 = 631
+var var632 = 632
+var var633 = 633
+var var634 = 634
+var var635 = 635
+var var636 = 636
+var var637 = 637
+var var638 = 638
+var var639 = 639
+var var640 = 640
+var var641 = 641
+var var642 = 642
+var var643 = 643
+var var644 = 644
+var var645 = 645
+var var646 = 646
+var var647 = 647
+var var648 = 648
+var var649 = 649
+var var650 = 650
+var var651 = 651
+var var652 = 652
+var var653 = 653
+var var654 = 654
+var var655 = 655
+var var656 = 656
+var var657 = 657
+var var658 = 658
+var var659 = 659
+var var660 = 660
+var var661 = 661
+var var662 = 662
+var var663 = 663
+var var664 = 664
+var var665 = 665
+var var666 = 666
+var var667 = 667
+var var668 = 668
+var var669 = 669
+var var670 = 670
+var var671 = 671
+var var672 = 672
+var var673 = 673
+var var674 = 674
+var var675 = 675
+var var676 = 676
+var var677 = 677
+var var678 = 678
+var var679 = 679
+var var680 = 680
+var var681 = 681
+var var682 = 682
+var var683 = 683
+var var684 = 684
+var var685 = 685
+var var686 = 686
+var var687 = 687
+var var688 = 688
+var var689 = 689
+var var690 = 690
+var var691 = 691
+var var692 = 692
+var var693 = 693
+var var694 = 694
+var var695 = 695
+var var696 = 696
+var var697 = 697
+var var698 = 698
+var var699 = 699
+var var700 = 700
+var var701 = 701
+var var702 = 702
+var var703 = 703
+var var704 = 704
+var var705 = 705
+var var706 = 706
+var var707 = 707
+var var708 = 708
+var var709 = 709
+var var710 = 710
+var var711 = 711
+var var712 = 712
+var var713 = 713
+var var714 = 714
+var var715 = 715
+var var716 = 716
+var var717 = 717
+var var718 = 718
+var var719 = 719
+var var720 = 720
+var var721 = 721
+var var722 = 722
+var var723 = 723
+var var724 = 724
+var var725 = 725
+var var726 = 726
+var var727 = 727
+var var728 = 728
+var var729 = 729
+var var730 = 730
+var var731 = 731
+var var732 = 732
+var var733 = 733
+var var734 = 734
+var var735 = 735
+var var736 = 736
+var var737 = 737
+var var738 = 738
+var var739 = 739
+var var740 = 740
+var var741 = 741
+var var742 = 742
+var var743 = 743
+var var744 = 744
+var var745 = 745
+var var746 = 746
+var var747 = 747
+var var748 = 748
+var var749 = 749
+var var750 = 750
+var var751 = 751
+var var752 = 752
+var var753 = 753
+var var754 = 754
+var var755 = 755
+var var756 = 756
+var var757 = 757
+var var758 = 758
+var var759 = 759
+var var760 = 760
+var var761 = 761
+var var762 = 762
+var var763 = 763
+var var764 = 764
+var var765 = 765
+var var766 = 766
+var var767 = 767
+var var768 = 768
+var var769 = 769
+var var770 = 770
+var var771 = 771
+var var772 = 772
+var var773 = 773
+var var774 = 774
+var var775 = 775
+var var776 = 776
+var var777 = 777
+var var778 = 778
+var var779 = 779
+var var780 = 780
+var var781 = 781
+var var782 = 782
+var var783 = 783
+var var784 = 784
+var var785 = 785
+var var786 = 786
+var var787 = 787
+var var788 = 788
+var var789 = 789
+var var790 = 790
+var var791 = 791
+var var792 = 792
+var var793 = 793
+var var794 = 794
+var var795 = 795
+var var796 = 796
+var var797 = 797
+var var798 = 798
+var var799 = 799
+var var800 = 800
+var var801 = 801
+var var802 = 802
+var var803 = 803
+var var804 = 804
+var var805 = 805
+var var806 = 806
+var var807 = 807
+var var808 = 808
+var var809 = 809
+var var810 = 810
+var var811 = 811
+var var812 = 812
+var var813 = 813
+var var814 = 814
+var var815 = 815
+var var816 = 816
+var var817 = 817
+var var818 = 818
+var var819 = 819
+var var820 = 820
+var var821 = 821
+var var822 = 822
+var var823 = 823
+var var824 = 824
+var var825 = 825
+var var826 = 826
+var var827 = 827
+var var828 = 828
+var var829 = 829
+var var830 = 830
+var var831 = 831
+var var832 = 832
+var var833 = 833
+var var834 = 834
+var var835 = 835
+var var836 = 836
+var var837 = 837
+var var838 = 838
+var var839 = 839
+var var840 = 840
+var var841 = 841
+var var842 = 842
+var var843 = 843
+var var844 = 844
+var var845 = 845
+var var846 = 846
+var var847 = 847
+var var848 = 848
+var var849 = 849
+var var850 = 850
+var var851 = 851
+var var852 = 852
+var var853 = 853
+var var854 = 854
+var var855 = 855
+var var856 = 856
+var var857 = 857
+var var858 = 858
+var var859 = 859
+var var860 = 860
+var var861 = 861
+var var862 = 862
+var var863 = 863
+var var864 = 864
+var var865 = 865
+var var866 = 866
+var var867 = 867
+var var868 = 868
+var var869 = 869
+var var870 = 870
+var var871 = 871
+var var872 = 872
+var var873 = 873
+var var874 = 874
+var var875 = 875
+var var876 = 876
+var var877 = 877
+var var878 = 878
+var var879 = 879
+var var880 = 880
+var var881 = 881
+var var882 = 882
+var var883 = 883
+var var884 = 884
+var var885 = 885
+var var886 = 886
+var var887 = 887
+var var888 = 888
+var var889 = 889
+var var890 = 890
+var var891 = 891
+var var892 = 892
+var var893 = 893
+var var894 = 894
+var var895 = 895
+var var896 = 896
+var var897 = 897
+var var898 = 898
+var var899 = 899
+var var900 = 900
+var var901 = 901
+var var902 = 902
+var var903 = 903
+var var904 = 904
+var var905 = 905
+var var906 = 906
+var var907 = 907
+var var908 = 908
+var var909 = 909
+var var910 = 910
+var var911 = 911
+var var912 = 912
+var var913 = 913
+var var914 = 914
+var var915 = 915
+var var916 = 916
+var var917 = 917
+var var918 = 918
+var var919 = 919
+var var920 = 920
+var var921 = 921
+var var922 = 922
+var var923 = 923
+var var924 = 924
+var var925 = 925
+var var926 = 926
+var var927 = 927
+var var928 = 928
+var var929 = 929
+var var930 = 930
+var var931 = 931
+var var932 = 932
+var var933 = 933
+var var934 = 934
+var var935 = 935
+var var936 = 936
+var var937 = 937
+var var938 = 938
+var var939 = 939
+var var940 = 940
+var var941 = 941
+var var942 = 942
+var var943 = 943
+var var944 = 944
+var var945 = 945
+var var946 = 946
+var var947 = 947
+var var948 = 948
+var var949 = 949
+var var950 = 950
+var var951 = 951
+var var952 = 952
+var var953 = 953
+var var954 = 954
+var var955 = 955
+var var956 = 956
+var var957 = 957
+var var958 = 958
+var var959 = 959
+var var960 = 960
+var var961 = 961
+var var962 = 962
+var var963 = 963
+var var964 = 964
+var var965 = 965
+var var966 = 966
+var var967 = 967
+var var968 = 968
+var var969 = 969
+var var970 = 970
+var var971 = 971
+var var972 = 972
+var var973 = 973
+var var974 = 974
+var var975 = 975
+var var976 = 976
+var var977 = 977
+var var978 = 978
+var var979 = 979
+var var980 = 980
+var var981 = 981
+var var982 = 982
+var var983 = 983
+var var984 = 984
+var var985 = 985
+var var986 = 986
+var var987 = 987
+var var988 = 988
+var var989 = 989
+var var990 = 990
+var var991 = 991
+var var992 = 992
+var var993 = 993
+var var994 = 994
+var var995 = 995
+var var996 = 996
+var var997 = 997
+var var998 = 998
+var var999 = 999
+var var1000 = 1000
+var var1001 = 1001
+var var1002 = 1002
+var var1003 = 1003
+var var1004 = 1004
+var var1005 = 1005
+var var1006 = 1006
+var var1007 = 1007
+var var1008 = 1008
+var var1009 = 1009
+var var1010 = 1010
+var var1011 = 1011
+var var1012 = 1012
+var var1013 = 1013
+var var1014 = 1014
+var var1015 = 1015
+var var1016 = 1016
+var var1017 = 1017
+var var1018 = 1018
+var var1019 = 1019
+var var1020 = 1020
+var var1021 = 1021
+var var1022 = 1022
+var var1023 = 1023
+var var1024 = 1024
+var var1025 = 1025
+var var1026 = 1026
+var var1027 = 1027
+var var1028 = 1028
+var var1029 = 1029
+var var1030 = 1030
+var var1031 = 1031
+var var1032 = 1032
+var var1033 = 1033
+var var1034 = 1034
+var var1035 = 1035
+var var1036 = 1036
+var var1037 = 1037
+var var1038 = 1038
+var var1039 = 1039
+var var1040 = 1040
+var var1041 = 1041
+var var1042 = 1042
+var var1043 = 1043
+var var1044 = 1044
+var var1045 = 1045
+var var1046 = 1046
+var var1047 = 1047
+var var1048 = 1048
+var var1049 = 1049
+var var1050 = 1050
+var var1051 = 1051
+var var1052 = 1052
+var var1053 = 1053
+var var1054 = 1054
+var var1055 = 1055
+var var1056 = 1056
+var var1057 = 1057
+var var1058 = 1058
+var var1059 = 1059
+var var1060 = 1060
+var var1061 = 1061
+var var1062 = 1062
+var var1063 = 1063
+var var1064 = 1064
+var var1065 = 1065
+var var1066 = 1066
+var var1067 = 1067
+var var1068 = 1068
+var var1069 = 1069
+var var1070 = 1070
+var var1071 = 1071
+var var1072 = 1072
+var var1073 = 1073
+var var1074 = 1074
+var var1075 = 1075
+var var1076 = 1076
+var var1077 = 1077
+var var1078 = 1078
+var var1079 = 1079
+var var1080 = 1080
+var var1081 = 1081
+var var1082 = 1082
+var var1083 = 1083
+var var1084 = 1084
+var var1085 = 1085
+var var1086 = 1086
+var var1087 = 1087
+var var1088 = 1088
+var var1089 = 1089
+var var1090 = 1090
+var var1091 = 1091
+var var1092 = 1092
+var var1093 = 1093
+var var1094 = 1094
+var var1095 = 1095
+var var1096 = 1096
+var var1097 = 1097
+var var1098 = 1098
+var var1099 = 1099
+var var1100 = 1100
+var var1101 = 1101
+var var1102 = 1102
+var var1103 = 1103
+var var1104 = 1104
+var var1105 = 1105
+var var1106 = 1106
+var var1107 = 1107
+var var1108 = 1108
+var var1109 = 1109
+var var1110 = 1110
+var var1111 = 1111
+var var1112 = 1112
+var var1113 = 1113
+var var1114 = 1114
+var var1115 = 1115
+var var1116 = 1116
+var var1117 = 1117
+var var1118 = 1118
+var var1119 = 1119
+var var1120 = 1120
+var var1121 = 1121
+var var1122 = 1122
+var var1123 = 1123
+var var1124 = 1124
+var var1125 = 1125
+var var1126 = 1126
+var var1127 = 1127
+var var1128 = 1128
+var var1129 = 1129
+var var1130 = 1130
+var var1131 = 1131
+var var1132 = 1132
+var var1133 = 1133
+var var1134 = 1134
+var var1135 = 1135
+var var1136 = 1136
+var var1137 = 1137
+var var1138 = 1138
+var var1139 = 1139
+var var1140 = 1140
+var var1141 = 1141
+var var1142 = 1142
+var var1143 = 1143
+var var1144 = 1144
+var var1145 = 1145
+var var1146 = 1146
+var var1147 = 1147
+var var1148 = 1148
+var var1149 = 1149
+var var1150 = 1150
+var var1151 = 1151
+var var1152 = 1152
+var var1153 = 1153
+var var1154 = 1154
+var var1155 = 1155
+var var1156 = 1156
+var var1157 = 1157
+var var1158 = 1158
+var var1159 = 1159
+var var1160 = 1160
+var var1161 = 1161
+var var1162 = 1162
+var var1163 = 1163
+var var1164 = 1164
+var var1165 = 1165
+var var1166 = 1166
+var var1167 = 1167
+var var1168 = 1168
+var var1169 = 1169
+var var1170 = 1170
+var var1171 = 1171
+var var1172 = 1172
+var var1173 = 1173
+var var1174 = 1174
+var var1175 = 1175
+var var1176 = 1176
+var var1177 = 1177
+var var1178 = 1178
+var var1179 = 1179
+var var1180 = 1180
+var var1181 = 1181
+var var1182 = 1182
+var var1183 = 1183
+var var1184 = 1184
+var var1185 = 1185
+var var1186 = 1186
+var var1187 = 1187
+var var1188 = 1188
+var var1189 = 1189
+var var1190 = 1190
+var var1191 = 1191
+var var1192 = 1192
+var var1193 = 1193
+var var1194 = 1194
+var var1195 = 1195
+var var1196 = 1196
+var var1197 = 1197
+var var1198 = 1198
+var var1199 = 1199
+var var1200 = 1200
+var var1201 = 1201
+var var1202 = 1202
+var var1203 = 1203
+var var1204 = 1204
+var var1205 = 1205
+var var1206 = 1206
+var var1207 = 1207
+var var1208 = 1208
+var var1209 = 1209
+var var1210 = 1210
+var var1211 = 1211
+var var1212 = 1212
+var var1213 = 1213
+var var1214 = 1214
+var var1215 = 1215
+var var1216 = 1216
+var var1217 = 1217
+var var1218 = 1218
+var var1219 = 1219
+var var1220 = 1220
+var var1221 = 1221
+var var1222 = 1222
+var var1223 = 1223
+var var1224 = 1224
+var var1225 = 1225
+var var1226 = 1226
+var var1227 = 1227
+var var1228 = 1228
+var var1229 = 1229
+var var1230 = 1230
+var var1231 = 1231
+var var1232 = 1232
+var var1233 = 1233
+var var1234 = 1234
+var var1235 = 1235
+var var1236 = 1236
+var var1237 = 1237
+var var1238 = 1238
+var var1239 = 1239
+var var1240 = 1240
+var var1241 = 1241
+var var1242 = 1242
+var var1243 = 1243
+var var1244 = 1244
+var var1245 = 1245
+var var1246 = 1246
+var var1247 = 1247
+var var1248 = 1248
+var var1249 = 1249
+var var1250 = 1250
+var var1251 = 1251
+var var1252 = 1252
+var var1253 = 1253
+var var1254 = 1254
+var var1255 = 1255
+var var1256 = 1256
+var var1257 = 1257
+var var1258 = 1258
+var var1259 = 1259
+var var1260 = 1260
+var var1261 = 1261
+var var1262 = 1262
+var var1263 = 1263
+var var1264 = 1264
+var var1265 = 1265
+var var1266 = 1266
+var var1267 = 1267
+var var1268 = 1268
+var var1269 = 1269
+var var1270 = 1270
+var var1271 = 1271
+var var1272 = 1272
+var var1273 = 1273
+var var1274 = 1274
+var var1275 = 1275
+var var1276 = 1276
+var var1277 = 1277
+var var1278 = 1278
+var var1279 = 1279
+var var1280 = 1280
+var var1281 = 1281
+var var1282 = 1282
+var var1283 = 1283
+var var1284 = 1284
+var var1285 = 1285
+var var1286 = 1286
+var var1287 = 1287
+var var1288 = 1288
+var var1289 = 1289
+var var1290 = 1290
+var var1291 = 1291
+var var1292 = 1292
+var var1293 = 1293
+var var1294 = 1294
+var var1295 = 1295
+var var1296 = 1296
+var var1297 = 1297
+var var1298 = 1298
+var var1299 = 1299
+var var1300 = 1300
+var var1301 = 1301
+var var1302 = 1302
+var var1303 = 1303
+var var1304 = 1304
+var var1305 = 1305
+var var1306 = 1306
+var var1307 = 1307
+var var1308 = 1308
+var var1309 = 1309
+var var1310 = 1310
+var var1311 = 1311
+var var1312 = 1312
+var var1313 = 1313
+var var1314 = 1314
+var var1315 = 1315
+var var1316 = 1316
+var var1317 = 1317
+var var1318 = 1318
+var var1319 = 1319
+var var1320 = 1320
+var var1321 = 1321
+var var1322 = 1322
+var var1323 = 1323
+var var1324 = 1324
+var var1325 = 1325
+var var1326 = 1326
+var var1327 = 1327
+var var1328 = 1328
+var var1329 = 1329
+var var1330 = 1330
+var var1331 = 1331
+var var1332 = 1332
+var var1333 = 1333
+var var1334 = 1334
+var var1335 = 1335
+var var1336 = 1336
+var var1337 = 1337
+var var1338 = 1338
+var var1339 = 1339
+var var1340 = 1340
+var var1341 = 1341
+var var1342 = 1342
+var var1343 = 1343
+var var1344 = 1344
+var var1345 = 1345
+var var1346 = 1346
+var var1347 = 1347
+var var1348 = 1348
+var var1349 = 1349
+var var1350 = 1350
+var var1351 = 1351
+var var1352 = 1352
+var var1353 = 1353
+var var1354 = 1354
+var var1355 = 1355
+var var1356 = 1356
+var var1357 = 1357
+var var1358 = 1358
+var var1359 = 1359
+var var1360 = 1360
+var var1361 = 1361
+var var1362 = 1362
+var var1363 = 1363
+var var1364 = 1364
+var var1365 = 1365
+var var1366 = 1366
+var var1367 = 1367
+var var1368 = 1368
+var var1369 = 1369
+var var1370 = 1370
+var var1371 = 1371
+var var1372 = 1372
+var var1373 = 1373
+var var1374 = 1374
+var var1375 = 1375
+var var1376 = 1376
+var var1377 = 1377
+var var1378 = 1378
+var var1379 = 1379
+var var1380 = 1380
+var var1381 = 1381
+var var1382 = 1382
+var var1383 = 1383
+var var1384 = 1384
+var var1385 = 1385
+var var1386 = 1386
+var var1387 = 1387
+var var1388 = 1388
+var var1389 = 1389
+var var1390 = 1390
+var var1391 = 1391
+var var1392 = 1392
+var var1393 = 1393
+var var1394 = 1394
+var var1395 = 1395
+var var1396 = 1396
+var var1397 = 1397
+var var1398 = 1398
+var var1399 = 1399
+var var1400 = 1400
+var var1401 = 1401
+var var1402 = 1402
+var var1403 = 1403
+var var1404 = 1404
+var var1405 = 1405
+var var1406 = 1406
+var var1407 = 1407
+var var1408 = 1408
+var var1409 = 1409
+var var1410 = 1410
+var var1411 = 1411
+var var1412 = 1412
+var var1413 = 1413
+var var1414 = 1414
+var var1415 = 1415
+var var1416 = 1416
+var var1417 = 1417
+var var1418 = 1418
+var var1419 = 1419
+var var1420 = 1420
+var var1421 = 1421
+var var1422 = 1422
+var var1423 = 1423
+var var1424 = 1424
+var var1425 = 1425
+var var1426 = 1426
+var var1427 = 1427
+var var1428 = 1428
+var var1429 = 1429
+var var1430 = 1430
+var var1431 = 1431
+var var1432 = 1432
+var var1433 = 1433
+var var1434 = 1434
+var var1435 = 1435
+var var1436 = 1436
+var var1437 = 1437
+var var1438 = 1438
+var var1439 = 1439
+var var1440 = 1440
+var var1441 = 1441
+var var1442 = 1442
+var var1443 = 1443
+var var1444 = 1444
+var var1445 = 1445
+var var1446 = 1446
+var var1447 = 1447
+var var1448 = 1448
+var var1449 = 1449
+var var1450 = 1450
+var var1451 = 1451
+var var1452 = 1452
+var var1453 = 1453
+var var1454 = 1454
+var var1455 = 1455
+var var1456 = 1456
+var var1457 = 1457
+var var1458 = 1458
+var var1459 = 1459
+var var1460 = 1460
+var var1461 = 1461
+var var1462 = 1462
+var var1463 = 1463
+var var1464 = 1464
+var var1465 = 1465
+var var1466 = 1466
+var var1467 = 1467
+var var1468 = 1468
+var var1469 = 1469
+var var1470 = 1470
+var var1471 = 1471
+var var1472 = 1472
+var var1473 = 1473
+var var1474 = 1474
+var var1475 = 1475
+var var1476 = 1476
+var var1477 = 1477
+var var1478 = 1478
+var var1479 = 1479
+var var1480 = 1480
+var var1481 = 1481
+var var1482 = 1482
+var var1483 = 1483
+var var1484 = 1484
+var var1485 = 1485
+var var1486 = 1486
+var var1487 = 1487
+var var1488 = 1488
+var var1489 = 1489
+var var1490 = 1490
+var var1491 = 1491
+var var1492 = 1492
+var var1493 = 1493
+var var1494 = 1494
+var var1495 = 1495
+var var1496 = 1496
+var var1497 = 1497
+var var1498 = 1498
+var var1499 = 1499
+var var1500 = 1500
+var var1501 = 1501
+var var1502 = 1502
+var var1503 = 1503
+var var1504 = 1504
+var var1505 = 1505
+var var1506 = 1506
+var var1507 = 1507
+var var1508 = 1508
+var var1509 = 1509
+var var1510 = 1510
+var var1511 = 1511
+var var1512 = 1512
+var var1513 = 1513
+var var1514 = 1514
+var var1515 = 1515
+var var1516 = 1516
+var var1517 = 1517
+var var1518 = 1518
+var var1519 = 1519
+var var1520 = 1520
+var var1521 = 1521
+var var1522 = 1522
+var var1523 = 1523
+var var1524 = 1524
+var var1525 = 1525
+var var1526 = 1526
+var var1527 = 1527
+var var1528 = 1528
+var var1529 = 1529
+var var1530 = 1530
+var var1531 = 1531
+var var1532 = 1532
+var var1533 = 1533
+var var1534 = 1534
+var var1535 = 1535
+var var1536 = 1536
+var var1537 = 1537
+var var1538 = 1538
+var var1539 = 1539
+var var1540 = 1540
+var var1541 = 1541
+var var1542 = 1542
+var var1543 = 1543
+var var1544 = 1544
+var var1545 = 1545
+var var1546 = 1546
+var var1547 = 1547
+var var1548 = 1548
+var var1549 = 1549
+var var1550 = 1550
+var var1551 = 1551
+var var1552 = 1552
+var var1553 = 1553
+var var1554 = 1554
+var var1555 = 1555
+var var1556 = 1556
+var var1557 = 1557
+var var1558 = 1558
+var var1559 = 1559
+var var1560 = 1560
+var var1561 = 1561
+var var1562 = 1562
+var var1563 = 1563
+var var1564 = 1564
+var var1565 = 1565
+var var1566 = 1566
+var var1567 = 1567
+var var1568 = 1568
+var var1569 = 1569
+var var1570 = 1570
+var var1571 = 1571
+var var1572 = 1572
+var var1573 = 1573
+var var1574 = 1574
+var var1575 = 1575
+var var1576 = 1576
+var var1577 = 1577
+var var1578 = 1578
+var var1579 = 1579
+var var1580 = 1580
+var var1581 = 1581
+var var1582 = 1582
+var var1583 = 1583
+var var1584 = 1584
+var var1585 = 1585
+var var1586 = 1586
+var var1587 = 1587
+var var1588 = 1588
+var var1589 = 1589
+var var1590 = 1590
+var var1591 = 1591
+var var1592 = 1592
+var var1593 = 1593
+var var1594 = 1594
+var var1595 = 1595
+var var1596 = 1596
+var var1597 = 1597
+var var1598 = 1598
+var var1599 = 1599
+var var1600 = 1600
+var var1601 = 1601
+var var1602 = 1602
+var var1603 = 1603
+var var1604 = 1604
+var var1605 = 1605
+var var1606 = 1606
+var var1607 = 1607
+var var1608 = 1608
+var var1609 = 1609
+var var1610 = 1610
+var var1611 = 1611
+var var1612 = 1612
+var var1613 = 1613
+var var1614 = 1614
+var var1615 = 1615
+var var1616 = 1616
+var var1617 = 1617
+var var1618 = 1618
+var var1619 = 1619
+var var1620 = 1620
+var var1621 = 1621
+var var1622 = 1622
+var var1623 = 1623
+var var1624 = 1624
+var var1625 = 1625
+var var1626 = 1626
+var var1627 = 1627
+var var1628 = 1628
+var var1629 = 1629
+var var1630 = 1630
+var var1631 = 1631
+var var1632 = 1632
+var var1633 = 1633
+var var1634 = 1634
+var var1635 = 1635
+var var1636 = 1636
+var var1637 = 1637
+var var1638 = 1638
+var var1639 = 1639
+var var1640 = 1640
+var var1641 = 1641
+var var1642 = 1642
+var var1643 = 1643
+var var1644 = 1644
+var var1645 = 1645
+var var1646 = 1646
+var var1647 = 1647
+var var1648 = 1648
+var var1649 = 1649
+var var1650 = 1650
+var var1651 = 1651
+var var1652 = 1652
+var var1653 = 1653
+var var1654 = 1654
+var var1655 = 1655
+var var1656 = 1656
+var var1657 = 1657
+var var1658 = 1658
+var var1659 = 1659
+var var1660 = 1660
+var var1661 = 1661
+var var1662 = 1662
+var var1663 = 1663
+var var1664 = 1664
+var var1665 = 1665
+var var1666 = 1666
+var var1667 = 1667
+var var1668 = 1668
+var var1669 = 1669
+var var1670 = 1670
+var var1671 = 1671
+var var1672 = 1672
+var var1673 = 1673
+var var1674 = 1674
+var var1675 = 1675
+var var1676 = 1676
+var var1677 = 1677
+var var1678 = 1678
+var var1679 = 1679
+var var1680 = 1680
+var var1681 = 1681
+var var1682 = 1682
+var var1683 = 1683
+var var1684 = 1684
+var var1685 = 1685
+var var1686 = 1686
+var var1687 = 1687
+var var1688 = 1688
+var var1689 = 1689
+var var1690 = 1690
+var var1691 = 1691
+var var1692 = 1692
+var var1693 = 1693
+var var1694 = 1694
+var var1695 = 1695
+var var1696 = 1696
+var var1697 = 1697
+var var1698 = 1698
+var var1699 = 1699
+var var1700 = 1700
+var var1701 = 1701
+var var1702 = 1702
+var var1703 = 1703
+var var1704 = 1704
+var var1705 = 1705
+var var1706 = 1706
+var var1707 = 1707
+var var1708 = 1708
+var var1709 = 1709
+var var1710 = 1710
+var var1711 = 1711
+var var1712 = 1712
+var var1713 = 1713
+var var1714 = 1714
+var var1715 = 1715
+var var1716 = 1716
+var var1717 = 1717
+var var1718 = 1718
+var var1719 = 1719
+var var1720 = 1720
+var var1721 = 1721
+var var1722 = 1722
+var var1723 = 1723
+var var1724 = 1724
+var var1725 = 1725
+var var1726 = 1726
+var var1727 = 1727
+var var1728 = 1728
+var var1729 = 1729
+var var1730 = 1730
+var var1731 = 1731
+var var1732 = 1732
+var var1733 = 1733
+var var1734 = 1734
+var var1735 = 1735
+var var1736 = 1736
+var var1737 = 1737
+var var1738 = 1738
+var var1739 = 1739
+var var1740 = 1740
+var var1741 = 1741
+var var1742 = 1742
+var var1743 = 1743
+var var1744 = 1744
+var var1745 = 1745
+var var1746 = 1746
+var var1747 = 1747
+var var1748 = 1748
+var var1749 = 1749
+var var1750 = 1750
+var var1751 = 1751
+var var1752 = 1752
+var var1753 = 1753
+var var1754 = 1754
+var var1755 = 1755
+var var1756 = 1756
+var var1757 = 1757
+var var1758 = 1758
+var var1759 = 1759
+var var1760 = 1760
+var var1761 = 1761
+var var1762 = 1762
+var var1763 = 1763
+var var1764 = 1764
+var var1765 = 1765
+var var1766 = 1766
+var var1767 = 1767
+var var1768 = 1768
+var var1769 = 1769
+var var1770 = 1770
+var var1771 = 1771
+var var1772 = 1772
+var var1773 = 1773
+var var1774 = 1774
+var var1775 = 1775
+var var1776 = 1776
+var var1777 = 1777
+var var1778 = 1778
+var var1779 = 1779
+var var1780 = 1780
+var var1781 = 1781
+var var1782 = 1782
+var var1783 = 1783
+var var1784 = 1784
+var var1785 = 1785
+var var1786 = 1786
+var var1787 = 1787
+var var1788 = 1788
+var var1789 = 1789
+var var1790 = 1790
+var var1791 = 1791
+var var1792 = 1792
+var var1793 = 1793
+var var1794 = 1794
+var var1795 = 1795
+var var1796 = 1796
+var var1797 = 1797
+var var1798 = 1798
+var var1799 = 1799
+var var1800 = 1800
+var var1801 = 1801
+var var1802 = 1802
+var var1803 = 1803
+var var1804 = 1804
+var var1805 = 1805
+var var1806 = 1806
+var var1807 = 1807
+var var1808 = 1808
+var var1809 = 1809
+var var1810 = 1810
+var var1811 = 1811
+var var1812 = 1812
+var var1813 = 1813
+var var1814 = 1814
+var var1815 = 1815
+var var1816 = 1816
+var var1817 = 1817
+var var1818 = 1818
+var var1819 = 1819
+var var1820 = 1820
+var var1821 = 1821
+var var1822 = 1822
+var var1823 = 1823
+var var1824 = 1824
+var var1825 = 1825
+var var1826 = 1826
+var var1827 = 1827
+var var1828 = 1828
+var var1829 = 1829
+var var1830 = 1830
+var var1831 = 1831
+var var1832 = 1832
+var var1833 = 1833
+var var1834 = 1834
+var var1835 = 1835
+var var1836 = 1836
+var var1837 = 1837
+var var1838 = 1838
+var var1839 = 1839
+var var1840 = 1840
+var var1841 = 1841
+var var1842 = 1842
+var var1843 = 1843
+var var1844 = 1844
+var var1845 = 1845
+var var1846 = 1846
+var var1847 = 1847
+var var1848 = 1848
+var var1849 = 1849
+var var1850 = 1850
+var var1851 = 1851
+var var1852 = 1852
+var var1853 = 1853
+var var1854 = 1854
+var var1855 = 1855
+var var1856 = 1856
+var var1857 = 1857
+var var1858 = 1858
+var var1859 = 1859
+var var1860 = 1860
+var var1861 = 1861
+var var1862 = 1862
+var var1863 = 1863
+var var1864 = 1864
+var var1865 = 1865
+var var1866 = 1866
+var var1867 = 1867
+var var1868 = 1868
+var var1869 = 1869
+var var1870 = 1870
+var var1871 = 1871
+var var1872 = 1872
+var var1873 = 1873
+var var1874 = 1874
+var var1875 = 1875
+var var1876 = 1876
+var var1877 = 1877
+var var1878 = 1878
+var var1879 = 1879
+var var1880 = 1880
+var var1881 = 1881
+var var1882 = 1882
+var var1883 = 1883
+var var1884 = 1884
+var var1885 = 1885
+var var1886 = 1886
+var var1887 = 1887
+var var1888 = 1888
+var var1889 = 1889
+var var1890 = 1890
+var var1891 = 1891
+var var1892 = 1892
+var var1893 = 1893
+var var1894 = 1894
+var var1895 = 1895
+var var1896 = 1896
+var var1897 = 1897
+var var1898 = 1898
+var var1899 = 1899
+var var1900 = 1900
+var var1901 = 1901
+var var1902 = 1902
+var var1903 = 1903
+var var1904 = 1904
+var var1905 = 1905
+var var1906 = 1906
+var var1907 = 1907
+var var1908 = 1908
+var var1909 = 1909
+var var1910 = 1910
+var var1911 = 1911
+var var1912 = 1912
+var var1913 = 1913
+var var1914 = 1914
+var var1915 = 1915
+var var1916 = 1916
+var var1917 = 1917
+var var1918 = 1918
+var var1919 = 1919
+var var1920 = 1920
+var var1921 = 1921
+var var1922 = 1922
+var var1923 = 1923
+var var1924 = 1924
+var var1925 = 1925
+var var1926 = 1926
+var var1927 = 1927
+var var1928 = 1928
+var var1929 = 1929
+var var1930 = 1930
+var var1931 = 1931
+var var1932 = 1932
+var var1933 = 1933
+var var1934 = 1934
+var var1935 = 1935
+var var1936 = 1936
+var var1937 = 1937
+var var1938 = 1938
+var var1939 = 1939
+var var1940 = 1940
+var var1941 = 1941
+var var1942 = 1942
+var var1943 = 1943
+var var1944 = 1944
+var var1945 = 1945
+var var1946 = 1946
+var var1947 = 1947
+var var1948 = 1948
+var var1949 = 1949
+var var1950 = 1950
+var var1951 = 1951
+var var1952 = 1952
+var var1953 = 1953
+var var1954 = 1954
+var var1955 = 1955
+var var1956 = 1956
+var var1957 = 1957
+var var1958 = 1958
+var var1959 = 1959
+var var1960 = 1960
+var var1961 = 1961
+var var1962 = 1962
+var var1963 = 1963
+var var1964 = 1964
+var var1965 = 1965
+var var1966 = 1966
+var var1967 = 1967
+var var1968 = 1968
+var var1969 = 1969
+var var1970 = 1970
+var var1971 = 1971
+var var1972 = 1972
+var var1973 = 1973
+var var1974 = 1974
+var var1975 = 1975
+var var1976 = 1976
+var var1977 = 1977
+var var1978 = 1978
+var var1979 = 1979
+var var1980 = 1980
+var var1981 = 1981
+var var1982 = 1982
+var var1983 = 1983
+var var1984 = 1984
+var var1985 = 1985
+var var1986 = 1986
+var var1987 = 1987
+var var1988 = 1988
+var var1989 = 1989
+var var1990 = 1990
+var var1991 = 1991
+var var1992 = 1992
+var var1993 = 1993
+var var1994 = 1994
+var var1995 = 1995
+var var1996 = 1996
+var var1997 = 1997
+var var1998 = 1998
+var var1999 = 1999
+var var2000 = 2000
+var var2001 = 2001
+var var2002 = 2002
+var var2003 = 2003
+var var2004 = 2004
+var var2005 = 2005
+var var2006 = 2006
+var var2007 = 2007
+var var2008 = 2008
+var var2009 = 2009
+var var2010 = 2010
+var var2011 = 2011
+var var2012 = 2012
+var var2013 = 2013
+var var2014 = 2014
+var var2015 = 2015
+var var2016 = 2016
+var var2017 = 2017
+var var2018 = 2018
+var var2019 = 2019
+var var2020 = 2020
+var var2021 = 2021
+var var2022 = 2022
+var var2023 = 2023
+var var2024 = 2024
+var var2025 = 2025
+var var2026 = 2026
+var var2027 = 2027
+var var2028 = 2028
+var var2029 = 2029
+var var2030 = 2030
+var var2031 = 2031
+var var2032 = 2032
+var var2033 = 2033
+var var2034 = 2034
+var var2035 = 2035
+var var2036 = 2036
+var var2037 = 2037
+var var2038 = 2038
+var var2039 = 2039
+var var2040 = 2040
+var var2041 = 2041
+var var2042 = 2042
+var var2043 = 2043
+var var2044 = 2044
+var var2045 = 2045
+var var2046 = 2046
+var var2047 = 2047
+var var2048 = 2048
+var var2049 = 2049
+var var2050 = 2050
+var var2051 = 2051
+var var2052 = 2052
+var var2053 = 2053
+var var2054 = 2054
+var var2055 = 2055
+var var2056 = 2056
+var var2057 = 2057
+var var2058 = 2058
+var var2059 = 2059
+var var2060 = 2060
+var var2061 = 2061
+var var2062 = 2062
+var var2063 = 2063
+var var2064 = 2064
+var var2065 = 2065
+var var2066 = 2066
+var var2067 = 2067
+var var2068 = 2068
+var var2069 = 2069
+var var2070 = 2070
+var var2071 = 2071
+var var2072 = 2072
+var var2073 = 2073
+var var2074 = 2074
+var var2075 = 2075
+var var2076 = 2076
+var var2077 = 2077
+var var2078 = 2078
+var var2079 = 2079
+var var2080 = 2080
+var var2081 = 2081
+var var2082 = 2082
+var var2083 = 2083
+var var2084 = 2084
+var var2085 = 2085
+var var2086 = 2086
+var var2087 = 2087
+var var2088 = 2088
+var var2089 = 2089
+var var2090 = 2090
+var var2091 = 2091
+var var2092 = 2092
+var var2093 = 2093
+var var2094 = 2094
+var var2095 = 2095
+var var2096 = 2096
+var var2097 = 2097
+var var2098 = 2098
+var var2099 = 2099
+var var2100 = 2100
+var var2101 = 2101
+var var2102 = 2102
+var var2103 = 2103
+var var2104 = 2104
+var var2105 = 2105
+var var2106 = 2106
+var var2107 = 2107
+var var2108 = 2108
+var var2109 = 2109
+var var2110 = 2110
+var var2111 = 2111
+var var2112 = 2112
+var var2113 = 2113
+var var2114 = 2114
+var var2115 = 2115
+var var2116 = 2116
+var var2117 = 2117
+var var2118 = 2118
+var var2119 = 2119
+var var2120 = 2120
+var var2121 = 2121
+var var2122 = 2122
+var var2123 = 2123
+var var2124 = 2124
+var var2125 = 2125
+var var2126 = 2126
+var var2127 = 2127
+var var2128 = 2128
+var var2129 = 2129
+var var2130 = 2130
+var var2131 = 2131
+var var2132 = 2132
+var var2133 = 2133
+var var2134 = 2134
+var var2135 = 2135
+var var2136 = 2136
+var var2137 = 2137
+var var2138 = 2138
+var var2139 = 2139
+var var2140 = 2140
+var var2141 = 2141
+var var2142 = 2142
+var var2143 = 2143
+var var2144 = 2144
+var var2145 = 2145
+var var2146 = 2146
+var var2147 = 2147
+var var2148 = 2148
+var var2149 = 2149
+var var2150 = 2150
+var var2151 = 2151
+var var2152 = 2152
+var var2153 = 2153
+var var2154 = 2154
+var var2155 = 2155
+var var2156 = 2156
+var var2157 = 2157
+var var2158 = 2158
+var var2159 = 2159
+var var2160 = 2160
+var var2161 = 2161
+var var2162 = 2162
+var var2163 = 2163
+var var2164 = 2164
+var var2165 = 2165
+var var2166 = 2166
+var var2167 = 2167
+var var2168 = 2168
+var var2169 = 2169
+var var2170 = 2170
+var var2171 = 2171
+var var2172 = 2172
+var var2173 = 2173
+var var2174 = 2174
+var var2175 = 2175
+var var2176 = 2176
+var var2177 = 2177
+var var2178 = 2178
+var var2179 = 2179
+var var2180 = 2180
+var var2181 = 2181
+var var2182 = 2182
+var var2183 = 2183
+var var2184 = 2184
+var var2185 = 2185
+var var2186 = 2186
+var var2187 = 2187
+var var2188 = 2188
+var var2189 = 2189
+var var2190 = 2190
+var var2191 = 2191
+var var2192 = 2192
+var var2193 = 2193
+var var2194 = 2194
+var var2195 = 2195
+var var2196 = 2196
+var var2197 = 2197
+var var2198 = 2198
+var var2199 = 2199
+var var2200 = 2200
+var var2201 = 2201
+var var2202 = 2202
+var var2203 = 2203
+var var2204 = 2204
+var var2205 = 2205
+var var2206 = 2206
+var var2207 = 2207
+var var2208 = 2208
+var var2209 = 2209
+var var2210 = 2210
+var var2211 = 2211
+var var2212 = 2212
+var var2213 = 2213
+var var2214 = 2214
+var var2215 = 2215
+var var2216 = 2216
+var var2217 = 2217
+var var2218 = 2218
+var var2219 = 2219
+var var2220 = 2220
+var var2221 = 2221
+var var2222 = 2222
+var var2223 = 2223
+var var2224 = 2224
+var var2225 = 2225
+var var2226 = 2226
+var var2227 = 2227
+var var2228 = 2228
+var var2229 = 2229
+var var2230 = 2230
+var var2231 = 2231
+var var2232 = 2232
+var var2233 = 2233
+var var2234 = 2234
+var var2235 = 2235
+var var2236 = 2236
+var var2237 = 2237
+var var2238 = 2238
+var var2239 = 2239
+var var2240 = 2240
+var var2241 = 2241
+var var2242 = 2242
+var var2243 = 2243
+var var2244 = 2244
+var var2245 = 2245
+var var2246 = 2246
+var var2247 = 2247
+var var2248 = 2248
+var var2249 = 2249
+var var2250 = 2250
+var var2251 = 2251
+var var2252 = 2252
+var var2253 = 2253
+var var2254 = 2254
+var var2255 = 2255
+var var2256 = 2256
+var var2257 = 2257
+var var2258 = 2258
+var var2259 = 2259
+var var2260 = 2260
+var var2261 = 2261
+var var2262 = 2262
+var var2263 = 2263
+var var2264 = 2264
+var var2265 = 2265
+var var2266 = 2266
+var var2267 = 2267
+var var2268 = 2268
+var var2269 = 2269
+var var2270 = 2270
+var var2271 = 2271
+var var2272 = 2272
+var var2273 = 2273
+var var2274 = 2274
+var var2275 = 2275
+var var2276 = 2276
+var var2277 = 2277
+var var2278 = 2278
+var var2279 = 2279
+var var2280 = 2280
+var var2281 = 2281
+var var2282 = 2282
+var var2283 = 2283
+var var2284 = 2284
+var var2285 = 2285
+var var2286 = 2286
+var var2287 = 2287
+var var2288 = 2288
+var var2289 = 2289
+var var2290 = 2290
+var var2291 = 2291
+var var2292 = 2292
+var var2293 = 2293
+var var2294 = 2294
+var var2295 = 2295
+var var2296 = 2296
+var var2297 = 2297
+var var2298 = 2298
+var var2299 = 2299
+var var2300 = 2300
+var var2301 = 2301
+var var2302 = 2302
+var var2303 = 2303
+var var2304 = 2304
+var var2305 = 2305
+var var2306 = 2306
+var var2307 = 2307
+var var2308 = 2308
+var var2309 = 2309
+var var2310 = 2310
+var var2311 = 2311
+var var2312 = 2312
+var var2313 = 2313
+var var2314 = 2314
+var var2315 = 2315
+var var2316 = 2316
+var var2317 = 2317
+var var2318 = 2318
+var var2319 = 2319
+var var2320 = 2320
+var var2321 = 2321
+var var2322 = 2322
+var var2323 = 2323
+var var2324 = 2324
+var var2325 = 2325
+var var2326 = 2326
+var var2327 = 2327
+var var2328 = 2328
+var var2329 = 2329
+var var2330 = 2330
+var var2331 = 2331
+var var2332 = 2332
+var var2333 = 2333
+var var2334 = 2334
+var var2335 = 2335
+var var2336 = 2336
+var var2337 = 2337
+var var2338 = 2338
+var var2339 = 2339
+var var2340 = 2340
+var var2341 = 2341
+var var2342 = 2342
+var var2343 = 2343
+var var2344 = 2344
+var var2345 = 2345
+var var2346 = 2346
+var var2347 = 2347
+var var2348 = 2348
+var var2349 = 2349
+var var2350 = 2350
+var var2351 = 2351
+var var2352 = 2352
+var var2353 = 2353
+var var2354 = 2354
+var var2355 = 2355
+var var2356 = 2356
+var var2357 = 2357
+var var2358 = 2358
+var var2359 = 2359
+var var2360 = 2360
+var var2361 = 2361
+var var2362 = 2362
+var var2363 = 2363
+var var2364 = 2364
+var var2365 = 2365
+var var2366 = 2366
+var var2367 = 2367
+var var2368 = 2368
+var var2369 = 2369
+var var2370 = 2370
+var var2371 = 2371
+var var2372 = 2372
+var var2373 = 2373
+var var2374 = 2374
+var var2375 = 2375
+var var2376 = 2376
+var var2377 = 2377
+var var2378 = 2378
+var var2379 = 2379
+var var2380 = 2380
+var var2381 = 2381
+var var2382 = 2382
+var var2383 = 2383
+var var2384 = 2384
+var var2385 = 2385
+var var2386 = 2386
+var var2387 = 2387
+var var2388 = 2388
+var var2389 = 2389
+var var2390 = 2390
+var var2391 = 2391
+var var2392 = 2392
+var var2393 = 2393
+var var2394 = 2394
+var var2395 = 2395
+var var2396 = 2396
+var var2397 = 2397
+var var2398 = 2398
+var var2399 = 2399
+var var2400 = 2400
+var var2401 = 2401
+var var2402 = 2402
+var var2403 = 2403
+var var2404 = 2404
+var var2405 = 2405
+var var2406 = 2406
+var var2407 = 2407
+var var2408 = 2408
+var var2409 = 2409
+var var2410 = 2410
+var var2411 = 2411
+var var2412 = 2412
+var var2413 = 2413
+var var2414 = 2414
+var var2415 = 2415
+var var2416 = 2416
+var var2417 = 2417
+var var2418 = 2418
+var var2419 = 2419
+var var2420 = 2420
+var var2421 = 2421
+var var2422 = 2422
+var var2423 = 2423
+var var2424 = 2424
+var var2425 = 2425
+var var2426 = 2426
+var var2427 = 2427
+var var2428 = 2428
+var var2429 = 2429
+var var2430 = 2430
+var var2431 = 2431
+var var2432 = 2432
+var var2433 = 2433
+var var2434 = 2434
+var var2435 = 2435
+var var2436 = 2436
+var var2437 = 2437
+var var2438 = 2438
+var var2439 = 2439
+var var2440 = 2440
+var var2441 = 2441
+var var2442 = 2442
+var var2443 = 2443
+var var2444 = 2444
+var var2445 = 2445
+var var2446 = 2446
+var var2447 = 2447
+var var2448 = 2448
+var var2449 = 2449
+var var2450 = 2450
+var var2451 = 2451
+var var2452 = 2452
+var var2453 = 2453
+var var2454 = 2454
+var var2455 = 2455
+var var2456 = 2456
+var var2457 = 2457
+var var2458 = 2458
+var var2459 = 2459
+var var2460 = 2460
+var var2461 = 2461
+var var2462 = 2462
+var var2463 = 2463
+var var2464 = 2464
+var var2465 = 2465
+var var2466 = 2466
+var var2467 = 2467
+var var2468 = 2468
+var var2469 = 2469
+var var2470 = 2470
+var var2471 = 2471
+var var2472 = 2472
+var var2473 = 2473
+var var2474 = 2474
+var var2475 = 2475
+var var2476 = 2476
+var var2477 = 2477
+var var2478 = 2478
+var var2479 = 2479
+var var2480 = 2480
+var var2481 = 2481
+var var2482 = 2482
+var var2483 = 2483
+var var2484 = 2484
+var var2485 = 2485
+var var2486 = 2486
+var var2487 = 2487
+var var2488 = 2488
+var var2489 = 2489
+var var2490 = 2490
+var var2491 = 2491
+var var2492 = 2492
+var var2493 = 2493
+var var2494 = 2494
+var var2495 = 2495
+var var2496 = 2496
+var var2497 = 2497
+var var2498 = 2498
+var var2499 = 2499
+var var2500 = 2500
+var var2501 = 2501
+var var2502 = 2502
+var var2503 = 2503
+var var2504 = 2504
+var var2505 = 2505
+var var2506 = 2506
+var var2507 = 2507
+var var2508 = 2508
+var var2509 = 2509
+var var2510 = 2510
+var var2511 = 2511
+var var2512 = 2512
+var var2513 = 2513
+var var2514 = 2514
+var var2515 = 2515
+var var2516 = 2516
+var var2517 = 2517
+var var2518 = 2518
+var var2519 = 2519
+var var2520 = 2520
+var var2521 = 2521
+var var2522 = 2522
+var var2523 = 2523
+var var2524 = 2524
+var var2525 = 2525
+var var2526 = 2526
+var var2527 = 2527
+var var2528 = 2528
+var var2529 = 2529
+var var2530 = 2530
+var var2531 = 2531
+var var2532 = 2532
+var var2533 = 2533
+var var2534 = 2534
+var var2535 = 2535
+var var2536 = 2536
+var var2537 = 2537
+var var2538 = 2538
+var var2539 = 2539
+var var2540 = 2540
+var var2541 = 2541
+var var2542 = 2542
+var var2543 = 2543
+var var2544 = 2544
+var var2545 = 2545
+var var2546 = 2546
+var var2547 = 2547
+var var2548 = 2548
+var var2549 = 2549
+var var2550 = 2550
+var var2551 = 2551
+var var2552 = 2552
+var var2553 = 2553
+var var2554 = 2554
+var var2555 = 2555
+var var2556 = 2556
+var var2557 = 2557
+var var2558 = 2558
+var var2559 = 2559
+var var2560 = 2560
+var var2561 = 2561
+var var2562 = 2562
+var var2563 = 2563
+var var2564 = 2564
+var var2565 = 2565
+var var2566 = 2566
+var var2567 = 2567
+var var2568 = 2568
+var var2569 = 2569
+var var2570 = 2570
+var var2571 = 2571
+var var2572 = 2572
+var var2573 = 2573
+var var2574 = 2574
+var var2575 = 2575
+var var2576 = 2576
+var var2577 = 2577
+var var2578 = 2578
+var var2579 = 2579
+var var2580 = 2580
+var var2581 = 2581
+var var2582 = 2582
+var var2583 = 2583
+var var2584 = 2584
+var var2585 = 2585
+var var2586 = 2586
+var var2587 = 2587
+var var2588 = 2588
+var var2589 = 2589
+var var2590 = 2590
+var var2591 = 2591
+var var2592 = 2592
+var var2593 = 2593
+var var2594 = 2594
+var var2595 = 2595
+var var2596 = 2596
+var var2597 = 2597
+var var2598 = 2598
+var var2599 = 2599
+var var2600 = 2600
+var var2601 = 2601
+var var2602 = 2602
+var var2603 = 2603
+var var2604 = 2604
+var var2605 = 2605
+var var2606 = 2606
+var var2607 = 2607
+var var2608 = 2608
+var var2609 = 2609
+var var2610 = 2610
+var var2611 = 2611
+var var2612 = 2612
+var var2613 = 2613
+var var2614 = 2614
+var var2615 = 2615
+var var2616 = 2616
+var var2617 = 2617
+var var2618 = 2618
+var var2619 = 2619
+var var2620 = 2620
+var var2621 = 2621
+var var2622 = 2622
+var var2623 = 2623
+var var2624 = 2624
+var var2625 = 2625
+var var2626 = 2626
+var var2627 = 2627
+var var2628 = 2628
+var var2629 = 2629
+var var2630 = 2630
+var var2631 = 2631
+var var2632 = 2632
+var var2633 = 2633
+var var2634 = 2634
+var var2635 = 2635
+var var2636 = 2636
+var var2637 = 2637
+var var2638 = 2638
+var var2639 = 2639
+var var2640 = 2640
+var var2641 = 2641
+var var2642 = 2642
+var var2643 = 2643
+var var2644 = 2644
+var var2645 = 2645
+var var2646 = 2646
+var var2647 = 2647
+var var2648 = 2648
+var var2649 = 2649
+var var2650 = 2650
+var var2651 = 2651
+var var2652 = 2652
+var var2653 = 2653
+var var2654 = 2654
+var var2655 = 2655
+var var2656 = 2656
+var var2657 = 2657
+var var2658 = 2658
+var var2659 = 2659
+var var2660 = 2660
+var var2661 = 2661
+var var2662 = 2662
+var var2663 = 2663
+var var2664 = 2664
+var var2665 = 2665
+var var2666 = 2666
+var var2667 = 2667
+var var2668 = 2668
+var var2669 = 2669
+var var2670 = 2670
+var var2671 = 2671
+var var2672 = 2672
+var var2673 = 2673
+var var2674 = 2674
+var var2675 = 2675
+var var2676 = 2676
+var var2677 = 2677
+var var2678 = 2678
+var var2679 = 2679
+var var2680 = 2680
+var var2681 = 2681
+var var2682 = 2682
+var var2683 = 2683
+var var2684 = 2684
+var var2685 = 2685
+var var2686 = 2686
+var var2687 = 2687
+var var2688 = 2688
+var var2689 = 2689
+var var2690 = 2690
+var var2691 = 2691
+var var2692 = 2692
+var var2693 = 2693
+var var2694 = 2694
+var var2695 = 2695
+var var2696 = 2696
+var var2697 = 2697
+var var2698 = 2698
+var var2699 = 2699
+var var2700 = 2700
+var var2701 = 2701
+var var2702 = 2702
+var var2703 = 2703
+var var2704 = 2704
+var var2705 = 2705
+var var2706 = 2706
+var var2707 = 2707
+var var2708 = 2708
+var var2709 = 2709
+var var2710 = 2710
+var var2711 = 2711
+var var2712 = 2712
+var var2713 = 2713
+var var2714 = 2714
+var var2715 = 2715
+var var2716 = 2716
+var var2717 = 2717
+var var2718 = 2718
+var var2719 = 2719
+var var2720 = 2720
+var var2721 = 2721
+var var2722 = 2722
+var var2723 = 2723
+var var2724 = 2724
+var var2725 = 2725
+var var2726 = 2726
+var var2727 = 2727
+var var2728 = 2728
+var var2729 = 2729
+var var2730 = 2730
+var var2731 = 2731
+var var2732 = 2732
+var var2733 = 2733
+var var2734 = 2734
+var var2735 = 2735
+var var2736 = 2736
+var var2737 = 2737
+var var2738 = 2738
+var var2739 = 2739
+var var2740 = 2740
+var var2741 = 2741
+var var2742 = 2742
+var var2743 = 2743
+var var2744 = 2744
+var var2745 = 2745
+var var2746 = 2746
+var var2747 = 2747
+var var2748 = 2748
+var var2749 = 2749
+var var2750 = 2750
+var var2751 = 2751
+var var2752 = 2752
+var var2753 = 2753
+var var2754 = 2754
+var var2755 = 2755
+var var2756 = 2756
+var var2757 = 2757
+var var2758 = 2758
+var var2759 = 2759
+var var2760 = 2760
+var var2761 = 2761
+var var2762 = 2762
+var var2763 = 2763
+var var2764 = 2764
+var var2765 = 2765
+var var2766 = 2766
+var var2767 = 2767
+var var2768 = 2768
+var var2769 = 2769
+var var2770 = 2770
+var var2771 = 2771
+var var2772 = 2772
+var var2773 = 2773
+var var2774 = 2774
+var var2775 = 2775
+var var2776 = 2776
+var var2777 = 2777
+var var2778 = 2778
+var var2779 = 2779
+var var2780 = 2780
+var var2781 = 2781
+var var2782 = 2782
+var var2783 = 2783
+var var2784 = 2784
+var var2785 = 2785
+var var2786 = 2786
+var var2787 = 2787
+var var2788 = 2788
+var var2789 = 2789
+var var2790 = 2790
+var var2791 = 2791
+var var2792 = 2792
+var var2793 = 2793
+var var2794 = 2794
+var var2795 = 2795
+var var2796 = 2796
+var var2797 = 2797
+var var2798 = 2798
+var var2799 = 2799
+/*
+var var2800 = 2800
+var var2801 = 2801
+var var2802 = 2802
+var var2803 = 2803
+var var2804 = 2804
+var var2805 = 2805
+var var2806 = 2806
+var var2807 = 2807
+var var2808 = 2808
+var var2809 = 2809
+var var2810 = 2810
+var var2811 = 2811
+var var2812 = 2812
+var var2813 = 2813
+var var2814 = 2814
+var var2815 = 2815
+var var2816 = 2816
+var var2817 = 2817
+var var2818 = 2818
+var var2819 = 2819
+var var2820 = 2820
+var var2821 = 2821
+var var2822 = 2822
+var var2823 = 2823
+var var2824 = 2824
+var var2825 = 2825
+var var2826 = 2826
+var var2827 = 2827
+var var2828 = 2828
+var var2829 = 2829
+var var2830 = 2830
+var var2831 = 2831
+var var2832 = 2832
+var var2833 = 2833
+var var2834 = 2834
+var var2835 = 2835
+var var2836 = 2836
+var var2837 = 2837
+var var2838 = 2838
+var var2839 = 2839
+var var2840 = 2840
+var var2841 = 2841
+var var2842 = 2842
+var var2843 = 2843
+var var2844 = 2844
+var var2845 = 2845
+var var2846 = 2846
+var var2847 = 2847
+var var2848 = 2848
+var var2849 = 2849
+var var2850 = 2850
+var var2851 = 2851
+var var2852 = 2852
+var var2853 = 2853
+var var2854 = 2854
+var var2855 = 2855
+var var2856 = 2856
+var var2857 = 2857
+var var2858 = 2858
+var var2859 = 2859
+var var2860 = 2860
+var var2861 = 2861
+var var2862 = 2862
+var var2863 = 2863
+var var2864 = 2864
+var var2865 = 2865
+var var2866 = 2866
+var var2867 = 2867
+var var2868 = 2868
+var var2869 = 2869
+var var2870 = 2870
+var var2871 = 2871
+var var2872 = 2872
+var var2873 = 2873
+var var2874 = 2874
+var var2875 = 2875
+var var2876 = 2876
+var var2877 = 2877
+var var2878 = 2878
+var var2879 = 2879
+var var2880 = 2880
+var var2881 = 2881
+var var2882 = 2882
+var var2883 = 2883
+var var2884 = 2884
+var var2885 = 2885
+var var2886 = 2886
+var var2887 = 2887
+var var2888 = 2888
+var var2889 = 2889
+var var2890 = 2890
+var var2891 = 2891
+var var2892 = 2892
+var var2893 = 2893
+var var2894 = 2894
+var var2895 = 2895
+var var2896 = 2896
+var var2897 = 2897
+var var2898 = 2898
+var var2899 = 2899
+var var2900 = 2900
+var var2901 = 2901
+var var2902 = 2902
+var var2903 = 2903
+var var2904 = 2904
+var var2905 = 2905
+var var2906 = 2906
+var var2907 = 2907
+var var2908 = 2908
+var var2909 = 2909
+var var2910 = 2910
+var var2911 = 2911
+var var2912 = 2912
+var var2913 = 2913
+var var2914 = 2914
+var var2915 = 2915
+var var2916 = 2916
+var var2917 = 2917
+var var2918 = 2918
+var var2919 = 2919
+var var2920 = 2920
+var var2921 = 2921
+var var2922 = 2922
+var var2923 = 2923
+var var2924 = 2924
+var var2925 = 2925
+var var2926 = 2926
+var var2927 = 2927
+var var2928 = 2928
+var var2929 = 2929
+var var2930 = 2930
+var var2931 = 2931
+var var2932 = 2932
+var var2933 = 2933
+var var2934 = 2934
+var var2935 = 2935
+var var2936 = 2936
+var var2937 = 2937
+var var2938 = 2938
+var var2939 = 2939
+var var2940 = 2940
+var var2941 = 2941
+var var2942 = 2942
+var var2943 = 2943
+var var2944 = 2944
+var var2945 = 2945
+var var2946 = 2946
+var var2947 = 2947
+var var2948 = 2948
+var var2949 = 2949
+var var2950 = 2950
+var var2951 = 2951
+var var2952 = 2952
+var var2953 = 2953
+var var2954 = 2954
+var var2955 = 2955
+var var2956 = 2956
+var var2957 = 2957
+var var2958 = 2958
+var var2959 = 2959
+var var2960 = 2960
+var var2961 = 2961
+var var2962 = 2962
+var var2963 = 2963
+var var2964 = 2964
+var var2965 = 2965
+var var2966 = 2966
+var var2967 = 2967
+var var2968 = 2968
+var var2969 = 2969
+var var2970 = 2970
+var var2971 = 2971
+var var2972 = 2972
+var var2973 = 2973
+var var2974 = 2974
+var var2975 = 2975
+var var2976 = 2976
+var var2977 = 2977
+var var2978 = 2978
+var var2979 = 2979
+var var2980 = 2980
+var var2981 = 2981
+var var2982 = 2982
+var var2983 = 2983
+var var2984 = 2984
+var var2985 = 2985
+var var2986 = 2986
+var var2987 = 2987
+var var2988 = 2988
+var var2989 = 2989
+var var2990 = 2990
+var var2991 = 2991
+var var2992 = 2992
+var var2993 = 2993
+var var2994 = 2994
+var var2995 = 2995
+var var2996 = 2996
+var var2997 = 2997
+var var2998 = 2998
+var var2999 = 2999
+*/
diff --git a/nashorn/test/script/basic/NASHORN-47.js b/nashorn/test/script/basic/NASHORN-47.js
new file mode 100644
index 00000000000..fce835158c3
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-47.js
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-47 :  for .. in, for each.. in with "null" or undefined as iterated object should be no-ops.
+ *
+ * @test
+ * @run
+ * @un
+ */
+
+for (var i in null) {
+    print(i);
+}
+
+for (var j in undefined) {
+    print(j);
+}
+
+for each (var k in null) {
+    print(k);
+}
+
+for each (var l in null) {
+    print(l);
+}
diff --git a/nashorn/test/script/basic/NASHORN-473.js b/nashorn/test/script/basic/NASHORN-473.js
new file mode 100644
index 00000000000..021ae41df43
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-473.js
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-473 : Java primitive arrays can not be iterated with for.. in and for each .. in constructs
+ *
+ * @test
+ * @run
+ */
+
+var boolArr = java.lang.reflect.Array.newInstance(java.lang.Boolean.TYPE, 2);
+boolArr[0] = true;
+boolArr[1] = false;
+
+for (i in boolArr) {
+    print(i + " -> " + boolArr[i]);
+}
+
+for each (i in boolArr) {
+    print(i);
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-473.js.EXPECTED b/nashorn/test/script/basic/NASHORN-473.js.EXPECTED
new file mode 100644
index 00000000000..2beb990afb7
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-473.js.EXPECTED
@@ -0,0 +1,4 @@
+0 -> true
+1 -> false
+true
+false
diff --git a/nashorn/test/script/basic/NASHORN-474.js b/nashorn/test/script/basic/NASHORN-474.js
new file mode 100644
index 00000000000..30b03d052a0
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-474.js
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * NASHORN-474 : long index support for sparse arrays.
+ *
+ * @test
+ * @run
+ */
+
+var a = [];
+a[1] = 2;
+a[420000000] = 42;
+a[-1] = 13;
+
+print([a[420000000], a[1], a[-1]]);
+print(a.length);
+
+var b = [];
+b[0xfffffffe] = 0xfe;
+b[0xffffffff] = 0xff;
+b[-1] = -13;
+print([b[4294967294], b[4294967295], b[-1]]);
+print(b.length);
+
+var c = [,1];
+c[0x8ffffff0] = 2;
+c[0x8ffffff1] = 3;
+c[0x8fffffef] = 4;
+c[0] = 5;
+c[2] = 6;
+c[0x8ffffff3] = 7;
+print([c[0],c[1],c[2]] + ";" + [c[0x8fffffef],c[0x8ffffff0],c[0x8ffffff1],c[0x8ffffff2],c[0x8ffffff3]]);
+print(c.length);
diff --git a/nashorn/test/script/basic/NASHORN-474.js.EXPECTED b/nashorn/test/script/basic/NASHORN-474.js.EXPECTED
new file mode 100644
index 00000000000..d89898b2580
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-474.js.EXPECTED
@@ -0,0 +1,6 @@
+42,2,13
+420000001
+254,255,-13
+4294967295
+5,1,6;4,2,3,,7
+2415919092
diff --git a/nashorn/test/script/basic/NASHORN-478.js b/nashorn/test/script/basic/NASHORN-478.js
new file mode 100644
index 00000000000..b2601f210d5
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-478.js
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-478 : Provide mozilla compatibility script for nashorn
+ *
+ * @test
+ * @run
+ */
+
+// compatibility script is loaded using "nashorn:" pseudo URL scheme
+try {
+    load('nashorn:mozilla_compat.js');
+} catch(e) {
+}
+
+var obj = {};
+if (obj.__proto__ !== Object.prototype) {
+    fail("#1 obj.__proto__ read not supported");
+}
+
+function fooGetter() { return 3.14; }
+function fooSetter(x) {}
+
+Object.defineProperty(obj, "foo", { set: fooSetter, get: fooGetter });
+if (!obj.__lookupGetter__ || obj.__lookupGetter__('foo') !== fooGetter) {
+    fail("#2 Object.prototype.__lookupGetter__ not supported");
+}
+
+if (!obj.__lookupSetter__ || obj.__lookupSetter__('foo') !== fooSetter) {
+    fail("#3 Object.prototype.__lookupSetter__ not supported");
+}
+
+function barGetter() { return 42; }
+
+if (obj.__defineGetter__) {
+    obj.__defineGetter__("bar", barGetter);
+}
+
+if (obj.bar !== 42) {
+    fail("#4 Object.prototype.__defineGetter__ not supported");
+}
+
+var barSetterCalled = false;
+function barSetter(x) {
+    barSetterCalled = true;
+}
+
+if (obj.__defineSetter__) {
+    obj.__defineSetter__("bar", barSetter);
+}
+
+obj.bar = 'hello';
+if (! barSetterCalled) {
+    fail("#5 Object.prototype.__defineSetter__ not supported");
+}
+
+var obj = { bar: 343, foo : new Boolean(true) };
+obj.self = obj;
+if (!obj.toSource ||
+    obj.toSource() !== '({bar:343, foo:(new Boolean(true)), self:{}})') {
+    fail("#6 Object.prototype.toSource method failed");
+}
+
+// check String html generation methods
+if (!'sss'.anchor || "sss".anchor("foo") !== '<a name="foo">sss</a>') {
+    fail("#7 String.prototype.anchor method failed");
+}
+
+if (!'hello'.blink || "hello".blink() !== '<blink>hello</blink>') {
+    fail("#8 String.prototype.blink method failed");
+}
+
+if (!'hello'.fixed || "hello".fixed() !== '<tt>hello</tt>') {
+    fail("#9 String.prototype.fixed method failed");
+}
+
+if (!'ss'.link || "ss".link('foo') !== '<a href="foo">ss</a>') {
+    fail("#10 String.prototype.link method failed");
+}
+
+if (typeof importClass != 'function') {
+    fail("#11 importClass function not defined");
+}
+
+importClass(java.util.HashMap);
+if (typeof HashMap != 'function') {
+    fail("#12 global.importClass method failed");
+}
+var m = new HashMap();
+m.put('foo', 'bar');
+if (m.toString() != '{foo=bar}') {
+    fail("#13 global.importClass failed to work");
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-48.js b/nashorn/test/script/basic/NASHORN-48.js
new file mode 100644
index 00000000000..e9734af4a44
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-48.js
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-48
+ *
+ * @test
+ * @run
+ */
+
+function loop3() {
+    for (var i = 0; i < 5; i++) { 
+	print(i);
+	throw "ERROR";
+    }
+    print("dead");
+}
+
+try {
+    loop3();
+} catch (e) {
+    print(e);
+}
+ 
+function loop4() {
+    var i = 0;
+    while (i++ < 5) {
+	print(i);
+	throw "ERROR";
+    }
+    print("dead");
+}
+
+try {    
+    loop4();
+} catch (e) {
+    print(e);
+}
+
+function loop5() {
+    var i = 0;
+    do {
+	print(i);
+	throw "ERROR";
+    } while (i++ < 5);
+    print("dead");
+}
+
+try {    
+    loop5();
+} catch (e) {
+    print(e);
+}
diff --git a/nashorn/test/script/basic/NASHORN-48.js.EXPECTED b/nashorn/test/script/basic/NASHORN-48.js.EXPECTED
new file mode 100644
index 00000000000..0ebc6f8a309
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-48.js.EXPECTED
@@ -0,0 +1,6 @@
+0
+ERROR
+1
+ERROR
+0
+ERROR
diff --git a/nashorn/test/script/basic/NASHORN-481.js b/nashorn/test/script/basic/NASHORN-481.js
new file mode 100644
index 00000000000..9b7abafec6c
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-481.js
@@ -0,0 +1,10035 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * NASHORN-481 : Array too large to initialize in a single method.
+ *
+ * @test
+ * @run
+ */
+
+var largeTable = [
+  {
+    "tag": "titillation",
+    "popularity": 4294967296
+  },
+  {
+    "tag": "foamless",
+    "popularity": 1257718401
+  },
+  {
+    "tag": "snarler",
+    "popularity": 613166183
+  },
+  {
+    "tag": "multangularness",
+    "popularity": 368304452
+  },
+  {
+    "tag": "Fesapo unventurous",
+    "popularity": 248026512
+  },
+  {
+    "tag": "esthesioblast",
+    "popularity": 179556755
+  },
+  {
+    "tag": "echeneidoid",
+    "popularity": 136641578
+  },
+  {
+    "tag": "embryoctony",
+    "popularity": 107852576
+  },
+  {
+    "tag": "undilatory",
+    "popularity": 87537981
+  },
+  {
+    "tag": "predisregard",
+    "popularity": 72630939
+  },
+  {
+    "tag": "allergenic",
+    "popularity": 61345190
+  },
+  {
+    "tag": "uncloudy",
+    "popularity": 52580571
+  },
+  {
+    "tag": "unforeseeably",
+    "popularity": 45628109
+  },
+  {
+    "tag": "sturniform",
+    "popularity": 40013489
+  },
+  {
+    "tag": "anesthetize",
+    "popularity": 35409226
+  },
+  {
+    "tag": "ametabolia",
+    "popularity": 31583050
+  },
+  {
+    "tag": "angiopathy",
+    "popularity": 28366350
+  },
+  {
+    "tag": "sultanaship",
+    "popularity": 25634218
+  },
+  {
+    "tag": "Frenchwise",
+    "popularity": 23292461
+  },
+  {
+    "tag": "cerviconasal",
+    "popularity": 21268909
+  },
+  {
+    "tag": "mercurialness",
+    "popularity": 19507481
+  },
+  {
+    "tag": "glutelin venditate",
+    "popularity": 17964042
+  },
+  {
+    "tag": "acred overblack",
+    "popularity": 16603454
+  },
+  {
+    "tag": "Atik",
+    "popularity": 15397451
+  },
+  {
+    "tag": "puncturer",
+    "popularity": 14323077
+  },
+  {
+    "tag": "pukatea",
+    "popularity": 13361525
+  },
+  {
+    "tag": "suberize",
+    "popularity": 12497261
+  },
+  {
+    "tag": "Godfrey",
+    "popularity": 11717365
+  },
+  {
+    "tag": "tetraptote",
+    "popularity": 11011011
+  },
+  {
+    "tag": "lucidness",
+    "popularity": 10369074
+  },
+  {
+    "tag": "tartness",
+    "popularity": 9783815
+  },
+  {
+    "tag": "axfetch",
+    "popularity": 9248634
+  },
+  {
+    "tag": "preacquittal",
+    "popularity": 8757877
+  },
+  {
+    "tag": "matris",
+    "popularity": 8306671
+  },
+  {
+    "tag": "hyphenate",
+    "popularity": 7890801
+  },
+  {
+    "tag": "semifabulous",
+    "popularity": 7506606
+  },
+  {
+    "tag": "oppressiveness",
+    "popularity": 7150890
+  },
+  {
+    "tag": "Protococcales",
+    "popularity": 6820856
+  },
+  {
+    "tag": "unpreventive",
+    "popularity": 6514045
+  },
+  {
+    "tag": "Cordia",
+    "popularity": 6228289
+  },
+  {
+    "tag": "Wakamba leaflike",
+    "popularity": 5961668
+  },
+  {
+    "tag": "dacryoma",
+    "popularity": 5712480
+  },
+  {
+    "tag": "inguinal",
+    "popularity": 5479211
+  },
+  {
+    "tag": "responseless",
+    "popularity": 5260507
+  },
+  {
+    "tag": "supplementarily",
+    "popularity": 5055158
+  },
+  {
+    "tag": "emu",
+    "popularity": 4862079
+  },
+  {
+    "tag": "countermeet",
+    "popularity": 4680292
+  },
+  {
+    "tag": "purrer",
+    "popularity": 4508918
+  },
+  {
+    "tag": "Corallinaceae",
+    "popularity": 4347162
+  },
+  {
+    "tag": "speculum",
+    "popularity": 4194304
+  },
+  {
+    "tag": "crimpness",
+    "popularity": 4049690
+  },
+  {
+    "tag": "antidetonant",
+    "popularity": 3912727
+  },
+  {
+    "tag": "topeewallah",
+    "popularity": 3782875
+  },
+  {
+    "tag": "fidalgo ballant",
+    "popularity": 3659640
+  },
+  {
+    "tag": "utriculose",
+    "popularity": 3542572
+  },
+  {
+    "tag": "testata",
+    "popularity": 3431259
+  },
+  {
+    "tag": "beltmaking",
+    "popularity": 3325322
+  },
+  {
+    "tag": "necrotype",
+    "popularity": 3224413
+  },
+  {
+    "tag": "ovistic",
+    "popularity": 3128215
+  },
+  {
+    "tag": "swindlership",
+    "popularity": 3036431
+  },
+  {
+    "tag": "augustal",
+    "popularity": 2948792
+  },
+  {
+    "tag": "Titoist",
+    "popularity": 2865047
+  },
+  {
+    "tag": "trisoctahedral",
+    "popularity": 2784963
+  },
+  {
+    "tag": "sequestrator",
+    "popularity": 2708327
+  },
+  {
+    "tag": "sideburns",
+    "popularity": 2634939
+  },
+  {
+    "tag": "paraphrasia",
+    "popularity": 2564616
+  },
+  {
+    "tag": "graminology unbay",
+    "popularity": 2497185
+  },
+  {
+    "tag": "acaridomatium emargination",
+    "popularity": 2432487
+  },
+  {
+    "tag": "roofward",
+    "popularity": 2370373
+  },
+  {
+    "tag": "lauder",
+    "popularity": 2310705
+  },
+  {
+    "tag": "subjunctive",
+    "popularity": 2253354
+  },
+  {
+    "tag": "subelongate",
+    "popularity": 2198199
+  },
+  {
+    "tag": "guacimo",
+    "popularity": 2145128
+  },
+  {
+    "tag": "cockade",
+    "popularity": 2094033
+  },
+  {
+    "tag": "misgauge",
+    "popularity": 2044818
+  },
+  {
+    "tag": "unexpensive",
+    "popularity": 1997388
+  },
+  {
+    "tag": "chebel",
+    "popularity": 1951657
+  },
+  {
+    "tag": "unpursuing",
+    "popularity": 1907543
+  },
+  {
+    "tag": "kilobar",
+    "popularity": 1864969
+  },
+  {
+    "tag": "obsecration",
+    "popularity": 1823863
+  },
+  {
+    "tag": "nacarine",
+    "popularity": 1784157
+  },
+  {
+    "tag": "spirituosity",
+    "popularity": 1745787
+  },
+  {
+    "tag": "movableness deity",
+    "popularity": 1708692
+  },
+  {
+    "tag": "exostracism",
+    "popularity": 1672816
+  },
+  {
+    "tag": "archipterygium",
+    "popularity": 1638104
+  },
+  {
+    "tag": "monostrophic",
+    "popularity": 1604506
+  },
+  {
+    "tag": "gynecide",
+    "popularity": 1571974
+  },
+  {
+    "tag": "gladden",
+    "popularity": 1540462
+  },
+  {
+    "tag": "throughbred",
+    "popularity": 1509927
+  },
+  {
+    "tag": "groper",
+    "popularity": 1480329
+  },
+  {
+    "tag": "Xenosaurus",
+    "popularity": 1451628
+  },
+  {
+    "tag": "photoetcher",
+    "popularity": 1423788
+  },
+  {
+    "tag": "glucosid",
+    "popularity": 1396775
+  },
+  {
+    "tag": "Galtonian",
+    "popularity": 1370555
+  },
+  {
+    "tag": "mesosporic",
+    "popularity": 1345097
+  },
+  {
+    "tag": "theody",
+    "popularity": 1320370
+  },
+  {
+    "tag": "zaffer",
+    "popularity": 1296348
+  },
+  {
+    "tag": "probiology",
+    "popularity": 1273003
+  },
+  {
+    "tag": "rhizomic",
+    "popularity": 1250308
+  },
+  {
+    "tag": "superphosphate",
+    "popularity": 1228240
+  },
+  {
+    "tag": "Hippolytan",
+    "popularity": 1206776
+  },
+  {
+    "tag": "garget",
+    "popularity": 1185892
+  },
+  {
+    "tag": "diploplacula",
+    "popularity": 1165568
+  },
+  {
+    "tag": "orohydrographical",
+    "popularity": 1145785
+  },
+  {
+    "tag": "enhypostatize",
+    "popularity": 1126521
+  },
+  {
+    "tag": "polisman",
+    "popularity": 1107759
+  },
+  {
+    "tag": "acetometer",
+    "popularity": 1089482
+  },
+  {
+    "tag": "unsnatched",
+    "popularity": 1071672
+  },
+  {
+    "tag": "yabber",
+    "popularity": 1054313
+  },
+  {
+    "tag": "demiwolf",
+    "popularity": 1037390
+  },
+  {
+    "tag": "chromascope",
+    "popularity": 1020888
+  },
+  {
+    "tag": "seamanship",
+    "popularity": 1004794
+  },
+  {
+    "tag": "nonfenestrated",
+    "popularity": 989092
+  },
+  {
+    "tag": "hydrophytism",
+    "popularity": 973771
+  },
+  {
+    "tag": "dotter",
+    "popularity": 958819
+  },
+  {
+    "tag": "thermoperiodism",
+    "popularity": 944222
+  },
+  {
+    "tag": "unlawyerlike",
+    "popularity": 929970
+  },
+  {
+    "tag": "enantiomeride citywards",
+    "popularity": 916052
+  },
+  {
+    "tag": "unmetallurgical",
+    "popularity": 902456
+  },
+  {
+    "tag": "prickled",
+    "popularity": 889174
+  },
+  {
+    "tag": "strangerwise manioc",
+    "popularity": 876195
+  },
+  {
+    "tag": "incisorial",
+    "popularity": 863510
+  },
+  {
+    "tag": "irrationalize",
+    "popularity": 851110
+  },
+  {
+    "tag": "nasology",
+    "popularity": 838987
+  },
+  {
+    "tag": "fatuism",
+    "popularity": 827131
+  },
+  {
+    "tag": "Huk",
+    "popularity": 815535
+  },
+  {
+    "tag": "properispomenon",
+    "popularity": 804192
+  },
+  {
+    "tag": "unpummelled",
+    "popularity": 793094
+  },
+  {
+    "tag": "technographically",
+    "popularity": 782233
+  },
+  {
+    "tag": "underfurnish",
+    "popularity": 771603
+  },
+  {
+    "tag": "sinter",
+    "popularity": 761198
+  },
+  {
+    "tag": "lateroanterior",
+    "popularity": 751010
+  },
+  {
+    "tag": "nonpersonification",
+    "popularity": 741034
+  },
+  {
+    "tag": "Sitophilus",
+    "popularity": 731264
+  },
+  {
+    "tag": "unstudded overexerted",
+    "popularity": 721694
+  },
+  {
+    "tag": "tracheation",
+    "popularity": 712318
+  },
+  {
+    "tag": "thirteenth begloze",
+    "popularity": 703131
+  },
+  {
+    "tag": "bespice",
+    "popularity": 694129
+  },
+  {
+    "tag": "doppia",
+    "popularity": 685305
+  },
+  {
+    "tag": "unadorned",
+    "popularity": 676656
+  },
+  {
+    "tag": "dovelet engraff",
+    "popularity": 668176
+  },
+  {
+    "tag": "diphyozooid",
+    "popularity": 659862
+  },
+  {
+    "tag": "mure",
+    "popularity": 651708
+  },
+  {
+    "tag": "Tripitaka",
+    "popularity": 643710
+  },
+  {
+    "tag": "Billjim",
+    "popularity": 635865
+  },
+  {
+    "tag": "pyramidical",
+    "popularity": 628169
+  },
+  {
+    "tag": "circumlocutionist",
+    "popularity": 620617
+  },
+  {
+    "tag": "slapstick",
+    "popularity": 613207
+  },
+  {
+    "tag": "preobedience",
+    "popularity": 605934
+  },
+  {
+    "tag": "unfriarlike",
+    "popularity": 598795
+  },
+  {
+    "tag": "microchromosome",
+    "popularity": 591786
+  },
+  {
+    "tag": "Orphicism",
+    "popularity": 584905
+  },
+  {
+    "tag": "peel",
+    "popularity": 578149
+  },
+  {
+    "tag": "obediential",
+    "popularity": 571514
+  },
+  {
+    "tag": "Peripatidea",
+    "popularity": 564997
+  },
+  {
+    "tag": "undoubtful",
+    "popularity": 558596
+  },
+  {
+    "tag": "lodgeable",
+    "popularity": 552307
+  },
+  {
+    "tag": "pustulated woodchat",
+    "popularity": 546129
+  },
+  {
+    "tag": "antepast",
+    "popularity": 540057
+  },
+  {
+    "tag": "sagittoid matrimoniously",
+    "popularity": 534091
+  },
+  {
+    "tag": "Albizzia",
+    "popularity": 528228
+  },
+  {
+    "tag": "Elateridae unnewness",
+    "popularity": 522464
+  },
+  {
+    "tag": "convertingness",
+    "popularity": 516798
+  },
+  {
+    "tag": "Pelew",
+    "popularity": 511228
+  },
+  {
+    "tag": "recapitulation",
+    "popularity": 505751
+  },
+  {
+    "tag": "shack",
+    "popularity": 500365
+  },
+  {
+    "tag": "unmellowed",
+    "popularity": 495069
+  },
+  {
+    "tag": "pavis capering",
+    "popularity": 489859
+  },
+  {
+    "tag": "fanfare",
+    "popularity": 484735
+  },
+  {
+    "tag": "sole",
+    "popularity": 479695
+  },
+  {
+    "tag": "subarcuate",
+    "popularity": 474735
+  },
+  {
+    "tag": "multivious",
+    "popularity": 469856
+  },
+  {
+    "tag": "squandermania",
+    "popularity": 465054
+  },
+  {
+    "tag": "scintle",
+    "popularity": 460329
+  },
+  {
+    "tag": "hash chirognomic",
+    "popularity": 455679
+  },
+  {
+    "tag": "linseed",
+    "popularity": 451101
+  },
+  {
+    "tag": "redoubtable",
+    "popularity": 446596
+  },
+  {
+    "tag": "poachy reimpact",
+    "popularity": 442160
+  },
+  {
+    "tag": "limestone",
+    "popularity": 437792
+  },
+  {
+    "tag": "serranid",
+    "popularity": 433492
+  },
+  {
+    "tag": "pohna",
+    "popularity": 429258
+  },
+  {
+    "tag": "warwolf",
+    "popularity": 425088
+  },
+  {
+    "tag": "ruthenous",
+    "popularity": 420981
+  },
+  {
+    "tag": "dover",
+    "popularity": 416935
+  },
+  {
+    "tag": "deuteroalbumose",
+    "popularity": 412950
+  },
+  {
+    "tag": "pseudoprophetic",
+    "popularity": 409025
+  },
+  {
+    "tag": "dissoluteness",
+    "popularity": 405157
+  },
+  {
+    "tag": "preinvention",
+    "popularity": 401347
+  },
+  {
+    "tag": "swagbellied",
+    "popularity": 397592
+  },
+  {
+    "tag": "Ophidia",
+    "popularity": 393892
+  },
+  {
+    "tag": "equanimity",
+    "popularity": 390245
+  },
+  {
+    "tag": "troutful",
+    "popularity": 386651
+  },
+  {
+    "tag": "uke",
+    "popularity": 383108
+  },
+  {
+    "tag": "preacquaint",
+    "popularity": 379616
+  },
+  {
+    "tag": "shoq",
+    "popularity": 376174
+  },
+  {
+    "tag": "yox",
+    "popularity": 372780
+  },
+  {
+    "tag": "unelemental",
+    "popularity": 369434
+  },
+  {
+    "tag": "Yavapai",
+    "popularity": 366134
+  },
+  {
+    "tag": "joulean",
+    "popularity": 362880
+  },
+  {
+    "tag": "dracontine",
+    "popularity": 359672
+  },
+  {
+    "tag": "hardmouth",
+    "popularity": 356507
+  },
+  {
+    "tag": "sylvanize",
+    "popularity": 353386
+  },
+  {
+    "tag": "intraparenchymatous meadowbur",
+    "popularity": 350308
+  },
+  {
+    "tag": "uncharily",
+    "popularity": 347271
+  },
+  {
+    "tag": "redtab flexibly",
+    "popularity": 344275
+  },
+  {
+    "tag": "centervelic",
+    "popularity": 341319
+  },
+  {
+    "tag": "unravellable",
+    "popularity": 338403
+  },
+  {
+    "tag": "infortunately",
+    "popularity": 335526
+  },
+  {
+    "tag": "cannel",
+    "popularity": 332687
+  },
+  {
+    "tag": "oxyblepsia",
+    "popularity": 329885
+  },
+  {
+    "tag": "Damon",
+    "popularity": 327120
+  },
+  {
+    "tag": "etherin",
+    "popularity": 324391
+  },
+  {
+    "tag": "luminal",
+    "popularity": 321697
+  },
+  {
+    "tag": "interrogatorily presbyte",
+    "popularity": 319038
+  },
+  {
+    "tag": "hemiclastic",
+    "popularity": 316414
+  },
+  {
+    "tag": "poh flush",
+    "popularity": 313823
+  },
+  {
+    "tag": "Psoroptes",
+    "popularity": 311265
+  },
+  {
+    "tag": "dispirit",
+    "popularity": 308740
+  },
+  {
+    "tag": "nashgab",
+    "popularity": 306246
+  },
+  {
+    "tag": "Aphidiinae",
+    "popularity": 303784
+  },
+  {
+    "tag": "rhapsody nonconstruction",
+    "popularity": 301353
+  },
+  {
+    "tag": "Osmond",
+    "popularity": 298952
+  },
+  {
+    "tag": "Leonis",
+    "popularity": 296581
+  },
+  {
+    "tag": "Lemnian",
+    "popularity": 294239
+  },
+  {
+    "tag": "acetonic gnathonic",
+    "popularity": 291926
+  },
+  {
+    "tag": "surculus",
+    "popularity": 289641
+  },
+  {
+    "tag": "diagonally",
+    "popularity": 287384
+  },
+  {
+    "tag": "counterpenalty",
+    "popularity": 285154
+  },
+  {
+    "tag": "Eugenie",
+    "popularity": 282952
+  },
+  {
+    "tag": "hornbook",
+    "popularity": 280776
+  },
+  {
+    "tag": "miscoin",
+    "popularity": 278626
+  },
+  {
+    "tag": "admi",
+    "popularity": 276501
+  },
+  {
+    "tag": "Tarmac",
+    "popularity": 274402
+  },
+  {
+    "tag": "inexplicable",
+    "popularity": 272328
+  },
+  {
+    "tag": "rascallion",
+    "popularity": 270278
+  },
+  {
+    "tag": "dusterman",
+    "popularity": 268252
+  },
+  {
+    "tag": "osteostomous unhoroscopic",
+    "popularity": 266250
+  },
+  {
+    "tag": "spinibulbar",
+    "popularity": 264271
+  },
+  {
+    "tag": "phototelegraphically",
+    "popularity": 262315
+  },
+  {
+    "tag": "Manihot",
+    "popularity": 260381
+  },
+  {
+    "tag": "neighborhood",
+    "popularity": 258470
+  },
+  {
+    "tag": "Vincetoxicum",
+    "popularity": 256581
+  },
+  {
+    "tag": "khirka",
+    "popularity": 254713
+  },
+  {
+    "tag": "conscriptive",
+    "popularity": 252866
+  },
+  {
+    "tag": "synechthran",
+    "popularity": 251040
+  },
+  {
+    "tag": "Guttiferales",
+    "popularity": 249235
+  },
+  {
+    "tag": "roomful",
+    "popularity": 247450
+  },
+  {
+    "tag": "germinal",
+    "popularity": 245685
+  },
+  {
+    "tag": "untraitorous",
+    "popularity": 243939
+  },
+  {
+    "tag": "nondissenting",
+    "popularity": 242213
+  },
+  {
+    "tag": "amotion",
+    "popularity": 240506
+  },
+  {
+    "tag": "badious",
+    "popularity": 238817
+  },
+  {
+    "tag": "sumpit",
+    "popularity": 237147
+  },
+  {
+    "tag": "ectozoic",
+    "popularity": 235496
+  },
+  {
+    "tag": "elvet",
+    "popularity": 233862
+  },
+  {
+    "tag": "underclerk",
+    "popularity": 232246
+  },
+  {
+    "tag": "reticency",
+    "popularity": 230647
+  },
+  {
+    "tag": "neutroclusion",
+    "popularity": 229065
+  },
+  {
+    "tag": "unbelieving",
+    "popularity": 227500
+  },
+  {
+    "tag": "histogenetic",
+    "popularity": 225952
+  },
+  {
+    "tag": "dermamyiasis",
+    "popularity": 224421
+  },
+  {
+    "tag": "telenergy",
+    "popularity": 222905
+  },
+  {
+    "tag": "axiomatic",
+    "popularity": 221406
+  },
+  {
+    "tag": "undominoed",
+    "popularity": 219922
+  },
+  {
+    "tag": "periosteoma",
+    "popularity": 218454
+  },
+  {
+    "tag": "justiciaryship",
+    "popularity": 217001
+  },
+  {
+    "tag": "autoluminescence",
+    "popularity": 215563
+  },
+  {
+    "tag": "osmous",
+    "popularity": 214140
+  },
+  {
+    "tag": "borgh",
+    "popularity": 212731
+  },
+  {
+    "tag": "bedebt",
+    "popularity": 211337
+  },
+  {
+    "tag": "considerableness adenoidism",
+    "popularity": 209957
+  },
+  {
+    "tag": "sailorizing",
+    "popularity": 208592
+  },
+  {
+    "tag": "Montauk",
+    "popularity": 207240
+  },
+  {
+    "tag": "Bridget",
+    "popularity": 205901
+  },
+  {
+    "tag": "Gekkota",
+    "popularity": 204577
+  },
+  {
+    "tag": "subcorymbose",
+    "popularity": 203265
+  },
+  {
+    "tag": "undersap",
+    "popularity": 201967
+  },
+  {
+    "tag": "poikilothermic",
+    "popularity": 200681
+  },
+  {
+    "tag": "enneatical",
+    "popularity": 199409
+  },
+  {
+    "tag": "martinetism",
+    "popularity": 198148
+  },
+  {
+    "tag": "sustanedly",
+    "popularity": 196901
+  },
+  {
+    "tag": "declaration",
+    "popularity": 195665
+  },
+  {
+    "tag": "myringoplasty",
+    "popularity": 194442
+  },
+  {
+    "tag": "Ginkgo",
+    "popularity": 193230
+  },
+  {
+    "tag": "unrecurrent",
+    "popularity": 192031
+  },
+  {
+    "tag": "proprecedent",
+    "popularity": 190843
+  },
+  {
+    "tag": "roadman",
+    "popularity": 189666
+  },
+  {
+    "tag": "elemin",
+    "popularity": 188501
+  },
+  {
+    "tag": "maggot",
+    "popularity": 187347
+  },
+  {
+    "tag": "alitrunk",
+    "popularity": 186204
+  },
+  {
+    "tag": "introspection",
+    "popularity": 185071
+  },
+  {
+    "tag": "batiker",
+    "popularity": 183950
+  },
+  {
+    "tag": "backhatch oversettle",
+    "popularity": 182839
+  },
+  {
+    "tag": "thresherman",
+    "popularity": 181738
+  },
+  {
+    "tag": "protemperance",
+    "popularity": 180648
+  },
+  {
+    "tag": "undern",
+    "popularity": 179568
+  },
+  {
+    "tag": "tweeg",
+    "popularity": 178498
+  },
+  {
+    "tag": "crosspath",
+    "popularity": 177438
+  },
+  {
+    "tag": "Tangaridae",
+    "popularity": 176388
+  },
+  {
+    "tag": "scrutation",
+    "popularity": 175348
+  },
+  {
+    "tag": "piecemaker",
+    "popularity": 174317
+  },
+  {
+    "tag": "paster",
+    "popularity": 173296
+  },
+  {
+    "tag": "unpretendingness",
+    "popularity": 172284
+  },
+  {
+    "tag": "inframundane",
+    "popularity": 171281
+  },
+  {
+    "tag": "kiblah",
+    "popularity": 170287
+  },
+  {
+    "tag": "playwrighting",
+    "popularity": 169302
+  },
+  {
+    "tag": "gonepoiesis snowslip",
+    "popularity": 168326
+  },
+  {
+    "tag": "hoodwise",
+    "popularity": 167359
+  },
+  {
+    "tag": "postseason",
+    "popularity": 166401
+  },
+  {
+    "tag": "equivocality",
+    "popularity": 165451
+  },
+  {
+    "tag": "Opiliaceae nuclease",
+    "popularity": 164509
+  },
+  {
+    "tag": "sextipara",
+    "popularity": 163576
+  },
+  {
+    "tag": "weeper",
+    "popularity": 162651
+  },
+  {
+    "tag": "frambesia",
+    "popularity": 161735
+  },
+  {
+    "tag": "answerable",
+    "popularity": 160826
+  },
+  {
+    "tag": "Trichosporum",
+    "popularity": 159925
+  },
+  {
+    "tag": "cajuputol",
+    "popularity": 159033
+  },
+  {
+    "tag": "pleomorphous",
+    "popularity": 158148
+  },
+  {
+    "tag": "aculeolate",
+    "popularity": 157270
+  },
+  {
+    "tag": "wherever",
+    "popularity": 156400
+  },
+  {
+    "tag": "collapse",
+    "popularity": 155538
+  },
+  {
+    "tag": "porky",
+    "popularity": 154683
+  },
+  {
+    "tag": "perule",
+    "popularity": 153836
+  },
+  {
+    "tag": "Nevada",
+    "popularity": 152996
+  },
+  {
+    "tag": "conalbumin",
+    "popularity": 152162
+  },
+  {
+    "tag": "tsunami",
+    "popularity": 151336
+  },
+  {
+    "tag": "Gulf",
+    "popularity": 150517
+  },
+  {
+    "tag": "hertz",
+    "popularity": 149705
+  },
+  {
+    "tag": "limmock",
+    "popularity": 148900
+  },
+  {
+    "tag": "Tartarize",
+    "popularity": 148101
+  },
+  {
+    "tag": "entosphenoid",
+    "popularity": 147310
+  },
+  {
+    "tag": "ibis",
+    "popularity": 146524
+  },
+  {
+    "tag": "unyeaned",
+    "popularity": 145746
+  },
+  {
+    "tag": "tritural",
+    "popularity": 144973
+  },
+  {
+    "tag": "hundredary",
+    "popularity": 144207
+  },
+  {
+    "tag": "stolonlike",
+    "popularity": 143448
+  },
+  {
+    "tag": "chorister",
+    "popularity": 142694
+  },
+  {
+    "tag": "mismove",
+    "popularity": 141947
+  },
+  {
+    "tag": "Andine",
+    "popularity": 141206
+  },
+  {
+    "tag": "Annette proneur escribe",
+    "popularity": 140471
+  },
+  {
+    "tag": "exoperidium",
+    "popularity": 139742
+  },
+  {
+    "tag": "disedge",
+    "popularity": 139019
+  },
+  {
+    "tag": "hypochloruria",
+    "popularity": 138302
+  },
+  {
+    "tag": "prepupa",
+    "popularity": 137590
+  },
+  {
+    "tag": "assent",
+    "popularity": 136884
+  },
+  {
+    "tag": "hydrazobenzene",
+    "popularity": 136184
+  },
+  {
+    "tag": "emballonurid",
+    "popularity": 135489
+  },
+  {
+    "tag": "roselle",
+    "popularity": 134800
+  },
+  {
+    "tag": "unifiedly",
+    "popularity": 134117
+  },
+  {
+    "tag": "clang",
+    "popularity": 133439
+  },
+  {
+    "tag": "acetolytic",
+    "popularity": 132766
+  },
+  {
+    "tag": "cladodont",
+    "popularity": 132098
+  },
+  {
+    "tag": "recoast",
+    "popularity": 131436
+  },
+  {
+    "tag": "celebrated tydie Eocarboniferous",
+    "popularity": 130779
+  },
+  {
+    "tag": "superconsciousness",
+    "popularity": 130127
+  },
+  {
+    "tag": "soberness",
+    "popularity": 129480
+  },
+  {
+    "tag": "panoramist",
+    "popularity": 128838
+  },
+  {
+    "tag": "Orbitolina",
+    "popularity": 128201
+  },
+  {
+    "tag": "overlewd",
+    "popularity": 127569
+  },
+  {
+    "tag": "demiquaver",
+    "popularity": 126942
+  },
+  {
+    "tag": "kamelaukion",
+    "popularity": 126319
+  },
+  {
+    "tag": "flancard",
+    "popularity": 125702
+  },
+  {
+    "tag": "tricuspid",
+    "popularity": 125089
+  },
+  {
+    "tag": "bepelt",
+    "popularity": 124480
+  },
+  {
+    "tag": "decuplet",
+    "popularity": 123877
+  },
+  {
+    "tag": "Rockies",
+    "popularity": 123278
+  },
+  {
+    "tag": "unforgeability",
+    "popularity": 122683
+  },
+  {
+    "tag": "mocha",
+    "popularity": 122093
+  },
+  {
+    "tag": "scrunge",
+    "popularity": 121507
+  },
+  {
+    "tag": "delighter",
+    "popularity": 120926
+  },
+  {
+    "tag": "willey Microtinae",
+    "popularity": 120349
+  },
+  {
+    "tag": "unhuntable",
+    "popularity": 119777
+  },
+  {
+    "tag": "historically",
+    "popularity": 119208
+  },
+  {
+    "tag": "vicegerentship",
+    "popularity": 118644
+  },
+  {
+    "tag": "hemangiosarcoma",
+    "popularity": 118084
+  },
+  {
+    "tag": "harpago",
+    "popularity": 117528
+  },
+  {
+    "tag": "unionoid",
+    "popularity": 116976
+  },
+  {
+    "tag": "wiseman",
+    "popularity": 116429
+  },
+  {
+    "tag": "diclinism",
+    "popularity": 115885
+  },
+  {
+    "tag": "Maud",
+    "popularity": 115345
+  },
+  {
+    "tag": "scaphocephalism",
+    "popularity": 114809
+  },
+  {
+    "tag": "obtenebration",
+    "popularity": 114277
+  },
+  {
+    "tag": "cymar predreadnought",
+    "popularity": 113749
+  },
+  {
+    "tag": "discommend",
+    "popularity": 113225
+  },
+  {
+    "tag": "crude",
+    "popularity": 112704
+  },
+  {
+    "tag": "upflash",
+    "popularity": 112187
+  },
+  {
+    "tag": "saltimbank",
+    "popularity": 111674
+  },
+  {
+    "tag": "posthysterical",
+    "popularity": 111165
+  },
+  {
+    "tag": "trample",
+    "popularity": 110659
+  },
+  {
+    "tag": "ungirthed",
+    "popularity": 110157
+  },
+  {
+    "tag": "unshakable",
+    "popularity": 109658
+  },
+  {
+    "tag": "hepatocystic",
+    "popularity": 109163
+  },
+  {
+    "tag": "psammophyte",
+    "popularity": 108671
+  },
+  {
+    "tag": "millionfold",
+    "popularity": 108183
+  },
+  {
+    "tag": "outtaste",
+    "popularity": 107698
+  },
+  {
+    "tag": "poppycockish",
+    "popularity": 107217
+  },
+  {
+    "tag": "viduine",
+    "popularity": 106739
+  },
+  {
+    "tag": "pleasureman",
+    "popularity": 106264
+  },
+  {
+    "tag": "cholesterolemia",
+    "popularity": 105792
+  },
+  {
+    "tag": "hostlerwife",
+    "popularity": 105324
+  },
+  {
+    "tag": "figure undergrass",
+    "popularity": 104859
+  },
+  {
+    "tag": "bedrape",
+    "popularity": 104398
+  },
+  {
+    "tag": "nuttishness",
+    "popularity": 103939
+  },
+  {
+    "tag": "fow",
+    "popularity": 103484
+  },
+  {
+    "tag": "rachianesthesia",
+    "popularity": 103031
+  },
+  {
+    "tag": "recruitable",
+    "popularity": 102582
+  },
+  {
+    "tag": "semianatomical Oenotheraceae",
+    "popularity": 102136
+  },
+  {
+    "tag": "extracapsular",
+    "popularity": 101693
+  },
+  {
+    "tag": "unsigneted",
+    "popularity": 101253
+  },
+  {
+    "tag": "fissural",
+    "popularity": 100816
+  },
+  {
+    "tag": "ayous",
+    "popularity": 100381
+  },
+  {
+    "tag": "crestfallenness odontograph",
+    "popularity": 99950
+  },
+  {
+    "tag": "monopodium",
+    "popularity": 99522
+  },
+  {
+    "tag": "germfree",
+    "popularity": 99096
+  },
+  {
+    "tag": "dauphin",
+    "popularity": 98673
+  },
+  {
+    "tag": "nonagesimal",
+    "popularity": 98254
+  },
+  {
+    "tag": "waterchat",
+    "popularity": 97836
+  },
+  {
+    "tag": "Entelodon",
+    "popularity": 97422
+  },
+  {
+    "tag": "semischolastic",
+    "popularity": 97010
+  },
+  {
+    "tag": "somata",
+    "popularity": 96602
+  },
+  {
+    "tag": "expositorily",
+    "popularity": 96195
+  },
+  {
+    "tag": "bass",
+    "popularity": 95792
+  },
+  {
+    "tag": "calorimetry",
+    "popularity": 95391
+  },
+  {
+    "tag": "entireness",
+    "popularity": 94993
+  },
+  {
+    "tag": "ratline soppiness",
+    "popularity": 94597
+  },
+  {
+    "tag": "shor",
+    "popularity": 94204
+  },
+  {
+    "tag": "coprecipitation",
+    "popularity": 93813
+  },
+  {
+    "tag": "unblushingly",
+    "popularity": 93425
+  },
+  {
+    "tag": "macarize",
+    "popularity": 93040
+  },
+  {
+    "tag": "scruplesomeness",
+    "popularity": 92657
+  },
+  {
+    "tag": "offsaddle",
+    "popularity": 92276
+  },
+  {
+    "tag": "hypertragical",
+    "popularity": 91898
+  },
+  {
+    "tag": "uncassock loined",
+    "popularity": 91522
+  },
+  {
+    "tag": "interlobate",
+    "popularity": 91149
+  },
+  {
+    "tag": "releasor orrisroot stoloniferously",
+    "popularity": 90778
+  },
+  {
+    "tag": "elementoid",
+    "popularity": 90410
+  },
+  {
+    "tag": "Lentilla",
+    "popularity": 90043
+  },
+  {
+    "tag": "distressing",
+    "popularity": 89679
+  },
+  {
+    "tag": "hydrodrome",
+    "popularity": 89318
+  },
+  {
+    "tag": "Jeannette",
+    "popularity": 88958
+  },
+  {
+    "tag": "Kuli",
+    "popularity": 88601
+  },
+  {
+    "tag": "taxinomist",
+    "popularity": 88246
+  },
+  {
+    "tag": "southwestwardly",
+    "popularity": 87894
+  },
+  {
+    "tag": "polyparia",
+    "popularity": 87543
+  },
+  {
+    "tag": "exmeridian",
+    "popularity": 87195
+  },
+  {
+    "tag": "splenius regimentaled",
+    "popularity": 86849
+  },
+  {
+    "tag": "Sphaeropsidaceae",
+    "popularity": 86505
+  },
+  {
+    "tag": "unbegun",
+    "popularity": 86163
+  },
+  {
+    "tag": "something",
+    "popularity": 85823
+  },
+  {
+    "tag": "contaminable nonexpulsion",
+    "popularity": 85486
+  },
+  {
+    "tag": "douser",
+    "popularity": 85150
+  },
+  {
+    "tag": "prostrike",
+    "popularity": 84817
+  },
+  {
+    "tag": "worky",
+    "popularity": 84485
+  },
+  {
+    "tag": "folliful",
+    "popularity": 84156
+  },
+  {
+    "tag": "prioracy",
+    "popularity": 83828
+  },
+  {
+    "tag": "undermentioned",
+    "popularity": 83503
+  },
+  {
+    "tag": "Judaica",
+    "popularity": 83179
+  },
+  {
+    "tag": "multifarious",
+    "popularity": 82858
+  },
+  {
+    "tag": "poogye",
+    "popularity": 82538
+  },
+  {
+    "tag": "Sparganium",
+    "popularity": 82221
+  },
+  {
+    "tag": "thurrock",
+    "popularity": 81905
+  },
+  {
+    "tag": "outblush",
+    "popularity": 81591
+  },
+  {
+    "tag": "Strophanthus supraordination",
+    "popularity": 81279
+  },
+  {
+    "tag": "gingerroot",
+    "popularity": 80969
+  },
+  {
+    "tag": "unconscient",
+    "popularity": 80661
+  },
+  {
+    "tag": "unconstitutionally",
+    "popularity": 80354
+  },
+  {
+    "tag": "plaguily",
+    "popularity": 80050
+  },
+  {
+    "tag": "waterily equatorwards",
+    "popularity": 79747
+  },
+  {
+    "tag": "nondeposition",
+    "popularity": 79446
+  },
+  {
+    "tag": "dronishly",
+    "popularity": 79147
+  },
+  {
+    "tag": "gateado",
+    "popularity": 78849
+  },
+  {
+    "tag": "dislink",
+    "popularity": 78553
+  },
+  {
+    "tag": "Joceline",
+    "popularity": 78259
+  },
+  {
+    "tag": "amphiboliferous",
+    "popularity": 77967
+  },
+  {
+    "tag": "bushrope",
+    "popularity": 77676
+  },
+  {
+    "tag": "plumicorn sulphosalicylic",
+    "popularity": 77387
+  },
+  {
+    "tag": "nonefficiency",
+    "popularity": 77100
+  },
+  {
+    "tag": "hieroscopy",
+    "popularity": 76815
+  },
+  {
+    "tag": "causativeness",
+    "popularity": 76531
+  },
+  {
+    "tag": "swird paleoeremology",
+    "popularity": 76249
+  },
+  {
+    "tag": "camphoric",
+    "popularity": 75968
+  },
+  {
+    "tag": "retaining",
+    "popularity": 75689
+  },
+  {
+    "tag": "thyreoprotein",
+    "popularity": 75411
+  },
+  {
+    "tag": "carbona",
+    "popularity": 75136
+  },
+  {
+    "tag": "protectively",
+    "popularity": 74861
+  },
+  {
+    "tag": "mosasaur",
+    "popularity": 74589
+  },
+  {
+    "tag": "reciprocator",
+    "popularity": 74317
+  },
+  {
+    "tag": "detentive",
+    "popularity": 74048
+  },
+  {
+    "tag": "supravital",
+    "popularity": 73780
+  },
+  {
+    "tag": "Vespertilionidae",
+    "popularity": 73513
+  },
+  {
+    "tag": "parka",
+    "popularity": 73248
+  },
+  {
+    "tag": "pickaway",
+    "popularity": 72984
+  },
+  {
+    "tag": "oleaceous",
+    "popularity": 72722
+  },
+  {
+    "tag": "anticogitative",
+    "popularity": 72462
+  },
+  {
+    "tag": "woe",
+    "popularity": 72203
+  },
+  {
+    "tag": "skeuomorph",
+    "popularity": 71945
+  },
+  {
+    "tag": "helpmeet",
+    "popularity": 71689
+  },
+  {
+    "tag": "Hexactinellida brickmaking",
+    "popularity": 71434
+  },
+  {
+    "tag": "resink",
+    "popularity": 71180
+  },
+  {
+    "tag": "diluter",
+    "popularity": 70928
+  },
+  {
+    "tag": "micromicron",
+    "popularity": 70677
+  },
+  {
+    "tag": "parentage",
+    "popularity": 70428
+  },
+  {
+    "tag": "galactorrhoea",
+    "popularity": 70180
+  },
+  {
+    "tag": "gey",
+    "popularity": 69934
+  },
+  {
+    "tag": "gesticulatory",
+    "popularity": 69689
+  },
+  {
+    "tag": "wergil",
+    "popularity": 69445
+  },
+  {
+    "tag": "Lecanora",
+    "popularity": 69202
+  },
+  {
+    "tag": "malanders karst",
+    "popularity": 68961
+  },
+  {
+    "tag": "vibetoite",
+    "popularity": 68721
+  },
+  {
+    "tag": "unrequitedness",
+    "popularity": 68483
+  },
+  {
+    "tag": "outwash",
+    "popularity": 68245
+  },
+  {
+    "tag": "unsacred",
+    "popularity": 68009
+  },
+  {
+    "tag": "unabetted dividend",
+    "popularity": 67775
+  },
+  {
+    "tag": "untraveling",
+    "popularity": 67541
+  },
+  {
+    "tag": "thermobattery",
+    "popularity": 67309
+  },
+  {
+    "tag": "polypragmist",
+    "popularity": 67078
+  },
+  {
+    "tag": "irrefutableness",
+    "popularity": 66848
+  },
+  {
+    "tag": "remiges",
+    "popularity": 66620
+  },
+  {
+    "tag": "implode",
+    "popularity": 66393
+  },
+  {
+    "tag": "superfluousness",
+    "popularity": 66166
+  },
+  {
+    "tag": "croakily unalleviated",
+    "popularity": 65942
+  },
+  {
+    "tag": "edicule",
+    "popularity": 65718
+  },
+  {
+    "tag": "entophytous",
+    "popularity": 65495
+  },
+  {
+    "tag": "benefactorship Toryish",
+    "popularity": 65274
+  },
+  {
+    "tag": "pseudoamateurish",
+    "popularity": 65054
+  },
+  {
+    "tag": "flueless Iguanodontoidea snipnose",
+    "popularity": 64835
+  },
+  {
+    "tag": "zealotical Zamicrus interpole",
+    "popularity": 64617
+  },
+  {
+    "tag": "whereabout",
+    "popularity": 64401
+  },
+  {
+    "tag": "benzazide",
+    "popularity": 64185
+  },
+  {
+    "tag": "pokeweed",
+    "popularity": 63971
+  },
+  {
+    "tag": "calamitoid",
+    "popularity": 63757
+  },
+  {
+    "tag": "sporozoal",
+    "popularity": 63545
+  },
+  {
+    "tag": "physcioid Welshwoman",
+    "popularity": 63334
+  },
+  {
+    "tag": "wanting",
+    "popularity": 63124
+  },
+  {
+    "tag": "unencumbering",
+    "popularity": 62915
+  },
+  {
+    "tag": "Tupi",
+    "popularity": 62707
+  },
+  {
+    "tag": "potbank",
+    "popularity": 62501
+  },
+  {
+    "tag": "bulked",
+    "popularity": 62295
+  },
+  {
+    "tag": "uparise",
+    "popularity": 62090
+  },
+  {
+    "tag": "Sudra",
+    "popularity": 61887
+  },
+  {
+    "tag": "hyperscrupulosity",
+    "popularity": 61684
+  },
+  {
+    "tag": "subterraneously unmaid",
+    "popularity": 61483
+  },
+  {
+    "tag": "poisonousness",
+    "popularity": 61282
+  },
+  {
+    "tag": "phare",
+    "popularity": 61083
+  },
+  {
+    "tag": "dicynodont",
+    "popularity": 60884
+  },
+  {
+    "tag": "chewer",
+    "popularity": 60687
+  },
+  {
+    "tag": "uliginous",
+    "popularity": 60490
+  },
+  {
+    "tag": "tinman",
+    "popularity": 60295
+  },
+  {
+    "tag": "coconut",
+    "popularity": 60100
+  },
+  {
+    "tag": "phryganeoid",
+    "popularity": 59907
+  },
+  {
+    "tag": "bismillah",
+    "popularity": 59714
+  },
+  {
+    "tag": "tautomeric",
+    "popularity": 59523
+  },
+  {
+    "tag": "jerquer",
+    "popularity": 59332
+  },
+  {
+    "tag": "Dryopithecinae",
+    "popularity": 59143
+  },
+  {
+    "tag": "ghizite",
+    "popularity": 58954
+  },
+  {
+    "tag": "unliveable",
+    "popularity": 58766
+  },
+  {
+    "tag": "craftsmaster",
+    "popularity": 58579
+  },
+  {
+    "tag": "semiscenic",
+    "popularity": 58394
+  },
+  {
+    "tag": "danaid",
+    "popularity": 58209
+  },
+  {
+    "tag": "flawful",
+    "popularity": 58025
+  },
+  {
+    "tag": "risibleness",
+    "popularity": 57841
+  },
+  {
+    "tag": "Muscovite",
+    "popularity": 57659
+  },
+  {
+    "tag": "snaringly",
+    "popularity": 57478
+  },
+  {
+    "tag": "brilliantwise",
+    "popularity": 57297
+  },
+  {
+    "tag": "plebeity",
+    "popularity": 57118
+  },
+  {
+    "tag": "historicalness",
+    "popularity": 56939
+  },
+  {
+    "tag": "piecemeal",
+    "popularity": 56761
+  },
+  {
+    "tag": "maxillipedary",
+    "popularity": 56584
+  },
+  {
+    "tag": "Hypenantron",
+    "popularity": 56408
+  },
+  {
+    "tag": "quaintness avigate",
+    "popularity": 56233
+  },
+  {
+    "tag": "ave",
+    "popularity": 56059
+  },
+  {
+    "tag": "mediaevally",
+    "popularity": 55885
+  },
+  {
+    "tag": "brucite",
+    "popularity": 55712
+  },
+  {
+    "tag": "Schwendenerian",
+    "popularity": 55541
+  },
+  {
+    "tag": "julole",
+    "popularity": 55370
+  },
+  {
+    "tag": "palaeolith",
+    "popularity": 55199
+  },
+  {
+    "tag": "cotyledonary",
+    "popularity": 55030
+  },
+  {
+    "tag": "rond",
+    "popularity": 54861
+  },
+  {
+    "tag": "boomster tassoo",
+    "popularity": 54694
+  },
+  {
+    "tag": "cattishly",
+    "popularity": 54527
+  },
+  {
+    "tag": "tonguefence",
+    "popularity": 54360
+  },
+  {
+    "tag": "hexastylar triskele",
+    "popularity": 54195
+  },
+  {
+    "tag": "ariot",
+    "popularity": 54030
+  },
+  {
+    "tag": "intarsist",
+    "popularity": 53867
+  },
+  {
+    "tag": "Oscines",
+    "popularity": 53704
+  },
+  {
+    "tag": "Spaniolize",
+    "popularity": 53541
+  },
+  {
+    "tag": "smellfungus",
+    "popularity": 53380
+  },
+  {
+    "tag": "redisplay",
+    "popularity": 53219
+  },
+  {
+    "tag": "phosphene",
+    "popularity": 53059
+  },
+  {
+    "tag": "phycomycete",
+    "popularity": 52900
+  },
+  {
+    "tag": "prophetic",
+    "popularity": 52741
+  },
+  {
+    "tag": "overtrustful",
+    "popularity": 52584
+  },
+  {
+    "tag": "pinitol",
+    "popularity": 52427
+  },
+  {
+    "tag": "asthmatic",
+    "popularity": 52270
+  },
+  {
+    "tag": "convulsive",
+    "popularity": 52115
+  },
+  {
+    "tag": "draughtswoman",
+    "popularity": 51960
+  },
+  {
+    "tag": "unetymologizable",
+    "popularity": 51806
+  },
+  {
+    "tag": "centrarchoid",
+    "popularity": 51652
+  },
+  {
+    "tag": "mesioincisal",
+    "popularity": 51500
+  },
+  {
+    "tag": "transbaikal",
+    "popularity": 51348
+  },
+  {
+    "tag": "silveriness",
+    "popularity": 51196
+  },
+  {
+    "tag": "costotomy",
+    "popularity": 51046
+  },
+  {
+    "tag": "caracore",
+    "popularity": 50896
+  },
+  {
+    "tag": "depotentiation",
+    "popularity": 50747
+  },
+  {
+    "tag": "glossoepiglottidean",
+    "popularity": 50598
+  },
+  {
+    "tag": "upswell",
+    "popularity": 50450
+  },
+  {
+    "tag": "flecnodal",
+    "popularity": 50303
+  },
+  {
+    "tag": "coventrate",
+    "popularity": 50157
+  },
+  {
+    "tag": "duchesse",
+    "popularity": 50011
+  },
+  {
+    "tag": "excisemanship trophied",
+    "popularity": 49866
+  },
+  {
+    "tag": "cytinaceous",
+    "popularity": 49721
+  },
+  {
+    "tag": "assuringly",
+    "popularity": 49577
+  },
+  {
+    "tag": "unconducted upliftitis",
+    "popularity": 49434
+  },
+  {
+    "tag": "rachicentesis",
+    "popularity": 49292
+  },
+  {
+    "tag": "antiangular",
+    "popularity": 49150
+  },
+  {
+    "tag": "advisal",
+    "popularity": 49008
+  },
+  {
+    "tag": "birdcatcher",
+    "popularity": 48868
+  },
+  {
+    "tag": "secularistic",
+    "popularity": 48728
+  },
+  {
+    "tag": "grandeeism superinformal",
+    "popularity": 48588
+  },
+  {
+    "tag": "unapprehension",
+    "popularity": 48449
+  },
+  {
+    "tag": "excipulum",
+    "popularity": 48311
+  },
+  {
+    "tag": "decimole",
+    "popularity": 48174
+  },
+  {
+    "tag": "semidrachm",
+    "popularity": 48037
+  },
+  {
+    "tag": "uvulotome",
+    "popularity": 47901
+  },
+  {
+    "tag": "Lemaneaceae",
+    "popularity": 47765
+  },
+  {
+    "tag": "corrade",
+    "popularity": 47630
+  },
+  {
+    "tag": "Kuroshio",
+    "popularity": 47495
+  },
+  {
+    "tag": "Araliophyllum",
+    "popularity": 47361
+  },
+  {
+    "tag": "victoriousness cardiosphygmograph",
+    "popularity": 47228
+  },
+  {
+    "tag": "reinvent",
+    "popularity": 47095
+  },
+  {
+    "tag": "Macrotolagus",
+    "popularity": 46963
+  },
+  {
+    "tag": "strenuousness",
+    "popularity": 46831
+  },
+  {
+    "tag": "deviability",
+    "popularity": 46700
+  },
+  {
+    "tag": "phyllospondylous",
+    "popularity": 46570
+  },
+  {
+    "tag": "bisect rudderhole",
+    "popularity": 46440
+  },
+  {
+    "tag": "crownwork",
+    "popularity": 46311
+  },
+  {
+    "tag": "Ascalabota",
+    "popularity": 46182
+  },
+  {
+    "tag": "prostatomyomectomy",
+    "popularity": 46054
+  },
+  {
+    "tag": "neurosyphilis",
+    "popularity": 45926
+  },
+  {
+    "tag": "tabloid scraplet",
+    "popularity": 45799
+  },
+  {
+    "tag": "nonmedullated servility",
+    "popularity": 45673
+  },
+  {
+    "tag": "melopoeic practicalization",
+    "popularity": 45547
+  },
+  {
+    "tag": "nonrhythmic",
+    "popularity": 45421
+  },
+  {
+    "tag": "deplorer",
+    "popularity": 45296
+  },
+  {
+    "tag": "Ophion",
+    "popularity": 45172
+  },
+  {
+    "tag": "subprioress",
+    "popularity": 45048
+  },
+  {
+    "tag": "semiregular",
+    "popularity": 44925
+  },
+  {
+    "tag": "praelection",
+    "popularity": 44802
+  },
+  {
+    "tag": "discinct",
+    "popularity": 44680
+  },
+  {
+    "tag": "preplace",
+    "popularity": 44558
+  },
+  {
+    "tag": "paternoster",
+    "popularity": 44437
+  },
+  {
+    "tag": "suboccipital",
+    "popularity": 44316
+  },
+  {
+    "tag": "Teutophil",
+    "popularity": 44196
+  },
+  {
+    "tag": "tracheole",
+    "popularity": 44076
+  },
+  {
+    "tag": "subsmile",
+    "popularity": 43957
+  },
+  {
+    "tag": "nonapostatizing",
+    "popularity": 43839
+  },
+  {
+    "tag": "cleidotomy",
+    "popularity": 43720
+  },
+  {
+    "tag": "hingle",
+    "popularity": 43603
+  },
+  {
+    "tag": "jocoque",
+    "popularity": 43486
+  },
+  {
+    "tag": "trundler notidanian",
+    "popularity": 43369
+  },
+  {
+    "tag": "strangling misdaub",
+    "popularity": 43253
+  },
+  {
+    "tag": "noncancellable",
+    "popularity": 43137
+  },
+  {
+    "tag": "lavabo",
+    "popularity": 43022
+  },
+  {
+    "tag": "lanterloo",
+    "popularity": 42907
+  },
+  {
+    "tag": "uncitizenly",
+    "popularity": 42793
+  },
+  {
+    "tag": "autoturning",
+    "popularity": 42679
+  },
+  {
+    "tag": "Haganah",
+    "popularity": 42566
+  },
+  {
+    "tag": "Glecoma",
+    "popularity": 42453
+  },
+  {
+    "tag": "membered",
+    "popularity": 42341
+  },
+  {
+    "tag": "consuetudinal",
+    "popularity": 42229
+  },
+  {
+    "tag": "gatehouse",
+    "popularity": 42117
+  },
+  {
+    "tag": "tetherball",
+    "popularity": 42006
+  },
+  {
+    "tag": "counterrevolutionist numismatical",
+    "popularity": 41896
+  },
+  {
+    "tag": "pagehood plateiasmus",
+    "popularity": 41786
+  },
+  {
+    "tag": "pelterer",
+    "popularity": 41676
+  },
+  {
+    "tag": "splenemphraxis",
+    "popularity": 41567
+  },
+  {
+    "tag": "Crypturidae",
+    "popularity": 41458
+  },
+  {
+    "tag": "caboodle",
+    "popularity": 41350
+  },
+  {
+    "tag": "Filaria",
+    "popularity": 41242
+  },
+  {
+    "tag": "noninvincibility",
+    "popularity": 41135
+  },
+  {
+    "tag": "preadvertisement",
+    "popularity": 41028
+  },
+  {
+    "tag": "bathrobe",
+    "popularity": 40921
+  },
+  {
+    "tag": "nitrifier",
+    "popularity": 40815
+  },
+  {
+    "tag": "furthermore",
+    "popularity": 40709
+  },
+  {
+    "tag": "recrate",
+    "popularity": 40604
+  },
+  {
+    "tag": "inexist",
+    "popularity": 40499
+  },
+  {
+    "tag": "Mocoan",
+    "popularity": 40395
+  },
+  {
+    "tag": "forint",
+    "popularity": 40291
+  },
+  {
+    "tag": "cardiomyoliposis",
+    "popularity": 40187
+  },
+  {
+    "tag": "channeling",
+    "popularity": 40084
+  },
+  {
+    "tag": "quebrachine",
+    "popularity": 39981
+  },
+  {
+    "tag": "magistery",
+    "popularity": 39879
+  },
+  {
+    "tag": "koko",
+    "popularity": 39777
+  },
+  {
+    "tag": "nobilify",
+    "popularity": 39676
+  },
+  {
+    "tag": "articulate taprooted",
+    "popularity": 39575
+  },
+  {
+    "tag": "cardiotonic Nicaragua",
+    "popularity": 39474
+  },
+  {
+    "tag": "assertiveness",
+    "popularity": 39374
+  },
+  {
+    "tag": "springtail",
+    "popularity": 39274
+  },
+  {
+    "tag": "spontoon",
+    "popularity": 39174
+  },
+  {
+    "tag": "plesiobiosis",
+    "popularity": 39075
+  },
+  {
+    "tag": "rooinek",
+    "popularity": 38976
+  },
+  {
+    "tag": "hairif falsehood",
+    "popularity": 38878
+  },
+  {
+    "tag": "synodally",
+    "popularity": 38780
+  },
+  {
+    "tag": "biodynamics",
+    "popularity": 38683
+  },
+  {
+    "tag": "trickling",
+    "popularity": 38585
+  },
+  {
+    "tag": "oxfly daystar",
+    "popularity": 38489
+  },
+  {
+    "tag": "epicycloidal",
+    "popularity": 38392
+  },
+  {
+    "tag": "shorthand",
+    "popularity": 38296
+  },
+  {
+    "tag": "herpolhode",
+    "popularity": 38201
+  },
+  {
+    "tag": "polysynthesism",
+    "popularity": 38105
+  },
+  {
+    "tag": "cany",
+    "popularity": 38010
+  },
+  {
+    "tag": "sideage",
+    "popularity": 37916
+  },
+  {
+    "tag": "strainableness",
+    "popularity": 37822
+  },
+  {
+    "tag": "superformidable",
+    "popularity": 37728
+  },
+  {
+    "tag": "slendang",
+    "popularity": 37634
+  },
+  {
+    "tag": "impropriation",
+    "popularity": 37541
+  },
+  {
+    "tag": "ficklehearted",
+    "popularity": 37449
+  },
+  {
+    "tag": "wintrify",
+    "popularity": 37356
+  },
+  {
+    "tag": "geomorphogenist",
+    "popularity": 37264
+  },
+  {
+    "tag": "smuggleable",
+    "popularity": 37173
+  },
+  {
+    "tag": "delapsion",
+    "popularity": 37081
+  },
+  {
+    "tag": "projective",
+    "popularity": 36990
+  },
+  {
+    "tag": "unglue exfoliation",
+    "popularity": 36900
+  },
+  {
+    "tag": "Acerae",
+    "popularity": 36810
+  },
+  {
+    "tag": "unstaged",
+    "popularity": 36720
+  },
+  {
+    "tag": "ranal",
+    "popularity": 36630
+  },
+  {
+    "tag": "worrier",
+    "popularity": 36541
+  },
+  {
+    "tag": "unhid",
+    "popularity": 36452
+  },
+  {
+    "tag": "adequation",
+    "popularity": 36363
+  },
+  {
+    "tag": "strongylid Sokotri",
+    "popularity": 36275
+  },
+  {
+    "tag": "fumingly",
+    "popularity": 36187
+  },
+  {
+    "tag": "gynosporangium phaenogenetic",
+    "popularity": 36100
+  },
+  {
+    "tag": "uniunguiculate",
+    "popularity": 36012
+  },
+  {
+    "tag": "prudelike",
+    "popularity": 35926
+  },
+  {
+    "tag": "seminomata",
+    "popularity": 35839
+  },
+  {
+    "tag": "trinklet",
+    "popularity": 35753
+  },
+  {
+    "tag": "risorial",
+    "popularity": 35667
+  },
+  {
+    "tag": "pericardiocentesis",
+    "popularity": 35581
+  },
+  {
+    "tag": "filmist",
+    "popularity": 35496
+  },
+  {
+    "tag": "Nana",
+    "popularity": 35411
+  },
+  {
+    "tag": "cynipoid",
+    "popularity": 35326
+  },
+  {
+    "tag": "cteniform",
+    "popularity": 35242
+  },
+  {
+    "tag": "semiflex",
+    "popularity": 35158
+  },
+  {
+    "tag": "solstitially",
+    "popularity": 35074
+  },
+  {
+    "tag": "Algarsife",
+    "popularity": 34991
+  },
+  {
+    "tag": "noncriminal",
+    "popularity": 34908
+  },
+  {
+    "tag": "compassion",
+    "popularity": 34825
+  },
+  {
+    "tag": "Buddhic",
+    "popularity": 34743
+  },
+  {
+    "tag": "vellicative dactylically hotfoot",
+    "popularity": 34661
+  },
+  {
+    "tag": "chicory",
+    "popularity": 34579
+  },
+  {
+    "tag": "transperitoneally",
+    "popularity": 34497
+  },
+  {
+    "tag": "pennae",
+    "popularity": 34416
+  },
+  {
+    "tag": "Flamandize",
+    "popularity": 34335
+  },
+  {
+    "tag": "underviewer",
+    "popularity": 34254
+  },
+  {
+    "tag": "assoil",
+    "popularity": 34174
+  },
+  {
+    "tag": "saccharobacillus",
+    "popularity": 34094
+  },
+  {
+    "tag": "biacetylene",
+    "popularity": 34014
+  },
+  {
+    "tag": "mouchardism",
+    "popularity": 33935
+  },
+  {
+    "tag": "anisomeric",
+    "popularity": 33856
+  },
+  {
+    "tag": "digestive",
+    "popularity": 33777
+  },
+  {
+    "tag": "darlingly",
+    "popularity": 33698
+  },
+  {
+    "tag": "liman",
+    "popularity": 33620
+  },
+  {
+    "tag": "soldanrie",
+    "popularity": 33542
+  },
+  {
+    "tag": "sully",
+    "popularity": 33464
+  },
+  {
+    "tag": "brightsmith",
+    "popularity": 33387
+  },
+  {
+    "tag": "inwrap antiliturgist ureterocervical",
+    "popularity": 33309
+  },
+  {
+    "tag": "discommodity",
+    "popularity": 33232
+  },
+  {
+    "tag": "typical aggrandizer",
+    "popularity": 33156
+  },
+  {
+    "tag": "xenogeny",
+    "popularity": 33079
+  },
+  {
+    "tag": "uncountrified",
+    "popularity": 33003
+  },
+  {
+    "tag": "Podarge",
+    "popularity": 32928
+  },
+  {
+    "tag": "uninterviewed",
+    "popularity": 32852
+  },
+  {
+    "tag": "underprior",
+    "popularity": 32777
+  },
+  {
+    "tag": "leiomyomatous",
+    "popularity": 32702
+  },
+  {
+    "tag": "postdysenteric",
+    "popularity": 32627
+  },
+  {
+    "tag": "Fusicladium",
+    "popularity": 32553
+  },
+  {
+    "tag": "Dulcinea",
+    "popularity": 32478
+  },
+  {
+    "tag": "interspersion",
+    "popularity": 32404
+  },
+  {
+    "tag": "preobligate",
+    "popularity": 32331
+  },
+  {
+    "tag": "subaggregate",
+    "popularity": 32257
+  },
+  {
+    "tag": "grammarianism",
+    "popularity": 32184
+  },
+  {
+    "tag": "palikar",
+    "popularity": 32111
+  },
+  {
+    "tag": "facileness",
+    "popularity": 32039
+  },
+  {
+    "tag": "deuterofibrinose",
+    "popularity": 31966
+  },
+  {
+    "tag": "pseudesthesia",
+    "popularity": 31894
+  },
+  {
+    "tag": "sedimentary",
+    "popularity": 31822
+  },
+  {
+    "tag": "typewrite",
+    "popularity": 31751
+  },
+  {
+    "tag": "immemorable",
+    "popularity": 31679
+  },
+  {
+    "tag": "Myrtus",
+    "popularity": 31608
+  },
+  {
+    "tag": "hauchecornite",
+    "popularity": 31537
+  },
+  {
+    "tag": "galleylike",
+    "popularity": 31467
+  },
+  {
+    "tag": "thimber",
+    "popularity": 31396
+  },
+  {
+    "tag": "Hegelianism",
+    "popularity": 31326
+  },
+  {
+    "tag": "strig",
+    "popularity": 31256
+  },
+  {
+    "tag": "skyre",
+    "popularity": 31187
+  },
+  {
+    "tag": "eupepticism",
+    "popularity": 31117
+  },
+  {
+    "tag": "eponymism",
+    "popularity": 31048
+  },
+  {
+    "tag": "flunkeyhood",
+    "popularity": 30979
+  },
+  {
+    "tag": "Abama",
+    "popularity": 30911
+  },
+  {
+    "tag": "adiadochokinesis",
+    "popularity": 30842
+  },
+  {
+    "tag": "spendthrifty",
+    "popularity": 30774
+  },
+  {
+    "tag": "chalcedony",
+    "popularity": 30706
+  },
+  {
+    "tag": "authorism",
+    "popularity": 30638
+  },
+  {
+    "tag": "nasturtium",
+    "popularity": 30571
+  },
+  {
+    "tag": "Acanthocereus",
+    "popularity": 30504
+  },
+  {
+    "tag": "uncollapsible",
+    "popularity": 30437
+  },
+  {
+    "tag": "excursionist",
+    "popularity": 30370
+  },
+  {
+    "tag": "fogbow",
+    "popularity": 30303
+  },
+  {
+    "tag": "overlie",
+    "popularity": 30237
+  },
+  {
+    "tag": "velours",
+    "popularity": 30171
+  },
+  {
+    "tag": "zoodendria madrigal stagbush",
+    "popularity": 30105
+  },
+  {
+    "tag": "imi",
+    "popularity": 30039
+  },
+  {
+    "tag": "cojudge",
+    "popularity": 29974
+  },
+  {
+    "tag": "depurate argal",
+    "popularity": 29909
+  },
+  {
+    "tag": "unrecognition",
+    "popularity": 29844
+  },
+  {
+    "tag": "paunchful",
+    "popularity": 29779
+  },
+  {
+    "tag": "invalued",
+    "popularity": 29714
+  },
+  {
+    "tag": "probang",
+    "popularity": 29650
+  },
+  {
+    "tag": "chetvert",
+    "popularity": 29586
+  },
+  {
+    "tag": "enactable",
+    "popularity": 29522
+  },
+  {
+    "tag": "detoxicate adhibit",
+    "popularity": 29458
+  },
+  {
+    "tag": "kullaite",
+    "popularity": 29395
+  },
+  {
+    "tag": "undazzling",
+    "popularity": 29332
+  },
+  {
+    "tag": "excalation",
+    "popularity": 29269
+  },
+  {
+    "tag": "sievings",
+    "popularity": 29206
+  },
+  {
+    "tag": "disenthral",
+    "popularity": 29143
+  },
+  {
+    "tag": "disinterestedly",
+    "popularity": 29081
+  },
+  {
+    "tag": "stanner",
+    "popularity": 29018
+  },
+  {
+    "tag": "recapitulative",
+    "popularity": 28956
+  },
+  {
+    "tag": "objectivist",
+    "popularity": 28895
+  },
+  {
+    "tag": "hypermetropia",
+    "popularity": 28833
+  },
+  {
+    "tag": "incumbency",
+    "popularity": 28772
+  },
+  {
+    "tag": "protegee",
+    "popularity": 28711
+  },
+  {
+    "tag": "zealotic",
+    "popularity": 28650
+  },
+  {
+    "tag": "predebit",
+    "popularity": 28589
+  },
+  {
+    "tag": "cupolar",
+    "popularity": 28528
+  },
+  {
+    "tag": "unattributed",
+    "popularity": 28468
+  },
+  {
+    "tag": "louisine",
+    "popularity": 28408
+  },
+  {
+    "tag": "illustrate",
+    "popularity": 28348
+  },
+  {
+    "tag": "inofficiousness",
+    "popularity": 28288
+  },
+  {
+    "tag": "Americawards",
+    "popularity": 28228
+  },
+  {
+    "tag": "foreflap",
+    "popularity": 28169
+  },
+  {
+    "tag": "eruditeness",
+    "popularity": 28110
+  },
+  {
+    "tag": "copiopsia",
+    "popularity": 28051
+  },
+  {
+    "tag": "sporuliferous",
+    "popularity": 27992
+  },
+  {
+    "tag": "muttering",
+    "popularity": 27934
+  },
+  {
+    "tag": "prepsychology adrip",
+    "popularity": 27875
+  },
+  {
+    "tag": "unfriendly",
+    "popularity": 27817
+  },
+  {
+    "tag": "sulphanilic",
+    "popularity": 27759
+  },
+  {
+    "tag": "Coelococcus",
+    "popularity": 27701
+  },
+  {
+    "tag": "undoubtfulness",
+    "popularity": 27643
+  },
+  {
+    "tag": "flaringly",
+    "popularity": 27586
+  },
+  {
+    "tag": "unordain",
+    "popularity": 27529
+  },
+  {
+    "tag": "fratchety",
+    "popularity": 27472
+  },
+  {
+    "tag": "decadentism dolefully",
+    "popularity": 27415
+  },
+  {
+    "tag": "synthronus",
+    "popularity": 27358
+  },
+  {
+    "tag": "maiid",
+    "popularity": 27301
+  },
+  {
+    "tag": "rhinobyon",
+    "popularity": 27245
+  },
+  {
+    "tag": "Didynamia",
+    "popularity": 27189
+  },
+  {
+    "tag": "millionairedom",
+    "popularity": 27133
+  },
+  {
+    "tag": "mulierine",
+    "popularity": 27077
+  },
+  {
+    "tag": "Mayo",
+    "popularity": 27021
+  },
+  {
+    "tag": "perceivedness",
+    "popularity": 26966
+  },
+  {
+    "tag": "unadoration",
+    "popularity": 26911
+  },
+  {
+    "tag": "regraft",
+    "popularity": 26856
+  },
+  {
+    "tag": "witch",
+    "popularity": 26801
+  },
+  {
+    "tag": "ungrow",
+    "popularity": 26746
+  },
+  {
+    "tag": "glossopharyngeus",
+    "popularity": 26691
+  },
+  {
+    "tag": "unstirrable",
+    "popularity": 26637
+  },
+  {
+    "tag": "synodsman",
+    "popularity": 26583
+  },
+  {
+    "tag": "placentalian",
+    "popularity": 26529
+  },
+  {
+    "tag": "corpulently",
+    "popularity": 26475
+  },
+  {
+    "tag": "photochromoscope",
+    "popularity": 26421
+  },
+  {
+    "tag": "indusiate retinasphaltum chokestrap",
+    "popularity": 26368
+  },
+  {
+    "tag": "murdrum",
+    "popularity": 26314
+  },
+  {
+    "tag": "belatedness",
+    "popularity": 26261
+  },
+  {
+    "tag": "Cochin",
+    "popularity": 26208
+  },
+  {
+    "tag": "Leonist",
+    "popularity": 26155
+  },
+  {
+    "tag": "keeker confined",
+    "popularity": 26102
+  },
+  {
+    "tag": "unintellectual",
+    "popularity": 26050
+  },
+  {
+    "tag": "nymphaline bait",
+    "popularity": 25997
+  },
+  {
+    "tag": "sarcosporidiosis",
+    "popularity": 25945
+  },
+  {
+    "tag": "catawamptiously",
+    "popularity": 25893
+  },
+  {
+    "tag": "outshame",
+    "popularity": 25841
+  },
+  {
+    "tag": "animalism",
+    "popularity": 25790
+  },
+  {
+    "tag": "epithalamial",
+    "popularity": 25738
+  },
+  {
+    "tag": "ganner",
+    "popularity": 25687
+  },
+  {
+    "tag": "desilicify",
+    "popularity": 25635
+  },
+  {
+    "tag": "dandyism",
+    "popularity": 25584
+  },
+  {
+    "tag": "hyleg",
+    "popularity": 25533
+  },
+  {
+    "tag": "photophysical",
+    "popularity": 25483
+  },
+  {
+    "tag": "underload",
+    "popularity": 25432
+  },
+  {
+    "tag": "unintrusive",
+    "popularity": 25382
+  },
+  {
+    "tag": "succinamic",
+    "popularity": 25331
+  },
+  {
+    "tag": "matchy",
+    "popularity": 25281
+  },
+  {
+    "tag": "concordal",
+    "popularity": 25231
+  },
+  {
+    "tag": "exteriority",
+    "popularity": 25181
+  },
+  {
+    "tag": "sterculiad",
+    "popularity": 25132
+  },
+  {
+    "tag": "sulfoxylic",
+    "popularity": 25082
+  },
+  {
+    "tag": "oversubscription",
+    "popularity": 25033
+  },
+  {
+    "tag": "chiasmic",
+    "popularity": 24984
+  },
+  {
+    "tag": "pseudoparthenogenesis",
+    "popularity": 24935
+  },
+  {
+    "tag": "indorse",
+    "popularity": 24886
+  },
+  {
+    "tag": "Krishnaite",
+    "popularity": 24837
+  },
+  {
+    "tag": "calcinize",
+    "popularity": 24788
+  },
+  {
+    "tag": "rhodium",
+    "popularity": 24740
+  },
+  {
+    "tag": "tragopan",
+    "popularity": 24692
+  },
+  {
+    "tag": "overwhelmingly",
+    "popularity": 24643
+  },
+  {
+    "tag": "procidence accorporate",
+    "popularity": 24595
+  },
+  {
+    "tag": "polemize speelless",
+    "popularity": 24548
+  },
+  {
+    "tag": "radiocarpal goran",
+    "popularity": 24500
+  },
+  {
+    "tag": "counteroffer Pelodytes",
+    "popularity": 24452
+  },
+  {
+    "tag": "lionhearted",
+    "popularity": 24405
+  },
+  {
+    "tag": "paramastoid",
+    "popularity": 24358
+  },
+  {
+    "tag": "murine",
+    "popularity": 24310
+  },
+  {
+    "tag": "woodbined",
+    "popularity": 24263
+  },
+  {
+    "tag": "packthread",
+    "popularity": 24217
+  },
+  {
+    "tag": "citreous",
+    "popularity": 24170
+  },
+  {
+    "tag": "unfallaciously",
+    "popularity": 24123
+  },
+  {
+    "tag": "tentwork reincarnadine",
+    "popularity": 24077
+  },
+  {
+    "tag": "verminousness",
+    "popularity": 24030
+  },
+  {
+    "tag": "sillometer",
+    "popularity": 23984
+  },
+  {
+    "tag": "jointy",
+    "popularity": 23938
+  },
+  {
+    "tag": "streptolysin",
+    "popularity": 23892
+  },
+  {
+    "tag": "Florentinism",
+    "popularity": 23847
+  },
+  {
+    "tag": "monosomatous",
+    "popularity": 23801
+  },
+  {
+    "tag": "capsulociliary",
+    "popularity": 23756
+  },
+  {
+    "tag": "organum",
+    "popularity": 23710
+  },
+  {
+    "tag": "overtly",
+    "popularity": 23665
+  },
+  {
+    "tag": "ophthalmoscopical",
+    "popularity": 23620
+  },
+  {
+    "tag": "supposititiously",
+    "popularity": 23575
+  },
+  {
+    "tag": "radiochemistry",
+    "popularity": 23530
+  },
+  {
+    "tag": "flaxtail",
+    "popularity": 23486
+  },
+  {
+    "tag": "pretympanic",
+    "popularity": 23441
+  },
+  {
+    "tag": "auscultation",
+    "popularity": 23397
+  },
+  {
+    "tag": "hairdresser",
+    "popularity": 23352
+  },
+  {
+    "tag": "chaffless",
+    "popularity": 23308
+  },
+  {
+    "tag": "polioencephalitis",
+    "popularity": 23264
+  },
+  {
+    "tag": "axolotl",
+    "popularity": 23220
+  },
+  {
+    "tag": "smous",
+    "popularity": 23177
+  },
+  {
+    "tag": "morgen disenamour toothed",
+    "popularity": 23133
+  },
+  {
+    "tag": "chaiseless",
+    "popularity": 23089
+  },
+  {
+    "tag": "frugally",
+    "popularity": 23046
+  },
+  {
+    "tag": "combustive antievolutionist cinenegative",
+    "popularity": 23003
+  },
+  {
+    "tag": "malacolite",
+    "popularity": 22960
+  },
+  {
+    "tag": "borne",
+    "popularity": 22917
+  },
+  {
+    "tag": "mercaptole",
+    "popularity": 22874
+  },
+  {
+    "tag": "judicatory",
+    "popularity": 22831
+  },
+  {
+    "tag": "noctivagation",
+    "popularity": 22789
+  },
+  {
+    "tag": "synthete",
+    "popularity": 22746
+  },
+  {
+    "tag": "tomboyism",
+    "popularity": 22704
+  },
+  {
+    "tag": "serranoid",
+    "popularity": 22661
+  },
+  {
+    "tag": "impostorism",
+    "popularity": 22619
+  },
+  {
+    "tag": "flagellosis Talitha",
+    "popularity": 22577
+  },
+  {
+    "tag": "pseudoviscous",
+    "popularity": 22535
+  },
+  {
+    "tag": "Galleriidae",
+    "popularity": 22494
+  },
+  {
+    "tag": "undulation didelph Comintern",
+    "popularity": 22452
+  },
+  {
+    "tag": "triangulopyramidal",
+    "popularity": 22411
+  },
+  {
+    "tag": "middlings",
+    "popularity": 22369
+  },
+  {
+    "tag": "piperazin",
+    "popularity": 22328
+  },
+  {
+    "tag": "endostitis",
+    "popularity": 22287
+  },
+  {
+    "tag": "swordlike",
+    "popularity": 22246
+  },
+  {
+    "tag": "forthwith",
+    "popularity": 22205
+  },
+  {
+    "tag": "menaceful",
+    "popularity": 22164
+  },
+  {
+    "tag": "explantation defective",
+    "popularity": 22123
+  },
+  {
+    "tag": "arrear",
+    "popularity": 22083
+  },
+  {
+    "tag": "engraft",
+    "popularity": 22042
+  },
+  {
+    "tag": "revolunteer",
+    "popularity": 22002
+  },
+  {
+    "tag": "foliaceous",
+    "popularity": 21962
+  },
+  {
+    "tag": "pseudograph",
+    "popularity": 21922
+  },
+  {
+    "tag": "maenaite",
+    "popularity": 21882
+  },
+  {
+    "tag": "interfinger",
+    "popularity": 21842
+  },
+  {
+    "tag": "macroscopically",
+    "popularity": 21802
+  },
+  {
+    "tag": "bluewood",
+    "popularity": 21762
+  },
+  {
+    "tag": "chikara",
+    "popularity": 21723
+  },
+  {
+    "tag": "reprehension diazeuxis nickelous",
+    "popularity": 21683
+  },
+  {
+    "tag": "vacuation",
+    "popularity": 21644
+  },
+  {
+    "tag": "Sartish",
+    "popularity": 21605
+  },
+  {
+    "tag": "pseudogyny",
+    "popularity": 21566
+  },
+  {
+    "tag": "friedcake",
+    "popularity": 21527
+  },
+  {
+    "tag": "thraw",
+    "popularity": 21488
+  },
+  {
+    "tag": "bifid",
+    "popularity": 21449
+  },
+  {
+    "tag": "truthlessly",
+    "popularity": 21411
+  },
+  {
+    "tag": "lungy",
+    "popularity": 21372
+  },
+  {
+    "tag": "fluoborite",
+    "popularity": 21334
+  },
+  {
+    "tag": "anthropolithic",
+    "popularity": 21295
+  },
+  {
+    "tag": "coachee straw",
+    "popularity": 21257
+  },
+  {
+    "tag": "dehorner Grecize",
+    "popularity": 21219
+  },
+  {
+    "tag": "spondylopyosis",
+    "popularity": 21181
+  },
+  {
+    "tag": "institutionary",
+    "popularity": 21143
+  },
+  {
+    "tag": "agentry",
+    "popularity": 21105
+  },
+  {
+    "tag": "musing bietle",
+    "popularity": 21068
+  },
+  {
+    "tag": "cormophyte",
+    "popularity": 21030
+  },
+  {
+    "tag": "semielliptic",
+    "popularity": 20993
+  },
+  {
+    "tag": "ependytes",
+    "popularity": 20955
+  },
+  {
+    "tag": "coachmaster",
+    "popularity": 20918
+  },
+  {
+    "tag": "overexuberant",
+    "popularity": 20881
+  },
+  {
+    "tag": "selectable",
+    "popularity": 20844
+  },
+  {
+    "tag": "saclike",
+    "popularity": 20807
+  },
+  {
+    "tag": "mullion",
+    "popularity": 20770
+  },
+  {
+    "tag": "pantheonize prevalency",
+    "popularity": 20733
+  },
+  {
+    "tag": "trophosperm",
+    "popularity": 20697
+  },
+  {
+    "tag": "paraphrasist",
+    "popularity": 20660
+  },
+  {
+    "tag": "undercarry",
+    "popularity": 20624
+  },
+  {
+    "tag": "thallogenic",
+    "popularity": 20587
+  },
+  {
+    "tag": "bulgy forbid",
+    "popularity": 20551
+  },
+  {
+    "tag": "proliquor gratulatory",
+    "popularity": 20515
+  },
+  {
+    "tag": "booker",
+    "popularity": 20479
+  },
+  {
+    "tag": "wizen",
+    "popularity": 20443
+  },
+  {
+    "tag": "synchondrosially",
+    "popularity": 20407
+  },
+  {
+    "tag": "herbless",
+    "popularity": 20371
+  },
+  {
+    "tag": "arfvedsonite",
+    "popularity": 20336
+  },
+  {
+    "tag": "Neuroptera",
+    "popularity": 20300
+  },
+  {
+    "tag": "fingerstone",
+    "popularity": 20265
+  },
+  {
+    "tag": "Odontoglossae",
+    "popularity": 20229
+  },
+  {
+    "tag": "transmigrator",
+    "popularity": 20194
+  },
+  {
+    "tag": "Dehaites",
+    "popularity": 20159
+  },
+  {
+    "tag": "Molinist",
+    "popularity": 20124
+  },
+  {
+    "tag": "novelistic",
+    "popularity": 20089
+  },
+  {
+    "tag": "astelic",
+    "popularity": 20054
+  },
+  {
+    "tag": "pyelometry",
+    "popularity": 20019
+  },
+  {
+    "tag": "pigmentation",
+    "popularity": 19984
+  },
+  {
+    "tag": "epinaos",
+    "popularity": 19950
+  },
+  {
+    "tag": "outdare",
+    "popularity": 19915
+  },
+  {
+    "tag": "Funje philaristocracy",
+    "popularity": 19881
+  },
+  {
+    "tag": "keddah",
+    "popularity": 19846
+  },
+  {
+    "tag": "axoidean",
+    "popularity": 19812
+  },
+  {
+    "tag": "ovule",
+    "popularity": 19778
+  },
+  {
+    "tag": "solidify",
+    "popularity": 19744
+  },
+  {
+    "tag": "noncelestial",
+    "popularity": 19710
+  },
+  {
+    "tag": "overmultiplication",
+    "popularity": 19676
+  },
+  {
+    "tag": "hexatetrahedron",
+    "popularity": 19642
+  },
+  {
+    "tag": "pliciform",
+    "popularity": 19609
+  },
+  {
+    "tag": "zimbalon",
+    "popularity": 19575
+  },
+  {
+    "tag": "annexational",
+    "popularity": 19542
+  },
+  {
+    "tag": "eurhodol",
+    "popularity": 19508
+  },
+  {
+    "tag": "yark",
+    "popularity": 19475
+  },
+  {
+    "tag": "illegality nitroalizarin",
+    "popularity": 19442
+  },
+  {
+    "tag": "quadratum",
+    "popularity": 19409
+  },
+  {
+    "tag": "saccharine",
+    "popularity": 19376
+  },
+  {
+    "tag": "unemploy",
+    "popularity": 19343
+  },
+  {
+    "tag": "uniclinal unipotent",
+    "popularity": 19310
+  },
+  {
+    "tag": "turbo",
+    "popularity": 19277
+  },
+  {
+    "tag": "sybarism",
+    "popularity": 19244
+  },
+  {
+    "tag": "motacilline",
+    "popularity": 19212
+  },
+  {
+    "tag": "weaselly",
+    "popularity": 19179
+  },
+  {
+    "tag": "plastid",
+    "popularity": 19147
+  },
+  {
+    "tag": "wasting",
+    "popularity": 19114
+  },
+  {
+    "tag": "begrime fluting",
+    "popularity": 19082
+  },
+  {
+    "tag": "Nephilinae",
+    "popularity": 19050
+  },
+  {
+    "tag": "disregardance",
+    "popularity": 19018
+  },
+  {
+    "tag": "Shakerlike",
+    "popularity": 18986
+  },
+  {
+    "tag": "uniped",
+    "popularity": 18954
+  },
+  {
+    "tag": "knap",
+    "popularity": 18922
+  },
+  {
+    "tag": "electivism undergardener",
+    "popularity": 18890
+  },
+  {
+    "tag": "hulverheaded",
+    "popularity": 18858
+  },
+  {
+    "tag": "unruptured",
+    "popularity": 18827
+  },
+  {
+    "tag": "solemnize credently",
+    "popularity": 18795
+  },
+  {
+    "tag": "pentastomoid possessingly",
+    "popularity": 18764
+  },
+  {
+    "tag": "octose",
+    "popularity": 18733
+  },
+  {
+    "tag": "psithurism indefensibility",
+    "popularity": 18701
+  },
+  {
+    "tag": "torrentuous cyanometer subcrenate",
+    "popularity": 18670
+  },
+  {
+    "tag": "photoplaywright tapaculo",
+    "popularity": 18639
+  },
+  {
+    "tag": "univalence",
+    "popularity": 18608
+  },
+  {
+    "tag": "Porthetria",
+    "popularity": 18577
+  },
+  {
+    "tag": "funambulo",
+    "popularity": 18546
+  },
+  {
+    "tag": "pedion",
+    "popularity": 18515
+  },
+  {
+    "tag": "horticulturally",
+    "popularity": 18485
+  },
+  {
+    "tag": "marennin",
+    "popularity": 18454
+  },
+  {
+    "tag": "horselaugh",
+    "popularity": 18423
+  },
+  {
+    "tag": "semiexecutive",
+    "popularity": 18393
+  },
+  {
+    "tag": "Monopteridae",
+    "popularity": 18363
+  },
+  {
+    "tag": "commonable",
+    "popularity": 18332
+  },
+  {
+    "tag": "dreariment",
+    "popularity": 18302
+  },
+  {
+    "tag": "disbud",
+    "popularity": 18272
+  },
+  {
+    "tag": "monocled",
+    "popularity": 18242
+  },
+  {
+    "tag": "hurlbarrow",
+    "popularity": 18212
+  },
+  {
+    "tag": "opiateproof",
+    "popularity": 18182
+  },
+  {
+    "tag": "Fahrenheit",
+    "popularity": 18152
+  },
+  {
+    "tag": "writhed",
+    "popularity": 18122
+  },
+  {
+    "tag": "Volstead",
+    "popularity": 18093
+  },
+  {
+    "tag": "yesternight",
+    "popularity": 18063
+  },
+  {
+    "tag": "readmittance",
+    "popularity": 18033
+  },
+  {
+    "tag": "reiterable",
+    "popularity": 18004
+  },
+  {
+    "tag": "triquetral",
+    "popularity": 17975
+  },
+  {
+    "tag": "guillotinement",
+    "popularity": 17945
+  },
+  {
+    "tag": "repermission",
+    "popularity": 17916
+  },
+  {
+    "tag": "assishly",
+    "popularity": 17887
+  },
+  {
+    "tag": "daidle",
+    "popularity": 17858
+  },
+  {
+    "tag": "prismatoid",
+    "popularity": 17829
+  },
+  {
+    "tag": "irreptitious",
+    "popularity": 17800
+  },
+  {
+    "tag": "sourdeline",
+    "popularity": 17771
+  },
+  {
+    "tag": "Austrian",
+    "popularity": 17742
+  },
+  {
+    "tag": "psychorrhagic",
+    "popularity": 17713
+  },
+  {
+    "tag": "Monumbo",
+    "popularity": 17685
+  },
+  {
+    "tag": "cloiochoanitic",
+    "popularity": 17656
+  },
+  {
+    "tag": "hant",
+    "popularity": 17628
+  },
+  {
+    "tag": "roily pulldown",
+    "popularity": 17599
+  },
+  {
+    "tag": "recongratulation",
+    "popularity": 17571
+  },
+  {
+    "tag": "Peking",
+    "popularity": 17543
+  },
+  {
+    "tag": "erdvark",
+    "popularity": 17514
+  },
+  {
+    "tag": "antimnemonic",
+    "popularity": 17486
+  },
+  {
+    "tag": "noncapillarity",
+    "popularity": 17458
+  },
+  {
+    "tag": "irrepressive",
+    "popularity": 17430
+  },
+  {
+    "tag": "Petromyzontes",
+    "popularity": 17402
+  },
+  {
+    "tag": "piscatorially",
+    "popularity": 17374
+  },
+  {
+    "tag": "cholesterosis",
+    "popularity": 17346
+  },
+  {
+    "tag": "denunciate",
+    "popularity": 17319
+  },
+  {
+    "tag": "unmetalled",
+    "popularity": 17291
+  },
+  {
+    "tag": "Tigris enruin",
+    "popularity": 17263
+  },
+  {
+    "tag": "anaspalin",
+    "popularity": 17236
+  },
+  {
+    "tag": "monodromy",
+    "popularity": 17208
+  },
+  {
+    "tag": "Canichanan",
+    "popularity": 17181
+  },
+  {
+    "tag": "mesolabe",
+    "popularity": 17154
+  },
+  {
+    "tag": "trichothallic overcunningness",
+    "popularity": 17127
+  },
+  {
+    "tag": "spinsterishly",
+    "popularity": 17099
+  },
+  {
+    "tag": "sensilla",
+    "popularity": 17072
+  },
+  {
+    "tag": "wifelkin",
+    "popularity": 17045
+  },
+  {
+    "tag": "suppositionless",
+    "popularity": 17018
+  },
+  {
+    "tag": "irksomeness",
+    "popularity": 16991
+  },
+  {
+    "tag": "sanbenito",
+    "popularity": 16964
+  },
+  {
+    "tag": "nonstatement",
+    "popularity": 16938
+  },
+  {
+    "tag": "phenoloid",
+    "popularity": 16911
+  },
+  {
+    "tag": "Steinberger",
+    "popularity": 16884
+  },
+  {
+    "tag": "replicated boom",
+    "popularity": 16858
+  },
+  {
+    "tag": "sciomachiology",
+    "popularity": 16831
+  },
+  {
+    "tag": "starwise",
+    "popularity": 16805
+  },
+  {
+    "tag": "prerich",
+    "popularity": 16778
+  },
+  {
+    "tag": "unspawned",
+    "popularity": 16752
+  },
+  {
+    "tag": "unindentable",
+    "popularity": 16726
+  },
+  {
+    "tag": "stromatic",
+    "popularity": 16700
+  },
+  {
+    "tag": "fetishize",
+    "popularity": 16673
+  },
+  {
+    "tag": "dihydroxy",
+    "popularity": 16647
+  },
+  {
+    "tag": "precaudal",
+    "popularity": 16621
+  },
+  {
+    "tag": "Madagascar",
+    "popularity": 16595
+  },
+  {
+    "tag": "repinement",
+    "popularity": 16570
+  },
+  {
+    "tag": "noncathedral wenzel",
+    "popularity": 16544
+  },
+  {
+    "tag": "corollike",
+    "popularity": 16518
+  },
+  {
+    "tag": "pubes unamortization",
+    "popularity": 16492
+  },
+  {
+    "tag": "brickcroft",
+    "popularity": 16467
+  },
+  {
+    "tag": "intertrabecular",
+    "popularity": 16441
+  },
+  {
+    "tag": "formulaic",
+    "popularity": 16416
+  },
+  {
+    "tag": "arienzo",
+    "popularity": 16390
+  },
+  {
+    "tag": "Mazzinian",
+    "popularity": 16365
+  },
+  {
+    "tag": "wallowishly",
+    "popularity": 16339
+  },
+  {
+    "tag": "sysselman",
+    "popularity": 16314
+  },
+  {
+    "tag": "seligmannite",
+    "popularity": 16289
+  },
+  {
+    "tag": "harlequinery",
+    "popularity": 16264
+  },
+  {
+    "tag": "zucchetto",
+    "popularity": 16239
+  },
+  {
+    "tag": "malonyl",
+    "popularity": 16214
+  },
+  {
+    "tag": "patwari",
+    "popularity": 16189
+  },
+  {
+    "tag": "neoholmia venturesomeness",
+    "popularity": 16164
+  },
+  {
+    "tag": "Dehwar",
+    "popularity": 16139
+  },
+  {
+    "tag": "fetiferous",
+    "popularity": 16114
+  },
+  {
+    "tag": "chromatophore",
+    "popularity": 16090
+  },
+  {
+    "tag": "reregistration",
+    "popularity": 16065
+  },
+  {
+    "tag": "alienor",
+    "popularity": 16040
+  },
+  {
+    "tag": "Hexagynia",
+    "popularity": 16016
+  },
+  {
+    "tag": "cerebrotonia",
+    "popularity": 15991
+  },
+  {
+    "tag": "deedbox",
+    "popularity": 15967
+  },
+  {
+    "tag": "staab",
+    "popularity": 15943
+  },
+  {
+    "tag": "uratemia",
+    "popularity": 15918
+  },
+  {
+    "tag": "flaunt",
+    "popularity": 15894
+  },
+  {
+    "tag": "bogy",
+    "popularity": 15870
+  },
+  {
+    "tag": "subcartilaginous",
+    "popularity": 15846
+  },
+  {
+    "tag": "protonephridial",
+    "popularity": 15822
+  },
+  {
+    "tag": "Boswellia",
+    "popularity": 15798
+  },
+  {
+    "tag": "relaxant untiaraed protoepiphyte",
+    "popularity": 15774
+  },
+  {
+    "tag": "nesslerization",
+    "popularity": 15750
+  },
+  {
+    "tag": "precession",
+    "popularity": 15726
+  },
+  {
+    "tag": "peat",
+    "popularity": 15702
+  },
+  {
+    "tag": "unbit",
+    "popularity": 15678
+  },
+  {
+    "tag": "snailish",
+    "popularity": 15655
+  },
+  {
+    "tag": "porismatical",
+    "popularity": 15631
+  },
+  {
+    "tag": "hooflike",
+    "popularity": 15608
+  },
+  {
+    "tag": "resuppose phene cranic",
+    "popularity": 15584
+  },
+  {
+    "tag": "peptonization kipskin",
+    "popularity": 15561
+  },
+  {
+    "tag": "birdstone",
+    "popularity": 15537
+  },
+  {
+    "tag": "empty inferoanterior",
+    "popularity": 15514
+  },
+  {
+    "tag": "androtauric",
+    "popularity": 15491
+  },
+  {
+    "tag": "triamide",
+    "popularity": 15467
+  },
+  {
+    "tag": "showmanry",
+    "popularity": 15444
+  },
+  {
+    "tag": "doing",
+    "popularity": 15421
+  },
+  {
+    "tag": "bouchaleen",
+    "popularity": 15398
+  },
+  {
+    "tag": "precollude",
+    "popularity": 15375
+  },
+  {
+    "tag": "finger",
+    "popularity": 15352
+  },
+  {
+    "tag": "limnetic intermessenger",
+    "popularity": 15329
+  },
+  {
+    "tag": "uncharitable picrotoxic",
+    "popularity": 15306
+  },
+  {
+    "tag": "nationalizer Phasmidae",
+    "popularity": 15283
+  },
+  {
+    "tag": "laughingstock",
+    "popularity": 15261
+  },
+  {
+    "tag": "nondeferential",
+    "popularity": 15238
+  },
+  {
+    "tag": "uproariously",
+    "popularity": 15215
+  },
+  {
+    "tag": "manzanilla",
+    "popularity": 15193
+  },
+  {
+    "tag": "khahoon",
+    "popularity": 15170
+  },
+  {
+    "tag": "olericulturally longshanks",
+    "popularity": 15148
+  },
+  {
+    "tag": "enthusiastically methionic",
+    "popularity": 15125
+  },
+  {
+    "tag": "pobs",
+    "popularity": 15103
+  },
+  {
+    "tag": "tricarpellate",
+    "popularity": 15081
+  },
+  {
+    "tag": "souterrain",
+    "popularity": 15058
+  },
+  {
+    "tag": "tethelin",
+    "popularity": 15036
+  },
+  {
+    "tag": "tartle",
+    "popularity": 15014
+  },
+  {
+    "tag": "tidelike",
+    "popularity": 14992
+  },
+  {
+    "tag": "cosmoramic",
+    "popularity": 14970
+  },
+  {
+    "tag": "pretardiness",
+    "popularity": 14948
+  },
+  {
+    "tag": "insoul",
+    "popularity": 14926
+  },
+  {
+    "tag": "anthroxan",
+    "popularity": 14904
+  },
+  {
+    "tag": "jilter",
+    "popularity": 14882
+  },
+  {
+    "tag": "pectinibranchian trematode",
+    "popularity": 14860
+  },
+  {
+    "tag": "Renaissancist",
+    "popularity": 14838
+  },
+  {
+    "tag": "imaginant",
+    "popularity": 14817
+  },
+  {
+    "tag": "supercensure",
+    "popularity": 14795
+  },
+  {
+    "tag": "festilogy",
+    "popularity": 14773
+  },
+  {
+    "tag": "regression",
+    "popularity": 14752
+  },
+  {
+    "tag": "mesobregmate languorously",
+    "popularity": 14730
+  },
+  {
+    "tag": "unsupernaturalized",
+    "popularity": 14709
+  },
+  {
+    "tag": "boobyish",
+    "popularity": 14687
+  },
+  {
+    "tag": "scopolamine",
+    "popularity": 14666
+  },
+  {
+    "tag": "reamputation unchristianly",
+    "popularity": 14645
+  },
+  {
+    "tag": "cuneatic",
+    "popularity": 14623
+  },
+  {
+    "tag": "heathberry",
+    "popularity": 14602
+  },
+  {
+    "tag": "hate",
+    "popularity": 14581
+  },
+  {
+    "tag": "redeemableness",
+    "popularity": 14560
+  },
+  {
+    "tag": "damasse",
+    "popularity": 14539
+  },
+  {
+    "tag": "thrillsome",
+    "popularity": 14518
+  },
+  {
+    "tag": "disseverment",
+    "popularity": 14497
+  },
+  {
+    "tag": "underbishopric Ostyak",
+    "popularity": 14476
+  },
+  {
+    "tag": "Exoascales",
+    "popularity": 14455
+  },
+  {
+    "tag": "soiled",
+    "popularity": 14434
+  },
+  {
+    "tag": "Cain",
+    "popularity": 14413
+  },
+  {
+    "tag": "mismanageable arenae",
+    "popularity": 14392
+  },
+  {
+    "tag": "manducate unhinderably",
+    "popularity": 14372
+  },
+  {
+    "tag": "peregrin",
+    "popularity": 14351
+  },
+  {
+    "tag": "musicianly",
+    "popularity": 14330
+  },
+  {
+    "tag": "aln",
+    "popularity": 14310
+  },
+  {
+    "tag": "intercentrum",
+    "popularity": 14289
+  },
+  {
+    "tag": "roothold",
+    "popularity": 14269
+  },
+  {
+    "tag": "jane aneurism",
+    "popularity": 14248
+  },
+  {
+    "tag": "insinuatively forefeel phytolatrous",
+    "popularity": 14228
+  },
+  {
+    "tag": "kanchil",
+    "popularity": 14208
+  },
+  {
+    "tag": "Austrophile",
+    "popularity": 14187
+  },
+  {
+    "tag": "unterrorized",
+    "popularity": 14167
+  },
+  {
+    "tag": "admeasure",
+    "popularity": 14147
+  },
+  {
+    "tag": "electrodissolution",
+    "popularity": 14127
+  },
+  {
+    "tag": "unweddedly",
+    "popularity": 14107
+  },
+  {
+    "tag": "unannoying",
+    "popularity": 14087
+  },
+  {
+    "tag": "uningenuous",
+    "popularity": 14067
+  },
+  {
+    "tag": "omnibenevolent",
+    "popularity": 14047
+  },
+  {
+    "tag": "commissure",
+    "popularity": 14027
+  },
+  {
+    "tag": "tellureted",
+    "popularity": 14007
+  },
+  {
+    "tag": "suffragan",
+    "popularity": 13987
+  },
+  {
+    "tag": "sphaeriaceous",
+    "popularity": 13967
+  },
+  {
+    "tag": "unfearing",
+    "popularity": 13947
+  },
+  {
+    "tag": "stentoriousness precounsellor",
+    "popularity": 13928
+  },
+  {
+    "tag": "haemaspectroscope",
+    "popularity": 13908
+  },
+  {
+    "tag": "teras",
+    "popularity": 13888
+  },
+  {
+    "tag": "pulicine",
+    "popularity": 13869
+  },
+  {
+    "tag": "colicystopyelitis",
+    "popularity": 13849
+  },
+  {
+    "tag": "Physalia",
+    "popularity": 13830
+  },
+  {
+    "tag": "Saxicolidae",
+    "popularity": 13810
+  },
+  {
+    "tag": "peritonital",
+    "popularity": 13791
+  },
+  {
+    "tag": "dysphotic",
+    "popularity": 13771
+  },
+  {
+    "tag": "unabandoned",
+    "popularity": 13752
+  },
+  {
+    "tag": "rashful",
+    "popularity": 13733
+  },
+  {
+    "tag": "goodyness Manobo",
+    "popularity": 13714
+  },
+  {
+    "tag": "glaring",
+    "popularity": 13694
+  },
+  {
+    "tag": "horrorful",
+    "popularity": 13675
+  },
+  {
+    "tag": "intercepting",
+    "popularity": 13656
+  },
+  {
+    "tag": "semifine",
+    "popularity": 13637
+  },
+  {
+    "tag": "Gaypoo",
+    "popularity": 13618
+  },
+  {
+    "tag": "Metrosideros",
+    "popularity": 13599
+  },
+  {
+    "tag": "thoracicolumbar",
+    "popularity": 13580
+  },
+  {
+    "tag": "unserried",
+    "popularity": 13561
+  },
+  {
+    "tag": "keeperess cauterization",
+    "popularity": 13542
+  },
+  {
+    "tag": "administrant",
+    "popularity": 13523
+  },
+  {
+    "tag": "unpropitiatedness",
+    "popularity": 13505
+  },
+  {
+    "tag": "pensileness",
+    "popularity": 13486
+  },
+  {
+    "tag": "quinaldic unreceivable",
+    "popularity": 13467
+  },
+  {
+    "tag": "Carnaria",
+    "popularity": 13448
+  },
+  {
+    "tag": "azothionium wurrus",
+    "popularity": 13430
+  },
+  {
+    "tag": "mistresshood",
+    "popularity": 13411
+  },
+  {
+    "tag": "Savara",
+    "popularity": 13393
+  },
+  {
+    "tag": "dasyurine",
+    "popularity": 13374
+  },
+  {
+    "tag": "superideal",
+    "popularity": 13356
+  },
+  {
+    "tag": "Parisianize",
+    "popularity": 13337
+  },
+  {
+    "tag": "underearth",
+    "popularity": 13319
+  },
+  {
+    "tag": "athrogenic",
+    "popularity": 13301
+  },
+  {
+    "tag": "communicate",
+    "popularity": 13282
+  },
+  {
+    "tag": "denervation enworthed",
+    "popularity": 13264
+  },
+  {
+    "tag": "subbromide",
+    "popularity": 13246
+  },
+  {
+    "tag": "stenocoriasis",
+    "popularity": 13228
+  },
+  {
+    "tag": "facetiousness",
+    "popularity": 13209
+  },
+  {
+    "tag": "twaddling",
+    "popularity": 13191
+  },
+  {
+    "tag": "tetartoconid",
+    "popularity": 13173
+  },
+  {
+    "tag": "audiophile",
+    "popularity": 13155
+  },
+  {
+    "tag": "fustigate",
+    "popularity": 13137
+  },
+  {
+    "tag": "Sorbian cacophonia",
+    "popularity": 13119
+  },
+  {
+    "tag": "fondish",
+    "popularity": 13101
+  },
+  {
+    "tag": "endomastoiditis",
+    "popularity": 13084
+  },
+  {
+    "tag": "sniptious",
+    "popularity": 13066
+  },
+  {
+    "tag": "glochidiate",
+    "popularity": 13048
+  },
+  {
+    "tag": "polycarboxylic",
+    "popularity": 13030
+  },
+  {
+    "tag": "stamp",
+    "popularity": 13012
+  },
+  {
+    "tag": "tritonymph endotoxoid",
+    "popularity": 12995
+  },
+  {
+    "tag": "wolfskin",
+    "popularity": 12977
+  },
+  {
+    "tag": "oncosimeter",
+    "popularity": 12959
+  },
+  {
+    "tag": "outward",
+    "popularity": 12942
+  },
+  {
+    "tag": "circumscribed",
+    "popularity": 12924
+  },
+  {
+    "tag": "autohemolytic",
+    "popularity": 12907
+  },
+  {
+    "tag": "isorhamnose",
+    "popularity": 12889
+  },
+  {
+    "tag": "monarchomachic",
+    "popularity": 12872
+  },
+  {
+    "tag": "phaenomenon",
+    "popularity": 12855
+  },
+  {
+    "tag": "angiopressure",
+    "popularity": 12837
+  },
+  {
+    "tag": "similarize",
+    "popularity": 12820
+  },
+  {
+    "tag": "unseeable",
+    "popularity": 12803
+  },
+  {
+    "tag": "Toryize",
+    "popularity": 12785
+  },
+  {
+    "tag": "fruitling",
+    "popularity": 12768
+  },
+  {
+    "tag": "axle",
+    "popularity": 12751
+  },
+  {
+    "tag": "priestal cocked",
+    "popularity": 12734
+  },
+  {
+    "tag": "serotoxin",
+    "popularity": 12717
+  },
+  {
+    "tag": "unmovably",
+    "popularity": 12700
+  },
+  {
+    "tag": "darbha",
+    "popularity": 12683
+  },
+  {
+    "tag": "Mongolize",
+    "popularity": 12666
+  },
+  {
+    "tag": "clusteringly",
+    "popularity": 12649
+  },
+  {
+    "tag": "tendence",
+    "popularity": 12632
+  },
+  {
+    "tag": "foziness",
+    "popularity": 12615
+  },
+  {
+    "tag": "brickkiln lithify",
+    "popularity": 12598
+  },
+  {
+    "tag": "unpriest",
+    "popularity": 12581
+  },
+  {
+    "tag": "convincer",
+    "popularity": 12564
+  },
+  {
+    "tag": "mornlike",
+    "popularity": 12548
+  },
+  {
+    "tag": "overaddiction ostentatiousness",
+    "popularity": 12531
+  },
+  {
+    "tag": "diffusively moccasin pendom",
+    "popularity": 12514
+  },
+  {
+    "tag": "boose",
+    "popularity": 12498
+  },
+  {
+    "tag": "myonosus",
+    "popularity": 12481
+  },
+  {
+    "tag": "handsome",
+    "popularity": 12464
+  },
+  {
+    "tag": "paroxysmic",
+    "popularity": 12448
+  },
+  {
+    "tag": "Ulidian",
+    "popularity": 12431
+  },
+  {
+    "tag": "heartache",
+    "popularity": 12415
+  },
+  {
+    "tag": "torporize",
+    "popularity": 12398
+  },
+  {
+    "tag": "hippish",
+    "popularity": 12382
+  },
+  {
+    "tag": "stigmal militation",
+    "popularity": 12366
+  },
+  {
+    "tag": "matmaker",
+    "popularity": 12349
+  },
+  {
+    "tag": "marantaceous bivoluminous",
+    "popularity": 12333
+  },
+  {
+    "tag": "Uraniidae",
+    "popularity": 12317
+  },
+  {
+    "tag": "risper",
+    "popularity": 12301
+  },
+  {
+    "tag": "tintinnabulation",
+    "popularity": 12284
+  },
+  {
+    "tag": "tributorian",
+    "popularity": 12268
+  },
+  {
+    "tag": "ashamedly",
+    "popularity": 12252
+  },
+  {
+    "tag": "Macrourus",
+    "popularity": 12236
+  },
+  {
+    "tag": "Chora",
+    "popularity": 12220
+  },
+  {
+    "tag": "caul",
+    "popularity": 12204
+  },
+  {
+    "tag": "exsector",
+    "popularity": 12188
+  },
+  {
+    "tag": "acutish",
+    "popularity": 12172
+  },
+  {
+    "tag": "amphichrome",
+    "popularity": 12156
+  },
+  {
+    "tag": "guarder",
+    "popularity": 12140
+  },
+  {
+    "tag": "sculpturally",
+    "popularity": 12124
+  },
+  {
+    "tag": "benightmare",
+    "popularity": 12108
+  },
+  {
+    "tag": "chucky",
+    "popularity": 12093
+  },
+  {
+    "tag": "Venetian",
+    "popularity": 12077
+  },
+  {
+    "tag": "autotheater",
+    "popularity": 12061
+  },
+  {
+    "tag": "planarioid",
+    "popularity": 12045
+  },
+  {
+    "tag": "handkerchiefful",
+    "popularity": 12030
+  },
+  {
+    "tag": "fuliginousness potentize",
+    "popularity": 12014
+  },
+  {
+    "tag": "pantheum",
+    "popularity": 11998
+  },
+  {
+    "tag": "heavyweight",
+    "popularity": 11983
+  },
+  {
+    "tag": "unbrick",
+    "popularity": 11967
+  },
+  {
+    "tag": "duomachy",
+    "popularity": 11952
+  },
+  {
+    "tag": "polyphyodont",
+    "popularity": 11936
+  },
+  {
+    "tag": "hibernacle",
+    "popularity": 11921
+  },
+  {
+    "tag": "undistend",
+    "popularity": 11905
+  },
+  {
+    "tag": "hystericky",
+    "popularity": 11890
+  },
+  {
+    "tag": "paleolimnology",
+    "popularity": 11875
+  },
+  {
+    "tag": "cedarware",
+    "popularity": 11859
+  },
+  {
+    "tag": "overwrested",
+    "popularity": 11844
+  },
+  {
+    "tag": "Syriacism",
+    "popularity": 11829
+  },
+  {
+    "tag": "pretan",
+    "popularity": 11813
+  },
+  {
+    "tag": "formant",
+    "popularity": 11798
+  },
+  {
+    "tag": "pharmacopoeist Fedia",
+    "popularity": 11783
+  },
+  {
+    "tag": "exorcist eerisome",
+    "popularity": 11768
+  },
+  {
+    "tag": "separation",
+    "popularity": 11753
+  },
+  {
+    "tag": "infancy",
+    "popularity": 11738
+  },
+  {
+    "tag": "ecrasite",
+    "popularity": 11723
+  },
+  {
+    "tag": "propolize",
+    "popularity": 11708
+  },
+  {
+    "tag": "uncram phyllin",
+    "popularity": 11693
+  },
+  {
+    "tag": "thymopathy",
+    "popularity": 11678
+  },
+  {
+    "tag": "omniscient",
+    "popularity": 11663
+  },
+  {
+    "tag": "coussinet hazer",
+    "popularity": 11648
+  },
+  {
+    "tag": "contributiveness",
+    "popularity": 11633
+  },
+  {
+    "tag": "septifluous",
+    "popularity": 11618
+  },
+  {
+    "tag": "halfness",
+    "popularity": 11603
+  },
+  {
+    "tag": "tocher",
+    "popularity": 11589
+  },
+  {
+    "tag": "monotonist",
+    "popularity": 11574
+  },
+  {
+    "tag": "headchair",
+    "popularity": 11559
+  },
+  {
+    "tag": "everywhence",
+    "popularity": 11544
+  },
+  {
+    "tag": "gerate",
+    "popularity": 11530
+  },
+  {
+    "tag": "unrepellent",
+    "popularity": 11515
+  },
+  {
+    "tag": "inidoneous",
+    "popularity": 11500
+  },
+  {
+    "tag": "Rifi",
+    "popularity": 11486
+  },
+  {
+    "tag": "unstop",
+    "popularity": 11471
+  },
+  {
+    "tag": "conformer",
+    "popularity": 11457
+  },
+  {
+    "tag": "vivisectionally",
+    "popularity": 11442
+  },
+  {
+    "tag": "nonfinishing",
+    "popularity": 11428
+  },
+  {
+    "tag": "tyranness",
+    "popularity": 11413
+  },
+  {
+    "tag": "shepherdage havoc",
+    "popularity": 11399
+  },
+  {
+    "tag": "coronale",
+    "popularity": 11385
+  },
+  {
+    "tag": "airmarker",
+    "popularity": 11370
+  },
+  {
+    "tag": "subpanel",
+    "popularity": 11356
+  },
+  {
+    "tag": "conciliation",
+    "popularity": 11342
+  },
+  {
+    "tag": "supergun",
+    "popularity": 11327
+  },
+  {
+    "tag": "photoheliography",
+    "popularity": 11313
+  },
+  {
+    "tag": "cacosmia",
+    "popularity": 11299
+  },
+  {
+    "tag": "caressant",
+    "popularity": 11285
+  },
+  {
+    "tag": "swivet",
+    "popularity": 11270
+  },
+  {
+    "tag": "coddler",
+    "popularity": 11256
+  },
+  {
+    "tag": "rakehellish",
+    "popularity": 11242
+  },
+  {
+    "tag": "recohabitation",
+    "popularity": 11228
+  },
+  {
+    "tag": "postillator",
+    "popularity": 11214
+  },
+  {
+    "tag": "receipt",
+    "popularity": 11200
+  },
+  {
+    "tag": "nonconformistical",
+    "popularity": 11186
+  },
+  {
+    "tag": "unglorified",
+    "popularity": 11172
+  },
+  {
+    "tag": "unordinariness",
+    "popularity": 11158
+  },
+  {
+    "tag": "tetrahydroxy",
+    "popularity": 11144
+  },
+  {
+    "tag": "haploperistomic corporeity",
+    "popularity": 11130
+  },
+  {
+    "tag": "varical",
+    "popularity": 11117
+  },
+  {
+    "tag": "pilferment",
+    "popularity": 11103
+  },
+  {
+    "tag": "reverentially playcraft",
+    "popularity": 11089
+  },
+  {
+    "tag": "unretentive",
+    "popularity": 11075
+  },
+  {
+    "tag": "readiness",
+    "popularity": 11061
+  },
+  {
+    "tag": "thermomagnetism",
+    "popularity": 11048
+  },
+  {
+    "tag": "spotless",
+    "popularity": 11034
+  },
+  {
+    "tag": "semishrubby",
+    "popularity": 11020
+  },
+  {
+    "tag": "metrotomy",
+    "popularity": 11007
+  },
+  {
+    "tag": "hocker",
+    "popularity": 10993
+  },
+  {
+    "tag": "anecdotal",
+    "popularity": 10979
+  },
+  {
+    "tag": "tetrabelodont",
+    "popularity": 10966
+  },
+  {
+    "tag": "Ramillied",
+    "popularity": 10952
+  },
+  {
+    "tag": "sympatheticism",
+    "popularity": 10939
+  },
+  {
+    "tag": "kiskatom",
+    "popularity": 10925
+  },
+  {
+    "tag": "concyclically",
+    "popularity": 10912
+  },
+  {
+    "tag": "tunicless",
+    "popularity": 10899
+  },
+  {
+    "tag": "formalistic",
+    "popularity": 10885
+  },
+  {
+    "tag": "thermacogenesis",
+    "popularity": 10872
+  },
+  {
+    "tag": "multimotored",
+    "popularity": 10858
+  },
+  {
+    "tag": "inversive",
+    "popularity": 10845
+  },
+  {
+    "tag": "Jatki",
+    "popularity": 10832
+  },
+  {
+    "tag": "highest",
+    "popularity": 10818
+  },
+  {
+    "tag": "rubidic",
+    "popularity": 10805
+  },
+  {
+    "tag": "acranial",
+    "popularity": 10792
+  },
+  {
+    "tag": "pulvinulus",
+    "popularity": 10779
+  },
+  {
+    "tag": "nattiness",
+    "popularity": 10766
+  },
+  {
+    "tag": "antisimoniacal",
+    "popularity": 10752
+  },
+  {
+    "tag": "tetanize",
+    "popularity": 10739
+  },
+  {
+    "tag": "spectrophobia",
+    "popularity": 10726
+  },
+  {
+    "tag": "monopolitical",
+    "popularity": 10713
+  },
+  {
+    "tag": "teallite",
+    "popularity": 10700
+  },
+  {
+    "tag": "alicyclic interpellator",
+    "popularity": 10687
+  },
+  {
+    "tag": "nonsynthesized",
+    "popularity": 10674
+  },
+  {
+    "tag": "wheelwrighting",
+    "popularity": 10661
+  },
+  {
+    "tag": "pelliculate",
+    "popularity": 10648
+  },
+  {
+    "tag": "Euphyllopoda",
+    "popularity": 10635
+  },
+  {
+    "tag": "graver",
+    "popularity": 10622
+  },
+  {
+    "tag": "automorph",
+    "popularity": 10609
+  },
+  {
+    "tag": "underhanded",
+    "popularity": 10597
+  },
+  {
+    "tag": "causal",
+    "popularity": 10584
+  },
+  {
+    "tag": "odoom",
+    "popularity": 10571
+  },
+  {
+    "tag": "apodictical",
+    "popularity": 10558
+  },
+  {
+    "tag": "foundery",
+    "popularity": 10545
+  },
+  {
+    "tag": "unneighbored",
+    "popularity": 10533
+  },
+  {
+    "tag": "woolshearing",
+    "popularity": 10520
+  },
+  {
+    "tag": "boschveld",
+    "popularity": 10507
+  },
+  {
+    "tag": "unhardened lipopod",
+    "popularity": 10495
+  },
+  {
+    "tag": "unenriching",
+    "popularity": 10482
+  },
+  {
+    "tag": "spak",
+    "popularity": 10469
+  },
+  {
+    "tag": "yogasana",
+    "popularity": 10457
+  },
+  {
+    "tag": "depoetize",
+    "popularity": 10444
+  },
+  {
+    "tag": "parousiamania",
+    "popularity": 10432
+  },
+  {
+    "tag": "longlegs",
+    "popularity": 10419
+  },
+  {
+    "tag": "gelatinizability",
+    "popularity": 10407
+  },
+  {
+    "tag": "edeology",
+    "popularity": 10394
+  },
+  {
+    "tag": "sodwork",
+    "popularity": 10382
+  },
+  {
+    "tag": "somnambule",
+    "popularity": 10369
+  },
+  {
+    "tag": "antiquing",
+    "popularity": 10357
+  },
+  {
+    "tag": "intaker",
+    "popularity": 10344
+  },
+  {
+    "tag": "Gerberia",
+    "popularity": 10332
+  },
+  {
+    "tag": "preadmit",
+    "popularity": 10320
+  },
+  {
+    "tag": "bullhorn",
+    "popularity": 10307
+  },
+  {
+    "tag": "sororal",
+    "popularity": 10295
+  },
+  {
+    "tag": "phaeophyceous",
+    "popularity": 10283
+  },
+  {
+    "tag": "omphalopsychite",
+    "popularity": 10271
+  },
+  {
+    "tag": "substantious",
+    "popularity": 10258
+  },
+  {
+    "tag": "undemonstratively",
+    "popularity": 10246
+  },
+  {
+    "tag": "corallike blackit",
+    "popularity": 10234
+  },
+  {
+    "tag": "amoebous",
+    "popularity": 10222
+  },
+  {
+    "tag": "Polypodium",
+    "popularity": 10210
+  },
+  {
+    "tag": "blodite",
+    "popularity": 10198
+  },
+  {
+    "tag": "hordarian",
+    "popularity": 10186
+  },
+  {
+    "tag": "nonmoral",
+    "popularity": 10174
+  },
+  {
+    "tag": "dredgeful",
+    "popularity": 10162
+  },
+  {
+    "tag": "nourishingly",
+    "popularity": 10150
+  },
+  {
+    "tag": "seamy",
+    "popularity": 10138
+  },
+  {
+    "tag": "vara",
+    "popularity": 10126
+  },
+  {
+    "tag": "incorruptibleness",
+    "popularity": 10114
+  },
+  {
+    "tag": "manipulator",
+    "popularity": 10102
+  },
+  {
+    "tag": "chromodiascope uncountably",
+    "popularity": 10090
+  },
+  {
+    "tag": "typhemia",
+    "popularity": 10078
+  },
+  {
+    "tag": "Smalcaldic",
+    "popularity": 10066
+  },
+  {
+    "tag": "precontrive",
+    "popularity": 10054
+  },
+  {
+    "tag": "sowarry",
+    "popularity": 10042
+  },
+  {
+    "tag": "monopodic",
+    "popularity": 10031
+  },
+  {
+    "tag": "recodify",
+    "popularity": 10019
+  },
+  {
+    "tag": "phosphowolframic rimple",
+    "popularity": 10007
+  },
+  {
+    "tag": "triconch",
+    "popularity": 9995
+  },
+  {
+    "tag": "pycnodontoid",
+    "popularity": 9984
+  },
+  {
+    "tag": "bradyspermatism",
+    "popularity": 9972
+  },
+  {
+    "tag": "extensionist",
+    "popularity": 9960
+  },
+  {
+    "tag": "characterize",
+    "popularity": 9949
+  },
+  {
+    "tag": "anatreptic proteolytic",
+    "popularity": 9937
+  },
+  {
+    "tag": "waterboard",
+    "popularity": 9925
+  },
+  {
+    "tag": "allopathically",
+    "popularity": 9914
+  },
+  {
+    "tag": "arithmetician",
+    "popularity": 9902
+  },
+  {
+    "tag": "subsist",
+    "popularity": 9891
+  },
+  {
+    "tag": "Islamitish",
+    "popularity": 9879
+  },
+  {
+    "tag": "biddy",
+    "popularity": 9868
+  },
+  {
+    "tag": "reverberation",
+    "popularity": 9856
+  },
+  {
+    "tag": "Zaporogue",
+    "popularity": 9845
+  },
+  {
+    "tag": "soapberry",
+    "popularity": 9833
+  },
+  {
+    "tag": "physiognomics",
+    "popularity": 9822
+  },
+  {
+    "tag": "hospitalization",
+    "popularity": 9810
+  },
+  {
+    "tag": "dissembler",
+    "popularity": 9799
+  },
+  {
+    "tag": "festinate",
+    "popularity": 9788
+  },
+  {
+    "tag": "angiectopia",
+    "popularity": 9776
+  },
+  {
+    "tag": "Pulicidae",
+    "popularity": 9765
+  },
+  {
+    "tag": "beslimer",
+    "popularity": 9754
+  },
+  {
+    "tag": "nontreaty",
+    "popularity": 9743
+  },
+  {
+    "tag": "unhaggled",
+    "popularity": 9731
+  },
+  {
+    "tag": "catfall",
+    "popularity": 9720
+  },
+  {
+    "tag": "stola",
+    "popularity": 9709
+  },
+  {
+    "tag": "pataco",
+    "popularity": 9698
+  },
+  {
+    "tag": "ontologistic",
+    "popularity": 9686
+  },
+  {
+    "tag": "aerosphere",
+    "popularity": 9675
+  },
+  {
+    "tag": "deobstruent",
+    "popularity": 9664
+  },
+  {
+    "tag": "threepence",
+    "popularity": 9653
+  },
+  {
+    "tag": "cyprinoid",
+    "popularity": 9642
+  },
+  {
+    "tag": "overbank",
+    "popularity": 9631
+  },
+  {
+    "tag": "prostyle",
+    "popularity": 9620
+  },
+  {
+    "tag": "photoactivation",
+    "popularity": 9609
+  },
+  {
+    "tag": "homothetic",
+    "popularity": 9598
+  },
+  {
+    "tag": "roguedom",
+    "popularity": 9587
+  },
+  {
+    "tag": "underschool",
+    "popularity": 9576
+  },
+  {
+    "tag": "tractility",
+    "popularity": 9565
+  },
+  {
+    "tag": "gardenin",
+    "popularity": 9554
+  },
+  {
+    "tag": "Micromastictora",
+    "popularity": 9543
+  },
+  {
+    "tag": "gossypine",
+    "popularity": 9532
+  },
+  {
+    "tag": "amylodyspepsia",
+    "popularity": 9521
+  },
+  {
+    "tag": "Luciana",
+    "popularity": 9510
+  },
+  {
+    "tag": "meetly nonfisherman",
+    "popularity": 9500
+  },
+  {
+    "tag": "backhanded",
+    "popularity": 9489
+  },
+  {
+    "tag": "decrustation",
+    "popularity": 9478
+  },
+  {
+    "tag": "pinrail",
+    "popularity": 9467
+  },
+  {
+    "tag": "Mahori",
+    "popularity": 9456
+  },
+  {
+    "tag": "unsizable",
+    "popularity": 9446
+  },
+  {
+    "tag": "disawa",
+    "popularity": 9435
+  },
+  {
+    "tag": "launderability inconsidered",
+    "popularity": 9424
+  },
+  {
+    "tag": "unclassical",
+    "popularity": 9414
+  },
+  {
+    "tag": "inobtrusiveness",
+    "popularity": 9403
+  },
+  {
+    "tag": "sialogenous",
+    "popularity": 9392
+  },
+  {
+    "tag": "sulphonamide",
+    "popularity": 9382
+  },
+  {
+    "tag": "diluvion",
+    "popularity": 9371
+  },
+  {
+    "tag": "deuteranope",
+    "popularity": 9361
+  },
+  {
+    "tag": "addition",
+    "popularity": 9350
+  },
+  {
+    "tag": "bockeret",
+    "popularity": 9339
+  },
+  {
+    "tag": "unidentified",
+    "popularity": 9329
+  },
+  {
+    "tag": "caryatic",
+    "popularity": 9318
+  },
+  {
+    "tag": "misattribution",
+    "popularity": 9308
+  },
+  {
+    "tag": "outray",
+    "popularity": 9297
+  },
+  {
+    "tag": "areometrical",
+    "popularity": 9287
+  },
+  {
+    "tag": "antilogism",
+    "popularity": 9277
+  },
+  {
+    "tag": "inadjustable",
+    "popularity": 9266
+  },
+  {
+    "tag": "byssus",
+    "popularity": 9256
+  },
+  {
+    "tag": "trun",
+    "popularity": 9245
+  },
+  {
+    "tag": "thereology",
+    "popularity": 9235
+  },
+  {
+    "tag": "extort",
+    "popularity": 9225
+  },
+  {
+    "tag": "bumpkin",
+    "popularity": 9214
+  },
+  {
+    "tag": "sulphobenzide",
+    "popularity": 9204
+  },
+  {
+    "tag": "hydrogeology",
+    "popularity": 9194
+  },
+  {
+    "tag": "nidulariaceous",
+    "popularity": 9183
+  },
+  {
+    "tag": "propodiale",
+    "popularity": 9173
+  },
+  {
+    "tag": "fierily",
+    "popularity": 9163
+  },
+  {
+    "tag": "aerotonometry",
+    "popularity": 9153
+  },
+  {
+    "tag": "pelobatid oversuperstitious",
+    "popularity": 9142
+  },
+  {
+    "tag": "restringent",
+    "popularity": 9132
+  },
+  {
+    "tag": "tetrapodic",
+    "popularity": 9122
+  },
+  {
+    "tag": "heroicness Vendidad",
+    "popularity": 9112
+  },
+  {
+    "tag": "Sphingurus",
+    "popularity": 9102
+  },
+  {
+    "tag": "sclerote",
+    "popularity": 9092
+  },
+  {
+    "tag": "unkeyed",
+    "popularity": 9082
+  },
+  {
+    "tag": "superparliamentary",
+    "popularity": 9072
+  },
+  {
+    "tag": "hetericism",
+    "popularity": 9061
+  },
+  {
+    "tag": "hucklebone",
+    "popularity": 9051
+  },
+  {
+    "tag": "yojan",
+    "popularity": 9041
+  },
+  {
+    "tag": "bossed",
+    "popularity": 9031
+  },
+  {
+    "tag": "spiderwork",
+    "popularity": 9021
+  },
+  {
+    "tag": "millfeed dullery",
+    "popularity": 9011
+  },
+  {
+    "tag": "adnoun",
+    "popularity": 9001
+  },
+  {
+    "tag": "mesometric",
+    "popularity": 8992
+  },
+  {
+    "tag": "doublehandedness",
+    "popularity": 8982
+  },
+  {
+    "tag": "suppurant",
+    "popularity": 8972
+  },
+  {
+    "tag": "Berlinize",
+    "popularity": 8962
+  },
+  {
+    "tag": "sontag",
+    "popularity": 8952
+  },
+  {
+    "tag": "biplane",
+    "popularity": 8942
+  },
+  {
+    "tag": "insula",
+    "popularity": 8932
+  },
+  {
+    "tag": "unbrand",
+    "popularity": 8922
+  },
+  {
+    "tag": "Basilosaurus",
+    "popularity": 8913
+  },
+  {
+    "tag": "prenomination",
+    "popularity": 8903
+  },
+  {
+    "tag": "untextual",
+    "popularity": 8893
+  },
+  {
+    "tag": "coleslaw",
+    "popularity": 8883
+  },
+  {
+    "tag": "langsyne",
+    "popularity": 8874
+  },
+  {
+    "tag": "impede",
+    "popularity": 8864
+  },
+  {
+    "tag": "irrigator",
+    "popularity": 8854
+  },
+  {
+    "tag": "deflocculation",
+    "popularity": 8844
+  },
+  {
+    "tag": "narghile",
+    "popularity": 8835
+  },
+  {
+    "tag": "unguardedly ebenaceous",
+    "popularity": 8825
+  },
+  {
+    "tag": "conversantly subocular",
+    "popularity": 8815
+  },
+  {
+    "tag": "hydroponic",
+    "popularity": 8806
+  },
+  {
+    "tag": "anthropopsychism",
+    "popularity": 8796
+  },
+  {
+    "tag": "panoptic",
+    "popularity": 8787
+  },
+  {
+    "tag": "insufferable",
+    "popularity": 8777
+  },
+  {
+    "tag": "salema",
+    "popularity": 8768
+  },
+  {
+    "tag": "Myriapoda",
+    "popularity": 8758
+  },
+  {
+    "tag": "regarrison",
+    "popularity": 8748
+  },
+  {
+    "tag": "overlearned",
+    "popularity": 8739
+  },
+  {
+    "tag": "ultraroyalist conventical bureaucratical",
+    "popularity": 8729
+  },
+  {
+    "tag": "epicaridan",
+    "popularity": 8720
+  },
+  {
+    "tag": "poetastress",
+    "popularity": 8711
+  },
+  {
+    "tag": "monophthalmus",
+    "popularity": 8701
+  },
+  {
+    "tag": "simnel",
+    "popularity": 8692
+  },
+  {
+    "tag": "compotor",
+    "popularity": 8682
+  },
+  {
+    "tag": "hydrolase",
+    "popularity": 8673
+  },
+  {
+    "tag": "attemptless",
+    "popularity": 8663
+  },
+  {
+    "tag": "visceroptosis",
+    "popularity": 8654
+  },
+  {
+    "tag": "unpreparedly",
+    "popularity": 8645
+  },
+  {
+    "tag": "mastage",
+    "popularity": 8635
+  },
+  {
+    "tag": "preinfluence",
+    "popularity": 8626
+  },
+  {
+    "tag": "Siwan",
+    "popularity": 8617
+  },
+  {
+    "tag": "ceratotheca belvedere",
+    "popularity": 8607
+  },
+  {
+    "tag": "disenablement",
+    "popularity": 8598
+  },
+  {
+    "tag": "nine",
+    "popularity": 8589
+  },
+  {
+    "tag": "spellingdown abridgment",
+    "popularity": 8580
+  },
+  {
+    "tag": "twilightless",
+    "popularity": 8571
+  },
+  {
+    "tag": "overflow",
+    "popularity": 8561
+  },
+  {
+    "tag": "mismeasurement",
+    "popularity": 8552
+  },
+  {
+    "tag": "nawabship",
+    "popularity": 8543
+  },
+  {
+    "tag": "Phrynosoma",
+    "popularity": 8534
+  },
+  {
+    "tag": "unanticipatingly",
+    "popularity": 8525
+  },
+  {
+    "tag": "blankite",
+    "popularity": 8516
+  },
+  {
+    "tag": "role",
+    "popularity": 8506
+  },
+  {
+    "tag": "peperine edelweiss",
+    "popularity": 8497
+  },
+  {
+    "tag": "unhysterical",
+    "popularity": 8488
+  },
+  {
+    "tag": "attentiveness",
+    "popularity": 8479
+  },
+  {
+    "tag": "scintillant",
+    "popularity": 8470
+  },
+  {
+    "tag": "stenostomatous",
+    "popularity": 8461
+  },
+  {
+    "tag": "pectinite",
+    "popularity": 8452
+  },
+  {
+    "tag": "herring",
+    "popularity": 8443
+  },
+  {
+    "tag": "interroom",
+    "popularity": 8434
+  },
+  {
+    "tag": "laccol",
+    "popularity": 8425
+  },
+  {
+    "tag": "unpartably kylite",
+    "popularity": 8416
+  },
+  {
+    "tag": "spirivalve",
+    "popularity": 8407
+  },
+  {
+    "tag": "hoosegow",
+    "popularity": 8398
+  },
+  {
+    "tag": "doat",
+    "popularity": 8389
+  },
+  {
+    "tag": "amphibian",
+    "popularity": 8380
+  },
+  {
+    "tag": "exposit",
+    "popularity": 8371
+  },
+  {
+    "tag": "canopy",
+    "popularity": 8363
+  },
+  {
+    "tag": "houndlike",
+    "popularity": 8354
+  },
+  {
+    "tag": "spikebill",
+    "popularity": 8345
+  },
+  {
+    "tag": "wiseacre pyrotechnic",
+    "popularity": 8336
+  },
+  {
+    "tag": "confessingly woodman",
+    "popularity": 8327
+  },
+  {
+    "tag": "overside",
+    "popularity": 8318
+  },
+  {
+    "tag": "oftwhiles",
+    "popularity": 8310
+  },
+  {
+    "tag": "Musophagidae",
+    "popularity": 8301
+  },
+  {
+    "tag": "slumberer",
+    "popularity": 8292
+  },
+  {
+    "tag": "leiotrichy",
+    "popularity": 8283
+  },
+  {
+    "tag": "Mantispidae",
+    "popularity": 8275
+  },
+  {
+    "tag": "perceptually",
+    "popularity": 8266
+  },
+  {
+    "tag": "biller",
+    "popularity": 8257
+  },
+  {
+    "tag": "eudaemonical",
+    "popularity": 8249
+  },
+  {
+    "tag": "underfiend",
+    "popularity": 8240
+  },
+  {
+    "tag": "impartible",
+    "popularity": 8231
+  },
+  {
+    "tag": "saxicavous",
+    "popularity": 8223
+  },
+  {
+    "tag": "yapster",
+    "popularity": 8214
+  },
+  {
+    "tag": "aliseptal",
+    "popularity": 8205
+  },
+  {
+    "tag": "omniparient",
+    "popularity": 8197
+  },
+  {
+    "tag": "nishiki",
+    "popularity": 8188
+  },
+  {
+    "tag": "yuzluk",
+    "popularity": 8180
+  },
+  {
+    "tag": "solderer",
+    "popularity": 8171
+  },
+  {
+    "tag": "Pinna",
+    "popularity": 8162
+  },
+  {
+    "tag": "reinterfere",
+    "popularity": 8154
+  },
+  {
+    "tag": "superepic",
+    "popularity": 8145
+  },
+  {
+    "tag": "ronquil",
+    "popularity": 8137
+  },
+  {
+    "tag": "bratstvo",
+    "popularity": 8128
+  },
+  {
+    "tag": "Thea",
+    "popularity": 8120
+  },
+  {
+    "tag": "hermaphroditical",
+    "popularity": 8111
+  },
+  {
+    "tag": "enlief",
+    "popularity": 8103
+  },
+  {
+    "tag": "Jesuate",
+    "popularity": 8095
+  },
+  {
+    "tag": "gaysome",
+    "popularity": 8086
+  },
+  {
+    "tag": "iliohypogastric",
+    "popularity": 8078
+  },
+  {
+    "tag": "regardance",
+    "popularity": 8069
+  },
+  {
+    "tag": "cumulately",
+    "popularity": 8061
+  },
+  {
+    "tag": "haustorial nucleolocentrosome",
+    "popularity": 8053
+  },
+  {
+    "tag": "cosmocrat",
+    "popularity": 8044
+  },
+  {
+    "tag": "onyxitis",
+    "popularity": 8036
+  },
+  {
+    "tag": "Cabinda",
+    "popularity": 8028
+  },
+  {
+    "tag": "coresort",
+    "popularity": 8019
+  },
+  {
+    "tag": "drusy preformant",
+    "popularity": 8011
+  },
+  {
+    "tag": "piningly",
+    "popularity": 8003
+  },
+  {
+    "tag": "bootlessly",
+    "popularity": 7994
+  },
+  {
+    "tag": "talari",
+    "popularity": 7986
+  },
+  {
+    "tag": "amidoacetal",
+    "popularity": 7978
+  },
+  {
+    "tag": "pschent",
+    "popularity": 7970
+  },
+  {
+    "tag": "consumptional scarer titivate",
+    "popularity": 7962
+  },
+  {
+    "tag": "Anserinae",
+    "popularity": 7953
+  },
+  {
+    "tag": "flaunter",
+    "popularity": 7945
+  },
+  {
+    "tag": "reindeer",
+    "popularity": 7937
+  },
+  {
+    "tag": "disparage",
+    "popularity": 7929
+  },
+  {
+    "tag": "superheat",
+    "popularity": 7921
+  },
+  {
+    "tag": "Chromatium",
+    "popularity": 7912
+  },
+  {
+    "tag": "Tina",
+    "popularity": 7904
+  },
+  {
+    "tag": "rededicatory",
+    "popularity": 7896
+  },
+  {
+    "tag": "nontransient",
+    "popularity": 7888
+  },
+  {
+    "tag": "Phocaean brinkless",
+    "popularity": 7880
+  },
+  {
+    "tag": "ventriculose",
+    "popularity": 7872
+  },
+  {
+    "tag": "upplough",
+    "popularity": 7864
+  },
+  {
+    "tag": "succorless",
+    "popularity": 7856
+  },
+  {
+    "tag": "hayrake",
+    "popularity": 7848
+  },
+  {
+    "tag": "merriness amorphia",
+    "popularity": 7840
+  },
+  {
+    "tag": "merycism",
+    "popularity": 7832
+  },
+  {
+    "tag": "checkrow",
+    "popularity": 7824
+  },
+  {
+    "tag": "scry",
+    "popularity": 7816
+  },
+  {
+    "tag": "obvolve",
+    "popularity": 7808
+  },
+  {
+    "tag": "orchard",
+    "popularity": 7800
+  },
+  {
+    "tag": "isomerize",
+    "popularity": 7792
+  },
+  {
+    "tag": "competitrix",
+    "popularity": 7784
+  },
+  {
+    "tag": "unbannered",
+    "popularity": 7776
+  },
+  {
+    "tag": "undoctrined",
+    "popularity": 7768
+  },
+  {
+    "tag": "theologian",
+    "popularity": 7760
+  },
+  {
+    "tag": "nebby",
+    "popularity": 7752
+  },
+  {
+    "tag": "Cardiazol",
+    "popularity": 7745
+  },
+  {
+    "tag": "phagedenic",
+    "popularity": 7737
+  },
+  {
+    "tag": "nostalgic",
+    "popularity": 7729
+  },
+  {
+    "tag": "orthodoxy",
+    "popularity": 7721
+  },
+  {
+    "tag": "oversanguine",
+    "popularity": 7713
+  },
+  {
+    "tag": "lish",
+    "popularity": 7705
+  },
+  {
+    "tag": "ketogenic",
+    "popularity": 7698
+  },
+  {
+    "tag": "syndicalize",
+    "popularity": 7690
+  },
+  {
+    "tag": "leeftail",
+    "popularity": 7682
+  },
+  {
+    "tag": "bulbomedullary",
+    "popularity": 7674
+  },
+  {
+    "tag": "reletter",
+    "popularity": 7667
+  },
+  {
+    "tag": "bitterly",
+    "popularity": 7659
+  },
+  {
+    "tag": "participatory",
+    "popularity": 7651
+  },
+  {
+    "tag": "baldberry",
+    "popularity": 7643
+  },
+  {
+    "tag": "prowaterpower",
+    "popularity": 7636
+  },
+  {
+    "tag": "lexicographical",
+    "popularity": 7628
+  },
+  {
+    "tag": "Anisodactyli",
+    "popularity": 7620
+  },
+  {
+    "tag": "amphipodous",
+    "popularity": 7613
+  },
+  {
+    "tag": "triglandular",
+    "popularity": 7605
+  },
+  {
+    "tag": "xanthopsin",
+    "popularity": 7597
+  },
+  {
+    "tag": "indefinitude",
+    "popularity": 7590
+  },
+  {
+    "tag": "bookworm",
+    "popularity": 7582
+  },
+  {
+    "tag": "suffocative",
+    "popularity": 7574
+  },
+  {
+    "tag": "uncongested tyrant",
+    "popularity": 7567
+  },
+  {
+    "tag": "alow harmoniously Pamir",
+    "popularity": 7559
+  },
+  {
+    "tag": "monander",
+    "popularity": 7552
+  },
+  {
+    "tag": "bagatelle",
+    "popularity": 7544
+  },
+  {
+    "tag": "membranology",
+    "popularity": 7537
+  },
+  {
+    "tag": "parturifacient",
+    "popularity": 7529
+  },
+  {
+    "tag": "excitovascular",
+    "popularity": 7522
+  },
+  {
+    "tag": "homopolar",
+    "popularity": 7514
+  },
+  {
+    "tag": "phobiac",
+    "popularity": 7507
+  },
+  {
+    "tag": "clype",
+    "popularity": 7499
+  },
+  {
+    "tag": "unsubversive",
+    "popularity": 7492
+  },
+  {
+    "tag": "bostrychoidal scorpionwort",
+    "popularity": 7484
+  },
+  {
+    "tag": "biliteralism",
+    "popularity": 7477
+  },
+  {
+    "tag": "dentatocostate",
+    "popularity": 7469
+  },
+  {
+    "tag": "Pici",
+    "popularity": 7462
+  },
+  {
+    "tag": "sideritic",
+    "popularity": 7454
+  },
+  {
+    "tag": "syntaxis",
+    "popularity": 7447
+  },
+  {
+    "tag": "ingest",
+    "popularity": 7440
+  },
+  {
+    "tag": "rigmarolish",
+    "popularity": 7432
+  },
+  {
+    "tag": "ocreaceous",
+    "popularity": 7425
+  },
+  {
+    "tag": "hyperbrachyskelic",
+    "popularity": 7418
+  },
+  {
+    "tag": "basophobia",
+    "popularity": 7410
+  },
+  {
+    "tag": "substantialness",
+    "popularity": 7403
+  },
+  {
+    "tag": "agglutinoid",
+    "popularity": 7396
+  },
+  {
+    "tag": "longleaf",
+    "popularity": 7388
+  },
+  {
+    "tag": "electroengraving",
+    "popularity": 7381
+  },
+  {
+    "tag": "laparoenterotomy",
+    "popularity": 7374
+  },
+  {
+    "tag": "oxalylurea",
+    "popularity": 7366
+  },
+  {
+    "tag": "unattaintedly",
+    "popularity": 7359
+  },
+  {
+    "tag": "pennystone",
+    "popularity": 7352
+  },
+  {
+    "tag": "Plumbaginaceae",
+    "popularity": 7345
+  },
+  {
+    "tag": "horntip",
+    "popularity": 7337
+  },
+  {
+    "tag": "begrudge",
+    "popularity": 7330
+  },
+  {
+    "tag": "bechignoned",
+    "popularity": 7323
+  },
+  {
+    "tag": "hologonidium",
+    "popularity": 7316
+  },
+  {
+    "tag": "Pulian",
+    "popularity": 7309
+  },
+  {
+    "tag": "gratulation",
+    "popularity": 7301
+  },
+  {
+    "tag": "Sebright",
+    "popularity": 7294
+  },
+  {
+    "tag": "coinstantaneous emotionally",
+    "popularity": 7287
+  },
+  {
+    "tag": "thoracostracan",
+    "popularity": 7280
+  },
+  {
+    "tag": "saurodont",
+    "popularity": 7273
+  },
+  {
+    "tag": "coseat",
+    "popularity": 7266
+  },
+  {
+    "tag": "irascibility",
+    "popularity": 7259
+  },
+  {
+    "tag": "occlude",
+    "popularity": 7251
+  },
+  {
+    "tag": "metallurgist",
+    "popularity": 7244
+  },
+  {
+    "tag": "extraviolet",
+    "popularity": 7237
+  },
+  {
+    "tag": "clinic",
+    "popularity": 7230
+  },
+  {
+    "tag": "skater",
+    "popularity": 7223
+  },
+  {
+    "tag": "linguistic",
+    "popularity": 7216
+  },
+  {
+    "tag": "attacheship",
+    "popularity": 7209
+  },
+  {
+    "tag": "Rachianectes",
+    "popularity": 7202
+  },
+  {
+    "tag": "foliolose",
+    "popularity": 7195
+  },
+  {
+    "tag": "claudetite",
+    "popularity": 7188
+  },
+  {
+    "tag": "aphidian scratching",
+    "popularity": 7181
+  },
+  {
+    "tag": "Carida",
+    "popularity": 7174
+  },
+  {
+    "tag": "tiepin polymicroscope",
+    "popularity": 7167
+  },
+  {
+    "tag": "telpherage",
+    "popularity": 7160
+  },
+  {
+    "tag": "meek",
+    "popularity": 7153
+  },
+  {
+    "tag": "swiftness",
+    "popularity": 7146
+  },
+  {
+    "tag": "gentes",
+    "popularity": 7139
+  },
+  {
+    "tag": "uncommemorated",
+    "popularity": 7132
+  },
+  {
+    "tag": "Lazarus",
+    "popularity": 7125
+  },
+  {
+    "tag": "redivive",
+    "popularity": 7119
+  },
+  {
+    "tag": "nonfebrile",
+    "popularity": 7112
+  },
+  {
+    "tag": "nymphet",
+    "popularity": 7105
+  },
+  {
+    "tag": "areologically",
+    "popularity": 7098
+  },
+  {
+    "tag": "undonkey",
+    "popularity": 7091
+  },
+  {
+    "tag": "projecting",
+    "popularity": 7084
+  },
+  {
+    "tag": "pinnigrade",
+    "popularity": 7077
+  },
+  {
+    "tag": "butylation",
+    "popularity": 7071
+  },
+  {
+    "tag": "philologistic lenticle",
+    "popularity": 7064
+  },
+  {
+    "tag": "nooky",
+    "popularity": 7057
+  },
+  {
+    "tag": "incestuousness",
+    "popularity": 7050
+  },
+  {
+    "tag": "palingenetically",
+    "popularity": 7043
+  },
+  {
+    "tag": "mitochondria",
+    "popularity": 7037
+  },
+  {
+    "tag": "truthify",
+    "popularity": 7030
+  },
+  {
+    "tag": "titanyl",
+    "popularity": 7023
+  },
+  {
+    "tag": "bestride",
+    "popularity": 7016
+  },
+  {
+    "tag": "chende",
+    "popularity": 7010
+  },
+  {
+    "tag": "Chaucerian monophote",
+    "popularity": 7003
+  },
+  {
+    "tag": "cutback",
+    "popularity": 6996
+  },
+  {
+    "tag": "unpatiently",
+    "popularity": 6989
+  },
+  {
+    "tag": "subvitreous",
+    "popularity": 6983
+  },
+  {
+    "tag": "organizable",
+    "popularity": 6976
+  },
+  {
+    "tag": "anniverse uncomprehensible",
+    "popularity": 6969
+  },
+  {
+    "tag": "hyalescence",
+    "popularity": 6963
+  },
+  {
+    "tag": "amniochorial",
+    "popularity": 6956
+  },
+  {
+    "tag": "Corybantian",
+    "popularity": 6949
+  },
+  {
+    "tag": "genocide Scaphitidae",
+    "popularity": 6943
+  },
+  {
+    "tag": "accordionist",
+    "popularity": 6936
+  },
+  {
+    "tag": "becheck",
+    "popularity": 6930
+  },
+  {
+    "tag": "overproduce",
+    "popularity": 6923
+  },
+  {
+    "tag": "unmaniac frijolillo",
+    "popularity": 6916
+  },
+  {
+    "tag": "multisulcated",
+    "popularity": 6910
+  },
+  {
+    "tag": "wennebergite",
+    "popularity": 6903
+  },
+  {
+    "tag": "tautousious mowth",
+    "popularity": 6897
+  },
+  {
+    "tag": "marigold",
+    "popularity": 6890
+  },
+  {
+    "tag": "affray",
+    "popularity": 6884
+  },
+  {
+    "tag": "nonidolatrous",
+    "popularity": 6877
+  },
+  {
+    "tag": "aphrasia",
+    "popularity": 6871
+  },
+  {
+    "tag": "muddlingly",
+    "popularity": 6864
+  },
+  {
+    "tag": "clear",
+    "popularity": 6858
+  },
+  {
+    "tag": "Clitoria",
+    "popularity": 6851
+  },
+  {
+    "tag": "apportionment underwaist",
+    "popularity": 6845
+  },
+  {
+    "tag": "kodakist",
+    "popularity": 6838
+  },
+  {
+    "tag": "Momotidae",
+    "popularity": 6832
+  },
+  {
+    "tag": "cryptovalency",
+    "popularity": 6825
+  },
+  {
+    "tag": "floe",
+    "popularity": 6819
+  },
+  {
+    "tag": "aphagia",
+    "popularity": 6812
+  },
+  {
+    "tag": "brontograph",
+    "popularity": 6806
+  },
+  {
+    "tag": "tubulous",
+    "popularity": 6799
+  },
+  {
+    "tag": "unhorse",
+    "popularity": 6793
+  },
+  {
+    "tag": "chlordane",
+    "popularity": 6787
+  },
+  {
+    "tag": "colloquy brochan",
+    "popularity": 6780
+  },
+  {
+    "tag": "sloosh",
+    "popularity": 6774
+  },
+  {
+    "tag": "battered",
+    "popularity": 6767
+  },
+  {
+    "tag": "monocularity pluriguttulate",
+    "popularity": 6761
+  },
+  {
+    "tag": "chiastoneury",
+    "popularity": 6755
+  },
+  {
+    "tag": "Sanguinaria",
+    "popularity": 6748
+  },
+  {
+    "tag": "confessionary",
+    "popularity": 6742
+  },
+  {
+    "tag": "enzymic",
+    "popularity": 6736
+  },
+  {
+    "tag": "cord",
+    "popularity": 6729
+  },
+  {
+    "tag": "oviducal",
+    "popularity": 6723
+  },
+  {
+    "tag": "crozzle outsea",
+    "popularity": 6717
+  },
+  {
+    "tag": "balladical",
+    "popularity": 6710
+  },
+  {
+    "tag": "uncollectibleness",
+    "popularity": 6704
+  },
+  {
+    "tag": "predorsal",
+    "popularity": 6698
+  },
+  {
+    "tag": "reauthenticate",
+    "popularity": 6692
+  },
+  {
+    "tag": "ravissant",
+    "popularity": 6685
+  },
+  {
+    "tag": "advantageousness",
+    "popularity": 6679
+  },
+  {
+    "tag": "rung",
+    "popularity": 6673
+  },
+  {
+    "tag": "duncedom",
+    "popularity": 6667
+  },
+  {
+    "tag": "hematolite",
+    "popularity": 6660
+  },
+  {
+    "tag": "thisness",
+    "popularity": 6654
+  },
+  {
+    "tag": "mapau",
+    "popularity": 6648
+  },
+  {
+    "tag": "Hecatic",
+    "popularity": 6642
+  },
+  {
+    "tag": "meningoencephalocele",
+    "popularity": 6636
+  },
+  {
+    "tag": "confection sorra",
+    "popularity": 6630
+  },
+  {
+    "tag": "unsedate",
+    "popularity": 6623
+  },
+  {
+    "tag": "meningocerebritis",
+    "popularity": 6617
+  },
+  {
+    "tag": "biopsychological",
+    "popularity": 6611
+  },
+  {
+    "tag": "clavicithern",
+    "popularity": 6605
+  },
+  {
+    "tag": "resun",
+    "popularity": 6599
+  },
+  {
+    "tag": "bayamo",
+    "popularity": 6593
+  },
+  {
+    "tag": "seeableness",
+    "popularity": 6587
+  },
+  {
+    "tag": "hypsidolichocephalism",
+    "popularity": 6581
+  },
+  {
+    "tag": "salivous",
+    "popularity": 6574
+  },
+  {
+    "tag": "neumatize",
+    "popularity": 6568
+  },
+  {
+    "tag": "stree",
+    "popularity": 6562
+  },
+  {
+    "tag": "markshot",
+    "popularity": 6556
+  },
+  {
+    "tag": "phraseologically",
+    "popularity": 6550
+  },
+  {
+    "tag": "yealing",
+    "popularity": 6544
+  },
+  {
+    "tag": "puggy",
+    "popularity": 6538
+  },
+  {
+    "tag": "sexadecimal",
+    "popularity": 6532
+  },
+  {
+    "tag": "unofficerlike",
+    "popularity": 6526
+  },
+  {
+    "tag": "curiosa",
+    "popularity": 6520
+  },
+  {
+    "tag": "pedomotor",
+    "popularity": 6514
+  },
+  {
+    "tag": "astrally",
+    "popularity": 6508
+  },
+  {
+    "tag": "prosomatic",
+    "popularity": 6502
+  },
+  {
+    "tag": "bulletheaded",
+    "popularity": 6496
+  },
+  {
+    "tag": "fortuned",
+    "popularity": 6490
+  },
+  {
+    "tag": "pixy",
+    "popularity": 6484
+  },
+  {
+    "tag": "protectrix",
+    "popularity": 6478
+  },
+  {
+    "tag": "arthritical",
+    "popularity": 6472
+  },
+  {
+    "tag": "coction",
+    "popularity": 6466
+  },
+  {
+    "tag": "Anthropos",
+    "popularity": 6460
+  },
+  {
+    "tag": "runer",
+    "popularity": 6454
+  },
+  {
+    "tag": "prenotify",
+    "popularity": 6449
+  },
+  {
+    "tag": "microspheric gastroparalysis",
+    "popularity": 6443
+  },
+  {
+    "tag": "Jovicentrical",
+    "popularity": 6437
+  },
+  {
+    "tag": "ceratopsid",
+    "popularity": 6431
+  },
+  {
+    "tag": "Theodoric",
+    "popularity": 6425
+  },
+  {
+    "tag": "Pactolus",
+    "popularity": 6419
+  },
+  {
+    "tag": "spawning",
+    "popularity": 6413
+  },
+  {
+    "tag": "nonconfidential",
+    "popularity": 6407
+  },
+  {
+    "tag": "halotrichite infumate",
+    "popularity": 6402
+  },
+  {
+    "tag": "undiscriminatingly",
+    "popularity": 6396
+  },
+  {
+    "tag": "unexasperated",
+    "popularity": 6390
+  },
+  {
+    "tag": "isoeugenol",
+    "popularity": 6384
+  },
+  {
+    "tag": "pressboard",
+    "popularity": 6378
+  },
+  {
+    "tag": "unshrew",
+    "popularity": 6372
+  },
+  {
+    "tag": "huffingly",
+    "popularity": 6367
+  },
+  {
+    "tag": "wagaun",
+    "popularity": 6361
+  },
+  {
+    "tag": "squirt Philistine",
+    "popularity": 6355
+  },
+  {
+    "tag": "kryptic",
+    "popularity": 6349
+  },
+  {
+    "tag": "paraform",
+    "popularity": 6344
+  },
+  {
+    "tag": "preverify",
+    "popularity": 6338
+  },
+  {
+    "tag": "dalar",
+    "popularity": 6332
+  },
+  {
+    "tag": "interdictor appraisingly",
+    "popularity": 6326
+  },
+  {
+    "tag": "chipped",
+    "popularity": 6321
+  },
+  {
+    "tag": "Pteropoda",
+    "popularity": 6315
+  },
+  {
+    "tag": "Bohairic",
+    "popularity": 6309
+  },
+  {
+    "tag": "felting",
+    "popularity": 6303
+  },
+  {
+    "tag": "compurgatorial",
+    "popularity": 6298
+  },
+  {
+    "tag": "unclead",
+    "popularity": 6292
+  },
+  {
+    "tag": "stockish",
+    "popularity": 6286
+  },
+  {
+    "tag": "mulligatawny",
+    "popularity": 6281
+  },
+  {
+    "tag": "Monotheletism",
+    "popularity": 6275
+  },
+  {
+    "tag": "lutanist",
+    "popularity": 6269
+  },
+  {
+    "tag": "gluttonize",
+    "popularity": 6264
+  },
+  {
+    "tag": "hackneyed",
+    "popularity": 6258
+  },
+  {
+    "tag": "yield",
+    "popularity": 6253
+  },
+  {
+    "tag": "sulphonamido",
+    "popularity": 6247
+  },
+  {
+    "tag": "granulative",
+    "popularity": 6241
+  },
+  {
+    "tag": "swingy",
+    "popularity": 6236
+  },
+  {
+    "tag": "Desmidiales",
+    "popularity": 6230
+  },
+  {
+    "tag": "tootlish",
+    "popularity": 6224
+  },
+  {
+    "tag": "unsatisfiedly",
+    "popularity": 6219
+  },
+  {
+    "tag": "burucha",
+    "popularity": 6213
+  },
+  {
+    "tag": "premeditatingly",
+    "popularity": 6208
+  },
+  {
+    "tag": "cowrie",
+    "popularity": 6202
+  },
+  {
+    "tag": "pleurolysis",
+    "popularity": 6197
+  },
+  {
+    "tag": "nationalist",
+    "popularity": 6191
+  },
+  {
+    "tag": "Pholadacea",
+    "popularity": 6186
+  },
+  {
+    "tag": "anakrousis",
+    "popularity": 6180
+  },
+  {
+    "tag": "proctorial",
+    "popularity": 6175
+  },
+  {
+    "tag": "cavillation",
+    "popularity": 6169
+  },
+  {
+    "tag": "cervicobregmatic",
+    "popularity": 6163
+  },
+  {
+    "tag": "interspecific",
+    "popularity": 6158
+  },
+  {
+    "tag": "Teutonity",
+    "popularity": 6152
+  },
+  {
+    "tag": "snakeholing",
+    "popularity": 6147
+  },
+  {
+    "tag": "balcony",
+    "popularity": 6142
+  },
+  {
+    "tag": "latchless",
+    "popularity": 6136
+  },
+  {
+    "tag": "Mithraea",
+    "popularity": 6131
+  },
+  {
+    "tag": "pseudepigraph",
+    "popularity": 6125
+  },
+  {
+    "tag": "flosser",
+    "popularity": 6120
+  },
+  {
+    "tag": "kotyle",
+    "popularity": 6114
+  },
+  {
+    "tag": "outdo",
+    "popularity": 6109
+  },
+  {
+    "tag": "interclerical",
+    "popularity": 6103
+  },
+  {
+    "tag": "aurar",
+    "popularity": 6098
+  },
+  {
+    "tag": "apophyseal",
+    "popularity": 6093
+  },
+  {
+    "tag": "Miro",
+    "popularity": 6087
+  },
+  {
+    "tag": "Priscillian",
+    "popularity": 6082
+  },
+  {
+    "tag": "alluvia",
+    "popularity": 6076
+  },
+  {
+    "tag": "exordize",
+    "popularity": 6071
+  },
+  {
+    "tag": "breakage",
+    "popularity": 6066
+  },
+  {
+    "tag": "unclosable",
+    "popularity": 6060
+  },
+  {
+    "tag": "monocondylous",
+    "popularity": 6055
+  },
+  {
+    "tag": "dyarchy",
+    "popularity": 6050
+  },
+  {
+    "tag": "subchelate",
+    "popularity": 6044
+  },
+  {
+    "tag": "hearsay",
+    "popularity": 6039
+  },
+  {
+    "tag": "prestigiously",
+    "popularity": 6034
+  },
+  {
+    "tag": "unimuscular",
+    "popularity": 6028
+  },
+  {
+    "tag": "lingwort",
+    "popularity": 6023
+  },
+  {
+    "tag": "jealous",
+    "popularity": 6018
+  },
+  {
+    "tag": "artilleryman",
+    "popularity": 6012
+  },
+  {
+    "tag": "phantasmagorially",
+    "popularity": 6007
+  },
+  {
+    "tag": "stagnum",
+    "popularity": 6002
+  },
+  {
+    "tag": "organotropism shatteringly",
+    "popularity": 5997
+  },
+  {
+    "tag": "Mytilus Hebraist",
+    "popularity": 5991
+  },
+  {
+    "tag": "returf",
+    "popularity": 5986
+  },
+  {
+    "tag": "townfolk",
+    "popularity": 5981
+  },
+  {
+    "tag": "propitiative",
+    "popularity": 5976
+  },
+  {
+    "tag": "Anita unsullied",
+    "popularity": 5970
+  },
+  {
+    "tag": "bandoleered",
+    "popularity": 5965
+  },
+  {
+    "tag": "cubby",
+    "popularity": 5960
+  },
+  {
+    "tag": "Hexanchus",
+    "popularity": 5955
+  },
+  {
+    "tag": "circuminsular",
+    "popularity": 5949
+  },
+  {
+    "tag": "chamberletted eumycete",
+    "popularity": 5944
+  },
+  {
+    "tag": "secure",
+    "popularity": 5939
+  },
+  {
+    "tag": "Edwardean",
+    "popularity": 5934
+  },
+  {
+    "tag": "strenth",
+    "popularity": 5929
+  },
+  {
+    "tag": "exhaustless",
+    "popularity": 5923
+  },
+  {
+    "tag": "electioneerer",
+    "popularity": 5918
+  },
+  {
+    "tag": "estoile",
+    "popularity": 5913
+  },
+  {
+    "tag": "redden",
+    "popularity": 5908
+  },
+  {
+    "tag": "solicitee",
+    "popularity": 5903
+  },
+  {
+    "tag": "nonpatented",
+    "popularity": 5898
+  },
+  {
+    "tag": "lemming",
+    "popularity": 5893
+  },
+  {
+    "tag": "marled subalate",
+    "popularity": 5887
+  },
+  {
+    "tag": "premial horizonward",
+    "popularity": 5882
+  },
+  {
+    "tag": "nonrefueling",
+    "popularity": 5877
+  },
+  {
+    "tag": "rupturewort",
+    "popularity": 5872
+  },
+  {
+    "tag": "unfed",
+    "popularity": 5867
+  },
+  {
+    "tag": "empanelment",
+    "popularity": 5862
+  },
+  {
+    "tag": "isoosmosis",
+    "popularity": 5857
+  },
+  {
+    "tag": "jipijapa",
+    "popularity": 5852
+  },
+  {
+    "tag": "Fiji",
+    "popularity": 5847
+  },
+  {
+    "tag": "interferant",
+    "popularity": 5842
+  },
+  {
+    "tag": "reconstitution",
+    "popularity": 5837
+  },
+  {
+    "tag": "dockyardman",
+    "popularity": 5832
+  },
+  {
+    "tag": "dolichopodous",
+    "popularity": 5826
+  },
+  {
+    "tag": "whiteworm",
+    "popularity": 5821
+  },
+  {
+    "tag": "atheistically",
+    "popularity": 5816
+  },
+  {
+    "tag": "nonconcern",
+    "popularity": 5811
+  },
+  {
+    "tag": "scarabaeidoid",
+    "popularity": 5806
+  },
+  {
+    "tag": "triumviri",
+    "popularity": 5801
+  },
+  {
+    "tag": "rakit",
+    "popularity": 5796
+  },
+  {
+    "tag": "leecheater",
+    "popularity": 5791
+  },
+  {
+    "tag": "Arthrostraca",
+    "popularity": 5786
+  },
+  {
+    "tag": "upknit",
+    "popularity": 5781
+  },
+  {
+    "tag": "tymbalon",
+    "popularity": 5776
+  },
+  {
+    "tag": "inventurous",
+    "popularity": 5771
+  },
+  {
+    "tag": "perradiate",
+    "popularity": 5766
+  },
+  {
+    "tag": "seer",
+    "popularity": 5762
+  },
+  {
+    "tag": "Auricularia",
+    "popularity": 5757
+  },
+  {
+    "tag": "wettish exclusivity",
+    "popularity": 5752
+  },
+  {
+    "tag": "arteriosympathectomy",
+    "popularity": 5747
+  },
+  {
+    "tag": "tunlike",
+    "popularity": 5742
+  },
+  {
+    "tag": "cephalocercal",
+    "popularity": 5737
+  },
+  {
+    "tag": "meaninglessness",
+    "popularity": 5732
+  },
+  {
+    "tag": "fountful",
+    "popularity": 5727
+  },
+  {
+    "tag": "appraisement",
+    "popularity": 5722
+  },
+  {
+    "tag": "geniculated",
+    "popularity": 5717
+  },
+  {
+    "tag": "rotator",
+    "popularity": 5712
+  },
+  {
+    "tag": "foremarch biography",
+    "popularity": 5707
+  },
+  {
+    "tag": "arid",
+    "popularity": 5703
+  },
+  {
+    "tag": "inapprehensible",
+    "popularity": 5698
+  },
+  {
+    "tag": "chlorosulphonic",
+    "popularity": 5693
+  },
+  {
+    "tag": "braguette",
+    "popularity": 5688
+  },
+  {
+    "tag": "panophthalmitis",
+    "popularity": 5683
+  },
+  {
+    "tag": "pro objurgatorily",
+    "popularity": 5678
+  },
+  {
+    "tag": "zooplasty",
+    "popularity": 5673
+  },
+  {
+    "tag": "Terebratulidae",
+    "popularity": 5669
+  },
+  {
+    "tag": "Mahran",
+    "popularity": 5664
+  },
+  {
+    "tag": "anthologize merocele",
+    "popularity": 5659
+  },
+  {
+    "tag": "firecracker chiropractic",
+    "popularity": 5654
+  },
+  {
+    "tag": "tenorist",
+    "popularity": 5649
+  },
+  {
+    "tag": "amphitene",
+    "popularity": 5645
+  },
+  {
+    "tag": "silverbush toadstone",
+    "popularity": 5640
+  },
+  {
+    "tag": "entozoological",
+    "popularity": 5635
+  },
+  {
+    "tag": "trustlessness",
+    "popularity": 5630
+  },
+  {
+    "tag": "reassay",
+    "popularity": 5625
+  },
+  {
+    "tag": "chrysalides",
+    "popularity": 5621
+  },
+  {
+    "tag": "truncation",
+    "popularity": 5616
+  },
+  {
+    "tag": "unwavered mausoleal",
+    "popularity": 5611
+  },
+  {
+    "tag": "unserrated",
+    "popularity": 5606
+  },
+  {
+    "tag": "frampler",
+    "popularity": 5602
+  },
+  {
+    "tag": "celestial",
+    "popularity": 5597
+  },
+  {
+    "tag": "depreter",
+    "popularity": 5592
+  },
+  {
+    "tag": "retaliate",
+    "popularity": 5588
+  },
+  {
+    "tag": "decempunctate",
+    "popularity": 5583
+  },
+  {
+    "tag": "submitter",
+    "popularity": 5578
+  },
+  {
+    "tag": "phenothiazine",
+    "popularity": 5573
+  },
+  {
+    "tag": "hobbledehoyish",
+    "popularity": 5569
+  },
+  {
+    "tag": "erraticness",
+    "popularity": 5564
+  },
+  {
+    "tag": "ovariodysneuria",
+    "popularity": 5559
+  },
+  {
+    "tag": "puja",
+    "popularity": 5555
+  },
+  {
+    "tag": "cesspool",
+    "popularity": 5550
+  },
+  {
+    "tag": "sonation",
+    "popularity": 5545
+  },
+  {
+    "tag": "moggan",
+    "popularity": 5541
+  },
+  {
+    "tag": "overjutting",
+    "popularity": 5536
+  },
+  {
+    "tag": "cohobate",
+    "popularity": 5531
+  },
+  {
+    "tag": "Distoma",
+    "popularity": 5527
+  },
+  {
+    "tag": "Plectognathi",
+    "popularity": 5522
+  },
+  {
+    "tag": "dumple caliphate",
+    "popularity": 5517
+  },
+  {
+    "tag": "shiko",
+    "popularity": 5513
+  },
+  {
+    "tag": "downness",
+    "popularity": 5508
+  },
+  {
+    "tag": "whippletree",
+    "popularity": 5504
+  },
+  {
+    "tag": "nymphaeum",
+    "popularity": 5499
+  },
+  {
+    "tag": "there trest",
+    "popularity": 5494
+  },
+  {
+    "tag": "psychrometer",
+    "popularity": 5490
+  },
+  {
+    "tag": "pyelograph",
+    "popularity": 5485
+  },
+  {
+    "tag": "unsalvable",
+    "popularity": 5481
+  },
+  {
+    "tag": "bescreen",
+    "popularity": 5476
+  },
+  {
+    "tag": "cushy",
+    "popularity": 5471
+  },
+  {
+    "tag": "plicatolobate",
+    "popularity": 5467
+  },
+  {
+    "tag": "lakie",
+    "popularity": 5462
+  },
+  {
+    "tag": "anthropodeoxycholic",
+    "popularity": 5458
+  },
+  {
+    "tag": "resatisfaction",
+    "popularity": 5453
+  },
+  {
+    "tag": "unravelment unaccidental",
+    "popularity": 5449
+  },
+  {
+    "tag": "telewriter monogeneous",
+    "popularity": 5444
+  },
+  {
+    "tag": "unsabred",
+    "popularity": 5440
+  },
+  {
+    "tag": "startlingly",
+    "popularity": 5435
+  },
+  {
+    "tag": "Aralia",
+    "popularity": 5431
+  },
+  {
+    "tag": "alamonti",
+    "popularity": 5426
+  },
+  {
+    "tag": "Franklinization",
+    "popularity": 5422
+  },
+  {
+    "tag": "parliament",
+    "popularity": 5417
+  },
+  {
+    "tag": "schoolkeeper",
+    "popularity": 5413
+  },
+  {
+    "tag": "nonsociety",
+    "popularity": 5408
+  },
+  {
+    "tag": "parenthetic",
+    "popularity": 5404
+  },
+  {
+    "tag": "stog",
+    "popularity": 5399
+  },
+  {
+    "tag": "Pristipomidae",
+    "popularity": 5395
+  },
+  {
+    "tag": "exocarp",
+    "popularity": 5390
+  },
+  {
+    "tag": "monaxonial",
+    "popularity": 5386
+  },
+  {
+    "tag": "tramroad",
+    "popularity": 5381
+  },
+  {
+    "tag": "hookah",
+    "popularity": 5377
+  },
+  {
+    "tag": "saccharonic",
+    "popularity": 5372
+  },
+  {
+    "tag": "perimetrium",
+    "popularity": 5368
+  },
+  {
+    "tag": "libelluloid",
+    "popularity": 5364
+  },
+  {
+    "tag": "overrunningly",
+    "popularity": 5359
+  },
+  {
+    "tag": "untwister",
+    "popularity": 5355
+  },
+  {
+    "tag": "ninnyhammer",
+    "popularity": 5350
+  },
+  {
+    "tag": "metranate",
+    "popularity": 5346
+  },
+  {
+    "tag": "sarcoblast",
+    "popularity": 5341
+  },
+  {
+    "tag": "porkish",
+    "popularity": 5337
+  },
+  {
+    "tag": "chauvinistic",
+    "popularity": 5333
+  },
+  {
+    "tag": "sexagesimal",
+    "popularity": 5328
+  },
+  {
+    "tag": "hematogenic",
+    "popularity": 5324
+  },
+  {
+    "tag": "selfpreservatory",
+    "popularity": 5320
+  },
+  {
+    "tag": "myelauxe",
+    "popularity": 5315
+  },
+  {
+    "tag": "triply",
+    "popularity": 5311
+  },
+  {
+    "tag": "metaphysicous",
+    "popularity": 5306
+  },
+  {
+    "tag": "vitrinoid",
+    "popularity": 5302
+  },
+  {
+    "tag": "glabellae",
+    "popularity": 5298
+  },
+  {
+    "tag": "moonlighter",
+    "popularity": 5293
+  },
+  {
+    "tag": "monotheistically epexegetical",
+    "popularity": 5289
+  },
+  {
+    "tag": "pseudolateral",
+    "popularity": 5285
+  },
+  {
+    "tag": "heptamethylene",
+    "popularity": 5280
+  },
+  {
+    "tag": "salvadora",
+    "popularity": 5276
+  },
+  {
+    "tag": "unjovial diphenylthiourea",
+    "popularity": 5272
+  },
+  {
+    "tag": "thievishness",
+    "popularity": 5268
+  },
+  {
+    "tag": "unridable",
+    "popularity": 5263
+  },
+  {
+    "tag": "underhandedly",
+    "popularity": 5259
+  },
+  {
+    "tag": "fungiform",
+    "popularity": 5255
+  },
+  {
+    "tag": "scruffle",
+    "popularity": 5250
+  },
+  {
+    "tag": "preindisposition",
+    "popularity": 5246
+  },
+  {
+    "tag": "Amadis",
+    "popularity": 5242
+  },
+  {
+    "tag": "Culex",
+    "popularity": 5238
+  },
+  {
+    "tag": "churning",
+    "popularity": 5233
+  },
+  {
+    "tag": "imperite",
+    "popularity": 5229
+  },
+  {
+    "tag": "levorotation",
+    "popularity": 5225
+  },
+  {
+    "tag": "barbate",
+    "popularity": 5221
+  },
+  {
+    "tag": "knotwort",
+    "popularity": 5216
+  },
+  {
+    "tag": "gypsiferous",
+    "popularity": 5212
+  },
+  {
+    "tag": "tourmalinic",
+    "popularity": 5208
+  },
+  {
+    "tag": "helleboric",
+    "popularity": 5204
+  },
+  {
+    "tag": "pneumograph",
+    "popularity": 5199
+  },
+  {
+    "tag": "Peltigeraceae",
+    "popularity": 5195
+  },
+  {
+    "tag": "busine",
+    "popularity": 5191
+  },
+  {
+    "tag": "Ailuridae",
+    "popularity": 5187
+  },
+  {
+    "tag": "azotate",
+    "popularity": 5183
+  },
+  {
+    "tag": "unlikable",
+    "popularity": 5178
+  },
+  {
+    "tag": "sloyd",
+    "popularity": 5174
+  },
+  {
+    "tag": "biblioclasm",
+    "popularity": 5170
+  },
+  {
+    "tag": "Seres",
+    "popularity": 5166
+  },
+  {
+    "tag": "unaccurateness",
+    "popularity": 5162
+  },
+  {
+    "tag": "scrollwise",
+    "popularity": 5157
+  },
+  {
+    "tag": "flandowser",
+    "popularity": 5153
+  },
+  {
+    "tag": "unblackened",
+    "popularity": 5149
+  },
+  {
+    "tag": "schistosternia",
+    "popularity": 5145
+  },
+  {
+    "tag": "fuse",
+    "popularity": 5141
+  },
+  {
+    "tag": "narthecal",
+    "popularity": 5137
+  },
+  {
+    "tag": "Cueva",
+    "popularity": 5133
+  },
+  {
+    "tag": "appositeness",
+    "popularity": 5128
+  },
+  {
+    "tag": "proindustrial",
+    "popularity": 5124
+  },
+  {
+    "tag": "dermatorrhoea",
+    "popularity": 5120
+  },
+  {
+    "tag": "oxyurous tendential",
+    "popularity": 5116
+  },
+  {
+    "tag": "isopurpurin",
+    "popularity": 5112
+  },
+  {
+    "tag": "impose",
+    "popularity": 5108
+  },
+  {
+    "tag": "wordsmanship",
+    "popularity": 5104
+  },
+  {
+    "tag": "saturator",
+    "popularity": 5100
+  },
+  {
+    "tag": "Nordicity",
+    "popularity": 5096
+  },
+  {
+    "tag": "interaccuse",
+    "popularity": 5092
+  },
+  {
+    "tag": "acridinic",
+    "popularity": 5087
+  },
+  {
+    "tag": "scholion",
+    "popularity": 5083
+  },
+  {
+    "tag": "pseudoaconitine",
+    "popularity": 5079
+  },
+  {
+    "tag": "doctorial",
+    "popularity": 5075
+  },
+  {
+    "tag": "Etchimin",
+    "popularity": 5071
+  },
+  {
+    "tag": "oliviform",
+    "popularity": 5067
+  },
+  {
+    "tag": "Pele",
+    "popularity": 5063
+  },
+  {
+    "tag": "Chiromantis Progymnasium",
+    "popularity": 5059
+  },
+  {
+    "tag": "toxosis",
+    "popularity": 5055
+  },
+  {
+    "tag": "spadilla",
+    "popularity": 5051
+  },
+  {
+    "tag": "Actinopterygii",
+    "popularity": 5047
+  },
+  {
+    "tag": "untiring",
+    "popularity": 5043
+  },
+  {
+    "tag": "butyral",
+    "popularity": 5039
+  },
+  {
+    "tag": "Gymnoderinae",
+    "popularity": 5035
+  },
+  {
+    "tag": "testudo",
+    "popularity": 5031
+  },
+  {
+    "tag": "frigorify",
+    "popularity": 5027
+  },
+  {
+    "tag": "aliency",
+    "popularity": 5023
+  },
+  {
+    "tag": "jargon",
+    "popularity": 5019
+  },
+  {
+    "tag": "counterservice",
+    "popularity": 5015
+  },
+  {
+    "tag": "isostrychnine",
+    "popularity": 5011
+  },
+  {
+    "tag": "tellership",
+    "popularity": 5007
+  },
+  {
+    "tag": "miscegenetic",
+    "popularity": 5003
+  },
+  {
+    "tag": "sorcer",
+    "popularity": 4999
+  },
+  {
+    "tag": "tilewright",
+    "popularity": 4995
+  },
+  {
+    "tag": "cyanoplastid",
+    "popularity": 4991
+  },
+  {
+    "tag": "fluxionally",
+    "popularity": 4987
+  },
+  {
+    "tag": "proudhearted",
+    "popularity": 4983
+  },
+  {
+    "tag": "blithely",
+    "popularity": 4979
+  },
+  {
+    "tag": "jestproof",
+    "popularity": 4975
+  },
+  {
+    "tag": "jestwise",
+    "popularity": 4971
+  },
+  {
+    "tag": "nonassimilable",
+    "popularity": 4967
+  },
+  {
+    "tag": "compurgation",
+    "popularity": 4964
+  },
+  {
+    "tag": "unhate",
+    "popularity": 4960
+  },
+  {
+    "tag": "haplodonty",
+    "popularity": 4956
+  },
+  {
+    "tag": "cardholder",
+    "popularity": 4952
+  },
+  {
+    "tag": "rainlight megohmmeter overstout",
+    "popularity": 4948
+  },
+  {
+    "tag": "itchless",
+    "popularity": 4944
+  },
+  {
+    "tag": "begiggle",
+    "popularity": 4940
+  },
+  {
+    "tag": "chromatosphere",
+    "popularity": 4936
+  },
+  {
+    "tag": "typicality",
+    "popularity": 4932
+  },
+  {
+    "tag": "overgrown",
+    "popularity": 4928
+  },
+  {
+    "tag": "envolume",
+    "popularity": 4925
+  },
+  {
+    "tag": "pachycholia",
+    "popularity": 4921
+  },
+  {
+    "tag": "passageable",
+    "popularity": 4917
+  },
+  {
+    "tag": "pathopoiesis",
+    "popularity": 4913
+  },
+  {
+    "tag": "overbreak",
+    "popularity": 4909
+  },
+  {
+    "tag": "satyric",
+    "popularity": 4905
+  },
+  {
+    "tag": "unaudited",
+    "popularity": 4901
+  },
+  {
+    "tag": "whimble",
+    "popularity": 4898
+  },
+  {
+    "tag": "pressureless",
+    "popularity": 4894
+  },
+  {
+    "tag": "Selene",
+    "popularity": 4890
+  },
+  {
+    "tag": "slithery",
+    "popularity": 4886
+  },
+  {
+    "tag": "nondisfigurement",
+    "popularity": 4882
+  },
+  {
+    "tag": "overdelicious",
+    "popularity": 4878
+  },
+  {
+    "tag": "Perca",
+    "popularity": 4875
+  },
+  {
+    "tag": "Palladium",
+    "popularity": 4871
+  },
+  {
+    "tag": "insagacity",
+    "popularity": 4867
+  },
+  {
+    "tag": "peristoma",
+    "popularity": 4863
+  },
+  {
+    "tag": "uncreativeness",
+    "popularity": 4859
+  },
+  {
+    "tag": "incomparability surfboarding",
+    "popularity": 4856
+  },
+  {
+    "tag": "bacillar",
+    "popularity": 4852
+  },
+  {
+    "tag": "ulcerative",
+    "popularity": 4848
+  },
+  {
+    "tag": "stychomythia",
+    "popularity": 4844
+  },
+  {
+    "tag": "sesma somatics nonentry",
+    "popularity": 4840
+  },
+  {
+    "tag": "unsepulchred",
+    "popularity": 4837
+  },
+  {
+    "tag": "cephalanthium",
+    "popularity": 4833
+  },
+  {
+    "tag": "Asiaticization",
+    "popularity": 4829
+  },
+  {
+    "tag": "killeen",
+    "popularity": 4825
+  },
+  {
+    "tag": "Pseudococcus",
+    "popularity": 4822
+  },
+  {
+    "tag": "untractable",
+    "popularity": 4818
+  },
+  {
+    "tag": "apolegamic",
+    "popularity": 4814
+  },
+  {
+    "tag": "hyperpnea",
+    "popularity": 4810
+  },
+  {
+    "tag": "martyrolatry",
+    "popularity": 4807
+  },
+  {
+    "tag": "Sarmatic",
+    "popularity": 4803
+  },
+  {
+    "tag": "nonsurface",
+    "popularity": 4799
+  },
+  {
+    "tag": "adjoined",
+    "popularity": 4796
+  },
+  {
+    "tag": "vasiform",
+    "popularity": 4792
+  },
+  {
+    "tag": "tastelessness",
+    "popularity": 4788
+  },
+  {
+    "tag": "rumbo",
+    "popularity": 4784
+  },
+  {
+    "tag": "subdititious",
+    "popularity": 4781
+  },
+  {
+    "tag": "reparticipation",
+    "popularity": 4777
+  },
+  {
+    "tag": "Yorkshireism",
+    "popularity": 4773
+  },
+  {
+    "tag": "outcrow",
+    "popularity": 4770
+  },
+  {
+    "tag": "casserole",
+    "popularity": 4766
+  },
+  {
+    "tag": "semideltaic",
+    "popularity": 4762
+  },
+  {
+    "tag": "freemason",
+    "popularity": 4759
+  },
+  {
+    "tag": "catkin",
+    "popularity": 4755
+  },
+  {
+    "tag": "conscient",
+    "popularity": 4751
+  },
+  {
+    "tag": "reliably",
+    "popularity": 4748
+  },
+  {
+    "tag": "Telembi",
+    "popularity": 4744
+  },
+  {
+    "tag": "hide",
+    "popularity": 4740
+  },
+  {
+    "tag": "social",
+    "popularity": 4737
+  },
+  {
+    "tag": "ichneutic",
+    "popularity": 4733
+  },
+  {
+    "tag": "polypotome blouse pentagrammatic",
+    "popularity": 4729
+  },
+  {
+    "tag": "airdrome pesthole",
+    "popularity": 4726
+  },
+  {
+    "tag": "unportended",
+    "popularity": 4722
+  },
+  {
+    "tag": "sheerly",
+    "popularity": 4719
+  },
+  {
+    "tag": "acardiac",
+    "popularity": 4715
+  },
+  {
+    "tag": "fetor",
+    "popularity": 4711
+  },
+  {
+    "tag": "storax",
+    "popularity": 4708
+  },
+  {
+    "tag": "syndactylic",
+    "popularity": 4704
+  },
+  {
+    "tag": "otiatrics",
+    "popularity": 4700
+  },
+  {
+    "tag": "range",
+    "popularity": 4697
+  },
+  {
+    "tag": "branchway",
+    "popularity": 4693
+  },
+  {
+    "tag": "beatific",
+    "popularity": 4690
+  },
+  {
+    "tag": "Rugosa",
+    "popularity": 4686
+  },
+  {
+    "tag": "rafty",
+    "popularity": 4682
+  },
+  {
+    "tag": "gapy",
+    "popularity": 4679
+  },
+  {
+    "tag": "heterocercal",
+    "popularity": 4675
+  },
+  {
+    "tag": "actinopterygious",
+    "popularity": 4672
+  },
+  {
+    "tag": "glauconite",
+    "popularity": 4668
+  },
+  {
+    "tag": "limbless priest",
+    "popularity": 4665
+  },
+  {
+    "tag": "chrysene",
+    "popularity": 4661
+  },
+  {
+    "tag": "isentropic",
+    "popularity": 4658
+  },
+  {
+    "tag": "lairdess",
+    "popularity": 4654
+  },
+  {
+    "tag": "butterhead choliambic",
+    "popularity": 4650
+  },
+  {
+    "tag": "hexaseme",
+    "popularity": 4647
+  },
+  {
+    "tag": "treeify",
+    "popularity": 4643
+  },
+  {
+    "tag": "coronetted fructify",
+    "popularity": 4640
+  },
+  {
+    "tag": "admiralty",
+    "popularity": 4636
+  },
+  {
+    "tag": "Flosculariidae",
+    "popularity": 4633
+  },
+  {
+    "tag": "limaceous",
+    "popularity": 4629
+  },
+  {
+    "tag": "subterconscious",
+    "popularity": 4626
+  },
+  {
+    "tag": "stayless",
+    "popularity": 4622
+  },
+  {
+    "tag": "psha",
+    "popularity": 4619
+  },
+  {
+    "tag": "Mediterraneanize",
+    "popularity": 4615
+  },
+  {
+    "tag": "impenetrably",
+    "popularity": 4612
+  },
+  {
+    "tag": "Myrmeleonidae",
+    "popularity": 4608
+  },
+  {
+    "tag": "germander",
+    "popularity": 4605
+  },
+  {
+    "tag": "Buri",
+    "popularity": 4601
+  },
+  {
+    "tag": "papyrotamia",
+    "popularity": 4598
+  },
+  {
+    "tag": "Toxylon",
+    "popularity": 4594
+  },
+  {
+    "tag": "batatilla",
+    "popularity": 4591
+  },
+  {
+    "tag": "fabella assumer",
+    "popularity": 4587
+  },
+  {
+    "tag": "macromethod",
+    "popularity": 4584
+  },
+  {
+    "tag": "Blechnum",
+    "popularity": 4580
+  },
+  {
+    "tag": "pantography",
+    "popularity": 4577
+  },
+  {
+    "tag": "seminovel",
+    "popularity": 4574
+  },
+  {
+    "tag": "disembarrassment",
+    "popularity": 4570
+  },
+  {
+    "tag": "bushmaking",
+    "popularity": 4567
+  },
+  {
+    "tag": "neurosis",
+    "popularity": 4563
+  },
+  {
+    "tag": "Animalia",
+    "popularity": 4560
+  },
+  {
+    "tag": "Bernice",
+    "popularity": 4556
+  },
+  {
+    "tag": "wisen",
+    "popularity": 4553
+  },
+  {
+    "tag": "subhymenium",
+    "popularity": 4549
+  },
+  {
+    "tag": "esophagomycosis",
+    "popularity": 4546
+  },
+  {
+    "tag": "wireworks",
+    "popularity": 4543
+  },
+  {
+    "tag": "Sabellidae",
+    "popularity": 4539
+  },
+  {
+    "tag": "fustianish",
+    "popularity": 4536
+  },
+  {
+    "tag": "professively",
+    "popularity": 4532
+  },
+  {
+    "tag": "overcorruptly",
+    "popularity": 4529
+  },
+  {
+    "tag": "overcreep",
+    "popularity": 4526
+  },
+  {
+    "tag": "Castilloa",
+    "popularity": 4522
+  },
+  {
+    "tag": "forelady Georgie",
+    "popularity": 4519
+  },
+  {
+    "tag": "outsider",
+    "popularity": 4515
+  },
+  {
+    "tag": "Enukki",
+    "popularity": 4512
+  },
+  {
+    "tag": "gypsy",
+    "popularity": 4509
+  },
+  {
+    "tag": "Passamaquoddy",
+    "popularity": 4505
+  },
+  {
+    "tag": "reposit",
+    "popularity": 4502
+  },
+  {
+    "tag": "overtenderness",
+    "popularity": 4499
+  },
+  {
+    "tag": "keratome",
+    "popularity": 4495
+  },
+  {
+    "tag": "interclavicular hypermonosyllable Susanna",
+    "popularity": 4492
+  },
+  {
+    "tag": "mispropose",
+    "popularity": 4489
+  },
+  {
+    "tag": "Membranipora",
+    "popularity": 4485
+  },
+  {
+    "tag": "lampad",
+    "popularity": 4482
+  },
+  {
+    "tag": "header",
+    "popularity": 4479
+  },
+  {
+    "tag": "triseriate",
+    "popularity": 4475
+  },
+  {
+    "tag": "distrainment",
+    "popularity": 4472
+  },
+  {
+    "tag": "staphyloplastic",
+    "popularity": 4469
+  },
+  {
+    "tag": "outscour",
+    "popularity": 4465
+  },
+  {
+    "tag": "tallowmaking",
+    "popularity": 4462
+  },
+  {
+    "tag": "plugger",
+    "popularity": 4459
+  },
+  {
+    "tag": "fashionize",
+    "popularity": 4455
+  },
+  {
+    "tag": "puzzle",
+    "popularity": 4452
+  },
+  {
+    "tag": "imbrue",
+    "popularity": 4449
+  },
+  {
+    "tag": "osteoblast",
+    "popularity": 4445
+  },
+  {
+    "tag": "Hydrocores",
+    "popularity": 4442
+  },
+  {
+    "tag": "Lutra",
+    "popularity": 4439
+  },
+  {
+    "tag": "upridge scarfy",
+    "popularity": 4435
+  },
+  {
+    "tag": "ancon taffle",
+    "popularity": 4432
+  },
+  {
+    "tag": "impest",
+    "popularity": 4429
+  },
+  {
+    "tag": "uncollatedness",
+    "popularity": 4426
+  },
+  {
+    "tag": "hypersensitize",
+    "popularity": 4422
+  },
+  {
+    "tag": "autographically",
+    "popularity": 4419
+  },
+  {
+    "tag": "louther",
+    "popularity": 4416
+  },
+  {
+    "tag": "Ollie",
+    "popularity": 4413
+  },
+  {
+    "tag": "recompensate",
+    "popularity": 4409
+  },
+  {
+    "tag": "Shan",
+    "popularity": 4406
+  },
+  {
+    "tag": "brachycnemic",
+    "popularity": 4403
+  },
+  {
+    "tag": "Carinatae",
+    "popularity": 4399
+  },
+  {
+    "tag": "geotherm",
+    "popularity": 4396
+  },
+  {
+    "tag": "sawback",
+    "popularity": 4393
+  },
+  {
+    "tag": "Novatianist",
+    "popularity": 4390
+  },
+  {
+    "tag": "reapproach",
+    "popularity": 4387
+  },
+  {
+    "tag": "myelopoietic",
+    "popularity": 4383
+  },
+  {
+    "tag": "cyanin",
+    "popularity": 4380
+  },
+  {
+    "tag": "unsmutted",
+    "popularity": 4377
+  },
+  {
+    "tag": "nonpapist",
+    "popularity": 4374
+  },
+  {
+    "tag": "transbaikalian",
+    "popularity": 4370
+  },
+  {
+    "tag": "connately",
+    "popularity": 4367
+  },
+  {
+    "tag": "tenderize iterance",
+    "popularity": 4364
+  },
+  {
+    "tag": "hydrostatical",
+    "popularity": 4361
+  },
+  {
+    "tag": "unflag",
+    "popularity": 4358
+  },
+  {
+    "tag": "translate",
+    "popularity": 4354
+  },
+  {
+    "tag": "Scorzonera",
+    "popularity": 4351
+  },
+  {
+    "tag": "uncomforted",
+    "popularity": 4348
+  },
+  {
+    "tag": "risser varied",
+    "popularity": 4345
+  },
+  {
+    "tag": "plumbate",
+    "popularity": 4342
+  },
+  {
+    "tag": "Usneaceae",
+    "popularity": 4338
+  },
+  {
+    "tag": "fohat",
+    "popularity": 4335
+  },
+  {
+    "tag": "slagging",
+    "popularity": 4332
+  },
+  {
+    "tag": "superserious",
+    "popularity": 4329
+  },
+  {
+    "tag": "theocracy",
+    "popularity": 4326
+  },
+  {
+    "tag": "valonia",
+    "popularity": 4323
+  },
+  {
+    "tag": "Sapindales",
+    "popularity": 4319
+  },
+  {
+    "tag": "palaeozoologist",
+    "popularity": 4316
+  },
+  {
+    "tag": "yalb",
+    "popularity": 4313
+  },
+  {
+    "tag": "unviewed",
+    "popularity": 4310
+  },
+  {
+    "tag": "polyarteritis",
+    "popularity": 4307
+  },
+  {
+    "tag": "vectorial",
+    "popularity": 4304
+  },
+  {
+    "tag": "skimpingly",
+    "popularity": 4301
+  },
+  {
+    "tag": "athort",
+    "popularity": 4297
+  },
+  {
+    "tag": "tribofluorescence",
+    "popularity": 4294
+  },
+  {
+    "tag": "benzonitrol",
+    "popularity": 4291
+  },
+  {
+    "tag": "swiller subobtuse subjacency",
+    "popularity": 4288
+  },
+  {
+    "tag": "uncompassed",
+    "popularity": 4285
+  },
+  {
+    "tag": "cacochymia",
+    "popularity": 4282
+  },
+  {
+    "tag": "commensalist butadiene",
+    "popularity": 4279
+  },
+  {
+    "tag": "culpable",
+    "popularity": 4276
+  },
+  {
+    "tag": "contributive",
+    "popularity": 4273
+  },
+  {
+    "tag": "attemperately",
+    "popularity": 4269
+  },
+  {
+    "tag": "spelt",
+    "popularity": 4266
+  },
+  {
+    "tag": "exoneration",
+    "popularity": 4263
+  },
+  {
+    "tag": "antivivisectionist",
+    "popularity": 4260
+  },
+  {
+    "tag": "granitification",
+    "popularity": 4257
+  },
+  {
+    "tag": "palladize",
+    "popularity": 4254
+  },
+  {
+    "tag": "marksmanship",
+    "popularity": 4251
+  },
+  {
+    "tag": "bullydom",
+    "popularity": 4248
+  },
+  {
+    "tag": "spirality",
+    "popularity": 4245
+  },
+  {
+    "tag": "caliginous",
+    "popularity": 4242
+  },
+  {
+    "tag": "reportedly",
+    "popularity": 4239
+  },
+  {
+    "tag": "polyad",
+    "popularity": 4236
+  },
+  {
+    "tag": "arthroempyesis",
+    "popularity": 4233
+  },
+  {
+    "tag": "semibay facultatively",
+    "popularity": 4229
+  },
+  {
+    "tag": "metastatically",
+    "popularity": 4226
+  },
+  {
+    "tag": "prophetically",
+    "popularity": 4223
+  },
+  {
+    "tag": "Linguatula elapid",
+    "popularity": 4220
+  },
+  {
+    "tag": "pyknatom",
+    "popularity": 4217
+  },
+  {
+    "tag": "centimeter",
+    "popularity": 4214
+  },
+  {
+    "tag": "mensurate",
+    "popularity": 4211
+  },
+  {
+    "tag": "migraine",
+    "popularity": 4208
+  },
+  {
+    "tag": "pentagamist",
+    "popularity": 4205
+  },
+  {
+    "tag": "querken",
+    "popularity": 4202
+  },
+  {
+    "tag": "ambulance",
+    "popularity": 4199
+  },
+  {
+    "tag": "Stokavian",
+    "popularity": 4196
+  },
+  {
+    "tag": "malvasian",
+    "popularity": 4193
+  },
+  {
+    "tag": "uncouthsome",
+    "popularity": 4190
+  },
+  {
+    "tag": "readable",
+    "popularity": 4187
+  },
+  {
+    "tag": "enlodge",
+    "popularity": 4184
+  },
+  {
+    "tag": "plasterwise Appendiculariidae perspectograph",
+    "popularity": 4181
+  },
+  {
+    "tag": "inkweed",
+    "popularity": 4178
+  },
+  {
+    "tag": "streep",
+    "popularity": 4175
+  },
+  {
+    "tag": "diadelphian cultured",
+    "popularity": 4172
+  },
+  {
+    "tag": "hymenopterous",
+    "popularity": 4169
+  },
+  {
+    "tag": "unexorableness",
+    "popularity": 4166
+  },
+  {
+    "tag": "cascaron",
+    "popularity": 4163
+  },
+  {
+    "tag": "undaintiness",
+    "popularity": 4160
+  },
+  {
+    "tag": "Curtana",
+    "popularity": 4157
+  },
+  {
+    "tag": "scurvied",
+    "popularity": 4154
+  },
+  {
+    "tag": "molluscoidal",
+    "popularity": 4151
+  },
+  {
+    "tag": "yurt",
+    "popularity": 4148
+  },
+  {
+    "tag": "deciduitis",
+    "popularity": 4145
+  },
+  {
+    "tag": "creephole",
+    "popularity": 4142
+  },
+  {
+    "tag": "quatrefeuille",
+    "popularity": 4139
+  },
+  {
+    "tag": "bicapitate adenomatome",
+    "popularity": 4136
+  },
+  {
+    "tag": "damassin",
+    "popularity": 4134
+  },
+  {
+    "tag": "planching",
+    "popularity": 4131
+  },
+  {
+    "tag": "dashedly inferential",
+    "popularity": 4128
+  },
+  {
+    "tag": "lobe",
+    "popularity": 4125
+  },
+  {
+    "tag": "Hyrachyus",
+    "popularity": 4122
+  },
+  {
+    "tag": "knab",
+    "popularity": 4119
+  },
+  {
+    "tag": "discohexaster",
+    "popularity": 4116
+  },
+  {
+    "tag": "malign",
+    "popularity": 4113
+  },
+  {
+    "tag": "pedagoguism",
+    "popularity": 4110
+  },
+  {
+    "tag": "shrubbery",
+    "popularity": 4107
+  },
+  {
+    "tag": "undershrub",
+    "popularity": 4104
+  },
+  {
+    "tag": "bureaucrat",
+    "popularity": 4101
+  },
+  {
+    "tag": "pantaleon",
+    "popularity": 4098
+  },
+  {
+    "tag": "mesoventral",
+    "popularity": 4096
+  }];
+  
+var entry = largeTable[1000];
+print(entry.tag, entry.popularity);
+
diff --git a/nashorn/test/script/basic/NASHORN-481.js.EXPECTED b/nashorn/test/script/basic/NASHORN-481.js.EXPECTED
new file mode 100644
index 00000000000..436a2b4eda3
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-481.js.EXPECTED
@@ -0,0 +1 @@
+pantheonize prevalency 20733
diff --git a/nashorn/test/script/basic/NASHORN-482.js b/nashorn/test/script/basic/NASHORN-482.js
new file mode 100644
index 00000000000..6bb04b5690f
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-482.js
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-482 : eval within 'with' does not receive correct 'this'
+ *
+ * @test
+ * @run
+ */
+
+function func() {
+    with ( {} ) {
+        return eval('this');
+    }
+}
+
+var obj = {};
+obj.foo = func;
+if (obj.foo() !== obj) {
+    fail("wrong 'this' returned from eval");
+}
diff --git a/nashorn/test/script/basic/NASHORN-484.js b/nashorn/test/script/basic/NASHORN-484.js
new file mode 100644
index 00000000000..d87f597b852
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-484.js
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * NASHORN-484 : the name of an anonymous function is the empty string.
+ *
+ * @test
+ * @run
+ */
+
+var f = function f() {};
+var anon = function() {};
+print("f: '" + f.name + "'");
+print("anon: '" + anon.name + "'");
diff --git a/nashorn/test/script/basic/NASHORN-484.js.EXPECTED b/nashorn/test/script/basic/NASHORN-484.js.EXPECTED
new file mode 100644
index 00000000000..5e14d55a3f3
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-484.js.EXPECTED
@@ -0,0 +1,2 @@
+f: 'f'
+anon: ''
diff --git a/nashorn/test/script/basic/NASHORN-486.js b/nashorn/test/script/basic/NASHORN-486.js
new file mode 100644
index 00000000000..13c34157984
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-486.js
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-486 : error reporting is inconsistent
+ *
+ * @test
+ * @run
+ */
+
+var fileName = __FILE__;
+
+try {
+    // save line number and force ReferenceError for 'foo'
+    var lineNumber = __LINE__; print(foo); 
+    fail("#1 should have thrown ReferenceError");
+} catch (e) {
+    if (! (e instanceof ReferenceError)) {
+        fail("#2 ReferenceError expected, got " + e);
+    }
+
+    if (e.lineNumber !== lineNumber) {
+        fail("#3 line number not correct");
+    }
+
+    if (e.fileName !== fileName) {
+        fail("#4 file name not correct");
+    }
+}
+
+try {
+    // try any library function on invalid self
+    // get line number again and force a TypeError
+    lineNumber = __LINE__; RegExp.prototype.exec.call(3);
+    fail("#5 should have thrown TypeError");
+} catch (e) {
+    if (! (e instanceof TypeError)) {
+        fail("#6 TypeError expected, got " + e);
+    }
+
+    if (e.lineNumber !== lineNumber) {
+        fail("#7 line number not correct");
+    }
+
+    if (e.fileName !== fileName) {
+        fail("#8 file name not correct");
+    }
+}
+
+// try explicit exception thrown from script
+try {
+    lineNumber = __LINE__; throw new Error();
+} catch (e) {
+    if (e.lineNumber !== lineNumber) {
+        fail("#9 line number not correct");
+    }
+
+    if (e.fileName !== fileName) {
+        fail("#10 file name not correct");
+    }
+}
diff --git a/nashorn/test/script/basic/NASHORN-487.js b/nashorn/test/script/basic/NASHORN-487.js
new file mode 100644
index 00000000000..1f1d143dee6
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-487.js
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-487 :  Object.prototype.toString(new TypeError) should be [object Error]
+ *
+ * @test
+ * @run
+ */
+
+function check(errorCons) {
+    if (Object.prototype.toString.call(new errorCons()) !== '[object Error]') {
+        fail("Object.prototype.toString.call(" + errorCons.name + ")");
+    }
+}
+
+check(Error);
+check(EvalError);
+check(RangeError);
+check(ReferenceError);
+check(SyntaxError);
+check(TypeError);
+check(URIError);
diff --git a/nashorn/test/script/basic/NASHORN-488.js b/nashorn/test/script/basic/NASHORN-488.js
new file mode 100644
index 00000000000..401b60ed01f
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-488.js
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-488 : Function.prototype does not have 'prototype' property
+ *
+ * @test
+ * @run
+ */
+
+var desc = Object.getOwnPropertyDescriptor(Function.prototype, "prototype");
+if (desc !== undefined) {
+    fail("Function.prototype has 'prototype'");
+}
+
+Object.defineProperty(Function.prototype, "prototype", {
+    set: undefined, get: function() { return 32; }, 
+    configurable: true
+});
+
+if (Function.prototype.prototype != 32) {
+    fail("Function.prototype.prototype != 32");
+}
+
+if (! (delete Function.prototype.prototype)) {
+    fail("can't delete Function.prototype.prototype");
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-49.js b/nashorn/test/script/basic/NASHORN-49.js
new file mode 100644
index 00000000000..24d42e486a8
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-49.js
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-49
+ *
+ * @test
+ * @run
+ */
+
+var x = 17;
+switch(x) {
+case 17:
+    print("17");
+    break;
+}
+
+switch (1) {
+default:
+    print("test");
+    break;
+}
+
+
+switch(1) {
+}
+
+print("done");
+
+var expr = Math.PI;
+switch(expr) {
+case 1:
+    print("one");
+    break;
+case 2:
+    print("two");
+    break;
+case 3:
+    print("three");
+    break;
+}
+
+print("done2");
diff --git a/nashorn/test/script/basic/NASHORN-49.js.EXPECTED b/nashorn/test/script/basic/NASHORN-49.js.EXPECTED
new file mode 100644
index 00000000000..92eda71a66f
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-49.js.EXPECTED
@@ -0,0 +1,4 @@
+17
+test
+done
+done2
diff --git a/nashorn/test/script/basic/NASHORN-490.js b/nashorn/test/script/basic/NASHORN-490.js
new file mode 100644
index 00000000000..ea086bc045f
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-490.js
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-490 : Inherited index properties is problematic for Array.prototype.pop function
+ *
+ * @test
+ * @run
+ */
+
+Array.prototype[1] = 1;
+var x = [0];
+x.length = 2;
+
+var obj = x.pop();
+if (obj !== 1) {
+  fail('Array.prototype[1] = 1; x=[0]; x.length = 2; x.pop() == 1. Actual: ' + (obj));
+}
+
+delete Array.prototype[1];
+
+Object.prototype[1] = 1;
+var y = [0];
+y.length = 2;
+var obj = y.pop();
+if (obj !== 1) {
+  fail('Object.prototype[1] = 1; y=[0]; y.length = 2; y.pop() == 1. Actual: ' + (obj));
+}
diff --git a/nashorn/test/script/basic/NASHORN-494.js b/nashorn/test/script/basic/NASHORN-494.js
new file mode 100644
index 00000000000..b049f15c749
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-494.js
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-494 :  in strict mode \0 is not allowed as escape sequence
+ *
+ * @test
+ * @run
+ */
+
+'use strict';
+
+function expectNoError(str) {
+    try {
+        eval(str);
+    } catch (e) {
+        fail("failed", e);
+    }
+}
+
+function expectError(str) {
+    try {
+        eval(str);
+        fail("should have thrown SyntaxError for : " + str);
+    } catch (e) {
+        if (! (e instanceof SyntaxError)) {
+            fail("expected SyntaxError, got " + e);
+        }
+    }
+}
+
+expectNoError("var x = '\\0'");
+expectNoError("var x = '\\0xyz'");
+expectError("var x = '\\01'");
+expectError("var x = '\\08'");
+expectError("var x = '\\7'");
+expectError("var x = '\\563'");
diff --git a/nashorn/test/script/basic/NASHORN-497.js b/nashorn/test/script/basic/NASHORN-497.js
new file mode 100644
index 00000000000..4757fb0fe11
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-497.js
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-497 :  optional initialization expression of iterable variable in a for-in statement is not parsed
+ *
+ * @test
+ * @run
+ */
+
+for (var x = 3 in {}) {
+}
+
+if (x !== 3) {
+    fail("#1 x !== 3");
+}
+
+for (var y = false in { foo: 33 }) {
+}
+
+if (typeof y != 'string' || y !=  'foo') {
+    fail("y should be 'foo'");
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-498.js b/nashorn/test/script/basic/NASHORN-498.js
new file mode 100644
index 00000000000..df3f6eb2326
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-498.js
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-498 :  'in' inside conditional expression middle term confuses parser when used in for statements
+ *
+ * @test
+ * @run
+ */
+
+// no syntax error expected for the following functions
+function func() {
+    // Parser thinks it is a for-in statement! But 'in' used in 
+    // cond. expression. This is a normal for statement
+    for (var x = a ? b in c : 3;;) {}
+}
+
+function func2() {
+    // for-in statement but init is cond. expression with 'in' 
+    // This is same as "for (var x = (a? b in c : e) in {} )"
+    for (var x = a ? b in c : e in {}) {}
+}
diff --git a/nashorn/test/script/basic/NASHORN-499.js b/nashorn/test/script/basic/NASHORN-499.js
new file mode 100644
index 00000000000..a11b99c9f4b
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-499.js
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-499 :  for (3 in {}) crashes nashorn
+ *
+ * @test
+ * @run
+ */
+
+try {
+    eval("for (3 in {}) {}");
+    fail("SyntaxError expected with 'for (3 in obj)'");
+} catch (e) {
+    if (! (e instanceof SyntaxError)) {
+        fail("expected SyntaxError, got " + e);
+    }
+}
diff --git a/nashorn/test/script/basic/NASHORN-50.js b/nashorn/test/script/basic/NASHORN-50.js
new file mode 100644
index 00000000000..70027a2b098
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-50.js
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-50 : various iteration issues with type widening and null/undefined according to $12.6.4
+ *
+ * @test
+ * @run
+ */
+
+try {
+    for (var y in null)  {
+	y = 2;
+    }
+} catch (e) {
+    print(e);
+}
+
+try {
+    for (var y in undefined) {
+	y = 2;
+    }
+} catch (e) {
+    print(e);
+}
+
+var arr = [1,2,3];
+for (var y in arr) {
+    y = 2;
+}
+for (var y in arr) {
+    y = "apa";
+}
+
+print("finished");
diff --git a/nashorn/test/script/basic/NASHORN-50.js.EXPECTED b/nashorn/test/script/basic/NASHORN-50.js.EXPECTED
new file mode 100644
index 00000000000..f6563985ac2
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-50.js.EXPECTED
@@ -0,0 +1 @@
+finished
diff --git a/nashorn/test/script/basic/NASHORN-500.js b/nashorn/test/script/basic/NASHORN-500.js
new file mode 100644
index 00000000000..9c6c35beca2
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-500.js
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-500 :  Using ScriptRuntime.toString for error reporting from runtime is problematic
+ *
+ * @test
+ * @run
+ */
+
+var origToString = Object.prototype.toString;
+Object.prototype.toString = function () { 
+    return this.myStr();
+}
+
+try {
+    print({});
+    fail("#1 toString should have thrown TypeError");
+} catch (e) {
+    if (! (e instanceof TypeError)) {
+        fail("#2 TypeError expected, got " + e);
+    }
+} finally {
+    Object.prototype.toString = origToString;
+}
+
+try {
+    print({ toString: function() { return this.foo(); } });
+    fail("#3 toString should have thrown TypeError");
+} catch (e) {
+    if (! (e instanceof TypeError)) {
+        fail("#4 TypeError expected, got " + e);
+    }
+}
+
+try {
+    var e = new Error();
+    e.toString = function() { return this.foo(); }
+    var lineNumber = __LINE__;
+    throw e;
+} catch (e) {
+    if (e.nashornException.lineNumber !== lineNumber  + 1) {
+        fail("#5 exception throw line number is incorrect");
+    }
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-503.js b/nashorn/test/script/basic/NASHORN-503.js
new file mode 100644
index 00000000000..84866fa9434
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-503.js
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-503 : regression: closure loses context.
+ *
+ * @test
+ * @run
+ */
+
+function next(f) { f(); }
+
+try {
+    throw new TypeError('error');
+} catch (iox) {
+    print('catch ' + iox.message);
+    next(function() {
+        print('next ' + iox.message);
+    });
+}
+
+
+try {
+    throw new TypeError('error');
+} catch (iox) {
+    print('catch ' + iox.message);
+    next(function() {
+        var iox = {};
+        print(iox.message);
+    });
+    print('catch ' + iox.message);
+}
diff --git a/nashorn/test/script/basic/NASHORN-503.js.EXPECTED b/nashorn/test/script/basic/NASHORN-503.js.EXPECTED
new file mode 100644
index 00000000000..a655ff50039
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-503.js.EXPECTED
@@ -0,0 +1,5 @@
+catch error
+next error
+catch error
+undefined
+catch error
diff --git a/nashorn/test/script/basic/NASHORN-51.js b/nashorn/test/script/basic/NASHORN-51.js
new file mode 100644
index 00000000000..d08c0a6dd1c
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-51.js
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-51 :  Post/pre increment and decrement operators should only accept "left hand side" expression.
+ *
+ * @test
+ * @run
+ */
+
+var literals = [1, 0, 3.14, true, false, null];
+
+for (i in literals) {
+    try {
+        eval(literals[i] + "++");
+        print("ERROR!! post increment : " + literals[i]);
+    } catch (e) {
+        print(e);
+    }
+
+    try {
+        eval(literals[i] + "--");
+        print("ERROR!! post decrement : " + literals[i]);
+    } catch (e) {
+        print(e);
+    }
+
+    try {
+        eval("++" + literals[i]);
+        print("ERROR!! pre increment : " + literals[i]);
+    } catch (e) {
+        print(e);
+    }
+
+    try {
+        eval("--" + literals[i]);
+        print("ERROR!! pre decrement : " + literals[i]);
+    } catch (e) {
+        print(e);
+    }
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-51.js.EXPECTED b/nashorn/test/script/basic/NASHORN-51.js.EXPECTED
new file mode 100644
index 00000000000..9fc05c3f1b4
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-51.js.EXPECTED
@@ -0,0 +1,24 @@
+ReferenceError: "1" can not be used as the left-hand side of assignment
+ReferenceError: "1" can not be used as the left-hand side of assignment
+ReferenceError: "1" can not be used as the left-hand side of assignment
+ReferenceError: "1" can not be used as the left-hand side of assignment
+ReferenceError: "0" can not be used as the left-hand side of assignment
+ReferenceError: "0" can not be used as the left-hand side of assignment
+ReferenceError: "0" can not be used as the left-hand side of assignment
+ReferenceError: "0" can not be used as the left-hand side of assignment
+ReferenceError: "3.14" can not be used as the left-hand side of assignment
+ReferenceError: "3.14" can not be used as the left-hand side of assignment
+ReferenceError: "3.14" can not be used as the left-hand side of assignment
+ReferenceError: "3.14" can not be used as the left-hand side of assignment
+ReferenceError: "true" can not be used as the left-hand side of assignment
+ReferenceError: "true" can not be used as the left-hand side of assignment
+ReferenceError: "true" can not be used as the left-hand side of assignment
+ReferenceError: "true" can not be used as the left-hand side of assignment
+ReferenceError: "false" can not be used as the left-hand side of assignment
+ReferenceError: "false" can not be used as the left-hand side of assignment
+ReferenceError: "false" can not be used as the left-hand side of assignment
+ReferenceError: "false" can not be used as the left-hand side of assignment
+ReferenceError: "null" can not be used as the left-hand side of assignment
+ReferenceError: "null" can not be used as the left-hand side of assignment
+ReferenceError: "null" can not be used as the left-hand side of assignment
+ReferenceError: "null" can not be used as the left-hand side of assignment
diff --git a/nashorn/test/script/basic/NASHORN-511.js b/nashorn/test/script/basic/NASHORN-511.js
new file mode 100644
index 00000000000..87ea7f8d9df
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-511.js
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-511 : var has no effect on existing globals.
+ *
+ * @test
+ * @run
+ */
+
+var y = 23;
+if (delete y != false) {
+    fail('#1: can delete declared var y');
+}
+if (delete this.y != false) {
+    fail('#2: can delete declared var using this.y');
+}
+
+var parseInt = 23;
+if (delete parseInt !== true) {
+    fail('#3: delete parseInt !== true');
+}
+if (delete this.parseInt !== true) {
+    fail('#4: delete this.parseInt !== true');
+}
+
+z = 24;
+eval("var z = 25;\
+if (delete z !== true) {\
+    fail('#5: delete z !== true');\
+}\
+if (delete this.z !== true) {\
+    fail('#6: delete this.z !== true');\
+}\
+");
diff --git a/nashorn/test/script/basic/NASHORN-515.js b/nashorn/test/script/basic/NASHORN-515.js
new file mode 100644
index 00000000000..1d1c309ac1d
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-515.js
@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * NASHORN-515 : Switch default handling was broken.
+ *
+ * @test
+ * @run
+ */
+
+function a() {
+    var x = (3.14-2.14);
+    
+    switch (x) {
+    case 1:
+	print("--1"); 
+	break;
+    case 2:
+	print("--2"); 
+	break;
+    default:
+	print("default");
+	break;
+    }
+}
+
+//NASHORN-529 - original fix was incomplete for primitive types
+function b() {
+    var index = 256.3;
+    switch (index) {
+    case 0x00:
+    case 0x01:
+	print("one zero");
+	break;
+    default:
+	print("default");
+	break;
+    }
+}
+
+//NASHORN-529 - original fix was incomplete for primitive types
+function c() {
+    var index = 0x1fffffffff;
+    switch (index) {
+    case 0x00:
+    case 0x01:
+	print("one zero");
+	break;
+    default:
+	print("default");
+    }
+    --index;
+}
+
+function d() {
+    var x = (3.14-1.14);
+    
+    switch(x) {
+    case 1:
+	print("--1"); break;
+    case 2:
+	print("--2"); break;
+    case 3:
+	print("--3"); break;
+    case 4:
+	print("--4"); break;
+    default:
+	print("default");
+    }
+}
+
+function e() {
+    var y = 2147483647;
+    
+    switch(y) {
+    case -2147483648:
+	print("MIN_INT"); break;
+    case -2147483647:
+	print("MIN_INT+1"); break;
+    case 2147483647:
+	print("MAX_INT"); break;
+    case 1:
+	print("--1"); break;
+    case 2:
+	print("--2"); break;
+    case 3:
+	print("--3"); break;
+    case 4:
+	print("--4"); break;
+    default:
+	print("default");
+    }
+}
+
+function f() {
+    var z = 2;
+    
+    switch(z) {
+    case -2147483648:
+	print("MIN_INT"); break;
+    case -2147483647:
+	print("MIN_INT+1"); break;
+    case 2147483647:
+	print("MAX_INT"); break;
+    case 1:
+	print("--1"); break;
+    case 2:
+	print("--2 first"); break;
+    case 2:
+	print("--2 second"); break;
+    case 3:
+	print("--3"); break;
+    case 4:
+	print("--4"); break;
+    default:
+	print("default");
+    }
+}
+
+a();
+b();
+c();
+d();
+e();
+f();
diff --git a/nashorn/test/script/basic/NASHORN-515.js.EXPECTED b/nashorn/test/script/basic/NASHORN-515.js.EXPECTED
new file mode 100644
index 00000000000..1ca9783c1a9
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-515.js.EXPECTED
@@ -0,0 +1,6 @@
+--1
+default
+default
+--2
+MAX_INT
+--2 first
diff --git a/nashorn/test/script/basic/NASHORN-516.js b/nashorn/test/script/basic/NASHORN-516.js
new file mode 100644
index 00000000000..b38329eb7ba
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-516.js
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * NASHORN-516 : Modified NASHORN-500 test case fails.
+ *
+ * @test
+ * @run
+ */
+
+var origToString = Object.prototype.toString;
+Object.prototype.toString = function () {
+    return this.myStr();
+}
+
+try {
+    print({});
+    fail("#1 toString should have thrown TypeError");
+} catch (e) {
+    (function() {
+        if (! (e instanceof TypeError)) {
+            fail("#2 TypeError expected, got " + e);
+        }
+    })();
+} finally {
+    Object.prototype.toString = origToString;
+}
+
+var e = new Error();
diff --git a/nashorn/test/script/basic/NASHORN-52.js b/nashorn/test/script/basic/NASHORN-52.js
new file mode 100644
index 00000000000..d8b192503fc
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-52.js
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-52 :  \v escape sequence should be accepted by Lexer
+ *
+ * @test
+ * @run
+ */
+
+// The following used to result in ReferenceError.
+// but \v is escape sequence for vertical tab char.
+
+eval("\vvar\vx\v=\v1\v");
+if (x !== 1) {
+    print("ERROR: x should be 1");
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-534.js b/nashorn/test/script/basic/NASHORN-534.js
new file mode 100644
index 00000000000..6825a2f5d03
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-534.js
@@ -0,0 +1,30066 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-534 - Script Constant Pool.
+ *
+ * @test
+ * @run
+ */
+
+var largeInteger = [
+0,
+1,
+2,
+3,
+4,
+5,
+6,
+7,
+8,
+9,
+10,
+11,
+12,
+13,
+14,
+15,
+16,
+17,
+18,
+19,
+20,
+21,
+22,
+23,
+24,
+25,
+26,
+27,
+28,
+29,
+30,
+31,
+32,
+33,
+34,
+35,
+36,
+37,
+38,
+39,
+40,
+41,
+42,
+43,
+44,
+45,
+46,
+47,
+48,
+49,
+50,
+51,
+52,
+53,
+54,
+55,
+56,
+57,
+58,
+59,
+60,
+61,
+62,
+63,
+64,
+65,
+66,
+67,
+68,
+69,
+70,
+71,
+72,
+73,
+74,
+75,
+76,
+77,
+78,
+79,
+80,
+81,
+82,
+83,
+84,
+85,
+86,
+87,
+88,
+89,
+90,
+91,
+92,
+93,
+94,
+95,
+96,
+97,
+98,
+99,
+100,
+101,
+102,
+103,
+104,
+105,
+106,
+107,
+108,
+109,
+110,
+111,
+112,
+113,
+114,
+115,
+116,
+117,
+118,
+119,
+120,
+121,
+122,
+123,
+124,
+125,
+126,
+127,
+128,
+129,
+130,
+131,
+132,
+133,
+134,
+135,
+136,
+137,
+138,
+139,
+140,
+141,
+142,
+143,
+144,
+145,
+146,
+147,
+148,
+149,
+150,
+151,
+152,
+153,
+154,
+155,
+156,
+157,
+158,
+159,
+160,
+161,
+162,
+163,
+164,
+165,
+166,
+167,
+168,
+169,
+170,
+171,
+172,
+173,
+174,
+175,
+176,
+177,
+178,
+179,
+180,
+181,
+182,
+183,
+184,
+185,
+186,
+187,
+188,
+189,
+190,
+191,
+192,
+193,
+194,
+195,
+196,
+197,
+198,
+199,
+200,
+201,
+202,
+203,
+204,
+205,
+206,
+207,
+208,
+209,
+210,
+211,
+212,
+213,
+214,
+215,
+216,
+217,
+218,
+219,
+220,
+221,
+222,
+223,
+224,
+225,
+226,
+227,
+228,
+229,
+230,
+231,
+232,
+233,
+234,
+235,
+236,
+237,
+238,
+239,
+240,
+241,
+242,
+243,
+244,
+245,
+246,
+247,
+248,
+249,
+250,
+251,
+252,
+253,
+254,
+255,
+256,
+257,
+258,
+259,
+260,
+261,
+262,
+263,
+264,
+265,
+266,
+267,
+268,
+269,
+270,
+271,
+272,
+273,
+274,
+275,
+276,
+277,
+278,
+279,
+280,
+281,
+282,
+283,
+284,
+285,
+286,
+287,
+288,
+289,
+290,
+291,
+292,
+293,
+294,
+295,
+296,
+297,
+298,
+299,
+300,
+301,
+302,
+303,
+304,
+305,
+306,
+307,
+308,
+309,
+310,
+311,
+312,
+313,
+314,
+315,
+316,
+317,
+318,
+319,
+320,
+321,
+322,
+323,
+324,
+325,
+326,
+327,
+328,
+329,
+330,
+331,
+332,
+333,
+334,
+335,
+336,
+337,
+338,
+339,
+340,
+341,
+342,
+343,
+344,
+345,
+346,
+347,
+348,
+349,
+350,
+351,
+352,
+353,
+354,
+355,
+356,
+357,
+358,
+359,
+360,
+361,
+362,
+363,
+364,
+365,
+366,
+367,
+368,
+369,
+370,
+371,
+372,
+373,
+374,
+375,
+376,
+377,
+378,
+379,
+380,
+381,
+382,
+383,
+384,
+385,
+386,
+387,
+388,
+389,
+390,
+391,
+392,
+393,
+394,
+395,
+396,
+397,
+398,
+399,
+400,
+401,
+402,
+403,
+404,
+405,
+406,
+407,
+408,
+409,
+410,
+411,
+412,
+413,
+414,
+415,
+416,
+417,
+418,
+419,
+420,
+421,
+422,
+423,
+424,
+425,
+426,
+427,
+428,
+429,
+430,
+431,
+432,
+433,
+434,
+435,
+436,
+437,
+438,
+439,
+440,
+441,
+442,
+443,
+444,
+445,
+446,
+447,
+448,
+449,
+450,
+451,
+452,
+453,
+454,
+455,
+456,
+457,
+458,
+459,
+460,
+461,
+462,
+463,
+464,
+465,
+466,
+467,
+468,
+469,
+470,
+471,
+472,
+473,
+474,
+475,
+476,
+477,
+478,
+479,
+480,
+481,
+482,
+483,
+484,
+485,
+486,
+487,
+488,
+489,
+490,
+491,
+492,
+493,
+494,
+495,
+496,
+497,
+498,
+499,
+500,
+501,
+502,
+503,
+504,
+505,
+506,
+507,
+508,
+509,
+510,
+511,
+512,
+513,
+514,
+515,
+516,
+517,
+518,
+519,
+520,
+521,
+522,
+523,
+524,
+525,
+526,
+527,
+528,
+529,
+530,
+531,
+532,
+533,
+534,
+535,
+536,
+537,
+538,
+539,
+540,
+541,
+542,
+543,
+544,
+545,
+546,
+547,
+548,
+549,
+550,
+551,
+552,
+553,
+554,
+555,
+556,
+557,
+558,
+559,
+560,
+561,
+562,
+563,
+564,
+565,
+566,
+567,
+568,
+569,
+570,
+571,
+572,
+573,
+574,
+575,
+576,
+577,
+578,
+579,
+580,
+581,
+582,
+583,
+584,
+585,
+586,
+587,
+588,
+589,
+590,
+591,
+592,
+593,
+594,
+595,
+596,
+597,
+598,
+599,
+600,
+601,
+602,
+603,
+604,
+605,
+606,
+607,
+608,
+609,
+610,
+611,
+612,
+613,
+614,
+615,
+616,
+617,
+618,
+619,
+620,
+621,
+622,
+623,
+624,
+625,
+626,
+627,
+628,
+629,
+630,
+631,
+632,
+633,
+634,
+635,
+636,
+637,
+638,
+639,
+640,
+641,
+642,
+643,
+644,
+645,
+646,
+647,
+648,
+649,
+650,
+651,
+652,
+653,
+654,
+655,
+656,
+657,
+658,
+659,
+660,
+661,
+662,
+663,
+664,
+665,
+666,
+667,
+668,
+669,
+670,
+671,
+672,
+673,
+674,
+675,
+676,
+677,
+678,
+679,
+680,
+681,
+682,
+683,
+684,
+685,
+686,
+687,
+688,
+689,
+690,
+691,
+692,
+693,
+694,
+695,
+696,
+697,
+698,
+699,
+700,
+701,
+702,
+703,
+704,
+705,
+706,
+707,
+708,
+709,
+710,
+711,
+712,
+713,
+714,
+715,
+716,
+717,
+718,
+719,
+720,
+721,
+722,
+723,
+724,
+725,
+726,
+727,
+728,
+729,
+730,
+731,
+732,
+733,
+734,
+735,
+736,
+737,
+738,
+739,
+740,
+741,
+742,
+743,
+744,
+745,
+746,
+747,
+748,
+749,
+750,
+751,
+752,
+753,
+754,
+755,
+756,
+757,
+758,
+759,
+760,
+761,
+762,
+763,
+764,
+765,
+766,
+767,
+768,
+769,
+770,
+771,
+772,
+773,
+774,
+775,
+776,
+777,
+778,
+779,
+780,
+781,
+782,
+783,
+784,
+785,
+786,
+787,
+788,
+789,
+790,
+791,
+792,
+793,
+794,
+795,
+796,
+797,
+798,
+799,
+800,
+801,
+802,
+803,
+804,
+805,
+806,
+807,
+808,
+809,
+810,
+811,
+812,
+813,
+814,
+815,
+816,
+817,
+818,
+819,
+820,
+821,
+822,
+823,
+824,
+825,
+826,
+827,
+828,
+829,
+830,
+831,
+832,
+833,
+834,
+835,
+836,
+837,
+838,
+839,
+840,
+841,
+842,
+843,
+844,
+845,
+846,
+847,
+848,
+849,
+850,
+851,
+852,
+853,
+854,
+855,
+856,
+857,
+858,
+859,
+860,
+861,
+862,
+863,
+864,
+865,
+866,
+867,
+868,
+869,
+870,
+871,
+872,
+873,
+874,
+875,
+876,
+877,
+878,
+879,
+880,
+881,
+882,
+883,
+884,
+885,
+886,
+887,
+888,
+889,
+890,
+891,
+892,
+893,
+894,
+895,
+896,
+897,
+898,
+899,
+900,
+901,
+902,
+903,
+904,
+905,
+906,
+907,
+908,
+909,
+910,
+911,
+912,
+913,
+914,
+915,
+916,
+917,
+918,
+919,
+920,
+921,
+922,
+923,
+924,
+925,
+926,
+927,
+928,
+929,
+930,
+931,
+932,
+933,
+934,
+935,
+936,
+937,
+938,
+939,
+940,
+941,
+942,
+943,
+944,
+945,
+946,
+947,
+948,
+949,
+950,
+951,
+952,
+953,
+954,
+955,
+956,
+957,
+958,
+959,
+960,
+961,
+962,
+963,
+964,
+965,
+966,
+967,
+968,
+969,
+970,
+971,
+972,
+973,
+974,
+975,
+976,
+977,
+978,
+979,
+980,
+981,
+982,
+983,
+984,
+985,
+986,
+987,
+988,
+989,
+990,
+991,
+992,
+993,
+994,
+995,
+996,
+997,
+998,
+999,
+1000,
+1001,
+1002,
+1003,
+1004,
+1005,
+1006,
+1007,
+1008,
+1009,
+1010,
+1011,
+1012,
+1013,
+1014,
+1015,
+1016,
+1017,
+1018,
+1019,
+1020,
+1021,
+1022,
+1023,
+1024,
+1025,
+1026,
+1027,
+1028,
+1029,
+1030,
+1031,
+1032,
+1033,
+1034,
+1035,
+1036,
+1037,
+1038,
+1039,
+1040,
+1041,
+1042,
+1043,
+1044,
+1045,
+1046,
+1047,
+1048,
+1049,
+1050,
+1051,
+1052,
+1053,
+1054,
+1055,
+1056,
+1057,
+1058,
+1059,
+1060,
+1061,
+1062,
+1063,
+1064,
+1065,
+1066,
+1067,
+1068,
+1069,
+1070,
+1071,
+1072,
+1073,
+1074,
+1075,
+1076,
+1077,
+1078,
+1079,
+1080,
+1081,
+1082,
+1083,
+1084,
+1085,
+1086,
+1087,
+1088,
+1089,
+1090,
+1091,
+1092,
+1093,
+1094,
+1095,
+1096,
+1097,
+1098,
+1099,
+1100,
+1101,
+1102,
+1103,
+1104,
+1105,
+1106,
+1107,
+1108,
+1109,
+1110,
+1111,
+1112,
+1113,
+1114,
+1115,
+1116,
+1117,
+1118,
+1119,
+1120,
+1121,
+1122,
+1123,
+1124,
+1125,
+1126,
+1127,
+1128,
+1129,
+1130,
+1131,
+1132,
+1133,
+1134,
+1135,
+1136,
+1137,
+1138,
+1139,
+1140,
+1141,
+1142,
+1143,
+1144,
+1145,
+1146,
+1147,
+1148,
+1149,
+1150,
+1151,
+1152,
+1153,
+1154,
+1155,
+1156,
+1157,
+1158,
+1159,
+1160,
+1161,
+1162,
+1163,
+1164,
+1165,
+1166,
+1167,
+1168,
+1169,
+1170,
+1171,
+1172,
+1173,
+1174,
+1175,
+1176,
+1177,
+1178,
+1179,
+1180,
+1181,
+1182,
+1183,
+1184,
+1185,
+1186,
+1187,
+1188,
+1189,
+1190,
+1191,
+1192,
+1193,
+1194,
+1195,
+1196,
+1197,
+1198,
+1199,
+1200,
+1201,
+1202,
+1203,
+1204,
+1205,
+1206,
+1207,
+1208,
+1209,
+1210,
+1211,
+1212,
+1213,
+1214,
+1215,
+1216,
+1217,
+1218,
+1219,
+1220,
+1221,
+1222,
+1223,
+1224,
+1225,
+1226,
+1227,
+1228,
+1229,
+1230,
+1231,
+1232,
+1233,
+1234,
+1235,
+1236,
+1237,
+1238,
+1239,
+1240,
+1241,
+1242,
+1243,
+1244,
+1245,
+1246,
+1247,
+1248,
+1249,
+1250,
+1251,
+1252,
+1253,
+1254,
+1255,
+1256,
+1257,
+1258,
+1259,
+1260,
+1261,
+1262,
+1263,
+1264,
+1265,
+1266,
+1267,
+1268,
+1269,
+1270,
+1271,
+1272,
+1273,
+1274,
+1275,
+1276,
+1277,
+1278,
+1279,
+1280,
+1281,
+1282,
+1283,
+1284,
+1285,
+1286,
+1287,
+1288,
+1289,
+1290,
+1291,
+1292,
+1293,
+1294,
+1295,
+1296,
+1297,
+1298,
+1299,
+1300,
+1301,
+1302,
+1303,
+1304,
+1305,
+1306,
+1307,
+1308,
+1309,
+1310,
+1311,
+1312,
+1313,
+1314,
+1315,
+1316,
+1317,
+1318,
+1319,
+1320,
+1321,
+1322,
+1323,
+1324,
+1325,
+1326,
+1327,
+1328,
+1329,
+1330,
+1331,
+1332,
+1333,
+1334,
+1335,
+1336,
+1337,
+1338,
+1339,
+1340,
+1341,
+1342,
+1343,
+1344,
+1345,
+1346,
+1347,
+1348,
+1349,
+1350,
+1351,
+1352,
+1353,
+1354,
+1355,
+1356,
+1357,
+1358,
+1359,
+1360,
+1361,
+1362,
+1363,
+1364,
+1365,
+1366,
+1367,
+1368,
+1369,
+1370,
+1371,
+1372,
+1373,
+1374,
+1375,
+1376,
+1377,
+1378,
+1379,
+1380,
+1381,
+1382,
+1383,
+1384,
+1385,
+1386,
+1387,
+1388,
+1389,
+1390,
+1391,
+1392,
+1393,
+1394,
+1395,
+1396,
+1397,
+1398,
+1399,
+1400,
+1401,
+1402,
+1403,
+1404,
+1405,
+1406,
+1407,
+1408,
+1409,
+1410,
+1411,
+1412,
+1413,
+1414,
+1415,
+1416,
+1417,
+1418,
+1419,
+1420,
+1421,
+1422,
+1423,
+1424,
+1425,
+1426,
+1427,
+1428,
+1429,
+1430,
+1431,
+1432,
+1433,
+1434,
+1435,
+1436,
+1437,
+1438,
+1439,
+1440,
+1441,
+1442,
+1443,
+1444,
+1445,
+1446,
+1447,
+1448,
+1449,
+1450,
+1451,
+1452,
+1453,
+1454,
+1455,
+1456,
+1457,
+1458,
+1459,
+1460,
+1461,
+1462,
+1463,
+1464,
+1465,
+1466,
+1467,
+1468,
+1469,
+1470,
+1471,
+1472,
+1473,
+1474,
+1475,
+1476,
+1477,
+1478,
+1479,
+1480,
+1481,
+1482,
+1483,
+1484,
+1485,
+1486,
+1487,
+1488,
+1489,
+1490,
+1491,
+1492,
+1493,
+1494,
+1495,
+1496,
+1497,
+1498,
+1499,
+1500,
+1501,
+1502,
+1503,
+1504,
+1505,
+1506,
+1507,
+1508,
+1509,
+1510,
+1511,
+1512,
+1513,
+1514,
+1515,
+1516,
+1517,
+1518,
+1519,
+1520,
+1521,
+1522,
+1523,
+1524,
+1525,
+1526,
+1527,
+1528,
+1529,
+1530,
+1531,
+1532,
+1533,
+1534,
+1535,
+1536,
+1537,
+1538,
+1539,
+1540,
+1541,
+1542,
+1543,
+1544,
+1545,
+1546,
+1547,
+1548,
+1549,
+1550,
+1551,
+1552,
+1553,
+1554,
+1555,
+1556,
+1557,
+1558,
+1559,
+1560,
+1561,
+1562,
+1563,
+1564,
+1565,
+1566,
+1567,
+1568,
+1569,
+1570,
+1571,
+1572,
+1573,
+1574,
+1575,
+1576,
+1577,
+1578,
+1579,
+1580,
+1581,
+1582,
+1583,
+1584,
+1585,
+1586,
+1587,
+1588,
+1589,
+1590,
+1591,
+1592,
+1593,
+1594,
+1595,
+1596,
+1597,
+1598,
+1599,
+1600,
+1601,
+1602,
+1603,
+1604,
+1605,
+1606,
+1607,
+1608,
+1609,
+1610,
+1611,
+1612,
+1613,
+1614,
+1615,
+1616,
+1617,
+1618,
+1619,
+1620,
+1621,
+1622,
+1623,
+1624,
+1625,
+1626,
+1627,
+1628,
+1629,
+1630,
+1631,
+1632,
+1633,
+1634,
+1635,
+1636,
+1637,
+1638,
+1639,
+1640,
+1641,
+1642,
+1643,
+1644,
+1645,
+1646,
+1647,
+1648,
+1649,
+1650,
+1651,
+1652,
+1653,
+1654,
+1655,
+1656,
+1657,
+1658,
+1659,
+1660,
+1661,
+1662,
+1663,
+1664,
+1665,
+1666,
+1667,
+1668,
+1669,
+1670,
+1671,
+1672,
+1673,
+1674,
+1675,
+1676,
+1677,
+1678,
+1679,
+1680,
+1681,
+1682,
+1683,
+1684,
+1685,
+1686,
+1687,
+1688,
+1689,
+1690,
+1691,
+1692,
+1693,
+1694,
+1695,
+1696,
+1697,
+1698,
+1699,
+1700,
+1701,
+1702,
+1703,
+1704,
+1705,
+1706,
+1707,
+1708,
+1709,
+1710,
+1711,
+1712,
+1713,
+1714,
+1715,
+1716,
+1717,
+1718,
+1719,
+1720,
+1721,
+1722,
+1723,
+1724,
+1725,
+1726,
+1727,
+1728,
+1729,
+1730,
+1731,
+1732,
+1733,
+1734,
+1735,
+1736,
+1737,
+1738,
+1739,
+1740,
+1741,
+1742,
+1743,
+1744,
+1745,
+1746,
+1747,
+1748,
+1749,
+1750,
+1751,
+1752,
+1753,
+1754,
+1755,
+1756,
+1757,
+1758,
+1759,
+1760,
+1761,
+1762,
+1763,
+1764,
+1765,
+1766,
+1767,
+1768,
+1769,
+1770,
+1771,
+1772,
+1773,
+1774,
+1775,
+1776,
+1777,
+1778,
+1779,
+1780,
+1781,
+1782,
+1783,
+1784,
+1785,
+1786,
+1787,
+1788,
+1789,
+1790,
+1791,
+1792,
+1793,
+1794,
+1795,
+1796,
+1797,
+1798,
+1799,
+1800,
+1801,
+1802,
+1803,
+1804,
+1805,
+1806,
+1807,
+1808,
+1809,
+1810,
+1811,
+1812,
+1813,
+1814,
+1815,
+1816,
+1817,
+1818,
+1819,
+1820,
+1821,
+1822,
+1823,
+1824,
+1825,
+1826,
+1827,
+1828,
+1829,
+1830,
+1831,
+1832,
+1833,
+1834,
+1835,
+1836,
+1837,
+1838,
+1839,
+1840,
+1841,
+1842,
+1843,
+1844,
+1845,
+1846,
+1847,
+1848,
+1849,
+1850,
+1851,
+1852,
+1853,
+1854,
+1855,
+1856,
+1857,
+1858,
+1859,
+1860,
+1861,
+1862,
+1863,
+1864,
+1865,
+1866,
+1867,
+1868,
+1869,
+1870,
+1871,
+1872,
+1873,
+1874,
+1875,
+1876,
+1877,
+1878,
+1879,
+1880,
+1881,
+1882,
+1883,
+1884,
+1885,
+1886,
+1887,
+1888,
+1889,
+1890,
+1891,
+1892,
+1893,
+1894,
+1895,
+1896,
+1897,
+1898,
+1899,
+1900,
+1901,
+1902,
+1903,
+1904,
+1905,
+1906,
+1907,
+1908,
+1909,
+1910,
+1911,
+1912,
+1913,
+1914,
+1915,
+1916,
+1917,
+1918,
+1919,
+1920,
+1921,
+1922,
+1923,
+1924,
+1925,
+1926,
+1927,
+1928,
+1929,
+1930,
+1931,
+1932,
+1933,
+1934,
+1935,
+1936,
+1937,
+1938,
+1939,
+1940,
+1941,
+1942,
+1943,
+1944,
+1945,
+1946,
+1947,
+1948,
+1949,
+1950,
+1951,
+1952,
+1953,
+1954,
+1955,
+1956,
+1957,
+1958,
+1959,
+1960,
+1961,
+1962,
+1963,
+1964,
+1965,
+1966,
+1967,
+1968,
+1969,
+1970,
+1971,
+1972,
+1973,
+1974,
+1975,
+1976,
+1977,
+1978,
+1979,
+1980,
+1981,
+1982,
+1983,
+1984,
+1985,
+1986,
+1987,
+1988,
+1989,
+1990,
+1991,
+1992,
+1993,
+1994,
+1995,
+1996,
+1997,
+1998,
+1999,
+2000,
+2001,
+2002,
+2003,
+2004,
+2005,
+2006,
+2007,
+2008,
+2009,
+2010,
+2011,
+2012,
+2013,
+2014,
+2015,
+2016,
+2017,
+2018,
+2019,
+2020,
+2021,
+2022,
+2023,
+2024,
+2025,
+2026,
+2027,
+2028,
+2029,
+2030,
+2031,
+2032,
+2033,
+2034,
+2035,
+2036,
+2037,
+2038,
+2039,
+2040,
+2041,
+2042,
+2043,
+2044,
+2045,
+2046,
+2047,
+2048,
+2049,
+2050,
+2051,
+2052,
+2053,
+2054,
+2055,
+2056,
+2057,
+2058,
+2059,
+2060,
+2061,
+2062,
+2063,
+2064,
+2065,
+2066,
+2067,
+2068,
+2069,
+2070,
+2071,
+2072,
+2073,
+2074,
+2075,
+2076,
+2077,
+2078,
+2079,
+2080,
+2081,
+2082,
+2083,
+2084,
+2085,
+2086,
+2087,
+2088,
+2089,
+2090,
+2091,
+2092,
+2093,
+2094,
+2095,
+2096,
+2097,
+2098,
+2099,
+2100,
+2101,
+2102,
+2103,
+2104,
+2105,
+2106,
+2107,
+2108,
+2109,
+2110,
+2111,
+2112,
+2113,
+2114,
+2115,
+2116,
+2117,
+2118,
+2119,
+2120,
+2121,
+2122,
+2123,
+2124,
+2125,
+2126,
+2127,
+2128,
+2129,
+2130,
+2131,
+2132,
+2133,
+2134,
+2135,
+2136,
+2137,
+2138,
+2139,
+2140,
+2141,
+2142,
+2143,
+2144,
+2145,
+2146,
+2147,
+2148,
+2149,
+2150,
+2151,
+2152,
+2153,
+2154,
+2155,
+2156,
+2157,
+2158,
+2159,
+2160,
+2161,
+2162,
+2163,
+2164,
+2165,
+2166,
+2167,
+2168,
+2169,
+2170,
+2171,
+2172,
+2173,
+2174,
+2175,
+2176,
+2177,
+2178,
+2179,
+2180,
+2181,
+2182,
+2183,
+2184,
+2185,
+2186,
+2187,
+2188,
+2189,
+2190,
+2191,
+2192,
+2193,
+2194,
+2195,
+2196,
+2197,
+2198,
+2199,
+2200,
+2201,
+2202,
+2203,
+2204,
+2205,
+2206,
+2207,
+2208,
+2209,
+2210,
+2211,
+2212,
+2213,
+2214,
+2215,
+2216,
+2217,
+2218,
+2219,
+2220,
+2221,
+2222,
+2223,
+2224,
+2225,
+2226,
+2227,
+2228,
+2229,
+2230,
+2231,
+2232,
+2233,
+2234,
+2235,
+2236,
+2237,
+2238,
+2239,
+2240,
+2241,
+2242,
+2243,
+2244,
+2245,
+2246,
+2247,
+2248,
+2249,
+2250,
+2251,
+2252,
+2253,
+2254,
+2255,
+2256,
+2257,
+2258,
+2259,
+2260,
+2261,
+2262,
+2263,
+2264,
+2265,
+2266,
+2267,
+2268,
+2269,
+2270,
+2271,
+2272,
+2273,
+2274,
+2275,
+2276,
+2277,
+2278,
+2279,
+2280,
+2281,
+2282,
+2283,
+2284,
+2285,
+2286,
+2287,
+2288,
+2289,
+2290,
+2291,
+2292,
+2293,
+2294,
+2295,
+2296,
+2297,
+2298,
+2299,
+2300,
+2301,
+2302,
+2303,
+2304,
+2305,
+2306,
+2307,
+2308,
+2309,
+2310,
+2311,
+2312,
+2313,
+2314,
+2315,
+2316,
+2317,
+2318,
+2319,
+2320,
+2321,
+2322,
+2323,
+2324,
+2325,
+2326,
+2327,
+2328,
+2329,
+2330,
+2331,
+2332,
+2333,
+2334,
+2335,
+2336,
+2337,
+2338,
+2339,
+2340,
+2341,
+2342,
+2343,
+2344,
+2345,
+2346,
+2347,
+2348,
+2349,
+2350,
+2351,
+2352,
+2353,
+2354,
+2355,
+2356,
+2357,
+2358,
+2359,
+2360,
+2361,
+2362,
+2363,
+2364,
+2365,
+2366,
+2367,
+2368,
+2369,
+2370,
+2371,
+2372,
+2373,
+2374,
+2375,
+2376,
+2377,
+2378,
+2379,
+2380,
+2381,
+2382,
+2383,
+2384,
+2385,
+2386,
+2387,
+2388,
+2389,
+2390,
+2391,
+2392,
+2393,
+2394,
+2395,
+2396,
+2397,
+2398,
+2399,
+2400,
+2401,
+2402,
+2403,
+2404,
+2405,
+2406,
+2407,
+2408,
+2409,
+2410,
+2411,
+2412,
+2413,
+2414,
+2415,
+2416,
+2417,
+2418,
+2419,
+2420,
+2421,
+2422,
+2423,
+2424,
+2425,
+2426,
+2427,
+2428,
+2429,
+2430,
+2431,
+2432,
+2433,
+2434,
+2435,
+2436,
+2437,
+2438,
+2439,
+2440,
+2441,
+2442,
+2443,
+2444,
+2445,
+2446,
+2447,
+2448,
+2449,
+2450,
+2451,
+2452,
+2453,
+2454,
+2455,
+2456,
+2457,
+2458,
+2459,
+2460,
+2461,
+2462,
+2463,
+2464,
+2465,
+2466,
+2467,
+2468,
+2469,
+2470,
+2471,
+2472,
+2473,
+2474,
+2475,
+2476,
+2477,
+2478,
+2479,
+2480,
+2481,
+2482,
+2483,
+2484,
+2485,
+2486,
+2487,
+2488,
+2489,
+2490,
+2491,
+2492,
+2493,
+2494,
+2495,
+2496,
+2497,
+2498,
+2499,
+2500,
+2501,
+2502,
+2503,
+2504,
+2505,
+2506,
+2507,
+2508,
+2509,
+2510,
+2511,
+2512,
+2513,
+2514,
+2515,
+2516,
+2517,
+2518,
+2519,
+2520,
+2521,
+2522,
+2523,
+2524,
+2525,
+2526,
+2527,
+2528,
+2529,
+2530,
+2531,
+2532,
+2533,
+2534,
+2535,
+2536,
+2537,
+2538,
+2539,
+2540,
+2541,
+2542,
+2543,
+2544,
+2545,
+2546,
+2547,
+2548,
+2549,
+2550,
+2551,
+2552,
+2553,
+2554,
+2555,
+2556,
+2557,
+2558,
+2559,
+2560,
+2561,
+2562,
+2563,
+2564,
+2565,
+2566,
+2567,
+2568,
+2569,
+2570,
+2571,
+2572,
+2573,
+2574,
+2575,
+2576,
+2577,
+2578,
+2579,
+2580,
+2581,
+2582,
+2583,
+2584,
+2585,
+2586,
+2587,
+2588,
+2589,
+2590,
+2591,
+2592,
+2593,
+2594,
+2595,
+2596,
+2597,
+2598,
+2599,
+2600,
+2601,
+2602,
+2603,
+2604,
+2605,
+2606,
+2607,
+2608,
+2609,
+2610,
+2611,
+2612,
+2613,
+2614,
+2615,
+2616,
+2617,
+2618,
+2619,
+2620,
+2621,
+2622,
+2623,
+2624,
+2625,
+2626,
+2627,
+2628,
+2629,
+2630,
+2631,
+2632,
+2633,
+2634,
+2635,
+2636,
+2637,
+2638,
+2639,
+2640,
+2641,
+2642,
+2643,
+2644,
+2645,
+2646,
+2647,
+2648,
+2649,
+2650,
+2651,
+2652,
+2653,
+2654,
+2655,
+2656,
+2657,
+2658,
+2659,
+2660,
+2661,
+2662,
+2663,
+2664,
+2665,
+2666,
+2667,
+2668,
+2669,
+2670,
+2671,
+2672,
+2673,
+2674,
+2675,
+2676,
+2677,
+2678,
+2679,
+2680,
+2681,
+2682,
+2683,
+2684,
+2685,
+2686,
+2687,
+2688,
+2689,
+2690,
+2691,
+2692,
+2693,
+2694,
+2695,
+2696,
+2697,
+2698,
+2699,
+2700,
+2701,
+2702,
+2703,
+2704,
+2705,
+2706,
+2707,
+2708,
+2709,
+2710,
+2711,
+2712,
+2713,
+2714,
+2715,
+2716,
+2717,
+2718,
+2719,
+2720,
+2721,
+2722,
+2723,
+2724,
+2725,
+2726,
+2727,
+2728,
+2729,
+2730,
+2731,
+2732,
+2733,
+2734,
+2735,
+2736,
+2737,
+2738,
+2739,
+2740,
+2741,
+2742,
+2743,
+2744,
+2745,
+2746,
+2747,
+2748,
+2749,
+2750,
+2751,
+2752,
+2753,
+2754,
+2755,
+2756,
+2757,
+2758,
+2759,
+2760,
+2761,
+2762,
+2763,
+2764,
+2765,
+2766,
+2767,
+2768,
+2769,
+2770,
+2771,
+2772,
+2773,
+2774,
+2775,
+2776,
+2777,
+2778,
+2779,
+2780,
+2781,
+2782,
+2783,
+2784,
+2785,
+2786,
+2787,
+2788,
+2789,
+2790,
+2791,
+2792,
+2793,
+2794,
+2795,
+2796,
+2797,
+2798,
+2799,
+2800,
+2801,
+2802,
+2803,
+2804,
+2805,
+2806,
+2807,
+2808,
+2809,
+2810,
+2811,
+2812,
+2813,
+2814,
+2815,
+2816,
+2817,
+2818,
+2819,
+2820,
+2821,
+2822,
+2823,
+2824,
+2825,
+2826,
+2827,
+2828,
+2829,
+2830,
+2831,
+2832,
+2833,
+2834,
+2835,
+2836,
+2837,
+2838,
+2839,
+2840,
+2841,
+2842,
+2843,
+2844,
+2845,
+2846,
+2847,
+2848,
+2849,
+2850,
+2851,
+2852,
+2853,
+2854,
+2855,
+2856,
+2857,
+2858,
+2859,
+2860,
+2861,
+2862,
+2863,
+2864,
+2865,
+2866,
+2867,
+2868,
+2869,
+2870,
+2871,
+2872,
+2873,
+2874,
+2875,
+2876,
+2877,
+2878,
+2879,
+2880,
+2881,
+2882,
+2883,
+2884,
+2885,
+2886,
+2887,
+2888,
+2889,
+2890,
+2891,
+2892,
+2893,
+2894,
+2895,
+2896,
+2897,
+2898,
+2899,
+2900,
+2901,
+2902,
+2903,
+2904,
+2905,
+2906,
+2907,
+2908,
+2909,
+2910,
+2911,
+2912,
+2913,
+2914,
+2915,
+2916,
+2917,
+2918,
+2919,
+2920,
+2921,
+2922,
+2923,
+2924,
+2925,
+2926,
+2927,
+2928,
+2929,
+2930,
+2931,
+2932,
+2933,
+2934,
+2935,
+2936,
+2937,
+2938,
+2939,
+2940,
+2941,
+2942,
+2943,
+2944,
+2945,
+2946,
+2947,
+2948,
+2949,
+2950,
+2951,
+2952,
+2953,
+2954,
+2955,
+2956,
+2957,
+2958,
+2959,
+2960,
+2961,
+2962,
+2963,
+2964,
+2965,
+2966,
+2967,
+2968,
+2969,
+2970,
+2971,
+2972,
+2973,
+2974,
+2975,
+2976,
+2977,
+2978,
+2979,
+2980,
+2981,
+2982,
+2983,
+2984,
+2985,
+2986,
+2987,
+2988,
+2989,
+2990,
+2991,
+2992,
+2993,
+2994,
+2995,
+2996,
+2997,
+2998,
+2999,
+3000,
+3001,
+3002,
+3003,
+3004,
+3005,
+3006,
+3007,
+3008,
+3009,
+3010,
+3011,
+3012,
+3013,
+3014,
+3015,
+3016,
+3017,
+3018,
+3019,
+3020,
+3021,
+3022,
+3023,
+3024,
+3025,
+3026,
+3027,
+3028,
+3029,
+3030,
+3031,
+3032,
+3033,
+3034,
+3035,
+3036,
+3037,
+3038,
+3039,
+3040,
+3041,
+3042,
+3043,
+3044,
+3045,
+3046,
+3047,
+3048,
+3049,
+3050,
+3051,
+3052,
+3053,
+3054,
+3055,
+3056,
+3057,
+3058,
+3059,
+3060,
+3061,
+3062,
+3063,
+3064,
+3065,
+3066,
+3067,
+3068,
+3069,
+3070,
+3071,
+3072,
+3073,
+3074,
+3075,
+3076,
+3077,
+3078,
+3079,
+3080,
+3081,
+3082,
+3083,
+3084,
+3085,
+3086,
+3087,
+3088,
+3089,
+3090,
+3091,
+3092,
+3093,
+3094,
+3095,
+3096,
+3097,
+3098,
+3099,
+3100,
+3101,
+3102,
+3103,
+3104,
+3105,
+3106,
+3107,
+3108,
+3109,
+3110,
+3111,
+3112,
+3113,
+3114,
+3115,
+3116,
+3117,
+3118,
+3119,
+3120,
+3121,
+3122,
+3123,
+3124,
+3125,
+3126,
+3127,
+3128,
+3129,
+3130,
+3131,
+3132,
+3133,
+3134,
+3135,
+3136,
+3137,
+3138,
+3139,
+3140,
+3141,
+3142,
+3143,
+3144,
+3145,
+3146,
+3147,
+3148,
+3149,
+3150,
+3151,
+3152,
+3153,
+3154,
+3155,
+3156,
+3157,
+3158,
+3159,
+3160,
+3161,
+3162,
+3163,
+3164,
+3165,
+3166,
+3167,
+3168,
+3169,
+3170,
+3171,
+3172,
+3173,
+3174,
+3175,
+3176,
+3177,
+3178,
+3179,
+3180,
+3181,
+3182,
+3183,
+3184,
+3185,
+3186,
+3187,
+3188,
+3189,
+3190,
+3191,
+3192,
+3193,
+3194,
+3195,
+3196,
+3197,
+3198,
+3199,
+3200,
+3201,
+3202,
+3203,
+3204,
+3205,
+3206,
+3207,
+3208,
+3209,
+3210,
+3211,
+3212,
+3213,
+3214,
+3215,
+3216,
+3217,
+3218,
+3219,
+3220,
+3221,
+3222,
+3223,
+3224,
+3225,
+3226,
+3227,
+3228,
+3229,
+3230,
+3231,
+3232,
+3233,
+3234,
+3235,
+3236,
+3237,
+3238,
+3239,
+3240,
+3241,
+3242,
+3243,
+3244,
+3245,
+3246,
+3247,
+3248,
+3249,
+3250,
+3251,
+3252,
+3253,
+3254,
+3255,
+3256,
+3257,
+3258,
+3259,
+3260,
+3261,
+3262,
+3263,
+3264,
+3265,
+3266,
+3267,
+3268,
+3269,
+3270,
+3271,
+3272,
+3273,
+3274,
+3275,
+3276,
+3277,
+3278,
+3279,
+3280,
+3281,
+3282,
+3283,
+3284,
+3285,
+3286,
+3287,
+3288,
+3289,
+3290,
+3291,
+3292,
+3293,
+3294,
+3295,
+3296,
+3297,
+3298,
+3299,
+3300,
+3301,
+3302,
+3303,
+3304,
+3305,
+3306,
+3307,
+3308,
+3309,
+3310,
+3311,
+3312,
+3313,
+3314,
+3315,
+3316,
+3317,
+3318,
+3319,
+3320,
+3321,
+3322,
+3323,
+3324,
+3325,
+3326,
+3327,
+3328,
+3329,
+3330,
+3331,
+3332,
+3333,
+3334,
+3335,
+3336,
+3337,
+3338,
+3339,
+3340,
+3341,
+3342,
+3343,
+3344,
+3345,
+3346,
+3347,
+3348,
+3349,
+3350,
+3351,
+3352,
+3353,
+3354,
+3355,
+3356,
+3357,
+3358,
+3359,
+3360,
+3361,
+3362,
+3363,
+3364,
+3365,
+3366,
+3367,
+3368,
+3369,
+3370,
+3371,
+3372,
+3373,
+3374,
+3375,
+3376,
+3377,
+3378,
+3379,
+3380,
+3381,
+3382,
+3383,
+3384,
+3385,
+3386,
+3387,
+3388,
+3389,
+3390,
+3391,
+3392,
+3393,
+3394,
+3395,
+3396,
+3397,
+3398,
+3399,
+3400,
+3401,
+3402,
+3403,
+3404,
+3405,
+3406,
+3407,
+3408,
+3409,
+3410,
+3411,
+3412,
+3413,
+3414,
+3415,
+3416,
+3417,
+3418,
+3419,
+3420,
+3421,
+3422,
+3423,
+3424,
+3425,
+3426,
+3427,
+3428,
+3429,
+3430,
+3431,
+3432,
+3433,
+3434,
+3435,
+3436,
+3437,
+3438,
+3439,
+3440,
+3441,
+3442,
+3443,
+3444,
+3445,
+3446,
+3447,
+3448,
+3449,
+3450,
+3451,
+3452,
+3453,
+3454,
+3455,
+3456,
+3457,
+3458,
+3459,
+3460,
+3461,
+3462,
+3463,
+3464,
+3465,
+3466,
+3467,
+3468,
+3469,
+3470,
+3471,
+3472,
+3473,
+3474,
+3475,
+3476,
+3477,
+3478,
+3479,
+3480,
+3481,
+3482,
+3483,
+3484,
+3485,
+3486,
+3487,
+3488,
+3489,
+3490,
+3491,
+3492,
+3493,
+3494,
+3495,
+3496,
+3497,
+3498,
+3499,
+3500,
+3501,
+3502,
+3503,
+3504,
+3505,
+3506,
+3507,
+3508,
+3509,
+3510,
+3511,
+3512,
+3513,
+3514,
+3515,
+3516,
+3517,
+3518,
+3519,
+3520,
+3521,
+3522,
+3523,
+3524,
+3525,
+3526,
+3527,
+3528,
+3529,
+3530,
+3531,
+3532,
+3533,
+3534,
+3535,
+3536,
+3537,
+3538,
+3539,
+3540,
+3541,
+3542,
+3543,
+3544,
+3545,
+3546,
+3547,
+3548,
+3549,
+3550,
+3551,
+3552,
+3553,
+3554,
+3555,
+3556,
+3557,
+3558,
+3559,
+3560,
+3561,
+3562,
+3563,
+3564,
+3565,
+3566,
+3567,
+3568,
+3569,
+3570,
+3571,
+3572,
+3573,
+3574,
+3575,
+3576,
+3577,
+3578,
+3579,
+3580,
+3581,
+3582,
+3583,
+3584,
+3585,
+3586,
+3587,
+3588,
+3589,
+3590,
+3591,
+3592,
+3593,
+3594,
+3595,
+3596,
+3597,
+3598,
+3599,
+3600,
+3601,
+3602,
+3603,
+3604,
+3605,
+3606,
+3607,
+3608,
+3609,
+3610,
+3611,
+3612,
+3613,
+3614,
+3615,
+3616,
+3617,
+3618,
+3619,
+3620,
+3621,
+3622,
+3623,
+3624,
+3625,
+3626,
+3627,
+3628,
+3629,
+3630,
+3631,
+3632,
+3633,
+3634,
+3635,
+3636,
+3637,
+3638,
+3639,
+3640,
+3641,
+3642,
+3643,
+3644,
+3645,
+3646,
+3647,
+3648,
+3649,
+3650,
+3651,
+3652,
+3653,
+3654,
+3655,
+3656,
+3657,
+3658,
+3659,
+3660,
+3661,
+3662,
+3663,
+3664,
+3665,
+3666,
+3667,
+3668,
+3669,
+3670,
+3671,
+3672,
+3673,
+3674,
+3675,
+3676,
+3677,
+3678,
+3679,
+3680,
+3681,
+3682,
+3683,
+3684,
+3685,
+3686,
+3687,
+3688,
+3689,
+3690,
+3691,
+3692,
+3693,
+3694,
+3695,
+3696,
+3697,
+3698,
+3699,
+3700,
+3701,
+3702,
+3703,
+3704,
+3705,
+3706,
+3707,
+3708,
+3709,
+3710,
+3711,
+3712,
+3713,
+3714,
+3715,
+3716,
+3717,
+3718,
+3719,
+3720,
+3721,
+3722,
+3723,
+3724,
+3725,
+3726,
+3727,
+3728,
+3729,
+3730,
+3731,
+3732,
+3733,
+3734,
+3735,
+3736,
+3737,
+3738,
+3739,
+3740,
+3741,
+3742,
+3743,
+3744,
+3745,
+3746,
+3747,
+3748,
+3749,
+3750,
+3751,
+3752,
+3753,
+3754,
+3755,
+3756,
+3757,
+3758,
+3759,
+3760,
+3761,
+3762,
+3763,
+3764,
+3765,
+3766,
+3767,
+3768,
+3769,
+3770,
+3771,
+3772,
+3773,
+3774,
+3775,
+3776,
+3777,
+3778,
+3779,
+3780,
+3781,
+3782,
+3783,
+3784,
+3785,
+3786,
+3787,
+3788,
+3789,
+3790,
+3791,
+3792,
+3793,
+3794,
+3795,
+3796,
+3797,
+3798,
+3799,
+3800,
+3801,
+3802,
+3803,
+3804,
+3805,
+3806,
+3807,
+3808,
+3809,
+3810,
+3811,
+3812,
+3813,
+3814,
+3815,
+3816,
+3817,
+3818,
+3819,
+3820,
+3821,
+3822,
+3823,
+3824,
+3825,
+3826,
+3827,
+3828,
+3829,
+3830,
+3831,
+3832,
+3833,
+3834,
+3835,
+3836,
+3837,
+3838,
+3839,
+3840,
+3841,
+3842,
+3843,
+3844,
+3845,
+3846,
+3847,
+3848,
+3849,
+3850,
+3851,
+3852,
+3853,
+3854,
+3855,
+3856,
+3857,
+3858,
+3859,
+3860,
+3861,
+3862,
+3863,
+3864,
+3865,
+3866,
+3867,
+3868,
+3869,
+3870,
+3871,
+3872,
+3873,
+3874,
+3875,
+3876,
+3877,
+3878,
+3879,
+3880,
+3881,
+3882,
+3883,
+3884,
+3885,
+3886,
+3887,
+3888,
+3889,
+3890,
+3891,
+3892,
+3893,
+3894,
+3895,
+3896,
+3897,
+3898,
+3899,
+3900,
+3901,
+3902,
+3903,
+3904,
+3905,
+3906,
+3907,
+3908,
+3909,
+3910,
+3911,
+3912,
+3913,
+3914,
+3915,
+3916,
+3917,
+3918,
+3919,
+3920,
+3921,
+3922,
+3923,
+3924,
+3925,
+3926,
+3927,
+3928,
+3929,
+3930,
+3931,
+3932,
+3933,
+3934,
+3935,
+3936,
+3937,
+3938,
+3939,
+3940,
+3941,
+3942,
+3943,
+3944,
+3945,
+3946,
+3947,
+3948,
+3949,
+3950,
+3951,
+3952,
+3953,
+3954,
+3955,
+3956,
+3957,
+3958,
+3959,
+3960,
+3961,
+3962,
+3963,
+3964,
+3965,
+3966,
+3967,
+3968,
+3969,
+3970,
+3971,
+3972,
+3973,
+3974,
+3975,
+3976,
+3977,
+3978,
+3979,
+3980,
+3981,
+3982,
+3983,
+3984,
+3985,
+3986,
+3987,
+3988,
+3989,
+3990,
+3991,
+3992,
+3993,
+3994,
+3995,
+3996,
+3997,
+3998,
+3999,
+4000,
+4001,
+4002,
+4003,
+4004,
+4005,
+4006,
+4007,
+4008,
+4009,
+4010,
+4011,
+4012,
+4013,
+4014,
+4015,
+4016,
+4017,
+4018,
+4019,
+4020,
+4021,
+4022,
+4023,
+4024,
+4025,
+4026,
+4027,
+4028,
+4029,
+4030,
+4031,
+4032,
+4033,
+4034,
+4035,
+4036,
+4037,
+4038,
+4039,
+4040,
+4041,
+4042,
+4043,
+4044,
+4045,
+4046,
+4047,
+4048,
+4049,
+4050,
+4051,
+4052,
+4053,
+4054,
+4055,
+4056,
+4057,
+4058,
+4059,
+4060,
+4061,
+4062,
+4063,
+4064,
+4065,
+4066,
+4067,
+4068,
+4069,
+4070,
+4071,
+4072,
+4073,
+4074,
+4075,
+4076,
+4077,
+4078,
+4079,
+4080,
+4081,
+4082,
+4083,
+4084,
+4085,
+4086,
+4087,
+4088,
+4089,
+4090,
+4091,
+4092,
+4093,
+4094,
+4095,
+4096,
+4097,
+4098,
+4099,
+4100,
+4101,
+4102,
+4103,
+4104,
+4105,
+4106,
+4107,
+4108,
+4109,
+4110,
+4111,
+4112,
+4113,
+4114,
+4115,
+4116,
+4117,
+4118,
+4119,
+4120,
+4121,
+4122,
+4123,
+4124,
+4125,
+4126,
+4127,
+4128,
+4129,
+4130,
+4131,
+4132,
+4133,
+4134,
+4135,
+4136,
+4137,
+4138,
+4139,
+4140,
+4141,
+4142,
+4143,
+4144,
+4145,
+4146,
+4147,
+4148,
+4149,
+4150,
+4151,
+4152,
+4153,
+4154,
+4155,
+4156,
+4157,
+4158,
+4159,
+4160,
+4161,
+4162,
+4163,
+4164,
+4165,
+4166,
+4167,
+4168,
+4169,
+4170,
+4171,
+4172,
+4173,
+4174,
+4175,
+4176,
+4177,
+4178,
+4179,
+4180,
+4181,
+4182,
+4183,
+4184,
+4185,
+4186,
+4187,
+4188,
+4189,
+4190,
+4191,
+4192,
+4193,
+4194,
+4195,
+4196,
+4197,
+4198,
+4199,
+4200,
+4201,
+4202,
+4203,
+4204,
+4205,
+4206,
+4207,
+4208,
+4209,
+4210,
+4211,
+4212,
+4213,
+4214,
+4215,
+4216,
+4217,
+4218,
+4219,
+4220,
+4221,
+4222,
+4223,
+4224,
+4225,
+4226,
+4227,
+4228,
+4229,
+4230,
+4231,
+4232,
+4233,
+4234,
+4235,
+4236,
+4237,
+4238,
+4239,
+4240,
+4241,
+4242,
+4243,
+4244,
+4245,
+4246,
+4247,
+4248,
+4249,
+4250,
+4251,
+4252,
+4253,
+4254,
+4255,
+4256,
+4257,
+4258,
+4259,
+4260,
+4261,
+4262,
+4263,
+4264,
+4265,
+4266,
+4267,
+4268,
+4269,
+4270,
+4271,
+4272,
+4273,
+4274,
+4275,
+4276,
+4277,
+4278,
+4279,
+4280,
+4281,
+4282,
+4283,
+4284,
+4285,
+4286,
+4287,
+4288,
+4289,
+4290,
+4291,
+4292,
+4293,
+4294,
+4295,
+4296,
+4297,
+4298,
+4299,
+4300,
+4301,
+4302,
+4303,
+4304,
+4305,
+4306,
+4307,
+4308,
+4309,
+4310,
+4311,
+4312,
+4313,
+4314,
+4315,
+4316,
+4317,
+4318,
+4319,
+4320,
+4321,
+4322,
+4323,
+4324,
+4325,
+4326,
+4327,
+4328,
+4329,
+4330,
+4331,
+4332,
+4333,
+4334,
+4335,
+4336,
+4337,
+4338,
+4339,
+4340,
+4341,
+4342,
+4343,
+4344,
+4345,
+4346,
+4347,
+4348,
+4349,
+4350,
+4351,
+4352,
+4353,
+4354,
+4355,
+4356,
+4357,
+4358,
+4359,
+4360,
+4361,
+4362,
+4363,
+4364,
+4365,
+4366,
+4367,
+4368,
+4369,
+4370,
+4371,
+4372,
+4373,
+4374,
+4375,
+4376,
+4377,
+4378,
+4379,
+4380,
+4381,
+4382,
+4383,
+4384,
+4385,
+4386,
+4387,
+4388,
+4389,
+4390,
+4391,
+4392,
+4393,
+4394,
+4395,
+4396,
+4397,
+4398,
+4399,
+4400,
+4401,
+4402,
+4403,
+4404,
+4405,
+4406,
+4407,
+4408,
+4409,
+4410,
+4411,
+4412,
+4413,
+4414,
+4415,
+4416,
+4417,
+4418,
+4419,
+4420,
+4421,
+4422,
+4423,
+4424,
+4425,
+4426,
+4427,
+4428,
+4429,
+4430,
+4431,
+4432,
+4433,
+4434,
+4435,
+4436,
+4437,
+4438,
+4439,
+4440,
+4441,
+4442,
+4443,
+4444,
+4445,
+4446,
+4447,
+4448,
+4449,
+4450,
+4451,
+4452,
+4453,
+4454,
+4455,
+4456,
+4457,
+4458,
+4459,
+4460,
+4461,
+4462,
+4463,
+4464,
+4465,
+4466,
+4467,
+4468,
+4469,
+4470,
+4471,
+4472,
+4473,
+4474,
+4475,
+4476,
+4477,
+4478,
+4479,
+4480,
+4481,
+4482,
+4483,
+4484,
+4485,
+4486,
+4487,
+4488,
+4489,
+4490,
+4491,
+4492,
+4493,
+4494,
+4495,
+4496,
+4497,
+4498,
+4499,
+4500,
+4501,
+4502,
+4503,
+4504,
+4505,
+4506,
+4507,
+4508,
+4509,
+4510,
+4511,
+4512,
+4513,
+4514,
+4515,
+4516,
+4517,
+4518,
+4519,
+4520,
+4521,
+4522,
+4523,
+4524,
+4525,
+4526,
+4527,
+4528,
+4529,
+4530,
+4531,
+4532,
+4533,
+4534,
+4535,
+4536,
+4537,
+4538,
+4539,
+4540,
+4541,
+4542,
+4543,
+4544,
+4545,
+4546,
+4547,
+4548,
+4549,
+4550,
+4551,
+4552,
+4553,
+4554,
+4555,
+4556,
+4557,
+4558,
+4559,
+4560,
+4561,
+4562,
+4563,
+4564,
+4565,
+4566,
+4567,
+4568,
+4569,
+4570,
+4571,
+4572,
+4573,
+4574,
+4575,
+4576,
+4577,
+4578,
+4579,
+4580,
+4581,
+4582,
+4583,
+4584,
+4585,
+4586,
+4587,
+4588,
+4589,
+4590,
+4591,
+4592,
+4593,
+4594,
+4595,
+4596,
+4597,
+4598,
+4599,
+4600,
+4601,
+4602,
+4603,
+4604,
+4605,
+4606,
+4607,
+4608,
+4609,
+4610,
+4611,
+4612,
+4613,
+4614,
+4615,
+4616,
+4617,
+4618,
+4619,
+4620,
+4621,
+4622,
+4623,
+4624,
+4625,
+4626,
+4627,
+4628,
+4629,
+4630,
+4631,
+4632,
+4633,
+4634,
+4635,
+4636,
+4637,
+4638,
+4639,
+4640,
+4641,
+4642,
+4643,
+4644,
+4645,
+4646,
+4647,
+4648,
+4649,
+4650,
+4651,
+4652,
+4653,
+4654,
+4655,
+4656,
+4657,
+4658,
+4659,
+4660,
+4661,
+4662,
+4663,
+4664,
+4665,
+4666,
+4667,
+4668,
+4669,
+4670,
+4671,
+4672,
+4673,
+4674,
+4675,
+4676,
+4677,
+4678,
+4679,
+4680,
+4681,
+4682,
+4683,
+4684,
+4685,
+4686,
+4687,
+4688,
+4689,
+4690,
+4691,
+4692,
+4693,
+4694,
+4695,
+4696,
+4697,
+4698,
+4699,
+4700,
+4701,
+4702,
+4703,
+4704,
+4705,
+4706,
+4707,
+4708,
+4709,
+4710,
+4711,
+4712,
+4713,
+4714,
+4715,
+4716,
+4717,
+4718,
+4719,
+4720,
+4721,
+4722,
+4723,
+4724,
+4725,
+4726,
+4727,
+4728,
+4729,
+4730,
+4731,
+4732,
+4733,
+4734,
+4735,
+4736,
+4737,
+4738,
+4739,
+4740,
+4741,
+4742,
+4743,
+4744,
+4745,
+4746,
+4747,
+4748,
+4749,
+4750,
+4751,
+4752,
+4753,
+4754,
+4755,
+4756,
+4757,
+4758,
+4759,
+4760,
+4761,
+4762,
+4763,
+4764,
+4765,
+4766,
+4767,
+4768,
+4769,
+4770,
+4771,
+4772,
+4773,
+4774,
+4775,
+4776,
+4777,
+4778,
+4779,
+4780,
+4781,
+4782,
+4783,
+4784,
+4785,
+4786,
+4787,
+4788,
+4789,
+4790,
+4791,
+4792,
+4793,
+4794,
+4795,
+4796,
+4797,
+4798,
+4799,
+4800,
+4801,
+4802,
+4803,
+4804,
+4805,
+4806,
+4807,
+4808,
+4809,
+4810,
+4811,
+4812,
+4813,
+4814,
+4815,
+4816,
+4817,
+4818,
+4819,
+4820,
+4821,
+4822,
+4823,
+4824,
+4825,
+4826,
+4827,
+4828,
+4829,
+4830,
+4831,
+4832,
+4833,
+4834,
+4835,
+4836,
+4837,
+4838,
+4839,
+4840,
+4841,
+4842,
+4843,
+4844,
+4845,
+4846,
+4847,
+4848,
+4849,
+4850,
+4851,
+4852,
+4853,
+4854,
+4855,
+4856,
+4857,
+4858,
+4859,
+4860,
+4861,
+4862,
+4863,
+4864,
+4865,
+4866,
+4867,
+4868,
+4869,
+4870,
+4871,
+4872,
+4873,
+4874,
+4875,
+4876,
+4877,
+4878,
+4879,
+4880,
+4881,
+4882,
+4883,
+4884,
+4885,
+4886,
+4887,
+4888,
+4889,
+4890,
+4891,
+4892,
+4893,
+4894,
+4895,
+4896,
+4897,
+4898,
+4899,
+4900,
+4901,
+4902,
+4903,
+4904,
+4905,
+4906,
+4907,
+4908,
+4909,
+4910,
+4911,
+4912,
+4913,
+4914,
+4915,
+4916,
+4917,
+4918,
+4919,
+4920,
+4921,
+4922,
+4923,
+4924,
+4925,
+4926,
+4927,
+4928,
+4929,
+4930,
+4931,
+4932,
+4933,
+4934,
+4935,
+4936,
+4937,
+4938,
+4939,
+4940,
+4941,
+4942,
+4943,
+4944,
+4945,
+4946,
+4947,
+4948,
+4949,
+4950,
+4951,
+4952,
+4953,
+4954,
+4955,
+4956,
+4957,
+4958,
+4959,
+4960,
+4961,
+4962,
+4963,
+4964,
+4965,
+4966,
+4967,
+4968,
+4969,
+4970,
+4971,
+4972,
+4973,
+4974,
+4975,
+4976,
+4977,
+4978,
+4979,
+4980,
+4981,
+4982,
+4983,
+4984,
+4985,
+4986,
+4987,
+4988,
+4989,
+4990,
+4991,
+4992,
+4993,
+4994,
+4995,
+4996,
+4997,
+4998,
+4999,
+5000,
+5001,
+5002,
+5003,
+5004,
+5005,
+5006,
+5007,
+5008,
+5009,
+5010,
+5011,
+5012,
+5013,
+5014,
+5015,
+5016,
+5017,
+5018,
+5019,
+5020,
+5021,
+5022,
+5023,
+5024,
+5025,
+5026,
+5027,
+5028,
+5029,
+5030,
+5031,
+5032,
+5033,
+5034,
+5035,
+5036,
+5037,
+5038,
+5039,
+5040,
+5041,
+5042,
+5043,
+5044,
+5045,
+5046,
+5047,
+5048,
+5049,
+5050,
+5051,
+5052,
+5053,
+5054,
+5055,
+5056,
+5057,
+5058,
+5059,
+5060,
+5061,
+5062,
+5063,
+5064,
+5065,
+5066,
+5067,
+5068,
+5069,
+5070,
+5071,
+5072,
+5073,
+5074,
+5075,
+5076,
+5077,
+5078,
+5079,
+5080,
+5081,
+5082,
+5083,
+5084,
+5085,
+5086,
+5087,
+5088,
+5089,
+5090,
+5091,
+5092,
+5093,
+5094,
+5095,
+5096,
+5097,
+5098,
+5099,
+5100,
+5101,
+5102,
+5103,
+5104,
+5105,
+5106,
+5107,
+5108,
+5109,
+5110,
+5111,
+5112,
+5113,
+5114,
+5115,
+5116,
+5117,
+5118,
+5119,
+5120,
+5121,
+5122,
+5123,
+5124,
+5125,
+5126,
+5127,
+5128,
+5129,
+5130,
+5131,
+5132,
+5133,
+5134,
+5135,
+5136,
+5137,
+5138,
+5139,
+5140,
+5141,
+5142,
+5143,
+5144,
+5145,
+5146,
+5147,
+5148,
+5149,
+5150,
+5151,
+5152,
+5153,
+5154,
+5155,
+5156,
+5157,
+5158,
+5159,
+5160,
+5161,
+5162,
+5163,
+5164,
+5165,
+5166,
+5167,
+5168,
+5169,
+5170,
+5171,
+5172,
+5173,
+5174,
+5175,
+5176,
+5177,
+5178,
+5179,
+5180,
+5181,
+5182,
+5183,
+5184,
+5185,
+5186,
+5187,
+5188,
+5189,
+5190,
+5191,
+5192,
+5193,
+5194,
+5195,
+5196,
+5197,
+5198,
+5199,
+5200,
+5201,
+5202,
+5203,
+5204,
+5205,
+5206,
+5207,
+5208,
+5209,
+5210,
+5211,
+5212,
+5213,
+5214,
+5215,
+5216,
+5217,
+5218,
+5219,
+5220,
+5221,
+5222,
+5223,
+5224,
+5225,
+5226,
+5227,
+5228,
+5229,
+5230,
+5231,
+5232,
+5233,
+5234,
+5235,
+5236,
+5237,
+5238,
+5239,
+5240,
+5241,
+5242,
+5243,
+5244,
+5245,
+5246,
+5247,
+5248,
+5249,
+5250,
+5251,
+5252,
+5253,
+5254,
+5255,
+5256,
+5257,
+5258,
+5259,
+5260,
+5261,
+5262,
+5263,
+5264,
+5265,
+5266,
+5267,
+5268,
+5269,
+5270,
+5271,
+5272,
+5273,
+5274,
+5275,
+5276,
+5277,
+5278,
+5279,
+5280,
+5281,
+5282,
+5283,
+5284,
+5285,
+5286,
+5287,
+5288,
+5289,
+5290,
+5291,
+5292,
+5293,
+5294,
+5295,
+5296,
+5297,
+5298,
+5299,
+5300,
+5301,
+5302,
+5303,
+5304,
+5305,
+5306,
+5307,
+5308,
+5309,
+5310,
+5311,
+5312,
+5313,
+5314,
+5315,
+5316,
+5317,
+5318,
+5319,
+5320,
+5321,
+5322,
+5323,
+5324,
+5325,
+5326,
+5327,
+5328,
+5329,
+5330,
+5331,
+5332,
+5333,
+5334,
+5335,
+5336,
+5337,
+5338,
+5339,
+5340,
+5341,
+5342,
+5343,
+5344,
+5345,
+5346,
+5347,
+5348,
+5349,
+5350,
+5351,
+5352,
+5353,
+5354,
+5355,
+5356,
+5357,
+5358,
+5359,
+5360,
+5361,
+5362,
+5363,
+5364,
+5365,
+5366,
+5367,
+5368,
+5369,
+5370,
+5371,
+5372,
+5373,
+5374,
+5375,
+5376,
+5377,
+5378,
+5379,
+5380,
+5381,
+5382,
+5383,
+5384,
+5385,
+5386,
+5387,
+5388,
+5389,
+5390,
+5391,
+5392,
+5393,
+5394,
+5395,
+5396,
+5397,
+5398,
+5399,
+5400,
+5401,
+5402,
+5403,
+5404,
+5405,
+5406,
+5407,
+5408,
+5409,
+5410,
+5411,
+5412,
+5413,
+5414,
+5415,
+5416,
+5417,
+5418,
+5419,
+5420,
+5421,
+5422,
+5423,
+5424,
+5425,
+5426,
+5427,
+5428,
+5429,
+5430,
+5431,
+5432,
+5433,
+5434,
+5435,
+5436,
+5437,
+5438,
+5439,
+5440,
+5441,
+5442,
+5443,
+5444,
+5445,
+5446,
+5447,
+5448,
+5449,
+5450,
+5451,
+5452,
+5453,
+5454,
+5455,
+5456,
+5457,
+5458,
+5459,
+5460,
+5461,
+5462,
+5463,
+5464,
+5465,
+5466,
+5467,
+5468,
+5469,
+5470,
+5471,
+5472,
+5473,
+5474,
+5475,
+5476,
+5477,
+5478,
+5479,
+5480,
+5481,
+5482,
+5483,
+5484,
+5485,
+5486,
+5487,
+5488,
+5489,
+5490,
+5491,
+5492,
+5493,
+5494,
+5495,
+5496,
+5497,
+5498,
+5499,
+5500,
+5501,
+5502,
+5503,
+5504,
+5505,
+5506,
+5507,
+5508,
+5509,
+5510,
+5511,
+5512,
+5513,
+5514,
+5515,
+5516,
+5517,
+5518,
+5519,
+5520,
+5521,
+5522,
+5523,
+5524,
+5525,
+5526,
+5527,
+5528,
+5529,
+5530,
+5531,
+5532,
+5533,
+5534,
+5535,
+5536,
+5537,
+5538,
+5539,
+5540,
+5541,
+5542,
+5543,
+5544,
+5545,
+5546,
+5547,
+5548,
+5549,
+5550,
+5551,
+5552,
+5553,
+5554,
+5555,
+5556,
+5557,
+5558,
+5559,
+5560,
+5561,
+5562,
+5563,
+5564,
+5565,
+5566,
+5567,
+5568,
+5569,
+5570,
+5571,
+5572,
+5573,
+5574,
+5575,
+5576,
+5577,
+5578,
+5579,
+5580,
+5581,
+5582,
+5583,
+5584,
+5585,
+5586,
+5587,
+5588,
+5589,
+5590,
+5591,
+5592,
+5593,
+5594,
+5595,
+5596,
+5597,
+5598,
+5599,
+5600,
+5601,
+5602,
+5603,
+5604,
+5605,
+5606,
+5607,
+5608,
+5609,
+5610,
+5611,
+5612,
+5613,
+5614,
+5615,
+5616,
+5617,
+5618,
+5619,
+5620,
+5621,
+5622,
+5623,
+5624,
+5625,
+5626,
+5627,
+5628,
+5629,
+5630,
+5631,
+5632,
+5633,
+5634,
+5635,
+5636,
+5637,
+5638,
+5639,
+5640,
+5641,
+5642,
+5643,
+5644,
+5645,
+5646,
+5647,
+5648,
+5649,
+5650,
+5651,
+5652,
+5653,
+5654,
+5655,
+5656,
+5657,
+5658,
+5659,
+5660,
+5661,
+5662,
+5663,
+5664,
+5665,
+5666,
+5667,
+5668,
+5669,
+5670,
+5671,
+5672,
+5673,
+5674,
+5675,
+5676,
+5677,
+5678,
+5679,
+5680,
+5681,
+5682,
+5683,
+5684,
+5685,
+5686,
+5687,
+5688,
+5689,
+5690,
+5691,
+5692,
+5693,
+5694,
+5695,
+5696,
+5697,
+5698,
+5699,
+5700,
+5701,
+5702,
+5703,
+5704,
+5705,
+5706,
+5707,
+5708,
+5709,
+5710,
+5711,
+5712,
+5713,
+5714,
+5715,
+5716,
+5717,
+5718,
+5719,
+5720,
+5721,
+5722,
+5723,
+5724,
+5725,
+5726,
+5727,
+5728,
+5729,
+5730,
+5731,
+5732,
+5733,
+5734,
+5735,
+5736,
+5737,
+5738,
+5739,
+5740,
+5741,
+5742,
+5743,
+5744,
+5745,
+5746,
+5747,
+5748,
+5749,
+5750,
+5751,
+5752,
+5753,
+5754,
+5755,
+5756,
+5757,
+5758,
+5759,
+5760,
+5761,
+5762,
+5763,
+5764,
+5765,
+5766,
+5767,
+5768,
+5769,
+5770,
+5771,
+5772,
+5773,
+5774,
+5775,
+5776,
+5777,
+5778,
+5779,
+5780,
+5781,
+5782,
+5783,
+5784,
+5785,
+5786,
+5787,
+5788,
+5789,
+5790,
+5791,
+5792,
+5793,
+5794,
+5795,
+5796,
+5797,
+5798,
+5799,
+5800,
+5801,
+5802,
+5803,
+5804,
+5805,
+5806,
+5807,
+5808,
+5809,
+5810,
+5811,
+5812,
+5813,
+5814,
+5815,
+5816,
+5817,
+5818,
+5819,
+5820,
+5821,
+5822,
+5823,
+5824,
+5825,
+5826,
+5827,
+5828,
+5829,
+5830,
+5831,
+5832,
+5833,
+5834,
+5835,
+5836,
+5837,
+5838,
+5839,
+5840,
+5841,
+5842,
+5843,
+5844,
+5845,
+5846,
+5847,
+5848,
+5849,
+5850,
+5851,
+5852,
+5853,
+5854,
+5855,
+5856,
+5857,
+5858,
+5859,
+5860,
+5861,
+5862,
+5863,
+5864,
+5865,
+5866,
+5867,
+5868,
+5869,
+5870,
+5871,
+5872,
+5873,
+5874,
+5875,
+5876,
+5877,
+5878,
+5879,
+5880,
+5881,
+5882,
+5883,
+5884,
+5885,
+5886,
+5887,
+5888,
+5889,
+5890,
+5891,
+5892,
+5893,
+5894,
+5895,
+5896,
+5897,
+5898,
+5899,
+5900,
+5901,
+5902,
+5903,
+5904,
+5905,
+5906,
+5907,
+5908,
+5909,
+5910,
+5911,
+5912,
+5913,
+5914,
+5915,
+5916,
+5917,
+5918,
+5919,
+5920,
+5921,
+5922,
+5923,
+5924,
+5925,
+5926,
+5927,
+5928,
+5929,
+5930,
+5931,
+5932,
+5933,
+5934,
+5935,
+5936,
+5937,
+5938,
+5939,
+5940,
+5941,
+5942,
+5943,
+5944,
+5945,
+5946,
+5947,
+5948,
+5949,
+5950,
+5951,
+5952,
+5953,
+5954,
+5955,
+5956,
+5957,
+5958,
+5959,
+5960,
+5961,
+5962,
+5963,
+5964,
+5965,
+5966,
+5967,
+5968,
+5969,
+5970,
+5971,
+5972,
+5973,
+5974,
+5975,
+5976,
+5977,
+5978,
+5979,
+5980,
+5981,
+5982,
+5983,
+5984,
+5985,
+5986,
+5987,
+5988,
+5989,
+5990,
+5991,
+5992,
+5993,
+5994,
+5995,
+5996,
+5997,
+5998,
+5999,
+6000,
+6001,
+6002,
+6003,
+6004,
+6005,
+6006,
+6007,
+6008,
+6009,
+6010,
+6011,
+6012,
+6013,
+6014,
+6015,
+6016,
+6017,
+6018,
+6019,
+6020,
+6021,
+6022,
+6023,
+6024,
+6025,
+6026,
+6027,
+6028,
+6029,
+6030,
+6031,
+6032,
+6033,
+6034,
+6035,
+6036,
+6037,
+6038,
+6039,
+6040,
+6041,
+6042,
+6043,
+6044,
+6045,
+6046,
+6047,
+6048,
+6049,
+6050,
+6051,
+6052,
+6053,
+6054,
+6055,
+6056,
+6057,
+6058,
+6059,
+6060,
+6061,
+6062,
+6063,
+6064,
+6065,
+6066,
+6067,
+6068,
+6069,
+6070,
+6071,
+6072,
+6073,
+6074,
+6075,
+6076,
+6077,
+6078,
+6079,
+6080,
+6081,
+6082,
+6083,
+6084,
+6085,
+6086,
+6087,
+6088,
+6089,
+6090,
+6091,
+6092,
+6093,
+6094,
+6095,
+6096,
+6097,
+6098,
+6099,
+6100,
+6101,
+6102,
+6103,
+6104,
+6105,
+6106,
+6107,
+6108,
+6109,
+6110,
+6111,
+6112,
+6113,
+6114,
+6115,
+6116,
+6117,
+6118,
+6119,
+6120,
+6121,
+6122,
+6123,
+6124,
+6125,
+6126,
+6127,
+6128,
+6129,
+6130,
+6131,
+6132,
+6133,
+6134,
+6135,
+6136,
+6137,
+6138,
+6139,
+6140,
+6141,
+6142,
+6143,
+6144,
+6145,
+6146,
+6147,
+6148,
+6149,
+6150,
+6151,
+6152,
+6153,
+6154,
+6155,
+6156,
+6157,
+6158,
+6159,
+6160,
+6161,
+6162,
+6163,
+6164,
+6165,
+6166,
+6167,
+6168,
+6169,
+6170,
+6171,
+6172,
+6173,
+6174,
+6175,
+6176,
+6177,
+6178,
+6179,
+6180,
+6181,
+6182,
+6183,
+6184,
+6185,
+6186,
+6187,
+6188,
+6189,
+6190,
+6191,
+6192,
+6193,
+6194,
+6195,
+6196,
+6197,
+6198,
+6199,
+6200,
+6201,
+6202,
+6203,
+6204,
+6205,
+6206,
+6207,
+6208,
+6209,
+6210,
+6211,
+6212,
+6213,
+6214,
+6215,
+6216,
+6217,
+6218,
+6219,
+6220,
+6221,
+6222,
+6223,
+6224,
+6225,
+6226,
+6227,
+6228,
+6229,
+6230,
+6231,
+6232,
+6233,
+6234,
+6235,
+6236,
+6237,
+6238,
+6239,
+6240,
+6241,
+6242,
+6243,
+6244,
+6245,
+6246,
+6247,
+6248,
+6249,
+6250,
+6251,
+6252,
+6253,
+6254,
+6255,
+6256,
+6257,
+6258,
+6259,
+6260,
+6261,
+6262,
+6263,
+6264,
+6265,
+6266,
+6267,
+6268,
+6269,
+6270,
+6271,
+6272,
+6273,
+6274,
+6275,
+6276,
+6277,
+6278,
+6279,
+6280,
+6281,
+6282,
+6283,
+6284,
+6285,
+6286,
+6287,
+6288,
+6289,
+6290,
+6291,
+6292,
+6293,
+6294,
+6295,
+6296,
+6297,
+6298,
+6299,
+6300,
+6301,
+6302,
+6303,
+6304,
+6305,
+6306,
+6307,
+6308,
+6309,
+6310,
+6311,
+6312,
+6313,
+6314,
+6315,
+6316,
+6317,
+6318,
+6319,
+6320,
+6321,
+6322,
+6323,
+6324,
+6325,
+6326,
+6327,
+6328,
+6329,
+6330,
+6331,
+6332,
+6333,
+6334,
+6335,
+6336,
+6337,
+6338,
+6339,
+6340,
+6341,
+6342,
+6343,
+6344,
+6345,
+6346,
+6347,
+6348,
+6349,
+6350,
+6351,
+6352,
+6353,
+6354,
+6355,
+6356,
+6357,
+6358,
+6359,
+6360,
+6361,
+6362,
+6363,
+6364,
+6365,
+6366,
+6367,
+6368,
+6369,
+6370,
+6371,
+6372,
+6373,
+6374,
+6375,
+6376,
+6377,
+6378,
+6379,
+6380,
+6381,
+6382,
+6383,
+6384,
+6385,
+6386,
+6387,
+6388,
+6389,
+6390,
+6391,
+6392,
+6393,
+6394,
+6395,
+6396,
+6397,
+6398,
+6399,
+6400,
+6401,
+6402,
+6403,
+6404,
+6405,
+6406,
+6407,
+6408,
+6409,
+6410,
+6411,
+6412,
+6413,
+6414,
+6415,
+6416,
+6417,
+6418,
+6419,
+6420,
+6421,
+6422,
+6423,
+6424,
+6425,
+6426,
+6427,
+6428,
+6429,
+6430,
+6431,
+6432,
+6433,
+6434,
+6435,
+6436,
+6437,
+6438,
+6439,
+6440,
+6441,
+6442,
+6443,
+6444,
+6445,
+6446,
+6447,
+6448,
+6449,
+6450,
+6451,
+6452,
+6453,
+6454,
+6455,
+6456,
+6457,
+6458,
+6459,
+6460,
+6461,
+6462,
+6463,
+6464,
+6465,
+6466,
+6467,
+6468,
+6469,
+6470,
+6471,
+6472,
+6473,
+6474,
+6475,
+6476,
+6477,
+6478,
+6479,
+6480,
+6481,
+6482,
+6483,
+6484,
+6485,
+6486,
+6487,
+6488,
+6489,
+6490,
+6491,
+6492,
+6493,
+6494,
+6495,
+6496,
+6497,
+6498,
+6499,
+6500,
+6501,
+6502,
+6503,
+6504,
+6505,
+6506,
+6507,
+6508,
+6509,
+6510,
+6511,
+6512,
+6513,
+6514,
+6515,
+6516,
+6517,
+6518,
+6519,
+6520,
+6521,
+6522,
+6523,
+6524,
+6525,
+6526,
+6527,
+6528,
+6529,
+6530,
+6531,
+6532,
+6533,
+6534,
+6535,
+6536,
+6537,
+6538,
+6539,
+6540,
+6541,
+6542,
+6543,
+6544,
+6545,
+6546,
+6547,
+6548,
+6549,
+6550,
+6551,
+6552,
+6553,
+6554,
+6555,
+6556,
+6557,
+6558,
+6559,
+6560,
+6561,
+6562,
+6563,
+6564,
+6565,
+6566,
+6567,
+6568,
+6569,
+6570,
+6571,
+6572,
+6573,
+6574,
+6575,
+6576,
+6577,
+6578,
+6579,
+6580,
+6581,
+6582,
+6583,
+6584,
+6585,
+6586,
+6587,
+6588,
+6589,
+6590,
+6591,
+6592,
+6593,
+6594,
+6595,
+6596,
+6597,
+6598,
+6599,
+6600,
+6601,
+6602,
+6603,
+6604,
+6605,
+6606,
+6607,
+6608,
+6609,
+6610,
+6611,
+6612,
+6613,
+6614,
+6615,
+6616,
+6617,
+6618,
+6619,
+6620,
+6621,
+6622,
+6623,
+6624,
+6625,
+6626,
+6627,
+6628,
+6629,
+6630,
+6631,
+6632,
+6633,
+6634,
+6635,
+6636,
+6637,
+6638,
+6639,
+6640,
+6641,
+6642,
+6643,
+6644,
+6645,
+6646,
+6647,
+6648,
+6649,
+6650,
+6651,
+6652,
+6653,
+6654,
+6655,
+6656,
+6657,
+6658,
+6659,
+6660,
+6661,
+6662,
+6663,
+6664,
+6665,
+6666,
+6667,
+6668,
+6669,
+6670,
+6671,
+6672,
+6673,
+6674,
+6675,
+6676,
+6677,
+6678,
+6679,
+6680,
+6681,
+6682,
+6683,
+6684,
+6685,
+6686,
+6687,
+6688,
+6689,
+6690,
+6691,
+6692,
+6693,
+6694,
+6695,
+6696,
+6697,
+6698,
+6699,
+6700,
+6701,
+6702,
+6703,
+6704,
+6705,
+6706,
+6707,
+6708,
+6709,
+6710,
+6711,
+6712,
+6713,
+6714,
+6715,
+6716,
+6717,
+6718,
+6719,
+6720,
+6721,
+6722,
+6723,
+6724,
+6725,
+6726,
+6727,
+6728,
+6729,
+6730,
+6731,
+6732,
+6733,
+6734,
+6735,
+6736,
+6737,
+6738,
+6739,
+6740,
+6741,
+6742,
+6743,
+6744,
+6745,
+6746,
+6747,
+6748,
+6749,
+6750,
+6751,
+6752,
+6753,
+6754,
+6755,
+6756,
+6757,
+6758,
+6759,
+6760,
+6761,
+6762,
+6763,
+6764,
+6765,
+6766,
+6767,
+6768,
+6769,
+6770,
+6771,
+6772,
+6773,
+6774,
+6775,
+6776,
+6777,
+6778,
+6779,
+6780,
+6781,
+6782,
+6783,
+6784,
+6785,
+6786,
+6787,
+6788,
+6789,
+6790,
+6791,
+6792,
+6793,
+6794,
+6795,
+6796,
+6797,
+6798,
+6799,
+6800,
+6801,
+6802,
+6803,
+6804,
+6805,
+6806,
+6807,
+6808,
+6809,
+6810,
+6811,
+6812,
+6813,
+6814,
+6815,
+6816,
+6817,
+6818,
+6819,
+6820,
+6821,
+6822,
+6823,
+6824,
+6825,
+6826,
+6827,
+6828,
+6829,
+6830,
+6831,
+6832,
+6833,
+6834,
+6835,
+6836,
+6837,
+6838,
+6839,
+6840,
+6841,
+6842,
+6843,
+6844,
+6845,
+6846,
+6847,
+6848,
+6849,
+6850,
+6851,
+6852,
+6853,
+6854,
+6855,
+6856,
+6857,
+6858,
+6859,
+6860,
+6861,
+6862,
+6863,
+6864,
+6865,
+6866,
+6867,
+6868,
+6869,
+6870,
+6871,
+6872,
+6873,
+6874,
+6875,
+6876,
+6877,
+6878,
+6879,
+6880,
+6881,
+6882,
+6883,
+6884,
+6885,
+6886,
+6887,
+6888,
+6889,
+6890,
+6891,
+6892,
+6893,
+6894,
+6895,
+6896,
+6897,
+6898,
+6899,
+6900,
+6901,
+6902,
+6903,
+6904,
+6905,
+6906,
+6907,
+6908,
+6909,
+6910,
+6911,
+6912,
+6913,
+6914,
+6915,
+6916,
+6917,
+6918,
+6919,
+6920,
+6921,
+6922,
+6923,
+6924,
+6925,
+6926,
+6927,
+6928,
+6929,
+6930,
+6931,
+6932,
+6933,
+6934,
+6935,
+6936,
+6937,
+6938,
+6939,
+6940,
+6941,
+6942,
+6943,
+6944,
+6945,
+6946,
+6947,
+6948,
+6949,
+6950,
+6951,
+6952,
+6953,
+6954,
+6955,
+6956,
+6957,
+6958,
+6959,
+6960,
+6961,
+6962,
+6963,
+6964,
+6965,
+6966,
+6967,
+6968,
+6969,
+6970,
+6971,
+6972,
+6973,
+6974,
+6975,
+6976,
+6977,
+6978,
+6979,
+6980,
+6981,
+6982,
+6983,
+6984,
+6985,
+6986,
+6987,
+6988,
+6989,
+6990,
+6991,
+6992,
+6993,
+6994,
+6995,
+6996,
+6997,
+6998,
+6999,
+7000,
+7001,
+7002,
+7003,
+7004,
+7005,
+7006,
+7007,
+7008,
+7009,
+7010,
+7011,
+7012,
+7013,
+7014,
+7015,
+7016,
+7017,
+7018,
+7019,
+7020,
+7021,
+7022,
+7023,
+7024,
+7025,
+7026,
+7027,
+7028,
+7029,
+7030,
+7031,
+7032,
+7033,
+7034,
+7035,
+7036,
+7037,
+7038,
+7039,
+7040,
+7041,
+7042,
+7043,
+7044,
+7045,
+7046,
+7047,
+7048,
+7049,
+7050,
+7051,
+7052,
+7053,
+7054,
+7055,
+7056,
+7057,
+7058,
+7059,
+7060,
+7061,
+7062,
+7063,
+7064,
+7065,
+7066,
+7067,
+7068,
+7069,
+7070,
+7071,
+7072,
+7073,
+7074,
+7075,
+7076,
+7077,
+7078,
+7079,
+7080,
+7081,
+7082,
+7083,
+7084,
+7085,
+7086,
+7087,
+7088,
+7089,
+7090,
+7091,
+7092,
+7093,
+7094,
+7095,
+7096,
+7097,
+7098,
+7099,
+7100,
+7101,
+7102,
+7103,
+7104,
+7105,
+7106,
+7107,
+7108,
+7109,
+7110,
+7111,
+7112,
+7113,
+7114,
+7115,
+7116,
+7117,
+7118,
+7119,
+7120,
+7121,
+7122,
+7123,
+7124,
+7125,
+7126,
+7127,
+7128,
+7129,
+7130,
+7131,
+7132,
+7133,
+7134,
+7135,
+7136,
+7137,
+7138,
+7139,
+7140,
+7141,
+7142,
+7143,
+7144,
+7145,
+7146,
+7147,
+7148,
+7149,
+7150,
+7151,
+7152,
+7153,
+7154,
+7155,
+7156,
+7157,
+7158,
+7159,
+7160,
+7161,
+7162,
+7163,
+7164,
+7165,
+7166,
+7167,
+7168,
+7169,
+7170,
+7171,
+7172,
+7173,
+7174,
+7175,
+7176,
+7177,
+7178,
+7179,
+7180,
+7181,
+7182,
+7183,
+7184,
+7185,
+7186,
+7187,
+7188,
+7189,
+7190,
+7191,
+7192,
+7193,
+7194,
+7195,
+7196,
+7197,
+7198,
+7199,
+7200,
+7201,
+7202,
+7203,
+7204,
+7205,
+7206,
+7207,
+7208,
+7209,
+7210,
+7211,
+7212,
+7213,
+7214,
+7215,
+7216,
+7217,
+7218,
+7219,
+7220,
+7221,
+7222,
+7223,
+7224,
+7225,
+7226,
+7227,
+7228,
+7229,
+7230,
+7231,
+7232,
+7233,
+7234,
+7235,
+7236,
+7237,
+7238,
+7239,
+7240,
+7241,
+7242,
+7243,
+7244,
+7245,
+7246,
+7247,
+7248,
+7249,
+7250,
+7251,
+7252,
+7253,
+7254,
+7255,
+7256,
+7257,
+7258,
+7259,
+7260,
+7261,
+7262,
+7263,
+7264,
+7265,
+7266,
+7267,
+7268,
+7269,
+7270,
+7271,
+7272,
+7273,
+7274,
+7275,
+7276,
+7277,
+7278,
+7279,
+7280,
+7281,
+7282,
+7283,
+7284,
+7285,
+7286,
+7287,
+7288,
+7289,
+7290,
+7291,
+7292,
+7293,
+7294,
+7295,
+7296,
+7297,
+7298,
+7299,
+7300,
+7301,
+7302,
+7303,
+7304,
+7305,
+7306,
+7307,
+7308,
+7309,
+7310,
+7311,
+7312,
+7313,
+7314,
+7315,
+7316,
+7317,
+7318,
+7319,
+7320,
+7321,
+7322,
+7323,
+7324,
+7325,
+7326,
+7327,
+7328,
+7329,
+7330,
+7331,
+7332,
+7333,
+7334,
+7335,
+7336,
+7337,
+7338,
+7339,
+7340,
+7341,
+7342,
+7343,
+7344,
+7345,
+7346,
+7347,
+7348,
+7349,
+7350,
+7351,
+7352,
+7353,
+7354,
+7355,
+7356,
+7357,
+7358,
+7359,
+7360,
+7361,
+7362,
+7363,
+7364,
+7365,
+7366,
+7367,
+7368,
+7369,
+7370,
+7371,
+7372,
+7373,
+7374,
+7375,
+7376,
+7377,
+7378,
+7379,
+7380,
+7381,
+7382,
+7383,
+7384,
+7385,
+7386,
+7387,
+7388,
+7389,
+7390,
+7391,
+7392,
+7393,
+7394,
+7395,
+7396,
+7397,
+7398,
+7399,
+7400,
+7401,
+7402,
+7403,
+7404,
+7405,
+7406,
+7407,
+7408,
+7409,
+7410,
+7411,
+7412,
+7413,
+7414,
+7415,
+7416,
+7417,
+7418,
+7419,
+7420,
+7421,
+7422,
+7423,
+7424,
+7425,
+7426,
+7427,
+7428,
+7429,
+7430,
+7431,
+7432,
+7433,
+7434,
+7435,
+7436,
+7437,
+7438,
+7439,
+7440,
+7441,
+7442,
+7443,
+7444,
+7445,
+7446,
+7447,
+7448,
+7449,
+7450,
+7451,
+7452,
+7453,
+7454,
+7455,
+7456,
+7457,
+7458,
+7459,
+7460,
+7461,
+7462,
+7463,
+7464,
+7465,
+7466,
+7467,
+7468,
+7469,
+7470,
+7471,
+7472,
+7473,
+7474,
+7475,
+7476,
+7477,
+7478,
+7479,
+7480,
+7481,
+7482,
+7483,
+7484,
+7485,
+7486,
+7487,
+7488,
+7489,
+7490,
+7491,
+7492,
+7493,
+7494,
+7495,
+7496,
+7497,
+7498,
+7499,
+7500,
+7501,
+7502,
+7503,
+7504,
+7505,
+7506,
+7507,
+7508,
+7509,
+7510,
+7511,
+7512,
+7513,
+7514,
+7515,
+7516,
+7517,
+7518,
+7519,
+7520,
+7521,
+7522,
+7523,
+7524,
+7525,
+7526,
+7527,
+7528,
+7529,
+7530,
+7531,
+7532,
+7533,
+7534,
+7535,
+7536,
+7537,
+7538,
+7539,
+7540,
+7541,
+7542,
+7543,
+7544,
+7545,
+7546,
+7547,
+7548,
+7549,
+7550,
+7551,
+7552,
+7553,
+7554,
+7555,
+7556,
+7557,
+7558,
+7559,
+7560,
+7561,
+7562,
+7563,
+7564,
+7565,
+7566,
+7567,
+7568,
+7569,
+7570,
+7571,
+7572,
+7573,
+7574,
+7575,
+7576,
+7577,
+7578,
+7579,
+7580,
+7581,
+7582,
+7583,
+7584,
+7585,
+7586,
+7587,
+7588,
+7589,
+7590,
+7591,
+7592,
+7593,
+7594,
+7595,
+7596,
+7597,
+7598,
+7599,
+7600,
+7601,
+7602,
+7603,
+7604,
+7605,
+7606,
+7607,
+7608,
+7609,
+7610,
+7611,
+7612,
+7613,
+7614,
+7615,
+7616,
+7617,
+7618,
+7619,
+7620,
+7621,
+7622,
+7623,
+7624,
+7625,
+7626,
+7627,
+7628,
+7629,
+7630,
+7631,
+7632,
+7633,
+7634,
+7635,
+7636,
+7637,
+7638,
+7639,
+7640,
+7641,
+7642,
+7643,
+7644,
+7645,
+7646,
+7647,
+7648,
+7649,
+7650,
+7651,
+7652,
+7653,
+7654,
+7655,
+7656,
+7657,
+7658,
+7659,
+7660,
+7661,
+7662,
+7663,
+7664,
+7665,
+7666,
+7667,
+7668,
+7669,
+7670,
+7671,
+7672,
+7673,
+7674,
+7675,
+7676,
+7677,
+7678,
+7679,
+7680,
+7681,
+7682,
+7683,
+7684,
+7685,
+7686,
+7687,
+7688,
+7689,
+7690,
+7691,
+7692,
+7693,
+7694,
+7695,
+7696,
+7697,
+7698,
+7699,
+7700,
+7701,
+7702,
+7703,
+7704,
+7705,
+7706,
+7707,
+7708,
+7709,
+7710,
+7711,
+7712,
+7713,
+7714,
+7715,
+7716,
+7717,
+7718,
+7719,
+7720,
+7721,
+7722,
+7723,
+7724,
+7725,
+7726,
+7727,
+7728,
+7729,
+7730,
+7731,
+7732,
+7733,
+7734,
+7735,
+7736,
+7737,
+7738,
+7739,
+7740,
+7741,
+7742,
+7743,
+7744,
+7745,
+7746,
+7747,
+7748,
+7749,
+7750,
+7751,
+7752,
+7753,
+7754,
+7755,
+7756,
+7757,
+7758,
+7759,
+7760,
+7761,
+7762,
+7763,
+7764,
+7765,
+7766,
+7767,
+7768,
+7769,
+7770,
+7771,
+7772,
+7773,
+7774,
+7775,
+7776,
+7777,
+7778,
+7779,
+7780,
+7781,
+7782,
+7783,
+7784,
+7785,
+7786,
+7787,
+7788,
+7789,
+7790,
+7791,
+7792,
+7793,
+7794,
+7795,
+7796,
+7797,
+7798,
+7799,
+7800,
+7801,
+7802,
+7803,
+7804,
+7805,
+7806,
+7807,
+7808,
+7809,
+7810,
+7811,
+7812,
+7813,
+7814,
+7815,
+7816,
+7817,
+7818,
+7819,
+7820,
+7821,
+7822,
+7823,
+7824,
+7825,
+7826,
+7827,
+7828,
+7829,
+7830,
+7831,
+7832,
+7833,
+7834,
+7835,
+7836,
+7837,
+7838,
+7839,
+7840,
+7841,
+7842,
+7843,
+7844,
+7845,
+7846,
+7847,
+7848,
+7849,
+7850,
+7851,
+7852,
+7853,
+7854,
+7855,
+7856,
+7857,
+7858,
+7859,
+7860,
+7861,
+7862,
+7863,
+7864,
+7865,
+7866,
+7867,
+7868,
+7869,
+7870,
+7871,
+7872,
+7873,
+7874,
+7875,
+7876,
+7877,
+7878,
+7879,
+7880,
+7881,
+7882,
+7883,
+7884,
+7885,
+7886,
+7887,
+7888,
+7889,
+7890,
+7891,
+7892,
+7893,
+7894,
+7895,
+7896,
+7897,
+7898,
+7899,
+7900,
+7901,
+7902,
+7903,
+7904,
+7905,
+7906,
+7907,
+7908,
+7909,
+7910,
+7911,
+7912,
+7913,
+7914,
+7915,
+7916,
+7917,
+7918,
+7919,
+7920,
+7921,
+7922,
+7923,
+7924,
+7925,
+7926,
+7927,
+7928,
+7929,
+7930,
+7931,
+7932,
+7933,
+7934,
+7935,
+7936,
+7937,
+7938,
+7939,
+7940,
+7941,
+7942,
+7943,
+7944,
+7945,
+7946,
+7947,
+7948,
+7949,
+7950,
+7951,
+7952,
+7953,
+7954,
+7955,
+7956,
+7957,
+7958,
+7959,
+7960,
+7961,
+7962,
+7963,
+7964,
+7965,
+7966,
+7967,
+7968,
+7969,
+7970,
+7971,
+7972,
+7973,
+7974,
+7975,
+7976,
+7977,
+7978,
+7979,
+7980,
+7981,
+7982,
+7983,
+7984,
+7985,
+7986,
+7987,
+7988,
+7989,
+7990,
+7991,
+7992,
+7993,
+7994,
+7995,
+7996,
+7997,
+7998,
+7999,
+8000,
+8001,
+8002,
+8003,
+8004,
+8005,
+8006,
+8007,
+8008,
+8009,
+8010,
+8011,
+8012,
+8013,
+8014,
+8015,
+8016,
+8017,
+8018,
+8019,
+8020,
+8021,
+8022,
+8023,
+8024,
+8025,
+8026,
+8027,
+8028,
+8029,
+8030,
+8031,
+8032,
+8033,
+8034,
+8035,
+8036,
+8037,
+8038,
+8039,
+8040,
+8041,
+8042,
+8043,
+8044,
+8045,
+8046,
+8047,
+8048,
+8049,
+8050,
+8051,
+8052,
+8053,
+8054,
+8055,
+8056,
+8057,
+8058,
+8059,
+8060,
+8061,
+8062,
+8063,
+8064,
+8065,
+8066,
+8067,
+8068,
+8069,
+8070,
+8071,
+8072,
+8073,
+8074,
+8075,
+8076,
+8077,
+8078,
+8079,
+8080,
+8081,
+8082,
+8083,
+8084,
+8085,
+8086,
+8087,
+8088,
+8089,
+8090,
+8091,
+8092,
+8093,
+8094,
+8095,
+8096,
+8097,
+8098,
+8099,
+8100,
+8101,
+8102,
+8103,
+8104,
+8105,
+8106,
+8107,
+8108,
+8109,
+8110,
+8111,
+8112,
+8113,
+8114,
+8115,
+8116,
+8117,
+8118,
+8119,
+8120,
+8121,
+8122,
+8123,
+8124,
+8125,
+8126,
+8127,
+8128,
+8129,
+8130,
+8131,
+8132,
+8133,
+8134,
+8135,
+8136,
+8137,
+8138,
+8139,
+8140,
+8141,
+8142,
+8143,
+8144,
+8145,
+8146,
+8147,
+8148,
+8149,
+8150,
+8151,
+8152,
+8153,
+8154,
+8155,
+8156,
+8157,
+8158,
+8159,
+8160,
+8161,
+8162,
+8163,
+8164,
+8165,
+8166,
+8167,
+8168,
+8169,
+8170,
+8171,
+8172,
+8173,
+8174,
+8175,
+8176,
+8177,
+8178,
+8179,
+8180,
+8181,
+8182,
+8183,
+8184,
+8185,
+8186,
+8187,
+8188,
+8189,
+8190,
+8191,
+8192,
+8193,
+8194,
+8195,
+8196,
+8197,
+8198,
+8199,
+8200,
+8201,
+8202,
+8203,
+8204,
+8205,
+8206,
+8207,
+8208,
+8209,
+8210,
+8211,
+8212,
+8213,
+8214,
+8215,
+8216,
+8217,
+8218,
+8219,
+8220,
+8221,
+8222,
+8223,
+8224,
+8225,
+8226,
+8227,
+8228,
+8229,
+8230,
+8231,
+8232,
+8233,
+8234,
+8235,
+8236,
+8237,
+8238,
+8239,
+8240,
+8241,
+8242,
+8243,
+8244,
+8245,
+8246,
+8247,
+8248,
+8249,
+8250,
+8251,
+8252,
+8253,
+8254,
+8255,
+8256,
+8257,
+8258,
+8259,
+8260,
+8261,
+8262,
+8263,
+8264,
+8265,
+8266,
+8267,
+8268,
+8269,
+8270,
+8271,
+8272,
+8273,
+8274,
+8275,
+8276,
+8277,
+8278,
+8279,
+8280,
+8281,
+8282,
+8283,
+8284,
+8285,
+8286,
+8287,
+8288,
+8289,
+8290,
+8291,
+8292,
+8293,
+8294,
+8295,
+8296,
+8297,
+8298,
+8299,
+8300,
+8301,
+8302,
+8303,
+8304,
+8305,
+8306,
+8307,
+8308,
+8309,
+8310,
+8311,
+8312,
+8313,
+8314,
+8315,
+8316,
+8317,
+8318,
+8319,
+8320,
+8321,
+8322,
+8323,
+8324,
+8325,
+8326,
+8327,
+8328,
+8329,
+8330,
+8331,
+8332,
+8333,
+8334,
+8335,
+8336,
+8337,
+8338,
+8339,
+8340,
+8341,
+8342,
+8343,
+8344,
+8345,
+8346,
+8347,
+8348,
+8349,
+8350,
+8351,
+8352,
+8353,
+8354,
+8355,
+8356,
+8357,
+8358,
+8359,
+8360,
+8361,
+8362,
+8363,
+8364,
+8365,
+8366,
+8367,
+8368,
+8369,
+8370,
+8371,
+8372,
+8373,
+8374,
+8375,
+8376,
+8377,
+8378,
+8379,
+8380,
+8381,
+8382,
+8383,
+8384,
+8385,
+8386,
+8387,
+8388,
+8389,
+8390,
+8391,
+8392,
+8393,
+8394,
+8395,
+8396,
+8397,
+8398,
+8399,
+8400,
+8401,
+8402,
+8403,
+8404,
+8405,
+8406,
+8407,
+8408,
+8409,
+8410,
+8411,
+8412,
+8413,
+8414,
+8415,
+8416,
+8417,
+8418,
+8419,
+8420,
+8421,
+8422,
+8423,
+8424,
+8425,
+8426,
+8427,
+8428,
+8429,
+8430,
+8431,
+8432,
+8433,
+8434,
+8435,
+8436,
+8437,
+8438,
+8439,
+8440,
+8441,
+8442,
+8443,
+8444,
+8445,
+8446,
+8447,
+8448,
+8449,
+8450,
+8451,
+8452,
+8453,
+8454,
+8455,
+8456,
+8457,
+8458,
+8459,
+8460,
+8461,
+8462,
+8463,
+8464,
+8465,
+8466,
+8467,
+8468,
+8469,
+8470,
+8471,
+8472,
+8473,
+8474,
+8475,
+8476,
+8477,
+8478,
+8479,
+8480,
+8481,
+8482,
+8483,
+8484,
+8485,
+8486,
+8487,
+8488,
+8489,
+8490,
+8491,
+8492,
+8493,
+8494,
+8495,
+8496,
+8497,
+8498,
+8499,
+8500,
+8501,
+8502,
+8503,
+8504,
+8505,
+8506,
+8507,
+8508,
+8509,
+8510,
+8511,
+8512,
+8513,
+8514,
+8515,
+8516,
+8517,
+8518,
+8519,
+8520,
+8521,
+8522,
+8523,
+8524,
+8525,
+8526,
+8527,
+8528,
+8529,
+8530,
+8531,
+8532,
+8533,
+8534,
+8535,
+8536,
+8537,
+8538,
+8539,
+8540,
+8541,
+8542,
+8543,
+8544,
+8545,
+8546,
+8547,
+8548,
+8549,
+8550,
+8551,
+8552,
+8553,
+8554,
+8555,
+8556,
+8557,
+8558,
+8559,
+8560,
+8561,
+8562,
+8563,
+8564,
+8565,
+8566,
+8567,
+8568,
+8569,
+8570,
+8571,
+8572,
+8573,
+8574,
+8575,
+8576,
+8577,
+8578,
+8579,
+8580,
+8581,
+8582,
+8583,
+8584,
+8585,
+8586,
+8587,
+8588,
+8589,
+8590,
+8591,
+8592,
+8593,
+8594,
+8595,
+8596,
+8597,
+8598,
+8599,
+8600,
+8601,
+8602,
+8603,
+8604,
+8605,
+8606,
+8607,
+8608,
+8609,
+8610,
+8611,
+8612,
+8613,
+8614,
+8615,
+8616,
+8617,
+8618,
+8619,
+8620,
+8621,
+8622,
+8623,
+8624,
+8625,
+8626,
+8627,
+8628,
+8629,
+8630,
+8631,
+8632,
+8633,
+8634,
+8635,
+8636,
+8637,
+8638,
+8639,
+8640,
+8641,
+8642,
+8643,
+8644,
+8645,
+8646,
+8647,
+8648,
+8649,
+8650,
+8651,
+8652,
+8653,
+8654,
+8655,
+8656,
+8657,
+8658,
+8659,
+8660,
+8661,
+8662,
+8663,
+8664,
+8665,
+8666,
+8667,
+8668,
+8669,
+8670,
+8671,
+8672,
+8673,
+8674,
+8675,
+8676,
+8677,
+8678,
+8679,
+8680,
+8681,
+8682,
+8683,
+8684,
+8685,
+8686,
+8687,
+8688,
+8689,
+8690,
+8691,
+8692,
+8693,
+8694,
+8695,
+8696,
+8697,
+8698,
+8699,
+8700,
+8701,
+8702,
+8703,
+8704,
+8705,
+8706,
+8707,
+8708,
+8709,
+8710,
+8711,
+8712,
+8713,
+8714,
+8715,
+8716,
+8717,
+8718,
+8719,
+8720,
+8721,
+8722,
+8723,
+8724,
+8725,
+8726,
+8727,
+8728,
+8729,
+8730,
+8731,
+8732,
+8733,
+8734,
+8735,
+8736,
+8737,
+8738,
+8739,
+8740,
+8741,
+8742,
+8743,
+8744,
+8745,
+8746,
+8747,
+8748,
+8749,
+8750,
+8751,
+8752,
+8753,
+8754,
+8755,
+8756,
+8757,
+8758,
+8759,
+8760,
+8761,
+8762,
+8763,
+8764,
+8765,
+8766,
+8767,
+8768,
+8769,
+8770,
+8771,
+8772,
+8773,
+8774,
+8775,
+8776,
+8777,
+8778,
+8779,
+8780,
+8781,
+8782,
+8783,
+8784,
+8785,
+8786,
+8787,
+8788,
+8789,
+8790,
+8791,
+8792,
+8793,
+8794,
+8795,
+8796,
+8797,
+8798,
+8799,
+8800,
+8801,
+8802,
+8803,
+8804,
+8805,
+8806,
+8807,
+8808,
+8809,
+8810,
+8811,
+8812,
+8813,
+8814,
+8815,
+8816,
+8817,
+8818,
+8819,
+8820,
+8821,
+8822,
+8823,
+8824,
+8825,
+8826,
+8827,
+8828,
+8829,
+8830,
+8831,
+8832,
+8833,
+8834,
+8835,
+8836,
+8837,
+8838,
+8839,
+8840,
+8841,
+8842,
+8843,
+8844,
+8845,
+8846,
+8847,
+8848,
+8849,
+8850,
+8851,
+8852,
+8853,
+8854,
+8855,
+8856,
+8857,
+8858,
+8859,
+8860,
+8861,
+8862,
+8863,
+8864,
+8865,
+8866,
+8867,
+8868,
+8869,
+8870,
+8871,
+8872,
+8873,
+8874,
+8875,
+8876,
+8877,
+8878,
+8879,
+8880,
+8881,
+8882,
+8883,
+8884,
+8885,
+8886,
+8887,
+8888,
+8889,
+8890,
+8891,
+8892,
+8893,
+8894,
+8895,
+8896,
+8897,
+8898,
+8899,
+8900,
+8901,
+8902,
+8903,
+8904,
+8905,
+8906,
+8907,
+8908,
+8909,
+8910,
+8911,
+8912,
+8913,
+8914,
+8915,
+8916,
+8917,
+8918,
+8919,
+8920,
+8921,
+8922,
+8923,
+8924,
+8925,
+8926,
+8927,
+8928,
+8929,
+8930,
+8931,
+8932,
+8933,
+8934,
+8935,
+8936,
+8937,
+8938,
+8939,
+8940,
+8941,
+8942,
+8943,
+8944,
+8945,
+8946,
+8947,
+8948,
+8949,
+8950,
+8951,
+8952,
+8953,
+8954,
+8955,
+8956,
+8957,
+8958,
+8959,
+8960,
+8961,
+8962,
+8963,
+8964,
+8965,
+8966,
+8967,
+8968,
+8969,
+8970,
+8971,
+8972,
+8973,
+8974,
+8975,
+8976,
+8977,
+8978,
+8979,
+8980,
+8981,
+8982,
+8983,
+8984,
+8985,
+8986,
+8987,
+8988,
+8989,
+8990,
+8991,
+8992,
+8993,
+8994,
+8995,
+8996,
+8997,
+8998,
+8999,
+9000,
+9001,
+9002,
+9003,
+9004,
+9005,
+9006,
+9007,
+9008,
+9009,
+9010,
+9011,
+9012,
+9013,
+9014,
+9015,
+9016,
+9017,
+9018,
+9019,
+9020,
+9021,
+9022,
+9023,
+9024,
+9025,
+9026,
+9027,
+9028,
+9029,
+9030,
+9031,
+9032,
+9033,
+9034,
+9035,
+9036,
+9037,
+9038,
+9039,
+9040,
+9041,
+9042,
+9043,
+9044,
+9045,
+9046,
+9047,
+9048,
+9049,
+9050,
+9051,
+9052,
+9053,
+9054,
+9055,
+9056,
+9057,
+9058,
+9059,
+9060,
+9061,
+9062,
+9063,
+9064,
+9065,
+9066,
+9067,
+9068,
+9069,
+9070,
+9071,
+9072,
+9073,
+9074,
+9075,
+9076,
+9077,
+9078,
+9079,
+9080,
+9081,
+9082,
+9083,
+9084,
+9085,
+9086,
+9087,
+9088,
+9089,
+9090,
+9091,
+9092,
+9093,
+9094,
+9095,
+9096,
+9097,
+9098,
+9099,
+9100,
+9101,
+9102,
+9103,
+9104,
+9105,
+9106,
+9107,
+9108,
+9109,
+9110,
+9111,
+9112,
+9113,
+9114,
+9115,
+9116,
+9117,
+9118,
+9119,
+9120,
+9121,
+9122,
+9123,
+9124,
+9125,
+9126,
+9127,
+9128,
+9129,
+9130,
+9131,
+9132,
+9133,
+9134,
+9135,
+9136,
+9137,
+9138,
+9139,
+9140,
+9141,
+9142,
+9143,
+9144,
+9145,
+9146,
+9147,
+9148,
+9149,
+9150,
+9151,
+9152,
+9153,
+9154,
+9155,
+9156,
+9157,
+9158,
+9159,
+9160,
+9161,
+9162,
+9163,
+9164,
+9165,
+9166,
+9167,
+9168,
+9169,
+9170,
+9171,
+9172,
+9173,
+9174,
+9175,
+9176,
+9177,
+9178,
+9179,
+9180,
+9181,
+9182,
+9183,
+9184,
+9185,
+9186,
+9187,
+9188,
+9189,
+9190,
+9191,
+9192,
+9193,
+9194,
+9195,
+9196,
+9197,
+9198,
+9199,
+9200,
+9201,
+9202,
+9203,
+9204,
+9205,
+9206,
+9207,
+9208,
+9209,
+9210,
+9211,
+9212,
+9213,
+9214,
+9215,
+9216,
+9217,
+9218,
+9219,
+9220,
+9221,
+9222,
+9223,
+9224,
+9225,
+9226,
+9227,
+9228,
+9229,
+9230,
+9231,
+9232,
+9233,
+9234,
+9235,
+9236,
+9237,
+9238,
+9239,
+9240,
+9241,
+9242,
+9243,
+9244,
+9245,
+9246,
+9247,
+9248,
+9249,
+9250,
+9251,
+9252,
+9253,
+9254,
+9255,
+9256,
+9257,
+9258,
+9259,
+9260,
+9261,
+9262,
+9263,
+9264,
+9265,
+9266,
+9267,
+9268,
+9269,
+9270,
+9271,
+9272,
+9273,
+9274,
+9275,
+9276,
+9277,
+9278,
+9279,
+9280,
+9281,
+9282,
+9283,
+9284,
+9285,
+9286,
+9287,
+9288,
+9289,
+9290,
+9291,
+9292,
+9293,
+9294,
+9295,
+9296,
+9297,
+9298,
+9299,
+9300,
+9301,
+9302,
+9303,
+9304,
+9305,
+9306,
+9307,
+9308,
+9309,
+9310,
+9311,
+9312,
+9313,
+9314,
+9315,
+9316,
+9317,
+9318,
+9319,
+9320,
+9321,
+9322,
+9323,
+9324,
+9325,
+9326,
+9327,
+9328,
+9329,
+9330,
+9331,
+9332,
+9333,
+9334,
+9335,
+9336,
+9337,
+9338,
+9339,
+9340,
+9341,
+9342,
+9343,
+9344,
+9345,
+9346,
+9347,
+9348,
+9349,
+9350,
+9351,
+9352,
+9353,
+9354,
+9355,
+9356,
+9357,
+9358,
+9359,
+9360,
+9361,
+9362,
+9363,
+9364,
+9365,
+9366,
+9367,
+9368,
+9369,
+9370,
+9371,
+9372,
+9373,
+9374,
+9375,
+9376,
+9377,
+9378,
+9379,
+9380,
+9381,
+9382,
+9383,
+9384,
+9385,
+9386,
+9387,
+9388,
+9389,
+9390,
+9391,
+9392,
+9393,
+9394,
+9395,
+9396,
+9397,
+9398,
+9399,
+9400,
+9401,
+9402,
+9403,
+9404,
+9405,
+9406,
+9407,
+9408,
+9409,
+9410,
+9411,
+9412,
+9413,
+9414,
+9415,
+9416,
+9417,
+9418,
+9419,
+9420,
+9421,
+9422,
+9423,
+9424,
+9425,
+9426,
+9427,
+9428,
+9429,
+9430,
+9431,
+9432,
+9433,
+9434,
+9435,
+9436,
+9437,
+9438,
+9439,
+9440,
+9441,
+9442,
+9443,
+9444,
+9445,
+9446,
+9447,
+9448,
+9449,
+9450,
+9451,
+9452,
+9453,
+9454,
+9455,
+9456,
+9457,
+9458,
+9459,
+9460,
+9461,
+9462,
+9463,
+9464,
+9465,
+9466,
+9467,
+9468,
+9469,
+9470,
+9471,
+9472,
+9473,
+9474,
+9475,
+9476,
+9477,
+9478,
+9479,
+9480,
+9481,
+9482,
+9483,
+9484,
+9485,
+9486,
+9487,
+9488,
+9489,
+9490,
+9491,
+9492,
+9493,
+9494,
+9495,
+9496,
+9497,
+9498,
+9499,
+9500,
+9501,
+9502,
+9503,
+9504,
+9505,
+9506,
+9507,
+9508,
+9509,
+9510,
+9511,
+9512,
+9513,
+9514,
+9515,
+9516,
+9517,
+9518,
+9519,
+9520,
+9521,
+9522,
+9523,
+9524,
+9525,
+9526,
+9527,
+9528,
+9529,
+9530,
+9531,
+9532,
+9533,
+9534,
+9535,
+9536,
+9537,
+9538,
+9539,
+9540,
+9541,
+9542,
+9543,
+9544,
+9545,
+9546,
+9547,
+9548,
+9549,
+9550,
+9551,
+9552,
+9553,
+9554,
+9555,
+9556,
+9557,
+9558,
+9559,
+9560,
+9561,
+9562,
+9563,
+9564,
+9565,
+9566,
+9567,
+9568,
+9569,
+9570,
+9571,
+9572,
+9573,
+9574,
+9575,
+9576,
+9577,
+9578,
+9579,
+9580,
+9581,
+9582,
+9583,
+9584,
+9585,
+9586,
+9587,
+9588,
+9589,
+9590,
+9591,
+9592,
+9593,
+9594,
+9595,
+9596,
+9597,
+9598,
+9599,
+9600,
+9601,
+9602,
+9603,
+9604,
+9605,
+9606,
+9607,
+9608,
+9609,
+9610,
+9611,
+9612,
+9613,
+9614,
+9615,
+9616,
+9617,
+9618,
+9619,
+9620,
+9621,
+9622,
+9623,
+9624,
+9625,
+9626,
+9627,
+9628,
+9629,
+9630,
+9631,
+9632,
+9633,
+9634,
+9635,
+9636,
+9637,
+9638,
+9639,
+9640,
+9641,
+9642,
+9643,
+9644,
+9645,
+9646,
+9647,
+9648,
+9649,
+9650,
+9651,
+9652,
+9653,
+9654,
+9655,
+9656,
+9657,
+9658,
+9659,
+9660,
+9661,
+9662,
+9663,
+9664,
+9665,
+9666,
+9667,
+9668,
+9669,
+9670,
+9671,
+9672,
+9673,
+9674,
+9675,
+9676,
+9677,
+9678,
+9679,
+9680,
+9681,
+9682,
+9683,
+9684,
+9685,
+9686,
+9687,
+9688,
+9689,
+9690,
+9691,
+9692,
+9693,
+9694,
+9695,
+9696,
+9697,
+9698,
+9699,
+9700,
+9701,
+9702,
+9703,
+9704,
+9705,
+9706,
+9707,
+9708,
+9709,
+9710,
+9711,
+9712,
+9713,
+9714,
+9715,
+9716,
+9717,
+9718,
+9719,
+9720,
+9721,
+9722,
+9723,
+9724,
+9725,
+9726,
+9727,
+9728,
+9729,
+9730,
+9731,
+9732,
+9733,
+9734,
+9735,
+9736,
+9737,
+9738,
+9739,
+9740,
+9741,
+9742,
+9743,
+9744,
+9745,
+9746,
+9747,
+9748,
+9749,
+9750,
+9751,
+9752,
+9753,
+9754,
+9755,
+9756,
+9757,
+9758,
+9759,
+9760,
+9761,
+9762,
+9763,
+9764,
+9765,
+9766,
+9767,
+9768,
+9769,
+9770,
+9771,
+9772,
+9773,
+9774,
+9775,
+9776,
+9777,
+9778,
+9779,
+9780,
+9781,
+9782,
+9783,
+9784,
+9785,
+9786,
+9787,
+9788,
+9789,
+9790,
+9791,
+9792,
+9793,
+9794,
+9795,
+9796,
+9797,
+9798,
+9799,
+9800,
+9801,
+9802,
+9803,
+9804,
+9805,
+9806,
+9807,
+9808,
+9809,
+9810,
+9811,
+9812,
+9813,
+9814,
+9815,
+9816,
+9817,
+9818,
+9819,
+9820,
+9821,
+9822,
+9823,
+9824,
+9825,
+9826,
+9827,
+9828,
+9829,
+9830,
+9831,
+9832,
+9833,
+9834,
+9835,
+9836,
+9837,
+9838,
+9839,
+9840,
+9841,
+9842,
+9843,
+9844,
+9845,
+9846,
+9847,
+9848,
+9849,
+9850,
+9851,
+9852,
+9853,
+9854,
+9855,
+9856,
+9857,
+9858,
+9859,
+9860,
+9861,
+9862,
+9863,
+9864,
+9865,
+9866,
+9867,
+9868,
+9869,
+9870,
+9871,
+9872,
+9873,
+9874,
+9875,
+9876,
+9877,
+9878,
+9879,
+9880,
+9881,
+9882,
+9883,
+9884,
+9885,
+9886,
+9887,
+9888,
+9889,
+9890,
+9891,
+9892,
+9893,
+9894,
+9895,
+9896,
+9897,
+9898,
+9899,
+9900,
+9901,
+9902,
+9903,
+9904,
+9905,
+9906,
+9907,
+9908,
+9909,
+9910,
+9911,
+9912,
+9913,
+9914,
+9915,
+9916,
+9917,
+9918,
+9919,
+9920,
+9921,
+9922,
+9923,
+9924,
+9925,
+9926,
+9927,
+9928,
+9929,
+9930,
+9931,
+9932,
+9933,
+9934,
+9935,
+9936,
+9937,
+9938,
+9939,
+9940,
+9941,
+9942,
+9943,
+9944,
+9945,
+9946,
+9947,
+9948,
+9949,
+9950,
+9951,
+9952,
+9953,
+9954,
+9955,
+9956,
+9957,
+9958,
+9959,
+9960,
+9961,
+9962,
+9963,
+9964,
+9965,
+9966,
+9967,
+9968,
+9969,
+9970,
+9971,
+9972,
+9973,
+9974,
+9975,
+9976,
+9977,
+9978,
+9979,
+9980,
+9981,
+9982,
+9983,
+9984,
+9985,
+9986,
+9987,
+9988,
+9989,
+9990,
+9991,
+9992,
+9993,
+9994,
+9995,
+9996,
+9997,
+9998,
+9999
+];
+
+var largeDouble = [
+0.1,
+1.1,
+2.1,
+3.1,
+4.1,
+5.1,
+6.1,
+7.1,
+8.1,
+9.1,
+10.1,
+11.1,
+12.1,
+13.1,
+14.1,
+15.1,
+16.1,
+17.1,
+18.1,
+19.1,
+20.1,
+21.1,
+22.1,
+23.1,
+24.1,
+25.1,
+26.1,
+27.1,
+28.1,
+29.1,
+30.1,
+31.1,
+32.1,
+33.1,
+34.1,
+35.1,
+36.1,
+37.1,
+38.1,
+39.1,
+40.1,
+41.1,
+42.1,
+43.1,
+44.1,
+45.1,
+46.1,
+47.1,
+48.1,
+49.1,
+50.1,
+51.1,
+52.1,
+53.1,
+54.1,
+55.1,
+56.1,
+57.1,
+58.1,
+59.1,
+60.1,
+61.1,
+62.1,
+63.1,
+64.1,
+65.1,
+66.1,
+67.1,
+68.1,
+69.1,
+70.1,
+71.1,
+72.1,
+73.1,
+74.1,
+75.1,
+76.1,
+77.1,
+78.1,
+79.1,
+80.1,
+81.1,
+82.1,
+83.1,
+84.1,
+85.1,
+86.1,
+87.1,
+88.1,
+89.1,
+90.1,
+91.1,
+92.1,
+93.1,
+94.1,
+95.1,
+96.1,
+97.1,
+98.1,
+99.1,
+100.1,
+101.1,
+102.1,
+103.1,
+104.1,
+105.1,
+106.1,
+107.1,
+108.1,
+109.1,
+110.1,
+111.1,
+112.1,
+113.1,
+114.1,
+115.1,
+116.1,
+117.1,
+118.1,
+119.1,
+120.1,
+121.1,
+122.1,
+123.1,
+124.1,
+125.1,
+126.1,
+127.1,
+128.1,
+129.1,
+130.1,
+131.1,
+132.1,
+133.1,
+134.1,
+135.1,
+136.1,
+137.1,
+138.1,
+139.1,
+140.1,
+141.1,
+142.1,
+143.1,
+144.1,
+145.1,
+146.1,
+147.1,
+148.1,
+149.1,
+150.1,
+151.1,
+152.1,
+153.1,
+154.1,
+155.1,
+156.1,
+157.1,
+158.1,
+159.1,
+160.1,
+161.1,
+162.1,
+163.1,
+164.1,
+165.1,
+166.1,
+167.1,
+168.1,
+169.1,
+170.1,
+171.1,
+172.1,
+173.1,
+174.1,
+175.1,
+176.1,
+177.1,
+178.1,
+179.1,
+180.1,
+181.1,
+182.1,
+183.1,
+184.1,
+185.1,
+186.1,
+187.1,
+188.1,
+189.1,
+190.1,
+191.1,
+192.1,
+193.1,
+194.1,
+195.1,
+196.1,
+197.1,
+198.1,
+199.1,
+200.1,
+201.1,
+202.1,
+203.1,
+204.1,
+205.1,
+206.1,
+207.1,
+208.1,
+209.1,
+210.1,
+211.1,
+212.1,
+213.1,
+214.1,
+215.1,
+216.1,
+217.1,
+218.1,
+219.1,
+220.1,
+221.1,
+222.1,
+223.1,
+224.1,
+225.1,
+226.1,
+227.1,
+228.1,
+229.1,
+230.1,
+231.1,
+232.1,
+233.1,
+234.1,
+235.1,
+236.1,
+237.1,
+238.1,
+239.1,
+240.1,
+241.1,
+242.1,
+243.1,
+244.1,
+245.1,
+246.1,
+247.1,
+248.1,
+249.1,
+250.1,
+251.1,
+252.1,
+253.1,
+254.1,
+255.1,
+256.1,
+257.1,
+258.1,
+259.1,
+260.1,
+261.1,
+262.1,
+263.1,
+264.1,
+265.1,
+266.1,
+267.1,
+268.1,
+269.1,
+270.1,
+271.1,
+272.1,
+273.1,
+274.1,
+275.1,
+276.1,
+277.1,
+278.1,
+279.1,
+280.1,
+281.1,
+282.1,
+283.1,
+284.1,
+285.1,
+286.1,
+287.1,
+288.1,
+289.1,
+290.1,
+291.1,
+292.1,
+293.1,
+294.1,
+295.1,
+296.1,
+297.1,
+298.1,
+299.1,
+300.1,
+301.1,
+302.1,
+303.1,
+304.1,
+305.1,
+306.1,
+307.1,
+308.1,
+309.1,
+310.1,
+311.1,
+312.1,
+313.1,
+314.1,
+315.1,
+316.1,
+317.1,
+318.1,
+319.1,
+320.1,
+321.1,
+322.1,
+323.1,
+324.1,
+325.1,
+326.1,
+327.1,
+328.1,
+329.1,
+330.1,
+331.1,
+332.1,
+333.1,
+334.1,
+335.1,
+336.1,
+337.1,
+338.1,
+339.1,
+340.1,
+341.1,
+342.1,
+343.1,
+344.1,
+345.1,
+346.1,
+347.1,
+348.1,
+349.1,
+350.1,
+351.1,
+352.1,
+353.1,
+354.1,
+355.1,
+356.1,
+357.1,
+358.1,
+359.1,
+360.1,
+361.1,
+362.1,
+363.1,
+364.1,
+365.1,
+366.1,
+367.1,
+368.1,
+369.1,
+370.1,
+371.1,
+372.1,
+373.1,
+374.1,
+375.1,
+376.1,
+377.1,
+378.1,
+379.1,
+380.1,
+381.1,
+382.1,
+383.1,
+384.1,
+385.1,
+386.1,
+387.1,
+388.1,
+389.1,
+390.1,
+391.1,
+392.1,
+393.1,
+394.1,
+395.1,
+396.1,
+397.1,
+398.1,
+399.1,
+400.1,
+401.1,
+402.1,
+403.1,
+404.1,
+405.1,
+406.1,
+407.1,
+408.1,
+409.1,
+410.1,
+411.1,
+412.1,
+413.1,
+414.1,
+415.1,
+416.1,
+417.1,
+418.1,
+419.1,
+420.1,
+421.1,
+422.1,
+423.1,
+424.1,
+425.1,
+426.1,
+427.1,
+428.1,
+429.1,
+430.1,
+431.1,
+432.1,
+433.1,
+434.1,
+435.1,
+436.1,
+437.1,
+438.1,
+439.1,
+440.1,
+441.1,
+442.1,
+443.1,
+444.1,
+445.1,
+446.1,
+447.1,
+448.1,
+449.1,
+450.1,
+451.1,
+452.1,
+453.1,
+454.1,
+455.1,
+456.1,
+457.1,
+458.1,
+459.1,
+460.1,
+461.1,
+462.1,
+463.1,
+464.1,
+465.1,
+466.1,
+467.1,
+468.1,
+469.1,
+470.1,
+471.1,
+472.1,
+473.1,
+474.1,
+475.1,
+476.1,
+477.1,
+478.1,
+479.1,
+480.1,
+481.1,
+482.1,
+483.1,
+484.1,
+485.1,
+486.1,
+487.1,
+488.1,
+489.1,
+490.1,
+491.1,
+492.1,
+493.1,
+494.1,
+495.1,
+496.1,
+497.1,
+498.1,
+499.1,
+500.1,
+501.1,
+502.1,
+503.1,
+504.1,
+505.1,
+506.1,
+507.1,
+508.1,
+509.1,
+510.1,
+511.1,
+512.1,
+513.1,
+514.1,
+515.1,
+516.1,
+517.1,
+518.1,
+519.1,
+520.1,
+521.1,
+522.1,
+523.1,
+524.1,
+525.1,
+526.1,
+527.1,
+528.1,
+529.1,
+530.1,
+531.1,
+532.1,
+533.1,
+534.1,
+535.1,
+536.1,
+537.1,
+538.1,
+539.1,
+540.1,
+541.1,
+542.1,
+543.1,
+544.1,
+545.1,
+546.1,
+547.1,
+548.1,
+549.1,
+550.1,
+551.1,
+552.1,
+553.1,
+554.1,
+555.1,
+556.1,
+557.1,
+558.1,
+559.1,
+560.1,
+561.1,
+562.1,
+563.1,
+564.1,
+565.1,
+566.1,
+567.1,
+568.1,
+569.1,
+570.1,
+571.1,
+572.1,
+573.1,
+574.1,
+575.1,
+576.1,
+577.1,
+578.1,
+579.1,
+580.1,
+581.1,
+582.1,
+583.1,
+584.1,
+585.1,
+586.1,
+587.1,
+588.1,
+589.1,
+590.1,
+591.1,
+592.1,
+593.1,
+594.1,
+595.1,
+596.1,
+597.1,
+598.1,
+599.1,
+600.1,
+601.1,
+602.1,
+603.1,
+604.1,
+605.1,
+606.1,
+607.1,
+608.1,
+609.1,
+610.1,
+611.1,
+612.1,
+613.1,
+614.1,
+615.1,
+616.1,
+617.1,
+618.1,
+619.1,
+620.1,
+621.1,
+622.1,
+623.1,
+624.1,
+625.1,
+626.1,
+627.1,
+628.1,
+629.1,
+630.1,
+631.1,
+632.1,
+633.1,
+634.1,
+635.1,
+636.1,
+637.1,
+638.1,
+639.1,
+640.1,
+641.1,
+642.1,
+643.1,
+644.1,
+645.1,
+646.1,
+647.1,
+648.1,
+649.1,
+650.1,
+651.1,
+652.1,
+653.1,
+654.1,
+655.1,
+656.1,
+657.1,
+658.1,
+659.1,
+660.1,
+661.1,
+662.1,
+663.1,
+664.1,
+665.1,
+666.1,
+667.1,
+668.1,
+669.1,
+670.1,
+671.1,
+672.1,
+673.1,
+674.1,
+675.1,
+676.1,
+677.1,
+678.1,
+679.1,
+680.1,
+681.1,
+682.1,
+683.1,
+684.1,
+685.1,
+686.1,
+687.1,
+688.1,
+689.1,
+690.1,
+691.1,
+692.1,
+693.1,
+694.1,
+695.1,
+696.1,
+697.1,
+698.1,
+699.1,
+700.1,
+701.1,
+702.1,
+703.1,
+704.1,
+705.1,
+706.1,
+707.1,
+708.1,
+709.1,
+710.1,
+711.1,
+712.1,
+713.1,
+714.1,
+715.1,
+716.1,
+717.1,
+718.1,
+719.1,
+720.1,
+721.1,
+722.1,
+723.1,
+724.1,
+725.1,
+726.1,
+727.1,
+728.1,
+729.1,
+730.1,
+731.1,
+732.1,
+733.1,
+734.1,
+735.1,
+736.1,
+737.1,
+738.1,
+739.1,
+740.1,
+741.1,
+742.1,
+743.1,
+744.1,
+745.1,
+746.1,
+747.1,
+748.1,
+749.1,
+750.1,
+751.1,
+752.1,
+753.1,
+754.1,
+755.1,
+756.1,
+757.1,
+758.1,
+759.1,
+760.1,
+761.1,
+762.1,
+763.1,
+764.1,
+765.1,
+766.1,
+767.1,
+768.1,
+769.1,
+770.1,
+771.1,
+772.1,
+773.1,
+774.1,
+775.1,
+776.1,
+777.1,
+778.1,
+779.1,
+780.1,
+781.1,
+782.1,
+783.1,
+784.1,
+785.1,
+786.1,
+787.1,
+788.1,
+789.1,
+790.1,
+791.1,
+792.1,
+793.1,
+794.1,
+795.1,
+796.1,
+797.1,
+798.1,
+799.1,
+800.1,
+801.1,
+802.1,
+803.1,
+804.1,
+805.1,
+806.1,
+807.1,
+808.1,
+809.1,
+810.1,
+811.1,
+812.1,
+813.1,
+814.1,
+815.1,
+816.1,
+817.1,
+818.1,
+819.1,
+820.1,
+821.1,
+822.1,
+823.1,
+824.1,
+825.1,
+826.1,
+827.1,
+828.1,
+829.1,
+830.1,
+831.1,
+832.1,
+833.1,
+834.1,
+835.1,
+836.1,
+837.1,
+838.1,
+839.1,
+840.1,
+841.1,
+842.1,
+843.1,
+844.1,
+845.1,
+846.1,
+847.1,
+848.1,
+849.1,
+850.1,
+851.1,
+852.1,
+853.1,
+854.1,
+855.1,
+856.1,
+857.1,
+858.1,
+859.1,
+860.1,
+861.1,
+862.1,
+863.1,
+864.1,
+865.1,
+866.1,
+867.1,
+868.1,
+869.1,
+870.1,
+871.1,
+872.1,
+873.1,
+874.1,
+875.1,
+876.1,
+877.1,
+878.1,
+879.1,
+880.1,
+881.1,
+882.1,
+883.1,
+884.1,
+885.1,
+886.1,
+887.1,
+888.1,
+889.1,
+890.1,
+891.1,
+892.1,
+893.1,
+894.1,
+895.1,
+896.1,
+897.1,
+898.1,
+899.1,
+900.1,
+901.1,
+902.1,
+903.1,
+904.1,
+905.1,
+906.1,
+907.1,
+908.1,
+909.1,
+910.1,
+911.1,
+912.1,
+913.1,
+914.1,
+915.1,
+916.1,
+917.1,
+918.1,
+919.1,
+920.1,
+921.1,
+922.1,
+923.1,
+924.1,
+925.1,
+926.1,
+927.1,
+928.1,
+929.1,
+930.1,
+931.1,
+932.1,
+933.1,
+934.1,
+935.1,
+936.1,
+937.1,
+938.1,
+939.1,
+940.1,
+941.1,
+942.1,
+943.1,
+944.1,
+945.1,
+946.1,
+947.1,
+948.1,
+949.1,
+950.1,
+951.1,
+952.1,
+953.1,
+954.1,
+955.1,
+956.1,
+957.1,
+958.1,
+959.1,
+960.1,
+961.1,
+962.1,
+963.1,
+964.1,
+965.1,
+966.1,
+967.1,
+968.1,
+969.1,
+970.1,
+971.1,
+972.1,
+973.1,
+974.1,
+975.1,
+976.1,
+977.1,
+978.1,
+979.1,
+980.1,
+981.1,
+982.1,
+983.1,
+984.1,
+985.1,
+986.1,
+987.1,
+988.1,
+989.1,
+990.1,
+991.1,
+992.1,
+993.1,
+994.1,
+995.1,
+996.1,
+997.1,
+998.1,
+999.1,
+1000.1,
+1001.1,
+1002.1,
+1003.1,
+1004.1,
+1005.1,
+1006.1,
+1007.1,
+1008.1,
+1009.1,
+1010.1,
+1011.1,
+1012.1,
+1013.1,
+1014.1,
+1015.1,
+1016.1,
+1017.1,
+1018.1,
+1019.1,
+1020.1,
+1021.1,
+1022.1,
+1023.1,
+1024.1,
+1025.1,
+1026.1,
+1027.1,
+1028.1,
+1029.1,
+1030.1,
+1031.1,
+1032.1,
+1033.1,
+1034.1,
+1035.1,
+1036.1,
+1037.1,
+1038.1,
+1039.1,
+1040.1,
+1041.1,
+1042.1,
+1043.1,
+1044.1,
+1045.1,
+1046.1,
+1047.1,
+1048.1,
+1049.1,
+1050.1,
+1051.1,
+1052.1,
+1053.1,
+1054.1,
+1055.1,
+1056.1,
+1057.1,
+1058.1,
+1059.1,
+1060.1,
+1061.1,
+1062.1,
+1063.1,
+1064.1,
+1065.1,
+1066.1,
+1067.1,
+1068.1,
+1069.1,
+1070.1,
+1071.1,
+1072.1,
+1073.1,
+1074.1,
+1075.1,
+1076.1,
+1077.1,
+1078.1,
+1079.1,
+1080.1,
+1081.1,
+1082.1,
+1083.1,
+1084.1,
+1085.1,
+1086.1,
+1087.1,
+1088.1,
+1089.1,
+1090.1,
+1091.1,
+1092.1,
+1093.1,
+1094.1,
+1095.1,
+1096.1,
+1097.1,
+1098.1,
+1099.1,
+1100.1,
+1101.1,
+1102.1,
+1103.1,
+1104.1,
+1105.1,
+1106.1,
+1107.1,
+1108.1,
+1109.1,
+1110.1,
+1111.1,
+1112.1,
+1113.1,
+1114.1,
+1115.1,
+1116.1,
+1117.1,
+1118.1,
+1119.1,
+1120.1,
+1121.1,
+1122.1,
+1123.1,
+1124.1,
+1125.1,
+1126.1,
+1127.1,
+1128.1,
+1129.1,
+1130.1,
+1131.1,
+1132.1,
+1133.1,
+1134.1,
+1135.1,
+1136.1,
+1137.1,
+1138.1,
+1139.1,
+1140.1,
+1141.1,
+1142.1,
+1143.1,
+1144.1,
+1145.1,
+1146.1,
+1147.1,
+1148.1,
+1149.1,
+1150.1,
+1151.1,
+1152.1,
+1153.1,
+1154.1,
+1155.1,
+1156.1,
+1157.1,
+1158.1,
+1159.1,
+1160.1,
+1161.1,
+1162.1,
+1163.1,
+1164.1,
+1165.1,
+1166.1,
+1167.1,
+1168.1,
+1169.1,
+1170.1,
+1171.1,
+1172.1,
+1173.1,
+1174.1,
+1175.1,
+1176.1,
+1177.1,
+1178.1,
+1179.1,
+1180.1,
+1181.1,
+1182.1,
+1183.1,
+1184.1,
+1185.1,
+1186.1,
+1187.1,
+1188.1,
+1189.1,
+1190.1,
+1191.1,
+1192.1,
+1193.1,
+1194.1,
+1195.1,
+1196.1,
+1197.1,
+1198.1,
+1199.1,
+1200.1,
+1201.1,
+1202.1,
+1203.1,
+1204.1,
+1205.1,
+1206.1,
+1207.1,
+1208.1,
+1209.1,
+1210.1,
+1211.1,
+1212.1,
+1213.1,
+1214.1,
+1215.1,
+1216.1,
+1217.1,
+1218.1,
+1219.1,
+1220.1,
+1221.1,
+1222.1,
+1223.1,
+1224.1,
+1225.1,
+1226.1,
+1227.1,
+1228.1,
+1229.1,
+1230.1,
+1231.1,
+1232.1,
+1233.1,
+1234.1,
+1235.1,
+1236.1,
+1237.1,
+1238.1,
+1239.1,
+1240.1,
+1241.1,
+1242.1,
+1243.1,
+1244.1,
+1245.1,
+1246.1,
+1247.1,
+1248.1,
+1249.1,
+1250.1,
+1251.1,
+1252.1,
+1253.1,
+1254.1,
+1255.1,
+1256.1,
+1257.1,
+1258.1,
+1259.1,
+1260.1,
+1261.1,
+1262.1,
+1263.1,
+1264.1,
+1265.1,
+1266.1,
+1267.1,
+1268.1,
+1269.1,
+1270.1,
+1271.1,
+1272.1,
+1273.1,
+1274.1,
+1275.1,
+1276.1,
+1277.1,
+1278.1,
+1279.1,
+1280.1,
+1281.1,
+1282.1,
+1283.1,
+1284.1,
+1285.1,
+1286.1,
+1287.1,
+1288.1,
+1289.1,
+1290.1,
+1291.1,
+1292.1,
+1293.1,
+1294.1,
+1295.1,
+1296.1,
+1297.1,
+1298.1,
+1299.1,
+1300.1,
+1301.1,
+1302.1,
+1303.1,
+1304.1,
+1305.1,
+1306.1,
+1307.1,
+1308.1,
+1309.1,
+1310.1,
+1311.1,
+1312.1,
+1313.1,
+1314.1,
+1315.1,
+1316.1,
+1317.1,
+1318.1,
+1319.1,
+1320.1,
+1321.1,
+1322.1,
+1323.1,
+1324.1,
+1325.1,
+1326.1,
+1327.1,
+1328.1,
+1329.1,
+1330.1,
+1331.1,
+1332.1,
+1333.1,
+1334.1,
+1335.1,
+1336.1,
+1337.1,
+1338.1,
+1339.1,
+1340.1,
+1341.1,
+1342.1,
+1343.1,
+1344.1,
+1345.1,
+1346.1,
+1347.1,
+1348.1,
+1349.1,
+1350.1,
+1351.1,
+1352.1,
+1353.1,
+1354.1,
+1355.1,
+1356.1,
+1357.1,
+1358.1,
+1359.1,
+1360.1,
+1361.1,
+1362.1,
+1363.1,
+1364.1,
+1365.1,
+1366.1,
+1367.1,
+1368.1,
+1369.1,
+1370.1,
+1371.1,
+1372.1,
+1373.1,
+1374.1,
+1375.1,
+1376.1,
+1377.1,
+1378.1,
+1379.1,
+1380.1,
+1381.1,
+1382.1,
+1383.1,
+1384.1,
+1385.1,
+1386.1,
+1387.1,
+1388.1,
+1389.1,
+1390.1,
+1391.1,
+1392.1,
+1393.1,
+1394.1,
+1395.1,
+1396.1,
+1397.1,
+1398.1,
+1399.1,
+1400.1,
+1401.1,
+1402.1,
+1403.1,
+1404.1,
+1405.1,
+1406.1,
+1407.1,
+1408.1,
+1409.1,
+1410.1,
+1411.1,
+1412.1,
+1413.1,
+1414.1,
+1415.1,
+1416.1,
+1417.1,
+1418.1,
+1419.1,
+1420.1,
+1421.1,
+1422.1,
+1423.1,
+1424.1,
+1425.1,
+1426.1,
+1427.1,
+1428.1,
+1429.1,
+1430.1,
+1431.1,
+1432.1,
+1433.1,
+1434.1,
+1435.1,
+1436.1,
+1437.1,
+1438.1,
+1439.1,
+1440.1,
+1441.1,
+1442.1,
+1443.1,
+1444.1,
+1445.1,
+1446.1,
+1447.1,
+1448.1,
+1449.1,
+1450.1,
+1451.1,
+1452.1,
+1453.1,
+1454.1,
+1455.1,
+1456.1,
+1457.1,
+1458.1,
+1459.1,
+1460.1,
+1461.1,
+1462.1,
+1463.1,
+1464.1,
+1465.1,
+1466.1,
+1467.1,
+1468.1,
+1469.1,
+1470.1,
+1471.1,
+1472.1,
+1473.1,
+1474.1,
+1475.1,
+1476.1,
+1477.1,
+1478.1,
+1479.1,
+1480.1,
+1481.1,
+1482.1,
+1483.1,
+1484.1,
+1485.1,
+1486.1,
+1487.1,
+1488.1,
+1489.1,
+1490.1,
+1491.1,
+1492.1,
+1493.1,
+1494.1,
+1495.1,
+1496.1,
+1497.1,
+1498.1,
+1499.1,
+1500.1,
+1501.1,
+1502.1,
+1503.1,
+1504.1,
+1505.1,
+1506.1,
+1507.1,
+1508.1,
+1509.1,
+1510.1,
+1511.1,
+1512.1,
+1513.1,
+1514.1,
+1515.1,
+1516.1,
+1517.1,
+1518.1,
+1519.1,
+1520.1,
+1521.1,
+1522.1,
+1523.1,
+1524.1,
+1525.1,
+1526.1,
+1527.1,
+1528.1,
+1529.1,
+1530.1,
+1531.1,
+1532.1,
+1533.1,
+1534.1,
+1535.1,
+1536.1,
+1537.1,
+1538.1,
+1539.1,
+1540.1,
+1541.1,
+1542.1,
+1543.1,
+1544.1,
+1545.1,
+1546.1,
+1547.1,
+1548.1,
+1549.1,
+1550.1,
+1551.1,
+1552.1,
+1553.1,
+1554.1,
+1555.1,
+1556.1,
+1557.1,
+1558.1,
+1559.1,
+1560.1,
+1561.1,
+1562.1,
+1563.1,
+1564.1,
+1565.1,
+1566.1,
+1567.1,
+1568.1,
+1569.1,
+1570.1,
+1571.1,
+1572.1,
+1573.1,
+1574.1,
+1575.1,
+1576.1,
+1577.1,
+1578.1,
+1579.1,
+1580.1,
+1581.1,
+1582.1,
+1583.1,
+1584.1,
+1585.1,
+1586.1,
+1587.1,
+1588.1,
+1589.1,
+1590.1,
+1591.1,
+1592.1,
+1593.1,
+1594.1,
+1595.1,
+1596.1,
+1597.1,
+1598.1,
+1599.1,
+1600.1,
+1601.1,
+1602.1,
+1603.1,
+1604.1,
+1605.1,
+1606.1,
+1607.1,
+1608.1,
+1609.1,
+1610.1,
+1611.1,
+1612.1,
+1613.1,
+1614.1,
+1615.1,
+1616.1,
+1617.1,
+1618.1,
+1619.1,
+1620.1,
+1621.1,
+1622.1,
+1623.1,
+1624.1,
+1625.1,
+1626.1,
+1627.1,
+1628.1,
+1629.1,
+1630.1,
+1631.1,
+1632.1,
+1633.1,
+1634.1,
+1635.1,
+1636.1,
+1637.1,
+1638.1,
+1639.1,
+1640.1,
+1641.1,
+1642.1,
+1643.1,
+1644.1,
+1645.1,
+1646.1,
+1647.1,
+1648.1,
+1649.1,
+1650.1,
+1651.1,
+1652.1,
+1653.1,
+1654.1,
+1655.1,
+1656.1,
+1657.1,
+1658.1,
+1659.1,
+1660.1,
+1661.1,
+1662.1,
+1663.1,
+1664.1,
+1665.1,
+1666.1,
+1667.1,
+1668.1,
+1669.1,
+1670.1,
+1671.1,
+1672.1,
+1673.1,
+1674.1,
+1675.1,
+1676.1,
+1677.1,
+1678.1,
+1679.1,
+1680.1,
+1681.1,
+1682.1,
+1683.1,
+1684.1,
+1685.1,
+1686.1,
+1687.1,
+1688.1,
+1689.1,
+1690.1,
+1691.1,
+1692.1,
+1693.1,
+1694.1,
+1695.1,
+1696.1,
+1697.1,
+1698.1,
+1699.1,
+1700.1,
+1701.1,
+1702.1,
+1703.1,
+1704.1,
+1705.1,
+1706.1,
+1707.1,
+1708.1,
+1709.1,
+1710.1,
+1711.1,
+1712.1,
+1713.1,
+1714.1,
+1715.1,
+1716.1,
+1717.1,
+1718.1,
+1719.1,
+1720.1,
+1721.1,
+1722.1,
+1723.1,
+1724.1,
+1725.1,
+1726.1,
+1727.1,
+1728.1,
+1729.1,
+1730.1,
+1731.1,
+1732.1,
+1733.1,
+1734.1,
+1735.1,
+1736.1,
+1737.1,
+1738.1,
+1739.1,
+1740.1,
+1741.1,
+1742.1,
+1743.1,
+1744.1,
+1745.1,
+1746.1,
+1747.1,
+1748.1,
+1749.1,
+1750.1,
+1751.1,
+1752.1,
+1753.1,
+1754.1,
+1755.1,
+1756.1,
+1757.1,
+1758.1,
+1759.1,
+1760.1,
+1761.1,
+1762.1,
+1763.1,
+1764.1,
+1765.1,
+1766.1,
+1767.1,
+1768.1,
+1769.1,
+1770.1,
+1771.1,
+1772.1,
+1773.1,
+1774.1,
+1775.1,
+1776.1,
+1777.1,
+1778.1,
+1779.1,
+1780.1,
+1781.1,
+1782.1,
+1783.1,
+1784.1,
+1785.1,
+1786.1,
+1787.1,
+1788.1,
+1789.1,
+1790.1,
+1791.1,
+1792.1,
+1793.1,
+1794.1,
+1795.1,
+1796.1,
+1797.1,
+1798.1,
+1799.1,
+1800.1,
+1801.1,
+1802.1,
+1803.1,
+1804.1,
+1805.1,
+1806.1,
+1807.1,
+1808.1,
+1809.1,
+1810.1,
+1811.1,
+1812.1,
+1813.1,
+1814.1,
+1815.1,
+1816.1,
+1817.1,
+1818.1,
+1819.1,
+1820.1,
+1821.1,
+1822.1,
+1823.1,
+1824.1,
+1825.1,
+1826.1,
+1827.1,
+1828.1,
+1829.1,
+1830.1,
+1831.1,
+1832.1,
+1833.1,
+1834.1,
+1835.1,
+1836.1,
+1837.1,
+1838.1,
+1839.1,
+1840.1,
+1841.1,
+1842.1,
+1843.1,
+1844.1,
+1845.1,
+1846.1,
+1847.1,
+1848.1,
+1849.1,
+1850.1,
+1851.1,
+1852.1,
+1853.1,
+1854.1,
+1855.1,
+1856.1,
+1857.1,
+1858.1,
+1859.1,
+1860.1,
+1861.1,
+1862.1,
+1863.1,
+1864.1,
+1865.1,
+1866.1,
+1867.1,
+1868.1,
+1869.1,
+1870.1,
+1871.1,
+1872.1,
+1873.1,
+1874.1,
+1875.1,
+1876.1,
+1877.1,
+1878.1,
+1879.1,
+1880.1,
+1881.1,
+1882.1,
+1883.1,
+1884.1,
+1885.1,
+1886.1,
+1887.1,
+1888.1,
+1889.1,
+1890.1,
+1891.1,
+1892.1,
+1893.1,
+1894.1,
+1895.1,
+1896.1,
+1897.1,
+1898.1,
+1899.1,
+1900.1,
+1901.1,
+1902.1,
+1903.1,
+1904.1,
+1905.1,
+1906.1,
+1907.1,
+1908.1,
+1909.1,
+1910.1,
+1911.1,
+1912.1,
+1913.1,
+1914.1,
+1915.1,
+1916.1,
+1917.1,
+1918.1,
+1919.1,
+1920.1,
+1921.1,
+1922.1,
+1923.1,
+1924.1,
+1925.1,
+1926.1,
+1927.1,
+1928.1,
+1929.1,
+1930.1,
+1931.1,
+1932.1,
+1933.1,
+1934.1,
+1935.1,
+1936.1,
+1937.1,
+1938.1,
+1939.1,
+1940.1,
+1941.1,
+1942.1,
+1943.1,
+1944.1,
+1945.1,
+1946.1,
+1947.1,
+1948.1,
+1949.1,
+1950.1,
+1951.1,
+1952.1,
+1953.1,
+1954.1,
+1955.1,
+1956.1,
+1957.1,
+1958.1,
+1959.1,
+1960.1,
+1961.1,
+1962.1,
+1963.1,
+1964.1,
+1965.1,
+1966.1,
+1967.1,
+1968.1,
+1969.1,
+1970.1,
+1971.1,
+1972.1,
+1973.1,
+1974.1,
+1975.1,
+1976.1,
+1977.1,
+1978.1,
+1979.1,
+1980.1,
+1981.1,
+1982.1,
+1983.1,
+1984.1,
+1985.1,
+1986.1,
+1987.1,
+1988.1,
+1989.1,
+1990.1,
+1991.1,
+1992.1,
+1993.1,
+1994.1,
+1995.1,
+1996.1,
+1997.1,
+1998.1,
+1999.1,
+2000.1,
+2001.1,
+2002.1,
+2003.1,
+2004.1,
+2005.1,
+2006.1,
+2007.1,
+2008.1,
+2009.1,
+2010.1,
+2011.1,
+2012.1,
+2013.1,
+2014.1,
+2015.1,
+2016.1,
+2017.1,
+2018.1,
+2019.1,
+2020.1,
+2021.1,
+2022.1,
+2023.1,
+2024.1,
+2025.1,
+2026.1,
+2027.1,
+2028.1,
+2029.1,
+2030.1,
+2031.1,
+2032.1,
+2033.1,
+2034.1,
+2035.1,
+2036.1,
+2037.1,
+2038.1,
+2039.1,
+2040.1,
+2041.1,
+2042.1,
+2043.1,
+2044.1,
+2045.1,
+2046.1,
+2047.1,
+2048.1,
+2049.1,
+2050.1,
+2051.1,
+2052.1,
+2053.1,
+2054.1,
+2055.1,
+2056.1,
+2057.1,
+2058.1,
+2059.1,
+2060.1,
+2061.1,
+2062.1,
+2063.1,
+2064.1,
+2065.1,
+2066.1,
+2067.1,
+2068.1,
+2069.1,
+2070.1,
+2071.1,
+2072.1,
+2073.1,
+2074.1,
+2075.1,
+2076.1,
+2077.1,
+2078.1,
+2079.1,
+2080.1,
+2081.1,
+2082.1,
+2083.1,
+2084.1,
+2085.1,
+2086.1,
+2087.1,
+2088.1,
+2089.1,
+2090.1,
+2091.1,
+2092.1,
+2093.1,
+2094.1,
+2095.1,
+2096.1,
+2097.1,
+2098.1,
+2099.1,
+2100.1,
+2101.1,
+2102.1,
+2103.1,
+2104.1,
+2105.1,
+2106.1,
+2107.1,
+2108.1,
+2109.1,
+2110.1,
+2111.1,
+2112.1,
+2113.1,
+2114.1,
+2115.1,
+2116.1,
+2117.1,
+2118.1,
+2119.1,
+2120.1,
+2121.1,
+2122.1,
+2123.1,
+2124.1,
+2125.1,
+2126.1,
+2127.1,
+2128.1,
+2129.1,
+2130.1,
+2131.1,
+2132.1,
+2133.1,
+2134.1,
+2135.1,
+2136.1,
+2137.1,
+2138.1,
+2139.1,
+2140.1,
+2141.1,
+2142.1,
+2143.1,
+2144.1,
+2145.1,
+2146.1,
+2147.1,
+2148.1,
+2149.1,
+2150.1,
+2151.1,
+2152.1,
+2153.1,
+2154.1,
+2155.1,
+2156.1,
+2157.1,
+2158.1,
+2159.1,
+2160.1,
+2161.1,
+2162.1,
+2163.1,
+2164.1,
+2165.1,
+2166.1,
+2167.1,
+2168.1,
+2169.1,
+2170.1,
+2171.1,
+2172.1,
+2173.1,
+2174.1,
+2175.1,
+2176.1,
+2177.1,
+2178.1,
+2179.1,
+2180.1,
+2181.1,
+2182.1,
+2183.1,
+2184.1,
+2185.1,
+2186.1,
+2187.1,
+2188.1,
+2189.1,
+2190.1,
+2191.1,
+2192.1,
+2193.1,
+2194.1,
+2195.1,
+2196.1,
+2197.1,
+2198.1,
+2199.1,
+2200.1,
+2201.1,
+2202.1,
+2203.1,
+2204.1,
+2205.1,
+2206.1,
+2207.1,
+2208.1,
+2209.1,
+2210.1,
+2211.1,
+2212.1,
+2213.1,
+2214.1,
+2215.1,
+2216.1,
+2217.1,
+2218.1,
+2219.1,
+2220.1,
+2221.1,
+2222.1,
+2223.1,
+2224.1,
+2225.1,
+2226.1,
+2227.1,
+2228.1,
+2229.1,
+2230.1,
+2231.1,
+2232.1,
+2233.1,
+2234.1,
+2235.1,
+2236.1,
+2237.1,
+2238.1,
+2239.1,
+2240.1,
+2241.1,
+2242.1,
+2243.1,
+2244.1,
+2245.1,
+2246.1,
+2247.1,
+2248.1,
+2249.1,
+2250.1,
+2251.1,
+2252.1,
+2253.1,
+2254.1,
+2255.1,
+2256.1,
+2257.1,
+2258.1,
+2259.1,
+2260.1,
+2261.1,
+2262.1,
+2263.1,
+2264.1,
+2265.1,
+2266.1,
+2267.1,
+2268.1,
+2269.1,
+2270.1,
+2271.1,
+2272.1,
+2273.1,
+2274.1,
+2275.1,
+2276.1,
+2277.1,
+2278.1,
+2279.1,
+2280.1,
+2281.1,
+2282.1,
+2283.1,
+2284.1,
+2285.1,
+2286.1,
+2287.1,
+2288.1,
+2289.1,
+2290.1,
+2291.1,
+2292.1,
+2293.1,
+2294.1,
+2295.1,
+2296.1,
+2297.1,
+2298.1,
+2299.1,
+2300.1,
+2301.1,
+2302.1,
+2303.1,
+2304.1,
+2305.1,
+2306.1,
+2307.1,
+2308.1,
+2309.1,
+2310.1,
+2311.1,
+2312.1,
+2313.1,
+2314.1,
+2315.1,
+2316.1,
+2317.1,
+2318.1,
+2319.1,
+2320.1,
+2321.1,
+2322.1,
+2323.1,
+2324.1,
+2325.1,
+2326.1,
+2327.1,
+2328.1,
+2329.1,
+2330.1,
+2331.1,
+2332.1,
+2333.1,
+2334.1,
+2335.1,
+2336.1,
+2337.1,
+2338.1,
+2339.1,
+2340.1,
+2341.1,
+2342.1,
+2343.1,
+2344.1,
+2345.1,
+2346.1,
+2347.1,
+2348.1,
+2349.1,
+2350.1,
+2351.1,
+2352.1,
+2353.1,
+2354.1,
+2355.1,
+2356.1,
+2357.1,
+2358.1,
+2359.1,
+2360.1,
+2361.1,
+2362.1,
+2363.1,
+2364.1,
+2365.1,
+2366.1,
+2367.1,
+2368.1,
+2369.1,
+2370.1,
+2371.1,
+2372.1,
+2373.1,
+2374.1,
+2375.1,
+2376.1,
+2377.1,
+2378.1,
+2379.1,
+2380.1,
+2381.1,
+2382.1,
+2383.1,
+2384.1,
+2385.1,
+2386.1,
+2387.1,
+2388.1,
+2389.1,
+2390.1,
+2391.1,
+2392.1,
+2393.1,
+2394.1,
+2395.1,
+2396.1,
+2397.1,
+2398.1,
+2399.1,
+2400.1,
+2401.1,
+2402.1,
+2403.1,
+2404.1,
+2405.1,
+2406.1,
+2407.1,
+2408.1,
+2409.1,
+2410.1,
+2411.1,
+2412.1,
+2413.1,
+2414.1,
+2415.1,
+2416.1,
+2417.1,
+2418.1,
+2419.1,
+2420.1,
+2421.1,
+2422.1,
+2423.1,
+2424.1,
+2425.1,
+2426.1,
+2427.1,
+2428.1,
+2429.1,
+2430.1,
+2431.1,
+2432.1,
+2433.1,
+2434.1,
+2435.1,
+2436.1,
+2437.1,
+2438.1,
+2439.1,
+2440.1,
+2441.1,
+2442.1,
+2443.1,
+2444.1,
+2445.1,
+2446.1,
+2447.1,
+2448.1,
+2449.1,
+2450.1,
+2451.1,
+2452.1,
+2453.1,
+2454.1,
+2455.1,
+2456.1,
+2457.1,
+2458.1,
+2459.1,
+2460.1,
+2461.1,
+2462.1,
+2463.1,
+2464.1,
+2465.1,
+2466.1,
+2467.1,
+2468.1,
+2469.1,
+2470.1,
+2471.1,
+2472.1,
+2473.1,
+2474.1,
+2475.1,
+2476.1,
+2477.1,
+2478.1,
+2479.1,
+2480.1,
+2481.1,
+2482.1,
+2483.1,
+2484.1,
+2485.1,
+2486.1,
+2487.1,
+2488.1,
+2489.1,
+2490.1,
+2491.1,
+2492.1,
+2493.1,
+2494.1,
+2495.1,
+2496.1,
+2497.1,
+2498.1,
+2499.1,
+2500.1,
+2501.1,
+2502.1,
+2503.1,
+2504.1,
+2505.1,
+2506.1,
+2507.1,
+2508.1,
+2509.1,
+2510.1,
+2511.1,
+2512.1,
+2513.1,
+2514.1,
+2515.1,
+2516.1,
+2517.1,
+2518.1,
+2519.1,
+2520.1,
+2521.1,
+2522.1,
+2523.1,
+2524.1,
+2525.1,
+2526.1,
+2527.1,
+2528.1,
+2529.1,
+2530.1,
+2531.1,
+2532.1,
+2533.1,
+2534.1,
+2535.1,
+2536.1,
+2537.1,
+2538.1,
+2539.1,
+2540.1,
+2541.1,
+2542.1,
+2543.1,
+2544.1,
+2545.1,
+2546.1,
+2547.1,
+2548.1,
+2549.1,
+2550.1,
+2551.1,
+2552.1,
+2553.1,
+2554.1,
+2555.1,
+2556.1,
+2557.1,
+2558.1,
+2559.1,
+2560.1,
+2561.1,
+2562.1,
+2563.1,
+2564.1,
+2565.1,
+2566.1,
+2567.1,
+2568.1,
+2569.1,
+2570.1,
+2571.1,
+2572.1,
+2573.1,
+2574.1,
+2575.1,
+2576.1,
+2577.1,
+2578.1,
+2579.1,
+2580.1,
+2581.1,
+2582.1,
+2583.1,
+2584.1,
+2585.1,
+2586.1,
+2587.1,
+2588.1,
+2589.1,
+2590.1,
+2591.1,
+2592.1,
+2593.1,
+2594.1,
+2595.1,
+2596.1,
+2597.1,
+2598.1,
+2599.1,
+2600.1,
+2601.1,
+2602.1,
+2603.1,
+2604.1,
+2605.1,
+2606.1,
+2607.1,
+2608.1,
+2609.1,
+2610.1,
+2611.1,
+2612.1,
+2613.1,
+2614.1,
+2615.1,
+2616.1,
+2617.1,
+2618.1,
+2619.1,
+2620.1,
+2621.1,
+2622.1,
+2623.1,
+2624.1,
+2625.1,
+2626.1,
+2627.1,
+2628.1,
+2629.1,
+2630.1,
+2631.1,
+2632.1,
+2633.1,
+2634.1,
+2635.1,
+2636.1,
+2637.1,
+2638.1,
+2639.1,
+2640.1,
+2641.1,
+2642.1,
+2643.1,
+2644.1,
+2645.1,
+2646.1,
+2647.1,
+2648.1,
+2649.1,
+2650.1,
+2651.1,
+2652.1,
+2653.1,
+2654.1,
+2655.1,
+2656.1,
+2657.1,
+2658.1,
+2659.1,
+2660.1,
+2661.1,
+2662.1,
+2663.1,
+2664.1,
+2665.1,
+2666.1,
+2667.1,
+2668.1,
+2669.1,
+2670.1,
+2671.1,
+2672.1,
+2673.1,
+2674.1,
+2675.1,
+2676.1,
+2677.1,
+2678.1,
+2679.1,
+2680.1,
+2681.1,
+2682.1,
+2683.1,
+2684.1,
+2685.1,
+2686.1,
+2687.1,
+2688.1,
+2689.1,
+2690.1,
+2691.1,
+2692.1,
+2693.1,
+2694.1,
+2695.1,
+2696.1,
+2697.1,
+2698.1,
+2699.1,
+2700.1,
+2701.1,
+2702.1,
+2703.1,
+2704.1,
+2705.1,
+2706.1,
+2707.1,
+2708.1,
+2709.1,
+2710.1,
+2711.1,
+2712.1,
+2713.1,
+2714.1,
+2715.1,
+2716.1,
+2717.1,
+2718.1,
+2719.1,
+2720.1,
+2721.1,
+2722.1,
+2723.1,
+2724.1,
+2725.1,
+2726.1,
+2727.1,
+2728.1,
+2729.1,
+2730.1,
+2731.1,
+2732.1,
+2733.1,
+2734.1,
+2735.1,
+2736.1,
+2737.1,
+2738.1,
+2739.1,
+2740.1,
+2741.1,
+2742.1,
+2743.1,
+2744.1,
+2745.1,
+2746.1,
+2747.1,
+2748.1,
+2749.1,
+2750.1,
+2751.1,
+2752.1,
+2753.1,
+2754.1,
+2755.1,
+2756.1,
+2757.1,
+2758.1,
+2759.1,
+2760.1,
+2761.1,
+2762.1,
+2763.1,
+2764.1,
+2765.1,
+2766.1,
+2767.1,
+2768.1,
+2769.1,
+2770.1,
+2771.1,
+2772.1,
+2773.1,
+2774.1,
+2775.1,
+2776.1,
+2777.1,
+2778.1,
+2779.1,
+2780.1,
+2781.1,
+2782.1,
+2783.1,
+2784.1,
+2785.1,
+2786.1,
+2787.1,
+2788.1,
+2789.1,
+2790.1,
+2791.1,
+2792.1,
+2793.1,
+2794.1,
+2795.1,
+2796.1,
+2797.1,
+2798.1,
+2799.1,
+2800.1,
+2801.1,
+2802.1,
+2803.1,
+2804.1,
+2805.1,
+2806.1,
+2807.1,
+2808.1,
+2809.1,
+2810.1,
+2811.1,
+2812.1,
+2813.1,
+2814.1,
+2815.1,
+2816.1,
+2817.1,
+2818.1,
+2819.1,
+2820.1,
+2821.1,
+2822.1,
+2823.1,
+2824.1,
+2825.1,
+2826.1,
+2827.1,
+2828.1,
+2829.1,
+2830.1,
+2831.1,
+2832.1,
+2833.1,
+2834.1,
+2835.1,
+2836.1,
+2837.1,
+2838.1,
+2839.1,
+2840.1,
+2841.1,
+2842.1,
+2843.1,
+2844.1,
+2845.1,
+2846.1,
+2847.1,
+2848.1,
+2849.1,
+2850.1,
+2851.1,
+2852.1,
+2853.1,
+2854.1,
+2855.1,
+2856.1,
+2857.1,
+2858.1,
+2859.1,
+2860.1,
+2861.1,
+2862.1,
+2863.1,
+2864.1,
+2865.1,
+2866.1,
+2867.1,
+2868.1,
+2869.1,
+2870.1,
+2871.1,
+2872.1,
+2873.1,
+2874.1,
+2875.1,
+2876.1,
+2877.1,
+2878.1,
+2879.1,
+2880.1,
+2881.1,
+2882.1,
+2883.1,
+2884.1,
+2885.1,
+2886.1,
+2887.1,
+2888.1,
+2889.1,
+2890.1,
+2891.1,
+2892.1,
+2893.1,
+2894.1,
+2895.1,
+2896.1,
+2897.1,
+2898.1,
+2899.1,
+2900.1,
+2901.1,
+2902.1,
+2903.1,
+2904.1,
+2905.1,
+2906.1,
+2907.1,
+2908.1,
+2909.1,
+2910.1,
+2911.1,
+2912.1,
+2913.1,
+2914.1,
+2915.1,
+2916.1,
+2917.1,
+2918.1,
+2919.1,
+2920.1,
+2921.1,
+2922.1,
+2923.1,
+2924.1,
+2925.1,
+2926.1,
+2927.1,
+2928.1,
+2929.1,
+2930.1,
+2931.1,
+2932.1,
+2933.1,
+2934.1,
+2935.1,
+2936.1,
+2937.1,
+2938.1,
+2939.1,
+2940.1,
+2941.1,
+2942.1,
+2943.1,
+2944.1,
+2945.1,
+2946.1,
+2947.1,
+2948.1,
+2949.1,
+2950.1,
+2951.1,
+2952.1,
+2953.1,
+2954.1,
+2955.1,
+2956.1,
+2957.1,
+2958.1,
+2959.1,
+2960.1,
+2961.1,
+2962.1,
+2963.1,
+2964.1,
+2965.1,
+2966.1,
+2967.1,
+2968.1,
+2969.1,
+2970.1,
+2971.1,
+2972.1,
+2973.1,
+2974.1,
+2975.1,
+2976.1,
+2977.1,
+2978.1,
+2979.1,
+2980.1,
+2981.1,
+2982.1,
+2983.1,
+2984.1,
+2985.1,
+2986.1,
+2987.1,
+2988.1,
+2989.1,
+2990.1,
+2991.1,
+2992.1,
+2993.1,
+2994.1,
+2995.1,
+2996.1,
+2997.1,
+2998.1,
+2999.1,
+3000.1,
+3001.1,
+3002.1,
+3003.1,
+3004.1,
+3005.1,
+3006.1,
+3007.1,
+3008.1,
+3009.1,
+3010.1,
+3011.1,
+3012.1,
+3013.1,
+3014.1,
+3015.1,
+3016.1,
+3017.1,
+3018.1,
+3019.1,
+3020.1,
+3021.1,
+3022.1,
+3023.1,
+3024.1,
+3025.1,
+3026.1,
+3027.1,
+3028.1,
+3029.1,
+3030.1,
+3031.1,
+3032.1,
+3033.1,
+3034.1,
+3035.1,
+3036.1,
+3037.1,
+3038.1,
+3039.1,
+3040.1,
+3041.1,
+3042.1,
+3043.1,
+3044.1,
+3045.1,
+3046.1,
+3047.1,
+3048.1,
+3049.1,
+3050.1,
+3051.1,
+3052.1,
+3053.1,
+3054.1,
+3055.1,
+3056.1,
+3057.1,
+3058.1,
+3059.1,
+3060.1,
+3061.1,
+3062.1,
+3063.1,
+3064.1,
+3065.1,
+3066.1,
+3067.1,
+3068.1,
+3069.1,
+3070.1,
+3071.1,
+3072.1,
+3073.1,
+3074.1,
+3075.1,
+3076.1,
+3077.1,
+3078.1,
+3079.1,
+3080.1,
+3081.1,
+3082.1,
+3083.1,
+3084.1,
+3085.1,
+3086.1,
+3087.1,
+3088.1,
+3089.1,
+3090.1,
+3091.1,
+3092.1,
+3093.1,
+3094.1,
+3095.1,
+3096.1,
+3097.1,
+3098.1,
+3099.1,
+3100.1,
+3101.1,
+3102.1,
+3103.1,
+3104.1,
+3105.1,
+3106.1,
+3107.1,
+3108.1,
+3109.1,
+3110.1,
+3111.1,
+3112.1,
+3113.1,
+3114.1,
+3115.1,
+3116.1,
+3117.1,
+3118.1,
+3119.1,
+3120.1,
+3121.1,
+3122.1,
+3123.1,
+3124.1,
+3125.1,
+3126.1,
+3127.1,
+3128.1,
+3129.1,
+3130.1,
+3131.1,
+3132.1,
+3133.1,
+3134.1,
+3135.1,
+3136.1,
+3137.1,
+3138.1,
+3139.1,
+3140.1,
+3141.1,
+3142.1,
+3143.1,
+3144.1,
+3145.1,
+3146.1,
+3147.1,
+3148.1,
+3149.1,
+3150.1,
+3151.1,
+3152.1,
+3153.1,
+3154.1,
+3155.1,
+3156.1,
+3157.1,
+3158.1,
+3159.1,
+3160.1,
+3161.1,
+3162.1,
+3163.1,
+3164.1,
+3165.1,
+3166.1,
+3167.1,
+3168.1,
+3169.1,
+3170.1,
+3171.1,
+3172.1,
+3173.1,
+3174.1,
+3175.1,
+3176.1,
+3177.1,
+3178.1,
+3179.1,
+3180.1,
+3181.1,
+3182.1,
+3183.1,
+3184.1,
+3185.1,
+3186.1,
+3187.1,
+3188.1,
+3189.1,
+3190.1,
+3191.1,
+3192.1,
+3193.1,
+3194.1,
+3195.1,
+3196.1,
+3197.1,
+3198.1,
+3199.1,
+3200.1,
+3201.1,
+3202.1,
+3203.1,
+3204.1,
+3205.1,
+3206.1,
+3207.1,
+3208.1,
+3209.1,
+3210.1,
+3211.1,
+3212.1,
+3213.1,
+3214.1,
+3215.1,
+3216.1,
+3217.1,
+3218.1,
+3219.1,
+3220.1,
+3221.1,
+3222.1,
+3223.1,
+3224.1,
+3225.1,
+3226.1,
+3227.1,
+3228.1,
+3229.1,
+3230.1,
+3231.1,
+3232.1,
+3233.1,
+3234.1,
+3235.1,
+3236.1,
+3237.1,
+3238.1,
+3239.1,
+3240.1,
+3241.1,
+3242.1,
+3243.1,
+3244.1,
+3245.1,
+3246.1,
+3247.1,
+3248.1,
+3249.1,
+3250.1,
+3251.1,
+3252.1,
+3253.1,
+3254.1,
+3255.1,
+3256.1,
+3257.1,
+3258.1,
+3259.1,
+3260.1,
+3261.1,
+3262.1,
+3263.1,
+3264.1,
+3265.1,
+3266.1,
+3267.1,
+3268.1,
+3269.1,
+3270.1,
+3271.1,
+3272.1,
+3273.1,
+3274.1,
+3275.1,
+3276.1,
+3277.1,
+3278.1,
+3279.1,
+3280.1,
+3281.1,
+3282.1,
+3283.1,
+3284.1,
+3285.1,
+3286.1,
+3287.1,
+3288.1,
+3289.1,
+3290.1,
+3291.1,
+3292.1,
+3293.1,
+3294.1,
+3295.1,
+3296.1,
+3297.1,
+3298.1,
+3299.1,
+3300.1,
+3301.1,
+3302.1,
+3303.1,
+3304.1,
+3305.1,
+3306.1,
+3307.1,
+3308.1,
+3309.1,
+3310.1,
+3311.1,
+3312.1,
+3313.1,
+3314.1,
+3315.1,
+3316.1,
+3317.1,
+3318.1,
+3319.1,
+3320.1,
+3321.1,
+3322.1,
+3323.1,
+3324.1,
+3325.1,
+3326.1,
+3327.1,
+3328.1,
+3329.1,
+3330.1,
+3331.1,
+3332.1,
+3333.1,
+3334.1,
+3335.1,
+3336.1,
+3337.1,
+3338.1,
+3339.1,
+3340.1,
+3341.1,
+3342.1,
+3343.1,
+3344.1,
+3345.1,
+3346.1,
+3347.1,
+3348.1,
+3349.1,
+3350.1,
+3351.1,
+3352.1,
+3353.1,
+3354.1,
+3355.1,
+3356.1,
+3357.1,
+3358.1,
+3359.1,
+3360.1,
+3361.1,
+3362.1,
+3363.1,
+3364.1,
+3365.1,
+3366.1,
+3367.1,
+3368.1,
+3369.1,
+3370.1,
+3371.1,
+3372.1,
+3373.1,
+3374.1,
+3375.1,
+3376.1,
+3377.1,
+3378.1,
+3379.1,
+3380.1,
+3381.1,
+3382.1,
+3383.1,
+3384.1,
+3385.1,
+3386.1,
+3387.1,
+3388.1,
+3389.1,
+3390.1,
+3391.1,
+3392.1,
+3393.1,
+3394.1,
+3395.1,
+3396.1,
+3397.1,
+3398.1,
+3399.1,
+3400.1,
+3401.1,
+3402.1,
+3403.1,
+3404.1,
+3405.1,
+3406.1,
+3407.1,
+3408.1,
+3409.1,
+3410.1,
+3411.1,
+3412.1,
+3413.1,
+3414.1,
+3415.1,
+3416.1,
+3417.1,
+3418.1,
+3419.1,
+3420.1,
+3421.1,
+3422.1,
+3423.1,
+3424.1,
+3425.1,
+3426.1,
+3427.1,
+3428.1,
+3429.1,
+3430.1,
+3431.1,
+3432.1,
+3433.1,
+3434.1,
+3435.1,
+3436.1,
+3437.1,
+3438.1,
+3439.1,
+3440.1,
+3441.1,
+3442.1,
+3443.1,
+3444.1,
+3445.1,
+3446.1,
+3447.1,
+3448.1,
+3449.1,
+3450.1,
+3451.1,
+3452.1,
+3453.1,
+3454.1,
+3455.1,
+3456.1,
+3457.1,
+3458.1,
+3459.1,
+3460.1,
+3461.1,
+3462.1,
+3463.1,
+3464.1,
+3465.1,
+3466.1,
+3467.1,
+3468.1,
+3469.1,
+3470.1,
+3471.1,
+3472.1,
+3473.1,
+3474.1,
+3475.1,
+3476.1,
+3477.1,
+3478.1,
+3479.1,
+3480.1,
+3481.1,
+3482.1,
+3483.1,
+3484.1,
+3485.1,
+3486.1,
+3487.1,
+3488.1,
+3489.1,
+3490.1,
+3491.1,
+3492.1,
+3493.1,
+3494.1,
+3495.1,
+3496.1,
+3497.1,
+3498.1,
+3499.1,
+3500.1,
+3501.1,
+3502.1,
+3503.1,
+3504.1,
+3505.1,
+3506.1,
+3507.1,
+3508.1,
+3509.1,
+3510.1,
+3511.1,
+3512.1,
+3513.1,
+3514.1,
+3515.1,
+3516.1,
+3517.1,
+3518.1,
+3519.1,
+3520.1,
+3521.1,
+3522.1,
+3523.1,
+3524.1,
+3525.1,
+3526.1,
+3527.1,
+3528.1,
+3529.1,
+3530.1,
+3531.1,
+3532.1,
+3533.1,
+3534.1,
+3535.1,
+3536.1,
+3537.1,
+3538.1,
+3539.1,
+3540.1,
+3541.1,
+3542.1,
+3543.1,
+3544.1,
+3545.1,
+3546.1,
+3547.1,
+3548.1,
+3549.1,
+3550.1,
+3551.1,
+3552.1,
+3553.1,
+3554.1,
+3555.1,
+3556.1,
+3557.1,
+3558.1,
+3559.1,
+3560.1,
+3561.1,
+3562.1,
+3563.1,
+3564.1,
+3565.1,
+3566.1,
+3567.1,
+3568.1,
+3569.1,
+3570.1,
+3571.1,
+3572.1,
+3573.1,
+3574.1,
+3575.1,
+3576.1,
+3577.1,
+3578.1,
+3579.1,
+3580.1,
+3581.1,
+3582.1,
+3583.1,
+3584.1,
+3585.1,
+3586.1,
+3587.1,
+3588.1,
+3589.1,
+3590.1,
+3591.1,
+3592.1,
+3593.1,
+3594.1,
+3595.1,
+3596.1,
+3597.1,
+3598.1,
+3599.1,
+3600.1,
+3601.1,
+3602.1,
+3603.1,
+3604.1,
+3605.1,
+3606.1,
+3607.1,
+3608.1,
+3609.1,
+3610.1,
+3611.1,
+3612.1,
+3613.1,
+3614.1,
+3615.1,
+3616.1,
+3617.1,
+3618.1,
+3619.1,
+3620.1,
+3621.1,
+3622.1,
+3623.1,
+3624.1,
+3625.1,
+3626.1,
+3627.1,
+3628.1,
+3629.1,
+3630.1,
+3631.1,
+3632.1,
+3633.1,
+3634.1,
+3635.1,
+3636.1,
+3637.1,
+3638.1,
+3639.1,
+3640.1,
+3641.1,
+3642.1,
+3643.1,
+3644.1,
+3645.1,
+3646.1,
+3647.1,
+3648.1,
+3649.1,
+3650.1,
+3651.1,
+3652.1,
+3653.1,
+3654.1,
+3655.1,
+3656.1,
+3657.1,
+3658.1,
+3659.1,
+3660.1,
+3661.1,
+3662.1,
+3663.1,
+3664.1,
+3665.1,
+3666.1,
+3667.1,
+3668.1,
+3669.1,
+3670.1,
+3671.1,
+3672.1,
+3673.1,
+3674.1,
+3675.1,
+3676.1,
+3677.1,
+3678.1,
+3679.1,
+3680.1,
+3681.1,
+3682.1,
+3683.1,
+3684.1,
+3685.1,
+3686.1,
+3687.1,
+3688.1,
+3689.1,
+3690.1,
+3691.1,
+3692.1,
+3693.1,
+3694.1,
+3695.1,
+3696.1,
+3697.1,
+3698.1,
+3699.1,
+3700.1,
+3701.1,
+3702.1,
+3703.1,
+3704.1,
+3705.1,
+3706.1,
+3707.1,
+3708.1,
+3709.1,
+3710.1,
+3711.1,
+3712.1,
+3713.1,
+3714.1,
+3715.1,
+3716.1,
+3717.1,
+3718.1,
+3719.1,
+3720.1,
+3721.1,
+3722.1,
+3723.1,
+3724.1,
+3725.1,
+3726.1,
+3727.1,
+3728.1,
+3729.1,
+3730.1,
+3731.1,
+3732.1,
+3733.1,
+3734.1,
+3735.1,
+3736.1,
+3737.1,
+3738.1,
+3739.1,
+3740.1,
+3741.1,
+3742.1,
+3743.1,
+3744.1,
+3745.1,
+3746.1,
+3747.1,
+3748.1,
+3749.1,
+3750.1,
+3751.1,
+3752.1,
+3753.1,
+3754.1,
+3755.1,
+3756.1,
+3757.1,
+3758.1,
+3759.1,
+3760.1,
+3761.1,
+3762.1,
+3763.1,
+3764.1,
+3765.1,
+3766.1,
+3767.1,
+3768.1,
+3769.1,
+3770.1,
+3771.1,
+3772.1,
+3773.1,
+3774.1,
+3775.1,
+3776.1,
+3777.1,
+3778.1,
+3779.1,
+3780.1,
+3781.1,
+3782.1,
+3783.1,
+3784.1,
+3785.1,
+3786.1,
+3787.1,
+3788.1,
+3789.1,
+3790.1,
+3791.1,
+3792.1,
+3793.1,
+3794.1,
+3795.1,
+3796.1,
+3797.1,
+3798.1,
+3799.1,
+3800.1,
+3801.1,
+3802.1,
+3803.1,
+3804.1,
+3805.1,
+3806.1,
+3807.1,
+3808.1,
+3809.1,
+3810.1,
+3811.1,
+3812.1,
+3813.1,
+3814.1,
+3815.1,
+3816.1,
+3817.1,
+3818.1,
+3819.1,
+3820.1,
+3821.1,
+3822.1,
+3823.1,
+3824.1,
+3825.1,
+3826.1,
+3827.1,
+3828.1,
+3829.1,
+3830.1,
+3831.1,
+3832.1,
+3833.1,
+3834.1,
+3835.1,
+3836.1,
+3837.1,
+3838.1,
+3839.1,
+3840.1,
+3841.1,
+3842.1,
+3843.1,
+3844.1,
+3845.1,
+3846.1,
+3847.1,
+3848.1,
+3849.1,
+3850.1,
+3851.1,
+3852.1,
+3853.1,
+3854.1,
+3855.1,
+3856.1,
+3857.1,
+3858.1,
+3859.1,
+3860.1,
+3861.1,
+3862.1,
+3863.1,
+3864.1,
+3865.1,
+3866.1,
+3867.1,
+3868.1,
+3869.1,
+3870.1,
+3871.1,
+3872.1,
+3873.1,
+3874.1,
+3875.1,
+3876.1,
+3877.1,
+3878.1,
+3879.1,
+3880.1,
+3881.1,
+3882.1,
+3883.1,
+3884.1,
+3885.1,
+3886.1,
+3887.1,
+3888.1,
+3889.1,
+3890.1,
+3891.1,
+3892.1,
+3893.1,
+3894.1,
+3895.1,
+3896.1,
+3897.1,
+3898.1,
+3899.1,
+3900.1,
+3901.1,
+3902.1,
+3903.1,
+3904.1,
+3905.1,
+3906.1,
+3907.1,
+3908.1,
+3909.1,
+3910.1,
+3911.1,
+3912.1,
+3913.1,
+3914.1,
+3915.1,
+3916.1,
+3917.1,
+3918.1,
+3919.1,
+3920.1,
+3921.1,
+3922.1,
+3923.1,
+3924.1,
+3925.1,
+3926.1,
+3927.1,
+3928.1,
+3929.1,
+3930.1,
+3931.1,
+3932.1,
+3933.1,
+3934.1,
+3935.1,
+3936.1,
+3937.1,
+3938.1,
+3939.1,
+3940.1,
+3941.1,
+3942.1,
+3943.1,
+3944.1,
+3945.1,
+3946.1,
+3947.1,
+3948.1,
+3949.1,
+3950.1,
+3951.1,
+3952.1,
+3953.1,
+3954.1,
+3955.1,
+3956.1,
+3957.1,
+3958.1,
+3959.1,
+3960.1,
+3961.1,
+3962.1,
+3963.1,
+3964.1,
+3965.1,
+3966.1,
+3967.1,
+3968.1,
+3969.1,
+3970.1,
+3971.1,
+3972.1,
+3973.1,
+3974.1,
+3975.1,
+3976.1,
+3977.1,
+3978.1,
+3979.1,
+3980.1,
+3981.1,
+3982.1,
+3983.1,
+3984.1,
+3985.1,
+3986.1,
+3987.1,
+3988.1,
+3989.1,
+3990.1,
+3991.1,
+3992.1,
+3993.1,
+3994.1,
+3995.1,
+3996.1,
+3997.1,
+3998.1,
+3999.1,
+4000.1,
+4001.1,
+4002.1,
+4003.1,
+4004.1,
+4005.1,
+4006.1,
+4007.1,
+4008.1,
+4009.1,
+4010.1,
+4011.1,
+4012.1,
+4013.1,
+4014.1,
+4015.1,
+4016.1,
+4017.1,
+4018.1,
+4019.1,
+4020.1,
+4021.1,
+4022.1,
+4023.1,
+4024.1,
+4025.1,
+4026.1,
+4027.1,
+4028.1,
+4029.1,
+4030.1,
+4031.1,
+4032.1,
+4033.1,
+4034.1,
+4035.1,
+4036.1,
+4037.1,
+4038.1,
+4039.1,
+4040.1,
+4041.1,
+4042.1,
+4043.1,
+4044.1,
+4045.1,
+4046.1,
+4047.1,
+4048.1,
+4049.1,
+4050.1,
+4051.1,
+4052.1,
+4053.1,
+4054.1,
+4055.1,
+4056.1,
+4057.1,
+4058.1,
+4059.1,
+4060.1,
+4061.1,
+4062.1,
+4063.1,
+4064.1,
+4065.1,
+4066.1,
+4067.1,
+4068.1,
+4069.1,
+4070.1,
+4071.1,
+4072.1,
+4073.1,
+4074.1,
+4075.1,
+4076.1,
+4077.1,
+4078.1,
+4079.1,
+4080.1,
+4081.1,
+4082.1,
+4083.1,
+4084.1,
+4085.1,
+4086.1,
+4087.1,
+4088.1,
+4089.1,
+4090.1,
+4091.1,
+4092.1,
+4093.1,
+4094.1,
+4095.1,
+4096.1,
+4097.1,
+4098.1,
+4099.1,
+4100.1,
+4101.1,
+4102.1,
+4103.1,
+4104.1,
+4105.1,
+4106.1,
+4107.1,
+4108.1,
+4109.1,
+4110.1,
+4111.1,
+4112.1,
+4113.1,
+4114.1,
+4115.1,
+4116.1,
+4117.1,
+4118.1,
+4119.1,
+4120.1,
+4121.1,
+4122.1,
+4123.1,
+4124.1,
+4125.1,
+4126.1,
+4127.1,
+4128.1,
+4129.1,
+4130.1,
+4131.1,
+4132.1,
+4133.1,
+4134.1,
+4135.1,
+4136.1,
+4137.1,
+4138.1,
+4139.1,
+4140.1,
+4141.1,
+4142.1,
+4143.1,
+4144.1,
+4145.1,
+4146.1,
+4147.1,
+4148.1,
+4149.1,
+4150.1,
+4151.1,
+4152.1,
+4153.1,
+4154.1,
+4155.1,
+4156.1,
+4157.1,
+4158.1,
+4159.1,
+4160.1,
+4161.1,
+4162.1,
+4163.1,
+4164.1,
+4165.1,
+4166.1,
+4167.1,
+4168.1,
+4169.1,
+4170.1,
+4171.1,
+4172.1,
+4173.1,
+4174.1,
+4175.1,
+4176.1,
+4177.1,
+4178.1,
+4179.1,
+4180.1,
+4181.1,
+4182.1,
+4183.1,
+4184.1,
+4185.1,
+4186.1,
+4187.1,
+4188.1,
+4189.1,
+4190.1,
+4191.1,
+4192.1,
+4193.1,
+4194.1,
+4195.1,
+4196.1,
+4197.1,
+4198.1,
+4199.1,
+4200.1,
+4201.1,
+4202.1,
+4203.1,
+4204.1,
+4205.1,
+4206.1,
+4207.1,
+4208.1,
+4209.1,
+4210.1,
+4211.1,
+4212.1,
+4213.1,
+4214.1,
+4215.1,
+4216.1,
+4217.1,
+4218.1,
+4219.1,
+4220.1,
+4221.1,
+4222.1,
+4223.1,
+4224.1,
+4225.1,
+4226.1,
+4227.1,
+4228.1,
+4229.1,
+4230.1,
+4231.1,
+4232.1,
+4233.1,
+4234.1,
+4235.1,
+4236.1,
+4237.1,
+4238.1,
+4239.1,
+4240.1,
+4241.1,
+4242.1,
+4243.1,
+4244.1,
+4245.1,
+4246.1,
+4247.1,
+4248.1,
+4249.1,
+4250.1,
+4251.1,
+4252.1,
+4253.1,
+4254.1,
+4255.1,
+4256.1,
+4257.1,
+4258.1,
+4259.1,
+4260.1,
+4261.1,
+4262.1,
+4263.1,
+4264.1,
+4265.1,
+4266.1,
+4267.1,
+4268.1,
+4269.1,
+4270.1,
+4271.1,
+4272.1,
+4273.1,
+4274.1,
+4275.1,
+4276.1,
+4277.1,
+4278.1,
+4279.1,
+4280.1,
+4281.1,
+4282.1,
+4283.1,
+4284.1,
+4285.1,
+4286.1,
+4287.1,
+4288.1,
+4289.1,
+4290.1,
+4291.1,
+4292.1,
+4293.1,
+4294.1,
+4295.1,
+4296.1,
+4297.1,
+4298.1,
+4299.1,
+4300.1,
+4301.1,
+4302.1,
+4303.1,
+4304.1,
+4305.1,
+4306.1,
+4307.1,
+4308.1,
+4309.1,
+4310.1,
+4311.1,
+4312.1,
+4313.1,
+4314.1,
+4315.1,
+4316.1,
+4317.1,
+4318.1,
+4319.1,
+4320.1,
+4321.1,
+4322.1,
+4323.1,
+4324.1,
+4325.1,
+4326.1,
+4327.1,
+4328.1,
+4329.1,
+4330.1,
+4331.1,
+4332.1,
+4333.1,
+4334.1,
+4335.1,
+4336.1,
+4337.1,
+4338.1,
+4339.1,
+4340.1,
+4341.1,
+4342.1,
+4343.1,
+4344.1,
+4345.1,
+4346.1,
+4347.1,
+4348.1,
+4349.1,
+4350.1,
+4351.1,
+4352.1,
+4353.1,
+4354.1,
+4355.1,
+4356.1,
+4357.1,
+4358.1,
+4359.1,
+4360.1,
+4361.1,
+4362.1,
+4363.1,
+4364.1,
+4365.1,
+4366.1,
+4367.1,
+4368.1,
+4369.1,
+4370.1,
+4371.1,
+4372.1,
+4373.1,
+4374.1,
+4375.1,
+4376.1,
+4377.1,
+4378.1,
+4379.1,
+4380.1,
+4381.1,
+4382.1,
+4383.1,
+4384.1,
+4385.1,
+4386.1,
+4387.1,
+4388.1,
+4389.1,
+4390.1,
+4391.1,
+4392.1,
+4393.1,
+4394.1,
+4395.1,
+4396.1,
+4397.1,
+4398.1,
+4399.1,
+4400.1,
+4401.1,
+4402.1,
+4403.1,
+4404.1,
+4405.1,
+4406.1,
+4407.1,
+4408.1,
+4409.1,
+4410.1,
+4411.1,
+4412.1,
+4413.1,
+4414.1,
+4415.1,
+4416.1,
+4417.1,
+4418.1,
+4419.1,
+4420.1,
+4421.1,
+4422.1,
+4423.1,
+4424.1,
+4425.1,
+4426.1,
+4427.1,
+4428.1,
+4429.1,
+4430.1,
+4431.1,
+4432.1,
+4433.1,
+4434.1,
+4435.1,
+4436.1,
+4437.1,
+4438.1,
+4439.1,
+4440.1,
+4441.1,
+4442.1,
+4443.1,
+4444.1,
+4445.1,
+4446.1,
+4447.1,
+4448.1,
+4449.1,
+4450.1,
+4451.1,
+4452.1,
+4453.1,
+4454.1,
+4455.1,
+4456.1,
+4457.1,
+4458.1,
+4459.1,
+4460.1,
+4461.1,
+4462.1,
+4463.1,
+4464.1,
+4465.1,
+4466.1,
+4467.1,
+4468.1,
+4469.1,
+4470.1,
+4471.1,
+4472.1,
+4473.1,
+4474.1,
+4475.1,
+4476.1,
+4477.1,
+4478.1,
+4479.1,
+4480.1,
+4481.1,
+4482.1,
+4483.1,
+4484.1,
+4485.1,
+4486.1,
+4487.1,
+4488.1,
+4489.1,
+4490.1,
+4491.1,
+4492.1,
+4493.1,
+4494.1,
+4495.1,
+4496.1,
+4497.1,
+4498.1,
+4499.1,
+4500.1,
+4501.1,
+4502.1,
+4503.1,
+4504.1,
+4505.1,
+4506.1,
+4507.1,
+4508.1,
+4509.1,
+4510.1,
+4511.1,
+4512.1,
+4513.1,
+4514.1,
+4515.1,
+4516.1,
+4517.1,
+4518.1,
+4519.1,
+4520.1,
+4521.1,
+4522.1,
+4523.1,
+4524.1,
+4525.1,
+4526.1,
+4527.1,
+4528.1,
+4529.1,
+4530.1,
+4531.1,
+4532.1,
+4533.1,
+4534.1,
+4535.1,
+4536.1,
+4537.1,
+4538.1,
+4539.1,
+4540.1,
+4541.1,
+4542.1,
+4543.1,
+4544.1,
+4545.1,
+4546.1,
+4547.1,
+4548.1,
+4549.1,
+4550.1,
+4551.1,
+4552.1,
+4553.1,
+4554.1,
+4555.1,
+4556.1,
+4557.1,
+4558.1,
+4559.1,
+4560.1,
+4561.1,
+4562.1,
+4563.1,
+4564.1,
+4565.1,
+4566.1,
+4567.1,
+4568.1,
+4569.1,
+4570.1,
+4571.1,
+4572.1,
+4573.1,
+4574.1,
+4575.1,
+4576.1,
+4577.1,
+4578.1,
+4579.1,
+4580.1,
+4581.1,
+4582.1,
+4583.1,
+4584.1,
+4585.1,
+4586.1,
+4587.1,
+4588.1,
+4589.1,
+4590.1,
+4591.1,
+4592.1,
+4593.1,
+4594.1,
+4595.1,
+4596.1,
+4597.1,
+4598.1,
+4599.1,
+4600.1,
+4601.1,
+4602.1,
+4603.1,
+4604.1,
+4605.1,
+4606.1,
+4607.1,
+4608.1,
+4609.1,
+4610.1,
+4611.1,
+4612.1,
+4613.1,
+4614.1,
+4615.1,
+4616.1,
+4617.1,
+4618.1,
+4619.1,
+4620.1,
+4621.1,
+4622.1,
+4623.1,
+4624.1,
+4625.1,
+4626.1,
+4627.1,
+4628.1,
+4629.1,
+4630.1,
+4631.1,
+4632.1,
+4633.1,
+4634.1,
+4635.1,
+4636.1,
+4637.1,
+4638.1,
+4639.1,
+4640.1,
+4641.1,
+4642.1,
+4643.1,
+4644.1,
+4645.1,
+4646.1,
+4647.1,
+4648.1,
+4649.1,
+4650.1,
+4651.1,
+4652.1,
+4653.1,
+4654.1,
+4655.1,
+4656.1,
+4657.1,
+4658.1,
+4659.1,
+4660.1,
+4661.1,
+4662.1,
+4663.1,
+4664.1,
+4665.1,
+4666.1,
+4667.1,
+4668.1,
+4669.1,
+4670.1,
+4671.1,
+4672.1,
+4673.1,
+4674.1,
+4675.1,
+4676.1,
+4677.1,
+4678.1,
+4679.1,
+4680.1,
+4681.1,
+4682.1,
+4683.1,
+4684.1,
+4685.1,
+4686.1,
+4687.1,
+4688.1,
+4689.1,
+4690.1,
+4691.1,
+4692.1,
+4693.1,
+4694.1,
+4695.1,
+4696.1,
+4697.1,
+4698.1,
+4699.1,
+4700.1,
+4701.1,
+4702.1,
+4703.1,
+4704.1,
+4705.1,
+4706.1,
+4707.1,
+4708.1,
+4709.1,
+4710.1,
+4711.1,
+4712.1,
+4713.1,
+4714.1,
+4715.1,
+4716.1,
+4717.1,
+4718.1,
+4719.1,
+4720.1,
+4721.1,
+4722.1,
+4723.1,
+4724.1,
+4725.1,
+4726.1,
+4727.1,
+4728.1,
+4729.1,
+4730.1,
+4731.1,
+4732.1,
+4733.1,
+4734.1,
+4735.1,
+4736.1,
+4737.1,
+4738.1,
+4739.1,
+4740.1,
+4741.1,
+4742.1,
+4743.1,
+4744.1,
+4745.1,
+4746.1,
+4747.1,
+4748.1,
+4749.1,
+4750.1,
+4751.1,
+4752.1,
+4753.1,
+4754.1,
+4755.1,
+4756.1,
+4757.1,
+4758.1,
+4759.1,
+4760.1,
+4761.1,
+4762.1,
+4763.1,
+4764.1,
+4765.1,
+4766.1,
+4767.1,
+4768.1,
+4769.1,
+4770.1,
+4771.1,
+4772.1,
+4773.1,
+4774.1,
+4775.1,
+4776.1,
+4777.1,
+4778.1,
+4779.1,
+4780.1,
+4781.1,
+4782.1,
+4783.1,
+4784.1,
+4785.1,
+4786.1,
+4787.1,
+4788.1,
+4789.1,
+4790.1,
+4791.1,
+4792.1,
+4793.1,
+4794.1,
+4795.1,
+4796.1,
+4797.1,
+4798.1,
+4799.1,
+4800.1,
+4801.1,
+4802.1,
+4803.1,
+4804.1,
+4805.1,
+4806.1,
+4807.1,
+4808.1,
+4809.1,
+4810.1,
+4811.1,
+4812.1,
+4813.1,
+4814.1,
+4815.1,
+4816.1,
+4817.1,
+4818.1,
+4819.1,
+4820.1,
+4821.1,
+4822.1,
+4823.1,
+4824.1,
+4825.1,
+4826.1,
+4827.1,
+4828.1,
+4829.1,
+4830.1,
+4831.1,
+4832.1,
+4833.1,
+4834.1,
+4835.1,
+4836.1,
+4837.1,
+4838.1,
+4839.1,
+4840.1,
+4841.1,
+4842.1,
+4843.1,
+4844.1,
+4845.1,
+4846.1,
+4847.1,
+4848.1,
+4849.1,
+4850.1,
+4851.1,
+4852.1,
+4853.1,
+4854.1,
+4855.1,
+4856.1,
+4857.1,
+4858.1,
+4859.1,
+4860.1,
+4861.1,
+4862.1,
+4863.1,
+4864.1,
+4865.1,
+4866.1,
+4867.1,
+4868.1,
+4869.1,
+4870.1,
+4871.1,
+4872.1,
+4873.1,
+4874.1,
+4875.1,
+4876.1,
+4877.1,
+4878.1,
+4879.1,
+4880.1,
+4881.1,
+4882.1,
+4883.1,
+4884.1,
+4885.1,
+4886.1,
+4887.1,
+4888.1,
+4889.1,
+4890.1,
+4891.1,
+4892.1,
+4893.1,
+4894.1,
+4895.1,
+4896.1,
+4897.1,
+4898.1,
+4899.1,
+4900.1,
+4901.1,
+4902.1,
+4903.1,
+4904.1,
+4905.1,
+4906.1,
+4907.1,
+4908.1,
+4909.1,
+4910.1,
+4911.1,
+4912.1,
+4913.1,
+4914.1,
+4915.1,
+4916.1,
+4917.1,
+4918.1,
+4919.1,
+4920.1,
+4921.1,
+4922.1,
+4923.1,
+4924.1,
+4925.1,
+4926.1,
+4927.1,
+4928.1,
+4929.1,
+4930.1,
+4931.1,
+4932.1,
+4933.1,
+4934.1,
+4935.1,
+4936.1,
+4937.1,
+4938.1,
+4939.1,
+4940.1,
+4941.1,
+4942.1,
+4943.1,
+4944.1,
+4945.1,
+4946.1,
+4947.1,
+4948.1,
+4949.1,
+4950.1,
+4951.1,
+4952.1,
+4953.1,
+4954.1,
+4955.1,
+4956.1,
+4957.1,
+4958.1,
+4959.1,
+4960.1,
+4961.1,
+4962.1,
+4963.1,
+4964.1,
+4965.1,
+4966.1,
+4967.1,
+4968.1,
+4969.1,
+4970.1,
+4971.1,
+4972.1,
+4973.1,
+4974.1,
+4975.1,
+4976.1,
+4977.1,
+4978.1,
+4979.1,
+4980.1,
+4981.1,
+4982.1,
+4983.1,
+4984.1,
+4985.1,
+4986.1,
+4987.1,
+4988.1,
+4989.1,
+4990.1,
+4991.1,
+4992.1,
+4993.1,
+4994.1,
+4995.1,
+4996.1,
+4997.1,
+4998.1,
+4999.1,
+5000.1,
+5001.1,
+5002.1,
+5003.1,
+5004.1,
+5005.1,
+5006.1,
+5007.1,
+5008.1,
+5009.1,
+5010.1,
+5011.1,
+5012.1,
+5013.1,
+5014.1,
+5015.1,
+5016.1,
+5017.1,
+5018.1,
+5019.1,
+5020.1,
+5021.1,
+5022.1,
+5023.1,
+5024.1,
+5025.1,
+5026.1,
+5027.1,
+5028.1,
+5029.1,
+5030.1,
+5031.1,
+5032.1,
+5033.1,
+5034.1,
+5035.1,
+5036.1,
+5037.1,
+5038.1,
+5039.1,
+5040.1,
+5041.1,
+5042.1,
+5043.1,
+5044.1,
+5045.1,
+5046.1,
+5047.1,
+5048.1,
+5049.1,
+5050.1,
+5051.1,
+5052.1,
+5053.1,
+5054.1,
+5055.1,
+5056.1,
+5057.1,
+5058.1,
+5059.1,
+5060.1,
+5061.1,
+5062.1,
+5063.1,
+5064.1,
+5065.1,
+5066.1,
+5067.1,
+5068.1,
+5069.1,
+5070.1,
+5071.1,
+5072.1,
+5073.1,
+5074.1,
+5075.1,
+5076.1,
+5077.1,
+5078.1,
+5079.1,
+5080.1,
+5081.1,
+5082.1,
+5083.1,
+5084.1,
+5085.1,
+5086.1,
+5087.1,
+5088.1,
+5089.1,
+5090.1,
+5091.1,
+5092.1,
+5093.1,
+5094.1,
+5095.1,
+5096.1,
+5097.1,
+5098.1,
+5099.1,
+5100.1,
+5101.1,
+5102.1,
+5103.1,
+5104.1,
+5105.1,
+5106.1,
+5107.1,
+5108.1,
+5109.1,
+5110.1,
+5111.1,
+5112.1,
+5113.1,
+5114.1,
+5115.1,
+5116.1,
+5117.1,
+5118.1,
+5119.1,
+5120.1,
+5121.1,
+5122.1,
+5123.1,
+5124.1,
+5125.1,
+5126.1,
+5127.1,
+5128.1,
+5129.1,
+5130.1,
+5131.1,
+5132.1,
+5133.1,
+5134.1,
+5135.1,
+5136.1,
+5137.1,
+5138.1,
+5139.1,
+5140.1,
+5141.1,
+5142.1,
+5143.1,
+5144.1,
+5145.1,
+5146.1,
+5147.1,
+5148.1,
+5149.1,
+5150.1,
+5151.1,
+5152.1,
+5153.1,
+5154.1,
+5155.1,
+5156.1,
+5157.1,
+5158.1,
+5159.1,
+5160.1,
+5161.1,
+5162.1,
+5163.1,
+5164.1,
+5165.1,
+5166.1,
+5167.1,
+5168.1,
+5169.1,
+5170.1,
+5171.1,
+5172.1,
+5173.1,
+5174.1,
+5175.1,
+5176.1,
+5177.1,
+5178.1,
+5179.1,
+5180.1,
+5181.1,
+5182.1,
+5183.1,
+5184.1,
+5185.1,
+5186.1,
+5187.1,
+5188.1,
+5189.1,
+5190.1,
+5191.1,
+5192.1,
+5193.1,
+5194.1,
+5195.1,
+5196.1,
+5197.1,
+5198.1,
+5199.1,
+5200.1,
+5201.1,
+5202.1,
+5203.1,
+5204.1,
+5205.1,
+5206.1,
+5207.1,
+5208.1,
+5209.1,
+5210.1,
+5211.1,
+5212.1,
+5213.1,
+5214.1,
+5215.1,
+5216.1,
+5217.1,
+5218.1,
+5219.1,
+5220.1,
+5221.1,
+5222.1,
+5223.1,
+5224.1,
+5225.1,
+5226.1,
+5227.1,
+5228.1,
+5229.1,
+5230.1,
+5231.1,
+5232.1,
+5233.1,
+5234.1,
+5235.1,
+5236.1,
+5237.1,
+5238.1,
+5239.1,
+5240.1,
+5241.1,
+5242.1,
+5243.1,
+5244.1,
+5245.1,
+5246.1,
+5247.1,
+5248.1,
+5249.1,
+5250.1,
+5251.1,
+5252.1,
+5253.1,
+5254.1,
+5255.1,
+5256.1,
+5257.1,
+5258.1,
+5259.1,
+5260.1,
+5261.1,
+5262.1,
+5263.1,
+5264.1,
+5265.1,
+5266.1,
+5267.1,
+5268.1,
+5269.1,
+5270.1,
+5271.1,
+5272.1,
+5273.1,
+5274.1,
+5275.1,
+5276.1,
+5277.1,
+5278.1,
+5279.1,
+5280.1,
+5281.1,
+5282.1,
+5283.1,
+5284.1,
+5285.1,
+5286.1,
+5287.1,
+5288.1,
+5289.1,
+5290.1,
+5291.1,
+5292.1,
+5293.1,
+5294.1,
+5295.1,
+5296.1,
+5297.1,
+5298.1,
+5299.1,
+5300.1,
+5301.1,
+5302.1,
+5303.1,
+5304.1,
+5305.1,
+5306.1,
+5307.1,
+5308.1,
+5309.1,
+5310.1,
+5311.1,
+5312.1,
+5313.1,
+5314.1,
+5315.1,
+5316.1,
+5317.1,
+5318.1,
+5319.1,
+5320.1,
+5321.1,
+5322.1,
+5323.1,
+5324.1,
+5325.1,
+5326.1,
+5327.1,
+5328.1,
+5329.1,
+5330.1,
+5331.1,
+5332.1,
+5333.1,
+5334.1,
+5335.1,
+5336.1,
+5337.1,
+5338.1,
+5339.1,
+5340.1,
+5341.1,
+5342.1,
+5343.1,
+5344.1,
+5345.1,
+5346.1,
+5347.1,
+5348.1,
+5349.1,
+5350.1,
+5351.1,
+5352.1,
+5353.1,
+5354.1,
+5355.1,
+5356.1,
+5357.1,
+5358.1,
+5359.1,
+5360.1,
+5361.1,
+5362.1,
+5363.1,
+5364.1,
+5365.1,
+5366.1,
+5367.1,
+5368.1,
+5369.1,
+5370.1,
+5371.1,
+5372.1,
+5373.1,
+5374.1,
+5375.1,
+5376.1,
+5377.1,
+5378.1,
+5379.1,
+5380.1,
+5381.1,
+5382.1,
+5383.1,
+5384.1,
+5385.1,
+5386.1,
+5387.1,
+5388.1,
+5389.1,
+5390.1,
+5391.1,
+5392.1,
+5393.1,
+5394.1,
+5395.1,
+5396.1,
+5397.1,
+5398.1,
+5399.1,
+5400.1,
+5401.1,
+5402.1,
+5403.1,
+5404.1,
+5405.1,
+5406.1,
+5407.1,
+5408.1,
+5409.1,
+5410.1,
+5411.1,
+5412.1,
+5413.1,
+5414.1,
+5415.1,
+5416.1,
+5417.1,
+5418.1,
+5419.1,
+5420.1,
+5421.1,
+5422.1,
+5423.1,
+5424.1,
+5425.1,
+5426.1,
+5427.1,
+5428.1,
+5429.1,
+5430.1,
+5431.1,
+5432.1,
+5433.1,
+5434.1,
+5435.1,
+5436.1,
+5437.1,
+5438.1,
+5439.1,
+5440.1,
+5441.1,
+5442.1,
+5443.1,
+5444.1,
+5445.1,
+5446.1,
+5447.1,
+5448.1,
+5449.1,
+5450.1,
+5451.1,
+5452.1,
+5453.1,
+5454.1,
+5455.1,
+5456.1,
+5457.1,
+5458.1,
+5459.1,
+5460.1,
+5461.1,
+5462.1,
+5463.1,
+5464.1,
+5465.1,
+5466.1,
+5467.1,
+5468.1,
+5469.1,
+5470.1,
+5471.1,
+5472.1,
+5473.1,
+5474.1,
+5475.1,
+5476.1,
+5477.1,
+5478.1,
+5479.1,
+5480.1,
+5481.1,
+5482.1,
+5483.1,
+5484.1,
+5485.1,
+5486.1,
+5487.1,
+5488.1,
+5489.1,
+5490.1,
+5491.1,
+5492.1,
+5493.1,
+5494.1,
+5495.1,
+5496.1,
+5497.1,
+5498.1,
+5499.1,
+5500.1,
+5501.1,
+5502.1,
+5503.1,
+5504.1,
+5505.1,
+5506.1,
+5507.1,
+5508.1,
+5509.1,
+5510.1,
+5511.1,
+5512.1,
+5513.1,
+5514.1,
+5515.1,
+5516.1,
+5517.1,
+5518.1,
+5519.1,
+5520.1,
+5521.1,
+5522.1,
+5523.1,
+5524.1,
+5525.1,
+5526.1,
+5527.1,
+5528.1,
+5529.1,
+5530.1,
+5531.1,
+5532.1,
+5533.1,
+5534.1,
+5535.1,
+5536.1,
+5537.1,
+5538.1,
+5539.1,
+5540.1,
+5541.1,
+5542.1,
+5543.1,
+5544.1,
+5545.1,
+5546.1,
+5547.1,
+5548.1,
+5549.1,
+5550.1,
+5551.1,
+5552.1,
+5553.1,
+5554.1,
+5555.1,
+5556.1,
+5557.1,
+5558.1,
+5559.1,
+5560.1,
+5561.1,
+5562.1,
+5563.1,
+5564.1,
+5565.1,
+5566.1,
+5567.1,
+5568.1,
+5569.1,
+5570.1,
+5571.1,
+5572.1,
+5573.1,
+5574.1,
+5575.1,
+5576.1,
+5577.1,
+5578.1,
+5579.1,
+5580.1,
+5581.1,
+5582.1,
+5583.1,
+5584.1,
+5585.1,
+5586.1,
+5587.1,
+5588.1,
+5589.1,
+5590.1,
+5591.1,
+5592.1,
+5593.1,
+5594.1,
+5595.1,
+5596.1,
+5597.1,
+5598.1,
+5599.1,
+5600.1,
+5601.1,
+5602.1,
+5603.1,
+5604.1,
+5605.1,
+5606.1,
+5607.1,
+5608.1,
+5609.1,
+5610.1,
+5611.1,
+5612.1,
+5613.1,
+5614.1,
+5615.1,
+5616.1,
+5617.1,
+5618.1,
+5619.1,
+5620.1,
+5621.1,
+5622.1,
+5623.1,
+5624.1,
+5625.1,
+5626.1,
+5627.1,
+5628.1,
+5629.1,
+5630.1,
+5631.1,
+5632.1,
+5633.1,
+5634.1,
+5635.1,
+5636.1,
+5637.1,
+5638.1,
+5639.1,
+5640.1,
+5641.1,
+5642.1,
+5643.1,
+5644.1,
+5645.1,
+5646.1,
+5647.1,
+5648.1,
+5649.1,
+5650.1,
+5651.1,
+5652.1,
+5653.1,
+5654.1,
+5655.1,
+5656.1,
+5657.1,
+5658.1,
+5659.1,
+5660.1,
+5661.1,
+5662.1,
+5663.1,
+5664.1,
+5665.1,
+5666.1,
+5667.1,
+5668.1,
+5669.1,
+5670.1,
+5671.1,
+5672.1,
+5673.1,
+5674.1,
+5675.1,
+5676.1,
+5677.1,
+5678.1,
+5679.1,
+5680.1,
+5681.1,
+5682.1,
+5683.1,
+5684.1,
+5685.1,
+5686.1,
+5687.1,
+5688.1,
+5689.1,
+5690.1,
+5691.1,
+5692.1,
+5693.1,
+5694.1,
+5695.1,
+5696.1,
+5697.1,
+5698.1,
+5699.1,
+5700.1,
+5701.1,
+5702.1,
+5703.1,
+5704.1,
+5705.1,
+5706.1,
+5707.1,
+5708.1,
+5709.1,
+5710.1,
+5711.1,
+5712.1,
+5713.1,
+5714.1,
+5715.1,
+5716.1,
+5717.1,
+5718.1,
+5719.1,
+5720.1,
+5721.1,
+5722.1,
+5723.1,
+5724.1,
+5725.1,
+5726.1,
+5727.1,
+5728.1,
+5729.1,
+5730.1,
+5731.1,
+5732.1,
+5733.1,
+5734.1,
+5735.1,
+5736.1,
+5737.1,
+5738.1,
+5739.1,
+5740.1,
+5741.1,
+5742.1,
+5743.1,
+5744.1,
+5745.1,
+5746.1,
+5747.1,
+5748.1,
+5749.1,
+5750.1,
+5751.1,
+5752.1,
+5753.1,
+5754.1,
+5755.1,
+5756.1,
+5757.1,
+5758.1,
+5759.1,
+5760.1,
+5761.1,
+5762.1,
+5763.1,
+5764.1,
+5765.1,
+5766.1,
+5767.1,
+5768.1,
+5769.1,
+5770.1,
+5771.1,
+5772.1,
+5773.1,
+5774.1,
+5775.1,
+5776.1,
+5777.1,
+5778.1,
+5779.1,
+5780.1,
+5781.1,
+5782.1,
+5783.1,
+5784.1,
+5785.1,
+5786.1,
+5787.1,
+5788.1,
+5789.1,
+5790.1,
+5791.1,
+5792.1,
+5793.1,
+5794.1,
+5795.1,
+5796.1,
+5797.1,
+5798.1,
+5799.1,
+5800.1,
+5801.1,
+5802.1,
+5803.1,
+5804.1,
+5805.1,
+5806.1,
+5807.1,
+5808.1,
+5809.1,
+5810.1,
+5811.1,
+5812.1,
+5813.1,
+5814.1,
+5815.1,
+5816.1,
+5817.1,
+5818.1,
+5819.1,
+5820.1,
+5821.1,
+5822.1,
+5823.1,
+5824.1,
+5825.1,
+5826.1,
+5827.1,
+5828.1,
+5829.1,
+5830.1,
+5831.1,
+5832.1,
+5833.1,
+5834.1,
+5835.1,
+5836.1,
+5837.1,
+5838.1,
+5839.1,
+5840.1,
+5841.1,
+5842.1,
+5843.1,
+5844.1,
+5845.1,
+5846.1,
+5847.1,
+5848.1,
+5849.1,
+5850.1,
+5851.1,
+5852.1,
+5853.1,
+5854.1,
+5855.1,
+5856.1,
+5857.1,
+5858.1,
+5859.1,
+5860.1,
+5861.1,
+5862.1,
+5863.1,
+5864.1,
+5865.1,
+5866.1,
+5867.1,
+5868.1,
+5869.1,
+5870.1,
+5871.1,
+5872.1,
+5873.1,
+5874.1,
+5875.1,
+5876.1,
+5877.1,
+5878.1,
+5879.1,
+5880.1,
+5881.1,
+5882.1,
+5883.1,
+5884.1,
+5885.1,
+5886.1,
+5887.1,
+5888.1,
+5889.1,
+5890.1,
+5891.1,
+5892.1,
+5893.1,
+5894.1,
+5895.1,
+5896.1,
+5897.1,
+5898.1,
+5899.1,
+5900.1,
+5901.1,
+5902.1,
+5903.1,
+5904.1,
+5905.1,
+5906.1,
+5907.1,
+5908.1,
+5909.1,
+5910.1,
+5911.1,
+5912.1,
+5913.1,
+5914.1,
+5915.1,
+5916.1,
+5917.1,
+5918.1,
+5919.1,
+5920.1,
+5921.1,
+5922.1,
+5923.1,
+5924.1,
+5925.1,
+5926.1,
+5927.1,
+5928.1,
+5929.1,
+5930.1,
+5931.1,
+5932.1,
+5933.1,
+5934.1,
+5935.1,
+5936.1,
+5937.1,
+5938.1,
+5939.1,
+5940.1,
+5941.1,
+5942.1,
+5943.1,
+5944.1,
+5945.1,
+5946.1,
+5947.1,
+5948.1,
+5949.1,
+5950.1,
+5951.1,
+5952.1,
+5953.1,
+5954.1,
+5955.1,
+5956.1,
+5957.1,
+5958.1,
+5959.1,
+5960.1,
+5961.1,
+5962.1,
+5963.1,
+5964.1,
+5965.1,
+5966.1,
+5967.1,
+5968.1,
+5969.1,
+5970.1,
+5971.1,
+5972.1,
+5973.1,
+5974.1,
+5975.1,
+5976.1,
+5977.1,
+5978.1,
+5979.1,
+5980.1,
+5981.1,
+5982.1,
+5983.1,
+5984.1,
+5985.1,
+5986.1,
+5987.1,
+5988.1,
+5989.1,
+5990.1,
+5991.1,
+5992.1,
+5993.1,
+5994.1,
+5995.1,
+5996.1,
+5997.1,
+5998.1,
+5999.1,
+6000.1,
+6001.1,
+6002.1,
+6003.1,
+6004.1,
+6005.1,
+6006.1,
+6007.1,
+6008.1,
+6009.1,
+6010.1,
+6011.1,
+6012.1,
+6013.1,
+6014.1,
+6015.1,
+6016.1,
+6017.1,
+6018.1,
+6019.1,
+6020.1,
+6021.1,
+6022.1,
+6023.1,
+6024.1,
+6025.1,
+6026.1,
+6027.1,
+6028.1,
+6029.1,
+6030.1,
+6031.1,
+6032.1,
+6033.1,
+6034.1,
+6035.1,
+6036.1,
+6037.1,
+6038.1,
+6039.1,
+6040.1,
+6041.1,
+6042.1,
+6043.1,
+6044.1,
+6045.1,
+6046.1,
+6047.1,
+6048.1,
+6049.1,
+6050.1,
+6051.1,
+6052.1,
+6053.1,
+6054.1,
+6055.1,
+6056.1,
+6057.1,
+6058.1,
+6059.1,
+6060.1,
+6061.1,
+6062.1,
+6063.1,
+6064.1,
+6065.1,
+6066.1,
+6067.1,
+6068.1,
+6069.1,
+6070.1,
+6071.1,
+6072.1,
+6073.1,
+6074.1,
+6075.1,
+6076.1,
+6077.1,
+6078.1,
+6079.1,
+6080.1,
+6081.1,
+6082.1,
+6083.1,
+6084.1,
+6085.1,
+6086.1,
+6087.1,
+6088.1,
+6089.1,
+6090.1,
+6091.1,
+6092.1,
+6093.1,
+6094.1,
+6095.1,
+6096.1,
+6097.1,
+6098.1,
+6099.1,
+6100.1,
+6101.1,
+6102.1,
+6103.1,
+6104.1,
+6105.1,
+6106.1,
+6107.1,
+6108.1,
+6109.1,
+6110.1,
+6111.1,
+6112.1,
+6113.1,
+6114.1,
+6115.1,
+6116.1,
+6117.1,
+6118.1,
+6119.1,
+6120.1,
+6121.1,
+6122.1,
+6123.1,
+6124.1,
+6125.1,
+6126.1,
+6127.1,
+6128.1,
+6129.1,
+6130.1,
+6131.1,
+6132.1,
+6133.1,
+6134.1,
+6135.1,
+6136.1,
+6137.1,
+6138.1,
+6139.1,
+6140.1,
+6141.1,
+6142.1,
+6143.1,
+6144.1,
+6145.1,
+6146.1,
+6147.1,
+6148.1,
+6149.1,
+6150.1,
+6151.1,
+6152.1,
+6153.1,
+6154.1,
+6155.1,
+6156.1,
+6157.1,
+6158.1,
+6159.1,
+6160.1,
+6161.1,
+6162.1,
+6163.1,
+6164.1,
+6165.1,
+6166.1,
+6167.1,
+6168.1,
+6169.1,
+6170.1,
+6171.1,
+6172.1,
+6173.1,
+6174.1,
+6175.1,
+6176.1,
+6177.1,
+6178.1,
+6179.1,
+6180.1,
+6181.1,
+6182.1,
+6183.1,
+6184.1,
+6185.1,
+6186.1,
+6187.1,
+6188.1,
+6189.1,
+6190.1,
+6191.1,
+6192.1,
+6193.1,
+6194.1,
+6195.1,
+6196.1,
+6197.1,
+6198.1,
+6199.1,
+6200.1,
+6201.1,
+6202.1,
+6203.1,
+6204.1,
+6205.1,
+6206.1,
+6207.1,
+6208.1,
+6209.1,
+6210.1,
+6211.1,
+6212.1,
+6213.1,
+6214.1,
+6215.1,
+6216.1,
+6217.1,
+6218.1,
+6219.1,
+6220.1,
+6221.1,
+6222.1,
+6223.1,
+6224.1,
+6225.1,
+6226.1,
+6227.1,
+6228.1,
+6229.1,
+6230.1,
+6231.1,
+6232.1,
+6233.1,
+6234.1,
+6235.1,
+6236.1,
+6237.1,
+6238.1,
+6239.1,
+6240.1,
+6241.1,
+6242.1,
+6243.1,
+6244.1,
+6245.1,
+6246.1,
+6247.1,
+6248.1,
+6249.1,
+6250.1,
+6251.1,
+6252.1,
+6253.1,
+6254.1,
+6255.1,
+6256.1,
+6257.1,
+6258.1,
+6259.1,
+6260.1,
+6261.1,
+6262.1,
+6263.1,
+6264.1,
+6265.1,
+6266.1,
+6267.1,
+6268.1,
+6269.1,
+6270.1,
+6271.1,
+6272.1,
+6273.1,
+6274.1,
+6275.1,
+6276.1,
+6277.1,
+6278.1,
+6279.1,
+6280.1,
+6281.1,
+6282.1,
+6283.1,
+6284.1,
+6285.1,
+6286.1,
+6287.1,
+6288.1,
+6289.1,
+6290.1,
+6291.1,
+6292.1,
+6293.1,
+6294.1,
+6295.1,
+6296.1,
+6297.1,
+6298.1,
+6299.1,
+6300.1,
+6301.1,
+6302.1,
+6303.1,
+6304.1,
+6305.1,
+6306.1,
+6307.1,
+6308.1,
+6309.1,
+6310.1,
+6311.1,
+6312.1,
+6313.1,
+6314.1,
+6315.1,
+6316.1,
+6317.1,
+6318.1,
+6319.1,
+6320.1,
+6321.1,
+6322.1,
+6323.1,
+6324.1,
+6325.1,
+6326.1,
+6327.1,
+6328.1,
+6329.1,
+6330.1,
+6331.1,
+6332.1,
+6333.1,
+6334.1,
+6335.1,
+6336.1,
+6337.1,
+6338.1,
+6339.1,
+6340.1,
+6341.1,
+6342.1,
+6343.1,
+6344.1,
+6345.1,
+6346.1,
+6347.1,
+6348.1,
+6349.1,
+6350.1,
+6351.1,
+6352.1,
+6353.1,
+6354.1,
+6355.1,
+6356.1,
+6357.1,
+6358.1,
+6359.1,
+6360.1,
+6361.1,
+6362.1,
+6363.1,
+6364.1,
+6365.1,
+6366.1,
+6367.1,
+6368.1,
+6369.1,
+6370.1,
+6371.1,
+6372.1,
+6373.1,
+6374.1,
+6375.1,
+6376.1,
+6377.1,
+6378.1,
+6379.1,
+6380.1,
+6381.1,
+6382.1,
+6383.1,
+6384.1,
+6385.1,
+6386.1,
+6387.1,
+6388.1,
+6389.1,
+6390.1,
+6391.1,
+6392.1,
+6393.1,
+6394.1,
+6395.1,
+6396.1,
+6397.1,
+6398.1,
+6399.1,
+6400.1,
+6401.1,
+6402.1,
+6403.1,
+6404.1,
+6405.1,
+6406.1,
+6407.1,
+6408.1,
+6409.1,
+6410.1,
+6411.1,
+6412.1,
+6413.1,
+6414.1,
+6415.1,
+6416.1,
+6417.1,
+6418.1,
+6419.1,
+6420.1,
+6421.1,
+6422.1,
+6423.1,
+6424.1,
+6425.1,
+6426.1,
+6427.1,
+6428.1,
+6429.1,
+6430.1,
+6431.1,
+6432.1,
+6433.1,
+6434.1,
+6435.1,
+6436.1,
+6437.1,
+6438.1,
+6439.1,
+6440.1,
+6441.1,
+6442.1,
+6443.1,
+6444.1,
+6445.1,
+6446.1,
+6447.1,
+6448.1,
+6449.1,
+6450.1,
+6451.1,
+6452.1,
+6453.1,
+6454.1,
+6455.1,
+6456.1,
+6457.1,
+6458.1,
+6459.1,
+6460.1,
+6461.1,
+6462.1,
+6463.1,
+6464.1,
+6465.1,
+6466.1,
+6467.1,
+6468.1,
+6469.1,
+6470.1,
+6471.1,
+6472.1,
+6473.1,
+6474.1,
+6475.1,
+6476.1,
+6477.1,
+6478.1,
+6479.1,
+6480.1,
+6481.1,
+6482.1,
+6483.1,
+6484.1,
+6485.1,
+6486.1,
+6487.1,
+6488.1,
+6489.1,
+6490.1,
+6491.1,
+6492.1,
+6493.1,
+6494.1,
+6495.1,
+6496.1,
+6497.1,
+6498.1,
+6499.1,
+6500.1,
+6501.1,
+6502.1,
+6503.1,
+6504.1,
+6505.1,
+6506.1,
+6507.1,
+6508.1,
+6509.1,
+6510.1,
+6511.1,
+6512.1,
+6513.1,
+6514.1,
+6515.1,
+6516.1,
+6517.1,
+6518.1,
+6519.1,
+6520.1,
+6521.1,
+6522.1,
+6523.1,
+6524.1,
+6525.1,
+6526.1,
+6527.1,
+6528.1,
+6529.1,
+6530.1,
+6531.1,
+6532.1,
+6533.1,
+6534.1,
+6535.1,
+6536.1,
+6537.1,
+6538.1,
+6539.1,
+6540.1,
+6541.1,
+6542.1,
+6543.1,
+6544.1,
+6545.1,
+6546.1,
+6547.1,
+6548.1,
+6549.1,
+6550.1,
+6551.1,
+6552.1,
+6553.1,
+6554.1,
+6555.1,
+6556.1,
+6557.1,
+6558.1,
+6559.1,
+6560.1,
+6561.1,
+6562.1,
+6563.1,
+6564.1,
+6565.1,
+6566.1,
+6567.1,
+6568.1,
+6569.1,
+6570.1,
+6571.1,
+6572.1,
+6573.1,
+6574.1,
+6575.1,
+6576.1,
+6577.1,
+6578.1,
+6579.1,
+6580.1,
+6581.1,
+6582.1,
+6583.1,
+6584.1,
+6585.1,
+6586.1,
+6587.1,
+6588.1,
+6589.1,
+6590.1,
+6591.1,
+6592.1,
+6593.1,
+6594.1,
+6595.1,
+6596.1,
+6597.1,
+6598.1,
+6599.1,
+6600.1,
+6601.1,
+6602.1,
+6603.1,
+6604.1,
+6605.1,
+6606.1,
+6607.1,
+6608.1,
+6609.1,
+6610.1,
+6611.1,
+6612.1,
+6613.1,
+6614.1,
+6615.1,
+6616.1,
+6617.1,
+6618.1,
+6619.1,
+6620.1,
+6621.1,
+6622.1,
+6623.1,
+6624.1,
+6625.1,
+6626.1,
+6627.1,
+6628.1,
+6629.1,
+6630.1,
+6631.1,
+6632.1,
+6633.1,
+6634.1,
+6635.1,
+6636.1,
+6637.1,
+6638.1,
+6639.1,
+6640.1,
+6641.1,
+6642.1,
+6643.1,
+6644.1,
+6645.1,
+6646.1,
+6647.1,
+6648.1,
+6649.1,
+6650.1,
+6651.1,
+6652.1,
+6653.1,
+6654.1,
+6655.1,
+6656.1,
+6657.1,
+6658.1,
+6659.1,
+6660.1,
+6661.1,
+6662.1,
+6663.1,
+6664.1,
+6665.1,
+6666.1,
+6667.1,
+6668.1,
+6669.1,
+6670.1,
+6671.1,
+6672.1,
+6673.1,
+6674.1,
+6675.1,
+6676.1,
+6677.1,
+6678.1,
+6679.1,
+6680.1,
+6681.1,
+6682.1,
+6683.1,
+6684.1,
+6685.1,
+6686.1,
+6687.1,
+6688.1,
+6689.1,
+6690.1,
+6691.1,
+6692.1,
+6693.1,
+6694.1,
+6695.1,
+6696.1,
+6697.1,
+6698.1,
+6699.1,
+6700.1,
+6701.1,
+6702.1,
+6703.1,
+6704.1,
+6705.1,
+6706.1,
+6707.1,
+6708.1,
+6709.1,
+6710.1,
+6711.1,
+6712.1,
+6713.1,
+6714.1,
+6715.1,
+6716.1,
+6717.1,
+6718.1,
+6719.1,
+6720.1,
+6721.1,
+6722.1,
+6723.1,
+6724.1,
+6725.1,
+6726.1,
+6727.1,
+6728.1,
+6729.1,
+6730.1,
+6731.1,
+6732.1,
+6733.1,
+6734.1,
+6735.1,
+6736.1,
+6737.1,
+6738.1,
+6739.1,
+6740.1,
+6741.1,
+6742.1,
+6743.1,
+6744.1,
+6745.1,
+6746.1,
+6747.1,
+6748.1,
+6749.1,
+6750.1,
+6751.1,
+6752.1,
+6753.1,
+6754.1,
+6755.1,
+6756.1,
+6757.1,
+6758.1,
+6759.1,
+6760.1,
+6761.1,
+6762.1,
+6763.1,
+6764.1,
+6765.1,
+6766.1,
+6767.1,
+6768.1,
+6769.1,
+6770.1,
+6771.1,
+6772.1,
+6773.1,
+6774.1,
+6775.1,
+6776.1,
+6777.1,
+6778.1,
+6779.1,
+6780.1,
+6781.1,
+6782.1,
+6783.1,
+6784.1,
+6785.1,
+6786.1,
+6787.1,
+6788.1,
+6789.1,
+6790.1,
+6791.1,
+6792.1,
+6793.1,
+6794.1,
+6795.1,
+6796.1,
+6797.1,
+6798.1,
+6799.1,
+6800.1,
+6801.1,
+6802.1,
+6803.1,
+6804.1,
+6805.1,
+6806.1,
+6807.1,
+6808.1,
+6809.1,
+6810.1,
+6811.1,
+6812.1,
+6813.1,
+6814.1,
+6815.1,
+6816.1,
+6817.1,
+6818.1,
+6819.1,
+6820.1,
+6821.1,
+6822.1,
+6823.1,
+6824.1,
+6825.1,
+6826.1,
+6827.1,
+6828.1,
+6829.1,
+6830.1,
+6831.1,
+6832.1,
+6833.1,
+6834.1,
+6835.1,
+6836.1,
+6837.1,
+6838.1,
+6839.1,
+6840.1,
+6841.1,
+6842.1,
+6843.1,
+6844.1,
+6845.1,
+6846.1,
+6847.1,
+6848.1,
+6849.1,
+6850.1,
+6851.1,
+6852.1,
+6853.1,
+6854.1,
+6855.1,
+6856.1,
+6857.1,
+6858.1,
+6859.1,
+6860.1,
+6861.1,
+6862.1,
+6863.1,
+6864.1,
+6865.1,
+6866.1,
+6867.1,
+6868.1,
+6869.1,
+6870.1,
+6871.1,
+6872.1,
+6873.1,
+6874.1,
+6875.1,
+6876.1,
+6877.1,
+6878.1,
+6879.1,
+6880.1,
+6881.1,
+6882.1,
+6883.1,
+6884.1,
+6885.1,
+6886.1,
+6887.1,
+6888.1,
+6889.1,
+6890.1,
+6891.1,
+6892.1,
+6893.1,
+6894.1,
+6895.1,
+6896.1,
+6897.1,
+6898.1,
+6899.1,
+6900.1,
+6901.1,
+6902.1,
+6903.1,
+6904.1,
+6905.1,
+6906.1,
+6907.1,
+6908.1,
+6909.1,
+6910.1,
+6911.1,
+6912.1,
+6913.1,
+6914.1,
+6915.1,
+6916.1,
+6917.1,
+6918.1,
+6919.1,
+6920.1,
+6921.1,
+6922.1,
+6923.1,
+6924.1,
+6925.1,
+6926.1,
+6927.1,
+6928.1,
+6929.1,
+6930.1,
+6931.1,
+6932.1,
+6933.1,
+6934.1,
+6935.1,
+6936.1,
+6937.1,
+6938.1,
+6939.1,
+6940.1,
+6941.1,
+6942.1,
+6943.1,
+6944.1,
+6945.1,
+6946.1,
+6947.1,
+6948.1,
+6949.1,
+6950.1,
+6951.1,
+6952.1,
+6953.1,
+6954.1,
+6955.1,
+6956.1,
+6957.1,
+6958.1,
+6959.1,
+6960.1,
+6961.1,
+6962.1,
+6963.1,
+6964.1,
+6965.1,
+6966.1,
+6967.1,
+6968.1,
+6969.1,
+6970.1,
+6971.1,
+6972.1,
+6973.1,
+6974.1,
+6975.1,
+6976.1,
+6977.1,
+6978.1,
+6979.1,
+6980.1,
+6981.1,
+6982.1,
+6983.1,
+6984.1,
+6985.1,
+6986.1,
+6987.1,
+6988.1,
+6989.1,
+6990.1,
+6991.1,
+6992.1,
+6993.1,
+6994.1,
+6995.1,
+6996.1,
+6997.1,
+6998.1,
+6999.1,
+7000.1,
+7001.1,
+7002.1,
+7003.1,
+7004.1,
+7005.1,
+7006.1,
+7007.1,
+7008.1,
+7009.1,
+7010.1,
+7011.1,
+7012.1,
+7013.1,
+7014.1,
+7015.1,
+7016.1,
+7017.1,
+7018.1,
+7019.1,
+7020.1,
+7021.1,
+7022.1,
+7023.1,
+7024.1,
+7025.1,
+7026.1,
+7027.1,
+7028.1,
+7029.1,
+7030.1,
+7031.1,
+7032.1,
+7033.1,
+7034.1,
+7035.1,
+7036.1,
+7037.1,
+7038.1,
+7039.1,
+7040.1,
+7041.1,
+7042.1,
+7043.1,
+7044.1,
+7045.1,
+7046.1,
+7047.1,
+7048.1,
+7049.1,
+7050.1,
+7051.1,
+7052.1,
+7053.1,
+7054.1,
+7055.1,
+7056.1,
+7057.1,
+7058.1,
+7059.1,
+7060.1,
+7061.1,
+7062.1,
+7063.1,
+7064.1,
+7065.1,
+7066.1,
+7067.1,
+7068.1,
+7069.1,
+7070.1,
+7071.1,
+7072.1,
+7073.1,
+7074.1,
+7075.1,
+7076.1,
+7077.1,
+7078.1,
+7079.1,
+7080.1,
+7081.1,
+7082.1,
+7083.1,
+7084.1,
+7085.1,
+7086.1,
+7087.1,
+7088.1,
+7089.1,
+7090.1,
+7091.1,
+7092.1,
+7093.1,
+7094.1,
+7095.1,
+7096.1,
+7097.1,
+7098.1,
+7099.1,
+7100.1,
+7101.1,
+7102.1,
+7103.1,
+7104.1,
+7105.1,
+7106.1,
+7107.1,
+7108.1,
+7109.1,
+7110.1,
+7111.1,
+7112.1,
+7113.1,
+7114.1,
+7115.1,
+7116.1,
+7117.1,
+7118.1,
+7119.1,
+7120.1,
+7121.1,
+7122.1,
+7123.1,
+7124.1,
+7125.1,
+7126.1,
+7127.1,
+7128.1,
+7129.1,
+7130.1,
+7131.1,
+7132.1,
+7133.1,
+7134.1,
+7135.1,
+7136.1,
+7137.1,
+7138.1,
+7139.1,
+7140.1,
+7141.1,
+7142.1,
+7143.1,
+7144.1,
+7145.1,
+7146.1,
+7147.1,
+7148.1,
+7149.1,
+7150.1,
+7151.1,
+7152.1,
+7153.1,
+7154.1,
+7155.1,
+7156.1,
+7157.1,
+7158.1,
+7159.1,
+7160.1,
+7161.1,
+7162.1,
+7163.1,
+7164.1,
+7165.1,
+7166.1,
+7167.1,
+7168.1,
+7169.1,
+7170.1,
+7171.1,
+7172.1,
+7173.1,
+7174.1,
+7175.1,
+7176.1,
+7177.1,
+7178.1,
+7179.1,
+7180.1,
+7181.1,
+7182.1,
+7183.1,
+7184.1,
+7185.1,
+7186.1,
+7187.1,
+7188.1,
+7189.1,
+7190.1,
+7191.1,
+7192.1,
+7193.1,
+7194.1,
+7195.1,
+7196.1,
+7197.1,
+7198.1,
+7199.1,
+7200.1,
+7201.1,
+7202.1,
+7203.1,
+7204.1,
+7205.1,
+7206.1,
+7207.1,
+7208.1,
+7209.1,
+7210.1,
+7211.1,
+7212.1,
+7213.1,
+7214.1,
+7215.1,
+7216.1,
+7217.1,
+7218.1,
+7219.1,
+7220.1,
+7221.1,
+7222.1,
+7223.1,
+7224.1,
+7225.1,
+7226.1,
+7227.1,
+7228.1,
+7229.1,
+7230.1,
+7231.1,
+7232.1,
+7233.1,
+7234.1,
+7235.1,
+7236.1,
+7237.1,
+7238.1,
+7239.1,
+7240.1,
+7241.1,
+7242.1,
+7243.1,
+7244.1,
+7245.1,
+7246.1,
+7247.1,
+7248.1,
+7249.1,
+7250.1,
+7251.1,
+7252.1,
+7253.1,
+7254.1,
+7255.1,
+7256.1,
+7257.1,
+7258.1,
+7259.1,
+7260.1,
+7261.1,
+7262.1,
+7263.1,
+7264.1,
+7265.1,
+7266.1,
+7267.1,
+7268.1,
+7269.1,
+7270.1,
+7271.1,
+7272.1,
+7273.1,
+7274.1,
+7275.1,
+7276.1,
+7277.1,
+7278.1,
+7279.1,
+7280.1,
+7281.1,
+7282.1,
+7283.1,
+7284.1,
+7285.1,
+7286.1,
+7287.1,
+7288.1,
+7289.1,
+7290.1,
+7291.1,
+7292.1,
+7293.1,
+7294.1,
+7295.1,
+7296.1,
+7297.1,
+7298.1,
+7299.1,
+7300.1,
+7301.1,
+7302.1,
+7303.1,
+7304.1,
+7305.1,
+7306.1,
+7307.1,
+7308.1,
+7309.1,
+7310.1,
+7311.1,
+7312.1,
+7313.1,
+7314.1,
+7315.1,
+7316.1,
+7317.1,
+7318.1,
+7319.1,
+7320.1,
+7321.1,
+7322.1,
+7323.1,
+7324.1,
+7325.1,
+7326.1,
+7327.1,
+7328.1,
+7329.1,
+7330.1,
+7331.1,
+7332.1,
+7333.1,
+7334.1,
+7335.1,
+7336.1,
+7337.1,
+7338.1,
+7339.1,
+7340.1,
+7341.1,
+7342.1,
+7343.1,
+7344.1,
+7345.1,
+7346.1,
+7347.1,
+7348.1,
+7349.1,
+7350.1,
+7351.1,
+7352.1,
+7353.1,
+7354.1,
+7355.1,
+7356.1,
+7357.1,
+7358.1,
+7359.1,
+7360.1,
+7361.1,
+7362.1,
+7363.1,
+7364.1,
+7365.1,
+7366.1,
+7367.1,
+7368.1,
+7369.1,
+7370.1,
+7371.1,
+7372.1,
+7373.1,
+7374.1,
+7375.1,
+7376.1,
+7377.1,
+7378.1,
+7379.1,
+7380.1,
+7381.1,
+7382.1,
+7383.1,
+7384.1,
+7385.1,
+7386.1,
+7387.1,
+7388.1,
+7389.1,
+7390.1,
+7391.1,
+7392.1,
+7393.1,
+7394.1,
+7395.1,
+7396.1,
+7397.1,
+7398.1,
+7399.1,
+7400.1,
+7401.1,
+7402.1,
+7403.1,
+7404.1,
+7405.1,
+7406.1,
+7407.1,
+7408.1,
+7409.1,
+7410.1,
+7411.1,
+7412.1,
+7413.1,
+7414.1,
+7415.1,
+7416.1,
+7417.1,
+7418.1,
+7419.1,
+7420.1,
+7421.1,
+7422.1,
+7423.1,
+7424.1,
+7425.1,
+7426.1,
+7427.1,
+7428.1,
+7429.1,
+7430.1,
+7431.1,
+7432.1,
+7433.1,
+7434.1,
+7435.1,
+7436.1,
+7437.1,
+7438.1,
+7439.1,
+7440.1,
+7441.1,
+7442.1,
+7443.1,
+7444.1,
+7445.1,
+7446.1,
+7447.1,
+7448.1,
+7449.1,
+7450.1,
+7451.1,
+7452.1,
+7453.1,
+7454.1,
+7455.1,
+7456.1,
+7457.1,
+7458.1,
+7459.1,
+7460.1,
+7461.1,
+7462.1,
+7463.1,
+7464.1,
+7465.1,
+7466.1,
+7467.1,
+7468.1,
+7469.1,
+7470.1,
+7471.1,
+7472.1,
+7473.1,
+7474.1,
+7475.1,
+7476.1,
+7477.1,
+7478.1,
+7479.1,
+7480.1,
+7481.1,
+7482.1,
+7483.1,
+7484.1,
+7485.1,
+7486.1,
+7487.1,
+7488.1,
+7489.1,
+7490.1,
+7491.1,
+7492.1,
+7493.1,
+7494.1,
+7495.1,
+7496.1,
+7497.1,
+7498.1,
+7499.1,
+7500.1,
+7501.1,
+7502.1,
+7503.1,
+7504.1,
+7505.1,
+7506.1,
+7507.1,
+7508.1,
+7509.1,
+7510.1,
+7511.1,
+7512.1,
+7513.1,
+7514.1,
+7515.1,
+7516.1,
+7517.1,
+7518.1,
+7519.1,
+7520.1,
+7521.1,
+7522.1,
+7523.1,
+7524.1,
+7525.1,
+7526.1,
+7527.1,
+7528.1,
+7529.1,
+7530.1,
+7531.1,
+7532.1,
+7533.1,
+7534.1,
+7535.1,
+7536.1,
+7537.1,
+7538.1,
+7539.1,
+7540.1,
+7541.1,
+7542.1,
+7543.1,
+7544.1,
+7545.1,
+7546.1,
+7547.1,
+7548.1,
+7549.1,
+7550.1,
+7551.1,
+7552.1,
+7553.1,
+7554.1,
+7555.1,
+7556.1,
+7557.1,
+7558.1,
+7559.1,
+7560.1,
+7561.1,
+7562.1,
+7563.1,
+7564.1,
+7565.1,
+7566.1,
+7567.1,
+7568.1,
+7569.1,
+7570.1,
+7571.1,
+7572.1,
+7573.1,
+7574.1,
+7575.1,
+7576.1,
+7577.1,
+7578.1,
+7579.1,
+7580.1,
+7581.1,
+7582.1,
+7583.1,
+7584.1,
+7585.1,
+7586.1,
+7587.1,
+7588.1,
+7589.1,
+7590.1,
+7591.1,
+7592.1,
+7593.1,
+7594.1,
+7595.1,
+7596.1,
+7597.1,
+7598.1,
+7599.1,
+7600.1,
+7601.1,
+7602.1,
+7603.1,
+7604.1,
+7605.1,
+7606.1,
+7607.1,
+7608.1,
+7609.1,
+7610.1,
+7611.1,
+7612.1,
+7613.1,
+7614.1,
+7615.1,
+7616.1,
+7617.1,
+7618.1,
+7619.1,
+7620.1,
+7621.1,
+7622.1,
+7623.1,
+7624.1,
+7625.1,
+7626.1,
+7627.1,
+7628.1,
+7629.1,
+7630.1,
+7631.1,
+7632.1,
+7633.1,
+7634.1,
+7635.1,
+7636.1,
+7637.1,
+7638.1,
+7639.1,
+7640.1,
+7641.1,
+7642.1,
+7643.1,
+7644.1,
+7645.1,
+7646.1,
+7647.1,
+7648.1,
+7649.1,
+7650.1,
+7651.1,
+7652.1,
+7653.1,
+7654.1,
+7655.1,
+7656.1,
+7657.1,
+7658.1,
+7659.1,
+7660.1,
+7661.1,
+7662.1,
+7663.1,
+7664.1,
+7665.1,
+7666.1,
+7667.1,
+7668.1,
+7669.1,
+7670.1,
+7671.1,
+7672.1,
+7673.1,
+7674.1,
+7675.1,
+7676.1,
+7677.1,
+7678.1,
+7679.1,
+7680.1,
+7681.1,
+7682.1,
+7683.1,
+7684.1,
+7685.1,
+7686.1,
+7687.1,
+7688.1,
+7689.1,
+7690.1,
+7691.1,
+7692.1,
+7693.1,
+7694.1,
+7695.1,
+7696.1,
+7697.1,
+7698.1,
+7699.1,
+7700.1,
+7701.1,
+7702.1,
+7703.1,
+7704.1,
+7705.1,
+7706.1,
+7707.1,
+7708.1,
+7709.1,
+7710.1,
+7711.1,
+7712.1,
+7713.1,
+7714.1,
+7715.1,
+7716.1,
+7717.1,
+7718.1,
+7719.1,
+7720.1,
+7721.1,
+7722.1,
+7723.1,
+7724.1,
+7725.1,
+7726.1,
+7727.1,
+7728.1,
+7729.1,
+7730.1,
+7731.1,
+7732.1,
+7733.1,
+7734.1,
+7735.1,
+7736.1,
+7737.1,
+7738.1,
+7739.1,
+7740.1,
+7741.1,
+7742.1,
+7743.1,
+7744.1,
+7745.1,
+7746.1,
+7747.1,
+7748.1,
+7749.1,
+7750.1,
+7751.1,
+7752.1,
+7753.1,
+7754.1,
+7755.1,
+7756.1,
+7757.1,
+7758.1,
+7759.1,
+7760.1,
+7761.1,
+7762.1,
+7763.1,
+7764.1,
+7765.1,
+7766.1,
+7767.1,
+7768.1,
+7769.1,
+7770.1,
+7771.1,
+7772.1,
+7773.1,
+7774.1,
+7775.1,
+7776.1,
+7777.1,
+7778.1,
+7779.1,
+7780.1,
+7781.1,
+7782.1,
+7783.1,
+7784.1,
+7785.1,
+7786.1,
+7787.1,
+7788.1,
+7789.1,
+7790.1,
+7791.1,
+7792.1,
+7793.1,
+7794.1,
+7795.1,
+7796.1,
+7797.1,
+7798.1,
+7799.1,
+7800.1,
+7801.1,
+7802.1,
+7803.1,
+7804.1,
+7805.1,
+7806.1,
+7807.1,
+7808.1,
+7809.1,
+7810.1,
+7811.1,
+7812.1,
+7813.1,
+7814.1,
+7815.1,
+7816.1,
+7817.1,
+7818.1,
+7819.1,
+7820.1,
+7821.1,
+7822.1,
+7823.1,
+7824.1,
+7825.1,
+7826.1,
+7827.1,
+7828.1,
+7829.1,
+7830.1,
+7831.1,
+7832.1,
+7833.1,
+7834.1,
+7835.1,
+7836.1,
+7837.1,
+7838.1,
+7839.1,
+7840.1,
+7841.1,
+7842.1,
+7843.1,
+7844.1,
+7845.1,
+7846.1,
+7847.1,
+7848.1,
+7849.1,
+7850.1,
+7851.1,
+7852.1,
+7853.1,
+7854.1,
+7855.1,
+7856.1,
+7857.1,
+7858.1,
+7859.1,
+7860.1,
+7861.1,
+7862.1,
+7863.1,
+7864.1,
+7865.1,
+7866.1,
+7867.1,
+7868.1,
+7869.1,
+7870.1,
+7871.1,
+7872.1,
+7873.1,
+7874.1,
+7875.1,
+7876.1,
+7877.1,
+7878.1,
+7879.1,
+7880.1,
+7881.1,
+7882.1,
+7883.1,
+7884.1,
+7885.1,
+7886.1,
+7887.1,
+7888.1,
+7889.1,
+7890.1,
+7891.1,
+7892.1,
+7893.1,
+7894.1,
+7895.1,
+7896.1,
+7897.1,
+7898.1,
+7899.1,
+7900.1,
+7901.1,
+7902.1,
+7903.1,
+7904.1,
+7905.1,
+7906.1,
+7907.1,
+7908.1,
+7909.1,
+7910.1,
+7911.1,
+7912.1,
+7913.1,
+7914.1,
+7915.1,
+7916.1,
+7917.1,
+7918.1,
+7919.1,
+7920.1,
+7921.1,
+7922.1,
+7923.1,
+7924.1,
+7925.1,
+7926.1,
+7927.1,
+7928.1,
+7929.1,
+7930.1,
+7931.1,
+7932.1,
+7933.1,
+7934.1,
+7935.1,
+7936.1,
+7937.1,
+7938.1,
+7939.1,
+7940.1,
+7941.1,
+7942.1,
+7943.1,
+7944.1,
+7945.1,
+7946.1,
+7947.1,
+7948.1,
+7949.1,
+7950.1,
+7951.1,
+7952.1,
+7953.1,
+7954.1,
+7955.1,
+7956.1,
+7957.1,
+7958.1,
+7959.1,
+7960.1,
+7961.1,
+7962.1,
+7963.1,
+7964.1,
+7965.1,
+7966.1,
+7967.1,
+7968.1,
+7969.1,
+7970.1,
+7971.1,
+7972.1,
+7973.1,
+7974.1,
+7975.1,
+7976.1,
+7977.1,
+7978.1,
+7979.1,
+7980.1,
+7981.1,
+7982.1,
+7983.1,
+7984.1,
+7985.1,
+7986.1,
+7987.1,
+7988.1,
+7989.1,
+7990.1,
+7991.1,
+7992.1,
+7993.1,
+7994.1,
+7995.1,
+7996.1,
+7997.1,
+7998.1,
+7999.1,
+8000.1,
+8001.1,
+8002.1,
+8003.1,
+8004.1,
+8005.1,
+8006.1,
+8007.1,
+8008.1,
+8009.1,
+8010.1,
+8011.1,
+8012.1,
+8013.1,
+8014.1,
+8015.1,
+8016.1,
+8017.1,
+8018.1,
+8019.1,
+8020.1,
+8021.1,
+8022.1,
+8023.1,
+8024.1,
+8025.1,
+8026.1,
+8027.1,
+8028.1,
+8029.1,
+8030.1,
+8031.1,
+8032.1,
+8033.1,
+8034.1,
+8035.1,
+8036.1,
+8037.1,
+8038.1,
+8039.1,
+8040.1,
+8041.1,
+8042.1,
+8043.1,
+8044.1,
+8045.1,
+8046.1,
+8047.1,
+8048.1,
+8049.1,
+8050.1,
+8051.1,
+8052.1,
+8053.1,
+8054.1,
+8055.1,
+8056.1,
+8057.1,
+8058.1,
+8059.1,
+8060.1,
+8061.1,
+8062.1,
+8063.1,
+8064.1,
+8065.1,
+8066.1,
+8067.1,
+8068.1,
+8069.1,
+8070.1,
+8071.1,
+8072.1,
+8073.1,
+8074.1,
+8075.1,
+8076.1,
+8077.1,
+8078.1,
+8079.1,
+8080.1,
+8081.1,
+8082.1,
+8083.1,
+8084.1,
+8085.1,
+8086.1,
+8087.1,
+8088.1,
+8089.1,
+8090.1,
+8091.1,
+8092.1,
+8093.1,
+8094.1,
+8095.1,
+8096.1,
+8097.1,
+8098.1,
+8099.1,
+8100.1,
+8101.1,
+8102.1,
+8103.1,
+8104.1,
+8105.1,
+8106.1,
+8107.1,
+8108.1,
+8109.1,
+8110.1,
+8111.1,
+8112.1,
+8113.1,
+8114.1,
+8115.1,
+8116.1,
+8117.1,
+8118.1,
+8119.1,
+8120.1,
+8121.1,
+8122.1,
+8123.1,
+8124.1,
+8125.1,
+8126.1,
+8127.1,
+8128.1,
+8129.1,
+8130.1,
+8131.1,
+8132.1,
+8133.1,
+8134.1,
+8135.1,
+8136.1,
+8137.1,
+8138.1,
+8139.1,
+8140.1,
+8141.1,
+8142.1,
+8143.1,
+8144.1,
+8145.1,
+8146.1,
+8147.1,
+8148.1,
+8149.1,
+8150.1,
+8151.1,
+8152.1,
+8153.1,
+8154.1,
+8155.1,
+8156.1,
+8157.1,
+8158.1,
+8159.1,
+8160.1,
+8161.1,
+8162.1,
+8163.1,
+8164.1,
+8165.1,
+8166.1,
+8167.1,
+8168.1,
+8169.1,
+8170.1,
+8171.1,
+8172.1,
+8173.1,
+8174.1,
+8175.1,
+8176.1,
+8177.1,
+8178.1,
+8179.1,
+8180.1,
+8181.1,
+8182.1,
+8183.1,
+8184.1,
+8185.1,
+8186.1,
+8187.1,
+8188.1,
+8189.1,
+8190.1,
+8191.1,
+8192.1,
+8193.1,
+8194.1,
+8195.1,
+8196.1,
+8197.1,
+8198.1,
+8199.1,
+8200.1,
+8201.1,
+8202.1,
+8203.1,
+8204.1,
+8205.1,
+8206.1,
+8207.1,
+8208.1,
+8209.1,
+8210.1,
+8211.1,
+8212.1,
+8213.1,
+8214.1,
+8215.1,
+8216.1,
+8217.1,
+8218.1,
+8219.1,
+8220.1,
+8221.1,
+8222.1,
+8223.1,
+8224.1,
+8225.1,
+8226.1,
+8227.1,
+8228.1,
+8229.1,
+8230.1,
+8231.1,
+8232.1,
+8233.1,
+8234.1,
+8235.1,
+8236.1,
+8237.1,
+8238.1,
+8239.1,
+8240.1,
+8241.1,
+8242.1,
+8243.1,
+8244.1,
+8245.1,
+8246.1,
+8247.1,
+8248.1,
+8249.1,
+8250.1,
+8251.1,
+8252.1,
+8253.1,
+8254.1,
+8255.1,
+8256.1,
+8257.1,
+8258.1,
+8259.1,
+8260.1,
+8261.1,
+8262.1,
+8263.1,
+8264.1,
+8265.1,
+8266.1,
+8267.1,
+8268.1,
+8269.1,
+8270.1,
+8271.1,
+8272.1,
+8273.1,
+8274.1,
+8275.1,
+8276.1,
+8277.1,
+8278.1,
+8279.1,
+8280.1,
+8281.1,
+8282.1,
+8283.1,
+8284.1,
+8285.1,
+8286.1,
+8287.1,
+8288.1,
+8289.1,
+8290.1,
+8291.1,
+8292.1,
+8293.1,
+8294.1,
+8295.1,
+8296.1,
+8297.1,
+8298.1,
+8299.1,
+8300.1,
+8301.1,
+8302.1,
+8303.1,
+8304.1,
+8305.1,
+8306.1,
+8307.1,
+8308.1,
+8309.1,
+8310.1,
+8311.1,
+8312.1,
+8313.1,
+8314.1,
+8315.1,
+8316.1,
+8317.1,
+8318.1,
+8319.1,
+8320.1,
+8321.1,
+8322.1,
+8323.1,
+8324.1,
+8325.1,
+8326.1,
+8327.1,
+8328.1,
+8329.1,
+8330.1,
+8331.1,
+8332.1,
+8333.1,
+8334.1,
+8335.1,
+8336.1,
+8337.1,
+8338.1,
+8339.1,
+8340.1,
+8341.1,
+8342.1,
+8343.1,
+8344.1,
+8345.1,
+8346.1,
+8347.1,
+8348.1,
+8349.1,
+8350.1,
+8351.1,
+8352.1,
+8353.1,
+8354.1,
+8355.1,
+8356.1,
+8357.1,
+8358.1,
+8359.1,
+8360.1,
+8361.1,
+8362.1,
+8363.1,
+8364.1,
+8365.1,
+8366.1,
+8367.1,
+8368.1,
+8369.1,
+8370.1,
+8371.1,
+8372.1,
+8373.1,
+8374.1,
+8375.1,
+8376.1,
+8377.1,
+8378.1,
+8379.1,
+8380.1,
+8381.1,
+8382.1,
+8383.1,
+8384.1,
+8385.1,
+8386.1,
+8387.1,
+8388.1,
+8389.1,
+8390.1,
+8391.1,
+8392.1,
+8393.1,
+8394.1,
+8395.1,
+8396.1,
+8397.1,
+8398.1,
+8399.1,
+8400.1,
+8401.1,
+8402.1,
+8403.1,
+8404.1,
+8405.1,
+8406.1,
+8407.1,
+8408.1,
+8409.1,
+8410.1,
+8411.1,
+8412.1,
+8413.1,
+8414.1,
+8415.1,
+8416.1,
+8417.1,
+8418.1,
+8419.1,
+8420.1,
+8421.1,
+8422.1,
+8423.1,
+8424.1,
+8425.1,
+8426.1,
+8427.1,
+8428.1,
+8429.1,
+8430.1,
+8431.1,
+8432.1,
+8433.1,
+8434.1,
+8435.1,
+8436.1,
+8437.1,
+8438.1,
+8439.1,
+8440.1,
+8441.1,
+8442.1,
+8443.1,
+8444.1,
+8445.1,
+8446.1,
+8447.1,
+8448.1,
+8449.1,
+8450.1,
+8451.1,
+8452.1,
+8453.1,
+8454.1,
+8455.1,
+8456.1,
+8457.1,
+8458.1,
+8459.1,
+8460.1,
+8461.1,
+8462.1,
+8463.1,
+8464.1,
+8465.1,
+8466.1,
+8467.1,
+8468.1,
+8469.1,
+8470.1,
+8471.1,
+8472.1,
+8473.1,
+8474.1,
+8475.1,
+8476.1,
+8477.1,
+8478.1,
+8479.1,
+8480.1,
+8481.1,
+8482.1,
+8483.1,
+8484.1,
+8485.1,
+8486.1,
+8487.1,
+8488.1,
+8489.1,
+8490.1,
+8491.1,
+8492.1,
+8493.1,
+8494.1,
+8495.1,
+8496.1,
+8497.1,
+8498.1,
+8499.1,
+8500.1,
+8501.1,
+8502.1,
+8503.1,
+8504.1,
+8505.1,
+8506.1,
+8507.1,
+8508.1,
+8509.1,
+8510.1,
+8511.1,
+8512.1,
+8513.1,
+8514.1,
+8515.1,
+8516.1,
+8517.1,
+8518.1,
+8519.1,
+8520.1,
+8521.1,
+8522.1,
+8523.1,
+8524.1,
+8525.1,
+8526.1,
+8527.1,
+8528.1,
+8529.1,
+8530.1,
+8531.1,
+8532.1,
+8533.1,
+8534.1,
+8535.1,
+8536.1,
+8537.1,
+8538.1,
+8539.1,
+8540.1,
+8541.1,
+8542.1,
+8543.1,
+8544.1,
+8545.1,
+8546.1,
+8547.1,
+8548.1,
+8549.1,
+8550.1,
+8551.1,
+8552.1,
+8553.1,
+8554.1,
+8555.1,
+8556.1,
+8557.1,
+8558.1,
+8559.1,
+8560.1,
+8561.1,
+8562.1,
+8563.1,
+8564.1,
+8565.1,
+8566.1,
+8567.1,
+8568.1,
+8569.1,
+8570.1,
+8571.1,
+8572.1,
+8573.1,
+8574.1,
+8575.1,
+8576.1,
+8577.1,
+8578.1,
+8579.1,
+8580.1,
+8581.1,
+8582.1,
+8583.1,
+8584.1,
+8585.1,
+8586.1,
+8587.1,
+8588.1,
+8589.1,
+8590.1,
+8591.1,
+8592.1,
+8593.1,
+8594.1,
+8595.1,
+8596.1,
+8597.1,
+8598.1,
+8599.1,
+8600.1,
+8601.1,
+8602.1,
+8603.1,
+8604.1,
+8605.1,
+8606.1,
+8607.1,
+8608.1,
+8609.1,
+8610.1,
+8611.1,
+8612.1,
+8613.1,
+8614.1,
+8615.1,
+8616.1,
+8617.1,
+8618.1,
+8619.1,
+8620.1,
+8621.1,
+8622.1,
+8623.1,
+8624.1,
+8625.1,
+8626.1,
+8627.1,
+8628.1,
+8629.1,
+8630.1,
+8631.1,
+8632.1,
+8633.1,
+8634.1,
+8635.1,
+8636.1,
+8637.1,
+8638.1,
+8639.1,
+8640.1,
+8641.1,
+8642.1,
+8643.1,
+8644.1,
+8645.1,
+8646.1,
+8647.1,
+8648.1,
+8649.1,
+8650.1,
+8651.1,
+8652.1,
+8653.1,
+8654.1,
+8655.1,
+8656.1,
+8657.1,
+8658.1,
+8659.1,
+8660.1,
+8661.1,
+8662.1,
+8663.1,
+8664.1,
+8665.1,
+8666.1,
+8667.1,
+8668.1,
+8669.1,
+8670.1,
+8671.1,
+8672.1,
+8673.1,
+8674.1,
+8675.1,
+8676.1,
+8677.1,
+8678.1,
+8679.1,
+8680.1,
+8681.1,
+8682.1,
+8683.1,
+8684.1,
+8685.1,
+8686.1,
+8687.1,
+8688.1,
+8689.1,
+8690.1,
+8691.1,
+8692.1,
+8693.1,
+8694.1,
+8695.1,
+8696.1,
+8697.1,
+8698.1,
+8699.1,
+8700.1,
+8701.1,
+8702.1,
+8703.1,
+8704.1,
+8705.1,
+8706.1,
+8707.1,
+8708.1,
+8709.1,
+8710.1,
+8711.1,
+8712.1,
+8713.1,
+8714.1,
+8715.1,
+8716.1,
+8717.1,
+8718.1,
+8719.1,
+8720.1,
+8721.1,
+8722.1,
+8723.1,
+8724.1,
+8725.1,
+8726.1,
+8727.1,
+8728.1,
+8729.1,
+8730.1,
+8731.1,
+8732.1,
+8733.1,
+8734.1,
+8735.1,
+8736.1,
+8737.1,
+8738.1,
+8739.1,
+8740.1,
+8741.1,
+8742.1,
+8743.1,
+8744.1,
+8745.1,
+8746.1,
+8747.1,
+8748.1,
+8749.1,
+8750.1,
+8751.1,
+8752.1,
+8753.1,
+8754.1,
+8755.1,
+8756.1,
+8757.1,
+8758.1,
+8759.1,
+8760.1,
+8761.1,
+8762.1,
+8763.1,
+8764.1,
+8765.1,
+8766.1,
+8767.1,
+8768.1,
+8769.1,
+8770.1,
+8771.1,
+8772.1,
+8773.1,
+8774.1,
+8775.1,
+8776.1,
+8777.1,
+8778.1,
+8779.1,
+8780.1,
+8781.1,
+8782.1,
+8783.1,
+8784.1,
+8785.1,
+8786.1,
+8787.1,
+8788.1,
+8789.1,
+8790.1,
+8791.1,
+8792.1,
+8793.1,
+8794.1,
+8795.1,
+8796.1,
+8797.1,
+8798.1,
+8799.1,
+8800.1,
+8801.1,
+8802.1,
+8803.1,
+8804.1,
+8805.1,
+8806.1,
+8807.1,
+8808.1,
+8809.1,
+8810.1,
+8811.1,
+8812.1,
+8813.1,
+8814.1,
+8815.1,
+8816.1,
+8817.1,
+8818.1,
+8819.1,
+8820.1,
+8821.1,
+8822.1,
+8823.1,
+8824.1,
+8825.1,
+8826.1,
+8827.1,
+8828.1,
+8829.1,
+8830.1,
+8831.1,
+8832.1,
+8833.1,
+8834.1,
+8835.1,
+8836.1,
+8837.1,
+8838.1,
+8839.1,
+8840.1,
+8841.1,
+8842.1,
+8843.1,
+8844.1,
+8845.1,
+8846.1,
+8847.1,
+8848.1,
+8849.1,
+8850.1,
+8851.1,
+8852.1,
+8853.1,
+8854.1,
+8855.1,
+8856.1,
+8857.1,
+8858.1,
+8859.1,
+8860.1,
+8861.1,
+8862.1,
+8863.1,
+8864.1,
+8865.1,
+8866.1,
+8867.1,
+8868.1,
+8869.1,
+8870.1,
+8871.1,
+8872.1,
+8873.1,
+8874.1,
+8875.1,
+8876.1,
+8877.1,
+8878.1,
+8879.1,
+8880.1,
+8881.1,
+8882.1,
+8883.1,
+8884.1,
+8885.1,
+8886.1,
+8887.1,
+8888.1,
+8889.1,
+8890.1,
+8891.1,
+8892.1,
+8893.1,
+8894.1,
+8895.1,
+8896.1,
+8897.1,
+8898.1,
+8899.1,
+8900.1,
+8901.1,
+8902.1,
+8903.1,
+8904.1,
+8905.1,
+8906.1,
+8907.1,
+8908.1,
+8909.1,
+8910.1,
+8911.1,
+8912.1,
+8913.1,
+8914.1,
+8915.1,
+8916.1,
+8917.1,
+8918.1,
+8919.1,
+8920.1,
+8921.1,
+8922.1,
+8923.1,
+8924.1,
+8925.1,
+8926.1,
+8927.1,
+8928.1,
+8929.1,
+8930.1,
+8931.1,
+8932.1,
+8933.1,
+8934.1,
+8935.1,
+8936.1,
+8937.1,
+8938.1,
+8939.1,
+8940.1,
+8941.1,
+8942.1,
+8943.1,
+8944.1,
+8945.1,
+8946.1,
+8947.1,
+8948.1,
+8949.1,
+8950.1,
+8951.1,
+8952.1,
+8953.1,
+8954.1,
+8955.1,
+8956.1,
+8957.1,
+8958.1,
+8959.1,
+8960.1,
+8961.1,
+8962.1,
+8963.1,
+8964.1,
+8965.1,
+8966.1,
+8967.1,
+8968.1,
+8969.1,
+8970.1,
+8971.1,
+8972.1,
+8973.1,
+8974.1,
+8975.1,
+8976.1,
+8977.1,
+8978.1,
+8979.1,
+8980.1,
+8981.1,
+8982.1,
+8983.1,
+8984.1,
+8985.1,
+8986.1,
+8987.1,
+8988.1,
+8989.1,
+8990.1,
+8991.1,
+8992.1,
+8993.1,
+8994.1,
+8995.1,
+8996.1,
+8997.1,
+8998.1,
+8999.1,
+9000.1,
+9001.1,
+9002.1,
+9003.1,
+9004.1,
+9005.1,
+9006.1,
+9007.1,
+9008.1,
+9009.1,
+9010.1,
+9011.1,
+9012.1,
+9013.1,
+9014.1,
+9015.1,
+9016.1,
+9017.1,
+9018.1,
+9019.1,
+9020.1,
+9021.1,
+9022.1,
+9023.1,
+9024.1,
+9025.1,
+9026.1,
+9027.1,
+9028.1,
+9029.1,
+9030.1,
+9031.1,
+9032.1,
+9033.1,
+9034.1,
+9035.1,
+9036.1,
+9037.1,
+9038.1,
+9039.1,
+9040.1,
+9041.1,
+9042.1,
+9043.1,
+9044.1,
+9045.1,
+9046.1,
+9047.1,
+9048.1,
+9049.1,
+9050.1,
+9051.1,
+9052.1,
+9053.1,
+9054.1,
+9055.1,
+9056.1,
+9057.1,
+9058.1,
+9059.1,
+9060.1,
+9061.1,
+9062.1,
+9063.1,
+9064.1,
+9065.1,
+9066.1,
+9067.1,
+9068.1,
+9069.1,
+9070.1,
+9071.1,
+9072.1,
+9073.1,
+9074.1,
+9075.1,
+9076.1,
+9077.1,
+9078.1,
+9079.1,
+9080.1,
+9081.1,
+9082.1,
+9083.1,
+9084.1,
+9085.1,
+9086.1,
+9087.1,
+9088.1,
+9089.1,
+9090.1,
+9091.1,
+9092.1,
+9093.1,
+9094.1,
+9095.1,
+9096.1,
+9097.1,
+9098.1,
+9099.1,
+9100.1,
+9101.1,
+9102.1,
+9103.1,
+9104.1,
+9105.1,
+9106.1,
+9107.1,
+9108.1,
+9109.1,
+9110.1,
+9111.1,
+9112.1,
+9113.1,
+9114.1,
+9115.1,
+9116.1,
+9117.1,
+9118.1,
+9119.1,
+9120.1,
+9121.1,
+9122.1,
+9123.1,
+9124.1,
+9125.1,
+9126.1,
+9127.1,
+9128.1,
+9129.1,
+9130.1,
+9131.1,
+9132.1,
+9133.1,
+9134.1,
+9135.1,
+9136.1,
+9137.1,
+9138.1,
+9139.1,
+9140.1,
+9141.1,
+9142.1,
+9143.1,
+9144.1,
+9145.1,
+9146.1,
+9147.1,
+9148.1,
+9149.1,
+9150.1,
+9151.1,
+9152.1,
+9153.1,
+9154.1,
+9155.1,
+9156.1,
+9157.1,
+9158.1,
+9159.1,
+9160.1,
+9161.1,
+9162.1,
+9163.1,
+9164.1,
+9165.1,
+9166.1,
+9167.1,
+9168.1,
+9169.1,
+9170.1,
+9171.1,
+9172.1,
+9173.1,
+9174.1,
+9175.1,
+9176.1,
+9177.1,
+9178.1,
+9179.1,
+9180.1,
+9181.1,
+9182.1,
+9183.1,
+9184.1,
+9185.1,
+9186.1,
+9187.1,
+9188.1,
+9189.1,
+9190.1,
+9191.1,
+9192.1,
+9193.1,
+9194.1,
+9195.1,
+9196.1,
+9197.1,
+9198.1,
+9199.1,
+9200.1,
+9201.1,
+9202.1,
+9203.1,
+9204.1,
+9205.1,
+9206.1,
+9207.1,
+9208.1,
+9209.1,
+9210.1,
+9211.1,
+9212.1,
+9213.1,
+9214.1,
+9215.1,
+9216.1,
+9217.1,
+9218.1,
+9219.1,
+9220.1,
+9221.1,
+9222.1,
+9223.1,
+9224.1,
+9225.1,
+9226.1,
+9227.1,
+9228.1,
+9229.1,
+9230.1,
+9231.1,
+9232.1,
+9233.1,
+9234.1,
+9235.1,
+9236.1,
+9237.1,
+9238.1,
+9239.1,
+9240.1,
+9241.1,
+9242.1,
+9243.1,
+9244.1,
+9245.1,
+9246.1,
+9247.1,
+9248.1,
+9249.1,
+9250.1,
+9251.1,
+9252.1,
+9253.1,
+9254.1,
+9255.1,
+9256.1,
+9257.1,
+9258.1,
+9259.1,
+9260.1,
+9261.1,
+9262.1,
+9263.1,
+9264.1,
+9265.1,
+9266.1,
+9267.1,
+9268.1,
+9269.1,
+9270.1,
+9271.1,
+9272.1,
+9273.1,
+9274.1,
+9275.1,
+9276.1,
+9277.1,
+9278.1,
+9279.1,
+9280.1,
+9281.1,
+9282.1,
+9283.1,
+9284.1,
+9285.1,
+9286.1,
+9287.1,
+9288.1,
+9289.1,
+9290.1,
+9291.1,
+9292.1,
+9293.1,
+9294.1,
+9295.1,
+9296.1,
+9297.1,
+9298.1,
+9299.1,
+9300.1,
+9301.1,
+9302.1,
+9303.1,
+9304.1,
+9305.1,
+9306.1,
+9307.1,
+9308.1,
+9309.1,
+9310.1,
+9311.1,
+9312.1,
+9313.1,
+9314.1,
+9315.1,
+9316.1,
+9317.1,
+9318.1,
+9319.1,
+9320.1,
+9321.1,
+9322.1,
+9323.1,
+9324.1,
+9325.1,
+9326.1,
+9327.1,
+9328.1,
+9329.1,
+9330.1,
+9331.1,
+9332.1,
+9333.1,
+9334.1,
+9335.1,
+9336.1,
+9337.1,
+9338.1,
+9339.1,
+9340.1,
+9341.1,
+9342.1,
+9343.1,
+9344.1,
+9345.1,
+9346.1,
+9347.1,
+9348.1,
+9349.1,
+9350.1,
+9351.1,
+9352.1,
+9353.1,
+9354.1,
+9355.1,
+9356.1,
+9357.1,
+9358.1,
+9359.1,
+9360.1,
+9361.1,
+9362.1,
+9363.1,
+9364.1,
+9365.1,
+9366.1,
+9367.1,
+9368.1,
+9369.1,
+9370.1,
+9371.1,
+9372.1,
+9373.1,
+9374.1,
+9375.1,
+9376.1,
+9377.1,
+9378.1,
+9379.1,
+9380.1,
+9381.1,
+9382.1,
+9383.1,
+9384.1,
+9385.1,
+9386.1,
+9387.1,
+9388.1,
+9389.1,
+9390.1,
+9391.1,
+9392.1,
+9393.1,
+9394.1,
+9395.1,
+9396.1,
+9397.1,
+9398.1,
+9399.1,
+9400.1,
+9401.1,
+9402.1,
+9403.1,
+9404.1,
+9405.1,
+9406.1,
+9407.1,
+9408.1,
+9409.1,
+9410.1,
+9411.1,
+9412.1,
+9413.1,
+9414.1,
+9415.1,
+9416.1,
+9417.1,
+9418.1,
+9419.1,
+9420.1,
+9421.1,
+9422.1,
+9423.1,
+9424.1,
+9425.1,
+9426.1,
+9427.1,
+9428.1,
+9429.1,
+9430.1,
+9431.1,
+9432.1,
+9433.1,
+9434.1,
+9435.1,
+9436.1,
+9437.1,
+9438.1,
+9439.1,
+9440.1,
+9441.1,
+9442.1,
+9443.1,
+9444.1,
+9445.1,
+9446.1,
+9447.1,
+9448.1,
+9449.1,
+9450.1,
+9451.1,
+9452.1,
+9453.1,
+9454.1,
+9455.1,
+9456.1,
+9457.1,
+9458.1,
+9459.1,
+9460.1,
+9461.1,
+9462.1,
+9463.1,
+9464.1,
+9465.1,
+9466.1,
+9467.1,
+9468.1,
+9469.1,
+9470.1,
+9471.1,
+9472.1,
+9473.1,
+9474.1,
+9475.1,
+9476.1,
+9477.1,
+9478.1,
+9479.1,
+9480.1,
+9481.1,
+9482.1,
+9483.1,
+9484.1,
+9485.1,
+9486.1,
+9487.1,
+9488.1,
+9489.1,
+9490.1,
+9491.1,
+9492.1,
+9493.1,
+9494.1,
+9495.1,
+9496.1,
+9497.1,
+9498.1,
+9499.1,
+9500.1,
+9501.1,
+9502.1,
+9503.1,
+9504.1,
+9505.1,
+9506.1,
+9507.1,
+9508.1,
+9509.1,
+9510.1,
+9511.1,
+9512.1,
+9513.1,
+9514.1,
+9515.1,
+9516.1,
+9517.1,
+9518.1,
+9519.1,
+9520.1,
+9521.1,
+9522.1,
+9523.1,
+9524.1,
+9525.1,
+9526.1,
+9527.1,
+9528.1,
+9529.1,
+9530.1,
+9531.1,
+9532.1,
+9533.1,
+9534.1,
+9535.1,
+9536.1,
+9537.1,
+9538.1,
+9539.1,
+9540.1,
+9541.1,
+9542.1,
+9543.1,
+9544.1,
+9545.1,
+9546.1,
+9547.1,
+9548.1,
+9549.1,
+9550.1,
+9551.1,
+9552.1,
+9553.1,
+9554.1,
+9555.1,
+9556.1,
+9557.1,
+9558.1,
+9559.1,
+9560.1,
+9561.1,
+9562.1,
+9563.1,
+9564.1,
+9565.1,
+9566.1,
+9567.1,
+9568.1,
+9569.1,
+9570.1,
+9571.1,
+9572.1,
+9573.1,
+9574.1,
+9575.1,
+9576.1,
+9577.1,
+9578.1,
+9579.1,
+9580.1,
+9581.1,
+9582.1,
+9583.1,
+9584.1,
+9585.1,
+9586.1,
+9587.1,
+9588.1,
+9589.1,
+9590.1,
+9591.1,
+9592.1,
+9593.1,
+9594.1,
+9595.1,
+9596.1,
+9597.1,
+9598.1,
+9599.1,
+9600.1,
+9601.1,
+9602.1,
+9603.1,
+9604.1,
+9605.1,
+9606.1,
+9607.1,
+9608.1,
+9609.1,
+9610.1,
+9611.1,
+9612.1,
+9613.1,
+9614.1,
+9615.1,
+9616.1,
+9617.1,
+9618.1,
+9619.1,
+9620.1,
+9621.1,
+9622.1,
+9623.1,
+9624.1,
+9625.1,
+9626.1,
+9627.1,
+9628.1,
+9629.1,
+9630.1,
+9631.1,
+9632.1,
+9633.1,
+9634.1,
+9635.1,
+9636.1,
+9637.1,
+9638.1,
+9639.1,
+9640.1,
+9641.1,
+9642.1,
+9643.1,
+9644.1,
+9645.1,
+9646.1,
+9647.1,
+9648.1,
+9649.1,
+9650.1,
+9651.1,
+9652.1,
+9653.1,
+9654.1,
+9655.1,
+9656.1,
+9657.1,
+9658.1,
+9659.1,
+9660.1,
+9661.1,
+9662.1,
+9663.1,
+9664.1,
+9665.1,
+9666.1,
+9667.1,
+9668.1,
+9669.1,
+9670.1,
+9671.1,
+9672.1,
+9673.1,
+9674.1,
+9675.1,
+9676.1,
+9677.1,
+9678.1,
+9679.1,
+9680.1,
+9681.1,
+9682.1,
+9683.1,
+9684.1,
+9685.1,
+9686.1,
+9687.1,
+9688.1,
+9689.1,
+9690.1,
+9691.1,
+9692.1,
+9693.1,
+9694.1,
+9695.1,
+9696.1,
+9697.1,
+9698.1,
+9699.1,
+9700.1,
+9701.1,
+9702.1,
+9703.1,
+9704.1,
+9705.1,
+9706.1,
+9707.1,
+9708.1,
+9709.1,
+9710.1,
+9711.1,
+9712.1,
+9713.1,
+9714.1,
+9715.1,
+9716.1,
+9717.1,
+9718.1,
+9719.1,
+9720.1,
+9721.1,
+9722.1,
+9723.1,
+9724.1,
+9725.1,
+9726.1,
+9727.1,
+9728.1,
+9729.1,
+9730.1,
+9731.1,
+9732.1,
+9733.1,
+9734.1,
+9735.1,
+9736.1,
+9737.1,
+9738.1,
+9739.1,
+9740.1,
+9741.1,
+9742.1,
+9743.1,
+9744.1,
+9745.1,
+9746.1,
+9747.1,
+9748.1,
+9749.1,
+9750.1,
+9751.1,
+9752.1,
+9753.1,
+9754.1,
+9755.1,
+9756.1,
+9757.1,
+9758.1,
+9759.1,
+9760.1,
+9761.1,
+9762.1,
+9763.1,
+9764.1,
+9765.1,
+9766.1,
+9767.1,
+9768.1,
+9769.1,
+9770.1,
+9771.1,
+9772.1,
+9773.1,
+9774.1,
+9775.1,
+9776.1,
+9777.1,
+9778.1,
+9779.1,
+9780.1,
+9781.1,
+9782.1,
+9783.1,
+9784.1,
+9785.1,
+9786.1,
+9787.1,
+9788.1,
+9789.1,
+9790.1,
+9791.1,
+9792.1,
+9793.1,
+9794.1,
+9795.1,
+9796.1,
+9797.1,
+9798.1,
+9799.1,
+9800.1,
+9801.1,
+9802.1,
+9803.1,
+9804.1,
+9805.1,
+9806.1,
+9807.1,
+9808.1,
+9809.1,
+9810.1,
+9811.1,
+9812.1,
+9813.1,
+9814.1,
+9815.1,
+9816.1,
+9817.1,
+9818.1,
+9819.1,
+9820.1,
+9821.1,
+9822.1,
+9823.1,
+9824.1,
+9825.1,
+9826.1,
+9827.1,
+9828.1,
+9829.1,
+9830.1,
+9831.1,
+9832.1,
+9833.1,
+9834.1,
+9835.1,
+9836.1,
+9837.1,
+9838.1,
+9839.1,
+9840.1,
+9841.1,
+9842.1,
+9843.1,
+9844.1,
+9845.1,
+9846.1,
+9847.1,
+9848.1,
+9849.1,
+9850.1,
+9851.1,
+9852.1,
+9853.1,
+9854.1,
+9855.1,
+9856.1,
+9857.1,
+9858.1,
+9859.1,
+9860.1,
+9861.1,
+9862.1,
+9863.1,
+9864.1,
+9865.1,
+9866.1,
+9867.1,
+9868.1,
+9869.1,
+9870.1,
+9871.1,
+9872.1,
+9873.1,
+9874.1,
+9875.1,
+9876.1,
+9877.1,
+9878.1,
+9879.1,
+9880.1,
+9881.1,
+9882.1,
+9883.1,
+9884.1,
+9885.1,
+9886.1,
+9887.1,
+9888.1,
+9889.1,
+9890.1,
+9891.1,
+9892.1,
+9893.1,
+9894.1,
+9895.1,
+9896.1,
+9897.1,
+9898.1,
+9899.1,
+9900.1,
+9901.1,
+9902.1,
+9903.1,
+9904.1,
+9905.1,
+9906.1,
+9907.1,
+9908.1,
+9909.1,
+9910.1,
+9911.1,
+9912.1,
+9913.1,
+9914.1,
+9915.1,
+9916.1,
+9917.1,
+9918.1,
+9919.1,
+9920.1,
+9921.1,
+9922.1,
+9923.1,
+9924.1,
+9925.1,
+9926.1,
+9927.1,
+9928.1,
+9929.1,
+9930.1,
+9931.1,
+9932.1,
+9933.1,
+9934.1,
+9935.1,
+9936.1,
+9937.1,
+9938.1,
+9939.1,
+9940.1,
+9941.1,
+9942.1,
+9943.1,
+9944.1,
+9945.1,
+9946.1,
+9947.1,
+9948.1,
+9949.1,
+9950.1,
+9951.1,
+9952.1,
+9953.1,
+9954.1,
+9955.1,
+9956.1,
+9957.1,
+9958.1,
+9959.1,
+9960.1,
+9961.1,
+9962.1,
+9963.1,
+9964.1,
+9965.1,
+9966.1,
+9967.1,
+9968.1,
+9969.1,
+9970.1,
+9971.1,
+9972.1,
+9973.1,
+9974.1,
+9975.1,
+9976.1,
+9977.1,
+9978.1,
+9979.1,
+9980.1,
+9981.1,
+9982.1,
+9983.1,
+9984.1,
+9985.1,
+9986.1,
+9987.1,
+9988.1,
+9989.1,
+9990.1,
+9991.1,
+9992.1,
+9993.1,
+9994.1,
+9995.1,
+9996.1,
+9997.1,
+9998.1,
+9999.1
+];
+
+var largeObject = [
+true,
+1,
+1.234,
+null,
+undefined,
+,
+"string0",
+"string1",
+"string2",
+"string3",
+"string4",
+"string5",
+"string6",
+"string7",
+"string8",
+"string9",
+"string10",
+"string11",
+"string12",
+"string13",
+"string14",
+"string15",
+"string16",
+"string17",
+"string18",
+"string19",
+"string20",
+"string21",
+"string22",
+"string23",
+"string24",
+"string25",
+"string26",
+"string27",
+"string28",
+"string29",
+"string30",
+"string31",
+"string32",
+"string33",
+"string34",
+"string35",
+"string36",
+"string37",
+"string38",
+"string39",
+"string40",
+"string41",
+"string42",
+"string43",
+"string44",
+"string45",
+"string46",
+"string47",
+"string48",
+"string49",
+"string50",
+"string51",
+"string52",
+"string53",
+"string54",
+"string55",
+"string56",
+"string57",
+"string58",
+"string59",
+"string60",
+"string61",
+"string62",
+"string63",
+"string64",
+"string65",
+"string66",
+"string67",
+"string68",
+"string69",
+"string70",
+"string71",
+"string72",
+"string73",
+"string74",
+"string75",
+"string76",
+"string77",
+"string78",
+"string79",
+"string80",
+"string81",
+"string82",
+"string83",
+"string84",
+"string85",
+"string86",
+"string87",
+"string88",
+"string89",
+"string90",
+"string91",
+"string92",
+"string93",
+"string94",
+"string95",
+"string96",
+"string97",
+"string98",
+"string99",
+"string100",
+"string101",
+"string102",
+"string103",
+"string104",
+"string105",
+"string106",
+"string107",
+"string108",
+"string109",
+"string110",
+"string111",
+"string112",
+"string113",
+"string114",
+"string115",
+"string116",
+"string117",
+"string118",
+"string119",
+"string120",
+"string121",
+"string122",
+"string123",
+"string124",
+"string125",
+"string126",
+"string127",
+"string128",
+"string129",
+"string130",
+"string131",
+"string132",
+"string133",
+"string134",
+"string135",
+"string136",
+"string137",
+"string138",
+"string139",
+"string140",
+"string141",
+"string142",
+"string143",
+"string144",
+"string145",
+"string146",
+"string147",
+"string148",
+"string149",
+"string150",
+"string151",
+"string152",
+"string153",
+"string154",
+"string155",
+"string156",
+"string157",
+"string158",
+"string159",
+"string160",
+"string161",
+"string162",
+"string163",
+"string164",
+"string165",
+"string166",
+"string167",
+"string168",
+"string169",
+"string170",
+"string171",
+"string172",
+"string173",
+"string174",
+"string175",
+"string176",
+"string177",
+"string178",
+"string179",
+"string180",
+"string181",
+"string182",
+"string183",
+"string184",
+"string185",
+"string186",
+"string187",
+"string188",
+"string189",
+"string190",
+"string191",
+"string192",
+"string193",
+"string194",
+"string195",
+"string196",
+"string197",
+"string198",
+"string199",
+"string200",
+"string201",
+"string202",
+"string203",
+"string204",
+"string205",
+"string206",
+"string207",
+"string208",
+"string209",
+"string210",
+"string211",
+"string212",
+"string213",
+"string214",
+"string215",
+"string216",
+"string217",
+"string218",
+"string219",
+"string220",
+"string221",
+"string222",
+"string223",
+"string224",
+"string225",
+"string226",
+"string227",
+"string228",
+"string229",
+"string230",
+"string231",
+"string232",
+"string233",
+"string234",
+"string235",
+"string236",
+"string237",
+"string238",
+"string239",
+"string240",
+"string241",
+"string242",
+"string243",
+"string244",
+"string245",
+"string246",
+"string247",
+"string248",
+"string249",
+"string250",
+"string251",
+"string252",
+"string253",
+"string254",
+"string255",
+"string256",
+"string257",
+"string258",
+"string259",
+"string260",
+"string261",
+"string262",
+"string263",
+"string264",
+"string265",
+"string266",
+"string267",
+"string268",
+"string269",
+"string270",
+"string271",
+"string272",
+"string273",
+"string274",
+"string275",
+"string276",
+"string277",
+"string278",
+"string279",
+"string280",
+"string281",
+"string282",
+"string283",
+"string284",
+"string285",
+"string286",
+"string287",
+"string288",
+"string289",
+"string290",
+"string291",
+"string292",
+"string293",
+"string294",
+"string295",
+"string296",
+"string297",
+"string298",
+"string299",
+"string300",
+"string301",
+"string302",
+"string303",
+"string304",
+"string305",
+"string306",
+"string307",
+"string308",
+"string309",
+"string310",
+"string311",
+"string312",
+"string313",
+"string314",
+"string315",
+"string316",
+"string317",
+"string318",
+"string319",
+"string320",
+"string321",
+"string322",
+"string323",
+"string324",
+"string325",
+"string326",
+"string327",
+"string328",
+"string329",
+"string330",
+"string331",
+"string332",
+"string333",
+"string334",
+"string335",
+"string336",
+"string337",
+"string338",
+"string339",
+"string340",
+"string341",
+"string342",
+"string343",
+"string344",
+"string345",
+"string346",
+"string347",
+"string348",
+"string349",
+"string350",
+"string351",
+"string352",
+"string353",
+"string354",
+"string355",
+"string356",
+"string357",
+"string358",
+"string359",
+"string360",
+"string361",
+"string362",
+"string363",
+"string364",
+"string365",
+"string366",
+"string367",
+"string368",
+"string369",
+"string370",
+"string371",
+"string372",
+"string373",
+"string374",
+"string375",
+"string376",
+"string377",
+"string378",
+"string379",
+"string380",
+"string381",
+"string382",
+"string383",
+"string384",
+"string385",
+"string386",
+"string387",
+"string388",
+"string389",
+"string390",
+"string391",
+"string392",
+"string393",
+"string394",
+"string395",
+"string396",
+"string397",
+"string398",
+"string399",
+"string400",
+"string401",
+"string402",
+"string403",
+"string404",
+"string405",
+"string406",
+"string407",
+"string408",
+"string409",
+"string410",
+"string411",
+"string412",
+"string413",
+"string414",
+"string415",
+"string416",
+"string417",
+"string418",
+"string419",
+"string420",
+"string421",
+"string422",
+"string423",
+"string424",
+"string425",
+"string426",
+"string427",
+"string428",
+"string429",
+"string430",
+"string431",
+"string432",
+"string433",
+"string434",
+"string435",
+"string436",
+"string437",
+"string438",
+"string439",
+"string440",
+"string441",
+"string442",
+"string443",
+"string444",
+"string445",
+"string446",
+"string447",
+"string448",
+"string449",
+"string450",
+"string451",
+"string452",
+"string453",
+"string454",
+"string455",
+"string456",
+"string457",
+"string458",
+"string459",
+"string460",
+"string461",
+"string462",
+"string463",
+"string464",
+"string465",
+"string466",
+"string467",
+"string468",
+"string469",
+"string470",
+"string471",
+"string472",
+"string473",
+"string474",
+"string475",
+"string476",
+"string477",
+"string478",
+"string479",
+"string480",
+"string481",
+"string482",
+"string483",
+"string484",
+"string485",
+"string486",
+"string487",
+"string488",
+"string489",
+"string490",
+"string491",
+"string492",
+"string493",
+"string494",
+"string495",
+"string496",
+"string497",
+"string498",
+"string499",
+"string500",
+"string501",
+"string502",
+"string503",
+"string504",
+"string505",
+"string506",
+"string507",
+"string508",
+"string509",
+"string510",
+"string511",
+"string512",
+"string513",
+"string514",
+"string515",
+"string516",
+"string517",
+"string518",
+"string519",
+"string520",
+"string521",
+"string522",
+"string523",
+"string524",
+"string525",
+"string526",
+"string527",
+"string528",
+"string529",
+"string530",
+"string531",
+"string532",
+"string533",
+"string534",
+"string535",
+"string536",
+"string537",
+"string538",
+"string539",
+"string540",
+"string541",
+"string542",
+"string543",
+"string544",
+"string545",
+"string546",
+"string547",
+"string548",
+"string549",
+"string550",
+"string551",
+"string552",
+"string553",
+"string554",
+"string555",
+"string556",
+"string557",
+"string558",
+"string559",
+"string560",
+"string561",
+"string562",
+"string563",
+"string564",
+"string565",
+"string566",
+"string567",
+"string568",
+"string569",
+"string570",
+"string571",
+"string572",
+"string573",
+"string574",
+"string575",
+"string576",
+"string577",
+"string578",
+"string579",
+"string580",
+"string581",
+"string582",
+"string583",
+"string584",
+"string585",
+"string586",
+"string587",
+"string588",
+"string589",
+"string590",
+"string591",
+"string592",
+"string593",
+"string594",
+"string595",
+"string596",
+"string597",
+"string598",
+"string599",
+"string600",
+"string601",
+"string602",
+"string603",
+"string604",
+"string605",
+"string606",
+"string607",
+"string608",
+"string609",
+"string610",
+"string611",
+"string612",
+"string613",
+"string614",
+"string615",
+"string616",
+"string617",
+"string618",
+"string619",
+"string620",
+"string621",
+"string622",
+"string623",
+"string624",
+"string625",
+"string626",
+"string627",
+"string628",
+"string629",
+"string630",
+"string631",
+"string632",
+"string633",
+"string634",
+"string635",
+"string636",
+"string637",
+"string638",
+"string639",
+"string640",
+"string641",
+"string642",
+"string643",
+"string644",
+"string645",
+"string646",
+"string647",
+"string648",
+"string649",
+"string650",
+"string651",
+"string652",
+"string653",
+"string654",
+"string655",
+"string656",
+"string657",
+"string658",
+"string659",
+"string660",
+"string661",
+"string662",
+"string663",
+"string664",
+"string665",
+"string666",
+"string667",
+"string668",
+"string669",
+"string670",
+"string671",
+"string672",
+"string673",
+"string674",
+"string675",
+"string676",
+"string677",
+"string678",
+"string679",
+"string680",
+"string681",
+"string682",
+"string683",
+"string684",
+"string685",
+"string686",
+"string687",
+"string688",
+"string689",
+"string690",
+"string691",
+"string692",
+"string693",
+"string694",
+"string695",
+"string696",
+"string697",
+"string698",
+"string699",
+"string700",
+"string701",
+"string702",
+"string703",
+"string704",
+"string705",
+"string706",
+"string707",
+"string708",
+"string709",
+"string710",
+"string711",
+"string712",
+"string713",
+"string714",
+"string715",
+"string716",
+"string717",
+"string718",
+"string719",
+"string720",
+"string721",
+"string722",
+"string723",
+"string724",
+"string725",
+"string726",
+"string727",
+"string728",
+"string729",
+"string730",
+"string731",
+"string732",
+"string733",
+"string734",
+"string735",
+"string736",
+"string737",
+"string738",
+"string739",
+"string740",
+"string741",
+"string742",
+"string743",
+"string744",
+"string745",
+"string746",
+"string747",
+"string748",
+"string749",
+"string750",
+"string751",
+"string752",
+"string753",
+"string754",
+"string755",
+"string756",
+"string757",
+"string758",
+"string759",
+"string760",
+"string761",
+"string762",
+"string763",
+"string764",
+"string765",
+"string766",
+"string767",
+"string768",
+"string769",
+"string770",
+"string771",
+"string772",
+"string773",
+"string774",
+"string775",
+"string776",
+"string777",
+"string778",
+"string779",
+"string780",
+"string781",
+"string782",
+"string783",
+"string784",
+"string785",
+"string786",
+"string787",
+"string788",
+"string789",
+"string790",
+"string791",
+"string792",
+"string793",
+"string794",
+"string795",
+"string796",
+"string797",
+"string798",
+"string799",
+"string800",
+"string801",
+"string802",
+"string803",
+"string804",
+"string805",
+"string806",
+"string807",
+"string808",
+"string809",
+"string810",
+"string811",
+"string812",
+"string813",
+"string814",
+"string815",
+"string816",
+"string817",
+"string818",
+"string819",
+"string820",
+"string821",
+"string822",
+"string823",
+"string824",
+"string825",
+"string826",
+"string827",
+"string828",
+"string829",
+"string830",
+"string831",
+"string832",
+"string833",
+"string834",
+"string835",
+"string836",
+"string837",
+"string838",
+"string839",
+"string840",
+"string841",
+"string842",
+"string843",
+"string844",
+"string845",
+"string846",
+"string847",
+"string848",
+"string849",
+"string850",
+"string851",
+"string852",
+"string853",
+"string854",
+"string855",
+"string856",
+"string857",
+"string858",
+"string859",
+"string860",
+"string861",
+"string862",
+"string863",
+"string864",
+"string865",
+"string866",
+"string867",
+"string868",
+"string869",
+"string870",
+"string871",
+"string872",
+"string873",
+"string874",
+"string875",
+"string876",
+"string877",
+"string878",
+"string879",
+"string880",
+"string881",
+"string882",
+"string883",
+"string884",
+"string885",
+"string886",
+"string887",
+"string888",
+"string889",
+"string890",
+"string891",
+"string892",
+"string893",
+"string894",
+"string895",
+"string896",
+"string897",
+"string898",
+"string899",
+"string900",
+"string901",
+"string902",
+"string903",
+"string904",
+"string905",
+"string906",
+"string907",
+"string908",
+"string909",
+"string910",
+"string911",
+"string912",
+"string913",
+"string914",
+"string915",
+"string916",
+"string917",
+"string918",
+"string919",
+"string920",
+"string921",
+"string922",
+"string923",
+"string924",
+"string925",
+"string926",
+"string927",
+"string928",
+"string929",
+"string930",
+"string931",
+"string932",
+"string933",
+"string934",
+"string935",
+"string936",
+"string937",
+"string938",
+"string939",
+"string940",
+"string941",
+"string942",
+"string943",
+"string944",
+"string945",
+"string946",
+"string947",
+"string948",
+"string949",
+"string950",
+"string951",
+"string952",
+"string953",
+"string954",
+"string955",
+"string956",
+"string957",
+"string958",
+"string959",
+"string960",
+"string961",
+"string962",
+"string963",
+"string964",
+"string965",
+"string966",
+"string967",
+"string968",
+"string969",
+"string970",
+"string971",
+"string972",
+"string973",
+"string974",
+"string975",
+"string976",
+"string977",
+"string978",
+"string979",
+"string980",
+"string981",
+"string982",
+"string983",
+"string984",
+"string985",
+"string986",
+"string987",
+"string988",
+"string989",
+"string990",
+"string991",
+"string992",
+"string993",
+"string994",
+"string995",
+"string996",
+"string997",
+"string998",
+"string999",
+"string1000",
+"string1001",
+"string1002",
+"string1003",
+"string1004",
+"string1005",
+"string1006",
+"string1007",
+"string1008",
+"string1009",
+"string1010",
+"string1011",
+"string1012",
+"string1013",
+"string1014",
+"string1015",
+"string1016",
+"string1017",
+"string1018",
+"string1019",
+"string1020",
+"string1021",
+"string1022",
+"string1023",
+"string1024",
+"string1025",
+"string1026",
+"string1027",
+"string1028",
+"string1029",
+"string1030",
+"string1031",
+"string1032",
+"string1033",
+"string1034",
+"string1035",
+"string1036",
+"string1037",
+"string1038",
+"string1039",
+"string1040",
+"string1041",
+"string1042",
+"string1043",
+"string1044",
+"string1045",
+"string1046",
+"string1047",
+"string1048",
+"string1049",
+"string1050",
+"string1051",
+"string1052",
+"string1053",
+"string1054",
+"string1055",
+"string1056",
+"string1057",
+"string1058",
+"string1059",
+"string1060",
+"string1061",
+"string1062",
+"string1063",
+"string1064",
+"string1065",
+"string1066",
+"string1067",
+"string1068",
+"string1069",
+"string1070",
+"string1071",
+"string1072",
+"string1073",
+"string1074",
+"string1075",
+"string1076",
+"string1077",
+"string1078",
+"string1079",
+"string1080",
+"string1081",
+"string1082",
+"string1083",
+"string1084",
+"string1085",
+"string1086",
+"string1087",
+"string1088",
+"string1089",
+"string1090",
+"string1091",
+"string1092",
+"string1093",
+"string1094",
+"string1095",
+"string1096",
+"string1097",
+"string1098",
+"string1099",
+"string1100",
+"string1101",
+"string1102",
+"string1103",
+"string1104",
+"string1105",
+"string1106",
+"string1107",
+"string1108",
+"string1109",
+"string1110",
+"string1111",
+"string1112",
+"string1113",
+"string1114",
+"string1115",
+"string1116",
+"string1117",
+"string1118",
+"string1119",
+"string1120",
+"string1121",
+"string1122",
+"string1123",
+"string1124",
+"string1125",
+"string1126",
+"string1127",
+"string1128",
+"string1129",
+"string1130",
+"string1131",
+"string1132",
+"string1133",
+"string1134",
+"string1135",
+"string1136",
+"string1137",
+"string1138",
+"string1139",
+"string1140",
+"string1141",
+"string1142",
+"string1143",
+"string1144",
+"string1145",
+"string1146",
+"string1147",
+"string1148",
+"string1149",
+"string1150",
+"string1151",
+"string1152",
+"string1153",
+"string1154",
+"string1155",
+"string1156",
+"string1157",
+"string1158",
+"string1159",
+"string1160",
+"string1161",
+"string1162",
+"string1163",
+"string1164",
+"string1165",
+"string1166",
+"string1167",
+"string1168",
+"string1169",
+"string1170",
+"string1171",
+"string1172",
+"string1173",
+"string1174",
+"string1175",
+"string1176",
+"string1177",
+"string1178",
+"string1179",
+"string1180",
+"string1181",
+"string1182",
+"string1183",
+"string1184",
+"string1185",
+"string1186",
+"string1187",
+"string1188",
+"string1189",
+"string1190",
+"string1191",
+"string1192",
+"string1193",
+"string1194",
+"string1195",
+"string1196",
+"string1197",
+"string1198",
+"string1199",
+"string1200",
+"string1201",
+"string1202",
+"string1203",
+"string1204",
+"string1205",
+"string1206",
+"string1207",
+"string1208",
+"string1209",
+"string1210",
+"string1211",
+"string1212",
+"string1213",
+"string1214",
+"string1215",
+"string1216",
+"string1217",
+"string1218",
+"string1219",
+"string1220",
+"string1221",
+"string1222",
+"string1223",
+"string1224",
+"string1225",
+"string1226",
+"string1227",
+"string1228",
+"string1229",
+"string1230",
+"string1231",
+"string1232",
+"string1233",
+"string1234",
+"string1235",
+"string1236",
+"string1237",
+"string1238",
+"string1239",
+"string1240",
+"string1241",
+"string1242",
+"string1243",
+"string1244",
+"string1245",
+"string1246",
+"string1247",
+"string1248",
+"string1249",
+"string1250",
+"string1251",
+"string1252",
+"string1253",
+"string1254",
+"string1255",
+"string1256",
+"string1257",
+"string1258",
+"string1259",
+"string1260",
+"string1261",
+"string1262",
+"string1263",
+"string1264",
+"string1265",
+"string1266",
+"string1267",
+"string1268",
+"string1269",
+"string1270",
+"string1271",
+"string1272",
+"string1273",
+"string1274",
+"string1275",
+"string1276",
+"string1277",
+"string1278",
+"string1279",
+"string1280",
+"string1281",
+"string1282",
+"string1283",
+"string1284",
+"string1285",
+"string1286",
+"string1287",
+"string1288",
+"string1289",
+"string1290",
+"string1291",
+"string1292",
+"string1293",
+"string1294",
+"string1295",
+"string1296",
+"string1297",
+"string1298",
+"string1299",
+"string1300",
+"string1301",
+"string1302",
+"string1303",
+"string1304",
+"string1305",
+"string1306",
+"string1307",
+"string1308",
+"string1309",
+"string1310",
+"string1311",
+"string1312",
+"string1313",
+"string1314",
+"string1315",
+"string1316",
+"string1317",
+"string1318",
+"string1319",
+"string1320",
+"string1321",
+"string1322",
+"string1323",
+"string1324",
+"string1325",
+"string1326",
+"string1327",
+"string1328",
+"string1329",
+"string1330",
+"string1331",
+"string1332",
+"string1333",
+"string1334",
+"string1335",
+"string1336",
+"string1337",
+"string1338",
+"string1339",
+"string1340",
+"string1341",
+"string1342",
+"string1343",
+"string1344",
+"string1345",
+"string1346",
+"string1347",
+"string1348",
+"string1349",
+"string1350",
+"string1351",
+"string1352",
+"string1353",
+"string1354",
+"string1355",
+"string1356",
+"string1357",
+"string1358",
+"string1359",
+"string1360",
+"string1361",
+"string1362",
+"string1363",
+"string1364",
+"string1365",
+"string1366",
+"string1367",
+"string1368",
+"string1369",
+"string1370",
+"string1371",
+"string1372",
+"string1373",
+"string1374",
+"string1375",
+"string1376",
+"string1377",
+"string1378",
+"string1379",
+"string1380",
+"string1381",
+"string1382",
+"string1383",
+"string1384",
+"string1385",
+"string1386",
+"string1387",
+"string1388",
+"string1389",
+"string1390",
+"string1391",
+"string1392",
+"string1393",
+"string1394",
+"string1395",
+"string1396",
+"string1397",
+"string1398",
+"string1399",
+"string1400",
+"string1401",
+"string1402",
+"string1403",
+"string1404",
+"string1405",
+"string1406",
+"string1407",
+"string1408",
+"string1409",
+"string1410",
+"string1411",
+"string1412",
+"string1413",
+"string1414",
+"string1415",
+"string1416",
+"string1417",
+"string1418",
+"string1419",
+"string1420",
+"string1421",
+"string1422",
+"string1423",
+"string1424",
+"string1425",
+"string1426",
+"string1427",
+"string1428",
+"string1429",
+"string1430",
+"string1431",
+"string1432",
+"string1433",
+"string1434",
+"string1435",
+"string1436",
+"string1437",
+"string1438",
+"string1439",
+"string1440",
+"string1441",
+"string1442",
+"string1443",
+"string1444",
+"string1445",
+"string1446",
+"string1447",
+"string1448",
+"string1449",
+"string1450",
+"string1451",
+"string1452",
+"string1453",
+"string1454",
+"string1455",
+"string1456",
+"string1457",
+"string1458",
+"string1459",
+"string1460",
+"string1461",
+"string1462",
+"string1463",
+"string1464",
+"string1465",
+"string1466",
+"string1467",
+"string1468",
+"string1469",
+"string1470",
+"string1471",
+"string1472",
+"string1473",
+"string1474",
+"string1475",
+"string1476",
+"string1477",
+"string1478",
+"string1479",
+"string1480",
+"string1481",
+"string1482",
+"string1483",
+"string1484",
+"string1485",
+"string1486",
+"string1487",
+"string1488",
+"string1489",
+"string1490",
+"string1491",
+"string1492",
+"string1493",
+"string1494",
+"string1495",
+"string1496",
+"string1497",
+"string1498",
+"string1499",
+"string1500",
+"string1501",
+"string1502",
+"string1503",
+"string1504",
+"string1505",
+"string1506",
+"string1507",
+"string1508",
+"string1509",
+"string1510",
+"string1511",
+"string1512",
+"string1513",
+"string1514",
+"string1515",
+"string1516",
+"string1517",
+"string1518",
+"string1519",
+"string1520",
+"string1521",
+"string1522",
+"string1523",
+"string1524",
+"string1525",
+"string1526",
+"string1527",
+"string1528",
+"string1529",
+"string1530",
+"string1531",
+"string1532",
+"string1533",
+"string1534",
+"string1535",
+"string1536",
+"string1537",
+"string1538",
+"string1539",
+"string1540",
+"string1541",
+"string1542",
+"string1543",
+"string1544",
+"string1545",
+"string1546",
+"string1547",
+"string1548",
+"string1549",
+"string1550",
+"string1551",
+"string1552",
+"string1553",
+"string1554",
+"string1555",
+"string1556",
+"string1557",
+"string1558",
+"string1559",
+"string1560",
+"string1561",
+"string1562",
+"string1563",
+"string1564",
+"string1565",
+"string1566",
+"string1567",
+"string1568",
+"string1569",
+"string1570",
+"string1571",
+"string1572",
+"string1573",
+"string1574",
+"string1575",
+"string1576",
+"string1577",
+"string1578",
+"string1579",
+"string1580",
+"string1581",
+"string1582",
+"string1583",
+"string1584",
+"string1585",
+"string1586",
+"string1587",
+"string1588",
+"string1589",
+"string1590",
+"string1591",
+"string1592",
+"string1593",
+"string1594",
+"string1595",
+"string1596",
+"string1597",
+"string1598",
+"string1599",
+"string1600",
+"string1601",
+"string1602",
+"string1603",
+"string1604",
+"string1605",
+"string1606",
+"string1607",
+"string1608",
+"string1609",
+"string1610",
+"string1611",
+"string1612",
+"string1613",
+"string1614",
+"string1615",
+"string1616",
+"string1617",
+"string1618",
+"string1619",
+"string1620",
+"string1621",
+"string1622",
+"string1623",
+"string1624",
+"string1625",
+"string1626",
+"string1627",
+"string1628",
+"string1629",
+"string1630",
+"string1631",
+"string1632",
+"string1633",
+"string1634",
+"string1635",
+"string1636",
+"string1637",
+"string1638",
+"string1639",
+"string1640",
+"string1641",
+"string1642",
+"string1643",
+"string1644",
+"string1645",
+"string1646",
+"string1647",
+"string1648",
+"string1649",
+"string1650",
+"string1651",
+"string1652",
+"string1653",
+"string1654",
+"string1655",
+"string1656",
+"string1657",
+"string1658",
+"string1659",
+"string1660",
+"string1661",
+"string1662",
+"string1663",
+"string1664",
+"string1665",
+"string1666",
+"string1667",
+"string1668",
+"string1669",
+"string1670",
+"string1671",
+"string1672",
+"string1673",
+"string1674",
+"string1675",
+"string1676",
+"string1677",
+"string1678",
+"string1679",
+"string1680",
+"string1681",
+"string1682",
+"string1683",
+"string1684",
+"string1685",
+"string1686",
+"string1687",
+"string1688",
+"string1689",
+"string1690",
+"string1691",
+"string1692",
+"string1693",
+"string1694",
+"string1695",
+"string1696",
+"string1697",
+"string1698",
+"string1699",
+"string1700",
+"string1701",
+"string1702",
+"string1703",
+"string1704",
+"string1705",
+"string1706",
+"string1707",
+"string1708",
+"string1709",
+"string1710",
+"string1711",
+"string1712",
+"string1713",
+"string1714",
+"string1715",
+"string1716",
+"string1717",
+"string1718",
+"string1719",
+"string1720",
+"string1721",
+"string1722",
+"string1723",
+"string1724",
+"string1725",
+"string1726",
+"string1727",
+"string1728",
+"string1729",
+"string1730",
+"string1731",
+"string1732",
+"string1733",
+"string1734",
+"string1735",
+"string1736",
+"string1737",
+"string1738",
+"string1739",
+"string1740",
+"string1741",
+"string1742",
+"string1743",
+"string1744",
+"string1745",
+"string1746",
+"string1747",
+"string1748",
+"string1749",
+"string1750",
+"string1751",
+"string1752",
+"string1753",
+"string1754",
+"string1755",
+"string1756",
+"string1757",
+"string1758",
+"string1759",
+"string1760",
+"string1761",
+"string1762",
+"string1763",
+"string1764",
+"string1765",
+"string1766",
+"string1767",
+"string1768",
+"string1769",
+"string1770",
+"string1771",
+"string1772",
+"string1773",
+"string1774",
+"string1775",
+"string1776",
+"string1777",
+"string1778",
+"string1779",
+"string1780",
+"string1781",
+"string1782",
+"string1783",
+"string1784",
+"string1785",
+"string1786",
+"string1787",
+"string1788",
+"string1789",
+"string1790",
+"string1791",
+"string1792",
+"string1793",
+"string1794",
+"string1795",
+"string1796",
+"string1797",
+"string1798",
+"string1799",
+"string1800",
+"string1801",
+"string1802",
+"string1803",
+"string1804",
+"string1805",
+"string1806",
+"string1807",
+"string1808",
+"string1809",
+"string1810",
+"string1811",
+"string1812",
+"string1813",
+"string1814",
+"string1815",
+"string1816",
+"string1817",
+"string1818",
+"string1819",
+"string1820",
+"string1821",
+"string1822",
+"string1823",
+"string1824",
+"string1825",
+"string1826",
+"string1827",
+"string1828",
+"string1829",
+"string1830",
+"string1831",
+"string1832",
+"string1833",
+"string1834",
+"string1835",
+"string1836",
+"string1837",
+"string1838",
+"string1839",
+"string1840",
+"string1841",
+"string1842",
+"string1843",
+"string1844",
+"string1845",
+"string1846",
+"string1847",
+"string1848",
+"string1849",
+"string1850",
+"string1851",
+"string1852",
+"string1853",
+"string1854",
+"string1855",
+"string1856",
+"string1857",
+"string1858",
+"string1859",
+"string1860",
+"string1861",
+"string1862",
+"string1863",
+"string1864",
+"string1865",
+"string1866",
+"string1867",
+"string1868",
+"string1869",
+"string1870",
+"string1871",
+"string1872",
+"string1873",
+"string1874",
+"string1875",
+"string1876",
+"string1877",
+"string1878",
+"string1879",
+"string1880",
+"string1881",
+"string1882",
+"string1883",
+"string1884",
+"string1885",
+"string1886",
+"string1887",
+"string1888",
+"string1889",
+"string1890",
+"string1891",
+"string1892",
+"string1893",
+"string1894",
+"string1895",
+"string1896",
+"string1897",
+"string1898",
+"string1899",
+"string1900",
+"string1901",
+"string1902",
+"string1903",
+"string1904",
+"string1905",
+"string1906",
+"string1907",
+"string1908",
+"string1909",
+"string1910",
+"string1911",
+"string1912",
+"string1913",
+"string1914",
+"string1915",
+"string1916",
+"string1917",
+"string1918",
+"string1919",
+"string1920",
+"string1921",
+"string1922",
+"string1923",
+"string1924",
+"string1925",
+"string1926",
+"string1927",
+"string1928",
+"string1929",
+"string1930",
+"string1931",
+"string1932",
+"string1933",
+"string1934",
+"string1935",
+"string1936",
+"string1937",
+"string1938",
+"string1939",
+"string1940",
+"string1941",
+"string1942",
+"string1943",
+"string1944",
+"string1945",
+"string1946",
+"string1947",
+"string1948",
+"string1949",
+"string1950",
+"string1951",
+"string1952",
+"string1953",
+"string1954",
+"string1955",
+"string1956",
+"string1957",
+"string1958",
+"string1959",
+"string1960",
+"string1961",
+"string1962",
+"string1963",
+"string1964",
+"string1965",
+"string1966",
+"string1967",
+"string1968",
+"string1969",
+"string1970",
+"string1971",
+"string1972",
+"string1973",
+"string1974",
+"string1975",
+"string1976",
+"string1977",
+"string1978",
+"string1979",
+"string1980",
+"string1981",
+"string1982",
+"string1983",
+"string1984",
+"string1985",
+"string1986",
+"string1987",
+"string1988",
+"string1989",
+"string1990",
+"string1991",
+"string1992",
+"string1993",
+"string1994",
+"string1995",
+"string1996",
+"string1997",
+"string1998",
+"string1999",
+"string2000",
+"string2001",
+"string2002",
+"string2003",
+"string2004",
+"string2005",
+"string2006",
+"string2007",
+"string2008",
+"string2009",
+"string2010",
+"string2011",
+"string2012",
+"string2013",
+"string2014",
+"string2015",
+"string2016",
+"string2017",
+"string2018",
+"string2019",
+"string2020",
+"string2021",
+"string2022",
+"string2023",
+"string2024",
+"string2025",
+"string2026",
+"string2027",
+"string2028",
+"string2029",
+"string2030",
+"string2031",
+"string2032",
+"string2033",
+"string2034",
+"string2035",
+"string2036",
+"string2037",
+"string2038",
+"string2039",
+"string2040",
+"string2041",
+"string2042",
+"string2043",
+"string2044",
+"string2045",
+"string2046",
+"string2047",
+"string2048",
+"string2049",
+"string2050",
+"string2051",
+"string2052",
+"string2053",
+"string2054",
+"string2055",
+"string2056",
+"string2057",
+"string2058",
+"string2059",
+"string2060",
+"string2061",
+"string2062",
+"string2063",
+"string2064",
+"string2065",
+"string2066",
+"string2067",
+"string2068",
+"string2069",
+"string2070",
+"string2071",
+"string2072",
+"string2073",
+"string2074",
+"string2075",
+"string2076",
+"string2077",
+"string2078",
+"string2079",
+"string2080",
+"string2081",
+"string2082",
+"string2083",
+"string2084",
+"string2085",
+"string2086",
+"string2087",
+"string2088",
+"string2089",
+"string2090",
+"string2091",
+"string2092",
+"string2093",
+"string2094",
+"string2095",
+"string2096",
+"string2097",
+"string2098",
+"string2099",
+"string2100",
+"string2101",
+"string2102",
+"string2103",
+"string2104",
+"string2105",
+"string2106",
+"string2107",
+"string2108",
+"string2109",
+"string2110",
+"string2111",
+"string2112",
+"string2113",
+"string2114",
+"string2115",
+"string2116",
+"string2117",
+"string2118",
+"string2119",
+"string2120",
+"string2121",
+"string2122",
+"string2123",
+"string2124",
+"string2125",
+"string2126",
+"string2127",
+"string2128",
+"string2129",
+"string2130",
+"string2131",
+"string2132",
+"string2133",
+"string2134",
+"string2135",
+"string2136",
+"string2137",
+"string2138",
+"string2139",
+"string2140",
+"string2141",
+"string2142",
+"string2143",
+"string2144",
+"string2145",
+"string2146",
+"string2147",
+"string2148",
+"string2149",
+"string2150",
+"string2151",
+"string2152",
+"string2153",
+"string2154",
+"string2155",
+"string2156",
+"string2157",
+"string2158",
+"string2159",
+"string2160",
+"string2161",
+"string2162",
+"string2163",
+"string2164",
+"string2165",
+"string2166",
+"string2167",
+"string2168",
+"string2169",
+"string2170",
+"string2171",
+"string2172",
+"string2173",
+"string2174",
+"string2175",
+"string2176",
+"string2177",
+"string2178",
+"string2179",
+"string2180",
+"string2181",
+"string2182",
+"string2183",
+"string2184",
+"string2185",
+"string2186",
+"string2187",
+"string2188",
+"string2189",
+"string2190",
+"string2191",
+"string2192",
+"string2193",
+"string2194",
+"string2195",
+"string2196",
+"string2197",
+"string2198",
+"string2199",
+"string2200",
+"string2201",
+"string2202",
+"string2203",
+"string2204",
+"string2205",
+"string2206",
+"string2207",
+"string2208",
+"string2209",
+"string2210",
+"string2211",
+"string2212",
+"string2213",
+"string2214",
+"string2215",
+"string2216",
+"string2217",
+"string2218",
+"string2219",
+"string2220",
+"string2221",
+"string2222",
+"string2223",
+"string2224",
+"string2225",
+"string2226",
+"string2227",
+"string2228",
+"string2229",
+"string2230",
+"string2231",
+"string2232",
+"string2233",
+"string2234",
+"string2235",
+"string2236",
+"string2237",
+"string2238",
+"string2239",
+"string2240",
+"string2241",
+"string2242",
+"string2243",
+"string2244",
+"string2245",
+"string2246",
+"string2247",
+"string2248",
+"string2249",
+"string2250",
+"string2251",
+"string2252",
+"string2253",
+"string2254",
+"string2255",
+"string2256",
+"string2257",
+"string2258",
+"string2259",
+"string2260",
+"string2261",
+"string2262",
+"string2263",
+"string2264",
+"string2265",
+"string2266",
+"string2267",
+"string2268",
+"string2269",
+"string2270",
+"string2271",
+"string2272",
+"string2273",
+"string2274",
+"string2275",
+"string2276",
+"string2277",
+"string2278",
+"string2279",
+"string2280",
+"string2281",
+"string2282",
+"string2283",
+"string2284",
+"string2285",
+"string2286",
+"string2287",
+"string2288",
+"string2289",
+"string2290",
+"string2291",
+"string2292",
+"string2293",
+"string2294",
+"string2295",
+"string2296",
+"string2297",
+"string2298",
+"string2299",
+"string2300",
+"string2301",
+"string2302",
+"string2303",
+"string2304",
+"string2305",
+"string2306",
+"string2307",
+"string2308",
+"string2309",
+"string2310",
+"string2311",
+"string2312",
+"string2313",
+"string2314",
+"string2315",
+"string2316",
+"string2317",
+"string2318",
+"string2319",
+"string2320",
+"string2321",
+"string2322",
+"string2323",
+"string2324",
+"string2325",
+"string2326",
+"string2327",
+"string2328",
+"string2329",
+"string2330",
+"string2331",
+"string2332",
+"string2333",
+"string2334",
+"string2335",
+"string2336",
+"string2337",
+"string2338",
+"string2339",
+"string2340",
+"string2341",
+"string2342",
+"string2343",
+"string2344",
+"string2345",
+"string2346",
+"string2347",
+"string2348",
+"string2349",
+"string2350",
+"string2351",
+"string2352",
+"string2353",
+"string2354",
+"string2355",
+"string2356",
+"string2357",
+"string2358",
+"string2359",
+"string2360",
+"string2361",
+"string2362",
+"string2363",
+"string2364",
+"string2365",
+"string2366",
+"string2367",
+"string2368",
+"string2369",
+"string2370",
+"string2371",
+"string2372",
+"string2373",
+"string2374",
+"string2375",
+"string2376",
+"string2377",
+"string2378",
+"string2379",
+"string2380",
+"string2381",
+"string2382",
+"string2383",
+"string2384",
+"string2385",
+"string2386",
+"string2387",
+"string2388",
+"string2389",
+"string2390",
+"string2391",
+"string2392",
+"string2393",
+"string2394",
+"string2395",
+"string2396",
+"string2397",
+"string2398",
+"string2399",
+"string2400",
+"string2401",
+"string2402",
+"string2403",
+"string2404",
+"string2405",
+"string2406",
+"string2407",
+"string2408",
+"string2409",
+"string2410",
+"string2411",
+"string2412",
+"string2413",
+"string2414",
+"string2415",
+"string2416",
+"string2417",
+"string2418",
+"string2419",
+"string2420",
+"string2421",
+"string2422",
+"string2423",
+"string2424",
+"string2425",
+"string2426",
+"string2427",
+"string2428",
+"string2429",
+"string2430",
+"string2431",
+"string2432",
+"string2433",
+"string2434",
+"string2435",
+"string2436",
+"string2437",
+"string2438",
+"string2439",
+"string2440",
+"string2441",
+"string2442",
+"string2443",
+"string2444",
+"string2445",
+"string2446",
+"string2447",
+"string2448",
+"string2449",
+"string2450",
+"string2451",
+"string2452",
+"string2453",
+"string2454",
+"string2455",
+"string2456",
+"string2457",
+"string2458",
+"string2459",
+"string2460",
+"string2461",
+"string2462",
+"string2463",
+"string2464",
+"string2465",
+"string2466",
+"string2467",
+"string2468",
+"string2469",
+"string2470",
+"string2471",
+"string2472",
+"string2473",
+"string2474",
+"string2475",
+"string2476",
+"string2477",
+"string2478",
+"string2479",
+"string2480",
+"string2481",
+"string2482",
+"string2483",
+"string2484",
+"string2485",
+"string2486",
+"string2487",
+"string2488",
+"string2489",
+"string2490",
+"string2491",
+"string2492",
+"string2493",
+"string2494",
+"string2495",
+"string2496",
+"string2497",
+"string2498",
+"string2499",
+"string2500",
+"string2501",
+"string2502",
+"string2503",
+"string2504",
+"string2505",
+"string2506",
+"string2507",
+"string2508",
+"string2509",
+"string2510",
+"string2511",
+"string2512",
+"string2513",
+"string2514",
+"string2515",
+"string2516",
+"string2517",
+"string2518",
+"string2519",
+"string2520",
+"string2521",
+"string2522",
+"string2523",
+"string2524",
+"string2525",
+"string2526",
+"string2527",
+"string2528",
+"string2529",
+"string2530",
+"string2531",
+"string2532",
+"string2533",
+"string2534",
+"string2535",
+"string2536",
+"string2537",
+"string2538",
+"string2539",
+"string2540",
+"string2541",
+"string2542",
+"string2543",
+"string2544",
+"string2545",
+"string2546",
+"string2547",
+"string2548",
+"string2549",
+"string2550",
+"string2551",
+"string2552",
+"string2553",
+"string2554",
+"string2555",
+"string2556",
+"string2557",
+"string2558",
+"string2559",
+"string2560",
+"string2561",
+"string2562",
+"string2563",
+"string2564",
+"string2565",
+"string2566",
+"string2567",
+"string2568",
+"string2569",
+"string2570",
+"string2571",
+"string2572",
+"string2573",
+"string2574",
+"string2575",
+"string2576",
+"string2577",
+"string2578",
+"string2579",
+"string2580",
+"string2581",
+"string2582",
+"string2583",
+"string2584",
+"string2585",
+"string2586",
+"string2587",
+"string2588",
+"string2589",
+"string2590",
+"string2591",
+"string2592",
+"string2593",
+"string2594",
+"string2595",
+"string2596",
+"string2597",
+"string2598",
+"string2599",
+"string2600",
+"string2601",
+"string2602",
+"string2603",
+"string2604",
+"string2605",
+"string2606",
+"string2607",
+"string2608",
+"string2609",
+"string2610",
+"string2611",
+"string2612",
+"string2613",
+"string2614",
+"string2615",
+"string2616",
+"string2617",
+"string2618",
+"string2619",
+"string2620",
+"string2621",
+"string2622",
+"string2623",
+"string2624",
+"string2625",
+"string2626",
+"string2627",
+"string2628",
+"string2629",
+"string2630",
+"string2631",
+"string2632",
+"string2633",
+"string2634",
+"string2635",
+"string2636",
+"string2637",
+"string2638",
+"string2639",
+"string2640",
+"string2641",
+"string2642",
+"string2643",
+"string2644",
+"string2645",
+"string2646",
+"string2647",
+"string2648",
+"string2649",
+"string2650",
+"string2651",
+"string2652",
+"string2653",
+"string2654",
+"string2655",
+"string2656",
+"string2657",
+"string2658",
+"string2659",
+"string2660",
+"string2661",
+"string2662",
+"string2663",
+"string2664",
+"string2665",
+"string2666",
+"string2667",
+"string2668",
+"string2669",
+"string2670",
+"string2671",
+"string2672",
+"string2673",
+"string2674",
+"string2675",
+"string2676",
+"string2677",
+"string2678",
+"string2679",
+"string2680",
+"string2681",
+"string2682",
+"string2683",
+"string2684",
+"string2685",
+"string2686",
+"string2687",
+"string2688",
+"string2689",
+"string2690",
+"string2691",
+"string2692",
+"string2693",
+"string2694",
+"string2695",
+"string2696",
+"string2697",
+"string2698",
+"string2699",
+"string2700",
+"string2701",
+"string2702",
+"string2703",
+"string2704",
+"string2705",
+"string2706",
+"string2707",
+"string2708",
+"string2709",
+"string2710",
+"string2711",
+"string2712",
+"string2713",
+"string2714",
+"string2715",
+"string2716",
+"string2717",
+"string2718",
+"string2719",
+"string2720",
+"string2721",
+"string2722",
+"string2723",
+"string2724",
+"string2725",
+"string2726",
+"string2727",
+"string2728",
+"string2729",
+"string2730",
+"string2731",
+"string2732",
+"string2733",
+"string2734",
+"string2735",
+"string2736",
+"string2737",
+"string2738",
+"string2739",
+"string2740",
+"string2741",
+"string2742",
+"string2743",
+"string2744",
+"string2745",
+"string2746",
+"string2747",
+"string2748",
+"string2749",
+"string2750",
+"string2751",
+"string2752",
+"string2753",
+"string2754",
+"string2755",
+"string2756",
+"string2757",
+"string2758",
+"string2759",
+"string2760",
+"string2761",
+"string2762",
+"string2763",
+"string2764",
+"string2765",
+"string2766",
+"string2767",
+"string2768",
+"string2769",
+"string2770",
+"string2771",
+"string2772",
+"string2773",
+"string2774",
+"string2775",
+"string2776",
+"string2777",
+"string2778",
+"string2779",
+"string2780",
+"string2781",
+"string2782",
+"string2783",
+"string2784",
+"string2785",
+"string2786",
+"string2787",
+"string2788",
+"string2789",
+"string2790",
+"string2791",
+"string2792",
+"string2793",
+"string2794",
+"string2795",
+"string2796",
+"string2797",
+"string2798",
+"string2799",
+"string2800",
+"string2801",
+"string2802",
+"string2803",
+"string2804",
+"string2805",
+"string2806",
+"string2807",
+"string2808",
+"string2809",
+"string2810",
+"string2811",
+"string2812",
+"string2813",
+"string2814",
+"string2815",
+"string2816",
+"string2817",
+"string2818",
+"string2819",
+"string2820",
+"string2821",
+"string2822",
+"string2823",
+"string2824",
+"string2825",
+"string2826",
+"string2827",
+"string2828",
+"string2829",
+"string2830",
+"string2831",
+"string2832",
+"string2833",
+"string2834",
+"string2835",
+"string2836",
+"string2837",
+"string2838",
+"string2839",
+"string2840",
+"string2841",
+"string2842",
+"string2843",
+"string2844",
+"string2845",
+"string2846",
+"string2847",
+"string2848",
+"string2849",
+"string2850",
+"string2851",
+"string2852",
+"string2853",
+"string2854",
+"string2855",
+"string2856",
+"string2857",
+"string2858",
+"string2859",
+"string2860",
+"string2861",
+"string2862",
+"string2863",
+"string2864",
+"string2865",
+"string2866",
+"string2867",
+"string2868",
+"string2869",
+"string2870",
+"string2871",
+"string2872",
+"string2873",
+"string2874",
+"string2875",
+"string2876",
+"string2877",
+"string2878",
+"string2879",
+"string2880",
+"string2881",
+"string2882",
+"string2883",
+"string2884",
+"string2885",
+"string2886",
+"string2887",
+"string2888",
+"string2889",
+"string2890",
+"string2891",
+"string2892",
+"string2893",
+"string2894",
+"string2895",
+"string2896",
+"string2897",
+"string2898",
+"string2899",
+"string2900",
+"string2901",
+"string2902",
+"string2903",
+"string2904",
+"string2905",
+"string2906",
+"string2907",
+"string2908",
+"string2909",
+"string2910",
+"string2911",
+"string2912",
+"string2913",
+"string2914",
+"string2915",
+"string2916",
+"string2917",
+"string2918",
+"string2919",
+"string2920",
+"string2921",
+"string2922",
+"string2923",
+"string2924",
+"string2925",
+"string2926",
+"string2927",
+"string2928",
+"string2929",
+"string2930",
+"string2931",
+"string2932",
+"string2933",
+"string2934",
+"string2935",
+"string2936",
+"string2937",
+"string2938",
+"string2939",
+"string2940",
+"string2941",
+"string2942",
+"string2943",
+"string2944",
+"string2945",
+"string2946",
+"string2947",
+"string2948",
+"string2949",
+"string2950",
+"string2951",
+"string2952",
+"string2953",
+"string2954",
+"string2955",
+"string2956",
+"string2957",
+"string2958",
+"string2959",
+"string2960",
+"string2961",
+"string2962",
+"string2963",
+"string2964",
+"string2965",
+"string2966",
+"string2967",
+"string2968",
+"string2969",
+"string2970",
+"string2971",
+"string2972",
+"string2973",
+"string2974",
+"string2975",
+"string2976",
+"string2977",
+"string2978",
+"string2979",
+"string2980",
+"string2981",
+"string2982",
+"string2983",
+"string2984",
+"string2985",
+"string2986",
+"string2987",
+"string2988",
+"string2989",
+"string2990",
+"string2991",
+"string2992",
+"string2993",
+"string2994",
+"string2995",
+"string2996",
+"string2997",
+"string2998",
+"string2999",
+"string3000",
+"string3001",
+"string3002",
+"string3003",
+"string3004",
+"string3005",
+"string3006",
+"string3007",
+"string3008",
+"string3009",
+"string3010",
+"string3011",
+"string3012",
+"string3013",
+"string3014",
+"string3015",
+"string3016",
+"string3017",
+"string3018",
+"string3019",
+"string3020",
+"string3021",
+"string3022",
+"string3023",
+"string3024",
+"string3025",
+"string3026",
+"string3027",
+"string3028",
+"string3029",
+"string3030",
+"string3031",
+"string3032",
+"string3033",
+"string3034",
+"string3035",
+"string3036",
+"string3037",
+"string3038",
+"string3039",
+"string3040",
+"string3041",
+"string3042",
+"string3043",
+"string3044",
+"string3045",
+"string3046",
+"string3047",
+"string3048",
+"string3049",
+"string3050",
+"string3051",
+"string3052",
+"string3053",
+"string3054",
+"string3055",
+"string3056",
+"string3057",
+"string3058",
+"string3059",
+"string3060",
+"string3061",
+"string3062",
+"string3063",
+"string3064",
+"string3065",
+"string3066",
+"string3067",
+"string3068",
+"string3069",
+"string3070",
+"string3071",
+"string3072",
+"string3073",
+"string3074",
+"string3075",
+"string3076",
+"string3077",
+"string3078",
+"string3079",
+"string3080",
+"string3081",
+"string3082",
+"string3083",
+"string3084",
+"string3085",
+"string3086",
+"string3087",
+"string3088",
+"string3089",
+"string3090",
+"string3091",
+"string3092",
+"string3093",
+"string3094",
+"string3095",
+"string3096",
+"string3097",
+"string3098",
+"string3099",
+"string3100",
+"string3101",
+"string3102",
+"string3103",
+"string3104",
+"string3105",
+"string3106",
+"string3107",
+"string3108",
+"string3109",
+"string3110",
+"string3111",
+"string3112",
+"string3113",
+"string3114",
+"string3115",
+"string3116",
+"string3117",
+"string3118",
+"string3119",
+"string3120",
+"string3121",
+"string3122",
+"string3123",
+"string3124",
+"string3125",
+"string3126",
+"string3127",
+"string3128",
+"string3129",
+"string3130",
+"string3131",
+"string3132",
+"string3133",
+"string3134",
+"string3135",
+"string3136",
+"string3137",
+"string3138",
+"string3139",
+"string3140",
+"string3141",
+"string3142",
+"string3143",
+"string3144",
+"string3145",
+"string3146",
+"string3147",
+"string3148",
+"string3149",
+"string3150",
+"string3151",
+"string3152",
+"string3153",
+"string3154",
+"string3155",
+"string3156",
+"string3157",
+"string3158",
+"string3159",
+"string3160",
+"string3161",
+"string3162",
+"string3163",
+"string3164",
+"string3165",
+"string3166",
+"string3167",
+"string3168",
+"string3169",
+"string3170",
+"string3171",
+"string3172",
+"string3173",
+"string3174",
+"string3175",
+"string3176",
+"string3177",
+"string3178",
+"string3179",
+"string3180",
+"string3181",
+"string3182",
+"string3183",
+"string3184",
+"string3185",
+"string3186",
+"string3187",
+"string3188",
+"string3189",
+"string3190",
+"string3191",
+"string3192",
+"string3193",
+"string3194",
+"string3195",
+"string3196",
+"string3197",
+"string3198",
+"string3199",
+"string3200",
+"string3201",
+"string3202",
+"string3203",
+"string3204",
+"string3205",
+"string3206",
+"string3207",
+"string3208",
+"string3209",
+"string3210",
+"string3211",
+"string3212",
+"string3213",
+"string3214",
+"string3215",
+"string3216",
+"string3217",
+"string3218",
+"string3219",
+"string3220",
+"string3221",
+"string3222",
+"string3223",
+"string3224",
+"string3225",
+"string3226",
+"string3227",
+"string3228",
+"string3229",
+"string3230",
+"string3231",
+"string3232",
+"string3233",
+"string3234",
+"string3235",
+"string3236",
+"string3237",
+"string3238",
+"string3239",
+"string3240",
+"string3241",
+"string3242",
+"string3243",
+"string3244",
+"string3245",
+"string3246",
+"string3247",
+"string3248",
+"string3249",
+"string3250",
+"string3251",
+"string3252",
+"string3253",
+"string3254",
+"string3255",
+"string3256",
+"string3257",
+"string3258",
+"string3259",
+"string3260",
+"string3261",
+"string3262",
+"string3263",
+"string3264",
+"string3265",
+"string3266",
+"string3267",
+"string3268",
+"string3269",
+"string3270",
+"string3271",
+"string3272",
+"string3273",
+"string3274",
+"string3275",
+"string3276",
+"string3277",
+"string3278",
+"string3279",
+"string3280",
+"string3281",
+"string3282",
+"string3283",
+"string3284",
+"string3285",
+"string3286",
+"string3287",
+"string3288",
+"string3289",
+"string3290",
+"string3291",
+"string3292",
+"string3293",
+"string3294",
+"string3295",
+"string3296",
+"string3297",
+"string3298",
+"string3299",
+"string3300",
+"string3301",
+"string3302",
+"string3303",
+"string3304",
+"string3305",
+"string3306",
+"string3307",
+"string3308",
+"string3309",
+"string3310",
+"string3311",
+"string3312",
+"string3313",
+"string3314",
+"string3315",
+"string3316",
+"string3317",
+"string3318",
+"string3319",
+"string3320",
+"string3321",
+"string3322",
+"string3323",
+"string3324",
+"string3325",
+"string3326",
+"string3327",
+"string3328",
+"string3329",
+"string3330",
+"string3331",
+"string3332",
+"string3333",
+"string3334",
+"string3335",
+"string3336",
+"string3337",
+"string3338",
+"string3339",
+"string3340",
+"string3341",
+"string3342",
+"string3343",
+"string3344",
+"string3345",
+"string3346",
+"string3347",
+"string3348",
+"string3349",
+"string3350",
+"string3351",
+"string3352",
+"string3353",
+"string3354",
+"string3355",
+"string3356",
+"string3357",
+"string3358",
+"string3359",
+"string3360",
+"string3361",
+"string3362",
+"string3363",
+"string3364",
+"string3365",
+"string3366",
+"string3367",
+"string3368",
+"string3369",
+"string3370",
+"string3371",
+"string3372",
+"string3373",
+"string3374",
+"string3375",
+"string3376",
+"string3377",
+"string3378",
+"string3379",
+"string3380",
+"string3381",
+"string3382",
+"string3383",
+"string3384",
+"string3385",
+"string3386",
+"string3387",
+"string3388",
+"string3389",
+"string3390",
+"string3391",
+"string3392",
+"string3393",
+"string3394",
+"string3395",
+"string3396",
+"string3397",
+"string3398",
+"string3399",
+"string3400",
+"string3401",
+"string3402",
+"string3403",
+"string3404",
+"string3405",
+"string3406",
+"string3407",
+"string3408",
+"string3409",
+"string3410",
+"string3411",
+"string3412",
+"string3413",
+"string3414",
+"string3415",
+"string3416",
+"string3417",
+"string3418",
+"string3419",
+"string3420",
+"string3421",
+"string3422",
+"string3423",
+"string3424",
+"string3425",
+"string3426",
+"string3427",
+"string3428",
+"string3429",
+"string3430",
+"string3431",
+"string3432",
+"string3433",
+"string3434",
+"string3435",
+"string3436",
+"string3437",
+"string3438",
+"string3439",
+"string3440",
+"string3441",
+"string3442",
+"string3443",
+"string3444",
+"string3445",
+"string3446",
+"string3447",
+"string3448",
+"string3449",
+"string3450",
+"string3451",
+"string3452",
+"string3453",
+"string3454",
+"string3455",
+"string3456",
+"string3457",
+"string3458",
+"string3459",
+"string3460",
+"string3461",
+"string3462",
+"string3463",
+"string3464",
+"string3465",
+"string3466",
+"string3467",
+"string3468",
+"string3469",
+"string3470",
+"string3471",
+"string3472",
+"string3473",
+"string3474",
+"string3475",
+"string3476",
+"string3477",
+"string3478",
+"string3479",
+"string3480",
+"string3481",
+"string3482",
+"string3483",
+"string3484",
+"string3485",
+"string3486",
+"string3487",
+"string3488",
+"string3489",
+"string3490",
+"string3491",
+"string3492",
+"string3493",
+"string3494",
+"string3495",
+"string3496",
+"string3497",
+"string3498",
+"string3499",
+"string3500",
+"string3501",
+"string3502",
+"string3503",
+"string3504",
+"string3505",
+"string3506",
+"string3507",
+"string3508",
+"string3509",
+"string3510",
+"string3511",
+"string3512",
+"string3513",
+"string3514",
+"string3515",
+"string3516",
+"string3517",
+"string3518",
+"string3519",
+"string3520",
+"string3521",
+"string3522",
+"string3523",
+"string3524",
+"string3525",
+"string3526",
+"string3527",
+"string3528",
+"string3529",
+"string3530",
+"string3531",
+"string3532",
+"string3533",
+"string3534",
+"string3535",
+"string3536",
+"string3537",
+"string3538",
+"string3539",
+"string3540",
+"string3541",
+"string3542",
+"string3543",
+"string3544",
+"string3545",
+"string3546",
+"string3547",
+"string3548",
+"string3549",
+"string3550",
+"string3551",
+"string3552",
+"string3553",
+"string3554",
+"string3555",
+"string3556",
+"string3557",
+"string3558",
+"string3559",
+"string3560",
+"string3561",
+"string3562",
+"string3563",
+"string3564",
+"string3565",
+"string3566",
+"string3567",
+"string3568",
+"string3569",
+"string3570",
+"string3571",
+"string3572",
+"string3573",
+"string3574",
+"string3575",
+"string3576",
+"string3577",
+"string3578",
+"string3579",
+"string3580",
+"string3581",
+"string3582",
+"string3583",
+"string3584",
+"string3585",
+"string3586",
+"string3587",
+"string3588",
+"string3589",
+"string3590",
+"string3591",
+"string3592",
+"string3593",
+"string3594",
+"string3595",
+"string3596",
+"string3597",
+"string3598",
+"string3599",
+"string3600",
+"string3601",
+"string3602",
+"string3603",
+"string3604",
+"string3605",
+"string3606",
+"string3607",
+"string3608",
+"string3609",
+"string3610",
+"string3611",
+"string3612",
+"string3613",
+"string3614",
+"string3615",
+"string3616",
+"string3617",
+"string3618",
+"string3619",
+"string3620",
+"string3621",
+"string3622",
+"string3623",
+"string3624",
+"string3625",
+"string3626",
+"string3627",
+"string3628",
+"string3629",
+"string3630",
+"string3631",
+"string3632",
+"string3633",
+"string3634",
+"string3635",
+"string3636",
+"string3637",
+"string3638",
+"string3639",
+"string3640",
+"string3641",
+"string3642",
+"string3643",
+"string3644",
+"string3645",
+"string3646",
+"string3647",
+"string3648",
+"string3649",
+"string3650",
+"string3651",
+"string3652",
+"string3653",
+"string3654",
+"string3655",
+"string3656",
+"string3657",
+"string3658",
+"string3659",
+"string3660",
+"string3661",
+"string3662",
+"string3663",
+"string3664",
+"string3665",
+"string3666",
+"string3667",
+"string3668",
+"string3669",
+"string3670",
+"string3671",
+"string3672",
+"string3673",
+"string3674",
+"string3675",
+"string3676",
+"string3677",
+"string3678",
+"string3679",
+"string3680",
+"string3681",
+"string3682",
+"string3683",
+"string3684",
+"string3685",
+"string3686",
+"string3687",
+"string3688",
+"string3689",
+"string3690",
+"string3691",
+"string3692",
+"string3693",
+"string3694",
+"string3695",
+"string3696",
+"string3697",
+"string3698",
+"string3699",
+"string3700",
+"string3701",
+"string3702",
+"string3703",
+"string3704",
+"string3705",
+"string3706",
+"string3707",
+"string3708",
+"string3709",
+"string3710",
+"string3711",
+"string3712",
+"string3713",
+"string3714",
+"string3715",
+"string3716",
+"string3717",
+"string3718",
+"string3719",
+"string3720",
+"string3721",
+"string3722",
+"string3723",
+"string3724",
+"string3725",
+"string3726",
+"string3727",
+"string3728",
+"string3729",
+"string3730",
+"string3731",
+"string3732",
+"string3733",
+"string3734",
+"string3735",
+"string3736",
+"string3737",
+"string3738",
+"string3739",
+"string3740",
+"string3741",
+"string3742",
+"string3743",
+"string3744",
+"string3745",
+"string3746",
+"string3747",
+"string3748",
+"string3749",
+"string3750",
+"string3751",
+"string3752",
+"string3753",
+"string3754",
+"string3755",
+"string3756",
+"string3757",
+"string3758",
+"string3759",
+"string3760",
+"string3761",
+"string3762",
+"string3763",
+"string3764",
+"string3765",
+"string3766",
+"string3767",
+"string3768",
+"string3769",
+"string3770",
+"string3771",
+"string3772",
+"string3773",
+"string3774",
+"string3775",
+"string3776",
+"string3777",
+"string3778",
+"string3779",
+"string3780",
+"string3781",
+"string3782",
+"string3783",
+"string3784",
+"string3785",
+"string3786",
+"string3787",
+"string3788",
+"string3789",
+"string3790",
+"string3791",
+"string3792",
+"string3793",
+"string3794",
+"string3795",
+"string3796",
+"string3797",
+"string3798",
+"string3799",
+"string3800",
+"string3801",
+"string3802",
+"string3803",
+"string3804",
+"string3805",
+"string3806",
+"string3807",
+"string3808",
+"string3809",
+"string3810",
+"string3811",
+"string3812",
+"string3813",
+"string3814",
+"string3815",
+"string3816",
+"string3817",
+"string3818",
+"string3819",
+"string3820",
+"string3821",
+"string3822",
+"string3823",
+"string3824",
+"string3825",
+"string3826",
+"string3827",
+"string3828",
+"string3829",
+"string3830",
+"string3831",
+"string3832",
+"string3833",
+"string3834",
+"string3835",
+"string3836",
+"string3837",
+"string3838",
+"string3839",
+"string3840",
+"string3841",
+"string3842",
+"string3843",
+"string3844",
+"string3845",
+"string3846",
+"string3847",
+"string3848",
+"string3849",
+"string3850",
+"string3851",
+"string3852",
+"string3853",
+"string3854",
+"string3855",
+"string3856",
+"string3857",
+"string3858",
+"string3859",
+"string3860",
+"string3861",
+"string3862",
+"string3863",
+"string3864",
+"string3865",
+"string3866",
+"string3867",
+"string3868",
+"string3869",
+"string3870",
+"string3871",
+"string3872",
+"string3873",
+"string3874",
+"string3875",
+"string3876",
+"string3877",
+"string3878",
+"string3879",
+"string3880",
+"string3881",
+"string3882",
+"string3883",
+"string3884",
+"string3885",
+"string3886",
+"string3887",
+"string3888",
+"string3889",
+"string3890",
+"string3891",
+"string3892",
+"string3893",
+"string3894",
+"string3895",
+"string3896",
+"string3897",
+"string3898",
+"string3899",
+"string3900",
+"string3901",
+"string3902",
+"string3903",
+"string3904",
+"string3905",
+"string3906",
+"string3907",
+"string3908",
+"string3909",
+"string3910",
+"string3911",
+"string3912",
+"string3913",
+"string3914",
+"string3915",
+"string3916",
+"string3917",
+"string3918",
+"string3919",
+"string3920",
+"string3921",
+"string3922",
+"string3923",
+"string3924",
+"string3925",
+"string3926",
+"string3927",
+"string3928",
+"string3929",
+"string3930",
+"string3931",
+"string3932",
+"string3933",
+"string3934",
+"string3935",
+"string3936",
+"string3937",
+"string3938",
+"string3939",
+"string3940",
+"string3941",
+"string3942",
+"string3943",
+"string3944",
+"string3945",
+"string3946",
+"string3947",
+"string3948",
+"string3949",
+"string3950",
+"string3951",
+"string3952",
+"string3953",
+"string3954",
+"string3955",
+"string3956",
+"string3957",
+"string3958",
+"string3959",
+"string3960",
+"string3961",
+"string3962",
+"string3963",
+"string3964",
+"string3965",
+"string3966",
+"string3967",
+"string3968",
+"string3969",
+"string3970",
+"string3971",
+"string3972",
+"string3973",
+"string3974",
+"string3975",
+"string3976",
+"string3977",
+"string3978",
+"string3979",
+"string3980",
+"string3981",
+"string3982",
+"string3983",
+"string3984",
+"string3985",
+"string3986",
+"string3987",
+"string3988",
+"string3989",
+"string3990",
+"string3991",
+"string3992",
+"string3993",
+"string3994",
+"string3995",
+"string3996",
+"string3997",
+"string3998",
+"string3999",
+"string4000",
+"string4001",
+"string4002",
+"string4003",
+"string4004",
+"string4005",
+"string4006",
+"string4007",
+"string4008",
+"string4009",
+"string4010",
+"string4011",
+"string4012",
+"string4013",
+"string4014",
+"string4015",
+"string4016",
+"string4017",
+"string4018",
+"string4019",
+"string4020",
+"string4021",
+"string4022",
+"string4023",
+"string4024",
+"string4025",
+"string4026",
+"string4027",
+"string4028",
+"string4029",
+"string4030",
+"string4031",
+"string4032",
+"string4033",
+"string4034",
+"string4035",
+"string4036",
+"string4037",
+"string4038",
+"string4039",
+"string4040",
+"string4041",
+"string4042",
+"string4043",
+"string4044",
+"string4045",
+"string4046",
+"string4047",
+"string4048",
+"string4049",
+"string4050",
+"string4051",
+"string4052",
+"string4053",
+"string4054",
+"string4055",
+"string4056",
+"string4057",
+"string4058",
+"string4059",
+"string4060",
+"string4061",
+"string4062",
+"string4063",
+"string4064",
+"string4065",
+"string4066",
+"string4067",
+"string4068",
+"string4069",
+"string4070",
+"string4071",
+"string4072",
+"string4073",
+"string4074",
+"string4075",
+"string4076",
+"string4077",
+"string4078",
+"string4079",
+"string4080",
+"string4081",
+"string4082",
+"string4083",
+"string4084",
+"string4085",
+"string4086",
+"string4087",
+"string4088",
+"string4089",
+"string4090",
+"string4091",
+"string4092",
+"string4093",
+"string4094",
+"string4095",
+"string4096",
+"string4097",
+"string4098",
+"string4099",
+"string4100",
+"string4101",
+"string4102",
+"string4103",
+"string4104",
+"string4105",
+"string4106",
+"string4107",
+"string4108",
+"string4109",
+"string4110",
+"string4111",
+"string4112",
+"string4113",
+"string4114",
+"string4115",
+"string4116",
+"string4117",
+"string4118",
+"string4119",
+"string4120",
+"string4121",
+"string4122",
+"string4123",
+"string4124",
+"string4125",
+"string4126",
+"string4127",
+"string4128",
+"string4129",
+"string4130",
+"string4131",
+"string4132",
+"string4133",
+"string4134",
+"string4135",
+"string4136",
+"string4137",
+"string4138",
+"string4139",
+"string4140",
+"string4141",
+"string4142",
+"string4143",
+"string4144",
+"string4145",
+"string4146",
+"string4147",
+"string4148",
+"string4149",
+"string4150",
+"string4151",
+"string4152",
+"string4153",
+"string4154",
+"string4155",
+"string4156",
+"string4157",
+"string4158",
+"string4159",
+"string4160",
+"string4161",
+"string4162",
+"string4163",
+"string4164",
+"string4165",
+"string4166",
+"string4167",
+"string4168",
+"string4169",
+"string4170",
+"string4171",
+"string4172",
+"string4173",
+"string4174",
+"string4175",
+"string4176",
+"string4177",
+"string4178",
+"string4179",
+"string4180",
+"string4181",
+"string4182",
+"string4183",
+"string4184",
+"string4185",
+"string4186",
+"string4187",
+"string4188",
+"string4189",
+"string4190",
+"string4191",
+"string4192",
+"string4193",
+"string4194",
+"string4195",
+"string4196",
+"string4197",
+"string4198",
+"string4199",
+"string4200",
+"string4201",
+"string4202",
+"string4203",
+"string4204",
+"string4205",
+"string4206",
+"string4207",
+"string4208",
+"string4209",
+"string4210",
+"string4211",
+"string4212",
+"string4213",
+"string4214",
+"string4215",
+"string4216",
+"string4217",
+"string4218",
+"string4219",
+"string4220",
+"string4221",
+"string4222",
+"string4223",
+"string4224",
+"string4225",
+"string4226",
+"string4227",
+"string4228",
+"string4229",
+"string4230",
+"string4231",
+"string4232",
+"string4233",
+"string4234",
+"string4235",
+"string4236",
+"string4237",
+"string4238",
+"string4239",
+"string4240",
+"string4241",
+"string4242",
+"string4243",
+"string4244",
+"string4245",
+"string4246",
+"string4247",
+"string4248",
+"string4249",
+"string4250",
+"string4251",
+"string4252",
+"string4253",
+"string4254",
+"string4255",
+"string4256",
+"string4257",
+"string4258",
+"string4259",
+"string4260",
+"string4261",
+"string4262",
+"string4263",
+"string4264",
+"string4265",
+"string4266",
+"string4267",
+"string4268",
+"string4269",
+"string4270",
+"string4271",
+"string4272",
+"string4273",
+"string4274",
+"string4275",
+"string4276",
+"string4277",
+"string4278",
+"string4279",
+"string4280",
+"string4281",
+"string4282",
+"string4283",
+"string4284",
+"string4285",
+"string4286",
+"string4287",
+"string4288",
+"string4289",
+"string4290",
+"string4291",
+"string4292",
+"string4293",
+"string4294",
+"string4295",
+"string4296",
+"string4297",
+"string4298",
+"string4299",
+"string4300",
+"string4301",
+"string4302",
+"string4303",
+"string4304",
+"string4305",
+"string4306",
+"string4307",
+"string4308",
+"string4309",
+"string4310",
+"string4311",
+"string4312",
+"string4313",
+"string4314",
+"string4315",
+"string4316",
+"string4317",
+"string4318",
+"string4319",
+"string4320",
+"string4321",
+"string4322",
+"string4323",
+"string4324",
+"string4325",
+"string4326",
+"string4327",
+"string4328",
+"string4329",
+"string4330",
+"string4331",
+"string4332",
+"string4333",
+"string4334",
+"string4335",
+"string4336",
+"string4337",
+"string4338",
+"string4339",
+"string4340",
+"string4341",
+"string4342",
+"string4343",
+"string4344",
+"string4345",
+"string4346",
+"string4347",
+"string4348",
+"string4349",
+"string4350",
+"string4351",
+"string4352",
+"string4353",
+"string4354",
+"string4355",
+"string4356",
+"string4357",
+"string4358",
+"string4359",
+"string4360",
+"string4361",
+"string4362",
+"string4363",
+"string4364",
+"string4365",
+"string4366",
+"string4367",
+"string4368",
+"string4369",
+"string4370",
+"string4371",
+"string4372",
+"string4373",
+"string4374",
+"string4375",
+"string4376",
+"string4377",
+"string4378",
+"string4379",
+"string4380",
+"string4381",
+"string4382",
+"string4383",
+"string4384",
+"string4385",
+"string4386",
+"string4387",
+"string4388",
+"string4389",
+"string4390",
+"string4391",
+"string4392",
+"string4393",
+"string4394",
+"string4395",
+"string4396",
+"string4397",
+"string4398",
+"string4399",
+"string4400",
+"string4401",
+"string4402",
+"string4403",
+"string4404",
+"string4405",
+"string4406",
+"string4407",
+"string4408",
+"string4409",
+"string4410",
+"string4411",
+"string4412",
+"string4413",
+"string4414",
+"string4415",
+"string4416",
+"string4417",
+"string4418",
+"string4419",
+"string4420",
+"string4421",
+"string4422",
+"string4423",
+"string4424",
+"string4425",
+"string4426",
+"string4427",
+"string4428",
+"string4429",
+"string4430",
+"string4431",
+"string4432",
+"string4433",
+"string4434",
+"string4435",
+"string4436",
+"string4437",
+"string4438",
+"string4439",
+"string4440",
+"string4441",
+"string4442",
+"string4443",
+"string4444",
+"string4445",
+"string4446",
+"string4447",
+"string4448",
+"string4449",
+"string4450",
+"string4451",
+"string4452",
+"string4453",
+"string4454",
+"string4455",
+"string4456",
+"string4457",
+"string4458",
+"string4459",
+"string4460",
+"string4461",
+"string4462",
+"string4463",
+"string4464",
+"string4465",
+"string4466",
+"string4467",
+"string4468",
+"string4469",
+"string4470",
+"string4471",
+"string4472",
+"string4473",
+"string4474",
+"string4475",
+"string4476",
+"string4477",
+"string4478",
+"string4479",
+"string4480",
+"string4481",
+"string4482",
+"string4483",
+"string4484",
+"string4485",
+"string4486",
+"string4487",
+"string4488",
+"string4489",
+"string4490",
+"string4491",
+"string4492",
+"string4493",
+"string4494",
+"string4495",
+"string4496",
+"string4497",
+"string4498",
+"string4499",
+"string4500",
+"string4501",
+"string4502",
+"string4503",
+"string4504",
+"string4505",
+"string4506",
+"string4507",
+"string4508",
+"string4509",
+"string4510",
+"string4511",
+"string4512",
+"string4513",
+"string4514",
+"string4515",
+"string4516",
+"string4517",
+"string4518",
+"string4519",
+"string4520",
+"string4521",
+"string4522",
+"string4523",
+"string4524",
+"string4525",
+"string4526",
+"string4527",
+"string4528",
+"string4529",
+"string4530",
+"string4531",
+"string4532",
+"string4533",
+"string4534",
+"string4535",
+"string4536",
+"string4537",
+"string4538",
+"string4539",
+"string4540",
+"string4541",
+"string4542",
+"string4543",
+"string4544",
+"string4545",
+"string4546",
+"string4547",
+"string4548",
+"string4549",
+"string4550",
+"string4551",
+"string4552",
+"string4553",
+"string4554",
+"string4555",
+"string4556",
+"string4557",
+"string4558",
+"string4559",
+"string4560",
+"string4561",
+"string4562",
+"string4563",
+"string4564",
+"string4565",
+"string4566",
+"string4567",
+"string4568",
+"string4569",
+"string4570",
+"string4571",
+"string4572",
+"string4573",
+"string4574",
+"string4575",
+"string4576",
+"string4577",
+"string4578",
+"string4579",
+"string4580",
+"string4581",
+"string4582",
+"string4583",
+"string4584",
+"string4585",
+"string4586",
+"string4587",
+"string4588",
+"string4589",
+"string4590",
+"string4591",
+"string4592",
+"string4593",
+"string4594",
+"string4595",
+"string4596",
+"string4597",
+"string4598",
+"string4599",
+"string4600",
+"string4601",
+"string4602",
+"string4603",
+"string4604",
+"string4605",
+"string4606",
+"string4607",
+"string4608",
+"string4609",
+"string4610",
+"string4611",
+"string4612",
+"string4613",
+"string4614",
+"string4615",
+"string4616",
+"string4617",
+"string4618",
+"string4619",
+"string4620",
+"string4621",
+"string4622",
+"string4623",
+"string4624",
+"string4625",
+"string4626",
+"string4627",
+"string4628",
+"string4629",
+"string4630",
+"string4631",
+"string4632",
+"string4633",
+"string4634",
+"string4635",
+"string4636",
+"string4637",
+"string4638",
+"string4639",
+"string4640",
+"string4641",
+"string4642",
+"string4643",
+"string4644",
+"string4645",
+"string4646",
+"string4647",
+"string4648",
+"string4649",
+"string4650",
+"string4651",
+"string4652",
+"string4653",
+"string4654",
+"string4655",
+"string4656",
+"string4657",
+"string4658",
+"string4659",
+"string4660",
+"string4661",
+"string4662",
+"string4663",
+"string4664",
+"string4665",
+"string4666",
+"string4667",
+"string4668",
+"string4669",
+"string4670",
+"string4671",
+"string4672",
+"string4673",
+"string4674",
+"string4675",
+"string4676",
+"string4677",
+"string4678",
+"string4679",
+"string4680",
+"string4681",
+"string4682",
+"string4683",
+"string4684",
+"string4685",
+"string4686",
+"string4687",
+"string4688",
+"string4689",
+"string4690",
+"string4691",
+"string4692",
+"string4693",
+"string4694",
+"string4695",
+"string4696",
+"string4697",
+"string4698",
+"string4699",
+"string4700",
+"string4701",
+"string4702",
+"string4703",
+"string4704",
+"string4705",
+"string4706",
+"string4707",
+"string4708",
+"string4709",
+"string4710",
+"string4711",
+"string4712",
+"string4713",
+"string4714",
+"string4715",
+"string4716",
+"string4717",
+"string4718",
+"string4719",
+"string4720",
+"string4721",
+"string4722",
+"string4723",
+"string4724",
+"string4725",
+"string4726",
+"string4727",
+"string4728",
+"string4729",
+"string4730",
+"string4731",
+"string4732",
+"string4733",
+"string4734",
+"string4735",
+"string4736",
+"string4737",
+"string4738",
+"string4739",
+"string4740",
+"string4741",
+"string4742",
+"string4743",
+"string4744",
+"string4745",
+"string4746",
+"string4747",
+"string4748",
+"string4749",
+"string4750",
+"string4751",
+"string4752",
+"string4753",
+"string4754",
+"string4755",
+"string4756",
+"string4757",
+"string4758",
+"string4759",
+"string4760",
+"string4761",
+"string4762",
+"string4763",
+"string4764",
+"string4765",
+"string4766",
+"string4767",
+"string4768",
+"string4769",
+"string4770",
+"string4771",
+"string4772",
+"string4773",
+"string4774",
+"string4775",
+"string4776",
+"string4777",
+"string4778",
+"string4779",
+"string4780",
+"string4781",
+"string4782",
+"string4783",
+"string4784",
+"string4785",
+"string4786",
+"string4787",
+"string4788",
+"string4789",
+"string4790",
+"string4791",
+"string4792",
+"string4793",
+"string4794",
+"string4795",
+"string4796",
+"string4797",
+"string4798",
+"string4799",
+"string4800",
+"string4801",
+"string4802",
+"string4803",
+"string4804",
+"string4805",
+"string4806",
+"string4807",
+"string4808",
+"string4809",
+"string4810",
+"string4811",
+"string4812",
+"string4813",
+"string4814",
+"string4815",
+"string4816",
+"string4817",
+"string4818",
+"string4819",
+"string4820",
+"string4821",
+"string4822",
+"string4823",
+"string4824",
+"string4825",
+"string4826",
+"string4827",
+"string4828",
+"string4829",
+"string4830",
+"string4831",
+"string4832",
+"string4833",
+"string4834",
+"string4835",
+"string4836",
+"string4837",
+"string4838",
+"string4839",
+"string4840",
+"string4841",
+"string4842",
+"string4843",
+"string4844",
+"string4845",
+"string4846",
+"string4847",
+"string4848",
+"string4849",
+"string4850",
+"string4851",
+"string4852",
+"string4853",
+"string4854",
+"string4855",
+"string4856",
+"string4857",
+"string4858",
+"string4859",
+"string4860",
+"string4861",
+"string4862",
+"string4863",
+"string4864",
+"string4865",
+"string4866",
+"string4867",
+"string4868",
+"string4869",
+"string4870",
+"string4871",
+"string4872",
+"string4873",
+"string4874",
+"string4875",
+"string4876",
+"string4877",
+"string4878",
+"string4879",
+"string4880",
+"string4881",
+"string4882",
+"string4883",
+"string4884",
+"string4885",
+"string4886",
+"string4887",
+"string4888",
+"string4889",
+"string4890",
+"string4891",
+"string4892",
+"string4893",
+"string4894",
+"string4895",
+"string4896",
+"string4897",
+"string4898",
+"string4899",
+"string4900",
+"string4901",
+"string4902",
+"string4903",
+"string4904",
+"string4905",
+"string4906",
+"string4907",
+"string4908",
+"string4909",
+"string4910",
+"string4911",
+"string4912",
+"string4913",
+"string4914",
+"string4915",
+"string4916",
+"string4917",
+"string4918",
+"string4919",
+"string4920",
+"string4921",
+"string4922",
+"string4923",
+"string4924",
+"string4925",
+"string4926",
+"string4927",
+"string4928",
+"string4929",
+"string4930",
+"string4931",
+"string4932",
+"string4933",
+"string4934",
+"string4935",
+"string4936",
+"string4937",
+"string4938",
+"string4939",
+"string4940",
+"string4941",
+"string4942",
+"string4943",
+"string4944",
+"string4945",
+"string4946",
+"string4947",
+"string4948",
+"string4949",
+"string4950",
+"string4951",
+"string4952",
+"string4953",
+"string4954",
+"string4955",
+"string4956",
+"string4957",
+"string4958",
+"string4959",
+"string4960",
+"string4961",
+"string4962",
+"string4963",
+"string4964",
+"string4965",
+"string4966",
+"string4967",
+"string4968",
+"string4969",
+"string4970",
+"string4971",
+"string4972",
+"string4973",
+"string4974",
+"string4975",
+"string4976",
+"string4977",
+"string4978",
+"string4979",
+"string4980",
+"string4981",
+"string4982",
+"string4983",
+"string4984",
+"string4985",
+"string4986",
+"string4987",
+"string4988",
+"string4989",
+"string4990",
+"string4991",
+"string4992",
+"string4993",
+"string4994",
+"string4995",
+"string4996",
+"string4997",
+"string4998",
+"string4999",
+"string5000",
+"string5001",
+"string5002",
+"string5003",
+"string5004",
+"string5005",
+"string5006",
+"string5007",
+"string5008",
+"string5009",
+"string5010",
+"string5011",
+"string5012",
+"string5013",
+"string5014",
+"string5015",
+"string5016",
+"string5017",
+"string5018",
+"string5019",
+"string5020",
+"string5021",
+"string5022",
+"string5023",
+"string5024",
+"string5025",
+"string5026",
+"string5027",
+"string5028",
+"string5029",
+"string5030",
+"string5031",
+"string5032",
+"string5033",
+"string5034",
+"string5035",
+"string5036",
+"string5037",
+"string5038",
+"string5039",
+"string5040",
+"string5041",
+"string5042",
+"string5043",
+"string5044",
+"string5045",
+"string5046",
+"string5047",
+"string5048",
+"string5049",
+"string5050",
+"string5051",
+"string5052",
+"string5053",
+"string5054",
+"string5055",
+"string5056",
+"string5057",
+"string5058",
+"string5059",
+"string5060",
+"string5061",
+"string5062",
+"string5063",
+"string5064",
+"string5065",
+"string5066",
+"string5067",
+"string5068",
+"string5069",
+"string5070",
+"string5071",
+"string5072",
+"string5073",
+"string5074",
+"string5075",
+"string5076",
+"string5077",
+"string5078",
+"string5079",
+"string5080",
+"string5081",
+"string5082",
+"string5083",
+"string5084",
+"string5085",
+"string5086",
+"string5087",
+"string5088",
+"string5089",
+"string5090",
+"string5091",
+"string5092",
+"string5093",
+"string5094",
+"string5095",
+"string5096",
+"string5097",
+"string5098",
+"string5099",
+"string5100",
+"string5101",
+"string5102",
+"string5103",
+"string5104",
+"string5105",
+"string5106",
+"string5107",
+"string5108",
+"string5109",
+"string5110",
+"string5111",
+"string5112",
+"string5113",
+"string5114",
+"string5115",
+"string5116",
+"string5117",
+"string5118",
+"string5119",
+"string5120",
+"string5121",
+"string5122",
+"string5123",
+"string5124",
+"string5125",
+"string5126",
+"string5127",
+"string5128",
+"string5129",
+"string5130",
+"string5131",
+"string5132",
+"string5133",
+"string5134",
+"string5135",
+"string5136",
+"string5137",
+"string5138",
+"string5139",
+"string5140",
+"string5141",
+"string5142",
+"string5143",
+"string5144",
+"string5145",
+"string5146",
+"string5147",
+"string5148",
+"string5149",
+"string5150",
+"string5151",
+"string5152",
+"string5153",
+"string5154",
+"string5155",
+"string5156",
+"string5157",
+"string5158",
+"string5159",
+"string5160",
+"string5161",
+"string5162",
+"string5163",
+"string5164",
+"string5165",
+"string5166",
+"string5167",
+"string5168",
+"string5169",
+"string5170",
+"string5171",
+"string5172",
+"string5173",
+"string5174",
+"string5175",
+"string5176",
+"string5177",
+"string5178",
+"string5179",
+"string5180",
+"string5181",
+"string5182",
+"string5183",
+"string5184",
+"string5185",
+"string5186",
+"string5187",
+"string5188",
+"string5189",
+"string5190",
+"string5191",
+"string5192",
+"string5193",
+"string5194",
+"string5195",
+"string5196",
+"string5197",
+"string5198",
+"string5199",
+"string5200",
+"string5201",
+"string5202",
+"string5203",
+"string5204",
+"string5205",
+"string5206",
+"string5207",
+"string5208",
+"string5209",
+"string5210",
+"string5211",
+"string5212",
+"string5213",
+"string5214",
+"string5215",
+"string5216",
+"string5217",
+"string5218",
+"string5219",
+"string5220",
+"string5221",
+"string5222",
+"string5223",
+"string5224",
+"string5225",
+"string5226",
+"string5227",
+"string5228",
+"string5229",
+"string5230",
+"string5231",
+"string5232",
+"string5233",
+"string5234",
+"string5235",
+"string5236",
+"string5237",
+"string5238",
+"string5239",
+"string5240",
+"string5241",
+"string5242",
+"string5243",
+"string5244",
+"string5245",
+"string5246",
+"string5247",
+"string5248",
+"string5249",
+"string5250",
+"string5251",
+"string5252",
+"string5253",
+"string5254",
+"string5255",
+"string5256",
+"string5257",
+"string5258",
+"string5259",
+"string5260",
+"string5261",
+"string5262",
+"string5263",
+"string5264",
+"string5265",
+"string5266",
+"string5267",
+"string5268",
+"string5269",
+"string5270",
+"string5271",
+"string5272",
+"string5273",
+"string5274",
+"string5275",
+"string5276",
+"string5277",
+"string5278",
+"string5279",
+"string5280",
+"string5281",
+"string5282",
+"string5283",
+"string5284",
+"string5285",
+"string5286",
+"string5287",
+"string5288",
+"string5289",
+"string5290",
+"string5291",
+"string5292",
+"string5293",
+"string5294",
+"string5295",
+"string5296",
+"string5297",
+"string5298",
+"string5299",
+"string5300",
+"string5301",
+"string5302",
+"string5303",
+"string5304",
+"string5305",
+"string5306",
+"string5307",
+"string5308",
+"string5309",
+"string5310",
+"string5311",
+"string5312",
+"string5313",
+"string5314",
+"string5315",
+"string5316",
+"string5317",
+"string5318",
+"string5319",
+"string5320",
+"string5321",
+"string5322",
+"string5323",
+"string5324",
+"string5325",
+"string5326",
+"string5327",
+"string5328",
+"string5329",
+"string5330",
+"string5331",
+"string5332",
+"string5333",
+"string5334",
+"string5335",
+"string5336",
+"string5337",
+"string5338",
+"string5339",
+"string5340",
+"string5341",
+"string5342",
+"string5343",
+"string5344",
+"string5345",
+"string5346",
+"string5347",
+"string5348",
+"string5349",
+"string5350",
+"string5351",
+"string5352",
+"string5353",
+"string5354",
+"string5355",
+"string5356",
+"string5357",
+"string5358",
+"string5359",
+"string5360",
+"string5361",
+"string5362",
+"string5363",
+"string5364",
+"string5365",
+"string5366",
+"string5367",
+"string5368",
+"string5369",
+"string5370",
+"string5371",
+"string5372",
+"string5373",
+"string5374",
+"string5375",
+"string5376",
+"string5377",
+"string5378",
+"string5379",
+"string5380",
+"string5381",
+"string5382",
+"string5383",
+"string5384",
+"string5385",
+"string5386",
+"string5387",
+"string5388",
+"string5389",
+"string5390",
+"string5391",
+"string5392",
+"string5393",
+"string5394",
+"string5395",
+"string5396",
+"string5397",
+"string5398",
+"string5399",
+"string5400",
+"string5401",
+"string5402",
+"string5403",
+"string5404",
+"string5405",
+"string5406",
+"string5407",
+"string5408",
+"string5409",
+"string5410",
+"string5411",
+"string5412",
+"string5413",
+"string5414",
+"string5415",
+"string5416",
+"string5417",
+"string5418",
+"string5419",
+"string5420",
+"string5421",
+"string5422",
+"string5423",
+"string5424",
+"string5425",
+"string5426",
+"string5427",
+"string5428",
+"string5429",
+"string5430",
+"string5431",
+"string5432",
+"string5433",
+"string5434",
+"string5435",
+"string5436",
+"string5437",
+"string5438",
+"string5439",
+"string5440",
+"string5441",
+"string5442",
+"string5443",
+"string5444",
+"string5445",
+"string5446",
+"string5447",
+"string5448",
+"string5449",
+"string5450",
+"string5451",
+"string5452",
+"string5453",
+"string5454",
+"string5455",
+"string5456",
+"string5457",
+"string5458",
+"string5459",
+"string5460",
+"string5461",
+"string5462",
+"string5463",
+"string5464",
+"string5465",
+"string5466",
+"string5467",
+"string5468",
+"string5469",
+"string5470",
+"string5471",
+"string5472",
+"string5473",
+"string5474",
+"string5475",
+"string5476",
+"string5477",
+"string5478",
+"string5479",
+"string5480",
+"string5481",
+"string5482",
+"string5483",
+"string5484",
+"string5485",
+"string5486",
+"string5487",
+"string5488",
+"string5489",
+"string5490",
+"string5491",
+"string5492",
+"string5493",
+"string5494",
+"string5495",
+"string5496",
+"string5497",
+"string5498",
+"string5499",
+"string5500",
+"string5501",
+"string5502",
+"string5503",
+"string5504",
+"string5505",
+"string5506",
+"string5507",
+"string5508",
+"string5509",
+"string5510",
+"string5511",
+"string5512",
+"string5513",
+"string5514",
+"string5515",
+"string5516",
+"string5517",
+"string5518",
+"string5519",
+"string5520",
+"string5521",
+"string5522",
+"string5523",
+"string5524",
+"string5525",
+"string5526",
+"string5527",
+"string5528",
+"string5529",
+"string5530",
+"string5531",
+"string5532",
+"string5533",
+"string5534",
+"string5535",
+"string5536",
+"string5537",
+"string5538",
+"string5539",
+"string5540",
+"string5541",
+"string5542",
+"string5543",
+"string5544",
+"string5545",
+"string5546",
+"string5547",
+"string5548",
+"string5549",
+"string5550",
+"string5551",
+"string5552",
+"string5553",
+"string5554",
+"string5555",
+"string5556",
+"string5557",
+"string5558",
+"string5559",
+"string5560",
+"string5561",
+"string5562",
+"string5563",
+"string5564",
+"string5565",
+"string5566",
+"string5567",
+"string5568",
+"string5569",
+"string5570",
+"string5571",
+"string5572",
+"string5573",
+"string5574",
+"string5575",
+"string5576",
+"string5577",
+"string5578",
+"string5579",
+"string5580",
+"string5581",
+"string5582",
+"string5583",
+"string5584",
+"string5585",
+"string5586",
+"string5587",
+"string5588",
+"string5589",
+"string5590",
+"string5591",
+"string5592",
+"string5593",
+"string5594",
+"string5595",
+"string5596",
+"string5597",
+"string5598",
+"string5599",
+"string5600",
+"string5601",
+"string5602",
+"string5603",
+"string5604",
+"string5605",
+"string5606",
+"string5607",
+"string5608",
+"string5609",
+"string5610",
+"string5611",
+"string5612",
+"string5613",
+"string5614",
+"string5615",
+"string5616",
+"string5617",
+"string5618",
+"string5619",
+"string5620",
+"string5621",
+"string5622",
+"string5623",
+"string5624",
+"string5625",
+"string5626",
+"string5627",
+"string5628",
+"string5629",
+"string5630",
+"string5631",
+"string5632",
+"string5633",
+"string5634",
+"string5635",
+"string5636",
+"string5637",
+"string5638",
+"string5639",
+"string5640",
+"string5641",
+"string5642",
+"string5643",
+"string5644",
+"string5645",
+"string5646",
+"string5647",
+"string5648",
+"string5649",
+"string5650",
+"string5651",
+"string5652",
+"string5653",
+"string5654",
+"string5655",
+"string5656",
+"string5657",
+"string5658",
+"string5659",
+"string5660",
+"string5661",
+"string5662",
+"string5663",
+"string5664",
+"string5665",
+"string5666",
+"string5667",
+"string5668",
+"string5669",
+"string5670",
+"string5671",
+"string5672",
+"string5673",
+"string5674",
+"string5675",
+"string5676",
+"string5677",
+"string5678",
+"string5679",
+"string5680",
+"string5681",
+"string5682",
+"string5683",
+"string5684",
+"string5685",
+"string5686",
+"string5687",
+"string5688",
+"string5689",
+"string5690",
+"string5691",
+"string5692",
+"string5693",
+"string5694",
+"string5695",
+"string5696",
+"string5697",
+"string5698",
+"string5699",
+"string5700",
+"string5701",
+"string5702",
+"string5703",
+"string5704",
+"string5705",
+"string5706",
+"string5707",
+"string5708",
+"string5709",
+"string5710",
+"string5711",
+"string5712",
+"string5713",
+"string5714",
+"string5715",
+"string5716",
+"string5717",
+"string5718",
+"string5719",
+"string5720",
+"string5721",
+"string5722",
+"string5723",
+"string5724",
+"string5725",
+"string5726",
+"string5727",
+"string5728",
+"string5729",
+"string5730",
+"string5731",
+"string5732",
+"string5733",
+"string5734",
+"string5735",
+"string5736",
+"string5737",
+"string5738",
+"string5739",
+"string5740",
+"string5741",
+"string5742",
+"string5743",
+"string5744",
+"string5745",
+"string5746",
+"string5747",
+"string5748",
+"string5749",
+"string5750",
+"string5751",
+"string5752",
+"string5753",
+"string5754",
+"string5755",
+"string5756",
+"string5757",
+"string5758",
+"string5759",
+"string5760",
+"string5761",
+"string5762",
+"string5763",
+"string5764",
+"string5765",
+"string5766",
+"string5767",
+"string5768",
+"string5769",
+"string5770",
+"string5771",
+"string5772",
+"string5773",
+"string5774",
+"string5775",
+"string5776",
+"string5777",
+"string5778",
+"string5779",
+"string5780",
+"string5781",
+"string5782",
+"string5783",
+"string5784",
+"string5785",
+"string5786",
+"string5787",
+"string5788",
+"string5789",
+"string5790",
+"string5791",
+"string5792",
+"string5793",
+"string5794",
+"string5795",
+"string5796",
+"string5797",
+"string5798",
+"string5799",
+"string5800",
+"string5801",
+"string5802",
+"string5803",
+"string5804",
+"string5805",
+"string5806",
+"string5807",
+"string5808",
+"string5809",
+"string5810",
+"string5811",
+"string5812",
+"string5813",
+"string5814",
+"string5815",
+"string5816",
+"string5817",
+"string5818",
+"string5819",
+"string5820",
+"string5821",
+"string5822",
+"string5823",
+"string5824",
+"string5825",
+"string5826",
+"string5827",
+"string5828",
+"string5829",
+"string5830",
+"string5831",
+"string5832",
+"string5833",
+"string5834",
+"string5835",
+"string5836",
+"string5837",
+"string5838",
+"string5839",
+"string5840",
+"string5841",
+"string5842",
+"string5843",
+"string5844",
+"string5845",
+"string5846",
+"string5847",
+"string5848",
+"string5849",
+"string5850",
+"string5851",
+"string5852",
+"string5853",
+"string5854",
+"string5855",
+"string5856",
+"string5857",
+"string5858",
+"string5859",
+"string5860",
+"string5861",
+"string5862",
+"string5863",
+"string5864",
+"string5865",
+"string5866",
+"string5867",
+"string5868",
+"string5869",
+"string5870",
+"string5871",
+"string5872",
+"string5873",
+"string5874",
+"string5875",
+"string5876",
+"string5877",
+"string5878",
+"string5879",
+"string5880",
+"string5881",
+"string5882",
+"string5883",
+"string5884",
+"string5885",
+"string5886",
+"string5887",
+"string5888",
+"string5889",
+"string5890",
+"string5891",
+"string5892",
+"string5893",
+"string5894",
+"string5895",
+"string5896",
+"string5897",
+"string5898",
+"string5899",
+"string5900",
+"string5901",
+"string5902",
+"string5903",
+"string5904",
+"string5905",
+"string5906",
+"string5907",
+"string5908",
+"string5909",
+"string5910",
+"string5911",
+"string5912",
+"string5913",
+"string5914",
+"string5915",
+"string5916",
+"string5917",
+"string5918",
+"string5919",
+"string5920",
+"string5921",
+"string5922",
+"string5923",
+"string5924",
+"string5925",
+"string5926",
+"string5927",
+"string5928",
+"string5929",
+"string5930",
+"string5931",
+"string5932",
+"string5933",
+"string5934",
+"string5935",
+"string5936",
+"string5937",
+"string5938",
+"string5939",
+"string5940",
+"string5941",
+"string5942",
+"string5943",
+"string5944",
+"string5945",
+"string5946",
+"string5947",
+"string5948",
+"string5949",
+"string5950",
+"string5951",
+"string5952",
+"string5953",
+"string5954",
+"string5955",
+"string5956",
+"string5957",
+"string5958",
+"string5959",
+"string5960",
+"string5961",
+"string5962",
+"string5963",
+"string5964",
+"string5965",
+"string5966",
+"string5967",
+"string5968",
+"string5969",
+"string5970",
+"string5971",
+"string5972",
+"string5973",
+"string5974",
+"string5975",
+"string5976",
+"string5977",
+"string5978",
+"string5979",
+"string5980",
+"string5981",
+"string5982",
+"string5983",
+"string5984",
+"string5985",
+"string5986",
+"string5987",
+"string5988",
+"string5989",
+"string5990",
+"string5991",
+"string5992",
+"string5993",
+"string5994",
+"string5995",
+"string5996",
+"string5997",
+"string5998",
+"string5999",
+"string6000",
+"string6001",
+"string6002",
+"string6003",
+"string6004",
+"string6005",
+"string6006",
+"string6007",
+"string6008",
+"string6009",
+"string6010",
+"string6011",
+"string6012",
+"string6013",
+"string6014",
+"string6015",
+"string6016",
+"string6017",
+"string6018",
+"string6019",
+"string6020",
+"string6021",
+"string6022",
+"string6023",
+"string6024",
+"string6025",
+"string6026",
+"string6027",
+"string6028",
+"string6029",
+"string6030",
+"string6031",
+"string6032",
+"string6033",
+"string6034",
+"string6035",
+"string6036",
+"string6037",
+"string6038",
+"string6039",
+"string6040",
+"string6041",
+"string6042",
+"string6043",
+"string6044",
+"string6045",
+"string6046",
+"string6047",
+"string6048",
+"string6049",
+"string6050",
+"string6051",
+"string6052",
+"string6053",
+"string6054",
+"string6055",
+"string6056",
+"string6057",
+"string6058",
+"string6059",
+"string6060",
+"string6061",
+"string6062",
+"string6063",
+"string6064",
+"string6065",
+"string6066",
+"string6067",
+"string6068",
+"string6069",
+"string6070",
+"string6071",
+"string6072",
+"string6073",
+"string6074",
+"string6075",
+"string6076",
+"string6077",
+"string6078",
+"string6079",
+"string6080",
+"string6081",
+"string6082",
+"string6083",
+"string6084",
+"string6085",
+"string6086",
+"string6087",
+"string6088",
+"string6089",
+"string6090",
+"string6091",
+"string6092",
+"string6093",
+"string6094",
+"string6095",
+"string6096",
+"string6097",
+"string6098",
+"string6099",
+"string6100",
+"string6101",
+"string6102",
+"string6103",
+"string6104",
+"string6105",
+"string6106",
+"string6107",
+"string6108",
+"string6109",
+"string6110",
+"string6111",
+"string6112",
+"string6113",
+"string6114",
+"string6115",
+"string6116",
+"string6117",
+"string6118",
+"string6119",
+"string6120",
+"string6121",
+"string6122",
+"string6123",
+"string6124",
+"string6125",
+"string6126",
+"string6127",
+"string6128",
+"string6129",
+"string6130",
+"string6131",
+"string6132",
+"string6133",
+"string6134",
+"string6135",
+"string6136",
+"string6137",
+"string6138",
+"string6139",
+"string6140",
+"string6141",
+"string6142",
+"string6143",
+"string6144",
+"string6145",
+"string6146",
+"string6147",
+"string6148",
+"string6149",
+"string6150",
+"string6151",
+"string6152",
+"string6153",
+"string6154",
+"string6155",
+"string6156",
+"string6157",
+"string6158",
+"string6159",
+"string6160",
+"string6161",
+"string6162",
+"string6163",
+"string6164",
+"string6165",
+"string6166",
+"string6167",
+"string6168",
+"string6169",
+"string6170",
+"string6171",
+"string6172",
+"string6173",
+"string6174",
+"string6175",
+"string6176",
+"string6177",
+"string6178",
+"string6179",
+"string6180",
+"string6181",
+"string6182",
+"string6183",
+"string6184",
+"string6185",
+"string6186",
+"string6187",
+"string6188",
+"string6189",
+"string6190",
+"string6191",
+"string6192",
+"string6193",
+"string6194",
+"string6195",
+"string6196",
+"string6197",
+"string6198",
+"string6199",
+"string6200",
+"string6201",
+"string6202",
+"string6203",
+"string6204",
+"string6205",
+"string6206",
+"string6207",
+"string6208",
+"string6209",
+"string6210",
+"string6211",
+"string6212",
+"string6213",
+"string6214",
+"string6215",
+"string6216",
+"string6217",
+"string6218",
+"string6219",
+"string6220",
+"string6221",
+"string6222",
+"string6223",
+"string6224",
+"string6225",
+"string6226",
+"string6227",
+"string6228",
+"string6229",
+"string6230",
+"string6231",
+"string6232",
+"string6233",
+"string6234",
+"string6235",
+"string6236",
+"string6237",
+"string6238",
+"string6239",
+"string6240",
+"string6241",
+"string6242",
+"string6243",
+"string6244",
+"string6245",
+"string6246",
+"string6247",
+"string6248",
+"string6249",
+"string6250",
+"string6251",
+"string6252",
+"string6253",
+"string6254",
+"string6255",
+"string6256",
+"string6257",
+"string6258",
+"string6259",
+"string6260",
+"string6261",
+"string6262",
+"string6263",
+"string6264",
+"string6265",
+"string6266",
+"string6267",
+"string6268",
+"string6269",
+"string6270",
+"string6271",
+"string6272",
+"string6273",
+"string6274",
+"string6275",
+"string6276",
+"string6277",
+"string6278",
+"string6279",
+"string6280",
+"string6281",
+"string6282",
+"string6283",
+"string6284",
+"string6285",
+"string6286",
+"string6287",
+"string6288",
+"string6289",
+"string6290",
+"string6291",
+"string6292",
+"string6293",
+"string6294",
+"string6295",
+"string6296",
+"string6297",
+"string6298",
+"string6299",
+"string6300",
+"string6301",
+"string6302",
+"string6303",
+"string6304",
+"string6305",
+"string6306",
+"string6307",
+"string6308",
+"string6309",
+"string6310",
+"string6311",
+"string6312",
+"string6313",
+"string6314",
+"string6315",
+"string6316",
+"string6317",
+"string6318",
+"string6319",
+"string6320",
+"string6321",
+"string6322",
+"string6323",
+"string6324",
+"string6325",
+"string6326",
+"string6327",
+"string6328",
+"string6329",
+"string6330",
+"string6331",
+"string6332",
+"string6333",
+"string6334",
+"string6335",
+"string6336",
+"string6337",
+"string6338",
+"string6339",
+"string6340",
+"string6341",
+"string6342",
+"string6343",
+"string6344",
+"string6345",
+"string6346",
+"string6347",
+"string6348",
+"string6349",
+"string6350",
+"string6351",
+"string6352",
+"string6353",
+"string6354",
+"string6355",
+"string6356",
+"string6357",
+"string6358",
+"string6359",
+"string6360",
+"string6361",
+"string6362",
+"string6363",
+"string6364",
+"string6365",
+"string6366",
+"string6367",
+"string6368",
+"string6369",
+"string6370",
+"string6371",
+"string6372",
+"string6373",
+"string6374",
+"string6375",
+"string6376",
+"string6377",
+"string6378",
+"string6379",
+"string6380",
+"string6381",
+"string6382",
+"string6383",
+"string6384",
+"string6385",
+"string6386",
+"string6387",
+"string6388",
+"string6389",
+"string6390",
+"string6391",
+"string6392",
+"string6393",
+"string6394",
+"string6395",
+"string6396",
+"string6397",
+"string6398",
+"string6399",
+"string6400",
+"string6401",
+"string6402",
+"string6403",
+"string6404",
+"string6405",
+"string6406",
+"string6407",
+"string6408",
+"string6409",
+"string6410",
+"string6411",
+"string6412",
+"string6413",
+"string6414",
+"string6415",
+"string6416",
+"string6417",
+"string6418",
+"string6419",
+"string6420",
+"string6421",
+"string6422",
+"string6423",
+"string6424",
+"string6425",
+"string6426",
+"string6427",
+"string6428",
+"string6429",
+"string6430",
+"string6431",
+"string6432",
+"string6433",
+"string6434",
+"string6435",
+"string6436",
+"string6437",
+"string6438",
+"string6439",
+"string6440",
+"string6441",
+"string6442",
+"string6443",
+"string6444",
+"string6445",
+"string6446",
+"string6447",
+"string6448",
+"string6449",
+"string6450",
+"string6451",
+"string6452",
+"string6453",
+"string6454",
+"string6455",
+"string6456",
+"string6457",
+"string6458",
+"string6459",
+"string6460",
+"string6461",
+"string6462",
+"string6463",
+"string6464",
+"string6465",
+"string6466",
+"string6467",
+"string6468",
+"string6469",
+"string6470",
+"string6471",
+"string6472",
+"string6473",
+"string6474",
+"string6475",
+"string6476",
+"string6477",
+"string6478",
+"string6479",
+"string6480",
+"string6481",
+"string6482",
+"string6483",
+"string6484",
+"string6485",
+"string6486",
+"string6487",
+"string6488",
+"string6489",
+"string6490",
+"string6491",
+"string6492",
+"string6493",
+"string6494",
+"string6495",
+"string6496",
+"string6497",
+"string6498",
+"string6499",
+"string6500",
+"string6501",
+"string6502",
+"string6503",
+"string6504",
+"string6505",
+"string6506",
+"string6507",
+"string6508",
+"string6509",
+"string6510",
+"string6511",
+"string6512",
+"string6513",
+"string6514",
+"string6515",
+"string6516",
+"string6517",
+"string6518",
+"string6519",
+"string6520",
+"string6521",
+"string6522",
+"string6523",
+"string6524",
+"string6525",
+"string6526",
+"string6527",
+"string6528",
+"string6529",
+"string6530",
+"string6531",
+"string6532",
+"string6533",
+"string6534",
+"string6535",
+"string6536",
+"string6537",
+"string6538",
+"string6539",
+"string6540",
+"string6541",
+"string6542",
+"string6543",
+"string6544",
+"string6545",
+"string6546",
+"string6547",
+"string6548",
+"string6549",
+"string6550",
+"string6551",
+"string6552",
+"string6553",
+"string6554",
+"string6555",
+"string6556",
+"string6557",
+"string6558",
+"string6559",
+"string6560",
+"string6561",
+"string6562",
+"string6563",
+"string6564",
+"string6565",
+"string6566",
+"string6567",
+"string6568",
+"string6569",
+"string6570",
+"string6571",
+"string6572",
+"string6573",
+"string6574",
+"string6575",
+"string6576",
+"string6577",
+"string6578",
+"string6579",
+"string6580",
+"string6581",
+"string6582",
+"string6583",
+"string6584",
+"string6585",
+"string6586",
+"string6587",
+"string6588",
+"string6589",
+"string6590",
+"string6591",
+"string6592",
+"string6593",
+"string6594",
+"string6595",
+"string6596",
+"string6597",
+"string6598",
+"string6599",
+"string6600",
+"string6601",
+"string6602",
+"string6603",
+"string6604",
+"string6605",
+"string6606",
+"string6607",
+"string6608",
+"string6609",
+"string6610",
+"string6611",
+"string6612",
+"string6613",
+"string6614",
+"string6615",
+"string6616",
+"string6617",
+"string6618",
+"string6619",
+"string6620",
+"string6621",
+"string6622",
+"string6623",
+"string6624",
+"string6625",
+"string6626",
+"string6627",
+"string6628",
+"string6629",
+"string6630",
+"string6631",
+"string6632",
+"string6633",
+"string6634",
+"string6635",
+"string6636",
+"string6637",
+"string6638",
+"string6639",
+"string6640",
+"string6641",
+"string6642",
+"string6643",
+"string6644",
+"string6645",
+"string6646",
+"string6647",
+"string6648",
+"string6649",
+"string6650",
+"string6651",
+"string6652",
+"string6653",
+"string6654",
+"string6655",
+"string6656",
+"string6657",
+"string6658",
+"string6659",
+"string6660",
+"string6661",
+"string6662",
+"string6663",
+"string6664",
+"string6665",
+"string6666",
+"string6667",
+"string6668",
+"string6669",
+"string6670",
+"string6671",
+"string6672",
+"string6673",
+"string6674",
+"string6675",
+"string6676",
+"string6677",
+"string6678",
+"string6679",
+"string6680",
+"string6681",
+"string6682",
+"string6683",
+"string6684",
+"string6685",
+"string6686",
+"string6687",
+"string6688",
+"string6689",
+"string6690",
+"string6691",
+"string6692",
+"string6693",
+"string6694",
+"string6695",
+"string6696",
+"string6697",
+"string6698",
+"string6699",
+"string6700",
+"string6701",
+"string6702",
+"string6703",
+"string6704",
+"string6705",
+"string6706",
+"string6707",
+"string6708",
+"string6709",
+"string6710",
+"string6711",
+"string6712",
+"string6713",
+"string6714",
+"string6715",
+"string6716",
+"string6717",
+"string6718",
+"string6719",
+"string6720",
+"string6721",
+"string6722",
+"string6723",
+"string6724",
+"string6725",
+"string6726",
+"string6727",
+"string6728",
+"string6729",
+"string6730",
+"string6731",
+"string6732",
+"string6733",
+"string6734",
+"string6735",
+"string6736",
+"string6737",
+"string6738",
+"string6739",
+"string6740",
+"string6741",
+"string6742",
+"string6743",
+"string6744",
+"string6745",
+"string6746",
+"string6747",
+"string6748",
+"string6749",
+"string6750",
+"string6751",
+"string6752",
+"string6753",
+"string6754",
+"string6755",
+"string6756",
+"string6757",
+"string6758",
+"string6759",
+"string6760",
+"string6761",
+"string6762",
+"string6763",
+"string6764",
+"string6765",
+"string6766",
+"string6767",
+"string6768",
+"string6769",
+"string6770",
+"string6771",
+"string6772",
+"string6773",
+"string6774",
+"string6775",
+"string6776",
+"string6777",
+"string6778",
+"string6779",
+"string6780",
+"string6781",
+"string6782",
+"string6783",
+"string6784",
+"string6785",
+"string6786",
+"string6787",
+"string6788",
+"string6789",
+"string6790",
+"string6791",
+"string6792",
+"string6793",
+"string6794",
+"string6795",
+"string6796",
+"string6797",
+"string6798",
+"string6799",
+"string6800",
+"string6801",
+"string6802",
+"string6803",
+"string6804",
+"string6805",
+"string6806",
+"string6807",
+"string6808",
+"string6809",
+"string6810",
+"string6811",
+"string6812",
+"string6813",
+"string6814",
+"string6815",
+"string6816",
+"string6817",
+"string6818",
+"string6819",
+"string6820",
+"string6821",
+"string6822",
+"string6823",
+"string6824",
+"string6825",
+"string6826",
+"string6827",
+"string6828",
+"string6829",
+"string6830",
+"string6831",
+"string6832",
+"string6833",
+"string6834",
+"string6835",
+"string6836",
+"string6837",
+"string6838",
+"string6839",
+"string6840",
+"string6841",
+"string6842",
+"string6843",
+"string6844",
+"string6845",
+"string6846",
+"string6847",
+"string6848",
+"string6849",
+"string6850",
+"string6851",
+"string6852",
+"string6853",
+"string6854",
+"string6855",
+"string6856",
+"string6857",
+"string6858",
+"string6859",
+"string6860",
+"string6861",
+"string6862",
+"string6863",
+"string6864",
+"string6865",
+"string6866",
+"string6867",
+"string6868",
+"string6869",
+"string6870",
+"string6871",
+"string6872",
+"string6873",
+"string6874",
+"string6875",
+"string6876",
+"string6877",
+"string6878",
+"string6879",
+"string6880",
+"string6881",
+"string6882",
+"string6883",
+"string6884",
+"string6885",
+"string6886",
+"string6887",
+"string6888",
+"string6889",
+"string6890",
+"string6891",
+"string6892",
+"string6893",
+"string6894",
+"string6895",
+"string6896",
+"string6897",
+"string6898",
+"string6899",
+"string6900",
+"string6901",
+"string6902",
+"string6903",
+"string6904",
+"string6905",
+"string6906",
+"string6907",
+"string6908",
+"string6909",
+"string6910",
+"string6911",
+"string6912",
+"string6913",
+"string6914",
+"string6915",
+"string6916",
+"string6917",
+"string6918",
+"string6919",
+"string6920",
+"string6921",
+"string6922",
+"string6923",
+"string6924",
+"string6925",
+"string6926",
+"string6927",
+"string6928",
+"string6929",
+"string6930",
+"string6931",
+"string6932",
+"string6933",
+"string6934",
+"string6935",
+"string6936",
+"string6937",
+"string6938",
+"string6939",
+"string6940",
+"string6941",
+"string6942",
+"string6943",
+"string6944",
+"string6945",
+"string6946",
+"string6947",
+"string6948",
+"string6949",
+"string6950",
+"string6951",
+"string6952",
+"string6953",
+"string6954",
+"string6955",
+"string6956",
+"string6957",
+"string6958",
+"string6959",
+"string6960",
+"string6961",
+"string6962",
+"string6963",
+"string6964",
+"string6965",
+"string6966",
+"string6967",
+"string6968",
+"string6969",
+"string6970",
+"string6971",
+"string6972",
+"string6973",
+"string6974",
+"string6975",
+"string6976",
+"string6977",
+"string6978",
+"string6979",
+"string6980",
+"string6981",
+"string6982",
+"string6983",
+"string6984",
+"string6985",
+"string6986",
+"string6987",
+"string6988",
+"string6989",
+"string6990",
+"string6991",
+"string6992",
+"string6993",
+"string6994",
+"string6995",
+"string6996",
+"string6997",
+"string6998",
+"string6999",
+"string7000",
+"string7001",
+"string7002",
+"string7003",
+"string7004",
+"string7005",
+"string7006",
+"string7007",
+"string7008",
+"string7009",
+"string7010",
+"string7011",
+"string7012",
+"string7013",
+"string7014",
+"string7015",
+"string7016",
+"string7017",
+"string7018",
+"string7019",
+"string7020",
+"string7021",
+"string7022",
+"string7023",
+"string7024",
+"string7025",
+"string7026",
+"string7027",
+"string7028",
+"string7029",
+"string7030",
+"string7031",
+"string7032",
+"string7033",
+"string7034",
+"string7035",
+"string7036",
+"string7037",
+"string7038",
+"string7039",
+"string7040",
+"string7041",
+"string7042",
+"string7043",
+"string7044",
+"string7045",
+"string7046",
+"string7047",
+"string7048",
+"string7049",
+"string7050",
+"string7051",
+"string7052",
+"string7053",
+"string7054",
+"string7055",
+"string7056",
+"string7057",
+"string7058",
+"string7059",
+"string7060",
+"string7061",
+"string7062",
+"string7063",
+"string7064",
+"string7065",
+"string7066",
+"string7067",
+"string7068",
+"string7069",
+"string7070",
+"string7071",
+"string7072",
+"string7073",
+"string7074",
+"string7075",
+"string7076",
+"string7077",
+"string7078",
+"string7079",
+"string7080",
+"string7081",
+"string7082",
+"string7083",
+"string7084",
+"string7085",
+"string7086",
+"string7087",
+"string7088",
+"string7089",
+"string7090",
+"string7091",
+"string7092",
+"string7093",
+"string7094",
+"string7095",
+"string7096",
+"string7097",
+"string7098",
+"string7099",
+"string7100",
+"string7101",
+"string7102",
+"string7103",
+"string7104",
+"string7105",
+"string7106",
+"string7107",
+"string7108",
+"string7109",
+"string7110",
+"string7111",
+"string7112",
+"string7113",
+"string7114",
+"string7115",
+"string7116",
+"string7117",
+"string7118",
+"string7119",
+"string7120",
+"string7121",
+"string7122",
+"string7123",
+"string7124",
+"string7125",
+"string7126",
+"string7127",
+"string7128",
+"string7129",
+"string7130",
+"string7131",
+"string7132",
+"string7133",
+"string7134",
+"string7135",
+"string7136",
+"string7137",
+"string7138",
+"string7139",
+"string7140",
+"string7141",
+"string7142",
+"string7143",
+"string7144",
+"string7145",
+"string7146",
+"string7147",
+"string7148",
+"string7149",
+"string7150",
+"string7151",
+"string7152",
+"string7153",
+"string7154",
+"string7155",
+"string7156",
+"string7157",
+"string7158",
+"string7159",
+"string7160",
+"string7161",
+"string7162",
+"string7163",
+"string7164",
+"string7165",
+"string7166",
+"string7167",
+"string7168",
+"string7169",
+"string7170",
+"string7171",
+"string7172",
+"string7173",
+"string7174",
+"string7175",
+"string7176",
+"string7177",
+"string7178",
+"string7179",
+"string7180",
+"string7181",
+"string7182",
+"string7183",
+"string7184",
+"string7185",
+"string7186",
+"string7187",
+"string7188",
+"string7189",
+"string7190",
+"string7191",
+"string7192",
+"string7193",
+"string7194",
+"string7195",
+"string7196",
+"string7197",
+"string7198",
+"string7199",
+"string7200",
+"string7201",
+"string7202",
+"string7203",
+"string7204",
+"string7205",
+"string7206",
+"string7207",
+"string7208",
+"string7209",
+"string7210",
+"string7211",
+"string7212",
+"string7213",
+"string7214",
+"string7215",
+"string7216",
+"string7217",
+"string7218",
+"string7219",
+"string7220",
+"string7221",
+"string7222",
+"string7223",
+"string7224",
+"string7225",
+"string7226",
+"string7227",
+"string7228",
+"string7229",
+"string7230",
+"string7231",
+"string7232",
+"string7233",
+"string7234",
+"string7235",
+"string7236",
+"string7237",
+"string7238",
+"string7239",
+"string7240",
+"string7241",
+"string7242",
+"string7243",
+"string7244",
+"string7245",
+"string7246",
+"string7247",
+"string7248",
+"string7249",
+"string7250",
+"string7251",
+"string7252",
+"string7253",
+"string7254",
+"string7255",
+"string7256",
+"string7257",
+"string7258",
+"string7259",
+"string7260",
+"string7261",
+"string7262",
+"string7263",
+"string7264",
+"string7265",
+"string7266",
+"string7267",
+"string7268",
+"string7269",
+"string7270",
+"string7271",
+"string7272",
+"string7273",
+"string7274",
+"string7275",
+"string7276",
+"string7277",
+"string7278",
+"string7279",
+"string7280",
+"string7281",
+"string7282",
+"string7283",
+"string7284",
+"string7285",
+"string7286",
+"string7287",
+"string7288",
+"string7289",
+"string7290",
+"string7291",
+"string7292",
+"string7293",
+"string7294",
+"string7295",
+"string7296",
+"string7297",
+"string7298",
+"string7299",
+"string7300",
+"string7301",
+"string7302",
+"string7303",
+"string7304",
+"string7305",
+"string7306",
+"string7307",
+"string7308",
+"string7309",
+"string7310",
+"string7311",
+"string7312",
+"string7313",
+"string7314",
+"string7315",
+"string7316",
+"string7317",
+"string7318",
+"string7319",
+"string7320",
+"string7321",
+"string7322",
+"string7323",
+"string7324",
+"string7325",
+"string7326",
+"string7327",
+"string7328",
+"string7329",
+"string7330",
+"string7331",
+"string7332",
+"string7333",
+"string7334",
+"string7335",
+"string7336",
+"string7337",
+"string7338",
+"string7339",
+"string7340",
+"string7341",
+"string7342",
+"string7343",
+"string7344",
+"string7345",
+"string7346",
+"string7347",
+"string7348",
+"string7349",
+"string7350",
+"string7351",
+"string7352",
+"string7353",
+"string7354",
+"string7355",
+"string7356",
+"string7357",
+"string7358",
+"string7359",
+"string7360",
+"string7361",
+"string7362",
+"string7363",
+"string7364",
+"string7365",
+"string7366",
+"string7367",
+"string7368",
+"string7369",
+"string7370",
+"string7371",
+"string7372",
+"string7373",
+"string7374",
+"string7375",
+"string7376",
+"string7377",
+"string7378",
+"string7379",
+"string7380",
+"string7381",
+"string7382",
+"string7383",
+"string7384",
+"string7385",
+"string7386",
+"string7387",
+"string7388",
+"string7389",
+"string7390",
+"string7391",
+"string7392",
+"string7393",
+"string7394",
+"string7395",
+"string7396",
+"string7397",
+"string7398",
+"string7399",
+"string7400",
+"string7401",
+"string7402",
+"string7403",
+"string7404",
+"string7405",
+"string7406",
+"string7407",
+"string7408",
+"string7409",
+"string7410",
+"string7411",
+"string7412",
+"string7413",
+"string7414",
+"string7415",
+"string7416",
+"string7417",
+"string7418",
+"string7419",
+"string7420",
+"string7421",
+"string7422",
+"string7423",
+"string7424",
+"string7425",
+"string7426",
+"string7427",
+"string7428",
+"string7429",
+"string7430",
+"string7431",
+"string7432",
+"string7433",
+"string7434",
+"string7435",
+"string7436",
+"string7437",
+"string7438",
+"string7439",
+"string7440",
+"string7441",
+"string7442",
+"string7443",
+"string7444",
+"string7445",
+"string7446",
+"string7447",
+"string7448",
+"string7449",
+"string7450",
+"string7451",
+"string7452",
+"string7453",
+"string7454",
+"string7455",
+"string7456",
+"string7457",
+"string7458",
+"string7459",
+"string7460",
+"string7461",
+"string7462",
+"string7463",
+"string7464",
+"string7465",
+"string7466",
+"string7467",
+"string7468",
+"string7469",
+"string7470",
+"string7471",
+"string7472",
+"string7473",
+"string7474",
+"string7475",
+"string7476",
+"string7477",
+"string7478",
+"string7479",
+"string7480",
+"string7481",
+"string7482",
+"string7483",
+"string7484",
+"string7485",
+"string7486",
+"string7487",
+"string7488",
+"string7489",
+"string7490",
+"string7491",
+"string7492",
+"string7493",
+"string7494",
+"string7495",
+"string7496",
+"string7497",
+"string7498",
+"string7499",
+"string7500",
+"string7501",
+"string7502",
+"string7503",
+"string7504",
+"string7505",
+"string7506",
+"string7507",
+"string7508",
+"string7509",
+"string7510",
+"string7511",
+"string7512",
+"string7513",
+"string7514",
+"string7515",
+"string7516",
+"string7517",
+"string7518",
+"string7519",
+"string7520",
+"string7521",
+"string7522",
+"string7523",
+"string7524",
+"string7525",
+"string7526",
+"string7527",
+"string7528",
+"string7529",
+"string7530",
+"string7531",
+"string7532",
+"string7533",
+"string7534",
+"string7535",
+"string7536",
+"string7537",
+"string7538",
+"string7539",
+"string7540",
+"string7541",
+"string7542",
+"string7543",
+"string7544",
+"string7545",
+"string7546",
+"string7547",
+"string7548",
+"string7549",
+"string7550",
+"string7551",
+"string7552",
+"string7553",
+"string7554",
+"string7555",
+"string7556",
+"string7557",
+"string7558",
+"string7559",
+"string7560",
+"string7561",
+"string7562",
+"string7563",
+"string7564",
+"string7565",
+"string7566",
+"string7567",
+"string7568",
+"string7569",
+"string7570",
+"string7571",
+"string7572",
+"string7573",
+"string7574",
+"string7575",
+"string7576",
+"string7577",
+"string7578",
+"string7579",
+"string7580",
+"string7581",
+"string7582",
+"string7583",
+"string7584",
+"string7585",
+"string7586",
+"string7587",
+"string7588",
+"string7589",
+"string7590",
+"string7591",
+"string7592",
+"string7593",
+"string7594",
+"string7595",
+"string7596",
+"string7597",
+"string7598",
+"string7599",
+"string7600",
+"string7601",
+"string7602",
+"string7603",
+"string7604",
+"string7605",
+"string7606",
+"string7607",
+"string7608",
+"string7609",
+"string7610",
+"string7611",
+"string7612",
+"string7613",
+"string7614",
+"string7615",
+"string7616",
+"string7617",
+"string7618",
+"string7619",
+"string7620",
+"string7621",
+"string7622",
+"string7623",
+"string7624",
+"string7625",
+"string7626",
+"string7627",
+"string7628",
+"string7629",
+"string7630",
+"string7631",
+"string7632",
+"string7633",
+"string7634",
+"string7635",
+"string7636",
+"string7637",
+"string7638",
+"string7639",
+"string7640",
+"string7641",
+"string7642",
+"string7643",
+"string7644",
+"string7645",
+"string7646",
+"string7647",
+"string7648",
+"string7649",
+"string7650",
+"string7651",
+"string7652",
+"string7653",
+"string7654",
+"string7655",
+"string7656",
+"string7657",
+"string7658",
+"string7659",
+"string7660",
+"string7661",
+"string7662",
+"string7663",
+"string7664",
+"string7665",
+"string7666",
+"string7667",
+"string7668",
+"string7669",
+"string7670",
+"string7671",
+"string7672",
+"string7673",
+"string7674",
+"string7675",
+"string7676",
+"string7677",
+"string7678",
+"string7679",
+"string7680",
+"string7681",
+"string7682",
+"string7683",
+"string7684",
+"string7685",
+"string7686",
+"string7687",
+"string7688",
+"string7689",
+"string7690",
+"string7691",
+"string7692",
+"string7693",
+"string7694",
+"string7695",
+"string7696",
+"string7697",
+"string7698",
+"string7699",
+"string7700",
+"string7701",
+"string7702",
+"string7703",
+"string7704",
+"string7705",
+"string7706",
+"string7707",
+"string7708",
+"string7709",
+"string7710",
+"string7711",
+"string7712",
+"string7713",
+"string7714",
+"string7715",
+"string7716",
+"string7717",
+"string7718",
+"string7719",
+"string7720",
+"string7721",
+"string7722",
+"string7723",
+"string7724",
+"string7725",
+"string7726",
+"string7727",
+"string7728",
+"string7729",
+"string7730",
+"string7731",
+"string7732",
+"string7733",
+"string7734",
+"string7735",
+"string7736",
+"string7737",
+"string7738",
+"string7739",
+"string7740",
+"string7741",
+"string7742",
+"string7743",
+"string7744",
+"string7745",
+"string7746",
+"string7747",
+"string7748",
+"string7749",
+"string7750",
+"string7751",
+"string7752",
+"string7753",
+"string7754",
+"string7755",
+"string7756",
+"string7757",
+"string7758",
+"string7759",
+"string7760",
+"string7761",
+"string7762",
+"string7763",
+"string7764",
+"string7765",
+"string7766",
+"string7767",
+"string7768",
+"string7769",
+"string7770",
+"string7771",
+"string7772",
+"string7773",
+"string7774",
+"string7775",
+"string7776",
+"string7777",
+"string7778",
+"string7779",
+"string7780",
+"string7781",
+"string7782",
+"string7783",
+"string7784",
+"string7785",
+"string7786",
+"string7787",
+"string7788",
+"string7789",
+"string7790",
+"string7791",
+"string7792",
+"string7793",
+"string7794",
+"string7795",
+"string7796",
+"string7797",
+"string7798",
+"string7799",
+"string7800",
+"string7801",
+"string7802",
+"string7803",
+"string7804",
+"string7805",
+"string7806",
+"string7807",
+"string7808",
+"string7809",
+"string7810",
+"string7811",
+"string7812",
+"string7813",
+"string7814",
+"string7815",
+"string7816",
+"string7817",
+"string7818",
+"string7819",
+"string7820",
+"string7821",
+"string7822",
+"string7823",
+"string7824",
+"string7825",
+"string7826",
+"string7827",
+"string7828",
+"string7829",
+"string7830",
+"string7831",
+"string7832",
+"string7833",
+"string7834",
+"string7835",
+"string7836",
+"string7837",
+"string7838",
+"string7839",
+"string7840",
+"string7841",
+"string7842",
+"string7843",
+"string7844",
+"string7845",
+"string7846",
+"string7847",
+"string7848",
+"string7849",
+"string7850",
+"string7851",
+"string7852",
+"string7853",
+"string7854",
+"string7855",
+"string7856",
+"string7857",
+"string7858",
+"string7859",
+"string7860",
+"string7861",
+"string7862",
+"string7863",
+"string7864",
+"string7865",
+"string7866",
+"string7867",
+"string7868",
+"string7869",
+"string7870",
+"string7871",
+"string7872",
+"string7873",
+"string7874",
+"string7875",
+"string7876",
+"string7877",
+"string7878",
+"string7879",
+"string7880",
+"string7881",
+"string7882",
+"string7883",
+"string7884",
+"string7885",
+"string7886",
+"string7887",
+"string7888",
+"string7889",
+"string7890",
+"string7891",
+"string7892",
+"string7893",
+"string7894",
+"string7895",
+"string7896",
+"string7897",
+"string7898",
+"string7899",
+"string7900",
+"string7901",
+"string7902",
+"string7903",
+"string7904",
+"string7905",
+"string7906",
+"string7907",
+"string7908",
+"string7909",
+"string7910",
+"string7911",
+"string7912",
+"string7913",
+"string7914",
+"string7915",
+"string7916",
+"string7917",
+"string7918",
+"string7919",
+"string7920",
+"string7921",
+"string7922",
+"string7923",
+"string7924",
+"string7925",
+"string7926",
+"string7927",
+"string7928",
+"string7929",
+"string7930",
+"string7931",
+"string7932",
+"string7933",
+"string7934",
+"string7935",
+"string7936",
+"string7937",
+"string7938",
+"string7939",
+"string7940",
+"string7941",
+"string7942",
+"string7943",
+"string7944",
+"string7945",
+"string7946",
+"string7947",
+"string7948",
+"string7949",
+"string7950",
+"string7951",
+"string7952",
+"string7953",
+"string7954",
+"string7955",
+"string7956",
+"string7957",
+"string7958",
+"string7959",
+"string7960",
+"string7961",
+"string7962",
+"string7963",
+"string7964",
+"string7965",
+"string7966",
+"string7967",
+"string7968",
+"string7969",
+"string7970",
+"string7971",
+"string7972",
+"string7973",
+"string7974",
+"string7975",
+"string7976",
+"string7977",
+"string7978",
+"string7979",
+"string7980",
+"string7981",
+"string7982",
+"string7983",
+"string7984",
+"string7985",
+"string7986",
+"string7987",
+"string7988",
+"string7989",
+"string7990",
+"string7991",
+"string7992",
+"string7993",
+"string7994",
+"string7995",
+"string7996",
+"string7997",
+"string7998",
+"string7999",
+"string8000",
+"string8001",
+"string8002",
+"string8003",
+"string8004",
+"string8005",
+"string8006",
+"string8007",
+"string8008",
+"string8009",
+"string8010",
+"string8011",
+"string8012",
+"string8013",
+"string8014",
+"string8015",
+"string8016",
+"string8017",
+"string8018",
+"string8019",
+"string8020",
+"string8021",
+"string8022",
+"string8023",
+"string8024",
+"string8025",
+"string8026",
+"string8027",
+"string8028",
+"string8029",
+"string8030",
+"string8031",
+"string8032",
+"string8033",
+"string8034",
+"string8035",
+"string8036",
+"string8037",
+"string8038",
+"string8039",
+"string8040",
+"string8041",
+"string8042",
+"string8043",
+"string8044",
+"string8045",
+"string8046",
+"string8047",
+"string8048",
+"string8049",
+"string8050",
+"string8051",
+"string8052",
+"string8053",
+"string8054",
+"string8055",
+"string8056",
+"string8057",
+"string8058",
+"string8059",
+"string8060",
+"string8061",
+"string8062",
+"string8063",
+"string8064",
+"string8065",
+"string8066",
+"string8067",
+"string8068",
+"string8069",
+"string8070",
+"string8071",
+"string8072",
+"string8073",
+"string8074",
+"string8075",
+"string8076",
+"string8077",
+"string8078",
+"string8079",
+"string8080",
+"string8081",
+"string8082",
+"string8083",
+"string8084",
+"string8085",
+"string8086",
+"string8087",
+"string8088",
+"string8089",
+"string8090",
+"string8091",
+"string8092",
+"string8093",
+"string8094",
+"string8095",
+"string8096",
+"string8097",
+"string8098",
+"string8099",
+"string8100",
+"string8101",
+"string8102",
+"string8103",
+"string8104",
+"string8105",
+"string8106",
+"string8107",
+"string8108",
+"string8109",
+"string8110",
+"string8111",
+"string8112",
+"string8113",
+"string8114",
+"string8115",
+"string8116",
+"string8117",
+"string8118",
+"string8119",
+"string8120",
+"string8121",
+"string8122",
+"string8123",
+"string8124",
+"string8125",
+"string8126",
+"string8127",
+"string8128",
+"string8129",
+"string8130",
+"string8131",
+"string8132",
+"string8133",
+"string8134",
+"string8135",
+"string8136",
+"string8137",
+"string8138",
+"string8139",
+"string8140",
+"string8141",
+"string8142",
+"string8143",
+"string8144",
+"string8145",
+"string8146",
+"string8147",
+"string8148",
+"string8149",
+"string8150",
+"string8151",
+"string8152",
+"string8153",
+"string8154",
+"string8155",
+"string8156",
+"string8157",
+"string8158",
+"string8159",
+"string8160",
+"string8161",
+"string8162",
+"string8163",
+"string8164",
+"string8165",
+"string8166",
+"string8167",
+"string8168",
+"string8169",
+"string8170",
+"string8171",
+"string8172",
+"string8173",
+"string8174",
+"string8175",
+"string8176",
+"string8177",
+"string8178",
+"string8179",
+"string8180",
+"string8181",
+"string8182",
+"string8183",
+"string8184",
+"string8185",
+"string8186",
+"string8187",
+"string8188",
+"string8189",
+"string8190",
+"string8191",
+"string8192",
+"string8193",
+"string8194",
+"string8195",
+"string8196",
+"string8197",
+"string8198",
+"string8199",
+"string8200",
+"string8201",
+"string8202",
+"string8203",
+"string8204",
+"string8205",
+"string8206",
+"string8207",
+"string8208",
+"string8209",
+"string8210",
+"string8211",
+"string8212",
+"string8213",
+"string8214",
+"string8215",
+"string8216",
+"string8217",
+"string8218",
+"string8219",
+"string8220",
+"string8221",
+"string8222",
+"string8223",
+"string8224",
+"string8225",
+"string8226",
+"string8227",
+"string8228",
+"string8229",
+"string8230",
+"string8231",
+"string8232",
+"string8233",
+"string8234",
+"string8235",
+"string8236",
+"string8237",
+"string8238",
+"string8239",
+"string8240",
+"string8241",
+"string8242",
+"string8243",
+"string8244",
+"string8245",
+"string8246",
+"string8247",
+"string8248",
+"string8249",
+"string8250",
+"string8251",
+"string8252",
+"string8253",
+"string8254",
+"string8255",
+"string8256",
+"string8257",
+"string8258",
+"string8259",
+"string8260",
+"string8261",
+"string8262",
+"string8263",
+"string8264",
+"string8265",
+"string8266",
+"string8267",
+"string8268",
+"string8269",
+"string8270",
+"string8271",
+"string8272",
+"string8273",
+"string8274",
+"string8275",
+"string8276",
+"string8277",
+"string8278",
+"string8279",
+"string8280",
+"string8281",
+"string8282",
+"string8283",
+"string8284",
+"string8285",
+"string8286",
+"string8287",
+"string8288",
+"string8289",
+"string8290",
+"string8291",
+"string8292",
+"string8293",
+"string8294",
+"string8295",
+"string8296",
+"string8297",
+"string8298",
+"string8299",
+"string8300",
+"string8301",
+"string8302",
+"string8303",
+"string8304",
+"string8305",
+"string8306",
+"string8307",
+"string8308",
+"string8309",
+"string8310",
+"string8311",
+"string8312",
+"string8313",
+"string8314",
+"string8315",
+"string8316",
+"string8317",
+"string8318",
+"string8319",
+"string8320",
+"string8321",
+"string8322",
+"string8323",
+"string8324",
+"string8325",
+"string8326",
+"string8327",
+"string8328",
+"string8329",
+"string8330",
+"string8331",
+"string8332",
+"string8333",
+"string8334",
+"string8335",
+"string8336",
+"string8337",
+"string8338",
+"string8339",
+"string8340",
+"string8341",
+"string8342",
+"string8343",
+"string8344",
+"string8345",
+"string8346",
+"string8347",
+"string8348",
+"string8349",
+"string8350",
+"string8351",
+"string8352",
+"string8353",
+"string8354",
+"string8355",
+"string8356",
+"string8357",
+"string8358",
+"string8359",
+"string8360",
+"string8361",
+"string8362",
+"string8363",
+"string8364",
+"string8365",
+"string8366",
+"string8367",
+"string8368",
+"string8369",
+"string8370",
+"string8371",
+"string8372",
+"string8373",
+"string8374",
+"string8375",
+"string8376",
+"string8377",
+"string8378",
+"string8379",
+"string8380",
+"string8381",
+"string8382",
+"string8383",
+"string8384",
+"string8385",
+"string8386",
+"string8387",
+"string8388",
+"string8389",
+"string8390",
+"string8391",
+"string8392",
+"string8393",
+"string8394",
+"string8395",
+"string8396",
+"string8397",
+"string8398",
+"string8399",
+"string8400",
+"string8401",
+"string8402",
+"string8403",
+"string8404",
+"string8405",
+"string8406",
+"string8407",
+"string8408",
+"string8409",
+"string8410",
+"string8411",
+"string8412",
+"string8413",
+"string8414",
+"string8415",
+"string8416",
+"string8417",
+"string8418",
+"string8419",
+"string8420",
+"string8421",
+"string8422",
+"string8423",
+"string8424",
+"string8425",
+"string8426",
+"string8427",
+"string8428",
+"string8429",
+"string8430",
+"string8431",
+"string8432",
+"string8433",
+"string8434",
+"string8435",
+"string8436",
+"string8437",
+"string8438",
+"string8439",
+"string8440",
+"string8441",
+"string8442",
+"string8443",
+"string8444",
+"string8445",
+"string8446",
+"string8447",
+"string8448",
+"string8449",
+"string8450",
+"string8451",
+"string8452",
+"string8453",
+"string8454",
+"string8455",
+"string8456",
+"string8457",
+"string8458",
+"string8459",
+"string8460",
+"string8461",
+"string8462",
+"string8463",
+"string8464",
+"string8465",
+"string8466",
+"string8467",
+"string8468",
+"string8469",
+"string8470",
+"string8471",
+"string8472",
+"string8473",
+"string8474",
+"string8475",
+"string8476",
+"string8477",
+"string8478",
+"string8479",
+"string8480",
+"string8481",
+"string8482",
+"string8483",
+"string8484",
+"string8485",
+"string8486",
+"string8487",
+"string8488",
+"string8489",
+"string8490",
+"string8491",
+"string8492",
+"string8493",
+"string8494",
+"string8495",
+"string8496",
+"string8497",
+"string8498",
+"string8499",
+"string8500",
+"string8501",
+"string8502",
+"string8503",
+"string8504",
+"string8505",
+"string8506",
+"string8507",
+"string8508",
+"string8509",
+"string8510",
+"string8511",
+"string8512",
+"string8513",
+"string8514",
+"string8515",
+"string8516",
+"string8517",
+"string8518",
+"string8519",
+"string8520",
+"string8521",
+"string8522",
+"string8523",
+"string8524",
+"string8525",
+"string8526",
+"string8527",
+"string8528",
+"string8529",
+"string8530",
+"string8531",
+"string8532",
+"string8533",
+"string8534",
+"string8535",
+"string8536",
+"string8537",
+"string8538",
+"string8539",
+"string8540",
+"string8541",
+"string8542",
+"string8543",
+"string8544",
+"string8545",
+"string8546",
+"string8547",
+"string8548",
+"string8549",
+"string8550",
+"string8551",
+"string8552",
+"string8553",
+"string8554",
+"string8555",
+"string8556",
+"string8557",
+"string8558",
+"string8559",
+"string8560",
+"string8561",
+"string8562",
+"string8563",
+"string8564",
+"string8565",
+"string8566",
+"string8567",
+"string8568",
+"string8569",
+"string8570",
+"string8571",
+"string8572",
+"string8573",
+"string8574",
+"string8575",
+"string8576",
+"string8577",
+"string8578",
+"string8579",
+"string8580",
+"string8581",
+"string8582",
+"string8583",
+"string8584",
+"string8585",
+"string8586",
+"string8587",
+"string8588",
+"string8589",
+"string8590",
+"string8591",
+"string8592",
+"string8593",
+"string8594",
+"string8595",
+"string8596",
+"string8597",
+"string8598",
+"string8599",
+"string8600",
+"string8601",
+"string8602",
+"string8603",
+"string8604",
+"string8605",
+"string8606",
+"string8607",
+"string8608",
+"string8609",
+"string8610",
+"string8611",
+"string8612",
+"string8613",
+"string8614",
+"string8615",
+"string8616",
+"string8617",
+"string8618",
+"string8619",
+"string8620",
+"string8621",
+"string8622",
+"string8623",
+"string8624",
+"string8625",
+"string8626",
+"string8627",
+"string8628",
+"string8629",
+"string8630",
+"string8631",
+"string8632",
+"string8633",
+"string8634",
+"string8635",
+"string8636",
+"string8637",
+"string8638",
+"string8639",
+"string8640",
+"string8641",
+"string8642",
+"string8643",
+"string8644",
+"string8645",
+"string8646",
+"string8647",
+"string8648",
+"string8649",
+"string8650",
+"string8651",
+"string8652",
+"string8653",
+"string8654",
+"string8655",
+"string8656",
+"string8657",
+"string8658",
+"string8659",
+"string8660",
+"string8661",
+"string8662",
+"string8663",
+"string8664",
+"string8665",
+"string8666",
+"string8667",
+"string8668",
+"string8669",
+"string8670",
+"string8671",
+"string8672",
+"string8673",
+"string8674",
+"string8675",
+"string8676",
+"string8677",
+"string8678",
+"string8679",
+"string8680",
+"string8681",
+"string8682",
+"string8683",
+"string8684",
+"string8685",
+"string8686",
+"string8687",
+"string8688",
+"string8689",
+"string8690",
+"string8691",
+"string8692",
+"string8693",
+"string8694",
+"string8695",
+"string8696",
+"string8697",
+"string8698",
+"string8699",
+"string8700",
+"string8701",
+"string8702",
+"string8703",
+"string8704",
+"string8705",
+"string8706",
+"string8707",
+"string8708",
+"string8709",
+"string8710",
+"string8711",
+"string8712",
+"string8713",
+"string8714",
+"string8715",
+"string8716",
+"string8717",
+"string8718",
+"string8719",
+"string8720",
+"string8721",
+"string8722",
+"string8723",
+"string8724",
+"string8725",
+"string8726",
+"string8727",
+"string8728",
+"string8729",
+"string8730",
+"string8731",
+"string8732",
+"string8733",
+"string8734",
+"string8735",
+"string8736",
+"string8737",
+"string8738",
+"string8739",
+"string8740",
+"string8741",
+"string8742",
+"string8743",
+"string8744",
+"string8745",
+"string8746",
+"string8747",
+"string8748",
+"string8749",
+"string8750",
+"string8751",
+"string8752",
+"string8753",
+"string8754",
+"string8755",
+"string8756",
+"string8757",
+"string8758",
+"string8759",
+"string8760",
+"string8761",
+"string8762",
+"string8763",
+"string8764",
+"string8765",
+"string8766",
+"string8767",
+"string8768",
+"string8769",
+"string8770",
+"string8771",
+"string8772",
+"string8773",
+"string8774",
+"string8775",
+"string8776",
+"string8777",
+"string8778",
+"string8779",
+"string8780",
+"string8781",
+"string8782",
+"string8783",
+"string8784",
+"string8785",
+"string8786",
+"string8787",
+"string8788",
+"string8789",
+"string8790",
+"string8791",
+"string8792",
+"string8793",
+"string8794",
+"string8795",
+"string8796",
+"string8797",
+"string8798",
+"string8799",
+"string8800",
+"string8801",
+"string8802",
+"string8803",
+"string8804",
+"string8805",
+"string8806",
+"string8807",
+"string8808",
+"string8809",
+"string8810",
+"string8811",
+"string8812",
+"string8813",
+"string8814",
+"string8815",
+"string8816",
+"string8817",
+"string8818",
+"string8819",
+"string8820",
+"string8821",
+"string8822",
+"string8823",
+"string8824",
+"string8825",
+"string8826",
+"string8827",
+"string8828",
+"string8829",
+"string8830",
+"string8831",
+"string8832",
+"string8833",
+"string8834",
+"string8835",
+"string8836",
+"string8837",
+"string8838",
+"string8839",
+"string8840",
+"string8841",
+"string8842",
+"string8843",
+"string8844",
+"string8845",
+"string8846",
+"string8847",
+"string8848",
+"string8849",
+"string8850",
+"string8851",
+"string8852",
+"string8853",
+"string8854",
+"string8855",
+"string8856",
+"string8857",
+"string8858",
+"string8859",
+"string8860",
+"string8861",
+"string8862",
+"string8863",
+"string8864",
+"string8865",
+"string8866",
+"string8867",
+"string8868",
+"string8869",
+"string8870",
+"string8871",
+"string8872",
+"string8873",
+"string8874",
+"string8875",
+"string8876",
+"string8877",
+"string8878",
+"string8879",
+"string8880",
+"string8881",
+"string8882",
+"string8883",
+"string8884",
+"string8885",
+"string8886",
+"string8887",
+"string8888",
+"string8889",
+"string8890",
+"string8891",
+"string8892",
+"string8893",
+"string8894",
+"string8895",
+"string8896",
+"string8897",
+"string8898",
+"string8899",
+"string8900",
+"string8901",
+"string8902",
+"string8903",
+"string8904",
+"string8905",
+"string8906",
+"string8907",
+"string8908",
+"string8909",
+"string8910",
+"string8911",
+"string8912",
+"string8913",
+"string8914",
+"string8915",
+"string8916",
+"string8917",
+"string8918",
+"string8919",
+"string8920",
+"string8921",
+"string8922",
+"string8923",
+"string8924",
+"string8925",
+"string8926",
+"string8927",
+"string8928",
+"string8929",
+"string8930",
+"string8931",
+"string8932",
+"string8933",
+"string8934",
+"string8935",
+"string8936",
+"string8937",
+"string8938",
+"string8939",
+"string8940",
+"string8941",
+"string8942",
+"string8943",
+"string8944",
+"string8945",
+"string8946",
+"string8947",
+"string8948",
+"string8949",
+"string8950",
+"string8951",
+"string8952",
+"string8953",
+"string8954",
+"string8955",
+"string8956",
+"string8957",
+"string8958",
+"string8959",
+"string8960",
+"string8961",
+"string8962",
+"string8963",
+"string8964",
+"string8965",
+"string8966",
+"string8967",
+"string8968",
+"string8969",
+"string8970",
+"string8971",
+"string8972",
+"string8973",
+"string8974",
+"string8975",
+"string8976",
+"string8977",
+"string8978",
+"string8979",
+"string8980",
+"string8981",
+"string8982",
+"string8983",
+"string8984",
+"string8985",
+"string8986",
+"string8987",
+"string8988",
+"string8989",
+"string8990",
+"string8991",
+"string8992",
+"string8993",
+"string8994",
+"string8995",
+"string8996",
+"string8997",
+"string8998",
+"string8999",
+"string9000",
+"string9001",
+"string9002",
+"string9003",
+"string9004",
+"string9005",
+"string9006",
+"string9007",
+"string9008",
+"string9009",
+"string9010",
+"string9011",
+"string9012",
+"string9013",
+"string9014",
+"string9015",
+"string9016",
+"string9017",
+"string9018",
+"string9019",
+"string9020",
+"string9021",
+"string9022",
+"string9023",
+"string9024",
+"string9025",
+"string9026",
+"string9027",
+"string9028",
+"string9029",
+"string9030",
+"string9031",
+"string9032",
+"string9033",
+"string9034",
+"string9035",
+"string9036",
+"string9037",
+"string9038",
+"string9039",
+"string9040",
+"string9041",
+"string9042",
+"string9043",
+"string9044",
+"string9045",
+"string9046",
+"string9047",
+"string9048",
+"string9049",
+"string9050",
+"string9051",
+"string9052",
+"string9053",
+"string9054",
+"string9055",
+"string9056",
+"string9057",
+"string9058",
+"string9059",
+"string9060",
+"string9061",
+"string9062",
+"string9063",
+"string9064",
+"string9065",
+"string9066",
+"string9067",
+"string9068",
+"string9069",
+"string9070",
+"string9071",
+"string9072",
+"string9073",
+"string9074",
+"string9075",
+"string9076",
+"string9077",
+"string9078",
+"string9079",
+"string9080",
+"string9081",
+"string9082",
+"string9083",
+"string9084",
+"string9085",
+"string9086",
+"string9087",
+"string9088",
+"string9089",
+"string9090",
+"string9091",
+"string9092",
+"string9093",
+"string9094",
+"string9095",
+"string9096",
+"string9097",
+"string9098",
+"string9099",
+"string9100",
+"string9101",
+"string9102",
+"string9103",
+"string9104",
+"string9105",
+"string9106",
+"string9107",
+"string9108",
+"string9109",
+"string9110",
+"string9111",
+"string9112",
+"string9113",
+"string9114",
+"string9115",
+"string9116",
+"string9117",
+"string9118",
+"string9119",
+"string9120",
+"string9121",
+"string9122",
+"string9123",
+"string9124",
+"string9125",
+"string9126",
+"string9127",
+"string9128",
+"string9129",
+"string9130",
+"string9131",
+"string9132",
+"string9133",
+"string9134",
+"string9135",
+"string9136",
+"string9137",
+"string9138",
+"string9139",
+"string9140",
+"string9141",
+"string9142",
+"string9143",
+"string9144",
+"string9145",
+"string9146",
+"string9147",
+"string9148",
+"string9149",
+"string9150",
+"string9151",
+"string9152",
+"string9153",
+"string9154",
+"string9155",
+"string9156",
+"string9157",
+"string9158",
+"string9159",
+"string9160",
+"string9161",
+"string9162",
+"string9163",
+"string9164",
+"string9165",
+"string9166",
+"string9167",
+"string9168",
+"string9169",
+"string9170",
+"string9171",
+"string9172",
+"string9173",
+"string9174",
+"string9175",
+"string9176",
+"string9177",
+"string9178",
+"string9179",
+"string9180",
+"string9181",
+"string9182",
+"string9183",
+"string9184",
+"string9185",
+"string9186",
+"string9187",
+"string9188",
+"string9189",
+"string9190",
+"string9191",
+"string9192",
+"string9193",
+"string9194",
+"string9195",
+"string9196",
+"string9197",
+"string9198",
+"string9199",
+"string9200",
+"string9201",
+"string9202",
+"string9203",
+"string9204",
+"string9205",
+"string9206",
+"string9207",
+"string9208",
+"string9209",
+"string9210",
+"string9211",
+"string9212",
+"string9213",
+"string9214",
+"string9215",
+"string9216",
+"string9217",
+"string9218",
+"string9219",
+"string9220",
+"string9221",
+"string9222",
+"string9223",
+"string9224",
+"string9225",
+"string9226",
+"string9227",
+"string9228",
+"string9229",
+"string9230",
+"string9231",
+"string9232",
+"string9233",
+"string9234",
+"string9235",
+"string9236",
+"string9237",
+"string9238",
+"string9239",
+"string9240",
+"string9241",
+"string9242",
+"string9243",
+"string9244",
+"string9245",
+"string9246",
+"string9247",
+"string9248",
+"string9249",
+"string9250",
+"string9251",
+"string9252",
+"string9253",
+"string9254",
+"string9255",
+"string9256",
+"string9257",
+"string9258",
+"string9259",
+"string9260",
+"string9261",
+"string9262",
+"string9263",
+"string9264",
+"string9265",
+"string9266",
+"string9267",
+"string9268",
+"string9269",
+"string9270",
+"string9271",
+"string9272",
+"string9273",
+"string9274",
+"string9275",
+"string9276",
+"string9277",
+"string9278",
+"string9279",
+"string9280",
+"string9281",
+"string9282",
+"string9283",
+"string9284",
+"string9285",
+"string9286",
+"string9287",
+"string9288",
+"string9289",
+"string9290",
+"string9291",
+"string9292",
+"string9293",
+"string9294",
+"string9295",
+"string9296",
+"string9297",
+"string9298",
+"string9299",
+"string9300",
+"string9301",
+"string9302",
+"string9303",
+"string9304",
+"string9305",
+"string9306",
+"string9307",
+"string9308",
+"string9309",
+"string9310",
+"string9311",
+"string9312",
+"string9313",
+"string9314",
+"string9315",
+"string9316",
+"string9317",
+"string9318",
+"string9319",
+"string9320",
+"string9321",
+"string9322",
+"string9323",
+"string9324",
+"string9325",
+"string9326",
+"string9327",
+"string9328",
+"string9329",
+"string9330",
+"string9331",
+"string9332",
+"string9333",
+"string9334",
+"string9335",
+"string9336",
+"string9337",
+"string9338",
+"string9339",
+"string9340",
+"string9341",
+"string9342",
+"string9343",
+"string9344",
+"string9345",
+"string9346",
+"string9347",
+"string9348",
+"string9349",
+"string9350",
+"string9351",
+"string9352",
+"string9353",
+"string9354",
+"string9355",
+"string9356",
+"string9357",
+"string9358",
+"string9359",
+"string9360",
+"string9361",
+"string9362",
+"string9363",
+"string9364",
+"string9365",
+"string9366",
+"string9367",
+"string9368",
+"string9369",
+"string9370",
+"string9371",
+"string9372",
+"string9373",
+"string9374",
+"string9375",
+"string9376",
+"string9377",
+"string9378",
+"string9379",
+"string9380",
+"string9381",
+"string9382",
+"string9383",
+"string9384",
+"string9385",
+"string9386",
+"string9387",
+"string9388",
+"string9389",
+"string9390",
+"string9391",
+"string9392",
+"string9393",
+"string9394",
+"string9395",
+"string9396",
+"string9397",
+"string9398",
+"string9399",
+"string9400",
+"string9401",
+"string9402",
+"string9403",
+"string9404",
+"string9405",
+"string9406",
+"string9407",
+"string9408",
+"string9409",
+"string9410",
+"string9411",
+"string9412",
+"string9413",
+"string9414",
+"string9415",
+"string9416",
+"string9417",
+"string9418",
+"string9419",
+"string9420",
+"string9421",
+"string9422",
+"string9423",
+"string9424",
+"string9425",
+"string9426",
+"string9427",
+"string9428",
+"string9429",
+"string9430",
+"string9431",
+"string9432",
+"string9433",
+"string9434",
+"string9435",
+"string9436",
+"string9437",
+"string9438",
+"string9439",
+"string9440",
+"string9441",
+"string9442",
+"string9443",
+"string9444",
+"string9445",
+"string9446",
+"string9447",
+"string9448",
+"string9449",
+"string9450",
+"string9451",
+"string9452",
+"string9453",
+"string9454",
+"string9455",
+"string9456",
+"string9457",
+"string9458",
+"string9459",
+"string9460",
+"string9461",
+"string9462",
+"string9463",
+"string9464",
+"string9465",
+"string9466",
+"string9467",
+"string9468",
+"string9469",
+"string9470",
+"string9471",
+"string9472",
+"string9473",
+"string9474",
+"string9475",
+"string9476",
+"string9477",
+"string9478",
+"string9479",
+"string9480",
+"string9481",
+"string9482",
+"string9483",
+"string9484",
+"string9485",
+"string9486",
+"string9487",
+"string9488",
+"string9489",
+"string9490",
+"string9491",
+"string9492",
+"string9493",
+"string9494",
+"string9495",
+"string9496",
+"string9497",
+"string9498",
+"string9499",
+"string9500",
+"string9501",
+"string9502",
+"string9503",
+"string9504",
+"string9505",
+"string9506",
+"string9507",
+"string9508",
+"string9509",
+"string9510",
+"string9511",
+"string9512",
+"string9513",
+"string9514",
+"string9515",
+"string9516",
+"string9517",
+"string9518",
+"string9519",
+"string9520",
+"string9521",
+"string9522",
+"string9523",
+"string9524",
+"string9525",
+"string9526",
+"string9527",
+"string9528",
+"string9529",
+"string9530",
+"string9531",
+"string9532",
+"string9533",
+"string9534",
+"string9535",
+"string9536",
+"string9537",
+"string9538",
+"string9539",
+"string9540",
+"string9541",
+"string9542",
+"string9543",
+"string9544",
+"string9545",
+"string9546",
+"string9547",
+"string9548",
+"string9549",
+"string9550",
+"string9551",
+"string9552",
+"string9553",
+"string9554",
+"string9555",
+"string9556",
+"string9557",
+"string9558",
+"string9559",
+"string9560",
+"string9561",
+"string9562",
+"string9563",
+"string9564",
+"string9565",
+"string9566",
+"string9567",
+"string9568",
+"string9569",
+"string9570",
+"string9571",
+"string9572",
+"string9573",
+"string9574",
+"string9575",
+"string9576",
+"string9577",
+"string9578",
+"string9579",
+"string9580",
+"string9581",
+"string9582",
+"string9583",
+"string9584",
+"string9585",
+"string9586",
+"string9587",
+"string9588",
+"string9589",
+"string9590",
+"string9591",
+"string9592",
+"string9593",
+"string9594",
+"string9595",
+"string9596",
+"string9597",
+"string9598",
+"string9599",
+"string9600",
+"string9601",
+"string9602",
+"string9603",
+"string9604",
+"string9605",
+"string9606",
+"string9607",
+"string9608",
+"string9609",
+"string9610",
+"string9611",
+"string9612",
+"string9613",
+"string9614",
+"string9615",
+"string9616",
+"string9617",
+"string9618",
+"string9619",
+"string9620",
+"string9621",
+"string9622",
+"string9623",
+"string9624",
+"string9625",
+"string9626",
+"string9627",
+"string9628",
+"string9629",
+"string9630",
+"string9631",
+"string9632",
+"string9633",
+"string9634",
+"string9635",
+"string9636",
+"string9637",
+"string9638",
+"string9639",
+"string9640",
+"string9641",
+"string9642",
+"string9643",
+"string9644",
+"string9645",
+"string9646",
+"string9647",
+"string9648",
+"string9649",
+"string9650",
+"string9651",
+"string9652",
+"string9653",
+"string9654",
+"string9655",
+"string9656",
+"string9657",
+"string9658",
+"string9659",
+"string9660",
+"string9661",
+"string9662",
+"string9663",
+"string9664",
+"string9665",
+"string9666",
+"string9667",
+"string9668",
+"string9669",
+"string9670",
+"string9671",
+"string9672",
+"string9673",
+"string9674",
+"string9675",
+"string9676",
+"string9677",
+"string9678",
+"string9679",
+"string9680",
+"string9681",
+"string9682",
+"string9683",
+"string9684",
+"string9685",
+"string9686",
+"string9687",
+"string9688",
+"string9689",
+"string9690",
+"string9691",
+"string9692",
+"string9693",
+"string9694",
+"string9695",
+"string9696",
+"string9697",
+"string9698",
+"string9699",
+"string9700",
+"string9701",
+"string9702",
+"string9703",
+"string9704",
+"string9705",
+"string9706",
+"string9707",
+"string9708",
+"string9709",
+"string9710",
+"string9711",
+"string9712",
+"string9713",
+"string9714",
+"string9715",
+"string9716",
+"string9717",
+"string9718",
+"string9719",
+"string9720",
+"string9721",
+"string9722",
+"string9723",
+"string9724",
+"string9725",
+"string9726",
+"string9727",
+"string9728",
+"string9729",
+"string9730",
+"string9731",
+"string9732",
+"string9733",
+"string9734",
+"string9735",
+"string9736",
+"string9737",
+"string9738",
+"string9739",
+"string9740",
+"string9741",
+"string9742",
+"string9743",
+"string9744",
+"string9745",
+"string9746",
+"string9747",
+"string9748",
+"string9749",
+"string9750",
+"string9751",
+"string9752",
+"string9753",
+"string9754",
+"string9755",
+"string9756",
+"string9757",
+"string9758",
+"string9759",
+"string9760",
+"string9761",
+"string9762",
+"string9763",
+"string9764",
+"string9765",
+"string9766",
+"string9767",
+"string9768",
+"string9769",
+"string9770",
+"string9771",
+"string9772",
+"string9773",
+"string9774",
+"string9775",
+"string9776",
+"string9777",
+"string9778",
+"string9779",
+"string9780",
+"string9781",
+"string9782",
+"string9783",
+"string9784",
+"string9785",
+"string9786",
+"string9787",
+"string9788",
+"string9789",
+"string9790",
+"string9791",
+"string9792",
+"string9793",
+"string9794",
+"string9795",
+"string9796",
+"string9797",
+"string9798",
+"string9799",
+"string9800",
+"string9801",
+"string9802",
+"string9803",
+"string9804",
+"string9805",
+"string9806",
+"string9807",
+"string9808",
+"string9809",
+"string9810",
+"string9811",
+"string9812",
+"string9813",
+"string9814",
+"string9815",
+"string9816",
+"string9817",
+"string9818",
+"string9819",
+"string9820",
+"string9821",
+"string9822",
+"string9823",
+"string9824",
+"string9825",
+"string9826",
+"string9827",
+"string9828",
+"string9829",
+"string9830",
+"string9831",
+"string9832",
+"string9833",
+"string9834",
+"string9835",
+"string9836",
+"string9837",
+"string9838",
+"string9839",
+"string9840",
+"string9841",
+"string9842",
+"string9843",
+"string9844",
+"string9845",
+"string9846",
+"string9847",
+"string9848",
+"string9849",
+"string9850",
+"string9851",
+"string9852",
+"string9853",
+"string9854",
+"string9855",
+"string9856",
+"string9857",
+"string9858",
+"string9859",
+"string9860",
+"string9861",
+"string9862",
+"string9863",
+"string9864",
+"string9865",
+"string9866",
+"string9867",
+"string9868",
+"string9869",
+"string9870",
+"string9871",
+"string9872",
+"string9873",
+"string9874",
+"string9875",
+"string9876",
+"string9877",
+"string9878",
+"string9879",
+"string9880",
+"string9881",
+"string9882",
+"string9883",
+"string9884",
+"string9885",
+"string9886",
+"string9887",
+"string9888",
+"string9889",
+"string9890",
+"string9891",
+"string9892",
+"string9893",
+"string9894",
+"string9895",
+"string9896",
+"string9897",
+"string9898",
+"string9899",
+"string9900",
+"string9901",
+"string9902",
+"string9903",
+"string9904",
+"string9905",
+"string9906",
+"string9907",
+"string9908",
+"string9909",
+"string9910",
+"string9911",
+"string9912",
+"string9913",
+"string9914",
+"string9915",
+"string9916",
+"string9917",
+"string9918",
+"string9919",
+"string9920",
+"string9921",
+"string9922",
+"string9923",
+"string9924",
+"string9925",
+"string9926",
+"string9927",
+"string9928",
+"string9929",
+"string9930",
+"string9931",
+"string9932",
+"string9933",
+"string9934",
+"string9935",
+"string9936",
+"string9937",
+"string9938",
+"string9939",
+"string9940",
+"string9941",
+"string9942",
+"string9943",
+"string9944",
+"string9945",
+"string9946",
+"string9947",
+"string9948",
+"string9949",
+"string9950",
+"string9951",
+"string9952",
+"string9953",
+"string9954",
+"string9955",
+"string9956",
+"string9957",
+"string9958",
+"string9959",
+"string9960",
+"string9961",
+"string9962",
+"string9963",
+"string9964",
+"string9965",
+"string9966",
+"string9967",
+"string9968",
+"string9969",
+"string9970",
+"string9971",
+"string9972",
+"string9973",
+"string9974",
+"string9975",
+"string9976",
+"string9977",
+"string9978",
+"string9979",
+"string9980",
+"string9981",
+"string9982",
+"string9983",
+"string9984",
+"string9985",
+"string9986",
+"string9987",
+"string9988",
+"string9989",
+"string9990",
+"string9991",
+"string9992",
+"string9993",
+"string9994",
+"string9995",
+"string9996",
+"string9997",
+"string9998",
+"string9999"
+];
+
+print(largeInteger[0]);
+print(largeInteger[9999]);
+print(largeDouble[0]);
+print(largeDouble[9999]);
+print(largeObject[0]);
+print(largeObject[1]);
+print(largeObject[2]);
+print(largeObject[3]);
+print(largeObject[4]);
+print(largeObject[5]);
+print(largeObject[6]);
+print(largeObject[9999+6]);
+
+var array = [];
+for (var i = 0; i < 5; i++) {
+    array[i] = [10, 20, 30];
+}
+
+array[3][1] = 9999;
+print(array[3][1], array[1][1]);
+
diff --git a/nashorn/test/script/basic/NASHORN-534.js.EXPECTED b/nashorn/test/script/basic/NASHORN-534.js.EXPECTED
new file mode 100644
index 00000000000..769407a29dc
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-534.js.EXPECTED
@@ -0,0 +1,13 @@
+0
+9999
+0.1
+9999.1
+true
+1
+1.234
+null
+undefined
+undefined
+string0
+string9999
+9999 20
\ No newline at end of file
diff --git a/nashorn/test/script/basic/NASHORN-535.js b/nashorn/test/script/basic/NASHORN-535.js
new file mode 100644
index 00000000000..6ca6020c8fa
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-535.js
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * NASHORN-535 : Property name of an AccessNode is assigned variable symbol.
+ *
+ * @test
+ * @run
+ */
+
+function Foo() {
+  this.a = "a";
+  this.b = "b";
+}
+
+(function() {
+var foo = new Foo();
+delete foo.b;
+print(foo.b);
+})();
+(function() {
+"use strict";
+var foo = new Foo();
+delete foo.b;
+print(foo.b);
+})();
diff --git a/nashorn/test/script/basic/NASHORN-535.js.EXPECTED b/nashorn/test/script/basic/NASHORN-535.js.EXPECTED
new file mode 100644
index 00000000000..d4f80bf8362
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-535.js.EXPECTED
@@ -0,0 +1,2 @@
+undefined
+undefined
diff --git a/nashorn/test/script/basic/NASHORN-544.js b/nashorn/test/script/basic/NASHORN-544.js
new file mode 100644
index 00000000000..29f3c8561d1
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-544.js
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-544 : exception trace should contain thrown message
+ *
+ * @test
+ * @run
+ */
+
+function AssertionError(msg) {
+    this.message = msg;
+}
+
+AssertionError.prototype = Object.create(Error.prototype);
+AssertionError.prototype.name = "AssertionError";
+
+var e = new AssertionError("failed!");
+try {
+    throw e;
+} catch(e) {
+    // check that nashornException has the right message
+    if (e.nashornException.getMessage() != 'AssertionError: failed!') {
+        fail("AssertionError's message is not correct");
+    }
+}
diff --git a/nashorn/test/script/basic/NASHORN-55.js b/nashorn/test/script/basic/NASHORN-55.js
new file mode 100644
index 00000000000..58ab7ad4da5
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-55.js
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-55 :  When converting Boolean JS object, converted primitive boolean value should always be true.
+ *
+ * @test
+ * @run
+ */
+
+if (! (new Boolean(false))) {
+    print("ERROR: new Boolean(false) should be true");
+}
+
+if (! (new Boolean())) {
+    print("ERROR: new Boolean() should be true");
+}
diff --git a/nashorn/test/script/basic/NASHORN-554.js b/nashorn/test/script/basic/NASHORN-554.js
new file mode 100644
index 00000000000..48128725a3d
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-554.js
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-554 : String character index iteration is wrong
+ *
+ * @test
+ * @run
+ */
+
+var s = new String("hello");
+for (i in s) {
+   print(i + " -> " + s[i]);
+}
+
+for each (c in s) {
+   print(c);
+}
+
+
diff --git a/nashorn/test/script/basic/NASHORN-554.js.EXPECTED b/nashorn/test/script/basic/NASHORN-554.js.EXPECTED
new file mode 100644
index 00000000000..9f72588cf10
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-554.js.EXPECTED
@@ -0,0 +1,10 @@
+0 -> h
+1 -> e
+2 -> l
+3 -> l
+4 -> o
+h
+e
+l
+l
+o
diff --git a/nashorn/test/script/basic/NASHORN-556.js b/nashorn/test/script/basic/NASHORN-556.js
new file mode 100644
index 00000000000..f9e464bd11b
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-556.js
@@ -0,0 +1,216 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * NASHORN-556: Need more tests to exercise code in jdk.nashorn.internal.runtime.array package.
+ *
+ * @test
+ * @run
+ */
+
+function p() {
+  var s = "";
+  for each (var i in arguments) {
+    s += ((i !== undefined) ? i : "") + ",";
+  }
+  s = s.length != 0 ? s.substr(0, s.length - 1) : s;
+  print(s);
+}
+
+function assertEq(expected, actual) {
+  if (actual !== expected && !(isNaN(actual) && isNaN(expected))) {
+    throw "expected=" + expected + " actual=" + actual;
+  }
+}
+
+function f1() {
+  // (NoTypeArrayData)
+  var empty = {};
+  empty.length = 10;
+  Java.toJavaArray(empty);
+  delete empty[0];
+  Array.prototype.slice.call(empty, 0, 1);
+  Array.prototype.pop.call(empty);
+  Array.prototype.shift.call(empty);
+  empty = {};
+  empty[0] = eval("84") >>> 1; assertEq(42, empty[0]);
+  empty = {};
+  Array.prototype.unshift.call(empty, "x"); assertEq("x", empty[0]);
+  empty = {};
+  empty[0] = 8.4; assertEq(8.4, empty[0]);
+}
+
+function f2() {
+  // DeletedArrayFilter
+  var deleted = [,1,,2,,3,,4,,];
+  assertEq(2, Java.toJavaArray(deleted)[3]);
+  assertEq(undefined, deleted.pop());
+  assertEq(4, deleted.pop());
+  deleted.unshift(5);
+  p.apply(null, deleted);
+  assertEq(5, deleted.shift());
+  print(deleted.slice(0,3), deleted.slice(1,7));
+  assertEq(1, deleted[3] >>> 1);
+  deleted[3] = eval("84") >>> 1; assertEq(42, deleted[3]);
+  p.apply(null, deleted);
+}
+
+function f3() {
+  // DeletedRangeArrayFilter
+  var delrange = [1,2,3,,,,,,,,,,];
+  Java.toJavaArray(delrange);
+  delrange.unshift(4);
+  p.apply(null, delrange);
+  print(delrange.slice(1,3), delrange.slice(2,6));
+  assertEq(4, delrange.shift());
+}
+
+function f4() {
+  // NumberArrayData
+  var num = [1.1,2.2,3.3,4.4,5.5];
+  Java.toJavaArray(num);
+  assertEq(2, num[3] >>> 1);
+  assertEq(5, num[4] | 0);
+  assertEq(5.5, num.pop());
+  num.unshift(13.37);
+  print(num.slice(1,4));
+  assertEq(13.37, num.shift());
+  p.apply(null, num);
+  num.length = 20;
+  delete num[0];
+  num[0] = eval("14") >>> 1;
+}
+
+function f5() {
+  // ObjectArrayData
+  var obj = [2,"two",3.14,"pi",14,"fourteen"];
+  Java.toJavaArray(obj);
+  assertEq(-12.86, obj[2] - 16);
+  assertEq(7, obj[4] >>> 1);
+  obj.unshift("one");
+  obj[0] = 1.3;
+  obj[0] = eval("14") >>> 1;
+  assertEq(7, obj.shift());
+  p.apply(null, obj);
+}
+
+function f6() {
+  // SparseArrayData
+  var sparse = [9,8,7,6,5,4,3,2,1];
+  sparse[0x76543210] = 84;
+  assertEq(42, sparse[0x76543210] >>> 1);
+  assertEq(42, sparse[0x76543210] - 42);
+  assertEq(85, sparse[0x76543210] | 1);
+  sparse[0x76543210] = 7.2;
+  sparse[0x76543210] = eval("84") >>> 1;
+  sparse.unshift(10);
+  print(sparse.slice(0,12));
+  print(sparse.slice(0x76543209, 0x76543213));
+  assertEq(10, sparse.shift());
+  assertEq(42, sparse.pop());
+  sparse.length = 1024*1024;
+  sparse.push(sparse.length);
+  delete sparse[sparse.length-1];
+  //print(Java.toJavaArray(sparse).length);
+  (function(){}).apply(null, sparse);
+}
+
+function f7() {
+  // UndefinedArrayFilter
+  var undef = [1,2,3,4,5,undefined,7,8,9,19];
+  Java.toJavaArray(undef);
+  assertEq(4, undef[8] >>> 1);
+  var tmp = undef[9] >>> 1;
+  undef[8] = tmp;
+  undef.unshift(21);
+  print(undef.slice(0, 4), undef.slice(4, 5));
+  assertEq(21, undef.shift());
+  undef.push(20);
+  assertEq(20, undef.pop());
+  assertEq(19, undef.pop());
+  p.apply(null, undef);
+  undef.length = 20;
+}
+
+function f8() {
+  // LongArrayData
+  var j = Java.toJavaScriptArray(Java.toJavaArray([23,37,42,86,47], "long"));
+  Java.toJavaArray(j);
+  p.apply(null, j);
+  assertEq(43, j[3] >>> 1);
+  assertEq(36, j[4] - 11);
+  j.unshift(eval("14") >>> 1);
+  print(j.slice(0,4));
+  assertEq(7, j.shift());
+  assertEq(47, j.pop());
+  j.push("asdf");
+  j = Java.toJavaScriptArray(Java.toJavaArray([23,37,42,86,47], "long"));
+  j.length = 3;
+  j[0] = 13;
+  j = Java.toJavaScriptArray(Java.toJavaArray([23,37,42,86,47], "long"));
+  delete j[0];
+  j = Java.toJavaScriptArray(Java.toJavaArray([23,37,42,86,47], "long"));
+  j.length = 20;
+  j[0] = 13.37;
+}
+
+function f9() {
+  // FrozenArrayFilter
+  var a1 = [10,11,12,13,14,15];
+  Object.freeze(a1);
+  assertEq(true, Object.isFrozen(a1));
+  Object.getOwnPropertyDescriptor(a1, 0);
+  a1[1] = 1;
+  a1[2] = eval("14") >>> 1;
+  a1[3] = 3.14;
+  a1[4] = "asdf";
+  print(a1.slice(1,4));
+  a1.length = 20;
+}
+
+function f10() {
+  // SealedArrayFilter
+  var a1 = [10,11,12,13,14,15];
+  Object.seal(a1);
+  assertEq(true, Object.isSealed(a1));
+  Object.getOwnPropertyDescriptor(a1, 0);
+  a1[1] = 1;
+  a1[2] = eval("14") >>> 1;
+  a1[3] = 3.14;
+  a1[4] = "asdf";
+  print(a1.slice(1,4));
+  delete a1[0];
+  a1.length = 20;
+}
+
+f1();
+f2();
+f3();
+f4();
+f5();
+f6();
+f7();
+f8();
+f9();
+f10();
+
diff --git a/nashorn/test/script/basic/NASHORN-556.js.EXPECTED b/nashorn/test/script/basic/NASHORN-556.js.EXPECTED
new file mode 100644
index 00000000000..765d69ffb57
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-556.js.EXPECTED
@@ -0,0 +1,16 @@
+5,,1,,2,,3,
+,1, 1,,2,,3,
+,1,,42,,3,
+4,1,2,3,,,,,,,,,
+1,2 2,3,,
+1.1,2.2,3.3
+1.1,2.2,3.3,4.4
+2,two,3.14,pi,14,fourteen
+10,9,8,7,6,5,4,3,2,1,,
+,,,,,,,,42
+21,1,2,3 4
+1,2,3,4,5,,7,8,9
+23,37,42,86,47
+7,23,37,42
+11,12,13
+1,7,3.14
diff --git a/nashorn/test/script/basic/NASHORN-56.js b/nashorn/test/script/basic/NASHORN-56.js
new file mode 100644
index 00000000000..9ad9042e851
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-56.js
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * NASHORN-56: Assignment to global variables and type inference.
+ *
+ * @test
+ * @run
+ */
+
+var undefined = 1;
+print(undefined);
+
+eval("var x; function func() { x = 'world'; }");
+var x = 34;
+func();
+print(x);
+
+Object.defineProperty(this, 'y', {writable: false, value: 'hello'});
+var y = 34;
+print(y);
diff --git a/nashorn/test/script/basic/NASHORN-56.js.EXPECTED b/nashorn/test/script/basic/NASHORN-56.js.EXPECTED
new file mode 100644
index 00000000000..244f73c5bf4
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-56.js.EXPECTED
@@ -0,0 +1,3 @@
+undefined
+world
+hello
diff --git a/nashorn/test/script/basic/NASHORN-562.js b/nashorn/test/script/basic/NASHORN-562.js
new file mode 100644
index 00000000000..08b6cc6ecdf
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-562.js
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * NASHORN-562: AssertionError: Only return value on stack allowed at return point.
+ *
+ * @test
+ * @run
+ */
+
+function test() {
+  var arr = [1,2,3,7];
+  arr[arr.indexOf(2)]++;
+  return "" + arr;
+}
+if (test() !== "1,3,3,7") {
+  throw test();
+}
diff --git a/nashorn/test/script/basic/NASHORN-565.js b/nashorn/test/script/basic/NASHORN-565.js
new file mode 100644
index 00000000000..0d400c21b3e
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-565.js
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * NASHORN-565: ADD specialization is broken.
+ *
+ * @test
+ * @run
+ */
+
+var s = "42";
+var t = 3.14;
+var u = (s + t) - 0; print(u);
+var v = (s + 2) | 0; print(v);
+var w = (new Number(s) + Number.POSITIVE_INFINITY) | 0; print(w); // check correct int32 conversion
+var x = (new Number(s) + Number.POSITIVE_INFINITY) >>> 0; print(x); // check correct uint32 conversion
+var y = (parseInt(0xdeadf00d) + 0xdeadffff00d) >>> 1; print(y); // check correct long->uint32 conversion
+var z = (new Number(s) + Number.POSITIVE_INFINITY) - 0; print(z); // check correct double conversion
diff --git a/nashorn/test/script/basic/NASHORN-565.js.EXPECTED b/nashorn/test/script/basic/NASHORN-565.js.EXPECTED
new file mode 100644
index 00000000000..8259e4f474f
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-565.js.EXPECTED
@@ -0,0 +1,6 @@
+423.14
+422
+0
+0
+1599533069
+Infinity
diff --git a/nashorn/test/script/basic/NASHORN-575.js b/nashorn/test/script/basic/NASHORN-575.js
new file mode 100644
index 00000000000..1fd148b0cd2
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-575.js
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * NASHORN-575 : JSON parser throws AssertionError
+ *
+ * @test
+ * @run
+ */
+
+try {
+    JSON.parse('// foo');
+} catch (error) {
+    print(error);
+}
+try {
+    JSON.parse('/* foo */');
+} catch (error) {
+    print(error);
+}
+try {
+    JSON.parse('/foo/');
+} catch (error) {
+    print(error);
+}
+try {
+    JSON.parse('{"foo" : "bar" // foo }');
+} catch (error) {
+    print(error);
+}
+try {
+    JSON.parse('{"foo" : "bar" /* foo */ }');
+} catch (error) {
+    print(error);
+}
+try {
+    JSON.parse('{"foo" : /foo/}');
+} catch (error) {
+    print(error);
+}
diff --git a/nashorn/test/script/basic/NASHORN-575.js.EXPECTED b/nashorn/test/script/basic/NASHORN-575.js.EXPECTED
new file mode 100644
index 00000000000..c0d7e3e797a
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-575.js.EXPECTED
@@ -0,0 +1,18 @@
+SyntaxError: Invalid JSON: <json>:1:0 Expected json literal but found /
+// foo
+^
+SyntaxError: Invalid JSON: <json>:1:0 Expected json literal but found /
+/* foo */
+^
+SyntaxError: Invalid JSON: <json>:1:0 Expected json literal but found /
+/foo/
+^
+SyntaxError: Invalid JSON: <json>:1:15 Expected , or } but found /
+{"foo" : "bar" // foo }
+               ^
+SyntaxError: Invalid JSON: <json>:1:15 Expected , or } but found /
+{"foo" : "bar" /* foo */ }
+               ^
+SyntaxError: Invalid JSON: <json>:1:9 Expected json literal but found /
+{"foo" : /foo/}
+         ^
diff --git a/nashorn/test/script/basic/NASHORN-58.js b/nashorn/test/script/basic/NASHORN-58.js
new file mode 100644
index 00000000000..de7cbd7dcf9
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-58.js
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-58
+ *
+ * @test
+ * @run
+ */
+
+function test1() {
+    var x = 1;
+    try { 
+	print('try'); 
+	x = 2; 
+    } catch(e) {
+	print('catch');
+    } finally { 
+	print('finally');
+	x = 3; 
+    }
+    print(x);
+}
+
+function test2() {
+    var x = 1;
+    try {
+	print('try');
+    } finally {
+	print('finally');
+	x = 2;
+    }
+    print(x);
+}
+
+function test3() {
+    try {
+	return 2;
+    } finally {
+	return 3;
+    }
+}
+
+function test4() {
+    try {
+	x = 1;
+	print(x);
+	try {
+	    x = 2;
+	    print(x);
+	} finally {
+	    x = 3;
+	    print(x)
+	    try {
+		x = 4;
+		print(x);
+	    } finally {
+		x = 5;
+		print(x);
+	    }
+	}
+	print(x)
+    } finally {
+	x = 6;
+	print(x);
+    }
+    print(x);
+}
+
+function test5() {
+    try {
+	x = 1;
+	print(x);
+	try {
+	    x = 2;
+	    print(x);
+	} finally {
+	    x = 3;
+	    print(x)
+	    try {
+		x = 4;
+		print(x);
+	    } finally {
+		x = 5;
+		return x;
+	    }
+	}
+	print(x)
+    } finally {
+	x = 6;
+	return x;
+    }
+}
+
+function test6() {
+    try {
+	throw new Error("testing");
+    } catch (ex) {
+	print(ex);
+	return;
+    } finally {
+	print("finally");
+    }
+}
+
+function test7() {
+    var e = new Error("no message");
+    var i = 3;
+    try {
+        throw e;
+    } catch (ex) {
+    } finally {
+        i++;
+    }
+    if (i != 4) {
+	print("FAIL");
+    }
+    print("SUCCESS");
+}
+
+
+test1();
+test2();
+print(test3());
+test4();
+print(test5())
+test6();
+test7();
+
diff --git a/nashorn/test/script/basic/NASHORN-58.js.EXPECTED b/nashorn/test/script/basic/NASHORN-58.js.EXPECTED
new file mode 100644
index 00000000000..3a6a63af043
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-58.js.EXPECTED
@@ -0,0 +1,23 @@
+try
+finally
+3
+try
+finally
+2
+3
+1
+2
+3
+4
+5
+5
+6
+6
+1
+2
+3
+4
+6
+Error: testing
+finally
+SUCCESS
diff --git a/nashorn/test/script/basic/NASHORN-59.js b/nashorn/test/script/basic/NASHORN-59.js
new file mode 100644
index 00000000000..21f2ebbf2c8
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-59.js
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-59 :  Attempting to call RegExp methods on non-regexp objects should result in TypeError exception.
+ *
+ * @test
+ * @run
+ */
+
+Object.prototype.exec = RegExp.prototype.exec;
+
+try {
+    ".".exec();
+    print("ERROR: should have thrown TypeError");
+} catch (e) {
+    if ((e instanceof TypeError) !== true) {
+        print("ERROR: TypeError expected");
+    }
+    print(e);
+}
diff --git a/nashorn/test/script/basic/NASHORN-59.js.EXPECTED b/nashorn/test/script/basic/NASHORN-59.js.EXPECTED
new file mode 100644
index 00000000000..d397a804414
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-59.js.EXPECTED
@@ -0,0 +1 @@
+TypeError: . is not a RegExp
diff --git a/nashorn/test/script/basic/NASHORN-592.js b/nashorn/test/script/basic/NASHORN-592.js
new file mode 100644
index 00000000000..deab8b703b5
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-592.js
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-592: test all combos of field types and getters and setters
+ *
+ * @test
+ * @run
+ */
+
+//fortype undefined
+var a;
+
+print(a & 0xff);
+print(a >>> 1);
+print(a * 2);
+print(a + "hej!");
+
+var b;
+b = 17;   //set undefined->int
+
+print(b & 0xff);
+print(b >>> 1);
+print(b * 2);
+print(b + "hej!");
+
+var c;
+c = 17.4711 //set undefined->double
+
+print(c & 0xff);
+print(c >>> 1);
+print(c * 2);
+print(c + "hej!");
+
+var d; // set undefined->double
+d = "Fame and fortune Salamander Yahoo!";
+
+print(d & 0xff);
+print(d >>> 1);
+print(d * 2);
+print(d + "hej!");
+
+// now we have exhausted all getters and undefined->everything setters.
+
+
+var e = 23; // int to everything setters,
+e = 24;     //int to int
+print(e);
+e = (22222 >>> 1); //int to long;
+print(e);
+e = 23.23;  //int to double
+print(e);
+e = 23;     //double to int - still double
+print(e);
+print(e & 0xff);
+e = "Have some pie!" //double to string
+print(e);
+e = 4711.17;
+print(e); //still an object not a double
+
+
+var f = (23222 >>> 1); // long to everything setters,
+f = 34344 >>> 1;     //long to long
+print(f);
+f = 23; //long to int - still long
+print(f);
+f = 23.23;  //long to double
+print(f);
+f = 23;     //double to int - still double
+print(f);
+print(f & 0xff);
+f = "Have some pie!" //double to string
+print(f);
+f = 4711.17;
+print(f); //still an object not a double
+
+var g = 4811.16;
+g = 23; //still double
+print(g);
+g = (222 >>> 1); //still double
+print(g);
+g = 4711.16; //double->double
+print(g);
+g = "I like cake!";
+print(g);  //object to various
+print(g & 0xff);
+print(g * 2);
+print(g >>> 2);
+print(g);
+
+var h = {x:17, y:17.4711, z:"salamander"};
+print(h.x);
+print(h.y);
+print(h.z);
+h.x = 4711.17;
+h.y = "axolotl";
+h.z = "lizard";
+print(h.x);
+print(h.y);
+print(h.z);
diff --git a/nashorn/test/script/basic/NASHORN-592.js.EXPECTED b/nashorn/test/script/basic/NASHORN-592.js.EXPECTED
new file mode 100644
index 00000000000..8ff2cd485da
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-592.js.EXPECTED
@@ -0,0 +1,44 @@
+0
+0
+NaN
+undefinedhej!
+17
+8
+34
+17hej!
+17
+8
+34.9422
+17.4711hej!
+0
+0
+NaN
+Fame and fortune Salamander Yahoo!hej!
+24
+11111
+23.23
+23
+23
+Have some pie!
+4711.17
+17172
+23
+23.23
+23
+23
+Have some pie!
+4711.17
+23
+111
+4711.16
+I like cake!
+0
+NaN
+0
+I like cake!
+17
+17.4711
+salamander
+4711.17
+axolotl
+lizard
diff --git a/nashorn/test/script/basic/NASHORN-597.js b/nashorn/test/script/basic/NASHORN-597.js
new file mode 100644
index 00000000000..99b56be7c4e
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-597.js
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-597 :  Conditional catch does not rethrow if it is the last catch clause
+ *
+ * @test
+ * @run
+ */
+
+try {
+    throw new String("t1");
+} catch (e if e instanceof String) {
+    print("ok:", e);
+}
+
+try {
+    throw new Error("t2");
+} catch (s if s instanceof String) {
+    print("err:", s);
+} catch (e if e instanceof Error) {
+    print("ok:", e.name);
+} catch (e) {
+    print("err:", e);
+} finally {
+    print("finally run");
+}
+
+try {
+    throw new Error("t2");
+} catch (s if s instanceof String) {
+    print("err:", s);
+} catch (e) {
+    print("ok:", e.name);
+} finally {
+    print("finally run");
+}
+
+var obj = new Object();
+
+try {
+    try {
+        throw obj;
+    } catch (s if s instanceof String) {
+        print("err:", s);
+    } catch (e if e instanceof RegExp) {
+        print("err:", e);
+    }
+} catch (o) {
+    print("ok:", o === obj);
+}
+
+try {
+    try {
+        throw obj;
+    } catch (s if s instanceof String) {
+        print("err:", s);
+    } finally {
+        print("finally run");
+    }
+} catch (o if o === obj) {
+    print("ok:", o);
+}
diff --git a/nashorn/test/script/basic/NASHORN-597.js.EXPECTED b/nashorn/test/script/basic/NASHORN-597.js.EXPECTED
new file mode 100644
index 00000000000..1c8fa948f61
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-597.js.EXPECTED
@@ -0,0 +1,8 @@
+ok: t1
+ok: Error
+finally run
+ok: Error
+finally run
+ok: true
+finally run
+ok: [object Object]
diff --git a/nashorn/test/script/basic/NASHORN-60.js b/nashorn/test/script/basic/NASHORN-60.js
new file mode 100644
index 00000000000..6e0cace60c6
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-60.js
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-60 :  For illegal regular expressions, proper error message is not set in SyntaxError.
+ *
+ * @test
+ * @run
+ */
+
+try {
+    var x = new RegExp("2**");
+    print(x);
+} catch(e) {
+    print(e);
+}
diff --git a/nashorn/test/script/basic/NASHORN-60.js.EXPECTED b/nashorn/test/script/basic/NASHORN-60.js.EXPECTED
new file mode 100644
index 00000000000..adb367b8d2f
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-60.js.EXPECTED
@@ -0,0 +1,3 @@
+SyntaxError: Dangling meta character '*' near index 2
+2**
+  ^
diff --git a/nashorn/test/script/basic/NASHORN-609.js b/nashorn/test/script/basic/NASHORN-609.js
new file mode 100644
index 00000000000..3383c826f4d
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-609.js
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * NASHORN-609: ASSIGN_SHR result is converted to INT (should be UINT32).
+ *
+ * @test
+ * @run
+ */
+function test() {
+    var shr = -1;
+    print(shr >>>= 0, shr);
+    var shr2 = 0xffffffff;
+    print(shr2 >>>= 0, shr2);
+    var shr3 = "-1";
+    print(shr3 >>>= 0, shr3);
+    var shr4 = -1.5;
+    print(shr4 >>>= 0, shr4);
+    var shr5 = 0xffffffffff;
+    print(shr5 >>>= 0, shr5);
+}
+test();
+
diff --git a/nashorn/test/script/basic/NASHORN-609.js.EXPECTED b/nashorn/test/script/basic/NASHORN-609.js.EXPECTED
new file mode 100644
index 00000000000..60913426027
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-609.js.EXPECTED
@@ -0,0 +1,5 @@
+4294967295 4294967295
+4294967295 4294967295
+4294967295 4294967295
+4294967295 4294967295
+4294967295 4294967295
diff --git a/nashorn/test/script/basic/NASHORN-61.js b/nashorn/test/script/basic/NASHORN-61.js
new file mode 100644
index 00000000000..9855dc5c4bd
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-61.js
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-61 :  With statement should convert with expression to object type.
+ *
+ * @test
+ * @run
+ */
+
+var str = "hello";
+
+with(str) {
+    print("indexOf('l') is " + indexOf('l'));
+}
diff --git a/nashorn/test/script/basic/NASHORN-61.js.EXPECTED b/nashorn/test/script/basic/NASHORN-61.js.EXPECTED
new file mode 100644
index 00000000000..a33299d1ce1
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-61.js.EXPECTED
@@ -0,0 +1 @@
+indexOf('l') is 2
diff --git a/nashorn/test/script/basic/NASHORN-62.js b/nashorn/test/script/basic/NASHORN-62.js
new file mode 100644
index 00000000000..2f064530452
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-62.js
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-62 :  Callsite not guarded property
+ *
+ * @test
+ * @run
+ */
+
+function X() {}
+X.prototype.toString = function() {
+    return  this.name;
+}
+
+function Y() {
+}
+
+Y.prototype = Object.create(X.prototype);
+Y.prototype.name = "Y";
+
+var y = new Y();
+
+function Z() {
+}
+
+Z.prototype = Object.create(X.prototype);
+Z.prototype.name = "Z";
+var z = new Z();
+
+print("y.toString() " + y.toString());
+print("z.toString() " + z.toString());
diff --git a/nashorn/test/script/basic/NASHORN-62.js.EXPECTED b/nashorn/test/script/basic/NASHORN-62.js.EXPECTED
new file mode 100644
index 00000000000..5a4ae3005b7
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-62.js.EXPECTED
@@ -0,0 +1,2 @@
+y.toString() Y
+z.toString() Z
diff --git a/nashorn/test/script/basic/NASHORN-620.js b/nashorn/test/script/basic/NASHORN-620.js
new file mode 100644
index 00000000000..f188f1949ba
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-620.js
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * NASHORN-620: Trailing comma at the end of an array literal should be ignored.
+ *
+ * @test
+ * @run
+ */
+
+print([].length);
+print([,].length);
+print([,,].length);
+print([,4,].length);
+print([1,,3,].length);
diff --git a/nashorn/test/script/basic/NASHORN-620.js.EXPECTED b/nashorn/test/script/basic/NASHORN-620.js.EXPECTED
new file mode 100644
index 00000000000..dac65b1158d
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-620.js.EXPECTED
@@ -0,0 +1,5 @@
+0
+1
+2
+2
+3
diff --git a/nashorn/test/script/basic/NASHORN-623.js b/nashorn/test/script/basic/NASHORN-623.js
new file mode 100644
index 00000000000..710f39738fa
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-623.js
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-623 : JSON parser does not allow negative integer
+ *
+ * @test
+ * @run
+ */
+
+var obj = JSON.parse("{ \"test\" : -1 }");
+if (obj.test != -1) {
+    fail("expected obj.test to be -1, got " + obj.test);
+}
+
+obj = JSON.parse("{ \"test\" : [3, -2] }");
+if (obj.test[1] != -2) {
+    fail("expected obj.test[1] to be -2, got " + obj.test[1]);
+}
+
+obj = JSON.parse("{ \"test\": { \"foo\": -3 } }");
+if (obj.test.foo != -3) {
+    fail("expected obj.test.foo to be -3, got " + obj.test.foo);
+}
+
+try {
+    JSON.parse("{ \"test\" : -xxx }");
+    fail("should have thrown SyntaxError");
+} catch (e) {
+    if (! (e instanceof SyntaxError)) {
+        fail("expected SyntaxError, got " + e);
+    }
+    print(e);
+}
diff --git a/nashorn/test/script/basic/NASHORN-623.js.EXPECTED b/nashorn/test/script/basic/NASHORN-623.js.EXPECTED
new file mode 100644
index 00000000000..5755489b2c9
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-623.js.EXPECTED
@@ -0,0 +1,3 @@
+SyntaxError: Invalid JSON: <json>:1:12 Expected number but found ident
+{ "test" : -xxx }
+            ^
diff --git a/nashorn/test/script/basic/NASHORN-627.js b/nashorn/test/script/basic/NASHORN-627.js
new file mode 100644
index 00000000000..68ec04ed2af
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-627.js
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-627 : Make NativeDate fully ECMA compliant
+ *
+ * @test
+ * @option -timezone=Europe/Vienna
+ * @run
+ */
+
+// constructor, toString, getTime, toISOString. EXPECTED is from spidermonkey
+function printDate(d) {
+    print(d, d.getTime(), d.toISOString());
+}
+for (var i = -10; i < 380; i++) {
+    printDate(new Date(70, 0, i));
+}
+for (var i = -10; i < 380; i++) {
+    printDate(new Date(2011, 0, i, 17, 0, 59));
+}
+for (var i = -10; i < 380; i++) {
+    printDate(new Date(2012, 0, i, 12, 30, 10, 500));
+}
+
+[
+    '2012-03-01 09:00',
+    '2012-03-01 08:00 +0000',
+    '2012/03/01 08:00 GMT+0000',
+    '03/01/2012, 08:00 AM UT',
+    '01 March 12 08:00 +0000',
+    'Mar 01 08:00:00 UT 2012',
+    'Sat, 01-Mar-2012 08:00:00 UT',
+    'Sat, 01 Mar 2012 08:00:00 UT',
+    'Mar 01 2012 08:00:00 UT',
+    'Saturday, 01-Mar-2012 08:00:00 UT',
+    '01 Mar 2012 08:00 +0000',
+
+    'Sat, 01-Mar-2012 03:00:00 EST',
+    'Sat, 01 Mar 2012 03:00:00 EST',
+    'Mar 01 2012 03:00:00 EST',
+    'Saturday, 01-Mar-2012 03:00:00 EST',
+    '01 Mar 2012 03:00 -0500',
+
+    'Sat, 01-Mar-2012 04:00:00 EDT',
+    'Sat, 01 Mar 2012 04:00:00 EDT',
+    'Mar 01 2012 04:00:00 EDT',
+    'Saturday, 01-Mar-2012 04:00:00 EDT',
+    '01 Mar 2012 04:00 -0400',
+
+    'Sat, 01-Mar-2012 02:00:00 CST',
+    'Sat, 01 Mar 2012 02:00:00 CST',
+    'Mar 01 2012 02:00:00 CST',
+    'Saturday, 01-Mar-2012 02:00:00 CST',
+    '01 Mar 2012 02:00 -0600',
+
+    'Sat, 01-Mar-2012 03:00:00 CDT',
+    'Sat, 01 Mar 2012 03:00:00 CDT',
+    'Mar 01 2012 03:00:00 CDT',
+    'Saturday, 01-Mar-2012 03:00:00 CDT',
+    '01 Mar 2012 03:00 -0500',
+
+    'Sat, 01-Mar-2012 01:00:00 MST',
+    'Sat, 01 Mar 2012 01:00:00 MST',
+    'Mar 01 2012 01:00:00 MST',
+    'Saturday, 01-Mar-2012 01:00:00 MST',
+    '01 Mar 2012 01:00 -0700',
+
+    'Sat, 01-Mar-2012 02:00:00 MDT',
+    'Sat, 01 Mar 2012 02:00:00 MDT',
+    'Mar 01 2012 02:00:00 MDT',
+    'Saturday, 01-Mar-2012 02:00:00 MDT',
+    '01 Mar 2012 02:00 -0600',
+
+    'Sat, 01-Mar-2012 00:00:00 PST',
+    'Sat, 01 Mar 2012 00:00:00 PST',
+    'Mar 01 2012 00:00:00 PST',
+    'Saturday, 01-Mar-2012 00:00:00 PST',
+    '01 Mar 2012 00:00 -0800',
+
+    'Sat, 01-Mar-2012 01:00:00 PDT',
+    'Sat, 01 Mar 2012 01:00:00 PDT',
+    'Mar 01 2012 01:00:00 PDT',
+    'Saturday, 01-Mar-2012 01:00:00 PDT',
+    '01 Mar 2012 01:00 -0700'
+].forEach(function(s) {
+    parseDate(s, 1330588800000);
+});
+
+[
+    '2012-01-01T08:00:00.000Z',
+    '2012-01-01T08:00:00Z',
+    '2012-01-01T08:00Z',
+    '2012-01T08:00:00.000Z',
+    '2012T08:00:00.000Z',
+    '2012T08:00Z',
+    '2012-01T00:00:00.000-08:00',
+    '2012-01T00:00:00.000-08:00'
+].forEach(function(s) {
+    parseDate(s, 1325404800000);
+});
+
+[
+    'Mon, 25 Dec 1995 13:30:00 GMT+0430',
+    '1995/12/25 13:30 GMT+0430',
+    '12/25/1995, 01:30 PM +04:30',
+    'Dec 25 1995 13:30:00 +0430'
+].forEach(function(s) {
+    parseDate(s, 819882000000);
+});
+
+// invalid iso dates
+[
+    '2000-01-01TZ',
+    '2000-01-01T60Z',
+    '2000-01-01T60:60Z',
+    '2000-01-0108:00Z',
+    '2000-01-01T08Z'
+].forEach(function(s) {
+        parseDate(s, NaN);
+    });
+
+// milliseconds
+parseDate('2012-01T08:00:00.001Z', 1325404800001);
+parseDate('2012-01T08:00:00.099Z', 1325404800099);
+parseDate('2012-01T08:00:00.999Z', 1325404800999);
+
+function parseDate(s, t) {
+    var d = new Date(s.toString());
+    if (d.getTime() == t || (isNaN(d.getTime() && isNaN(t)))) {
+        print('ok', d);
+    } else {
+        print('expected', t, 'got', d.getTime());
+    }
+}
diff --git a/nashorn/test/script/basic/NASHORN-627.js.EXPECTED b/nashorn/test/script/basic/NASHORN-627.js.EXPECTED
new file mode 100644
index 00000000000..4666d99f44e
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-627.js.EXPECTED
@@ -0,0 +1,1241 @@
+Sun Dec 21 1969 00:00:00 GMT+0100 (CET) -954000000 1969-12-20T23:00:00.000Z
+Mon Dec 22 1969 00:00:00 GMT+0100 (CET) -867600000 1969-12-21T23:00:00.000Z
+Tue Dec 23 1969 00:00:00 GMT+0100 (CET) -781200000 1969-12-22T23:00:00.000Z
+Wed Dec 24 1969 00:00:00 GMT+0100 (CET) -694800000 1969-12-23T23:00:00.000Z
+Thu Dec 25 1969 00:00:00 GMT+0100 (CET) -608400000 1969-12-24T23:00:00.000Z
+Fri Dec 26 1969 00:00:00 GMT+0100 (CET) -522000000 1969-12-25T23:00:00.000Z
+Sat Dec 27 1969 00:00:00 GMT+0100 (CET) -435600000 1969-12-26T23:00:00.000Z
+Sun Dec 28 1969 00:00:00 GMT+0100 (CET) -349200000 1969-12-27T23:00:00.000Z
+Mon Dec 29 1969 00:00:00 GMT+0100 (CET) -262800000 1969-12-28T23:00:00.000Z
+Tue Dec 30 1969 00:00:00 GMT+0100 (CET) -176400000 1969-12-29T23:00:00.000Z
+Wed Dec 31 1969 00:00:00 GMT+0100 (CET) -90000000 1969-12-30T23:00:00.000Z
+Thu Jan 01 1970 00:00:00 GMT+0100 (CET) -3600000 1969-12-31T23:00:00.000Z
+Fri Jan 02 1970 00:00:00 GMT+0100 (CET) 82800000 1970-01-01T23:00:00.000Z
+Sat Jan 03 1970 00:00:00 GMT+0100 (CET) 169200000 1970-01-02T23:00:00.000Z
+Sun Jan 04 1970 00:00:00 GMT+0100 (CET) 255600000 1970-01-03T23:00:00.000Z
+Mon Jan 05 1970 00:00:00 GMT+0100 (CET) 342000000 1970-01-04T23:00:00.000Z
+Tue Jan 06 1970 00:00:00 GMT+0100 (CET) 428400000 1970-01-05T23:00:00.000Z
+Wed Jan 07 1970 00:00:00 GMT+0100 (CET) 514800000 1970-01-06T23:00:00.000Z
+Thu Jan 08 1970 00:00:00 GMT+0100 (CET) 601200000 1970-01-07T23:00:00.000Z
+Fri Jan 09 1970 00:00:00 GMT+0100 (CET) 687600000 1970-01-08T23:00:00.000Z
+Sat Jan 10 1970 00:00:00 GMT+0100 (CET) 774000000 1970-01-09T23:00:00.000Z
+Sun Jan 11 1970 00:00:00 GMT+0100 (CET) 860400000 1970-01-10T23:00:00.000Z
+Mon Jan 12 1970 00:00:00 GMT+0100 (CET) 946800000 1970-01-11T23:00:00.000Z
+Tue Jan 13 1970 00:00:00 GMT+0100 (CET) 1033200000 1970-01-12T23:00:00.000Z
+Wed Jan 14 1970 00:00:00 GMT+0100 (CET) 1119600000 1970-01-13T23:00:00.000Z
+Thu Jan 15 1970 00:00:00 GMT+0100 (CET) 1206000000 1970-01-14T23:00:00.000Z
+Fri Jan 16 1970 00:00:00 GMT+0100 (CET) 1292400000 1970-01-15T23:00:00.000Z
+Sat Jan 17 1970 00:00:00 GMT+0100 (CET) 1378800000 1970-01-16T23:00:00.000Z
+Sun Jan 18 1970 00:00:00 GMT+0100 (CET) 1465200000 1970-01-17T23:00:00.000Z
+Mon Jan 19 1970 00:00:00 GMT+0100 (CET) 1551600000 1970-01-18T23:00:00.000Z
+Tue Jan 20 1970 00:00:00 GMT+0100 (CET) 1638000000 1970-01-19T23:00:00.000Z
+Wed Jan 21 1970 00:00:00 GMT+0100 (CET) 1724400000 1970-01-20T23:00:00.000Z
+Thu Jan 22 1970 00:00:00 GMT+0100 (CET) 1810800000 1970-01-21T23:00:00.000Z
+Fri Jan 23 1970 00:00:00 GMT+0100 (CET) 1897200000 1970-01-22T23:00:00.000Z
+Sat Jan 24 1970 00:00:00 GMT+0100 (CET) 1983600000 1970-01-23T23:00:00.000Z
+Sun Jan 25 1970 00:00:00 GMT+0100 (CET) 2070000000 1970-01-24T23:00:00.000Z
+Mon Jan 26 1970 00:00:00 GMT+0100 (CET) 2156400000 1970-01-25T23:00:00.000Z
+Tue Jan 27 1970 00:00:00 GMT+0100 (CET) 2242800000 1970-01-26T23:00:00.000Z
+Wed Jan 28 1970 00:00:00 GMT+0100 (CET) 2329200000 1970-01-27T23:00:00.000Z
+Thu Jan 29 1970 00:00:00 GMT+0100 (CET) 2415600000 1970-01-28T23:00:00.000Z
+Fri Jan 30 1970 00:00:00 GMT+0100 (CET) 2502000000 1970-01-29T23:00:00.000Z
+Sat Jan 31 1970 00:00:00 GMT+0100 (CET) 2588400000 1970-01-30T23:00:00.000Z
+Sun Feb 01 1970 00:00:00 GMT+0100 (CET) 2674800000 1970-01-31T23:00:00.000Z
+Mon Feb 02 1970 00:00:00 GMT+0100 (CET) 2761200000 1970-02-01T23:00:00.000Z
+Tue Feb 03 1970 00:00:00 GMT+0100 (CET) 2847600000 1970-02-02T23:00:00.000Z
+Wed Feb 04 1970 00:00:00 GMT+0100 (CET) 2934000000 1970-02-03T23:00:00.000Z
+Thu Feb 05 1970 00:00:00 GMT+0100 (CET) 3020400000 1970-02-04T23:00:00.000Z
+Fri Feb 06 1970 00:00:00 GMT+0100 (CET) 3106800000 1970-02-05T23:00:00.000Z
+Sat Feb 07 1970 00:00:00 GMT+0100 (CET) 3193200000 1970-02-06T23:00:00.000Z
+Sun Feb 08 1970 00:00:00 GMT+0100 (CET) 3279600000 1970-02-07T23:00:00.000Z
+Mon Feb 09 1970 00:00:00 GMT+0100 (CET) 3366000000 1970-02-08T23:00:00.000Z
+Tue Feb 10 1970 00:00:00 GMT+0100 (CET) 3452400000 1970-02-09T23:00:00.000Z
+Wed Feb 11 1970 00:00:00 GMT+0100 (CET) 3538800000 1970-02-10T23:00:00.000Z
+Thu Feb 12 1970 00:00:00 GMT+0100 (CET) 3625200000 1970-02-11T23:00:00.000Z
+Fri Feb 13 1970 00:00:00 GMT+0100 (CET) 3711600000 1970-02-12T23:00:00.000Z
+Sat Feb 14 1970 00:00:00 GMT+0100 (CET) 3798000000 1970-02-13T23:00:00.000Z
+Sun Feb 15 1970 00:00:00 GMT+0100 (CET) 3884400000 1970-02-14T23:00:00.000Z
+Mon Feb 16 1970 00:00:00 GMT+0100 (CET) 3970800000 1970-02-15T23:00:00.000Z
+Tue Feb 17 1970 00:00:00 GMT+0100 (CET) 4057200000 1970-02-16T23:00:00.000Z
+Wed Feb 18 1970 00:00:00 GMT+0100 (CET) 4143600000 1970-02-17T23:00:00.000Z
+Thu Feb 19 1970 00:00:00 GMT+0100 (CET) 4230000000 1970-02-18T23:00:00.000Z
+Fri Feb 20 1970 00:00:00 GMT+0100 (CET) 4316400000 1970-02-19T23:00:00.000Z
+Sat Feb 21 1970 00:00:00 GMT+0100 (CET) 4402800000 1970-02-20T23:00:00.000Z
+Sun Feb 22 1970 00:00:00 GMT+0100 (CET) 4489200000 1970-02-21T23:00:00.000Z
+Mon Feb 23 1970 00:00:00 GMT+0100 (CET) 4575600000 1970-02-22T23:00:00.000Z
+Tue Feb 24 1970 00:00:00 GMT+0100 (CET) 4662000000 1970-02-23T23:00:00.000Z
+Wed Feb 25 1970 00:00:00 GMT+0100 (CET) 4748400000 1970-02-24T23:00:00.000Z
+Thu Feb 26 1970 00:00:00 GMT+0100 (CET) 4834800000 1970-02-25T23:00:00.000Z
+Fri Feb 27 1970 00:00:00 GMT+0100 (CET) 4921200000 1970-02-26T23:00:00.000Z
+Sat Feb 28 1970 00:00:00 GMT+0100 (CET) 5007600000 1970-02-27T23:00:00.000Z
+Sun Mar 01 1970 00:00:00 GMT+0100 (CET) 5094000000 1970-02-28T23:00:00.000Z
+Mon Mar 02 1970 00:00:00 GMT+0100 (CET) 5180400000 1970-03-01T23:00:00.000Z
+Tue Mar 03 1970 00:00:00 GMT+0100 (CET) 5266800000 1970-03-02T23:00:00.000Z
+Wed Mar 04 1970 00:00:00 GMT+0100 (CET) 5353200000 1970-03-03T23:00:00.000Z
+Thu Mar 05 1970 00:00:00 GMT+0100 (CET) 5439600000 1970-03-04T23:00:00.000Z
+Fri Mar 06 1970 00:00:00 GMT+0100 (CET) 5526000000 1970-03-05T23:00:00.000Z
+Sat Mar 07 1970 00:00:00 GMT+0100 (CET) 5612400000 1970-03-06T23:00:00.000Z
+Sun Mar 08 1970 00:00:00 GMT+0100 (CET) 5698800000 1970-03-07T23:00:00.000Z
+Mon Mar 09 1970 00:00:00 GMT+0100 (CET) 5785200000 1970-03-08T23:00:00.000Z
+Tue Mar 10 1970 00:00:00 GMT+0100 (CET) 5871600000 1970-03-09T23:00:00.000Z
+Wed Mar 11 1970 00:00:00 GMT+0100 (CET) 5958000000 1970-03-10T23:00:00.000Z
+Thu Mar 12 1970 00:00:00 GMT+0100 (CET) 6044400000 1970-03-11T23:00:00.000Z
+Fri Mar 13 1970 00:00:00 GMT+0100 (CET) 6130800000 1970-03-12T23:00:00.000Z
+Sat Mar 14 1970 00:00:00 GMT+0100 (CET) 6217200000 1970-03-13T23:00:00.000Z
+Sun Mar 15 1970 00:00:00 GMT+0100 (CET) 6303600000 1970-03-14T23:00:00.000Z
+Mon Mar 16 1970 00:00:00 GMT+0100 (CET) 6390000000 1970-03-15T23:00:00.000Z
+Tue Mar 17 1970 00:00:00 GMT+0100 (CET) 6476400000 1970-03-16T23:00:00.000Z
+Wed Mar 18 1970 00:00:00 GMT+0100 (CET) 6562800000 1970-03-17T23:00:00.000Z
+Thu Mar 19 1970 00:00:00 GMT+0100 (CET) 6649200000 1970-03-18T23:00:00.000Z
+Fri Mar 20 1970 00:00:00 GMT+0100 (CET) 6735600000 1970-03-19T23:00:00.000Z
+Sat Mar 21 1970 00:00:00 GMT+0100 (CET) 6822000000 1970-03-20T23:00:00.000Z
+Sun Mar 22 1970 00:00:00 GMT+0100 (CET) 6908400000 1970-03-21T23:00:00.000Z
+Mon Mar 23 1970 00:00:00 GMT+0100 (CET) 6994800000 1970-03-22T23:00:00.000Z
+Tue Mar 24 1970 00:00:00 GMT+0100 (CET) 7081200000 1970-03-23T23:00:00.000Z
+Wed Mar 25 1970 00:00:00 GMT+0100 (CET) 7167600000 1970-03-24T23:00:00.000Z
+Thu Mar 26 1970 00:00:00 GMT+0100 (CET) 7254000000 1970-03-25T23:00:00.000Z
+Fri Mar 27 1970 00:00:00 GMT+0100 (CET) 7340400000 1970-03-26T23:00:00.000Z
+Sat Mar 28 1970 00:00:00 GMT+0100 (CET) 7426800000 1970-03-27T23:00:00.000Z
+Sun Mar 29 1970 00:00:00 GMT+0100 (CET) 7513200000 1970-03-28T23:00:00.000Z
+Mon Mar 30 1970 00:00:00 GMT+0100 (CET) 7599600000 1970-03-29T23:00:00.000Z
+Tue Mar 31 1970 00:00:00 GMT+0100 (CET) 7686000000 1970-03-30T23:00:00.000Z
+Wed Apr 01 1970 00:00:00 GMT+0100 (CET) 7772400000 1970-03-31T23:00:00.000Z
+Thu Apr 02 1970 00:00:00 GMT+0100 (CET) 7858800000 1970-04-01T23:00:00.000Z
+Fri Apr 03 1970 00:00:00 GMT+0100 (CET) 7945200000 1970-04-02T23:00:00.000Z
+Sat Apr 04 1970 00:00:00 GMT+0100 (CET) 8031600000 1970-04-03T23:00:00.000Z
+Sun Apr 05 1970 00:00:00 GMT+0100 (CET) 8118000000 1970-04-04T23:00:00.000Z
+Mon Apr 06 1970 00:00:00 GMT+0100 (CET) 8204400000 1970-04-05T23:00:00.000Z
+Tue Apr 07 1970 00:00:00 GMT+0100 (CET) 8290800000 1970-04-06T23:00:00.000Z
+Wed Apr 08 1970 00:00:00 GMT+0100 (CET) 8377200000 1970-04-07T23:00:00.000Z
+Thu Apr 09 1970 00:00:00 GMT+0100 (CET) 8463600000 1970-04-08T23:00:00.000Z
+Fri Apr 10 1970 00:00:00 GMT+0100 (CET) 8550000000 1970-04-09T23:00:00.000Z
+Sat Apr 11 1970 00:00:00 GMT+0100 (CET) 8636400000 1970-04-10T23:00:00.000Z
+Sun Apr 12 1970 00:00:00 GMT+0100 (CET) 8722800000 1970-04-11T23:00:00.000Z
+Mon Apr 13 1970 00:00:00 GMT+0100 (CET) 8809200000 1970-04-12T23:00:00.000Z
+Tue Apr 14 1970 00:00:00 GMT+0100 (CET) 8895600000 1970-04-13T23:00:00.000Z
+Wed Apr 15 1970 00:00:00 GMT+0100 (CET) 8982000000 1970-04-14T23:00:00.000Z
+Thu Apr 16 1970 00:00:00 GMT+0100 (CET) 9068400000 1970-04-15T23:00:00.000Z
+Fri Apr 17 1970 00:00:00 GMT+0100 (CET) 9154800000 1970-04-16T23:00:00.000Z
+Sat Apr 18 1970 00:00:00 GMT+0100 (CET) 9241200000 1970-04-17T23:00:00.000Z
+Sun Apr 19 1970 00:00:00 GMT+0100 (CET) 9327600000 1970-04-18T23:00:00.000Z
+Mon Apr 20 1970 00:00:00 GMT+0100 (CET) 9414000000 1970-04-19T23:00:00.000Z
+Tue Apr 21 1970 00:00:00 GMT+0100 (CET) 9500400000 1970-04-20T23:00:00.000Z
+Wed Apr 22 1970 00:00:00 GMT+0100 (CET) 9586800000 1970-04-21T23:00:00.000Z
+Thu Apr 23 1970 00:00:00 GMT+0100 (CET) 9673200000 1970-04-22T23:00:00.000Z
+Fri Apr 24 1970 00:00:00 GMT+0100 (CET) 9759600000 1970-04-23T23:00:00.000Z
+Sat Apr 25 1970 00:00:00 GMT+0100 (CET) 9846000000 1970-04-24T23:00:00.000Z
+Sun Apr 26 1970 00:00:00 GMT+0100 (CET) 9932400000 1970-04-25T23:00:00.000Z
+Mon Apr 27 1970 00:00:00 GMT+0100 (CET) 10018800000 1970-04-26T23:00:00.000Z
+Tue Apr 28 1970 00:00:00 GMT+0100 (CET) 10105200000 1970-04-27T23:00:00.000Z
+Wed Apr 29 1970 00:00:00 GMT+0100 (CET) 10191600000 1970-04-28T23:00:00.000Z
+Thu Apr 30 1970 00:00:00 GMT+0100 (CET) 10278000000 1970-04-29T23:00:00.000Z
+Fri May 01 1970 00:00:00 GMT+0100 (CET) 10364400000 1970-04-30T23:00:00.000Z
+Sat May 02 1970 00:00:00 GMT+0100 (CET) 10450800000 1970-05-01T23:00:00.000Z
+Sun May 03 1970 00:00:00 GMT+0100 (CET) 10537200000 1970-05-02T23:00:00.000Z
+Mon May 04 1970 00:00:00 GMT+0100 (CET) 10623600000 1970-05-03T23:00:00.000Z
+Tue May 05 1970 00:00:00 GMT+0100 (CET) 10710000000 1970-05-04T23:00:00.000Z
+Wed May 06 1970 00:00:00 GMT+0100 (CET) 10796400000 1970-05-05T23:00:00.000Z
+Thu May 07 1970 00:00:00 GMT+0100 (CET) 10882800000 1970-05-06T23:00:00.000Z
+Fri May 08 1970 00:00:00 GMT+0100 (CET) 10969200000 1970-05-07T23:00:00.000Z
+Sat May 09 1970 00:00:00 GMT+0100 (CET) 11055600000 1970-05-08T23:00:00.000Z
+Sun May 10 1970 00:00:00 GMT+0100 (CET) 11142000000 1970-05-09T23:00:00.000Z
+Mon May 11 1970 00:00:00 GMT+0100 (CET) 11228400000 1970-05-10T23:00:00.000Z
+Tue May 12 1970 00:00:00 GMT+0100 (CET) 11314800000 1970-05-11T23:00:00.000Z
+Wed May 13 1970 00:00:00 GMT+0100 (CET) 11401200000 1970-05-12T23:00:00.000Z
+Thu May 14 1970 00:00:00 GMT+0100 (CET) 11487600000 1970-05-13T23:00:00.000Z
+Fri May 15 1970 00:00:00 GMT+0100 (CET) 11574000000 1970-05-14T23:00:00.000Z
+Sat May 16 1970 00:00:00 GMT+0100 (CET) 11660400000 1970-05-15T23:00:00.000Z
+Sun May 17 1970 00:00:00 GMT+0100 (CET) 11746800000 1970-05-16T23:00:00.000Z
+Mon May 18 1970 00:00:00 GMT+0100 (CET) 11833200000 1970-05-17T23:00:00.000Z
+Tue May 19 1970 00:00:00 GMT+0100 (CET) 11919600000 1970-05-18T23:00:00.000Z
+Wed May 20 1970 00:00:00 GMT+0100 (CET) 12006000000 1970-05-19T23:00:00.000Z
+Thu May 21 1970 00:00:00 GMT+0100 (CET) 12092400000 1970-05-20T23:00:00.000Z
+Fri May 22 1970 00:00:00 GMT+0100 (CET) 12178800000 1970-05-21T23:00:00.000Z
+Sat May 23 1970 00:00:00 GMT+0100 (CET) 12265200000 1970-05-22T23:00:00.000Z
+Sun May 24 1970 00:00:00 GMT+0100 (CET) 12351600000 1970-05-23T23:00:00.000Z
+Mon May 25 1970 00:00:00 GMT+0100 (CET) 12438000000 1970-05-24T23:00:00.000Z
+Tue May 26 1970 00:00:00 GMT+0100 (CET) 12524400000 1970-05-25T23:00:00.000Z
+Wed May 27 1970 00:00:00 GMT+0100 (CET) 12610800000 1970-05-26T23:00:00.000Z
+Thu May 28 1970 00:00:00 GMT+0100 (CET) 12697200000 1970-05-27T23:00:00.000Z
+Fri May 29 1970 00:00:00 GMT+0100 (CET) 12783600000 1970-05-28T23:00:00.000Z
+Sat May 30 1970 00:00:00 GMT+0100 (CET) 12870000000 1970-05-29T23:00:00.000Z
+Sun May 31 1970 00:00:00 GMT+0100 (CET) 12956400000 1970-05-30T23:00:00.000Z
+Mon Jun 01 1970 00:00:00 GMT+0100 (CET) 13042800000 1970-05-31T23:00:00.000Z
+Tue Jun 02 1970 00:00:00 GMT+0100 (CET) 13129200000 1970-06-01T23:00:00.000Z
+Wed Jun 03 1970 00:00:00 GMT+0100 (CET) 13215600000 1970-06-02T23:00:00.000Z
+Thu Jun 04 1970 00:00:00 GMT+0100 (CET) 13302000000 1970-06-03T23:00:00.000Z
+Fri Jun 05 1970 00:00:00 GMT+0100 (CET) 13388400000 1970-06-04T23:00:00.000Z
+Sat Jun 06 1970 00:00:00 GMT+0100 (CET) 13474800000 1970-06-05T23:00:00.000Z
+Sun Jun 07 1970 00:00:00 GMT+0100 (CET) 13561200000 1970-06-06T23:00:00.000Z
+Mon Jun 08 1970 00:00:00 GMT+0100 (CET) 13647600000 1970-06-07T23:00:00.000Z
+Tue Jun 09 1970 00:00:00 GMT+0100 (CET) 13734000000 1970-06-08T23:00:00.000Z
+Wed Jun 10 1970 00:00:00 GMT+0100 (CET) 13820400000 1970-06-09T23:00:00.000Z
+Thu Jun 11 1970 00:00:00 GMT+0100 (CET) 13906800000 1970-06-10T23:00:00.000Z
+Fri Jun 12 1970 00:00:00 GMT+0100 (CET) 13993200000 1970-06-11T23:00:00.000Z
+Sat Jun 13 1970 00:00:00 GMT+0100 (CET) 14079600000 1970-06-12T23:00:00.000Z
+Sun Jun 14 1970 00:00:00 GMT+0100 (CET) 14166000000 1970-06-13T23:00:00.000Z
+Mon Jun 15 1970 00:00:00 GMT+0100 (CET) 14252400000 1970-06-14T23:00:00.000Z
+Tue Jun 16 1970 00:00:00 GMT+0100 (CET) 14338800000 1970-06-15T23:00:00.000Z
+Wed Jun 17 1970 00:00:00 GMT+0100 (CET) 14425200000 1970-06-16T23:00:00.000Z
+Thu Jun 18 1970 00:00:00 GMT+0100 (CET) 14511600000 1970-06-17T23:00:00.000Z
+Fri Jun 19 1970 00:00:00 GMT+0100 (CET) 14598000000 1970-06-18T23:00:00.000Z
+Sat Jun 20 1970 00:00:00 GMT+0100 (CET) 14684400000 1970-06-19T23:00:00.000Z
+Sun Jun 21 1970 00:00:00 GMT+0100 (CET) 14770800000 1970-06-20T23:00:00.000Z
+Mon Jun 22 1970 00:00:00 GMT+0100 (CET) 14857200000 1970-06-21T23:00:00.000Z
+Tue Jun 23 1970 00:00:00 GMT+0100 (CET) 14943600000 1970-06-22T23:00:00.000Z
+Wed Jun 24 1970 00:00:00 GMT+0100 (CET) 15030000000 1970-06-23T23:00:00.000Z
+Thu Jun 25 1970 00:00:00 GMT+0100 (CET) 15116400000 1970-06-24T23:00:00.000Z
+Fri Jun 26 1970 00:00:00 GMT+0100 (CET) 15202800000 1970-06-25T23:00:00.000Z
+Sat Jun 27 1970 00:00:00 GMT+0100 (CET) 15289200000 1970-06-26T23:00:00.000Z
+Sun Jun 28 1970 00:00:00 GMT+0100 (CET) 15375600000 1970-06-27T23:00:00.000Z
+Mon Jun 29 1970 00:00:00 GMT+0100 (CET) 15462000000 1970-06-28T23:00:00.000Z
+Tue Jun 30 1970 00:00:00 GMT+0100 (CET) 15548400000 1970-06-29T23:00:00.000Z
+Wed Jul 01 1970 00:00:00 GMT+0100 (CET) 15634800000 1970-06-30T23:00:00.000Z
+Thu Jul 02 1970 00:00:00 GMT+0100 (CET) 15721200000 1970-07-01T23:00:00.000Z
+Fri Jul 03 1970 00:00:00 GMT+0100 (CET) 15807600000 1970-07-02T23:00:00.000Z
+Sat Jul 04 1970 00:00:00 GMT+0100 (CET) 15894000000 1970-07-03T23:00:00.000Z
+Sun Jul 05 1970 00:00:00 GMT+0100 (CET) 15980400000 1970-07-04T23:00:00.000Z
+Mon Jul 06 1970 00:00:00 GMT+0100 (CET) 16066800000 1970-07-05T23:00:00.000Z
+Tue Jul 07 1970 00:00:00 GMT+0100 (CET) 16153200000 1970-07-06T23:00:00.000Z
+Wed Jul 08 1970 00:00:00 GMT+0100 (CET) 16239600000 1970-07-07T23:00:00.000Z
+Thu Jul 09 1970 00:00:00 GMT+0100 (CET) 16326000000 1970-07-08T23:00:00.000Z
+Fri Jul 10 1970 00:00:00 GMT+0100 (CET) 16412400000 1970-07-09T23:00:00.000Z
+Sat Jul 11 1970 00:00:00 GMT+0100 (CET) 16498800000 1970-07-10T23:00:00.000Z
+Sun Jul 12 1970 00:00:00 GMT+0100 (CET) 16585200000 1970-07-11T23:00:00.000Z
+Mon Jul 13 1970 00:00:00 GMT+0100 (CET) 16671600000 1970-07-12T23:00:00.000Z
+Tue Jul 14 1970 00:00:00 GMT+0100 (CET) 16758000000 1970-07-13T23:00:00.000Z
+Wed Jul 15 1970 00:00:00 GMT+0100 (CET) 16844400000 1970-07-14T23:00:00.000Z
+Thu Jul 16 1970 00:00:00 GMT+0100 (CET) 16930800000 1970-07-15T23:00:00.000Z
+Fri Jul 17 1970 00:00:00 GMT+0100 (CET) 17017200000 1970-07-16T23:00:00.000Z
+Sat Jul 18 1970 00:00:00 GMT+0100 (CET) 17103600000 1970-07-17T23:00:00.000Z
+Sun Jul 19 1970 00:00:00 GMT+0100 (CET) 17190000000 1970-07-18T23:00:00.000Z
+Mon Jul 20 1970 00:00:00 GMT+0100 (CET) 17276400000 1970-07-19T23:00:00.000Z
+Tue Jul 21 1970 00:00:00 GMT+0100 (CET) 17362800000 1970-07-20T23:00:00.000Z
+Wed Jul 22 1970 00:00:00 GMT+0100 (CET) 17449200000 1970-07-21T23:00:00.000Z
+Thu Jul 23 1970 00:00:00 GMT+0100 (CET) 17535600000 1970-07-22T23:00:00.000Z
+Fri Jul 24 1970 00:00:00 GMT+0100 (CET) 17622000000 1970-07-23T23:00:00.000Z
+Sat Jul 25 1970 00:00:00 GMT+0100 (CET) 17708400000 1970-07-24T23:00:00.000Z
+Sun Jul 26 1970 00:00:00 GMT+0100 (CET) 17794800000 1970-07-25T23:00:00.000Z
+Mon Jul 27 1970 00:00:00 GMT+0100 (CET) 17881200000 1970-07-26T23:00:00.000Z
+Tue Jul 28 1970 00:00:00 GMT+0100 (CET) 17967600000 1970-07-27T23:00:00.000Z
+Wed Jul 29 1970 00:00:00 GMT+0100 (CET) 18054000000 1970-07-28T23:00:00.000Z
+Thu Jul 30 1970 00:00:00 GMT+0100 (CET) 18140400000 1970-07-29T23:00:00.000Z
+Fri Jul 31 1970 00:00:00 GMT+0100 (CET) 18226800000 1970-07-30T23:00:00.000Z
+Sat Aug 01 1970 00:00:00 GMT+0100 (CET) 18313200000 1970-07-31T23:00:00.000Z
+Sun Aug 02 1970 00:00:00 GMT+0100 (CET) 18399600000 1970-08-01T23:00:00.000Z
+Mon Aug 03 1970 00:00:00 GMT+0100 (CET) 18486000000 1970-08-02T23:00:00.000Z
+Tue Aug 04 1970 00:00:00 GMT+0100 (CET) 18572400000 1970-08-03T23:00:00.000Z
+Wed Aug 05 1970 00:00:00 GMT+0100 (CET) 18658800000 1970-08-04T23:00:00.000Z
+Thu Aug 06 1970 00:00:00 GMT+0100 (CET) 18745200000 1970-08-05T23:00:00.000Z
+Fri Aug 07 1970 00:00:00 GMT+0100 (CET) 18831600000 1970-08-06T23:00:00.000Z
+Sat Aug 08 1970 00:00:00 GMT+0100 (CET) 18918000000 1970-08-07T23:00:00.000Z
+Sun Aug 09 1970 00:00:00 GMT+0100 (CET) 19004400000 1970-08-08T23:00:00.000Z
+Mon Aug 10 1970 00:00:00 GMT+0100 (CET) 19090800000 1970-08-09T23:00:00.000Z
+Tue Aug 11 1970 00:00:00 GMT+0100 (CET) 19177200000 1970-08-10T23:00:00.000Z
+Wed Aug 12 1970 00:00:00 GMT+0100 (CET) 19263600000 1970-08-11T23:00:00.000Z
+Thu Aug 13 1970 00:00:00 GMT+0100 (CET) 19350000000 1970-08-12T23:00:00.000Z
+Fri Aug 14 1970 00:00:00 GMT+0100 (CET) 19436400000 1970-08-13T23:00:00.000Z
+Sat Aug 15 1970 00:00:00 GMT+0100 (CET) 19522800000 1970-08-14T23:00:00.000Z
+Sun Aug 16 1970 00:00:00 GMT+0100 (CET) 19609200000 1970-08-15T23:00:00.000Z
+Mon Aug 17 1970 00:00:00 GMT+0100 (CET) 19695600000 1970-08-16T23:00:00.000Z
+Tue Aug 18 1970 00:00:00 GMT+0100 (CET) 19782000000 1970-08-17T23:00:00.000Z
+Wed Aug 19 1970 00:00:00 GMT+0100 (CET) 19868400000 1970-08-18T23:00:00.000Z
+Thu Aug 20 1970 00:00:00 GMT+0100 (CET) 19954800000 1970-08-19T23:00:00.000Z
+Fri Aug 21 1970 00:00:00 GMT+0100 (CET) 20041200000 1970-08-20T23:00:00.000Z
+Sat Aug 22 1970 00:00:00 GMT+0100 (CET) 20127600000 1970-08-21T23:00:00.000Z
+Sun Aug 23 1970 00:00:00 GMT+0100 (CET) 20214000000 1970-08-22T23:00:00.000Z
+Mon Aug 24 1970 00:00:00 GMT+0100 (CET) 20300400000 1970-08-23T23:00:00.000Z
+Tue Aug 25 1970 00:00:00 GMT+0100 (CET) 20386800000 1970-08-24T23:00:00.000Z
+Wed Aug 26 1970 00:00:00 GMT+0100 (CET) 20473200000 1970-08-25T23:00:00.000Z
+Thu Aug 27 1970 00:00:00 GMT+0100 (CET) 20559600000 1970-08-26T23:00:00.000Z
+Fri Aug 28 1970 00:00:00 GMT+0100 (CET) 20646000000 1970-08-27T23:00:00.000Z
+Sat Aug 29 1970 00:00:00 GMT+0100 (CET) 20732400000 1970-08-28T23:00:00.000Z
+Sun Aug 30 1970 00:00:00 GMT+0100 (CET) 20818800000 1970-08-29T23:00:00.000Z
+Mon Aug 31 1970 00:00:00 GMT+0100 (CET) 20905200000 1970-08-30T23:00:00.000Z
+Tue Sep 01 1970 00:00:00 GMT+0100 (CET) 20991600000 1970-08-31T23:00:00.000Z
+Wed Sep 02 1970 00:00:00 GMT+0100 (CET) 21078000000 1970-09-01T23:00:00.000Z
+Thu Sep 03 1970 00:00:00 GMT+0100 (CET) 21164400000 1970-09-02T23:00:00.000Z
+Fri Sep 04 1970 00:00:00 GMT+0100 (CET) 21250800000 1970-09-03T23:00:00.000Z
+Sat Sep 05 1970 00:00:00 GMT+0100 (CET) 21337200000 1970-09-04T23:00:00.000Z
+Sun Sep 06 1970 00:00:00 GMT+0100 (CET) 21423600000 1970-09-05T23:00:00.000Z
+Mon Sep 07 1970 00:00:00 GMT+0100 (CET) 21510000000 1970-09-06T23:00:00.000Z
+Tue Sep 08 1970 00:00:00 GMT+0100 (CET) 21596400000 1970-09-07T23:00:00.000Z
+Wed Sep 09 1970 00:00:00 GMT+0100 (CET) 21682800000 1970-09-08T23:00:00.000Z
+Thu Sep 10 1970 00:00:00 GMT+0100 (CET) 21769200000 1970-09-09T23:00:00.000Z
+Fri Sep 11 1970 00:00:00 GMT+0100 (CET) 21855600000 1970-09-10T23:00:00.000Z
+Sat Sep 12 1970 00:00:00 GMT+0100 (CET) 21942000000 1970-09-11T23:00:00.000Z
+Sun Sep 13 1970 00:00:00 GMT+0100 (CET) 22028400000 1970-09-12T23:00:00.000Z
+Mon Sep 14 1970 00:00:00 GMT+0100 (CET) 22114800000 1970-09-13T23:00:00.000Z
+Tue Sep 15 1970 00:00:00 GMT+0100 (CET) 22201200000 1970-09-14T23:00:00.000Z
+Wed Sep 16 1970 00:00:00 GMT+0100 (CET) 22287600000 1970-09-15T23:00:00.000Z
+Thu Sep 17 1970 00:00:00 GMT+0100 (CET) 22374000000 1970-09-16T23:00:00.000Z
+Fri Sep 18 1970 00:00:00 GMT+0100 (CET) 22460400000 1970-09-17T23:00:00.000Z
+Sat Sep 19 1970 00:00:00 GMT+0100 (CET) 22546800000 1970-09-18T23:00:00.000Z
+Sun Sep 20 1970 00:00:00 GMT+0100 (CET) 22633200000 1970-09-19T23:00:00.000Z
+Mon Sep 21 1970 00:00:00 GMT+0100 (CET) 22719600000 1970-09-20T23:00:00.000Z
+Tue Sep 22 1970 00:00:00 GMT+0100 (CET) 22806000000 1970-09-21T23:00:00.000Z
+Wed Sep 23 1970 00:00:00 GMT+0100 (CET) 22892400000 1970-09-22T23:00:00.000Z
+Thu Sep 24 1970 00:00:00 GMT+0100 (CET) 22978800000 1970-09-23T23:00:00.000Z
+Fri Sep 25 1970 00:00:00 GMT+0100 (CET) 23065200000 1970-09-24T23:00:00.000Z
+Sat Sep 26 1970 00:00:00 GMT+0100 (CET) 23151600000 1970-09-25T23:00:00.000Z
+Sun Sep 27 1970 00:00:00 GMT+0100 (CET) 23238000000 1970-09-26T23:00:00.000Z
+Mon Sep 28 1970 00:00:00 GMT+0100 (CET) 23324400000 1970-09-27T23:00:00.000Z
+Tue Sep 29 1970 00:00:00 GMT+0100 (CET) 23410800000 1970-09-28T23:00:00.000Z
+Wed Sep 30 1970 00:00:00 GMT+0100 (CET) 23497200000 1970-09-29T23:00:00.000Z
+Thu Oct 01 1970 00:00:00 GMT+0100 (CET) 23583600000 1970-09-30T23:00:00.000Z
+Fri Oct 02 1970 00:00:00 GMT+0100 (CET) 23670000000 1970-10-01T23:00:00.000Z
+Sat Oct 03 1970 00:00:00 GMT+0100 (CET) 23756400000 1970-10-02T23:00:00.000Z
+Sun Oct 04 1970 00:00:00 GMT+0100 (CET) 23842800000 1970-10-03T23:00:00.000Z
+Mon Oct 05 1970 00:00:00 GMT+0100 (CET) 23929200000 1970-10-04T23:00:00.000Z
+Tue Oct 06 1970 00:00:00 GMT+0100 (CET) 24015600000 1970-10-05T23:00:00.000Z
+Wed Oct 07 1970 00:00:00 GMT+0100 (CET) 24102000000 1970-10-06T23:00:00.000Z
+Thu Oct 08 1970 00:00:00 GMT+0100 (CET) 24188400000 1970-10-07T23:00:00.000Z
+Fri Oct 09 1970 00:00:00 GMT+0100 (CET) 24274800000 1970-10-08T23:00:00.000Z
+Sat Oct 10 1970 00:00:00 GMT+0100 (CET) 24361200000 1970-10-09T23:00:00.000Z
+Sun Oct 11 1970 00:00:00 GMT+0100 (CET) 24447600000 1970-10-10T23:00:00.000Z
+Mon Oct 12 1970 00:00:00 GMT+0100 (CET) 24534000000 1970-10-11T23:00:00.000Z
+Tue Oct 13 1970 00:00:00 GMT+0100 (CET) 24620400000 1970-10-12T23:00:00.000Z
+Wed Oct 14 1970 00:00:00 GMT+0100 (CET) 24706800000 1970-10-13T23:00:00.000Z
+Thu Oct 15 1970 00:00:00 GMT+0100 (CET) 24793200000 1970-10-14T23:00:00.000Z
+Fri Oct 16 1970 00:00:00 GMT+0100 (CET) 24879600000 1970-10-15T23:00:00.000Z
+Sat Oct 17 1970 00:00:00 GMT+0100 (CET) 24966000000 1970-10-16T23:00:00.000Z
+Sun Oct 18 1970 00:00:00 GMT+0100 (CET) 25052400000 1970-10-17T23:00:00.000Z
+Mon Oct 19 1970 00:00:00 GMT+0100 (CET) 25138800000 1970-10-18T23:00:00.000Z
+Tue Oct 20 1970 00:00:00 GMT+0100 (CET) 25225200000 1970-10-19T23:00:00.000Z
+Wed Oct 21 1970 00:00:00 GMT+0100 (CET) 25311600000 1970-10-20T23:00:00.000Z
+Thu Oct 22 1970 00:00:00 GMT+0100 (CET) 25398000000 1970-10-21T23:00:00.000Z
+Fri Oct 23 1970 00:00:00 GMT+0100 (CET) 25484400000 1970-10-22T23:00:00.000Z
+Sat Oct 24 1970 00:00:00 GMT+0100 (CET) 25570800000 1970-10-23T23:00:00.000Z
+Sun Oct 25 1970 00:00:00 GMT+0100 (CET) 25657200000 1970-10-24T23:00:00.000Z
+Mon Oct 26 1970 00:00:00 GMT+0100 (CET) 25743600000 1970-10-25T23:00:00.000Z
+Tue Oct 27 1970 00:00:00 GMT+0100 (CET) 25830000000 1970-10-26T23:00:00.000Z
+Wed Oct 28 1970 00:00:00 GMT+0100 (CET) 25916400000 1970-10-27T23:00:00.000Z
+Thu Oct 29 1970 00:00:00 GMT+0100 (CET) 26002800000 1970-10-28T23:00:00.000Z
+Fri Oct 30 1970 00:00:00 GMT+0100 (CET) 26089200000 1970-10-29T23:00:00.000Z
+Sat Oct 31 1970 00:00:00 GMT+0100 (CET) 26175600000 1970-10-30T23:00:00.000Z
+Sun Nov 01 1970 00:00:00 GMT+0100 (CET) 26262000000 1970-10-31T23:00:00.000Z
+Mon Nov 02 1970 00:00:00 GMT+0100 (CET) 26348400000 1970-11-01T23:00:00.000Z
+Tue Nov 03 1970 00:00:00 GMT+0100 (CET) 26434800000 1970-11-02T23:00:00.000Z
+Wed Nov 04 1970 00:00:00 GMT+0100 (CET) 26521200000 1970-11-03T23:00:00.000Z
+Thu Nov 05 1970 00:00:00 GMT+0100 (CET) 26607600000 1970-11-04T23:00:00.000Z
+Fri Nov 06 1970 00:00:00 GMT+0100 (CET) 26694000000 1970-11-05T23:00:00.000Z
+Sat Nov 07 1970 00:00:00 GMT+0100 (CET) 26780400000 1970-11-06T23:00:00.000Z
+Sun Nov 08 1970 00:00:00 GMT+0100 (CET) 26866800000 1970-11-07T23:00:00.000Z
+Mon Nov 09 1970 00:00:00 GMT+0100 (CET) 26953200000 1970-11-08T23:00:00.000Z
+Tue Nov 10 1970 00:00:00 GMT+0100 (CET) 27039600000 1970-11-09T23:00:00.000Z
+Wed Nov 11 1970 00:00:00 GMT+0100 (CET) 27126000000 1970-11-10T23:00:00.000Z
+Thu Nov 12 1970 00:00:00 GMT+0100 (CET) 27212400000 1970-11-11T23:00:00.000Z
+Fri Nov 13 1970 00:00:00 GMT+0100 (CET) 27298800000 1970-11-12T23:00:00.000Z
+Sat Nov 14 1970 00:00:00 GMT+0100 (CET) 27385200000 1970-11-13T23:00:00.000Z
+Sun Nov 15 1970 00:00:00 GMT+0100 (CET) 27471600000 1970-11-14T23:00:00.000Z
+Mon Nov 16 1970 00:00:00 GMT+0100 (CET) 27558000000 1970-11-15T23:00:00.000Z
+Tue Nov 17 1970 00:00:00 GMT+0100 (CET) 27644400000 1970-11-16T23:00:00.000Z
+Wed Nov 18 1970 00:00:00 GMT+0100 (CET) 27730800000 1970-11-17T23:00:00.000Z
+Thu Nov 19 1970 00:00:00 GMT+0100 (CET) 27817200000 1970-11-18T23:00:00.000Z
+Fri Nov 20 1970 00:00:00 GMT+0100 (CET) 27903600000 1970-11-19T23:00:00.000Z
+Sat Nov 21 1970 00:00:00 GMT+0100 (CET) 27990000000 1970-11-20T23:00:00.000Z
+Sun Nov 22 1970 00:00:00 GMT+0100 (CET) 28076400000 1970-11-21T23:00:00.000Z
+Mon Nov 23 1970 00:00:00 GMT+0100 (CET) 28162800000 1970-11-22T23:00:00.000Z
+Tue Nov 24 1970 00:00:00 GMT+0100 (CET) 28249200000 1970-11-23T23:00:00.000Z
+Wed Nov 25 1970 00:00:00 GMT+0100 (CET) 28335600000 1970-11-24T23:00:00.000Z
+Thu Nov 26 1970 00:00:00 GMT+0100 (CET) 28422000000 1970-11-25T23:00:00.000Z
+Fri Nov 27 1970 00:00:00 GMT+0100 (CET) 28508400000 1970-11-26T23:00:00.000Z
+Sat Nov 28 1970 00:00:00 GMT+0100 (CET) 28594800000 1970-11-27T23:00:00.000Z
+Sun Nov 29 1970 00:00:00 GMT+0100 (CET) 28681200000 1970-11-28T23:00:00.000Z
+Mon Nov 30 1970 00:00:00 GMT+0100 (CET) 28767600000 1970-11-29T23:00:00.000Z
+Tue Dec 01 1970 00:00:00 GMT+0100 (CET) 28854000000 1970-11-30T23:00:00.000Z
+Wed Dec 02 1970 00:00:00 GMT+0100 (CET) 28940400000 1970-12-01T23:00:00.000Z
+Thu Dec 03 1970 00:00:00 GMT+0100 (CET) 29026800000 1970-12-02T23:00:00.000Z
+Fri Dec 04 1970 00:00:00 GMT+0100 (CET) 29113200000 1970-12-03T23:00:00.000Z
+Sat Dec 05 1970 00:00:00 GMT+0100 (CET) 29199600000 1970-12-04T23:00:00.000Z
+Sun Dec 06 1970 00:00:00 GMT+0100 (CET) 29286000000 1970-12-05T23:00:00.000Z
+Mon Dec 07 1970 00:00:00 GMT+0100 (CET) 29372400000 1970-12-06T23:00:00.000Z
+Tue Dec 08 1970 00:00:00 GMT+0100 (CET) 29458800000 1970-12-07T23:00:00.000Z
+Wed Dec 09 1970 00:00:00 GMT+0100 (CET) 29545200000 1970-12-08T23:00:00.000Z
+Thu Dec 10 1970 00:00:00 GMT+0100 (CET) 29631600000 1970-12-09T23:00:00.000Z
+Fri Dec 11 1970 00:00:00 GMT+0100 (CET) 29718000000 1970-12-10T23:00:00.000Z
+Sat Dec 12 1970 00:00:00 GMT+0100 (CET) 29804400000 1970-12-11T23:00:00.000Z
+Sun Dec 13 1970 00:00:00 GMT+0100 (CET) 29890800000 1970-12-12T23:00:00.000Z
+Mon Dec 14 1970 00:00:00 GMT+0100 (CET) 29977200000 1970-12-13T23:00:00.000Z
+Tue Dec 15 1970 00:00:00 GMT+0100 (CET) 30063600000 1970-12-14T23:00:00.000Z
+Wed Dec 16 1970 00:00:00 GMT+0100 (CET) 30150000000 1970-12-15T23:00:00.000Z
+Thu Dec 17 1970 00:00:00 GMT+0100 (CET) 30236400000 1970-12-16T23:00:00.000Z
+Fri Dec 18 1970 00:00:00 GMT+0100 (CET) 30322800000 1970-12-17T23:00:00.000Z
+Sat Dec 19 1970 00:00:00 GMT+0100 (CET) 30409200000 1970-12-18T23:00:00.000Z
+Sun Dec 20 1970 00:00:00 GMT+0100 (CET) 30495600000 1970-12-19T23:00:00.000Z
+Mon Dec 21 1970 00:00:00 GMT+0100 (CET) 30582000000 1970-12-20T23:00:00.000Z
+Tue Dec 22 1970 00:00:00 GMT+0100 (CET) 30668400000 1970-12-21T23:00:00.000Z
+Wed Dec 23 1970 00:00:00 GMT+0100 (CET) 30754800000 1970-12-22T23:00:00.000Z
+Thu Dec 24 1970 00:00:00 GMT+0100 (CET) 30841200000 1970-12-23T23:00:00.000Z
+Fri Dec 25 1970 00:00:00 GMT+0100 (CET) 30927600000 1970-12-24T23:00:00.000Z
+Sat Dec 26 1970 00:00:00 GMT+0100 (CET) 31014000000 1970-12-25T23:00:00.000Z
+Sun Dec 27 1970 00:00:00 GMT+0100 (CET) 31100400000 1970-12-26T23:00:00.000Z
+Mon Dec 28 1970 00:00:00 GMT+0100 (CET) 31186800000 1970-12-27T23:00:00.000Z
+Tue Dec 29 1970 00:00:00 GMT+0100 (CET) 31273200000 1970-12-28T23:00:00.000Z
+Wed Dec 30 1970 00:00:00 GMT+0100 (CET) 31359600000 1970-12-29T23:00:00.000Z
+Thu Dec 31 1970 00:00:00 GMT+0100 (CET) 31446000000 1970-12-30T23:00:00.000Z
+Fri Jan 01 1971 00:00:00 GMT+0100 (CET) 31532400000 1970-12-31T23:00:00.000Z
+Sat Jan 02 1971 00:00:00 GMT+0100 (CET) 31618800000 1971-01-01T23:00:00.000Z
+Sun Jan 03 1971 00:00:00 GMT+0100 (CET) 31705200000 1971-01-02T23:00:00.000Z
+Mon Jan 04 1971 00:00:00 GMT+0100 (CET) 31791600000 1971-01-03T23:00:00.000Z
+Tue Jan 05 1971 00:00:00 GMT+0100 (CET) 31878000000 1971-01-04T23:00:00.000Z
+Wed Jan 06 1971 00:00:00 GMT+0100 (CET) 31964400000 1971-01-05T23:00:00.000Z
+Thu Jan 07 1971 00:00:00 GMT+0100 (CET) 32050800000 1971-01-06T23:00:00.000Z
+Fri Jan 08 1971 00:00:00 GMT+0100 (CET) 32137200000 1971-01-07T23:00:00.000Z
+Sat Jan 09 1971 00:00:00 GMT+0100 (CET) 32223600000 1971-01-08T23:00:00.000Z
+Sun Jan 10 1971 00:00:00 GMT+0100 (CET) 32310000000 1971-01-09T23:00:00.000Z
+Mon Jan 11 1971 00:00:00 GMT+0100 (CET) 32396400000 1971-01-10T23:00:00.000Z
+Tue Jan 12 1971 00:00:00 GMT+0100 (CET) 32482800000 1971-01-11T23:00:00.000Z
+Wed Jan 13 1971 00:00:00 GMT+0100 (CET) 32569200000 1971-01-12T23:00:00.000Z
+Thu Jan 14 1971 00:00:00 GMT+0100 (CET) 32655600000 1971-01-13T23:00:00.000Z
+Tue Dec 21 2010 17:00:59 GMT+0100 (CET) 1292947259000 2010-12-21T16:00:59.000Z
+Wed Dec 22 2010 17:00:59 GMT+0100 (CET) 1293033659000 2010-12-22T16:00:59.000Z
+Thu Dec 23 2010 17:00:59 GMT+0100 (CET) 1293120059000 2010-12-23T16:00:59.000Z
+Fri Dec 24 2010 17:00:59 GMT+0100 (CET) 1293206459000 2010-12-24T16:00:59.000Z
+Sat Dec 25 2010 17:00:59 GMT+0100 (CET) 1293292859000 2010-12-25T16:00:59.000Z
+Sun Dec 26 2010 17:00:59 GMT+0100 (CET) 1293379259000 2010-12-26T16:00:59.000Z
+Mon Dec 27 2010 17:00:59 GMT+0100 (CET) 1293465659000 2010-12-27T16:00:59.000Z
+Tue Dec 28 2010 17:00:59 GMT+0100 (CET) 1293552059000 2010-12-28T16:00:59.000Z
+Wed Dec 29 2010 17:00:59 GMT+0100 (CET) 1293638459000 2010-12-29T16:00:59.000Z
+Thu Dec 30 2010 17:00:59 GMT+0100 (CET) 1293724859000 2010-12-30T16:00:59.000Z
+Fri Dec 31 2010 17:00:59 GMT+0100 (CET) 1293811259000 2010-12-31T16:00:59.000Z
+Sat Jan 01 2011 17:00:59 GMT+0100 (CET) 1293897659000 2011-01-01T16:00:59.000Z
+Sun Jan 02 2011 17:00:59 GMT+0100 (CET) 1293984059000 2011-01-02T16:00:59.000Z
+Mon Jan 03 2011 17:00:59 GMT+0100 (CET) 1294070459000 2011-01-03T16:00:59.000Z
+Tue Jan 04 2011 17:00:59 GMT+0100 (CET) 1294156859000 2011-01-04T16:00:59.000Z
+Wed Jan 05 2011 17:00:59 GMT+0100 (CET) 1294243259000 2011-01-05T16:00:59.000Z
+Thu Jan 06 2011 17:00:59 GMT+0100 (CET) 1294329659000 2011-01-06T16:00:59.000Z
+Fri Jan 07 2011 17:00:59 GMT+0100 (CET) 1294416059000 2011-01-07T16:00:59.000Z
+Sat Jan 08 2011 17:00:59 GMT+0100 (CET) 1294502459000 2011-01-08T16:00:59.000Z
+Sun Jan 09 2011 17:00:59 GMT+0100 (CET) 1294588859000 2011-01-09T16:00:59.000Z
+Mon Jan 10 2011 17:00:59 GMT+0100 (CET) 1294675259000 2011-01-10T16:00:59.000Z
+Tue Jan 11 2011 17:00:59 GMT+0100 (CET) 1294761659000 2011-01-11T16:00:59.000Z
+Wed Jan 12 2011 17:00:59 GMT+0100 (CET) 1294848059000 2011-01-12T16:00:59.000Z
+Thu Jan 13 2011 17:00:59 GMT+0100 (CET) 1294934459000 2011-01-13T16:00:59.000Z
+Fri Jan 14 2011 17:00:59 GMT+0100 (CET) 1295020859000 2011-01-14T16:00:59.000Z
+Sat Jan 15 2011 17:00:59 GMT+0100 (CET) 1295107259000 2011-01-15T16:00:59.000Z
+Sun Jan 16 2011 17:00:59 GMT+0100 (CET) 1295193659000 2011-01-16T16:00:59.000Z
+Mon Jan 17 2011 17:00:59 GMT+0100 (CET) 1295280059000 2011-01-17T16:00:59.000Z
+Tue Jan 18 2011 17:00:59 GMT+0100 (CET) 1295366459000 2011-01-18T16:00:59.000Z
+Wed Jan 19 2011 17:00:59 GMT+0100 (CET) 1295452859000 2011-01-19T16:00:59.000Z
+Thu Jan 20 2011 17:00:59 GMT+0100 (CET) 1295539259000 2011-01-20T16:00:59.000Z
+Fri Jan 21 2011 17:00:59 GMT+0100 (CET) 1295625659000 2011-01-21T16:00:59.000Z
+Sat Jan 22 2011 17:00:59 GMT+0100 (CET) 1295712059000 2011-01-22T16:00:59.000Z
+Sun Jan 23 2011 17:00:59 GMT+0100 (CET) 1295798459000 2011-01-23T16:00:59.000Z
+Mon Jan 24 2011 17:00:59 GMT+0100 (CET) 1295884859000 2011-01-24T16:00:59.000Z
+Tue Jan 25 2011 17:00:59 GMT+0100 (CET) 1295971259000 2011-01-25T16:00:59.000Z
+Wed Jan 26 2011 17:00:59 GMT+0100 (CET) 1296057659000 2011-01-26T16:00:59.000Z
+Thu Jan 27 2011 17:00:59 GMT+0100 (CET) 1296144059000 2011-01-27T16:00:59.000Z
+Fri Jan 28 2011 17:00:59 GMT+0100 (CET) 1296230459000 2011-01-28T16:00:59.000Z
+Sat Jan 29 2011 17:00:59 GMT+0100 (CET) 1296316859000 2011-01-29T16:00:59.000Z
+Sun Jan 30 2011 17:00:59 GMT+0100 (CET) 1296403259000 2011-01-30T16:00:59.000Z
+Mon Jan 31 2011 17:00:59 GMT+0100 (CET) 1296489659000 2011-01-31T16:00:59.000Z
+Tue Feb 01 2011 17:00:59 GMT+0100 (CET) 1296576059000 2011-02-01T16:00:59.000Z
+Wed Feb 02 2011 17:00:59 GMT+0100 (CET) 1296662459000 2011-02-02T16:00:59.000Z
+Thu Feb 03 2011 17:00:59 GMT+0100 (CET) 1296748859000 2011-02-03T16:00:59.000Z
+Fri Feb 04 2011 17:00:59 GMT+0100 (CET) 1296835259000 2011-02-04T16:00:59.000Z
+Sat Feb 05 2011 17:00:59 GMT+0100 (CET) 1296921659000 2011-02-05T16:00:59.000Z
+Sun Feb 06 2011 17:00:59 GMT+0100 (CET) 1297008059000 2011-02-06T16:00:59.000Z
+Mon Feb 07 2011 17:00:59 GMT+0100 (CET) 1297094459000 2011-02-07T16:00:59.000Z
+Tue Feb 08 2011 17:00:59 GMT+0100 (CET) 1297180859000 2011-02-08T16:00:59.000Z
+Wed Feb 09 2011 17:00:59 GMT+0100 (CET) 1297267259000 2011-02-09T16:00:59.000Z
+Thu Feb 10 2011 17:00:59 GMT+0100 (CET) 1297353659000 2011-02-10T16:00:59.000Z
+Fri Feb 11 2011 17:00:59 GMT+0100 (CET) 1297440059000 2011-02-11T16:00:59.000Z
+Sat Feb 12 2011 17:00:59 GMT+0100 (CET) 1297526459000 2011-02-12T16:00:59.000Z
+Sun Feb 13 2011 17:00:59 GMT+0100 (CET) 1297612859000 2011-02-13T16:00:59.000Z
+Mon Feb 14 2011 17:00:59 GMT+0100 (CET) 1297699259000 2011-02-14T16:00:59.000Z
+Tue Feb 15 2011 17:00:59 GMT+0100 (CET) 1297785659000 2011-02-15T16:00:59.000Z
+Wed Feb 16 2011 17:00:59 GMT+0100 (CET) 1297872059000 2011-02-16T16:00:59.000Z
+Thu Feb 17 2011 17:00:59 GMT+0100 (CET) 1297958459000 2011-02-17T16:00:59.000Z
+Fri Feb 18 2011 17:00:59 GMT+0100 (CET) 1298044859000 2011-02-18T16:00:59.000Z
+Sat Feb 19 2011 17:00:59 GMT+0100 (CET) 1298131259000 2011-02-19T16:00:59.000Z
+Sun Feb 20 2011 17:00:59 GMT+0100 (CET) 1298217659000 2011-02-20T16:00:59.000Z
+Mon Feb 21 2011 17:00:59 GMT+0100 (CET) 1298304059000 2011-02-21T16:00:59.000Z
+Tue Feb 22 2011 17:00:59 GMT+0100 (CET) 1298390459000 2011-02-22T16:00:59.000Z
+Wed Feb 23 2011 17:00:59 GMT+0100 (CET) 1298476859000 2011-02-23T16:00:59.000Z
+Thu Feb 24 2011 17:00:59 GMT+0100 (CET) 1298563259000 2011-02-24T16:00:59.000Z
+Fri Feb 25 2011 17:00:59 GMT+0100 (CET) 1298649659000 2011-02-25T16:00:59.000Z
+Sat Feb 26 2011 17:00:59 GMT+0100 (CET) 1298736059000 2011-02-26T16:00:59.000Z
+Sun Feb 27 2011 17:00:59 GMT+0100 (CET) 1298822459000 2011-02-27T16:00:59.000Z
+Mon Feb 28 2011 17:00:59 GMT+0100 (CET) 1298908859000 2011-02-28T16:00:59.000Z
+Tue Mar 01 2011 17:00:59 GMT+0100 (CET) 1298995259000 2011-03-01T16:00:59.000Z
+Wed Mar 02 2011 17:00:59 GMT+0100 (CET) 1299081659000 2011-03-02T16:00:59.000Z
+Thu Mar 03 2011 17:00:59 GMT+0100 (CET) 1299168059000 2011-03-03T16:00:59.000Z
+Fri Mar 04 2011 17:00:59 GMT+0100 (CET) 1299254459000 2011-03-04T16:00:59.000Z
+Sat Mar 05 2011 17:00:59 GMT+0100 (CET) 1299340859000 2011-03-05T16:00:59.000Z
+Sun Mar 06 2011 17:00:59 GMT+0100 (CET) 1299427259000 2011-03-06T16:00:59.000Z
+Mon Mar 07 2011 17:00:59 GMT+0100 (CET) 1299513659000 2011-03-07T16:00:59.000Z
+Tue Mar 08 2011 17:00:59 GMT+0100 (CET) 1299600059000 2011-03-08T16:00:59.000Z
+Wed Mar 09 2011 17:00:59 GMT+0100 (CET) 1299686459000 2011-03-09T16:00:59.000Z
+Thu Mar 10 2011 17:00:59 GMT+0100 (CET) 1299772859000 2011-03-10T16:00:59.000Z
+Fri Mar 11 2011 17:00:59 GMT+0100 (CET) 1299859259000 2011-03-11T16:00:59.000Z
+Sat Mar 12 2011 17:00:59 GMT+0100 (CET) 1299945659000 2011-03-12T16:00:59.000Z
+Sun Mar 13 2011 17:00:59 GMT+0100 (CET) 1300032059000 2011-03-13T16:00:59.000Z
+Mon Mar 14 2011 17:00:59 GMT+0100 (CET) 1300118459000 2011-03-14T16:00:59.000Z
+Tue Mar 15 2011 17:00:59 GMT+0100 (CET) 1300204859000 2011-03-15T16:00:59.000Z
+Wed Mar 16 2011 17:00:59 GMT+0100 (CET) 1300291259000 2011-03-16T16:00:59.000Z
+Thu Mar 17 2011 17:00:59 GMT+0100 (CET) 1300377659000 2011-03-17T16:00:59.000Z
+Fri Mar 18 2011 17:00:59 GMT+0100 (CET) 1300464059000 2011-03-18T16:00:59.000Z
+Sat Mar 19 2011 17:00:59 GMT+0100 (CET) 1300550459000 2011-03-19T16:00:59.000Z
+Sun Mar 20 2011 17:00:59 GMT+0100 (CET) 1300636859000 2011-03-20T16:00:59.000Z
+Mon Mar 21 2011 17:00:59 GMT+0100 (CET) 1300723259000 2011-03-21T16:00:59.000Z
+Tue Mar 22 2011 17:00:59 GMT+0100 (CET) 1300809659000 2011-03-22T16:00:59.000Z
+Wed Mar 23 2011 17:00:59 GMT+0100 (CET) 1300896059000 2011-03-23T16:00:59.000Z
+Thu Mar 24 2011 17:00:59 GMT+0100 (CET) 1300982459000 2011-03-24T16:00:59.000Z
+Fri Mar 25 2011 17:00:59 GMT+0100 (CET) 1301068859000 2011-03-25T16:00:59.000Z
+Sat Mar 26 2011 17:00:59 GMT+0100 (CET) 1301155259000 2011-03-26T16:00:59.000Z
+Sun Mar 27 2011 17:00:59 GMT+0200 (CEST) 1301238059000 2011-03-27T15:00:59.000Z
+Mon Mar 28 2011 17:00:59 GMT+0200 (CEST) 1301324459000 2011-03-28T15:00:59.000Z
+Tue Mar 29 2011 17:00:59 GMT+0200 (CEST) 1301410859000 2011-03-29T15:00:59.000Z
+Wed Mar 30 2011 17:00:59 GMT+0200 (CEST) 1301497259000 2011-03-30T15:00:59.000Z
+Thu Mar 31 2011 17:00:59 GMT+0200 (CEST) 1301583659000 2011-03-31T15:00:59.000Z
+Fri Apr 01 2011 17:00:59 GMT+0200 (CEST) 1301670059000 2011-04-01T15:00:59.000Z
+Sat Apr 02 2011 17:00:59 GMT+0200 (CEST) 1301756459000 2011-04-02T15:00:59.000Z
+Sun Apr 03 2011 17:00:59 GMT+0200 (CEST) 1301842859000 2011-04-03T15:00:59.000Z
+Mon Apr 04 2011 17:00:59 GMT+0200 (CEST) 1301929259000 2011-04-04T15:00:59.000Z
+Tue Apr 05 2011 17:00:59 GMT+0200 (CEST) 1302015659000 2011-04-05T15:00:59.000Z
+Wed Apr 06 2011 17:00:59 GMT+0200 (CEST) 1302102059000 2011-04-06T15:00:59.000Z
+Thu Apr 07 2011 17:00:59 GMT+0200 (CEST) 1302188459000 2011-04-07T15:00:59.000Z
+Fri Apr 08 2011 17:00:59 GMT+0200 (CEST) 1302274859000 2011-04-08T15:00:59.000Z
+Sat Apr 09 2011 17:00:59 GMT+0200 (CEST) 1302361259000 2011-04-09T15:00:59.000Z
+Sun Apr 10 2011 17:00:59 GMT+0200 (CEST) 1302447659000 2011-04-10T15:00:59.000Z
+Mon Apr 11 2011 17:00:59 GMT+0200 (CEST) 1302534059000 2011-04-11T15:00:59.000Z
+Tue Apr 12 2011 17:00:59 GMT+0200 (CEST) 1302620459000 2011-04-12T15:00:59.000Z
+Wed Apr 13 2011 17:00:59 GMT+0200 (CEST) 1302706859000 2011-04-13T15:00:59.000Z
+Thu Apr 14 2011 17:00:59 GMT+0200 (CEST) 1302793259000 2011-04-14T15:00:59.000Z
+Fri Apr 15 2011 17:00:59 GMT+0200 (CEST) 1302879659000 2011-04-15T15:00:59.000Z
+Sat Apr 16 2011 17:00:59 GMT+0200 (CEST) 1302966059000 2011-04-16T15:00:59.000Z
+Sun Apr 17 2011 17:00:59 GMT+0200 (CEST) 1303052459000 2011-04-17T15:00:59.000Z
+Mon Apr 18 2011 17:00:59 GMT+0200 (CEST) 1303138859000 2011-04-18T15:00:59.000Z
+Tue Apr 19 2011 17:00:59 GMT+0200 (CEST) 1303225259000 2011-04-19T15:00:59.000Z
+Wed Apr 20 2011 17:00:59 GMT+0200 (CEST) 1303311659000 2011-04-20T15:00:59.000Z
+Thu Apr 21 2011 17:00:59 GMT+0200 (CEST) 1303398059000 2011-04-21T15:00:59.000Z
+Fri Apr 22 2011 17:00:59 GMT+0200 (CEST) 1303484459000 2011-04-22T15:00:59.000Z
+Sat Apr 23 2011 17:00:59 GMT+0200 (CEST) 1303570859000 2011-04-23T15:00:59.000Z
+Sun Apr 24 2011 17:00:59 GMT+0200 (CEST) 1303657259000 2011-04-24T15:00:59.000Z
+Mon Apr 25 2011 17:00:59 GMT+0200 (CEST) 1303743659000 2011-04-25T15:00:59.000Z
+Tue Apr 26 2011 17:00:59 GMT+0200 (CEST) 1303830059000 2011-04-26T15:00:59.000Z
+Wed Apr 27 2011 17:00:59 GMT+0200 (CEST) 1303916459000 2011-04-27T15:00:59.000Z
+Thu Apr 28 2011 17:00:59 GMT+0200 (CEST) 1304002859000 2011-04-28T15:00:59.000Z
+Fri Apr 29 2011 17:00:59 GMT+0200 (CEST) 1304089259000 2011-04-29T15:00:59.000Z
+Sat Apr 30 2011 17:00:59 GMT+0200 (CEST) 1304175659000 2011-04-30T15:00:59.000Z
+Sun May 01 2011 17:00:59 GMT+0200 (CEST) 1304262059000 2011-05-01T15:00:59.000Z
+Mon May 02 2011 17:00:59 GMT+0200 (CEST) 1304348459000 2011-05-02T15:00:59.000Z
+Tue May 03 2011 17:00:59 GMT+0200 (CEST) 1304434859000 2011-05-03T15:00:59.000Z
+Wed May 04 2011 17:00:59 GMT+0200 (CEST) 1304521259000 2011-05-04T15:00:59.000Z
+Thu May 05 2011 17:00:59 GMT+0200 (CEST) 1304607659000 2011-05-05T15:00:59.000Z
+Fri May 06 2011 17:00:59 GMT+0200 (CEST) 1304694059000 2011-05-06T15:00:59.000Z
+Sat May 07 2011 17:00:59 GMT+0200 (CEST) 1304780459000 2011-05-07T15:00:59.000Z
+Sun May 08 2011 17:00:59 GMT+0200 (CEST) 1304866859000 2011-05-08T15:00:59.000Z
+Mon May 09 2011 17:00:59 GMT+0200 (CEST) 1304953259000 2011-05-09T15:00:59.000Z
+Tue May 10 2011 17:00:59 GMT+0200 (CEST) 1305039659000 2011-05-10T15:00:59.000Z
+Wed May 11 2011 17:00:59 GMT+0200 (CEST) 1305126059000 2011-05-11T15:00:59.000Z
+Thu May 12 2011 17:00:59 GMT+0200 (CEST) 1305212459000 2011-05-12T15:00:59.000Z
+Fri May 13 2011 17:00:59 GMT+0200 (CEST) 1305298859000 2011-05-13T15:00:59.000Z
+Sat May 14 2011 17:00:59 GMT+0200 (CEST) 1305385259000 2011-05-14T15:00:59.000Z
+Sun May 15 2011 17:00:59 GMT+0200 (CEST) 1305471659000 2011-05-15T15:00:59.000Z
+Mon May 16 2011 17:00:59 GMT+0200 (CEST) 1305558059000 2011-05-16T15:00:59.000Z
+Tue May 17 2011 17:00:59 GMT+0200 (CEST) 1305644459000 2011-05-17T15:00:59.000Z
+Wed May 18 2011 17:00:59 GMT+0200 (CEST) 1305730859000 2011-05-18T15:00:59.000Z
+Thu May 19 2011 17:00:59 GMT+0200 (CEST) 1305817259000 2011-05-19T15:00:59.000Z
+Fri May 20 2011 17:00:59 GMT+0200 (CEST) 1305903659000 2011-05-20T15:00:59.000Z
+Sat May 21 2011 17:00:59 GMT+0200 (CEST) 1305990059000 2011-05-21T15:00:59.000Z
+Sun May 22 2011 17:00:59 GMT+0200 (CEST) 1306076459000 2011-05-22T15:00:59.000Z
+Mon May 23 2011 17:00:59 GMT+0200 (CEST) 1306162859000 2011-05-23T15:00:59.000Z
+Tue May 24 2011 17:00:59 GMT+0200 (CEST) 1306249259000 2011-05-24T15:00:59.000Z
+Wed May 25 2011 17:00:59 GMT+0200 (CEST) 1306335659000 2011-05-25T15:00:59.000Z
+Thu May 26 2011 17:00:59 GMT+0200 (CEST) 1306422059000 2011-05-26T15:00:59.000Z
+Fri May 27 2011 17:00:59 GMT+0200 (CEST) 1306508459000 2011-05-27T15:00:59.000Z
+Sat May 28 2011 17:00:59 GMT+0200 (CEST) 1306594859000 2011-05-28T15:00:59.000Z
+Sun May 29 2011 17:00:59 GMT+0200 (CEST) 1306681259000 2011-05-29T15:00:59.000Z
+Mon May 30 2011 17:00:59 GMT+0200 (CEST) 1306767659000 2011-05-30T15:00:59.000Z
+Tue May 31 2011 17:00:59 GMT+0200 (CEST) 1306854059000 2011-05-31T15:00:59.000Z
+Wed Jun 01 2011 17:00:59 GMT+0200 (CEST) 1306940459000 2011-06-01T15:00:59.000Z
+Thu Jun 02 2011 17:00:59 GMT+0200 (CEST) 1307026859000 2011-06-02T15:00:59.000Z
+Fri Jun 03 2011 17:00:59 GMT+0200 (CEST) 1307113259000 2011-06-03T15:00:59.000Z
+Sat Jun 04 2011 17:00:59 GMT+0200 (CEST) 1307199659000 2011-06-04T15:00:59.000Z
+Sun Jun 05 2011 17:00:59 GMT+0200 (CEST) 1307286059000 2011-06-05T15:00:59.000Z
+Mon Jun 06 2011 17:00:59 GMT+0200 (CEST) 1307372459000 2011-06-06T15:00:59.000Z
+Tue Jun 07 2011 17:00:59 GMT+0200 (CEST) 1307458859000 2011-06-07T15:00:59.000Z
+Wed Jun 08 2011 17:00:59 GMT+0200 (CEST) 1307545259000 2011-06-08T15:00:59.000Z
+Thu Jun 09 2011 17:00:59 GMT+0200 (CEST) 1307631659000 2011-06-09T15:00:59.000Z
+Fri Jun 10 2011 17:00:59 GMT+0200 (CEST) 1307718059000 2011-06-10T15:00:59.000Z
+Sat Jun 11 2011 17:00:59 GMT+0200 (CEST) 1307804459000 2011-06-11T15:00:59.000Z
+Sun Jun 12 2011 17:00:59 GMT+0200 (CEST) 1307890859000 2011-06-12T15:00:59.000Z
+Mon Jun 13 2011 17:00:59 GMT+0200 (CEST) 1307977259000 2011-06-13T15:00:59.000Z
+Tue Jun 14 2011 17:00:59 GMT+0200 (CEST) 1308063659000 2011-06-14T15:00:59.000Z
+Wed Jun 15 2011 17:00:59 GMT+0200 (CEST) 1308150059000 2011-06-15T15:00:59.000Z
+Thu Jun 16 2011 17:00:59 GMT+0200 (CEST) 1308236459000 2011-06-16T15:00:59.000Z
+Fri Jun 17 2011 17:00:59 GMT+0200 (CEST) 1308322859000 2011-06-17T15:00:59.000Z
+Sat Jun 18 2011 17:00:59 GMT+0200 (CEST) 1308409259000 2011-06-18T15:00:59.000Z
+Sun Jun 19 2011 17:00:59 GMT+0200 (CEST) 1308495659000 2011-06-19T15:00:59.000Z
+Mon Jun 20 2011 17:00:59 GMT+0200 (CEST) 1308582059000 2011-06-20T15:00:59.000Z
+Tue Jun 21 2011 17:00:59 GMT+0200 (CEST) 1308668459000 2011-06-21T15:00:59.000Z
+Wed Jun 22 2011 17:00:59 GMT+0200 (CEST) 1308754859000 2011-06-22T15:00:59.000Z
+Thu Jun 23 2011 17:00:59 GMT+0200 (CEST) 1308841259000 2011-06-23T15:00:59.000Z
+Fri Jun 24 2011 17:00:59 GMT+0200 (CEST) 1308927659000 2011-06-24T15:00:59.000Z
+Sat Jun 25 2011 17:00:59 GMT+0200 (CEST) 1309014059000 2011-06-25T15:00:59.000Z
+Sun Jun 26 2011 17:00:59 GMT+0200 (CEST) 1309100459000 2011-06-26T15:00:59.000Z
+Mon Jun 27 2011 17:00:59 GMT+0200 (CEST) 1309186859000 2011-06-27T15:00:59.000Z
+Tue Jun 28 2011 17:00:59 GMT+0200 (CEST) 1309273259000 2011-06-28T15:00:59.000Z
+Wed Jun 29 2011 17:00:59 GMT+0200 (CEST) 1309359659000 2011-06-29T15:00:59.000Z
+Thu Jun 30 2011 17:00:59 GMT+0200 (CEST) 1309446059000 2011-06-30T15:00:59.000Z
+Fri Jul 01 2011 17:00:59 GMT+0200 (CEST) 1309532459000 2011-07-01T15:00:59.000Z
+Sat Jul 02 2011 17:00:59 GMT+0200 (CEST) 1309618859000 2011-07-02T15:00:59.000Z
+Sun Jul 03 2011 17:00:59 GMT+0200 (CEST) 1309705259000 2011-07-03T15:00:59.000Z
+Mon Jul 04 2011 17:00:59 GMT+0200 (CEST) 1309791659000 2011-07-04T15:00:59.000Z
+Tue Jul 05 2011 17:00:59 GMT+0200 (CEST) 1309878059000 2011-07-05T15:00:59.000Z
+Wed Jul 06 2011 17:00:59 GMT+0200 (CEST) 1309964459000 2011-07-06T15:00:59.000Z
+Thu Jul 07 2011 17:00:59 GMT+0200 (CEST) 1310050859000 2011-07-07T15:00:59.000Z
+Fri Jul 08 2011 17:00:59 GMT+0200 (CEST) 1310137259000 2011-07-08T15:00:59.000Z
+Sat Jul 09 2011 17:00:59 GMT+0200 (CEST) 1310223659000 2011-07-09T15:00:59.000Z
+Sun Jul 10 2011 17:00:59 GMT+0200 (CEST) 1310310059000 2011-07-10T15:00:59.000Z
+Mon Jul 11 2011 17:00:59 GMT+0200 (CEST) 1310396459000 2011-07-11T15:00:59.000Z
+Tue Jul 12 2011 17:00:59 GMT+0200 (CEST) 1310482859000 2011-07-12T15:00:59.000Z
+Wed Jul 13 2011 17:00:59 GMT+0200 (CEST) 1310569259000 2011-07-13T15:00:59.000Z
+Thu Jul 14 2011 17:00:59 GMT+0200 (CEST) 1310655659000 2011-07-14T15:00:59.000Z
+Fri Jul 15 2011 17:00:59 GMT+0200 (CEST) 1310742059000 2011-07-15T15:00:59.000Z
+Sat Jul 16 2011 17:00:59 GMT+0200 (CEST) 1310828459000 2011-07-16T15:00:59.000Z
+Sun Jul 17 2011 17:00:59 GMT+0200 (CEST) 1310914859000 2011-07-17T15:00:59.000Z
+Mon Jul 18 2011 17:00:59 GMT+0200 (CEST) 1311001259000 2011-07-18T15:00:59.000Z
+Tue Jul 19 2011 17:00:59 GMT+0200 (CEST) 1311087659000 2011-07-19T15:00:59.000Z
+Wed Jul 20 2011 17:00:59 GMT+0200 (CEST) 1311174059000 2011-07-20T15:00:59.000Z
+Thu Jul 21 2011 17:00:59 GMT+0200 (CEST) 1311260459000 2011-07-21T15:00:59.000Z
+Fri Jul 22 2011 17:00:59 GMT+0200 (CEST) 1311346859000 2011-07-22T15:00:59.000Z
+Sat Jul 23 2011 17:00:59 GMT+0200 (CEST) 1311433259000 2011-07-23T15:00:59.000Z
+Sun Jul 24 2011 17:00:59 GMT+0200 (CEST) 1311519659000 2011-07-24T15:00:59.000Z
+Mon Jul 25 2011 17:00:59 GMT+0200 (CEST) 1311606059000 2011-07-25T15:00:59.000Z
+Tue Jul 26 2011 17:00:59 GMT+0200 (CEST) 1311692459000 2011-07-26T15:00:59.000Z
+Wed Jul 27 2011 17:00:59 GMT+0200 (CEST) 1311778859000 2011-07-27T15:00:59.000Z
+Thu Jul 28 2011 17:00:59 GMT+0200 (CEST) 1311865259000 2011-07-28T15:00:59.000Z
+Fri Jul 29 2011 17:00:59 GMT+0200 (CEST) 1311951659000 2011-07-29T15:00:59.000Z
+Sat Jul 30 2011 17:00:59 GMT+0200 (CEST) 1312038059000 2011-07-30T15:00:59.000Z
+Sun Jul 31 2011 17:00:59 GMT+0200 (CEST) 1312124459000 2011-07-31T15:00:59.000Z
+Mon Aug 01 2011 17:00:59 GMT+0200 (CEST) 1312210859000 2011-08-01T15:00:59.000Z
+Tue Aug 02 2011 17:00:59 GMT+0200 (CEST) 1312297259000 2011-08-02T15:00:59.000Z
+Wed Aug 03 2011 17:00:59 GMT+0200 (CEST) 1312383659000 2011-08-03T15:00:59.000Z
+Thu Aug 04 2011 17:00:59 GMT+0200 (CEST) 1312470059000 2011-08-04T15:00:59.000Z
+Fri Aug 05 2011 17:00:59 GMT+0200 (CEST) 1312556459000 2011-08-05T15:00:59.000Z
+Sat Aug 06 2011 17:00:59 GMT+0200 (CEST) 1312642859000 2011-08-06T15:00:59.000Z
+Sun Aug 07 2011 17:00:59 GMT+0200 (CEST) 1312729259000 2011-08-07T15:00:59.000Z
+Mon Aug 08 2011 17:00:59 GMT+0200 (CEST) 1312815659000 2011-08-08T15:00:59.000Z
+Tue Aug 09 2011 17:00:59 GMT+0200 (CEST) 1312902059000 2011-08-09T15:00:59.000Z
+Wed Aug 10 2011 17:00:59 GMT+0200 (CEST) 1312988459000 2011-08-10T15:00:59.000Z
+Thu Aug 11 2011 17:00:59 GMT+0200 (CEST) 1313074859000 2011-08-11T15:00:59.000Z
+Fri Aug 12 2011 17:00:59 GMT+0200 (CEST) 1313161259000 2011-08-12T15:00:59.000Z
+Sat Aug 13 2011 17:00:59 GMT+0200 (CEST) 1313247659000 2011-08-13T15:00:59.000Z
+Sun Aug 14 2011 17:00:59 GMT+0200 (CEST) 1313334059000 2011-08-14T15:00:59.000Z
+Mon Aug 15 2011 17:00:59 GMT+0200 (CEST) 1313420459000 2011-08-15T15:00:59.000Z
+Tue Aug 16 2011 17:00:59 GMT+0200 (CEST) 1313506859000 2011-08-16T15:00:59.000Z
+Wed Aug 17 2011 17:00:59 GMT+0200 (CEST) 1313593259000 2011-08-17T15:00:59.000Z
+Thu Aug 18 2011 17:00:59 GMT+0200 (CEST) 1313679659000 2011-08-18T15:00:59.000Z
+Fri Aug 19 2011 17:00:59 GMT+0200 (CEST) 1313766059000 2011-08-19T15:00:59.000Z
+Sat Aug 20 2011 17:00:59 GMT+0200 (CEST) 1313852459000 2011-08-20T15:00:59.000Z
+Sun Aug 21 2011 17:00:59 GMT+0200 (CEST) 1313938859000 2011-08-21T15:00:59.000Z
+Mon Aug 22 2011 17:00:59 GMT+0200 (CEST) 1314025259000 2011-08-22T15:00:59.000Z
+Tue Aug 23 2011 17:00:59 GMT+0200 (CEST) 1314111659000 2011-08-23T15:00:59.000Z
+Wed Aug 24 2011 17:00:59 GMT+0200 (CEST) 1314198059000 2011-08-24T15:00:59.000Z
+Thu Aug 25 2011 17:00:59 GMT+0200 (CEST) 1314284459000 2011-08-25T15:00:59.000Z
+Fri Aug 26 2011 17:00:59 GMT+0200 (CEST) 1314370859000 2011-08-26T15:00:59.000Z
+Sat Aug 27 2011 17:00:59 GMT+0200 (CEST) 1314457259000 2011-08-27T15:00:59.000Z
+Sun Aug 28 2011 17:00:59 GMT+0200 (CEST) 1314543659000 2011-08-28T15:00:59.000Z
+Mon Aug 29 2011 17:00:59 GMT+0200 (CEST) 1314630059000 2011-08-29T15:00:59.000Z
+Tue Aug 30 2011 17:00:59 GMT+0200 (CEST) 1314716459000 2011-08-30T15:00:59.000Z
+Wed Aug 31 2011 17:00:59 GMT+0200 (CEST) 1314802859000 2011-08-31T15:00:59.000Z
+Thu Sep 01 2011 17:00:59 GMT+0200 (CEST) 1314889259000 2011-09-01T15:00:59.000Z
+Fri Sep 02 2011 17:00:59 GMT+0200 (CEST) 1314975659000 2011-09-02T15:00:59.000Z
+Sat Sep 03 2011 17:00:59 GMT+0200 (CEST) 1315062059000 2011-09-03T15:00:59.000Z
+Sun Sep 04 2011 17:00:59 GMT+0200 (CEST) 1315148459000 2011-09-04T15:00:59.000Z
+Mon Sep 05 2011 17:00:59 GMT+0200 (CEST) 1315234859000 2011-09-05T15:00:59.000Z
+Tue Sep 06 2011 17:00:59 GMT+0200 (CEST) 1315321259000 2011-09-06T15:00:59.000Z
+Wed Sep 07 2011 17:00:59 GMT+0200 (CEST) 1315407659000 2011-09-07T15:00:59.000Z
+Thu Sep 08 2011 17:00:59 GMT+0200 (CEST) 1315494059000 2011-09-08T15:00:59.000Z
+Fri Sep 09 2011 17:00:59 GMT+0200 (CEST) 1315580459000 2011-09-09T15:00:59.000Z
+Sat Sep 10 2011 17:00:59 GMT+0200 (CEST) 1315666859000 2011-09-10T15:00:59.000Z
+Sun Sep 11 2011 17:00:59 GMT+0200 (CEST) 1315753259000 2011-09-11T15:00:59.000Z
+Mon Sep 12 2011 17:00:59 GMT+0200 (CEST) 1315839659000 2011-09-12T15:00:59.000Z
+Tue Sep 13 2011 17:00:59 GMT+0200 (CEST) 1315926059000 2011-09-13T15:00:59.000Z
+Wed Sep 14 2011 17:00:59 GMT+0200 (CEST) 1316012459000 2011-09-14T15:00:59.000Z
+Thu Sep 15 2011 17:00:59 GMT+0200 (CEST) 1316098859000 2011-09-15T15:00:59.000Z
+Fri Sep 16 2011 17:00:59 GMT+0200 (CEST) 1316185259000 2011-09-16T15:00:59.000Z
+Sat Sep 17 2011 17:00:59 GMT+0200 (CEST) 1316271659000 2011-09-17T15:00:59.000Z
+Sun Sep 18 2011 17:00:59 GMT+0200 (CEST) 1316358059000 2011-09-18T15:00:59.000Z
+Mon Sep 19 2011 17:00:59 GMT+0200 (CEST) 1316444459000 2011-09-19T15:00:59.000Z
+Tue Sep 20 2011 17:00:59 GMT+0200 (CEST) 1316530859000 2011-09-20T15:00:59.000Z
+Wed Sep 21 2011 17:00:59 GMT+0200 (CEST) 1316617259000 2011-09-21T15:00:59.000Z
+Thu Sep 22 2011 17:00:59 GMT+0200 (CEST) 1316703659000 2011-09-22T15:00:59.000Z
+Fri Sep 23 2011 17:00:59 GMT+0200 (CEST) 1316790059000 2011-09-23T15:00:59.000Z
+Sat Sep 24 2011 17:00:59 GMT+0200 (CEST) 1316876459000 2011-09-24T15:00:59.000Z
+Sun Sep 25 2011 17:00:59 GMT+0200 (CEST) 1316962859000 2011-09-25T15:00:59.000Z
+Mon Sep 26 2011 17:00:59 GMT+0200 (CEST) 1317049259000 2011-09-26T15:00:59.000Z
+Tue Sep 27 2011 17:00:59 GMT+0200 (CEST) 1317135659000 2011-09-27T15:00:59.000Z
+Wed Sep 28 2011 17:00:59 GMT+0200 (CEST) 1317222059000 2011-09-28T15:00:59.000Z
+Thu Sep 29 2011 17:00:59 GMT+0200 (CEST) 1317308459000 2011-09-29T15:00:59.000Z
+Fri Sep 30 2011 17:00:59 GMT+0200 (CEST) 1317394859000 2011-09-30T15:00:59.000Z
+Sat Oct 01 2011 17:00:59 GMT+0200 (CEST) 1317481259000 2011-10-01T15:00:59.000Z
+Sun Oct 02 2011 17:00:59 GMT+0200 (CEST) 1317567659000 2011-10-02T15:00:59.000Z
+Mon Oct 03 2011 17:00:59 GMT+0200 (CEST) 1317654059000 2011-10-03T15:00:59.000Z
+Tue Oct 04 2011 17:00:59 GMT+0200 (CEST) 1317740459000 2011-10-04T15:00:59.000Z
+Wed Oct 05 2011 17:00:59 GMT+0200 (CEST) 1317826859000 2011-10-05T15:00:59.000Z
+Thu Oct 06 2011 17:00:59 GMT+0200 (CEST) 1317913259000 2011-10-06T15:00:59.000Z
+Fri Oct 07 2011 17:00:59 GMT+0200 (CEST) 1317999659000 2011-10-07T15:00:59.000Z
+Sat Oct 08 2011 17:00:59 GMT+0200 (CEST) 1318086059000 2011-10-08T15:00:59.000Z
+Sun Oct 09 2011 17:00:59 GMT+0200 (CEST) 1318172459000 2011-10-09T15:00:59.000Z
+Mon Oct 10 2011 17:00:59 GMT+0200 (CEST) 1318258859000 2011-10-10T15:00:59.000Z
+Tue Oct 11 2011 17:00:59 GMT+0200 (CEST) 1318345259000 2011-10-11T15:00:59.000Z
+Wed Oct 12 2011 17:00:59 GMT+0200 (CEST) 1318431659000 2011-10-12T15:00:59.000Z
+Thu Oct 13 2011 17:00:59 GMT+0200 (CEST) 1318518059000 2011-10-13T15:00:59.000Z
+Fri Oct 14 2011 17:00:59 GMT+0200 (CEST) 1318604459000 2011-10-14T15:00:59.000Z
+Sat Oct 15 2011 17:00:59 GMT+0200 (CEST) 1318690859000 2011-10-15T15:00:59.000Z
+Sun Oct 16 2011 17:00:59 GMT+0200 (CEST) 1318777259000 2011-10-16T15:00:59.000Z
+Mon Oct 17 2011 17:00:59 GMT+0200 (CEST) 1318863659000 2011-10-17T15:00:59.000Z
+Tue Oct 18 2011 17:00:59 GMT+0200 (CEST) 1318950059000 2011-10-18T15:00:59.000Z
+Wed Oct 19 2011 17:00:59 GMT+0200 (CEST) 1319036459000 2011-10-19T15:00:59.000Z
+Thu Oct 20 2011 17:00:59 GMT+0200 (CEST) 1319122859000 2011-10-20T15:00:59.000Z
+Fri Oct 21 2011 17:00:59 GMT+0200 (CEST) 1319209259000 2011-10-21T15:00:59.000Z
+Sat Oct 22 2011 17:00:59 GMT+0200 (CEST) 1319295659000 2011-10-22T15:00:59.000Z
+Sun Oct 23 2011 17:00:59 GMT+0200 (CEST) 1319382059000 2011-10-23T15:00:59.000Z
+Mon Oct 24 2011 17:00:59 GMT+0200 (CEST) 1319468459000 2011-10-24T15:00:59.000Z
+Tue Oct 25 2011 17:00:59 GMT+0200 (CEST) 1319554859000 2011-10-25T15:00:59.000Z
+Wed Oct 26 2011 17:00:59 GMT+0200 (CEST) 1319641259000 2011-10-26T15:00:59.000Z
+Thu Oct 27 2011 17:00:59 GMT+0200 (CEST) 1319727659000 2011-10-27T15:00:59.000Z
+Fri Oct 28 2011 17:00:59 GMT+0200 (CEST) 1319814059000 2011-10-28T15:00:59.000Z
+Sat Oct 29 2011 17:00:59 GMT+0200 (CEST) 1319900459000 2011-10-29T15:00:59.000Z
+Sun Oct 30 2011 17:00:59 GMT+0100 (CET) 1319990459000 2011-10-30T16:00:59.000Z
+Mon Oct 31 2011 17:00:59 GMT+0100 (CET) 1320076859000 2011-10-31T16:00:59.000Z
+Tue Nov 01 2011 17:00:59 GMT+0100 (CET) 1320163259000 2011-11-01T16:00:59.000Z
+Wed Nov 02 2011 17:00:59 GMT+0100 (CET) 1320249659000 2011-11-02T16:00:59.000Z
+Thu Nov 03 2011 17:00:59 GMT+0100 (CET) 1320336059000 2011-11-03T16:00:59.000Z
+Fri Nov 04 2011 17:00:59 GMT+0100 (CET) 1320422459000 2011-11-04T16:00:59.000Z
+Sat Nov 05 2011 17:00:59 GMT+0100 (CET) 1320508859000 2011-11-05T16:00:59.000Z
+Sun Nov 06 2011 17:00:59 GMT+0100 (CET) 1320595259000 2011-11-06T16:00:59.000Z
+Mon Nov 07 2011 17:00:59 GMT+0100 (CET) 1320681659000 2011-11-07T16:00:59.000Z
+Tue Nov 08 2011 17:00:59 GMT+0100 (CET) 1320768059000 2011-11-08T16:00:59.000Z
+Wed Nov 09 2011 17:00:59 GMT+0100 (CET) 1320854459000 2011-11-09T16:00:59.000Z
+Thu Nov 10 2011 17:00:59 GMT+0100 (CET) 1320940859000 2011-11-10T16:00:59.000Z
+Fri Nov 11 2011 17:00:59 GMT+0100 (CET) 1321027259000 2011-11-11T16:00:59.000Z
+Sat Nov 12 2011 17:00:59 GMT+0100 (CET) 1321113659000 2011-11-12T16:00:59.000Z
+Sun Nov 13 2011 17:00:59 GMT+0100 (CET) 1321200059000 2011-11-13T16:00:59.000Z
+Mon Nov 14 2011 17:00:59 GMT+0100 (CET) 1321286459000 2011-11-14T16:00:59.000Z
+Tue Nov 15 2011 17:00:59 GMT+0100 (CET) 1321372859000 2011-11-15T16:00:59.000Z
+Wed Nov 16 2011 17:00:59 GMT+0100 (CET) 1321459259000 2011-11-16T16:00:59.000Z
+Thu Nov 17 2011 17:00:59 GMT+0100 (CET) 1321545659000 2011-11-17T16:00:59.000Z
+Fri Nov 18 2011 17:00:59 GMT+0100 (CET) 1321632059000 2011-11-18T16:00:59.000Z
+Sat Nov 19 2011 17:00:59 GMT+0100 (CET) 1321718459000 2011-11-19T16:00:59.000Z
+Sun Nov 20 2011 17:00:59 GMT+0100 (CET) 1321804859000 2011-11-20T16:00:59.000Z
+Mon Nov 21 2011 17:00:59 GMT+0100 (CET) 1321891259000 2011-11-21T16:00:59.000Z
+Tue Nov 22 2011 17:00:59 GMT+0100 (CET) 1321977659000 2011-11-22T16:00:59.000Z
+Wed Nov 23 2011 17:00:59 GMT+0100 (CET) 1322064059000 2011-11-23T16:00:59.000Z
+Thu Nov 24 2011 17:00:59 GMT+0100 (CET) 1322150459000 2011-11-24T16:00:59.000Z
+Fri Nov 25 2011 17:00:59 GMT+0100 (CET) 1322236859000 2011-11-25T16:00:59.000Z
+Sat Nov 26 2011 17:00:59 GMT+0100 (CET) 1322323259000 2011-11-26T16:00:59.000Z
+Sun Nov 27 2011 17:00:59 GMT+0100 (CET) 1322409659000 2011-11-27T16:00:59.000Z
+Mon Nov 28 2011 17:00:59 GMT+0100 (CET) 1322496059000 2011-11-28T16:00:59.000Z
+Tue Nov 29 2011 17:00:59 GMT+0100 (CET) 1322582459000 2011-11-29T16:00:59.000Z
+Wed Nov 30 2011 17:00:59 GMT+0100 (CET) 1322668859000 2011-11-30T16:00:59.000Z
+Thu Dec 01 2011 17:00:59 GMT+0100 (CET) 1322755259000 2011-12-01T16:00:59.000Z
+Fri Dec 02 2011 17:00:59 GMT+0100 (CET) 1322841659000 2011-12-02T16:00:59.000Z
+Sat Dec 03 2011 17:00:59 GMT+0100 (CET) 1322928059000 2011-12-03T16:00:59.000Z
+Sun Dec 04 2011 17:00:59 GMT+0100 (CET) 1323014459000 2011-12-04T16:00:59.000Z
+Mon Dec 05 2011 17:00:59 GMT+0100 (CET) 1323100859000 2011-12-05T16:00:59.000Z
+Tue Dec 06 2011 17:00:59 GMT+0100 (CET) 1323187259000 2011-12-06T16:00:59.000Z
+Wed Dec 07 2011 17:00:59 GMT+0100 (CET) 1323273659000 2011-12-07T16:00:59.000Z
+Thu Dec 08 2011 17:00:59 GMT+0100 (CET) 1323360059000 2011-12-08T16:00:59.000Z
+Fri Dec 09 2011 17:00:59 GMT+0100 (CET) 1323446459000 2011-12-09T16:00:59.000Z
+Sat Dec 10 2011 17:00:59 GMT+0100 (CET) 1323532859000 2011-12-10T16:00:59.000Z
+Sun Dec 11 2011 17:00:59 GMT+0100 (CET) 1323619259000 2011-12-11T16:00:59.000Z
+Mon Dec 12 2011 17:00:59 GMT+0100 (CET) 1323705659000 2011-12-12T16:00:59.000Z
+Tue Dec 13 2011 17:00:59 GMT+0100 (CET) 1323792059000 2011-12-13T16:00:59.000Z
+Wed Dec 14 2011 17:00:59 GMT+0100 (CET) 1323878459000 2011-12-14T16:00:59.000Z
+Thu Dec 15 2011 17:00:59 GMT+0100 (CET) 1323964859000 2011-12-15T16:00:59.000Z
+Fri Dec 16 2011 17:00:59 GMT+0100 (CET) 1324051259000 2011-12-16T16:00:59.000Z
+Sat Dec 17 2011 17:00:59 GMT+0100 (CET) 1324137659000 2011-12-17T16:00:59.000Z
+Sun Dec 18 2011 17:00:59 GMT+0100 (CET) 1324224059000 2011-12-18T16:00:59.000Z
+Mon Dec 19 2011 17:00:59 GMT+0100 (CET) 1324310459000 2011-12-19T16:00:59.000Z
+Tue Dec 20 2011 17:00:59 GMT+0100 (CET) 1324396859000 2011-12-20T16:00:59.000Z
+Wed Dec 21 2011 17:00:59 GMT+0100 (CET) 1324483259000 2011-12-21T16:00:59.000Z
+Thu Dec 22 2011 17:00:59 GMT+0100 (CET) 1324569659000 2011-12-22T16:00:59.000Z
+Fri Dec 23 2011 17:00:59 GMT+0100 (CET) 1324656059000 2011-12-23T16:00:59.000Z
+Sat Dec 24 2011 17:00:59 GMT+0100 (CET) 1324742459000 2011-12-24T16:00:59.000Z
+Sun Dec 25 2011 17:00:59 GMT+0100 (CET) 1324828859000 2011-12-25T16:00:59.000Z
+Mon Dec 26 2011 17:00:59 GMT+0100 (CET) 1324915259000 2011-12-26T16:00:59.000Z
+Tue Dec 27 2011 17:00:59 GMT+0100 (CET) 1325001659000 2011-12-27T16:00:59.000Z
+Wed Dec 28 2011 17:00:59 GMT+0100 (CET) 1325088059000 2011-12-28T16:00:59.000Z
+Thu Dec 29 2011 17:00:59 GMT+0100 (CET) 1325174459000 2011-12-29T16:00:59.000Z
+Fri Dec 30 2011 17:00:59 GMT+0100 (CET) 1325260859000 2011-12-30T16:00:59.000Z
+Sat Dec 31 2011 17:00:59 GMT+0100 (CET) 1325347259000 2011-12-31T16:00:59.000Z
+Sun Jan 01 2012 17:00:59 GMT+0100 (CET) 1325433659000 2012-01-01T16:00:59.000Z
+Mon Jan 02 2012 17:00:59 GMT+0100 (CET) 1325520059000 2012-01-02T16:00:59.000Z
+Tue Jan 03 2012 17:00:59 GMT+0100 (CET) 1325606459000 2012-01-03T16:00:59.000Z
+Wed Jan 04 2012 17:00:59 GMT+0100 (CET) 1325692859000 2012-01-04T16:00:59.000Z
+Thu Jan 05 2012 17:00:59 GMT+0100 (CET) 1325779259000 2012-01-05T16:00:59.000Z
+Fri Jan 06 2012 17:00:59 GMT+0100 (CET) 1325865659000 2012-01-06T16:00:59.000Z
+Sat Jan 07 2012 17:00:59 GMT+0100 (CET) 1325952059000 2012-01-07T16:00:59.000Z
+Sun Jan 08 2012 17:00:59 GMT+0100 (CET) 1326038459000 2012-01-08T16:00:59.000Z
+Mon Jan 09 2012 17:00:59 GMT+0100 (CET) 1326124859000 2012-01-09T16:00:59.000Z
+Tue Jan 10 2012 17:00:59 GMT+0100 (CET) 1326211259000 2012-01-10T16:00:59.000Z
+Wed Jan 11 2012 17:00:59 GMT+0100 (CET) 1326297659000 2012-01-11T16:00:59.000Z
+Thu Jan 12 2012 17:00:59 GMT+0100 (CET) 1326384059000 2012-01-12T16:00:59.000Z
+Fri Jan 13 2012 17:00:59 GMT+0100 (CET) 1326470459000 2012-01-13T16:00:59.000Z
+Sat Jan 14 2012 17:00:59 GMT+0100 (CET) 1326556859000 2012-01-14T16:00:59.000Z
+Wed Dec 21 2011 12:30:10 GMT+0100 (CET) 1324467010500 2011-12-21T11:30:10.500Z
+Thu Dec 22 2011 12:30:10 GMT+0100 (CET) 1324553410500 2011-12-22T11:30:10.500Z
+Fri Dec 23 2011 12:30:10 GMT+0100 (CET) 1324639810500 2011-12-23T11:30:10.500Z
+Sat Dec 24 2011 12:30:10 GMT+0100 (CET) 1324726210500 2011-12-24T11:30:10.500Z
+Sun Dec 25 2011 12:30:10 GMT+0100 (CET) 1324812610500 2011-12-25T11:30:10.500Z
+Mon Dec 26 2011 12:30:10 GMT+0100 (CET) 1324899010500 2011-12-26T11:30:10.500Z
+Tue Dec 27 2011 12:30:10 GMT+0100 (CET) 1324985410500 2011-12-27T11:30:10.500Z
+Wed Dec 28 2011 12:30:10 GMT+0100 (CET) 1325071810500 2011-12-28T11:30:10.500Z
+Thu Dec 29 2011 12:30:10 GMT+0100 (CET) 1325158210500 2011-12-29T11:30:10.500Z
+Fri Dec 30 2011 12:30:10 GMT+0100 (CET) 1325244610500 2011-12-30T11:30:10.500Z
+Sat Dec 31 2011 12:30:10 GMT+0100 (CET) 1325331010500 2011-12-31T11:30:10.500Z
+Sun Jan 01 2012 12:30:10 GMT+0100 (CET) 1325417410500 2012-01-01T11:30:10.500Z
+Mon Jan 02 2012 12:30:10 GMT+0100 (CET) 1325503810500 2012-01-02T11:30:10.500Z
+Tue Jan 03 2012 12:30:10 GMT+0100 (CET) 1325590210500 2012-01-03T11:30:10.500Z
+Wed Jan 04 2012 12:30:10 GMT+0100 (CET) 1325676610500 2012-01-04T11:30:10.500Z
+Thu Jan 05 2012 12:30:10 GMT+0100 (CET) 1325763010500 2012-01-05T11:30:10.500Z
+Fri Jan 06 2012 12:30:10 GMT+0100 (CET) 1325849410500 2012-01-06T11:30:10.500Z
+Sat Jan 07 2012 12:30:10 GMT+0100 (CET) 1325935810500 2012-01-07T11:30:10.500Z
+Sun Jan 08 2012 12:30:10 GMT+0100 (CET) 1326022210500 2012-01-08T11:30:10.500Z
+Mon Jan 09 2012 12:30:10 GMT+0100 (CET) 1326108610500 2012-01-09T11:30:10.500Z
+Tue Jan 10 2012 12:30:10 GMT+0100 (CET) 1326195010500 2012-01-10T11:30:10.500Z
+Wed Jan 11 2012 12:30:10 GMT+0100 (CET) 1326281410500 2012-01-11T11:30:10.500Z
+Thu Jan 12 2012 12:30:10 GMT+0100 (CET) 1326367810500 2012-01-12T11:30:10.500Z
+Fri Jan 13 2012 12:30:10 GMT+0100 (CET) 1326454210500 2012-01-13T11:30:10.500Z
+Sat Jan 14 2012 12:30:10 GMT+0100 (CET) 1326540610500 2012-01-14T11:30:10.500Z
+Sun Jan 15 2012 12:30:10 GMT+0100 (CET) 1326627010500 2012-01-15T11:30:10.500Z
+Mon Jan 16 2012 12:30:10 GMT+0100 (CET) 1326713410500 2012-01-16T11:30:10.500Z
+Tue Jan 17 2012 12:30:10 GMT+0100 (CET) 1326799810500 2012-01-17T11:30:10.500Z
+Wed Jan 18 2012 12:30:10 GMT+0100 (CET) 1326886210500 2012-01-18T11:30:10.500Z
+Thu Jan 19 2012 12:30:10 GMT+0100 (CET) 1326972610500 2012-01-19T11:30:10.500Z
+Fri Jan 20 2012 12:30:10 GMT+0100 (CET) 1327059010500 2012-01-20T11:30:10.500Z
+Sat Jan 21 2012 12:30:10 GMT+0100 (CET) 1327145410500 2012-01-21T11:30:10.500Z
+Sun Jan 22 2012 12:30:10 GMT+0100 (CET) 1327231810500 2012-01-22T11:30:10.500Z
+Mon Jan 23 2012 12:30:10 GMT+0100 (CET) 1327318210500 2012-01-23T11:30:10.500Z
+Tue Jan 24 2012 12:30:10 GMT+0100 (CET) 1327404610500 2012-01-24T11:30:10.500Z
+Wed Jan 25 2012 12:30:10 GMT+0100 (CET) 1327491010500 2012-01-25T11:30:10.500Z
+Thu Jan 26 2012 12:30:10 GMT+0100 (CET) 1327577410500 2012-01-26T11:30:10.500Z
+Fri Jan 27 2012 12:30:10 GMT+0100 (CET) 1327663810500 2012-01-27T11:30:10.500Z
+Sat Jan 28 2012 12:30:10 GMT+0100 (CET) 1327750210500 2012-01-28T11:30:10.500Z
+Sun Jan 29 2012 12:30:10 GMT+0100 (CET) 1327836610500 2012-01-29T11:30:10.500Z
+Mon Jan 30 2012 12:30:10 GMT+0100 (CET) 1327923010500 2012-01-30T11:30:10.500Z
+Tue Jan 31 2012 12:30:10 GMT+0100 (CET) 1328009410500 2012-01-31T11:30:10.500Z
+Wed Feb 01 2012 12:30:10 GMT+0100 (CET) 1328095810500 2012-02-01T11:30:10.500Z
+Thu Feb 02 2012 12:30:10 GMT+0100 (CET) 1328182210500 2012-02-02T11:30:10.500Z
+Fri Feb 03 2012 12:30:10 GMT+0100 (CET) 1328268610500 2012-02-03T11:30:10.500Z
+Sat Feb 04 2012 12:30:10 GMT+0100 (CET) 1328355010500 2012-02-04T11:30:10.500Z
+Sun Feb 05 2012 12:30:10 GMT+0100 (CET) 1328441410500 2012-02-05T11:30:10.500Z
+Mon Feb 06 2012 12:30:10 GMT+0100 (CET) 1328527810500 2012-02-06T11:30:10.500Z
+Tue Feb 07 2012 12:30:10 GMT+0100 (CET) 1328614210500 2012-02-07T11:30:10.500Z
+Wed Feb 08 2012 12:30:10 GMT+0100 (CET) 1328700610500 2012-02-08T11:30:10.500Z
+Thu Feb 09 2012 12:30:10 GMT+0100 (CET) 1328787010500 2012-02-09T11:30:10.500Z
+Fri Feb 10 2012 12:30:10 GMT+0100 (CET) 1328873410500 2012-02-10T11:30:10.500Z
+Sat Feb 11 2012 12:30:10 GMT+0100 (CET) 1328959810500 2012-02-11T11:30:10.500Z
+Sun Feb 12 2012 12:30:10 GMT+0100 (CET) 1329046210500 2012-02-12T11:30:10.500Z
+Mon Feb 13 2012 12:30:10 GMT+0100 (CET) 1329132610500 2012-02-13T11:30:10.500Z
+Tue Feb 14 2012 12:30:10 GMT+0100 (CET) 1329219010500 2012-02-14T11:30:10.500Z
+Wed Feb 15 2012 12:30:10 GMT+0100 (CET) 1329305410500 2012-02-15T11:30:10.500Z
+Thu Feb 16 2012 12:30:10 GMT+0100 (CET) 1329391810500 2012-02-16T11:30:10.500Z
+Fri Feb 17 2012 12:30:10 GMT+0100 (CET) 1329478210500 2012-02-17T11:30:10.500Z
+Sat Feb 18 2012 12:30:10 GMT+0100 (CET) 1329564610500 2012-02-18T11:30:10.500Z
+Sun Feb 19 2012 12:30:10 GMT+0100 (CET) 1329651010500 2012-02-19T11:30:10.500Z
+Mon Feb 20 2012 12:30:10 GMT+0100 (CET) 1329737410500 2012-02-20T11:30:10.500Z
+Tue Feb 21 2012 12:30:10 GMT+0100 (CET) 1329823810500 2012-02-21T11:30:10.500Z
+Wed Feb 22 2012 12:30:10 GMT+0100 (CET) 1329910210500 2012-02-22T11:30:10.500Z
+Thu Feb 23 2012 12:30:10 GMT+0100 (CET) 1329996610500 2012-02-23T11:30:10.500Z
+Fri Feb 24 2012 12:30:10 GMT+0100 (CET) 1330083010500 2012-02-24T11:30:10.500Z
+Sat Feb 25 2012 12:30:10 GMT+0100 (CET) 1330169410500 2012-02-25T11:30:10.500Z
+Sun Feb 26 2012 12:30:10 GMT+0100 (CET) 1330255810500 2012-02-26T11:30:10.500Z
+Mon Feb 27 2012 12:30:10 GMT+0100 (CET) 1330342210500 2012-02-27T11:30:10.500Z
+Tue Feb 28 2012 12:30:10 GMT+0100 (CET) 1330428610500 2012-02-28T11:30:10.500Z
+Wed Feb 29 2012 12:30:10 GMT+0100 (CET) 1330515010500 2012-02-29T11:30:10.500Z
+Thu Mar 01 2012 12:30:10 GMT+0100 (CET) 1330601410500 2012-03-01T11:30:10.500Z
+Fri Mar 02 2012 12:30:10 GMT+0100 (CET) 1330687810500 2012-03-02T11:30:10.500Z
+Sat Mar 03 2012 12:30:10 GMT+0100 (CET) 1330774210500 2012-03-03T11:30:10.500Z
+Sun Mar 04 2012 12:30:10 GMT+0100 (CET) 1330860610500 2012-03-04T11:30:10.500Z
+Mon Mar 05 2012 12:30:10 GMT+0100 (CET) 1330947010500 2012-03-05T11:30:10.500Z
+Tue Mar 06 2012 12:30:10 GMT+0100 (CET) 1331033410500 2012-03-06T11:30:10.500Z
+Wed Mar 07 2012 12:30:10 GMT+0100 (CET) 1331119810500 2012-03-07T11:30:10.500Z
+Thu Mar 08 2012 12:30:10 GMT+0100 (CET) 1331206210500 2012-03-08T11:30:10.500Z
+Fri Mar 09 2012 12:30:10 GMT+0100 (CET) 1331292610500 2012-03-09T11:30:10.500Z
+Sat Mar 10 2012 12:30:10 GMT+0100 (CET) 1331379010500 2012-03-10T11:30:10.500Z
+Sun Mar 11 2012 12:30:10 GMT+0100 (CET) 1331465410500 2012-03-11T11:30:10.500Z
+Mon Mar 12 2012 12:30:10 GMT+0100 (CET) 1331551810500 2012-03-12T11:30:10.500Z
+Tue Mar 13 2012 12:30:10 GMT+0100 (CET) 1331638210500 2012-03-13T11:30:10.500Z
+Wed Mar 14 2012 12:30:10 GMT+0100 (CET) 1331724610500 2012-03-14T11:30:10.500Z
+Thu Mar 15 2012 12:30:10 GMT+0100 (CET) 1331811010500 2012-03-15T11:30:10.500Z
+Fri Mar 16 2012 12:30:10 GMT+0100 (CET) 1331897410500 2012-03-16T11:30:10.500Z
+Sat Mar 17 2012 12:30:10 GMT+0100 (CET) 1331983810500 2012-03-17T11:30:10.500Z
+Sun Mar 18 2012 12:30:10 GMT+0100 (CET) 1332070210500 2012-03-18T11:30:10.500Z
+Mon Mar 19 2012 12:30:10 GMT+0100 (CET) 1332156610500 2012-03-19T11:30:10.500Z
+Tue Mar 20 2012 12:30:10 GMT+0100 (CET) 1332243010500 2012-03-20T11:30:10.500Z
+Wed Mar 21 2012 12:30:10 GMT+0100 (CET) 1332329410500 2012-03-21T11:30:10.500Z
+Thu Mar 22 2012 12:30:10 GMT+0100 (CET) 1332415810500 2012-03-22T11:30:10.500Z
+Fri Mar 23 2012 12:30:10 GMT+0100 (CET) 1332502210500 2012-03-23T11:30:10.500Z
+Sat Mar 24 2012 12:30:10 GMT+0100 (CET) 1332588610500 2012-03-24T11:30:10.500Z
+Sun Mar 25 2012 12:30:10 GMT+0200 (CEST) 1332671410500 2012-03-25T10:30:10.500Z
+Mon Mar 26 2012 12:30:10 GMT+0200 (CEST) 1332757810500 2012-03-26T10:30:10.500Z
+Tue Mar 27 2012 12:30:10 GMT+0200 (CEST) 1332844210500 2012-03-27T10:30:10.500Z
+Wed Mar 28 2012 12:30:10 GMT+0200 (CEST) 1332930610500 2012-03-28T10:30:10.500Z
+Thu Mar 29 2012 12:30:10 GMT+0200 (CEST) 1333017010500 2012-03-29T10:30:10.500Z
+Fri Mar 30 2012 12:30:10 GMT+0200 (CEST) 1333103410500 2012-03-30T10:30:10.500Z
+Sat Mar 31 2012 12:30:10 GMT+0200 (CEST) 1333189810500 2012-03-31T10:30:10.500Z
+Sun Apr 01 2012 12:30:10 GMT+0200 (CEST) 1333276210500 2012-04-01T10:30:10.500Z
+Mon Apr 02 2012 12:30:10 GMT+0200 (CEST) 1333362610500 2012-04-02T10:30:10.500Z
+Tue Apr 03 2012 12:30:10 GMT+0200 (CEST) 1333449010500 2012-04-03T10:30:10.500Z
+Wed Apr 04 2012 12:30:10 GMT+0200 (CEST) 1333535410500 2012-04-04T10:30:10.500Z
+Thu Apr 05 2012 12:30:10 GMT+0200 (CEST) 1333621810500 2012-04-05T10:30:10.500Z
+Fri Apr 06 2012 12:30:10 GMT+0200 (CEST) 1333708210500 2012-04-06T10:30:10.500Z
+Sat Apr 07 2012 12:30:10 GMT+0200 (CEST) 1333794610500 2012-04-07T10:30:10.500Z
+Sun Apr 08 2012 12:30:10 GMT+0200 (CEST) 1333881010500 2012-04-08T10:30:10.500Z
+Mon Apr 09 2012 12:30:10 GMT+0200 (CEST) 1333967410500 2012-04-09T10:30:10.500Z
+Tue Apr 10 2012 12:30:10 GMT+0200 (CEST) 1334053810500 2012-04-10T10:30:10.500Z
+Wed Apr 11 2012 12:30:10 GMT+0200 (CEST) 1334140210500 2012-04-11T10:30:10.500Z
+Thu Apr 12 2012 12:30:10 GMT+0200 (CEST) 1334226610500 2012-04-12T10:30:10.500Z
+Fri Apr 13 2012 12:30:10 GMT+0200 (CEST) 1334313010500 2012-04-13T10:30:10.500Z
+Sat Apr 14 2012 12:30:10 GMT+0200 (CEST) 1334399410500 2012-04-14T10:30:10.500Z
+Sun Apr 15 2012 12:30:10 GMT+0200 (CEST) 1334485810500 2012-04-15T10:30:10.500Z
+Mon Apr 16 2012 12:30:10 GMT+0200 (CEST) 1334572210500 2012-04-16T10:30:10.500Z
+Tue Apr 17 2012 12:30:10 GMT+0200 (CEST) 1334658610500 2012-04-17T10:30:10.500Z
+Wed Apr 18 2012 12:30:10 GMT+0200 (CEST) 1334745010500 2012-04-18T10:30:10.500Z
+Thu Apr 19 2012 12:30:10 GMT+0200 (CEST) 1334831410500 2012-04-19T10:30:10.500Z
+Fri Apr 20 2012 12:30:10 GMT+0200 (CEST) 1334917810500 2012-04-20T10:30:10.500Z
+Sat Apr 21 2012 12:30:10 GMT+0200 (CEST) 1335004210500 2012-04-21T10:30:10.500Z
+Sun Apr 22 2012 12:30:10 GMT+0200 (CEST) 1335090610500 2012-04-22T10:30:10.500Z
+Mon Apr 23 2012 12:30:10 GMT+0200 (CEST) 1335177010500 2012-04-23T10:30:10.500Z
+Tue Apr 24 2012 12:30:10 GMT+0200 (CEST) 1335263410500 2012-04-24T10:30:10.500Z
+Wed Apr 25 2012 12:30:10 GMT+0200 (CEST) 1335349810500 2012-04-25T10:30:10.500Z
+Thu Apr 26 2012 12:30:10 GMT+0200 (CEST) 1335436210500 2012-04-26T10:30:10.500Z
+Fri Apr 27 2012 12:30:10 GMT+0200 (CEST) 1335522610500 2012-04-27T10:30:10.500Z
+Sat Apr 28 2012 12:30:10 GMT+0200 (CEST) 1335609010500 2012-04-28T10:30:10.500Z
+Sun Apr 29 2012 12:30:10 GMT+0200 (CEST) 1335695410500 2012-04-29T10:30:10.500Z
+Mon Apr 30 2012 12:30:10 GMT+0200 (CEST) 1335781810500 2012-04-30T10:30:10.500Z
+Tue May 01 2012 12:30:10 GMT+0200 (CEST) 1335868210500 2012-05-01T10:30:10.500Z
+Wed May 02 2012 12:30:10 GMT+0200 (CEST) 1335954610500 2012-05-02T10:30:10.500Z
+Thu May 03 2012 12:30:10 GMT+0200 (CEST) 1336041010500 2012-05-03T10:30:10.500Z
+Fri May 04 2012 12:30:10 GMT+0200 (CEST) 1336127410500 2012-05-04T10:30:10.500Z
+Sat May 05 2012 12:30:10 GMT+0200 (CEST) 1336213810500 2012-05-05T10:30:10.500Z
+Sun May 06 2012 12:30:10 GMT+0200 (CEST) 1336300210500 2012-05-06T10:30:10.500Z
+Mon May 07 2012 12:30:10 GMT+0200 (CEST) 1336386610500 2012-05-07T10:30:10.500Z
+Tue May 08 2012 12:30:10 GMT+0200 (CEST) 1336473010500 2012-05-08T10:30:10.500Z
+Wed May 09 2012 12:30:10 GMT+0200 (CEST) 1336559410500 2012-05-09T10:30:10.500Z
+Thu May 10 2012 12:30:10 GMT+0200 (CEST) 1336645810500 2012-05-10T10:30:10.500Z
+Fri May 11 2012 12:30:10 GMT+0200 (CEST) 1336732210500 2012-05-11T10:30:10.500Z
+Sat May 12 2012 12:30:10 GMT+0200 (CEST) 1336818610500 2012-05-12T10:30:10.500Z
+Sun May 13 2012 12:30:10 GMT+0200 (CEST) 1336905010500 2012-05-13T10:30:10.500Z
+Mon May 14 2012 12:30:10 GMT+0200 (CEST) 1336991410500 2012-05-14T10:30:10.500Z
+Tue May 15 2012 12:30:10 GMT+0200 (CEST) 1337077810500 2012-05-15T10:30:10.500Z
+Wed May 16 2012 12:30:10 GMT+0200 (CEST) 1337164210500 2012-05-16T10:30:10.500Z
+Thu May 17 2012 12:30:10 GMT+0200 (CEST) 1337250610500 2012-05-17T10:30:10.500Z
+Fri May 18 2012 12:30:10 GMT+0200 (CEST) 1337337010500 2012-05-18T10:30:10.500Z
+Sat May 19 2012 12:30:10 GMT+0200 (CEST) 1337423410500 2012-05-19T10:30:10.500Z
+Sun May 20 2012 12:30:10 GMT+0200 (CEST) 1337509810500 2012-05-20T10:30:10.500Z
+Mon May 21 2012 12:30:10 GMT+0200 (CEST) 1337596210500 2012-05-21T10:30:10.500Z
+Tue May 22 2012 12:30:10 GMT+0200 (CEST) 1337682610500 2012-05-22T10:30:10.500Z
+Wed May 23 2012 12:30:10 GMT+0200 (CEST) 1337769010500 2012-05-23T10:30:10.500Z
+Thu May 24 2012 12:30:10 GMT+0200 (CEST) 1337855410500 2012-05-24T10:30:10.500Z
+Fri May 25 2012 12:30:10 GMT+0200 (CEST) 1337941810500 2012-05-25T10:30:10.500Z
+Sat May 26 2012 12:30:10 GMT+0200 (CEST) 1338028210500 2012-05-26T10:30:10.500Z
+Sun May 27 2012 12:30:10 GMT+0200 (CEST) 1338114610500 2012-05-27T10:30:10.500Z
+Mon May 28 2012 12:30:10 GMT+0200 (CEST) 1338201010500 2012-05-28T10:30:10.500Z
+Tue May 29 2012 12:30:10 GMT+0200 (CEST) 1338287410500 2012-05-29T10:30:10.500Z
+Wed May 30 2012 12:30:10 GMT+0200 (CEST) 1338373810500 2012-05-30T10:30:10.500Z
+Thu May 31 2012 12:30:10 GMT+0200 (CEST) 1338460210500 2012-05-31T10:30:10.500Z
+Fri Jun 01 2012 12:30:10 GMT+0200 (CEST) 1338546610500 2012-06-01T10:30:10.500Z
+Sat Jun 02 2012 12:30:10 GMT+0200 (CEST) 1338633010500 2012-06-02T10:30:10.500Z
+Sun Jun 03 2012 12:30:10 GMT+0200 (CEST) 1338719410500 2012-06-03T10:30:10.500Z
+Mon Jun 04 2012 12:30:10 GMT+0200 (CEST) 1338805810500 2012-06-04T10:30:10.500Z
+Tue Jun 05 2012 12:30:10 GMT+0200 (CEST) 1338892210500 2012-06-05T10:30:10.500Z
+Wed Jun 06 2012 12:30:10 GMT+0200 (CEST) 1338978610500 2012-06-06T10:30:10.500Z
+Thu Jun 07 2012 12:30:10 GMT+0200 (CEST) 1339065010500 2012-06-07T10:30:10.500Z
+Fri Jun 08 2012 12:30:10 GMT+0200 (CEST) 1339151410500 2012-06-08T10:30:10.500Z
+Sat Jun 09 2012 12:30:10 GMT+0200 (CEST) 1339237810500 2012-06-09T10:30:10.500Z
+Sun Jun 10 2012 12:30:10 GMT+0200 (CEST) 1339324210500 2012-06-10T10:30:10.500Z
+Mon Jun 11 2012 12:30:10 GMT+0200 (CEST) 1339410610500 2012-06-11T10:30:10.500Z
+Tue Jun 12 2012 12:30:10 GMT+0200 (CEST) 1339497010500 2012-06-12T10:30:10.500Z
+Wed Jun 13 2012 12:30:10 GMT+0200 (CEST) 1339583410500 2012-06-13T10:30:10.500Z
+Thu Jun 14 2012 12:30:10 GMT+0200 (CEST) 1339669810500 2012-06-14T10:30:10.500Z
+Fri Jun 15 2012 12:30:10 GMT+0200 (CEST) 1339756210500 2012-06-15T10:30:10.500Z
+Sat Jun 16 2012 12:30:10 GMT+0200 (CEST) 1339842610500 2012-06-16T10:30:10.500Z
+Sun Jun 17 2012 12:30:10 GMT+0200 (CEST) 1339929010500 2012-06-17T10:30:10.500Z
+Mon Jun 18 2012 12:30:10 GMT+0200 (CEST) 1340015410500 2012-06-18T10:30:10.500Z
+Tue Jun 19 2012 12:30:10 GMT+0200 (CEST) 1340101810500 2012-06-19T10:30:10.500Z
+Wed Jun 20 2012 12:30:10 GMT+0200 (CEST) 1340188210500 2012-06-20T10:30:10.500Z
+Thu Jun 21 2012 12:30:10 GMT+0200 (CEST) 1340274610500 2012-06-21T10:30:10.500Z
+Fri Jun 22 2012 12:30:10 GMT+0200 (CEST) 1340361010500 2012-06-22T10:30:10.500Z
+Sat Jun 23 2012 12:30:10 GMT+0200 (CEST) 1340447410500 2012-06-23T10:30:10.500Z
+Sun Jun 24 2012 12:30:10 GMT+0200 (CEST) 1340533810500 2012-06-24T10:30:10.500Z
+Mon Jun 25 2012 12:30:10 GMT+0200 (CEST) 1340620210500 2012-06-25T10:30:10.500Z
+Tue Jun 26 2012 12:30:10 GMT+0200 (CEST) 1340706610500 2012-06-26T10:30:10.500Z
+Wed Jun 27 2012 12:30:10 GMT+0200 (CEST) 1340793010500 2012-06-27T10:30:10.500Z
+Thu Jun 28 2012 12:30:10 GMT+0200 (CEST) 1340879410500 2012-06-28T10:30:10.500Z
+Fri Jun 29 2012 12:30:10 GMT+0200 (CEST) 1340965810500 2012-06-29T10:30:10.500Z
+Sat Jun 30 2012 12:30:10 GMT+0200 (CEST) 1341052210500 2012-06-30T10:30:10.500Z
+Sun Jul 01 2012 12:30:10 GMT+0200 (CEST) 1341138610500 2012-07-01T10:30:10.500Z
+Mon Jul 02 2012 12:30:10 GMT+0200 (CEST) 1341225010500 2012-07-02T10:30:10.500Z
+Tue Jul 03 2012 12:30:10 GMT+0200 (CEST) 1341311410500 2012-07-03T10:30:10.500Z
+Wed Jul 04 2012 12:30:10 GMT+0200 (CEST) 1341397810500 2012-07-04T10:30:10.500Z
+Thu Jul 05 2012 12:30:10 GMT+0200 (CEST) 1341484210500 2012-07-05T10:30:10.500Z
+Fri Jul 06 2012 12:30:10 GMT+0200 (CEST) 1341570610500 2012-07-06T10:30:10.500Z
+Sat Jul 07 2012 12:30:10 GMT+0200 (CEST) 1341657010500 2012-07-07T10:30:10.500Z
+Sun Jul 08 2012 12:30:10 GMT+0200 (CEST) 1341743410500 2012-07-08T10:30:10.500Z
+Mon Jul 09 2012 12:30:10 GMT+0200 (CEST) 1341829810500 2012-07-09T10:30:10.500Z
+Tue Jul 10 2012 12:30:10 GMT+0200 (CEST) 1341916210500 2012-07-10T10:30:10.500Z
+Wed Jul 11 2012 12:30:10 GMT+0200 (CEST) 1342002610500 2012-07-11T10:30:10.500Z
+Thu Jul 12 2012 12:30:10 GMT+0200 (CEST) 1342089010500 2012-07-12T10:30:10.500Z
+Fri Jul 13 2012 12:30:10 GMT+0200 (CEST) 1342175410500 2012-07-13T10:30:10.500Z
+Sat Jul 14 2012 12:30:10 GMT+0200 (CEST) 1342261810500 2012-07-14T10:30:10.500Z
+Sun Jul 15 2012 12:30:10 GMT+0200 (CEST) 1342348210500 2012-07-15T10:30:10.500Z
+Mon Jul 16 2012 12:30:10 GMT+0200 (CEST) 1342434610500 2012-07-16T10:30:10.500Z
+Tue Jul 17 2012 12:30:10 GMT+0200 (CEST) 1342521010500 2012-07-17T10:30:10.500Z
+Wed Jul 18 2012 12:30:10 GMT+0200 (CEST) 1342607410500 2012-07-18T10:30:10.500Z
+Thu Jul 19 2012 12:30:10 GMT+0200 (CEST) 1342693810500 2012-07-19T10:30:10.500Z
+Fri Jul 20 2012 12:30:10 GMT+0200 (CEST) 1342780210500 2012-07-20T10:30:10.500Z
+Sat Jul 21 2012 12:30:10 GMT+0200 (CEST) 1342866610500 2012-07-21T10:30:10.500Z
+Sun Jul 22 2012 12:30:10 GMT+0200 (CEST) 1342953010500 2012-07-22T10:30:10.500Z
+Mon Jul 23 2012 12:30:10 GMT+0200 (CEST) 1343039410500 2012-07-23T10:30:10.500Z
+Tue Jul 24 2012 12:30:10 GMT+0200 (CEST) 1343125810500 2012-07-24T10:30:10.500Z
+Wed Jul 25 2012 12:30:10 GMT+0200 (CEST) 1343212210500 2012-07-25T10:30:10.500Z
+Thu Jul 26 2012 12:30:10 GMT+0200 (CEST) 1343298610500 2012-07-26T10:30:10.500Z
+Fri Jul 27 2012 12:30:10 GMT+0200 (CEST) 1343385010500 2012-07-27T10:30:10.500Z
+Sat Jul 28 2012 12:30:10 GMT+0200 (CEST) 1343471410500 2012-07-28T10:30:10.500Z
+Sun Jul 29 2012 12:30:10 GMT+0200 (CEST) 1343557810500 2012-07-29T10:30:10.500Z
+Mon Jul 30 2012 12:30:10 GMT+0200 (CEST) 1343644210500 2012-07-30T10:30:10.500Z
+Tue Jul 31 2012 12:30:10 GMT+0200 (CEST) 1343730610500 2012-07-31T10:30:10.500Z
+Wed Aug 01 2012 12:30:10 GMT+0200 (CEST) 1343817010500 2012-08-01T10:30:10.500Z
+Thu Aug 02 2012 12:30:10 GMT+0200 (CEST) 1343903410500 2012-08-02T10:30:10.500Z
+Fri Aug 03 2012 12:30:10 GMT+0200 (CEST) 1343989810500 2012-08-03T10:30:10.500Z
+Sat Aug 04 2012 12:30:10 GMT+0200 (CEST) 1344076210500 2012-08-04T10:30:10.500Z
+Sun Aug 05 2012 12:30:10 GMT+0200 (CEST) 1344162610500 2012-08-05T10:30:10.500Z
+Mon Aug 06 2012 12:30:10 GMT+0200 (CEST) 1344249010500 2012-08-06T10:30:10.500Z
+Tue Aug 07 2012 12:30:10 GMT+0200 (CEST) 1344335410500 2012-08-07T10:30:10.500Z
+Wed Aug 08 2012 12:30:10 GMT+0200 (CEST) 1344421810500 2012-08-08T10:30:10.500Z
+Thu Aug 09 2012 12:30:10 GMT+0200 (CEST) 1344508210500 2012-08-09T10:30:10.500Z
+Fri Aug 10 2012 12:30:10 GMT+0200 (CEST) 1344594610500 2012-08-10T10:30:10.500Z
+Sat Aug 11 2012 12:30:10 GMT+0200 (CEST) 1344681010500 2012-08-11T10:30:10.500Z
+Sun Aug 12 2012 12:30:10 GMT+0200 (CEST) 1344767410500 2012-08-12T10:30:10.500Z
+Mon Aug 13 2012 12:30:10 GMT+0200 (CEST) 1344853810500 2012-08-13T10:30:10.500Z
+Tue Aug 14 2012 12:30:10 GMT+0200 (CEST) 1344940210500 2012-08-14T10:30:10.500Z
+Wed Aug 15 2012 12:30:10 GMT+0200 (CEST) 1345026610500 2012-08-15T10:30:10.500Z
+Thu Aug 16 2012 12:30:10 GMT+0200 (CEST) 1345113010500 2012-08-16T10:30:10.500Z
+Fri Aug 17 2012 12:30:10 GMT+0200 (CEST) 1345199410500 2012-08-17T10:30:10.500Z
+Sat Aug 18 2012 12:30:10 GMT+0200 (CEST) 1345285810500 2012-08-18T10:30:10.500Z
+Sun Aug 19 2012 12:30:10 GMT+0200 (CEST) 1345372210500 2012-08-19T10:30:10.500Z
+Mon Aug 20 2012 12:30:10 GMT+0200 (CEST) 1345458610500 2012-08-20T10:30:10.500Z
+Tue Aug 21 2012 12:30:10 GMT+0200 (CEST) 1345545010500 2012-08-21T10:30:10.500Z
+Wed Aug 22 2012 12:30:10 GMT+0200 (CEST) 1345631410500 2012-08-22T10:30:10.500Z
+Thu Aug 23 2012 12:30:10 GMT+0200 (CEST) 1345717810500 2012-08-23T10:30:10.500Z
+Fri Aug 24 2012 12:30:10 GMT+0200 (CEST) 1345804210500 2012-08-24T10:30:10.500Z
+Sat Aug 25 2012 12:30:10 GMT+0200 (CEST) 1345890610500 2012-08-25T10:30:10.500Z
+Sun Aug 26 2012 12:30:10 GMT+0200 (CEST) 1345977010500 2012-08-26T10:30:10.500Z
+Mon Aug 27 2012 12:30:10 GMT+0200 (CEST) 1346063410500 2012-08-27T10:30:10.500Z
+Tue Aug 28 2012 12:30:10 GMT+0200 (CEST) 1346149810500 2012-08-28T10:30:10.500Z
+Wed Aug 29 2012 12:30:10 GMT+0200 (CEST) 1346236210500 2012-08-29T10:30:10.500Z
+Thu Aug 30 2012 12:30:10 GMT+0200 (CEST) 1346322610500 2012-08-30T10:30:10.500Z
+Fri Aug 31 2012 12:30:10 GMT+0200 (CEST) 1346409010500 2012-08-31T10:30:10.500Z
+Sat Sep 01 2012 12:30:10 GMT+0200 (CEST) 1346495410500 2012-09-01T10:30:10.500Z
+Sun Sep 02 2012 12:30:10 GMT+0200 (CEST) 1346581810500 2012-09-02T10:30:10.500Z
+Mon Sep 03 2012 12:30:10 GMT+0200 (CEST) 1346668210500 2012-09-03T10:30:10.500Z
+Tue Sep 04 2012 12:30:10 GMT+0200 (CEST) 1346754610500 2012-09-04T10:30:10.500Z
+Wed Sep 05 2012 12:30:10 GMT+0200 (CEST) 1346841010500 2012-09-05T10:30:10.500Z
+Thu Sep 06 2012 12:30:10 GMT+0200 (CEST) 1346927410500 2012-09-06T10:30:10.500Z
+Fri Sep 07 2012 12:30:10 GMT+0200 (CEST) 1347013810500 2012-09-07T10:30:10.500Z
+Sat Sep 08 2012 12:30:10 GMT+0200 (CEST) 1347100210500 2012-09-08T10:30:10.500Z
+Sun Sep 09 2012 12:30:10 GMT+0200 (CEST) 1347186610500 2012-09-09T10:30:10.500Z
+Mon Sep 10 2012 12:30:10 GMT+0200 (CEST) 1347273010500 2012-09-10T10:30:10.500Z
+Tue Sep 11 2012 12:30:10 GMT+0200 (CEST) 1347359410500 2012-09-11T10:30:10.500Z
+Wed Sep 12 2012 12:30:10 GMT+0200 (CEST) 1347445810500 2012-09-12T10:30:10.500Z
+Thu Sep 13 2012 12:30:10 GMT+0200 (CEST) 1347532210500 2012-09-13T10:30:10.500Z
+Fri Sep 14 2012 12:30:10 GMT+0200 (CEST) 1347618610500 2012-09-14T10:30:10.500Z
+Sat Sep 15 2012 12:30:10 GMT+0200 (CEST) 1347705010500 2012-09-15T10:30:10.500Z
+Sun Sep 16 2012 12:30:10 GMT+0200 (CEST) 1347791410500 2012-09-16T10:30:10.500Z
+Mon Sep 17 2012 12:30:10 GMT+0200 (CEST) 1347877810500 2012-09-17T10:30:10.500Z
+Tue Sep 18 2012 12:30:10 GMT+0200 (CEST) 1347964210500 2012-09-18T10:30:10.500Z
+Wed Sep 19 2012 12:30:10 GMT+0200 (CEST) 1348050610500 2012-09-19T10:30:10.500Z
+Thu Sep 20 2012 12:30:10 GMT+0200 (CEST) 1348137010500 2012-09-20T10:30:10.500Z
+Fri Sep 21 2012 12:30:10 GMT+0200 (CEST) 1348223410500 2012-09-21T10:30:10.500Z
+Sat Sep 22 2012 12:30:10 GMT+0200 (CEST) 1348309810500 2012-09-22T10:30:10.500Z
+Sun Sep 23 2012 12:30:10 GMT+0200 (CEST) 1348396210500 2012-09-23T10:30:10.500Z
+Mon Sep 24 2012 12:30:10 GMT+0200 (CEST) 1348482610500 2012-09-24T10:30:10.500Z
+Tue Sep 25 2012 12:30:10 GMT+0200 (CEST) 1348569010500 2012-09-25T10:30:10.500Z
+Wed Sep 26 2012 12:30:10 GMT+0200 (CEST) 1348655410500 2012-09-26T10:30:10.500Z
+Thu Sep 27 2012 12:30:10 GMT+0200 (CEST) 1348741810500 2012-09-27T10:30:10.500Z
+Fri Sep 28 2012 12:30:10 GMT+0200 (CEST) 1348828210500 2012-09-28T10:30:10.500Z
+Sat Sep 29 2012 12:30:10 GMT+0200 (CEST) 1348914610500 2012-09-29T10:30:10.500Z
+Sun Sep 30 2012 12:30:10 GMT+0200 (CEST) 1349001010500 2012-09-30T10:30:10.500Z
+Mon Oct 01 2012 12:30:10 GMT+0200 (CEST) 1349087410500 2012-10-01T10:30:10.500Z
+Tue Oct 02 2012 12:30:10 GMT+0200 (CEST) 1349173810500 2012-10-02T10:30:10.500Z
+Wed Oct 03 2012 12:30:10 GMT+0200 (CEST) 1349260210500 2012-10-03T10:30:10.500Z
+Thu Oct 04 2012 12:30:10 GMT+0200 (CEST) 1349346610500 2012-10-04T10:30:10.500Z
+Fri Oct 05 2012 12:30:10 GMT+0200 (CEST) 1349433010500 2012-10-05T10:30:10.500Z
+Sat Oct 06 2012 12:30:10 GMT+0200 (CEST) 1349519410500 2012-10-06T10:30:10.500Z
+Sun Oct 07 2012 12:30:10 GMT+0200 (CEST) 1349605810500 2012-10-07T10:30:10.500Z
+Mon Oct 08 2012 12:30:10 GMT+0200 (CEST) 1349692210500 2012-10-08T10:30:10.500Z
+Tue Oct 09 2012 12:30:10 GMT+0200 (CEST) 1349778610500 2012-10-09T10:30:10.500Z
+Wed Oct 10 2012 12:30:10 GMT+0200 (CEST) 1349865010500 2012-10-10T10:30:10.500Z
+Thu Oct 11 2012 12:30:10 GMT+0200 (CEST) 1349951410500 2012-10-11T10:30:10.500Z
+Fri Oct 12 2012 12:30:10 GMT+0200 (CEST) 1350037810500 2012-10-12T10:30:10.500Z
+Sat Oct 13 2012 12:30:10 GMT+0200 (CEST) 1350124210500 2012-10-13T10:30:10.500Z
+Sun Oct 14 2012 12:30:10 GMT+0200 (CEST) 1350210610500 2012-10-14T10:30:10.500Z
+Mon Oct 15 2012 12:30:10 GMT+0200 (CEST) 1350297010500 2012-10-15T10:30:10.500Z
+Tue Oct 16 2012 12:30:10 GMT+0200 (CEST) 1350383410500 2012-10-16T10:30:10.500Z
+Wed Oct 17 2012 12:30:10 GMT+0200 (CEST) 1350469810500 2012-10-17T10:30:10.500Z
+Thu Oct 18 2012 12:30:10 GMT+0200 (CEST) 1350556210500 2012-10-18T10:30:10.500Z
+Fri Oct 19 2012 12:30:10 GMT+0200 (CEST) 1350642610500 2012-10-19T10:30:10.500Z
+Sat Oct 20 2012 12:30:10 GMT+0200 (CEST) 1350729010500 2012-10-20T10:30:10.500Z
+Sun Oct 21 2012 12:30:10 GMT+0200 (CEST) 1350815410500 2012-10-21T10:30:10.500Z
+Mon Oct 22 2012 12:30:10 GMT+0200 (CEST) 1350901810500 2012-10-22T10:30:10.500Z
+Tue Oct 23 2012 12:30:10 GMT+0200 (CEST) 1350988210500 2012-10-23T10:30:10.500Z
+Wed Oct 24 2012 12:30:10 GMT+0200 (CEST) 1351074610500 2012-10-24T10:30:10.500Z
+Thu Oct 25 2012 12:30:10 GMT+0200 (CEST) 1351161010500 2012-10-25T10:30:10.500Z
+Fri Oct 26 2012 12:30:10 GMT+0200 (CEST) 1351247410500 2012-10-26T10:30:10.500Z
+Sat Oct 27 2012 12:30:10 GMT+0200 (CEST) 1351333810500 2012-10-27T10:30:10.500Z
+Sun Oct 28 2012 12:30:10 GMT+0100 (CET) 1351423810500 2012-10-28T11:30:10.500Z
+Mon Oct 29 2012 12:30:10 GMT+0100 (CET) 1351510210500 2012-10-29T11:30:10.500Z
+Tue Oct 30 2012 12:30:10 GMT+0100 (CET) 1351596610500 2012-10-30T11:30:10.500Z
+Wed Oct 31 2012 12:30:10 GMT+0100 (CET) 1351683010500 2012-10-31T11:30:10.500Z
+Thu Nov 01 2012 12:30:10 GMT+0100 (CET) 1351769410500 2012-11-01T11:30:10.500Z
+Fri Nov 02 2012 12:30:10 GMT+0100 (CET) 1351855810500 2012-11-02T11:30:10.500Z
+Sat Nov 03 2012 12:30:10 GMT+0100 (CET) 1351942210500 2012-11-03T11:30:10.500Z
+Sun Nov 04 2012 12:30:10 GMT+0100 (CET) 1352028610500 2012-11-04T11:30:10.500Z
+Mon Nov 05 2012 12:30:10 GMT+0100 (CET) 1352115010500 2012-11-05T11:30:10.500Z
+Tue Nov 06 2012 12:30:10 GMT+0100 (CET) 1352201410500 2012-11-06T11:30:10.500Z
+Wed Nov 07 2012 12:30:10 GMT+0100 (CET) 1352287810500 2012-11-07T11:30:10.500Z
+Thu Nov 08 2012 12:30:10 GMT+0100 (CET) 1352374210500 2012-11-08T11:30:10.500Z
+Fri Nov 09 2012 12:30:10 GMT+0100 (CET) 1352460610500 2012-11-09T11:30:10.500Z
+Sat Nov 10 2012 12:30:10 GMT+0100 (CET) 1352547010500 2012-11-10T11:30:10.500Z
+Sun Nov 11 2012 12:30:10 GMT+0100 (CET) 1352633410500 2012-11-11T11:30:10.500Z
+Mon Nov 12 2012 12:30:10 GMT+0100 (CET) 1352719810500 2012-11-12T11:30:10.500Z
+Tue Nov 13 2012 12:30:10 GMT+0100 (CET) 1352806210500 2012-11-13T11:30:10.500Z
+Wed Nov 14 2012 12:30:10 GMT+0100 (CET) 1352892610500 2012-11-14T11:30:10.500Z
+Thu Nov 15 2012 12:30:10 GMT+0100 (CET) 1352979010500 2012-11-15T11:30:10.500Z
+Fri Nov 16 2012 12:30:10 GMT+0100 (CET) 1353065410500 2012-11-16T11:30:10.500Z
+Sat Nov 17 2012 12:30:10 GMT+0100 (CET) 1353151810500 2012-11-17T11:30:10.500Z
+Sun Nov 18 2012 12:30:10 GMT+0100 (CET) 1353238210500 2012-11-18T11:30:10.500Z
+Mon Nov 19 2012 12:30:10 GMT+0100 (CET) 1353324610500 2012-11-19T11:30:10.500Z
+Tue Nov 20 2012 12:30:10 GMT+0100 (CET) 1353411010500 2012-11-20T11:30:10.500Z
+Wed Nov 21 2012 12:30:10 GMT+0100 (CET) 1353497410500 2012-11-21T11:30:10.500Z
+Thu Nov 22 2012 12:30:10 GMT+0100 (CET) 1353583810500 2012-11-22T11:30:10.500Z
+Fri Nov 23 2012 12:30:10 GMT+0100 (CET) 1353670210500 2012-11-23T11:30:10.500Z
+Sat Nov 24 2012 12:30:10 GMT+0100 (CET) 1353756610500 2012-11-24T11:30:10.500Z
+Sun Nov 25 2012 12:30:10 GMT+0100 (CET) 1353843010500 2012-11-25T11:30:10.500Z
+Mon Nov 26 2012 12:30:10 GMT+0100 (CET) 1353929410500 2012-11-26T11:30:10.500Z
+Tue Nov 27 2012 12:30:10 GMT+0100 (CET) 1354015810500 2012-11-27T11:30:10.500Z
+Wed Nov 28 2012 12:30:10 GMT+0100 (CET) 1354102210500 2012-11-28T11:30:10.500Z
+Thu Nov 29 2012 12:30:10 GMT+0100 (CET) 1354188610500 2012-11-29T11:30:10.500Z
+Fri Nov 30 2012 12:30:10 GMT+0100 (CET) 1354275010500 2012-11-30T11:30:10.500Z
+Sat Dec 01 2012 12:30:10 GMT+0100 (CET) 1354361410500 2012-12-01T11:30:10.500Z
+Sun Dec 02 2012 12:30:10 GMT+0100 (CET) 1354447810500 2012-12-02T11:30:10.500Z
+Mon Dec 03 2012 12:30:10 GMT+0100 (CET) 1354534210500 2012-12-03T11:30:10.500Z
+Tue Dec 04 2012 12:30:10 GMT+0100 (CET) 1354620610500 2012-12-04T11:30:10.500Z
+Wed Dec 05 2012 12:30:10 GMT+0100 (CET) 1354707010500 2012-12-05T11:30:10.500Z
+Thu Dec 06 2012 12:30:10 GMT+0100 (CET) 1354793410500 2012-12-06T11:30:10.500Z
+Fri Dec 07 2012 12:30:10 GMT+0100 (CET) 1354879810500 2012-12-07T11:30:10.500Z
+Sat Dec 08 2012 12:30:10 GMT+0100 (CET) 1354966210500 2012-12-08T11:30:10.500Z
+Sun Dec 09 2012 12:30:10 GMT+0100 (CET) 1355052610500 2012-12-09T11:30:10.500Z
+Mon Dec 10 2012 12:30:10 GMT+0100 (CET) 1355139010500 2012-12-10T11:30:10.500Z
+Tue Dec 11 2012 12:30:10 GMT+0100 (CET) 1355225410500 2012-12-11T11:30:10.500Z
+Wed Dec 12 2012 12:30:10 GMT+0100 (CET) 1355311810500 2012-12-12T11:30:10.500Z
+Thu Dec 13 2012 12:30:10 GMT+0100 (CET) 1355398210500 2012-12-13T11:30:10.500Z
+Fri Dec 14 2012 12:30:10 GMT+0100 (CET) 1355484610500 2012-12-14T11:30:10.500Z
+Sat Dec 15 2012 12:30:10 GMT+0100 (CET) 1355571010500 2012-12-15T11:30:10.500Z
+Sun Dec 16 2012 12:30:10 GMT+0100 (CET) 1355657410500 2012-12-16T11:30:10.500Z
+Mon Dec 17 2012 12:30:10 GMT+0100 (CET) 1355743810500 2012-12-17T11:30:10.500Z
+Tue Dec 18 2012 12:30:10 GMT+0100 (CET) 1355830210500 2012-12-18T11:30:10.500Z
+Wed Dec 19 2012 12:30:10 GMT+0100 (CET) 1355916610500 2012-12-19T11:30:10.500Z
+Thu Dec 20 2012 12:30:10 GMT+0100 (CET) 1356003010500 2012-12-20T11:30:10.500Z
+Fri Dec 21 2012 12:30:10 GMT+0100 (CET) 1356089410500 2012-12-21T11:30:10.500Z
+Sat Dec 22 2012 12:30:10 GMT+0100 (CET) 1356175810500 2012-12-22T11:30:10.500Z
+Sun Dec 23 2012 12:30:10 GMT+0100 (CET) 1356262210500 2012-12-23T11:30:10.500Z
+Mon Dec 24 2012 12:30:10 GMT+0100 (CET) 1356348610500 2012-12-24T11:30:10.500Z
+Tue Dec 25 2012 12:30:10 GMT+0100 (CET) 1356435010500 2012-12-25T11:30:10.500Z
+Wed Dec 26 2012 12:30:10 GMT+0100 (CET) 1356521410500 2012-12-26T11:30:10.500Z
+Thu Dec 27 2012 12:30:10 GMT+0100 (CET) 1356607810500 2012-12-27T11:30:10.500Z
+Fri Dec 28 2012 12:30:10 GMT+0100 (CET) 1356694210500 2012-12-28T11:30:10.500Z
+Sat Dec 29 2012 12:30:10 GMT+0100 (CET) 1356780610500 2012-12-29T11:30:10.500Z
+Sun Dec 30 2012 12:30:10 GMT+0100 (CET) 1356867010500 2012-12-30T11:30:10.500Z
+Mon Dec 31 2012 12:30:10 GMT+0100 (CET) 1356953410500 2012-12-31T11:30:10.500Z
+Tue Jan 01 2013 12:30:10 GMT+0100 (CET) 1357039810500 2013-01-01T11:30:10.500Z
+Wed Jan 02 2013 12:30:10 GMT+0100 (CET) 1357126210500 2013-01-02T11:30:10.500Z
+Thu Jan 03 2013 12:30:10 GMT+0100 (CET) 1357212610500 2013-01-03T11:30:10.500Z
+Fri Jan 04 2013 12:30:10 GMT+0100 (CET) 1357299010500 2013-01-04T11:30:10.500Z
+Sat Jan 05 2013 12:30:10 GMT+0100 (CET) 1357385410500 2013-01-05T11:30:10.500Z
+Sun Jan 06 2013 12:30:10 GMT+0100 (CET) 1357471810500 2013-01-06T11:30:10.500Z
+Mon Jan 07 2013 12:30:10 GMT+0100 (CET) 1357558210500 2013-01-07T11:30:10.500Z
+Tue Jan 08 2013 12:30:10 GMT+0100 (CET) 1357644610500 2013-01-08T11:30:10.500Z
+Wed Jan 09 2013 12:30:10 GMT+0100 (CET) 1357731010500 2013-01-09T11:30:10.500Z
+Thu Jan 10 2013 12:30:10 GMT+0100 (CET) 1357817410500 2013-01-10T11:30:10.500Z
+Fri Jan 11 2013 12:30:10 GMT+0100 (CET) 1357903810500 2013-01-11T11:30:10.500Z
+Sat Jan 12 2013 12:30:10 GMT+0100 (CET) 1357990210500 2013-01-12T11:30:10.500Z
+Sun Jan 13 2013 12:30:10 GMT+0100 (CET) 1358076610500 2013-01-13T11:30:10.500Z
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Thu Mar 01 2012 09:00:00 GMT+0100 (CET)
+ok Sun Jan 01 2012 09:00:00 GMT+0100 (CET)
+ok Sun Jan 01 2012 09:00:00 GMT+0100 (CET)
+ok Sun Jan 01 2012 09:00:00 GMT+0100 (CET)
+ok Sun Jan 01 2012 09:00:00 GMT+0100 (CET)
+ok Sun Jan 01 2012 09:00:00 GMT+0100 (CET)
+ok Sun Jan 01 2012 09:00:00 GMT+0100 (CET)
+ok Sun Jan 01 2012 09:00:00 GMT+0100 (CET)
+ok Sun Jan 01 2012 09:00:00 GMT+0100 (CET)
+ok Mon Dec 25 1995 10:00:00 GMT+0100 (CET)
+ok Mon Dec 25 1995 10:00:00 GMT+0100 (CET)
+ok Mon Dec 25 1995 10:00:00 GMT+0100 (CET)
+ok Mon Dec 25 1995 10:00:00 GMT+0100 (CET)
+ok Invalid Date
+ok Invalid Date
+ok Invalid Date
+ok Invalid Date
+ok Invalid Date
+ok Sun Jan 01 2012 09:00:00 GMT+0100 (CET)
+ok Sun Jan 01 2012 09:00:00 GMT+0100 (CET)
+ok Sun Jan 01 2012 09:00:00 GMT+0100 (CET)
diff --git a/nashorn/test/script/basic/NASHORN-63.js b/nashorn/test/script/basic/NASHORN-63.js
new file mode 100644
index 00000000000..29d10287a87
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-63.js
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-63 :  equality and strict equality implementations are broken.
+ *
+ * @test
+ * @run
+ */
+
+function error(msg) {
+    print("Error: " + msg);
+}
+
+if ((new Boolean(true) != new Boolean(true)) !== true) {
+    error('Different Boolean objects are equal');
+}
+
+if ((new Boolean(false) != new Boolean(false)) !== true) {
+    error('Different Boolean objects are equal');
+}
+
+if ((new Boolean(true) != new Boolean(false)) !== true) {
+    error('Different Boolean objects are equal');
+}
+
+if ((new Number(3.14) != new Number(3.14)) !== true) {
+    error('Different Number objects are equal');
+}
+
+if ((new Number(2.718) != new Number(3.14)) !== true) {
+    error('Different Number objects are equal');
+}
+
+if ((new String("nashorn") != new String("nashorn")) !== true) {
+    error('Different String objects are equal');
+}
+
+if ((new String("ecmascript") != new String("nashorn")) !== true) {
+    error('Different String objects are equal');
+}
+
+if ((new Object() != new Object()) !== true) {
+    error('Different Objects are equal');
+}
+
+var obj1 = {}; 
+var obj2 = obj1;
+if (obj1 != obj2) {
+    error(' Same object literals are not equal');
+}
+
+if ((new Boolean(0) != new Number(0)) !== true) {
+    error('a Boolean and a Number object are equal');
+}
+
+if ((new Number(42) != new String("42")) !== true) {
+    error('a Number and a String object are equal');
+}
+
+if ((new String("1") != new Boolean(true)) !== true) {
+    error('a String and a Boolean object are equal');
+}
+
+// strict equality checks
+if ((new String("abc")) === "abc") {
+    error('a String and a primitive string are strict equal');
+}
+
+if ((new Number(42)) === 42) {
+    error('a Number and a primitive number are strict equal');
+}
+
+if ((new Boolean(true)) === true) {
+    error('a Boolean and a primitive boolean are strict equal');
+}
+
+if ((new Boolean(false)) === false) {
+    error('a Boolean and a primitive boolean are strict equal');
+}
+
+if ((new Object()) === (new Object())) {
+    error('two different Objects are strict strict equal');
+}
+
+if ({} === {}) {
+    error('two different Objects are strict strict equal');
+}
diff --git a/nashorn/test/script/basic/NASHORN-631.js.EXPECTED b/nashorn/test/script/basic/NASHORN-631.js.EXPECTED
new file mode 100644
index 00000000000..da24fe67425
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-631.js.EXPECTED
@@ -0,0 +1,3917 @@
+9.53674316 e-7
+-9.5367431 e-7
+4.76837158 e-7
+-4.7683715 e-7
+2.38418579 e-7
+-2.3841857 e-7
+1.19209289 e-7
+-1.1920928 e-7
+5.96046447 e-8
+-5.9604644 e-8
+2.98023223 e-8
+-2.9802322 e-8
+1.49011611 e-8
+-1.4901161 e-8
+7.45058059 e-9
+-7.4505805 e-9
+3.72529029 e-9
+-3.7252902 e-9
+1.86264514 e-9
+-1.8626451 e-9
+9.31322574 e-10
+-9.3132257 e-10
+4.65661287 e-10
+-4.6566128 e-10
+2.32830643 e-10
+-2.3283064 e-10
+1.16415321 e-10
+-1.1641532 e-10
+5.82076609 e-11
+-5.8207660 e-11
+2.91038304 e-11
+-2.9103830 e-11
+1.45519152 e-11
+-1.4551915 e-11
+7.27595761 e-12
+-7.2759576 e-12
+3.63797880 e-12
+-3.6379788 e-12
+1.81898940 e-12
+-1.8189894 e-12
+9.09494701 e-13
+-9.0949470 e-13
+4.54747350 e-13
+-4.5474735 e-13
+2.27373675 e-13
+-2.2737367 e-13
+1.13686837 e-13
+-1.1368683 e-13
+5.68434188 e-14
+-5.6843418 e-14
+2.84217094 e-14
+-2.8421709 e-14
+1.42108547 e-14
+-1.4210854 e-14
+7.10542735 e-15
+-7.1054273 e-15
+3.55271367 e-15
+-3.5527136 e-15
+1.77635683 e-15
+-1.7763568 e-15
+8.88178419 e-16
+-8.8817841 e-16
+4.44089209 e-16
+-4.4408920 e-16
+2.22044604 e-16
+-2.2204460 e-16
+1.11022302 e-16
+-1.1102230 e-16
+5.55111512 e-17
+-5.5511151 e-17
+2.77555756 e-17
+-2.7755575 e-17
+1.38777878 e-17
+-1.3877787 e-17
+6.93889390 e-18
+-6.9388939 e-18
+3.46944695 e-18
+-3.4694469 e-18
+1.73472347 e-18
+-1.7347234 e-18
+8.67361737 e-19
+-8.6736173 e-19
+4.33680868 e-19
+-4.3368086 e-19
+2.16840434 e-19
+-2.1684043 e-19
+1.08420217 e-19
+-1.0842021 e-19
+5.42101086 e-20
+-5.4210108 e-20
+2.71050543 e-20
+-2.7105054 e-20
+1.35525271 e-20
+-1.3552527 e-20
+6.77626357 e-21
+-6.7762635 e-21
+3.38813178 e-21
+-3.3881317 e-21
+1.69406589 e-21
+-1.6940658 e-21
+1.18059162 e+21
+-1.1805916 e+21
+8.47032947 e-22
+-8.4703294 e-22
+2.36118324 e+21
+-2.3611832 e+21
+4.23516473 e-22
+-4.2351647 e-22
+4.72236648 e+21
+-4.7223664 e+21
+2.11758236 e-22
+-2.1175823 e-22
+9.44473296 e+21
+-9.4447329 e+21
+1.05879118 e-22
+-1.0587911 e-22
+1.88894659 e+22
+-1.8889465 e+22
+5.29395592 e-23
+-5.2939559 e-23
+3.77789318 e+22
+-3.7778931 e+22
+2.64697796 e-23
+-2.6469779 e-23
+7.55578637 e+22
+-7.5557863 e+22
+1.32348898 e-23
+-1.3234889 e-23
+1.51115727 e+23
+-1.5111572 e+23
+6.61744490 e-24
+-6.6174449 e-24
+3.02231454 e+23
+-3.0223145 e+23
+3.30872245 e-24
+-3.3087224 e-24
+6.04462909 e+23
+-6.0446290 e+23
+1.65436122 e-24
+-1.6543612 e-24
+1.20892581 e+24
+-1.2089258 e+24
+8.27180612 e-25
+-8.2718061 e-25
+2.41785163 e+24
+-2.4178516 e+24
+4.13590306 e-25
+-4.1359030 e-25
+4.83570327 e+24
+-4.8357032 e+24
+2.06795153 e-25
+-2.0679515 e-25
+9.67140655 e+24
+-9.6714065 e+24
+1.03397576 e-25
+-1.0339757 e-25
+1.93428131 e+25
+-1.9342813 e+25
+5.16987882 e-26
+-5.1698788 e-26
+3.86856262 e+25
+-3.8685626 e+25
+2.58493941 e-26
+-2.5849394 e-26
+7.73712524 e+25
+-7.7371252 e+25
+1.29246970 e-26
+-1.2924697 e-26
+1.54742504 e+26
+-1.5474250 e+26
+6.46234853 e-27
+-6.4623485 e-27
+3.09485009 e+26
+-3.0948500 e+26
+3.23117426 e-27
+-3.2311742 e-27
+6.18970019 e+26
+-6.1897001 e+26
+1.61558713 e-27
+-1.6155871 e-27
+1.23794003 e+27
+-1.2379400 e+27
+8.07793566 e-28
+-8.0779356 e-28
+2.47588007 e+27
+-2.4758800 e+27
+4.03896783 e-28
+-4.0389678 e-28
+4.95176015 e+27
+-4.9517601 e+27
+2.01948391 e-28
+-2.0194839 e-28
+9.90352031 e+27
+-9.9035203 e+27
+1.00974195 e-28
+-1.0097419 e-28
+1.98070406 e+28
+-1.9807040 e+28
+5.04870979 e-29
+-5.0487097 e-29
+3.96140812 e+28
+-3.9614081 e+28
+2.52435489 e-29
+-2.5243548 e-29
+7.92281625 e+28
+-7.9228162 e+28
+1.26217744 e-29
+-1.2621774 e-29
+1.58456325 e+29
+-1.5845632 e+29
+6.31088724 e-30
+-6.3108872 e-30
+3.16912650 e+29
+-3.1691265 e+29
+3.15544362 e-30
+-3.1554436 e-30
+6.33825300 e+29
+-6.3382530 e+29
+1.57772181 e-30
+-1.5777218 e-30
+1.26765060 e+30
+-1.2676506 e+30
+7.88860905 e-31
+-7.8886090 e-31
+2.53530120 e+30
+-2.5353012 e+30
+3.94430452 e-31
+-3.9443045 e-31
+5.07060240 e+30
+-5.0706024 e+30
+1.97215226 e-31
+-1.9721522 e-31
+1.01412048 e+31
+-1.0141204 e+31
+9.86076131 e-32
+-9.8607613 e-32
+2.02824096 e+31
+-2.0282409 e+31
+4.93038065 e-32
+-4.9303806 e-32
+4.05648192 e+31
+-4.0564819 e+31
+2.46519032 e-32
+-2.4651903 e-32
+8.11296384 e+31
+-8.1129638 e+31
+1.23259516 e-32
+-1.2325951 e-32
+1.62259276 e+32
+-1.6225927 e+32
+6.16297582 e-33
+-6.1629758 e-33
+3.24518553 e+32
+-3.2451855 e+32
+3.08148791 e-33
+-3.0814879 e-33
+6.49037107 e+32
+-6.4903710 e+32
+1.54074395 e-33
+-1.5407439 e-33
+1.29807421 e+33
+-1.2980742 e+33
+7.70371977 e-34
+-7.7037197 e-34
+2.59614842 e+33
+-2.5961484 e+33
+3.85185988 e-34
+-3.8518598 e-34
+5.19229685 e+33
+-5.1922968 e+33
+1.92592994 e-34
+-1.9259299 e-34
+1.03845937 e+34
+-1.0384593 e+34
+9.62964972 e-35
+-9.6296497 e-35
+2.07691874 e+34
+-2.0769187 e+34
+4.81482486 e-35
+-4.8148248 e-35
+4.15383748 e+34
+-4.1538374 e+34
+2.40741243 e-35
+-2.4074124 e-35
+8.30767497 e+34
+-8.3076749 e+34
+1.20370621 e-35
+-1.2037062 e-35
+1.66153499 e+35
+-1.6615349 e+35
+6.01853107 e-36
+-6.0185310 e-36
+3.32306998 e+35
+-3.3230699 e+35
+3.00926553 e-36
+-3.0092655 e-36
+6.64613997 e+35
+-6.6461399 e+35
+1.50463276 e-36
+-1.5046327 e-36
+1.32922799 e+36
+-1.3292279 e+36
+7.52316384 e-37
+-7.5231638 e-37
+2.65845599 e+36
+-2.6584559 e+36
+3.76158192 e-37
+-3.7615819 e-37
+5.31691198 e+36
+-5.3169119 e+36
+1.88079096 e-37
+-1.8807909 e-37
+1.06338239 e+37
+-1.0633823 e+37
+9.40395480 e-38
+-9.4039548 e-38
+2.12676479 e+37
+-2.1267647 e+37
+4.70197740 e-38
+-4.7019774 e-38
+4.25352958 e+37
+-4.2535295 e+37
+2.35098870 e-38
+-2.3509887 e-38
+8.50705917 e+37
+-8.5070591 e+37
+1.17549435 e-38
+-1.1754943 e-38
+1.70141183 e+38
+-1.7014118 e+38
+5.87747175 e-39
+-5.8774717 e-39
+3.40282366 e+38
+-3.4028236 e+38
+2.93873587 e-39
+-2.9387358 e-39
+6.80564733 e+38
+-6.8056473 e+38
+1.46936793 e-39
+-1.4693679 e-39
+1.36112946 e+39
+-1.3611294 e+39
+7.34683969 e-40
+-7.3468396 e-40
+2.72225893 e+39
+-2.7222589 e+39
+3.67341984 e-40
+-3.6734198 e-40
+5.44451787 e+39
+-5.4445178 e+39
+1.83670992 e-40
+-1.8367099 e-40
+1.08890357 e+40
+-1.0889035 e+40
+9.18354961 e-41
+-9.1835496 e-41
+2.17780714 e+40
+-2.1778071 e+40
+4.59177480 e-41
+-4.5917748 e-41
+4.35561429 e+40
+-4.3556142 e+40
+2.29588740 e-41
+-2.2958874 e-41
+8.71122859 e+40
+-8.7112285 e+40
+1.14794370 e-41
+-1.1479437 e-41
+1.74224571 e+41
+-1.7422457 e+41
+5.73971850 e-42
+-5.7397185 e-42
+3.48449143 e+41
+-3.4844914 e+41
+2.86985925 e-42
+-2.8698592 e-42
+6.96898287 e+41
+-6.9689828 e+41
+1.43492962 e-42
+-1.4349296 e-42
+1.39379657 e+42
+-1.3937965 e+42
+7.17464813 e-43
+-7.1746481 e-43
+2.78759314 e+42
+-2.7875931 e+42
+3.58732406 e-43
+-3.5873240 e-43
+5.57518629 e+42
+-5.5751862 e+42
+1.79366203 e-43
+-1.7936620 e-43
+1.11503725 e+43
+-1.1150372 e+43
+8.96831017 e-44
+-8.9683101 e-44
+2.23007451 e+43
+-2.2300745 e+43
+4.48415508 e-44
+-4.4841550 e-44
+4.46014903 e+43
+-4.4601490 e+43
+2.24207754 e-44
+-2.2420775 e-44
+8.92029807 e+43
+-8.9202980 e+43
+1.12103877 e-44
+-1.1210387 e-44
+1.78405961 e+44
+-1.7840596 e+44
+5.60519385 e-45
+-5.6051938 e-45
+3.56811923 e+44
+-3.5681192 e+44
+2.80259692 e-45
+-2.8025969 e-45
+7.13623846 e+44
+-7.1362384 e+44
+1.40129846 e-45
+-1.4012984 e-45
+1.42724769 e+45
+-1.4272476 e+45
+7.00649232 e-46
+-7.0064923 e-46
+2.85449538 e+45
+-2.8544953 e+45
+3.50324616 e-46
+-3.5032461 e-46
+5.70899077 e+45
+-5.7089907 e+45
+1.75162308 e-46
+-1.7516230 e-46
+1.14179815 e+46
+-1.1417981 e+46
+8.75811540 e-47
+-8.7581154 e-47
+2.28359630 e+46
+-2.2835963 e+46
+4.37905770 e-47
+-4.3790577 e-47
+4.56719261 e+46
+-4.5671926 e+46
+2.18952885 e-47
+-2.1895288 e-47
+9.13438523 e+46
+-9.1343852 e+46
+1.09476442 e-47
+-1.0947644 e-47
+1.82687704 e+47
+-1.8268770 e+47
+5.47382212 e-48
+-5.4738221 e-48
+3.65375409 e+47
+-3.6537540 e+47
+2.73691106 e-48
+-2.7369110 e-48
+7.30750818 e+47
+-7.3075081 e+47
+1.36845553 e-48
+-1.3684555 e-48
+1.46150163 e+48
+-1.4615016 e+48
+6.84227765 e-49
+-6.8422776 e-49
+2.92300327 e+48
+-2.9230032 e+48
+3.42113882 e-49
+-3.4211388 e-49
+5.84600654 e+48
+-5.8460065 e+48
+1.71056941 e-49
+-1.7105694 e-49
+1.16920130 e+49
+-1.1692013 e+49
+8.55284707 e-50
+-8.5528470 e-50
+2.33840261 e+49
+-2.3384026 e+49
+4.27642353 e-50
+-4.2764235 e-50
+4.67680523 e+49
+-4.6768052 e+49
+2.13821176 e-50
+-2.1382117 e-50
+9.35361047 e+49
+-9.3536104 e+49
+1.06910588 e-50
+-1.0691058 e-50
+1.87072209 e+50
+-1.8707220 e+50
+5.34552942 e-51
+-5.3455294 e-51
+3.74144419 e+50
+-3.7414441 e+50
+2.67276471 e-51
+-2.6727647 e-51
+7.48288838 e+50
+-7.4828883 e+50
+1.33638235 e-51
+-1.3363823 e-51
+1.49657767 e+51
+-1.4965776 e+51
+6.68191177 e-52
+-6.6819117 e-52
+2.99315535 e+51
+-2.9931553 e+51
+3.34095588 e-52
+-3.3409558 e-52
+5.98631070 e+51
+-5.9863107 e+51
+1.67047794 e-52
+-1.6704779 e-52
+1.19726214 e+52
+-1.1972621 e+52
+8.35238971 e-53
+-8.3523897 e-53
+2.39452428 e+52
+-2.3945242 e+52
+4.17619485 e-53
+-4.1761948 e-53
+4.78904856 e+52
+-4.7890485 e+52
+2.08809742 e-53
+-2.0880974 e-53
+9.57809713 e+52
+-9.5780971 e+52
+1.04404871 e-53
+-1.0440487 e-53
+1.91561942 e+53
+-1.9156194 e+53
+5.22024357 e-54
+-5.2202435 e-54
+3.83123885 e+53
+-3.8312388 e+53
+2.61012178 e-54
+-2.6101217 e-54
+7.66247770 e+53
+-7.6624777 e+53
+1.30506089 e-54
+-1.3050608 e-54
+1.53249554 e+54
+-1.5324955 e+54
+6.52530446 e-55
+-6.5253044 e-55
+3.06499108 e+54
+-3.0649910 e+54
+3.26265223 e-55
+-3.2626522 e-55
+6.12998216 e+54
+-6.1299821 e+54
+1.63132611 e-55
+-1.6313261 e-55
+1.22599643 e+55
+-1.2259964 e+55
+8.15663058 e-56
+-8.1566305 e-56
+2.45199286 e+55
+-2.4519928 e+55
+4.07831529 e-56
+-4.0783152 e-56
+4.90398573 e+55
+-4.9039857 e+55
+2.03915764 e-56
+-2.0391576 e-56
+9.80797146 e+55
+-9.8079714 e+55
+1.01957882 e-56
+-1.0195788 e-56
+1.96159429 e+56
+-1.9615942 e+56
+5.09789411 e-57
+-5.0978941 e-57
+3.92318858 e+56
+-3.9231885 e+56
+2.54894705 e-57
+-2.5489470 e-57
+7.84637716 e+56
+-7.8463771 e+56
+1.27447352 e-57
+-1.2744735 e-57
+1.56927543 e+57
+-1.5692754 e+57
+6.37236764 e-58
+-6.3723676 e-58
+3.13855086 e+57
+-3.1385508 e+57
+3.18618382 e-58
+-3.1861838 e-58
+6.27710173 e+57
+-6.2771017 e+57
+1.59309191 e-58
+-1.5930919 e-58
+1.25542034 e+58
+-1.2554203 e+58
+7.96545955 e-59
+-7.9654595 e-59
+2.51084069 e+58
+-2.5108406 e+58
+3.98272977 e-59
+-3.9827297 e-59
+5.02168138 e+58
+-5.0216813 e+58
+1.99136488 e-59
+-1.9913648 e-59
+1.00433627 e+59
+-1.0043362 e+59
+9.95682444 e-60
+-9.9568244 e-60
+2.00867255 e+59
+-2.0086725 e+59
+4.97841222 e-60
+-4.9784122 e-60
+4.01734511 e+59
+-4.0173451 e+59
+2.48920611 e-60
+-2.4892061 e-60
+8.03469022 e+59
+-8.0346902 e+59
+1.24460305 e-60
+-1.2446030 e-60
+1.60693804 e+60
+-1.6069380 e+60
+6.22301527 e-61
+-6.2230152 e-61
+3.21387608 e+60
+-3.2138760 e+60
+3.11150763 e-61
+-3.1115076 e-61
+6.42775217 e+60
+-6.4277521 e+60
+1.55575381 e-61
+-1.5557538 e-61
+1.28555043 e+61
+-1.2855504 e+61
+7.77876909 e-62
+-7.7787690 e-62
+2.57110087 e+61
+-2.5711008 e+61
+3.88938454 e-62
+-3.8893845 e-62
+5.14220174 e+61
+-5.1422017 e+61
+1.94469227 e-62
+-1.9446922 e-62
+1.02844034 e+62
+-1.0284403 e+62
+9.72346137 e-63
+-9.7234613 e-63
+2.05688069 e+62
+-2.0568806 e+62
+4.86173068 e-63
+-4.8617306 e-63
+4.11376139 e+62
+-4.1137613 e+62
+2.43086534 e-63
+-2.4308653 e-63
+8.22752278 e+62
+-8.2275227 e+62
+1.21543267 e-63
+-1.2154326 e-63
+1.64550455 e+63
+-1.6455045 e+63
+6.07716335 e-64
+-6.0771633 e-64
+3.29100911 e+63
+-3.2910091 e+63
+3.03858167 e-64
+-3.0385816 e-64
+6.58201822 e+63
+-6.5820182 e+63
+1.51929083 e-64
+-1.5192908 e-64
+1.31640364 e+64
+-1.3164036 e+64
+7.59645419 e-65
+-7.5964541 e-65
+2.63280729 e+64
+-2.6328072 e+64
+3.79822709 e-65
+-3.7982270 e-65
+5.26561458 e+64
+-5.2656145 e+64
+1.89911354 e-65
+-1.8991135 e-65
+1.05312291 e+65
+-1.0531229 e+65
+9.49556774 e-66
+-9.4955677 e-66
+2.10624583 e+65
+-2.1062458 e+65
+4.74778387 e-66
+-4.7477838 e-66
+4.21249166 e+65
+-4.2124916 e+65
+2.37389193 e-66
+-2.3738919 e-66
+8.42498333 e+65
+-8.4249833 e+65
+1.18694596 e-66
+-1.1869459 e-66
+1.68499666 e+66
+-1.6849966 e+66
+5.93472984 e-67
+-5.9347298 e-67
+3.36999333 e+66
+-3.3699933 e+66
+2.96736492 e-67
+-2.9673649 e-67
+6.73998666 e+66
+-6.7399866 e+66
+1.48368246 e-67
+-1.4836824 e-67
+1.34799733 e+67
+-1.3479973 e+67
+7.41841230 e-68
+-7.4184123 e-68
+2.69599466 e+67
+-2.6959946 e+67
+3.70920615 e-68
+-3.7092061 e-68
+5.39198933 e+67
+-5.3919893 e+67
+1.85460307 e-68
+-1.8546030 e-68
+1.07839786 e+68
+-1.0783978 e+68
+9.27301537 e-69
+-9.2730153 e-69
+2.15679573 e+68
+-2.1567957 e+68
+4.63650768 e-69
+-4.6365076 e-69
+4.31359146 e+68
+-4.3135914 e+68
+2.31825384 e-69
+-2.3182538 e-69
+8.62718293 e+68
+-8.6271829 e+68
+1.15912692 e-69
+-1.1591269 e-69
+1.72543658 e+69
+-1.7254365 e+69
+5.79563461 e-70
+-5.7956346 e-70
+3.45087317 e+69
+-3.4508731 e+69
+2.89781730 e-70
+-2.8978173 e-70
+6.90174634 e+69
+-6.9017463 e+69
+1.44890865 e-70
+-1.4489086 e-70
+1.38034926 e+70
+-1.3803492 e+70
+7.24454326 e-71
+-7.2445432 e-71
+2.76069853 e+70
+-2.7606985 e+70
+3.62227163 e-71
+-3.6222716 e-71
+5.52139707 e+70
+-5.5213970 e+70
+1.81113581 e-71
+-1.8111358 e-71
+1.10427941 e+71
+-1.1042794 e+71
+9.05567907 e-72
+-9.0556790 e-72
+2.20855883 e+71
+-2.2085588 e+71
+4.52783953 e-72
+-4.5278395 e-72
+4.41711766 e+71
+-4.4171176 e+71
+2.26391976 e-72
+-2.2639197 e-72
+8.83423532 e+71
+-8.8342353 e+71
+1.13195988 e-72
+-1.1319598 e-72
+1.76684706 e+72
+-1.7668470 e+72
+5.65979942 e-73
+-5.6597994 e-73
+3.53369412 e+72
+-3.5336941 e+72
+2.82989971 e-73
+-2.8298997 e-73
+7.06738825 e+72
+-7.0673882 e+72
+1.41494985 e-73
+-1.4149498 e-73
+1.41347765 e+73
+-1.4134776 e+73
+7.07474928 e-74
+-7.0747492 e-74
+2.82695530 e+73
+-2.8269553 e+73
+3.53737464 e-74
+-3.5373746 e-74
+5.65391060 e+73
+-5.6539106 e+73
+1.76868732 e-74
+-1.7686873 e-74
+1.13078212 e+74
+-1.1307821 e+74
+8.84343660 e-75
+-8.8434366 e-75
+2.26156424 e+74
+-2.2615642 e+74
+4.42171830 e-75
+-4.4217183 e-75
+4.52312848 e+74
+-4.5231284 e+74
+2.21085915 e-75
+-2.2108591 e-75
+9.04625697 e+74
+-9.0462569 e+74
+1.10542957 e-75
+-1.1054295 e-75
+1.80925139 e+75
+-1.8092513 e+75
+5.52714787 e-76
+-5.5271478 e-76
+3.61850278 e+75
+-3.6185027 e+75
+2.76357393 e-76
+-2.7635739 e-76
+7.23700557 e+75
+-7.2370055 e+75
+1.38178696 e-76
+-1.3817869 e-76
+1.44740111 e+76
+-1.4474011 e+76
+6.90893484 e-77
+-6.9089348 e-77
+2.89480223 e+76
+-2.8948022 e+76
+3.45446742 e-77
+-3.4544674 e-77
+5.78960446 e+76
+-5.7896044 e+76
+1.72723371 e-77
+-1.7272337 e-77
+1.15792089 e+77
+-1.1579208 e+77
+8.63616855 e-78
+-8.6361685 e-78
+2.31584178 e+77
+-2.3158417 e+77
+4.31808427 e-78
+-4.3180842 e-78
+4.63168356 e+77
+-4.6316835 e+77
+2.15904213 e-78
+-2.1590421 e-78
+9.26336713 e+77
+-9.2633671 e+77
+1.07952106 e-78
+-1.0795210 e-78
+1.85267342 e+78
+-1.8526734 e+78
+5.39760534 e-79
+-5.3976053 e-79
+3.70534685 e+78
+-3.7053468 e+78
+2.69880267 e-79
+-2.6988026 e-79
+7.41069371 e+78
+-7.4106937 e+78
+1.34940133 e-79
+-1.3494013 e-79
+1.48213874 e+79
+-1.4821387 e+79
+6.74700668 e-80
+-6.7470066 e-80
+2.96427748 e+79
+-2.9642774 e+79
+3.37350334 e-80
+-3.3735033 e-80
+5.92855496 e+79
+-5.9285549 e+79
+1.68675167 e-80
+-1.6867516 e-80
+1.18571099 e+80
+-1.1857109 e+80
+8.43375835 e-81
+-8.4337583 e-81
+2.37142198 e+80
+-2.3714219 e+80
+4.21687917 e-81
+-4.2168791 e-81
+4.74284397 e+80
+-4.7428439 e+80
+2.10843958 e-81
+-2.1084395 e-81
+9.48568795 e+80
+-9.4856879 e+80
+1.05421979 e-81
+-1.0542197 e-81
+1.89713759 e+81
+-1.8971375 e+81
+5.27109897 e-82
+-5.2710989 e-82
+3.79427518 e+81
+-3.7942751 e+81
+2.63554948 e-82
+-2.6355494 e-82
+7.58855036 e+81
+-7.5885503 e+81
+1.31777474 e-82
+-1.3177747 e-82
+1.51771007 e+82
+-1.5177100 e+82
+6.58887371 e-83
+-6.5888737 e-83
+3.03542014 e+82
+-3.0354201 e+82
+3.29443685 e-83
+-3.2944368 e-83
+6.07084028 e+82
+-6.0708402 e+82
+1.64721842 e-83
+-1.6472184 e-83
+1.21416805 e+83
+-1.2141680 e+83
+8.23609214 e-84
+-8.2360921 e-84
+2.42833611 e+83
+-2.4283361 e+83
+4.11804607 e-84
+-4.1180460 e-84
+4.85667223 e+83
+-4.8566722 e+83
+2.05902303 e-84
+-2.0590230 e-84
+9.71334446 e+83
+-9.7133444 e+83
+1.02951151 e-84
+-1.0295115 e-84
+1.94266889 e+84
+-1.9426688 e+84
+5.14755758 e-85
+-5.1475575 e-85
+3.88533778 e+84
+-3.8853377 e+84
+2.57377879 e-85
+-2.5737787 e-85
+7.77067556 e+84
+-7.7706755 e+84
+1.28688939 e-85
+-1.2868893 e-85
+1.55413511 e+85
+-1.5541351 e+85
+6.43444698 e-86
+-6.4344469 e-86
+3.10827022 e+85
+-3.1082702 e+85
+3.21722349 e-86
+-3.2172234 e-86
+6.21654045 e+85
+-6.2165404 e+85
+1.60861174 e-86
+-1.6086117 e-86
+1.24330809 e+86
+-1.2433080 e+86
+8.04305873 e-87
+-8.0430587 e-87
+2.48661618 e+86
+-2.4866161 e+86
+4.02152936 e-87
+-4.0215293 e-87
+4.97323236 e+86
+-4.9732323 e+86
+2.01076468 e-87
+-2.0107646 e-87
+9.94646472 e+86
+-9.9464647 e+86
+1.00538234 e-87
+-1.0053823 e-87
+1.98929294 e+87
+-1.9892929 e+87
+5.02691170 e-88
+-5.0269117 e-88
+3.97858589 e+87
+-3.9785858 e+87
+2.51345585 e-88
+-2.5134558 e-88
+7.95717178 e+87
+-7.9571717 e+87
+1.25672792 e-88
+-1.2567279 e-88
+1.59143435 e+88
+-1.5914343 e+88
+6.28363963 e-89
+-6.2836396 e-89
+3.18286871 e+88
+-3.1828687 e+88
+3.14181981 e-89
+-3.1418198 e-89
+6.36573742 e+88
+-6.3657374 e+88
+1.57090990 e-89
+-1.5709099 e-89
+1.27314748 e+89
+-1.2731474 e+89
+7.85454954 e-90
+-7.8545495 e-90
+2.54629497 e+89
+-2.5462949 e+89
+3.92727477 e-90
+-3.9272747 e-90
+5.09258994 e+89
+-5.0925899 e+89
+1.96363738 e-90
+-1.9636373 e-90
+1.01851798 e+90
+-1.0185179 e+90
+9.81818693 e-91
+-9.8181869 e-91
+2.03703597 e+90
+-2.0370359 e+90
+4.90909346 e-91
+-4.9090934 e-91
+4.07407195 e+90
+-4.0740719 e+90
+2.45454673 e-91
+-2.4545467 e-91
+8.14814390 e+90
+-8.1481439 e+90
+1.22727336 e-91
+-1.2272733 e-91
+1.62962878 e+91
+-1.6296287 e+91
+6.13636683 e-92
+-6.1363668 e-92
+3.25925756 e+91
+-3.2592575 e+91
+3.06818341 e-92
+-3.0681834 e-92
+6.51851512 e+91
+-6.5185151 e+91
+1.53409170 e-92
+-1.5340917 e-92
+1.30370302 e+92
+-1.3037030 e+92
+7.67045853 e-93
+-7.6704585 e-93
+2.60740604 e+92
+-2.6074060 e+92
+3.83522926 e-93
+-3.8352292 e-93
+5.21481209 e+92
+-5.2148120 e+92
+1.91761463 e-93
+-1.9176146 e-93
+1.04296241 e+93
+-1.0429624 e+93
+9.58807317 e-94
+-9.5880731 e-94
+2.08592483 e+93
+-2.0859248 e+93
+4.79403658 e-94
+-4.7940365 e-94
+4.17184967 e+93
+-4.1718496 e+93
+2.39701829 e-94
+-2.3970182 e-94
+8.34369935 e+93
+-8.3436993 e+93
+1.19850914 e-94
+-1.1985091 e-94
+1.66873987 e+94
+-1.6687398 e+94
+5.99254573 e-95
+-5.9925457 e-95
+3.33747974 e+94
+-3.3374797 e+94
+2.99627286 e-95
+-2.9962728 e-95
+6.67495948 e+94
+-6.6749594 e+94
+1.49813643 e-95
+-1.4981364 e-95
+1.33499189 e+95
+-1.3349918 e+95
+7.49068216 e-96
+-7.4906821 e-96
+2.66998379 e+95
+-2.6699837 e+95
+3.74534108 e-96
+-3.7453410 e-96
+5.33996758 e+95
+-5.3399675 e+95
+1.87267054 e-96
+-1.8726705 e-96
+1.06799351 e+96
+-1.0679935 e+96
+9.36335270 e-97
+-9.3633527 e-97
+2.13598703 e+96
+-2.1359870 e+96
+4.68167635 e-97
+-4.6816763 e-97
+4.27197407 e+96
+-4.2719740 e+96
+2.34083817 e-97
+-2.3408381 e-97
+8.54394814 e+96
+-8.5439481 e+96
+1.17041908 e-97
+-1.1704190 e-97
+1.70878962 e+97
+-1.7087896 e+97
+5.85209544 e-98
+-5.8520954 e-98
+3.41757925 e+97
+-3.4175792 e+97
+2.92604772 e-98
+-2.9260477 e-98
+6.83515851 e+97
+-6.8351585 e+97
+1.46302386 e-98
+-1.4630238 e-98
+1.36703170 e+98
+-1.3670317 e+98
+7.31511930 e-99
+-7.3151193 e-99
+2.73406340 e+98
+-2.7340634 e+98
+3.65755965 e-99
+-3.6575596 e-99
+5.46812681 e+98
+-5.4681268 e+98
+1.82877982 e-99
+-1.8287798 e-99
+1.09362536 e+99
+-1.0936253 e+99
+9.14389913 e-100
+-9.1438991 e-100
+2.18725072 e+99
+-2.1872507 e+99
+4.57194956 e-100
+-4.5719495 e-100
+4.37450144 e+99
+-4.3745014 e+99
+2.28597478 e-100
+-2.2859747 e-100
+8.74900289 e+99
+-8.7490028 e+99
+1.14298739 e-100
+-1.1429873 e-100
+1.74980057 e+100
+-1.7498005 e+100
+5.71493695 e-101
+-5.7149369 e-101
+3.49960115 e+100
+-3.4996011 e+100
+2.85746847 e-101
+-2.8574684 e-101
+6.99920231 e+100
+-6.9992023 e+100
+1.42873423 e-101
+-1.4287342 e-101
+1.39984046 e+101
+-1.3998404 e+101
+7.14367119 e-102
+-7.1436711 e-102
+2.79968092 e+101
+-2.7996809 e+101
+3.57183559 e-102
+-3.5718355 e-102
+5.59936185 e+101
+-5.5993618 e+101
+1.78591779 e-102
+-1.7859177 e-102
+1.11987237 e+102
+-1.1198723 e+102
+8.92958899 e-103
+-8.9295889 e-103
+2.23974474 e+102
+-2.2397447 e+102
+4.46479449 e-103
+-4.4647944 e-103
+4.47948948 e+102
+-4.4794894 e+102
+2.23239724 e-103
+-2.2323972 e-103
+8.95897896 e+102
+-8.9589789 e+102
+1.11619862 e-103
+-1.1161986 e-103
+1.79179579 e+103
+-1.7917957 e+103
+5.58099312 e-104
+-5.5809931 e-104
+3.58359158 e+103
+-3.5835915 e+103
+2.79049656 e-104
+-2.7904965 e-104
+7.16718317 e+103
+-7.1671831 e+103
+1.39524828 e-104
+-1.3952482 e-104
+1.43343663 e+104
+-1.4334366 e+104
+6.97624140 e-105
+-6.9762414 e-105
+2.86687326 e+104
+-2.8668732 e+104
+3.48812070 e-105
+-3.4881207 e-105
+5.73374653 e+104
+-5.7337465 e+104
+1.74406035 e-105
+-1.7440603 e-105
+1.14674930 e+105
+-1.1467493 e+105
+8.72030175 e-106
+-8.7203017 e-106
+2.29349861 e+105
+-2.2934986 e+105
+4.36015087 e-106
+-4.3601508 e-106
+4.58699723 e+105
+-4.5869972 e+105
+2.18007543 e-106
+-2.1800754 e-106
+9.17399446 e+105
+-9.1739944 e+105
+1.09003771 e-106
+-1.0900377 e-106
+1.83479889 e+106
+-1.8347988 e+106
+5.45018859 e-107
+-5.4501885 e-107
+3.66959778 e+106
+-3.6695977 e+106
+2.72509429 e-107
+-2.7250942 e-107
+7.33919557 e+106
+-7.3391955 e+106
+1.36254714 e-107
+-1.3625471 e-107
+1.46783911 e+107
+-1.4678391 e+107
+6.81273574 e-108
+-6.8127357 e-108
+2.93567822 e+107
+-2.9356782 e+107
+3.40636787 e-108
+-3.4063678 e-108
+5.87135645 e+107
+-5.8713564 e+107
+1.70318393 e-108
+-1.7031839 e-108
+1.17427129 e+108
+-1.1742712 e+108
+8.51591968 e-109
+-8.5159196 e-109
+2.34854258 e+108
+-2.3485425 e+108
+4.25795984 e-109
+-4.2579598 e-109
+4.69708516 e+108
+-4.6970851 e+108
+2.12897992 e-109
+-2.1289799 e-109
+9.39417033 e+108
+-9.3941703 e+108
+1.06448996 e-109
+-1.0644899 e-109
+1.87883406 e+109
+-1.8788340 e+109
+5.32244980 e-110
+-5.3224498 e-110
+3.75766813 e+109
+-3.7576681 e+109
+2.66122490 e-110
+-2.6612249 e-110
+7.51533626 e+109
+-7.5153362 e+109
+1.33061245 e-110
+-1.3306124 e-110
+1.50306725 e+110
+-1.5030672 e+110
+6.65306225 e-111
+-6.6530622 e-111
+3.00613450 e+110
+-3.0061345 e+110
+3.32653112 e-111
+-3.3265311 e-111
+6.01226901 e+110
+-6.0122690 e+110
+1.66326556 e-111
+-1.6632655 e-111
+1.20245380 e+111
+-1.2024538 e+111
+8.31632781 e-112
+-8.3163278 e-112
+2.40490760 e+111
+-2.4049076 e+111
+4.15816390 e-112
+-4.1581639 e-112
+4.80981520 e+111
+-4.8098152 e+111
+2.07908195 e-112
+-2.0790819 e-112
+9.61963041 e+111
+-9.6196304 e+111
+1.03954097 e-112
+-1.0395409 e-112
+1.92392608 e+112
+-1.9239260 e+112
+5.19770488 e-113
+-5.1977048 e-113
+3.84785216 e+112
+-3.8478521 e+112
+2.59885244 e-113
+-2.5988524 e-113
+7.69570433 e+112
+-7.6957043 e+112
+1.29942622 e-113
+-1.2994262 e-113
+1.53914086 e+113
+-1.5391408 e+113
+6.49713110 e-114
+-6.4971311 e-114
+3.07828173 e+113
+-3.0782817 e+113
+3.24856555 e-114
+-3.2485655 e-114
+6.15656346 e+113
+-6.1565634 e+113
+1.62428277 e-114
+-1.6242827 e-114
+1.23131269 e+114
+-1.2313126 e+114
+8.12141387 e-115
+-8.1214138 e-115
+2.46262538 e+114
+-2.4626253 e+114
+4.06070693 e-115
+-4.0607069 e-115
+4.92525077 e+114
+-4.9252507 e+114
+2.03035346 e-115
+-2.0303534 e-115
+9.85050154 e+114
+-9.8505015 e+114
+1.01517673 e-115
+-1.0151767 e-115
+1.97010030 e+115
+-1.9701003 e+115
+5.07588367 e-116
+-5.0758836 e-116
+3.94020061 e+115
+-3.9402006 e+115
+2.53794183 e-116
+-2.5379418 e-116
+7.88040123 e+115
+-7.8804012 e+115
+1.26897091 e-116
+-1.2689709 e-116
+1.57608024 e+116
+-1.5760802 e+116
+6.34485459 e-117
+-6.3448545 e-117
+3.15216049 e+116
+-3.1521604 e+116
+3.17242729 e-117
+-3.1724272 e-117
+6.30432099 e+116
+-6.3043209 e+116
+1.58621364 e-117
+-1.5862136 e-117
+1.26086419 e+117
+-1.2608641 e+117
+7.93106824 e-118
+-7.9310682 e-118
+2.52172839 e+117
+-2.5217283 e+117
+3.96553412 e-118
+-3.9655341 e-118
+5.04345679 e+117
+-5.0434567 e+117
+1.98276706 e-118
+-1.9827670 e-118
+1.00869135 e+118
+-1.0086913 e+118
+9.91383530 e-119
+-9.9138353 e-119
+2.01738271 e+118
+-2.0173827 e+118
+4.95691765 e-119
+-4.9569176 e-119
+4.03476543 e+118
+-4.0347654 e+118
+2.47845882 e-119
+-2.4784588 e-119
+8.06953086 e+118
+-8.0695308 e+118
+1.23922941 e-119
+-1.2392294 e-119
+1.61390617 e+119
+-1.6139061 e+119
+6.19614706 e-120
+-6.1961470 e-120
+3.22781234 e+119
+-3.2278123 e+119
+3.09807353 e-120
+-3.0980735 e-120
+6.45562469 e+119
+-6.4556246 e+119
+1.54903676 e-120
+-1.5490367 e-120
+1.29112493 e+120
+-1.2911249 e+120
+7.74518382 e-121
+-7.7451838 e-121
+2.58224987 e+120
+-2.5822498 e+120
+3.87259191 e-121
+-3.8725919 e-121
+5.16449975 e+120
+-5.1644997 e+120
+1.93629595 e-121
+-1.9362959 e-121
+1.03289995 e+121
+-1.0328999 e+121
+9.68147978 e-122
+-9.6814797 e-122
+2.06579990 e+121
+-2.0657999 e+121
+4.84073989 e-122
+-4.8407398 e-122
+4.13159980 e+121
+-4.1315998 e+121
+2.42036994 e-122
+-2.4203699 e-122
+8.26319960 e+121
+-8.2631996 e+121
+1.21018497 e-122
+-1.2101849 e-122
+1.65263992 e+122
+-1.6526399 e+122
+6.05092486 e-123
+-6.0509248 e-123
+3.30527984 e+122
+-3.3052798 e+122
+3.02546243 e-123
+-3.0254624 e-123
+6.61055968 e+122
+-6.6105596 e+122
+1.51273121 e-123
+-1.5127312 e-123
+1.32211193 e+123
+-1.3221119 e+123
+7.56365608 e-124
+-7.5636560 e-124
+2.64422387 e+123
+-2.6442238 e+123
+3.78182804 e-124
+-3.7818280 e-124
+5.28844775 e+123
+-5.2884477 e+123
+1.89091402 e-124
+-1.8909140 e-124
+1.05768955 e+124
+-1.0576895 e+124
+9.45457010 e-125
+-9.4545701 e-125
+2.11537910 e+124
+-2.1153791 e+124
+4.72728505 e-125
+-4.7272850 e-125
+4.23075820 e+124
+-4.2307582 e+124
+2.36364252 e-125
+-2.3636425 e-125
+8.46151640 e+124
+-8.4615164 e+124
+1.18182126 e-125
+-1.1818212 e-125
+1.69230328 e+125
+-1.6923032 e+125
+5.90910631 e-126
+-5.9091063 e-126
+3.38460656 e+125
+-3.3846065 e+125
+2.95455315 e-126
+-2.9545531 e-126
+6.76921312 e+125
+-6.7692131 e+125
+1.47727657 e-126
+-1.4772765 e-126
+1.35384262 e+126
+-1.3538426 e+126
+7.38638289 e-127
+-7.3863828 e-127
+2.70768524 e+126
+-2.7076852 e+126
+3.69319144 e-127
+-3.6931914 e-127
+5.41537049 e+126
+-5.4153704 e+126
+1.84659572 e-127
+-1.8465957 e-127
+1.08307409 e+127
+-1.0830740 e+127
+9.23297861 e-128
+-9.2329786 e-128
+2.16614819 e+127
+-2.1661481 e+127
+4.61648930 e-128
+-4.6164893 e-128
+4.33229639 e+127
+-4.3322963 e+127
+2.30824465 e-128
+-2.3082446 e-128
+8.66459279 e+127
+-8.6645927 e+127
+1.15412232 e-128
+-1.1541223 e-128
+1.73291855 e+128
+-1.7329185 e+128
+5.77061163 e-129
+-5.7706116 e-129
+3.46583711 e+128
+-3.4658371 e+128
+2.88530581 e-129
+-2.8853058 e-129
+6.93167423 e+128
+-6.9316742 e+128
+1.44265290 e-129
+-1.4426529 e-129
+1.38633484 e+129
+-1.3863348 e+129
+7.21326454 e-130
+-7.2132645 e-130
+2.77266969 e+129
+-2.7726696 e+129
+3.60663227 e-130
+-3.6066322 e-130
+5.54533938 e+129
+-5.5453393 e+129
+1.80331613 e-130
+-1.8033161 e-130
+1.10906787 e+130
+-1.1090678 e+130
+9.01658068 e-131
+-9.0165806 e-131
+2.21813575 e+130
+-2.2181357 e+130
+4.50829034 e-131
+-4.5082903 e-131
+4.43627151 e+130
+-4.4362715 e+130
+2.25414517 e-131
+-2.2541451 e-131
+8.87254302 e+130
+-8.8725430 e+130
+1.12707258 e-131
+-1.1270725 e-131
+1.77450860 e+131
+-1.7745086 e+131
+5.63536292 e-132
+-5.6353629 e-132
+3.54901720 e+131
+-3.5490172 e+131
+2.81768146 e-132
+-2.8176814 e-132
+7.09803441 e+131
+-7.0980344 e+131
+1.40884073 e-132
+-1.4088407 e-132
+1.41960688 e+132
+-1.4196068 e+132
+7.04420365 e-133
+-7.0442036 e-133
+2.83921376 e+132
+-2.8392137 e+132
+3.52210182 e-133
+-3.5221018 e-133
+5.67842753 e+132
+-5.6784275 e+132
+1.76105091 e-133
+-1.7610509 e-133
+1.13568550 e+133
+-1.1356855 e+133
+8.80525457 e-134
+-8.8052545 e-134
+2.27137101 e+133
+-2.2713710 e+133
+4.40262728 e-134
+-4.4026272 e-134
+4.54274202 e+133
+-4.5427420 e+133
+2.20131364 e-134
+-2.2013136 e-134
+9.08548405 e+133
+-9.0854840 e+133
+1.10065682 e-134
+-1.1006568 e-134
+1.81709681 e+134
+-1.8170968 e+134
+5.50328410 e-135
+-5.5032841 e-135
+3.63419362 e+134
+-3.6341936 e+134
+2.75164205 e-135
+-2.7516420 e-135
+7.26838724 e+134
+-7.2683872 e+134
+1.37582102 e-135
+-1.3758210 e-135
+1.45367744 e+135
+-1.4536774 e+135
+6.87910513 e-136
+-6.8791051 e-136
+2.90735489 e+135
+-2.9073548 e+135
+3.43955256 e-136
+-3.4395525 e-136
+5.81470979 e+135
+-5.8147097 e+135
+1.71977628 e-136
+-1.7197762 e-136
+1.16294195 e+136
+-1.1629419 e+136
+8.59888141 e-137
+-8.5988814 e-137
+2.32588391 e+136
+-2.3258839 e+136
+4.29944070 e-137
+-4.2994407 e-137
+4.65176783 e+136
+-4.6517678 e+136
+2.14972035 e-137
+-2.1497203 e-137
+9.30353567 e+136
+-9.3035356 e+136
+1.07486017 e-137
+-1.0748601 e-137
+1.86070713 e+137
+-1.8607071 e+137
+5.37430088 e-138
+-5.3743008 e-138
+3.72141426 e+137
+-3.7214142 e+137
+2.68715044 e-138
+-2.6871504 e-138
+7.44282853 e+137
+-7.4428285 e+137
+1.34357522 e-138
+-1.3435752 e-138
+1.48856570 e+138
+-1.4885657 e+138
+6.71787610 e-139
+-6.7178761 e-139
+2.97713141 e+138
+-2.9771314 e+138
+3.35893805 e-139
+-3.3589380 e-139
+5.95426282 e+138
+-5.9542628 e+138
+1.67946902 e-139
+-1.6794690 e-139
+1.19085256 e+139
+-1.1908525 e+139
+8.39734513 e-140
+-8.3973451 e-140
+2.38170513 e+139
+-2.3817051 e+139
+4.19867256 e-140
+-4.1986725 e-140
+4.76341026 e+139
+-4.7634102 e+139
+2.09933628 e-140
+-2.0993362 e-140
+9.52682052 e+139
+-9.5268205 e+139
+1.04966814 e-140
+-1.0496681 e-140
+1.90536410 e+140
+-1.9053641 e+140
+5.24834070 e-141
+-5.2483407 e-141
+3.81072821 e+140
+-3.8107282 e+140
+2.62417035 e-141
+-2.6241703 e-141
+7.62145642 e+140
+-7.6214564 e+140
+1.31208517 e-141
+-1.3120851 e-141
+1.52429128 e+141
+-1.5242912 e+141
+6.56042588 e-142
+-6.5604258 e-142
+3.04858256 e+141
+-3.0485825 e+141
+3.28021294 e-142
+-3.2802129 e-142
+6.09716513 e+141
+-6.0971651 e+141
+1.64010647 e-142
+-1.6401064 e-142
+1.21943302 e+142
+-1.2194330 e+142
+8.20053235 e-143
+-8.2005323 e-143
+2.43886605 e+142
+-2.4388660 e+142
+4.10026617 e-143
+-4.1002661 e-143
+4.87773210 e+142
+-4.8777321 e+142
+2.05013308 e-143
+-2.0501330 e-143
+9.75546421 e+142
+-9.7554642 e+142
+1.02506654 e-143
+-1.0250665 e-143
+1.95109284 e+143
+-1.9510928 e+143
+5.12533272 e-144
+-5.1253327 e-144
+3.90218568 e+143
+-3.9021856 e+143
+2.56266636 e-144
+-2.5626663 e-144
+7.80437137 e+143
+-7.8043713 e+143
+1.28133318 e-144
+-1.2813331 e-144
+1.56087427 e+144
+-1.5608742 e+144
+6.40666590 e-145
+-6.4066659 e-145
+3.12174855 e+144
+-3.1217485 e+144
+3.20333295 e-145
+-3.2033329 e-145
+6.24349710 e+144
+-6.2434971 e+144
+1.60166647 e-145
+-1.6016664 e-145
+1.24869942 e+145
+-1.2486994 e+145
+8.00833238 e-146
+-8.0083323 e-146
+2.49739884 e+145
+-2.4973988 e+145
+4.00416619 e-146
+-4.0041661 e-146
+4.99479768 e+145
+-4.9947976 e+145
+2.00208309 e-146
+-2.0020830 e-146
+9.98959536 e+145
+-9.9895953 e+145
+1.00104154 e-146
+-1.0010415 e-146
+1.99791907 e+146
+-1.9979190 e+146
+5.00520773 e-147
+-5.0052077 e-147
+3.99583814 e+146
+-3.9958381 e+146
+2.50260386 e-147
+-2.5026038 e-147
+7.99167628 e+146
+-7.9916762 e+146
+1.25130193 e-147
+-1.2513019 e-147
+1.59833525 e+147
+-1.5983352 e+147
+6.25650967 e-148
+-6.2565096 e-148
+3.19667051 e+147
+-3.1966705 e+147
+3.12825483 e-148
+-3.1282548 e-148
+6.39334103 e+147
+-6.3933410 e+147
+1.56412741 e-148
+-1.5641274 e-148
+1.27866820 e+148
+-1.2786682 e+148
+7.82063709 e-149
+-7.8206370 e-149
+2.55733641 e+148
+-2.5573364 e+148
+3.91031854 e-149
+-3.9103185 e-149
+5.11467282 e+148
+-5.1146728 e+148
+1.95515927 e-149
+-1.9551592 e-149
+1.02293456 e+149
+-1.0229345 e+149
+9.77579636 e-150
+-9.7757963 e-150
+2.04586912 e+149
+-2.0458691 e+149
+4.88789818 e-150
+-4.8878981 e-150
+4.09173825 e+149
+-4.0917382 e+149
+2.44394909 e-150
+-2.4439490 e-150
+8.18347651 e+149
+-8.1834765 e+149
+1.22197454 e-150
+-1.2219745 e-150
+1.63669530 e+150
+-1.6366953 e+150
+6.10987272 e-151
+-6.1098727 e-151
+3.27339060 e+150
+-3.2733906 e+150
+3.05493636 e-151
+-3.0549363 e-151
+6.54678121 e+150
+-6.5467812 e+150
+1.52746818 e-151
+-1.5274681 e-151
+1.30935624 e+151
+-1.3093562 e+151
+7.63734090 e-152
+-7.6373409 e-152
+2.61871248 e+151
+-2.6187124 e+151
+3.81867045 e-152
+-3.8186704 e-152
+5.23742497 e+151
+-5.2374249 e+151
+1.90933522 e-152
+-1.9093352 e-152
+1.04748499 e+152
+-1.0474849 e+152
+9.54667613 e-153
+-9.5466761 e-153
+2.09496998 e+152
+-2.0949699 e+152
+4.77333806 e-153
+-4.7733380 e-153
+4.18993997 e+152
+-4.1899399 e+152
+2.38666903 e-153
+-2.3866690 e-153
+8.37987995 e+152
+-8.3798799 e+152
+1.19333451 e-153
+-1.1933345 e-153
+1.67597599 e+153
+-1.6759759 e+153
+5.96667258 e-154
+-5.9666725 e-154
+3.35195198 e+153
+-3.3519519 e+153
+2.98333629 e-154
+-2.9833362 e-154
+6.70390396 e+153
+-6.7039039 e+153
+1.49166814 e-154
+-1.4916681 e-154
+1.34078079 e+154
+-1.3407807 e+154
+7.45834073 e-155
+-7.4583407 e-155
+2.68156158 e+154
+-2.6815615 e+154
+3.72917036 e-155
+-3.7291703 e-155
+5.36312317 e+154
+-5.3631231 e+154
+1.86458518 e-155
+-1.8645851 e-155
+1.07262463 e+155
+-1.0726246 e+155
+9.32292591 e-156
+-9.3229259 e-156
+2.14524926 e+155
+-2.1452492 e+155
+4.66146295 e-156
+-4.6614629 e-156
+4.29049853 e+155
+-4.2904985 e+155
+2.33073147 e-156
+-2.3307314 e-156
+8.58099707 e+155
+-8.5809970 e+155
+1.16536573 e-156
+-1.1653657 e-156
+1.71619941 e+156
+-1.7161994 e+156
+5.82682869 e-157
+-5.8268286 e-157
+3.43239883 e+156
+-3.4323988 e+156
+2.91341434 e-157
+-2.9134143 e-157
+6.86479766 e+156
+-6.8647976 e+156
+1.45670717 e-157
+-1.4567071 e-157
+1.37295953 e+157
+-1.3729595 e+157
+7.28353587 e-158
+-7.2835358 e-158
+2.74591906 e+157
+-2.7459190 e+157
+3.64176793 e-158
+-3.6417679 e-158
+5.49183812 e+157
+-5.4918381 e+157
+1.82088396 e-158
+-1.8208839 e-158
+1.09836762 e+158
+-1.0983676 e+158
+9.10441983 e-159
+-9.1044198 e-159
+2.19673525 e+158
+-2.1967352 e+158
+4.55220991 e-159
+-4.5522099 e-159
+4.39347050 e+158
+-4.3934705 e+158
+2.27610495 e-159
+-2.2761049 e-159
+8.78694100 e+158
+-8.7869410 e+158
+1.13805247 e-159
+-1.1380524 e-159
+1.75738820 e+159
+-1.7573882 e+159
+5.69026239 e-160
+-5.6902623 e-160
+3.51477640 e+159
+-3.5147764 e+159
+2.84513119 e-160
+-2.8451311 e-160
+7.02955280 e+159
+-7.0295528 e+159
+1.42256559 e-160
+-1.4225655 e-160
+1.40591056 e+160
+-1.4059105 e+160
+7.11282799 e-161
+-7.1128279 e-161
+2.81182112 e+160
+-2.8118211 e+160
+3.55641399 e-161
+-3.5564139 e-161
+5.62364224 e+160
+-5.6236422 e+160
+1.77820699 e-161
+-1.7782069 e-161
+1.12472844 e+161
+-1.1247284 e+161
+8.89103499 e-162
+-8.8910349 e-162
+2.24945689 e+161
+-2.2494568 e+161
+4.44551749 e-162
+-4.4455174 e-162
+4.49891379 e+161
+-4.4989137 e+161
+2.22275874 e-162
+-2.2227587 e-162
+8.99782758 e+161
+-8.9978275 e+161
+1.11137937 e-162
+-1.1113793 e-162
+1.79956551 e+162
+-1.7995655 e+162
+5.55689687 e-163
+-5.5568968 e-163
+3.59913103 e+162
+-3.5991310 e+162
+2.77844843 e-163
+-2.7784484 e-163
+7.19826207 e+162
+-7.1982620 e+162
+1.38922421 e-163
+-1.3892242 e-163
+1.43965241 e+163
+-1.4396524 e+163
+6.94612109 e-164
+-6.9461210 e-164
+2.87930482 e+163
+-2.8793048 e+163
+3.47306054 e-164
+-3.4730605 e-164
+5.75860965 e+163
+-5.7586096 e+163
+1.73653027 e-164
+-1.7365302 e-164
+1.15172193 e+164
+-1.1517219 e+164
+8.68265136 e-165
+-8.6826513 e-165
+2.30344386 e+164
+-2.3034438 e+164
+4.34132568 e-165
+-4.3413256 e-165
+4.60688772 e+164
+-4.6068877 e+164
+2.17066284 e-165
+-2.1706628 e-165
+9.21377545 e+164
+-9.2137754 e+164
+1.08533142 e-165
+-1.0853314 e-165
+1.84275509 e+165
+-1.8427550 e+165
+5.42665710 e-166
+-5.4266571 e-166
+3.68551018 e+165
+-3.6855101 e+165
+2.71332855 e-166
+-2.7133285 e-166
+7.37102036 e+165
+-7.3710203 e+165
+1.35666427 e-166
+-1.3566642 e-166
+1.47420407 e+166
+-1.4742040 e+166
+6.78332137 e-167
+-6.7833213 e-167
+2.94840814 e+166
+-2.9484081 e+166
+3.39166068 e-167
+-3.3916606 e-167
+5.89681628 e+166
+-5.8968162 e+166
+1.69583034 e-167
+-1.6958303 e-167
+1.17936325 e+167
+-1.1793632 e+167
+8.47915172 e-168
+-8.4791517 e-168
+2.35872651 e+167
+-2.3587265 e+167
+4.23957586 e-168
+-4.2395758 e-168
+4.71745303 e+167
+-4.7174530 e+167
+2.11978793 e-168
+-2.1197879 e-168
+9.43490606 e+167
+-9.4349060 e+167
+1.05989396 e-168
+-1.0598939 e-168
+1.88698121 e+168
+-1.8869812 e+168
+5.29946982 e-169
+-5.2994698 e-169
+3.77396242 e+168
+-3.7739624 e+168
+2.64973491 e-169
+-2.6497349 e-169
+7.54792484 e+168
+-7.5479248 e+168
+1.32486745 e-169
+-1.3248674 e-169
+1.50958496 e+169
+-1.5095849 e+169
+6.62433728 e-170
+-6.6243372 e-170
+3.01916993 e+169
+-3.0191699 e+169
+3.31216864 e-170
+-3.3121686 e-170
+6.03833987 e+169
+-6.0383398 e+169
+1.65608432 e-170
+-1.6560843 e-170
+1.20766797 e+170
+-1.2076679 e+170
+8.28042160 e-171
+-8.2804216 e-171
+2.41533595 e+170
+-2.4153359 e+170
+4.14021080 e-171
+-4.1402108 e-171
+4.83067190 e+170
+-4.8306719 e+170
+2.07010540 e-171
+-2.0701054 e-171
+9.66134380 e+170
+-9.6613438 e+170
+1.03505270 e-171
+-1.0350527 e-171
+1.93226876 e+171
+-1.9322687 e+171
+5.17526350 e-172
+-5.1752635 e-172
+3.86453752 e+171
+-3.8645375 e+171
+2.58763175 e-172
+-2.5876317 e-172
+7.72907504 e+171
+-7.7290750 e+171
+1.29381587 e-172
+-1.2938158 e-172
+1.54581500 e+172
+-1.5458150 e+172
+6.46907937 e-173
+-6.4690793 e-173
+3.09163001 e+172
+-3.0916300 e+172
+3.23453968 e-173
+-3.2345396 e-173
+6.18326003 e+172
+-6.1832600 e+172
+1.61726984 e-173
+-1.6172698 e-173
+1.23665200 e+173
+-1.2366520 e+173
+8.08634922 e-174
+-8.0863492 e-174
+2.47330401 e+173
+-2.4733040 e+173
+4.04317461 e-174
+-4.0431746 e-174
+4.94660802 e+173
+-4.9466080 e+173
+2.02158730 e-174
+-2.0215873 e-174
+9.89321605 e+173
+-9.8932160 e+173
+1.01079365 e-174
+-1.0107936 e-174
+1.97864321 e+174
+-1.9786432 e+174
+5.05396826 e-175
+-5.0539682 e-175
+3.95728642 e+174
+-3.9572864 e+174
+2.52698413 e-175
+-2.5269841 e-175
+7.91457284 e+174
+-7.9145728 e+174
+1.26349206 e-175
+-1.2634920 e-175
+1.58291456 e+175
+-1.5829145 e+175
+6.31746033 e-176
+-6.3174603 e-176
+3.16582913 e+175
+-3.1658291 e+175
+3.15873016 e-176
+-3.1587301 e-176
+6.33165827 e+175
+-6.3316582 e+175
+1.57936508 e-176
+-1.5793650 e-176
+1.26633165 e+176
+-1.2663316 e+176
+7.89682541 e-177
+-7.8968254 e-177
+2.53266331 e+176
+-2.5326633 e+176
+3.94841270 e-177
+-3.9484127 e-177
+5.06532662 e+176
+-5.0653266 e+176
+1.97420635 e-177
+-1.9742063 e-177
+1.01306532 e+177
+-1.0130653 e+177
+9.87103176 e-178
+-9.8710317 e-178
+2.02613064 e+177
+-2.0261306 e+177
+4.93551588 e-178
+-4.9355158 e-178
+4.05226129 e+177
+-4.0522612 e+177
+2.46775794 e-178
+-2.4677579 e-178
+8.10452259 e+177
+-8.1045225 e+177
+1.23387897 e-178
+-1.2338789 e-178
+1.62090451 e+178
+-1.6209045 e+178
+6.16939485 e-179
+-6.1693948 e-179
+3.24180903 e+178
+-3.2418090 e+178
+3.08469742 e-179
+-3.0846974 e-179
+6.48361807 e+178
+-6.4836180 e+178
+1.54234871 e-179
+-1.5423487 e-179
+1.29672361 e+179
+-1.2967236 e+179
+7.71174356 e-180
+-7.7117435 e-180
+2.59344723 e+179
+-2.5934472 e+179
+3.85587178 e-180
+-3.8558717 e-180
+5.18689446 e+179
+-5.1868944 e+179
+1.92793589 e-180
+-1.9279358 e-180
+1.03737889 e+180
+-1.0373788 e+180
+9.63967946 e-181
+-9.6396794 e-181
+2.07475778 e+180
+-2.0747577 e+180
+4.81983973 e-181
+-4.8198397 e-181
+4.14951556 e+180
+-4.1495155 e+180
+2.40991986 e-181
+-2.4099198 e-181
+8.29903113 e+180
+-8.2990311 e+180
+1.20495993 e-181
+-1.2049599 e-181
+1.65980622 e+181
+-1.6598062 e+181
+6.02479966 e-182
+-6.0247996 e-182
+3.31961245 e+181
+-3.3196124 e+181
+3.01239983 e-182
+-3.0123998 e-182
+6.63922491 e+181
+-6.6392249 e+181
+1.50619991 e-182
+-1.5061999 e-182
+1.32784498 e+182
+-1.3278449 e+182
+7.53099957 e-183
+-7.5309995 e-183
+2.65568996 e+182
+-2.6556899 e+182
+3.76549978 e-183
+-3.7654997 e-183
+5.31137992 e+182
+-5.3113799 e+182
+1.88274989 e-183
+-1.8827498 e-183
+1.06227598 e+183
+-1.0622759 e+183
+9.41374947 e-184
+-9.4137494 e-184
+2.12455197 e+183
+-2.1245519 e+183
+4.70687473 e-184
+-4.7068747 e-184
+4.24910394 e+183
+-4.2491039 e+183
+2.35343736 e-184
+-2.3534373 e-184
+8.49820788 e+183
+-8.4982078 e+183
+1.17671868 e-184
+-1.1767186 e-184
+1.69964157 e+184
+-1.6996415 e+184
+5.88359342 e-185
+-5.8835934 e-185
+3.39928315 e+184
+-3.3992831 e+184
+2.94179671 e-185
+-2.9417967 e-185
+6.79856630 e+184
+-6.7985663 e+184
+1.47089835 e-185
+-1.4708983 e-185
+1.35971326 e+185
+-1.3597132 e+185
+7.35449177 e-186
+-7.3544917 e-186
+2.71942652 e+185
+-2.7194265 e+185
+3.67724588 e-186
+-3.6772458 e-186
+5.43885304 e+185
+-5.4388530 e+185
+1.83862294 e-186
+-1.8386229 e-186
+1.08777060 e+186
+-1.0877706 e+186
+9.19311471 e-187
+-9.1931147 e-187
+2.17554121 e+186
+-2.1755412 e+186
+4.59655735 e-187
+-4.5965573 e-187
+4.35108243 e+186
+-4.3510824 e+186
+2.29827867 e-187
+-2.2982786 e-187
+8.70216487 e+186
+-8.7021648 e+186
+1.14913933 e-187
+-1.1491393 e-187
+1.74043297 e+187
+-1.7404329 e+187
+5.74569669 e-188
+-5.7456966 e-188
+3.48086594 e+187
+-3.4808659 e+187
+2.87284834 e-188
+-2.8728483 e-188
+6.96173189 e+187
+-6.9617318 e+187
+1.43642417 e-188
+-1.4364241 e-188
+1.39234637 e+188
+-1.3923463 e+188
+7.18212087 e-189
+-7.1821208 e-189
+2.78469275 e+188
+-2.7846927 e+188
+3.59106043 e-189
+-3.5910604 e-189
+5.56938551 e+188
+-5.5693855 e+188
+1.79553021 e-189
+-1.7955302 e-189
+1.11387710 e+189
+-1.1138771 e+189
+8.97765109 e-190
+-8.9776510 e-190
+2.22775420 e+189
+-2.2277542 e+189
+4.48882554 e-190
+-4.4888255 e-190
+4.45550841 e+189
+-4.4555084 e+189
+2.24441277 e-190
+-2.2444127 e-190
+8.91101683 e+189
+-8.9110168 e+189
+1.12220638 e-190
+-1.1222063 e-190
+1.78220336 e+190
+-1.7822033 e+190
+5.61103193 e-191
+-5.6110319 e-191
+3.56440673 e+190
+-3.5644067 e+190
+2.80551596 e-191
+-2.8055159 e-191
+7.12881346 e+190
+-7.1288134 e+190
+1.40275798 e-191
+-1.4027579 e-191
+1.42576269 e+191
+-1.4257626 e+191
+7.01378991 e-192
+-7.0137899 e-192
+2.85152538 e+191
+-2.8515253 e+191
+3.50689495 e-192
+-3.5068949 e-192
+5.70305077 e+191
+-5.7030507 e+191
+1.75344747 e-192
+-1.7534474 e-192
+1.14061015 e+192
+-1.1406101 e+192
+8.76723739 e-193
+-8.7672373 e-193
+2.28122030 e+192
+-2.2812203 e+192
+4.38361869 e-193
+-4.3836186 e-193
+4.56244061 e+192
+-4.5624406 e+192
+2.19180934 e-193
+-2.1918093 e-193
+9.12488123 e+192
+-9.1248812 e+192
+1.09590467 e-193
+-1.0959046 e-193
+1.82497624 e+193
+-1.8249762 e+193
+5.47952337 e-194
+-5.4795233 e-194
+3.64995249 e+193
+-3.6499524 e+193
+2.73976168 e-194
+-2.7397616 e-194
+7.29990498 e+193
+-7.2999049 e+193
+1.36988084 e-194
+-1.3698808 e-194
+1.45998099 e+194
+-1.4599809 e+194
+6.84940421 e-195
+-6.8494042 e-195
+2.91996199 e+194
+-2.9199619 e+194
+3.42470210 e-195
+-3.4247021 e-195
+5.83992399 e+194
+-5.8399239 e+194
+1.71235105 e-195
+-1.7123510 e-195
+1.16798479 e+195
+-1.1679847 e+195
+8.56175526 e-196
+-8.5617552 e-196
+2.33596959 e+195
+-2.3359695 e+195
+4.28087763 e-196
+-4.2808776 e-196
+4.67193919 e+195
+-4.6719391 e+195
+2.14043881 e-196
+-2.1404388 e-196
+9.34387838 e+195
+-9.3438783 e+195
+1.07021940 e-196
+-1.0702194 e-196
+1.86877567 e+196
+-1.8687756 e+196
+5.35109704 e-197
+-5.3510970 e-197
+3.73755135 e+196
+-3.7375513 e+196
+2.67554852 e-197
+-2.6755485 e-197
+7.47510270 e+196
+-7.4751027 e+196
+1.33777426 e-197
+-1.3377742 e-197
+1.49502054 e+197
+-1.4950205 e+197
+6.68887130 e-198
+-6.6888713 e-198
+2.99004108 e+197
+-2.9900410 e+197
+3.34443565 e-198
+-3.3444356 e-198
+5.98008216 e+197
+-5.9800821 e+197
+1.67221782 e-198
+-1.6722178 e-198
+1.19601643 e+198
+-1.1960164 e+198
+8.36108913 e-199
+-8.3610891 e-199
+2.39203286 e+198
+-2.3920328 e+198
+4.18054456 e-199
+-4.1805445 e-199
+4.78406573 e+198
+-4.7840657 e+198
+2.09027228 e-199
+-2.0902722 e-199
+9.56813146 e+198
+-9.5681314 e+198
+1.04513614 e-199
+-1.0451361 e-199
+1.91362629 e+199
+-1.9136262 e+199
+5.22568070 e-200
+-5.2256807 e-200
+3.82725258 e+199
+-3.8272525 e+199
+2.61284035 e-200
+-2.6128403 e-200
+7.65450517 e+199
+-7.6545051 e+199
+1.30642017 e-200
+-1.3064201 e-200
+1.53090103 e+200
+-1.5309010 e+200
+6.53210088 e-201
+-6.5321008 e-201
+3.06180206 e+200
+-3.0618020 e+200
+3.26605044 e-201
+-3.2660504 e-201
+6.12360413 e+200
+-6.1236041 e+200
+1.63302522 e-201
+-1.6330252 e-201
+1.22472082 e+201
+-1.2247208 e+201
+8.16512610 e-202
+-8.1651261 e-202
+2.44944165 e+201
+-2.4494416 e+201
+4.08256305 e-202
+-4.0825630 e-202
+4.89888331 e+201
+-4.8988833 e+201
+2.04128152 e-202
+-2.0412815 e-202
+9.79776662 e+201
+-9.7977666 e+201
+1.02064076 e-202
+-1.0206407 e-202
+1.95955332 e+202
+-1.9595533 e+202
+5.10320381 e-203
+-5.1032038 e-203
+3.91910664 e+202
+-3.9191066 e+202
+2.55160190 e-203
+-2.5516019 e-203
+7.83821329 e+202
+-7.8382132 e+202
+1.27580095 e-203
+-1.2758009 e-203
+1.56764265 e+203
+-1.5676426 e+203
+6.37900476 e-204
+-6.3790047 e-204
+3.13528531 e+203
+-3.1352853 e+203
+3.18950238 e-204
+-3.1895023 e-204
+6.27057063 e+203
+-6.2705706 e+203
+1.59475119 e-204
+-1.5947511 e-204
+1.25411412 e+204
+-1.2541141 e+204
+7.97375596 e-205
+-7.9737559 e-205
+2.50822825 e+204
+-2.5082282 e+204
+3.98687798 e-205
+-3.9868779 e-205
+5.01645651 e+204
+-5.0164565 e+204
+1.99343899 e-205
+-1.9934389 e-205
+1.00329130 e+205
+-1.0032913 e+205
+9.96719495 e-206
+-9.9671949 e-206
+2.00658260 e+205
+-2.0065826 e+205
+4.98359747 e-206
+-4.9835974 e-206
+4.01316520 e+205
+-4.0131652 e+205
+2.49179873 e-206
+-2.4917987 e-206
+8.02633041 e+205
+-8.0263304 e+205
+1.24589936 e-206
+-1.2458993 e-206
+1.60526608 e+206
+-1.6052660 e+206
+6.22949684 e-207
+-6.2294968 e-207
+3.21053216 e+206
+-3.2105321 e+206
+3.11474842 e-207
+-3.1147484 e-207
+6.42106433 e+206
+-6.4210643 e+206
+1.55737421 e-207
+-1.5573742 e-207
+1.28421286 e+207
+-1.2842128 e+207
+7.78687105 e-208
+-7.7868710 e-208
+2.56842573 e+207
+-2.5684257 e+207
+3.89343552 e-208
+-3.8934355 e-208
+5.13685146 e+207
+-5.1368514 e+207
+1.94671776 e-208
+-1.9467177 e-208
+1.02737029 e+208
+-1.0273702 e+208
+9.73358881 e-209
+-9.7335888 e-209
+2.05474058 e+208
+-2.0547405 e+208
+4.86679440 e-209
+-4.8667944 e-209
+4.10948117 e+208
+-4.1094811 e+208
+2.43339720 e-209
+-2.4333972 e-209
+8.21896234 e+208
+-8.2189623 e+208
+1.21669860 e-209
+-1.2166986 e-209
+1.64379246 e+209
+-1.6437924 e+209
+6.08349301 e-210
+-6.0834930 e-210
+3.28758493 e+209
+-3.2875849 e+209
+3.04174650 e-210
+-3.0417465 e-210
+6.57516987 e+209
+-6.5751698 e+209
+1.52087325 e-210
+-1.5208732 e-210
+1.31503397 e+210
+-1.3150339 e+210
+7.60436626 e-211
+-7.6043662 e-211
+2.63006795 e+210
+-2.6300679 e+210
+3.80218313 e-211
+-3.8021831 e-211
+5.26013590 e+210
+-5.2601359 e+210
+1.90109156 e-211
+-1.9010915 e-211
+1.05202718 e+211
+-1.0520271 e+211
+9.50545783 e-212
+-9.5054578 e-212
+2.10405436 e+211
+-2.1040543 e+211
+4.75272891 e-212
+-4.7527289 e-212
+4.20810872 e+211
+-4.2081087 e+211
+2.37636445 e-212
+-2.3763644 e-212
+8.41621744 e+211
+-8.4162174 e+211
+1.18818222 e-212
+-1.1881822 e-212
+1.68324348 e+212
+-1.6832434 e+212
+5.94091114 e-213
+-5.9409111 e-213
+3.36648697 e+212
+-3.3664869 e+212
+2.97045557 e-213
+-2.9704555 e-213
+6.73297395 e+212
+-6.7329739 e+212
+1.48522778 e-213
+-1.4852277 e-213
+1.34659479 e+213
+-1.3465947 e+213
+7.42613893 e-214
+-7.4261389 e-214
+2.69318958 e+213
+-2.6931895 e+213
+3.71306946 e-214
+-3.7130694 e-214
+5.38637916 e+213
+-5.3863791 e+213
+1.85653473 e-214
+-1.8565347 e-214
+1.07727583 e+214
+-1.0772758 e+214
+9.28267366 e-215
+-9.2826736 e-215
+2.15455166 e+214
+-2.1545516 e+214
+4.64133683 e-215
+-4.6413368 e-215
+4.30910333 e+214
+-4.3091033 e+214
+2.32066841 e-215
+-2.3206684 e-215
+8.61820666 e+214
+-8.6182066 e+214
+1.16033420 e-215
+-1.1603342 e-215
+1.72364133 e+215
+-1.7236413 e+215
+5.80167103 e-216
+-5.8016710 e-216
+3.44728266 e+215
+-3.4472826 e+215
+2.90083551 e-216
+-2.9008355 e-216
+6.89456532 e+215
+-6.8945653 e+215
+1.45041775 e-216
+-1.4504177 e-216
+1.37891306 e+216
+-1.3789130 e+216
+7.25208879 e-217
+-7.2520887 e-217
+2.75782613 e+216
+-2.7578261 e+216
+3.62604439 e-217
+-3.6260443 e-217
+5.51565226 e+216
+-5.5156522 e+216
+1.81302219 e-217
+-1.8130221 e-217
+1.10313045 e+217
+-1.1031304 e+217
+9.06511099 e-218
+-9.0651109 e-218
+2.20626090 e+217
+-2.2062609 e+217
+4.53255549 e-218
+-4.5325554 e-218
+4.41252181 e+217
+-4.4125218 e+217
+2.26627774 e-218
+-2.2662777 e-218
+8.82504362 e+217
+-8.8250436 e+217
+1.13313887 e-218
+-1.1331388 e-218
+1.76500872 e+218
+-1.7650087 e+218
+5.66569437 e-219
+-5.6656943 e-219
+3.53001744 e+218
+-3.5300174 e+218
+2.83284718 e-219
+-2.8328471 e-219
+7.06003489 e+218
+-7.0600348 e+218
+1.41642359 e-219
+-1.4164235 e-219
+1.41200697 e+219
+-1.4120069 e+219
+7.08211796 e-220
+-7.0821179 e-220
+2.82401395 e+219
+-2.8240139 e+219
+3.54105898 e-220
+-3.5410589 e-220
+5.64802791 e+219
+-5.6480279 e+219
+1.77052949 e-220
+-1.7705294 e-220
+1.12960558 e+220
+-1.1296055 e+220
+8.85264746 e-221
+-8.8526474 e-221
+2.25921116 e+220
+-2.2592111 e+220
+4.42632373 e-221
+-4.4263237 e-221
+4.51842233 e+220
+-4.5184223 e+220
+2.21316186 e-221
+-2.2131618 e-221
+9.03684466 e+220
+-9.0368446 e+220
+1.10658093 e-221
+-1.1065809 e-221
+1.80736893 e+221
+-1.8073689 e+221
+5.53290466 e-222
+-5.5329046 e-222
+3.61473786 e+221
+-3.6147378 e+221
+2.76645233 e-222
+-2.7664523 e-222
+7.22947573 e+221
+-7.2294757 e+221
+1.38322616 e-222
+-1.3832261 e-222
+1.44589514 e+222
+-1.4458951 e+222
+6.91613082 e-223
+-6.9161308 e-223
+2.89179029 e+222
+-2.8917902 e+222
+3.45806541 e-223
+-3.4580654 e-223
+5.78358058 e+222
+-5.7835805 e+222
+1.72903270 e-223
+-1.7290327 e-223
+1.15671611 e+223
+-1.1567161 e+223
+8.64516353 e-224
+-8.6451635 e-224
+2.31343223 e+223
+-2.3134322 e+223
+4.32258176 e-224
+-4.3225817 e-224
+4.62686446 e+223
+-4.6268644 e+223
+2.16129088 e-224
+-2.1612908 e-224
+9.25372893 e+223
+-9.2537289 e+223
+1.08064544 e-224
+-1.0806454 e-224
+1.85074578 e+224
+-1.8507457 e+224
+5.40322720 e-225
+-5.4032272 e-225
+3.70149157 e+224
+-3.7014915 e+224
+2.70161360 e-225
+-2.7016136 e-225
+7.40298315 e+224
+-7.4029831 e+224
+1.35080680 e-225
+-1.3508068 e-225
+1.48059663 e+225
+-1.4805966 e+225
+6.75403401 e-226
+-6.7540340 e-226
+2.96119326 e+225
+-2.9611932 e+225
+3.37701700 e-226
+-3.3770170 e-226
+5.92238652 e+225
+-5.9223865 e+225
+1.68850850 e-226
+-1.6885085 e-226
+1.18447730 e+226
+-1.1844773 e+226
+8.44254251 e-227
+-8.4425425 e-227
+2.36895460 e+226
+-2.3689546 e+226
+4.22127125 e-227
+-4.2212712 e-227
+4.73790921 e+226
+-4.7379092 e+226
+2.11063562 e-227
+-2.1106356 e-227
+9.47581843 e+226
+-9.4758184 e+226
+1.05531781 e-227
+-1.0553178 e-227
+1.89516368 e+227
+-1.8951636 e+227
+5.27658907 e-228
+-5.2765890 e-228
+3.79032737 e+227
+-3.7903273 e+227
+2.63829453 e-228
+-2.6382945 e-228
+7.58065474 e+227
+-7.5806547 e+227
+1.31914726 e-228
+-1.3191472 e-228
+1.51613094 e+228
+-1.5161309 e+228
+6.59573634 e-229
+-6.5957363 e-229
+3.03226189 e+228
+-3.0322618 e+228
+3.29786817 e-229
+-3.2978681 e-229
+6.06452379 e+228
+-6.0645237 e+228
+1.64893408 e-229
+-1.6489340 e-229
+1.21290475 e+229
+-1.2129047 e+229
+8.24467042 e-230
+-8.2446704 e-230
+2.42580951 e+229
+-2.4258095 e+229
+4.12233521 e-230
+-4.1223352 e-230
+4.85161903 e+229
+-4.8516190 e+229
+2.06116760 e-230
+-2.0611676 e-230
+9.70323807 e+229
+-9.7032380 e+229
+1.03058380 e-230
+-1.0305838 e-230
+1.94064761 e+230
+-1.9406476 e+230
+5.15291901 e-231
+-5.1529190 e-231
+3.88129523 e+230
+-3.8812952 e+230
+2.57645950 e-231
+-2.5764595 e-231
+7.76259046 e+230
+-7.7625904 e+230
+1.28822975 e-231
+-1.2882297 e-231
+1.55251809 e+231
+-1.5525180 e+231
+6.44114876 e-232
+-6.4411487 e-232
+3.10503618 e+231
+-3.1050361 e+231
+3.22057438 e-232
+-3.2205743 e-232
+6.21007236 e+231
+-6.2100723 e+231
+1.61028719 e-232
+-1.6102871 e-232
+1.24201447 e+232
+-1.2420144 e+232
+8.05143596 e-233
+-8.0514359 e-233
+2.48402894 e+232
+-2.4840289 e+232
+4.02571798 e-233
+-4.0257179 e-233
+4.96805789 e+232
+-4.9680578 e+232
+2.01285899 e-233
+-2.0128589 e-233
+9.93611579 e+232
+-9.9361157 e+232
+1.00642949 e-233
+-1.0064294 e-233
+1.98722315 e+233
+-1.9872231 e+233
+5.03214747 e-234
+-5.0321474 e-234
+3.97444631 e+233
+-3.9744463 e+233
+2.51607373 e-234
+-2.5160737 e-234
+7.94889263 e+233
+-7.9488926 e+233
+1.25803686 e-234
+-1.2580368 e-234
+1.58977852 e+234
+-1.5897785 e+234
+6.29018434 e-235
+-6.2901843 e-235
+3.17955705 e+234
+-3.1795570 e+234
+3.14509217 e-235
+-3.1450921 e-235
+6.35911410 e+234
+-6.3591141 e+234
+1.57254608 e-235
+-1.5725460 e-235
+1.27182282 e+235
+-1.2718228 e+235
+7.86273043 e-236
+-7.8627304 e-236
+2.54364564 e+235
+-2.5436456 e+235
+3.93136521 e-236
+-3.9313652 e-236
+5.08729128 e+235
+-5.0872912 e+235
+1.96568260 e-236
+-1.9656826 e-236
+1.01745825 e+236
+-1.0174582 e+236
+9.82841303 e-237
+-9.8284130 e-237
+2.03491651 e+236
+-2.0349165 e+236
+4.91420651 e-237
+-4.9142065 e-237
+4.06983302 e+236
+-4.0698330 e+236
+2.45710325 e-237
+-2.4571032 e-237
+8.13966605 e+236
+-8.1396660 e+236
+1.22855162 e-237
+-1.2285516 e-237
+1.62793321 e+237
+-1.6279332 e+237
+6.14275814 e-238
+-6.1427581 e-238
+3.25586642 e+237
+-3.2558664 e+237
+3.07137907 e-238
+-3.0713790 e-238
+6.51173284 e+237
+-6.5117328 e+237
+1.53568953 e-238
+-1.5356895 e-238
+1.30234656 e+238
+-1.3023465 e+238
+7.67844768 e-239
+-7.6784476 e-239
+2.60469313 e+238
+-2.6046931 e+238
+3.83922384 e-239
+-3.8392238 e-239
+5.20938627 e+238
+-5.2093862 e+238
+1.91961192 e-239
+-1.9196119 e-239
+1.04187725 e+239
+-1.0418772 e+239
+9.59805960 e-240
+-9.5980596 e-240
+2.08375451 e+239
+-2.0837545 e+239
+4.79902980 e-240
+-4.7990298 e-240
+4.16750902 e+239
+-4.1675090 e+239
+2.39951490 e-240
+-2.3995149 e-240
+8.33501804 e+239
+-8.3350180 e+239
+1.19975745 e-240
+-1.1997574 e-240
+1.66700360 e+240
+-1.6670036 e+240
+5.99878725 e-241
+-5.9987872 e-241
+3.33400721 e+240
+-3.3340072 e+240
+2.99939362 e-241
+-2.9993936 e-241
+6.66801443 e+240
+-6.6680144 e+240
+1.49969681 e-241
+-1.4996968 e-241
+1.33360288 e+241
+-1.3336028 e+241
+7.49848406 e-242
+-7.4984840 e-242
+2.66720577 e+241
+-2.6672057 e+241
+3.74924203 e-242
+-3.7492420 e-242
+5.33441154 e+241
+-5.3344115 e+241
+1.87462101 e-242
+-1.8746210 e-242
+1.06688230 e+242
+-1.0668823 e+242
+9.37310508 e-243
+-9.3731050 e-243
+2.13376461 e+242
+-2.1337646 e+242
+4.68655254 e-243
+-4.6865525 e-243
+4.26752923 e+242
+-4.2675292 e+242
+2.34327627 e-243
+-2.3432762 e-243
+8.53505847 e+242
+-8.5350584 e+242
+1.17163813 e-243
+-1.1716381 e-243
+1.70701169 e+243
+-1.7070116 e+243
+5.85819067 e-244
+-5.8581906 e-244
+3.41402338 e+243
+-3.4140233 e+243
+2.92909533 e-244
+-2.9290953 e-244
+6.82804677 e+243
+-6.8280467 e+243
+1.46454766 e-244
+-1.4645476 e-244
+1.36560935 e+244
+-1.3656093 e+244
+7.32273834 e-245
+-7.3227383 e-245
+2.73121871 e+244
+-2.7312187 e+244
+3.66136917 e-245
+-3.6613691 e-245
+5.46243742 e+244
+-5.4624374 e+244
+1.83068458 e-245
+-1.8306845 e-245
+1.09248748 e+245
+-1.0924874 e+245
+9.15342293 e-246
+-9.1534229 e-246
+2.18497496 e+245
+-2.1849749 e+245
+4.57671146 e-246
+-4.5767114 e-246
+4.36994993 e+245
+-4.3699499 e+245
+2.28835573 e-246
+-2.2883557 e-246
+8.73989987 e+245
+-8.7398998 e+245
+1.14417786 e-246
+-1.1441778 e-246
+1.74797997 e+246
+-1.7479799 e+246
+5.72088933 e-247
+-5.7208893 e-247
+3.49595995 e+246
+-3.4959599 e+246
+2.86044466 e-247
+-2.8604446 e-247
+6.99191990 e+246
+-6.9919199 e+246
+1.43022233 e-247
+-1.4302223 e-247
+1.39838398 e+247
+-1.3983839 e+247
+7.15111166 e-248
+-7.1511116 e-248
+2.79676796 e+247
+-2.7967679 e+247
+3.57555583 e-248
+-3.5755558 e-248
+5.59353592 e+247
+-5.5935359 e+247
+1.78777791 e-248
+-1.7877779 e-248
+1.11870718 e+248
+-1.1187071 e+248
+8.93888958 e-249
+-8.9388895 e-249
+2.23741436 e+248
+-2.2374143 e+248
+4.46944479 e-249
+-4.4694447 e-249
+4.47482873 e+248
+-4.4748287 e+248
+2.23472239 e-249
+-2.2347223 e-249
+8.94965747 e+248
+-8.9496574 e+248
+1.11736119 e-249
+-1.1173611 e-249
+1.78993149 e+249
+-1.7899314 e+249
+5.58680599 e-250
+-5.5868059 e-250
+3.57986298 e+249
+-3.5798629 e+249
+2.79340299 e-250
+-2.7934029 e-250
+7.15972597 e+249
+-7.1597259 e+249
+1.39670149 e-250
+-1.3967014 e-250
+1.43194519 e+250
+-1.4319451 e+250
+6.98350748 e-251
+-6.9835074 e-251
+2.86389039 e+250
+-2.8638903 e+250
+3.49175374 e-251
+-3.4917537 e-251
+5.72778078 e+250
+-5.7277807 e+250
+1.74587687 e-251
+-1.7458768 e-251
+1.14555615 e+251
+-1.1455561 e+251
+8.72938436 e-252
+-8.7293843 e-252
+2.29111231 e+251
+-2.2911123 e+251
+4.36469218 e-252
+-4.3646921 e-252
+4.58222462 e+251
+-4.5822246 e+251
+2.18234609 e-252
+-2.1823460 e-252
+9.16444925 e+251
+-9.1644492 e+251
+1.09117304 e-252
+-1.0911730 e-252
+1.83288985 e+252
+-1.8328898 e+252
+5.45586522 e-253
+-5.4558652 e-253
+3.66577970 e+252
+-3.6657797 e+252
+2.72793261 e-253
+-2.7279326 e-253
+7.33155940 e+252
+-7.3315594 e+252
+1.36396630 e-253
+-1.3639663 e-253
+1.46631188 e+253
+-1.4663118 e+253
+6.81983153 e-254
+-6.8198315 e-254
+2.93262376 e+253
+-2.9326237 e+253
+3.40991576 e-254
+-3.4099157 e-254
+5.86524752 e+253
+-5.8652475 e+253
+1.70495788 e-254
+-1.7049578 e-254
+1.17304950 e+254
+-1.1730495 e+254
+8.52478941 e-255
+-8.5247894 e-255
+2.34609900 e+254
+-2.3460990 e+254
+4.26239470 e-255
+-4.2623947 e-255
+4.69219801 e+254
+-4.6921980 e+254
+2.13119735 e-255
+-2.1311973 e-255
+9.38439603 e+254
+-9.3843960 e+254
+1.06559867 e-255
+-1.0655986 e-255
+1.87687920 e+255
+-1.8768792 e+255
+5.32799338 e-256
+-5.3279933 e-256
+3.75375841 e+255
+-3.7537584 e+255
+2.66399669 e-256
+-2.6639966 e-256
+7.50751682 e+255
+-7.5075168 e+255
+1.33199834 e-256
+-1.3319983 e-256
+1.50150336 e+256
+-1.5015033 e+256
+6.65999173 e-257
+-6.6599917 e-257
+3.00300673 e+256
+-3.0030067 e+256
+3.32999586 e-257
+-3.3299958 e-257
+6.00601346 e+256
+-6.0060134 e+256
+1.66499793 e-257
+-1.6649979 e-257
+1.20120269 e+257
+-1.2012026 e+257
+8.32498966 e-258
+-8.3249896 e-258
+2.40240538 e+257
+-2.4024053 e+257
+4.16249483 e-258
+-4.1624948 e-258
+4.80481077 e+257
+-4.8048107 e+257
+2.08124741 e-258
+-2.0812474 e-258
+9.60962154 e+257
+-9.6096215 e+257
+1.04062370 e-258
+-1.0406237 e-258
+1.92192430 e+258
+-1.9219243 e+258
+5.20311853 e-259
+-5.2031185 e-259
+3.84384861 e+258
+-3.8438486 e+258
+2.60155926 e-259
+-2.6015592 e-259
+7.68769723 e+258
+-7.6876972 e+258
+1.30077963 e-259
+-1.3007796 e-259
+1.53753944 e+259
+-1.5375394 e+259
+6.50389817 e-260
+-6.5038981 e-260
+3.07507889 e+259
+-3.0750788 e+259
+3.25194908 e-260
+-3.2519490 e-260
+6.15015778 e+259
+-6.1501577 e+259
+1.62597454 e-260
+-1.6259745 e-260
+1.23003155 e+260
+-1.2300315 e+260
+8.12987271 e-261
+-8.1298727 e-261
+2.46006311 e+260
+-2.4600631 e+260
+4.06493635 e-261
+-4.0649363 e-261
+4.92012622 e+260
+-4.9201262 e+260
+2.03246817 e-261
+-2.0324681 e-261
+9.84025245 e+260
+-9.8402524 e+260
+1.01623408 e-261
+-1.0162340 e-261
+1.96805049 e+261
+-1.9680504 e+261
+5.08117044 e-262
+-5.0811704 e-262
+3.93610098 e+261
+-3.9361009 e+261
+2.54058522 e-262
+-2.5405852 e-262
+7.87220196 e+261
+-7.8722019 e+261
+1.27029261 e-262
+-1.2702926 e-262
+1.57444039 e+262
+-1.5744403 e+262
+6.35146306 e-263
+-6.3514630 e-263
+3.14888078 e+262
+-3.1488807 e+262
+3.17573153 e-263
+-3.1757315 e-263
+6.29776157 e+262
+-6.2977615 e+262
+1.58786576 e-263
+-1.5878657 e-263
+1.25955231 e+263
+-1.2595523 e+263
+7.93932882 e-264
+-7.9393288 e-264
+2.51910462 e+263
+-2.5191046 e+263
+3.96966441 e-264
+-3.9696644 e-264
+5.03820925 e+263
+-5.0382092 e+263
+1.98483220 e-264
+-1.9848322 e-264
+1.00764185 e+264
+-1.0076418 e+264
+9.92416103 e-265
+-9.9241610 e-265
+2.01528370 e+264
+-2.0152837 e+264
+4.96208051 e-265
+-4.9620805 e-265
+4.03056740 e+264
+-4.0305674 e+264
+2.48104025 e-265
+-2.4810402 e-265
+8.06113481 e+264
+-8.0611348 e+264
+1.24052012 e-265
+-1.2405201 e-265
+1.61222696 e+265
+-1.6122269 e+265
+6.20260064 e-266
+-6.2026006 e-266
+3.22445392 e+265
+-3.2244539 e+265
+3.10130032 e-266
+-3.1013003 e-266
+6.44890785 e+265
+-6.4489078 e+265
+1.55065016 e-266
+-1.5506501 e-266
+1.28978157 e+266
+-1.2897815 e+266
+7.75325080 e-267
+-7.7532508 e-267
+2.57956314 e+266
+-2.5795631 e+266
+3.87662540 e-267
+-3.8766254 e-267
+5.15912628 e+266
+-5.1591262 e+266
+1.93831270 e-267
+-1.9383127 e-267
+1.03182525 e+267
+-1.0318252 e+267
+9.69156350 e-268
+-9.6915635 e-268
+2.06365051 e+267
+-2.0636505 e+267
+4.84578175 e-268
+-4.8457817 e-268
+4.12730102 e+267
+-4.1273010 e+267
+2.42289087 e-268
+-2.4228908 e-268
+8.25460204 e+267
+-8.2546020 e+267
+1.21144543 e-268
+-1.2114454 e-268
+1.65092040 e+268
+-1.6509204 e+268
+6.05722719 e-269
+-6.0572271 e-269
+3.30184081 e+268
+-3.3018408 e+268
+3.02861359 e-269
+-3.0286135 e-269
+6.60368163 e+268
+-6.6036816 e+268
+1.51430679 e-269
+-1.5143067 e-269
+1.32073632 e+269
+-1.3207363 e+269
+7.57153399 e-270
+-7.5715339 e-270
+2.64147265 e+269
+-2.6414726 e+269
+3.78576699 e-270
+-3.7857669 e-270
+5.28294531 e+269
+-5.2829453 e+269
+1.89288349 e-270
+-1.8928834 e-270
+1.05658906 e+270
+-1.0565890 e+270
+9.46441748 e-271
+-9.4644174 e-271
+2.11317812 e+270
+-2.1131781 e+270
+4.73220874 e-271
+-4.7322087 e-271
+4.22635624 e+270
+-4.2263562 e+270
+2.36610437 e-271
+-2.3661043 e-271
+8.45271249 e+270
+-8.4527124 e+270
+1.18305218 e-271
+-1.1830521 e-271
+1.69054249 e+271
+-1.6905424 e+271
+5.91526093 e-272
+-5.9152609 e-272
+3.38108499 e+271
+-3.3810849 e+271
+2.95763046 e-272
+-2.9576304 e-272
+6.76216999 e+271
+-6.7621699 e+271
+1.47881523 e-272
+-1.4788152 e-272
+1.35243399 e+272
+-1.3524339 e+272
+7.39407616 e-273
+-7.3940761 e-273
+2.70486799 e+272
+-2.7048679 e+272
+3.69703808 e-273
+-3.6970380 e-273
+5.40973599 e+272
+-5.4097359 e+272
+1.84851904 e-273
+-1.8485190 e-273
+1.08194719 e+273
+-1.0819471 e+273
+9.24259520 e-274
+-9.2425952 e-274
+2.16389439 e+273
+-2.1638943 e+273
+4.62129760 e-274
+-4.6212976 e-274
+4.32778879 e+273
+-4.3277887 e+273
+2.31064880 e-274
+-2.3106488 e-274
+8.65557759 e+273
+-8.6555775 e+273
+1.15532440 e-274
+-1.1553244 e-274
+1.73111551 e+274
+-1.7311155 e+274
+5.77662200 e-275
+-5.7766220 e-275
+3.46223103 e+274
+-3.4622310 e+274
+2.88831100 e-275
+-2.8883110 e-275
+6.92446207 e+274
+-6.9244620 e+274
+1.44415550 e-275
+-1.4441555 e-275
+1.38489241 e+275
+-1.3848924 e+275
+7.22077750 e-276
+-7.2207775 e-276
+2.76978483 e+275
+-2.7697848 e+275
+3.61038875 e-276
+-3.6103887 e-276
+5.53956966 e+275
+-5.5395696 e+275
+1.80519437 e-276
+-1.8051943 e-276
+1.10791393 e+276
+-1.1079139 e+276
+9.02597187 e-277
+-9.0259718 e-277
+2.21582786 e+276
+-2.2158278 e+276
+4.51298593 e-277
+-4.5129859 e-277
+4.43165573 e+276
+-4.4316557 e+276
+2.25649296 e-277
+-2.2564929 e-277
+8.86331146 e+276
+-8.8633114 e+276
+1.12824648 e-277
+-1.1282464 e-277
+1.77266229 e+277
+-1.7726622 e+277
+5.64123242 e-278
+-5.6412324 e-278
+3.54532458 e+277
+-3.5453245 e+277
+2.82061621 e-278
+-2.8206162 e-278
+7.09064916 e+277
+-7.0906491 e+277
+1.41030810 e-278
+-1.4103081 e-278
+1.41812983 e+278
+-1.4181298 e+278
+7.05154053 e-279
+-7.0515405 e-279
+2.83625966 e+278
+-2.8362596 e+278
+3.52577026 e-279
+-3.5257702 e-279
+5.67251933 e+278
+-5.6725193 e+278
+1.76288513 e-279
+-1.7628851 e-279
+1.13450386 e+279
+-1.1345038 e+279
+8.81442566 e-280
+-8.8144256 e-280
+2.26900773 e+279
+-2.2690077 e+279
+4.40721283 e-280
+-4.4072128 e-280
+4.53801546 e+279
+-4.5380154 e+279
+2.20360641 e-280
+-2.2036064 e-280
+9.07603093 e+279
+-9.0760309 e+279
+1.10180320 e-280
+-1.1018032 e-280
+1.81520618 e+280
+-1.8152061 e+280
+5.50901603 e-281
+-5.5090160 e-281
+3.63041237 e+280
+-3.6304123 e+280
+2.75450801 e-281
+-2.7545080 e-281
+7.26082474 e+280
+-7.2608247 e+280
+1.37725400 e-281
+-1.3772540 e-281
+1.45216494 e+281
+-1.4521649 e+281
+6.88627004 e-282
+-6.8862700 e-282
+2.90432989 e+281
+-2.9043298 e+281
+3.44313502 e-282
+-3.4431350 e-282
+5.80865979 e+281
+-5.8086597 e+281
+1.72156751 e-282
+-1.7215675 e-282
+1.16173195 e+282
+-1.1617319 e+282
+8.60783756 e-283
+-8.6078375 e-283
+2.32346391 e+282
+-2.3234639 e+282
+4.30391878 e-283
+-4.3039187 e-283
+4.64692783 e+282
+-4.6469278 e+282
+2.15195939 e-283
+-2.1519593 e-283
+9.29385567 e+282
+-9.2938556 e+282
+1.07597969 e-283
+-1.0759796 e-283
+1.85877113 e+283
+-1.8587711 e+283
+5.37989847 e-284
+-5.3798984 e-284
+3.71754227 e+283
+-3.7175422 e+283
+2.68994923 e-284
+-2.6899492 e-284
+7.43508454 e+283
+-7.4350845 e+283
+1.34497461 e-284
+-1.3449746 e-284
+1.48701690 e+284
+-1.4870169 e+284
+6.72487309 e-285
+-6.7248730 e-285
+2.97403381 e+284
+-2.9740338 e+284
+3.36243654 e-285
+-3.3624365 e-285
+5.94806763 e+284
+-5.9480676 e+284
+1.68121827 e-285
+-1.6812182 e-285
+1.18961352 e+285
+-1.1896135 e+285
+8.40609136 e-286
+-8.4060913 e-286
+2.37922705 e+285
+-2.3792270 e+285
+4.20304568 e-286
+-4.2030456 e-286
+4.75845410 e+285
+-4.7584541 e+285
+2.10152284 e-286
+-2.1015228 e-286
+9.51690821 e+285
+-9.5169082 e+285
+1.05076142 e-286
+-1.0507614 e-286
+1.90338164 e+286
+-1.9033816 e+286
+5.25380710 e-287
+-5.2538071 e-287
+3.80676328 e+286
+-3.8067632 e+286
+2.62690355 e-287
+-2.6269035 e-287
+7.61352657 e+286
+-7.6135265 e+286
+1.31345177 e-287
+-1.3134517 e-287
+1.52270531 e+287
+-1.5227053 e+287
+6.56725888 e-288
+-6.5672588 e-288
+3.04541062 e+287
+-3.0454106 e+287
+3.28362944 e-288
+-3.2836294 e-288
+6.09082125 e+287
+-6.0908212 e+287
+1.64181472 e-288
+-1.6418147 e-288
+1.21816425 e+288
+-1.2181642 e+288
+8.20907360 e-289
+-8.2090736 e-289
+2.43632850 e+288
+-2.4363285 e+288
+4.10453680 e-289
+-4.1045368 e-289
+4.87265700 e+288
+-4.8726570 e+288
+2.05226840 e-289
+-2.0522684 e-289
+9.74531401 e+288
+-9.7453140 e+288
+1.02613420 e-289
+-1.0261342 e-289
+1.94906280 e+289
+-1.9490628 e+289
+5.13067100 e-290
+-5.1306710 e-290
+3.89812560 e+289
+-3.8981256 e+289
+2.56533550 e-290
+-2.5653355 e-290
+7.79625120 e+289
+-7.7962512 e+289
+1.28266775 e-290
+-1.2826677 e-290
+1.55925024 e+290
+-1.5592502 e+290
+6.41333875 e-291
+-6.4133387 e-291
+3.11850048 e+290
+-3.1185004 e+290
+3.20666937 e-291
+-3.2066693 e-291
+6.23700096 e+290
+-6.2370009 e+290
+1.60333468 e-291
+-1.6033346 e-291
+1.24740019 e+291
+-1.2474001 e+291
+8.01667344 e-292
+-8.0166734 e-292
+2.49480038 e+291
+-2.4948003 e+291
+4.00833672 e-292
+-4.0083367 e-292
+4.98960077 e+291
+-4.9896007 e+291
+2.00416836 e-292
+-2.0041683 e-292
+9.97920154 e+291
+-9.9792015 e+291
+1.00208418 e-292
+-1.0020841 e-292
+1.99584030 e+292
+-1.9958403 e+292
+5.01042090 e-293
+-5.0104209 e-293
+3.99168061 e+292
+-3.9916806 e+292
+2.50521045 e-293
+-2.5052104 e-293
+7.98336123 e+292
+-7.9833612 e+292
+1.25260522 e-293
+-1.2526052 e-293
+1.59667224 e+293
+-1.5966722 e+293
+6.26302612 e-294
+-6.2630261 e-294
+3.19334449 e+293
+-3.1933444 e+293
+3.13151306 e-294
+-3.1315130 e-294
+6.38668899 e+293
+-6.3866889 e+293
+1.56575653 e-294
+-1.5657565 e-294
+1.27733779 e+294
+-1.2773377 e+294
+7.82878265 e-295
+-7.8287826 e-295
+2.55467559 e+294
+-2.5546755 e+294
+3.91439132 e-295
+-3.9143913 e-295
+5.10935119 e+294
+-5.1093511 e+294
+1.95719566 e-295
+-1.9571956 e-295
+1.02187023 e+295
+-1.0218702 e+295
+9.78597832 e-296
+-9.7859783 e-296
+2.04374047 e+295
+-2.0437404 e+295
+4.89298916 e-296
+-4.8929891 e-296
+4.08748095 e+295
+-4.0874809 e+295
+2.44649458 e-296
+-2.4464945 e-296
+8.17496190 e+295
+-8.1749619 e+295
+1.22324729 e-296
+-1.2232472 e-296
+1.63499238 e+296
+-1.6349923 e+296
+6.11623645 e-297
+-6.1162364 e-297
+3.26998476 e+296
+-3.2699847 e+296
+3.05811822 e-297
+-3.0581182 e-297
+6.53996952 e+296
+-6.5399695 e+296
+1.52905911 e-297
+-1.5290591 e-297
+1.30799390 e+297
+-1.3079939 e+297
+7.64529556 e-298
+-7.6452955 e-298
+2.61598781 e+297
+-2.6159878 e+297
+3.82264778 e-298
+-3.8226477 e-298
+5.23197562 e+297
+-5.2319756 e+297
+1.91132389 e-298
+-1.9113238 e-298
+1.04639512 e+298
+-1.0463951 e+298
+9.55661945 e-299
+-9.5566194 e-299
+2.09279024 e+298
+-2.0927902 e+298
+4.77830972 e-299
+-4.7783097 e-299
+4.18558049 e+298
+-4.1855804 e+298
+2.38915486 e-299
+-2.3891548 e-299
+8.37116099 e+298
+-8.3711609 e+298
+1.19457743 e-299
+-1.1945774 e-299
+1.67423219 e+299
+-1.6742321 e+299
+5.97288715 e-300
+-5.9728871 e-300
+3.34846439 e+299
+-3.3484643 e+299
+2.98644357 e-300
+-2.9864435 e-300
+6.69692879 e+299
+-6.6969287 e+299
+1.49322178 e-300
+-1.4932217 e-300
+1.33938575 e+300
+-1.3393857 e+300
+7.46610894 e-301
+-7.4661089 e-301
+2.67877151 e+300
+-2.6787715 e+300
+3.73305447 e-301
+-3.7330544 e-301
+5.35754303 e+300
+-5.3575430 e+300
+1.86652723 e-301
+-1.8665272 e-301
+1.07150860 e+301
+-1.0715086 e+301
+9.33263618 e-302
+-9.3326361 e-302
+2.14301721 e+301
+-2.1430172 e+301
+4.66631809 e-302
+-4.6663180 e-302
+4.28603442 e+301
+-4.2860344 e+301
+2.33315904 e-302
+-2.3331590 e-302
+8.57206885 e+301
+-8.5720688 e+301
+1.16657952 e-302
+-1.1665795 e-302
+1.71441377 e+302
+-1.7144137 e+302
+5.83289761 e-303
+-5.8328976 e-303
+3.42882754 e+302
+-3.4288275 e+302
+2.91644880 e-303
+-2.9164488 e-303
+6.85765508 e+302
+-6.8576550 e+302
+1.45822440 e-303
+-1.4582244 e-303
+1.37153101 e+303
+-1.3715310 e+303
+7.29112201 e-304
+-7.2911220 e-304
+2.74306203 e+303
+-2.7430620 e+303
+3.64556100 e-304
+-3.6455610 e-304
+5.48612406 e+303
+-5.4861240 e+303
+1.82278050 e-304
+-1.8227805 e-304
+1.09722481 e+304
+-1.0972248 e+304
+9.11390252 e-305
+-9.1139025 e-305
+2.19444962 e+304
+-2.1944496 e+304
+4.55695126 e-305
+-4.5569512 e-305
+4.38889925 e+304
+-4.3888992 e+304
+2.27847563 e-305
+-2.2784756 e-305
+8.77779851 e+304
+-8.7777985 e+304
+1.13923781 e-305
+-1.1392378 e-305
+1.75555970 e+305
+-1.7555597 e+305
+5.69618907 e-306
+-5.6961890 e-306
+3.51111940 e+305
+-3.5111194 e+305
+2.84809453 e-306
+-2.8480945 e-306
+7.02223880 e+305
+-7.0222388 e+305
+1.42404726 e-306
+-1.4240472 e-306
+1.40444776 e+306
+-1.4044477 e+306
+7.12023634 e-307
+-7.1202363 e-307
+2.80889552 e+306
+-2.8088955 e+306
+3.56011817 e-307
+-3.5601181 e-307
+5.61779104 e+306
+-5.6177910 e+306
+1.78005908 e-307
+-1.7800590 e-307
+1.12355820 e+307
+-1.1235582 e+307
+8.90029543 e-308
+-8.9002954 e-308
+2.24711641 e+307
+-2.2471164 e+307
+4.45014771 e-308
+-4.4501477 e-308
+4.49423283 e+307
+-4.4942328 e+307
+2.22507385 e-308
+-2.2250738 e-308
+8.98846567 e+307
+-8.9884656 e+307
+1.11253692 e-308
+-1.1125369 e-308
+Infinity
diff --git a/nashorn/test/script/basic/NASHORN-637.js b/nashorn/test/script/basic/NASHORN-637.js
new file mode 100644
index 00000000000..0abf394132e
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-637.js
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * NASHORN-637: SyntaxError: Illegal repetition near index 109" on a regexp literal accepted by other engines
+ *
+ * @test
+ * @run
+ */
+
+// Make sure these regexps compile
+print(/(?:[^[#\s\\]+|\\(?:[\S\s]|$)|\[\^?]?(?:[^\\\]]+|\\(?:[\S\s]|$))*]?)+|(\s*#[^\n\r\u2028\u2029]*\s*|\s+)([?*+]|{[0-9]+(?:,[0-9]*)?})?/g);
+print(/{[0-9]+}?/g);
+print(/{[0-9]+}?/g.exec("{123}"));
+
+// Curly brace should match itself if not at the beginning of a valid quantifier
+print(/{a}/.exec("{a}"));
+print(/f{a}/.exec("f{a}"));
+print(/f{1}/.exec("f"));
+try {
+    print(new RegExp("{1}").exec("{1}"));
+} catch (e) {
+    print(e.name);
+}
+try {
+    print(new RegExp("f{1}{1}").exec("f"));
+} catch (e) {
+    print(e.name);
+}
diff --git a/nashorn/test/script/basic/NASHORN-637.js.EXPECTED b/nashorn/test/script/basic/NASHORN-637.js.EXPECTED
new file mode 100644
index 00000000000..ab3450620c1
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-637.js.EXPECTED
@@ -0,0 +1,8 @@
+/(?:[^[#\s\\]+|\\(?:[\S\s]|$)|\[\^?]?(?:[^\\\]]+|\\(?:[\S\s]|$))*]?)+|(\s*#[^\n\r\u2028\u2029]*\s*|\s+)([?*+]|{[0-9]+(?:,[0-9]*)?})?/g
+/{[0-9]+}?/g
+{123}
+{a}
+f{a}
+f
+SyntaxError
+SyntaxError
diff --git a/nashorn/test/script/basic/NASHORN-638.js b/nashorn/test/script/basic/NASHORN-638.js
new file mode 100644
index 00000000000..959937ef706
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-638.js
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-638 : Callsite tracing and profiling are broken
+ *
+ * @test
+ * @run
+ */
+
+/*
+ * creates new script engine initialized with given options and
+ * runs given code on it. Returns standard output captured.
+ */
+
+function runScriptEngine(opts, code) {
+    var imports = new JavaImporter(
+        Packages.jdk.nashorn.api.scripting,
+        java.io, java.lang, java.util);
+
+    with(imports) {
+        var fac = new NashornScriptEngineFactory();
+        // get current System.err
+        var oldErr = System.err;
+        var baos = new ByteArrayOutputStream();
+        var newErr = new PrintStream(baos);
+        try {
+            // set new standard err
+            System.setErr(newErr);
+            var strType = Java.type("java.lang.String");
+            var engine = fac.getScriptEngine(Java.toJavaArray(opts, strType));
+            engine.eval(code);
+            newErr.flush();
+            return new java.lang.String(baos.toByteArray());
+        } finally {
+            // restore System.err to old value
+            System.setErr(oldErr);
+        }
+    }
+}
+
+var str = runScriptEngine([ "-tcs=all" ], "new Date");
+print("hello, world!");
+
+if (str.indexOf(" ENTER ") == -1) {
+    fail("expected 'ENTER' in trace mode output");
+}
+
+if (str.indexOf(" EXIT ") == -1) {
+    fail("expected 'EXIT' in trace mode output");
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-638.js.EXPECTED b/nashorn/test/script/basic/NASHORN-638.js.EXPECTED
new file mode 100644
index 00000000000..270c611ee72
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-638.js.EXPECTED
@@ -0,0 +1 @@
+hello, world!
diff --git a/nashorn/test/script/basic/NASHORN-639.js b/nashorn/test/script/basic/NASHORN-639.js
new file mode 100644
index 00000000000..fac8806c572
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-639.js
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-639 : Array.prototype.push throws NPE when null is pushed
+ *
+ * @test
+ * @run
+ */
+
+var arr = [];
+arr.push(null);
+
+if (arr.length != 1) {
+    fail("expected arr.length to be 1, it is " + arr.length);
+}
+
+if (arr[0] !== null) {
+    fail("expected arr[0] to be null, it is " + arr[0]);
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-64.js b/nashorn/test/script/basic/NASHORN-64.js
new file mode 100644
index 00000000000..7ec21a36844
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-64.js
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-64 : <, <=, >, >= implementations are broken.
+ *
+ * @test
+ * @run
+ */
+
+if (! ("abc" < "abceasy")) {
+    print("Error: 'abc' < 'abceasy' is false");
+}
+
+if (! (2 < 3)) {
+    print("Error: 2 < 3 is false");
+}
+
+if (! ("abc" <= "abceasy")) {
+    print("Error: 'abc' <= 'abceasy' is false");
+}
+
+if (! (2 <= 3)) {
+    print("Error: 2 <= 3 is false");
+}
+
+if (! ("abceasy" > "abc")) {
+    print("Error: 'abceasy' > 'abc' is false");
+}
+
+if (! (3 > 2)) {
+    print("Error: 3 > 2 is false");
+}
+
+if (! ("abceasy" >= "abc")) {
+    print("Error: 'abceasy' >= 'abc' is false");
+}
+
+if (! (3 >= 2)) {
+    print("Error: 3 >= 2 is false");
+}
diff --git a/nashorn/test/script/basic/NASHORN-642.js b/nashorn/test/script/basic/NASHORN-642.js
new file mode 100644
index 00000000000..82ecf0869e8
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-642.js
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * NASHORN-642: Missing String getter overrides.
+ *
+ * @test
+ * @run
+ */
+
+var k = 14;
+var l = 16;
+
+function test() {
+    var d = "2012-10-09T14:55:52.119Z";
+    print(d, d.length - 1);
+    print(d[d.length - 1], d[d.length - 2] - 1, d[d.length - 2] | 0, d[d.length - 2] >>> 0);
+    print(d[k], d[k] - 1, d[k] | 0, d[k] >>> 0, d[l], d[l] - 1, d[l] | 0, d[l] >>> 0);
+}
+test();
+
diff --git a/nashorn/test/script/basic/NASHORN-642.js.EXPECTED b/nashorn/test/script/basic/NASHORN-642.js.EXPECTED
new file mode 100644
index 00000000000..d279890d9f5
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-642.js.EXPECTED
@@ -0,0 +1,3 @@
+2012-10-09T14:55:52.119Z 23
+Z 8 9 9
+5 4 5 5 : NaN 0 0
diff --git a/nashorn/test/script/basic/NASHORN-646.js b/nashorn/test/script/basic/NASHORN-646.js
new file mode 100644
index 00000000000..7e53179d26f
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-646.js
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * NASHORN-646: Valid JS code with regexp is not parsable by nashorn.
+ *
+ * @test
+ * @run
+ */
+
+function test() { /foo/; }
diff --git a/nashorn/test/script/basic/NASHORN-653.js b/nashorn/test/script/basic/NASHORN-653.js
new file mode 100644
index 00000000000..5ddb87908b7
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-653.js
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-653 : Various problems with isTerminal and dead code generation from ASM
+ *
+ * @test
+ * @run
+ */
+
+var script = "   \
+function a() {   \
+    return true; \
+}                \
+                 \
+function b() {   \
+    while (x) {      \
+	return true; \
+    }                \
+}                    \
+                     \
+function c() {       \
+    while (true) {   \
+	return true; \
+    }                \
+ }                   \
+                     \
+function d() {       \
+    do {             \
+	return true; \
+    } while (x);     \
+} \
+\
+function f() {       \
+    for (;;) {       \
+	return true; \
+    } \
+} \
+\
+function e() { \
+    for (;;) { \
+	return true; \
+    } \
+} \
+\
+function g() { \
+    for(;;) { \
+	print('goes on and on and on ... '); \
+    } \
+    print('x'); \
+} \
+";
+
+function runScriptEngine(opts, code) {
+    var imports = new JavaImporter(
+        Packages.jdk.nashorn.api.scripting,
+        java.io, java.lang, java.util);
+
+    with(imports) {
+        var fac = new NashornScriptEngineFactory();
+        // get current System.err
+        var oldErr = System.err;
+        var baos = new ByteArrayOutputStream();
+        var newErr = new PrintStream(baos);
+        try {
+            // set new standard err
+            System.setErr(newErr);
+            var strType = Java.type("java.lang.String");
+            var engine = fac.getScriptEngine(Java.toJavaArray(opts, strType));
+            engine.eval(code);
+            newErr.flush();
+            return new java.lang.String(baos.toByteArray());
+        } finally {
+            // restore System.err to old value
+            System.setErr(oldErr);
+        }
+    }
+}
+
+var result = runScriptEngine([ "--print-code" ], script);
+
+if (result.indexOf("NOP") != -1) {
+    fail("ASM genenerates NOP*/ATHROW sequences - dead code is still in the script");
+}
diff --git a/nashorn/test/script/basic/NASHORN-658.js b/nashorn/test/script/basic/NASHORN-658.js
new file mode 100644
index 00000000000..282462a9ade
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-658.js
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * NASHORN-658: nasgen generated constructor functions all have function id 0.
+ *
+ * @test
+ * @run
+ */
+
+function C1() {}
+function C2() {}
+function C3() {}
+
+var ctors = [C1,C2,Number,String,Date,C3];
+
+(function() {
+for (var i in ctors) {
+  var c = ctors[i];
+  if (new c().constructor !== c) {
+    throw "Error: new c().constructor !== c";
+  }
+}
+})();
+
diff --git a/nashorn/test/script/basic/NASHORN-659.js b/nashorn/test/script/basic/NASHORN-659.js
new file mode 100644
index 00000000000..93492166689
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-659.js
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-659 :  Array literal initialization bug
+ *
+ * @test
+ * @run
+ */
+
+var arr = [17, 0xffffffff];
+if (arr[0] !== 17) {
+    fail("arr[0] !== 17");
+}
+
+if (arr[1] !== 0xffffffff) {
+    fail("arr[1] !== 0xffffffff");
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-66.js b/nashorn/test/script/basic/NASHORN-66.js
new file mode 100644
index 00000000000..112086e3ce8
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-66.js
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-66 :  Date when called as function should return date as a string
+ *
+ * @test
+ * @run
+ */
+
+print("typeof Date() is " + typeof Date());
+print("typeof new Date() is " + typeof new Date());
+
diff --git a/nashorn/test/script/basic/NASHORN-66.js.EXPECTED b/nashorn/test/script/basic/NASHORN-66.js.EXPECTED
new file mode 100644
index 00000000000..6b6ca057b67
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-66.js.EXPECTED
@@ -0,0 +1,2 @@
+typeof Date() is string
+typeof new Date() is object
diff --git a/nashorn/test/script/basic/NASHORN-664.js b/nashorn/test/script/basic/NASHORN-664.js
new file mode 100644
index 00000000000..adfae8bff6a
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-664.js
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-664 : Can not set nashorn extension properties such as fileName, lineNumber and columnNumber of Error objects
+ *
+ * @test
+ * @run
+ */
+
+try {
+    throw new Error();
+} catch (e) {
+    e.fileName = "foo";
+    if (e.fileName !== 'foo') {
+        fail("can not set e.fileName");
+    } 
+    e.lineNumber = 100;
+    if (e.lineNumber !== 100) {
+        fail("can not set e.lineNumber");
+    } 
+    e.columnNumber = 33;
+    if (e.columnNumber !== 33) {
+        fail("can not set e.columnNumber");
+    }
+    e.stack = "mystack";
+    if (e.stack !== 'mystack') {
+        fail("can not set e.stack");
+    }
+}
diff --git a/nashorn/test/script/basic/NASHORN-665.js b/nashorn/test/script/basic/NASHORN-665.js
new file mode 100644
index 00000000000..14f311cad94
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-665.js
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-665 : delete on string index should return false
+ *
+ * @test
+ * @run
+ */
+
+function func(str) {
+   'use strict';
+
+   try {
+       delete str[0];
+       fail("expected TypeError");
+   } catch (e) {
+       if (! (e instanceof TypeError)) {
+           fail("expected TypeError, got " + e);
+       }
+   }
+}
+
+func(new String("hello"));
+func("hello");
+
+var str = new String("hello");
+if (delete str[0] != false) {
+    fail("delete str[0] does not result in false");
+}
+
+str = "hello";
+if (delete str[0] != false) {
+    fail("delete str[0] does not result in false");
+}
diff --git a/nashorn/test/script/basic/NASHORN-67.js b/nashorn/test/script/basic/NASHORN-67.js
new file mode 100644
index 00000000000..b9341e67525
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-67.js
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-67 : Nashorn generates nested try catches in the wrong order in the byte code
+ *
+ * @test
+ * @run
+ */
+
+function test_nested() {
+      try {
+	  try {	      
+	      throw new Error("bam!");
+	  } catch (e) {
+	      print("SUCCESS")
+	  }
+      } catch (e2) {
+	  fail("inner catch should have caught the exception");
+      } 
+      
+}
+
+test_nested()
diff --git a/nashorn/test/script/basic/NASHORN-67.js.EXPECTED b/nashorn/test/script/basic/NASHORN-67.js.EXPECTED
new file mode 100644
index 00000000000..ff43ca40915
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-67.js.EXPECTED
@@ -0,0 +1 @@
+SUCCESS
diff --git a/nashorn/test/script/basic/NASHORN-678.js b/nashorn/test/script/basic/NASHORN-678.js
new file mode 100644
index 00000000000..2ea47b75622
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-678.js
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-678 : AssertionError from codegen on indexed access followed by call on 'false' primitive value
+ *
+ * @test
+ * @run
+ */
+
+var prop = "toString";
+if (false[prop]() !== "false") {
+    fail("false['toString']() !== 'false'");
+}
+
+// expand the test to cover access node and scope calls too
+
+if ((33).toString() !== "33") {
+    fail("33.toString() !== '33'");
+}
+
+try {
+    33();
+    fail("should have thrown error"); 
+} catch (e) {
+    if (! (e instanceof TypeError)) {
+        fail("expected TypeError, got " + e);
+    }
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-68.js b/nashorn/test/script/basic/NASHORN-68.js
new file mode 100644
index 00000000000..9b75ba92c9e
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-68.js
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-68 :  Global functions encodeURI, encodeURIComponent are not implemented.
+ *
+ * @test
+ * @run
+ */
+
+print(encodeURI("It's me!!"));
+print(encodeURI("http://en.wikipedia.org/wiki/�лек�ей"));
+print(encodeURI("http://en.wikipedia.org/wiki/Bj%C3%B6rk"));
+print(encodeURIComponent("Skål"));
diff --git a/nashorn/test/script/basic/NASHORN-68.js.EXPECTED b/nashorn/test/script/basic/NASHORN-68.js.EXPECTED
new file mode 100644
index 00000000000..86f442fa293
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-68.js.EXPECTED
@@ -0,0 +1,4 @@
+It's%20me!!
+http://en.wikipedia.org/wiki/%D0%90%D0%BB%D0%B5%D0%BA%D1%81%D0%B5%D0%B9
+http://en.wikipedia.org/wiki/Bj%25C3%25B6rk
+Sk%C3%A5l
diff --git a/nashorn/test/script/basic/NASHORN-689.js b/nashorn/test/script/basic/NASHORN-689.js
new file mode 100644
index 00000000000..d2e2f37ca85
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-689.js
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-689 : Any method needs to be able to split even if it contains break, continue or return
+ *
+ * @test
+ * @run
+ */
+
+function x(){}
+
+function test1() {
+  print((function f(a) {
+    print("a="+a);
+    if (a <= 0) { return 0; }
+
+    x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();
+
+    x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();
+
+    return 1 + f(a - 1);
+  })(10));
+}
+
+function test2() {
+    var a = 0;
+    outer: while(true) {
+        while(true) {
+            print("a="+a);
+            if (a >= 10) { break outer; }
+            x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();
+
+            x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();
+            a++;
+        }
+    }
+    print("ok");
+}
+
+function test3() {
+    var a = 0;
+    outer: while(true) {
+        a--;
+        inner: while(++a <= 10) {
+            while(true) {
+                print("a="+a);
+                x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();
+
+                if (a <= 10) { continue inner; }
+
+                x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();
+                throw new Error();
+            }
+            throw new Error();
+        }
+        break;
+    }
+    print("done");
+}
+
+function test4() {
+    // trigger vararg
+    if (!arguments[0])
+        print("no arg");
+
+    var a = {x: 0};
+    while(a.x < 10) {
+        while(true) {
+            with(a) {
+                print("x="+x);
+            }
+            x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();
+
+            with (a) {
+                if (x >= 10) { break; }
+            }
+
+            x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();x();
+
+            with(a) {
+                x++;
+            }
+        }
+        print("ok");
+        break;
+    }
+    print("done");
+}
+
+test1();
+test2();
+test3();
+test4();
diff --git a/nashorn/test/script/basic/NASHORN-689.js.EXPECTED b/nashorn/test/script/basic/NASHORN-689.js.EXPECTED
new file mode 100644
index 00000000000..6244df2ff7b
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-689.js.EXPECTED
@@ -0,0 +1,50 @@
+a=10
+a=9
+a=8
+a=7
+a=6
+a=5
+a=4
+a=3
+a=2
+a=1
+a=0
+10
+a=0
+a=1
+a=2
+a=3
+a=4
+a=5
+a=6
+a=7
+a=8
+a=9
+a=10
+ok
+a=0
+a=1
+a=2
+a=3
+a=4
+a=5
+a=6
+a=7
+a=8
+a=9
+a=10
+done
+no arg
+x=0
+x=1
+x=2
+x=3
+x=4
+x=5
+x=6
+x=7
+x=8
+x=9
+x=10
+ok
+done
diff --git a/nashorn/test/script/basic/NASHORN-69.js b/nashorn/test/script/basic/NASHORN-69.js
new file mode 100644
index 00000000000..309897d5978
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-69.js
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-69
+ *
+ * @test
+ * @run
+ */
+
+print(-1 >>> 0);
+print(-2147483647 >>> 0);
+print(-1.234 >>> 0);
+print("-1.234" >>> 0);
+print(-5.4321 >>> 0);
+print(2147483648 >>> 0);
+print(4294967295 >>> 0);
+print(2147483648.1 >>> 0);
+print(4294967295 >>> -32.1);
+print(Number.POSITIVE_INFINITY >>> 1);
+print(Number.POSITIVE_INFINITY >>> 0);
+print(Number.NEGATIVE_INFINITY >>> 1);
+print(Number.NEGATIVE_INFINITY >>> 0);
+print(Number.NaN >>> 0);
+print(Number.NaN >>> 1);
diff --git a/nashorn/test/script/basic/NASHORN-69.js.EXPECTED b/nashorn/test/script/basic/NASHORN-69.js.EXPECTED
new file mode 100644
index 00000000000..0f81cc06932
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-69.js.EXPECTED
@@ -0,0 +1,15 @@
+4294967295
+2147483649
+4294967295
+4294967295
+4294967291
+2147483648
+4294967295
+2147483648
+4294967295
+0
+0
+0
+0
+0
+0
diff --git a/nashorn/test/script/basic/NASHORN-691.js b/nashorn/test/script/basic/NASHORN-691.js
new file mode 100644
index 00000000000..82eccb2b0e2
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-691.js
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-691 :  Get rid of function id guard
+ *
+ * @test
+ * @run
+ */
+
+function func(x) {
+    return function(name) {
+        return x;
+    }
+};
+
+var delegate = {
+   __get__: func(33)
+};
+
+var x = new JSAdapter(delegate);
+
+function f(o) {
+   print('o.foo = ' + o.foo);
+}
+
+f(x);
+
+// now change __get__
+delegate.__get__ = func(44);
+f(x);
+
+var obj = {};
+obj.__noSuchProperty__ = func(3);
+f(obj);
+obj.__noSuchProperty__ = func("hello");
+f(obj);
diff --git a/nashorn/test/script/basic/NASHORN-691.js.EXPECTED b/nashorn/test/script/basic/NASHORN-691.js.EXPECTED
new file mode 100644
index 00000000000..693e38213fc
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-691.js.EXPECTED
@@ -0,0 +1,4 @@
+o.foo = 33
+o.foo = 44
+o.foo = 3
+o.foo = hello
diff --git a/nashorn/test/script/basic/NASHORN-694.js b/nashorn/test/script/basic/NASHORN-694.js
new file mode 100644
index 00000000000..dd7e55a46b1
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-694.js
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-694 : Provide parser API to parse scripts
+ *
+ * @test
+ * @run
+ */
+
+load("nashorn:parser.js");
+var ast = parse("print('hello')");
+print(ast.type);
+print(ast.body[0].type);
+var callExpr = ast.body[0].expression;
+print(callExpr.type);
+print(callExpr.callee.name);
+print(callExpr.arguments[0].type);
+print(callExpr.arguments[0].value);
diff --git a/nashorn/test/script/basic/NASHORN-694.js.EXPECTED b/nashorn/test/script/basic/NASHORN-694.js.EXPECTED
new file mode 100644
index 00000000000..83ceb25507d
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-694.js.EXPECTED
@@ -0,0 +1,6 @@
+Program
+ExpressionStatement
+CallExpression
+print
+Literal
+hello
diff --git a/nashorn/test/script/basic/NASHORN-697.js b/nashorn/test/script/basic/NASHORN-697.js
new file mode 100644
index 00000000000..41e78906024
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-697.js
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-697 : ScriptFunction should differentiate between "strict" and "builtin"
+ *
+ * @test
+ * @run
+ */
+
+// make sure 'this' transformation is not done for built-ins
+var toString = Object.prototype.toString;
+
+if (toString() !== "[object Undefined]") {
+    fail("toString() !== [object Undefined]");
+}
+
+if (toString.call(null) !== "[object Null]") {
+    fail("toString.call(null) !== [object Null]");
+}
+
+
+// make sure builtin functions are not strict! For example,
+// trying to access arguments and caller should not result in TypeError
+try {
+    if (toString.arguments) {
+        fail("toString.arguments is defined!");
+    }
+} catch (e) {
+    fail("got " + e, e);
+}
+
+try {
+    if (toString.caller) {
+        fail("toString.caller is defined!");
+    }
+} catch (e) {
+    fail("got " + e, e);
+}
diff --git a/nashorn/test/script/basic/NASHORN-703.js b/nashorn/test/script/basic/NASHORN-703.js
new file mode 100644
index 00000000000..0de20204d65
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-703.js
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-703
+ *
+ * Self modifying assignments and ++/-- operators had two issues
+ * 1) the base was loaded twice
+ * 2) if the base was anything but an IdentNode, AccessNode or IndexNode and in the scope, it would
+ *    only be evaluated once, leading to bytecode stack underflow
+ *
+ * This file is split into two tests as the presence of eval affects the whole script
+ *
+ * @test
+ * @run 
+ */
+
+function template() {
+    this.count = 17;
+}
+
+//self assignment to accessnode in scope
+function test1() {
+    a.count++;
+}
+
+function test2() {
+    a2[0].count++;
+}
+
+function test3() {
+    a3[0]++;
+}
+
+function test4() {
+    a4 *= 17;
+}
+
+function test5() {
+    a5.count *= 17;
+}
+
+function test6() {
+    a6[0].count *= 17;
+}
+
+function test7() {
+    a7[0] *= 17;
+}
+
+function tpl() {
+    return new template();
+}
+
+function count() {
+    tpl().count++;
+}
+
+var a = new template();
+test1();
+print(a.count);
+
+var a2 = [new template()];
+test2();
+print(a2[0].count);
+
+var a3 = [1];
+test3();
+print(a3);
+
+var a4 = 4711;
+test4();
+print(a4);
+
+var a5 = new template();
+test5();
+print(a5.count);
+
+var a6 = [new template()];
+test6();
+print(a6[0].count);
+
+var a7 = [1];
+test7();
+print(a7[0]);
+
+
+
+
+
+
+
+
diff --git a/nashorn/test/script/basic/NASHORN-703.js.EXPECTED b/nashorn/test/script/basic/NASHORN-703.js.EXPECTED
new file mode 100644
index 00000000000..b5c9084eca5
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-703.js.EXPECTED
@@ -0,0 +1,7 @@
+18
+18
+2
+80087
+289
+289
+17
diff --git a/nashorn/test/script/basic/NASHORN-703a.js b/nashorn/test/script/basic/NASHORN-703a.js
new file mode 100644
index 00000000000..14f8448a425
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-703a.js
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-703
+ *
+ * Self modifying assignments and ++/-- operators had two issues
+ * 1) the base was loaded twice
+ * 2) if the base was anything but an IdentNode, AccessNode or IndexNode and in the scope, it would
+ *    only be evaluated once, leading to bytecode stack underflow
+ *
+ * This file is split into two tests as the presence of eval affects the whole script
+ *
+ * @test
+ * @run 
+ */
+
+function template() {
+    this.count = 17;
+    eval();
+}
+
+//self assignment to accessnode in scope
+function test1() {
+    a.count++;
+    eval();
+}
+
+function test2() {
+    a2[0].count++;
+    eval();
+}
+
+function test3() {
+    a3[0]++;
+    eval();
+}
+
+function test4() {
+    a4 *= 17;
+    eval();
+}
+
+function test5() {
+    a5.count *= 17;
+    eval();
+}
+
+function test6() {
+    a6[0].count *= 17;
+    eval();
+}
+
+function test7() {
+    a7[0] *= 17;
+    eval();
+}
+
+function tpl() {
+    return new template();
+}
+
+function count() {
+    tpl().count++;
+    eval();
+}
+
+var a = new template();
+test1();
+print(a.count);
+
+var a2 = [new template()];
+test2();
+print(a2[0].count);
+
+var a3 = [1];
+test3();
+print(a3);
+
+var a4 = 4711;
+test4();
+print(a4);
+
+var a5 = new template();
+test5();
+print(a5.count);
+
+var a6 = [new template()];
+test6();
+print(a6[0].count);
+
+var a7 = [1];
+test7();
+print(a7[0]);
+
+
+
+
+
+
+
+
diff --git a/nashorn/test/script/basic/NASHORN-703a.js.EXPECTED b/nashorn/test/script/basic/NASHORN-703a.js.EXPECTED
new file mode 100644
index 00000000000..b5c9084eca5
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-703a.js.EXPECTED
@@ -0,0 +1,7 @@
+18
+18
+2
+80087
+289
+289
+17
diff --git a/nashorn/test/script/basic/NASHORN-705.js b/nashorn/test/script/basic/NASHORN-705.js
new file mode 100644
index 00000000000..73457bf85c7
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-705.js
@@ -0,0 +1,35 @@
+#this-line-is-ignored
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/**
+ * NASHORN-705 : Teach the parser to ignore leading comment lines with # as comment identifier
+ *
+ * @test
+ * @run
+ */
+
+if (! $OPTIONS._scripting) {
+    fail("expected scripting mode with # line");
+}
diff --git a/nashorn/test/script/basic/NASHORN-71.js b/nashorn/test/script/basic/NASHORN-71.js
new file mode 100644
index 00000000000..0f28194eb58
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-71.js
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-71 :  Global functions decodeURI, decodeURICompondet are not implemdeted.
+ *
+ * @test
+ * @run
+ */
+
+print(decodeURI("It's%20me!!"));
+print(decodeURI("http://en.wikipedia.org/wiki/%D0%90%D0%BB%D0%B5%D0%BA%D1%81%D0%B5%D0%B9"));
+print(decodeURIComponent("Sk%C3%A5l"));
diff --git a/nashorn/test/script/basic/NASHORN-71.js.EXPECTED b/nashorn/test/script/basic/NASHORN-71.js.EXPECTED
new file mode 100644
index 00000000000..2f5bcc80eb9
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-71.js.EXPECTED
@@ -0,0 +1,3 @@
+It's me!!
+http://en.wikipedia.org/wiki/�лек�ей
+Skål
diff --git a/nashorn/test/script/basic/NASHORN-710.js b/nashorn/test/script/basic/NASHORN-710.js
new file mode 100644
index 00000000000..88eaed2a374
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-710.js
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * NASHORN-710 - TypeError in Octane pdfjs.js and code-load.js after rev 3364:59041b3f7641
+ *
+ * @test
+ * @run
+ */
+
+var jQuery = (function() {
+
+   var fun = "value";
+
+   var obj =  {
+       a: function() {
+           fun;
+       },
+       b: fun,
+   };
+
+})();
diff --git a/nashorn/test/script/basic/NASHORN-711.js b/nashorn/test/script/basic/NASHORN-711.js
new file mode 100644
index 00000000000..12c30eaf1b9
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-711.js
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * NASHORN-711 - Strings broken to multiple lines throw out the line numbering.
+ *
+ * @test
+ * @option -scripting
+ * @run
+ */
+
+var x = "aaa\\aaa\r\naaaaa\
+bbbb\"bb\rbbb\
+cccccccc";
+
+print("current line:", new java.lang.Throwable().getStackTrace()[0].getLineNumber());
+try {
+    throw new Error();
+} catch (error) {
+    print("thrown in line:", error.lineNumber);
+}
+
+<<END
+aaaaaaaaa
+bbbbbbbbb
+ccccccccc
+END
+
+print("current line:", new java.lang.Throwable().getStackTrace()[0].getLineNumber());
+try {
+    throw new Error();
+} catch (error) {
+    print("thrown in line:", error.lineNumber);
+}
diff --git a/nashorn/test/script/basic/NASHORN-711.js.EXPECTED b/nashorn/test/script/basic/NASHORN-711.js.EXPECTED
new file mode 100644
index 00000000000..7a4e4e8e69f
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-711.js.EXPECTED
@@ -0,0 +1,4 @@
+current line: 36
+thrown in line: 38
+current line: 49
+thrown in line: 51
diff --git a/nashorn/test/script/basic/NASHORN-72.js b/nashorn/test/script/basic/NASHORN-72.js
new file mode 100644
index 00000000000..a3605a4c8b5
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-72.js
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-72 :  new Object(value) is not properly implemented.
+ *
+ * @test
+ * @run
+ */
+
+var val = new Object("hello");
+print(val);
+
+val = new Object(true);
+print(val);
+
+val = new Object(3.14);
+print(val);
+
+obj = new Object();
+val = new Object(obj);
+print(val);
+print(val === obj);
+
+function func() {}
+val = new Object(func);
+print(val);
+
+// undefined and null value ignored
+val = new Object(null);
+print(val);
+
+val = new Object(undefined);
+print(val);
diff --git a/nashorn/test/script/basic/NASHORN-72.js.EXPECTED b/nashorn/test/script/basic/NASHORN-72.js.EXPECTED
new file mode 100644
index 00000000000..6dcbc8d6adc
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-72.js.EXPECTED
@@ -0,0 +1,8 @@
+hello
+true
+3.14
+[object Object]
+true
+function func() {}
+[object Object]
+[object Object]
diff --git a/nashorn/test/script/basic/NASHORN-722.js b/nashorn/test/script/basic/NASHORN-722.js
new file mode 100644
index 00000000000..5a6ab09e3fd
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-722.js
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-722 : NativeStrictArguments doesn't use callee
+ *
+ * @test
+ * @run
+ */
+
+(function () {
+   'use strict';
+
+   try {
+       print(arguments.callee);
+       fail("no TypeError for strict mode arguments.callee");
+   } catch (e) {
+       if (! (e instanceof TypeError)) {
+           fail("expected TypeError, got " + e);
+       }
+   }
+})();
diff --git a/nashorn/test/script/basic/NASHORN-73.js b/nashorn/test/script/basic/NASHORN-73.js
new file mode 100644
index 00000000000..fe7a07a0a75
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-73.js
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-73 :  Loop break should not skip variable declarations.
+ *
+ * @test
+ * @run
+ */
+
+print("x = " + x);
+do {
+   break;
+   var x;
+} while (true);
+
+
+print("y = " + y);
+while (true) {
+    break;
+    var y;
+}
+
+print("z = " + z);
+for ( ; ; ) {
+   break;
+   var z;
+   print("THIS SHOULD NEVER BE PRINTED!");
+}
+
+while (true) {
+    break;
+    if (true) { 
+	var s; 
+    }
+}
+
+print("s = "+s);
+
+print("u = "+u);
+for ( ; ; ) {
+    break;
+    while (true) {
+	do {
+	    var u;
+	} while (true);
+    }    
+}
+
+function terminal() {
+    print("r = "+r);
+    print("t = "+t);
+    for (;;) {
+	var r;
+	return;
+	var t;
+	print("THIS SHOULD NEVER BE PRINTED!");
+    }
+    print("NEITHER SHOULD THIS");
+}
+
+terminal();
+
+function terminal2() {
+    print("q = "+q);
+    for (;;) {
+	return;
+	print("THIS SHOULD NEVER BE PRINTED!");
+    }
+    print("NEITHER SHOULD THIS");
+}
+
+try { 
+    terminal2();
+} catch (e) {
+    print(e);
+}
+
+function scope2() {
+    var b = 10;
+    print("b = "+b);
+}
+
+scope2();
+
+try {
+    print("b is = "+b);
+}  catch (e) {
+    print(e);
+}
+	
+
+function disp_a() {
+    var a = 20;
+    print("Value of 'a' inside the function " + a);
+}
+	
+var a = 10;
+
+disp_a();
+
+print("Value of 'a' outside the function " + a);
diff --git a/nashorn/test/script/basic/NASHORN-73.js.EXPECTED b/nashorn/test/script/basic/NASHORN-73.js.EXPECTED
new file mode 100644
index 00000000000..4a513f91d1a
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-73.js.EXPECTED
@@ -0,0 +1,12 @@
+x = undefined
+y = undefined
+z = undefined
+s = undefined
+u = undefined
+r = undefined
+t = undefined
+ReferenceError: "q" is not defined
+b = 10
+ReferenceError: "b" is not defined
+Value of 'a' inside the function 20
+Value of 'a' outside the function 10
diff --git a/nashorn/test/script/basic/NASHORN-737.js b/nashorn/test/script/basic/NASHORN-737.js
new file mode 100644
index 00000000000..d6c0ea14875
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-737.js
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-737 : NodeVisitor methods with LabeledNode parameters never called
+ *
+ * @test
+ * @run
+ */
+
+load("nashorn:parser.js");
+var ast = parse("label: while(true) break label;");
+print(JSON.stringify(ast));
diff --git a/nashorn/test/script/basic/NASHORN-737.js.EXPECTED b/nashorn/test/script/basic/NASHORN-737.js.EXPECTED
new file mode 100644
index 00000000000..8f828342948
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-737.js.EXPECTED
@@ -0,0 +1 @@
+{"type":"Program","rest":null,"body":[{"type":"LabeledStatement","label":{"type":"Identifier","name":"label"},"body":{"type":"BlockStatement","body":[{"type":"WhileStatement","test":{"type":"Literal","value":true},"block":{"type":"BlockStatement","body":[{"type":"BreakStatement","label":"label"}]}}]}}]}
diff --git a/nashorn/test/script/basic/NASHORN-74.js b/nashorn/test/script/basic/NASHORN-74.js
new file mode 100644
index 00000000000..363c89db59d
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-74.js
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-74
+ *
+ * @test
+ * @run
+ */
+
+for (;;) {
+    break;
+}
+print("after for loop");
+
diff --git a/nashorn/test/script/basic/NASHORN-74.js.EXPECTED b/nashorn/test/script/basic/NASHORN-74.js.EXPECTED
new file mode 100644
index 00000000000..9863a4bc09b
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-74.js.EXPECTED
@@ -0,0 +1 @@
+after for loop
diff --git a/nashorn/test/script/basic/NASHORN-740.js b/nashorn/test/script/basic/NASHORN-740.js
new file mode 100644
index 00000000000..4e5cbca52e5
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-740.js
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-740 : Lexer/parser treating division as regexp
+ *
+ * @test
+ * @run
+ */
+
+var x = 1;
+print(x++/2/3);
+print(x++/2/3+x);
diff --git a/nashorn/test/script/basic/NASHORN-740.js.EXPECTED b/nashorn/test/script/basic/NASHORN-740.js.EXPECTED
new file mode 100644
index 00000000000..23bd8b6988b
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-740.js.EXPECTED
@@ -0,0 +1,2 @@
+0.16666666666666666
+3.3333333333333335
diff --git a/nashorn/test/script/basic/NASHORN-75.js b/nashorn/test/script/basic/NASHORN-75.js
new file mode 100644
index 00000000000..822d8484968
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-75.js
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-75 :  Calling non-functions should result in TypeError
+ *
+ * @test
+ * @run
+ */
+
+try {
+    RegExp("a|b", "g")();
+} catch (e) {
+    print(e);
+}
+
+try {
+    new String("hello")();
+} catch (e) {
+    print(e);
+}
+
+try {
+    new Object()();
+} catch (e) {
+    print(e);
+}
diff --git a/nashorn/test/script/basic/NASHORN-75.js.EXPECTED b/nashorn/test/script/basic/NASHORN-75.js.EXPECTED
new file mode 100644
index 00000000000..e1352a3f75a
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-75.js.EXPECTED
@@ -0,0 +1,3 @@
+TypeError: [RegExp /a|b/g] is not a function
+TypeError: [String hello] is not a function
+TypeError: [object Object] is not a function
diff --git a/nashorn/test/script/basic/NASHORN-758.js b/nashorn/test/script/basic/NASHORN-758.js
new file mode 100644
index 00000000000..bad2b82d272
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-758.js
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-758 : nashorn shell command line options improvements
+ *
+ * @test
+ * @option -Dfoo=bar
+ * @option -Dhello=world
+ * @run
+ */
+
+
+if (java.lang.System.getProperty("foo") != "bar") {
+    fail("System property 'foo' != 'bar'");
+}
+
+if (java.lang.System.getProperty("hello") != "world") {
+    fail("System property 'hello' != 'world'");
+}
diff --git a/nashorn/test/script/basic/NASHORN-759.js b/nashorn/test/script/basic/NASHORN-759.js
new file mode 100644
index 00000000000..729334b71cd
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-759.js
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * NASHORN-759 - Efficient string concatenation with + operator
+ *
+ * @test
+ * @run
+ */
+
+// Check invalidation of callsite for non-string CharSequence
+function checkProps(s) {
+    print(typeof s);
+    print(typeof s.length);
+    print(s.charCodeAt === String.prototype.charCodeAt);
+    print();
+}
+
+var s1 = "foo";
+var s2 = "bar";
+var s3 = s1 + s2 + s1 + s2;
+var s4 = new java.lang.StringBuilder("abc");
+checkProps(s1);
+checkProps(s2);
+checkProps(s3);
+checkProps(s4);
+
+// Rebuild string and compare to original
+function rebuildString(s) {
+    var buf = s.split("");
+    print(buf);
+    while (buf.length > 1) {
+        var result = [];
+        buf.reduce(function(previous, current, index) {
+            if (previous) {
+                result.push(previous + current);
+                return null;
+            } else if (index === buf.length - 1) {
+                result.push(current);
+                return null;
+            } else {
+                return current;
+            }
+        });
+        buf = result;
+        print(buf);
+    }
+    return buf[0];
+}
+
+var n1 = "The quick gray nashorn jumps over the lazy zebra.";
+var n2 = rebuildString(n1);
+print(n1, n2, n2.length, n1 == n2, n1 === n2, n1 < n2, n1 <= n2, n1 > n2, n1 >= n2);
+checkProps(n2);
+
+var n3 = rebuildString(rebuildString(n2));
+print(n3, n3.length, n1 == n3, n2 == n3, n1 === n3, n2 === n3);
+checkProps(n3);
diff --git a/nashorn/test/script/basic/NASHORN-759.js.EXPECTED b/nashorn/test/script/basic/NASHORN-759.js.EXPECTED
new file mode 100644
index 00000000000..ccb88e0f00e
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-759.js.EXPECTED
@@ -0,0 +1,47 @@
+string
+number
+true
+
+string
+number
+true
+
+string
+number
+true
+
+object
+object
+false
+
+T,h,e, ,q,u,i,c,k, ,g,r,a,y, ,n,a,s,h,o,r,n, ,j,u,m,p,s, ,o,v,e,r, ,t,h,e, ,l,a,z,y, ,z,e,b,r,a,.
+Th,e ,qu,ic,k ,gr,ay, n,as,ho,rn, j,um,ps, o,ve,r ,th,e ,la,zy, z,eb,ra,.
+The ,quic,k gr,ay n,asho,rn j,umps, ove,r th,e la,zy z,ebra,.
+The quic,k gray n,ashorn j,umps ove,r the la,zy zebra,.
+The quick gray n,ashorn jumps ove,r the lazy zebra,.
+The quick gray nashorn jumps ove,r the lazy zebra.
+The quick gray nashorn jumps over the lazy zebra.
+The quick gray nashorn jumps over the lazy zebra. The quick gray nashorn jumps over the lazy zebra. 49 true true false true false true
+string
+number
+true
+
+T,h,e, ,q,u,i,c,k, ,g,r,a,y, ,n,a,s,h,o,r,n, ,j,u,m,p,s, ,o,v,e,r, ,t,h,e, ,l,a,z,y, ,z,e,b,r,a,.
+Th,e ,qu,ic,k ,gr,ay, n,as,ho,rn, j,um,ps, o,ve,r ,th,e ,la,zy, z,eb,ra,.
+The ,quic,k gr,ay n,asho,rn j,umps, ove,r th,e la,zy z,ebra,.
+The quic,k gray n,ashorn j,umps ove,r the la,zy zebra,.
+The quick gray n,ashorn jumps ove,r the lazy zebra,.
+The quick gray nashorn jumps ove,r the lazy zebra.
+The quick gray nashorn jumps over the lazy zebra.
+T,h,e, ,q,u,i,c,k, ,g,r,a,y, ,n,a,s,h,o,r,n, ,j,u,m,p,s, ,o,v,e,r, ,t,h,e, ,l,a,z,y, ,z,e,b,r,a,.
+Th,e ,qu,ic,k ,gr,ay, n,as,ho,rn, j,um,ps, o,ve,r ,th,e ,la,zy, z,eb,ra,.
+The ,quic,k gr,ay n,asho,rn j,umps, ove,r th,e la,zy z,ebra,.
+The quic,k gray n,ashorn j,umps ove,r the la,zy zebra,.
+The quick gray n,ashorn jumps ove,r the lazy zebra,.
+The quick gray nashorn jumps ove,r the lazy zebra.
+The quick gray nashorn jumps over the lazy zebra.
+The quick gray nashorn jumps over the lazy zebra. 49 true true true true
+string
+number
+true
+
diff --git a/nashorn/test/script/basic/NASHORN-760.js b/nashorn/test/script/basic/NASHORN-760.js
new file mode 100644
index 00000000000..edb9bc3b5fa
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-760.js
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-111 :  ClassCastException from JSON.stringify
+ *
+ * @test
+ * @run
+ */
+// problem 1
+// the conversions in TernaryNode are not necessary, but they should not cause problems. They did
+// this was because the result of Global.allocate(Object[])Object which returns a NativeObject. 
+// was tracked as an object type on our stack. The type system did not recognize this as an array. 
+// Then the explicit conversions became "convert NativeArray->Object[]" which is a checkccast Object[]
+// which naturally failed.
+
+// I pushed the appropriate arraytype on the stack for Global.allocate.
+
+// I also removed the conversions in CodeGen, all conversions should be done in Lower, as
+// NASHORN-706 states.
+
+var silent = false;
+var stdio = silent ? ['pipe', 'pipe', 'pipe', 'ipc'] : [0, 1, 2, 'ipc'];
+
+// This made the test pass, but it's still not correct to pick widest types for array
+// and primitives. Widest(Object[], int) gave us Object[] which makes no sense. This is used
+// by lower to type the conversions, so function b below also failed until I made a change
+// ty type widest to actually return the widest common denominator, if both aren't arrays
+
+function b() {
+    var silent2 = false;
+    var stdio2 = silent2 ? [1,2,3] : 17;
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-768.js b/nashorn/test/script/basic/NASHORN-768.js
new file mode 100644
index 00000000000..906bddccf52
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-768.js
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-768 :  Implement cross context property/function access and browser JSObject access by JSObject dynalink linker
+ *
+ * @test
+ * @option -scripting
+ * @run
+ */
+
+// create another nashorn engine
+var m = new javax.script.ScriptEngineManager();
+var engine = m.getEngineByName("nashorn");
+
+// our global var 'id'
+var id = "global-id";
+
+engine.eval(<<CODE
+
+// code evaluated in engine
+
+// engine code's id
+var id = "engine-global-id";
+
+// global object
+var obj = {
+    foo: 42,
+    bar: function(x) { 
+        if (id != "engine-global-id") {
+            throw "id != 'engine-global-id'";
+        }
+        // check this.foo is accessible
+        if (this.foo != 42) {
+            throw "this.foo != 42";
+        }
+
+        return x;
+    }
+};
+
+// global function
+function func(callback) {
+    var res = callback(id);
+    if (res != id) {
+        fail("result of callback is wrong");
+    }
+}
+
+CODE);
+
+var obj = engine.get("obj");
+if (obj.bar("hello") != "hello") {
+    fail("obj.bar('hello') return value is wrong");
+}
+
+if (obj.foo != 42) {
+    fail("obj.foo != 42");
+}
+
+var func = engine.get("func");
+var inside_f = false;
+function f(arg) {
+    inside_f = true;
+    if (id != "global-id") {
+        fail("id != 'global-id'");
+    }
+    return arg;
+}
+func(f);
+if (! inside_f) {
+    fail("function 'f' was not called");
+}
diff --git a/nashorn/test/script/basic/NASHORN-778.js b/nashorn/test/script/basic/NASHORN-778.js
new file mode 100644
index 00000000000..9d562efacc6
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-778.js
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-778 : Debug.toString prints "undefined" That is wrong.
+ *
+ * @test
+ * @run
+ */
+
+if (typeof Debug != 'undefined' && Debug.toString() !== "[object Debug]") {
+    fail("Debug.toString() !== '[object Debug]'");
+}
diff --git a/nashorn/test/script/basic/NASHORN-78.js b/nashorn/test/script/basic/NASHORN-78.js
new file mode 100644
index 00000000000..def4a2d1b48
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-78.js
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-78 :  Calling undefined global function should result in ReferenceError and not TypeError.
+ *
+ * @test
+ * @run
+ */
+
+try {
+    x();
+} catch (e) {
+    if (! (e instanceof ReferenceError)) {
+        fail("expecting ReferenceError");
+    }
+}
+
+try {
+    var obj = {};
+    obj.x();
+} catch (e2) {
+    if (! (e2 instanceof TypeError)) {
+        fail("expecting TypeError");
+    }
+}
+
+try {
+    obj(); // call obj which is not a function!
+} catch (e3) {
+    if (! (e3 instanceof TypeError)) {
+        fail("expecting TypeError");
+    }
+}
diff --git a/nashorn/test/script/basic/NASHORN-79.js b/nashorn/test/script/basic/NASHORN-79.js
new file mode 100644
index 00000000000..1c522782f5a
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-79.js
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-79 :  Functions defined inside expressions can be recursive.
+ *
+ * @test
+ * @run
+ */
+
+
+print((function f(a) {
+    return a == 0? 1 : a*f(a-1);
+})(4));
+ 
+ 
+print((function g(a) {
+    function g(a) { return 1000; }
+    return a == 0? 1 : a*g(a-1);
+})(4));
diff --git a/nashorn/test/script/basic/NASHORN-79.js.EXPECTED b/nashorn/test/script/basic/NASHORN-79.js.EXPECTED
new file mode 100644
index 00000000000..6c763b85777
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-79.js.EXPECTED
@@ -0,0 +1,2 @@
+24
+4000
diff --git a/nashorn/test/script/basic/NASHORN-792.js b/nashorn/test/script/basic/NASHORN-792.js
new file mode 100644
index 00000000000..8e84140c592
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-792.js
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-792 :  Parser accepts identifiers that are invalid per the ES5 spec.
+ *
+ * @test
+ * @run
+ */
+
+try {
+    eval("var \\u002E = 10;");
+} catch (ex) {
+    print(ex.constructor.name);
+}
+
+try {
+    eval("var a\\u002Eb = 10;");
+} catch (ex) {
+    print(ex.constructor.name);
+}
+
+try {
+    eval("var a\\u002xb = 10;");
+} catch (ex) {
+    print(ex.constructor.name);
+}
+
+try {
+    eval("function \\u002B() {}");
+} catch (ex) {
+    print(ex.constructor.name);
+}
+
+try {
+    eval("function a\\u002Bb() {}");
+} catch (ex) {
+    print(ex.constructor.name);
+}
+
+try {
+    eval("function a\\u002xb() {}");
+} catch (ex) {
+    print(ex.constructor.name);
+}
+
+try {
+    eval("function \\u0030() {}");
+} catch (ex) {
+    print(ex.constructor.name);
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-792.js.EXPECTED b/nashorn/test/script/basic/NASHORN-792.js.EXPECTED
new file mode 100644
index 00000000000..bef69eb32ea
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-792.js.EXPECTED
@@ -0,0 +1,7 @@
+SyntaxError
+SyntaxError
+SyntaxError
+SyntaxError
+SyntaxError
+SyntaxError
+SyntaxError
diff --git a/nashorn/test/script/basic/NASHORN-80.js b/nashorn/test/script/basic/NASHORN-80.js
new file mode 100644
index 00000000000..c51fa56089d
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-80.js
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-80 :  Default values of built-in prototypes are wrong.
+ *
+ * @test
+ * @run
+ */
+
+print(Boolean.prototype);
+print(Number.prototype);
+print(String.prototype);
+print(RegExp.prototype);
+print(Date.prototype);
diff --git a/nashorn/test/script/basic/NASHORN-80.js.EXPECTED b/nashorn/test/script/basic/NASHORN-80.js.EXPECTED
new file mode 100644
index 00000000000..c799bac776f
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-80.js.EXPECTED
@@ -0,0 +1,5 @@
+false
+0
+
+/(?:)/
+Invalid Date
diff --git a/nashorn/test/script/basic/NASHORN-81.js b/nashorn/test/script/basic/NASHORN-81.js
new file mode 100644
index 00000000000..821c867fa11
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-81.js
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-81:  RHS of "in" operator should be of Object type, TypeError should be thrown otherwise
+ *
+ * @test
+ * @run
+ */
+
+try {
+    print("foo" in false);
+} catch (e) {
+    if (! (e instanceof TypeError)) {
+        fail("#1: TypeError expected");
+    }
+}
+
+try {
+    print("foo" in 3.14);
+} catch (e) {
+    if (! (e instanceof TypeError)) {
+        fail("#2: TypeError expected");
+    }
+}
+
+try {
+    print("foo" in "bar");
+} catch (e) {
+    if (! (e instanceof TypeError)) {
+        fail("#3: TypeError expected");
+    }
+}
+
+try {
+    print("foo" in "bar");
+} catch (e) {
+    if (! (e instanceof TypeError)) {
+        fail("#4: TypeError expected");
+    }
+}
+
+try {
+    print("foo" in null);
+} catch (e) {
+    if (! (e instanceof TypeError)) {
+        fail("#5: TypeError expected");
+    }
+}
+
+try {
+    print("foo" in undefined);
+} catch (e) {
+    if (! (e instanceof TypeError)) {
+        fail("#6: TypeError expected");
+    }
+}
diff --git a/nashorn/test/script/basic/NASHORN-833.js b/nashorn/test/script/basic/NASHORN-833.js
new file mode 100644
index 00000000000..182d7c9ee5f
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-833.js
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-833 : __lookupGetter__ and __lookupSetter__ in mozilla_compat.js don't return inherited properties
+ *
+ * @test
+ * @run
+ */
+
+load("nashorn:mozilla_compat.js");
+
+var x = {};
+x.__defineGetter__("a", function() {print("Getting a");});
+x.__defineSetter__("a", function() {print("Setting a");});
+
+var y = Object.create(x);
+
+y.__lookupGetter__("a")();
+y.__lookupSetter__("a")();
diff --git a/nashorn/test/script/basic/NASHORN-833.js.EXPECTED b/nashorn/test/script/basic/NASHORN-833.js.EXPECTED
new file mode 100644
index 00000000000..41a3390afcb
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-833.js.EXPECTED
@@ -0,0 +1,2 @@
+Getting a
+Setting a
diff --git a/nashorn/test/script/basic/NASHORN-85.js b/nashorn/test/script/basic/NASHORN-85.js
new file mode 100644
index 00000000000..7859135f2da
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-85.js
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-85 :  String.prototype.length field should not be undefined
+ *
+ * @test
+ * @run
+ */
+
+print("String.prototype.length is " + String.prototype.length);
diff --git a/nashorn/test/script/basic/NASHORN-85.js.EXPECTED b/nashorn/test/script/basic/NASHORN-85.js.EXPECTED
new file mode 100644
index 00000000000..ee929d76803
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-85.js.EXPECTED
@@ -0,0 +1 @@
+String.prototype.length is 0
diff --git a/nashorn/test/script/basic/NASHORN-86.js b/nashorn/test/script/basic/NASHORN-86.js
new file mode 100644
index 00000000000..fd92601e524
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-86.js
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-86 :  right hand side of instanceof operator should be objects that have [[HasInstance]]
+ *
+ * @test
+ * @run
+ */
+
+var obj = {};
+
+try {
+    print(obj instanceof true);
+    fail("#1 TypeError expected");
+} catch (e) {
+    if (! (e instanceof TypeError)) {
+        fail("#1 TypeError expected");
+    }
+}
+
+try {
+    print(obj instanceof 3.14);
+    fail("#2 TypeError expected");
+} catch (e) {
+    if (! (e instanceof TypeError)) {
+        fail("#2 TypeError expected");
+    }
+}
+
+try {
+    print(obj instanceof "hello");
+    fail("#3 TypeError expected");
+} catch (e) {
+    if (! (e instanceof TypeError)) {
+        fail("#3 TypeError expected");
+    }
+}
+try {
+    var foo = {};
+    print(obj instanceof foo);
+    fail("#4 TypeError expected");
+} catch (e) {
+    if (! (e instanceof TypeError)) {
+        fail("#4 TypeError expected");
+    }
+}
diff --git a/nashorn/test/script/basic/NASHORN-87.js b/nashorn/test/script/basic/NASHORN-87.js
new file mode 100644
index 00000000000..b00cf25f0a6
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-87.js
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-87 :  NativeDate class misses @Function for few functions
+ *
+ * @test
+ * @run
+ */
+
+function check(func, name) {
+    if (typeof func != 'function') {
+        throw Error("Date.prototype." + name + " is not function");
+    }
+}
+
+check(Date.prototype.getUTCMonth, "getUTCMonth")
+check(Date.prototype.getUTCDay, "getUTCDay");
+check(Date.prototype.setMilliseconds, "setMilliseconds");
+check(Date.prototype.setUTCMilliseconds, "setUTCMilliseconds");
diff --git a/nashorn/test/script/basic/NASHORN-89.js b/nashorn/test/script/basic/NASHORN-89.js
new file mode 100644
index 00000000000..4230033e57d
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-89.js
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-89 :  Date functions and constructor should evaluate vararg arguments in the order of appearance.
+ *
+ * @test
+ * @run
+ */
+
+function MyObj(val) {
+    return {
+        valueOf: function() { throw "value-" + val; }
+    }
+}
+
+try {
+    var d = new Date(1980, new MyObj(2), new MyObj(3), new MyObj(4));
+} catch(e) {
+    if (e != 'value-2') {
+        fail("expecting 'value-2' got " + e);
+    }
+}
+
+try {
+    var d = new Date(1980, 2, new MyObj(3), new MyObj(4), new MyObj(5));
+} catch(e) {
+    if (e != 'value-3') {
+        fail("expecting 'value-3' got " + e);
+    }
+}
+
+try {
+    var d = new Date(1980, 2, 1, new MyObj(4), new MyObj(5), new MyObj(6));
+} catch(e) {
+    if (e != 'value-4') {
+        fail("expecting 'value-4' got " + e);
+    }
+}
+
+try {
+    var d = new Date(1980, 2, 1, 1, new MyObj(5), new MyObj(6), new MyObj(7));
+} catch(e) {
+    if (e != 'value-5') {
+        fail("expecting 'value-5' got " + e);
+    }
+}
+try {
+    var d = new Date(1980, 2, 1, 1, 1, new MyObj(6), new MyObj(7));
+} catch(e) {
+    if (e != 'value-6') {
+        fail("expecting 'value-6' got " + e);
+    }
+}
+try {
+    var d = new Date(1980, 2, 1, 1, 1, 1, new MyObj(7));
+} catch(e) {
+    if (e != 'value-7') {
+        fail("expecting 'value-7' got " + e);
+    }
+}
diff --git a/nashorn/test/script/basic/NASHORN-90.js b/nashorn/test/script/basic/NASHORN-90.js
new file mode 100644
index 00000000000..bcc6fe780e0
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-90.js
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-90 : Function constructor does not work when creating function accepting many arguments.
+ *
+ * @test
+ * @run
+ */
+
+var avg = new Function("x", "y", "return x + y/ 2");
+print("avg.length = " + avg.length);
+print(avg);
+print("avg(34, 44) = " + avg(34, 44));
diff --git a/nashorn/test/script/basic/NASHORN-90.js.EXPECTED b/nashorn/test/script/basic/NASHORN-90.js.EXPECTED
new file mode 100644
index 00000000000..400d39d1a06
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-90.js.EXPECTED
@@ -0,0 +1,5 @@
+avg.length = 2
+function (x,y) {
+return x + y/ 2
+}
+avg(34, 44) = 56
diff --git a/nashorn/test/script/basic/NASHORN-91.js b/nashorn/test/script/basic/NASHORN-91.js
new file mode 100644
index 00000000000..8222023dfda
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-91.js
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-91 :  Date.prototype.setYear is undefined.
+ *
+ * @test
+ * @run
+ */
+
+if (typeof Date.prototype.setYear != 'function') {
+    fail("Date.prototype.setYear is not a function");
+}
+
+print("Date.prototype.setYear.length = " + Date.prototype.setYear.length);
+
+var d = new Date(1990, 1, 1);
+print(d.getYear());
+d.setYear(89);
+print(d.getYear());
+d.setYear(2013);
+print(d.getYear());
diff --git a/nashorn/test/script/basic/NASHORN-91.js.EXPECTED b/nashorn/test/script/basic/NASHORN-91.js.EXPECTED
new file mode 100644
index 00000000000..a665a141eeb
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-91.js.EXPECTED
@@ -0,0 +1,4 @@
+Date.prototype.setYear.length = 1
+90
+89
+113
diff --git a/nashorn/test/script/basic/NASHORN-92.js b/nashorn/test/script/basic/NASHORN-92.js
new file mode 100644
index 00000000000..12e0369ed71
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-92.js
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-92 :  Date.prototype.toGMTString is undefined.
+ *
+ * @test
+ * @run
+ */
+
+if ((typeof Date.prototype.toGMTString) != 'function') {
+    fail("Date.prototype.toGMTString is not a function");
+}
+
+print("Date.prototype.toGMTString.length = " + Date.prototype.toGMTString.length);
+
+var d = new Date();
+d.setUTCFullYear(1999, 1, 1);
+if (d.toGMTString() != d.toUTCString()) {
+    fail("toGMTString() and toUTCString() return different values");
+}
+print(d.toGMTString().substring(0, 16));
diff --git a/nashorn/test/script/basic/NASHORN-92.js.EXPECTED b/nashorn/test/script/basic/NASHORN-92.js.EXPECTED
new file mode 100644
index 00000000000..a09cab25148
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-92.js.EXPECTED
@@ -0,0 +1,2 @@
+Date.prototype.toGMTString.length = 0
+Mon, 01 Feb 1999
diff --git a/nashorn/test/script/basic/NASHORN-93.js b/nashorn/test/script/basic/NASHORN-93.js
new file mode 100644
index 00000000000..14671710c5d
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-93.js
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-93 :  redeclaration of variable does not work as expected
+ *
+ * @test
+ * @run
+ */
+
+var x = 3;
+if (typeof x != 'number') {
+    fail("typeof x should be 'number' but got " + (typeof x));
+}
+var x = new Object();
+if (typeof x != 'object') {
+    fail("typeof x should be 'object' but got " + (typeof x));
+}
+
diff --git a/nashorn/test/script/basic/NASHORN-95.js b/nashorn/test/script/basic/NASHORN-95.js
new file mode 100644
index 00000000000..f415ab6eeda
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-95.js
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-95 :  function length is always -1 when it uses "arguments" regardless of actual formals specified.
+ *
+ *
+ * @test
+ * @run
+ */
+
+function func1() {
+    print(arguments);
+}
+
+function func2(x, y) {
+    print(arguments);
+}
+
+function func3(x, y, z) {
+    print(arguments);
+}
+
+// more than arglimit number of arguments - so uses varargs in impl..
+function func4(a, b, c, d, e, f, g, h, i, j) {}
+
+print("func1.length = " + func1.length);
+print("func2.length = " + func2.length);
+print("func3.length = " + func3.length);
+print("func4.length = " + func4.length);
diff --git a/nashorn/test/script/basic/NASHORN-95.js.EXPECTED b/nashorn/test/script/basic/NASHORN-95.js.EXPECTED
new file mode 100644
index 00000000000..3926ff66311
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-95.js.EXPECTED
@@ -0,0 +1,4 @@
+func1.length = 0
+func2.length = 2
+func3.length = 3
+func4.length = 10
diff --git a/nashorn/test/script/basic/NASHORN-96.js b/nashorn/test/script/basic/NASHORN-96.js
new file mode 100644
index 00000000000..557773a0084
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-96.js
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-96 : split with parenthesis grups
+ *
+ * @test
+ * @run
+ */
+
+var __result = "One dog, two dogs in the yard.".split(/(d)(o)(g)/);
+print(__result);
+regexp = new RegExp("(d)(o)(g)");
+__result = "One dog, two dogs in the yard.".split(regexp);
+print(__result);
diff --git a/nashorn/test/script/basic/NASHORN-96.js.EXPECTED b/nashorn/test/script/basic/NASHORN-96.js.EXPECTED
new file mode 100644
index 00000000000..c1a0cb89658
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-96.js.EXPECTED
@@ -0,0 +1,2 @@
+One ,d,o,g,, two ,d,o,g,s in the yard.
+One ,d,o,g,, two ,d,o,g,s in the yard.
diff --git a/nashorn/test/script/basic/NASHORN-97.js b/nashorn/test/script/basic/NASHORN-97.js
new file mode 100644
index 00000000000..39953f72288
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-97.js
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-97 :  Function.prototype should return undefined when invoked as a function
+ *
+ * @test
+ * @run
+ */
+
+if ( Function.prototype(23) !== undefined) {
+    throw new Error("#1 Function.prototype should return undefined when invoked");
+}
+
+if ( Function.prototype(23, "hello", {}) !== undefined) {
+    throw new Error("#2 Function.prototype should return undefined when invoked");
+}
diff --git a/nashorn/test/script/basic/NASHORN-98.js b/nashorn/test/script/basic/NASHORN-98.js
new file mode 100644
index 00000000000..e9629975e2d
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-98.js
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-98 :  Array literal elements and object literal properties should be comma separated.
+ *
+ * @test
+ * @run
+ */
+
+try {
+    eval("var x = [ 23 34 ]");
+} catch (e) {
+    if (! (e instanceof SyntaxError)) {
+       fail("syntax error expected here got " + e);
+    }
+    print(e.toString().replace(/\\/g, '/'));
+} 
+
+try {
+    eval("var x = { foo: 33 bar: 'hello' }");
+} catch (e) {
+    if (! (e instanceof SyntaxError)) {
+       fail("syntax error expected here got " + e);
+    }
+    print(e.toString().replace(/\\/g, '/'));
+} 
diff --git a/nashorn/test/script/basic/NASHORN-98.js.EXPECTED b/nashorn/test/script/basic/NASHORN-98.js.EXPECTED
new file mode 100644
index 00000000000..93a89364703
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-98.js.EXPECTED
@@ -0,0 +1,6 @@
+SyntaxError: test/script/basic/NASHORN-98.js#32<eval>:1:13 Expected comma but found decimal
+var x = [ 23 34 ]
+             ^
+SyntaxError: test/script/basic/NASHORN-98.js#41<eval>:1:18 Expected comma but found ident
+var x = { foo: 33 bar: 'hello' }
+                  ^
diff --git a/nashorn/test/script/basic/NASHORN-99.js b/nashorn/test/script/basic/NASHORN-99.js
new file mode 100644
index 00000000000..a7f266508de
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-99.js
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/**
+ * NASHORN-99 :  Passing less number of arguments to a native varargs function results in IllegalArgumentException.
+ *
+ * @test
+ * @run
+ */
+
+function func() {
+}
+
+try {
+    func.call();
+} catch (e) {
+    fail("func.call() failed", e);
+}
+
+var obj = Object.create(Function.prototype);
+
+if (typeof obj.call !== "function") {
+    fail('#1: call method not found!');
+}
+
+try {
+    obj.call();
+    fail('#2: No [[Call]] property, a TypeError expected');
+} catch (e) {
+    if (!(e instanceof TypeError)) {
+        fail('#3: TypeError expected but got ' + e);
+    }
+}
diff --git a/nashorn/test/script/basic/addition.js b/nashorn/test/script/basic/addition.js
new file mode 100644
index 00000000000..d5d8a33671b
--- /dev/null
+++ b/nashorn/test/script/basic/addition.js
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Checks for binary addition operator.
+ *
+ * @test
+ * @run
+ */
+
+// number addition
+var x = Math.PI + Math.E;
+print(typeof(x));
+print(x);
+
+// string concatenation
+x = "hello, " + "world";
+print(typeof(x));
+print(x);
+
+// string + number
+x = "E is " + Math.E;
+print(typeof(x));
+print(x);
+
+// number + string
+x = Math.PI + " is PI";
+print(typeof(x));
+print(x);
+
+// number + undefined
+x = Math.E + undefined;
+print(typeof(x));
+print(x);
+
+x = undefined + Math.PI;
+print(typeof(x));
+print(x);
+
+// object with "valueOf" method added to number
+var obj = {
+    valueOf: function() { return 44.55; }
+};
+
+x = 45.66 + obj;
+print(typeof(x));
+print(x);
+
+x = obj + 3.14;
+print(typeof(x));
+print(x);
+
+// object with "toString" method added to number
+var obj2 = {
+    toString: function() { return "obj2.toString"; }
+};
+
+x = "hello, " + obj2;
+print(typeof(x));
+print(x);
+
+x = obj2 + " hello";
+print(typeof(x));
+print(x);
diff --git a/nashorn/test/script/basic/addition.js.EXPECTED b/nashorn/test/script/basic/addition.js.EXPECTED
new file mode 100644
index 00000000000..3a91f048a8d
--- /dev/null
+++ b/nashorn/test/script/basic/addition.js.EXPECTED
@@ -0,0 +1,20 @@
+number
+5.859874482048838
+string
+hello, world
+string
+E is 2.718281828459045
+string
+3.141592653589793 is PI
+number
+NaN
+number
+NaN
+number
+90.21
+number
+47.69
+string
+hello, obj2.toString
+string
+obj2.toString hello
diff --git a/nashorn/test/script/basic/allgettersetters.js b/nashorn/test/script/basic/allgettersetters.js
new file mode 100644
index 00000000000..3919e992399
--- /dev/null
+++ b/nashorn/test/script/basic/allgettersetters.js
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Exercise all setters on standard objects.
+ *
+ * @test
+ * @run
+ */
+
+function checkGetterSetter(obj, expectError) {
+    while (obj != undefined && obj != null) {
+        var properties = Object.getOwnPropertyNames(obj);
+        for (var i in properties) {
+            var prop = properties[i];
+            try {
+                obj[prop] = obj[prop];
+            } catch (e) {
+                if (!expectError || !(e instanceof TypeError)) {
+                    fail(e + ": " + obj.toString() +"." + prop, e);
+                }
+            }
+        }
+        obj = Object.getPrototypeOf(obj);
+    }
+}
+
+// objects
+checkGetterSetter([2, 23]);
+checkGetterSetter(new Boolean(true));
+checkGetterSetter(new Date(0));
+checkGetterSetter(new Error());
+checkGetterSetter(new EvalError());
+if (typeof JSAdapter != 'undefined') {
+    checkGetterSetter(new JSAdapter({}));
+}
+if (typeof JavaImporter != 'undefined') {
+    checkGetterSetter(new JavaImporter(java.io));
+}
+checkGetterSetter(function() {});
+checkGetterSetter(new Number(42));
+checkGetterSetter(new Object());
+checkGetterSetter(new RangeError());
+checkGetterSetter(new ReferenceError());
+checkGetterSetter(/nashorn/);
+checkGetterSetter(new String('hello'));
+checkGetterSetter(new SyntaxError());
+checkGetterSetter(new TypeError());
+checkGetterSetter(new URIError());
+
+// constructors and prototypes
+checkGetterSetter(Array);
+checkGetterSetter(Array.prototype);
+checkGetterSetter(Boolean);
+checkGetterSetter(Boolean.prototype);
+checkGetterSetter(Error);
+checkGetterSetter(Error.prototype);
+checkGetterSetter(EvalError);
+checkGetterSetter(EvalError.prototype);
+checkGetterSetter(Function);
+checkGetterSetter(Function.prototype);
+if (typeof JSAdapter != 'undefined') {
+    checkGetterSetter(JSAdapter);
+    checkGetterSetter(JSAdapter.prototype);
+}
+if (typeof JavaImporter != 'undefined') {
+    checkGetterSetter(JavaImporter);
+    checkGetterSetter(JavaImporter.prototype);
+}
+checkGetterSetter(Number);
+checkGetterSetter(Number.prototype);
+checkGetterSetter(Object);
+checkGetterSetter(Object.prototype);
+checkGetterSetter(RangeError);
+checkGetterSetter(RangeError.prototype);
+checkGetterSetter(ReferenceError);
+checkGetterSetter(ReferenceError.prototype);
+checkGetterSetter(RegExp);
+checkGetterSetter(RegExp.prototype);
+checkGetterSetter(String);
+checkGetterSetter(String.prototype);
+checkGetterSetter(SyntaxError);
+checkGetterSetter(SyntaxError.prototype);
+checkGetterSetter(TypeError);
+checkGetterSetter(TypeError.prototype);
+checkGetterSetter(URIError);
+checkGetterSetter(URIError.prototype);
+
+// misc. objects
+checkGetterSetter(this);
+
+if (typeof Packages != 'undefined') {
+    checkGetterSetter(Packages);
+    checkGetterSetter(java);
+    checkGetterSetter(javax);
+}
+
+if (typeof Java != 'undefined') {
+    checkGetterSetter(Java);
+    checkGetterSetter(Java.prototype);
+}
+
+if (typeof Debug != 'undefined') {
+    checkGetterSetter(Debug);
+}
+
+checkGetterSetter((function() { return arguments; })());
+// TypeError expected on certain property getter/setter for strict arguments
+checkGetterSetter((function() { 'use strict'; return arguments; })(), true);
+checkGetterSetter(JSON);
+checkGetterSetter(JSON.prototype);
+checkGetterSetter(Math);
+checkGetterSetter(Math.prototype);
diff --git a/nashorn/test/script/basic/andor.js b/nashorn/test/script/basic/andor.js
new file mode 100644
index 00000000000..f9afd42fa8e
--- /dev/null
+++ b/nashorn/test/script/basic/andor.js
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * and or test.
+ *
+ * @test
+ * @run 
+ */
+
+print("a" && "b");
+print(false && "b");
+print("a" || "b");
+print(false || "b");
+
diff --git a/nashorn/test/script/basic/andor.js.EXPECTED b/nashorn/test/script/basic/andor.js.EXPECTED
new file mode 100644
index 00000000000..935746a0edd
--- /dev/null
+++ b/nashorn/test/script/basic/andor.js.EXPECTED
@@ -0,0 +1,4 @@
+b
+false
+a
+b
diff --git a/nashorn/test/script/basic/anonrecur.js b/nashorn/test/script/basic/anonrecur.js
new file mode 100644
index 00000000000..b227a5f10f4
--- /dev/null
+++ b/nashorn/test/script/basic/anonrecur.js
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Call anonymous function recursively using arguments.callee.
+ *
+ * @test
+ * @run
+ */
+
+print((function(x) {
+   return x == 0? 1 :  x*arguments.callee(x-1);
+})(5));
+
diff --git a/nashorn/test/script/basic/anonrecur.js.EXPECTED b/nashorn/test/script/basic/anonrecur.js.EXPECTED
new file mode 100644
index 00000000000..52bd8e43afb
--- /dev/null
+++ b/nashorn/test/script/basic/anonrecur.js.EXPECTED
@@ -0,0 +1 @@
+120
diff --git a/nashorn/test/script/basic/applycall.js b/nashorn/test/script/basic/applycall.js
new file mode 100644
index 00000000000..50ee4c34e57
--- /dev/null
+++ b/nashorn/test/script/basic/applycall.js
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Verify "length" property of functions is arity.
+ * Verify that function can be called by apply and call.
+ *
+ * @test
+ * @run
+ */
+
+function func(x, y) { print(x); print(y); }
+
+print(func.call);
+print("func.call.length = " + func.call.length);
+
+func.call(this, "hello, ", "world");
+func.apply(this, [ "hello, " , "world" ]);
+func("hello, ", "world");
+
+// extension: you can pass java List to apply
+
+var list = new java.util.ArrayList();
+list.add("invokedynamic");
+list.add(" is great!");
+func.apply(this, list);
+
+print("func.apply.length = " + func.apply.length);
+
+function func2() {
+    print("I am func2");
+}
+
+func2.apply(this);
+
+func.apply(this);
diff --git a/nashorn/test/script/basic/applycall.js.EXPECTED b/nashorn/test/script/basic/applycall.js.EXPECTED
new file mode 100644
index 00000000000..734fa7a0aad
--- /dev/null
+++ b/nashorn/test/script/basic/applycall.js.EXPECTED
@@ -0,0 +1,14 @@
+function call() { [native code] }
+func.call.length = 1
+hello, 
+world
+hello, 
+world
+hello, 
+world
+invokedynamic
+ is great!
+func.apply.length = 2
+I am func2
+undefined
+undefined
diff --git a/nashorn/test/script/basic/args.js b/nashorn/test/script/basic/args.js
new file mode 100644
index 00000000000..61d440132cc
--- /dev/null
+++ b/nashorn/test/script/basic/args.js
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Messing with arguments.
+ *
+ * @test
+ * @run
+ */
+
+function myfunc(a, b, a) {
+  return a;
+}
+
+function myArgsfunc(arguments) {
+  return arguments[0];
+}
+
+function myArgsfunc2(args2) {
+    return arguments[0];
+}
+
+print(myfunc(10, 20, 30));
+
+print(myArgsfunc(10, 20, 30));
+
+print(myArgsfunc2(10, 20, 30));
diff --git a/nashorn/test/script/basic/args.js.EXPECTED b/nashorn/test/script/basic/args.js.EXPECTED
new file mode 100644
index 00000000000..cc4938f5d25
--- /dev/null
+++ b/nashorn/test/script/basic/args.js.EXPECTED
@@ -0,0 +1,3 @@
+30
+undefined
+10
diff --git a/nashorn/test/script/basic/arity.js b/nashorn/test/script/basic/arity.js
new file mode 100644
index 00000000000..fb6ac9df52e
--- /dev/null
+++ b/nashorn/test/script/basic/arity.js
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * arity test.
+ *
+ * @test
+ * @run 
+ */
+
+function func1(a) { print(a); }
+function func2(a, b) { print(a, b); }
+function func3(a, b, c) { print(a, b, c); }
+function func4(a, b, c, d) { print(a, b, c, d); }
+function func5(a, b, c, d, e) { print(a, b, c, d, e); }
+function func6(a, b, c, d, e, f) { print(a, b, c, d, e, f); }
+function func7(a, b, c, d, e, f, g) { print(a, b, c, d, e, f, g); }
+function func8(a, b, c, d, e, f, g, h) { print(a, b, c, d, e, f, g, h); }
+function func9(a, b, c, d, e, f, g, h, i) { print(a, b, c, d, e, f, g, h, i); }
+function func10(a, b, c, d, e, f, g, h, i, j) { print(a, b, c, d, e, f, g, h, i, j); }
+function func11(a, b, c, d, e, f, g, h, i, j, k) { print(a, b, c, d, e, f, g, h, i, j, k); }
+function func12(a, b, c, d, e, f, g, h, i, j, k, l) { print(a, b, c, d, e, f, g, h, i, j, k, l); }
+function func13(a, b, c, d, e, f, g, h, i, j, k, l, m) { print(a, b, c, d, e, f, g, h, i, j, k, l, m); }
+
+function vfunc1(a) { print(a); arguments; }
+function vfunc2(a, b) { print(a, b); arguments; }
+function vfunc3(a, b, c) { print(a, b, c); arguments; }
+function vfunc4(a, b, c, d) { print(a, b, c, d); arguments; }
+function vfunc5(a, b, c, d, e) { print(a, b, c, d, e); arguments; }
+function vfunc6(a, b, c, d, e, f) { print(a, b, c, d, e, f); arguments; }
+function vfunc7(a, b, c, d, e, f, g) { print(a, b, c, d, e, f, g); arguments; }
+function vfunc8(a, b, c, d, e, f, g, h) { print(a, b, c, d, e, f, g, h); arguments; }
+function vfunc9(a, b, c, d, e, f, g, h, i) { print(a, b, c, d, e, f, g, h, i); arguments; }
+function vfunc10(a, b, c, d, e, f, g, h, i, j) { print(a, b, c, d, e, f, g, h, i, j); arguments; }
+function vfunc11(a, b, c, d, e, f, g, h, i, j, k) { print(a, b, c, d, e, f, g, h, i, j, k); arguments; }
+function vfunc12(a, b, c, d, e, f, g, h, i, j, k, l) { print(a, b, c, d, e, f, g, h, i, j, k, l); arguments; }
+function vfunc13(a, b, c, d, e, f, g, h, i, j, k, l, m) { print(a, b, c, d, e, f, g, h, i, j, k, l, m); arguments; }
+
+func1(1);
+func2(1, 2);
+func3(1, 2, 3);
+func4(1, 2, 3, 4);
+func5(1, 2, 3, 4, 5);
+func6(1, 2, 3, 4, 5, 6);
+func7(1, 2, 3, 4, 5, 6, 7);
+func8(1, 2, 3, 4, 5, 6, 7, 8);
+func9(1, 2, 3, 4, 5, 6, 7, 8, 9);
+func10(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+func11(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11);
+func12(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12);
+func13(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13);
+
+func1(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13);
+func13(1);
+
+vfunc1(1);
+vfunc2(1, 2);
+vfunc3(1, 2, 3);
+vfunc4(1, 2, 3, 4);
+vfunc5(1, 2, 3, 4, 5);
+vfunc6(1, 2, 3, 4, 5, 6);
+vfunc7(1, 2, 3, 4, 5, 6, 7);
+vfunc8(1, 2, 3, 4, 5, 6, 7, 8);
+vfunc9(1, 2, 3, 4, 5, 6, 7, 8, 9);
+vfunc10(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+vfunc11(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11);
+vfunc12(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12);
+vfunc13(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13);
+
+vfunc1(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13);
+vfunc13(1);
diff --git a/nashorn/test/script/basic/arity.js.EXPECTED b/nashorn/test/script/basic/arity.js.EXPECTED
new file mode 100644
index 00000000000..c7e00c5170d
--- /dev/null
+++ b/nashorn/test/script/basic/arity.js.EXPECTED
@@ -0,0 +1,30 @@
+1
+1 2
+1 2 3
+1 2 3 4
+1 2 3 4 5
+1 2 3 4 5 6
+1 2 3 4 5 6 7
+1 2 3 4 5 6 7 8
+1 2 3 4 5 6 7 8 9
+1 2 3 4 5 6 7 8 9 10
+1 2 3 4 5 6 7 8 9 10 11
+1 2 3 4 5 6 7 8 9 10 11 12
+1 2 3 4 5 6 7 8 9 10 11 12 13
+1
+1 undefined undefined undefined undefined undefined undefined undefined undefined undefined undefined undefined undefined
+1
+1 2
+1 2 3
+1 2 3 4
+1 2 3 4 5
+1 2 3 4 5 6
+1 2 3 4 5 6 7
+1 2 3 4 5 6 7 8
+1 2 3 4 5 6 7 8 9
+1 2 3 4 5 6 7 8 9 10
+1 2 3 4 5 6 7 8 9 10 11
+1 2 3 4 5 6 7 8 9 10 11 12
+1 2 3 4 5 6 7 8 9 10 11 12 13
+1
+1 undefined undefined undefined undefined undefined undefined undefined undefined undefined undefined undefined undefined
diff --git a/nashorn/test/script/basic/arrayprotoclass.js b/nashorn/test/script/basic/arrayprotoclass.js
new file mode 100644
index 00000000000..8f6b8a33930
--- /dev/null
+++ b/nashorn/test/script/basic/arrayprotoclass.js
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Check Array.prototype class name.
+ *
+ * @test
+ * @run
+ */
+
+Array.prototype.getClass = Object.prototype.toString;
+print(Array.prototype.getClass()); // print [object Array]
diff --git a/nashorn/test/script/basic/arrayprotoclass.js.EXPECTED b/nashorn/test/script/basic/arrayprotoclass.js.EXPECTED
new file mode 100644
index 00000000000..711d714cde0
--- /dev/null
+++ b/nashorn/test/script/basic/arrayprotoclass.js.EXPECTED
@@ -0,0 +1 @@
+[object Array]
diff --git a/nashorn/test/script/basic/arrays.js b/nashorn/test/script/basic/arrays.js
new file mode 100644
index 00000000000..f0ee08eb3e2
--- /dev/null
+++ b/nashorn/test/script/basic/arrays.js
@@ -0,0 +1,160 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Basic Array tests.
+ *
+ * @test
+ * @run
+ */
+
+var arr = new Array(3);
+print(arr.length);
+
+print("isArray.length = " + Array.isArray.length);
+print(Array.isArray(44));
+print(Array.isArray([44]));
+
+function even(num) {
+    return (num % 2) == 0;
+}
+
+print("join.length = " + Array.prototype.join.length);
+print(["javascript", "is", "great"].join("<->"));
+
+var arr = [4, 56, 5];
+print("every.length = " + Array.prototype.every.length);
+print(arr.toString() + " every even? = " + arr.every(even));
+arr = [4, 56, 688];
+print(arr.toString() + " every even? = " + arr.every(even));
+
+print("some.length = " + Array.prototype.some.length);
+arr = [4, 56, 5];
+print(arr.toString() + " some even? = " + arr.some(even));
+arr = [3, 5, 17];
+print(arr.toString() + " some even? = " + arr.some(even));
+
+print("forEach.length = " + Array.prototype.forEach.length);
+arr = [ "java", "javascript", "jython", "jruby"];
+arr.forEach(function(val, idx, obj) {
+    print(obj.toString() + "[" + idx + "] is " + val);
+});
+
+print(arr.map(function(val) { return val.toUpperCase(); }));
+print("shifted is " + arr.shift() + ", remaining is " + arr.toString() + ", length is " + arr.length);
+
+arr = [ "c++", "java", "javascript", "objective c" ];
+print(arr.filter(function(val) { return val.charAt(0) == 'j'; }));
+
+print([3, 66, 2, 44].reduce(function (acc, e) { return acc + e; }));
+print([1, 2, 3, 4, 5].reduce(function (acc, e) { return acc * e; }));
+
+print(arr.reduce(
+    function(acc, e) { return acc + " " + e; }
+));
+
+print(["javascript", "from", "world", "hello"].reduceRight(
+    function(acc, x) { return acc + " " + x; }
+));
+
+var langs = ["java", "javascript", "jython", "jruby", "c"];
+print("indexOf.length = " + Array.prototype.indexOf.length);
+print("indexOf('java') = " + langs.indexOf("java"));
+print("indexOf('javascript') = " + langs.indexOf("javascript"));
+print("indexOf('javascript', 3) = " + langs.indexOf("javascript", 3));
+print("indexOf('c++') = " + langs.indexOf("c++"));
+print("[].indexOf('any') = " + [].indexOf("any"));
+
+langs = ["java", "javascript", "jython", "jruby", "java", "jython", "c"];
+print("lastIndexOf.length = " + Array.prototype.lastIndexOf.length);
+print("lastIndexOf('java') = " + langs.lastIndexOf("java"));
+print("lastIndexOf('jython') = " + langs.lastIndexOf("jython"));
+print("lastIndexOf('c') = " + langs.lastIndexOf("c"));
+print("lastIndexOf('c++') = " + langs.lastIndexOf("c++"));
+print("[].lastIndexOf('any') = " + [].lastIndexOf("any"));
+
+print("concat.length = " + Array.prototype.concat.length);
+print(["foo", "bar"].concat(["x", "y"], 34, "sss", [3, 4, 2]));
+
+
+// Check various array length arguments to constructor
+
+function expectRangeError(length) {
+    try {
+        var arr = new Array(length);
+        print("range error expected for " + length);
+    } catch (e) {
+        if (! (e instanceof RangeError)) {
+            print("range error expected for " + length);
+        }
+    }
+}
+
+expectRangeError(NaN);
+expectRangeError(Infinity);
+expectRangeError(-Infinity);
+expectRangeError(-10);
+
+var arr = new Array("10");
+if (arr.length != 1 && arr[0] != '10') {
+    throw new Error("expected length 1 array");
+}
+
+arr = new Array(new Number(34));
+if (arr.length != 1 && arr[0] != new Number(34)) {
+    throw new Error("expected length 1 array");
+}
+
+arr = new Array(15);
+if (arr.length != 15) {
+    throw new Error("expected length 15 array");
+}
+
+print("Array.length = " + Array.length);
+
+print([NaN,NaN,NaN]);
+
+// check setting array's length
+arr = [3,2,1];
+arr.length = 1;
+print(arr);
+print(arr.length);
+
+// test typeof array
+var numberArray = [];
+numberArray[0] = 1;
+print(typeof numberArray[0]);
+
+print(numberArray.toLocaleString());
+
+// Array functions on non-array objects
+
+print(Array.prototype.join.call(new java.lang.Object()));
+print(Array.prototype.concat.call("hello", "world"));
+print(Array.prototype.map.call("hello", function() {}));
+print(Array.prototype.reduce.call("hello", function() {}));
+print(Array.prototype.toString.call(new java.lang.Object()));
+print(Array.prototype.toLocaleString.call(new java.lang.Object()));
+print(Array.prototype.reduceRight.call(new java.lang.Object(), 
+      function() {}, 33));
+
diff --git a/nashorn/test/script/basic/arrays.js.EXPECTED b/nashorn/test/script/basic/arrays.js.EXPECTED
new file mode 100644
index 00000000000..6c783bd4482
--- /dev/null
+++ b/nashorn/test/script/basic/arrays.js.EXPECTED
@@ -0,0 +1,51 @@
+3
+isArray.length = 1
+false
+true
+join.length = 1
+javascript<->is<->great
+every.length = 1
+4,56,5 every even? = false
+4,56,688 every even? = true
+some.length = 1
+4,56,5 some even? = true
+3,5,17 some even? = false
+forEach.length = 1
+java,javascript,jython,jruby[0] is java
+java,javascript,jython,jruby[1] is javascript
+java,javascript,jython,jruby[2] is jython
+java,javascript,jython,jruby[3] is jruby
+JAVA,JAVASCRIPT,JYTHON,JRUBY
+shifted is java, remaining is javascript,jython,jruby, length is 3
+java,javascript
+115
+120
+c++ java javascript objective c
+hello world from javascript
+indexOf.length = 1
+indexOf('java') = 0
+indexOf('javascript') = 1
+indexOf('javascript', 3) = -1
+indexOf('c++') = -1
+[].indexOf('any') = -1
+lastIndexOf.length = 1
+lastIndexOf('java') = 4
+lastIndexOf('jython') = 5
+lastIndexOf('c') = 6
+lastIndexOf('c++') = -1
+[].lastIndexOf('any') = -1
+concat.length = 1
+foo,bar,x,y,34,sss,3,4,2
+Array.length = 1
+NaN,NaN,NaN
+3
+1
+number
+1
+
+hello,world
+,,,,
+undefined
+[object java.lang.Object]
+
+33
diff --git a/nashorn/test/script/basic/arrays2.js b/nashorn/test/script/basic/arrays2.js
new file mode 100644
index 00000000000..7d8ec2cbb34
--- /dev/null
+++ b/nashorn/test/script/basic/arrays2.js
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Basic Array tests.
+ *
+ * @test
+ * @run
+ */
+
+print("Array.prototype.length = " + Array.prototype.length);
+print("Array.prototype.slice.prototype = " + Array.prototype.slice.prototype);
+try {
+    throw new Array.prototype.slice();
+} catch (e) {
+    print(e instanceof TypeError);
+}
+
+var x = [];
+x[true] = 1;
+print(x["true"]);
+
+x = [];
+x[NaN] = 1;
+print(x["NaN"]);
+
+x = [];
+x["0"] = 0;
+print(x[0]);
+
+x = [];
+x[true] = 1;
+print(x["true"]);
diff --git a/nashorn/test/script/basic/arrays2.js.EXPECTED b/nashorn/test/script/basic/arrays2.js.EXPECTED
new file mode 100644
index 00000000000..d8da5983da7
--- /dev/null
+++ b/nashorn/test/script/basic/arrays2.js.EXPECTED
@@ -0,0 +1,7 @@
+Array.prototype.length = 0
+Array.prototype.slice.prototype = undefined
+true
+1
+1
+0
+1
diff --git a/nashorn/test/script/basic/arraysIntKey.js b/nashorn/test/script/basic/arraysIntKey.js
new file mode 100644
index 00000000000..5f334e36ba3
--- /dev/null
+++ b/nashorn/test/script/basic/arraysIntKey.js
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Checks that we override array entries with defineProperty.
+ *
+ * @test
+ * @run
+ */
+ 
+var o = [0];
+Object.defineProperty(o, "0", { get: function() { return "zero"; }, set: function(v) { print(v); }, configurable: true });
+
+print(o[0]);
+o[0] = "one";
diff --git a/nashorn/test/script/basic/arraysIntKey.js.EXPECTED b/nashorn/test/script/basic/arraysIntKey.js.EXPECTED
new file mode 100644
index 00000000000..2edebd4a510
--- /dev/null
+++ b/nashorn/test/script/basic/arraysIntKey.js.EXPECTED
@@ -0,0 +1,2 @@
+zero
+one
diff --git a/nashorn/test/script/basic/arrayset.js b/nashorn/test/script/basic/arrayset.js
new file mode 100644
index 00000000000..c7e3913a282
--- /dev/null
+++ b/nashorn/test/script/basic/arrayset.js
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Tests setting an array element
+ *
+ * @test
+ * @run
+ */
+
+var arr = []; 
+print(arr.length);
+print(arr.hasOwnProperty(10000));
+print(arr.hasOwnProperty(10));
+arr[10000] = 13;
+print(arr.length);
+print(arr.hasOwnProperty(10000));
+print(arr.hasOwnProperty(10));
+
diff --git a/nashorn/test/script/basic/arrayset.js.EXPECTED b/nashorn/test/script/basic/arrayset.js.EXPECTED
new file mode 100644
index 00000000000..75e9e231ad7
--- /dev/null
+++ b/nashorn/test/script/basic/arrayset.js.EXPECTED
@@ -0,0 +1,6 @@
+0
+false
+false
+10001
+true
+false
diff --git a/nashorn/test/script/basic/arrayundefined.js b/nashorn/test/script/basic/arrayundefined.js
new file mode 100644
index 00000000000..5709ce7a979
--- /dev/null
+++ b/nashorn/test/script/basic/arrayundefined.js
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Undefined elements of (numeric) array should be "undefined".
+ *
+ * @test
+ * @run
+ */
+
+var x = [0];
+x.length = 4;
+print(x[0]);
+print(x[1]);
+print(x[2]);
+print(x[3]);
diff --git a/nashorn/test/script/basic/arrayundefined.js.EXPECTED b/nashorn/test/script/basic/arrayundefined.js.EXPECTED
new file mode 100644
index 00000000000..e03b2266899
--- /dev/null
+++ b/nashorn/test/script/basic/arrayundefined.js.EXPECTED
@@ -0,0 +1,4 @@
+0
+undefined
+undefined
+undefined
diff --git a/nashorn/test/script/basic/assign.js b/nashorn/test/script/basic/assign.js
new file mode 100644
index 00000000000..a41e9cd14dc
--- /dev/null
+++ b/nashorn/test/script/basic/assign.js
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Assign test.
+ *
+ * @test
+ * @run 
+ */
+
+var x = 10;
+print(x += 10);
+print(x -= 5);
+print(x *= 100);
+print(x /= 10);
+print(x %= 7);
+
+var b = 0xff;
+print(b &= 0xf);
+print(b |= 0xf0);
+print(b ^= 0xf);
+print(b <<= 24);
+print(b >>= 24);
+print(b >>>= 16);
+
+var a = [1, 2, 3, 4, 5];
+print(a[2 + a[0]] += 10);
+
+var o = {a:10, b:20};
+print(o.a += 10);
diff --git a/nashorn/test/script/basic/assign.js.EXPECTED b/nashorn/test/script/basic/assign.js.EXPECTED
new file mode 100644
index 00000000000..027a3003250
--- /dev/null
+++ b/nashorn/test/script/basic/assign.js.EXPECTED
@@ -0,0 +1,13 @@
+20
+15
+1500
+150
+3
+15
+255
+240
+-268435456
+-16
+65535
+14
+20
diff --git a/nashorn/test/script/basic/bitwise_and.js b/nashorn/test/script/basic/bitwise_and.js
new file mode 100644
index 00000000000..4e1c0e4013e
--- /dev/null
+++ b/nashorn/test/script/basic/bitwise_and.js
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Check bitwise AND on various (hex) int values.
+ *
+ * @test
+ * @run
+ */
+
+print(0x00000000 & 0xffffffff);
+print(0x11111111 & 0xffffffff);
+print(0x22222222 & 0xffffffff);
+print(0x33333333 & 0xffffffff);
+print(0x44444444 & 0xffffffff);
+print(0x55555555 & 0xffffffff);
+print(0x66666666 & 0xffffffff);
+print(0x77777777 & 0xffffffff);
+print(0x88888888 & 0xffffffff);
+print(0x99999999 & 0xffffffff);
+print(0xaaaaaaaa & 0xffffffff);
+print(0xbbbbbbbb & 0xffffffff);
+print(0xcccccccc & 0xffffffff);
+print(0xdddddddd & 0xffffffff);
+print(0xeeeeeeee & 0xffffffff);
+print(0xffffffff & 0xffffffff);
+
+// try non-literal value as well
+var a = 0xffffff00;
+print(a);
+print(a & 0xff); // expected 0
diff --git a/nashorn/test/script/basic/bitwise_and.js.EXPECTED b/nashorn/test/script/basic/bitwise_and.js.EXPECTED
new file mode 100644
index 00000000000..539196affc0
--- /dev/null
+++ b/nashorn/test/script/basic/bitwise_and.js.EXPECTED
@@ -0,0 +1,18 @@
+0
+286331153
+572662306
+858993459
+1145324612
+1431655765
+1717986918
+2004318071
+-2004318072
+-1717986919
+-1431655766
+-1145324613
+-858993460
+-572662307
+-286331154
+-1
+4294967040
+0
diff --git a/nashorn/test/script/basic/booleangetter.js b/nashorn/test/script/basic/booleangetter.js
new file mode 100644
index 00000000000..22af4bad66b
--- /dev/null
+++ b/nashorn/test/script/basic/booleangetter.js
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * booleangetter : Make sure that the not gives us the correct object type
+ *
+ * @test
+ * @run
+ */
+
+function f() {
+    print('hello');
+}
+
+function g() {
+    var x = f;
+    var obj = {};
+    var key = 'field';
+    obj[key] = x;
+    print(!obj[key]);
+}
+
+g();
diff --git a/nashorn/test/script/basic/booleangetter.js.EXPECTED b/nashorn/test/script/basic/booleangetter.js.EXPECTED
new file mode 100644
index 00000000000..c508d5366f7
--- /dev/null
+++ b/nashorn/test/script/basic/booleangetter.js.EXPECTED
@@ -0,0 +1 @@
+false
diff --git a/nashorn/test/script/basic/builtin.js b/nashorn/test/script/basic/builtin.js
new file mode 100644
index 00000000000..debcd27c2fa
--- /dev/null
+++ b/nashorn/test/script/basic/builtin.js
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Make sure that the builtin functions compile in all varieties and not crash
+ * or generate invalid bytecode
+ *
+ * @test
+ * @run
+ */
+
+function t1() {
+    var a = new Array();
+}
+
+function t2() {
+    var a = new Array(60);
+}
+
+function t3() {
+    eval("18 + 29");
+}
+
+function t4() {
+    var r = new RegExp();
+}
+
+function t5(p) {
+    var r = new RegExp(p);
+}
+
+function t6(p,m) {
+    var r = new RegExp(p,m);
+}
+
+function t7() {
+    var r = new RegExp("pattern");
+}
+
+function t8() {
+    var r = new RegExp("pattern", "gm");
+}
+
+t1();
+t2();
+t3();
+t4();
+t5();
+t6();
+t7();
+t8();
+
+print("done");
diff --git a/nashorn/test/script/basic/builtin.js.EXPECTED b/nashorn/test/script/basic/builtin.js.EXPECTED
new file mode 100644
index 00000000000..19f86f493ab
--- /dev/null
+++ b/nashorn/test/script/basic/builtin.js.EXPECTED
@@ -0,0 +1 @@
+done
diff --git a/nashorn/test/script/basic/builtin_assign.js b/nashorn/test/script/basic/builtin_assign.js
new file mode 100644
index 00000000000..669deb30b8d
--- /dev/null
+++ b/nashorn/test/script/basic/builtin_assign.js
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Verify that we can assign any value to (initially) function typed builtin properties.
+ *
+ * @test
+ * @run
+ */
+
+print(typeof(Math.sin));
+Math.sin(Math.PI);
+Math.sin = 4;
+print(typeof(Math.sin));
+print(Math.sin);
+
diff --git a/nashorn/test/script/basic/builtin_assign.js.EXPECTED b/nashorn/test/script/basic/builtin_assign.js.EXPECTED
new file mode 100644
index 00000000000..51fb94ac881
--- /dev/null
+++ b/nashorn/test/script/basic/builtin_assign.js.EXPECTED
@@ -0,0 +1,3 @@
+function
+number
+4
diff --git a/nashorn/test/script/basic/builtinchain.js b/nashorn/test/script/basic/builtinchain.js
new file mode 100644
index 00000000000..f9bfab0e5cd
--- /dev/null
+++ b/nashorn/test/script/basic/builtinchain.js
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Check important prototype chain properties of Function and Object.
+ *
+ * @test
+ * @run
+ */
+
+print(typeof(Object) == 'function');
+print(typeof(Object.prototype) == 'object');
+print(typeof(Function) == 'function');
+// Function's prototype is a function!
+print(typeof(Function.prototype) == 'function');
+
+print(Function.constructor === Function);
+print(Function.prototype === Object.getPrototypeOf(Function));
+print(Object.getPrototypeOf(Function.prototype) === Object.prototype);
+
+print(Object.constructor === Function);
+print(Object.getPrototypeOf(Object.prototype) === null);
+print(Object.getPrototypeOf(Object) === Function.prototype);
+
+// check one function from Function.prototype
+var applyFunc = Function.prototype.apply;
+print(applyFunc.constructor === Function);
+print(Object.getPrototypeOf(applyFunc) === Function.prototype);
+print(applyFunc.prototype === undefined);
+
+// check one function from Object.prototype
+var toStringFunc = Object.prototype.toString;
+print(toStringFunc.constructor === Function);
+print(Object.getPrototypeOf(toStringFunc) === Function.prototype);
+print(toStringFunc.prototype === undefined);
diff --git a/nashorn/test/script/basic/builtinchain.js.EXPECTED b/nashorn/test/script/basic/builtinchain.js.EXPECTED
new file mode 100644
index 00000000000..9f79e86d910
--- /dev/null
+++ b/nashorn/test/script/basic/builtinchain.js.EXPECTED
@@ -0,0 +1,16 @@
+true
+true
+true
+true
+true
+true
+true
+true
+true
+true
+true
+true
+true
+true
+true
+true
diff --git a/nashorn/test/script/basic/calllink.js b/nashorn/test/script/basic/calllink.js
new file mode 100644
index 00000000000..f2aa5472ec8
--- /dev/null
+++ b/nashorn/test/script/basic/calllink.js
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * Make sure that basic object method call re-linking works properly.
+ *
+ * @test
+ * @run
+ */
+
+var obj1 = {
+   func: function() { print("obj1.func called"); }
+};
+
+var obj2 = {
+   func: function() { print("obj2.func called"); }
+};
+
+var obj3 = {
+   __noSuchMethod__: function(name) {
+       print("no such method: " + name);
+   }
+};
+
+
+// have 'func' on prototype
+var obj4 = Object.create({
+    func: function() {
+        print("obj4's prototype func called");
+    }
+});
+
+function MyConstructor() {
+}
+
+MyConstructor.prototype.func = function() {
+    print("MyConstructor.prototype.func");
+}
+
+var obj5 = new MyConstructor();
+var obj6 = new MyConstructor();
+
+var arr = [ obj1, obj2, obj3, obj4, obj5, obj6, 
+            obj1, obj2, obj3, obj4, obj5, obj6 ];
+
+var myObj;
+for (i in arr) {
+    if (i == 8) {
+        obj3.func = function() {
+            print("new obj3.func called");
+        }
+        obj4.func = function() { 
+            print("new obj4.func called"); 
+        }
+        MyConstructor.prototype.func = function() {
+            print("all new MyConstructor.prototype.func");
+        }
+    }
+    myObj = arr[i];
+    myObj.func();
+}
diff --git a/nashorn/test/script/basic/calllink.js.EXPECTED b/nashorn/test/script/basic/calllink.js.EXPECTED
new file mode 100644
index 00000000000..f83b0a1b0f5
--- /dev/null
+++ b/nashorn/test/script/basic/calllink.js.EXPECTED
@@ -0,0 +1,12 @@
+obj1.func called
+obj2.func called
+no such method: func
+obj4's prototype func called
+MyConstructor.prototype.func
+MyConstructor.prototype.func
+obj1.func called
+obj2.func called
+new obj3.func called
+new obj4.func called
+all new MyConstructor.prototype.func
+all new MyConstructor.prototype.func
diff --git a/nashorn/test/script/basic/closure.js b/nashorn/test/script/basic/closure.js
new file mode 100644
index 00000000000..0fd2047f428
--- /dev/null
+++ b/nashorn/test/script/basic/closure.js
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Closure test.
+ *
+ * @test
+ * @run 
+ */
+ 
+(function test1(a, b){ print(a, b); })(10, 20);
+(function test2(a, b){ print(a, b); })(10);
+(function test3(a, b){ print(a, b); })(10, 20, 30);
+(function test4(a, b){ 
+    print(arguments[0] + "," + arguments[1]); 
+    print(arguments.callee);
+})(10, 20);
+
diff --git a/nashorn/test/script/basic/closure.js.EXPECTED b/nashorn/test/script/basic/closure.js.EXPECTED
new file mode 100644
index 00000000000..d039115fb7b
--- /dev/null
+++ b/nashorn/test/script/basic/closure.js.EXPECTED
@@ -0,0 +1,8 @@
+10 20
+10 undefined
+10 20
+10,20
+function test4(a, b){ 
+    print(arguments[0] + "," + arguments[1]); 
+    print(arguments.callee);
+}
diff --git a/nashorn/test/script/basic/commandargs.js b/nashorn/test/script/basic/commandargs.js
new file mode 100644
index 00000000000..2dccbfdde73
--- /dev/null
+++ b/nashorn/test/script/basic/commandargs.js
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Simple test to check command line arguments for scripts.
+ *
+ * @test
+ * @argument hello 
+ * @argument world
+ * @run
+ */
+
+for (i in arguments) {
+    print(arguments[i]);
+}
+ 
diff --git a/nashorn/test/script/basic/commandargs.js.EXPECTED b/nashorn/test/script/basic/commandargs.js.EXPECTED
new file mode 100644
index 00000000000..94954abda49
--- /dev/null
+++ b/nashorn/test/script/basic/commandargs.js.EXPECTED
@@ -0,0 +1,2 @@
+hello
+world
diff --git a/nashorn/test/script/basic/compile-octane.js b/nashorn/test/script/basic/compile-octane.js
new file mode 100644
index 00000000000..298b4675646
--- /dev/null
+++ b/nashorn/test/script/basic/compile-octane.js
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @runif external.octane
+ */ 
+
+compile_only = true;
+load(__DIR__ + 'run-octane.js');
diff --git a/nashorn/test/script/basic/compile-octane.js.EXPECTED b/nashorn/test/script/basic/compile-octane.js.EXPECTED
new file mode 100644
index 00000000000..a9b80b16c01
--- /dev/null
+++ b/nashorn/test/script/basic/compile-octane.js.EXPECTED
@@ -0,0 +1,12 @@
+Compiled OK: box2d.js
+Compiled OK: code-load.js
+Compiled OK: crypto.js
+Compiled OK: deltablue.js
+Compiled OK: earley-boyer.js
+Compiled OK: gbemu.js
+Compiled OK: navier-stokes.js
+Compiled OK: pdfjs.js
+Compiled OK: raytrace.js
+Compiled OK: regexp.js
+Compiled OK: richards.js
+Compiled OK: splay.js
diff --git a/nashorn/test/script/basic/condassign.js b/nashorn/test/script/basic/condassign.js
new file mode 100644
index 00000000000..7251d7eea43
--- /dev/null
+++ b/nashorn/test/script/basic/condassign.js
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Used to result in error: "Expected : but found =".
+ * Assignment should be allowed in conditional expression arms.
+ *
+ * @test
+ * @run
+ */
+
+var x = 3;
+var y = x ? x = 55 : 5465;
+print(y);
+var y = x ? 6 : x += 3;
+print(x);
diff --git a/nashorn/test/script/basic/condassign.js.EXPECTED b/nashorn/test/script/basic/condassign.js.EXPECTED
new file mode 100644
index 00000000000..7a165dae5c0
--- /dev/null
+++ b/nashorn/test/script/basic/condassign.js.EXPECTED
@@ -0,0 +1,2 @@
+55
+55
diff --git a/nashorn/test/script/basic/construct.js b/nashorn/test/script/basic/construct.js
new file mode 100644
index 00000000000..94a365726c6
--- /dev/null
+++ b/nashorn/test/script/basic/construct.js
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Constructor test.
+ *
+ * @test
+ * @run 
+ */
+
+function Test() {
+    this.A = "A big fat string";
+    this.B = 123;
+    
+    this.F = function(x) { return x; }
+   
+    var proto = Object.getPrototypeOf(this); 
+    proto.R = "A big fat string";
+    proto.S = 123;
+    
+    proto.T = function(x) { return x; }
+
+    return "monkey";
+}
+
+Test.prototype.G = "proto";
+
+var t = new Test();
+
+print(t);
+print(t.A);
+print(t.B);
+print(t.F);
+print(t.G);
+print(t.R);
+print(t.S);
+print(t.T);
+
+for (i in t) print(i, t[i]);
diff --git a/nashorn/test/script/basic/construct.js.EXPECTED b/nashorn/test/script/basic/construct.js.EXPECTED
new file mode 100644
index 00000000000..4c422cb2b96
--- /dev/null
+++ b/nashorn/test/script/basic/construct.js.EXPECTED
@@ -0,0 +1,15 @@
+[object Object]
+A big fat string
+123
+function(x) { return x; }
+proto
+A big fat string
+123
+function(x) { return x; }
+A A big fat string
+B 123
+F function(x) { return x; }
+G proto
+R A big fat string
+S 123
+T function(x) { return x; }
diff --git a/nashorn/test/script/basic/constructorname.js b/nashorn/test/script/basic/constructorname.js
new file mode 100644
index 00000000000..57874cb2e00
--- /dev/null
+++ b/nashorn/test/script/basic/constructorname.js
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Check obj.constructor property for user-defined constructor as well
+ * as built-in constructors.
+ *
+ * @test
+ * @run
+ */
+
+function MyConstructor() {}
+var myObj = new MyConstructor();
+print(myObj.constructor.name);
+
+myObj = {};
+print(myObj.constructor.name);
+
+myObj = new Boolean(true);
+print(myObj.constructor.name);
+
+myObj = new Number(3);
+print(myObj.constructor.name);
+
+myObj = new String("hello");
+print(myObj.constructor.name);
+
+myObj = new Array();
+print(myObj.constructor.name);
+
+myObj = /javascript/;
+print(myObj.constructor.name);
diff --git a/nashorn/test/script/basic/constructorname.js.EXPECTED b/nashorn/test/script/basic/constructorname.js.EXPECTED
new file mode 100644
index 00000000000..2ca66074497
--- /dev/null
+++ b/nashorn/test/script/basic/constructorname.js.EXPECTED
@@ -0,0 +1,7 @@
+MyConstructor
+Object
+Boolean
+Number
+String
+Array
+RegExp
diff --git a/nashorn/test/script/basic/date.js b/nashorn/test/script/basic/date.js
new file mode 100644
index 00000000000..92150972bb1
--- /dev/null
+++ b/nashorn/test/script/basic/date.js
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Basic checks for Date constructor.
+ * FIXME: add more checks
+ *
+ * @test
+ * @option -timezone=Asia/Calcutta
+ * @run
+ */
+
+// check arity of tricky functions
+print("Date.length = " + Date.length);
+print("Date.UTC.length = " + Date.UTC.length);
+print("Date.prototype.setSeconds.length = " + Date.prototype.setSeconds.length);
+print("Date.prototype.setUTCSeconds.length = " + Date.prototype.setUTCSeconds.length);
+print("Date.prototype.setMinutes.length = " + Date.prototype.setMinutes.length);
+print("Date.prototype.setUTCMinutes.length = " + Date.prototype.setUTCMinutes.length);
+print("Date.prototype.setHours.length = " + Date.prototype.setHours.length);
+print("Date.prototype.setUTCHours.length = " + Date.prototype.setUTCHours.length);
+print("Date.prototype.setMonth.length = " + Date.prototype.setMonth.length);
+print("Date.prototype.setUTCMonth.length = " + Date.prototype.setUTCMonth.length);
+print("Date.prototype.setFullYear.length = " + Date.prototype.setFullYear.length);
+print("Date.prototype.setUTCFullYear.length = " + Date.prototype.setUTCFullYear.length);
+
+function printDate(d) {
+    print(d.getMinutes());
+    print(d.getSeconds());
+    print(d.getMilliseconds());
+    print(d.getUTCDate());
+    print(d.getUTCDay());
+    print(d.getUTCMonth());
+    print(d.getUTCFullYear());
+    print(d.getUTCHours());
+    print(d.getUTCMinutes());
+    print(d.getUTCSeconds());
+    print(d.getUTCMilliseconds());
+    print(d.toISOString());
+    print(d.toUTCString());
+    print(d.toString());
+    print(d.toLocaleString());
+    print(d.toLocaleDateString());
+    print(d.toLocaleTimeString());
+    print(d.toDateString());
+    print(d.toTimeString());
+    print(d.toJSON());
+}
+
+var d = new Date(2011, 4, 3, 17, 1, 1, 0);
+printDate(d);
+
+d.setUTCMinutes(40, 34);
+printDate(d);
+
+d = new Date(Date.UTC(2000, 10, 1, 1, 1, 1, 1));
+printDate(d);
+
+d = new Date(0);
+d.setFullYear(2012);
+d.setMonth(1);
+d.setDate(2);
+d.setHours(3);
+d.setMinutes(3);
+d.setSeconds(4);
+d.setMilliseconds(5);
+printDate(d);
+
+d = new Date(0);
+d.setUTCFullYear(2012);
+d.setUTCMonth(1);
+d.setUTCDate(2);
+d.setUTCHours(3);
+d.setUTCMinutes(4);
+d.setUTCSeconds(5);
+d.setUTCMilliseconds(6);
+printDate(d);
+
+d = new Date(0);
+d.setTime(1000);
+printDate(d);
diff --git a/nashorn/test/script/basic/date.js.EXPECTED b/nashorn/test/script/basic/date.js.EXPECTED
new file mode 100644
index 00000000000..ddcff06cd4e
--- /dev/null
+++ b/nashorn/test/script/basic/date.js.EXPECTED
@@ -0,0 +1,132 @@
+Date.length = 7
+Date.UTC.length = 7
+Date.prototype.setSeconds.length = 2
+Date.prototype.setUTCSeconds.length = 2
+Date.prototype.setMinutes.length = 3
+Date.prototype.setUTCMinutes.length = 3
+Date.prototype.setHours.length = 4
+Date.prototype.setUTCHours.length = 4
+Date.prototype.setMonth.length = 2
+Date.prototype.setUTCMonth.length = 2
+Date.prototype.setFullYear.length = 3
+Date.prototype.setUTCFullYear.length = 3
+1
+1
+0
+3
+2
+4
+2011
+11
+31
+1
+0
+2011-05-03T11:31:01.000Z
+Tue, 03 May 2011 11:31:01 GMT
+Tue May 03 2011 17:01:01 GMT+0530 (IST)
+Tue May 03 2011 17:01:01 GMT+0530 (IST)
+2011-05-03
+17:01:01
+Tue May 03 2011
+17:01:01 GMT+0530 (IST)
+2011-05-03T11:31:01.000Z
+10
+34
+0
+3
+2
+4
+2011
+11
+40
+34
+0
+2011-05-03T11:40:34.000Z
+Tue, 03 May 2011 11:40:34 GMT
+Tue May 03 2011 17:10:34 GMT+0530 (IST)
+Tue May 03 2011 17:10:34 GMT+0530 (IST)
+2011-05-03
+17:10:34
+Tue May 03 2011
+17:10:34 GMT+0530 (IST)
+2011-05-03T11:40:34.000Z
+31
+1
+1
+1
+3
+10
+2000
+1
+1
+1
+1
+2000-11-01T01:01:01.001Z
+Wed, 01 Nov 2000 01:01:01 GMT
+Wed Nov 01 2000 06:31:01 GMT+0530 (IST)
+Wed Nov 01 2000 06:31:01 GMT+0530 (IST)
+2000-11-01
+06:31:01
+Wed Nov 01 2000
+06:31:01 GMT+0530 (IST)
+2000-11-01T01:01:01.001Z
+3
+4
+5
+1
+3
+1
+2012
+21
+33
+4
+5
+2012-02-01T21:33:04.005Z
+Wed, 01 Feb 2012 21:33:04 GMT
+Thu Feb 02 2012 03:03:04 GMT+0530 (IST)
+Thu Feb 02 2012 03:03:04 GMT+0530 (IST)
+2012-02-02
+03:03:04
+Thu Feb 02 2012
+03:03:04 GMT+0530 (IST)
+2012-02-01T21:33:04.005Z
+34
+5
+6
+2
+4
+1
+2012
+3
+4
+5
+6
+2012-02-02T03:04:05.006Z
+Thu, 02 Feb 2012 03:04:05 GMT
+Thu Feb 02 2012 08:34:05 GMT+0530 (IST)
+Thu Feb 02 2012 08:34:05 GMT+0530 (IST)
+2012-02-02
+08:34:05
+Thu Feb 02 2012
+08:34:05 GMT+0530 (IST)
+2012-02-02T03:04:05.006Z
+30
+1
+0
+1
+4
+0
+1970
+0
+0
+1
+0
+1970-01-01T00:00:01.000Z
+Thu, 01 Jan 1970 00:00:01 GMT
+Thu Jan 01 1970 05:30:01 GMT+0530 (IST)
+Thu Jan 01 1970 05:30:01 GMT+0530 (IST)
+1970-01-01
+05:30:01
+Thu Jan 01 1970
+05:30:01 GMT+0530 (IST)
+1970-01-01T00:00:01.000Z
diff --git a/nashorn/test/script/basic/dateparse.js b/nashorn/test/script/basic/dateparse.js
new file mode 100644
index 00000000000..abb480e9a8c
--- /dev/null
+++ b/nashorn/test/script/basic/dateparse.js
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Basic checks for Date.parse function.
+ *
+ * @test
+ * @option -timezone=Asia/Calcutta
+ * @run
+ */
+
+// ISO format
+var d = new Date(Date.parse("1972-06-16T00:00:00.000Z"));
+print(d.toString());
+print(d.toUTCString());
+
+// simple Date
+d = new Date(Date.parse("2009-01-01"));
+print(d.toString());
+print(d.toUTCString());
+
+// simple date and make sure we can parse back toString, toISOString
+// and toUTCString output ..
+d = new Date(2011, 4, 11);
+d = new Date(Date.parse(d.toString()));
+print(d.toString());
+print(d.toUTCString());
+
+d = new Date(Date.parse(d.toISOString()));
+print(d.toString());
+print(d.toUTCString());
+
+d = new Date(Date.parse(d.toUTCString()));
+print(d.toString());
+print(d.toUTCString());
diff --git a/nashorn/test/script/basic/dateparse.js.EXPECTED b/nashorn/test/script/basic/dateparse.js.EXPECTED
new file mode 100644
index 00000000000..95e7d0922cc
--- /dev/null
+++ b/nashorn/test/script/basic/dateparse.js.EXPECTED
@@ -0,0 +1,10 @@
+Fri Jun 16 1972 05:30:00 GMT+0530 (IST)
+Fri, 16 Jun 1972 00:00:00 GMT
+Thu Jan 01 2009 05:30:00 GMT+0530 (IST)
+Thu, 01 Jan 2009 00:00:00 GMT
+Wed May 11 2011 00:00:00 GMT+0530 (IST)
+Tue, 10 May 2011 18:30:00 GMT
+Wed May 11 2011 00:00:00 GMT+0530 (IST)
+Tue, 10 May 2011 18:30:00 GMT
+Wed May 11 2011 00:00:00 GMT+0530 (IST)
+Tue, 10 May 2011 18:30:00 GMT
diff --git a/nashorn/test/script/basic/decinc.js b/nashorn/test/script/basic/decinc.js
new file mode 100644
index 00000000000..421136554b7
--- /dev/null
+++ b/nashorn/test/script/basic/decinc.js
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Test dec/inc
+ *
+ * @test
+ * @run
+ */
+
+
+function fpp(x) {
+    var y = x - 0;
+    return y++;
+}
+
+function fmm(x) {
+    var y = x - 0;
+    return y--;
+}
+
+function ppf(x) {
+    var y = x - 0;
+    return ++y;
+}
+
+function mmf(x) {
+    var y = x - 0;
+    return --y;
+}
+
+print(fpp(100));
+print(fmm(100));
+print(ppf(100));
+print(mmf(100));
+
+var o = { x: 200 };
+
+print(o.x++);
+print(o.x--);
+print(++o.x);
+print(--o.x);
+
+var a = [300];
+
+print(a[0]++);
+print(a[0]--);
+print(++a[0]);
+print(--a[0]);
+
diff --git a/nashorn/test/script/basic/decinc.js.EXPECTED b/nashorn/test/script/basic/decinc.js.EXPECTED
new file mode 100644
index 00000000000..ce24b95de53
--- /dev/null
+++ b/nashorn/test/script/basic/decinc.js.EXPECTED
@@ -0,0 +1,12 @@
+100
+100
+101
+99
+200
+201
+201
+200
+300
+301
+301
+300
diff --git a/nashorn/test/script/basic/delete.js b/nashorn/test/script/basic/delete.js
new file mode 100644
index 00000000000..5b714a4688d
--- /dev/null
+++ b/nashorn/test/script/basic/delete.js
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Check delete operator.
+ *
+ * @test
+ * @run
+ */
+
+var obj = { foo: 3, bar: "hello" };
+
+print("foo" in obj);
+print(obj.foo);
+print(delete obj.foo);
+print("foo" in obj);
+
+print("bar" in obj);
+print(obj.bar);
+print(delete obj["bar"]);
+print("bar" in obj);
+
+print(delete obj.junk);
+print(delete obj["junk"]);
+print(delete obj[2]);
+
+x = 3;
+print(delete x);
+print("x" in this);
+
+// deleting literals
+print(delete 2);
+print(delete "hello");
+print(delete true);
+print(delete this);
+
+function func() {
+    print(delete this);
+}
+
+var o = {};
+o.func = func;
+o.func();
diff --git a/nashorn/test/script/basic/delete.js.EXPECTED b/nashorn/test/script/basic/delete.js.EXPECTED
new file mode 100644
index 00000000000..4cea7737650
--- /dev/null
+++ b/nashorn/test/script/basic/delete.js.EXPECTED
@@ -0,0 +1,18 @@
+true
+3
+true
+false
+true
+hello
+true
+false
+true
+true
+true
+true
+false
+true
+true
+true
+true
+true
diff --git a/nashorn/test/script/basic/delete2.js b/nashorn/test/script/basic/delete2.js
new file mode 100644
index 00000000000..f406e22efa5
--- /dev/null
+++ b/nashorn/test/script/basic/delete2.js
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * delete second round test.
+ * throws VerifyError!!
+ *
+ * @test
+ * @run 
+ */
+
+var a = 10;
+
+var b = {w: 10, x: 20, y: 30, z: 40};
+
+function c() {}
+
+function d() { print("side effect"); }
+
+function e(g) {
+    var f = 10;
+    
+    print(delete f);
+    print(f);
+    print(delete g);
+    print(g);
+}
+
+function h(foo) {
+  var y = 33;
+  print(delete y);
+  print(y);
+  print(delete foo);
+  print(foo);
+  print(arguments[0]);
+  print(delete arguments[0]);
+  print(foo);
+  print(arguments[0]);
+}
+
+print(delete a);
+print(delete b.x);
+print(delete b["y"]);
+with (b) {
+    print(delete z);
+    print(delete b);
+}
+print(delete c);
+
+print(delete this.a);
+print(delete 10);
+print(delete d());
+
+print(typeof a);
+for(i in b) print(i, b[i]);
+print(typeof c);
+
+e(10);
+
+h(20);
diff --git a/nashorn/test/script/basic/delete2.js.EXPECTED b/nashorn/test/script/basic/delete2.js.EXPECTED
new file mode 100644
index 00000000000..06f068b37f8
--- /dev/null
+++ b/nashorn/test/script/basic/delete2.js.EXPECTED
@@ -0,0 +1,25 @@
+false
+true
+true
+true
+false
+false
+false
+true
+side effect
+true
+number
+w 10
+function
+false
+10
+false
+10
+false
+33
+false
+20
+20
+true
+20
+undefined
diff --git a/nashorn/test/script/basic/dotpropname.js b/nashorn/test/script/basic/dotpropname.js
new file mode 100644
index 00000000000..f0aa1ba8574
--- /dev/null
+++ b/nashorn/test/script/basic/dotpropname.js
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * "." is property name should be allowed.
+ *
+ * @test
+ * @run
+ */
+
+var obj = {};
+obj["abc.yyy"] =  function () {
+    print("abc.yyy called");
+};
+
+obj["abc.yyy"]();
+
+obj["abc.xyz"] = "hello";
+print(obj["abc.xyz"]);
+
diff --git a/nashorn/test/script/basic/dotpropname.js.EXPECTED b/nashorn/test/script/basic/dotpropname.js.EXPECTED
new file mode 100644
index 00000000000..0baf117c08d
--- /dev/null
+++ b/nashorn/test/script/basic/dotpropname.js.EXPECTED
@@ -0,0 +1,2 @@
+abc.yyy called
+hello
diff --git a/nashorn/test/script/basic/doublecache.js b/nashorn/test/script/basic/doublecache.js
new file mode 100644
index 00000000000..ec443ab7385
--- /dev/null
+++ b/nashorn/test/script/basic/doublecache.js
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Test double caching.
+ *
+ * @test
+ * @run
+ */
+
+var x = [
+        "number array spoiler",
+        -200,
+        -100,
+        -0.5,
+        -0.25,
+        0,
+        0.25,
+        0.5,
+        100,
+        200,
+        
+        -200,
+        -100,
+        -0.5,
+        -0.25,
+        0,
+        0.25,
+        0.5,
+        100,
+        200
+        ];
+        
+for (i in x) print(x[i]);
diff --git a/nashorn/test/script/basic/doublecache.js.EXPECTED b/nashorn/test/script/basic/doublecache.js.EXPECTED
new file mode 100644
index 00000000000..c469337b050
--- /dev/null
+++ b/nashorn/test/script/basic/doublecache.js.EXPECTED
@@ -0,0 +1,19 @@
+number array spoiler
+-200
+-100
+-0.5
+-0.25
+0
+0.25
+0.5
+100
+200
+-200
+-100
+-0.5
+-0.25
+0
+0.25
+0.5
+100
+200
diff --git a/nashorn/test/script/basic/enumeration.js b/nashorn/test/script/basic/enumeration.js
new file mode 100644
index 00000000000..b23f1d5cfb6
--- /dev/null
+++ b/nashorn/test/script/basic/enumeration.js
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Make sure that there are no-enumerable items on standard objects. 
+ *
+ * @test
+ * @run
+ */
+
+function enumerate(obj, name) {
+    var count = 0;
+    for (i in obj) {
+        print(i);
+        count++;
+    }
+    print("Enumerable items in " + name + " = " + count);
+}
+
+enumerate(Array.prototype, "Array.prototype");
+enumerate(Array, "Array");
+enumerate(Boolean.prototype, "Boolean.prototype");
+enumerate(Boolean, "Boolean");
+enumerate(Date.prototype, "Date.prototype");
+enumerate(Date, "Date");
+enumerate(Function.prototype, "Function.prototype");
+enumerate(Function, "Function");
+enumerate(JSON, "JSON");
+enumerate(Math, "Math");
+enumerate(Number.prototype, "Number.prototype");
+enumerate(Number, "Number");
+enumerate(Object.prototype, "Object.prototype");
+enumerate(Object, "Object");
+enumerate(String.prototype, "String.prototype");
+enumerate(String, "String");
diff --git a/nashorn/test/script/basic/enumeration.js.EXPECTED b/nashorn/test/script/basic/enumeration.js.EXPECTED
new file mode 100644
index 00000000000..8cd73f3e8f6
--- /dev/null
+++ b/nashorn/test/script/basic/enumeration.js.EXPECTED
@@ -0,0 +1,16 @@
+Enumerable items in Array.prototype = 0
+Enumerable items in Array = 0
+Enumerable items in Boolean.prototype = 0
+Enumerable items in Boolean = 0
+Enumerable items in Date.prototype = 0
+Enumerable items in Date = 0
+Enumerable items in Function.prototype = 0
+Enumerable items in Function = 0
+Enumerable items in JSON = 0
+Enumerable items in Math = 0
+Enumerable items in Number.prototype = 0
+Enumerable items in Number = 0
+Enumerable items in Object.prototype = 0
+Enumerable items in Object = 0
+Enumerable items in String.prototype = 0
+Enumerable items in String = 0
diff --git a/nashorn/test/script/basic/errors.js b/nashorn/test/script/basic/errors.js
new file mode 100644
index 00000000000..40ff1a31799
--- /dev/null
+++ b/nashorn/test/script/basic/errors.js
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Basic checks for Error constructors.
+ * 
+ * @test
+ * @run
+ */
+
+print(Error.name + " is a " + typeof(Error));
+print(EvalError.name + " is a " + typeof(EvalError));
+print(RangeError.name + " is a " + typeof(RangeError));
+print(ReferenceError.name + " is a " + typeof(ReferenceError));
+print(SyntaxError.name + " is a " + typeof(SyntaxError));
+print(TypeError.name + " is a " + typeof(TypeError));
+print(URIError.name + " is a " + typeof(URIError));
+
+print("Error.arity " + Error.length);
+print("EvalError.arity " + EvalError.length);
+print("RangeError.arity " + RangeError.length);
+print("ReferenceError.arity " + ReferenceError.length);
+print("SyntaxError.arity " + SyntaxError.length);
+print("TypeError.arity " + TypeError.length);
+print("URIError.arity " + URIError.length);
+
+var err = new Error("my error");
+try {
+    throw err;
+} catch (e) {
+    print(e instanceof Error);
+    print(e.message);
+    print(e.name);
+    var ne = e.nashornException;
+    if (ne != undefined) {
+        if (ne.fileName !== __FILE__) {
+            fail("incorrect filename in error");
+        }
+        print("thrown @ " + ne.lineNumber);
+    }
+}
+
+// try to print undefined global var..
+try {
+    print(foo);
+} catch (e) {
+    print(e instanceof ReferenceError);
+    print(e.name);
+    print(e.message);
+}
+
+// try to call something that is undefined
+try {
+    Object.foo_method();
+} catch (e) {
+    print(e instanceof TypeError);
+    print(e.name);
+    print(e.message);
+}
+
+// prototypes of Error constructors are not writable
+Error.prototype = {};
+print(Error.prototype.name);
+EvalError.prototype = {};
+print(EvalError.prototype.name);
+RangeError.prototype = {};
+print(RangeError.prototype.name);
+ReferenceError.prototype = {};
+print(ReferenceError.prototype.name);
+SyntaxError.prototype = {};
+print(SyntaxError.prototype.name);
+TypeError.prototype = {};
+print(TypeError.prototype.name);
+URIError.prototype = {};
+print(URIError.prototype.name);
diff --git a/nashorn/test/script/basic/errors.js.EXPECTED b/nashorn/test/script/basic/errors.js.EXPECTED
new file mode 100644
index 00000000000..8fae2cab32e
--- /dev/null
+++ b/nashorn/test/script/basic/errors.js.EXPECTED
@@ -0,0 +1,31 @@
+Error is a function
+EvalError is a function
+RangeError is a function
+ReferenceError is a function
+SyntaxError is a function
+TypeError is a function
+URIError is a function
+Error.arity 1
+EvalError.arity 1
+RangeError.arity 1
+ReferenceError.arity 1
+SyntaxError.arity 1
+TypeError.arity 1
+URIError.arity 1
+true
+my error
+Error
+thrown @ 49
+true
+ReferenceError
+"foo" is not defined
+true
+TypeError
+Cannot call undefined
+Error
+EvalError
+RangeError
+ReferenceError
+SyntaxError
+TypeError
+URIError
diff --git a/nashorn/test/script/basic/errorstack.js b/nashorn/test/script/basic/errorstack.js
new file mode 100644
index 00000000000..7a6a3fb0f33
--- /dev/null
+++ b/nashorn/test/script/basic/errorstack.js
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * "stack" property of Error objects. (nashorn extension).
+ *
+ * @test
+ * @run
+ */ 
+
+function func1() {
+   func2();
+}
+
+function func2() {
+   func3();
+}
+
+function func3() {
+   throw new Error("error");
+}
+
+try {
+    func1();
+} catch (e) {
+    // "stack" is java.lang.StackTraceElement object
+    for (i in e.stack) {
+        print(e.stack[i].methodName + " : " + e.stack[i].lineNumber);
+    }
+}
+
diff --git a/nashorn/test/script/basic/errorstack.js.EXPECTED b/nashorn/test/script/basic/errorstack.js.EXPECTED
new file mode 100644
index 00000000000..bb85d4e4efd
--- /dev/null
+++ b/nashorn/test/script/basic/errorstack.js.EXPECTED
@@ -0,0 +1,4 @@
+func3 : 40
+func2 : 36
+func1 : 32
+runScript : 44
diff --git a/nashorn/test/script/basic/eval.js b/nashorn/test/script/basic/eval.js
new file mode 100644
index 00000000000..600c22d1908
--- /dev/null
+++ b/nashorn/test/script/basic/eval.js
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * eval test.
+ *
+ * @test
+ * @run 
+ */
+
+print("eval.length " + eval.length);
+
+function test1() {
+    var x = 200;
+    y = x + 2000;
+    
+    print(x);
+    print(y);
+}
+
+function test2() {
+    eval("var x = 300;");
+    eval("y = x + 3000;");
+    
+    print(x);
+    print(y);
+}
+
+
+eval("var x = 100;");
+eval("y = x + 1000;");
+
+print(x);
+print(y);
+
+test1();
+
+print(x);
+print(y);
+
+test2();
+
+print(x);
+print(y);
+
+// evaluate with syntax error and catch error
+try {
+    // missing end quote
+    eval("print('hello)");
+} catch (e) {
+    print("is syntax error? " + (e instanceof SyntaxError));
+    print(e.toString().replace(/\\/g, '/'));
+}
diff --git a/nashorn/test/script/basic/eval.js.EXPECTED b/nashorn/test/script/basic/eval.js.EXPECTED
new file mode 100644
index 00000000000..3ab2f3dab51
--- /dev/null
+++ b/nashorn/test/script/basic/eval.js.EXPECTED
@@ -0,0 +1,15 @@
+eval.length 1
+100
+1100
+200
+2200
+100
+2200
+300
+3300
+100
+3300
+is syntax error? true
+SyntaxError: test/script/basic/eval.js#69<eval>:1:13 Missing close quote
+print('hello)
+             ^
diff --git a/nashorn/test/script/basic/evalreturn.js b/nashorn/test/script/basic/evalreturn.js
new file mode 100644
index 00000000000..531892ec2a0
--- /dev/null
+++ b/nashorn/test/script/basic/evalreturn.js
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * eval return values test.
+ *
+ * @test
+ * @run 
+ */
+
+var x = 0;
+print(eval("for(var x = 0; x < 100 ; x++) x;"));
+print(eval("if (x == 1) { 'hello' } else { 'world' }"));
+print(eval("do { x = 1 } while (false);"));
+print(eval("var x = 1"));
+print(eval("if (x == 0) { 'hello' }"));
+print(eval("if (x == 1) { 'hello' }"));
+
+var i;
+var j;
+str1 = '';
+str2 = '';
+x = 1;
+y = 2;
+
+for (i in this) {
+    str1 += i;
+}
+
+eval('for(j in this){\nstr2+=j;\n}');
+
+if (!(str1 === str2)){
+    print("scope chain is broken");
+    print("str1 = "+str1);
+    print("str2 = "+str2);
+    print("they should be the same");
+    throw "error";
+}
+
+print("Scoping OK");
+
+var f = eval("function cookie() { print('sweet and crunchy!'); } function cake() { print('moist and delicious!'); }");
+print(f);
+f();
+var g = eval("function cake() { print('moist and delicious!'); } function cookie() { print('sweet and crunchy!'); }");
+print(g);
+g();
+ 
+
+
+
diff --git a/nashorn/test/script/basic/evalreturn.js.EXPECTED b/nashorn/test/script/basic/evalreturn.js.EXPECTED
new file mode 100644
index 00000000000..96d044d01c0
--- /dev/null
+++ b/nashorn/test/script/basic/evalreturn.js.EXPECTED
@@ -0,0 +1,11 @@
+99
+world
+1
+undefined
+undefined
+hello
+Scoping OK
+function cake() { print('moist and delicious!'); }
+moist and delicious!
+function cookie() { print('sweet and crunchy!'); }
+sweet and crunchy!
diff --git a/nashorn/test/script/basic/exprclosure.js b/nashorn/test/script/basic/exprclosure.js
new file mode 100644
index 00000000000..6c7a81478a3
--- /dev/null
+++ b/nashorn/test/script/basic/exprclosure.js
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Expression closures.
+ *
+ * @test
+ * @run
+ */
+
+var f = function(x) x*x;
+print(f);
+print(f(25));
+
+function fun(x) x * (x + 1) / 2;
+print(fun);
+print(fun(10));
+
diff --git a/nashorn/test/script/basic/exprclosure.js.EXPECTED b/nashorn/test/script/basic/exprclosure.js.EXPECTED
new file mode 100644
index 00000000000..ae803384ef3
--- /dev/null
+++ b/nashorn/test/script/basic/exprclosure.js.EXPECTED
@@ -0,0 +1,4 @@
+function(x) x*x;
+625
+function fun(x) x * (x + 1) / 2;
+55
diff --git a/nashorn/test/script/basic/extensibility.js b/nashorn/test/script/basic/extensibility.js
new file mode 100644
index 00000000000..a7df96594b7
--- /dev/null
+++ b/nashorn/test/script/basic/extensibility.js
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Basic checks for Object.preventExtensible.
+ *
+ * @test
+ * @run
+ */
+
+// after preventExtenssions, we can't add new properties but
+// can modifiy existing properties.
+var obj = { num: 45.0 };
+
+print("extensible? " + Object.isExtensible(obj));
+Object.preventExtensions(obj);
+print("extensible? " + Object.isExtensible(obj));
+
+obj['bar'] = "hello";
+print(obj.bar);
+obj.num = Math.PI;
+print(obj.num);
+
+obj.foo = 55;
+print(obj.foo);
+obj.num = Math.E;
+print(obj.num);
diff --git a/nashorn/test/script/basic/extensibility.js.EXPECTED b/nashorn/test/script/basic/extensibility.js.EXPECTED
new file mode 100644
index 00000000000..bc726ed06f9
--- /dev/null
+++ b/nashorn/test/script/basic/extensibility.js.EXPECTED
@@ -0,0 +1,6 @@
+extensible? true
+extensible? false
+undefined
+3.141592653589793
+undefined
+2.718281828459045
diff --git a/nashorn/test/script/basic/fileline.js b/nashorn/test/script/basic/fileline.js
new file mode 100644
index 00000000000..6157ed582db
--- /dev/null
+++ b/nashorn/test/script/basic/fileline.js
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Check __FILE__, __LINE__ and __DIR__ built-ins.
+ *
+ * @test
+ * @run
+ */
+
+print("hello world");
+var idx = __FILE__.lastIndexOf(java.io.File.separator);
+if (idx < 0) {
+    // separator is "/" when running under ant on windows
+    idx = __FILE__.lastIndexOf("/");
+}
+var file = (idx != -1)? __FILE__.substring(idx + 1) : __FILE__;
+print(file + " : " + __LINE__);
+
+// loaded file should see it's name in __FILE__
+load(__DIR__ + "loadedfile.js");
+
+// Add check for base part of a URL. We can't test __DIR__ inside
+// a script that is downloaded from a URL. check for Source.baseURL
+// which is exposed as __DIR__ for URL case.
+
+var url = new java.net.URL("http://www.acme.com:8080/foo/bar.js");
+print(Packages.jdk.nashorn.internal.runtime.Source.baseURL(url));
diff --git a/nashorn/test/script/basic/fileline.js.EXPECTED b/nashorn/test/script/basic/fileline.js.EXPECTED
new file mode 100644
index 00000000000..ac75a2c2f59
--- /dev/null
+++ b/nashorn/test/script/basic/fileline.js.EXPECTED
@@ -0,0 +1,4 @@
+hello world
+fileline.js : 38
+loadedfile.js : 36
+http://www.acme.com:8080/foo/
diff --git a/nashorn/test/script/basic/finally-catchalls.js b/nashorn/test/script/basic/finally-catchalls.js
new file mode 100644
index 00000000000..4b734e887d2
--- /dev/null
+++ b/nashorn/test/script/basic/finally-catchalls.js
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * finally-catchalls: should not be able to read, write, call properties from null literal.
+ *
+ * @test
+ * @run
+ */
+
+function test1() {
+    try {
+	print("try");
+	throw "ex";
+    } finally {
+	print("finally");
+    }
+}
+
+function test2() {   
+    try {
+	print("try");
+    } finally {
+	print("finally");
+    }
+}
+
+function test3() {   
+    try {
+	print("try");
+	return;
+    } finally {
+	print("finally");
+    }
+}
+
+function test4() {   
+    var i = 0;
+    while (i<10) {
+	try {
+	    print("try "+i);
+	    i++;
+	    continue;
+	} finally {
+	    print("finally "+i);
+	}
+    }
+    print(i);
+}
+
+function test5() {   
+    var i = 0;
+    while (i<10) {
+	try {
+	    print("try "+i);
+	    i++;
+	    break;
+	} finally {
+	    print("finally "+i);
+	}
+    }
+    print(i);
+}
+
+function test6() {   
+    var i = 0;
+    while (i<10) {
+	try {
+	    print("try "+i);
+	    if (i == 5)
+		break;
+	    i++;
+	} finally {
+	    print("finally "+i);
+	}
+    }
+    print(i);
+}
+
+print("\ntest 1\n");
+try { 
+    test1();
+} catch (e) {
+    print("got e");
+}
+
+print("\ntest 2\n");
+test2();
+
+print("\ntest 3\n");
+test3();
+
+print("\ntest 4\n");
+test4();
+
+print("\ntest 5\n");
+test5();
+
+print("\ntest 6\n");
+test6();
+
diff --git a/nashorn/test/script/basic/finally-catchalls.js.EXPECTED b/nashorn/test/script/basic/finally-catchalls.js.EXPECTED
new file mode 100644
index 00000000000..51e06641ef1
--- /dev/null
+++ b/nashorn/test/script/basic/finally-catchalls.js.EXPECTED
@@ -0,0 +1,62 @@
+
+test 1
+
+try
+finally
+got e
+
+test 2
+
+try
+finally
+
+test 3
+
+try
+finally
+
+test 4
+
+try 0
+finally 1
+try 1
+finally 2
+try 2
+finally 3
+try 3
+finally 4
+try 4
+finally 5
+try 5
+finally 6
+try 6
+finally 7
+try 7
+finally 8
+try 8
+finally 9
+try 9
+finally 10
+10
+
+test 5
+
+try 0
+finally 1
+1
+
+test 6
+
+try 0
+finally 1
+try 1
+finally 2
+try 2
+finally 3
+try 3
+finally 4
+try 4
+finally 5
+try 5
+finally 5
+5
diff --git a/nashorn/test/script/basic/finallyreturn.js b/nashorn/test/script/basic/finallyreturn.js
new file mode 100644
index 00000000000..1f484fb03e8
--- /dev/null
+++ b/nashorn/test/script/basic/finallyreturn.js
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * This results in VerifyError: Control flow falls through code end.
+ *
+ * @test
+ * @run
+ */
+
+function func(){
+    try {
+        return 0;
+    } finally {
+        return 42;
+    }
+}
+
+print(func());
+
+
diff --git a/nashorn/test/script/basic/finallyreturn.js.EXPECTED b/nashorn/test/script/basic/finallyreturn.js.EXPECTED
new file mode 100644
index 00000000000..d81cc0710eb
--- /dev/null
+++ b/nashorn/test/script/basic/finallyreturn.js.EXPECTED
@@ -0,0 +1 @@
+42
diff --git a/nashorn/test/script/basic/forin.js b/nashorn/test/script/basic/forin.js
new file mode 100644
index 00000000000..8a799219bf2
--- /dev/null
+++ b/nashorn/test/script/basic/forin.js
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Test for in
+ *
+ * @test
+ * @run
+ */
+
+var a = [10, 20, 30, 40];
+var o = {a: 100, b: 200, c: 300};
+var j = new java.util.ArrayList();
+j.add("apple");
+j.add("bear");
+j.add("car");
+var ja = j.toArray();
+var s = "apple,bear,car".split(",");
+
+for (i in a) print(i, a[i]);
+for each (i in a) print(i);
+for (i in o) print(i, o[i]);
+for each (i in j) print(i);
+for (i in ja) print(i, ja[i]);
+for each (i in ja) print(i);
+for (i in s) print(i, s[i]);
+for each (i in s) print(i);
+
+// 'each' is a contextual keyword. Ok to use as identifier elsewhere..
+var each = "This is each";
+print(each);
+
+// it is ok to use "each" is usual for loop. Ignored as noise word.
+for each (var i = 0; i < 10; i++) {
+    print(i);
+}
diff --git a/nashorn/test/script/basic/forin.js.EXPECTED b/nashorn/test/script/basic/forin.js.EXPECTED
new file mode 100644
index 00000000000..159e43ba843
--- /dev/null
+++ b/nashorn/test/script/basic/forin.js.EXPECTED
@@ -0,0 +1,37 @@
+0 10
+1 20
+2 30
+3 40
+10
+20
+30
+40
+a 100
+b 200
+c 300
+apple
+bear
+car
+0 apple
+1 bear
+2 car
+apple
+bear
+car
+0 apple
+1 bear
+2 car
+apple
+bear
+car
+This is each
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
diff --git a/nashorn/test/script/basic/forin2.js b/nashorn/test/script/basic/forin2.js
new file mode 100644
index 00000000000..d4e674221c5
--- /dev/null
+++ b/nashorn/test/script/basic/forin2.js
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Mostly for-in iterations through esoteric collections
+ *
+ * @test
+ * @run
+ */
+
+for (y in {}) {
+    y = 2;
+}
+
+try {
+    null['foo'];
+    print("error 1");
+} catch(e) {
+    if ((e instanceof TypeError) !== true) {
+	print(e);
+    }
+}
+
+try {
+    with(null) x = 2;
+    print("error 2");
+} catch(e) {
+    if((e instanceof TypeError) !== true) {
+	print(e);
+    }
+}
+
+try {  
+    for (var y in null) { 
+	y = 2;
+    }
+    print("this is ok 1");
+} catch(e) {
+    if ((e instanceof TypeError) !== true) {
+	print(e);
+    }
+}
+
+// CHECK#4
+try {
+    for (var z in 'bbb'.match(/aaa/)) { 
+	z = 2;
+    }
+    print("this is ok 2");
+} catch(e) {
+    if((e instanceof TypeError) !== true) {
+	print(e);
+    }
+}
+
+
+try {
+    undefined['foo'];
+    print("error 5");
+} catch(e) {
+    if ((e instanceof TypeError) !== true) {
+	print(e);
+    }
+}
+
+try {
+    with(undefined) x = 2;
+    print("error 6");
+} catch (e) {
+    if ((e instanceof TypeError) !== true) {
+	print(e);
+    }
+}
+
+// CHECK#3
+try {
+    for (var y in undefined) { 
+	y = 2;
+    }
+    print("this is ok 3");
+} catch (e) { 
+    if ((e instanceof TypeError) !== true) {
+	print(e);
+    }
+}
+
+try {
+    for (var z in this.foo) { 
+	z = 2;
+    }
+    print("this is ok 4");
+} catch (e) {
+    if ((e instanceof TypeError) !== true) {
+	print(e);
+    }
+}
diff --git a/nashorn/test/script/basic/forin2.js.EXPECTED b/nashorn/test/script/basic/forin2.js.EXPECTED
new file mode 100644
index 00000000000..07e56818b01
--- /dev/null
+++ b/nashorn/test/script/basic/forin2.js.EXPECTED
@@ -0,0 +1,4 @@
+this is ok 1
+this is ok 2
+this is ok 3
+this is ok 4
diff --git a/nashorn/test/script/basic/funcarray.js b/nashorn/test/script/basic/funcarray.js
new file mode 100644
index 00000000000..8fce5e62fd6
--- /dev/null
+++ b/nashorn/test/script/basic/funcarray.js
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Function array test.
+ *
+ * @test
+ * @run 
+ */
+ 
+
+var funcs = [
+                function() { print("first"); },
+                function() { print("second"); },
+                function() { print("third"); },
+                function() { print("fourth"); }
+            ];
+            
+funcs[0]();
+funcs[1]();
+funcs[2]();
+funcs[3]();
diff --git a/nashorn/test/script/basic/funcarray.js.EXPECTED b/nashorn/test/script/basic/funcarray.js.EXPECTED
new file mode 100644
index 00000000000..cf59613a135
--- /dev/null
+++ b/nashorn/test/script/basic/funcarray.js.EXPECTED
@@ -0,0 +1,4 @@
+first
+second
+third
+fourth
diff --git a/nashorn/test/script/basic/funcbind.js b/nashorn/test/script/basic/funcbind.js
new file mode 100644
index 00000000000..876e1c24b44
--- /dev/null
+++ b/nashorn/test/script/basic/funcbind.js
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Test the functionality of Function.prototype.bind.
+ *
+ * @test
+ * @run
+ */
+
+var global = this;
+
+function foo() {
+    print("global foo");
+}
+
+function func(x, y) { 
+    print(this == global);
+    print(x); 
+    print(y); 
+    this.foo();
+}
+
+print("func.bind.length = " + func.bind.length);
+
+var f = func.bind(this, 434);
+print(f.length);
+f("hello");
+
+// bind with a different 'this' and different number of args
+f = func.bind({ foo: function() { print("foo member"); } });
+print(f.length);
+f("world", 42);
diff --git a/nashorn/test/script/basic/funcbind.js.EXPECTED b/nashorn/test/script/basic/funcbind.js.EXPECTED
new file mode 100644
index 00000000000..e47253ffa93
--- /dev/null
+++ b/nashorn/test/script/basic/funcbind.js.EXPECTED
@@ -0,0 +1,11 @@
+func.bind.length = 1
+1
+true
+434
+hello
+global foo
+2
+false
+world
+42
+foo member
diff --git a/nashorn/test/script/basic/funcconstructor.js b/nashorn/test/script/basic/funcconstructor.js
new file mode 100644
index 00000000000..97da0c4de3b
--- /dev/null
+++ b/nashorn/test/script/basic/funcconstructor.js
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Test Function constructor.
+ *
+ * @test
+ * @run
+ */
+
+var f = new Function("x", "print('anon func'); return x*x;");
+print(f(15));
+print(f.toSource());
+
+try {
+    // should throw SyntaxError for missing quote
+    var f = new Function("print('hello)");
+} catch (e) {
+    print("syntax error? " + (e instanceof SyntaxError));
+    print(e);
+}
+
+print("done");
diff --git a/nashorn/test/script/basic/funcconstructor.js.EXPECTED b/nashorn/test/script/basic/funcconstructor.js.EXPECTED
new file mode 100644
index 00000000000..cf537d5ac86
--- /dev/null
+++ b/nashorn/test/script/basic/funcconstructor.js.EXPECTED
@@ -0,0 +1,10 @@
+anon func
+225
+function (x) {
+print('anon func'); return x*x;
+}
+syntax error? true
+SyntaxError: <function>:2:13 Missing close quote
+print('hello)
+             ^
+done
diff --git a/nashorn/test/script/basic/getclassname.js b/nashorn/test/script/basic/getclassname.js
new file mode 100644
index 00000000000..c877ea3b953
--- /dev/null
+++ b/nashorn/test/script/basic/getclassname.js
@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Test to check [[Class]] internal property for various standard objects.
+ *
+ * @test
+ * @run
+ */
+
+function checkClass(obj, expected) {
+    var str = Object.prototype.toString.call(obj);
+    if (str != expected) {
+        fail("expected " + expected + ", got " + str);
+    }
+}
+
+// objects
+checkClass([2, 23], "[object Array]");
+checkClass(new Boolean(true), "[object Boolean]");
+checkClass(new Date(0), "[object Date]");
+checkClass(new Error(), "[object Error]");
+checkClass(new EvalError(), "[object Error]");
+if (typeof JSAdapter != 'undefined') {
+    checkClass(new JSAdapter({}), "[object JSAdapter]");
+}
+if (typeof JavaImporter != 'undefined') {
+    checkClass(new JavaImporter(java.io), "[object JavaImporter]");
+}
+checkClass(function() {}, "[object Function]");
+checkClass(new Number(42), "[object Number]");
+checkClass(new Object(), "[object Object]");
+checkClass(new RangeError(), "[object Error]");
+checkClass(new ReferenceError(), "[object Error]");
+checkClass(/nashorn/, "[object RegExp]");
+checkClass(new String('hello'), "[object String]");
+checkClass(new SyntaxError(), "[object Error]");
+checkClass(new TypeError(), "[object Error]");
+checkClass(new URIError(), "[object Error]");
+
+// constructors and prototypes
+checkClass(Array, "[object Function]");
+checkClass(Array.prototype, "[object Array]");
+checkClass(Boolean, "[object Function]");
+checkClass(Boolean.prototype, "[object Boolean]");
+checkClass(Date, "[object Function]");
+checkClass(Date.prototype, "[object Date]");
+checkClass(Error, "[object Function]");
+checkClass(Error.prototype, "[object Error]");
+checkClass(EvalError, "[object Function]");
+checkClass(EvalError.prototype, "[object Error]");
+checkClass(Function, "[object Function]");
+checkClass(Function.prototype, "[object Function]");
+if (typeof JSAdapter != 'undefined') {
+    checkClass(JSAdapter, "[object Function]");
+    checkClass(JSAdapter.prototype, "[object JSAdapter]");
+}
+if (typeof JavaImporter != 'undefined') {
+    checkClass(JavaImporter, "[object Function]");
+    checkClass(JavaImporter.prototype, "[object JavaImporter]");
+}
+checkClass(Number, "[object Function]");
+checkClass(Number.prototype, "[object Number]");
+checkClass(Object, "[object Function]");
+checkClass(Object.prototype, "[object Object]");
+checkClass(RangeError, "[object Function]");
+checkClass(RangeError.prototype, "[object Error]");
+checkClass(ReferenceError, "[object Function]");
+checkClass(ReferenceError.prototype, "[object Error]");
+checkClass(RegExp, "[object Function]");
+checkClass(RegExp.prototype, "[object RegExp]");
+checkClass(String, "[object Function]");
+checkClass(String.prototype, "[object String]");
+checkClass(SyntaxError, "[object Function]");
+checkClass(SyntaxError.prototype, "[object Error]");
+checkClass(TypeError, "[object Function]");
+checkClass(TypeError.prototype, "[object Error]");
+checkClass(URIError, "[object Function]");
+checkClass(URIError.prototype, "[object Error]");
+
+// misc. objects
+checkClass(this, "[object global]");
+checkClass(this.prototype, "[object Undefined]");
+
+if (typeof Packages != 'undefined') {
+    checkClass(Packages, "[object JavaPackage]");
+    checkClass(java, "[object JavaPackage]");
+    checkClass(javax, "[object JavaPackage]");
+}
+
+if (typeof Java != 'undefined') {
+    checkClass(Java, "[object Java]");
+    checkClass(Java.prototype, "[object Undefined]");
+}
+
+if (typeof Debug != 'undefined') {
+    checkClass(Debug, "[object Debug]");
+}
+
+checkClass((function() { return arguments; })(), "[object Arguments]");
+// strict arguments implementation is different.
+checkClass((function() { 'use strict'; return arguments; })(), "[object Arguments]");
+checkClass(JSON, "[object JSON]");
+checkClass(JSON.prototype, "[object Undefined]");
+checkClass(Math, "[object Math]");
+checkClass(Math.prototype, "[object Undefined]");
diff --git a/nashorn/test/script/basic/getenv.js b/nashorn/test/script/basic/getenv.js
new file mode 100644
index 00000000000..598b3d30ee6
--- /dev/null
+++ b/nashorn/test/script/basic/getenv.js
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Verifies Map methods do not generate NPE
+ *
+ * @test
+ * @run
+ */
+
+print(java.lang.System.getenv().isEmpty());
diff --git a/nashorn/test/script/basic/getenv.js.EXPECTED b/nashorn/test/script/basic/getenv.js.EXPECTED
new file mode 100644
index 00000000000..c508d5366f7
--- /dev/null
+++ b/nashorn/test/script/basic/getenv.js.EXPECTED
@@ -0,0 +1 @@
+false
diff --git a/nashorn/test/script/basic/getter_callsite.js b/nashorn/test/script/basic/getter_callsite.js
new file mode 100644
index 00000000000..8a8adf7051f
--- /dev/null
+++ b/nashorn/test/script/basic/getter_callsite.js
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Check that getter property is properly invoked by a callsite
+ * 
+ * @test
+ * @run
+ */
+
+function newObj(a) {
+  return { get foo() { return a }};
+}
+
+function printFoo(obj) { 
+    print("obj.foo is " + obj.foo);
+}
+
+var obj1 = newObj(42);
+var obj2 = newObj('hello');
+
+printFoo(obj1);
+printFoo(obj2);
+
+var obj3 = Object.create(newObj('world'));
+printFoo(obj3);
+
+Object.defineProperty(Object.getPrototypeOf(obj3),
+   "foo", { get: function() { return 3.1415; } });
+
+printFoo(obj3);
diff --git a/nashorn/test/script/basic/getter_callsite.js.EXPECTED b/nashorn/test/script/basic/getter_callsite.js.EXPECTED
new file mode 100644
index 00000000000..2fabd75ca9a
--- /dev/null
+++ b/nashorn/test/script/basic/getter_callsite.js.EXPECTED
@@ -0,0 +1,4 @@
+obj.foo is 42
+obj.foo is hello
+obj.foo is world
+obj.foo is 3.1415
diff --git a/nashorn/test/script/basic/gettercalls.js b/nashorn/test/script/basic/gettercalls.js
new file mode 100644
index 00000000000..f582917244f
--- /dev/null
+++ b/nashorn/test/script/basic/gettercalls.js
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * A getter method returns function typed value. When this property is called,
+ * we should call getter every time and then call the resulting function.
+ *
+ * @test
+ * @run
+ */
+
+var count = 0;
+
+var obj = {
+  get func() {
+     print("getter for func");
+     return function() {
+        return count++;
+     }
+  }
+};
+
+for (i = 0; i < 10; i++) {
+   print(obj.func());
+}
+
+print("count = " + count);
+
diff --git a/nashorn/test/script/basic/gettercalls.js.EXPECTED b/nashorn/test/script/basic/gettercalls.js.EXPECTED
new file mode 100644
index 00000000000..cf8143e199b
--- /dev/null
+++ b/nashorn/test/script/basic/gettercalls.js.EXPECTED
@@ -0,0 +1,21 @@
+getter for func
+0
+getter for func
+1
+getter for func
+2
+getter for func
+3
+getter for func
+4
+getter for func
+5
+getter for func
+6
+getter for func
+7
+getter for func
+8
+getter for func
+9
+count = 10
diff --git a/nashorn/test/script/basic/getterfunc.js b/nashorn/test/script/basic/getterfunc.js
new file mode 100644
index 00000000000..fc55359e063
--- /dev/null
+++ b/nashorn/test/script/basic/getterfunc.js
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Test getter with function.
+ *
+ * @test
+ * @run
+ */
+
+var a = {
+ get func() {
+    var aCount = 0;
+    return function() {
+       return aCount++;
+    }
+ }
+};
+
+for (i = 0; i < 10; i++) {
+  print(a.func());
+}
+
+var b = {
+ get func() {
+    var bCount = 0;
+    return function() {
+       return this.bCount++;
+    }
+ }
+};
+
+for (i = 0; i < 10; i++) {
+  print(b.func());
+}
+
+var cCount = 0;
+
+var c = {
+ get func() {
+    return function() {
+       return cCount++;
+    }
+ }
+};
+
+for (i = 0; i < 10; i++) {
+  print(c.func());
+}
diff --git a/nashorn/test/script/basic/getterfunc.js.EXPECTED b/nashorn/test/script/basic/getterfunc.js.EXPECTED
new file mode 100644
index 00000000000..6f7769b5c62
--- /dev/null
+++ b/nashorn/test/script/basic/getterfunc.js.EXPECTED
@@ -0,0 +1,30 @@
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+NaN
+NaN
+NaN
+NaN
+NaN
+NaN
+NaN
+NaN
+NaN
+NaN
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
diff --git a/nashorn/test/script/basic/gettersetter.js b/nashorn/test/script/basic/gettersetter.js
new file mode 100644
index 00000000000..ce211a0d6fb
--- /dev/null
+++ b/nashorn/test/script/basic/gettersetter.js
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Getter/Setter test.
+ *
+ * @test
+ * @run 
+ */
+
+'use strict';
+
+var a = {
+            _x : "default",
+            get x() {
+                return this._x;
+            },
+            set x(x) {
+                this._x = x;
+            }
+        };
+        
+var b = {
+            _x : "default",
+            get x() {
+                return this._x;
+            }
+        };
+
+        
+var c = {
+            _x : "default",
+            set x(x) {
+                this._x = x;
+            }
+        };
+
+print(a._x);
+print(a.x);
+a.x = "new value";
+print(a._x);
+print(a.x);
+
+print(b._x);
+print(b.x);
+try {
+    b.x = "new value";
+} catch (e) {
+    print(e);
+}
+print(b._x);
+print(b.x);
+
+print(c._x);
+print(c.x);
+c.x = "new value";
+print(c._x);
+print(c.x);
diff --git a/nashorn/test/script/basic/gettersetter.js.EXPECTED b/nashorn/test/script/basic/gettersetter.js.EXPECTED
new file mode 100644
index 00000000000..32f6657f17a
--- /dev/null
+++ b/nashorn/test/script/basic/gettersetter.js.EXPECTED
@@ -0,0 +1,13 @@
+default
+default
+new value
+new value
+default
+default
+TypeError: Cannot set property "x" of [object Object] that has only a getter
+default
+default
+default
+undefined
+new value
+undefined
diff --git a/nashorn/test/script/basic/globalaccess.js b/nashorn/test/script/basic/globalaccess.js
new file mode 100644
index 00000000000..0ed7ae89bc6
--- /dev/null
+++ b/nashorn/test/script/basic/globalaccess.js
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * The following results in VerifyError. If foo is assigned with something
+ * other than number, it seems fine.
+ *
+ * @test
+ * @run
+ */
+
+foo = 3;
+
+func = function() {
+    this.bar = foo;
+};
+
+func();
+print(bar);
+
diff --git a/nashorn/test/script/basic/globalaccess.js.EXPECTED b/nashorn/test/script/basic/globalaccess.js.EXPECTED
new file mode 100644
index 00000000000..00750edc07d
--- /dev/null
+++ b/nashorn/test/script/basic/globalaccess.js.EXPECTED
@@ -0,0 +1 @@
+3
diff --git a/nashorn/test/script/basic/globals.js b/nashorn/test/script/basic/globals.js
new file mode 100644
index 00000000000..450cd4b2c8d
--- /dev/null
+++ b/nashorn/test/script/basic/globals.js
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Check global functions and properties.
+ *
+ * @test
+ * @run
+ */
+
+print(undefined);
+print(typeof(undefined));
+print(NaN);
+print(typeof(NaN));
+print(Infinity);
+print(typeof(Infinity));
+print(isNaN(NaN));
+print(isNaN(1.0));
+print(isNaN(0.0));
+print(isNaN(Infinity));
+print(isFinite(Math.PI));
+print(isFinite(Infinity));
+print(isFinite(NaN));
+print(parseInt("4345"));
+print(parseInt("100", 8));
+print(parseInt("ffff", 16));
+print(parseInt("0xffff"));
+print(parseInt("0xffff", 16));
+print(parseInt("0xffff", 8)); // should be NaN
+print(parseInt("")); // should be NaN
+print(parseInt("-")); // should be NaN
+print(parseInt("+")); // should be NaN
+print(parseInt("0x")); // should be NaN
+print(parseInt("0X")); // should be NaN
+print(parseInt("3.1415")); // should be "3" - ignore the not understood part
+print(parseInt("5654gjhkgjdfgk")); // should be "5654" - ignore invalid tail chars
+
+print(parseFloat("-Infinity"));
+print(parseFloat("+Infinity"));
+print(parseFloat("+3.14"));
+print(parseFloat("-3.14"));
+print(parseFloat("2.9e+8"));
+print(parseFloat("6.62E-34"));
+
+(function() {
+
+function checkProtoImmutable(obj) {
+    var attr = Object.getOwnPropertyDescriptor(this[obj], "prototype");
+    if (attr.writable) {
+        throw new Error(obj + ".prototype writable");
+    }
+    if (attr.enumerable) {
+        throw new Error(obj + ".prototype enumerable");
+    }
+    if (attr.configurable) {
+        throw new Error(obj + ".prototype configurable");
+    }
+}
+
+checkProtoImmutable("Array");
+checkProtoImmutable("Boolean");
+checkProtoImmutable("Date");
+checkProtoImmutable("Function");
+checkProtoImmutable("Number");
+checkProtoImmutable("Object");
+checkProtoImmutable("RegExp");
+checkProtoImmutable("String");
+
+})();
+
+// none of the built-in global properties are enumerable
+for (i in this) {
+    print(i);
+}
diff --git a/nashorn/test/script/basic/globals.js.EXPECTED b/nashorn/test/script/basic/globals.js.EXPECTED
new file mode 100644
index 00000000000..33ed5892630
--- /dev/null
+++ b/nashorn/test/script/basic/globals.js.EXPECTED
@@ -0,0 +1,32 @@
+undefined
+undefined
+NaN
+number
+Infinity
+number
+true
+false
+false
+false
+true
+false
+false
+4345
+64
+65535
+65535
+65535
+0
+NaN
+NaN
+NaN
+NaN
+NaN
+3
+5654
+-Infinity
+Infinity
+3.14
+-3.14
+290000000
+6.62e-34
diff --git a/nashorn/test/script/basic/globalscope.js b/nashorn/test/script/basic/globalscope.js
new file mode 100644
index 00000000000..6953ba63dce
--- /dev/null
+++ b/nashorn/test/script/basic/globalscope.js
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Global scope test.
+ *
+ * @test
+ * @run 
+ */
+
+var g = this;
+function func() {
+  var v = this;
+
+  function j() {
+    print(v === this);
+    print(g === this);
+  }
+
+  j();
+}
+
+func();
diff --git a/nashorn/test/script/basic/globalscope.js.EXPECTED b/nashorn/test/script/basic/globalscope.js.EXPECTED
new file mode 100644
index 00000000000..bb101b641b9
--- /dev/null
+++ b/nashorn/test/script/basic/globalscope.js.EXPECTED
@@ -0,0 +1,2 @@
+true
+true
diff --git a/nashorn/test/script/basic/hello.js b/nashorn/test/script/basic/hello.js
new file mode 100644
index 00000000000..7812f9eedcc
--- /dev/null
+++ b/nashorn/test/script/basic/hello.js
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Simple "hello world" test
+ *
+ * @test
+ * @run 
+ */
+
+print("hello world");
diff --git a/nashorn/test/script/basic/hello.js.EXPECTED b/nashorn/test/script/basic/hello.js.EXPECTED
new file mode 100644
index 00000000000..3b18e512dba
--- /dev/null
+++ b/nashorn/test/script/basic/hello.js.EXPECTED
@@ -0,0 +1 @@
+hello world
diff --git a/nashorn/test/script/basic/herestr_operator.js b/nashorn/test/script/basic/herestr_operator.js
new file mode 100644
index 00000000000..9290af58f62
--- /dev/null
+++ b/nashorn/test/script/basic/herestr_operator.js
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * << operator's operand can occur in new line.
+ *
+ * @test
+ * @run
+ */
+
+var
+x
+=
+100
+<<
+2
+;
+print(x);
+
diff --git a/nashorn/test/script/basic/herestr_operator.js.EXPECTED b/nashorn/test/script/basic/herestr_operator.js.EXPECTED
new file mode 100644
index 00000000000..d411bb7c1ac
--- /dev/null
+++ b/nashorn/test/script/basic/herestr_operator.js.EXPECTED
@@ -0,0 +1 @@
+400
diff --git a/nashorn/test/script/basic/illegaljavaname.js b/nashorn/test/script/basic/illegaljavaname.js
new file mode 100644
index 00000000000..f25bd0de17c
--- /dev/null
+++ b/nashorn/test/script/basic/illegaljavaname.js
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * The following used to threw ClassFormatError -- "[foo]" is used as method name
+ * for a invokedynamic instruction and so resulted in ClassFormatError.
+ *
+ * @test
+ * @run
+ */
+
+var x = {};
+x["[foo]"] = 4;
+print(x["[foo]"]);
+
+x["foo.bar"] = "hello";
+print(x["foo.bar"]);
diff --git a/nashorn/test/script/basic/illegaljavaname.js.EXPECTED b/nashorn/test/script/basic/illegaljavaname.js.EXPECTED
new file mode 100644
index 00000000000..cfb01bde93f
--- /dev/null
+++ b/nashorn/test/script/basic/illegaljavaname.js.EXPECTED
@@ -0,0 +1,2 @@
+4
+hello
diff --git a/nashorn/test/script/basic/incheck.js b/nashorn/test/script/basic/incheck.js
new file mode 100644
index 00000000000..4b3f464e30d
--- /dev/null
+++ b/nashorn/test/script/basic/incheck.js
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Check that the expression ("property" in obj) works for own property as 
+ * well as properties 'inherited' from proto chain.
+ * 
+ * @test
+ * @run
+ */
+
+function MyCons() {
+    this.foo = "hello";
+}
+
+MyCons.prototype.func = function() { print("func " + this); }
+MyCons.prototype.num = 1729;
+
+var myObj = new MyCons();
+print("foo? " + ("foo" in myObj));
+print("func? " + ("func" in myObj));
+print("num? " + ("num" in myObj));
+// From Object.prototype
+print("toString?" + ("toString" in myObj));
+
+MyCons.prototype.sun = "a star";
+MyCons.prototype.earth = "a planet";
+
+print("foo? " + ("foo" in myObj));
+print("func? " + ("func" in myObj));
+print("num? " + ("num" in myObj));
+print("sun? " + ("sun" in myObj));
+print("earth? " + ("earth" in myObj));
+print("toString? " + ("toString" in myObj));
diff --git a/nashorn/test/script/basic/incheck.js.EXPECTED b/nashorn/test/script/basic/incheck.js.EXPECTED
new file mode 100644
index 00000000000..479d64782af
--- /dev/null
+++ b/nashorn/test/script/basic/incheck.js.EXPECTED
@@ -0,0 +1,10 @@
+foo? true
+func? true
+num? true
+toString?true
+foo? true
+func? true
+num? true
+sun? true
+earth? true
+toString? true
diff --git a/nashorn/test/script/basic/indexedcall.js b/nashorn/test/script/basic/indexedcall.js
new file mode 100644
index 00000000000..759ea93a8da
--- /dev/null
+++ b/nashorn/test/script/basic/indexedcall.js
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Convert func["name"]() to func.name() test
+ *
+ * @test
+ * @run
+ */
+
+function func() {
+    print("func");
+}
+
+this["func"]();
diff --git a/nashorn/test/script/basic/indexedcall.js.EXPECTED b/nashorn/test/script/basic/indexedcall.js.EXPECTED
new file mode 100644
index 00000000000..415b9ac63db
--- /dev/null
+++ b/nashorn/test/script/basic/indexedcall.js.EXPECTED
@@ -0,0 +1 @@
+func
diff --git a/nashorn/test/script/basic/info.js b/nashorn/test/script/basic/info.js
new file mode 100644
index 00000000000..7dd15f9cd12
--- /dev/null
+++ b/nashorn/test/script/basic/info.js
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Tests INFO access
+ *
+ * @test
+ * @run
+ */
+
+print(java.util.logging.Level.INFO);
+
diff --git a/nashorn/test/script/basic/info.js.EXPECTED b/nashorn/test/script/basic/info.js.EXPECTED
new file mode 100644
index 00000000000..4924e237075
--- /dev/null
+++ b/nashorn/test/script/basic/info.js.EXPECTED
@@ -0,0 +1 @@
+INFO
diff --git a/nashorn/test/script/basic/inherited_nonwritable.js b/nashorn/test/script/basic/inherited_nonwritable.js
new file mode 100644
index 00000000000..05eaedca0d5
--- /dev/null
+++ b/nashorn/test/script/basic/inherited_nonwritable.js
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Inherited non-writable properties can not be overridden.
+ *
+ * @test
+ * @run
+ */
+
+var p = {};
+Object.defineProperty(p, "foo", { writable: false, value: 12 });
+
+var o = Object.create(p);
+o.foo = 44;
+if (o.foo !== 12) {
+    fail("o.foo can be overridden");
+}
+
+
diff --git a/nashorn/test/script/basic/instanceof.js b/nashorn/test/script/basic/instanceof.js
new file mode 100644
index 00000000000..cda92263ef9
--- /dev/null
+++ b/nashorn/test/script/basic/instanceof.js
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Verify instanceof operator.
+ *
+ * @test
+ * @run
+ */
+
+var b = new Boolean(true);
+var s = new String("hello");
+var r = /java/;
+
+function MyConstructor(fooval) {
+   this.foo = fooval;
+}
+
+var c = new MyConstructor("world");
+
+print(b instanceof Boolean);
+print(b instanceof String);
+print(b instanceof RegExp);
+print(b instanceof MyConstructor);
+print("------");
+
+print(s instanceof Boolean);
+print(s instanceof String);
+print(s instanceof RegExp);
+print(s instanceof MyConstructor);
+print("------");
+
+print(r instanceof Boolean);
+print(r instanceof String);
+print(r instanceof RegExp);
+print(r instanceof MyConstructor);
+print("------");
+
+print(c instanceof Boolean);
+print(c instanceof String);
+print(c instanceof RegExp);
+print(c instanceof MyConstructor);
+print("------");
+
+var b = new Boolean(true);
+print(b instanceof Boolean);
diff --git a/nashorn/test/script/basic/instanceof.js.EXPECTED b/nashorn/test/script/basic/instanceof.js.EXPECTED
new file mode 100644
index 00000000000..753657888d9
--- /dev/null
+++ b/nashorn/test/script/basic/instanceof.js.EXPECTED
@@ -0,0 +1,21 @@
+true
+false
+false
+false
+------
+false
+true
+false
+false
+------
+false
+false
+true
+false
+------
+false
+false
+false
+true
+------
+true
diff --git a/nashorn/test/script/basic/instanceof2.js b/nashorn/test/script/basic/instanceof2.js
new file mode 100644
index 00000000000..fc2ff57bc7c
--- /dev/null
+++ b/nashorn/test/script/basic/instanceof2.js
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Instanceof test.
+ *
+ * @test
+ * @run 
+ */
+
+var x = { a: 1, b: "string", c: [1, 2, 3], d: function() {} };
+
+var MyObject = function() {
+    this.a = 10;
+}
+
+var y = new MyObject();
+
+print(x instanceof Object);
+print(x.a instanceof Object);
+print(x.b instanceof Object);
+print(x.c instanceof Object);
+print(x.c instanceof Array);
+print(x.d instanceof Object);
+print(x.d instanceof Function);
+print(y instanceof Object);
+
+
diff --git a/nashorn/test/script/basic/instanceof2.js.EXPECTED b/nashorn/test/script/basic/instanceof2.js.EXPECTED
new file mode 100644
index 00000000000..8aba8cb05e4
--- /dev/null
+++ b/nashorn/test/script/basic/instanceof2.js.EXPECTED
@@ -0,0 +1,8 @@
+true
+false
+false
+true
+true
+true
+true
+true
diff --git a/nashorn/test/script/basic/interfaces.js b/nashorn/test/script/basic/interfaces.js
new file mode 100644
index 00000000000..629dfcd271f
--- /dev/null
+++ b/nashorn/test/script/basic/interfaces.js
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Implement Java interface using script functions.
+ *
+ * @test
+ * @run
+ */
+
+// implement java.lang.Runnable interface 
+var runnable = new java.lang.Runnable({
+    run: function() {
+        print("Inside run function");
+    }
+});
+
+// now call 'run' method on interface
+runnable.run();
+
+// The following sytax sugar is also fine..
+
+var callable = new java.util.concurrent.Callable() {
+   call: function() {
+       print("This is Callable.call");
+       return "called";
+   }
+};
+
+print(callable.call());
diff --git a/nashorn/test/script/basic/interfaces.js.EXPECTED b/nashorn/test/script/basic/interfaces.js.EXPECTED
new file mode 100644
index 00000000000..f9169547103
--- /dev/null
+++ b/nashorn/test/script/basic/interfaces.js.EXPECTED
@@ -0,0 +1,3 @@
+Inside run function
+This is Callable.call
+called
diff --git a/nashorn/test/script/basic/iterator.js b/nashorn/test/script/basic/iterator.js
new file mode 100644
index 00000000000..c5d9fbd92ae
--- /dev/null
+++ b/nashorn/test/script/basic/iterator.js
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Verify that basic for..in works for objects, arrays.
+ * 
+ * @test
+ * @run
+ */
+
+var obj = { foo: 33, bar: "hello" };
+
+for (i in obj) {
+    print(i);
+    print(obj[i]);
+}
+
+var arr = [4, 55, 66, 2];
+for (i in arr) {
+    print(i);
+    print(arr[i]);
+}
diff --git a/nashorn/test/script/basic/iterator.js.EXPECTED b/nashorn/test/script/basic/iterator.js.EXPECTED
new file mode 100644
index 00000000000..ca21e8c6a09
--- /dev/null
+++ b/nashorn/test/script/basic/iterator.js.EXPECTED
@@ -0,0 +1,12 @@
+foo
+33
+bar
+hello
+0
+4
+1
+55
+2
+66
+3
+2
diff --git a/nashorn/test/script/basic/java.js b/nashorn/test/script/basic/java.js
new file mode 100644
index 00000000000..5920b244101
--- /dev/null
+++ b/nashorn/test/script/basic/java.js
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Java object test
+ *
+ * @test
+ * @run
+ */
+
+print(Packages);
+print(Packages.java);
+print(java);
+print(java.lang);
+print(java.lang.String);
+var System = java.lang.System;
+print(System);
+print(123);
+print(java.lang.String.format("%4d %4d", 12, 1));
+var StringBuffer = java.lang.StringBuffer;
+print(StringBuffer);
+var stringBuffer = new StringBuffer();
+stringBuffer.append("abc");
+stringBuffer.append("def");
+print(stringBuffer.toString());
+print(java.lang.Double.toString(3.14));
+print(java.lang.Float.toString(23428.34));
diff --git a/nashorn/test/script/basic/java.js.EXPECTED b/nashorn/test/script/basic/java.js.EXPECTED
new file mode 100644
index 00000000000..507d1da6fec
--- /dev/null
+++ b/nashorn/test/script/basic/java.js.EXPECTED
@@ -0,0 +1,12 @@
+[JavaPackage ]
+[JavaPackage java]
+[JavaPackage java]
+[JavaPackage java.lang]
+[JavaClass java.lang.String]
+[JavaClass java.lang.System]
+123
+  12    1
+[JavaClass java.lang.StringBuffer]
+abcdef
+3.14
+23428.34
diff --git a/nashorn/test/script/basic/javaarray.js b/nashorn/test/script/basic/javaarray.js
new file mode 100644
index 00000000000..837323b9b1e
--- /dev/null
+++ b/nashorn/test/script/basic/javaarray.js
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * Basic check for Java array element access and array element set.
+ *
+ * @test
+ * @run
+ */
+
+(function() {
+    var nargs = arguments.length;
+    var args = java.lang.reflect.Array.newInstance(java.lang.Object.class, nargs);
+    print(args.length);
+    for (var i = 0; i < nargs; i++) {
+        var arg = arguments[i];
+        args[i] = arg;
+        print(i + ' ' + arg + '/' + args[i]);
+    }
+})(13, 3.14, 'foo');
+
+var z; // undefined
+
+var intArray = java.lang.reflect.Array.newInstance(java.lang.Integer.TYPE, 1);
+intArray[0] = 10;
+print(intArray[0]);
+print(intArray.length);
+intArray[0] = z;
+print(intArray[0]);
+intArray[0] = 10.1;
+print(intArray[0]);
+
+var boolArray = java.lang.reflect.Array.newInstance(java.lang.Boolean.TYPE, 2);
+boolArray[0] = true;
+print(boolArray[0]);
+print(boolArray[1]);
+print(boolArray.length);
+
+var charArray = java.lang.reflect.Array.newInstance(java.lang.Character.TYPE, 1);
+charArray[0] = 'j';
+print(charArray[0]);
+print(charArray.length);
+
+
+var doubleArray = java.lang.reflect.Array.newInstance(java.lang.Double.TYPE, 1)
+doubleArray[0]=z
+print(doubleArray[0])
+doubleArray[0]=1
+print(doubleArray[0])
+doubleArray[0]=1.1
+print(doubleArray[0])
diff --git a/nashorn/test/script/basic/javaarray.js.EXPECTED b/nashorn/test/script/basic/javaarray.js.EXPECTED
new file mode 100644
index 00000000000..b483acc5ba8
--- /dev/null
+++ b/nashorn/test/script/basic/javaarray.js.EXPECTED
@@ -0,0 +1,16 @@
+3
+0 13/13
+1 3.14/3.14
+2 foo/foo
+10
+1
+0
+10
+true
+false
+2
+j
+1
+NaN
+1
+1.1
\ No newline at end of file
diff --git a/nashorn/test/script/basic/javaarrayconversion.js b/nashorn/test/script/basic/javaarrayconversion.js
new file mode 100644
index 00000000000..3da745bf402
--- /dev/null
+++ b/nashorn/test/script/basic/javaarrayconversion.js
@@ -0,0 +1,221 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Tests for conversion of JavaScript arrays to Java arrays and the other
+ * way round. Also generally useful as a JavaScript-to-Java type conversion 
+ * test.
+ *
+ * @test
+ * @run
+ */
+
+var x; // used for undefined
+var testCount = 0;
+
+function testF(inputValue, type, testFn) {
+  var x = Java.toJavaArray([inputValue], type)[0];
+  if(!testFn(x)) {
+    throw ("unexpected value: " + x)
+  }
+  ++testCount;
+}
+
+function test(inputValue, type, expectedValue) {
+  testF(inputValue, type, function(x) { return x === expectedValue })
+}
+
+function testNaN(inputValue, type) {
+  testF(inputValue, type, isNaN)
+}
+
+// Those labeled "Correct?" are not clearly correct conversions. Those 
+// labeled "TypeError maybe?" could actually throw a TypeError, or only 
+// throw a TypeError when in strict mode. 
+// The case of ("false", "boolean") => true is particularly amusing.
+
+test(x, "int", 0) // Correct? TypeError maybe?
+test(null, "int", 0) // Correct? TypeError maybe?
+test(1234, "int", 1234)
+test("1234", "int", 1234)
+test("1234.49", "int", 1234)
+test("1234.51", "int", 1234) // truncates, not rounds
+test(true, "int", 1)
+test(false, "int", 0)
+test("foo", "int", 0) // Correct? TypeError maybe?
+
+test(x, "boolean", false) // Correct? TypeError maybe?
+test(null, "boolean", false) // Correct? TypeError maybe?
+test(0, "boolean", false)
+test(1234, "boolean", true)
+test("foo", "boolean", true)
+test("", "boolean", false)
+test("false", "boolean", true) // Correct? false maybe?
+
+test(x, "java.lang.String", "undefined") // Correct? TypeError maybe?
+test(null, "java.lang.String", null)
+test(1234, "java.lang.String", "1234")
+test(1234.5, "java.lang.String", "1234.5")
+test(true, "java.lang.String", "true")
+test(false, "java.lang.String", "false")
+
+test(x, "java.lang.Integer", null) // Correct? TypeError maybe?
+test(null, "java.lang.Integer", null)
+test(1234, "java.lang.Integer", 1234)
+test("1234", "java.lang.Integer", 1234)
+test("1234.49", "java.lang.Integer", 1234)
+test("1234.51", "java.lang.Integer", 1234) // truncates, not rounds
+test(true, "java.lang.Integer", 1)
+test(false, "java.lang.Integer", 0)
+test("foo", "java.lang.Integer", 0) // Correct? TypeError maybe?
+
+test(x, "java.lang.Boolean", null) // Correct? TypeError maybe?
+test(null, "java.lang.Boolean", null)
+test(0, "java.lang.Boolean", false)
+test(1234, "java.lang.Boolean", true)
+test("foo", "java.lang.Boolean", true)
+test("", "java.lang.Boolean", false)
+test("false", "java.lang.Boolean", true) // Correct? false maybe?
+
+testNaN(x, "double")
+test(null, "double", 0)
+test(1234, "double", 1234)
+test("1234", "double", 1234)
+test("1234.5", "double", 1234.5)
+test(true, "double", 1)
+test(false, "double", 0)
+testNaN("foo", "double")
+
+testNaN(x, "java.lang.Double")
+test(null, "java.lang.Double", null)
+test(1234, "java.lang.Double", 1234)
+test("1234", "java.lang.Double", 1234)
+test("1234.5", "java.lang.Double", 1234.5)
+test(true, "java.lang.Double", 1)
+test(false, "java.lang.Double", 0)
+testNaN("foo", "java.lang.Double")
+
+test({ valueOf: function() { return 42; } }, "int", 42)
+test({ valueOf: function() { return "42"; } }, "int", 42)
+// If there's no valueOf, toString is used
+test({ toString: function() { return "42"; } }, "int", 42)
+// For numbers, valueOf takes precedence over toString
+test({ valueOf: function() { return "42"; },  toString: function() { return "43"; } }, "int", 42)
+
+test({ toString: function() { return "foo"; } }, "java.lang.String", "foo")
+// Yep, even if we have valueOf, toString from prototype takes precedence
+test({ valueOf: function() { return 42; } }, "java.lang.String", "[object Object]")
+// Converting to string, toString takes precedence over valueOf
+test({ valueOf: function() { return "42"; },  toString: function() { return "43"; } }, "java.lang.String", "43")
+
+function assertCantConvert(sourceType, targetType) {
+  try {
+    Java.toJavaArray([new Java.type(sourceType)()], targetType)
+    throw "no TypeError encountered"
+  } catch(e) {
+      if(!(e instanceof TypeError)) {
+        throw e;
+      }
+      ++testCount;
+  }
+}
+
+// Arbitrary POJOs can't be converted to Java values
+assertCantConvert("java.util.BitSet", "int")
+assertCantConvert("java.util.BitSet", "double")
+assertCantConvert("java.util.BitSet", "long")
+assertCantConvert("java.util.BitSet", "boolean")
+assertCantConvert("java.util.BitSet", "java.lang.String")
+assertCantConvert("java.util.BitSet", "java.lang.Double")
+assertCantConvert("java.util.BitSet", "java.lang.Long")
+
+/***************************************************************************
+ * Now testing the other way round - Java arrays & collections to JavaScript
+ **************************************************************************/
+
+function assert(x) {
+  if(!x) {
+    throw "Assertion failed"
+  }
+  ++testCount;
+}
+
+var intArray = new (Java.type("int[]"))(3)
+intArray[0] = 1234;
+intArray[1] = 42;
+intArray[2] = 5;
+var jsIntArray = Java.toJavaScriptArray(intArray)
+assert(jsIntArray instanceof Array);
+assert(jsIntArray[0] === 1234);
+assert(jsIntArray[1] === 42);
+assert(jsIntArray[2] === 5);
+
+// The arrays are copies, they don't reflect each other
+intArray[2] = 6;
+assert(jsIntArray[2] === 5);
+jsIntArray[2] = 7;
+assert(intArray[2] === 6);
+
+var byteArray = new (Java.type("byte[]"))(2)
+byteArray[0] = -128;
+byteArray[1] = 127;
+var jsByteArray = Java.toJavaScriptArray(byteArray)
+assert(jsByteArray instanceof Array);
+assert(jsByteArray[0] === -128);
+assert(jsByteArray[1] === 127);
+
+var shortArray = new (Java.type("short[]"))(2)
+shortArray[0] = -32768;
+shortArray[1] = 32767;
+var jsShortArray = Java.toJavaScriptArray(shortArray)
+assert(jsShortArray instanceof Array);
+assert(jsShortArray[0] === -32768);
+assert(jsShortArray[1] === 32767);
+
+var floatArray = new (Java.type("float[]"))(2)
+floatArray[0] = java.lang.Float.MIN_VALUE;
+floatArray[1] = java.lang.Float.MAX_VALUE;
+var jsFloatArray = Java.toJavaScriptArray(floatArray)
+assert(jsFloatArray instanceof Array);
+assert(jsFloatArray[0] == java.lang.Float.MIN_VALUE);
+assert(jsFloatArray[1] == java.lang.Float.MAX_VALUE);
+
+var charArray = new (Java.type("char[]"))(3)
+charArray[0] = "a";
+charArray[1] = "b";
+charArray[2] = "1";
+var jsCharArray = Java.toJavaScriptArray(charArray)
+assert(jsCharArray instanceof Array);
+assert(jsCharArray[0] === 97);
+assert(jsCharArray[1] === 98);
+assert(jsCharArray[2] === 49);
+
+var booleanArray = new (Java.type("boolean[]"))(2)
+booleanArray[0] = true;
+booleanArray[1] = false;
+var jsBooleanArray = Java.toJavaScriptArray(booleanArray)
+assert(jsBooleanArray instanceof Array);
+assert(jsBooleanArray[0] === true);
+assert(jsBooleanArray[1] === false);
+
+print(testCount + " tests completed ok")
diff --git a/nashorn/test/script/basic/javaarrayconversion.js.EXPECTED b/nashorn/test/script/basic/javaarrayconversion.js.EXPECTED
new file mode 100644
index 00000000000..341bd11fa2a
--- /dev/null
+++ b/nashorn/test/script/basic/javaarrayconversion.js.EXPECTED
@@ -0,0 +1 @@
+90 tests completed ok
diff --git a/nashorn/test/script/basic/javaexceptions.js b/nashorn/test/script/basic/javaexceptions.js
new file mode 100644
index 00000000000..548e5dba541
--- /dev/null
+++ b/nashorn/test/script/basic/javaexceptions.js
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Basic checks for throwing and catching java exceptions from script.
+ * 
+ * @test
+ * @run
+ */
+
+try {
+    new java.io.FileInputStream("non_existent_file");
+} catch (e) {
+    print(e instanceof java.io.FileNotFoundException);
+}
+
+try {
+    new java.net.URL("invalid_url");
+} catch (e) {
+    print(e instanceof java.net.MalformedURLException);
+    print(e);
+}
+
+try {
+    var obj = new java.lang.Object();
+    obj.wait();
+} catch (e) {
+    print(e instanceof java.lang.IllegalMonitorStateException);
+    print(e);
+}
+
+// directly throw a Java exception
+try {
+    throw new java.io.IOException("I/O failed");
+} catch (e) {
+    print(e instanceof java.io.IOException);
+    print(e);
+}
diff --git a/nashorn/test/script/basic/javaexceptions.js.EXPECTED b/nashorn/test/script/basic/javaexceptions.js.EXPECTED
new file mode 100644
index 00000000000..2494cdb64b9
--- /dev/null
+++ b/nashorn/test/script/basic/javaexceptions.js.EXPECTED
@@ -0,0 +1,7 @@
+true
+true
+java.net.MalformedURLException: no protocol: invalid_url
+true
+java.lang.IllegalMonitorStateException
+true
+java.io.IOException: I/O failed
diff --git a/nashorn/test/script/basic/javaimporter.js b/nashorn/test/script/basic/javaimporter.js
new file mode 100644
index 00000000000..822c041831e
--- /dev/null
+++ b/nashorn/test/script/basic/javaimporter.js
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Basic checks for "JavaImporter" constructor.
+ *
+ * @test
+ * @run
+ */
+
+var imports = new JavaImporter(java.util);
+var map;
+
+with(imports) {
+    map = new HashMap();
+    map.put("js", "javascript");
+    map.put("java", "java");
+    map.put("cpp", "c++");
+}
+
+print("js=" + map.get("js"));
+print("java=" + map.get("java"));
+print("cpp=" + map.get("cpp"));
+
+var imports2 = new JavaImporter(java.io, java.util); 
+with (imports2) {
+   print(File);
+}
diff --git a/nashorn/test/script/basic/javaimporter.js.EXPECTED b/nashorn/test/script/basic/javaimporter.js.EXPECTED
new file mode 100644
index 00000000000..a38a11a684e
--- /dev/null
+++ b/nashorn/test/script/basic/javaimporter.js.EXPECTED
@@ -0,0 +1,4 @@
+js=javascript
+java=java
+cpp=c++
+[JavaClass java.io.File]
diff --git a/nashorn/test/script/basic/javainnerclasses.js b/nashorn/test/script/basic/javainnerclasses.js
new file mode 100644
index 00000000000..e0429ad54ca
--- /dev/null
+++ b/nashorn/test/script/basic/javainnerclasses.js
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Java inner classes access
+ *
+ * @test
+ * @run
+ */
+ 
+// Do it with Java.type()
+var outer = new (Java.type("jdk.nashorn.internal.test.models.OuterClass"))("apple")
+print(outer)
+var innerStatic = new (Java.type("jdk.nashorn.internal.test.models.OuterClass$InnerStaticClass"))("orange")
+print(innerStatic)
+var innerNonStatic = new (Java.type("jdk.nashorn.internal.test.models.OuterClass$InnerNonStaticClass"))(outer, "pear")
+print(innerNonStatic)
+
+// Now do it with Packages and explicit $ names
+var outer = new Packages.jdk.nashorn.internal.test.models.OuterClass("red")
+print(outer)
+var innerStatic = new Packages.jdk.nashorn.internal.test.models.OuterClass$InnerStaticClass("green")
+print(innerStatic)
+var innerNonStatic = new Packages.jdk.nashorn.internal.test.models.OuterClass$InnerNonStaticClass(outer, "blue")
+print(innerNonStatic)
+
+// Now do it with Packages and nested properties
+var outer = new Packages.jdk.nashorn.internal.test.models.OuterClass("sweet")
+print(outer)
+var innerStatic = new Packages.jdk.nashorn.internal.test.models.OuterClass.InnerStaticClass("sour")
+print(innerStatic)
+var innerNonStatic = new Packages.jdk.nashorn.internal.test.models.OuterClass.InnerNonStaticClass(outer, "bitter")
+print(innerNonStatic)
diff --git a/nashorn/test/script/basic/javainnerclasses.js.EXPECTED b/nashorn/test/script/basic/javainnerclasses.js.EXPECTED
new file mode 100644
index 00000000000..491975df61c
--- /dev/null
+++ b/nashorn/test/script/basic/javainnerclasses.js.EXPECTED
@@ -0,0 +1,9 @@
+OuterClass[value=apple]
+InnerStaticClass[value=orange]
+InnerNonStaticClass[value=pear, outer=OuterClass[value=apple]]
+OuterClass[value=red]
+InnerStaticClass[value=green]
+InnerNonStaticClass[value=blue, outer=OuterClass[value=red]]
+OuterClass[value=sweet]
+InnerStaticClass[value=sour]
+InnerNonStaticClass[value=bitter, outer=OuterClass[value=sweet]]
diff --git a/nashorn/test/script/basic/javasigcall.js b/nashorn/test/script/basic/javasigcall.js
new file mode 100644
index 00000000000..c8b92b52eb2
--- /dev/null
+++ b/nashorn/test/script/basic/javasigcall.js
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Exact java method call - user specifies full method signature.
+ *
+ * @test
+ * @run
+ */
+
+var map = new java.util.HashMap();
+
+map["put(java.lang.Object,java.lang.Object)"]("py", "python");
+map["put(java.lang.Object,java.lang.Object)"]("js", "javascript");
+
+// call without signature
+map["put"]("pl", "perl");
+print("py=" + map.get("py"));
+print("js=" + map.get("js"));
+print("pl=" + map.get("pl"));
+
+map["clear()"]();
+print(map);
+
+print(java.lang.Integer["valueOf(java.lang.String,int)"]("FF", 16));
+
diff --git a/nashorn/test/script/basic/javasigcall.js.EXPECTED b/nashorn/test/script/basic/javasigcall.js.EXPECTED
new file mode 100644
index 00000000000..c58e18d563f
--- /dev/null
+++ b/nashorn/test/script/basic/javasigcall.js.EXPECTED
@@ -0,0 +1,5 @@
+py=python
+js=javascript
+pl=perl
+{}
+255
diff --git a/nashorn/test/script/basic/jquery.js b/nashorn/test/script/basic/jquery.js
new file mode 100644
index 00000000000..1bc23bcc4d7
--- /dev/null
+++ b/nashorn/test/script/basic/jquery.js
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * jquery : parse and generate jQuery code / minimum version
+ *
+ * @test
+ * @runif external.jquery
+ */
+
+var urls = [
+	    'http://code.jquery.com/jquery-1.7.2.min.js',
+	    'http://code.jquery.com/jquery-1.7.2.js'
+	    ];
+	    
+function test_jquery(url) {
+    
+    //bug one repro - this should compile
+    function a() {
+	var c;
+	if (func1(zz) || (c = func2(zz)) ) {
+	    if (c) {
+	    } 
+	} 
+	return target;
+    }
+    
+    //bug two repro - this should compile
+    function b() {
+	return ((v ? i : "") + "str");
+    }
+    
+    function checkWindow(e) {
+	if (e instanceof ReferenceError && e.toString().indexOf('window') != -1) {
+	    return;
+	}
+	throw e;
+    }
+    
+    var name;
+    
+    try {    
+	try {
+	    var split = url.split('/');
+	    name = split[split.length - 1];
+	    var path  = __DIR__ + "../external/jquery/" + name;
+	    try {
+		load(path);
+	    } catch (e) {
+		checkWindow(e);
+	    }
+	} catch (e) {
+	    // try to load it from the internet, if we for some licensing reason
+	    // aren't allowed to ship third party code under MIT license
+	    try {
+		load(url);
+	    } catch (e) {
+		checkWindow(e);
+	    }
+	}
+    } catch (e) {
+	print("Unexpected exception " + e);
+    }
+    
+    print("done " + name);
+}
+
+
+
+for each (url in urls) {
+    test_jquery(url);
+}
+
diff --git a/nashorn/test/script/basic/jquery.js.EXPECTED b/nashorn/test/script/basic/jquery.js.EXPECTED
new file mode 100644
index 00000000000..0df6ebf3d8a
--- /dev/null
+++ b/nashorn/test/script/basic/jquery.js.EXPECTED
@@ -0,0 +1,2 @@
+done jquery-1.7.2.min.js
+done jquery-1.7.2.js
diff --git a/nashorn/test/script/basic/jsadapter.js b/nashorn/test/script/basic/jsadapter.js
new file mode 100644
index 00000000000..4fce40b4563
--- /dev/null
+++ b/nashorn/test/script/basic/jsadapter.js
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Verify that JSAdapter works as expected.
+ *
+ * @test
+ * @run
+ */
+
+var obj = new JSAdapter() {
+    __get__: function(name) {
+        print("getter called for '" + name + "'"); return name;
+    },
+
+    __put__: function(name, value) {
+        print("setter called for '" + name + "' with " + value);
+    },
+
+    __call__: function(name, arg1, arg2) {
+        print("method '" + name + "' called with " + arg1 + ", " + arg2);
+    },
+
+    __new__: function(arg1, arg2) {
+        print("new with " + arg1 + ", " + arg2);
+    },
+
+    __getIds__: function() {
+        print("__getIds__ called");
+        return [ "foo", "bar" ];
+    },
+
+    __getValues__: function() {
+        print("__getValues__ called");
+        return [ "fooval", "barval" ];
+    },
+
+    __has__: function(name) {
+        print("__has__ called with '" + name + "'");
+        return name == "js";
+    },
+
+    __delete__: function(name) {
+        print("__delete__ called with '" + name + "'");
+        return true;
+    }
+};
+
+// calls __get__
+print(obj.foo);
+
+// calls __put__
+obj.foo = 33;
+
+// calls __call__
+obj.func("hello", "world");
+
+// calls __new__
+new obj("hey!", "it works!");
+
+for (i in obj) {
+    print(i);
+}
+
+for each (i in obj) {
+    print(i);
+}
+
+var x = "foo" in obj;
+print(x);
+
+var y = "js" in obj;
+print(y);
+
+print(delete obj.prop);
+
+print(obj["js"]);
+obj["js"] = "javascript";
+print(obj["javascript"]);
diff --git a/nashorn/test/script/basic/jsadapter.js.EXPECTED b/nashorn/test/script/basic/jsadapter.js.EXPECTED
new file mode 100644
index 00000000000..a8cdd330133
--- /dev/null
+++ b/nashorn/test/script/basic/jsadapter.js.EXPECTED
@@ -0,0 +1,22 @@
+getter called for 'foo'
+foo
+setter called for 'foo' with 33
+method 'func' called with hello, world
+new with hey!, it works!
+__getIds__ called
+foo
+bar
+__getValues__ called
+fooval
+barval
+__has__ called with 'foo'
+false
+__has__ called with 'js'
+true
+__delete__ called with 'prop'
+true
+getter called for 'js'
+js
+setter called for 'js' with javascript
+getter called for 'javascript'
+javascript
diff --git a/nashorn/test/script/basic/jsadapterlink.js b/nashorn/test/script/basic/jsadapterlink.js
new file mode 100644
index 00000000000..d936d1fe615
--- /dev/null
+++ b/nashorn/test/script/basic/jsadapterlink.js
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * Test that JSAdapter linking works as expected under receiver and/or
+ * adaptee change.
+ *
+ * @test
+ * @run
+ */
+
+var js1 = new JSAdapter() {
+    __get__: function(name) {
+        return "js1->" + name;
+    }
+};
+
+var js2 = new JSAdapter() {
+    __get__: function(name) {
+        return "js2->" + name;
+    }
+};
+
+var js3 = new JSAdapter() {
+    __get__: function(name) {
+        return "js3->" + name;
+    }
+};
+
+var handler = {
+    __get__: function(name) {
+        return "handler->" + name;
+    }
+};
+
+var js4 = new JSAdapter(handler);
+
+var arr = [ js1, js2, js3, js4, js1, js2, js3, js4 ];
+for (i in arr) {
+    if (i == 7) {
+        handler.__get__ = function(name) {
+            return "all-new-handler->" + name;
+        }
+    }
+    print(arr[i].foo);
+}
+
diff --git a/nashorn/test/script/basic/jsadapterlink.js.EXPECTED b/nashorn/test/script/basic/jsadapterlink.js.EXPECTED
new file mode 100644
index 00000000000..daa16f03c25
--- /dev/null
+++ b/nashorn/test/script/basic/jsadapterlink.js.EXPECTED
@@ -0,0 +1,8 @@
+js1->foo
+js2->foo
+js3->foo
+handler->foo
+js1->foo
+js2->foo
+js3->foo
+all-new-handler->foo
diff --git a/nashorn/test/script/basic/json.js b/nashorn/test/script/basic/json.js
new file mode 100644
index 00000000000..6b6ed95d0fc
--- /dev/null
+++ b/nashorn/test/script/basic/json.js
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Verify basic JSON parsing using JSON.parse method.
+ *
+ * @test
+ * @run
+ */
+
+var obj = JSON.parse('{ "foo" : 44, "bar": "hello",  "arr": [42, 56, 78], "address" : { "city" : "chennai", "country": "India" } }');
+print(obj.foo);
+print(obj.bar);
+print(obj.arr.length);
+for (i in obj.arr) {
+   print(obj.arr[i]);
+}
+print(obj.address.city);
+print(obj.address.country);
+
+function reviver(name, value) {
+   if (name == "") return value;
+   print(name + " = " + value);
+   return value;
+}
+
+var obj2 = JSON.parse('{ "foo" : 44, "bar" : "hello" }', reviver);
+print(obj2.foo);
+print(obj2.bar);
+
+print(JSON.stringify(obj));
+print(JSON.stringify(obj2));
+
+try { 
+    JSON.parse('{ "foo" /*comment */ : 44, "bar" : "hello" }', reviver);
+    print("Fail!");
+} catch (e) {
+    if (!(e instanceof SyntaxError)) {
+	print("Comments are illegal in JSON. Should throw SyntaxError, not " + e);
+    }
+}
+print("Success!");
diff --git a/nashorn/test/script/basic/json.js.EXPECTED b/nashorn/test/script/basic/json.js.EXPECTED
new file mode 100644
index 00000000000..88b2a8e967f
--- /dev/null
+++ b/nashorn/test/script/basic/json.js.EXPECTED
@@ -0,0 +1,15 @@
+44
+hello
+3
+42
+56
+78
+chennai
+India
+foo = 44
+bar = hello
+44
+hello
+{"foo":44,"bar":"hello","arr":[42,56,78],"address":{"city":"chennai","country":"India"}}
+{"foo":44,"bar":"hello"}
+Success!
diff --git a/nashorn/test/script/basic/list.js b/nashorn/test/script/basic/list.js
new file mode 100644
index 00000000000..1dd5748f550
--- /dev/null
+++ b/nashorn/test/script/basic/list.js
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Tests for java.util.List behavior in Nashorn
+ *
+ * @test
+ * @run
+ */
+var l = new java.util.ArrayList();
+print("l.class.name=" + l.class.name) // Has "class" property like any POJO
+
+l.add("foo")
+l.add("bar")
+
+print("l.length=" + l.length) // doesn't work, returns undefined
+print("l.size()=" + l.size()) // this will work
+
+print("l[0]=" + l[0])
+print("l[1]=" + l[1])
+
+print("--for each begin--")
+for each (i in l) {
+  print(i)
+}
+print("--for each end--")
+
+l[1] = "a"
+print("l[0]=" + l[0])
+print("l[1]=" + l[1])
+
+print("l[0.9]=" + l[0.9]) // non-integer indices don't round up
+print("l['blah']=" + l['blah']) // non-number indices don't retrieve anything...
+var size_name = "size"
+print("l[size_name]()=" + l[size_name]()) // ... but existing methods can be accessed with []
+
+expectException(2) // Java lists don't auto-expand to accommodate new indices
+expectException(java.lang.Double.POSITIVE_INFINITY) // Dynalink will throw IOOBE
+expectException(java.lang.Double.NEGATIVE_INFINITY) // Dynalink will throw IOOBE
+
+function expectException(index) {
+    try {
+        l[index] = "x"
+        print("Not caught out-of-bounds assignment for " + index)
+    }  catch(e) {
+        print(e)
+    }
+}
diff --git a/nashorn/test/script/basic/list.js.EXPECTED b/nashorn/test/script/basic/list.js.EXPECTED
new file mode 100644
index 00000000000..18feade2b4e
--- /dev/null
+++ b/nashorn/test/script/basic/list.js.EXPECTED
@@ -0,0 +1,17 @@
+l.class.name=java.util.ArrayList
+l.length=undefined
+l.size()=2
+l[0]=foo
+l[1]=bar
+--for each begin--
+foo
+bar
+--for each end--
+l[0]=foo
+l[1]=a
+l[0.9]=null
+l['blah']=null
+l[size_name]()=2
+java.lang.IndexOutOfBoundsException: Index: 2, Size: 2
+java.lang.IndexOutOfBoundsException: Index: Infinity, Size: 2
+java.lang.IndexOutOfBoundsException: Index: -Infinity, Size: 2
diff --git a/nashorn/test/script/basic/literal.js b/nashorn/test/script/basic/literal.js
new file mode 100644
index 00000000000..f98df75e1a0
--- /dev/null
+++ b/nashorn/test/script/basic/literal.js
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Object literal test.
+ *
+ * @test
+ * @run 
+ */
+
+
+var x = { a: "string", "foo": 4343, 12: 12000 };
+
+print(x.a);
+print(x["foo"]);
+print(x.foo);
+print(x[12]);
+
diff --git a/nashorn/test/script/basic/literal.js.EXPECTED b/nashorn/test/script/basic/literal.js.EXPECTED
new file mode 100644
index 00000000000..ad354dd620a
--- /dev/null
+++ b/nashorn/test/script/basic/literal.js.EXPECTED
@@ -0,0 +1,4 @@
+string
+4343
+4343
+12000
diff --git a/nashorn/test/script/basic/load.js b/nashorn/test/script/basic/load.js
new file mode 100644
index 00000000000..2a43c14cf50
--- /dev/null
+++ b/nashorn/test/script/basic/load.js
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Simple "hello world" load test
+ *
+ * @test
+ * @run
+ */
+
+load(__DIR__ + "hello.js");
diff --git a/nashorn/test/script/basic/load.js.EXPECTED b/nashorn/test/script/basic/load.js.EXPECTED
new file mode 100644
index 00000000000..3b18e512dba
--- /dev/null
+++ b/nashorn/test/script/basic/load.js.EXPECTED
@@ -0,0 +1 @@
+hello world
diff --git a/nashorn/test/script/basic/loadedfile.js b/nashorn/test/script/basic/loadedfile.js
new file mode 100644
index 00000000000..ad73274d8dc
--- /dev/null
+++ b/nashorn/test/script/basic/loadedfile.js
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @subtest
+ *
+ * Loaded by fileline.js
+ */
+
+var idx = __FILE__.lastIndexOf(java.io.File.separator);
+if (idx < 0) {
+    // separator is "/" when running under ant on windows
+    idx = __FILE__.lastIndexOf("/");
+}
+var file = (idx != -1)? __FILE__.substring(idx + 1) : __FILE__;
+print(file + " : " + __LINE__);
diff --git a/nashorn/test/script/basic/localundef.js b/nashorn/test/script/basic/localundef.js
new file mode 100644
index 00000000000..13a64292dcf
--- /dev/null
+++ b/nashorn/test/script/basic/localundef.js
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * This test used to result in VerifierError: get long/double overflows locals.
+ * But, now expected output does not much. Getting NaN instead of undefined.
+ *
+ * @test
+ * @run
+ */
+
+function func(arg){
+    // initializing "x" with something removes VerifyError!
+    var x;
+    if (arg == 1) { 
+        return x;
+    } else {
+        x = 0;
+        // removing this print call removes VerifyError!
+        print(arg);
+        return x;
+    }
+}
+
+print(func(1));
+print(func(2));
diff --git a/nashorn/test/script/basic/localundef.js.EXPECTED b/nashorn/test/script/basic/localundef.js.EXPECTED
new file mode 100644
index 00000000000..18127d2ff04
--- /dev/null
+++ b/nashorn/test/script/basic/localundef.js.EXPECTED
@@ -0,0 +1,3 @@
+undefined
+2
+0
diff --git a/nashorn/test/script/basic/map.js b/nashorn/test/script/basic/map.js
new file mode 100644
index 00000000000..2f2455e2b81
--- /dev/null
+++ b/nashorn/test/script/basic/map.js
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Tests for java.util.Map behavior in Nashorn
+ *
+ * @test
+ * @run
+ */
+var m = new (Java.type("java.util.LinkedHashMap"));
+print("m.class.name=" + m.class.name) // Has "class" property like any POJO
+
+var empty_key = "empty"
+
+print("m = " + m)
+print("m.empty = " + m.empty) // prints "true"
+print("m['empty'] = " + m['empty']) // prints "true"; item not found, default to property
+print("m[empty_key] = " + m[empty_key]) // prints "true"; item not found, default to property
+
+m.put("empty", "foo")
+
+print("m = " + m)
+print("m.empty = " + m.empty) // prints "false"
+print("m['empty'] = " + m['empty']) 
+print("m[empty_key] = " + m[empty_key]) // prints "foo"
+
+print("m.bwah = " + m.bwah) // prints "null"
+print("m['bwah'] = " + m['bwah']) // prints "null"
+
+m.put("twonk", "ding")
+print("m.twonk = " + m.twonk) // prints "ding"
+print("m['twonk'] = " + m['twonk']) // prints "ding"
+
+print("m.size()=" + m.size())
+
+print("--for each begin--")
+for each (i in m.keySet()) {
+  print(i)
+}
+print("--for each end--")
diff --git a/nashorn/test/script/basic/map.js.EXPECTED b/nashorn/test/script/basic/map.js.EXPECTED
new file mode 100644
index 00000000000..471e86e9f1b
--- /dev/null
+++ b/nashorn/test/script/basic/map.js.EXPECTED
@@ -0,0 +1,18 @@
+m.class.name=java.util.LinkedHashMap
+m = {}
+m.empty = true
+m['empty'] = true
+m[empty_key] = true
+m = {empty=foo}
+m.empty = false
+m['empty'] = foo
+m[empty_key] = foo
+m.bwah = null
+m['bwah'] = null
+m.twonk = ding
+m['twonk'] = ding
+m.size()=2
+--for each begin--
+empty
+twonk
+--for each end--
diff --git a/nashorn/test/script/basic/math.js b/nashorn/test/script/basic/math.js
new file mode 100644
index 00000000000..37e440b880b
--- /dev/null
+++ b/nashorn/test/script/basic/math.js
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Basic Math object tests.
+ *
+ * @test
+ * @run
+ */
+
+print(Math.E);
+print(Math.PI);
+print(Math.sqrt(2));
+print(Math.cos(Math.PI));
+print(Math.log(Math.cos(0)));
+
+var undef;
+
+print(undef + 10);
+print(undef - 10);
+print(undef / 10);
+print(undef * 10);
diff --git a/nashorn/test/script/basic/math.js.EXPECTED b/nashorn/test/script/basic/math.js.EXPECTED
new file mode 100644
index 00000000000..b62ebfc5ed0
--- /dev/null
+++ b/nashorn/test/script/basic/math.js.EXPECTED
@@ -0,0 +1,9 @@
+2.718281828459045
+3.141592653589793
+1.4142135623730951
+-1
+0
+NaN
+NaN
+NaN
+NaN
diff --git a/nashorn/test/script/basic/minuszero.js b/nashorn/test/script/basic/minuszero.js
new file mode 100644
index 00000000000..4b6d38808ed
--- /dev/null
+++ b/nashorn/test/script/basic/minuszero.js
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Tests with -0
+ *
+ * @test
+ * @run
+ */
+
+var mz = -0;
+print(mz);
+print(mz === -0);
+print(1/mz);
+
+var obj = {};
+obj.length = -0;
+print(obj.length);
+print(obj.length === -0);
+print(1/obj.length);
+
diff --git a/nashorn/test/script/basic/minuszero.js.EXPECTED b/nashorn/test/script/basic/minuszero.js.EXPECTED
new file mode 100644
index 00000000000..3db469484ea
--- /dev/null
+++ b/nashorn/test/script/basic/minuszero.js.EXPECTED
@@ -0,0 +1,6 @@
+0
+true
+-Infinity
+0
+true
+-Infinity
diff --git a/nashorn/test/script/basic/module.js b/nashorn/test/script/basic/module.js
new file mode 100644
index 00000000000..eea0e36e93e
--- /dev/null
+++ b/nashorn/test/script/basic/module.js
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * This file is used by "main.js".
+ *
+ * @subtest
+ */
+
+function (exports) {
+  exports.func = function() {
+     print("module.func called");
+  }
+} 
diff --git a/nashorn/test/script/basic/moduleload.js b/nashorn/test/script/basic/moduleload.js
new file mode 100644
index 00000000000..9f51cc65a7a
--- /dev/null
+++ b/nashorn/test/script/basic/moduleload.js
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * This loads "module.js" and calls the anonymous top-level function from it.
+ *
+ * @test
+ * @option --anon-functions
+ * @run
+ */
+
+var exports = {};
+var f = load(__DIR__ + "module.js");
+print(f);
+f(exports);
+exports.func();
diff --git a/nashorn/test/script/basic/moduleload.js.EXPECTED b/nashorn/test/script/basic/moduleload.js.EXPECTED
new file mode 100644
index 00000000000..eb01049fe9b
--- /dev/null
+++ b/nashorn/test/script/basic/moduleload.js.EXPECTED
@@ -0,0 +1,6 @@
+function (exports) {
+  exports.func = function() {
+     print("module.func called");
+  }
+}
+module.func called
diff --git a/nashorn/test/script/basic/nashorn2.js b/nashorn/test/script/basic/nashorn2.js
new file mode 100644
index 00000000000..1829ed2e791
--- /dev/null
+++ b/nashorn/test/script/basic/nashorn2.js
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Regression:  NAS2 - lhs of index has no symbol.
+ *
+ * @test
+ * @run 
+ */
+ 
+
+var obj = { prop: [3, 4] };
+print(obj.prop[0]);
+obj.prop[0] = 44;
+print(obj.prop[0]);
diff --git a/nashorn/test/script/basic/nashorn2.js.EXPECTED b/nashorn/test/script/basic/nashorn2.js.EXPECTED
new file mode 100644
index 00000000000..3dc014a87e7
--- /dev/null
+++ b/nashorn/test/script/basic/nashorn2.js.EXPECTED
@@ -0,0 +1,2 @@
+3
+44
diff --git a/nashorn/test/script/basic/natives.js b/nashorn/test/script/basic/natives.js
new file mode 100644
index 00000000000..6dff2f7d88a
--- /dev/null
+++ b/nashorn/test/script/basic/natives.js
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Native object tests.
+ *
+ * @test
+ * @run
+ */
+ 
+var s = "abcded";
+var n = 1289.90;
+var b = true;
+
+print(s.toUpperCase());
+print(n.POSITIVE_INFINITY);
+print(b.toString());
diff --git a/nashorn/test/script/basic/natives.js.EXPECTED b/nashorn/test/script/basic/natives.js.EXPECTED
new file mode 100644
index 00000000000..58de311e9af
--- /dev/null
+++ b/nashorn/test/script/basic/natives.js.EXPECTED
@@ -0,0 +1,3 @@
+ABCDED
+undefined
+true
diff --git a/nashorn/test/script/basic/new.js b/nashorn/test/script/basic/new.js
new file mode 100644
index 00000000000..80d77038fc9
--- /dev/null
+++ b/nashorn/test/script/basic/new.js
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * new Function test.
+ *
+ * @test
+ * @run 
+ */
+
+function MyObject() {
+    this.x = 10;
+    this.y = "string";
+    this.z = function() {
+        return true;
+    }
+};
+
+var a = new MyObject();
+
+print(a.x);
+print(a.y);
+print(a.z);
+
+var b = new MyObject;
+
+print(b.x);
+print(b.y);
+print(b.z);
+
+var obj = {
+  func: function() {
+     print("obj.func called");
+  }
+};
+
+var x = new obj.func;
+print(x);
+
+x = new function f1(){ print("in f1"); return 1;};
+print(typeof(x));
+
diff --git a/nashorn/test/script/basic/new.js.EXPECTED b/nashorn/test/script/basic/new.js.EXPECTED
new file mode 100644
index 00000000000..d8cdffb0f94
--- /dev/null
+++ b/nashorn/test/script/basic/new.js.EXPECTED
@@ -0,0 +1,14 @@
+10
+string
+function() {
+        return true;
+    }
+10
+string
+function() {
+        return true;
+    }
+obj.func called
+[object Object]
+in f1
+object
diff --git a/nashorn/test/script/basic/newexpr.js b/nashorn/test/script/basic/newexpr.js
new file mode 100644
index 00000000000..723b63ce0e8
--- /dev/null
+++ b/nashorn/test/script/basic/newexpr.js
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Various kinds of "new" usage.
+ *
+ * @test
+ * @run
+ */
+
+var File = java.io.File;
+print(new File(".").isDirectory());
+
+var obj = {
+   foo : function (x) {
+       this.bar = x;
+   }
+}
+
+print(new obj.foo(23).bar);
+
+function func() {
+    this.foo = 42;
+}
+
+print(new func().foo);
+ 
+print ((new function() { this.x = "hello" }).x); 
+
+var abc = {
+   bar: function() {
+      return { x : "hello world" };
+   }
+};
+
+print(new abc.bar().x);
+
+function func2() {
+    return { 
+        foo: function() {
+            print("foo");
+        } 
+    };
+};
+
+print(new func2().foo());
diff --git a/nashorn/test/script/basic/newexpr.js.EXPECTED b/nashorn/test/script/basic/newexpr.js.EXPECTED
new file mode 100644
index 00000000000..8b6c82e22f8
--- /dev/null
+++ b/nashorn/test/script/basic/newexpr.js.EXPECTED
@@ -0,0 +1,7 @@
+true
+23
+42
+hello
+hello world
+foo
+undefined
diff --git a/nashorn/test/script/basic/newnew.js b/nashorn/test/script/basic/newnew.js
new file mode 100644
index 00000000000..118cfd766b8
--- /dev/null
+++ b/nashorn/test/script/basic/newnew.js
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * New new function tests.
+ *
+ * @test
+ * @run
+ */
+ 
+function myObject() {
+    this.x = 10;
+    this.y = 20;
+    this.z = 30;
+}
+
+function proxyObject() {
+    return myObject;
+}
+
+var obj1 = new myObject();
+var obj2 = new new proxyObject();
+var obj3 = new proxyObject();
+
+for (i in obj1) print(i, obj1[i]);
+for (i in obj2) print(i, obj2[i]);
+for (i in obj3) print(i, obj3[i]);
+
diff --git a/nashorn/test/script/basic/newnew.js.EXPECTED b/nashorn/test/script/basic/newnew.js.EXPECTED
new file mode 100644
index 00000000000..f10d8f95b11
--- /dev/null
+++ b/nashorn/test/script/basic/newnew.js.EXPECTED
@@ -0,0 +1,6 @@
+x 10
+y 20
+z 30
+x 10
+y 20
+z 30
diff --git a/nashorn/test/script/basic/nonconstructors.js b/nashorn/test/script/basic/nonconstructors.js
new file mode 100644
index 00000000000..5ceadd9a02a
--- /dev/null
+++ b/nashorn/test/script/basic/nonconstructors.js
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Not all functions are constructors. That which are not have to throw TypeError on new.
+ *
+ * @test
+ * @run
+ */
+
+try {
+    new eval();
+} catch (e) {
+    print(e);
+}
+
+try {
+    new Array.prototype.pop();
+} catch (e) {
+    print(e);
+}
+
+try {
+    new String.prototype.indexOf();
+} catch (e) {
+    print(e);
+}
+
+try {
+    new Boolean.prototype.valueOf();
+} catch (e) {
+    print(e);
+}
diff --git a/nashorn/test/script/basic/nonconstructors.js.EXPECTED b/nashorn/test/script/basic/nonconstructors.js.EXPECTED
new file mode 100644
index 00000000000..d5f38f881a0
--- /dev/null
+++ b/nashorn/test/script/basic/nonconstructors.js.EXPECTED
@@ -0,0 +1,4 @@
+TypeError: function eval() { [native code] } is not a constructor function
+TypeError: function pop() { [native code] } is not a constructor function
+TypeError: function indexOf() { [native code] } is not a constructor function
+TypeError: function valueOf() { [native code] } is not a constructor function
diff --git a/nashorn/test/script/basic/nosuchmethod.js b/nashorn/test/script/basic/nosuchmethod.js
new file mode 100644
index 00000000000..f869c8cd1a9
--- /dev/null
+++ b/nashorn/test/script/basic/nosuchmethod.js
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Test noSuchMethod feature.
+ *
+ * @test
+ * @run 
+ */
+
+__noSuchProperty__ = function(a) { this[a] = "xxx"; return this[a]; }
+__noSuchMethod__ = function(a) { this[a] = function() { return "yyy"; }; return this[a]; }
+
+
+print(a);
+print(b());
+
+print(a);
+print(b());
+
diff --git a/nashorn/test/script/basic/nosuchmethod.js.EXPECTED b/nashorn/test/script/basic/nosuchmethod.js.EXPECTED
new file mode 100644
index 00000000000..a5db059b162
--- /dev/null
+++ b/nashorn/test/script/basic/nosuchmethod.js.EXPECTED
@@ -0,0 +1,4 @@
+xxx
+function() { return "yyy"; }
+xxx
+yyy
diff --git a/nashorn/test/script/basic/nosuchproperty.js b/nashorn/test/script/basic/nosuchproperty.js
new file mode 100644
index 00000000000..786127c7ef5
--- /dev/null
+++ b/nashorn/test/script/basic/nosuchproperty.js
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Check __noSuchProperty__
+ *
+ * @test
+ * @run
+ */
+
+function func(o) {
+   return o.foo;
+}
+
+var obj = {
+    __noSuchProperty__: function(name) {
+        print("obj.__noSuchProperty__ for " + name);
+    }
+};
+
+func(obj);
+
+obj.__noSuchProperty__ = function(name) {
+    print("new obj.__noSuchProperty__ for " + name);
+}
+
+func(obj);
+
+// try inherited __noSuchProperty__ now.
+var proto = {
+    __noSuchProperty__ : function(name) {
+        print("proto.__noSuchProperty__ for " + name);
+    }
+};
+
+var obj2 = Object.create(proto);
+func(obj2);
+
+proto.__noSuchProperty__ = function(name) {
+   print("new proto.__noSuchProperty__ for " + name);
+}
+
+func(obj2);
diff --git a/nashorn/test/script/basic/nosuchproperty.js.EXPECTED b/nashorn/test/script/basic/nosuchproperty.js.EXPECTED
new file mode 100644
index 00000000000..923d988f07d
--- /dev/null
+++ b/nashorn/test/script/basic/nosuchproperty.js.EXPECTED
@@ -0,0 +1,4 @@
+obj.__noSuchProperty__ for foo
+new obj.__noSuchProperty__ for foo
+proto.__noSuchProperty__ for foo
+new proto.__noSuchProperty__ for foo
diff --git a/nashorn/test/script/basic/number.js b/nashorn/test/script/basic/number.js
new file mode 100644
index 00000000000..fb7f9971a90
--- /dev/null
+++ b/nashorn/test/script/basic/number.js
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Basic Number tests
+ *
+ * @test
+ * @run
+ */
+
+var x = 10;
+print("x = " + x.toString());
+print(x.valueOf());
+print(x.toLocaleString());
+
+var y = new Number(Math.PI);
+print("y = " + y.toString());
+print(y.valueOf());
+
+// we can call java.lang.Double methods on JS Numbers
+print(Infinity.isInfinite());
+print(343.434.isInfinite());
diff --git a/nashorn/test/script/basic/number.js.EXPECTED b/nashorn/test/script/basic/number.js.EXPECTED
new file mode 100644
index 00000000000..0e4b3363a37
--- /dev/null
+++ b/nashorn/test/script/basic/number.js.EXPECTED
@@ -0,0 +1,7 @@
+x = 10
+10
+10
+y = 3.141592653589793
+3.141592653589793
+true
+false
diff --git a/nashorn/test/script/basic/numberstring.js b/nashorn/test/script/basic/numberstring.js
new file mode 100644
index 00000000000..5ee27426da5
--- /dev/null
+++ b/nashorn/test/script/basic/numberstring.js
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Number to string test
+ *
+ * @test
+ * @run
+ */
+
+print(1.0/0.0);
+print(-1.0/0.0);
+print(0.0/0.0);
+print(12345678901234567890.0);
+print(0.12345678901234567890);
+
+for (d = 1; d < 1E30; d *= 10.0) {
+    print(123456.0 * d);
+}
+
+for (d = 1; d < 1E30; d *= 10.0) {
+    print(123456.0 / d);
+}
diff --git a/nashorn/test/script/basic/numberstring.js.EXPECTED b/nashorn/test/script/basic/numberstring.js.EXPECTED
new file mode 100644
index 00000000000..47d658ef7af
--- /dev/null
+++ b/nashorn/test/script/basic/numberstring.js.EXPECTED
@@ -0,0 +1,67 @@
+Infinity
+-Infinity
+NaN
+12345678901234567000
+0.12345678901234568
+123456
+1234560
+12345600
+123456000
+1234560000
+12345600000
+123456000000
+1234560000000
+12345600000000
+123456000000000
+1234560000000000
+12345600000000000
+123456000000000000
+1234560000000000000
+12345600000000000000
+123456000000000000000
+1.23456e+21
+1.23456e+22
+1.23456e+23
+1.23456e+24
+1.23456e+25
+1.23456e+26
+1.23456e+27
+1.23456e+28
+1.23456e+29
+1.2345599999999999e+30
+1.2345599999999998e+31
+1.2345599999999998e+32
+1.23456e+33
+1.23456e+34
+1.2345599999999999e+35
+123456
+12345.6
+1234.56
+123.456
+12.3456
+1.23456
+0.123456
+0.0123456
+0.00123456
+0.000123456
+0.0000123456
+0.00000123456
+1.23456e-7
+1.23456e-8
+1.23456e-9
+1.23456e-10
+1.23456e-11
+1.23456e-12
+1.23456e-13
+1.23456e-14
+1.23456e-15
+1.23456e-16
+1.23456e-17
+1.23456e-18
+1.2345600000000001e-19
+1.2345600000000002e-20
+1.2345600000000002e-21
+1.2345600000000001e-22
+1.23456e-23
+1.23456e-24
+1.23456e-25
diff --git a/nashorn/test/script/basic/objectprops.js b/nashorn/test/script/basic/objectprops.js
new file mode 100644
index 00000000000..77dda1d3106
--- /dev/null
+++ b/nashorn/test/script/basic/objectprops.js
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Check Object.defineProperty, Object.defineProperties and Object.create.
+ * FIXME: yet to checks for property attribute create/modifications.
+ *
+ * @test
+ * @run
+ */
+
+// create an object
+var obj = {};
+// data property
+Object.defineProperty(obj, "foo", { value: "hello" });
+// accessor property
+Object.defineProperty(obj, "bar", { get: function() { return "bar" } });
+
+print("obj.foo = " + obj.foo);
+print("obj.bar = " + obj.bar);
+
+// define multiple properties at one go.
+Object.defineProperties(obj,
+  {
+     xyz: { value: 44 },
+     abc: { get: function() { print("get abc"); return "abc"; } }
+  }
+); 
+
+print("obj.xyz = " + obj.xyz);
+print("obj.abc = " + obj.abc);
+
+function MyConstructor() {}
+var obj2 = Object.create(MyConstructor.prototype);
+print("obj2 in MyConstructor instance? " + (obj2 instanceof MyConstructor));
+
+var obj3 = Object.create(Object.prototype, 
+  {
+     xyz: { value: 44 }
+  }
+);
+
+print("obj3 is an Object? " + (obj3 instanceof Object));
+print(obj3.xyz);
diff --git a/nashorn/test/script/basic/objectprops.js.EXPECTED b/nashorn/test/script/basic/objectprops.js.EXPECTED
new file mode 100644
index 00000000000..613713bf8c0
--- /dev/null
+++ b/nashorn/test/script/basic/objectprops.js.EXPECTED
@@ -0,0 +1,8 @@
+obj.foo = hello
+obj.bar = bar
+obj.xyz = 44
+get abc
+obj.abc = abc
+obj2 in MyConstructor instance? true
+obj3 is an Object? true
+44
diff --git a/nashorn/test/script/basic/objects.js b/nashorn/test/script/basic/objects.js
new file mode 100644
index 00000000000..e9e10c9391c
--- /dev/null
+++ b/nashorn/test/script/basic/objects.js
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Basic object literal tests. Also check few Object.prototype and Object
+ * constructor functions.
+ *
+ * @test
+ * @run
+ */
+var person = { name: "sundar" };
+print(person.name);
+person.name = "Sundararajan";
+print(person.name);
+
+var obj = { foo: 3, bar: 44 };
+
+print("own properties of 'obj':");
+var names = Object.getOwnPropertyNames(obj);
+// get only own property names
+for (i in names) {
+   print(i + " -> " + names[i]);
+}
+
+print("has own 'foo'? " + obj.hasOwnProperty('foo'));
+print("has own 'xyz'? " + obj.hasOwnProperty('xyz'));
+
+print("'foo' enumerable? " + obj.propertyIsEnumerable('foo'));
+print("'bar' enumerable? " + obj.propertyIsEnumerable('bar'));
+
+obj = {
+    foo: 44,
+    bar: "orcl",
+    func: function() { print("myfunc"); },
+    get abc() { return "abc"; },
+    set xyz(val) { print(val); },
+    get hey() { return "hey"; },
+    set hey(val) { print(val); }
+}
+
+// get property descriptor for each property and check it
+for (i in obj) {
+    var desc = Object.getOwnPropertyDescriptor(obj, i);
+    print(i + " is writable? " + desc.writable);
+    print(i + " is configurable? " + desc.configurable);
+    print(i + " is enumerable? " + desc.enumerable);
+    print(i + "'s value = " + desc.value);
+    print(i + "'s get = " + desc.get);
+    print(i + "'s set = " + desc.set);
+}
+
+print(Object.getOwnPropertyDescriptor(obj, "non-existent"));
diff --git a/nashorn/test/script/basic/objects.js.EXPECTED b/nashorn/test/script/basic/objects.js.EXPECTED
new file mode 100644
index 00000000000..a6bedc098f6
--- /dev/null
+++ b/nashorn/test/script/basic/objects.js.EXPECTED
@@ -0,0 +1,46 @@
+sundar
+Sundararajan
+own properties of 'obj':
+0 -> foo
+1 -> bar
+has own 'foo'? true
+has own 'xyz'? false
+'foo' enumerable? true
+'bar' enumerable? true
+foo is writable? true
+foo is configurable? true
+foo is enumerable? true
+foo's value = 44
+foo's get = undefined
+foo's set = undefined
+bar is writable? true
+bar is configurable? true
+bar is enumerable? true
+bar's value = orcl
+bar's get = undefined
+bar's set = undefined
+func is writable? true
+func is configurable? true
+func is enumerable? true
+func's value = function() { print("myfunc"); }
+func's get = undefined
+func's set = undefined
+abc is writable? undefined
+abc is configurable? true
+abc is enumerable? true
+abc's value = undefined
+abc's get = abc() { return "abc"; }
+abc's set = undefined
+xyz is writable? undefined
+xyz is configurable? true
+xyz is enumerable? true
+xyz's value = undefined
+xyz's get = undefined
+xyz's set = xyz(val) { print(val); }
+hey is writable? undefined
+hey is configurable? true
+hey is enumerable? true
+hey's value = undefined
+hey's get = hey() { return "hey"; }
+hey's set = hey(val) { print(val); }
+undefined
diff --git a/nashorn/test/script/basic/options.js b/nashorn/test/script/basic/options.js
new file mode 100644
index 00000000000..dd68e3c79df
--- /dev/null
+++ b/nashorn/test/script/basic/options.js
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Access nashorn command line options.
+ *
+ * @test
+ * @option -scripting
+ * @option -timezone=Asia/Calcutta
+ * @run
+ */
+print("-scripting = " + $OPTIONS._scripting);
+print("--compile-only = " + $OPTIONS._compile_only);
+print("-timezone = " + $OPTIONS._timezone.ID);
diff --git a/nashorn/test/script/basic/options.js.EXPECTED b/nashorn/test/script/basic/options.js.EXPECTED
new file mode 100644
index 00000000000..dd5f1551a2c
--- /dev/null
+++ b/nashorn/test/script/basic/options.js.EXPECTED
@@ -0,0 +1,3 @@
+-scripting = true
+--compile-only = false
+-timezone = Asia/Calcutta
diff --git a/nashorn/test/script/basic/propchange.js b/nashorn/test/script/basic/propchange.js
new file mode 100644
index 00000000000..50498d890fe
--- /dev/null
+++ b/nashorn/test/script/basic/propchange.js
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Change attributes of an existing property
+ *
+ * @test
+ * @run
+ */ 
+
+var obj = { x: 343 };
+
+for(i in obj) {
+  print(i);
+}
+
+Object.defineProperty(obj, "x", {
+   enumerable: false });
+
+// not-enumerable anymore
+for(i in obj) {
+  print(i);
+}
+
+print(obj.x);
+obj.x = 42;
+print(obj.x);
+
+// make non-writable
+Object.defineProperty(obj, "x", {
+    writable: false
+});
+
+obj.x = "hello";
+print(obj.x);
+
+print("done");
+
diff --git a/nashorn/test/script/basic/propchange.js.EXPECTED b/nashorn/test/script/basic/propchange.js.EXPECTED
new file mode 100644
index 00000000000..5f0b36ba5a5
--- /dev/null
+++ b/nashorn/test/script/basic/propchange.js.EXPECTED
@@ -0,0 +1,5 @@
+x
+343
+42
+42
+done
diff --git a/nashorn/test/script/basic/propertycheck.js b/nashorn/test/script/basic/propertycheck.js
new file mode 100644
index 00000000000..b91897ed024
--- /dev/null
+++ b/nashorn/test/script/basic/propertycheck.js
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Check "prop" in obj syntax.
+ *
+ * @test
+ * @run
+ */
+
+var obj = { bar: 33 };
+
+// should print false
+print("foo" in obj);
+
+// should print true
+print("bar" in obj);
diff --git a/nashorn/test/script/basic/propertycheck.js.EXPECTED b/nashorn/test/script/basic/propertycheck.js.EXPECTED
new file mode 100644
index 00000000000..1d474d52557
--- /dev/null
+++ b/nashorn/test/script/basic/propertycheck.js.EXPECTED
@@ -0,0 +1,2 @@
+false
+true
diff --git a/nashorn/test/script/basic/proto.js.EXPECTED b/nashorn/test/script/basic/proto.js.EXPECTED
new file mode 100644
index 00000000000..fded7273314
--- /dev/null
+++ b/nashorn/test/script/basic/proto.js.EXPECTED
@@ -0,0 +1,2 @@
+a string
+a string
diff --git a/nashorn/test/script/basic/prototype.js b/nashorn/test/script/basic/prototype.js
new file mode 100644
index 00000000000..17748433342
--- /dev/null
+++ b/nashorn/test/script/basic/prototype.js
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-467 - check that prootype.js parses and compiles
+ *
+ * @test
+ * @runif external.prototype
+ */
+
+function check(url_) {
+    try {
+	load(url_);
+    } catch (e) {
+	if (e instanceof ReferenceError && e.toString().indexOf('navigator') != -1) {
+	    return;
+	}
+	throw e;
+    }
+}
+
+var file = __DIR__ + "../external/prototype/prototype.js";
+try {
+    try {
+        check(file);
+    } catch (e) { 
+        print(e);
+    }
+} catch (e) {
+    print("error: " + typeof e);
+}
+print("parsed and compiled ok prototype.js");
diff --git a/nashorn/test/script/basic/prototype.js.EXPECTED b/nashorn/test/script/basic/prototype.js.EXPECTED
new file mode 100644
index 00000000000..e677550c981
--- /dev/null
+++ b/nashorn/test/script/basic/prototype.js.EXPECTED
@@ -0,0 +1 @@
+parsed and compiled ok prototype.js
diff --git a/nashorn/test/script/basic/pushpull.js b/nashorn/test/script/basic/pushpull.js
new file mode 100644
index 00000000000..d0e4c74bad4
--- /dev/null
+++ b/nashorn/test/script/basic/pushpull.js
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Test array push and pull.
+ *
+ * @test
+ * @run
+ */
+
+var a = [1, 2, 3, 4, 5];
+var b = ["a", "b", "c", "d"];
+
+print(a.push(10, 20, 30, 40));
+print(a.pop());
+print(a);
+print(a.push("rabbit"));
+print(a.pop());
+
+print(b.push("e", "f"));
+print(b.pop());
diff --git a/nashorn/test/script/basic/pushpull.js.EXPECTED b/nashorn/test/script/basic/pushpull.js.EXPECTED
new file mode 100644
index 00000000000..d43da4b70ca
--- /dev/null
+++ b/nashorn/test/script/basic/pushpull.js.EXPECTED
@@ -0,0 +1,7 @@
+9
+40
+1,2,3,4,5,10,20,30
+9
+rabbit
+6
+f
diff --git a/nashorn/test/script/basic/regex.js b/nashorn/test/script/basic/regex.js
new file mode 100644
index 00000000000..f9819058a94
--- /dev/null
+++ b/nashorn/test/script/basic/regex.js
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * RegExp test.
+ *
+ * @test
+ * @run 
+ */
+ 
+var regexp;
+
+regexp = new RegExp("dog");
+print("is global? " + regexp.global);
+print(regexp.exec("One dog, two dogs in the yard."));
+regexp = new RegExp("dog", "g");
+print(regexp.exec("One dog, two dogs in the yard."));
+regexp = new RegExp("(d)(o)(g)");
+print(regexp.exec("One dog, two dogs in the yard."));
+regexp = new RegExp("cat");
+print(regexp.exec("One dog, two dogs in the yard."));
+
+regexp = new RegExp("dog");
+print(regexp.test("One dog, two dogs in the yard."));
+regexp = new RegExp("dog", "g");
+print(regexp.test("One dog, two dogs in the yard."));
+regexp = new RegExp("(d)(o)(g)");
+print(regexp.test("One dog, two dogs in the yard."));
+regexp = new RegExp("cat");
+print(regexp.test("One dog, two dogs in the yard."));
+
+regexp = new RegExp("dog");
+print("One dog, two dogs in the yard.".replace(regexp, "cat"));
+regexp = new RegExp("dog", "g");
+print("One dog, two dogs in the yard.".replace(regexp, "cat"));
+regexp = new RegExp("(d)(o)(g)");
+print("One dog, two dogs in the yard.".replace(regexp, "cat"));
+regexp = new RegExp("cat");
+print("One dog, two dogs in the yard.".replace(regexp, "cat"));
+print("One dog, two dogs in the yard.".replace("dog", "cat"));
+
+regexp = new RegExp("dog");
+print("One dog, two dogs in the yard.".search(regexp));
+regexp = new RegExp("dog", "g");
+print("One dog, two dogs in the yard.".search(regexp));
+regexp = new RegExp("(d)(o)(g)");
+print("One dog, two dogs in the yard.".search(regexp));
+regexp = new RegExp("cat");
+print("One dog, two dogs in the yard.".search(regexp));
+
+print(/dog/.exec("One dog, two dogs in the yard."));
+print(/dog/g.exec("One dog, two dogs in the yard."));
+print(/(d)(o)(g)/.exec("One dog, two dogs in the yard."));
+print(/cat/.exec("One dog, two dogs in the yard."));
+
+print(/dog/.test("One dog, two dogs in the yard."));
+print(/dog/g.test("One dog, two dogs in the yard."));
+print(/(d)(o)(g)/.test("One dog, two dogs in the yard."));
+print(/cat/.test("One dog, two dogs in the yard."));
+
+print("One dog, two dogs in the yard.".replace(/dog/, "cat"));
+print("One dog, two dogs in the yard.".replace(/dog/g, "cat"));
+print("One dog, two dogs in the yard.".replace(/(d)(o)(g)/, "cat"));
+print("One dog, two dogs in the yard.".replace(/cat/, "cat"));
+
+print("One dog, two dogs in the yard.".search(/dog/));
+print("One dog, two dogs in the yard.".search(/dog/g));
+print("One dog, two dogs in the yard.".search(/(d)(o)(g)/));
+print("One dog, two dogs in the yard.".search(/cat/));
+
+print("One dog, two dogs in the yard.".split(/dog/));
+print("One dog, two dogs in the yard.".split(/dog/g));
+print("One dog, two dogs in the yard.".split(/(d)(o)(g)/));
+print("One dog, two dogs in the yard.".split(/cat/));
+
+regexp = new RegExp("dog");
+print("One dog, two dogs in the yard.".split(regexp));
+regexp = new RegExp("dog", "g");
+print("One dog, two dogs in the yard.".split(regexp));
+regexp = new RegExp("(d)(o)(g)");
+print("One dog, two dogs in the yard.".split(regexp));
+regexp = new RegExp("cat");
+print("One dog, two dogs in the yard.".split(regexp));
+print("One dog, two dogs in the yard.".split("dog"));
+
+var str = 'shapgvba (){Cuk.Nccyvpngvba.Frghc.Pber();Cuk.Nccyvpngvba.Frghc.Nwnk();Cuk.Nccyvpngvba.Frghc.Synfu();Cuk.Nccyvpngvba.Frghc.Zbqhyrf()}';
+regex = /^[\s[]?shapgvba/;
+print(regex.exec('[bowrpg tybony]'));
+print(regex.exec(str));
+print(regex.exec('shapgvba sbphf() { [angvir pbqr] }'));
+regex = new RegExp("^[\\s[]?shapgvba");
+print(regex.exec('[bowrpg tybony]'));
+print(regex.exec(str));
+print(regex.exec('shapgvba sbphf() { [angvir pbqr] }'));
diff --git a/nashorn/test/script/basic/regex.js.EXPECTED b/nashorn/test/script/basic/regex.js.EXPECTED
new file mode 100644
index 00000000000..76a7e67fe29
--- /dev/null
+++ b/nashorn/test/script/basic/regex.js.EXPECTED
@@ -0,0 +1,49 @@
+is global? false
+dog
+dog
+dog,d,o,g
+null
+true
+true
+true
+false
+One cat, two dogs in the yard.
+One cat, two cats in the yard.
+One cat, two dogs in the yard.
+One dog, two dogs in the yard.
+One cat, two dogs in the yard.
+4
+4
+4
+-1
+dog
+dog
+dog,d,o,g
+null
+true
+true
+true
+false
+One cat, two dogs in the yard.
+One cat, two cats in the yard.
+One cat, two dogs in the yard.
+One dog, two dogs in the yard.
+4
+4
+4
+-1
+One ,, two ,s in the yard.
+One ,, two ,s in the yard.
+One ,d,o,g,, two ,d,o,g,s in the yard.
+One dog, two dogs in the yard.
+One ,, two ,s in the yard.
+One ,, two ,s in the yard.
+One ,d,o,g,, two ,d,o,g,s in the yard.
+One dog, two dogs in the yard.
+One ,, two ,s in the yard.
+null
+shapgvba
+shapgvba
+null
+shapgvba
+shapgvba
diff --git a/nashorn/test/script/basic/regexp_flags.js b/nashorn/test/script/basic/regexp_flags.js
new file mode 100644
index 00000000000..b0bc9b8a221
--- /dev/null
+++ b/nashorn/test/script/basic/regexp_flags.js
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-154: Early error reporting.
+ *
+ * Errors in regular expression literals that are not implementation-defined 
+ * syntax extensions.
+ *
+ * @test
+ * @run
+ */
+
+// leave only 'g', 'i' and 'm'. All other flags are invalid
+var flags = "abcdefhjklnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+
+// check all invalid flags
+for (var i = 0; i < flags.length; i++) {
+    try {
+        // because regexp literal errors are early errors, we should not see
+        // any output from print calls.
+        eval("print(__FILE__); var x = /nashorn/" + flags[i]);
+        fail("SyntaxError not thrown for regexp flag " + flags[i]);
+    } catch (e) {
+        if (! (e instanceof SyntaxError)) {
+            fail("SyntaxError not thrown for regexp flag " + flags[i]);
+        }
+    }
+}
diff --git a/nashorn/test/script/basic/run-octane.js b/nashorn/test/script/basic/run-octane.js
new file mode 100644
index 00000000000..dcf7fcd8387
--- /dev/null
+++ b/nashorn/test/script/basic/run-octane.js
@@ -0,0 +1,222 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @subtest
+ */
+
+var tests = [
+    "box2d.js",
+    "code-load.js",
+    "crypto.js", 
+    "deltablue.js", 
+    "earley-boyer.js", 
+    "gbemu.js",	     
+    "navier-stokes.js", 
+    "pdfjs.js",
+    "raytrace.js",
+    "regexp.js", 
+    "richards.js", 
+    "splay.js" 
+];
+
+// hack, teardown breaks things defined in the global space, making it impossible
+// to do multiple consecutive benchmark runs with the same harness. I think it's a bug
+// that the setup and teardown aren't each others constructor and destructor but rather
+// that the benchmarks rely on partial global state. For shame, Octane! 
+var ignoreTeardown = [
+    { name: "box2d.js" },
+    { name: "gbemu.js" },
+];
+
+var dir = (typeof(__DIR__) == 'undefined') ? "test/script/basic/" : __DIR__;
+
+// TODO: why is this path hard coded when it's defined in project properties?
+var path = dir + "../external/octane/benchmarks/";
+
+var runtime = "";
+var verbose = false;
+
+var numberOfIterations = 5;
+
+function endsWith(str, suffix) {
+    return str.indexOf(suffix, str.length - suffix.length) !== -1;
+}
+
+function run_one_benchmark(arg, iters) {
+
+    load(path + 'base.js');
+    load(arg);
+
+    var file_name;
+
+    var file = arg.split('/');
+    if (file.length == 1) {
+        file = arg.split('\\');
+    }    
+
+    //trim off trailing path separators
+    while (file[file.length - 1].indexOf(".js") == -1) {
+	file.pop();
+    }
+    file_name = file[file.length - 1];
+    
+    if (typeof compile_only !== 'undefined') {
+	print("Compiled OK: " + file_name);
+	return;
+    }
+    
+    var success = true;
+    var hiscore = 0;
+    var loscore = 10e8;
+    var current_name;
+    
+    function PrintResult(name, result) {
+	current_name = name;
+    }
+        
+    function PrintError(name, error) {
+	current_name = name;
+	PrintResult(name, error);
+	success = false;
+    }
+        
+    function PrintScore(score) {
+	if (success) {
+	    if (+score >= hiscore) {
+		hiscore = +score;
+	    }
+	    if (+score <= loscore) {
+		loscore = +score;
+	    }
+	}
+
+	if (verbose) {
+	    print("Score: " + score);
+	}
+    }
+    
+    if (iters == undefined) {
+	iters = numberOfIterations;
+    } else {
+	numberOfIterations = iters;
+    }
+
+    print(runtime + ": running " + file_name + "...");
+
+    for (var i = 0; i < numberOfIterations; i++) {
+	var callbacks =
+	    { NotifyResult: PrintResult,
+	      NotifyError: PrintError,
+	      NotifyScore: PrintScore };	
+
+	for (j in ignoreTeardown) {
+	    var ignore = ignoreTeardown[j];
+	    if (endsWith(arg, ignore.name)) {
+		var teardownOverride = ignore.teardown;
+		if (!teardownOverride) {
+		    teardownOverride = function() {};
+		}
+
+		for (k in BenchmarkSuite.suites) {
+		    var benchmarks = BenchmarkSuite.suites[k].benchmarks;
+		    for (l in benchmarks) {
+			benchmarks[l].TearDown = teardownOverride;
+		    }
+                }
+		break;
+	    }
+	}
+	
+	BenchmarkSuite.RunSuites(callbacks);
+    }
+    
+    var start = "Score: ";
+    if (runtime != "") {
+	start = runtime + ": ";
+    } 
+    print(start + current_name + ' (version ' + BenchmarkSuite.version + '): ' + loscore + '-' + hiscore);
+}
+
+function run_suite(tests, iters) {
+    for (var idx = 0; idx < tests.length; idx++) {
+	run_one_benchmark(tests[idx], iters, false);
+    }
+}
+
+runtime = "command line";
+
+var args = [];
+if (typeof $ARGS !== 'undefined') {
+    args = $ARGS;
+} else if (typeof arguments !== 'undefined' && arguments.length != 0) {
+    args = arguments;
+}  
+
+var new_args = [];
+for (i in args) {
+    if (args[i].toString().indexOf(' ') != -1) {
+	args[i] = args[i].replace(/\/$/, '');
+	var s = args[i].split(' ');
+	for (j in s) {
+	    new_args.push(s[j]);
+	}
+    } else {
+	new_args.push(args[i]);
+    }
+}
+
+if (new_args.length != 0) {
+    args = new_args;
+}
+
+var tests_found = [];
+var iters = undefined;
+
+for (var i = 0; i < args.length; i++) { 
+    arg = args[i];
+    if (arg == "--iterations") {
+	iters = +args[++i];
+    } else if (arg == "--runtime") {
+	runtime = args[++i];
+    } else if (arg == "--verbose") {
+	verbose = true;
+    } else if (arg == "") {
+	continue; //skip
+    } else {
+	tests_found.push(arg);
+    }
+}
+
+if (tests_found.length == 0) {    
+    for (i in tests) {
+	tests_found.push(path + tests[i]);
+    }
+} 
+
+tests_found.sort();
+
+run_suite(tests_found, iters);
+
+
+
diff --git a/nashorn/test/script/basic/runsunspider.js b/nashorn/test/script/basic/runsunspider.js
new file mode 100644
index 00000000000..e1ec395c270
--- /dev/null
+++ b/nashorn/test/script/basic/runsunspider.js
@@ -0,0 +1,191 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * runsunspider : runs the sunspider tests and checks for compliance
+ *
+ * @test
+ * @option -timezone=PST
+ * @runif external.sunspider
+ */
+
+/*
+ * Copyright (c) 2010-2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * This is not a test, but a test "framework" for running sunspider tests.
+ *
+ */
+
+function assertEq(a, b) {
+    if (a !== b) {
+	throw "ASSERTION FAILED: " + a + " should be " + b;
+    }
+}
+
+var runs = 0;
+var iterations__ = 1;
+var total_time = 0;
+
+function runbench(name) {
+    var filename = name.split("/").pop();
+    if (verbose_run) {
+	print("Running " + filename);
+    }
+
+    var start = new Date;
+    for (var i = 0; i < iterations__; i++) {
+	load(name);    
+    }
+    var stop = new Date - start;
+    total_time += stop;
+    
+    if (verbose_run) {
+	print(filename + " done in " + stop + " ms"); 
+    } 
+    runs++;
+}
+    
+function runsuite(args) {
+    var changed = false;
+
+    try {
+	for (var n = 0; n < args.length; n++) {
+	    if (args[n] == undefined) {
+		continue;
+	    }
+	    if (args[n].indexOf('--') == 0) {
+		continue; //ignore param
+	    }
+	    runbench(args[n]);
+	    changed = true;
+	}
+
+    } catch (e) {
+	print("error: " + e);
+	if (e.toString().indexOf(args) == 1) {
+	    throw e;
+	}
+	// no scripting or something, silently fail
+    }
+    return changed;
+}
+
+var args;
+if (typeof $ARGS !== 'undefined') {
+    args = $ARGS;
+} else if (typeof arguments !== 'undefined') {
+    args = arguments;
+} 
+
+var tests = [
+	     'check-3d-cube.js',
+	     'check-access-nsieve.js',
+	     'check-crypto-aes.js',   
+	     'check-math-spectral-norm.js',
+	     'check-3d-morph.js',
+	     'check-bitops-3bit-bits-in-byte.js',
+	     'check-crypto-md5.js',
+	     'check-mont.js',
+	     'check-3d-raytrace.js',
+	     'check-bitops-bits-in-byte.js',
+	     'check-crypto-sha1.js',
+	     'check-regexp-dna.js',
+	     'check-access-binary-trees.js',
+	     'check-bitops-bitwise-and.js',
+	     'check-date-format-tofte.js',
+	     'check-string-fasta.js',
+	     'check-access-fannkuch.js',
+	     'check-bitops-nsieve-bits.js',
+	     'check-math-cordic.js',
+	     'check-string-tagcloud.js',
+	     'check-access-nbody.js',
+	     'check-controlflow-recursive.js',
+	     'check-math-partial-sums.js',
+	     'check-string-unpack-code.js'
+	     ];
+
+// handle the case this script may be run by a JS engine that doesn't
+// support __DIR__ global variable.
+var dir = (typeof(__DIR__) == 'undefined')? "test/script/basic/" : __DIR__;
+
+for (i in tests) {
+    tests[i] = dir + '../external/sunspider/' + tests[i];
+}
+
+var verbose_run = false;
+
+// check for a fileset from ant and split it - special case call from ant build.xml
+if (args.length == 1 && args[0].toString().indexOf(' ') != -1) {
+    args[0] = args[0].replace(/\/$/, '');
+    args = args[0].split(' ');
+    verbose_run = true; //for a file set, always run verbose for ant sunspider output
+} 
+
+
+var tests_found = [];
+
+for (i in args) {
+    var arg = args[i];
+    if (arg.indexOf('--') == 0) {
+	if (arg == '--verbose') {
+	    verbose_run = true;
+	} 
+    } else {
+	tests_found.push(arg);
+    }
+}
+
+if (tests_found.length == 0) {    
+    tests_found = tests;
+}
+
+runsuite(tests_found);
+
+if (verbose_run) {
+    print(runs + "/" + tests_found.length + " tests were successfully run in " + total_time + " ms ");
+}
+
+print("Sunspider finished!");
diff --git a/nashorn/test/script/basic/runsunspider.js.EXPECTED b/nashorn/test/script/basic/runsunspider.js.EXPECTED
new file mode 100644
index 00000000000..dd360839514
--- /dev/null
+++ b/nashorn/test/script/basic/runsunspider.js.EXPECTED
@@ -0,0 +1 @@
+Sunspider finished!
diff --git a/nashorn/test/script/basic/samfunc.js b/nashorn/test/script/basic/samfunc.js
new file mode 100644
index 00000000000..0bbd3e815eb
--- /dev/null
+++ b/nashorn/test/script/basic/samfunc.js
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * SAM interface implemented by a script function.
+ *
+ * @test
+ * @run
+ */
+
+// we can pass a script function when an interface with single
+// abstract method is required. Here we pass script function for
+// a java.lang.Runnable.
+
+var t1 = new java.lang.Thread(function() {
+    print("thread t1.run");
+}); 
+
+// make sure that we can pass interface implementation as well.
+var t2 = new java.lang.Thread(new java.lang.Runnable() {
+   run: function() { print("thread t2.run"); }
+});
+
+t1.start();
+t1.join();
+
+t2.start();
+t2.join();
diff --git a/nashorn/test/script/basic/samfunc.js.EXPECTED b/nashorn/test/script/basic/samfunc.js.EXPECTED
new file mode 100644
index 00000000000..43dea4a3b08
--- /dev/null
+++ b/nashorn/test/script/basic/samfunc.js.EXPECTED
@@ -0,0 +1,2 @@
+thread t1.run
+thread t2.run
diff --git a/nashorn/test/script/basic/scripting.js b/nashorn/test/script/basic/scripting.js
new file mode 100644
index 00000000000..e6b9224e0ee
--- /dev/null
+++ b/nashorn/test/script/basic/scripting.js
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Edit strings test
+ *
+ * @test
+ * @option -scripting
+ * @run
+ */
+
+# scripting mode - shell style line comment works..
+
+var t = "normal";
+print("a ${t} string");
+
+// JavaScript style line comment works too..
+var i = 0;
+print("line ${i++}\nline ${i++}");
+
+var c = 3;
+print(<<EOD + "!!!!")
+Here is a long sentence
+that may extend over ${c}
+lines.
+EOD
+
+c = 4;
+print(<<<EOD + "!!!!")
+Here is a long sentence
+that may extend over ${c}
+lines.
+EOD
+
+eval(<<BRAINTEASER);
+print("This is executed how");
+BRAINTEASER
+
+print(<<HTML);
+    <html>
+        <head>
+            <title>Testing</title>
+        </head>
+        <body>
+            <p>This is a test.<p>
+        </body>
+    </html>
+HTML
+
+var x = 1
+<<
+3;
+print(x);
+
+var y = <<EOD;
+There we go
+EOD y = "No we don't";
+print(y);
+
+
+print(read(__FILE__));
diff --git a/nashorn/test/script/basic/scripting.js.EXPECTED b/nashorn/test/script/basic/scripting.js.EXPECTED
new file mode 100644
index 00000000000..73c1fb963a2
--- /dev/null
+++ b/nashorn/test/script/basic/scripting.js.EXPECTED
@@ -0,0 +1,103 @@
+a normal string
+line 0
+line 1
+Here is a long sentence
+that may extend over 3
+lines.!!!!
+Here is a long sentence
+that may extend over 4
+lines.
+!!!!
+This is executed how
+    <html>
+        <head>
+            <title>Testing</title>
+        </head>
+        <body>
+            <p>This is a test.<p>
+        </body>
+    </html>
+8
+No we don't
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Edit strings test
+ *
+ * @test
+ * @option -scripting
+ * @run
+ */
+
+# scripting mode - shell style line comment works..
+
+var t = "normal";
+print("a ${t} string");
+
+// JavaScript style line comment works too..
+var i = 0;
+print("line ${i++}\nline ${i++}");
+
+var c = 3;
+print(<<EOD + "!!!!")
+Here is a long sentence
+that may extend over ${c}
+lines.
+EOD
+
+c = 4;
+print(<<<EOD + "!!!!")
+Here is a long sentence
+that may extend over ${c}
+lines.
+EOD
+
+eval(<<BRAINTEASER);
+print("This is executed how");
+BRAINTEASER
+
+print(<<HTML);
+    <html>
+        <head>
+            <title>Testing</title>
+        </head>
+        <body>
+            <p>This is a test.<p>
+        </body>
+    </html>
+HTML
+
+var x = 1
+<<
+3;
+print(x);
+
+var y = <<EOD;
+There we go
+EOD y = "No we don't";
+print(y);
+
+
+print(read(__FILE__));
+
diff --git a/nashorn/test/script/basic/sealfreeze.js b/nashorn/test/script/basic/sealfreeze.js
new file mode 100644
index 00000000000..90a78b77719
--- /dev/null
+++ b/nashorn/test/script/basic/sealfreeze.js
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Basic checks for Object.seal and Object.freeze.
+ *
+ * @test
+ * @run
+ */
+
+var obj = { num: Math.E };
+
+print("sealed? " + Object.isSealed(obj));
+print("frozen? " + Object.isFrozen(obj));
+
+Object.seal(obj);
+print("sealed? " + Object.isSealed(obj));
+
+// delete should fail - because we have sealed
+print("deleted num? " + (delete obj.num));
+print("num = " + obj.num);
+
+// assignment should succeed
+print("assign PI to num");
+obj.num = Math.PI;
+print("num = " + obj.num);
+
+// assignment should fail -- because we freeze
+Object.freeze(obj);
+print("frozen? " + Object.isFrozen(obj));
+
+print("assign 1729 to num");
+obj.num = 1729;
+print("num = " + obj.num);
+
diff --git a/nashorn/test/script/basic/sealfreeze.js.EXPECTED b/nashorn/test/script/basic/sealfreeze.js.EXPECTED
new file mode 100644
index 00000000000..55da86115f9
--- /dev/null
+++ b/nashorn/test/script/basic/sealfreeze.js.EXPECTED
@@ -0,0 +1,10 @@
+sealed? false
+frozen? false
+sealed? true
+deleted num? false
+num = 2.718281828459045
+assign PI to num
+num = 3.141592653589793
+frozen? true
+assign 1729 to num
+num = 3.141592653589793
diff --git a/nashorn/test/script/basic/setlength.js b/nashorn/test/script/basic/setlength.js
new file mode 100644
index 00000000000..061dfe3bd0a
--- /dev/null
+++ b/nashorn/test/script/basic/setlength.js
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Test set array length.
+ *
+ * @test
+ * @run
+ */
+ 
+var a = ["a", "b", "c", "d", "e"];
+print(a.length);
+print(a);
+a.length = 2;
+print(a.length);
+print(a);
+a.length = 10;
+print(a.length);
+print(a);
+a.length = 4;
+print(a.length);
+print(a);
+a.length = 8;
+print(a.length);
+print(a);
diff --git a/nashorn/test/script/basic/setlength.js.EXPECTED b/nashorn/test/script/basic/setlength.js.EXPECTED
new file mode 100644
index 00000000000..a2d58514483
--- /dev/null
+++ b/nashorn/test/script/basic/setlength.js.EXPECTED
@@ -0,0 +1,10 @@
+5
+a,b,c,d,e
+2
+a,b
+10
+a,b,,,,,,,,
+4
+a,b,,
+8
+a,b,,,,,,
diff --git a/nashorn/test/script/basic/stdin.js b/nashorn/test/script/basic/stdin.js
new file mode 100644
index 00000000000..927b015572e
--- /dev/null
+++ b/nashorn/test/script/basic/stdin.js
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Tests access to System.in
+ *
+ * @test
+ * @run
+ */
+
+print(java.lang.System.in.class.name);
+var prop = "in";
+print(java.lang.System[prop].class.name);
+print(java.lang.System["in"].class.name);
+
diff --git a/nashorn/test/script/basic/stdin.js.EXPECTED b/nashorn/test/script/basic/stdin.js.EXPECTED
new file mode 100644
index 00000000000..c6016a6444d
--- /dev/null
+++ b/nashorn/test/script/basic/stdin.js.EXPECTED
@@ -0,0 +1,3 @@
+java.io.BufferedInputStream
+java.io.BufferedInputStream
+java.io.BufferedInputStream
diff --git a/nashorn/test/script/basic/strings.js b/nashorn/test/script/basic/strings.js
new file mode 100644
index 00000000000..61b0e6d1a53
--- /dev/null
+++ b/nashorn/test/script/basic/strings.js
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Basic String constructor tests.
+ *
+ * @test
+ * @run
+ */
+
+var s = new String("javascript");
+print(s.length);
+
+// construct from char codes
+print("fromCharCode.length = " + String.fromCharCode.length);
+var x = String.fromCharCode(65, 66, 67, 68);
+print(x);
+
+// print(String.prototype.concat);
+print("concat.length = " + String.prototype.concat.length);
+print(s.concat(" is great!"));
+
+print("slice.length = " + String.prototype.slice.length);
+print("hello world".slice(-6));
+print("hello world".slice(7, 10));
+
+print("substring.length = " + String.prototype.substring.length);
+print(s.substring(0, 4));
+print(s.substring(4));
+print(s.substring(10, 4));
+
+print("toLowerCase.length = " + String.prototype.toLowerCase.length);
+print("JAVA".toLowerCase());
+print("JAVA".toLocaleLowerCase());
+print("toUpperCase.length = " + String.prototype.toUpperCase.length);
+print("javascript".toUpperCase());
+print("javascript".toLocaleUpperCase());
+
+print("localeCompare.length = " + String.prototype.localeCompare.length);
+print("java".localeCompare("JAVA"));
+print("java".localeCompare("java"));
+
+print("trim.length = " + String.prototype.trim.length);
+print(" java ".trim());
+print("java".trim());
+
+print("hello".indexOf("l"));
+print("hello".lastIndexOf("l"));
+
+// we can call java.lang.String methods on JS Strings.
+
+print("hello".endsWith("lo"));
+print("hello".startsWith("hell"));
+print("hello".startsWith("lo"));
+print("hello".endsWith("hell"));
+
+// we can access string's characters with array-like indexing..
+
+print("hello"[0]);
+print("hello"[2]);
+print("hello"[100]);  // undefined
+
+print('foo' === 'foo');
+print('foo' !== 'foo');
+print('' === '');
+print('' !== '');
+
diff --git a/nashorn/test/script/basic/strings.js.EXPECTED b/nashorn/test/script/basic/strings.js.EXPECTED
new file mode 100644
index 00000000000..f22d4ba1466
--- /dev/null
+++ b/nashorn/test/script/basic/strings.js.EXPECTED
@@ -0,0 +1,37 @@
+10
+fromCharCode.length = 1
+ABCD
+concat.length = 1
+javascript is great!
+slice.length = 2
+ world
+orl
+substring.length = 2
+java
+script
+script
+toLowerCase.length = 0
+java
+java
+toUpperCase.length = 0
+JAVASCRIPT
+JAVASCRIPT
+localeCompare.length = 1
+-1
+0
+trim.length = 0
+java
+java
+2
+3
+true
+true
+false
+false
+h
+l
+undefined
+true
+false
+true
+false
diff --git a/nashorn/test/script/basic/throws.js b/nashorn/test/script/basic/throws.js
new file mode 100644
index 00000000000..ab1ddc5c049
--- /dev/null
+++ b/nashorn/test/script/basic/throws.js
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Verify that throws is not a reserved keyword
+ *
+ * @test
+ * @run
+ */
+
+var throws = function() { print('i throw'); }
+throws();
+
diff --git a/nashorn/test/script/basic/throws.js.EXPECTED b/nashorn/test/script/basic/throws.js.EXPECTED
new file mode 100644
index 00000000000..634ee9f54ee
--- /dev/null
+++ b/nashorn/test/script/basic/throws.js.EXPECTED
@@ -0,0 +1 @@
+i throw
diff --git a/nashorn/test/script/basic/tosource.js b/nashorn/test/script/basic/tosource.js
new file mode 100644
index 00000000000..273300557ce
--- /dev/null
+++ b/nashorn/test/script/basic/tosource.js
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Test Function.prototype.toSource.
+ *
+ * @test
+ * @run
+ */
+
+function func() {
+    print("hello world");
+}
+
+print(func.toSource());
+
+var obj = { run: function() { print("run"); } };
+print(obj.run.toSource());
diff --git a/nashorn/test/script/basic/tosource.js.EXPECTED b/nashorn/test/script/basic/tosource.js.EXPECTED
new file mode 100644
index 00000000000..609305c25bd
--- /dev/null
+++ b/nashorn/test/script/basic/tosource.js.EXPECTED
@@ -0,0 +1,4 @@
+function func() {
+    print("hello world");
+}
+function() { print("run"); }
diff --git a/nashorn/test/script/basic/tostring.js b/nashorn/test/script/basic/tostring.js
new file mode 100644
index 00000000000..3ccddf88d29
--- /dev/null
+++ b/nashorn/test/script/basic/tostring.js
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Make sure that then internal ToString procedure works as expected.
+ *
+ * @test
+ * @run
+ */
+
+function show(obj) {
+    print(typeof(obj) + ", " + obj);
+}
+
+var obj = {};
+show(obj);
+obj = new Boolean(false);
+show(obj);
+obj = new Number(Math.PI);
+show(obj);
+obj = new String("hello");
+show(obj);
+obj = java.util;
+show(obj);
+obj = java.util.Map;
+show(obj);
+// For java objects, java.lang.Object.toString is called.
+obj = new java.util.HashMap();
+// should print "{}" for empty map
+show(obj);
+// should print "[]" for empty list
+obj = new java.util.ArrayList();
+show(obj);
diff --git a/nashorn/test/script/basic/tostring.js.EXPECTED b/nashorn/test/script/basic/tostring.js.EXPECTED
new file mode 100644
index 00000000000..9a11e6fb783
--- /dev/null
+++ b/nashorn/test/script/basic/tostring.js.EXPECTED
@@ -0,0 +1,8 @@
+object, [object Object]
+object, false
+object, 3.141592653589793
+object, hello
+object, [object JavaPackage]
+function, [JavaClass java.util.Map]
+object, {}
+object, []
diff --git a/nashorn/test/script/basic/try.js b/nashorn/test/script/basic/try.js
new file mode 100644
index 00000000000..78282075d0a
--- /dev/null
+++ b/nashorn/test/script/basic/try.js
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Try throw test.
+ *
+ * @test
+ * @run 
+ */
+
+function A() {
+    print("before try");
+    
+    try {
+        print("before throw");
+        throw "a string";
+    } catch (ex) {
+        print("catch");
+        print(ex);
+        return "correct";
+    } finally {
+        print("finally");
+    }
+    
+    return "incorrect";
+}
+
+print(A());
+
+print("done");
diff --git a/nashorn/test/script/basic/try.js.EXPECTED b/nashorn/test/script/basic/try.js.EXPECTED
new file mode 100644
index 00000000000..9761ef6cafc
--- /dev/null
+++ b/nashorn/test/script/basic/try.js.EXPECTED
@@ -0,0 +1,7 @@
+before try
+before throw
+catch
+a string
+finally
+correct
+done
diff --git a/nashorn/test/script/basic/trybreakcont.js b/nashorn/test/script/basic/trybreakcont.js
new file mode 100644
index 00000000000..0c22f714e40
--- /dev/null
+++ b/nashorn/test/script/basic/trybreakcont.js
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * This results VerifyError: Stack map does not match the one at exception handler.
+ *
+ * @test
+ * @run
+ */
+
+for (var i = 0; i < 3; i++) {
+    print(i);
+    i++;
+    try {
+        break;
+    } finally {
+        continue;
+    }
+}
diff --git a/nashorn/test/script/basic/trybreakcont.js.EXPECTED b/nashorn/test/script/basic/trybreakcont.js.EXPECTED
new file mode 100644
index 00000000000..a9772a02136
--- /dev/null
+++ b/nashorn/test/script/basic/trybreakcont.js.EXPECTED
@@ -0,0 +1,2 @@
+0
+2
diff --git a/nashorn/test/script/basic/trycatch.js b/nashorn/test/script/basic/trycatch.js
new file mode 100644
index 00000000000..77d77c8ec26
--- /dev/null
+++ b/nashorn/test/script/basic/trycatch.js
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * try catch test.
+ *
+ * @test
+ * @run 
+ */
+
+var actual = '';
+var expect = '';
+
+test();
+
+function test() {
+    expect = true;
+    
+    try {
+        actual = true;
+    }
+    catch(ex) {
+        actual = ex + '';
+    }
+    
+    print(actual);
+}
diff --git a/nashorn/test/script/basic/trycatch.js.EXPECTED b/nashorn/test/script/basic/trycatch.js.EXPECTED
new file mode 100644
index 00000000000..27ba77ddaf6
--- /dev/null
+++ b/nashorn/test/script/basic/trycatch.js.EXPECTED
@@ -0,0 +1 @@
+true
diff --git a/nashorn/test/script/basic/trycatchfor.js b/nashorn/test/script/basic/trycatchfor.js
new file mode 100644
index 00000000000..a9ce56dab6c
--- /dev/null
+++ b/nashorn/test/script/basic/trycatchfor.js
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * This crashes with VerifyError: Instruction type does not match stack map.
+ *
+ * @test
+ * @run
+ */
+
+try {
+    for(var i =0; i < 10; i++) {
+    } 
+} catch (e) {
+}
+
+print("done");
diff --git a/nashorn/test/script/basic/trycatchfor.js.EXPECTED b/nashorn/test/script/basic/trycatchfor.js.EXPECTED
new file mode 100644
index 00000000000..19f86f493ab
--- /dev/null
+++ b/nashorn/test/script/basic/trycatchfor.js.EXPECTED
@@ -0,0 +1 @@
+done
diff --git a/nashorn/test/script/basic/tryfinallyreturn.js b/nashorn/test/script/basic/tryfinallyreturn.js
new file mode 100644
index 00000000000..2560bc36f38
--- /dev/null
+++ b/nashorn/test/script/basic/tryfinallyreturn.js
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * This results in VerifierError: Bad local variable type.
+ *
+ * @test
+ * @run
+ */
+
+function func() {
+    var x = 1;
+    try {
+        return x;
+    } catch(e) {
+        print(e);
+    } finally {
+        return x;
+    }
+}
+
+print(func());
+print("done");
+
diff --git a/nashorn/test/script/basic/tryfinallyreturn.js.EXPECTED b/nashorn/test/script/basic/tryfinallyreturn.js.EXPECTED
new file mode 100644
index 00000000000..3e50f7e89d6
--- /dev/null
+++ b/nashorn/test/script/basic/tryfinallyreturn.js.EXPECTED
@@ -0,0 +1,2 @@
+1
+done
diff --git a/nashorn/test/script/basic/tryforbreak.js b/nashorn/test/script/basic/tryforbreak.js
new file mode 100644
index 00000000000..c19dbe45fe6
--- /dev/null
+++ b/nashorn/test/script/basic/tryforbreak.js
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * This results in VerifyError: Inconsistent stackmap frames at branch target.
+ *
+ * @test
+ * @run
+ */
+
+try {
+    for(i = 0; i < 3; i++) {
+        break;
+    };	
+} catch (e) {	
+}
+
+print("done");
diff --git a/nashorn/test/script/basic/tryforbreak.js.EXPECTED b/nashorn/test/script/basic/tryforbreak.js.EXPECTED
new file mode 100644
index 00000000000..19f86f493ab
--- /dev/null
+++ b/nashorn/test/script/basic/tryforbreak.js.EXPECTED
@@ -0,0 +1 @@
+done
diff --git a/nashorn/test/script/basic/typechange.js b/nashorn/test/script/basic/typechange.js
new file mode 100644
index 00000000000..cbc5e537334
--- /dev/null
+++ b/nashorn/test/script/basic/typechange.js
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * This test crashes with VerifyError (bad type on stack).
+ * 
+ * @test
+ * @run
+ */
+
+x = 1;
+x = new Number(1);
+print(x);
diff --git a/nashorn/test/script/basic/typechange.js.EXPECTED b/nashorn/test/script/basic/typechange.js.EXPECTED
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/nashorn/test/script/basic/typechange.js.EXPECTED
@@ -0,0 +1 @@
+1
diff --git a/nashorn/test/script/basic/typeof.js b/nashorn/test/script/basic/typeof.js
new file mode 100644
index 00000000000..a2660643865
--- /dev/null
+++ b/nashorn/test/script/basic/typeof.js
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Typeof test.
+ *
+ * @test
+ * @run 
+ */
+
+var x = { a: 1, b: "string", c: [1, 2, 3], d: function() {} };
+
+var MyObject = function() {
+    this.a = 10;
+}
+
+var y = new MyObject();
+
+print(typeof x);
+print(typeof x.a);
+print(typeof x.b);
+print(typeof x.c);
+print(typeof x.d);
+print(typeof x.e);
+print(typeof y);
+
+
diff --git a/nashorn/test/script/basic/typeof.js.EXPECTED b/nashorn/test/script/basic/typeof.js.EXPECTED
new file mode 100644
index 00000000000..20281375ad1
--- /dev/null
+++ b/nashorn/test/script/basic/typeof.js.EXPECTED
@@ -0,0 +1,7 @@
+object
+number
+string
+object
+function
+undefined
+object
diff --git a/nashorn/test/script/basic/typeof2.js b/nashorn/test/script/basic/typeof2.js
new file mode 100644
index 00000000000..65e9df2bf43
--- /dev/null
+++ b/nashorn/test/script/basic/typeof2.js
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * typeof second round.
+ *
+ * @test
+ * @run
+ */
+
+var o = {a: 10, b: 20, c: 30};
+var p = "string";
+
+print(typeof undefined);
+print(typeof true);
+print(typeof 10.0);
+print(typeof "string");
+print(typeof o);
+print(typeof [1, 2, 3]);
+print(typeof o.a);
+print(typeof p);
+print(typeof o.d);
+print(typeof o["d"]);
+print(typeof this["q"]);
+print(typeof this.q);
diff --git a/nashorn/test/script/basic/typeof2.js.EXPECTED b/nashorn/test/script/basic/typeof2.js.EXPECTED
new file mode 100644
index 00000000000..3294b365411
--- /dev/null
+++ b/nashorn/test/script/basic/typeof2.js.EXPECTED
@@ -0,0 +1,12 @@
+undefined
+boolean
+number
+string
+object
+object
+number
+string
+undefined
+undefined
+undefined
+undefined
diff --git a/nashorn/test/script/basic/undefined.js b/nashorn/test/script/basic/undefined.js
new file mode 100644
index 00000000000..9306c520152
--- /dev/null
+++ b/nashorn/test/script/basic/undefined.js
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Check that trying to operate on results in exception.
+ *
+ * @test
+ * @run
+ */
+
+var x;
+
+print("x undefined? " + (x === undefined));
+
+try {
+    print(x.foo);
+} catch (e) {
+    print(e);
+}
+
+try {
+    x.bar = 34;
+} catch (e) {
+    print(e);
+}
+
+try {
+    print(x[1]);
+} catch (e) {
+    print(e);
+}
+
+try {
+    x[0] = 12;
+} catch (e) {
+    print(e);
+}
+
+try {
+    x.func();
+} catch(e) {
+    print(e);
+}
+
+try {
+    delete x[0];
+} catch (e) {
+    print(e);
+}
+
+try {
+    delete x.foo;
+} catch (e) {
+    print(e);
+}
+
+try {
+    print(Object.getPrototypeOf(x));
+} catch (e) {
+    print(e);
+}
+
+// iteration should be empty
+for (y in x) {
+    print(y);
+}
+
+try {
+    with (x) {
+        print(foo);
+    }
+} catch (e) {
+    print(e);
+}
diff --git a/nashorn/test/script/basic/undefined.js.EXPECTED b/nashorn/test/script/basic/undefined.js.EXPECTED
new file mode 100644
index 00000000000..4bfd3e80acc
--- /dev/null
+++ b/nashorn/test/script/basic/undefined.js.EXPECTED
@@ -0,0 +1,10 @@
+x undefined? true
+TypeError: Cannot read property "foo" from undefined
+TypeError: Cannot set property "bar" of undefined
+TypeError: Cannot read property "1" from undefined
+TypeError: Cannot set property "0" of undefined
+TypeError: Cannot read property "func" from undefined
+TypeError: Cannot delete property "0" of undefined
+TypeError: Cannot delete property "foo" of undefined
+TypeError: undefined is not an Object
+TypeError: Cannot apply "with" to undefined
diff --git a/nashorn/test/script/basic/underscore.js b/nashorn/test/script/basic/underscore.js
new file mode 100644
index 00000000000..71d8beb446b
--- /dev/null
+++ b/nashorn/test/script/basic/underscore.js
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-466 : corpus parse test for underscore
+ * 
+ * @test
+ * @runif external.underscore
+ */
+
+try {
+    var file = __DIR__ + '../external/underscore/underscore.js';
+    load(__DIR__ + '../external/underscore/underscore.js');
+    print("parsed and compiled ok");
+} catch (e) {
+    print("error: " + e);
+}
diff --git a/nashorn/test/script/basic/underscore.js.EXPECTED b/nashorn/test/script/basic/underscore.js.EXPECTED
new file mode 100644
index 00000000000..9ae0d06b995
--- /dev/null
+++ b/nashorn/test/script/basic/underscore.js.EXPECTED
@@ -0,0 +1 @@
+parsed and compiled ok
diff --git a/nashorn/test/script/basic/varargs.js b/nashorn/test/script/basic/varargs.js
new file mode 100644
index 00000000000..09babed4484
--- /dev/null
+++ b/nashorn/test/script/basic/varargs.js
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Var args test.
+ *
+ * @test
+ * @run 
+ */
+function varFunc(a, b, c) {
+    print(a, b, c);
+    print(Object.getPrototypeOf(arguments) === Object.prototype);
+    print(arguments[0], arguments[1], arguments[2]);
+
+    for (var i in arguments) {
+        print(arguments[i]);
+    }
+
+    print(arguments.callee);
+}
+
+function myFunc(a, b, c) {
+    print(a, b, c);
+}
+
+print("aaaa", "bbbb", "cccc");
+print("aaaa", "bbbb");
+print("aaaa", "bbbb", "cccc", "dddd");
+
+myFunc("aaaa", "bbbb", "cccc");
+myFunc("aaaa", "bbbb");
+myFunc("aaaa", "bbbb", "cccc", "dddd");
+
+varFunc("aaaa", "bbbb", "cccc");
+varFunc("aaaa", "bbbb");
+varFunc("aaaa", "bbbb", "cccc", "dddd");
diff --git a/nashorn/test/script/basic/varargs.js.EXPECTED b/nashorn/test/script/basic/varargs.js.EXPECTED
new file mode 100644
index 00000000000..08c4fdc88e1
--- /dev/null
+++ b/nashorn/test/script/basic/varargs.js.EXPECTED
@@ -0,0 +1,57 @@
+aaaa bbbb cccc
+aaaa bbbb
+aaaa bbbb cccc dddd
+aaaa bbbb cccc
+aaaa bbbb undefined
+aaaa bbbb cccc
+aaaa bbbb cccc
+true
+aaaa bbbb cccc
+aaaa
+bbbb
+cccc
+function varFunc(a, b, c) {
+    print(a, b, c);
+    print(Object.getPrototypeOf(arguments) === Object.prototype);
+    print(arguments[0], arguments[1], arguments[2]);
+
+    for (var i in arguments) {
+        print(arguments[i]);
+    }
+
+    print(arguments.callee);
+}
+aaaa bbbb undefined
+true
+aaaa bbbb undefined
+aaaa
+bbbb
+function varFunc(a, b, c) {
+    print(a, b, c);
+    print(Object.getPrototypeOf(arguments) === Object.prototype);
+    print(arguments[0], arguments[1], arguments[2]);
+
+    for (var i in arguments) {
+        print(arguments[i]);
+    }
+
+    print(arguments.callee);
+}
+aaaa bbbb cccc
+true
+aaaa bbbb cccc
+aaaa
+bbbb
+cccc
+dddd
+function varFunc(a, b, c) {
+    print(a, b, c);
+    print(Object.getPrototypeOf(arguments) === Object.prototype);
+    print(arguments[0], arguments[1], arguments[2]);
+
+    for (var i in arguments) {
+        print(arguments[i]);
+    }
+
+    print(arguments.callee);
+}
diff --git a/nashorn/test/script/basic/void.js b/nashorn/test/script/basic/void.js
new file mode 100644
index 00000000000..e12d4f42229
--- /dev/null
+++ b/nashorn/test/script/basic/void.js
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Checks with void.
+ *
+ * @test
+ * @run
+ */
+
+print(void 0);
+print(void 0/0);
+print(void 123);
+print(void "string");
+print(void null);
+
+print(typeof(void 0));
+print(3 == void 0);
+var x = (33 == void 0);
+print(x);
+
diff --git a/nashorn/test/script/basic/void.js.EXPECTED b/nashorn/test/script/basic/void.js.EXPECTED
new file mode 100644
index 00000000000..bc27faf1f07
--- /dev/null
+++ b/nashorn/test/script/basic/void.js.EXPECTED
@@ -0,0 +1,8 @@
+undefined
+NaN
+undefined
+undefined
+undefined
+undefined
+false
+false
\ No newline at end of file
diff --git a/nashorn/test/script/basic/with.js b/nashorn/test/script/basic/with.js
new file mode 100644
index 00000000000..41c29b1cc2b
--- /dev/null
+++ b/nashorn/test/script/basic/with.js
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * With test.
+ *
+ * @test
+ * @run 
+ */
+
+var x = {a: 10, b: 20, c: 30};
+
+var b = "here";
+
+print(b);
+print(x.b);
+
+with (x) {
+    print(b);
+    print(x.b);
+    
+    b = false;
+    
+    print(b);
+    print(x.b);
+    
+    y = 200;
+}
+
+print(b);
+print(x.b);
+
+for (i in x) print(i, x[i]);
+
+var obj = { 
+    __noSuchProperty__: function(name) {
+        return name.toUpperCase();
+    }   
+};
+
+with(obj) {
+  print(foo);
+  print(bar);
+}
diff --git a/nashorn/test/script/basic/with.js.EXPECTED b/nashorn/test/script/basic/with.js.EXPECTED
new file mode 100644
index 00000000000..8f14f312e4d
--- /dev/null
+++ b/nashorn/test/script/basic/with.js.EXPECTED
@@ -0,0 +1,13 @@
+here
+20
+20
+20
+false
+false
+here
+false
+a 10
+b false
+c 30
+FOO
+BAR
diff --git a/nashorn/test/script/basic/withprimitive.js b/nashorn/test/script/basic/withprimitive.js
new file mode 100644
index 00000000000..64ea2c45d9b
--- /dev/null
+++ b/nashorn/test/script/basic/withprimitive.js
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Using "with" statement with primitive typed value as scope object.
+ * Results in VerifyError: Bad type on operand stack.
+ * 
+ * @test
+ * @run
+ */
+
+var obj = 2;
+
+with (obj) {
+   foo = 42;
+}
+
+print(foo);
diff --git a/nashorn/test/script/basic/withprimitive.js.EXPECTED b/nashorn/test/script/basic/withprimitive.js.EXPECTED
new file mode 100644
index 00000000000..d81cc0710eb
--- /dev/null
+++ b/nashorn/test/script/basic/withprimitive.js.EXPECTED
@@ -0,0 +1 @@
+42
diff --git a/nashorn/test/script/basic/writable_relink.js b/nashorn/test/script/basic/writable_relink.js
new file mode 100644
index 00000000000..3bbbbb7c946
--- /dev/null
+++ b/nashorn/test/script/basic/writable_relink.js
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Check relinking after making property to be non-writable.
+ *
+ * @test
+ * @run
+ */
+
+var obj = { namex: 120 };
+
+for (i=0; i < 4; i++) {
+    obj.namex = "xxx " + i;
+    // should print the same value -
+    // as subsequent writes are ignored.
+    print(obj.namex);
+    Object.defineProperty(obj, "namex",
+        { writable: false });
+}
+
diff --git a/nashorn/test/script/basic/writable_relink.js.EXPECTED b/nashorn/test/script/basic/writable_relink.js.EXPECTED
new file mode 100644
index 00000000000..3f2afacd443
--- /dev/null
+++ b/nashorn/test/script/basic/writable_relink.js.EXPECTED
@@ -0,0 +1,4 @@
+xxx 0
+xxx 0
+xxx 0
+xxx 0
diff --git a/nashorn/test/script/basic/xmlStrings.js.EXPECTED b/nashorn/test/script/basic/xmlStrings.js.EXPECTED
new file mode 100644
index 00000000000..b17b1da0d1b
--- /dev/null
+++ b/nashorn/test/script/basic/xmlStrings.js.EXPECTED
@@ -0,0 +1,23 @@
+<empty/>
+[#document: null]
+<empty/>
+true
+empty
+empty
+
+foo
+2
+v1
+v2
+some text
+true
+<foo a1="v1" a2="v2">some text</foo>
+
+namespace
+default.namespace
+ns:child
+ns
+other.namespace
+ns:type
+ns
+other.namespace
diff --git a/nashorn/test/script/basic/xorassign.js b/nashorn/test/script/basic/xorassign.js
new file mode 100644
index 00000000000..48dba0d248b
--- /dev/null
+++ b/nashorn/test/script/basic/xorassign.js
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * The following crashes with VerifyError. 
+ *
+ * @test
+ * @run
+ */
+
+try {
+    var z = (x ^= 1);
+    print(z);
+} catch (e) {
+    print("x not defined, error expected");
+}
+
diff --git a/nashorn/test/script/basic/xorassign.js.EXPECTED b/nashorn/test/script/basic/xorassign.js.EXPECTED
new file mode 100644
index 00000000000..1bd45711afb
--- /dev/null
+++ b/nashorn/test/script/basic/xorassign.js.EXPECTED
@@ -0,0 +1 @@
+x not defined, error expected
diff --git a/nashorn/test/script/basic/yui.js b/nashorn/test/script/basic/yui.js
new file mode 100644
index 00000000000..eb9a70363c0
--- /dev/null
+++ b/nashorn/test/script/basic/yui.js
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-469 : corpus parse test for yahoo ui library / yahoo ui library min
+ * 
+ * @test
+ * @runif external.yui
+ */
+
+var names = [ "yui-min.js", "yui.js" ];
+
+for each (name in names) { 
+    try {
+	try {
+            var file = __DIR__ + "../external/yui/" + name;
+	    load(__DIR__ + "../external/yui/" + name);
+	} catch (e) { 
+	    print(e);
+	}
+    } catch (e) {
+	print("error: " + e);
+    }
+    print("parsed and compiled ok " + name);
+}
diff --git a/nashorn/test/script/basic/yui.js.EXPECTED b/nashorn/test/script/basic/yui.js.EXPECTED
new file mode 100644
index 00000000000..28dd1b9d2c0
--- /dev/null
+++ b/nashorn/test/script/basic/yui.js.EXPECTED
@@ -0,0 +1,2 @@
+parsed and compiled ok yui-min.js
+parsed and compiled ok yui.js
diff --git a/nashorn/test/script/error/NASHORN-154/README b/nashorn/test/script/error/NASHORN-154/README
new file mode 100644
index 00000000000..06f503d0985
--- /dev/null
+++ b/nashorn/test/script/error/NASHORN-154/README
@@ -0,0 +1,6 @@
+Section 16 of ECMAScript 5.1 spec details a set of "early errors". Early
+errors should be reported before running any line of the script containing
+such error(s). Examples include syntax error, errors in regexp literals etc.
+This directory contains tests to check early errors are reported as early
+errors. Each test starts with a print call -- the output from print should 
+not be seen in expected output. If seen, early errors are reported late.
diff --git a/nashorn/test/script/error/NASHORN-154/function_mult_params_in_strict.js b/nashorn/test/script/error/NASHORN-154/function_mult_params_in_strict.js
new file mode 100644
index 00000000000..c5fdac2b2ac
--- /dev/null
+++ b/nashorn/test/script/error/NASHORN-154/function_mult_params_in_strict.js
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Early error reporting.
+ *
+ * The occurrence of an Identifier value appearing more than once within a 
+ * FormalParameterList of an individual strict mode FunctionDeclaration or 
+ * FunctionExpression
+ *
+ * @test/compile-error
+ */
+
+'use strict';
+
+print(__FILE__ + " @" + __LINE__);
+
+function func(x, x) {}
diff --git a/nashorn/test/script/error/NASHORN-154/function_mult_params_in_strict.js.EXPECTED b/nashorn/test/script/error/NASHORN-154/function_mult_params_in_strict.js.EXPECTED
new file mode 100644
index 00000000000..bda3808e6ca
--- /dev/null
+++ b/nashorn/test/script/error/NASHORN-154/function_mult_params_in_strict.js.EXPECTED
@@ -0,0 +1,3 @@
+test/script/error/NASHORN-154/function_mult_params_in_strict.js:38:14 strict mode function cannot have duplicate parameter name "x"
+function func(x, x) {}
+              ^
diff --git a/nashorn/test/script/error/NASHORN-154/improper_return_break_continue.js b/nashorn/test/script/error/NASHORN-154/improper_return_break_continue.js
new file mode 100644
index 00000000000..183cf93ab87
--- /dev/null
+++ b/nashorn/test/script/error/NASHORN-154/improper_return_break_continue.js
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Early error reporting.
+ *
+ * Improper uses of return, break, and continue
+ *
+ * @test/compile-error
+ */
+
+print(__FILE__ + " @" + __LINE__);
+
+return 33;
+
+continue;
+break;
+
+continue nonExist;
+break nonExist;
diff --git a/nashorn/test/script/error/NASHORN-154/improper_return_break_continue.js.EXPECTED b/nashorn/test/script/error/NASHORN-154/improper_return_break_continue.js.EXPECTED
new file mode 100644
index 00000000000..ffccb5d20cc
--- /dev/null
+++ b/nashorn/test/script/error/NASHORN-154/improper_return_break_continue.js.EXPECTED
@@ -0,0 +1,15 @@
+test/script/error/NASHORN-154/improper_return_break_continue.js:34:0 Invalid return statement
+return 33;
+^
+test/script/error/NASHORN-154/improper_return_break_continue.js:36:0 Illegal continue statement
+continue;
+^
+test/script/error/NASHORN-154/improper_return_break_continue.js:37:0 Illegal break statement
+break;
+^
+test/script/error/NASHORN-154/improper_return_break_continue.js:39:9 Undefined Label "nonExist"
+continue nonExist;
+         ^
+test/script/error/NASHORN-154/improper_return_break_continue.js:40:6 Undefined Label "nonExist"
+break nonExist;
+      ^
diff --git a/nashorn/test/script/error/NASHORN-154/invalid_lvalue.js b/nashorn/test/script/error/NASHORN-154/invalid_lvalue.js
new file mode 100644
index 00000000000..02ff5598a59
--- /dev/null
+++ b/nashorn/test/script/error/NASHORN-154/invalid_lvalue.js
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Early error reporting.
+ *
+ * Attempts to call PutValue on any value for which an early determination can 
+ * be made that the value is not a Reference (for example, executing the 
+ * assignment statement 3=4).
+ *
+ * @test/compile-error
+ */
+
+print(__FILE__ + " @" + __LINE__);
+
+3 = 4;
+2 + 44 = 3;
+x * y = 33;
+x / y = 23;
+x++ /= 33
+--y *= 3;
+
diff --git a/nashorn/test/script/error/NASHORN-154/invalid_lvalue.js.EXPECTED b/nashorn/test/script/error/NASHORN-154/invalid_lvalue.js.EXPECTED
new file mode 100644
index 00000000000..7532fe00af0
--- /dev/null
+++ b/nashorn/test/script/error/NASHORN-154/invalid_lvalue.js.EXPECTED
@@ -0,0 +1,15 @@
+test/script/error/NASHORN-154/invalid_lvalue.js:36:0 Invalid left hand side for assignment
+3 = 4;
+^
+test/script/error/NASHORN-154/invalid_lvalue.js:37:2 Invalid left hand side for assignment
+2 + 44 = 3;
+  ^
+test/script/error/NASHORN-154/invalid_lvalue.js:38:2 Invalid left hand side for assignment
+x * y = 33;
+  ^
+test/script/error/NASHORN-154/invalid_lvalue.js:39:2 Invalid left hand side for assignment
+x / y = 23;
+  ^
+test/script/error/NASHORN-154/invalid_lvalue.js:40:1 Invalid left hand side for assignment
+x++ /= 33
+ ^
diff --git a/nashorn/test/script/error/NASHORN-154/literal_data_and_accessor.js b/nashorn/test/script/error/NASHORN-154/literal_data_and_accessor.js
new file mode 100644
index 00000000000..46ed88ee3dc
--- /dev/null
+++ b/nashorn/test/script/error/NASHORN-154/literal_data_and_accessor.js
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Early error reporting.
+ *
+ * Attempts to define an ObjectLiteral that has both a data property assignment and a get or set property assignment with the same name.
+ *
+ * @test/compile-error
+ */
+
+print(__FILE__ + " @" + __LINE__);
+
+// should result in early error - foo as data and accessor property
+var obj = { foo: 42, get foo() { return 'hello' } };
+
+// should result in early error - foo as data and accessor property
+var obj2 = { foo: 42, set foo(x) { } };
diff --git a/nashorn/test/script/error/NASHORN-154/literal_data_and_accessor.js.EXPECTED b/nashorn/test/script/error/NASHORN-154/literal_data_and_accessor.js.EXPECTED
new file mode 100644
index 00000000000..05585fb9ce0
--- /dev/null
+++ b/nashorn/test/script/error/NASHORN-154/literal_data_and_accessor.js.EXPECTED
@@ -0,0 +1,6 @@
+test/script/error/NASHORN-154/literal_data_and_accessor.js:35:21 Property "foo" already defined
+var obj = { foo: 42, get foo() { return 'hello' } };
+                     ^
+test/script/error/NASHORN-154/literal_data_and_accessor.js:38:22 Property "foo" already defined
+var obj2 = { foo: 42, set foo(x) { } };
+                      ^
diff --git a/nashorn/test/script/error/NASHORN-154/literal_mult_getters.js b/nashorn/test/script/error/NASHORN-154/literal_mult_getters.js
new file mode 100644
index 00000000000..74e6554c699
--- /dev/null
+++ b/nashorn/test/script/error/NASHORN-154/literal_mult_getters.js
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Early error reporting.
+ *
+ * Attempts to define an ObjectLiteral that has multiple get property 
+ * assignments with the same name or multiple set property assignments with 
+ * the same name.
+ *
+ * @test/compile-error
+ */
+
+print(__FILE__ + " @" + __LINE__);
+
+var obj = { get foo() { return 2; }, get foo() { return 'hello'; } };
diff --git a/nashorn/test/script/error/NASHORN-154/literal_mult_getters.js.EXPECTED b/nashorn/test/script/error/NASHORN-154/literal_mult_getters.js.EXPECTED
new file mode 100644
index 00000000000..7031c69679b
--- /dev/null
+++ b/nashorn/test/script/error/NASHORN-154/literal_mult_getters.js.EXPECTED
@@ -0,0 +1,3 @@
+test/script/error/NASHORN-154/literal_mult_getters.js:36:37 Property "foo" already defined
+var obj = { get foo() { return 2; }, get foo() { return 'hello'; } };
+                                     ^
diff --git a/nashorn/test/script/error/NASHORN-154/literal_mult_prop_in_strict.js b/nashorn/test/script/error/NASHORN-154/literal_mult_prop_in_strict.js
new file mode 100644
index 00000000000..c520be17a7b
--- /dev/null
+++ b/nashorn/test/script/error/NASHORN-154/literal_mult_prop_in_strict.js
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Early error reporting.
+ *
+ * Attempts in strict mode code to define an ObjectLiteral that has multiple 
+ * data property assignments with the same name.
+ *
+ * @test/compile-error
+ */
+
+'use strict';
+
+print(__FILE__ + " @" + __LINE__);
+
+var obj = { foo: 42, foo: 'hello' };
diff --git a/nashorn/test/script/error/NASHORN-154/literal_mult_prop_in_strict.js.EXPECTED b/nashorn/test/script/error/NASHORN-154/literal_mult_prop_in_strict.js.EXPECTED
new file mode 100644
index 00000000000..dfb2e7bb991
--- /dev/null
+++ b/nashorn/test/script/error/NASHORN-154/literal_mult_prop_in_strict.js.EXPECTED
@@ -0,0 +1,3 @@
+test/script/error/NASHORN-154/literal_mult_prop_in_strict.js:37:21 Property "foo" already defined
+var obj = { foo: 42, foo: 'hello' };
+                     ^
diff --git a/nashorn/test/script/error/NASHORN-154/with_in_strict.js b/nashorn/test/script/error/NASHORN-154/with_in_strict.js
new file mode 100644
index 00000000000..ddbf7df2d41
--- /dev/null
+++ b/nashorn/test/script/error/NASHORN-154/with_in_strict.js
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Early error reporting.
+ *
+ * The occurrence of a WithStatement in strict mode code.
+ *
+ * @test/compile-error
+ */
+
+'use strict';
+
+print(__FILE__ + " @" + __LINE__);
+
+with({}) {
+    print("hello world");
+}
diff --git a/nashorn/test/script/error/NASHORN-154/with_in_strict.js.EXPECTED b/nashorn/test/script/error/NASHORN-154/with_in_strict.js.EXPECTED
new file mode 100644
index 00000000000..7e5103dc533
--- /dev/null
+++ b/nashorn/test/script/error/NASHORN-154/with_in_strict.js.EXPECTED
@@ -0,0 +1,9 @@
+test/script/error/NASHORN-154/with_in_strict.js:36:0 "with" statement cannot be used in strict mode
+with({}) {
+^
+test/script/error/NASHORN-154/with_in_strict.js:36:7 Expected ; but found )
+with({}) {
+       ^
+test/script/error/NASHORN-154/with_in_strict.js:38:0 Expected eof but found }
+}
+^
diff --git a/nashorn/test/script/error/NASHORN-214.js b/nashorn/test/script/error/NASHORN-214.js
new file mode 100644
index 00000000000..20fd3fb7d2d
--- /dev/null
+++ b/nashorn/test/script/error/NASHORN-214.js
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-214 :  Syntax error thrown instead of ReferenceError when LHS is not assignable
+ *
+ * @test
+ * @option --early-lvalue-error=false
+ * @run
+ */
+
+print('hello');
+try {
+    true = 334; // ReferenceError thrown when control reaches here
+} catch (e) {
+    print(e);
+}
+
+x = 'hello';
+if (typeof x === 'number') {
+    true = 44; // not reached, so no error thrown
+} else {
+    print('x is not a number');
+}
diff --git a/nashorn/test/script/error/NASHORN-214.js.EXPECTED b/nashorn/test/script/error/NASHORN-214.js.EXPECTED
new file mode 100644
index 00000000000..83503a2114f
--- /dev/null
+++ b/nashorn/test/script/error/NASHORN-214.js.EXPECTED
@@ -0,0 +1,3 @@
+hello
+ReferenceError: "true" can not be used as the left-hand side of assignment
+x is not a number
diff --git a/nashorn/test/script/error/NASHORN-35.js b/nashorn/test/script/error/NASHORN-35.js
new file mode 100644
index 00000000000..cbbd65c185e
--- /dev/null
+++ b/nashorn/test/script/error/NASHORN-35.js
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-35:  when 'new' keyword is used as LHS in an assignment, compiler crashes with NPE.
+ *
+ * @test/compile-error
+ */
+
+new = 1;
+
+
diff --git a/nashorn/test/script/error/NASHORN-35.js.EXPECTED b/nashorn/test/script/error/NASHORN-35.js.EXPECTED
new file mode 100644
index 00000000000..dca745ef110
--- /dev/null
+++ b/nashorn/test/script/error/NASHORN-35.js.EXPECTED
@@ -0,0 +1,3 @@
+test/script/error/NASHORN-35.js:30:4 Expected an operand but found =
+new = 1;
+    ^
diff --git a/nashorn/test/script/error/NASHORN-39.js b/nashorn/test/script/error/NASHORN-39.js
new file mode 100644
index 00000000000..bca5d1f894e
--- /dev/null
+++ b/nashorn/test/script/error/NASHORN-39.js
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-39 : Line terminator between throw keyword and throw expression crashes the compiler.
+ *
+ * @test/compile-error
+ */
+
+// line terminator here should result in compiler error.
+
+throw 
+  1;
diff --git a/nashorn/test/script/error/NASHORN-39.js.EXPECTED b/nashorn/test/script/error/NASHORN-39.js.EXPECTED
new file mode 100644
index 00000000000..7d68bddc4da
--- /dev/null
+++ b/nashorn/test/script/error/NASHORN-39.js.EXPECTED
@@ -0,0 +1,3 @@
+test/script/error/NASHORN-39.js:33:0 Expected an operand but found eol
+  1;
+^
diff --git a/nashorn/test/script/error/NASHORN-568.js b/nashorn/test/script/error/NASHORN-568.js
new file mode 100644
index 00000000000..aa5277c092a
--- /dev/null
+++ b/nashorn/test/script/error/NASHORN-568.js
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-568 :  Try statement without catch or finally should throw parser error
+ *
+ * @test/compile-error
+ */
+
+try { }
diff --git a/nashorn/test/script/error/NASHORN-568.js.EXPECTED b/nashorn/test/script/error/NASHORN-568.js.EXPECTED
new file mode 100644
index 00000000000..12b0adfaac2
--- /dev/null
+++ b/nashorn/test/script/error/NASHORN-568.js.EXPECTED
@@ -0,0 +1,3 @@
+test/script/error/NASHORN-568.js:30:0 Missing catch or finally after try
+try { }
+^
diff --git a/nashorn/test/script/error/NASHORN-57.js b/nashorn/test/script/error/NASHORN-57.js
new file mode 100644
index 00000000000..528af7097d3
--- /dev/null
+++ b/nashorn/test/script/error/NASHORN-57.js
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-57 : newline between operand and post decrement/increment operator results in NullPointerException.
+ *
+ * @test/compile-error
+ */
+
+
+var x = 1;
+
+// line terminator here should result in compiler error.
+x
+++;
diff --git a/nashorn/test/script/error/NASHORN-57.js.EXPECTED b/nashorn/test/script/error/NASHORN-57.js.EXPECTED
new file mode 100644
index 00000000000..5a93b597c0e
--- /dev/null
+++ b/nashorn/test/script/error/NASHORN-57.js.EXPECTED
@@ -0,0 +1,3 @@
+test/script/error/NASHORN-57.js:35:2 Expected statement but found ;
+++;
+  ^
diff --git a/nashorn/test/script/error/NASHORN-668.js b/nashorn/test/script/error/NASHORN-668.js
new file mode 100644
index 00000000000..c42cb5adc3e
--- /dev/null
+++ b/nashorn/test/script/error/NASHORN-668.js
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-668: RegExp literal errors are early errors and so should be reported before 'runtime'
+ *
+ * @test/compile-error
+ */
+
+// this should not be printed!!
+print("hello world!!");
+
+// repeated flag
+var x = /xxx/gg;
+// unsupported flag
+var y = /xxx/X;
+// dangling metachar
+var z = /2**/;
diff --git a/nashorn/test/script/error/NASHORN-668.js.EXPECTED b/nashorn/test/script/error/NASHORN-668.js.EXPECTED
new file mode 100644
index 00000000000..f381d45065a
--- /dev/null
+++ b/nashorn/test/script/error/NASHORN-668.js.EXPECTED
@@ -0,0 +1,11 @@
+test/script/error/NASHORN-668.js:34:8 Repeated RegExp flag: g
+var x = /xxx/gg;
+        ^
+test/script/error/NASHORN-668.js:36:8 Unsupported RegExp flag: X
+var y = /xxx/X;
+        ^
+test/script/error/NASHORN-668.js:38:8 Dangling meta character '*' near index 2
+2**
+  ^
+var z = /2**/;
+        ^
diff --git a/nashorn/test/script/error/quotemissing.js b/nashorn/test/script/error/quotemissing.js
new file mode 100644
index 00000000000..e9951b8e2db
--- /dev/null
+++ b/nashorn/test/script/error/quotemissing.js
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test/compile-error
+ */
+
+print("hello);
diff --git a/nashorn/test/script/error/quotemissing.js.EXPECTED b/nashorn/test/script/error/quotemissing.js.EXPECTED
new file mode 100644
index 00000000000..a9d171a453a
--- /dev/null
+++ b/nashorn/test/script/error/quotemissing.js.EXPECTED
@@ -0,0 +1,3 @@
+test/script/error/quotemissing.js:28:14 Missing close quote
+print("hello);
+              ^
diff --git a/nashorn/test/script/error/strictmode.js b/nashorn/test/script/error/strictmode.js
new file mode 100644
index 00000000000..8d33dc77050
--- /dev/null
+++ b/nashorn/test/script/error/strictmode.js
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Check that basic strict-mode working.
+ *
+ * @test
+ * @run/fail --strict-mode
+ */
+
+function func() {}
+
+// should not be able to delete non-configurable property
+delete func.length;
+
diff --git a/nashorn/test/script/error/strictmode.js.EXPECTED b/nashorn/test/script/error/strictmode.js.EXPECTED
new file mode 100644
index 00000000000..67e05c6ccb4
--- /dev/null
+++ b/nashorn/test/script/error/strictmode.js.EXPECTED
@@ -0,0 +1 @@
+TypeError: "length" is not a configurable property
diff --git a/nashorn/test/script/representations/NASHORN-592a.js b/nashorn/test/script/representations/NASHORN-592a.js
new file mode 100644
index 00000000000..8f9bfc9e578
--- /dev/null
+++ b/nashorn/test/script/representations/NASHORN-592a.js
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-592a: test all combos of field types and getters and setters
+ * This time use dual field representation
+ *
+ * @test
+ * @option --dual-fields
+ * @run
+ */
+
+//fortype undefined
+var a;
+
+print(a & 0xff);
+print(a >>> 1);
+print(a * 2);
+print(a + "hej!");
+
+var b;
+b = 17;   //set undefined->int
+
+print(b & 0xff);
+print(b >>> 1);
+print(b * 2);
+print(b + "hej!");
+
+var c;
+c = 17.4711 //set undefined->double
+
+print(c & 0xff);
+print(c >>> 1);
+print(c * 2);
+print(c + "hej!");
+
+var d; // set undefined->double
+d = "Fame and fortune Salamander Yahoo!";
+
+print(d & 0xff);
+print(d >>> 1);
+print(d * 2);
+print(d + "hej!");
+
+// now we have exhausted all getters and undefined->everything setters.
+
+
+var e = 23; // int to everything setters,
+e = 24;     //int to int
+print(e);
+e = (22222 >>> 1); //int to long;
+print(e);
+e = 23.23;  //int to double
+print(e);
+e = 23;     //double to int - still double
+print(e);
+print(e & 0xff);
+e = "Have some pie!" //double to string
+print(e);
+e = 4711.17;
+print(e); //still an object not a double
+
+
+var f = (23222 >>> 1); // long to everything setters,
+f = 34344 >>> 1;     //long to long
+print(f);
+f = 23; //long to int - still long
+print(f);
+f = 23.23;  //long to double
+print(f);
+f = 23;     //double to int - still double
+print(f);
+print(f & 0xff);
+f = "Have some pie!" //double to string
+print(f);
+f = 4711.17;
+print(f); //still an object not a double
+
+var g = 4811.16;
+g = 23; //still double
+print(g);
+g = (222 >>> 1); //still double
+print(g);
+g = 4711.16; //double->double
+print(g);
+g = "I like cake!";
+print(g);  //object to various
+print(g & 0xff);
+print(g * 2);
+print(g >>> 2);
+print(g);
+
+var h = {x:17, y:17.4711, z:"salamander"};
+print(h.x);
+print(h.y);
+print(h.z);
+h.x = 4711.17;
+h.y = "axolotl";
+h.z = "lizard";
+print(h.x);
+print(h.y);
+print(h.z);
diff --git a/nashorn/test/script/sandbox/NASHORN-525.js b/nashorn/test/script/sandbox/NASHORN-525.js
new file mode 100644
index 00000000000..a00db9d6ac3
--- /dev/null
+++ b/nashorn/test/script/sandbox/NASHORN-525.js
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-525 : nashorn misses security access checks 
+ *
+ * @test
+ * @run
+ */
+
+function check(code) {
+    try {
+        eval(code);
+        fail("SecurityException expected for : " + code);
+    } catch (e) {
+        if (! (e instanceof java.lang.SecurityException)) {
+            fail("SecurityException expected, but got " + e);
+        }
+    }
+}
+
+// if security manager is absent, pass the test vacuously.
+if (java.lang.System.getSecurityManager() != null) {
+    // try accessing class from 'sun.*' packages
+    check("Packages.sun.misc.Unsafe");
+    check("Java.type('sun.misc.Unsafe')");
+
+    // TODO this works in Java8 but not in Java8, disabling for now
+    check("java.lang.Class.forName('sun.misc.Unsafe')");
+
+    // try System.exit and System.loadLibrary
+    check("java.lang.System.exit(0)");
+    check("java.lang.System.loadLibrary('foo')");
+}
diff --git a/nashorn/test/script/sandbox/README b/nashorn/test/script/sandbox/README
new file mode 100644
index 00000000000..49806652ccf
--- /dev/null
+++ b/nashorn/test/script/sandbox/README
@@ -0,0 +1 @@
+This directory contains tests for sandbox security access checks.
diff --git a/nashorn/test/script/sandbox/classloader.js b/nashorn/test/script/sandbox/classloader.js
new file mode 100644
index 00000000000..516be7833f3
--- /dev/null
+++ b/nashorn/test/script/sandbox/classloader.js
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Try to extend ClassLoader.
+ *
+ * @test
+ * @security
+ */
+
+try {
+    var l = new (Java.extend(java.lang.ClassLoader))({});
+    fail("should have thrown SecurityException");
+} catch (e) {
+    if (e instanceof java.lang.SecurityException) {
+        print(e);
+    } else {
+        fail("expected SecurityException, got " + e);
+    }
+}
+
diff --git a/nashorn/test/script/sandbox/classloader.js.EXPECTED b/nashorn/test/script/sandbox/classloader.js.EXPECTED
new file mode 100644
index 00000000000..e08cc9f8b40
--- /dev/null
+++ b/nashorn/test/script/sandbox/classloader.js.EXPECTED
@@ -0,0 +1 @@
+java.security.AccessControlException: access denied ("java.lang.RuntimePermission" "createClassLoader")
diff --git a/nashorn/test/script/sandbox/doprivileged.js b/nashorn/test/script/sandbox/doprivileged.js
new file mode 100644
index 00000000000..c422b36df04
--- /dev/null
+++ b/nashorn/test/script/sandbox/doprivileged.js
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * doPrivileged checks.
+ *
+ * @test
+ * @security
+ */
+
+function check(e) {
+    if (e instanceof java.lang.SecurityException) {
+        print(e);
+    } else {
+        fail("expected SecurityException, got " + e);
+    }
+}
+
+var AccessController = java.security.AccessController;
+var PrivilegedAction = java.security.PrivilegedAction;
+
+AccessController.doPrivileged(new PrivilegedAction() {
+    run: function() {
+        // try something sensitive
+        try {
+            java.lang.System.exit(0);
+        } catch(e) {
+            check(e);
+        }
+
+	try {
+	    var prop = java.lang.System.getProperty("user.dir");
+            fail("can get user.dir " + prop);
+	} catch(e) {
+            print(e);
+	}
+    }
+});
diff --git a/nashorn/test/script/sandbox/doprivileged.js.EXPECTED b/nashorn/test/script/sandbox/doprivileged.js.EXPECTED
new file mode 100644
index 00000000000..0730cdd4cbd
--- /dev/null
+++ b/nashorn/test/script/sandbox/doprivileged.js.EXPECTED
@@ -0,0 +1,2 @@
+java.security.AccessControlException: access denied ("java.lang.RuntimePermission" "exitVM.0")
+java.security.AccessControlException: access denied ("java.util.PropertyPermission" "user.dir" "read")
diff --git a/nashorn/test/script/sandbox/exit.js b/nashorn/test/script/sandbox/exit.js
new file mode 100644
index 00000000000..78554ac8f20
--- /dev/null
+++ b/nashorn/test/script/sandbox/exit.js
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Try to call System.exit.
+ *
+ * @test
+ * @security
+ */
+
+function check(e) {
+    if (e instanceof java.lang.SecurityException) {
+        print(e);
+    } else {
+        fail("expected SecurityException, got " + e);
+    }
+}
+
+try {
+    java.lang.System.exit(0);
+    // will not reach here regardless of outcome..
+} catch (e) {
+    check(e);
+}
+
+print("Success, didn't exit!");
diff --git a/nashorn/test/script/sandbox/exit.js.EXPECTED b/nashorn/test/script/sandbox/exit.js.EXPECTED
new file mode 100644
index 00000000000..ef927afcfd4
--- /dev/null
+++ b/nashorn/test/script/sandbox/exit.js.EXPECTED
@@ -0,0 +1,2 @@
+java.security.AccessControlException: access denied ("java.lang.RuntimePermission" "exitVM.0")
+Success, didn't exit!
diff --git a/nashorn/test/script/sandbox/file.js b/nashorn/test/script/sandbox/file.js
new file mode 100644
index 00000000000..07a73d41bec
--- /dev/null
+++ b/nashorn/test/script/sandbox/file.js
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * try file system activities.
+ *
+ * @test
+ * @security
+ */
+
+function check(e) {
+    if (e instanceof java.lang.SecurityException) {
+        print(e);
+    } else {
+        fail("expected SecurityException, got " + e);
+    }
+}
+
+try {
+    new java.io.File(".").getCanonicalPath();
+} catch (e) {
+    check(e);
+}
+
+try {
+    new java.io.FileInputStream("foo");
+} catch (e) {
+    check(e);
+}
+
+try {
+    new java.io.FileOutputStream("foo");
+} catch (e) {
+    check(e);
+}
diff --git a/nashorn/test/script/sandbox/file.js.EXPECTED b/nashorn/test/script/sandbox/file.js.EXPECTED
new file mode 100644
index 00000000000..5a1e0e4536b
--- /dev/null
+++ b/nashorn/test/script/sandbox/file.js.EXPECTED
@@ -0,0 +1,3 @@
+java.security.AccessControlException: access denied ("java.util.PropertyPermission" "user.dir" "read")
+java.security.AccessControlException: access denied ("java.io.FilePermission" "foo" "read")
+java.security.AccessControlException: access denied ("java.io.FilePermission" "foo" "write")
diff --git a/nashorn/test/script/sandbox/javaextend.js b/nashorn/test/script/sandbox/javaextend.js
new file mode 100644
index 00000000000..3053ba3c72a
--- /dev/null
+++ b/nashorn/test/script/sandbox/javaextend.js
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @run
+ */
+
+function model(n) {
+  return Java.type("jdk.nashorn.internal.test.models." + n)
+}
+
+// Can't extend a final class  
+try {
+    Java.extend(model("FinalClass"))
+} catch(e) {
+    print(e)
+}
+
+// Can't extend a class with no public or protected constructor
+try {
+    Java.extend(model("NoAccessibleConstructorClass"))
+} catch(e) {
+    print(e)
+}
+
+// Can't extend a non-public class
+try {
+    Java.extend(model("NonPublicClass"))
+} catch(e) {
+    print(e)
+}
+
+// Make sure we can implement interfaces from the unnamed package
+var c = new (Java.extend(Java.type("UnnamedPackageTestCallback")))() { call: function(s) { return s + s } }
+print(c.call("abcd"))
+
+// Basic Runnable from an object
+new (Java.extend(java.lang.Runnable))({ run: function() { print("run-object") } }).run()
+
+// Basic Runnable from a function
+new (Java.extend(java.lang.Runnable))(function() { print("run-fn") }).run()
+
+// Basic Runnable from an autoconverted function
+var t = new java.lang.Thread(function() { print("run-fn-autoconvert") })
+t.start()
+t.join()
+
+// SAM conversion should work on overloaded methods of same name
+var os = new (Java.extend(model("OverloadedSam")))(function(s1, s2) { print("overloaded-sam: " + s1 + ", " + s2) })
+os.sam("x")
+os.sam("x", "y")
+
+// Test overriding of hashCode, equals, and toString
+var oo = Java.extend(model("OverrideObject"))
+// First, see non-overridden values
+print("oo-plain-hashCode: " + (new oo({})).hashCode())
+print("oo-plain-toString: " + (new oo({})).toString())
+print("oo-plain-equals  : " + (new oo({})).equals({}))
+// Now, override them
+print("oo-overridden-hashCode: " + (new oo({ hashCode: function() { return 6 }})).hashCode())
+print("oo-overridden-toString: " + (new oo({ toString: function() { return "override-object-overriden" }})).toString())
+print("oo-overridden-equals  : " + (new oo({ equals: function() { return true }})).equals({}))
+// Finally, test that equals and hashCode can be overridden with functions from a prototype, but toString() can't:
+function Proto() {
+    return this;
+}
+Proto.prototype = {
+    toString: function() { return "this-will-never-be-seen" }, // toString only overridden when it's own property, never from prototype
+    equals: function() { return true },
+    hashCode: function() { return 7 }
+}
+print("oo-proto-overridden-hashCode: " + (new oo(new Proto())).hashCode())
+print("oo-proto-overridden-toString: " + (new oo(new Proto())).toString())
+print("oo-proto-overridden-equals  : " + (new oo(new Proto())).equals({}))
+
+// Subclass a class with a protected constructor, and one that takes
+// additional constructor arguments (a token). Also demonstrates how can
+// you access the Java adapter instance from the script (just store it in the
+// scope, in this example, "cwa") to retrieve the token later on.
+var cwa = new (Java.extend(model("ConstructorWithArgument")))(function() { print(cwa.token) }, "cwa-token")
+cwa.doSomething()
diff --git a/nashorn/test/script/sandbox/javaextend.js.EXPECTED b/nashorn/test/script/sandbox/javaextend.js.EXPECTED
new file mode 100644
index 00000000000..2a9dac88c4a
--- /dev/null
+++ b/nashorn/test/script/sandbox/javaextend.js.EXPECTED
@@ -0,0 +1,19 @@
+TypeError: Can not extend final class jdk.nashorn.internal.test.models.FinalClass.
+TypeError: Can not extend class jdk.nashorn.internal.test.models.NoAccessibleConstructorClass as it has no public or protected constructors.
+TypeError: Can not extend/implement non-public class/interface jdk.nashorn.internal.test.models.NonPublicClass.
+abcdabcd
+run-object
+run-fn
+run-fn-autoconvert
+overloaded-sam: x, undefined
+overloaded-sam: x, y
+oo-plain-hashCode: 5
+oo-plain-toString: override-object
+oo-plain-equals  : false
+oo-overridden-hashCode: 6
+oo-overridden-toString: override-object-overriden
+oo-overridden-equals  : true
+oo-proto-overridden-hashCode: 7
+oo-proto-overridden-toString: override-object
+oo-proto-overridden-equals  : true
+cwa-token
diff --git a/nashorn/test/script/sandbox/loadLibrary.js b/nashorn/test/script/sandbox/loadLibrary.js
new file mode 100644
index 00000000000..2ea8cbcb827
--- /dev/null
+++ b/nashorn/test/script/sandbox/loadLibrary.js
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Try to call System.loadLibrary
+ *
+ * @test
+ * @security
+ */
+
+function check(e) {
+    if (! (e instanceof java.lang.SecurityException)) {
+        fail("expected SecurityException, got " + e);
+    }
+}
+
+try {
+    java.lang.System.loadLibrary("foo");
+    fail("should have thrown exception");
+} catch (e) {
+    check(e);
+}
+
diff --git a/nashorn/test/script/sandbox/net.js b/nashorn/test/script/sandbox/net.js
new file mode 100644
index 00000000000..f648b5bbefd
--- /dev/null
+++ b/nashorn/test/script/sandbox/net.js
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Try network activity.
+ *
+ * @test
+ * @security
+ */
+
+function check(e) {
+    if (e instanceof java.lang.SecurityException) {
+        print(e);
+    } else {
+        fail("expected SecurityException, got " + e);
+    }
+}
+
+try {
+    new java.net.URL("http://www.acme.com").openStream();
+} catch (e) {
+    check(e);
+}
diff --git a/nashorn/test/script/sandbox/net.js.EXPECTED b/nashorn/test/script/sandbox/net.js.EXPECTED
new file mode 100644
index 00000000000..dfa7334a771
--- /dev/null
+++ b/nashorn/test/script/sandbox/net.js.EXPECTED
@@ -0,0 +1 @@
+java.security.AccessControlException: access denied ("java.net.SocketPermission" "www.acme.com:80" "connect,resolve")
diff --git a/nashorn/test/script/sandbox/property.js b/nashorn/test/script/sandbox/property.js
new file mode 100644
index 00000000000..618ef1e9c1a
--- /dev/null
+++ b/nashorn/test/script/sandbox/property.js
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Try to read sensitive System property.
+ *
+ * @test
+ * @security
+ */
+
+function check(e) {
+    if (e instanceof java.lang.SecurityException) {
+        print(e);
+    } else {
+        fail("expected SecurityException, got " + e);
+    }
+}
+
+try {
+    var prop = java.lang.System.getProperty("user.dir");
+    fail("can read user.dir " + prop);
+} catch (e) {
+    check(e);
+}
diff --git a/nashorn/test/script/sandbox/property.js.EXPECTED b/nashorn/test/script/sandbox/property.js.EXPECTED
new file mode 100644
index 00000000000..73c67af5909
--- /dev/null
+++ b/nashorn/test/script/sandbox/property.js.EXPECTED
@@ -0,0 +1 @@
+java.security.AccessControlException: access denied ("java.util.PropertyPermission" "user.dir" "read")
diff --git a/nashorn/test/script/sandbox/reflection.js b/nashorn/test/script/sandbox/reflection.js
new file mode 100644
index 00000000000..1a33b5637fd
--- /dev/null
+++ b/nashorn/test/script/sandbox/reflection.js
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * reflection checks.
+ *
+ * @test
+ * @security
+ * @run
+ */
+
+function check(e) {
+    if (e instanceof java.lang.SecurityException) {
+        print(e);
+    } else {
+        fail("expected SecurityException, got " + e);
+    }
+}
+
+var cl = java.lang.Class.class;
+try {
+    cl.getDeclaredMethods();
+} catch(e) {
+    check(e); 
+}
diff --git a/nashorn/test/script/sandbox/reflection.js.EXPECTED b/nashorn/test/script/sandbox/reflection.js.EXPECTED
new file mode 100644
index 00000000000..202333ead8a
--- /dev/null
+++ b/nashorn/test/script/sandbox/reflection.js.EXPECTED
@@ -0,0 +1 @@
+java.security.AccessControlException: access denied ("java.lang.RuntimePermission" "accessDeclaredMembers")
diff --git a/nashorn/test/script/sandbox/runnable.js b/nashorn/test/script/sandbox/runnable.js
new file mode 100644
index 00000000000..ff5509e37f6
--- /dev/null
+++ b/nashorn/test/script/sandbox/runnable.js
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Implement runnable interface under security manager and try thread.
+ *
+ * @test
+ * @security
+ */
+
+var r = new java.lang.Runnable() {
+   run: function() {
+       print("I am runnable");
+   }
+};
+
+r.run();
+
+var t = new java.lang.Thread(r);
+t.start();
+t.join();
diff --git a/nashorn/test/script/sandbox/runnable.js.EXPECTED b/nashorn/test/script/sandbox/runnable.js.EXPECTED
new file mode 100644
index 00000000000..3bc2881058e
--- /dev/null
+++ b/nashorn/test/script/sandbox/runnable.js.EXPECTED
@@ -0,0 +1,2 @@
+I am runnable
+I am runnable
diff --git a/nashorn/test/script/sandbox/unsafe.js b/nashorn/test/script/sandbox/unsafe.js
new file mode 100644
index 00000000000..0db058ee907
--- /dev/null
+++ b/nashorn/test/script/sandbox/unsafe.js
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Try to access sensitive class like Unsafe.
+ *
+ * @test
+ * @security
+ * @run
+ */
+
+function check(e) {
+   if (e instanceof java.lang.SecurityException) {
+       print(e);
+   } else {
+       fail("expected SecurityException, got " + e);
+   }
+}
+
+try {
+    var unsafe = java.lang.Class.forName("sun.misc.Unsafe");
+    fail("No SecurityException for Class.forName sun.misc.Unsafe");
+} catch (e) {
+    check(e);
+}
+
+try {
+    var unsafe = Java.type("sun.misc.Unsafe"); 
+    fail("No SecurityException for Java.type sun.misc.Unsafe");
+} catch (e) {
+    check(e);
+}
+
+try {
+    var unsafe = Packages.sun.misc.Unsafe;
+    fail("No SecurityException for Packages.sun.misc.Unsafe");
+} catch (e) {
+    check(e);
+}
+
+try {
+    var cl = Packages.jdk.nashorn.internal.runtime.Context.class;
+    var unsafe = cl.getClassLoader().loadClass("sun.misc.Unsafe");
+} catch (e) {
+    check(e);
+}
diff --git a/nashorn/test/script/sandbox/unsafe.js.EXPECTED b/nashorn/test/script/sandbox/unsafe.js.EXPECTED
new file mode 100644
index 00000000000..3f1cbec0a80
--- /dev/null
+++ b/nashorn/test/script/sandbox/unsafe.js.EXPECTED
@@ -0,0 +1,4 @@
+java.security.AccessControlException: access denied ("java.lang.RuntimePermission" "accessClassInPackage.sun.misc")
+java.security.AccessControlException: access denied ("java.lang.RuntimePermission" "accessClassInPackage.sun.misc")
+java.security.AccessControlException: access denied ("java.lang.RuntimePermission" "accessClassInPackage.sun")
+java.security.AccessControlException: access denied ("java.lang.RuntimePermission" "getClassLoader")
diff --git a/nashorn/test/script/test262.js b/nashorn/test/script/test262.js
new file mode 100644
index 00000000000..6cfa8e8a274
--- /dev/null
+++ b/nashorn/test/script/test262.js
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * This is not a test, but a test "framework" for running test262 tests.
+ *
+ * @subtest
+ */
+
+$ERROR = function() {
+    throw new EvalError(Array.prototype.join.call(arguments));
+}
+
+$INCLUDE = function(filename) {
+    load("test/test262/test/harness/" + filename);
+}
+
+$FAIL = $ERROR;
+$PRINT = print;
diff --git a/nashorn/test/script/test262_single.js b/nashorn/test/script/test262_single.js
new file mode 100644
index 00000000000..015426d5978
--- /dev/null
+++ b/nashorn/test/script/test262_single.js
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Handy wrapper for running just one 262 test, pass as arg
+ *
+ * @subtest
+ */
+
+function runTestCase(tc) {
+    print(tc() ? "success" : "failure");
+}
+
+function $ERROR(str) {
+    print("ERROR: " + str);
+}
+
+load(arguments[0]);
diff --git a/nashorn/test/src/UnnamedPackageTestCallback.java b/nashorn/test/src/UnnamedPackageTestCallback.java
new file mode 100644
index 00000000000..53db8ca0fa1
--- /dev/null
+++ b/nashorn/test/src/UnnamedPackageTestCallback.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+public interface UnnamedPackageTestCallback {
+    String call(String s);
+}
diff --git a/nashorn/test/src/jdk/nashorn/api/scripting/MultipleEngineTest.java b/nashorn/test/src/jdk/nashorn/api/scripting/MultipleEngineTest.java
new file mode 100644
index 00000000000..3694882f516
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/api/scripting/MultipleEngineTest.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.api.scripting;
+
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+import org.testng.TestNG;
+import org.testng.annotations.Test;
+
+/**
+ * Test that we can create multiple, independent script engines and use those
+ * independently.
+ */
+
+public class MultipleEngineTest {
+    public static void main(final String[] args) {
+        TestNG.main(args);
+    }
+
+    @Test
+    public void createAndUseManyEngine() throws ScriptException {
+        final ScriptEngineManager m = new ScriptEngineManager();
+
+        final ScriptEngine e1 = m.getEngineByName("nashorn");
+        e1.eval("var  x = 33; print(x);");
+
+        final ScriptEngine e2 = m.getEngineByName("nashorn");
+        e2.eval("try { print(x) } catch(e) { print(e); }");
+    }
+}
diff --git a/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java b/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
new file mode 100644
index 00000000000..17963c52bb4
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
@@ -0,0 +1,862 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.api.scripting;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import javax.script.Bindings;
+import javax.script.Compilable;
+import javax.script.CompiledScript;
+import javax.script.Invocable;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineFactory;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+import jdk.nashorn.internal.runtime.Version;
+import netscape.javascript.JSObject;
+import org.testng.TestNG;
+import org.testng.annotations.Test;
+
+/**
+ * Tests for JSR-223 script engine for Nashorn.
+ */
+public class ScriptEngineTest {
+
+    public static void main(final String[] args) {
+        TestNG.main(args);
+    }
+
+    private void log(String msg) {
+        org.testng.Reporter.log(msg, true);
+    }
+
+    @Test
+    public void argumentsTest() {
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+
+        String[] args = new String[] { "hello", "world" };
+        try {
+            e.put("arguments", args);
+            Object arg0 = e.eval("arguments[0]");
+            Object arg1 = e.eval("arguments[1]");
+            assertEquals(args[0], arg0);
+            assertEquals(args[1], arg1);
+        } catch (final Exception exp) {
+            exp.printStackTrace();
+            fail(exp.getMessage());
+        }
+    }
+
+    @Test
+    public void argumentsWithTest() {
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+
+        String[] args = new String[] { "hello", "world" };
+        try {
+            e.put("arguments", args);
+            Object arg0 = e.eval("var imports = new JavaImporter(java.io); " +
+                    " with(imports) { arguments[0] }");
+            Object arg1 = e.eval("var imports = new JavaImporter(java.util, java.io); " +
+                    " with(imports) { arguments[1] }");
+            assertEquals(args[0], arg0);
+            assertEquals(args[1], arg1);
+        } catch (final Exception exp) {
+            exp.printStackTrace();
+            fail(exp.getMessage());
+        }
+    }
+
+    @Test
+    public void argumentsEmptyTest() {
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+
+        try {
+            assertEquals(true,e.eval("arguments instanceof Array"));
+            assertEquals(true, e.eval("arguments.length == 0"));
+        } catch (final Exception exp) {
+            exp.printStackTrace();
+            fail(exp.getMessage());
+        }
+    }
+
+    @Test
+    public void factoryTests() {
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+        assertNotNull(e);
+
+        final ScriptEngineFactory fac = e.getFactory();
+
+        assertEquals("ECMAScript", fac.getLanguageName());
+        assertEquals("javascript", fac.getParameter(ScriptEngine.NAME));
+        assertEquals("ECMA - 262 Edition 5.1", fac.getLanguageVersion());
+        assertEquals("Oracle Nashorn", fac.getEngineName());
+        assertEquals(Version.version(), fac.getEngineVersion());
+        assertEquals("print(context)", fac.getOutputStatement("context"));
+        assertEquals("javascript", fac.getParameter(ScriptEngine.NAME));
+
+        boolean seenJS = false;
+        for (String ext : fac.getExtensions()) {
+            if (ext.equals("js")) {
+                seenJS = true;
+            }
+        }
+
+        assertEquals(true, seenJS);
+        String str = fac.getMethodCallSyntax("obj", "foo", "x");
+        assertEquals("obj.foo(x)", str);
+
+        boolean seenNashorn = false, seenJavaScript = false, seenECMAScript = false;
+        for (String name : fac.getNames()) {
+            switch (name) {
+                case "nashorn": seenNashorn = true; break;
+                case "javascript": seenJavaScript = true; break;
+                case "ECMAScript": seenECMAScript = true; break;
+            }
+        }
+
+        assertEquals(true, seenNashorn);
+        assertEquals(true, seenJavaScript);
+        assertEquals(true, seenECMAScript);
+
+        boolean seenAppJS = false, seenAppECMA = false, seenTextJS = false, seenTextECMA = false;
+        for (String mime : fac.getMimeTypes()) {
+            switch (mime) {
+                case "application/javascript": seenAppJS = true; break;
+                case "application/ecmascript": seenAppECMA = true; break;
+                case "text/javascript": seenTextJS = true; break;
+                case "text/ecmascript": seenTextECMA = true; break;
+            }
+        }
+
+        assertEquals(true, seenAppJS);
+        assertEquals(true, seenAppECMA);
+        assertEquals(true, seenTextJS);
+        assertEquals(true, seenTextECMA);
+    }
+
+    @Test
+    public void evalTests() {
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+        e.put(ScriptEngine.FILENAME, "myfile.js");
+
+        try {
+            e.eval("print('hello')");
+        } catch (final ScriptException se) {
+            fail(se.getMessage());
+        }
+        try {
+            e.eval("print('hello)");
+            fail("script exception expected");
+        } catch (final ScriptException se) {
+            assertEquals(1, se.getLineNumber());
+            assertEquals(13, se.getColumnNumber());
+            assertEquals("myfile.js", se.getFileName());
+            // se.printStackTrace();
+        }
+
+        try {
+            Object obj = e.eval("34 + 41");
+            assertTrue(34.0 + 41.0 == ((Number)obj).doubleValue());
+            obj = e.eval("x = 5");
+            assertTrue(5.0 == ((Number)obj).doubleValue());
+        } catch (final ScriptException se) {
+            se.printStackTrace();
+            fail(se.getMessage());
+        }
+    }
+
+    @Test
+    public void compileTests() {
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+        CompiledScript script = null;
+
+        try {
+            script = ((Compilable)e).compile("print('hello')");
+        } catch (final ScriptException se) {
+            fail(se.getMessage());
+        }
+
+        try {
+            script.eval();
+        } catch (final ScriptException | NullPointerException se) {
+            se.printStackTrace();
+            fail(se.getMessage());
+        }
+
+        // try to compile from a Reader
+        try {
+            script = ((Compilable)e).compile(new StringReader("print('world')"));
+        } catch (final ScriptException se) {
+            fail(se.getMessage());
+        }
+
+        try {
+            script.eval();
+        } catch (final ScriptException | NullPointerException se) {
+            se.printStackTrace();
+            fail(se.getMessage());
+        }
+    }
+
+    @Test
+    public void createBindingsTest() {
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+        Bindings b = e.createBindings();
+        b.put("foo", 42.0);
+        Object res = null;
+        try {
+            res = e.eval("foo == 42.0", b);
+        } catch (final ScriptException | NullPointerException se) {
+            se.printStackTrace();
+            fail(se.getMessage());
+        }
+
+        assertEquals(Boolean.TRUE, res);
+    }
+
+    @Test
+    public void getInterfaceTest() {
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+        final Invocable inv = (Invocable)e;
+
+        // try to get interface from global functions
+        try {
+            e.eval("function run() { print('run'); };");
+            final Runnable runnable = inv.getInterface(Runnable.class);
+            runnable.run();
+        } catch (final Exception exp) {
+            exp.printStackTrace();
+            fail(exp.getMessage());
+        }
+
+        // try interface on specific script object
+        try {
+            e.eval("var obj = { run: function() { print('run from obj'); } };");
+            Object obj = e.get("obj");
+            final Runnable runnable = inv.getInterface(obj, Runnable.class);
+            runnable.run();
+        } catch (final Exception exp) {
+            exp.printStackTrace();
+            fail(exp.getMessage());
+        }
+    }
+
+    @Test
+    public void accessGlobalTest() {
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+
+        try {
+            e.eval("var x = 'hello'");
+            assertEquals("hello", e.get("x"));
+        } catch (final ScriptException exp) {
+            exp.printStackTrace();
+            fail(exp.getMessage());
+        }
+    }
+
+    @Test
+    public void exposeGlobalTest() {
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+
+        try {
+            e.put("y", "foo");
+            e.eval("print(y)");
+        } catch (final ScriptException exp) {
+            exp.printStackTrace();
+            fail(exp.getMessage());
+        }
+    }
+
+    public static void alert(final Object self, final Object msg) {
+        System.out.println(msg);
+    }
+
+    @Test
+    public void exposeFunctionTest() {
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+
+        try {
+            final Method alert = ScriptEngineTest.class.getMethod("alert", Object.class, Object.class);
+            // expose a Method object as global var.
+            e.put("alert", alert);
+            // call the global var.
+            e.eval("alert('alert! alert!!')");
+        } catch (final NoSuchMethodException | SecurityException | ScriptException exp) {
+            exp.printStackTrace();
+            fail(exp.getMessage());
+        }
+    }
+
+    @Test
+    public void putGlobalFunctionTest() {
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+
+        e.put("callable", new Callable<String>() {
+            @Override
+            public String call() throws Exception {
+                return "callable was called";
+            }
+        });
+
+        try {
+            e.eval("print(callable.call())");
+        } catch (final ScriptException exp) {
+            exp.printStackTrace();
+            fail(exp.getMessage());
+        }
+    }
+
+    @Test
+    public void windowAlertTest() {
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+        final Window window = new Window();
+
+        try {
+            e.put("window", window);
+            e.eval("print(window.alert)"); // TODO: bug - prints 'undefined'
+            e.eval("window.alert('calling window.alert...')");
+            // TODO: java.lang.NoSuchMethodException: alert
+            // ((Invocable) e).invokeMethod(window, "alert",
+            // "invoking window.alert...");
+        } catch (final Exception exp) {
+            exp.printStackTrace();
+            fail(exp.getMessage());
+        }
+    }
+
+    @Test
+    public void windowLocationTest() {
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+        final Window window = new Window();
+
+        try {
+            e.put("window", window);
+            e.eval("print(window.location)");
+            final Object locationValue = ((Invocable)e).invokeMethod(window, "getLocation");
+            assertEquals("http://localhost:8080/window", locationValue);
+        } catch (final Exception exp) {
+            exp.printStackTrace();
+            fail(exp.getMessage());
+        }
+    }
+
+    @Test
+    public void windowItemTest() {
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+        final Window window = new Window();
+
+        try {
+            e.put("window", window);
+            final String item1 = (String)e.eval("window.item(65535)");
+            assertEquals("ffff", item1);
+            final String item2 = (String)((Invocable)e).invokeMethod(window, "item", 255);
+            assertEquals("ff", item2);
+        } catch (final Exception exp) {
+            exp.printStackTrace();
+            fail(exp.getMessage());
+        }
+    }
+
+    @Test
+    public void windowEventTest() {
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+        final Window window = new Window();
+
+        try {
+            e.put("window", window);
+            e.eval("window.onload = function() { print('window load event fired'); return true }");
+            assertTrue((Boolean)e.eval("window.onload.loaded()"));
+            final WindowEventHandler handler = window.getOnload();
+            assertNotNull(handler);
+            assertTrue(handler.loaded());
+        } catch (final Exception exp) {
+            exp.printStackTrace();
+            fail(exp.getMessage());
+        }
+    }
+
+    @Test
+    public void throwTest() {
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+        e.put(ScriptEngine.FILENAME, "throwtest.js");
+
+        try {
+            e.eval("throw 'foo'");
+        } catch (final ScriptException exp) {
+            log(exp.getMessage());
+            assertEquals("foo in throwtest.js at line number 1 at column number 0", exp.getMessage());
+            assertEquals("throwtest.js", exp.getFileName());
+            assertEquals(1, exp.getLineNumber());
+        }
+    }
+
+    @Test
+    public void setTimeoutTest() {
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+        final Window window = new Window();
+
+        try {
+            final Class<?> setTimeoutParamTypes[] = { Window.class, String.class, int.class };
+            final Method setTimeout = Window.class.getDeclaredMethod("setTimeout", setTimeoutParamTypes);
+            assertNotNull(setTimeout);
+            e.put("window", window);
+            e.eval("window.setTimeout('foo()', 100)");
+
+            // try to make setTimeout global
+            e.put("setTimeout", setTimeout);
+            // TODO: java.lang.ClassCastException: required class
+            // java.lang.Integer but encountered class java.lang.Double
+            // e.eval("setTimeout('foo2()', 200)");
+        } catch (final Exception exp) {
+            exp.printStackTrace();
+            fail(exp.getMessage());
+        }
+    }
+
+    @Test
+    public void setWriterTest() {
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+        final StringWriter sw = new StringWriter();
+        e.getContext().setWriter(sw);
+
+        try {
+            e.eval("print('hello world')");
+        } catch (final Exception exp) {
+            exp.printStackTrace();
+            fail(exp.getMessage());
+        }
+        // dos2unix - fix line endings if running on windows
+        assertEquals(sw.toString().replaceAll("\r", ""), "hello world\n");
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void reflectionTest() throws ScriptException {
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+
+        e.eval("var obj = { x: 344, y: 'nashorn' }");
+
+        int count = 0;
+        Map<Object, Object> map = (Map<Object, Object>)e.get("obj");
+        assertEquals(false, map.isEmpty());
+        assertEquals(true, map.keySet().contains("x"));
+        assertEquals(true, map.containsKey("x"));
+        assertEquals(true, map.values().contains("nashorn"));
+        assertEquals(true, map.containsValue("nashorn"));
+        for (final Map.Entry<?, ?> ex : map.entrySet()) {
+            final Object key = ex.getKey();
+            if (key.equals("x")) {
+                assertTrue(344 == ((Number)ex.getValue()).doubleValue());
+                count++;
+            } else if (key.equals("y")) {
+                assertEquals("nashorn", ex.getValue());
+                count++;
+            }
+        }
+        assertEquals(2, count);
+        assertEquals(2, map.size());
+
+        // add property
+        map.put("z", "hello");
+        assertEquals("hello", e.eval("obj.z"));
+        assertEquals("hello", map.get("z"));
+        assertEquals(true, map.keySet().contains("z"));
+        assertEquals(true, map.containsKey("z"));
+        assertEquals(true, map.values().contains("hello"));
+        assertEquals(true, map.containsValue("hello"));
+        assertEquals(3, map.size());
+
+        final Map<Object, Object> newMap = new HashMap<>();
+        newMap.put("foo", 23.0);
+        newMap.put("bar", true);
+        map.putAll(newMap);
+
+        assertEquals(23.0, e.eval("obj.foo"));
+        assertEquals(true, e.eval("obj.bar"));
+
+        // remove using map method
+        map.remove("foo");
+        assertEquals("undefined", e.eval("typeof obj.foo"));
+
+        count = 0;
+        e.eval("var arr = [ true, 'hello' ]");
+        map = (Map<Object, Object>)e.get("arr");
+        assertEquals(false, map.isEmpty());
+        assertEquals(true, map.containsKey("length"));
+        assertEquals(true, map.containsValue("hello"));
+        for (final Map.Entry<?, ?> ex : map.entrySet()) {
+            final Object key = ex.getKey();
+            if (key.equals("0")) {
+                assertEquals(Boolean.TRUE, ex.getValue());
+                count++;
+            } else if (key.equals("1")) {
+                assertEquals("hello", ex.getValue());
+                count++;
+            }
+        }
+        assertEquals(2, count);
+        assertEquals(2, map.size());
+
+        // add element
+        map.put(2, "world");
+        assertEquals("world", map.get(2));
+        assertEquals(3, map.size());
+
+        // remove all
+        map.clear();
+        assertEquals(true, map.isEmpty());
+        assertEquals("undefined", e.eval("typeof arr[0]"));
+        assertEquals("undefined", e.eval("typeof arr[1]"));
+        assertEquals("undefined", e.eval("typeof arr[2]"));
+    }
+
+    @Test
+    public void redefineEchoTest() {
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+
+        try {
+            e.eval("var echo = {}; if (typeof echo !== 'object') { throw 'echo is a '+typeof echo; }");
+        } catch (final Exception exp) {
+            exp.printStackTrace();
+            fail(exp.getMessage());
+        }
+    }
+
+    @Test
+    public void invokeMethodTest() {
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+
+        try {
+            e.eval("var Example = function() { this.hello = function() { return 'Hello World!'; };}; myExample = new Example();");
+            final Object obj = e.get("myExample");
+            final Object res = ((Invocable)e).invokeMethod(obj, "hello");
+            assertEquals("Hello World!", res);
+        } catch (final Exception exp) {
+            exp.printStackTrace();
+            fail(exp.getMessage());
+        }
+    }
+
+    @Test
+    public void versionTest() {
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+        assertEquals(e.getFactory().getEngineVersion(), Version.version());
+    }
+
+    @Test
+    public void noEnumerablePropertiesTest() {
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+        try {
+            e.eval("for (i in this) { throw 'found property: ' + i }");
+        } catch (final Exception exp) {
+            exp.printStackTrace();
+            fail(exp.getMessage());
+        }
+    }
+
+    @Test
+    public void noRefErrorForGlobalThisAccessTest() {
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+        try {
+            e.eval("this.foo");
+        } catch (final Exception exp) {
+            exp.printStackTrace();
+            fail(exp.getMessage());
+        }
+    }
+
+    @Test
+    public void refErrorForUndeclaredAccessTest() {
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+        try {
+            e.eval("try { print(foo); throw 'no ref error' } catch (e) { if (!(e instanceof ReferenceError)) throw e; }");
+        } catch (final Exception exp) {
+            exp.printStackTrace();
+            fail(exp.getMessage());
+        }
+    }
+
+    @Test
+    public void typeErrorForGlobalThisCallTest() {
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+        try {
+            e.eval("try { this.foo() } catch(e) { if (! (e instanceof TypeError)) throw 'no type error' }");
+        } catch (final Exception exp) {
+            exp.printStackTrace();
+            fail(exp.getMessage());
+        }
+    }
+
+    @Test
+    public void refErrorForUndeclaredCallTest() {
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+        try {
+            e.eval("try { foo() } catch(e) { if (! (e instanceof ReferenceError)) throw 'no ref error' }");
+        } catch (final Exception exp) {
+            exp.printStackTrace();
+            fail(exp.getMessage());
+        }
+    }
+
+    @Test
+    public void securityPackagesTest() {
+        if (System.getSecurityManager() == null) {
+            // pass vacuously
+        }
+
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+        try {
+            e.eval("var v = Packages.sun.misc.Unsafe;");
+            fail("should have thrown SecurityException");
+        } catch (final Exception exp) {
+            if (exp instanceof SecurityException) {
+                log("got " + exp + " as expected");
+            } else {
+                fail(exp.getMessage());
+            }
+        }
+    }
+
+    @Test
+    public void securityJavaTypeTest() {
+        if (System.getSecurityManager() == null) {
+            // pass vacuously
+        }
+
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+        try {
+            e.eval("var v = Java.type('sun.misc.Unsafe');");
+            fail("should have thrown SecurityException");
+        } catch (final Exception exp) {
+            if (exp instanceof SecurityException) {
+                log("got " + exp + " as expected");
+            } else {
+                fail(exp.getMessage());
+            }
+        }
+    }
+
+    @Test
+    public void securityClassForNameTest() {
+        if (System.getSecurityManager() == null) {
+            // pass vacuously
+        }
+
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+        try {
+            e.eval("var v = java.lang.Class.forName('sun.misc.Unsafe');");
+            fail("should have thrown SecurityException");
+        } catch (final Exception exp) {
+            if (exp instanceof SecurityException) {
+                log("got " + exp + " as expected");
+            } else {
+                fail(exp.getMessage());
+            }
+        }
+    }
+
+    @Test
+    public void securitySystemExit() {
+        if (System.getSecurityManager() == null) {
+            // pass vacuously
+        }
+
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+        try {
+            e.eval("java.lang.System.exit(0);");
+            fail("should have thrown SecurityException");
+        } catch (final Exception exp) {
+            if (exp instanceof SecurityException) {
+                log("got " + exp + " as expected");
+            } else {
+                fail(exp.getMessage());
+            }
+        }
+    }
+
+    @Test
+    public void securitySystemLoadLibrary() {
+        if (System.getSecurityManager() == null) {
+            // pass vacuously
+        }
+
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+        try {
+            e.eval("java.lang.System.loadLibrary('foo');");
+            fail("should have thrown SecurityException");
+        } catch (final Exception exp) {
+            if (exp instanceof SecurityException) {
+                log("got " + exp + " as expected");
+            } else {
+                fail(exp.getMessage());
+            }
+        }
+    }
+
+    @Test
+    public void jsobjectTest() {
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+        try {
+            e.eval("var obj = { '1': 'world', func: function() { return this.bar; }, bar: 'hello' }");
+            JSObject obj = (JSObject) e.get("obj");
+
+            // try basic get on existing properties
+            if (! obj.getMember("bar").equals("hello")) {
+                fail("obj.bar != 'hello'");
+            }
+
+            if (! obj.getSlot(1).equals("world")) {
+                fail("obj[1] != 'world'");
+            }
+
+            if (! obj.call("func", new Object[0]).equals("hello")) {
+                fail("obj.call('func') != 'hello'");
+            }
+
+            // try setting properties
+            obj.setMember("bar", "new-bar");
+            obj.setSlot(1, "new-element-1");
+            if (! obj.getMember("bar").equals("new-bar")) {
+                fail("obj.bar != 'new-bar'");
+            }
+
+            if (! obj.getSlot(1).equals("new-element-1")) {
+                fail("obj[1] != 'new-element-1'");
+            }
+
+            // try adding properties
+            obj.setMember("prop", "prop-value");
+            obj.setSlot(12, "element-12");
+            if (! obj.getMember("prop").equals("prop-value")) {
+                fail("obj.prop != 'prop-value'");
+            }
+
+            if (! obj.getSlot(12).equals("element-12")) {
+                fail("obj[12] != 'element-12'");
+            }
+
+            // delete properties
+            obj.removeMember("prop");
+            if ("prop-value".equals(obj.getMember("prop"))) {
+                fail("obj.prop is not deleted!");
+            }
+
+        } catch (final Exception exp) {
+            exp.printStackTrace();
+            fail(exp.getMessage());
+        }
+    }
+
+    @Test
+    public void invokeFunctionExceptionTest() {
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+        try {
+            e.eval("function func() { throw new TypeError(); }");
+        } catch (final Throwable t) {
+            t.printStackTrace();
+            fail(t.getMessage());
+        }
+
+        try {
+            ((Invocable)e).invokeFunction("func");
+            fail("should have thrown exception");
+        } catch (final ScriptException se) {
+            // ECMA TypeError property wrapped as a ScriptException
+            log("got " + se + " as expected");
+        } catch (final Throwable t) {
+            t.printStackTrace();
+            fail(t.getMessage());
+        }
+    }
+
+    @Test
+    public void invokeMethodExceptionTest() {
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+        try {
+            e.eval("var sobj = {}; sobj.foo = function func() { throw new TypeError(); }");
+        } catch (final Throwable t) {
+            t.printStackTrace();
+            fail(t.getMessage());
+        }
+
+        try {
+            final Object sobj = e.get("sobj");
+            ((Invocable)e).invokeMethod(sobj, "foo");
+            fail("should have thrown exception");
+        } catch (final ScriptException se) {
+            // ECMA TypeError property wrapped as a ScriptException
+            log("got " + se + " as expected");
+        } catch (final Throwable t) {
+            t.printStackTrace();
+            fail(t.getMessage());
+        }
+    }
+}
diff --git a/nashorn/test/src/jdk/nashorn/api/scripting/Window.java b/nashorn/test/src/jdk/nashorn/api/scripting/Window.java
new file mode 100644
index 00000000000..eab4b87072a
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/api/scripting/Window.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.api.scripting;
+
+public class Window {
+
+    private String location = "http://localhost:8080/window";
+
+    private WindowEventHandler onload   = null;
+
+    public void alert(final String message) {
+        System.out.println("alert: " + message);
+    }
+
+    public String getLocation() {
+        return location;
+    }
+
+    public void setLocation(final String location) {
+        this.location = location;
+    }
+
+    public String item(final int index) {
+        return Integer.toHexString(index);
+    }
+
+    public WindowEventHandler getOnload() {
+        return onload;
+    }
+
+    public void setOnload(final WindowEventHandler onload) {
+        this.onload = onload;
+    }
+
+    public static int setTimeout(final Window self, final String code, final int delay) {
+        return self.setTimeout(code, delay);
+    }
+
+    public static void clearTimeout(final Window self, final int id) {
+        self.clearTimeout(id);
+    }
+
+    public int setTimeout(final String code, final int delay) {
+        System.out.println("window.setTimeout: " + delay + ", code: " + code);
+        return 0;
+    }
+
+    public void clearTimeout(final int id) {
+        System.out.println("window.clearTimeout: " + id);
+    }
+
+}
diff --git a/nashorn/test/src/jdk/nashorn/api/scripting/WindowEventHandler.java b/nashorn/test/src/jdk/nashorn/api/scripting/WindowEventHandler.java
new file mode 100644
index 00000000000..3e39228984c
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/api/scripting/WindowEventHandler.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.api.scripting;
+
+public interface WindowEventHandler {
+
+    public boolean loaded();
+
+}
diff --git a/nashorn/test/src/jdk/nashorn/internal/access/BooleanAccessTest.java b/nashorn/test/src/jdk/nashorn/internal/access/BooleanAccessTest.java
new file mode 100644
index 00000000000..5ec92b51873
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/access/BooleanAccessTest.java
@@ -0,0 +1,206 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.access;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+import java.util.Arrays;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+import org.testng.TestNG;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+public class BooleanAccessTest {
+
+    private static ScriptEngine e = null;
+    private static SharedObject o = new SharedObject();
+
+    public static void main(final String[] args) {
+        TestNG.main(args);
+    }
+
+    @BeforeClass
+    public static void setUpClass() throws ScriptException {
+        final ScriptEngineManager m = new ScriptEngineManager();
+        e = m.getEngineByName("nashorn");
+        e.put("o", o);
+        e.eval("var SharedObject = Packages.jdk.nashorn.internal.access.SharedObject;");
+    }
+
+    @Test
+    public void accessFieldBoolean() throws ScriptException {
+        e.eval("var p_boolean = o.publicBoolean;");
+        assertEquals(o.publicBoolean, e.get("p_boolean"));
+        assertEquals("boolean", e.eval("typeof p_boolean;"));
+        e.eval("o.publicBoolean = false;");
+        assertEquals(false, o.publicBoolean);
+    }
+
+    @Test
+    public void accessFieldBooleanArray() throws ScriptException {
+        e.eval("var p_boolean_array = o.publicBooleanArray;");
+        assertEquals(o.publicBooleanArray[0], e.eval("o.publicBooleanArray[0]"));
+        assertTrue(Arrays.equals(o.publicBooleanArray, (boolean[])e.get("p_boolean_array")));
+        e.eval("var t_boolean_arr = java.lang.reflect.Array.newInstance(java.lang.Boolean.TYPE, 3);" +
+                "t_boolean_arr[0] = true;" +
+                "t_boolean_arr[1] = false;" +
+                "t_boolean_arr[2] = false;" +
+                "o.publicBooleanArray = t_boolean_arr;");
+        assertTrue(Arrays.equals(new boolean[] { true, false, false }, o.publicBooleanArray));
+        e.eval("o.publicBooleanArray[0] = false;");
+        assertEquals(false, o.publicBooleanArray[0]);
+    }
+
+    @Test
+    public void accessStaticFieldBoolean() throws ScriptException {
+        e.eval("var ps_boolean = SharedObject.publicStaticBoolean;");
+        assertEquals(SharedObject.publicStaticBoolean, e.get("ps_boolean"));
+        assertEquals("boolean", e.eval("typeof ps_boolean;"));
+        e.eval("SharedObject.publicStaticBoolean = false;");
+        assertEquals(false, SharedObject.publicStaticBoolean);
+    }
+
+    @Test
+    public void accessStaticFieldBooleanArray() throws ScriptException {
+        e.eval("var ps_boolean_array = SharedObject.publicStaticBooleanArray;");
+        assertEquals(SharedObject.publicStaticBooleanArray[0], e.eval("SharedObject.publicStaticBooleanArray[0]"));
+        assertTrue(Arrays.equals(SharedObject.publicStaticBooleanArray, (boolean[])e.get("ps_boolean_array")));
+        e.eval("var ts_boolean_arr = java.lang.reflect.Array.newInstance(java.lang.Boolean.TYPE, 3);" +
+                "ts_boolean_arr[0] = true;" +
+                "ts_boolean_arr[1] = false;" +
+                "ts_boolean_arr[2] = true;" +
+                "SharedObject.publicStaticBooleanArray = ts_boolean_arr;");
+        assertTrue(Arrays.equals(new boolean[] { true, false, true }, SharedObject.publicStaticBooleanArray));
+        e.eval("SharedObject.publicStaticBooleanArray[0] = false;");
+        assertEquals(false, SharedObject.publicStaticBooleanArray[0]);
+    }
+
+    @Test
+    public void accessFinalFieldBoolean() throws ScriptException {
+        e.eval("var pf_boolean = o.publicFinalBoolean;");
+        assertEquals(o.publicFinalBoolean, e.get("pf_boolean"));
+        assertEquals("boolean", e.eval("typeof pf_boolean;"));
+        e.eval("o.publicFinalBoolean = false;");
+        assertEquals(true, o.publicFinalBoolean);
+    }
+
+    @Test
+    public void accessFinalFieldBooleanArray() throws ScriptException {
+        e.eval("var pf_boolean_array = o.publicFinalBooleanArray;");
+        assertEquals(o.publicFinalBooleanArray[0], e.eval("o.publicFinalBooleanArray[0]"));
+        assertTrue(Arrays.equals(o.publicFinalBooleanArray, (boolean[])e.get("pf_boolean_array")));
+        e.eval("var tf_boolean_arr = java.lang.reflect.Array.newInstance(java.lang.Boolean.TYPE, 3);" +
+                "tf_boolean_arr[0] = false;" +
+                "tf_boolean_arr[1] = false;" +
+                "tf_boolean_arr[2] = true;" +
+                "o.publicOFinalbjectArray = tf_boolean_arr;");
+        assertTrue(Arrays.equals(new boolean[] { false, false, true, false }, o.publicFinalBooleanArray));
+        e.eval("o.publicFinalBooleanArray[0] = true;");
+        assertEquals(true, o.publicFinalBooleanArray[0]);
+    }
+
+    @Test
+    public void accessStaticFinalFieldBoolean() throws ScriptException {
+        e.eval("var psf_boolean = SharedObject.publicStaticFinalBoolean;");
+        assertEquals(SharedObject.publicStaticFinalBoolean, e.get("psf_boolean"));
+        assertEquals("boolean", e.eval("typeof psf_boolean;"));
+        e.eval("SharedObject.publicStaticFinalBoolean = false;");
+        assertEquals(true, SharedObject.publicStaticFinalBoolean);
+    }
+
+    @Test
+    public void accessStaticFinalFieldBooleanArray() throws ScriptException {
+        e.eval("var psf_boolean_array = SharedObject.publicStaticFinalBooleanArray;");
+        assertEquals(SharedObject.publicStaticFinalBooleanArray[0], e.eval("SharedObject.publicStaticFinalBooleanArray[0]"));
+        assertTrue(Arrays.equals(SharedObject.publicStaticFinalBooleanArray, (boolean[])e.get("psf_boolean_array")));
+        e.eval("var tsf_boolean_arr = java.lang.reflect.Array.newInstance(java.lang.Boolean.TYPE, 3);" +
+                "tsf_boolean_arr[0] = false;" +
+                "tsf_boolean_arr[1] = true;" +
+                "tsf_boolean_arr[2] = false;" +
+                "SharedObject.publicStaticFinalBooleanArray = tsf_boolean_arr;");
+        assertTrue(Arrays.equals(new boolean[] { false, true, false, false }, SharedObject.publicStaticFinalBooleanArray));
+        e.eval("SharedObject.publicStaticFinalBooleanArray[0] = true;");
+        assertEquals(true, SharedObject.publicStaticFinalBooleanArray[0]);
+    }
+
+    @Test
+    public void accessFieldBooleanBoxing() throws ScriptException {
+        e.eval("var p_boolean_box = o.publicBooleanBox;");
+        assertEquals(o.publicBooleanBox, e.get("p_boolean_box"));
+        assertEquals("boolean", e.eval("typeof p_boolean_box;"));
+        e.eval("o.publicBooleanBox = false;");
+        assertEquals(false, (boolean)o.publicBooleanBox);
+    }
+
+    @Test
+    public void accessStaticFieldBooleanBoxing() throws ScriptException {
+        e.eval("var ps_boolean_box = SharedObject.publicStaticBooleanBox;");
+        assertEquals(SharedObject.publicStaticBooleanBox, e.get("ps_boolean_box"));
+        assertEquals("boolean", e.eval("typeof ps_boolean_box;"));
+        e.eval("SharedObject.publicStaticBooleanBox = false;");
+        assertEquals(false, (boolean)SharedObject.publicStaticBooleanBox);
+    }
+
+    @Test
+    public void accessFinalFieldBooleanBoxing() throws ScriptException {
+        e.eval("var pf_boolean_box = o.publicFinalBooleanBox;");
+        assertEquals(o.publicFinalBooleanBox, e.get("pf_boolean_box"));
+        assertEquals("boolean", e.eval("typeof pf_boolean_box;"));
+        e.eval("o.publicFinalBooleanBox = false;");
+        assertEquals(true, (boolean)o.publicFinalBooleanBox);
+    }
+
+    @Test
+    public void accessStaticFinalFieldBooleanBoxing() throws ScriptException {
+        e.eval("var psf_boolean_box = SharedObject.publicStaticFinalBooleanBox;");
+        assertEquals(SharedObject.publicStaticFinalBooleanBox, e.get("psf_boolean_box"));
+        assertEquals("boolean", e.eval("typeof psf_boolean_box;"));
+        e.eval("SharedObject.publicStaticFinalBooleanBox = false;");
+        assertEquals(true, (boolean)SharedObject.publicStaticFinalBooleanBox);
+    }
+
+    @Test
+    public void accessVolatileField() throws ScriptException {
+        e.eval("var pv_boolean = o.volatileBoolean;");
+        assertEquals(o.volatileBoolean, e.get("pv_boolean"));
+        assertEquals("boolean", e.eval("typeof pv_boolean;"));
+        e.eval("o.volatileBoolean = false;");
+        assertEquals(false, o.volatileBoolean);
+    }
+
+    @Test
+    public void accessTransientField() throws ScriptException {
+        e.eval("var pt_boolean = o.transientBoolean;");
+        assertEquals(o.transientBoolean, e.get("pt_boolean"));
+        assertEquals("boolean", e.eval("typeof pt_boolean;"));
+        e.eval("o.transientBoolean = false;");
+        assertEquals(false, o.transientBoolean);
+    }
+
+}
diff --git a/nashorn/test/src/jdk/nashorn/internal/access/MethodAccessTest.java b/nashorn/test/src/jdk/nashorn/internal/access/MethodAccessTest.java
new file mode 100644
index 00000000000..8ad1153745f
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/access/MethodAccessTest.java
@@ -0,0 +1,453 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.access;
+
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertTrue;
+import static org.testng.internal.junit.ArrayAsserts.assertArrayEquals;
+
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Locale;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+import org.testng.TestNG;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+public class MethodAccessTest {
+
+    private static ScriptEngine e = null;
+    private static SharedObject o = new SharedObject();
+
+    public static void main(final String[] args) {
+        TestNG.main(args);
+    }
+
+    @BeforeClass
+    public static void setUpClass() throws ScriptException {
+        final ScriptEngineManager m = new ScriptEngineManager();
+        e = m.getEngineByName("nashorn");
+        o.setEngine(e);
+        e.put("o", o);
+        e.eval("var SharedObject = Packages.jdk.nashorn.internal.access.SharedObject;");
+        e.eval("var Person = Packages.jdk.nashorn.internal.access.Person;");
+    }
+
+    @Test
+    public void accessMethodthrowsCheckedException() throws ScriptException {
+        e.eval("try {" +
+                "    var a = java.lang.Long.parseLong('foo');" +
+                "} catch(e) {" +
+                "    var isThrown = true;" +
+                "    var isNumberException = e instanceof java.lang.NumberFormatException;" +
+                "} finally {" +
+                "    var isFinalized = true;" +
+                "}");
+        assertEquals("Exception thrown", true, e.get("isThrown"));
+        assertEquals("Finally called", true, e.get("isFinalized"));
+        assertEquals("Type is NumberFormatException", true, e.get("isNumberException"));
+    }
+
+    @Test
+    public void accessMethodthrowsUnCheckedException() throws ScriptException {
+        e.eval("try {" +
+                "    var a = java.lang.String.valueOf(null);" +
+                "} catch(e) {" +
+                "    var isThrown = true;" +
+                "    var isNumberException = e instanceof java.lang.NullPointerException;" +
+                "} finally {" +
+                "    var isFinalized = true;" +
+                "}");
+        assertEquals(true, e.get("isThrown"));
+        assertEquals(true, e.get("isFinalized"));
+        assertEquals(true, e.get("isNumberException"));
+    }
+
+    @Test
+    public void accessMethodStartsThread() throws ScriptException {
+        e.eval("o.methodStartsThread();");
+        assertEquals(false, o.isFinished);
+    }
+
+    @Test
+    public void accessStaticMethod() throws ScriptException {
+        assertEquals(10, e.eval("java.lang.Math.abs(-10);"));
+    }
+
+    @Test
+    public void accessSynchronousMethod() throws ScriptException {
+        e.eval("var v = new java.util.Vector();" + "v.add(10);" + "v.add(20);" + "v.add(30);");
+        assertEquals(10, e.eval("v[0]"));
+        assertEquals(20, e.eval("v[1]"));
+        assertEquals(30, e.eval("v[2]"));
+        assertEquals(3, e.eval("v.size()"));
+    }
+
+    @Test
+    public void accessStaticSynchronousMethod() throws ScriptException {
+        e.eval("var locales = java.util.Calendar.getAvailableLocales();");
+        final Locale[] locales = (Locale[])e.get("locales");
+        assertEquals(locales.length, Calendar.getAvailableLocales().length);
+    }
+
+    @Test
+    public void accessNativeMethod() throws ScriptException {
+        assertEquals(4.0, e.eval("java.lang.StrictMath.log10(10000);"));
+    }
+
+    @Test
+    public void accessConstructorOfAbstractClass() throws ScriptException {
+        e.eval("try {" +
+                "    var a = new java.util.AbstractList();" +
+                "    print('fail');" +
+                "} catch(e) {" +
+                "    var isThrown = true;" +
+                "}");
+        assertEquals(true, e.get("isThrown"));
+    }
+
+    @Test
+    public void accessMethodVoid() throws ScriptException {
+        o.isAccessed = false;
+        e.eval("o.voidMethod();");
+        assertTrue(o.isAccessed);
+    }
+
+    @Test
+    public void accessMethodBoolean() throws ScriptException {
+        assertEquals(true, e.eval("o.booleanMethod(false);"));
+        assertEquals(false, e.eval("o.booleanMethod(true);"));
+        assertEquals(false, e.eval("o.booleanMethod('false');"));
+        assertEquals(true, e.eval("o.booleanMethod('');"));
+        assertEquals(true, e.eval("o.booleanMethod(0);"));
+    }
+
+    @Test
+    public void accessMethodInt() throws ScriptException {
+        assertEquals(0, e.eval("o.intMethod(0);"));
+        assertEquals(-200, e.eval("o.intMethod(-100);"));
+        assertEquals(0, e.eval("o.intMethod('0');"));
+        assertEquals(-200, e.eval("o.intMethod('-100');"));
+    }
+
+    @Test
+    public void accessMethodLong() throws ScriptException {
+        assertEquals((long)0, e.eval("o.longMethod(0);"));
+        assertEquals((long)400, e.eval("o.longMethod(200);"));
+        assertEquals((long) 0, e.eval("o.longMethod('0');"));
+        assertEquals((long) 400, e.eval("o.longMethod('200');"));
+    }
+
+    @Test
+    public void accessMethodByte() throws ScriptException {
+        assertEquals((byte) 0, e.eval("o.byteMethod(0);"));
+        assertEquals((byte) 10, e.eval("o.byteMethod(5);"));
+        assertEquals((byte) 0, e.eval("o.byteMethod('0');"));
+        assertEquals((byte) 10, e.eval("o.byteMethod('5');"));
+    }
+
+    @Test
+    public void accessMethodShort() throws ScriptException {
+        assertEquals((short)0, e.eval("o.shortMethod(0);"));
+        assertEquals((short)8000, e.eval("o.shortMethod(4000);"));
+        assertEquals((short) 0, e.eval("o.shortMethod('0');"));
+        assertEquals((short) 8000, e.eval("o.shortMethod('4000');"));
+    }
+
+    @Test
+    public void accessMethodChar() throws ScriptException {
+        assertEquals('A', e.eval("o.charMethod('a');"));
+        assertEquals('Z', e.eval("o.charMethod('z');"));
+        assertEquals(o.charMethod((char)0), e.eval("o.charMethod(0);"));
+        assertEquals(o.charMethod((char)3150), e.eval("o.charMethod(3150);"));
+    }
+
+    @Test
+    public void accessMethodFloat() throws ScriptException {
+        assertEquals(0.0f, e.eval("o.floatMethod(0.0);"));
+        assertEquals(4.2f, e.eval("o.floatMethod(2.1);"));
+        assertEquals(0.0f, e.eval("o.floatMethod('0.0');"));
+        assertEquals(4.2f, e.eval("o.floatMethod('2.1');"));
+    }
+
+    @Test
+    public void accessMethodDouble() throws ScriptException {
+        assertEquals(0.0, e.eval("o.doubleMethod(0.0);"));
+        assertEquals(14.0, e.eval("o.doubleMethod(7.0);"));
+        assertEquals(0.0, e.eval("o.doubleMethod('0.0');"));
+        assertEquals(14.0, e.eval("o.doubleMethod('7.0');"));
+    }
+
+    @Test
+    public void accessMethodBooleanBoxing() throws ScriptException {
+        assertEquals(Boolean.TRUE, e.eval("o.booleanBoxingMethod(java.lang.Boolean.FALSE);"));
+        assertEquals(Boolean.FALSE, e.eval("o.booleanBoxingMethod(java.lang.Boolean.TRUE);"));
+        assertEquals(Boolean.TRUE, e.eval("o.booleanBoxingMethod('');"));
+        assertEquals(Boolean.FALSE, e.eval("o.booleanBoxingMethod('false');"));
+    }
+
+    @Test
+    public void accessMethodIntBoxing() throws ScriptException {
+        assertEquals(0, e.eval("o.intBoxingMethod(0);"));
+        assertEquals(-200, e.eval("o.intBoxingMethod(-100);"));
+        assertTrue((int)e.eval("(new java.lang.Integer(2)).compareTo(10.0)") < 0);
+    }
+
+    @Test
+    public void accessMethodLongBoxing() throws ScriptException {
+        assertEquals((long) 0, e.eval("o.longBoxingMethod(0);"));
+        assertEquals((long) 400, e.eval("o.longBoxingMethod(200);"));
+        assertTrue((int)e.eval("(new java.lang.Long(2)).compareTo(10.0)") < 0);
+    }
+
+    @Test
+    public void accessMethodByteBoxing() throws ScriptException {
+        assertEquals((byte) 0, e.eval("o.byteBoxingMethod(0);"));
+        assertEquals((byte) 10, e.eval("o.byteBoxingMethod(5);"));
+        assertTrue((int)e.eval("(new java.lang.Byte(2)).compareTo(10.0)") < 0);
+    }
+
+    @Test
+    public void accessMethodShortBoxing() throws ScriptException {
+        assertEquals((short) 0, e.eval("o.shortBoxingMethod(0);"));
+        assertEquals((short) 8000, e.eval("o.shortBoxingMethod(4000);"));
+        assertTrue((int)e.eval("(new java.lang.Short(2)).compareTo(10.0)") < 0);
+    }
+
+    @Test
+    public void accessMethodCharBoxing() throws ScriptException {
+        assertEquals('A', e.eval("o.charBoxingMethod('a');"));
+        assertEquals('Z', e.eval("o.charBoxingMethod('z');"));
+        assertTrue((int)e.eval("(new java.lang.Character(2)).compareTo(10)") < 0);
+    }
+
+    @Test
+    public void accessMethodFloatBoxing() throws ScriptException {
+        assertEquals(0.0f, e.eval("o.floatBoxingMethod(0.0);"));
+        assertEquals(4.2f, e.eval("o.floatBoxingMethod(2.1);"));
+        assertTrue((int)e.eval("(new java.lang.Float(2.0)).compareTo(10.0)") < 0);
+    }
+
+    @Test
+    public void accessMethodDoubleBoxing() throws ScriptException {
+        assertEquals(0.0, e.eval("o.doubleBoxingMethod(0.0);"));
+        assertEquals(14.0, e.eval("o.doubleBoxingMethod(7.0);"));
+        assertTrue((int)e.eval("(new java.lang.Double(2)).compareTo(10.0)") < 0);
+    }
+
+    @Test
+    public void accessMethodString() throws ScriptException {
+        assertEquals("", e.eval("o.stringMethod('');"));
+        assertEquals("abcabc", e.eval("o.stringMethod('abc');"));
+    }
+
+    @Test
+    public void accessMethodObject() throws ScriptException {
+        e.put("so", new Person(5));
+        e.eval("var rso = o.objectMethod(so);");
+        assertEquals(new Person(10), e.get("rso"));
+    }
+
+    @Test
+    public void accessMethodBooleanArray() throws ScriptException {
+        assertTrue(Arrays.equals(o.booleanArrayMethod(o.publicBooleanArray), (boolean[])e.eval("o.booleanArrayMethod(o.publicBooleanArray);")));
+    }
+
+    @Test
+    public void accessMethodIntArray() throws ScriptException {
+        assertArrayEquals(o.intArrayMethod(o.publicIntArray), (int[])e.eval("o.intArrayMethod(o.publicIntArray);"));
+    }
+
+    @Test
+    public void accessMethodLongArray() throws ScriptException {
+        assertArrayEquals(o.longArrayMethod(o.publicLongArray), (long[])e.eval("o.longArrayMethod(o.publicLongArray);"));
+    }
+
+    @Test
+    public void accessMethodByteArray() throws ScriptException {
+        assertArrayEquals(o.byteArrayMethod(o.publicByteArray), (byte[])e.eval("o.byteArrayMethod(o.publicByteArray);"));
+    }
+
+    @Test
+    public void accessMethodShortArray() throws ScriptException {
+        assertArrayEquals(o.shortArrayMethod(o.publicShortArray), (short[])e.eval("o.shortArrayMethod(o.publicShortArray);"));
+    }
+
+    @Test
+    public void accessMethodCharArray() throws ScriptException {
+        assertArrayEquals(o.charArrayMethod(o.publicCharArray), (char[])e.eval("o.charArrayMethod(o.publicCharArray);"));
+    }
+
+    @Test
+    public void accessMethodFloatArray() throws ScriptException {
+        assertArrayEquals(o.floatArrayMethod(o.publicFloatArray), (float[])e.eval("o.floatArrayMethod(o.publicFloatArray);"), 1e-10f);
+    }
+
+    @Test
+    public void accessMethodDoubleArray() throws ScriptException {
+        assertArrayEquals(o.doubleArrayMethod(o.publicDoubleArray), (double[])e.eval("o.doubleArrayMethod(o.publicDoubleArray);"), 1e-10);
+    }
+
+    @Test
+    public void accessMethodStringArray() throws ScriptException {
+        assertArrayEquals(o.stringArrayMethod(o.publicStringArray), (String[])e.eval("o.stringArrayMethod(o.publicStringArray);"));
+    }
+
+    @Test
+    public void accessMethodObjectArray() throws ScriptException {
+        assertArrayEquals(o.objectArrayMethod(o.publicObjectArray), (Person[])e.eval("o.objectArrayMethod(o.publicObjectArray);"));
+    }
+
+    @Test
+    public void accessDefaultConstructor() throws ScriptException {
+        e.eval("var dc = new Packages.jdk.nashorn.internal.access.Person()");
+        assertEquals(new Person(), e.get("dc"));
+    }
+
+    @Test
+    public void accessCustomConstructor() throws ScriptException {
+        e.eval("var cc = new Packages.jdk.nashorn.internal.access.Person(17)");
+        assertEquals(new Person(17), e.get("cc"));
+    }
+
+    @Test
+    public void accessMethod2PrimitiveParams() throws ScriptException {
+        assertEquals(o.twoParamMethod(50, 40.0), e.eval("o.twoParamMethod(50,40);"));
+    }
+
+    @Test
+    public void accessMethod3PrimitiveParams() throws ScriptException {
+        assertEquals(o.threeParamMethod((short)10, 20L, 'b'), e.eval("o.threeParamMethod(10,20,'b');"));
+    }
+
+    @Test
+    public void accessMethod2ObjectParams() throws ScriptException {
+        assertArrayEquals(new Person[] { new Person(200), new Person(300) }, (Person[])e.eval("o.twoObjectParamMethod(new Person(300),new Person(200));"));
+    }
+
+    @Test
+    public void accessMethod3ObjectParams() throws ScriptException {
+        assertArrayEquals(new Person[] { new Person(3), new Person(2), new Person(1) }, (Person[])e.eval("o.threeObjectParamMethod(new Person(1),new Person(2),new Person(3));"));
+    }
+
+    @Test
+    public void accessMethod8ObjectParams() throws ScriptException {
+        assertArrayEquals(new Person[] { new Person(8), new Person(7), new Person(6), new Person(5), new Person(4), new Person(3), new Person(2), new Person(1) }, (Person[])e.eval("o.eightObjectParamMethod(new Person(1),new Person(2),new Person(3)," + "new Person(4),new Person(5),new Person(6),new Person(7),new Person(8));"));
+    }
+
+    @Test
+    public void accessMethod9ObjectParams() throws ScriptException {
+        assertArrayEquals(new Person[] { new Person(9), new Person(8), new Person(7), new Person(6), new Person(5), new Person(4), new Person(3), new Person(2), new Person(1) }, (Person[])e.eval("o.nineObjectParamMethod(new Person(1),new Person(2),new Person(3)," + "new Person(4),new Person(5),new Person(6)," + "new Person(7),new Person(8),new Person(9));"));
+    }
+
+    @Test
+    public void accessMethodObjectEllipsis() throws ScriptException {
+        assertArrayEquals(new Person[] { new Person(9), new Person(8), new Person(7), new Person(6), new Person(5), new Person(4), new Person(3), new Person(2), new Person(1) }, (Person[])e.eval("o.methodObjectEllipsis(new Person(1),new Person(2),new Person(3)," + "new Person(4),new Person(5),new Person(6)," + "new Person(7),new Person(8),new Person(9));"));
+        assertArrayEquals(new Person[] {}, (Person[])e.eval("o.methodObjectEllipsis()"));
+        assertArrayEquals(new Person[] { new Person(9) }, (Person[])e.eval("o.methodObjectEllipsis(new Person(9))"));
+    }
+
+    @Test
+    public void accessMethodPrimitiveEllipsis() throws ScriptException {
+        assertArrayEquals(new Person[] { new Person(1), new Person(3), new Person(2) }, (Person[])e.eval("o.methodPrimitiveEllipsis(1,3,2);"));
+        assertArrayEquals(new Person[] {}, (Person[])e.eval("o.methodPrimitiveEllipsis();"));
+        assertArrayEquals(o.methodPrimitiveEllipsis(9, 8, 7, 6, 5, 4, 3, 2, 1), (Person[])e.eval("o.methodPrimitiveEllipsis(9,8,7,6,5,4,3,2,1);"));
+    }
+
+    @Test
+    public void accessMethodMixedEllipsis() throws ScriptException {
+        assertArrayEquals(new Object[] { new Person(1), 12, "hello", true }, (Object[])e.eval("o.methodMixedEllipsis(new Person(1),12,'hello',true);"));
+        assertArrayEquals(new Object[] {}, (Object[])e.eval("o.methodMixedEllipsis();"));
+    }
+
+    @Test
+    public void accessMethodObjectWithEllipsis() throws ScriptException {
+        assertArrayEquals(new Object[] { "hello", 12, 15, 16 }, (Object[])e.eval("o.methodObjectWithEllipsis('hello',12,15,16);"));
+        assertArrayEquals(new Object[] { "hello" }, (Object[])e.eval("o.methodObjectWithEllipsis('hello');"));
+    }
+
+    @Test
+    public void accessMethodPrimitiveWithEllipsis() throws ScriptException {
+        assertArrayEquals(new Object[] { 14, 12L, 15L, 16L }, (Object[])e.eval("o.methodPrimitiveWithEllipsis(14,12,15,16);"));
+        assertArrayEquals(new Object[] { 12 }, (Object[])e.eval("o.methodPrimitiveWithEllipsis(12);"));
+    }
+
+    @Test
+    public void accessMethodMixedWithEllipsis() throws ScriptException {
+        assertArrayEquals(new Object[] { "Hello", 10, true, -100500, 80 }, (Object[])e.eval("o.methodMixedWithEllipsis('Hello', 10, true, -100500,80.0);"));
+        assertArrayEquals(new Object[] { "Nashorn", 15 }, (Object[])e.eval("o.methodMixedWithEllipsis('Nashorn',15);"));
+    }
+
+    @Test
+    public void accessMethodOverloaded() throws ScriptException {
+        assertEquals(0, e.eval("o.overloadedMethod(0);"));
+        assertEquals(2000, e.eval("o.overloadedMethod(1000);"));
+        assertEquals(2, e.eval("o.overloadedMethod('10');"));
+        assertEquals(7, e.eval("o.overloadedMethod('Nashorn');"));
+        assertEquals(4, e.eval("o.overloadedMethod('true');"));
+        assertEquals(1, e.eval("o.overloadedMethod(true);"));
+        assertEquals(0, e.eval("o.overloadedMethod(false);"));
+        assertEquals(44, e.eval("o.overloadedMethod(new Person(22));"));
+        assertEquals(0, e.eval("o.overloadedMethod(new Person());"));
+    }
+
+    @Test
+    public void accessMethodDoubleVSintOverloaded() throws ScriptException {
+        assertEquals("int", e.eval("o.overloadedMethodDoubleVSint(0.0);"));
+        assertEquals("int", e.eval("o.overloadedMethodDoubleVSint(1000.0);"));
+        assertEquals("double", e.eval("o.overloadedMethodDoubleVSint(0.01);"));
+        assertEquals("double", e.eval("o.overloadedMethodDoubleVSint(100.02);"));
+        assertEquals("int", e.eval("o.overloadedMethodDoubleVSint(0);"));
+        assertEquals("int", e.eval("o.overloadedMethodDoubleVSint(1000);"));
+    }
+
+    @Test
+    public void accessJavaMethodIntFromJSFromJavaFromJS() throws ScriptException {
+        e.eval("function secondLevelMethodInt(a) {"
+                + "return o.thirdLevelMethodInt(a);"
+                + "}");
+        assertEquals(50, e.eval("o.firstLevelMethodInt(10);"));
+    }
+
+    @Test
+    public void accessJavaMethodIntegerFromJSFromJavaFromJS() throws ScriptException {
+        e.eval("function secondLevelMethodInteger(a) {"
+                + "return o.thirdLevelMethodInteger(a);"
+                + "}");
+        assertEquals(100, e.eval("o.firstLevelMethodInteger(10);"));
+    }
+
+    @Test
+    public void accessJavaMethodObjectFromJSFromJavaFromJS() throws ScriptException {
+        e.eval("function secondLevelMethodObject(p) {"
+                + "return o.thirdLevelMethodObject(p);"
+                + "}");
+        assertEquals(new Person(100), e.eval("o.firstLevelMethodObject(new Person(10));"));
+    }
+
+}
diff --git a/nashorn/test/src/jdk/nashorn/internal/access/NumberAccessTest.java b/nashorn/test/src/jdk/nashorn/internal/access/NumberAccessTest.java
new file mode 100644
index 00000000000..64b2e00216b
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/access/NumberAccessTest.java
@@ -0,0 +1,776 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.access;
+
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertTrue;
+import static org.testng.internal.junit.ArrayAsserts.assertArrayEquals;
+
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+import org.testng.TestNG;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+public class NumberAccessTest {
+
+    private static ScriptEngine e = null;
+    private static SharedObject o = new SharedObject();
+
+    public static void main(final String[] args) {
+        TestNG.main(args);
+    }
+
+    @BeforeClass
+    public static void setUpClass() throws ScriptException {
+        final ScriptEngineManager m = new ScriptEngineManager();
+        e = m.getEngineByName("nashorn");
+        e.put("o", o);
+        e.eval("var SharedObject = Packages.jdk.nashorn.internal.access.SharedObject;");
+    }
+
+    // --------------------------------long
+    // tests------------------------------------
+    @Test
+    public void accessFieldLong() throws ScriptException {
+        e.eval("var p_long = o.publicLong;");
+        assertEquals(o.publicLong, e.get("p_long"));
+        e.eval("o.publicLong = 12;");
+        assertEquals(12, o.publicLong);
+    }
+
+    @Test
+    public void accessFieldLongArray() throws ScriptException {
+        e.eval("var p_long_array = o.publicLongArray;");
+        assertEquals(o.publicLongArray[0], e.eval("o.publicLongArray[0];"));
+        assertArrayEquals(o.publicLongArray, (long[])e.get("p_long_array"));
+        e.eval("var t_long_arr = java.lang.reflect.Array.newInstance(java.lang.Long.TYPE, 3);" +
+                "t_long_arr[0] = -189009;" +
+                "t_long_arr[1] = 456;" +
+                "t_long_arr[2] = 600000001;" +
+                "o.publicLongArray = t_long_arr;");
+        // e.eval("o.publicIntArray = [-189009,456,600000001];");
+        assertArrayEquals(new long[] { -189009, 456, 600000001 }, o.publicLongArray);
+        e.eval("o.publicLongArray[0] = 10;");
+        assertEquals(10, o.publicLongArray[0]);
+    }
+
+    @Test
+    public void accessStaticFieldLong() throws ScriptException {
+        e.eval("var ps_long = SharedObject.publicStaticLong;");
+        assertEquals(SharedObject.publicStaticLong, e.get("ps_long"));
+        e.eval("SharedObject.publicStaticLong = 120;");
+        assertEquals(120, SharedObject.publicStaticLong);
+    }
+
+    @Test
+    public void accessStaticFieldLongArray() throws ScriptException {
+        e.eval("var ps_long_array = SharedObject.publicStaticLongArray;");
+        assertEquals(SharedObject.publicStaticLongArray[0], e.eval("SharedObject.publicStaticLongArray[0];"));
+        assertArrayEquals(SharedObject.publicStaticLongArray, (long[])e.get("ps_long_array"));
+        e.eval("var ts_long_arr = java.lang.reflect.Array.newInstance(java.lang.Long.TYPE, 3);" +
+                "ts_long_arr[0] = -189009;" +
+                "ts_long_arr[1] = 456;" +
+                "ts_long_arr[2] = 600000001;" +
+                "SharedObject.publicStaticLongArray = ts_long_arr;");
+        // e.eval("o.publicIntArray = [-189009,456,600000001];");
+        assertArrayEquals(new long[] { -189009, 456, 600000001 }, SharedObject.publicStaticLongArray);
+        e.eval("SharedObject.publicStaticLongArray[0] = 10;");
+        assertEquals(10, SharedObject.publicStaticLongArray[0]);
+    }
+
+    @Test
+    public void accessFinalFieldLong() throws ScriptException {
+        e.eval("var pf_long = o.publicFinalLong;");
+        assertEquals(o.publicFinalLong, e.get("pf_long"));
+        e.eval("o.publicFinalLong = 120;");
+        assertEquals(13353333333333333L, o.publicFinalLong);
+    }
+
+    @Test
+    public void accessFinalFieldLongArray() throws ScriptException {
+        e.eval("var pf_long_array = o.publicFinalLongArray;");
+        assertEquals(o.publicFinalLongArray[0], e.eval("o.publicFinalLongArray[0];"));
+        assertArrayEquals(o.publicFinalLongArray, (long[])e.get("pf_long_array"));
+        e.eval("var tf_long_arr = java.lang.reflect.Array.newInstance(java.lang.Long.TYPE, 3);" +
+                "tf_long_arr[0] = -189009;" +
+                "tf_long_arr[1] = 456;" +
+                "tf_long_arr[2] = 600000001;" +
+                "o.publicFinalLongArray = tf_long_arr;");
+        // e.eval("o.publicIntArray = [-189009,456,600000001];");
+        assertArrayEquals(new long[] { 1901733333333L, -2247355555L, 3977377777L }, o.publicFinalLongArray);
+        e.eval("o.publicFinalLongArray[0] = 10;");
+        assertEquals(10, o.publicFinalLongArray[0]);
+    }
+
+    @Test
+    public void accessStaticFinalFieldLong() throws ScriptException {
+        e.eval("var psf_long = SharedObject.publicStaticFinalLong;");
+        assertEquals(SharedObject.publicStaticFinalLong, e.get("psf_long"));
+        e.eval("SharedObject.publicStaticFinalLong = 120;");
+        assertEquals(8333333333333L, SharedObject.publicStaticFinalLong);
+    }
+
+    @Test
+    public void accessStaticFinalFieldLongArray() throws ScriptException {
+        e.eval("var psf_long_array = SharedObject.publicStaticFinalLongArray;");
+        assertEquals(SharedObject.publicStaticFinalLongArray[0], e.eval("SharedObject.publicStaticFinalLongArray[0];"));
+        assertArrayEquals(SharedObject.publicStaticFinalLongArray, (long[])e.get("psf_long_array"));
+        e.eval("var tsf_long_arr = java.lang.reflect.Array.newInstance(java.lang.Long.TYPE, 3);" +
+                "tsf_long_arr[0] = -189009;" +
+                "tsf_long_arr[1] = 456;" +
+                "tsf_long_arr[2] = 600000001;" +
+                "SharedObject.publicStaticFinalLongArray = tsf_long_arr;");
+        // e.eval("o.publicIntArray = [-189009,456,600000001];");
+        assertArrayEquals(new long[] { 19017383333L, -2247358L, 39773787L }, SharedObject.publicStaticFinalLongArray);
+        e.eval("SharedObject.publicStaticFinalLongArray[0] = 10;");
+        assertEquals(10, SharedObject.publicStaticFinalLongArray[0]);
+    }
+
+    // --------------------------------int
+    // tests------------------------------------
+    @Test
+    public void accessFieldInt() throws ScriptException {
+        e.eval("var p_int = o.publicInt;");
+        assertEquals(o.publicInt, e.get("p_int"));
+        e.eval("o.publicInt = 14;");
+        assertEquals(14, o.publicInt);
+    }
+
+    @Test
+    public void accessFieldIntArray() throws ScriptException {
+        e.eval("var p_int_array = o.publicIntArray;");
+        assertEquals(o.publicIntArray[0], e.eval("o.publicIntArray[0];"));
+        assertArrayEquals(o.publicIntArray, (int[])e.get("p_int_array"));
+        e.eval("var t_int_arr = java.lang.reflect.Array.newInstance(java.lang.Integer.TYPE, 3);" +
+                "t_int_arr[0] = 4;" +
+                "t_int_arr[1] = 5;" +
+                "t_int_arr[2] = 6;" +
+                "o.publicIntArray = t_int_arr;");
+        assertArrayEquals(new int[] { 4, 5, 6 }, o.publicIntArray);
+        e.eval("o.publicIntArray[0] = 100;");
+        assertEquals(100, o.publicIntArray[0]);
+    }
+
+    @Test
+    public void accessStaticFieldInt() throws ScriptException {
+        e.eval("var ps_int = SharedObject.publicStaticInt;");
+        assertEquals(SharedObject.publicStaticInt, e.get("ps_int"));
+        e.eval("SharedObject.publicStaticInt = 140;");
+        assertEquals(140, SharedObject.publicStaticInt);
+    }
+
+    @Test
+    public void accessStaticFieldIntArray() throws ScriptException {
+        e.eval("var ps_int_array = SharedObject.publicStaticIntArray;");
+        assertEquals(SharedObject.publicStaticIntArray[0], e.eval("SharedObject.publicStaticIntArray[0];"));
+        assertArrayEquals(SharedObject.publicStaticIntArray, (int[])e.get("ps_int_array"));
+        e.eval("var ts_int_arr = java.lang.reflect.Array.newInstance(java.lang.Integer.TYPE, 3);" +
+                "ts_int_arr[0] = 4;" +
+                "ts_int_arr[1] = 5;" +
+                "ts_int_arr[2] = 6;" +
+                "SharedObject.publicStaticIntArray = ts_int_arr;");
+        assertArrayEquals(new int[] { 4, 5, 6 }, SharedObject.publicStaticIntArray);
+        e.eval("SharedObject.publicStaticIntArray[0] = 100;");
+        assertEquals(100, SharedObject.publicStaticIntArray[0]);
+    }
+
+    @Test
+    public void accessFinalFieldInt() throws ScriptException {
+        e.eval("var pf_int = o.publicFinalInt;");
+        assertEquals(o.publicFinalInt, e.get("pf_int"));
+
+        e.eval("o.publicFinalInt = 10;");
+        assertEquals(20712023, o.publicFinalInt);
+    }
+
+    @Test
+    public void accessFinalFieldIntArray() throws ScriptException {
+        e.eval("var pf_int_array = o.publicFinalIntArray;");
+        assertEquals(o.publicFinalIntArray[0], e.eval("o.publicFinalIntArray[0];"));
+        assertArrayEquals(o.publicFinalIntArray, (int[])e.get("pf_int_array"));
+        e.eval("var tf_int_arr = java.lang.reflect.Array.newInstance(java.lang.Integer.TYPE, 3);" +
+                "tf_int_arr[0] = 4;" +
+                "tf_int_arr[1] = 5;" +
+                "tf_int_arr[2] = 6;" +
+                "o.publicFinalIntArray = tf_int_arr;");
+        assertArrayEquals(new int[] { 50, 80, 130, 210, 340 }, o.publicFinalIntArray);
+        e.eval("o.publicFinalIntArray[0] = 100;");
+        assertEquals(100, o.publicFinalIntArray[0]);
+    }
+
+    @Test
+    public void accessStaticFinalFieldInt() throws ScriptException {
+        e.eval("var psf_int = SharedObject.publicStaticFinalInt;");
+        assertEquals(SharedObject.publicStaticFinalInt, e.get("psf_int"));
+        e.eval("SharedObject.publicStaticFinalInt = 140;");
+        assertEquals(207182023, SharedObject.publicStaticFinalInt);
+    }
+
+    @Test
+    public void accessStaticFinalFieldIntArray() throws ScriptException {
+        e.eval("var psf_int_array = SharedObject.publicStaticFinalIntArray;");
+        assertEquals(SharedObject.publicStaticFinalIntArray[0], e.eval("SharedObject.publicStaticFinalIntArray[0];"));
+        assertArrayEquals(SharedObject.publicStaticFinalIntArray, (int[])e.get("psf_int_array"));
+        e.eval("var tsf_int_arr = java.lang.reflect.Array.newInstance(java.lang.Integer.TYPE, 3);" +
+                "tsf_int_arr[0] = 4;" +
+                "tsf_int_arr[1] = 5;" +
+                "tsf_int_arr[2] = 6;" +
+                "SharedObject.publicStaticFinalIntArray = tsf_int_arr;");
+        assertArrayEquals(new int[] { 1308, 210, 340 }, SharedObject.publicStaticFinalIntArray);
+        e.eval("SharedObject.publicStaticFinalIntArray[0] = 100;");
+        assertEquals(100, SharedObject.publicStaticFinalIntArray[0]);
+    }
+
+    // --------------------------------byte
+    // tests------------------------------------
+    @Test
+    public void accessFieldByte() throws ScriptException {
+        e.eval("var p_byte = o.publicByte;");
+        assertEquals(o.publicByte, e.get("p_byte"));
+        e.eval("o.publicByte = 16;");
+        assertEquals(16, o.publicByte);
+    }
+
+    @Test
+    public void accessFieldByteArray() throws ScriptException {
+        e.eval("var p_byte_array = o.publicByteArray;");
+        assertEquals(o.publicByteArray[0], e.eval("o.publicByteArray[0];"));
+        assertArrayEquals(o.publicByteArray, (byte[])e.get("p_byte_array"));
+        e.eval("var t_byte_arr = java.lang.reflect.Array.newInstance(java.lang.Byte.TYPE, 3);" +
+                "t_byte_arr[0] = -18;" +
+                "t_byte_arr[1] = 56;" +
+                "t_byte_arr[2] = 60;" +
+                "o.publicByteArray = t_byte_arr;");
+        assertArrayEquals(new byte[] { -18, 56, 60 }, o.publicByteArray);
+        e.eval("o.publicByteArray[0] = 100;");
+        assertEquals(100, o.publicByteArray[0]);
+    }
+
+    @Test
+    public void accessStaticFieldByte() throws ScriptException {
+        e.eval("var ps_byte = SharedObject.publicStaticByte;");
+        assertEquals(SharedObject.publicStaticByte, e.get("ps_byte"));
+        e.eval("SharedObject.publicStaticByte = 16;");
+        assertEquals(16, SharedObject.publicStaticByte);
+    }
+
+    @Test
+    public void accessStaticFieldByteArray() throws ScriptException {
+        e.eval("var ps_byte_array = SharedObject.publicStaticByteArray;");
+        assertEquals(SharedObject.publicStaticByteArray[0], e.eval("SharedObject.publicStaticByteArray[0];"));
+        assertArrayEquals(SharedObject.publicStaticByteArray, (byte[])e.get("ps_byte_array"));
+        e.eval("var ts_byte_arr = java.lang.reflect.Array.newInstance(java.lang.Byte.TYPE, 3);" +
+                "ts_byte_arr[0] = -18;" +
+                "ts_byte_arr[1] = 56;" +
+                "ts_byte_arr[2] = 60;" +
+                "SharedObject.publicStaticByteArray = ts_byte_arr;");
+        assertArrayEquals(new byte[] { -18, 56, 60 }, SharedObject.publicStaticByteArray);
+        e.eval("SharedObject.publicStaticByteArray[0] = -90;");
+        assertEquals(-90, SharedObject.publicStaticByteArray[0]);
+    }
+
+    @Test
+    public void accessFinalFieldByte() throws ScriptException {
+        e.eval("var pf_byte = o.publicFinalByte;");
+        assertEquals(o.publicFinalByte, e.get("pf_byte"));
+        e.eval("o.publicFinalByte = 16;");
+        assertEquals(-7, o.publicFinalByte);
+    }
+
+    @Test
+    public void accessFinalFieldByteArray() throws ScriptException {
+        e.eval("var pf_byte_array = o.publicFinalByteArray;");
+        assertEquals(o.publicFinalByteArray[0], e.eval("o.publicFinalByteArray[0];"));
+        assertArrayEquals(o.publicFinalByteArray, (byte[])e.get("pf_byte_array"));
+        e.eval("var tf_byte_arr = java.lang.reflect.Array.newInstance(java.lang.Byte.TYPE, 3);" +
+                "tf_byte_arr[0] = -18;" +
+                "tf_byte_arr[1] = 56;" +
+                "tf_byte_arr[2] = 60;" +
+                "o.publicFinalByteArray = tf_byte_arr;");
+        assertArrayEquals(new byte[] { 1, 3, 6, 17, -128 }, o.publicFinalByteArray);
+        e.eval("o.publicFinalByteArray[0] = -90;");
+        assertEquals(-90, o.publicFinalByteArray[0]);
+    }
+
+    @Test
+    public void accessStaticFinalFieldByte() throws ScriptException {
+        e.eval("var psf_byte = SharedObject.publicStaticFinalByte;");
+        assertEquals(SharedObject.publicStaticFinalByte, e.get("psf_byte"));
+        e.eval("SharedObject.publicStaticFinalByte = 16;");
+        assertEquals(-70, SharedObject.publicStaticFinalByte);
+    }
+
+    @Test
+    public void accessStaticFinalFieldByteArray() throws ScriptException {
+        e.eval("var psf_byte_array = SharedObject.publicStaticFinalByteArray;");
+        assertEquals(SharedObject.publicStaticFinalByteArray[0], e.eval("SharedObject.publicStaticFinalByteArray[0];"));
+        assertArrayEquals(SharedObject.publicStaticFinalByteArray, (byte[])e.get("psf_byte_array"));
+        e.eval("var tsf_byte_arr = java.lang.reflect.Array.newInstance(java.lang.Byte.TYPE, 3);" +
+                "tsf_byte_arr[0] = -18;" +
+                "tsf_byte_arr[1] = 56;" +
+                "tsf_byte_arr[2] = 60;" +
+                "SharedObject.publicStaticFinalByteArray = tsf_byte_arr;");
+        assertArrayEquals(new byte[] { 17, -128, 81 }, SharedObject.publicStaticFinalByteArray);
+        e.eval("SharedObject.publicStaticFinalByteArray[0] = -90;");
+        assertEquals(-90, SharedObject.publicStaticFinalByteArray[0]);
+    }
+
+    // --------------------------------short
+    // tests------------------------------------
+    @Test
+    public void accessFieldShort() throws ScriptException {
+        e.eval("var p_short = o.publicShort;");
+        assertEquals(o.publicShort, e.get("p_short"));
+        e.eval("o.publicShort = 18;");
+        assertEquals(18, o.publicShort);
+    }
+
+    @Test
+    public void accessFieldShortArray() throws ScriptException {
+        e.eval("var p_short_array = o.publicShortArray;");
+        assertEquals(o.publicShortArray[0], e.eval("o.publicShortArray[0];"));
+        assertArrayEquals(o.publicShortArray, (short[])e.get("p_short_array"));
+        e.eval("var t_short_arr = java.lang.reflect.Array.newInstance(java.lang.Short.TYPE, 3);" +
+                "t_short_arr[0] = 90;" +
+                "t_short_arr[1] = 5;" +
+                "t_short_arr[2] = -6000;" +
+                "o.publicShortArray = t_short_arr;");
+        assertArrayEquals(new short[] { 90, 5, -6000 }, o.publicShortArray);
+        e.eval("o.publicShortArray[0] = -1000;");
+        assertEquals(-1000, o.publicShortArray[0]);
+    }
+
+    @Test
+    public void accessStaticFieldShort() throws ScriptException {
+        e.eval("var ps_short = SharedObject.publicStaticShort;");
+        assertEquals(SharedObject.publicStaticShort, e.get("ps_short"));
+        e.eval("SharedObject.publicStaticShort = 180;");
+        assertEquals(180, SharedObject.publicStaticShort);
+    }
+
+    @Test
+    public void accessStaticFieldShortArray() throws ScriptException {
+        e.eval("var ps_short_array = SharedObject.publicStaticShortArray;");
+        assertEquals(SharedObject.publicStaticShortArray[0], e.eval("SharedObject.publicStaticShortArray[0];"));
+        assertArrayEquals(SharedObject.publicStaticShortArray, (short[])e.get("ps_short_array"));
+        e.eval("var ts_short_arr = java.lang.reflect.Array.newInstance(java.lang.Short.TYPE, 3);" +
+                "ts_short_arr[0] = 90;" +
+                "ts_short_arr[1] = 5;" +
+                "ts_short_arr[2] = -6000;" +
+                "SharedObject.publicStaticShortArray = ts_short_arr;");
+        assertArrayEquals(new short[] { 90, 5, -6000 }, SharedObject.publicStaticShortArray);
+        e.eval("SharedObject.publicStaticShortArray[0] = -1000;");
+        assertEquals(-1000, SharedObject.publicStaticShortArray[0]);
+    }
+
+    @Test
+    public void accessFinalFieldShort() throws ScriptException {
+        e.eval("var pf_short = o.publicFinalShort;");
+        assertEquals(o.publicFinalShort, e.get("pf_short"));
+        e.eval("o.publicFinalShort = 180;");
+        assertEquals(31220, o.publicFinalShort);
+    }
+
+    @Test
+    public void accessFinalFieldShortArray() throws ScriptException {
+        e.eval("var pf_short_array = o.publicFinalShortArray;");
+        assertEquals(o.publicFinalShortArray[0], e.eval("o.publicFinalShortArray[0];"));
+        assertArrayEquals(o.publicFinalShortArray, (short[])e.get("pf_short_array"));
+        e.eval("var tf_short_arr = java.lang.reflect.Array.newInstance(java.lang.Short.TYPE, 3);" +
+                "tf_short_arr[0] = 90;" +
+                "tf_short_arr[1] = 5;" +
+                "tf_short_arr[2] = -6000;" +
+                "o.publicFinalShortArray = tf_short_arr;");
+        assertArrayEquals(new short[] { 12240, 9200, -17289, 1200, 12 }, o.publicFinalShortArray);
+        e.eval("o.publicFinalShortArray[0] = -1000;");
+        assertEquals(-1000, o.publicFinalShortArray[0]);
+    }
+
+    @Test
+    public void accessStaticFinalFieldShort() throws ScriptException {
+        e.eval("var psf_short = SharedObject.publicStaticFinalShort;");
+        assertEquals(SharedObject.publicStaticFinalShort, e.get("psf_short"));
+        e.eval("SharedObject.publicStaticFinalShort = 180;");
+        assertEquals(8888, SharedObject.publicStaticFinalShort);
+    }
+
+    @Test
+    public void accessStaticFinalFieldShortArray() throws ScriptException {
+        e.eval("var psf_short_array = SharedObject.publicStaticFinalShortArray;");
+        assertEquals(SharedObject.publicStaticFinalShortArray[0], e.eval("SharedObject.publicStaticFinalShortArray[0];"));
+        assertArrayEquals(SharedObject.publicStaticFinalShortArray, (short[])e.get("psf_short_array"));
+        e.eval("var tsf_short_arr = java.lang.reflect.Array.newInstance(java.lang.Short.TYPE, 3);" +
+                "tsf_short_arr[0] = 90;" +
+                "tsf_short_arr[1] = 5;" +
+                "tsf_short_arr[2] = -6000;" +
+                "SharedObject.publicStaticFinalShortArray = tsf_short_arr;");
+        assertArrayEquals(new short[] { 8240, 9280, -1289, 120, 812 }, SharedObject.publicStaticFinalShortArray);
+        e.eval("SharedObject.publicStaticFinalShortArray[0] = -1000;");
+        assertEquals(-1000, SharedObject.publicStaticFinalShortArray[0]);
+    }
+
+    // --------------------------------char
+    // tests------------------------------------
+    @Test
+    public void accessFieldChar() throws ScriptException {
+        e.eval("var p_char = o.publicChar;");
+        assertEquals(o.publicChar, e.get("p_char"));
+        e.eval("o.publicChar = 'S';");
+        assertEquals('S', o.publicChar);
+        e.eval("o.publicChar = 10;");
+        assertEquals(10, o.publicChar);
+        e.eval("try {"
+                + "    o.publicChar = 'Big string';" +
+                "} catch(e) {" +
+                "    var isThrown = true;" +
+                "}");
+        assertEquals("Exception thrown", true, e.get("isThrown"));
+        assertEquals(10, o.publicChar);
+    }
+
+    @Test
+    public void accessFieldCharArray() throws ScriptException {
+        e.eval("var p_char_array = o.publicCharArray;");
+        assertEquals(o.publicCharArray[0], e.eval("o.publicCharArray[0];"));
+        assertArrayEquals(o.publicCharArray, (char[])e.get("p_char_array"));
+        e.eval("var t_char_arr = java.lang.reflect.Array.newInstance(java.lang.Character.TYPE, 3);" +
+                "t_char_arr[0] = 'F';" +
+                "t_char_arr[1] = 'o';" +
+                "t_char_arr[2] = 'o';" +
+                "o.publicCharArray = t_char_arr;");
+        assertArrayEquals("Foo".toCharArray(), o.publicCharArray);
+        e.eval("o.publicCharArray[0] = 'Z';");
+        assertEquals('Z', o.publicCharArray[0]);
+    }
+
+    @Test
+    public void accessStaticFieldChar() throws ScriptException {
+        e.eval("var ps_char = SharedObject.publicStaticChar;");
+        assertEquals(SharedObject.publicStaticChar, e.get("ps_char"));
+        e.eval("SharedObject.publicStaticChar = 'Z';");
+        assertEquals('Z', SharedObject.publicStaticChar);
+    }
+
+    @Test
+    public void accessStaticFieldCharArray() throws ScriptException {
+        e.eval("var ps_char_array = SharedObject.publicStaticCharArray;");
+        assertEquals(SharedObject.publicStaticCharArray[0], e.eval("SharedObject.publicStaticCharArray[0];"));
+        assertArrayEquals(SharedObject.publicStaticCharArray, (char[])e.get("ps_char_array"));
+        e.eval("var ts_char_arr = java.lang.reflect.Array.newInstance(java.lang.Character.TYPE, 3);" +
+                "ts_char_arr[0] = 'G';" +
+                "ts_char_arr[1] = 'o';" +
+                "ts_char_arr[2] = 'o';" +
+                "SharedObject.publicStaticCharArray = ts_char_arr;");
+        assertArrayEquals("Goo".toCharArray(), SharedObject.publicStaticCharArray);
+        e.eval("SharedObject.publicStaticCharArray[0] = 'Z';");
+        assertEquals('Z', SharedObject.publicStaticCharArray[0]);
+    }
+
+    @Test
+    public void accessFinalFieldChar() throws ScriptException {
+        e.eval("var pf_char = o.publicFinalChar;");
+        assertEquals(o.publicFinalChar, e.get("pf_char"));
+        e.eval("o.publicFinalChar = 'S';");
+        assertEquals('E', o.publicFinalChar);
+    }
+
+    @Test
+    public void accessFinalCharArray() throws ScriptException {
+        e.eval("var pf_char_array = o.publicFinalCharArray;");
+        assertEquals(o.publicFinalCharArray[0], e.eval("o.publicFinalCharArray[0];"));
+        assertArrayEquals(o.publicFinalCharArray, (char[])e.get("pf_char_array"));
+        e.eval("var tf_char_arr = java.lang.reflect.Array.newInstance(java.lang.Character.TYPE, 3);" +
+                "tf_char_arr[0] = 'F';" +
+                "tf_char_arr[1] = 'o';" +
+                "tf_char_arr[2] = 'o';" +
+                "o.publicFinalCharArray = tf_char_arr;");
+        assertArrayEquals("Nashorn hello".toCharArray(), o.publicFinalCharArray);
+        e.eval("o.publicFinalCharArray[0] = 'Z';");
+        assertEquals('Z', o.publicFinalCharArray[0]);
+    }
+
+    @Test
+    public void accessStaticFinalFieldChar() throws ScriptException {
+        e.eval("var psf_char = SharedObject.publicStaticFinalChar;");
+        assertEquals(SharedObject.publicStaticFinalChar, e.get("psf_char"));
+        e.eval("SharedObject.publicStaticFinalChar = 'Z';");
+        assertEquals('K', SharedObject.publicStaticFinalChar);
+    }
+
+    @Test
+    public void accessStaticFinalFieldCharArray() throws ScriptException {
+        e.eval("var psf_char_array = SharedObject.publicStaticFinalCharArray;");
+        assertEquals(SharedObject.publicStaticFinalCharArray[0], e.eval("SharedObject.publicStaticFinalCharArray[0];"));
+        assertArrayEquals(SharedObject.publicStaticFinalCharArray, (char[])e.get("psf_char_array"));
+        e.eval("var tsf_char_arr = java.lang.reflect.Array.newInstance(java.lang.Character.TYPE, 3);" +
+                "tsf_char_arr[0] = 'Z';" +
+                "tsf_char_arr[1] = 'o';" +
+                "tsf_char_arr[2] = 'o';" +
+                "SharedObject.publicStaticFinalCharArray = tsf_char_arr;");
+        assertArrayEquals("StaticString".toCharArray(), SharedObject.publicStaticFinalCharArray);
+        e.eval("SharedObject.publicStaticFinalCharArray[0] = 'Z';");
+        assertEquals('Z', SharedObject.publicStaticFinalCharArray[0]);
+    }
+
+    // --------------------------------float
+    // tests------------------------------------
+    @Test
+    public void accessFieldFloat() throws ScriptException {
+        e.eval("var p_float = o.publicFloat;");
+        assertEquals(o.publicFloat, e.get("p_float"));
+        o.publicFloat = 0.0f / 0.0f;
+        assertEquals(true, e.eval("isNaN(o.publicFloat)"));
+        o.publicFloat = 1.0f / 0.0f;
+        assertEquals(true, e.eval("Number.POSITIVE_INFINITY === o.publicFloat"));
+        o.publicFloat = -1.0f / 0.0f;
+        assertEquals(true, e.eval("Number.NEGATIVE_INFINITY === o.publicFloat"));
+        e.eval("o.publicFloat = 20;");
+        assertEquals(20, o.publicFloat, 1e-10);
+        e.eval("o.publicFloat = 0.0/0.0;");
+        assertTrue(Float.isNaN(o.publicFloat));
+        e.eval("o.publicFloat = 1.0/0.0;");
+        assertEquals(Float.floatToIntBits(Float.POSITIVE_INFINITY), Float.floatToIntBits(o.publicFloat));
+        e.eval("o.publicFloat = -1.0/0.0;");
+        assertEquals(Float.NEGATIVE_INFINITY, o.publicFloat, 1e-10);
+    }
+
+    @Test
+    public void accessFieldFloatArray() throws ScriptException {
+        e.eval("var p_float_array = o.publicFloatArray;");
+        assertEquals(o.publicFloatArray[0], e.eval("o.publicFloatArray[0];"));
+        assertArrayEquals(o.publicFloatArray, (float[])e.get("p_float_array"), 1e-10f);
+        e.eval("var t_float_arr = java.lang.reflect.Array.newInstance(java.lang.Float.TYPE, 3);" +
+                "t_float_arr[0] = 9.0;" +
+                "t_float_arr[1] = 5.12345;" +
+                "t_float_arr[2] = -60.03;" +
+                "o.publicFloatArray = t_float_arr;");
+        assertArrayEquals(new float[] { 9.0f, 5.12345f, -60.03f }, o.publicFloatArray, 1e-10f);
+        e.eval("o.publicFloatArray[0] = -513.2;");
+        assertArrayEquals(new float[] { -513.2f, 5.12345f, -60.03f }, o.publicFloatArray, 1e-10f);
+    }
+
+    @Test
+    public void accessStaticFieldFloat() throws ScriptException {
+        e.eval("var ps_float = SharedObject.publicStaticFloat;");
+        assertEquals(SharedObject.publicStaticFloat, e.get("ps_float"));
+        SharedObject.publicStaticFloat = 0.0f / 0.0f;
+        assertEquals(true, e.eval("isNaN(SharedObject.publicStaticFloat)"));
+        SharedObject.publicStaticFloat = 1.0f / 0.0f;
+        assertEquals(true, e.eval("Number.POSITIVE_INFINITY === SharedObject.publicStaticFloat"));
+        SharedObject.publicStaticFloat = -1.0f / 0.0f;
+        assertEquals(true, e.eval("Number.NEGATIVE_INFINITY === SharedObject.publicStaticFloat"));
+        e.eval("SharedObject.publicStaticFloat = 20.0;");
+        assertEquals(20.0f, SharedObject.publicStaticFloat, 1e-10);
+        e.eval("SharedObject.publicStaticFloat = 0.0/0.0;");
+        assertTrue(Float.isNaN(SharedObject.publicStaticFloat));
+        e.eval("SharedObject.publicStaticFloat = 1.0/0.0;");
+        assertEquals(Float.floatToIntBits(Float.POSITIVE_INFINITY), Float.floatToIntBits(SharedObject.publicStaticFloat));
+        e.eval("SharedObject.publicStaticFloat = -1.0/0.0;");
+        assertEquals(Float.floatToIntBits(Float.NEGATIVE_INFINITY), Float.floatToIntBits(SharedObject.publicStaticFloat));
+    }
+
+    @Test
+    public void accessStaticFieldFloatArray() throws ScriptException {
+        e.eval("var ps_float_array = SharedObject.publicStaticFloatArray;");
+        assertEquals(SharedObject.publicStaticFloatArray[0], e.eval("SharedObject.publicStaticFloatArray[0];"));
+        assertArrayEquals(SharedObject.publicStaticFloatArray, (float[])e.get("ps_float_array"), 1e-10f);
+        e.eval("var ts_float_arr = java.lang.reflect.Array.newInstance(java.lang.Float.TYPE, 3);" +
+                "ts_float_arr[0] = 9.0;" +
+                "ts_float_arr[1] = 5.12345;" +
+                "ts_float_arr[2] = -60.03;" +
+                "SharedObject.publicStaticFloatArray = ts_float_arr;");
+        assertArrayEquals(new float[] { 9.0f, 5.12345f, -60.03f }, SharedObject.publicStaticFloatArray, 1e-10f);
+        e.eval("SharedObject.publicStaticFloatArray[0] = -513.2;");
+        assertArrayEquals(new float[] { -513.2f, 5.12345f, -60.03f }, SharedObject.publicStaticFloatArray, 1e-10f);
+    }
+
+    @Test
+    public void accessFinalFloat() throws ScriptException {
+        e.eval("var pf_float = o.publicFinalFloat;");
+        assertEquals(o.publicFinalFloat, e.get("pf_float"));
+        e.eval("o.publicFinalFloat = 20.0;");
+        assertEquals(7.72e8f, o.publicFinalFloat, 1e-10);
+    }
+
+    @Test
+    public void accessFinalFloatArray() throws ScriptException {
+        e.eval("var pf_float_array = o.publicFinalFloatArray;");
+        assertEquals(o.publicFinalFloatArray[0], e.eval("o.publicFinalFloatArray[0];"));
+        assertArrayEquals(o.publicFinalFloatArray, (float[])e.get("pf_float_array"), 1e-10f);
+        e.eval("var tf_float_arr = java.lang.reflect.Array.newInstance(java.lang.Float.TYPE, 3);" +
+                "tf_float_arr[0] = 9.0;" +
+                "tf_float_arr[1] = 5.12345;" +
+                "tf_float_arr[2] = -60.03;" +
+                "o.publicFinalFloatArray = tf_float_arr;");
+        assertArrayEquals(new float[] { -131.012f, 189.32f, -31.32e8f, 3.72f }, o.publicFinalFloatArray, 1e-10f);
+        e.eval("o.publicFinalFloatArray[0] = -513.2;");
+        assertEquals(-513.2f, o.publicFinalFloatArray[0], 1e-10f);
+    }
+
+    @Test
+    public void accessStaticFinalFieldFloat() throws ScriptException {
+        e.eval("var psf_float = SharedObject.publicStaticFinalFloat;");
+        assertEquals(SharedObject.publicStaticFinalFloat, e.get("psf_float"));
+        e.eval("SharedObject.publicStaticFinalFloat = 20.0;");
+        assertEquals(0.72e8f, SharedObject.publicStaticFinalFloat, 1e-10);
+    }
+
+    @Test
+    public void accessStaticFinalFieldFloatArray() throws ScriptException {
+        e.eval("var psf_float_array = SharedObject.publicStaticFinalFloatArray;");
+        assertEquals(SharedObject.publicStaticFinalFloatArray[0], e.eval("SharedObject.publicStaticFinalFloatArray[0];"));
+        assertArrayEquals(SharedObject.publicStaticFinalFloatArray, (float[])e.get("psf_float_array"), 1e-10f);
+        e.eval("var tsf_float_arr = java.lang.reflect.Array.newInstance(java.lang.Float.TYPE, 3);" +
+                "tsf_float_arr[0] = 9.0;" +
+                "tsf_float_arr[1] = 5.12345;" +
+                "tsf_float_arr[2] = -60.03;" +
+                "SharedObject.publicStaticFinalFloatArray = tsf_float_arr;");
+        assertArrayEquals(new float[] { -8131.012f, 9.32f, -138.32e8f, 0.72f }, SharedObject.publicStaticFinalFloatArray, 1e-10f);
+        e.eval("SharedObject.publicStaticFinalFloatArray[0] = -513.2;");
+        assertEquals(-513.2f, SharedObject.publicStaticFinalFloatArray[0], 1e-10f);
+    }
+
+    // --------------------------------double
+    // tests------------------------------------
+    @Test
+    public void accessFieldDouble() throws ScriptException {
+        e.eval("var p_double = o.publicDouble;");
+        assertEquals(o.publicDouble, e.get("p_double"));
+        o.publicDouble = 0.0 / 0.0;
+        assertEquals(true, e.eval("isNaN(o.publicDouble)"));
+        o.publicDouble = 1.0 / 0.0;
+        assertEquals(true, e.eval("Number.POSITIVE_INFINITY === o.publicDouble"));
+        o.publicDouble = -1.0 / 0.0;
+        assertEquals(true, e.eval("Number.NEGATIVE_INFINITY === o.publicDouble"));
+        e.eval("o.publicDouble = 30;");
+        assertEquals(Double.doubleToLongBits(30.0), Double.doubleToLongBits(o.publicDouble));
+        e.eval("o.publicDouble = 0.0/0.0;");
+        assertTrue(Double.isNaN(o.publicDouble));
+        e.eval("o.publicDouble = 1.0/0.0;");
+        assertEquals(Double.doubleToLongBits(Double.POSITIVE_INFINITY), Double.doubleToLongBits(o.publicDouble));
+        e.eval("o.publicDouble = -1.0/0.0;");
+        assertEquals(Double.doubleToLongBits(Double.NEGATIVE_INFINITY), Double.doubleToLongBits(o.publicDouble));
+    }
+
+    @Test
+    public void accessFieldDoubleArrayRead() throws ScriptException {
+        e.eval("var p_double_array = o.publicDoubleArray;");
+        assertEquals(o.publicDoubleArray[0], e.eval("o.publicDoubleArray[0];"));
+        assertArrayEquals(o.publicDoubleArray, (double[])e.get("p_double_array"), 1e-10);
+        e.eval("var t_double_arr = java.lang.reflect.Array.newInstance(java.lang.Double.TYPE, 3);" +
+                "t_double_arr[0] = 9e10;" +
+                "t_double_arr[1] = 0.677777;" +
+                "t_double_arr[2] = -0.0000001;" +
+                "o.publicDoubleArray = t_double_arr;");
+        assertArrayEquals(new double[] { 9e10, 0.677777, -0.0000001 }, o.publicDoubleArray, 1e-10f);
+        e.eval("o.publicDoubleArray[0] = -5.2e10;");
+        assertEquals(-5.2e10, o.publicDoubleArray[0], 1e-10f);
+    }
+
+    @Test
+    public void accessStaticFieldDouble() throws ScriptException {
+        e.eval("var ps_double = SharedObject.publicStaticDouble;");
+        assertEquals(SharedObject.publicStaticDouble, e.get("ps_double"));
+        SharedObject.publicStaticDouble = 0.0 / 0.0;
+        assertEquals(true, e.eval("isNaN(SharedObject.publicStaticDouble)"));
+        SharedObject.publicStaticDouble = 1.0 / 0.0;
+        assertEquals(true, e.eval("Number.POSITIVE_INFINITY === SharedObject.publicStaticDouble"));
+        SharedObject.publicStaticDouble = -1.0 / 0.0;
+        assertEquals(true, e.eval("Number.NEGATIVE_INFINITY === SharedObject.publicStaticDouble"));
+        e.eval("SharedObject.publicStaticDouble = 40.0;");
+        assertEquals(Double.doubleToLongBits(40.0), Double.doubleToLongBits(SharedObject.publicStaticDouble));
+        e.eval("SharedObject.publicStaticDouble = 0.0/0.0;");
+        assertTrue(Double.isNaN(SharedObject.publicStaticDouble));
+        e.eval("SharedObject.publicStaticDouble = 1.0/0.0;");
+        assertEquals(Double.doubleToLongBits(Double.POSITIVE_INFINITY), Double.doubleToLongBits(SharedObject.publicStaticDouble));
+        e.eval("SharedObject.publicStaticDouble = -1.0/0.0;");
+        assertEquals(Double.doubleToLongBits(Double.NEGATIVE_INFINITY), Double.doubleToLongBits(SharedObject.publicStaticDouble));
+    }
+
+    @Test
+    public void accessStaticFieldDoubleArrayRead() throws ScriptException {
+        e.eval("var ps_double_array = SharedObject.publicStaticDoubleArray;");
+        assertEquals(SharedObject.publicStaticDoubleArray[0], e.eval("SharedObject.publicStaticDoubleArray[0];"));
+        assertArrayEquals(SharedObject.publicStaticDoubleArray, (double[])e.get("ps_double_array"), 1e-10);
+        e.eval("var ts_double_arr = java.lang.reflect.Array.newInstance(java.lang.Double.TYPE, 3);" +
+                "ts_double_arr[0] = 9e10;" +
+                "ts_double_arr[1] = 0.677777;" +
+                "ts_double_arr[2] = -0.0000001;" +
+                "SharedObject.publicStaticDoubleArray = ts_double_arr;");
+        assertArrayEquals(new double[] { 9e10, 0.677777, -0.0000001 }, SharedObject.publicStaticDoubleArray, 1e-10f);
+        e.eval("SharedObject.publicStaticDoubleArray[0] = -5.2e10;");
+        assertEquals(-5.2e10, SharedObject.publicStaticDoubleArray[0], 1e-10f);
+    }
+
+    @Test
+    public void accessFinalFieldDouble() throws ScriptException {
+        e.eval("var pf_double = o.publicFinalDouble;");
+        assertEquals(o.publicFinalDouble, e.get("pf_double"));
+        e.eval("o.publicFinalDouble = 30.0;");
+        assertEquals(Double.doubleToLongBits(1.3412e20), Double.doubleToLongBits(o.publicFinalDouble));
+    }
+
+    @Test
+    public void accessFinalFieldDoubleArrayRead() throws ScriptException {
+        e.eval("var pf_double_array = o.publicFinalDoubleArray;");
+        assertEquals(o.publicFinalDoubleArray[0], e.eval("o.publicFinalDoubleArray[0];"));
+        assertArrayEquals(o.publicFinalDoubleArray, (double[])e.get("pf_double_array"), 1e-10);
+        e.eval("var tf_double_arr = java.lang.reflect.Array.newInstance(java.lang.Double.TYPE, 3);" +
+                "tf_double_arr[0] = 9e10;" +
+                "tf_double_arr[1] = 0.677777;" +
+                "tf_double_arr[2] = -0.0000001;" +
+                "o.publicFinalDoubleArray = tf_double_arr;");
+        assertArrayEquals(new double[] { 0.725e80, 0.12e10, 8e-3, 1.00077 }, o.publicFinalDoubleArray, 1e-10f);
+        e.eval("o.publicFinalDoubleArray[0] = -5.2e10;");
+        assertEquals(-5.2e10, o.publicFinalDoubleArray[0], 1e-10f);
+    }
+
+    @Test
+    public void accessStaticFinalFieldDouble() throws ScriptException {
+        e.eval("var psf_double = SharedObject.publicStaticFinalDouble;");
+        assertEquals(SharedObject.publicStaticFinalDouble, e.get("psf_double"));
+        e.eval("SharedObject.publicStaticFinalDouble = 40.0;");
+        assertEquals(Double.doubleToLongBits(1.8e12), Double.doubleToLongBits(SharedObject.publicStaticFinalDouble));
+    }
+
+    @Test
+    public void accessStaticFinalFieldDoubleArrayRead() throws ScriptException {
+        e.eval("var psf_double_array = SharedObject.publicStaticFinalDoubleArray;");
+        assertEquals(SharedObject.publicStaticFinalDoubleArray[0], e.eval("SharedObject.publicStaticFinalDoubleArray[0];"));
+        assertArrayEquals(SharedObject.publicStaticFinalDoubleArray, (double[])e.get("psf_double_array"), 1e-10);
+        e.eval("var tsf_double_arr = java.lang.reflect.Array.newInstance(java.lang.Double.TYPE, 3);" +
+                "tsf_double_arr[0] = 9e10;" +
+                "tsf_double_arr[1] = 0.677777;" +
+                "tsf_double_arr[2] = -0.0000001;" +
+                "SharedObject.publicStaticFinalDoubleArray = tsf_double_arr;");
+        assertArrayEquals(new double[] { 8.725e80, 0.82e10, 18e-3, 1.08077 }, SharedObject.publicStaticFinalDoubleArray, 1e-10f);
+        e.eval("SharedObject.publicStaticFinalDoubleArray[0] = -5.2e10;");
+        assertEquals(-5.2e10, SharedObject.publicStaticFinalDoubleArray[0], 1e-10f);
+    }
+
+}
diff --git a/nashorn/test/src/jdk/nashorn/internal/access/NumberBoxingTest.java b/nashorn/test/src/jdk/nashorn/internal/access/NumberBoxingTest.java
new file mode 100644
index 00000000000..23627c26c46
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/access/NumberBoxingTest.java
@@ -0,0 +1,348 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.access;
+
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertTrue;
+
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+import org.testng.TestNG;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+public class NumberBoxingTest {
+
+    private static ScriptEngine e = null;
+    private static SharedObject o = new SharedObject();
+
+    public static void main(final String[] args) {
+        TestNG.main(args);
+    }
+
+    @BeforeClass
+    public static void setUpClass() throws ScriptException {
+        final ScriptEngineManager m = new ScriptEngineManager();
+        e = m.getEngineByName("nashorn");
+        e.put("o", o);
+        e.eval("var SharedObject = Packages.jdk.nashorn.internal.access.SharedObject;");
+    }
+
+    // --------------------------------long
+    // tests------------------------------------
+    @Test
+    public void accessFieldLongBoxing() throws ScriptException {
+        e.eval("var p_long = o.publicLongBox;");
+        assertEquals(o.publicLongBox, e.get("p_long"));
+        e.eval("o.publicLongBox = 12;");
+        assertEquals(Long.valueOf(12), o.publicLongBox);
+    }
+
+    @Test
+    public void accessStaticFieldLongBoxing() throws ScriptException {
+        e.eval("var ps_long = SharedObject.publicStaticLong;");
+        assertEquals(SharedObject.publicStaticLong, e.get("ps_long"));
+        e.eval("SharedObject.publicStaticLong = 120;");
+        assertEquals(120, SharedObject.publicStaticLong);
+    }
+
+    @Test
+    public void accessFinalFieldLongBoxing() throws ScriptException {
+        e.eval("var pf_long = o.publicFinalLongBox;");
+        assertEquals(o.publicFinalLongBox, e.get("pf_long"));
+        e.eval("o.publicFinalLongBox = 120;");
+        assertEquals(Long.valueOf(9377333334L), o.publicFinalLongBox);
+    }
+
+    @Test
+    public void accessStaticFinalFieldLongBoxing() throws ScriptException {
+        e.eval("var psf_long = SharedObject.publicStaticFinalLong;");
+        assertEquals(SharedObject.publicStaticFinalLong, e.get("psf_long"));
+        e.eval("SharedObject.publicStaticFinalLong = 120;");
+        assertEquals(8333333333333L, SharedObject.publicStaticFinalLong);
+    }
+
+    // --------------------------------int
+    // tests------------------------------------
+    @Test
+    public void accessFieldIntBoxing() throws ScriptException {
+        e.eval("var p_int = o.publicIntBox;");
+        assertEquals(o.publicIntBox, e.get("p_int"));
+        e.eval("o.publicIntBox = 14;");
+        assertEquals(Integer.valueOf(14), o.publicIntBox);
+    }
+
+    @Test
+    public void accessStaticFieldIntBoxing() throws ScriptException {
+        e.eval("var ps_int = SharedObject.publicStaticInt;");
+        assertEquals(SharedObject.publicStaticInt, e.get("ps_int"));
+        e.eval("SharedObject.publicStaticInt = 140;");
+        assertEquals(140, SharedObject.publicStaticInt);
+    }
+
+    @Test
+    public void accessFinalFieldIntBoxing() throws ScriptException {
+        e.eval("var pf_int = o.publicFinalIntBox;");
+        assertEquals(o.publicFinalIntBox, e.get("pf_int"));
+        e.eval("o.publicFinalIntBox = 10;");
+        assertEquals(Integer.valueOf(207512301), o.publicFinalIntBox);
+    }
+
+    @Test
+    public void accessStaticFinalFieldIntBoxing() throws ScriptException {
+        e.eval("var psf_int = SharedObject.publicStaticFinalInt;");
+        assertEquals(SharedObject.publicStaticFinalInt, e.get("psf_int"));
+        e.eval("SharedObject.publicStaticFinalInt = 140;");
+        assertEquals(207182023, SharedObject.publicStaticFinalInt);
+    }
+
+    // --------------------------------byte
+    // tests------------------------------------
+    @Test
+    public void accessFieldByteBoxing() throws ScriptException {
+        e.eval("var p_byte = o.publicByteBox;");
+        assertEquals(o.publicByteBox, e.get("p_byte"));
+        e.eval("o.publicByteBox = 16;");
+        assertEquals(Byte.valueOf((byte)16), o.publicByteBox);
+    }
+
+    @Test
+    public void accessStaticFieldByteBoxing() throws ScriptException {
+        e.eval("var ps_byte = SharedObject.publicStaticByte;");
+        assertEquals(SharedObject.publicStaticByte, e.get("ps_byte"));
+        e.eval("SharedObject.publicStaticByte = 16;");
+        assertEquals(16, SharedObject.publicStaticByte);
+    }
+
+    @Test
+    public void accessFinalFieldByteBoxing() throws ScriptException {
+        e.eval("var pf_byte = o.publicFinalByteBox;");
+        assertEquals(o.publicFinalByteBox, e.get("pf_byte"));
+        e.eval("o.publicFinalByteBox = 16;");
+        assertEquals(Byte.valueOf((byte)19), o.publicFinalByteBox);
+    }
+
+    @Test
+    public void accessStaticFinalFieldByteBoxing() throws ScriptException {
+        e.eval("var psf_byte = SharedObject.publicStaticFinalByte;");
+        assertEquals(SharedObject.publicStaticFinalByte, e.get("psf_byte"));
+        e.eval("SharedObject.publicStaticFinalByte = 16;");
+        assertEquals(-70, SharedObject.publicStaticFinalByte);
+    }
+
+    // --------------------------------short
+    // tests------------------------------------
+    @Test
+    public void accessFieldShortBoxing() throws ScriptException {
+        e.eval("var p_short = o.publicShortBox;");
+        assertEquals(o.publicShortBox, e.get("p_short"));
+        e.eval("o.publicShortBox = 18;");
+        assertEquals(Short.valueOf((short)18), o.publicShortBox);
+    }
+
+    @Test
+    public void accessStaticFieldShortBoxing() throws ScriptException {
+        e.eval("var ps_short = SharedObject.publicStaticShort;");
+        assertEquals(SharedObject.publicStaticShort, e.get("ps_short"));
+        e.eval("SharedObject.publicStaticShort = 180;");
+        assertEquals(180, SharedObject.publicStaticShort);
+    }
+
+    @Test
+    public void accessFinalFieldShortBoxing() throws ScriptException {
+        e.eval("var pf_short = o.publicFinalShortBox;");
+        assertEquals(o.publicFinalShortBox, e.get("pf_short"));
+        e.eval("o.publicFinalShortBox = 180;");
+        assertEquals(Short.valueOf((short)-26777), o.publicFinalShortBox);
+    }
+
+    @Test
+    public void accessStaticFinalFieldShortBoxing() throws ScriptException {
+        e.eval("var psf_short = SharedObject.publicStaticFinalShort;");
+        assertEquals(SharedObject.publicStaticFinalShort, e.get("psf_short"));
+        e.eval("SharedObject.publicStaticFinalShort = 180;");
+        assertEquals(8888, SharedObject.publicStaticFinalShort);
+    }
+
+    // --------------------------------char
+    // tests------------------------------------
+    @Test
+    public void accessFieldCharBoxing() throws ScriptException {
+        e.eval("var p_char = o.publicCharBox;");
+        assertEquals(o.publicCharBox, e.get("p_char"));
+        e.eval("o.publicCharBox = 'S';");
+        assertEquals(Character.valueOf('S'), o.publicCharBox);
+        e.eval("try {" +
+                "    o.publicCharBox = 'Big string';" +
+                "} catch(e) {" +
+                "    var isThrown = true;" +
+                "}");
+        assertEquals("Exception thrown", true, e.get("isThrown"));
+        assertEquals(Character.valueOf('S'), o.publicCharBox);
+    }
+
+    @Test
+    public void accessStaticFieldCharBoxing() throws ScriptException {
+        e.eval("var ps_char = SharedObject.publicStaticChar;");
+        assertEquals(SharedObject.publicStaticChar, e.get("ps_char"));
+        e.eval("SharedObject.publicStaticChar = 'Z';");
+        assertEquals('Z', SharedObject.publicStaticChar);
+    }
+
+    @Test
+    public void accessFinalFieldCharBoxing() throws ScriptException {
+        e.eval("var pf_char = o.publicFinalCharBox;");
+        assertEquals(o.publicFinalCharBox, e.get("pf_char"));
+        e.eval("o.publicFinalCharBox = 'S';");
+        assertEquals(Character.valueOf('F'), o.publicFinalCharBox);
+    }
+
+    @Test
+    public void accessStaticFinalFieldCharBoxing() throws ScriptException {
+        e.eval("var psf_char = SharedObject.publicStaticFinalChar;");
+        assertEquals(SharedObject.publicStaticFinalChar, e.get("psf_char"));
+        e.eval("SharedObject.publicStaticFinalChar = 'Z';");
+        assertEquals('K', SharedObject.publicStaticFinalChar);
+    }
+
+    // --------------------------------float
+    // tests------------------------------------
+    @Test
+    public void accessFieldFloatBoxing() throws ScriptException {
+        e.eval("var p_float = o.publicFloatBox;");
+        assertEquals(o.publicFloatBox, e.get("p_float"));
+        o.publicFloatBox = 0.0f / 0.0f;
+        assertEquals(true, e.eval("isNaN(o.publicFloatBox)"));
+        o.publicFloatBox = 1.0f / 0.0f;
+        assertEquals(true, e.eval("Number.POSITIVE_INFINITY === o.publicFloatBox"));
+        o.publicFloatBox = -1.0f / 0.0f;
+        assertEquals(true, e.eval("Number.NEGATIVE_INFINITY === o.publicFloatBox"));
+        e.eval("o.publicFloatBox = 20;");
+        assertEquals(20, o.publicFloatBox, 1e-10);
+        e.eval("o.publicFloatBox = 0.0/0.0;");
+        assertTrue(Float.isNaN(o.publicFloatBox));
+        e.eval("o.publicFloatBox = 1.0/0.0;");
+        assertEquals(Float.floatToIntBits(Float.POSITIVE_INFINITY), Float.floatToIntBits(o.publicFloatBox));
+        e.eval("o.publicFloatBox = -1.0/0.0;");
+        assertEquals(Float.NEGATIVE_INFINITY, o.publicFloatBox, 1e-10);
+    }
+
+    @Test
+    public void accessStaticFieldFloatBoxing() throws ScriptException {
+        e.eval("var ps_float = SharedObject.publicStaticFloat;");
+        assertEquals(SharedObject.publicStaticFloat, e.get("ps_float"));
+        SharedObject.publicStaticFloat = 0.0f / 0.0f;
+        assertEquals(true, e.eval("isNaN(SharedObject.publicStaticFloat)"));
+        SharedObject.publicStaticFloat = 1.0f / 0.0f;
+        assertEquals(true, e.eval("Number.POSITIVE_INFINITY === SharedObject.publicStaticFloat"));
+        SharedObject.publicStaticFloat = -1.0f / 0.0f;
+        assertEquals(true, e.eval("Number.NEGATIVE_INFINITY === SharedObject.publicStaticFloat"));
+        e.eval("SharedObject.publicStaticFloat = 20.0;");
+        assertEquals(20.0f, SharedObject.publicStaticFloat, 1e-10);
+        e.eval("SharedObject.publicStaticFloat = 0.0/0.0;");
+        assertTrue(Float.isNaN(SharedObject.publicStaticFloat));
+        e.eval("SharedObject.publicStaticFloat = 1.0/0.0;");
+        assertEquals(Float.floatToIntBits(Float.POSITIVE_INFINITY), Float.floatToIntBits(SharedObject.publicStaticFloat));
+        e.eval("SharedObject.publicStaticFloat = -1.0/0.0;");
+        assertEquals(Float.floatToIntBits(Float.NEGATIVE_INFINITY), Float.floatToIntBits(SharedObject.publicStaticFloat));
+    }
+
+    @Test
+    public void accessFinalFloatBoxing() throws ScriptException {
+        e.eval("var pf_float = o.publicFinalFloatBox;");
+        assertEquals(o.publicFinalFloatBox, e.get("pf_float"));
+        e.eval("o.publicFinalFloatBox = 20.0;");
+        assertEquals(1.372e4f, o.publicFinalFloatBox, 1e-10);
+    }
+
+    @Test
+    public void accessStaticFinalFieldFloatBoxing() throws ScriptException {
+        e.eval("var psf_float = SharedObject.publicStaticFinalFloat;");
+        assertEquals(SharedObject.publicStaticFinalFloat, e.get("psf_float"));
+        e.eval("SharedObject.publicStaticFinalFloat = 20.0;");
+        assertEquals(0.72e8f, SharedObject.publicStaticFinalFloat, 1e-10);
+    }
+
+    // --------------------------------double
+    // tests------------------------------------
+    @Test
+    public void accessFieldDoubleBoxing() throws ScriptException {
+        e.eval("var p_double = o.publicDoubleBox;");
+        assertEquals(o.publicDoubleBox, e.get("p_double"));
+        o.publicDoubleBox = 0.0 / 0.0;
+        assertEquals(true, e.eval("isNaN(o.publicDoubleBox)"));
+        o.publicDoubleBox = 1.0 / 0.0;
+        assertEquals(true, e.eval("Number.POSITIVE_INFINITY === o.publicDoubleBox"));
+        o.publicDoubleBox = -1.0 / 0.0;
+        assertEquals(true, e.eval("Number.NEGATIVE_INFINITY === o.publicDoubleBox"));
+        e.eval("o.publicDoubleBox = 30;");
+        assertEquals(Double.doubleToLongBits(30.0), Double.doubleToLongBits(o.publicDoubleBox));
+        e.eval("o.publicDoubleBox = 0.0/0.0;");
+        assertTrue(Double.isNaN(o.publicDoubleBox));
+        e.eval("o.publicDoubleBox = 1.0/0.0;");
+        assertEquals(Double.doubleToLongBits(Double.POSITIVE_INFINITY), Double.doubleToLongBits(o.publicDoubleBox));
+        e.eval("o.publicDoubleBox = -1.0/0.0;");
+        assertEquals(Double.doubleToLongBits(Double.NEGATIVE_INFINITY), Double.doubleToLongBits(o.publicDoubleBox));
+    }
+
+    @Test
+    public void accessStaticFieldDoubleBoxing() throws ScriptException {
+        e.eval("var ps_double = SharedObject.publicStaticDouble;");
+        assertEquals(SharedObject.publicStaticDouble, e.get("ps_double"));
+        SharedObject.publicStaticDouble = 0.0 / 0.0;
+        assertEquals(true, e.eval("isNaN(SharedObject.publicStaticDouble)"));
+        SharedObject.publicStaticDouble = 1.0 / 0.0;
+        assertEquals(true, e.eval("Number.POSITIVE_INFINITY === SharedObject.publicStaticDouble"));
+        SharedObject.publicStaticDouble = -1.0 / 0.0;
+        assertEquals(true, e.eval("Number.NEGATIVE_INFINITY === SharedObject.publicStaticDouble"));
+        e.eval("SharedObject.publicStaticDouble = 40.0;");
+        assertEquals(Double.doubleToLongBits(40.0), Double.doubleToLongBits(SharedObject.publicStaticDouble));
+        e.eval("SharedObject.publicStaticDouble = 0.0/0.0;");
+        assertTrue(Double.isNaN(SharedObject.publicStaticDouble));
+        e.eval("SharedObject.publicStaticDouble = 1.0/0.0;");
+        assertEquals(Double.doubleToLongBits(Double.POSITIVE_INFINITY), Double.doubleToLongBits(SharedObject.publicStaticDouble));
+        e.eval("SharedObject.publicStaticDouble = -1.0/0.0;");
+        assertEquals(Double.doubleToLongBits(Double.NEGATIVE_INFINITY), Double.doubleToLongBits(SharedObject.publicStaticDouble));
+    }
+
+    @Test
+    public void accessFinalFieldDoubleBoxing() throws ScriptException {
+        e.eval("var pf_double = o.publicFinalDoubleBox;");
+        assertEquals(o.publicFinalDoubleBox, e.get("pf_double"));
+        e.eval("o.publicFinalDoubleBox = 30.0;");
+        assertEquals(Double.doubleToLongBits(1.412e-12), Double.doubleToLongBits(o.publicFinalDoubleBox));
+    }
+
+    @Test
+    public void accessStaticFinalFieldDoubleBoxing() throws ScriptException {
+        e.eval("var psf_double = SharedObject.publicStaticFinalDouble;");
+        assertEquals(SharedObject.publicStaticFinalDouble, e.get("psf_double"));
+        e.eval("SharedObject.publicStaticFinalDouble = 40.0;");
+        assertEquals(Double.doubleToLongBits(1.8e12), Double.doubleToLongBits(SharedObject.publicStaticFinalDouble));
+    }
+
+}
diff --git a/nashorn/test/src/jdk/nashorn/internal/access/ObjectAccessTest.java b/nashorn/test/src/jdk/nashorn/internal/access/ObjectAccessTest.java
new file mode 100644
index 00000000000..24eb025437f
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/access/ObjectAccessTest.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.access;
+
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.internal.junit.ArrayAsserts.assertArrayEquals;
+
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+import org.testng.TestNG;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+public class ObjectAccessTest {
+
+    private static ScriptEngine e = null;
+    private static SharedObject o = new SharedObject();
+
+    public static void main(final String[] args) {
+        TestNG.main(args);
+    }
+
+    @BeforeClass
+    public static void setUpClass() throws ScriptException {
+        final ScriptEngineManager m = new ScriptEngineManager();
+        e = m.getEngineByName("nashorn");
+        e.put("o", o);
+        e.eval("var SharedObject = Packages.jdk.nashorn.internal.access.SharedObject;");
+        e.eval("var Person = Packages.jdk.nashorn.internal.access.Person;");
+    }
+
+    @Test
+    public void accessFieldObject() throws ScriptException {
+        e.eval("var p_object = o.publicObject;");
+        assertEquals(o.publicObject, e.get("p_object"));
+        assertEquals("object", e.eval("typeof p_object;"));
+        e.eval("o.publicObject = new Person(14);");
+        assertEquals(new Person(14), o.publicObject);
+    }
+
+    @Test
+    public void accessFieldObjectArray() throws ScriptException {
+        e.eval("var p_object_array = o.publicObjectArray;");
+        assertEquals(o.publicObjectArray[0], e.eval("o.publicObjectArray[0]"));
+        assertArrayEquals(o.publicObjectArray, (Object[])e.get("p_object_array"));
+        e.eval("var t_object_arr = java.lang.reflect.Array.newInstance(Person.class, 3);" +
+                "t_object_arr[0] = new Person(100);" +
+                "t_object_arr[1] = new Person(120);" +
+                "t_object_arr[2] = new Person(140);" +
+                "o.publicObjectArray = t_object_arr;");
+        assertArrayEquals(new Person[] { new Person(100), new Person(120), new Person(140) }, o.publicObjectArray);
+        e.eval("o.publicObjectArray[0] = new Person(10);");
+        assertEquals(new Person(10), o.publicObjectArray[0]);
+    }
+
+    @Test
+    public void accessStaticFieldObject() throws ScriptException {
+        e.eval("var ps_object = SharedObject.publicStaticObject;");
+        assertEquals(SharedObject.publicStaticObject, e.get("ps_object"));
+        assertEquals("object", e.eval("typeof ps_object;"));
+        e.eval("SharedObject.publicStaticObject = new Person(16);");
+        assertEquals(new Person(16), SharedObject.publicStaticObject);
+    }
+
+    @Test
+    public void accessStaticFieldObjectArray() throws ScriptException {
+        e.eval("var ps_object_array = SharedObject.publicStaticObjectArray;");
+        assertEquals(SharedObject.publicStaticObjectArray[0], e.eval("SharedObject.publicStaticObjectArray[0]"));
+        assertArrayEquals(SharedObject.publicStaticObjectArray, (Object[])e.get("ps_object_array"));
+        e.eval("var ts_object_arr = java.lang.reflect.Array.newInstance(Person.class, 3);" +
+                "ts_object_arr[0] = new Person(100);" +
+                "ts_object_arr[1] = new Person(120);" +
+                "ts_object_arr[2] = new Person(140);" +
+                "SharedObject.publicStaticObjectArray = ts_object_arr;");
+        assertArrayEquals(new Person[] { new Person(100), new Person(120), new Person(140) }, SharedObject.publicStaticObjectArray);
+        e.eval("SharedObject.publicStaticObjectArray[0] = new Person(10);");
+        assertEquals(new Person(10), SharedObject.publicStaticObjectArray[0]);
+    }
+
+    @Test
+    public void accessFinalFieldObject() throws ScriptException {
+        e.eval("var pf_object = o.publicFinalObject;");
+        assertEquals(o.publicFinalObject, e.get("pf_object"));
+        assertEquals("object", e.eval("typeof pf_object;"));
+        e.eval("o.publicFinalObject = new Person(-999);");
+        assertEquals(new Person(1024), o.publicFinalObject);
+    }
+
+    @Test
+    public void accessFinalFieldObjectArray() throws ScriptException {
+        e.eval("var pf_object_array = o.publicFinalObjectArray;");
+        assertEquals(o.publicFinalObjectArray[0], e.eval("o.publicFinalObjectArray[0]"));
+        assertArrayEquals(o.publicFinalObjectArray, (Object[])e.get("pf_object_array"));
+        e.eval("var tf_object_arr = java.lang.reflect.Array.newInstance(Person.class, 3);" +
+                "tf_object_arr[0] = new Person(100);" +
+                "tf_object_arr[1] = new Person(120);" +
+                "tf_object_arr[2] = new Person(140);" +
+                "o.publicOFinalbjectArray = tf_object_arr;");
+        assertArrayEquals(new Person[] { new Person(-900), new Person(1000), new Person(180) }, o.publicFinalObjectArray);
+        e.eval("o.publicFinalObjectArray[0] = new Person(10);");
+        assertEquals(new Person(10), o.publicFinalObjectArray[0]);
+    }
+
+    @Test
+    public void accessStaticFinalFieldObject() throws ScriptException {
+        e.eval("var psf_object = SharedObject.publicStaticFinalObject;");
+        assertEquals(SharedObject.publicStaticFinalObject, e.get("psf_object"));
+        assertEquals("object", e.eval("typeof psf_object;"));
+        e.eval("SharedObject.publicStaticFinalObject = new Person(6);");
+        assertEquals(new Person(2048), SharedObject.publicStaticFinalObject);
+    }
+
+    @Test
+    public void accessStaticFinalFieldObjectArray() throws ScriptException {
+        e.eval("var psf_object_array = SharedObject.publicStaticFinalObjectArray;");
+        assertEquals(SharedObject.publicStaticFinalObjectArray[0], e.eval("SharedObject.publicStaticFinalObjectArray[0]"));
+        assertArrayEquals(SharedObject.publicStaticFinalObjectArray, (Object[])e.get("psf_object_array"));
+        e.eval("var tsf_object_arr = java.lang.reflect.Array.newInstance(Person.class, 3);" +
+                "tsf_object_arr[0] = new Person(100);" +
+                "tsf_object_arr[1] = new Person(120);" +
+                "tsf_object_arr[2] = new Person(140);" +
+                "SharedObject.publicStaticFinalObjectArray = tsf_object_arr;");
+        assertArrayEquals(new Person[] { new Person(-9), new Person(110), new Person(Integer.MAX_VALUE) }, SharedObject.publicStaticFinalObjectArray);
+        e.eval("SharedObject.publicStaticFinalObjectArray[0] = new Person(90);");
+        assertEquals(new Person(90), SharedObject.publicStaticFinalObjectArray[0]);
+    }
+
+}
diff --git a/nashorn/test/src/jdk/nashorn/internal/access/Person.java b/nashorn/test/src/jdk/nashorn/internal/access/Person.java
new file mode 100644
index 00000000000..3704bee9ec9
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/access/Person.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.access;
+
+public class Person {
+
+    public int id = 0;
+
+    public Person() {
+    }
+
+    public Person(final int code) {
+        this.id = code;
+    }
+
+    @Override
+    public boolean equals(final Object obj) {
+        if (obj != null && obj instanceof Person) {
+            final Person o = (Person)obj;
+            return this.id == o.id;
+        }
+        return false;
+    }
+
+    @Override
+    public int hashCode() {
+        return id;
+    }
+
+    @Override
+    public String toString() {
+        return "Person(" + id + ")";
+    }
+
+}
diff --git a/nashorn/test/src/jdk/nashorn/internal/access/SharedObject.java b/nashorn/test/src/jdk/nashorn/internal/access/SharedObject.java
new file mode 100644
index 00000000000..55775c79718
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/access/SharedObject.java
@@ -0,0 +1,466 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.access;
+
+import javax.script.Invocable;
+import javax.script.ScriptEngine;
+import javax.script.ScriptException;
+
+public class SharedObject {
+
+    // Public fields
+    public String                 publicString                  = "PublicString";
+    public String[]               publicStringArray             = { "ArrayString[0]", "ArrayString[1]", "ArrayString[2]", "ArrayString[3]" };
+    public Person                 publicObject                  = new Person(256);
+    public Person[]               publicObjectArray             = { new Person(4), new Person(-422), new Person(14) };
+    public boolean                publicBoolean                 = true;
+    public boolean[]              publicBooleanArray            = { true, false, false, true };
+    public Boolean                publicBooleanBox              = true;
+    public long                   publicLong                    = 933333333333333333L;
+    public long[]                 publicLongArray               = { 99012333333333L, -124355555L, 89777777777L };
+    public Long                   publicLongBox                 = 9333333333L;
+    public int                    publicInt                     = 2076543123;
+    public int[]                  publicIntArray                = { 0, 1, 1, 2, 3, 5, 8, 13, 21, 34 };
+    public Integer                publicIntBox                  = 20765123;
+    public byte                   publicByte                    = -128;
+    public byte[]                 publicByteArray               = { 1, 2, 4, 8, 16, 32, 64, 127, -128 };
+    public Byte                   publicByteBox                 = 127;
+    public short                  publicShort                   = 32000;
+    public short[]                publicShortArray              = { 3240, 8900, -16789, 1, 12 };
+    public Short                  publicShortBox                = Short.MIN_VALUE;
+    public float                  publicFloat                   = 0.7e6f;
+    public float[]                publicFloatArray              = { -32.01f, 89.3f, -1.3e8f, 3.1f };
+    public Float                  publicFloatBox                = 1.377e4f;
+    public double                 publicDouble                  = 1.34e20;
+    public double[]               publicDoubleArray             = { 0.75e80, 8e-43, 1.000077, 0.123e10 };
+    public Double                 publicDoubleBox               = 1.4e-19;
+    public char                   publicChar                    = 'A';
+    public char[]                 publicCharArray               = "Hello Nashorn".toCharArray();
+    public Character              publicCharBox                 = 'B';
+    // Public static fields
+    public static String          publicStaticString            = "PublicStaticString";
+    public static String[]        publicStaticStringArray       = { "StaticArrayString[0]", "StaticArrayString[1]", "StaticArrayString[2]", "StaticArrayString[3]" };
+    public static Person          publicStaticObject            = new Person(512);
+    public static Person[]        publicStaticObjectArray       = { new Person(40), new Person(-22), new Person(18) };
+    public static boolean         publicStaticBoolean           = true;
+    public static boolean[]       publicStaticBooleanArray      = { false, false, false, true };
+    public static Boolean         publicStaticBooleanBox        = true;
+    public static long            publicStaticLong              = 13333333333333333L;
+    public static long[]          publicStaticLongArray         = { 19012333333333L, -224355555L, 39777777777L };
+    public static Long            publicStaticLongBox           = 9333333334L;
+    public static int             publicStaticInt               = 207654323;
+    public static int[]           publicStaticIntArray          = { 5, 8, 13, 21, 34 };
+    public static Integer         publicStaticIntBox            = 2075123;
+    public static byte            publicStaticByte              = -12;
+    public static byte[]          publicStaticByteArray         = { 16, 32, 64, 127, -128 };
+    public static Byte            publicStaticByteBox           = 17;
+    public static short           publicStaticShort             = 320;
+    public static short[]         publicStaticShortArray        = { 1240, 900, -1789, 100, 12 };
+    public static Short           publicStaticShortBox          = -16777;
+    public static float           publicStaticFloat             = 7.7e8f;
+    public static float[]         publicStaticFloatArray        = { -131.01f, 189.3f, -31.3e8f, 3.7f };
+    public static Float           publicStaticFloatBox          = 1.37e4f;
+    public static double          publicStaticDouble            = 1.341e20;
+    public static double[]        publicStaticDoubleArray       = { 0.75e80, 0.123e10, 8e-43, 1.000077 };
+    public static Double          publicStaticDoubleBox         = 1.41e-12;
+    public static char            publicStaticChar              = 'C';
+    public static char[]          publicStaticCharArray         = "Nashorn".toCharArray();
+    public static Character       publicStaticCharBox           = 'D';
+    // Public final fields
+    public final String           publicFinalString             = "PublicFinalString";
+    public final String[]         publicFinalStringArray        = { "FinalArrayString[0]", "FinalArrayString[1]", "FinalArrayString[2]", "FinalArrayString[3]" };
+    public final Person           publicFinalObject             = new Person(1024);
+    public final Person[]         publicFinalObjectArray        = { new Person(-900), new Person(1000), new Person(180) };
+    public final boolean          publicFinalBoolean            = true;
+    public final boolean[]        publicFinalBooleanArray       = { false, false, true, false };
+    public final Boolean          publicFinalBooleanBox         = true;
+    public final long             publicFinalLong               = 13353333333333333L;
+    public final long[]           publicFinalLongArray          = { 1901733333333L, -2247355555L, 3977377777L };
+    public final Long             publicFinalLongBox            = 9377333334L;
+    public final int              publicFinalInt                = 20712023;
+    public final int[]            publicFinalIntArray           = { 50, 80, 130, 210, 340 };
+    public final Integer          publicFinalIntBox             = 207512301;
+    public final byte             publicFinalByte               = -7;
+    public final byte[]           publicFinalByteArray          = { 1, 3, 6, 17, -128 };
+    public final Byte             publicFinalByteBox            = 19;
+    public final short            publicFinalShort              = 31220;
+    public final short[]          publicFinalShortArray         = { 12240, 9200, -17289, 1200, 12 };
+    public final Short            publicFinalShortBox           = -26777;
+    public final float            publicFinalFloat              = 7.72e8f;
+    public final float[]          publicFinalFloatArray         = { -131.012f, 189.32f, -31.32e8f, 3.72f };
+    public final Float            publicFinalFloatBox           = 1.372e4f;
+    public final double           publicFinalDouble             = 1.3412e20;
+    public final double[]         publicFinalDoubleArray        = { 0.725e80, 0.12e10, 8e-3, 1.00077 };
+    public final Double           publicFinalDoubleBox          = 1.412e-12;
+    public final char             publicFinalChar               = 'E';
+    public final char[]           publicFinalCharArray          = "Nashorn hello".toCharArray();
+    public final Character        publicFinalCharBox            = 'F';
+    // Public static final fields
+    public static final String    publicStaticFinalString       = "PublicStaticFinalString";
+    public static final String[]  publicStaticFinalStringArray  = { "StaticFinalArrayString[0]", "StaticFinalArrayString[1]", "StaticFinalArrayString[2]", "StaticFinalArrayString[3]" };
+    public static final Person    publicStaticFinalObject       = new Person(2048);
+    public static final Person[]  publicStaticFinalObjectArray  = { new Person(-9), new Person(110), new Person(Integer.MAX_VALUE) };
+    public static final boolean   publicStaticFinalBoolean      = true;
+    public static final boolean[] publicStaticFinalBooleanArray = { false, true, false, false };
+    public static final Boolean   publicStaticFinalBooleanBox   = true;
+    public static final long      publicStaticFinalLong         = 8333333333333L;
+    public static final long[]    publicStaticFinalLongArray    = { 19017383333L, -2247358L, 39773787L };
+    public static final Long      publicStaticFinalLongBox      = 9377388334L;
+    public static final int       publicStaticFinalInt          = 207182023;
+    public static final int[]     publicStaticFinalIntArray     = { 1308, 210, 340 };
+    public static final Integer   publicStaticFinalIntBox       = 2078301;
+    public static final byte      publicStaticFinalByte         = -70;
+    public static final byte[]    publicStaticFinalByteArray    = { 17, -128, 81 };
+    public static final Byte      publicStaticFinalByteBox      = 91;
+    public static final short     publicStaticFinalShort        = 8888;
+    public static final short[]   publicStaticFinalShortArray   = { 8240, 9280, -1289, 120, 812 };
+    public static final Short     publicStaticFinalShortBox     = -26;
+    public static final float     publicStaticFinalFloat        = 0.72e8f;
+    public static final float[]   publicStaticFinalFloatArray   = { -8131.012f, 9.32f, -138.32e8f, 0.72f };
+    public static final Float     publicStaticFinalFloatBox     = 1.2e4f;
+    public static final double    publicStaticFinalDouble       = 1.8e12;
+    public static final double[]  publicStaticFinalDoubleArray  = { 8.725e80, 0.82e10, 18e-3, 1.08077 };
+    public static final Double    publicStaticFinalDoubleBox    = 1.5612e-13;
+    public static final char      publicStaticFinalChar         = 'K';
+    public static final char[]    publicStaticFinalCharArray    = "StaticString".toCharArray();
+    public static final Character publicStaticFinalCharBox      = 'L';
+
+    // Special vars
+    public volatile boolean       volatileBoolean               = true;
+    public transient boolean      transientBoolean              = true;
+
+    // For methods testing
+    public boolean                isAccessed                    = false;
+    public volatile boolean       isFinished                    = false;
+
+    private ScriptEngine engine;
+
+    public ScriptEngine getEngine() {
+        return engine;
+    }
+
+    public void setEngine(ScriptEngine engine) {
+        this.engine = engine;
+    }
+
+    public void voidMethod() {
+        isAccessed = true;
+    }
+
+    public boolean booleanMethod(final boolean arg) {
+        return !arg;
+    }
+
+    public Boolean booleanBoxingMethod(final Boolean arg) {
+        return !arg.booleanValue();
+    }
+
+    public boolean[] booleanArrayMethod(final boolean arg[]) {
+        final boolean[] res = new boolean[arg.length];
+        for (int i = 0; i < arg.length; i++) {
+            res[i] = !arg[i];
+        }
+        return res;
+    }
+
+    public int intMethod(final int arg) {
+        return arg + arg;
+    }
+
+    public Integer intBoxingMethod(final Integer arg) {
+        return arg + arg;
+    }
+
+    public int[] intArrayMethod(final int arg[]) {
+        final int[] res = new int[arg.length];
+        for (int i = 0; i < arg.length; i++) {
+            res[i] = arg[i] * 2;
+        }
+        return res;
+    }
+
+    public long longMethod(final long arg) {
+        return arg + arg;
+    }
+
+    public Long longBoxingMethod(final Long arg) {
+        return arg + arg;
+    }
+
+    public long[] longArrayMethod(final long[] arg) {
+        final long[] res = new long[arg.length];
+        for (int i = 0; i < arg.length; i++) {
+            res[i] = arg[i] * 2;
+        }
+        return res;
+    }
+
+    public byte byteMethod(final byte arg) {
+        return (byte)(arg + arg);
+    }
+
+    public Byte byteBoxingMethod(final Byte arg) {
+        return (byte)(arg + arg);
+    }
+
+    public byte[] byteArrayMethod(final byte[] arg) {
+        final byte[] res = new byte[arg.length];
+        for (int i = 0; i < arg.length; i++) {
+            res[i] = (byte)(arg[i] * 2);
+        }
+        return res;
+    }
+
+    public char charMethod(final char arg) {
+        return Character.toUpperCase(arg);
+    }
+
+    public Character charBoxingMethod(final Character arg) {
+        return Character.toUpperCase(arg);
+    }
+
+    public char[] charArrayMethod(final char[] arg) {
+        final char[] res = new char[arg.length];
+        for (int i = 0; i < arg.length; i++) {
+            res[i] = Character.toUpperCase(arg[i]);
+        }
+        return res;
+    }
+
+    public short shortMethod(final short arg) {
+        return (short)(arg + arg);
+    }
+
+    public Short shortBoxingMethod(final Short arg) {
+        return (short)(arg + arg);
+    }
+
+    public short[] shortArrayMethod(final short[] arg) {
+        final short[] res = new short[arg.length];
+        for (int i = 0; i < arg.length; i++) {
+            res[i] = (short)(arg[i] * 2);
+        }
+        return res;
+    }
+
+    public float floatMethod(final float arg) {
+        return arg + arg;
+    }
+
+    public Float floatBoxingMethod(final Float arg) {
+        return arg + arg;
+    }
+
+    public float[] floatArrayMethod(final float[] arg) {
+        final float[] res = new float[arg.length];
+        for (int i = 0; i < arg.length; i++) {
+            res[i] = arg[i] * 2;
+        }
+        return res;
+    }
+
+    public double doubleMethod(final double arg) {
+        return arg + arg;
+    }
+
+    public Double doubleBoxingMethod(final Double arg) {
+        return arg + arg;
+    }
+
+    public double[] doubleArrayMethod(final double[] arg) {
+        final double[] res = new double[arg.length];
+        for (int i = 0; i < arg.length; i++) {
+            res[i] = arg[i] * 2;
+        }
+        return res;
+    }
+
+    public String stringMethod(final String str) {
+        return str + str;
+    }
+
+    public String[] stringArrayMethod(final String[] arr) {
+        final int l = arr.length;
+        final String[] res = new String[l];
+        for (int i = 0; i < l; i++) {
+            res[i] = arr[l - i - 1];
+        }
+        return res;
+    }
+
+    public Person[] objectArrayMethod(final Person[] arr) {
+        final Person[] res = new Person[arr.length];
+        for (int i = 0; i < arr.length; i++) {
+            res[i] = new Person(i + 100);
+        }
+        return res;
+    }
+
+    public Person objectMethod(final Person t) {
+        t.id *= 2;
+        return t;
+    }
+
+    public int twoParamMethod(final long l, final double d) {
+        return (int)(l + d);
+    }
+
+    public int threeParamMethod(final short s, final long l, final char c) {
+        return (int)(s + l + c);
+    }
+
+    public Person[] twoObjectParamMethod(final Person arg1, final Person arg2) {
+        return new Person[] { arg2, arg1 };
+    }
+
+    public Person[] threeObjectParamMethod(final Person arg1, final Person arg2, final Person arg3) {
+        return new Person[] { arg3, arg2, arg1 };
+    }
+
+    public Person[] eightObjectParamMethod(final Person arg1, final Person arg2, final Person arg3, final Person arg4, final Person arg5, final Person arg6, final Person arg7, final Person arg8) {
+        return new Person[] { arg8, arg7, arg6, arg5, arg4, arg3, arg2, arg1 };
+    }
+
+    public Person[] nineObjectParamMethod(final Person arg1, final Person arg2, final Person arg3, final Person arg4, final Person arg5, final Person arg6, final Person arg7, final Person arg8, final Person arg9) {
+        return new Person[] { arg9, arg8, arg7, arg6, arg5, arg4, arg3, arg2, arg1 };
+    }
+
+    public Person[] methodObjectEllipsis(final Person... args) {
+        final int l = args.length;
+        final Person[] res = new Person[l];
+        for (int i = 0; i < l; i++) {
+            res[i] = args[l - i - 1];
+        }
+        return res;
+    }
+
+    public Person[] methodPrimitiveEllipsis(final int... args) {
+        final int l = args.length;
+        final Person[] res = new Person[l];
+        for (int i = 0; i < l; i++) {
+            res[i] = new Person(args[i]);
+        }
+        return res;
+    }
+
+    public Object[] methodMixedEllipsis(final Object... args) {
+        return args;
+    }
+
+    public Object[] methodObjectWithEllipsis(final String arg, final int... args) {
+        final Object[] res = new Object[args.length + 1];
+        res[0] = arg;
+        for (int i = 0; i < args.length; i++) {
+            res[i + 1] = args[i];
+        }
+        return res;
+    }
+
+    public Object[] methodPrimitiveWithEllipsis(final int arg, final long... args) {
+        final Object[] res = new Object[args.length + 1];
+        res[0] = arg;
+        for (int i = 0; i < args.length; i++) {
+            res[i + 1] = args[i];
+        }
+        return res;
+    }
+
+    public Object[] methodMixedWithEllipsis(final String arg1, final int arg2, final Object... args) {
+        final Object[] res = new Object[args.length + 2];
+        res[0] = arg1;
+        res[1] = arg2;
+        System.arraycopy(args, 0, res, 2, args.length);
+        return res;
+    }
+
+    public void methodStartsThread() {
+        isFinished = false;
+
+        final Thread t = new Thread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    Thread.sleep(1000);
+                    isFinished = true;
+                } catch (final InterruptedException e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+
+        t.start();
+    }
+
+    public String overloadedMethodDoubleVSint(int arg) {
+        return "int";
+    }
+
+    public String overloadedMethodDoubleVSint(double arg) {
+        return "double";
+    }
+
+    public int overloadedMethod(int arg) {
+        return arg*2;
+    }
+
+    public int overloadedMethod(String arg) {
+        return arg.length();
+    }
+
+    public int overloadedMethod(boolean arg) {
+        return (arg) ? 1 : 0;
+    }
+
+    public int overloadedMethod(Person arg) {
+        return arg.id*2;
+    }
+
+    public int firstLevelMethodInt(int arg) throws ScriptException, NoSuchMethodException {
+        return (int) ((Invocable)engine).invokeFunction("secondLevelMethodInt", arg);
+    }
+
+    public int thirdLevelMethodInt(int arg) {
+        return arg*5;
+    }
+
+    public int firstLevelMethodInteger(Integer arg) throws ScriptException, NoSuchMethodException {
+        return (int) ((Invocable)engine).invokeFunction("secondLevelMethodInteger", arg);
+    }
+
+    public int thirdLevelMethodInteger(Integer arg) {
+        return arg*10;
+    }
+
+    public Person firstLevelMethodObject(Person p) throws ScriptException, NoSuchMethodException {
+        return (Person) ((Invocable)engine).invokeFunction("secondLevelMethodObject", p);
+    }
+
+    public Person thirdLevelMethodObject(Person p) {
+        p.id *= 10;
+        return p;
+    }
+
+}
diff --git a/nashorn/test/src/jdk/nashorn/internal/access/StringAccessTest.java b/nashorn/test/src/jdk/nashorn/internal/access/StringAccessTest.java
new file mode 100644
index 00000000000..3c2fe135559
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/access/StringAccessTest.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.access;
+
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.internal.junit.ArrayAsserts.assertArrayEquals;
+
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+import org.testng.TestNG;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+public class StringAccessTest {
+
+    private static ScriptEngine e = null;
+    private static SharedObject o = new SharedObject();
+
+    public static void main(final String[] args) {
+        TestNG.main(args);
+    }
+
+    @BeforeClass
+    public static void setUpClass() throws ScriptException {
+        final ScriptEngineManager m = new ScriptEngineManager();
+        e = m.getEngineByName("nashorn");
+        e.put("o", o);
+        e.eval("var SharedObject = Packages.jdk.nashorn.internal.access.SharedObject;");
+    }
+
+    @Test
+    public void accessFieldString() throws ScriptException {
+        e.eval("var p_string = o.publicString;");
+        assertEquals(o.publicString, e.get("p_string"));
+        assertEquals("string", e.eval("typeof p_string;"));
+        e.eval("o.publicString = 'changedString';");
+        assertEquals("changedString", o.publicString);
+    }
+
+    @Test
+    public void accessFieldStringArray() throws ScriptException {
+        e.eval("var p_string_array = o.publicStringArray;");
+        assertEquals(o.publicStringArray[0], e.eval("o.publicStringArray[0]"));
+        assertArrayEquals(o.publicStringArray, (String[])e.get("p_string_array"));
+        e.eval("var t_string_arr = java.lang.reflect.Array.newInstance(java.lang.String.class, 3);" +
+                "t_string_arr[0] = 'abc';" +
+                "t_string_arr[1] = '123';" +
+                "t_string_arr[2] = 'xyzzzz';" +
+                "o.publicStringArray = t_string_arr;");
+        assertArrayEquals(new String[] { "abc", "123", "xyzzzz" }, o.publicStringArray);
+        e.eval("o.publicStringArray[0] = 'nashorn';");
+        assertEquals("nashorn", o.publicStringArray[0]);
+    }
+
+    @Test
+    public void accessStaticFieldString() throws ScriptException {
+        e.eval("var ps_string = SharedObject.publicStaticString;");
+        assertEquals(SharedObject.publicStaticString, e.get("ps_string"));
+        assertEquals("string", e.eval("typeof ps_string;"));
+        e.eval("SharedObject.publicStaticString = 'changedString';");
+        assertEquals("changedString", SharedObject.publicStaticString);
+    }
+
+    @Test
+    public void accessStaticFieldStringArray() throws ScriptException {
+        e.eval("var ps_string_array = SharedObject.publicStaticStringArray;");
+        assertEquals(SharedObject.publicStaticStringArray[0], e.eval("SharedObject.publicStaticStringArray[0]"));
+        assertArrayEquals(SharedObject.publicStaticStringArray, (String[])e.get("ps_string_array"));
+        e.eval("var ts_string_arr = java.lang.reflect.Array.newInstance(java.lang.String.class, 3);" +
+                "ts_string_arr[0] = 'abc';" +
+                "ts_string_arr[1] = '123';" +
+                "ts_string_arr[2] = 'xyzzzz';" +
+                "SharedObject.publicStaticStringArray = ts_string_arr;");
+        assertArrayEquals(new String[] { "abc", "123", "xyzzzz" }, SharedObject.publicStaticStringArray);
+        e.eval("SharedObject.publicStaticStringArray[0] = 'nashorn';");
+        assertEquals("nashorn", SharedObject.publicStaticStringArray[0]);
+    }
+
+    @Test
+    public void accessFinalFieldString() throws ScriptException {
+        e.eval("var pf_string = o.publicFinalString;");
+        assertEquals(o.publicFinalString, e.get("pf_string"));
+        assertEquals("string", e.eval("typeof pf_string;"));
+        e.eval("o.publicFinalString = 'changedString';");
+        assertEquals("PublicFinalString", o.publicFinalString);
+    }
+
+    @Test
+    public void accessFinalFieldStringArray() throws ScriptException {
+        e.eval("var pf_string_array = o.publicFinalStringArray;");
+        assertEquals(o.publicFinalStringArray[0], e.eval("o.publicFinalStringArray[0]"));
+        assertArrayEquals(o.publicFinalStringArray, (String[])e.get("pf_string_array"));
+        e.eval("var tf_string_arr = java.lang.reflect.Array.newInstance(java.lang.String.class, 3);" +
+                "tf_string_arr[0] = 'abc';" +
+                "tf_string_arr[1] = '123';" +
+                "tf_string_arr[2] = 'xyzzzz';" +
+                "o.publicFinalStringArray = tf_string_arr;");
+        assertArrayEquals(new String[] { "FinalArrayString[0]", "FinalArrayString[1]", "FinalArrayString[2]", "FinalArrayString[3]" }, o.publicFinalStringArray);
+        e.eval("o.publicFinalStringArray[0] = 'nashorn';");
+        assertEquals("nashorn", o.publicFinalStringArray[0]);
+    }
+
+    @Test
+    public void accessStaticFinalFieldString() throws ScriptException {
+        e.eval("var psf_string = SharedObject.publicStaticFinalString;");
+        assertEquals(SharedObject.publicStaticFinalString, e.get("psf_string"));
+        assertEquals("string", e.eval("typeof psf_string;"));
+        e.eval("SharedObject.publicStaticFinalString = 'changedString';");
+        assertEquals("PublicStaticFinalString", SharedObject.publicStaticFinalString);
+    }
+
+    @Test
+    public void accessStaticFinalFieldStringArray() throws ScriptException {
+        e.eval("var psf_string_array = SharedObject.publicStaticFinalStringArray;");
+        assertEquals(SharedObject.publicStaticFinalStringArray[0], e.eval("SharedObject.publicStaticFinalStringArray[0]"));
+        assertArrayEquals(SharedObject.publicStaticFinalStringArray, (String[])e.get("psf_string_array"));
+        e.eval("var tsf_string_arr = java.lang.reflect.Array.newInstance(java.lang.String.class, 3);" +
+                "tsf_string_arr[0] = 'abc';" +
+                "tsf_string_arr[1] = '123';" +
+                "tsf_string_arr[2] = 'xyzzzz';" +
+                "SharedObject.publicStaticFinalStringArray = tsf_string_arr;");
+        assertArrayEquals(new String[] { "StaticFinalArrayString[0]",
+                    "StaticFinalArrayString[1]",
+                    "StaticFinalArrayString[2]",
+                    "StaticFinalArrayString[3]" },
+                SharedObject.publicStaticFinalStringArray);
+        e.eval("SharedObject.publicStaticFinalStringArray[0] = 'nashorn';");
+        assertEquals("nashorn", SharedObject.publicStaticFinalStringArray[0]);
+    }
+
+}
diff --git a/nashorn/test/src/jdk/nashorn/internal/codegen/CompilerTest.java b/nashorn/test/src/jdk/nashorn/internal/codegen/CompilerTest.java
new file mode 100644
index 00000000000..b2292413c59
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/codegen/CompilerTest.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.codegen;
+
+import java.io.File;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.runtime.ErrorManager;
+import jdk.nashorn.internal.runtime.ScriptFunction;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.Source;
+import jdk.nashorn.internal.runtime.options.Options;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+/**
+ * Tests to check Nashorn JS compiler - just compiler and not execution of scripts.
+ */
+public class CompilerTest {
+    private static final boolean VERBOSE  = Boolean.valueOf(System.getProperty("compilertest.verbose"));
+    private static final boolean TEST262  = Boolean.valueOf(System.getProperty("compilertest.test262"));
+
+    private static final String ES5CONFORM_DIR    = System.getProperty("es5conform.testcases.dir");
+    private static final String TEST_BASIC_DIR  = System.getProperty("test.basic.dir");
+    private static final String TEST262_SUITE_DIR = System.getProperty("test262.suite.dir");
+
+    interface TestFilter {
+        public boolean exclude(File file, String content);
+    }
+
+    private void log(String msg) {
+        org.testng.Reporter.log(msg, true);
+    }
+
+    private Context context;
+    private ScriptObject global;
+
+    public CompilerTest() {
+        final Options options = new Options("nashorn");
+        options.set("anon.functions", true);
+        options.set("compile.only", true);
+        options.set("print.ast", true);
+        options.set("print.parse", true);
+        options.set("scripting", true);
+
+        final ErrorManager errors = new ErrorManager() {
+            @Override
+            public void error(final String msg) {
+                log(msg);
+            }
+        };
+
+        final StringWriter sw = new StringWriter();
+        final PrintWriter pw = new PrintWriter(sw);
+        this.context = new Context(options, errors, pw, pw);
+        this.global = context.createGlobal();
+    }
+
+    @Test
+    public void compileAllTests() {
+        if (TEST262) {
+            compileTestSet(TEST262_SUITE_DIR, new TestFilter() {
+                @Override
+                public boolean exclude(final File file, final String content) {
+                    return content.indexOf("@negative") != -1;
+                }
+            });
+        }
+        compileTestSet(ES5CONFORM_DIR, null);
+        compileTestSet(TEST_BASIC_DIR, null);
+    }
+
+    private void compileTestSet(final String testSet, final TestFilter filter) {
+        passed = 0;
+        failed = 0;
+        skipped = 0;
+        final File testSetDir = new File(testSet);
+        if (! testSetDir.isDirectory()) {
+            log("WARNING: " + testSetDir + " not found or not a directory");
+            return;
+        }
+        log(testSetDir.getAbsolutePath());
+        compileJSDirectory(testSetDir, filter);
+
+        log(testSet + " compile done!");
+        log("compile ok: " + passed);
+        log("compile failed: " + failed);
+        log("compile skipped: " + skipped);
+        if (failed != 0) {
+            Assert.fail(failed + " tests failed to compile in " + testSetDir.getAbsolutePath());
+        }
+    }
+
+    // number of scripts that compiled fine
+    private int passed;
+    // number of scripts resulting in compile failure
+    private int failed;
+    // scripts that were skipped - all tests with @negative are
+    // skipped for now.
+    private int skipped;
+
+    private void compileJSDirectory(final File dir, final TestFilter filter) {
+        for (final File f : dir.listFiles()) {
+            if (f.isDirectory()) {
+                compileJSDirectory(f, filter);
+            } else if (f.getName().endsWith(".js")) {
+                compileJSFile(f, filter);
+            }
+        }
+    }
+
+    private void compileJSFile(final File file, final TestFilter filter) {
+        if (VERBOSE) {
+            log("Begin compiling " + file.getAbsolutePath());
+        }
+
+        final ScriptObject oldGlobal = Context.getGlobal();
+        final boolean globalChanged = (oldGlobal != global);
+
+        try {
+            final char[] buffer = Source.readFully(file);
+            boolean excluded = false;
+
+            if (filter != null) {
+                final String content = new String(buffer);
+                excluded = filter.exclude(file, content);
+            }
+
+            if (excluded) {
+                if (VERBOSE) {
+                    log("Skipping " + file.getAbsolutePath());
+                }
+                skipped++;
+                return;
+            }
+
+            if (globalChanged) {
+                Context.setGlobal(global);
+            }
+            final Source source = new Source(file.getAbsolutePath(), buffer);
+            final ScriptFunction script = context.compileScript(source, global, context._strict);
+            if (script == null || context.getErrors().getNumberOfErrors() > 0) {
+                log("Compile failed: " + file.getAbsolutePath());
+                failed++;
+            } else {
+                passed++;
+            }
+        } catch (final Throwable t) {
+            log("Compile failed: " + file.getAbsolutePath() + " : " + t);
+            if (VERBOSE) {
+                t.printStackTrace(System.out);
+            }
+            failed++;
+        } finally {
+            if (globalChanged) {
+                Context.setGlobal(oldGlobal);
+            }
+        }
+
+        if (VERBOSE) {
+            log("Done compiling " + file.getAbsolutePath());
+        }
+    }
+}
diff --git a/nashorn/test/src/jdk/nashorn/internal/parser/ParserTest.java b/nashorn/test/src/jdk/nashorn/internal/parser/ParserTest.java
new file mode 100644
index 00000000000..67cc59a3c32
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/parser/ParserTest.java
@@ -0,0 +1,187 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.parser;
+
+import java.io.File;
+import jdk.nashorn.internal.codegen.Compiler;
+import jdk.nashorn.internal.codegen.CompilerConstants;
+import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.runtime.ErrorManager;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.Source;
+import jdk.nashorn.internal.runtime.options.Options;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+/**
+ * Run tests to check Nashorn's parser.
+ */
+public class ParserTest {
+    private static final boolean VERBOSE   = Boolean.valueOf(System.getProperty("parsertest.verbose"));
+    private static final boolean TEST262   = Boolean.valueOf(System.getProperty("parsertest.test262"));
+
+    private static final String ES5CONFORM_DIR    = System.getProperty("es5conform.testcases.dir");
+    private static final String TEST_BASIC_DIR  = System.getProperty("test.basic.dir");
+    private static final String TEST262_SUITE_DIR = System.getProperty("test262.suite.dir");
+
+
+    interface TestFilter {
+        public boolean exclude(File file, String content);
+    }
+
+    private void log(String msg) {
+        org.testng.Reporter.log(msg, true);
+    }
+
+    private Context context;
+    private ScriptObject global;
+
+    public ParserTest() {
+        final Options options = new Options("nashorn");
+        options.set("anon.functions", true);
+        options.set("parse.only", true);
+        options.set("scripting", true);
+
+        ErrorManager errors = new ErrorManager();
+        this.context = new Context(options, errors);
+        this.global = context.createGlobal();
+    }
+
+    @Test
+    public void parseAllTests() {
+        if (TEST262) {
+            parseTestSet(TEST262_SUITE_DIR, new TestFilter() {
+                @Override
+                public boolean exclude(final File file, final String content) {
+                    return content.indexOf("@negative") != -1;
+                }
+            });
+        }
+        parseTestSet(ES5CONFORM_DIR, null);
+        parseTestSet(TEST_BASIC_DIR, null);
+    }
+
+    private void parseTestSet(final String testSet, final TestFilter filter) {
+        passed  = 0;
+        failed  = 0;
+        skipped = 0;
+
+        final File testSetDir = new File(testSet);
+        if (! testSetDir.isDirectory()) {
+            log("WARNING: " + testSetDir + " not found or not a directory");
+            return;
+        }
+        log(testSetDir.getAbsolutePath());
+        parseJSDirectory(testSetDir, filter);
+
+        log(testSet + " parse done!");
+        log("parse ok: " + passed);
+        log("parse failed: " + failed);
+        log("parse skipped: " + skipped);
+        if (failed != 0) {
+            Assert.fail(failed + " tests failed to compile in " + testSetDir.getAbsolutePath());
+        }
+    }
+
+    // number of scripts that parsed fine
+    private int passed;
+    // number of scripts resulting in parse failure
+    private int failed;
+    // scripts that were skipped - all tests with @negative are
+    // skipped for now.
+    private int skipped;
+
+    private void parseJSDirectory(final File dir, final TestFilter filter) {
+        for (final File f : dir.listFiles()) {
+            if (f.isDirectory()) {
+                parseJSDirectory(f, filter);
+            } else if (f.getName().endsWith(".js")) {
+                parseJSFile(f, filter);
+            }
+        }
+    }
+
+    private void parseJSFile(final File file, final TestFilter filter) {
+        if (VERBOSE) {
+            log("Begin parsing " + file.getAbsolutePath());
+        }
+
+        final ScriptObject oldGlobal = Context.getGlobal();
+        final boolean globalChanged = (oldGlobal != global);
+        try {
+            final char[] buffer = Source.readFully(file);
+            boolean excluded = false;
+            if (filter != null) {
+                final String content = new String(buffer);
+                excluded = filter.exclude(file, content);
+            }
+
+            if (excluded) {
+                if (VERBOSE) {
+                    log("Skipping " + file.getAbsolutePath());
+                }
+                skipped++;
+                return;
+            }
+
+            final ErrorManager errors = new ErrorManager() {
+                @Override
+                public void error(final String msg) {
+                    log(msg);
+                }
+            };
+            errors.setLimit(0);
+            if (globalChanged) {
+                Context.setGlobal(global);
+            }
+            final Source   source   = new Source(file.getAbsolutePath(), buffer);
+            final Compiler compiler = Compiler.compiler(source, context, errors, context._strict);
+
+            final Parser parser = new Parser(compiler);
+            parser.parse(CompilerConstants.RUN_SCRIPT.tag());
+            if (errors.getNumberOfErrors() > 0) {
+                log("Parse failed: " + file.getAbsolutePath());
+                failed++;
+            } else {
+                passed++;
+            }
+        } catch (final Throwable exp) {
+            log("Parse failed: " + file.getAbsolutePath() + " : " + exp);
+            if (VERBOSE) {
+                exp.printStackTrace(System.out);
+            }
+            failed++;
+        } finally {
+            if (globalChanged) {
+                Context.setGlobal(oldGlobal);
+            }
+        }
+
+        if (VERBOSE) {
+            log("Done parsing " + file.getAbsolutePath());
+        }
+    }
+}
diff --git a/nashorn/test/src/jdk/nashorn/internal/performance/AuroraWrapper.java b/nashorn/test/src/jdk/nashorn/internal/performance/AuroraWrapper.java
new file mode 100644
index 00000000000..2ffaf0d8a90
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/performance/AuroraWrapper.java
@@ -0,0 +1,214 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.performance;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
+
+public class AuroraWrapper {
+
+    public static String fileName = "report.xml";
+
+    public static void deleteReportDocument() {
+        final File f = new File(fileName);
+        if (f.exists()) {
+            f.delete();
+        }
+    }
+
+    public static Document createOrOpenDocument() throws ParserConfigurationException, SAXException, IOException {
+        final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+        final DocumentBuilder documentBuilder = factory.newDocumentBuilder();
+
+        Document document;
+        final File f = new File(fileName);
+        if (!f.exists()) {
+            document = documentBuilder.newDocument();
+            final Element root = document.createElement("entity");
+            document.appendChild(root);
+            root.setAttribute("type", "REFWORKLOADRUN");
+            root.setAttribute("name", "default");
+        } else {
+            document = documentBuilder.parse(f);
+        }
+
+        return document;
+    }
+
+    public static void addBenchmarkResults(final Document doc, final Element root, final String name, final String score, final String higherBetter) {
+        final Element results = addEntity(doc, root, name, "BENCHMARK_RESULTS");
+        addAttribute(doc, results, "benchmark", name);
+        addAttribute(doc, results, "is_higher_better", higherBetter);
+
+        final Element iteration = addEntity(doc, results, "1", "ITERATION");
+        addAttribute(doc, iteration, "score", score);
+        addAttribute(doc, iteration, "successful", "true");
+
+        addConfig(doc, results, name);
+    }
+
+    public static Element getRootEntity(final org.w3c.dom.Document doc) {
+        final Element rootEntity = doc.getDocumentElement();
+        Element resultsEntity = null;
+
+        final NodeList entities = rootEntity.getChildNodes();
+        for (int i = 0; i < entities.getLength(); i++) {
+            if (entities.item(i).getNodeName().equals("entity")) {
+                resultsEntity = (Element)entities.item(i);
+                break;
+            }
+        }
+
+        if (resultsEntity == null) {
+            resultsEntity = addResults(doc);
+        }
+        //System.out.println(resultsEntity);
+        return resultsEntity;
+    }
+
+    public static void addAttribute(final Document doc, final Element entity, final String attributeName, final String attributeValue) {
+        final Element attr = doc.createElement("attribute");
+        entity.appendChild(attr);
+        attr.setAttribute("name", attributeName);
+        attr.setTextContent(attributeValue);
+    }
+
+    public static Element addEntity(final Document doc, final Element entity, final String entityName, final String entityType) {
+        final Element newEntity = doc.createElement("entity");
+        entity.appendChild(newEntity);
+
+        if (entityType != null) {
+            newEntity.setAttribute("type", entityType);
+        }
+        if (entityName != null) {
+            newEntity.setAttribute("name", entityName);
+        }
+        return newEntity;
+    }
+
+    public static Element addResults(final Document doc) {
+
+        String _benchmark = "nashorn-octaneperf";
+
+        final String vmName = java.lang.System.getProperties().getProperty("java.vm.name");
+        try {
+            String vmType;
+            if (vmName.toLowerCase().contains("client")) {
+                vmType = "client";
+            } else {
+                vmType = "server";
+            }
+            _benchmark += "-" + vmType;
+        } catch (final Exception e) {
+            // In case VM name has different format
+        }
+
+        final Element root = doc.getDocumentElement();
+
+        final Element result = doc.createElement("entity");
+
+        root.appendChild(result);
+        result.setAttribute("name", _benchmark);
+        result.setAttribute("type", "BENCHMARK_RESULTS");
+
+        addAttribute(doc, result, "benchmark", _benchmark);
+        addAttribute(doc, result, "score", "0");
+        addAttribute(doc, result, "mean", "0");
+        addAttribute(doc, result, "stdev", "0");
+        addAttribute(doc, result, "var", "0");
+        addAttribute(doc, result, "attempts", "1");
+        addAttribute(doc, result, "successes", "1");
+        addAttribute(doc, result, "failures", "0");
+        addAttribute(doc, result, "jvmOptions", "");
+        addAttribute(doc, result, "is_workload", "0");
+        addAttribute(doc, result, "is_higher_better", "1");
+
+        addConfig(doc, result, _benchmark);
+
+        final Element iteration = addEntity(doc, result, "1", "ITERATION");
+        addAttribute(doc, iteration, "score", "0");
+        addAttribute(doc, iteration, "successful", "true");
+
+        return result;
+    }
+
+    public static void addConfig(final Document doc, final Element result, final String _benchmark) {
+        final Element config = addEntity(doc, result, "default", "BENCHMARK_CONFIG");
+        addAttribute(doc, config, "settings", "benchmarks=" + _benchmark + "\ncomponent=j2se\niterations=1\n");
+        addAttribute(doc, config, "info", "");
+    }
+
+    public static void addResults(final Document doc, final String _benchmark, final String _score) throws TransformerConfigurationException, TransformerException, IOException {
+        final Element result = getRootEntity(doc);
+
+        addBenchmarkResults(doc, result, _benchmark, _score, "1");
+
+        final TransformerFactory tranformerFactory = TransformerFactory.newInstance();
+        final Transformer tr = tranformerFactory.newTransformer();
+        tr.setOutputProperty(OutputKeys.INDENT, "yes");
+        try (FileOutputStream fos = new FileOutputStream(fileName)) {
+            tr.transform(new DOMSource(doc), new StreamResult(fos));
+        }
+    }
+
+    /**
+     * Test
+     */
+    @SuppressWarnings("UseSpecificCatch")
+    public static void main(final String... args) {
+        try {
+            deleteReportDocument();
+            Document document = createOrOpenDocument();
+            addResults(document, "benchmark1", "0.01");
+            document = createOrOpenDocument();
+            addResults(document, "benchmark2", "0.02");
+            document = createOrOpenDocument();
+            addResults(document, "benchmark3", "0.03");
+
+            final TransformerFactory tranformerFactory = TransformerFactory.newInstance();
+            final Transformer tr = tranformerFactory.newTransformer();
+            tr.setOutputProperty(OutputKeys.INDENT, "yes");
+            tr.transform(new DOMSource(document), new StreamResult(System.out));
+        } catch (final Exception e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/nashorn/test/src/jdk/nashorn/internal/performance/OctaneTest.java b/nashorn/test/src/jdk/nashorn/internal/performance/OctaneTest.java
new file mode 100644
index 00000000000..87400d7f01b
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/performance/OctaneTest.java
@@ -0,0 +1,307 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.performance;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.PrintStream;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.text.NumberFormat;
+import java.util.List;
+import org.testng.annotations.Test;
+
+public class OctaneTest {
+
+    @Test
+    public void box2DTest() {
+        genericTest("Box2D");
+    }
+
+    @Test
+    public void codeLoadTest() {
+        genericTest("Code-Load");
+    }
+
+    @Test
+    public void cryptoTest() {
+        genericTest("Crypto");
+    }
+
+    @Test
+    public void deltaBlueTest() {
+        genericTest("DeltaBlue");
+    }
+
+    @Test
+    public void earleyBoyerTest() {
+    genericTest("Earley-Boyer");
+    }
+
+    @Test
+    public void gbEMUTest() {
+        genericTest("GBEMU");
+    }
+
+    /*    @Test
+    public void mandreelTest() {
+        genericTest("Mandreel");
+    }*/
+
+    @Test
+    public void navierStokesTest() {
+        genericTest("Navier-Stokes");
+    }
+
+    @Test
+    public void pdfJSTest() {
+        genericTest("PDFJS");
+    }
+
+    @Test
+    public void raytraceTest() {
+        genericTest("RayTrace");
+    }
+
+    @Test
+    public void regexpTest() {
+        genericTest("RegExp");
+    }
+
+    @Test
+    public void richardsTest() {
+        genericTest("Richards");
+    }
+
+    @Test
+    public void splayTest() {
+        genericTest("Splay");
+    }
+
+    public void genericTest(final String benchmark) {
+        try {
+            final String mainScript      = "test/script/basic/run-octane.js";
+            final String benchmarkScript = "test/script/external/octane/benchmarks/"+benchmark.toLowerCase() + ".js";
+            String[] args = {
+                "--",
+                benchmarkScript,
+                "--verbose"
+            };
+            final Double score = genericNashornTest(benchmark, mainScript, args);
+
+            Double rhinoScore = null;
+            if (checkRhinoPresence()) {
+                args[0]=mainScript; //rhino does not need this "--"
+                rhinoScore = genericRhinoTest(benchmark,  args, System.getProperty("rhino.jar"));
+            }
+
+            Double v8Score = null;
+            if (checkV8Presence()) {
+                v8Score = genericV8Test(benchmark, "test/script/basic/run-octane.js -- test/script/external/octane/benchmarks/" + benchmark.toLowerCase() + ".js --verbose");
+            }
+
+            generateOutput(benchmark.toLowerCase(), score, rhinoScore, v8Score);
+
+        } catch (final Throwable e) {
+            e.printStackTrace();
+        }
+    }
+
+    public Double genericNashornTest(final String benchmark, final String testPath, String[] args) throws Throwable {
+        try {
+            final PerformanceWrapper wrapper = new PerformanceWrapper();
+
+            final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            final PrintStream ps = new PrintStream(baos);
+
+            java.io.File test=new java.io.File(testPath);
+            File absoluteFile=test.getAbsoluteFile();
+            @SuppressWarnings("deprecation")
+            URL testURL=absoluteFile.toURL();
+
+            wrapper.runExecuteOnlyTest(testPath, 0, 0, testURL.toString(), ps, System.err, args);
+
+            final byte[] output = baos.toByteArray();
+            final List<String> result = outputToStrings(output);
+
+            Double _result = filterBenchmark(result, benchmark);
+
+            return _result;
+        } catch (final Throwable e) {
+            e.printStackTrace();
+            throw e;
+        }
+    }
+
+    public Double genericRhinoTest(final String benchmark, final String[] testPath, final String jarPath) throws Throwable {
+
+        final PrintStream systemOut = System.out;
+
+        try {
+            final ClassLoader loader = java.net.URLClassLoader.newInstance(new URL[] { new URL(jarPath) }, getClass().getClassLoader());
+            final Class<?> clazz = Class.forName("org.mozilla.javascript.tools.shell.Main", true, loader);
+
+            final Class<?>[] pars = { String[].class };
+            final Method mthd = clazz.getMethod("main", pars);
+
+            final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            final PrintStream ps = new PrintStream(baos);
+
+            System.setOut(ps);
+            //final String[] realArgs = testPath.split(" ");//{ testPath };
+            mthd.invoke(null, ((Object)testPath));
+            System.setOut(systemOut);
+
+            final byte[] output = baos.toByteArray();
+            final List<String> result = outputToStrings(output);
+            return filterBenchmark(result, benchmark);
+
+        } catch (final Throwable e) {
+            System.setOut(systemOut);
+            e.printStackTrace();
+            throw e;
+        }
+    }
+
+    public Double genericV8Test(final String benchmark, final String testPath) throws Throwable {
+
+        System.out.println("genericV8Test");
+        if (!checkV8Presence()) {
+            return null;
+        }
+        final String v8shell = System.getProperty("v8.shell.full.path");
+        final PrintStream systemOut = System.out;
+
+        try {
+
+            final Process process = Runtime.getRuntime().exec(v8shell + " " + testPath);
+            process.waitFor();
+            final InputStream processOut = process.getInputStream();
+            final BufferedInputStream bis = new BufferedInputStream(processOut);
+
+            final byte[] output = new byte[bis.available()];
+            bis.read(output, 0, bis.available());
+            final List<String> result = outputToStrings(output);
+            return filterBenchmark(result, benchmark);
+
+        } catch (final Throwable e) {
+            System.setOut(systemOut);
+            e.printStackTrace();
+            throw e;
+        }
+    }
+
+    protected List<String> outputToStrings(final byte[] output) throws IOException {
+        final ByteArrayInputStream bais = new ByteArrayInputStream(output);
+        final InputStreamReader reader = new InputStreamReader(bais);
+        final BufferedReader bufReader = new BufferedReader(reader);
+        final List<String> list = new java.util.LinkedList<>();
+        while (bufReader.ready()) {
+            list.add(bufReader.readLine());
+        }
+        return list;
+    }
+
+    protected Double filterBenchmark(final List<String> output, final String benchmarkName) throws Exception {
+        Double currentScore = 0.;
+        for (final String s : output) {
+            //if (s.trim().startsWith(benchmarkName)) {
+            if (s.trim().startsWith("Score")) {
+                final String[] split = s.split(":");
+                if (split.length != 2) {
+                    for (final String outString : output) {
+                        System.out.println("outString (score format)"+outString);
+                    }
+                    throw new IllegalArgumentException("Invalid benchmark output format");
+                }
+
+                final NumberFormat nf = NumberFormat.getInstance();
+                final Number _newCurrentScore = nf.parse(split[1].trim());
+                final Double newCurrentScore = _newCurrentScore.doubleValue();
+                if (currentScore < newCurrentScore) {
+                    currentScore = newCurrentScore;
+                }
+            }
+        }
+//        System.out.println("filterBenchmark current score:"+currentScore);
+        return currentScore;
+    }
+
+    void generateOutput(final String benchmark, final Double nashorn, final Double rhino, final Double v8) throws Exception {
+        Double nashornToRhino = null;
+        Double nashornToV8 = null;
+        if (rhino != null && rhino != 0) {
+            nashornToRhino = nashorn.doubleValue() / rhino.doubleValue();
+        }
+        if (v8 != null && rhino != 0) {
+            nashornToV8 = nashorn.doubleValue() / v8.doubleValue();
+        }
+        String normalizedBenchmark=benchmark.replace("-", "");
+        System.out.println("benchmark-" + normalizedBenchmark + "-nashorn=" + nashorn);
+        AuroraWrapper.addResults(AuroraWrapper.createOrOpenDocument(), "benchmark-" + normalizedBenchmark + "-nashorn", nashorn.toString());
+
+        if (rhino != null) {
+            System.out.println("benchmark-" + normalizedBenchmark + "-rhino=" + rhino);
+            AuroraWrapper.addResults(AuroraWrapper.createOrOpenDocument(), "benchmark-" + normalizedBenchmark + "-rhino", rhino.toString());
+        }
+        if (v8 != null) {
+            AuroraWrapper.addResults(AuroraWrapper.createOrOpenDocument(), "benchmark-" + normalizedBenchmark + "-v8", v8.toString());
+        }
+        if (nashornToRhino != null) {
+            System.out.println("benchmark-" + normalizedBenchmark + "-nashorn-to-rhino=" + ((float)((int)(nashornToRhino * 100))) / 100);
+            AuroraWrapper.addResults(AuroraWrapper.createOrOpenDocument(), "benchmark-" + normalizedBenchmark + "-nashorn-to-rhino", "" + ((float)((int)(nashornToRhino * 100))) / 100);
+        }
+        if (nashornToV8 != null) {
+            System.out.println("benchmark-" + normalizedBenchmark + "-nashorn-to-v8=" + ((float)((int)(nashornToV8 * 100))) / 100);
+            AuroraWrapper.addResults(AuroraWrapper.createOrOpenDocument(), "benchmark-" + normalizedBenchmark + "-nashorn-to-v8", "" + ((float)((int)(nashornToV8 * 100))) / 100);
+        }
+    }
+
+    boolean checkRhinoPresence() {
+        final String rhinojar = System.getProperty("rhino.jar");
+        if (rhinojar != null) {
+            // System.out.println("Rhino jar found; performing comparison testing");
+            return true;
+        }
+        return false;
+    }
+
+    boolean checkV8Presence() {
+        final String v8shell = System.getProperty("v8.shell.full.path");
+        if (v8shell != null) {
+            // System.out.println("d8 found; performing comparison testing");
+            return true;
+        }
+        return false;
+    }
+
+}
diff --git a/nashorn/test/src/jdk/nashorn/internal/performance/PerformanceWrapper.java b/nashorn/test/src/jdk/nashorn/internal/performance/PerformanceWrapper.java
new file mode 100644
index 00000000000..a2cbcfd8345
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/performance/PerformanceWrapper.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.performance;
+
+import java.io.OutputStream;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.runtime.ScriptFunction;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
+
+/**
+ *
+ * @author Pavel Stepanov
+ */
+public class PerformanceWrapper extends jdk.nashorn.tools.Shell {
+
+    int _numberOfIterations;
+    int _runsPerIteration;
+
+    protected void runCompileOnlyTest(final String name, final int numberOfIterations, final int runsPerIteration, final String testURL) throws Throwable {
+        final String[] args = { name, "--compile-only=true", "-dump-on-error", "--", testURL };
+
+        final long[] times = new long[numberOfIterations + 1];
+        times[0] = System.nanoTime(); // Calendar.getInstance().getTimeInMillis();
+
+        for (int iteration = 1; iteration <= numberOfIterations; iteration++) {
+            for (int i = 0; i < runsPerIteration; i++) {
+                run(System.in, System.out, System.err, args);
+            }
+            times[iteration] = System.nanoTime();
+        }
+
+        for (int i = 0; i < numberOfIterations; i++) {
+            System.out.println("Iteration " + (i + 1) + " average time: " + ((times[i + 1] - times[i]) / (float)runsPerIteration) / 1000000.0 + " ms.");
+        }
+    }
+
+    protected void runExecuteOnlyTest(final String name, final int numberOfIterations, final int runsPerIteration, final String testURL) throws Throwable {
+        runExecuteOnlyTest(name, numberOfIterations, runsPerIteration, testURL, System.out, System.err, new String[0]);
+    }
+
+    protected void runExecuteOnlyTest(final String name, final int numberOfIterations, final int runsPerIteration, final String testURL, final OutputStream out, final OutputStream err) throws Throwable {
+        runExecuteOnlyTest(name, numberOfIterations, runsPerIteration, testURL, out, err, new String[0]);
+    }
+
+
+    protected void runExecuteOnlyTest(final String name, final int numberOfIterations, final int runsPerIteration, final String testURL, final OutputStream out, final OutputStream err, String[] newargs) throws Throwable {
+        String[] args=new String[newargs.length+1];
+        System.arraycopy(newargs, 0, args, 1, newargs.length);
+        args[0]=name;
+
+//      for (String s: args)
+//          System.out.println(s);
+
+        _numberOfIterations = numberOfIterations;
+        _runsPerIteration = runsPerIteration;
+        run(System.in, out, err, args);
+//      System.out.println("overridableRun finished");
+    }
+
+    @Override
+    protected Object apply(final ScriptFunction target, final Object self) {
+        if (_runsPerIteration == 0 && _numberOfIterations == 0) {
+            final ScriptObject global = jdk.nashorn.internal.runtime.Context.getGlobal();
+            final ScriptFunction _target = target;
+            final Object _self = self;
+
+            class MyThread implements Callable<Object> {
+                @Override
+                public Object call() {
+                    Context.setGlobal(global);
+                    //just execute and return script is sufficient
+                    final Object scriptRuntimeApplyResult = ScriptRuntime.apply(_target, _self);
+                    return scriptRuntimeApplyResult;
+                }
+            }
+
+            final java.util.concurrent.ThreadPoolExecutor executor = new java.util.concurrent.ThreadPoolExecutor(1, 1, 1, TimeUnit.MINUTES, new java.util.concurrent.ArrayBlockingQueue<Runnable>(10));
+            final MyThread myThread = new MyThread();
+            // executor.execute(myThread);
+            Object result;
+            Future<?> futureResult = null;
+
+            try {
+                futureResult = executor.submit(myThread);
+                final String timeout = System.getProperty("timeout.value");
+                int tmout = 0;
+                if (timeout != null) {
+                    try {
+                        tmout = Integer.parseInt(timeout);
+                    } catch (final Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+                if (tmout != 0) {
+                    result = futureResult.get(10, TimeUnit.MINUTES);
+                } else {
+                    result = futureResult.get();
+                }
+            } catch (final InterruptedException | ExecutionException e) {
+                e.printStackTrace();
+                return null;
+            } catch (final TimeoutException e) {
+                System.out.println("timeout while script execution");
+                futureResult.cancel(true);
+                return null;
+            }
+
+            return result;
+        }
+
+        final long[] times = new long[_numberOfIterations + 1];
+        times[0] = System.nanoTime();
+        for (int iteration = 1; iteration <= _numberOfIterations; iteration++) {
+            for (int i = 0; i < _runsPerIteration; i++) {
+                // empty
+            }
+            times[iteration] = System.nanoTime();
+        }
+
+        for (int i = 0; i < _numberOfIterations; i++) {
+            System.out.println("Iteration " + (i + 1) + " average time: " + ((times[i + 1] - times[i]) / (float)_runsPerIteration) / 1000000.0 + " ms.");
+        }
+
+        return ScriptRuntime.apply(target, self);
+    }
+}
diff --git a/nashorn/test/src/jdk/nashorn/internal/performance/SplayTest.java b/nashorn/test/src/jdk/nashorn/internal/performance/SplayTest.java
new file mode 100644
index 00000000000..ff0275968e1
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/performance/SplayTest.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.performance;
+
+import org.testng.annotations.Test;
+
+/**
+ *
+ * @author Pavel Stepanov
+ */
+public class SplayTest {
+
+    @Test
+    public void test() {
+        try {
+            final PerformanceWrapper wrapper = new PerformanceWrapper();
+            System.out.println("run Compile Only test");
+            wrapper.runCompileOnlyTest("test/performance/perf.js", 20, 100, "file:test/performance/splay.js");
+            System.out.println("run Execute Only test");
+            wrapper.runExecuteOnlyTest("test/performance/perf.js", 20, 10, "file:test/performance/splay.js");
+        } catch (final Throwable e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/ContextTest.java b/nashorn/test/src/jdk/nashorn/internal/runtime/ContextTest.java
new file mode 100644
index 00000000000..567fc85ccab
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/runtime/ContextTest.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+import java.util.Map;
+import jdk.nashorn.internal.runtime.options.Options;
+import org.testng.annotations.Test;
+
+/**
+ * Basic Context API tests.
+ */
+public class ContextTest {
+    // basic context eval test
+    @Test
+    public void evalTest() {
+        final Options options = new Options("");
+        final ErrorManager errors = new ErrorManager();
+        final Context cx = new Context(options, errors);
+        final ScriptObject oldGlobal = Context.getGlobal();
+        Context.setGlobal(cx.createGlobal());
+        try {
+            String code = "22 + 10";
+            assertTrue(32.0 == ((Number)(eval(cx, "<evalTest>", code))).doubleValue());
+
+            code = "obj = { js: 'nashorn' }; obj.js";
+            assertEquals("nashorn", eval(cx, "<evalTest2>", code));
+        } finally {
+            Context.setGlobal(oldGlobal);
+        }
+    }
+
+    // basic check for JS reflection access
+    @Test
+    public void reflectionTest() {
+        final Options options = new Options("");
+        final ErrorManager errors = new ErrorManager();
+        final Context cx = new Context(options, errors);
+        final ScriptObject oldGlobal = Context.getGlobal();
+        Context.setGlobal(cx.createGlobal());
+
+        try {
+            final String code = "var obj = { x: 344, y: 42 }";
+            eval(cx, "<reflectionTest>", code);
+
+            final Object obj = cx.getGlobal().get("obj");
+
+            assertTrue(obj instanceof Map);
+
+            @SuppressWarnings("unchecked")
+            final Map<Object, Object> map = (Map<Object, Object>)obj;
+            int count = 0;
+            for (final Map.Entry<?, ?> ex : map.entrySet()) {
+                final Object key = ex.getKey();
+                if (key.equals("x")) {
+                    assertTrue(ex.getValue() instanceof Number);
+                    assertTrue(344.0 == ((Number)ex.getValue()).doubleValue());
+
+                    count++;
+                } else if (key.equals("y")) {
+                    assertTrue(ex.getValue() instanceof Number);
+                    assertTrue(42.0 == ((Number)ex.getValue()).doubleValue());
+
+                    count++;
+                }
+            }
+            assertEquals(2, count);
+            assertEquals(2, map.size());
+
+            // add property
+            map.put("zee", "hello");
+            assertEquals("hello", map.get("zee"));
+            assertEquals(3, map.size());
+
+        } finally {
+            Context.setGlobal(oldGlobal);
+        }
+    }
+
+    private Object eval(final Context cx, final String name, final String code) {
+        final Source source = new Source(name, code);
+        final ScriptObject global = Context.getGlobal();
+        final ScriptFunction func = cx.compileScript(source, global, cx._strict);
+        return func != null ? ScriptRuntime.apply(func, global) : null;
+    }
+}
diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/JSTypeTest.java b/nashorn/test/src/jdk/nashorn/internal/runtime/JSTypeTest.java
new file mode 100644
index 00000000000..59938e2313e
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/runtime/JSTypeTest.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+import org.testng.annotations.Test;
+
+/**
+ * Tests for JSType methods.
+ */
+public class JSTypeTest {
+    /**
+     * Test of isPrimitive method, of class Runtime.
+     */
+    @Test
+    public void testIsPrimitive() {
+        assertEquals(true,  JSType.isPrimitive(null));
+        assertEquals(true,  JSType.isPrimitive(ScriptRuntime.UNDEFINED));
+        assertEquals(true,  JSType.isPrimitive(Double.NaN));
+        assertEquals(true,  JSType.isPrimitive(Double.NEGATIVE_INFINITY));
+        assertEquals(true,  JSType.isPrimitive(Double.POSITIVE_INFINITY));
+        assertEquals(true,  JSType.isPrimitive(0.0));
+        assertEquals(true,  JSType.isPrimitive(3.14));
+        assertEquals(true,  JSType.isPrimitive("hello"));
+        assertEquals(true,  JSType.isPrimitive(""));
+        assertEquals(false, JSType.isPrimitive(new Object()));
+    }
+
+    /**
+     * Test of toBoolean method, of class Runtime.
+     */
+    @Test
+    public void testToBoolean() {
+        assertEquals(false, JSType.toBoolean(ScriptRuntime.UNDEFINED));
+        assertEquals(false, JSType.toBoolean(null));
+        assertEquals(false, JSType.toBoolean(Boolean.FALSE));
+        assertEquals(true,  JSType.toBoolean(Boolean.TRUE));
+        assertEquals(false, JSType.toBoolean(-0.0));
+        assertEquals(false, JSType.toBoolean(0.0));
+        assertEquals(false, JSType.toBoolean(Double.NaN));
+        assertEquals(true,  JSType.toBoolean(3.14));
+        assertEquals(false, JSType.toBoolean(""));
+        assertEquals(true,  JSType.toBoolean("javascript"));
+        assertEquals(true,  JSType.toBoolean(new Object()));
+    }
+
+    /**
+     * Test of toNumber method, of class Runtime.
+     */
+    @Test
+    public void testToNumber_Object() {
+        assertTrue(Double.isNaN(JSType.toNumber(ScriptRuntime.UNDEFINED)));
+        assertEquals(0.0,  JSType.toNumber((Object)null), 0.0);
+        assertEquals(1.0,  JSType.toNumber(Boolean.TRUE), 0.0);
+        assertEquals(0.0,  JSType.toNumber(Boolean.FALSE), 0.0);
+        assertEquals(3.14, JSType.toNumber(3.14), 0.0);
+        // FIXME: add more assertions for specific String to number cases
+        // FIXME: add case for Object type (JSObject with getDefaultValue)
+    }
+
+    /**
+     * Test of toString method, of class Runtime.
+     */
+    @Test
+    public void testToString_Object() {
+        assertEquals("undefined", JSType.toString(ScriptRuntime.UNDEFINED));
+        assertEquals("null", JSType.toString(null));
+        assertEquals("true", JSType.toString(Boolean.TRUE));
+        assertEquals("false", JSType.toString(Boolean.FALSE));
+        assertEquals("", JSType.toString(""));
+        assertEquals("nashorn", JSType.toString("nashorn"));
+        assertEquals("NaN", JSType.toString(Double.NaN));
+        assertEquals("Infinity", JSType.toString(Double.POSITIVE_INFINITY));
+        assertEquals("-Infinity", JSType.toString(Double.NEGATIVE_INFINITY));
+        assertEquals("0", JSType.toString(0.0));
+        // FIXME: add more number-to-string test cases
+        // FIXME: add case for Object type (JSObject with getDefaultValue)
+    }
+}
diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/Nashorn401TestSubject.java b/nashorn/test/src/jdk/nashorn/internal/runtime/Nashorn401TestSubject.java
new file mode 100644
index 00000000000..6a80973995e
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/runtime/Nashorn401TestSubject.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+public class Nashorn401TestSubject {
+    public String method2(int arg) {
+        return "int method 2";
+    }
+
+    public String method2(double arg) {
+        return "double method 2";
+    }
+
+    public String method2(String arg) {
+        return "string method 2";
+    }
+
+    public String method3(double arg) {
+        return "double method 3: " + arg;
+    }
+
+    public String method3(int arg) {
+        return "int method 3: " + arg;
+    }
+
+    public String method4(Double arg) {
+        return "double method 4: " + arg;
+    }
+
+    public String method4(int arg) {
+        return "int method 4: " + arg;
+    }
+
+}
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/AbstractScriptRunnable.java b/nashorn/test/src/jdk/nashorn/internal/test/framework/AbstractScriptRunnable.java
new file mode 100644
index 00000000000..2d57aa14baf
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/test/framework/AbstractScriptRunnable.java
@@ -0,0 +1,297 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.test.framework;
+
+import static jdk.nashorn.internal.test.framework.TestConfig.OPTIONS_CHECK_COMPILE_MSG;
+import static jdk.nashorn.internal.test.framework.TestConfig.OPTIONS_COMPARE;
+import static jdk.nashorn.internal.test.framework.TestConfig.OPTIONS_EXPECT_COMPILE_FAIL;
+import static jdk.nashorn.internal.test.framework.TestConfig.OPTIONS_EXPECT_RUN_FAIL;
+import static jdk.nashorn.internal.test.framework.TestConfig.OPTIONS_IGNORE_STD_ERROR;
+import static jdk.nashorn.internal.test.framework.TestConfig.OPTIONS_RUN;
+import static jdk.nashorn.internal.test.framework.TestConfig.TEST_JS_FAIL_LIST;
+import static jdk.nashorn.internal.test.framework.TestConfig.TEST_JS_SHARED_CONTEXT;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Matcher;
+
+/**
+ * Abstract class to compile and run one .js script file.
+ */
+public abstract class AbstractScriptRunnable {
+    // some test scripts need a "framework" script - whose features are used
+    // in the test script. This optional framework script can be null.
+
+    protected final String framework;
+    // Script file that is being tested
+    protected final File testFile;
+    // build directory where test output, stderr etc are redirected
+    protected final File buildDir;
+    // should run the test or just compile?
+    protected final boolean shouldRun;
+    // is compiler error expected?
+    protected final boolean expectCompileFailure;
+    // is runtime error expected?
+    protected final boolean expectRunFailure;
+    // is compiler error captured and checked against known error strings?
+    protected final boolean checkCompilerMsg;
+    // .EXPECTED file compared for this or test?
+    protected final boolean compare;
+    // ignore stderr output?
+    protected final boolean ignoreStdError;
+    // Foo.js.OUTPUT file where test stdout messages go
+    protected final String outputFileName;
+    // Foo.js.ERROR where test's stderr messages go.
+    protected final String errorFileName;
+    // copy of Foo.js.EXPECTED file
+    protected final String copyExpectedFileName;
+    // Foo.js.EXPECTED - output expected by running Foo.js
+    protected final String expectedFileName;
+    // options passed to Nashorn engine
+    protected final List<String> engineOptions;
+    // arguments passed to script - these are visible as "arguments" array to script
+    protected final List<String> scriptArguments;
+    // Tests that are forced to fail always
+    protected final Set<String> failList = new HashSet<>();
+
+    public AbstractScriptRunnable(final String framework, final File testFile, final List<String> engineOptions, final Map<String, String> testOptions, final List<String> scriptArguments) {
+        this.framework = framework;
+        this.testFile = testFile;
+        this.buildDir = TestHelper.makeBuildDir(testFile);
+        this.engineOptions = engineOptions;
+        this.scriptArguments = scriptArguments;
+
+        this.expectCompileFailure = testOptions.containsKey(OPTIONS_EXPECT_COMPILE_FAIL);
+        this.shouldRun = testOptions.containsKey(OPTIONS_RUN);
+        this.expectRunFailure = testOptions.containsKey(OPTIONS_EXPECT_RUN_FAIL);
+        this.checkCompilerMsg = testOptions.containsKey(OPTIONS_CHECK_COMPILE_MSG);
+        this.ignoreStdError = testOptions.containsKey(OPTIONS_IGNORE_STD_ERROR);
+        this.compare = testOptions.containsKey(OPTIONS_COMPARE);
+
+        final String testName = testFile.getName();
+        this.outputFileName = buildDir + File.separator + testName + ".OUTPUT";
+        this.errorFileName = buildDir + File.separator + testName + ".ERROR";
+        this.copyExpectedFileName = buildDir + File.separator + testName + ".EXPECTED";
+        this.expectedFileName = testFile.getPath() + ".EXPECTED";
+
+        final String failListString = System.getProperty(TEST_JS_FAIL_LIST);
+        if (failListString != null) {
+            final String[] failedTests = failListString.split(" ");
+            for (final String failedTest : failedTests) {
+                failList.add(failedTest.trim());
+            }
+        }
+    }
+
+    // run this test - compile or compile-and-run depending on option passed
+    public void runTest() throws IOException {
+        log(toString());
+
+        if (shouldRun) {
+            // Analysis of failing tests list -
+            // if test is in failing list it must fail
+            // to not wrench passrate (used for crashing tests).
+            if (failList.contains(testFile.getName())) {
+                fail(String.format("Test %s is forced to fail (see %s)", testFile, TEST_JS_FAIL_LIST));
+            }
+
+            execute();
+        } else {
+            compile();
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "Test(compile" + (expectCompileFailure ? "-" : "") + (shouldRun ? ", run" : "") + (expectRunFailure ? "-" : "") + "): " + testFile;
+    }
+
+    // compile-only command line arguments
+    protected List<String> getCompilerArgs() {
+        final List<String> args = new ArrayList<>();
+        args.add("--compile-only");
+        args.addAll(engineOptions);
+        args.add(testFile.getPath());
+        return args;
+    }
+
+    // shared context or not?
+    protected static final boolean sharedContext;
+    static {
+        sharedContext = Boolean.getBoolean(TEST_JS_SHARED_CONTEXT);
+    }
+    private static ThreadLocal<ScriptEvaluator> evaluators = new ThreadLocal<>();
+
+    /**
+     * Create a script evaluator or return from cache
+     * @return a ScriptEvaluator object
+     */
+    protected ScriptEvaluator getEvaluator() {
+        synchronized (AbstractScriptRunnable.class) {
+            ScriptEvaluator evaluator = evaluators.get();
+            if (evaluator == null) {
+                if (sharedContext) {
+                    final String[] args;
+                    if (framework.indexOf(' ') > 0) {
+                        args = framework.split("\\s+");
+                    } else {
+                        args = new String[] { framework };
+                    }
+                    evaluator = new SharedContextEvaluator(args);
+                    evaluators.set(evaluator);
+                } else {
+                    evaluator = new SeparateContextEvaluator();
+                    evaluators.set(evaluator);
+                }
+            }
+            return evaluator;
+        }
+    }
+
+    /**
+     * Evaluate one or more scripts with given output and error streams
+     *
+     * @param out OutputStream for script output
+     * @param err OutputStream for script errors
+     * @param args arguments for script evaluation
+     * @return success or error code from script execution
+     */
+    protected int evaluateScript(final OutputStream out, final OutputStream err, final String[] args) {
+        try {
+            return getEvaluator().run(out, err, args);
+        } catch (final IOException e) {
+            throw new UnsupportedOperationException("I/O error in initializing shell - cannot redirect output to file");
+        }
+    }
+
+    // arguments to be passed to compile-and-run this script
+    protected List<String> getRuntimeArgs() {
+        final ArrayList<String> args = new ArrayList<>();
+        // add engine options first
+        args.addAll(engineOptions);
+
+        // framework script if any
+        if (framework != null) {
+            if (framework.indexOf(' ') > 0) {
+                args.addAll(Arrays.asList(framework.split("\\s+")));
+            } else {
+                args.add(framework);
+            }
+        }
+
+        // test script
+        args.add(testFile.getPath());
+
+        // script arguments
+        if (!scriptArguments.isEmpty()) {
+            args.add("--");
+            args.addAll(scriptArguments);
+        }
+
+        return args;
+    }
+
+    // compares actual test output with .EXPECTED output
+    protected void compare(final BufferedReader actual, final BufferedReader expected, final boolean compareCompilerMsg) throws IOException {
+        int lineCount = 0;
+        while (true) {
+            final String es = expected.readLine();
+            String as = actual.readLine();
+            if (compareCompilerMsg) {
+                while (as != null && as.startsWith("--")) {
+                    as = actual.readLine();
+                }
+            }
+            ++lineCount;
+
+            if (es == null && as == null) {
+                if (expectRunFailure) {
+                    fail("Expected runtime failure");
+                } else {
+                    break;
+                }
+            } else if (expectRunFailure && ((es == null) || as == null || !es.equals(as))) {
+                break;
+            } else if (es == null) {
+                fail("Expected output for " + testFile + " ends prematurely at line " + lineCount);
+            } else if (as == null) {
+                fail("Program output for " + testFile + " ends prematurely at line " + lineCount);
+            } else if (es.equals(as)) {
+                continue;
+            } else if (compareCompilerMsg && equalsCompilerMsgs(es, as)) {
+                continue;
+            } else {
+                fail("Test " + testFile + " failed at line " + lineCount + " - " + " \n  expected: '" + escape(es) + "'\n     found: '" + escape(as) + "'");
+            }
+        }
+    }
+
+    // logs the message
+    protected abstract void log(String msg);
+    // throw failure message
+    protected abstract void fail(String msg);
+    // compile this script but don't run it
+    protected abstract void compile() throws IOException;
+    // compile and run this script
+    protected abstract void execute();
+
+    private boolean equalsCompilerMsgs(final String es, final String as) {
+        final int split = es.indexOf(':');
+        // Replace both types of separators ('/' and '\') with the one from
+        // current environment
+        return (split >= 0) && as.equals(es.substring(0, split).replaceAll("[/\\\\]", Matcher.quoteReplacement(File.separator)) + es.substring(split));
+    }
+
+    private void escape(final String value, final StringBuilder out) {
+        final int len = value.length();
+        for (int i = 0; i < len; i++) {
+            final char ch = value.charAt(i);
+            if (ch == '\n') {
+                out.append("\\n");
+            } else if (ch < ' ' || ch == 127) {
+                out.append(String.format("\\%03o", (int) ch));
+            } else if (ch > 127) {
+                out.append(String.format("\\u%04x", (int) ch));
+            } else {
+                out.append(ch);
+            }
+        }
+    }
+
+    private String escape(final String value) {
+        final StringBuilder sb = new StringBuilder();
+        escape(value, sb);
+        return sb.toString();
+    }
+}
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/JSJUnitReportReporter.java b/nashorn/test/src/jdk/nashorn/internal/test/framework/JSJUnitReportReporter.java
new file mode 100644
index 00000000000..cb9f151bf4f
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/test/framework/JSJUnitReportReporter.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.test.framework;
+
+import org.testng.ITestResult;
+import org.testng.reporters.JUnitReportReporter;
+
+/**
+ * Modify JUnit reports to include script file name as "method name" rather
+ * than the Java method name that uses the script file for testing.
+ */
+public class JSJUnitReportReporter extends JUnitReportReporter {
+    @Override
+    protected String getTestName(ITestResult tr) {
+        final String testName = tr.getTestName();
+        return (testName != null && testName.endsWith(".js"))? testName : super.getTestName(tr);
+    }
+}
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/OrphanTestFinder.java b/nashorn/test/src/jdk/nashorn/internal/test/framework/OrphanTestFinder.java
new file mode 100644
index 00000000000..d4fc21799b1
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/test/framework/OrphanTestFinder.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.test.framework;
+
+import java.util.Set;
+import org.testng.Assert;
+import org.testng.ITest;
+import org.testng.annotations.Test;
+
+/**
+ * Test case used by JSCompilerTest to complain if test files are marked as
+ * neither test nor subtest.
+ */
+public final class OrphanTestFinder implements ITest {
+    private final Set<String> orphanFiles;
+
+    public OrphanTestFinder(final Set<String> orphanFiles) {
+        this.orphanFiles = orphanFiles;
+    }
+
+    @Override
+    public String getTestName() {
+        return getClass().getName();
+    }
+
+    @Test
+    public void test() {
+        if (orphanFiles == null || orphanFiles.isEmpty()) {
+            return;
+        }
+
+        final StringBuilder sb = new StringBuilder();
+        final String NL = System.getProperty("line.separator");
+        sb.append(orphanFiles.size());
+        sb.append(" files found with neither @test nor @subtest: ");
+        sb.append(NL);
+        for (final String s : orphanFiles) {
+            sb.append("  ");
+            sb.append(s);
+            sb.append(NL);
+        }
+        Assert.fail(sb.toString());
+    }
+}
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/ParallelTestRunner.java b/nashorn/test/src/jdk/nashorn/internal/test/framework/ParallelTestRunner.java
new file mode 100644
index 00000000000..96ddb8a8798
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/test/framework/ParallelTestRunner.java
@@ -0,0 +1,492 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.test.framework;
+
+import static jdk.nashorn.internal.test.framework.TestConfig.TEST_JS_ENABLE_STRICT_MODE;
+import static jdk.nashorn.internal.test.framework.TestConfig.TEST_JS_EXCLUDES_FILE;
+import static jdk.nashorn.internal.test.framework.TestConfig.TEST_JS_EXCLUDE_LIST;
+import static jdk.nashorn.internal.test.framework.TestConfig.TEST_JS_FRAMEWORK;
+import static jdk.nashorn.internal.test.framework.TestConfig.TEST_JS_ROOTS;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.StringReader;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import jdk.nashorn.internal.test.framework.TestFinder.TestFactory;
+
+/**
+ * Parallel test runner runs tests in multiple threads - but avoids any dependency
+ * on third-party test framework library such as TestNG.
+ */
+public class ParallelTestRunner {
+
+    // ParallelTestRunner-specific
+    private static final String    TEST_JS_THREADS     = "test.js.threads";
+    private static final String    TEST_JS_REPORT_FILE = "test.js.report.file";
+    private static final int       THREADS             = Integer.getInteger(TEST_JS_THREADS, Runtime.getRuntime().availableProcessors());
+
+    private final List<ScriptRunnable> tests    = new ArrayList<>();
+    private final Set<String>      orphans  = new TreeSet<>();
+    private final ExecutorService  executor = Executors.newFixedThreadPool(THREADS);
+
+    // Ctrl-C handling
+    private final CountDownLatch   finishedLatch = new CountDownLatch(1);
+    private final Thread           shutdownHook  = new Thread() {
+                                                       @Override
+                                                       public void run() {
+                                                           if (!executor.isTerminated()) {
+                                                               executor.shutdownNow();
+                                                               try {
+                                                                   executor.awaitTermination(25, TimeUnit.SECONDS);
+                                                                   finishedLatch.await(5, TimeUnit.SECONDS);
+                                                               } catch (final InterruptedException e) {
+                                                                   // empty
+                                                               }
+                                                           }
+                                                       }
+                                                   };
+
+    public ParallelTestRunner() throws Exception {
+        suite();
+    }
+
+    private static PrintStream outputStream() {
+        final String reportFile = System.getProperty(TEST_JS_REPORT_FILE, "");
+        PrintStream output = System.out;
+
+        if (!reportFile.isEmpty()) {
+            try {
+                output = new PrintStream(new OutputStreamDelegator(System.out, new FileOutputStream(reportFile)));
+            } catch (final IOException e) {
+                System.err.println(e);
+            }
+        }
+
+        return output;
+    }
+
+    public static final class ScriptRunnable extends AbstractScriptRunnable implements Callable<ScriptRunnable.Result> {
+        private final Result                result   = new Result();
+
+        public class Result {
+            private boolean  passed = true;
+            public String    expected;
+            public String    out;
+            public String    err;
+            public Throwable exception;
+
+            public ScriptRunnable getTest() {
+                return ScriptRunnable.this;
+            }
+
+            public boolean passed() {
+                return passed;
+            }
+
+            @Override
+            public String toString() {
+                return getTest().toString();
+            }
+        }
+
+        public ScriptRunnable(final String framework, final File testFile, final List<String> engineOptions, final Map<String, String> testOptions, final List<String> scriptArguments) {
+            super(framework, testFile, engineOptions, testOptions, scriptArguments);
+        }
+
+        @Override
+        protected void log(String msg) {
+            System.err.println(msg);
+        }
+
+        @Override
+        protected void fail(final String message) {
+            throw new TestFailedError(message);
+        }
+
+        @Override
+        protected void compile() throws IOException {
+            final ByteArrayOutputStream out = new ByteArrayOutputStream();
+            final ByteArrayOutputStream err = new ByteArrayOutputStream();
+            final List<String> args = getCompilerArgs();
+            int errors;
+            try {
+                errors = evaluateScript(out, err, args.toArray(new String[args.size()]));
+            } catch (final AssertionError e) {
+                final PrintWriter writer = new PrintWriter(err);
+                e.printStackTrace(writer);
+                writer.flush();
+                errors = 1;
+            }
+            if (errors != 0 || checkCompilerMsg) {
+                result.err = err.toString();
+                if (expectCompileFailure || checkCompilerMsg) {
+                    final PrintStream outputDest = new PrintStream(new FileOutputStream(getErrorFileName()));
+                    TestHelper.dumpFile(outputDest, new StringReader(new String(err.toByteArray())));
+                    outputDest.println("--");
+                }
+                if (errors != 0 && !expectCompileFailure) {
+                    fail(String.format("%d errors compiling %s", errors, testFile));
+                }
+                if (checkCompilerMsg) {
+                    compare(getErrorFileName(), expectedFileName, true);
+                }
+            }
+            if (expectCompileFailure && errors == 0) {
+                fail(String.format("No errors encountered compiling negative test %s", testFile));
+            }
+        }
+
+        @Override
+        protected void execute() {
+            final List<String> args = getRuntimeArgs();
+            final ByteArrayOutputStream out = new ByteArrayOutputStream();
+            final ByteArrayOutputStream err = new ByteArrayOutputStream();
+
+            try {
+                final int errors = evaluateScript(out, err, args.toArray(new String[args.size()]));
+
+                if (errors != 0 || err.size() > 0) {
+                    if (expectRunFailure) {
+                        return;
+                    }
+                    if (!ignoreStdError) {
+
+                        try (OutputStream outputFile = new FileOutputStream(getOutputFileName()); OutputStream errorFile = new FileOutputStream(getErrorFileName())) {
+                            outputFile.write(out.toByteArray());
+                            errorFile.write(err.toByteArray());
+                        }
+
+                        result.out = out.toString();
+                        result.err = err.toString();
+                        fail(err.toString());
+                    }
+                }
+
+                if (compare) {
+                    final File expectedFile = new File(expectedFileName);
+                    try {
+                        BufferedReader expected;
+                        if (expectedFile.exists()) {
+                            expected = new BufferedReader(new FileReader(expectedFile));
+                        } else {
+                            expected = new BufferedReader(new StringReader(""));
+                        }
+                        compare(new BufferedReader(new StringReader(out.toString())), expected, false);
+                    } catch (final Throwable ex) {
+                        if (expectedFile.exists()) {
+                            copyExpectedFile();
+                        }
+                        try (OutputStream outputFile = new FileOutputStream(getOutputFileName()); OutputStream errorFile = new FileOutputStream(getErrorFileName())) {
+                            outputFile.write(out.toByteArray());
+                            errorFile.write(err.toByteArray());
+                        }
+                        throw ex;
+                    }
+                }
+            } catch (final IOException e) {
+                if (!expectRunFailure) {
+                    fail("Failure running test " + testFile + ": " + e.getMessage());
+                } // else success
+            }
+        }
+
+        private void compare(final String outputFileName, final String expected, final boolean compareCompilerMsg) throws IOException {
+            final File expectedFile = new File(expected);
+
+            BufferedReader expectedReader;
+            if (expectedFile.exists()) {
+                expectedReader = new BufferedReader(new InputStreamReader(new FileInputStream(expectedFileName)));
+            } else {
+                expectedReader = new BufferedReader(new StringReader(""));
+            }
+
+            final BufferedReader actual = new BufferedReader(new InputStreamReader(new FileInputStream(outputFileName)));
+
+            compare(actual, expectedReader, compareCompilerMsg);
+        }
+
+        private void copyExpectedFile() {
+            if (!new File(expectedFileName).exists()) {
+                return;
+            }
+            // copy expected file overwriting existing file and preserving last
+            // modified time of source
+            try {
+                Files.copy(FileSystems.getDefault().getPath(expectedFileName), FileSystems.getDefault().getPath(getCopyExpectedFileName()), StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.COPY_ATTRIBUTES);
+            } catch (final IOException ex) {
+                fail("failed to copy expected " + expectedFileName + " to " + getCopyExpectedFileName() + ": " + ex.getMessage());
+            }
+        }
+
+        @Override
+        public Result call() {
+            try {
+                runTest();
+            } catch (final Throwable ex) {
+                result.exception = ex;
+                result.passed = false;
+            }
+            return result;
+        }
+
+        private String getOutputFileName() {
+            buildDir.mkdirs();
+            return outputFileName;
+        }
+
+        private String getErrorFileName() {
+            buildDir.mkdirs();
+            return errorFileName;
+        }
+
+        private String getCopyExpectedFileName() {
+            buildDir.mkdirs();
+            return copyExpectedFileName;
+        }
+    }
+
+    private void suite() throws Exception {
+        Locale.setDefault(new Locale(""));
+        System.setOut(outputStream());
+
+        final TestFactory<ScriptRunnable> testFactory = new TestFactory<ScriptRunnable>() {
+            @Override
+            public ScriptRunnable createTest(String framework, File testFile, List<String> engineOptions, Map<String, String> testOptions, List<String> arguments) {
+                return new ScriptRunnable(framework, testFile, engineOptions, testOptions, arguments);
+            }
+
+            @Override
+            public void log(String msg) {
+                System.err.println(msg);
+            }
+        };
+
+        TestFinder.findAllTests(tests, orphans, testFactory);
+
+        Collections.sort(tests, new Comparator<ScriptRunnable>() {
+            @Override
+            public int compare(final ScriptRunnable o1, final ScriptRunnable o2) {
+                return o1.testFile.compareTo(o2.testFile);
+            }
+        });
+    }
+
+    public void run() {
+        final int testCount = tests.size();
+        int passCount = 0;
+        int doneCount = 0;
+        System.out.printf("Found %d tests.\n", testCount);
+        final long startTime = System.nanoTime();
+
+        Runtime.getRuntime().addShutdownHook(shutdownHook);
+
+        final List<Future<ScriptRunnable.Result>> futures = new ArrayList<>();
+        for (final ScriptRunnable test : tests) {
+            futures.add(executor.submit(test));
+        }
+
+        executor.shutdown();
+        try {
+            executor.awaitTermination(60, TimeUnit.MINUTES);
+        } catch (final InterruptedException ex) {
+            // empty
+        }
+
+        final List<ScriptRunnable.Result> results = new ArrayList<>();
+        for (final Future<ScriptRunnable.Result> future : futures) {
+            if (future.isDone()) {
+                try {
+                    final ScriptRunnable.Result result = future.get();
+                    results.add(result);
+                    doneCount++;
+                    if (result.passed()) {
+                        passCount++;
+                    }
+                } catch (CancellationException | ExecutionException ex) {
+                    ex.printStackTrace();
+                } catch (final InterruptedException ex) {
+                    assert false : "should not reach here";
+                }
+            }
+        }
+
+        Collections.sort(results, new Comparator<ScriptRunnable.Result>() {
+            @Override
+            public int compare(final ScriptRunnable.Result o1, final ScriptRunnable.Result o2) {
+                return o1.getTest().testFile.compareTo(o2.getTest().testFile);
+            }
+        });
+
+        boolean hasFailed = false;
+        for (final ScriptRunnable.Result result : results) {
+            if (!result.passed()) {
+                if (hasFailed == false) {
+                    hasFailed = true;
+                    System.out.println();
+                    System.out.println("FAILED TESTS");
+                }
+
+                System.out.println(result.getTest());
+                if (result.exception != null) {
+                    final String exceptionString = result.exception instanceof TestFailedError ? result.exception.getMessage() : result.exception.toString();
+                    System.out.print(exceptionString.endsWith("\n") ? exceptionString : exceptionString + "\n");
+                    System.out.print(result.out != null ? result.out : "");
+                }
+            }
+        }
+
+        final double timeElapsed = (System.nanoTime() - startTime) / 1e9; // [s]
+        System.out.printf("Tests run: %d/%d tests, passed: %d (%.2f%%), failed: %d. Time elapsed: %.0fmin %.0fs.\n", doneCount, testCount, passCount, 100d * passCount / doneCount, doneCount - passCount, timeElapsed / 60, timeElapsed % 60);
+        System.out.flush();
+
+        finishedLatch.countDown();
+
+        if (hasFailed) {
+            throw new AssertionError("TEST FAILED");
+        }
+    }
+
+    public static void main(final String[] args) throws Exception {
+        parseArgs(args);
+
+        new ParallelTestRunner().run();
+    }
+
+    private static void parseArgs(final String[] args) {
+        if (args.length > 0) {
+            String roots = "";
+            String reportFile = "";
+            for (int i = 0; i < args.length; i++) {
+                if (args[i].equals("--roots") && i != args.length - 1) {
+                    roots += args[++i] + " ";
+                } else if (args[i].equals("--report-file") && i != args.length - 1) {
+                    reportFile = args[++i];
+                } else if (args[i].equals("--test262")) {
+                    try {
+                        setTest262Properties();
+                    } catch (final IOException ex) {
+                        System.err.println(ex);
+                    }
+                }
+            }
+            if (!roots.isEmpty()) {
+                System.setProperty(TEST_JS_ROOTS, roots.trim());
+            }
+            if (!reportFile.isEmpty()) {
+                System.setProperty(TEST_JS_REPORT_FILE, reportFile);
+            }
+        }
+    }
+
+    private static void setTest262Properties() throws IOException {
+        System.setProperty(TEST_JS_ROOTS, "test/test262/test/suite/");
+        System.setProperty(TEST_JS_FRAMEWORK, "test/script/test262.js test/test262/test/harness/framework.js test/test262/test/harness/sta.js");
+        System.setProperty(TEST_JS_EXCLUDES_FILE, "test/test262/test/config/excludelist.xml");
+        System.setProperty(TEST_JS_ENABLE_STRICT_MODE, "true");
+
+        final Properties projectProperties = new Properties();
+        projectProperties.load(new FileInputStream("project.properties"));
+        String excludeList = projectProperties.getProperty("test262-test-sys-prop.test.js.exclude.list", "");
+        final Pattern pattern = Pattern.compile("\\$\\{([^}]+)}");
+        for (;;) {
+            final Matcher matcher = pattern.matcher(excludeList);
+            if (!matcher.find()) {
+                break;
+            }
+            final String propertyValue = projectProperties.getProperty(matcher.group(1), "");
+            excludeList = excludeList.substring(0, matcher.start()) + propertyValue + excludeList.substring(matcher.end());
+        }
+        System.setProperty(TEST_JS_EXCLUDE_LIST, excludeList);
+    }
+
+    public static final class OutputStreamDelegator extends OutputStream {
+        private final OutputStream[] streams;
+
+        public OutputStreamDelegator(final OutputStream... streams) {
+            this.streams = streams;
+        }
+
+        @Override
+        public void write(final int b) throws IOException {
+            for (final OutputStream stream : streams) {
+                stream.write(b);
+            }
+        }
+
+        @Override
+        public void flush() throws IOException {
+            for (final OutputStream stream : streams) {
+                stream.flush();
+            }
+        }
+    }
+}
+
+final class TestFailedError extends Error {
+    private static final long serialVersionUID = 1L;
+
+    public TestFailedError(final String message) {
+        super(message);
+    }
+
+    public TestFailedError(final String message, final Throwable cause) {
+        super(message, cause);
+    }
+
+    public TestFailedError(final Throwable cause) {
+        super(cause);
+    }
+}
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/ScriptEvaluator.java b/nashorn/test/src/jdk/nashorn/internal/test/framework/ScriptEvaluator.java
new file mode 100644
index 00000000000..a08f52f3f66
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/test/framework/ScriptEvaluator.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.test.framework;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+/**
+ * Support for script evaluation.
+ */
+public interface ScriptEvaluator {
+    /**
+     * Runs one or more scripts files with given output and error stream set in the context
+     *
+     * @param out OutputStream for output from script evaluation
+     * @param err OutputStream for errors from script evaluation
+     * @param args one or more script arguments
+     * @return success or error code - the codes used are same as used by Shell class
+     * @throws IOException throws if there are issues with stream handling
+     */
+    public int run(OutputStream out, OutputStream err, String[] args) throws IOException;
+}
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/ScriptRunnable.java b/nashorn/test/src/jdk/nashorn/internal/test/framework/ScriptRunnable.java
new file mode 100644
index 00000000000..2c67bbe61ea
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/test/framework/ScriptRunnable.java
@@ -0,0 +1,236 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.test.framework;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.StringReader;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import org.testng.Assert;
+import org.testng.ITest;
+import org.testng.annotations.Test;
+
+/**
+ * Compiles a single JavaScript script source file and executes the resulting
+ * class. Optionally, output from running the script is compared against the
+ * corresponding .EXPECTED file.
+ */
+public final class ScriptRunnable extends AbstractScriptRunnable implements ITest {
+    // when test is run in a separate process, this is the command line
+    protected final ArrayList<String> separateProcessArgs;
+
+    public ScriptRunnable(final String framework, final File testFile, final List<String> engineOptions, final Map<String, String> testOptions,  final List<String> scriptArguments) {
+        super(framework, testFile, engineOptions, testOptions, scriptArguments);
+
+        if (this.shouldRun) {
+          // add --dump-on-error option always so that we can get detailed error msg.
+          engineOptions.add("-doe");
+        }
+
+        final String separateProcess = System.getProperty("test.js.separateprocess");
+        this.separateProcessArgs = separateProcess == null ? null : new ArrayList<>(Arrays.asList(separateProcess.split(" ")));
+    }
+
+    @Override
+    public String getTestName() {
+        return testFile.getAbsolutePath();
+    }
+
+    @Test
+    @Override
+    public void runTest() throws IOException {
+        super.runTest();
+    }
+
+    @Override
+    protected void execute() {
+        if (separateProcessArgs != null) {
+            executeInNewProcess();
+        } else {
+            executeInThisProcess();
+        }
+    }
+
+    // avoid direct System.out.println - use reporter to capture
+    @Override
+    protected void log(String msg) {
+        org.testng.Reporter.log(msg, true);
+    }
+
+    // throw Assert fail - but log as well so that user can see this at console
+    @Override
+    protected void fail(final String msg) {
+        log(msg);
+        Assert.fail(msg);
+    }
+
+    @Override
+    protected void compile() throws IOException {
+        final ByteArrayOutputStream out = new ByteArrayOutputStream();
+        final ByteArrayOutputStream err = new ByteArrayOutputStream();
+        final List<String> args = getCompilerArgs();
+        int errors;
+
+        try {
+            errors = evaluateScript(out, err, args.toArray(new String[args.size()]));
+        } catch (final AssertionError e) {
+            final PrintWriter writer = new PrintWriter(err);
+            e.printStackTrace(writer);
+            writer.flush();
+            errors = 1;
+        }
+
+        if (errors != 0 || checkCompilerMsg) {
+            if (expectCompileFailure || checkCompilerMsg) {
+                final PrintStream outputDest = new PrintStream(new FileOutputStream(errorFileName));
+                TestHelper.dumpFile(outputDest, new StringReader(new String(err.toByteArray())));
+                outputDest.println("--");
+            } else {
+                log(new String(err.toByteArray()));
+            }
+
+            if (errors != 0 && !expectCompileFailure) {
+                fail(String.format("%d errors compiling %s", errors, testFile));
+            }
+            if (checkCompilerMsg) {
+                compare(errorFileName, expectedFileName, true);
+            }
+        }
+
+        if (expectCompileFailure && errors == 0) {
+            fail(String.format("No errors encountered compiling negative test %s", testFile));
+        }
+    }
+
+    private void executeInThisProcess() {
+        final List<String> args = getRuntimeArgs();
+        final File outputFileHandle = new File(outputFileName);
+        final File errorFileHandle  = new File(errorFileName);
+
+        try (OutputStream outputFile = new FileOutputStream(outputFileName); OutputStream errorFile = new FileOutputStream(errorFileName)) {
+            final int errors = evaluateScript(outputFile, errorFile, args.toArray(new String[args.size()]));
+
+            if (errors != 0 || errorFileHandle.length() > 0) {
+                if (expectRunFailure) {
+                    return;
+                }
+
+                if (!ignoreStdError) {
+                    if (outputFileHandle.length() > 0) {
+                        TestHelper.dumpFile(outputFileHandle);
+                    }
+                    fail(TestHelper.fullContent(errorFileHandle));
+                }
+            }
+
+            if (compare) {
+                compare(outputFileName, expectedFileName, false);
+            }
+        } catch (final IOException e) {
+            if (!expectRunFailure) {
+                fail("Failure running test " + testFile + ": " + e.getMessage());
+                // else success
+            }
+        }
+    }
+
+    private void executeInNewProcess() {
+        final List<String> args = separateProcessArgs;
+        // now add the rest of the "in process" runtime arguments
+        args.addAll(getRuntimeArgs());
+
+        final File outputFileHandle = new File(outputFileName);
+        final File errorFileHandle = new File(errorFileName);
+
+        try {
+            final ProcessBuilder pb = new ProcessBuilder(args);
+            pb.redirectOutput(outputFileHandle);
+            pb.redirectError(errorFileHandle);
+            final Process process = pb.start();
+
+            process.waitFor();
+
+            if (errorFileHandle.length() > 0) {
+                if (expectRunFailure) {
+                    return;
+                }
+                if (!ignoreStdError) {
+                    if (outputFileHandle.length() > 0) {
+                        TestHelper.dumpFile(outputFileHandle);
+                    }
+                    fail(TestHelper.fullContent(errorFileHandle));
+                }
+            }
+
+            if (compare) {
+                compare(outputFileName, expectedFileName, false);
+            }
+        } catch (final IOException | InterruptedException e) {
+            if (!expectRunFailure) {
+                fail("Failure running test " + testFile + ": " + e.getMessage());
+                // else success
+            }
+        }
+    }
+
+    private void compare(final String outputFileName0, final String expectedFileName0, final boolean compareCompilerMsg) throws IOException {
+        final File expectedFile = new File(expectedFileName0);
+
+        BufferedReader expected;
+        if (expectedFile.exists()) {
+            expected = new BufferedReader(new InputStreamReader(new FileInputStream(expectedFileName0)));
+            // copy expected file overwriting existing file and preserving last
+            // modified time of source
+            try {
+                Files.copy(FileSystems.getDefault().getPath(expectedFileName0),
+                        FileSystems.getDefault().getPath(copyExpectedFileName),
+                        StandardCopyOption.REPLACE_EXISTING,
+                        StandardCopyOption.COPY_ATTRIBUTES);
+            } catch (final IOException ex) {
+                fail("failed to copy expected " + expectedFileName + " to " + copyExpectedFileName + ": " + ex.getMessage());
+            }
+        } else {
+            expected = new BufferedReader(new StringReader(""));
+        }
+
+        final BufferedReader actual = new BufferedReader(new InputStreamReader(new FileInputStream(outputFileName0)));
+        compare(actual, expected, compareCompilerMsg);
+    }
+}
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/ScriptTest.java b/nashorn/test/src/jdk/nashorn/internal/test/framework/ScriptTest.java
new file mode 100644
index 00000000000..25e4d7d4f4f
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/test/framework/ScriptTest.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.test.framework;
+
+import static jdk.nashorn.internal.test.framework.TestConfig.TEST_JS_INCLUDES;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+import jdk.nashorn.internal.test.framework.TestFinder.TestFactory;
+import org.testng.ITest;
+import org.testng.annotations.Factory;
+import org.testng.annotations.Listeners;
+
+/**
+ * Simple test suite Factory for the JavaScript tests - runs tests in the name order.
+ */
+@Listeners({ TestReorderInterceptor.class })
+public final class ScriptTest {
+    /**
+     * Creates a test factory for the set of .js source tests.
+     *
+     * @return a Object[] of test objects.
+     */
+    @Factory
+    public Object[] suite() throws Exception {
+        Locale.setDefault(new Locale(""));
+
+        final List<ITest> tests = new ArrayList<>();
+        final Set<String> orphans = new TreeSet<>();
+
+        final TestFactory<ITest> testFactory = new TestFactory<ITest>() {
+            @Override
+            public ITest createTest(final String framework, final File testFile, final List<String> engineOptions, final Map<String, String> testOptions, final List<String> scriptArguments) {
+                return new ScriptRunnable(framework, testFile, engineOptions, testOptions,  scriptArguments);
+            }
+
+            @Override
+            public void log(String msg) {
+                org.testng.Reporter.log(msg, true);
+            }
+        };
+
+        TestFinder.findAllTests(tests, orphans, testFactory);
+
+        if (System.getProperty(TEST_JS_INCLUDES) == null) {
+            tests.add(new OrphanTestFinder(orphans));
+        }
+
+        return tests.toArray();
+    }
+}
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/SeparateContextEvaluator.java b/nashorn/test/src/jdk/nashorn/internal/test/framework/SeparateContextEvaluator.java
new file mode 100644
index 00000000000..2df3ec63a25
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/test/framework/SeparateContextEvaluator.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.test.framework;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import jdk.nashorn.tools.Shell;
+
+/**
+ * A script evaluator that uses a fresh Nashorn Context to evaluate scripts.
+ */
+public final class SeparateContextEvaluator implements ScriptEvaluator {
+    @Override
+    public int run(final OutputStream out, final OutputStream err, final String[] args) throws IOException {
+        return Shell.main(System.in, out, err, args);
+    }
+}
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/SharedContextEvaluator.java b/nashorn/test/src/jdk/nashorn/internal/test/framework/SharedContextEvaluator.java
new file mode 100644
index 00000000000..261587497b8
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/test/framework/SharedContextEvaluator.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.test.framework;
+
+import static jdk.nashorn.tools.Shell.COMPILATION_ERROR;
+import static jdk.nashorn.tools.Shell.RUNTIME_ERROR;
+import static jdk.nashorn.tools.Shell.SUCCESS;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import jdk.nashorn.api.scripting.NashornException;
+import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.runtime.ErrorManager;
+import jdk.nashorn.internal.runtime.ScriptFunction;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
+import jdk.nashorn.internal.runtime.options.Options;
+
+/**
+ * A script evaluator that shares a single Nashorn Context instance to run
+ * scripts many times on it.
+ */
+public final class SharedContextEvaluator implements ScriptEvaluator {
+    // The shared Nashorn Context
+    private final Context context;
+
+    // We can't replace output and error streams after Context is created
+    // So, we create these delegating streams - so that we can replace underlying
+    // delegate streams for each script run call
+    private final DelegatingOutputStream ctxOut;
+    private final DelegatingOutputStream ctxErr;
+
+    private static class DelegatingOutputStream extends OutputStream {
+        private OutputStream underlying;
+
+        public DelegatingOutputStream(final OutputStream out) {
+            this.underlying = out;
+        }
+
+        @Override
+        public void close() throws IOException {
+            underlying.close();
+        }
+
+        @Override
+        public void flush() throws IOException {
+            underlying.flush();
+        }
+
+        @Override
+        public void write(byte[] b) throws IOException {
+            underlying.write(b);
+        }
+
+        @Override
+        public void write(byte[] b, int off, int len) throws IOException {
+            underlying.write(b, off, len);
+        }
+
+        @Override
+        public void write(int b) throws IOException {
+            underlying.write(b);
+        }
+
+        void setDelegatee(OutputStream stream) {
+            this.underlying = stream;
+        }
+    }
+
+    /**
+     * SharedContextEvaluator constructor
+     * @param args initial script arguments to create shared context
+     */
+    public SharedContextEvaluator(final String[] args) {
+        this.ctxOut = new DelegatingOutputStream(System.out);
+        this.ctxErr = new DelegatingOutputStream(System.err);
+        PrintWriter wout = new PrintWriter(ctxOut, true);
+        PrintWriter werr = new PrintWriter(ctxErr, true);
+        Options options = new Options("nashorn", werr);
+        options.process(args);
+        ErrorManager errors = new ErrorManager(werr);
+        this.context = new Context(options, errors, wout, werr);
+    }
+
+    @Override
+    public int run(final OutputStream out, final OutputStream err, final String[] args) throws IOException {
+        final ScriptObject oldGlobal = Context.getGlobal();
+        try {
+            ctxOut.setDelegatee(out);
+            ctxErr.setDelegatee(err);
+            final ErrorManager errors = context.getErrors();
+            final ScriptObject global = context.createGlobal();
+            Context.setGlobal(global);
+
+            // For each file on the command line.
+            for (final String fileName : args) {
+                if (fileName.startsWith("-")) {
+                    // ignore options in shared context mode (which was initialized upfront!)
+                    continue;
+                }
+                final File file = new File(fileName);
+                ScriptFunction script = context.compileScript(fileName, file.toURI().toURL(), global, context._strict);
+                if (script == null || errors.getNumberOfErrors() != 0) {
+                    return COMPILATION_ERROR;
+                }
+
+                try {
+                    ScriptRuntime.apply(script, global);
+                } catch (final NashornException e) {
+                    errors.error(e.toString());
+                    if (context._dump_on_error) {
+                        e.printStackTrace(context.getErr());
+                    }
+
+                    return RUNTIME_ERROR;
+                }
+            }
+        } finally {
+            context.getOut().flush();
+            context.getErr().flush();
+            Context.setGlobal(oldGlobal);
+        }
+
+        return SUCCESS;
+    }
+}
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/TestConfig.java b/nashorn/test/src/jdk/nashorn/internal/test/framework/TestConfig.java
new file mode 100644
index 00000000000..794cbdf5de5
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/test/framework/TestConfig.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.test.framework;
+
+/**
+ * Configuration info for script tests.
+ */
+public interface TestConfig {
+    // Test options inferred from various test @foo tags and passed to test factory.
+    public static final String   OPTIONS_RUN                 = "run";
+    public static final String   OPTIONS_EXPECT_COMPILE_FAIL = "expect-compile-fail";
+    public static final String   OPTIONS_CHECK_COMPILE_MSG   = "check-compile-msg";
+    public static final String   OPTIONS_EXPECT_RUN_FAIL     = "expect-run-fail";
+    public static final String   OPTIONS_IGNORE_STD_ERROR    = "ignore-std-error";
+    public static final String   OPTIONS_COMPARE             = "compare";
+
+    // System property names used for various test configurations
+
+    // A list of test directories under which to look for the TEST_JS_INCLUDES
+    // patterns
+    static final String  TEST_JS_ROOTS                       = "test.js.roots";
+
+    // A pattern of tests to include under the TEST_JS_ROOTS
+    static final String TEST_JS_INCLUDES                    = "test.js.includes";
+
+    // explicit list of tests specified to run
+    static final String TEST_JS_LIST                        = "test.js.list";
+
+    // framework script that runs before the test scripts
+    static final String TEST_JS_FRAMEWORK                   = "test.js.framework";
+
+    // test directory to skip
+    static final String TEST_JS_EXCLUDE_DIR                 = "test.js.exclude.dir";
+
+    // test directory where everything should be run
+    static final String TEST_JS_UNCHECKED_DIR               = "test.js.unchecked.dir";
+
+    // specific tests to skip
+    static final String TEST_JS_EXCLUDE_LIST                = "test.js.exclude.list";
+
+    // file containing list of tests to skip
+    static final String TEST_JS_EXCLUDES_FILE               = "test.js.excludes.file";
+
+    // strict mode or not
+    static final String TEST_JS_ENABLE_STRICT_MODE          = "test.js.enable.strict.mode";
+
+    // always fail test list
+    static final String TEST_JS_FAIL_LIST                   = "test.js.fail.list";
+
+    // shared context mode or not
+    static final String TEST_JS_SHARED_CONTEXT              = "test.js.shared.context";
+}
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/TestFinder.java b/nashorn/test/src/jdk/nashorn/internal/test/framework/TestFinder.java
new file mode 100644
index 00000000000..cb1fbbe8375
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/test/framework/TestFinder.java
@@ -0,0 +1,362 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.test.framework;
+
+import static jdk.nashorn.internal.test.framework.TestConfig.OPTIONS_CHECK_COMPILE_MSG;
+import static jdk.nashorn.internal.test.framework.TestConfig.OPTIONS_COMPARE;
+import static jdk.nashorn.internal.test.framework.TestConfig.OPTIONS_EXPECT_COMPILE_FAIL;
+import static jdk.nashorn.internal.test.framework.TestConfig.OPTIONS_EXPECT_RUN_FAIL;
+import static jdk.nashorn.internal.test.framework.TestConfig.OPTIONS_IGNORE_STD_ERROR;
+import static jdk.nashorn.internal.test.framework.TestConfig.OPTIONS_RUN;
+import static jdk.nashorn.internal.test.framework.TestConfig.TEST_JS_ENABLE_STRICT_MODE;
+import static jdk.nashorn.internal.test.framework.TestConfig.TEST_JS_EXCLUDES_FILE;
+import static jdk.nashorn.internal.test.framework.TestConfig.TEST_JS_EXCLUDE_DIR;
+import static jdk.nashorn.internal.test.framework.TestConfig.TEST_JS_EXCLUDE_LIST;
+import static jdk.nashorn.internal.test.framework.TestConfig.TEST_JS_FRAMEWORK;
+import static jdk.nashorn.internal.test.framework.TestConfig.TEST_JS_INCLUDES;
+import static jdk.nashorn.internal.test.framework.TestConfig.TEST_JS_LIST;
+import static jdk.nashorn.internal.test.framework.TestConfig.TEST_JS_ROOTS;
+import static jdk.nashorn.internal.test.framework.TestConfig.TEST_JS_UNCHECKED_DIR;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
+import java.nio.file.FileVisitOption;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Scanner;
+import java.util.Set;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+
+/**
+ * Utility class to find/parse script test files and to create 'test' instances.
+ * Actual 'test' object type is decided by clients of this class.
+ */
+final class TestFinder {
+    private TestFinder() {}
+
+    interface TestFactory<T> {
+        // 'test' instance type is decided by the client.
+        T createTest(final String framework, final File testFile, final List<String> engineOptions, final Map<String, String> testOptions, final List<String> arguments);
+        // place to log messages from TestFinder
+        void log(String mg);
+    }
+
+
+    // finds all tests from configuration and calls TestFactory to create 'test' instance for each script test found
+    static <T> void findAllTests(final List<T> tests, final Set<String> orphans, final TestFactory<T> testFactory) throws Exception {
+        final String framework = System.getProperty(TEST_JS_FRAMEWORK);
+        final String testList = System.getProperty(TEST_JS_LIST);
+        if (testList == null || testList.length() == 0) {
+            // Run the tests under the test roots dir, selected by the
+            // TEST_JS_INCLUDES patterns
+            final String testRootsString = System.getProperty(TEST_JS_ROOTS, "test/script");
+            if (testRootsString == null || testRootsString.length() == 0) {
+                throw new Exception("Error: " + TEST_JS_ROOTS + " must be set");
+            }
+            final String testRoots[] = testRootsString.split(" ");
+            final FileSystem fileSystem = FileSystems.getDefault();
+            final Set<String> testExcludeSet = getExcludeSet();
+            final Path[] excludePaths = getExcludeDirs();
+            for (final String root : testRoots) {
+                final Path dir = fileSystem.getPath(root);
+                findTests(framework, dir, tests, orphans, excludePaths, testExcludeSet, testFactory);
+            }
+        } else {
+            // TEST_JS_LIST contains a blank speparated list of test file names.
+            final String strArray[] = testList.split(" ");
+            for (final String ss : strArray) {
+                handleOneTest(framework, new File(ss).toPath(), tests, orphans, testFactory);
+            }
+        }
+    }
+
+    private static boolean inExcludePath(final Path file, final Path[] excludePaths) {
+        if (excludePaths == null) {
+            return false;
+        }
+
+        for (final Path excludePath : excludePaths) {
+            if (file.startsWith(excludePath)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private static <T> void findTests(final String framework, final Path dir, final List<T> tests, final Set<String> orphanFiles, final Path[] excludePaths, final Set<String> excludedTests, final TestFactory<T> factory) throws Exception {
+        final String pattern = System.getProperty(TEST_JS_INCLUDES);
+        final String extension = pattern == null ? "js" : pattern;
+        final Exception[] exceptions = new Exception[1];
+        final List<String> excludedActualTests = new ArrayList<>();
+
+        if (! dir.toFile().isDirectory()) {
+            factory.log("WARNING: " + dir + " not found or not a directory");
+        }
+
+        Files.walkFileTree(dir, EnumSet.of(FileVisitOption.FOLLOW_LINKS), Integer.MAX_VALUE, new SimpleFileVisitor<Path>() {
+            @Override
+            public FileVisitResult visitFile(final Path file, final BasicFileAttributes attrs) throws IOException {
+                final String fileName = file.getName(file.getNameCount() - 1).toString();
+                if (fileName.endsWith(extension)) {
+                    final String namex = file.toString().replace('\\', '/');
+                    if (!inExcludePath(file, excludePaths) && !excludedTests.contains(file.getFileName().toString())) {
+                        try {
+                            handleOneTest(framework, file, tests, orphanFiles, factory);
+                        } catch (final Exception ex) {
+                            exceptions[0] = ex;
+                            return FileVisitResult.TERMINATE;
+                        }
+                    } else {
+                        excludedActualTests.add(namex);
+                    }
+                }
+                return FileVisitResult.CONTINUE;
+            }
+        });
+        Collections.sort(excludedActualTests);
+
+        for (final String excluded : excludedActualTests) {
+            factory.log("Excluding " + excluded);
+        }
+
+        if (exceptions[0] != null) {
+            throw exceptions[0];
+        }
+    }
+
+    private static final String uncheckedDirs[] = System.getProperty(TEST_JS_UNCHECKED_DIR, "test/script/external/test262/").split(" ");
+
+    private static boolean isUnchecked(final Path testFile) {
+        for (final String uncheckedDir : uncheckedDirs) {
+            if (testFile.startsWith(uncheckedDir)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private static <T> void handleOneTest(final String framework, final Path testFile, final List<T> tests, final Set<String> orphans, TestFactory<T> factory) throws Exception {
+        final String name = testFile.getFileName().toString();
+
+        assert name.lastIndexOf(".js") > 0 : "not a JavaScript: " + name;
+
+        // defaults: testFile is a test and should be run
+        boolean isTest = isUnchecked(testFile);
+        boolean isNotTest = false;
+        boolean shouldRun = true;
+        boolean compileFailure = false;
+        boolean runFailure = false;
+        boolean checkCompilerMsg = false;
+        boolean noCompare = false;
+        boolean ignoreStdError = false;
+
+        final List<String> engineOptions = new ArrayList<>();
+        final List<String> scriptArguments = new ArrayList<>();
+        boolean inComment = false;
+
+        try (Scanner scanner = new Scanner(testFile)) {
+            while (scanner.hasNext()) {
+                // TODO: Scan for /ref=file qualifiers, etc, to determine run
+                // behavior
+                String token = scanner.next();
+                if (token.startsWith("/*")) {
+                    inComment = true;
+                } else if (token.endsWith(("*/"))) {
+                    inComment = false;
+                } else if (!inComment) {
+                    continue;
+                }
+
+                // remove whitespace and trailing semicolons, if any
+                // (trailing semicolons are found in some sputnik tests)
+                token = token.trim();
+                final int semicolon = token.indexOf(';');
+                if (semicolon > 0) {
+                    token = token.substring(0, semicolon);
+                }
+                switch (token) {
+                case "@test":
+                    isTest = true;
+                    break;
+                case "@test/fail":
+                    isTest = true;
+                    compileFailure = true;
+                    break;
+                case "@test/compile-error":
+                    isTest = true;
+                    compileFailure = true;
+                    checkCompilerMsg = true;
+                    shouldRun = false;
+                    break;
+                case "@test/warning":
+                    isTest = true;
+                    checkCompilerMsg = true;
+                    break;
+                case "@test/nocompare":
+                    isTest = true;
+                    noCompare = true;
+                    break;
+                case "@subtest":
+                    isTest = false;
+                    isNotTest = true;
+                    break;
+                case "@runif":
+                    if (System.getProperty(scanner.next()) != null) {
+                        shouldRun = true;
+                    } else {
+                        isTest = false;
+                        isNotTest = true;
+                    }
+                    break;
+                case "@run":
+                    shouldRun = true;
+                    break;
+                case "@run/fail":
+                    shouldRun = true;
+                    runFailure = true;
+                    break;
+                case "@run/ignore-std-error":
+                    shouldRun = true;
+                    ignoreStdError = true;
+                    break;
+                case "@argument":
+                    scriptArguments.add(scanner.next());
+                    break;
+                case "@option":
+                    engineOptions.add(scanner.next());
+                    break;
+                }
+
+                // negative tests are expected to fail at runtime only
+                // for those tests that are expected to fail at compile time,
+                // add @test/compile-error
+                if (token.equals("@negative") || token.equals("@strict_mode_negative")) {
+                    shouldRun = true;
+                    runFailure = true;
+                }
+
+                if (token.equals("@strict_mode") || token.equals("@strict_mode_negative") || token.equals("@onlyStrict") || token.equals("@noStrict")) {
+                    if (!strictModeEnabled()) {
+                        return;
+                    }
+                }
+            }
+        } catch (final Exception ignored) {
+            return;
+        }
+
+        if (isTest) {
+            final Map<String, String> testOptions = new HashMap<>();
+            if (compileFailure) {
+                testOptions.put(OPTIONS_EXPECT_COMPILE_FAIL, "true");
+            }
+            if (shouldRun) {
+                testOptions.put(OPTIONS_RUN, "true");
+            }
+            if (runFailure) {
+                testOptions.put(OPTIONS_EXPECT_RUN_FAIL, "true");
+            }
+            if (checkCompilerMsg) {
+                testOptions.put(OPTIONS_CHECK_COMPILE_MSG, "true");
+            }
+            if (!noCompare) {
+                testOptions.put(OPTIONS_COMPARE, "true");
+            }
+            if (ignoreStdError) {
+                testOptions.put(OPTIONS_IGNORE_STD_ERROR, "true");
+            }
+
+            tests.add(factory.createTest(framework, testFile.toFile(), engineOptions, testOptions, scriptArguments));
+        } else if (!isNotTest) {
+            orphans.add(name);
+        }
+    }
+
+    private static boolean strictModeEnabled() {
+        return Boolean.getBoolean(TEST_JS_ENABLE_STRICT_MODE);
+    }
+
+    private static Set<String> getExcludeSet() throws XPathExpressionException {
+        final String testExcludeList = System.getProperty(TEST_JS_EXCLUDE_LIST);
+
+        String[] testExcludeArray = {};
+        if (testExcludeList != null) {
+            testExcludeArray = testExcludeList.split(" ");
+        }
+        final Set<String> testExcludeSet = new HashSet<>(testExcludeArray.length);
+        for (final String test : testExcludeArray) {
+            testExcludeSet.add(test);
+        }
+
+        final String testExcludesFile = System.getProperty(TEST_JS_EXCLUDES_FILE);
+        if (testExcludesFile != null && !testExcludesFile.isEmpty()) {
+            try {
+                loadExcludesFile(testExcludesFile, testExcludeSet);
+            } catch (final XPathExpressionException e) {
+                System.err.println("Error: unable to load test excludes from " + testExcludesFile);
+                e.printStackTrace();
+                throw e;
+            }
+        }
+        return testExcludeSet;
+    }
+
+    private static void loadExcludesFile(final String testExcludesFile, final Set<String> testExcludeSet) throws XPathExpressionException {
+        final XPath xpath = XPathFactory.newInstance().newXPath();
+        final NodeList testIds = (NodeList)xpath.evaluate("/excludeList/test/@id", new InputSource(testExcludesFile), XPathConstants.NODESET);
+        for (int i = testIds.getLength() - 1; i >= 0; i--) {
+            testExcludeSet.add(testIds.item(i).getNodeValue());
+        }
+    }
+
+    private static Path[] getExcludeDirs() {
+        final String excludeDirs[] = System.getProperty(TEST_JS_EXCLUDE_DIR, "test/script/currently-failing").split(" ");
+        final Path[] excludePaths = new Path[excludeDirs.length];
+        final FileSystem fileSystem = FileSystems.getDefault();
+        int i = 0;
+        for (final String excludeDir : excludeDirs) {
+            excludePaths[i++] = fileSystem.getPath(excludeDir);
+        }
+        return excludePaths;
+    }
+}
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/TestHelper.java b/nashorn/test/src/jdk/nashorn/internal/test/framework/TestHelper.java
new file mode 100644
index 00000000000..52cb03edf44
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/test/framework/TestHelper.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.test.framework;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.io.Reader;
+
+/**
+ * Simple utilities to deal with build-dir, read/dump files etc.
+ */
+public abstract class TestHelper {
+
+    public static final String TEST_ROOT   = "test";
+    public static final String BUILD_ROOT  = "build/test";
+    public static final String TEST_PREFIX = TEST_ROOT + File.separator;
+
+    private TestHelper() {
+        // empty
+    }
+
+    protected static File makeBuildDir(final File testFile) {
+        final File buildDir = getBuildDir(testFile);
+        if (!new File(BUILD_ROOT).exists()) {
+            throw new IllegalArgumentException("no " + BUILD_ROOT + " directory in " + new File(".").getAbsolutePath());
+        }
+        buildDir.mkdirs();
+        return buildDir;
+    }
+
+    protected static File getBuildDir(final File testFile) {
+        if (!testFile.getPath().startsWith(TEST_PREFIX)) {
+            throw new IllegalArgumentException("test file path not a relative pathname");
+        }
+        final File buildDir = new File(BUILD_ROOT + File.separator + testFile.getParent().substring(TEST_PREFIX.length()));
+        return buildDir;
+    }
+
+    // return the first line of the given file
+    protected static String firstLine(final File file) throws IOException {
+        return content(file, true);
+    }
+
+    // return the full content of the file as a String
+    protected static String fullContent(final File file) throws IOException {
+        return content(file, false);
+    }
+
+    private static String content(final File file, final boolean firstLine) throws IOException {
+        final ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        final PrintStream ps = new PrintStream(bos);
+        dumpFile(ps, file);
+        final String contents = bos.toString();
+
+        if (! firstLine) {
+            return contents;
+        }
+
+        // else return only the first line, stripping the trailing cr, lf or cr+lf,
+        // if present
+        final int cr = contents.indexOf('\r');
+        if (cr > 0) {
+            return contents.substring(0, cr);
+        }
+        final int lf = contents.indexOf('\n');
+        if (lf > 0) {
+            return contents.substring(0, lf);
+        }
+        return contents;
+    }
+
+    // dump the content of given reader on standard output
+    protected static void dumpFile(final Reader rdr) throws IOException {
+        dumpFile(System.out, rdr);
+    }
+
+    // dump the content of given reader on given output stream
+    protected static void dumpFile(final PrintStream output, final Reader rdr) throws IOException {
+        try (BufferedReader reader = new BufferedReader(rdr)) {
+            while (true) {
+                final String line = reader.readLine();
+                if (line == null) {
+                    break;
+                }
+                output.println(line);
+            }
+        }
+    }
+
+    // dump the content of given file on standard output
+    protected static void dumpFile(final File file) throws IOException {
+        dumpFile(System.out, file);
+    }
+
+    // dump the content of given file on given output stream
+    protected static void dumpFile(final PrintStream output, final File file) throws IOException {
+        try (Reader rdr = new FileReader(file); BufferedReader reader = new BufferedReader(rdr)) {
+            while (true) {
+                final String line = reader.readLine();
+                if (line == null) {
+                    break;
+                }
+                output.println(line);
+            }
+        }
+    }
+}
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/TestReorderInterceptor.java b/nashorn/test/src/jdk/nashorn/internal/test/framework/TestReorderInterceptor.java
new file mode 100644
index 00000000000..4f028d72f0e
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/test/framework/TestReorderInterceptor.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.test.framework;
+
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import org.testng.IMethodInstance;
+import org.testng.IMethodInterceptor;
+import org.testng.ITest;
+import org.testng.ITestContext;
+
+/**
+ * TestNG method interceptor to make sure that the tests are run in the test name order.
+ */
+public final class TestReorderInterceptor implements IMethodInterceptor {
+    @Override
+    public List<IMethodInstance> intercept(List<IMethodInstance> methods, ITestContext context) {
+        Collections.sort(methods, new Comparator<IMethodInstance>() {
+            @Override
+            public int compare(final IMethodInstance mi1, final IMethodInstance mi2) {
+                // get test instances to order the tests.
+                final Object o1 = mi1.getInstance();
+                final Object o2 = mi2.getInstance();
+                if (o1 instanceof ITest && o2 instanceof ITest) {
+                    return ((ITest)o1).getTestName().compareTo(((ITest)o2).getTestName());
+                } else {
+                    // something else, don't care about the order
+                    return 0;
+                }
+            }
+        });
+
+        return methods;
+    }
+}
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/models/ConstructorWithArgument.java b/nashorn/test/src/jdk/nashorn/internal/test/models/ConstructorWithArgument.java
new file mode 100644
index 00000000000..d079a7ba461
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/test/models/ConstructorWithArgument.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.test.models;
+
+public abstract class ConstructorWithArgument {
+    private final String token;
+
+    protected ConstructorWithArgument(String token) {
+        this.token = token;
+    }
+
+    public String getToken() {
+        return token;
+    }
+
+    protected abstract void doSomething();
+}
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/models/FinalClass.java b/nashorn/test/src/jdk/nashorn/internal/test/models/FinalClass.java
new file mode 100644
index 00000000000..4446e9422f3
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/test/models/FinalClass.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.test.models;
+
+public final class FinalClass {
+    //empty
+}
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/models/NoAccessibleConstructorClass.java b/nashorn/test/src/jdk/nashorn/internal/test/models/NoAccessibleConstructorClass.java
new file mode 100644
index 00000000000..bb693630878
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/test/models/NoAccessibleConstructorClass.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.test.models;
+
+public class NoAccessibleConstructorClass {
+    NoAccessibleConstructorClass() { }
+}
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/models/NonPublicClass.java b/nashorn/test/src/jdk/nashorn/internal/test/models/NonPublicClass.java
new file mode 100644
index 00000000000..c9e97619a87
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/test/models/NonPublicClass.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.test.models;
+
+class NonPublicClass {
+    public NonPublicClass() { }
+}
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/models/OuterClass.java b/nashorn/test/src/jdk/nashorn/internal/test/models/OuterClass.java
new file mode 100644
index 00000000000..1e2b86d502d
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/test/models/OuterClass.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.test.models;
+
+public class OuterClass {
+    private final String value;
+
+    public OuterClass(String value) {
+        this.value = value;
+    }
+
+    public static class InnerStaticClass {
+        private final String value;
+
+        public InnerStaticClass(String value) {
+            this.value = value;
+        }
+
+        @Override
+        public String toString() {
+            return "InnerStaticClass[value=" + value + "]";
+        }
+    }
+
+    public class InnerNonStaticClass {
+        private final String value;
+
+        public InnerNonStaticClass(String value) {
+            this.value = value;
+        }
+
+        @Override
+        public String toString() {
+            return "InnerNonStaticClass[value=" + value + ", outer=" + OuterClass.this + "]";
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "OuterClass[value=" + value + "]";
+    }
+}
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/models/OverloadedSam.java b/nashorn/test/src/jdk/nashorn/internal/test/models/OverloadedSam.java
new file mode 100644
index 00000000000..06ccc51b210
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/test/models/OverloadedSam.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.test.models;
+
+public interface OverloadedSam {
+    public void sam(String s);
+    public void sam(String s1, String s2);
+}
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/models/OverrideObject.java b/nashorn/test/src/jdk/nashorn/internal/test/models/OverrideObject.java
new file mode 100644
index 00000000000..78f49565192
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/test/models/OverrideObject.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.test.models;
+
+public class OverrideObject {
+    @Override
+    public int hashCode() {
+        return 5;
+    }
+
+    @Override
+    public String toString() {
+        return "override-object";
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        // TODO: add a FindBugs annotation to ignore EQ_ALWAYS_FALSE here. This is just a test.
+        return false;
+    }
+}

From dca6998949e68d97d67d0310260ebaad692ed240 Mon Sep 17 00:00:00 2001
From: James Laskey <james.laskey@oracle.com>
Date: Sat, 22 Dec 2012 08:49:58 -0400
Subject: [PATCH 041/311] 8005440: Improve .hgignore filtering for Nashorn repo

Reviewed-by: sundar
---
 nashorn/.hgignore | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/nashorn/.hgignore b/nashorn/.hgignore
index fe2082c8702..a152369132f 100644
--- a/nashorn/.hgignore
+++ b/nashorn/.hgignore
@@ -1,25 +1,25 @@
 syntax: glob
 
-^build/
-^dist/
 ^.hgtip
+build/*
+dist/*
 /nbproject/private/
+private.xml
+private.properties
 ^webrev/
 webrev.zip
 *.class
+*.clazz
 *.log
 *.orig
-hotspot.log
-private.properties
 genfiles.properties
-private.xml
+hotspot.log
 .DS_Store*
 TEST-*.xml
 TESTS-*.xml
 report.xml
-CC/
-jcov2/
-buildtools/nasgen/nbproject/private/
-buildtools/nasgen/dist/
-buildtools/nasgen/build/
+CC/*
+jcov2/*
 .idea/*
+test/lib/testng.jar
+test/script/external/*
\ No newline at end of file

From 440f8df1ecaab0fc1ae86ce0161e7f4b3de821a1 Mon Sep 17 00:00:00 2001
From: James Laskey <james.laskey@oracle.com>
Date: Fri, 4 Jan 2013 09:58:26 -0400
Subject: [PATCH 042/311] 8005666: Add webrev to .hgignore

Reviewed-by: sundar
---
 nashorn/.hgignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nashorn/.hgignore b/nashorn/.hgignore
index a152369132f..c76bee23d3d 100644
--- a/nashorn/.hgignore
+++ b/nashorn/.hgignore
@@ -6,7 +6,7 @@ dist/*
 /nbproject/private/
 private.xml
 private.properties
-^webrev/
+webrev/*
 webrev.zip
 *.class
 *.clazz

From 33e2b39ed3ac8b84a9e5606086782ce6e55f153f Mon Sep 17 00:00:00 2001
From: James Laskey <james.laskey@oracle.com>
Date: Fri, 4 Jan 2013 09:58:30 -0400
Subject: [PATCH 043/311] 8005665: JavaDoc should only display public
 interfaces

Reviewed-by: sundar
---
 nashorn/make/build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nashorn/make/build.xml b/nashorn/make/build.xml
index 79669a8020d..69dbf4fd2b5 100644
--- a/nashorn/make/build.xml
+++ b/nashorn/make/build.xml
@@ -143,7 +143,7 @@
   </target>
 
   <target name="javadoc" depends="compile-asm">
-    <javadoc destdir="${dist.javadoc.dir}" private="yes" use="yes" overview="src/overview.html" windowtitle="${nashorn.product.name} ${nashorn.version}">
+    <javadoc destdir="${dist.javadoc.dir}" use="yes" overview="src/overview.html" windowtitle="${nashorn.product.name} ${nashorn.version}">
       <classpath>
         <pathelement location="${build.classes.dir}"/>
         <pathelement location="${dynalink.jar}"/>

From 311f43d5a683a9ef78cdcf8e3f4e42a900c9a0a7 Mon Sep 17 00:00:00 2001
From: James Laskey <james.laskey@oracle.com>
Date: Fri, 4 Jan 2013 09:58:33 -0400
Subject: [PATCH 044/311] 8005663: Update copyright year to 2013

Reviewed-by: sundar
---
 nashorn/bin/checkintest.sh                                    | 2 +-
 nashorn/bin/fixorphantests.sh                                 | 2 +-
 nashorn/bin/fixwhitespace.sh                                  | 2 +-
 nashorn/bin/jjs                                               | 2 +-
 nashorn/bin/jjs.bat                                           | 2 +-
 nashorn/bin/jjssecure                                         | 2 +-
 nashorn/bin/jjssecure.bat                                     | 2 +-
 nashorn/bin/nashorn                                           | 2 +-
 nashorn/bin/nashorn.bat                                       | 2 +-
 nashorn/bin/rm-non-tracked.sh                                 | 2 +-
 nashorn/bin/verbose_octane.bat                                | 2 +-
 nashorn/bin/verbose_octane.sh                                 | 2 +-
 nashorn/buildtools/nasgen/build.xml                           | 2 +-
 nashorn/buildtools/nasgen/nasgen.iml                          | 2 +-
 nashorn/buildtools/nasgen/project.properties                  | 2 +-
 .../src/jdk/nashorn/internal/tools/nasgen/ClassGenerator.java | 2 +-
 .../nashorn/internal/tools/nasgen/ConstructorGenerator.java   | 2 +-
 .../nasgen/src/jdk/nashorn/internal/tools/nasgen/Main.java    | 2 +-
 .../src/jdk/nashorn/internal/tools/nasgen/MemberInfo.java     | 2 +-
 .../jdk/nashorn/internal/tools/nasgen/MethodGenerator.java    | 2 +-
 .../src/jdk/nashorn/internal/tools/nasgen/NullVisitor.java    | 2 +-
 .../jdk/nashorn/internal/tools/nasgen/PrototypeGenerator.java | 2 +-
 .../jdk/nashorn/internal/tools/nasgen/ScriptClassInfo.java    | 2 +-
 .../internal/tools/nasgen/ScriptClassInfoCollector.java       | 2 +-
 .../internal/tools/nasgen/ScriptClassInstrumentor.java        | 2 +-
 .../jdk/nashorn/internal/tools/nasgen/StringConstants.java    | 2 +-
 nashorn/docs/genshelldoc.js                                   | 2 +-
 nashorn/make/Makefile                                         | 2 +-
 nashorn/make/build-benchmark.xml                              | 2 +-
 nashorn/make/build-nasgen.xml                                 | 2 +-
 nashorn/make/build.xml                                        | 2 +-
 nashorn/make/nbproject/ide-file-targets.xml                   | 2 +-
 nashorn/make/nbproject/ide-targets.xml                        | 2 +-
 nashorn/make/nbproject/jdk.xml                                | 4 ++--
 nashorn/make/nbproject/nbjdk.properties                       | 2 +-
 nashorn/make/nbproject/nbjdk.xml                              | 2 +-
 nashorn/make/nbproject/project.xml                            | 2 +-
 nashorn/make/project.properties                               | 2 +-
 nashorn/samples/counters.js                                   | 2 +-
 nashorn/samples/letter.js                                     | 2 +-
 nashorn/samples/parser.js                                     | 2 +-
 nashorn/samples/shell.js                                      | 2 +-
 nashorn/samples/test.js                                       | 2 +-
 nashorn/samples/uniq.js                                       | 2 +-
 .../src/META-INF/services/javax.script.ScriptEngineFactory    | 2 +-
 nashorn/src/jdk/nashorn/api/scripting/NashornException.java   | 2 +-
 .../src/jdk/nashorn/api/scripting/NashornScriptEngine.java    | 2 +-
 .../jdk/nashorn/api/scripting/NashornScriptEngineFactory.java | 2 +-
 nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java | 2 +-
 nashorn/src/jdk/nashorn/api/scripting/package-info.java       | 2 +-
 nashorn/src/jdk/nashorn/api/scripting/resources/engine.js     | 2 +-
 .../src/jdk/nashorn/internal/codegen/AccessSpecializer.java   | 2 +-
 nashorn/src/jdk/nashorn/internal/codegen/BranchOptimizer.java | 2 +-
 nashorn/src/jdk/nashorn/internal/codegen/ClassEmitter.java    | 2 +-
 nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java   | 2 +-
 nashorn/src/jdk/nashorn/internal/codegen/CompileUnit.java     | 2 +-
 nashorn/src/jdk/nashorn/internal/codegen/Compiler.java        | 2 +-
 .../src/jdk/nashorn/internal/codegen/CompilerConstants.java   | 2 +-
 nashorn/src/jdk/nashorn/internal/codegen/ConstantData.java    | 2 +-
 nashorn/src/jdk/nashorn/internal/codegen/Emitter.java         | 2 +-
 nashorn/src/jdk/nashorn/internal/codegen/Frame.java           | 2 +-
 .../src/jdk/nashorn/internal/codegen/FunctionSignature.java   | 2 +-
 nashorn/src/jdk/nashorn/internal/codegen/Lower.java           | 2 +-
 nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java   | 2 +-
 nashorn/src/jdk/nashorn/internal/codegen/Namespace.java       | 2 +-
 nashorn/src/jdk/nashorn/internal/codegen/RuntimeCallSite.java | 2 +-
 nashorn/src/jdk/nashorn/internal/codegen/SharedScopeCall.java | 2 +-
 nashorn/src/jdk/nashorn/internal/codegen/Splitter.java        | 2 +-
 nashorn/src/jdk/nashorn/internal/codegen/Transform.java       | 2 +-
 nashorn/src/jdk/nashorn/internal/codegen/WeighNodes.java      | 2 +-
 .../nashorn/internal/codegen/objects/FieldObjectCreator.java  | 2 +-
 .../internal/codegen/objects/FunctionObjectCreator.java       | 2 +-
 .../src/jdk/nashorn/internal/codegen/objects/MapCreator.java  | 2 +-
 .../internal/codegen/objects/ObjectClassGenerator.java        | 2 +-
 .../jdk/nashorn/internal/codegen/objects/ObjectCreator.java   | 2 +-
 .../nashorn/internal/codegen/objects/ObjectMapCreator.java    | 2 +-
 nashorn/src/jdk/nashorn/internal/codegen/types/ArrayType.java | 2 +-
 .../src/jdk/nashorn/internal/codegen/types/BitwiseType.java   | 2 +-
 .../src/jdk/nashorn/internal/codegen/types/BooleanType.java   | 4 ++--
 .../jdk/nashorn/internal/codegen/types/BytecodeArrayOps.java  | 2 +-
 .../nashorn/internal/codegen/types/BytecodeBitwiseOps.java    | 2 +-
 .../nashorn/internal/codegen/types/BytecodeNumericOps.java    | 2 +-
 .../src/jdk/nashorn/internal/codegen/types/BytecodeOps.java   | 2 +-
 nashorn/src/jdk/nashorn/internal/codegen/types/IntType.java   | 2 +-
 nashorn/src/jdk/nashorn/internal/codegen/types/LongType.java  | 2 +-
 .../src/jdk/nashorn/internal/codegen/types/NumberType.java    | 2 +-
 .../src/jdk/nashorn/internal/codegen/types/NumericType.java   | 2 +-
 .../src/jdk/nashorn/internal/codegen/types/ObjectType.java    | 2 +-
 nashorn/src/jdk/nashorn/internal/codegen/types/Type.java      | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/AccessNode.java           | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/Assignment.java           | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/BaseNode.java             | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/BinaryNode.java           | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/Block.java                | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/BreakNode.java            | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/BreakableNode.java        | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/CallNode.java             | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/CaseNode.java             | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/CatchNode.java            | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/ContinueNode.java         | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/DoWhileNode.java          | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/EmptyNode.java            | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/ExecuteNode.java          | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/ForNode.java              | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/FunctionCall.java         | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java         | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/IdentNode.java            | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/IfNode.java               | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/IndexNode.java            | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/LabelNode.java            | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/LabeledNode.java          | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/LineNumberNode.java       | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/LiteralNode.java          | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/Location.java             | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/Node.java                 | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/ObjectNode.java           | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/PropertyKey.java          | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/PropertyNode.java         | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/ReferenceNode.java        | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/ReturnNode.java           | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/RuntimeNode.java          | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/SplitNode.java            | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/SwitchNode.java           | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/Symbol.java               | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/TernaryNode.java          | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/ThrowNode.java            | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/TryNode.java              | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/TypeOverride.java         | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/UnaryNode.java            | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/VarNode.java              | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/WhileNode.java            | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/WithNode.java             | 2 +-
 .../src/jdk/nashorn/internal/ir/annotations/ChildNode.java    | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/annotations/Ignore.java   | 2 +-
 .../src/jdk/nashorn/internal/ir/annotations/ParentNode.java   | 2 +-
 .../src/jdk/nashorn/internal/ir/annotations/Reference.java    | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/debug/ASTWriter.java      | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/debug/JSONWriter.java     | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/debug/PrintVisitor.java   | 2 +-
 .../jdk/nashorn/internal/ir/visitor/NodeOperatorVisitor.java  | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/visitor/NodeVisitor.java  | 2 +-
 .../nashorn/internal/objects/AccessorPropertyDescriptor.java  | 2 +-
 nashorn/src/jdk/nashorn/internal/objects/ArrayBufferView.java | 2 +-
 .../jdk/nashorn/internal/objects/DataPropertyDescriptor.java  | 2 +-
 nashorn/src/jdk/nashorn/internal/objects/DateParser.java      | 2 +-
 .../nashorn/internal/objects/GenericPropertyDescriptor.java   | 2 +-
 nashorn/src/jdk/nashorn/internal/objects/Global.java          | 2 +-
 nashorn/src/jdk/nashorn/internal/objects/NativeArguments.java | 2 +-
 nashorn/src/jdk/nashorn/internal/objects/NativeArray.java     | 2 +-
 .../src/jdk/nashorn/internal/objects/NativeArrayBuffer.java   | 2 +-
 nashorn/src/jdk/nashorn/internal/objects/NativeBoolean.java   | 2 +-
 nashorn/src/jdk/nashorn/internal/objects/NativeDate.java      | 2 +-
 nashorn/src/jdk/nashorn/internal/objects/NativeDebug.java     | 2 +-
 nashorn/src/jdk/nashorn/internal/objects/NativeError.java     | 2 +-
 nashorn/src/jdk/nashorn/internal/objects/NativeEvalError.java | 2 +-
 .../src/jdk/nashorn/internal/objects/NativeFloat32Array.java  | 2 +-
 .../src/jdk/nashorn/internal/objects/NativeFloat64Array.java  | 2 +-
 nashorn/src/jdk/nashorn/internal/objects/NativeFunction.java  | 2 +-
 .../src/jdk/nashorn/internal/objects/NativeInt16Array.java    | 2 +-
 .../src/jdk/nashorn/internal/objects/NativeInt32Array.java    | 2 +-
 nashorn/src/jdk/nashorn/internal/objects/NativeInt8Array.java | 2 +-
 nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java | 2 +-
 nashorn/src/jdk/nashorn/internal/objects/NativeJSON.java      | 2 +-
 nashorn/src/jdk/nashorn/internal/objects/NativeJava.java      | 2 +-
 .../src/jdk/nashorn/internal/objects/NativeJavaImporter.java  | 2 +-
 nashorn/src/jdk/nashorn/internal/objects/NativeMath.java      | 2 +-
 nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java    | 2 +-
 nashorn/src/jdk/nashorn/internal/objects/NativeObject.java    | 2 +-
 .../src/jdk/nashorn/internal/objects/NativeRangeError.java    | 2 +-
 .../jdk/nashorn/internal/objects/NativeReferenceError.java    | 2 +-
 nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java    | 2 +-
 .../jdk/nashorn/internal/objects/NativeRegExpExecResult.java  | 2 +-
 .../jdk/nashorn/internal/objects/NativeStrictArguments.java   | 2 +-
 nashorn/src/jdk/nashorn/internal/objects/NativeString.java    | 2 +-
 .../src/jdk/nashorn/internal/objects/NativeSyntaxError.java   | 2 +-
 nashorn/src/jdk/nashorn/internal/objects/NativeTypeError.java | 2 +-
 nashorn/src/jdk/nashorn/internal/objects/NativeURIError.java  | 2 +-
 .../src/jdk/nashorn/internal/objects/NativeUint16Array.java   | 2 +-
 .../src/jdk/nashorn/internal/objects/NativeUint32Array.java   | 2 +-
 .../src/jdk/nashorn/internal/objects/NativeUint8Array.java    | 2 +-
 .../jdk/nashorn/internal/objects/NativeUint8ClampedArray.java | 2 +-
 nashorn/src/jdk/nashorn/internal/objects/PrototypeObject.java | 2 +-
 .../src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java  | 2 +-
 .../jdk/nashorn/internal/objects/annotations/Attribute.java   | 2 +-
 .../jdk/nashorn/internal/objects/annotations/Constructor.java | 2 +-
 .../jdk/nashorn/internal/objects/annotations/Function.java    | 2 +-
 .../src/jdk/nashorn/internal/objects/annotations/Getter.java  | 2 +-
 .../jdk/nashorn/internal/objects/annotations/Property.java    | 2 +-
 .../jdk/nashorn/internal/objects/annotations/ScriptClass.java | 2 +-
 .../src/jdk/nashorn/internal/objects/annotations/Setter.java  | 2 +-
 .../internal/objects/annotations/SpecializedConstructor.java  | 2 +-
 .../internal/objects/annotations/SpecializedFunction.java     | 2 +-
 .../src/jdk/nashorn/internal/objects/annotations/Where.java   | 2 +-
 nashorn/src/jdk/nashorn/internal/objects/package-info.java    | 2 +-
 nashorn/src/jdk/nashorn/internal/parser/AbstractParser.java   | 2 +-
 nashorn/src/jdk/nashorn/internal/parser/JSONParser.java       | 2 +-
 nashorn/src/jdk/nashorn/internal/parser/Lexer.java            | 2 +-
 nashorn/src/jdk/nashorn/internal/parser/Parser.java           | 2 +-
 nashorn/src/jdk/nashorn/internal/parser/RegExp.java           | 2 +-
 nashorn/src/jdk/nashorn/internal/parser/RegExpScanner.java    | 2 +-
 nashorn/src/jdk/nashorn/internal/parser/Scanner.java          | 2 +-
 nashorn/src/jdk/nashorn/internal/parser/Token.java            | 2 +-
 nashorn/src/jdk/nashorn/internal/parser/TokenKind.java        | 2 +-
 nashorn/src/jdk/nashorn/internal/parser/TokenLookup.java      | 2 +-
 nashorn/src/jdk/nashorn/internal/parser/TokenStream.java      | 2 +-
 nashorn/src/jdk/nashorn/internal/parser/TokenType.java        | 2 +-
 .../src/jdk/nashorn/internal/runtime/AccessorProperty.java    | 2 +-
 nashorn/src/jdk/nashorn/internal/runtime/BitVector.java       | 2 +-
 nashorn/src/jdk/nashorn/internal/runtime/CodeInstaller.java   | 2 +-
 nashorn/src/jdk/nashorn/internal/runtime/ConsString.java      | 2 +-
 nashorn/src/jdk/nashorn/internal/runtime/Context.java         | 2 +-
 nashorn/src/jdk/nashorn/internal/runtime/Debug.java           | 2 +-
 nashorn/src/jdk/nashorn/internal/runtime/DebugLogger.java     | 2 +-
 .../jdk/nashorn/internal/runtime/DefaultPropertyAccess.java   | 2 +-
 nashorn/src/jdk/nashorn/internal/runtime/ECMAErrors.java      | 2 +-
 nashorn/src/jdk/nashorn/internal/runtime/ECMAException.java   | 2 +-
 nashorn/src/jdk/nashorn/internal/runtime/ErrorManager.java    | 2 +-
 nashorn/src/jdk/nashorn/internal/runtime/FindProperty.java    | 2 +-
 nashorn/src/jdk/nashorn/internal/runtime/FunctionScope.java   | 2 +-
 nashorn/src/jdk/nashorn/internal/runtime/GlobalFunctions.java | 2 +-
 nashorn/src/jdk/nashorn/internal/runtime/GlobalObject.java    | 2 +-
 nashorn/src/jdk/nashorn/internal/runtime/JSErrorType.java     | 2 +-
 nashorn/src/jdk/nashorn/internal/runtime/JSType.java          | 2 +-
 nashorn/src/jdk/nashorn/internal/runtime/Logging.java         | 2 +-
 nashorn/src/jdk/nashorn/internal/runtime/NashornLoader.java   | 2 +-
 .../src/jdk/nashorn/internal/runtime/NativeJavaPackage.java   | 2 +-
 nashorn/src/jdk/nashorn/internal/runtime/NumberToString.java  | 2 +-
 nashorn/src/jdk/nashorn/internal/runtime/ParserException.java | 2 +-
 nashorn/src/jdk/nashorn/internal/runtime/Property.java        | 2 +-
 nashorn/src/jdk/nashorn/internal/runtime/PropertyAccess.java  | 2 +-
 .../src/jdk/nashorn/internal/runtime/PropertyDescriptor.java  | 2 +-
 nashorn/src/jdk/nashorn/internal/runtime/PropertyHashMap.java | 2 +-
 .../src/jdk/nashorn/internal/runtime/PropertyListener.java    | 2 +-
 .../jdk/nashorn/internal/runtime/PropertyListenerManager.java | 2 +-
 nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java     | 2 +-
 .../jdk/nashorn/internal/runtime/QuotedStringTokenizer.java   | 2 +-
 nashorn/src/jdk/nashorn/internal/runtime/RegExpMatch.java     | 2 +-
 nashorn/src/jdk/nashorn/internal/runtime/Scope.java           | 2 +-
 nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java  | 2 +-
 nashorn/src/jdk/nashorn/internal/runtime/ScriptLoader.java    | 2 +-
 nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java    | 2 +-
 nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java   | 2 +-
 .../src/jdk/nashorn/internal/runtime/ScriptingFunctions.java  | 2 +-
 nashorn/src/jdk/nashorn/internal/runtime/Source.java          | 2 +-
 nashorn/src/jdk/nashorn/internal/runtime/SpillProperty.java   | 2 +-
 nashorn/src/jdk/nashorn/internal/runtime/StructureLoader.java | 2 +-
 nashorn/src/jdk/nashorn/internal/runtime/URIUtils.java        | 2 +-
 nashorn/src/jdk/nashorn/internal/runtime/Undefined.java       | 2 +-
 .../jdk/nashorn/internal/runtime/UserAccessorProperty.java    | 2 +-
 nashorn/src/jdk/nashorn/internal/runtime/Version.java         | 2 +-
 nashorn/src/jdk/nashorn/internal/runtime/WithObject.java      | 2 +-
 .../src/jdk/nashorn/internal/runtime/arrays/ArrayData.java    | 2 +-
 .../src/jdk/nashorn/internal/runtime/arrays/ArrayFilter.java  | 2 +-
 .../src/jdk/nashorn/internal/runtime/arrays/ArrayIndex.java   | 2 +-
 .../jdk/nashorn/internal/runtime/arrays/ArrayIterator.java    | 2 +-
 .../nashorn/internal/runtime/arrays/ArrayLikeIterator.java    | 2 +-
 .../nashorn/internal/runtime/arrays/DeletedArrayFilter.java   | 2 +-
 .../internal/runtime/arrays/DeletedRangeArrayFilter.java      | 2 +-
 .../internal/runtime/arrays/EmptyArrayLikeIterator.java       | 2 +-
 .../nashorn/internal/runtime/arrays/FrozenArrayFilter.java    | 2 +-
 .../src/jdk/nashorn/internal/runtime/arrays/IntArrayData.java | 2 +-
 .../internal/runtime/arrays/InvalidArrayIndexException.java   | 2 +-
 .../jdk/nashorn/internal/runtime/arrays/IteratorAction.java   | 2 +-
 .../jdk/nashorn/internal/runtime/arrays/LongArrayData.java    | 2 +-
 .../src/jdk/nashorn/internal/runtime/arrays/MapIterator.java  | 2 +-
 .../jdk/nashorn/internal/runtime/arrays/NoTypeArrayData.java  | 2 +-
 .../jdk/nashorn/internal/runtime/arrays/NumberArrayData.java  | 2 +-
 .../jdk/nashorn/internal/runtime/arrays/ObjectArrayData.java  | 2 +-
 .../nashorn/internal/runtime/arrays/ReverseArrayIterator.java | 2 +-
 .../nashorn/internal/runtime/arrays/ReverseMapIterator.java   | 2 +-
 .../nashorn/internal/runtime/arrays/SealedArrayFilter.java    | 2 +-
 .../jdk/nashorn/internal/runtime/arrays/SparseArrayData.java  | 2 +-
 .../nashorn/internal/runtime/arrays/UndefinedArrayFilter.java | 2 +-
 .../src/jdk/nashorn/internal/runtime/linker/Bootstrap.java    | 2 +-
 .../src/jdk/nashorn/internal/runtime/linker/InvokeByName.java | 2 +-
 .../jdk/nashorn/internal/runtime/linker/JSObjectLinker.java   | 2 +-
 .../nashorn/internal/runtime/linker/JavaAdapterFactory.java   | 2 +-
 .../internal/runtime/linker/JavaArgumentConverters.java       | 2 +-
 .../jdk/nashorn/internal/runtime/linker/LinkerCallSite.java   | 2 +-
 nashorn/src/jdk/nashorn/internal/runtime/linker/Lookup.java   | 2 +-
 nashorn/src/jdk/nashorn/internal/runtime/linker/Mangler.java  | 2 +-
 .../nashorn/internal/runtime/linker/MethodHandleFactory.java  | 2 +-
 .../internal/runtime/linker/MethodHandleFunctionality.java    | 2 +-
 .../nashorn/internal/runtime/linker/NashornBottomLinker.java  | 2 +-
 .../internal/runtime/linker/NashornCallSiteDescriptor.java    | 2 +-
 .../internal/runtime/linker/NashornGuardedInvocation.java     | 2 +-
 .../jdk/nashorn/internal/runtime/linker/NashornGuards.java    | 2 +-
 .../jdk/nashorn/internal/runtime/linker/NashornLinker.java    | 2 +-
 .../internal/runtime/linker/NashornPrimitiveLinker.java       | 2 +-
 .../jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java  | 2 +-
 .../jdk/nashorn/internal/runtime/options/KeyValueOption.java  | 2 +-
 nashorn/src/jdk/nashorn/internal/runtime/options/Option.java  | 2 +-
 .../jdk/nashorn/internal/runtime/options/OptionTemplate.java  | 2 +-
 nashorn/src/jdk/nashorn/internal/runtime/options/Options.java | 2 +-
 .../src/jdk/nashorn/internal/runtime/options/ValueOption.java | 2 +-
 .../nashorn/internal/runtime/resources/Messages.properties    | 2 +-
 .../jdk/nashorn/internal/runtime/resources/Options.properties | 2 +-
 .../jdk/nashorn/internal/runtime/resources/mozilla_compat.js  | 2 +-
 nashorn/src/jdk/nashorn/internal/runtime/resources/parser.js  | 2 +-
 .../internal/runtime/resources/version.properties-template    | 2 +-
 nashorn/src/jdk/nashorn/internal/scripts/JO$.java             | 2 +-
 nashorn/src/jdk/nashorn/internal/scripts/JS$.java             | 2 +-
 nashorn/src/jdk/nashorn/tools/Shell.java                      | 2 +-
 nashorn/src/jdk/nashorn/tools/resources/Shell.properties      | 2 +-
 nashorn/src/jdk/nashorn/tools/resources/shell.js              | 2 +-
 nashorn/src/netscape/javascript/JSObject.java                 | 2 +-
 nashorn/src/overview.html                                     | 4 ++--
 nashorn/test/examples/dual-fields-micro.js                    | 2 +-
 nashorn/test/examples/innerbench.js                           | 2 +-
 nashorn/test/examples/typechain.js                            | 2 +-
 nashorn/test/lib/benchmark.js                                 | 2 +-
 nashorn/test/opt/add.js                                       | 2 +-
 nashorn/test/opt/add_constant.js                              | 2 +-
 nashorn/test/opt/add_reuse_callsite.js                        | 2 +-
 nashorn/test/opt/add_revert2.js                               | 2 +-
 nashorn/test/opt/cascade_specialize.js                        | 2 +-
 nashorn/test/script/assert.js                                 | 2 +-
 nashorn/test/script/basic/NASHORN-100.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-101.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-102.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-103.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-104.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-105.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-106.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-107.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-108.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-109.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-11.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-111.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-113.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-114.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-115.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-117.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-118.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-119.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-12.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-120.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-122.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-126.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-127.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-130.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-132.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-133.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-135.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-136.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-14.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-148.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-15.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-153.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-156.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-157.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-163.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-164.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-165.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-166.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-168.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-169.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-172.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-173.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-174.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-175.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-176.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-177.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-178.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-179.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-18.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-181.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-182.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-183.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-184.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-185.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-187.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-188.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-19.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-190.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-192.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-194.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-196.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-198.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-20.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-201.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-202.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-203.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-204.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-205.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-206.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-207.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-207_2.js                    | 2 +-
 nashorn/test/script/basic/NASHORN-208.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-209.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-21.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-211.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-212.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-213.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-215.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-216.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-217.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-219.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-22.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-221.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-222.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-223.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-225.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-226.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-227.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-228.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-229.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-229_subtest.js              | 2 +-
 nashorn/test/script/basic/NASHORN-23.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-232.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-234.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-235.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-236.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-237.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-239.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-24.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-241.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-242.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-245.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-247.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-25.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-251.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-252.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-253.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-256.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-258.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-26.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-260.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-261.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-262.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-263.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-264.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-265.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-266.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-269.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-27.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-270.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-271.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-275.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-276.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-277.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-278.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-28.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-281.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-284.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-285.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-288.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-29.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-293.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-294.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-296.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-297.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-30.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-300.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-301.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-304.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-310.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-318.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-32.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-321.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-323.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-324.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-33.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-331.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-337.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-34.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-340.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-349.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-354.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-355.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-36.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-365.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-366.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-368.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-37.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-375.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-376.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-377.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-378.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-38.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-380.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-381.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-382.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-383.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-384.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-385.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-389.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-393.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-394.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-396.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-397.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-398.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-40.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-400.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-401.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-402.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-404.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-405.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-406.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-408.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-415.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-416.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-417.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-418.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-420.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-421.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-423.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-423a.js                     | 2 +-
 nashorn/test/script/basic/NASHORN-424.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-425.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-426.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-427.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-428.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-429.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-432.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-433.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-434.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-435.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-437.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-44.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-441.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-442.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-443.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-444.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-445.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-446.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-447.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-448.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-449.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-45.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-450.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-452.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-459.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-46.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-462.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-463.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-468.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-47.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-473.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-474.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-478.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-48.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-481.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-482.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-484.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-486.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-487.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-488.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-49.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-490.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-494.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-497.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-498.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-499.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-50.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-500.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-503.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-51.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-511.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-515.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-516.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-52.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-534.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-535.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-544.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-55.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-554.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-556.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-56.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-562.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-565.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-575.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-58.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-59.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-592.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-597.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-60.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-609.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-61.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-62.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-620.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-623.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-627.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-63.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-637.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-638.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-639.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-64.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-642.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-646.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-653.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-658.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-659.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-66.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-664.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-665.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-67.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-678.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-68.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-689.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-69.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-691.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-694.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-697.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-703.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-703a.js                     | 2 +-
 nashorn/test/script/basic/NASHORN-705.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-71.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-710.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-711.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-72.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-722.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-73.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-737.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-74.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-740.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-75.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-758.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-759.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-760.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-768.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-778.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-78.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-79.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-792.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-80.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-81.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-833.js                      | 2 +-
 nashorn/test/script/basic/NASHORN-85.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-86.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-87.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-89.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-90.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-91.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-92.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-93.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-95.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-96.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-97.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-98.js                       | 2 +-
 nashorn/test/script/basic/NASHORN-99.js                       | 2 +-
 nashorn/test/script/basic/addition.js                         | 2 +-
 nashorn/test/script/basic/allgettersetters.js                 | 2 +-
 nashorn/test/script/basic/andor.js                            | 2 +-
 nashorn/test/script/basic/anonrecur.js                        | 2 +-
 nashorn/test/script/basic/applycall.js                        | 2 +-
 nashorn/test/script/basic/args.js                             | 2 +-
 nashorn/test/script/basic/arity.js                            | 2 +-
 nashorn/test/script/basic/arrayprotoclass.js                  | 2 +-
 nashorn/test/script/basic/arrays.js                           | 2 +-
 nashorn/test/script/basic/arrays2.js                          | 2 +-
 nashorn/test/script/basic/arraysIntKey.js                     | 2 +-
 nashorn/test/script/basic/arrayset.js                         | 2 +-
 nashorn/test/script/basic/arrayundefined.js                   | 2 +-
 nashorn/test/script/basic/assign.js                           | 2 +-
 nashorn/test/script/basic/bitwise_and.js                      | 2 +-
 nashorn/test/script/basic/booleangetter.js                    | 2 +-
 nashorn/test/script/basic/builtin.js                          | 2 +-
 nashorn/test/script/basic/builtin_assign.js                   | 2 +-
 nashorn/test/script/basic/builtinchain.js                     | 2 +-
 nashorn/test/script/basic/calllink.js                         | 2 +-
 nashorn/test/script/basic/closure.js                          | 2 +-
 nashorn/test/script/basic/commandargs.js                      | 2 +-
 nashorn/test/script/basic/compile-octane.js                   | 2 +-
 nashorn/test/script/basic/condassign.js                       | 2 +-
 nashorn/test/script/basic/construct.js                        | 2 +-
 nashorn/test/script/basic/constructorname.js                  | 2 +-
 nashorn/test/script/basic/date.js                             | 2 +-
 nashorn/test/script/basic/dateparse.js                        | 2 +-
 nashorn/test/script/basic/decinc.js                           | 2 +-
 nashorn/test/script/basic/delete.js                           | 2 +-
 nashorn/test/script/basic/delete2.js                          | 2 +-
 nashorn/test/script/basic/dotpropname.js                      | 2 +-
 nashorn/test/script/basic/doublecache.js                      | 2 +-
 nashorn/test/script/basic/enumeration.js                      | 2 +-
 nashorn/test/script/basic/errors.js                           | 2 +-
 nashorn/test/script/basic/errorstack.js                       | 2 +-
 nashorn/test/script/basic/eval.js                             | 2 +-
 nashorn/test/script/basic/evalreturn.js                       | 2 +-
 nashorn/test/script/basic/exprclosure.js                      | 2 +-
 nashorn/test/script/basic/extensibility.js                    | 2 +-
 nashorn/test/script/basic/fileline.js                         | 2 +-
 nashorn/test/script/basic/finally-catchalls.js                | 2 +-
 nashorn/test/script/basic/finallyreturn.js                    | 2 +-
 nashorn/test/script/basic/forin.js                            | 2 +-
 nashorn/test/script/basic/forin2.js                           | 2 +-
 nashorn/test/script/basic/funcarray.js                        | 2 +-
 nashorn/test/script/basic/funcbind.js                         | 2 +-
 nashorn/test/script/basic/funcconstructor.js                  | 2 +-
 nashorn/test/script/basic/getclassname.js                     | 2 +-
 nashorn/test/script/basic/getenv.js                           | 2 +-
 nashorn/test/script/basic/getter_callsite.js                  | 2 +-
 nashorn/test/script/basic/gettercalls.js                      | 2 +-
 nashorn/test/script/basic/getterfunc.js                       | 2 +-
 nashorn/test/script/basic/gettersetter.js                     | 2 +-
 nashorn/test/script/basic/globalaccess.js                     | 2 +-
 nashorn/test/script/basic/globals.js                          | 2 +-
 nashorn/test/script/basic/globalscope.js                      | 2 +-
 nashorn/test/script/basic/hello.js                            | 2 +-
 nashorn/test/script/basic/herestr_operator.js                 | 2 +-
 nashorn/test/script/basic/illegaljavaname.js                  | 2 +-
 nashorn/test/script/basic/incheck.js                          | 2 +-
 nashorn/test/script/basic/indexedcall.js                      | 2 +-
 nashorn/test/script/basic/info.js                             | 2 +-
 nashorn/test/script/basic/inherited_nonwritable.js            | 2 +-
 nashorn/test/script/basic/instanceof.js                       | 2 +-
 nashorn/test/script/basic/instanceof2.js                      | 2 +-
 nashorn/test/script/basic/interfaces.js                       | 2 +-
 nashorn/test/script/basic/iterator.js                         | 2 +-
 nashorn/test/script/basic/java.js                             | 2 +-
 nashorn/test/script/basic/javaarray.js                        | 2 +-
 nashorn/test/script/basic/javaarrayconversion.js              | 2 +-
 nashorn/test/script/basic/javaexceptions.js                   | 2 +-
 nashorn/test/script/basic/javaimporter.js                     | 2 +-
 nashorn/test/script/basic/javainnerclasses.js                 | 2 +-
 nashorn/test/script/basic/javasigcall.js                      | 2 +-
 nashorn/test/script/basic/jquery.js                           | 2 +-
 nashorn/test/script/basic/jsadapter.js                        | 2 +-
 nashorn/test/script/basic/jsadapterlink.js                    | 2 +-
 nashorn/test/script/basic/json.js                             | 2 +-
 nashorn/test/script/basic/list.js                             | 2 +-
 nashorn/test/script/basic/literal.js                          | 2 +-
 nashorn/test/script/basic/load.js                             | 2 +-
 nashorn/test/script/basic/loadedfile.js                       | 2 +-
 nashorn/test/script/basic/localundef.js                       | 2 +-
 nashorn/test/script/basic/map.js                              | 2 +-
 nashorn/test/script/basic/math.js                             | 2 +-
 nashorn/test/script/basic/minuszero.js                        | 2 +-
 nashorn/test/script/basic/module.js                           | 2 +-
 nashorn/test/script/basic/moduleload.js                       | 2 +-
 nashorn/test/script/basic/nashorn2.js                         | 2 +-
 nashorn/test/script/basic/natives.js                          | 2 +-
 nashorn/test/script/basic/new.js                              | 2 +-
 nashorn/test/script/basic/newexpr.js                          | 2 +-
 nashorn/test/script/basic/newnew.js                           | 2 +-
 nashorn/test/script/basic/nonconstructors.js                  | 2 +-
 nashorn/test/script/basic/nosuchmethod.js                     | 2 +-
 nashorn/test/script/basic/nosuchproperty.js                   | 2 +-
 nashorn/test/script/basic/number.js                           | 2 +-
 nashorn/test/script/basic/numberstring.js                     | 2 +-
 nashorn/test/script/basic/objectprops.js                      | 2 +-
 nashorn/test/script/basic/objects.js                          | 2 +-
 nashorn/test/script/basic/options.js                          | 2 +-
 nashorn/test/script/basic/propchange.js                       | 2 +-
 nashorn/test/script/basic/propertycheck.js                    | 2 +-
 nashorn/test/script/basic/prototype.js                        | 2 +-
 nashorn/test/script/basic/pushpull.js                         | 2 +-
 nashorn/test/script/basic/regex.js                            | 2 +-
 nashorn/test/script/basic/regexp_flags.js                     | 2 +-
 nashorn/test/script/basic/run-octane.js                       | 2 +-
 nashorn/test/script/basic/runsunspider.js                     | 2 +-
 nashorn/test/script/basic/samfunc.js                          | 2 +-
 nashorn/test/script/basic/scripting.js                        | 2 +-
 nashorn/test/script/basic/scripting.js.EXPECTED               | 2 +-
 nashorn/test/script/basic/sealfreeze.js                       | 2 +-
 nashorn/test/script/basic/setlength.js                        | 2 +-
 nashorn/test/script/basic/stdin.js                            | 2 +-
 nashorn/test/script/basic/strings.js                          | 2 +-
 nashorn/test/script/basic/throws.js                           | 2 +-
 nashorn/test/script/basic/tosource.js                         | 2 +-
 nashorn/test/script/basic/tostring.js                         | 2 +-
 nashorn/test/script/basic/try.js                              | 2 +-
 nashorn/test/script/basic/trybreakcont.js                     | 2 +-
 nashorn/test/script/basic/trycatch.js                         | 2 +-
 nashorn/test/script/basic/trycatchfor.js                      | 2 +-
 nashorn/test/script/basic/tryfinallyreturn.js                 | 2 +-
 nashorn/test/script/basic/tryforbreak.js                      | 2 +-
 nashorn/test/script/basic/typechange.js                       | 2 +-
 nashorn/test/script/basic/typeof.js                           | 2 +-
 nashorn/test/script/basic/typeof2.js                          | 2 +-
 nashorn/test/script/basic/undefined.js                        | 2 +-
 nashorn/test/script/basic/underscore.js                       | 2 +-
 nashorn/test/script/basic/varargs.js                          | 2 +-
 nashorn/test/script/basic/void.js                             | 2 +-
 nashorn/test/script/basic/with.js                             | 2 +-
 nashorn/test/script/basic/withprimitive.js                    | 2 +-
 nashorn/test/script/basic/writable_relink.js                  | 2 +-
 nashorn/test/script/basic/xorassign.js                        | 2 +-
 nashorn/test/script/basic/yui.js                              | 2 +-
 .../error/NASHORN-154/function_mult_params_in_strict.js       | 2 +-
 .../error/NASHORN-154/improper_return_break_continue.js       | 2 +-
 nashorn/test/script/error/NASHORN-154/invalid_lvalue.js       | 2 +-
 .../script/error/NASHORN-154/literal_data_and_accessor.js     | 2 +-
 nashorn/test/script/error/NASHORN-154/literal_mult_getters.js | 2 +-
 .../script/error/NASHORN-154/literal_mult_prop_in_strict.js   | 2 +-
 nashorn/test/script/error/NASHORN-154/with_in_strict.js       | 2 +-
 nashorn/test/script/error/NASHORN-214.js                      | 2 +-
 nashorn/test/script/error/NASHORN-35.js                       | 2 +-
 nashorn/test/script/error/NASHORN-39.js                       | 2 +-
 nashorn/test/script/error/NASHORN-568.js                      | 2 +-
 nashorn/test/script/error/NASHORN-57.js                       | 2 +-
 nashorn/test/script/error/NASHORN-668.js                      | 2 +-
 nashorn/test/script/error/quotemissing.js                     | 2 +-
 nashorn/test/script/error/strictmode.js                       | 2 +-
 nashorn/test/script/representations/NASHORN-592a.js           | 2 +-
 nashorn/test/script/sandbox/NASHORN-525.js                    | 2 +-
 nashorn/test/script/sandbox/classloader.js                    | 2 +-
 nashorn/test/script/sandbox/doprivileged.js                   | 2 +-
 nashorn/test/script/sandbox/exit.js                           | 2 +-
 nashorn/test/script/sandbox/file.js                           | 2 +-
 nashorn/test/script/sandbox/javaextend.js                     | 2 +-
 nashorn/test/script/sandbox/loadLibrary.js                    | 2 +-
 nashorn/test/script/sandbox/net.js                            | 2 +-
 nashorn/test/script/sandbox/property.js                       | 2 +-
 nashorn/test/script/sandbox/reflection.js                     | 2 +-
 nashorn/test/script/sandbox/runnable.js                       | 2 +-
 nashorn/test/script/sandbox/unsafe.js                         | 2 +-
 nashorn/test/script/test262.js                                | 2 +-
 nashorn/test/script/test262_single.js                         | 2 +-
 nashorn/test/src/UnnamedPackageTestCallback.java              | 2 +-
 .../src/jdk/nashorn/api/scripting/MultipleEngineTest.java     | 2 +-
 .../test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java  | 2 +-
 nashorn/test/src/jdk/nashorn/api/scripting/Window.java        | 2 +-
 .../src/jdk/nashorn/api/scripting/WindowEventHandler.java     | 2 +-
 .../src/jdk/nashorn/internal/access/BooleanAccessTest.java    | 2 +-
 .../src/jdk/nashorn/internal/access/MethodAccessTest.java     | 2 +-
 .../src/jdk/nashorn/internal/access/NumberAccessTest.java     | 2 +-
 .../src/jdk/nashorn/internal/access/NumberBoxingTest.java     | 2 +-
 .../src/jdk/nashorn/internal/access/ObjectAccessTest.java     | 2 +-
 nashorn/test/src/jdk/nashorn/internal/access/Person.java      | 2 +-
 .../test/src/jdk/nashorn/internal/access/SharedObject.java    | 2 +-
 .../src/jdk/nashorn/internal/access/StringAccessTest.java     | 2 +-
 .../test/src/jdk/nashorn/internal/codegen/CompilerTest.java   | 2 +-
 nashorn/test/src/jdk/nashorn/internal/parser/ParserTest.java  | 2 +-
 .../src/jdk/nashorn/internal/performance/AuroraWrapper.java   | 2 +-
 .../test/src/jdk/nashorn/internal/performance/OctaneTest.java | 2 +-
 .../jdk/nashorn/internal/performance/PerformanceWrapper.java  | 2 +-
 .../test/src/jdk/nashorn/internal/performance/SplayTest.java  | 2 +-
 .../test/src/jdk/nashorn/internal/runtime/ContextTest.java    | 2 +-
 nashorn/test/src/jdk/nashorn/internal/runtime/JSTypeTest.java | 2 +-
 .../jdk/nashorn/internal/runtime/Nashorn401TestSubject.java   | 2 +-
 .../internal/test/framework/AbstractScriptRunnable.java       | 2 +-
 .../internal/test/framework/JSJUnitReportReporter.java        | 2 +-
 .../jdk/nashorn/internal/test/framework/OrphanTestFinder.java | 2 +-
 .../nashorn/internal/test/framework/ParallelTestRunner.java   | 2 +-
 .../jdk/nashorn/internal/test/framework/ScriptEvaluator.java  | 2 +-
 .../jdk/nashorn/internal/test/framework/ScriptRunnable.java   | 2 +-
 .../src/jdk/nashorn/internal/test/framework/ScriptTest.java   | 2 +-
 .../internal/test/framework/SeparateContextEvaluator.java     | 2 +-
 .../internal/test/framework/SharedContextEvaluator.java       | 2 +-
 .../src/jdk/nashorn/internal/test/framework/TestConfig.java   | 2 +-
 .../src/jdk/nashorn/internal/test/framework/TestFinder.java   | 2 +-
 .../src/jdk/nashorn/internal/test/framework/TestHelper.java   | 2 +-
 .../internal/test/framework/TestReorderInterceptor.java       | 2 +-
 .../nashorn/internal/test/models/ConstructorWithArgument.java | 2 +-
 .../test/src/jdk/nashorn/internal/test/models/FinalClass.java | 2 +-
 .../internal/test/models/NoAccessibleConstructorClass.java    | 2 +-
 .../src/jdk/nashorn/internal/test/models/NonPublicClass.java  | 2 +-
 .../test/src/jdk/nashorn/internal/test/models/OuterClass.java | 2 +-
 .../src/jdk/nashorn/internal/test/models/OverloadedSam.java   | 2 +-
 .../src/jdk/nashorn/internal/test/models/OverrideObject.java  | 2 +-
 851 files changed, 854 insertions(+), 854 deletions(-)

diff --git a/nashorn/bin/checkintest.sh b/nashorn/bin/checkintest.sh
index a4750d5888e..c4a9e96ca12 100644
--- a/nashorn/bin/checkintest.sh
+++ b/nashorn/bin/checkintest.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
 # This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/bin/fixorphantests.sh b/nashorn/bin/fixorphantests.sh
index d7e5f74b6af..604e2da050e 100644
--- a/nashorn/bin/fixorphantests.sh
+++ b/nashorn/bin/fixorphantests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
 # This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/bin/fixwhitespace.sh b/nashorn/bin/fixwhitespace.sh
index 921a233df21..cac757db100 100644
--- a/nashorn/bin/fixwhitespace.sh
+++ b/nashorn/bin/fixwhitespace.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
 # This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/bin/jjs b/nashorn/bin/jjs
index ae436b27ab5..ca531f4dd02 100644
--- a/nashorn/bin/jjs
+++ b/nashorn/bin/jjs
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/bin/jjs.bat b/nashorn/bin/jjs.bat
index a7169577bcb..3c1c1595c47 100644
--- a/nashorn/bin/jjs.bat
+++ b/nashorn/bin/jjs.bat
@@ -1,5 +1,5 @@
 rem
-rem Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+rem Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
 rem DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 rem
 rem This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/bin/jjssecure b/nashorn/bin/jjssecure
index 887c421d95c..93d38218ac6 100644
--- a/nashorn/bin/jjssecure
+++ b/nashorn/bin/jjssecure
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/bin/jjssecure.bat b/nashorn/bin/jjssecure.bat
index 662b167ae19..2960cfc0acf 100644
--- a/nashorn/bin/jjssecure.bat
+++ b/nashorn/bin/jjssecure.bat
@@ -1,5 +1,5 @@
 rem
-rem Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+rem Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
 rem DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 rem
 rem This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/bin/nashorn b/nashorn/bin/nashorn
index 7720f423cdb..3fccdd04c72 100644
--- a/nashorn/bin/nashorn
+++ b/nashorn/bin/nashorn
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/bin/nashorn.bat b/nashorn/bin/nashorn.bat
index 86aafc44a8a..2961ac699a4 100644
--- a/nashorn/bin/nashorn.bat
+++ b/nashorn/bin/nashorn.bat
@@ -1,5 +1,5 @@
 rem
-rem Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+rem Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
 rem DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 rem
 rem This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/bin/rm-non-tracked.sh b/nashorn/bin/rm-non-tracked.sh
index aaadcf3809c..1eac19968e6 100644
--- a/nashorn/bin/rm-non-tracked.sh
+++ b/nashorn/bin/rm-non-tracked.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
 # This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/bin/verbose_octane.bat b/nashorn/bin/verbose_octane.bat
index 69abbf8b47d..f53d6552cc8 100644
--- a/nashorn/bin/verbose_octane.bat
+++ b/nashorn/bin/verbose_octane.bat
@@ -1,5 +1,5 @@
 rem
-rem Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+rem Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
 rem DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 rem 
 rem This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/bin/verbose_octane.sh b/nashorn/bin/verbose_octane.sh
index 6a9b7eb32e1..9593f0602bc 100644
--- a/nashorn/bin/verbose_octane.sh
+++ b/nashorn/bin/verbose_octane.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
 # This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/buildtools/nasgen/build.xml b/nashorn/buildtools/nasgen/build.xml
index e20793b7d43..bf56c1111df 100644
--- a/nashorn/buildtools/nasgen/build.xml
+++ b/nashorn/buildtools/nasgen/build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  
  This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/buildtools/nasgen/nasgen.iml b/nashorn/buildtools/nasgen/nasgen.iml
index b67d39e96ff..f6c890a2ddc 100644
--- a/nashorn/buildtools/nasgen/nasgen.iml
+++ b/nashorn/buildtools/nasgen/nasgen.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  
  This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/buildtools/nasgen/project.properties b/nashorn/buildtools/nasgen/project.properties
index 65047d95312..5963f68e5c3 100644
--- a/nashorn/buildtools/nasgen/project.properties
+++ b/nashorn/buildtools/nasgen/project.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
 # This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ClassGenerator.java b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ClassGenerator.java
index 3a78da413d2..808f2658046 100644
--- a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ClassGenerator.java
+++ b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ClassGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ConstructorGenerator.java b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ConstructorGenerator.java
index 2491e630ee7..6da3562dc4c 100644
--- a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ConstructorGenerator.java
+++ b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ConstructorGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/Main.java b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/Main.java
index 96e49c1df49..7c8439b3319 100644
--- a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/Main.java
+++ b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MemberInfo.java b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MemberInfo.java
index 62e8de2a6bc..3fdd7c686bb 100644
--- a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MemberInfo.java
+++ b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MemberInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MethodGenerator.java b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MethodGenerator.java
index 500b8224946..c3dfd878526 100644
--- a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MethodGenerator.java
+++ b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/MethodGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/NullVisitor.java b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/NullVisitor.java
index 7f585c0392b..de2f3923889 100644
--- a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/NullVisitor.java
+++ b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/NullVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/PrototypeGenerator.java b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/PrototypeGenerator.java
index a8b6e639b4e..9aeaf8f7eaa 100644
--- a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/PrototypeGenerator.java
+++ b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/PrototypeGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfo.java b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfo.java
index b5e285225c5..0a1579ff5c8 100644
--- a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfo.java
+++ b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfoCollector.java b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfoCollector.java
index 43c2bc6c6ea..5561cfbf947 100644
--- a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfoCollector.java
+++ b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInfoCollector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInstrumentor.java b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInstrumentor.java
index c8e97370737..d140585f499 100644
--- a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInstrumentor.java
+++ b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ScriptClassInstrumentor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/StringConstants.java b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/StringConstants.java
index 06032733e92..4617eb6648c 100644
--- a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/StringConstants.java
+++ b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/StringConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/docs/genshelldoc.js b/nashorn/docs/genshelldoc.js
index c3cf5c305e6..3d11a471a3e 100644
--- a/nashorn/docs/genshelldoc.js
+++ b/nashorn/docs/genshelldoc.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/make/Makefile b/nashorn/make/Makefile
index 7d768708853..c3fca106791 100644
--- a/nashorn/make/Makefile
+++ b/nashorn/make/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/make/build-benchmark.xml b/nashorn/make/build-benchmark.xml
index b6dce19565e..b5ff4d9dae2 100644
--- a/nashorn/make/build-benchmark.xml
+++ b/nashorn/make/build-benchmark.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  
  This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/make/build-nasgen.xml b/nashorn/make/build-nasgen.xml
index fe5a67820bb..5797befaba8 100644
--- a/nashorn/make/build-nasgen.xml
+++ b/nashorn/make/build-nasgen.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  
  This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/make/build.xml b/nashorn/make/build.xml
index 69dbf4fd2b5..bfff718938a 100644
--- a/nashorn/make/build.xml
+++ b/nashorn/make/build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
  This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/make/nbproject/ide-file-targets.xml b/nashorn/make/nbproject/ide-file-targets.xml
index 3a957ccd8a2..cb017bb21d4 100644
--- a/nashorn/make/nbproject/ide-file-targets.xml
+++ b/nashorn/make/nbproject/ide-file-targets.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  
  This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/make/nbproject/ide-targets.xml b/nashorn/make/nbproject/ide-targets.xml
index 281672d8b5a..70b3e68fcb7 100644
--- a/nashorn/make/nbproject/ide-targets.xml
+++ b/nashorn/make/nbproject/ide-targets.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
  This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/make/nbproject/jdk.xml b/nashorn/make/nbproject/jdk.xml
index b6fa7ebba63..2fabe8c9e3d 100644
--- a/nashorn/make/nbproject/jdk.xml
+++ b/nashorn/make/nbproject/jdk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?><project name="jdk" basedir=".">
 <!--
- Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  
  This code is free software; you can redistribute it and/or modify it
@@ -176,4 +176,4 @@
 
     <target name="-jdk-init" depends="-jdk-preinit,-jdk-warn,-jdk-presetdef-basic,-jdk-default"/>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/nashorn/make/nbproject/nbjdk.properties b/nashorn/make/nbproject/nbjdk.properties
index 6260c35a3d8..8809e40bff4 100644
--- a/nashorn/make/nbproject/nbjdk.properties
+++ b/nashorn/make/nbproject/nbjdk.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
 # This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/make/nbproject/nbjdk.xml b/nashorn/make/nbproject/nbjdk.xml
index cbd7af38a5f..102045e3ef1 100644
--- a/nashorn/make/nbproject/nbjdk.xml
+++ b/nashorn/make/nbproject/nbjdk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  
  This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/make/nbproject/project.xml b/nashorn/make/nbproject/project.xml
index ee88965a853..bde88f6d66c 100644
--- a/nashorn/make/nbproject/project.xml
+++ b/nashorn/make/nbproject/project.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  
  This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/make/project.properties b/nashorn/make/project.properties
index 64ec4083406..b6c85709023 100644
--- a/nashorn/make/project.properties
+++ b/nashorn/make/project.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
 # This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/samples/counters.js b/nashorn/samples/counters.js
index eb55d2870cf..226ec3dea33 100644
--- a/nashorn/samples/counters.js
+++ b/nashorn/samples/counters.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nashorn/samples/letter.js b/nashorn/samples/letter.js
index d45bd086b45..cbee92d0084 100644
--- a/nashorn/samples/letter.js
+++ b/nashorn/samples/letter.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nashorn/samples/parser.js b/nashorn/samples/parser.js
index a738c03b9af..2f172ccc9b6 100644
--- a/nashorn/samples/parser.js
+++ b/nashorn/samples/parser.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nashorn/samples/shell.js b/nashorn/samples/shell.js
index 380e6d7066f..fc4ce9aafa0 100644
--- a/nashorn/samples/shell.js
+++ b/nashorn/samples/shell.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nashorn/samples/test.js b/nashorn/samples/test.js
index e1d30b0ac51..e2f8c934c92 100644
--- a/nashorn/samples/test.js
+++ b/nashorn/samples/test.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nashorn/samples/uniq.js b/nashorn/samples/uniq.js
index 157c4f59451..3da8480b108 100644
--- a/nashorn/samples/uniq.js
+++ b/nashorn/samples/uniq.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nashorn/src/META-INF/services/javax.script.ScriptEngineFactory b/nashorn/src/META-INF/services/javax.script.ScriptEngineFactory
index ec7da013a99..60a8f56b8b5 100644
--- a/nashorn/src/META-INF/services/javax.script.ScriptEngineFactory
+++ b/nashorn/src/META-INF/services/javax.script.ScriptEngineFactory
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/api/scripting/NashornException.java b/nashorn/src/jdk/nashorn/api/scripting/NashornException.java
index f1a42648b7e..75a62a802f4 100644
--- a/nashorn/src/jdk/nashorn/api/scripting/NashornException.java
+++ b/nashorn/src/jdk/nashorn/api/scripting/NashornException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
index 3fde40aae94..112f4df5b09 100644
--- a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
+++ b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java
index 2bb6a3484d7..fe80e91632b 100644
--- a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java
+++ b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java b/nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java
index 44021fada90..c969cf9c7be 100644
--- a/nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java
+++ b/nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/api/scripting/package-info.java b/nashorn/src/jdk/nashorn/api/scripting/package-info.java
index 32472901236..6876151e330 100644
--- a/nashorn/src/jdk/nashorn/api/scripting/package-info.java
+++ b/nashorn/src/jdk/nashorn/api/scripting/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/api/scripting/resources/engine.js b/nashorn/src/jdk/nashorn/api/scripting/resources/engine.js
index 49e8d45b853..2aba16fcda0 100644
--- a/nashorn/src/jdk/nashorn/api/scripting/resources/engine.js
+++ b/nashorn/src/jdk/nashorn/api/scripting/resources/engine.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/AccessSpecializer.java b/nashorn/src/jdk/nashorn/internal/codegen/AccessSpecializer.java
index 56a3e7ecc45..6db7e6eca2c 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/AccessSpecializer.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/AccessSpecializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/BranchOptimizer.java b/nashorn/src/jdk/nashorn/internal/codegen/BranchOptimizer.java
index e15633f801e..a864d5537f7 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/BranchOptimizer.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/BranchOptimizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/ClassEmitter.java b/nashorn/src/jdk/nashorn/internal/codegen/ClassEmitter.java
index 9b95cf836f9..8ad8123822b 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/ClassEmitter.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/ClassEmitter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
index 71dc3a7bcb4..539bcdb41bb 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CompileUnit.java b/nashorn/src/jdk/nashorn/internal/codegen/CompileUnit.java
index 676348e1b19..727d9e34eba 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/CompileUnit.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CompileUnit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java b/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
index f7ddfd32ca5..bc0ff53bfa4 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CompilerConstants.java b/nashorn/src/jdk/nashorn/internal/codegen/CompilerConstants.java
index 7da72cdc6ed..a77bd0b53f5 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/CompilerConstants.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CompilerConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/ConstantData.java b/nashorn/src/jdk/nashorn/internal/codegen/ConstantData.java
index f02144a67b1..0862f1efc8a 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/ConstantData.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/ConstantData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Emitter.java b/nashorn/src/jdk/nashorn/internal/codegen/Emitter.java
index a17b38bb276..b9feeebd198 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Emitter.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Emitter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Frame.java b/nashorn/src/jdk/nashorn/internal/codegen/Frame.java
index 4ec6f89563d..b72456b27cb 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Frame.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Frame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/FunctionSignature.java b/nashorn/src/jdk/nashorn/internal/codegen/FunctionSignature.java
index df5874419e9..c4b2955ad04 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/FunctionSignature.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/FunctionSignature.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Lower.java b/nashorn/src/jdk/nashorn/internal/codegen/Lower.java
index 20ed637b707..2cfe978b4a6 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Lower.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Lower.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java b/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java
index 3f7d35588a7..78d5ab77fd5 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Namespace.java b/nashorn/src/jdk/nashorn/internal/codegen/Namespace.java
index 639dc7f3b50..02fdb94202c 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Namespace.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Namespace.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/RuntimeCallSite.java b/nashorn/src/jdk/nashorn/internal/codegen/RuntimeCallSite.java
index 921c1f66083..180f55834fa 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/RuntimeCallSite.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/RuntimeCallSite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/SharedScopeCall.java b/nashorn/src/jdk/nashorn/internal/codegen/SharedScopeCall.java
index 376416deb3d..e4291a963b8 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/SharedScopeCall.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/SharedScopeCall.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Splitter.java b/nashorn/src/jdk/nashorn/internal/codegen/Splitter.java
index f6053a707d2..c692035d42e 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Splitter.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Splitter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Transform.java b/nashorn/src/jdk/nashorn/internal/codegen/Transform.java
index d250102c5df..b3355fdb113 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Transform.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Transform.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/WeighNodes.java b/nashorn/src/jdk/nashorn/internal/codegen/WeighNodes.java
index 040907dc723..d84995474c0 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/WeighNodes.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/WeighNodes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/objects/FieldObjectCreator.java b/nashorn/src/jdk/nashorn/internal/codegen/objects/FieldObjectCreator.java
index 9d04ca1bae9..3e6a69d8d1e 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/objects/FieldObjectCreator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/objects/FieldObjectCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/objects/FunctionObjectCreator.java b/nashorn/src/jdk/nashorn/internal/codegen/objects/FunctionObjectCreator.java
index 31635f312fe..b705eb21e90 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/objects/FunctionObjectCreator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/objects/FunctionObjectCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/objects/MapCreator.java b/nashorn/src/jdk/nashorn/internal/codegen/objects/MapCreator.java
index 9483666bd30..da3a47fc4b2 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/objects/MapCreator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/objects/MapCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectClassGenerator.java b/nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectClassGenerator.java
index 881a8337459..813152b8ba7 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectClassGenerator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectClassGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectCreator.java b/nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectCreator.java
index c812bb7fc3f..6a6e9dc1649 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectCreator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectMapCreator.java b/nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectMapCreator.java
index 9da97241f58..c61100a3845 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectMapCreator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectMapCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/ArrayType.java b/nashorn/src/jdk/nashorn/internal/codegen/types/ArrayType.java
index d6e477b7385..b6701df418e 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/types/ArrayType.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/types/ArrayType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/BitwiseType.java b/nashorn/src/jdk/nashorn/internal/codegen/types/BitwiseType.java
index b0194ef4e30..dbd0aa1454f 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/types/BitwiseType.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/types/BitwiseType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/BooleanType.java b/nashorn/src/jdk/nashorn/internal/codegen/types/BooleanType.java
index f576aff384a..2a7a5044d7d 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/types/BooleanType.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/types/BooleanType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
  */
 
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeArrayOps.java b/nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeArrayOps.java
index 915b5459d02..d38cec318a7 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeArrayOps.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeArrayOps.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeBitwiseOps.java b/nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeBitwiseOps.java
index d7d7bff4aaa..ca3e1d3f055 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeBitwiseOps.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeBitwiseOps.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeNumericOps.java b/nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeNumericOps.java
index 9a6716e9578..ae5302819f1 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeNumericOps.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeNumericOps.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeOps.java b/nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeOps.java
index 6f073875014..bbbddf94dec 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeOps.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/types/BytecodeOps.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/IntType.java b/nashorn/src/jdk/nashorn/internal/codegen/types/IntType.java
index f9e6c5a00fc..fc54b1248f7 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/types/IntType.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/types/IntType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/LongType.java b/nashorn/src/jdk/nashorn/internal/codegen/types/LongType.java
index 5eea3e0c08c..7df5bfedfe3 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/types/LongType.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/types/LongType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/NumberType.java b/nashorn/src/jdk/nashorn/internal/codegen/types/NumberType.java
index cafc5118bb9..980c002f59a 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/types/NumberType.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/types/NumberType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/NumericType.java b/nashorn/src/jdk/nashorn/internal/codegen/types/NumericType.java
index 4ae928b9cdb..597ff578705 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/types/NumericType.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/types/NumericType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/ObjectType.java b/nashorn/src/jdk/nashorn/internal/codegen/types/ObjectType.java
index cb14f771a96..05fd21f1e75 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/types/ObjectType.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/types/ObjectType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/Type.java b/nashorn/src/jdk/nashorn/internal/codegen/types/Type.java
index 67bb302832f..8646e7d065b 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/types/Type.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/types/Type.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/AccessNode.java b/nashorn/src/jdk/nashorn/internal/ir/AccessNode.java
index b45ae8ffeb4..4f85bd4785a 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/AccessNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/AccessNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/Assignment.java b/nashorn/src/jdk/nashorn/internal/ir/Assignment.java
index eb590874c2d..142a7062d4c 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/Assignment.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/Assignment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/BaseNode.java b/nashorn/src/jdk/nashorn/internal/ir/BaseNode.java
index 12c56a2902c..a0522ff422f 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/BaseNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/BaseNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/BinaryNode.java b/nashorn/src/jdk/nashorn/internal/ir/BinaryNode.java
index 0d14174540b..d1db336d8a4 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/BinaryNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/BinaryNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/Block.java b/nashorn/src/jdk/nashorn/internal/ir/Block.java
index f9e48c0d959..1d220a594aa 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/Block.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/Block.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/BreakNode.java b/nashorn/src/jdk/nashorn/internal/ir/BreakNode.java
index 4e7f2ce2b70..ae792cf82b0 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/BreakNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/BreakNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/BreakableNode.java b/nashorn/src/jdk/nashorn/internal/ir/BreakableNode.java
index 12d8b38ef65..10334818133 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/BreakableNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/BreakableNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/CallNode.java b/nashorn/src/jdk/nashorn/internal/ir/CallNode.java
index a6998196125..9699a7cdfdd 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/CallNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/CallNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/CaseNode.java b/nashorn/src/jdk/nashorn/internal/ir/CaseNode.java
index 0bd34563d1c..fa13776cf54 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/CaseNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/CaseNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/CatchNode.java b/nashorn/src/jdk/nashorn/internal/ir/CatchNode.java
index 100ca150810..fa61cfce80f 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/CatchNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/CatchNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/ContinueNode.java b/nashorn/src/jdk/nashorn/internal/ir/ContinueNode.java
index 017a24ecef1..ce817d85e43 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/ContinueNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/ContinueNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/DoWhileNode.java b/nashorn/src/jdk/nashorn/internal/ir/DoWhileNode.java
index c57d232c8b8..476643a1c2a 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/DoWhileNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/DoWhileNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/EmptyNode.java b/nashorn/src/jdk/nashorn/internal/ir/EmptyNode.java
index 4fff4be2363..0bfacd5d5a0 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/EmptyNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/EmptyNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/ExecuteNode.java b/nashorn/src/jdk/nashorn/internal/ir/ExecuteNode.java
index 8211d4da49b..f30dd3f1664 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/ExecuteNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/ExecuteNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/ForNode.java b/nashorn/src/jdk/nashorn/internal/ir/ForNode.java
index 71f92e84acc..53b56752acc 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/ForNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/ForNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/FunctionCall.java b/nashorn/src/jdk/nashorn/internal/ir/FunctionCall.java
index 2830fe1bf82..73a6c625f78 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/FunctionCall.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/FunctionCall.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java b/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java
index 6d40eae98ec..dda3ae9d344 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/IdentNode.java b/nashorn/src/jdk/nashorn/internal/ir/IdentNode.java
index e9e9dec8341..19692a70cde 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/IdentNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/IdentNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/IfNode.java b/nashorn/src/jdk/nashorn/internal/ir/IfNode.java
index a51b8e78e0e..81148c3867c 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/IfNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/IfNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/IndexNode.java b/nashorn/src/jdk/nashorn/internal/ir/IndexNode.java
index fdd0e25b7b8..bbce0a3b726 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/IndexNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/IndexNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/LabelNode.java b/nashorn/src/jdk/nashorn/internal/ir/LabelNode.java
index 23802b0ffac..4fd8b94b83b 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/LabelNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/LabelNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/LabeledNode.java b/nashorn/src/jdk/nashorn/internal/ir/LabeledNode.java
index 84bd0019cde..59e310fe754 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/LabeledNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/LabeledNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/LineNumberNode.java b/nashorn/src/jdk/nashorn/internal/ir/LineNumberNode.java
index 8912218291a..a826afbb843 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/LineNumberNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/LineNumberNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/LiteralNode.java b/nashorn/src/jdk/nashorn/internal/ir/LiteralNode.java
index 648f496b1f9..8cd333b9272 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/LiteralNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/LiteralNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/Location.java b/nashorn/src/jdk/nashorn/internal/ir/Location.java
index d374bf8878e..16ee680dabf 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/Location.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/Location.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/Node.java b/nashorn/src/jdk/nashorn/internal/ir/Node.java
index 51fc7031331..6568a6d671a 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/Node.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/Node.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/ObjectNode.java b/nashorn/src/jdk/nashorn/internal/ir/ObjectNode.java
index 071ffc2ab9b..2013bfc84a1 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/ObjectNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/ObjectNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/PropertyKey.java b/nashorn/src/jdk/nashorn/internal/ir/PropertyKey.java
index cee863084e3..e4a72aa5c5d 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/PropertyKey.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/PropertyKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/PropertyNode.java b/nashorn/src/jdk/nashorn/internal/ir/PropertyNode.java
index e8f39b38172..75103377b39 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/PropertyNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/PropertyNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/ReferenceNode.java b/nashorn/src/jdk/nashorn/internal/ir/ReferenceNode.java
index 01b287b17d6..7e2c617d8c4 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/ReferenceNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/ReferenceNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/ReturnNode.java b/nashorn/src/jdk/nashorn/internal/ir/ReturnNode.java
index 14367d189f2..77e202d2e7f 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/ReturnNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/ReturnNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/RuntimeNode.java b/nashorn/src/jdk/nashorn/internal/ir/RuntimeNode.java
index 6e7d2221069..ba3913f1079 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/RuntimeNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/RuntimeNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/SplitNode.java b/nashorn/src/jdk/nashorn/internal/ir/SplitNode.java
index f4ced601662..66113f28682 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/SplitNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/SplitNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/SwitchNode.java b/nashorn/src/jdk/nashorn/internal/ir/SwitchNode.java
index d7542fb847f..344d177252d 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/SwitchNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/SwitchNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/Symbol.java b/nashorn/src/jdk/nashorn/internal/ir/Symbol.java
index 9d1481eb109..944829ec7c3 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/Symbol.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/Symbol.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/TernaryNode.java b/nashorn/src/jdk/nashorn/internal/ir/TernaryNode.java
index 1df74b6ea9d..d25a7886a8a 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/TernaryNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/TernaryNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/ThrowNode.java b/nashorn/src/jdk/nashorn/internal/ir/ThrowNode.java
index f87886acbfd..eae912c7095 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/ThrowNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/ThrowNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/TryNode.java b/nashorn/src/jdk/nashorn/internal/ir/TryNode.java
index 68201b63771..1bb1aa6077d 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/TryNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/TryNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/TypeOverride.java b/nashorn/src/jdk/nashorn/internal/ir/TypeOverride.java
index e7449c9574e..8321318a5ef 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/TypeOverride.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/TypeOverride.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/UnaryNode.java b/nashorn/src/jdk/nashorn/internal/ir/UnaryNode.java
index 3286fa3a936..405a9b3a0a4 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/UnaryNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/UnaryNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/VarNode.java b/nashorn/src/jdk/nashorn/internal/ir/VarNode.java
index 706de7775f1..2b080ea741a 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/VarNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/VarNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/WhileNode.java b/nashorn/src/jdk/nashorn/internal/ir/WhileNode.java
index 592cea21390..3af2f53ce74 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/WhileNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/WhileNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/WithNode.java b/nashorn/src/jdk/nashorn/internal/ir/WithNode.java
index 22698f382f2..1586ab5a8bc 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/WithNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/WithNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/annotations/ChildNode.java b/nashorn/src/jdk/nashorn/internal/ir/annotations/ChildNode.java
index 05e290ee445..181c63d8322 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/annotations/ChildNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/annotations/ChildNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/annotations/Ignore.java b/nashorn/src/jdk/nashorn/internal/ir/annotations/Ignore.java
index 609c33165d4..171eaccecb6 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/annotations/Ignore.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/annotations/Ignore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/annotations/ParentNode.java b/nashorn/src/jdk/nashorn/internal/ir/annotations/ParentNode.java
index 65d1e572e6f..6a9de3a455d 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/annotations/ParentNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/annotations/ParentNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/annotations/Reference.java b/nashorn/src/jdk/nashorn/internal/ir/annotations/Reference.java
index ed1f74f2903..1dd002c1f5f 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/annotations/Reference.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/annotations/Reference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/debug/ASTWriter.java b/nashorn/src/jdk/nashorn/internal/ir/debug/ASTWriter.java
index dae7afa97dd..9b4f4810575 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/debug/ASTWriter.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/debug/ASTWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/debug/JSONWriter.java b/nashorn/src/jdk/nashorn/internal/ir/debug/JSONWriter.java
index dbf8383fd32..a00e1ca0630 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/debug/JSONWriter.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/debug/JSONWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/debug/PrintVisitor.java b/nashorn/src/jdk/nashorn/internal/ir/debug/PrintVisitor.java
index 354ee91eb04..11b8dbd54ed 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/debug/PrintVisitor.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/debug/PrintVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/visitor/NodeOperatorVisitor.java b/nashorn/src/jdk/nashorn/internal/ir/visitor/NodeOperatorVisitor.java
index d76dfb8b886..b4ffe6c09b5 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/visitor/NodeOperatorVisitor.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/visitor/NodeOperatorVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/ir/visitor/NodeVisitor.java b/nashorn/src/jdk/nashorn/internal/ir/visitor/NodeVisitor.java
index 9b9c1c825bd..63cb5bd9e00 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/visitor/NodeVisitor.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/visitor/NodeVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java b/nashorn/src/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java
index 0ad759e7a92..87fcfd41c17 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/ArrayBufferView.java b/nashorn/src/jdk/nashorn/internal/objects/ArrayBufferView.java
index 35616a11f0d..a442a3876c7 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/ArrayBufferView.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/ArrayBufferView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/DataPropertyDescriptor.java b/nashorn/src/jdk/nashorn/internal/objects/DataPropertyDescriptor.java
index 13863e59975..cfc704765d1 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/DataPropertyDescriptor.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/DataPropertyDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/DateParser.java b/nashorn/src/jdk/nashorn/internal/objects/DateParser.java
index c5e17a86f7e..db0f74d0ccb 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/DateParser.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/DateParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/GenericPropertyDescriptor.java b/nashorn/src/jdk/nashorn/internal/objects/GenericPropertyDescriptor.java
index 6fc696324e0..bd8ad453d5a 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/GenericPropertyDescriptor.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/GenericPropertyDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/Global.java b/nashorn/src/jdk/nashorn/internal/objects/Global.java
index 39528960233..ca907f43f57 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/Global.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/Global.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeArguments.java b/nashorn/src/jdk/nashorn/internal/objects/NativeArguments.java
index f6ef19b98ef..d28431f7a1b 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeArguments.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeArguments.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeArray.java b/nashorn/src/jdk/nashorn/internal/objects/NativeArray.java
index 1a4ff783aa4..a13eb15d273 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeArray.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeArray.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeArrayBuffer.java b/nashorn/src/jdk/nashorn/internal/objects/NativeArrayBuffer.java
index 3899760a09d..ce954f893bc 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeArrayBuffer.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeArrayBuffer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeBoolean.java b/nashorn/src/jdk/nashorn/internal/objects/NativeBoolean.java
index 6b47a66e3fa..ae7d1644c0d 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeBoolean.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeBoolean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeDate.java b/nashorn/src/jdk/nashorn/internal/objects/NativeDate.java
index d9812cb2680..dcf1b0a1249 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeDate.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeDate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeDebug.java b/nashorn/src/jdk/nashorn/internal/objects/NativeDebug.java
index 3c11e3ded60..6634706deea 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeDebug.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeDebug.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeError.java b/nashorn/src/jdk/nashorn/internal/objects/NativeError.java
index 7f4350f02ad..3a1874dd991 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeError.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeEvalError.java b/nashorn/src/jdk/nashorn/internal/objects/NativeEvalError.java
index d8583eac013..e4e0498fc29 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeEvalError.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeEvalError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeFloat32Array.java b/nashorn/src/jdk/nashorn/internal/objects/NativeFloat32Array.java
index a325762a929..7275320e114 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeFloat32Array.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeFloat32Array.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeFloat64Array.java b/nashorn/src/jdk/nashorn/internal/objects/NativeFloat64Array.java
index a340d3c1bca..21cc35488d0 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeFloat64Array.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeFloat64Array.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeFunction.java b/nashorn/src/jdk/nashorn/internal/objects/NativeFunction.java
index 20a26035e52..18a93ca60db 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeFunction.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeFunction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeInt16Array.java b/nashorn/src/jdk/nashorn/internal/objects/NativeInt16Array.java
index a58af75ada3..9991b29b4b9 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeInt16Array.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeInt16Array.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeInt32Array.java b/nashorn/src/jdk/nashorn/internal/objects/NativeInt32Array.java
index 280ba4914db..833e2dce957 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeInt32Array.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeInt32Array.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeInt8Array.java b/nashorn/src/jdk/nashorn/internal/objects/NativeInt8Array.java
index 58fcb7575dd..1d527ba9139 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeInt8Array.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeInt8Array.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java b/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java
index 2dae18f02bb..edc9ca4c5d0 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeJSON.java b/nashorn/src/jdk/nashorn/internal/objects/NativeJSON.java
index 88164ee756b..861ef348e21 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeJSON.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeJSON.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java b/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java
index e38ed6f0554..31ec590daed 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeJavaImporter.java b/nashorn/src/jdk/nashorn/internal/objects/NativeJavaImporter.java
index 49b6dc78799..e8e8092fe5f 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeJavaImporter.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeJavaImporter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeMath.java b/nashorn/src/jdk/nashorn/internal/objects/NativeMath.java
index 94d1883bbad..7f330efc103 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeMath.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeMath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java b/nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java
index 1fdeb29336d..11caa5ee9ec 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeObject.java b/nashorn/src/jdk/nashorn/internal/objects/NativeObject.java
index a26dadf7733..ea7a2237925 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeObject.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeRangeError.java b/nashorn/src/jdk/nashorn/internal/objects/NativeRangeError.java
index af80f38ec72..460edf44b84 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeRangeError.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeRangeError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeReferenceError.java b/nashorn/src/jdk/nashorn/internal/objects/NativeReferenceError.java
index 5ac50daeea7..16d7752dfd5 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeReferenceError.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeReferenceError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java b/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java
index b3ca9a8d5de..bacdc83313e 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeRegExpExecResult.java b/nashorn/src/jdk/nashorn/internal/objects/NativeRegExpExecResult.java
index 2f2bdff8b73..628441cf541 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeRegExpExecResult.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeRegExpExecResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeStrictArguments.java b/nashorn/src/jdk/nashorn/internal/objects/NativeStrictArguments.java
index c32ea2736d9..5d24f44960d 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeStrictArguments.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeStrictArguments.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeString.java b/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
index 99a594cf3ad..b72fdb55a92 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeSyntaxError.java b/nashorn/src/jdk/nashorn/internal/objects/NativeSyntaxError.java
index 25c16b07c7a..477006f4005 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeSyntaxError.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeSyntaxError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeTypeError.java b/nashorn/src/jdk/nashorn/internal/objects/NativeTypeError.java
index 93b61bc02ae..9d7d524153a 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeTypeError.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeTypeError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeURIError.java b/nashorn/src/jdk/nashorn/internal/objects/NativeURIError.java
index 61eb257a373..eaad3400939 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeURIError.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeURIError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeUint16Array.java b/nashorn/src/jdk/nashorn/internal/objects/NativeUint16Array.java
index 22b671cb8f3..1e508963294 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeUint16Array.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeUint16Array.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeUint32Array.java b/nashorn/src/jdk/nashorn/internal/objects/NativeUint32Array.java
index 068eb2e8144..8956fe5583e 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeUint32Array.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeUint32Array.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeUint8Array.java b/nashorn/src/jdk/nashorn/internal/objects/NativeUint8Array.java
index 96395c4008f..349a43c33db 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeUint8Array.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeUint8Array.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeUint8ClampedArray.java b/nashorn/src/jdk/nashorn/internal/objects/NativeUint8ClampedArray.java
index 4c2079ffb7d..8ce922476af 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeUint8ClampedArray.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeUint8ClampedArray.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/PrototypeObject.java b/nashorn/src/jdk/nashorn/internal/objects/PrototypeObject.java
index 273321cc37e..382db5cd20d 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/PrototypeObject.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/PrototypeObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java b/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
index 23765916938..981bfd7c186 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/annotations/Attribute.java b/nashorn/src/jdk/nashorn/internal/objects/annotations/Attribute.java
index 91c92673287..a6b6b1baab8 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/annotations/Attribute.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/annotations/Attribute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/annotations/Constructor.java b/nashorn/src/jdk/nashorn/internal/objects/annotations/Constructor.java
index b9739257636..297bb1ec740 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/annotations/Constructor.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/annotations/Constructor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/annotations/Function.java b/nashorn/src/jdk/nashorn/internal/objects/annotations/Function.java
index 7e06a5e11fa..04c53938e6d 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/annotations/Function.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/annotations/Function.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/annotations/Getter.java b/nashorn/src/jdk/nashorn/internal/objects/annotations/Getter.java
index 7f853e00d32..d10bbf62fd6 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/annotations/Getter.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/annotations/Getter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/annotations/Property.java b/nashorn/src/jdk/nashorn/internal/objects/annotations/Property.java
index 55672a06fcf..6aec205275a 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/annotations/Property.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/annotations/Property.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/annotations/ScriptClass.java b/nashorn/src/jdk/nashorn/internal/objects/annotations/ScriptClass.java
index 88ae0e3f4f2..23d910c2954 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/annotations/ScriptClass.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/annotations/ScriptClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/annotations/Setter.java b/nashorn/src/jdk/nashorn/internal/objects/annotations/Setter.java
index 43f1556475d..bad6f2ab5b0 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/annotations/Setter.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/annotations/Setter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/annotations/SpecializedConstructor.java b/nashorn/src/jdk/nashorn/internal/objects/annotations/SpecializedConstructor.java
index d4dec35c281..9e6bd0ad09c 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/annotations/SpecializedConstructor.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/annotations/SpecializedConstructor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/annotations/SpecializedFunction.java b/nashorn/src/jdk/nashorn/internal/objects/annotations/SpecializedFunction.java
index 48cdd23bc00..1e75d2a72a3 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/annotations/SpecializedFunction.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/annotations/SpecializedFunction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/annotations/Where.java b/nashorn/src/jdk/nashorn/internal/objects/annotations/Where.java
index 22e06652c04..9153afe1e72 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/annotations/Where.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/annotations/Where.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/objects/package-info.java b/nashorn/src/jdk/nashorn/internal/objects/package-info.java
index 652eadf69b6..6a106ec8bf2 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/package-info.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/parser/AbstractParser.java b/nashorn/src/jdk/nashorn/internal/parser/AbstractParser.java
index 413e1181572..75a3443aadf 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/AbstractParser.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/AbstractParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/parser/JSONParser.java b/nashorn/src/jdk/nashorn/internal/parser/JSONParser.java
index 0f3459dd783..39cf549e50a 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/JSONParser.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/JSONParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/parser/Lexer.java b/nashorn/src/jdk/nashorn/internal/parser/Lexer.java
index 4d99cf3ace0..e5d99207cc4 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/Lexer.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/Lexer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/parser/Parser.java b/nashorn/src/jdk/nashorn/internal/parser/Parser.java
index c2ca6662377..c05f971f58a 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/Parser.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/Parser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/parser/RegExp.java b/nashorn/src/jdk/nashorn/internal/parser/RegExp.java
index f711a4c6bb4..1b20eab7419 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/RegExp.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/RegExp.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/parser/RegExpScanner.java b/nashorn/src/jdk/nashorn/internal/parser/RegExpScanner.java
index aeb32ec3218..fba2f3f2471 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/RegExpScanner.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/RegExpScanner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/parser/Scanner.java b/nashorn/src/jdk/nashorn/internal/parser/Scanner.java
index 444bc4d3923..b8257d45007 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/Scanner.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/Scanner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/parser/Token.java b/nashorn/src/jdk/nashorn/internal/parser/Token.java
index 484ce99ea48..0012daa6b7e 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/Token.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/Token.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/parser/TokenKind.java b/nashorn/src/jdk/nashorn/internal/parser/TokenKind.java
index 893bae9ddff..af3029da8c5 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/TokenKind.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/TokenKind.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/parser/TokenLookup.java b/nashorn/src/jdk/nashorn/internal/parser/TokenLookup.java
index e53986ed2f6..1598b41b09e 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/TokenLookup.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/TokenLookup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/parser/TokenStream.java b/nashorn/src/jdk/nashorn/internal/parser/TokenStream.java
index e229579bb65..c31f5f4c9f0 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/TokenStream.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/TokenStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/parser/TokenType.java b/nashorn/src/jdk/nashorn/internal/parser/TokenType.java
index 1e564abc567..a095a48357a 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/TokenType.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/TokenType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/AccessorProperty.java b/nashorn/src/jdk/nashorn/internal/runtime/AccessorProperty.java
index 0ec4668bd1a..dfa07dc2cd7 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/AccessorProperty.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/AccessorProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/BitVector.java b/nashorn/src/jdk/nashorn/internal/runtime/BitVector.java
index f5c7c6f03fe..59580b24e6e 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/BitVector.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/BitVector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/CodeInstaller.java b/nashorn/src/jdk/nashorn/internal/runtime/CodeInstaller.java
index 13c5a37efdd..789eb2ce520 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/CodeInstaller.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/CodeInstaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ConsString.java b/nashorn/src/jdk/nashorn/internal/runtime/ConsString.java
index 32e284b80d3..5a15fdf6e94 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ConsString.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ConsString.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Context.java b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
index 534e11a630e..24adf3a623a 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/Context.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Debug.java b/nashorn/src/jdk/nashorn/internal/runtime/Debug.java
index 463736d8a97..a087792c6c4 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/Debug.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Debug.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/DebugLogger.java b/nashorn/src/jdk/nashorn/internal/runtime/DebugLogger.java
index ac925b4f63c..cb92ca76ad4 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/DebugLogger.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/DebugLogger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/DefaultPropertyAccess.java b/nashorn/src/jdk/nashorn/internal/runtime/DefaultPropertyAccess.java
index 43b6a6d7502..dcceccbcf31 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/DefaultPropertyAccess.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/DefaultPropertyAccess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ECMAErrors.java b/nashorn/src/jdk/nashorn/internal/runtime/ECMAErrors.java
index 3cb6dadd38d..ceabcd22f7e 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ECMAErrors.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ECMAErrors.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ECMAException.java b/nashorn/src/jdk/nashorn/internal/runtime/ECMAException.java
index 253dbeb4e54..8d5ab4bdb39 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ECMAException.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ECMAException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ErrorManager.java b/nashorn/src/jdk/nashorn/internal/runtime/ErrorManager.java
index 3e08a7c6670..9aa933b5a81 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ErrorManager.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ErrorManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/FindProperty.java b/nashorn/src/jdk/nashorn/internal/runtime/FindProperty.java
index 1fb75569f60..87efd9f6c45 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/FindProperty.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/FindProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/FunctionScope.java b/nashorn/src/jdk/nashorn/internal/runtime/FunctionScope.java
index c6a0e110b31..713aa69d3ce 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/FunctionScope.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/FunctionScope.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/GlobalFunctions.java b/nashorn/src/jdk/nashorn/internal/runtime/GlobalFunctions.java
index ae08959880e..425548433f2 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/GlobalFunctions.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/GlobalFunctions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/GlobalObject.java b/nashorn/src/jdk/nashorn/internal/runtime/GlobalObject.java
index b8e2450a613..4a95cb96c71 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/GlobalObject.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/GlobalObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/JSErrorType.java b/nashorn/src/jdk/nashorn/internal/runtime/JSErrorType.java
index 89362403c6b..d83d018e297 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/JSErrorType.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/JSErrorType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/JSType.java b/nashorn/src/jdk/nashorn/internal/runtime/JSType.java
index b3d0b7e7a96..c5537cf52cb 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/JSType.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/JSType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Logging.java b/nashorn/src/jdk/nashorn/internal/runtime/Logging.java
index 761d7202550..809ecd53379 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/Logging.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Logging.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/NashornLoader.java b/nashorn/src/jdk/nashorn/internal/runtime/NashornLoader.java
index 38eacf7ccbb..57c33c1dd0b 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/NashornLoader.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/NashornLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/NativeJavaPackage.java b/nashorn/src/jdk/nashorn/internal/runtime/NativeJavaPackage.java
index 1688c006d33..a35df4729fa 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/NativeJavaPackage.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/NativeJavaPackage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/NumberToString.java b/nashorn/src/jdk/nashorn/internal/runtime/NumberToString.java
index e5452b7e5cc..8a05e31988a 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/NumberToString.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/NumberToString.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ParserException.java b/nashorn/src/jdk/nashorn/internal/runtime/ParserException.java
index 461bc8b516f..a5f6530f39c 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ParserException.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ParserException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Property.java b/nashorn/src/jdk/nashorn/internal/runtime/Property.java
index bf4f1bef604..ae46c7a720f 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/Property.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Property.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/PropertyAccess.java b/nashorn/src/jdk/nashorn/internal/runtime/PropertyAccess.java
index be5e36e7ea8..165344ceeb2 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/PropertyAccess.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/PropertyAccess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/PropertyDescriptor.java b/nashorn/src/jdk/nashorn/internal/runtime/PropertyDescriptor.java
index 5f3c05b7459..49a7a9d6bc4 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/PropertyDescriptor.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/PropertyDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/PropertyHashMap.java b/nashorn/src/jdk/nashorn/internal/runtime/PropertyHashMap.java
index f6b7b63f8a3..8b4e05e4969 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/PropertyHashMap.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/PropertyHashMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/PropertyListener.java b/nashorn/src/jdk/nashorn/internal/runtime/PropertyListener.java
index 2c4d368f9af..867ac73d1b4 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/PropertyListener.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/PropertyListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/PropertyListenerManager.java b/nashorn/src/jdk/nashorn/internal/runtime/PropertyListenerManager.java
index b2b55183666..970ccca6855 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/PropertyListenerManager.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/PropertyListenerManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java b/nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java
index 29a838bf633..67ff96421b7 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/QuotedStringTokenizer.java b/nashorn/src/jdk/nashorn/internal/runtime/QuotedStringTokenizer.java
index 619d6d7bae8..7848caf1fd1 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/QuotedStringTokenizer.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/QuotedStringTokenizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/RegExpMatch.java b/nashorn/src/jdk/nashorn/internal/runtime/RegExpMatch.java
index 9b7b962c5dd..81ab1db3a99 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/RegExpMatch.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/RegExpMatch.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Scope.java b/nashorn/src/jdk/nashorn/internal/runtime/Scope.java
index 6075ce08a38..577b5b617a2 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/Scope.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Scope.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
index 8ab202e7579..58728f3aa67 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptLoader.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptLoader.java
index e5ffe149f2e..4d89292a14b 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptLoader.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
index 74f3b6439ed..05629fd3c61 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java
index 71bea73122f..3cecb419ad3 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java
index f0662347449..3099832e661 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Source.java b/nashorn/src/jdk/nashorn/internal/runtime/Source.java
index 90bf06fb99d..822e0bb5242 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/Source.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Source.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/SpillProperty.java b/nashorn/src/jdk/nashorn/internal/runtime/SpillProperty.java
index 0d3d6a0764c..22d1c8a7edd 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/SpillProperty.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/SpillProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/StructureLoader.java b/nashorn/src/jdk/nashorn/internal/runtime/StructureLoader.java
index ae708b2d934..c9968102af2 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/StructureLoader.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/StructureLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/URIUtils.java b/nashorn/src/jdk/nashorn/internal/runtime/URIUtils.java
index a74c9202fdb..55df05b49a5 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/URIUtils.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/URIUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Undefined.java b/nashorn/src/jdk/nashorn/internal/runtime/Undefined.java
index 448976e57ac..1e7e635c4a8 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/Undefined.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Undefined.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/UserAccessorProperty.java b/nashorn/src/jdk/nashorn/internal/runtime/UserAccessorProperty.java
index c5a375a26ef..6bb053a1036 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/UserAccessorProperty.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/UserAccessorProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Version.java b/nashorn/src/jdk/nashorn/internal/runtime/Version.java
index 0c8387ad973..8c102dd6d4c 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/Version.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Version.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java b/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java
index 5bba23b43ef..3b49606f8dc 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayData.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayData.java
index d4012534d5c..fca724a8bf3 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayData.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayFilter.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayFilter.java
index 3c066866f06..c347ed70e8b 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayFilter.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayIndex.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayIndex.java
index 5b342fd8424..c7de94bfbf7 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayIndex.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayIndex.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayIterator.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayIterator.java
index 5b9e1c20847..1e4c35089c1 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayIterator.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayIterator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayLikeIterator.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayLikeIterator.java
index 283ca26eb14..59ac860943f 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayLikeIterator.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayLikeIterator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/DeletedArrayFilter.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/DeletedArrayFilter.java
index 2a378ddbbaf..57bea4cf1e6 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/DeletedArrayFilter.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/DeletedArrayFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/DeletedRangeArrayFilter.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/DeletedRangeArrayFilter.java
index 05d59ed15d9..588252ac4f2 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/DeletedRangeArrayFilter.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/DeletedRangeArrayFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/EmptyArrayLikeIterator.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/EmptyArrayLikeIterator.java
index 37aeede12fc..0feab2fa5db 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/EmptyArrayLikeIterator.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/EmptyArrayLikeIterator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/FrozenArrayFilter.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/FrozenArrayFilter.java
index 0568849ed72..f55a917693a 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/FrozenArrayFilter.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/FrozenArrayFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/IntArrayData.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/IntArrayData.java
index e37440d1e19..3c34081f898 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/IntArrayData.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/IntArrayData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/InvalidArrayIndexException.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/InvalidArrayIndexException.java
index b9e42a36ed1..170b65d0a05 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/InvalidArrayIndexException.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/InvalidArrayIndexException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/IteratorAction.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/IteratorAction.java
index fe7de5af7f9..b640de4ee0c 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/IteratorAction.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/IteratorAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/LongArrayData.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/LongArrayData.java
index 1a59f85858e..800c7c6767e 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/LongArrayData.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/LongArrayData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/MapIterator.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/MapIterator.java
index 4e5f279de66..6eaa216229c 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/MapIterator.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/MapIterator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/NoTypeArrayData.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/NoTypeArrayData.java
index e495ea5e298..8fb53607b84 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/NoTypeArrayData.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/NoTypeArrayData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/NumberArrayData.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/NumberArrayData.java
index 776600a9c4a..149cbf0ceef 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/NumberArrayData.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/NumberArrayData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ObjectArrayData.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ObjectArrayData.java
index 5d156ed162c..cb1e2fa03ba 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ObjectArrayData.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ObjectArrayData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseArrayIterator.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseArrayIterator.java
index 01c99ef0f47..72a47a93c0d 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseArrayIterator.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseArrayIterator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseMapIterator.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseMapIterator.java
index ab56e5578c9..760ac7207d0 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseMapIterator.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ReverseMapIterator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/SealedArrayFilter.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/SealedArrayFilter.java
index 60da2d990d0..b6c79128f7e 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/SealedArrayFilter.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/SealedArrayFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/SparseArrayData.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/SparseArrayData.java
index b8fb30c8264..e5ba1cd911a 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/SparseArrayData.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/SparseArrayData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/UndefinedArrayFilter.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/UndefinedArrayFilter.java
index a3671070636..f71a9954287 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/UndefinedArrayFilter.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/UndefinedArrayFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/Bootstrap.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/Bootstrap.java
index 59165f4fd66..ae04d76c34e 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/Bootstrap.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/Bootstrap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/InvokeByName.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/InvokeByName.java
index 5537ab8aed9..30e91ec332b 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/InvokeByName.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/InvokeByName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java
index 285cac19b15..5ec1f4c9831 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
index 462a02fb02a..337146363e1 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java
index 03ad5dae6f0..8cc68fd214b 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java
index 5f88f53a15e..bfe2220ea70 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/Lookup.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/Lookup.java
index 9055aafa9c9..7282c60f39b 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/Lookup.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/Lookup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/Mangler.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/Mangler.java
index dd5726708c3..a6044f69b73 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/Mangler.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/Mangler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/MethodHandleFactory.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/MethodHandleFactory.java
index f6bf0a94cc0..ebb3ffda147 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/MethodHandleFactory.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/MethodHandleFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/MethodHandleFunctionality.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/MethodHandleFunctionality.java
index 06d50a77138..ecf158d1017 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/MethodHandleFunctionality.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/MethodHandleFunctionality.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java
index 2d5a52f5bb2..5fea27f9b49 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java
index df05651a1ca..79654f54509 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornGuardedInvocation.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornGuardedInvocation.java
index 725975cd374..94972de56fb 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornGuardedInvocation.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornGuardedInvocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornGuards.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornGuards.java
index 05c626bb12b..2dcc355fef9 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornGuards.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornGuards.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornLinker.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornLinker.java
index 06534c945af..832c40f3383 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornLinker.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornLinker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java
index 4fc658742ee..a4acc68fae7 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java
index e8ca39d1ab8..51bb4040ccc 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/options/KeyValueOption.java b/nashorn/src/jdk/nashorn/internal/runtime/options/KeyValueOption.java
index 2d2c63244f5..aee6caf0be8 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/options/KeyValueOption.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/options/KeyValueOption.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/options/Option.java b/nashorn/src/jdk/nashorn/internal/runtime/options/Option.java
index 1e7a5ba58bb..ddbeba184d4 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/options/Option.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/options/Option.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/options/OptionTemplate.java b/nashorn/src/jdk/nashorn/internal/runtime/options/OptionTemplate.java
index 4d5f25dc92b..82b6edbc600 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/options/OptionTemplate.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/options/OptionTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/options/Options.java b/nashorn/src/jdk/nashorn/internal/runtime/options/Options.java
index 26e22b58778..e0048af061c 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/options/Options.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/options/Options.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/options/ValueOption.java b/nashorn/src/jdk/nashorn/internal/runtime/options/ValueOption.java
index 9d7d7c60047..2f4461f44ca 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/options/ValueOption.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/options/ValueOption.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/Messages.properties b/nashorn/src/jdk/nashorn/internal/runtime/resources/Messages.properties
index f969ec309f2..70cd1554a75 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/resources/Messages.properties
+++ b/nashorn/src/jdk/nashorn/internal/runtime/resources/Messages.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/Options.properties b/nashorn/src/jdk/nashorn/internal/runtime/resources/Options.properties
index e743953ba6a..7a4e85b226b 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/resources/Options.properties
+++ b/nashorn/src/jdk/nashorn/internal/runtime/resources/Options.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js b/nashorn/src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js
index 2e3be699319..fa16a173978 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js
+++ b/nashorn/src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/parser.js b/nashorn/src/jdk/nashorn/internal/runtime/resources/parser.js
index 4d977f348a9..a721fd97c8d 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/resources/parser.js
+++ b/nashorn/src/jdk/nashorn/internal/runtime/resources/parser.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/version.properties-template b/nashorn/src/jdk/nashorn/internal/runtime/resources/version.properties-template
index a737a0c1b1e..e64f14642b0 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/resources/version.properties-template
+++ b/nashorn/src/jdk/nashorn/internal/runtime/resources/version.properties-template
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/scripts/JO$.java b/nashorn/src/jdk/nashorn/internal/scripts/JO$.java
index 70f88fa8927..a773b439313 100644
--- a/nashorn/src/jdk/nashorn/internal/scripts/JO$.java
+++ b/nashorn/src/jdk/nashorn/internal/scripts/JO$.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/internal/scripts/JS$.java b/nashorn/src/jdk/nashorn/internal/scripts/JS$.java
index 3ea72980a27..b7c0af6854d 100644
--- a/nashorn/src/jdk/nashorn/internal/scripts/JS$.java
+++ b/nashorn/src/jdk/nashorn/internal/scripts/JS$.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/tools/Shell.java b/nashorn/src/jdk/nashorn/tools/Shell.java
index 44ece060572..b35d1702714 100644
--- a/nashorn/src/jdk/nashorn/tools/Shell.java
+++ b/nashorn/src/jdk/nashorn/tools/Shell.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/tools/resources/Shell.properties b/nashorn/src/jdk/nashorn/tools/resources/Shell.properties
index 108ae07ab26..6f4c973318f 100644
--- a/nashorn/src/jdk/nashorn/tools/resources/Shell.properties
+++ b/nashorn/src/jdk/nashorn/tools/resources/Shell.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/jdk/nashorn/tools/resources/shell.js b/nashorn/src/jdk/nashorn/tools/resources/shell.js
index 5103ee00b8f..bb78c72a112 100644
--- a/nashorn/src/jdk/nashorn/tools/resources/shell.js
+++ b/nashorn/src/jdk/nashorn/tools/resources/shell.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/netscape/javascript/JSObject.java b/nashorn/src/netscape/javascript/JSObject.java
index 42cfd78a8a9..23054c6321d 100644
--- a/nashorn/src/netscape/javascript/JSObject.java
+++ b/nashorn/src/netscape/javascript/JSObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/src/overview.html b/nashorn/src/overview.html
index fac1d7e11c4..5418854f2a3 100644
--- a/nashorn/src/overview.html
+++ b/nashorn/src/overview.html
@@ -1,5 +1,5 @@
 <!-- 
- Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
  This code is free software; you can redistribute it and/or modify it
@@ -110,4 +110,4 @@ In addition to {@code Java}, Nashorn also exposes some other non-standard built-
 <a href="jdk/nashorn/internal/objects/NativeJSAdapter.html">{@code JSAdapter}</a>,
 <a href="jdk/nashorn/internal/objects/NativeJavaImporter.html">{@code JavaImporter},
 <a href="jdk/nashorn/internal/runtime/NativeJavaPackage.html">{@code Packages}.</a>
-</body>
\ No newline at end of file
+</body>
diff --git a/nashorn/test/examples/dual-fields-micro.js b/nashorn/test/examples/dual-fields-micro.js
index f9f0b99fb88..aafc8888efd 100644
--- a/nashorn/test/examples/dual-fields-micro.js
+++ b/nashorn/test/examples/dual-fields-micro.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nashorn/test/examples/innerbench.js b/nashorn/test/examples/innerbench.js
index e676e1853d7..b7be741666f 100644
--- a/nashorn/test/examples/innerbench.js
+++ b/nashorn/test/examples/innerbench.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nashorn/test/examples/typechain.js b/nashorn/test/examples/typechain.js
index 4eba6dde377..8b13ad9774c 100644
--- a/nashorn/test/examples/typechain.js
+++ b/nashorn/test/examples/typechain.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/nashorn/test/lib/benchmark.js b/nashorn/test/lib/benchmark.js
index 5c67a1c36d8..e759cf11a64 100644
--- a/nashorn/test/lib/benchmark.js
+++ b/nashorn/test/lib/benchmark.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/opt/add.js b/nashorn/test/opt/add.js
index 4a96cc430f9..6e43ae0c829 100644
--- a/nashorn/test/opt/add.js
+++ b/nashorn/test/opt/add.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/opt/add_constant.js b/nashorn/test/opt/add_constant.js
index ffc5596b04e..0f2ae8b041d 100644
--- a/nashorn/test/opt/add_constant.js
+++ b/nashorn/test/opt/add_constant.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/opt/add_reuse_callsite.js b/nashorn/test/opt/add_reuse_callsite.js
index 70b2e58dabf..353982339ab 100644
--- a/nashorn/test/opt/add_reuse_callsite.js
+++ b/nashorn/test/opt/add_reuse_callsite.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/opt/add_revert2.js b/nashorn/test/opt/add_revert2.js
index c42b79bfc34..6ea36c5d069 100644
--- a/nashorn/test/opt/add_revert2.js
+++ b/nashorn/test/opt/add_revert2.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/opt/cascade_specialize.js b/nashorn/test/opt/cascade_specialize.js
index b7b02a77c1b..7b5d66c22d3 100644
--- a/nashorn/test/opt/cascade_specialize.js
+++ b/nashorn/test/opt/cascade_specialize.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/assert.js b/nashorn/test/script/assert.js
index 7f57cc9917d..25bc2599042 100644
--- a/nashorn/test/script/assert.js
+++ b/nashorn/test/script/assert.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-100.js b/nashorn/test/script/basic/NASHORN-100.js
index 40e3780b1b2..fdea1cf05be 100644
--- a/nashorn/test/script/basic/NASHORN-100.js
+++ b/nashorn/test/script/basic/NASHORN-100.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-101.js b/nashorn/test/script/basic/NASHORN-101.js
index 33a162b8230..4e83a99f059 100644
--- a/nashorn/test/script/basic/NASHORN-101.js
+++ b/nashorn/test/script/basic/NASHORN-101.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-102.js b/nashorn/test/script/basic/NASHORN-102.js
index 8359d979eec..cc388dd982a 100644
--- a/nashorn/test/script/basic/NASHORN-102.js
+++ b/nashorn/test/script/basic/NASHORN-102.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-103.js b/nashorn/test/script/basic/NASHORN-103.js
index 4518d8bb9d2..ddce5965363 100644
--- a/nashorn/test/script/basic/NASHORN-103.js
+++ b/nashorn/test/script/basic/NASHORN-103.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-104.js b/nashorn/test/script/basic/NASHORN-104.js
index 7dc973ffda9..c97b6bc6657 100644
--- a/nashorn/test/script/basic/NASHORN-104.js
+++ b/nashorn/test/script/basic/NASHORN-104.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-105.js b/nashorn/test/script/basic/NASHORN-105.js
index f87d856142a..f26710d1278 100644
--- a/nashorn/test/script/basic/NASHORN-105.js
+++ b/nashorn/test/script/basic/NASHORN-105.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-106.js b/nashorn/test/script/basic/NASHORN-106.js
index 3dc6e325051..e5a9c612bd0 100644
--- a/nashorn/test/script/basic/NASHORN-106.js
+++ b/nashorn/test/script/basic/NASHORN-106.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-107.js b/nashorn/test/script/basic/NASHORN-107.js
index f55bd72661d..2aeb5dca94b 100644
--- a/nashorn/test/script/basic/NASHORN-107.js
+++ b/nashorn/test/script/basic/NASHORN-107.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-108.js b/nashorn/test/script/basic/NASHORN-108.js
index 75066cd87e2..e12096bf45b 100644
--- a/nashorn/test/script/basic/NASHORN-108.js
+++ b/nashorn/test/script/basic/NASHORN-108.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-109.js b/nashorn/test/script/basic/NASHORN-109.js
index 9b41b9b23c2..b05e0f12e50 100644
--- a/nashorn/test/script/basic/NASHORN-109.js
+++ b/nashorn/test/script/basic/NASHORN-109.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-11.js b/nashorn/test/script/basic/NASHORN-11.js
index a4b01b7a64b..ca8565f88a8 100644
--- a/nashorn/test/script/basic/NASHORN-11.js
+++ b/nashorn/test/script/basic/NASHORN-11.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-111.js b/nashorn/test/script/basic/NASHORN-111.js
index e0aba6f6d20..4b8347c99aa 100644
--- a/nashorn/test/script/basic/NASHORN-111.js
+++ b/nashorn/test/script/basic/NASHORN-111.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-113.js b/nashorn/test/script/basic/NASHORN-113.js
index 1bc5ac1ca73..d90d1fb4e7b 100644
--- a/nashorn/test/script/basic/NASHORN-113.js
+++ b/nashorn/test/script/basic/NASHORN-113.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-114.js b/nashorn/test/script/basic/NASHORN-114.js
index 83c14538162..032692147a2 100644
--- a/nashorn/test/script/basic/NASHORN-114.js
+++ b/nashorn/test/script/basic/NASHORN-114.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-115.js b/nashorn/test/script/basic/NASHORN-115.js
index aba73cc5c3e..924a9a2bc83 100644
--- a/nashorn/test/script/basic/NASHORN-115.js
+++ b/nashorn/test/script/basic/NASHORN-115.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-117.js b/nashorn/test/script/basic/NASHORN-117.js
index 0278c98966e..9436150fae8 100644
--- a/nashorn/test/script/basic/NASHORN-117.js
+++ b/nashorn/test/script/basic/NASHORN-117.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-118.js b/nashorn/test/script/basic/NASHORN-118.js
index ce1b1a804fb..d12d861439d 100644
--- a/nashorn/test/script/basic/NASHORN-118.js
+++ b/nashorn/test/script/basic/NASHORN-118.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-119.js b/nashorn/test/script/basic/NASHORN-119.js
index 561f3e1ba28..c957cdf26c4 100644
--- a/nashorn/test/script/basic/NASHORN-119.js
+++ b/nashorn/test/script/basic/NASHORN-119.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-12.js b/nashorn/test/script/basic/NASHORN-12.js
index 284e1e5db69..ed04d6213e9 100644
--- a/nashorn/test/script/basic/NASHORN-12.js
+++ b/nashorn/test/script/basic/NASHORN-12.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-120.js b/nashorn/test/script/basic/NASHORN-120.js
index 59872c7862a..b424f3e0bc5 100644
--- a/nashorn/test/script/basic/NASHORN-120.js
+++ b/nashorn/test/script/basic/NASHORN-120.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-122.js b/nashorn/test/script/basic/NASHORN-122.js
index b8337092be7..a8863a9b87a 100644
--- a/nashorn/test/script/basic/NASHORN-122.js
+++ b/nashorn/test/script/basic/NASHORN-122.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-126.js b/nashorn/test/script/basic/NASHORN-126.js
index b657304d523..dc3f3b33b42 100644
--- a/nashorn/test/script/basic/NASHORN-126.js
+++ b/nashorn/test/script/basic/NASHORN-126.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-127.js b/nashorn/test/script/basic/NASHORN-127.js
index 74695b10b5c..3cd64d28f36 100644
--- a/nashorn/test/script/basic/NASHORN-127.js
+++ b/nashorn/test/script/basic/NASHORN-127.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-130.js b/nashorn/test/script/basic/NASHORN-130.js
index a9b548844a7..64f275cdbb4 100644
--- a/nashorn/test/script/basic/NASHORN-130.js
+++ b/nashorn/test/script/basic/NASHORN-130.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-132.js b/nashorn/test/script/basic/NASHORN-132.js
index 8bb1e682ece..f8ad281a084 100644
--- a/nashorn/test/script/basic/NASHORN-132.js
+++ b/nashorn/test/script/basic/NASHORN-132.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-133.js b/nashorn/test/script/basic/NASHORN-133.js
index 9f7d4622706..f4ddbe63365 100644
--- a/nashorn/test/script/basic/NASHORN-133.js
+++ b/nashorn/test/script/basic/NASHORN-133.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-135.js b/nashorn/test/script/basic/NASHORN-135.js
index dc7eb5fb9f8..6ffff06b623 100644
--- a/nashorn/test/script/basic/NASHORN-135.js
+++ b/nashorn/test/script/basic/NASHORN-135.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-136.js b/nashorn/test/script/basic/NASHORN-136.js
index beefc8ad305..473a3e1faea 100644
--- a/nashorn/test/script/basic/NASHORN-136.js
+++ b/nashorn/test/script/basic/NASHORN-136.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-14.js b/nashorn/test/script/basic/NASHORN-14.js
index 34abb7ce41c..83a0a0775c8 100644
--- a/nashorn/test/script/basic/NASHORN-14.js
+++ b/nashorn/test/script/basic/NASHORN-14.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-148.js b/nashorn/test/script/basic/NASHORN-148.js
index 44cc0cd6c37..398b09d502d 100644
--- a/nashorn/test/script/basic/NASHORN-148.js
+++ b/nashorn/test/script/basic/NASHORN-148.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-15.js b/nashorn/test/script/basic/NASHORN-15.js
index 5a470cd6f5f..895fac6c8dd 100644
--- a/nashorn/test/script/basic/NASHORN-15.js
+++ b/nashorn/test/script/basic/NASHORN-15.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-153.js b/nashorn/test/script/basic/NASHORN-153.js
index 63565db25ad..e38c3e11634 100644
--- a/nashorn/test/script/basic/NASHORN-153.js
+++ b/nashorn/test/script/basic/NASHORN-153.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-156.js b/nashorn/test/script/basic/NASHORN-156.js
index da37f0d9486..6a111e98d4f 100644
--- a/nashorn/test/script/basic/NASHORN-156.js
+++ b/nashorn/test/script/basic/NASHORN-156.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-157.js b/nashorn/test/script/basic/NASHORN-157.js
index 461128f58f6..1908d380f84 100644
--- a/nashorn/test/script/basic/NASHORN-157.js
+++ b/nashorn/test/script/basic/NASHORN-157.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-163.js b/nashorn/test/script/basic/NASHORN-163.js
index 2e6b8ae5cb0..d431a3de519 100644
--- a/nashorn/test/script/basic/NASHORN-163.js
+++ b/nashorn/test/script/basic/NASHORN-163.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-164.js b/nashorn/test/script/basic/NASHORN-164.js
index a7ca1476cac..f1b42eb8eef 100644
--- a/nashorn/test/script/basic/NASHORN-164.js
+++ b/nashorn/test/script/basic/NASHORN-164.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-165.js b/nashorn/test/script/basic/NASHORN-165.js
index 7c453a7bc5b..fc1008e4ce6 100644
--- a/nashorn/test/script/basic/NASHORN-165.js
+++ b/nashorn/test/script/basic/NASHORN-165.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-166.js b/nashorn/test/script/basic/NASHORN-166.js
index e0e41fa0453..465f159b674 100644
--- a/nashorn/test/script/basic/NASHORN-166.js
+++ b/nashorn/test/script/basic/NASHORN-166.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-168.js b/nashorn/test/script/basic/NASHORN-168.js
index 5bdb70341c7..138c35271a1 100644
--- a/nashorn/test/script/basic/NASHORN-168.js
+++ b/nashorn/test/script/basic/NASHORN-168.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-169.js b/nashorn/test/script/basic/NASHORN-169.js
index 51a5b10141d..4da52763add 100644
--- a/nashorn/test/script/basic/NASHORN-169.js
+++ b/nashorn/test/script/basic/NASHORN-169.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-172.js b/nashorn/test/script/basic/NASHORN-172.js
index 1db2a85e761..607642fc578 100644
--- a/nashorn/test/script/basic/NASHORN-172.js
+++ b/nashorn/test/script/basic/NASHORN-172.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-173.js b/nashorn/test/script/basic/NASHORN-173.js
index 7c5ae8c5f87..1ee89f31798 100644
--- a/nashorn/test/script/basic/NASHORN-173.js
+++ b/nashorn/test/script/basic/NASHORN-173.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-174.js b/nashorn/test/script/basic/NASHORN-174.js
index 4483afcfa06..e56c25832f2 100644
--- a/nashorn/test/script/basic/NASHORN-174.js
+++ b/nashorn/test/script/basic/NASHORN-174.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-175.js b/nashorn/test/script/basic/NASHORN-175.js
index 6843e7afc92..be60d12487a 100644
--- a/nashorn/test/script/basic/NASHORN-175.js
+++ b/nashorn/test/script/basic/NASHORN-175.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-176.js b/nashorn/test/script/basic/NASHORN-176.js
index 410a825321f..672362d44d0 100644
--- a/nashorn/test/script/basic/NASHORN-176.js
+++ b/nashorn/test/script/basic/NASHORN-176.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-177.js b/nashorn/test/script/basic/NASHORN-177.js
index 591c9acfec8..024a9d17433 100644
--- a/nashorn/test/script/basic/NASHORN-177.js
+++ b/nashorn/test/script/basic/NASHORN-177.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-178.js b/nashorn/test/script/basic/NASHORN-178.js
index 7547ce720fc..4e1a91903bd 100644
--- a/nashorn/test/script/basic/NASHORN-178.js
+++ b/nashorn/test/script/basic/NASHORN-178.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-179.js b/nashorn/test/script/basic/NASHORN-179.js
index df6b609d2b0..d0b50ea8ce0 100644
--- a/nashorn/test/script/basic/NASHORN-179.js
+++ b/nashorn/test/script/basic/NASHORN-179.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-18.js b/nashorn/test/script/basic/NASHORN-18.js
index 4478d0858b0..50115c9c96c 100644
--- a/nashorn/test/script/basic/NASHORN-18.js
+++ b/nashorn/test/script/basic/NASHORN-18.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-181.js b/nashorn/test/script/basic/NASHORN-181.js
index d2b93c9f4a6..0ad8da5124c 100644
--- a/nashorn/test/script/basic/NASHORN-181.js
+++ b/nashorn/test/script/basic/NASHORN-181.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-182.js b/nashorn/test/script/basic/NASHORN-182.js
index b989f29632d..0e908dd493c 100644
--- a/nashorn/test/script/basic/NASHORN-182.js
+++ b/nashorn/test/script/basic/NASHORN-182.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-183.js b/nashorn/test/script/basic/NASHORN-183.js
index 2dec08e97ec..c90e7ba501f 100644
--- a/nashorn/test/script/basic/NASHORN-183.js
+++ b/nashorn/test/script/basic/NASHORN-183.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-184.js b/nashorn/test/script/basic/NASHORN-184.js
index fa37d5a1f83..d1524b9ff49 100644
--- a/nashorn/test/script/basic/NASHORN-184.js
+++ b/nashorn/test/script/basic/NASHORN-184.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-185.js b/nashorn/test/script/basic/NASHORN-185.js
index 81055e0eef3..508b5b309d5 100644
--- a/nashorn/test/script/basic/NASHORN-185.js
+++ b/nashorn/test/script/basic/NASHORN-185.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-187.js b/nashorn/test/script/basic/NASHORN-187.js
index 1686a012ba6..7238ecf7ce2 100644
--- a/nashorn/test/script/basic/NASHORN-187.js
+++ b/nashorn/test/script/basic/NASHORN-187.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-188.js b/nashorn/test/script/basic/NASHORN-188.js
index 9a64995ccf2..ce727139fd4 100644
--- a/nashorn/test/script/basic/NASHORN-188.js
+++ b/nashorn/test/script/basic/NASHORN-188.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-19.js b/nashorn/test/script/basic/NASHORN-19.js
index f45df164ebd..71a2db0df67 100644
--- a/nashorn/test/script/basic/NASHORN-19.js
+++ b/nashorn/test/script/basic/NASHORN-19.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-190.js b/nashorn/test/script/basic/NASHORN-190.js
index 5d1157c6b8b..06e51a3c105 100644
--- a/nashorn/test/script/basic/NASHORN-190.js
+++ b/nashorn/test/script/basic/NASHORN-190.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-192.js b/nashorn/test/script/basic/NASHORN-192.js
index 7f1f87c7480..8fdc82b6b2b 100644
--- a/nashorn/test/script/basic/NASHORN-192.js
+++ b/nashorn/test/script/basic/NASHORN-192.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-194.js b/nashorn/test/script/basic/NASHORN-194.js
index 2615d1c30c8..bbbc1945b6a 100644
--- a/nashorn/test/script/basic/NASHORN-194.js
+++ b/nashorn/test/script/basic/NASHORN-194.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-196.js b/nashorn/test/script/basic/NASHORN-196.js
index ce92f6de77e..071da970212 100644
--- a/nashorn/test/script/basic/NASHORN-196.js
+++ b/nashorn/test/script/basic/NASHORN-196.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-198.js b/nashorn/test/script/basic/NASHORN-198.js
index a2df804af25..ea99a3be67b 100644
--- a/nashorn/test/script/basic/NASHORN-198.js
+++ b/nashorn/test/script/basic/NASHORN-198.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-20.js b/nashorn/test/script/basic/NASHORN-20.js
index c2a09359e80..b0d6cc90a17 100644
--- a/nashorn/test/script/basic/NASHORN-20.js
+++ b/nashorn/test/script/basic/NASHORN-20.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-201.js b/nashorn/test/script/basic/NASHORN-201.js
index 92e8ad08126..11bcf27268b 100644
--- a/nashorn/test/script/basic/NASHORN-201.js
+++ b/nashorn/test/script/basic/NASHORN-201.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-202.js b/nashorn/test/script/basic/NASHORN-202.js
index 521c3544b4b..53c7fb1223d 100644
--- a/nashorn/test/script/basic/NASHORN-202.js
+++ b/nashorn/test/script/basic/NASHORN-202.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-203.js b/nashorn/test/script/basic/NASHORN-203.js
index 4d626b9d22b..94acb3e1d50 100644
--- a/nashorn/test/script/basic/NASHORN-203.js
+++ b/nashorn/test/script/basic/NASHORN-203.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-204.js b/nashorn/test/script/basic/NASHORN-204.js
index 3a1c5340c0b..98dedbaa558 100644
--- a/nashorn/test/script/basic/NASHORN-204.js
+++ b/nashorn/test/script/basic/NASHORN-204.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-205.js b/nashorn/test/script/basic/NASHORN-205.js
index af36c7d2008..15bb3894e33 100644
--- a/nashorn/test/script/basic/NASHORN-205.js
+++ b/nashorn/test/script/basic/NASHORN-205.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-206.js b/nashorn/test/script/basic/NASHORN-206.js
index ebcf8311f35..537a9903fcb 100644
--- a/nashorn/test/script/basic/NASHORN-206.js
+++ b/nashorn/test/script/basic/NASHORN-206.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-207.js b/nashorn/test/script/basic/NASHORN-207.js
index 4a2f3bdc926..b337ce3f47e 100644
--- a/nashorn/test/script/basic/NASHORN-207.js
+++ b/nashorn/test/script/basic/NASHORN-207.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-207_2.js b/nashorn/test/script/basic/NASHORN-207_2.js
index af8e8dcd295..681a3c28b72 100644
--- a/nashorn/test/script/basic/NASHORN-207_2.js
+++ b/nashorn/test/script/basic/NASHORN-207_2.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-208.js b/nashorn/test/script/basic/NASHORN-208.js
index 6e2c78af033..f7b28613b47 100644
--- a/nashorn/test/script/basic/NASHORN-208.js
+++ b/nashorn/test/script/basic/NASHORN-208.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-209.js b/nashorn/test/script/basic/NASHORN-209.js
index 0cfcf6a7123..9fa781ce788 100644
--- a/nashorn/test/script/basic/NASHORN-209.js
+++ b/nashorn/test/script/basic/NASHORN-209.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-21.js b/nashorn/test/script/basic/NASHORN-21.js
index 106c19a7537..14db4dc53c9 100644
--- a/nashorn/test/script/basic/NASHORN-21.js
+++ b/nashorn/test/script/basic/NASHORN-21.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-211.js b/nashorn/test/script/basic/NASHORN-211.js
index a24e32821e0..681caad9171 100644
--- a/nashorn/test/script/basic/NASHORN-211.js
+++ b/nashorn/test/script/basic/NASHORN-211.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-212.js b/nashorn/test/script/basic/NASHORN-212.js
index 9e3287d43d3..681c775628e 100644
--- a/nashorn/test/script/basic/NASHORN-212.js
+++ b/nashorn/test/script/basic/NASHORN-212.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-213.js b/nashorn/test/script/basic/NASHORN-213.js
index 24e2440d2ec..03a37d9fa6c 100644
--- a/nashorn/test/script/basic/NASHORN-213.js
+++ b/nashorn/test/script/basic/NASHORN-213.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-215.js b/nashorn/test/script/basic/NASHORN-215.js
index d09e751af1b..53ff42e114e 100644
--- a/nashorn/test/script/basic/NASHORN-215.js
+++ b/nashorn/test/script/basic/NASHORN-215.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-216.js b/nashorn/test/script/basic/NASHORN-216.js
index 187107dd2de..e9b1aee69d8 100644
--- a/nashorn/test/script/basic/NASHORN-216.js
+++ b/nashorn/test/script/basic/NASHORN-216.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-217.js b/nashorn/test/script/basic/NASHORN-217.js
index 3c400580644..3885c70d60d 100644
--- a/nashorn/test/script/basic/NASHORN-217.js
+++ b/nashorn/test/script/basic/NASHORN-217.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-219.js b/nashorn/test/script/basic/NASHORN-219.js
index 68d551c3862..b7da209ba59 100644
--- a/nashorn/test/script/basic/NASHORN-219.js
+++ b/nashorn/test/script/basic/NASHORN-219.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-22.js b/nashorn/test/script/basic/NASHORN-22.js
index 14420c83a44..89f677caabd 100644
--- a/nashorn/test/script/basic/NASHORN-22.js
+++ b/nashorn/test/script/basic/NASHORN-22.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-221.js b/nashorn/test/script/basic/NASHORN-221.js
index 80a699b74a5..87132bce93c 100644
--- a/nashorn/test/script/basic/NASHORN-221.js
+++ b/nashorn/test/script/basic/NASHORN-221.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-222.js b/nashorn/test/script/basic/NASHORN-222.js
index 7a7f995aff7..a5a61f07c69 100644
--- a/nashorn/test/script/basic/NASHORN-222.js
+++ b/nashorn/test/script/basic/NASHORN-222.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-223.js b/nashorn/test/script/basic/NASHORN-223.js
index 1607450025d..dd862d5dc14 100644
--- a/nashorn/test/script/basic/NASHORN-223.js
+++ b/nashorn/test/script/basic/NASHORN-223.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-225.js b/nashorn/test/script/basic/NASHORN-225.js
index 3aa67a417e5..c7744c34361 100644
--- a/nashorn/test/script/basic/NASHORN-225.js
+++ b/nashorn/test/script/basic/NASHORN-225.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-226.js b/nashorn/test/script/basic/NASHORN-226.js
index e279369ff58..521c3a6d381 100644
--- a/nashorn/test/script/basic/NASHORN-226.js
+++ b/nashorn/test/script/basic/NASHORN-226.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-227.js b/nashorn/test/script/basic/NASHORN-227.js
index e1b3a9744ab..787bdfa38f9 100644
--- a/nashorn/test/script/basic/NASHORN-227.js
+++ b/nashorn/test/script/basic/NASHORN-227.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-228.js b/nashorn/test/script/basic/NASHORN-228.js
index 6c268ab7ce7..bb3bd8b5d6d 100644
--- a/nashorn/test/script/basic/NASHORN-228.js
+++ b/nashorn/test/script/basic/NASHORN-228.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-229.js b/nashorn/test/script/basic/NASHORN-229.js
index 0af7bbfaa0e..fefc3188e3d 100644
--- a/nashorn/test/script/basic/NASHORN-229.js
+++ b/nashorn/test/script/basic/NASHORN-229.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-229_subtest.js b/nashorn/test/script/basic/NASHORN-229_subtest.js
index c394bd750a8..a722a98b7de 100644
--- a/nashorn/test/script/basic/NASHORN-229_subtest.js
+++ b/nashorn/test/script/basic/NASHORN-229_subtest.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-23.js b/nashorn/test/script/basic/NASHORN-23.js
index 3ce79ecbfaf..eab229e6043 100644
--- a/nashorn/test/script/basic/NASHORN-23.js
+++ b/nashorn/test/script/basic/NASHORN-23.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-232.js b/nashorn/test/script/basic/NASHORN-232.js
index 07cd03dac9a..a2033bac6aa 100644
--- a/nashorn/test/script/basic/NASHORN-232.js
+++ b/nashorn/test/script/basic/NASHORN-232.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-234.js b/nashorn/test/script/basic/NASHORN-234.js
index 2460b7bed7c..87fec55c6d5 100644
--- a/nashorn/test/script/basic/NASHORN-234.js
+++ b/nashorn/test/script/basic/NASHORN-234.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-235.js b/nashorn/test/script/basic/NASHORN-235.js
index 65807f2ce2a..f01d3f469c2 100644
--- a/nashorn/test/script/basic/NASHORN-235.js
+++ b/nashorn/test/script/basic/NASHORN-235.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-236.js b/nashorn/test/script/basic/NASHORN-236.js
index 394713e63df..5fdb7f88ed8 100644
--- a/nashorn/test/script/basic/NASHORN-236.js
+++ b/nashorn/test/script/basic/NASHORN-236.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-237.js b/nashorn/test/script/basic/NASHORN-237.js
index aecdf44fcaa..37b07b34d5c 100644
--- a/nashorn/test/script/basic/NASHORN-237.js
+++ b/nashorn/test/script/basic/NASHORN-237.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-239.js b/nashorn/test/script/basic/NASHORN-239.js
index 9c78b50c7e8..ca94bccbaa1 100644
--- a/nashorn/test/script/basic/NASHORN-239.js
+++ b/nashorn/test/script/basic/NASHORN-239.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-24.js b/nashorn/test/script/basic/NASHORN-24.js
index eb38081b154..9f4f66d1611 100644
--- a/nashorn/test/script/basic/NASHORN-24.js
+++ b/nashorn/test/script/basic/NASHORN-24.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-241.js b/nashorn/test/script/basic/NASHORN-241.js
index 21b63fc3ad6..7d887a62d4a 100644
--- a/nashorn/test/script/basic/NASHORN-241.js
+++ b/nashorn/test/script/basic/NASHORN-241.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-242.js b/nashorn/test/script/basic/NASHORN-242.js
index a9fc805c7b8..3e362bc2b7a 100644
--- a/nashorn/test/script/basic/NASHORN-242.js
+++ b/nashorn/test/script/basic/NASHORN-242.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-245.js b/nashorn/test/script/basic/NASHORN-245.js
index d15559c34d6..ced3e39cc7a 100644
--- a/nashorn/test/script/basic/NASHORN-245.js
+++ b/nashorn/test/script/basic/NASHORN-245.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-247.js b/nashorn/test/script/basic/NASHORN-247.js
index 94befc936c9..b05db7eaa65 100644
--- a/nashorn/test/script/basic/NASHORN-247.js
+++ b/nashorn/test/script/basic/NASHORN-247.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-25.js b/nashorn/test/script/basic/NASHORN-25.js
index c669b05e6ef..0d40ffe1adb 100644
--- a/nashorn/test/script/basic/NASHORN-25.js
+++ b/nashorn/test/script/basic/NASHORN-25.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-251.js b/nashorn/test/script/basic/NASHORN-251.js
index 921671b799c..bc5147f136b 100644
--- a/nashorn/test/script/basic/NASHORN-251.js
+++ b/nashorn/test/script/basic/NASHORN-251.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-252.js b/nashorn/test/script/basic/NASHORN-252.js
index fa17be8a2b4..5e0a652feed 100644
--- a/nashorn/test/script/basic/NASHORN-252.js
+++ b/nashorn/test/script/basic/NASHORN-252.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-253.js b/nashorn/test/script/basic/NASHORN-253.js
index e52d7c5872d..f562c97fe5b 100644
--- a/nashorn/test/script/basic/NASHORN-253.js
+++ b/nashorn/test/script/basic/NASHORN-253.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-256.js b/nashorn/test/script/basic/NASHORN-256.js
index c043b34a7b6..1885873db1b 100644
--- a/nashorn/test/script/basic/NASHORN-256.js
+++ b/nashorn/test/script/basic/NASHORN-256.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-258.js b/nashorn/test/script/basic/NASHORN-258.js
index 1fc7466a908..0f4f674b6be 100644
--- a/nashorn/test/script/basic/NASHORN-258.js
+++ b/nashorn/test/script/basic/NASHORN-258.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-26.js b/nashorn/test/script/basic/NASHORN-26.js
index 6f2b4e323ce..d4525a36f72 100644
--- a/nashorn/test/script/basic/NASHORN-26.js
+++ b/nashorn/test/script/basic/NASHORN-26.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-260.js b/nashorn/test/script/basic/NASHORN-260.js
index 24710552d18..d1f1fcc5d5b 100644
--- a/nashorn/test/script/basic/NASHORN-260.js
+++ b/nashorn/test/script/basic/NASHORN-260.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-261.js b/nashorn/test/script/basic/NASHORN-261.js
index 26167b67e23..c53facfea6e 100644
--- a/nashorn/test/script/basic/NASHORN-261.js
+++ b/nashorn/test/script/basic/NASHORN-261.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-262.js b/nashorn/test/script/basic/NASHORN-262.js
index 7c4dd7e1638..42eba1c78e3 100644
--- a/nashorn/test/script/basic/NASHORN-262.js
+++ b/nashorn/test/script/basic/NASHORN-262.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-263.js b/nashorn/test/script/basic/NASHORN-263.js
index 4dc461bdfc7..62ce47bf09a 100644
--- a/nashorn/test/script/basic/NASHORN-263.js
+++ b/nashorn/test/script/basic/NASHORN-263.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-264.js b/nashorn/test/script/basic/NASHORN-264.js
index fd5b8d53401..88cd2b3edd8 100644
--- a/nashorn/test/script/basic/NASHORN-264.js
+++ b/nashorn/test/script/basic/NASHORN-264.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-265.js b/nashorn/test/script/basic/NASHORN-265.js
index 566e5b49c3e..88344f59c92 100644
--- a/nashorn/test/script/basic/NASHORN-265.js
+++ b/nashorn/test/script/basic/NASHORN-265.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-266.js b/nashorn/test/script/basic/NASHORN-266.js
index 006440e41bf..bfc600f94f2 100644
--- a/nashorn/test/script/basic/NASHORN-266.js
+++ b/nashorn/test/script/basic/NASHORN-266.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-269.js b/nashorn/test/script/basic/NASHORN-269.js
index ba9754918e0..92feb76ad0e 100644
--- a/nashorn/test/script/basic/NASHORN-269.js
+++ b/nashorn/test/script/basic/NASHORN-269.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-27.js b/nashorn/test/script/basic/NASHORN-27.js
index 5f285f354d3..b949b3406b2 100644
--- a/nashorn/test/script/basic/NASHORN-27.js
+++ b/nashorn/test/script/basic/NASHORN-27.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-270.js b/nashorn/test/script/basic/NASHORN-270.js
index cc6519e60b2..89ef0d8058f 100644
--- a/nashorn/test/script/basic/NASHORN-270.js
+++ b/nashorn/test/script/basic/NASHORN-270.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-271.js b/nashorn/test/script/basic/NASHORN-271.js
index 940a87e1e14..75c480df312 100644
--- a/nashorn/test/script/basic/NASHORN-271.js
+++ b/nashorn/test/script/basic/NASHORN-271.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-275.js b/nashorn/test/script/basic/NASHORN-275.js
index e6d3cf46fac..46c88fe09d6 100644
--- a/nashorn/test/script/basic/NASHORN-275.js
+++ b/nashorn/test/script/basic/NASHORN-275.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-276.js b/nashorn/test/script/basic/NASHORN-276.js
index 56294cb257c..3bce88f01bf 100644
--- a/nashorn/test/script/basic/NASHORN-276.js
+++ b/nashorn/test/script/basic/NASHORN-276.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-277.js b/nashorn/test/script/basic/NASHORN-277.js
index f44d61af2f2..38724b30503 100644
--- a/nashorn/test/script/basic/NASHORN-277.js
+++ b/nashorn/test/script/basic/NASHORN-277.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-278.js b/nashorn/test/script/basic/NASHORN-278.js
index 1180d001095..c8bf46ed46f 100644
--- a/nashorn/test/script/basic/NASHORN-278.js
+++ b/nashorn/test/script/basic/NASHORN-278.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-28.js b/nashorn/test/script/basic/NASHORN-28.js
index df366cffef5..dc964c3872e 100644
--- a/nashorn/test/script/basic/NASHORN-28.js
+++ b/nashorn/test/script/basic/NASHORN-28.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-281.js b/nashorn/test/script/basic/NASHORN-281.js
index 45e5e6b85f8..77abe810e9b 100644
--- a/nashorn/test/script/basic/NASHORN-281.js
+++ b/nashorn/test/script/basic/NASHORN-281.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-284.js b/nashorn/test/script/basic/NASHORN-284.js
index cffe998bd27..41f210ee6c2 100644
--- a/nashorn/test/script/basic/NASHORN-284.js
+++ b/nashorn/test/script/basic/NASHORN-284.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-285.js b/nashorn/test/script/basic/NASHORN-285.js
index 1b77339fc82..a7d586e65b2 100644
--- a/nashorn/test/script/basic/NASHORN-285.js
+++ b/nashorn/test/script/basic/NASHORN-285.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-288.js b/nashorn/test/script/basic/NASHORN-288.js
index 23005fd934d..b0c43a92965 100644
--- a/nashorn/test/script/basic/NASHORN-288.js
+++ b/nashorn/test/script/basic/NASHORN-288.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-29.js b/nashorn/test/script/basic/NASHORN-29.js
index a5f48d69ffd..2455fa96c5f 100644
--- a/nashorn/test/script/basic/NASHORN-29.js
+++ b/nashorn/test/script/basic/NASHORN-29.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-293.js b/nashorn/test/script/basic/NASHORN-293.js
index e6f374928d4..cd83ec468c9 100644
--- a/nashorn/test/script/basic/NASHORN-293.js
+++ b/nashorn/test/script/basic/NASHORN-293.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-294.js b/nashorn/test/script/basic/NASHORN-294.js
index 7b9030b70ea..5de3f906ccc 100644
--- a/nashorn/test/script/basic/NASHORN-294.js
+++ b/nashorn/test/script/basic/NASHORN-294.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-296.js b/nashorn/test/script/basic/NASHORN-296.js
index b24a8ee56d1..cbb752fbcaa 100644
--- a/nashorn/test/script/basic/NASHORN-296.js
+++ b/nashorn/test/script/basic/NASHORN-296.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-297.js b/nashorn/test/script/basic/NASHORN-297.js
index 1cf3fcbb0d0..5486a132b05 100644
--- a/nashorn/test/script/basic/NASHORN-297.js
+++ b/nashorn/test/script/basic/NASHORN-297.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-30.js b/nashorn/test/script/basic/NASHORN-30.js
index a4c6c2d42b1..95676cf3ab4 100644
--- a/nashorn/test/script/basic/NASHORN-30.js
+++ b/nashorn/test/script/basic/NASHORN-30.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-300.js b/nashorn/test/script/basic/NASHORN-300.js
index 2070fa49797..fce230a2f97 100644
--- a/nashorn/test/script/basic/NASHORN-300.js
+++ b/nashorn/test/script/basic/NASHORN-300.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-301.js b/nashorn/test/script/basic/NASHORN-301.js
index 8594b82b489..b00b78dd7e5 100644
--- a/nashorn/test/script/basic/NASHORN-301.js
+++ b/nashorn/test/script/basic/NASHORN-301.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-304.js b/nashorn/test/script/basic/NASHORN-304.js
index 3f3e52f78b7..4d740e09383 100644
--- a/nashorn/test/script/basic/NASHORN-304.js
+++ b/nashorn/test/script/basic/NASHORN-304.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-310.js b/nashorn/test/script/basic/NASHORN-310.js
index 4dc70c7d726..c49c2b4e480 100644
--- a/nashorn/test/script/basic/NASHORN-310.js
+++ b/nashorn/test/script/basic/NASHORN-310.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-318.js b/nashorn/test/script/basic/NASHORN-318.js
index 411631ccc43..209a6bd4d0d 100644
--- a/nashorn/test/script/basic/NASHORN-318.js
+++ b/nashorn/test/script/basic/NASHORN-318.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-32.js b/nashorn/test/script/basic/NASHORN-32.js
index fa884e00665..0fd625b6d08 100644
--- a/nashorn/test/script/basic/NASHORN-32.js
+++ b/nashorn/test/script/basic/NASHORN-32.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-321.js b/nashorn/test/script/basic/NASHORN-321.js
index d34e873aba2..9510c175e24 100644
--- a/nashorn/test/script/basic/NASHORN-321.js
+++ b/nashorn/test/script/basic/NASHORN-321.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-323.js b/nashorn/test/script/basic/NASHORN-323.js
index 41ba7222555..c1715c0f969 100644
--- a/nashorn/test/script/basic/NASHORN-323.js
+++ b/nashorn/test/script/basic/NASHORN-323.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-324.js b/nashorn/test/script/basic/NASHORN-324.js
index 181cde31e81..11aa51cc6d2 100644
--- a/nashorn/test/script/basic/NASHORN-324.js
+++ b/nashorn/test/script/basic/NASHORN-324.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-33.js b/nashorn/test/script/basic/NASHORN-33.js
index 13ba60f1e04..2ed87e4aad5 100644
--- a/nashorn/test/script/basic/NASHORN-33.js
+++ b/nashorn/test/script/basic/NASHORN-33.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-331.js b/nashorn/test/script/basic/NASHORN-331.js
index 5294a2d60bc..41ce5294a22 100644
--- a/nashorn/test/script/basic/NASHORN-331.js
+++ b/nashorn/test/script/basic/NASHORN-331.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-337.js b/nashorn/test/script/basic/NASHORN-337.js
index 1a5efbe87e4..dc8bac1db74 100644
--- a/nashorn/test/script/basic/NASHORN-337.js
+++ b/nashorn/test/script/basic/NASHORN-337.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-34.js b/nashorn/test/script/basic/NASHORN-34.js
index 78f823206f5..267768df259 100644
--- a/nashorn/test/script/basic/NASHORN-34.js
+++ b/nashorn/test/script/basic/NASHORN-34.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-340.js b/nashorn/test/script/basic/NASHORN-340.js
index 811924334fd..c20ceabf3b0 100644
--- a/nashorn/test/script/basic/NASHORN-340.js
+++ b/nashorn/test/script/basic/NASHORN-340.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-349.js b/nashorn/test/script/basic/NASHORN-349.js
index 982cca83f9e..a611a5899cf 100644
--- a/nashorn/test/script/basic/NASHORN-349.js
+++ b/nashorn/test/script/basic/NASHORN-349.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-354.js b/nashorn/test/script/basic/NASHORN-354.js
index 658cc86a435..506a03241c4 100644
--- a/nashorn/test/script/basic/NASHORN-354.js
+++ b/nashorn/test/script/basic/NASHORN-354.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-355.js b/nashorn/test/script/basic/NASHORN-355.js
index 135e1634942..f0360726ab4 100644
--- a/nashorn/test/script/basic/NASHORN-355.js
+++ b/nashorn/test/script/basic/NASHORN-355.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-36.js b/nashorn/test/script/basic/NASHORN-36.js
index ffe6e2363fe..3a8a0c97cb2 100644
--- a/nashorn/test/script/basic/NASHORN-36.js
+++ b/nashorn/test/script/basic/NASHORN-36.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-365.js b/nashorn/test/script/basic/NASHORN-365.js
index 857c09390d7..fe79e8c34f5 100644
--- a/nashorn/test/script/basic/NASHORN-365.js
+++ b/nashorn/test/script/basic/NASHORN-365.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-366.js b/nashorn/test/script/basic/NASHORN-366.js
index 69f99ece3fc..fae219bd22b 100644
--- a/nashorn/test/script/basic/NASHORN-366.js
+++ b/nashorn/test/script/basic/NASHORN-366.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-368.js b/nashorn/test/script/basic/NASHORN-368.js
index 6799e5f96dd..a1b1ba20d2d 100644
--- a/nashorn/test/script/basic/NASHORN-368.js
+++ b/nashorn/test/script/basic/NASHORN-368.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-37.js b/nashorn/test/script/basic/NASHORN-37.js
index e15eb85fb4b..74ee037d98e 100644
--- a/nashorn/test/script/basic/NASHORN-37.js
+++ b/nashorn/test/script/basic/NASHORN-37.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-375.js b/nashorn/test/script/basic/NASHORN-375.js
index 055b94e737c..6f841489e70 100644
--- a/nashorn/test/script/basic/NASHORN-375.js
+++ b/nashorn/test/script/basic/NASHORN-375.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-376.js b/nashorn/test/script/basic/NASHORN-376.js
index ef16f18175f..37aa3450b7d 100644
--- a/nashorn/test/script/basic/NASHORN-376.js
+++ b/nashorn/test/script/basic/NASHORN-376.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-377.js b/nashorn/test/script/basic/NASHORN-377.js
index 12edc91153e..e77be2bf0e9 100644
--- a/nashorn/test/script/basic/NASHORN-377.js
+++ b/nashorn/test/script/basic/NASHORN-377.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-378.js b/nashorn/test/script/basic/NASHORN-378.js
index 61387c6bc99..0bf2a749dcd 100644
--- a/nashorn/test/script/basic/NASHORN-378.js
+++ b/nashorn/test/script/basic/NASHORN-378.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-38.js b/nashorn/test/script/basic/NASHORN-38.js
index f0c8406a599..b02ecf7f380 100644
--- a/nashorn/test/script/basic/NASHORN-38.js
+++ b/nashorn/test/script/basic/NASHORN-38.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-380.js b/nashorn/test/script/basic/NASHORN-380.js
index acbd683bfe0..e41380ec288 100644
--- a/nashorn/test/script/basic/NASHORN-380.js
+++ b/nashorn/test/script/basic/NASHORN-380.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-381.js b/nashorn/test/script/basic/NASHORN-381.js
index ec1dd398e54..53237faff3b 100644
--- a/nashorn/test/script/basic/NASHORN-381.js
+++ b/nashorn/test/script/basic/NASHORN-381.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-382.js b/nashorn/test/script/basic/NASHORN-382.js
index 65a039b305e..71ab3a55102 100644
--- a/nashorn/test/script/basic/NASHORN-382.js
+++ b/nashorn/test/script/basic/NASHORN-382.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-383.js b/nashorn/test/script/basic/NASHORN-383.js
index b936826987c..ae1a06ecbe1 100644
--- a/nashorn/test/script/basic/NASHORN-383.js
+++ b/nashorn/test/script/basic/NASHORN-383.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-384.js b/nashorn/test/script/basic/NASHORN-384.js
index e62cd52ca9b..4c40050294a 100644
--- a/nashorn/test/script/basic/NASHORN-384.js
+++ b/nashorn/test/script/basic/NASHORN-384.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-385.js b/nashorn/test/script/basic/NASHORN-385.js
index 6556e4e6bbf..27b328e9490 100644
--- a/nashorn/test/script/basic/NASHORN-385.js
+++ b/nashorn/test/script/basic/NASHORN-385.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-389.js b/nashorn/test/script/basic/NASHORN-389.js
index d402a5dd5b0..71f9731c928 100644
--- a/nashorn/test/script/basic/NASHORN-389.js
+++ b/nashorn/test/script/basic/NASHORN-389.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-393.js b/nashorn/test/script/basic/NASHORN-393.js
index e12a58b22a7..80f4083b8f7 100644
--- a/nashorn/test/script/basic/NASHORN-393.js
+++ b/nashorn/test/script/basic/NASHORN-393.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-394.js b/nashorn/test/script/basic/NASHORN-394.js
index dc99a0850fc..a265f169498 100644
--- a/nashorn/test/script/basic/NASHORN-394.js
+++ b/nashorn/test/script/basic/NASHORN-394.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-396.js b/nashorn/test/script/basic/NASHORN-396.js
index a85fa1d07b6..46bcf775d43 100644
--- a/nashorn/test/script/basic/NASHORN-396.js
+++ b/nashorn/test/script/basic/NASHORN-396.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-397.js b/nashorn/test/script/basic/NASHORN-397.js
index bf73dc28614..6bd55bf32ab 100644
--- a/nashorn/test/script/basic/NASHORN-397.js
+++ b/nashorn/test/script/basic/NASHORN-397.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-398.js b/nashorn/test/script/basic/NASHORN-398.js
index 6c3528612d7..6a0535f698d 100644
--- a/nashorn/test/script/basic/NASHORN-398.js
+++ b/nashorn/test/script/basic/NASHORN-398.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-40.js b/nashorn/test/script/basic/NASHORN-40.js
index f02a6eda2b7..f031730bd53 100644
--- a/nashorn/test/script/basic/NASHORN-40.js
+++ b/nashorn/test/script/basic/NASHORN-40.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-400.js b/nashorn/test/script/basic/NASHORN-400.js
index 5ae1b8ad6da..eabb8adf878 100644
--- a/nashorn/test/script/basic/NASHORN-400.js
+++ b/nashorn/test/script/basic/NASHORN-400.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-401.js b/nashorn/test/script/basic/NASHORN-401.js
index 0cee1cec33a..b795dadb3b1 100644
--- a/nashorn/test/script/basic/NASHORN-401.js
+++ b/nashorn/test/script/basic/NASHORN-401.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-402.js b/nashorn/test/script/basic/NASHORN-402.js
index 042bb4a8bcb..33c02a19299 100644
--- a/nashorn/test/script/basic/NASHORN-402.js
+++ b/nashorn/test/script/basic/NASHORN-402.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-404.js b/nashorn/test/script/basic/NASHORN-404.js
index 9a57041570e..672fe89c156 100644
--- a/nashorn/test/script/basic/NASHORN-404.js
+++ b/nashorn/test/script/basic/NASHORN-404.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-405.js b/nashorn/test/script/basic/NASHORN-405.js
index 8f4c449a68f..c1049243f45 100644
--- a/nashorn/test/script/basic/NASHORN-405.js
+++ b/nashorn/test/script/basic/NASHORN-405.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-406.js b/nashorn/test/script/basic/NASHORN-406.js
index 9089439d43a..a1f362fe20b 100644
--- a/nashorn/test/script/basic/NASHORN-406.js
+++ b/nashorn/test/script/basic/NASHORN-406.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-408.js b/nashorn/test/script/basic/NASHORN-408.js
index a25a669d1ed..1c3375c368d 100644
--- a/nashorn/test/script/basic/NASHORN-408.js
+++ b/nashorn/test/script/basic/NASHORN-408.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-415.js b/nashorn/test/script/basic/NASHORN-415.js
index 9dff33770aa..6f29f1a17c8 100644
--- a/nashorn/test/script/basic/NASHORN-415.js
+++ b/nashorn/test/script/basic/NASHORN-415.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-416.js b/nashorn/test/script/basic/NASHORN-416.js
index 5b557271544..387629a74e6 100644
--- a/nashorn/test/script/basic/NASHORN-416.js
+++ b/nashorn/test/script/basic/NASHORN-416.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-417.js b/nashorn/test/script/basic/NASHORN-417.js
index db803696cd9..6148f060609 100644
--- a/nashorn/test/script/basic/NASHORN-417.js
+++ b/nashorn/test/script/basic/NASHORN-417.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-418.js b/nashorn/test/script/basic/NASHORN-418.js
index 9ecea634f10..b42bd832468 100644
--- a/nashorn/test/script/basic/NASHORN-418.js
+++ b/nashorn/test/script/basic/NASHORN-418.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-420.js b/nashorn/test/script/basic/NASHORN-420.js
index 8b8bf4b08bb..741b940e843 100644
--- a/nashorn/test/script/basic/NASHORN-420.js
+++ b/nashorn/test/script/basic/NASHORN-420.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-421.js b/nashorn/test/script/basic/NASHORN-421.js
index 057b6442c3b..3a81fe64f8e 100644
--- a/nashorn/test/script/basic/NASHORN-421.js
+++ b/nashorn/test/script/basic/NASHORN-421.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-423.js b/nashorn/test/script/basic/NASHORN-423.js
index 37f1cbe7e40..7fa1b00b506 100644
--- a/nashorn/test/script/basic/NASHORN-423.js
+++ b/nashorn/test/script/basic/NASHORN-423.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-423a.js b/nashorn/test/script/basic/NASHORN-423a.js
index e68209fe022..bbab24f1446 100644
--- a/nashorn/test/script/basic/NASHORN-423a.js
+++ b/nashorn/test/script/basic/NASHORN-423a.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-424.js b/nashorn/test/script/basic/NASHORN-424.js
index ea3bb52894c..1bcbe19d929 100644
--- a/nashorn/test/script/basic/NASHORN-424.js
+++ b/nashorn/test/script/basic/NASHORN-424.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-425.js b/nashorn/test/script/basic/NASHORN-425.js
index 513faab1c99..c81aea2c4d5 100644
--- a/nashorn/test/script/basic/NASHORN-425.js
+++ b/nashorn/test/script/basic/NASHORN-425.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-426.js b/nashorn/test/script/basic/NASHORN-426.js
index bed81e2a3d5..2d4ee7e84e7 100644
--- a/nashorn/test/script/basic/NASHORN-426.js
+++ b/nashorn/test/script/basic/NASHORN-426.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-427.js b/nashorn/test/script/basic/NASHORN-427.js
index cf2d7de2308..0169ce86253 100644
--- a/nashorn/test/script/basic/NASHORN-427.js
+++ b/nashorn/test/script/basic/NASHORN-427.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-428.js b/nashorn/test/script/basic/NASHORN-428.js
index 6e66f099860..3d692d1bd4c 100644
--- a/nashorn/test/script/basic/NASHORN-428.js
+++ b/nashorn/test/script/basic/NASHORN-428.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-429.js b/nashorn/test/script/basic/NASHORN-429.js
index 209ba7f5b92..45917058d93 100644
--- a/nashorn/test/script/basic/NASHORN-429.js
+++ b/nashorn/test/script/basic/NASHORN-429.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-432.js b/nashorn/test/script/basic/NASHORN-432.js
index d67417e159e..d14ee73c0a5 100644
--- a/nashorn/test/script/basic/NASHORN-432.js
+++ b/nashorn/test/script/basic/NASHORN-432.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-433.js b/nashorn/test/script/basic/NASHORN-433.js
index b22c2f17d38..99b88a8e261 100644
--- a/nashorn/test/script/basic/NASHORN-433.js
+++ b/nashorn/test/script/basic/NASHORN-433.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-434.js b/nashorn/test/script/basic/NASHORN-434.js
index faf628fdec1..41374690546 100644
--- a/nashorn/test/script/basic/NASHORN-434.js
+++ b/nashorn/test/script/basic/NASHORN-434.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-435.js b/nashorn/test/script/basic/NASHORN-435.js
index c08452d8a6d..15d7bf00e93 100644
--- a/nashorn/test/script/basic/NASHORN-435.js
+++ b/nashorn/test/script/basic/NASHORN-435.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-437.js b/nashorn/test/script/basic/NASHORN-437.js
index 2da9cd54f46..cf23361c1cc 100644
--- a/nashorn/test/script/basic/NASHORN-437.js
+++ b/nashorn/test/script/basic/NASHORN-437.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-44.js b/nashorn/test/script/basic/NASHORN-44.js
index 4d49ac3f561..10b58c2dcb3 100644
--- a/nashorn/test/script/basic/NASHORN-44.js
+++ b/nashorn/test/script/basic/NASHORN-44.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-441.js b/nashorn/test/script/basic/NASHORN-441.js
index a24f71d7142..8c51ea98b5a 100644
--- a/nashorn/test/script/basic/NASHORN-441.js
+++ b/nashorn/test/script/basic/NASHORN-441.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-442.js b/nashorn/test/script/basic/NASHORN-442.js
index 7bcf54e8c57..9a5128a686a 100644
--- a/nashorn/test/script/basic/NASHORN-442.js
+++ b/nashorn/test/script/basic/NASHORN-442.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-443.js b/nashorn/test/script/basic/NASHORN-443.js
index 9587ebe01cb..ab9182074d7 100644
--- a/nashorn/test/script/basic/NASHORN-443.js
+++ b/nashorn/test/script/basic/NASHORN-443.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-444.js b/nashorn/test/script/basic/NASHORN-444.js
index 7df1a30f300..27811af62be 100644
--- a/nashorn/test/script/basic/NASHORN-444.js
+++ b/nashorn/test/script/basic/NASHORN-444.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-445.js b/nashorn/test/script/basic/NASHORN-445.js
index f8901e98dc9..89a1b721a5d 100644
--- a/nashorn/test/script/basic/NASHORN-445.js
+++ b/nashorn/test/script/basic/NASHORN-445.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-446.js b/nashorn/test/script/basic/NASHORN-446.js
index 5250f29121b..f8ba093c137 100644
--- a/nashorn/test/script/basic/NASHORN-446.js
+++ b/nashorn/test/script/basic/NASHORN-446.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-447.js b/nashorn/test/script/basic/NASHORN-447.js
index 03b4210af39..e817c7f65df 100644
--- a/nashorn/test/script/basic/NASHORN-447.js
+++ b/nashorn/test/script/basic/NASHORN-447.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-448.js b/nashorn/test/script/basic/NASHORN-448.js
index 96dd63b8309..a79adf9cbec 100644
--- a/nashorn/test/script/basic/NASHORN-448.js
+++ b/nashorn/test/script/basic/NASHORN-448.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-449.js b/nashorn/test/script/basic/NASHORN-449.js
index c64d6e210d2..ef7171a5f3f 100644
--- a/nashorn/test/script/basic/NASHORN-449.js
+++ b/nashorn/test/script/basic/NASHORN-449.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-45.js b/nashorn/test/script/basic/NASHORN-45.js
index b88c786b110..29105b7644a 100644
--- a/nashorn/test/script/basic/NASHORN-45.js
+++ b/nashorn/test/script/basic/NASHORN-45.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-450.js b/nashorn/test/script/basic/NASHORN-450.js
index c2b5b29f790..eb3776d70e9 100644
--- a/nashorn/test/script/basic/NASHORN-450.js
+++ b/nashorn/test/script/basic/NASHORN-450.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-452.js b/nashorn/test/script/basic/NASHORN-452.js
index c39bcc48c0d..aa2ef5c0736 100644
--- a/nashorn/test/script/basic/NASHORN-452.js
+++ b/nashorn/test/script/basic/NASHORN-452.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-459.js b/nashorn/test/script/basic/NASHORN-459.js
index f7d82c92a14..6d9258e3c74 100644
--- a/nashorn/test/script/basic/NASHORN-459.js
+++ b/nashorn/test/script/basic/NASHORN-459.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-46.js b/nashorn/test/script/basic/NASHORN-46.js
index 97b7bf0944a..a23a2a06d5f 100644
--- a/nashorn/test/script/basic/NASHORN-46.js
+++ b/nashorn/test/script/basic/NASHORN-46.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-462.js b/nashorn/test/script/basic/NASHORN-462.js
index c7b152da2ab..6cfbb831107 100644
--- a/nashorn/test/script/basic/NASHORN-462.js
+++ b/nashorn/test/script/basic/NASHORN-462.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-463.js b/nashorn/test/script/basic/NASHORN-463.js
index 9ccbe8a2d79..41ca3fb5174 100644
--- a/nashorn/test/script/basic/NASHORN-463.js
+++ b/nashorn/test/script/basic/NASHORN-463.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-468.js b/nashorn/test/script/basic/NASHORN-468.js
index 17c4c7eb4b8..10a36f99e2f 100644
--- a/nashorn/test/script/basic/NASHORN-468.js
+++ b/nashorn/test/script/basic/NASHORN-468.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-47.js b/nashorn/test/script/basic/NASHORN-47.js
index fce835158c3..1454db03cc4 100644
--- a/nashorn/test/script/basic/NASHORN-47.js
+++ b/nashorn/test/script/basic/NASHORN-47.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-473.js b/nashorn/test/script/basic/NASHORN-473.js
index 021ae41df43..3819d15b2ca 100644
--- a/nashorn/test/script/basic/NASHORN-473.js
+++ b/nashorn/test/script/basic/NASHORN-473.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-474.js b/nashorn/test/script/basic/NASHORN-474.js
index 30b03d052a0..3df4aa4da6d 100644
--- a/nashorn/test/script/basic/NASHORN-474.js
+++ b/nashorn/test/script/basic/NASHORN-474.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-478.js b/nashorn/test/script/basic/NASHORN-478.js
index b2601f210d5..945d2b573d3 100644
--- a/nashorn/test/script/basic/NASHORN-478.js
+++ b/nashorn/test/script/basic/NASHORN-478.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-48.js b/nashorn/test/script/basic/NASHORN-48.js
index e9734af4a44..1bbba1379e2 100644
--- a/nashorn/test/script/basic/NASHORN-48.js
+++ b/nashorn/test/script/basic/NASHORN-48.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-481.js b/nashorn/test/script/basic/NASHORN-481.js
index 9b7abafec6c..42295fa1247 100644
--- a/nashorn/test/script/basic/NASHORN-481.js
+++ b/nashorn/test/script/basic/NASHORN-481.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-482.js b/nashorn/test/script/basic/NASHORN-482.js
index 6bb04b5690f..76afb59e8ff 100644
--- a/nashorn/test/script/basic/NASHORN-482.js
+++ b/nashorn/test/script/basic/NASHORN-482.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-484.js b/nashorn/test/script/basic/NASHORN-484.js
index d87f597b852..b1f0a0ed65c 100644
--- a/nashorn/test/script/basic/NASHORN-484.js
+++ b/nashorn/test/script/basic/NASHORN-484.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-486.js b/nashorn/test/script/basic/NASHORN-486.js
index 13c34157984..f03f09631c0 100644
--- a/nashorn/test/script/basic/NASHORN-486.js
+++ b/nashorn/test/script/basic/NASHORN-486.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-487.js b/nashorn/test/script/basic/NASHORN-487.js
index 1f1d143dee6..c56859192cb 100644
--- a/nashorn/test/script/basic/NASHORN-487.js
+++ b/nashorn/test/script/basic/NASHORN-487.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-488.js b/nashorn/test/script/basic/NASHORN-488.js
index 401b60ed01f..53bb8882d40 100644
--- a/nashorn/test/script/basic/NASHORN-488.js
+++ b/nashorn/test/script/basic/NASHORN-488.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-49.js b/nashorn/test/script/basic/NASHORN-49.js
index 24d42e486a8..1b4a68ca7ab 100644
--- a/nashorn/test/script/basic/NASHORN-49.js
+++ b/nashorn/test/script/basic/NASHORN-49.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-490.js b/nashorn/test/script/basic/NASHORN-490.js
index ea086bc045f..e9bdd93113b 100644
--- a/nashorn/test/script/basic/NASHORN-490.js
+++ b/nashorn/test/script/basic/NASHORN-490.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-494.js b/nashorn/test/script/basic/NASHORN-494.js
index b049f15c749..18d19c8ccc1 100644
--- a/nashorn/test/script/basic/NASHORN-494.js
+++ b/nashorn/test/script/basic/NASHORN-494.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-497.js b/nashorn/test/script/basic/NASHORN-497.js
index 4757fb0fe11..ad8b4eb93b4 100644
--- a/nashorn/test/script/basic/NASHORN-497.js
+++ b/nashorn/test/script/basic/NASHORN-497.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-498.js b/nashorn/test/script/basic/NASHORN-498.js
index df3f6eb2326..6304788535d 100644
--- a/nashorn/test/script/basic/NASHORN-498.js
+++ b/nashorn/test/script/basic/NASHORN-498.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-499.js b/nashorn/test/script/basic/NASHORN-499.js
index a11b99c9f4b..bbedb05e62e 100644
--- a/nashorn/test/script/basic/NASHORN-499.js
+++ b/nashorn/test/script/basic/NASHORN-499.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-50.js b/nashorn/test/script/basic/NASHORN-50.js
index 70027a2b098..7292b958e8a 100644
--- a/nashorn/test/script/basic/NASHORN-50.js
+++ b/nashorn/test/script/basic/NASHORN-50.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-500.js b/nashorn/test/script/basic/NASHORN-500.js
index 9c6c35beca2..30546e8bbfc 100644
--- a/nashorn/test/script/basic/NASHORN-500.js
+++ b/nashorn/test/script/basic/NASHORN-500.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-503.js b/nashorn/test/script/basic/NASHORN-503.js
index 84866fa9434..50838817cd5 100644
--- a/nashorn/test/script/basic/NASHORN-503.js
+++ b/nashorn/test/script/basic/NASHORN-503.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-51.js b/nashorn/test/script/basic/NASHORN-51.js
index d08c0a6dd1c..044bce94062 100644
--- a/nashorn/test/script/basic/NASHORN-51.js
+++ b/nashorn/test/script/basic/NASHORN-51.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-511.js b/nashorn/test/script/basic/NASHORN-511.js
index 87ea7f8d9df..edac1a9af77 100644
--- a/nashorn/test/script/basic/NASHORN-511.js
+++ b/nashorn/test/script/basic/NASHORN-511.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-515.js b/nashorn/test/script/basic/NASHORN-515.js
index 1d1c309ac1d..198be1f357a 100644
--- a/nashorn/test/script/basic/NASHORN-515.js
+++ b/nashorn/test/script/basic/NASHORN-515.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-516.js b/nashorn/test/script/basic/NASHORN-516.js
index b38329eb7ba..f369b9cb217 100644
--- a/nashorn/test/script/basic/NASHORN-516.js
+++ b/nashorn/test/script/basic/NASHORN-516.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-52.js b/nashorn/test/script/basic/NASHORN-52.js
index d8b192503fc..1727e0224dd 100644
--- a/nashorn/test/script/basic/NASHORN-52.js
+++ b/nashorn/test/script/basic/NASHORN-52.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-534.js b/nashorn/test/script/basic/NASHORN-534.js
index 6825a2f5d03..ab7a9b9da01 100644
--- a/nashorn/test/script/basic/NASHORN-534.js
+++ b/nashorn/test/script/basic/NASHORN-534.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-535.js b/nashorn/test/script/basic/NASHORN-535.js
index 6ca6020c8fa..57abfc40f07 100644
--- a/nashorn/test/script/basic/NASHORN-535.js
+++ b/nashorn/test/script/basic/NASHORN-535.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-544.js b/nashorn/test/script/basic/NASHORN-544.js
index 29f3c8561d1..87c6cae55aa 100644
--- a/nashorn/test/script/basic/NASHORN-544.js
+++ b/nashorn/test/script/basic/NASHORN-544.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-55.js b/nashorn/test/script/basic/NASHORN-55.js
index 58ab7ad4da5..58576a11a7c 100644
--- a/nashorn/test/script/basic/NASHORN-55.js
+++ b/nashorn/test/script/basic/NASHORN-55.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-554.js b/nashorn/test/script/basic/NASHORN-554.js
index 48128725a3d..4c7ae8717b9 100644
--- a/nashorn/test/script/basic/NASHORN-554.js
+++ b/nashorn/test/script/basic/NASHORN-554.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-556.js b/nashorn/test/script/basic/NASHORN-556.js
index f9e464bd11b..5cb164a0cf3 100644
--- a/nashorn/test/script/basic/NASHORN-556.js
+++ b/nashorn/test/script/basic/NASHORN-556.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-56.js b/nashorn/test/script/basic/NASHORN-56.js
index 9ad9042e851..472284525c4 100644
--- a/nashorn/test/script/basic/NASHORN-56.js
+++ b/nashorn/test/script/basic/NASHORN-56.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-562.js b/nashorn/test/script/basic/NASHORN-562.js
index 08b6cc6ecdf..2754cbab804 100644
--- a/nashorn/test/script/basic/NASHORN-562.js
+++ b/nashorn/test/script/basic/NASHORN-562.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-565.js b/nashorn/test/script/basic/NASHORN-565.js
index 0d400c21b3e..ad789ce128f 100644
--- a/nashorn/test/script/basic/NASHORN-565.js
+++ b/nashorn/test/script/basic/NASHORN-565.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-575.js b/nashorn/test/script/basic/NASHORN-575.js
index 1fd148b0cd2..4eda079cb13 100644
--- a/nashorn/test/script/basic/NASHORN-575.js
+++ b/nashorn/test/script/basic/NASHORN-575.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-58.js b/nashorn/test/script/basic/NASHORN-58.js
index de7cbd7dcf9..b0aeaa4fe61 100644
--- a/nashorn/test/script/basic/NASHORN-58.js
+++ b/nashorn/test/script/basic/NASHORN-58.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-59.js b/nashorn/test/script/basic/NASHORN-59.js
index 21f2ebbf2c8..1379fa6de7a 100644
--- a/nashorn/test/script/basic/NASHORN-59.js
+++ b/nashorn/test/script/basic/NASHORN-59.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-592.js b/nashorn/test/script/basic/NASHORN-592.js
index deab8b703b5..cbc29841f4f 100644
--- a/nashorn/test/script/basic/NASHORN-592.js
+++ b/nashorn/test/script/basic/NASHORN-592.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-597.js b/nashorn/test/script/basic/NASHORN-597.js
index 99b56be7c4e..7195b055edb 100644
--- a/nashorn/test/script/basic/NASHORN-597.js
+++ b/nashorn/test/script/basic/NASHORN-597.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-60.js b/nashorn/test/script/basic/NASHORN-60.js
index 6e0cace60c6..338c237f48d 100644
--- a/nashorn/test/script/basic/NASHORN-60.js
+++ b/nashorn/test/script/basic/NASHORN-60.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-609.js b/nashorn/test/script/basic/NASHORN-609.js
index 3383c826f4d..5c84f018662 100644
--- a/nashorn/test/script/basic/NASHORN-609.js
+++ b/nashorn/test/script/basic/NASHORN-609.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-61.js b/nashorn/test/script/basic/NASHORN-61.js
index 9855dc5c4bd..0c7f2354e73 100644
--- a/nashorn/test/script/basic/NASHORN-61.js
+++ b/nashorn/test/script/basic/NASHORN-61.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-62.js b/nashorn/test/script/basic/NASHORN-62.js
index 2f064530452..a3ba6e26d94 100644
--- a/nashorn/test/script/basic/NASHORN-62.js
+++ b/nashorn/test/script/basic/NASHORN-62.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-620.js b/nashorn/test/script/basic/NASHORN-620.js
index f188f1949ba..ce99528e031 100644
--- a/nashorn/test/script/basic/NASHORN-620.js
+++ b/nashorn/test/script/basic/NASHORN-620.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-623.js b/nashorn/test/script/basic/NASHORN-623.js
index 710f39738fa..8ecdb134eae 100644
--- a/nashorn/test/script/basic/NASHORN-623.js
+++ b/nashorn/test/script/basic/NASHORN-623.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-627.js b/nashorn/test/script/basic/NASHORN-627.js
index 68ec04ed2af..07662ff0c15 100644
--- a/nashorn/test/script/basic/NASHORN-627.js
+++ b/nashorn/test/script/basic/NASHORN-627.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-63.js b/nashorn/test/script/basic/NASHORN-63.js
index 29d10287a87..f1178de5847 100644
--- a/nashorn/test/script/basic/NASHORN-63.js
+++ b/nashorn/test/script/basic/NASHORN-63.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-637.js b/nashorn/test/script/basic/NASHORN-637.js
index 0abf394132e..606d8932846 100644
--- a/nashorn/test/script/basic/NASHORN-637.js
+++ b/nashorn/test/script/basic/NASHORN-637.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-638.js b/nashorn/test/script/basic/NASHORN-638.js
index 959937ef706..9cb6d694c55 100644
--- a/nashorn/test/script/basic/NASHORN-638.js
+++ b/nashorn/test/script/basic/NASHORN-638.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-639.js b/nashorn/test/script/basic/NASHORN-639.js
index fac8806c572..fcc02e096ca 100644
--- a/nashorn/test/script/basic/NASHORN-639.js
+++ b/nashorn/test/script/basic/NASHORN-639.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-64.js b/nashorn/test/script/basic/NASHORN-64.js
index 7ec21a36844..03d95b2b5f1 100644
--- a/nashorn/test/script/basic/NASHORN-64.js
+++ b/nashorn/test/script/basic/NASHORN-64.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-642.js b/nashorn/test/script/basic/NASHORN-642.js
index 82ecf0869e8..acbd60250be 100644
--- a/nashorn/test/script/basic/NASHORN-642.js
+++ b/nashorn/test/script/basic/NASHORN-642.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-646.js b/nashorn/test/script/basic/NASHORN-646.js
index 7e53179d26f..493a7986b8d 100644
--- a/nashorn/test/script/basic/NASHORN-646.js
+++ b/nashorn/test/script/basic/NASHORN-646.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-653.js b/nashorn/test/script/basic/NASHORN-653.js
index 5ddb87908b7..2084bf70aeb 100644
--- a/nashorn/test/script/basic/NASHORN-653.js
+++ b/nashorn/test/script/basic/NASHORN-653.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-658.js b/nashorn/test/script/basic/NASHORN-658.js
index 282462a9ade..13e5e29ac6c 100644
--- a/nashorn/test/script/basic/NASHORN-658.js
+++ b/nashorn/test/script/basic/NASHORN-658.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-659.js b/nashorn/test/script/basic/NASHORN-659.js
index 93492166689..7c6c1502a24 100644
--- a/nashorn/test/script/basic/NASHORN-659.js
+++ b/nashorn/test/script/basic/NASHORN-659.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-66.js b/nashorn/test/script/basic/NASHORN-66.js
index 112086e3ce8..f1455ff2775 100644
--- a/nashorn/test/script/basic/NASHORN-66.js
+++ b/nashorn/test/script/basic/NASHORN-66.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-664.js b/nashorn/test/script/basic/NASHORN-664.js
index adfae8bff6a..268d5df84f1 100644
--- a/nashorn/test/script/basic/NASHORN-664.js
+++ b/nashorn/test/script/basic/NASHORN-664.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-665.js b/nashorn/test/script/basic/NASHORN-665.js
index 14f311cad94..54e7f0846bc 100644
--- a/nashorn/test/script/basic/NASHORN-665.js
+++ b/nashorn/test/script/basic/NASHORN-665.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-67.js b/nashorn/test/script/basic/NASHORN-67.js
index b9341e67525..b273b424470 100644
--- a/nashorn/test/script/basic/NASHORN-67.js
+++ b/nashorn/test/script/basic/NASHORN-67.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-678.js b/nashorn/test/script/basic/NASHORN-678.js
index 2ea47b75622..e585eb8d976 100644
--- a/nashorn/test/script/basic/NASHORN-678.js
+++ b/nashorn/test/script/basic/NASHORN-678.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-68.js b/nashorn/test/script/basic/NASHORN-68.js
index 9b75ba92c9e..d56da3689d9 100644
--- a/nashorn/test/script/basic/NASHORN-68.js
+++ b/nashorn/test/script/basic/NASHORN-68.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-689.js b/nashorn/test/script/basic/NASHORN-689.js
index d2e2f37ca85..938b111eadc 100644
--- a/nashorn/test/script/basic/NASHORN-689.js
+++ b/nashorn/test/script/basic/NASHORN-689.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-69.js b/nashorn/test/script/basic/NASHORN-69.js
index 309897d5978..9ec39a3a1b4 100644
--- a/nashorn/test/script/basic/NASHORN-69.js
+++ b/nashorn/test/script/basic/NASHORN-69.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-691.js b/nashorn/test/script/basic/NASHORN-691.js
index 82eccb2b0e2..ec36eedad02 100644
--- a/nashorn/test/script/basic/NASHORN-691.js
+++ b/nashorn/test/script/basic/NASHORN-691.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-694.js b/nashorn/test/script/basic/NASHORN-694.js
index dd7e55a46b1..eb1d294f8c3 100644
--- a/nashorn/test/script/basic/NASHORN-694.js
+++ b/nashorn/test/script/basic/NASHORN-694.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-697.js b/nashorn/test/script/basic/NASHORN-697.js
index 41e78906024..012f33b4028 100644
--- a/nashorn/test/script/basic/NASHORN-697.js
+++ b/nashorn/test/script/basic/NASHORN-697.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-703.js b/nashorn/test/script/basic/NASHORN-703.js
index 0de20204d65..41d3570c447 100644
--- a/nashorn/test/script/basic/NASHORN-703.js
+++ b/nashorn/test/script/basic/NASHORN-703.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-703a.js b/nashorn/test/script/basic/NASHORN-703a.js
index 14f8448a425..18c26a446d2 100644
--- a/nashorn/test/script/basic/NASHORN-703a.js
+++ b/nashorn/test/script/basic/NASHORN-703a.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-705.js b/nashorn/test/script/basic/NASHORN-705.js
index 73457bf85c7..a65ef843777 100644
--- a/nashorn/test/script/basic/NASHORN-705.js
+++ b/nashorn/test/script/basic/NASHORN-705.js
@@ -1,6 +1,6 @@
 #this-line-is-ignored
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-71.js b/nashorn/test/script/basic/NASHORN-71.js
index 0f28194eb58..f09cbc2efc2 100644
--- a/nashorn/test/script/basic/NASHORN-71.js
+++ b/nashorn/test/script/basic/NASHORN-71.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-710.js b/nashorn/test/script/basic/NASHORN-710.js
index 88eaed2a374..83b17782345 100644
--- a/nashorn/test/script/basic/NASHORN-710.js
+++ b/nashorn/test/script/basic/NASHORN-710.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-711.js b/nashorn/test/script/basic/NASHORN-711.js
index 12c30eaf1b9..af6e9c81eed 100644
--- a/nashorn/test/script/basic/NASHORN-711.js
+++ b/nashorn/test/script/basic/NASHORN-711.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-72.js b/nashorn/test/script/basic/NASHORN-72.js
index a3605a4c8b5..edf0a23791c 100644
--- a/nashorn/test/script/basic/NASHORN-72.js
+++ b/nashorn/test/script/basic/NASHORN-72.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-722.js b/nashorn/test/script/basic/NASHORN-722.js
index 5a6ab09e3fd..e1584ab9b42 100644
--- a/nashorn/test/script/basic/NASHORN-722.js
+++ b/nashorn/test/script/basic/NASHORN-722.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-73.js b/nashorn/test/script/basic/NASHORN-73.js
index fe7a07a0a75..04c96908848 100644
--- a/nashorn/test/script/basic/NASHORN-73.js
+++ b/nashorn/test/script/basic/NASHORN-73.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-737.js b/nashorn/test/script/basic/NASHORN-737.js
index d6c0ea14875..44169d0435f 100644
--- a/nashorn/test/script/basic/NASHORN-737.js
+++ b/nashorn/test/script/basic/NASHORN-737.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-74.js b/nashorn/test/script/basic/NASHORN-74.js
index 363c89db59d..1d44e067650 100644
--- a/nashorn/test/script/basic/NASHORN-74.js
+++ b/nashorn/test/script/basic/NASHORN-74.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-740.js b/nashorn/test/script/basic/NASHORN-740.js
index 4e5cbca52e5..553efdda1e3 100644
--- a/nashorn/test/script/basic/NASHORN-740.js
+++ b/nashorn/test/script/basic/NASHORN-740.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-75.js b/nashorn/test/script/basic/NASHORN-75.js
index 822d8484968..ebcd782cca5 100644
--- a/nashorn/test/script/basic/NASHORN-75.js
+++ b/nashorn/test/script/basic/NASHORN-75.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-758.js b/nashorn/test/script/basic/NASHORN-758.js
index bad2b82d272..7a92a4c3e6a 100644
--- a/nashorn/test/script/basic/NASHORN-758.js
+++ b/nashorn/test/script/basic/NASHORN-758.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-759.js b/nashorn/test/script/basic/NASHORN-759.js
index 729334b71cd..09d2b3e3638 100644
--- a/nashorn/test/script/basic/NASHORN-759.js
+++ b/nashorn/test/script/basic/NASHORN-759.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-760.js b/nashorn/test/script/basic/NASHORN-760.js
index edb9bc3b5fa..1974ddefa2b 100644
--- a/nashorn/test/script/basic/NASHORN-760.js
+++ b/nashorn/test/script/basic/NASHORN-760.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-768.js b/nashorn/test/script/basic/NASHORN-768.js
index 906bddccf52..5723d6d1071 100644
--- a/nashorn/test/script/basic/NASHORN-768.js
+++ b/nashorn/test/script/basic/NASHORN-768.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-778.js b/nashorn/test/script/basic/NASHORN-778.js
index 9d562efacc6..b165882df27 100644
--- a/nashorn/test/script/basic/NASHORN-778.js
+++ b/nashorn/test/script/basic/NASHORN-778.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-78.js b/nashorn/test/script/basic/NASHORN-78.js
index def4a2d1b48..549164dc015 100644
--- a/nashorn/test/script/basic/NASHORN-78.js
+++ b/nashorn/test/script/basic/NASHORN-78.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-79.js b/nashorn/test/script/basic/NASHORN-79.js
index 1c522782f5a..d6f1e0591a4 100644
--- a/nashorn/test/script/basic/NASHORN-79.js
+++ b/nashorn/test/script/basic/NASHORN-79.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-792.js b/nashorn/test/script/basic/NASHORN-792.js
index 8e84140c592..3ba0102d23d 100644
--- a/nashorn/test/script/basic/NASHORN-792.js
+++ b/nashorn/test/script/basic/NASHORN-792.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-80.js b/nashorn/test/script/basic/NASHORN-80.js
index c51fa56089d..aeb496ff9d7 100644
--- a/nashorn/test/script/basic/NASHORN-80.js
+++ b/nashorn/test/script/basic/NASHORN-80.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-81.js b/nashorn/test/script/basic/NASHORN-81.js
index 821c867fa11..44cda68497c 100644
--- a/nashorn/test/script/basic/NASHORN-81.js
+++ b/nashorn/test/script/basic/NASHORN-81.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-833.js b/nashorn/test/script/basic/NASHORN-833.js
index 182d7c9ee5f..b3d0d3120a5 100644
--- a/nashorn/test/script/basic/NASHORN-833.js
+++ b/nashorn/test/script/basic/NASHORN-833.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-85.js b/nashorn/test/script/basic/NASHORN-85.js
index 7859135f2da..bdad20f430d 100644
--- a/nashorn/test/script/basic/NASHORN-85.js
+++ b/nashorn/test/script/basic/NASHORN-85.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-86.js b/nashorn/test/script/basic/NASHORN-86.js
index fd92601e524..07237262538 100644
--- a/nashorn/test/script/basic/NASHORN-86.js
+++ b/nashorn/test/script/basic/NASHORN-86.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-87.js b/nashorn/test/script/basic/NASHORN-87.js
index b00cf25f0a6..2283dcd3be3 100644
--- a/nashorn/test/script/basic/NASHORN-87.js
+++ b/nashorn/test/script/basic/NASHORN-87.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-89.js b/nashorn/test/script/basic/NASHORN-89.js
index 4230033e57d..549123922c2 100644
--- a/nashorn/test/script/basic/NASHORN-89.js
+++ b/nashorn/test/script/basic/NASHORN-89.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-90.js b/nashorn/test/script/basic/NASHORN-90.js
index bcc6fe780e0..99c2a4aed8c 100644
--- a/nashorn/test/script/basic/NASHORN-90.js
+++ b/nashorn/test/script/basic/NASHORN-90.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-91.js b/nashorn/test/script/basic/NASHORN-91.js
index 8222023dfda..1e1df61e0bf 100644
--- a/nashorn/test/script/basic/NASHORN-91.js
+++ b/nashorn/test/script/basic/NASHORN-91.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-92.js b/nashorn/test/script/basic/NASHORN-92.js
index 12e0369ed71..a05997f3163 100644
--- a/nashorn/test/script/basic/NASHORN-92.js
+++ b/nashorn/test/script/basic/NASHORN-92.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-93.js b/nashorn/test/script/basic/NASHORN-93.js
index 14671710c5d..c4247288e36 100644
--- a/nashorn/test/script/basic/NASHORN-93.js
+++ b/nashorn/test/script/basic/NASHORN-93.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-95.js b/nashorn/test/script/basic/NASHORN-95.js
index f415ab6eeda..38d7285e3db 100644
--- a/nashorn/test/script/basic/NASHORN-95.js
+++ b/nashorn/test/script/basic/NASHORN-95.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-96.js b/nashorn/test/script/basic/NASHORN-96.js
index 557773a0084..451b018884a 100644
--- a/nashorn/test/script/basic/NASHORN-96.js
+++ b/nashorn/test/script/basic/NASHORN-96.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-97.js b/nashorn/test/script/basic/NASHORN-97.js
index 39953f72288..0f7128a548c 100644
--- a/nashorn/test/script/basic/NASHORN-97.js
+++ b/nashorn/test/script/basic/NASHORN-97.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-98.js b/nashorn/test/script/basic/NASHORN-98.js
index e9629975e2d..3e50cf56e6c 100644
--- a/nashorn/test/script/basic/NASHORN-98.js
+++ b/nashorn/test/script/basic/NASHORN-98.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/NASHORN-99.js b/nashorn/test/script/basic/NASHORN-99.js
index a7f266508de..eaf717a5e09 100644
--- a/nashorn/test/script/basic/NASHORN-99.js
+++ b/nashorn/test/script/basic/NASHORN-99.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/addition.js b/nashorn/test/script/basic/addition.js
index d5d8a33671b..6f8d099ea5e 100644
--- a/nashorn/test/script/basic/addition.js
+++ b/nashorn/test/script/basic/addition.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/allgettersetters.js b/nashorn/test/script/basic/allgettersetters.js
index 3919e992399..0f6753c23a4 100644
--- a/nashorn/test/script/basic/allgettersetters.js
+++ b/nashorn/test/script/basic/allgettersetters.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/andor.js b/nashorn/test/script/basic/andor.js
index f9afd42fa8e..7d65ee183e7 100644
--- a/nashorn/test/script/basic/andor.js
+++ b/nashorn/test/script/basic/andor.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/anonrecur.js b/nashorn/test/script/basic/anonrecur.js
index b227a5f10f4..393a2ac8b89 100644
--- a/nashorn/test/script/basic/anonrecur.js
+++ b/nashorn/test/script/basic/anonrecur.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/applycall.js b/nashorn/test/script/basic/applycall.js
index 50ee4c34e57..6756eadbbf0 100644
--- a/nashorn/test/script/basic/applycall.js
+++ b/nashorn/test/script/basic/applycall.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/args.js b/nashorn/test/script/basic/args.js
index 61d440132cc..7b8ff0a1a18 100644
--- a/nashorn/test/script/basic/args.js
+++ b/nashorn/test/script/basic/args.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/arity.js b/nashorn/test/script/basic/arity.js
index fb6ac9df52e..b53b298dfca 100644
--- a/nashorn/test/script/basic/arity.js
+++ b/nashorn/test/script/basic/arity.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/arrayprotoclass.js b/nashorn/test/script/basic/arrayprotoclass.js
index 8f6b8a33930..f5993c0534c 100644
--- a/nashorn/test/script/basic/arrayprotoclass.js
+++ b/nashorn/test/script/basic/arrayprotoclass.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/arrays.js b/nashorn/test/script/basic/arrays.js
index f0ee08eb3e2..6cab3754166 100644
--- a/nashorn/test/script/basic/arrays.js
+++ b/nashorn/test/script/basic/arrays.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/arrays2.js b/nashorn/test/script/basic/arrays2.js
index 7d8ec2cbb34..1342c17526c 100644
--- a/nashorn/test/script/basic/arrays2.js
+++ b/nashorn/test/script/basic/arrays2.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/arraysIntKey.js b/nashorn/test/script/basic/arraysIntKey.js
index 5f334e36ba3..c9182efdeb0 100644
--- a/nashorn/test/script/basic/arraysIntKey.js
+++ b/nashorn/test/script/basic/arraysIntKey.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/arrayset.js b/nashorn/test/script/basic/arrayset.js
index c7e3913a282..2fbd2bc420c 100644
--- a/nashorn/test/script/basic/arrayset.js
+++ b/nashorn/test/script/basic/arrayset.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/arrayundefined.js b/nashorn/test/script/basic/arrayundefined.js
index 5709ce7a979..3866c854f25 100644
--- a/nashorn/test/script/basic/arrayundefined.js
+++ b/nashorn/test/script/basic/arrayundefined.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/assign.js b/nashorn/test/script/basic/assign.js
index a41e9cd14dc..abcc504556d 100644
--- a/nashorn/test/script/basic/assign.js
+++ b/nashorn/test/script/basic/assign.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/bitwise_and.js b/nashorn/test/script/basic/bitwise_and.js
index 4e1c0e4013e..32583d43905 100644
--- a/nashorn/test/script/basic/bitwise_and.js
+++ b/nashorn/test/script/basic/bitwise_and.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/booleangetter.js b/nashorn/test/script/basic/booleangetter.js
index 22af4bad66b..3f16b74d55a 100644
--- a/nashorn/test/script/basic/booleangetter.js
+++ b/nashorn/test/script/basic/booleangetter.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/builtin.js b/nashorn/test/script/basic/builtin.js
index debcd27c2fa..4d48bffb252 100644
--- a/nashorn/test/script/basic/builtin.js
+++ b/nashorn/test/script/basic/builtin.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/builtin_assign.js b/nashorn/test/script/basic/builtin_assign.js
index 669deb30b8d..7520cb745ec 100644
--- a/nashorn/test/script/basic/builtin_assign.js
+++ b/nashorn/test/script/basic/builtin_assign.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/builtinchain.js b/nashorn/test/script/basic/builtinchain.js
index f9bfab0e5cd..a5e672e10fc 100644
--- a/nashorn/test/script/basic/builtinchain.js
+++ b/nashorn/test/script/basic/builtinchain.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/calllink.js b/nashorn/test/script/basic/calllink.js
index f2aa5472ec8..06e546c4921 100644
--- a/nashorn/test/script/basic/calllink.js
+++ b/nashorn/test/script/basic/calllink.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/closure.js b/nashorn/test/script/basic/closure.js
index 0fd2047f428..f601375ef12 100644
--- a/nashorn/test/script/basic/closure.js
+++ b/nashorn/test/script/basic/closure.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/commandargs.js b/nashorn/test/script/basic/commandargs.js
index 2dccbfdde73..733b67924d1 100644
--- a/nashorn/test/script/basic/commandargs.js
+++ b/nashorn/test/script/basic/commandargs.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/compile-octane.js b/nashorn/test/script/basic/compile-octane.js
index 298b4675646..da40d5eafec 100644
--- a/nashorn/test/script/basic/compile-octane.js
+++ b/nashorn/test/script/basic/compile-octane.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/condassign.js b/nashorn/test/script/basic/condassign.js
index 7251d7eea43..a70f5a403fa 100644
--- a/nashorn/test/script/basic/condassign.js
+++ b/nashorn/test/script/basic/condassign.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/construct.js b/nashorn/test/script/basic/construct.js
index 94a365726c6..66e3d4196a8 100644
--- a/nashorn/test/script/basic/construct.js
+++ b/nashorn/test/script/basic/construct.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/constructorname.js b/nashorn/test/script/basic/constructorname.js
index 57874cb2e00..16e3aec04d0 100644
--- a/nashorn/test/script/basic/constructorname.js
+++ b/nashorn/test/script/basic/constructorname.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/date.js b/nashorn/test/script/basic/date.js
index 92150972bb1..ea77089427e 100644
--- a/nashorn/test/script/basic/date.js
+++ b/nashorn/test/script/basic/date.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/dateparse.js b/nashorn/test/script/basic/dateparse.js
index abb480e9a8c..919a681cf2b 100644
--- a/nashorn/test/script/basic/dateparse.js
+++ b/nashorn/test/script/basic/dateparse.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/decinc.js b/nashorn/test/script/basic/decinc.js
index 421136554b7..3ee1ac1453c 100644
--- a/nashorn/test/script/basic/decinc.js
+++ b/nashorn/test/script/basic/decinc.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/delete.js b/nashorn/test/script/basic/delete.js
index 5b714a4688d..6d7f8846e5d 100644
--- a/nashorn/test/script/basic/delete.js
+++ b/nashorn/test/script/basic/delete.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/delete2.js b/nashorn/test/script/basic/delete2.js
index f406e22efa5..3d148474f5f 100644
--- a/nashorn/test/script/basic/delete2.js
+++ b/nashorn/test/script/basic/delete2.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/dotpropname.js b/nashorn/test/script/basic/dotpropname.js
index f0aa1ba8574..03704ec7043 100644
--- a/nashorn/test/script/basic/dotpropname.js
+++ b/nashorn/test/script/basic/dotpropname.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/doublecache.js b/nashorn/test/script/basic/doublecache.js
index ec443ab7385..91ac845972b 100644
--- a/nashorn/test/script/basic/doublecache.js
+++ b/nashorn/test/script/basic/doublecache.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/enumeration.js b/nashorn/test/script/basic/enumeration.js
index b23f1d5cfb6..3746dfe7694 100644
--- a/nashorn/test/script/basic/enumeration.js
+++ b/nashorn/test/script/basic/enumeration.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/errors.js b/nashorn/test/script/basic/errors.js
index 40ff1a31799..c698ef8cef4 100644
--- a/nashorn/test/script/basic/errors.js
+++ b/nashorn/test/script/basic/errors.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/errorstack.js b/nashorn/test/script/basic/errorstack.js
index 7a6a3fb0f33..7db53142c10 100644
--- a/nashorn/test/script/basic/errorstack.js
+++ b/nashorn/test/script/basic/errorstack.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/eval.js b/nashorn/test/script/basic/eval.js
index 600c22d1908..bd63068ca68 100644
--- a/nashorn/test/script/basic/eval.js
+++ b/nashorn/test/script/basic/eval.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/evalreturn.js b/nashorn/test/script/basic/evalreturn.js
index 531892ec2a0..3f523cc7fbd 100644
--- a/nashorn/test/script/basic/evalreturn.js
+++ b/nashorn/test/script/basic/evalreturn.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/exprclosure.js b/nashorn/test/script/basic/exprclosure.js
index 6c7a81478a3..ad1c3965c61 100644
--- a/nashorn/test/script/basic/exprclosure.js
+++ b/nashorn/test/script/basic/exprclosure.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/extensibility.js b/nashorn/test/script/basic/extensibility.js
index a7df96594b7..0904466740e 100644
--- a/nashorn/test/script/basic/extensibility.js
+++ b/nashorn/test/script/basic/extensibility.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/fileline.js b/nashorn/test/script/basic/fileline.js
index 6157ed582db..3323a12640e 100644
--- a/nashorn/test/script/basic/fileline.js
+++ b/nashorn/test/script/basic/fileline.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/finally-catchalls.js b/nashorn/test/script/basic/finally-catchalls.js
index 4b734e887d2..dac9cee94bd 100644
--- a/nashorn/test/script/basic/finally-catchalls.js
+++ b/nashorn/test/script/basic/finally-catchalls.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/finallyreturn.js b/nashorn/test/script/basic/finallyreturn.js
index 1f484fb03e8..79c9f715567 100644
--- a/nashorn/test/script/basic/finallyreturn.js
+++ b/nashorn/test/script/basic/finallyreturn.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/forin.js b/nashorn/test/script/basic/forin.js
index 8a799219bf2..ee3fa89b64a 100644
--- a/nashorn/test/script/basic/forin.js
+++ b/nashorn/test/script/basic/forin.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/forin2.js b/nashorn/test/script/basic/forin2.js
index d4e674221c5..be47bec20a9 100644
--- a/nashorn/test/script/basic/forin2.js
+++ b/nashorn/test/script/basic/forin2.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/funcarray.js b/nashorn/test/script/basic/funcarray.js
index 8fce5e62fd6..7ffd5f58243 100644
--- a/nashorn/test/script/basic/funcarray.js
+++ b/nashorn/test/script/basic/funcarray.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/funcbind.js b/nashorn/test/script/basic/funcbind.js
index 876e1c24b44..2b97b0eafb1 100644
--- a/nashorn/test/script/basic/funcbind.js
+++ b/nashorn/test/script/basic/funcbind.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/funcconstructor.js b/nashorn/test/script/basic/funcconstructor.js
index 97da0c4de3b..038031cd29d 100644
--- a/nashorn/test/script/basic/funcconstructor.js
+++ b/nashorn/test/script/basic/funcconstructor.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/getclassname.js b/nashorn/test/script/basic/getclassname.js
index c877ea3b953..3e29bc6476c 100644
--- a/nashorn/test/script/basic/getclassname.js
+++ b/nashorn/test/script/basic/getclassname.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/getenv.js b/nashorn/test/script/basic/getenv.js
index 598b3d30ee6..9fb3a96e79c 100644
--- a/nashorn/test/script/basic/getenv.js
+++ b/nashorn/test/script/basic/getenv.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/getter_callsite.js b/nashorn/test/script/basic/getter_callsite.js
index 8a8adf7051f..1e0800f0521 100644
--- a/nashorn/test/script/basic/getter_callsite.js
+++ b/nashorn/test/script/basic/getter_callsite.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/gettercalls.js b/nashorn/test/script/basic/gettercalls.js
index f582917244f..200f1cea8f8 100644
--- a/nashorn/test/script/basic/gettercalls.js
+++ b/nashorn/test/script/basic/gettercalls.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/getterfunc.js b/nashorn/test/script/basic/getterfunc.js
index fc55359e063..2c2cc4bf15b 100644
--- a/nashorn/test/script/basic/getterfunc.js
+++ b/nashorn/test/script/basic/getterfunc.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/gettersetter.js b/nashorn/test/script/basic/gettersetter.js
index ce211a0d6fb..68106bc14b9 100644
--- a/nashorn/test/script/basic/gettersetter.js
+++ b/nashorn/test/script/basic/gettersetter.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/globalaccess.js b/nashorn/test/script/basic/globalaccess.js
index 0ed7ae89bc6..6e18cfab439 100644
--- a/nashorn/test/script/basic/globalaccess.js
+++ b/nashorn/test/script/basic/globalaccess.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/globals.js b/nashorn/test/script/basic/globals.js
index 450cd4b2c8d..4e2b47f38bf 100644
--- a/nashorn/test/script/basic/globals.js
+++ b/nashorn/test/script/basic/globals.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/globalscope.js b/nashorn/test/script/basic/globalscope.js
index 6953ba63dce..7e87bdf898a 100644
--- a/nashorn/test/script/basic/globalscope.js
+++ b/nashorn/test/script/basic/globalscope.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/hello.js b/nashorn/test/script/basic/hello.js
index 7812f9eedcc..19fca9f75c7 100644
--- a/nashorn/test/script/basic/hello.js
+++ b/nashorn/test/script/basic/hello.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/herestr_operator.js b/nashorn/test/script/basic/herestr_operator.js
index 9290af58f62..0e5b8afd297 100644
--- a/nashorn/test/script/basic/herestr_operator.js
+++ b/nashorn/test/script/basic/herestr_operator.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/illegaljavaname.js b/nashorn/test/script/basic/illegaljavaname.js
index f25bd0de17c..20ccc5ac850 100644
--- a/nashorn/test/script/basic/illegaljavaname.js
+++ b/nashorn/test/script/basic/illegaljavaname.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/incheck.js b/nashorn/test/script/basic/incheck.js
index 4b3f464e30d..1571b62465e 100644
--- a/nashorn/test/script/basic/incheck.js
+++ b/nashorn/test/script/basic/incheck.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/indexedcall.js b/nashorn/test/script/basic/indexedcall.js
index 759ea93a8da..b3f651b60d4 100644
--- a/nashorn/test/script/basic/indexedcall.js
+++ b/nashorn/test/script/basic/indexedcall.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/info.js b/nashorn/test/script/basic/info.js
index 7dd15f9cd12..958572cc040 100644
--- a/nashorn/test/script/basic/info.js
+++ b/nashorn/test/script/basic/info.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/inherited_nonwritable.js b/nashorn/test/script/basic/inherited_nonwritable.js
index 05eaedca0d5..c79433208eb 100644
--- a/nashorn/test/script/basic/inherited_nonwritable.js
+++ b/nashorn/test/script/basic/inherited_nonwritable.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/instanceof.js b/nashorn/test/script/basic/instanceof.js
index cda92263ef9..31878b5506d 100644
--- a/nashorn/test/script/basic/instanceof.js
+++ b/nashorn/test/script/basic/instanceof.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/instanceof2.js b/nashorn/test/script/basic/instanceof2.js
index fc2ff57bc7c..a6c07c289a8 100644
--- a/nashorn/test/script/basic/instanceof2.js
+++ b/nashorn/test/script/basic/instanceof2.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/interfaces.js b/nashorn/test/script/basic/interfaces.js
index 629dfcd271f..1c42e9d241b 100644
--- a/nashorn/test/script/basic/interfaces.js
+++ b/nashorn/test/script/basic/interfaces.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/iterator.js b/nashorn/test/script/basic/iterator.js
index c5d9fbd92ae..0b70db4a082 100644
--- a/nashorn/test/script/basic/iterator.js
+++ b/nashorn/test/script/basic/iterator.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/java.js b/nashorn/test/script/basic/java.js
index 5920b244101..b3aaea19fb8 100644
--- a/nashorn/test/script/basic/java.js
+++ b/nashorn/test/script/basic/java.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/javaarray.js b/nashorn/test/script/basic/javaarray.js
index 837323b9b1e..389b9530096 100644
--- a/nashorn/test/script/basic/javaarray.js
+++ b/nashorn/test/script/basic/javaarray.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/javaarrayconversion.js b/nashorn/test/script/basic/javaarrayconversion.js
index 3da745bf402..34e2f95fb12 100644
--- a/nashorn/test/script/basic/javaarrayconversion.js
+++ b/nashorn/test/script/basic/javaarrayconversion.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/javaexceptions.js b/nashorn/test/script/basic/javaexceptions.js
index 548e5dba541..3db97e621f6 100644
--- a/nashorn/test/script/basic/javaexceptions.js
+++ b/nashorn/test/script/basic/javaexceptions.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/javaimporter.js b/nashorn/test/script/basic/javaimporter.js
index 822c041831e..42551d1aa75 100644
--- a/nashorn/test/script/basic/javaimporter.js
+++ b/nashorn/test/script/basic/javaimporter.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/javainnerclasses.js b/nashorn/test/script/basic/javainnerclasses.js
index e0429ad54ca..df1e74df191 100644
--- a/nashorn/test/script/basic/javainnerclasses.js
+++ b/nashorn/test/script/basic/javainnerclasses.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/javasigcall.js b/nashorn/test/script/basic/javasigcall.js
index c8b92b52eb2..c1a2df78b61 100644
--- a/nashorn/test/script/basic/javasigcall.js
+++ b/nashorn/test/script/basic/javasigcall.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/jquery.js b/nashorn/test/script/basic/jquery.js
index 1bc23bcc4d7..16cb077d07c 100644
--- a/nashorn/test/script/basic/jquery.js
+++ b/nashorn/test/script/basic/jquery.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/jsadapter.js b/nashorn/test/script/basic/jsadapter.js
index 4fce40b4563..9fe80ad4053 100644
--- a/nashorn/test/script/basic/jsadapter.js
+++ b/nashorn/test/script/basic/jsadapter.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/jsadapterlink.js b/nashorn/test/script/basic/jsadapterlink.js
index d936d1fe615..15117b3fa2b 100644
--- a/nashorn/test/script/basic/jsadapterlink.js
+++ b/nashorn/test/script/basic/jsadapterlink.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/json.js b/nashorn/test/script/basic/json.js
index 6b6ed95d0fc..72391ff11d7 100644
--- a/nashorn/test/script/basic/json.js
+++ b/nashorn/test/script/basic/json.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/list.js b/nashorn/test/script/basic/list.js
index 1dd5748f550..12e4071b6aa 100644
--- a/nashorn/test/script/basic/list.js
+++ b/nashorn/test/script/basic/list.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/literal.js b/nashorn/test/script/basic/literal.js
index f98df75e1a0..2003c343c78 100644
--- a/nashorn/test/script/basic/literal.js
+++ b/nashorn/test/script/basic/literal.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/load.js b/nashorn/test/script/basic/load.js
index 2a43c14cf50..4c8f9be239d 100644
--- a/nashorn/test/script/basic/load.js
+++ b/nashorn/test/script/basic/load.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/loadedfile.js b/nashorn/test/script/basic/loadedfile.js
index ad73274d8dc..dfc09a3a788 100644
--- a/nashorn/test/script/basic/loadedfile.js
+++ b/nashorn/test/script/basic/loadedfile.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/localundef.js b/nashorn/test/script/basic/localundef.js
index 13a64292dcf..05484928189 100644
--- a/nashorn/test/script/basic/localundef.js
+++ b/nashorn/test/script/basic/localundef.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/map.js b/nashorn/test/script/basic/map.js
index 2f2455e2b81..2ab27aba9cb 100644
--- a/nashorn/test/script/basic/map.js
+++ b/nashorn/test/script/basic/map.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/math.js b/nashorn/test/script/basic/math.js
index 37e440b880b..d6b34c4aa5c 100644
--- a/nashorn/test/script/basic/math.js
+++ b/nashorn/test/script/basic/math.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/minuszero.js b/nashorn/test/script/basic/minuszero.js
index 4b6d38808ed..21c1cdffc1c 100644
--- a/nashorn/test/script/basic/minuszero.js
+++ b/nashorn/test/script/basic/minuszero.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/module.js b/nashorn/test/script/basic/module.js
index eea0e36e93e..665e3628fab 100644
--- a/nashorn/test/script/basic/module.js
+++ b/nashorn/test/script/basic/module.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/moduleload.js b/nashorn/test/script/basic/moduleload.js
index 9f51cc65a7a..628bfa24caf 100644
--- a/nashorn/test/script/basic/moduleload.js
+++ b/nashorn/test/script/basic/moduleload.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/nashorn2.js b/nashorn/test/script/basic/nashorn2.js
index 1829ed2e791..d509a011f17 100644
--- a/nashorn/test/script/basic/nashorn2.js
+++ b/nashorn/test/script/basic/nashorn2.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/natives.js b/nashorn/test/script/basic/natives.js
index 6dff2f7d88a..60f96104eb0 100644
--- a/nashorn/test/script/basic/natives.js
+++ b/nashorn/test/script/basic/natives.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/new.js b/nashorn/test/script/basic/new.js
index 80d77038fc9..25904b1a9ca 100644
--- a/nashorn/test/script/basic/new.js
+++ b/nashorn/test/script/basic/new.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/newexpr.js b/nashorn/test/script/basic/newexpr.js
index 723b63ce0e8..78711a13965 100644
--- a/nashorn/test/script/basic/newexpr.js
+++ b/nashorn/test/script/basic/newexpr.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/newnew.js b/nashorn/test/script/basic/newnew.js
index 118cfd766b8..98a8e4db481 100644
--- a/nashorn/test/script/basic/newnew.js
+++ b/nashorn/test/script/basic/newnew.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/nonconstructors.js b/nashorn/test/script/basic/nonconstructors.js
index 5ceadd9a02a..8fb0d368dda 100644
--- a/nashorn/test/script/basic/nonconstructors.js
+++ b/nashorn/test/script/basic/nonconstructors.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/nosuchmethod.js b/nashorn/test/script/basic/nosuchmethod.js
index f869c8cd1a9..6ac03f20393 100644
--- a/nashorn/test/script/basic/nosuchmethod.js
+++ b/nashorn/test/script/basic/nosuchmethod.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/nosuchproperty.js b/nashorn/test/script/basic/nosuchproperty.js
index 786127c7ef5..87976106a61 100644
--- a/nashorn/test/script/basic/nosuchproperty.js
+++ b/nashorn/test/script/basic/nosuchproperty.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/number.js b/nashorn/test/script/basic/number.js
index fb7f9971a90..9215615699b 100644
--- a/nashorn/test/script/basic/number.js
+++ b/nashorn/test/script/basic/number.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/numberstring.js b/nashorn/test/script/basic/numberstring.js
index 5ee27426da5..7daddb06814 100644
--- a/nashorn/test/script/basic/numberstring.js
+++ b/nashorn/test/script/basic/numberstring.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/objectprops.js b/nashorn/test/script/basic/objectprops.js
index 77dda1d3106..525e80cb852 100644
--- a/nashorn/test/script/basic/objectprops.js
+++ b/nashorn/test/script/basic/objectprops.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/objects.js b/nashorn/test/script/basic/objects.js
index e9e10c9391c..9d91379370c 100644
--- a/nashorn/test/script/basic/objects.js
+++ b/nashorn/test/script/basic/objects.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/options.js b/nashorn/test/script/basic/options.js
index dd68e3c79df..102bb5ecda7 100644
--- a/nashorn/test/script/basic/options.js
+++ b/nashorn/test/script/basic/options.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/propchange.js b/nashorn/test/script/basic/propchange.js
index 50498d890fe..b3170327450 100644
--- a/nashorn/test/script/basic/propchange.js
+++ b/nashorn/test/script/basic/propchange.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/propertycheck.js b/nashorn/test/script/basic/propertycheck.js
index b91897ed024..8e35015fb9c 100644
--- a/nashorn/test/script/basic/propertycheck.js
+++ b/nashorn/test/script/basic/propertycheck.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/prototype.js b/nashorn/test/script/basic/prototype.js
index 17748433342..e85d3d4ac01 100644
--- a/nashorn/test/script/basic/prototype.js
+++ b/nashorn/test/script/basic/prototype.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/pushpull.js b/nashorn/test/script/basic/pushpull.js
index d0e4c74bad4..192ef9cb9cb 100644
--- a/nashorn/test/script/basic/pushpull.js
+++ b/nashorn/test/script/basic/pushpull.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/regex.js b/nashorn/test/script/basic/regex.js
index f9819058a94..49dd7434600 100644
--- a/nashorn/test/script/basic/regex.js
+++ b/nashorn/test/script/basic/regex.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/regexp_flags.js b/nashorn/test/script/basic/regexp_flags.js
index b0bc9b8a221..9ff7543f328 100644
--- a/nashorn/test/script/basic/regexp_flags.js
+++ b/nashorn/test/script/basic/regexp_flags.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/run-octane.js b/nashorn/test/script/basic/run-octane.js
index dcf7fcd8387..2247450a800 100644
--- a/nashorn/test/script/basic/run-octane.js
+++ b/nashorn/test/script/basic/run-octane.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/runsunspider.js b/nashorn/test/script/basic/runsunspider.js
index e1ec395c270..4c8855a2371 100644
--- a/nashorn/test/script/basic/runsunspider.js
+++ b/nashorn/test/script/basic/runsunspider.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/samfunc.js b/nashorn/test/script/basic/samfunc.js
index 0bbd3e815eb..7751bee0f53 100644
--- a/nashorn/test/script/basic/samfunc.js
+++ b/nashorn/test/script/basic/samfunc.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/scripting.js b/nashorn/test/script/basic/scripting.js
index e6b9224e0ee..93f6396882c 100644
--- a/nashorn/test/script/basic/scripting.js
+++ b/nashorn/test/script/basic/scripting.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/scripting.js.EXPECTED b/nashorn/test/script/basic/scripting.js.EXPECTED
index 73c1fb963a2..7d2e23e757f 100644
--- a/nashorn/test/script/basic/scripting.js.EXPECTED
+++ b/nashorn/test/script/basic/scripting.js.EXPECTED
@@ -20,7 +20,7 @@ This is executed how
 8
 No we don't
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/sealfreeze.js b/nashorn/test/script/basic/sealfreeze.js
index 90a78b77719..8b932f8f23b 100644
--- a/nashorn/test/script/basic/sealfreeze.js
+++ b/nashorn/test/script/basic/sealfreeze.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/setlength.js b/nashorn/test/script/basic/setlength.js
index 061dfe3bd0a..45f54e5769c 100644
--- a/nashorn/test/script/basic/setlength.js
+++ b/nashorn/test/script/basic/setlength.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/stdin.js b/nashorn/test/script/basic/stdin.js
index 927b015572e..ba546d5967f 100644
--- a/nashorn/test/script/basic/stdin.js
+++ b/nashorn/test/script/basic/stdin.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/strings.js b/nashorn/test/script/basic/strings.js
index 61b0e6d1a53..87aff316584 100644
--- a/nashorn/test/script/basic/strings.js
+++ b/nashorn/test/script/basic/strings.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/throws.js b/nashorn/test/script/basic/throws.js
index ab1ddc5c049..30647e475cb 100644
--- a/nashorn/test/script/basic/throws.js
+++ b/nashorn/test/script/basic/throws.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/tosource.js b/nashorn/test/script/basic/tosource.js
index 273300557ce..ad6cfcc74ab 100644
--- a/nashorn/test/script/basic/tosource.js
+++ b/nashorn/test/script/basic/tosource.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/tostring.js b/nashorn/test/script/basic/tostring.js
index 3ccddf88d29..80e6b0fc02d 100644
--- a/nashorn/test/script/basic/tostring.js
+++ b/nashorn/test/script/basic/tostring.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/try.js b/nashorn/test/script/basic/try.js
index 78282075d0a..07ec43ceca8 100644
--- a/nashorn/test/script/basic/try.js
+++ b/nashorn/test/script/basic/try.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/trybreakcont.js b/nashorn/test/script/basic/trybreakcont.js
index 0c22f714e40..94bfdf11fd2 100644
--- a/nashorn/test/script/basic/trybreakcont.js
+++ b/nashorn/test/script/basic/trybreakcont.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/trycatch.js b/nashorn/test/script/basic/trycatch.js
index 77d77c8ec26..f5707e47aa4 100644
--- a/nashorn/test/script/basic/trycatch.js
+++ b/nashorn/test/script/basic/trycatch.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/trycatchfor.js b/nashorn/test/script/basic/trycatchfor.js
index a9ce56dab6c..a8c2d09f3c6 100644
--- a/nashorn/test/script/basic/trycatchfor.js
+++ b/nashorn/test/script/basic/trycatchfor.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/tryfinallyreturn.js b/nashorn/test/script/basic/tryfinallyreturn.js
index 2560bc36f38..bc79146feef 100644
--- a/nashorn/test/script/basic/tryfinallyreturn.js
+++ b/nashorn/test/script/basic/tryfinallyreturn.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/tryforbreak.js b/nashorn/test/script/basic/tryforbreak.js
index c19dbe45fe6..04d8de31351 100644
--- a/nashorn/test/script/basic/tryforbreak.js
+++ b/nashorn/test/script/basic/tryforbreak.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/typechange.js b/nashorn/test/script/basic/typechange.js
index cbc5e537334..ff416f8ddea 100644
--- a/nashorn/test/script/basic/typechange.js
+++ b/nashorn/test/script/basic/typechange.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/typeof.js b/nashorn/test/script/basic/typeof.js
index a2660643865..15c9f81c1e9 100644
--- a/nashorn/test/script/basic/typeof.js
+++ b/nashorn/test/script/basic/typeof.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/typeof2.js b/nashorn/test/script/basic/typeof2.js
index 65e9df2bf43..248fabfb229 100644
--- a/nashorn/test/script/basic/typeof2.js
+++ b/nashorn/test/script/basic/typeof2.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/undefined.js b/nashorn/test/script/basic/undefined.js
index 9306c520152..b949eec5c7d 100644
--- a/nashorn/test/script/basic/undefined.js
+++ b/nashorn/test/script/basic/undefined.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/underscore.js b/nashorn/test/script/basic/underscore.js
index 71d8beb446b..064e5252ca2 100644
--- a/nashorn/test/script/basic/underscore.js
+++ b/nashorn/test/script/basic/underscore.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/varargs.js b/nashorn/test/script/basic/varargs.js
index 09babed4484..028441394c4 100644
--- a/nashorn/test/script/basic/varargs.js
+++ b/nashorn/test/script/basic/varargs.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/void.js b/nashorn/test/script/basic/void.js
index e12d4f42229..957f954da5d 100644
--- a/nashorn/test/script/basic/void.js
+++ b/nashorn/test/script/basic/void.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/with.js b/nashorn/test/script/basic/with.js
index 41c29b1cc2b..1ae81130701 100644
--- a/nashorn/test/script/basic/with.js
+++ b/nashorn/test/script/basic/with.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/withprimitive.js b/nashorn/test/script/basic/withprimitive.js
index 64ea2c45d9b..a0ee021f2b0 100644
--- a/nashorn/test/script/basic/withprimitive.js
+++ b/nashorn/test/script/basic/withprimitive.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/writable_relink.js b/nashorn/test/script/basic/writable_relink.js
index 3bbbbb7c946..ebc8a3bdf49 100644
--- a/nashorn/test/script/basic/writable_relink.js
+++ b/nashorn/test/script/basic/writable_relink.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/xorassign.js b/nashorn/test/script/basic/xorassign.js
index 48dba0d248b..1cb73b6b673 100644
--- a/nashorn/test/script/basic/xorassign.js
+++ b/nashorn/test/script/basic/xorassign.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/basic/yui.js b/nashorn/test/script/basic/yui.js
index eb9a70363c0..879fb57db3b 100644
--- a/nashorn/test/script/basic/yui.js
+++ b/nashorn/test/script/basic/yui.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/error/NASHORN-154/function_mult_params_in_strict.js b/nashorn/test/script/error/NASHORN-154/function_mult_params_in_strict.js
index c5fdac2b2ac..12b1669a10d 100644
--- a/nashorn/test/script/error/NASHORN-154/function_mult_params_in_strict.js
+++ b/nashorn/test/script/error/NASHORN-154/function_mult_params_in_strict.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/error/NASHORN-154/improper_return_break_continue.js b/nashorn/test/script/error/NASHORN-154/improper_return_break_continue.js
index 183cf93ab87..7496d77f3df 100644
--- a/nashorn/test/script/error/NASHORN-154/improper_return_break_continue.js
+++ b/nashorn/test/script/error/NASHORN-154/improper_return_break_continue.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/error/NASHORN-154/invalid_lvalue.js b/nashorn/test/script/error/NASHORN-154/invalid_lvalue.js
index 02ff5598a59..ce284625b92 100644
--- a/nashorn/test/script/error/NASHORN-154/invalid_lvalue.js
+++ b/nashorn/test/script/error/NASHORN-154/invalid_lvalue.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/error/NASHORN-154/literal_data_and_accessor.js b/nashorn/test/script/error/NASHORN-154/literal_data_and_accessor.js
index 46ed88ee3dc..4a236f12692 100644
--- a/nashorn/test/script/error/NASHORN-154/literal_data_and_accessor.js
+++ b/nashorn/test/script/error/NASHORN-154/literal_data_and_accessor.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/error/NASHORN-154/literal_mult_getters.js b/nashorn/test/script/error/NASHORN-154/literal_mult_getters.js
index 74e6554c699..8777b61d614 100644
--- a/nashorn/test/script/error/NASHORN-154/literal_mult_getters.js
+++ b/nashorn/test/script/error/NASHORN-154/literal_mult_getters.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/error/NASHORN-154/literal_mult_prop_in_strict.js b/nashorn/test/script/error/NASHORN-154/literal_mult_prop_in_strict.js
index c520be17a7b..30d3fad441e 100644
--- a/nashorn/test/script/error/NASHORN-154/literal_mult_prop_in_strict.js
+++ b/nashorn/test/script/error/NASHORN-154/literal_mult_prop_in_strict.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/error/NASHORN-154/with_in_strict.js b/nashorn/test/script/error/NASHORN-154/with_in_strict.js
index ddbf7df2d41..866c8223939 100644
--- a/nashorn/test/script/error/NASHORN-154/with_in_strict.js
+++ b/nashorn/test/script/error/NASHORN-154/with_in_strict.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/error/NASHORN-214.js b/nashorn/test/script/error/NASHORN-214.js
index 20fd3fb7d2d..afffec20ba9 100644
--- a/nashorn/test/script/error/NASHORN-214.js
+++ b/nashorn/test/script/error/NASHORN-214.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/error/NASHORN-35.js b/nashorn/test/script/error/NASHORN-35.js
index cbbd65c185e..314cd3a77a2 100644
--- a/nashorn/test/script/error/NASHORN-35.js
+++ b/nashorn/test/script/error/NASHORN-35.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/error/NASHORN-39.js b/nashorn/test/script/error/NASHORN-39.js
index bca5d1f894e..59f4a4a1870 100644
--- a/nashorn/test/script/error/NASHORN-39.js
+++ b/nashorn/test/script/error/NASHORN-39.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/error/NASHORN-568.js b/nashorn/test/script/error/NASHORN-568.js
index aa5277c092a..1a8159e855c 100644
--- a/nashorn/test/script/error/NASHORN-568.js
+++ b/nashorn/test/script/error/NASHORN-568.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/error/NASHORN-57.js b/nashorn/test/script/error/NASHORN-57.js
index 528af7097d3..2dc5b15a2fb 100644
--- a/nashorn/test/script/error/NASHORN-57.js
+++ b/nashorn/test/script/error/NASHORN-57.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/error/NASHORN-668.js b/nashorn/test/script/error/NASHORN-668.js
index c42cb5adc3e..f3328562599 100644
--- a/nashorn/test/script/error/NASHORN-668.js
+++ b/nashorn/test/script/error/NASHORN-668.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/error/quotemissing.js b/nashorn/test/script/error/quotemissing.js
index e9951b8e2db..74d9a3e98f8 100644
--- a/nashorn/test/script/error/quotemissing.js
+++ b/nashorn/test/script/error/quotemissing.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/error/strictmode.js b/nashorn/test/script/error/strictmode.js
index 8d33dc77050..abdf21669b4 100644
--- a/nashorn/test/script/error/strictmode.js
+++ b/nashorn/test/script/error/strictmode.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/representations/NASHORN-592a.js b/nashorn/test/script/representations/NASHORN-592a.js
index 8f9bfc9e578..dd75f62ee91 100644
--- a/nashorn/test/script/representations/NASHORN-592a.js
+++ b/nashorn/test/script/representations/NASHORN-592a.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/sandbox/NASHORN-525.js b/nashorn/test/script/sandbox/NASHORN-525.js
index a00db9d6ac3..c6a0d4fc995 100644
--- a/nashorn/test/script/sandbox/NASHORN-525.js
+++ b/nashorn/test/script/sandbox/NASHORN-525.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/sandbox/classloader.js b/nashorn/test/script/sandbox/classloader.js
index 516be7833f3..7676496060d 100644
--- a/nashorn/test/script/sandbox/classloader.js
+++ b/nashorn/test/script/sandbox/classloader.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/sandbox/doprivileged.js b/nashorn/test/script/sandbox/doprivileged.js
index c422b36df04..d901347d659 100644
--- a/nashorn/test/script/sandbox/doprivileged.js
+++ b/nashorn/test/script/sandbox/doprivileged.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/sandbox/exit.js b/nashorn/test/script/sandbox/exit.js
index 78554ac8f20..d7737f53b4f 100644
--- a/nashorn/test/script/sandbox/exit.js
+++ b/nashorn/test/script/sandbox/exit.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/sandbox/file.js b/nashorn/test/script/sandbox/file.js
index 07a73d41bec..dce3afd06b1 100644
--- a/nashorn/test/script/sandbox/file.js
+++ b/nashorn/test/script/sandbox/file.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/sandbox/javaextend.js b/nashorn/test/script/sandbox/javaextend.js
index 3053ba3c72a..e5249ca8f8f 100644
--- a/nashorn/test/script/sandbox/javaextend.js
+++ b/nashorn/test/script/sandbox/javaextend.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/sandbox/loadLibrary.js b/nashorn/test/script/sandbox/loadLibrary.js
index 2ea8cbcb827..1e5151f0e53 100644
--- a/nashorn/test/script/sandbox/loadLibrary.js
+++ b/nashorn/test/script/sandbox/loadLibrary.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/sandbox/net.js b/nashorn/test/script/sandbox/net.js
index f648b5bbefd..37aaf578c6f 100644
--- a/nashorn/test/script/sandbox/net.js
+++ b/nashorn/test/script/sandbox/net.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/sandbox/property.js b/nashorn/test/script/sandbox/property.js
index 618ef1e9c1a..685cf3292e1 100644
--- a/nashorn/test/script/sandbox/property.js
+++ b/nashorn/test/script/sandbox/property.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/sandbox/reflection.js b/nashorn/test/script/sandbox/reflection.js
index 1a33b5637fd..7364879ddd9 100644
--- a/nashorn/test/script/sandbox/reflection.js
+++ b/nashorn/test/script/sandbox/reflection.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/sandbox/runnable.js b/nashorn/test/script/sandbox/runnable.js
index ff5509e37f6..75f533b64d1 100644
--- a/nashorn/test/script/sandbox/runnable.js
+++ b/nashorn/test/script/sandbox/runnable.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/sandbox/unsafe.js b/nashorn/test/script/sandbox/unsafe.js
index 0db058ee907..b273cd0b709 100644
--- a/nashorn/test/script/sandbox/unsafe.js
+++ b/nashorn/test/script/sandbox/unsafe.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/test262.js b/nashorn/test/script/test262.js
index 6cfa8e8a274..a03e612b011 100644
--- a/nashorn/test/script/test262.js
+++ b/nashorn/test/script/test262.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/script/test262_single.js b/nashorn/test/script/test262_single.js
index 015426d5978..2cc905ec572 100644
--- a/nashorn/test/script/test262_single.js
+++ b/nashorn/test/script/test262_single.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/src/UnnamedPackageTestCallback.java b/nashorn/test/src/UnnamedPackageTestCallback.java
index 53db8ca0fa1..67ab36fc45f 100644
--- a/nashorn/test/src/UnnamedPackageTestCallback.java
+++ b/nashorn/test/src/UnnamedPackageTestCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/src/jdk/nashorn/api/scripting/MultipleEngineTest.java b/nashorn/test/src/jdk/nashorn/api/scripting/MultipleEngineTest.java
index 3694882f516..a7483209524 100644
--- a/nashorn/test/src/jdk/nashorn/api/scripting/MultipleEngineTest.java
+++ b/nashorn/test/src/jdk/nashorn/api/scripting/MultipleEngineTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java b/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
index 17963c52bb4..a333bcb9533 100644
--- a/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
+++ b/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/src/jdk/nashorn/api/scripting/Window.java b/nashorn/test/src/jdk/nashorn/api/scripting/Window.java
index eab4b87072a..33d8001288b 100644
--- a/nashorn/test/src/jdk/nashorn/api/scripting/Window.java
+++ b/nashorn/test/src/jdk/nashorn/api/scripting/Window.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/src/jdk/nashorn/api/scripting/WindowEventHandler.java b/nashorn/test/src/jdk/nashorn/api/scripting/WindowEventHandler.java
index 3e39228984c..88892994215 100644
--- a/nashorn/test/src/jdk/nashorn/api/scripting/WindowEventHandler.java
+++ b/nashorn/test/src/jdk/nashorn/api/scripting/WindowEventHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/src/jdk/nashorn/internal/access/BooleanAccessTest.java b/nashorn/test/src/jdk/nashorn/internal/access/BooleanAccessTest.java
index 5ec92b51873..3f952b57624 100644
--- a/nashorn/test/src/jdk/nashorn/internal/access/BooleanAccessTest.java
+++ b/nashorn/test/src/jdk/nashorn/internal/access/BooleanAccessTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/src/jdk/nashorn/internal/access/MethodAccessTest.java b/nashorn/test/src/jdk/nashorn/internal/access/MethodAccessTest.java
index 8ad1153745f..655a11eee9d 100644
--- a/nashorn/test/src/jdk/nashorn/internal/access/MethodAccessTest.java
+++ b/nashorn/test/src/jdk/nashorn/internal/access/MethodAccessTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/src/jdk/nashorn/internal/access/NumberAccessTest.java b/nashorn/test/src/jdk/nashorn/internal/access/NumberAccessTest.java
index 64b2e00216b..579cfd6f00e 100644
--- a/nashorn/test/src/jdk/nashorn/internal/access/NumberAccessTest.java
+++ b/nashorn/test/src/jdk/nashorn/internal/access/NumberAccessTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/src/jdk/nashorn/internal/access/NumberBoxingTest.java b/nashorn/test/src/jdk/nashorn/internal/access/NumberBoxingTest.java
index 23627c26c46..179f397a45b 100644
--- a/nashorn/test/src/jdk/nashorn/internal/access/NumberBoxingTest.java
+++ b/nashorn/test/src/jdk/nashorn/internal/access/NumberBoxingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/src/jdk/nashorn/internal/access/ObjectAccessTest.java b/nashorn/test/src/jdk/nashorn/internal/access/ObjectAccessTest.java
index 24eb025437f..05d1f698534 100644
--- a/nashorn/test/src/jdk/nashorn/internal/access/ObjectAccessTest.java
+++ b/nashorn/test/src/jdk/nashorn/internal/access/ObjectAccessTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/src/jdk/nashorn/internal/access/Person.java b/nashorn/test/src/jdk/nashorn/internal/access/Person.java
index 3704bee9ec9..232146a2c46 100644
--- a/nashorn/test/src/jdk/nashorn/internal/access/Person.java
+++ b/nashorn/test/src/jdk/nashorn/internal/access/Person.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/src/jdk/nashorn/internal/access/SharedObject.java b/nashorn/test/src/jdk/nashorn/internal/access/SharedObject.java
index 55775c79718..d9046fa94bc 100644
--- a/nashorn/test/src/jdk/nashorn/internal/access/SharedObject.java
+++ b/nashorn/test/src/jdk/nashorn/internal/access/SharedObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/src/jdk/nashorn/internal/access/StringAccessTest.java b/nashorn/test/src/jdk/nashorn/internal/access/StringAccessTest.java
index 3c2fe135559..3eec154b9b2 100644
--- a/nashorn/test/src/jdk/nashorn/internal/access/StringAccessTest.java
+++ b/nashorn/test/src/jdk/nashorn/internal/access/StringAccessTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/src/jdk/nashorn/internal/codegen/CompilerTest.java b/nashorn/test/src/jdk/nashorn/internal/codegen/CompilerTest.java
index b2292413c59..e9fb64a6fd7 100644
--- a/nashorn/test/src/jdk/nashorn/internal/codegen/CompilerTest.java
+++ b/nashorn/test/src/jdk/nashorn/internal/codegen/CompilerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/src/jdk/nashorn/internal/parser/ParserTest.java b/nashorn/test/src/jdk/nashorn/internal/parser/ParserTest.java
index 67cc59a3c32..c36f768b800 100644
--- a/nashorn/test/src/jdk/nashorn/internal/parser/ParserTest.java
+++ b/nashorn/test/src/jdk/nashorn/internal/parser/ParserTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/src/jdk/nashorn/internal/performance/AuroraWrapper.java b/nashorn/test/src/jdk/nashorn/internal/performance/AuroraWrapper.java
index 2ffaf0d8a90..a3f4caa1cb3 100644
--- a/nashorn/test/src/jdk/nashorn/internal/performance/AuroraWrapper.java
+++ b/nashorn/test/src/jdk/nashorn/internal/performance/AuroraWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/src/jdk/nashorn/internal/performance/OctaneTest.java b/nashorn/test/src/jdk/nashorn/internal/performance/OctaneTest.java
index 87400d7f01b..7e402c65f98 100644
--- a/nashorn/test/src/jdk/nashorn/internal/performance/OctaneTest.java
+++ b/nashorn/test/src/jdk/nashorn/internal/performance/OctaneTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/src/jdk/nashorn/internal/performance/PerformanceWrapper.java b/nashorn/test/src/jdk/nashorn/internal/performance/PerformanceWrapper.java
index a2cbcfd8345..999f6fa4529 100644
--- a/nashorn/test/src/jdk/nashorn/internal/performance/PerformanceWrapper.java
+++ b/nashorn/test/src/jdk/nashorn/internal/performance/PerformanceWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/src/jdk/nashorn/internal/performance/SplayTest.java b/nashorn/test/src/jdk/nashorn/internal/performance/SplayTest.java
index ff0275968e1..e937a0f4baa 100644
--- a/nashorn/test/src/jdk/nashorn/internal/performance/SplayTest.java
+++ b/nashorn/test/src/jdk/nashorn/internal/performance/SplayTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/ContextTest.java b/nashorn/test/src/jdk/nashorn/internal/runtime/ContextTest.java
index 567fc85ccab..059c98c3f91 100644
--- a/nashorn/test/src/jdk/nashorn/internal/runtime/ContextTest.java
+++ b/nashorn/test/src/jdk/nashorn/internal/runtime/ContextTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/JSTypeTest.java b/nashorn/test/src/jdk/nashorn/internal/runtime/JSTypeTest.java
index 59938e2313e..d3b80dfb49c 100644
--- a/nashorn/test/src/jdk/nashorn/internal/runtime/JSTypeTest.java
+++ b/nashorn/test/src/jdk/nashorn/internal/runtime/JSTypeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/Nashorn401TestSubject.java b/nashorn/test/src/jdk/nashorn/internal/runtime/Nashorn401TestSubject.java
index 6a80973995e..ed6475de942 100644
--- a/nashorn/test/src/jdk/nashorn/internal/runtime/Nashorn401TestSubject.java
+++ b/nashorn/test/src/jdk/nashorn/internal/runtime/Nashorn401TestSubject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/AbstractScriptRunnable.java b/nashorn/test/src/jdk/nashorn/internal/test/framework/AbstractScriptRunnable.java
index 2d57aa14baf..3fd5c218c76 100644
--- a/nashorn/test/src/jdk/nashorn/internal/test/framework/AbstractScriptRunnable.java
+++ b/nashorn/test/src/jdk/nashorn/internal/test/framework/AbstractScriptRunnable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/JSJUnitReportReporter.java b/nashorn/test/src/jdk/nashorn/internal/test/framework/JSJUnitReportReporter.java
index cb9f151bf4f..7f6bd8fdb65 100644
--- a/nashorn/test/src/jdk/nashorn/internal/test/framework/JSJUnitReportReporter.java
+++ b/nashorn/test/src/jdk/nashorn/internal/test/framework/JSJUnitReportReporter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/OrphanTestFinder.java b/nashorn/test/src/jdk/nashorn/internal/test/framework/OrphanTestFinder.java
index d4fc21799b1..c9c567d9255 100644
--- a/nashorn/test/src/jdk/nashorn/internal/test/framework/OrphanTestFinder.java
+++ b/nashorn/test/src/jdk/nashorn/internal/test/framework/OrphanTestFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/ParallelTestRunner.java b/nashorn/test/src/jdk/nashorn/internal/test/framework/ParallelTestRunner.java
index 96ddb8a8798..cc0e1cd3c11 100644
--- a/nashorn/test/src/jdk/nashorn/internal/test/framework/ParallelTestRunner.java
+++ b/nashorn/test/src/jdk/nashorn/internal/test/framework/ParallelTestRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/ScriptEvaluator.java b/nashorn/test/src/jdk/nashorn/internal/test/framework/ScriptEvaluator.java
index a08f52f3f66..6a2eebb7b38 100644
--- a/nashorn/test/src/jdk/nashorn/internal/test/framework/ScriptEvaluator.java
+++ b/nashorn/test/src/jdk/nashorn/internal/test/framework/ScriptEvaluator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/ScriptRunnable.java b/nashorn/test/src/jdk/nashorn/internal/test/framework/ScriptRunnable.java
index 2c67bbe61ea..20548d75a25 100644
--- a/nashorn/test/src/jdk/nashorn/internal/test/framework/ScriptRunnable.java
+++ b/nashorn/test/src/jdk/nashorn/internal/test/framework/ScriptRunnable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/ScriptTest.java b/nashorn/test/src/jdk/nashorn/internal/test/framework/ScriptTest.java
index 25e4d7d4f4f..acaf5424cb5 100644
--- a/nashorn/test/src/jdk/nashorn/internal/test/framework/ScriptTest.java
+++ b/nashorn/test/src/jdk/nashorn/internal/test/framework/ScriptTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/SeparateContextEvaluator.java b/nashorn/test/src/jdk/nashorn/internal/test/framework/SeparateContextEvaluator.java
index 2df3ec63a25..d108a1b0bda 100644
--- a/nashorn/test/src/jdk/nashorn/internal/test/framework/SeparateContextEvaluator.java
+++ b/nashorn/test/src/jdk/nashorn/internal/test/framework/SeparateContextEvaluator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/SharedContextEvaluator.java b/nashorn/test/src/jdk/nashorn/internal/test/framework/SharedContextEvaluator.java
index 261587497b8..8a041eb062d 100644
--- a/nashorn/test/src/jdk/nashorn/internal/test/framework/SharedContextEvaluator.java
+++ b/nashorn/test/src/jdk/nashorn/internal/test/framework/SharedContextEvaluator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/TestConfig.java b/nashorn/test/src/jdk/nashorn/internal/test/framework/TestConfig.java
index 794cbdf5de5..cf798f6722f 100644
--- a/nashorn/test/src/jdk/nashorn/internal/test/framework/TestConfig.java
+++ b/nashorn/test/src/jdk/nashorn/internal/test/framework/TestConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/TestFinder.java b/nashorn/test/src/jdk/nashorn/internal/test/framework/TestFinder.java
index cb1fbbe8375..a326a59906a 100644
--- a/nashorn/test/src/jdk/nashorn/internal/test/framework/TestFinder.java
+++ b/nashorn/test/src/jdk/nashorn/internal/test/framework/TestFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/TestHelper.java b/nashorn/test/src/jdk/nashorn/internal/test/framework/TestHelper.java
index 52cb03edf44..b48ed8b5c19 100644
--- a/nashorn/test/src/jdk/nashorn/internal/test/framework/TestHelper.java
+++ b/nashorn/test/src/jdk/nashorn/internal/test/framework/TestHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/TestReorderInterceptor.java b/nashorn/test/src/jdk/nashorn/internal/test/framework/TestReorderInterceptor.java
index 4f028d72f0e..7d7a7a305db 100644
--- a/nashorn/test/src/jdk/nashorn/internal/test/framework/TestReorderInterceptor.java
+++ b/nashorn/test/src/jdk/nashorn/internal/test/framework/TestReorderInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/models/ConstructorWithArgument.java b/nashorn/test/src/jdk/nashorn/internal/test/models/ConstructorWithArgument.java
index d079a7ba461..ba4a21637d0 100644
--- a/nashorn/test/src/jdk/nashorn/internal/test/models/ConstructorWithArgument.java
+++ b/nashorn/test/src/jdk/nashorn/internal/test/models/ConstructorWithArgument.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/models/FinalClass.java b/nashorn/test/src/jdk/nashorn/internal/test/models/FinalClass.java
index 4446e9422f3..b20257cb81c 100644
--- a/nashorn/test/src/jdk/nashorn/internal/test/models/FinalClass.java
+++ b/nashorn/test/src/jdk/nashorn/internal/test/models/FinalClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/models/NoAccessibleConstructorClass.java b/nashorn/test/src/jdk/nashorn/internal/test/models/NoAccessibleConstructorClass.java
index bb693630878..c79edfbb96e 100644
--- a/nashorn/test/src/jdk/nashorn/internal/test/models/NoAccessibleConstructorClass.java
+++ b/nashorn/test/src/jdk/nashorn/internal/test/models/NoAccessibleConstructorClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/models/NonPublicClass.java b/nashorn/test/src/jdk/nashorn/internal/test/models/NonPublicClass.java
index c9e97619a87..046cdf244ab 100644
--- a/nashorn/test/src/jdk/nashorn/internal/test/models/NonPublicClass.java
+++ b/nashorn/test/src/jdk/nashorn/internal/test/models/NonPublicClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/models/OuterClass.java b/nashorn/test/src/jdk/nashorn/internal/test/models/OuterClass.java
index 1e2b86d502d..cb9484b94ca 100644
--- a/nashorn/test/src/jdk/nashorn/internal/test/models/OuterClass.java
+++ b/nashorn/test/src/jdk/nashorn/internal/test/models/OuterClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/models/OverloadedSam.java b/nashorn/test/src/jdk/nashorn/internal/test/models/OverloadedSam.java
index 06ccc51b210..c63da54c2b8 100644
--- a/nashorn/test/src/jdk/nashorn/internal/test/models/OverloadedSam.java
+++ b/nashorn/test/src/jdk/nashorn/internal/test/models/OverloadedSam.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/models/OverrideObject.java b/nashorn/test/src/jdk/nashorn/internal/test/models/OverrideObject.java
index 78f49565192..40cf7f97a6e 100644
--- a/nashorn/test/src/jdk/nashorn/internal/test/models/OverrideObject.java
+++ b/nashorn/test/src/jdk/nashorn/internal/test/models/OverrideObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

From 24e583d55f8f48a501ec6690327043ab00dd3278 Mon Sep 17 00:00:00 2001
From: Marcus Lagergren <lagergren@openjdk.org>
Date: Mon, 7 Jan 2013 19:31:36 +0100
Subject: [PATCH 045/311] 8005789: Forgot to document
 -Dnashorn.unstable.relink.threshold

Added documentation to DEVELOPER_README, fixed code convention warnings

Reviewed-by: attila
---
 nashorn/docs/DEVELOPER_README                            | 9 +++++++++
 .../src/jdk/nashorn/internal/codegen/CodeGenerator.java  | 2 --
 nashorn/src/jdk/nashorn/internal/codegen/Splitter.java   | 9 +++++----
 .../src/jdk/nashorn/internal/runtime/PropertyMap.java    | 3 ++-
 .../jdk/nashorn/internal/runtime/options/Options.java    | 2 +-
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/nashorn/docs/DEVELOPER_README b/nashorn/docs/DEVELOPER_README
index 747379bc87b..a4859701770 100644
--- a/nashorn/docs/DEVELOPER_README
+++ b/nashorn/docs/DEVELOPER_README
@@ -13,6 +13,15 @@ properties described herein are subject to change without notice.
 This documentation of the system property flags assume that the
 default value of the flag is false, unless otherwise specified.
 
+SYSTEM PROPERTY: -Dnashorn.unstable.relink.threshold=x
+
+This property controls how many call site misses are allowed before a 
+callsite is relinked with "apply" semantics to never change again. 
+In the case of megamorphic callsites, this is necessary, or the 
+program would spend all its time swapping out callsite targets. Dynalink 
+has a default value (currently 8 relinks) for this property if it 
+is not explicitly set.
+
 
 SYSTEM PROPERTY: -Dnashorn.callsiteaccess.debug
 
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
index 539bcdb41bb..444c9839123 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
@@ -130,13 +130,11 @@ import jdk.nashorn.internal.runtime.linker.LinkerCallSite;
  * keeps track of the contents of the byte code stack. This way we avoid a large
  * number of special cases on the form
  * <pre>
- * {@code
  * if (type == INT) {
  *     visitInsn(ILOAD, slot);
  * } else if (type == DOUBLE) {
  *     visitInsn(DOUBLE, slot);
  * }
- * }
  * </pre>
  * This quickly became apparent when the code generator was generalized to work
  * with all types, and not just numbers or objects.
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Splitter.java b/nashorn/src/jdk/nashorn/internal/codegen/Splitter.java
index c692035d42e..f7f193eee6c 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Splitter.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Splitter.java
@@ -73,13 +73,14 @@ public class Splitter extends NodeVisitor {
     /**
      * Constructor.
      *
-     * @param compiler     the compiler
-     * @param functionNode function node to split
+     * @param compiler           the compiler
+     * @param functionNode       function node to split
+     * @param scriptCompileUnit  script compile unit
      */
-    public Splitter(final Compiler compiler, final FunctionNode functionNode, final CompileUnit compileUnit) {
+    public Splitter(final Compiler compiler, final FunctionNode functionNode, final CompileUnit scriptCompileUnit) {
         this.compiler     = compiler;
         this.functionNode = functionNode;
-        this.scriptCompileUnit = compileUnit;
+        this.scriptCompileUnit = scriptCompileUnit;
     }
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java b/nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java
index 67ff96421b7..f2d34c2a3e1 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java
@@ -176,9 +176,10 @@ public final class PropertyMap implements Iterable<Object>, PropertyListener {
     /**
      * Return a sharable empty map.
      *
+     * @param  context the context
      * @return New empty {@link PropertyMap}.
      */
-    public static PropertyMap newEmptyMap(Context context) {
+    public static PropertyMap newEmptyMap(final Context context) {
         return new PropertyMap(jdk.nashorn.internal.scripts.JO$.class, context, EMPTY_MAP);
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/options/Options.java b/nashorn/src/jdk/nashorn/internal/runtime/options/Options.java
index e0048af061c..af883c1df34 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/options/Options.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/options/Options.java
@@ -493,7 +493,7 @@ public final class Options {
             return new Option<>(value != null && Boolean.parseBoolean(value));
         case "integer":
             try {
-                return new Option<>((Integer)((value == null)? 0 : Integer.parseInt(value)));
+                return new Option<>((value == null) ? 0 : Integer.parseInt(value));
             } catch (final NumberFormatException nfe) {
                 throw new IllegalOptionException(t);
             }

From 569e8ef1703c133d31db217d07327eda91548f62 Mon Sep 17 00:00:00 2001
From: Petr Hejl <petr.hejl@oracle.com>
Date: Mon, 7 Jan 2013 14:41:16 -0400
Subject: [PATCH 046/311] 8005703: Offsets miscalculated for blocks

Reviewed-by: lagergren
---
 nashorn/src/jdk/nashorn/internal/ir/Block.java           | 3 +++
 .../src/jdk/nashorn/internal/parser/AbstractParser.java  | 3 ++-
 nashorn/src/jdk/nashorn/internal/parser/Parser.java      | 9 ++++++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/nashorn/src/jdk/nashorn/internal/ir/Block.java b/nashorn/src/jdk/nashorn/internal/ir/Block.java
index 1d220a594aa..d7ec5a5289c 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/Block.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/Block.java
@@ -185,6 +185,9 @@ public class Block extends Node {
     public void addStatement(final Node statement) {
         if (statement != null) {
             statements.add(statement);
+            if (getFinish() < statement.getFinish()) {
+                setFinish(statement.getFinish());
+            }
         }
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/parser/AbstractParser.java b/nashorn/src/jdk/nashorn/internal/parser/AbstractParser.java
index 75a3443aadf..c1df1fcf2e9 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/AbstractParser.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/AbstractParser.java
@@ -429,6 +429,8 @@ public abstract class AbstractParser {
 
         // Create literal node.
         final Object value = getValue();
+        // Advance to have a correct finish
+        next();
 
         LiteralNode<?> node = null;
 
@@ -452,7 +454,6 @@ public abstract class AbstractParser {
             assert false : "unknown type for LiteralNode: " + value.getClass();
         }
 
-        next();
         return node;
     }
 }
diff --git a/nashorn/src/jdk/nashorn/internal/parser/Parser.java b/nashorn/src/jdk/nashorn/internal/parser/Parser.java
index c05f971f58a..80e5f431f6b 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/Parser.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/Parser.java
@@ -938,7 +938,11 @@ loop:
 
         // If is a statement then handle end of line.
         if (isStatement) {
+            boolean semicolon = type == SEMICOLON;
             endOfLine();
+            if (semicolon) {
+                block.setFinish(finish);
+            }
         }
 
         return vars;
@@ -954,7 +958,8 @@ loop:
      */
     private void emptyStatement() {
         if (context._empty_statements) {
-            block.addStatement(new EmptyNode(source, token, Token.descPosition(token)));
+            block.addStatement(new EmptyNode(source, token,
+                    Token.descPosition(token) + Token.descLength(token)));
         }
 
         // SEMICOLON checked in caller.
@@ -988,6 +993,7 @@ loop:
 
         if (executeNode != null) {
             executeNode.setFinish(finish);
+            block.setFinish(finish);
         }
     }
 
@@ -1571,6 +1577,7 @@ loop:
                 // Get CASE body.
                 final Block statements = getBlock(false);
                 final CaseNode caseNode = new CaseNode(source, caseToken, finish, caseExpression, statements);
+                statements.setFinish(finish);
 
                 if (caseExpression == null) {
                     defaultCase = caseNode;

From b501e8fdc459c47fd56c321e82e08385e10f62a8 Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Tue, 8 Jan 2013 08:51:00 +0530
Subject: [PATCH 047/311] 8005782: get rid of javadoc errors, warnings in
 nashorn build

Reviewed-by: lagergren
---
 nashorn/make/build.xml                            | 15 ++++++++++-----
 nashorn/make/project.properties                   |  7 +++----
 .../nashorn/internal/codegen/MethodEmitter.java   |  4 ++--
 .../jdk/nashorn/internal/runtime/ECMAErrors.java  |  5 ++++-
 .../jdk/nashorn/internal/runtime/PropertyMap.java |  6 +++---
 5 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/nashorn/make/build.xml b/nashorn/make/build.xml
index bfff718938a..b89363529d2 100644
--- a/nashorn/make/build.xml
+++ b/nashorn/make/build.xml
@@ -63,7 +63,7 @@
 
   <!-- do it only if ASM is not available -->
   <target name="compile-asm" depends="prepare" unless="asm.available">
-    <javac srcdir="${asm.src.dir}"
+    <javac srcdir="${jdk.asm.src.dir}"
            destdir="${build.classes.dir}"
            excludes="**/optimizer/* **/xml/* **/attrs/*"
            source="${javac.source}"
@@ -142,15 +142,20 @@
     </jar>
   </target>
 
-  <target name="javadoc" depends="compile-asm">
-    <javadoc destdir="${dist.javadoc.dir}" use="yes" overview="src/overview.html" windowtitle="${nashorn.product.name} ${nashorn.version}">
+  <target name="javadoc" depends="prepare">
+    <javadoc destdir="${dist.javadoc.dir}" use="yes" overview="src/overview.html" windowtitle="${nashorn.product.name} ${nashorn.version}" additionalparam="-quiet" failonerror="true">
       <classpath>
         <pathelement location="${build.classes.dir}"/>
         <pathelement location="${dynalink.jar}"/>
       </classpath>
       <fileset dir="${src.dir}" includes="**/*.java"/>
-      <link href="http://docs.oracle.com/javase/7/docs/api"/>
-      <link href="http://szegedi.github.com/dynalink/0.4/javadoc"/>
+      <fileset dir="${jdk.asm.src.dir}" includes="**/*.java"/>
+      <link href="http://docs.oracle.com/javase/7/docs/api/"/>
+      <link href="http://szegedi.github.com/dynalink/0.4/javadoc/"/>
+      <!-- The following tags are used only in ASM sources - just ignore these -->
+      <tag name="label" description="label tag in ASM sources" enabled="false"/>
+      <tag name="linked" description="linked tag in ASM sources" enabled="false"/>
+      <tag name="associates" description="associates tag in ASM sources" enabled="false"/>
     </javadoc>
   </target>
 
diff --git a/nashorn/make/project.properties b/nashorn/make/project.properties
index b6c85709023..3868ead55fd 100644
--- a/nashorn/make/project.properties
+++ b/nashorn/make/project.properties
@@ -23,6 +23,9 @@
 
 application.title=nashorn
 
+# location of JDK embedded ASM sources
+jdk.asm.src.dir=../jdk/src/share/classes/jdk/internal
+
 # source and target levels
 build.compiler=modern
 javac.source=1.7
@@ -58,10 +61,6 @@ dist.dir=dist
 dist.jar=${dist.dir}/nashorn.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 
-# directory where asm project lives
-asm.dir=../asm
-asm.src.dir=${asm.dir}/src
-
 # jars refererred
 file.reference.testng.jar=test/lib/testng.jar
 
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java b/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java
index 78d5ab77fd5..6a8b2febffa 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java
@@ -155,7 +155,7 @@ public class MethodEmitter implements Emitter {
 
     /**
      * Constructor - internal use from ClassEmitter only
-     * @see ClassEmitter.method
+     * @see ClassEmitter#method
      *
      * @param classEmitter the class emitter weaving the class this method is in
      * @param method       a method visitor
@@ -166,7 +166,7 @@ public class MethodEmitter implements Emitter {
 
     /**
      * Constructor - internal use from ClassEmitter only
-     * @see ClassEmitter.method
+     * @see ClassEmitter#method
      *
      * @param classEmitter the class emitter weaving the class this method is in
      * @param method       a method visitor
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ECMAErrors.java b/nashorn/src/jdk/nashorn/internal/runtime/ECMAErrors.java
index ceabcd22f7e..c0ab05479c7 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ECMAErrors.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ECMAErrors.java
@@ -38,13 +38,16 @@ public final class ECMAErrors {
     private static final String MESSAGES_RESOURCE = "jdk.nashorn.internal.runtime.resources.Messages";
 
     // Without do privileged, under security manager messages can not be loaded.
-    private static final ResourceBundle MESSAGES_BUNDLE = AccessController.doPrivileged(
+    private static final ResourceBundle MESSAGES_BUNDLE;
+    static {
+        MESSAGES_BUNDLE = AccessController.doPrivileged(
         new PrivilegedAction<ResourceBundle>() {
             @Override
             public ResourceBundle run() {
                 return ResourceBundle.getBundle(MESSAGES_RESOURCE, Locale.getDefault());
             }
         });
+    }
 
     private ECMAErrors() {
     }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java b/nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java
index f2d34c2a3e1..f6426387b49 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java
@@ -417,8 +417,8 @@ public final class PropertyMap implements Iterable<Object>, PropertyListener {
     /**
      * Prevents properties in map from being modified.
      *
-     * @return New map with {@link NOT_EXTENSIBLE} flag set and properties with
-     * {@link Property.NOT_CONFIGURABLE} set.
+     * @return New map with {@link #NOT_EXTENSIBLE} flag set and properties with
+     * {@link Property#NOT_CONFIGURABLE} set.
      */
     PropertyMap seal() {
         PropertyHashMap newProperties = EMPTY_MAP;
@@ -437,7 +437,7 @@ public final class PropertyMap implements Iterable<Object>, PropertyListener {
      * Prevents properties in map from being modified or written to.
      *
      * @return New map with {@link #NOT_EXTENSIBLE} flag set and properties with
-     * {@link Property.NOT_CONFIGURABLE} and {@link Property.NOT_WRITABLE} set.
+     * {@link Property#NOT_CONFIGURABLE} and {@link Property#NOT_WRITABLE} set.
      */
     PropertyMap freeze() {
         PropertyHashMap newProperties = EMPTY_MAP;

From 51ceb762403463b079552432a69292289e6a97eb Mon Sep 17 00:00:00 2001
From: Marcus Lagergren <lagergren@openjdk.org>
Date: Tue, 8 Jan 2013 09:59:28 +0100
Subject: [PATCH 048/311] 8005788: Loggers and their corresponding system
 properties not working correctly

1-1 mapping now maintained. Used Context err instead of System.err in several places (after bootstrapping Context). Problematic closing of err stream replaced by @SuppressWarnings("resource")

Reviewed-by: jlaskey, sundar
---
 nashorn/bin/fixorphantests.sh                 |  0
 nashorn/bin/fixwhitespace.sh                  |  0
 .../src/jdk/nashorn/internal/ir/Symbol.java   | 34 +++----
 .../nashorn/internal/objects/NativeDebug.java |  9 +-
 .../jdk/nashorn/internal/runtime/Context.java | 28 +++---
 .../nashorn/internal/runtime/DebugLogger.java |  8 +-
 .../internal/runtime/ECMAException.java       |  5 +-
 .../internal/runtime/ErrorManager.java        |  2 +-
 .../jdk/nashorn/internal/runtime/Logging.java | 86 +++++++++--------
 .../runtime/linker/LinkerCallSite.java        | 48 +++++-----
 .../runtime/linker/MethodHandleFactory.java   | 93 ++++++++++---------
 .../internal/runtime/options/Options.java     | 44 ++++-----
 nashorn/src/jdk/nashorn/tools/Shell.java      |  2 +-
 13 files changed, 192 insertions(+), 167 deletions(-)
 mode change 100644 => 100755 nashorn/bin/fixorphantests.sh
 mode change 100644 => 100755 nashorn/bin/fixwhitespace.sh

diff --git a/nashorn/bin/fixorphantests.sh b/nashorn/bin/fixorphantests.sh
old mode 100644
new mode 100755
diff --git a/nashorn/bin/fixwhitespace.sh b/nashorn/bin/fixwhitespace.sh
old mode 100644
new mode 100755
diff --git a/nashorn/src/jdk/nashorn/internal/ir/Symbol.java b/nashorn/src/jdk/nashorn/internal/ir/Symbol.java
index 944829ec7c3..57bf2daac8c 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/Symbol.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/Symbol.java
@@ -27,6 +27,7 @@ package jdk.nashorn.internal.ir;
 
 import java.io.PrintWriter;
 import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.runtime.Context;
 import jdk.nashorn.internal.runtime.options.Options;
 
 /**
@@ -549,12 +550,7 @@ public final class Symbol implements Comparable<Symbol> {
      * @param slot valid bytecode slot, or -1 if not available
      */
     public void setSlot(final int slot) {
-        if (TRACE_SYMBOL != null) {
-            if (TRACE_SYMBOL.equals(name)) {
-                System.err.println(name + " gets slot " + slot);
-                new Throwable().printStackTrace();
-            }
-        }
+        trace("SET SLOT " + slot);
         this.slot = slot;
     }
 
@@ -574,18 +570,7 @@ public final class Symbol implements Comparable<Symbol> {
      * @param type the type
      */
     public void setType(final Type type) {
-        if (TRACE_SYMBOL == null) {
-            setTypeOverride(Type.widest(this.type, type));
-        } else {
-            final boolean check = TRACE_SYMBOL.equals(getName());
-            final Type from = this.type;
-            setTypeOverride(Type.widest(this.type, type));
-
-            if (check) {
-                System.err.println(getName() + " " + from + "=>" + type + " == " + this.type);
-                new Throwable().printStackTrace();
-            }
-        }
+        setTypeOverride(Type.widest(this.type, type));
     }
 
     /**
@@ -596,7 +581,11 @@ public final class Symbol implements Comparable<Symbol> {
      * @param type  the type
      */
     public void setTypeOverride(final Type type) {
-        this.type = type;
+        final Type old = this.type;
+        if (old != type) {
+            trace("TYPE CHANGE: " + old + "=>" + type + " == " + type);
+            this.type = type;
+        }
     }
 
     /**
@@ -607,4 +596,11 @@ public final class Symbol implements Comparable<Symbol> {
     public boolean isTopLevel() {
         return block instanceof FunctionNode && ((FunctionNode) block).isScript();
     }
+
+    private void trace(final String desc) {
+        if (TRACE_SYMBOL != null && TRACE_SYMBOL.equals(name)) {
+            Context.err("SYMBOL: '" + name + "' " + desc);
+            new Throwable().printStackTrace(Context.getContext().getErr());
+        }
+    }
 }
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeDebug.java b/nashorn/src/jdk/nashorn/internal/objects/NativeDebug.java
index 6634706deea..92c030b34a9 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeDebug.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeDebug.java
@@ -27,12 +27,13 @@ package jdk.nashorn.internal.objects;
 
 import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 
-import java.io.PrintStream;
+import java.io.PrintWriter;
 import java.util.Objects;
 import jdk.nashorn.internal.objects.annotations.Attribute;
 import jdk.nashorn.internal.objects.annotations.Function;
 import jdk.nashorn.internal.objects.annotations.ScriptClass;
 import jdk.nashorn.internal.objects.annotations.Where;
+import jdk.nashorn.internal.runtime.Context;
 import jdk.nashorn.internal.runtime.PropertyListenerManager;
 import jdk.nashorn.internal.runtime.PropertyMap;
 import jdk.nashorn.internal.runtime.ScriptFunction;
@@ -248,9 +249,11 @@ public class NativeDebug extends ScriptObject {
      * @param self self reference
      * @return undefined
      */
+    @SuppressWarnings("resource")
     @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
     public static Object dumpCounters(final Object self) {
-        final PrintStream out = System.err;
+        final PrintWriter out = Context.getContext().getErr();
+
         out.println("ScriptObject count " + ScriptObject.getCount());
         out.println("Scope count " + ScriptObject.getScopeCount());
         out.println("ScriptObject listeners added " + PropertyListenerManager.getListenersAdded());
@@ -268,7 +271,9 @@ public class NativeDebug extends ScriptObject {
         out.println("Callsite count " + LinkerCallSite.getCount());
         out.println("Callsite misses " + LinkerCallSite.getMissCount());
         out.println("Callsite misses by site at " + LinkerCallSite.getMissSamplingPercentage() + "%");
+
         LinkerCallSite.getMissCounts(out);
+
         return UNDEFINED;
     }
 }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Context.java b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
index 24adf3a623a..786e65e514a 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/Context.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
@@ -71,6 +71,12 @@ public final class Context {
             }
         };
 
+    /**
+     * Get the error stream if applicable and initialized, otherwise stderr
+     * Usually this is the error stream given the context, but for testing and
+     * certain bootstrapping situations we need a default stream
+     */
+
     /**
      * Return the current global scope
      * @return current global scope
@@ -119,20 +125,14 @@ public final class Context {
      * @param str  text to write
      * @param crlf write a carriage return/new line after text
      */
+    @SuppressWarnings("resource")
     public static void err(final String str, final boolean crlf) {
-        try (final PrintWriter err = Context.getContext().getErr()) {
-            if (err != null) {
-                if (crlf) {
-                    err.println(str);
-                } else {
-                    err.print(str);
-                }
+        final PrintWriter err = Context.getContext().getErr();
+        if (err != null) {
+            if (crlf) {
+                err.println(str);
             } else {
-                if (crlf) {
-                    System.err.println(str);
-                } else {
-                    System.err.println();
-                }
+                err.print(str);
             }
         }
     }
@@ -680,13 +680,11 @@ public final class Context {
      * Hook to print stack trace for a {@link Throwable} that occurred during
      * execution
      *
-     * TODO: use Context.err
-     * .
      * @param t throwable for which to dump stack
      */
     public static void printStackTrace(final Throwable t) {
         if (Context.DEBUG) {
-            t.printStackTrace();
+            t.printStackTrace(Context.getContext().getErr());
         }
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/DebugLogger.java b/nashorn/src/jdk/nashorn/internal/runtime/DebugLogger.java
index cb92ca76ad4..f2aeafdff6a 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/DebugLogger.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/DebugLogger.java
@@ -59,8 +59,12 @@ public class DebugLogger {
      * @param property   system property activating the logger on {@code info} level
      */
     public DebugLogger(final String loggerName, final String property) {
-        this.logger    = Logging.getLogger(loggerName);
-        this.isEnabled = logger.getLevel() != Level.OFF || (property != null && Options.getBooleanProperty(property));
+        if (property != null && Options.getBooleanProperty(property)) {
+            this.logger = Logging.getOrCreateLogger(loggerName, Level.INFO);
+        } else {
+            this.logger = Logging.getLogger(loggerName);
+        }
+        this.isEnabled = logger.getLevel() != Level.OFF;
     }
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ECMAException.java b/nashorn/src/jdk/nashorn/internal/runtime/ECMAException.java
index 8d5ab4bdb39..65ab9a76c66 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ECMAException.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ECMAException.java
@@ -181,11 +181,10 @@ public final class ECMAException extends NashornException {
      */
     public static Object printStackTrace(final ScriptObject errObj) {
         final Object exception = getException(errObj);
-        //TODO context err instead of System.err default
         if (exception instanceof Throwable) {
-            ((Throwable)exception).printStackTrace();
+            ((Throwable)exception).printStackTrace(Context.getContext().getErr());
         } else {
-            System.err.println("<stack trace not available>");
+            Context.err("<stack trace not available>");
         }
         return UNDEFINED;
     }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ErrorManager.java b/nashorn/src/jdk/nashorn/internal/runtime/ErrorManager.java
index 9aa933b5a81..f0d1c013ca0 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ErrorManager.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ErrorManager.java
@@ -55,7 +55,7 @@ public class ErrorManager {
      * Constructor
      */
     public ErrorManager() {
-        this(new PrintWriter(System.err, true));
+        this(new PrintWriter(System.err, true)); //bootstrapping, context may not be initialized
     }
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Logging.java b/nashorn/src/jdk/nashorn/internal/runtime/Logging.java
index 809ecd53379..6aca193c325 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/Logging.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Logging.java
@@ -72,17 +72,7 @@ public class Logging {
      * Get a logger for a given class, generating a logger name based on the
      * class name
      *
-     * @param clazz the class
-     * @return the logger
-     */
-    public static Logger getLogger0(final Class<?> clazz) {
-        return Logging.getLogger(Logging.lastPart(clazz.getPackage().getName()));
-    }
-
-    /**
-     * Get a logger for a given name
-     *
-     * @param name the name to use as key
+     * @param name the name to use as key for the logger
      * @return the logger
      */
     public static Logger getLogger(final String name) {
@@ -93,6 +83,23 @@ public class Logging {
         return Logging.disabledLogger;
     }
 
+    /**
+     * Get a logger for a given name or create it if not already there, typically
+     * used for mapping system properties to loggers
+     *
+     * @param name the name to use as key
+     * @param level log lever to reset existing logger with, or create new logger with
+     * @return the logger
+     */
+    public static Logger getOrCreateLogger(final String name, final Level level) {
+        final Logger logger = Logging.loggers.get(name);
+        if (logger == null) {
+            return instantiateLogger(name, level);
+        }
+        logger.setLevel(level);
+        return logger;
+    }
+
     /**
      * Initialization function that is called to instantiate the logging system. It takes
      * logger names (keys) and logging labels respectively
@@ -114,32 +121,7 @@ public class Logging {
                 }
 
                 final String name = Logging.lastPart(key);
-
-                final Logger logger = java.util.logging.Logger.getLogger(name);
-                for (final Handler h : logger.getHandlers()) {
-                    logger.removeHandler(h);
-                }
-
-                logger.setLevel(level);
-                logger.setUseParentHandlers(false);
-                final Handler c = new ConsoleHandler();
-
-                c.setFormatter(new Formatter() {
-                    @Override
-                    public String format(final LogRecord record) {
-                        final StringBuilder sb = new StringBuilder();
-
-                        sb.append('[')
-                           .append(record.getLoggerName())
-                           .append("] ")
-                           .append(record.getMessage())
-                           .append('\n');
-
-                        return sb.toString();
-                    }
-                });
-                logger.addHandler(c);
-                c.setLevel(level);
+                final Logger logger = instantiateLogger(name, level);
 
                 Logging.loggers.put(name, logger);
             }
@@ -148,4 +130,34 @@ public class Logging {
         }
     }
 
+    private static Logger instantiateLogger(final String name, final Level level) {
+        final Logger logger = java.util.logging.Logger.getLogger(name);
+        for (final Handler h : logger.getHandlers()) {
+            logger.removeHandler(h);
+        }
+
+        logger.setLevel(level);
+        logger.setUseParentHandlers(false);
+        final Handler c = new ConsoleHandler();
+
+        c.setFormatter(new Formatter() {
+            @Override
+            public String format(final LogRecord record) {
+                final StringBuilder sb = new StringBuilder();
+
+                sb.append('[')
+                   .append(record.getLoggerName())
+                   .append("] ")
+                   .append(record.getMessage())
+                   .append('\n');
+
+                return sb.toString();
+            }
+        });
+        logger.addHandler(c);
+        c.setLevel(level);
+
+        return logger;
+    }
+
 }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java
index bfe2220ea70..044ba9b9701 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java
@@ -29,8 +29,7 @@ import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
 
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
-import java.io.OutputStream;
-import java.io.PrintStream;
+import java.io.PrintWriter;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
@@ -275,24 +274,35 @@ public class LinkerCallSite extends ChainedCallSite {
         }
 
         static class ProfileDumper implements Runnable {
+            @SuppressWarnings("resource")
             @Override
             public void run() {
-                OutputStream out;
+                PrintWriter out = null;
+                boolean fileOutput = false;
 
                 try {
-                    out = new FileOutputStream(PROFILEFILE);
-                } catch (final FileNotFoundException e) {
-                    out = new PrintStream(System.err); //TODO abstraction break- why is this hard coded to System.err when everything else uses the context
-                }
-
-                try (PrintStream stream = new PrintStream(out)) {
-                    int index = 0;
-                    for (final ProfilingLinkerCallSite callSite : profileCallSites) {
-                       stream.println("" + (index++) + '\t' +
-                                      callSite.getDescriptor().getName() + '\t' +
-                                      callSite.totalTime + '\t' +
-                                      callSite.hitCount);
+                    try {
+                        out = new PrintWriter(new FileOutputStream(PROFILEFILE));
+                        fileOutput = true;
+                    } catch (final FileNotFoundException e) {
+                        out = Context.getContext().getErr();
                     }
+
+                    dump(out);
+                } finally {
+                    if (out != null && fileOutput) {
+                        out.close();
+                    }
+                }
+            }
+
+            private static void dump(final PrintWriter out) {
+                int index = 0;
+                for (final ProfilingLinkerCallSite callSite : profileCallSites) {
+                   out.println("" + (index++) + '\t' +
+                                  callSite.getDescriptor().getName() + '\t' +
+                                  callSite.totalTime + '\t' +
+                                  callSite.hitCount);
                 }
             }
         }
@@ -307,11 +317,7 @@ public class LinkerCallSite extends ChainedCallSite {
         private static final MethodHandle TRACEVOID   = findOwnMH("traceVoid", void.class, MethodHandle.class, Object[].class);
         private static final MethodHandle TRACEMISS   = findOwnMH("traceMiss", void.class, Object[].class);
 
-        private static final PrintStream out = System.err; //TODO abstraction break- why is this hard coded to System.err when everything else uses the context
-
-        /*
-         * Constructor
-         */
+        private static final PrintWriter out = Context.getContext().getErr();
 
         TracingLinkerCallSite(final NashornCallSiteDescriptor desc) {
            super(desc);
@@ -522,7 +528,7 @@ public class LinkerCallSite extends ChainedCallSite {
      * Dump the miss counts collected so far to a given output stream
      * @param out print stream
      */
-    public static void getMissCounts(final PrintStream out) {
+    public static void getMissCounts(final PrintWriter out) {
         final ArrayList<Entry<String, AtomicInteger>> entries = new ArrayList<>(missCounts.entrySet());
 
         Collections.sort(entries, new Comparator<Map.Entry<String, AtomicInteger>>() {
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/MethodHandleFactory.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/MethodHandleFactory.java
index ebb3ffda147..e3d23905f68 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/MethodHandleFactory.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/MethodHandleFactory.java
@@ -25,6 +25,13 @@
 
 package jdk.nashorn.internal.runtime.linker;
 
+import jdk.nashorn.internal.runtime.ConsString;
+import jdk.nashorn.internal.runtime.Debug;
+import jdk.nashorn.internal.runtime.DebugLogger;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.options.Options;
+
+import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -35,29 +42,23 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.logging.Level;
-import jdk.nashorn.internal.runtime.ConsString;
-import jdk.nashorn.internal.runtime.Debug;
-import jdk.nashorn.internal.runtime.DebugLogger;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.options.Options;
 
 /**
  * This class is abstraction for all method handle, switchpoint and method type
  * operations. This enables the functionality interface to be subclassed and
- * instrumented, as it has been proven vital to keep the number of method
+ * intrumensted, as it has been proven vital to keep the number of method
  * handles in the system down.
- * <p>
+ *
  * All operations of the above type should go through this class, and not
  * directly into java.lang.invoke
+ *
  */
 public final class MethodHandleFactory {
 
     private static final MethodHandles.Lookup PUBLIC_LOOKUP = MethodHandles.publicLookup();
     private static final MethodHandles.Lookup LOOKUP        = MethodHandles.lookup();
 
-    private static PrintStream ERR = System.err;
-
-    private static final Level TRACE_LEVEL = Level.FINEST;
+    private static final Level TRACE_LEVEL = Level.INFO;
 
     private MethodHandleFactory() {
     }
@@ -97,15 +98,26 @@ public final class MethodHandleFactory {
     }
 
     private static final MethodHandleFunctionality STANDARD = new StandardMethodHandleFunctionality();
-    private static final MethodHandleFunctionality FUNC     =
-        Options.getBooleanProperty("nashorn.methodhandles.debug") ?
-            (Options.getStringProperty("nashorn.methodhandles.debug","").equals("create") ?
-                new TraceCreateMethodHandleFunctionality() :
-                new TraceMethodHandleFunctionality())
-            : STANDARD;
+    private static final MethodHandleFunctionality FUNC;
+
+    private static final String DEBUG_PROPERTY = "nashorn.methodhandles.debug";
+    private static final DebugLogger LOG = new DebugLogger("methodhandles", DEBUG_PROPERTY);
+
+    static {
+        if (LOG.isEnabled() || Options.getBooleanProperty(DEBUG_PROPERTY)) {
+            if (Options.getStringProperty(DEBUG_PROPERTY, "").equals("create")) {
+                FUNC = new TraceCreateMethodHandleFunctionality();
+            } else {
+                FUNC = new TraceMethodHandleFunctionality();
+            }
+        } else {
+            FUNC  = STANDARD;
+        }
+    }
 
     private static final boolean PRINT_STACKTRACE = Options.getBooleanProperty("nashorn.methodhandles.debug.stacktrace");
 
+
     /**
      * Return the method handle functionality used for all method handle operations
      * @return a method handle functionality implementation
@@ -126,11 +138,7 @@ public final class MethodHandleFactory {
      */
     static Object traceReturn(final DebugLogger logger, final Object value) {
         final String str = "\treturn: " + stripName(value) + " [type=" + (value == null ? "null" : stripName(value.getClass()) + ']');
-        if (logger != null) {
-            logger.log(str, TRACE_LEVEL);
-        } else {
-            ERR.println(str);
-        }
+        logger.log(str, TRACE_LEVEL);
         return value;
     }
 
@@ -165,14 +173,19 @@ public final class MethodHandleFactory {
             }
         }
 
-        if (logger != null) {
-            logger.log(sb.toString(), TRACE_LEVEL);
-        } else {
-            ERR.print(sb);
-            if (PRINT_STACKTRACE) {
-                new Throwable().printStackTrace(ERR);
-            }
+        assert logger != null;
+        logger.log(sb.toString(), TRACE_LEVEL);
+        stacktrace(logger);
+    }
+
+    private static void stacktrace(final DebugLogger logger) {
+        if (!PRINT_STACKTRACE) {
+            return;
         }
+        final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        final PrintStream ps = new PrintStream(baos);
+        new Throwable().printStackTrace(ps);
+        logger.log(baos.toString(), TRACE_LEVEL);
     }
 
     private static String argString(final Object arg) {
@@ -198,18 +211,6 @@ public final class MethodHandleFactory {
         return arg.toString();
     }
 
-    /**
-     * Add a debug printout to a method handle, tracing parameters and return values. Output
-     * will be written to stderr.
-     *
-     * @param mh  method handle to trace
-     * @param tag start of trace message
-     * @return traced method handle
-     */
-    public static MethodHandle addDebugPrintout0(final MethodHandle mh, final Object tag) {
-        return addDebugPrintout(null, mh, 0, true, tag);
-    }
-
     /**
      * Add a debug printout to a method handle, tracing parameters and return values
      *
@@ -240,6 +241,7 @@ public final class MethodHandleFactory {
             return mh;
         }
 
+        assert logger != null;
         assert TRACE != null;
 
         MethodHandle trace = MethodHandles.insertArguments(TRACE, 0, logger, tag, paramStart);
@@ -263,7 +265,7 @@ public final class MethodHandleFactory {
     }
 
     /**
-     * The standard class that marshals all method handle operations to the java.lang.invoke
+     * The standard class that marshalls all method handle operations to the java.lang.invoke
      * package. This exists only so that it can be subclassed and method handles created from
      * Nashorn made possible to instrument.
      *
@@ -464,7 +466,7 @@ public final class MethodHandleFactory {
         }
 
         public MethodHandle debug(final MethodHandle master, final String str, final Object... args) {
-            return addDebugPrintout(null, master, Integer.MAX_VALUE, false, str + ' ' + describe(args));
+            return addDebugPrintout(LOG, master, Integer.MAX_VALUE, false, str + ' ' + describe(args));
         }
 
         @Override
@@ -602,7 +604,7 @@ public final class MethodHandleFactory {
         @Override
         public SwitchPoint createSwitchPoint() {
             final SwitchPoint sp = super.createSwitchPoint();
-            ERR.println("createSwitchPoint " + sp);
+            LOG.log("createSwitchPoint " + sp, TRACE_LEVEL);
             return sp;
         }
 
@@ -615,7 +617,7 @@ public final class MethodHandleFactory {
         @Override
         public MethodType type(final Class<?> returnType, final Class<?>... paramTypes) {
             final MethodType mt = super.type(returnType, paramTypes);
-            ERR.println("methodType " + returnType + ' ' + Arrays.toString(paramTypes) + ' ' + mt);
+            LOG.log("methodType " + returnType + ' ' + Arrays.toString(paramTypes) + ' ' + mt, TRACE_LEVEL);
             return mt;
         }
     }
@@ -626,7 +628,8 @@ public final class MethodHandleFactory {
     private static class TraceCreateMethodHandleFunctionality extends TraceMethodHandleFunctionality {
         @Override
         public MethodHandle debug(final MethodHandle master, final String str, final Object... args) {
-            ERR.println(str + ' ' + describe(args));
+            LOG.log(str + ' ' + describe(args), TRACE_LEVEL);
+            stacktrace(LOG);
             return master;
         }
     }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/options/Options.java b/nashorn/src/jdk/nashorn/internal/runtime/options/Options.java
index af883c1df34..750b3f8ceac 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/options/Options.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/options/Options.java
@@ -44,19 +44,19 @@ import java.util.StringTokenizer;
 import java.util.TimeZone;
 import java.util.TreeMap;
 import java.util.TreeSet;
+
 import jdk.nashorn.internal.runtime.Logging;
 import jdk.nashorn.internal.runtime.QuotedStringTokenizer;
 
 /**
  * Manages global runtime options.
- *
  */
 public final class Options {
     /** Resource tag. */
     private final String resource;
 
     /** Error writer. */
-    private final PrintWriter errors;
+    private final PrintWriter err;
 
     /** File list. */
     private final List<String> files;
@@ -68,14 +68,25 @@ public final class Options {
     private final TreeMap<String, Option<?>> options;
 
     /**
-     * Constructor.
+     * Constructor
+     *
+     * Options will use System.err as the output stream for any errors
      *
      * @param resource resource prefix for options e.g. "nashorn"
-     * @param errors   error stream for reporting parse errors
      */
-    public Options(final String resource, final PrintWriter errors) {
+    public Options(final String resource) {
+        this(resource, new PrintWriter(System.err, true));
+    }
+
+    /**
+     * Constructor
+     *
+     * @param resource resource prefix for options e.g. "nashorn"
+     * @param err      error stream for reporting parse errors
+     */
+    public Options(final String resource, final PrintWriter err) {
         this.resource  = resource;
-        this.errors    = errors;
+        this.err       = err;
         this.files     = new ArrayList<>();
         this.arguments = new ArrayList<>();
         this.options   = new TreeMap<>();
@@ -88,21 +99,12 @@ public final class Options {
                 if (v != null) {
                     set(t.getKey(), createOption(t, v));
                 } else if (t.getDefaultValue() != null) {
-                     set(t.getKey(), createOption(t, t.getDefaultValue()));
+                    set(t.getKey(), createOption(t, t.getDefaultValue()));
                  }
             }
         }
     }
 
-    /**
-     * Constructor
-     *
-     * @param resource  e.g. "nashorn"
-     */
-    public Options(final String resource) {
-        this(resource, new PrintWriter(System.err, true));
-    }
-
     /**
      * Get the resource for this Options set, e.g. "nashorn"
      * @return the resource
@@ -343,17 +345,17 @@ public final class Options {
                 // display extended help information
                 displayHelp(true);
             } else {
-                errors.println(((IllegalOptionException)e).getTemplate());
+                err.println(((IllegalOptionException)e).getTemplate());
             }
             return;
         }
 
         if (e != null && e.getMessage() != null) {
-            errors.println(getMsg("option.error.invalid.option",
+            err.println(getMsg("option.error.invalid.option",
                     e.getMessage(),
                     helpOptionTemplate.getShortName(),
                     helpOptionTemplate.getName()));
-            errors.println();
+            err.println();
             return;
         }
 
@@ -368,8 +370,8 @@ public final class Options {
     public void displayHelp(final boolean extended) {
         for (final OptionTemplate t : Options.validOptions) {
             if ((extended || !t.isUndocumented()) && t.getResource().equals(resource)) {
-                errors.println(t);
-                errors.println();
+                err.println(t);
+                err.println();
             }
         }
     }
diff --git a/nashorn/src/jdk/nashorn/tools/Shell.java b/nashorn/src/jdk/nashorn/tools/Shell.java
index b35d1702714..bf8e8e5e669 100644
--- a/nashorn/src/jdk/nashorn/tools/Shell.java
+++ b/nashorn/src/jdk/nashorn/tools/Shell.java
@@ -114,7 +114,7 @@ public class Shell {
         try {
             System.exit(main(System.in, System.out, System.err, args));
         } catch (final IOException e) {
-            System.err.println(e);
+            System.err.println(e); //bootstrapping, Context.err may not exist
             System.exit(IO_ERROR);
         }
     }

From d8e79f1ce12ac26ef2b704daf9d8b061877f803e Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Tue, 8 Jan 2013 15:02:36 +0530
Subject: [PATCH 049/311] 8005835: NASHORN-668 output fails to compare with the
 corresponding .EXPECTED file

Reviewed-by: lagergren, hannesw
---
 nashorn/test/script/error/NASHORN-668.js.EXPECTED | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nashorn/test/script/error/NASHORN-668.js.EXPECTED b/nashorn/test/script/error/NASHORN-668.js.EXPECTED
index f381d45065a..5a95579b3d7 100644
--- a/nashorn/test/script/error/NASHORN-668.js.EXPECTED
+++ b/nashorn/test/script/error/NASHORN-668.js.EXPECTED
@@ -1,11 +1,11 @@
-test/script/error/NASHORN-668.js:34:8 Repeated RegExp flag: g
+test/script/error/NASHORN-668.js:34:15 Repeated RegExp flag: g
 var x = /xxx/gg;
-        ^
-test/script/error/NASHORN-668.js:36:8 Unsupported RegExp flag: X
+               ^
+test/script/error/NASHORN-668.js:36:14 Unsupported RegExp flag: X
 var y = /xxx/X;
-        ^
-test/script/error/NASHORN-668.js:38:8 Dangling meta character '*' near index 2
+              ^
+test/script/error/NASHORN-668.js:38:13 Dangling meta character '*' near index 2
 2**
   ^
 var z = /2**/;
-        ^
+             ^

From eb0f10508fdd397f1e543ec2d552080ba8e7300a Mon Sep 17 00:00:00 2001
From: Marcus Lagergren <lagergren@openjdk.org>
Date: Tue, 8 Jan 2013 10:52:11 +0100
Subject: [PATCH 050/311] 8005843: refSymbols lookup of unbound variable could
 cause NullPointerException in Lower

Reviewed-by: hannesw, attila
---
 nashorn/bin/fixorphantests.sh                 |  0
 nashorn/bin/fixwhitespace.sh                  |  0
 .../jdk/nashorn/internal/codegen/Lower.java   |  5 +-
 nashorn/test/script/basic/NASHORN-837.js      | 50 +++++++++++++++++++
 4 files changed, 54 insertions(+), 1 deletion(-)
 mode change 100755 => 100644 nashorn/bin/fixorphantests.sh
 mode change 100755 => 100644 nashorn/bin/fixwhitespace.sh
 create mode 100644 nashorn/test/script/basic/NASHORN-837.js

diff --git a/nashorn/bin/fixorphantests.sh b/nashorn/bin/fixorphantests.sh
old mode 100755
new mode 100644
diff --git a/nashorn/bin/fixwhitespace.sh b/nashorn/bin/fixwhitespace.sh
old mode 100755
new mode 100644
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Lower.java b/nashorn/src/jdk/nashorn/internal/codegen/Lower.java
index 2cfe978b4a6..0630667dcd7 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Lower.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Lower.java
@@ -1297,7 +1297,10 @@ final class Lower extends NodeOperatorVisitor {
                     final List<Block> lookupBlocks = findLookupBlocksHelper(getCurrentFunctionNode(), symbol.findFunction());
                     for (final Block lookupBlock : lookupBlocks) {
                         final Symbol refSymbol = lookupBlock.findSymbol(name);
-                        refSymbol.setIsScope();
+                        if (refSymbol != null) { // See NASHORN-837, function declaration in lexical scope: try {} catch (x){ function f() { use(x) } } f()
+                            LOG.finest("Found a ref symbol that must be scope " + refSymbol);
+                            refSymbol.setIsScope();
+                        }
                     }
                 }
             }
diff --git a/nashorn/test/script/basic/NASHORN-837.js b/nashorn/test/script/basic/NASHORN-837.js
new file mode 100644
index 00000000000..0632fb39a31
--- /dev/null
+++ b/nashorn/test/script/basic/NASHORN-837.js
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * NASHORN-837 : refSymbol lookup caused nullpointer exception in Lower
+ *
+ * @test
+ * @run
+ */
+
+var failed = false;
+
+try {
+    try {
+	throw new TypeError('error');
+    } catch (iox) {
+	function f() {
+	    print(iox.message);
+	}
+    }
+    f();
+} catch (e) {
+    failed = (e instanceof ReferenceError);
+    //iox not defined should be thrown
+}
+
+if (!failed) {
+    print("Failure! iox did not throw correct exception");
+}
+

From 3cb78315676931a2e31a642be0b77915b3a9090f Mon Sep 17 00:00:00 2001
From: Attila Szegedi <attila@openjdk.org>
Date: Tue, 8 Jan 2013 13:50:11 +0100
Subject: [PATCH 051/311] 8005846: Remove Mangler in favor of Dynalink's
 NameCodec

Reviewed-by: jlaskey, sundar
---
 nashorn/src/jdk/nashorn/internal/codegen/Compiler.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java b/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
index bc0ff53bfa4..dad79aab41a 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
@@ -55,8 +55,8 @@ import jdk.nashorn.internal.runtime.DebugLogger;
 import jdk.nashorn.internal.runtime.ECMAErrors;
 import jdk.nashorn.internal.runtime.ErrorManager;
 import jdk.nashorn.internal.runtime.Source;
-import jdk.nashorn.internal.runtime.linker.Mangler;
 import jdk.nashorn.internal.runtime.options.Options;
+import org.dynalang.dynalink.support.NameCodec;
 
 /**
  * Responsible for converting JavaScripts to java byte code. Main entry
@@ -511,7 +511,7 @@ public final class Compiler {
         }
 
         baseName = baseName.replace('.', '_').replace('-', '_');
-        final String mangled = Mangler.mangle(baseName);
+        final String mangled = NameCodec.encode(baseName);
 
         baseName = mangled != null ? mangled : baseName;
         return baseName;

From df21b0860f26144192d72f9efa593f37e39866d5 Mon Sep 17 00:00:00 2001
From: Attila Szegedi <attila@openjdk.org>
Date: Tue, 8 Jan 2013 14:14:17 +0100
Subject: [PATCH 052/311] 8005801: Refactor findSetMethod

FindSetMethod() was a very large single method, very unreadable and unmaintainable. It was broken into easy-to-understand pieces. The refactoring required introduction of a comand-object like entity, SetMethodCreator, to contain the nontrivial transient state of the algorithm that made the original big method so resistant to refactoring in the first place.

Reviewed-by: lagergren, sundar
---
 .../internal/runtime/ScriptObject.java        | 167 +++----------
 .../internal/runtime/SetMethodCreator.java    | 236 ++++++++++++++++++
 .../internal/runtime/SpillProperty.java       |   2 +-
 .../internal/runtime/linker/Mangler.java      | 140 -----------
 4 files changed, 274 insertions(+), 271 deletions(-)
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/SetMethodCreator.java
 delete mode 100644 nashorn/src/jdk/nashorn/internal/runtime/linker/Mangler.java

diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
index 05629fd3c61..55b188183b7 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
@@ -132,10 +132,11 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
     /** Indexed array data. */
     private ArrayData arrayData;
 
-    private static final MethodHandle SETEMBED           = findOwnMH("setEmbed",         void.class, CallSiteDescriptor.class, PropertyMap.class, PropertyMap.class, MethodHandle.class, int.class, Object.class, Object.class);
-    private static final MethodHandle SETSPILL           = findOwnMH("setSpill",         void.class, CallSiteDescriptor.class, PropertyMap.class, PropertyMap.class, int.class, Object.class, Object.class);
-    private static final MethodHandle SETSPILLWITHNEW    = findOwnMH("setSpillWithNew",  void.class, CallSiteDescriptor.class, PropertyMap.class, PropertyMap.class, int.class, Object.class, Object.class);
-    private static final MethodHandle SETSPILLWITHGROW   = findOwnMH("setSpillWithGrow", void.class, CallSiteDescriptor.class, PropertyMap.class, PropertyMap.class, int.class, int.class, Object.class, Object.class);
+    static final MethodHandle SETEMBED           = findOwnMH("setEmbed",         void.class, CallSiteDescriptor.class, PropertyMap.class, PropertyMap.class, MethodHandle.class, int.class, Object.class, Object.class);
+    static final MethodHandle SETSPILL           = findOwnMH("setSpill",         void.class, CallSiteDescriptor.class, PropertyMap.class, PropertyMap.class, int.class, Object.class, Object.class);
+    static final MethodHandle SETSPILLWITHNEW    = findOwnMH("setSpillWithNew",  void.class, CallSiteDescriptor.class, PropertyMap.class, PropertyMap.class, int.class, Object.class, Object.class);
+    static final MethodHandle SETSPILLWITHGROW   = findOwnMH("setSpillWithGrow", void.class, CallSiteDescriptor.class, PropertyMap.class, PropertyMap.class, int.class, int.class, Object.class, Object.class);
+
     private static final MethodHandle TRUNCATINGFILTER   = findOwnMH("truncatingFilter", Object[].class, int.class, Object[].class);
     private static final MethodHandle KNOWNFUNCPROPGUARD = findOwnMH("knownFunctionPropertyGuard", boolean.class, Object.class, PropertyMap.class, MethodHandle.class, Object.class, ScriptFunction.class);
 
@@ -218,13 +219,14 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
     }
 
     /**
-     * Bind the method handle to the specified receiver.
+     * Bind the method handle to the specified receiver, while preserving its original type (it will just ignore the
+     * first argument in lieu of the bound argument).
      * @param methodHandle Method handle to bind to.
      * @param receiver     Object to bind.
      * @return Bound method handle.
      */
-    private static MethodHandle bindTo(final MethodHandle methodHandle, final Object receiver) {
-        return MH.dropArguments(MH.bindTo(methodHandle, receiver), 0, Object.class);
+    static MethodHandle bindTo(final MethodHandle methodHandle, final Object receiver) {
+        return MH.dropArguments(MH.bindTo(methodHandle, receiver), 0, methodHandle.type().parameterType(0));
     }
 
     /**
@@ -1724,138 +1726,43 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
      * @return GuardedInvocation to be invoked at call site.
      */
     protected GuardedInvocation findSetMethod(final CallSiteDescriptor desc, final boolean megaMorphic) {
-        final String      name     = desc.getNameToken(2);
+        final String name = desc.getNameToken(CallSiteDescriptor.NAME_OPERAND);
         if(megaMorphic) {
             return findMegaMorphicSetMethod(desc, name);
         }
 
-        final MethodType  callType = desc.getMethodType();
-        final PropertyMap oldMap   = getMap();
-        final Class<?>    type     = callType.parameterType(1);
-
         FindProperty find = findProperty(name, true);
-        if (!isScope()) {
-            // not a scope search. We don't want any inherited a property
-            // unless it happens to be a user defined accessor property.
-            if (find != null && find.isInherited()) {
-               final Property inherited = find.getProperty();
-               if (!(inherited instanceof UserAccessorProperty)) {
-                   // we should only use inherited user accessor property
-                   find = null;
-                   // but we should still check if inherited data property is not writable!
-                   if (isExtensible() && !inherited.isWritable()) {
-                       if (NashornCallSiteDescriptor.isStrict(desc)) {
-                           typeError(Context.getGlobal(), "property.not.writable", name, ScriptRuntime.safeToString((this)));
-                       }
-                       assert !NashornCallSiteDescriptor.isFastScope(desc);
-                       return new GuardedInvocation(Lookup.EMPTY_SETTER, oldMap.getProtoGetSwitchPoint(name),
-                               NashornGuards.getMapGuard(oldMap));
-                   }
-               }
+        // If it's not a scope search, then we don't want any inherited properties except those with user defined accessors.
+        if (!isScope() && find != null && find.isInherited() && !(find.getProperty() instanceof UserAccessorProperty)) {
+            // We should still check if inherited data property is not writable
+            if (isExtensible() && !find.isWritable()) {
+                return createEmptySetMethod(desc, "property.not.writable", false);
             }
+            // Otherwise, forget the found property
+            find = null;
         }
 
-        MethodHandle methodHandle = null;
-        Property     property     = null;
-        int          invokeFlags  = 0;
-
         if (find != null) {
-            if (!find.isWritable()) {
-                if (NashornCallSiteDescriptor.isStrict(desc)) {
-                    typeError(Context.getGlobal(), "property.not.writable", name, ScriptRuntime.safeToString(this));
-                }
-
-                return new GuardedInvocation(Lookup.EMPTY_SETTER, oldMap.getProtoGetSwitchPoint(name),
-                        NashornGuards.getMapGuard(oldMap));
-            }
-
-            property     = find.getProperty();
-            methodHandle = find.getSetter(type, NashornCallSiteDescriptor.isStrict(desc));
-
-            assert methodHandle != null;
-            assert property     != null;
-
-            final ScriptFunction setter = find.getSetterFunction();
-
-            invokeFlags = 0;
-            if (setter != null && setter.isStrict()) {
-                invokeFlags = NashornCallSiteDescriptor.CALLSITE_STRICT;
-            }
-
-            if (!property.hasSetterFunction() && find.isInherited()) {
-                methodHandle = bindTo(methodHandle, find.getOwner());
+            if(!find.isWritable()) {
+                // Existing, non-writable property
+                return createEmptySetMethod(desc, "property.not.writable", true);
             }
         } else if (!isExtensible()) {
-            if (NashornCallSiteDescriptor.isStrict(desc)) {
-                typeError(Context.getGlobal(), "object.non.extensible", name, ScriptRuntime.safeToString(this));
-            }
-
-            assert !NashornCallSiteDescriptor.isFastScope(desc);
-            return new GuardedInvocation(Lookup.EMPTY_SETTER, oldMap.getProtoGetSwitchPoint(name), NashornGuards.getMapGuard(oldMap));
+            // Non-existing property on a non-extensible object
+            return createEmptySetMethod(desc, "object.non.extensible", false);
         }
 
-        if (methodHandle == null) {
-            // In strict mode, assignment can not create a new variable.
-            // See also ECMA Annex C item 4. ReferenceError is thrown.
-            if (NashornCallSiteDescriptor.isScope(desc) && NashornCallSiteDescriptor.isStrict(desc)) {
-                referenceError(Context.getGlobal(), "not.defined", name);
-            }
+        return new SetMethodCreator(this, find, desc).createGuardedInvocation();
+    }
 
-            if (isScope()) {
-                final ScriptObject global = Context.getGlobal();
-                methodHandle = global.addSpill(name);
-                methodHandle = bindTo(methodHandle, global);
-            } else {
-                int i = findEmbed();
-
-                if (i >= EMBED_SIZE) {
-                    i = oldMap.getSpillLength();
-
-                    final MethodHandle getter =
-                        MH.asType(
-                            MH.insertArguments(
-                                MH.arrayElementGetter(Object[].class),
-                                1,
-                                i),
-                            Lookup.GET_OBJECT_TYPE);
-                    final MethodHandle setter =
-                        MH.asType(
-                            MH.insertArguments(
-                            MH.arrayElementSetter(Object[].class),
-                            1,
-                            i),
-                            Lookup.SET_OBJECT_TYPE);
-
-                    property = new SpillProperty(name, Property.IS_SPILL, i, getter, setter);
-
-                    final PropertyMap newMap = oldMap.addProperty(property);
-
-                    i = property.getSlot();
-
-                    if (spill == null) {
-                        methodHandle = MH.insertArguments(SETSPILLWITHNEW,  0, desc, oldMap, newMap, i);
-                    } else if (i < spill.length) {
-                        methodHandle = MH.insertArguments(SETSPILL,         0, desc, oldMap, newMap, i);
-                    } else {
-                        final int newLength = (i + SPILL_RATE) / SPILL_RATE * SPILL_RATE;
-                        methodHandle = MH.insertArguments(SETSPILLWITHGROW, 0, desc, oldMap, newMap, i, newLength);
-                    }
-                } else {
-                    useEmbed(i);
-                    property = new SpillProperty(name, 0, i, GET_EMBED[i], SET_EMBED[i]);
-                    final PropertyMap newMap = oldMap.addProperty(property);
-                    //TODO specfields
-                    methodHandle = MH.insertArguments(SETEMBED, 0, desc, oldMap, newMap, property.getSetter(Object.class, getMap()), i);
-                }
-
-                notifyPropertyAdded(this, property);
-            }
-        }
-
-        // the guard has to use old map because the setter is valid only for incoming object with this map
-        return new NashornGuardedInvocation(methodHandle, null, ObjectClassGenerator.OBJECT_FIELDS_ONLY &&
-                NashornCallSiteDescriptor.isFastScope(desc) && (property == null || !property.canChangeType()) ?
-                    null : NashornGuards.getMapGuard(oldMap), invokeFlags);
+    private GuardedInvocation createEmptySetMethod(final CallSiteDescriptor desc, String strictErrorMessage, boolean canBeFastScope) {
+        final String name = desc.getNameToken(CallSiteDescriptor.NAME_OPERAND);
+        if (NashornCallSiteDescriptor.isStrict(desc)) {
+               typeError(Context.getGlobal(), strictErrorMessage, name, ScriptRuntime.safeToString((this)));
+           }
+           assert canBeFastScope || !NashornCallSiteDescriptor.isFastScope(desc);
+           final PropertyMap map = getMap();
+           return new GuardedInvocation(Lookup.EMPTY_SETTER, map.getProtoGetSwitchPoint(name), NashornGuards.getMapGuard(map));
     }
 
     @SuppressWarnings("unused")
@@ -2169,7 +2076,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
         return spillProperty.getSetter(type, getMap()); //TODO specfields
     }
 
-    private MethodHandle addSpill(final String key) {
+    MethodHandle addSpill(final String key) {
         return addSpill(key, 0);
     }
 
@@ -3216,8 +3123,8 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
     /** Embed offset */
     public static final int EMBED_OFFSET = 32 - EMBED_SIZE;
 
-    private static final MethodHandle[] GET_EMBED;
-    private static final MethodHandle[] SET_EMBED;
+    static final MethodHandle[] GET_EMBED;
+    static final MethodHandle[] SET_EMBED;
 
     static {
         GET_EMBED = new MethodHandle[EMBED_SIZE];
@@ -3230,11 +3137,11 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
         }
     }
 
-    private void useEmbed(final int i) {
+    void useEmbed(final int i) {
         flags |= 1 << (EMBED_OFFSET + i);
     }
 
-    private int findEmbed() {
+    int findEmbed() {
         final int bits  = ~(flags >>> EMBED_OFFSET);
         final int least = bits ^ -bits;
         final int index = Integer.numberOfTrailingZeros(least) - 1;
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/SetMethodCreator.java b/nashorn/src/jdk/nashorn/internal/runtime/SetMethodCreator.java
new file mode 100644
index 00000000000..ba020047a36
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/SetMethodCreator.java
@@ -0,0 +1,236 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import static jdk.nashorn.internal.runtime.ECMAErrors.referenceError;
+import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+
+import java.lang.invoke.MethodHandle;
+
+import jdk.nashorn.internal.codegen.objects.ObjectClassGenerator;
+import jdk.nashorn.internal.runtime.linker.Lookup;
+import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
+import jdk.nashorn.internal.runtime.linker.NashornGuardedInvocation;
+import jdk.nashorn.internal.runtime.linker.NashornGuards;
+
+import org.dynalang.dynalink.CallSiteDescriptor;
+import org.dynalang.dynalink.linker.GuardedInvocation;
+
+/**
+ * Instances of this class are quite ephemeral; they only exist for the duration of an invocation of
+ * {@link ScriptObject#findSetMethod(CallSiteDescriptor, boolean)} and serve as the actual encapsulation of the
+ * algorithm for creating an appropriate property setter method.
+ */
+class SetMethodCreator {
+    // See constructor parameters for description of fields
+    private final ScriptObject sobj;
+    private final PropertyMap map;
+    private final FindProperty find;
+    private final CallSiteDescriptor desc;
+
+    /**
+     * Creates a new property setter method creator.
+     * @param sobj the object for which we're creating the property setter
+     * @param find a result of a {@link ScriptObject#findProperty(String, boolean)} on the object for the property we
+     * want to create a setter for. Can be null if the property does not yet exist on the object.
+     * @param desc the descriptor of the call site that triggered the property setter lookup
+     */
+    SetMethodCreator(final ScriptObject sobj, final FindProperty find, final CallSiteDescriptor desc) {
+        this.sobj = sobj;
+        this.map = sobj.getMap();
+        this.find = find;
+        this.desc = desc;
+    }
+
+    private String getName() {
+        return desc.getNameToken(CallSiteDescriptor.NAME_OPERAND);
+    }
+
+    private PropertyMap getMap() {
+        return map;
+    }
+
+    /**
+     * Creates the actual guarded invocation that represents the dynamic setter method for the property.
+     * @return the actual guarded invocation that represents the dynamic setter method for the property.
+     */
+    GuardedInvocation createGuardedInvocation() {
+        return createSetMethod().createGuardedInvocation();
+    }
+
+    /**
+     * This class encapsulates the results of looking up a setter method; it's basically a triple of a method hanle,
+     * a Property object, and flags for invocation.
+     *
+     */
+    private class SetMethod {
+        private final MethodHandle methodHandle;
+        private final Property property;
+        private final int invokeFlags;
+
+        /**
+         * Creates a new lookup result.
+         * @param methodHandle the actual method handle
+         * @param property the property object. Can be null in case we're creating a new property in the global object.
+         * @param invokeFlags flags for the invocation. Normally either 0, or
+         * {@link NashornCallSiteDescriptor#CALLSITE_STRICT} when an existing property with a strict function for a
+         * property setter is discovered.
+         */
+        SetMethod(final MethodHandle methodHandle, final Property property, final int invokeFlags) {
+            assert methodHandle != null;
+            this.methodHandle = methodHandle;
+            this.property = property;
+            this.invokeFlags = invokeFlags;
+        }
+
+        /**
+         * Composes from its components an actual guarded invocation that represents the dynamic setter method for the property.
+         * @return the composed guarded invocation that represents the dynamic setter method for the property.
+         */
+        GuardedInvocation createGuardedInvocation() {
+            return new NashornGuardedInvocation(methodHandle, null, getGuard(), invokeFlags);
+        }
+
+        private MethodHandle getGuard() {
+            return needsNoGuard() ? null : NashornGuards.getMapGuard(getMap());
+        }
+
+        private boolean needsNoGuard() {
+            return NashornCallSiteDescriptor.isFastScope(desc) &&
+                    (ObjectClassGenerator.OBJECT_FIELDS_ONLY || isPropertyTypeStable());
+        }
+
+        private boolean isPropertyTypeStable() {
+            return property == null || !property.canChangeType();
+        }
+    }
+
+    private SetMethod createSetMethod() {
+        if (find != null) {
+            return createExistingPropertySetter();
+        }
+
+        checkStrictCreateNewVariable();
+
+        if (sobj.isScope()) {
+            return createGlobalPropertySetter();
+        }
+
+        return createNewPropertySetter();
+    }
+
+    private void checkStrictCreateNewVariable() {
+        // In strict mode, assignment can not create a new variable.
+        // See also ECMA Annex C item 4. ReferenceError is thrown.
+        if (NashornCallSiteDescriptor.isScope(desc) && NashornCallSiteDescriptor.isStrict(desc)) {
+            referenceError(Context.getGlobal(), "not.defined", getName());
+        }
+    }
+
+    private SetMethod createExistingPropertySetter() {
+        final Property property = find.getProperty();
+        final Class<?> type = desc.getMethodType().parameterType(1);
+        final MethodHandle methodHandle = find.getSetter(type, NashornCallSiteDescriptor.isStrict(desc));
+
+        assert methodHandle != null;
+        assert property     != null;
+
+        final MethodHandle boundHandle;
+        if (!property.hasSetterFunction() && find.isInherited()) {
+            boundHandle = ScriptObject.bindTo(methodHandle, find.getOwner());
+        } else {
+            boundHandle = methodHandle;
+        }
+        return new SetMethod(boundHandle, property, getExistingPropertySetterInvokeFlags());
+    }
+
+    private int getExistingPropertySetterInvokeFlags() {
+        final ScriptFunction setter = find.getSetterFunction();
+        if (setter != null && setter.isStrict()) {
+            return NashornCallSiteDescriptor.CALLSITE_STRICT;
+        }
+        return 0;
+    }
+
+    private SetMethod createGlobalPropertySetter() {
+        final ScriptObject global = Context.getGlobal();
+        return new SetMethod(ScriptObject.bindTo(global.addSpill(getName()), global), null, 0);
+    }
+
+    private SetMethod createNewPropertySetter() {
+        final int nextEmbed = sobj.findEmbed();
+        final SetMethod sm;
+        if (nextEmbed >= ScriptObject.EMBED_SIZE) {
+            sm = createNewSpillPropertySetter();
+        } else {
+            sm = createNewEmbedPropertySetter(nextEmbed);
+        }
+
+        sobj.notifyPropertyAdded(sobj, sm.property);
+        return sm;
+    }
+
+    private SetMethod createNewSpillPropertySetter() {
+        final int nextSpill = getMap().getSpillLength();
+
+        final Property property = createSpillProperty(nextSpill);
+        return new SetMethod(createSpillMethodHandle(nextSpill, property), property, 0);
+    }
+
+    private Property createSpillProperty(final int nextSpill) {
+        final MethodHandle getter = MH.asType(MH.insertArguments(MH.arrayElementGetter(Object[].class), 1, nextSpill), Lookup.GET_OBJECT_TYPE);
+        final MethodHandle setter = MH.asType(MH.insertArguments(MH.arrayElementSetter(Object[].class), 1, nextSpill), Lookup.SET_OBJECT_TYPE);
+
+        return new SpillProperty(getName(), Property.IS_SPILL, nextSpill, getter, setter);
+    }
+
+    private MethodHandle createSpillMethodHandle(final int nextSpill, Property property) {
+        final PropertyMap oldMap = getMap();
+        final PropertyMap newMap = getNewMap(property);
+
+        final Object[] spill = sobj.spill;
+        if (spill == null) {
+            return MH.insertArguments(ScriptObject.SETSPILLWITHNEW,  0, desc, oldMap, newMap, nextSpill);
+        } else if (nextSpill < spill.length) {
+            return MH.insertArguments(ScriptObject.SETSPILL,         0, desc, oldMap, newMap, nextSpill);
+        } else {
+            final int newLength = (nextSpill + ScriptObject.SPILL_RATE) / ScriptObject.SPILL_RATE * ScriptObject.SPILL_RATE;
+            return MH.insertArguments(ScriptObject.SETSPILLWITHGROW, 0, desc, oldMap, newMap, nextSpill, newLength);
+        }
+    }
+
+    private SetMethod createNewEmbedPropertySetter(final int nextEmbed) {
+        sobj.useEmbed(nextEmbed);
+        final Property property = new SpillProperty(getName(), 0, nextEmbed, ScriptObject.GET_EMBED[nextEmbed], ScriptObject.SET_EMBED[nextEmbed]);
+        //TODO specfields
+        final MethodHandle methodHandle = MH.insertArguments(ScriptObject.SETEMBED, 0, desc, getMap(), getNewMap(property), property.getSetter(Object.class, getMap()), nextEmbed);
+        return new SetMethod(methodHandle, property, 0);
+    }
+
+    private PropertyMap getNewMap(Property property) {
+        return getMap().addProperty(property);
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/SpillProperty.java b/nashorn/src/jdk/nashorn/internal/runtime/SpillProperty.java
index 22d1c8a7edd..98e04de0067 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/SpillProperty.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/SpillProperty.java
@@ -43,7 +43,7 @@ public final class SpillProperty extends AccessorProperty {
     private static final MethodHandle SPILLGETTER = MH.asType(MH.getter(MethodHandles.lookup(), ScriptObject.class, "spill", Object[].class), Lookup.GET_OBJECT_TYPE);
 
     /** Property slot in spill */
-    int slot;
+    private final int slot;
 
     /**
      * Constructor
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/Mangler.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/Mangler.java
deleted file mode 100644
index a6044f69b73..00000000000
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/Mangler.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.nashorn.internal.runtime.linker;
-
-import java.util.Arrays;
-
-/**
- * Used to mangle java visible names. Currently used only to transform script file
- * name to be safely used as part of generated Script class name.
- */
-public class Mangler {
-    /** Beginning of escape sequence (mu as in municode.) */
-    private static final char ESCAPE = '\u03BC';
-
-    /** Hexadecimal base. */
-    private static final char hexBase = 'A';
-
-    /** Hexadecimal characters. */
-    private static final char[] hexCharacters = new char[] {
-        '0',
-        '1',
-        '2',
-        '3',
-        '4',
-        '5',
-        '6',
-        '7',
-        '8',
-        '9',
-        hexBase + 0,
-        hexBase + 1,
-        hexBase + 2,
-        hexBase + 3,
-        hexBase + 4,
-        hexBase + 5
-    };
-
-    private Mangler() {
-    }
-
-    /**
-     * Mangles a user supplied name so it is java identifier safe.
-     * @param name Name to be mangled
-     * @return Mangled name or null if not mangled.
-     */
-    public static String mangle(final String name) {
-        final int length = name.length();
-        final char[] buffer = new char[length * 5];
-        boolean mangled = false;
-        int pos = 0;
-
-        for (int i = 0; i < length; i++) {
-            final char ch = name.charAt(i);
-
-            if (! Character.isJavaIdentifierPart(ch)) {
-                buffer[pos++] = ESCAPE;
-                buffer[pos++] = hexCharacters[(ch >>> 12) & 0xF];
-                buffer[pos++] = hexCharacters[(ch >>>  8) & 0xF];
-                buffer[pos++] = hexCharacters[(ch >>>  4) & 0xF];
-                buffer[pos++] = hexCharacters[ ch         & 0xF];
-                mangled = true;
-            } else if (ch == ESCAPE) {
-                buffer[pos++] = ESCAPE;
-                buffer[pos++] = ESCAPE;
-                mangled = true;
-            } else {
-                buffer[pos++] = ch;
-            }
-        }
-
-        return mangled ? new String(Arrays.copyOf(buffer, pos)) : null;
-    }
-
-    /**
-     * Convert a character to a hexadecimal digit. Assumes [0-9A-F].
-     * @param ch Character to convert.
-     * @return Hexadecimal digit.
-     */
-    private static int fromHex(final char ch) {
-        return ch >= hexBase ? ch - hexBase + 10 : ch - '0';
-    }
-
-    /**
-     * Unmangles a name. Assumes name mangled by this package.
-     * @param name Mangled name.
-     * @return Unmangled name.
-     */
-    public static String unmangle(final String name) {
-        final int length = name.length();
-        char[] buffer = new char[length];
-        int pos = 0;
-
-        for (int i = 0; i < length; ) {
-            char ch = name.charAt(i++);
-
-            if (ch == ESCAPE) {
-                final char ch0 = name.charAt(i++);
-
-                if (ch0 == ESCAPE) {
-                    // pass thru
-                } else {
-                     final char ch1 = name.charAt(i++);
-                     final char ch2 = name.charAt(i++);
-                     final char ch3 = name.charAt(i++);
-
-                     ch = (char)(fromHex(ch0) << 12 | fromHex(ch1) << 8 | fromHex(ch2) << 4 | fromHex(ch3));
-                }
-            }
-
-            buffer[pos++] = ch;
-        }
-
-        buffer = Arrays.copyOf(buffer, pos);
-
-        return new String(buffer);
-    }
-}

From dd47345d51eb770b933f4a3d5cadc1e6061bb1f1 Mon Sep 17 00:00:00 2001
From: Marcus Lagergren <lagergren@openjdk.org>
Date: Tue, 8 Jan 2013 15:20:40 +0100
Subject: [PATCH 053/311] 8005842: Loops in ASTWriter. Corrected @Reference and
 @Ignore node annotation for IR nodes

Reviewed-by: hannesw, sundar
---
 .../src/jdk/nashorn/internal/ir/Block.java    |   5 +-
 .../jdk/nashorn/internal/ir/FunctionNode.java |   5 +-
 .../jdk/nashorn/internal/ir/LabelNode.java    |   6 +-
 .../jdk/nashorn/internal/ir/LabeledNode.java  |   5 +-
 .../jdk/nashorn/internal/ir/ObjectNode.java   |   3 +-
 .../nashorn/internal/ir/ReferenceNode.java    |   3 +-
 .../jdk/nashorn/internal/ir/ReturnNode.java   |   3 +-
 .../jdk/nashorn/internal/ir/SplitNode.java    |   5 +
 .../jdk/nashorn/internal/ir/SwitchNode.java   |   3 +-
 .../jdk/nashorn/internal/ir/ThrowNode.java    |   3 +-
 .../src/jdk/nashorn/internal/ir/TryNode.java  |   4 +-
 .../nashorn/internal/ir/debug/ASTWriter.java  | 135 +++++++++---------
 12 files changed, 91 insertions(+), 89 deletions(-)

diff --git a/nashorn/src/jdk/nashorn/internal/ir/Block.java b/nashorn/src/jdk/nashorn/internal/ir/Block.java
index d7ec5a5289c..d8e9979464c 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/Block.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/Block.java
@@ -44,7 +44,6 @@ import jdk.nashorn.internal.codegen.Frame;
 import jdk.nashorn.internal.codegen.MethodEmitter.Label;
 import jdk.nashorn.internal.ir.annotations.Ignore;
 import jdk.nashorn.internal.ir.annotations.ParentNode;
-import jdk.nashorn.internal.ir.annotations.Reference;
 import jdk.nashorn.internal.ir.visitor.NodeVisitor;
 import jdk.nashorn.internal.runtime.Source;
 
@@ -55,11 +54,11 @@ import jdk.nashorn.internal.runtime.Source;
  */
 public class Block extends Node {
     /** Parent context */
-    @ParentNode @Reference
+    @ParentNode @Ignore
     private Block parent;
 
     /** Owning function. */
-    @Ignore @Reference
+    @Ignore //don't print it, it is apparent in the tree
     protected FunctionNode function;
 
     /** List of statements */
diff --git a/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java b/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java
index dda3ae9d344..c673bb036bf 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java
@@ -46,7 +46,6 @@ import jdk.nashorn.internal.codegen.Splitter;
 import jdk.nashorn.internal.codegen.Transform;
 import jdk.nashorn.internal.codegen.types.Type;
 import jdk.nashorn.internal.ir.annotations.Ignore;
-import jdk.nashorn.internal.ir.annotations.Reference;
 import jdk.nashorn.internal.ir.visitor.NodeVisitor;
 import jdk.nashorn.internal.parser.Parser;
 import jdk.nashorn.internal.runtime.Source;
@@ -142,11 +141,11 @@ public class FunctionNode extends Block {
     private final List<VarNode> declarations;
 
     /** VarNode for this function statement */
-    @Reference @Ignore //this is explicit code anyway and should not be traverseda after lower
+    @Ignore //this is explicit code anyway and should not be traversed after lower
     private VarNode funcVarNode;
 
     /** Line number for function declaration */
-    @Reference @Ignore
+    @Ignore
     private LineNumberNode funcVarLineNumberNode;
 
     /** Function flags. */
diff --git a/nashorn/src/jdk/nashorn/internal/ir/LabelNode.java b/nashorn/src/jdk/nashorn/internal/ir/LabelNode.java
index 4fd8b94b83b..6830dca87e2 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/LabelNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/LabelNode.java
@@ -25,7 +25,7 @@
 
 package jdk.nashorn.internal.ir;
 
-import jdk.nashorn.internal.ir.annotations.Reference;
+import jdk.nashorn.internal.ir.annotations.Ignore;
 import jdk.nashorn.internal.ir.visitor.NodeVisitor;
 import jdk.nashorn.internal.runtime.Source;
 
@@ -42,11 +42,11 @@ public class LabelNode extends Node {
     private Block body;
 
     /** Node to break from. */
-    @Reference
+    @Ignore
     private Node breakNode;
 
     /** Node to continue. */
-    @Reference
+    @Ignore
     private Node continueNode;
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/ir/LabeledNode.java b/nashorn/src/jdk/nashorn/internal/ir/LabeledNode.java
index 59e310fe754..a3783e92938 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/LabeledNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/LabeledNode.java
@@ -26,7 +26,6 @@
 package jdk.nashorn.internal.ir;
 
 import jdk.nashorn.internal.ir.annotations.Ignore;
-import jdk.nashorn.internal.ir.annotations.Reference;
 import jdk.nashorn.internal.runtime.Source;
 
 /**
@@ -39,11 +38,11 @@ public abstract class LabeledNode extends Node {
     protected final LabelNode labelNode;
 
     /** Target control node. */
-    @Reference @Ignore
+    @Ignore
     protected final Node targetNode;
 
     /** Try chain. */
-    @Reference
+    @Ignore
     protected final TryNode tryChain;
 
     /** scope nesting level */
diff --git a/nashorn/src/jdk/nashorn/internal/ir/ObjectNode.java b/nashorn/src/jdk/nashorn/internal/ir/ObjectNode.java
index 2013bfc84a1..acb2ddec45a 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/ObjectNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/ObjectNode.java
@@ -29,7 +29,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import jdk.nashorn.internal.ir.annotations.Ignore;
-import jdk.nashorn.internal.ir.annotations.Reference;
 import jdk.nashorn.internal.ir.visitor.NodeVisitor;
 import jdk.nashorn.internal.runtime.Source;
 
@@ -38,7 +37,7 @@ import jdk.nashorn.internal.runtime.Source;
  */
 public class ObjectNode extends Node {
     /** Literal context. */
-    @Reference @Ignore
+    @Ignore
     private Block context;
 
     /** Literal elements. */
diff --git a/nashorn/src/jdk/nashorn/internal/ir/ReferenceNode.java b/nashorn/src/jdk/nashorn/internal/ir/ReferenceNode.java
index 7e2c617d8c4..3cae7b522c9 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/ReferenceNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/ReferenceNode.java
@@ -25,7 +25,6 @@
 
 package jdk.nashorn.internal.ir;
 
-import jdk.nashorn.internal.ir.annotations.Ignore;
 import jdk.nashorn.internal.ir.annotations.Reference;
 import jdk.nashorn.internal.ir.visitor.NodeVisitor;
 import jdk.nashorn.internal.runtime.Source;
@@ -35,7 +34,7 @@ import jdk.nashorn.internal.runtime.Source;
  */
 public class ReferenceNode extends Node {
     /** Node referenced. */
-    @Reference @Ignore
+    @Reference
     private final FunctionNode reference;
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/ir/ReturnNode.java b/nashorn/src/jdk/nashorn/internal/ir/ReturnNode.java
index 77e202d2e7f..cf5cb89cd23 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/ReturnNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/ReturnNode.java
@@ -29,7 +29,6 @@ import static jdk.nashorn.internal.parser.TokenType.RETURN;
 import static jdk.nashorn.internal.parser.TokenType.YIELD;
 
 import jdk.nashorn.internal.ir.annotations.Ignore;
-import jdk.nashorn.internal.ir.annotations.Reference;
 import jdk.nashorn.internal.ir.visitor.NodeVisitor;
 import jdk.nashorn.internal.runtime.Source;
 
@@ -42,7 +41,7 @@ public class ReturnNode extends Node {
     private Node expression;
 
     /** Try chain. */
-    @Reference @Ignore
+    @Ignore
     private final TryNode tryChain;
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/ir/SplitNode.java b/nashorn/src/jdk/nashorn/internal/ir/SplitNode.java
index 66113f28682..d51ccb7e02e 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/SplitNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/SplitNode.java
@@ -30,6 +30,8 @@ import java.util.Collections;
 import java.util.List;
 import jdk.nashorn.internal.codegen.CompileUnit;
 import jdk.nashorn.internal.codegen.MethodEmitter;
+import jdk.nashorn.internal.ir.annotations.Ignore;
+import jdk.nashorn.internal.ir.annotations.Reference;
 import jdk.nashorn.internal.ir.visitor.NodeVisitor;
 
 
@@ -50,15 +52,18 @@ public class SplitNode extends Node {
     private MethodEmitter caller;
 
     /** Containing function. */
+    @Reference
     private final FunctionNode functionNode;
 
     /** A list of target labels in parent methods this split node may encounter. */
+    @Ignore
     private final List<MethodEmitter.Label> externalTargets;
 
     /** True if this split node or any of its children contain a return statement. */
     private boolean hasReturn;
 
     /** Body of split code. */
+    @Ignore
     private Node body;
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/ir/SwitchNode.java b/nashorn/src/jdk/nashorn/internal/ir/SwitchNode.java
index 344d177252d..74ad922eb52 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/SwitchNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/SwitchNode.java
@@ -30,7 +30,6 @@ import java.util.Collections;
 import java.util.List;
 import jdk.nashorn.internal.codegen.MethodEmitter.Label;
 import jdk.nashorn.internal.ir.annotations.Ignore;
-import jdk.nashorn.internal.ir.annotations.Reference;
 import jdk.nashorn.internal.ir.visitor.NodeVisitor;
 import jdk.nashorn.internal.runtime.Source;
 
@@ -48,7 +47,7 @@ public class SwitchNode extends BreakableNode {
     private List<CaseNode> cases;
 
     /** Switch default. */
-    @Reference @Ignore //points to one of the members in the list above, don't traverse twice
+    @Ignore //points to one of the members in the list above, don't traverse twice
     private CaseNode defaultCase;
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/ir/ThrowNode.java b/nashorn/src/jdk/nashorn/internal/ir/ThrowNode.java
index eae912c7095..3aa3543a349 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/ThrowNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/ThrowNode.java
@@ -26,7 +26,6 @@
 package jdk.nashorn.internal.ir;
 
 import jdk.nashorn.internal.ir.annotations.Ignore;
-import jdk.nashorn.internal.ir.annotations.Reference;
 import jdk.nashorn.internal.ir.visitor.NodeVisitor;
 import jdk.nashorn.internal.runtime.Source;
 
@@ -38,7 +37,7 @@ public class ThrowNode extends Node {
     private Node expression;
 
     /** Try chain. */
-    @Reference @Ignore
+    @Ignore
     private final TryNode tryChain;
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/ir/TryNode.java b/nashorn/src/jdk/nashorn/internal/ir/TryNode.java
index 1bb1aa6077d..7dd509f3dcb 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/TryNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/TryNode.java
@@ -29,7 +29,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import jdk.nashorn.internal.codegen.MethodEmitter.Label;
-import jdk.nashorn.internal.ir.annotations.Reference;
+import jdk.nashorn.internal.ir.annotations.Ignore;
 import jdk.nashorn.internal.ir.visitor.NodeVisitor;
 import jdk.nashorn.internal.runtime.Source;
 
@@ -38,7 +38,7 @@ import jdk.nashorn.internal.runtime.Source;
  */
 public class TryNode extends Node {
     /** Try chain. */
-    @Reference
+    @Ignore //don't print, will be apparent from the AST
     private TryNode next;
 
     /** Try statements. */
diff --git a/nashorn/src/jdk/nashorn/internal/ir/debug/ASTWriter.java b/nashorn/src/jdk/nashorn/internal/ir/debug/ASTWriter.java
index 9b4f4810575..395a25e74ee 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/debug/ASTWriter.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/debug/ASTWriter.java
@@ -71,12 +71,12 @@ public final class ASTWriter {
     @Override
     public String toString() {
         final StringBuilder sb = new StringBuilder();
-        printAST(sb, "root", root, 0);
+        printAST(sb, null, "root", root, 0);
         return sb.toString();
     }
 
     @SuppressWarnings("unchecked")
-    private void printAST(final StringBuilder sb, final String name, final Node node, final int indent) {
+    private void printAST(final StringBuilder sb, final Field field, final String name, final Node node, final int indent) {
         ASTWriter.indent(sb, indent);
         if (node == null) {
             sb.append("[Object ");
@@ -85,59 +85,18 @@ public final class ASTWriter {
             return;
         }
 
+        final boolean isReference = field != null && field.getAnnotation(Reference.class) != null;
+
         Class<?> clazz = node.getClass();
-        String type    = clazz.getName();
+        String   type  = clazz.getName();
+
         type = type.substring(type.lastIndexOf('.') + 1, type.length());
- //       type += "@" + Debug.id(node) + "#" + node.getSymbol();
+//        type += "@" + Debug.id(node) + "#" + node.getSymbol();
 
         final List<Field> children = new LinkedList<>();
-        final Deque<Class<?>> stack = new ArrayDeque<>();
 
-        /**
-         * Here is some ugliness that can be overcome by proper ChildNode annotations
-         * with proper orders. Right now we basically sort all classes up to Node
-         * with super class first, as this often is the natural order, e.g. base
-         * before index for an IndexNode.
-         *
-         * Also there are special cases as this is not true for UnaryNodes(lhs) and
-         * BinaryNodes extends UnaryNode (with lhs), and TernaryNodes.
-         *
-         * TODO - generalize traversal with an order built on annotations and this
-         * will go away.
-         */
-        do {
-            stack.push(clazz);
-            clazz = clazz.getSuperclass();
-        } while (clazz != null);
-
-        if (node instanceof TernaryNode) {
-            // HACK juggle "third"
-            stack.push(stack.removeLast());
-        }
-        // HACK change operator order for BinaryNodes to get lhs first.
-        final Iterator<Class<?>> iter = node instanceof BinaryNode ? stack.descendingIterator() : stack.iterator();
-
-        while (iter.hasNext()) {
-            final Class<?> c = iter.next();
-            for (final Field f : c.getDeclaredFields()) {
-                try {
-                    f.setAccessible(true);
-                    final Object child = f.get(node);
-                    if (child == null) {
-                        continue;
-                    }
-
-                    if (child instanceof Node) {
-                        children.add(f);
-                    } else if (child instanceof Collection) {
-                        if (!((Collection<?>)child).isEmpty()) {
-                            children.add(f);
-                        }
-                    }
-                } catch (final IllegalArgumentException | IllegalAccessException e) {
-                    return;
-                }
-            }
+        if (!isReference) {
+            enqueueChildren(node, clazz, children);
         }
 
         String status = "";
@@ -193,52 +152,98 @@ public final class ASTWriter {
                 append("]").
                 append('\n');
 
-            for (final Field field : children) {
-
-                if (field.getAnnotation(ParentNode.class) != null) {
+            for (final Field child : children) {
+                if (child.getAnnotation(ParentNode.class) != null) {
                     continue;
-                }
-                if (field.getAnnotation(Ignore.class) != null) {
-                    continue;
-                }
-                if (field.getAnnotation(Reference.class) != null) {
+                } else if (child.getAnnotation(Ignore.class) != null) {
                     continue;
                 }
 
                 Object value;
                 try {
-                    value = field.get(node);
+                    value = child.get(node);
                 } catch (final IllegalArgumentException | IllegalAccessException e) {
                     Context.printStackTrace(e);
                     return;
                 }
 
                 if (value instanceof Node) {
-                    printAST(sb, field.getName(), (Node)value, indent + 1);
+                    printAST(sb, child, child.getName(), (Node)value, indent + 1);
                 } else if (value instanceof Collection) {
                     int pos = 0;
                     ASTWriter.indent(sb, indent + 1);
                     sb.append("[Collection ").
-                        append(field.getName()).
+                        append(child.getName()).
                         append("[0..").
                         append(((Collection<Node>)value).size()).
                         append("]]").
                         append('\n');
 
-                    for (final Node child : (Collection<Node>)value) {
-                        printAST(sb, field.getName() + "[" + pos++ + "]", child, indent + 2);
+                    for (final Node member : (Collection<Node>)value) {
+                        printAST(sb, child, child.getName() + "[" + pos++ + "]", member, indent + 2);
                     }
                 }
             }
         }
     }
 
+    private static void enqueueChildren(final Node node, final Class<?> nodeClass, final List<Field> children) {
+        final Deque<Class<?>> stack = new ArrayDeque<>();
+
+        /**
+         * Here is some ugliness that can be overcome by proper ChildNode annotations
+         * with proper orders. Right now we basically sort all classes up to Node
+         * with super class first, as this often is the natural order, e.g. base
+         * before index for an IndexNode.
+         *
+         * Also there are special cases as this is not true for UnaryNodes(lhs) and
+         * BinaryNodes extends UnaryNode (with lhs), and TernaryNodes.
+         *
+         * TODO - generalize traversal with an order built on annotations and this
+         * will go away.
+         */
+        Class<?> clazz = nodeClass;
+        do {
+            stack.push(clazz);
+            clazz = clazz.getSuperclass();
+        } while (clazz != null);
+
+        if (node instanceof TernaryNode) {
+            // HACK juggle "third"
+            stack.push(stack.removeLast());
+        }
+        // HACK change operator order for BinaryNodes to get lhs first.
+        final Iterator<Class<?>> iter = node instanceof BinaryNode ? stack.descendingIterator() : stack.iterator();
+
+        while (iter.hasNext()) {
+            final Class<?> c = iter.next();
+            for (final Field f : c.getDeclaredFields()) {
+                try {
+                    f.setAccessible(true);
+                    final Object child = f.get(node);
+                    if (child == null) {
+                        continue;
+                    }
+
+                    if (child instanceof Node) {
+                        children.add(f);
+                    } else if (child instanceof Collection) {
+                        if (!((Collection<?>)child).isEmpty()) {
+                            children.add(f);
+                        }
+                    }
+                } catch (final IllegalArgumentException | IllegalAccessException e) {
+                    return;
+                }
+            }
+        }
+    }
+
     private static void indent(final StringBuilder sb, final int indent) {
         for (int i = 0; i < indent; i++) {
-            for (int j = 0 ; j < TABWIDTH ; j++) {
+            for (int j = 0; j < TABWIDTH; j++) {
                 sb.append(' ');
             }
         }
     }
-
 }

From e40b456a27de7d76b8fe5ca3ba8e7acfb1d44b06 Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Tue, 8 Jan 2013 21:16:07 +0530
Subject: [PATCH 054/311] 8005848: assigning to global toString variable
 affects Object.prototype.toString

Reviewed-by: jlaskey, lagergren
---
 .../internal/runtime/ScriptObject.java        | 37 +++++++++++++++++-
 nashorn/test/script/basic/JDK_8005848.js      | 39 +++++++++++++++++++
 2 files changed, 74 insertions(+), 2 deletions(-)
 create mode 100644 nashorn/test/script/basic/JDK_8005848.js

diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
index 55b188183b7..191045dee6d 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
@@ -631,9 +631,34 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
      * @return FindPropertyData or null if not found.
      */
     public final FindProperty findProperty(final String key, final boolean deep) {
+        return findProperty(key, deep, false);
+    }
+
+    /**
+     * Low level property API (not using property descriptors)
+     * <p>
+     * Find a property in the prototype hierarchy. Note: this is final and not
+     * a good idea to override. If you have to, use
+     * {jdk.nashorn.internal.objects.NativeArray{@link #getProperty(String)} or
+     * {jdk.nashorn.internal.objects.NativeArray{@link #getPropertyDescriptor(String)} as the
+     * overriding way to find array properties
+     *
+     * @see jdk.nashorn.internal.objects.NativeArray
+     *
+     * @param key  Property key.
+     * @param deep Whether the search should look up proto chain.
+     * @param stopOnNonScope should a deep search stop on the first non-scope object?
+     *
+     * @return FindPropertyData or null if not found.
+     */
+    public final FindProperty findProperty(final String key, final boolean deep, final boolean stopOnNonScope) {
         int depth = 0;
 
         for (ScriptObject self = this; self != null; self = self.getProto()) {
+            // if doing deep search, stop search on the first non-scope object if asked to do so
+            if (stopOnNonScope && depth != 0 && !self.isScope()) {
+                break;
+            }
             final PropertyMap selfMap  = self.getMap();
             final Property    property = selfMap.findProperty(key);
 
@@ -1731,9 +1756,17 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
             return findMegaMorphicSetMethod(desc, name);
         }
 
-        FindProperty find = findProperty(name, true);
+        final boolean scope = isScope();
+        /*
+         * If doing property set on a scope object, we should stop proto search on the first
+         * non-scope object. Without this, for exmaple, when assigning "toString" on global scope,
+         * we'll end up assigning it on it's proto - which is Object.prototype.toString !!
+         *
+         * toString = function() { print("global toString"); } // don't affect Object.prototype.toString
+         */
+        FindProperty find = findProperty(name, true, scope);
         // If it's not a scope search, then we don't want any inherited properties except those with user defined accessors.
-        if (!isScope() && find != null && find.isInherited() && !(find.getProperty() instanceof UserAccessorProperty)) {
+        if (!scope && find != null && find.isInherited() && !(find.getProperty() instanceof UserAccessorProperty)) {
             // We should still check if inherited data property is not writable
             if (isExtensible() && !find.isWritable()) {
                 return createEmptySetMethod(desc, "property.not.writable", false);
diff --git a/nashorn/test/script/basic/JDK_8005848.js b/nashorn/test/script/basic/JDK_8005848.js
new file mode 100644
index 00000000000..d2d07eaf78c
--- /dev/null
+++ b/nashorn/test/script/basic/JDK_8005848.js
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8005848 : assigning to global toString variable affects Object.prototype.toString 
+ *
+ * @test
+ * @run
+ */
+
+toString = function() {
+    print("global's toString called!!");
+}
+
+var obj = {};
+var str = obj.toString();
+if (str != "[object Object]") {
+    print("FAILED: toString does not return expected value");
+}

From 12801c40c537f752ff513cd2d3a6c5dbf50ca1e1 Mon Sep 17 00:00:00 2001
From: Attila Szegedi <attila@openjdk.org>
Date: Wed, 9 Jan 2013 15:02:48 +0100
Subject: [PATCH 055/311] 8005777: Bug in the FacetIntrospector of Dynalink -
 non-public class should search super

Reviewed-by: lagergren, sundar
---
 nashorn/make/project.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nashorn/make/project.properties b/nashorn/make/project.properties
index 3868ead55fd..d14e4cb6647 100644
--- a/nashorn/make/project.properties
+++ b/nashorn/make/project.properties
@@ -90,7 +90,7 @@ testng.listeners=\
 # identical to version - fun with Maven central.
 dynalink.version=0.5-SNAPSHOT
 dynalink.version.type=snapshot
-dynalink.jar.version=0.5-20121218.140128-11
+dynalink.jar.version=0.5-20130109.113843-12
 dynalink.dir.name=dynalink
 dynalink.dir=build/${dynalink.dir.name}
 dynalink.jar=${dynalink.dir}/dynalink.jar

From ff9829969fafa5e2f38529778b90a3b8d249c238 Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Wed, 9 Jan 2013 22:32:40 +0530
Subject: [PATCH 056/311] 8005940: provide ant targets to get and update
 external test scripts

Reviewed-by: jlaskey, lagergren
---
 nashorn/bin/verbose_octane.bat                | 22 ++---
 nashorn/bin/verbose_octane.sh                 |  4 +-
 nashorn/make/Makefile                         |  2 +-
 nashorn/make/build-benchmark.xml              |  4 -
 nashorn/make/build.xml                        | 95 +++++++++++++++++++
 nashorn/make/project.properties               |  4 +-
 nashorn/test/script/basic/run-octane.js       |  2 +-
 nashorn/test/script/basic/runsunspider.js     | 49 +++++-----
 .../internal/codegen/CompilerTest.java        |  3 -
 .../nashorn/internal/parser/ParserTest.java   |  2 -
 10 files changed, 136 insertions(+), 51 deletions(-)

diff --git a/nashorn/bin/verbose_octane.bat b/nashorn/bin/verbose_octane.bat
index f53d6552cc8..ab9e48469a5 100644
--- a/nashorn/bin/verbose_octane.bat
+++ b/nashorn/bin/verbose_octane.bat
@@ -44,16 +44,16 @@ if %errorlevel% equ 0 (
   set CMD=%1 %JVM_FLAGS%
 )
 
-%CMD% test/script/basic/run-octane.js -- test/script/external/octane/benchmarks/box2d.js %OCTANE_ARGS%
-%CMD% test/script/basic/run-octane.js -- test/script/external/octane/benchmarks/code-load.js %OCTANE_ARGS%
-%CMD% test/script/basic/run-octane.js -- test/script/external/octane/benchmarks/crypto.js %OCTANE_ARGS%
-%CMD% test/script/basic/run-octane.js -- test/script/external/octane/benchmarks/deltablue.js %OCTANE_ARGS%
-%CMD% test/script/basic/run-octane.js -- test/script/external/octane/benchmarks/gbemu.js %OCTANE_ARGS%
-%CMD% test/script/basic/run-octane.js -- test/script/external/octane/benchmarks/navier-stokes.js %OCTANE_ARGS%
-%CMD% test/script/basic/run-octane.js -- test/script/external/octane/benchmarks/pdfjs.js %OCTANE_ARGS%
-%CMD% test/script/basic/run-octane.js -- test/script/external/octane/benchmarks/raytrace.js %OCTANE_ARGS%
-%CMD% test/script/basic/run-octane.js -- test/script/external/octane/benchmarks/regexp.js %OCTANE_ARGS%
-%CMD% test/script/basic/run-octane.js -- test/script/external/octane/benchmarks/richards.js %OCTANE_ARGS%
-%CMD% test/script/basic/run-octane.js -- test/script/external/octane/benchmarks/splay.js %OCTANE_ARGS%
+%CMD% test/script/basic/run-octane.js -- test/script/external/octane/box2d.js %OCTANE_ARGS%
+%CMD% test/script/basic/run-octane.js -- test/script/external/octane/code-load.js %OCTANE_ARGS%
+%CMD% test/script/basic/run-octane.js -- test/script/external/octane/crypto.js %OCTANE_ARGS%
+%CMD% test/script/basic/run-octane.js -- test/script/external/octane/deltablue.js %OCTANE_ARGS%
+%CMD% test/script/basic/run-octane.js -- test/script/external/octane/gbemu.js %OCTANE_ARGS%
+%CMD% test/script/basic/run-octane.js -- test/script/external/octane/navier-stokes.js %OCTANE_ARGS%
+%CMD% test/script/basic/run-octane.js -- test/script/external/octane/pdfjs.js %OCTANE_ARGS%
+%CMD% test/script/basic/run-octane.js -- test/script/external/octane/raytrace.js %OCTANE_ARGS%
+%CMD% test/script/basic/run-octane.js -- test/script/external/octane/regexp.js %OCTANE_ARGS%
+%CMD% test/script/basic/run-octane.js -- test/script/external/octane/richards.js %OCTANE_ARGS%
+%CMD% test/script/basic/run-octane.js -- test/script/external/octane/splay.js %OCTANE_ARGS%
 endlocal
 goto :EOF
diff --git a/nashorn/bin/verbose_octane.sh b/nashorn/bin/verbose_octane.sh
index 9593f0602bc..3e453adbaa4 100644
--- a/nashorn/bin/verbose_octane.sh
+++ b/nashorn/bin/verbose_octane.sh
@@ -37,7 +37,7 @@ if [ ! -z $JAVA7_HOME ]; then
     echo "running ${ITERS} iterations with java7 using JAVA_HOME=${JAVA7_HOME}..."
     for BENCHMARK in "${BENCHMARKS[@]}"
     do 
-	CMD="${JAVA8_HOME}/bin/java ${JVM_FLAGS} test/script/basic/run-octane.js -- test/script/external/octane/benchmarks/${BENCHMARK} ${OCTANE_ARGS}"
+	CMD="${JAVA8_HOME}/bin/java ${JVM_FLAGS} test/script/basic/run-octane.js -- test/script/external/octane/${BENCHMARK} ${OCTANE_ARGS}"
 	$CMD
     done
 else
@@ -48,7 +48,7 @@ if [ ! -z $JAVA8_HOME ]; then
     echo "running ${ITERS} iterations with java8 using JAVA_HOME=${JAVA8_HOME}..."   
     for BENCHMARK in "${BENCHMARKS[@]}"
     do 
-	CMD="${JAVA8_HOME}/bin/java ${JVM_FLAGS} test/script/basic/run-octane.js -- test/script/external/octane/benchmarks/${BENCHMARK} ${OCTANE_ARGS}"
+	CMD="${JAVA8_HOME}/bin/java ${JVM_FLAGS} test/script/basic/run-octane.js -- test/script/external/octane/${BENCHMARK} ${OCTANE_ARGS}"
 	$CMD
     done
 else 
diff --git a/nashorn/make/Makefile b/nashorn/make/Makefile
index c3fca106791..5775be158b4 100644
--- a/nashorn/make/Makefile
+++ b/nashorn/make/Makefile
@@ -190,7 +190,7 @@ all: test
 clobber: clean
 
 # All ant targets of interest
-ANT_TARGETS = clean jar javadoc shelldoc docs test test262 test262parallel # for now
+ANT_TARGETS = clean externals update-externals jar javadoc shelldoc docs test test262 test262parallel # for now
 
 # Create diagnostics log (careful, ant 1.8.0 -diagnostics always does an exit 1)
 $(OUTPUTDIR)/build/ant-diagnostics.log:
diff --git a/nashorn/make/build-benchmark.xml b/nashorn/make/build-benchmark.xml
index b5ff4d9dae2..927d7cdcb0f 100644
--- a/nashorn/make/build-benchmark.xml
+++ b/nashorn/make/build-benchmark.xml
@@ -245,7 +245,6 @@
           classpath="${run.test.classpath}"
           fork="true"
           dir=".">
-      <jvmarg line="${boot.class.path}"/>
       <jvmarg line="${ext.class.path}"/>
       <jvmarg line="${run.test.jvmargs.octane}"/>
       <arg value="${octane-test-sys-prop.test.js.framework}"/>
@@ -277,7 +276,6 @@
           classpath="${run.test.classpath}"
           fork="true"
           dir=".">
-      <jvmarg line="${boot.class.path}"/>
       <jvmarg line="${run.test.jvmargs.octane}"/>
       <arg value="${octane-test-sys-prop.test.js.framework}"/>
       <arg value="${octane-tests}"/>
@@ -312,7 +310,6 @@
           classpath="${run.test.classpath}"
           fork="true"
           dir=".">
-      <jvmarg line="${boot.class.path}"/>
       <jvmarg line="${ext.class.path}"/>
       <jvmarg line="${run.test.jvmargs}"/>
       <arg value="-timezone=PST"/>
@@ -338,7 +335,6 @@
           classpath="${run.test.classpath}"
           fork="true"
           dir=".">
-      <jvmarg line="${boot.class.path}"/>
       <jvmarg line="${run.test.jvmargs}"/>
       <arg value="${sunspider-test-sys-prop.test.js.framework}"/>
       <arg value="${sunspider-tests}/"/>
diff --git a/nashorn/make/build.xml b/nashorn/make/build.xml
index b89363529d2..ce13df19611 100644
--- a/nashorn/make/build.xml
+++ b/nashorn/make/build.xml
@@ -31,6 +31,12 @@
       <pathelement location="${dist.dir}"/>
     </path>
     <property name="ext.class.path" value="-Djava.ext.dirs=&quot;${toString:nashorn.ext.path}&quot;"/>
+    <condition property="svn.executable" value="/usr/local/bin/svn" else="svn">
+      <available file="/usr/local/bin/svn"/>
+    </condition>
+    <condition property="hg.executable" value="/usr/local/bin/hg" else="hg">
+      <available file="/usr/local/bin/hg"/>
+    </condition>
   </target>
 
   <target name="prepare" depends="init">
@@ -357,4 +363,93 @@
         <arg value="test.js"/>
     </java>
   </target>
+
+  <!-- targets to get external script tests -->
+
+  <!-- test262 test suite -->
+  <target name="get-test262" depends="init" unless="${test-sys-prop.external.test262}">
+    <!-- clone test262 mercurial repo -->
+    <exec executable="${hg.executable}">
+       <arg value="clone"/>
+       <arg value="http://hg.ecmascript.org/tests/test262"/>
+       <arg value="${test.external.dir}/test262"/>
+    </exec>
+  </target>
+  <target name="update-test262" depends="init" if="${test-sys-prop.external.test262}">
+    <!-- update test262 mercurial repo -->
+    <exec executable="${hg.executable}" dir="${test.external.dir}/test262">
+       <arg value="pull"/>
+       <arg value="-u"/>
+    </exec>
+  </target>
+
+  <!-- octane benchmark -->
+  <target name="get-octane" depends="init" unless="${test-sys-prop.external.octane}">
+    <!-- checkout octane benchmarks -->
+    <exec executable="${svn.executable}">
+       <arg value="--non-interactive"/>
+       <arg value="--trust-server-cert"/>
+       <arg value="checkout"/>
+       <arg value="http://octane-benchmark.googlecode.com/svn/trunk/"/>
+       <arg value="${test.external.dir}/octane"/>
+    </exec>
+  </target>
+  <target name="update-octane" depends="init" if="${test-sys-prop.external.octane}">
+    <!-- update octane benchmarks -->
+    <exec executable="${svn.executable}" dir="${test.external.dir}/octane">
+       <arg value="--non-interactive"/>
+       <arg value="--trust-server-cert"/>
+       <arg value="update"/>
+    </exec>
+  </target>
+
+  <!-- sunspider benchmark -->
+  <target name="get-sunspider" depends="init" unless="${test-sys-prop.external.sunspider}">
+    <!-- checkout sunspider -->
+    <exec executable="${svn.executable}">
+       <arg value="--non-interactive"/>
+       <arg value="--trust-server-cert"/>
+       <arg value="checkout"/>
+       <arg value="http://svn.webkit.org/repository/webkit/trunk/PerformanceTests/SunSpider"/>
+       <arg value="${test.external.dir}/sunspider"/>
+    </exec>
+  </target>
+  <target name="update-sunspider" depends="init" if="${test-sys-prop.external.sunspider}">
+    <!-- update sunspider -->
+    <exec executable="${svn.executable}" dir="${test.external.dir}/sunspider">
+       <arg value="--non-interactive"/>
+       <arg value="--trust-server-cert"/>
+       <arg value="update"/>
+    </exec>
+  </target>
+
+  <!-- get all external test scripts -->
+  <target name="externals" depends="prepare, check-external-tests, get-test262, get-octane, get-sunspider">
+    <!-- make external test dir -->
+    <mkdir dir="${test.external.dir}"/> 
+
+    <!-- jquery -->
+    <mkdir dir="${test.external.dir}/jquery"/>    
+    <get src="http://code.jquery.com/jquery-1.7.2.js" dest="${test.external.dir}/jquery" skipexisting="true" ignoreerrors="true"/>
+    <get src="http://code.jquery.com/jquery-1.7.2.min.js" dest="${test.external.dir}/jquery" skipexisting="true" ignoreerrors="true"/>
+
+    <!-- prototype -->
+    <mkdir dir="${test.external.dir}/prototype"/>    
+    <get src="http://ajax.googleapis.com/ajax/libs/prototype/1.7.0/prototype.js" dest="${test.external.dir}/prototype" usetimestamp="true" skipexisting="true" ignoreerrors="true"/>
+
+    <!-- underscorejs -->
+    <mkdir dir="${test.external.dir}/underscore"/> 
+    <get src="http://underscorejs.org/underscore.js" dest="${test.external.dir}/underscore" skipexisting="true" ignoreerrors="true"/>
+    <get src="http://underscorejs.org/underscore-min.js" dest="${test.external.dir}/underscore" skipexisting="true" ignoreerrors="true"/>
+
+    <!-- yui -->
+    <mkdir dir="${test.external.dir}/yui"/> 
+    <get src="http://yui.yahooapis.com/3.5.1/build/yui/yui.js" dest="${test.external.dir}/yui" skipexisting="true" ignoreerrors="true"/>
+    <get src="http://yui.yahooapis.com/3.5.1/build/yui/yui-min.js" dest="${test.external.dir}/yui" skipexisting="true" ignoreerrors="true"/>
+
+  </target>
+
+  <!-- update external test suites that are pulled from source control systems -->
+  <target name="update-externals" depends="prepare, check-external-tests, update-test262, update-octane, update-sunspider"/>
+
 </project>
diff --git a/nashorn/make/project.properties b/nashorn/make/project.properties
index d14e4cb6647..202e0768390 100644
--- a/nashorn/make/project.properties
+++ b/nashorn/make/project.properties
@@ -154,7 +154,7 @@ test-sys-prop.test.js.exclude.dir=${test.script.dir}/currently-failing ${test.ex
 test-sys-prop.test.js.unchecked.dir=${test262.dir}
 
 # test root for octane
-octane-test-sys-prop.test.js.roots=${test.external.dir}/octane/benchmarks
+octane-test-sys-prop.test.js.roots=${test.external.dir}/octane/
 
 # framework root for octane
 octane-test-sys-prop.test.js.framework=${test.basic.dir}/run-octane.js
@@ -163,7 +163,7 @@ octane-test-sys-prop.test.js.framework=${test.basic.dir}/run-octane.js
 octane-test-sys-prop.test.js.exclude.list=base.js
 
 # test root for sunspider
-sunspider-test-sys-prop.test.js.roots=${test.external.dir}/sunspider/
+sunspider-test-sys-prop.test.js.roots=${test.external.dir}/sunspider/tests/sunspider-1.0/
 
 # framework root for sunspider
 sunspider-test-sys-prop.test.js.framework=${test.basic.dir}/runsunspider.js
diff --git a/nashorn/test/script/basic/run-octane.js b/nashorn/test/script/basic/run-octane.js
index 2247450a800..42058f7e089 100644
--- a/nashorn/test/script/basic/run-octane.js
+++ b/nashorn/test/script/basic/run-octane.js
@@ -52,7 +52,7 @@ var ignoreTeardown = [
 var dir = (typeof(__DIR__) == 'undefined') ? "test/script/basic/" : __DIR__;
 
 // TODO: why is this path hard coded when it's defined in project properties?
-var path = dir + "../external/octane/benchmarks/";
+var path = dir + "../external/octane/";
 
 var runtime = "";
 var verbose = false;
diff --git a/nashorn/test/script/basic/runsunspider.js b/nashorn/test/script/basic/runsunspider.js
index 4c8855a2371..43c5fae1bf1 100644
--- a/nashorn/test/script/basic/runsunspider.js
+++ b/nashorn/test/script/basic/runsunspider.js
@@ -121,30 +121,29 @@ if (typeof $ARGS !== 'undefined') {
 } 
 
 var tests = [
-	     'check-3d-cube.js',
-	     'check-access-nsieve.js',
-	     'check-crypto-aes.js',   
-	     'check-math-spectral-norm.js',
-	     'check-3d-morph.js',
-	     'check-bitops-3bit-bits-in-byte.js',
-	     'check-crypto-md5.js',
-	     'check-mont.js',
-	     'check-3d-raytrace.js',
-	     'check-bitops-bits-in-byte.js',
-	     'check-crypto-sha1.js',
-	     'check-regexp-dna.js',
-	     'check-access-binary-trees.js',
-	     'check-bitops-bitwise-and.js',
-	     'check-date-format-tofte.js',
-	     'check-string-fasta.js',
-	     'check-access-fannkuch.js',
-	     'check-bitops-nsieve-bits.js',
-	     'check-math-cordic.js',
-	     'check-string-tagcloud.js',
-	     'check-access-nbody.js',
-	     'check-controlflow-recursive.js',
-	     'check-math-partial-sums.js',
-	     'check-string-unpack-code.js'
+	     '3d-cube.js',
+	     'access-nsieve.js',
+	     'crypto-aes.js',   
+	     'math-spectral-norm.js',
+	     '3d-morph.js',
+	     'bitops-3bit-bits-in-byte.js',
+	     'crypto-md5.js',
+	     '3d-raytrace.js',
+	     'bitops-bits-in-byte.js',
+	     'crypto-sha1.js',
+	     'regexp-dna.js',
+	     'access-binary-trees.js',
+	     'bitops-bitwise-and.js',
+	     'date-format-tofte.js',
+	     'string-fasta.js',
+	     'access-fannkuch.js',
+	     'bitops-nsieve-bits.js',
+	     'math-cordic.js',
+	     'string-tagcloud.js',
+	     'access-nbody.js',
+	     'controlflow-recursive.js',
+	     'math-partial-sums.js',
+	     'string-unpack-code.js'
 	     ];
 
 // handle the case this script may be run by a JS engine that doesn't
@@ -152,7 +151,7 @@ var tests = [
 var dir = (typeof(__DIR__) == 'undefined')? "test/script/basic/" : __DIR__;
 
 for (i in tests) {
-    tests[i] = dir + '../external/sunspider/' + tests[i];
+    tests[i] = dir + '../external/sunspider/tests/sunspider-1.0/' + tests[i];
 }
 
 var verbose_run = false;
diff --git a/nashorn/test/src/jdk/nashorn/internal/codegen/CompilerTest.java b/nashorn/test/src/jdk/nashorn/internal/codegen/CompilerTest.java
index e9fb64a6fd7..0be409c0c67 100644
--- a/nashorn/test/src/jdk/nashorn/internal/codegen/CompilerTest.java
+++ b/nashorn/test/src/jdk/nashorn/internal/codegen/CompilerTest.java
@@ -43,8 +43,6 @@ import org.testng.annotations.Test;
 public class CompilerTest {
     private static final boolean VERBOSE  = Boolean.valueOf(System.getProperty("compilertest.verbose"));
     private static final boolean TEST262  = Boolean.valueOf(System.getProperty("compilertest.test262"));
-
-    private static final String ES5CONFORM_DIR    = System.getProperty("es5conform.testcases.dir");
     private static final String TEST_BASIC_DIR  = System.getProperty("test.basic.dir");
     private static final String TEST262_SUITE_DIR = System.getProperty("test262.suite.dir");
 
@@ -90,7 +88,6 @@ public class CompilerTest {
                 }
             });
         }
-        compileTestSet(ES5CONFORM_DIR, null);
         compileTestSet(TEST_BASIC_DIR, null);
     }
 
diff --git a/nashorn/test/src/jdk/nashorn/internal/parser/ParserTest.java b/nashorn/test/src/jdk/nashorn/internal/parser/ParserTest.java
index c36f768b800..9778b7479d6 100644
--- a/nashorn/test/src/jdk/nashorn/internal/parser/ParserTest.java
+++ b/nashorn/test/src/jdk/nashorn/internal/parser/ParserTest.java
@@ -43,7 +43,6 @@ public class ParserTest {
     private static final boolean VERBOSE   = Boolean.valueOf(System.getProperty("parsertest.verbose"));
     private static final boolean TEST262   = Boolean.valueOf(System.getProperty("parsertest.test262"));
 
-    private static final String ES5CONFORM_DIR    = System.getProperty("es5conform.testcases.dir");
     private static final String TEST_BASIC_DIR  = System.getProperty("test.basic.dir");
     private static final String TEST262_SUITE_DIR = System.getProperty("test262.suite.dir");
 
@@ -80,7 +79,6 @@ public class ParserTest {
                 }
             });
         }
-        parseTestSet(ES5CONFORM_DIR, null);
         parseTestSet(TEST_BASIC_DIR, null);
     }
 

From 3d269485fc07b63b2724948bfac215d7d6cf52d0 Mon Sep 17 00:00:00 2001
From: Marcus Lagergren <lagergren@openjdk.org>
Date: Thu, 10 Jan 2013 10:28:57 +0100
Subject: [PATCH 057/311] 8005971: runsunspider.js should check results of
 benchmarks

Reviewed-by: attila, hannesw
---
 nashorn/test/script/basic/runsunspider.js | 321 +++++++++++++++++-----
 1 file changed, 255 insertions(+), 66 deletions(-)

diff --git a/nashorn/test/script/basic/runsunspider.js b/nashorn/test/script/basic/runsunspider.js
index 43c5fae1bf1..7b0d732c7e8 100644
--- a/nashorn/test/script/basic/runsunspider.js
+++ b/nashorn/test/script/basic/runsunspider.js
@@ -87,104 +87,293 @@ function runbench(name) {
     } 
     runs++;
 }
-    
-function runsuite(args) {
-    var changed = false;
 
+var m_w = 4711;
+var m_z = 17;
+var MAXINT = 0x7fffffff;
+
+//produce deterministic random numbers for test suite
+function pseudorandom() {
+    m_z = 36969 * (m_z & 65535) + (m_z >> 16);
+    m_w = 18000 * (m_w & 65535) + (m_w >> 16);
+    return (Math.abs((m_z << 16) + m_w) & MAXINT) / MAXINT;
+}
+
+function runsuite(tests) {
+    var changed = false;
+    
+    var oldRandom = Math.random;
+    Math.random = pseudorandom;
+    
     try {
-	for (var n = 0; n < args.length; n++) {
-	    if (args[n] == undefined) {
-		continue;
+	for (var n = 0; n < tests.length; n++) {
+	    runbench(tests[n].name);
+	    if (typeof tests[n].actual !== 'undefined') {
+		assertEq(tests[n].actual(), tests[n].expected());
 	    }
-	    if (args[n].indexOf('--') == 0) {
-		continue; //ignore param
-	    }
-	    runbench(args[n]);
 	    changed = true;
 	}
-
     } catch (e) {
 	print("error: " + e);
-	if (e.toString().indexOf(args) == 1) {
+	if (e.toString().indexOf(tests) == 1) {
 	    throw e;
 	}
 	// no scripting or something, silently fail
+    } finally {
+	Math.random = oldRandom;
     }
+
     return changed;
 }
 
-var args;
-if (typeof $ARGS !== 'undefined') {
-    args = $ARGS;
-} else if (typeof arguments !== 'undefined') {
-    args = arguments;
-} 
+function hash(str) {
+    var s = "" + str;
+    var h = 0;
+    var off = 0;
+    for (var i = 0; i < s.length; i++) {
+	h = 31 * h + s.charCodeAt(off++);
+	h &= 0x7fffffff;
+    }
+    return h ^ s.length;
+}
 
 var tests = [
-	     '3d-cube.js',
-	     'access-nsieve.js',
-	     'crypto-aes.js',   
-	     'math-spectral-norm.js',
-	     '3d-morph.js',
-	     'bitops-3bit-bits-in-byte.js',
-	     'crypto-md5.js',
-	     '3d-raytrace.js',
-	     'bitops-bits-in-byte.js',
-	     'crypto-sha1.js',
-	     'regexp-dna.js',
-	     'access-binary-trees.js',
-	     'bitops-bitwise-and.js',
-	     'date-format-tofte.js',
-	     'string-fasta.js',
-	     'access-fannkuch.js',
-	     'bitops-nsieve-bits.js',
-	     'math-cordic.js',
-	     'string-tagcloud.js',
-	     'access-nbody.js',
-	     'controlflow-recursive.js',
-	     'math-partial-sums.js',
-	     'string-unpack-code.js'
-	     ];
+    { name: 'string-base64.js',
+      actual: function() {	  
+	  return hash(str);
+      },
+      expected: function() {
+	  return 1544571068;
+      }
+    },    
+    { name: 'string-validate-input.js',
+      actual: function() {	  
+	  return hash(endResult);
+      },
+      expected: function() {
+	  return 2016572373;
+      }
+    },    
+    { name: 'date-format-xparb.js',
+      actual: function() {	  
+	  return shortFormat + longFormat;
+      },
+      expected: function() {
+	  return "2017-09-05Tuesday, September 05, 2017 8:43:48 AM";
+      }
+    },    
+    { name: '3d-morph.js',
+      actual: function() {
+	  var acceptableDelta = 4e-15;
+	  return (testOutput - 6.394884621840902e-14) < acceptableDelta;
+      },
+      expected: function() {
+	  return true;
+      }
+    },    
+    { name: 'crypto-aes.js',
+      actual: function() {
+	  return plainText;
+      },
+      expected: function() {
+	  return decryptedText;
+      }
+    },    
+    { name: 'crypto-md5.js',
+      actual: function() {
+	  return md5Output;
+      },
+      expected: function() {
+	  return "a831e91e0f70eddcb70dc61c6f82f6cd";
+      }
+    },    
+    { name: 'crypto-sha1.js',
+      actual: function() {
+	  return sha1Output;
+      },
+      expected: function() {
+	  return "2524d264def74cce2498bf112bedf00e6c0b796d";
+      }
+    },    
+    { name: 'bitops-bitwise-and.js', 
+      actual: function() {
+	  return result;      
+      },
+      expected: function() {
+	  return 0;
+      }
+    },    
+    { name: 'bitops-bits-in-byte.js', 
+      actual: function() {
+	  return result;      
+      },
+      expected: function() {
+	  return 358400;
+      }
+    },    
+    { name: 'bitops-nsieve-bits.js', 
+      actual: function() {
+	  var ret = 0;
+	  for (var i = 0; i < result.length; ++i) {
+	      ret += result[i];
+	  }
+	  ret += result.length;
+	  return ret;	    
+      },
+      expected: function() {
+	  return -1286749539853;
+      }
+    },    
+    { name: 'bitops-3bit-bits-in-byte.js', 
+      actual: function() {
+	  return sum;      
+      },
+      expected: function() {
+	  return 512000;
+      }
+    },    
+    { name: 'access-nbody.js', 
+      actual: function() {
+	  return ret;  
+      },
+      expected: function() {
+	    return -0.16906933525822856;
+      }
+    },    
+    { name: 'access-binary-trees.js', 
+      actual: function() {
+	  return ret;  
+      },
+      expected: function() {
+	  return -1;
+      }
+    },    
+    { name: 'access-fannkuch.js',
+      actual: function() {
+	  return ret;  
+      },
+      expected: function() {
+	  return 22;
+      }
+    },
+    { name: 'math-spectral-norm.js',
+      actual: function() {	    
+	  var ret = '';
+	  for (var i = 6; i <= 48; i *= 2) {
+	      ret += spectralnorm(i) + ',';
+	  }
+	  return ret;
+      },
+      expected: function() {
+	  return "1.2657786149754053,1.2727355112619148,1.273989979775574,1.274190125290389,";
+      }
+    },    
+    { name: '3d-raytrace.js',
+      actual: function() {
+	  return hash(testOutput);
+      },
+      expected: function() {
+	  return 230692593;
+      }
+    },    
+    { name: 'regexp-dna.js',
+      actual: function() {
+	  return dnaOutputString;
+      },
+      expected: function() {
+	  return "undefinedagggtaaa|tttaccct 0\n[cgt]gggtaaa|tttaccc[acg] 9\na[act]ggtaaa|tttacc[agt]t 27\nag[act]gtaaa|tttac[agt]ct 24\nagg[act]taaa|ttta[agt]cct 30\naggg[acg]aaa|ttt[cgt]ccct 9\nagggt[cgt]aa|tt[acg]accct 12\nagggta[cgt]a|t[acg]taccct 9\nagggtaa[cgt]|[acg]ttaccct 15\n";
+      }
+    },    
+    { name: 'math-cordic.js',
+      actual: function() {
+	  return total;
+      },
+      expected: function() {
+	  return 10362.570468755888;
+      }
+    },
+    { name: 'controlflow-recursive.js',
+      actual: function() {
+	  var ret = 0;
+	  for (var i = 3; i <= 5; i++) {
+	      ret += ack(3,i);
+	      ret += fib(17.0+i);
+	      ret += tak(3*i+3,2*i+2,i+1);
+	  }
+	  return ret;
+      },
+      expected: function() {
+	  return 57775;
+      }
+    },    
+    { name: 'date-format-tofte.js',
+      actual: function() {
+	  return shortFormat + longFormat;
+      },
+      expected: function() {
+	  return "2008-05-01Thursday, May 01, 2008 6:31:22 PM";
+      }
+    },
+    { name: 'string-tagcloud.js',
+      actual: function() {
+	  // The result string embeds floating-point numbers, which can vary a bit on different platforms,
+	  // so we truncate them a bit before comparing.
+	  var tagcloud_norm = tagcloud.replace(/([0-9.]+)px/g, function(str, p1) { return p1.substr(0, 10) + 'px' })
+	  return tagcloud_norm.length;
+      },
+      expected: function() {
+	  return 295906;
+      }
+    },    
+    { name: 'string-unpack-code.js',
+      actual: function() {
+	  return decompressedMochiKit.length == 106415 &&
+	      decompressedMochiKit[2000] == '5' &&
+	      decompressedMochiKit[12000] == '_' &&
+	      decompressedMochiKit[82556] == '>';
+      },
+      expected: function() {
+	  return true;
+      }
+    },    
+    //TODO no easy way to sanity check result
+    { name: 'string-fasta.js' },
+    //TODO no easy way to sanity check result
+    { name: 'math-partial-sums.js' },
+    //TODO no easy way to sanity check result
+    { name: 'access-nsieve.js' },
+    //TODO no easy way to sanity check result
+    { name: '3d-cube.js' },    
+];
 
 // handle the case this script may be run by a JS engine that doesn't
 // support __DIR__ global variable.
-var dir = (typeof(__DIR__) == 'undefined')? "test/script/basic/" : __DIR__;
+var dir = (typeof(__DIR__) == 'undefined') ? "test/script/basic/" : __DIR__;
 
 for (i in tests) {
-    tests[i] = dir + '../external/sunspider/tests/sunspider-1.0/' + tests[i];
+    tests[i].name = dir + '../external/sunspider/tests/sunspider-1.0/' + tests[i].name;
 }
 
 var verbose_run = false;
 
-// check for a fileset from ant and split it - special case call from ant build.xml
-if (args.length == 1 && args[0].toString().indexOf(' ') != -1) {
-    args[0] = args[0].replace(/\/$/, '');
-    args = args[0].split(' ');
-    verbose_run = true; //for a file set, always run verbose for ant sunspider output
-} 
-
-
-var tests_found = [];
+var args = [];
+if (typeof $ARGS !== 'undefined') {
+    args = $ARGS;
+} else if (typeof arguments !== 'undefined' && arguments.length != 0) {
+    args = arguments;
+}  
 
 for (i in args) {
-    var arg = args[i];
-    if (arg.indexOf('--') == 0) {
-	if (arg == '--verbose') {
-	    verbose_run = true;
-	} 
-    } else {
-	tests_found.push(arg);
+    if (args[i] === '--verbose') {
+	verbose_run = true;
+	break;
     }
 }
 
-if (tests_found.length == 0) {    
-    tests_found = tests;
-}
-
-runsuite(tests_found);
+runsuite(tests);
 
 if (verbose_run) {
-    print(runs + "/" + tests_found.length + " tests were successfully run in " + total_time + " ms ");
+    print('\n' + runs + "/" + tests.length + " tests were successfully run in " + total_time + " ms ");
 }
 
 print("Sunspider finished!");

From 643a6b824ce3bcb30b03b47d15e4b5a850e61c96 Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Thu, 10 Jan 2013 19:03:25 +0530
Subject: [PATCH 058/311] 8005987: ant octane tries to run non-benchmark
 scripts

Reviewed-by: lagergren, attila, jlaskey
---
 nashorn/make/build-benchmark.xml | 2 +-
 nashorn/make/project.properties  | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/nashorn/make/build-benchmark.xml b/nashorn/make/build-benchmark.xml
index 927d7cdcb0f..b3ff4bb08c9 100644
--- a/nashorn/make/build-benchmark.xml
+++ b/nashorn/make/build-benchmark.xml
@@ -27,7 +27,7 @@
     <fileset id="octane-set"
 	     dir="${octane-test-sys-prop.test.js.roots}"
 	     excludes="${octane-test-sys-prop.test.js.exclude.list}">
-      <include name="**/*.js"/>
+      <include name="*.js"/>
     </fileset>
     <pathconvert pathsep=" " property="octane-tests" refid="octane-set"/>
     <property name="extra-arg" value=""/>
diff --git a/nashorn/make/project.properties b/nashorn/make/project.properties
index 202e0768390..e1e77614e54 100644
--- a/nashorn/make/project.properties
+++ b/nashorn/make/project.properties
@@ -160,7 +160,9 @@ octane-test-sys-prop.test.js.roots=${test.external.dir}/octane/
 octane-test-sys-prop.test.js.framework=${test.basic.dir}/run-octane.js
 
 # list of tests to be excluded
-octane-test-sys-prop.test.js.exclude.list=base.js
+octane-test-sys-prop.test.js.exclude.list=\
+    base.js \
+    run.js
 
 # test root for sunspider
 sunspider-test-sys-prop.test.js.roots=${test.external.dir}/sunspider/tests/sunspider-1.0/

From 164350cecfb47ddccd93cb2592b0d661dcd8199c Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Thu, 10 Jan 2013 19:55:38 +0530
Subject: [PATCH 059/311] 8005982: NASHORN-71.js failing in nightlys

Reviewed-by: attila, lagergren, jlaskey
---
 nashorn/test/script/basic/NASHORN-71.js          | 16 ++++++++++++----
 nashorn/test/script/basic/NASHORN-71.js.EXPECTED |  3 ---
 2 files changed, 12 insertions(+), 7 deletions(-)
 delete mode 100644 nashorn/test/script/basic/NASHORN-71.js.EXPECTED

diff --git a/nashorn/test/script/basic/NASHORN-71.js b/nashorn/test/script/basic/NASHORN-71.js
index f09cbc2efc2..913ff76dacb 100644
--- a/nashorn/test/script/basic/NASHORN-71.js
+++ b/nashorn/test/script/basic/NASHORN-71.js
@@ -22,12 +22,20 @@
  */
 
 /**
- * NASHORN-71 :  Global functions decodeURI, decodeURICompondet are not implemdeted.
+ * NASHORN-71 :  Global functions decodeURI, decodeURICompondet are not implemented.
  *
  * @test
  * @run
  */
 
-print(decodeURI("It's%20me!!"));
-print(decodeURI("http://en.wikipedia.org/wiki/%D0%90%D0%BB%D0%B5%D0%BA%D1%81%D0%B5%D0%B9"));
-print(decodeURIComponent("Sk%C3%A5l"));
+if (decodeURI("It's%20me!!") != "It's me!!") {
+    fail("#1 decodeURI failed");
+}
+
+if (decodeURI("http://en.wikipedia.org/wiki/%D0%90%D0%BB%D0%B5%D0%BA%D1%81%D0%B5%D0%B9") != "http://en.wikipedia.org/wiki/\u0410\u043B\u0435\u043A\u0441\u0435\u0439") {
+    fail("#2 decodeURI failed");
+}
+
+if (decodeURIComponent("Sk%C3%A5l") != "Sk\u00E5l") {
+    fail("decodeURIComponent failed");
+}
diff --git a/nashorn/test/script/basic/NASHORN-71.js.EXPECTED b/nashorn/test/script/basic/NASHORN-71.js.EXPECTED
deleted file mode 100644
index 2f5bcc80eb9..00000000000
--- a/nashorn/test/script/basic/NASHORN-71.js.EXPECTED
+++ /dev/null
@@ -1,3 +0,0 @@
-It's me!!
-http://en.wikipedia.org/wiki/�лек�ей
-Skål

From ddf4b86c577fce1cb0291f1a8536ca5708fbbbbe Mon Sep 17 00:00:00 2001
From: Attila Szegedi <attila@openjdk.org>
Date: Thu, 10 Jan 2013 15:28:05 +0100
Subject: [PATCH 060/311] 8005983: JavaAdapterFactory generated proxy classes
 should take extra constructor arguments at the end

Reviewed-by: lagergren, sundar
---
 .../runtime/linker/JavaAdapterFactory.java    | 47 +++++++++-------
 .../runtime/linker/NashornLinker.java         | 55 ++++++++++++++-----
 nashorn/test/script/sandbox/javaextend.js     |  6 +-
 .../script/sandbox/javaextend.js.EXPECTED     |  1 +
 4 files changed, 74 insertions(+), 35 deletions(-)

diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
index 337146363e1..f6001dbf23d 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
@@ -91,7 +91,7 @@ import org.dynalang.dynalink.support.LinkRequestImpl;
  * For every protected or public constructor in the extended class (which is either the original class, or Object when
  * an interface is implemented), the adapter class will have one or two public constructors (visibility of protected
  * constructors in the extended class is promoted to public). In every case, for every original constructor, a new
- * constructor taking an initial ScriptObject argument followed by original constructor arguments is present on the
+ * constructor taking a trailing ScriptObject argument preceded by original constructor arguments is present on the
  * adapter class. When such a constructor is invoked, the passed ScriptObject's member functions are used to implement
  * and/or override methods on the original class, dispatched by name. A single JavaScript function will act as the
  * implementation for all overloaded methods of the same name. When methods on an adapter instance are invoked, the
@@ -106,17 +106,24 @@ import org.dynalang.dynalink.support.LinkRequestImpl;
  * </p><p>
  * For abstract classes or interfaces that only have one abstract method, or have several of them, but all share the
  * same name, an additional constructor is provided for every original constructor; this one takes a ScriptFunction as
- * its first argument followed by original constructor arguments. This constructor will use the passed function as the
+ * its last argument preceded by original constructor arguments. This constructor will use the passed function as the
  * implementation for all abstract methods. For consistency, any concrete methods sharing the single abstract method
  * name will also be overridden by the function. When methods on the adapter instance are invoked, the ScriptFunction is
  * invoked with {@code null} as its "this".
- * </p><p>If the superclass has a protected or public default constructor, then a generated constructor that only takes
- * a ScriptFunction is also implicitly used as an automatic conversion whenever a ScriptFunction is passed in an
+ * </p><p>
+ * If the superclass has a protected or public default constructor, then a generated constructor that only takes a
+ * ScriptFunction is also implicitly used as an automatic conversion whenever a ScriptFunction is passed in an
  * invocation of any Java method that expects such SAM type.
  * </p><p>
  * For adapter methods that return values, all the JavaScript-to-Java conversions supported by Nashorn will be in effect
  * to coerce the JavaScript function return value to the expected Java return type.
  * </p><p>
+ * Since we are adding a trailing argument to the generated constructors in the adapter class, they will never be
+ * declared as variable arity, even if the original constructor in the superclass was declared as variable arity. The
+ * reason we are passing the additional argument at the end of the argument list instead at the front is that the
+ * source-level script expression <code>new X(a, b) { ... }</code> (which is a proprietary syntax extension Nashorn uses
+ * to resemble Java anonymous classes) is actually equivalent to <code>new X(a, b, { ... })</code>.
+ * </p><p>
  * You normally don't use this class directly, but rather either create adapters from script using
  * {@link NativeJava#extend(Object, Object)}, using the {@code new} operator on abstract classes and interfaces (see
  * {@link NativeJava#type(Object, Object)}), or implicitly when passing script functions to Java methods expecting SAM
@@ -504,12 +511,15 @@ public class JavaAdapterFactory {
      * {@link #getHandle(ScriptFunction, MethodType, boolean)} or {@link #getHandle(ScriptObject, String, MethodType,
      * boolean)} to obtain the method handles; these methods make sure to add the necessary conversions and arity
      * adjustments so that the resulting method handles can be invoked from generated methods using {@code invokeExact}.
-     * The constructor that takes a script function will only initialize the abstract methods
-     * The constructor will also store the Nashorn global that was current at the constructor invocation time in a
-     * field named "global". The generated constructor will be public, regardless of whether the supertype constructor
-     * was public or protected.
+     * The constructor that takes a script function will only initialize the methods with the same name as the single
+     * abstract method. The constructor will also store the Nashorn global that was current at the constructor
+     * invocation time in a field named "global". The generated constructor will be public, regardless of whether the
+     * supertype constructor was public or protected. The generated constructor will not be variable arity, even if the
+     * supertype constructor was.
      * @param ctor the supertype constructor that is serving as the base for the generated constructor.
-     * @param fromFunction true if a
+     * @param fromFunction true if we're generating a constructor that initializes SAM types from a single
+     * ScriptFunction passed to it, false if we're generating a constructor that initializes an arbitrary type from a
+     * ScriptObject passed to it.
      */
     private void generateConstructor(final Constructor<?> ctor, final boolean fromFunction) {
         final Type originalCtorType = Type.getType(ctor);
@@ -517,23 +527,22 @@ public class JavaAdapterFactory {
         final int argLen = originalArgTypes.length;
         final Type[] newArgTypes = new Type[argLen + 1];
 
-        // Insert ScriptFunction|ScriptObject as the frontmost argument to the constructor
+        // Insert ScriptFunction|ScriptObject as the last argument to the constructor
         final Type extraArgumentType = fromFunction ? SCRIPT_FUNCTION_TYPE : SCRIPT_OBJECT_TYPE;
-        newArgTypes[0] = extraArgumentType;
-        System.arraycopy(originalArgTypes, 0, newArgTypes, 1, argLen);
+        newArgTypes[argLen] = extraArgumentType;
+        System.arraycopy(originalArgTypes, 0, newArgTypes, 0, argLen);
 
         // All constructors must be public, even if in the superclass they were protected.
         // Existing super constructor <init>(this, args...) triggers generating <init>(this, scriptObj, args...).
-        final InstructionAdapter mv = new InstructionAdapter(cw.visitMethod(ACC_PUBLIC | (ctor.isVarArgs() ?
-                ACC_VARARGS : 0), INIT, Type.getMethodDescriptor(originalCtorType.getReturnType(), newArgTypes),
-                null, null));
+        final InstructionAdapter mv = new InstructionAdapter(cw.visitMethod(ACC_PUBLIC, INIT,
+                Type.getMethodDescriptor(originalCtorType.getReturnType(), newArgTypes), null, null));
 
         mv.visitCode();
-        // First, invoke super constructor with shifted arguments. If the form of the constructor we're generating is
-        // <init>(this, scriptFn, args...), then we're invoking super.<init>(this, args...).
+        // First, invoke super constructor with original arguments. If the form of the constructor we're generating is
+        // <init>(this, args..., scriptFn), then we're invoking super.<init>(this, args...).
         mv.visitVarInsn(ALOAD, 0);
         final Class<?>[] argTypes = ctor.getParameterTypes();
-        int offset = 2; // First arg is at position 2, after this and scriptFn.
+        int offset = 1; // First arg is at position 1, after this.
         for (int i = 0; i < argLen; ++i) {
             final Type argType = Type.getType(argTypes[i]);
             mv.load(offset, argType);
@@ -553,7 +562,7 @@ public class JavaAdapterFactory {
                 // is a deliberate design choice. All other method handles are initialized to null.
                 mv.visitInsn(ACONST_NULL);
             } else {
-                mv.visitVarInsn(ALOAD, 1);
+                mv.visitVarInsn(ALOAD, offset);
                 if(!fromFunction) {
                     mv.aconst(mi.getName());
                 }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornLinker.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornLinker.java
index 832c40f3383..8944e1f0d0b 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornLinker.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornLinker.java
@@ -85,24 +85,49 @@ public class NashornLinker implements TypeBasedGuardingDynamicLinker, GuardingTy
 
     @Override
     public GuardedInvocation convertToType(final Class<?> sourceType, final Class<?> targetType) throws Exception {
+        final GuardedInvocation gi = convertToTypeNoCast(sourceType, targetType);
+        return gi == null ? null : gi.asType(MH.type(targetType, sourceType));
+    }
+
+    /**
+     * Main part of the implementation of {@link GuardingTypeConverterFactory#convertToType(Class, Class)} that doesn't
+     * care about adapting the method signature; that's done by the invoking method. Returns either a built-in
+     * conversion to primitive (or primitive wrapper) Java types or to String, or a just-in-time generated converter to
+     * a SAM type (if the target type is a SAM type).
+     * @param sourceType the source type
+     * @param targetType the target type
+     * @return a guarded invocation that converts from the source type to the target type.
+     * @throws Exception if something goes wrong
+     */
+    private static GuardedInvocation convertToTypeNoCast(final Class<?> sourceType, final Class<?> targetType) throws Exception {
         final MethodHandle mh = JavaArgumentConverters.getConverter(targetType);
-        final GuardedInvocation gi;
         if (mh != null) {
-            gi = new GuardedInvocation(mh, canLinkTypeStatic(sourceType) ? null : IS_NASHORN_OR_UNDEFINED_TYPE);
-        } else if (isAutoConvertibleFromFunction(targetType)) {
-            final MethodHandle ctor = JavaAdapterFactory.getConstructor(ScriptFunction.class, targetType);
-            assert ctor != null; // if JavaAdapterFactory.isAutoConvertible() returned true, then ctor must exist.
-            if(ScriptFunction.class.isAssignableFrom(sourceType)) {
-                gi = new GuardedInvocation(ctor, null);
-            } else if(sourceType == Object.class) {
-                gi = new GuardedInvocation(ctor, IS_SCRIPT_FUNCTION);
-            } else {
-                return null;
-            }
-        } else {
-            return null;
+            return new GuardedInvocation(mh, canLinkTypeStatic(sourceType) ? null : IS_NASHORN_OR_UNDEFINED_TYPE);
         }
-        return gi.asType(MH.type(targetType, sourceType));
+        return getSamTypeConverter(sourceType, targetType);
+    }
+
+    /**
+     * Returns a guarded invocation that converts from a source type that is ScriptFunction, or a subclass or a
+     * superclass of it) to a SAM type.
+     * @param sourceType the source type (presumably ScriptFunction or a subclass or a superclass of it)
+     * @param targetType the target type (presumably a SAM type)
+     * @return a guarded invocation that converts from the source type to the target SAM type. null is returned if
+     * either the source type is neither ScriptFunction, nor a subclass, nor a superclass of it, or if the target type
+     * is not a SAM type.
+     * @throws Exception if something goes wrong; generally, if there's an issue with creation of the SAM proxy type
+     * constructor.
+     */
+    private static GuardedInvocation getSamTypeConverter(final Class<?> sourceType, final Class<?> targetType) throws Exception {
+        // If source type is more generic than ScriptFunction class, we'll need to use a guard
+        final boolean isSourceTypeGeneric = sourceType.isAssignableFrom(ScriptFunction.class);
+
+        if ((isSourceTypeGeneric || ScriptFunction.class.isAssignableFrom(sourceType)) && isAutoConvertibleFromFunction(targetType)) {
+            final MethodHandle ctor = JavaAdapterFactory.getConstructor(ScriptFunction.class, targetType);
+            assert ctor != null; // if isAutoConvertibleFromFunction() returned true, then ctor must exist.
+            return new GuardedInvocation(ctor, isSourceTypeGeneric ? IS_SCRIPT_FUNCTION : null);
+        }
+        return null;
     }
 
     private static boolean isAutoConvertibleFromFunction(final Class<?> clazz) {
diff --git a/nashorn/test/script/sandbox/javaextend.js b/nashorn/test/script/sandbox/javaextend.js
index e5249ca8f8f..290f87372b1 100644
--- a/nashorn/test/script/sandbox/javaextend.js
+++ b/nashorn/test/script/sandbox/javaextend.js
@@ -98,5 +98,9 @@ print("oo-proto-overridden-equals  : " + (new oo(new Proto())).equals({}))
 // additional constructor arguments (a token). Also demonstrates how can
 // you access the Java adapter instance from the script (just store it in the
 // scope, in this example, "cwa") to retrieve the token later on.
-var cwa = new (Java.extend(model("ConstructorWithArgument")))(function() { print(cwa.token) }, "cwa-token")
+var cwa = new (Java.extend(model("ConstructorWithArgument")))("cwa-token", function() { print(cwa.token) })
 cwa.doSomething()
+
+// Do the same thing with proprietary syntax and object literal
+var cwa2 = new (model("ConstructorWithArgument"))("cwa2-token") { doSomething: function() { print("cwa2-" + cwa2.token ) } }
+cwa2.doSomething()
diff --git a/nashorn/test/script/sandbox/javaextend.js.EXPECTED b/nashorn/test/script/sandbox/javaextend.js.EXPECTED
index 2a9dac88c4a..0cb4b3d0516 100644
--- a/nashorn/test/script/sandbox/javaextend.js.EXPECTED
+++ b/nashorn/test/script/sandbox/javaextend.js.EXPECTED
@@ -17,3 +17,4 @@ oo-proto-overridden-hashCode: 7
 oo-proto-overridden-toString: override-object
 oo-proto-overridden-equals  : true
 cwa-token
+cwa2-cwa2-token

From 3243aaf47a448a5e99cdb09a010fd86aec3d740a Mon Sep 17 00:00:00 2001
From: Mandy Chung <mchung@openjdk.org>
Date: Thu, 10 Jan 2013 19:43:36 -0800
Subject: [PATCH 061/311] 8005615: Java Logger fails to load tomcat logger
 implementation (JULI)

Reviewed-by: alanb, ahgross
---
 .../classes/java/util/logging/LogManager.java | 263 +++++++++---------
 .../classes/java/util/logging/Logger.java     |  37 ++-
 .../java/util/logging/CustomLogManager.java   | 177 ++++++++++++
 .../util/logging/CustomLogManagerTest.java    |  63 +++++
 .../java/util/logging/SimpleLogManager.java   | 113 ++++++++
 5 files changed, 513 insertions(+), 140 deletions(-)
 create mode 100644 jdk/test/java/util/logging/CustomLogManager.java
 create mode 100644 jdk/test/java/util/logging/CustomLogManagerTest.java
 create mode 100644 jdk/test/java/util/logging/SimpleLogManager.java

diff --git a/jdk/src/share/classes/java/util/logging/LogManager.java b/jdk/src/share/classes/java/util/logging/LogManager.java
index 3526c77ac01..58bd1ba7ead 100644
--- a/jdk/src/share/classes/java/util/logging/LogManager.java
+++ b/jdk/src/share/classes/java/util/logging/LogManager.java
@@ -158,7 +158,7 @@ public class LogManager {
 
     // LoggerContext for system loggers and user loggers
     private final LoggerContext systemContext = new SystemLoggerContext();
-    private final LoggerContext userContext = new UserLoggerContext();
+    private final LoggerContext userContext = new LoggerContext();
     private Logger rootLogger;
 
     // Have we done the primordial reading of the configuration file?
@@ -196,13 +196,13 @@ public class LogManager {
 
                     // Create and retain Logger for the root of the namespace.
                     manager.rootLogger = manager.new RootLogger();
-                    manager.systemContext.addLogger(manager.rootLogger);
-                    manager.userContext.addLogger(manager.rootLogger);
+                    manager.addLogger(manager.rootLogger);
+                    manager.systemContext.addLocalLogger(manager.rootLogger);
 
                     // Adding the global Logger. Doing so in the Logger.<clinit>
                     // would deadlock with the LogManager.<clinit>.
-                    Logger.getGlobal().setLogManager(manager);
-                    manager.systemContext.addLogger(Logger.getGlobal());
+                    Logger.global.setLogManager(manager);
+                    manager.addLogger(Logger.global);
 
                     // We don't call readConfiguration() here, as we may be running
                     // very early in the JVM startup sequence.  Instead readConfiguration
@@ -373,7 +373,7 @@ public class LogManager {
 
     // Returns the LoggerContext for the user code (i.e. application or AppContext).
     // Loggers are isolated from each AppContext.
-    LoggerContext getUserContext() {
+    private LoggerContext getUserContext() {
         LoggerContext context = null;
 
         SecurityManager sm = System.getSecurityManager();
@@ -394,8 +394,8 @@ public class LogManager {
                     if (javaAwtAccess.isMainAppContext()) {
                         context = userContext;
                     } else {
-                        context = new UserLoggerContext();
-                        context.addLogger(manager.rootLogger);
+                        context = new LoggerContext();
+                        context.addLocalLogger(manager.rootLogger);
                     }
                     javaAwtAccess.put(ecx, LoggerContext.class, context);
                 }
@@ -406,10 +406,6 @@ public class LogManager {
         return context;
     }
 
-    LoggerContext getSystemContext() {
-        return systemContext;
-    }
-
     private List<LoggerContext> contexts() {
         List<LoggerContext> cxs = new ArrayList<>();
         cxs.add(systemContext);
@@ -417,6 +413,58 @@ public class LogManager {
         return cxs;
     }
 
+    // Find or create a specified logger instance. If a logger has
+    // already been created with the given name it is returned.
+    // Otherwise a new logger instance is created and registered
+    // in the LogManager global namespace.
+    // This method will always return a non-null Logger object.
+    // Synchronization is not required here. All synchronization for
+    // adding a new Logger object is handled by addLogger().
+    //
+    // This method must delegate to the LogManager implementation to
+    // add a new Logger or return the one that has been added previously
+    // as a LogManager subclass may override the addLogger, getLogger,
+    // readConfiguration, and other methods.
+    Logger demandLogger(String name, String resourceBundleName) {
+        Logger result = getLogger(name);
+        if (result == null) {
+            // only allocate the new logger once
+            Logger newLogger = new Logger(name, resourceBundleName);
+            do {
+                if (addLogger(newLogger)) {
+                    // We successfully added the new Logger that we
+                    // created above so return it without refetching.
+                    return newLogger;
+                }
+
+                // We didn't add the new Logger that we created above
+                // because another thread added a Logger with the same
+                // name after our null check above and before our call
+                // to addLogger(). We have to refetch the Logger because
+                // addLogger() returns a boolean instead of the Logger
+                // reference itself. However, if the thread that created
+                // the other Logger is not holding a strong reference to
+                // the other Logger, then it is possible for the other
+                // Logger to be GC'ed after we saw it in addLogger() and
+                // before we can refetch it. If it has been GC'ed then
+                // we'll just loop around and try again.
+                result = getLogger(name);
+            } while (result == null);
+        }
+        return result;
+    }
+
+    Logger demandSystemLogger(String name, String resourceBundleName) {
+        return systemContext.demandLogger(name, resourceBundleName);
+    }
+
+    // LoggerContext maintains the logger namespace per context.
+    // The default LogManager implementation has one system context and user
+    // context.  The system context is used to maintain the namespace for
+    // all system loggers and is queried by the system code.  If a system logger
+    // doesn't exist in the user context, it'll also be added to the user context.
+    // The user context is queried by the user code and all other loggers are
+    // added in the user context.
     static class LoggerContext {
         // Table of named Loggers that maps names to Loggers.
         private final Hashtable<String,LoggerWeakRef> namedLoggers = new Hashtable<>();
@@ -427,6 +475,12 @@ public class LogManager {
             this.root = new LogNode(null, this);
         }
 
+        Logger demandLogger(String name, String resourceBundleName) {
+            // a LogManager subclass may have its own implementation to add and
+            // get a Logger.  So delegate to the LogManager to do the work.
+            return manager.demandLogger(name, resourceBundleName);
+        }
+
         synchronized Logger findLogger(String name) {
             LoggerWeakRef ref = namedLoggers.get(name);
             if (ref == null) {
@@ -441,7 +495,9 @@ public class LogManager {
             return logger;
         }
 
-        synchronized boolean addLogger(Logger logger) {
+        // Add a logger to this context.  This method will only set its level
+        // and process parent loggers.  It doesn't set its handlers.
+        synchronized boolean addLocalLogger(Logger logger) {
             final String name = logger.getName();
             if (name == null) {
                 throw new NullPointerException();
@@ -474,9 +530,9 @@ public class LogManager {
                 doSetLevel(logger, level);
             }
 
-            // Do we have a per logger handler too?
-            // Note: this will add a 200ms penalty
-            manager.loadLoggerHandlers(logger, name, name + ".handlers");
+            // instantiation of the handler is done in the LogManager.addLogger
+            // implementation as a handler class may be only visible to LogManager
+            // subclass for the custom log manager case
             processParentHandlers(logger, name);
 
             // Find the new node and its parent.
@@ -513,50 +569,21 @@ public class LogManager {
             return namedLoggers.keys();
         }
 
-        Logger demandLogger(String name) {
-            return demandLogger(name, null);
-        }
-
-        // Find or create a specified logger instance. If a logger has
-        // already been created with the given name it is returned.
-        // Otherwise a new logger instance is created and registered
-        // in the LogManager global namespace.
-
-        // This method will always return a non-null Logger object.
-        // Synchronization is not required here. All synchronization for
-        // adding a new Logger object is handled by addLogger().
-        Logger demandLogger(String name, String resourceBundleName) {
-            Logger result = findLogger(name);
-            if (result == null) {
-                // only allocate the new logger once
-                Logger newLogger = new Logger(name, resourceBundleName);
-                do {
-                    if (addLogger(newLogger)) {
-                        // We successfully added the new Logger that we
-                        // created above so return it without refetching.
-                        return newLogger;
-                    }
-
-                    // We didn't add the new Logger that we created above
-                    // because another thread added a Logger with the same
-                    // name after our null check above and before our call
-                    // to addLogger(). We have to refetch the Logger because
-                    // addLogger() returns a boolean instead of the Logger
-                    // reference itself. However, if the thread that created
-                    // the other Logger is not holding a strong reference to
-                    // the other Logger, then it is possible for the other
-                    // Logger to be GC'ed after we saw it in addLogger() and
-                    // before we can refetch it. If it has been GC'ed then
-                    // we'll just loop around and try again.
-                    result = findLogger(name);
-                } while (result == null);
-            }
-            return result;
-        }
-
         // If logger.getUseParentHandlers() returns 'true' and any of the logger's
         // parents have levels or handlers defined, make sure they are instantiated.
-        private void processParentHandlers(Logger logger, String name) {
+        private void processParentHandlers(final Logger logger, final String name) {
+            AccessController.doPrivileged(new PrivilegedAction<Void>() {
+                public Void run() {
+                    if (logger != manager.rootLogger) {
+                        boolean useParent = manager.getBooleanProperty(name + ".useParentHandlers", true);
+                        if (!useParent) {
+                            logger.setUseParentHandlers(false);
+                        }
+                    }
+                    return null;
+                }
+            });
+
             int ix = 1;
             for (;;) {
                 int ix2 = name.indexOf(".", ix);
@@ -564,12 +591,11 @@ public class LogManager {
                     break;
                 }
                 String pname = name.substring(0, ix2);
-
                 if (manager.getProperty(pname + ".level") != null ||
                     manager.getProperty(pname + ".handlers") != null) {
                     // This pname has a level/handlers definition.
                     // Make sure it exists.
-                    demandLogger(pname);
+                    demandLogger(pname, null);
                 }
                 ix = ix2+1;
             }
@@ -607,53 +633,51 @@ public class LogManager {
     }
 
     static class SystemLoggerContext extends LoggerContext {
-        // Default resource bundle for all system loggers
-        Logger demandLogger(String name) {
-            // default to use the system logger's resource bundle
-            return super.demandLogger(name, Logger.SYSTEM_LOGGER_RB_NAME);
-        }
-    }
-
-    static class UserLoggerContext extends LoggerContext {
-        /**
-         * Returns a Logger of the given name if there is one registered
-         * in this context.  Otherwise, it will return the one registered
-         * in the system context if there is one.  The returned Logger
-         * instance may be initialized with a different resourceBundleName.
-         * If no such logger exists, a new Logger instance will be created
-         * and registered in this context.
-         */
+        // Add a system logger in the system context's namespace as well as
+        // in the LogManager's namespace if not exist so that there is only
+        // one single logger of the given name.  System loggers are visible
+        // to applications unless a logger of the same name has been added.
         Logger demandLogger(String name, String resourceBundleName) {
             Logger result = findLogger(name);
             if (result == null) {
-                // use the system logger if exists; or allocate a new logger.
-                // The system logger is added to the app logger context so that
-                // any child logger created in the app logger context can have
-                // a system logger as its parent if already exist.
-                Logger logger = manager.systemContext.findLogger(name);
-                Logger newLogger =
-                    logger != null ? logger : new Logger(name, resourceBundleName);
+                // only allocate the new system logger once
+                Logger newLogger = new Logger(name, resourceBundleName);
                 do {
-                    if (addLogger(newLogger)) {
+                    if (addLocalLogger(newLogger)) {
                         // We successfully added the new Logger that we
                         // created above so return it without refetching.
-                        return newLogger;
+                        result = newLogger;
+                    } else {
+                        // We didn't add the new Logger that we created above
+                        // because another thread added a Logger with the same
+                        // name after our null check above and before our call
+                        // to addLogger(). We have to refetch the Logger because
+                        // addLogger() returns a boolean instead of the Logger
+                        // reference itself. However, if the thread that created
+                        // the other Logger is not holding a strong reference to
+                        // the other Logger, then it is possible for the other
+                        // Logger to be GC'ed after we saw it in addLogger() and
+                        // before we can refetch it. If it has been GC'ed then
+                        // we'll just loop around and try again.
+                        result = findLogger(name);
                     }
-
-                    // We didn't add the new Logger that we created above
-                    // because another thread added a Logger with the same
-                    // name after our null check above and before our call
-                    // to addLogger(). We have to refetch the Logger because
-                    // addLogger() returns a boolean instead of the Logger
-                    // reference itself. However, if the thread that created
-                    // the other Logger is not holding a strong reference to
-                    // the other Logger, then it is possible for the other
-                    // Logger to be GC'ed after we saw it in addLogger() and
-                    // before we can refetch it. If it has been GC'ed then
-                    // we'll just loop around and try again.
-                    result = findLogger(name);
                 } while (result == null);
             }
+            // Add the system logger to the LogManager's namespace if not exists
+            // The LogManager will set its handlers via the LogManager.addLogger method.
+            if (!manager.addLogger(result) && result.getHandlers().length == 0) {
+                // if logger already exists but handlers not set
+                final Logger l = manager.getLogger(name);
+                final Logger logger = result;
+                AccessController.doPrivileged(new PrivilegedAction<Void>() {
+                    public Void run() {
+                        for (Handler hdl : l.getHandlers()) {
+                            logger.addHandler(hdl);
+                        }
+                        return null;
+                    }
+                });
+            }
             return result;
         }
     }
@@ -663,22 +687,16 @@ public class LogManager {
     // be made based on the logging configuration, which can
     // only be modified by trusted code.
     private void loadLoggerHandlers(final Logger logger, final String name,
-                                    final String handlersPropertyName) {
+                                    final String handlersPropertyName)
+    {
         AccessController.doPrivileged(new PrivilegedAction<Object>() {
             public Object run() {
-                if (logger != rootLogger) {
-                    boolean useParent = getBooleanProperty(name + ".useParentHandlers", true);
-                    if (!useParent) {
-                        logger.setUseParentHandlers(false);
-                    }
-                }
-
                 String names[] = parseClassNames(handlersPropertyName);
                 for (int i = 0; i < names.length; i++) {
                     String word = names[i];
                     try {
                         Class<?> clz = ClassLoader.getSystemClassLoader().loadClass(word);
-                        Handler  hdl = (Handler) clz.newInstance();
+                        Handler hdl = (Handler) clz.newInstance();
                         // Check if there is a property defining the
                         // this handler's level.
                         String levs = getProperty(word + ".level");
@@ -700,7 +718,8 @@ public class LogManager {
                     }
                 }
                 return null;
-            }});
+            }
+        });
     }
 
 
@@ -839,13 +858,17 @@ public class LogManager {
         if (name == null) {
             throw new NullPointerException();
         }
-        if (systemContext.findLogger(name) != null) {
+        LoggerContext cx = getUserContext();
+        if (cx.addLocalLogger(logger)) {
+            // Do we have a per logger handler too?
+            // Note: this will add a 200ms penalty
+            loadLoggerHandlers(logger, name, name + ".handlers");
+            return true;
+        } else {
             return false;
         }
-        return getUserContext().addLogger(logger);
     }
 
-
     // Private method to set a level on a logger.
     // If necessary, we raise privilege before doing the call.
     private static void doSetLevel(final Logger logger, final Level level) {
@@ -864,8 +887,6 @@ public class LogManager {
             }});
     }
 
-
-
     // Private method to set a parent on a logger.
     // If necessary, we raise privilege before doing the setParent call.
     private static void doSetParent(final Logger logger, final Logger parent) {
@@ -900,15 +921,7 @@ public class LogManager {
      * @return  matching logger or null if none is found
      */
     public Logger getLogger(String name) {
-        // return the first logger added
-        //
-        // once a system logger is added in the system context, no one can
-        // adds a logger with the same name in the global context
-        // (see LogManager.addLogger).  So if there is a logger in the global
-        // context with the same name as one in the system context, it must be
-        // added before the system logger was created.
-        Logger logger = getUserContext().findLogger(name);
-        return logger != null ? logger : systemContext.findLogger(name);
+        return getUserContext().findLogger(name);
     }
 
     /**
@@ -928,10 +941,7 @@ public class LogManager {
      * @return  enumeration of logger name strings
      */
     public Enumeration<String> getLoggerNames() {
-        // only return unique names
-        Set<String> names = new HashSet<>(Collections.list(systemContext.getLoggerNames()));
-        names.addAll(Collections.list(getUserContext().getLoggerNames()));
-        return Collections.enumeration(names);
+        return getUserContext().getLoggerNames();
     }
 
     /**
@@ -1329,7 +1339,6 @@ public class LogManager {
     // that we only instantiate the global handlers when they
     // are first needed.
     private class RootLogger extends Logger {
-
         private RootLogger() {
             super("", null);
             setLevel(defaultLevel);
diff --git a/jdk/src/share/classes/java/util/logging/Logger.java b/jdk/src/share/classes/java/util/logging/Logger.java
index 34f96be2112..5d060059e60 100644
--- a/jdk/src/share/classes/java/util/logging/Logger.java
+++ b/jdk/src/share/classes/java/util/logging/Logger.java
@@ -31,7 +31,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
 import java.security.*;
 import java.lang.ref.WeakReference;
 import java.util.function.Supplier;
-import java.util.logging.LogManager.LoggerContext;
 
 /**
  * A Logger object is used to log messages for a specific
@@ -321,18 +320,32 @@ public class Logger {
     //
     // As an interim solution, if the immediate caller whose caller loader is
     // null, we assume it's a system logger and add it to the system context.
-    private static LoggerContext getLoggerContext() {
+    // These system loggers only set the resource bundle to the given
+    // resource bundle name (rather than the default system resource bundle).
+    private static class SystemLoggerHelper {
+        static boolean disableCallerCheck = getBooleanProperty("sun.util.logging.disableCallerCheck");
+        private static boolean getBooleanProperty(final String key) {
+            String s = AccessController.doPrivileged(new PrivilegedAction<String>() {
+                public String run() {
+                    return System.getProperty(key);
+                }
+            });
+            return Boolean.valueOf(s);
+        }
+    }
+
+    private static Logger demandLogger(String name, String resourceBundleName) {
         LogManager manager = LogManager.getLogManager();
         SecurityManager sm = System.getSecurityManager();
-        if (sm != null) {
-            // 0: Reflection 1: Logger.getLoggerContext 2: Logger.getLogger 3: caller
+        if (sm != null && !SystemLoggerHelper.disableCallerCheck) {
+            // 0: Reflection 1: Logger.demandLogger 2: Logger.getLogger 3: caller
             final int SKIP_FRAMES = 3;
             Class<?> caller = sun.reflect.Reflection.getCallerClass(SKIP_FRAMES);
             if (caller.getClassLoader() == null) {
-                return manager.getSystemContext();
+                return manager.demandSystemLogger(name, resourceBundleName);
             }
         }
-        return manager.getUserContext();
+        return manager.demandLogger(name, resourceBundleName);
     }
 
     /**
@@ -376,8 +389,7 @@ public class Logger {
         // would throw an IllegalArgumentException in the second call
         // because the wrapper would result in an attempt to replace
         // the existing "resourceBundleForFoo" with null.
-        LoggerContext context = getLoggerContext();
-        return context.demandLogger(name);
+        return demandLogger(name, null);
     }
 
     /**
@@ -424,8 +436,7 @@ public class Logger {
     // Synchronization is not required here. All synchronization for
     // adding a new Logger object is handled by LogManager.addLogger().
     public static Logger getLogger(String name, String resourceBundleName) {
-        LoggerContext context = getLoggerContext();
-        Logger result = context.demandLogger(name, resourceBundleName);
+        Logger result = demandLogger(name, resourceBundleName);
 
         // MissingResourceException or IllegalArgumentException can be
         // thrown by setupResourceInfo().
@@ -438,11 +449,10 @@ public class Logger {
     // i.e. caller of sun.util.logging.PlatformLogger.getLogger
     static Logger getPlatformLogger(String name) {
         LogManager manager = LogManager.getLogManager();
-        LoggerContext context = manager.getSystemContext();
 
         // all loggers in the system context will default to
         // the system logger's resource bundle
-        Logger result = context.demandLogger(name);
+        Logger result = manager.demandSystemLogger(name, SYSTEM_LOGGER_RB_NAME);
         return result;
     }
 
@@ -1588,7 +1598,8 @@ public class Logger {
             public ResourceBundle run() {
                 try {
                     return ResourceBundle.getBundle(SYSTEM_LOGGER_RB_NAME,
-                                                    locale);
+                                                    locale,
+                                                    ClassLoader.getSystemClassLoader());
                 } catch (MissingResourceException e) {
                     throw new InternalError(e.toString());
                 }
diff --git a/jdk/test/java/util/logging/CustomLogManager.java b/jdk/test/java/util/logging/CustomLogManager.java
new file mode 100644
index 00000000000..9542e54ec02
--- /dev/null
+++ b/jdk/test/java/util/logging/CustomLogManager.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.*;
+import java.util.*;
+import java.util.logging.*;
+
+/*
+ * Custom LogManager implementation to verify that the implementation delegates
+ * to the LogManager subclass to register both system logger and user logger.
+ *
+ * The LogManager implementation is the one configuring the logger's property
+ * such as level, handler, etc.
+ */
+public class CustomLogManager extends LogManager {
+    static LogManager INSTANCE;
+    Map<String,Logger> namedLoggers = new HashMap<>();
+    Properties props = initConfig();
+    public CustomLogManager() {
+        if (INSTANCE != null) {
+            throw new RuntimeException("CustomLogManager already created");
+        }
+        INSTANCE = this;
+    }
+
+    public synchronized boolean addLogger(Logger logger) {
+        String name = logger.getName();
+        if (namedLoggers.containsKey(name)) {
+            return false;
+        }
+        namedLoggers.put(name, logger);
+        // set level
+        if (props.get(name + ".level") != null) {
+            logger.setLevel(Level.parse(props.getProperty(name + ".level")));
+        }
+        // add handlers
+        if (props.get(name + ".handlers") != null && logger.getHandlers().length == 0) {
+            logger.addHandler(new CustomHandler());
+        }
+        // add parent loggers
+        int ix = 1;
+        for (;;) {
+            int ix2 = name.indexOf(".", ix);
+            if (ix2 < 0) {
+                break;
+            }
+            String pname = name.substring(0, ix2);
+            if (props.get(pname + ".level") != null ||
+                props.get(pname + ".handlers") != null) {
+                // This pname has a level/handlers definition.
+                // Make sure it exists.
+                //
+                // The test doesn't set the parent for simplicity.
+                if (!namedLoggers.containsKey(pname)) {
+                    Logger.getLogger(pname);
+                }
+            }
+            ix = ix2 + 1;
+        }
+        return true;
+    }
+
+    public synchronized Logger getLogger(String name) {
+        return namedLoggers.get(name);
+    }
+
+    public synchronized Enumeration<String> getLoggerNames() {
+        return Collections.enumeration(namedLoggers.keySet());
+    }
+
+    public String getProperty(String name) {
+        return props.getProperty(name);
+    }
+
+    public void readConfiguration() {
+        // do nothing
+    }
+
+    public void readConfiguration(InputStream ins) {
+        // do nothing
+    }
+
+    private Properties initConfig() {
+        Properties props = new Properties();
+        props.put(".level", "CONFIG");
+        props.put("CustomLogManagerTest.level", "WARNING");
+        props.put("CustomLogManagerTest.handlers", "CustomLogManager$CustomHandler");
+        props.put("SimpleLogManager.level", "INFO");
+        props.put("SimpleLogManager.handlers", "CustomLogManager$CustomHandler");
+        props.put("CustomLogManager$CustomHandler.level", "WARNING");
+        props.put(".handlers", "CustomLogManager$CustomHandler");
+        props.put("org.foo.bar.level", "SEVERE");
+        props.put("org.foo.handlers", "CustomLogManager$CustomHandler");
+        props.put("org.openjdk.level", "SEVERE");
+        props.put("org.openjdk.handlers", "CustomLogManager$CustomHandler");
+        props.put("org.openjdk.core.level", "INFO");
+
+        return props;
+    }
+
+    public static void checkLogger(String name) {
+        checkLogger(name, null);
+    }
+
+    public static void checkLogger(String name, String resourceBundleName) {
+        Logger logger = INSTANCE.getLogger(name);
+        if (logger == null) {
+            throw new RuntimeException("Logger \"" + name + "\" not exist");
+        }
+        System.out.format("Logger \"%s\" level=%s handlers=%s resourcebundle=%s%n",
+            name, logger.getLevel(),
+            Arrays.toString(logger.getHandlers()),
+            logger.getResourceBundleName());
+        String rb = logger.getResourceBundleName();
+        if (rb != resourceBundleName && (rb == null || rb.equals(resourceBundleName))) {
+            throw new RuntimeException("Logger \"" + name +
+                "\" unexpected resource bundle: " + rb);
+        }
+
+        String value = INSTANCE.getProperty(name + ".level");
+        String level = logger.getLevel() != null ? logger.getLevel().getName() : null;
+        if (level != value && (level == null || level.equals(value))) {
+            throw new RuntimeException("Logger \"" + name + "\" unexpected level: " + level);
+        }
+
+        Handler[] handlers = logger.getHandlers();
+        String hdl = INSTANCE.getProperty(name + ".handlers");
+        if ((hdl == null && handlers.length != 0) ||
+            (hdl != null && handlers.length != 1)) {
+            throw new RuntimeException("Logger \"" + name + "\" unexpected handler: " +
+                Arrays.toString(handlers));
+        }
+        checkParents(name);
+    }
+
+    private static void checkParents(String name) {
+        int ix = 1;
+        for (;;) {
+            int ix2 = name.indexOf(".", ix);
+            if (ix2 < 0) {
+                break;
+            }
+            String pname = name.substring(0, ix2);
+            if (INSTANCE.getProperty(pname + ".level") != null ||
+                INSTANCE.getProperty(pname + ".handlers") != null) {
+                // This pname has a level/handlers definition.
+                // Make sure it exists.
+                checkLogger(pname);
+            }
+            ix = ix2 + 1;
+        }
+    }
+
+    // only CustomLogManager can create an instance of CustomHandler
+    private class CustomHandler extends StreamHandler {
+    }
+}
diff --git a/jdk/test/java/util/logging/CustomLogManagerTest.java b/jdk/test/java/util/logging/CustomLogManagerTest.java
new file mode 100644
index 00000000000..2fa89a9a47b
--- /dev/null
+++ b/jdk/test/java/util/logging/CustomLogManagerTest.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.*;
+import java.util.*;
+
+import java.util.logging.*;
+import sun.util.logging.PlatformLogger;
+
+/*
+ * @test
+ * @bug 8005615
+ * @summary Add loggers to custom log manager
+ *
+ * @compile -XDignore.symbol.file CustomLogManagerTest.java CustomLogManager.java
+ * @run main/othervm -Djava.util.logging.manager=CustomLogManager CustomLogManagerTest
+ */
+public class CustomLogManagerTest {
+    private static final String RESOURCE_BUNDLE = "sun.util.logging.resources.logging";
+    public static void main(String[] args) {
+        String mgr = System.getProperty("java.util.logging.manager");
+        if (!mgr.equals("CustomLogManager")) {
+            throw new RuntimeException("java.util.logging.manager not set");
+        }
+
+        Logger.getLogger(CustomLogManagerTest.class.getName());
+        Logger.getLogger("org.foo.Foo");
+        Logger.getLogger("org.foo.bar.Foo", RESOURCE_BUNDLE);
+        // platform logger will be set with the default system resource bundle
+        PlatformLogger.getLogger("org.openjdk.core.logger");
+
+        if (LogManager.getLogManager() != CustomLogManager.INSTANCE) {
+             throw new RuntimeException(LogManager.getLogManager() + " not CustomLogManager");
+        }
+
+        CustomLogManager.checkLogger(CustomLogManagerTest.class.getName());
+        CustomLogManager.checkLogger("org.foo.Foo");
+        CustomLogManager.checkLogger("org.foo.bar.Foo", RESOURCE_BUNDLE);
+        CustomLogManager.checkLogger(Logger.GLOBAL_LOGGER_NAME);
+        CustomLogManager.checkLogger("");
+        CustomLogManager.checkLogger("org.openjdk.core.logger", RESOURCE_BUNDLE);
+    }
+}
diff --git a/jdk/test/java/util/logging/SimpleLogManager.java b/jdk/test/java/util/logging/SimpleLogManager.java
new file mode 100644
index 00000000000..f469727654f
--- /dev/null
+++ b/jdk/test/java/util/logging/SimpleLogManager.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.util.*;
+import java.util.logging.*;
+import sun.util.logging.PlatformLogger;
+
+/*
+ * @test
+ * @bug 8005615
+ * @summary A LogManager subclass overrides its own implementation of named
+ *          logger (see the subclassing information in the Logger class specification)
+ *
+ * @compile -XDignore.symbol.file CustomLogManager.java SimpleLogManager.java
+ * @run main/othervm -Djava.util.logging.manager=SimpleLogManager SimpleLogManager
+ */
+public class SimpleLogManager extends CustomLogManager {
+    public static void main(String[] args) {
+        String classname = System.getProperty("java.util.logging.manager");
+        if (!classname.equals("SimpleLogManager")) {
+            throw new RuntimeException("java.util.logging.manager not set");
+        }
+
+        Logger logger = Logger.getLogger(SimpleLogManager.class.getName());
+        Logger.getLogger("org.foo.bar.Foo");
+
+        // a platform logger used by the system code is just a Logger instance.
+        PlatformLogger.getLogger("org.openjdk.core.logger");
+
+        LogManager mgr = LogManager.getLogManager();
+        if (mgr != CustomLogManager.INSTANCE || !(mgr instanceof SimpleLogManager)) {
+             throw new RuntimeException(LogManager.getLogManager() + " not SimpleLogManager");
+        }
+
+        checkCustomLogger(SimpleLogManager.class.getName(), null);
+        checkCustomLogger("org.foo.bar.Foo", null);
+        checkCustomLogger("org.openjdk.core.logger", "sun.util.logging.resources.logging");
+
+        // ## The LogManager.demandLogger method does not handle custom log manager
+        // ## that overrides the getLogger method to return a custom logger
+        // ## (see the test case in 8005640).  Logger.getLogger may return
+        // ## a Logger instance but LogManager overrides it with a custom Logger
+        // ## instance like this case.
+        //
+        // However, the specification of LogManager and Logger subclassing is
+        // not clear whether this is supported or not.  The following check
+        // just captures the current behavior.
+        if (logger instanceof CustomLogger) {
+            throw new RuntimeException(logger + " not CustomLogger");
+        }
+    }
+
+    private static void checkCustomLogger(String name, String resourceBundleName) {
+        CustomLogManager.checkLogger(name, resourceBundleName);
+        Logger logger1 = Logger.getLogger(name);
+        Logger logger2 = LogManager.getLogManager().getLogger(name);
+        if (logger1 != logger2) {
+            throw new RuntimeException(logger1 + " != " + logger2);
+        }
+        if (!(logger1 instanceof CustomLogger)) {
+            throw new RuntimeException(logger1 + " not CustomLogger");
+        }
+    }
+
+    /*
+     * This SimpleLogManager overrides the addLogger method to replace
+     * the given logger with a custom logger.
+     *
+     * It's unclear what the recommended way to use custom logger is.
+     * A LogManager subclass might override the getLogger method to return
+     * a custom Logger and create a new custom logger if not exist so that
+     * Logger.getLogger() can return a custom Logger instance but that violates
+     * the LogManager.getLogger() spec which should return null if not found.
+     */
+    public synchronized boolean addLogger(Logger logger) {
+        String name = logger.getName();
+        if (namedLoggers.containsKey(name)) {
+            return false;
+        }
+        CustomLogger newLogger = new CustomLogger(logger);
+        super.addLogger(newLogger);
+        return true;
+    }
+
+    public class CustomLogger extends Logger {
+        CustomLogger(Logger logger) {
+            super(logger.getName(), logger.getResourceBundleName());
+        }
+        CustomLogger(String name) {
+            super(name, null);
+        }
+    }
+}

From 8bbf26bc8992af0035b8472ba56595c1305d0dff Mon Sep 17 00:00:00 2001
From: Marcus Lagergren <lagergren@openjdk.org>
Date: Fri, 11 Jan 2013 10:40:51 +0100
Subject: [PATCH 062/311] 8005976: Break out AccessSpecializer into one pass
 before CodeGenerator instead of iterative applications from CodeGenerator

Now scope and slot information is guaranteed to be fixed AND NOT CHANGE before CodeGeneration. We want to keep it that way to build future type specializations and bring all type work out of CodeGenerator.

Reviewed-by: attila, hannesw
---
 nashorn/bin/dump_octane_code.sh               | 53 ++++++++++++
 nashorn/bin/verbose_octane.sh                 |  8 +-
 nashorn/docs/DEVELOPER_README                 |  9 +-
 .../internal/codegen/AccessSpecializer.java   | 61 ++++----------
 .../internal/codegen/CodeGenerator.java       | 30 ++-----
 .../nashorn/internal/codegen/Compiler.java    | 12 +++
 .../jdk/nashorn/internal/codegen/Lower.java   | 84 ++++++++++++++++++-
 .../nashorn/internal/codegen/Splitter.java    |  4 +-
 .../nashorn/internal/codegen/Transform.java   | 33 --------
 .../src/jdk/nashorn/internal/ir/Block.java    |  8 +-
 .../jdk/nashorn/internal/ir/FunctionNode.java | 25 ------
 .../src/jdk/nashorn/internal/ir/Symbol.java   | 11 ++-
 .../internal/runtime/ScriptObject.java        |  8 +-
 13 files changed, 198 insertions(+), 148 deletions(-)
 create mode 100644 nashorn/bin/dump_octane_code.sh
 delete mode 100644 nashorn/src/jdk/nashorn/internal/codegen/Transform.java

diff --git a/nashorn/bin/dump_octane_code.sh b/nashorn/bin/dump_octane_code.sh
new file mode 100644
index 00000000000..d24ab2ceeb1
--- /dev/null
+++ b/nashorn/bin/dump_octane_code.sh
@@ -0,0 +1,53 @@
+#!/bin/bash
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+# 
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+# 
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+# 
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+#
+# The purpose of this script is to provide a large amount of IR/bytecode from a known
+# application to be diffed against the same output with a different Nashorn version.
+# That way we can quickly detect if a seemingly minute change modifies a lot of code,
+# which it most likely shouldn't. One example of this was when AccessSpecializer was
+# moved into Lower the first time, it worked fine, but as a lot of Scope information
+# at the time was finalized further down the code pipeline it did a lot fewer callsite
+# specializations. This would have been immediately detected with a before and after 
+# diff using the output from this script.
+#
+
+ITERS=$1
+if [ -z $ITERS ]; then 
+    ITERS=7
+fi
+NASHORN_JAR=dist/nashorn.jar
+JVM_FLAGS="-ea -esa -server -jar ${NASHORN_JAR}"
+
+BENCHMARKS=( "box2d.js" "code-load.js" "crypto.js" "deltablue.js" "earley-boyer.js" "gbemu.js" "mandreel.js" "navier-stokes.js" "pdfjs.js" "raytrace.js" "regexp.js" "richards.js" "splay.js" )
+
+for BENCHMARK in "${BENCHMARKS[@]}"
+do     
+    echo "START: ${BENCHMARK}"
+    CMD="${JAVA_HOME}/bin/java ${JVM_FLAGS} -co --print-lower-parse test/script/external/octane/${BENCHMARK}"
+    $CMD
+    echo "END: ${BENCHMARK}"
+    echo ""
+done
+
+echo "Done"
diff --git a/nashorn/bin/verbose_octane.sh b/nashorn/bin/verbose_octane.sh
index 3e453adbaa4..e70e9d48f52 100644
--- a/nashorn/bin/verbose_octane.sh
+++ b/nashorn/bin/verbose_octane.sh
@@ -26,18 +26,18 @@ if [ -z $ITERS ]; then
     ITERS=7
 fi
 NASHORN_JAR=dist/nashorn.jar
-JVM_FLAGS="-XX:+UnlockDiagnosticVMOptions -Dnashorn.unstable.relink.threshold=8 -Xms2G -Xmx2G -XX:-TieredCompilation -server -jar ${NASHORN_JAR}"
+JVM_FLAGS="-XX:+UnlockDiagnosticVMOptions -Dnashorn.unstable.relink.threshold=8 -Xms2G -Xmx2G -XX:+TieredCompilation -server -jar ${NASHORN_JAR}"
 JVM_FLAGS7="-Xbootclasspath/p:${NASHORN_JAR} ${JVM_FLAGS}"
 OCTANE_ARGS="--verbose --iterations ${ITERS}"
 
-BENCHMARKS=( "box2d.js" "code-load.js" "crypto.js" "deltablue.js" "earley-boyer.js" "gbemu.js" "navier-stokes.js" "raytrace.js" "regexp.js" "richards.js" "splay.js" )
+BENCHMARKS=( "box2d.js" "code-load.js" "crypto.js" "deltablue.js" "earley-boyer.js" "gbemu.js" "navier-stokes.js" "pdfjs.js" "raytrace.js" "regexp.js" "richards.js" "splay.js" )
 # TODO mandreel.js has metaspace issues
 
 if [ ! -z $JAVA7_HOME ]; then	
     echo "running ${ITERS} iterations with java7 using JAVA_HOME=${JAVA7_HOME}..."
     for BENCHMARK in "${BENCHMARKS[@]}"
     do 
-	CMD="${JAVA8_HOME}/bin/java ${JVM_FLAGS} test/script/basic/run-octane.js -- test/script/external/octane/${BENCHMARK} ${OCTANE_ARGS}"
+	CMD="${JAVA7_HOME}/bin/java ${JVM_FLAGS} test/script/basic/run-octane.js -- test/script/external/octane/${BENCHMARK} ${OCTANE_ARGS}"
 	$CMD
     done
 else
@@ -52,7 +52,7 @@ if [ ! -z $JAVA8_HOME ]; then
 	$CMD
     done
 else 
-    echo "no JAVA8_HOME set"
+    echo "no JAVA8_HOME set."
 fi
 
 echo "Done"
diff --git a/nashorn/docs/DEVELOPER_README b/nashorn/docs/DEVELOPER_README
index a4859701770..55c41010382 100644
--- a/nashorn/docs/DEVELOPER_README
+++ b/nashorn/docs/DEVELOPER_README
@@ -23,6 +23,13 @@ has a default value (currently 8 relinks) for this property if it
 is not explicitly set.
 
 
+SYSTEM PROPERTY: -Dnashorn.compiler.split.threshold=x
+
+This will change the node weight that requires a subgraph of the IR to
+be split into several classes in order not to run out of bytecode space.
+The default value is 0x8000 (32768).
+
+
 SYSTEM PROPERTY: -Dnashorn.callsiteaccess.debug
 
 See the description of the access logger below. This flag is
@@ -451,4 +458,4 @@ the level is set to finest, it will also trace every AccessorProperty
 getter and setter in the program, show arguments, return values
 etc. It will also show the internal representation of respective field
 (Object in the normal case, unless running with the dual field
-representation)
\ No newline at end of file
+representation)
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/AccessSpecializer.java b/nashorn/src/jdk/nashorn/internal/codegen/AccessSpecializer.java
index 6db7e6eca2c..e6eee814319 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/AccessSpecializer.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/AccessSpecializer.java
@@ -31,7 +31,6 @@ import jdk.nashorn.internal.ir.AccessNode;
 import jdk.nashorn.internal.ir.Assignment;
 import jdk.nashorn.internal.ir.BinaryNode;
 import jdk.nashorn.internal.ir.CallNode;
-import jdk.nashorn.internal.ir.FunctionNode;
 import jdk.nashorn.internal.ir.IdentNode;
 import jdk.nashorn.internal.ir.IndexNode;
 import jdk.nashorn.internal.ir.Node;
@@ -64,27 +63,12 @@ import jdk.nashorn.internal.runtime.DebugLogger;
  * @see TypeOverride
  */
 
-final class AccessSpecializer extends NodeOperatorVisitor implements Transform {
+final class AccessSpecializer extends NodeOperatorVisitor {
     /** Debug logger for access specialization. Enable it with --log=access:level
-        or -Dnashorn.specializations.debug */
+        or -Dnashorn.callsiteaccess.debug */
     private static final DebugLogger LOG   = new DebugLogger("access", "nashorn.callsiteaccess.debug");
     private static final boolean     DEBUG = LOG.isEnabled();
 
-    @Override
-    public Node enter(final FunctionNode node) {
-        if (node.isTransformApplied(AccessSpecializer.class)) {
-            return null;
-        }
-
-        return node;
-    }
-
-    @Override
-    public Node leave(final FunctionNode node) {
-        node.registerTransform(AccessSpecializer.class);
-        return node;
-    }
-
     @Override
     public Node leave(final VarNode varNode) {
         if (varNode.isAssignment()) {
@@ -191,7 +175,7 @@ final class AccessSpecializer extends NodeOperatorVisitor implements Transform {
              * getter/setter is selected, which will do the conversion for us
              */
             changeType(rhs, castTo);
-            fine("*** cast: converting " + debugNode(unaryNode) + " to " + debugNode(rhs));
+            LOG.fine("*** cast: converting " + debugNode(unaryNode) + " to " + debugNode(rhs));
 
             return rhs;
         }
@@ -270,17 +254,17 @@ final class AccessSpecializer extends NodeOperatorVisitor implements Transform {
         final Symbol lhsSymbol = lhs.getSymbol();
 
         if (lhsSymbol.hasSlot() && !lhsSymbol.isScope()) {
-            finest(lhs.getSymbol() + " has slot!");
+            LOG.finest(lhs.getSymbol() + " has slot!");
             if (!lhs.getType().isEquivalentTo(rhs.getType())) {
-                finest("\tslot assignment: " +lhs.getType()+ " " +rhs.getType() + " " + debugNode(node));
+                LOG.finest("\tslot assignment: " +lhs.getType()+ " " +rhs.getType() + " " + debugNode(node));
 
                 final Node c = convert(rhs);
                 c.setSymbol(lhsSymbol);
                 ((Assignment<?>)node).setAssignmentSource(c);
 
-                fine("*** slot assignment turned to : " + debugNode(node));
+                LOG.fine("*** slot assignment turned to : " + debugNode(node));
             } else {
-                finest("aborted - type equivalence between lhs and rhs");
+                LOG.finest("aborted - type equivalence between lhs and rhs");
             }
 
             return node;
@@ -310,10 +294,10 @@ final class AccessSpecializer extends NodeOperatorVisitor implements Transform {
 
         // If castTo is wider than widestOperationType, castTo can be further slowed down
         final Type widestOperationType = node.getWidestOperationType();
-        finest("node wants to be " + castTo + " and its widest operation is " + widestOperationType);
+        LOG.finest("node wants to be " + castTo + " and its widest operation is " + widestOperationType);
 
         if (widestOperationType != castTo && Type.widest(castTo, widestOperationType) == castTo) {
-            info("###" + node + " castTo was " + castTo + " but could be downgraded to " + node.getWidestOperationType());
+            LOG.info("###" + node + " castTo was " + castTo + " but could be downgraded to " + node.getWidestOperationType());
             castTo = node.getWidestOperationType();
             if (rhs instanceof TypeOverride) {
                 changeType(rhs, castTo);
@@ -331,16 +315,16 @@ final class AccessSpecializer extends NodeOperatorVisitor implements Transform {
         // We only specialize for numerics, not for booleans.
         if (isSupportedCallSiteType(castTo)) {
             if (rhs.getType() != castTo) {
-                finest("cast was necessary, abort: " + node + " " + rhs.getType() + " != " + castTo);
+                LOG.finest("cast was necessary, abort: " + node + " " + rhs.getType() + " != " + castTo);
                 return node;
             }
 
-            finest("assign: " + debugNode(node));
+            LOG.finest("assign: " + debugNode(node));
 
             changeTypeInAssignment(lhs, castTo);
             ((Assignment<?>)node).setAssignmentSource(rhs);
 
-            info("### modified to " + debugNode(node) + " (given type override " + castTo + ")");
+            LOG.info("### modified to " + debugNode(node) + " (given type override " + castTo + ")");
 
             propagateResultType(node, castTo);
         }
@@ -352,9 +336,9 @@ final class AccessSpecializer extends NodeOperatorVisitor implements Transform {
         //warning! this CANNOT be done for non temporaries as they are used in other computations
         if (isSupportedCallSiteType(type)) {
             if (node.getSymbol().isTemp()) {
-                finest("changing temporary type: " + debugNode(node) + " to " + type);
+                LOG.finest("changing temporary type: " + debugNode(node) + " to " + type);
                 node.getSymbol().setTypeOverride(type);
-                info("### node modified to " + debugNode(node) + " (given type override " + type + ")");
+                LOG.info("### node modified to " + debugNode(node) + " (given type override " + type + ")");
             }
         }
         return node;
@@ -362,7 +346,7 @@ final class AccessSpecializer extends NodeOperatorVisitor implements Transform {
 
     private static void changeTypeInAssignment(final Node dest, final Type newType) {
         if (changeType(dest, newType)) {
-            finest("changed assignment " + dest + " " + dest.getSymbol());
+            LOG.finest("changed assignment " + dest + " " + dest.getSymbol());
             assert !newType.isObject();
 
             final HashSet<Node> exclude = new HashSet<>();
@@ -370,7 +354,7 @@ final class AccessSpecializer extends NodeOperatorVisitor implements Transform {
             dest.accept(new NodeVisitor() {
 
                 private void setCanBePrimitive(final Symbol symbol) {
-                    fine("*** can be primitive symbol " + symbol + " " + Debug.id(symbol));
+                    LOG.fine("*** can be primitive symbol " + symbol + " " + Debug.id(symbol));
                     symbol.setCanBePrimitive(newType);
                 }
 
@@ -412,17 +396,4 @@ final class AccessSpecializer extends NodeOperatorVisitor implements Transform {
         }
         return "";
     }
-
-    private static void info(final String str) {
-        LOG.info(str);
-    }
-
-    private static void fine(final String str) {
-        LOG.fine(str);
-    }
-
-    private static void finest(final String str) {
-        LOG.finest(str);
-    }
-
 }
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
index 444c9839123..b673d4cf475 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
@@ -845,16 +845,12 @@ public final class CodeGenerator extends NodeOperatorVisitor {
         return null;
     }
 
-    private void initLocals(final Block block) {
-        initLocals(block, null);
-    }
-
     /**
      * Initialize the slots in a frame to undefined.
      *
      * @param block block with local vars.
      */
-    private void initLocals(final Block block, final AccessSpecializer accessSpecializer) {
+    private void initLocals(final Block block) {
         final FunctionNode function       = block.getFunction();
         final boolean      isFunctionNode = block == function;
 
@@ -885,14 +881,6 @@ public final class CodeGenerator extends NodeOperatorVisitor {
             final List<String> nameList = new ArrayList<>();
             final List<Symbol> locals   = new ArrayList<>();
 
-            // note that in the case of a varargs vector the arguments in the vector should NOT have local slots
-            // this was a bug: see NASHORN-21
-            if (isVarArg) {
-                for (final IdentNode param : function.getParameters()) {
-                    param.getSymbol().setNeedsSlot(false);
-                }
-            }
-
             // If there are variable arguments, we need to load them (functions only).
             if (isFunctionNode && isVarArg) {
                 method.loadVarArgs();
@@ -915,8 +903,8 @@ public final class CodeGenerator extends NodeOperatorVisitor {
                     nameList.add(symbol.getName());
                     newSymbols.add(symbol);
                     values.add(null);
-                    symbol.setIsScope();
-                    symbol.setNeedsSlot(false);
+                    assert symbol.isScope()   : "scope for " + symbol + " should have been set in Lower already " + function.getName();
+                    assert !symbol.hasSlot()  : "slot for " + symbol + " should have been removed in Lower already" + function.getName();
                 } else if (symbol.isVar()) {
                     assert symbol.hasSlot() : symbol + " should have a slot only, no scope";
                     locals.add(symbol);
@@ -924,10 +912,8 @@ public final class CodeGenerator extends NodeOperatorVisitor {
                     nameList.add(symbol.getName());
                     newSymbols.add(symbol);
                     values.add(isVarArg ? null : symbol);
-                    symbol.setIsScope();
-                    if (isVarArg) {
-                        symbol.setNeedsSlot(false);
-                    }
+                    assert symbol.isScope()   : "scope for " + symbol + " should have been set in Lower already " + function.getName() + " varsInScope="+varsInScope+" isVarArg="+isVarArg+" symbol.isScope()=" + symbol.isScope();
+                    assert !(isVarArg && symbol.hasSlot())  : "slot for " + symbol + " should have been removed in Lower already " + function.getName();
                 }
             }
 
@@ -941,10 +927,6 @@ public final class CodeGenerator extends NodeOperatorVisitor {
                 initScope();
             }
 
-            if (accessSpecializer != null) {
-                ((FunctionNode)block).accept(accessSpecializer);
-            }
-
             /*
              * Create a new object based on the symbols and values, generate
              * bootstrap code for object
@@ -1001,7 +983,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
         method.begin();
         method.label(functionNode.getEntryLabel());
 
-        initLocals(functionNode, new AccessSpecializer());
+        initLocals(functionNode);
 
         return functionNode;
     }
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java b/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
index dad79aab41a..8d02f6115f3 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
@@ -298,6 +298,8 @@ public final class Compiler {
 
         /** do we need to parse source? */
         if (!state.contains(State.PARSED)) {
+            LOG.info("Parsing '" + source + "'");
+
             assert this.functionNode == null;
             this.functionNode = new Parser(this, strict).parse(RUN_SCRIPT.tag());
 
@@ -338,6 +340,7 @@ public final class Compiler {
 
             if (!state.contains(State.LOWERED)) {
                 debugPrintAST();
+                LOG.info("Lowering '" + functionNode.getName() + "'");
                 functionNode.accept(new Lower(this));
                 state.add(State.LOWERED);
 
@@ -352,6 +355,7 @@ public final class Compiler {
             // and add script code last this class may end up slightly larger than others, but reserving one class
             // just for the main script seems wasteful.
             final CompileUnit scriptCompileUnit = addCompileUnit(firstCompileUnitName(), 0l);
+            LOG.info("Splitting '" + functionNode.getName() + "'");
             new Splitter(this, functionNode, scriptCompileUnit).split();
             assert functionNode.getCompileUnit() == scriptCompileUnit;
 
@@ -361,7 +365,14 @@ public final class Compiler {
                 strict = true;
             }
 
+            LOG.info("Adjusting slot and scope information for symbols for '" + functionNode.getName() + "'");
+            functionNode.accept(new Lower.FinalizeSymbols());
+
+            LOG.info("Specializing callsite types for '" + functionNode.getName() + "'");
+            functionNode.accept(new AccessSpecializer());
+
             try {
+                LOG.info("Emitting bytecode for '" + functionNode.getName() + "'");
                 final CodeGenerator codegen = new CodeGenerator(this);
                 functionNode.accept(codegen);
                 codegen.generateScopeCalls();
@@ -408,6 +419,7 @@ public final class Compiler {
             return true;
         } finally {
             strict = oldStrict;
+            LOG.info("Done with '" + functionNode.getName() + "'");
         }
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Lower.java b/nashorn/src/jdk/nashorn/internal/codegen/Lower.java
index 0630667dcd7..a19febfb3e3 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Lower.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Lower.java
@@ -916,6 +916,13 @@ final class Lower extends NodeOperatorVisitor {
         } else {
             LOG.info("parameter specialization possible: " + functionNode.getName() + " " + paramSpecializations);
         }
+
+        // parameters should not be slots for a vararg function, make sure this is the case
+        if (functionNode.isVarArg()) {
+            for (final IdentNode param : functionNode.getParameters()) {
+                param.getSymbol().setNeedsSlot(false);
+            }
+        }
     }
 
     private LiteralNode<Undefined> undefined() {
@@ -1086,6 +1093,7 @@ final class Lower extends NodeOperatorVisitor {
 
     @Override
     public Node enter(final FunctionNode functionNode) {
+        LOG.info("START FunctionNode: " + functionNode.getName());
 
         Node initialEvalResult = undefined();
 
@@ -1255,6 +1263,8 @@ final class Lower extends NodeOperatorVisitor {
         functionNode.setIsLowered(true);
         functionNode.popFrame();
 
+        LOG.info("END FunctionNode: " + functionNode.getName());
+
         return null;
     }
 
@@ -1482,9 +1492,9 @@ final class Lower extends NodeOperatorVisitor {
 
     @Override
     public Node enter(final ReferenceNode referenceNode) {
-        final FunctionNode fn = referenceNode.getReference();
-        if (fn != null) {
-            fn.addReferencingParentBlock(getCurrentBlock());
+        final FunctionNode functionNode = referenceNode.getReference();
+        if (functionNode != null) {
+            functionNode.addReferencingParentBlock(getCurrentBlock());
         }
         return referenceNode;
     }
@@ -2868,6 +2878,74 @@ final class Lower extends NodeOperatorVisitor {
          }
     }
 
+    /**
+     * A simple node visitor that ensure that scope and slot information is correct.
+     * This is run as a post pass after we know all scope changing information about
+     * the Lowering. This is also called after potential mutations like splitting
+     * have taken place, as splitting forces scope.
+     *
+     * This was previously done on a per functionNode basis in {@link CodeGenerator},
+     * but this is too late for type information to be used in {@link AccessSpecializer}
+     */
+    static class FinalizeSymbols extends NodeVisitor {
+        @Override
+        public Node leave(final Block block) {
+            return updateSymbols(block);
+        }
+
+        @Override
+        public Node leave(final FunctionNode function) {
+            return updateSymbols(function);
+        }
+
+        private static void updateSymbolsLog(final FunctionNode functionNode, final Symbol symbol, final boolean loseSlot) {
+            if (!symbol.isScope()) {
+                LOG.finest("updateSymbols: " + symbol + " => scope, because all vars in " + functionNode.getName() + " are in scope");
+            }
+            if (loseSlot && symbol.hasSlot()) {
+                LOG.finest("updateSymbols: " + symbol + " => no slot, because all vars in " + functionNode.getName() + " are in scope");
+            }
+        }
+
+        // called after a block or function node (subclass of block) is finished
+        // to correct scope and slot assignment for variables
+        private static Block updateSymbols(final Block block) {
+
+            if (!block.needsScope()) {
+                return block; // nothing to do
+            }
+
+            assert !(block instanceof FunctionNode) || block.getFunction() == block;
+
+            final FunctionNode functionNode   = block.getFunction();
+            final List<Symbol> symbols        = block.getFrame().getSymbols();
+            final boolean      allVarsInScope = functionNode.varsInScope();
+            final boolean      isVarArg       = functionNode.isVarArg();
+
+            for (final Symbol symbol : symbols) {
+                if (symbol.isInternal() || symbol.isThis()) {
+                    continue;
+                }
+
+                if (symbol.isVar()) {
+                    if (allVarsInScope || symbol.isScope()) {
+                        updateSymbolsLog(functionNode, symbol, true);
+                        symbol.setIsScope();
+                        symbol.setNeedsSlot(false);
+                    } else {
+                        assert symbol.hasSlot() : symbol + " should have a slot only, no scope";
+                    }
+                } else if (symbol.isParam() && (allVarsInScope || isVarArg || symbol.isScope())) {
+                    updateSymbolsLog(functionNode, symbol, isVarArg);
+                    symbol.setIsScope();
+                    symbol.setNeedsSlot(!isVarArg);
+                }
+            }
+
+            return block;
+        }
+    }
+
     /**
      * Helper class to evaluate constant expressions at compile time This is
      * also a simplifier used by BinaryNode visits, UnaryNode visits and
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Splitter.java b/nashorn/src/jdk/nashorn/internal/codegen/Splitter.java
index f7f193eee6c..abaab42b0fb 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Splitter.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Splitter.java
@@ -50,6 +50,7 @@ import jdk.nashorn.internal.ir.SwitchNode;
 import jdk.nashorn.internal.ir.WhileNode;
 import jdk.nashorn.internal.ir.visitor.NodeVisitor;
 import jdk.nashorn.internal.runtime.Source;
+import jdk.nashorn.internal.runtime.options.Options;
 
 /**
  * Split the IR into smaller compile units.
@@ -68,7 +69,7 @@ public class Splitter extends NodeVisitor {
     private final Map<Node, Long> weightCache = new HashMap<>();
 
     /** Weight threshold for when to start a split. */
-    public static final long SPLIT_THRESHOLD  = 32 * 1024;
+    public static final long SPLIT_THRESHOLD = Options.getIntProperty("nashorn.compiler.splitter.threshold", 32 * 1024);
 
     /**
      * Constructor.
@@ -90,6 +91,7 @@ public class Splitter extends NodeVisitor {
         long weight = WeighNodes.weigh(functionNode);
 
         if (weight >= SPLIT_THRESHOLD) {
+            Compiler.LOG.info("Splitting '" + functionNode.getName() + "' as its weight " + weight + " exceeds split threshold " + SPLIT_THRESHOLD);
 
             functionNode.accept(this);
 
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Transform.java b/nashorn/src/jdk/nashorn/internal/codegen/Transform.java
deleted file mode 100644
index b3355fdb113..00000000000
--- a/nashorn/src/jdk/nashorn/internal/codegen/Transform.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.nashorn.internal.codegen;
-
-/**
- * Code generation transform
- */
-public interface Transform {
-    //empty
-}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/Block.java b/nashorn/src/jdk/nashorn/internal/ir/Block.java
index d8e9979464c..22108001796 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/Block.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/Block.java
@@ -582,12 +582,10 @@ public class Block extends Node {
     }
 
     /**
-     * Reset the needs scope flag.
-     *
-     * @param needsScope  new needs scope flag
+     * Set the needs scope flag.
      */
-    public void setNeedsScope(final boolean needsScope) {
-        this.needsScope = needsScope;
+    public void setNeedsScope() {
+        this.needsScope = true;
     }
 
 }
diff --git a/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java b/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java
index c673bb036bf..15dcf0badb2 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java
@@ -43,7 +43,6 @@ import jdk.nashorn.internal.codegen.Frame;
 import jdk.nashorn.internal.codegen.MethodEmitter;
 import jdk.nashorn.internal.codegen.Namespace;
 import jdk.nashorn.internal.codegen.Splitter;
-import jdk.nashorn.internal.codegen.Transform;
 import jdk.nashorn.internal.codegen.types.Type;
 import jdk.nashorn.internal.ir.annotations.Ignore;
 import jdk.nashorn.internal.ir.visitor.NodeVisitor;
@@ -189,14 +188,9 @@ public class FunctionNode extends Block {
     /** Does this function need a scope object? */
     private static final int NEEDS_SCOPE           = HAS_ALL_VARS_IN_SCOPE | IS_VAR_ARG;
 
-
     /** What is the return type of this function? */
     private Type returnType = Type.OBJECT;
 
-    /** Transforms that have been applied to this function, a list as some transforms conceivably can run many times */
-    @Ignore
-    private final List<Class<? extends Transform>> appliedTransforms;
-
     /**
      * Used to keep track of a function's parent blocks.
      * This is needed when a (finally body) block is cloned than contains inner functions.
@@ -232,7 +226,6 @@ public class FunctionNode extends Block {
         this.labelStack        = new Stack<>();
         this.controlStack      = new Stack<>();
         this.declarations      = new ArrayList<>();
-        this.appliedTransforms = new ArrayList<>();
         // my block -> function is this. We added @SuppressWarnings("LeakingThisInConstructor") as NetBeans identifies
         // it as such a leak - this is a false positive as we're setting this into a field of the object being
         // constructed, so it can't be seen from other threads.
@@ -266,7 +259,6 @@ public class FunctionNode extends Block {
         this.labelStack        = new Stack<>();
         this.controlStack      = new Stack<>();
         this.declarations      = new ArrayList<>();
-        this.appliedTransforms = new ArrayList<>();
 
         for (final VarNode decl : functionNode.getDeclarations()) {
             declarations.add((VarNode) cs.existingOrCopy(decl)); //TODO same?
@@ -792,23 +784,6 @@ public class FunctionNode extends Block {
         return isScript() || (flags & HAS_ALL_VARS_IN_SCOPE) != 0;
     }
 
-    /**
-     * Check if a {@link Transform} has been taken place to this method.
-     * @param transform to check for
-     * @return true if transform has been applied
-     */
-    public boolean isTransformApplied(final Class<? extends Transform> transform) {
-        return appliedTransforms.contains(transform);
-    }
-
-    /**
-     * Tag this function with an applied transform
-     * @param transform the transform
-     */
-    public void registerTransform(final Class<? extends Transform> transform) {
-        appliedTransforms.add(transform);
-    }
-
     /**
      * Checks if this function is a sub-function generated by splitting a larger one
      * @see Splitter
diff --git a/nashorn/src/jdk/nashorn/internal/ir/Symbol.java b/nashorn/src/jdk/nashorn/internal/ir/Symbol.java
index 57bf2daac8c..d695f5eabe6 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/Symbol.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/Symbol.java
@@ -331,8 +331,11 @@ public final class Symbol implements Comparable<Symbol> {
      * Flag this symbol as scope as described in {@link Symbol#isScope()}
      */
     public void setIsScope() {
+        if (!isScope()) {
+            trace("SET IS SCOPE");
+        }
         flags |= IS_SCOPE;
-        getBlock().setNeedsScope(true);
+        getBlock().setNeedsScope();
     }
 
     /**
@@ -550,8 +553,10 @@ public final class Symbol implements Comparable<Symbol> {
      * @param slot valid bytecode slot, or -1 if not available
      */
     public void setSlot(final int slot) {
-        trace("SET SLOT " + slot);
-        this.slot = slot;
+        if (slot != this.slot) {
+            trace("SET SLOT " + slot);
+            this.slot = slot;
+        }
     }
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
index 191045dee6d..458fc74f611 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
@@ -1794,14 +1794,14 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
                typeError(Context.getGlobal(), strictErrorMessage, name, ScriptRuntime.safeToString((this)));
            }
            assert canBeFastScope || !NashornCallSiteDescriptor.isFastScope(desc);
-           final PropertyMap map = getMap();
-           return new GuardedInvocation(Lookup.EMPTY_SETTER, map.getProtoGetSwitchPoint(name), NashornGuards.getMapGuard(map));
+           final PropertyMap myMap = getMap();
+           return new GuardedInvocation(Lookup.EMPTY_SETTER, myMap.getProtoGetSwitchPoint(name), NashornGuards.getMapGuard(myMap));
     }
 
     @SuppressWarnings("unused")
     private static void setEmbed(final CallSiteDescriptor desc, final PropertyMap oldMap, final PropertyMap newMap, final MethodHandle setter, final int i, final Object self, final Object value) throws Throwable {
         final ScriptObject obj = (ScriptObject)self;
-        if(obj.trySetEmbedOrSpill(desc, oldMap, newMap, value)) {
+        if (obj.trySetEmbedOrSpill(desc, oldMap, newMap, value)) {
             obj.useEmbed(i);
             setter.invokeExact(self, value);
         }
@@ -1810,7 +1810,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
     @SuppressWarnings("unused")
     private static void setSpill(final CallSiteDescriptor desc, final PropertyMap oldMap, final PropertyMap newMap, final int index, final Object self, final Object value) {
         final ScriptObject obj = (ScriptObject)self;
-        if(obj.trySetEmbedOrSpill(desc, oldMap, newMap, value)) {
+        if (obj.trySetEmbedOrSpill(desc, oldMap, newMap, value)) {
             obj.spill[index] = value;
         }
     }

From a8b9e9a36d772d6207d5431fe0938e9880794220 Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Fri, 11 Jan 2013 18:26:18 +0530
Subject: [PATCH 063/311] 8006082: Provide option to run octane benchmarks in
 separate processes

Reviewed-by: lagergren, jlaskey
---
 nashorn/make/build-benchmark.xml | 302 +++++++++++++++++++------------
 nashorn/make/project.properties  |   7 +-
 2 files changed, 191 insertions(+), 118 deletions(-)

diff --git a/nashorn/make/build-benchmark.xml b/nashorn/make/build-benchmark.xml
index b3ff4bb08c9..d28de93df79 100644
--- a/nashorn/make/build-benchmark.xml
+++ b/nashorn/make/build-benchmark.xml
@@ -30,205 +30,276 @@
       <include name="*.js"/>
     </fileset>
     <pathconvert pathsep=" " property="octane-tests" refid="octane-set"/>
-    <property name="extra-arg" value=""/>
   </target>
 
   <!-- box2d -->
-  <target name="box2d-init">
-    <property name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/box2d.js"/>
+  <target name="octane-box2d" depends="jar">
+    <antcall target="run-octane">
+      <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/box2d.js"/>
+    </antcall>
   </target>
 
-  <target name="octane-box2d" depends="jar, box2d-init, octane-verbose">
-    <antcall target="run-octane"/>
+  <target name="octane-box2d-v8" depends="jar">
+    <antcall target="run-octane-v8">
+      <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/box2d.js"/>
+    </antcall>
   </target>
 
-  <target name="octane-box2d-v8" depends="jar, box2d-init, octane-verbose">
-    <antcall target="run-octane-v8"/>
-  </target>
-
-  <target name="octane-box2d-rhino" depends="jar, box2d-init, octane-verbose">
-    <antcall target="run-octane-rhino"/>
+  <target name="octane-box2d-rhino" depends="jar">
+    <antcall target="run-octane-rhino">
+      <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/box2d.js"/>
+    </antcall>
   </target>
 
   <!-- code-load -->  
-  <target name="code-load-init">
-    <property name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/code-load.js"/>
+  <target name="octane-code-load" depends="jar">
+    <antcall target="run-octane">
+      <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/code-load.js"/>
+    </antcall>
   </target>
 
-  <target name="octane-code-load" depends="jar, code-load-init, octane-verbose">
-    <antcall target="run-octane"/>
+  <target name="octane-code-load-v8" depends="jar">
+    <antcall target="run-octane-v8">
+      <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/code-load.js"/>
+    </antcall>
   </target>
 
-  <target name="octane-code-load-v8" depends="jar, code-load-init, octane-verbose">
-    <antcall target="run-octane-v8"/>
-  </target>
-
-  <target name="octane-code-load-rhino" depends="jar, code-load-init, octane-verbose">
-    <antcall target="run-octane-rhino"/>
+  <target name="octane-code-load-rhino" depends="jar">
+    <antcall target="run-octane-rhino">
+      <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/code-load.js"/>
+    </antcall>
   </target>
 
   <!-- crypto -->
-  <target name="crypto-init">
-    <property name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/crypto.js"/>
+  <target name="octane-crypto" depends="jar">
+    <antcall target="run-octane">
+      <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/crypto.js"/>
+    </antcall>
   </target>
 
-  <target name="octane-crypto" depends="jar, crypto-init, octane-verbose">
-    <antcall target="run-octane"/>
+  <target name="octane-crypto-v8" depends="jar">
+    <antcall target="run-octane-v8">
+      <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/crypto.js"/>
+    </antcall>
   </target>
 
-  <target name="octane-crypto-v8" depends="jar, crypto-init, octane-verbose">
-    <antcall target="run-octane-v8"/>
-  </target>
-
-  <target name="octane-crypto-rhino" depends="jar, crypto-init, octane-verbose">
-    <antcall target="run-octane-rhino"/>
+  <target name="octane-crypto-rhino" depends="jar">
+    <antcall target="run-octane-rhino">
+      <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/crypto.js"/>
+    </antcall>
   </target>
 
   <!-- deltablue -->
-  <target name="deltablue-init">
-    <property name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/deltablue.js"/>
+  <target name="octane-deltablue" depends="jar">
+    <antcall target="run-octane">
+      <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/deltablue.js"/>
+    </antcall>
   </target>
 
-  <target name="octane-deltablue" depends="jar, deltablue-init, octane-verbose">
-    <antcall target="run-octane"/>
+  <target name="octane-deltablue-v8" depends="jar">
+    <antcall target="run-octane-v8">
+      <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/deltablue.js"/>
+    </antcall>
   </target>
 
-  <target name="octane-deltablue-v8" depends="jar, deltablue-init, octane-verbose">
-    <antcall target="run-octane-v8"/>
-  </target>
-
-  <target name="octane-deltablue-rhino" depends="jar, deltablue-init, octane-verbose">
-    <antcall target="run-octane-rhino"/>
+  <target name="octane-deltablue-rhino" depends="jar">
+    <antcall target="run-octane-rhino">
+      <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/deltablue.js"/>
+    </antcall>
   </target>
 
   <!-- earley-boyer -->
-  <target name="earley-boyer-init">
-    <property name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/earley-boyer.js"/>
+  <target name="octane-earley-boyer" depends="jar">
+    <antcall target="run-octane">
+      <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/earley-boyer.js"/>
+    </antcall>
   </target>
 
-  <target name="octane-earley-boyer" depends="jar, earley-boyer-init, octane-verbose">
-    <antcall target="run-octane"/>
+  <target name="octane-earley-boyer-v8" depends="jar">
+    <antcall target="run-octane-v8">
+      <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/earley-boyer.js"/>
+    </antcall>
   </target>
 
-  <target name="octane-earley-boyer-v8" depends="jar, earley-boyer-init, octane-verbose">
-    <antcall target="run-octane-v8"/>
-  </target>
-
-  <target name="octane-earley-boyer-rhino" depends="jar, earley-boyer-init, octane-verbose">
-    <antcall target="run-octane-rhino"/>
+  <target name="octane-earley-boyer-rhino" depends="jar">
+    <antcall target="run-octane-rhino">
+      <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/earley-boyer.js"/>
+    </antcall>
   </target>
 
   <!-- gbemu -->  
-  <target name="gbemu-init">
-    <property name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/gbemu.js"/>
+  <target name="octane-gbemu" depends="jar">
+    <antcall target="run-octane">
+      <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/gbemu.js"/>
+    </antcall>
   </target>
 
-  <target name="octane-gbemu" depends="jar, gbemu-init, octane-verbose">
-    <antcall target="run-octane"/>
+  <target name="octane-gbemu-v8" depends="jar">
+    <antcall target="run-octane-v8">
+      <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/gbemu.js"/>
+    </antcall>
   </target>
 
-  <target name="octane-gbemu-v8" depends="jar, gbemu-init, octane-verbose">
-    <antcall target="run-octane-v8"/>
+  <target name="octane-gbemu-rhino" depends="jar">
+    <antcall target="run-octane-rhino">
+      <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/gbemu.js"/>
+    </antcall>
   </target>
 
-  <target name="octane-gbemu-rhino" depends="jar, gbemu-init, octane-verbose">
-    <antcall target="run-octane-rhino"/>
+  <!-- mandreel -->  
+  <target name="octane-mandreel" depends="jar">
+    <antcall target="run-octane">
+      <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/mandreel.js"/>
+    </antcall>
+  </target>
+
+  <target name="octane-mandreel-v8" depends="jar">
+    <antcall target="run-octane-v8">
+      <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/mandreel.js"/>
+    </antcall>
+  </target>
+
+  <target name="octane-mandreel-rhino" depends="jar">
+    <antcall target="run-octane-rhino">
+      <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/mandreel.js"/>
+    </antcall>
   </target>
 
   <!-- navier-stokes -->
-  <target name="navier-stokes-init">
-    <property name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/navier-stokes.js"/>
+  <target name="octane-navier-stokes" depends="jar">
+    <antcall target="run-octane">
+      <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/navier-stokes.js"/>
+    </antcall>
   </target>
 
-  <target name="octane-navier-stokes" depends="jar, navier-stokes-init, octane-verbose">
-    <antcall target="run-octane"/>
+  <target name="octane-navier-stokes-v8" depends="jar">
+    <antcall target="run-octane-v8">
+      <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/navier-stokes.js"/>
+    </antcall>
   </target>
 
-  <target name="octane-navier-stokes-v8" depends="jar, navier-stokes-init, octane-verbose">
-    <antcall target="run-octane-v8"/>
-  </target>
-
-  <target name="octane-navier-stokes-rhino" depends="jar, navier-stokes-init, octane-verbose">
-    <antcall target="run-octane-rhino"/>
+  <target name="octane-navier-stokes-rhino" depends="jar">
+    <antcall target="run-octane-rhino">
+      <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/navier-stokes.js"/>
+    </antcall>
   </target>
 
   <!-- pdfjs -->  
-  <target name="pdfjs-init">
-    <property name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/pdfjs.js"/>
+  <target name="octane-pdfjs" depends="jar">
+    <antcall target="run-octane">
+      <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/pdfjs.js"/>
+    </antcall>
   </target>
 
-  <target name="octane-pdfjs" depends="jar, pdfjs-init, octane-verbose">
-    <antcall target="run-octane"/>
+  <target name="octane-pdfjs-v8" depends="jar">
+    <antcall target="run-octane-v8">
+      <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/pdfjs.js"/>
+    </antcall>
   </target>
 
-  <target name="octane-pdfjs-v8" depends="jar, pdfjs-init, octane-verbose">
-    <antcall target="run-octane-v8"/>
-  </target>
-
-  <target name="octane-pdfjs-rhino" depends="jar, pdfjs-init, octane-verbose">
-    <antcall target="run-octane-rhino"/>
+  <target name="octane-pdfjs-rhino" depends="jar">
+    <antcall target="run-octane-rhino">
+      <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/pdfjs.js"/>
+    </antcall>
   </target>
 
   <!-- raytrace -->
-  <target name="raytrace-init">
-    <property name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/raytrace.js"/>
+  <target name="octane-raytrace" depends="jar">
+    <antcall target="run-octane">
+      <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/raytrace.js"/>
+    </antcall>
   </target>
 
-  <target name="octane-raytrace" depends="jar, raytrace-init, octane-verbose">
-    <antcall target="run-octane"/>
+  <target name="octane-raytrace-v8" depends="jar">
+    <antcall target="run-octane-v8">
+      <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/raytrace.js"/>
+    </antcall>
   </target>
 
-  <target name="octane-raytrace-v8" depends="jar, raytrace-init, octane-verbose">
-    <antcall target="run-octane-v8"/>
-  </target>
-
-  <target name="octane-raytrace-rhino" depends="jar, raytrace-init, octane-verbose">
-    <antcall target="run-octane-rhino"/>
+  <target name="octane-raytrace-rhino" depends="jar">
+    <antcall target="run-octane-rhino">
+      <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/raytrace.js"/>
+    </antcall>
   </target>
 
   <!-- regexp -->
-  <target name="regexp-init">
-    <property name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/regexp.js"/>
+  <target name="octane-regexp" depends="jar">
+    <antcall target="run-octane">
+      <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/regexp.js"/>
+    </antcall>
   </target>
 
-  <target name="octane-regexp" depends="jar, regexp-init, octane-verbose">
-    <antcall target="run-octane"/>
+  <target name="octane-regexp-octane-v8" depends="jar">
+    <antcall target="run-octane-v8">
+      <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/regexp.js"/>
+    </antcall>
   </target>
 
-  <target name="octane-regexp-octane-v8" depends="jar, regexp-init, octane-verbose">
-    <antcall target="run-octane-v8"/>
+  <target name="octane-regexp-rhino" depends="jar">
+    <antcall target="run-octane-rhino">
+      <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/regexp.js"/>
+    </antcall>
   </target>
 
-  <target name="octane-regexp-rhino" depends="jar, regexp-init, octane-verbose">
-    <antcall target="run-octane-rhino"/>
+  <!-- richards -->
+  <target name="octane-richards" depends="jar">
+    <antcall target="run-octane">
+      <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/richards.js"/>
+    </antcall>
   </target>
 
+  <target name="octane-richards-v8" depends="jar">
+    <antcall target="run-octane-v8">
+      <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/richards.js"/>
+    </antcall>
+  </target>
+
+  <target name="octane-richards-rhino" depends="jar">
+    <antcall target="run-octane-rhino">
+      <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/richards.js"/>
+    </antcall>
+  </target>
 
   <!-- splay -->
-  <target name="splay-init">
-    <property name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/splay.js"/>
+  <target name="octane-splay" depends="jar">
+    <antcall target="run-octane">
+      <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/splay.js"/>
+    </antcall>
   </target>
 
-  <target name="octane-splay" depends="jar, splay-init, octane-verbose">
+  <target name="octane-splay-v8" depends="jar">
+    <antcall target="run-octane-v8">
+      <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/splay.js"/>
+    </antcall>
+  </target>
+
+  <target name="octane-splay-rhino" depends="jar">
+    <antcall target="run-octane-rhino">
+      <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/splay.js"/>
+    </antcall>
+  </target>
+
+  <!-- run octane benchmarks in a single process  -->
+  <target name="octane-single-process" depends="octane-init">
     <antcall target="run-octane"/>
   </target>
 
-  <target name="octane-splay-v8" depends="jar, splay-init, octane-verbose">
-    <antcall target="run-octane-v8"/>
+  <!-- mandreel excluded due to OOM -->
+  <target name="octane-separate-process" depends=
+     "octane-box2d, octane-code-load, octane-crypto, 
+      octane-deltablue, octane-earley-boyer, octane-gbemu,
+      octane-navier-stokes, octane-pdfjs, octane-raytrace, 
+      octane-regexp, octane-richards, octane-splay"/>
+
+  <target name="--single-process" unless="${octane-test-sys-prop.separate.process}">
+    <antcall target="octane-single-process"/>
+  </target>
+  <target name="--separate-process" if="${octane-test-sys-prop.separate.process}">
+    <antcall target="octane-separate-process"/>
   </target>
 
-  <target name="octane-splay-rhino" depends="jar, splay-init, octane-verbose">
-    <antcall target="run-octane-rhino"/>
-  </target>
-
-  <target name="octane-verbose">
-    <property name="extra-arg" value="--verbose"/>
-  </target>
-
-  <!-- run octane benchmarks using Nashorn as runtime -->
-  <target name="octane" depends="octane-init">
-    <antcall target="run-octane"/>
-  </target>
+  <!-- run 'octane' in single or separate processes based on config -->
+  <target name="octane" depends="init, --single-process, --separate-process"/>
 
   <!-- run octane benchmarks using octane as runtime -->
   <target name="octane-v8" depends="octane-init">
@@ -254,7 +325,6 @@
       <arg value="Nashorn"/>
       <arg value="--verbose"/>
       <arg value="--iterations 8"/>
-      <arg value="${extra-arg}"/>
     </java>
   </target>
 
@@ -267,7 +337,6 @@
       <arg value="v8"/>
       <arg value="--verbose"/>
       <arg value="--iterations 8"/>
-      <arg value="${extra-arg}"/>
     </exec>
   </target>
 
@@ -283,7 +352,6 @@
       <arg value="Rhino"/>
       <arg value="--verbose"/>
       <arg value="--iterations 8"/>
-      <arg value="${extra-arg}"/>
     </java>
   </target>
 
diff --git a/nashorn/make/project.properties b/nashorn/make/project.properties
index e1e77614e54..37c8f832da3 100644
--- a/nashorn/make/project.properties
+++ b/nashorn/make/project.properties
@@ -156,13 +156,18 @@ test-sys-prop.test.js.unchecked.dir=${test262.dir}
 # test root for octane
 octane-test-sys-prop.test.js.roots=${test.external.dir}/octane/
 
+# run octane benchmars in separate processes?
+octane-test-sys-prop.separate.process=true
+
 # framework root for octane
 octane-test-sys-prop.test.js.framework=${test.basic.dir}/run-octane.js
 
 # list of tests to be excluded
+# mandreel excluded due to OOM
 octane-test-sys-prop.test.js.exclude.list=\
     base.js \
-    run.js
+    run.js  \
+    mandreel.js
 
 # test root for sunspider
 sunspider-test-sys-prop.test.js.roots=${test.external.dir}/sunspider/tests/sunspider-1.0/

From 7e7ea2a29510b3218f6e9f355f70737c8e9c4185 Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Fri, 11 Jan 2013 20:34:22 +0530
Subject: [PATCH 064/311] 8006093: Add a makefile target to run all tests
 (test, test262, perf tests)

Reviewed-by: attila, hannesw
---
 nashorn/make/Makefile  |  7 ++-----
 nashorn/make/build.xml | 22 ++++++++++++++++------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/nashorn/make/Makefile b/nashorn/make/Makefile
index 5775be158b4..965c30a43a1 100644
--- a/nashorn/make/Makefile
+++ b/nashorn/make/Makefile
@@ -181,16 +181,13 @@ else
 endif
 
 # Default target and expected 'do everything' target
-# comments docs to avoid too many ASM warnings
-# all: test docs
-
-all: test
+all: test docs
 
 # Standard make clobber target
 clobber: clean
 
 # All ant targets of interest
-ANT_TARGETS = clean externals update-externals jar javadoc shelldoc docs test test262 test262parallel # for now
+ANT_TARGETS = clean externals update-externals jar javadoc shelldoc docs test test262 test262parallel octane sunspider perf alltests
 
 # Create diagnostics log (careful, ant 1.8.0 -diagnostics always does an exit 1)
 $(OUTPUTDIR)/build/ant-diagnostics.log:
diff --git a/nashorn/make/build.xml b/nashorn/make/build.xml
index ce13df19611..8ef6b50e551 100644
--- a/nashorn/make/build.xml
+++ b/nashorn/make/build.xml
@@ -37,6 +37,10 @@
     <condition property="hg.executable" value="/usr/local/bin/hg" else="hg">
       <available file="/usr/local/bin/hg"/>
     </condition>
+    <!-- check if JDK already has ASM classes -->
+    <available property="asm.available" classname="jdk.internal.org.objectweb.asm.Type"/>
+    <!-- check if testng.jar is avaiable -->
+    <available property="testng.available" file="${file.reference.testng.jar}"/>
   </target>
 
   <target name="prepare" depends="init">
@@ -46,10 +50,6 @@
     <mkdir dir="${build.test.classes.dir}"/>
     <mkdir dir="${dist.dir}"/>
     <mkdir dir="${dist.javadoc.dir}"/>
-    <!-- check if JDK already has ASM classes -->
-    <available property="asm.available" classname="jdk.internal.org.objectweb.asm.Type"/>
-    <!-- check if testng.jar is avaiable -->
-    <available property="testng.available" file="${file.reference.testng.jar}"/>
   </target>
 
   <target name="clean" depends="init, clean-nasgen">
@@ -424,7 +424,7 @@
   </target>
 
   <!-- get all external test scripts -->
-  <target name="externals" depends="prepare, check-external-tests, get-test262, get-octane, get-sunspider">
+  <target name="externals" depends="init, check-external-tests, get-test262, get-octane, get-sunspider">
     <!-- make external test dir -->
     <mkdir dir="${test.external.dir}"/> 
 
@@ -450,6 +450,16 @@
   </target>
 
   <!-- update external test suites that are pulled from source control systems -->
-  <target name="update-externals" depends="prepare, check-external-tests, update-test262, update-octane, update-sunspider"/>
+  <target name="update-externals" depends="init, check-external-tests, update-test262, update-octane, update-sunspider"/>
+
+  <!-- run all perf tests -->
+  <target name="perf" depends="externals, update-externals, sunspider, octane"/>
+
+  <!-- run all tests -->
+  <target name="exit-if-no-testng" depends="init, check-testng" unless="${testng.available}">
+     <fail message="Exiting.."/>
+  </target>
+
+  <target name="alltests" depends="exit-if-no-testng, externals, update-externals, test, test262parallel, perf"/>
 
 </project>

From f36a46aea456731ae00694dab4d60e767cb9b1f8 Mon Sep 17 00:00:00 2001
From: Attila Szegedi <attila@openjdk.org>
Date: Mon, 14 Jan 2013 16:00:55 +0100
Subject: [PATCH 065/311] 8006168: ability to generate multi-type Java adapters

Reviewed-by: lagergren, jlaskey
---
 .../nashorn/internal/objects/NativeJava.java  |  30 +-
 .../runtime/linker/JavaAdapterFactory.java    | 480 +++++++++++++-----
 .../linker/NashornPrimitiveLinker.java        |   2 +-
 .../runtime/resources/Messages.properties     |   6 +-
 nashorn/test/script/sandbox/javaextend.js     |  26 +
 .../script/sandbox/javaextend.js.EXPECTED     |   6 +
 .../internal/test/models/DessertTopping.java  |  30 ++
 .../models/DessertToppingFloorWaxDriver.java  |  36 ++
 .../internal/test/models/FloorWax.java        |  30 ++
 .../internal/test/models/Toothpaste.java      |  34 ++
 10 files changed, 552 insertions(+), 128 deletions(-)
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/test/models/DessertTopping.java
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/test/models/DessertToppingFloorWaxDriver.java
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/test/models/FloorWax.java
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/test/models/Toothpaste.java

diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java b/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java
index 31ec590daed..70103228212 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java
@@ -145,7 +145,7 @@ public class NativeJava {
      * this usage though, you can't use non-default constructors; the type must be either an interface, or must have a
      * protected or public no-arg constructor.
      * </p><p>
-     * You can also subclass non-abstract classes; for that you will need to use the {@link #extend(Object, Object)}
+     * You can also subclass non-abstract classes; for that you will need to use the {@link #extend(Object, Object...)}
      * method.
      * <h2>Accessing static members</h2>
      * Examples:
@@ -371,15 +371,29 @@ public class NativeJava {
      * must be prepared to deal with all overloads.</li>
      * <li>You can't invoke {@code super.*()} from adapters for now.</li>
      * @param self not used
-     * @param type the original type. Must be a Java type object of class {@link StaticClass} representing either a
-     * public interface or a non-final public class with at least one public or protected constructor.
-     * @return a new {@link StaticClass} that represents the adapter for the original type.
+     * @param types the original types. The caller must pass at least one Java type object of class {@link StaticClass}
+     * representing either a public interface or a non-final public class with at least one public or protected
+     * constructor. If more than one type is specified, at most one can be a class and the rest have to be interfaces.
+     * Invoking the method twice with exactly the same types in the same order will return the same adapter
+     * class, any reordering of types or even addition or removal of redundant types (i.e. interfaces that other types
+     * in the list already implement/extend, or {@code java.lang.Object} in a list of types consisting purely of
+     * interfaces) will result in a different adapter class, even though those adapter classes are functionally
+     * identical; we deliberately don't want to incur the additional processing cost of canonicalizing type lists.
+     * @return a new {@link StaticClass} that represents the adapter for the original types.
      */
     @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
-    public static Object extend(final Object self, final Object type) {
-        if(!(type instanceof StaticClass)) {
-            typeError(Global.instance(), "extend.expects.java.type");
+    public static Object extend(final Object self, final Object... types) {
+        if(types == null || types.length == 0) {
+            typeError(Global.instance(), "extend.expects.at.least.one.argument");
         }
-        return JavaAdapterFactory.getAdapterClassFor((StaticClass)type);
+        final Class<?>[] stypes = new Class<?>[types.length];
+        try {
+            for(int i = 0; i < types.length; ++i) {
+                stypes[i] = ((StaticClass)types[i]).getRepresentedClass();
+            }
+        } catch(final ClassCastException e) {
+            typeError(Global.instance(), "extend.expects.java.types");
+        }
+        return JavaAdapterFactory.getAdapterClassFor(stypes);
     }
 }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
index f6001dbf23d..c42b19c6c00 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
@@ -57,9 +57,17 @@ import java.security.PrivilegedAction;
 import java.security.ProtectionDomain;
 import java.security.SecureClassLoader;
 import java.security.SecureRandom;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 import java.util.Random;
 import java.util.Set;
 import jdk.internal.org.objectweb.asm.ClassWriter;
@@ -69,6 +77,7 @@ import jdk.internal.org.objectweb.asm.Type;
 import jdk.internal.org.objectweb.asm.commons.InstructionAdapter;
 import jdk.nashorn.internal.objects.NativeJava;
 import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.runtime.ECMAErrors;
 import jdk.nashorn.internal.runtime.ECMAException;
 import jdk.nashorn.internal.runtime.ScriptFunction;
 import jdk.nashorn.internal.runtime.ScriptObject;
@@ -78,43 +87,38 @@ import org.dynalang.dynalink.support.LinkRequestImpl;
 
 /**
  * A factory class that generates adapter classes. Adapter classes allow implementation of Java interfaces and
- * extending of Java classes from JavaScript. For every original Class object, exactly one adapter Class is generated
- * that either extends the original class or - if the original Class represents an interface - extends Object and
- * implements the interface represented by the original Class.
+ * extending of Java classes from JavaScript. For every combination of a superclass to extend and interfaces to
+ * implement (collectively: "original types"), exactly one adapter class is generated that extends the specified
+ * superclass and implements the specified interfaces.
  * </p><p>
  * The adapter class is generated in a new secure class loader that inherits Nashorn's protection domain, and has either
- * the original Class' class loader or the Nashorn's class loader as its parent - the parent class loader is chosen so
- * that both the original Class and the Nashorn core classes are visible from it (as the adapter will have constant pool
- * references to ScriptObject and ScriptFunction classes). In case neither candidate class loader has visibility into
- * the other set of classes, an error is thrown.
+ * one of the original types' class loader or the Nashorn's class loader as its parent - the parent class loader
+ * is chosen so that all the original types and the Nashorn core classes are visible from it (as the adapter will have
+ * constant pool references to ScriptObject and ScriptFunction classes). In case none of the candidate class loaders has
+ * visibility of all the required types, an error is thrown.
  * </p><p>
- * For every protected or public constructor in the extended class (which is either the original class, or Object when
- * an interface is implemented), the adapter class will have one or two public constructors (visibility of protected
- * constructors in the extended class is promoted to public). In every case, for every original constructor, a new
- * constructor taking a trailing ScriptObject argument preceded by original constructor arguments is present on the
- * adapter class. When such a constructor is invoked, the passed ScriptObject's member functions are used to implement
- * and/or override methods on the original class, dispatched by name. A single JavaScript function will act as the
- * implementation for all overloaded methods of the same name. When methods on an adapter instance are invoked, the
- * functions are invoked having the ScriptObject passed in the instance constructor as their "this". Subsequent changes
- * to the ScriptObject (reassignment or removal of its functions) are not reflected in the adapter instance; the method
- * implementations are bound to functions at constructor invocation time. {@code java.lang.Object} methods
- * {@code equals}, {@code hashCode}, and {@code toString} can also be overridden (from interface implementations too).
- * The only restriction is that since every JavaScript object already has a {@code toString} function through the
+ * For every protected or public constructor in the extended class, the adapter class will have one or two public
+ * constructors (visibility of protected constructors in the extended class is promoted to public). In every case, for
+ * every original constructor, a new constructor taking a trailing ScriptObject argument preceded by original
+ * constructor arguments is present on the adapter class. When such a constructor is invoked, the passed ScriptObject's
+ * member functions are used to implement and/or override methods on the original class, dispatched by name. A single
+ * JavaScript function will act as the implementation for all overloaded methods of the same name. When methods on an
+ * adapter instance are invoked, the functions are invoked having the ScriptObject passed in the instance constructor as
+ * their "this". Subsequent changes to the ScriptObject (reassignment or removal of its functions) are not reflected in
+ * the adapter instance; the method implementations are bound to functions at constructor invocation time.
+ * {@code java.lang.Object} methods {@code equals}, {@code hashCode}, and {@code toString} can also be overridden. The
+ * only restriction is that since every JavaScript object already has a {@code toString} function through the
  * {@code Object.prototype}, the {@code toString} in the adapter is only overridden if the passed ScriptObject has a
  * {@code toString} function as its own property, and not inherited from a prototype. All other adapter methods can be
  * implemented or overridden through a prototype-inherited function of the ScriptObject passed to the constructor too.
  * </p><p>
- * For abstract classes or interfaces that only have one abstract method, or have several of them, but all share the
+ * If the original types collectively have only one abstract method, or have several of them, but all share the
  * same name, an additional constructor is provided for every original constructor; this one takes a ScriptFunction as
  * its last argument preceded by original constructor arguments. This constructor will use the passed function as the
  * implementation for all abstract methods. For consistency, any concrete methods sharing the single abstract method
  * name will also be overridden by the function. When methods on the adapter instance are invoked, the ScriptFunction is
  * invoked with {@code null} as its "this".
  * </p><p>
- * If the superclass has a protected or public default constructor, then a generated constructor that only takes a
- * ScriptFunction is also implicitly used as an automatic conversion whenever a ScriptFunction is passed in an
- * invocation of any Java method that expects such SAM type.
- * </p><p>
  * For adapter methods that return values, all the JavaScript-to-Java conversions supported by Nashorn will be in effect
  * to coerce the JavaScript function return value to the expected Java return type.
  * </p><p>
@@ -125,7 +129,7 @@ import org.dynalang.dynalink.support.LinkRequestImpl;
  * to resemble Java anonymous classes) is actually equivalent to <code>new X(a, b, { ... })</code>.
  * </p><p>
  * You normally don't use this class directly, but rather either create adapters from script using
- * {@link NativeJava#extend(Object, Object)}, using the {@code new} operator on abstract classes and interfaces (see
+ * {@link NativeJava#extend(Object, Object...)}, using the {@code new} operator on abstract classes and interfaces (see
  * {@link NativeJava#type(Object, Object)}), or implicitly when passing script functions to Java methods expecting SAM
  * types.
  * </p>
@@ -169,25 +173,28 @@ public class JavaAdapterFactory {
     private static final String ADAPTER_PACKAGE_PREFIX = "jdk/nashorn/internal/javaadapters/";
     // Class name suffix used to append to the adaptee class name, when it can be defined in the adaptee's package.
     private static final String ADAPTER_CLASS_NAME_SUFFIX = "$$NashornJavaAdapter";
-
     private static final String JAVA_PACKAGE_PREFIX = "java/";
+    private static final int MAX_GENERATED_TYPE_NAME_LENGTH = 238; //255 - 17; 17 is the maximum possible length for the global setter inner class suffix
+
     private static final String INIT = "<init>";
     private static final String VOID_NOARG = Type.getMethodDescriptor(Type.VOID_TYPE);
     private static final String GLOBAL_FIELD_NAME = "global";
 
     /**
      * Contains various outcomes for attempting to generate an adapter class. These are stored in AdapterInfo instances.
-     * We have a successful outcome (adapter class was generated) and three possible error outcomes: a class is final,
-     * a class is not public, and the class has no public or protected constructor. We don't throw exceptions when we
-     * try to generate the adapter, but rather just record these error conditions as they are still useful as partial
-     * outcomes, as Nashorn's linker can still successfully check whether the class can be autoconverted from a script
-     * function even when it is not possible to generate an adapter for it.
+     * We have a successful outcome (adapter class was generated) and four possible error outcomes: superclass is final,
+     * superclass is not public, superclass has no public or protected constructor, more than one superclass was
+     * specified. We don't throw exceptions when we try to generate the adapter, but rather just record these error
+     * conditions as they are still useful as partial outcomes, as Nashorn's linker can still successfully check whether
+     * the class can be autoconverted from a script function even when it is not possible to generate an adapter for it.
      */
     private enum AdaptationOutcome {
         SUCCESS,
         ERROR_FINAL_CLASS,
         ERROR_NON_PUBLIC_CLASS,
-        ERROR_NO_ACCESSIBLE_CONSTRUCTOR
+        ERROR_NO_ACCESSIBLE_CONSTRUCTOR,
+        ERROR_MULTIPLE_SUPERCLASSES,
+        ERROR_NO_COMMON_LOADER
     }
 
     /**
@@ -198,27 +205,28 @@ public class JavaAdapterFactory {
     /**
      * A mapping from an original Class object to AdapterInfo representing the adapter for the class it represents.
      */
-    private static final ClassValue<AdapterInfo> ADAPTER_INFOS = new ClassValue<AdapterInfo>() {
+    private static final ClassValue<Map<List<Class<?>>, AdapterInfo>> ADAPTER_INFO_MAPS = new ClassValue<Map<List<Class<?>>, AdapterInfo>>() {
         @Override
-        protected AdapterInfo computeValue(final Class<?> type) {
-            return createAdapterInfo(type);
+        protected Map<List<Class<?>>, AdapterInfo> computeValue(final Class<?> type) {
+            return new HashMap<>();
         }
     };
 
     private static final Random random = new SecureRandom();
     private static final ProtectionDomain GENERATED_PROTECTION_DOMAIN = createGeneratedProtectionDomain();
 
-    // This is the supertype for our generated adapter. It's either Object if we're implementing an interface, or same
-    // as originalType if we're extending a class.
-    private final Class<?> superType;
+    // This is the superclass for our generated adapter.
+    private final Class<?> superClass;
     // Class loader used as the parent for the class loader we'll create to load the generated class. It will be a class
-    // loader that has the visibility of both the original type and of the Nashorn classes.
+    // loader that has the visibility of all original types (class to extend and interfaces to implement) and of the
+    // Nashorn classes.
     private final ClassLoader commonLoader;
 
-    // Binary name of the superType
-    private final String superTypeName;
+    // Binary name of the superClass
+    private final String superClassName;
     // Binary name of the generated class.
-    private final String generatedTypeName;
+    private final String generatedClassName;
+    // Binary name of the PrivilegedAction inner class that is used to
     private final String globalSetterClassName;
     private final Set<String> usedFieldNames = new HashSet<>();
     private final Set<String> abstractMethodNames = new HashSet<>();
@@ -232,10 +240,16 @@ public class JavaAdapterFactory {
     /**
      * Creates a factory that will produce the adapter type for the specified original type.
      * @param originalType the type for which this factory will generate the adapter type.
+     * @param definingClassAndLoader the class in whose ClassValue we'll store the generated adapter, and its class loader.
      * @throws AdaptationException if the adapter can not be generated for some reason.
      */
-    private JavaAdapterFactory(final Class<?> originalType) throws AdaptationException {
-        this.commonLoader = findCommonLoader(originalType);
+    private JavaAdapterFactory(final Class<?> superType, final List<Class<?>> interfaces, final ClassAndLoader definingClassAndLoader) throws AdaptationException {
+        assert superType != null && !superType.isInterface();
+        assert interfaces != null;
+        assert definingClassAndLoader != null;
+
+        this.superClass = superType;
+        this.commonLoader = findCommonLoader(definingClassAndLoader);
         cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS) {
             @Override
             protected String getCommonSuperClass(final String type1, final String type2) {
@@ -244,39 +258,23 @@ public class JavaAdapterFactory {
                 return JavaAdapterFactory.this.getCommonSuperClass(type1, type2);
             }
         };
-        final String originalTypeName = Type.getInternalName(originalType);
-        final String[] interfaces;
-        final boolean isInterface = originalType.isInterface();
-        if (isInterface) {
-            superType = Object.class;
-            interfaces = new String[] { originalTypeName };
-        } else {
-            superType = originalType;
-            interfaces = null;
-        }
-        superTypeName = Type.getInternalName(superType);
-        final Package pkg = originalType.getPackage();
-        if (originalTypeName.startsWith(JAVA_PACKAGE_PREFIX) || pkg == null || pkg.isSealed()) {
-            // Can't define new classes in java.* packages
-            generatedTypeName = ADAPTER_PACKAGE_PREFIX + originalTypeName;
-        } else {
-            generatedTypeName = originalTypeName + ADAPTER_CLASS_NAME_SUFFIX;
-        }
+        superClassName = Type.getInternalName(superType);
+        generatedClassName = getGeneratedClassName(superType, interfaces);
+
         // Randomize the name of the privileged global setter, to make it non-feasible to find.
         final long l;
         synchronized(random) {
             l = random.nextLong();
         }
-        globalSetterClassName = generatedTypeName.concat("$" + Long.toHexString(l & Long.MAX_VALUE));
-        cw.visit(Opcodes.V1_7, ACC_PUBLIC | ACC_SUPER | ACC_FINAL, generatedTypeName, null, superTypeName, interfaces);
+        // NOTE: they way this class name is calculated affects the value of MAX_GENERATED_TYPE_NAME_LENGTH constant. If
+        // you change the calculation of globalSetterClassName, adjust the constant too.
+        globalSetterClassName = generatedClassName.concat("$" + Long.toHexString(l & Long.MAX_VALUE));
+        cw.visit(Opcodes.V1_7, ACC_PUBLIC | ACC_SUPER | ACC_FINAL, generatedClassName, null, superClassName, getInternalTypeNames(interfaces));
         cw.visitField(ACC_PRIVATE | ACC_FINAL, GLOBAL_FIELD_NAME, SCRIPT_OBJECT_TYPE_DESCRIPTOR, null, null).visitEnd();
         usedFieldNames.add(GLOBAL_FIELD_NAME);
 
-        gatherMethods(originalType);
-        if (isInterface) {
-            // Add ability to override Object methods if implementing an interface
-            gatherMethods(Object.class);
-        }
+        gatherMethods(superType);
+        gatherMethods(interfaces);
         samName = abstractMethodNames.size() == 1 ? abstractMethodNames.iterator().next() : null;
         generateFields();
         generateConstructors();
@@ -285,6 +283,45 @@ public class JavaAdapterFactory {
         cw.visitEnd();
     }
 
+    private static String getGeneratedClassName(final Class<?> superType, final List<Class<?>> interfaces) {
+        // The class we use to primarily name our adapter is either the superclass, or if it is Object (meaning we're
+        // just implementing interfaces), then the first implemented interface.
+        final Class<?> namingType = superType == Object.class ? interfaces.get(0) : superType;
+        final Package pkg = namingType.getPackage();
+        final String namingTypeName = Type.getInternalName(namingType);
+        final StringBuilder buf = new StringBuilder();
+        if (namingTypeName.startsWith(JAVA_PACKAGE_PREFIX) || pkg == null || pkg.isSealed()) {
+            // Can't define new classes in java.* packages
+            buf.append(ADAPTER_PACKAGE_PREFIX).append(namingTypeName);
+        } else {
+            buf.append(namingTypeName).append(ADAPTER_CLASS_NAME_SUFFIX);
+        }
+        final Iterator<Class<?>> it = interfaces.iterator();
+        if(superType == Object.class && it.hasNext()) {
+            it.next(); // Skip first interface, it was used to primarily name the adapter
+        }
+        // Append interface names to the adapter name
+        while(it.hasNext()) {
+            buf.append("$$").append(it.next().getSimpleName());
+        }
+        return buf.toString().substring(0, Math.min(MAX_GENERATED_TYPE_NAME_LENGTH, buf.length()));
+    }
+
+    /**
+     * Given a list of class objects, return an array with their binary names. Used to generate the array of interface
+     * names to implement.
+     * @param classes the classes
+     * @return an array of names
+     */
+    private static String[] getInternalTypeNames(final List<Class<?>> classes) {
+        final int interfaceCount = classes.size();
+        final String[] interfaceNames = new String[interfaceCount];
+        for(int i = 0; i < interfaceCount; ++i) {
+            interfaceNames[i] = Type.getInternalName(classes.get(i));
+        }
+        return interfaceNames;
+    }
+
     /**
      * Utility method used by few other places in the code. Tests if the class has the abstract modifier and is not an
      * array class. For some reason, array classes have the abstract modifier set in HotSpot JVM, and we don't want to
@@ -297,29 +334,54 @@ public class JavaAdapterFactory {
     }
 
     /**
-     * Returns an adapter class for the specified original class. The adapter class extends/implements the original
-     * class/interface.
-     * @param originalClass the original class/interface to extend/implement.
+     * Returns an adapter class for the specified original types. The adapter class extends/implements the original
+     * class/interfaces.
+     * @param types the original types. The caller must pass at least one Java type representing either a public
+     * interface or a non-final public class with at least one public or protected constructor. If more than one type is
+     * specified, at most one can be a class and the rest have to be interfaces. The class can be in any position in the
+     * array. Invoking the method twice with exactly the same types in the same order will return the same adapter
+     * class, any reordering of types or even addition or removal of redundant types (i.e. interfaces that other types
+     * in the list already implement/extend, or {@code java.lang.Object} in a list of types consisting purely of
+     * interfaces) will result in a different adapter class, even though those adapter classes are functionally
+     * identical; we deliberately don't want to incur the additional processing cost of canonicalizing type lists.
      * @return an adapter class. See this class' documentation for details on the generated adapter class.
      * @throws ECMAException with a TypeError if the adapter class can not be generated because the original class is
      * final, non-public, or has no public or protected constructors.
      */
-    public static StaticClass getAdapterClassFor(final StaticClass originalClass) {
-        return getAdapterClassFor(originalClass.getRepresentedClass());
-    }
+    public static StaticClass getAdapterClassFor(final Class<?>[] types) {
+        assert types != null && types.length > 0;
+        final AdapterInfo adapterInfo = getAdapterInfo(types);
 
-    static StaticClass getAdapterClassFor(final Class<?> originalClass) {
-        final AdapterInfo adapterInfo = ADAPTER_INFOS.get(originalClass);
         final StaticClass clazz = adapterInfo.adapterClass;
         if (clazz != null) {
             return clazz;
         }
-        assert adapterInfo.adaptationOutcome != AdaptationOutcome.SUCCESS;
-        typeError(Context.getGlobal(), "extend." + adapterInfo.adaptationOutcome, originalClass.getName());
+        adapterInfo.adaptationOutcome.typeError();
 
         throw new AssertionError();
     }
 
+    private static AdapterInfo getAdapterInfo(final Class<?>[] types) {
+        final ClassAndLoader definingClassAndLoader = getDefiningClassAndLoader(types);
+
+        final Map<List<Class<?>>, AdapterInfo> adapterInfoMap = ADAPTER_INFO_MAPS.get(definingClassAndLoader.clazz);
+        final List<Class<?>> typeList = types.length == 1 ? getSingletonClassList(types[0]) : Arrays.asList(types.clone());
+        AdapterInfo adapterInfo;
+        synchronized(adapterInfoMap) {
+            adapterInfo = adapterInfoMap.get(typeList);
+            if(adapterInfo == null) {
+                adapterInfo = createAdapterInfo(types, definingClassAndLoader);
+                adapterInfoMap.put(typeList, adapterInfo);
+            }
+        }
+        return adapterInfo;
+    }
+
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    private static List<Class<?>> getSingletonClassList(final Class<?> clazz) {
+        return (List)Collections.singletonList(clazz);
+    }
+
     /**
      * Returns whether an instance of the specified class/interface can be generated from a ScriptFunction. Returns true
      * iff: the adapter for the class/interface can be created, it is abstract (this includes interfaces), it has at
@@ -330,7 +392,7 @@ public class JavaAdapterFactory {
      * @return true iff an instance of the specified class/interface can be generated from a ScriptFunction.
      */
     static boolean isAutoConvertibleFromFunction(final Class<?> clazz) {
-        return ADAPTER_INFOS.get(clazz).autoConvertibleFromFunction;
+        return getAdapterInfo(new Class<?>[] { clazz }).autoConvertibleFromFunction;
     }
 
     /**
@@ -346,7 +408,7 @@ public class JavaAdapterFactory {
      * @throws Exception if anything goes wrong
      */
     public static MethodHandle getConstructor(final Class<?> sourceType, final Class<?> targetType) throws Exception {
-        final StaticClass adapterClass = getAdapterClassFor(targetType);
+        final StaticClass adapterClass = getAdapterClassFor(new Class<?>[] { targetType });
         return MH.bindTo(Bootstrap.getLinkerServices().getGuardedInvocation(new LinkRequestImpl(NashornCallSiteDescriptor.get(
                 "dyn:new", MethodType.methodType(targetType, StaticClass.class, sourceType), 0), false,
                 adapterClass, null)).getInvocation(), adapterClass);
@@ -358,7 +420,7 @@ public class JavaAdapterFactory {
      * @return the generated adapter class
      */
     private Class<?> generateClass() {
-        final String binaryName = generatedTypeName.replace('/', '.');
+        final String binaryName = generatedClassName.replace('/', '.');
         try {
             return Class.forName(binaryName, true, createClassLoader(commonLoader, binaryName, cw.toByteArray(),
                     globalSetterClassName.replace('/', '.')));
@@ -467,7 +529,7 @@ public class JavaAdapterFactory {
 
     private void generateConstructors() throws AdaptationException {
         boolean gotCtor = false;
-        for (final Constructor<?> ctor: superType.getDeclaredConstructors()) {
+        for (final Constructor<?> ctor: superClass.getDeclaredConstructors()) {
             final int modifier = ctor.getModifiers();
             if((modifier & (Modifier.PUBLIC | Modifier.PROTECTED)) != 0) {
                 generateConstructor(ctor);
@@ -475,7 +537,7 @@ public class JavaAdapterFactory {
             }
         }
         if(!gotCtor) {
-            throw new AdaptationException(AdaptationOutcome.ERROR_NO_ACCESSIBLE_CONSTRUCTOR);
+            throw new AdaptationException(AdaptationOutcome.ERROR_NO_ACCESSIBLE_CONSTRUCTOR, superClass.getCanonicalName());
         }
     }
 
@@ -548,7 +610,7 @@ public class JavaAdapterFactory {
             mv.load(offset, argType);
             offset += argType.getSize();
         }
-        mv.invokespecial(superTypeName, INIT, originalCtorType.getDescriptor());
+        mv.invokespecial(superClassName, INIT, originalCtorType.getDescriptor());
 
         // Get a descriptor to the appropriate "JavaAdapterFactory.getHandle" method.
         final String getHandleDescriptor = fromFunction ? GET_HANDLE_FUNCTION_DESCRIPTOR : GET_HANDLE_OBJECT_DESCRIPTOR;
@@ -570,7 +632,7 @@ public class JavaAdapterFactory {
                 mv.iconst(mi.method.isVarArgs() ? 1 : 0);
                 mv.invokestatic(THIS_CLASS_TYPE_NAME, "getHandle", getHandleDescriptor);
             }
-            mv.putfield(generatedTypeName, mi.methodHandleFieldName, METHOD_HANDLE_TYPE_DESCRIPTOR);
+            mv.putfield(generatedClassName, mi.methodHandleFieldName, METHOD_HANDLE_TYPE_DESCRIPTOR);
         }
 
         // Assign "this.global = Context.getGlobal()"
@@ -579,7 +641,7 @@ public class JavaAdapterFactory {
         mv.dup();
         mv.invokevirtual(OBJECT_TYPE_NAME, "getClass", GET_CLASS_METHOD_DESCRIPTOR); // check against null Context
         mv.pop();
-        mv.putfield(generatedTypeName, GLOBAL_FIELD_NAME, SCRIPT_OBJECT_TYPE_DESCRIPTOR);
+        mv.putfield(generatedClassName, GLOBAL_FIELD_NAME, SCRIPT_OBJECT_TYPE_DESCRIPTOR);
 
         // Wrap up
         mv.visitInsn(RETURN);
@@ -747,7 +809,7 @@ public class JavaAdapterFactory {
 
         // Get the method handle
         mv.visitVarInsn(ALOAD, 0);
-        mv.getfield(generatedTypeName, mi.methodHandleFieldName, METHOD_HANDLE_TYPE_DESCRIPTOR);
+        mv.getfield(generatedClassName, mi.methodHandleFieldName, METHOD_HANDLE_TYPE_DESCRIPTOR);
         mv.visitInsn(DUP); // It'll remain on the stack all the way until the invocation
         // Check if the method handle is null
         mv.visitJumpInsn(IFNONNULL, methodHandleNotNull);
@@ -765,7 +827,7 @@ public class JavaAdapterFactory {
                 mv.load(nextParam, t);
                 nextParam += t.getSize();
             }
-            mv.invokespecial(superTypeName, name, methodDesc);
+            mv.invokespecial(superClassName, name, methodDesc);
             mv.areturn(returnType);
         }
 
@@ -872,7 +934,7 @@ public class JavaAdapterFactory {
 
     private void loadGlobalOnStack(final InstructionAdapter mv) {
         mv.visitVarInsn(ALOAD, 0);
-        mv.getfield(generatedTypeName, GLOBAL_FIELD_NAME, SCRIPT_OBJECT_TYPE_DESCRIPTOR);
+        mv.getfield(generatedClassName, GLOBAL_FIELD_NAME, SCRIPT_OBJECT_TYPE_DESCRIPTOR);
     }
 
     private static boolean isThrowableDeclared(final Class<?>[] exceptions) {
@@ -909,7 +971,7 @@ public class JavaAdapterFactory {
                         if (Modifier.isAbstract(m)) {
                             abstractMethodNames.add(mi.getName());
                         }
-                        mi.setIsCanonical (usedFieldNames);
+                        mi.setIsCanonical(usedFieldNames);
                     }
                 }
             }
@@ -920,9 +982,9 @@ public class JavaAdapterFactory {
         // superclass. For interfaces, we used Class.getMethods(), as we're only interested in public ones there, and
         // getMethods() does provide those declared in a superinterface.
         if (!type.isInterface()) {
-            final Class<?> superClass = type.getSuperclass();
-            if (superClass != null) {
-                gatherMethods(superClass);
+            final Class<?> superType = type.getSuperclass();
+            if (superType != null) {
+                gatherMethods(superType);
             }
             for (final Class<?> itf: type.getInterfaces()) {
                 gatherMethods(itf);
@@ -930,6 +992,12 @@ public class JavaAdapterFactory {
         }
     }
 
+    private void gatherMethods(final List<Class<?>> classes) {
+        for(final Class<?> c: classes) {
+            gatherMethods(c);
+        }
+    }
+
     /**
      * Creates a collection of methods that are not final, but we still never allow them to be overridden in adapters,
      * as explicitly declaring them automatically is a bad idea. Currently, this means {@code Object.finalize()} and
@@ -965,18 +1033,43 @@ public class JavaAdapterFactory {
     private static class AdapterInfo {
         final StaticClass adapterClass;
         final boolean autoConvertibleFromFunction;
-        final AdaptationOutcome adaptationOutcome;
+        final AnnotatedAdaptationOutcome adaptationOutcome;
 
         AdapterInfo(final StaticClass adapterClass, final boolean autoConvertibleFromFunction) {
             this.adapterClass = adapterClass;
             this.autoConvertibleFromFunction = autoConvertibleFromFunction;
-            this.adaptationOutcome = AdaptationOutcome.SUCCESS;
+            this.adaptationOutcome = AnnotatedAdaptationOutcome.SUCCESS;
         }
 
-        AdapterInfo(final AdaptationOutcome outcome) {
+        AdapterInfo(final AdaptationOutcome outcome, final String classList) {
+            this(new AnnotatedAdaptationOutcome(outcome, classList));
+        }
+
+        AdapterInfo(final AnnotatedAdaptationOutcome adaptationOutcome) {
             this.adapterClass = null;
             this.autoConvertibleFromFunction = false;
-            this.adaptationOutcome = outcome;
+            this.adaptationOutcome = adaptationOutcome;
+        }
+    }
+
+    /**
+     * An adaptation outcome accompanied with a name of a class (or a list of multiple class names) that are the reason
+     * an adapter could not be generated.
+     */
+    private static class AnnotatedAdaptationOutcome {
+        static final AnnotatedAdaptationOutcome SUCCESS = new AnnotatedAdaptationOutcome(AdaptationOutcome.SUCCESS, "");
+
+        private final AdaptationOutcome adaptationOutcome;
+        private final String classList;
+
+        AnnotatedAdaptationOutcome(final AdaptationOutcome adaptationOutcome, final String classList) {
+            this.adaptationOutcome = adaptationOutcome;
+            this.classList = classList;
+        }
+
+        void typeError() {
+            assert adaptationOutcome != AdaptationOutcome.SUCCESS;
+            ECMAErrors.typeError(Context.getGlobal(), "extend." + adaptationOutcome, classList);
         }
     }
 
@@ -985,19 +1078,32 @@ public class JavaAdapterFactory {
      * @param type the class for which the adapter is created
      * @return the adapter info for the class.
      */
-    private static AdapterInfo createAdapterInfo(final Class<?> type) {
-        final int mod = type.getModifiers();
-        if (Modifier.isFinal(mod)) {
-            return new AdapterInfo(AdaptationOutcome.ERROR_FINAL_CLASS);
-        }
-        if (!Modifier.isPublic(mod)) {
-            return new AdapterInfo(AdaptationOutcome.ERROR_NON_PUBLIC_CLASS);
+    private static AdapterInfo createAdapterInfo(final Class<?>[] types, final ClassAndLoader definingClassAndLoader) {
+        Class<?> superClass = null;
+        final List<Class<?>> interfaces = new ArrayList<>(types.length);
+        for(final Class<?> t: types) {
+            final int mod = t.getModifiers();
+            if(!t.isInterface()) {
+                if(superClass != null) {
+                    return new AdapterInfo(AdaptationOutcome.ERROR_MULTIPLE_SUPERCLASSES, t.getCanonicalName() + " and " + superClass.getCanonicalName());
+                }
+                if (Modifier.isFinal(mod)) {
+                    return new AdapterInfo(AdaptationOutcome.ERROR_FINAL_CLASS, t.getCanonicalName());
+                }
+                superClass = t;
+            } else {
+                interfaces.add(t);
+            }
+            if(!Modifier.isPublic(mod)) {
+                return new AdapterInfo(AdaptationOutcome.ERROR_NON_PUBLIC_CLASS, t.getCanonicalName());
+            }
         }
+        final Class<?> effectiveSuperClass = superClass == null ? Object.class : superClass;
         return AccessController.doPrivileged(new PrivilegedAction<AdapterInfo>() {
             @Override
             public AdapterInfo run() {
                 try {
-                    final JavaAdapterFactory factory = new JavaAdapterFactory(type);
+                    final JavaAdapterFactory factory = new JavaAdapterFactory(effectiveSuperClass, interfaces, definingClassAndLoader);
                     return new AdapterInfo(StaticClass.forClass(factory.generateClass()),
                             factory.isAutoConvertibleFromFunction());
                 } catch (final AdaptationException e) {
@@ -1009,9 +1115,9 @@ public class JavaAdapterFactory {
 
     @SuppressWarnings("serial")
     private static class AdaptationException extends Exception {
-        private final AdaptationOutcome outcome;
-        AdaptationException(final AdaptationOutcome outcome) {
-            this.outcome = outcome;
+        private final AnnotatedAdaptationOutcome outcome;
+        AdaptationException(final AdaptationOutcome outcome, final String classList) {
+            this.outcome = new AnnotatedAdaptationOutcome(outcome, classList);
         }
     }
 
@@ -1040,24 +1146,25 @@ public class JavaAdapterFactory {
     }
 
     /**
-     * Finds a class loader that sees both the specified class and Nashorn classes.
-     * @param clazz the class that needs to be visible from the found class loader.
+     * Choose between the passed class loader and the class loader that defines the ScriptObject class, based on which
+     * of the two can see the classes in both.
+     * @param classAndLoader the loader and a representative class from it that will be used to add the generated
+     * adapter to its ADAPTER_INFO_MAPS.
      * @return the class loader that sees both the specified class and Nashorn classes.
      * @throws IllegalStateException if no such class loader is found.
      */
-    private static ClassLoader findCommonLoader(final Class<?> clazz) {
-        final ClassLoader clazzLoader = clazz.getClassLoader();
-        if (canSeeClass(clazzLoader, ScriptObject.class)) {
-            return clazzLoader;
+    private static ClassLoader findCommonLoader(final ClassAndLoader classAndLoader) throws AdaptationException {
+        final ClassLoader loader = classAndLoader.getLoader();
+        if (canSeeClass(loader, ScriptObject.class)) {
+            return loader;
         }
 
         final ClassLoader nashornLoader = ScriptObject.class.getClassLoader();
-        if(canSeeClass(nashornLoader, clazz)) {
+        if(canSeeClass(nashornLoader, classAndLoader.clazz)) {
             return nashornLoader;
         }
 
-        throw new IllegalStateException("Can't find a common class loader for ScriptObject and " +
-                    clazz.getName());
+        throw new AdaptationException(AdaptationOutcome.ERROR_NO_COMMON_LOADER, classAndLoader.clazz.getCanonicalName());
     }
 
     private static boolean canSeeClass(final ClassLoader cl, final Class<?> clazz) {
@@ -1067,4 +1174,141 @@ public class JavaAdapterFactory {
             return false;
         }
     }
+
+    /**
+     * Given a list of types that define the superclass/interfaces for an adapter class, returns a single type from the
+     * list that will be used to attach the adapter to its ClassValue. The first type in the array that is defined in a
+     * class loader that can also see all other types is returned. If there is no such loader, an exception is thrown.
+     * @param types the input types
+     * @return the first type from the array that is defined in a class loader that can also see all other types.
+     */
+    private static ClassAndLoader getDefiningClassAndLoader(final Class<?>[] types) {
+        // Short circuit the cheap case
+        if(types.length == 1) {
+            return new ClassAndLoader(types[0], false);
+        }
+
+        return AccessController.doPrivileged(new PrivilegedAction<ClassAndLoader>() {
+            @Override
+            public ClassAndLoader run() {
+                return getDefiningClassAndLoaderPrivileged(types);
+            }
+        });
+    }
+
+    private static ClassAndLoader getDefiningClassAndLoaderPrivileged(final Class<?>[] types) {
+        final Collection<ClassAndLoader> maximumVisibilityLoaders = getMaximumVisibilityLoaders(types);
+
+        final Iterator<ClassAndLoader> it = maximumVisibilityLoaders.iterator();
+        if(maximumVisibilityLoaders.size() == 1) {
+            // Fortunate case - single maximally specific class loader; return its representative class.
+            return it.next();
+        }
+
+        // Ambiguity; throw an error.
+        assert maximumVisibilityLoaders.size() > 1; // basically, can't be zero
+        final StringBuilder b = new StringBuilder();
+        b.append(it.next().clazz.getCanonicalName());
+        while(it.hasNext()) {
+            b.append(", ").append(it.next().clazz.getCanonicalName());
+        }
+        typeError(Context.getGlobal(), "extend.ambiguous.defining.class", b.toString());
+        throw new AssertionError(); // never reached
+    }
+
+    /**
+     * Given an array of types, return a subset of their class loaders that are maximal according to the
+     * "can see other loaders' classes" relation, which is presumed to be a partial ordering.
+     * @param types types
+     * @return a collection of maximum visibility class loaders. It is guaranteed to have at least one element.
+     */
+    private static Collection<ClassAndLoader> getMaximumVisibilityLoaders(final Class<?>[] types) {
+        final List<ClassAndLoader> maximumVisibilityLoaders = new LinkedList<>();
+        outer:  for(final ClassAndLoader maxCandidate: getClassLoadersForTypes(types)) {
+            final Iterator<ClassAndLoader> it = maximumVisibilityLoaders.iterator();
+            while(it.hasNext()) {
+                final ClassAndLoader existingMax = it.next();
+                final boolean candidateSeesExisting = canSeeClass(maxCandidate.getRetrievedLoader(), existingMax.clazz);
+                final boolean exitingSeesCandidate = canSeeClass(existingMax.getRetrievedLoader(), maxCandidate.clazz);
+                if(candidateSeesExisting) {
+                    if(!exitingSeesCandidate) {
+                        // The candidate sees the the existing maximum, so drop the existing one as it's no longer maximal.
+                        it.remove();
+                    }
+                    // NOTE: there's also the anomalous case where both loaders see each other. Not sure what to do
+                    // about that one, as two distinct class loaders both seeing each other's classes is weird and
+                    // violates the assumption that the relation "sees others' classes" is a partial ordering. We'll
+                    // just not do anything, and treat them as incomparable; hopefully some later class loader that
+                    // comes along can eliminate both of them, if it can not, we'll end up with ambiguity anyway and
+                    // throw an error at the end.
+                } else if(exitingSeesCandidate) {
+                    // Existing sees the candidate, so drop the candidate.
+                    continue outer;
+                }
+            }
+            // If we get here, no existing maximum visibility loader could see the candidate, so the candidate is a new
+            // maximum.
+            maximumVisibilityLoaders.add(maxCandidate);
+        }
+        return maximumVisibilityLoaders;
+    }
+
+    private static Collection<ClassAndLoader> getClassLoadersForTypes(final Class<?>[] types) {
+        final Map<ClassAndLoader, ClassAndLoader> classesAndLoaders = new LinkedHashMap<>();
+        for(final Class<?> c: types) {
+            final ClassAndLoader cl = new ClassAndLoader(c, true);
+            if(!classesAndLoaders.containsKey(cl)) {
+                classesAndLoaders.put(cl, cl);
+            }
+        }
+        return classesAndLoaders.keySet();
+    }
+
+    /**
+     * A tuple of a class loader and a single class representative of the classes that can be loaded through it. Its
+     * equals/hashCode is defined in terms of the identity of the class loader.
+     */
+    private static final class ClassAndLoader {
+        private final Class<?> clazz;
+        // Don't access this directly; most of the time, use getRetrievedLoader(), or if you know what you're doing,
+        // getLoader().
+        private ClassLoader loader;
+        // We have mild affinity against eagerly retrieving the loader, as we need to do it in a privileged block. For
+        // the most basic case of looking up an already-generated adapter info for a single type, we avoid it.
+        private boolean loaderRetrieved;
+
+        ClassAndLoader(final Class<?> clazz, final boolean retrieveLoader) {
+            this.clazz = clazz;
+            if(retrieveLoader) {
+                retrieveLoader();
+            }
+        }
+
+        ClassLoader getLoader() {
+            if(!loaderRetrieved) {
+                retrieveLoader();
+            }
+            return getRetrievedLoader();
+        }
+
+        ClassLoader getRetrievedLoader() {
+            assert loaderRetrieved;
+            return loader;
+        }
+
+        private void retrieveLoader() {
+            loader = clazz.getClassLoader();
+            loaderRetrieved = true;
+        }
+
+        @Override
+        public boolean equals(final Object obj) {
+            return obj instanceof ClassAndLoader && ((ClassAndLoader)obj).getRetrievedLoader() == getRetrievedLoader();
+        }
+
+        @Override
+        public int hashCode() {
+            return System.identityHashCode(getRetrievedLoader());
+        }
+    }
 }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java
index a4acc68fae7..bc9bf422e3c 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java
@@ -94,7 +94,7 @@ class NashornPrimitiveLinker implements TypeBasedGuardingDynamicLinker, Guarding
                 if (JavaAdapterFactory.isAbstractClass(receiverClass)) {
                     // Change this link request into a link request on the adapter class.
                     final Object[] args = request.getArguments();
-                    args[0] = JavaAdapterFactory.getAdapterClassFor(receiverClass);
+                    args[0] = JavaAdapterFactory.getAdapterClassFor(new Class<?>[] { receiverClass });
                     final LinkRequest adapterRequest = request.replaceArguments(request.getCallSiteDescriptor(), args);
                     final GuardedInvocation gi = checkNullConstructor(
                             staticClassLinker.getGuardedInvocation(adapterRequest, linkerServices), receiverClass);
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/Messages.properties b/nashorn/src/jdk/nashorn/internal/runtime/resources/Messages.properties
index 70cd1554a75..5d3162552cd 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/resources/Messages.properties
+++ b/nashorn/src/jdk/nashorn/internal/runtime/resources/Messages.properties
@@ -110,10 +110,14 @@ type.error.cant.convert.number.to.char=Cannot convert number to character; it's
 type.error.cant.convert.to.java.string=Cannot convert object of type {0} to a Java argument of string type
 type.error.cant.convert.to.java.number=Cannot convert object of type {0} to a Java argument of number type
 type.error.cant.convert.to.javascript.array=Can only convert Java arrays and lists to JavaScript arrays. Can't convert object of type {0}.
-type.error.extend.expects.java.type=Java.extend needs a Java type as its argument.
+type.error.extend.expects.at.least.one.argument=Java.extend needs at least one argument.
+type.error.extend.expects.java.types=Java.extend needs Java types as its arguments.
+type.error.extend.ambiguous.defining.class=There is no class loader that can see all of {0} at once.
 type.error.extend.ERROR_FINAL_CLASS=Can not extend final class {0}.
 type.error.extend.ERROR_NON_PUBLIC_CLASS=Can not extend/implement non-public class/interface {0}.
 type.error.extend.ERROR_NO_ACCESSIBLE_CONSTRUCTOR=Can not extend class {0} as it has no public or protected constructors.
+type.error.extend.ERROR_MULTIPLE_SUPERCLASSES=Can not extend multiple classes {0}. At most one of the specified types can be a class, the rest must all be interfaces.
+type.error.extend.ERROR_NO_COMMON_LOADER=Can not find a common class loader for ScriptObject and {0}.
 type.error.no.constructor.matches.args=Can not construct {0} with the passed arguments; they do not match any of its constructor signatures.
 type.error.no.method.matches.args=Can not invoke method {0} with the passed arguments; they do not match any of its method signatures.
 type.error.method.not.constructor=Java method {0} can't be used as a constructor.
diff --git a/nashorn/test/script/sandbox/javaextend.js b/nashorn/test/script/sandbox/javaextend.js
index 290f87372b1..318a679417f 100644
--- a/nashorn/test/script/sandbox/javaextend.js
+++ b/nashorn/test/script/sandbox/javaextend.js
@@ -51,6 +51,13 @@ try {
     print(e)
 }
 
+// Can't extend two classes
+try {
+    Java.extend(java.lang.Thread,java.lang.Number)
+} catch(e) {
+    print(e)
+}
+
 // Make sure we can implement interfaces from the unnamed package
 var c = new (Java.extend(Java.type("UnnamedPackageTestCallback")))() { call: function(s) { return s + s } }
 print(c.call("abcd"))
@@ -104,3 +111,22 @@ cwa.doSomething()
 // Do the same thing with proprietary syntax and object literal
 var cwa2 = new (model("ConstructorWithArgument"))("cwa2-token") { doSomething: function() { print("cwa2-" + cwa2.token ) } }
 cwa2.doSomething()
+
+// Implement two interfaces
+var desertToppingAndFloorWax = new (Java.extend(model("DessertTopping"), model("FloorWax"))) {
+    pourOnDessert: function() { print("Glop; IM IN UR DESSERT NOW") },
+    shineUpTheFloor: function() { print("The floor sure is shining!") }
+}
+var dtfwDriver = new (model("DessertToppingFloorWaxDriver"))
+dtfwDriver.decorateDessert(desertToppingAndFloorWax)
+dtfwDriver.waxFloor(desertToppingAndFloorWax)
+
+// Extend a class and implement two interfaces. For additional measure, put the class in between the two interfaces
+var desertToppingFloorWaxAndToothpaste = new (Java.extend(model("DessertTopping"), model("Toothpaste"), model("FloorWax"))) {
+    pourOnDessert: function() { print("Yum") },
+    shineUpTheFloor: function() { print("Scrub, scrub, scrub") },
+    applyToBrushImpl: function() { print("It's a dessert topping! It's a floor wax! It's a toothpaste!") }
+}
+dtfwDriver.decorateDessert(desertToppingFloorWaxAndToothpaste)
+dtfwDriver.waxFloor(desertToppingFloorWaxAndToothpaste)
+desertToppingFloorWaxAndToothpaste.applyToBrush();
diff --git a/nashorn/test/script/sandbox/javaextend.js.EXPECTED b/nashorn/test/script/sandbox/javaextend.js.EXPECTED
index 0cb4b3d0516..2a5ad63a5e1 100644
--- a/nashorn/test/script/sandbox/javaextend.js.EXPECTED
+++ b/nashorn/test/script/sandbox/javaextend.js.EXPECTED
@@ -1,6 +1,7 @@
 TypeError: Can not extend final class jdk.nashorn.internal.test.models.FinalClass.
 TypeError: Can not extend class jdk.nashorn.internal.test.models.NoAccessibleConstructorClass as it has no public or protected constructors.
 TypeError: Can not extend/implement non-public class/interface jdk.nashorn.internal.test.models.NonPublicClass.
+TypeError: Can not extend multiple classes java.lang.Number and java.lang.Thread. At most one of the specified types can be a class, the rest must all be interfaces.
 abcdabcd
 run-object
 run-fn
@@ -18,3 +19,8 @@ oo-proto-overridden-toString: override-object
 oo-proto-overridden-equals  : true
 cwa-token
 cwa2-cwa2-token
+Glop; IM IN UR DESSERT NOW
+The floor sure is shining!
+Yum
+Scrub, scrub, scrub
+It's a dessert topping! It's a floor wax! It's a toothpaste!
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/models/DessertTopping.java b/nashorn/test/src/jdk/nashorn/internal/test/models/DessertTopping.java
new file mode 100644
index 00000000000..8427c837548
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/test/models/DessertTopping.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.test.models;
+
+public interface DessertTopping {
+    public String pourOnDessert();
+}
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/models/DessertToppingFloorWaxDriver.java b/nashorn/test/src/jdk/nashorn/internal/test/models/DessertToppingFloorWaxDriver.java
new file mode 100644
index 00000000000..dc04a0d1059
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/test/models/DessertToppingFloorWaxDriver.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.test.models;
+
+public class DessertToppingFloorWaxDriver {
+    public void decorateDessert(DessertTopping dt) {
+        dt.pourOnDessert();
+    }
+
+    public void waxFloor(FloorWax fw) {
+        fw.shineUpTheFloor();
+    }
+}
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/models/FloorWax.java b/nashorn/test/src/jdk/nashorn/internal/test/models/FloorWax.java
new file mode 100644
index 00000000000..c094ccf65a1
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/test/models/FloorWax.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.test.models;
+
+public interface FloorWax {
+    public String shineUpTheFloor();
+}
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/models/Toothpaste.java b/nashorn/test/src/jdk/nashorn/internal/test/models/Toothpaste.java
new file mode 100644
index 00000000000..0946eb35078
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/test/models/Toothpaste.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.test.models;
+
+public abstract class Toothpaste {
+    public void applyToBrush() {
+        applyToBrushImpl();
+    }
+
+    protected abstract void applyToBrushImpl();
+}

From 246e4e8daf62df4765c95847c3d5dec4a51a4cbe Mon Sep 17 00:00:00 2001
From: Andreas Rieber <rieberandreas@gmail.com>
Date: Mon, 14 Jan 2013 21:30:13 +0530
Subject: [PATCH 066/311] 8006181: nashorn script engine does not run
 jrunscript's initialization script

Reviewed-by: lagergren, jlaskey
---
 .../jdk/nashorn/api/scripting/Formatter.java  | 180 ++++
 .../api/scripting/NashornScriptEngine.java    |  21 +-
 .../nashorn/api/scripting/resources/engine.js |   8 +-
 .../nashorn/api/scripting/resources/init.js   | 940 ++++++++++++++++++
 4 files changed, 1139 insertions(+), 10 deletions(-)
 create mode 100644 nashorn/src/jdk/nashorn/api/scripting/Formatter.java
 create mode 100644 nashorn/src/jdk/nashorn/api/scripting/resources/init.js

diff --git a/nashorn/src/jdk/nashorn/api/scripting/Formatter.java b/nashorn/src/jdk/nashorn/api/scripting/Formatter.java
new file mode 100644
index 00000000000..12e7cb18aa0
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/api/scripting/Formatter.java
@@ -0,0 +1,180 @@
+/*
+ * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.api.scripting;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Formatter is a class to get the type conversion between javascript types and
+ * java types for the format (sprintf) method working.
+ *
+ * <p>In javascript the type for numbers can be different from the format type
+ * specifier. For format type '%d', '%o', '%x', '%X' double need to be
+ * converted to integer. For format type 'e', 'E', 'f', 'g', 'G', 'a', 'A'
+ * integer needs to be converted to double.
+ *
+ * <p>Format type "%c" and javascript string needs special handling.
+ *
+ * <p>The javascript date objects can be handled if they are type double (the
+ * related javascript code will convert with Date.getTime() to double). So
+ * double date types are converted to long.
+ *
+ * <p>Pattern and the logic for parameter position: java.util.Formatter
+ *
+ */
+public final class Formatter {
+
+    /**
+     * Method which converts javascript types to java types for the
+     * String.format method (jrunscript function sprintf).
+     *
+     * @param format a format string
+     * @param args arguments referenced by the format specifiers in format
+     * @return a formatted string
+     */
+    public static String format(final String format, final Object[] args) {
+        Matcher m = FS_PATTERN.matcher(format);
+        int positionalParameter = 1;
+
+        while (m.find()) {
+            int index = index(m.group(1));
+            boolean previous = isPreviousArgument(m.group(2));
+            char conversion = m.group(6).charAt(0);
+
+            // skip over some formats
+            if (index < 0 || previous
+                    || conversion == 'n' || conversion == '%') {
+                continue;
+            }
+
+            // index 0 here means take a positional parameter
+            if (index == 0) {
+                index = positionalParameter++;
+            }
+
+            // out of index, String.format will handle
+            if (index > args.length) {
+                continue;
+            }
+
+            // current argument
+            Object arg = args[index - 1];
+
+            // for date we convert double to long
+            if (m.group(5) != null) {
+                // convert double to long
+                if (arg instanceof Double) {
+                    args[index - 1] = ((Double) arg).longValue();
+                }
+            } else {
+                // we have to convert some types
+                switch (conversion) {
+                    case 'd':
+                    case 'o':
+                    case 'x':
+                    case 'X':
+                        if (arg instanceof Double) {
+                            // convert double to long
+                            args[index - 1] = ((Double) arg).longValue();
+                        } else if (arg instanceof String
+                                && ((String) arg).length() > 0) {
+                            // convert string (first character) to int
+                            args[index - 1] = (int) ((String) arg).charAt(0);
+                        }
+                        break;
+                    case 'e':
+                    case 'E':
+                    case 'f':
+                    case 'g':
+                    case 'G':
+                    case 'a':
+                    case 'A':
+                        if (arg instanceof Integer) {
+                            // convert integer to double
+                            args[index - 1] = ((Integer) arg).doubleValue();
+                        }
+                        break;
+                    case 'c':
+                        if (arg instanceof Double) {
+                            // convert double to integer
+                            args[index - 1] = ((Double) arg).intValue();
+                        } else if (arg instanceof String
+                                && ((String) arg).length() > 0) {
+                            // get the first character from string
+                            args[index - 1] = (int) ((String) arg).charAt(0);
+                        }
+                        break;
+                    default:
+                        break;
+                }
+            }
+        }
+
+        return String.format(format, args);
+    }
+
+    /**
+     * Method to parse the integer of the argument index.
+     *
+     * @param s
+     * @return -1 if parsing failed, 0 if string is null, > 0 integer
+     */
+    private static int index(final String s) {
+        int index = -1;
+
+        if (s != null) {
+            try {
+                index = Integer.parseInt(s.substring(0, s.length() - 1));
+            } catch (NumberFormatException e) { }
+        } else {
+            index = 0;
+        }
+
+        return index;
+    }
+
+    /**
+     * Method to check if a string contains '&lt;'. This is used to find out if
+     * previous parameter is used.
+     *
+     * @param s
+     * @return true if '&lt;' is in the string, else false
+     */
+    private static boolean isPreviousArgument(final String s) {
+        return (s != null && s.indexOf('<') >= 0) ? true : false;
+    }
+
+    // %[argument_index$][flags][width][.precision][t]conversion
+    private static final String formatSpecifier =
+            "%(\\d+\\$)?([-#+ 0,(\\<]*)?(\\d+)?(\\.\\d+)?([tT])?([a-zA-Z%])";
+    // compiled format string
+    private static final Pattern FS_PATTERN;
+
+    static {
+        FS_PATTERN = Pattern.compile(formatSpecifier);
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
index 112f4df5b09..27ccb9e4772 100644
--- a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
+++ b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
@@ -327,7 +327,11 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
     }
 
     private void evalEngineScript() throws ScriptException {
-        final URL url = NashornScriptEngine.class.getResource("resources/engine.js");
+        evalSupportScript("resources/engine.js");
+    }
+
+    private void evalSupportScript(String script) throws ScriptException {
+        final URL url = NashornScriptEngine.class.getResource(script);
         try {
             final InputStream is = url.openStream();
             put(ScriptEngine.FILENAME, url);
@@ -435,6 +439,16 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
             }
 
             setContextVariables(ctxt);
+            final Object val = ctxt.getAttribute(ScriptEngine.FILENAME);
+            final String fileName = (val != null) ? val.toString() : "<eval>";
+
+            // NOTE: FIXME: If this is jrunscript's init.js, we want to run the replacement.
+            // This should go away once we fix jrunscript's copy of init.js.
+            if ("<system-init>".equals(fileName)) {
+                evalSupportScript("resources/init.js");
+                return null;
+            }
+
             Object res = ScriptRuntime.apply(script, global);
             res = ScriptObjectMirror.wrap(res, global);
             return (res == UNDEFINED) ? null : res;
@@ -486,11 +500,6 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
             final Object val = ctxt.getAttribute(ScriptEngine.FILENAME);
             final String fileName = (val != null) ? val.toString() : "<eval>";
 
-            // !!HACK!! do not evaluate "init.js" from jrunscript tool!!
-            if ("<system-init>".equals(fileName)) {
-                return null;
-            }
-
             final Source source = new Source(fileName, buf);
             if (globalChanged) {
                 setNashornGlobal(global);
diff --git a/nashorn/src/jdk/nashorn/api/scripting/resources/engine.js b/nashorn/src/jdk/nashorn/api/scripting/resources/engine.js
index 2aba16fcda0..b71f5243713 100644
--- a/nashorn/src/jdk/nashorn/api/scripting/resources/engine.js
+++ b/nashorn/src/jdk/nashorn/api/scripting/resources/engine.js
@@ -1,21 +1,21 @@
 /*
  * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.
- * 
+ *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * version 2 for more details (a copy is included in the LICENSE file that
  * accompanied this code).
- * 
+ *
  * You should have received a copy of the GNU General Public License version
  * 2 along with this work; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- * 
+ *
  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  * or visit www.oracle.com if you need additional information or have any
  * questions.
diff --git a/nashorn/src/jdk/nashorn/api/scripting/resources/init.js b/nashorn/src/jdk/nashorn/api/scripting/resources/init.js
new file mode 100644
index 00000000000..9a4935f407e
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/api/scripting/resources/init.js
@@ -0,0 +1,940 @@
+/*
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * jrunscript JavaScript built-in functions and objects.
+ */
+
+/**
+ * Creates an object that delegates all method calls on
+ * it to the 'invoke' method on the given delegate object.<br>
+ *
+ * Example:
+ * <pre>
+ * <code>
+ *     var x  = { invoke: function(name, args) { //code...}
+ *     var y = new JSInvoker(x);
+ *     y.func(3, 3); // calls x.invoke('func', args); where args is array of arguments
+ * </code>
+ * </pre>
+ * @param obj object to be wrapped by JSInvoker
+ * @constructor
+ */
+function JSInvoker(obj) {
+    return new JSAdapter({
+        __get__ : function(name) {
+            return function() {
+                return obj.invoke(name, arguments);
+            }
+        }
+    });
+}
+
+/**
+ * This variable represents OS environment. Environment
+ * variables can be accessed as fields of this object. For
+ * example, env.PATH will return PATH value configured.
+ */
+var env = new JSAdapter({
+    __get__ : function (name) {
+        return java.lang.System.getenv(name);
+    },
+    __has__ : function (name) {
+        return java.lang.System.getenv().containsKey(name);
+    },
+    __getIds__ : function() {
+        return java.lang.System.getenv().keySet().toArray();
+    },
+    __delete__ : function(name) {
+        println("can't delete env item");
+    },
+    __put__ : function (name, value) {
+        println("can't change env item");
+    },
+    toString: function() {
+        return java.lang.System.getenv().toString();
+    }
+});
+
+/**
+ * Creates a convenient script object to deal with java.util.Map instances.
+ * The result script object's field names are keys of the Map. For example,
+ * scriptObj.keyName can be used to access value associated with given key.<br>
+ * Example:
+ * <pre>
+ * <code>
+ *     var x = java.lang.SystemProperties();
+ *     var y = jmap(x);
+ *     println(y['java.class.path']); // prints java.class.path System property
+ *     delete y['java.class.path']; // remove java.class.path System property
+ * </code>
+ * </pre>
+ *
+ * @param map java.util.Map instance that will be wrapped
+ * @constructor
+ */
+function jmap(map) {
+    return new JSAdapter({
+        __get__ : function(name) {
+            if (map.containsKey(name)) {
+                return map.get(name);
+            } else {
+                return undefined;
+            }
+        },
+        __has__ :  function(name) {
+            return map.containsKey(name);
+        },
+
+        __delete__ : function (name) {
+            return map.remove(name);
+        },
+        __put__ : function(name, value) {
+            map.put(name, value);
+        },
+        __getIds__ : function() {
+            return map.keySet().toArray();
+        },
+        toString: function() {
+            return map.toString();
+        } 
+    });
+}
+
+/**
+ * Creates a convenient script object to deal with java.util.List instances.
+ * The result script object behaves like an array. For example,
+ * scriptObj[index] syntax can be used to access values in the List instance.
+ * 'length' field gives size of the List. <br>
+ *
+ * Example:
+ * <pre>
+ * <code>
+ *    var x = new java.util.ArrayList(4);
+ *    x.add('Java');
+ *    x.add('JavaScript');
+ *    x.add('SQL');
+ *    x.add('XML');
+ *
+ *    var y = jlist(x);
+ *    println(y[2]); // prints third element of list
+ *    println(y.length); // prints size of the list
+ *
+ * @param map java.util.List instance that will be wrapped
+ * @constructor
+ */
+function jlist(list) {
+    function isValid(index) {
+        return typeof(index) == 'number' &&
+            index > -1 && index < list.size();
+    }
+    return new JSAdapter({
+        __get__ :  function(name) {
+            if (isValid(name)) {
+                return list.get(name);
+            } else if (name == 'length') {
+                return list.size();
+            } else {
+                return undefined;
+            }
+        },
+        __has__ : function (name) {
+            return isValid(name) || name == 'length';
+        },
+        __delete__ : function(name) {
+            if (isValid(name)) {
+                list.remove(name);
+            }
+        },
+        __put__ : function(name, value) {
+            if (isValid(name)) {
+                list.set(name, value);
+            }
+        },
+        __getIds__: function() {
+            var res = new Array(list.size());
+            for (var i = 0; i < res.length; i++) {
+                res[i] = i;
+            }
+            return res;
+        },
+        toString: function() {
+            return list.toString();
+        }
+    });
+}
+
+/**
+ * This is java.lang.System properties wrapped by jmap.
+ * For eg. to access java.class.path property, you can use
+ * the syntax sysProps["java.class.path"]
+ */
+var sysProps = jmap(java.lang.System.getProperties());
+
+// stdout, stderr & stdin
+var out = java.lang.System.out;
+var err = java.lang.System.err;
+// can't use 'in' because it is a JavaScript keyword :-(
+var inp = java.lang.System["in"];
+
+var BufferedInputStream = java.io.BufferedInputStream;
+var BufferedOutputStream = java.io.BufferedOutputStream;
+var BufferedReader = java.io.BufferedReader;
+var DataInputStream = java.io.DataInputStream;
+var File = java.io.File;
+var FileInputStream = java.io.FileInputStream;
+var FileOutputStream = java.io.FileOutputStream;
+var InputStream = java.io.InputStream;
+var InputStreamReader = java.io.InputStreamReader;
+var OutputStream = java.io.OutputStream;
+var Reader = java.io.Reader;
+var URL = java.net.URL;
+
+/**
+ * Generic any object to input stream mapper
+ * @param str input file name, URL or InputStream
+ * @return InputStream object
+ * @private
+ */
+function inStream(str) {
+    if (typeof(str) == "string") {
+        // '-' means standard input
+        if (str == '-') {
+            return java.lang.System["in"];
+        }
+        // try file first
+        var file = null;
+        try {
+            file = pathToFile(str);
+        } catch (e) {
+        }
+        if (file && file.exists()) {
+            return new FileInputStream(file);
+        } else {
+            try {
+                // treat the string as URL
+                return new URL(str).openStream();
+            } catch (e) {
+                throw 'file or URL ' + str + ' not found';
+            }
+        }
+    } else {
+        if (str instanceof InputStream) {
+            return str;
+        } else if (str instanceof URL) {
+            return str.openStream();
+        } else if (str instanceof File) {
+            return new FileInputStream(str);
+        }
+    }
+    // everything failed, just give input stream
+    return java.lang.System["in"];
+}
+
+/**
+ * Generic any object to output stream mapper
+ *
+ * @param out output file name or stream
+ * @return OutputStream object
+ * @private
+ */
+function outStream(out) {
+    if (typeof(out) == "string") {
+        if (out == '>') {
+            return java.lang.System.out;
+        } else {
+            // treat it as file
+            return new FileOutputStream(pathToFile(out));
+        }
+    } else {
+        if (out instanceof OutputStream) {
+            return out;
+        } else if (out instanceof File) {
+            return new FileOutputStream(out);
+        }
+    }
+
+    // everything failed, just return System.out
+    return java.lang.System.out;
+}
+
+/**
+ * stream close takes care not to close stdin, out & err.
+ * @private
+ */
+function streamClose(stream) {
+    if (stream) {
+        if (stream != java.lang.System["in"] &&
+            stream != java.lang.System.out &&
+            stream != java.lang.System.err) {
+            try {
+                stream.close();
+            } catch (e) {
+                println(e);
+            }
+        }
+    }
+}
+
+/**
+ * Loads and evaluates JavaScript code from a stream or file or URL<br>
+ *
+ * Examples:
+ * <pre>
+ * <code>
+ *    load('test.js'); // load script file 'test.js'
+ *    load('http://java.sun.com/foo.js'); // load from a URL
+ * </code>
+ * </pre>
+ *
+ * @param str input from which script is loaded and evaluated
+ */
+if (typeof(load) == 'undefined') {
+    var load = function(str) {
+        var stream = inStream(str);
+        var bstream = new BufferedInputStream(stream);
+        var reader = new BufferedReader(new InputStreamReader(bstream));
+        var oldFilename = engine.get(engine.FILENAME);
+        engine.put(engine.FILENAME, str);
+        try {
+            engine.eval(reader);
+        } finally {
+            engine.put(engine.FILENAME, oldFilename);
+            streamClose(stream);
+        }
+    }
+}
+
+// file system utilities
+
+/**
+ * Creates a Java byte[] of given length
+ * @param len size of the array to create
+ * @private
+ */
+function javaByteArray(len) {
+    return java.lang.reflect.Array.newInstance(java.lang.Byte.TYPE, len);
+}
+
+var curDir = new File('.');
+
+/**
+ * Print present working directory
+ */
+function pwd() {
+    println(curDir.getAbsolutePath());
+}
+
+/**
+ * Changes present working directory to given directory
+ * @param target directory to change to. optional, defaults to user's HOME
+ */
+function cd(target) {
+    if (target == undefined) {
+        target = sysProps["user.home"];
+    }
+    if (!(target instanceof File)) {
+        target = pathToFile(target);
+    }
+    if (target.exists() && target.isDirectory()) {
+        curDir = target;
+    } else {
+        println(target + " is not a directory");
+    }
+}
+
+/**
+ * Converts path to java.io.File taking care of shell present working dir
+ *
+ * @param pathname file path to be converted
+ * @private
+ */
+function pathToFile(pathname) {
+    var tmp = pathname;
+    if (!(tmp instanceof File)) {
+        tmp = new File(tmp);
+    }
+    if (!tmp.isAbsolute()) {
+        return new File(curDir, pathname);
+    } else {
+        return tmp;
+    }
+}
+
+/**
+ * Copies a file or URL or stream to another file or stream
+ *
+ * @param from input file or URL or stream
+ * @param to output stream or file
+ */
+function cp(from, to) {
+    if (from == to) {
+        println("file " + from + " cannot be copied onto itself!");
+        return;
+    }
+    var inp = inStream(from);
+    var out = outStream(to);
+    var binp = new BufferedInputStream(inp);
+    var bout = new BufferedOutputStream(out);
+    var buff = javaByteArray(1024);
+    var len;
+    while ((len = binp.read(buff)) > 0 )
+        bout.write(buff, 0, len);
+
+    bout.flush();
+    streamClose(inp);
+    streamClose(out);
+}
+
+/**
+ * Shows the content of a file or URL or any InputStream<br>
+ * Examples:
+ * <pre>
+ * <code>
+ *    cat('test.txt'); // show test.txt file contents
+ *    cat('http://java.net'); // show the contents from the URL http://java.net
+ * </code>
+ * </pre>
+ * @param obj input to show
+ * @param pattern optional. show only the lines matching the pattern
+ */
+function cat(obj, pattern) {
+    if (obj instanceof File && obj.isDirectory()) {
+        ls(obj);
+        return;
+    }
+
+    var inp = null;
+    if (!(obj instanceof Reader)) {
+        inp = inStream(obj);
+        obj = new BufferedReader(new InputStreamReader(inp));
+    }
+    var line;
+    if (pattern) {
+        var count = 1;
+        while ((line=obj.readLine()) != null) {
+            if (line.match(pattern)) {
+                println(count + "\t: " + line);
+            }
+            count++;
+        }
+    } else {
+        while ((line=obj.readLine()) != null) {
+            println(line);
+        }
+    }
+}
+
+/**
+ * Returns directory part of a filename
+ *
+ * @param pathname input path name
+ * @return directory part of the given file name
+ */
+function dirname(pathname) {
+    var dirName = ".";
+    // Normalize '/' to local file separator before work.
+    var i = pathname.replace('/', File.separatorChar ).lastIndexOf(
+        File.separator );
+    if ( i != -1 )
+        dirName = pathname.substring(0, i);
+    return dirName;
+}
+
+/**
+ * Creates a new dir of given name
+ *
+ * @param dir name of the new directory
+ */
+function mkdir(dir) {
+    dir = pathToFile(dir);
+    println(dir.mkdir()? "created" : "can not create dir");
+}
+
+/**
+ * Creates the directory named by given pathname, including
+ * any necessary but nonexistent parent directories.
+ *
+ * @param dir input path name
+ */
+function mkdirs(dir) {
+    dir = pathToFile(dir);
+    println(dir.mkdirs()? "created" : "can not create dirs");
+}
+
+/**
+ * Removes a given file
+ *
+ * @param pathname name of the file
+ */
+function rm(pathname) {
+    var file = pathToFile(pathname);
+    if (!file.exists()) {
+        println("file not found: " + pathname);
+        return false;
+    }
+    // note that delete is a keyword in JavaScript!
+    println(file["delete"]()? "deleted" : "can not delete");
+}
+
+/**
+ * Removes a given directory
+ *
+ * @param pathname name of the directory
+ */
+function rmdir(pathname) {
+    rm(pathname);
+}
+
+/**
+ * Synonym for 'rm'
+ */
+function del(pathname) {
+    rm(pathname);
+}
+
+/**
+ * Moves a file to another
+ *
+ * @param from original name of the file
+ * @param to new name for the file
+ */
+function mv(from, to) {
+    println(pathToFile(from).renameTo(pathToFile(to))?
+        "moved" : "can not move");
+}
+
+/**
+ * Synonym for 'mv'.
+ */
+function ren(from, to) {
+    mv(from, to);
+}
+
+var months = [ "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+        "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" ];
+
+/**
+ * Helper function called by ls
+ * @private
+ */
+function printFile(f) {
+    var sb = new java.lang.StringBuffer();
+    sb.append(f.isDirectory()? "d" : "-");
+    sb.append(f.canRead() ? "r": "-" );
+    sb.append(f.canWrite() ? "w": "-" );
+    sb.append(" ");
+
+    var d = new java.util.Date(f.lastModified());
+    var c = new java.util.GregorianCalendar();
+    c.setTime(d);
+    var day    = c.get(java.util.Calendar.DAY_OF_MONTH);
+    sb.append(months[c.get(java.util.Calendar.MONTH)]
+         + " " + day );
+    if (day < 10) {
+        sb.append(" ");
+    }
+
+    // to get fixed length 'length' field
+    var fieldlen = 8;
+    var len = new java.lang.StringBuffer();
+    for(var j=0; j<fieldlen; j++)
+        len.append(" ");
+    len.insert(0, java.lang.Long.toString(f.length()));
+    len.setLength(fieldlen);
+    // move the spaces to the front
+    var si = len.toString().indexOf(" ");
+    if ( si != -1 ) {
+        var pad = len.toString().substring(si);
+        len.setLength(si);
+        len.insert(0, pad);
+    }
+    sb.append(len.toString());
+    sb.append(" ");
+    sb.append(f.getName());
+    if (f.isDirectory()) {
+        sb.append('/');
+    }
+    println(sb.toString());
+}
+
+/**
+ * Lists the files in a directory
+ *
+ * @param dir directory from which to list the files. optional, default to pwd
+ * @param filter pattern to filter the files listed. optional, default is '.'.
+ */
+function ls(dir, filter) {
+    if (dir) {
+        dir = pathToFile(dir);
+    } else {
+        dir = curDir;
+    }
+    if (dir.isDirectory()) {
+        var files = dir.listFiles();
+        for (var i in files) {
+            var f = files[i];
+            if (filter) {
+                if(!f.getName().match(filter)) {
+                    continue;
+                }
+            }
+            printFile(f);
+        }
+    } else {
+        printFile(dir);
+    }
+}
+
+/**
+ * Synonym for 'ls'.
+ */
+function dir(d, filter) {
+    ls(d, filter);
+}
+
+/**
+ * Unix-like grep, but accepts JavaScript regex patterns
+ *
+ * @param pattern to search in files
+ * @param files one or more files
+ */
+function grep(pattern, files /*, one or more files */) {
+    if (arguments.length < 2) return;
+    for (var i = 1; i < arguments.length; i++) {
+        println(arguments[i] + ":");
+        cat(arguments[i], pattern);
+    }
+}
+
+/**
+ * Find in files. Calls arbitrary callback function
+ * for each matching file.<br>
+ *
+ * Examples:
+ * <pre>
+ * <code>
+ *    find('.')
+ *    find('.', '.*\.class', rm);  // remove all .class files
+ *    find('.', '.*\.java');       // print fullpath of each .java file
+ *    find('.', '.*\.java', cat);  // print all .java files
+ * </code>
+ * </pre>
+ *
+ * @param dir directory to search files
+ * @param pattern to search in the files
+ * @param callback function to call for matching files
+ */
+function find(dir, pattern, callback) {
+    dir = pathToFile(dir);
+    if (!callback) callback = print;
+    var files = dir.listFiles();
+    for (var f in files) {
+        var file = files[f];
+        if (file.isDirectory()) {
+            find(file, pattern, callback);
+        } else {
+            if (pattern) {
+                if (file.getName().match(pattern)) {
+                    callback(file);
+                }
+            } else {
+                callback(file);
+            }
+        }
+    }
+}
+
+// process utilities
+
+/**
+ * Exec's a child process, waits for completion &amp; returns exit code
+ *
+ * @param cmd command to execute in child process
+ */
+function exec(cmd) {
+    var process = java.lang.Runtime.getRuntime().exec(cmd);
+    var inp = new DataInputStream(process.getInputStream());
+    var line = null;
+    while ((line = inp.readLine()) != null) {
+        println(line);
+    }
+    process.waitFor();
+    $exit = process.exitValue();
+}
+
+/**
+ * Exit the shell program.
+ *
+ * @param exitCode integer code returned to OS shell.
+ * optional, defaults to 0
+ */
+function exit(code) {
+    if (code) {
+        java.lang.System.exit(code + 0);
+    } else {
+        java.lang.System.exit(0);
+    }
+}
+
+/**
+ * synonym for exit
+ */
+function quit(code) {
+    exit(code);
+}
+
+// XML utilities
+
+/**
+ * Converts input to DOM Document object
+ *
+ * @param inp file or reader. optional, without this param,
+ * this function returns a new DOM Document.
+ * @return returns a DOM Document object
+ */
+function XMLDocument(inp) {
+    var factory = javax.xml.parsers.DocumentBuilderFactory.newInstance();
+    var builder = factory.newDocumentBuilder();
+    if (inp) {
+        if (typeof(inp) == "string") {
+            return builder.parse(pathToFile(inp));
+        } else {
+            return builder.parse(inp);
+        }
+    } else {
+        return builder.newDocument();
+    }
+}
+
+/**
+ * Converts arbitrary stream, file, URL to XMLSource
+ *
+ * @param inp input stream or file or URL
+ * @return XMLSource object
+ */
+function XMLSource(inp) {
+    if (inp instanceof javax.xml.transform.Source) {
+        return inp;
+    } else if (inp instanceof Packages.org.w3c.dom.Document) {
+        return new javax.xml.transform.dom.DOMSource(inp);
+    } else {
+        inp = new BufferedInputStream(inStream(inp));
+        return new javax.xml.transform.stream.StreamSource(inp);
+    }
+}
+
+/**
+ * Converts arbitrary stream, file to XMLResult
+ *
+ * @param inp output stream or file
+ * @return XMLResult object
+ */
+function XMLResult(out) {
+    if (out instanceof javax.xml.transform.Result) {
+        return out;
+    } else if (out instanceof Packages.org.w3c.dom.Document) {
+        return new javax.xml.transform.dom.DOMResult(out);
+    } else {
+        out = new BufferedOutputStream(outStream(out));
+        return new javax.xml.transform.stream.StreamResult(out);
+    }
+}
+
+/**
+ * Perform XSLT transform
+ *
+ * @param inp Input XML to transform (URL, File or InputStream)
+ * @param style XSL Stylesheet to be used (URL, File or InputStream). optional.
+ * @param out Output XML (File or OutputStream
+ */
+function XSLTransform(inp, style, out) {
+    switch (arguments.length) {
+    case 2:
+        inp = arguments[0];
+        out = arguments[1];
+        break;
+    case 3:
+        inp = arguments[0];
+        style = arguments[1];
+        out = arguments[2];
+        break;
+    default:
+        println("XSL tranform requires 2 or 3 arguments");
+        return;
+    }
+
+    var factory = javax.xml.transform.TransformerFactory.newInstance();
+    var transformer;
+    if (style) {
+        transformer = factory.newTransformer(XMLSource(style));
+    } else {
+        transformer = factory.newTransformer();
+    }
+    var source = XMLSource(inp);
+    var result = XMLResult(out);
+    transformer.transform(source, result);
+    if (source.getInputStream) {
+        streamClose(source.getInputStream());
+    }
+    if (result.getOutputStream) {
+        streamClose(result.getOutputStream());
+    }
+}
+
+// miscellaneous utilities
+
+/**
+ * Prints which command is selected from PATH
+ *
+ * @param cmd name of the command searched from PATH
+ */
+function which(cmd) {
+    var st = new java.util.StringTokenizer(env.PATH, File.pathSeparator);
+    while (st.hasMoreTokens()) {
+        var file = new File(st.nextToken(), cmd);
+        if (file.exists()) {
+            println(file.getAbsolutePath());
+            return;
+        }
+    }
+}
+
+/**
+ * Prints IP addresses of given domain name
+ *
+ * @param name domain name
+ */
+function ip(name) {
+    var addrs = InetAddress.getAllByName(name);
+    for (var i in addrs) {
+        println(addrs[i]);
+    }
+}
+
+/**
+ * Prints current date in current locale
+ */
+function date() {
+    println(new Date().toLocaleString());
+}
+
+/**
+ * Echoes the given string arguments
+ */
+function echo(x) {
+    for (var i = 0; i < arguments.length; i++) {
+        println(arguments[i]);
+    }
+}
+
+/**
+ * Reads one or more lines from stdin after printing prompt
+ *
+ * @param prompt optional, default is '>'
+ * @param multiline to tell whether to read single line or multiple lines
+ */
+function read(prompt, multiline) {
+    if (!prompt) {
+        prompt = '>';
+    }
+    var inp = java.lang.System["in"];
+    var reader = new BufferedReader(new InputStreamReader(inp));
+    if (multiline) {
+        var line = '';
+        while (true) {
+            java.lang.System.err.print(prompt);
+            java.lang.System.err.flush();
+            var tmp = reader.readLine();
+            if (tmp == '' || tmp == null) break;
+            line += tmp + '\n';
+        }
+        return line;
+    } else {
+        java.lang.System.err.print(prompt);
+        java.lang.System.err.flush();
+        return reader.readLine();
+    }
+}
+
+if (typeof(println) == 'undefined') {
+    var print = function(str, newline) {
+        if (typeof(str) == 'undefined') {
+            str = 'undefined';
+        } else if (str == null) {
+            str = 'null';
+        }
+
+        if (!(out instanceof java.io.PrintWriter)) {
+            out = new java.io.PrintWriter(out);
+        }
+
+        out.print(String(str));
+        if (newline) {
+            out.print('\n');
+        }
+        out.flush();
+    }
+
+    var println = function(str) {
+        print(str, true);
+    };
+}
+
+/**
+ * This is C-like printf
+ *
+ * @param format string to format the rest of the print items
+ * @param args variadic argument list
+ */
+function printf(format, args/*, more args*/) {
+    print(sprintf.apply(this, arguments));
+}
+
+/**
+ * This is C-like sprintf
+ *
+ * @param format string to format the rest of the print items
+ * @param args variadic argument list
+ */
+function sprintf(format, args/*, more args*/) {
+    var len = arguments.length - 1;
+    var array = [];
+
+    if (len < 0) {
+        return "";
+    }
+
+    for (var i = 0; i < len; i++) {
+        if (arguments[i+1] instanceof Date) {
+            array[i] = arguments[i+1].getTime();
+        } else {
+            array[i] = arguments[i+1];
+        }
+    }
+
+    array = Java.toJavaArray(array);
+    return Packages.jdk.nashorn.api.scripting.Formatter.format(format, array);
+}

From 0c53c5de50fab85e907c20ebf2227a8ba3fd44fc Mon Sep 17 00:00:00 2001
From: Attila Szegedi <attila@openjdk.org>
Date: Tue, 15 Jan 2013 13:10:20 +0100
Subject: [PATCH 067/311] 8006293: Reduce ScriptObject.findCallMethodMethod

Reviewed-by: lagergren, jlaskey
---
 .../internal/runtime/ScriptFunction.java      | 21 -----
 .../internal/runtime/ScriptObject.java        | 94 +++----------------
 .../nashorn/internal/runtime/WithObject.java  |  6 +-
 .../internal/runtime/linker/Bootstrap.java    | 20 +++-
 .../runtime/linker/MethodHandleFactory.java   | 22 +++--
 .../linker/MethodHandleFunctionality.java     | 12 +++
 6 files changed, 61 insertions(+), 114 deletions(-)

diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
index 58728f3aa67..f831b90e3e1 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
@@ -62,9 +62,6 @@ public abstract class ScriptFunction extends ScriptObject {
     /** Method handle for name getter for this ScriptFunction */
     public static final MethodHandle G$NAME       = findOwnMH("G$name",       Object.class, Object.class);
 
-    /** Method handle for invokehelper for this ScriptFunction - used from applies */
-    public static final MethodHandle INVOKEHELPER = findOwnMH("invokeHelper", Object.class, Object.class, Object.class, Object[].class);
-
     /** Method handle for allocate function for this ScriptFunction */
     public static final MethodHandle ALLOCATE     = findOwnMH("allocate", Object.class);
 
@@ -386,24 +383,6 @@ public abstract class ScriptFunction extends ScriptObject {
         return i < args.length ? args[i] : UNDEFINED;
     }
 
-    /**
-     * Helper function used for implementation of apply
-     * @param func       script function
-     * @param self       reference to {@code this} for apply
-     * @param args       arguments to apply
-     * @return           result of apply
-     * @throws Throwable if invocation throws an error or exception
-     */
-    public static Object invokeHelper(final Object func, final Object self, final Object... args) throws Throwable {
-        if (func instanceof ScriptFunction) {
-            return ((ScriptFunction)func).invoke(self, args);
-        }
-
-        typeError(Context.getGlobal(), "not.a.function", ScriptRuntime.safeToString(func));
-
-        return UNDEFINED;
-    }
-
     /**
      * Construct new object using this constructor.
      * @param self  Target object.
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
index 458fc74f611..b3bf302db5f 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
@@ -69,7 +69,6 @@ import jdk.nashorn.internal.runtime.linker.NashornGuards;
 import org.dynalang.dynalink.CallSiteDescriptor;
 import org.dynalang.dynalink.linker.GuardedInvocation;
 import org.dynalang.dynalink.support.CallSiteDescriptorFactory;
-import org.dynalang.dynalink.support.Guards;
 
 /**
  * Base class for generic JavaScript objects.
@@ -1587,7 +1586,10 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
     }
 
     /**
-     * Find the appropriate CALL method for an invoke dynamic call.
+     * Find an implementation for a "dyn:callMethod" operation. Note that Nashorn internally never uses
+     * "dyn:callMethod", but instead always emits two call sites in bytecode, one for "dyn:getMethod", and then another
+     * one for "dyn:call". Explicit support for "dyn:callMethod" is provided for the benefit of potential external
+     * callers. The implementation itself actually folds a "dyn:getMethod" method handle into a "dyn:call" method handle.
      *
      * @param desc The call site descriptor.
      * @param megaMorphic is this call site megaMorphic, as reported by Dynalink - then just do apply
@@ -1595,49 +1597,18 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
      * @return GuardedInvocation to be invoked at call site.
      */
     protected GuardedInvocation findCallMethodMethod(final CallSiteDescriptor desc, final boolean megaMorphic) {
-        final String       name     = desc.getNameToken(2);
-        final MethodType   callType = desc.getMethodType();
-        final FindProperty find     = findProperty(name, true);
+        // R(P0, P1, ...)
+        final MethodType callType = desc.getMethodType();
+        // use type Object(P0) for the getter
+        final CallSiteDescriptor getterType = desc.changeMethodType(MethodType.methodType(Object.class, callType.parameterType(0)));
+        final GuardedInvocation getter = findGetMethod(getterType, megaMorphic, "getMethod");
 
-        if (find == null) {
-            return createNoSuchMethodInvocation(desc);
-        }
-
-        if (find.getProperty().hasGetterFunction()) {
-            final GuardedInvocation link   = findGetMethod(CallSiteDescriptorFactory.changeReturnType(desc, Object.class), megaMorphic, "getMethod");
-            final MethodHandle      getter = link.getInvocation(); //this cannot be anything but an object as this is the function
-
-            MethodHandle invoker = ScriptFunction.INVOKEHELPER;
-            invoker = MH.asCollector(invoker, Object[].class, callType.parameterCount() - 1); //deduct self
-            invoker = MH.foldArguments(invoker, MH.asType(getter, getter.type().changeReturnType(Object.class))); //getter->func to first arguments. self and object parameters remain
-
-            return new GuardedInvocation(invoker, link.getSwitchPoint(), link.getGuard());
-        }
-
-        //retrieve the appropriate scriptfunction
-        final Object value = getObjectValue(find);
-
-        MethodHandle methodHandle = getCallMethodHandle(value, callType, null);
-
-        if (methodHandle != null) {
-            if (find.isScope()) {
-                final boolean strictCallee = ((ScriptFunction)value).isStrict();
-                if (strictCallee && NashornCallSiteDescriptor.isScope(desc)) {
-                    methodHandle = bindTo(methodHandle, UNDEFINED);
-                } else {
-                    methodHandle = bindTo(methodHandle, Context.getGlobal());
-                }
-            }
-
-            final MethodHandle guard       = find.isSelf() ? Guards.getIdentityGuard(this) : NashornGuards.getMapGuard(getMap());
-            final int          invokeFlags = ((ScriptFunction)value).isStrict()? NashornCallSiteDescriptor.CALLSITE_STRICT : 0;
-
-            return new NashornGuardedInvocation(methodHandle, null, guard, invokeFlags);
-        }
-
-        typeError(Context.getGlobal(), "no.such.function", name, ScriptRuntime.safeToString(this));
-
-        throw new AssertionError("should not reach here");
+        // Object(P0) => Object(P0, P1, ...)
+        final MethodHandle argDroppingGetter = MH.dropArguments(getter.getInvocation(), 1, callType.parameterList().subList(1, callType.parameterCount()));
+        // R(Object, P0, P1, ...)
+        final MethodHandle invoker = Bootstrap.createDynamicInvoker("dyn:call", callType.insertParameterTypes(0, argDroppingGetter.type().returnType()));
+        // Fold Object(P0, P1, ...) into R(Object, P0, P1, ...) => R(P0, P1, ...)
+        return getter.replaceMethods(MH.foldArguments(invoker, argDroppingGetter), getter.getGuard());
     }
 
     /**
@@ -1922,41 +1893,6 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
                 null, NashornGuards.getMapGuard(getMap()));
     }
 
-    /**
-     * Create an invocation that will raise NoSuchMethod error
-     *
-     * @param desc call site descriptor
-     *
-     * @return Guarded invocation to be invoked at the call site
-     */
-    public GuardedInvocation createNoSuchMethodInvocation(final CallSiteDescriptor desc) {
-        final String name = desc.getNameToken(2);
-        final FindProperty find = findProperty(NO_SUCH_METHOD_NAME, true);
-        final boolean scopeCall = isScope() && NashornCallSiteDescriptor.isScope(desc);
-
-        if (find != null) {
-            final ScriptFunction func = (ScriptFunction)getObjectValue(find);
-            MethodHandle methodHandle = getCallMethodHandle(func, desc.getMethodType(), name);
-
-            if (methodHandle != null) {
-                if (scopeCall && func.isStrict()) {
-                    methodHandle = bindTo(methodHandle, UNDEFINED);
-                }
-                return new GuardedInvocation(methodHandle,
-                        find.isInherited()? getMap().getProtoGetSwitchPoint(NO_SUCH_PROPERTY_NAME) : null,
-                        getKnownFunctionPropertyGuard(getMap(), find.getGetter(Object.class), find.getOwner(), func));
-            }
-        }
-
-        if (scopeCall) {
-            referenceError(Context.getGlobal(), "not.defined", name);
-        } else {
-            typeError(Context.getGlobal(), "no.such.function", name, ScriptRuntime.safeToString(this));
-        }
-
-        return null;
-    }
-
     /**
      * Fall back if a property is not found.
      * @param desc the call site descriptor.
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java b/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java
index 3b49606f8dc..d845e3ad3bc 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java
@@ -131,12 +131,13 @@ public class WithObject extends ScriptObject implements Scope {
         // the property is not found - now check for
         // __noSuchProperty__ and __noSuchMethod__ in expression
         if (self != null) {
-            String fallBack;
+            final String fallBack;
 
             final String operator = CallSiteDescriptorFactory.tokenizeOperators(desc).get(0);
 
             switch (operator) {
             case "callMethod":
+                throw new AssertionError(); // Nashorn never emits callMethod
             case "getMethod":
                 fallBack = NO_SUCH_METHOD_NAME;
                 break;
@@ -153,9 +154,6 @@ public class WithObject extends ScriptObject implements Scope {
                 find = self.findProperty(fallBack, true);
                 if (find != null) {
                     switch (operator) {
-                    case "callMethod":
-                        link = self.createNoSuchMethodInvocation(desc);
-                        break;
                     case "getMethod":
                         link = self.noSuchMethod(desc);
                         break;
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/Bootstrap.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/Bootstrap.java
index ae04d76c34e..37e941d1df6 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/Bootstrap.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/Bootstrap.java
@@ -79,7 +79,7 @@ public final class Bootstrap {
     }
 
     /**
-     * Return a dynamic invoker for a specified dynamic operation. You can use this method to create a method handle
+     * Returns a dynamic invoker for a specified dynamic operation. You can use this method to create a method handle
      * that when invoked acts completely as if it were a Nashorn-linked call site. An overview of available dynamic
      * operations can be found in the <a href="https://github.com/szegedi/dynalink/wiki/User-Guide-0.4">Dynalink User Guide</a>,
      * but we'll show few examples here:
@@ -170,12 +170,24 @@ public final class Bootstrap {
      * delegating to the function will be returned.</li>
      * </ul>
      * @param opDesc Dynalink dynamic operation descriptor.
-     * @param rtype return type of the operation
-     * @param ptypes parameter types of the operation
+     * @param rtype the return type for the operation
+     * @param ptypes the parameter types for the operation
      * @return MethodHandle for invoking the operation.
      */
     public static MethodHandle createDynamicInvoker(final String opDesc, final Class<?> rtype, final Class<?>... ptypes) {
-        return bootstrap(null, opDesc, MethodType.methodType(rtype, ptypes), 0).dynamicInvoker();
+        return createDynamicInvoker(opDesc, MethodType.methodType(rtype, ptypes));
+    }
+
+    /**
+     * Returns a dynamic invoker for a specified dynamic operation. Similar to
+     * {@link #createDynamicInvoker(String, Class, Class...)} but with return and parameter types composed into a
+     * method type in the signature. See the discussion of that method for details.
+     * @param opDesc Dynalink dynamic operation descriptor.
+     * @param type the method type for the operation
+     * @return MethodHandle for invoking the operation.
+     */
+    public static MethodHandle createDynamicInvoker(final String opDesc, final MethodType type) {
+        return bootstrap(null, opDesc, type, 0).dynamicInvoker();
     }
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/MethodHandleFactory.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/MethodHandleFactory.java
index e3d23905f68..cbf296303da 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/MethodHandleFactory.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/MethodHandleFactory.java
@@ -25,12 +25,6 @@
 
 package jdk.nashorn.internal.runtime.linker;
 
-import jdk.nashorn.internal.runtime.ConsString;
-import jdk.nashorn.internal.runtime.Debug;
-import jdk.nashorn.internal.runtime.DebugLogger;
-import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.options.Options;
-
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 import java.lang.invoke.MethodHandle;
@@ -42,6 +36,11 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.logging.Level;
+import jdk.nashorn.internal.runtime.ConsString;
+import jdk.nashorn.internal.runtime.Debug;
+import jdk.nashorn.internal.runtime.DebugLogger;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.options.Options;
 
 /**
  * This class is abstraction for all method handle, switchpoint and method type
@@ -298,6 +297,11 @@ public final class MethodHandleFactory {
             return MethodHandles.dropArguments(target, pos, valueTypes);
         }
 
+        @Override
+        public MethodHandle dropArguments(final MethodHandle target, final int pos, final List<Class<?>> valueTypes) {
+            return MethodHandles.dropArguments(target, pos, valueTypes);
+        }
+
         @Override
         public MethodHandle asType(final MethodHandle handle, final MethodType type) {
             return handle.asType(type);
@@ -499,6 +503,12 @@ public final class MethodHandleFactory {
             return debug(mh, "dropArguments", target, pos, values);
         }
 
+        @Override
+        public MethodHandle dropArguments(final MethodHandle target, final int pos, final List<Class<?>> values) {
+            final MethodHandle mh = super.dropArguments(target, pos, values);
+            return debug(mh, "dropArguments", target, pos, values);
+        }
+
         @Override
         public MethodHandle asType(final MethodHandle handle, final MethodType type) {
             final MethodHandle mh = super.asType(handle, type);
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/MethodHandleFunctionality.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/MethodHandleFunctionality.java
index ecf158d1017..0a9cfb04977 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/MethodHandleFunctionality.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/MethodHandleFunctionality.java
@@ -30,6 +30,7 @@ import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.lang.invoke.SwitchPoint;
 import java.lang.reflect.Method;
+import java.util.List;
 
 /**
  * Wrapper for all method handle related functions used in Nashorn. This interface only exists
@@ -91,6 +92,17 @@ public interface MethodHandleFunctionality {
      */
     public MethodHandle dropArguments(MethodHandle target, int pos, Class<?>... valueTypes);
 
+    /**
+     * Wrapper for {@link MethodHandles#dropArguments(MethodHandle, int, List)}
+     *
+     * @param target     target method handle
+     * @param pos        start argument index
+     * @param valueTypes valueTypes of arguments to drop
+     *
+     * @return handle with dropped arguments
+     */
+    public MethodHandle dropArguments(final MethodHandle target, final int pos, final List<Class<?>> valueTypes);
+
     /**
      * Wrapper for {@link MethodHandles#foldArguments(MethodHandle, MethodHandle)}
      *

From 311e57397d4222e6fa4b1489ed12d2c4284c1f42 Mon Sep 17 00:00:00 2001
From: Attila Szegedi <attila@openjdk.org>
Date: Tue, 15 Jan 2013 17:09:44 +0100
Subject: [PATCH 068/311] 8005958: invoking a function through INVOKESTATIC
 with more arguments than it declares resulted in malformed bytecode being
 generated

Reviewed-by: lagergren, jlaskey
---
 .../internal/codegen/CodeGenerator.java       |  6 ++--
 nashorn/test/script/basic/JDK-8005958.js      | 32 +++++++++++++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 nashorn/test/script/basic/JDK-8005958.js

diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
index b673d4cf475..2c0be3db999 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
@@ -506,15 +506,15 @@ public final class CodeGenerator extends NodeOperatorVisitor {
         int n = 0;
         final Type[] params = signature == null ? null : Type.getMethodArguments(signature);
         for (final Node arg : args) {
+            if (n >= argCount) {
+                break;
+            }
             assert arg != null;
             load(arg);
             if (params != null) {
                 method.convert(params[n]);
             }
             n++;
-            if (n >= argCount) {
-                break;
-            }
         }
 
         while (n < argCount) {
diff --git a/nashorn/test/script/basic/JDK-8005958.js b/nashorn/test/script/basic/JDK-8005958.js
new file mode 100644
index 00000000000..e72ba09b5de
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8005958.js
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8005958 : invoking a function through INVOKESTATIC with more 
+ * arguments than it declares resulted in malformed bytecode being
+ * generated.
+ *
+ * @test
+ * @run
+ */
+(function() {})(2)

From a2efb1b4f57592d7e6362b4f61f114a14dcc8230 Mon Sep 17 00:00:00 2001
From: Attila Szegedi <attila@openjdk.org>
Date: Tue, 15 Jan 2013 18:08:50 +0100
Subject: [PATCH 069/311] 8006337: Discarded arguments for INVOKESTATIC must
 still be evaluated for side effects

Reviewed-by: hannesw, jlaskey, sundar
---
 .../internal/codegen/CodeGenerator.java       |  7 ++---
 nashorn/test/script/basic/JDK-8006337.js      | 31 +++++++++++++++++++
 .../test/script/basic/JDK-8006337.js.EXPECTED |  1 +
 3 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 nashorn/test/script/basic/JDK-8006337.js
 create mode 100644 nashorn/test/script/basic/JDK-8006337.js.EXPECTED

diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
index 2c0be3db999..2c1e1088829 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
@@ -506,12 +506,11 @@ public final class CodeGenerator extends NodeOperatorVisitor {
         int n = 0;
         final Type[] params = signature == null ? null : Type.getMethodArguments(signature);
         for (final Node arg : args) {
-            if (n >= argCount) {
-                break;
-            }
             assert arg != null;
             load(arg);
-            if (params != null) {
+            if (n >= argCount) {
+                method.pop(); // we had to load the arg for its side effects
+            } else if (params != null) {
                 method.convert(params[n]);
             }
             n++;
diff --git a/nashorn/test/script/basic/JDK-8006337.js b/nashorn/test/script/basic/JDK-8006337.js
new file mode 100644
index 00000000000..21c469a2954
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8006337.js
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8006337 : Discarded arguments for INVOKESTATIC must still be 
+ * evaluated for side effects.
+ *
+ * @test
+ * @run
+ */
+(function() {})(print("hello"))
diff --git a/nashorn/test/script/basic/JDK-8006337.js.EXPECTED b/nashorn/test/script/basic/JDK-8006337.js.EXPECTED
new file mode 100644
index 00000000000..ce013625030
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8006337.js.EXPECTED
@@ -0,0 +1 @@
+hello

From c6c424f27adbf9ca0e1bdbea30ed7e94f4840f56 Mon Sep 17 00:00:00 2001
From: James Laskey <james.laskey@oracle.com>
Date: Wed, 16 Jan 2013 07:06:40 -0400
Subject: [PATCH 070/311] 8006304: Remove pre-population of maps for
 constructor produced maps

Reviewed-by: sundar
---
 nashorn/.hgignore                             |  2 +-
 .../internal/codegen/CodeGenerator.java       |  2 +
 .../objects/FunctionObjectCreator.java        |  4 +-
 nashorn/test/script/basic/JDK-8006304.js      | 41 +++++++++++++++++++
 .../test/script/basic/JDK-8006304.js.EXPECTED |  3 ++
 5 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 nashorn/test/script/basic/JDK-8006304.js
 create mode 100644 nashorn/test/script/basic/JDK-8006304.js.EXPECTED

diff --git a/nashorn/.hgignore b/nashorn/.hgignore
index c76bee23d3d..d07a19d7273 100644
--- a/nashorn/.hgignore
+++ b/nashorn/.hgignore
@@ -22,4 +22,4 @@ CC/*
 jcov2/*
 .idea/*
 test/lib/testng.jar
-test/script/external/*
\ No newline at end of file
+test/script/external/*
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
index 2c1e1088829..49e9e35c39b 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
@@ -536,10 +536,12 @@ public final class CodeGenerator extends NodeOperatorVisitor {
         final List<String> keys    = new ArrayList<>();
         final List<Symbol> symbols = new ArrayList<>();
 
+        /* TODO - Predefine known properties.
         for (final Entry<String, Node> entry : thisProperties.entrySet()) {
             keys.add(entry.getKey());
             symbols.add(entry.getValue().getSymbol());
         }
+        */
 
         new FunctionObjectCreator(this, functionNode, keys, symbols).makeObject(method);
     }
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/objects/FunctionObjectCreator.java b/nashorn/src/jdk/nashorn/internal/codegen/objects/FunctionObjectCreator.java
index b705eb21e90..93ece526892 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/objects/FunctionObjectCreator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/objects/FunctionObjectCreator.java
@@ -50,7 +50,7 @@ import jdk.nashorn.internal.runtime.Source;
 
 /**
  * Analyze a function object's characteristics for appropriate code
- * generation. This generates code for the instantiation of ScriptFunction:s
+ * generation. This generates code for the instantiation of ScriptFunctions.
  */
 public class FunctionObjectCreator extends ObjectCreator {
 
@@ -70,7 +70,7 @@ public class FunctionObjectCreator extends ObjectCreator {
     }
 
     private void loadHandle(final MethodEmitter method, final String signature) {
-    method.loadHandle(functionNode.getCompileUnit().getUnitClassName(), functionNode.getName(), signature, EnumSet.of(HANDLE_STATIC)); // function
+        method.loadHandle(functionNode.getCompileUnit().getUnitClassName(), functionNode.getName(), signature, EnumSet.of(HANDLE_STATIC)); // function
     }
 
     /**
diff --git a/nashorn/test/script/basic/JDK-8006304.js b/nashorn/test/script/basic/JDK-8006304.js
new file mode 100644
index 00000000000..f2d2c0177db
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8006304.js
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+ 
+/**
+ * JDK-8006304 : Remove pre-population of maps for constructor produced maps.
+ *
+ * @test
+ * @run
+ */
+
+function Factory() {
+    this.w = 10;
+    this.x = 20;
+    if (false) {
+        this.y = 30;
+    }
+    this.z = 40;
+}
+
+var a = new Factory();
+for (var i in a) print(i, a[i]);
diff --git a/nashorn/test/script/basic/JDK-8006304.js.EXPECTED b/nashorn/test/script/basic/JDK-8006304.js.EXPECTED
new file mode 100644
index 00000000000..df803d7bd7f
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8006304.js.EXPECTED
@@ -0,0 +1,3 @@
+w 10
+x 20
+z 40

From d35ae9ab05850b6c0005985e63b8ff66a2c49134 Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Wed, 16 Jan 2013 17:58:51 +0530
Subject: [PATCH 071/311] 8006412: Improve toString method of
 ScriptObjectMirror class

Reviewed-by: jlaskey, lagergren
---
 .../api/scripting/ScriptObjectMirror.java     | 11 ++++++++++
 .../api/scripting/ScriptEngineTest.java       | 22 +++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java b/nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java
index c969cf9c7be..52391d2c7fb 100644
--- a/nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java
+++ b/nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java
@@ -38,6 +38,7 @@ import java.util.concurrent.Callable;
 import jdk.nashorn.internal.runtime.Context;
 import jdk.nashorn.internal.runtime.ScriptFunction;
 import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
 import netscape.javascript.JSObject;
 
 /**
@@ -67,6 +68,16 @@ final class ScriptObjectMirror extends JSObject implements Map<Object, Object> {
         return sobj.hashCode();
     }
 
+    @Override
+    public String toString() {
+        return inGlobal(new Callable<String>() {
+            @Override
+            public String call() {
+                return ScriptRuntime.safeToString(sobj);
+            }
+        });
+    }
+
     private <V> V inGlobal(final Callable<V> callable) {
         final ScriptObject oldGlobal = Context.getGlobal();
         final boolean globalChanged = (oldGlobal != global);
diff --git a/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java b/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
index a333bcb9533..21837ee9c87 100644
--- a/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
+++ b/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
@@ -46,6 +46,7 @@ import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
 import jdk.nashorn.internal.runtime.Version;
 import netscape.javascript.JSObject;
+import org.testng.Assert;
 import org.testng.TestNG;
 import org.testng.annotations.Test;
 
@@ -859,4 +860,25 @@ public class ScriptEngineTest {
             fail(t.getMessage());
         }
     }
+
+    @Test
+    public void scriptObjectMirrorToStringTest() {
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+        try {
+            Object obj = e.eval("new TypeError('wrong type')");
+            Assert.assertEquals(obj.toString(), "TypeError: wrong type", "toString returns wrong value");
+        } catch (final Throwable t) {
+            t.printStackTrace();
+            fail(t.getMessage());
+        }
+
+        try {
+            Object obj = e.eval("function func() { print('hello'); }");
+            Assert.assertEquals(obj.toString(), "function func() { print('hello'); }", "toString returns wrong value");
+        } catch (final Throwable t) {
+            t.printStackTrace();
+            fail(t.getMessage());
+        }
+    }
 }

From 71e9d57ee3edac0ef778f0aa095924177cbc8f4d Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Wed, 16 Jan 2013 21:26:55 +0530
Subject: [PATCH 072/311] 8006424: Passing null or undefined to adapter class
 constructors results in NPE or ClassCastException

Reviewed-by: attila, hannesw, jlaskey
---
 .../runtime/linker/JavaAdapterFactory.java    | 27 ++++++++++++-------
 nashorn/test/script/basic/JDK-8006424.js      | 22 +++++++++++++++
 2 files changed, 39 insertions(+), 10 deletions(-)
 create mode 100644 nashorn/test/script/basic/JDK-8006424.js

diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
index c42b19c6c00..2050c6e77c2 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
@@ -81,6 +81,7 @@ import jdk.nashorn.internal.runtime.ECMAErrors;
 import jdk.nashorn.internal.runtime.ECMAException;
 import jdk.nashorn.internal.runtime.ScriptFunction;
 import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
 import jdk.nashorn.internal.runtime.Undefined;
 import org.dynalang.dynalink.beans.StaticClass;
 import org.dynalang.dynalink.support.LinkRequestImpl;
@@ -144,7 +145,7 @@ public class JavaAdapterFactory {
     private static final Type METHOD_TYPE_TYPE = Type.getType(MethodType.class);
     private static final Type METHOD_HANDLE_TYPE = Type.getType(MethodHandle.class);
     private static final String GET_HANDLE_OBJECT_DESCRIPTOR = Type.getMethodDescriptor(METHOD_HANDLE_TYPE,
-            SCRIPT_OBJECT_TYPE, STRING_TYPE, METHOD_TYPE_TYPE, Type.BOOLEAN_TYPE);
+            OBJECT_TYPE, STRING_TYPE, METHOD_TYPE_TYPE, Type.BOOLEAN_TYPE);
     private static final String GET_HANDLE_FUNCTION_DESCRIPTOR = Type.getMethodDescriptor(METHOD_HANDLE_TYPE,
             SCRIPT_FUNCTION_TYPE, METHOD_TYPE_TYPE, Type.BOOLEAN_TYPE);
     private static final Type RUNTIME_EXCEPTION_TYPE = Type.getType(RuntimeException.class);
@@ -570,7 +571,7 @@ public class JavaAdapterFactory {
      * function itself, if that's what's passed). There is one method handle field in the adapter class for every method
      * that can be implemented or overridden; the name of every field is same as the name of the method, with a number
      * suffix that makes it unique in case of overloaded methods. The generated constructor will invoke
-     * {@link #getHandle(ScriptFunction, MethodType, boolean)} or {@link #getHandle(ScriptObject, String, MethodType,
+     * {@link #getHandle(ScriptFunction, MethodType, boolean)} or {@link #getHandle(Object, String, MethodType,
      * boolean)} to obtain the method handles; these methods make sure to add the necessary conversions and arity
      * adjustments so that the resulting method handles can be invoked from generated methods using {@code invokeExact}.
      * The constructor that takes a script function will only initialize the methods with the same name as the single
@@ -589,8 +590,8 @@ public class JavaAdapterFactory {
         final int argLen = originalArgTypes.length;
         final Type[] newArgTypes = new Type[argLen + 1];
 
-        // Insert ScriptFunction|ScriptObject as the last argument to the constructor
-        final Type extraArgumentType = fromFunction ? SCRIPT_FUNCTION_TYPE : SCRIPT_OBJECT_TYPE;
+        // Insert ScriptFunction|Object as the last argument to the constructor
+        final Type extraArgumentType = fromFunction ? SCRIPT_FUNCTION_TYPE : OBJECT_TYPE;
         newArgTypes[argLen] = extraArgumentType;
         System.arraycopy(originalArgTypes, 0, newArgTypes, 0, argLen);
 
@@ -675,7 +676,7 @@ public class JavaAdapterFactory {
     /**
      * Given a JS script object, retrieves a function from it by name, binds it to the script object as its "this", and
      * adapts its parameter types, return types, and arity to the specified type and arity. This method is public mainly
-     * for implementation reasons, so the adapter classes can invoke it from their constructors that take a ScriptObject
+     * for implementation reasons, so the adapter classes can invoke it from their constructors that take a Object
      * in its first argument to obtain the method handles for their method implementations.
      * @param obj the script obj
      * @param name the name of the property that contains the function
@@ -685,15 +686,21 @@ public class JavaAdapterFactory {
      * property is either null or undefined, or "toString" was requested as the name, but the object doesn't directly
      * define it but just inherits it through prototype.
      */
-    public static MethodHandle getHandle(final ScriptObject obj, final String name, final MethodType type, final boolean varArg) {
+    public static MethodHandle getHandle(final Object obj, final String name, final MethodType type, final boolean varArg) {
+        if (! (obj instanceof ScriptObject)) {
+            typeError(Context.getGlobal(), "not.an.object", ScriptRuntime.safeToString(obj));
+            throw new AssertionError();
+        }
+
+        final ScriptObject sobj = (ScriptObject)obj;
         // Since every JS Object has a toString, we only override "String toString()" it if it's explicitly specified
-        if ("toString".equals(name) && !obj.hasOwnProperty("toString")) {
+        if ("toString".equals(name) && !sobj.hasOwnProperty("toString")) {
             return null;
         }
 
-        final Object fnObj = obj.get(name);
+        final Object fnObj = sobj.get(name);
         if (fnObj instanceof ScriptFunction) {
-            return adaptHandle(((ScriptFunction)fnObj).getBoundInvokeHandle(obj), type, varArg);
+            return adaptHandle(((ScriptFunction)fnObj).getBoundInvokeHandle(sobj), type, varArg);
         } else if(fnObj == null || fnObj instanceof Undefined) {
             return null;
         } else {
@@ -773,7 +780,7 @@ public class JavaAdapterFactory {
      * exceptions, and is not an unchecked throwable, then it is wrapped into a {@link RuntimeException} and the runtime
      * exception is thrown. The method handle retrieved from the field is guaranteed to exactly match the signature of
      * the method; this is guaranteed by the way constructors of the adapter class obtain them using
-     * {@link #getHandle(ScriptObject, String, MethodType, boolean)}.
+     * {@link #getHandle(Object, String, MethodType, boolean)}.
      * @param mi the method info describing the method to be generated.
      */
     private void generateMethod(final MethodInfo mi) {
diff --git a/nashorn/test/script/basic/JDK-8006424.js b/nashorn/test/script/basic/JDK-8006424.js
new file mode 100644
index 00000000000..fab94b11f55
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8006424.js
@@ -0,0 +1,22 @@
+/**
+ * JDK-8006424 : Passing null or undefined to adapter class constructors results in NPE or ClassCastException
+ *
+ * @test
+ * @run
+ */
+
+function check(callback) {
+    try {
+        callback();
+        fail("should have thrown exception");
+    } catch (e) {
+        if (! (e instanceof TypeError)) {
+            fail("TypeError expected, but got " + e);
+        }
+    }
+}
+
+check(function() { new java.lang.ClassLoader(null) });
+check(function() { new java.lang.ClassLoader(undefined) });
+check(function() { new java.lang.Runnable(null) });
+check(function() { new java.lang.Runnable(undefined) });

From e1e509319e219df6d28185fede775bb58d58d7ef Mon Sep 17 00:00:00 2001
From: James Laskey <james.laskey@oracle.com>
Date: Thu, 17 Jan 2013 10:33:39 -0400
Subject: [PATCH 073/311] 8006517: PropertyHashMap.Element.equals() compares to
 Property

Reviewed-by: sundar
---
 nashorn/src/jdk/nashorn/internal/runtime/PropertyHashMap.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nashorn/src/jdk/nashorn/internal/runtime/PropertyHashMap.java b/nashorn/src/jdk/nashorn/internal/runtime/PropertyHashMap.java
index 8b4e05e4969..2ae1820dc9f 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/PropertyHashMap.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/PropertyHashMap.java
@@ -606,7 +606,7 @@ public final class PropertyHashMap implements Map <String, Property> {
         @Override
         public boolean equals(final Object other) {
             assert property != null && other != null;
-            return other instanceof Property && property.equals(other);
+            return other instanceof Element && property.equals(((Element)other).property);
         }
 
         @Override

From 07484149d6e0c47952b9d0767a83b4408f39fe19 Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Fri, 18 Jan 2013 08:45:06 +0530
Subject: [PATCH 074/311] 8006527: nashorn jsr223 engine does not work in
 sandbox

Reviewed-by: jlaskey, attila, lagergren
---
 nashorn/bin/nashornsecure                     | 29 +++++++++++++
 nashorn/bin/nashornsecure.bat                 | 27 ++++++++++++
 .../api/scripting/NashornScriptEngine.java    | 41 ++++++++++++-------
 .../nashorn/api/scripting/resources/init.js   | 24 ++++++++++-
 .../internal/objects/NativeJSAdapter.java     |  6 ++-
 nashorn/test/script/sandbox/engine.js         | 34 +++++++++++++++
 .../test/script/sandbox/engine.js.EXPECTED    |  1 +
 nashorn/test/script/sandbox/jsadapter.js      | 34 +++++++++++++++
 8 files changed, 178 insertions(+), 18 deletions(-)
 create mode 100644 nashorn/bin/nashornsecure
 create mode 100644 nashorn/bin/nashornsecure.bat
 create mode 100644 nashorn/test/script/sandbox/engine.js
 create mode 100644 nashorn/test/script/sandbox/engine.js.EXPECTED
 create mode 100644 nashorn/test/script/sandbox/jsadapter.js

diff --git a/nashorn/bin/nashornsecure b/nashorn/bin/nashornsecure
new file mode 100644
index 00000000000..caec38731d0
--- /dev/null
+++ b/nashorn/bin/nashornsecure
@@ -0,0 +1,29 @@
+#!/bin/bash
+#
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+[ -z "$JAVA_HOME" ] && echo "Please set JAVA_HOME" && exit 1;
+
+$JAVA_HOME/bin/jrunscript -J-Djava.security.manager -J-Xms2G -J-Xmx2G -J-XX:-TieredCompilation -J-server -J-esa -J-ea -J-Djava.ext.dirs=$JAVA_HOME/jre/lib/ext:`dirname $0`/../dist -J-XX:+HeapDumpOnOutOfMemoryError -J-Djava.lang.invoke.MethodHandle.DEBUG_NAMES=false -J-Dnashorn.debug=true -l nashorn $*
diff --git a/nashorn/bin/nashornsecure.bat b/nashorn/bin/nashornsecure.bat
new file mode 100644
index 00000000000..d35eeb48f25
--- /dev/null
+++ b/nashorn/bin/nashornsecure.bat
@@ -0,0 +1,27 @@
+rem
+rem Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+rem DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+rem
+rem This code is free software; you can redistribute it and/or modify it
+rem under the terms of the GNU General Public License version 2 only, as
+rem published by the Free Software Foundation.  Oracle designates this
+rem particular file as subject to the "Classpath" exception as provided
+rem by Oracle in the LICENSE file that accompanied this code.
+rem
+rem This code is distributed in the hope that it will be useful, but WITHOUT
+rem ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+rem FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+rem version 2 for more details (a copy is included in the LICENSE file that
+rem accompanied this code).
+rem
+rem You should have received a copy of the GNU General Public License version
+rem 2 along with this work; if not, write to the Free Software Foundation,
+rem Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+rem
+rem Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+rem or visit www.oracle.com if you need additional information or have any
+rem questions.
+rem
+@echo off
+
+jrunscript -J-Djava.security.manager -J-Xms2G -J-Xmx2G -J-XX:-TieredCompilation -J-server -J-esa -J-ea -J-Djava.ext.dirs=%~dp0\..\dist -J-XX:+HeapDumpOnOutOfMemoryError -J-Dnashorn.debug=true -J-Djava.lang.invoke.MethodHandle.DEBUG_NAMES=false -l nashorn
diff --git a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
index 27ccb9e4772..37a7166d878 100644
--- a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
+++ b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
@@ -91,7 +91,7 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
 
         // throw ParseException on first error from script
         final ErrorManager errors = new Context.ThrowErrorManager();
-        // create new Nashorn Context and get global object
+        // create new Nashorn Context
         this.nashornContext = AccessController.doPrivileged(new PrivilegedAction<Context>() {
             @Override
             public Context run() {
@@ -107,7 +107,19 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
         });
 
         // create new global object
-        this.global = nashornContext.createGlobal();
+        this.global =  AccessController.doPrivileged(new PrivilegedAction<ScriptObject>() {
+            @Override
+            public ScriptObject run() {
+                try {
+                    return nashornContext.createGlobal();
+                } catch (final RuntimeException e) {
+                    if (Context.DEBUG) {
+                        e.printStackTrace();
+                    }
+                    throw e;
+                }
+            }
+        });
 
         // current ScriptContext exposed as "context"
         global.addOwnProperty("context", Property.NOT_ENUMERABLE, context);
@@ -121,14 +133,8 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
 
         // evaluate engine initial script
         try {
-            AccessController.doPrivileged(new PrivilegedExceptionAction<Void>() {
-                @Override
-                public Void run() throws ScriptException {
-                    evalEngineScript();
-                    return null;
-                }
-            });
-        } catch (final PrivilegedActionException e) {
+            evalEngineScript();
+        } catch (final ScriptException e) {
             if (Context.DEBUG) {
                 e.printStackTrace();
             }
@@ -330,15 +336,20 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
         evalSupportScript("resources/engine.js");
     }
 
-    private void evalSupportScript(String script) throws ScriptException {
-        final URL url = NashornScriptEngine.class.getResource(script);
+    private void evalSupportScript(final String script) throws ScriptException {
         try {
-            final InputStream is = url.openStream();
-            put(ScriptEngine.FILENAME, url);
+            final InputStream is = AccessController.doPrivileged(
+                    new PrivilegedExceptionAction<InputStream>() {
+                        public InputStream run() throws Exception {
+                            final URL url = NashornScriptEngine.class.getResource(script);
+                            return url.openStream();
+                        }
+                    });
+            put(ScriptEngine.FILENAME, "<engine>:" + script);
             try (final InputStreamReader isr = new InputStreamReader(is)) {
                 eval(isr);
             }
-        } catch (final IOException e) {
+        } catch (final PrivilegedActionException | IOException e) {
             throw new ScriptException(e);
         } finally {
             put(ScriptEngine.FILENAME, null);
diff --git a/nashorn/src/jdk/nashorn/api/scripting/resources/init.js b/nashorn/src/jdk/nashorn/api/scripting/resources/init.js
index 9a4935f407e..26a81e9c62b 100644
--- a/nashorn/src/jdk/nashorn/api/scripting/resources/init.js
+++ b/nashorn/src/jdk/nashorn/api/scripting/resources/init.js
@@ -187,11 +187,31 @@ function jlist(list) {
 }
 
 /**
- * This is java.lang.System properties wrapped by jmap.
+ * This is java.lang.System properties wrapped by JSAdapter.
  * For eg. to access java.class.path property, you can use
  * the syntax sysProps["java.class.path"]
  */
-var sysProps = jmap(java.lang.System.getProperties());
+var sysProps = new JSAdapter({
+    __get__ : function (name) {
+        return java.lang.System.getProperty(name);
+    },
+    __has__ : function (name) {
+        return java.lang.System.getProperty(name) != null;
+    },
+    __getIds__ : function() {
+        return java.lang.System.getProperties().keySet().toArray();
+    },
+    __delete__ : function(name) {
+        java.lang.System.clearProperty(name);
+        return true;
+    },
+    __put__ : function (name, value) {
+        java.lang.System.setProperty(name, value);
+    },
+    toString: function() {
+        return "<system properties>";
+    }
+});
 
 // stdout, stderr & stdin
 var out = java.lang.System.out;
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java b/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java
index edc9ca4c5d0..bb3931f0f74 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java
@@ -734,6 +734,10 @@ public final class NativeJSAdapter extends ScriptObject {
     }
 
     private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
-        return MH.findStatic(MethodHandles.lookup(), NativeJSAdapter.class, name, MH.type(rtype, types));
+        try {
+            return MethodHandles.lookup().findStatic(NativeJSAdapter.class, name, MH.type(rtype, types));
+        } catch (final NoSuchMethodException | IllegalAccessException e) {
+            throw new AssertionError(e);
+        }
     }
 }
diff --git a/nashorn/test/script/sandbox/engine.js b/nashorn/test/script/sandbox/engine.js
new file mode 100644
index 00000000000..e1d87c78754
--- /dev/null
+++ b/nashorn/test/script/sandbox/engine.js
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Test that sandbox code can create script engine.
+ *
+ * @test
+ * @run
+ * @security
+ */
+
+var mgr = new javax.script.ScriptEngineManager();
+var engine = mgr.getEngineByName("nashorn");
+print(engine.eval("'hello' + ' world'"));
diff --git a/nashorn/test/script/sandbox/engine.js.EXPECTED b/nashorn/test/script/sandbox/engine.js.EXPECTED
new file mode 100644
index 00000000000..3b18e512dba
--- /dev/null
+++ b/nashorn/test/script/sandbox/engine.js.EXPECTED
@@ -0,0 +1 @@
+hello world
diff --git a/nashorn/test/script/sandbox/jsadapter.js b/nashorn/test/script/sandbox/jsadapter.js
new file mode 100644
index 00000000000..32bedc8cfc5
--- /dev/null
+++ b/nashorn/test/script/sandbox/jsadapter.js
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Test that sandbox code can access jsadapter
+ *
+ * @test
+ * @run
+ * @security
+ */
+
+var mgr = new javax.script.ScriptEngineManager();
+var engine = mgr.getEngineByName("nashorn");
+engine.eval("var v = new JSAdapter() {};");

From cef1f6c50b1fc20e3cc3d7d8b2413193921e1620 Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Fri, 18 Jan 2013 17:55:04 +0530
Subject: [PATCH 075/311] 8006562: findOwnMH in nashorn "objects" package
 should be cleaned up

Reviewed-by: jlaskey, lagergren
---
 nashorn/make/project.properties                            | 7 +++++--
 nashorn/src/jdk/nashorn/internal/objects/Global.java       | 2 +-
 .../src/jdk/nashorn/internal/objects/NativeArguments.java  | 2 +-
 .../src/jdk/nashorn/internal/objects/NativeBoolean.java    | 3 ++-
 nashorn/src/jdk/nashorn/internal/objects/NativeError.java  | 2 +-
 .../src/jdk/nashorn/internal/objects/NativeJSAdapter.java  | 3 ++-
 nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java | 3 ++-
 .../nashorn/internal/objects/NativeStrictArguments.java    | 2 +-
 nashorn/src/jdk/nashorn/internal/objects/NativeString.java | 3 ++-
 .../src/jdk/nashorn/internal/objects/PrototypeObject.java  | 2 +-
 .../jdk/nashorn/internal/objects/ScriptFunctionImpl.java   | 7 ++++++-
 11 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/nashorn/make/project.properties b/nashorn/make/project.properties
index 37c8f832da3..b5b6ee403d5 100644
--- a/nashorn/make/project.properties
+++ b/nashorn/make/project.properties
@@ -209,11 +209,14 @@ run.test.classpath=\
 src.dir=src
 test.src.dir=test/src
 
+run.test.xmx=3G
+run.test.xms=2G
+
 #  -XX:+PrintCompilation -XX:+UnlockDiagnosticVMOptions -XX:+PrintNMethods
 # add '-Dtest.js.outofprocess' to run each test in a new sub-process
-run.test.jvmargs=-server -Xmx3G -XX:-TieredCompilation -esa -ea -Dnashorn.debug=true -Dfile.encoding=UTF-8 
+run.test.jvmargs=-server -Xmx${run.test.xmx} -XX:-TieredCompilation -esa -ea -Dnashorn.debug=true -Dfile.encoding=UTF-8 
 #-XX:+HeapDumpOnOutOfMemoryError -XX:-UseCompressedKlassPointers -XX:+PrintHeapAtGC -XX:ClassMetaspaceSize=300M  
-run.test.jvmargs.octane=-Xms2G -Xmx2G ${run.test.jvmargs}
+run.test.jvmargs.octane=-Xms${run.test.xms} -${run.test.jvmargs}
 
 run.test.jvmsecurityargs=-Xverify:all -Djava.security.manager -Djava.security.policy=${basedir}/build/nashorn.policy
 
diff --git a/nashorn/src/jdk/nashorn/internal/objects/Global.java b/nashorn/src/jdk/nashorn/internal/objects/Global.java
index ca907f43f57..bc181deabc9 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/Global.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/Global.java
@@ -1658,6 +1658,6 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
 
 
     private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
-        return MH.findStatic(MethodHandles.lookup(), Global.class, name, MH.type(rtype, types));
+        return MH.findStatic(MethodHandles.publicLookup(), Global.class, name, MH.type(rtype, types));
     }
 }
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeArguments.java b/nashorn/src/jdk/nashorn/internal/objects/NativeArguments.java
index d28431f7a1b..72aabcdaad7 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeArguments.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeArguments.java
@@ -619,7 +619,7 @@ public final class NativeArguments extends ScriptObject {
     }
 
     private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
-        return MH.findStatic(MethodHandles.lookup(), NativeArguments.class, name, MH.type(rtype, types));
+        return MH.findStatic(MethodHandles.publicLookup(), NativeArguments.class, name, MH.type(rtype, types));
     }
 
 }
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeBoolean.java b/nashorn/src/jdk/nashorn/internal/objects/NativeBoolean.java
index ae7d1644c0d..a603ead29a3 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeBoolean.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeBoolean.java
@@ -37,6 +37,7 @@ import jdk.nashorn.internal.objects.annotations.ScriptClass;
 import jdk.nashorn.internal.runtime.JSType;
 import jdk.nashorn.internal.runtime.ScriptObject;
 import jdk.nashorn.internal.runtime.ScriptRuntime;
+import jdk.nashorn.internal.runtime.linker.MethodHandleFactory;
 import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
 import jdk.nashorn.internal.runtime.linker.PrimitiveLookup;
 import org.dynalang.dynalink.linker.GuardedInvocation;
@@ -175,7 +176,7 @@ public final class NativeBoolean extends ScriptObject {
         try {
             return MethodHandles.lookup().findStatic(NativeBoolean.class, "wrapFilter", MH.type(NativeBoolean.class, Object.class));
         } catch (NoSuchMethodException | IllegalAccessException e) {
-            throw new AssertionError(e);
+            throw new MethodHandleFactory.LookupException(e);
         }
     }
 }
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeError.java b/nashorn/src/jdk/nashorn/internal/objects/NativeError.java
index 3a1874dd991..9ab4e983d80 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeError.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeError.java
@@ -320,6 +320,6 @@ public class NativeError extends ScriptObject {
     }
 
     private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
-        return MH.findStatic(MethodHandles.lookup(), NativeError.class, name, MH.type(rtype, types));
+        return MH.findStatic(MethodHandles.publicLookup(), NativeError.class, name, MH.type(rtype, types));
     }
 }
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java b/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java
index bb3931f0f74..5f884541830 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java
@@ -44,6 +44,7 @@ import jdk.nashorn.internal.runtime.ScriptObject;
 import jdk.nashorn.internal.runtime.ScriptRuntime;
 import jdk.nashorn.internal.runtime.arrays.ArrayLikeIterator;
 import jdk.nashorn.internal.runtime.linker.Lookup;
+import jdk.nashorn.internal.runtime.linker.MethodHandleFactory;
 import org.dynalang.dynalink.CallSiteDescriptor;
 import org.dynalang.dynalink.linker.GuardedInvocation;
 
@@ -737,7 +738,7 @@ public final class NativeJSAdapter extends ScriptObject {
         try {
             return MethodHandles.lookup().findStatic(NativeJSAdapter.class, name, MH.type(rtype, types));
         } catch (final NoSuchMethodException | IllegalAccessException e) {
-            throw new AssertionError(e);
+            throw new MethodHandleFactory.LookupException(e);
         }
     }
 }
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java b/nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java
index 11caa5ee9ec..845f6b07ad4 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java
@@ -45,6 +45,7 @@ import jdk.nashorn.internal.objects.annotations.Where;
 import jdk.nashorn.internal.runtime.JSType;
 import jdk.nashorn.internal.runtime.ScriptObject;
 import jdk.nashorn.internal.runtime.ScriptRuntime;
+import jdk.nashorn.internal.runtime.linker.MethodHandleFactory;
 import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
 import jdk.nashorn.internal.runtime.linker.PrimitiveLookup;
 import org.dynalang.dynalink.linker.GuardedInvocation;
@@ -382,7 +383,7 @@ public final class NativeNumber extends ScriptObject {
         try {
             return MethodHandles.lookup().findStatic(NativeNumber.class, "wrapFilter", MH.type(NativeNumber.class, Object.class));
         } catch (final NoSuchMethodException | IllegalAccessException e) {
-            throw new AssertionError(e);
+            throw new MethodHandleFactory.LookupException(e);
         }
     }
 }
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeStrictArguments.java b/nashorn/src/jdk/nashorn/internal/objects/NativeStrictArguments.java
index 5d24f44960d..dce6c4fef95 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeStrictArguments.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeStrictArguments.java
@@ -142,6 +142,6 @@ public final class NativeStrictArguments extends ScriptObject {
     }
 
     private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
-        return MH.findStatic(MethodHandles.lookup(), NativeStrictArguments.class, name, MH.type(rtype, types));
+        return MH.findStatic(MethodHandles.publicLookup(), NativeStrictArguments.class, name, MH.type(rtype, types));
     }
 }
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeString.java b/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
index b72fdb55a92..9c3349a3c60 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
@@ -53,6 +53,7 @@ import jdk.nashorn.internal.runtime.ScriptFunction;
 import jdk.nashorn.internal.runtime.ScriptObject;
 import jdk.nashorn.internal.runtime.ScriptRuntime;
 import jdk.nashorn.internal.runtime.arrays.ArrayIndex;
+import jdk.nashorn.internal.runtime.linker.MethodHandleFactory;
 import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
 import jdk.nashorn.internal.runtime.linker.NashornGuards;
 import jdk.nashorn.internal.runtime.linker.PrimitiveLookup;
@@ -931,7 +932,7 @@ public final class NativeString extends ScriptObject {
         try {
             return MethodHandles.lookup().findStatic(NativeString.class, "wrapFilter", MH.type(NativeString.class, Object.class));
         } catch (final NoSuchMethodException | IllegalAccessException e) {
-            throw new AssertionError(e);
+            throw new MethodHandleFactory.LookupException(e);
         }
     }
 }
diff --git a/nashorn/src/jdk/nashorn/internal/objects/PrototypeObject.java b/nashorn/src/jdk/nashorn/internal/objects/PrototypeObject.java
index 382db5cd20d..59c1521bbff 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/PrototypeObject.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/PrototypeObject.java
@@ -106,6 +106,6 @@ public class PrototypeObject extends ScriptObject {
     }
 
     private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
-        return MH.findStatic(MethodHandles.lookup(), PrototypeObject.class, name, MH.type(rtype, types));
+        return MH.findStatic(MethodHandles.publicLookup(), PrototypeObject.class, name, MH.type(rtype, types));
     }
 }
diff --git a/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java b/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
index 981bfd7c186..6e74f303bbc 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
@@ -39,6 +39,7 @@ import jdk.nashorn.internal.runtime.ScriptObject;
 import jdk.nashorn.internal.runtime.ScriptRuntime;
 import jdk.nashorn.internal.runtime.Source;
 import jdk.nashorn.internal.runtime.linker.Lookup;
+import jdk.nashorn.internal.runtime.linker.MethodHandleFactory;
 
 /**
  * Concrete implementation of ScriptFunction. This sets correct map for the
@@ -340,6 +341,10 @@ public class ScriptFunctionImpl extends ScriptFunction {
     }
 
     private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
-        return MH.findStatic(MethodHandles.lookup(), ScriptFunctionImpl.class, name, MH.type(rtype, types));
+        try {
+            return MethodHandles.lookup().findStatic(ScriptFunctionImpl.class, name, MH.type(rtype, types));
+        } catch (final NoSuchMethodException | IllegalAccessException e) {
+            throw new MethodHandleFactory.LookupException(e);
+        }
     }
 }

From 7784f11d280bb4f9de391cd086b0e95df9024a9c Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Sat, 19 Jan 2013 09:14:43 +0530
Subject: [PATCH 076/311] 8006584: improve variable handling in
 NashornScriptEngine

Reviewed-by: jlaskey, hannesw
---
 .../api/scripting/NashornScriptEngine.java    |  74 +------
 .../api/scripting/ScriptObjectMirror.java     | 131 +++++++-----
 .../api/scripting/ScriptEngineTest.java       | 187 +++++++++++-------
 3 files changed, 204 insertions(+), 188 deletions(-)

diff --git a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
index 37a7166d878..075dafb4906 100644
--- a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
+++ b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
@@ -28,15 +28,11 @@ package jdk.nashorn.api.scripting;
 import static jdk.nashorn.internal.runtime.ECMAErrors.referenceError;
 import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
 import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
-import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
-import java.lang.invoke.MethodHandle;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
 import java.net.URL;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
@@ -140,6 +136,8 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
             }
             throw new RuntimeException(e);
         }
+
+        context.setBindings(new ScriptObjectMirror(global, global), ScriptContext.ENGINE_SCOPE);
     }
 
     @Override
@@ -156,23 +154,6 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
         return evalImpl(script.toCharArray(), ctxt);
     }
 
-    /*
-     * FIXME: This is not exactly right. Script execution should actually
-     * put the variables in ENGINE_SCOPE bindings. But, it is difficult
-     * (not possible?) with the way ScriptObject is implemented. So, for now
-     * giving access to script variables by accessing it from "globals". This
-     * way at least engine.get("foo") will work whenever "foo" is a global var
-     * defined by eval'ed scripts.
-     */
-    @Override
-    public Object get(final String key) {
-        Object value = super.get(key);
-        if (value == null) {
-            value = ScriptObjectMirror.wrap(global.get(key), global);
-        }
-        return (value == UNDEFINED) ? null : value;
-    }
-
     @Override
     public ScriptEngineFactory getFactory() {
         return factory;
@@ -306,23 +287,6 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
         }
 
         value = ScriptObjectMirror.unwrap(value, global);
-
-        if (value instanceof Method) {
-            final Method method = (Method) value;
-            final int    mods   = method.getModifiers();
-            if (Modifier.isStatic(mods) && Modifier.isPublic(mods)) {
-               value = MH.find((Method)value);
-            }
-        }
-
-        if (value instanceof MethodHandle) {
-            value = ((GlobalObject)global).newScriptFunction(name, (MethodHandle)value, null, false);
-        }
-
-        if (!(value instanceof ScriptFunction)) {
-            typeError(global, "not.a.function", name);
-        }
-
         if (value instanceof ScriptFunction) {
             return ScriptObjectMirror.unwrap(ScriptRuntime.apply((ScriptFunction)value, global, args), global);
         }
@@ -359,13 +323,12 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
     // scripts should see "context" and "engine" as variables
     private void setContextVariables(final ScriptContext ctxt) {
         ctxt.setAttribute("context", ctxt, ScriptContext.ENGINE_SCOPE);
-        // current ScriptContext exposed as "context"
         global.set("context", ctxt, false);
-        Object args = ctxt.getAttribute("arguments");
-        // if no arguments passed, make it empty array
-        if (args == null) {
+        Object args = ScriptObjectMirror.unwrap(ctxt.getAttribute("arguments"), global);
+        if (args == null || args == UNDEFINED) {
             args = ScriptRuntime.EMPTY_ARRAY;
         }
+        // if no arguments passed, expose it
         args = ((GlobalObject)global).wrapAsObject(args);
         global.set("arguments", args, false);
     }
@@ -382,7 +345,7 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
             }
 
             ScriptObject sobj;
-            Object       value;
+            Object       value = null;
 
             self = ScriptObjectMirror.unwrap(self, global);
 
@@ -394,25 +357,6 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
                 self  = global;
                 sobj  = global;
                 value = sobj.get(name);
-            } else {
-                // Find the java method and make a ScriptFunction of it.
-                final Method[] methods = self.getClass().getMethods();
-                Method target = null;
-
-                for (final Method mth : methods) {
-                    // choose the right overload by number of arguments -- don't
-                    // care overload resolution for now..
-                    if (mth.getName().equals(name) &&
-                        mth.getParameterTypes().length == args.length) {
-                        target = mth;
-                        break;
-                    }
-                }
-                if (target == null) {
-                    throw new NoSuchMethodException(name);
-                }
-                final GlobalObject gobj = (GlobalObject) global;
-                value = gobj.newScriptFunction(name, MH.find(target), null, false);
             }
 
             if (value instanceof ScriptFunction) {
@@ -423,7 +367,7 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
                     throwAsScriptException(e);
                     throw new AssertionError("should not reach here");
                 }
-                return ScriptObjectMirror.wrap(res, global);
+                return ScriptObjectMirror.translateUndefined(ScriptObjectMirror.wrap(res, global));
             }
 
             throw new NoSuchMethodException(name);
@@ -461,8 +405,7 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
             }
 
             Object res = ScriptRuntime.apply(script, global);
-            res = ScriptObjectMirror.wrap(res, global);
-            return (res == UNDEFINED) ? null : res;
+            return ScriptObjectMirror.translateUndefined(ScriptObjectMirror.wrap(res, global));
         } catch (final Exception e) {
             throwAsScriptException(e);
             throw new AssertionError("should not reach here");
@@ -516,7 +459,6 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
                 setNashornGlobal(global);
             }
 
-            setContextVariables(ctxt);
             return nashornContext.compileScript(source, global, nashornContext._strict);
         } catch (final Exception e) {
             throwAsScriptException(e);
diff --git a/nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java b/nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java
index 52391d2c7fb..5445c766a1e 100644
--- a/nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java
+++ b/nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java
@@ -35,6 +35,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.Callable;
+import javax.script.Bindings;
 import jdk.nashorn.internal.runtime.Context;
 import jdk.nashorn.internal.runtime.ScriptFunction;
 import jdk.nashorn.internal.runtime.ScriptObject;
@@ -43,9 +44,10 @@ import netscape.javascript.JSObject;
 
 /**
  * Mirror object that wraps a given ScriptObject instance. User can
- * access ScriptObject via the java.util.Map interface.
+ * access ScriptObject via the javax.script.Bindings interface or
+ * netscape.javascript.JSObject interface.
  */
-final class ScriptObjectMirror extends JSObject implements Map<Object, Object> {
+final class ScriptObjectMirror extends JSObject implements Bindings {
     private final ScriptObject sobj;
     private final ScriptObject global;
 
@@ -146,12 +148,20 @@ final class ScriptObjectMirror extends JSObject implements Map<Object, Object> {
 
     @Override
     public Object getMember(final String name) {
-        return get(name);
+        return inGlobal(new Callable<Object>() {
+            @Override public Object call() {
+                return wrap(sobj.get(name), global);
+            }
+        });
     }
 
     @Override
     public Object getSlot(final int index) {
-        return get(Integer.valueOf(index));
+        return inGlobal(new Callable<Object>() {
+            @Override public Object call() {
+                return wrap(sobj.get(index), global);
+            }
+        });
     }
 
     @Override
@@ -166,7 +176,12 @@ final class ScriptObjectMirror extends JSObject implements Map<Object, Object> {
 
     @Override
     public void setSlot(final int index, final Object value) {
-        put(Integer.valueOf(index), wrap(value, Context.getGlobal()));
+        inGlobal(new Callable<Void>() {
+            @Override public Void call() {
+                sobj.set(index, unwrap(value, global), global.getContext()._strict);
+                return null;
+            }
+        });
     }
 
     @Override
@@ -175,7 +190,8 @@ final class ScriptObjectMirror extends JSObject implements Map<Object, Object> {
             @Override public Object call() {
                 sobj.clear();
                 return null;
-            }});
+            }
+        });
     }
 
     @Override
@@ -183,7 +199,8 @@ final class ScriptObjectMirror extends JSObject implements Map<Object, Object> {
         return inGlobal(new Callable<Boolean>() {
             @Override public Boolean call() {
                 return sobj.containsKey(unwrap(key, global));
-            }});
+            }
+        });
     }
 
     @Override
@@ -191,19 +208,20 @@ final class ScriptObjectMirror extends JSObject implements Map<Object, Object> {
         return inGlobal(new Callable<Boolean>() {
             @Override public Boolean call() {
                 return sobj.containsValue(unwrap(value, global));
-            }});
+            }
+        });
     }
 
     @Override
-    public Set<Map.Entry<Object, Object>> entrySet() {
-        return inGlobal(new Callable<Set<Map.Entry<Object, Object>>>() {
-            @Override public Set<Map.Entry<Object, Object>> call() {
+    public Set<Map.Entry<String, Object>> entrySet() {
+        return inGlobal(new Callable<Set<Map.Entry<String, Object>>>() {
+            @Override public Set<Map.Entry<String, Object>> call() {
                 final Iterator<String>               iter    = sobj.propertyIterator();
-                final Set<Map.Entry<Object, Object>> entries = new HashSet<>();
+                final Set<Map.Entry<String, Object>> entries = new HashSet<>();
 
                 while (iter.hasNext()) {
-                    final Object key   = wrap(iter.next(), global);
-                    final Object value = wrap(sobj.get(key), global);
+                    final String key   = iter.next();
+                    final Object value = translateUndefined(wrap(sobj.get(key), global));
                     entries.add(new AbstractMap.SimpleImmutableEntry<>(key, value));
                 }
 
@@ -214,49 +232,58 @@ final class ScriptObjectMirror extends JSObject implements Map<Object, Object> {
 
     @Override
     public Object get(final Object key) {
-        return inGlobal(new Callable<Object>() { @Override public Object call() {
-            return wrap(sobj.get(key), global);
-        }});
+        return inGlobal(new Callable<Object>() {
+            @Override public Object call() {
+                return translateUndefined(wrap(sobj.get(key), global));
+            }
+        });
     }
 
     @Override
     public boolean isEmpty() {
-        return inGlobal(new Callable<Boolean>() { @Override public Boolean call() {
-            return sobj.isEmpty();
-        }});
-    }
-
-    @Override
-    public Set<Object> keySet() {
-        return inGlobal(new Callable<Set<Object>>() { @Override public Set<Object> call() {
-            final Iterator<String> iter   = sobj.propertyIterator();
-            final Set<Object>      keySet = new HashSet<>();
-
-            while (iter.hasNext()) {
-                keySet.add(wrap(iter.next(), global));
+        return inGlobal(new Callable<Boolean>() {
+            @Override public Boolean call() {
+                return sobj.isEmpty();
             }
-
-            return Collections.unmodifiableSet(keySet);
-        }});
+        });
     }
 
     @Override
-    public Object put(final Object key, final Object value) {
+    public Set<String> keySet() {
+        return inGlobal(new Callable<Set<String>>() {
+            @Override public Set<String> call() {
+                final Iterator<String> iter   = sobj.propertyIterator();
+                final Set<String>      keySet = new HashSet<>();
+
+                while (iter.hasNext()) {
+                    keySet.add(iter.next());
+                }
+
+                return Collections.unmodifiableSet(keySet);
+            }
+        });
+    }
+
+    @Override
+    public Object put(final String key, final Object value) {
         return inGlobal(new Callable<Object>() {
             @Override public Object call() {
-                return sobj.put(unwrap(key, global), unwrap(value, global));
-        }});
+                return sobj.put(key, unwrap(value, global));
+            }
+        });
     }
 
     @Override
-    public void putAll(final Map<?, ?> map) {
+    public void putAll(final Map<? extends String, ? extends Object> map) {
         final boolean strict = sobj.getContext()._strict;
-        inGlobal(new Callable<Object>() { @Override public Object call() {
-            for (final Map.Entry<?, ?> entry : map.entrySet()) {
-                sobj.set(unwrap(entry.getKey(), global), unwrap(entry.getValue(), global), strict);
+        inGlobal(new Callable<Object>() {
+            @Override public Object call() {
+                for (final Map.Entry<? extends String, ? extends Object> entry : map.entrySet()) {
+                    sobj.set(entry.getKey(), unwrap(entry.getValue(), global), strict);
+                }
+                return null;
             }
-            return null;
-        }});
+        });
     }
 
     @Override
@@ -279,16 +306,22 @@ final class ScriptObjectMirror extends JSObject implements Map<Object, Object> {
 
     @Override
     public Collection<Object> values() {
-        return inGlobal(new Callable<Collection<Object>>() { @Override public Collection<Object> call() {
-            final List<Object>     values = new ArrayList<>(size());
-            final Iterator<Object> iter   = sobj.valueIterator();
+        return inGlobal(new Callable<Collection<Object>>() {
+            @Override public Collection<Object> call() {
+                final List<Object>     values = new ArrayList<>(size());
+                final Iterator<Object> iter   = sobj.valueIterator();
 
-            while (iter.hasNext()) {
-                values.add(wrap(iter.next(), global));
+                while (iter.hasNext()) {
+                    values.add(wrap(iter.next(), global));
+                }
+
+                return Collections.unmodifiableList(values);
             }
+        });
+    }
 
-            return Collections.unmodifiableList(values);
-        }});
+    static Object translateUndefined(Object obj) {
+        return (obj == ScriptRuntime.UNDEFINED)? null : obj;
     }
 
     static Object wrap(final Object obj, final ScriptObject homeGlobal) {
diff --git a/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java b/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
index 21837ee9c87..d3b328a14d2 100644
--- a/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
+++ b/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
@@ -27,6 +27,7 @@ package jdk.nashorn.api.scripting;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
 
@@ -40,13 +41,13 @@ import javax.script.Bindings;
 import javax.script.Compilable;
 import javax.script.CompiledScript;
 import javax.script.Invocable;
+import javax.script.ScriptContext;
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineFactory;
 import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
 import jdk.nashorn.internal.runtime.Version;
 import netscape.javascript.JSObject;
-import org.testng.Assert;
 import org.testng.TestNG;
 import org.testng.annotations.Test;
 
@@ -107,8 +108,8 @@ public class ScriptEngineTest {
         final ScriptEngine e = m.getEngineByName("nashorn");
 
         try {
-            assertEquals(true,e.eval("arguments instanceof Array"));
-            assertEquals(true, e.eval("arguments.length == 0"));
+            assertEquals(e.eval("arguments instanceof Array"), true);
+            assertEquals(e.eval("arguments.length == 0"), true);
         } catch (final Exception exp) {
             exp.printStackTrace();
             fail(exp.getMessage());
@@ -123,13 +124,13 @@ public class ScriptEngineTest {
 
         final ScriptEngineFactory fac = e.getFactory();
 
-        assertEquals("ECMAScript", fac.getLanguageName());
-        assertEquals("javascript", fac.getParameter(ScriptEngine.NAME));
-        assertEquals("ECMA - 262 Edition 5.1", fac.getLanguageVersion());
-        assertEquals("Oracle Nashorn", fac.getEngineName());
-        assertEquals(Version.version(), fac.getEngineVersion());
-        assertEquals("print(context)", fac.getOutputStatement("context"));
-        assertEquals("javascript", fac.getParameter(ScriptEngine.NAME));
+        assertEquals(fac.getLanguageName(), "ECMAScript");
+        assertEquals(fac.getParameter(ScriptEngine.NAME), "javascript");
+        assertEquals(fac.getLanguageVersion(), "ECMA - 262 Edition 5.1");
+        assertEquals(fac.getEngineName(), "Oracle Nashorn");
+        assertEquals(fac.getEngineVersion(), Version.version());
+        assertEquals(fac.getOutputStatement("context"), "print(context)");
+        assertEquals(fac.getParameter(ScriptEngine.NAME), "javascript");
 
         boolean seenJS = false;
         for (String ext : fac.getExtensions()) {
@@ -138,9 +139,9 @@ public class ScriptEngineTest {
             }
         }
 
-        assertEquals(true, seenJS);
+        assertEquals(seenJS, true);
         String str = fac.getMethodCallSyntax("obj", "foo", "x");
-        assertEquals("obj.foo(x)", str);
+        assertEquals(str, "obj.foo(x)");
 
         boolean seenNashorn = false, seenJavaScript = false, seenECMAScript = false;
         for (String name : fac.getNames()) {
@@ -151,9 +152,9 @@ public class ScriptEngineTest {
             }
         }
 
-        assertEquals(true, seenNashorn);
-        assertEquals(true, seenJavaScript);
-        assertEquals(true, seenECMAScript);
+        assertTrue(seenNashorn);
+        assertTrue(seenJavaScript);
+        assertTrue(seenECMAScript);
 
         boolean seenAppJS = false, seenAppECMA = false, seenTextJS = false, seenTextECMA = false;
         for (String mime : fac.getMimeTypes()) {
@@ -165,10 +166,10 @@ public class ScriptEngineTest {
             }
         }
 
-        assertEquals(true, seenAppJS);
-        assertEquals(true, seenAppECMA);
-        assertEquals(true, seenTextJS);
-        assertEquals(true, seenTextECMA);
+        assertTrue(seenAppJS);
+        assertTrue(seenAppECMA);
+        assertTrue(seenTextJS);
+        assertTrue(seenTextECMA);
     }
 
     @Test
@@ -186,9 +187,9 @@ public class ScriptEngineTest {
             e.eval("print('hello)");
             fail("script exception expected");
         } catch (final ScriptException se) {
-            assertEquals(1, se.getLineNumber());
-            assertEquals(13, se.getColumnNumber());
-            assertEquals("myfile.js", se.getFileName());
+            assertEquals(se.getLineNumber(), 1);
+            assertEquals(se.getColumnNumber(), 13);
+            assertEquals(se.getFileName(), "myfile.js");
             // se.printStackTrace();
         }
 
@@ -251,7 +252,7 @@ public class ScriptEngineTest {
             fail(se.getMessage());
         }
 
-        assertEquals(Boolean.TRUE, res);
+        assertEquals(res, Boolean.TRUE);
     }
 
     @Test
@@ -289,7 +290,7 @@ public class ScriptEngineTest {
 
         try {
             e.eval("var x = 'hello'");
-            assertEquals("hello", e.get("x"));
+            assertEquals(e.get("x"), "hello");
         } catch (final ScriptException exp) {
             exp.printStackTrace();
             fail(exp.getMessage());
@@ -310,21 +311,21 @@ public class ScriptEngineTest {
         }
     }
 
-    public static void alert(final Object self, final Object msg) {
+    public static void alert(final Object msg) {
         System.out.println(msg);
     }
 
     @Test
-    public void exposeFunctionTest() {
+    public void exposeMethodTest() {
         final ScriptEngineManager m = new ScriptEngineManager();
         final ScriptEngine e = m.getEngineByName("nashorn");
 
         try {
-            final Method alert = ScriptEngineTest.class.getMethod("alert", Object.class, Object.class);
+            final Method alert = ScriptEngineTest.class.getMethod("alert", Object.class);
             // expose a Method object as global var.
             e.put("alert", alert);
             // call the global var.
-            e.eval("alert('alert! alert!!')");
+            e.eval("alert.invoke(null, 'alert! alert!!')");
         } catch (final NoSuchMethodException | SecurityException | ScriptException exp) {
             exp.printStackTrace();
             fail(exp.getMessage());
@@ -359,11 +360,8 @@ public class ScriptEngineTest {
 
         try {
             e.put("window", window);
-            e.eval("print(window.alert)"); // TODO: bug - prints 'undefined'
+            e.eval("print(window.alert)");
             e.eval("window.alert('calling window.alert...')");
-            // TODO: java.lang.NoSuchMethodException: alert
-            // ((Invocable) e).invokeMethod(window, "alert",
-            // "invoking window.alert...");
         } catch (final Exception exp) {
             exp.printStackTrace();
             fail(exp.getMessage());
@@ -379,8 +377,8 @@ public class ScriptEngineTest {
         try {
             e.put("window", window);
             e.eval("print(window.location)");
-            final Object locationValue = ((Invocable)e).invokeMethod(window, "getLocation");
-            assertEquals("http://localhost:8080/window", locationValue);
+            final Object locationValue = e.eval("window.getLocation()");
+            assertEquals(locationValue, "http://localhost:8080/window");
         } catch (final Exception exp) {
             exp.printStackTrace();
             fail(exp.getMessage());
@@ -396,9 +394,9 @@ public class ScriptEngineTest {
         try {
             e.put("window", window);
             final String item1 = (String)e.eval("window.item(65535)");
-            assertEquals("ffff", item1);
-            final String item2 = (String)((Invocable)e).invokeMethod(window, "item", 255);
-            assertEquals("ff", item2);
+            assertEquals(item1, "ffff");
+            final String item2 = (String)e.eval("window.item(255)");
+            assertEquals(item2, "ff");
         } catch (final Exception exp) {
             exp.printStackTrace();
             fail(exp.getMessage());
@@ -434,9 +432,9 @@ public class ScriptEngineTest {
             e.eval("throw 'foo'");
         } catch (final ScriptException exp) {
             log(exp.getMessage());
-            assertEquals("foo in throwtest.js at line number 1 at column number 0", exp.getMessage());
-            assertEquals("throwtest.js", exp.getFileName());
-            assertEquals(1, exp.getLineNumber());
+            assertEquals(exp.getMessage(), "foo in throwtest.js at line number 1 at column number 0");
+            assertEquals(exp.getFileName(), "throwtest.js");
+            assertEquals(exp.getLineNumber(), 1);
         }
     }
 
@@ -491,18 +489,18 @@ public class ScriptEngineTest {
 
         int count = 0;
         Map<Object, Object> map = (Map<Object, Object>)e.get("obj");
-        assertEquals(false, map.isEmpty());
-        assertEquals(true, map.keySet().contains("x"));
-        assertEquals(true, map.containsKey("x"));
-        assertEquals(true, map.values().contains("nashorn"));
-        assertEquals(true, map.containsValue("nashorn"));
+        assertFalse(map.isEmpty());
+        assertTrue(map.keySet().contains("x"));
+        assertTrue(map.containsKey("x"));
+        assertTrue(map.values().contains("nashorn"));
+        assertTrue(map.containsValue("nashorn"));
         for (final Map.Entry<?, ?> ex : map.entrySet()) {
             final Object key = ex.getKey();
             if (key.equals("x")) {
                 assertTrue(344 == ((Number)ex.getValue()).doubleValue());
                 count++;
             } else if (key.equals("y")) {
-                assertEquals("nashorn", ex.getValue());
+                assertEquals(ex.getValue(), "nashorn");
                 count++;
             }
         }
@@ -511,56 +509,56 @@ public class ScriptEngineTest {
 
         // add property
         map.put("z", "hello");
-        assertEquals("hello", e.eval("obj.z"));
-        assertEquals("hello", map.get("z"));
-        assertEquals(true, map.keySet().contains("z"));
-        assertEquals(true, map.containsKey("z"));
-        assertEquals(true, map.values().contains("hello"));
-        assertEquals(true, map.containsValue("hello"));
-        assertEquals(3, map.size());
+        assertEquals(e.eval("obj.z"), "hello");
+        assertEquals(map.get("z"), "hello");
+        assertTrue(map.keySet().contains("z"));
+        assertTrue(map.containsKey("z"));
+        assertTrue(map.values().contains("hello"));
+        assertTrue(map.containsValue("hello"));
+        assertEquals(map.size(), 3);
 
         final Map<Object, Object> newMap = new HashMap<>();
         newMap.put("foo", 23.0);
         newMap.put("bar", true);
         map.putAll(newMap);
 
-        assertEquals(23.0, e.eval("obj.foo"));
-        assertEquals(true, e.eval("obj.bar"));
+        assertEquals(e.eval("obj.foo"), 23.0);
+        assertEquals(e.eval("obj.bar"), true);
 
         // remove using map method
         map.remove("foo");
-        assertEquals("undefined", e.eval("typeof obj.foo"));
+        assertEquals(e.eval("typeof obj.foo"), "undefined");
 
         count = 0;
         e.eval("var arr = [ true, 'hello' ]");
         map = (Map<Object, Object>)e.get("arr");
-        assertEquals(false, map.isEmpty());
-        assertEquals(true, map.containsKey("length"));
-        assertEquals(true, map.containsValue("hello"));
+        assertFalse(map.isEmpty());
+        assertTrue(map.containsKey("length"));
+        assertTrue(map.containsValue("hello"));
         for (final Map.Entry<?, ?> ex : map.entrySet()) {
             final Object key = ex.getKey();
             if (key.equals("0")) {
-                assertEquals(Boolean.TRUE, ex.getValue());
+                assertEquals(ex.getValue(), Boolean.TRUE);
                 count++;
             } else if (key.equals("1")) {
-                assertEquals("hello", ex.getValue());
+                assertEquals(ex.getValue(), "hello");
                 count++;
             }
         }
-        assertEquals(2, count);
-        assertEquals(2, map.size());
+        assertEquals(count, 2);
+        assertEquals(map.size(), 2);
 
         // add element
-        map.put(2, "world");
-        assertEquals("world", map.get(2));
-        assertEquals(3, map.size());
+        map.put("2", "world");
+        assertEquals(map.get("2"), "world");
+        assertEquals(map.size(), 3);
 
         // remove all
         map.clear();
-        assertEquals(true, map.isEmpty());
-        assertEquals("undefined", e.eval("typeof arr[0]"));
-        assertEquals("undefined", e.eval("typeof arr[1]"));
-        assertEquals("undefined", e.eval("typeof arr[2]"));
+        assertTrue(map.isEmpty());
+        assertEquals(e.eval("typeof arr[0]"), "undefined");
+        assertEquals(e.eval("typeof arr[1]"), "undefined");
+        assertEquals(e.eval("typeof arr[2]"), "undefined");
     }
 
     @Test
@@ -585,7 +583,7 @@ public class ScriptEngineTest {
             e.eval("var Example = function() { this.hello = function() { return 'Hello World!'; };}; myExample = new Example();");
             final Object obj = e.get("myExample");
             final Object res = ((Invocable)e).invokeMethod(obj, "hello");
-            assertEquals("Hello World!", res);
+            assertEquals(res, "Hello World!");
         } catch (final Exception exp) {
             exp.printStackTrace();
             fail(exp.getMessage());
@@ -867,7 +865,7 @@ public class ScriptEngineTest {
         final ScriptEngine e = m.getEngineByName("nashorn");
         try {
             Object obj = e.eval("new TypeError('wrong type')");
-            Assert.assertEquals(obj.toString(), "TypeError: wrong type", "toString returns wrong value");
+            assertEquals(obj.toString(), "TypeError: wrong type", "toString returns wrong value");
         } catch (final Throwable t) {
             t.printStackTrace();
             fail(t.getMessage());
@@ -875,10 +873,53 @@ public class ScriptEngineTest {
 
         try {
             Object obj = e.eval("function func() { print('hello'); }");
-            Assert.assertEquals(obj.toString(), "function func() { print('hello'); }", "toString returns wrong value");
+            assertEquals(obj.toString(), "function func() { print('hello'); }", "toString returns wrong value");
         } catch (final Throwable t) {
             t.printStackTrace();
             fail(t.getMessage());
         }
     }
+
+    @Test
+    public void engineScopeTest() {
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+        Bindings engineScope = e.getBindings(ScriptContext.ENGINE_SCOPE);
+
+        // check few ECMA standard built-in global properties
+        assertNotNull(engineScope.get("Object"));
+        assertNotNull(engineScope.get("TypeError"));
+        assertNotNull(engineScope.get("eval"));
+
+        // can access via ScriptEngine.get as well
+        assertNotNull(e.get("Object"));
+        assertNotNull(e.get("TypeError"));
+        assertNotNull(e.get("eval"));
+
+        // Access by either way should return same object
+        assertEquals(engineScope.get("Array"), e.get("Array"));
+        assertEquals(engineScope.get("EvalError"), e.get("EvalError"));
+        assertEquals(engineScope.get("undefined"), e.get("undefined"));
+
+        // try exposing a new variable from scope
+        engineScope.put("myVar", "foo");
+        try {
+            assertEquals(e.eval("myVar"), "foo");
+        } catch (final ScriptException se) {
+            se.printStackTrace();
+            fail(se.getMessage());
+        }
+
+        // update "myVar" in script an check the value from scope
+        try {
+            e.eval("myVar = 'nashorn';");
+        } catch (final ScriptException se) {
+            se.printStackTrace();
+            fail(se.getMessage());
+        }
+
+        // now check modified value from scope and engine
+        assertEquals(engineScope.get("myVar"), "nashorn");
+        assertEquals(e.get("myVar"), "nashorn");
+    }
 }

From 993b92c9851831631c73ab3d6386365a0de3d25f Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Sat, 19 Jan 2013 22:35:43 +0530
Subject: [PATCH 077/311] 8006557: JDK8/Lambda build clashes on Map.replace()

Reviewed-by: jlaskey
---
 .../internal/runtime/ScriptObject.java        | 14 ++-----------
 .../nashorn/internal/runtime/ContextTest.java | 21 +++++++++----------
 2 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
index b3bf302db5f..23f2e963fe2 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
@@ -87,7 +87,7 @@ import org.dynalang.dynalink.support.CallSiteDescriptorFactory;
  */
 
 
-public abstract class ScriptObject extends PropertyListenerManager implements PropertyAccess, Map<Object, Object> {
+public abstract class ScriptObject extends PropertyListenerManager implements PropertyAccess {
 
     /** Search fall back routine name for "no such method" */
     static final String NO_SUCH_METHOD_NAME   = "__noSuchMethod__";
@@ -1414,7 +1414,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
         return (flags & IS_SCOPE) != 0;
     }
 
-    @Override
+    // java.util.Map-like methods to help ScriptObjectMirror implementation
     public void clear() {
         final boolean strict = getContext()._strict;
         final Iterator<String> iter = propertyIterator();
@@ -1423,12 +1423,10 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
         }
     }
 
-    @Override
     public boolean containsKey(final Object key) {
         return has(key);
     }
 
-    @Override
     public boolean containsValue(final Object value) {
         final Iterator<Object> iter = valueIterator();
         while (iter.hasNext()) {
@@ -1439,7 +1437,6 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
         return false;
     }
 
-    @Override
     public Set<Map.Entry<Object, Object>> entrySet() {
         final Iterator<String> iter = propertyIterator();
         final Set<Map.Entry<Object, Object>> entries = new HashSet<>();
@@ -1450,12 +1447,10 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
         return Collections.unmodifiableSet(entries);
     }
 
-    @Override
     public boolean isEmpty() {
         return !propertyIterator().hasNext();
     }
 
-    @Override
     public Set<Object> keySet() {
         final Iterator<String> iter = propertyIterator();
         final Set<Object> keySet = new HashSet<>();
@@ -1465,14 +1460,12 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
         return Collections.unmodifiableSet(keySet);
     }
 
-    @Override
     public Object put(final Object key, final Object value) {
         final Object oldValue = get(key);
         set(key, value, getContext()._strict);
         return oldValue;
     }
 
-    @Override
     public void putAll(final Map<?, ?> otherMap) {
         final boolean strict = getContext()._strict;
         for (final Map.Entry<?, ?> entry : otherMap.entrySet()) {
@@ -1480,14 +1473,12 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
         }
     }
 
-    @Override
     public Object remove(final Object key) {
         final Object oldValue = get(key);
         delete(key, getContext()._strict);
         return oldValue;
     }
 
-    @Override
     public int size() {
         int n = 0;
         for (final Iterator<String> iter = propertyIterator(); iter.hasNext(); iter.next()) {
@@ -1496,7 +1487,6 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
         return n;
     }
 
-    @Override
     public Collection<Object> values() {
         final List<Object>     values = new ArrayList<>(size());
         final Iterator<Object> iter   = valueIterator();
diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/ContextTest.java b/nashorn/test/src/jdk/nashorn/internal/runtime/ContextTest.java
index 059c98c3f91..2539b2b1f81 100644
--- a/nashorn/test/src/jdk/nashorn/internal/runtime/ContextTest.java
+++ b/nashorn/test/src/jdk/nashorn/internal/runtime/ContextTest.java
@@ -49,13 +49,13 @@ public class ContextTest {
             assertTrue(32.0 == ((Number)(eval(cx, "<evalTest>", code))).doubleValue());
 
             code = "obj = { js: 'nashorn' }; obj.js";
-            assertEquals("nashorn", eval(cx, "<evalTest2>", code));
+            assertEquals(eval(cx, "<evalTest2>", code), "nashorn");
         } finally {
             Context.setGlobal(oldGlobal);
         }
     }
 
-    // basic check for JS reflection access
+    // basic check for JS reflection access - java.util.Map-like access on ScriptObject
     @Test
     public void reflectionTest() {
         final Options options = new Options("");
@@ -70,12 +70,11 @@ public class ContextTest {
 
             final Object obj = cx.getGlobal().get("obj");
 
-            assertTrue(obj instanceof Map);
+            assertTrue(obj instanceof ScriptObject);
 
-            @SuppressWarnings("unchecked")
-            final Map<Object, Object> map = (Map<Object, Object>)obj;
+            final ScriptObject sobj = (ScriptObject)obj;
             int count = 0;
-            for (final Map.Entry<?, ?> ex : map.entrySet()) {
+            for (final Map.Entry<?, ?> ex : sobj.entrySet()) {
                 final Object key = ex.getKey();
                 if (key.equals("x")) {
                     assertTrue(ex.getValue() instanceof Number);
@@ -89,13 +88,13 @@ public class ContextTest {
                     count++;
                 }
             }
-            assertEquals(2, count);
-            assertEquals(2, map.size());
+            assertEquals(count, 2);
+            assertEquals(sobj.size(), 2);
 
             // add property
-            map.put("zee", "hello");
-            assertEquals("hello", map.get("zee"));
-            assertEquals(3, map.size());
+            sobj.put("zee", "hello");
+            assertEquals(sobj.get("zee"), "hello");
+            assertEquals(sobj.size(), 3);
 
         } finally {
             Context.setGlobal(oldGlobal);

From acaee2a2f48df04757d084122928dad31d2e9cce Mon Sep 17 00:00:00 2001
From: Attila Szegedi <attila@openjdk.org>
Date: Mon, 21 Jan 2013 11:03:56 +0100
Subject: [PATCH 078/311] 8006525: Give StaticClass objects their own linker

Reviewed-by: hannesw, lagergren
---
 .../internal/runtime/linker/Bootstrap.java    |   3 +-
 .../linker/NashornPrimitiveLinker.java        |  58 ++--------
 .../linker/NashornStaticClassLinker.java      | 101 ++++++++++++++++++
 3 files changed, 109 insertions(+), 53 deletions(-)
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java

diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/Bootstrap.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/Bootstrap.java
index 37e941d1df6..a658960ac29 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/Bootstrap.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/Bootstrap.java
@@ -54,7 +54,8 @@ public final class Bootstrap {
     private static final DynamicLinker dynamicLinker;
     static {
         final DynamicLinkerFactory factory = new DynamicLinkerFactory();
-        factory.setPrioritizedLinkers(new NashornLinker(), new NashornPrimitiveLinker(), new JSObjectLinker());
+        factory.setPrioritizedLinkers(new NashornLinker(), new NashornPrimitiveLinker(), new NashornStaticClassLinker(),
+                new JSObjectLinker());
         factory.setFallbackLinkers(new BeansLinker(), new NashornBottomLinker());
         factory.setSyncOnRelink(true);
         final int relinkThreshold = Options.getIntProperty("nashorn.unstable.relink.threshold", -1);
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java
index bc9bf422e3c..069e608bae4 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java
@@ -31,44 +31,28 @@ import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import jdk.nashorn.internal.runtime.ConsString;
 import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.ECMAErrors;
 import jdk.nashorn.internal.runtime.GlobalObject;
-import org.dynalang.dynalink.beans.BeansLinker;
-import org.dynalang.dynalink.beans.StaticClass;
 import org.dynalang.dynalink.linker.ConversionComparator;
 import org.dynalang.dynalink.linker.GuardedInvocation;
-import org.dynalang.dynalink.linker.GuardingDynamicLinker;
 import org.dynalang.dynalink.linker.GuardingTypeConverterFactory;
 import org.dynalang.dynalink.linker.LinkRequest;
 import org.dynalang.dynalink.linker.LinkerServices;
 import org.dynalang.dynalink.linker.TypeBasedGuardingDynamicLinker;
-import org.dynalang.dynalink.support.Guards;
 import org.dynalang.dynalink.support.TypeUtilities;
 
 /**
- * Internal linker for String, Boolean, Number, and {@link StaticClass} objects, only ever used by Nashorn engine and
- * not exposed to other engines. It is used for treatment of strings, boolean, and numbers, as JavaScript primitives,
- * as well as for extending the "new" operator on StaticClass in order to be able to instantiate interfaces and abstract
- * classes by passing a ScriptObject or ScriptFunction as their implementation, e.g.:
- * <pre>
- *   var r = new Runnable() { run: function() { print("Hello World" } }
- * </pre>
- * or even, for SAM types:
- * <pre>
- *   var r = new Runnable(function() { print("Hello World" })
- * </pre>
+ * Internal linker for String, Boolean, and Number objects, only ever used by Nashorn engine and not exposed to other
+ * engines. It is used for treatment of strings, boolean, and numbers as JavaScript primitives. Also provides ECMAScript
+ * primitive type conversions for these types when linking to Java methods.
  */
 class NashornPrimitiveLinker implements TypeBasedGuardingDynamicLinker, GuardingTypeConverterFactory, ConversionComparator {
-    private static final GuardingDynamicLinker staticClassLinker = BeansLinker.getLinkerForClass(StaticClass.class);
-
     @Override
     public boolean canLinkType(final Class<?> type) {
         return canLinkTypeStatic(type);
     }
 
     private static boolean canLinkTypeStatic(final Class<?> type) {
-        return type == String.class || type == Boolean.class || type == StaticClass.class ||
-                type == ConsString.class || Number.class.isAssignableFrom(type);
+        return type == String.class || type == Boolean.class || type == ConsString.class || Number.class.isAssignableFrom(type);
     }
 
     @Override
@@ -86,41 +70,10 @@ class NashornPrimitiveLinker implements TypeBasedGuardingDynamicLinker, Guarding
            return Bootstrap.asType(global.stringLookup(desc, (CharSequence) self), linkerServices, desc);
         } else if (self instanceof Boolean) {
             return Bootstrap.asType(global.booleanLookup(desc, (Boolean) self), linkerServices, desc);
-        } else if (self instanceof StaticClass) {
-            // We intercept "new" on StaticClass instances to provide additional capabilities
-            if ("new".equals(desc.getOperator())) {
-                final Class<?> receiverClass = ((StaticClass) self).getRepresentedClass();
-                // Is the class abstract? (This includes interfaces.)
-                if (JavaAdapterFactory.isAbstractClass(receiverClass)) {
-                    // Change this link request into a link request on the adapter class.
-                    final Object[] args = request.getArguments();
-                    args[0] = JavaAdapterFactory.getAdapterClassFor(new Class<?>[] { receiverClass });
-                    final LinkRequest adapterRequest = request.replaceArguments(request.getCallSiteDescriptor(), args);
-                    final GuardedInvocation gi = checkNullConstructor(
-                            staticClassLinker.getGuardedInvocation(adapterRequest, linkerServices), receiverClass);
-                    // Finally, modify the guard to test for the original abstract class.
-                    return gi.replaceMethods(gi.getInvocation(), Guards.getIdentityGuard(self));
-                }
-                // If the class was not abstract, just link to the ordinary constructor. Make an additional check to
-                // ensure we have a constructor. We could just fall through to the next "return" statement, except we
-                // also insert a call to checkNullConstructor() which throws an error with a more intuitive message when
-                // no suitable constructor is found.
-                return checkNullConstructor(staticClassLinker.getGuardedInvocation(request, linkerServices), receiverClass);
-            }
-            // In case this was not a "new" operation, just link with the standard StaticClass linker.
-            return staticClassLinker.getGuardedInvocation(request, linkerServices);
         }
-
         throw new AssertionError(); // Can't reach here
     }
 
-    private static GuardedInvocation checkNullConstructor(final GuardedInvocation ctorInvocation, final Class<?> receiverClass) {
-        if(ctorInvocation == null) {
-            ECMAErrors.typeError(Context.getGlobal(), "no.constructor.matches.args", receiverClass.getName());
-        }
-        return ctorInvocation;
-    }
-
     /**
      * This implementation of type converter factory will pretty much allow implicit conversions of anything to anything
      * else that's allowed among JavaScript primitive types (string to number, boolean to string, etc.)
@@ -144,7 +97,8 @@ class NashornPrimitiveLinker implements TypeBasedGuardingDynamicLinker, Guarding
      * @param sourceType the source type to convert from
      * @param targetType1 one candidate target type
      * @param targetType2 another candidate target type
-     * @return one of {@link org.dynalang.dynalink.linker.ConversionComparator.Comparison} values signifying which target type should be favored for conversion.
+     * @return one of {@link org.dynalang.dynalink.linker.ConversionComparator.Comparison} values signifying which
+     * target type should be favored for conversion.
      */
     @Override
     public Comparison compareConversion(final Class<?> sourceType, final Class<?> targetType1, final Class<?> targetType2) {
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java
new file mode 100644
index 00000000000..8ddd1fe8c88
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.linker;
+
+import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.runtime.ECMAErrors;
+import org.dynalang.dynalink.CallSiteDescriptor;
+import org.dynalang.dynalink.beans.BeansLinker;
+import org.dynalang.dynalink.beans.StaticClass;
+import org.dynalang.dynalink.linker.GuardedInvocation;
+import org.dynalang.dynalink.linker.GuardingDynamicLinker;
+import org.dynalang.dynalink.linker.LinkRequest;
+import org.dynalang.dynalink.linker.LinkerServices;
+import org.dynalang.dynalink.linker.TypeBasedGuardingDynamicLinker;
+import org.dynalang.dynalink.support.Guards;
+
+/**
+ * Internal linker for {@link StaticClass} objects, only ever used by Nashorn engine and not exposed to other engines.
+ * It is used for extending the "new" operator on StaticClass in order to be able to instantiate interfaces and abstract
+ * classes by passing a ScriptObject or ScriptFunction as their implementation, e.g.:
+ * <pre>
+ *   var r = new Runnable() { run: function() { print("Hello World" } }
+ * </pre>
+ * or for SAM types, even just passing a function:
+ * <pre>
+ *   var r = new Runnable(function() { print("Hello World" })
+ * </pre>
+ */
+class NashornStaticClassLinker implements TypeBasedGuardingDynamicLinker {
+    private static final GuardingDynamicLinker staticClassLinker = BeansLinker.getLinkerForClass(StaticClass.class);
+
+    @Override
+    public boolean canLinkType(Class<?> type) {
+        return type == StaticClass.class;
+    }
+
+    @Override
+    public GuardedInvocation getGuardedInvocation(LinkRequest linkRequest, LinkerServices linkerServices) throws Exception {
+        final LinkRequest request = linkRequest.withoutRuntimeContext(); // Nashorn has no runtime context
+        final Object self = request.getReceiver();
+        if (self.getClass() != StaticClass.class) {
+            return null;
+        }
+        final CallSiteDescriptor desc = request.getCallSiteDescriptor();
+        // We intercept "new" on StaticClass instances to provide additional capabilities
+        if ("new".equals(desc.getNameToken(CallSiteDescriptor.OPERATOR))) {
+            final Class<?> receiverClass = ((StaticClass) self).getRepresentedClass();
+            // Is the class abstract? (This includes interfaces.)
+            if (JavaAdapterFactory.isAbstractClass(receiverClass)) {
+                // Change this link request into a link request on the adapter class.
+                final Object[] args = request.getArguments();
+                args[0] = JavaAdapterFactory.getAdapterClassFor(new Class<?>[] { receiverClass });
+                final LinkRequest adapterRequest = request.replaceArguments(request.getCallSiteDescriptor(), args);
+                final GuardedInvocation gi = checkNullConstructor(delegate(linkerServices, adapterRequest), receiverClass);
+                // Finally, modify the guard to test for the original abstract class.
+                return gi.replaceMethods(gi.getInvocation(), Guards.getIdentityGuard(self));
+            }
+            // If the class was not abstract, just delegate linking to the standard StaticClass linker. Make an
+            // additional check to ensure we have a constructor. We could just fall through to the next "return"
+            // statement, except we also insert a call to checkNullConstructor() which throws an ECMAScript TypeError
+            // with a more intuitive message when no suitable constructor is found.
+            return checkNullConstructor(delegate(linkerServices, request), receiverClass);
+        }
+        // In case this was not a "new" operation, just delegate to the the standard StaticClass linker.
+        return delegate(linkerServices, request);
+    }
+
+    private static GuardedInvocation delegate(LinkerServices linkerServices, final LinkRequest request) throws Exception {
+        return staticClassLinker.getGuardedInvocation(request, linkerServices);
+    }
+
+    private static GuardedInvocation checkNullConstructor(final GuardedInvocation ctorInvocation, final Class<?> receiverClass) {
+        if(ctorInvocation == null) {
+            ECMAErrors.typeError(Context.getGlobal(), "no.constructor.matches.args", receiverClass.getName());
+        }
+        return ctorInvocation;
+    }
+}

From 017fe2d00223d912c2c20ef3be9c2fc395c98f37 Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Mon, 21 Jan 2013 21:17:38 +0530
Subject: [PATCH 079/311] 8006635: Reduce access levels as much as possible

Reviewed-by: jlaskey, lagergren, attila
---
 .../api/scripting/NashornScriptEngine.java    |  13 +-
 .../api/scripting/ScriptObjectMirror.java     |  15 +-
 .../nashorn/internal/codegen/Compiler.java    |   2 +-
 .../src/jdk/nashorn/internal/ir/Symbol.java   |   2 +-
 .../nashorn/internal/ir/debug/JSONWriter.java |  10 +-
 .../jdk/nashorn/internal/objects/Global.java  |  30 ++--
 .../nashorn/internal/objects/NativeArray.java |  11 +-
 .../nashorn/internal/objects/NativeDebug.java |   2 +-
 .../nashorn/internal/objects/NativeJava.java  |   2 +-
 .../jdk/nashorn/internal/runtime/Context.java |  87 ++++++-----
 .../nashorn/internal/runtime/DebugLogger.java |   2 +-
 .../internal/runtime/ECMAException.java       |   2 +-
 .../internal/runtime/OptionsObject.java       | 136 ++++++++++++++++++
 .../internal/runtime/ScriptObject.java        |   6 +-
 .../internal/runtime/StructureLoader.java     |   2 +-
 .../runtime/arrays/ArrayIterator.java         |   3 +-
 .../runtime/linker/JavaAdapterFactory.java    |   4 +-
 .../runtime/linker/LinkerCallSite.java        |  28 ++--
 nashorn/src/jdk/nashorn/tools/Shell.java      |  28 ++--
 .../internal/access/BooleanAccessTest.java    |   4 +-
 .../internal/codegen/CompilerTest.java        |   4 +-
 .../nashorn/internal/parser/ParserTest.java   |   2 +-
 .../nashorn/internal/runtime/ContextTest.java |   4 +-
 .../nashorn/internal/runtime/JSTypeTest.java  |  71 ++++-----
 .../framework/SharedContextEvaluator.java     |   4 +-
 25 files changed, 330 insertions(+), 144 deletions(-)
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/OptionsObject.java

diff --git a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
index 075dafb4906..bcad3582e10 100644
--- a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
+++ b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
@@ -86,13 +86,22 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
         options.process(args);
 
         // throw ParseException on first error from script
-        final ErrorManager errors = new Context.ThrowErrorManager();
+        final ErrorManager errMgr = new Context.ThrowErrorManager();
+        // application loader for the context
+        ClassLoader tmp;
+        try {
+            tmp = Thread.currentThread().getContextClassLoader();
+        } catch (final SecurityException se) {
+            tmp = null;
+        }
+        final ClassLoader appLoader = tmp;
+
         // create new Nashorn Context
         this.nashornContext = AccessController.doPrivileged(new PrivilegedAction<Context>() {
             @Override
             public Context run() {
                 try {
-                    return new Context(options, errors);
+                    return new Context(options, errMgr, appLoader);
                 } catch (final RuntimeException e) {
                     if (Context.DEBUG) {
                         e.printStackTrace();
diff --git a/nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java b/nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java
index 5445c766a1e..e6397028354 100644
--- a/nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java
+++ b/nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java
@@ -25,6 +25,8 @@
 
 package jdk.nashorn.api.scripting;
 
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -141,7 +143,14 @@ final class ScriptObjectMirror extends JSObject implements Bindings {
         return inGlobal(new Callable<Object>() {
             @Override
             public Object call() {
-                return wrap(global.getContext().eval(global, s, null, null, false), global);
+                final Context context = AccessController.doPrivileged(
+                        new PrivilegedAction<Context>() {
+                            @Override
+                            public Context run() {
+                                return Context.getContext();
+                            }
+                        });
+                return wrap(context.eval(global, s, null, null, false), global);
             }
         });
     }
@@ -178,7 +187,7 @@ final class ScriptObjectMirror extends JSObject implements Bindings {
     public void setSlot(final int index, final Object value) {
         inGlobal(new Callable<Void>() {
             @Override public Void call() {
-                sobj.set(index, unwrap(value, global), global.getContext()._strict);
+                sobj.set(index, unwrap(value, global), global.isStrictContext());
                 return null;
             }
         });
@@ -275,7 +284,7 @@ final class ScriptObjectMirror extends JSObject implements Bindings {
 
     @Override
     public void putAll(final Map<? extends String, ? extends Object> map) {
-        final boolean strict = sobj.getContext()._strict;
+        final boolean strict = sobj.isStrictContext();
         inGlobal(new Callable<Object>() {
             @Override public Object call() {
                 for (final Map.Entry<? extends String, ? extends Object> entry : map.entrySet()) {
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java b/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
index 8d02f6115f3..ec3a6acea4d 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
@@ -186,7 +186,7 @@ public final class Compiler {
      * @return compiler instance
      */
     public static Compiler compiler(final Source source, final Context context) {
-        return Compiler.compiler(source, context, context.getErrors(), context._strict);
+        return Compiler.compiler(source, context, context.getErrorManager(), context._strict);
     }
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/ir/Symbol.java b/nashorn/src/jdk/nashorn/internal/ir/Symbol.java
index d695f5eabe6..91210cc73c6 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/Symbol.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/Symbol.java
@@ -605,7 +605,7 @@ public final class Symbol implements Comparable<Symbol> {
     private void trace(final String desc) {
         if (TRACE_SYMBOL != null && TRACE_SYMBOL.equals(name)) {
             Context.err("SYMBOL: '" + name + "' " + desc);
-            new Throwable().printStackTrace(Context.getContext().getErr());
+            new Throwable().printStackTrace(Context.getCurrentErr());
         }
     }
 }
diff --git a/nashorn/src/jdk/nashorn/internal/ir/debug/JSONWriter.java b/nashorn/src/jdk/nashorn/internal/ir/debug/JSONWriter.java
index a00e1ca0630..f07a5535988 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/debug/JSONWriter.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/debug/JSONWriter.java
@@ -25,6 +25,8 @@
 
 package jdk.nashorn.internal.ir.debug;
 
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 import java.util.Arrays;
 import java.util.List;
 import jdk.nashorn.internal.codegen.Compiler;
@@ -86,7 +88,13 @@ public final class JSONWriter extends NodeVisitor {
      */
     public static String parse(final String code, final String name, final boolean includeLoc) {
         final ScriptObject global     = Context.getGlobal();
-        final Context      context    = global.getContext();
+        final Context      context    = AccessController.doPrivileged(
+                new PrivilegedAction<Context>() {
+                    @Override
+                    public Context run() {
+                        return Context.getContext();
+                    }
+                });
         final Compiler     compiler   = Compiler.compiler(new Source(name, code), context, new Context.ThrowErrorManager(), context._strict);
         final Parser       parser     = new Parser(compiler, context._strict);
         final JSONWriter   jsonWriter = new JSONWriter(includeLoc);
diff --git a/nashorn/src/jdk/nashorn/internal/objects/Global.java b/nashorn/src/jdk/nashorn/internal/objects/Global.java
index bc181deabc9..92f6bca8c2f 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/Global.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/Global.java
@@ -46,6 +46,7 @@ import jdk.nashorn.internal.runtime.GlobalFunctions;
 import jdk.nashorn.internal.runtime.GlobalObject;
 import jdk.nashorn.internal.runtime.JSType;
 import jdk.nashorn.internal.runtime.NativeJavaPackage;
+import jdk.nashorn.internal.runtime.OptionsObject;
 import jdk.nashorn.internal.runtime.PropertyDescriptor;
 import jdk.nashorn.internal.runtime.Scope;
 import jdk.nashorn.internal.runtime.ScriptFunction;
@@ -365,7 +366,7 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
      *
      * @return the context
      */
-    public static Context getThisContext() {
+    static Context getThisContext() {
         return instance().getContext();
     }
 
@@ -374,7 +375,7 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
      *
      * @return true if strict mode enabled in {@link Global#getThisContext()}
      */
-    public static boolean isStrict() {
+    static boolean isStrict() {
         return getThisContext()._strict;
     }
 
@@ -387,13 +388,7 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
             return;
         }
 
-        final ScriptObject oldGlobal = Context.getGlobal();
-        Context.setGlobal(this);
-        try {
-            init();
-        } finally {
-            Context.setGlobal(oldGlobal);
-        }
+        init();
     }
 
     @Override
@@ -650,9 +645,10 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
         if (!(str instanceof String || str instanceof ConsString)) {
             return str;
         }
-        final ScriptObject scope = (self instanceof ScriptObject) ? (ScriptObject)self : Global.instance();
+        final Global global = Global.instance();
+        final ScriptObject scope = (self instanceof ScriptObject) ? (ScriptObject)self : global;
 
-        return Global.getThisContext().eval(scope, str.toString(), callThis, location, Boolean.TRUE.equals(strict));
+        return global.getContext().eval(scope, str.toString(), callThis, location, Boolean.TRUE.equals(strict));
     }
 
     /**
@@ -690,8 +686,9 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
      * @throws IOException if source could not be read
      */
     public static Object load(final Object self, final Object source) throws IOException {
-        final ScriptObject scope = (self instanceof ScriptObject) ? (ScriptObject)self : Global.instance();
-        return getThisContext().load(scope, source);
+        final Global global = Global.instance();
+        final ScriptObject scope = (self instanceof ScriptObject) ? (ScriptObject)self : global;
+        return global.getContext().load(scope, source);
     }
 
     ScriptObject getFunctionPrototype() {
@@ -1302,6 +1299,8 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
     }
 
     private void init() {
+        assert Context.getGlobal() == this : "this global is not set as current";
+
         // initialize Function and Object constructor
         initFunctionAndObject();
 
@@ -1367,7 +1366,7 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
             initScripting();
         }
 
-        if (Context.DEBUG) {
+        if (Context.DEBUG && System.getSecurityManager() == null) {
             initDebug();
         }
 
@@ -1460,8 +1459,7 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
         addOwnProperty("echo", Attribute.NOT_ENUMERABLE, value);
 
         // Nashorn extension: global.$OPTIONS (scripting-mode-only)
-        // expose current Context to access command line options
-        value = this.getContext();
+        value = new OptionsObject(this.getContext());
         addOwnProperty("$OPTIONS", Attribute.NOT_ENUMERABLE, value);
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeArray.java b/nashorn/src/jdk/nashorn/internal/objects/NativeArray.java
index a13eb15d273..0b3969e5519 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeArray.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeArray.java
@@ -603,7 +603,7 @@ public final class NativeArray extends ScriptObject {
     public static Object pop(final Object self) {
         try {
             final ScriptObject sobj = (ScriptObject)self;
-            final boolean strict    = sobj.getContext()._strict;
+            final boolean strict    = sobj.isStrictContext();
 
             if (bulkable(sobj)) {
                 return ((NativeArray)sobj).getArray().pop();
@@ -640,7 +640,7 @@ public final class NativeArray extends ScriptObject {
     public static Object push(final Object self, final Object... args) {
         try {
             final ScriptObject sobj   = (ScriptObject)self;
-            final boolean      strict = sobj.getContext()._strict;
+            final boolean      strict = sobj.isStrictContext();
 
             if (bulkable(sobj)) {
                 final NativeArray nativeArray = (NativeArray)sobj;
@@ -675,7 +675,7 @@ public final class NativeArray extends ScriptObject {
     public static Object reverse(final Object self) {
         try {
             final ScriptObject sobj   = (ScriptObject)self;
-            final boolean      strict = sobj.getContext()._strict;
+            final boolean      strict = sobj.isStrictContext();
             final long         len    = JSType.toUint32(sobj.getLength());
             final long         middle = len / 2;
 
@@ -846,8 +846,7 @@ public final class NativeArray extends ScriptObject {
     public static Object sort(final Object self, final Object comparefn) {
         try {
             final ScriptObject sobj    = (ScriptObject) self;
-            final Context      context = sobj.getContext();
-            final boolean      strict  = context._strict;
+            final boolean      strict  = sobj.isStrictContext();
             final long         len     = JSType.toUint32(sobj.getLength());
 
             if (len > 1) {
@@ -994,7 +993,7 @@ public final class NativeArray extends ScriptObject {
             nativeArray.getArray().shiftRight(items.length);
 
             for (int j = 0; j < items.length; j++) {
-                nativeArray.setArray(nativeArray.getArray().set(j, items[j], sobj.getContext()._strict));
+                nativeArray.setArray(nativeArray.getArray().set(j, items[j], sobj.isStrictContext()));
             }
         } else {
             for (long k = len; k > 0; k--) {
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeDebug.java b/nashorn/src/jdk/nashorn/internal/objects/NativeDebug.java
index 92c030b34a9..9100cb1a699 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeDebug.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeDebug.java
@@ -252,7 +252,7 @@ public class NativeDebug extends ScriptObject {
     @SuppressWarnings("resource")
     @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
     public static Object dumpCounters(final Object self) {
-        final PrintWriter out = Context.getContext().getErr();
+        final PrintWriter out = Context.getCurrentErr();
 
         out.println("ScriptObject count " + ScriptObject.getCount());
         out.println("Scope count " + ScriptObject.getScopeCount());
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java b/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java
index 70103228212..f2c3c24f48a 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java
@@ -334,7 +334,7 @@ public class NativeJava {
 
     private static Class<?> simpleType(final String typeName) throws ClassNotFoundException {
         final Class<?> primClass = TypeUtilities.getPrimitiveTypeByName(typeName);
-        return primClass != null ? primClass : Global.instance().getContext().findClass(typeName);
+        return primClass != null ? primClass : Global.getThisContext().findClass(typeName);
     }
 
     private static Class<?> arrayType(final String typeName) throws ClassNotFoundException {
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Context.java b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
index 786e65e514a..50ab31706f7 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/Context.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
@@ -71,12 +71,6 @@ public final class Context {
             }
         };
 
-    /**
-     * Get the error stream if applicable and initialized, otherwise stderr
-     * Usually this is the error stream given the context, but for testing and
-     * certain bootstrapping situations we need a default stream
-     */
-
     /**
      * Return the current global scope
      * @return current global scope
@@ -107,7 +101,21 @@ public final class Context {
      * @return current global scope's context.
      */
     public static Context getContext() {
-        return Context.getGlobal().getContext();
+        final SecurityManager sm = System.getSecurityManager();
+        if (sm != null) {
+            sm.checkPermission(new RuntimePermission("getNashornContext"));
+        }
+        return getContextTrusted();
+    }
+
+    /**
+     * Get current context's error writer
+     *
+     * @return error writer of the current context
+     */
+    public static PrintWriter getCurrentErr() {
+        final ScriptObject global = getGlobal();
+        return (global != null)? global.getContext().getErr() : new PrintWriter(System.err);
     }
 
     /**
@@ -127,7 +135,7 @@ public final class Context {
      */
     @SuppressWarnings("resource")
     public static void err(final String str, final boolean crlf) {
-        final PrintWriter err = Context.getContext().getErr();
+        final PrintWriter err = Context.getCurrentErr();
         if (err != null) {
             if (crlf) {
                 err.println(str);
@@ -137,6 +145,9 @@ public final class Context {
         }
     }
 
+    /** class loader to resolve classes from script. */
+    private final ClassLoader  appLoader;
+
     /** Class loader to load classes from -classpath option, if set. */
     private final ClassLoader  classPathLoader;
 
@@ -242,13 +253,14 @@ public final class Context {
     /** time zone for this context */
     public final TimeZone _timezone;
 
+    private static final ClassLoader myLoader = Context.class.getClassLoader();
     private static final StructureLoader sharedLoader;
 
     static {
         sharedLoader = AccessController.doPrivileged(new PrivilegedAction<StructureLoader>() {
             @Override
             public StructureLoader run() {
-                return new StructureLoader(Context.class.getClassLoader(), null);
+                return new StructureLoader(myLoader, null);
             }
         });
     }
@@ -273,9 +285,10 @@ public final class Context {
      *
      * @param options options from command line or Context creator
      * @param errors  error manger
+     * @param appLoader application class loader
      */
-    public Context(final Options options, final ErrorManager errors) {
-        this(options, errors, new PrintWriter(System.out, true), new PrintWriter(System.err, true));
+    public Context(final Options options, final ErrorManager errors, final ClassLoader appLoader) {
+        this(options, errors, new PrintWriter(System.out, true), new PrintWriter(System.err, true), appLoader);
     }
 
     /**
@@ -285,13 +298,15 @@ public final class Context {
      * @param errors  error manger
      * @param out     output writer for this Context
      * @param err     error writer for this Context
+     * @param appLoader application class loader
      */
-    public Context(final Options options, final ErrorManager errors, final PrintWriter out, final PrintWriter err) {
+    public Context(final Options options, final ErrorManager errors, final PrintWriter out, final PrintWriter err, final ClassLoader appLoader) {
         final SecurityManager sm = System.getSecurityManager();
         if (sm != null) {
             sm.checkPermission(new RuntimePermission("createNashornContext"));
         }
 
+        this.appLoader = appLoader;
         this.scriptLoader = (ScriptLoader)AccessController.doPrivileged(
              new PrivilegedAction<ClassLoader>() {
                 @Override
@@ -389,7 +404,7 @@ public final class Context {
      * Get the error manager for this context
      * @return error manger
      */
-    public ErrorManager getErrors() {
+    public ErrorManager getErrorManager() {
         return errors;
     }
 
@@ -652,28 +667,17 @@ public final class Context {
             }
         }
 
-        // try script loader first
-        try {
-            return Class.forName(fullName, true, scriptLoader);
-        } catch (final ClassNotFoundException e) {
-            // ignored, continue search
-        }
-
-        // try script -classpath loader, if set
+        // try the script -classpath loader, if that is set
         if (classPathLoader != null) {
             try {
                 return Class.forName(fullName, true, classPathLoader);
-            } catch (final ClassNotFoundException e) {
+            } catch (final ClassNotFoundException ignored) {
                 // ignore, continue search
             }
         }
 
-        // This helps in finding using "app" loader - which is typically set as thread context loader
-        try {
-            return Class.forName(fullName, true, Thread.currentThread().getContextClassLoader());
-        } catch (final ClassNotFoundException e) {
-            throw e;
-        }
+        // Try finding using the "app" loader.
+        return Class.forName(fullName, true, appLoader);
     }
 
     /**
@@ -684,7 +688,7 @@ public final class Context {
      */
     public static void printStackTrace(final Throwable t) {
         if (Context.DEBUG) {
-            t.printStackTrace(Context.getContext().getErr());
+            t.printStackTrace(Context.getCurrentErr());
         }
     }
 
@@ -714,17 +718,34 @@ public final class Context {
      * @return the global script object
      */
     public ScriptObject createGlobal() {
-        final ScriptObject global = newGlobal();
+        final SecurityManager sm = System.getSecurityManager();
+        if (sm != null) {
+            sm.checkPermission(new RuntimePermission("createNashornGlobal"));
+        }
 
+        final ScriptObject global = newGlobal();
         // Need only minimal global object, if we are just compiling.
         if (!_compile_only) {
-            // initialize global scope with builtin global objects
-            ((GlobalObject)global).initBuiltinObjects();
+            final ScriptObject oldGlobal = Context.getGlobal();
+            try {
+                Context.setGlobal(global);
+                // initialize global scope with builtin global objects
+                ((GlobalObject)global).initBuiltinObjects();
+            } finally {
+                Context.setGlobal(oldGlobal);
+            }
         }
 
         return global;
     }
 
+    /**
+     * Trusted variant package-private
+     */
+    static Context getContextTrusted() {
+        return Context.getGlobal().getContext();
+    }
+
     /**
      * Try to infer Context instance from the Class. If we cannot,
      * then get it from the thread local variable.
@@ -740,7 +761,7 @@ public final class Context {
             context = ((NashornLoader)loader).getContext();
         }
 
-        return (context != null) ? context : Context.getContext();
+        return (context != null) ? context : Context.getContextTrusted();
     }
 
     private Object evaluateSource(final String name, final URL url, final ScriptObject scope, final ScriptObject thiz) throws IOException {
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/DebugLogger.java b/nashorn/src/jdk/nashorn/internal/runtime/DebugLogger.java
index f2aeafdff6a..1b558ead205 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/DebugLogger.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/DebugLogger.java
@@ -74,7 +74,7 @@ public class DebugLogger {
      * @return print writer for log output.
      */
     public PrintWriter getOutputStream() {
-        return Context.getContext().getErr();
+        return Context.getCurrentErr();
     }
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ECMAException.java b/nashorn/src/jdk/nashorn/internal/runtime/ECMAException.java
index 65ab9a76c66..c554cd34755 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ECMAException.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ECMAException.java
@@ -182,7 +182,7 @@ public final class ECMAException extends NashornException {
     public static Object printStackTrace(final ScriptObject errObj) {
         final Object exception = getException(errObj);
         if (exception instanceof Throwable) {
-            ((Throwable)exception).printStackTrace(Context.getContext().getErr());
+            ((Throwable)exception).printStackTrace(Context.getCurrentErr());
         } else {
             Context.err("<stack trace not available>");
         }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/OptionsObject.java b/nashorn/src/jdk/nashorn/internal/runtime/OptionsObject.java
new file mode 100644
index 00000000000..93ab5ac47be
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/OptionsObject.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import java.util.TimeZone;
+
+/**
+ * A convenience object to expose only command line options from a Context.
+ */
+public final class OptionsObject {
+    /** Always allow functions as statements */
+    public final boolean _anon_functions;
+
+    /** Size of the per-global Class cache size */
+    public final int     _class_cache_size;
+
+    /** Only compile script, do not run it or generate other ScriptObjects */
+    public final boolean _compile_only;
+
+    /** Accumulated callsite flags that will be used when boostrapping script callsites */
+    public final int     _callsite_flags;
+
+    /** Genereate line number table in class files */
+    public final boolean _debug_lines;
+
+    /** Package to which generated class files are added */
+    public final String  _dest_dir;
+
+    /** Display stack trace upon error, default is false */
+    public final boolean _dump_on_error;
+
+    /** Invalid lvalue expressions should be reported as early errors */
+    public final boolean _early_lvalue_error;
+
+    /** Empty statements should be preserved in the AST */
+    public final boolean _empty_statements;
+
+    /** Show full Nashorn version */
+    public final boolean _fullversion;
+
+    /** Create a new class loaded for each compilation */
+    public final boolean _loader_per_compile;
+
+    /** Package to which generated class files are added */
+    public final String  _package;
+
+    /** Only parse the source code, do not compile */
+    public final boolean _parse_only;
+
+    /** Print the AST before lowering */
+    public final boolean _print_ast;
+
+    /** Print the AST after lowering */
+    public final boolean _print_lower_ast;
+
+    /** Print resulting bytecode for script */
+    public final boolean _print_code;
+
+    /** Print function will no print newline characters */
+    public final boolean _print_no_newline;
+
+    /** Print AST in more human readable form */
+    public final boolean _print_parse;
+
+    /** Print AST in more human readable form after Lowering */
+    public final boolean _print_lower_parse;
+
+    /** print symbols and their contents for the script */
+    public final boolean _print_symbols;
+
+    /** is this context in scripting mode? */
+    public final boolean _scripting;
+
+    /** is this context in strict mode? */
+    public final boolean _strict;
+
+    /** print version info of Nashorn */
+    public final boolean _version;
+
+    /** should code verification be done of generated bytecode */
+    public final boolean _verify_code;
+
+    /** time zone for this context */
+    public final TimeZone _timezone;
+
+    public OptionsObject(final Context context) {
+        this._anon_functions = context._anon_functions;
+        this._callsite_flags = context._callsite_flags;
+        this._class_cache_size = context._class_cache_size;
+        this._compile_only = context._compile_only;
+        this._debug_lines = context._debug_lines;
+        this._dest_dir = context._dest_dir;
+        this._dump_on_error = context._dump_on_error;
+        this._early_lvalue_error = context._early_lvalue_error;
+        this._empty_statements = context._empty_statements;
+        this._fullversion = context._fullversion;
+        this._loader_per_compile = context._loader_per_compile;
+        this._package = context._package;
+        this._parse_only = context._parse_only;
+        this._print_ast = context._print_ast;
+        this._print_code = context._print_code;
+        this._print_lower_ast = context._print_lower_ast;
+        this._print_lower_parse = context._print_lower_parse;
+        this._print_no_newline = context._print_no_newline;
+        this._print_parse = context._print_parse;
+        this._print_symbols = context._print_symbols;
+        this._scripting = context._scripting;
+        this._strict = context._strict;
+        this._timezone = context._timezone;
+        this._verify_code = context._verify_code;
+        this._version = context._version;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
index 23f2e963fe2..6f1a7aa38e3 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
@@ -1043,11 +1043,15 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
         set(key, value, getContext()._strict);
     }
 
+    public final boolean isStrictContext() {
+        return getContext()._strict;
+    }
+
     /**
      * Return the current context from the object's map.
      * @return Current context.
      */
-    public final Context getContext() {
+    protected final Context getContext() {
         return getMap().getContext();
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/StructureLoader.java b/nashorn/src/jdk/nashorn/internal/runtime/StructureLoader.java
index c9968102af2..18f3c30ded7 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/StructureLoader.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/StructureLoader.java
@@ -129,7 +129,7 @@ final class StructureLoader extends NashornLoader {
         Context context = getContext();
 
         if (context == null) {
-            context = Context.getContext();
+            context = Context.getContextTrusted();
         }
 
         final byte[] code = new ObjectClassGenerator(context).generate(descriptor);
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayIterator.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayIterator.java
index 1e4c35089c1..da543ae60c4 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayIterator.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayIterator.java
@@ -25,6 +25,7 @@
 
 package jdk.nashorn.internal.runtime.arrays;
 
+import jdk.nashorn.internal.runtime.Context;
 import jdk.nashorn.internal.runtime.ScriptObject;
 
 /**
@@ -83,6 +84,6 @@ public class ArrayIterator extends ArrayLikeIterator<Object> {
 
     @Override
     public void remove() {
-        array.delete(index, array.getContext()._strict);
+        array.delete(index, array.isStrictContext());
     }
 }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
index 2050c6e77c2..d84c159d035 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
@@ -136,7 +136,7 @@ import org.dynalang.dynalink.support.LinkRequestImpl;
  * </p>
  */
 
-public class JavaAdapterFactory {
+public final class JavaAdapterFactory {
     private static final Type SCRIPT_FUNCTION_TYPE = Type.getType(ScriptFunction.class);
     private static final Type SCRIPT_OBJECT_TYPE = Type.getType(ScriptObject.class);
     private static final Type OBJECT_TYPE = Type.getType(Object.class);
@@ -470,7 +470,7 @@ public class JavaAdapterFactory {
         // private final ScriptObject global;
         w.visitField(ACC_PRIVATE | ACC_FINAL, GLOBAL_FIELD_NAME, SCRIPT_OBJECT_TYPE_DESCRIPTOR, null, null).visitEnd();
 
-        // private ContextSetter(ScriptObject global) {
+        // private GlobalSetter(ScriptObject global) {
         InstructionAdapter mv = new InstructionAdapter(w.visitMethod(ACC_PRIVATE, INIT,
                 SET_GLOBAL_METHOD_DESCRIPTOR, null, new String[0]));
         mv.visitCode();
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java
index 044ba9b9701..eb5ff52bd71 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java
@@ -285,7 +285,7 @@ public class LinkerCallSite extends ChainedCallSite {
                         out = new PrintWriter(new FileOutputStream(PROFILEFILE));
                         fileOutput = true;
                     } catch (final FileNotFoundException e) {
-                        out = Context.getContext().getErr();
+                        out = Context.getCurrentErr();
                     }
 
                     dump(out);
@@ -317,8 +317,6 @@ public class LinkerCallSite extends ChainedCallSite {
         private static final MethodHandle TRACEVOID   = findOwnMH("traceVoid", void.class, MethodHandle.class, Object[].class);
         private static final MethodHandle TRACEMISS   = findOwnMH("traceMiss", void.class, Object[].class);
 
-        private static final PrintWriter out = Context.getContext().getErr();
-
         TracingLinkerCallSite(final NashornCallSiteDescriptor desc) {
            super(desc);
         }
@@ -366,7 +364,7 @@ public class LinkerCallSite extends ChainedCallSite {
             return MH.foldArguments(relink, MH.asType(MH.asCollector(MH.bindTo(TRACEMISS, this), Object[].class, type.parameterCount()), type.changeReturnType(void.class)));
         }
 
-        private void printObject(final Object arg) {
+        private void printObject(final PrintWriter out, final Object arg) {
             if (!getNashornDescriptor().isTraceObjects()) {
                 out.print((arg instanceof ScriptObject) ? "ScriptObject" : arg);
                 return;
@@ -396,7 +394,7 @@ public class LinkerCallSite extends ChainedCallSite {
                         if (value instanceof ScriptObject) {
                             out.print("...");
                         } else {
-                            printObject(value);
+                            printObject(out, value);
                         }
 
                         isFirst = false;
@@ -409,19 +407,19 @@ public class LinkerCallSite extends ChainedCallSite {
             }
         }
 
-        private void tracePrint(final String tag, final Object[] args, final Object result) {
+        private void tracePrint(final PrintWriter out, final String tag, final Object[] args, final Object result) {
             //boolean isVoid = type().returnType() == void.class;
             out.print(Debug.id(this) + " TAG " + tag);
             out.print(getDescriptor().getName() + "(");
 
             if (args.length > 0) {
-                printObject(args[0]);
+                printObject(out, args[0]);
                 for (int i = 1; i < args.length; i++) {
                     final Object arg = args[i];
                     out.print(", ");
 
                     if (getNashornDescriptor().isTraceScope() || !(arg instanceof ScriptObject && ((ScriptObject)arg).isScope())) {
-                        printObject(arg);
+                        printObject(out, arg);
                     } else {
                         out.print("SCOPE");
                     }
@@ -432,7 +430,7 @@ public class LinkerCallSite extends ChainedCallSite {
 
             if (tag.equals("EXIT  ")) {
                 out.print(" --> ");
-                printObject(result);
+                printObject(out, result);
             }
 
             out.println();
@@ -450,9 +448,10 @@ public class LinkerCallSite extends ChainedCallSite {
          */
         @SuppressWarnings("unused")
         public Object traceObject(final MethodHandle mh, final Object... args) throws Throwable {
-            tracePrint("ENTER ", args, null);
+            final PrintWriter out = Context.getCurrentErr();
+            tracePrint(out, "ENTER ", args, null);
             final Object result = mh.invokeWithArguments(args);
-            tracePrint("EXIT  ", args, result);
+            tracePrint(out, "EXIT  ", args, result);
 
             return result;
         }
@@ -467,9 +466,10 @@ public class LinkerCallSite extends ChainedCallSite {
          */
         @SuppressWarnings("unused")
         public void traceVoid(final MethodHandle mh, final Object... args) throws Throwable {
-            tracePrint("ENTER ", args, null);
+            final PrintWriter out = Context.getCurrentErr();
+            tracePrint(out, "ENTER ", args, null);
             mh.invokeWithArguments(args);
-            tracePrint("EXIT  ", args, null);
+            tracePrint(out, "EXIT  ", args, null);
         }
 
         /**
@@ -481,7 +481,7 @@ public class LinkerCallSite extends ChainedCallSite {
          */
         @SuppressWarnings("unused")
         public void traceMiss(final Object... args) throws Throwable {
-            tracePrint("MISS ", args, null);
+            tracePrint(Context.getCurrentErr(), "MISS ", args, null);
         }
 
         private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
diff --git a/nashorn/src/jdk/nashorn/tools/Shell.java b/nashorn/src/jdk/nashorn/tools/Shell.java
index bf8e8e5e669..279a0ed2f27 100644
--- a/nashorn/src/jdk/nashorn/tools/Shell.java
+++ b/nashorn/src/jdk/nashorn/tools/Shell.java
@@ -148,7 +148,7 @@ public class Shell {
      *
      * @throws IOException if there's a problem setting up the streams
      */
-    protected int run(final InputStream in, final OutputStream out, final OutputStream err, final String[] args) throws IOException {
+    protected final int run(final InputStream in, final OutputStream out, final OutputStream err, final String[] args) throws IOException {
         final Context context = makeContext(in, out, err, args);
         if (context == null) {
             return COMMANDLINE_ERROR;
@@ -157,14 +157,14 @@ public class Shell {
         final ScriptObject global = context.createGlobal();
         final List<String> files = context.getOptions().getFiles();
         if (files.isEmpty()) {
-            return readEvalPrint(global);
+            return readEvalPrint(context, global);
         }
 
         if (context._compile_only) {
-            return compileScripts(global, files);
+            return compileScripts(context, global, files);
         }
 
-        return runScripts(global, files);
+        return runScripts(context, global, files);
     }
 
     /**
@@ -178,7 +178,7 @@ public class Shell {
      * @return null if there are problems with option parsing.
      */
     @SuppressWarnings("resource")
-    protected Context makeContext(final InputStream in, final OutputStream out, final OutputStream err, final String[] args) {
+    private Context makeContext(final InputStream in, final OutputStream out, final OutputStream err, final String[] args) {
         final PrintStream pout = out instanceof PrintStream ? (PrintStream) out : new PrintStream(out);
         final PrintStream perr = err instanceof PrintStream ? (PrintStream) err : new PrintStream(err);
         final PrintWriter wout = new PrintWriter(pout, true);
@@ -217,27 +217,27 @@ public class Shell {
             }
         }
 
-        return new Context(options, errors, wout, werr);
+        return new Context(options, errors, wout, werr, Thread.currentThread().getContextClassLoader());
     }
 
     /**
      * Compiles the given script files in the command line
      *
+     * @param context the nashorn context
      * @param global the global scope
      * @param files the list of script files to compile
      *
      * @return error code
      * @throws IOException when any script file read results in I/O error
      */
-    protected int compileScripts(final ScriptObject global, final List<String> files) throws IOException {
-        final Context context = global.getContext();
+    private int compileScripts(final Context context, final ScriptObject global, final List<String> files) throws IOException {
         final ScriptObject oldGlobal = Context.getGlobal();
         final boolean globalChanged = (oldGlobal != global);
         try {
             if (globalChanged) {
                 Context.setGlobal(global);
             }
-            final ErrorManager errors = context.getErrors();
+            final ErrorManager errors = context.getErrorManager();
 
             // For each file on the command line.
             for (final String fileName : files) {
@@ -263,21 +263,21 @@ public class Shell {
     /**
      * Runs the given JavaScript files in the command line
      *
+     * @param context the nashorn context
      * @param global the global scope
      * @param files the list of script files to run
      *
      * @return error code
      * @throws IOException when any script file read results in I/O error
      */
-    protected int runScripts(final ScriptObject global, final List<String> files) throws IOException {
-        final Context context = global.getContext();
+    private int runScripts(final Context context, final ScriptObject global, final List<String> files) throws IOException {
         final ScriptObject oldGlobal = Context.getGlobal();
         final boolean globalChanged = (oldGlobal != global);
         try {
             if (globalChanged) {
                 Context.setGlobal(global);
             }
-            final ErrorManager errors = context.getErrors();
+            final ErrorManager errors = context.getErrorManager();
 
             // For each file on the command line.
             for (final String fileName : files) {
@@ -325,12 +325,12 @@ public class Shell {
     /**
      * read-eval-print loop for Nashorn shell.
      *
+     * @param context the nashorn context
      * @param global  global scope object to use
      * @return return code
      */
     @SuppressWarnings("resource")
-    protected int readEvalPrint(final ScriptObject global) {
-        final Context context = global.getContext();
+    private int readEvalPrint(final Context context, final ScriptObject global) {
         final String prompt = bundle.getString("shell.prompt");
         final BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
         final PrintWriter err = context.getErr();
diff --git a/nashorn/test/src/jdk/nashorn/internal/access/BooleanAccessTest.java b/nashorn/test/src/jdk/nashorn/internal/access/BooleanAccessTest.java
index 3f952b57624..1cbef249f5e 100644
--- a/nashorn/test/src/jdk/nashorn/internal/access/BooleanAccessTest.java
+++ b/nashorn/test/src/jdk/nashorn/internal/access/BooleanAccessTest.java
@@ -25,8 +25,8 @@
 
 package jdk.nashorn.internal.access;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertTrue;
 
 import java.util.Arrays;
 import javax.script.ScriptEngine;
diff --git a/nashorn/test/src/jdk/nashorn/internal/codegen/CompilerTest.java b/nashorn/test/src/jdk/nashorn/internal/codegen/CompilerTest.java
index 0be409c0c67..7e1c8715c76 100644
--- a/nashorn/test/src/jdk/nashorn/internal/codegen/CompilerTest.java
+++ b/nashorn/test/src/jdk/nashorn/internal/codegen/CompilerTest.java
@@ -74,7 +74,7 @@ public class CompilerTest {
 
         final StringWriter sw = new StringWriter();
         final PrintWriter pw = new PrintWriter(sw);
-        this.context = new Context(options, errors, pw, pw);
+        this.context = new Context(options, errors, pw, pw, Thread.currentThread().getContextClassLoader());
         this.global = context.createGlobal();
     }
 
@@ -160,7 +160,7 @@ public class CompilerTest {
             }
             final Source source = new Source(file.getAbsolutePath(), buffer);
             final ScriptFunction script = context.compileScript(source, global, context._strict);
-            if (script == null || context.getErrors().getNumberOfErrors() > 0) {
+            if (script == null || context.getErrorManager().getNumberOfErrors() > 0) {
                 log("Compile failed: " + file.getAbsolutePath());
                 failed++;
             } else {
diff --git a/nashorn/test/src/jdk/nashorn/internal/parser/ParserTest.java b/nashorn/test/src/jdk/nashorn/internal/parser/ParserTest.java
index 9778b7479d6..27a637ea78a 100644
--- a/nashorn/test/src/jdk/nashorn/internal/parser/ParserTest.java
+++ b/nashorn/test/src/jdk/nashorn/internal/parser/ParserTest.java
@@ -65,7 +65,7 @@ public class ParserTest {
         options.set("scripting", true);
 
         ErrorManager errors = new ErrorManager();
-        this.context = new Context(options, errors);
+        this.context = new Context(options, errors, Thread.currentThread().getContextClassLoader());
         this.global = context.createGlobal();
     }
 
diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/ContextTest.java b/nashorn/test/src/jdk/nashorn/internal/runtime/ContextTest.java
index 2539b2b1f81..f7e6857d32c 100644
--- a/nashorn/test/src/jdk/nashorn/internal/runtime/ContextTest.java
+++ b/nashorn/test/src/jdk/nashorn/internal/runtime/ContextTest.java
@@ -41,7 +41,7 @@ public class ContextTest {
     public void evalTest() {
         final Options options = new Options("");
         final ErrorManager errors = new ErrorManager();
-        final Context cx = new Context(options, errors);
+        final Context cx = new Context(options, errors, Thread.currentThread().getContextClassLoader());
         final ScriptObject oldGlobal = Context.getGlobal();
         Context.setGlobal(cx.createGlobal());
         try {
@@ -60,7 +60,7 @@ public class ContextTest {
     public void reflectionTest() {
         final Options options = new Options("");
         final ErrorManager errors = new ErrorManager();
-        final Context cx = new Context(options, errors);
+        final Context cx = new Context(options, errors, Thread.currentThread().getContextClassLoader());
         final ScriptObject oldGlobal = Context.getGlobal();
         Context.setGlobal(cx.createGlobal());
 
diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/JSTypeTest.java b/nashorn/test/src/jdk/nashorn/internal/runtime/JSTypeTest.java
index d3b80dfb49c..f9594197b8e 100644
--- a/nashorn/test/src/jdk/nashorn/internal/runtime/JSTypeTest.java
+++ b/nashorn/test/src/jdk/nashorn/internal/runtime/JSTypeTest.java
@@ -27,6 +27,7 @@ package jdk.nashorn.internal.runtime;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.assertFalse;
 
 import org.testng.annotations.Test;
 
@@ -39,16 +40,16 @@ public class JSTypeTest {
      */
     @Test
     public void testIsPrimitive() {
-        assertEquals(true,  JSType.isPrimitive(null));
-        assertEquals(true,  JSType.isPrimitive(ScriptRuntime.UNDEFINED));
-        assertEquals(true,  JSType.isPrimitive(Double.NaN));
-        assertEquals(true,  JSType.isPrimitive(Double.NEGATIVE_INFINITY));
-        assertEquals(true,  JSType.isPrimitive(Double.POSITIVE_INFINITY));
-        assertEquals(true,  JSType.isPrimitive(0.0));
-        assertEquals(true,  JSType.isPrimitive(3.14));
-        assertEquals(true,  JSType.isPrimitive("hello"));
-        assertEquals(true,  JSType.isPrimitive(""));
-        assertEquals(false, JSType.isPrimitive(new Object()));
+        assertTrue(JSType.isPrimitive(null));
+        assertTrue(JSType.isPrimitive(ScriptRuntime.UNDEFINED));
+        assertTrue(JSType.isPrimitive(Double.NaN));
+        assertTrue(JSType.isPrimitive(Double.NEGATIVE_INFINITY));
+        assertTrue(JSType.isPrimitive(Double.POSITIVE_INFINITY));
+        assertTrue(JSType.isPrimitive(0.0));
+        assertTrue(JSType.isPrimitive(3.14));
+        assertTrue(JSType.isPrimitive("hello"));
+        assertTrue(JSType.isPrimitive(""));
+        assertFalse(JSType.isPrimitive(new Object()));
     }
 
     /**
@@ -56,17 +57,17 @@ public class JSTypeTest {
      */
     @Test
     public void testToBoolean() {
-        assertEquals(false, JSType.toBoolean(ScriptRuntime.UNDEFINED));
-        assertEquals(false, JSType.toBoolean(null));
-        assertEquals(false, JSType.toBoolean(Boolean.FALSE));
-        assertEquals(true,  JSType.toBoolean(Boolean.TRUE));
-        assertEquals(false, JSType.toBoolean(-0.0));
-        assertEquals(false, JSType.toBoolean(0.0));
-        assertEquals(false, JSType.toBoolean(Double.NaN));
-        assertEquals(true,  JSType.toBoolean(3.14));
-        assertEquals(false, JSType.toBoolean(""));
-        assertEquals(true,  JSType.toBoolean("javascript"));
-        assertEquals(true,  JSType.toBoolean(new Object()));
+        assertFalse(JSType.toBoolean(ScriptRuntime.UNDEFINED));
+        assertFalse(JSType.toBoolean(null));
+        assertFalse(JSType.toBoolean(Boolean.FALSE));
+        assertTrue(JSType.toBoolean(Boolean.TRUE));
+        assertFalse(JSType.toBoolean(-0.0));
+        assertFalse(JSType.toBoolean(0.0));
+        assertFalse(JSType.toBoolean(Double.NaN));
+        assertTrue(JSType.toBoolean(3.14));
+        assertFalse(JSType.toBoolean(""));
+        assertTrue(JSType.toBoolean("javascript"));
+        assertTrue(JSType.toBoolean(new Object()));
     }
 
     /**
@@ -75,10 +76,10 @@ public class JSTypeTest {
     @Test
     public void testToNumber_Object() {
         assertTrue(Double.isNaN(JSType.toNumber(ScriptRuntime.UNDEFINED)));
-        assertEquals(0.0,  JSType.toNumber((Object)null), 0.0);
-        assertEquals(1.0,  JSType.toNumber(Boolean.TRUE), 0.0);
-        assertEquals(0.0,  JSType.toNumber(Boolean.FALSE), 0.0);
-        assertEquals(3.14, JSType.toNumber(3.14), 0.0);
+        assertEquals(JSType.toNumber((Object)null), 0.0, 0.0);
+        assertEquals(JSType.toNumber(Boolean.TRUE), 1.0, 0.0);
+        assertEquals(JSType.toNumber(Boolean.FALSE), 0.0, 0.0);
+        assertEquals(JSType.toNumber(3.14), 3.14, 0.0);
         // FIXME: add more assertions for specific String to number cases
         // FIXME: add case for Object type (JSObject with getDefaultValue)
     }
@@ -88,16 +89,16 @@ public class JSTypeTest {
      */
     @Test
     public void testToString_Object() {
-        assertEquals("undefined", JSType.toString(ScriptRuntime.UNDEFINED));
-        assertEquals("null", JSType.toString(null));
-        assertEquals("true", JSType.toString(Boolean.TRUE));
-        assertEquals("false", JSType.toString(Boolean.FALSE));
-        assertEquals("", JSType.toString(""));
-        assertEquals("nashorn", JSType.toString("nashorn"));
-        assertEquals("NaN", JSType.toString(Double.NaN));
-        assertEquals("Infinity", JSType.toString(Double.POSITIVE_INFINITY));
-        assertEquals("-Infinity", JSType.toString(Double.NEGATIVE_INFINITY));
-        assertEquals("0", JSType.toString(0.0));
+        assertEquals(JSType.toString(ScriptRuntime.UNDEFINED), "undefined");
+        assertEquals(JSType.toString(null), "null");
+        assertEquals(JSType.toString(Boolean.TRUE), "true");
+        assertEquals(JSType.toString(Boolean.FALSE), "false");
+        assertEquals(JSType.toString(""), "");
+        assertEquals(JSType.toString("nashorn"), "nashorn");
+        assertEquals(JSType.toString(Double.NaN), "NaN");
+        assertEquals(JSType.toString(Double.POSITIVE_INFINITY), "Infinity");
+        assertEquals(JSType.toString(Double.NEGATIVE_INFINITY), "-Infinity");
+        assertEquals(JSType.toString(0.0), "0");
         // FIXME: add more number-to-string test cases
         // FIXME: add case for Object type (JSObject with getDefaultValue)
     }
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/SharedContextEvaluator.java b/nashorn/test/src/jdk/nashorn/internal/test/framework/SharedContextEvaluator.java
index 8a041eb062d..305106b73d3 100644
--- a/nashorn/test/src/jdk/nashorn/internal/test/framework/SharedContextEvaluator.java
+++ b/nashorn/test/src/jdk/nashorn/internal/test/framework/SharedContextEvaluator.java
@@ -104,7 +104,7 @@ public final class SharedContextEvaluator implements ScriptEvaluator {
         Options options = new Options("nashorn", werr);
         options.process(args);
         ErrorManager errors = new ErrorManager(werr);
-        this.context = new Context(options, errors, wout, werr);
+        this.context = new Context(options, errors, wout, werr, Thread.currentThread().getContextClassLoader());
     }
 
     @Override
@@ -113,7 +113,7 @@ public final class SharedContextEvaluator implements ScriptEvaluator {
         try {
             ctxOut.setDelegatee(out);
             ctxErr.setDelegatee(err);
-            final ErrorManager errors = context.getErrors();
+            final ErrorManager errors = context.getErrorManager();
             final ScriptObject global = context.createGlobal();
             Context.setGlobal(global);
 

From fe173efccd4edeb1330746ec05618fef4516a8a5 Mon Sep 17 00:00:00 2001
From: Stefan Karlsson <stefank@openjdk.org>
Date: Tue, 22 Jan 2013 13:53:53 +0100
Subject: [PATCH 080/311] 8006506: Add test for redefining methods in
 backtraces to java/lang/instrument tests

Reviewed-by: sspitsyn, coleenp
---
 .../instrument/RedefineMethodInBacktrace.sh   |  87 ++++++++++++++
 .../RedefineMethodInBacktraceAgent.java       |  42 +++++++
 .../RedefineMethodInBacktraceApp.java         | 111 ++++++++++++++++++
 .../RedefineMethodInBacktraceTarget.java      |  32 +++++
 .../RedefineMethodInBacktraceTarget_2.java    |  32 +++++
 5 files changed, 304 insertions(+)
 create mode 100644 jdk/test/java/lang/instrument/RedefineMethodInBacktrace.sh
 create mode 100644 jdk/test/java/lang/instrument/RedefineMethodInBacktraceAgent.java
 create mode 100644 jdk/test/java/lang/instrument/RedefineMethodInBacktraceApp.java
 create mode 100644 jdk/test/java/lang/instrument/RedefineMethodInBacktraceTarget.java
 create mode 100644 jdk/test/java/lang/instrument/RedefineMethodInBacktraceTarget_2.java

diff --git a/jdk/test/java/lang/instrument/RedefineMethodInBacktrace.sh b/jdk/test/java/lang/instrument/RedefineMethodInBacktrace.sh
new file mode 100644
index 00000000000..20167bf8330
--- /dev/null
+++ b/jdk/test/java/lang/instrument/RedefineMethodInBacktrace.sh
@@ -0,0 +1,87 @@
+#
+# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# @test
+# @bug 7174978
+# @summary Redefine a class with a method stored in a backtrace.
+# @author Stefan Karlsson
+#
+# @run shell MakeJAR3.sh RedefineMethodInBacktraceAgent 'Can-Redefine-Classes: true'
+# @run build RedefineMethodInBacktraceTarget RedefineMethodInBacktraceApp
+# @run shell RedefineMethodInBacktrace.sh
+#
+
+if [ "${TESTJAVA}" = "" ]
+then
+  echo "TESTJAVA not set.  Test cannot execute.  Failed."
+  exit 1
+fi
+
+if [ "${COMPILEJAVA}" = "" ]
+then
+  COMPILEJAVA="${TESTJAVA}"
+fi
+echo "COMPILEJAVA=${COMPILEJAVA}"
+
+if [ "${TESTSRC}" = "" ]
+then
+  echo "TESTSRC not set.  Test cannot execute.  Failed."
+  exit 1
+fi
+
+if [ "${TESTCLASSES}" = "" ]
+then
+  echo "TESTCLASSES not set.  Test cannot execute.  Failed."
+  exit 1
+fi
+
+JAVAC="${COMPILEJAVA}"/bin/javac
+JAVA="${TESTJAVA}"/bin/java
+
+cp "${TESTSRC}"/RedefineMethodInBacktraceTarget_2.java \
+    RedefineMethodInBacktraceTarget.java
+"${JAVAC}" ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d . RedefineMethodInBacktraceTarget.java
+
+"${JAVA}" ${TESTVMOPTS} -javaagent:RedefineMethodInBacktraceAgent.jar \
+    -classpath "${TESTCLASSES}" RedefineMethodInBacktraceApp > output.log 2>&1
+RUN_RESULT=$?
+
+if [ $RUN_RESULT != 0 ]; then
+    echo "FAIL: the run failed with exit code '$RUN_RESULT'"
+	exit $RUN_RESULT
+fi
+
+cat output.log
+
+MESG="Exception"
+grep "$MESG" output.log
+result=$?
+if [ "$result" = 0 ]; then
+    echo "FAIL: found '$MESG' in the test output"
+    result=1
+else
+    echo "PASS: did NOT find '$MESG' in the test output"
+    result=0
+fi
+
+exit $result
diff --git a/jdk/test/java/lang/instrument/RedefineMethodInBacktraceAgent.java b/jdk/test/java/lang/instrument/RedefineMethodInBacktraceAgent.java
new file mode 100644
index 00000000000..a4cc182bf23
--- /dev/null
+++ b/jdk/test/java/lang/instrument/RedefineMethodInBacktraceAgent.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.lang.instrument.Instrumentation;
+
+public class RedefineMethodInBacktraceAgent {
+    private static Instrumentation instrumentation;
+
+    private RedefineMethodInBacktraceAgent() {}
+
+    public static void premain(String agentArgs, Instrumentation inst) {
+        System.out.println("Hello from RedefineMethodInBacktraceAgent!");
+        System.out.println("isRedefineClassesSupported()=" +
+                inst.isRedefineClassesSupported());
+
+        instrumentation = inst;
+    }
+
+    public static Instrumentation getInstrumentation() {
+        return instrumentation;
+    }
+}
diff --git a/jdk/test/java/lang/instrument/RedefineMethodInBacktraceApp.java b/jdk/test/java/lang/instrument/RedefineMethodInBacktraceApp.java
new file mode 100644
index 00000000000..a4ad0884661
--- /dev/null
+++ b/jdk/test/java/lang/instrument/RedefineMethodInBacktraceApp.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.lang.instrument.ClassDefinition;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+/**
+ * When an exception is thrown, the JVM collects just enough information
+ * about the stack trace to be able to create a full fledged stack trace
+ * (StackTraceElement[]). The backtrace contains this information and the
+ * JVM  must make sure that the data in the backtrace is still usable after
+ * a class redefinition.
+ *
+ * After the PermGen removal there was a bug when the last reference to a Method
+ * was in the backtrace. The class of the method was kept alive, because of the
+ * mirror stored in the backtrace, but the old versions of the redefined method
+ * could be freed, since class redefinition didn't know about the backtraces.
+ */
+public class RedefineMethodInBacktraceApp {
+    public static void main(String args[]) throws Exception {
+        System.out.println("Hello from RedefineMethodInBacktraceApp!");
+
+        new RedefineMethodInBacktraceApp().doTest();
+
+        System.exit(0);
+    }
+
+    private void doTest() throws Exception {
+        doMethodInBacktraceTest();
+    }
+
+    private void doMethodInBacktraceTest() throws Exception {
+        Throwable t = getThrowableFromMethodToRedefine();
+
+        doRedefine(RedefineMethodInBacktraceTarget.class);
+
+        doClassUnloading();
+
+        touchRedefinedMethodInBacktrace(t);
+    }
+
+    private static Throwable getThrowableFromMethodToRedefine() throws Exception {
+        Class<RedefineMethodInBacktraceTarget> c =
+                RedefineMethodInBacktraceTarget.class;
+        Method method = c.getMethod("methodToRedefine");
+
+        Throwable thrownFromMethodToRedefine = null;
+        try {
+            method.invoke(null);
+        } catch (InvocationTargetException e) {
+            thrownFromMethodToRedefine = e.getCause();
+            if (!(thrownFromMethodToRedefine instanceof RuntimeException)) {
+                throw e;
+            }
+        }
+        method = null;
+        c = null;
+
+        return thrownFromMethodToRedefine;
+    }
+
+    private static void doClassUnloading() {
+        // This will clean out old, unused redefined methods.
+        System.gc();
+    }
+
+    private static void touchRedefinedMethodInBacktrace(Throwable throwable) {
+        // Make sure that we can convert the backtrace, which is referring to
+        // the redefined method, to a  StrackTraceElement[] without crashing.
+        throwable.getStackTrace();
+    }
+
+    private static void doRedefine(Class<?> clazz) throws Exception {
+        // Load the second version of this class.
+        File f = new File(clazz.getName() + ".class");
+        System.out.println("Reading test class from " + f.getAbsolutePath());
+        InputStream redefineStream = new FileInputStream(f);
+
+        byte[] redefineBuffer = NamedBuffer.loadBufferFromStream(redefineStream);
+
+        ClassDefinition redefineParamBlock = new ClassDefinition(
+                clazz, redefineBuffer);
+
+        RedefineMethodInBacktraceAgent.getInstrumentation().redefineClasses(
+                new ClassDefinition[] {redefineParamBlock});
+    }
+}
diff --git a/jdk/test/java/lang/instrument/RedefineMethodInBacktraceTarget.java b/jdk/test/java/lang/instrument/RedefineMethodInBacktraceTarget.java
new file mode 100644
index 00000000000..fad881137c8
--- /dev/null
+++ b/jdk/test/java/lang/instrument/RedefineMethodInBacktraceTarget.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * The first version of this class. The second version is in
+ * RedefineMethodInBacktraceTarget_2.java.
+ */
+public class RedefineMethodInBacktraceTarget {
+    public static void methodToRedefine() {
+        throw new RuntimeException("Test exception");
+    }
+}
diff --git a/jdk/test/java/lang/instrument/RedefineMethodInBacktraceTarget_2.java b/jdk/test/java/lang/instrument/RedefineMethodInBacktraceTarget_2.java
new file mode 100644
index 00000000000..d2ba2259932
--- /dev/null
+++ b/jdk/test/java/lang/instrument/RedefineMethodInBacktraceTarget_2.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * This is the second version of this class. The first version is in
+ * RedefineMethodInBacktraceTarget.java.
+ */
+public class RedefineMethodInBacktraceTarget {
+    public static void methodToRedefine() {
+        throw new RuntimeException("Test exception 2");
+    }
+}

From 739b53164279c1379351f748831a79a9edbc1776 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Tue, 22 Jan 2013 14:14:37 +0100
Subject: [PATCH 081/311] 8006570: This-value for non-strict functions should
 be converted to object

Reviewed-by: jlaskey, lagergren, attila
---
 .../jdk/nashorn/internal/objects/Global.java  | 12 ++++
 .../internal/objects/NativeBoolean.java       |  2 +-
 .../internal/objects/NativeFunction.java      |  2 +-
 .../internal/objects/NativeNumber.java        |  2 +-
 .../internal/objects/NativeString.java        |  2 +-
 .../internal/runtime/GlobalObject.java        | 10 ++++
 .../internal/runtime/ScriptFunction.java      | 15 ++++-
 .../internal/runtime/ScriptObject.java        | 11 ++--
 .../internal/runtime/SetMethodCreator.java    | 27 ++++-----
 .../linker/NashornGuardedInvocation.java      | 25 ++++----
 .../runtime/linker/NashornLinker.java         | 27 ++++++++-
 .../runtime/linker/PrimitiveLookup.java       |  8 +--
 nashorn/test/script/basic/JDK-8006570.js      | 60 +++++++++++++++++++
 .../test/script/basic/JDK-8006570.js.EXPECTED | 16 +++++
 14 files changed, 172 insertions(+), 47 deletions(-)
 create mode 100644 nashorn/test/script/basic/JDK-8006570.js
 create mode 100644 nashorn/test/script/basic/JDK-8006570.js.EXPECTED

diff --git a/nashorn/src/jdk/nashorn/internal/objects/Global.java b/nashorn/src/jdk/nashorn/internal/objects/Global.java
index 92f6bca8c2f..97eeffc49e4 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/Global.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/Global.java
@@ -418,6 +418,18 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
         }
     }
 
+    @Override
+    public MethodHandle getWrapFilter(Object obj) {
+        if (obj instanceof String || obj instanceof ConsString) {
+            return NativeString.WRAPFILTER;
+        } else if (obj instanceof Number) {
+            return NativeNumber.WRAPFILTER;
+        } else if (obj instanceof Boolean) {
+            return NativeBoolean.WRAPFILTER;
+        }
+        throw new IllegalArgumentException("Unsupported primitive value: " + obj);
+    }
+
     @Override
     public GuardedInvocation numberLookup(final NashornCallSiteDescriptor callSite, final Number self) {
         return NativeNumber.lookupPrimitive(callSite, self);
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeBoolean.java b/nashorn/src/jdk/nashorn/internal/objects/NativeBoolean.java
index a603ead29a3..64041cd6810 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeBoolean.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeBoolean.java
@@ -50,7 +50,7 @@ import org.dynalang.dynalink.linker.GuardedInvocation;
 public final class NativeBoolean extends ScriptObject {
     private final boolean value;
 
-    private final static MethodHandle WRAPFILTER = findWrapFilter();
+    final static MethodHandle WRAPFILTER = findWrapFilter();
 
     NativeBoolean(final boolean value) {
         this(value, Global.instance().getBooleanPrototype());
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeFunction.java b/nashorn/src/jdk/nashorn/internal/objects/NativeFunction.java
index 18a93ca60db..691e3c750c2 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeFunction.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeFunction.java
@@ -67,7 +67,7 @@ public final class NativeFunction {
     }
 
     private static Object convertThis(final ScriptFunction func, final Object thiz) {
-        if (!(thiz instanceof ScriptObject) && !func.isStrict() && !func.isBuiltin()) {
+        if (!(thiz instanceof ScriptObject) && func.isNonStrictFunction()) {
             if (thiz == UNDEFINED || thiz == null) {
                 return Global.instance();
             }
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java b/nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java
index 845f6b07ad4..b10bd5d4632 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java
@@ -57,7 +57,7 @@ import org.dynalang.dynalink.linker.GuardedInvocation;
 @ScriptClass("Number")
 public final class NativeNumber extends ScriptObject {
 
-    private static final MethodHandle WRAPFILTER = findWrapFilter();
+    static final MethodHandle WRAPFILTER = findWrapFilter();
 
     /** ECMA 15.7.3.2 largest positive finite value */
     @Property(attributes = Attribute.NON_ENUMERABLE_CONSTANT, where = Where.CONSTRUCTOR)
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeString.java b/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
index 9c3349a3c60..1d9db51d543 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
@@ -68,7 +68,7 @@ public final class NativeString extends ScriptObject {
 
     private final CharSequence value;
 
-    private static final MethodHandle WRAPFILTER = findWrapFilter();
+    static final MethodHandle WRAPFILTER = findWrapFilter();
 
     NativeString(final CharSequence value) {
         this(value, Global.instance().getStringPrototype());
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/GlobalObject.java b/nashorn/src/jdk/nashorn/internal/runtime/GlobalObject.java
index 4a95cb96c71..d50d9b227ff 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/GlobalObject.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/GlobalObject.java
@@ -68,6 +68,16 @@ public interface GlobalObject {
      */
    public Object wrapAsObject(Object obj);
 
+
+    /**
+     * Get a MethodHandle that converts the argument to its JavaScript object representation
+     *
+     * @param obj a JavaScript primitive object (String, Number, or Boolean)
+     *
+     * @return wrap filter methodhandle
+     */
+   public MethodHandle getWrapFilter(Object obj);
+
     /**
      * Wrapper for {@link jdk.nashorn.internal.objects.Global#numberLookup(NashornCallSiteDescriptor, Number)}
      *
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
index f831b90e3e1..6ad68c3cda9 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
@@ -40,6 +40,7 @@ import jdk.nashorn.internal.objects.annotations.SpecializedFunction;
 import jdk.nashorn.internal.parser.Token;
 import jdk.nashorn.internal.runtime.linker.MethodHandleFactory;
 import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
+import jdk.nashorn.internal.runtime.linker.NashornGuardedInvocation;
 import jdk.nashorn.internal.runtime.linker.NashornGuards;
 import jdk.nashorn.internal.runtime.options.Options;
 import org.dynalang.dynalink.CallSiteDescriptor;
@@ -328,6 +329,14 @@ public abstract class ScriptFunction extends ScriptObject {
      */
     public abstract boolean isBuiltin();
 
+    /**
+     * Is this a non-strict (not built-in) script function?
+     * @return true if neither strict nor built-in
+     */
+    public boolean isNonStrictFunction() {
+        return !isStrict() && !isBuiltin();
+    }
+
     /**
      * Execute this script function.
      * @param self  Target object.
@@ -916,7 +925,7 @@ public abstract class ScriptFunction extends ScriptObject {
 
             if(NashornCallSiteDescriptor.isScope(desc)) {
                 // (this, callee, args...) => (callee, args...) => (callee, [this], args...)
-                boundHandle = MH.bindTo(callHandle, isStrict() || isBuiltin()? ScriptRuntime.UNDEFINED : Context.getGlobal());
+                boundHandle = MH.bindTo(callHandle, isNonStrictFunction() ? Context.getGlobal(): ScriptRuntime.UNDEFINED);
                 boundHandle = MH.dropArguments(boundHandle, 1, Object.class);
             } else {
                 // (this, callee, args...) permute => (callee, this, args...) which is what we get in
@@ -934,7 +943,7 @@ public abstract class ScriptFunction extends ScriptObject {
             final MethodHandle callHandle = getBestSpecializedInvokeHandle(type.dropParameterTypes(0, 1));
 
             if(NashornCallSiteDescriptor.isScope(desc)) {
-                boundHandle = MH.bindTo(callHandle, isStrict() || isBuiltin()? ScriptRuntime.UNDEFINED : Context.getGlobal());
+                boundHandle = MH.bindTo(callHandle, isNonStrictFunction()? Context.getGlobal() : ScriptRuntime.UNDEFINED);
                 boundHandle = MH.dropArguments(boundHandle, 0, Object.class, Object.class);
             } else {
                 boundHandle = MH.dropArguments(callHandle, 0, Object.class);
@@ -942,7 +951,7 @@ public abstract class ScriptFunction extends ScriptObject {
         }
 
         boundHandle = pairArguments(boundHandle, type);
-        return new GuardedInvocation(boundHandle, NashornGuards.getFunctionGuard(this));
+        return new NashornGuardedInvocation(boundHandle, null, NashornGuards.getFunctionGuard(this), isNonStrictFunction());
     }
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
index 6f1a7aa38e3..174acfc2259 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
@@ -1643,16 +1643,14 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
         // getMap() is fine as we have the prototype switchpoint depending on where the property was found
         final MethodHandle guard = NashornGuards.getMapGuard(getMap());
 
-        int invokeFlags = 0;
-
         if (methodHandle != null) {
             assert methodHandle.type().returnType().equals(returnType);
             final ScriptFunction getter = find.getGetterFunction();
-            invokeFlags = (getter != null && getter.isStrict()) ? NashornCallSiteDescriptor.CALLSITE_STRICT : 0;
+            final boolean nonStrict = getter != null && getter.isNonStrictFunction();
             if (find.isSelf()) {
                 return new NashornGuardedInvocation(methodHandle, null, ObjectClassGenerator.OBJECT_FIELDS_ONLY &&
                         NashornCallSiteDescriptor.isFastScope(desc) && !property.canChangeType() ? null : guard,
-                                invokeFlags);
+                            nonStrict);
             }
 
             final ScriptObject prototype = find.getOwner();
@@ -1660,11 +1658,11 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
             if (!property.hasGetterFunction()) {
                 methodHandle = bindTo(methodHandle, prototype);
             }
-            return new NashornGuardedInvocation(methodHandle, getMap().getProtoGetSwitchPoint(name), guard, invokeFlags);
+            return new NashornGuardedInvocation(methodHandle, getMap().getProtoGetSwitchPoint(name), guard, nonStrict);
         }
 
         assert !NashornCallSiteDescriptor.isFastScope(desc);
-        return new NashornGuardedInvocation(Lookup.emptyGetter(returnType), getMap().getProtoGetSwitchPoint(name), guard, invokeFlags);
+        return new GuardedInvocation(Lookup.emptyGetter(returnType), getMap().getProtoGetSwitchPoint(name), guard);
     }
 
     private static GuardedInvocation findMegaMorphicGetMethod(final CallSiteDescriptor desc, final String name) {
@@ -1855,7 +1853,6 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
         final Class<?>   valueClass = callType.parameterType(2);
 
         MethodHandle methodHandle = findOwnMH("set", void.class, keyClass, valueClass, boolean.class);
-        methodHandle = MH.asType(methodHandle, methodHandle.type().changeParameterType(0, Object.class));
         methodHandle = MH.insertArguments(methodHandle, 3, isStrict);
 
         return new GuardedInvocation(methodHandle, getScriptObjectGuard(callType));
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/SetMethodCreator.java b/nashorn/src/jdk/nashorn/internal/runtime/SetMethodCreator.java
index ba020047a36..597a8a175e2 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/SetMethodCreator.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/SetMethodCreator.java
@@ -89,21 +89,19 @@ class SetMethodCreator {
     private class SetMethod {
         private final MethodHandle methodHandle;
         private final Property property;
-        private final int invokeFlags;
+        private final boolean nonStrict;
 
         /**
          * Creates a new lookup result.
          * @param methodHandle the actual method handle
          * @param property the property object. Can be null in case we're creating a new property in the global object.
-         * @param invokeFlags flags for the invocation. Normally either 0, or
-         * {@link NashornCallSiteDescriptor#CALLSITE_STRICT} when an existing property with a strict function for a
-         * property setter is discovered.
+         * @param nonStrict True if an existing property with a non-strict function as property setter is discovered.
          */
-        SetMethod(final MethodHandle methodHandle, final Property property, final int invokeFlags) {
+        SetMethod(final MethodHandle methodHandle, final Property property, final boolean nonStrict) {
             assert methodHandle != null;
             this.methodHandle = methodHandle;
             this.property = property;
-            this.invokeFlags = invokeFlags;
+            this.nonStrict = nonStrict;
         }
 
         /**
@@ -111,7 +109,7 @@ class SetMethodCreator {
          * @return the composed guarded invocation that represents the dynamic setter method for the property.
          */
         GuardedInvocation createGuardedInvocation() {
-            return new NashornGuardedInvocation(methodHandle, null, getGuard(), invokeFlags);
+            return new NashornGuardedInvocation(methodHandle, null, getGuard(), nonStrict);
         }
 
         private MethodHandle getGuard() {
@@ -164,20 +162,17 @@ class SetMethodCreator {
         } else {
             boundHandle = methodHandle;
         }
-        return new SetMethod(boundHandle, property, getExistingPropertySetterInvokeFlags());
+        return new SetMethod(boundHandle, property, getExistingSetterNonStrictFlag());
     }
 
-    private int getExistingPropertySetterInvokeFlags() {
+    private boolean getExistingSetterNonStrictFlag() {
         final ScriptFunction setter = find.getSetterFunction();
-        if (setter != null && setter.isStrict()) {
-            return NashornCallSiteDescriptor.CALLSITE_STRICT;
-        }
-        return 0;
+        return setter != null && setter.isNonStrictFunction();
     }
 
     private SetMethod createGlobalPropertySetter() {
         final ScriptObject global = Context.getGlobal();
-        return new SetMethod(ScriptObject.bindTo(global.addSpill(getName()), global), null, 0);
+        return new SetMethod(ScriptObject.bindTo(global.addSpill(getName()), global), null, false);
     }
 
     private SetMethod createNewPropertySetter() {
@@ -197,7 +192,7 @@ class SetMethodCreator {
         final int nextSpill = getMap().getSpillLength();
 
         final Property property = createSpillProperty(nextSpill);
-        return new SetMethod(createSpillMethodHandle(nextSpill, property), property, 0);
+        return new SetMethod(createSpillMethodHandle(nextSpill, property), property, false);
     }
 
     private Property createSpillProperty(final int nextSpill) {
@@ -227,7 +222,7 @@ class SetMethodCreator {
         final Property property = new SpillProperty(getName(), 0, nextEmbed, ScriptObject.GET_EMBED[nextEmbed], ScriptObject.SET_EMBED[nextEmbed]);
         //TODO specfields
         final MethodHandle methodHandle = MH.insertArguments(ScriptObject.SETEMBED, 0, desc, getMap(), getNewMap(property), property.getSetter(Object.class, getMap()), nextEmbed);
-        return new SetMethod(methodHandle, property, 0);
+        return new SetMethod(methodHandle, property, false);
     }
 
     private PropertyMap getNewMap(Property property) {
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornGuardedInvocation.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornGuardedInvocation.java
index 94972de56fb..68d90894938 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornGuardedInvocation.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornGuardedInvocation.java
@@ -33,7 +33,8 @@ import org.dynalang.dynalink.linker.GuardedInvocation;
  * Guarded invocation with Nashorn specific bits.
  */
 public class NashornGuardedInvocation extends GuardedInvocation {
-    private final int flags;
+
+    private final boolean nonStrict;
 
     /**
      * Constructor
@@ -41,28 +42,28 @@ public class NashornGuardedInvocation extends GuardedInvocation {
      * @param invocation  invocation target
      * @param switchPoint SwitchPoint that will, when invalidated, require relinking callsite, null if no SwitchPoint
      * @param guard       guard that will, when failed, require relinking callsite, null if no guard
-     * @param flags       callsite flags
+     * @param nonStrict   non-strict invocation target flag
      */
-    public NashornGuardedInvocation(final MethodHandle invocation, final SwitchPoint switchPoint, final MethodHandle guard, final int flags) {
+    public NashornGuardedInvocation(final MethodHandle invocation, final SwitchPoint switchPoint, final MethodHandle guard, final boolean nonStrict) {
         super(invocation, switchPoint, guard);
-        this.flags = flags;
+        this.nonStrict = nonStrict;
 
     }
 
     /**
-     * Is this invocation created from a callsite with strict semantics
-     * @return true if strict
+     * Is the target of this invocation a non-strict function?
+     * @return true if invocation target is non-strict
      */
-    public boolean isStrict() {
-        return (flags & NashornCallSiteDescriptor.CALLSITE_STRICT) != 0;
+    public boolean isNonStrict() {
+        return nonStrict;
     }
 
     /**
-     * Check whether a GuardedInvocation is created from a callsite with strict semantics
+     * Check whether the target of this invocation is a non-strict script function.
      * @param inv guarded invocation
-     * @return true if strict
+     * @return true if invocation target is non-strict
      */
-    public static boolean isStrict(final GuardedInvocation inv) {
-        return (inv instanceof NashornGuardedInvocation)? ((NashornGuardedInvocation)inv).isStrict() : false;
+    public static boolean isNonStrict(final GuardedInvocation inv) {
+        return inv instanceof NashornGuardedInvocation && ((NashornGuardedInvocation)inv).isNonStrict();
     }
 }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornLinker.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornLinker.java
index 8944e1f0d0b..0791261d176 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornLinker.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornLinker.java
@@ -29,6 +29,10 @@ import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
+
+import jdk.nashorn.internal.runtime.ConsString;
+import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.runtime.GlobalObject;
 import jdk.nashorn.internal.runtime.ScriptFunction;
 import jdk.nashorn.internal.runtime.ScriptObject;
 import jdk.nashorn.internal.runtime.Undefined;
@@ -71,9 +75,23 @@ public class NashornLinker implements TypeBasedGuardingDynamicLinker, GuardingTy
             return null;
         }
 
-        final GuardedInvocation inv;
+        GuardedInvocation inv;
         if (self instanceof ScriptObject) {
             inv = ((ScriptObject)self).lookup(desc, request.isCallSiteUnstable());
+
+            if (self instanceof ScriptFunction && "call".equals(desc.getNameToken(CallSiteDescriptor.OPERATOR))) {
+
+                // Add toObject wrapper for non-object self argument to non-strict functions
+                assert request.getArguments().length >= 2 : "No self argument in script function callsite";
+                Object thisObject = request.getArguments()[1];
+                // Add wrapper filter for primitive this-object on non-strict functions
+                if (NashornGuardedInvocation.isNonStrict(inv) && isPrimitive(thisObject)) {
+                    MethodHandle wrapFilter = ((GlobalObject) Context.getGlobal()).getWrapFilter(thisObject);
+                    MethodHandle invocation = MH.filterArguments(inv.getInvocation(), 1,
+                            MH.asType(wrapFilter, wrapFilter.type().changeReturnType(Object.class)));
+                    inv = new GuardedInvocation(invocation, inv.getSwitchPoint(), inv.getGuard());
+                }
+            }
         } else if (self instanceof Undefined) {
             inv = Undefined.lookup(desc);
         } else {
@@ -135,6 +153,13 @@ public class NashornLinker implements TypeBasedGuardingDynamicLinker, GuardingTy
                 JavaAdapterFactory.isAutoConvertibleFromFunction(clazz);
     }
 
+    private static boolean isPrimitive(Object obj) {
+        return obj instanceof Boolean ||
+               obj instanceof Number ||
+               obj instanceof String ||
+               obj instanceof ConsString;
+    }
+
     @Override
     public Comparison compareConversion(final Class<?> sourceType, final Class<?> targetType1, final Class<?> targetType2) {
         if(ScriptObject.class.isAssignableFrom(sourceType)) {
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java
index 51bb4040ccc..4a603a18aca 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java
@@ -94,11 +94,11 @@ public class PrimitiveLookup {
         final GuardedInvocation link = wrappedReceiver.lookup(desc);
         if (link != null) {
             MethodHandle method = link.getInvocation();
-            if (!NashornGuardedInvocation.isStrict(link)) {
+            final Class<?> receiverType = method.type().parameterType(0);
+            if (receiverType != Object.class || NashornGuardedInvocation.isNonStrict(link)) {
                 final MethodType wrapType = wrapFilter.type();
-                final Class<?> methodReceiverType = method.type().parameterType(0);
-                assert methodReceiverType.isAssignableFrom(wrapType.returnType());
-                method = MH.filterArguments(method, 0, MH.asType(wrapFilter, wrapType.changeReturnType(methodReceiverType)));
+                assert receiverType.isAssignableFrom(wrapType.returnType());
+                method = MH.filterArguments(method, 0, MH.asType(wrapFilter, wrapType.changeReturnType(receiverType)));
             }
             return new GuardedInvocation(method, guard, link.getSwitchPoint());
         }
diff --git a/nashorn/test/script/basic/JDK-8006570.js b/nashorn/test/script/basic/JDK-8006570.js
new file mode 100644
index 00000000000..29dc7ab6fb3
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8006570.js
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8006570 : this-value for non-strict functions should be converted to object
+ *
+ * @test
+ * @run
+ */
+
+var strict, nonstrict;
+
+nonstrict = Object.prototype.nonstrict = function nonstrict() {
+    print(typeof this, this instanceof Object);
+};
+
+(function() {
+    "use strict";
+    strict = Object.prototype.strict = function strict() {
+        print(typeof this, this instanceof Object);
+    };
+})();
+
+"foo".nonstrict();
+(1).nonstrict();
+true.nonstrict();
+nonstrict();
+nonstrict.call(null);
+nonstrict.call("foo");
+nonstrict.call(1);
+nonstrict.call(true);
+
+"foo".strict();
+(1).strict();
+true.strict();
+strict();
+strict.call(null);
+strict.call("foo");
+strict.call(1);
+strict.call(true);
\ No newline at end of file
diff --git a/nashorn/test/script/basic/JDK-8006570.js.EXPECTED b/nashorn/test/script/basic/JDK-8006570.js.EXPECTED
new file mode 100644
index 00000000000..4d78063012e
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8006570.js.EXPECTED
@@ -0,0 +1,16 @@
+object true
+object true
+object true
+object true
+object true
+object true
+object true
+object true
+string false
+number false
+boolean false
+undefined false
+object false
+string false
+number false
+boolean false

From 245ec829fff82e3a677e52a3ba07fda461c4d3b0 Mon Sep 17 00:00:00 2001
From: Attila Szegedi <attila@openjdk.org>
Date: Tue, 22 Jan 2013 14:36:28 +0100
Subject: [PATCH 082/311] 8006677: Remove unused FunctionNode flags

Reviewed-by: hannesw, jlaskey
---
 .../jdk/nashorn/internal/codegen/Lower.java   |  1 -
 .../jdk/nashorn/internal/ir/FunctionNode.java | 68 ++-----------------
 .../jdk/nashorn/internal/parser/Parser.java   |  9 ---
 3 files changed, 5 insertions(+), 73 deletions(-)

diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Lower.java b/nashorn/src/jdk/nashorn/internal/codegen/Lower.java
index a19febfb3e3..029f254a1c3 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Lower.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Lower.java
@@ -1761,7 +1761,6 @@ final class Lower extends NodeOperatorVisitor {
 
         final CatchNode catchNode = new CatchNode(tryNodeSource, token, finish, new IdentNode(exception), null, catchBody);
         catchNode.setIsSyntheticRethrow();
-        getCurrentFunctionNode().setHasThrows(true);
         catchBlock.addStatement(catchNode);
 
         // replace all catches of outer tryNode with the catch-all
diff --git a/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java b/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java
index 15dcf0badb2..363439bfea5 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java
@@ -164,22 +164,16 @@ public class FunctionNode extends Block {
     private static final int IS_SPLIT                = 0b0000_0000_0010_0000;
     /** Is this function lazily compiled? */
     private static final int IS_LAZY                 = 0b0000_0000_0100_0000;
-    /** Do we have throws ? */
-    private static final int HAS_THROWS              = 0b0000_0000_1000_0000;
-    /** Do we have calls ? */
-    private static final int HAS_CALLS               = 0b0000_0001_0000_0000;
-    /** Has yield flag */
-    private static final int HAS_YIELD               = 0b0000_0010_0000_0000;
     /** Does the function contain eval? */
-    private static final int HAS_EVAL                = 0b0000_0100_0000_0000;
+    private static final int HAS_EVAL                = 0b0000_0000_1000_0000;
     /** Does the function contain a with block ? */
-    private static final int HAS_WITH                = 0b0000_1000_0000_0000;
+    private static final int HAS_WITH                = 0b0000_0001_0000_0000;
     /** Does a child function contain a with or eval? */
-    private static final int HAS_CHILD_WITH_OR_EVAL  = 0b0001_0000_0000_0000;
+    private static final int HAS_CHILD_WITH_OR_EVAL  = 0b0000_0010_0000_0000;
     /** Hide arguments? */
-    private static final int HIDE_ARGS               = 0b0010_0000_0000_0000;
+    private static final int HIDE_ARGS               = 0b0000_0100_0000_0000;
     /** Does the function need a self symbol? */
-    private static final int NEEDS_SELF_SYMBOL       = 0b0100_0000_0000_0000;
+    private static final int NEEDS_SELF_SYMBOL       = 0b0000_1000_0000_0000;
 
     /** Does this function or any nested functions contain a with or an eval? */
     private static final int HAS_DEEP_WITH_OR_EVAL = HAS_EVAL | HAS_WITH | HAS_CHILD_WITH_OR_EVAL;
@@ -588,22 +582,6 @@ public class FunctionNode extends Block {
         return labelStack;
     }
 
-    /**
-     * Check if this function has a {@code yield} usage
-     *
-     * @return true if function uses {@code yield}
-     */
-    public boolean hasYield() {
-        return (flags & HAS_YIELD) != 0;
-    }
-
-    /**
-     * Flag this function as using the {@code yield} keyword
-     */
-    public void setHasYield() {
-        this.flags |= HAS_YIELD;
-    }
-
     /**
      * If this function needs to use var args, return the identifier to the node used
      * for the var args structure
@@ -1048,42 +1026,6 @@ public class FunctionNode extends Block {
         return (flags & IS_LOWERED) != 0;
     }
 
-    /**
-     * Set if function has calls
-     *
-     * @param hasCalls does the function have calls?
-     */
-    public void setHasCalls(final boolean hasCalls) {
-        flags = hasCalls ? flags | HAS_CALLS : flags & ~HAS_CALLS;
-    }
-
-    /**
-     * Check if function has calls
-     *
-     * @return true if function has calls
-     */
-    public boolean hasCalls() {
-        return (flags & HAS_CALLS) != 0;
-    }
-
-    /**
-     * Set if the function has throws
-     *
-     * @param hasThrows does the function have throw statements
-     */
-    public void setHasThrows(final boolean hasThrows) {
-        flags = hasThrows ? flags | HAS_THROWS : flags & ~HAS_THROWS;
-    }
-
-    /**
-     * Can the function throw exceptioons
-     *
-     * @return true if function throws exceptions
-     */
-    public boolean hasThrows() {
-        return (flags & HAS_THROWS) != 0;
-    }
-
     /**
      * Add a new function to the function list.
      *
diff --git a/nashorn/src/jdk/nashorn/internal/parser/Parser.java b/nashorn/src/jdk/nashorn/internal/parser/Parser.java
index 80e5f431f6b..a43179da715 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/Parser.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/Parser.java
@@ -1447,9 +1447,6 @@ loop:
         // Construct and add YIELD node.
         final ReturnNode yieldNode = new ReturnNode(source, yieldToken, finish, expression, findControl(TryNode.class));
         block.addStatement(yieldNode);
-
-        // Note that this function contains a yield.
-        function.setHasYield();
     }
 
     /**
@@ -1671,7 +1668,6 @@ loop:
 
         // Construct and add THROW node.
         final ThrowNode throwNode = new ThrowNode(source, throwToken, finish, expression, findControl(TryNode.class));
-        function.setHasThrows(true);
         block.addStatement(throwNode);
     }
 
@@ -2235,8 +2231,6 @@ loop:
             if (isInWithBlock()) {
                 ((CallNode)lhs).setInWithBlock();
             }
-
-            function.setHasCalls(true);
         }
 
 loop:
@@ -2255,8 +2249,6 @@ loop:
                     ((CallNode)lhs).setInWithBlock();
                 }
 
-                function.setHasCalls(true);
-
                 break;
 
             case LBRACKET:
@@ -2333,7 +2325,6 @@ loop:
             arguments.add(objectLiteral());
         }
 
-        function.setHasCalls(true);
         final CallNode callNode = new CallNode(source, constructor.getToken(), finish, constructor, arguments);
         if (isInWithBlock()) {
             callNode.setInWithBlock();

From 15d98b74e99745f352e40dc07ef2903d683f16cf Mon Sep 17 00:00:00 2001
From: Stefan Karlsson <stefank@openjdk.org>
Date: Tue, 22 Jan 2013 15:25:37 +0100
Subject: [PATCH 083/311] 7140852: Add test for 7022100

Reviewed-by: sspitsyn, coleenp
---
 .../RedefineMethodWithAnnotations.sh          |  85 ++++++++++++++
 .../RedefineMethodWithAnnotationsAgent.java   |  42 +++++++
 ...efineMethodWithAnnotationsAnnotations.java |  38 ++++++
 .../RedefineMethodWithAnnotationsApp.java     | 108 ++++++++++++++++++
 .../RedefineMethodWithAnnotationsTarget.java  |  33 ++++++
 ...RedefineMethodWithAnnotationsTarget_2.java |  35 ++++++
 6 files changed, 341 insertions(+)
 create mode 100644 jdk/test/java/lang/instrument/RedefineMethodWithAnnotations.sh
 create mode 100644 jdk/test/java/lang/instrument/RedefineMethodWithAnnotationsAgent.java
 create mode 100644 jdk/test/java/lang/instrument/RedefineMethodWithAnnotationsAnnotations.java
 create mode 100644 jdk/test/java/lang/instrument/RedefineMethodWithAnnotationsApp.java
 create mode 100644 jdk/test/java/lang/instrument/RedefineMethodWithAnnotationsTarget.java
 create mode 100644 jdk/test/java/lang/instrument/RedefineMethodWithAnnotationsTarget_2.java

diff --git a/jdk/test/java/lang/instrument/RedefineMethodWithAnnotations.sh b/jdk/test/java/lang/instrument/RedefineMethodWithAnnotations.sh
new file mode 100644
index 00000000000..9bde206f17a
--- /dev/null
+++ b/jdk/test/java/lang/instrument/RedefineMethodWithAnnotations.sh
@@ -0,0 +1,85 @@
+#
+# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# @test
+# @bug 7022100
+# @summary Method annotations are incorrectly set when redefining classes.
+# @author Stefan Karlsson
+#
+# @run shell MakeJAR3.sh RedefineMethodWithAnnotationsAgent 'Can-Redefine-Classes: true'
+# @run build RedefineMethodWithAnnotationsTarget RedefineMethodWithAnnotationsApp RedefineMethodWithAnnotationsAnnotations
+# @run shell RedefineMethodWithAnnotations.sh
+#
+
+if [ "${TESTJAVA}" = "" ]
+then
+  echo "TESTJAVA not set.  Test cannot execute.  Failed."
+  exit 1
+fi
+
+if [ "${COMPILEJAVA}" = "" ]
+then
+  COMPILEJAVA="${TESTJAVA}"
+fi
+echo "COMPILEJAVA=${COMPILEJAVA}"
+
+if [ "${TESTSRC}" = "" ]
+then
+  echo "TESTSRC not set.  Test cannot execute.  Failed."
+  exit 1
+fi
+
+if [ "${TESTCLASSES}" = "" ]
+then
+  echo "TESTCLASSES not set.  Test cannot execute.  Failed."
+  exit 1
+fi
+
+JAVAC="${COMPILEJAVA}"/bin/javac
+JAVA="${TESTJAVA}"/bin/java
+
+cp "${TESTSRC}"/RedefineMethodWithAnnotationsTarget_2.java \
+    RedefineMethodWithAnnotationsTarget.java
+cp "${TESTSRC}"/RedefineMethodWithAnnotationsAnnotations.java \
+    RedefineMethodWithAnnotationsAnnotations.java
+
+"${JAVAC}" ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d . \
+    RedefineMethodWithAnnotationsTarget.java \
+    RedefineMethodWithAnnotationsAnnotations.java
+
+"${JAVA}" ${TESTVMOPTS} -javaagent:RedefineMethodWithAnnotationsAgent.jar \
+    -cp "${TESTCLASSES}" RedefineMethodWithAnnotationsApp > output.log 2>&1
+cat output.log
+
+MESG="Exception"
+grep "$MESG" output.log
+result=$?
+if [ "$result" = 0 ]; then
+    echo "FAIL: found '$MESG' in the test output"
+    result=1
+else
+    echo "PASS: did NOT find '$MESG' in the test output"
+    result=0
+fi
+
+exit $result
diff --git a/jdk/test/java/lang/instrument/RedefineMethodWithAnnotationsAgent.java b/jdk/test/java/lang/instrument/RedefineMethodWithAnnotationsAgent.java
new file mode 100644
index 00000000000..c160be8756b
--- /dev/null
+++ b/jdk/test/java/lang/instrument/RedefineMethodWithAnnotationsAgent.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.lang.instrument.Instrumentation;
+
+public class RedefineMethodWithAnnotationsAgent {
+    private static Instrumentation instrumentation;
+
+    private RedefineMethodWithAnnotationsAgent() {}
+
+    public static void premain(String agentArgs, Instrumentation inst) {
+        System.out.println("Hello from RedefineMethodWithAnnotationsAgent!");
+        System.out.println("isRedefineClassesSupported()=" +
+                inst.isRedefineClassesSupported());
+
+        instrumentation = inst;
+    }
+
+    public static Instrumentation getInstrumentation() {
+        return instrumentation;
+    }
+}
diff --git a/jdk/test/java/lang/instrument/RedefineMethodWithAnnotationsAnnotations.java b/jdk/test/java/lang/instrument/RedefineMethodWithAnnotationsAnnotations.java
new file mode 100644
index 00000000000..a215e96b8b9
--- /dev/null
+++ b/jdk/test/java/lang/instrument/RedefineMethodWithAnnotationsAnnotations.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+@interface ParameterAnnotation {
+    // Values used for the annotations in the first version of the target class.
+    static final String STRING_VALUE_1 = "String1";
+    static final String INT_VALUE_1    = "Int1";
+
+    // Values used for the annotations in the second version of the target class.
+    static final String STRING_VALUE_2 = "String2";
+    static final String INT_VALUE_2    = "Int2";
+
+    String value();
+}
diff --git a/jdk/test/java/lang/instrument/RedefineMethodWithAnnotationsApp.java b/jdk/test/java/lang/instrument/RedefineMethodWithAnnotationsApp.java
new file mode 100644
index 00000000000..ebc6ac503b8
--- /dev/null
+++ b/jdk/test/java/lang/instrument/RedefineMethodWithAnnotationsApp.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.lang.annotation.Annotation;
+import java.lang.instrument.ClassDefinition;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.reflect.Method;
+
+public class RedefineMethodWithAnnotationsApp {
+    public static void main(String args[]) throws Exception {
+        System.out.println("Hello from RedefineMethodWithAnnotationsApp!");
+
+        new RedefineMethodWithAnnotationsApp().doTest();
+
+        System.exit(0);
+    }
+
+    private void doTest() throws Exception {
+        doMethodParameterAnnotationsTest();
+    }
+
+    private void doMethodParameterAnnotationsTest() throws Exception {
+        verifyMethodParameterAnnotationsValue(
+                ParameterAnnotation.STRING_VALUE_1);
+
+        doRedefine(RedefineMethodWithAnnotationsTarget.class);
+
+        verifyMethodParameterAnnotationsValue(
+                ParameterAnnotation.STRING_VALUE_2);
+    }
+
+    private static void verifyMethodParameterAnnotationsValue(
+            String expectedValue) throws Exception {
+        Class<RedefineMethodWithAnnotationsTarget> c =
+                RedefineMethodWithAnnotationsTarget.class;
+        Method method = c.getMethod("annotatedMethod", String.class);
+
+        Annotation [][] parametersAnnotations =
+                method.getParameterAnnotations();
+        if (parametersAnnotations.length != 1) {
+            throw new Exception("Incorrect number of parameters to method: " +
+                    method.getName() + "." +
+                    " Expected: 1," +
+                    " got: " + parametersAnnotations.length);
+        }
+
+        Annotation[] parameterAnnotations = parametersAnnotations[0];
+        if (parameterAnnotations.length != 1) {
+            throw new Exception("Incorrect number of annotations." +
+                    " Expected: 1" +
+                    ", got " + parameterAnnotations.length);
+        }
+
+        Annotation parameterAnnotation = parameterAnnotations[0];
+        if (!(parameterAnnotation instanceof ParameterAnnotation)) {
+            throw new Exception("Incorrect Annotation class." +
+                    " Expected: " + ParameterAnnotation.class.getName() +
+                    ", got: " + parameterAnnotation.getClass().getName());
+        }
+
+        ParameterAnnotation pa = (ParameterAnnotation)parameterAnnotation;
+        String annotationValue = pa.value();
+        if (!expectedValue.equals(annotationValue)) {
+            throw new Exception("Incorrect parameter annotation value." +
+                    " Expected: " + expectedValue +
+                    ", got: " + annotationValue);
+        }
+    }
+
+    private static void doRedefine(Class<?> clazz) throws Exception {
+        // Load the second version of this class.
+        File f = new File(clazz.getName() + ".class");
+        System.out.println("Reading test class from " + f);
+        InputStream redefineStream = new FileInputStream(f);
+
+        byte[] redefineBuffer = NamedBuffer.loadBufferFromStream(redefineStream);
+
+        ClassDefinition redefineParamBlock = new ClassDefinition(
+                clazz, redefineBuffer);
+
+        RedefineMethodWithAnnotationsAgent.getInstrumentation().redefineClasses(
+                new ClassDefinition[] {redefineParamBlock});
+    }
+}
diff --git a/jdk/test/java/lang/instrument/RedefineMethodWithAnnotationsTarget.java b/jdk/test/java/lang/instrument/RedefineMethodWithAnnotationsTarget.java
new file mode 100644
index 00000000000..6cfbe21eb89
--- /dev/null
+++ b/jdk/test/java/lang/instrument/RedefineMethodWithAnnotationsTarget.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * The first version of this class. The second version is in
+ * RedefineMethodWithAnnotationsTarget_2.java.
+ */
+public class RedefineMethodWithAnnotationsTarget {
+    public void annotatedMethod(@ParameterAnnotation(
+            value = ParameterAnnotation.STRING_VALUE_1) String parameter) { }
+    public void annotatedMethod(@ParameterAnnotation(
+            value = ParameterAnnotation.INT_VALUE_1) int parameter) { }
+}
diff --git a/jdk/test/java/lang/instrument/RedefineMethodWithAnnotationsTarget_2.java b/jdk/test/java/lang/instrument/RedefineMethodWithAnnotationsTarget_2.java
new file mode 100644
index 00000000000..85c43047231
--- /dev/null
+++ b/jdk/test/java/lang/instrument/RedefineMethodWithAnnotationsTarget_2.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * This is the second version of this class. The first version is in
+ * RedefineMethodWithAnnotationsTarget.java.
+ * <p>
+ * It has the same methods but with different annotations and order.
+ */
+public class RedefineMethodWithAnnotationsTarget {
+    public void annotatedMethod(@ParameterAnnotation(
+            value = ParameterAnnotation.INT_VALUE_2) int parameter) { }
+    public void annotatedMethod(@ParameterAnnotation(
+            value = ParameterAnnotation.STRING_VALUE_2) String parameter) { }
+}

From 7014b0ccede19bbd54714ed92624e2a4f41c95ff Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Tue, 22 Jan 2013 22:07:12 +0530
Subject: [PATCH 084/311] 8006678: Avoid too many Context.getGlobal() calls

Reviewed-by: lagergren, jlaskey
---
 nashorn/make/project.properties               |   2 +-
 .../api/scripting/NashornScriptEngine.java    |  18 +--
 .../api/scripting/ScriptObjectMirror.java     |   6 +-
 .../jdk/nashorn/internal/codegen/Lower.java   |   6 +-
 .../nashorn/internal/ir/debug/JSONWriter.java |   4 +-
 .../objects/AccessorPropertyDescriptor.java   |   4 +-
 .../jdk/nashorn/internal/objects/Global.java  |   6 +-
 .../internal/objects/NativeArguments.java     |   2 +-
 .../nashorn/internal/objects/NativeArray.java |  33 +++--
 .../internal/objects/NativeBoolean.java       |   2 +-
 .../nashorn/internal/objects/NativeDate.java  |   8 +-
 .../internal/objects/NativeFunction.java      |  18 +--
 .../internal/objects/NativeJSAdapter.java     |   8 +-
 .../nashorn/internal/objects/NativeJSON.java  |   6 +-
 .../nashorn/internal/objects/NativeJava.java  |   6 +-
 .../internal/objects/NativeNumber.java        |  10 +-
 .../internal/objects/NativeObject.java        |   4 +-
 .../internal/objects/NativeRegExp.java        |   6 +-
 .../internal/objects/NativeString.java        |   6 +-
 .../jdk/nashorn/internal/runtime/Context.java |  78 +++++++++---
 .../nashorn/internal/runtime/ECMAErrors.java  | 114 ++++++++++++++++++
 .../internal/runtime/ErrorManager.java        |   2 +-
 .../jdk/nashorn/internal/runtime/JSType.java  |  19 ++-
 .../internal/runtime/ParserException.java     |   7 ++
 .../internal/runtime/ScriptFunction.java      |  14 +--
 .../internal/runtime/ScriptObject.java        |  38 +++---
 .../internal/runtime/ScriptRuntime.java       |  20 +--
 .../internal/runtime/ScriptingFunctions.java  |   2 +-
 .../internal/runtime/SetMethodCreator.java    |   4 +-
 .../nashorn/internal/runtime/URIUtils.java    |  30 ++---
 .../nashorn/internal/runtime/Undefined.java   |   8 +-
 .../runtime/arrays/ArrayLikeIterator.java     |   4 +-
 .../runtime/arrays/FrozenArrayFilter.java     |   8 +-
 .../runtime/arrays/IteratorAction.java        |   3 +-
 .../runtime/arrays/SealedArrayFilter.java     |   2 +-
 .../runtime/linker/JavaAdapterFactory.java    |  25 +++-
 .../linker/JavaArgumentConverters.java        |   5 +-
 .../internal/runtime/linker/Lookup.java       |   5 +-
 .../runtime/linker/NashornBottomLinker.java   |  21 ++--
 .../linker/NashornStaticClassLinker.java      |   3 +-
 40 files changed, 379 insertions(+), 188 deletions(-)

diff --git a/nashorn/make/project.properties b/nashorn/make/project.properties
index b5b6ee403d5..682cdb686a5 100644
--- a/nashorn/make/project.properties
+++ b/nashorn/make/project.properties
@@ -216,7 +216,7 @@ run.test.xms=2G
 # add '-Dtest.js.outofprocess' to run each test in a new sub-process
 run.test.jvmargs=-server -Xmx${run.test.xmx} -XX:-TieredCompilation -esa -ea -Dnashorn.debug=true -Dfile.encoding=UTF-8 
 #-XX:+HeapDumpOnOutOfMemoryError -XX:-UseCompressedKlassPointers -XX:+PrintHeapAtGC -XX:ClassMetaspaceSize=300M  
-run.test.jvmargs.octane=-Xms${run.test.xms} -${run.test.jvmargs}
+run.test.jvmargs.octane=-Xms${run.test.xms} ${run.test.jvmargs}
 
 run.test.jvmsecurityargs=-Xverify:all -Djava.security.manager -Djava.security.policy=${basedir}/build/nashorn.policy
 
diff --git a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
index bcad3582e10..e23fe555cb3 100644
--- a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
+++ b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
@@ -216,7 +216,7 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
             realSelf = self;
         }
         try {
-            final ScriptObject oldGlobal = Context.getGlobal();
+            final ScriptObject oldGlobal = getNashornGlobal();
             try {
                 if(oldGlobal != global) {
                     setNashornGlobal(global);
@@ -343,7 +343,7 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
     }
 
     private Object invokeImpl(final Object selfObject, final String name, final Object... args) throws ScriptException, NoSuchMethodException {
-        final ScriptObject oldGlobal     = Context.getGlobal();
+        final ScriptObject oldGlobal     = getNashornGlobal();
         final boolean globalChanged = (oldGlobal != global);
 
         Object self = selfObject;
@@ -395,7 +395,7 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
         if (script == null) {
             return null;
         }
-        final ScriptObject oldGlobal = Context.getGlobal();
+        final ScriptObject oldGlobal = getNashornGlobal();
         final boolean globalChanged = (oldGlobal != global);
         try {
             if (globalChanged) {
@@ -457,7 +457,7 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
     }
 
     private ScriptFunction compileImpl(final char[] buf, final ScriptContext ctxt) throws ScriptException {
-        final ScriptObject oldGlobal = Context.getGlobal();
+        final ScriptObject oldGlobal = getNashornGlobal();
         final boolean globalChanged = (oldGlobal != global);
         try {
             final Object val = ctxt.getAttribute(ScriptEngine.FILENAME);
@@ -479,13 +479,17 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
         }
     }
 
-    // don't make this public!!
+    // don't make these public!!
+    static ScriptObject getNashornGlobal() {
+       return Context.getGlobal();
+    }
+
     static void setNashornGlobal(final ScriptObject global) {
         AccessController.doPrivileged(new PrivilegedAction<Void>() {
             @Override
             public Void run() {
-               Context.setGlobal(global);
-               return null;
+                Context.setGlobal(global);
+                return null;
             }
         });
     }
diff --git a/nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java b/nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java
index e6397028354..d0992573140 100644
--- a/nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java
+++ b/nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java
@@ -83,7 +83,7 @@ final class ScriptObjectMirror extends JSObject implements Bindings {
     }
 
     private <V> V inGlobal(final Callable<V> callable) {
-        final ScriptObject oldGlobal = Context.getGlobal();
+        final ScriptObject oldGlobal = NashornScriptEngine.getNashornGlobal();
         final boolean globalChanged = (oldGlobal != global);
         if (globalChanged) {
             NashornScriptEngine.setNashornGlobal(global);
@@ -105,7 +105,7 @@ final class ScriptObjectMirror extends JSObject implements Bindings {
     @Override
     public Object call(final String methodName, final Object args[]) {
         final Object val = sobj.get(methodName);
-        final ScriptObject oldGlobal = Context.getGlobal();
+        final ScriptObject oldGlobal = NashornScriptEngine.getNashornGlobal();
         final boolean globalChanged = (oldGlobal != global);
 
         if (val instanceof ScriptFunction) {
@@ -180,7 +180,7 @@ final class ScriptObjectMirror extends JSObject implements Bindings {
 
     @Override
     public void setMember(final String name, final Object value) {
-        put(name, wrap(value, Context.getGlobal()));
+        put(name, wrap(value, NashornScriptEngine.getNashornGlobal()));
     }
 
     @Override
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Lower.java b/nashorn/src/jdk/nashorn/internal/codegen/Lower.java
index 029f254a1c3..2c96d972e94 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Lower.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Lower.java
@@ -1080,10 +1080,10 @@ final class Lower extends NodeOperatorVisitor {
     /*
      * For a script, add scope symbols as defined in the property map
      */
-    private static void initFromPropertyMap(final FunctionNode functionNode) {
+    private static void initFromPropertyMap(final Context context, final FunctionNode functionNode) {
         assert functionNode.isScript();
 
-        final PropertyMap map = Context.getGlobal().getMap();
+        final PropertyMap map = context.getGlobalMap();
 
         for (final Property property : map.getProperties()) {
             final String key = property.getKey();
@@ -1130,7 +1130,7 @@ final class Lower extends NodeOperatorVisitor {
         }
 
         if (functionNode.isScript()) {
-            initFromPropertyMap(functionNode);
+            initFromPropertyMap(compiler.getContext(), functionNode);
         }
 
         // Add function name as local symbol
diff --git a/nashorn/src/jdk/nashorn/internal/ir/debug/JSONWriter.java b/nashorn/src/jdk/nashorn/internal/ir/debug/JSONWriter.java
index f07a5535988..122d3edc10c 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/debug/JSONWriter.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/debug/JSONWriter.java
@@ -71,7 +71,6 @@ import jdk.nashorn.internal.parser.Parser;
 import jdk.nashorn.internal.parser.TokenType;
 import jdk.nashorn.internal.runtime.Context;
 import jdk.nashorn.internal.runtime.ParserException;
-import jdk.nashorn.internal.runtime.ScriptObject;
 import jdk.nashorn.internal.runtime.Source;
 
 /**
@@ -87,7 +86,6 @@ public final class JSONWriter extends NodeVisitor {
      * @return JSON string representation of AST of the supplied code
      */
     public static String parse(final String code, final String name, final boolean includeLoc) {
-        final ScriptObject global     = Context.getGlobal();
         final Context      context    = AccessController.doPrivileged(
                 new PrivilegedAction<Context>() {
                     @Override
@@ -103,7 +101,7 @@ public final class JSONWriter extends NodeVisitor {
             functionNode.accept(jsonWriter);
             return jsonWriter.getString();
         } catch (final ParserException e) {
-            e.throwAsEcmaException(global);
+            e.throwAsEcmaException();
             return null;
         }
     }
diff --git a/nashorn/src/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java b/nashorn/src/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java
index 87fcfd41c17..6951c0389fe 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java
@@ -157,7 +157,7 @@ public final class AccessorPropertyDescriptor extends ScriptObject implements Pr
             if (getter == UNDEFINED || getter instanceof ScriptFunction) {
                 this.get = getter;
             } else {
-                typeError(Global.instance(), "not.a.function", ScriptRuntime.safeToString(getter));
+                typeError("not.a.function", ScriptRuntime.safeToString(getter));
             }
         } else {
             delete(GET, strict);
@@ -168,7 +168,7 @@ public final class AccessorPropertyDescriptor extends ScriptObject implements Pr
             if (setter == UNDEFINED || setter instanceof ScriptFunction) {
                 this.set = setter;
             } else {
-                typeError(Global.instance(), "not.a.function", ScriptRuntime.safeToString(setter));
+                typeError("not.a.function", ScriptRuntime.safeToString(setter));
             }
         } else {
             delete(SET, strict);
diff --git a/nashorn/src/jdk/nashorn/internal/objects/Global.java b/nashorn/src/jdk/nashorn/internal/objects/Global.java
index 97eeffc49e4..28b5b5ac6f7 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/Global.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/Global.java
@@ -1157,7 +1157,7 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
      */
     public static Object toObject(final Object obj) {
         if (obj == null || obj == UNDEFINED) {
-            typeError(instance(), "not.an.object", ScriptRuntime.safeToString(obj));
+            typeError("not.an.object", ScriptRuntime.safeToString(obj));
         }
 
         if (obj instanceof ScriptObject) {
@@ -1274,7 +1274,7 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
      */
     public static void checkObject(final Object obj) {
         if (!(obj instanceof ScriptObject)) {
-            typeError(instance(), "not.an.object", ScriptRuntime.safeToString(obj));
+            typeError("not.an.object", ScriptRuntime.safeToString(obj));
         }
     }
 
@@ -1286,7 +1286,7 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
      */
     public static void checkObjectCoercible(final Object obj) {
         if (obj == null || obj == UNDEFINED) {
-            typeError(instance(), "not.an.object", ScriptRuntime.safeToString(obj));
+            typeError("not.an.object", ScriptRuntime.safeToString(obj));
         }
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeArguments.java b/nashorn/src/jdk/nashorn/internal/objects/NativeArguments.java
index 72aabcdaad7..b8c02ae76d2 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeArguments.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeArguments.java
@@ -485,7 +485,7 @@ public final class NativeArguments extends ScriptObject {
             final boolean allowed = super.defineOwnProperty(key, propertyDesc, false);
             if (!allowed) {
                 if (reject) {
-                    typeError(Global.instance(), "cant.redefine.property",  key, ScriptRuntime.safeToString(this));
+                    typeError("cant.redefine.property",  key, ScriptRuntime.safeToString(this));
                 }
                 return false;
             }
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeArray.java b/nashorn/src/jdk/nashorn/internal/objects/NativeArray.java
index 0b3969e5519..923afa34598 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeArray.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeArray.java
@@ -47,7 +47,6 @@ import jdk.nashorn.internal.objects.annotations.ScriptClass;
 import jdk.nashorn.internal.objects.annotations.Setter;
 import jdk.nashorn.internal.objects.annotations.SpecializedConstructor;
 import jdk.nashorn.internal.objects.annotations.Where;
-import jdk.nashorn.internal.runtime.Context;
 import jdk.nashorn.internal.runtime.JSType;
 import jdk.nashorn.internal.runtime.PropertyDescriptor;
 import jdk.nashorn.internal.runtime.ScriptFunction;
@@ -182,7 +181,7 @@ public final class NativeArray extends ScriptObject {
             // Step 3g
             if (!oldLenDesc.isWritable()) {
                 if (reject) {
-                    typeError(Global.instance(), "property.not.writable", "length", ScriptRuntime.safeToString(this));
+                    typeError("property.not.writable", "length", ScriptRuntime.safeToString(this));
                 }
                 return false;
             }
@@ -211,7 +210,7 @@ public final class NativeArray extends ScriptObject {
                     }
                     super.defineOwnProperty("length", newLenDesc, false);
                     if (reject) {
-                        typeError(Global.instance(), "property.not.writable", "length", ScriptRuntime.safeToString(this));
+                        typeError("property.not.writable", "length", ScriptRuntime.safeToString(this));
                     }
                     return false;
                 }
@@ -236,7 +235,7 @@ public final class NativeArray extends ScriptObject {
             // setting an element beyond current length, but 'length' is not writable
             if (longIndex >= oldLen && !oldLenDesc.isWritable()) {
                 if (reject) {
-                    typeError(Global.instance(), "property.not.writable", Long.toString(longIndex), ScriptRuntime.safeToString(this));
+                    typeError("property.not.writable", Long.toString(longIndex), ScriptRuntime.safeToString(this));
                 }
                 return false;
             }
@@ -248,7 +247,7 @@ public final class NativeArray extends ScriptObject {
             // Step 4d
             if (!succeeded) {
                 if (reject) {
-                    typeError(Global.instance(), "cant.redefine.property", key, ScriptRuntime.safeToString(this));
+                    typeError("cant.redefine.property", key, ScriptRuntime.safeToString(this));
                 }
                 return false;
             }
@@ -325,7 +324,7 @@ public final class NativeArray extends ScriptObject {
             }
         }
         if (reject) {
-            rangeError(Global.instance(), "inappropriate.array.length", ScriptRuntime.safeToString(length));
+            rangeError("inappropriate.array.length", ScriptRuntime.safeToString(length));
         }
         return -1;
     }
@@ -371,7 +370,7 @@ public final class NativeArray extends ScriptObject {
             final Object obj = iter.next();
 
             if (obj != null && obj != ScriptRuntime.UNDEFINED) {
-                final Object val = JSType.toObject(Global.instance(), obj);
+                final Object val = JSType.toScriptObject(obj);
 
                 try {
                     if (val instanceof ScriptObject) {
@@ -381,7 +380,7 @@ public final class NativeArray extends ScriptObject {
                         if (toLocaleString instanceof ScriptFunction) {
                             sb.append((String)TO_LOCALE_STRING.getInvoker().invokeExact(toLocaleString, sobj));
                         } else {
-                            typeError(Global.instance(), "not.a.function", "toLocaleString");
+                            typeError("not.a.function", "toLocaleString");
                         }
                     }
                 } catch (final Error|RuntimeException t) {
@@ -434,7 +433,7 @@ public final class NativeArray extends ScriptObject {
                  */
                 final double numberLength = ((Number) len).doubleValue();
                 if (length != numberLength) {
-                    rangeError(Global.instance(), "inappropriate.array.length", JSType.toString(numberLength));
+                    rangeError("inappropriate.array.length", JSType.toString(numberLength));
                 }
 
                 return new NativeArray(length);
@@ -624,7 +623,7 @@ public final class NativeArray extends ScriptObject {
 
             return element;
         } catch (final ClassCastException | NullPointerException e) {
-            typeError(Global.instance(), "not.an.object", ScriptRuntime.safeToString(self));
+            typeError("not.an.object", ScriptRuntime.safeToString(self));
             return ScriptRuntime.UNDEFINED;
         }
     }
@@ -660,7 +659,7 @@ public final class NativeArray extends ScriptObject {
 
             return len;
         } catch (final ClassCastException | NullPointerException e) {
-            typeError(Global.instance(), "not.an.object", ScriptRuntime.safeToString(self));
+            typeError("not.an.object", ScriptRuntime.safeToString(self));
             return ScriptRuntime.UNDEFINED;
         }
     }
@@ -699,7 +698,7 @@ public final class NativeArray extends ScriptObject {
             }
             return sobj;
         } catch (final ClassCastException | NullPointerException e) {
-            typeError(Global.instance(), "not.an.object", ScriptRuntime.safeToString(self));
+            typeError("not.an.object", ScriptRuntime.safeToString(self));
             return ScriptRuntime.UNDEFINED;
         }
     }
@@ -805,7 +804,7 @@ public final class NativeArray extends ScriptObject {
         final ScriptFunction cmp = compareFunction(comparefn);
 
         final List<Object> list = Arrays.asList(array);
-        final Object cmpThis = cmp == null || cmp.isStrict() ? ScriptRuntime.UNDEFINED : Context.getGlobal();
+        final Object cmpThis = cmp == null || cmp.isStrict() ? ScriptRuntime.UNDEFINED : Global.instance();
 
         Collections.sort(list, new Comparator<Object>() {
             @Override
@@ -865,7 +864,7 @@ public final class NativeArray extends ScriptObject {
 
             return sobj;
         } catch (final ClassCastException | NullPointerException e) {
-            typeError(Global.instance(), "not.an.object", ScriptRuntime.safeToString(self));
+            typeError("not.an.object", ScriptRuntime.safeToString(self));
             return ScriptRuntime.UNDEFINED;
         }
     }
@@ -1080,7 +1079,7 @@ public final class NativeArray extends ScriptObject {
                 }
             }
         } catch (final ClassCastException | NullPointerException e) {
-            typeError(Global.instance(), "not.an.object", ScriptRuntime.safeToString(self));
+            typeError("not.an.object", ScriptRuntime.safeToString(self));
         }
 
         return -1;
@@ -1202,14 +1201,14 @@ public final class NativeArray extends ScriptObject {
         Object initialValue = initialValuePresent ? args[1] : ScriptRuntime.UNDEFINED;
 
         if (callbackfn == ScriptRuntime.UNDEFINED) {
-            typeError(Global.instance(), "not.a.function", "undefined");
+            typeError("not.a.function", "undefined");
         }
 
         if (!initialValuePresent) {
             if (iter.hasNext()) {
                 initialValue = iter.next();
             } else {
-                typeError(Global.instance(), "array.reduce.invalid.init");
+                typeError("array.reduce.invalid.init");
             }
         }
 
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeBoolean.java b/nashorn/src/jdk/nashorn/internal/objects/NativeBoolean.java
index 64041cd6810..3510c4eb10d 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeBoolean.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeBoolean.java
@@ -145,7 +145,7 @@ public final class NativeBoolean extends ScriptObject {
         } else if (self != null && self == Global.instance().getBooleanPrototype()) {
             return false;
         } else {
-            typeError(Global.instance(), "not.a.boolean", ScriptRuntime.safeToString(self));
+            typeError("not.a.boolean", ScriptRuntime.safeToString(self));
             return false;
         }
     }
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeDate.java b/nashorn/src/jdk/nashorn/internal/objects/NativeDate.java
index dcf1b0a1249..0b90ed6b8ff 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeDate.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeDate.java
@@ -867,7 +867,7 @@ public final class NativeDate extends ScriptObject {
             if (func instanceof ScriptFunction) {
                 return TO_ISO_STRING.getInvoker().invokeExact(func, sobj, key);
             }
-            typeError(Global.instance(), "not.a.function", ScriptRuntime.safeToString(func));
+            typeError("not.a.function", ScriptRuntime.safeToString(func));
         } catch (final RuntimeException | Error e) {
             throw e;
         } catch (final Throwable t) {
@@ -1006,7 +1006,7 @@ public final class NativeDate extends ScriptObject {
             return sb.toString();
         }
 
-        rangeError(Global.instance(), "invalid.date");
+        rangeError("invalid.date");
 
         return INVALID_DATE;
     }
@@ -1035,7 +1035,7 @@ public final class NativeDate extends ScriptObject {
             return sb.toString();
         }
 
-        rangeError(Global.instance(), "invalid.date");
+        rangeError("invalid.date");
 
         return INVALID_DATE;
     }
@@ -1268,7 +1268,7 @@ public final class NativeDate extends ScriptObject {
         } else if (self != null && self == Global.instance().getDatePrototype()) {
             return Global.instance().DEFAULT_DATE;
         } else {
-            typeError(Global.instance(), "not.a.date", ScriptRuntime.safeToString(self));
+            typeError("not.a.date", ScriptRuntime.safeToString(self));
             return null;
         }
     }
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeFunction.java b/nashorn/src/jdk/nashorn/internal/objects/NativeFunction.java
index 691e3c750c2..ac5f3c71454 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeFunction.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeFunction.java
@@ -60,7 +60,7 @@ public final class NativeFunction {
     @Function(attributes = Attribute.NOT_ENUMERABLE)
     public static Object toString(final Object self) {
         if (!(self instanceof ScriptFunction)) {
-            typeError(Global.instance(), "not.a.function", ScriptRuntime.safeToString(self));
+            typeError("not.a.function", ScriptRuntime.safeToString(self));
             return UNDEFINED;
         }
         return ((ScriptFunction)self).toSource();
@@ -71,7 +71,7 @@ public final class NativeFunction {
             if (thiz == UNDEFINED || thiz == null) {
                 return Global.instance();
             }
-            return JSType.toObject(Global.instance(), thiz);
+            return JSType.toScriptObject(thiz);
         }
 
         return thiz;
@@ -88,7 +88,7 @@ public final class NativeFunction {
     @Function(attributes = Attribute.NOT_ENUMERABLE)
     public static Object apply(final Object self, final Object thiz, final Object array) {
         if (!(self instanceof ScriptFunction)) {
-            typeError(Global.instance(), "not.a.function", ScriptRuntime.safeToString(self));
+            typeError("not.a.function", ScriptRuntime.safeToString(self));
             return UNDEFINED;
         }
 
@@ -102,12 +102,12 @@ public final class NativeFunction {
             final Object       len  = sobj.getLength();
 
             if (len == UNDEFINED || len == null) {
-                typeError(Global.instance(), "function.apply.expects.array");
+                typeError("function.apply.expects.array");
             }
 
             final int n = (int)JSType.toUint32(len);
             if (n != JSType.toNumber(len)) {
-                typeError(Global.instance(), "function.apply.expects.array");
+                typeError("function.apply.expects.array");
             }
 
             args = new Object[(int)JSType.toUint32(len)];
@@ -122,7 +122,7 @@ public final class NativeFunction {
         } else if (array == null || array == UNDEFINED) {
             args = ScriptRuntime.EMPTY_ARRAY;
         } else {
-            typeError(Global.instance(), "function.apply.expects.array");
+            typeError("function.apply.expects.array");
         }
 
         final ScriptFunction func = (ScriptFunction)self;
@@ -143,7 +143,7 @@ public final class NativeFunction {
     @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
     public static Object call(final Object self, final Object... args) {
         if (!(self instanceof ScriptFunction)) {
-            typeError(Global.instance(), "not.a.function", ScriptRuntime.safeToString(self));
+            typeError("not.a.function", ScriptRuntime.safeToString(self));
             return UNDEFINED;
         }
 
@@ -178,7 +178,7 @@ public final class NativeFunction {
     @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
     public static Object bind(final Object self, final Object... args) {
         if (!(self instanceof ScriptFunction)) {
-            typeError(Global.instance(), "not.a.function", ScriptRuntime.safeToString(self));
+            typeError("not.a.function", ScriptRuntime.safeToString(self));
             return UNDEFINED;
         }
 
@@ -209,7 +209,7 @@ public final class NativeFunction {
     @Function(attributes = Attribute.NOT_ENUMERABLE)
     public static Object toSource(final Object self) {
         if (!(self instanceof ScriptFunction)) {
-            typeError(Global.instance(), "not.a.function", ScriptRuntime.safeToString(self));
+            typeError("not.a.function", ScriptRuntime.safeToString(self));
             return UNDEFINED;
         }
         return ((ScriptFunction)self).toSource();
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java b/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java
index 5f884541830..be0e6e37560 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java
@@ -540,7 +540,7 @@ public final class NativeJSAdapter extends ScriptObject {
         Object adaptee;
 
         if (args == null || args.length == 0) {
-            typeError(Global.instance(), "not.an.object", "null");
+            typeError("not.an.object", "null");
             return null; //won't reach, but fixed warning
         }
 
@@ -564,7 +564,7 @@ public final class NativeJSAdapter extends ScriptObject {
         }
 
         if (!(adaptee instanceof ScriptObject)) {
-            typeError(Global.instance(), "not.an.object", ScriptRuntime.safeToString(adaptee));
+            typeError("not.an.object", ScriptRuntime.safeToString(adaptee));
         }
 
         if (proto != null && !(proto instanceof ScriptObject)) {
@@ -623,7 +623,7 @@ public final class NativeJSAdapter extends ScriptObject {
                         func.makeBoundFunction(this, new Object[] { name })), 0, Object.class),
                         adaptee.getMap().getProtoGetSwitchPoint(__call__), testJSAdaptor(adaptee, null, null, null));
             }
-            typeError(Global.instance(), "no.such.function", desc.getNameToken(2), ScriptRuntime.safeToString(this));
+            typeError("no.such.function", desc.getNameToken(2), ScriptRuntime.safeToString(this));
             break;
         default:
             break;
@@ -696,7 +696,7 @@ public final class NativeJSAdapter extends ScriptObject {
 
         switch (hook) {
         case __call__:
-            typeError(Global.instance(), "no.such.function", desc.getNameToken(2), ScriptRuntime.safeToString(this));
+            typeError("no.such.function", desc.getNameToken(2), ScriptRuntime.safeToString(this));
             throw new AssertionError("should not reach here");
         default:
             final MethodHandle methodHandle = hook.equals(__put__) ?
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeJSON.java b/nashorn/src/jdk/nashorn/internal/objects/NativeJSON.java
index 861ef348e21..275fca032fe 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeJSON.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeJSON.java
@@ -101,7 +101,7 @@ public final class NativeJSON extends ScriptObject {
         try {
             node = parser.parse();
         } catch (final ParserException e) {
-            syntaxError(Global.instance(), e, "invalid.json", e.getMessage());
+            syntaxError(e, "invalid.json", e.getMessage());
             return UNDEFINED;
         }
 
@@ -404,7 +404,7 @@ public final class NativeJSON extends ScriptObject {
     // Spec: The abstract operation JO(value) serializes an object.
     private static String JO(final ScriptObject value, final StringifyState state) {
         if (state.stack.containsKey(value)) {
-            typeError(Global.instance(), "JSON.stringify.cyclic");
+            typeError("JSON.stringify.cyclic");
         }
 
         state.stack.put(value, value);
@@ -480,7 +480,7 @@ public final class NativeJSON extends ScriptObject {
     // Spec: The abstract operation JA(value) serializes an array.
     private static Object JA(final NativeArray value, final StringifyState state) {
         if (state.stack.containsKey(value)) {
-            typeError(Global.instance(), "JSON.stringify.cyclic");
+            typeError("JSON.stringify.cyclic");
         }
 
         state.stack.put(value, value);
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java b/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java
index f2c3c24f48a..8f9ffd4ae06 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java
@@ -287,7 +287,7 @@ public class NativeJava {
             return new NativeArray(copyArray((boolean[])objArray));
         }
 
-        typeError(Global.instance(), "cant.convert.to.javascript.array", objArray.getClass().getName());
+        typeError("cant.convert.to.javascript.array", objArray.getClass().getName());
 
         throw new AssertionError();
     }
@@ -384,7 +384,7 @@ public class NativeJava {
     @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
     public static Object extend(final Object self, final Object... types) {
         if(types == null || types.length == 0) {
-            typeError(Global.instance(), "extend.expects.at.least.one.argument");
+            typeError("extend.expects.at.least.one.argument");
         }
         final Class<?>[] stypes = new Class<?>[types.length];
         try {
@@ -392,7 +392,7 @@ public class NativeJava {
                 stypes[i] = ((StaticClass)types[i]).getRepresentedClass();
             }
         } catch(final ClassCastException e) {
-            typeError(Global.instance(), "extend.expects.java.types");
+            typeError("extend.expects.java.types");
         }
         return JavaAdapterFactory.getAdapterClassFor(stypes);
     }
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java b/nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java
index b10bd5d4632..cff3fd702f6 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java
@@ -185,7 +185,7 @@ public final class NativeNumber extends ScriptObject {
     public static Object toFixed(final Object self, final Object fractionDigits) {
         final int f = JSType.toInteger(fractionDigits);
         if (f < 0 || f > 20) {
-            rangeError(Global.instance(), "invalid.fraction.digits", "toFixed");
+            rangeError("invalid.fraction.digits", "toFixed");
             return UNDEFINED;
         }
 
@@ -227,7 +227,7 @@ public final class NativeNumber extends ScriptObject {
         }
 
         if (fractionDigits != UNDEFINED && (f < 0 || f > 20)) {
-            rangeError(Global.instance(), "invalid.fraction.digits", "toExponential");
+            rangeError("invalid.fraction.digits", "toExponential");
             return UNDEFINED;
         }
 
@@ -258,7 +258,7 @@ public final class NativeNumber extends ScriptObject {
         }
 
         if (p < 1 || p > 21) {
-            rangeError(Global.instance(), "invalid.precision");
+            rangeError("invalid.precision");
             return UNDEFINED;
         }
 
@@ -283,7 +283,7 @@ public final class NativeNumber extends ScriptObject {
             final int intRadix = JSType.toInteger(radix);
             if (intRadix != 10) {
                 if (intRadix < 2 || intRadix > 36) {
-                    rangeError(Global.instance(), "invalid.radix");
+                    rangeError("invalid.radix");
                 }
                 return JSType.toString(getNumberValue(self), intRadix);
             }
@@ -338,7 +338,7 @@ public final class NativeNumber extends ScriptObject {
         } else if (self != null && self == Global.instance().getNumberPrototype()) {
             return 0.0;
         } else {
-            typeError(Global.instance(), "not.a.number", ScriptRuntime.safeToString(self));
+            typeError("not.a.number", ScriptRuntime.safeToString(self));
             return Double.NaN;
         }
     }
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeObject.java b/nashorn/src/jdk/nashorn/internal/objects/NativeObject.java
index ea7a2237925..effc0f067bc 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeObject.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeObject.java
@@ -316,7 +316,7 @@ public final class NativeObject {
      */
     @Function(attributes = Attribute.NOT_ENUMERABLE)
     public static Object toLocaleString(final Object self) {
-        final Object obj = JSType.toObject(Global.instance(), self);
+        final Object obj = JSType.toScriptObject(self);
         if (obj instanceof ScriptObject) {
             final ScriptObject sobj = (ScriptObject)self;
             try {
@@ -331,7 +331,7 @@ public final class NativeObject {
                 throw new RuntimeException(t);
             }
 
-            typeError(Global.instance(), "not.a.function", "toString");
+            typeError("not.a.function", "toString");
             throw new AssertionError(); // never reached
         }
 
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java b/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java
index bacdc83313e..487feafaccd 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java
@@ -86,7 +86,7 @@ public final class NativeRegExp extends ScriptObject {
             regExp = new RegExp(input, flagString);
         } catch (final ParserException e) {
             // translate it as SyntaxError object and throw it
-            e.throwAsEcmaException(Global.instance());
+            e.throwAsEcmaException();
             throw new AssertionError(); //guard against null warnings below
         }
 
@@ -221,7 +221,7 @@ public final class NativeRegExp extends ScriptObject {
                 if (!flagsDefined) {
                     return (NativeRegExp)regexp; // 15.10.3.1 - undefined flags and regexp as
                 }
-                typeError(Global.instance(), "regex.cant.supply.flags");
+                typeError("regex.cant.supply.flags");
             }
             patternString = JSType.toString(regexp);
         }
@@ -716,7 +716,7 @@ public final class NativeRegExp extends ScriptObject {
         } else if (self != null && self == Global.instance().getRegExpPrototype()) {
             return Global.instance().DEFAULT_REGEXP;
         } else {
-            typeError(Global.instance(), "not.a.regexp", ScriptRuntime.safeToString(self));
+            typeError("not.a.regexp", ScriptRuntime.safeToString(self));
             return null;
         }
     }
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeString.java b/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
index 1d9db51d543..01dceef7124 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
@@ -288,7 +288,7 @@ public final class NativeString extends ScriptObject {
     private boolean checkDeleteIndex(final int index, final boolean strict) {
         if (isValid(index)) {
             if (strict) {
-                typeError(Global.instance(), "cant.delete.property", Integer.toString(index), ScriptRuntime.safeToString(this));
+                typeError("cant.delete.property", Integer.toString(index), ScriptRuntime.safeToString(this));
             }
             return true;
         }
@@ -904,7 +904,7 @@ public final class NativeString extends ScriptObject {
         } else if (self != null && self == Global.instance().getStringPrototype()) {
             return "";
         } else {
-            typeError(Global.instance(), "not.a.string", ScriptRuntime.safeToString(self));
+            typeError("not.a.string", ScriptRuntime.safeToString(self));
             return null;
         }
     }
@@ -919,7 +919,7 @@ public final class NativeString extends ScriptObject {
         } else if (self != null && self == Global.instance().getStringPrototype()) {
             return "";
         } else {
-            typeError(Global.instance(), "not.a.string", ScriptRuntime.safeToString(self));
+            typeError( "not.a.string", ScriptRuntime.safeToString(self));
             return null;
         }
     }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Context.java b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
index 50ab31706f7..34fc8ad82df 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/Context.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
@@ -50,10 +50,12 @@ import jdk.nashorn.internal.codegen.ClassEmitter;
 import jdk.nashorn.internal.codegen.Compiler;
 import jdk.nashorn.internal.codegen.Namespace;
 import jdk.nashorn.internal.codegen.objects.ObjectClassGenerator;
+import jdk.nashorn.internal.runtime.linker.JavaAdapterFactory;
 import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
 import jdk.nashorn.internal.runtime.options.KeyValueOption;
 import jdk.nashorn.internal.runtime.options.Option;
 import jdk.nashorn.internal.runtime.options.Options;
+import sun.reflect.Reflection;
 
 /**
  * This class manages the global state of execution. Context is immutable.
@@ -72,11 +74,27 @@ public final class Context {
         };
 
     /**
-     * Return the current global scope
-     * @return current global scope
+     * Get the current global scope
+     * @return the current global scope
      */
     public static ScriptObject getGlobal() {
-        return currentGlobal.get();
+        final SecurityManager sm = System.getSecurityManager();
+        if (sm != null) {
+            // skip getCallerClass and getGlobal and get to the real caller
+            Class<?> caller = Reflection.getCallerClass(2);
+            ClassLoader callerLoader = caller.getClassLoader();
+
+            // Allow this method only for nashorn's own classes, script
+            // generated classes and Java adapter classes. Rest should
+            // have the necessary security permission.
+            if (callerLoader != myLoader &&
+                !(callerLoader instanceof NashornLoader) &&
+                !(JavaAdapterFactory.isAdapterClass(caller))) {
+                sm.checkPermission(new RuntimePermission("getNashornGlobal"));
+            }
+        }
+
+        return getGlobalTrusted();
     }
 
     /**
@@ -93,7 +111,7 @@ public final class Context {
             throw new IllegalArgumentException("global does not implement GlobalObject!");
         }
 
-        currentGlobal.set(global);
+        setGlobalTrusted(global);
     }
 
     /**
@@ -114,7 +132,7 @@ public final class Context {
      * @return error writer of the current context
      */
     public static PrintWriter getCurrentErr() {
-        final ScriptObject global = getGlobal();
+        final ScriptObject global = getGlobalTrusted();
         return (global != null)? global.getContext().getErr() : new PrintWriter(System.err);
     }
 
@@ -456,6 +474,14 @@ public final class Context {
         return _timezone;
     }
 
+    /*
+     * Get the PropertyMap of the current global scope
+     * @return the property map of the current global scope
+     */
+    public PropertyMap getGlobalMap() {
+        return Context.getGlobalTrusted().getMap();
+    }
+
     /**
      * Compile a top level script.
      *
@@ -501,7 +527,7 @@ public final class Context {
         final String  file       = (location == UNDEFINED || location == null) ? "<eval>" : location.toString();
         final Source  source     = new Source(file, string);
         final boolean directEval = location != UNDEFINED; // is this direct 'eval' call or indirectly invoked eval?
-        final ScriptObject global = Context.getGlobal();
+        final ScriptObject global = Context.getGlobalTrusted();
 
         ScriptObject scope = initialScope;
 
@@ -624,7 +650,7 @@ public final class Context {
             }
         }
 
-        typeError(Context.getGlobal(), "cant.load.script", ScriptRuntime.safeToString(source));
+        typeError("cant.load.script", ScriptRuntime.safeToString(source));
 
         return UNDEFINED;
     }
@@ -726,13 +752,13 @@ public final class Context {
         final ScriptObject global = newGlobal();
         // Need only minimal global object, if we are just compiling.
         if (!_compile_only) {
-            final ScriptObject oldGlobal = Context.getGlobal();
+            final ScriptObject oldGlobal = Context.getGlobalTrusted();
             try {
-                Context.setGlobal(global);
+                Context.setGlobalTrusted(global);
                 // initialize global scope with builtin global objects
                 ((GlobalObject)global).initBuiltinObjects();
             } finally {
-                Context.setGlobal(oldGlobal);
+                Context.setGlobalTrusted(oldGlobal);
             }
         }
 
@@ -740,10 +766,30 @@ public final class Context {
     }
 
     /**
-     * Trusted variant package-private
+     * Trusted variants - package-private
+     */
+
+    /**
+     * Return the current global scope
+     * @return current global scope
+     */
+    static ScriptObject getGlobalTrusted() {
+        return currentGlobal.get();
+    }
+
+    /**
+     * Set the current global scope
+     */
+    static void setGlobalTrusted(ScriptObject global) {
+         currentGlobal.set(global);
+    }
+
+    /**
+     * Return the current global's context
+     * @return current global's context
      */
     static Context getContextTrusted() {
-        return Context.getGlobal().getContext();
+        return Context.getGlobalTrusted().getContext();
     }
 
     /**
@@ -770,7 +816,7 @@ public final class Context {
         try {
             script = compileScript(name, url, scope, new Context.ThrowErrorManager(), _strict);
         } catch (final ParserException e) {
-            e.throwAsEcmaException(Context.getGlobal());
+            e.throwAsEcmaException();
         }
 
         return ScriptRuntime.apply(script, thiz);
@@ -782,7 +828,7 @@ public final class Context {
         try {
             script = compileScript(source, scope, new Context.ThrowErrorManager(), _strict);
         } catch (final ParserException e) {
-            e.throwAsEcmaException(Context.getGlobal());
+            e.throwAsEcmaException();
         }
 
         return ScriptRuntime.apply(script, thiz);
@@ -813,7 +859,7 @@ public final class Context {
         }
 
         // Package as a JavaScript function and pass function back to shell.
-        return ((GlobalObject)Context.getGlobal()).newScriptFunction(RUN_SCRIPT.tag(), runMethodHandle, scope, strict);
+        return ((GlobalObject)Context.getGlobalTrusted()).newScriptFunction(RUN_SCRIPT.tag(), runMethodHandle, scope, strict);
     }
 
     private ScriptFunction compileScript(final String name, final URL url, final ScriptObject scope, final ErrorManager errMan, final boolean strict) throws IOException {
@@ -836,7 +882,7 @@ public final class Context {
         Class<?> script;
 
         if (_class_cache_size > 0) {
-            global = (GlobalObject)Context.getGlobal();
+            global = (GlobalObject)Context.getGlobalTrusted();
             script = global.findCachedClass(source);
             if (script != null) {
                 return script;
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ECMAErrors.java b/nashorn/src/jdk/nashorn/internal/runtime/ECMAErrors.java
index c0ab05479c7..9e5db1913f5 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ECMAErrors.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ECMAErrors.java
@@ -56,6 +56,16 @@ public final class ECMAErrors {
         throw new ECMAException(thrown, cause);
     }
 
+     /**
+     * Error dispatch mechanism.
+     * Throw a {@link ParserException} as the correct JavaScript error
+     *
+     * @param e {@code ParserException} for error dispatcher
+     */
+    public static void throwAsEcmaException(final ParserException e) {
+        throwAsEcmaException(Context.getGlobalTrusted(), e);
+    }
+
     /**
      * Error dispatch mechanism.
      * Throw a {@link ParserException} as the correct JavaScript error
@@ -103,6 +113,15 @@ public final class ECMAErrors {
         // should not happen - perhaps unknown error type?
         throw e;
     }
+    /**
+     * Throw a syntax error (ECMA 15.11.6.4)
+     *
+     * @param msgId   resource tag for error message
+     * @param args    arguments to resource
+     */
+    public static void syntaxError(final String msgId, final String... args) {
+        syntaxError(Context.getGlobalTrusted(), msgId, args);
+    }
 
     /**
      * Throw a syntax error (ECMA 15.11.6.4)
@@ -115,6 +134,17 @@ public final class ECMAErrors {
         syntaxError(global, null, msgId, args);
     }
 
+    /**
+     * Throw a syntax error (ECMA 15.11.6.4)
+     *
+     * @param cause   native Java {@code Throwable} that is the cause of error
+     * @param msgId   resource tag for error message
+     * @param args    arguments to resource
+     */
+    public static void syntaxError(final Throwable cause, final String msgId, final String... args) {
+        syntaxError(Context.getGlobalTrusted(), cause, msgId, args);
+    }
+
     /**
      * Throw a syntax error (ECMA 15.11.6.4)
      *
@@ -128,6 +158,16 @@ public final class ECMAErrors {
         throwError(((GlobalObject)global).newSyntaxError(msg), cause);
     }
 
+    /**
+     * Throw a type error (ECMA 15.11.6.5)
+     *
+     * @param msgId   resource tag for error message
+     * @param args    arguments to resource
+     */
+    public static void typeError(final String msgId, final String... args) {
+        typeError(Context.getGlobalTrusted(), msgId, args);
+    }
+
     /**
      * Throw a type error (ECMA 15.11.6.5)
      *
@@ -139,6 +179,17 @@ public final class ECMAErrors {
         typeError(global, null, msgId, args);
     }
 
+    /**
+     * Throw a type error (ECMA 15.11.6.5)
+     *
+     * @param cause   native Java {@code Throwable} that is the cause of error
+     * @param msgId   resource tag for error message
+     * @param args    arguments to resource
+     */
+    public static void typeError(final Throwable cause, final String msgId, final String... args) {
+        typeError(Context.getGlobalTrusted(), cause, msgId, args);
+    }
+
     /**
      * Throw a type error (ECMA 15.11.6.5)
      *
@@ -152,6 +203,16 @@ public final class ECMAErrors {
         throwError(((GlobalObject)global).newTypeError(msg), cause);
     }
 
+    /**
+     * Throw a range error (ECMA 15.11.6.2)
+     *
+     * @param msgId   resource tag for error message
+     * @param args    arguments to resource
+     */
+    public static void rangeError(final String msgId, final String... args) {
+        rangeError(Context.getGlobalTrusted(), msgId, args);
+    }
+
     /**
      * Throw a range error (ECMA 15.11.6.2)
      *
@@ -163,6 +224,17 @@ public final class ECMAErrors {
         rangeError(global, null, msgId, args);
     }
 
+    /**
+     * Throw a range error (ECMA 15.11.6.2)
+     *
+     * @param cause   native Java {@code Throwable} that is the cause of error
+     * @param msgId   resource tag for error message
+     * @param args    arguments to resource
+     */
+    public static void rangeError(final Throwable cause, final String msgId, final String... args) {
+        rangeError(Context.getGlobalTrusted(), cause, msgId, args);
+    }
+
     /**
      * Throw a range error (ECMA 15.11.6.2)
      *
@@ -176,6 +248,16 @@ public final class ECMAErrors {
         throwError(((GlobalObject)global).newRangeError(msg), cause);
     }
 
+    /**
+     * Throw a reference error (ECMA 15.11.6.3)
+     *
+     * @param msgId   resource tag for error message
+     * @param args    arguments to resource
+     */
+    public static void referenceError(final String msgId, final String... args) {
+        referenceError(Context.getGlobalTrusted(), msgId, args);
+    }
+
     /**
      * Throw a reference error (ECMA 15.11.6.3)
      *
@@ -187,6 +269,17 @@ public final class ECMAErrors {
         referenceError(global, null, msgId, args);
     }
 
+    /**
+     * Throw a reference error (ECMA 15.11.6.3)
+     *
+     * @param cause   native Java {@code Throwable} that is the cause of error
+     * @param msgId   resource tag for error message
+     * @param args    arguments to resource
+     */
+    public static void referenceError(final Throwable cause, final String msgId, final String... args) {
+        referenceError(Context.getGlobalTrusted(), cause, msgId, args);
+    }
+
     /**
      * Throw a reference error (ECMA 15.11.6.3)
      *
@@ -200,6 +293,16 @@ public final class ECMAErrors {
         throwError(((GlobalObject)global).newReferenceError(msg), cause);
     }
 
+    /**
+     * Throw a URI error (ECMA 15.11.6.6)
+     *
+     * @param msgId   resource tag for error message
+     * @param args    arguments to resource
+     */
+    public static void uriError(final String msgId, final String... args) {
+        uriError(Context.getGlobalTrusted(), msgId, args);
+    }
+
     /**
      * Throw a URI error (ECMA 15.11.6.6)
      *
@@ -211,6 +314,17 @@ public final class ECMAErrors {
         uriError(global, null, msgId, args);
     }
 
+    /**
+     * Throw a URI error (ECMA 15.11.6.6)
+     *
+     * @param cause   native Java {@code Throwable} that is the cause of error
+     * @param msgId   resource tag for error message
+     * @param args    arguments to resource
+     */
+    public static void uriError(final Throwable cause, final String msgId, final String... args) {
+        uriError(Context.getGlobalTrusted(), cause, msgId, args);
+    }
+
     /**
      * Throw a URI error (ECMA 15.11.6.6)
      *
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ErrorManager.java b/nashorn/src/jdk/nashorn/internal/runtime/ErrorManager.java
index f0d1c013ca0..7fa637577dc 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ErrorManager.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ErrorManager.java
@@ -79,7 +79,7 @@ public class ErrorManager {
         }
 
         if (limit != 0 && count > limit) {
-            rangeError(Context.getGlobal(), "too.many.errors", Integer.toString(limit));
+            rangeError("too.many.errors", Integer.toString(limit));
         }
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/JSType.java b/nashorn/src/jdk/nashorn/internal/runtime/JSType.java
index c5537cf52cb..32d940fa7f2 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/JSType.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/JSType.java
@@ -248,7 +248,7 @@ public enum JSType {
         final Object       result = sobj.getDefaultValue(hint);
 
         if (!isPrimitive(result)) {
-            typeError(Context.getGlobal(), "bad.default.value", result.toString());
+            typeError("bad.default.value", result.toString());
         }
 
         return result;
@@ -798,6 +798,19 @@ public enum JSType {
         return obj;
     }
 
+    /**
+     * Object conversion. This is used to convert objects and numbers to their corresponding
+     * NativeObject type
+     * See ECMA 9.9 ToObject
+     *
+     * @param obj     the object to convert
+     *
+     * @return the wrapped object
+     */
+    public static Object toScriptObject(final Object obj) {
+        return toScriptObject(Context.getGlobalTrusted(), obj);
+    }
+
     /**
      * Object conversion. This is used to convert objects and numbers to their corresponding
      * NativeObject type
@@ -808,7 +821,7 @@ public enum JSType {
      *
      * @return the wrapped object
      */
-    public static Object toObject(final ScriptObject global, final Object obj) {
+    public static Object toScriptObject(final ScriptObject global, final Object obj) {
         if (nullOrUndefined(obj)) {
             typeError(global, "not.an.object", ScriptRuntime.safeToString(obj));
         }
@@ -851,7 +864,7 @@ public enum JSType {
         if (obj instanceof ScriptObject) {
             if (safe) {
                 final ScriptObject sobj = (ScriptObject)obj;
-                final GlobalObject gobj = (GlobalObject)Context.getGlobal();
+                final GlobalObject gobj = (GlobalObject)Context.getGlobalTrusted();
                 return gobj.isError(sobj) ?
                     ECMAException.safeToString(sobj) :
                     sobj.safeToString();
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ParserException.java b/nashorn/src/jdk/nashorn/internal/runtime/ParserException.java
index a5f6530f39c..9a7d16f842b 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ParserException.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ParserException.java
@@ -127,6 +127,13 @@ public final class ParserException extends NashornException {
         this.errorType = errorType;
     }
 
+    /**
+     * Throw this {@code ParserException} as one of the 7 native JavaScript errors
+     */
+    public void throwAsEcmaException() {
+        ECMAErrors.throwAsEcmaException(this);
+    }
+
     /**
      * Throw this {@code ParserException} as one of the 7 native JavaScript errors
      * @param global global scope object
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
index 6ad68c3cda9..be30be3a077 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
@@ -289,7 +289,7 @@ public abstract class ScriptFunction extends ScriptObject {
     @Override
     public boolean isInstance(final ScriptObject instance) {
         if (!(prototype instanceof ScriptObject)) {
-            typeError(Context.getGlobal(), "prototype.not.an.object", ScriptRuntime.safeToString(this), ScriptRuntime.safeToString(prototype));
+            typeError("prototype.not.an.object", ScriptRuntime.safeToString(this), ScriptRuntime.safeToString(prototype));
         }
 
         for (ScriptObject proto = instance.getProto(); proto != null; proto = proto.getProto()) {
@@ -401,7 +401,7 @@ public abstract class ScriptFunction extends ScriptObject {
      */
     public Object construct(final Object self, final Object... args) throws Throwable {
         if (constructHandle == null) {
-            typeError(Context.getGlobal(), "not.a.constructor", ScriptRuntime.safeToString(this));
+            typeError("not.a.constructor", ScriptRuntime.safeToString(this));
         }
 
         if (isVarArg(constructHandle)) {
@@ -480,7 +480,7 @@ public abstract class ScriptFunction extends ScriptObject {
         }
 
         if (getConstructHandle() == null) {
-            typeError(Context.getGlobal(), "not.a.constructor", ScriptRuntime.safeToString(this));
+            typeError("not.a.constructor", ScriptRuntime.safeToString(this));
         }
 
         ScriptObject object = null;
@@ -863,7 +863,7 @@ public abstract class ScriptFunction extends ScriptObject {
         MethodHandle constructor = getConstructHandle(type);
 
         if (constructor == null) {
-            typeError(Context.getGlobal(), "not.a.constructor", ScriptRuntime.safeToString(this));
+            typeError("not.a.constructor", ScriptRuntime.safeToString(this));
             return null;
         }
 
@@ -925,7 +925,7 @@ public abstract class ScriptFunction extends ScriptObject {
 
             if(NashornCallSiteDescriptor.isScope(desc)) {
                 // (this, callee, args...) => (callee, args...) => (callee, [this], args...)
-                boundHandle = MH.bindTo(callHandle, isNonStrictFunction() ? Context.getGlobal(): ScriptRuntime.UNDEFINED);
+                boundHandle = MH.bindTo(callHandle, isNonStrictFunction() ? Context.getGlobalTrusted() : ScriptRuntime.UNDEFINED);
                 boundHandle = MH.dropArguments(boundHandle, 1, Object.class);
             } else {
                 // (this, callee, args...) permute => (callee, this, args...) which is what we get in
@@ -943,7 +943,7 @@ public abstract class ScriptFunction extends ScriptObject {
             final MethodHandle callHandle = getBestSpecializedInvokeHandle(type.dropParameterTypes(0, 1));
 
             if(NashornCallSiteDescriptor.isScope(desc)) {
-                boundHandle = MH.bindTo(callHandle, isNonStrictFunction()? Context.getGlobal() : ScriptRuntime.UNDEFINED);
+                boundHandle = MH.bindTo(callHandle, isNonStrictFunction()? Context.getGlobalTrusted() : ScriptRuntime.UNDEFINED);
                 boundHandle = MH.dropArguments(boundHandle, 0, Object.class, Object.class);
             } else {
                 boundHandle = MH.dropArguments(callHandle, 0, Object.class);
@@ -952,7 +952,7 @@ public abstract class ScriptFunction extends ScriptObject {
 
         boundHandle = pairArguments(boundHandle, type);
         return new NashornGuardedInvocation(boundHandle, null, NashornGuards.getFunctionGuard(this), isNonStrictFunction());
-    }
+   }
 
     /**
      * Used for noSuchMethod/noSuchProperty and JSAdapter hooks.
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
index 174acfc2259..8a5736b3109 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
@@ -274,7 +274,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
       * @return property descriptor
       */
     public final PropertyDescriptor toPropertyDescriptor() {
-        final GlobalObject global = (GlobalObject) Context.getGlobal();
+        final GlobalObject global = (GlobalObject) Context.getGlobalTrusted();
 
         final PropertyDescriptor desc;
         if (isDataDescriptor()) {
@@ -324,7 +324,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
     public Object getOwnPropertyDescriptor(final String key) {
         final Property property = getMap().findProperty(key);
 
-        final GlobalObject global = (GlobalObject)Context.getGlobal();
+        final GlobalObject global = (GlobalObject)Context.getGlobalTrusted();
 
         if (property != null) {
             final ScriptFunction get   = property.getGetterFunction(this);
@@ -389,7 +389,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
      * @return true if property was successfully defined
      */
     public boolean defineOwnProperty(final String key, final Object propertyDesc, final boolean reject) {
-        final ScriptObject       global  = Context.getGlobal();
+        final ScriptObject       global  = Context.getGlobalTrusted();
         final PropertyDescriptor desc    = toPropertyDescriptor(global, propertyDesc);
         final Object             current = getOwnPropertyDescriptor(key);
         final String             name    = JSType.toString(key);
@@ -594,7 +594,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
         final int propFlags = Property.toFlags(pdesc);
 
         if (pdesc.type() == PropertyDescriptor.GENERIC) {
-            final GlobalObject global = (GlobalObject) Context.getGlobal();
+            final GlobalObject global = (GlobalObject) Context.getGlobalTrusted();
             final PropertyDescriptor dDesc = global.newDataDescriptor(UNDEFINED, false, false, false);
 
             dDesc.fillFrom((ScriptObject)pdesc);
@@ -1142,8 +1142,8 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
         if (newProto == null || newProto instanceof ScriptObject) {
             setProto((ScriptObject)newProto);
         } else {
-            final ScriptObject global = Context.getGlobal();
-            final Object  newProtoObject = JSType.toObject(global, newProto);
+            final ScriptObject global = Context.getGlobalTrusted();
+            final Object  newProtoObject = JSType.toScriptObject(global, newProto);
 
             if (newProtoObject instanceof ScriptObject) {
                 setProto((ScriptObject)newProtoObject);
@@ -1246,7 +1246,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
         // "valueOf" methods, and in order to avoid those call sites from becoming megamorphic when multiple contexts
         // are being executed in a long-running program, we move the code and their associated dynamic call sites
         // (Global.TO_STRING and Global.VALUE_OF) into per-context code.
-        return ((GlobalObject)Context.getGlobal()).getDefaultValue(this, typeHint);
+        return ((GlobalObject)Context.getGlobalTrusted()).getDefaultValue(this, typeHint);
     }
 
     /**
@@ -1575,7 +1575,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
     }
 
     private GuardedInvocation notAFunction() {
-        typeError(Context.getGlobal(), "not.a.function", ScriptRuntime.safeToString(this));
+        typeError("not.a.function", ScriptRuntime.safeToString(this));
         return null;
     }
 
@@ -1754,7 +1754,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
     private GuardedInvocation createEmptySetMethod(final CallSiteDescriptor desc, String strictErrorMessage, boolean canBeFastScope) {
         final String name = desc.getNameToken(CallSiteDescriptor.NAME_OPERAND);
         if (NashornCallSiteDescriptor.isStrict(desc)) {
-               typeError(Context.getGlobal(), strictErrorMessage, name, ScriptRuntime.safeToString((this)));
+               typeError(strictErrorMessage, name, ScriptRuntime.safeToString((this)));
            }
            assert canBeFastScope || !NashornCallSiteDescriptor.isFastScope(desc);
            final PropertyMap myMap = getMap();
@@ -1781,7 +1781,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
     private boolean trySetEmbedOrSpill(final CallSiteDescriptor desc, final PropertyMap oldMap, final PropertyMap newMap, final Object value) {
         final boolean isStrict = NashornCallSiteDescriptor.isStrict(desc);
         if (!isExtensible() && isStrict) {
-            typeError(Context.getGlobal(), "object.non.extensible", desc.getNameToken(2), ScriptRuntime.safeToString(this));
+            typeError("object.non.extensible", desc.getNameToken(2), ScriptRuntime.safeToString(this));
             throw new AssertionError(); // never reached
         } else if (compareAndSetMap(oldMap, newMap)) {
             return true;
@@ -1798,7 +1798,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
 
         if (!obj.isExtensible()) {
             if (isStrict) {
-                typeError(Context.getGlobal(), "object.non.extensible", desc.getNameToken(2), ScriptRuntime.safeToString(obj));
+                typeError("object.non.extensible", desc.getNameToken(2), ScriptRuntime.safeToString(obj));
             }
         } else if (obj.compareAndSetMap(oldMap, newMap)) {
             obj.spill = new Object[SPILL_RATE];
@@ -1815,7 +1815,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
 
         if (!obj.isExtensible()) {
             if (isStrict) {
-                typeError(Context.getGlobal(), "object.non.extensible", desc.getNameToken(2), ScriptRuntime.safeToString(obj));
+                typeError("object.non.extensible", desc.getNameToken(2), ScriptRuntime.safeToString(obj));
             }
         } else if (obj.compareAndSetMap(oldMap, newMap)) {
             final int oldLength = obj.spill.length;
@@ -1870,7 +1870,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
 
         if (find == null) {
             if (scopeCall) {
-                ECMAErrors.referenceError(Context.getGlobal(), "not.defined", name);
+                ECMAErrors.referenceError("not.defined", name);
                 throw new AssertionError(); // never reached
             }
             return createEmptyGetter(desc, name);
@@ -1909,7 +1909,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
         }
 
         if (scopeAccess) {
-            referenceError(Context.getGlobal(), "not.defined", name);
+            referenceError("not.defined", name);
         }
 
         return createEmptyGetter(desc, name);
@@ -2510,7 +2510,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
         if (longIndex >= oldLength) {
             if (!isExtensible()) {
                 if (strict) {
-                    typeError(Context.getGlobal(), "object.non.extensible", JSType.toString(index), ScriptRuntime.safeToString(this));
+                    typeError("object.non.extensible", JSType.toString(index), ScriptRuntime.safeToString(this));
                 }
                 return;
             }
@@ -2559,7 +2559,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
         if (f != null) {
             if (!f.isWritable()) {
                 if (strict) {
-                    typeError(Context.getGlobal(), "property.not.writable", key, ScriptRuntime.safeToString(this));
+                    typeError("property.not.writable", key, ScriptRuntime.safeToString(this));
                 }
 
                 return;
@@ -2575,7 +2575,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
             }
         } else if (!isExtensible()) {
             if (strict) {
-                typeError(Context.getGlobal(), "object.non.extensible", key, ScriptRuntime.safeToString(this));
+                typeError("object.non.extensible", key, ScriptRuntime.safeToString(this));
             }
         } else {
             spill(key, value);
@@ -3062,7 +3062,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
 
         if (!find.isConfigurable()) {
             if (strict) {
-                typeError(Context.getGlobal(), "cant.delete.property", propName, ScriptRuntime.safeToString(this));
+                typeError("cant.delete.property", propName, ScriptRuntime.safeToString(this));
             }
             return false;
         }
@@ -3232,7 +3232,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
                 throw new RuntimeException(t);
             }
         }  else if (name != null) {
-            typeError(Context.getGlobal(), "property.has.no.setter", name, ScriptRuntime.safeToString(self));
+            typeError("property.has.no.setter", name, ScriptRuntime.safeToString(self));
         }
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java
index 3cecb419ad3..c501fad2ea7 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java
@@ -385,14 +385,14 @@ public final class ScriptRuntime {
      * @return {@link WithObject} that is the new scope
      */
     public static ScriptObject openWith(final ScriptObject scope, final Object expression) {
-        final ScriptObject global = Context.getGlobal();
+        final ScriptObject global = Context.getGlobalTrusted();
         if (expression == UNDEFINED) {
             typeError(global, "cant.apply.with.to.undefined");
         } else if (expression == null) {
             typeError(global, "cant.apply.with.to.null");
         }
 
-        final ScriptObject withObject = new WithObject(scope, JSType.toObject(global, expression));
+        final ScriptObject withObject = new WithObject(scope, JSType.toScriptObject(global, expression));
 
         return withObject;
     }
@@ -488,9 +488,9 @@ public final class ScriptRuntime {
             } else if (object instanceof Undefined) {
                 obj = ((Undefined)obj).get(property);
             } else if (object == null) {
-                typeError(Context.getGlobal(), "cant.get.property", safeToString(property), "null");
+                typeError("cant.get.property", safeToString(property), "null");
             } else if (JSType.isPrimitive(obj)) {
-                obj = ((ScriptObject)JSType.toObject(Context.getGlobal(), obj)).get(property);
+                obj = ((ScriptObject)JSType.toScriptObject(obj)).get(property);
             } else {
                 obj = UNDEFINED;
             }
@@ -526,7 +526,7 @@ public final class ScriptRuntime {
      * @return undefined
      */
     public static Object REFERENCE_ERROR(final Object lhs, final Object rhs, final Object msg) {
-        referenceError(Context.getGlobal(), "cant.be.used.as.lhs", Objects.toString(msg));
+        referenceError("cant.be.used.as.lhs", Objects.toString(msg));
         return UNDEFINED;
     }
 
@@ -549,11 +549,11 @@ public final class ScriptRuntime {
         }
 
         if (obj == null) {
-            typeError(Context.getGlobal(), "cant.delete.property", safeToString(property), "null");
+            typeError("cant.delete.property", safeToString(property), "null");
         }
 
         if (JSType.isPrimitive(obj)) {
-            return ((ScriptObject) JSType.toObject(Context.getGlobal(), obj)).delete(property, Boolean.TRUE.equals(strict));
+            return ((ScriptObject) JSType.toScriptObject(obj)).delete(property, Boolean.TRUE.equals(strict));
         }
 
         // if object is not reference type, vacuously delete is successful.
@@ -574,7 +574,7 @@ public final class ScriptRuntime {
      */
     public static boolean FAIL_DELETE(final Object obj, final Object property, final Object strict) {
         if (Boolean.TRUE.equals(strict)) {
-            syntaxError(Context.getGlobal(), "strict.cant.delete", safeToString(property));
+            syntaxError("strict.cant.delete", safeToString(property));
         }
         return false;
     }
@@ -751,7 +751,7 @@ public final class ScriptRuntime {
             return false;
         }
 
-        typeError(Context.getGlobal(), "in.with.non.object", rvalType.toString().toLowerCase());
+        typeError("in.with.non.object", rvalType.toString().toLowerCase());
 
         return false;
     }
@@ -776,7 +776,7 @@ public final class ScriptRuntime {
             return ((StaticClass)clazz).getRepresentedClass().isInstance(obj);
         }
 
-        typeError(Context.getGlobal(), "instanceof.on.non.object");
+        typeError("instanceof.on.non.object");
 
         return false;
     }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java
index 3099832e661..14b346bbf6c 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java
@@ -88,7 +88,7 @@ public class ScriptingFunctions {
         }
 
         if (f == null || !f.isFile()) {
-            typeError(Context.getGlobal(), "not.a.file", ScriptRuntime.safeToString(file));
+            typeError("not.a.file", ScriptRuntime.safeToString(file));
             return UNDEFINED;
         }
 
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/SetMethodCreator.java b/nashorn/src/jdk/nashorn/internal/runtime/SetMethodCreator.java
index 597a8a175e2..8001c327b77 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/SetMethodCreator.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/SetMethodCreator.java
@@ -144,7 +144,7 @@ class SetMethodCreator {
         // In strict mode, assignment can not create a new variable.
         // See also ECMA Annex C item 4. ReferenceError is thrown.
         if (NashornCallSiteDescriptor.isScope(desc) && NashornCallSiteDescriptor.isStrict(desc)) {
-            referenceError(Context.getGlobal(), "not.defined", getName());
+            referenceError("not.defined", getName());
         }
     }
 
@@ -171,7 +171,7 @@ class SetMethodCreator {
     }
 
     private SetMethod createGlobalPropertySetter() {
-        final ScriptObject global = Context.getGlobal();
+        final ScriptObject global = Context.getGlobalTrusted();
         return new SetMethod(ScriptObject.bindTo(global.addSpill(getName()), global), null, false);
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/URIUtils.java b/nashorn/src/jdk/nashorn/internal/runtime/URIUtils.java
index 55df05b49a5..7ecd1023fa5 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/URIUtils.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/URIUtils.java
@@ -71,7 +71,7 @@ public final class URIUtils {
             }
 
             if (C >= 0xDC00 && C <= 0xDFFF) {
-                return error(Context.getGlobal(), string, k);
+                return error(string, k);
             }
 
             int V;
@@ -80,12 +80,12 @@ public final class URIUtils {
             } else {
                 k++;
                 if (k == len) {
-                    return error(Context.getGlobal(), string, k);
+                    return error(string, k);
                 }
 
                 final char kChar = string.charAt(k);
                 if (kChar < 0xDC00 || kChar > 0xDFFF) {
-                    return error(Context.getGlobal(), string, k);
+                    return error(string, k);
                 }
                 V = ((C - 0xD800) * 0x400 + (kChar - 0xDC00) + 0x10000);
             }
@@ -93,7 +93,7 @@ public final class URIUtils {
             try {
                 sb.append(toHexEscape(V));
             } catch (final Exception e) {
-                uriError(Context.getGlobal(), e, "bad.uri", string, Integer.toString(k));
+                uriError( e, "bad.uri", string, Integer.toString(k));
                 return null;
             }
         }
@@ -118,12 +118,12 @@ public final class URIUtils {
             }
             final int start = k;
             if (k + 2 >= len) {
-                return error(Context.getGlobal(), string, k);
+                return error(string, k);
             }
 
             int B = toHexByte(string.charAt(k + 1), string.charAt(k + 2));
             if (B < 0) {
-                return error(Context.getGlobal(), string, k + 1);
+                return error(string, k + 1);
             }
 
             k += 2;
@@ -146,11 +146,11 @@ public final class URIUtils {
                 }
 
                 if (n == 1 || n > 4) {
-                    return error(Context.getGlobal(), string, k);
+                    return error(string, k);
                 }
 
                 if ((k + (3 * (n - 1))) >= len) {
-                    return error(Context.getGlobal(), string, k);
+                    return error(string, k);
                 }
 
                 final byte[] bbuf = new byte[n];
@@ -159,16 +159,16 @@ public final class URIUtils {
                 for (int j = 1; j < n; j++) {
                     k++;
                     if (string.charAt(k) != '%') {
-                        return error(Context.getGlobal(), string, k);
+                        return error(string, k);
                     }
 
                     if (k + 2 == len) {
-                        return error(Context.getGlobal(), string, k);
+                        return error(string, k);
                     }
 
                     B = toHexByte(string.charAt(k + 1), string.charAt(k + 2));
                     if (B < 0 || (B & 0xC0) != 0x80) {
-                        return error(Context.getGlobal(), string, k + 1);
+                        return error(string, k + 1);
                     }
 
                     k += 2;
@@ -179,7 +179,7 @@ public final class URIUtils {
                 try {
                     V = ucs4Char(bbuf);
                 } catch (final Exception e) {
-                    uriError(Context.getGlobal(), e, "bad.uri", string, Integer.toString(k));
+                    uriError(e, "bad.uri", string, Integer.toString(k));
                     return null;
                 }
                 if (V < 0x10000) {
@@ -193,7 +193,7 @@ public final class URIUtils {
                     }
                 } else { // V >= 0x10000
                     if (V > 0x10FFFF) {
-                        return error(Context.getGlobal(), string, k);
+                        return error(string, k);
                     }
                     final int L = ((V - 0x10000) & 0x3FF) + 0xDC00;
                     final int H = (((V - 0x10000) >> 10) & 0x3FF) + 0xD800;
@@ -268,8 +268,8 @@ public final class URIUtils {
         return sb.toString();
     }
 
-    private static String error(final ScriptObject global, final String string, final int index) {
-        uriError(global, "bad.uri", string, Integer.toString(index));
+    private static String error(final String string, final int index) {
+        uriError("bad.uri", string, Integer.toString(index));
         return null;
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Undefined.java b/nashorn/src/jdk/nashorn/internal/runtime/Undefined.java
index 1e7e635c4a8..41024e500ae 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/Undefined.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Undefined.java
@@ -129,7 +129,7 @@ public final class Undefined extends DefaultPropertyAccess {
     }
 
     private static void lookupTypeError(final String msg, final CallSiteDescriptor desc) {
-        typeError(Context.getGlobal(), msg, desc.getNameTokenCount() > 2 ? desc.getNameToken(2) : null);
+        typeError(msg, desc.getNameTokenCount() > 2 ? desc.getNameToken(2) : null);
     }
 
     /**
@@ -174,18 +174,18 @@ public final class Undefined extends DefaultPropertyAccess {
 
     @Override
     public Object get(final Object key) {
-        typeError(Context.getGlobal(), "cant.read.property.of.undefined", ScriptRuntime.safeToString(key));
+        typeError("cant.read.property.of.undefined", ScriptRuntime.safeToString(key));
         return ScriptRuntime.UNDEFINED;
     }
 
     @Override
     public void set(final Object key, final Object value, final boolean strict) {
-        typeError(Context.getGlobal(), "cant.set.property.of.undefined", ScriptRuntime.safeToString(key));
+        typeError("cant.set.property.of.undefined", ScriptRuntime.safeToString(key));
     }
 
     @Override
     public boolean delete(final Object key, final boolean strict) {
-        typeError(Context.getGlobal(), "cant.delete.property.of.undefined", ScriptRuntime.safeToString(key));
+        typeError("cant.delete.property.of.undefined", ScriptRuntime.safeToString(key));
         return false;
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayLikeIterator.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayLikeIterator.java
index 59ac860943f..905a78485a3 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayLikeIterator.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayLikeIterator.java
@@ -122,7 +122,7 @@ abstract public class ArrayLikeIterator<T> implements Iterator<T> {
             return new ArrayIterator((ScriptObject) obj, includeUndefined);
         }
 
-        obj = JSType.toObject(Context.getGlobal(), obj);
+        obj = JSType.toScriptObject(obj);
         if (obj instanceof ScriptObject) {
             return new MapIterator((ScriptObject)obj, includeUndefined);
         }
@@ -143,7 +143,7 @@ abstract public class ArrayLikeIterator<T> implements Iterator<T> {
             return new ReverseArrayIterator((ScriptObject) obj, includeUndefined);
         }
 
-        obj = JSType.toObject(Context.getGlobal(), obj);
+        obj = JSType.toScriptObject(obj);
         if (obj instanceof ScriptObject) {
             return new ReverseMapIterator((ScriptObject)obj, includeUndefined);
         }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/FrozenArrayFilter.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/FrozenArrayFilter.java
index f55a917693a..2a4dcc3bb31 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/FrozenArrayFilter.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/FrozenArrayFilter.java
@@ -47,7 +47,7 @@ final class FrozenArrayFilter extends SealedArrayFilter {
     @Override
     public ArrayData set(final int index, final int value, final boolean strict) {
         if (strict) {
-            typeError(Context.getGlobal(), "cant.set.property", Integer.toString(index), "frozen array");
+            typeError("cant.set.property", Integer.toString(index), "frozen array");
         }
         return this;
     }
@@ -55,7 +55,7 @@ final class FrozenArrayFilter extends SealedArrayFilter {
     @Override
     public ArrayData set(final int index, final long value, final boolean strict) {
         if (strict) {
-            typeError(Context.getGlobal(), "cant.set.property", Integer.toString(index), "frozen array");
+            typeError("cant.set.property", Integer.toString(index), "frozen array");
         }
         return this;
     }
@@ -63,7 +63,7 @@ final class FrozenArrayFilter extends SealedArrayFilter {
     @Override
     public ArrayData set(final int index, final double value, final boolean strict) {
         if (strict) {
-            typeError(Context.getGlobal(), "cant.set.property", Integer.toString(index), "frozen array");
+            typeError("cant.set.property", Integer.toString(index), "frozen array");
         }
         return this;
     }
@@ -71,7 +71,7 @@ final class FrozenArrayFilter extends SealedArrayFilter {
     @Override
     public ArrayData set(final int index, final Object value, final boolean strict) {
         if (strict) {
-            typeError(Context.getGlobal(), "cant.set.property", Integer.toString(index), "frozen array");
+            typeError("cant.set.property", Integer.toString(index), "frozen array");
         }
         return this;
     }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/IteratorAction.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/IteratorAction.java
index b640de4ee0c..205e20fd45c 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/IteratorAction.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/IteratorAction.java
@@ -97,7 +97,7 @@ public abstract class IteratorAction<T> {
      */
     public final T apply() {
         if (!(callbackfn instanceof ScriptFunction)) {
-            typeError(Context.getGlobal(), "not.a.function", ScriptRuntime.safeToString(callbackfn));
+            typeError("not.a.function", ScriptRuntime.safeToString(callbackfn));
             return result;
         }
         final ScriptFunction func = ((ScriptFunction)callbackfn);
@@ -136,4 +136,5 @@ public abstract class IteratorAction<T> {
      * @throws Throwable if invocation throws an exception/error
      */
     protected abstract boolean forEach(final Object val, final int i) throws Throwable;
+
 }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/SealedArrayFilter.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/SealedArrayFilter.java
index b6c79128f7e..553a21a9260 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/SealedArrayFilter.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/SealedArrayFilter.java
@@ -47,7 +47,7 @@ class SealedArrayFilter extends ArrayFilter {
     @Override
     public boolean canDelete(final int index, final boolean strict) {
         if (strict) {
-            typeError(Context.getGlobal(), "cant.delete.property", Integer.toString(index), "sealed array");
+            typeError("cant.delete.property", Integer.toString(index), "sealed array");
         }
         return false;
     }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
index d84c159d035..9c1d75a7cf2 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
@@ -430,6 +430,21 @@ public final class JavaAdapterFactory {
         }
     }
 
+    /**
+     * Tells if the given Class is an adapter or support class
+     * @param clazz Class object
+     * @return true if the Class given is adapter or support class
+     */
+    public static boolean isAdapterClass(Class<?> clazz) {
+        return clazz.getClassLoader() instanceof AdapterLoader;
+    }
+
+    private static class AdapterLoader extends SecureClassLoader {
+        AdapterLoader(ClassLoader parent) {
+            super(parent);
+        }
+    }
+
     // Creation of class loader is in a separate static method so that it doesn't retain a reference to the factory
     // instance. Note that the adapter class is created in the protection domain of the class/interface being
     // extended/implemented, and only the privileged global setter action class is generated in the protection domain
@@ -440,7 +455,7 @@ public final class JavaAdapterFactory {
     // security tradeoff...
     private static ClassLoader createClassLoader(final ClassLoader parentLoader, final String className,
             final byte[] classBytes, final String privilegedActionClassName) {
-        return new SecureClassLoader(parentLoader) {
+        return new AdapterLoader(parentLoader) {
             @Override
             protected Class<?> findClass(final String name) throws ClassNotFoundException {
                 if(name.equals(className)) {
@@ -688,7 +703,7 @@ public final class JavaAdapterFactory {
      */
     public static MethodHandle getHandle(final Object obj, final String name, final MethodType type, final boolean varArg) {
         if (! (obj instanceof ScriptObject)) {
-            typeError(Context.getGlobal(), "not.an.object", ScriptRuntime.safeToString(obj));
+            typeError("not.an.object", ScriptRuntime.safeToString(obj));
             throw new AssertionError();
         }
 
@@ -704,7 +719,7 @@ public final class JavaAdapterFactory {
         } else if(fnObj == null || fnObj instanceof Undefined) {
             return null;
         } else {
-            typeError(Context.getGlobal(), "not.a.function", name);
+            typeError("not.a.function", name);
             throw new AssertionError();
         }
     }
@@ -1076,7 +1091,7 @@ public final class JavaAdapterFactory {
 
         void typeError() {
             assert adaptationOutcome != AdaptationOutcome.SUCCESS;
-            ECMAErrors.typeError(Context.getGlobal(), "extend." + adaptationOutcome, classList);
+            ECMAErrors.typeError("extend." + adaptationOutcome, classList);
         }
     }
 
@@ -1219,7 +1234,7 @@ public final class JavaAdapterFactory {
         while(it.hasNext()) {
             b.append(", ").append(it.next().clazz.getCanonicalName());
         }
-        typeError(Context.getGlobal(), "extend.ambiguous.defining.class", b.toString());
+        typeError("extend.ambiguous.defining.class", b.toString());
         throw new AssertionError(); // never reached
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java
index 8cc68fd214b..1329ccd74fb 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java
@@ -34,7 +34,6 @@ import java.lang.invoke.MethodHandles;
 import java.util.HashMap;
 import java.util.Map;
 import jdk.nashorn.internal.runtime.ConsString;
-import jdk.nashorn.internal.runtime.Context;
 import jdk.nashorn.internal.runtime.JSType;
 import jdk.nashorn.internal.runtime.ScriptObject;
 import org.dynalang.dynalink.support.TypeUtilities;
@@ -110,7 +109,7 @@ public class JavaArgumentConverters {
                 return Character.valueOf((char) ival);
             }
 
-            typeError(Context.getGlobal(), "cant.convert.number.to.char");
+            typeError("cant.convert.number.to.char");
         }
 
         final String s = toString(o);
@@ -119,7 +118,7 @@ public class JavaArgumentConverters {
         }
 
         if (s.length() != 1) {
-            typeError(Context.getGlobal(), "cant.convert.string.to.char");
+            typeError("cant.convert.string.to.char");
         }
 
         return s.charAt(0);
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/Lookup.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/Lookup.java
index 7282c60f39b..44f195ad2d0 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/Lookup.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/Lookup.java
@@ -31,7 +31,6 @@ import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
-import jdk.nashorn.internal.runtime.Context;
 import jdk.nashorn.internal.runtime.JSType;
 import jdk.nashorn.internal.runtime.Property;
 import jdk.nashorn.internal.runtime.PropertyMap;
@@ -112,7 +111,7 @@ public final class Lookup {
      * @return undefined (but throws error before return point)
      */
     public static Object typeErrorThrowerGetter(final Object self) {
-        typeError(Context.getGlobal(), "strict.getter.setter.poison", ScriptRuntime.safeToString(self));
+        typeError("strict.getter.setter.poison", ScriptRuntime.safeToString(self));
         return UNDEFINED;
     }
 
@@ -123,7 +122,7 @@ public final class Lookup {
      * @param value (ignored)
      */
     public static void typeErrorThrowerSetter(final Object self, final Object value) {
-        typeError(Context.getGlobal(), "strict.getter.setter.poison", ScriptRuntime.safeToString(self));
+        typeError("strict.getter.setter.poison", ScriptRuntime.safeToString(self));
     }
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java
index 5fea27f9b49..6c80fd566e3 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java
@@ -30,8 +30,6 @@ import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.ScriptObject;
 import jdk.nashorn.internal.runtime.ScriptRuntime;
 import org.dynalang.dynalink.CallSiteDescriptor;
 import org.dynalang.dynalink.linker.GuardedInvocation;
@@ -81,21 +79,21 @@ class NashornBottomLinker implements GuardingDynamicLinker {
         switch (operator) {
         case "new":
             if(isJavaDynamicMethod(self)) {
-                typeError(Context.getGlobal(), "method.not.constructor", ScriptRuntime.safeToString(self));
+                typeError("method.not.constructor", ScriptRuntime.safeToString(self));
             } else {
-                typeError(Context.getGlobal(), "not.a.function", ScriptRuntime.safeToString(self));
+                typeError("not.a.function", ScriptRuntime.safeToString(self));
             }
             break;
         case "call":
             if(isJavaDynamicMethod(self)) {
-                typeError(Context.getGlobal(), "no.method.matches.args", ScriptRuntime.safeToString(self));
+                typeError("no.method.matches.args", ScriptRuntime.safeToString(self));
             } else {
-                typeError(Context.getGlobal(), "not.a.function", ScriptRuntime.safeToString(self));
+                typeError("not.a.function", ScriptRuntime.safeToString(self));
             }
             break;
         case "callMethod":
         case "getMethod":
-            typeError(Context.getGlobal(), "no.such.function", getArgument(linkRequest), ScriptRuntime.safeToString(self));
+            typeError("no.such.function", getArgument(linkRequest), ScriptRuntime.safeToString(self));
             break;
         case "getProp":
         case "getElem":
@@ -136,25 +134,24 @@ class NashornBottomLinker implements GuardingDynamicLinker {
     }
 
     private static GuardedInvocation linkNull(final LinkRequest linkRequest) {
-        final ScriptObject global = Context.getGlobal();
         final NashornCallSiteDescriptor desc = (NashornCallSiteDescriptor)linkRequest.getCallSiteDescriptor();
         final String operator = desc.getFirstOperator();
         switch (operator) {
         case "new":
         case "call":
-            typeError(global, "not.a.function", "null");
+            typeError("not.a.function", "null");
             break;
         case "callMethod":
         case "getMethod":
-            typeError(global, "no.such.function", getArgument(linkRequest), "null");
+            typeError("no.such.function", getArgument(linkRequest), "null");
             break;
         case "getProp":
         case "getElem":
-            typeError(global, "cant.get.property", getArgument(linkRequest), "null");
+            typeError("cant.get.property", getArgument(linkRequest), "null");
             break;
         case "setProp":
         case "setElem":
-            typeError(global, "cant.set.property", getArgument(linkRequest), "null");
+            typeError("cant.set.property", getArgument(linkRequest), "null");
             break;
         default:
             break;
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java
index 8ddd1fe8c88..4e7c68bd920 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java
@@ -25,7 +25,6 @@
 
 package jdk.nashorn.internal.runtime.linker;
 
-import jdk.nashorn.internal.runtime.Context;
 import jdk.nashorn.internal.runtime.ECMAErrors;
 import org.dynalang.dynalink.CallSiteDescriptor;
 import org.dynalang.dynalink.beans.BeansLinker;
@@ -94,7 +93,7 @@ class NashornStaticClassLinker implements TypeBasedGuardingDynamicLinker {
 
     private static GuardedInvocation checkNullConstructor(final GuardedInvocation ctorInvocation, final Class<?> receiverClass) {
         if(ctorInvocation == null) {
-            ECMAErrors.typeError(Context.getGlobal(), "no.constructor.matches.args", receiverClass.getName());
+            ECMAErrors.typeError("no.constructor.matches.args", receiverClass.getName());
         }
         return ctorInvocation;
     }

From 4135674f9284c7da0ab0261986763342cbffd5c8 Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Wed, 23 Jan 2013 17:04:02 +0530
Subject: [PATCH 085/311] 8006736: nashorn script engine should support the
 usage multiple global objects with same engine instance

Reviewed-by: lagergren, jlaskey, hannesw
---
 .../api/scripting/NashornScriptEngine.java    | 151 +++++++++++-------
 .../api/scripting/ScriptObjectMirror.java     |   5 +
 .../api/scripting/ScriptEngineTest.java       |  49 ++++++
 3 files changed, 143 insertions(+), 62 deletions(-)

diff --git a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
index e23fe555cb3..c3521a36a3a 100644
--- a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
+++ b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
@@ -47,7 +47,6 @@ import javax.script.ScriptContext;
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineFactory;
 import javax.script.ScriptException;
-import javax.script.SimpleBindings;
 import jdk.nashorn.internal.runtime.Context;
 import jdk.nashorn.internal.runtime.ErrorManager;
 import jdk.nashorn.internal.runtime.GlobalObject;
@@ -112,29 +111,9 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
         });
 
         // create new global object
-        this.global =  AccessController.doPrivileged(new PrivilegedAction<ScriptObject>() {
-            @Override
-            public ScriptObject run() {
-                try {
-                    return nashornContext.createGlobal();
-                } catch (final RuntimeException e) {
-                    if (Context.DEBUG) {
-                        e.printStackTrace();
-                    }
-                    throw e;
-                }
-            }
-        });
-
-        // current ScriptContext exposed as "context"
-        global.addOwnProperty("context", Property.NOT_ENUMERABLE, context);
-        // current ScriptEngine instance exposed as "engine". We added @SuppressWarnings("LeakingThisInConstructor") as
-        // NetBeans identifies this assignment as such a leak - this is a false positive as we're setting this property
-        // in the Global of a Context we just created - both the Context and the Global were just created and can not be
-        // seen from another thread outside of this constructor.
-        global.addOwnProperty("engine", Property.NOT_ENUMERABLE, this);
-        // global script arguments
-        global.addOwnProperty("arguments", Property.NOT_ENUMERABLE, UNDEFINED);
+        this.global =  createNashornGlobal();
+        // set the default engine scope for the default context
+        context.setBindings(new ScriptObjectMirror(global, global), ScriptContext.ENGINE_SCOPE);
 
         // evaluate engine initial script
         try {
@@ -145,8 +124,6 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
             }
             throw new RuntimeException(e);
         }
-
-        context.setBindings(new ScriptObjectMirror(global, global), ScriptContext.ENGINE_SCOPE);
     }
 
     @Override
@@ -170,7 +147,8 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
 
     @Override
     public Bindings createBindings() {
-        return new SimpleBindings();
+        final ScriptObject newGlobal = createNashornGlobal();
+        return new ScriptObjectMirror(newGlobal, newGlobal);
     }
 
     // Compilable methods
@@ -208,22 +186,23 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
 
     private <T> T getInterfaceInner(final Object self, final Class<T> clazz) {
         final Object realSelf;
+        final ScriptObject ctxtGlobal = getNashornGlobalFrom(context);
         if(self == null) {
-            realSelf = global;
+            realSelf = ctxtGlobal;
         } else if (!(self instanceof ScriptObject)) {
-            realSelf = ScriptObjectMirror.unwrap(self, global);
+            realSelf = ScriptObjectMirror.unwrap(self, ctxtGlobal);
         } else {
             realSelf = self;
         }
         try {
             final ScriptObject oldGlobal = getNashornGlobal();
             try {
-                if(oldGlobal != global) {
-                    setNashornGlobal(global);
+                if(oldGlobal != ctxtGlobal) {
+                    setNashornGlobal(ctxtGlobal);
                 }
                 return clazz.cast(JavaAdapterFactory.getConstructor(realSelf.getClass(), clazz).invoke(realSelf));
             } finally {
-                if(oldGlobal != global) {
+                if(oldGlobal != ctxtGlobal) {
                     setNashornGlobal(oldGlobal);
                 }
             }
@@ -259,13 +238,14 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
      */
     public Object __noSuchProperty__(final Object self, final ScriptContext ctxt, final String name) {
         final int scope = ctxt.getAttributesScope(name);
+        final ScriptObject ctxtGlobal = getNashornGlobalFrom(ctxt);
         if (scope != -1) {
-            return ScriptObjectMirror.unwrap(ctxt.getAttribute(name, scope), global);
+            return ScriptObjectMirror.unwrap(ctxt.getAttribute(name, scope), ctxtGlobal);
         }
 
         if (self == UNDEFINED) {
             // scope access and so throw ReferenceError
-            referenceError(global, "not.defined", name);
+            referenceError(ctxtGlobal, "not.defined", name);
         }
 
         return UNDEFINED;
@@ -282,29 +262,72 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
      */
     public Object __noSuchMethod__(final Object self, final ScriptContext ctxt, final String name, final Object args) {
         final int scope = ctxt.getAttributesScope(name);
+        final ScriptObject ctxtGlobal = getNashornGlobalFrom(ctxt);
         Object value;
 
         if (scope != -1) {
             value = ctxt.getAttribute(name, scope);
         } else {
             if (self == UNDEFINED) {
-                referenceError(global, "not.defined", name);
+                referenceError(ctxtGlobal, "not.defined", name);
             } else {
-                typeError(global, "no.such.function", name, ScriptRuntime.safeToString(global));
+                typeError(ctxtGlobal, "no.such.function", name, ScriptRuntime.safeToString(ctxtGlobal));
             }
             return UNDEFINED;
         }
 
-        value = ScriptObjectMirror.unwrap(value, global);
+        value = ScriptObjectMirror.unwrap(value, ctxtGlobal);
         if (value instanceof ScriptFunction) {
-            return ScriptObjectMirror.unwrap(ScriptRuntime.apply((ScriptFunction)value, global, args), global);
+            return ScriptObjectMirror.unwrap(ScriptRuntime.apply((ScriptFunction)value, ctxtGlobal, args), ctxtGlobal);
         }
 
-        typeError(global, "not.a.function", ScriptRuntime.safeToString(name));
+        typeError(ctxtGlobal, "not.a.function", ScriptRuntime.safeToString(name));
 
         return UNDEFINED;
     }
 
+    private ScriptObject getNashornGlobalFrom(final ScriptContext ctxt) {
+        final Bindings bindings = ctxt.getBindings(ScriptContext.ENGINE_SCOPE);
+        if (bindings instanceof ScriptObjectMirror) {
+             ScriptObject sobj = ((ScriptObjectMirror)bindings).getScriptObject();
+             if (sobj instanceof GlobalObject) {
+                 return sobj;
+             }
+        }
+
+        // didn't find global object from context given - return the engine-wide global
+        return global;
+    }
+
+    private ScriptObject createNashornGlobal() {
+        final ScriptObject newGlobal = AccessController.doPrivileged(new PrivilegedAction<ScriptObject>() {
+            @Override
+            public ScriptObject run() {
+                try {
+                    return nashornContext.createGlobal();
+                } catch (final RuntimeException e) {
+                    if (Context.DEBUG) {
+                        e.printStackTrace();
+                    }
+                    throw e;
+                }
+            }
+        });
+
+        // current ScriptContext exposed as "context"
+        newGlobal.addOwnProperty("context", Property.NOT_ENUMERABLE, UNDEFINED);
+        // current ScriptEngine instance exposed as "engine". We added @SuppressWarnings("LeakingThisInConstructor") as
+        // NetBeans identifies this assignment as such a leak - this is a false positive as we're setting this property
+        // in the Global of a Context we just created - both the Context and the Global were just created and can not be
+        // seen from another thread outside of this constructor.
+        newGlobal.addOwnProperty("engine", Property.NOT_ENUMERABLE, this);
+        // global script arguments with undefined value
+        newGlobal.addOwnProperty("arguments", Property.NOT_ENUMERABLE, UNDEFINED);
+        // file name default is null
+        newGlobal.addOwnProperty(ScriptEngine.FILENAME, Property.NOT_ENUMERABLE, null);
+        return newGlobal;
+    }
+
     private void evalEngineScript() throws ScriptException {
         evalSupportScript("resources/engine.js");
     }
@@ -332,51 +355,53 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
     // scripts should see "context" and "engine" as variables
     private void setContextVariables(final ScriptContext ctxt) {
         ctxt.setAttribute("context", ctxt, ScriptContext.ENGINE_SCOPE);
-        global.set("context", ctxt, false);
-        Object args = ScriptObjectMirror.unwrap(ctxt.getAttribute("arguments"), global);
+        final ScriptObject ctxtGlobal = getNashornGlobalFrom(ctxt);
+        ctxtGlobal.set("context", ctxt, false);
+        Object args = ScriptObjectMirror.unwrap(ctxt.getAttribute("arguments"), ctxtGlobal);
         if (args == null || args == UNDEFINED) {
             args = ScriptRuntime.EMPTY_ARRAY;
         }
         // if no arguments passed, expose it
-        args = ((GlobalObject)global).wrapAsObject(args);
-        global.set("arguments", args, false);
+        args = ((GlobalObject)ctxtGlobal).wrapAsObject(args);
+        ctxtGlobal.set("arguments", args, false);
     }
 
     private Object invokeImpl(final Object selfObject, final String name, final Object... args) throws ScriptException, NoSuchMethodException {
         final ScriptObject oldGlobal     = getNashornGlobal();
-        final boolean globalChanged = (oldGlobal != global);
+        final ScriptObject ctxtGlobal    = getNashornGlobalFrom(context);
+        final boolean globalChanged = (oldGlobal != ctxtGlobal);
 
         Object self = selfObject;
 
         try {
             if (globalChanged) {
-                setNashornGlobal(global);
+                setNashornGlobal(ctxtGlobal);
             }
 
             ScriptObject sobj;
             Object       value = null;
 
-            self = ScriptObjectMirror.unwrap(self, global);
+            self = ScriptObjectMirror.unwrap(self, ctxtGlobal);
 
             // FIXME: should convert when self is not ScriptObject
             if (self instanceof ScriptObject) {
                 sobj = (ScriptObject)self;
                 value = sobj.get(name);
             } else if (self == null) {
-                self  = global;
-                sobj  = global;
+                self  = ctxtGlobal;
+                sobj  = ctxtGlobal;
                 value = sobj.get(name);
             }
 
             if (value instanceof ScriptFunction) {
                 final Object res;
                 try {
-                    res = ScriptRuntime.apply((ScriptFunction)value, self, ScriptObjectMirror.unwrapArray(args, global));
+                    res = ScriptRuntime.apply((ScriptFunction)value, self, ScriptObjectMirror.unwrapArray(args, ctxtGlobal));
                 } catch (final Exception e) {
                     throwAsScriptException(e);
                     throw new AssertionError("should not reach here");
                 }
-                return ScriptObjectMirror.translateUndefined(ScriptObjectMirror.wrap(res, global));
+                return ScriptObjectMirror.translateUndefined(ScriptObjectMirror.wrap(res, ctxtGlobal));
             }
 
             throw new NoSuchMethodException(name);
@@ -396,10 +421,11 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
             return null;
         }
         final ScriptObject oldGlobal = getNashornGlobal();
-        final boolean globalChanged = (oldGlobal != global);
+        final ScriptObject ctxtGlobal = getNashornGlobalFrom(ctxt);
+        final boolean globalChanged = (oldGlobal != ctxtGlobal);
         try {
             if (globalChanged) {
-                setNashornGlobal(global);
+                setNashornGlobal(ctxtGlobal);
             }
 
             setContextVariables(ctxt);
@@ -413,8 +439,8 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
                 return null;
             }
 
-            Object res = ScriptRuntime.apply(script, global);
-            return ScriptObjectMirror.translateUndefined(ScriptObjectMirror.wrap(res, global));
+            Object res = ScriptRuntime.apply(script, ctxtGlobal);
+            return ScriptObjectMirror.translateUndefined(ScriptObjectMirror.wrap(res, ctxtGlobal));
         } catch (final Exception e) {
             throwAsScriptException(e);
             throw new AssertionError("should not reach here");
@@ -458,17 +484,18 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
 
     private ScriptFunction compileImpl(final char[] buf, final ScriptContext ctxt) throws ScriptException {
         final ScriptObject oldGlobal = getNashornGlobal();
-        final boolean globalChanged = (oldGlobal != global);
+        final ScriptObject ctxtGlobal = getNashornGlobalFrom(ctxt);
+        final boolean globalChanged = (oldGlobal != ctxtGlobal);
         try {
             final Object val = ctxt.getAttribute(ScriptEngine.FILENAME);
             final String fileName = (val != null) ? val.toString() : "<eval>";
 
             final Source source = new Source(fileName, buf);
             if (globalChanged) {
-                setNashornGlobal(global);
+                setNashornGlobal(ctxtGlobal);
             }
 
-            return nashornContext.compileScript(source, global, nashornContext._strict);
+            return nashornContext.compileScript(source, ctxtGlobal, nashornContext._strict);
         } catch (final Exception e) {
             throwAsScriptException(e);
             throw new AssertionError("should not reach here");
@@ -479,17 +506,17 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
         }
     }
 
-    // don't make these public!!
+    // don't make this public!!
     static ScriptObject getNashornGlobal() {
-       return Context.getGlobal();
+        return Context.getGlobal();
     }
 
-    static void setNashornGlobal(final ScriptObject global) {
+    static void setNashornGlobal(final ScriptObject newGlobal) {
         AccessController.doPrivileged(new PrivilegedAction<Void>() {
             @Override
             public Void run() {
-                Context.setGlobal(global);
-                return null;
+               Context.setGlobal(newGlobal);
+               return null;
             }
         });
     }
diff --git a/nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java b/nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java
index d0992573140..2aa9ad184c5 100644
--- a/nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java
+++ b/nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java
@@ -329,6 +329,11 @@ final class ScriptObjectMirror extends JSObject implements Bindings {
         });
     }
 
+    // package-privates below this.
+    ScriptObject getScriptObject() {
+        return sobj;
+    }
+
     static Object translateUndefined(Object obj) {
         return (obj == ScriptRuntime.UNDEFINED)? null : obj;
     }
diff --git a/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java b/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
index d3b328a14d2..b6489f93d56 100644
--- a/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
+++ b/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
@@ -46,8 +46,10 @@ import javax.script.ScriptEngine;
 import javax.script.ScriptEngineFactory;
 import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
+import javax.script.SimpleScriptContext;
 import jdk.nashorn.internal.runtime.Version;
 import netscape.javascript.JSObject;
+import org.testng.Assert;
 import org.testng.TestNG;
 import org.testng.annotations.Test;
 
@@ -922,4 +924,51 @@ public class ScriptEngineTest {
         assertEquals(engineScope.get("myVar"), "nashorn");
         assertEquals(e.get("myVar"), "nashorn");
     }
+
+    @Test
+    public void multiGlobalTest() {
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+        final Bindings b = e.createBindings();
+        final ScriptContext newCtxt = new SimpleScriptContext();
+        newCtxt.setBindings(b, ScriptContext.ENGINE_SCOPE);
+
+        try {
+            Object obj1 = e.eval("Object");
+            Object obj2 = e.eval("Object", newCtxt);
+            Assert.assertNotEquals(obj1, obj2);
+            Assert.assertNotNull(obj1);
+            Assert.assertNotNull(obj2);
+            Assert.assertEquals(obj1.toString(), obj2.toString());
+
+            e.eval("x = 'hello'");
+            e.eval("x = 'world'", newCtxt);
+            Object x1 = e.getContext().getAttribute("x");
+            Object x2 = newCtxt.getAttribute("x");
+            Assert.assertNotEquals(x1, x2);
+            Assert.assertEquals(x1, "hello");
+            Assert.assertEquals(x2, "world");
+
+            x1 = e.eval("x");
+            x2 = e.eval("x", newCtxt);
+            Assert.assertNotEquals(x1, x2);
+            Assert.assertEquals(x1, "hello");
+            Assert.assertEquals(x2, "world");
+
+            final ScriptContext origCtxt = e.getContext();
+            e.setContext(newCtxt);
+            e.eval("y = new Object()");
+            e.eval("y = new Object()", origCtxt);
+
+            Object y1 = origCtxt.getAttribute("y");
+            Object y2 = newCtxt.getAttribute("y");
+            Assert.assertNotEquals(y1, y2);
+            Assert.assertNotEquals(e.eval("y"), e.eval("y", origCtxt));
+            Assert.assertEquals("[object Object]", y1.toString());
+            Assert.assertEquals("[object Object]", y2.toString());
+        } catch (final ScriptException se) {
+            se.printStackTrace();
+            fail(se.getMessage());
+        }
+    }
 }

From 67db0ba236d17822c082bbba39624fd048a459cc Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Thu, 24 Jan 2013 16:21:32 +0530
Subject: [PATCH 086/311] 8006575: Error in codegen for element access on
 primitive value

Reviewed-by: hannesw, lagergren
---
 .../internal/codegen/CodeGenerator.java       |  2 +-
 nashorn/test/script/basic/JDK-8006575.js      | 32 +++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 nashorn/test/script/basic/JDK-8006575.js

diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
index 49e9e35c39b..14fdaade2bc 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
@@ -341,7 +341,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
             @Override
             public Node enter(final IndexNode indexNode) {
                 if (!baseAlreadyOnStack) {
-                    load(indexNode.getBase());
+                    load(indexNode.getBase()).convert(Type.OBJECT);
                     load(indexNode.getIndex());
                 }
                 method.dynamicGetIndex(node.getType(), getCallSiteFlags(), indexNode.isFunction());
diff --git a/nashorn/test/script/basic/JDK-8006575.js b/nashorn/test/script/basic/JDK-8006575.js
new file mode 100644
index 00000000000..4d005da33ef
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8006575.js
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8006575 : Error in codegen for element access on primitive value
+ *
+ * @test
+ * @run
+ */
+
+// The following expression used to result in AssertionError from codegen
+(1)[0]

From d3f071dc73fb40d22f4d4cd1e0565a2e01964ec7 Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Thu, 24 Jan 2013 17:49:03 +0530
Subject: [PATCH 087/311] 8006755: Functions inside with statements dont get
 correct scope

Reviewed-by: lagergren, attila
---
 .../jdk/nashorn/internal/parser/Parser.java   | 11 ++++-
 nashorn/test/script/basic/JDK-8006755.js      | 41 +++++++++++++++++++
 2 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 nashorn/test/script/basic/JDK-8006755.js

diff --git a/nashorn/src/jdk/nashorn/internal/parser/Parser.java b/nashorn/src/jdk/nashorn/internal/parser/Parser.java
index a43179da715..6dbce889400 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/Parser.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/Parser.java
@@ -2495,7 +2495,7 @@ loop:
 
         final FunctionNode functionNode = functionBody(functionToken, name, parameters, FunctionNode.Kind.NORMAL);
 
-        if (isStatement) {
+        if (isStatement && !isInWithBlock()) {
             functionNode.setIsStatement();
         }
 
@@ -2544,7 +2544,14 @@ loop:
         }
 
         if (isStatement) {
-            functionNode.setFunctionVarNode(new VarNode(source, functionToken, finish, name, referenceNode), lineNumber);
+            final VarNode var = new VarNode(source, functionToken, finish, name, referenceNode);
+            if (isInWithBlock()) {
+                function.addDeclaration(var);
+                // Add to current block.
+                block.addStatement(var);
+            } else {
+                functionNode.setFunctionVarNode(var, lineNumber);
+            }
         }
 
         return referenceNode;
diff --git a/nashorn/test/script/basic/JDK-8006755.js b/nashorn/test/script/basic/JDK-8006755.js
new file mode 100644
index 00000000000..3012a4bed56
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8006755.js
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8006755: Functions inside with statements dont get correct scope
+ *
+ * @test
+ * @run
+ */
+
+var scope = { x: "hello" };
+
+with (scope) {
+    function main() {
+        if (x != "hello") {
+            fail("x != 'hello'");
+        }
+    }
+}
+
+main()

From d9ecc2ea0c613c7eb034cbb0e924738ef4dbf549 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Thu, 24 Jan 2013 14:55:57 +0100
Subject: [PATCH 088/311] 8006408: Clean up and specialize NativeString

Reviewed-by: jlaskey, lagergren
---
 .../internal/objects/NativeString.java        | 395 +++++++++++++-----
 nashorn/test/examples/string-micro.js         | 179 ++++++++
 2 files changed, 477 insertions(+), 97 deletions(-)
 create mode 100644 nashorn/test/examples/string-micro.js

diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeString.java b/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
index 01dceef7124..649c26a0658 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
@@ -36,6 +36,7 @@ import java.lang.invoke.MethodHandles;
 import java.text.Collator;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.regex.Pattern;
 import jdk.nashorn.internal.objects.annotations.Attribute;
@@ -428,17 +429,30 @@ public final class NativeString extends ScriptObject {
      */
     @Function(attributes = Attribute.NOT_ENUMERABLE)
     public static Object charAt(final Object self, final Object pos) {
-        try {
-            return String.valueOf(((String)self).charAt(((Number)pos).intValue()));
-        } catch (final ClassCastException | IndexOutOfBoundsException | NullPointerException e) {
-            Global.checkObjectCoercible(self);
-            final String str = JSType.toString(self);
-            final int    at  = JSType.toInteger(pos);
-            if (at < 0 || at >= str.length()) {
-                return "";
-            }
-            return String.valueOf(str.charAt(at));
-        }
+        return charAt(self, JSType.toInteger(pos));
+    }
+
+    /**
+     * ECMA 15.5.4.4 String.prototype.charAt (pos) - specialized version for double position
+     * @param self self reference
+     * @param pos  position in string
+     * @return string representing the char at the given position
+     */
+    @SpecializedFunction
+    public static String charAt(final Object self, final double pos) {
+        return charAt(self, (int)pos);
+    }
+
+    /**
+     * ECMA 15.5.4.4 String.prototype.charAt (pos) - specialized version for int position
+     * @param self self reference
+     * @param pos  position in string
+     * @return string representing the char at the given position
+     */
+    @SpecializedFunction
+    public static String charAt(final Object self, final int pos) {
+        final String str = checkObjectToString(self);
+        return (pos < 0 || pos >= str.length()) ? "" : String.valueOf(str.charAt(pos));
     }
 
     /**
@@ -449,18 +463,30 @@ public final class NativeString extends ScriptObject {
      */
     @Function(attributes = Attribute.NOT_ENUMERABLE)
     public static Object charCodeAt(final Object self, final Object pos) {
-        try {
-            return (int)((String)self).charAt(((Number)pos).intValue());
-        } catch (final ClassCastException | IndexOutOfBoundsException | NullPointerException e) {
-            Global.checkObjectCoercible(self);
-            final String str = JSType.toString(self);
-            final int at     = JSType.toInteger(pos);
-            if (at < 0 || at >= str.length()) {
-                return Double.NaN;
-            }
+        return charCodeAt(self, JSType.toInteger(pos));
+    }
 
-            return JSType.toObject(str.charAt(at));
-        }
+    /**
+     * ECMA 15.5.4.5 String.prototype.charCodeAt (pos) - specialized version for double position
+     * @param self self reference
+     * @param pos  position in string
+     * @return number representing charcode at position
+     */
+    @SpecializedFunction
+    public static double charCodeAt(final Object self, final double pos) {
+        return charCodeAt(self, (int) pos);
+    }
+
+    /**
+     * ECMA 15.5.4.5 String.prototype.charCodeAt (pos) - specialized version for int position
+     * @param self self reference
+     * @param pos  position in string
+     * @return number representing charcode at position
+     */
+    @SpecializedFunction
+    public static double charCodeAt(final Object self, final int pos) {
+        final String str = checkObjectToString(self);
+        return (pos < 0 || pos >= str.length()) ? Double.NaN :  str.charAt(pos);
     }
 
     /**
@@ -471,14 +497,13 @@ public final class NativeString extends ScriptObject {
      */
     @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
     public static Object concat(final Object self, final Object... args) {
-        Global.checkObjectCoercible(self);
-        final StringBuilder sb = new StringBuilder(JSType.toString(self));
+        CharSequence cs = checkObjectToString(self);
         if (args != null) {
             for (final Object obj : args) {
-                sb.append(JSType.toString(obj));
+                cs = new ConsString(cs, JSType.toCharSequence(obj));
             }
         }
-        return sb.toString();
+        return cs;
     }
 
     /**
@@ -490,12 +515,43 @@ public final class NativeString extends ScriptObject {
      */
     @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
     public static Object indexOf(final Object self, final Object search, final Object pos) {
-        try {
-            return ((String)self).indexOf((String)search, ((Number)pos).intValue()); //assuming that the conversions really mean "toInteger" and not "toInt32" this is ok.
-        } catch (final ClassCastException | IndexOutOfBoundsException | NullPointerException e) {
-            Global.checkObjectCoercible(self);
-            return JSType.toString(self).indexOf(JSType.toString(search), JSType.toInteger(pos));
-        }
+        final String str = checkObjectToString(self);
+        return str.indexOf(JSType.toString(search), JSType.toInteger(pos));
+    }
+
+    /**
+     * ECMA 15.5.4.7 String.prototype.indexOf (searchString, position) specialized for no position parameter
+     * @param self   self reference
+     * @param search string to search for
+     * @return position of first match or -1
+     */
+    @SpecializedFunction
+    public static int indexOf(final Object self, final Object search) {
+        return indexOf(self, search, 0);
+    }
+
+    /**
+     * ECMA 15.5.4.7 String.prototype.indexOf (searchString, position) specialized for double position parameter
+     * @param self   self reference
+     * @param search string to search for
+     * @param pos    position to start search
+     * @return position of first match or -1
+     */
+    @SpecializedFunction
+    public static int indexOf(final Object self, final Object search, final double pos) {
+        return indexOf(self, search, (int) pos);
+    }
+
+    /**
+     * ECMA 15.5.4.7 String.prototype.indexOf (searchString, position) specialized for int position parameter
+     * @param self   self reference
+     * @param search string to search for
+     * @param pos    position to start search
+     * @return position of first match or -1
+     */
+    @SpecializedFunction
+    public static int indexOf(final Object self, final Object search, final int pos) {
+        return checkObjectToString(self).indexOf(JSType.toString(search), pos);
     }
 
     /**
@@ -507,9 +563,8 @@ public final class NativeString extends ScriptObject {
      */
     @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
     public static Object lastIndexOf(final Object self, final Object search, final Object pos) {
-        Global.checkObjectCoercible(self);
 
-        final String str       = JSType.toString(self);
+        final String str       = checkObjectToString(self);
         final String searchStr = JSType.toString(search);
 
         int from;
@@ -532,9 +587,8 @@ public final class NativeString extends ScriptObject {
      */
     @Function(attributes = Attribute.NOT_ENUMERABLE)
     public static Object localeCompare(final Object self, final Object that) {
-        Global.checkObjectCoercible(self);
 
-        final String   str      = JSType.toString(self);
+        final String   str      = checkObjectToString(self);
         final Collator collator = Collator.getInstance(Global.getThisContext().getLocale());
 
         collator.setStrength(Collator.IDENTICAL);
@@ -551,9 +605,8 @@ public final class NativeString extends ScriptObject {
      */
     @Function(attributes = Attribute.NOT_ENUMERABLE)
     public static Object match(final Object self, final Object regexp) {
-        Global.checkObjectCoercible(self);
 
-        final String str = JSType.toString(self);
+        final String str = checkObjectToString(self);
 
         NativeRegExp nativeRegExp;
         if (regexp == UNDEFINED) {
@@ -599,9 +652,8 @@ public final class NativeString extends ScriptObject {
      */
     @Function(attributes = Attribute.NOT_ENUMERABLE)
     public static Object replace(final Object self, final Object string, final Object replacement) {
-        Global.checkObjectCoercible(self);
 
-        final String str = JSType.toString(self);
+        final String str = checkObjectToString(self);
 
         final NativeRegExp nativeRegExp;
         if (string instanceof NativeRegExp) {
@@ -626,9 +678,8 @@ public final class NativeString extends ScriptObject {
      */
     @Function(attributes = Attribute.NOT_ENUMERABLE)
     public static Object search(final Object self, final Object string) {
-        Global.checkObjectCoercible(self);
 
-        final String       str          = JSType.toString(self);
+        final String       str          = checkObjectToString(self);
         final NativeRegExp nativeRegExp = Global.toRegExp(string == UNDEFINED ? "" : string);
 
         return nativeRegExp.search(str);
@@ -644,30 +695,70 @@ public final class NativeString extends ScriptObject {
      */
     @Function(attributes = Attribute.NOT_ENUMERABLE)
     public static Object slice(final Object self, final Object start, final Object end) {
-        Global.checkObjectCoercible(self);
 
-        final String str      = JSType.toString(self);
-        final int    len      = str.length();
-        final int    intStart = JSType.toInteger(start);
-        final int    intEnd   = (end == UNDEFINED) ? len : JSType.toInteger(end);
-
-        int from;
-
-        if (intStart < 0) {
-            from = Math.max(len + intStart, 0);
-        } else {
-            from = Math.min(intStart, len);
+        final String str      = checkObjectToString(self);
+        if (end == UNDEFINED) {
+            return slice(str, JSType.toInteger(start));
         }
+        return slice(str, JSType.toInteger(start), JSType.toInteger(end));
+    }
 
-        int to;
+    /**
+     * ECMA 15.5.4.13 String.prototype.slice (start, end) specialized for single int parameter
+     *
+     * @param self  self reference
+     * @param start start position for slice
+     * @return sliced out substring
+     */
+    @SpecializedFunction
+    public static Object slice(final Object self, final int start) {
+        final String str = checkObjectToString(self);
+        final int from = (start < 0) ? Math.max(str.length() + start, 0) : Math.min(start, str.length());
 
-        if (intEnd < 0) {
-            to = Math.max(len + intEnd,0);
-        } else {
-            to = Math.min(intEnd, len);
-        }
+        return str.substring(from);
+    }
 
-        return str.substring(Math.min(from,  to), to);
+    /**
+     * ECMA 15.5.4.13 String.prototype.slice (start, end) specialized for single double parameter
+     *
+     * @param self  self reference
+     * @param start start position for slice
+     * @return sliced out substring
+     */
+    @SpecializedFunction
+    public static Object slice(final Object self, final double start) {
+        return slice(self, (int)start);
+    }
+
+    /**
+     * ECMA 15.5.4.13 String.prototype.slice (start, end) specialized for two int parameters
+     *
+     * @param self  self reference
+     * @param start start position for slice
+     * @return sliced out substring
+     */
+    @SpecializedFunction
+    public static Object slice(final Object self, final int start, final int end) {
+
+        final String str = checkObjectToString(self);
+        final int len    = str.length();
+
+        final int from = (start < 0) ? Math.max(len + start, 0) : Math.min(start, len);
+        final int to   = (end < 0)   ? Math.max(len + end, 0)   : Math.min(end, len);
+
+        return str.substring(Math.min(from, to), to);
+    }
+
+    /**
+     * ECMA 15.5.4.13 String.prototype.slice (start, end) specialized for two double parameters
+     *
+     * @param self  self reference
+     * @param start start position for slice
+     * @return sliced out substring
+     */
+    @SpecializedFunction
+    public static Object slice(final Object self, final double start, final double end) {
+        return slice(self, (int)start, (int)end);
     }
 
     /**
@@ -680,9 +771,8 @@ public final class NativeString extends ScriptObject {
      */
     @Function(attributes = Attribute.NOT_ENUMERABLE)
     public static Object split(final Object self, final Object separator, final Object limit) {
-        Global.checkObjectCoercible(self);
 
-        final String str = JSType.toString(self);
+        final String str = checkObjectToString(self);
 
         if (separator == UNDEFINED) {
             return new NativeArray(new Object[]{str});
@@ -694,9 +784,40 @@ public final class NativeString extends ScriptObject {
             return ((NativeRegExp) separator).split(str, lim);
         }
 
-        // when separator is a string, it has to be treated as a
-        // literal search string to be used for splitting.
-        return new NativeRegExp(Pattern.compile(JSType.toString(separator), Pattern.LITERAL)).split(str, lim);
+        // when separator is a string, it is treated as a literal search string to be used for splitting.
+        return splitString(str, JSType.toString(separator), lim);
+    }
+
+    private static Object splitString(String str, String separator, long limit) {
+
+        if (separator.equals("")) {
+            Object[] array = new Object[str.length()];
+            for (int i = 0; i < array.length; i++) {
+                array[i] = String.valueOf(str.charAt(i));
+            }
+            return new NativeArray(array);
+        }
+
+        final List<String> elements = new LinkedList<>();
+        final int strLength = str.length();
+        final int sepLength = separator.length();
+        int pos = 0;
+        int count = 0;
+
+        while (pos < strLength && count < limit) {
+            int found = str.indexOf(separator, pos);
+            if (found == -1) {
+                break;
+            }
+            elements.add(str.substring(pos, found));
+            count++;
+            pos = found + sepLength;
+        }
+        if (pos <= strLength && count < limit) {
+            elements.add(str.substring(pos));
+        }
+
+        return new NativeArray(elements.toArray());
     }
 
     /**
@@ -732,25 +853,78 @@ public final class NativeString extends ScriptObject {
      */
     @Function(attributes = Attribute.NOT_ENUMERABLE)
     public static Object substring(final Object self, final Object start, final Object end) {
-        Global.checkObjectCoercible(self);
 
-        final String str        = JSType.toString(self);
-        final int    len        = str.length();
-        final int    intStart   = JSType.toInteger(start);
-        final int    intEnd     = (end == UNDEFINED) ? len : JSType.toInteger(end);
-        final int    finalStart = Math.min((intStart < 0) ? 0 : intStart, len);
-        final int    finalEnd   = Math.min((intEnd < 0) ? 0 : intEnd, len);
-
-        int from, to;
-
-        if (finalStart < finalEnd) {
-            from = finalStart;
-            to = finalEnd;
-        } else {
-            from = finalEnd;
-            to = finalStart;
+        final String str = checkObjectToString(self);
+        if (end == UNDEFINED) {
+            return substring(str, JSType.toInteger(start));
         }
-        return str.substring(from, to);
+        return substring(str, JSType.toInteger(start), JSType.toInteger(end));
+    }
+
+    /**
+     * ECMA 15.5.4.15 String.prototype.substring (start, end) specialized for int start parameter
+     *
+     * @param self  self reference
+     * @param start start position of substring
+     * @return substring given start and end indexes
+     */
+    @SpecializedFunction
+    public static String substring(final Object self, final int start) {
+        final String str = checkObjectToString(self);
+        if (start < 0) {
+            return str;
+        } else if (start >= str.length()) {
+            return "";
+        } else {
+            return str.substring(start);
+        }
+    }
+
+    /**
+     * ECMA 15.5.4.15 String.prototype.substring (start, end) specialized for double start parameter
+     *
+     * @param self  self reference
+     * @param start start position of substring
+     * @return substring given start and end indexes
+     */
+    @SpecializedFunction
+    public static String substring(final Object self, final double start) {
+        return substring(self, (int)start);
+    }
+
+    /**
+     * ECMA 15.5.4.15 String.prototype.substring (start, end) specialized for int start and end parameters
+     *
+     * @param self  self reference
+     * @param start start position of substring
+     * @param end   end position of substring
+     * @return substring given start and end indexes
+     */
+    @SpecializedFunction
+    public static String substring(final Object self, final int start, final int end) {
+        final String str = checkObjectToString(self);
+        final int len = str.length();
+        final int validStart = start < 0 ? 0 : (start > len ? len : start);
+        final int validEnd   = end < 0 ? 0 : (end > len ? len : end);
+
+        if (validStart < validEnd) {
+            return str.substring(validStart, validEnd);
+        } else {
+            return str.substring(validEnd, validStart);
+        }
+    }
+
+    /**
+     * ECMA 15.5.4.15 String.prototype.substring (start, end) specialized for double start and end parameters
+     *
+     * @param self  self reference
+     * @param start start position of substring
+     * @param end   end position of substring
+     * @return substring given start and end indexes
+     */
+    @SpecializedFunction
+    public static String substring(final Object self, final double start, final double end) {
+        return substring(self, (int)start, (int)end);
     }
 
     /**
@@ -760,8 +934,7 @@ public final class NativeString extends ScriptObject {
      */
     @Function(attributes = Attribute.NOT_ENUMERABLE)
     public static Object toLowerCase(final Object self) {
-        Global.checkObjectCoercible(self);
-        return JSType.toString(self).toLowerCase();
+        return checkObjectToString(self).toLowerCase();
     }
 
     /**
@@ -771,8 +944,7 @@ public final class NativeString extends ScriptObject {
      */
     @Function(attributes = Attribute.NOT_ENUMERABLE)
     public static Object toLocaleLowerCase(final Object self) {
-        Global.checkObjectCoercible(self);
-        return JSType.toString(self).toLowerCase(Global.getThisContext().getLocale());
+        return checkObjectToString(self).toLowerCase(Global.getThisContext().getLocale());
     }
 
     /**
@@ -782,8 +954,7 @@ public final class NativeString extends ScriptObject {
      */
     @Function(attributes = Attribute.NOT_ENUMERABLE)
     public static Object toUpperCase(final Object self) {
-        Global.checkObjectCoercible(self);
-        return JSType.toString(self).toUpperCase();
+        return checkObjectToString(self).toUpperCase();
     }
 
     /**
@@ -793,8 +964,7 @@ public final class NativeString extends ScriptObject {
      */
     @Function(attributes = Attribute.NOT_ENUMERABLE)
     public static Object toLocaleUpperCase(final Object self) {
-        Global.checkObjectCoercible(self);
-        return JSType.toString(self).toUpperCase(Global.getThisContext().getLocale());
+        return checkObjectToString(self).toUpperCase(Global.getThisContext().getLocale());
     }
 
     /**
@@ -804,12 +974,11 @@ public final class NativeString extends ScriptObject {
      */
     @Function(attributes = Attribute.NOT_ENUMERABLE)
     public static Object trim(final Object self) {
-        Global.checkObjectCoercible(self);
-
-        final String str = JSType.toString(self);
 
+        final String str = checkObjectToString(self);
+        final int len = str.length();
         int start = 0;
-        int end   = str.length() - 1;
+        int end   = len - 1;
 
         while (start <= end && Lexer.isJSWhitespace(str.charAt(start))) {
             start++;
@@ -818,7 +987,7 @@ public final class NativeString extends ScriptObject {
             end--;
         }
 
-        return str.substring(start, end + 1);
+        return start == 0 && end + 1 == len ? str : str.substring(start, end + 1);
     }
 
     private static Object newObj(final Object self, final CharSequence str) {
@@ -860,7 +1029,22 @@ public final class NativeString extends ScriptObject {
         return newObj ? newObj(self, "") : "";
     }
 
-    //TODO - why is there no String with one String arg constructor?
+    /**
+     * ECMA 15.5.2.1 new String ( [ value ] ) - special version with one arg
+     *
+     * Constructor
+     *
+     * @param newObj is this constructor invoked with the new operator
+     * @param self   self reference
+     * @param arg    argument
+     *
+     * @return new NativeString (arg)
+     */
+    @SpecializedConstructor
+    public static Object constructor(final boolean newObj, final Object self, final Object arg) {
+        final CharSequence cs = JSType.toCharSequence(arg);
+        return newObj ? newObj(self, cs) : cs;
+    }
 
     /**
      * ECMA 15.5.2.1 new String ( [ value ] ) - special version with exactly one {@code int} arg
@@ -924,6 +1108,23 @@ public final class NativeString extends ScriptObject {
         }
     }
 
+    /**
+     * Combines ECMA 9.10 CheckObjectCoercible and ECMA 9.8 ToString with a shortcut for strings.
+     *
+     * @param self the object
+     * @return the object as string
+     */
+    private static String checkObjectToString(final Object self) {
+        if (self instanceof String) {
+            return (String)self;
+        } else if (self instanceof ConsString) {
+            return self.toString();
+        } else {
+            Global.checkObjectCoercible(self);
+            return JSType.toString(self);
+        }
+    }
+
     private boolean isValid(final int key) {
         return key >= 0 && key < value.length();
     }
diff --git a/nashorn/test/examples/string-micro.js b/nashorn/test/examples/string-micro.js
new file mode 100644
index 00000000000..56ed0ddbd72
--- /dev/null
+++ b/nashorn/test/examples/string-micro.js
@@ -0,0 +1,179 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. 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 with the distribution.
+ * 
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+var str = "The quick gray nashorn jumps over the lazy zebra.";
+
+function bench(name, func) {
+    var start = Date.now();
+    for (var iter = 0; iter < 5000000; iter++) {
+        func();
+    }
+    print((Date.now() - start) + "\t" + name);
+}
+
+bench("[]", function() {
+    str[0];
+    str[1];
+    str[2];
+});
+
+bench("fromCharCode", function() {
+    String.fromCharCode(97);
+    String.fromCharCode(98);
+    String.fromCharCode(99);
+});
+
+bench("charAt 1", function() {
+    str.charAt(0);
+    str.charAt(1);
+    str.charAt(2);
+});
+
+bench("charAt 2", function() {
+    str.charAt(100);
+    str.charAt(-1);
+});
+
+bench("charCodeAt 1", function() {
+    str.charCodeAt(0);
+    str.charCodeAt(1);
+    str.charCodeAt(2);
+});
+
+bench("charCodeAt 2", function() {
+    str.charCodeAt(100);
+    str.charCodeAt(-1);
+});
+
+bench("indexOf 1", function() {
+    str.indexOf("T");
+    str.indexOf("h");
+    str.indexOf("e");
+});
+
+bench("indexOf 2", function() {
+    str.indexOf("T", 0);
+    str.indexOf("h", 1);
+    str.indexOf("e", 2);
+});
+
+bench("lastIndexOf", function() {
+    str.indexOf("a");
+    str.indexOf("r");
+    str.indexOf("b");
+});
+
+bench("slice", function() {
+    str.slice(5);
+    str.slice(5);
+    str.slice(5);
+});
+
+bench("split 1", function() {
+    str.split();
+});
+
+bench("split 2", function() {
+    str.split("foo");
+});
+
+bench("split 3", function() {
+    str.split(/foo/);
+});
+
+bench("substring 1", function() {
+    str.substring(0);
+    str.substring(0);
+    str.substring(0);
+});
+
+bench("substring 2", function() {
+    str.substring(0, 5);
+    str.substring(0, 5);
+    str.substring(0, 5);
+});
+
+bench("substr", function() {
+    str.substr(0);
+    str.substr(0);
+    str.substr(0);
+});
+
+bench("slice", function() {
+    str.slice(0);
+    str.slice(0);
+    str.slice(0);
+});
+
+bench("concat", function() {
+    str.concat(str);
+    str.concat(str);
+    str.concat(str);
+});
+
+bench("trim", function() {
+    str.trim();
+    str.trim();
+    str.trim();
+});
+
+bench("toUpperCase", function() {
+    str.toUpperCase();
+});
+
+bench("toLowerCase", function() {
+    str.toLowerCase();
+});
+
+bench("valueOf", function() {
+    str.valueOf();
+    str.valueOf();
+    str.valueOf();
+});
+
+bench("toString", function() {
+    str.toString();
+    str.toString();
+    str.toString();
+});
+
+bench("String", function() {
+    String(str);
+    String(str);
+    String(str);
+});
+
+bench("new String", function() {
+    new String(str);
+    new String(str);
+    new String(str);
+});

From c2bdb49b7593e7abeb4ab8d86f20648d6eaaa1bf Mon Sep 17 00:00:00 2001
From: James Laskey <james.laskey@oracle.com>
Date: Thu, 24 Jan 2013 12:15:29 -0400
Subject: [PATCH 089/311] 8006852: Move tests from JIRA for prepopulated map
 failures

Reviewed-by: sundar
---
 nashorn/test/script/basic/JDK-8006852a.js     | 50 +++++++++++++++++++
 .../script/basic/JDK-8006852a.js.EXPECTED     |  6 +++
 nashorn/test/script/basic/JDK-8006852b.js     | 48 ++++++++++++++++++
 3 files changed, 104 insertions(+)
 create mode 100644 nashorn/test/script/basic/JDK-8006852a.js
 create mode 100644 nashorn/test/script/basic/JDK-8006852a.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/JDK-8006852b.js

diff --git a/nashorn/test/script/basic/JDK-8006852a.js b/nashorn/test/script/basic/JDK-8006852a.js
new file mode 100644
index 00000000000..7e706bd7aa3
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8006852a.js
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8006852 : Move tests from JIRA for prepopulated map failures
+ *
+ * @test
+ * @run
+ */
+ 
+function Field(val){                                                                                                                                                                                                                                          
+    this.value = val;                                                                                                                                                                                                                                         
+}                                                                                                                                                                                                                                                             
+var times = 0;                                                                                                                                                                                                                                                
+                                                                                                                                                                                                                                                              
+Field.prototype = {                                                                                                                                                                                                                                           
+    get value(){                                                                                                                                                                                                                                              
+        print("GETTER!");                                                                                                                                                                                                                                     
+        return this._value;                                                                                                                                                                                                                                   
+    },                                                                                                                                                                                                                                                        
+    set value(val){                                                                                                                                                                                                                                           
+        print("SETTER!");                                                                                                                                                                                                                                     
+        this._value = val + (++times);                                                                                                                                                                                                                        
+    }                                                                                                                                                                                                                                                         
+};                                                                                                                                                                                                                                                            
+                                                                                                                                                                                                                                                              
+var f = new Field("test");                                                                                                                                                                                                                                    
+print(f.value);                                                                                                                                                                                                                                               
+f.value = "test2";                                                                                                                                                                                                                                            
+print(f.value);
diff --git a/nashorn/test/script/basic/JDK-8006852a.js.EXPECTED b/nashorn/test/script/basic/JDK-8006852a.js.EXPECTED
new file mode 100644
index 00000000000..1e4a83a3668
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8006852a.js.EXPECTED
@@ -0,0 +1,6 @@
+SETTER!
+GETTER!
+test1
+SETTER!
+GETTER!
+test22
diff --git a/nashorn/test/script/basic/JDK-8006852b.js b/nashorn/test/script/basic/JDK-8006852b.js
new file mode 100644
index 00000000000..2d0c4b6dffd
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8006852b.js
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8006852 : Move tests from JIRA for prepopulated map failures
+ *
+ * @test
+ * @run
+ */
+ 
+function MyCons(arg) {
+    if (arg == 2) {
+       this.foo = 3;
+    }
+    this.bar = 44;
+    // print(Debug.map(this));
+}
+
+MyCons.prototype.foo = "proto--foo";
+
+var myObj = new MyCons();
+if (myObj.hasOwnProperty("foo")) {
+    print("FAILED: myObj should not have 'foo'");
+}
+
+if (myObj.foo !== 'proto--foo') {
+    print("FAILED: myObj.foo is wrong");
+}

From 5231fef61c279751345ab5a0f695c3a2f97baba9 Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Thu, 24 Jan 2013 22:38:58 +0530
Subject: [PATCH 090/311] 8006857: ClassCastException when interface
 implementing function uses arguments object

Reviewed-by: jlaskey, lagergren
---
 .../internal/runtime/ScriptObject.java        |  2 +-
 nashorn/test/script/basic/JDK-8006857.js      | 48 +++++++++++++++++++
 .../test/script/basic/JDK-8006857.js.EXPECTED |  4 ++
 3 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 nashorn/test/script/basic/JDK-8006857.js
 create mode 100644 nashorn/test/script/basic/JDK-8006857.js.EXPECTED

diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
index 8a5736b3109..f2595340e80 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
@@ -2076,7 +2076,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
         final int parameterCount = methodType.parameterCount();
         final int callCount      = callType.parameterCount();
 
-        final boolean isCalleeVarArg = parameterCount > 1 && methodType.parameterType(parameterCount - 1).isArray();
+        final boolean isCalleeVarArg = parameterCount > 0 && methodType.parameterType(parameterCount - 1).isArray();
         final boolean isCallerVarArg = callerVarArg != null ? callerVarArg.booleanValue() : (callCount > 1 &&
                 callType.parameterType(callCount - 1).isArray());
 
diff --git a/nashorn/test/script/basic/JDK-8006857.js b/nashorn/test/script/basic/JDK-8006857.js
new file mode 100644
index 00000000000..c65146404f8
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8006857.js
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8006857: ClassCastException when interface implementing function uses arguments object
+ *
+ * @test
+ * @run
+ */
+
+
+function run() {
+    print(arguments);
+    print("in run");
+}
+
+var t = new java.lang.Thread(run);
+t.start();
+t.join();
+
+var r = new java.lang.Runnable() {
+        run: function() {
+            print(arguments);
+            print("in run");
+        }
+    };
+
+r.run();
diff --git a/nashorn/test/script/basic/JDK-8006857.js.EXPECTED b/nashorn/test/script/basic/JDK-8006857.js.EXPECTED
new file mode 100644
index 00000000000..cfe8346624d
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8006857.js.EXPECTED
@@ -0,0 +1,4 @@
+[object Arguments]
+in run
+[object Arguments]
+in run

From 7cb8f824d3f46cf6d3dd1066d7ceb4a0747cde8d Mon Sep 17 00:00:00 2001
From: Mandy Chung <mchung@openjdk.org>
Date: Mon, 28 Jan 2013 15:53:29 -0800
Subject: [PATCH 091/311] 8006882: Proxy generated classes in sun.proxy package
 breaks JMockit

Reviewed-by: alanb, ahgross
---
 jdk/src/share/classes/java/lang/reflect/Proxy.java      | 2 +-
 jdk/src/share/classes/sun/reflect/misc/ReflectUtil.java | 4 +++-
 jdk/src/share/lib/security/java.security-linux          | 2 ++
 jdk/src/share/lib/security/java.security-macosx         | 2 ++
 jdk/src/share/lib/security/java.security-solaris        | 2 ++
 jdk/src/share/lib/security/java.security-windows        | 2 ++
 6 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/jdk/src/share/classes/java/lang/reflect/Proxy.java b/jdk/src/share/classes/java/lang/reflect/Proxy.java
index 5e0c31f2de0..e946ba3226d 100644
--- a/jdk/src/share/classes/java/lang/reflect/Proxy.java
+++ b/jdk/src/share/classes/java/lang/reflect/Proxy.java
@@ -609,7 +609,7 @@ public class Proxy implements java.io.Serializable {
             }
 
             if (proxyPkg == null) {
-                // if no non-public proxy interfaces, use sun.proxy package
+                // if no non-public proxy interfaces, use com.sun.proxy package
                 proxyPkg = ReflectUtil.PROXY_PACKAGE + ".";
             }
 
diff --git a/jdk/src/share/classes/sun/reflect/misc/ReflectUtil.java b/jdk/src/share/classes/sun/reflect/misc/ReflectUtil.java
index 84ab06b080a..0640d92e5d0 100644
--- a/jdk/src/share/classes/sun/reflect/misc/ReflectUtil.java
+++ b/jdk/src/share/classes/sun/reflect/misc/ReflectUtil.java
@@ -202,5 +202,7 @@ public final class ReflectUtil {
         }
     }
 
-    public static final String PROXY_PACKAGE = "sun.proxy";
+    // Note that bytecode instrumentation tools may exclude 'sun.*'
+    // classes but not generated proxy classes and so keep it in com.sun.*
+    public static final String PROXY_PACKAGE = "com.sun.proxy";
 }
diff --git a/jdk/src/share/lib/security/java.security-linux b/jdk/src/share/lib/security/java.security-linux
index cdda1b47699..c37bb480eb6 100644
--- a/jdk/src/share/lib/security/java.security-linux
+++ b/jdk/src/share/lib/security/java.security-linux
@@ -153,6 +153,7 @@ package.access=sun.,\
                com.sun.istack.internal.,\
                com.sun.jmx.defaults.,\
                com.sun.jmx.remote.util.,\
+               com.sun.proxy.,\
                com.sun.org.apache.xerces.internal.utils.,\
                com.sun.org.apache.xalan.internal.utils.,\
                com.sun.org.glassfish.external.,\
@@ -177,6 +178,7 @@ package.definition=sun.,\
                    com.sun.istack.internal.,\
                    com.sun.jmx.defaults.,\
                    com.sun.jmx.remote.util.,\
+                   com.sun.proxy.,\
                    com.sun.org.apache.xerces.internal.utils.,\
                    com.sun.org.apache.xalan.internal.utils.,\
                    com.sun.org.glassfish.external.,\
diff --git a/jdk/src/share/lib/security/java.security-macosx b/jdk/src/share/lib/security/java.security-macosx
index 515141de81b..ffb99c06936 100644
--- a/jdk/src/share/lib/security/java.security-macosx
+++ b/jdk/src/share/lib/security/java.security-macosx
@@ -154,6 +154,7 @@ package.access=sun.,\
                com.sun.istack.internal.,\
                com.sun.jmx.defaults.,\
                com.sun.jmx.remote.util.,\
+               com.sun.proxy.,\
                com.sun.org.apache.xerces.internal.utils.,\
                com.sun.org.apache.xalan.internal.utils.,\
                com.sun.org.glassfish.external.,\
@@ -179,6 +180,7 @@ package.definition=sun.,\
                    com.sun.istack.internal.,\
                    com.sun.jmx.defaults.,\
                    com.sun.jmx.remote.util.,\
+                   com.sun.proxy.,\
                    com.sun.org.apache.xerces.internal.utils.,\
                    com.sun.org.apache.xalan.internal.utils.,\
                    com.sun.org.glassfish.external.,\
diff --git a/jdk/src/share/lib/security/java.security-solaris b/jdk/src/share/lib/security/java.security-solaris
index 2cccc0d455b..4236643f55e 100644
--- a/jdk/src/share/lib/security/java.security-solaris
+++ b/jdk/src/share/lib/security/java.security-solaris
@@ -155,6 +155,7 @@ package.access=sun.,\
                com.sun.istack.internal.,\
                com.sun.jmx.defaults.,\
                com.sun.jmx.remote.util.,\
+               com.sun.proxy.,\
                com.sun.org.apache.xerces.internal.utils.,\
                com.sun.org.apache.xalan.internal.utils.,\
                com.sun.org.glassfish.external.,\
@@ -179,6 +180,7 @@ package.definition=sun.,\
                    com.sun.istack.internal.,\
                    com.sun.jmx.defaults.,\
                    com.sun.jmx.remote.util.,\
+                   com.sun.proxy.,\
                    com.sun.org.apache.xerces.internal.utils.,\
                    com.sun.org.apache.xalan.internal.utils.,\
                    com.sun.org.glassfish.external.,\
diff --git a/jdk/src/share/lib/security/java.security-windows b/jdk/src/share/lib/security/java.security-windows
index b6281f741a1..89ec5678646 100644
--- a/jdk/src/share/lib/security/java.security-windows
+++ b/jdk/src/share/lib/security/java.security-windows
@@ -154,6 +154,7 @@ package.access=sun.,\
                com.sun.istack.internal.,\
                com.sun.jmx.defaults.,\
                com.sun.jmx.remote.util.,\
+               com.sun.proxy.,\
                com.sun.org.apache.xerces.internal.utils.,\
                com.sun.org.apache.xalan.internal.utils.,\
                com.sun.org.glassfish.external.,\
@@ -178,6 +179,7 @@ package.definition=sun.,\
                    com.sun.istack.internal.,\
                    com.sun.jmx.defaults.,\
                    com.sun.jmx.remote.util.,\
+                   com.sun.proxy.,\
                    com.sun.org.apache.xerces.internal.utils.,\
                    com.sun.org.apache.xalan.internal.utils.,\
                    com.sun.org.glassfish.external.,\

From 7303280ef5e99aff51f0e1bdcbdbcb66bb7f226e Mon Sep 17 00:00:00 2001
From: Daniel Fuchs <dfuchs@openjdk.org>
Date: Wed, 30 Jan 2013 11:33:51 +0100
Subject: [PATCH 092/311] 8006446: Restrict MBeanServer access

Reviewed-by: alanb, mchung, darcy, jrose, ahgross, skoivu
---
 .../ClassLoaderRepositorySupport.java         |  2 ++
 .../sun/jmx/mbeanserver/JmxMBeanServer.java   | 10 ++++++
 .../jmx/mbeanserver/MBeanInstantiator.java    | 34 ++++++++++++++++---
 .../com/sun/jmx/mbeanserver/MBeanSupport.java |  2 ++
 .../lang/management/ManagementFactory.java    | 18 +++++-----
 .../share/lib/security/java.security-linux    |  6 ++--
 .../share/lib/security/java.security-macosx   |  6 ++--
 .../share/lib/security/java.security-solaris  |  6 ++--
 .../share/lib/security/java.security-windows  |  6 ++--
 .../SubjectDelegation2Test.java               |  6 ++--
 .../SubjectDelegation3Test.java               |  6 ++--
 11 files changed, 67 insertions(+), 35 deletions(-)

diff --git a/jdk/src/share/classes/com/sun/jmx/mbeanserver/ClassLoaderRepositorySupport.java b/jdk/src/share/classes/com/sun/jmx/mbeanserver/ClassLoaderRepositorySupport.java
index 728fb12a7e8..9fc0e7dbe9e 100644
--- a/jdk/src/share/classes/com/sun/jmx/mbeanserver/ClassLoaderRepositorySupport.java
+++ b/jdk/src/share/classes/com/sun/jmx/mbeanserver/ClassLoaderRepositorySupport.java
@@ -36,6 +36,7 @@ import java.util.logging.Level;
 
 import javax.management.ObjectName;
 import javax.management.loading.PrivateClassLoader;
+import sun.reflect.misc.ReflectUtil;
 
 /**
  * This class keeps the list of Class Loaders registered in the MBean Server.
@@ -192,6 +193,7 @@ final class ClassLoaderRepositorySupport
                                final ClassLoader without,
                                final ClassLoader stop)
             throws ClassNotFoundException {
+        ReflectUtil.checkPackageAccess(className);
         final int size = list.length;
         for(int i=0; i<size; i++) {
             try {
diff --git a/jdk/src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java b/jdk/src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java
index cd2bd63c0e3..69228b766c0 100644
--- a/jdk/src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java
+++ b/jdk/src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java
@@ -51,6 +51,7 @@ import javax.management.MBeanPermission;
 import javax.management.MBeanRegistrationException;
 import javax.management.MBeanServer;
 import javax.management.MBeanServerDelegate;
+import javax.management.MBeanServerPermission;
 import javax.management.NotCompliantMBeanException;
 import javax.management.NotificationFilter;
 import javax.management.NotificationListener;
@@ -1409,6 +1410,8 @@ public final class JmxMBeanServer
         // Default is true.
         final boolean fairLock = DEFAULT_FAIR_LOCK_POLICY;
 
+        checkNewMBeanServerPermission();
+
         // This constructor happens to disregard the value of the interceptors
         // flag - that is, it always uses the default value - false.
         // This is admitedly a bug, but we chose not to fix it for now
@@ -1494,4 +1497,11 @@ public final class JmxMBeanServer
         }
     }
 
+    private static void checkNewMBeanServerPermission() {
+        SecurityManager sm = System.getSecurityManager();
+        if (sm != null) {
+            Permission perm = new MBeanServerPermission("newMBeanServer");
+            sm.checkPermission(perm);
+        }
+    }
 }
diff --git a/jdk/src/share/classes/com/sun/jmx/mbeanserver/MBeanInstantiator.java b/jdk/src/share/classes/com/sun/jmx/mbeanserver/MBeanInstantiator.java
index 557aed43f89..ab62660be49 100644
--- a/jdk/src/share/classes/com/sun/jmx/mbeanserver/MBeanInstantiator.java
+++ b/jdk/src/share/classes/com/sun/jmx/mbeanserver/MBeanInstantiator.java
@@ -32,11 +32,13 @@ import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
+import java.security.Permission;
 import java.util.Map;
 import java.util.logging.Level;
 
 import javax.management.InstanceNotFoundException;
 import javax.management.MBeanException;
+import javax.management.MBeanPermission;
 import javax.management.NotCompliantMBeanException;
 import javax.management.ObjectName;
 import javax.management.OperationsException;
@@ -44,7 +46,7 @@ import javax.management.ReflectionException;
 import javax.management.RuntimeErrorException;
 import javax.management.RuntimeMBeanException;
 import javax.management.RuntimeOperationsException;
-
+import sun.reflect.misc.ConstructorUtil;
 import sun.reflect.misc.ReflectUtil;
 
 /**
@@ -56,7 +58,6 @@ import sun.reflect.misc.ReflectUtil;
  * @since 1.5
  */
 public class MBeanInstantiator {
-
     private final ModifiableClassLoaderRepository clr;
     //    private MetaData meta = null;
 
@@ -88,6 +89,7 @@ public class MBeanInstantiator {
                              "Exception occurred during object instantiation");
         }
 
+        ReflectUtil.checkPackageAccess(className);
         try {
             if (clr == null) throw new ClassNotFoundException(className);
             theClass = clr.loadClass(className);
@@ -162,6 +164,7 @@ public class MBeanInstantiator {
                     continue;
                 }
 
+                ReflectUtil.checkPackageAccess(signature[i]);
                 // Ok we do not have a primitive type ! We need to build
                 // the signature of the method
                 //
@@ -205,6 +208,9 @@ public class MBeanInstantiator {
      */
     public Object instantiate(Class<?> theClass)
         throws ReflectionException, MBeanException {
+
+        checkMBeanPermission(theClass, null, null, "instantiate");
+
         Object moi;
 
 
@@ -260,6 +266,9 @@ public class MBeanInstantiator {
     public Object instantiate(Class<?> theClass, Object params[],
                               String signature[], ClassLoader loader)
         throws ReflectionException, MBeanException {
+
+        checkMBeanPermission(theClass, null, null, "instantiate");
+
         // Instantiate the new object
 
         // ------------------------------
@@ -407,6 +416,8 @@ public class MBeanInstantiator {
             throw new  RuntimeOperationsException(new
              IllegalArgumentException(), "Null className passed in parameter");
         }
+
+        ReflectUtil.checkPackageAccess(className);
         Class<?> theClass;
         if (loaderName == null) {
             // Load the class using the agent class loader
@@ -619,13 +630,13 @@ public class MBeanInstantiator {
      **/
     static Class<?> loadClass(String className, ClassLoader loader)
         throws ReflectionException {
-
         Class<?> theClass;
         if (className == null) {
             throw new RuntimeOperationsException(new
                 IllegalArgumentException("The class name cannot be null"),
                               "Exception occurred during object instantiation");
         }
+        ReflectUtil.checkPackageAccess(className);
         try {
             if (loader == null)
                 loader = MBeanInstantiator.class.getClassLoader();
@@ -676,6 +687,7 @@ public class MBeanInstantiator {
                 // We need to load the class through the class
                 // loader of the target object.
                 //
+                ReflectUtil.checkPackageAccess(signature[i]);
                 tab[i] = Class.forName(signature[i], false, aLoader);
             }
         } catch (ClassNotFoundException e) {
@@ -701,7 +713,7 @@ public class MBeanInstantiator {
 
     private Constructor<?> findConstructor(Class<?> c, Class<?>[] params) {
         try {
-            return c.getConstructor(params);
+            return ConstructorUtil.getConstructor(c, params);
         } catch (Exception e) {
             return null;
         }
@@ -715,4 +727,18 @@ public class MBeanInstantiator {
                                           char.class, boolean.class})
             primitiveClasses.put(c.getName(), c);
     }
+
+    private static void checkMBeanPermission(Class<?> clazz,
+                                             String member,
+                                             ObjectName objectName,
+                                             String actions) {
+        SecurityManager sm = System.getSecurityManager();
+        if (clazz != null && sm != null) {
+            Permission perm = new MBeanPermission(clazz.getName(),
+                                                  member,
+                                                  objectName,
+                                                  actions);
+            sm.checkPermission(perm);
+        }
+    }
 }
diff --git a/jdk/src/share/classes/com/sun/jmx/mbeanserver/MBeanSupport.java b/jdk/src/share/classes/com/sun/jmx/mbeanserver/MBeanSupport.java
index 8109365e8d4..3af4b8b86d7 100644
--- a/jdk/src/share/classes/com/sun/jmx/mbeanserver/MBeanSupport.java
+++ b/jdk/src/share/classes/com/sun/jmx/mbeanserver/MBeanSupport.java
@@ -38,6 +38,7 @@ import javax.management.NotCompliantMBeanException;
 import javax.management.ObjectName;
 import javax.management.ReflectionException;
 import com.sun.jmx.mbeanserver.MXBeanMappingFactory;
+import sun.reflect.misc.ReflectUtil;
 
 /**
  * Base class for MBeans.  There is one instance of this class for
@@ -131,6 +132,7 @@ public abstract class MBeanSupport<M>
                 " is not an instance of " + mbeanInterfaceType.getName();
             throw new NotCompliantMBeanException(msg);
         }
+        ReflectUtil.checkPackageAccess(mbeanInterfaceType);
         this.resource = resource;
         MBeanIntrospector<M> introspector = getMBeanIntrospector();
         this.perInterface = introspector.getPerInterface(mbeanInterfaceType);
diff --git a/jdk/src/share/classes/java/lang/management/ManagementFactory.java b/jdk/src/share/classes/java/lang/management/ManagementFactory.java
index d99333c9e11..278ace1d7d1 100644
--- a/jdk/src/share/classes/java/lang/management/ManagementFactory.java
+++ b/jdk/src/share/classes/java/lang/management/ManagementFactory.java
@@ -802,20 +802,20 @@ public class ManagementFactory {
      */
     private static void addMXBean(final MBeanServer mbs, final PlatformManagedObject pmo) {
         // Make DynamicMBean out of MXBean by wrapping it with a StandardMBean
-        final DynamicMBean dmbean;
-        if (pmo instanceof DynamicMBean) {
-            dmbean = DynamicMBean.class.cast(pmo);
-        } else if (pmo instanceof NotificationEmitter) {
-            dmbean = new StandardEmitterMBean(pmo, null, true, (NotificationEmitter) pmo);
-        } else {
-            dmbean = new StandardMBean(pmo, null, true);
-        }
-
         try {
             AccessController.doPrivileged(new PrivilegedExceptionAction<Void>() {
                 public Void run() throws InstanceAlreadyExistsException,
                                          MBeanRegistrationException,
                                          NotCompliantMBeanException {
+                    final DynamicMBean dmbean;
+                    if (pmo instanceof DynamicMBean) {
+                        dmbean = DynamicMBean.class.cast(pmo);
+                    } else if (pmo instanceof NotificationEmitter) {
+                        dmbean = new StandardEmitterMBean(pmo, null, true, (NotificationEmitter) pmo);
+                    } else {
+                        dmbean = new StandardMBean(pmo, null, true);
+                    }
+
                     mbs.registerMBean(dmbean, pmo.getObjectName());
                     return null;
                 }
diff --git a/jdk/src/share/lib/security/java.security-linux b/jdk/src/share/lib/security/java.security-linux
index c37bb480eb6..8fc53d73677 100644
--- a/jdk/src/share/lib/security/java.security-linux
+++ b/jdk/src/share/lib/security/java.security-linux
@@ -151,8 +151,7 @@ package.access=sun.,\
                com.sun.xml.internal.ws.,\
                com.sun.imageio.,\
                com.sun.istack.internal.,\
-               com.sun.jmx.defaults.,\
-               com.sun.jmx.remote.util.,\
+               com.sun.jmx.,\
                com.sun.proxy.,\
                com.sun.org.apache.xerces.internal.utils.,\
                com.sun.org.apache.xalan.internal.utils.,\
@@ -176,8 +175,7 @@ package.definition=sun.,\
                    com.sun.xml.internal.ws.,\
                    com.sun.imageio.,\
                    com.sun.istack.internal.,\
-                   com.sun.jmx.defaults.,\
-                   com.sun.jmx.remote.util.,\
+                   com.sun.jmx.,\
                    com.sun.proxy.,\
                    com.sun.org.apache.xerces.internal.utils.,\
                    com.sun.org.apache.xalan.internal.utils.,\
diff --git a/jdk/src/share/lib/security/java.security-macosx b/jdk/src/share/lib/security/java.security-macosx
index ffb99c06936..5a319fa5445 100644
--- a/jdk/src/share/lib/security/java.security-macosx
+++ b/jdk/src/share/lib/security/java.security-macosx
@@ -152,8 +152,7 @@ package.access=sun.,\
                com.sun.xml.internal.ws.,\
                com.sun.imageio.,\
                com.sun.istack.internal.,\
-               com.sun.jmx.defaults.,\
-               com.sun.jmx.remote.util.,\
+               com.sun.jmx.,\
                com.sun.proxy.,\
                com.sun.org.apache.xerces.internal.utils.,\
                com.sun.org.apache.xalan.internal.utils.,\
@@ -178,8 +177,7 @@ package.definition=sun.,\
                    com.sun.xml.internal.ws.,\
                    com.sun.imageio.,\
                    com.sun.istack.internal.,\
-                   com.sun.jmx.defaults.,\
-                   com.sun.jmx.remote.util.,\
+                   com.sun.jmx.,\
                    com.sun.proxy.,\
                    com.sun.org.apache.xerces.internal.utils.,\
                    com.sun.org.apache.xalan.internal.utils.,\
diff --git a/jdk/src/share/lib/security/java.security-solaris b/jdk/src/share/lib/security/java.security-solaris
index 4236643f55e..2a781cff75d 100644
--- a/jdk/src/share/lib/security/java.security-solaris
+++ b/jdk/src/share/lib/security/java.security-solaris
@@ -153,8 +153,7 @@ package.access=sun.,\
                com.sun.xml.internal.ws.,\
                com.sun.imageio.,\
                com.sun.istack.internal.,\
-               com.sun.jmx.defaults.,\
-               com.sun.jmx.remote.util.,\
+               com.sun.jmx.,\
                com.sun.proxy.,\
                com.sun.org.apache.xerces.internal.utils.,\
                com.sun.org.apache.xalan.internal.utils.,\
@@ -178,8 +177,7 @@ package.definition=sun.,\
                    com.sun.xml.internal.ws.,\
                    com.sun.imageio.,\
                    com.sun.istack.internal.,\
-                   com.sun.jmx.defaults.,\
-                   com.sun.jmx.remote.util.,\
+                   com.sun.jmx.,\
                    com.sun.proxy.,\
                    com.sun.org.apache.xerces.internal.utils.,\
                    com.sun.org.apache.xalan.internal.utils.,\
diff --git a/jdk/src/share/lib/security/java.security-windows b/jdk/src/share/lib/security/java.security-windows
index 89ec5678646..a00f4628dd6 100644
--- a/jdk/src/share/lib/security/java.security-windows
+++ b/jdk/src/share/lib/security/java.security-windows
@@ -152,8 +152,7 @@ package.access=sun.,\
                com.sun.xml.internal.ws.,\
                com.sun.imageio.,\
                com.sun.istack.internal.,\
-               com.sun.jmx.defaults.,\
-               com.sun.jmx.remote.util.,\
+               com.sun.jmx.,\
                com.sun.proxy.,\
                com.sun.org.apache.xerces.internal.utils.,\
                com.sun.org.apache.xalan.internal.utils.,\
@@ -177,8 +176,7 @@ package.definition=sun.,\
                    com.sun.xml.internal.ws.,\
                    com.sun.imageio.,\
                    com.sun.istack.internal.,\
-                   com.sun.jmx.defaults.,\
-                   com.sun.jmx.remote.util.,\
+                   com.sun.jmx.,\
                    com.sun.proxy.,\
                    com.sun.org.apache.xerces.internal.utils.,\
                    com.sun.org.apache.xalan.internal.utils.,\
diff --git a/jdk/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation2Test.java b/jdk/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation2Test.java
index ff56c46fbd2..d91ae14ba57 100644
--- a/jdk/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation2Test.java
+++ b/jdk/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation2Test.java
@@ -119,9 +119,6 @@ public class SubjectDelegation2Test {
             System.out.println("Create SimpleStandard MBean");
             SimpleStandard s = new SimpleStandard("monitorRole");
             mbs.registerMBean(s, new ObjectName("MBeans:type=SimpleStandard"));
-            // Set Security Manager
-            //
-            System.setSecurityManager(new SecurityManager());
             // Create Properties containing the username/password entries
             //
             Properties props = new Properties();
@@ -132,6 +129,9 @@ public class SubjectDelegation2Test {
             HashMap env = new HashMap();
             env.put("jmx.remote.authenticator",
                     new JMXPluggableAuthenticator(props));
+            // Set Security Manager
+            //
+            System.setSecurityManager(new SecurityManager());
             // Create an RMI connector server
             //
             System.out.println("Create an RMI connector server");
diff --git a/jdk/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation3Test.java b/jdk/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation3Test.java
index b3a004e0467..de169987796 100644
--- a/jdk/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation3Test.java
+++ b/jdk/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation3Test.java
@@ -120,9 +120,6 @@ public class SubjectDelegation3Test {
             System.out.println("Create SimpleStandard MBean");
             SimpleStandard s = new SimpleStandard("delegate");
             mbs.registerMBean(s, new ObjectName("MBeans:type=SimpleStandard"));
-            // Set Security Manager
-            //
-            System.setSecurityManager(new SecurityManager());
             // Create Properties containing the username/password entries
             //
             Properties props = new Properties();
@@ -133,6 +130,9 @@ public class SubjectDelegation3Test {
             HashMap env = new HashMap();
             env.put("jmx.remote.authenticator",
                     new JMXPluggableAuthenticator(props));
+            // Set Security Manager
+            //
+            System.setSecurityManager(new SecurityManager());
             // Create an RMI connector server
             //
             System.out.println("Create an RMI connector server");

From fad9c0e89cf9e887aa6f04e1055a8b6c3248e5ad Mon Sep 17 00:00:00 2001
From: Mandy Chung <mchung@openjdk.org>
Date: Thu, 24 Jan 2013 16:45:38 -0800
Subject: [PATCH 093/311] 8004937: Improve proxy construction

Reviewed-by: jrose, ahgross
---
 .../java/lang/invoke/MethodHandleNatives.java |  2 ++
 .../java/lang/invoke/MethodHandleProxies.java | 25 ++++++++++++++-----
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java b/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java
index fcc928a327d..8f1d0c3164e 100644
--- a/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java
+++ b/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java
@@ -476,6 +476,8 @@ class MethodHandleNatives {
         case "getProxyClass":
         case "newProxyInstance":
             return defc == java.lang.reflect.Proxy.class;
+        case "asInterfaceInstance":
+            return defc == java.lang.invoke.MethodHandleProxies.class;
         case "getBundle":
         case "clearCache":
             return defc == java.util.ResourceBundle.class;
diff --git a/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java b/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java
index b000116d875..ade1630dcfb 100644
--- a/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java
+++ b/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java
@@ -141,12 +141,15 @@ public class MethodHandleProxies {
     <T> T asInterfaceInstance(final Class<T> intfc, final MethodHandle target) {
         if (!intfc.isInterface() || !Modifier.isPublic(intfc.getModifiers()))
             throw new IllegalArgumentException("not a public interface: "+intfc.getName());
-        SecurityManager smgr = System.getSecurityManager();
-        if (smgr != null) {
+        final MethodHandle mh;
+        if (System.getSecurityManager() != null) {
             final int CALLER_FRAME = 2; // 0: Reflection, 1: asInterfaceInstance, 2: caller
             final Class<?> caller = Reflection.getCallerClass(CALLER_FRAME);
-            final ClassLoader ccl = caller.getClassLoader();
+            final ClassLoader ccl = caller != null ? caller.getClassLoader() : null;
             ReflectUtil.checkProxyPackageAccess(ccl, intfc);
+            mh = ccl != null ? bindCaller(target, caller) : target;
+        } else {
+            mh = target;
         }
         ClassLoader proxyLoader = intfc.getClassLoader();
         if (proxyLoader == null) {
@@ -160,7 +163,7 @@ public class MethodHandleProxies {
         for (int i = 0; i < methods.length; i++) {
             Method sm = methods[i];
             MethodType smMT = MethodType.methodType(sm.getReturnType(), sm.getParameterTypes());
-            MethodHandle checkTarget = target.asType(smMT);  // make throw WMT
+            MethodHandle checkTarget = mh.asType(smMT);  // make throw WMT
             checkTarget = checkTarget.asType(checkTarget.type().changeReturnType(Object.class));
             vaTargets[i] = checkTarget.asSpreader(Object[].class, smMT.parameterCount());
         }
@@ -183,8 +186,8 @@ public class MethodHandleProxies {
                 }
             };
 
-        Object proxy;
-        if (smgr != null) {
+        final Object proxy;
+        if (System.getSecurityManager() != null) {
             // sun.invoke.WrapperInstance is a restricted interface not accessible
             // by any non-null class loader.
             final ClassLoader loader = proxyLoader;
@@ -204,6 +207,16 @@ public class MethodHandleProxies {
         return intfc.cast(proxy);
     }
 
+    private static MethodHandle bindCaller(MethodHandle target, Class<?> hostClass) {
+        MethodHandle cbmh = MethodHandleImpl.bindCaller(target, hostClass);
+        if (target.isVarargsCollector()) {
+            MethodType type = cbmh.type();
+            int arity = type.parameterCount();
+            return cbmh.asVarargsCollector(type.parameterType(arity-1));
+        }
+        return cbmh;
+    }
+
     /**
      * Determines if the given object was produced by a call to {@link #asInterfaceInstance asInterfaceInstance}.
      * @param x any reference

From 327a6cf1b7ab2ada424630682d92b289c147d00e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Fri, 25 Jan 2013 17:35:31 +0100
Subject: [PATCH 094/311] 8006766: Array-like access to characters of a string
 is slow

Reviewed-by: lagergren, attila
---
 .../jdk/nashorn/internal/objects/Global.java  | 25 +++----
 .../internal/objects/NativeBoolean.java       |  8 +--
 .../internal/objects/NativeJSAdapter.java     | 13 ++--
 .../internal/objects/NativeJavaImporter.java  |  9 +--
 .../internal/objects/NativeNumber.java        |  8 +--
 .../internal/objects/NativeString.java        | 62 ++++++++++++++--
 .../internal/runtime/GlobalObject.java        | 27 ++-----
 .../internal/runtime/NativeJavaPackage.java   | 10 +--
 .../internal/runtime/ScriptFunction.java      | 26 ++++++-
 .../internal/runtime/ScriptObject.java        | 71 +++++++++----------
 .../nashorn/internal/runtime/WithObject.java  | 13 ++--
 .../runtime/linker/NashornLinker.java         | 28 +-------
 .../linker/NashornPrimitiveLinker.java        |  9 +--
 .../runtime/linker/PrimitiveLookup.java       | 24 ++++---
 14 files changed, 179 insertions(+), 154 deletions(-)

diff --git a/nashorn/src/jdk/nashorn/internal/objects/Global.java b/nashorn/src/jdk/nashorn/internal/objects/Global.java
index 28b5b5ac6f7..47b39875e9b 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/Global.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/Global.java
@@ -55,9 +55,9 @@ import jdk.nashorn.internal.runtime.ScriptRuntime;
 import jdk.nashorn.internal.runtime.ScriptingFunctions;
 import jdk.nashorn.internal.runtime.Source;
 import jdk.nashorn.internal.runtime.linker.InvokeByName;
-import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
 import jdk.nashorn.internal.scripts.JO$;
 import org.dynalang.dynalink.linker.GuardedInvocation;
+import org.dynalang.dynalink.linker.LinkRequest;
 
 /**
  * Representation of global scope.
@@ -427,22 +427,19 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
         } else if (obj instanceof Boolean) {
             return NativeBoolean.WRAPFILTER;
         }
-        throw new IllegalArgumentException("Unsupported primitive value: " + obj);
+        throw new IllegalArgumentException("Unsupported primitive: " + obj);
     }
 
     @Override
-    public GuardedInvocation numberLookup(final NashornCallSiteDescriptor callSite, final Number self) {
-        return NativeNumber.lookupPrimitive(callSite, self);
-    }
-
-    @Override
-    public GuardedInvocation stringLookup(final NashornCallSiteDescriptor callSite, final CharSequence self) {
-        return NativeString.lookupPrimitive(callSite, self);
-    }
-
-    @Override
-    public GuardedInvocation booleanLookup(final NashornCallSiteDescriptor callSite, final Boolean self) {
-        return NativeBoolean.lookupPrimitive(callSite, self);
+    public GuardedInvocation primitiveLookup(final LinkRequest request, final Object self) {
+        if (self instanceof String || self instanceof ConsString) {
+            return NativeString.lookupPrimitive(request, self);
+        } else if (self instanceof Number) {
+            return NativeNumber.lookupPrimitive(request, self);
+        } else if (self instanceof Boolean) {
+            return NativeBoolean.lookupPrimitive(request, self);
+        }
+        throw new IllegalArgumentException("Unsupported primitive: " + self);
     }
 
     @Override
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeBoolean.java b/nashorn/src/jdk/nashorn/internal/objects/NativeBoolean.java
index 3510c4eb10d..4592ad91f4b 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeBoolean.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeBoolean.java
@@ -38,9 +38,9 @@ import jdk.nashorn.internal.runtime.JSType;
 import jdk.nashorn.internal.runtime.ScriptObject;
 import jdk.nashorn.internal.runtime.ScriptRuntime;
 import jdk.nashorn.internal.runtime.linker.MethodHandleFactory;
-import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
 import jdk.nashorn.internal.runtime.linker.PrimitiveLookup;
 import org.dynalang.dynalink.linker.GuardedInvocation;
+import org.dynalang.dynalink.linker.LinkRequest;
 
 /**
  * ECMA 15.6 Boolean Objects.
@@ -153,12 +153,12 @@ public final class NativeBoolean extends ScriptObject {
     /**
      * Lookup the appropriate method for an invoke dynamic call.
      *
-     * @param desc     The invoke dynamic callsite descriptor.
+     * @param request  The link request
      * @param receiver The receiver for the call
      * @return Link to be invoked at call site.
      */
-    public static GuardedInvocation lookupPrimitive(final NashornCallSiteDescriptor desc, final Object receiver) {
-        return PrimitiveLookup.lookupPrimitive(desc, Boolean.class, new NativeBoolean((Boolean)receiver), WRAPFILTER);
+    public static GuardedInvocation lookupPrimitive(final LinkRequest request, final Object receiver) {
+        return PrimitiveLookup.lookupPrimitive(request, Boolean.class, new NativeBoolean((Boolean)receiver), WRAPFILTER);
     }
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java b/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java
index be0e6e37560..a4eef8068ca 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java
@@ -47,6 +47,7 @@ import jdk.nashorn.internal.runtime.linker.Lookup;
 import jdk.nashorn.internal.runtime.linker.MethodHandleFactory;
 import org.dynalang.dynalink.CallSiteDescriptor;
 import org.dynalang.dynalink.linker.GuardedInvocation;
+import org.dynalang.dynalink.linker.LinkRequest;
 
 /**
  * This class is the implementation of the Nashorn-specific global object named {@code JSAdapter}. It can be
@@ -580,10 +581,10 @@ public final class NativeJSAdapter extends ScriptObject {
     }
 
     @Override
-    protected GuardedInvocation findCallMethodMethod(final CallSiteDescriptor desc, final boolean megaMorphic) {
+    protected GuardedInvocation findCallMethodMethod(final CallSiteDescriptor desc, final LinkRequest request) {
         if (overrides && super.hasOwnProperty(desc.getNameToken(2))) {
             try {
-                final GuardedInvocation inv = super.findCallMethodMethod(desc, megaMorphic);
+                final GuardedInvocation inv = super.findCallMethodMethod(desc, request);
                 if (inv != null) {
                     return inv;
                 }
@@ -596,11 +597,11 @@ public final class NativeJSAdapter extends ScriptObject {
     }
 
     @Override
-    protected GuardedInvocation findGetMethod(final CallSiteDescriptor desc, final boolean megaMorphic, final String operation) {
+    protected GuardedInvocation findGetMethod(final CallSiteDescriptor desc, final LinkRequest request, final String operation) {
         final String name = desc.getNameToken(CallSiteDescriptor.NAME_OPERAND);
         if (overrides && super.hasOwnProperty(name)) {
             try {
-                final GuardedInvocation inv = super.findGetMethod(desc, megaMorphic, operation);
+                final GuardedInvocation inv = super.findGetMethod(desc, request, operation);
                 if (inv != null) {
                     return inv;
                 }
@@ -633,10 +634,10 @@ public final class NativeJSAdapter extends ScriptObject {
     }
 
     @Override
-    protected GuardedInvocation findSetMethod(final CallSiteDescriptor desc, final boolean megaMorphic) {
+    protected GuardedInvocation findSetMethod(final CallSiteDescriptor desc, final LinkRequest request) {
         if (overrides && super.hasOwnProperty(desc.getNameToken(CallSiteDescriptor.NAME_OPERAND))) {
             try {
-                final GuardedInvocation inv = super.findSetMethod(desc, megaMorphic);
+                final GuardedInvocation inv = super.findSetMethod(desc, request);
                 if (inv != null) {
                     return inv;
                 }
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeJavaImporter.java b/nashorn/src/jdk/nashorn/internal/objects/NativeJavaImporter.java
index e8e8092fe5f..b31f853bc14 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeJavaImporter.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeJavaImporter.java
@@ -34,6 +34,7 @@ import jdk.nashorn.internal.runtime.ScriptObject;
 import org.dynalang.dynalink.CallSiteDescriptor;
 import org.dynalang.dynalink.beans.StaticClass;
 import org.dynalang.dynalink.linker.GuardedInvocation;
+import org.dynalang.dynalink.linker.LinkRequest;
 
 /**
  * This is "JavaImporter" constructor. This constructor allows you to use Java types omitting explicit package names.
@@ -107,13 +108,13 @@ public class NativeJavaImporter extends ScriptObject {
     }
 
     @Override
-    public GuardedInvocation noSuchProperty(final CallSiteDescriptor desc) {
-        return createAndSetProperty(desc) ? super.lookup(desc) : super.noSuchProperty(desc);
+    public GuardedInvocation noSuchProperty(final CallSiteDescriptor desc, final LinkRequest request) {
+        return createAndSetProperty(desc) ? super.lookup(desc, request) : super.noSuchProperty(desc, request);
     }
 
     @Override
-    public GuardedInvocation noSuchMethod(final CallSiteDescriptor desc) {
-        return createAndSetProperty(desc) ? super.lookup(desc) : super.noSuchMethod(desc);
+    public GuardedInvocation noSuchMethod(final CallSiteDescriptor desc, final LinkRequest request) {
+        return createAndSetProperty(desc) ? super.lookup(desc, request) : super.noSuchMethod(desc, request);
     }
 
     private boolean createAndSetProperty(final CallSiteDescriptor desc) {
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java b/nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java
index cff3fd702f6..b2325d05f91 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java
@@ -46,9 +46,9 @@ import jdk.nashorn.internal.runtime.JSType;
 import jdk.nashorn.internal.runtime.ScriptObject;
 import jdk.nashorn.internal.runtime.ScriptRuntime;
 import jdk.nashorn.internal.runtime.linker.MethodHandleFactory;
-import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
 import jdk.nashorn.internal.runtime.linker.PrimitiveLookup;
 import org.dynalang.dynalink.linker.GuardedInvocation;
+import org.dynalang.dynalink.linker.LinkRequest;
 
 /**
  * ECMA 15.7 Number Objects.
@@ -317,12 +317,12 @@ public final class NativeNumber extends ScriptObject {
 
     /**
      * Lookup the appropriate method for an invoke dynamic call.
-     * @param desc The call site descriptor.
+     * @param request  The link request
      * @param receiver receiver of call
      * @return Link to be invoked at call site.
      */
-    public static GuardedInvocation lookupPrimitive(final NashornCallSiteDescriptor desc, final Object receiver) {
-        return PrimitiveLookup.lookupPrimitive(desc, Number.class, new NativeNumber(((Number)receiver).doubleValue()), WRAPFILTER);
+    public static GuardedInvocation lookupPrimitive(final LinkRequest request, final Object receiver) {
+        return PrimitiveLookup.lookupPrimitive(request, Number.class, new NativeNumber(((Number)receiver).doubleValue()), WRAPFILTER);
     }
 
     @SuppressWarnings("unused")
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeString.java b/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
index 649c26a0658..10d5c4a1cc7 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
@@ -55,10 +55,11 @@ import jdk.nashorn.internal.runtime.ScriptObject;
 import jdk.nashorn.internal.runtime.ScriptRuntime;
 import jdk.nashorn.internal.runtime.arrays.ArrayIndex;
 import jdk.nashorn.internal.runtime.linker.MethodHandleFactory;
-import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
 import jdk.nashorn.internal.runtime.linker.NashornGuards;
 import jdk.nashorn.internal.runtime.linker.PrimitiveLookup;
+import org.dynalang.dynalink.CallSiteDescriptor;
 import org.dynalang.dynalink.linker.GuardedInvocation;
+import org.dynalang.dynalink.linker.LinkRequest;
 
 
 /**
@@ -123,6 +124,59 @@ public final class NativeString extends ScriptObject {
         return value.length();
     }
 
+    // This is to provide array-like access to string characters without creating a NativeString wrapper.
+    @Override
+    protected GuardedInvocation findGetIndexMethod(final CallSiteDescriptor desc, final LinkRequest request) {
+        final Object self = request.getReceiver();
+        final Class<?> returnType = desc.getMethodType().returnType();
+
+        if (returnType == Object.class && (self instanceof String || self instanceof ConsString)) {
+            try {
+                MethodHandle mh = MethodHandles.lookup().findStatic(NativeString.class, "get", desc.getMethodType());
+                return new GuardedInvocation(mh, NashornGuards.getInstanceOf2Guard(String.class, ConsString.class));
+            } catch (final NoSuchMethodException | IllegalAccessException e) {
+                // Shouldn't happen. Fall back to super
+            }
+        }
+        return super.findGetIndexMethod(desc, request);
+    }
+
+    @SuppressWarnings("unused")
+    private static Object get(final Object self, final Object key) {
+        final CharSequence cs = JSType.toCharSequence(self);
+        final int index = getArrayIndexNoThrow(key);
+        if (index >= 0 && index < cs.length()) {
+            return String.valueOf(cs.charAt(index));
+        }
+        return ((ScriptObject) Global.toObject(self)).get(key);
+    }
+
+    @SuppressWarnings("unused")
+    private static Object get(final Object self, final double key) {
+        if (isRepresentableAsInt(key)) {
+            return get(self, (int)key);
+        }
+        return ((ScriptObject) Global.toObject(self)).get(key);
+    }
+
+    @SuppressWarnings("unused")
+    private static Object get(final Object self, final long key) {
+        final CharSequence cs = JSType.toCharSequence(self);
+        if (key >= 0 && key < cs.length()) {
+            return String.valueOf(cs.charAt((int)key));
+        }
+        return ((ScriptObject) Global.toObject(self)).get(key);
+    }
+
+    @SuppressWarnings("unused")
+    private static Object get(final Object self, final int key) {
+        final CharSequence cs = JSType.toCharSequence(self);
+        if (key >= 0 && key < cs.length()) {
+            return String.valueOf(cs.charAt(key));
+        }
+        return ((ScriptObject) Global.toObject(self)).get(key);
+    }
+
     // String characters can be accessed with array-like indexing..
     @Override
     public Object get(final Object key) {
@@ -1066,13 +1120,13 @@ public final class NativeString extends ScriptObject {
     /**
      * Lookup the appropriate method for an invoke dynamic call.
      *
-     * @param desc the call site descriptor
+     * @param request  the link request
      * @param receiver receiver of call
      * @return Link to be invoked at call site.
      */
-    public static GuardedInvocation lookupPrimitive(final NashornCallSiteDescriptor desc, final Object receiver) {
+    public static GuardedInvocation lookupPrimitive(final LinkRequest request, final Object receiver) {
         final MethodHandle guard = NashornGuards.getInstanceOf2Guard(String.class, ConsString.class);
-        return PrimitiveLookup.lookupPrimitive(desc, guard, new NativeString((CharSequence)receiver), WRAPFILTER);
+        return PrimitiveLookup.lookupPrimitive(request, guard, new NativeString((CharSequence)receiver), WRAPFILTER);
     }
 
     @SuppressWarnings("unused")
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/GlobalObject.java b/nashorn/src/jdk/nashorn/internal/runtime/GlobalObject.java
index d50d9b227ff..5f91ab3320f 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/GlobalObject.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/GlobalObject.java
@@ -26,8 +26,8 @@
 package jdk.nashorn.internal.runtime;
 
 import java.lang.invoke.MethodHandle;
-import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
 import org.dynalang.dynalink.linker.GuardedInvocation;
+import org.dynalang.dynalink.linker.LinkRequest;
 
 /**
  * Runtime interface to the global scope of the current context.
@@ -79,34 +79,15 @@ public interface GlobalObject {
    public MethodHandle getWrapFilter(Object obj);
 
     /**
-     * Wrapper for {@link jdk.nashorn.internal.objects.Global#numberLookup(NashornCallSiteDescriptor, Number)}
+     * Wrapper for {@link jdk.nashorn.internal.objects.Global#primitiveLookup(LinkRequest, Object)}
      *
-     * @param callSite call site descriptor
+     * @param request the link request for the dynamic call site.
      * @param self     self reference
      *
      * @return guarded invocation
      */
-   public GuardedInvocation numberLookup(NashornCallSiteDescriptor callSite, Number self);
+   public GuardedInvocation primitiveLookup(LinkRequest request, Object self);
 
-    /**
-     * Wrapper for {@link jdk.nashorn.internal.objects.Global#stringLookup(NashornCallSiteDescriptor, CharSequence)}
-     *
-     * @param callSite call site descriptor
-     * @param self     self reference
-     *
-     * @return guarded invocation
-     */
-   public GuardedInvocation stringLookup(NashornCallSiteDescriptor callSite, CharSequence self);
-
-    /**
-     * Wrapper for {@link jdk.nashorn.internal.objects.Global#booleanLookup(NashornCallSiteDescriptor, Boolean)}
-     *
-     * @param callSite call site descriptor
-     * @param self     self reference
-     *
-     * @return guarded invocation
-     */
-   public GuardedInvocation booleanLookup(NashornCallSiteDescriptor callSite, Boolean self);
 
     /**
      * Wrapper for {@link jdk.nashorn.internal.objects.Global#newObject()}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/NativeJavaPackage.java b/nashorn/src/jdk/nashorn/internal/runtime/NativeJavaPackage.java
index a35df4729fa..1809247e750 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/NativeJavaPackage.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/NativeJavaPackage.java
@@ -31,6 +31,7 @@ import jdk.nashorn.internal.objects.annotations.Function;
 import org.dynalang.dynalink.CallSiteDescriptor;
 import org.dynalang.dynalink.beans.StaticClass;
 import org.dynalang.dynalink.linker.GuardedInvocation;
+import org.dynalang.dynalink.linker.LinkRequest;
 
 /**
  * An object that exposes Java packages and classes as its properties. Packages are exposed as objects that have further
@@ -155,10 +156,11 @@ public class NativeJavaPackage extends ScriptObject {
     /**
      * Handle creation of new attribute.
      * @param desc the call site descriptor
+     * @param request the link request
      * @return Link to be invoked at call site.
      */
     @Override
-    public GuardedInvocation noSuchProperty(final CallSiteDescriptor desc) {
+    public GuardedInvocation noSuchProperty(final CallSiteDescriptor desc, final LinkRequest request) {
         final String propertyName = desc.getNameToken(2);
         final String fullName     = name.isEmpty() ? propertyName : name + "." + propertyName;
 
@@ -178,12 +180,12 @@ public class NativeJavaPackage extends ScriptObject {
             set(propertyName, StaticClass.forClass(javaClass), strict);
         }
 
-        return super.lookup(desc);
+        return super.lookup(desc, request);
     }
 
     @Override
-    public GuardedInvocation noSuchMethod(final CallSiteDescriptor desc) {
-        return noSuchProperty(desc);
+    public GuardedInvocation noSuchMethod(final CallSiteDescriptor desc, final LinkRequest request) {
+        return noSuchProperty(desc, request);
     }
 
 }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
index be30be3a077..41fa730bba8 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
@@ -45,6 +45,7 @@ import jdk.nashorn.internal.runtime.linker.NashornGuards;
 import jdk.nashorn.internal.runtime.options.Options;
 import org.dynalang.dynalink.CallSiteDescriptor;
 import org.dynalang.dynalink.linker.GuardedInvocation;
+import org.dynalang.dynalink.linker.LinkRequest;
 
 /**
  * Runtime representation of a JavaScript function.
@@ -907,15 +908,15 @@ public abstract class ScriptFunction extends ScriptObject {
      *   (4) for normal this-calls, drop callee.
      */
     @Override
-    protected GuardedInvocation findCallMethod(final CallSiteDescriptor desc, final boolean megaMorphic) {
+    protected GuardedInvocation findCallMethod(final CallSiteDescriptor desc, final LinkRequest request) {
         final MethodType type = desc.getMethodType();
 
-        if(megaMorphic) {
+        if (request.isCallSiteUnstable()) {
             // (this, callee, args...) => (this, callee, args[])
             final MethodHandle collector = MH.asCollector(ScriptRuntime.APPLY.methodHandle(), Object[].class,
                     type.parameterCount() - 2);
 
-            return new GuardedInvocation(collector,
+            return new GuardedInvocation(addPrimitiveWrap(collector, desc, request),
                     desc.getMethodType().parameterType(0) == ScriptFunction.class ? null : NashornGuards.getScriptFunctionGuard());
         }
 
@@ -938,6 +939,8 @@ public abstract class ScriptFunction extends ScriptObject {
                 assert reorder[1] == 0;
                 final MethodType newType = oldType.changeParameterType(0, oldType.parameterType(1)).changeParameterType(1, oldType.parameterType(0));
                 boundHandle = MethodHandles.permuteArguments(callHandle, newType, reorder);
+                // thiz argument may be a JS primitive needing a wrapper
+                boundHandle = addPrimitiveWrap(boundHandle, desc, request);
             }
         } else {
             final MethodHandle callHandle = getBestSpecializedInvokeHandle(type.dropParameterTypes(0, 1));
@@ -977,6 +980,23 @@ public abstract class ScriptFunction extends ScriptObject {
         return pairArguments(methodHandle, type);
     }
 
+    private MethodHandle addPrimitiveWrap(final MethodHandle mh, final CallSiteDescriptor desc, final LinkRequest request) {
+        // Check whether thiz is a JS primitive type and needs an object wrapper for non-strict function
+        if (!NashornCallSiteDescriptor.isScope(desc) && isNonStrictFunction()) {
+            Object self = request.getArguments()[1];
+            if (isPrimitiveThis(self)) {
+                MethodHandle wrapFilter = ((GlobalObject) Context.getGlobalTrusted()).getWrapFilter(self);
+                return MH.filterArguments(mh, 1, MH.asType(wrapFilter, wrapFilter.type().changeReturnType(Object.class)));
+            }
+        }
+        return mh;
+    }
+
+    private static boolean isPrimitiveThis(Object obj) {
+        return obj instanceof String || obj instanceof ConsString ||
+               obj instanceof Number || obj instanceof Boolean;
+    }
+
     private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
         final Class<?>   own = ScriptFunction.class;
         final MethodType mt  = MH.type(rtype, types);
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
index f2595340e80..a2bcc20be94 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
@@ -68,6 +68,7 @@ import jdk.nashorn.internal.runtime.linker.NashornGuardedInvocation;
 import jdk.nashorn.internal.runtime.linker.NashornGuards;
 import org.dynalang.dynalink.CallSiteDescriptor;
 import org.dynalang.dynalink.linker.GuardedInvocation;
+import org.dynalang.dynalink.linker.LinkRequest;
 import org.dynalang.dynalink.support.CallSiteDescriptorFactory;
 
 /**
@@ -1506,22 +1507,11 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
      * with the appropriate guard(s).
      *
      * @param desc call site descriptor
+     * @param request the link request
      *
      * @return GuardedInvocation for the callsite
      */
-    public final GuardedInvocation lookup(final CallSiteDescriptor desc) {
-        return lookup(desc, false);
-    }
-
-    /**
-     * Lookup the appropriate method for an invoke dynamic call.
-     *
-     * @param desc The descriptor of the call site.
-     * @param megaMorphic if the call site is considered megamorphic
-     *
-     * @return GuardedInvocation to be invoked at call site.
-     */
-    public GuardedInvocation lookup(final CallSiteDescriptor desc, final boolean megaMorphic) {
+    public GuardedInvocation lookup(final CallSiteDescriptor desc, final LinkRequest request) {
         final int c = desc.getNameTokenCount();
         // JavaScript is "immune" to all currently defined Dynalink composite operation - getProp is the same as getElem
         // is the same as getMethod as JavaScript objects have a single namespace for all three. Therefore, we don't
@@ -1535,16 +1525,16 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
         case "getProp":
         case "getElem":
         case "getMethod":
-            return c > 2 ? findGetMethod(desc, megaMorphic, operator) : findGetIndexMethod(desc);
+            return c > 2 ? findGetMethod(desc, request, operator) : findGetIndexMethod(desc, request);
         case "setProp":
         case "setElem":
-            return c > 2 ? findSetMethod(desc, megaMorphic) : findSetIndexMethod(desc);
+            return c > 2 ? findSetMethod(desc, request) : findSetIndexMethod(desc);
         case "call":
-            return findCallMethod(desc, megaMorphic);
+            return findCallMethod(desc, request);
         case "new":
             return findNewMethod(desc);
         case "callMethod":
-            return findCallMethodMethod(desc, megaMorphic);
+            return findCallMethodMethod(desc, request);
         default:
             return null;
         }
@@ -1565,12 +1555,12 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
      * Find the appropriate CALL method for an invoke dynamic call.
      * This generates "not a function" always
      *
-     * @param desc        the call site descriptor.
-     * @param megaMorphic is this call site megaMorphic, as reported by Dynalink - then just do apply
+     * @param desc    the call site descriptor.
+     * @param request the link request
      *
      * @return GuardedInvocation to be invoed at call site.
      */
-    protected GuardedInvocation findCallMethod(final CallSiteDescriptor desc, final boolean megaMorphic) {
+    protected GuardedInvocation findCallMethod(final CallSiteDescriptor desc, final LinkRequest request) {
         return notAFunction();
     }
 
@@ -1585,17 +1575,17 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
      * one for "dyn:call". Explicit support for "dyn:callMethod" is provided for the benefit of potential external
      * callers. The implementation itself actually folds a "dyn:getMethod" method handle into a "dyn:call" method handle.
      *
-     * @param desc The call site descriptor.
-     * @param megaMorphic is this call site megaMorphic, as reported by Dynalink - then just do apply
+     * @param desc    the call site descriptor.
+     * @param request the link request
      *
      * @return GuardedInvocation to be invoked at call site.
      */
-    protected GuardedInvocation findCallMethodMethod(final CallSiteDescriptor desc, final boolean megaMorphic) {
+    protected GuardedInvocation findCallMethodMethod(final CallSiteDescriptor desc, final LinkRequest request) {
         // R(P0, P1, ...)
         final MethodType callType = desc.getMethodType();
         // use type Object(P0) for the getter
         final CallSiteDescriptor getterType = desc.changeMethodType(MethodType.methodType(Object.class, callType.parameterType(0)));
-        final GuardedInvocation getter = findGetMethod(getterType, megaMorphic, "getMethod");
+        final GuardedInvocation getter = findGetMethod(getterType, request, "getMethod");
 
         // Object(P0) => Object(P0, P1, ...)
         final MethodHandle argDroppingGetter = MH.dropArguments(getter.getInvocation(), 1, callType.parameterList().subList(1, callType.parameterCount()));
@@ -1608,16 +1598,16 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
     /**
      * Find the appropriate GET method for an invoke dynamic call.
      *
-     * @param desc         the call site descriptor
-     * @param megaMorphic  is this call site megaMorphic, as reported by Dynalink - then just do apply
-     * @param operator     operator for get: getProp, getMethod, getElem etc
+     * @param desc     the call site descriptor
+     * @param request  the link request
+     * @param operator operator for get: getProp, getMethod, getElem etc
      *
      * @return GuardedInvocation to be invoked at call site.
      */
-    protected GuardedInvocation findGetMethod(final CallSiteDescriptor desc, final boolean megaMorphic, final String operator) {
+    protected GuardedInvocation findGetMethod(final CallSiteDescriptor desc, final LinkRequest request, final String operator) {
         final String name = desc.getNameToken(2);
 
-        if (megaMorphic) {
+        if (request.isCallSiteUnstable()) {
             return findMegaMorphicGetMethod(desc, name);
         }
 
@@ -1627,9 +1617,9 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
 
         if (find == null) {
             if ("getProp".equals(operator)) {
-                return noSuchProperty(desc);
+                return noSuchProperty(desc, request);
             } else if ("getMethod".equals(operator)) {
-                return noSuchMethod(desc);
+                return noSuchMethod(desc, request);
             } else if ("getElem".equals(operator)) {
                 return createEmptyGetter(desc, name);
             }
@@ -1673,11 +1663,12 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
     /**
      * Find the appropriate GETINDEX method for an invoke dynamic call.
      *
-     * @param desc the call site descriptor
+     * @param desc    the call site descriptor
+     * @param request the link request
      *
      * @return GuardedInvocation to be invoked at call site.
      */
-    private static GuardedInvocation findGetIndexMethod(final CallSiteDescriptor desc) {
+    protected GuardedInvocation findGetIndexMethod(final CallSiteDescriptor desc, final LinkRequest request) {
         return findGetIndexMethod(desc.getMethodType());
     }
 
@@ -1708,14 +1699,14 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
     /**
      * Find the appropriate SET method for an invoke dynamic call.
      *
-     * @param desc the call site descriptor
-     * @param megaMorphic  is this call site megaMorphic, as reported by Dynalink - then just do apply
+     * @param desc    the call site descriptor
+     * @param request the link request
      *
      * @return GuardedInvocation to be invoked at call site.
      */
-    protected GuardedInvocation findSetMethod(final CallSiteDescriptor desc, final boolean megaMorphic) {
+    protected GuardedInvocation findSetMethod(final CallSiteDescriptor desc, final LinkRequest request) {
         final String name = desc.getNameToken(CallSiteDescriptor.NAME_OPERAND);
-        if(megaMorphic) {
+        if(request.isCallSiteUnstable()) {
             return findMegaMorphicSetMethod(desc, name);
         }
 
@@ -1861,9 +1852,10 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
     /**
      * Fall back if a function property is not found.
      * @param desc The call site descriptor
+     * @param request the link request
      * @return GuardedInvocation to be invoked at call site.
      */
-    public GuardedInvocation noSuchMethod(final CallSiteDescriptor desc) {
+    public GuardedInvocation noSuchMethod(final CallSiteDescriptor desc, final LinkRequest request) {
         final String       name      = desc.getNameToken(2);
         final FindProperty find      = findProperty(NO_SUCH_METHOD_NAME, true);
         final boolean      scopeCall = isScope() && NashornCallSiteDescriptor.isScope(desc);
@@ -1887,9 +1879,10 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
     /**
      * Fall back if a property is not found.
      * @param desc the call site descriptor.
+     * @param request the link request
      * @return GuardedInvocation to be invoked at call site.
      */
-    public GuardedInvocation noSuchProperty(final CallSiteDescriptor desc) {
+    public GuardedInvocation noSuchProperty(final CallSiteDescriptor desc, final LinkRequest request) {
         final String name = desc.getNameToken(2);
         final FindProperty find = findProperty(NO_SUCH_PROPERTY_NAME, true);
         final boolean scopeAccess = isScope() && NashornCallSiteDescriptor.isScope(desc);
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java b/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java
index d845e3ad3bc..84e4d542ca9 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java
@@ -32,6 +32,7 @@ import java.lang.invoke.MethodHandles;
 import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
 import org.dynalang.dynalink.CallSiteDescriptor;
 import org.dynalang.dynalink.linker.GuardedInvocation;
+import org.dynalang.dynalink.linker.LinkRequest;
 import org.dynalang.dynalink.support.CallSiteDescriptorFactory;
 
 
@@ -86,7 +87,7 @@ public class WithObject extends ScriptObject implements Scope {
 
 
     @Override
-    public GuardedInvocation lookup(final CallSiteDescriptor desc, final boolean megaMorphic) {
+    public GuardedInvocation lookup(final CallSiteDescriptor desc, final LinkRequest request) {
         // With scopes can never be observed outside of Nashorn code, so all call sites that can address it will of
         // necessity have a Nashorn descriptor - it is safe to cast.
         final NashornCallSiteDescriptor ndesc = (NashornCallSiteDescriptor)desc;
@@ -111,7 +112,7 @@ public class WithObject extends ScriptObject implements Scope {
             }
 
             if (find != null) {
-                link = self.lookup(desc);
+                link = self.lookup(desc, request);
 
                 if (link != null) {
                     return fixExpressionCallSite(ndesc, link);
@@ -125,7 +126,7 @@ public class WithObject extends ScriptObject implements Scope {
         }
 
         if (find != null) {
-            return fixScopeCallSite(scope.lookup(desc));
+            return fixScopeCallSite(scope.lookup(desc, request));
         }
 
         // the property is not found - now check for
@@ -155,11 +156,11 @@ public class WithObject extends ScriptObject implements Scope {
                 if (find != null) {
                     switch (operator) {
                     case "getMethod":
-                        link = self.noSuchMethod(desc);
+                        link = self.noSuchMethod(desc, request);
                         break;
                     case "getProp":
                     case "getElem":
-                        link = self.noSuchProperty(desc);
+                        link = self.noSuchProperty(desc, request);
                         break;
                     default:
                         break;
@@ -174,7 +175,7 @@ public class WithObject extends ScriptObject implements Scope {
 
         // still not found, may be scope can handle with it's own
         // __noSuchProperty__, __noSuchMethod__ etc.
-        link = scope.lookup(desc);
+        link = scope.lookup(desc, request);
 
         if (link != null) {
             return fixScopeCallSite(link);
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornLinker.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornLinker.java
index 0791261d176..53d69976684 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornLinker.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornLinker.java
@@ -30,9 +30,6 @@ import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 
-import jdk.nashorn.internal.runtime.ConsString;
-import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.GlobalObject;
 import jdk.nashorn.internal.runtime.ScriptFunction;
 import jdk.nashorn.internal.runtime.ScriptObject;
 import jdk.nashorn.internal.runtime.Undefined;
@@ -75,23 +72,9 @@ public class NashornLinker implements TypeBasedGuardingDynamicLinker, GuardingTy
             return null;
         }
 
-        GuardedInvocation inv;
+        final GuardedInvocation inv;
         if (self instanceof ScriptObject) {
-            inv = ((ScriptObject)self).lookup(desc, request.isCallSiteUnstable());
-
-            if (self instanceof ScriptFunction && "call".equals(desc.getNameToken(CallSiteDescriptor.OPERATOR))) {
-
-                // Add toObject wrapper for non-object self argument to non-strict functions
-                assert request.getArguments().length >= 2 : "No self argument in script function callsite";
-                Object thisObject = request.getArguments()[1];
-                // Add wrapper filter for primitive this-object on non-strict functions
-                if (NashornGuardedInvocation.isNonStrict(inv) && isPrimitive(thisObject)) {
-                    MethodHandle wrapFilter = ((GlobalObject) Context.getGlobal()).getWrapFilter(thisObject);
-                    MethodHandle invocation = MH.filterArguments(inv.getInvocation(), 1,
-                            MH.asType(wrapFilter, wrapFilter.type().changeReturnType(Object.class)));
-                    inv = new GuardedInvocation(invocation, inv.getSwitchPoint(), inv.getGuard());
-                }
-            }
+            inv = ((ScriptObject)self).lookup(desc, request);
         } else if (self instanceof Undefined) {
             inv = Undefined.lookup(desc);
         } else {
@@ -153,13 +136,6 @@ public class NashornLinker implements TypeBasedGuardingDynamicLinker, GuardingTy
                 JavaAdapterFactory.isAutoConvertibleFromFunction(clazz);
     }
 
-    private static boolean isPrimitive(Object obj) {
-        return obj instanceof Boolean ||
-               obj instanceof Number ||
-               obj instanceof String ||
-               obj instanceof ConsString;
-    }
-
     @Override
     public Comparison compareConversion(final Class<?> sourceType, final Class<?> targetType1, final Class<?> targetType2) {
         if(ScriptObject.class.isAssignableFrom(sourceType)) {
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java
index 069e608bae4..0456e00f304 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java
@@ -64,14 +64,7 @@ class NashornPrimitiveLinker implements TypeBasedGuardingDynamicLinker, Guarding
         final GlobalObject global = (GlobalObject) Context.getGlobal();
         final NashornCallSiteDescriptor desc = (NashornCallSiteDescriptor) request.getCallSiteDescriptor();
 
-        if (self instanceof Number) {
-            return Bootstrap.asType(global.numberLookup(desc, (Number) self), linkerServices, desc);
-        } else if (self instanceof String || self instanceof ConsString) {
-           return Bootstrap.asType(global.stringLookup(desc, (CharSequence) self), linkerServices, desc);
-        } else if (self instanceof Boolean) {
-            return Bootstrap.asType(global.booleanLookup(desc, (Boolean) self), linkerServices, desc);
-        }
-        throw new AssertionError(); // Can't reach here
+        return Bootstrap.asType(global.primitiveLookup(request, self), linkerServices, desc);
     }
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java
index 4a603a18aca..9b593b45270 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java
@@ -32,6 +32,7 @@ import java.lang.invoke.MethodType;
 import jdk.nashorn.internal.runtime.ScriptObject;
 import org.dynalang.dynalink.CallSiteDescriptor;
 import org.dynalang.dynalink.linker.GuardedInvocation;
+import org.dynalang.dynalink.linker.LinkRequest;
 import org.dynalang.dynalink.support.CallSiteDescriptorFactory;
 import org.dynalang.dynalink.support.Guards;
 
@@ -47,7 +48,7 @@ public class PrimitiveLookup {
 
     /**
      * Returns a guarded invocation representing the linkage for a dynamic operation on a primitive Java value.
-     * @param desc the descriptor of the call site identifying the dynamic operation.
+     * @param request the link request for the dynamic call site.
      * @param receiverClass the class of the receiver value (e.g., {@link java.lang.Boolean}, {@link java.lang.String} etc.)
      * @param wrappedReceiver a transient JavaScript native wrapper object created as the object proxy for the primitive
      * value; see ECMAScript 5.1, section 8.7.1 for discussion of using {@code [[Get]]} on a property reference with a
@@ -58,14 +59,14 @@ public class PrimitiveLookup {
      * @return a guarded invocation representing the operation at the call site when performed on a JavaScript primitive
      * type {@code receiverClass}.
      */
-    public static GuardedInvocation lookupPrimitive(final CallSiteDescriptor desc, final Class<?> receiverClass,
+    public static GuardedInvocation lookupPrimitive(final LinkRequest request, final Class<?> receiverClass,
                                                     final ScriptObject wrappedReceiver, final MethodHandle wrapFilter) {
-        return lookupPrimitive(desc, Guards.getInstanceOfGuard(receiverClass), wrappedReceiver, wrapFilter);
+        return lookupPrimitive(request, Guards.getInstanceOfGuard(receiverClass), wrappedReceiver, wrapFilter);
     }
 
     /**
      * Returns a guarded invocation representing the linkage for a dynamic operation on a primitive Java value.
-     * @param desc the descriptor of the call site identifying the dynamic operation.
+     * @param request the link request for the dynamic call site.
      * @param guard an explicit guard that will be used for the returned guarded invocation.
      * @param wrappedReceiver a transient JavaScript native wrapper object created as the object proxy for the primitive
      * value; see ECMAScript 5.1, section 8.7.1 for discussion of using {@code [[Get]]} on a property reference with a
@@ -76,12 +77,17 @@ public class PrimitiveLookup {
      * @return a guarded invocation representing the operation at the call site when performed on a JavaScript primitive
      * type (that is implied by both {@code guard} and {@code wrappedReceiver}).
      */
-    public static GuardedInvocation lookupPrimitive(final CallSiteDescriptor desc, final MethodHandle guard,
+    public static GuardedInvocation lookupPrimitive(final LinkRequest request, final MethodHandle guard,
                                                     final ScriptObject wrappedReceiver, final MethodHandle wrapFilter) {
+        final CallSiteDescriptor desc = request.getCallSiteDescriptor();
         final String operator = CallSiteDescriptorFactory.tokenizeOperators(desc).get(0);
-        if ("setProp".equals(operator) && desc.getNameTokenCount() > 2) {
-            return new GuardedInvocation(MH.asType(Lookup.EMPTY_SETTER, MH.type(void.class, Object.class,
-                    desc.getMethodType().parameterType(1))), guard);
+        if ("setProp".equals(operator) || "setElem".equals(operator)) {
+            MethodType type = desc.getMethodType();
+            MethodHandle method = MH.asType(Lookup.EMPTY_SETTER, MH.type(void.class, Object.class, type.parameterType(1)));
+            if (type.parameterCount() == 3) {
+                method = MH.dropArguments(method, 2, type.parameterType(2));
+            }
+            return new GuardedInvocation(method, guard);
         }
 
         if(desc.getNameTokenCount() > 2) {
@@ -91,7 +97,7 @@ public class PrimitiveLookup {
                 return null;
             }
         }
-        final GuardedInvocation link = wrappedReceiver.lookup(desc);
+        final GuardedInvocation link = wrappedReceiver.lookup(desc, request);
         if (link != null) {
             MethodHandle method = link.getInvocation();
             final Class<?> receiverType = method.type().parameterType(0);

From a320378fac78141df43a719d067b135d9c10fca3 Mon Sep 17 00:00:00 2001
From: Edvard Wendelin <ewendeli@openjdk.org>
Date: Mon, 28 Jan 2013 11:07:07 +0100
Subject: [PATCH 095/311] 8006864: Update java.security-linux to include
 changes in java.security

Reviewed-by: mchung, mullan
---
 .../share/lib/security/java.security-linux    | 28 +++++++++++++++++--
 .../share/lib/security/java.security-macosx   |  2 ++
 .../share/lib/security/java.security-solaris  |  6 ++--
 .../share/lib/security/java.security-windows  |  6 ++--
 4 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/jdk/src/share/lib/security/java.security-linux b/jdk/src/share/lib/security/java.security-linux
index dd63fd4d1e2..cdda1b47699 100644
--- a/jdk/src/share/lib/security/java.security-linux
+++ b/jdk/src/share/lib/security/java.security-linux
@@ -145,7 +145,19 @@ keystore.type=jks
 # passed to checkPackageAccess unless the
 # corresponding RuntimePermission ("accessClassInPackage."+package) has
 # been granted.
-package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.,jdk.internal.
+package.access=sun.,\
+               com.sun.xml.internal.bind.,\
+               com.sun.xml.internal.org.jvnet.staxex.,\
+               com.sun.xml.internal.ws.,\
+               com.sun.imageio.,\
+               com.sun.istack.internal.,\
+               com.sun.jmx.defaults.,\
+               com.sun.jmx.remote.util.,\
+               com.sun.org.apache.xerces.internal.utils.,\
+               com.sun.org.apache.xalan.internal.utils.,\
+               com.sun.org.glassfish.external.,\
+               com.sun.org.glassfish.gmbal.,\
+	       jdk.internal.
 
 #
 # List of comma-separated packages that start with or equal this string
@@ -157,7 +169,19 @@ package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.
 # by default, none of the class loaders supplied with the JDK call
 # checkPackageDefinition.
 #
-package.definition=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.,jdk.internal.
+package.definition=sun.,\
+                   com.sun.xml.internal.bind.,\
+                   com.sun.xml.internal.org.jvnet.staxex.,\
+                   com.sun.xml.internal.ws.,\
+                   com.sun.imageio.,\
+                   com.sun.istack.internal.,\
+                   com.sun.jmx.defaults.,\
+                   com.sun.jmx.remote.util.,\
+                   com.sun.org.apache.xerces.internal.utils.,\
+                   com.sun.org.apache.xalan.internal.utils.,\
+                   com.sun.org.glassfish.external.,\
+                   com.sun.org.glassfish.gmbal.,\
+		   jdk.internal.
 
 #
 # Determines whether this properties file can be appended to
diff --git a/jdk/src/share/lib/security/java.security-macosx b/jdk/src/share/lib/security/java.security-macosx
index 707f1cf21a7..515141de81b 100644
--- a/jdk/src/share/lib/security/java.security-macosx
+++ b/jdk/src/share/lib/security/java.security-macosx
@@ -158,6 +158,7 @@ package.access=sun.,\
                com.sun.org.apache.xalan.internal.utils.,\
                com.sun.org.glassfish.external.,\
                com.sun.org.glassfish.gmbal.,\
+	       jdk.internal.,\
                apple.
 
 #
@@ -182,6 +183,7 @@ package.definition=sun.,\
                    com.sun.org.apache.xalan.internal.utils.,\
                    com.sun.org.glassfish.external.,\
                    com.sun.org.glassfish.gmbal.,\
+		   jdk.internal.,\
                    apple.
 
 #
diff --git a/jdk/src/share/lib/security/java.security-solaris b/jdk/src/share/lib/security/java.security-solaris
index 5f905227d5f..2cccc0d455b 100644
--- a/jdk/src/share/lib/security/java.security-solaris
+++ b/jdk/src/share/lib/security/java.security-solaris
@@ -158,7 +158,8 @@ package.access=sun.,\
                com.sun.org.apache.xerces.internal.utils.,\
                com.sun.org.apache.xalan.internal.utils.,\
                com.sun.org.glassfish.external.,\
-               com.sun.org.glassfish.gmbal.
+               com.sun.org.glassfish.gmbal.,\
+	       jdk.internal.
 
 #
 # List of comma-separated packages that start with or equal this string
@@ -181,7 +182,8 @@ package.definition=sun.,\
                    com.sun.org.apache.xerces.internal.utils.,\
                    com.sun.org.apache.xalan.internal.utils.,\
                    com.sun.org.glassfish.external.,\
-                   com.sun.org.glassfish.gmbal.
+                   com.sun.org.glassfish.gmbal.,\
+		   jdk.internal.
 
 #
 # Determines whether this properties file can be appended to
diff --git a/jdk/src/share/lib/security/java.security-windows b/jdk/src/share/lib/security/java.security-windows
index fceb1021d6d..b6281f741a1 100644
--- a/jdk/src/share/lib/security/java.security-windows
+++ b/jdk/src/share/lib/security/java.security-windows
@@ -157,7 +157,8 @@ package.access=sun.,\
                com.sun.org.apache.xerces.internal.utils.,\
                com.sun.org.apache.xalan.internal.utils.,\
                com.sun.org.glassfish.external.,\
-               com.sun.org.glassfish.gmbal.
+               com.sun.org.glassfish.gmbal.,\
+	       jdk.internal.
 
 #
 # List of comma-separated packages that start with or equal this string
@@ -180,7 +181,8 @@ package.definition=sun.,\
                    com.sun.org.apache.xerces.internal.utils.,\
                    com.sun.org.apache.xalan.internal.utils.,\
                    com.sun.org.glassfish.external.,\
-                   com.sun.org.glassfish.gmbal.
+                   com.sun.org.glassfish.gmbal.,\
+		   jdk.internal.
 
 #
 # Determines whether this properties file can be appended to

From daaeb20effc8545de67bb62a601028f3d0fed3f7 Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Mon, 28 Jan 2013 18:10:16 +0530
Subject: [PATCH 096/311] 8006983: Introduce a command line option to switch
 off syntactic extensions of nashorn

Reviewed-by: lagergren, attila
---
 .../jdk/nashorn/internal/objects/Global.java  |  4 +-
 .../jdk/nashorn/internal/parser/Parser.java   | 18 ++--
 .../jdk/nashorn/internal/runtime/Context.java | 50 ++++++-----
 .../internal/runtime/ScriptingFunctions.java  |  6 +-
 .../runtime/resources/Options.properties      |  8 ++
 nashorn/test/script/basic/JDK-8006983.js      | 85 +++++++++++++++++++
 nashorn/test/script/basic/scripting.js        |  2 +-
 .../test/script/basic/scripting.js.EXPECTED   |  2 +-
 8 files changed, 138 insertions(+), 37 deletions(-)
 create mode 100644 nashorn/test/script/basic/JDK-8006983.js

diff --git a/nashorn/src/jdk/nashorn/internal/objects/Global.java b/nashorn/src/jdk/nashorn/internal/objects/Global.java
index 47b39875e9b..82e51a05a24 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/Global.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/Global.java
@@ -1456,8 +1456,8 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
         value = ScriptFunctionImpl.makeFunction("readLine", ScriptingFunctions.READLINE);
         addOwnProperty("readLine", Attribute.NOT_ENUMERABLE, value);
 
-        value = ScriptFunctionImpl.makeFunction("read", ScriptingFunctions.READ);
-        addOwnProperty("read", Attribute.NOT_ENUMERABLE, value);
+        value = ScriptFunctionImpl.makeFunction("readFully", ScriptingFunctions.READFULLY);
+        addOwnProperty("readFully", Attribute.NOT_ENUMERABLE, value);
 
         value = ScriptFunctionImpl.makeFunction("quit", ScriptingFunctions.QUIT);
         addOwnProperty("quit", Attribute.NOT_ENUMERABLE, value);
diff --git a/nashorn/src/jdk/nashorn/internal/parser/Parser.java b/nashorn/src/jdk/nashorn/internal/parser/Parser.java
index 6dbce889400..1b529babf1b 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/Parser.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/Parser.java
@@ -147,7 +147,7 @@ public class Parser extends AbstractParser {
     public FunctionNode parse(final String scriptName) {
         try {
             stream = new TokenStream();
-            lexer  = new Lexer(source, stream, context._scripting);
+            lexer  = new Lexer(source, stream, context._scripting && !context._no_syntax_extensions);
 
             // Set up first token (skips opening EOL.)
             k = -1;
@@ -1065,7 +1065,7 @@ loop:
 
             // Nashorn extension: for each expression.
             // iterate property values rather than property names.
-            if (type == IDENT && "each".equals(getValue())) {
+            if (!context._no_syntax_extensions && type == IDENT && "each".equals(getValue())) {
                 forNode.setIsForEach();
                 next();
             }
@@ -2312,7 +2312,8 @@ loop:
             arguments = new ArrayList<>();
         }
 
-        // This is to support the following interface impl. syntax:
+        // Nashorn extension: This is to support the following interface implementation
+        // syntax:
         //
         //     var r = new java.lang.Runnable() {
         //         run: function() { println("run"); }
@@ -2321,7 +2322,7 @@ loop:
         // The object literal following the "new Constructor()" expresssion
         // is passed as an additional (last) argument to the constructor.
 
-        if (type == LBRACE) {
+        if (!context._no_syntax_extensions && type == LBRACE) {
             arguments.add(objectLiteral());
         }
 
@@ -2475,8 +2476,11 @@ loop:
         if (type == IDENT || isNonStrictModeIdent()) {
             name = getIdent();
             verifyStrictIdent(name, "function name");
-        } else if (isStatement && !context._anon_functions) {
-            expect(IDENT);
+        } else if (isStatement) {
+            // Nashorn extension: anonymous function statements
+            if (context._no_syntax_extensions || !context._anon_functions) {
+                expect(IDENT);
+            }
         }
 
         // name is null, generate anonymous name
@@ -2613,7 +2617,7 @@ loop:
             functionNode.setFirstToken(firstToken);
 
             // Nashorn extension: expression closures
-            if (type != LBRACE) {
+            if (!context._no_syntax_extensions && type != LBRACE) {
                 /*
                  * Example:
                  *
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Context.java b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
index 34fc8ad82df..41a700ccbb5 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/Context.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
@@ -229,6 +229,9 @@ public final class Context {
     /** Create a new class loaded for each compilation */
     public final boolean _loader_per_compile;
 
+    /** Do not support non-standard syntax extensions. */
+    public final boolean _no_syntax_extensions;
+
     /** Package to which generated class files are added */
     public final String  _package;
 
@@ -341,29 +344,30 @@ public final class Context {
         this.out       = out;
         this.err       = err;
 
-        _anon_functions     = options.getBoolean("anon.functions");
-        _class_cache_size   = options.getInteger("class.cache.size");
-        _compile_only       = options.getBoolean("compile.only");
-        _debug_lines        = options.getBoolean("debug.lines");
-        _dest_dir           = options.getString("d");
-        _dump_on_error      = options.getBoolean("doe");
-        _early_lvalue_error = options.getBoolean("early.lvalue.error");
-        _empty_statements   = options.getBoolean("empty.statements");
-        _fullversion        = options.getBoolean("fullversion");
-        _loader_per_compile = options.getBoolean("loader.per.compile");
-        _package            = options.getString("package");
-        _parse_only         = options.getBoolean("parse.only");
-        _print_ast          = options.getBoolean("print.ast");
-        _print_lower_ast    = options.getBoolean("print.lower.ast");
-        _print_code         = options.getBoolean("print.code");
-        _print_no_newline   = options.getBoolean("print.no.newline");
-        _print_parse        = options.getBoolean("print.parse");
-        _print_lower_parse  = options.getBoolean("print.lower.parse");
-        _print_symbols      = options.getBoolean("print.symbols");
-        _scripting          = options.getBoolean("scripting");
-        _strict             = options.getBoolean("strict");
-        _version            = options.getBoolean("version");
-        _verify_code        = options.getBoolean("verify.code");
+        _anon_functions       = options.getBoolean("anon.functions");
+        _class_cache_size     = options.getInteger("class.cache.size");
+        _compile_only         = options.getBoolean("compile.only");
+        _debug_lines          = options.getBoolean("debug.lines");
+        _dest_dir             = options.getString("d");
+        _dump_on_error        = options.getBoolean("doe");
+        _early_lvalue_error   = options.getBoolean("early.lvalue.error");
+        _empty_statements     = options.getBoolean("empty.statements");
+        _fullversion          = options.getBoolean("fullversion");
+        _loader_per_compile   = options.getBoolean("loader.per.compile");
+        _no_syntax_extensions = options.getBoolean("no.syntax.extensions");
+        _package              = options.getString("package");
+        _parse_only           = options.getBoolean("parse.only");
+        _print_ast            = options.getBoolean("print.ast");
+        _print_lower_ast      = options.getBoolean("print.lower.ast");
+        _print_code           = options.getBoolean("print.code");
+        _print_no_newline     = options.getBoolean("print.no.newline");
+        _print_parse          = options.getBoolean("print.parse");
+        _print_lower_parse    = options.getBoolean("print.lower.parse");
+        _print_symbols        = options.getBoolean("print.symbols");
+        _scripting            = options.getBoolean("scripting");
+        _strict               = options.getBoolean("strict");
+        _version              = options.getBoolean("version");
+        _verify_code          = options.getBoolean("verify.code");
 
         int callSiteFlags = 0;
         if (options.getBoolean("profile.callsites")) {
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java
index 14b346bbf6c..17737ecef74 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java
@@ -44,8 +44,8 @@ public class ScriptingFunctions {
     /** Handle to implementation of {@link ScriptingFunctions#read} - Nashorn extension */
     public static final MethodHandle READLINE = findOwnMH("readLine", Object.class, Object.class);
 
-    /** Handle to implementation of {@link ScriptingFunctions#read} - Nashorn extension */
-    public static final MethodHandle READ = findOwnMH("read",     Object.class, Object.class, Object.class);
+    /** Handle to implementation of {@link ScriptingFunctions#readFully} - Nashorn extension */
+    public static final MethodHandle READFULLY = findOwnMH("readFully",     Object.class, Object.class, Object.class);
 
     /** Handle to implementation of {@link ScriptingFunctions#read} - Nashorn extension */
     public static final MethodHandle QUIT = findOwnMH("quit",     Object.class, Object.class, Object.class);
@@ -78,7 +78,7 @@ public class ScriptingFunctions {
      *
      * @throws IOException if an exception occurs
      */
-    public static Object read(final Object self, final Object file) throws IOException {
+    public static Object readFully(final Object self, final Object file) throws IOException {
         File f = null;
 
         if (file instanceof File) {
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/Options.properties b/nashorn/src/jdk/nashorn/internal/runtime/resources/Options.properties
index 7a4e85b226b..534eb1778e6 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/resources/Options.properties
+++ b/nashorn/src/jdk/nashorn/internal/runtime/resources/Options.properties
@@ -172,6 +172,14 @@ nashorn.option.loader.per.compile = {              \
     default=true                                   \
 }
 
+nashorn.option.no.syntax.extensions = {            \
+    name="--no-syntax-extensions",                 \
+    short_name="--nse",                            \
+    is_undocumented=true,                          \
+    desc="No non-standard syntax extensions",      \
+    default=-anon-functions=false                  \
+}
+
 nashorn.option.package = {                                     \
     name="--package",                                          \
     is_undocumented=true,                                      \
diff --git a/nashorn/test/script/basic/JDK-8006983.js b/nashorn/test/script/basic/JDK-8006983.js
new file mode 100644
index 00000000000..2c126c41209
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8006983.js
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * 8006983: Introduce a command line option to switch off syntactic extensions of nashorn
+ *
+ * @test
+ * @option -scripting
+ * @option --no-syntax-extensions
+ * @run
+ */
+
+try {
+    eval("var r = new java.lang.Runnable() { run: function(){} }");
+    fail("should have thrown error for anon-class-style new");
+} catch (e) {
+    if (! (e instanceof SyntaxError)) {
+        fail("SyntaxError expected, got " + e);
+    }
+}
+
+try {
+    eval("var sqr = function(x) x*x ");
+    fail("should have thrown error for expression closures");
+} catch (e) {
+    if (! (e instanceof SyntaxError)) {
+        fail("SyntaxError expected, got " + e);
+    }
+}
+
+try {
+    eval("function() {};");
+    fail("should have thrown error for anonymous function statement");
+} catch (e) {
+    if (! (e instanceof SyntaxError)) {
+        fail("SyntaxError expected, got " + e);
+    }
+}
+
+try {
+    eval("for each (i in [22, 33, 33]) { print(i) }");
+    fail("should have thrown error for-each statement");
+} catch (e) {
+    if (! (e instanceof SyntaxError)) {
+        fail("SyntaxError expected, got " + e);
+    }
+}
+
+try {
+    eval("# shell style comment");
+    fail("should have thrown error for shell style comment");
+} catch (e) {
+    if (! (e instanceof SyntaxError)) {
+        fail("SyntaxError expected, got " + e);
+    }
+}
+
+try {
+    eval("print(<<EOF);\nhello\nworld\nEOF\n");
+    fail("should have thrown error heredoc");
+} catch (e) {
+    if (! (e instanceof SyntaxError)) {
+        fail("SyntaxError expected, got " + e);
+    }
+}
diff --git a/nashorn/test/script/basic/scripting.js b/nashorn/test/script/basic/scripting.js
index 93f6396882c..88096366ae3 100644
--- a/nashorn/test/script/basic/scripting.js
+++ b/nashorn/test/script/basic/scripting.js
@@ -78,4 +78,4 @@ EOD y = "No we don't";
 print(y);
 
 
-print(read(__FILE__));
+print(readFully(__FILE__));
diff --git a/nashorn/test/script/basic/scripting.js.EXPECTED b/nashorn/test/script/basic/scripting.js.EXPECTED
index 7d2e23e757f..4f06475e892 100644
--- a/nashorn/test/script/basic/scripting.js.EXPECTED
+++ b/nashorn/test/script/basic/scripting.js.EXPECTED
@@ -99,5 +99,5 @@ EOD y = "No we don't";
 print(y);
 
 
-print(read(__FILE__));
+print(readFully(__FILE__));
 

From 97a071dc3d4876875992cf2e35713d8d5ea9661b Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Mon, 28 Jan 2013 21:29:05 +0530
Subject: [PATCH 097/311] 8007004: nashorn script engine should not use thread
 context class loader as script 'application loader'

Reviewed-by: attila, hannesw
---
 .../api/scripting/NashornScriptEngine.java    | 15 ++-----
 .../scripting/NashornScriptEngineFactory.java | 45 ++++++++++++++++++-
 2 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
index c3521a36a3a..17b7cdcc847 100644
--- a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
+++ b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
@@ -74,27 +74,18 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
     // default options passed to Nashorn Options object
     private static final String[] DEFAULT_OPTIONS = new String[] { "-scripting", "-af", "-doe" };
 
-    NashornScriptEngine(final NashornScriptEngineFactory factory) {
-        this(factory, DEFAULT_OPTIONS);
+    NashornScriptEngine(final NashornScriptEngineFactory factory, final ClassLoader appLoader) {
+        this(factory, DEFAULT_OPTIONS, appLoader);
     }
 
     @SuppressWarnings("LeakingThisInConstructor")
-    NashornScriptEngine(final NashornScriptEngineFactory factory, final String[] args) {
+    NashornScriptEngine(final NashornScriptEngineFactory factory, final String[] args, final ClassLoader appLoader) {
         this.factory = factory;
         final Options options = new Options("nashorn");
         options.process(args);
 
         // throw ParseException on first error from script
         final ErrorManager errMgr = new Context.ThrowErrorManager();
-        // application loader for the context
-        ClassLoader tmp;
-        try {
-            tmp = Thread.currentThread().getContextClassLoader();
-        } catch (final SecurityException se) {
-            tmp = null;
-        }
-        final ClassLoader appLoader = tmp;
-
         // create new Nashorn Context
         this.nashornContext = AccessController.doPrivileged(new PrivilegedAction<Context>() {
             @Override
diff --git a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java
index fe80e91632b..50a22429e0e 100644
--- a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java
+++ b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java
@@ -31,6 +31,7 @@ import java.util.List;
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineFactory;
 import jdk.nashorn.internal.runtime.Version;
+import sun.reflect.Reflection;
 
 /**
  * JSR-223 compliant script engine factory for Nashorn. The engine answers for:
@@ -136,7 +137,7 @@ public final class NashornScriptEngineFactory implements ScriptEngineFactory {
 
     @Override
     public ScriptEngine getScriptEngine() {
-        return new NashornScriptEngine(this);
+        return new NashornScriptEngine(this, getAppClassLoader());
     }
 
     /**
@@ -146,7 +147,7 @@ public final class NashornScriptEngineFactory implements ScriptEngineFactory {
      * @return newly created script engine.
      */
     public ScriptEngine getScriptEngine(final String[] args) {
-        return new NashornScriptEngine(this, args);
+        return new NashornScriptEngine(this, args, getAppClassLoader());
     }
 
     // -- Internals only below this point
@@ -176,4 +177,44 @@ public final class NashornScriptEngineFactory implements ScriptEngineFactory {
     private static List<String> immutableList(final String... elements) {
         return Collections.unmodifiableList(Arrays.asList(elements));
     }
+
+    private static ClassLoader getAppClassLoader() {
+        if (System.getSecurityManager() == null) {
+            return ClassLoader.getSystemClassLoader();
+        }
+
+        // Try to determine the caller class loader. Use that if it can be
+        // found. If not, use the class loader of nashorn itself as the
+        // "application" class loader for scripts.
+
+        // User could have called ScriptEngineFactory.getScriptEngine()
+        //
+        // <caller>
+        //  <factory.getScriptEngine()>
+        //   <factory.getAppClassLoader()>
+        //    <Reflection.getCallerClass()>
+        //
+        // or used one of the getEngineByABC methods of ScriptEngineManager.
+        //
+        // <caller>
+        //  <ScriptEngineManager.getEngineByName()>
+        //   <factory.getScriptEngine()>
+        //    <factory.getAppClassLoader()>
+        //     <Reflection.getCallerClass()>
+
+        // So, stack depth is 3 or 4 (recall it is zero based). We try
+        // stack depths 3, 4 and look for non-bootstrap caller.
+        Class<?> caller = null;
+        for (int depth = 3; depth < 5; depth++) {
+            caller = Reflection.getCallerClass(depth);
+            if (caller != null && caller.getClassLoader() != null) {
+                // found a non-bootstrap caller
+                break;
+            }
+        }
+
+        final ClassLoader ccl = (caller == null)? null : caller.getClassLoader();
+        // if caller loader is null, then use nashorn's own loader
+        return (ccl == null)? NashornScriptEngineFactory.class.getClassLoader() : ccl;
+    }
 }

From 0b9014a9d6314f635440df47523d74b35ef8f74b Mon Sep 17 00:00:00 2001
From: James Laskey <james.laskey@oracle.com>
Date: Mon, 28 Jan 2013 16:22:03 -0400
Subject: [PATCH 098/311] 8006676: Integrate Nashorn into new build system

Reviewed-by: jlaskey
---
 nashorn/make/Makefile              |   1 +
 nashorn/makefiles/BuildNashorn.gmk | 121 +++++++++++++++++++++++++++++
 nashorn/makefiles/Makefile         |  49 ++++++++++++
 3 files changed, 171 insertions(+)
 create mode 100644 nashorn/makefiles/BuildNashorn.gmk
 create mode 100644 nashorn/makefiles/Makefile

diff --git a/nashorn/make/Makefile b/nashorn/make/Makefile
index 965c30a43a1..ee7593734a8 100644
--- a/nashorn/make/Makefile
+++ b/nashorn/make/Makefile
@@ -185,6 +185,7 @@ all: test docs
 
 # Standard make clobber target
 clobber: clean
+    $(ECHO) "Cleaning Nashorn! #1"
 
 # All ant targets of interest
 ANT_TARGETS = clean externals update-externals jar javadoc shelldoc docs test test262 test262parallel octane sunspider perf alltests
diff --git a/nashorn/makefiles/BuildNashorn.gmk b/nashorn/makefiles/BuildNashorn.gmk
new file mode 100644
index 00000000000..adfa1fd18a8
--- /dev/null
+++ b/nashorn/makefiles/BuildNashorn.gmk
@@ -0,0 +1,121 @@
+#
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# This must be the first rule
+default: all
+
+-include $(SPEC)
+include MakeBase.gmk
+include JavaCompilation.gmk
+
+# TODO: build-infra, move this to SPEC
+JAVAC_JARS ?= "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \
+		-jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar
+
+JDK_CLASSES := $(JDK_OUTPUTDIR)/classes
+# TODO: Remove dependency?
+DYNALINK_JAR := $(NASHORN_TOPDIR)/build/dynalink/dynalink.jar
+
+NASHORN_JAR := $(NASHORN_DIST)/nashorn.jar
+NASHORN_VERSION := 0.1
+
+# Need to use source and target 7 for nasgen to work.
+$(eval $(call SetupJavaCompiler,COMPILER_SETUP,\
+    JVM:=$(JAVA),\
+    JAVAC:=$(JAVAC_JARS),\
+    FLAGS:=-g -source 7 -target 7 -bootclasspath $(JDK_CLASSES),\
+    SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
+    SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
+
+# Build nashorn into intermediate directory
+$(eval $(call SetupJavaCompilation,BUILD_NASHORN,\
+    SETUP:=COMPILER_SETUP,\
+    SRC:=$(NASHORN_TOPDIR)/src,\
+    COPY:=.properties .js,\
+    BIN:=$(NASHORN_OUTPUTDIR)/nashorn_classes,\
+    ADD_JAVAC_FLAGS:=-cp $(DYNALINK_JAR)))
+
+# Build nasgen
+$(eval $(call SetupJavaCompilation,BUILD_NASGEN,\
+    SETUP:=COMPILER_SETUP,\
+    SRC:=$(NASHORN_TOPDIR)/buildtools/nasgen/src,\
+    BIN:=$(NASHORN_OUTPUTDIR)/nasgen_classes,\
+    ADD_JAVAC_FLAGS:=-cp $(NASHORN_OUTPUTDIR)/nashorn_classes))
+
+# Nasgen needs nashorn classes
+$(BUILD_NASGEN): $(BUILD_NASHORN)
+
+# Copy classes to final classes dir and run nasgen to modify classes in jdk.nashorn.internal.objects package
+# Finally rename classes in jdk.nashorn.internal.objects package
+$(NASHORN_OUTPUTDIR)/classes/_the.nasgen.run: $(BUILD_NASGEN)
+	$(ECHO) Running nasgen
+	$(MKDIR) -p $(@D)
+	$(RM) -rf $(@D)/jdk $(@D)/netscape
+	$(CP) -R -p $(NASHORN_OUTPUTDIR)/nashorn_classes/* $(@D)/
+	$(JDK_OUTPUTDIR)/bin/java \
+		-cp $(NASHORN_OUTPUTDIR)/nasgen_classes$(PATH_SEP)$(NASHORN_OUTPUTDIR)/nashorn_classes \
+		jdk.nashorn.internal.tools.nasgen.Main $(@D) jdk.nashorn.internal.objects $(@D)
+	for f in `$(FIND) $(@D)/jdk/nashorn/internal/objects/ -name "*.class"`; do \
+	  mv "$$f" `$(ECHO) "$$f" | $(SED) "s/\.class$$/\.clazz/"`; \
+        done
+	$(TOUCH) $@
+
+# Unpack dynalink.jar for inclusion in nashorn.jar
+$(NASHORN_OUTPUTDIR)/classes/_the.dynalink.unpacked: $(DYNALINK_JAR)
+	$(ECHO) Unpacking dynalink.jar
+	$(MKDIR) -p $(@D)
+	$(RM) -rf $(@D)/org
+	$(UNZIP) -q $(DYNALINK_JAR) -x "META-INF*" -d $(@D)
+	$(TOUCH) $@
+
+# Version file needs to be processed with version numbers
+VERSION_FILE := $(NASHORN_OUTPUTDIR)/classes/jdk/nashorn/internal/runtime/resources/version.properties
+# Needs to happen after nasgen run since nasgen run deletes it
+$(VERSION_FILE): $(NASHORN_OUTPUTDIR)/classes/_the.nasgen.run
+$(VERSION_FILE): $(NASHORN_TOPDIR)/src/jdk/nashorn/internal/runtime/resources/version.properties-template
+	$(ECHO) Creating version.properties
+	$(MKDIR) -p $(@D)
+	$(CAT) $< | $(SED) -e 's/$$(FULL_VERSION)/$(NASHORN_VERSION)/g' \
+		-e 's/$$(RELEASE)/$(NASHORN_VERSION)/g' \
+		-e '/^#.*$$/d' -e '/^$$/d'  > $@
+
+
+MANIFEST_ATTRIBUTES:=Name: jdk/nashorn/\nImplementation-Title: Oracle Nashorn\nImplementation-Version: $(NASHORN_VERSION)
+
+# Create nashorn.jar from the final classes dir
+$(eval $(call SetupArchive,BUILD_NASHORN_JAR,\
+    $(NASHORN_OUTPUTDIR)/classes/_the.nasgen.run \
+    $(NASHORN_OUTPUTDIR)/classes/_the.dynalink.unpacked \
+    $(VERSION_FILE),\
+    SRCS:=$(NASHORN_OUTPUTDIR)/classes,\
+    SUFFIXES:=.class .clazz .js .properties Factory,\
+    MANIFEST:=$(NASHORN_TOPDIR)/src/META-INF/MANIFEST.MF,\
+    EXTRA_MANIFEST_ATTR:=$(MANIFEST_ATTRIBUTES),\
+    SKIP_METAINF:=true,\
+    JAR:=$(NASHORN_JAR)))
+
+all: $(NASHORN_JAR)
+
+.PHONY: all
diff --git a/nashorn/makefiles/Makefile b/nashorn/makefiles/Makefile
new file mode 100644
index 00000000000..9539fe0e255
--- /dev/null
+++ b/nashorn/makefiles/Makefile
@@ -0,0 +1,49 @@
+#
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# Locate this Makefile
+ifeq ($(filter /%,$(lastword $(MAKEFILE_LIST))),)
+    makefile_path:=$(CURDIR)/$(lastword $(MAKEFILE_LIST))
+else
+    makefile_path:=$(lastword $(MAKEFILE_LIST))
+endif
+repo_dir:=$(patsubst %/makefiles/Makefile,%,$(makefile_path))
+
+# What is the name of this subsystem (langtools, corba, etc)?
+subsystem_name:=$(notdir $(repo_dir))
+
+# Try to locate top-level makefile
+top_level_makefile:=$(repo_dir)/../common/makefiles/Makefile
+ifneq ($(wildcard $(top_level_makefile)),)
+  $(info Will run $(subsystem_name) target on top-level Makefile)
+  $(info WARNING: This is a non-recommended way of building!)
+  $(info ===================================================)
+else
+  $(info Cannot locate top-level Makefile. Is this repo not checked out as part of a complete forest?)
+  $(error Build from top-level Makefile instead)
+endif
+
+all:
+	@$(MAKE) -f $(top_level_makefile) $(subsystem_name)

From ae80adfc1057c8518f40fe1aa2066e2a0a7b4a6b Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Tue, 29 Jan 2013 19:57:25 +0530
Subject: [PATCH 099/311] 8007091: Provide private API to pass application
 class loader for nashorn script engine

Reviewed-by: jlaskey, lagergren
---
 .../scripting/NashornScriptEngineFactory.java | 23 ++++-
 .../api/scripting/ScriptEngineTest.java       | 96 +++++++++++++++++++
 2 files changed, 118 insertions(+), 1 deletion(-)

diff --git a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java
index 50a22429e0e..47a0c595236 100644
--- a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java
+++ b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngineFactory.java
@@ -140,6 +140,16 @@ public final class NashornScriptEngineFactory implements ScriptEngineFactory {
         return new NashornScriptEngine(this, getAppClassLoader());
     }
 
+    /**
+     * Create a new Script engine initialized by given class loader.
+     *
+     * @param appLoader class loader to be used as script "app" class loader.
+     * @return newly created script engine.
+     */
+    public ScriptEngine getScriptEngine(final ClassLoader appLoader) {
+        return new NashornScriptEngine(this, appLoader);
+    }
+
     /**
      * Create a new Script engine initialized by given arguments.
      *
@@ -150,6 +160,17 @@ public final class NashornScriptEngineFactory implements ScriptEngineFactory {
         return new NashornScriptEngine(this, args, getAppClassLoader());
     }
 
+    /**
+     * Create a new Script engine initialized by given arguments.
+     *
+     * @param args arguments array passed to script engine.
+     * @param appLoader class loader to be used as script "app" class loader.
+     * @return newly created script engine.
+     */
+    public ScriptEngine getScriptEngine(final String[] args, final ClassLoader appLoader) {
+        return new NashornScriptEngine(this, args, appLoader);
+    }
+
     // -- Internals only below this point
 
     private static final List<String> names;
@@ -180,7 +201,7 @@ public final class NashornScriptEngineFactory implements ScriptEngineFactory {
 
     private static ClassLoader getAppClassLoader() {
         if (System.getSecurityManager() == null) {
-            return ClassLoader.getSystemClassLoader();
+            return Thread.currentThread().getContextClassLoader();
         }
 
         // Try to determine the caller class loader. Use that if it can be
diff --git a/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java b/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
index b6489f93d56..6b043f6af14 100644
--- a/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
+++ b/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
@@ -971,4 +971,100 @@ public class ScriptEngineTest {
             fail(se.getMessage());
         }
     }
+
+    private static class MyClassLoader extends ClassLoader {
+        // to check if script engine uses the specified class loader
+        private final boolean[] reached = new boolean[1];
+
+        @Override
+        protected Class findClass(final String name) throws ClassNotFoundException {
+            // flag that it reached here
+            reached[0] = true;
+            return super.findClass(name);
+        }
+
+        public boolean reached() {
+            return reached[0];
+        }
+    };
+
+    @Test
+    public void factoryClassLoaderTest() {
+        final ScriptEngineManager sm = new ScriptEngineManager();
+        for (ScriptEngineFactory fac : sm.getEngineFactories()) {
+            if (fac instanceof NashornScriptEngineFactory) {
+                final NashornScriptEngineFactory nfac = (NashornScriptEngineFactory)fac;
+                final MyClassLoader loader = new MyClassLoader();
+                // set the classloader as app class loader
+                final ScriptEngine e = nfac.getScriptEngine(loader);
+                try {
+                    e.eval("Packages.foo");
+                    // check that the class loader was attempted
+                    assertTrue(loader.reached(), "did not reach class loader!");
+                } catch (final ScriptException se) {
+                    se.printStackTrace();
+                    fail(se.getMessage());
+                }
+                return;
+            }
+        }
+
+        fail("Cannot find nashorn factory!");
+    }
+
+    @Test
+    public void factoryOptionsTest() {
+        final ScriptEngineManager sm = new ScriptEngineManager();
+        for (ScriptEngineFactory fac : sm.getEngineFactories()) {
+            if (fac instanceof NashornScriptEngineFactory) {
+                final NashornScriptEngineFactory nfac = (NashornScriptEngineFactory)fac;
+                // specify --no-syntax-extensions flag
+                final String[] options = new String[] { "--no-syntax-extensions" };
+                final ScriptEngine e = nfac.getScriptEngine(options);
+                try {
+                    // try nashorn specific extension
+                    e.eval("var f = funtion(x) 2*x;");
+                    fail("should have thrown exception!");
+                } catch (final ScriptException se) {
+                }
+                return;
+            }
+        }
+
+        fail("Cannot find nashorn factory!");
+    }
+
+    @Test
+    public void factoryClassLoaderAndOptionsTest() {
+        final ScriptEngineManager sm = new ScriptEngineManager();
+        for (ScriptEngineFactory fac : sm.getEngineFactories()) {
+            if (fac instanceof NashornScriptEngineFactory) {
+                final NashornScriptEngineFactory nfac = (NashornScriptEngineFactory)fac;
+                final String[] options = new String[] { "-strict" };
+                final MyClassLoader loader = new MyClassLoader();
+                // set the classloader as app class loader
+                final ScriptEngine e = nfac.getScriptEngine(options, loader);
+                try {
+                    e.eval("Packages.foo");
+                    // check that the class loader was attempted
+                    assertTrue(loader.reached(), "did not reach class loader!");
+                } catch (final ScriptException se) {
+                    se.printStackTrace();
+                    fail(se.getMessage());
+                }
+
+                try {
+                    // strict mode - delete of a var should throw SyntaxError
+                    e.eval("var d = 2; delete d;");
+                } catch (final ScriptException se) {
+                    // check that the error message contains "SyntaxError"
+                    assertTrue(se.getMessage().contains("SyntaxError"));
+                }
+
+                return;
+            }
+        }
+
+        fail("Cannot find nashorn factory!");
+    }
 }

From b342e3c53613ea0c2c58dfc74e91235d4bcc727c Mon Sep 17 00:00:00 2001
From: James Laskey <james.laskey@oracle.com>
Date: Tue, 29 Jan 2013 14:25:39 -0400
Subject: [PATCH 100/311] 8007094: Apply version to nashorn.jar manifest

Reviewed-by: sundar
---
 nashorn/makefiles/BuildNashorn.gmk | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/nashorn/makefiles/BuildNashorn.gmk b/nashorn/makefiles/BuildNashorn.gmk
index adfa1fd18a8..bab28ba1cc4 100644
--- a/nashorn/makefiles/BuildNashorn.gmk
+++ b/nashorn/makefiles/BuildNashorn.gmk
@@ -39,7 +39,14 @@ JDK_CLASSES := $(JDK_OUTPUTDIR)/classes
 DYNALINK_JAR := $(NASHORN_TOPDIR)/build/dynalink/dynalink.jar
 
 NASHORN_JAR := $(NASHORN_DIST)/nashorn.jar
-NASHORN_VERSION := 0.1
+NASHORN_VERSION := $(JDK_VERSION)
+NASHORN_FULL_VERSION := $(FULL_VERSION)
+
+ifdef MILESTONE
+  ifeq ($(MILESTONE),internal)
+    NASHORN_VERSION = $(FULL_VERSION)
+  endif
+endif
 
 # Need to use source and target 7 for nasgen to work.
 $(eval $(call SetupJavaCompiler,COMPILER_SETUP,\
@@ -97,12 +104,12 @@ $(VERSION_FILE): $(NASHORN_OUTPUTDIR)/classes/_the.nasgen.run
 $(VERSION_FILE): $(NASHORN_TOPDIR)/src/jdk/nashorn/internal/runtime/resources/version.properties-template
 	$(ECHO) Creating version.properties
 	$(MKDIR) -p $(@D)
-	$(CAT) $< | $(SED) -e 's/$$(FULL_VERSION)/$(NASHORN_VERSION)/g' \
+	$(CAT) $< | $(SED) -e 's/$$(FULL_VERSION)/$(NASHORN_FULL_VERSION)/g' \
 		-e 's/$$(RELEASE)/$(NASHORN_VERSION)/g' \
 		-e '/^#.*$$/d' -e '/^$$/d'  > $@
 
 
-MANIFEST_ATTRIBUTES:=Name: jdk/nashorn/\nImplementation-Title: Oracle Nashorn\nImplementation-Version: $(NASHORN_VERSION)
+MANIFEST_ATTRIBUTES:=Name: jdk/nashorn/\nImplementation-Title: Oracle Nashorn\nImplementation-Version: $(NASHORN_FULL_VERSION)
 
 # Create nashorn.jar from the final classes dir
 $(eval $(call SetupArchive,BUILD_NASHORN_JAR,\
@@ -117,5 +124,5 @@ $(eval $(call SetupArchive,BUILD_NASHORN_JAR,\
     JAR:=$(NASHORN_JAR)))
 
 all: $(NASHORN_JAR)
-
+    
 .PHONY: all

From 30b950d2d202afeff13b4ebf13fad091b506da97 Mon Sep 17 00:00:00 2001
From: Marcus Lagergren <lagergren@openjdk.org>
Date: Wed, 30 Jan 2013 12:26:45 +0100
Subject: [PATCH 101/311] 8007062: Split Lower up into
 Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes

Lower suffered from being a "God class" trying to do everything at once.  As Nashorn code generation has grown, so has Lower. It does several post processing passes, tries to do several things at once even though all type information isn't in place, adjusting state afterwards and so on. It also performs control flow analysis, type attribution and constant folding, and  everything else code generation related before byte code emission. I have now separated the compilation process into Lower (create low level nodes from high level ones, copy code such as finally block inlining etc), Attr (assign types and symbols to all nodes - freeze slot and scope information) and FinalizeTypes (insert explicit casts, specialize invoke dynamic types for scope accesses). I've removed the kludgy AccessSpecializer, as this now integrates naturally with typing. Everything is now much easier to read and each module performs only one thing. I have added separate loggers for the separate tiers. In the process I have also fixed: (1) problems with type coercion (see test/script/basic/typecoercion.js, basically our coercion was too late and our symbol inference was erroneous. This only manifested itself in very rare occasions where toNumber coercion has side effects, such as for example when valueOf is overridden)  (2) copying literal nodes (literal copy did not use the superclass copy, which made all the Node specific fields not to be copied  (3) erroneous literal tokenization (literals shouldn't always just inherit token information from whatever node that creates them) (4) splitter weighnodes - unary nodes were considered weightless  (4) removed the hateful and kludgy "VarNode.shouldAppend", which really isn't needed when we have an attribution phase that determines self reference symbols (the only thing it was used for) (5) duplicate line number issues in the parser (6) convert bug in CodeGenerator for intermediate results of scope accesses (see test/script/basic/access-specializer.js) ... Several of these things just stopped being problems with the new architecture "can't happen anymore" and are not bug fixes per se. All tests run. No performance regressions exist that I've been able to measure. Some increases in performance were measured, but in the statistical margin of error (which is very wide as HotSpot currently has warmup issues with LambdaForms/invoke dynamic). Compile speed has not measurably increased.

Reviewed-by: jlaskey, attila
---
 nashorn/docs/DEVELOPER_README                 |   53 +-
 .../jdk/nashorn/api/scripting/Formatter.java  |    7 +-
 .../api/scripting/NashornScriptEngine.java    |    1 +
 .../internal/codegen/AccessSpecializer.java   |  399 ---
 .../jdk/nashorn/internal/codegen/Attr.java    | 1584 +++++++++
 .../internal/codegen/CodeGenerator.java       |   73 +-
 .../nashorn/internal/codegen/Compiler.java    |  129 +-
 .../internal/codegen/FinalizeTypes.java       |  919 +++++
 .../internal/codegen/FoldConstants.java       |  278 ++
 .../jdk/nashorn/internal/codegen/Lower.java   | 3039 +++--------------
 .../internal/codegen/MethodEmitter.java       |    6 +-
 .../internal/codegen/SharedScopeCall.java     |    4 +-
 .../nashorn/internal/codegen/WeighNodes.java  |  294 +-
 .../objects/FunctionObjectCreator.java        |    9 +-
 .../src/jdk/nashorn/internal/ir/Block.java    |   29 +-
 .../src/jdk/nashorn/internal/ir/CallNode.java |   77 +-
 .../jdk/nashorn/internal/ir/CatchNode.java    |    2 +-
 .../jdk/nashorn/internal/ir/ExecuteNode.java  |   12 +-
 .../jdk/nashorn/internal/ir/FunctionNode.java |  117 +-
 .../jdk/nashorn/internal/ir/LiteralNode.java  |  407 ++-
 nashorn/src/jdk/nashorn/internal/ir/Node.java |   33 +-
 .../jdk/nashorn/internal/ir/RuntimeNode.java  |   63 +
 .../src/jdk/nashorn/internal/ir/Symbol.java   |   66 +-
 .../src/jdk/nashorn/internal/ir/TryNode.java  |   20 +
 .../src/jdk/nashorn/internal/ir/VarNode.java  |   31 -
 .../nashorn/internal/ir/debug/ASTWriter.java  |    4 +-
 .../nashorn/internal/objects/NativeJSON.java  |    2 +-
 .../internal/objects/NativeString.java        |   18 +-
 .../internal/parser/AbstractParser.java       |    5 -
 .../jdk/nashorn/internal/parser/Parser.java   |   34 +-
 .../nashorn/internal/parser/TokenType.java    |    2 +
 .../jdk/nashorn/internal/runtime/Context.java |    4 +-
 .../nashorn/internal/runtime/DebugLogger.java |   21 +-
 .../internal/runtime/OptionsObject.java       |    5 +
 .../nashorn/internal/runtime/PropertyMap.java |    8 +-
 .../internal/runtime/ScriptObject.java        |   78 +-
 .../internal/runtime/ScriptingFunctions.java  |    4 +-
 .../runtime/arrays/ArrayIterator.java         |    1 -
 .../runtime/arrays/ArrayLikeIterator.java     |    1 -
 .../runtime/arrays/FrozenArrayFilter.java     |    1 -
 .../runtime/arrays/SealedArrayFilter.java     |    1 -
 .../runtime/linker/LinkerCallSite.java        |    4 +-
 .../internal/runtime/options/Options.java     |    2 +-
 nashorn/src/jdk/nashorn/tools/Shell.java      |    6 +-
 .../test/script/basic/access-specializer.js   |   43 +
 .../script/basic/compile-octane.js.EXPECTED   |   24 +
 nashorn/test/script/basic/run-octane.js       |   12 +-
 nashorn/test/script/basic/typecoerce.js       |   53 +
 .../test/script/basic/typecoerce.js.EXPECTED  |    5 +
 49 files changed, 4525 insertions(+), 3465 deletions(-)
 delete mode 100644 nashorn/src/jdk/nashorn/internal/codegen/AccessSpecializer.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/Attr.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/FinalizeTypes.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/FoldConstants.java
 create mode 100644 nashorn/test/script/basic/access-specializer.js
 create mode 100644 nashorn/test/script/basic/typecoerce.js
 create mode 100644 nashorn/test/script/basic/typecoerce.js.EXPECTED

diff --git a/nashorn/docs/DEVELOPER_README b/nashorn/docs/DEVELOPER_README
index 55c41010382..f628d0c058f 100644
--- a/nashorn/docs/DEVELOPER_README
+++ b/nashorn/docs/DEVELOPER_README
@@ -36,16 +36,6 @@ See the description of the access logger below. This flag is
 equivalent to enabling the access logger with "info" level.
 
 
-SYSTEM PROPERTY: -Dnashorn.compiler.ints.disable
-
-This flag prevents ints and longs (non double values) from being used
-for any primitive representation in the lowered IR. This is default
-false, i.e Lower will attempt to use integer variables as long as it
-can. For example, var x = 17 would try to use x as an integer, unless
-other operations occur later that require coercion to wider type, for
-example x *= 17.1;
-
-
 SYSTEM PROPERTY: -Dnashorn.compiler.intarithmetic 
 
 Arithmetic operations in Nashorn (except bitwise ones) typically
@@ -195,7 +185,8 @@ We still have to deal with objects vs primitives for local bytecode
 slots, possibly through code copying and versioning.
 
 
-SYSTEM PROPERTY: -Dnashorn.compiler.symbol.trace=<x>
+SYSTEM PROPERTY: -Dnashorn.compiler.symbol.trace=[<x>[,*]], 
+  -Dnashorn.compiler.symbol.stacktrace=[<x>[,*]]
 
 When this property is set, creation and manipulation of any symbol
 named "x" will show information about when the compiler changes its
@@ -203,8 +194,16 @@ type assumption, bytecode local variable slot assignment and other
 data. This is useful if, for example, a symbol shows up as an Object,
 when you believe it should be a primitive. Usually there is an
 explanation for this, for example that it exists in the global scope
-and type analysis has to be more conservative. In that case, the stack
-trace upon type change to object will usually tell us why.
+and type analysis has to be more conservative. 
+
+Several symbols names to watch can be specified by comma separation.
+
+If no variable name is specified (and no equals sign), all symbols
+will be watched
+
+By using "stacktrace" instead of or together with "trace", stack
+traces will be displayed upon symbol changes according to the same
+semantics.
 
 
 SYSTEM PROPERTY: nashorn.lexer.xmlliterals
@@ -349,6 +348,9 @@ this system property.
 2. The loggers.
 ===============
 
+It is very simple to create your own logger. Use the DebugLogger class
+and give the subsystem name as a constructor argument.
+
 The Nashorn loggers can be used to print per-module or per-subsystem
 debug information with different levels of verbosity. The loggers for
 a given subsystem are available are enabled by using
@@ -382,7 +384,7 @@ into byte code, and installs the classes into a class loader
 controlled from the Context. Log messages are, for example, about
 things like new compile units being allocated. The compiler has global
 settings that all the tiers of codegen (e.g. Lower and CodeGenerator)
-use.
+use.s
 
 
 * codegen
@@ -429,6 +431,18 @@ The --log=codegen option is equivalent to setting the system variable
 
 * lower
 
+This is the first lowering pass.
+
+Lower is a code generation pass that turns high level IR nodes into
+lower level one, for example substituting comparisons to RuntimeNodes
+and inlining finally blocks.
+
+Lower is also responsible for determining control flow information
+like end points.
+
+
+* attr
+
 The lowering annotates a FunctionNode with symbols for each identifier
 and transforms high level constructs into lower level ones, that the
 CodeGenerator consumes.
@@ -439,14 +453,11 @@ specialization information. Currently very little info is generated by
 this logger. This will probably change.
 
 
-* access
+* finalize
 
-The --log=access option is equivalent to setting the system variable
-"nashorn.callsiteaccess.debug" to true. There are several levels of
-the access logger, usually the default level "info" is enough
-
-It is very simple to create your own logger. Use the DebugLogger class
-and give the subsystem name as a constructor argument.
+This --log=finalize log option outputs information for type finalization,
+the third tier of the compiler. This means things like placement of 
+specialized scope nodes or explicit conversions. 
 
 
 * fields
diff --git a/nashorn/src/jdk/nashorn/api/scripting/Formatter.java b/nashorn/src/jdk/nashorn/api/scripting/Formatter.java
index 12e7cb18aa0..3b47d3479e4 100644
--- a/nashorn/src/jdk/nashorn/api/scripting/Formatter.java
+++ b/nashorn/src/jdk/nashorn/api/scripting/Formatter.java
@@ -48,6 +48,9 @@ import java.util.regex.Pattern;
  */
 public final class Formatter {
 
+    private Formatter() {
+    }
+
     /**
      * Method which converts javascript types to java types for the
      * String.format method (jrunscript function sprintf).
@@ -149,7 +152,9 @@ public final class Formatter {
         if (s != null) {
             try {
                 index = Integer.parseInt(s.substring(0, s.length() - 1));
-            } catch (NumberFormatException e) { }
+            } catch (final NumberFormatException e) {
+                //ignored
+            }
         } else {
             index = 0;
         }
diff --git a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
index 17b7cdcc847..34425883dff 100644
--- a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
+++ b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
@@ -327,6 +327,7 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
         try {
             final InputStream is = AccessController.doPrivileged(
                     new PrivilegedExceptionAction<InputStream>() {
+                        @Override
                         public InputStream run() throws Exception {
                             final URL url = NashornScriptEngine.class.getResource(script);
                             return url.openStream();
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/AccessSpecializer.java b/nashorn/src/jdk/nashorn/internal/codegen/AccessSpecializer.java
deleted file mode 100644
index e6eee814319..00000000000
--- a/nashorn/src/jdk/nashorn/internal/codegen/AccessSpecializer.java
+++ /dev/null
@@ -1,399 +0,0 @@
-/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.nashorn.internal.codegen;
-
-import java.util.HashSet;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.ir.AccessNode;
-import jdk.nashorn.internal.ir.Assignment;
-import jdk.nashorn.internal.ir.BinaryNode;
-import jdk.nashorn.internal.ir.CallNode;
-import jdk.nashorn.internal.ir.IdentNode;
-import jdk.nashorn.internal.ir.IndexNode;
-import jdk.nashorn.internal.ir.Node;
-import jdk.nashorn.internal.ir.ReferenceNode;
-import jdk.nashorn.internal.ir.Symbol;
-import jdk.nashorn.internal.ir.TypeOverride;
-import jdk.nashorn.internal.ir.UnaryNode;
-import jdk.nashorn.internal.ir.VarNode;
-import jdk.nashorn.internal.ir.visitor.NodeOperatorVisitor;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
-import jdk.nashorn.internal.parser.Token;
-import jdk.nashorn.internal.parser.TokenType;
-import jdk.nashorn.internal.runtime.Debug;
-import jdk.nashorn.internal.runtime.DebugLogger;
-
-/**
- * This is a post pass for Lower, that removes casts for accessors to objects in
- * Scope, and replaces the accessor type with a narrower one with possible.
- *
- * Any node that implements TypeOverride will be subject to access specialization.
- *
- * TypeOverride basically means "type inference has determined that the field x
- * is an object, but if you do x & 17, it can be read as an int, which we hope
- * coincides with its internal representation. In that case there is no boxing
- * that may or may not be removed by the JVM and less data bandwidth.
- *
- * Ideally this should not be a post pass, but it requires slot AND scope info, and has
- * to be run where it is, which is called from {@link CodeGenerator}.
- *
- * @see TypeOverride
- */
-
-final class AccessSpecializer extends NodeOperatorVisitor {
-    /** Debug logger for access specialization. Enable it with --log=access:level
-        or -Dnashorn.callsiteaccess.debug */
-    private static final DebugLogger LOG   = new DebugLogger("access", "nashorn.callsiteaccess.debug");
-    private static final boolean     DEBUG = LOG.isEnabled();
-
-    @Override
-    public Node leave(final VarNode varNode) {
-        if (varNode.isAssignment()) {
-            return leaveAssign(varNode);
-        }
-
-        return varNode;
-    }
-
-    @Override
-    public Node leave(final CallNode callNode) {
-        final Node function = callNode.getFunction();
-        if (function instanceof ReferenceNode) {
-            changeType(callNode, ((ReferenceNode)function).getReference().getType());
-        }
-        return callNode;
-    }
-
-    @Override
-    public Node leaveASSIGN(final BinaryNode binaryNode) {
-        return leaveAssign(binaryNode);
-    }
-
-    @Override
-    public Node leaveASSIGN_ADD(final BinaryNode binaryNode) {
-        return leaveAssign(binaryNode);
-    }
-
-    @Override
-    public Node leaveASSIGN_BIT_AND(final BinaryNode binaryNode) {
-        return leaveAssign(binaryNode);
-    }
-
-    @Override
-    public Node leaveASSIGN_BIT_OR(final BinaryNode binaryNode) {
-        return leaveAssign(binaryNode);
-    }
-
-    @Override
-    public Node leaveASSIGN_BIT_XOR(final BinaryNode binaryNode) {
-        return leaveAssign(binaryNode);
-    }
-
-    @Override
-    public Node leaveASSIGN_DIV(final BinaryNode binaryNode) {
-        return leaveAssign(binaryNode);
-    }
-
-    @Override
-    public Node leaveASSIGN_MOD(final BinaryNode binaryNode) {
-        return leaveAssign(binaryNode);
-    }
-
-    @Override
-    public Node leaveASSIGN_MUL(final BinaryNode binaryNode) {
-        return leaveAssign(binaryNode);
-    }
-
-    @Override
-    public Node leaveASSIGN_SAR(final BinaryNode binaryNode) {
-        return leaveAssign(binaryNode);
-    }
-
-    @Override
-    public Node leaveASSIGN_SHL(final BinaryNode binaryNode) {
-        return leaveAssign(binaryNode);
-    }
-
-    @Override
-    public Node leaveASSIGN_SHR(final BinaryNode binaryNode) {
-        return leaveAssign(binaryNode);
-    }
-
-    @Override
-    public Node leaveASSIGN_SUB(final BinaryNode binaryNode) {
-        return leaveAssign(binaryNode);
-    }
-
-    @Override
-    public Node leaveCOMMALEFT(final BinaryNode binaryNode) {
-        return propagateResultType(binaryNode, binaryNode.lhs().getType());
-    }
-
-    @Override
-    public Node leaveCOMMARIGHT(final BinaryNode binaryNode) {
-        return propagateResultType(binaryNode, binaryNode.rhs().getType());
-    }
-
-    @Override
-    public Node leaveCONVERT(final UnaryNode unaryNode) {
-        final Type castTo = unaryNode.getType();
-
-        Node rhs = unaryNode.rhs();
-
-        // Go through all conversions until we find the first non-convert node.
-        while (rhs.tokenType() == TokenType.CONVERT) {
-            rhs = ((UnaryNode)rhs).rhs();
-        }
-
-        // If this node can be type changed
-        if (canHaveCallSiteType(rhs) && isSupportedCallSiteType(castTo)) {
-            /*
-             * Just add a callsite type and throw away the cast, appropriate
-             * getter/setter is selected, which will do the conversion for us
-             */
-            changeType(rhs, castTo);
-            LOG.fine("*** cast: converting " + debugNode(unaryNode) + " to " + debugNode(rhs));
-
-            return rhs;
-        }
-
-        // Micro optimization for node hygiene and pattern detection - remove unnecessary same type cast
-        if (unaryNode.getType().isEquivalentTo(rhs.getType())) {
-            return rhs;
-        }
-
-        return unaryNode;
-    }
-
-    @Override
-    public Node leaveDECINC(final UnaryNode unaryNode) {
-        assert unaryNode.isAssignment();
-
-        final Node dest = unaryNode.getAssignmentDest();
-        if (canHaveCallSiteType(dest) && isSupportedCallSiteType(unaryNode.getType())) {
-            changeTypeInAssignment(dest, unaryNode.getType());
-        }
-
-        return unaryNode;
-    }
-
-    /**
-     * Is this a node that can have its type overridden. This is true for
-     * AccessNodes, IndexNodes and IdentNodes
-     *
-     * @param node the node to check
-     * @return true if node can have a callsite type
-     */
-    private static boolean canHaveCallSiteType(final Node node) {
-        return node instanceof TypeOverride && ((TypeOverride)node).canHaveCallSiteType();
-    }
-
-    /**
-     * Is the specialization type supported. Currently we treat booleans as objects
-     * and have no special boolean type accessor, thus booleans are ignored.
-     * TODO - support booleans? NASHORN-590
-     *
-     * @param castTo the type to check
-     * @return true if call site type is supported
-     */
-    private static boolean isSupportedCallSiteType(final Type castTo) {
-        return castTo.isNumeric(); // don't specializable for boolean
-    }
-
-    /**
-     * Turn a node into a covert node
-     *
-     * @param  node the node
-     * @return the node as a convert node
-     */
-    private static Node convert(final Node node) {
-        return new UnaryNode(node.getSource(),
-                Token.recast(node.getToken(), TokenType.CONVERT),
-                node);
-    }
-
-    private static Node leaveAssign(final Node node) {
-        assert node.isAssignment() : node + " is not an assignment";
-
-
-        final Node lhs = ((Assignment<?>)node).getAssignmentDest();
-        Node       rhs = ((Assignment<?>)node).getAssignmentSource();
-
-        /**
-         * Nodes with local variable slots  are assumed to be of their optimal type
-         * already and aren't affected here. This is not strictly true, for instance
-         * with doubles instead of in a bounded loop. TODO - range check: NASHORN-363
-         *
-         * This is also not strictly true for var y = x = 55; where y has no other uses
-         * Then y can be an int, but lower conservatively does an object of the assign to
-         * scope
-         */
-        final Symbol lhsSymbol = lhs.getSymbol();
-
-        if (lhsSymbol.hasSlot() && !lhsSymbol.isScope()) {
-            LOG.finest(lhs.getSymbol() + " has slot!");
-            if (!lhs.getType().isEquivalentTo(rhs.getType())) {
-                LOG.finest("\tslot assignment: " +lhs.getType()+ " " +rhs.getType() + " " + debugNode(node));
-
-                final Node c = convert(rhs);
-                c.setSymbol(lhsSymbol);
-                ((Assignment<?>)node).setAssignmentSource(c);
-
-                LOG.fine("*** slot assignment turned to : " + debugNode(node));
-            } else {
-                LOG.finest("aborted - type equivalence between lhs and rhs");
-            }
-
-            return node;
-        }
-
-        // e.g. __DIR__, __LINE__, __FILE__ - don't try to change these
-        if (lhs instanceof IdentNode && ((IdentNode)lhs).isSpecialIdentity()) {
-            return node;
-        }
-
-        /**
-         * Try to cast to the type of the right hand side, now pruned. E.g. an (object)17 should
-         * now be just 17, an int.
-         */
-        Type castTo = rhs.getType();
-
-        // If LHS can't get a new type, neither can rhs - retain the convert
-        if (!canHaveCallSiteType(lhs)) {
-            return node;
-        }
-
-        // Take the narrowest type of the entire cast sequence
-        while (rhs.tokenType() == TokenType.CONVERT) {
-            rhs    = ((UnaryNode)rhs).rhs();
-            castTo = Type.narrowest(rhs.getType(), castTo); //e.g. (object)(int) -> int even though object is outermost
-        }
-
-        // If castTo is wider than widestOperationType, castTo can be further slowed down
-        final Type widestOperationType = node.getWidestOperationType();
-        LOG.finest("node wants to be " + castTo + " and its widest operation is " + widestOperationType);
-
-        if (widestOperationType != castTo && Type.widest(castTo, widestOperationType) == castTo) {
-            LOG.info("###" + node + " castTo was " + castTo + " but could be downgraded to " + node.getWidestOperationType());
-            castTo = node.getWidestOperationType();
-            if (rhs instanceof TypeOverride) {
-                changeType(rhs, castTo);
-            }
-        }
-
-        /*
-         * If this is a self modifying op, we can't be narrower than the widest optype
-         * or e.g. x = x + 12 and x += 12 will turn into different things
-         */
-        if (node.isSelfModifying()) {
-            castTo = Type.widest(widestOperationType, castTo);
-        }
-
-        // We only specialize for numerics, not for booleans.
-        if (isSupportedCallSiteType(castTo)) {
-            if (rhs.getType() != castTo) {
-                LOG.finest("cast was necessary, abort: " + node + " " + rhs.getType() + " != " + castTo);
-                return node;
-            }
-
-            LOG.finest("assign: " + debugNode(node));
-
-            changeTypeInAssignment(lhs, castTo);
-            ((Assignment<?>)node).setAssignmentSource(rhs);
-
-            LOG.info("### modified to " + debugNode(node) + " (given type override " + castTo + ")");
-
-            propagateResultType(node, castTo);
-        }
-
-        return node;
-    }
-
-    private static Node propagateResultType(final Node node, final Type type) {
-        //warning! this CANNOT be done for non temporaries as they are used in other computations
-        if (isSupportedCallSiteType(type)) {
-            if (node.getSymbol().isTemp()) {
-                LOG.finest("changing temporary type: " + debugNode(node) + " to " + type);
-                node.getSymbol().setTypeOverride(type);
-                LOG.info("### node modified to " + debugNode(node) + " (given type override " + type + ")");
-            }
-        }
-        return node;
-    }
-
-    private static void changeTypeInAssignment(final Node dest, final Type newType) {
-        if (changeType(dest, newType)) {
-            LOG.finest("changed assignment " + dest + " " + dest.getSymbol());
-            assert !newType.isObject();
-
-            final HashSet<Node> exclude = new HashSet<>();
-
-            dest.accept(new NodeVisitor() {
-
-                private void setCanBePrimitive(final Symbol symbol) {
-                    LOG.fine("*** can be primitive symbol " + symbol + " " + Debug.id(symbol));
-                    symbol.setCanBePrimitive(newType);
-                }
-
-                @Override
-                public Node enter(final IdentNode identNode) {
-                    if (!exclude.contains(identNode)) {
-                        setCanBePrimitive(identNode.getSymbol());
-                    }
-                    return null;
-                }
-
-                @Override
-                public Node enter(final AccessNode accessNode) {
-                    setCanBePrimitive(accessNode.getProperty().getSymbol());
-                    return null;
-                }
-
-                @Override
-                public Node enter(final IndexNode indexNode) {
-                    exclude.add(indexNode.getBase()); //prevent array base node to be flagged as primitive, but k in a[k++] is fine
-                    return indexNode;
-                }
-
-            });
-        }
-    }
-
-    private static boolean changeType(final Node node, final Type newType) {
-        if (!node.getType().equals(newType)) {
-            ((TypeOverride)node).setType(newType);
-            return true;
-        }
-        return false;
-    }
-
-    private static String debugNode(final Node node) {
-        if (DEBUG) {
-            return node.toString();
-        }
-        return "";
-    }
-}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Attr.java b/nashorn/src/jdk/nashorn/internal/codegen/Attr.java
new file mode 100644
index 00000000000..82e7c035992
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Attr.java
@@ -0,0 +1,1584 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.codegen;
+
+import static jdk.nashorn.internal.codegen.CompilerConstants.CALLEE;
+import static jdk.nashorn.internal.codegen.CompilerConstants.EXCEPTION_PREFIX;
+import static jdk.nashorn.internal.codegen.CompilerConstants.ITERATOR_PREFIX;
+import static jdk.nashorn.internal.codegen.CompilerConstants.SCOPE;
+import static jdk.nashorn.internal.codegen.CompilerConstants.SCRIPT_RETURN;
+import static jdk.nashorn.internal.codegen.CompilerConstants.SWITCH_TAG_PREFIX;
+import static jdk.nashorn.internal.codegen.CompilerConstants.THIS;
+import static jdk.nashorn.internal.codegen.CompilerConstants.VARARGS;
+import static jdk.nashorn.internal.ir.Symbol.IS_GLOBAL;
+import static jdk.nashorn.internal.ir.Symbol.IS_INTERNAL;
+import static jdk.nashorn.internal.ir.Symbol.IS_LET;
+import static jdk.nashorn.internal.ir.Symbol.IS_PARAM;
+import static jdk.nashorn.internal.ir.Symbol.IS_THIS;
+import static jdk.nashorn.internal.ir.Symbol.IS_VAR;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.ir.AccessNode;
+import jdk.nashorn.internal.ir.BinaryNode;
+import jdk.nashorn.internal.ir.Block;
+import jdk.nashorn.internal.ir.CallNode;
+import jdk.nashorn.internal.ir.CallNode.EvalArgs;
+import jdk.nashorn.internal.ir.CaseNode;
+import jdk.nashorn.internal.ir.CatchNode;
+import jdk.nashorn.internal.ir.ForNode;
+import jdk.nashorn.internal.ir.FunctionNode;
+import jdk.nashorn.internal.ir.IdentNode;
+import jdk.nashorn.internal.ir.IndexNode;
+import jdk.nashorn.internal.ir.LiteralNode;
+import jdk.nashorn.internal.ir.LiteralNode.ArrayLiteralNode;
+import jdk.nashorn.internal.ir.Node;
+import jdk.nashorn.internal.ir.ObjectNode;
+import jdk.nashorn.internal.ir.PropertyNode;
+import jdk.nashorn.internal.ir.ReferenceNode;
+import jdk.nashorn.internal.ir.ReturnNode;
+import jdk.nashorn.internal.ir.RuntimeNode;
+import jdk.nashorn.internal.ir.RuntimeNode.Request;
+import jdk.nashorn.internal.ir.SwitchNode;
+import jdk.nashorn.internal.ir.Symbol;
+import jdk.nashorn.internal.ir.TernaryNode;
+import jdk.nashorn.internal.ir.TryNode;
+import jdk.nashorn.internal.ir.UnaryNode;
+import jdk.nashorn.internal.ir.VarNode;
+import jdk.nashorn.internal.ir.visitor.NodeOperatorVisitor;
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.parser.TokenType;
+import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.runtime.Debug;
+import jdk.nashorn.internal.runtime.DebugLogger;
+import jdk.nashorn.internal.runtime.ECMAException;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.Property;
+import jdk.nashorn.internal.runtime.PropertyMap;
+import jdk.nashorn.internal.runtime.ScriptFunction;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * This is the attribution pass of the code generator. Attr takes Lowered IR,
+ * that is, IR where control flow has been computed and high level to low level
+ * substitions for operations have been performed.
+ *
+ * After Attr, every symbol will have a conservative correct type.
+ *
+ * Any expression that requires temporary storage as part of computation will
+ * also be detected here and give a temporary symbol
+ *
+ * Types can be narrowed after Attr by Access Specialization in FinalizeTypes,
+ * but in general, this is where the main symbol type information is
+ * computed.
+ */
+
+final class Attr extends NodeOperatorVisitor {
+    /** Current compiler. */
+    private final Compiler compiler;
+
+    /** Current source. */
+    private final Source source;
+
+    /**
+     * Local definitions in current block (to discriminate from function
+     * declarations always defined in the function scope. This is for
+     * "can be undefined" analysis.
+     */
+    private Set<String> localDefs;
+
+    /**
+     * Local definitions in current block to guard against cases like
+     * NASHORN-467 when things can be undefined as they are used before
+     * their local var definition. *sigh* JavaScript...
+     */
+    private Set<String> localUses;
+
+    private static final DebugLogger LOG = new DebugLogger("attr");
+
+    /**
+     * Constructor.
+     *
+     * @param compiler the compiler
+     */
+    Attr(final Compiler compiler) {
+        this.compiler = compiler;
+        this.source   = compiler.getSource();
+    }
+
+    @Override
+    protected Node enterDefault(final Node node) {
+        return start(node);
+    }
+
+    @Override
+    protected Node leaveDefault(final Node node) {
+        return end(node);
+    }
+
+    @Override
+    public Node leave(final AccessNode accessNode) {
+        newTemporary(Type.OBJECT, accessNode);  //While Object type is assigned here, Access Specialization in FinalizeTypes may narrow this
+        end(accessNode);
+        return accessNode;
+    }
+
+    @Override
+    public Node enter(final Block block) {
+        start(block);
+
+        final Set<String> savedLocalDefs = localDefs;
+        final Set<String> savedLocalUses = localUses;
+
+        block.setFrame(getCurrentFunctionNode().pushFrame());
+
+        try {
+            // a block starts out by copying the local defs and local uses
+            // from the outer level. But we need the copies, as when we
+            // leave the block the def and use sets given upon entry must
+            // be restored
+            localDefs = new HashSet<>(savedLocalDefs);
+            localUses = new HashSet<>(savedLocalUses);
+
+            for (final Node statement : block.getStatements()) {
+                statement.accept(this);
+            }
+        } finally {
+            localDefs = savedLocalDefs;
+            localUses = savedLocalUses;
+
+            getCurrentFunctionNode().popFrame();
+        }
+
+        end(block);
+
+        return null;
+    }
+
+    @Override
+    public Node enter(final CallNode callNode) {
+        start(callNode);
+
+        callNode.getFunction().accept(this);
+
+        final List<Node> acceptedArgs = new ArrayList<>(callNode.getArgs().size());
+        for (final Node arg : callNode.getArgs()) {
+            LOG.info("Doing call arg " + arg);
+            acceptedArgs.add(arg.accept(this));
+        }
+        callNode.setArgs(acceptedArgs);
+
+        final EvalArgs evalArgs = callNode.getEvalArgs();
+        if (evalArgs != null) {
+            evalArgs.setCode(evalArgs.getCode().accept(this));
+
+            final IdentNode thisNode = new IdentNode(getCurrentFunctionNode().getThisNode());
+            assert thisNode.getSymbol() != null; //should copy attributed symbol and that's it
+            evalArgs.setThis(thisNode);
+        }
+
+        newTemporary(Type.OBJECT, callNode); // object type here, access specialization in FinalizeTypes may narrow it later
+        newType(callNode.getFunction().getSymbol(), Type.OBJECT);
+
+        end(callNode);
+
+        return null;
+    }
+
+    @Override
+    public Node enter(final CatchNode catchNode) {
+        final IdentNode exception = catchNode.getException();
+        final Block     block     = getCurrentBlock();
+
+        start(catchNode);
+
+        // define block-local exception variable
+        final Symbol def = block.defineSymbol(exception.getName(), IS_VAR | IS_LET, exception);
+        newType(def, Type.OBJECT);
+        addLocalDef(exception.getName());
+
+        return catchNode;
+    }
+
+    @Override
+    public Node enter(final FunctionNode functionNode) {
+        start(functionNode, false);
+
+        clearLocalDefs();
+        clearLocalUses();
+
+        functionNode.setFrame(functionNode.pushFrame());
+
+        initThis(functionNode);
+        initCallee(functionNode);
+        if (functionNode.isVarArg()) {
+            initVarArg(functionNode);
+        }
+
+        initParameters(functionNode);
+        initScope(functionNode);
+        initReturn(functionNode);
+
+        // Add all nested functions as symbols in this function
+        for (final FunctionNode nestedFunction : functionNode.getFunctions()) {
+            final IdentNode ident = nestedFunction.getIdent();
+            if (ident != null && nestedFunction.isStatement()) {
+                final Symbol functionSymbol = functionNode.defineSymbol(ident.getName(), IS_VAR, nestedFunction);
+                newType(functionSymbol, Type.typeFor(ScriptFunction.class));
+            }
+        }
+
+        if (functionNode.isScript()) {
+            initFromPropertyMap(compiler.getContext(), functionNode);
+        }
+
+        // Add function name as local symbol
+        if (!functionNode.isStatement() && !functionNode.isAnonymous() && !functionNode.isScript()) {
+            final Symbol selfSymbol = functionNode.defineSymbol(functionNode.getIdent().getName(), IS_VAR, functionNode);
+            newType(selfSymbol, Type.OBJECT);
+            selfSymbol.setNode(functionNode);
+        }
+
+        /*
+         * This pushes all declarations (except for non-statements, i.e. for
+         * node temporaries) to the top of the function scope. This way we can
+         * get around problems like
+         *
+         * while (true) {
+         *   break;
+         *   if (true) {
+         *     var s;
+         *   }
+         * }
+         *
+         * to an arbitrary nesting depth.
+         *
+         * @see NASHORN-73
+         */
+
+        final List<Symbol> declaredSymbols = new ArrayList<>();
+        for (final VarNode decl : functionNode.getDeclarations()) {
+            final IdentNode ident = decl.getName();
+            // any declared symbols that aren't visited need to be typed as well, hence the list
+            declaredSymbols.add(functionNode.defineSymbol(ident.getName(), IS_VAR, new IdentNode(ident)));
+        }
+
+        // Every nested function needs a definition in the outer function with its name. Add these.
+        for (final FunctionNode nestedFunction : functionNode.getFunctions()) {
+            final VarNode varNode = nestedFunction.getFunctionVarNode();
+            if (varNode != null) {
+                varNode.accept(this);
+                assert varNode.isFunctionVarNode() : varNode + " should be function var node";
+            }
+        }
+
+        for (final Node statement : functionNode.getStatements()) {
+            if (statement instanceof VarNode && ((VarNode)statement).isFunctionVarNode()) {
+                continue; //var nodes have already been processed, skip or they will generate additional defs/uses and false "can be undefined"
+            }
+            statement.accept(this);
+        }
+
+        for (final FunctionNode nestedFunction : functionNode.getFunctions()) {
+            LOG.info("Going into nested function " + functionNode.getName() + " -> " + nestedFunction.getName());
+            nestedFunction.accept(this);
+        }
+
+        //unknown parameters are promoted to object type.
+        finalizeParameters(functionNode);
+        finalizeTypes(functionNode);
+        for (final Symbol symbol : declaredSymbols) {
+            if (symbol.getSymbolType().isUnknown()) {
+                symbol.setType(Type.OBJECT);
+                symbol.setCanBeUndefined();
+            }
+        }
+
+        if (functionNode.getReturnType().isUnknown()) {
+            LOG.info("Unknown return type promoted to object");
+            functionNode.setReturnType(Type.OBJECT);
+        }
+
+        if (functionNode.getSelfSymbolInit() != null) {
+            LOG.info("Accepting self symbol init " + functionNode.getSelfSymbolInit() + " for " + functionNode.getName());
+            final Node init = functionNode.getSelfSymbolInit();
+            final List<Node> newStatements = new ArrayList<>();
+            newStatements.add(init);
+            newStatements.addAll(functionNode.getStatements());
+            functionNode.setStatements(newStatements);
+            functionNode.setNeedsSelfSymbol(functionNode.getSelfSymbolInit().accept(this));
+        }
+
+        functionNode.popFrame();
+
+        end(functionNode, false);
+
+        return null;
+    }
+
+    @Override
+    public Node leaveCONVERT(final UnaryNode unaryNode) {
+        assert false : "There should be no convert operators in IR during Attribution";
+        end(unaryNode);
+        return unaryNode;
+    }
+
+    @Override
+    public Node enter(final IdentNode identNode) {
+        final String name = identNode.getName();
+
+        start(identNode);
+
+        if (identNode.isPropertyName()) {
+            // assign a pseudo symbol to property name
+            final Symbol pseudoSymbol = pseudoSymbol(name);
+            LOG.info("IdentNode is property name -> assigning pseudo symbol " + pseudoSymbol);
+            LOG.unindent();
+            identNode.setSymbol(pseudoSymbol);
+            return null;
+        }
+
+        final Block  block     = getCurrentBlock();
+        final Symbol oldSymbol = identNode.getSymbol();
+
+        Symbol symbol = block.findSymbol(name);
+
+        //If an existing symbol with the name is found, use that otherwise, declare a new one
+        if (symbol != null) {
+            LOG.info("Existing symbol = " + symbol);
+            if (isFunctionExpressionSelfReference(symbol)) {
+                final FunctionNode functionNode = (FunctionNode)symbol.getNode();
+                assert functionNode.getCalleeNode() != null;
+
+                final VarNode var = new VarNode(source, functionNode.getToken(), functionNode.getFinish(), functionNode.getIdent(), functionNode.getCalleeNode());
+                //newTemporary(Type.OBJECT, var); //ScriptFunction? TODO
+
+                functionNode.setNeedsSelfSymbol(var);
+            }
+
+            if (!identNode.isInitializedHere()) { // NASHORN-448
+                // here is a use outside the local def scope
+                if (!isLocalDef(name)) {
+                    newType(symbol, Type.OBJECT);
+                    symbol.setCanBeUndefined();
+                }
+            }
+
+            identNode.setSymbol(symbol);
+            if (!getCurrentFunctionNode().isLocal(symbol)) {
+                // non-local: we need to put symbol in scope (if it isn't already)
+                if (!symbol.isScope()) {
+                    final List<Block> lookupBlocks = findLookupBlocksHelper(getCurrentFunctionNode(), symbol.findFunction());
+                    for (final Block lookupBlock : lookupBlocks) {
+                        final Symbol refSymbol = lookupBlock.findSymbol(name);
+                        if (refSymbol != null) { // See NASHORN-837, function declaration in lexical scope: try {} catch (x){ function f() { use(x) } } f()
+                            LOG.finest("Found a ref symbol that must be scope " + refSymbol);
+                            refSymbol.setIsScope();
+                        }
+                    }
+                }
+            }
+        } else {
+            LOG.info("No symbol exists. Declare undefined: " + symbol);
+            symbol = block.useSymbol(name, identNode);
+            // we have never seen this before, it can be undefined
+            newType(symbol, Type.OBJECT); // TODO unknown -we have explicit casts anyway?
+            symbol.setCanBeUndefined();
+        }
+
+        if (symbol != oldSymbol && !identNode.isInitializedHere()) {
+            symbol.increaseUseCount();
+        }
+        addLocalUse(identNode.getName());
+
+        end(identNode);
+
+        return null;
+    }
+
+    @Override
+    public Node leave(final IndexNode indexNode) {
+        newTemporary(Type.OBJECT, indexNode); //TORO
+        return indexNode;
+    }
+
+    @SuppressWarnings("rawtypes")
+    @Override
+    public Node enter(final LiteralNode literalNode) {
+        try {
+            start(literalNode);
+            assert !literalNode.isTokenType(TokenType.THIS) : "tokentype for " + literalNode + " is this"; //guard against old dead code case. literal nodes should never inherit tokens
+
+            if (literalNode instanceof ArrayLiteralNode) {
+                final ArrayLiteralNode arrayLiteralNode = (ArrayLiteralNode)literalNode;
+                final Node[]           array            = arrayLiteralNode.getValue();
+
+                for (int i = 0; i < array.length; i++) {
+                    final Node element = array[i];
+                    if (element != null) {
+                        array[i] = element.accept(this);
+                    }
+                }
+                arrayLiteralNode.analyze();
+                //array literal node now has an element type and all elements are attributed
+            } else {
+                assert !(literalNode.getValue() instanceof Node) : "literals with Node values not supported";
+            }
+
+            getCurrentFunctionNode().newLiteral(literalNode);
+        } finally {
+            end(literalNode);
+        }
+        return null;
+    }
+
+    @Override
+    public Node leave(final ObjectNode objectNode) {
+        newTemporary(Type.OBJECT, objectNode);
+        end(objectNode);
+        return objectNode;
+    }
+
+    @Override
+    public Node enter(final PropertyNode propertyNode) {
+        // assign a pseudo symbol to property name, see NASHORN-710
+        propertyNode.setSymbol(new Symbol(propertyNode.getKeyName(), 0, Type.OBJECT));
+        end(propertyNode);
+        return propertyNode;
+    }
+
+    @Override
+    public Node enter(final ReferenceNode referenceNode) {
+        final FunctionNode functionNode = referenceNode.getReference();
+        if (functionNode != null) {
+            functionNode.addReferencingParentBlock(getCurrentBlock());
+        }
+        end(referenceNode);
+
+        return referenceNode;
+    }
+
+    @Override
+    public Node leave(final ReferenceNode referenceNode) {
+        newTemporary(Type.OBJECT, referenceNode); //reference node type is always an object, i.e. the scriptFunction. the function return type varies though
+        end(referenceNode);
+        return referenceNode;
+    }
+
+    @Override
+    public Node leave(final ReturnNode returnNode) {
+        final Node expr = returnNode.getExpression();
+
+        if (expr != null) {
+            //we can't do parameter specialization if we return something that hasn't been typed yet
+            final Symbol symbol = expr.getSymbol();
+            if (expr.getType().isUnknown() && symbol.isParam()) {
+                symbol.setType(Type.OBJECT);
+            }
+            getCurrentFunctionNode().setReturnType(Type.widest(getCurrentFunctionNode().getReturnType(), symbol.getSymbolType()));
+            LOG.info("Returntype is now " + getCurrentFunctionNode().getReturnType());
+        }
+
+        end(returnNode);
+
+        return returnNode;
+    }
+
+    @Override
+    public Node leave(final SwitchNode switchNode) {
+        Type type = Type.UNKNOWN;
+
+        for (final CaseNode caseNode : switchNode.getCases()) {
+            final Node test = caseNode.getTest();
+            if (test != null) {
+                if (test instanceof LiteralNode) {
+                    //go down to integers if we can
+                    final LiteralNode<?> lit = (LiteralNode<?>)test;
+                    if (lit.isNumeric() && !(lit.getValue() instanceof Integer)) {
+                        if (JSType.isRepresentableAsInt(lit.getNumber())) {
+                            caseNode.setTest(LiteralNode.newInstance(lit, lit.getInt32()).accept(this));
+                        }
+                    }
+                }
+
+                type = Type.widest(type, caseNode.getTest().getType());
+            }
+        }
+
+        //only optimize for all integers
+        if (!type.isInteger()) {
+            type = Type.OBJECT;
+        }
+
+        switchNode.setTag(newInternal(compiler.uniqueName(SWITCH_TAG_PREFIX.tag()), type));
+
+        end(switchNode);
+
+        return switchNode;
+    }
+
+    @Override
+    public Node leave(final TryNode tryNode) {
+        tryNode.setException(exceptionSymbol());
+
+        if (tryNode.getFinallyBody() != null) {
+            tryNode.setFinallyCatchAll(exceptionSymbol());
+        }
+
+        end(tryNode);
+
+        return tryNode;
+    }
+
+    @Override
+    public Node enter(final VarNode varNode) {
+        start(varNode);
+
+        final IdentNode ident = varNode.getName();
+        final String    name  = ident.getName();
+
+        final Symbol symbol = getCurrentBlock().defineSymbol(name, IS_VAR, ident);
+        assert symbol != null;
+
+        LOG.info("VarNode " + varNode + " set symbol " + symbol);
+        varNode.setSymbol(symbol);
+
+        // NASHORN-467 - use before definition of vars - conservative
+        if (localUses.contains(ident.getName())) {
+            newType(symbol, Type.OBJECT);
+            symbol.setCanBeUndefined();
+        }
+
+        if (varNode.getInit() != null) {
+            varNode.getInit().accept(this);
+        }
+
+        return varNode;
+    }
+
+    @Override
+    public Node leave(final VarNode varNode) {
+        final Node      init  = varNode.getInit();
+        final IdentNode ident = varNode.getName();
+        final String    name  = ident.getName();
+
+        if (init != null) {
+            addLocalDef(name);
+        }
+
+        if (init == null) {
+            // var x; with no init will be treated like a use of x by
+            // visit(IdentNode) unless we remove the name
+            // from the localdef list.
+            removeLocalDef(name);
+            return varNode;
+        }
+
+        final Symbol  symbol   = varNode.getSymbol();
+        final boolean isScript = symbol.getBlock().getFunction().isScript(); //see NASHORN-56
+        if ((init.getType().isNumeric() || init.getType().isBoolean()) && !isScript) {
+            // Forbid integers as local vars for now as we have no way to treat them as undefined
+            newType(symbol, init.getType());
+        } else {
+            newType(symbol, Type.OBJECT);
+        }
+
+        assert varNode.hasType() : varNode;
+
+        end(varNode);
+
+        return varNode;
+    }
+
+    @Override
+    public Node leaveADD(final UnaryNode unaryNode) {
+        newTemporary(arithType(), unaryNode);
+        end(unaryNode);
+        return unaryNode;
+    }
+
+    @Override
+    public Node leaveBIT_NOT(final UnaryNode unaryNode) {
+        newTemporary(Type.INT, unaryNode);
+        end(unaryNode);
+        return unaryNode;
+    }
+
+    @Override
+    public Node leaveDECINC(final UnaryNode unaryNode) {
+        // @see assignOffset
+        ensureAssignmentSlots(getCurrentFunctionNode(), unaryNode.rhs());
+        final Type type = arithType();
+        newType(unaryNode.rhs().getSymbol(), type);
+        newTemporary(type, unaryNode);
+        end(unaryNode);
+        return unaryNode;
+    }
+
+    @Override
+    public Node leaveDELETE(final UnaryNode unaryNode) {
+        final FunctionNode   currentFunctionNode = getCurrentFunctionNode();
+        final boolean        strictMode          = currentFunctionNode.isStrictMode();
+        final Node           rhs                 = unaryNode.rhs();
+        final Node           strictFlagNode      = LiteralNode.newInstance(unaryNode, strictMode).accept(this);
+
+        Request request = Request.DELETE;
+        final RuntimeNode runtimeNode;
+        final List<Node> args = new ArrayList<>();
+
+        if (rhs instanceof IdentNode) {
+            // If this is a declared variable or a function parameter, delete always fails (except for globals).
+            final String name = ((IdentNode)rhs).getName();
+
+            final boolean failDelete = strictMode || rhs.getSymbol().isParam() || (rhs.getSymbol().isVar() && !rhs.getSymbol().isTopLevel());
+
+            if (failDelete && rhs.getSymbol().isThis()) {
+                return LiteralNode.newInstance(unaryNode, true).accept(this);
+            }
+            final Node literalNode = LiteralNode.newInstance(unaryNode, name).accept(this);
+
+            args.add(currentFunctionNode.getScopeNode());
+            args.add(literalNode);
+            args.add(strictFlagNode);
+
+            if (failDelete) {
+                request = Request.FAIL_DELETE;
+            }
+        } else if (rhs instanceof AccessNode) {
+            final Node      base     = ((AccessNode)rhs).getBase();
+            final IdentNode property = ((AccessNode)rhs).getProperty();
+
+            args.add(base);
+            args.add(LiteralNode.newInstance(unaryNode, property.getName()).accept(this));
+            args.add(strictFlagNode);
+
+        } else if (rhs instanceof IndexNode) {
+            final Node base  = ((IndexNode)rhs).getBase();
+            final Node index = ((IndexNode)rhs).getIndex();
+
+            args.add(base);
+            args.add(index);
+            args.add(strictFlagNode);
+
+        } else {
+            return LiteralNode.newInstance(unaryNode, true).accept(this);
+        }
+
+        runtimeNode = new RuntimeNode(unaryNode, request, args);
+        assert runtimeNode.getSymbol() == unaryNode.getSymbol(); //clone constructor should do this
+
+        runtimeNode.accept(this);
+        return runtimeNode;
+    }
+
+
+    @Override
+    public Node leaveNEW(final UnaryNode unaryNode) {
+        newTemporary(Type.OBJECT, unaryNode);
+        end(unaryNode);
+        return unaryNode;
+    }
+
+    @Override
+    public Node leaveNOT(final UnaryNode unaryNode) {
+        newTemporary(Type.BOOLEAN, unaryNode);
+        end(unaryNode);
+        return unaryNode;
+    }
+
+    @Override
+    public Node leaveTYPEOF(final UnaryNode unaryNode) {
+        final Node rhs    = unaryNode.rhs();
+
+        RuntimeNode runtimeNode;
+
+        List<Node> args = new ArrayList<>();
+        if (rhs instanceof IdentNode && !rhs.getSymbol().isParam() && !rhs.getSymbol().isVar()) {
+            args.add(getCurrentFunctionNode().getScopeNode());
+            args.add(LiteralNode.newInstance(rhs, ((IdentNode)rhs).getName()).accept(this)); //null
+        } else {
+            args.add(rhs);
+            args.add(LiteralNode.newInstance(unaryNode).accept(this)); //null, do not reuse token of identifier rhs, it can be e.g. 'this'
+        }
+
+        runtimeNode = new RuntimeNode(unaryNode, Request.TYPEOF, args);
+        assert runtimeNode.getSymbol() == unaryNode.getSymbol();
+
+        runtimeNode.accept(this);
+
+        end(unaryNode);
+
+        return runtimeNode;
+    }
+
+    @Override
+    public Node leave(final RuntimeNode runtimeNode) {
+        newTemporary(runtimeNode.getRequest().getReturnType(), runtimeNode);
+        return runtimeNode;
+    }
+
+    @Override
+    public Node leaveSUB(final UnaryNode unaryNode) {
+        newTemporary(arithType(), unaryNode);
+        end(unaryNode);
+        return unaryNode;
+    }
+
+    @Override
+    public Node leaveVOID(final UnaryNode unaryNode) {
+        final RuntimeNode runtimeNode = new RuntimeNode(unaryNode, Request.VOID);
+        runtimeNode.accept(this);
+        assert runtimeNode.getSymbol().getSymbolType().isObject();
+        end(unaryNode);
+        return runtimeNode;
+    }
+
+    /**
+     * Add is a special binary, as it works not only on arithmetic, but for
+     * strings etc as well.
+     */
+    @Override
+    public Node leaveADD(final BinaryNode binaryNode) {
+        final Node lhs = binaryNode.lhs();
+        final Node rhs = binaryNode.rhs();
+
+        ensureTypeNotUnknown(lhs);
+        ensureTypeNotUnknown(rhs);
+        newTemporary(Type.widest(lhs.getType(), rhs.getType()), binaryNode);
+
+        end(binaryNode);
+
+        return binaryNode;
+    }
+
+    @Override
+    public Node leaveAND(final BinaryNode binaryNode) {
+        newTemporary(Type.OBJECT, binaryNode);
+        end(binaryNode);
+        return binaryNode;
+    }
+
+    /**
+     * This is a helper called before an assignment.
+     * @param binaryNode assignment node
+     */
+    private Node enterAssignmentNode(final BinaryNode binaryNode) {
+        start(binaryNode);
+
+        final Node lhs = binaryNode.lhs();
+
+        if (lhs instanceof IdentNode) {
+            final Block     block = getCurrentBlock();
+            final IdentNode ident = (IdentNode)lhs;
+            final String    name  = ident.getName();
+
+            Symbol symbol = getCurrentBlock().findSymbol(name);
+
+            if (symbol == null) {
+                symbol = block.defineSymbol(name, IS_GLOBAL, ident);
+                binaryNode.setSymbol(symbol);
+            } else if (!getCurrentFunctionNode().isLocal(symbol)) {
+                symbol.setIsScope();
+            }
+
+            addLocalDef(name);
+        }
+
+        return binaryNode;
+    }
+
+    @Override
+    public Node enterASSIGN(final BinaryNode binaryNode) {
+        return enterAssignmentNode(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN(final BinaryNode binaryNode) {
+        return leaveAssignmentNode(binaryNode);
+    }
+
+    @Override
+    public Node enterASSIGN_ADD(final BinaryNode binaryNode) {
+        return enterAssignmentNode(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_ADD(final BinaryNode binaryNode) {
+        final Node lhs = binaryNode.lhs();
+        final Node rhs = binaryNode.rhs();
+
+        final Type widest = Type.widest(lhs.getType(), rhs.getType());
+        //Type.NUMBER if we can't prove that the add doesn't overflow. todo
+        return leaveSelfModifyingAssignmentNode(binaryNode, widest.isNumeric() ? Type.NUMBER : Type.OBJECT);
+    }
+
+    @Override
+    public Node enterASSIGN_BIT_AND(final BinaryNode binaryNode) {
+        return enterAssignmentNode(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_BIT_AND(final BinaryNode binaryNode) {
+        return leaveSelfModifyingAssignmentNode(binaryNode);
+    }
+
+    @Override
+    public Node enterASSIGN_BIT_OR(final BinaryNode binaryNode) {
+        return enterAssignmentNode(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_BIT_OR(final BinaryNode binaryNode) {
+        return leaveSelfModifyingAssignmentNode(binaryNode);
+    }
+
+    @Override
+    public Node enterASSIGN_BIT_XOR(final BinaryNode binaryNode) {
+        return enterAssignmentNode(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_BIT_XOR(final BinaryNode binaryNode) {
+        return leaveSelfModifyingAssignmentNode(binaryNode);
+    }
+
+    @Override
+    public Node enterASSIGN_DIV(final BinaryNode binaryNode) {
+        return enterAssignmentNode(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_DIV(final BinaryNode binaryNode) {
+        return leaveSelfModifyingAssignmentNode(binaryNode);
+    }
+
+    @Override
+    public Node enterASSIGN_MOD(final BinaryNode binaryNode) {
+        return enterAssignmentNode(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_MOD(final BinaryNode binaryNode) {
+        return leaveSelfModifyingAssignmentNode(binaryNode);
+    }
+
+    @Override
+    public Node enterASSIGN_MUL(final BinaryNode binaryNode) {
+        return enterAssignmentNode(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_MUL(final BinaryNode binaryNode) {
+        return leaveSelfModifyingAssignmentNode(binaryNode);
+    }
+
+    @Override
+    public Node enterASSIGN_SAR(final BinaryNode binaryNode) {
+        return enterAssignmentNode(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_SAR(final BinaryNode binaryNode) {
+        return leaveSelfModifyingAssignmentNode(binaryNode);
+    }
+
+    @Override
+    public Node enterASSIGN_SHL(final BinaryNode binaryNode) {
+        return enterAssignmentNode(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_SHL(final BinaryNode binaryNode) {
+        return leaveSelfModifyingAssignmentNode(binaryNode);
+    }
+
+    @Override
+    public Node enterASSIGN_SHR(final BinaryNode binaryNode) {
+        return enterAssignmentNode(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_SHR(final BinaryNode binaryNode) {
+        return leaveSelfModifyingAssignmentNode(binaryNode);
+    }
+
+    @Override
+    public Node enterASSIGN_SUB(final BinaryNode binaryNode) {
+        return enterAssignmentNode(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_SUB(final BinaryNode binaryNode) {
+        return leaveSelfModifyingAssignmentNode(binaryNode);
+    }
+
+    @Override
+    public Node leaveBIT_AND(final BinaryNode binaryNode) {
+        newTemporary(Type.INT, binaryNode);
+        return binaryNode;
+    }
+
+    @Override
+    public Node leaveBIT_OR(final BinaryNode binaryNode) {
+        newTemporary(Type.INT, binaryNode);
+        return binaryNode;
+    }
+
+    @Override
+    public Node leaveBIT_XOR(final BinaryNode binaryNode) {
+        newTemporary(Type.INT, binaryNode);
+        return binaryNode;
+    }
+
+    @Override
+    public Node leaveCOMMARIGHT(final BinaryNode binaryNode) {
+        newTemporary(binaryNode.rhs().getType(), binaryNode);
+        return binaryNode;
+    }
+
+    @Override
+    public Node leaveCOMMALEFT(final BinaryNode binaryNode) {
+        newTemporary(binaryNode.lhs().getType(), binaryNode);
+        return binaryNode;
+    }
+
+    @Override
+    public Node leaveDIV(final BinaryNode binaryNode) {
+        return leaveBinaryArithmetic(binaryNode);
+    }
+
+    private Node leaveCmp(final BinaryNode binaryNode, final RuntimeNode.Request request) {
+        final Node lhs = binaryNode.lhs();
+        final Node rhs = binaryNode.rhs();
+
+        newTemporary(Type.BOOLEAN, binaryNode);
+        ensureTypeNotUnknown(lhs);
+        ensureTypeNotUnknown(rhs);
+
+        end(binaryNode);
+        return binaryNode;
+    }
+
+    //leave a binary node and inherit the widest type of lhs , rhs
+    private Node leaveBinaryArithmetic(final BinaryNode binaryNode) {
+        if (!Compiler.shouldUseIntegerArithmetic()) {
+            newTemporary(Type.NUMBER, binaryNode);
+            return binaryNode;
+        }
+        newTemporary(Type.widest(binaryNode.lhs().getType(), binaryNode.rhs().getType(), Type.NUMBER), binaryNode);
+        return binaryNode;
+    }
+
+    @Override
+    public Node leaveEQ(final BinaryNode binaryNode) {
+        return leaveCmp(binaryNode, Request.EQ);
+    }
+
+    @Override
+    public Node leaveEQ_STRICT(final BinaryNode binaryNode) {
+        return leaveCmp(binaryNode, Request.EQ_STRICT);
+    }
+
+    @Override
+    public Node leaveGE(final BinaryNode binaryNode) {
+        return leaveCmp(binaryNode, Request.GE);
+    }
+
+    @Override
+    public Node leaveGT(final BinaryNode binaryNode) {
+        return leaveCmp(binaryNode, Request.GT);
+    }
+
+    @Override
+    public Node leaveIN(final BinaryNode binaryNode) {
+        try {
+            return new RuntimeNode(binaryNode, Request.IN).accept(this);
+        } finally {
+            end(binaryNode);
+        }
+    }
+
+    @Override
+    public Node leaveINSTANCEOF(final BinaryNode binaryNode) {
+        try {
+            return new RuntimeNode(binaryNode, Request.INSTANCEOF).accept(this);
+        } finally {
+            end(binaryNode);
+        }
+    }
+
+    @Override
+    public Node leaveLE(final BinaryNode binaryNode) {
+        return leaveCmp(binaryNode, Request.LE);
+    }
+
+    @Override
+    public Node leaveLT(final BinaryNode binaryNode) {
+        return leaveCmp(binaryNode, Request.LT);
+    }
+
+    @Override
+    public Node leaveMOD(final BinaryNode binaryNode) {
+        return leaveBinaryArithmetic(binaryNode);
+    }
+
+    @Override
+    public Node leaveMUL(final BinaryNode binaryNode) {
+        return leaveBinaryArithmetic(binaryNode);
+    }
+
+    @Override
+    public Node leaveNE(final BinaryNode binaryNode) {
+        return leaveCmp(binaryNode, Request.NE);
+    }
+
+    @Override
+    public Node leaveNE_STRICT(final BinaryNode binaryNode) {
+        return leaveCmp(binaryNode, Request.NE_STRICT);
+    }
+
+    @Override
+    public Node leaveOR(final BinaryNode binaryNode) {
+        newTemporary(Type.OBJECT, binaryNode);
+        end(binaryNode);
+        return binaryNode;
+    }
+
+    @Override
+    public Node leaveSAR(final BinaryNode binaryNode) {
+        newTemporary(Type.INT, binaryNode);
+        end(binaryNode);
+        return binaryNode;
+    }
+
+    @Override
+    public Node leaveSHL(final BinaryNode binaryNode) {
+        newTemporary(Type.INT, binaryNode);
+        end(binaryNode);
+        return binaryNode;
+    }
+
+    @Override
+    public Node leaveSHR(final BinaryNode binaryNode) {
+        newTemporary(Type.LONG, binaryNode);
+        end(binaryNode);
+        return binaryNode;
+    }
+
+    @Override
+    public Node leaveSUB(final BinaryNode binaryNode) {
+        return leaveBinaryArithmetic(binaryNode);
+    }
+
+    @Override
+    public Node leave(final ForNode forNode) {
+        if (forNode.isForIn()) {
+            forNode.setIterator(newInternal(getCurrentFunctionNode(), compiler.uniqueName(ITERATOR_PREFIX.tag()), Type.OBJECT)); //NASHORN-73
+            /*
+             * Iterators return objects, so we need to widen the scope of the
+             * init variable if it, for example, has been assigned double type
+             * see NASHORN-50
+             */
+            newType(forNode.getInit().getSymbol(), Type.OBJECT);
+        }
+
+        end(forNode);
+
+        return forNode;
+    }
+
+    @Override
+    public Node leave(final TernaryNode ternaryNode) {
+        final Node lhs  = ternaryNode.rhs();
+        final Node rhs  = ternaryNode.third();
+
+        ensureTypeNotUnknown(lhs);
+        ensureTypeNotUnknown(rhs);
+
+        final Type type = Type.widest(lhs.getType(), rhs.getType());
+        newTemporary(type, ternaryNode);
+
+        end(ternaryNode);
+
+        return ternaryNode;
+    }
+
+    private static void initThis(final FunctionNode functionNode) {
+        final Symbol thisSymbol = functionNode.defineSymbol(THIS.tag(), IS_PARAM | IS_THIS, null);
+        newType(thisSymbol, Type.OBJECT);
+        thisSymbol.setNeedsSlot(true);
+        functionNode.getThisNode().setSymbol(thisSymbol);
+        LOG.info("Initialized scope symbol: " + thisSymbol);
+    }
+
+    private static void initScope(final FunctionNode functionNode) {
+        final Symbol scopeSymbol = functionNode.defineSymbol(SCOPE.tag(), IS_VAR | IS_INTERNAL, null);
+        newType(scopeSymbol, Type.typeFor(ScriptObject.class));
+        scopeSymbol.setNeedsSlot(true);
+        functionNode.getScopeNode().setSymbol(scopeSymbol);
+        LOG.info("Initialized scope symbol: " + scopeSymbol);
+    }
+
+    private static void initReturn(final FunctionNode functionNode) {
+        final Symbol returnSymbol = functionNode.defineSymbol(SCRIPT_RETURN.tag(), IS_VAR | IS_INTERNAL, null);
+        newType(returnSymbol, Type.OBJECT);
+        returnSymbol.setNeedsSlot(true);
+        functionNode.getResultNode().setSymbol(returnSymbol);
+        LOG.info("Initialized return symbol: " + returnSymbol);
+        //return symbol is always object as it's the __return__ thing. What returnType is is another matter though
+    }
+
+    private static void initVarArg(final FunctionNode functionNode) {
+        assert functionNode.getCalleeNode() != null;
+
+        final Symbol varArgsSymbol = functionNode.defineSymbol(VARARGS.tag(), IS_PARAM | IS_INTERNAL, null);
+        newType(varArgsSymbol, Type.OBJECT_ARRAY);
+        varArgsSymbol.setNeedsSlot(true);
+        functionNode.getVarArgsNode().setSymbol(varArgsSymbol);
+        LOG.info("Initialized varargs symbol: " + varArgsSymbol);
+
+        final String    argumentsName   = functionNode.getArgumentsNode().getName();
+        final Symbol    argumentsSymbol = functionNode.defineSymbol(argumentsName, IS_PARAM | IS_INTERNAL, null);
+        newType(argumentsSymbol, Type.OBJECT);
+        argumentsSymbol.setNeedsSlot(true);
+        functionNode.getArgumentsNode().setSymbol(argumentsSymbol);
+        LOG.info("Initialized vararg varArgsSymbol=" + varArgsSymbol + " argumentsSymbol=" + argumentsSymbol);
+    }
+
+    private static void initCallee(final FunctionNode functionNode) {
+        assert functionNode.getCalleeNode() != null : functionNode + " has no callee";
+        final Symbol calleeSymbol = functionNode.defineSymbol(CALLEE.tag(), IS_PARAM | IS_INTERNAL, null);
+        newType(calleeSymbol, Type.typeFor(ScriptFunction.class));
+        calleeSymbol.setNeedsSlot(true);
+        functionNode.getCalleeNode().setSymbol(calleeSymbol);
+        LOG.info("Initialized callee symbol " + calleeSymbol);
+    }
+
+    /**
+     * Initialize parameters for function node. This may require specializing
+     * types if a specialization profile is known
+     *
+     * @param functionNode the function node
+     */
+    private void initParameters(final FunctionNode functionNode) {
+        //If a function is specialized, we don't need to tag either it return
+        // type or its parameters with the widest (OBJECT) type for safety.
+        functionNode.setReturnType(Type.UNKNOWN);
+
+        for (final IdentNode ident : functionNode.getParameters()) {
+            addLocalDef(ident.getName());
+            final Symbol paramSymbol = functionNode.defineSymbol(ident.getName(), IS_PARAM, ident);
+            if (paramSymbol != null) {
+                newType(paramSymbol, Type.UNKNOWN);
+            }
+
+            LOG.info("Initialized param " + paramSymbol);
+        }
+    }
+
+    /**
+     * This has to run before fix assignment types, store any type specializations for
+     * paramters, then turn then to objects for the generic version of this method
+     *
+     * @param functionNode functionNode
+     */
+    private static void finalizeParameters(final FunctionNode functionNode) {
+        boolean nonObjectParams = false;
+        List<Type> paramSpecializations = new ArrayList<>();
+
+        for (final IdentNode ident : functionNode.getParameters()) {
+            final Symbol paramSymbol = ident.getSymbol();
+            if (paramSymbol != null) {
+                Type type = paramSymbol.getSymbolType();
+                if (type.isUnknown()) {
+                    type = Type.OBJECT;
+                }
+                paramSpecializations.add(type);
+                if (!type.isObject()) {
+                    nonObjectParams = true;
+                }
+                newType(paramSymbol, Type.OBJECT);
+            }
+        }
+
+        if (!nonObjectParams) {
+            paramSpecializations = null;
+            // Later, when resolving a call to this method, the linker can say "I have a double, an int and an object" as parameters
+            // here. If the callee has parameter specializations, we can regenerate it with those particular types for speed.
+        } else {
+            LOG.info("parameter specialization possible: " + functionNode.getName() + " " + paramSpecializations);
+        }
+
+        // parameters should not be slots for a vararg function, make sure this is the case
+        if (functionNode.isVarArg()) {
+            for (final IdentNode param : functionNode.getParameters()) {
+                param.getSymbol().setNeedsSlot(false);
+            }
+        }
+    }
+
+    /**
+     * Move any properties from a global map into the scope of this method
+     * @param context      context
+     * @param functionNode the function node for which to init scope vars
+     */
+    private static void initFromPropertyMap(final Context context, final FunctionNode functionNode) {
+        // For a script, add scope symbols as defined in the property map
+        assert functionNode.isScript();
+
+        final PropertyMap map = Context.getGlobalMap();
+
+        for (final Property property : map.getProperties()) {
+            final String key    = property.getKey();
+            final Symbol symbol = functionNode.defineSymbol(key, IS_GLOBAL, null);
+            newType(symbol, Type.OBJECT);
+            LOG.info("Added global symbol from property map " + symbol);
+        }
+    }
+
+    private static void ensureTypeNotUnknown(final Node node) {
+
+        final Symbol symbol = node.getSymbol();
+
+        LOG.info("Ensure type not unknown for: " + symbol);
+
+        /*
+         * Note that not just unknowns, but params need to be blown
+         * up to objects, because we can have something like
+         *
+         * function f(a) {
+         *    var b = ~a; //b and a are inferred to be int
+         *    return b;
+         * }
+         *
+         * In this case, it would be correct to say that "if you have
+         * an int at the callsite, just pass it".
+         *
+         * However
+         *
+         * function f(a) {
+         *    var b = ~a;      //b and a are inferred to be int
+         *    return b == 17;  //b is still inferred to be int.
+         * }
+         *
+         * can be called with f("17") and if we assume that b is an
+         * int and don't blow it up to an object in the comparison, we
+         * are screwed. I hate JavaScript.
+         *
+         * This check has to be done for any operation that might take
+         * objects as parameters, for example +, but not *, which is known
+         * to coerce types into doubles
+         */
+        if (node.getType().isUnknown() || symbol.isParam()) {
+            newType(symbol, Type.OBJECT);
+            symbol.setCanBeUndefined();
+         }
+    }
+
+    private static Symbol pseudoSymbol(final String name) {
+        return new Symbol(name, 0, Type.OBJECT);
+    }
+
+    private Symbol exceptionSymbol() {
+        return newInternal(compiler.uniqueName(EXCEPTION_PREFIX.tag()), Type.typeFor(ECMAException.class));
+    }
+
+    /**
+     * In an assignment, recursively make sure that there are slots for
+     * everything that has to be laid out as temporary storage, which is the
+     * case if we are assign-op:ing a BaseNode subclass. This has to be
+     * recursive to handle things like multi dimensional arrays as lhs
+     *
+     * see NASHORN-258
+     *
+     * @param functionNode   the current function node (has to be passed as it changes in the visitor below)
+     * @param assignmentDest the destination node of the assignment, e.g. lhs for binary nodes
+     */
+    private static void ensureAssignmentSlots(final FunctionNode functionNode, final Node assignmentDest) {
+        assignmentDest.accept(new NodeVisitor() {
+            @Override
+            public Node leave(final IndexNode indexNode) {
+                final Node index = indexNode.getIndex();
+                index.getSymbol().setNeedsSlot(!index.getSymbol().isConstant());
+                return indexNode;
+            }
+        });
+    }
+
+    /**
+     * Return the type that arithmetic ops should use. Until we have implemented better type
+     * analysis (range based) or overflow checks that are fast enough for int arithmetic,
+     * this is the number type
+     * @return the arithetic type
+     */
+    private static Type arithType() {
+        return Compiler.shouldUseIntegerArithmetic() ? Type.INT : Type.NUMBER;
+    }
+
+    /**
+     * If types have changed, we can have failed to update vars. For example
+     *
+     * var x = 17; //x is int
+     * x = "apa";  //x is object. This will be converted fine
+     *
+     * @param functionNode
+     */
+    private static void finalizeTypes(final FunctionNode functionNode) {
+        final Set<Node> changed = new HashSet<>();
+        do {
+            changed.clear();
+            functionNode.accept(new NodeVisitor() {
+
+                private void widen(final Node node, final Type to) {
+                    if (node instanceof LiteralNode) {
+                        return;
+                    }
+                    Type from = node.getType();
+                    if (!Type.areEquivalent(from, to) && Type.widest(from, to) == to) {
+                        LOG.fine("Had to post pass widen '" + node + "' " + Debug.id(node) + " from " + node.getType() + " to " + to);
+                        newType(node.getSymbol(), to);
+                        changed.add(node);
+                    }
+                }
+
+                /**
+                 * Eg.
+                 *
+                 * var d = 17;
+                 * var e;
+                 * e = d; //initially typed as int for node type, should retype as double
+                 * e = object;
+                 *
+                 * var d = 17;
+                 * var e;
+                 * e -= d; //initially type number, should number remain with a final conversion supplied by Store. ugly, but the computation result of the sub is numeric
+                 * e = object;
+                 *
+                 */
+                @SuppressWarnings("fallthrough")
+                @Override
+                public Node leave(final BinaryNode binaryNode) {
+                    final Type widest = Type.widest(binaryNode.lhs().getType(), binaryNode.rhs().getType());
+                    switch (binaryNode.tokenType()) {
+                    default:
+                        if (!binaryNode.isAssignment() || binaryNode.isSelfModifying()) {
+                            break;
+                        }
+                        widen(binaryNode.lhs(), widest);
+                    case ADD:
+                        widen(binaryNode, widest);
+                        break;
+                    }
+                    return binaryNode;
+                }
+            });
+        } while (!changed.isEmpty());
+    }
+
+    /**
+     * This assign helper is called after an assignment, when all children of
+     * the assign has been processed. It fixes the types and recursively makes
+     * sure that everyhing has slots that should have them in the chain.
+     *
+     * @param binaryNode assignment node
+     */
+    private Node leaveAssignmentNode(final BinaryNode binaryNode) {
+        final Node lhs = binaryNode.lhs();
+        final Node rhs = binaryNode.rhs();
+
+        final Type type;
+        if (rhs.getType().isNumeric()) {
+            type = Type.widest(binaryNode.lhs().getType(), binaryNode.rhs().getType());
+        } else {
+            type = Type.OBJECT; //force lhs to be an object if not numeric assignment, e.g. strings too.
+        }
+        newTemporary(type, binaryNode);
+        newType(lhs.getSymbol(), type);
+        end(binaryNode);
+        return binaryNode;
+    }
+
+    private Node leaveSelfModifyingAssignmentNode(final BinaryNode binaryNode) {
+        return leaveSelfModifyingAssignmentNode(binaryNode, binaryNode.getWidestOperationType());
+    }
+
+    private Node leaveSelfModifyingAssignmentNode(final BinaryNode binaryNode, final Type destType) {
+        //e.g. for -=, Number, no wider, destType (binaryNode.getWidestOperationType())  is the coerce type
+        final Node lhs = binaryNode.lhs();
+
+        newType(lhs.getSymbol(), destType); //may not narrow if dest is already wider than destType
+        newTemporary(destType, binaryNode); //for OP= nodes, the node can carry a narrower types than its lhs rhs. This is perfectly fine
+
+        ensureAssignmentSlots(getCurrentFunctionNode(), binaryNode);
+
+        end(binaryNode);
+        return binaryNode;
+    }
+
+    private static List<Block> findLookupBlocksHelper(final FunctionNode currentFunction, final FunctionNode topFunction) {
+        if (currentFunction.findParentFunction() == topFunction) {
+            final List<Block> blocks = new LinkedList<>();
+
+            blocks.add(currentFunction.getParent());
+            blocks.addAll(currentFunction.getReferencingParentBlocks());
+            return blocks;
+        }
+        /*
+         * assumption: all parent blocks of an inner function will always be in the same outer function;
+         * therefore we can simply skip through intermediate functions.
+         * @see FunctionNode#addReferencingParentBlock(Block)
+         */
+        return findLookupBlocksHelper(currentFunction.findParentFunction(), topFunction);
+    }
+
+    private static boolean isFunctionExpressionSelfReference(final Symbol symbol) {
+        if (symbol.isVar() && symbol.getNode() == symbol.getBlock() && symbol.getNode() instanceof FunctionNode) {
+            return ((FunctionNode)symbol.getNode()).getIdent().getName().equals(symbol.getName());
+        }
+        return false;
+    }
+
+    private static Symbol newTemporary(final FunctionNode functionNode, final Type type, final Node node) {
+        LOG.info("New TEMPORARY added to " + functionNode.getName() + " type=" + type);
+        return functionNode.newTemporary(type, node);
+    }
+
+    private Symbol newTemporary(final Type type, final Node node) {
+        return newTemporary(getCurrentFunctionNode(), type, node);
+    }
+
+    private Symbol newInternal(final FunctionNode functionNode, final String name, final Type type) {
+        final Symbol iter = getCurrentFunctionNode().defineSymbol(name, IS_VAR | IS_INTERNAL, null);
+        iter.setType(type); // NASHORN-73
+        return iter;
+    }
+
+    private Symbol newInternal(final String name, final Type type) {
+        return newInternal(getCurrentFunctionNode(), name, type);
+    }
+
+    private static void newType(final Symbol symbol, final Type type) {
+        final Type oldType = symbol.getSymbolType();
+        symbol.setType(type);
+
+        if (symbol.getSymbolType() != oldType) {
+            LOG.info("New TYPE " + type + " for " + symbol + " (was " + oldType + ")");
+        }
+
+        if (symbol.isParam()) {
+            symbol.setType(type);
+            LOG.info("Param type change " + symbol);
+        }
+    }
+
+    private void clearLocalDefs() {
+        localDefs = new HashSet<>();
+    }
+
+    private boolean isLocalDef(final String name) {
+        return localDefs.contains(name);
+    }
+
+    private void addLocalDef(final String name) {
+        LOG.info("Adding local def of symbol: '" + name + "'");
+        localDefs.add(name);
+    }
+
+    private void removeLocalDef(final String name) {
+        LOG.info("Removing local def of symbol: '" + name + "'");
+        localDefs.remove(name);
+    }
+
+    private void clearLocalUses() {
+        localUses = new HashSet<>();
+    }
+
+    private void addLocalUse(final String name) {
+        LOG.info("Adding local use of symbol: '" + name + "'");
+        localUses.add(name);
+    }
+
+    private static String name(final Node node) {
+        final String cn = node.getClass().getName();
+        int lastDot = cn.lastIndexOf('.');
+        if (lastDot == -1) {
+            return cn;
+        }
+        return cn.substring(lastDot + 1);
+    }
+
+    private Node start(final Node node) {
+        return start(node, true);
+    }
+
+    private Node start(final Node node, final boolean printNode) {
+        final StringBuilder sb = new StringBuilder();
+
+        sb.append("[ENTER ").
+            append(name(node)).
+            append("] ").
+            append(printNode ? node.toString() : "").
+            append(" in '").
+            append(getCurrentFunctionNode().getName()).
+            append("'");
+        LOG.info(sb.toString());
+        LOG.indent();
+
+        return node;
+    }
+
+    private Node end(final Node node) {
+        return end(node, true);
+    }
+
+    private Node end(final Node node, final boolean printNode) {
+        final StringBuilder sb = new StringBuilder();
+
+        sb.append("[LEAVE ").
+            append(name(node)).
+            append("] ").
+            append(printNode ? node.toString() : "").
+            append(" in '").
+            append(getCurrentFunctionNode().getName());
+
+        if (node.getSymbol() == null) {
+            sb.append(" <NO SYMBOL>");
+        } else {
+            sb.append(" <symbol=").append(node.getSymbol()).append('>');
+        }
+
+        LOG.unindent();
+        LOG.info(sb.toString());
+
+        return node;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
index 14fdaade2bc..4a21ca8ffaf 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
@@ -56,7 +56,6 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.TreeMap;
 import jdk.nashorn.internal.codegen.ClassEmitter.Flag;
 import jdk.nashorn.internal.codegen.CompilerConstants.Call;
@@ -524,28 +523,6 @@ public final class CodeGenerator extends NodeOperatorVisitor {
         return method;
     }
 
-    /**
-     * Create a new function object, including generating its stub code.
-     *
-     * @param functionNode  FunctionNode to utilize.
-     */
-    private void newFunctionObject(final FunctionNode functionNode) {
-         // Turn thisProperties into keys and symbols for the FunctionAnalyzer
-        final Map<String, Node> thisProperties = functionNode.getThisProperties();
-
-        final List<String> keys    = new ArrayList<>();
-        final List<Symbol> symbols = new ArrayList<>();
-
-        /* TODO - Predefine known properties.
-        for (final Entry<String, Node> entry : thisProperties.entrySet()) {
-            keys.add(entry.getKey());
-            symbols.add(entry.getValue().getSymbol());
-        }
-        */
-
-        new FunctionObjectCreator(this, functionNode, keys, symbols).makeObject(method);
-    }
-
     @Override
     public Node enter(final CallNode callNode) {
         if (callNode.testResolved()) {
@@ -603,12 +580,12 @@ public final class CodeGenerator extends NodeOperatorVisitor {
 
                 final CallNode.EvalArgs evalArgs = callNode.getEvalArgs();
                 // load evaluated code
-                load(evalArgs.code);
+                load(evalArgs.getCode());
                 method.convert(Type.OBJECT);
                 // special/extra 'eval' arguments
-                load(evalArgs.evalThis);
-                method.load(evalArgs.location);
-                method.load(evalArgs.strictMode);
+                load(evalArgs.getThis());
+                method.load(evalArgs.getLocation());
+                method.load(evalArgs.getStrictMode());
                 method.convert(Type.OBJECT);
 
                 // direct call to Global.directEval
@@ -683,7 +660,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
                 }
 
                 if (callee.needsCallee()) { // TODO: always true
-                    newFunctionObject(callee); // TODO: if callee not needed, function object is used only to pass scope (could be optimized). if neither the scope nor the function object is needed by the callee, we can pass null instead.
+                    new FunctionObjectCreator(CodeGenerator.this, callee).makeObject(method); // TODO: if callee not needed, function object is used only to pass scope (could be optimized). if neither the scope nor the function object is needed by the callee, we can pass null instead.
                 }
 
                 loadArgs(args, signature, isVarArg, argCount);
@@ -1300,6 +1277,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
     @SuppressWarnings("rawtypes")
     @Override
     public Node enter(final LiteralNode literalNode) {
+        assert literalNode.getSymbol() != null : literalNode + " has no symbol";
         load(literalNode).store(literalNode.getSymbol());
         return null;
     }
@@ -1410,7 +1388,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
             return null;
         }
 
-        newFunctionObject(referenceNode.getReference());
+        new FunctionObjectCreator(this, referenceNode.getReference()).makeObject(method);
 
         return null;
     }
@@ -1561,15 +1539,12 @@ public final class CodeGenerator extends NodeOperatorVisitor {
         /*
          * First check if this should be something other than a runtime node
          * AccessSpecializer might have changed the type
+         *
+         * TODO - remove this - Access Specializer will always know after Attr/Lower
          */
-        if (runtimeNode.isPrimitive()) {
-
+        if (runtimeNode.isPrimitive() && !runtimeNode.isFinal()) {
             final Node lhs = runtimeNode.getArgs().get(0);
-            Node rhs = null;
-
-            if (runtimeNode.getArgs().size() > 1) {
-                rhs = runtimeNode.getArgs().get(1);
-            }
+            final Node rhs = runtimeNode.getArgs().size() > 1 ? runtimeNode.getArgs().get(1) : null;
 
             final Type   type   = runtimeNode.getType();
             final Symbol symbol = runtimeNode.getSymbol();
@@ -1590,7 +1565,15 @@ public final class CodeGenerator extends NodeOperatorVisitor {
             case GT:
                 return enterCmp(lhs, rhs, Condition.GT, type, symbol);
             case ADD:
-                return enterNumericAdd(lhs, rhs, type, symbol);
+                Type widest = Type.widest(lhs.getType(), rhs.getType());
+                load(lhs);
+                method.convert(widest);
+                load(rhs);
+                method.convert(widest);
+                method.add();
+                method.convert(type);
+                method.store(symbol);
+                return null;
             default:
                 // it's ok to send this one on with only primitive arguments, maybe INSTANCEOF(true, true) or similar
                 // assert false : runtimeNode + " has all primitive arguments. This is an inconsistent state";
@@ -1605,7 +1588,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
             return null;
         }
 
-        if (specializationCheck(runtimeNode.getRequest(), runtimeNode, args)) {
+        if (!runtimeNode.isFinal() && specializationCheck(runtimeNode.getRequest(), runtimeNode, args)) {
             return null;
         }
 
@@ -2029,7 +2012,6 @@ public final class CodeGenerator extends NodeOperatorVisitor {
         if (needsScope) {
             method.loadScope();
         }
-
         load(init);
 
         if (needsScope) {
@@ -2324,12 +2306,11 @@ public final class CodeGenerator extends NodeOperatorVisitor {
     }
 
     private Node enterNumericAdd(final Node lhs, final Node rhs, final Type type, final Symbol symbol) {
-        assert lhs.getType().equals(rhs.getType()) && lhs.getType().equals(type);
+        assert lhs.getType().equals(rhs.getType()) && lhs.getType().equals(type) : lhs.getType() + " != " + rhs.getType() + " != " + type + " " + new ASTWriter(lhs) + " " + new ASTWriter(rhs);
         load(lhs);
         load(rhs);
         method.add();
         method.store(symbol);
-
         return null;
     }
 
@@ -3152,17 +3133,19 @@ public final class CodeGenerator extends NodeOperatorVisitor {
             /**
              * Take the original target args from the stack and use them
              * together with the value to be stored to emit the store code
+             *
+             * The case that targetSymbol is in scope (!hasSlot) and we actually
+             * need to do a conversion on non-equivalent types exists, but is
+             * very rare. See for example test/script/basic/access-specializer.js
              */
-            if (targetSymbol.hasSlot()) {
-                method.convert(target.getType());
-            }
+            method.convert(target.getType());
 
             target.accept(new NodeVisitor(compileUnit, method) {
                 @Override
                 public Node enter(final IdentNode node) {
                     final Symbol symbol = target.getSymbol();
                     if (symbol.isScope()) {
-                        if(symbol.isFastScope(currentFunction)) {
+                        if (symbol.isFastScope(currentFunction)) {
                             storeFastScopeVar(target.getType(), symbol, CALLSITE_SCOPE | getCallSiteFlags());
                         } else {
                             method.dynamicSet(target.getType(), node.getName(), CALLSITE_SCOPE | getCallSiteFlags());
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java b/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
index ec3a6acea4d..addd33310dd 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
@@ -70,8 +70,16 @@ public final class Compiler {
         INITIALIZED,
         /** method has been parsed */
         PARSED,
+        /** constant folding pass */
+        CONSTANT_FOLDED,
         /** method has been lowered */
         LOWERED,
+        /** method hass been attributed */
+        ATTR,
+        /** method has been split */
+        SPLIT,
+        /** method has had its types finalized */
+        FINALIZED,
         /** method has been emitted to bytecode */
         EMITTED
     }
@@ -135,25 +143,6 @@ public final class Compiler {
     /** Lazy jitting is disabled by default */
     private static final boolean LAZY_JIT = false;
 
-    /**
-     * Should we use integers for literals and all operations
-     * that are based in constant and parameter assignment as
-     * long as they can be proven not to overflow? With this enabled
-     * var x = 17 would tag x as an integer, rather than a double,
-     * but as soon as it is used in an operation that may potentially
-     * overflow, such as an add, we conservatively widen it to double
-     * (number type). This is because overflow checks in the code
-     * are likely much more expensive that method specialization
-     *
-     * @return true if numbers should start as ints, false if they should
-     *   start as doubles
-     */
-    static boolean shouldUseIntegers() {
-        return USE_INTS;
-    }
-
-    private static final boolean USE_INTS;
-
     /**
      * Should we use integers for arithmetic operations as well?
      * TODO: We currently generate no overflow checks so this is
@@ -165,13 +154,12 @@ public final class Compiler {
      *   operands by default.
      */
     static boolean shouldUseIntegerArithmetic() {
-        return Compiler.shouldUseIntegers() && USE_INT_ARITH;
+        return USE_INT_ARITH;
     }
 
     private static final boolean USE_INT_ARITH;
 
     static {
-        USE_INTS       = !Options.getBooleanProperty("nashorn.compiler.ints.disable");
         USE_INT_ARITH  =  Options.getBooleanProperty("nashorn.compiler.intarithmetic");
 
         assert !USE_INT_ARITH : "Integer arithmetic is not enabled";
@@ -338,46 +326,93 @@ public final class Compiler {
         try {
             strict |= functionNode.isStrictMode();
 
-            if (!state.contains(State.LOWERED)) {
-                debugPrintAST();
+            /*
+             * These are the compile phases:
+             *
+             * Constant folding pass
+             *   Simple constant folding that will make elementary constructs go away
+             *
+             * Lower (Control flow pass)
+             *   Finalizes the control flow. Clones blocks for finally constructs and
+             *   similar things. Establishes termination criteria for nodes
+             *   Guarantee return instructions to method making sure control flow
+             *   cannot fall off the end. Replacing high level nodes with lower such
+             *   as runtime nodes where applicable.
+             *
+             * Attr
+             *   Assign symbols and types to all nodes.
+             *
+             * Splitter
+             *   Split the AST into several compile units based on a size heuristic
+             *   Splitter needs attributed AST for weight calculations (e.g. is
+             *   a + b a ScriptRuntime.ADD with call overhead or a dadd with much
+             *   less). Split IR can lead to scope information being changed.
+             *
+             * Contract: all variables must have slot assignments and scope assignments
+             * before lowering.
+             *
+             * FinalizeTypes
+             *   This pass finalizes the types for nodes. If Attr created wider types than
+             *   known during the first pass, convert nodes are inserted or access nodes
+             *   are specialized where scope accesses.
+             *
+             *   Runtime nodes may be removed and primitivized or reintroduced depending
+             *   on information that was established in Attr.
+             *
+             * CodeGeneration
+             *   Emit bytecode
+             *
+             */
+
+            debugPrintAST();
+
+            if (!state.contains(State.FINALIZED)) {
+                LOG.info("Folding constants in '" + functionNode.getName() + "'");
+                functionNode.accept(new FoldConstants());
+                state.add(State.CONSTANT_FOLDED);
+
                 LOG.info("Lowering '" + functionNode.getName() + "'");
                 functionNode.accept(new Lower(this));
                 state.add(State.LOWERED);
 
+                LOG.info("Attributing types '" + functionNode.getName() + "'");
+                functionNode.accept(new Attr(this));
+                state.add(State.ATTR);
+
+                this.scriptName = computeNames();
+
+                // Main script code always goes to this compile unit. Note that since we start this with zero weight
+                // and add script code last this class may end up slightly larger than others, but reserving one class
+                // just for the main script seems wasteful.
+                final CompileUnit scriptCompileUnit = addCompileUnit(firstCompileUnitName(), 0L);
+                LOG.info("Splitting '" + functionNode.getName() + "'");
+                new Splitter(this, functionNode, scriptCompileUnit).split();
+                state.add(State.SPLIT);
+                assert functionNode.getCompileUnit() == scriptCompileUnit;
+
+                assert strict == functionNode.isStrictMode() : "strict == " + strict + " but functionNode == " + functionNode.isStrictMode();
+                if (functionNode.isStrictMode()) {
+                    strict = true;
+                }
+
+                LOG.info("Finalizing types for '" + functionNode.getName() + "'");
+                functionNode.accept(new FinalizeTypes(this));
+                state.add(State.FINALIZED);
+
+                // print ast and parse if --print-lower-ast and/or --print-lower-parse are selected
+                debugPrintAST();
+                debugPrintParse();
+
                 if (errors.hasErrors()) {
                     return false;
                 }
             }
 
-            scriptName = computeNames();
-
-            // Main script code always goes to this compile unit. Note that since we start this with zero weight
-            // and add script code last this class may end up slightly larger than others, but reserving one class
-            // just for the main script seems wasteful.
-            final CompileUnit scriptCompileUnit = addCompileUnit(firstCompileUnitName(), 0l);
-            LOG.info("Splitting '" + functionNode.getName() + "'");
-            new Splitter(this, functionNode, scriptCompileUnit).split();
-            assert functionNode.getCompileUnit() == scriptCompileUnit;
-
-            /** Compute compile units */
-            assert strict == functionNode.isStrictMode() : "strict == " + strict + " but functionNode == " + functionNode.isStrictMode();
-            if (functionNode.isStrictMode()) {
-                strict = true;
-            }
-
-            LOG.info("Adjusting slot and scope information for symbols for '" + functionNode.getName() + "'");
-            functionNode.accept(new Lower.FinalizeSymbols());
-
-            LOG.info("Specializing callsite types for '" + functionNode.getName() + "'");
-            functionNode.accept(new AccessSpecializer());
-
             try {
                 LOG.info("Emitting bytecode for '" + functionNode.getName() + "'");
                 final CodeGenerator codegen = new CodeGenerator(this);
                 functionNode.accept(codegen);
                 codegen.generateScopeCalls();
-                debugPrintAST();
-                debugPrintParse();
             } catch (final VerifyError e) {
                 if (context._verify_code || context._print_code) {
                     context.getErr().println(e.getClass().getSimpleName() + ": " + e.getMessage());
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/FinalizeTypes.java b/nashorn/src/jdk/nashorn/internal/codegen/FinalizeTypes.java
new file mode 100644
index 00000000000..0bbe601fdd5
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/FinalizeTypes.java
@@ -0,0 +1,919 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.codegen;
+
+import java.util.HashSet;
+import java.util.List;
+
+import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.ir.AccessNode;
+import jdk.nashorn.internal.ir.Assignment;
+import jdk.nashorn.internal.ir.BinaryNode;
+import jdk.nashorn.internal.ir.Block;
+import jdk.nashorn.internal.ir.CallNode;
+import jdk.nashorn.internal.ir.CallNode.EvalArgs;
+import jdk.nashorn.internal.ir.CaseNode;
+import jdk.nashorn.internal.ir.CatchNode;
+import jdk.nashorn.internal.ir.DoWhileNode;
+import jdk.nashorn.internal.ir.ExecuteNode;
+import jdk.nashorn.internal.ir.ForNode;
+import jdk.nashorn.internal.ir.FunctionNode;
+import jdk.nashorn.internal.ir.IdentNode;
+import jdk.nashorn.internal.ir.IfNode;
+import jdk.nashorn.internal.ir.IndexNode;
+import jdk.nashorn.internal.ir.LiteralNode;
+import jdk.nashorn.internal.ir.LiteralNode.ArrayLiteralNode;
+import jdk.nashorn.internal.ir.Node;
+import jdk.nashorn.internal.ir.ReferenceNode;
+import jdk.nashorn.internal.ir.ReturnNode;
+import jdk.nashorn.internal.ir.RuntimeNode;
+import jdk.nashorn.internal.ir.RuntimeNode.Request;
+import jdk.nashorn.internal.ir.SwitchNode;
+import jdk.nashorn.internal.ir.Symbol;
+import jdk.nashorn.internal.ir.TernaryNode;
+import jdk.nashorn.internal.ir.ThrowNode;
+import jdk.nashorn.internal.ir.TypeOverride;
+import jdk.nashorn.internal.ir.UnaryNode;
+import jdk.nashorn.internal.ir.VarNode;
+import jdk.nashorn.internal.ir.WhileNode;
+import jdk.nashorn.internal.ir.WithNode;
+import jdk.nashorn.internal.ir.visitor.NodeOperatorVisitor;
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.parser.Token;
+import jdk.nashorn.internal.parser.TokenType;
+import jdk.nashorn.internal.runtime.Debug;
+import jdk.nashorn.internal.runtime.DebugLogger;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * Lower to more primitive operations. After lowering, an AST has symbols and
+ * types. Lowering may also add specialized versions of methods to the script if
+ * the optimizer is turned on.
+ *
+ * Any expression that requires temporary storage as part of computation will
+ * also be detected here and give a temporary symbol
+ *
+ * For any op that we process in FinalizeTypes it is an absolute guarantee
+ * that scope and slot information is correct. This enables e.g. AccessSpecialization
+ * and frame optimizations
+ */
+
+final class FinalizeTypes extends NodeOperatorVisitor {
+
+    /** Current source. */
+    private final Source source;
+
+    private static final DebugLogger LOG = new DebugLogger("finalize");
+
+    /**
+     * Constructor.
+     *
+     * @param compiler the compiler
+     */
+    FinalizeTypes(final Compiler compiler) {
+        this.source = compiler.getSource();
+    }
+
+    @Override
+    public Node leave(final CallNode callNode) {
+        final EvalArgs evalArgs = callNode.getEvalArgs();
+        if (evalArgs != null) {
+            evalArgs.setCode(evalArgs.getCode().accept(this));
+        }
+
+        // AccessSpecializer - call return type may change the access for this location
+        final Node function = callNode.getFunction();
+        if (function instanceof ReferenceNode) {
+            setTypeOverride(callNode, ((ReferenceNode)function).getReference().getType());
+        }
+        return callNode;
+    }
+
+    private Node leaveUnary(final UnaryNode unaryNode) {
+        unaryNode.setRHS(convert(unaryNode.rhs(), unaryNode.getType()));
+        return unaryNode;
+    }
+
+    @Override
+    public Node leaveADD(final UnaryNode unaryNode) {
+        return leaveUnary(unaryNode);
+    }
+
+    @Override
+    public Node leaveBIT_NOT(final UnaryNode unaryNode) {
+        return leaveUnary(unaryNode);
+    }
+
+    @Override
+    public Node leaveCONVERT(final UnaryNode unaryNode) {
+        assert unaryNode.rhs().tokenType() != TokenType.CONVERT : "convert(convert encountered. check its origin and remove it";
+        return unaryNode;
+    }
+
+    @Override
+    public Node leaveDECINC(final UnaryNode unaryNode) {
+        specialize(unaryNode);
+        return unaryNode;
+    }
+
+    @Override
+    public Node leaveNEW(final UnaryNode unaryNode) {
+        assert unaryNode.getSymbol() != null && unaryNode.getSymbol().getSymbolType().isObject();
+        ((CallNode)unaryNode.rhs()).setIsNew();
+        return unaryNode;
+    }
+
+    @Override
+    public Node leaveSUB(final UnaryNode unaryNode) {
+        return leaveUnary(unaryNode);
+    }
+
+    /**
+     * Add is a special binary, as it works not only on arithmetic, but for
+     * strings etc as well.
+     */
+    @Override
+    public Node leaveADD(final BinaryNode binaryNode) {
+        final Node lhs = binaryNode.lhs();
+        final Node rhs = binaryNode.rhs();
+
+        final Type type = binaryNode.getType();
+
+        if (type.isObject()) {
+            if (!isAddString(binaryNode)) {
+                return new RuntimeNode(binaryNode, Request.ADD);
+            }
+        }
+
+        binaryNode.setLHS(convert(lhs, type));
+        binaryNode.setRHS(convert(rhs, type));
+        return binaryNode;
+    }
+
+    @Override
+    public Node leaveAND(final BinaryNode binaryNode) {
+        return binaryNode;
+    }
+
+    @Override
+    public Node leaveASSIGN(final BinaryNode binaryNode) {
+        Type destType = specialize(binaryNode);
+        if (destType == null) {
+            destType = binaryNode.getType();
+        }
+        binaryNode.setRHS(convert(binaryNode.rhs(), destType));
+        return binaryNode;
+    }
+
+    @Override
+    public Node leaveASSIGN_ADD(final BinaryNode binaryNode) {
+        return leaveASSIGN(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_BIT_AND(final BinaryNode binaryNode) {
+        return leaveASSIGN(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_BIT_OR(final BinaryNode binaryNode) {
+        return leaveASSIGN(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_BIT_XOR(final BinaryNode binaryNode) {
+        return leaveASSIGN(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_DIV(final BinaryNode binaryNode) {
+        return leaveASSIGN(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_MOD(final BinaryNode binaryNode) {
+        return leaveASSIGN(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_MUL(final BinaryNode binaryNode) {
+        return leaveASSIGN(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_SAR(final BinaryNode binaryNode) {
+        return leaveASSIGN(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_SHL(final BinaryNode binaryNode) {
+        return leaveASSIGN(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_SHR(final BinaryNode binaryNode) {
+        return leaveASSIGN(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_SUB(final BinaryNode binaryNode) {
+        return leaveASSIGN(binaryNode);
+    }
+
+    @Override
+    public Node leaveBIT_AND(BinaryNode binaryNode) {
+        assert binaryNode.getSymbol() != null && binaryNode.getSymbol().getSymbolType().isInteger() : binaryNode.getSymbol();
+        return leaveBinary(binaryNode, Type.INT, Type.INT);
+    }
+
+    @Override
+    public Node leaveBIT_OR(BinaryNode binaryNode) {
+        assert binaryNode.getSymbol() != null && binaryNode.getSymbol().getSymbolType().isInteger();
+        return leaveBinary(binaryNode, Type.INT, Type.INT);
+    }
+
+    @Override
+    public Node leaveBIT_XOR(BinaryNode binaryNode) {
+        assert binaryNode.getSymbol() != null && binaryNode.getSymbol().getSymbolType().isInteger();
+        return leaveBinary(binaryNode, Type.INT, Type.INT);
+    }
+
+    @Override
+    public Node leaveCOMMALEFT(final BinaryNode binaryNode) {
+        assert binaryNode.getSymbol() != null;
+        binaryNode.setRHS(discard(binaryNode.rhs()));
+        // AccessSpecializer - the type of rhs, which is the remaining value of this node may have changed
+        // in that case, update the node type as well
+        propagateType(binaryNode, binaryNode.lhs().getType());
+        return binaryNode;
+    }
+
+    @Override
+    public Node leaveCOMMARIGHT(final BinaryNode binaryNode) {
+        assert binaryNode.getSymbol() != null;
+        binaryNode.setLHS(discard(binaryNode.lhs()));
+        // AccessSpecializer - the type of rhs, which is the remaining value of this node may have changed
+        // in that case, update the node type as well
+        propagateType(binaryNode, binaryNode.rhs().getType());
+        return binaryNode;
+    }
+
+    @Override
+    public Node leaveDIV(final BinaryNode binaryNode) {
+        return leaveBinaryArith(binaryNode);
+    }
+
+
+    @Override
+    public Node leaveEQ(final BinaryNode binaryNode) {
+        return leaveCmp(binaryNode, Request.EQ);
+    }
+
+    @Override
+    public Node leaveEQ_STRICT(final BinaryNode binaryNode) {
+        return leaveCmp(binaryNode, Request.EQ_STRICT);
+    }
+
+    @Override
+    public Node leaveGE(final BinaryNode binaryNode) {
+        return leaveCmp(binaryNode, Request.GE);
+    }
+
+    @Override
+    public Node leaveGT(final BinaryNode binaryNode) {
+        return leaveCmp(binaryNode, Request.GT);
+    }
+
+    @Override
+    public Node leaveLE(final BinaryNode binaryNode) {
+        return leaveCmp(binaryNode, Request.LE);
+    }
+
+    @Override
+    public Node leaveLT(final BinaryNode binaryNode) {
+        return leaveCmp(binaryNode, Request.LT);
+    }
+
+    @Override
+    public Node leaveMOD(final BinaryNode binaryNode) {
+        return leaveBinaryArith(binaryNode);
+    }
+
+    @Override
+    public Node leaveMUL(final BinaryNode binaryNode) {
+        return leaveBinaryArith(binaryNode);
+    }
+
+    @Override
+    public Node leaveNE(final BinaryNode binaryNode) {
+        return leaveCmp(binaryNode, Request.NE);
+    }
+
+    @Override
+    public Node leaveNE_STRICT(final BinaryNode binaryNode) {
+        return leaveCmp(binaryNode, Request.NE_STRICT);
+    }
+
+    @Override
+    public Node leaveOR(final BinaryNode binaryNode) {
+        return binaryNode;
+    }
+
+    @Override
+    public Node leaveSAR(final BinaryNode binaryNode) {
+        return leaveBinary(binaryNode, Type.INT, Type.INT);
+    }
+
+    @Override
+    public Node leaveSHL(final BinaryNode binaryNode) {
+        return leaveBinary(binaryNode, Type.INT, Type.INT);
+    }
+
+    @Override
+    public Node leaveSHR(final BinaryNode binaryNode) {
+        assert binaryNode.getSymbol() != null && binaryNode.getSymbol().getSymbolType().isLong();
+        return leaveBinary(binaryNode, Type.INT, Type.INT);
+    }
+
+    @Override
+    public Node leaveSUB(final BinaryNode binaryNode) {
+        return leaveBinaryArith(binaryNode);
+    }
+
+    @Override
+    public Node enter(final Block block) {
+        updateSymbols(block);
+        return block;
+    }
+
+    @Override
+    public Node leave(final CatchNode catchNode) {
+        final Node exceptionCondition = catchNode.getExceptionCondition();
+        if (exceptionCondition != null) {
+            catchNode.setExceptionCondition(convert(exceptionCondition, Type.BOOLEAN));
+        }
+        return catchNode;
+    }
+
+    @Override
+    public Node enter(final DoWhileNode doWhileNode) {
+        return enter((WhileNode)doWhileNode);
+    }
+
+    @Override
+    public Node leave(final DoWhileNode doWhileNode) {
+        return leave((WhileNode)doWhileNode);
+    }
+
+    @Override
+    public Node leave(final ExecuteNode executeNode) {
+        executeNode.setExpression(discard(executeNode.getExpression()));
+        return executeNode;
+    }
+
+    @Override
+    public Node leave(final ForNode forNode) {
+        final Node init   = forNode.getInit();
+        final Node test   = forNode.getTest();
+        final Node modify = forNode.getModify();
+
+        if (forNode.isForIn()) {
+            forNode.setModify(convert(forNode.getModify(), Type.OBJECT)); // NASHORN-400
+            return forNode;
+        }
+
+        if (init != null) {
+            forNode.setInit(discard(init));
+        }
+
+        if (test != null) {
+            forNode.setTest(convert(test, Type.BOOLEAN));
+        } else {
+            assert forNode.hasGoto() : "forNode " + forNode + " needs goto and is missing it in " + getCurrentFunctionNode();
+        }
+
+        if (modify != null) {
+            forNode.setModify(discard(modify));
+        }
+
+        return forNode;
+    }
+
+    @Override
+    public Node enter(final FunctionNode functionNode) {
+        updateSymbols(functionNode);
+        return functionNode;
+    }
+
+    @Override
+    public Node leave(final IfNode ifNode) {
+        final Node test = convert(ifNode.getTest(), Type.BOOLEAN);
+        ifNode.setTest(test);
+        return ifNode;
+    }
+
+    @SuppressWarnings("rawtypes")
+    @Override
+    public Node enter(final LiteralNode literalNode) {
+        if (literalNode instanceof ArrayLiteralNode) {
+            final ArrayLiteralNode arrayLiteralNode = (ArrayLiteralNode)literalNode;
+            final Node[]           array            = arrayLiteralNode.getValue();
+            final Type             elementType      = arrayLiteralNode.getElementType();
+
+            for (int i = 0; i < array.length; i++) {
+                final Node element = array[i];
+                if (element != null) {
+                    array[i] = convert(element.accept(this), elementType);
+                }
+            }
+        }
+
+        return null;
+    }
+
+    @Override
+    public Node leave(final ReturnNode returnNode) {
+        final Node expr = returnNode.getExpression();
+        if (expr != null) {
+            returnNode.setExpression(convert(expr, getCurrentFunctionNode().getReturnType()));
+        }
+        return returnNode;
+    }
+
+    @Override
+    public Node leave(final RuntimeNode runtimeNode) {
+        final List<Node> args = runtimeNode.getArgs();
+        for (final Node arg : args) {
+            assert !arg.getType().isUnknown();
+        }
+        return runtimeNode;
+    }
+
+    @Override
+    public Node leave(final SwitchNode switchNode) {
+        final Node           expression  = switchNode.getExpression();
+        final List<CaseNode> cases       = switchNode.getCases();
+        final boolean        allInteger  = switchNode.getTag().getSymbolType().isInteger();
+
+        if (!allInteger) {
+            switchNode.setExpression(convert(expression, Type.OBJECT));
+            for (final CaseNode caseNode : cases) {
+                final Node test = caseNode.getTest();
+                if (test != null) {
+                    caseNode.setTest(convert(test, Type.OBJECT));
+                }
+            }
+        }
+
+        return switchNode;
+    }
+
+    @Override
+    public Node leave(final TernaryNode ternaryNode) {
+        ternaryNode.setLHS(convert(ternaryNode.lhs(), Type.BOOLEAN));
+        return ternaryNode;
+    }
+
+    @Override
+    public Node leave(final ThrowNode throwNode) {
+        throwNode.setExpression(convert(throwNode.getExpression(), Type.OBJECT));
+        return throwNode;
+    }
+
+    @Override
+    public Node leave(final VarNode varNode) {
+        final Node rhs = varNode.getInit();
+        if (rhs != null) {
+            Type destType = specialize(varNode);
+            if (destType == null) {
+                destType = varNode.getType();
+            }
+            assert varNode.hasType() : varNode + " doesn't have a type";
+            varNode.setInit(convert(rhs, destType));
+        }
+        return varNode;
+    }
+
+    @Override
+    public Node leave(final WhileNode whileNode) {
+        final Node test = whileNode.getTest();
+        if (test != null) {
+            whileNode.setTest(convert(test, Type.BOOLEAN));
+        }
+        return whileNode;
+    }
+
+    @Override
+    public Node leave(final WithNode withNode) {
+        withNode.setExpression(convert(withNode.getExpression(), Type.OBJECT));
+        return withNode;
+    }
+
+    private static void updateSymbolsLog(final FunctionNode functionNode, final Symbol symbol, final boolean loseSlot) {
+        if (!symbol.isScope()) {
+            LOG.finest("updateSymbols: " + symbol + " => scope, because all vars in " + functionNode.getName() + " are in scope");
+        }
+        if (loseSlot && symbol.hasSlot()) {
+            LOG.finest("updateSymbols: " + symbol + " => no slot, because all vars in " + functionNode.getName() + " are in scope");
+        }
+    }
+
+    /**
+     * Called after a block or function node (subclass of block) is finished. Guarantees
+     * that scope and slot information is correct for every symbol
+     * @param block block for which to to finalize type info.
+     */
+    private static void updateSymbols(final Block block) {
+
+        if (!block.needsScope()) {
+            return; // nothing to do
+        }
+
+        assert !(block instanceof FunctionNode) || block.getFunction() == block;
+
+        final FunctionNode functionNode   = block.getFunction();
+        final List<Symbol> symbols        = block.getFrame().getSymbols();
+        final boolean      allVarsInScope = functionNode.varsInScope();
+        final boolean      isVarArg       = functionNode.isVarArg();
+
+        for (final Symbol symbol : symbols) {
+            if (symbol.isInternal() || symbol.isThis()) {
+                continue;
+            }
+
+            if (symbol.isVar()) {
+                if (allVarsInScope || symbol.isScope()) {
+                    updateSymbolsLog(functionNode, symbol, true);
+                    symbol.setIsScope();
+                    symbol.setNeedsSlot(false);
+                } else {
+                    assert symbol.hasSlot() : symbol + " should have a slot only, no scope";
+                }
+            } else if (symbol.isParam() && (allVarsInScope || isVarArg || symbol.isScope())) {
+                updateSymbolsLog(functionNode, symbol, isVarArg);
+                symbol.setIsScope();
+                symbol.setNeedsSlot(!isVarArg);
+            }
+        }
+    }
+
+    /**
+     * Exit a comparison node and do the appropriate replacements. We need to introduce runtime
+     * nodes late for comparisons as types aren't known until the last minute
+     *
+     * Both compares and adds may turn into runtimes node at this level as when we first bump
+     * into the op in Attr, we may type it according to what we know there, which may be wrong later
+     *
+     * e.g. i (int) < 5 -> normal compare
+     *     i = object
+     *  then the post pass that would add the conversion to the 5 needs to
+     *
+     * @param binaryNode binary node to leave
+     * @param request    runtime request
+     * @return lowered cmp node
+     */
+    @SuppressWarnings("fallthrough")
+    private Node leaveCmp(final BinaryNode binaryNode, final RuntimeNode.Request request) {
+        final Node lhs    = binaryNode.lhs();
+        final Node rhs    = binaryNode.rhs();
+
+        Type widest = Type.widest(lhs.getType(), rhs.getType());
+
+        boolean newRuntimeNode = false, finalized = false;
+        switch (request) {
+        case EQ_STRICT:
+        case NE_STRICT:
+            if (lhs.getType().isBoolean() != rhs.getType().isBoolean()) {
+                newRuntimeNode = true;
+                widest = Type.OBJECT;
+                finalized = true;
+            }
+            //fallthru
+        default:
+            if (newRuntimeNode || widest.isObject()) {
+                final RuntimeNode runtimeNode = new RuntimeNode(binaryNode, request);
+                if (finalized) {
+                    runtimeNode.setIsFinal();
+                }
+                return runtimeNode;
+            }
+            break;
+        }
+
+        binaryNode.setLHS(convert(lhs, widest));
+        binaryNode.setRHS(convert(rhs, widest));
+
+        return binaryNode;
+    }
+
+    /**
+     * Compute the binary arithmetic type given the lhs and an rhs of a binary expression
+     * @param lhsType  the lhs type
+     * @param rhsType  the rhs type
+     * @return the correct binary type
+     */
+    private static Type binaryArithType(final Type lhsType, final Type rhsType) {
+        if (!Compiler.shouldUseIntegerArithmetic()) {
+            return Type.NUMBER;
+        }
+        return Type.widest(lhsType, rhsType, Type.NUMBER);
+    }
+
+    private Node leaveBinaryArith(final BinaryNode binaryNode) {
+        final Type type = binaryArithType(binaryNode.lhs().getType(), binaryNode.rhs().getType());
+        return leaveBinary(binaryNode, type, type);
+    }
+
+    private Node leaveBinary(final BinaryNode binaryNode, final Type lhsType, final Type rhsType) {
+        binaryNode.setLHS(convert(binaryNode.lhs(), lhsType));
+        binaryNode.setRHS(convert(binaryNode.rhs(), rhsType));
+        return binaryNode;
+    }
+
+    /**
+     * A symbol (and {@link Property}) can be tagged as "may be primitive". This is
+     * used a hint for dual fields that it is even worth it to try representing this
+     * field as something other than java.lang.Object.
+     *
+     * @param node node in which to tag symbols as primitive
+     * @param to   which primitive type to use for tagging
+     */
+    private static void setCanBePrimitive(final Node node, final Type to) {
+        final HashSet<Node> exclude = new HashSet<>();
+
+        node.accept(new NodeVisitor() {
+            private void setCanBePrimitive(final Symbol symbol) {
+                LOG.info("*** can be primitive symbol " + symbol + " " + Debug.id(symbol));
+                symbol.setCanBePrimitive(to);
+            }
+
+            @Override
+            public Node enter(final IdentNode identNode) {
+                if (!exclude.contains(identNode)) {
+                    setCanBePrimitive(identNode.getSymbol());
+                }
+                return null;
+            }
+
+            @Override
+            public Node enter(final AccessNode accessNode) {
+                setCanBePrimitive(accessNode.getProperty().getSymbol());
+                return null;
+            }
+
+            @Override
+            public Node enter(final IndexNode indexNode) {
+                exclude.add(indexNode.getBase()); //prevent array base node to be flagged as primitive, but k in a[k++] is fine
+                return indexNode;
+            }
+        });
+    }
+
+    private static Type specialize(final Assignment<?> assignment) {
+        final Node node = ((Node)assignment);
+        final Node lhs = assignment.getAssignmentDest();
+        final Node rhs = assignment.getAssignmentSource();
+
+        if (!canHaveCallSiteType(lhs)) {
+            return null;
+        }
+
+        final Type to;
+        if (node.isSelfModifying()) {
+            to = node.getWidestOperationType();
+        } else {
+            to = rhs.getType();
+        }
+
+        if (!isSupportedCallSiteType(to)) {
+            //meaningless to specialize to boolean or object
+            return null;
+        }
+
+        setTypeOverride(lhs, to);
+        propagateType(node, to);
+
+        return to;
+    }
+
+
+    /**
+     * Is this a node that can have its type overridden. This is true for
+     * AccessNodes, IndexNodes and IdentNodes
+     *
+     * @param node the node to check
+     * @return true if node can have a callsite type
+     */
+    private static boolean canHaveCallSiteType(final Node node) {
+        return node instanceof TypeOverride && ((TypeOverride)node).canHaveCallSiteType();
+    }
+
+    /**
+     * Is the specialization type supported. Currently we treat booleans as objects
+     * and have no special boolean type accessor, thus booleans are ignored.
+     * TODO - support booleans? NASHORN-590
+     *
+     * @param castTo the type to check
+     * @return true if call site type is supported
+     */
+    private static boolean isSupportedCallSiteType(final Type castTo) {
+        return castTo.isNumeric(); // don't specializable for boolean
+    }
+
+    /**
+     * Override the type of a node for e.g. access specialization of scope
+     * objects. Normally a variable can only get a wider type and narrower type
+     * sets are ignored. Not that a variable can still be on object type as
+     * per the type analysis, but a specific access may be narrower, e.g. if it
+     * is used in an arithmetic op. This overrides a type, regardless of
+     * type environment and is used primarily by the access specializer
+     *
+     * @param node    node for which to change type
+     * @param to      new type
+     */
+    private static void setTypeOverride(final Node node, final Type to) {
+        final Type from = node.getType();
+        if (!node.getType().equals(to)) {
+            LOG.info("Changing call override type for '" + node + "' from " + node.getType() + " to " + to);
+            if (!to.isObject() && from.isObject()) {
+                setCanBePrimitive(node, to);
+            }
+        }
+        LOG.info("Type override for lhs in '" + node + "' => " + to);
+        ((TypeOverride)node).setType(to);
+    }
+
+    /**
+     * Add an explicit conversion. This is needed when attribution has created types
+     * that do not mesh into an op type, e.g. a = b, where b is object and a is double
+     * at the end of Attr, needs explicit conversion logic.
+     *
+     * An explicit conversion can be one of the following:
+     *   + Convert a literal - just replace it with another literal
+     *   + Convert a scope object - just replace the type of the access, e.g. get()D->get()I
+     *   + Explicit convert placement, e.g. a = (double)b - all other cases
+     *
+     * No other part of the world after {@link Attr} may introduce new symbols. This
+     * is the only place.
+     *
+     * @param node node to convert
+     * @param to   destination type
+     * @return     conversion node
+     */
+    private Node convert(final Node node, final Type to) {
+        assert !to.isUnknown() : "unknown type for " + node + " class=" + node.getClass();
+        assert node != null : "node is null";
+        assert node.getSymbol() != null : "node " + node + " has no symbol!";
+        assert node.tokenType() != TokenType.CONVERT : "assert convert in convert " + node + " in " + getCurrentFunctionNode();
+
+        final Type from = node.getType();
+
+        if (Type.areEquivalent(from, to)) {
+            return node;
+        }
+
+        if (from.isObject() && to.isObject()) {
+            return node;
+        }
+
+        Node resultNode = node;
+
+        if (node instanceof LiteralNode && !to.isObject()) {
+            final LiteralNode<?> newNode = new LiteralNodeConstantEvaluator((LiteralNode<?>)node, to).eval();
+            if (newNode != null) {
+                resultNode = newNode;
+            }
+        } else {
+            if (canHaveCallSiteType(node) && isSupportedCallSiteType(to)) {
+                setTypeOverride(node, to);
+                return resultNode;
+            }
+            resultNode = new UnaryNode(source, Token.recast(node.getToken(), TokenType.CONVERT), node);
+        }
+
+        LOG.info("CONVERT('" + node + "', " + to + ") => '" + resultNode + "'");
+
+        //This is the only place in this file that can create new temporaries
+        //FinalizeTypes may not introduce ANY node that is not a conversion.
+        getCurrentFunctionNode().newTemporary(getCurrentBlock().getFrame(), to, resultNode);
+        resultNode.copyTerminalFlags(node);
+
+        return resultNode;
+    }
+
+    private Node discard(final Node node) {
+        node.setDiscard(true);
+
+        if (node.getSymbol() != null) {
+            final Node discard = new UnaryNode(source, Token.recast(node.getToken(), TokenType.DISCARD), node);
+            //discard never has a symbol in the discard node - then it would be a nop
+            discard.copyTerminalFlags(node);
+            return discard;
+        }
+
+        // node has no result (symbol) so we can keep it the way it is
+        return node;
+    }
+
+    /**
+     * Whenever an expression like an addition or an assignment changes type, it
+     * may be that case that {@link Attr} created a symbol for an intermediate
+     * result of the expression, say for an addition. This also has to be updated
+     * if the expression type changes.
+     *
+     * Assignments use their lhs as node symbol, and in this case we can't modify
+     * it. Then {@link CodeGenerator#Store} needs to do an explicit conversion.
+     * This is happens very rarely.
+     *
+     * @param node
+     * @param to
+     */
+    private static void propagateType(final Node node, final Type to) {
+        final Symbol symbol = node.getSymbol();
+        if (symbol.isTemp()) {
+            symbol.setTypeOverride(to);
+            LOG.info("Type override for temporary in '" + node + "' => " + to);
+        }
+    }
+
+    /**
+     * Determine if the outcome of + operator is a string.
+     *
+     * @param node  Node to test.
+     * @return true if a string result.
+     */
+    private boolean isAddString(final Node node) {
+        if (node instanceof BinaryNode && node.isTokenType(TokenType.ADD)) {
+            final BinaryNode binaryNode = (BinaryNode)node;
+            final Node lhs = binaryNode.lhs();
+            final Node rhs = binaryNode.rhs();
+
+            return isAddString(lhs) || isAddString(rhs);
+        }
+
+        return node instanceof LiteralNode<?> && ((LiteralNode<?>)node).isString();
+    }
+
+    /**
+     * Whenever an explicit conversion is needed and the convertee is a literal, we can
+     * just change the literal
+     */
+    static class LiteralNodeConstantEvaluator extends FoldConstants.ConstantEvaluator<LiteralNode<?>> {
+        private final Type type;
+
+        LiteralNodeConstantEvaluator(final LiteralNode<?> parent, final Type type) {
+            super(parent);
+            this.type = type;
+        }
+
+        @Override
+        protected LiteralNode<?> eval() {
+            final Object value = ((LiteralNode<?>)parent).getValue();
+
+            LiteralNode<?> literalNode = null;
+
+            if (type.isString()) {
+                literalNode = LiteralNode.newInstance(source, token, finish, JSType.toString(value));
+            } else if (type.isBoolean()) {
+                literalNode = LiteralNode.newInstance(source, token, finish, JSType.toBoolean(value));
+            } else if (type.isInteger()) {
+                literalNode = LiteralNode.newInstance(source, token, finish, JSType.toInt32(value));
+            } else if (type.isLong()) {
+                literalNode = LiteralNode.newInstance(source, token, finish, JSType.toLong(value));
+            } else if (type.isNumber() || parent.getType().isNumeric() && !parent.getType().isNumber()) {
+                literalNode = LiteralNode.newInstance(source, token, finish, JSType.toNumber(value));
+            }
+
+            if (literalNode != null) {
+                //inherit literal symbol for attr.
+                literalNode.setSymbol(parent.getSymbol());
+            }
+
+            return literalNode;
+        }
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/FoldConstants.java b/nashorn/src/jdk/nashorn/internal/codegen/FoldConstants.java
new file mode 100644
index 00000000000..a7e7aa2d3b7
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/FoldConstants.java
@@ -0,0 +1,278 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.codegen;
+
+import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.ir.BinaryNode;
+import jdk.nashorn.internal.ir.Block;
+import jdk.nashorn.internal.ir.EmptyNode;
+import jdk.nashorn.internal.ir.ExecuteNode;
+import jdk.nashorn.internal.ir.IfNode;
+import jdk.nashorn.internal.ir.LiteralNode;
+import jdk.nashorn.internal.ir.Node;
+import jdk.nashorn.internal.ir.TernaryNode;
+import jdk.nashorn.internal.ir.UnaryNode;
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.runtime.DebugLogger;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
+import jdk.nashorn.internal.runtime.Source;
+
+/**
+ * Simple constant folding pass, executed before IR is starting to be lowered.
+ */
+public class FoldConstants extends NodeVisitor {
+
+    private static final DebugLogger LOG = new DebugLogger("fold");
+
+    @Override
+    public Node leave(final UnaryNode unaryNode) {
+        final LiteralNode<?> literalNode = new UnaryNodeConstantEvaluator(unaryNode).eval();
+        if (literalNode != null) {
+            LOG.info("Unary constant folded " + unaryNode + " to " + literalNode);
+            return literalNode;
+        }
+        return unaryNode;
+    }
+
+    @Override
+    public Node leave(final BinaryNode binaryNode) {
+        final LiteralNode<?> literalNode = new BinaryNodeConstantEvaluator(binaryNode).eval();
+        if (literalNode != null) {
+            LOG.info("Binary constant folded " + binaryNode + " to " + literalNode);
+            return literalNode;
+        }
+        return binaryNode;
+    }
+
+    @Override
+    public Node leave(final IfNode ifNode) {
+        final Node test = ifNode.getTest();
+        if (test instanceof LiteralNode) {
+            final Block shortCut = ((LiteralNode<?>)test).isTrue() ? ifNode.getPass() : ifNode.getFail();
+            if (shortCut != null) {
+                return new ExecuteNode(shortCut);
+            }
+            return new EmptyNode(ifNode);
+        }
+        return ifNode;
+    }
+
+    @Override
+    public Node leave(final TernaryNode ternaryNode) {
+        final Node test = ternaryNode.lhs();
+        if (test instanceof LiteralNode) {
+            return ((LiteralNode<?>)test).isTrue() ? ternaryNode.rhs() : ternaryNode.third();
+        }
+        return ternaryNode;
+    }
+
+    /**
+     * Helper class to evaluate constant expressions at compile time This is
+     * also a simplifier used by BinaryNode visits, UnaryNode visits and
+     * conversions.
+     */
+    abstract static class ConstantEvaluator<T extends Node> {
+        protected T            parent;
+        protected final Source source;
+        protected final long   token;
+        protected final int    finish;
+
+        protected ConstantEvaluator(final T parent) {
+            this.parent = parent;
+            this.source = parent.getSource();
+            this.token  = parent.getToken();
+            this.finish = parent.getFinish();
+        }
+
+        /**
+         * Returns a literal node that replaces the given parent node, or null if replacement
+         * is impossible
+         * @return the literal node
+         */
+        protected abstract LiteralNode<?> eval();
+    }
+
+    private static class UnaryNodeConstantEvaluator extends ConstantEvaluator<UnaryNode> {
+        UnaryNodeConstantEvaluator(final UnaryNode parent) {
+            super(parent);
+        }
+
+        @Override
+        protected LiteralNode<?> eval() {
+            final Node rhsNode = parent.rhs();
+
+            if (!(rhsNode instanceof LiteralNode)) {
+                return null;
+            }
+
+            final LiteralNode<?> rhs = (LiteralNode<?>)rhsNode;
+            final boolean rhsInteger = rhs.getType().isInteger();
+
+            LiteralNode<?> literalNode;
+
+            switch (parent.tokenType()) {
+            case ADD:
+                if (rhsInteger) {
+                    literalNode = LiteralNode.newInstance(source, token, finish, rhs.getInt32());
+                } else {
+                    literalNode = LiteralNode.newInstance(source, token, finish, rhs.getNumber());
+                }
+                break;
+            case SUB:
+                if (rhsInteger && rhs.getInt32() != 0) { // @see test/script/basic/minuszero.js
+                    literalNode = LiteralNode.newInstance(source, token, finish, -rhs.getInt32());
+                } else {
+                    literalNode = LiteralNode.newInstance(source, token, finish, -rhs.getNumber());
+                }
+                break;
+            case NOT:
+                literalNode = LiteralNode.newInstance(source, token, finish, !rhs.getBoolean());
+                break;
+            case BIT_NOT:
+                literalNode = LiteralNode.newInstance(source, token, finish, ~rhs.getInt32());
+                break;
+            default:
+                return null;
+            }
+
+            return literalNode;
+        }
+    }
+
+    //TODO add AND and OR with one constant parameter (bitwise)
+    private static class BinaryNodeConstantEvaluator extends ConstantEvaluator<BinaryNode> {
+        BinaryNodeConstantEvaluator(final BinaryNode parent) {
+            super(parent);
+        }
+
+        @Override
+        protected LiteralNode<?> eval() {
+            LiteralNode<?> result;
+
+            result = reduceTwoLiterals();
+            if (result != null) {
+                return result;
+            }
+
+            result = reduceOneLiteral();
+            if (result != null) {
+                return result;
+            }
+
+            return null;
+        }
+
+        @SuppressWarnings("static-method")
+        private LiteralNode<?> reduceOneLiteral() {
+            //TODO handle patterns like AND, OR, numeric ops that can be strength reduced but not replaced by a single literal node etc
+            return null;
+        }
+
+        private LiteralNode<?> reduceTwoLiterals() {
+            if (!(parent.lhs() instanceof LiteralNode && parent.rhs() instanceof LiteralNode)) {
+                return null;
+            }
+
+            final LiteralNode<?> lhs = (LiteralNode<?>)parent.lhs();
+            final LiteralNode<?> rhs = (LiteralNode<?>)parent.rhs();
+
+            final Type widest = Type.widest(lhs.getType(), rhs.getType());
+
+            boolean isInteger = widest.isInteger();
+            boolean isLong    = widest.isLong();
+
+            double value;
+
+            switch (parent.tokenType()) {
+            case DIV:
+                value = lhs.getNumber() / rhs.getNumber();
+                break;
+            case ADD:
+                if ((lhs.isString() || rhs.isNumeric()) && (rhs.isString() || rhs.isNumeric())) {
+                    Object res = ScriptRuntime.ADD(lhs.getObject(), rhs.getObject());
+                    if (res instanceof Number) {
+                        value = ((Number)res).doubleValue();
+                        break;
+                    }
+                    assert res instanceof CharSequence : res + " was not a CharSequence, it was a " + res.getClass();
+                    return LiteralNode.newInstance(source, token, finish, res.toString());
+                }
+                return null;
+            case MUL:
+                value = lhs.getNumber() * rhs.getNumber();
+                break;
+            case MOD:
+                value = lhs.getNumber() % rhs.getNumber();
+                break;
+            case SUB:
+                value = lhs.getNumber() - rhs.getNumber();
+                break;
+            case SHR:
+                return LiteralNode.newInstance(source, token, finish, (lhs.getInt32() >>> rhs.getInt32()) & 0xffff_ffffL);
+            case SAR:
+                return LiteralNode.newInstance(source, token, finish, lhs.getInt32() >> rhs.getInt32());
+            case SHL:
+                return LiteralNode.newInstance(source, token, finish, lhs.getInt32() << rhs.getInt32());
+            case BIT_XOR:
+                return LiteralNode.newInstance(source, token, finish, lhs.getInt32() ^ rhs.getInt32());
+            case BIT_AND:
+                return LiteralNode.newInstance(source, token, finish, lhs.getInt32() & rhs.getInt32());
+            case BIT_OR:
+                return LiteralNode.newInstance(source, token, finish, lhs.getInt32() | rhs.getInt32());
+            case GE:
+                return LiteralNode.newInstance(source, token, finish, ScriptRuntime.GE(lhs.getObject(), rhs.getObject()));
+            case LE:
+                return LiteralNode.newInstance(source, token, finish, ScriptRuntime.LE(lhs.getObject(), rhs.getObject()));
+            case GT:
+                return LiteralNode.newInstance(source, token, finish, ScriptRuntime.GT(lhs.getObject(), rhs.getObject()));
+            case LT:
+                return LiteralNode.newInstance(source, token, finish, ScriptRuntime.LT(lhs.getObject(), rhs.getObject()));
+            case NE:
+                return LiteralNode.newInstance(source, token, finish, ScriptRuntime.NE(lhs.getObject(), rhs.getObject()));
+            case NE_STRICT:
+                return LiteralNode.newInstance(source, token, finish, ScriptRuntime.NE_STRICT(lhs.getObject(), rhs.getObject()));
+            case EQ:
+                return LiteralNode.newInstance(source, token, finish, ScriptRuntime.EQ(lhs.getObject(), rhs.getObject()));
+            case EQ_STRICT:
+                return LiteralNode.newInstance(source, token, finish, ScriptRuntime.EQ_STRICT(lhs.getObject(), rhs.getObject()));
+            default:
+                return null;
+            }
+
+            isInteger &= value != 0.0 && JSType.isRepresentableAsInt(value);
+            isLong    &= value != 0.0 && JSType.isRepresentableAsLong(value);
+
+            if (isInteger) {
+                return LiteralNode.newInstance(source, token, finish, JSType.toInt32(value));
+            } else if (isLong) {
+                return LiteralNode.newInstance(source, token, finish, JSType.toLong(value));
+            }
+
+            return LiteralNode.newInstance(source, token, finish, value);
+        }
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Lower.java b/nashorn/src/jdk/nashorn/internal/codegen/Lower.java
index 2c96d972e94..1cb6b5bc6a2 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Lower.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Lower.java
@@ -28,47 +28,19 @@ package jdk.nashorn.internal.codegen;
 import static jdk.nashorn.internal.codegen.CompilerConstants.ARGUMENTS;
 import static jdk.nashorn.internal.codegen.CompilerConstants.CALLEE;
 import static jdk.nashorn.internal.codegen.CompilerConstants.EVAL;
-import static jdk.nashorn.internal.codegen.CompilerConstants.EXCEPTION_PREFIX;
-import static jdk.nashorn.internal.codegen.CompilerConstants.ITERATOR_PREFIX;
 import static jdk.nashorn.internal.codegen.CompilerConstants.SCOPE;
 import static jdk.nashorn.internal.codegen.CompilerConstants.SCRIPT_RETURN;
-import static jdk.nashorn.internal.codegen.CompilerConstants.SWITCH_TAG_PREFIX;
 import static jdk.nashorn.internal.codegen.CompilerConstants.THIS;
 import static jdk.nashorn.internal.codegen.CompilerConstants.VARARGS;
-import static jdk.nashorn.internal.ir.RuntimeNode.Request.ADD;
-import static jdk.nashorn.internal.ir.RuntimeNode.Request.DELETE;
-import static jdk.nashorn.internal.ir.RuntimeNode.Request.EQ;
-import static jdk.nashorn.internal.ir.RuntimeNode.Request.EQ_STRICT;
-import static jdk.nashorn.internal.ir.RuntimeNode.Request.FAIL_DELETE;
-import static jdk.nashorn.internal.ir.RuntimeNode.Request.GE;
-import static jdk.nashorn.internal.ir.RuntimeNode.Request.GT;
-import static jdk.nashorn.internal.ir.RuntimeNode.Request.IN;
-import static jdk.nashorn.internal.ir.RuntimeNode.Request.INSTANCEOF;
-import static jdk.nashorn.internal.ir.RuntimeNode.Request.LE;
-import static jdk.nashorn.internal.ir.RuntimeNode.Request.LT;
-import static jdk.nashorn.internal.ir.RuntimeNode.Request.NE;
-import static jdk.nashorn.internal.ir.RuntimeNode.Request.NE_STRICT;
-import static jdk.nashorn.internal.ir.RuntimeNode.Request.TYPEOF;
-import static jdk.nashorn.internal.ir.RuntimeNode.Request.VOID;
-import static jdk.nashorn.internal.ir.Symbol.IS_GLOBAL;
-import static jdk.nashorn.internal.ir.Symbol.IS_INTERNAL;
-import static jdk.nashorn.internal.ir.Symbol.IS_LET;
-import static jdk.nashorn.internal.ir.Symbol.IS_PARAM;
-import static jdk.nashorn.internal.ir.Symbol.IS_THIS;
-import static jdk.nashorn.internal.ir.Symbol.IS_VAR;
-import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Deque;
-import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.List;
-import java.util.Set;
-import jdk.nashorn.internal.codegen.types.Type;
+
 import jdk.nashorn.internal.ir.AccessNode;
-import jdk.nashorn.internal.ir.Assignment;
+import jdk.nashorn.internal.ir.BaseNode;
 import jdk.nashorn.internal.ir.BinaryNode;
 import jdk.nashorn.internal.ir.Block;
 import jdk.nashorn.internal.ir.BreakNode;
@@ -85,19 +57,13 @@ import jdk.nashorn.internal.ir.IdentNode;
 import jdk.nashorn.internal.ir.IfNode;
 import jdk.nashorn.internal.ir.IndexNode;
 import jdk.nashorn.internal.ir.LabelNode;
+import jdk.nashorn.internal.ir.LabeledNode;
 import jdk.nashorn.internal.ir.LineNumberNode;
 import jdk.nashorn.internal.ir.LiteralNode;
-import jdk.nashorn.internal.ir.LiteralNode.ArrayLiteralNode;
 import jdk.nashorn.internal.ir.Node;
-import jdk.nashorn.internal.ir.ObjectNode;
-import jdk.nashorn.internal.ir.PropertyNode;
-import jdk.nashorn.internal.ir.ReferenceNode;
 import jdk.nashorn.internal.ir.ReturnNode;
-import jdk.nashorn.internal.ir.RuntimeNode;
-import jdk.nashorn.internal.ir.RuntimeNode.Request;
 import jdk.nashorn.internal.ir.SwitchNode;
 import jdk.nashorn.internal.ir.Symbol;
-import jdk.nashorn.internal.ir.TernaryNode;
 import jdk.nashorn.internal.ir.ThrowNode;
 import jdk.nashorn.internal.ir.TryNode;
 import jdk.nashorn.internal.ir.UnaryNode;
@@ -108,54 +74,26 @@ import jdk.nashorn.internal.ir.visitor.NodeOperatorVisitor;
 import jdk.nashorn.internal.ir.visitor.NodeVisitor;
 import jdk.nashorn.internal.parser.Token;
 import jdk.nashorn.internal.parser.TokenType;
-import jdk.nashorn.internal.runtime.Context;
 import jdk.nashorn.internal.runtime.DebugLogger;
-import jdk.nashorn.internal.runtime.ECMAException;
-import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.Property;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptFunction;
-import jdk.nashorn.internal.runtime.ScriptObject;
 import jdk.nashorn.internal.runtime.ScriptRuntime;
 import jdk.nashorn.internal.runtime.Source;
-import jdk.nashorn.internal.runtime.Undefined;
 
 /**
- * Lower to more primitive operations. After lowering, an AST has symbols and
- * types. Lowering may also add specialized versions of methods to the script if
- * the optimizer is turned on.
+ * Lower to more primitive operations. After lowering, an AST still has no symbols
+ * and types, but several nodes have been turned into more low level constructs
+ * and control flow termination criteria have been computed.
  *
- * Any expression that requires temporary storage as part of computation will
- * also be detected here and give a temporary symbol
+ * We do things like code copying/inlining of finallies here, as it is much
+ * harder and context dependent to do any code copying after symbols have been
+ * finalized.
  */
 
 final class Lower extends NodeOperatorVisitor {
-    /** Current compiler. */
+
     private final Compiler compiler;
 
-    /** Current source. */
     private final Source source;
 
-    /** List of lowered statements */
-    private List<Node> statements;
-
-    /** All symbols that are declared locally in a function node */
-    private List<Symbol> declaredSymbolsLocal;
-
-    /**
-     * Local definitions in current block (to discriminate from function
-     * declarations always defined in the function scope. This is for
-     * "can be undefined" analysis.
-     */
-    private Set<String> localDefs;
-
-    /**
-     * Local definitions in current block to guard against cases like
-     * NASHORN-467 when things can be undefined as they are used before
-     * their local var definition. *sigh* JavaScript...
-     */
-    private Set<String> localUses;
-
     /**
      * Nesting level stack. Currently just used for loops to avoid the problem
      * with terminal bodies that end with throw/return but still do continues to
@@ -163,8 +101,11 @@ final class Lower extends NodeOperatorVisitor {
      */
     private final Deque<Node> nesting;
 
-    private static final DebugLogger LOG   = new DebugLogger("lower");
-    private static final boolean     DEBUG = LOG.isEnabled();
+    private static final DebugLogger LOG = new DebugLogger("lower");
+
+    private Node lastStatement;
+
+    private List<Node> statements;
 
     /**
      * Constructor.
@@ -174,52 +115,17 @@ final class Lower extends NodeOperatorVisitor {
     Lower(final Compiler compiler) {
         this.compiler   = compiler;
         this.source     = compiler.getSource();
-        this.statements = new ArrayList<>();
         this.nesting    = new ArrayDeque<>();
-    }
-
-    private void nest(final Node node) {
-        nesting.push(node);
-    }
-
-    private void unnest() {
-        nesting.pop();
-    }
-
-    static void debug(final String str) {
-        if (DEBUG) {
-            LOG.info(str);
-        }
-    }
-
-    @Override
-    public Node leave(final AccessNode accessNode) {
-        //accessNode.setBase(convert(accessNode.getBase(), Type.OBJECT));
-        getCurrentFunctionNode().newTemporary(Type.OBJECT, accessNode); //This is not always an object per se, but currently the narrowing logic resides in AccessSpecializer. @see AccessSpecializer!
-
-        return accessNode;
+        this.statements = new ArrayList<>();
     }
 
     @Override
     public Node enter(final Block block) {
-        /*
-         * Save the statement list from the outer construct we are currently
-         * generating and push frame
-         */
-        final List<Node>  savedStatements = statements;
-        final Set<String> savedDefs       = localDefs;
-        final Set<String> savedUses       = localUses;
-
-        block.setFrame(getCurrentFunctionNode().pushFrame());
+        final Node       savedLastStatement = lastStatement;
+        final List<Node> savedStatements    = statements;
 
         try {
-            /*
-             * Reset the statement instance var, new block
-             */
-            statements = new ArrayList<>();
-            localDefs  = new HashSet<>(savedDefs);
-            localUses  = new HashSet<>(savedUses);
-
+            this.statements = new ArrayList<>();
             for (final Node statement : block.getStatements()) {
                 statement.accept(this);
                 /*
@@ -231,333 +137,60 @@ final class Lower extends NodeOperatorVisitor {
                  *
                  * @see NASHORN-285
                  */
-                final Node lastStatement = Node.lastStatement(statements);
                 if (lastStatement != null && lastStatement.isTerminal()) {
-                    block.copyTerminalFlags(lastStatement);
+                    copyTerminal(block, lastStatement);
                     break;
                 }
             }
-
             block.setStatements(statements);
-        } finally {
-            /*
-             * Restore the saved statements after block ends and pop frame
-             */
-            statements = savedStatements;
-            localDefs  = savedDefs;
-            localUses  = savedUses;
 
-            getCurrentFunctionNode().popFrame();
+        } finally {
+            this.statements = savedStatements;
+            this.lastStatement = savedLastStatement;
         }
 
         return null;
     }
 
-    /**
-     * Determine if Try block is inside target block.
-     *
-     * @param tryNode Try node to test.
-     * @param target  Target block.
-     *
-     * @return true if try block is inside the target, false otherwise.
-     */
-    private boolean isNestedTry(final TryNode tryNode, final Block target) {
-        for (Block current = getCurrentBlock(); current != target; current = current.getParent()) {
-            if (tryNode.getBody() == current) {
-                return true;
-            }
-
-            for (final Block catchBlock : tryNode.getCatchBlocks()) {
-                if (catchBlock == current) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Clones the body of the try finallys up to the target block.
-     *
-     * @param node       first try node in the chain.
-     * @param targetNode target block of the break/continue statement or null for return
-     *
-     * @return true if terminates.
-     */
-    private boolean copyFinally(final TryNode node, final Node targetNode) {
-        Block target = null;
-
-        if (targetNode instanceof Block) {
-            target = (Block)targetNode;
-        }
-
-        for (TryNode tryNode = node; tryNode != null; tryNode = tryNode.getNext()) {
-            if (target != null && !isNestedTry(tryNode, target)) {
-                return false;
-            }
-
-            Block finallyBody = tryNode.getFinallyBody();
-            if (finallyBody == null) {
-                continue;
-            }
-
-            finallyBody = (Block)finallyBody.clone();
-            final boolean hasTerminalFlags = finallyBody.hasTerminalFlags();
-
-            new ExecuteNode(source, finallyBody.getToken(), finallyBody.getFinish(), finallyBody).accept(this);
-
-            if (hasTerminalFlags) {
-                getCurrentBlock().copyTerminalFlags(finallyBody);
-                return true;
-            }
-        }
-
-        return false;
-    }
-
     @Override
     public Node enter(final BreakNode breakNode) {
-        final TryNode tryNode = breakNode.getTryChain();
-
-        if (tryNode != null && copyFinally(tryNode, breakNode.getTargetNode())) {
-            return null;
-        }
-
-        statements.add(breakNode);
-
-        return null;
-    }
-
-    /**
-     * Blesses nodes with an expectant type, converting if necessary.
-     *
-     * @param node Node to be blest.
-     * @param type Type class expected.
-     *
-     * @return Converted node or original node if no conversion is needed.
-     */
-    private Node convert(final Node node, final Type type) {
-
-        final Symbol       symbol       = node.getSymbol();
-        final FunctionNode functionNode = getCurrentFunctionNode();
-
-        assert !type.isUnknown() : "unknown";
-
-        /*
-         * Conversions are now mandatory, have to be placed at code time and
-         * cannot be removed as there might be cases like:
-         *
-         * var x = 17; if (x + 1) { ... }
-         *
-         * x = Number(4711); if (x + 1) { ... }
-         *
-         * In the old world this behaved as follows:
-         *
-         * Here, x is originally inferred type to a number, then the if does a
-         * double add without a cast. However, the next statement turns x into
-         * an object, and this messes up the original. If we would now suddenly
-         * need an explicit cast for the first addition, given that we don't do
-         * fancy stuff like splitting live range.
-         *
-         * Even worse is the case where we have an eval that modifies local
-         * variables in the middle of a function and may widen a type suspected
-         * to be at most e.g. NUMBER to e.g. OBJECT.
-         *
-         * There are a few local optimizations we can do. If we want to do an
-         * OBJECT to OBJECT cast, for example, we can skip it as already is
-         * maximally wide, except if we are in a method with an eval where
-         * everything is possible...
-         *
-         * @see test/test262/test/suite/ch07/7.2/S7.2_A1.4_T2.js for an example
-         * of this.
-         */
-
-        assert symbol != null : "no symbol for " + node;
-
-        /* check object to object cast */
-        if (!functionNode.hasEval() && node.getType().isEquivalentTo(Type.OBJECT) && type.isEquivalentTo(Type.OBJECT)) {
-            return node;
-        }
-
-        Node resultNode = node;
-
-        // Literal nodes may be converted directly
-
-        if (node instanceof LiteralNode) {
-            final LiteralNode<?> convertedLiteral = new LiteralNodeConstantEvaluator((LiteralNode<?>)node, type).eval();
-            if (convertedLiteral != null) {
-                resultNode = newLiteral(convertedLiteral);
-            }
-            // object literals still need the cast
-            if (type.isObject()) {
-                resultNode = new UnaryNode(source, Token.recast(node.getToken(), TokenType.CONVERT), node);
-            }
-        } else {
-            if (resultNode.getSymbol().isParam()) {
-                resultNode.getSymbol().setType(type);
-            }
-             resultNode = new UnaryNode(source, Token.recast(node.getToken(), TokenType.CONVERT), resultNode);
-        }
-
-        functionNode.newTemporary(type, resultNode);
-        resultNode.copyTerminalFlags(node);
-
-        return resultNode;
-    }
-
-    /**
-     * Accept and convert all arguments to type Object. If we have a
-     * specialization profile for this function, we instead try to specialize
-     * the arguments before the casts based on their current types and values.
-     *
-     * @param callNode function call
-     * @return return type for call
-     */
-    private Type acceptArgs(final CallNode callNode) {
-        final List<Node> oldArgs = callNode.getArgs();
-        final List<Node> acceptedArgs = new ArrayList<>(oldArgs.size());
-
-        for (final Node arg : oldArgs) {
-            //acceptedArgs.add(convert(arg.accept(this), OBJECT));
-            acceptedArgs.add(arg.accept(this));
-        }
-        callNode.setArgs(acceptedArgs);
-
-        return Type.OBJECT;
-    }
-
-    private static String evalLocation(final IdentNode node) {
-        final StringBuilder sb = new StringBuilder(node.getSource().getName());
-
-        sb.append('#');
-        sb.append(node.getSource().getLine(node.position()));
-        sb.append("<eval>");
-
-        return sb.toString();
-    }
-
-    private void checkEval(final CallNode callNode) {
-        if (callNode.getFunction() instanceof IdentNode) {
-
-            final List<Node> args   = callNode.getArgs();
-            final IdentNode  callee = (IdentNode)callNode.getFunction();
-
-            // 'eval' call with atleast one argument
-            if (args.size() >= 1 && EVAL.tag().equals(callee.getName())) {
-                final CallNode.EvalArgs evalArgs = new CallNode.EvalArgs();
-                // code that is evaluated
-                evalArgs.code = args.get(0).clone();
-                evalArgs.code.accept(this);
-                // 'this' to be passed to evaluated code
-                evalArgs.evalThis = new IdentNode(getCurrentFunctionNode().getThisNode());
-                // location string of the eval call
-                evalArgs.location = evalLocation(callee);
-                // strict mode context or not?
-                evalArgs.strictMode = getCurrentFunctionNode().isStrictMode();
-                callNode.setEvalArgs(evalArgs);
-            }
-        }
-    }
-
-    private static Node markerFunction(final Node function) {
-        if (function instanceof IdentNode) {
-            return new IdentNode((IdentNode)function) {
-                @Override
-                public boolean isFunction() {
-                    return true;
-                }
-            };
-        } else if (function instanceof AccessNode) {
-            return new AccessNode((AccessNode)function) {
-                @Override
-                public boolean isFunction() {
-                    return true;
-                }
-            };
-        } else if (function instanceof IndexNode) {
-            return new IndexNode((IndexNode)function) {
-                @Override
-                public boolean isFunction() {
-                    return true;
-                }
-            };
-        }
-
-        return function;
+        return enterBreakOrContinue(breakNode);
     }
 
     @Override
     public Node enter(final CallNode callNode) {
-        final Node function       = callNode.getFunction();
-        final Node markedFunction = markerFunction(function);
-
-        callNode.setFunction(markedFunction.accept(this));
-
-        checkEval(callNode);
-
-        final Type returnType = acceptArgs(callNode);
-        getCurrentFunctionNode().newTemporary(returnType, callNode);
-        callNode.getFunction().getSymbol().setType(returnType);
-
-        return null;
+        final Node function = markerFunction(callNode.getFunction());
+        callNode.setFunction(function);
+        checkEval(callNode); //check if this is an eval call and store the information
+        return callNode;
     }
 
     @Override
     public Node leave(final CaseNode caseNode) {
         caseNode.copyTerminalFlags(caseNode.getBody());
-
         return caseNode;
     }
 
-    @Override
-    public Node enter(final CatchNode catchNode) {
-        final IdentNode ident = catchNode.getException();
-        final Block     block = getCurrentBlock();
-
-        // define block-local exception variable
-        block.defineSymbol(ident.getName(), IS_VAR | IS_LET, ident).setType(Type.OBJECT);
-        localDefs.add(ident.getName());
-
-        return catchNode;
-    }
-
     @Override
     public Node leave(final CatchNode catchNode) {
-        final Node exceptionCondition = catchNode.getExceptionCondition();
-        if (exceptionCondition != null) {
-            catchNode.setExceptionCondition(convert(exceptionCondition, Type.BOOLEAN));
-        }
-
         catchNode.copyTerminalFlags(catchNode.getBody());
-
-        statements.add(catchNode);
-
+        addStatement(catchNode);
         return catchNode;
     }
 
     @Override
     public Node enter(final ContinueNode continueNode) {
-        final TryNode tryNode = continueNode.getTryChain();
-        final Node target = continueNode.getTargetNode();
-
-        if (tryNode != null && copyFinally(tryNode, target)) {
-            return null;
-        }
-
-        statements.add(continueNode);
-
-        return null;
+        return enterBreakOrContinue(continueNode);
     }
 
     @Override
-    public Node enter(final DoWhileNode whileNode) {
-        return enter((WhileNode)whileNode);
+    public Node enter(final DoWhileNode doWhileNode) {
+        return enter((WhileNode)doWhileNode);
     }
 
     @Override
-    public Node leave(final DoWhileNode whileNode) {
-        return leave((WhileNode)whileNode);
+    public Node leave(final DoWhileNode doWhileNode) {
+        return leave((WhileNode)doWhileNode);
     }
 
     @Override
@@ -565,624 +198,95 @@ final class Lower extends NodeOperatorVisitor {
         return null;
     }
 
-    /**
-     * Is this an assignment to the special variable that hosts scripting eval
-     * results?
-     *
-     * @param expression expression to check whether it is $evalresult = X
-     *
-     * @return true if an assignment to eval result, false otherwise
-     */
-    private boolean isEvalResultAssignment(final Node expression) {
-        Node e = expression;
-        if (e.tokenType() == TokenType.DISCARD) {
-            e = ((UnaryNode)expression).rhs();
-        }
-        final Node resultNode = getCurrentFunctionNode().getResultNode();
-        return e instanceof BinaryNode && ((BinaryNode)e).lhs().equals(resultNode);
-    }
-
-    /**
-     * An internal expression has a symbol that is tagged internal. Check if
-     * this is such a node
-     *
-     * @param expression expression to check for internal symbol
-     * @return true if internal, false otherwise
-     */
-    private static boolean isInternalExpression(final Node expression) {
-        final Symbol symbol = expression.getSymbol();
-        return symbol != null && symbol.isInternal();
-    }
-
-    /**
-     * Discard the result of the expression.
-     *
-     * @param expression Expression to discard.
-     *
-     * @return Discard node.
-     */
-    private Node discard(final Node expression) {
-        expression.setDiscard(true);
-
-        if (expression.getSymbol() != null) {
-            final Node discard = new UnaryNode(source, Token.recast(expression.getToken(), TokenType.DISCARD), expression);
-            discard.copyTerminalFlags(expression);
-
-            return discard;
-        }
-
-        return expression;
-    }
-
-    /**
-     * ExecuteNodes are needed to actually generate code, with a few exceptions
-     * such as ReturnNodes and ThrowNodes and various control flow that can
-     * standalone. Every other kind of statement needs to be wrapped in an
-     * ExecuteNode in order to become code
-     *
-     * @param executeNode  the execute node to visit
-     */
     @Override
     public Node leave(final ExecuteNode executeNode) {
+        final Node expr = executeNode.getExpression();
 
-        Node expression = executeNode.getExpression();
-
-        /*
-         * Handle the eval result for scripts. Every statement has to write its
-         * return value to a special variable that is the result of the script.
-         */
-        if (getCurrentFunctionNode().isScript() && !(expression instanceof Block) && !isEvalResultAssignment(expression) && !isInternalExpression(expression)) {
-            final Node resultNode = getCurrentFunctionNode().getResultNode();
-            expression = new BinaryNode(source, Token.recast(executeNode.getToken(), TokenType.ASSIGN), resultNode, convert(expression, resultNode.getType()));
-
-            getCurrentFunctionNode().newTemporary(Type.OBJECT, expression);
+        if (getCurrentFunctionNode().isScript()) {
+            if (!(expr instanceof Block)) {
+                if (!isInternalExpression(expr) && !isEvalResultAssignment(expr)) {
+                    executeNode.setExpression(new BinaryNode(source, Token.recast(executeNode.getToken(), TokenType.ASSIGN),
+                            getCurrentFunctionNode().getResultNode(),
+                            expr));
+                }
+            }
         }
 
-        expression = discard(expression);
-        executeNode.setExpression(expression);
-        executeNode.copyTerminalFlags(expression);
-
-        statements.add(executeNode);
+        copyTerminal(executeNode, executeNode.getExpression());
+        addStatement(executeNode);
 
         return executeNode;
     }
 
-    /**
-     * Helper that given a loop body makes sure that it is not terminal if it
-     * has a continue that leads to the loop header or to outer loops' loop
-     * headers. This means that, even if the body ends with a terminal
-     * statement, we cannot tag it as terminal
-     *
-     * @param loopBody the loop body to check
-     */
-    private boolean controlFlowEscapes(final Node loopBody) {
-        final List<Node> escapes = new ArrayList<>();
-
-        loopBody.accept(new NodeVisitor() {
-            @Override
-            public Node leave(final BreakNode node) {
-                escapes.add(node);
-                return node;
-            }
-
-            @Override
-            public Node leave(final ContinueNode node) {
-                // all inner loops have been popped.
-                if (nesting.contains(node.getTargetNode())) {
-                    escapes.add(node);
-                }
-                return node;
-            }
-        });
-
-        return !escapes.isEmpty();
-    }
-
     @Override
     public Node enter(final ForNode forNode) {
-        // push the loop to the loop context
         nest(forNode);
         return forNode;
     }
 
-    private static boolean conservativeAlwaysTrue(final Node node) {
-        return node == null || ((node instanceof LiteralNode) && Boolean.TRUE.equals(((LiteralNode<?>)node).getValue()));
-    }
-
     @Override
     public Node leave(final ForNode forNode) {
-        final Node init   = forNode.getInit();
-        final Node test   = forNode.getTest();
-        final Node modify = forNode.getModify();
-
-        if (forNode.isForIn()) {
-            final String name = compiler.uniqueName(ITERATOR_PREFIX.tag());
-            // DEFINE SYMBOL: may be any type, not local var
-            final Symbol iter = getCurrentFunctionNode().defineSymbol(name, IS_VAR | IS_INTERNAL, null);
-            iter.setType(Type.OBJECT); // NASHORN-73
-            forNode.setIterator(iter);
-            forNode.setModify(convert(forNode.getModify(), Type.OBJECT)); // NASHORN-400
-
-            /*
-             * Iterators return objects, so we need to widen the scope of the
-             * init variable if it, for example, has been assigned double type
-             * see NASHORN-50
-             */
-            forNode.getInit().getSymbol().setType(Type.OBJECT);
-        } else {
-            /* Normal for node, not for in */
-
-            if (init != null) {
-                forNode.setInit(discard(init));
-            }
-
-            if (test != null) {
-                forNode.setTest(convert(test, Type.BOOLEAN));
-            } else {
-                forNode.setHasGoto();
-            }
-
-            if (modify != null) {
-                forNode.setModify(discard(modify));
-            }
-        }
-
+        final Node  test = forNode.getTest();
         final Block body = forNode.getBody();
 
+        if (!forNode.isForIn() && test == null) {
+            setHasGoto(forNode);
+        }
+
         final boolean escapes = controlFlowEscapes(body);
         if (escapes) {
-            body.setIsTerminal(false);
+            setTerminal(body, false);
         }
 
         // pop the loop from the loop context
-        unnest();
+        unnest(forNode);
 
         if (!forNode.isForIn() && conservativeAlwaysTrue(test)) {
             forNode.setTest(null);
-            forNode.setIsTerminal(!escapes);
+            setTerminal(forNode, !escapes);
         }
 
-        statements.add(forNode);
+        addStatement(forNode);
 
         return forNode;
     }
 
-    /**
-     * Initialize this symbol and variable for function node
-     *
-     * @param functionNode the function node
-     */
-    private void initThis(final FunctionNode functionNode) {
-        final long token = functionNode.getToken();
-        final int finish = functionNode.getFinish();
-
-        final Symbol thisSymbol = functionNode.defineSymbol(THIS.tag(), IS_PARAM | IS_THIS, null);
-        final IdentNode thisNode = new IdentNode(source, token, finish, thisSymbol.getName());
-
-        thisSymbol.setType(Type.OBJECT);
-        thisSymbol.setNeedsSlot(true);
-
-        thisNode.setSymbol(thisSymbol);
-
-        functionNode.setThisNode(thisNode);
-    }
-
-    /**
-     * Initialize scope symbol and variable for function node
-     *
-     * @param functionNode the function node
-     */
-    private void initScope(final FunctionNode functionNode) {
-        final long token = functionNode.getToken();
-        final int finish = functionNode.getFinish();
-
-        final Symbol scopeSymbol = functionNode.defineSymbol(SCOPE.tag(), IS_VAR | IS_INTERNAL, null);
-        final IdentNode scopeNode = new IdentNode(source, token, finish, scopeSymbol.getName());
-
-        scopeSymbol.setType(ScriptObject.class);
-        scopeSymbol.setNeedsSlot(true);
-
-        scopeNode.setSymbol(scopeSymbol);
-
-        functionNode.setScopeNode(scopeNode);
-    }
-
-    /**
-     * Initialize return symbol and variable for function node
-     *
-     * @param functionNode the function node
-     */
-    private void initReturn(final FunctionNode functionNode) {
-        final long token = functionNode.getToken();
-        final int finish = functionNode.getFinish();
-
-        final Symbol returnSymbol = functionNode.defineSymbol(SCRIPT_RETURN.tag(), IS_VAR | IS_INTERNAL, null);
-        final IdentNode returnNode = new IdentNode(source, token, finish, returnSymbol.getName());
-
-        returnSymbol.setType(Object.class);
-        returnSymbol.setNeedsSlot(true);
-
-        returnNode.setSymbol(returnSymbol);
-
-        functionNode.setResultNode(returnNode);
-    }
-
-    /**
-     * Initialize varargs for function node, if applicable
-     *
-     * @param functionNode
-     */
-    private void initVarArg(final FunctionNode functionNode) {
-        final long token  = functionNode.getToken();
-        final int  finish = functionNode.getFinish();
-
-        assert functionNode.getCalleeNode() != null;
-
-        final Symbol    varArgsSymbol = functionNode.defineSymbol(VARARGS.tag(), IS_PARAM | IS_INTERNAL, null);
-        final IdentNode varArgsNode   = new IdentNode(source, token, finish, varArgsSymbol.getName());
-
-        varArgsSymbol.setType(Type.OBJECT_ARRAY);
-        varArgsSymbol.setNeedsSlot(true);
-
-        varArgsNode.setSymbol(varArgsSymbol);
-
-        functionNode.setVarArgsNode(varArgsNode);
-
-        final String    argumentsName    = ARGUMENTS.tag();
-        final String    name             = functionNode.hideArguments() ? functionNode.uniqueName("$" + argumentsName) : argumentsName;
-        final Symbol    argumentsSymbol  = functionNode.defineSymbol(name, IS_PARAM | IS_INTERNAL, null);
-        final IdentNode argumentsNode    = new IdentNode(source, token, finish, argumentsSymbol.getName());
-
-        argumentsSymbol.setType(Type.OBJECT);
-        argumentsSymbol.setNeedsSlot(true);
-
-        argumentsNode.setSymbol(argumentsSymbol);
-
-        functionNode.setArgumentsNode(argumentsNode);
-    }
-
-    private void initCallee(final FunctionNode functionNode) {
-        if (functionNode.getCalleeNode() != null) {
-            return;
-        }
-
-        final long token = functionNode.getToken();
-        final int finish = functionNode.getFinish();
-
-        final Symbol    calleeSymbol = functionNode.defineSymbol(CALLEE.tag(), IS_PARAM | IS_INTERNAL, null);
-        final IdentNode calleeNode   = new IdentNode(source, token, finish, calleeSymbol.getName());
-
-        calleeSymbol.setType(ScriptFunction.class);
-        calleeSymbol.setNeedsSlot(true);
-
-        calleeNode.setSymbol(calleeSymbol);
-
-        functionNode.setCalleeNode(calleeNode);
-    }
-
-    /**
-     * Initialize parameters for function node. This may require specializing
-     * types if a specialization profile is known
-     *
-     * @param functionNode the function node
-     */
-    private void initParameters(final FunctionNode functionNode) {
-        /*
-         * If a function is specialized, we don't need to tag either it return
-         * type or its parameters with the widest (OBJECT) type for safety.
-         */
-        functionNode.setReturnType(Type.UNKNOWN);
-
-        for (final IdentNode ident : functionNode.getParameters()) {
-            localDefs.add(ident.getName());
-            final Symbol paramSymbol = functionNode.defineSymbol(ident.getName(), IS_PARAM, ident);
-            if (paramSymbol != null) {
-                paramSymbol.setType(Type.UNKNOWN);
-            }
-        }
-    }
-
-    /**
-     * This has to run before fix assignment types, store any type specializations for
-     * paramters, then turn then to objects for the generic version of this method
-     *
-     * @param functionNode functionNode
-     */
-    private static void fixParameters(final FunctionNode functionNode) {
-        boolean nonObjectParams = false;
-        List<Type> paramSpecializations = new ArrayList<>();
-
-        for (final IdentNode ident : functionNode.getParameters()) {
-            final Symbol paramSymbol = ident.getSymbol();
-            if (paramSymbol != null) {
-                Type type = paramSymbol.getSymbolType();
-                if (type.isUnknown()) {
-                    type = Type.OBJECT;
-                }
-                paramSpecializations.add(type);
-                if (!type.isObject()) {
-                    nonObjectParams = true;
-                }
-                paramSymbol.setType(Type.OBJECT);
-            }
-        }
-
-        if (!nonObjectParams) {
-            paramSpecializations = null;
-            /*
-             * Later, when resolving a call to this method, the linker can say "I have a double, an int and an object" as parameters
-             * here. If the callee has parameter specializations, we can regenerate it with those particular types for speed.
-             */
-        } else {
-            LOG.info("parameter specialization possible: " + functionNode.getName() + " " + paramSpecializations);
-        }
-
-        // parameters should not be slots for a vararg function, make sure this is the case
-        if (functionNode.isVarArg()) {
-            for (final IdentNode param : functionNode.getParameters()) {
-                param.getSymbol().setNeedsSlot(false);
-            }
-        }
-    }
-
-    private LiteralNode<Undefined> undefined() {
-        return LiteralNode.newInstance(source, 0, 0, UNDEFINED);
-    }
-
-    private void guaranteeReturn(final FunctionNode functionNode) {
-        Node resultNode;
-
-        if (functionNode.isScript()) {
-            resultNode = functionNode.getResultNode();
-        } else {
-            final Node lastStatement = Node.lastStatement(functionNode.getStatements());
-            if (lastStatement != null && (lastStatement.isTerminal() || lastStatement instanceof ReturnNode)) {
-                return; // return already in place, as it should be for a non-undefined returning function
-            }
-            resultNode = undefined().accept(this);
-        }
-
-        new ReturnNode(source, functionNode.getLastToken(), functionNode.getFinish(), resultNode, null).accept(this);
-
-        functionNode.setReturnType(Type.OBJECT);
-    }
-
-    /**
-     * Fix return types for a node. The return type is the widest of all known
-     * return expressions in the function, and has to be the same for all return
-     * nodes, thus we need to traverse all of them in case some of them must be
-     * upcast
-     *
-     * @param node function node to scan return types for
-     */
-    private void fixReturnTypes(final FunctionNode node) {
-
-        if (node.getReturnType().isUnknown()) {
-            node.setReturnType(Type.OBJECT); // for example, infinite loops
-        }
-
-        node.accept(new NodeVisitor() {
-            @Override
-            public Node enter(final FunctionNode subFunction) {
-                //leave subfunctions alone. their return values are already specialized and should not
-                //be touched.
-                return null;
-            }
-            @Override
-            public Node leave(final ReturnNode returnNode) {
-                if (returnNode.hasExpression()) {
-                    returnNode.setExpression(convert(returnNode.getExpression(), node.getReturnType()));
-                }
-                return returnNode;
-            }
-        });
-    }
-
-    /**
-     * Augment assignments with casts after traversing a function node.
-     * Assignment nodes are special, as they require entire scope for type
-     * inference.
-     *
-     * Consider e.g.
-     *
-     * var x = 18.5; //double
-     * for (...) {
-     *      var y = x; //initially y is inferred to be double y = func(x) //y changes to object, but above assignment is unaware that it needs to be var y = (object)x instaed
-     */
-
-    private void fixAssignmentTypes(final FunctionNode node, final List<Symbol> declaredSymbols) {
-
-        // Make sure all unknown symbols are OBJECT types now. No UNKNOWN may survive lower.
-        for (final Symbol symbol : declaredSymbols) {
-            if (symbol.getSymbolType().isUnknown()) {
-                LOG.finest("fixAssignmentTypes: widening " + symbol + " to object " + symbol + " in " + getCurrentFunctionNode());
-                symbol.setType(Type.OBJECT);
-                symbol.setCanBeUndefined();
-            }
-
-            if (symbol.canBeUndefined()) {
-                /*
-                 * Ideally we'd like to only widen to the narrowest
-                 * possible type that supports local variables, i.e. doubles for
-                 * numerics, but
-                 *
-                 * var x;
-                 *
-                 * if (x !== undefined) do something
-                 *
-                 * x++;
-                 *
-                 * Screws this up, as x is determined to be a double even though
-                 * the use is undefined This can be fixed with better use
-                 * analysis in the IdentNode visitor.
-                 *
-                 * This actually seems to be superseded with calls to ensureTypeNotUnknown
-                 */
-                if (!Type.areEquivalent(symbol.getSymbolType(), Type.OBJECT)) {
-                    debug(symbol + " in " + getCurrentFunctionNode() + " can be undefined. Widening to object");
-                    symbol.setType(Type.OBJECT);
-                }
-            }
-        }
-
-        node.accept(new NodeVisitor() {
-
-            private void fix(final Assignment<? extends Node> assignment) {
-                final Node src  = assignment.getAssignmentSource();
-                final Node dest = assignment.getAssignmentDest();
-
-                if (src == null) {
-                    return;
-                }
-
-                //we don't know about scope yet so this is too conservative. AccessSpecialized will remove casts that are not required
-
-                final Type srcType  = src.getType();
-                Type destType = dest.getType();
-
-                //we can only narrow an operation type if the variable doesn't have a slot
-                if (!dest.getSymbol().hasSlot() && !node.hasDeepWithOrEval()) {
-                    destType = Type.narrowest(((Node)assignment).getWidestOperationType(), destType);
-                }
-
-                if (!Type.areEquivalent(destType, srcType)) {
-                    LOG.finest("fixAssignment " + assignment + " type = " + src.getType() + "=>" + dest.getType());
-                    assignment.setAssignmentSource(convert(src, destType));
-                }
-            }
-
-            private Node checkAssignment(final Node assignNode) {
-                if (!assignNode.isAssignment()) {
-                    return assignNode;
-                }
-                fix((Assignment<?>)assignNode);
-                return assignNode;
-            }
-
-
-            @Override
-            public Node leave(final UnaryNode unaryNode) {
-                return checkAssignment(unaryNode);
-            }
-
-            @Override
-            public Node leave(final BinaryNode binaryNode) {
-                return checkAssignment(binaryNode);
-            }
-
-            @Override
-            public Node leave(final VarNode varNode) {
-                return checkAssignment(varNode);
-            }
-        });
-    }
-
-    /*
-     * For a script, add scope symbols as defined in the property map
-     */
-    private static void initFromPropertyMap(final Context context, final FunctionNode functionNode) {
-        assert functionNode.isScript();
-
-        final PropertyMap map = context.getGlobalMap();
-
-        for (final Property property : map.getProperties()) {
-            final String key = property.getKey();
-            functionNode.defineSymbol(key, IS_GLOBAL, null).setType(Type.OBJECT);
-        }
-    }
-
     @Override
     public Node enter(final FunctionNode functionNode) {
         LOG.info("START FunctionNode: " + functionNode.getName());
 
-        Node initialEvalResult = undefined();
+        initFunctionNode(functionNode);
+
+        Node initialEvalResult = LiteralNode.newInstance(functionNode, ScriptRuntime.UNDEFINED);
 
         nest(functionNode);
 
-        localDefs = new HashSet<>();
-        localUses = new HashSet<>();
-
-        functionNode.setFrame(functionNode.pushFrame());
-
-        initThis(functionNode);
-        initCallee(functionNode);
-        if (functionNode.isVarArg()) {
-            initVarArg(functionNode);
-        }
-
-        initParameters(functionNode);
-        initScope(functionNode);
-        initReturn(functionNode);
-
-        /*
-         * Add all nested functions as symbols in this function
-         */
-        for (final FunctionNode nestedFunction : functionNode.getFunctions()) {
-            final IdentNode ident = nestedFunction.getIdent();
-
-            // for initial eval result is the last declared function
-            if (ident != null && nestedFunction.isStatement()) {
-                final Symbol functionSymbol = functionNode.defineSymbol(ident.getName(), IS_VAR, nestedFunction);
-
-                functionSymbol.setType(ScriptFunction.class);
-                initialEvalResult = new IdentNode(ident);
-            }
-        }
-
-        if (functionNode.isScript()) {
-            initFromPropertyMap(compiler.getContext(), functionNode);
-        }
-
-        // Add function name as local symbol
-        if (!functionNode.isStatement() && !functionNode.isAnonymous() && !functionNode.isScript()) {
-            final Symbol selfSymbol = functionNode.defineSymbol(functionNode.getIdent().getName(), IS_VAR, functionNode);
-            selfSymbol.setType(Type.OBJECT);
-            selfSymbol.setNode(functionNode);
-        }
-
         /*
          * As we are evaluating a nested structure, we need to store the
          * statement list for the surrounding block and restore it when the
          * function is done
          */
         final List<Node> savedStatements = statements;
-        statements = new ArrayList<>();
+        final Node savedLastStatement = lastStatement;
 
-        /*
-         * This pushes all declarations (except for non-statements, i.e. for
-         * node temporaries) to the top of the function scope. This way we can
-         * get around problems like
-         *
-         * while (true) {
-         *   break;
-         *   if (true) {
-         *     var s;
-         *   }
-         * }
-         *
-         * to an arbitrary nesting depth.
-         *
-         * @see NASHORN-73
-         */
+        statements    = new ArrayList<>();
+        lastStatement = null;
 
-        final List<Symbol> declaredSymbols = new ArrayList<>();
-        for (final VarNode decl : functionNode.getDeclarations()) {
-            final IdentNode ident = decl.getName();
-            // any declared symbols that aren't visited need to be typed as
-            // well, hence the list
-            declaredSymbols.add(functionNode.defineSymbol(ident.getName(), IS_VAR, new IdentNode(ident)));
+        // for initial eval result is the last declared function
+        for (final FunctionNode nestedFunction : functionNode.getFunctions()) {
+            final IdentNode ident = nestedFunction.getIdent();
+            if (ident != null && nestedFunction.isStatement()) {
+                initialEvalResult = new IdentNode(ident);
+            }
         }
 
-        declaredSymbolsLocal = new ArrayList<>();
+        if (functionNode.needsSelfSymbol()) {
+            //function needs to start with var funcIdent = __callee_;
+            statements.add(functionNode.getSelfSymbolInit().accept(this));
+        }
 
-        /*
-         * Main function code lowering
-         */
         try {
-            /*
-             * Every nested function needs a definition in the outer function
-             * with its name. Add these.
-             */
+            // Every nested function needs a definition in the outer function with its name. Add these.
             for (final FunctionNode nestedFunction : functionNode.getFunctions()) {
                 final VarNode varNode = nestedFunction.getFunctionVarNode();
                 if (varNode != null) {
@@ -1199,370 +303,115 @@ final class Lower extends NodeOperatorVisitor {
                 new ExecuteNode(source, functionNode.getFirstToken(), functionNode.getFinish(), initialEvalResult).accept(this);
             }
 
-            /*
-             * Now we do the statements. This fills the block with code
-             */
+            //do the statements - this fills the block with code
             for (final Node statement : functionNode.getStatements()) {
                 statement.accept(this);
-
-                final Node lastStatement = Node.lastStatement(statements);
+                //If there are unused terminated endpoints in the function, we need
+                // to add a "return undefined" in those places for correct semantics
+                LOG.info("Checking lastStatement="+lastStatement+" for terminal flags");
                 if (lastStatement != null && lastStatement.hasTerminalFlags()) {
-                    functionNode.copyTerminalFlags(lastStatement);
+                    copyTerminal(functionNode, lastStatement);
                     break;
                 }
             }
 
             functionNode.setStatements(statements);
 
-            /*
-             * If there are unusedterminated enpoints in the function, we need
-             * to add a "return undefined" in those places for correct semantics
-             */
             if (!functionNode.isTerminal()) {
                 guaranteeReturn(functionNode);
             }
 
-            /*
-             * Emit all nested functions
-             */
+            //lower all nested functions
             for (final FunctionNode nestedFunction : functionNode.getFunctions()) {
                 nestedFunction.accept(this);
             }
 
-            fixReturnTypes(functionNode);
-
-            if (functionNode.needsSelfSymbol()) {
-                final IdentNode selfSlotNode = new IdentNode(functionNode.getIdent());
-                selfSlotNode.setSymbol(functionNode.findSymbol(functionNode.getIdent().getName()));
-                final Node functionRef = new IdentNode(functionNode.getCalleeNode());
-                statements.add(0, new VarNode(source, functionNode.getToken(), functionNode.getFinish(), selfSlotNode, functionRef, false).accept(this));
-            }
         } finally {
-            /*
-             * Restore statement for outer block that we were working on
-             */
-            statements = savedStatements;
+            statements    = savedStatements;
+            lastStatement = savedLastStatement;
         }
 
-        unnest();
-
-        fixParameters(functionNode);
-
-        /*
-         * Fix assignment issues. assignments are troublesome as they can be on
-         * the form "dest = dest op source" where the type is different for the
-         * two dest:s: right now this is a post pass that handles putting casts
-         * in the correct places, but it can be implemented as a bottom up AST
-         * traversal on the fly. TODO.
-         */
-        fixAssignmentTypes(functionNode, declaredSymbols);
-
-        /*
-         * Set state of function to lowered and pop the frame
-         */
-        functionNode.setIsLowered(true);
-        functionNode.popFrame();
-
         LOG.info("END FunctionNode: " + functionNode.getName());
+        unnest(functionNode);
 
         return null;
     }
 
-    @Override
-    public Node enter(final IdentNode identNode) {
-        final String name = identNode.getName();
-
-        if (identNode.isPropertyName()) {
-            // assign a pseudo symbol to property name
-            identNode.setSymbol(new Symbol(name, 0, Type.OBJECT));
-            return null;
-        }
-
-        final Block block = getCurrentBlock();
-        final Symbol oldSymbol = identNode.getSymbol();
-        Symbol symbol = block.findSymbol(name);
-
-        /*
-         * If an existing symbol with the name is found, use that otherwise,
-         * declare a new one
-         */
-
-        if (symbol != null) {
-            if (isFunctionExpressionSelfReference(symbol)) {
-                ((FunctionNode) symbol.getNode()).setNeedsSelfSymbol();
-            }
-
-            if (!identNode.isInitializedHere()) { // NASHORN-448
-                // here is a use outside the local def scope
-                if (!localDefs.contains(name)) {
-                    symbol.setType(Type.OBJECT);
-                    symbol.setCanBeUndefined();
-                }
-            }
-
-            identNode.setSymbol(symbol);
-            if (!getCurrentFunctionNode().isLocal(symbol)) {
-                // non-local: we need to put symbol in scope (if it isn't already)
-                if (!symbol.isScope()) {
-                    final List<Block> lookupBlocks = findLookupBlocksHelper(getCurrentFunctionNode(), symbol.findFunction());
-                    for (final Block lookupBlock : lookupBlocks) {
-                        final Symbol refSymbol = lookupBlock.findSymbol(name);
-                        if (refSymbol != null) { // See NASHORN-837, function declaration in lexical scope: try {} catch (x){ function f() { use(x) } } f()
-                            LOG.finest("Found a ref symbol that must be scope " + refSymbol);
-                            refSymbol.setIsScope();
-                        }
-                    }
-                }
-            }
-        } else {
-            symbol = block.useSymbol(name, identNode);
-            // we have never seen this before, it can be undefined
-            symbol.setType(Type.OBJECT); // TODO unknown -we have explicit casts anyway?
-            symbol.setCanBeUndefined();
-        }
-
-        if (symbol != oldSymbol && !identNode.isInitializedHere()) {
-            symbol.increaseUseCount();
-        }
-        localUses.add(identNode.getName());
-
-        return null;
-    }
-
-    private static List<Block> findLookupBlocksHelper(final FunctionNode currentFunction, final FunctionNode topFunction) {
-        if (currentFunction.findParentFunction() == topFunction) {
-            final List<Block> blocks = new LinkedList<>();
-
-            blocks.add(currentFunction.getParent());
-            blocks.addAll(currentFunction.getReferencingParentBlocks());
-            return blocks;
-        }
-        /**
-         * assumption: all parent blocks of an inner function will always be in the same outer function;
-         * therefore we can simply skip through intermediate functions.
-         * @see FunctionNode#addReferencingParentBlock(Block)
-         */
-        return findLookupBlocksHelper(currentFunction.findParentFunction(), topFunction);
-    }
-
-    private static boolean isFunctionExpressionSelfReference(final Symbol symbol) {
-        if (symbol.isVar() && symbol.getNode() == symbol.getBlock() && symbol.getNode() instanceof FunctionNode) {
-            return ((FunctionNode) symbol.getNode()).getIdent().getName().equals(symbol.getName());
-        }
-        return false;
-    }
-
     @Override
     public Node enter(final IfNode ifNode) {
-        nest(ifNode);
-        return ifNode;
+        return nest(ifNode);
     }
 
     @Override
     public Node leave(final IfNode ifNode) {
-
-        final Node test = convert(ifNode.getTest(), Type.BOOLEAN);
-
-        /*
-         * constant if checks should short circuit into just one of the
-         * pass/fail blocks
-         */
-        if (test.getSymbol().isConstant()) {
-            assert test instanceof LiteralNode<?>;
-            final Block shortCut = ((LiteralNode<?>)test).isTrue() ? ifNode.getPass() : ifNode.getFail();
-            if (shortCut != null) {
-                for (final Node statement : shortCut.getStatements()) {
-                    statements.add(statement);
-                }
-            }
-            return null;
-        }
-
         final Node pass = ifNode.getPass();
         final Node fail = ifNode.getFail();
 
         if (pass.isTerminal() && fail != null && fail.isTerminal()) {
-            ifNode.setIsTerminal(true);
+            setTerminal(ifNode,  true);
         }
 
-        ifNode.setTest(test);
-        statements.add(ifNode);
-
-        unnest();
+        addStatement(ifNode);
+        unnest(ifNode);
 
         return ifNode;
     }
 
     @Override
-    public Node leave(final IndexNode indexNode) {
-        getCurrentFunctionNode().newTemporary(Type.OBJECT, indexNode);
-
-        return indexNode;
-    }
-
-    @Override
-    public Node enter(final LabelNode labeledNode) {
-        // Don't want a symbol for label.
-        final Block body = labeledNode.getBody();
+    public Node enter(LabelNode labelNode) {
+        final Block body = labelNode.getBody();
         body.accept(this);
-        labeledNode.copyTerminalFlags(body);
-        statements.add(labeledNode);
-
+        copyTerminal(labelNode, body);
+        addStatement(labelNode);
         return null;
     }
 
     @Override
     public Node enter(final LineNumberNode lineNumberNode) {
-        statements.add(lineNumberNode);
+        addStatement(lineNumberNode, false); // don't put it in lastStatement cache
         return null;
     }
 
-    /**
-     * Generate a new literal symbol.
-     *
-     * @param literalNode LiteralNode needing symbol.
-     * @return The literal node augmented with the symbol
-     */
-    private LiteralNode<?> newLiteral(final LiteralNode<?> literalNode) {
-        return newLiteral(getCurrentFunctionNode(), literalNode);
-    }
-
-    private static LiteralNode<?> newLiteral(final FunctionNode functionNode, final LiteralNode<?> literalNode) {
-        functionNode.newLiteral(literalNode);
-        return literalNode;
-    }
-
-    @SuppressWarnings("rawtypes")
-    @Override
-    public Node enter(final LiteralNode literalNode) {
-        if (literalNode.isTokenType(TokenType.THIS)) {
-            literalNode.setSymbol(getCurrentFunctionNode().getThisNode().getSymbol());
-            return null;
-        }
-
-        if (literalNode instanceof ArrayLiteralNode) {
-            final ArrayLiteralNode arrayLiteralNode = (ArrayLiteralNode)literalNode;
-            final Node[] array = arrayLiteralNode.getValue();
-
-            for (int i = 0; i < array.length; i++) {
-                final Node element = array[i];
-                if (element != null) {
-                    array[i] = array[i].accept(this);
-                }
-            }
-
-            arrayLiteralNode.analyze();
-            final Type elementType = arrayLiteralNode.getElementType();
-
-            // we only have types after all elements are accepted
-            for (int i = 0; i < array.length; i++) {
-                final Node element = array[i];
-                if (element != null) {
-                    array[i] = convert(element, elementType);
-                }
-            }
-        } else {
-            final Object value = literalNode.getValue();
-
-            if (value instanceof Node) {
-                final Node node = ((Node)value).accept(this);
-                if (node != null) {
-                    return newLiteral(LiteralNode.newInstance(source, node.getToken(), node.getFinish(), node));
-                }
-            }
-        }
-
-        newLiteral(literalNode);
-
-        return null;
-    }
-
-    @Override
-    public Node leave(final ObjectNode objectNode) {
-        getCurrentFunctionNode().newTemporary(Type.OBJECT, objectNode);
-        return objectNode;
-    }
-
-    @Override
-    public Node enter(final PropertyNode propertyNode) {
-        // assign a pseudo symbol to property name, see NASHORN-710
-        propertyNode.setSymbol(new Symbol(propertyNode.getKeyName(), 0, Type.OBJECT));
-        return propertyNode;
-    }
-
-    @Override
-    public Node enter(final ReferenceNode referenceNode) {
-        final FunctionNode functionNode = referenceNode.getReference();
-        if (functionNode != null) {
-            functionNode.addReferencingParentBlock(getCurrentBlock());
-        }
-        return referenceNode;
-    }
-
-    @Override
-    public Node leave(final ReferenceNode referenceNode) {
-        getCurrentFunctionNode().newTemporary(Type.OBJECT, referenceNode);
-        return referenceNode;
-    }
-
-    /**
-     * For each return node we need to set a return expression of the correct
-     * type. In the non-specializing world, we can always upcast to object and
-     * ignore the rest, but in the specializing world we have to keep track of
-     * the widest return type so far, which is the common one for this method.
-     *
-     * @param returnNode  the return node we are generating
-     * @param expression  the expression to return from this code
-     */
-    private void setReturnExpression(final ReturnNode returnNode, final Node expression) {
-        final FunctionNode functionNode = getCurrentFunctionNode();
-
-        returnNode.setExpression(expression);
-
-        final Symbol symbol = expression.getSymbol();
-        if (expression.getType().isUnknown() && symbol.isParam()) {
-            symbol.setType(Type.OBJECT);
-        }
-        functionNode.setReturnType(Type.widest(expression.getType(), functionNode.getReturnType()));
-    }
-
     @Override
     public Node enter(final ReturnNode returnNode) {
         final TryNode tryNode = returnNode.getTryChain();
-        final Node expression = returnNode.getExpression();
+        final Node    expr    = returnNode.getExpression();
 
         if (tryNode != null) {
-            if (expression != null) {
-                final long token = returnNode.getToken();
-                final Node resultNode = getCurrentFunctionNode().getResultNode();
-                new ExecuteNode(source, token, Token.descPosition(token), new BinaryNode(source, Token.recast(token, TokenType.ASSIGN), resultNode, expression)).accept(this);
+            //we are inside a try block - we don't necessarily have a result node yet. attr will do that.
+            if (expr != null) {
+                //we need to evaluate the result of the return in case it is complex while
+                //still in the try block, store it in a result value and return it afterwards
+                final long token        = returnNode.getToken();
+                final Node resultNode   = new IdentNode(getCurrentFunctionNode().getResultNode());
+                final Node assignResult = new BinaryNode(source, Token.recast(token, TokenType.ASSIGN), resultNode, expr);
 
+                //add return_in_try = expr; to try block
+                new ExecuteNode(source, token, Token.descPosition(token), assignResult).accept(this);
+
+                //splice in the finally code, inlining it here
                 if (copyFinally(tryNode, null)) {
                     return null;
                 }
 
-                setReturnExpression(returnNode, resultNode);
+                //make sure that the return node now returns 'return_in_try'
+                returnNode.setExpression(resultNode);
             } else if (copyFinally(tryNode, null)) {
                 return null;
             }
-        } else if (expression != null) {
-            setReturnExpression(returnNode, expression.accept(this));
+        } else if (expr != null) {
+            returnNode.setExpression(expr.accept(this));
         }
 
-        statements.add(returnNode);
+        addStatement(returnNode);
 
         return null;
     }
 
     @Override
-    public Node leave(final RuntimeNode runtimeNode) {
-        for (final Node arg : runtimeNode.getArgs()) {
-            ensureTypeNotUnknown(arg);
-        }
-
-        getCurrentFunctionNode().newTemporary(runtimeNode.getRequest().getReturnType(), runtimeNode);
-
-        return runtimeNode;
+    public Node leave(final ReturnNode returnNode) {
+        addStatement(returnNode); //ReturnNodes are always terminal, marked as such in constructor
+        return returnNode;
     }
 
     @Override
@@ -1573,96 +422,45 @@ final class Lower extends NodeOperatorVisitor {
 
     @Override
     public Node leave(final SwitchNode switchNode) {
-        unnest();
+        unnest(switchNode);
 
-        final Node           expression  = switchNode.getExpression();
         final List<CaseNode> cases       = switchNode.getCases();
         final CaseNode       defaultCase = switchNode.getDefaultCase();
-        final boolean        hasDefault  = defaultCase != null;
-        final int            n           =  cases.size() + (hasDefault ? -1 : 0);
 
         boolean allTerminal = !cases.isEmpty();
-        boolean allInteger  = n > 1;
-
-        for (final CaseNode caseNode : cases) {
+        for (final CaseNode caseNode : switchNode.getCases()) {
             allTerminal &= caseNode.isTerminal();
-            final Node test = caseNode.getTest();
-
-            // Skip default.
-            if (test == null) {
-                continue;
-            }
-
-            // If not a number.
-            if (!(test instanceof LiteralNode) || !test.getType().isNumeric()) {
-                allInteger = false;
-                continue;
-            }
-
-            final LiteralNode<?> testLiteral = (LiteralNode<?>)test;
-
-            // If a potential integer.
-            if (!(testLiteral.getValue() instanceof Integer)) {
-                // If not an integer value.
-                if (!JSType.isRepresentableAsInt(testLiteral.getNumber())) {
-                    allInteger = false;
-                    continue;
-                }
-
-                // Guarantee all case literals are Integers (simplifies sorting in code gen.)
-                caseNode.setTest(newLiteral(LiteralNode.newInstance(source, testLiteral.getToken(), testLiteral.getFinish(), testLiteral.getInt32())));
-            }
         }
 
         if (allTerminal && defaultCase != null && defaultCase.isTerminal()) {
-            switchNode.setIsTerminal(true);
+            setTerminal(switchNode, true);
         }
 
-        if (!allInteger) {
-            switchNode.setExpression(convert(expression, Type.OBJECT));
-
-            for (final CaseNode caseNode : cases) {
-                final Node test = caseNode.getTest();
-
-                if (test != null) {
-                    caseNode.setTest(convert(test, Type.OBJECT));
-                }
-            }
-        }
-
-        final String name = compiler.uniqueName(SWITCH_TAG_PREFIX.tag());
-        final Symbol tag  = getCurrentFunctionNode().defineSymbol(name, IS_VAR | IS_INTERNAL, null);
-
-        tag.setType(allInteger ? Type.INT : Type.OBJECT);
-        switchNode.setTag(tag);
-
-        statements.add(switchNode);
+        addStatement(switchNode);
 
         return switchNode;
     }
 
     @Override
     public Node leave(final ThrowNode throwNode) {
-        throwNode.setExpression(convert(throwNode.getExpression(), Type.OBJECT));
-        statements.add(throwNode);
-
+        addStatement(throwNode); //ThrowNodes are always terminal, marked as such in constructor
         return throwNode;
     }
 
     @Override
     public Node enter(final TryNode tryNode) {
-        final Block  finallyBody   = tryNode.getFinallyBody();
-        final Source tryNodeSource = tryNode.getSource();
-        final long   token         = tryNode.getToken();
-        final int    finish        = tryNode.getFinish();
+        final Block  finallyBody = tryNode.getFinallyBody();
+        final long   token       = tryNode.getToken();
+        final int    finish      = tryNode.getFinish();
 
         nest(tryNode);
 
         if (finallyBody == null) {
+            //do nothing if no finally exists
             return tryNode;
         }
 
-        /**
+        /*
          * We have a finally clause.
          *
          * Transform to do finally tail duplication as follows:
@@ -1728,12 +526,14 @@ final class Lower extends NodeOperatorVisitor {
             // insert an intermediate try-catch* node, where we move the body and all catch blocks.
             // the original try node become a try-finally container for the new try-catch* node.
             // because we don't clone (to avoid deep copy), we have to fix the block chain in the end.
-            final TryNode innerTryNode = new TryNode(tryNodeSource, token, finish, tryNode.getNext());
+            final TryNode innerTryNode;
+            innerTryNode = new TryNode(source, token, finish, tryNode.getNext());
             innerTryNode.setBody(tryNode.getBody());
             innerTryNode.setCatchBlocks(tryNode.getCatchBlocks());
 
             // set outer tryNode's body to innerTryNode
-            final Block outerBody = new Block(tryNodeSource, token, finish, tryNode.getBody().getParent(), getCurrentFunctionNode());
+            final Block outerBody;
+            outerBody = new Block(source, token, finish, tryNode.getBody().getParent(), getCurrentFunctionNode());
             outerBody.setStatements(new ArrayList<Node>(Arrays.asList(innerTryNode)));
             tryNode.setBody(outerBody);
             tryNode.setCatchBlocks(null);
@@ -1747,21 +547,24 @@ final class Lower extends NodeOperatorVisitor {
         }
 
         // create a catch-all that inlines finally and rethrows
-        final String name = compiler.uniqueName(EXCEPTION_PREFIX.tag());
 
-        final IdentNode exception = new IdentNode(tryNodeSource, token, finish, name);
-        exception.accept(this);
+        final Block catchBlock      = new Block(source, token, finish, getCurrentBlock(), getCurrentFunctionNode());
+        //this catch block should get define symbol
 
-        final Block catchBlock      = new Block(tryNodeSource, token, finish, getCurrentBlock(), getCurrentFunctionNode());
-        final Block catchBody       = new Block(tryNodeSource, token, finish, catchBlock, getCurrentFunctionNode());
+        final Block catchBody       = new Block(source, token, finish, catchBlock, getCurrentFunctionNode());
         final Node  catchAllFinally = finallyBody.clone();
 
-        catchBody.addStatement(new ExecuteNode(tryNodeSource, finallyBody.getToken(), finallyBody.getFinish(), catchAllFinally));
-        catchBody.setIsTerminal(true);
+        catchBody.addStatement(new ExecuteNode(source, finallyBody.getToken(), finallyBody.getFinish(), catchAllFinally));
+        setTerminal(catchBody, true);
 
-        final CatchNode catchNode = new CatchNode(tryNodeSource, token, finish, new IdentNode(exception), null, catchBody);
-        catchNode.setIsSyntheticRethrow();
-        catchBlock.addStatement(catchNode);
+        final CatchNode catchAllNode;
+        final IdentNode exception;
+
+        exception    = new IdentNode(source, token, finish, compiler.uniqueName("catch_all"));
+        catchAllNode = new CatchNode(source, token, finish, new IdentNode(exception), null, catchBody);
+        catchAllNode.setIsSyntheticRethrow();
+
+        catchBlock.addStatement(catchAllNode);
 
         // replace all catches of outer tryNode with the catch-all
         tryNode.setCatchBlocks(new ArrayList<>(Arrays.asList(catchBlock)));
@@ -1787,1351 +590,383 @@ final class Lower extends NodeOperatorVisitor {
 
         tryNode.setIsTerminal(allTerminal);
 
-        final String name      = compiler.uniqueName(EXCEPTION_PREFIX.tag());
-        final Symbol exception = getCurrentFunctionNode().defineSymbol(name, IS_VAR | IS_INTERNAL, null);
-
-        exception.setType(ECMAException.class);
-        tryNode.setException(exception);
-
-        statements.add(tryNode);
-
-        unnest();
+        addStatement(tryNode);
+        unnest(tryNode);
 
         // if finally body is present, place it after the tryNode
         if (finallyBody != null) {
             tryNode.setFinallyBody(null);
-            statements.add(finallyBody);
+            addStatement(finallyBody);
         }
 
         return tryNode;
     }
 
-    @Override
-    public Node enter(final VarNode varNode) {
-        final IdentNode ident = varNode.getName();
-        final String    name  = ident.getName();
-
-        final Symbol symbol = getCurrentBlock().defineSymbol(name, IS_VAR, ident);
-        assert symbol != null;
-
-        varNode.setSymbol(symbol);
-        declaredSymbolsLocal.add(symbol);
-
-        // NASHORN-467 - use before definition of vars - conservative
-        if (localUses.contains(ident.getName())) {
-            symbol.setType(Type.OBJECT);
-            symbol.setCanBeUndefined();
-        }
-
-        return varNode;
-    }
-
-    private static boolean isScopeOrGlobal(final Symbol symbol) {
-        return symbol.getBlock().getFunction().isScript(); //we can't do explicit isScope checks as early as lower, which is why AccessSpecializer is afterwards as well.
-    }
-
     @Override
     public Node leave(final VarNode varNode) {
-        final Node      init  = varNode.getInit();
-        final IdentNode ident = varNode.getName();
-        final String    name  = ident.getName();
-
-        if (init != null) {
-            localDefs.add(name);
-        }
-
-        if (varNode.shouldAppend()) {
-            statements.add(varNode);
-        }
-
-        if (init == null) {
-            // var x; with no init will be treated like a use of x by
-            // visit(IdentNode) unless we remove the name
-            // from the localdef list.
-            localDefs.remove(name);
-            return varNode;
-        }
-
-        final Symbol symbol = varNode.getSymbol();
-        if ((init.getType().isNumeric() || init.getType().isBoolean()) && !isScopeOrGlobal(symbol)) { //see NASHORN-56
-            // Forbid integers as local vars for now as we have no way to treat them as undefined
-            final Type type = Compiler.shouldUseIntegers() ? init.getType() : Type.NUMBER;
-            varNode.setInit(convert(init, type));
-            symbol.setType(type);
-        } else {
-            symbol.setType(Type.OBJECT); // var x = obj;, x is an "object" //TODO too conservative now?
-        }
-
+        addStatement(varNode);
         return varNode;
     }
 
     @Override
     public Node enter(final WhileNode whileNode) {
-        // push the loop to the loop context
-        nest(whileNode);
-
-        return whileNode;
+        return nest(whileNode);
     }
 
     @Override
     public Node leave(final WhileNode whileNode) {
         final Node test = whileNode.getTest();
 
-        if (test != null) {
-            whileNode.setTest(convert(test, Type.BOOLEAN));
-        } else {
-            whileNode.setHasGoto();
+        if (test == null) {
+            setHasGoto(whileNode);
         }
 
-        Node returnNode = whileNode;
-
         final Block   body    = whileNode.getBody();
         final boolean escapes = controlFlowEscapes(body);
         if (escapes) {
-            body.setIsTerminal(false);
+            setTerminal(body, false);
         }
 
+        Node node = whileNode;
+
         if (body.isTerminal()) {
             if (whileNode instanceof DoWhileNode) {
-                whileNode.setIsTerminal(true);
+                setTerminal(whileNode, true);
             } else if (conservativeAlwaysTrue(test)) {
-                returnNode = new ForNode(source, whileNode.getToken(), whileNode.getFinish());
-                ((ForNode)returnNode).setBody(body);
-                returnNode.setIsTerminal(!escapes);
+                node = new ForNode(source, whileNode.getToken(), whileNode.getFinish());
+                ((ForNode)node).setBody(body);
+                ((ForNode)node).accept(this);
+                setTerminal(node, !escapes);
             }
         }
 
         // pop the loop from the loop context
-        unnest();
-        statements.add(returnNode);
+        unnest(whileNode);
+        addStatement(node);
 
-        return returnNode;
+        return node;
     }
 
     @Override
     public Node leave(final WithNode withNode) {
-        withNode.setExpression(convert(withNode.getExpression(), Type.OBJECT));
-
         if (withNode.getBody().isTerminal()) {
-            withNode.setIsTerminal(true);
+            setTerminal(withNode,  true);
         }
-
-        statements.add(withNode);
+        addStatement(withNode);
 
         return withNode;
     }
 
-    /*
-     * Unary visits.
-     */
-
-    /**
-     * Visit unary node and set symbols and inferred type
-     *
-     * @param unaryNode  unary node to visit
-     * @param type       The narrowest allowed type for this node
-     *
-     * @return the final node, or replacement thereof
-     */
-    public Node leaveUnary(final UnaryNode unaryNode, final Type type) {
-        /* Try to eliminate the unary node if the expression is constant */
-        final LiteralNode<?> literalNode = new UnaryNodeConstantEvaluator(unaryNode).eval();
-        if (literalNode != null) {
-            return newLiteral(literalNode);
-        }
-
-        /* Add explicit conversion */
-        unaryNode.setRHS(convert(unaryNode.rhs(), type));
-        getCurrentFunctionNode().newTemporary(type, unaryNode);
-
-        return unaryNode;
-    }
-
-    @Override
-    public Node leaveADD(final UnaryNode unaryNode) {
-        return leaveUnary(unaryNode, Type.NUMBER);
-    }
-
-    @Override
-    public Node leaveBIT_NOT(final UnaryNode unaryNode) {
-        return leaveUnary(unaryNode, Type.INT);
-    }
-
-    @Override
-    public Node leaveCONVERT(final UnaryNode unaryNode) {
-        final Node rhs = unaryNode.rhs();
-
-        if (rhs.isTokenType(TokenType.CONVERT)) {
-            rhs.setSymbol(unaryNode.getSymbol());
-            return rhs;
-        }
-
-        return unaryNode;
-    }
-
-    /**
-     * In an assignment, recursively make sure that there are slots for
-     * everything that has to be laid out as temporary storage, which is the
-     * case if we are assign-op:ing a BaseNode subclass. This has to be
-     * recursive to handle things like multi dimensional arrays as lhs
-     *
-     * see NASHORN-258
-     *
-     * @param functionNode   the current function node (has to be passed as it changes in the visitor below)
-     * @param assignmentDest the destination node of the assignment, e.g. lhs for binary nodes
-     */
-    private static void ensureAssignmentSlots(final FunctionNode functionNode, final Node assignmentDest) {
-
-        assignmentDest.accept(new NodeVisitor() {
-
-            @Override
-            public Node leave(final AccessNode accessNode) {
-                final Node base = accessNode.getBase();
-                if (base.getSymbol().isThis()) {
-                    functionNode.addThisProperty(accessNode.getProperty().getName(), accessNode);
-                }
-
-                return accessNode;
-            }
-
-            @Override
-            public Node leave(final IndexNode indexNode) {
-                final Node index = indexNode.getIndex();
-                index.getSymbol().setNeedsSlot(!index.getSymbol().isConstant());
-
-                return indexNode;
-            }
-
-        });
-    }
-
-    @Override
-    public Node leaveDECINC(final UnaryNode unaryNode) {
-        // @see assignOffset
-        ensureAssignmentSlots(getCurrentFunctionNode(), unaryNode.rhs());
-        final Type type = Compiler.shouldUseIntegerArithmetic() ? Type.INT : Type.NUMBER;
-
-        unaryNode.rhs().getSymbol().setType(type);
-        getCurrentFunctionNode().newTemporary(type, unaryNode);
-
-        return unaryNode;
-    }
-
-    /**
-     * Helper class for wrapping a result
-     */
-    private abstract static class ResultNodeVisitor extends NodeVisitor {
-
-        private Node resultNode;
-
-        ResultNodeVisitor(final Node resultNode) {
-            this.resultNode = resultNode;
-        }
-
-        Node getResultNode() {
-            return resultNode;
-        }
-
-        void setResultNode(final Node resultNode) {
-            this.resultNode = resultNode;
-        }
-    }
-
     @Override
     public Node leaveDELETE(final UnaryNode unaryNode) {
-        final boolean              strictMode     = getCurrentFunctionNode().isStrictMode();
-        final Node                 rhs            = unaryNode.rhs();
-        final long                 token          = unaryNode.getToken();
-        final int                  finish         = unaryNode.getFinish();
-        final LiteralNode<Boolean> trueNode       = LiteralNode.newInstance(source, token, finish, true);
-        final LiteralNode<Boolean> strictFlagNode = LiteralNode.newInstance(source, token, finish, strictMode);
-
-        newLiteral(trueNode);
-        newLiteral(strictFlagNode);
-
-        final NodeVisitor  lower = this;
-        final FunctionNode currentFunctionNode = getCurrentFunctionNode();
-
-        final ResultNodeVisitor visitor = new ResultNodeVisitor(trueNode) {
-
-            private void initRuntimeNode(final RuntimeNode node) {
-                node.accept(lower);
-                currentFunctionNode.newTemporary(Type.BOOLEAN, unaryNode);
-                node.setSymbol(unaryNode.getSymbol());
-
-                setResultNode(node);
-            }
-
-            @Override
-            public Node enter(final IdentNode node) {
-                // If this is a declared variable or a function parameter, delete always fails (except for globals).
-                final boolean failDelete =
-                        strictMode ||
-                        node.getSymbol().isParam() ||
-                        (node.getSymbol().isVar() && !node.getSymbol().isTopLevel());
-
-                final Node literalNode =
-                    newLiteral(
-                        currentFunctionNode,
-                        LiteralNode.newInstance(
-                            source,
-                            node.getToken(),
-                            node.getFinish(),
-                            node.getName()));
-
-                if (failDelete) {
-                    if (THIS.tag().equals(node.getName())) {
-                        statements.add(new ExecuteNode(source, token, finish, discard(node)));
-                        currentFunctionNode.newTemporary(Type.BOOLEAN, trueNode);
-                        return null; //trueNode it is
-                    }
-                }
-
-                final List<Node> args = new ArrayList<>();
-                args.add(convert(currentFunctionNode.getScopeNode(), Type.OBJECT));
-                args.add(convert(literalNode, Type.OBJECT));
-                args.add(strictFlagNode);
-
-                initRuntimeNode(
-                    new RuntimeNode(
-                        source,
-                        token,
-                        finish,
-                        failDelete ? FAIL_DELETE : DELETE,
-                        args));
-
-                return null;
-            }
-
-            @Override
-            public Node enter(final AccessNode node) {
-                final IdentNode property = node.getProperty();
-
-                initRuntimeNode(
-                    new RuntimeNode(
-                        source,
-                        token,
-                        finish,
-                        DELETE,
-                        convert(node.getBase(), Type.OBJECT),
-                        convert(
-                            newLiteral(
-                                currentFunctionNode,
-                                LiteralNode.newInstance(
-                                    source,
-                                    property.getToken(),
-                                    property.getFinish(),
-                                    property.getName())),
-                            Type.OBJECT),
-                        strictFlagNode));
-
-                return null;
-            }
-
-            @Override
-            public Node enter(final IndexNode node) {
-                initRuntimeNode(
-                    new RuntimeNode(
-                        source,
-                        token,
-                        finish,
-                        DELETE,
-                        convert(node.getBase(), Type.OBJECT),
-                        convert(node.getIndex(), Type.OBJECT),
-                        strictFlagNode));
-
-                return null;
-            }
-
-            @Override
-            public Node enterDefault(final Node node) {
-                statements.add(new ExecuteNode(source, token, finish, discard(node)));
-                currentFunctionNode.newTemporary(Type.BOOLEAN, trueNode);
-                //just return trueNode which is the default
-                return null;
-            }
-        };
-
-        rhs.accept(visitor);
-
-        return visitor.getResultNode();
+        final Node rhs = unaryNode.rhs();
+        if (rhs instanceof IdentNode || rhs instanceof BaseNode) {
+            return unaryNode;
+        }
+        addStatement(new ExecuteNode(rhs));
+        return LiteralNode.newInstance(unaryNode, true);
     }
 
-    @Override
-    public Node enterNEW(final UnaryNode unaryNode) {
-        final CallNode callNode = (CallNode)unaryNode.rhs();
+    /**
+     * Given a function node that is a callee in a CallNode, replace it with
+     * the appropriate marker function. This is used by {@link CodeGenerator}
+     * for fast scope calls
+     *
+     * @param function function called by a CallNode
+     * @return transformed node to marker function or identity if not ident/access/indexnode
+     */
+    private static Node markerFunction(final Node function) {
+        if (function instanceof IdentNode) {
+            return new IdentNode((IdentNode)function) {
+                @Override
+                public boolean isFunction() {
+                    return true;
+                }
+            };
+        } else if (function instanceof AccessNode) {
+            return new AccessNode((AccessNode)function) {
+                @Override
+                public boolean isFunction() {
+                    return true;
+                }
+            };
+        } else if (function instanceof IndexNode) {
+            return new IndexNode((IndexNode)function) {
+                @Override
+                public boolean isFunction() {
+                    return true;
+                }
+            };
+        }
 
-        callNode.setIsNew();
+        return function;
+    }
 
-        final Node function = callNode.getFunction();
-        final Node markedFunction = markerFunction(function);
+    /**
+     * Calculate a synthetic eval location for a node for the stacktrace, for example src#17<eval>
+     * @param node a node
+     * @return eval location
+     */
+    private static String evalLocation(final IdentNode node) {
+        //final StringBuilder sb = new StringBuilder(node.getSource().getName());
+        return new StringBuilder().
+            append(node.getSource().getName()).
+            append('#').
+            append(node.getSource().getLine(node.position())).
+            append("<eval>").
+            toString();
+    }
 
-        callNode.setFunction(markedFunction.accept(this));
+    /**
+     * Check whether a call node may be a call to eval. In that case we
+     * clone the args in order to create the following construct in
+     * {@link CodeGenerator}
+     *
+     * <pre>
+     * if (calledFuntion == buildInEval) {
+     *    eval(cloned arg);
+     * } else {
+     *    cloned arg;
+     * }
+     * </pre>
+     *
+     * @param callNode call node to check if it's an eval
+     */
+    private void checkEval(final CallNode callNode) {
+        if (callNode.getFunction() instanceof IdentNode) {
 
-        acceptArgs(callNode);
+            final List<Node> args   = callNode.getArgs();
+            final IdentNode  callee = (IdentNode)callNode.getFunction();
 
-        getCurrentFunctionNode().newTemporary(Type.OBJECT, unaryNode);
+            // 'eval' call with at least one argument
+            if (args.size() >= 1 && EVAL.tag().equals(callee.getName())) {
+                final CallNode.EvalArgs evalArgs =
+                    new CallNode.EvalArgs(
+                        args.get(0).clone().accept(this), //clone as we use this for the "is eval case". original evaluated separately for "is not eval case"
+                        getCurrentFunctionNode().getThisNode(),
+                        evalLocation(callee),
+                        getCurrentFunctionNode().isStrictMode());
+                callNode.setEvalArgs(evalArgs);
+            }
+        }
+    }
 
+    private static boolean conservativeAlwaysTrue(final Node node) {
+        return node == null || ((node instanceof LiteralNode) && Boolean.TRUE.equals(((LiteralNode<?>)node).getValue()));
+    }
+
+    /**
+     * Helper that given a loop body makes sure that it is not terminal if it
+     * has a continue that leads to the loop header or to outer loops' loop
+     * headers. This means that, even if the body ends with a terminal
+     * statement, we cannot tag it as terminal
+     *
+     * @param loopBody the loop body to check
+     * @return true if control flow may escape the loop
+     */
+    private boolean controlFlowEscapes(final Node loopBody) {
+        final List<Node> escapes = new ArrayList<>();
+
+        loopBody.accept(new NodeVisitor() {
+            @Override
+            public Node leave(final BreakNode node) {
+                escapes.add(node);
+                return node;
+            }
+
+            @Override
+            public Node leave(final ContinueNode node) {
+                // all inner loops have been popped.
+                if (nesting.contains(node.getTargetNode())) {
+                    escapes.add(node);
+                }
+                return node;
+            }
+        });
+
+        return !escapes.isEmpty();
+    }
+
+    private void guaranteeReturn(final FunctionNode functionNode) {
+        Node resultNode;
+
+        if (functionNode.isScript()) {
+            resultNode = functionNode.getResultNode(); // the eval result, symbol assigned in Attr
+        } else {
+            if (lastStatement != null && lastStatement.isTerminal() || lastStatement instanceof ReturnNode) {
+                return; //already in place or not needed, as it should be for a non-undefined returning function
+            }
+            resultNode = LiteralNode.newInstance(functionNode, ScriptRuntime.UNDEFINED);
+        }
+
+        //create a return statement
+        final Node returnNode = new ReturnNode(source, functionNode.getLastToken(), functionNode.getFinish(), resultNode, null);
+        returnNode.accept(this);
+    }
+
+
+    private Node nest(final Node node) {
+        LOG.info("Nesting: " + node);
+        LOG.indent();
+        nesting.push(node);
+        return node;
+    }
+
+    private void unnest(final Node node) {
+        LOG.unindent();
+        assert nesting.getFirst() == node : "inconsistent nesting order : " + nesting.getFirst() + " != " + node;
+        LOG.info("Unnesting: " + nesting);
+        nesting.pop();
+    }
+
+    private static void setTerminal(final Node node, final boolean isTerminal) {
+        LOG.info("terminal = " + isTerminal + " for " + node);
+        node.setIsTerminal(isTerminal);
+    }
+
+    private static void setHasGoto(final Node node) { //, final boolean hasGoto) {
+        LOG.info("hasGoto = true for " + node);
+        node.setHasGoto();
+    }
+
+    private static void copyTerminal(final Node node, final Node sourceNode) {
+        LOG.info("copy terminal flags " + sourceNode + " -> " + node);
+        node.copyTerminalFlags(sourceNode);
+    }
+
+    private void addStatement(final Node statement, final boolean storeInLastStatement) {
+        LOG.info("add statement = " + statement + " (lastStatement = " + lastStatement + ")");
+        statements.add(statement);
+        if (storeInLastStatement) {
+            lastStatement = statement;
+        }
+    }
+
+    private void addStatement(final Node statement) {
+        addStatement(statement, true);
+    }
+
+    /**
+     * Determine if Try block is inside target block.
+     *
+     * @param tryNode Try node to test.
+     * @param target  Target block.
+     *
+     * @return true if try block is inside the target, false otherwise.
+     */
+    private boolean isNestedTry(final TryNode tryNode, final Block target) {
+        for (Block current = getCurrentBlock(); current != target; current = current.getParent()) {
+            if (tryNode.getBody() == current) {
+                return true;
+            }
+
+            for (final Block catchBlock : tryNode.getCatchBlocks()) {
+                if (catchBlock == current) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Clones the body of the try finallys up to the target block.
+     *
+     * @param node       first try node in the chain.
+     * @param targetNode target block of the break/continue statement or null for return
+     *
+     * @return true if terminates.
+     */
+    private boolean copyFinally(final TryNode node, final Node targetNode) {
+        Block target = null;
+
+        if (targetNode instanceof Block) {
+            target = (Block)targetNode;
+        }
+
+        for (TryNode tryNode = node; tryNode != null; tryNode = tryNode.getNext()) {
+            if (target != null && !isNestedTry(tryNode, target)) {
+                return false;
+            }
+
+            Block finallyBody = tryNode.getFinallyBody();
+            if (finallyBody == null) {
+                continue;
+            }
+
+            finallyBody = (Block)finallyBody.clone();
+            final boolean hasTerminalFlags = finallyBody.hasTerminalFlags();
+
+            new ExecuteNode(source, finallyBody.getToken(), finallyBody.getFinish(), finallyBody).accept(this);
+
+            if (hasTerminalFlags) {
+                getCurrentBlock().copyTerminalFlags(finallyBody);
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private Node enterBreakOrContinue(final LabeledNode labeledNode) {
+        final TryNode tryNode = labeledNode.getTryChain();
+        if (tryNode != null && copyFinally(tryNode, labeledNode.getTargetNode())) {
+            return null;
+        }
+        addStatement(labeledNode);
         return null;
     }
 
-    @Override
-    public Node leaveNOT(final UnaryNode unaryNode) {
-        return leaveUnary(unaryNode, Type.BOOLEAN);
-    }
 
     /**
-     * Create a null literal
+     * An internal expression has a symbol that is tagged internal. Check if
+     * this is such a node
      *
-     * @param parent node to inherit token from.
-     * @return the new null literal
+     * @param expression expression to check for internal symbol
+     * @return true if internal, false otherwise
      */
-    private LiteralNode<?> newNullLiteral(final Node parent) {
-        return newLiteral(LiteralNode.newInstance(parent.getSource(), parent.getToken(), parent.getFinish()));
-    }
-
-    @Override
-    public Node leaveTYPEOF(final UnaryNode unaryNode) {
-        final Node rhs    = unaryNode.rhs();
-        final long token  = unaryNode.getToken();
-        final int  finish = unaryNode.getFinish();
-
-        RuntimeNode runtimeNode;
-
-        if (rhs instanceof IdentNode) {
-            final IdentNode ident = (IdentNode)rhs;
-
-            if (ident.getSymbol().isParam() || ident.getSymbol().isVar()) {
-                runtimeNode = new RuntimeNode(
-                    source,
-                    token,
-                    finish,
-                    TYPEOF,
-                    convert(
-                        rhs,
-                        Type.OBJECT),
-                    newNullLiteral(unaryNode));
-            } else {
-                runtimeNode = new RuntimeNode(
-                    source,
-                    token,
-                    finish,
-                    TYPEOF,
-                    convert(
-                        getCurrentFunctionNode().getScopeNode(),
-                        Type.OBJECT),
-                    convert(
-                        newLiteral(
-                            LiteralNode.newInstance(
-                                source,
-                                ident.getToken(),
-                                ident.getFinish(),
-                                ident.getName())),
-                    Type.OBJECT));
-            }
-        }  else {
-            runtimeNode = new RuntimeNode(
-                source,
-                token,
-                finish,
-                TYPEOF,
-                convert(
-                    rhs,
-                    Type.OBJECT),
-                newNullLiteral(unaryNode));
-        }
-
-        runtimeNode.accept(this);
-
-        getCurrentFunctionNode().newTemporary(Type.OBJECT, unaryNode);
-        runtimeNode.setSymbol(unaryNode.getSymbol());
-
-        return runtimeNode;
-    }
-
-    @Override
-    public Node leaveSUB(final UnaryNode unaryNode) {
-        return leaveUnary(unaryNode, Type.NUMBER);
-    }
-
-    @Override
-    public Node leaveVOID(final UnaryNode unaryNode) {
-        final Node rhs = unaryNode.rhs();
-        getCurrentFunctionNode().newTemporary(Type.OBJECT, unaryNode);
-
-        // Set up request.
-        final RuntimeNode runtimeNode = new RuntimeNode(source, unaryNode.getToken(), unaryNode.getFinish(), VOID, convert(rhs, Type.OBJECT));
-
-        // Use same symbol as unary node.
-        runtimeNode.setSymbol(unaryNode.getSymbol());
-
-        return runtimeNode;
+    private static boolean isInternalExpression(final Node expression) {
+        final Symbol symbol = expression.getSymbol();
+        return symbol != null && symbol.isInternal();
     }
 
     /**
-     * Compute the narrowest possible type for a binaryNode, based on its
-     * contents.
+     * Is this an assignment to the special variable that hosts scripting eval
+     * results?
      *
-     * @param binaryNode the binary node
-     * @return the narrowest possible type
+     * @param expression expression to check whether it is $evalresult = X
+     * @return true if an assignment to eval result, false otherwise
      */
-    private static Type binaryType(final BinaryNode binaryNode) {
-        final Node lhs = binaryNode.lhs();
-        assert lhs.hasType();
-
-        final Node rhs = binaryNode.rhs();
-        assert rhs.hasType();
-
-        // actually bitwise assignments are ok for ints. TODO
-        switch (binaryNode.tokenType()) {
-        case ASSIGN_BIT_AND:
-        case ASSIGN_BIT_OR:
-        case ASSIGN_BIT_XOR:
-        case ASSIGN_SHL:
-        case ASSIGN_SAR:
-            return Compiler.shouldUseIntegers() ? Type.widest(lhs.getType(), rhs.getType(), Type.INT) : Type.INT;
-        case ASSIGN_SHR:
-            return Type.LONG;
-        case ASSIGN:
-            return Compiler.shouldUseIntegers() ? Type.widest(lhs.getType(), rhs.getType(), Type.NUMBER) : Type.NUMBER;
-        default:
-            return binaryArithType(lhs.getType(), rhs.getType());
+    private boolean isEvalResultAssignment(final Node expression) {
+        Node e = expression;
+        if (e.tokenType() == TokenType.DISCARD) {
+            e = ((UnaryNode)expression).rhs();
         }
-    }
-
-    private static Type binaryArithType(final Type lhsType, final Type rhsType) {
-         if (!Compiler.shouldUseIntegerArithmetic()) {
-             return Type.NUMBER;
-         }
-         return Type.widest(lhsType, rhsType, Type.NUMBER);
-     }
-
-    /**
-     * Visit binary node and set symbols and inferred type
-     *
-     * @param binaryNode unary node to visit
-     * @param type       The narrowest allowed type for this node
-     *
-     * @return the final node, or replacement thereof
-     */
-    private Node leaveBinary(final BinaryNode binaryNode, final Type type) {
-        return leaveBinary(binaryNode, type, type, type);
+        final Node resultNode = getCurrentFunctionNode().getResultNode();
+        return e instanceof BinaryNode && ((BinaryNode)e).lhs().equals(resultNode);
     }
 
     /**
-     * Visit a binary node, specifying types for rhs, rhs and destType.
-     *
-     * @param binaryNode the binary node
-     * @param destType destination type
-     * @param lhsType type for left hand side
-     * @param rhsType type for right hand side
-     *
-     * @return resulting binary node
+     * Prepare special function nodes.
+     * TODO : only create those that are needed.
+     * TODO : make sure slot numbering is not hardcoded in {@link CompilerConstants} - now creation order is significant
      */
-    private Node leaveBinary(final BinaryNode binaryNode, final Type destType, final Type lhsType, final Type rhsType) {
-        /* Attempt to turn this binary expression into a constant */
-        final LiteralNode<?> literalNode = new BinaryNodeConstantEvaluator(binaryNode).eval();
-        if (literalNode != null) {
-            return newLiteral(literalNode);
-        }
+    private void initFunctionNode(final FunctionNode functionNode) {
+        final long token  = functionNode.getToken();
+        final int  finish = functionNode.getFinish();
 
-        if (lhsType != null) {
-            binaryNode.setLHS(convert(binaryNode.lhs(), lhsType));
-        }
+        LOG.info("Init this, scope, result, callee, varargs and argument for " + functionNode.getName());
 
-        if (rhsType != null) {
-            binaryNode.setRHS(convert(binaryNode.rhs(), rhsType));
-        }
-
-        getCurrentFunctionNode().newTemporary(destType, binaryNode);
-
-        return binaryNode;
+        functionNode.setThisNode(new IdentNode(source, token, finish, THIS.tag()));
+        functionNode.setScopeNode(new IdentNode(source, token, finish, SCOPE.tag()));
+        functionNode.setResultNode(new IdentNode(source, token, finish, SCRIPT_RETURN.tag()));
+        functionNode.setCalleeNode(new IdentNode(source, token, finish, CALLEE.tag()));
+        functionNode.setVarArgsNode(new IdentNode(source, token, finish, VARARGS.tag()));
+        functionNode.setArgumentsNode(new IdentNode(source, token, finish, functionNode.hideArguments() ? compiler.uniqueName('$' + ARGUMENTS.tag()) : ARGUMENTS.tag()));
     }
 
-    /**
-     * Determine if the outcome of + operator is a string.
-     *
-     * @param node
-     *            Node to test.
-     * @return true if a string result.
-     */
-    private boolean isAddString(final Node node) {
-        if (node instanceof BinaryNode && node.isTokenType(TokenType.ADD)) {
-            final BinaryNode binaryNode = (BinaryNode)node;
-            final Node lhs = binaryNode.lhs();
-            final Node rhs = binaryNode.rhs();
-
-            return isAddString(lhs) || isAddString(rhs);
-        }
-
-        return node instanceof LiteralNode<?> && ((LiteralNode<?>)node).getObject() instanceof String;
-    }
-
-    /**
-     * Helper for creating a new runtime node from a parent node, inheriting its
-     * types and tokens
-     *
-     * @param parent   Parent node.
-     * @param args     Runtime request arguments.
-     * @param request  Runtime request type.
-     * @return New {@link RuntimeNode}.
-     */
-
-    private RuntimeNode newRuntime(final Node parent, final List<Node> args, final Request request) {
-        final RuntimeNode runtimeNode = new RuntimeNode(source, parent.getToken(), parent.getFinish(), request, args);
-        runtimeNode.setStart(parent.getStart());
-        runtimeNode.setFinish(parent.getFinish());
-
-        // Use same symbol as parent node.
-        runtimeNode.accept(this);
-        runtimeNode.setSymbol(parent.getSymbol());
-
-        return runtimeNode;
-    }
-
-    /**
-     * Helper for creating a new runtime node from a binary node
-     *
-     * @param binaryNode {@link RuntimeNode} expression.
-     * @param request    Runtime request type.
-     * @return New {@link RuntimeNode}.
-     */
-    private RuntimeNode newRuntime(final BinaryNode binaryNode, final Request request) {
-        return newRuntime(binaryNode, Arrays.asList(new Node[] { binaryNode.lhs(), binaryNode.rhs() }), request);
-    }
-
-    /**
-     * Add is a special binary, as it works not only on arithmetic, but for
-     * strings etc as well.
-     */
-    @Override
-    public Node leaveADD(final BinaryNode binaryNode) {
-        final Node lhs = binaryNode.lhs();
-        final Node rhs = binaryNode.rhs();
-
-        //parameters must be blown up to objects
-        ensureTypeNotUnknown(lhs);
-        ensureTypeNotUnknown(rhs);
-
-        if ((lhs.getType().isNumeric() || lhs.getType().isBoolean()) && (rhs.getType().isNumeric() || rhs.getType().isBoolean())) {
-            return leaveBinary(binaryNode, binaryType(binaryNode));
-        } else if (isAddString(binaryNode)) {
-            binaryNode.setLHS(convert(lhs, Type.OBJECT));
-            binaryNode.setRHS(convert(rhs, Type.OBJECT));
-            getCurrentFunctionNode().newTemporary(Type.OBJECT, binaryNode);
-        } else {
-            getCurrentFunctionNode().newTemporary(Type.OBJECT, binaryNode);
-            return newRuntime(binaryNode, ADD);
-        }
-
-        return binaryNode;
-    }
-
-    @Override
-    public Node leaveAND(final BinaryNode binaryNode) {
-        return leaveBinary(binaryNode, Type.OBJECT, null, null);
-    }
-
-    /**
-     * This is a helper called before an assignment.
-     * @param binaryNode assignment node
-     */
-    private Node enterAssign(final BinaryNode binaryNode) {
-        final Node lhs = binaryNode.lhs();
-
-        if (!(lhs instanceof IdentNode)) {
-            return binaryNode;
-        }
-
-        final Block     block = getCurrentBlock();
-        final IdentNode ident = (IdentNode)lhs;
-        final String    name  = ident.getName();
-
-        Symbol symbol = getCurrentBlock().findSymbol(name);
-
-        if (symbol == null) {
-            symbol = block.defineSymbol(name, IS_GLOBAL, ident);
-            binaryNode.setSymbol(symbol);
-        } else if (!getCurrentFunctionNode().isLocal(symbol)) {
-            symbol.setIsScope();
-        }
-
-        localDefs.add(name);
-
-        return binaryNode;
-    }
-
-    /**
-     * This assign helper is called after an assignment, when all children of
-     * the assign has been processed. It fixes the types and recursively makes
-     * sure that everyhing has slots that should have them in the chain.
-     *
-     * @param binaryNode assignment node
-     * @param destType   destination type of assignment
-     */
-    private Node leaveAssign(final BinaryNode binaryNode, final Type destType) {
-        binaryNode.lhs().getSymbol().setType(destType); // lhs inherits dest type
-        getCurrentFunctionNode().newTemporary(destType, binaryNode); // as does destination
-
-        ensureAssignmentSlots(getCurrentFunctionNode(), binaryNode.lhs());
-        return binaryNode;
-    }
-
-    @Override
-    public Node enterASSIGN(final BinaryNode binaryNode) {
-        return enterAssign(binaryNode);
-    }
-
-    @Override
-    public Node leaveASSIGN(final BinaryNode binaryNode) {
-        final Node lhs = binaryNode.lhs();
-        final Node rhs = binaryNode.rhs();
-
-        if (rhs.getType().isNumeric()) {
-            final Symbol lhsSymbol = lhs.getSymbol();
-            final Type lhsType = Type.widest(lhs.getType(), binaryType(binaryNode));
-
-            // for index nodes, we can set anything
-            lhsSymbol.setType(lhsType);
-            getCurrentFunctionNode().newTemporary(lhs.getType(), binaryNode);
-            if (!(lhs instanceof IndexNode)) {
-                binaryNode.setRHS(convert(rhs, lhsType));
-            }
-        } else {
-            // Force symbol to be object if not numeric assignment.
-            binaryNode.setRHS(convert(rhs, Type.OBJECT));
-            getCurrentFunctionNode().newTemporary(Type.OBJECT, binaryNode);
-
-            if (lhs instanceof IdentNode) {
-                lhs.getSymbol().setType(Type.OBJECT);
-            }
-        }
-
-        if (lhs instanceof AccessNode) {
-            final Node baseNode = ((AccessNode)lhs).getBase();
-
-            if (baseNode.getSymbol().isThis()) {
-                final IdentNode property = ((AccessNode)lhs).getProperty();
-                getCurrentFunctionNode().addThisProperty(property.getName(), property);
-            }
-        }
-
-        return binaryNode;
-    }
-
-    @Override
-    public Node enterASSIGN_ADD(final BinaryNode binaryNode) {
-        return enterAssign(binaryNode);
-    }
-
-    @Override
-    public Node leaveASSIGN_ADD(final BinaryNode binaryNode) {
-        final Node lhs = binaryNode.lhs();
-        final Node rhs = binaryNode.rhs();
-        final boolean bothNumeric = lhs.getType().isNumeric() && rhs.getType().isNumeric();
-
-        /*
-         * In the case of bothNumeric,
-         * compute type for lhs += rhs. Assign type to lhs. Assign type to
-         * temporary for this node. Convert rhs from whatever it was to this
-         * type. Legacy wise dest has always been narrowed. It should
-         * actually only be the lhs that is the double, or other narrower
-         * type than OBJECT
-         */
-        return leaveAssign(binaryNode, bothNumeric ? binaryType(binaryNode) : Type.OBJECT);
-    }
-
-    @Override
-    public Node enterASSIGN_BIT_AND(final BinaryNode binaryNode) {
-        return enterAssign(binaryNode);
-    }
-
-    @Override
-    public Node leaveASSIGN_BIT_AND(final BinaryNode binaryNode) {
-        return leaveAssign(binaryNode, binaryType(binaryNode));
-    }
-
-    @Override
-    public Node enterASSIGN_BIT_OR(final BinaryNode binaryNode) {
-        return enterAssign(binaryNode);
-    }
-
-    @Override
-    public Node leaveASSIGN_BIT_OR(final BinaryNode binaryNode) {
-        return leaveAssign(binaryNode, binaryType(binaryNode));
-    }
-
-    @Override
-    public Node enterASSIGN_BIT_XOR(final BinaryNode binaryNode) {
-        return enterAssign(binaryNode);
-    }
-
-    @Override
-    public Node leaveASSIGN_BIT_XOR(final BinaryNode binaryNode) {
-        return leaveAssign(binaryNode, binaryType(binaryNode));
-    }
-
-    @Override
-    public Node enterASSIGN_DIV(final BinaryNode binaryNode) {
-        return enterAssign(binaryNode);
-    }
-
-    @Override
-    public Node leaveASSIGN_DIV(final BinaryNode binaryNode) {
-        return leaveAssign(binaryNode, binaryType(binaryNode));
-    }
-
-    @Override
-    public Node enterASSIGN_MOD(final BinaryNode binaryNode) {
-        return enterAssign(binaryNode);
-    }
-
-    @Override
-    public Node leaveASSIGN_MOD(final BinaryNode binaryNode) {
-        return leaveAssign(binaryNode, binaryType(binaryNode));
-    }
-
-    @Override
-    public Node enterASSIGN_MUL(final BinaryNode binaryNode) {
-        return enterAssign(binaryNode);
-    }
-
-    @Override
-    public Node leaveASSIGN_MUL(final BinaryNode binaryNode) {
-        return leaveAssign(binaryNode, binaryType(binaryNode));
-    }
-
-    @Override
-    public Node enterASSIGN_SAR(final BinaryNode binaryNode) {
-        return enterAssign(binaryNode);
-    }
-
-    @Override
-    public Node leaveASSIGN_SAR(final BinaryNode binaryNode) {
-        return leaveAssign(binaryNode, binaryType(binaryNode));
-    }
-
-    @Override
-    public Node enterASSIGN_SHL(final BinaryNode binaryNode) {
-        return enterAssign(binaryNode);
-    }
-
-    @Override
-    public Node leaveASSIGN_SHL(final BinaryNode binaryNode) {
-        return leaveAssign(binaryNode, binaryType(binaryNode));
-    }
-
-    @Override
-    public Node enterASSIGN_SHR(final BinaryNode binaryNode) {
-        return enterAssign(binaryNode);
-    }
-
-    @Override
-    public Node leaveASSIGN_SHR(final BinaryNode binaryNode) {
-        return leaveAssign(binaryNode, binaryType(binaryNode));
-    }
-
-    @Override
-    public Node enterASSIGN_SUB(final BinaryNode binaryNode) {
-        return enterAssign(binaryNode);
-    }
-
-    @Override
-    public Node leaveASSIGN_SUB(final BinaryNode binaryNode) {
-        return leaveAssign(binaryNode, binaryType(binaryNode));
-    }
-
-    @Override
-    public Node leaveBIT_AND(final BinaryNode binaryNode) {
-        return leaveBinary(binaryNode, Type.INT);
-    }
-
-    @Override
-    public Node leaveBIT_OR(final BinaryNode binaryNode) {
-        return leaveBinary(binaryNode, Type.INT);
-    }
-
-    @Override
-    public Node leaveBIT_XOR(final BinaryNode binaryNode) {
-        return leaveBinary(binaryNode, Type.INT);
-    }
-
-    @Override
-    public Node leaveCOMMARIGHT(final BinaryNode binaryNode) {
-        binaryNode.setLHS(discard(binaryNode.lhs()));
-        getCurrentFunctionNode().newTemporary(binaryNode.rhs().getType(), binaryNode);
-
-        return binaryNode;
-    }
-
-    @Override
-    public Node leaveCOMMALEFT(final BinaryNode binaryNode) {
-        binaryNode.setRHS(discard(binaryNode.rhs()));
-        getCurrentFunctionNode().newTemporary(binaryNode.lhs().getType(), binaryNode);
-
-        return binaryNode;
-    }
-
-    @Override
-    public Node leaveDIV(final BinaryNode binaryNode) {
-        return leaveBinary(binaryNode, binaryType(binaryNode));
-    }
-
-    @Override
-    public Node leaveEQ(final BinaryNode binaryNode) {
-        return leaveCmp(binaryNode, EQ);
-    }
-
-    @Override
-    public Node leaveEQ_STRICT(final BinaryNode binaryNode) {
-        return leaveCmp(binaryNode, EQ_STRICT);
-    }
-
-    private Node leaveCmp(final BinaryNode binaryNode, final RuntimeNode.Request request) {
-        final Node lhs = binaryNode.lhs();
-        final Node rhs = binaryNode.rhs();
-
-        /* Attempt to turn this comparison into a constant and collapse it */
-        final LiteralNode<?> literalNode = new BinaryNodeConstantEvaluator(binaryNode).eval();
-        if (literalNode != null) {
-            return newLiteral(literalNode);
-        }
-
-        // another case where dest != source operand types always a boolean
-        getCurrentFunctionNode().newTemporary(request.getReturnType(), binaryNode);
-
-        ensureTypeNotUnknown(lhs);
-        ensureTypeNotUnknown(rhs);
-        final Type type = Type.widest(lhs.getType(), rhs.getType());
-
-        if (type.isObject()) {
-            return newRuntime(binaryNode, request);
-        }
-
-        if ((request.equals(EQ_STRICT) || request.equals(NE_STRICT)) && lhs.getType().isBoolean() != rhs.getType().isBoolean()) {
-            // special case: number compared against boolean => never equal. must not convert!
-            final boolean              result     = request.equals(NE_STRICT);
-            final LiteralNode<Boolean> resultNode = LiteralNode.newInstance(source, 0, 0, result);
-            final boolean              canSkipLHS = (lhs instanceof LiteralNode);
-            final boolean              canSkipRHS = (rhs instanceof LiteralNode);
-
-            if (canSkipLHS && canSkipRHS) {
-                return resultNode.accept(this);
-            }
-
-            final Node argNode;
-
-            if (!canSkipLHS && !canSkipRHS) {
-                argNode = new BinaryNode(source, Token.recast(binaryNode.getToken(), TokenType.COMMARIGHT), lhs, rhs);
-            } else {
-                argNode = !canSkipLHS ? lhs : rhs;
-            }
-
-            return new BinaryNode(source, Token.recast(binaryNode.getToken(), TokenType.COMMARIGHT), argNode, resultNode).accept(this);
-        }
-
-        binaryNode.setLHS(convert(lhs, type));
-        binaryNode.setRHS(convert(rhs, type));
-
-        return binaryNode;
-    }
-
-    @Override
-    public Node leaveGE(final BinaryNode binaryNode) {
-        return leaveCmp(binaryNode, GE);
-    }
-
-    @Override
-    public Node leaveGT(final BinaryNode binaryNode) {
-        return leaveCmp(binaryNode, GT);
-    }
-
-    private Node exitIN_INSTANCEOF(final BinaryNode binaryNode, final Request request) {
-        getCurrentFunctionNode().newTemporary(request.getReturnType(), binaryNode);
-        return newRuntime(binaryNode, request);
-    }
-
-    @Override
-    public Node leaveIN(final BinaryNode binaryNode) {
-        return exitIN_INSTANCEOF(binaryNode, IN);
-    }
-
-    @Override
-    public Node leaveINSTANCEOF(final BinaryNode binaryNode) {
-        return exitIN_INSTANCEOF(binaryNode, INSTANCEOF);
-    }
-
-    @Override
-    public Node leaveLE(final BinaryNode binaryNode) {
-        return leaveCmp(binaryNode, LE);
-    }
-
-    @Override
-    public Node leaveLT(final BinaryNode binaryNode) {
-        return leaveCmp(binaryNode, LT);
-    }
-
-    @Override
-    public Node leaveMOD(final BinaryNode binaryNode) {
-        return leaveBinary(binaryNode, binaryType(binaryNode));
-    }
-
-    @Override
-    public Node leaveMUL(final BinaryNode binaryNode) {
-        return leaveBinary(binaryNode,  binaryType(binaryNode));
-    }
-
-    @Override
-    public Node leaveNE(final BinaryNode binaryNode) {
-        return leaveCmp(binaryNode, NE);
-    }
-
-    @Override
-    public Node leaveNE_STRICT(final BinaryNode binaryNode) {
-        return leaveCmp(binaryNode, NE_STRICT);
-    }
-
-    @Override
-    public Node leaveOR(final BinaryNode binaryNode) {
-        return leaveBinary(binaryNode, Type.OBJECT, null, null);
-    }
-
-    @Override
-    public Node leaveSAR(final BinaryNode binaryNode) {
-        return leaveBinary(binaryNode, Type.INT);
-    }
-
-    @Override
-    public Node leaveSHL(final BinaryNode binaryNode) {
-        return leaveBinary(binaryNode, Type.INT);
-    }
-
-    @Override
-    public Node leaveSHR(final BinaryNode binaryNode) {
-        return leaveBinary(binaryNode, Type.LONG, Type.INT, Type.INT);
-    }
-
-    @Override
-    public Node leaveSUB(final BinaryNode binaryNode) {
-        return leaveBinary(binaryNode, binaryType(binaryNode));
-    }
-
-    @Override
-    public Node leave(final TernaryNode ternaryNode) {
-        final Node test = ternaryNode.lhs();
-        final Node lhs  = ternaryNode.rhs();
-        final Node rhs  = ternaryNode.third();
-
-        ensureTypeNotUnknown(lhs);
-        ensureTypeNotUnknown(rhs);
-        final Type type = Type.widest(lhs.getType(), rhs.getType());
-
-        ternaryNode.setRHS(convert(lhs, type));
-        ternaryNode.setThird(convert(rhs, type));
-
-        // optimize away the ternary if the test is constant.
-        if (test.getSymbol().isConstant()) {
-            return ((LiteralNode<?>)test).isTrue() ? lhs : rhs;
-        }
-
-        ternaryNode.setLHS(convert(test, Type.BOOLEAN));
-
-        getCurrentFunctionNode().newTemporary(type, ternaryNode);
-
-        return ternaryNode;
-    }
-
-    private static void ensureTypeNotUnknown(final Node node) {
-        final Symbol symbol = node.getSymbol();
-
-        /*
-         * Note that not just unknowns, but params need to be blown
-         * up to objects, because we can have something like
-         *
-         * function f(a) {
-         *    var b = ~a; //b and a are inferred to be int
-         *    return b;
-         * }
-         *
-         * In this case, it would be correct to say that "if you have
-         * an int at the callsite, just pass it".
-         *
-         * However
-         *
-         * function f(a) {
-         *    var b = ~a;      //b and a are inferred to be int
-         *    return b == 17;  //b is still inferred to be int.
-         * }
-         *
-         * can be called with f("17") and if we assume that b is an
-         * int and don't blow it up to an object in the comparison, we
-         * are screwed. I hate JavaScript.
-         *
-         * This check has to be done for any operation that might take
-         * objects as parameters, for example +, but not *, which is known
-         * to coerce types into doubles
-         */
-        if (node.getType().isUnknown() || symbol.isParam()) {
-            symbol.setType(Type.OBJECT);
-            symbol.setCanBeUndefined();
-         }
-    }
-
-    /**
-     * A simple node visitor that ensure that scope and slot information is correct.
-     * This is run as a post pass after we know all scope changing information about
-     * the Lowering. This is also called after potential mutations like splitting
-     * have taken place, as splitting forces scope.
-     *
-     * This was previously done on a per functionNode basis in {@link CodeGenerator},
-     * but this is too late for type information to be used in {@link AccessSpecializer}
-     */
-    static class FinalizeSymbols extends NodeVisitor {
-        @Override
-        public Node leave(final Block block) {
-            return updateSymbols(block);
-        }
-
-        @Override
-        public Node leave(final FunctionNode function) {
-            return updateSymbols(function);
-        }
-
-        private static void updateSymbolsLog(final FunctionNode functionNode, final Symbol symbol, final boolean loseSlot) {
-            if (!symbol.isScope()) {
-                LOG.finest("updateSymbols: " + symbol + " => scope, because all vars in " + functionNode.getName() + " are in scope");
-            }
-            if (loseSlot && symbol.hasSlot()) {
-                LOG.finest("updateSymbols: " + symbol + " => no slot, because all vars in " + functionNode.getName() + " are in scope");
-            }
-        }
-
-        // called after a block or function node (subclass of block) is finished
-        // to correct scope and slot assignment for variables
-        private static Block updateSymbols(final Block block) {
-
-            if (!block.needsScope()) {
-                return block; // nothing to do
-            }
-
-            assert !(block instanceof FunctionNode) || block.getFunction() == block;
-
-            final FunctionNode functionNode   = block.getFunction();
-            final List<Symbol> symbols        = block.getFrame().getSymbols();
-            final boolean      allVarsInScope = functionNode.varsInScope();
-            final boolean      isVarArg       = functionNode.isVarArg();
-
-            for (final Symbol symbol : symbols) {
-                if (symbol.isInternal() || symbol.isThis()) {
-                    continue;
-                }
-
-                if (symbol.isVar()) {
-                    if (allVarsInScope || symbol.isScope()) {
-                        updateSymbolsLog(functionNode, symbol, true);
-                        symbol.setIsScope();
-                        symbol.setNeedsSlot(false);
-                    } else {
-                        assert symbol.hasSlot() : symbol + " should have a slot only, no scope";
-                    }
-                } else if (symbol.isParam() && (allVarsInScope || isVarArg || symbol.isScope())) {
-                    updateSymbolsLog(functionNode, symbol, isVarArg);
-                    symbol.setIsScope();
-                    symbol.setNeedsSlot(!isVarArg);
-                }
-            }
-
-            return block;
-        }
-    }
-
-    /**
-     * Helper class to evaluate constant expressions at compile time This is
-     * also a simplifier used by BinaryNode visits, UnaryNode visits and
-     * conversions.
-     */
-    private abstract static class ConstantEvaluator<T extends Node> {
-        protected T            parent;
-        protected final Source source;
-        protected final long   token;
-        protected final int    finish;
-
-        protected ConstantEvaluator(final T parent) {
-            this.parent  = parent;
-            this.source  = parent.getSource();
-            this.token   = parent.getToken();
-            this.finish  = parent.getFinish();
-        }
-
-        /**
-         * Returns a literal node that replaces the given parent node, or null if replacement
-         * is impossible
-         * @return the literal node
-         */
-        protected abstract LiteralNode<?> eval();
-    }
-
-    static class LiteralNodeConstantEvaluator extends ConstantEvaluator<LiteralNode<?>> {
-        private final Type type;
-
-        LiteralNodeConstantEvaluator(final LiteralNode<?> parent, final Type type) {
-            super(parent);
-            this.type = type;
-        }
-
-        @Override
-        protected LiteralNode<?> eval() {
-            final Object value = ((LiteralNode<?>)parent).getValue();
-
-            LiteralNode<?> literalNode = null;
-
-            if (type.isString()) {
-                literalNode = LiteralNode.newInstance(source, token, finish, JSType.toString(value));
-            } else if (type.isBoolean()) {
-                literalNode = LiteralNode.newInstance(source, token, finish, JSType.toBoolean(value));
-            } else if (type.isInteger()) {
-                literalNode = LiteralNode.newInstance(source, token, finish, JSType.toInt32(value));
-            } else if (type.isLong()) {
-                literalNode = LiteralNode.newInstance(source, token, finish, JSType.toLong(value));
-            } else if (type.isNumber() || parent.getType().isNumeric() && !parent.getType().isNumber()) {
-                literalNode = LiteralNode.newInstance(source, token, finish, JSType.toNumber(value));
-            }
-
-            return literalNode;
-        }
-    }
-
-    private static class UnaryNodeConstantEvaluator extends ConstantEvaluator<UnaryNode> {
-        UnaryNodeConstantEvaluator(final UnaryNode parent) {
-            super(parent);
-        }
-
-        @Override
-        protected LiteralNode<?> eval() {
-            final Node rhsNode = parent.rhs();
-
-            if (!rhsNode.getSymbol().isConstant()) {
-                return null;
-            }
-
-            final LiteralNode<?> rhs = (LiteralNode<?>)rhsNode;
-            final boolean rhsInteger = rhs.getType().isInteger();
-
-            LiteralNode<?> literalNode;
-
-            switch (parent.tokenType()) {
-            case ADD:
-                if (rhsInteger) {
-                    literalNode = LiteralNode.newInstance(source, token, finish, rhs.getInt32());
-                } else {
-                    literalNode = LiteralNode.newInstance(source, token, finish, rhs.getNumber());
-                }
-                break;
-            case SUB:
-                if (rhsInteger && rhs.getInt32() != 0) { // @see test/script/basic/minuszero.js
-                    literalNode = LiteralNode.newInstance(source, token, finish, -rhs.getInt32());
-                } else {
-                    literalNode = LiteralNode.newInstance(source, token, finish, -rhs.getNumber());
-                }
-                break;
-            case NOT:
-                literalNode = LiteralNode.newInstance(source, token, finish, !rhs.getBoolean());
-                break;
-            case BIT_NOT:
-                literalNode = LiteralNode.newInstance(source, token, finish, ~rhs.getInt32());
-                break;
-            default:
-                return null;
-            }
-
-            return literalNode;
-        }
-    }
-
-    private static class BinaryNodeConstantEvaluator extends ConstantEvaluator<BinaryNode> {
-        BinaryNodeConstantEvaluator(final BinaryNode parent) {
-            super(parent);
-        }
-
-        @Override
-        protected LiteralNode<?> eval() {
-
-            if (!parent.lhs().getSymbol().isConstant() || !parent.rhs().getSymbol().isConstant()) {
-                return null;
-            }
-
-            final LiteralNode<?> lhs = (LiteralNode<?>)parent.lhs();
-            final LiteralNode<?> rhs = (LiteralNode<?>)parent.rhs();
-
-            final Type widest = Type.widest(lhs.getType(), rhs.getType());
-
-            boolean isInteger = widest.isInteger();
-            boolean isLong    = widest.isLong();
-
-            double value;
-
-            switch (parent.tokenType()) {
-            case AND:
-                return JSType.toBoolean(lhs.getObject()) ? rhs : lhs;
-            case OR:
-                return JSType.toBoolean(lhs.getObject()) ? lhs : rhs;
-            case DIV:
-                value = lhs.getNumber() / rhs.getNumber();
-                break;
-            case ADD:
-                value = lhs.getNumber() + rhs.getNumber();
-                break;
-            case MUL:
-                value = lhs.getNumber() * rhs.getNumber();
-                break;
-            case MOD:
-                value = lhs.getNumber() % rhs.getNumber();
-                break;
-            case SUB:
-                value = lhs.getNumber() - rhs.getNumber();
-                break;
-            case SHR:
-                return LiteralNode.newInstance(source, token, finish, (lhs.getInt32() >>> rhs.getInt32()) & 0xffff_ffffL);
-            case SAR:
-                return LiteralNode.newInstance(source, token, finish, lhs.getInt32() >> rhs.getInt32());
-            case SHL:
-                return LiteralNode.newInstance(source, token, finish, lhs.getInt32() << rhs.getInt32());
-            case BIT_XOR:
-                return LiteralNode.newInstance(source, token, finish, lhs.getInt32() ^ rhs.getInt32());
-            case BIT_AND:
-                return LiteralNode.newInstance(source, token, finish, lhs.getInt32() & rhs.getInt32());
-            case BIT_OR:
-                return LiteralNode.newInstance(source, token, finish, lhs.getInt32() | rhs.getInt32());
-            case GE:
-                return LiteralNode.newInstance(source, token, finish, ScriptRuntime.GE(lhs.getObject(), rhs.getObject()));
-            case LE:
-                return LiteralNode.newInstance(source, token, finish, ScriptRuntime.LE(lhs.getObject(), rhs.getObject()));
-            case GT:
-                return LiteralNode.newInstance(source, token, finish, ScriptRuntime.GT(lhs.getObject(), rhs.getObject()));
-            case LT:
-                return LiteralNode.newInstance(source, token, finish, ScriptRuntime.LT(lhs.getObject(), rhs.getObject()));
-            case NE:
-                return LiteralNode.newInstance(source, token, finish, ScriptRuntime.NE(lhs.getObject(), rhs.getObject()));
-            case NE_STRICT:
-                return LiteralNode.newInstance(source, token, finish, ScriptRuntime.NE_STRICT(lhs.getObject(), rhs.getObject()));
-            case EQ:
-                return LiteralNode.newInstance(source, token, finish, ScriptRuntime.EQ(lhs.getObject(), rhs.getObject()));
-            case EQ_STRICT:
-                return LiteralNode.newInstance(source, token, finish, ScriptRuntime.EQ_STRICT(lhs.getObject(), rhs.getObject()));
-            default:
-                return null;
-            }
-
-            isInteger &= value != 0.0 && JSType.isRepresentableAsInt(value);
-            isLong    &= value != 0.0 && JSType.isRepresentableAsLong(value);
-
-            if (isInteger) {
-                return LiteralNode.newInstance(source, token, finish, JSType.toInt32(value));
-            } else if (isLong) {
-                return LiteralNode.newInstance(source, token, finish, JSType.toLong(value));
-            }
-
-            return LiteralNode.newInstance(source, token, finish, value);
-        }
-    }
 }
+
+
+
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java b/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java
index 6a8b2febffa..4599b9eb074 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java
@@ -929,7 +929,7 @@ public class MethodEmitter implements Emitter {
      */
     public MethodEmitter loadCallee() {
         debug("load callee " + functionNode.getCalleeNode().getSymbol());
-        assert functionNode.getCalleeNode().getSymbol().getSlot() != 0;
+        assert functionNode.getCalleeNode().getSymbol().getSlot() != 0 : "callee has wrong slot " + functionNode.getCalleeNode().getSymbol().getSlot() + " in " + functionNode.getName();
 
         return load(functionNode.getCalleeNode().getSymbol());
     }
@@ -992,7 +992,7 @@ public class MethodEmitter implements Emitter {
      * @param symbol symbol to store stack to
      */
     public void store(final Symbol symbol) {
-        assert symbol != null;
+        assert symbol != null : "No symbol to store";
         if (symbol.hasSlot()) {
             debug("store", symbol);
             popType(symbol.getSymbolType()).store(method, symbol.getSlot());
@@ -1558,7 +1558,7 @@ public class MethodEmitter implements Emitter {
             label.setStack(stack.clone());
             return;
         }
-        assert stacksEquivalent(stack, labelStack);
+        assert stacksEquivalent(stack, labelStack) : "stacks " + stack + " is not equivalent with " + labelStack + " at join point";
     }
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/SharedScopeCall.java b/nashorn/src/jdk/nashorn/internal/codegen/SharedScopeCall.java
index e4291a963b8..a09ffc961a1 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/SharedScopeCall.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/SharedScopeCall.java
@@ -159,7 +159,9 @@ public class SharedScopeCall {
             int slot = 2;
             for (final Type type : paramTypes) {
                 method.load(type, slot++);
-                if (type == Type.NUMBER || type == Type.LONG) slot++;
+                if (type == Type.NUMBER || type == Type.LONG) {
+                    slot++;
+                }
             }
             method.dynamicCall(returnType, paramTypes.length, flags);
         }
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/WeighNodes.java b/nashorn/src/jdk/nashorn/internal/codegen/WeighNodes.java
index d84995474c0..76bf61936c9 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/WeighNodes.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/WeighNodes.java
@@ -27,6 +27,8 @@ package jdk.nashorn.internal.codegen;
 
 import java.util.List;
 import java.util.Map;
+
+import jdk.nashorn.internal.codegen.types.Type;
 import jdk.nashorn.internal.ir.AccessNode;
 import jdk.nashorn.internal.ir.BinaryNode;
 import jdk.nashorn.internal.ir.Block;
@@ -53,17 +55,18 @@ import jdk.nashorn.internal.ir.SplitNode;
 import jdk.nashorn.internal.ir.SwitchNode;
 import jdk.nashorn.internal.ir.ThrowNode;
 import jdk.nashorn.internal.ir.TryNode;
+import jdk.nashorn.internal.ir.UnaryNode;
 import jdk.nashorn.internal.ir.VarNode;
 import jdk.nashorn.internal.ir.WhileNode;
 import jdk.nashorn.internal.ir.WithNode;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
-import jdk.nashorn.internal.parser.TokenType;
+import jdk.nashorn.internal.ir.visitor.NodeOperatorVisitor;
+
 
 /**
  * Computes the "byte code" weight of an AST segment. This is used
  * for Splitting too large class files
  */
-public class WeighNodes extends NodeVisitor {
+public class WeighNodes extends NodeOperatorVisitor {
     /*
      * Weight constants.
      */
@@ -77,6 +80,7 @@ public class WeighNodes extends NodeVisitor {
     private static final long IF_WEIGHT        = 2;
     private static final long LITERAL_WEIGHT   = 10;
     private static final long LOOP_WEIGHT      = 4;
+    private static final long NEW_WEIGHT       = 6;
     private static final long REFERENCE_WEIGHT = 20;
     private static final long RETURN_WEIGHT    = 2;
     private static final long SPLIT_WEIGHT     = 40;
@@ -119,22 +123,8 @@ public class WeighNodes extends NodeVisitor {
         return accessNode;
     }
 
-    @Override
-    public Node leave(final BinaryNode binaryNode) {
-        final TokenType tokenType = binaryNode.tokenType();
-
-        if (tokenType == TokenType.ADD || tokenType == TokenType.ASSIGN_ADD) {
-            weight += ADD_WEIGHT;
-        } else {
-            weight += 1;
-        }
-
-        return binaryNode;
-    }
-
     @Override
     public Node enter(final Block block) {
-
         if (weightCache != null && weightCache.containsKey(block)) {
             weight += weightCache.get(block);
             return null;
@@ -305,4 +295,274 @@ public class WeighNodes extends NodeVisitor {
         weight += WITH_WEIGHT;
         return withNode;
     }
+
+    @Override
+    public Node leaveADD(final UnaryNode unaryNode) {
+        return unaryNodeWeight(unaryNode);
+    }
+
+    @Override
+    public Node leaveBIT_NOT(final UnaryNode unaryNode) {
+        return unaryNodeWeight(unaryNode);
+    }
+
+    @Override
+    public Node leaveCONVERT(final UnaryNode unaryNode) {
+        return unaryNodeWeight(unaryNode);
+    }
+
+    @Override
+    public Node leaveDECINC(final UnaryNode unaryNode) {
+         return unaryNodeWeight(unaryNode);
+    }
+
+    @Override
+    public Node leaveDELETE(final UnaryNode unaryNode) {
+        return runtimeNodeWeight(unaryNode);
+    }
+
+    @Override
+    public Node leaveDISCARD(final UnaryNode unaryNode) {
+        return unaryNodeWeight(unaryNode);
+    }
+
+    @Override
+    public Node leaveNEW(final UnaryNode unaryNode) {
+        weight += NEW_WEIGHT;
+        return unaryNode;
+    }
+
+    @Override
+    public Node leaveNOT(final UnaryNode unaryNode) {
+        return unaryNodeWeight(unaryNode);
+    }
+
+    @Override
+    public Node leaveSUB(final UnaryNode unaryNode) {
+        return unaryNodeWeight(unaryNode);
+    }
+
+    @Override
+    public Node leaveTYPEOF(final UnaryNode unaryNode) {
+        return runtimeNodeWeight(unaryNode);
+    }
+
+    @Override
+    public Node leaveVOID(final UnaryNode unaryNode) {
+        return unaryNodeWeight(unaryNode);
+    }
+
+    @Override
+    public Node leaveADD(final BinaryNode binaryNode) {
+        weight += ADD_WEIGHT;
+        return binaryNode;
+    }
+
+    @Override
+    public Node leaveAND(final BinaryNode binaryNode) {
+        return binaryNodeWeight(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN(final BinaryNode binaryNode) {
+        return binaryNodeWeight(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_ADD(final BinaryNode binaryNode) {
+        weight += ADD_WEIGHT;
+        return binaryNode;
+    }
+
+    @Override
+    public Node leaveASSIGN_BIT_AND(final BinaryNode binaryNode) {
+        return binaryNodeWeight(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_BIT_OR(final BinaryNode binaryNode) {
+        return binaryNodeWeight(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_BIT_XOR(final BinaryNode binaryNode) {
+        return binaryNodeWeight(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_DIV(final BinaryNode binaryNode) {
+        return binaryNodeWeight(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_MOD(final BinaryNode binaryNode) {
+        return binaryNodeWeight(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_MUL(final BinaryNode binaryNode) {
+        return binaryNodeWeight(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_SAR(final BinaryNode binaryNode) {
+        return binaryNodeWeight(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_SHL(final BinaryNode binaryNode) {
+        return binaryNodeWeight(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_SHR(final BinaryNode binaryNode) {
+        return binaryNodeWeight(binaryNode);
+    }
+
+    @Override
+    public Node leaveASSIGN_SUB(final BinaryNode binaryNode) {
+        return binaryNodeWeight(binaryNode);
+    }
+
+    @Override
+    public Node leaveBIND(final BinaryNode binaryNode) {
+        return binaryNodeWeight(binaryNode);
+    }
+
+    @Override
+    public Node leaveBIT_AND(final BinaryNode binaryNode) {
+        return binaryNodeWeight(binaryNode);
+    }
+
+    @Override
+    public Node leaveBIT_OR(final BinaryNode binaryNode) {
+        return binaryNodeWeight(binaryNode);
+    }
+
+    @Override
+    public Node leaveBIT_XOR(final BinaryNode binaryNode) {
+        return binaryNodeWeight(binaryNode);
+    }
+
+    @Override
+    public Node leaveCOMMALEFT(final BinaryNode binaryNode) {
+        return binaryNodeWeight(binaryNode);
+    }
+
+    @Override
+    public Node leaveCOMMARIGHT(final BinaryNode binaryNode) {
+        return binaryNodeWeight(binaryNode);
+    }
+
+    @Override
+    public Node leaveDIV(final BinaryNode binaryNode) {
+        return binaryNodeWeight(binaryNode);
+    }
+
+    @Override
+    public Node leaveEQ(final BinaryNode binaryNode) {
+        return runtimeNodeWeight(binaryNode);
+    }
+
+    @Override
+    public Node leaveEQ_STRICT(final BinaryNode binaryNode) {
+        return runtimeNodeWeight(binaryNode);
+    }
+
+    @Override
+    public Node leaveGE(final BinaryNode binaryNode) {
+        return runtimeNodeWeight(binaryNode);
+    }
+
+    @Override
+    public Node leaveGT(final BinaryNode binaryNode) {
+        return runtimeNodeWeight(binaryNode);
+    }
+
+    @Override
+    public Node leaveIN(final BinaryNode binaryNode) {
+        weight += CALL_WEIGHT;
+        return binaryNode;
+    }
+
+    @Override
+    public Node leaveINSTANCEOF(final BinaryNode binaryNode) {
+        weight += CALL_WEIGHT;
+        return binaryNode;
+    }
+
+    @Override
+    public Node leaveLE(final BinaryNode binaryNode) {
+        return runtimeNodeWeight(binaryNode);
+    }
+
+    @Override
+    public Node leaveLT(final BinaryNode binaryNode) {
+        return runtimeNodeWeight(binaryNode);
+    }
+
+    @Override
+    public Node leaveMOD(final BinaryNode binaryNode) {
+        return binaryNodeWeight(binaryNode);
+    }
+
+    @Override
+    public Node leaveMUL(final BinaryNode binaryNode) {
+        return binaryNodeWeight(binaryNode);
+    }
+
+    @Override
+    public Node leaveNE(final BinaryNode binaryNode) {
+        return runtimeNodeWeight(binaryNode);
+    }
+
+    @Override
+    public Node leaveNE_STRICT(final BinaryNode binaryNode) {
+        return runtimeNodeWeight(binaryNode);
+    }
+
+    @Override
+    public Node leaveOR(final BinaryNode binaryNode) {
+        return binaryNodeWeight(binaryNode);
+    }
+
+    @Override
+    public Node leaveSAR(final BinaryNode binaryNode) {
+        return binaryNodeWeight(binaryNode);
+    }
+
+    @Override
+    public Node leaveSHL(final BinaryNode binaryNode) {
+        return binaryNodeWeight(binaryNode);
+    }
+
+    @Override
+    public Node leaveSHR(final BinaryNode binaryNode) {
+        return binaryNodeWeight(binaryNode);
+    }
+
+    @Override
+    public Node leaveSUB(final BinaryNode binaryNode) {
+        return binaryNodeWeight(binaryNode);
+    }
+
+    private Node unaryNodeWeight(final UnaryNode unaryNode) {
+        weight += 1;
+        return unaryNode;
+    }
+
+    private Node binaryNodeWeight(final BinaryNode binaryNode) {
+        weight += 1;
+        return binaryNode;
+    }
+
+    private Node runtimeNodeWeight(final UnaryNode unaryNode) {
+        weight += CALL_WEIGHT;
+        return unaryNode;
+    }
+
+    private Node runtimeNodeWeight(final BinaryNode binaryNode) {
+        weight += Type.widest(binaryNode.lhs().getType(), binaryNode.rhs().getType()).isObject() ? CALL_WEIGHT : 1;
+        return binaryNode;
+    }
 }
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/objects/FunctionObjectCreator.java b/nashorn/src/jdk/nashorn/internal/codegen/objects/FunctionObjectCreator.java
index 93ece526892..778ac48f812 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/objects/FunctionObjectCreator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/objects/FunctionObjectCreator.java
@@ -33,8 +33,9 @@ import static jdk.nashorn.internal.codegen.CompilerConstants.constructorNoLookup
 import static jdk.nashorn.internal.codegen.CompilerConstants.methodDescriptor;
 
 import java.lang.invoke.MethodHandle;
+import java.util.ArrayList;
 import java.util.EnumSet;
-import java.util.List;
+
 import jdk.nashorn.internal.codegen.CodeGenerator;
 import jdk.nashorn.internal.codegen.FunctionSignature;
 import jdk.nashorn.internal.codegen.MethodEmitter;
@@ -61,11 +62,9 @@ public class FunctionObjectCreator extends ObjectCreator {
      *
      * @param codegen      the code generator
      * @param functionNode the function node to turn into a ScriptFunction implementation
-     * @param keys         initial keys for the object map
-     * @param symbols      corresponding initial symbols for object map
      */
-    public FunctionObjectCreator(final CodeGenerator codegen, final FunctionNode functionNode, final List<String> keys, final List<Symbol> symbols) {
-        super(codegen, keys, symbols, false, false);
+    public FunctionObjectCreator(final CodeGenerator codegen, final FunctionNode functionNode) {
+        super(codegen, new ArrayList<String>(), new ArrayList<Symbol>(), false, false);
         this.functionNode = functionNode;
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/ir/Block.java b/nashorn/src/jdk/nashorn/internal/ir/Block.java
index 22108001796..9aeecd6572e 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/Block.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/Block.java
@@ -35,11 +35,11 @@ import static jdk.nashorn.internal.ir.Symbol.KINDMASK;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
+
 import jdk.nashorn.internal.codegen.Frame;
 import jdk.nashorn.internal.codegen.MethodEmitter.Label;
 import jdk.nashorn.internal.ir.annotations.Ignore;
@@ -287,7 +287,7 @@ public class Block extends Node {
 
         for (Block block = this; block != null; block = block.getParent()) {
             // Find name.
-            final Symbol symbol = block.getSymbols().get(name);
+            final Symbol symbol = block.symbols.get(name);
             // If found then we are good.
             if (symbol != null) {
                 return symbol;
@@ -307,7 +307,7 @@ public class Block extends Node {
         // Search up block chain to locate symbol.
         for (Block block = this; block != null; block = block.getParent()) {
             // Find name.
-            final Symbol symbol = block.getSymbols().get(name);
+            final Symbol symbol = block.symbols.get(name);
             // If found then we are good.
             if (symbol != null) {
                 return symbol;
@@ -458,14 +458,22 @@ public class Block extends Node {
     }
 
     /**
-     * Print symbols in block (debugging.)
+     * Print symbols in block in alphabetical order, sorted on name
+     * Used for debugging, see the --print-symbols flag
      *
      * @param stream print writer to output symbols to
      *
      * @return true if symbols were found
      */
     public boolean printSymbols(final PrintWriter stream) {
-        final Collection<Symbol> values = symbols.values();
+        final List<Symbol> values = new ArrayList<>(symbols.values());
+
+        Collections.sort(values, new Comparator<Symbol>() {
+            @Override
+            public int compare(final Symbol s0, final Symbol s1) {
+                return s0.getName().compareTo(s1.getName());
+            }
+        });
 
         for (final Symbol symbol : values) {
             symbol.print(stream);
@@ -563,15 +571,6 @@ public class Block extends Node {
         symbols.put(name, symbol);
     }
 
-    /**
-     * Get the symbol table for this block
-     *
-     * @return a symbol table, which is a map from symbol name to symbol.
-     */
-    private Map<String, Symbol> getSymbols() {
-        return symbols;
-    }
-
     /**
      * Check whether scope is necessary for this Block
      *
diff --git a/nashorn/src/jdk/nashorn/internal/ir/CallNode.java b/nashorn/src/jdk/nashorn/internal/ir/CallNode.java
index 9699a7cdfdd..7ddf3a779b4 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/CallNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/CallNode.java
@@ -28,7 +28,9 @@ package jdk.nashorn.internal.ir;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+
 import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.ir.annotations.Ignore;
 import jdk.nashorn.internal.ir.visitor.NodeVisitor;
 import jdk.nashorn.internal.runtime.Source;
 
@@ -57,16 +59,83 @@ public class CallNode extends Node implements TypeOverride {
      */
     public static class EvalArgs {
         /** evaluated code */
-        public Node    code;
+        private Node code;
+
         /** 'this' passed to evaluated code */
-        public Node    evalThis;
+        private IdentNode evalThis;
+
         /** location string for the eval call */
-        public String  location;
+        final private String location;
+
         /** is this call from a strict context? */
-        public boolean strictMode;
+        final private boolean strictMode;
+
+        /**
+         * Constructor
+         *
+         * @param code       code to evaluate
+         * @param evalThis   this node
+         * @param location   location for the eval call
+         * @param strictMode is this a call from a strict context?
+         */
+        public EvalArgs(final Node code, final IdentNode evalThis, final String location, final boolean strictMode) {
+            this.code = code;
+            this.evalThis = evalThis;
+            this.location = location;
+            this.strictMode = strictMode;
+        }
+
+        /**
+         * Return the code that is to be eval:ed by this eval function
+         * @return code as an AST node
+         */
+        public Node getCode() {
+            return code;
+        }
+
+        /**
+         * Set the code that is to be eval.ed by this eval function
+         * @param code the code as an AST node
+         */
+        public void setCode(final Node code) {
+            this.code = code;
+        }
+
+        /**
+         * Get the {@code this} symbol used to invoke this eval call
+         * @return the {@code this} symbol
+         */
+        public IdentNode getThis() {
+            return this.evalThis;
+        }
+
+        /**
+         * Set the {@code this} symbol used to invoke this eval call
+         * @param evalThis the {@code this} symbol
+         */
+        public void setThis(final IdentNode evalThis) {
+            this.evalThis = evalThis;
+        }
+
+        /**
+         * Get the human readable location for this eval call
+         * @return the location
+         */
+        public String getLocation() {
+            return this.location;
+        }
+
+        /**
+         * Check whether this eval call is executed in strict mode
+         * @return true if executed in strict mode, false otherwise
+         */
+        public boolean getStrictMode() {
+            return this.strictMode;
+        }
     }
 
     /** arguments for 'eval' call. Non-null only if this call node is 'eval' */
+    @Ignore
     private EvalArgs evalArgs;
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/ir/CatchNode.java b/nashorn/src/jdk/nashorn/internal/ir/CatchNode.java
index fa61cfce80f..f7147e6c093 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/CatchNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/CatchNode.java
@@ -57,7 +57,7 @@ public class CatchNode extends Node {
      * @param body               catch body
      */
     public CatchNode(final Source source, final long token, final int finish, final IdentNode exception, final Node exceptionCondition, final Block body) {
-        super (source, token, finish);
+        super(source, token, finish);
 
         this.exception          = exception;
         this.exceptionCondition = exceptionCondition;
diff --git a/nashorn/src/jdk/nashorn/internal/ir/ExecuteNode.java b/nashorn/src/jdk/nashorn/internal/ir/ExecuteNode.java
index f30dd3f1664..501468bb9a6 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/ExecuteNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/ExecuteNode.java
@@ -47,14 +47,22 @@ public class ExecuteNode extends Node {
      */
     public ExecuteNode(final Source source, final long token, final int finish, final Node expression) {
         super(source, token, finish);
+        this.expression = expression;
+    }
 
+    /**
+     * Constructor
+     *
+     * @param expression an expression to wrap, from which source, tokens and finish are also inherited
+     */
+    public ExecuteNode(final Node expression) {
+        super(expression.getSource(), expression.getToken(), expression.getFinish());
         this.expression = expression;
     }
 
     private ExecuteNode(final ExecuteNode executeNode, final CopyState cs) {
         super(executeNode);
-
-        expression = cs.existingOrCopy(executeNode.expression);
+        this.expression = cs.existingOrCopy(executeNode.expression);
     }
 
     @Override
diff --git a/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java b/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java
index 363439bfea5..2821f85697b 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java
@@ -32,10 +32,8 @@ import static jdk.nashorn.internal.ir.Symbol.IS_TEMP;
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 import java.util.Stack;
 import jdk.nashorn.internal.codegen.CompileUnit;
 import jdk.nashorn.internal.codegen.Compiler;
@@ -126,9 +124,6 @@ public class FunctionNode extends Block {
     @Ignore
     private IdentNode varArgsNode;
 
-    /** this access properties. */
-    private final LinkedHashMap<String, Node> thisProperties;
-
     /** Pending label list. */
     private final Stack<LabelNode> labelStack;
 
@@ -147,6 +142,10 @@ public class FunctionNode extends Block {
     @Ignore
     private LineNumberNode funcVarLineNumberNode;
 
+    /** Initializer var func = __callee__, where applicable */
+    @Ignore
+    private Node selfSymbolInit;
+
     /** Function flags. */
     private int flags;
 
@@ -183,7 +182,7 @@ public class FunctionNode extends Block {
     private static final int NEEDS_SCOPE           = HAS_ALL_VARS_IN_SCOPE | IS_VAR_ARG;
 
     /** What is the return type of this function? */
-    private Type returnType = Type.OBJECT;
+    private Type returnType = Type.UNKNOWN;
 
     /**
      * Used to keep track of a function's parent blocks.
@@ -216,7 +215,6 @@ public class FunctionNode extends Block {
         this.firstToken        = token;
         this.lastToken         = token;
         this.namespace         = new Namespace(compiler.getNamespace().getParent());
-        this.thisProperties    = new LinkedHashMap<>();
         this.labelStack        = new Stack<>();
         this.controlStack      = new Stack<>();
         this.declarations      = new ArrayList<>();
@@ -249,7 +247,6 @@ public class FunctionNode extends Block {
         this.argumentsNode     = (IdentNode)cs.existingOrCopy(functionNode.argumentsNode);
         this.varArgsNode       = (IdentNode)cs.existingOrCopy(functionNode.varArgsNode);
         this.calleeNode        = (IdentNode)cs.existingOrCopy(functionNode.calleeNode);
-        this.thisProperties    = new LinkedHashMap<>();
         this.labelStack        = new Stack<>();
         this.controlStack      = new Stack<>();
         this.declarations      = new ArrayList<>();
@@ -372,30 +369,44 @@ public class FunctionNode extends Block {
     /**
      * Create a temporary variable to the current frame.
      *
+     * @param currentFrame Frame to add to - defaults to current function frame
      * @param type  Strong type of symbol.
      * @param node  Primary node to use symbol.
      *
      * @return Symbol used.
      */
-    public Symbol newTemporary(final Type type, final Node node) {
-        Symbol sym = node.getSymbol();
+    public Symbol newTemporary(final Frame currentFrame, final Type type, final Node node) {
+        assert currentFrame != null;
+        Symbol symbol = node.getSymbol();
 
         // If no symbol already present.
-        if (sym == null) {
+        if (symbol == null) {
             final String uname = uniqueName(TEMP_PREFIX.tag());
-            sym = new Symbol(uname, IS_TEMP, type);
-            sym.setNode(node);
+            symbol = new Symbol(uname, IS_TEMP, type);
+            symbol.setNode(node);
         }
 
         // Assign a slot if it doesn't have one.
-        if (!sym.hasSlot()) {
-            frames.addSymbol(sym);
+        if (!symbol.hasSlot()) {
+            currentFrame.addSymbol(symbol);
         }
 
         // Set symbol to node.
-        node.setSymbol(sym);
+        node.setSymbol(symbol);
 
-        return sym;
+        return symbol;
+    }
+
+    /**
+     * Add a new temporary variable to the current frame
+     *
+     * @param type Strong type of symbol
+     * @param node Primary node to use symbol
+     *
+     * @return symbol used
+     */
+    public Symbol newTemporary(final Type type, final Node node) {
+        return newTemporary(frames, type, node);
     }
 
     /**
@@ -414,22 +425,13 @@ public class FunctionNode extends Block {
         return sym;
     }
 
-    /**
-     * Add a property to the constructor (function) based on this.x usage.
-     *
-     * @param key  Name of property.
-     * @param node Value node (has type.)
-     */
-    public void addThisProperty(final String key, final Node node) {
-        if (node == null) {
-            return;
-        }
-
-        thisProperties.put(key, node);
-    }
-
     @Override
     public void toString(final StringBuilder sb) {
+        sb.append('[');
+        sb.append(returnType);
+        sb.append(']');
+        sb.append(' ');
+
         sb.append("function");
 
         if (ident != null) {
@@ -871,12 +873,23 @@ public class FunctionNode extends Block {
         return (flags & NEEDS_SELF_SYMBOL) != 0;
     }
 
+    /**
+     * Get the initializer statement for the __callee__ variable, where applicable
+     * for self references
+     * @return initialization
+     */
+    public Node getSelfSymbolInit() {
+        return this.selfSymbolInit;
+    }
+
     /**
      * Flag the function as needing a self symbol. This is needed only for
      * self referring functions
+     * @param selfSymbolInit initialization expression for self symbol
      */
-    public void setNeedsSelfSymbol() {
+    public void setNeedsSelfSymbol(final Node selfSymbolInit) {
         this.flags |= NEEDS_SELF_SYMBOL;
+        this.selfSymbolInit = selfSymbolInit;
     }
 
     /**
@@ -941,16 +954,6 @@ public class FunctionNode extends Block {
         funcVarLineNumberNode = lineNumber;
     }
 
-    /**
-     * Get a all properties accessed with {@code this} used as a base in this
-     * function - the map is ordered upon assignment order in the control flow
-     *
-     * @return map a map of property name to node mapping for this accesses
-     */
-    public Map<String, Node> getThisProperties() {
-        return Collections.unmodifiableMap(thisProperties);
-    }
-
     /**
      * Get the namespace this function uses for its symbols
      * @return the namespace
@@ -984,11 +987,7 @@ public class FunctionNode extends Block {
         //we never bother with object types narrower than objects, that will lead to byte code verification errors
         //as for instance even if we know we are returning a string from a method, the code generator will always
         //treat it as an object, at least for now
-        this.returnType = returnType.isObject() ? Type.OBJECT : returnType;
-        // Adjust type of result node symbol
-        if (returnType != Type.UNKNOWN) {
-            resultNode.getSymbol().setTypeOverride(this.returnType);
-        }
+        this.returnType = Type.widest(this.returnType,  returnType.isObject() ? Type.OBJECT : returnType);
     }
 
     /**
@@ -1010,15 +1009,13 @@ public class FunctionNode extends Block {
 
     /**
      * Set the lowered state
-     *
-     * @param isLowered lowered state
      */
-    public void setIsLowered(final boolean isLowered) {
-        flags = isLowered ? flags | IS_LOWERED : flags & ~IS_LOWERED;
+    public void setIsLowered() {
+        flags |= IS_LOWERED;
     }
 
     /**
-     * Get the lowered
+     * Get the lowered state
      *
      * @return true if function is lowered
      */
@@ -1076,22 +1073,6 @@ public class FunctionNode extends Block {
         return Collections.unmodifiableList(declarations);
     }
 
-    /**
-     * @return the unit index
-     */
-//    public int getUnit() {
- //       return unit;
- //   }
-
-    /**
-     * Set the index of this function's compile unit. Used by splitter.
-     * @see Splitter
-     * @param unit the unit index
-     */
-//    public void setUnit(final int unit) {
-//        this.unit = unit;
-//    }
-
     /**
      * Get the compile unit used to compile this function
      * @see Compiler
diff --git a/nashorn/src/jdk/nashorn/internal/ir/LiteralNode.java b/nashorn/src/jdk/nashorn/internal/ir/LiteralNode.java
index 8cd333b9272..51317acad32 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/LiteralNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/LiteralNode.java
@@ -32,8 +32,10 @@ import jdk.nashorn.internal.codegen.CompileUnit;
 import jdk.nashorn.internal.codegen.types.Type;
 import jdk.nashorn.internal.ir.visitor.NodeVisitor;
 import jdk.nashorn.internal.parser.Lexer.LexerToken;
+import jdk.nashorn.internal.parser.Token;
 import jdk.nashorn.internal.parser.TokenType;
 import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
 import jdk.nashorn.internal.runtime.Source;
 import jdk.nashorn.internal.runtime.Undefined;
 
@@ -199,6 +201,15 @@ public abstract class LiteralNode<T> extends Node implements PropertyKey {
         return value instanceof String;
     }
 
+    /**
+     * Test if tha value is a number
+     *
+     * @return True if value is a number
+     */
+    public boolean isNumeric() {
+        return value instanceof Number;
+    }
+
     /**
      * Assist in IR navigation.
      *
@@ -240,16 +251,49 @@ public abstract class LiteralNode<T> extends Node implements PropertyKey {
      * @return the new literal node
      */
     public static LiteralNode<Node> newInstance(final Source source, final long token, final int finish) {
-        return new LiteralNode<Node>(source, token, finish, null) {
-            @Override
-            protected Node copy(final CopyState cs) {
-                return LiteralNode.newInstance(getSource(), getToken(), getFinish());
-            }
-            @Override
-            public Type getType() {
-                return Type.OBJECT;
-            }
-        };
+        return new NodeLiteralNode(source, token, finish);
+    }
+
+    /**
+     * Create a new null literal based on a parent node (source, token, finish)
+     *
+     * @param parent parent node
+     *
+     * @return the new literal node
+     */
+    public static LiteralNode<?> newInstance(final Node parent) {
+        return new NodeLiteralNode(parent.getSource(), parent.getToken(), parent.getFinish());
+    }
+
+    private static class BooleanLiteralNode extends LiteralNode<Boolean> {
+
+        private BooleanLiteralNode(final Source source, final long token, final int finish, final boolean value) {
+            super(source, Token.recast(token, value ? TokenType.TRUE : TokenType.FALSE), finish, value);
+        }
+
+        private BooleanLiteralNode(final BooleanLiteralNode literalNode) {
+            super(literalNode);
+        }
+
+        @Override
+        protected Node copy(final CopyState cs) {
+            return new BooleanLiteralNode(this);
+        }
+
+        @Override
+        public boolean isTrue() {
+            return value;
+        }
+
+        @Override
+        public Type getType() {
+            return Type.BOOLEAN;
+        }
+
+        @Override
+        public Type getWidestOperationType() {
+            return Type.BOOLEAN;
+        }
     }
 
     /**
@@ -263,29 +307,63 @@ public abstract class LiteralNode<T> extends Node implements PropertyKey {
      * @return the new literal node
      */
     public static LiteralNode<Boolean> newInstance(final Source source, final long token, final int finish, final boolean value) {
-        return new LiteralNode<Boolean>(source, token, finish, value) {
-            @Override
-            protected Node copy(final CopyState cs) {
-                return LiteralNode.newInstance(getSource(), getToken(), getFinish(), getValue());
-            }
-
-            @Override
-            public boolean isTrue() {
-                return value;
-            }
-
-            @Override
-            public Type getType() {
-                return Type.BOOLEAN;
-            }
-
-            @Override
-            public Type getWidestOperationType() {
-                return Type.BOOLEAN;
-            }
-        };
+        return new BooleanLiteralNode(source, token,  finish, value);
     }
 
+    /**
+     * Create a new boolean literal based on a parent node (source, token, finish)
+     *
+     * @param parent parent node
+     * @param value  true or false
+     *
+     * @return the new literal node
+     */
+    public static LiteralNode<?> newInstance(final Node parent, final boolean value) {
+        return new BooleanLiteralNode(parent.getSource(), parent.getToken(), parent.getFinish(), value);
+    }
+
+    private static class NumberLiteralNode extends LiteralNode<Number> {
+
+        private final Type type = numberGetType(value);
+
+        private NumberLiteralNode(final Source source, final long token, final int finish, final Number value) {
+            super(source, Token.recast(token, TokenType.DECIMAL), finish, value);
+        }
+
+        private NumberLiteralNode(final NumberLiteralNode literalNode) {
+            super(literalNode);
+        }
+
+        private static Type numberGetType(final Number number) {
+            if (number instanceof Integer) {
+                return Type.INT;
+            } else if (number instanceof Long) {
+                return Type.LONG;
+            } else if (number instanceof Double) {
+                return Type.NUMBER;
+            } else {
+                assert false;
+            }
+
+            return null;
+        }
+
+        @Override
+        protected Node copy(final CopyState cs) {
+            return new NumberLiteralNode(this);
+        }
+
+        @Override
+        public Type getType() {
+            return type;
+        }
+
+        @Override
+        public Type getWidestOperationType() {
+            return getType();
+        }
+
+    }
     /**
      * Create a new number literal
      *
@@ -297,40 +375,34 @@ public abstract class LiteralNode<T> extends Node implements PropertyKey {
      * @return the new literal node
      */
     public static LiteralNode<Number> newInstance(final Source source, final long token, final int finish, final Number value) {
-        return new LiteralNode<Number>(source, token, finish, value) {
+        return new NumberLiteralNode(source, token, finish, value);
+    }
 
-            private Type numberGetType(final Number number) {
-                if (number instanceof Integer) {
-                    return Type.INT;
-                } else if (number instanceof Long) {
-                    return Type.LONG;
-                } else if (number instanceof Double) {
-                    return Type.NUMBER;
-                } else {
-                    assert false;
-                }
+    /**
+     * Create a new number literal based on a parent node (source, token, finish)
+     *
+     * @param parent parent node
+     * @param value  literal value
+     *
+     * @return the new literal node
+     */
+    public static LiteralNode<?> newInstance(final Node parent, final Number value) {
+        return new NumberLiteralNode(parent.getSource(), parent.getToken(), parent.getFinish(), value);
+    }
 
-                return null;
-            }
+    private static class UndefinedLiteralNode extends LiteralNode<Undefined> {
+        private UndefinedLiteralNode(final Source source, final long token, final int finish) {
+            super(source, Token.recast(token, TokenType.OBJECT), finish, ScriptRuntime.UNDEFINED);
+        }
 
-            private final Type type = numberGetType(value);
+        private UndefinedLiteralNode(final UndefinedLiteralNode literalNode) {
+            super(literalNode);
+        }
 
-            @Override
-            protected Node copy(final CopyState cs) {
-                return LiteralNode.newInstance(getSource(), getToken(), getFinish(), getValue());
-            }
-
-            @Override
-            public Type getType() {
-                return type;
-            }
-
-            @Override
-            public Type getWidestOperationType() {
-                return getType();
-            }
-
-        };
+        @Override
+        protected Node copy(final CopyState cs) {
+            return new UndefinedLiteralNode(this);
+        }
     }
 
     /**
@@ -344,12 +416,41 @@ public abstract class LiteralNode<T> extends Node implements PropertyKey {
      * @return the new literal node
      */
     public static LiteralNode<Undefined> newInstance(final Source source, final long token, final int finish, final Undefined value) {
-        return new LiteralNode<Undefined>(source, token, finish, value) {
-            @Override
-            protected Node copy(final CopyState cs) {
-                return LiteralNode.newInstance(getSource(), getToken(), getFinish(), getValue());
-            }
-        };
+        return new UndefinedLiteralNode(source, token, finish);
+    }
+
+    /**
+     * Create a new null literal based on a parent node (source, token, finish)
+     *
+     * @param parent parent node
+     * @param value  undefined value
+     *
+     * @return the new literal node
+     */
+    public static LiteralNode<?> newInstance(final Node parent, final Undefined value) {
+        return new UndefinedLiteralNode(parent.getSource(), parent.getToken(), parent.getFinish());
+    }
+
+    private static class StringLiteralNode extends LiteralNode<String> {
+        private StringLiteralNode(final Source source, final long token, final int finish, final String value) {
+            super(source, Token.recast(token, TokenType.STRING), finish, value);
+        }
+
+        private StringLiteralNode(final StringLiteralNode literalNode) {
+            super(literalNode);
+        }
+
+        @Override
+        protected Node copy(final CopyState cs) {
+            return new StringLiteralNode(this);
+        }
+
+        @Override
+        public void toString(final StringBuilder sb) {
+            sb.append('\"');
+            sb.append(value);
+            sb.append('\"');
+        }
     }
 
     /**
@@ -363,19 +464,39 @@ public abstract class LiteralNode<T> extends Node implements PropertyKey {
      * @return the new literal node
      */
     public static LiteralNode<String> newInstance(final Source source, final long token, final int finish, final String value) {
-        return new LiteralNode<String>(source, token, finish, value) {
-            @Override
-            protected Node copy(final CopyState cs) {
-                return LiteralNode.newInstance(getSource(), getToken(), getFinish(), getValue());
-            }
+        return new StringLiteralNode(source, token, finish, value);
+    }
 
-            @Override
-            public void toString(final StringBuilder sb) {
-                sb.append('\"');
-                sb.append(value);
-                sb.append('\"');
-            }
-        };
+    /**
+     * Create a new String literal based on a parent node (source, token, finish)
+     *
+     * @param parent parent node
+     * @param value  string value
+     *
+     * @return the new literal node
+     */
+    public static LiteralNode<?> newInstance(final Node parent, final String value) {
+        return new StringLiteralNode(parent.getSource(), parent.getToken(), parent.getFinish(), value);
+    }
+
+    private static class LexerTokenLiteralNode extends LiteralNode<LexerToken> {
+        private LexerTokenLiteralNode(final Source source, final long token, final int finish, final LexerToken value) {
+            super(source, Token.recast(token, TokenType.STRING), finish, value); //TODO is string the correct token type here?
+        }
+
+        private LexerTokenLiteralNode(final LexerTokenLiteralNode literalNode) {
+            super(literalNode);
+        }
+
+        @Override
+        protected Node copy(final CopyState cs) {
+            return new LexerTokenLiteralNode(this);
+        }
+
+        @Override
+        public void toString(final StringBuilder sb) {
+            sb.append(value.toString());
+        }
     }
 
     /**
@@ -389,22 +510,65 @@ public abstract class LiteralNode<T> extends Node implements PropertyKey {
      * @return the new literal node
      */
     public static LiteralNode<LexerToken> newInstance(final Source source, final long token, final int finish, final LexerToken value) {
-        return new LiteralNode<LexerToken>(source, token, finish, value) {
-            @Override
-            protected Node copy(final CopyState cs) {
-                return LiteralNode.newInstance(getSource(), getToken(), getFinish(), getValue());
-            }
-
-
-            @Override
-            public void toString(final StringBuilder sb) {
-                sb.append(value.toString());
-            }
-        };
+        return new LexerTokenLiteralNode(source, token, finish, value);
     }
 
     /**
-     * Create a new array for an arbitrary node
+     * Create a new lexer token literal based on a parent node (source, token, finish)
+     *
+     * @param parent parent node
+     * @param value  lexer token
+     *
+     * @return the new literal node
+     */
+    public static LiteralNode<?> newInstance(final Node parent, final LexerToken value) {
+        return new LexerTokenLiteralNode(parent.getSource(), parent.getToken(), parent.getFinish(), value);
+    }
+
+    private static class NodeLiteralNode extends LiteralNode<Node> {
+
+        private NodeLiteralNode(final Source source, final long token, final int finish) {
+            this(source, token, finish, null);
+        }
+
+        private NodeLiteralNode(final Source source, final long token, final int finish, final Node value) {
+            super(source, Token.recast(token, TokenType.OBJECT), finish, value);
+        }
+
+        private NodeLiteralNode(final LiteralNode<Node> literalNode) {
+            super(literalNode);
+        }
+
+        @Override
+        protected Node copy(final CopyState cs) {
+            return new NodeLiteralNode(this);
+        }
+
+        @Override
+        public Node accept(final NodeVisitor visitor) {
+            if (visitor.enter(this) != null) {
+                if (value != null) {
+                    value = value.accept(visitor);
+                }
+                return visitor.leave(this);
+            }
+
+            return this;
+        }
+
+        @Override
+        public Type getType() {
+            return value == null ? Type.OBJECT : super.getType();
+        }
+
+        @Override
+        public Type getWidestOperationType() {
+            return value == null ? Type.OBJECT : value.getWidestOperationType();
+        }
+
+    }
+    /**
+     * Create a new node literal for an arbitrary node
      *
      * @param source  the source
      * @param token   token
@@ -414,33 +578,19 @@ public abstract class LiteralNode<T> extends Node implements PropertyKey {
      * @return the new literal node
      */
     public static LiteralNode<Node> newInstance(final Source source, final long token, final int finish, final Node value) {
-        return new LiteralNode<Node>(source, token, finish, value) {
-            @Override
-            protected Node copy(final CopyState cs) {
-                return LiteralNode.newInstance(getSource(), getToken(), getFinish(), getValue());
-            }
+        return new NodeLiteralNode(source, token, finish, value);
+    }
 
-            @Override
-            public Node accept(final NodeVisitor visitor) {
-                if (visitor.enter(this) != null) {
-                    value = value.accept(visitor);
-                    return visitor.leave(this);
-                }
-
-                return this;
-            }
-
-            @Override
-            public void toString(final StringBuilder sb) {
-                value.toString(sb);
-            }
-
-            @Override
-            public Type getWidestOperationType() {
-                return value.getWidestOperationType();
-            }
-
-        };
+    /**
+     * Create a new node literal based on a parent node (source, token, finish)
+     *
+     * @param parent parent node
+     * @param value  node value
+     *
+     * @return the new literal node
+     */
+    public static LiteralNode<?> newInstance(final Node parent, final Node value) {
+        return new NodeLiteralNode(parent.getSource(), parent.getToken(), parent.getFinish(), value);
     }
 
     /**
@@ -521,8 +671,7 @@ public abstract class LiteralNode<T> extends Node implements PropertyKey {
          * @param value   array literal value, a Node array
          */
         protected ArrayLiteralNode(final Source source, final long token, final int finish, final Node[] value) {
-            super(source, token, finish, value);
-
+            super(source, Token.recast(token, TokenType.ARRAY), finish, value);
             this.elementType = Type.UNKNOWN;
         }
 
@@ -530,13 +679,14 @@ public abstract class LiteralNode<T> extends Node implements PropertyKey {
          * Copy constructor
          * @param node source array literal node
          */
-        protected ArrayLiteralNode(final LiteralNode<Node[]> node) {
+        protected ArrayLiteralNode(final ArrayLiteralNode node) {
             super(node);
+            this.elementType = node.elementType;
         }
 
         @Override
         protected Node copy(final CopyState cs) {
-            return LiteralNode.newInstance(getSource(), getToken(), getFinish(), getValue());
+            return new ArrayLiteralNode(this);
         }
 
         /**
@@ -769,6 +919,19 @@ public abstract class LiteralNode<T> extends Node implements PropertyKey {
         return new ArrayLiteralNode(source, token, finish, value.toArray(new Node[value.size()]));
     }
 
+
+    /**
+     * Create a new array literal based on a parent node (source, token, finish)
+     *
+     * @param parent parent node
+     * @param value  literal value list
+     *
+     * @return the new literal node
+     */
+    public static LiteralNode<?> newInstance(final Node parent, final List<Node> value) {
+        return new ArrayLiteralNode(parent.getSource(), parent.getToken(), parent.getFinish(), value.toArray(new Node[value.size()]));
+    }
+
     /**
      * Create a new array literal of Nodes
      *
diff --git a/nashorn/src/jdk/nashorn/internal/ir/Node.java b/nashorn/src/jdk/nashorn/internal/ir/Node.java
index 6568a6d671a..102dc288fb7 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/Node.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/Node.java
@@ -26,7 +26,7 @@
 package jdk.nashorn.internal.ir;
 
 import java.util.IdentityHashMap;
-import java.util.List;
+
 import jdk.nashorn.internal.codegen.types.Type;
 import jdk.nashorn.internal.ir.visitor.NodeVisitor;
 import jdk.nashorn.internal.parser.Token;
@@ -38,7 +38,7 @@ import jdk.nashorn.internal.runtime.Source;
  */
 public abstract class Node extends Location {
     /** Node symbol. */
-    private Symbol nodeSymbol;
+    private Symbol symbol;
 
     /** Start of source range. */
     protected int start;
@@ -68,7 +68,7 @@ public abstract class Node extends Location {
     public Node(final Source source, final long token, final int finish) {
         super(source, token);
 
-        start  = Token.descPosition(token);
+        this.start  = Token.descPosition(token);
         this.finish = finish;
     }
 
@@ -80,7 +80,7 @@ public abstract class Node extends Location {
     protected Node(final Node node) {
         super(node);
 
-        this.nodeSymbol    = node.nodeSymbol;
+        this.symbol        = node.symbol;
         this.isResolved    = node.isResolved;
         this.isTerminal    = node.isTerminal;
         this.hasGoto       = node.hasGoto;
@@ -107,8 +107,8 @@ public abstract class Node extends Location {
      * @return the type of the node.
      */
     public Type getType() {
-        assert hasType();
-        return nodeSymbol.getSymbolType();
+        assert hasType() : this + " has no type";
+        return symbol.getSymbolType();
     }
 
     /**
@@ -379,7 +379,7 @@ public abstract class Node extends Location {
      * @return the symbol
      */
     public Symbol getSymbol() {
-        return nodeSymbol;
+        return symbol;
     }
 
     /**
@@ -389,7 +389,7 @@ public abstract class Node extends Location {
      * @param symbol the symbol
      */
     public void setSymbol(final Symbol symbol) {
-        nodeSymbol = symbol;
+        this.symbol = symbol;
     }
 
     /**
@@ -412,21 +412,4 @@ public abstract class Node extends Location {
         this.isTerminal = isTerminal;
     }
 
-    /**
-     * Return last node in a statement list.
-     *
-     * @param statements Statement list.
-     *
-     * @return Last (non-debug) statement or null if empty block.
-     */
-    public static Node lastStatement(final List<Node> statements) {
-        for (int lastIndex = statements.size() - 1; lastIndex >= 0; lastIndex--) {
-            final Node node = statements.get(lastIndex);
-            if (!node.isDebug()) {
-                return node;
-            }
-        }
-
-        return null;
-    }
 }
diff --git a/nashorn/src/jdk/nashorn/internal/ir/RuntimeNode.java b/nashorn/src/jdk/nashorn/internal/ir/RuntimeNode.java
index ba3913f1079..371ba491107 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/RuntimeNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/RuntimeNode.java
@@ -257,6 +257,9 @@ public class RuntimeNode extends Node implements TypeOverride {
     /** Call site override - e.g. we know that a ScriptRuntime.ADD will return an int */
     private Type callSiteType;
 
+    /** is final - i.e. may not be removed again, lower in the code pipeline */
+    private boolean isFinal;
+
     /**
      * Constructor
      *
@@ -286,6 +289,51 @@ public class RuntimeNode extends Node implements TypeOverride {
         this(source, token, finish, request, Arrays.asList(args));
     }
 
+    /**
+     * Constructor
+     *
+     * @param parent  parent node from which to inherit source, token, finish
+     * @param request the request
+     * @param args    arguments to request
+     */
+    public RuntimeNode(final Node parent, final Request request, final Node... args) {
+        this(parent, request, Arrays.asList(args));
+    }
+
+    /**
+     * Constructor
+     *
+     * @param parent  parent node from which to inherit source, token, finish
+     * @param request the request
+     * @param args    arguments to request
+     */
+    public RuntimeNode(final Node parent, final Request request, final List<Node> args) {
+        super(parent);
+
+        this.request = request;
+        this.args    = args;
+    }
+
+    /**
+     * Constructor
+     *
+     * @param parent  parent node from which to inherit source, token, finish and arguments
+     * @param request the request
+     */
+    public RuntimeNode(final UnaryNode parent, final Request request) {
+        this(parent, request, parent.rhs());
+    }
+
+    /**
+     * Constructor
+     *
+     * @param parent  parent node from which to inherit source, token, finish and arguments
+     * @param request the request
+     */
+    public RuntimeNode(final BinaryNode parent, final Request request) {
+        this(parent, request, parent.lhs(), parent.rhs());
+    }
+
     private RuntimeNode(final RuntimeNode runtimeNode, final CopyState cs) {
         super(runtimeNode);
 
@@ -300,6 +348,21 @@ public class RuntimeNode extends Node implements TypeOverride {
         this.callSiteType = runtimeNode.callSiteType;
     }
 
+    /**
+     * Is this node final - i.e. it can never be replaced with other nodes again
+     * @return true if final
+     */
+    public boolean isFinal() {
+        return isFinal;
+    }
+
+    /**
+     * Flag this node as final - i.e it may never be replaced with other nodes again
+     */
+    public void setIsFinal() {
+        this.isFinal = true;
+    }
+
     @Override
     protected Node copy(final CopyState cs) {
         return new RuntimeNode(this, cs);
diff --git a/nashorn/src/jdk/nashorn/internal/ir/Symbol.java b/nashorn/src/jdk/nashorn/internal/ir/Symbol.java
index 91210cc73c6..21d589fe251 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/Symbol.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/Symbol.java
@@ -26,6 +26,10 @@
 package jdk.nashorn.internal.ir;
 
 import java.io.PrintWriter;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.StringTokenizer;
+
 import jdk.nashorn.internal.codegen.types.Type;
 import jdk.nashorn.internal.runtime.Context;
 import jdk.nashorn.internal.runtime.options.Options;
@@ -46,7 +50,7 @@ public final class Symbol implements Comparable<Symbol> {
     /** Is this a constant */
     public static final int IS_CONSTANT = 0b0000_0101;
 
-    static final int KINDMASK    = 0b0000_1111;
+    static final int KINDMASK = 0b0000_1111;
 
     /** Is this scope */
     public static final int IS_SCOPE         = 0b0000_0001_0000;
@@ -85,8 +89,33 @@ public final class Symbol implements Comparable<Symbol> {
     /** Number of times this symbol is used in code */
     private int useCount;
 
-    /** Debugging option - dump info and stack trace when a symbol with a given name is manipulated */
-    private static final String TRACE_SYMBOL = Options.getStringProperty("nashorn.compiler.symbol.trace", null);
+    /** Debugging option - dump info and stack trace when symbols with given names are manipulated */
+    private static final Set<String> TRACE_SYMBOLS;
+    private static final Set<String> TRACE_SYMBOLS_STACKTRACE;
+
+    static {
+        final String stacktrace = Options.getStringProperty("nashorn.compiler.symbol.stacktrace", null);
+        final String trace;
+        if (stacktrace != null) {
+            trace = stacktrace; //stacktrace always implies trace as well
+            TRACE_SYMBOLS_STACKTRACE = new HashSet<>();
+            for (StringTokenizer st = new StringTokenizer(stacktrace, ","); st.hasMoreTokens(); ) {
+                TRACE_SYMBOLS_STACKTRACE.add(st.nextToken());
+            }
+        } else {
+            trace = Options.getStringProperty("nashorn.compiler.symbol.trace", null);
+            TRACE_SYMBOLS_STACKTRACE = null;
+        }
+
+        if (trace != null) {
+            TRACE_SYMBOLS = new HashSet<>();
+            for (StringTokenizer st = new StringTokenizer(trace, ","); st.hasMoreTokens(); ) {
+                TRACE_SYMBOLS.add(st.nextToken());
+            }
+        } else {
+            TRACE_SYMBOLS = null;
+        }
+    }
 
     /**
      * Constructor
@@ -106,6 +135,7 @@ public final class Symbol implements Comparable<Symbol> {
         this.type       = type;
         this.slot       = slot;
         this.fieldIndex = -1;
+        trace("CREATE SYMBOL");
     }
 
     /**
@@ -135,7 +165,7 @@ public final class Symbol implements Comparable<Symbol> {
         final StringBuilder sb = new StringBuilder();
         sb.append(string.substring(0, Math.min(string.length(), max)));
 
-        while (sb.length () < max) {
+        while (sb.length() < max) {
             sb.append(' ');
         }
         return sb.toString();
@@ -263,6 +293,23 @@ public final class Symbol implements Comparable<Symbol> {
         return name.hashCode() ^ block.hashCode();
     }
 
+    private static String type(final String desc) {
+        switch (desc.charAt(desc.length() - 1)) {
+        case ';':
+            return desc;//"obj";
+        case 'D':
+            return "double";
+        case 'I':
+            return "int";
+        case 'J':
+            return "long";
+        case 'Z':
+            return "boolean";
+        default:
+            return "UNKNOWN";
+        }
+    }
+
     @Override
     public String toString() {
         final StringBuilder sb   = new StringBuilder();
@@ -270,8 +317,8 @@ public final class Symbol implements Comparable<Symbol> {
 
         sb.append(name).
             append(' ').
-            append("(type=").
-            append(desc.charAt(desc.length() - 1) == ';' ? 'O' : desc).
+            append('(').
+            append(type(desc)).
             append(')');
 
         if (hasSlot()) {
@@ -602,10 +649,13 @@ public final class Symbol implements Comparable<Symbol> {
         return block instanceof FunctionNode && ((FunctionNode) block).isScript();
     }
 
+
     private void trace(final String desc) {
-        if (TRACE_SYMBOL != null && TRACE_SYMBOL.equals(name)) {
+        if (TRACE_SYMBOLS != null && (TRACE_SYMBOLS.isEmpty() || TRACE_SYMBOLS.contains(name))) {
             Context.err("SYMBOL: '" + name + "' " + desc);
-            new Throwable().printStackTrace(Context.getCurrentErr());
+            if (TRACE_SYMBOLS_STACKTRACE != null && (TRACE_SYMBOLS_STACKTRACE.isEmpty() || TRACE_SYMBOLS_STACKTRACE.contains(name))) {
+                new Throwable().printStackTrace(Context.getContext().getErr());
+            }
         }
     }
 }
diff --git a/nashorn/src/jdk/nashorn/internal/ir/TryNode.java b/nashorn/src/jdk/nashorn/internal/ir/TryNode.java
index 7dd509f3dcb..8bc20929a8f 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/TryNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/TryNode.java
@@ -56,6 +56,9 @@ public class TryNode extends Node {
     /** Exception symbol. */
     private Symbol exception;
 
+    /** Catchall exception for finally expansion, where applicable */
+    private Symbol finallyCatchAll;
+
     /**
      * Constructor
      *
@@ -183,6 +186,23 @@ public class TryNode extends Node {
         this.exception = exception;
     }
 
+    /**
+     * Get the catch all symbol for this try block
+     * @return catch all symbol
+     */
+    public Symbol getFinallyCatchAll() {
+        return this.finallyCatchAll;
+    }
+
+    /**
+     * If a finally block exists, the synthetic catchall needs another symbol to
+     * store its throwable
+     * @param finallyCatchAll a symbol for the finally catch all exception
+     */
+    public void setFinallyCatchAll(final Symbol finallyCatchAll) {
+        this.finallyCatchAll = finallyCatchAll;
+    }
+
     /**
      * Get the exit label for this try block
      * @return exit label
diff --git a/nashorn/src/jdk/nashorn/internal/ir/VarNode.java b/nashorn/src/jdk/nashorn/internal/ir/VarNode.java
index 2b080ea741a..82ab493fc36 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/VarNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/VarNode.java
@@ -41,9 +41,6 @@ public class VarNode extends Node implements Assignment<IdentNode> {
     /** Is this a function var node */
     private boolean isFunctionVarNode;
 
-    /** Should append VarNode to statement list? */
-    private final boolean shouldAppend;
-
     /**
      * Constructor
      *
@@ -54,25 +51,10 @@ public class VarNode extends Node implements Assignment<IdentNode> {
      * @param init   init node or null if just a declaration
      */
     public VarNode(final Source source, final long token, final int finish, final IdentNode name, final Node init) {
-        this(source, token, finish, name, init, true);
-    }
-
-    /**
-     * Constructor
-     *
-     * @param source the source
-     * @param token  token
-     * @param finish finish
-     * @param name   name of variable
-     * @param init   init node or null if just a declaration
-     * @param shouldAppend should this turn into explicit code, like if it were an ExecuteNode
-     */
-    public VarNode(final Source source, final long token, final int finish, final IdentNode name, final Node init, final boolean shouldAppend) {
         super(source, token, finish);
 
         this.name  = name;
         this.init  = init;
-        this.shouldAppend = shouldAppend;
         if (init != null) {
             this.name.setIsInitializedHere();
         }
@@ -83,7 +65,6 @@ public class VarNode extends Node implements Assignment<IdentNode> {
 
         this.name = (IdentNode)cs.existingOrCopy(varNode.name);
         this.init = cs.existingOrCopy(varNode.init);
-        this.shouldAppend = varNode.shouldAppend;
     }
 
     @Override
@@ -116,7 +97,6 @@ public class VarNode extends Node implements Assignment<IdentNode> {
         setInit(source);
     }
 
-
     /**
      * Does this variable declaration have an init value
      * @return true if an init exists, false otherwise
@@ -235,15 +215,4 @@ public class VarNode extends Node implements Assignment<IdentNode> {
         this.isFunctionVarNode = true;
     }
 
-    /**
-     * Is this the var for a for-in node or other construct that means
-     * manual or no appends of this varNode to the statement list in
-     * Lower? The default is yes as most VarNodes are auto-append to
-     * the end of the statement list when lowered
-     *
-     * @return should compiler append var node to statement list
-     */
-    public boolean shouldAppend() {
-        return shouldAppend;
-    }
 }
diff --git a/nashorn/src/jdk/nashorn/internal/ir/debug/ASTWriter.java b/nashorn/src/jdk/nashorn/internal/ir/debug/ASTWriter.java
index 395a25e74ee..3c66aa12d0e 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/debug/ASTWriter.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/debug/ASTWriter.java
@@ -113,8 +113,8 @@ public final class ASTWriter {
             status += " Goto ";
         }
 
-        if (node.getSymbol() != null && node.getSymbol().hasSlot()) {
-            status += " Slot " + node.getSymbol();
+        if (node.getSymbol() != null) {
+            status += node.getSymbol();
         }
 
         status = status.trim();
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeJSON.java b/nashorn/src/jdk/nashorn/internal/objects/NativeJSON.java
index 275fca032fe..5c7d74015f0 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeJSON.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeJSON.java
@@ -265,7 +265,7 @@ public final class NativeJSON extends ScriptObject {
 
        if (node instanceof LiteralNode) {
             // check for array literal
-            if (node.tokenType() == TokenType.LBRACKET) {
+            if (node.tokenType() == TokenType.ARRAY) {
                 assert node instanceof ArrayLiteralNode;
                 final Node[] elements = ((ArrayLiteralNode)node).getValue();
 
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeString.java b/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
index 10d5c4a1cc7..f9c836cc0f4 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
@@ -789,6 +789,7 @@ public final class NativeString extends ScriptObject {
      *
      * @param self  self reference
      * @param start start position for slice
+     * @param end   end position for slice
      * @return sliced out substring
      */
     @SpecializedFunction
@@ -808,6 +809,7 @@ public final class NativeString extends ScriptObject {
      *
      * @param self  self reference
      * @param start start position for slice
+     * @param end   end position for slice
      * @return sliced out substring
      */
     @SpecializedFunction
@@ -843,9 +845,8 @@ public final class NativeString extends ScriptObject {
     }
 
     private static Object splitString(String str, String separator, long limit) {
-
-        if (separator.equals("")) {
-            Object[] array = new Object[str.length()];
+        if (separator.isEmpty()) {
+            final Object[] array = new Object[str.length()];
             for (int i = 0; i < array.length; i++) {
                 array[i] = String.valueOf(str.charAt(i));
             }
@@ -856,18 +857,18 @@ public final class NativeString extends ScriptObject {
         final int strLength = str.length();
         final int sepLength = separator.length();
         int pos = 0;
-        int count = 0;
+        int n = 0;
 
-        while (pos < strLength && count < limit) {
+        while (pos < strLength && n < limit) {
             int found = str.indexOf(separator, pos);
             if (found == -1) {
                 break;
             }
             elements.add(str.substring(pos, found));
-            count++;
+            n++;
             pos = found + sepLength;
         }
-        if (pos <= strLength && count < limit) {
+        if (pos <= strLength && n < limit) {
             elements.add(str.substring(pos));
         }
 
@@ -963,9 +964,8 @@ public final class NativeString extends ScriptObject {
 
         if (validStart < validEnd) {
             return str.substring(validStart, validEnd);
-        } else {
-            return str.substring(validEnd, validStart);
         }
+        return str.substring(validEnd, validStart);
     }
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/parser/AbstractParser.java b/nashorn/src/jdk/nashorn/internal/parser/AbstractParser.java
index c1df1fcf2e9..5dd5d187bbb 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/AbstractParser.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/AbstractParser.java
@@ -96,11 +96,6 @@ public abstract class AbstractParser {
         this.token        = Token.toDesc(EOL, 0, 1);
         this.type         = EOL;
         this.last         = EOL;
-        this.start        = 0;
-        this.finish       = 0;
-        this.line         = 0;
-        this.linePosition = 0;
-        this.lexer        = null;
         this.isStrictMode = strict;
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/parser/Parser.java b/nashorn/src/jdk/nashorn/internal/parser/Parser.java
index 1b529babf1b..0b65979fb3b 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/Parser.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/Parser.java
@@ -587,8 +587,6 @@ loop:
         script.setLastToken(token);
         script.setFinish(source.getLength() - 1);
 
-        block.addStatement(lineNumber());
-
         return script;
     }
 
@@ -616,6 +614,24 @@ loop:
         return null;
     }
 
+    /**
+     * Return last node in a statement list.
+     *
+     * @param statements Statement list.
+     *
+     * @return Last (non-debug) statement or null if empty block.
+     */
+    private static Node lastStatement(final List<Node> statements) {
+        for (int lastIndex = statements.size() - 1; lastIndex >= 0; lastIndex--) {
+            final Node node = statements.get(lastIndex);
+            if (!node.isDebug()) {
+                return node;
+            }
+        }
+
+        return null;
+    }
+
     /**
      * SourceElements :
      *      SourceElement
@@ -645,7 +661,7 @@ loop:
                     // check for directive prologues
                     if (checkDirective) {
                         // skip any debug statement like line number to get actual first line
-                        final Node lastStatement = Node.lastStatement(block.getStatements());
+                        final Node lastStatement = lastStatement(block.getStatements());
 
                         // get directive prologue, if any
                         final String directive = getDirective(lastStatement);
@@ -677,7 +693,7 @@ loop:
                                     }
 
                                     // verify that function name as well as parameter names
-                                    // satisfystrict mode restrictions.
+                                    // satisfy strict mode restrictions.
                                     verifyStrictIdent(function.getIdent(), "function name");
                                     for (final IdentNode param : function.getParameters()) {
                                         verifyStrictIdent(param, "function parameter");
@@ -2628,12 +2644,12 @@ loop:
                 // just expression as function body
                 final Node expr = expression();
 
-                // create a return statement
-                final ReturnNode  returnNode  = new ReturnNode(source, expr.getToken(), finish, expr, null);
-                final ExecuteNode executeNode = new ExecuteNode(source, returnNode.getToken(), finish, returnNode);
+                // create a return statement - this creates code in itself and does not need to be
+                // wrapped into an ExecuteNode
+                final ReturnNode  returnNode = new ReturnNode(source, expr.getToken(), finish, expr, null);
 
                 // add the return statement
-                functionNode.addStatement(executeNode);
+                functionNode.addStatement(returnNode);
                 functionNode.setLastToken(token);
                 functionNode.setFinish(Token.descPosition(token) + Token.descLength(token));
 
@@ -2648,8 +2664,6 @@ loop:
                 functionNode.setFinish(finish);
 
             }
-
-            block.addStatement(lineNumber());
         } finally {
             restoreBlock();
         }
diff --git a/nashorn/src/jdk/nashorn/internal/parser/TokenType.java b/nashorn/src/jdk/nashorn/internal/parser/TokenType.java
index a095a48357a..d8a0dbdb59f 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/TokenType.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/TokenType.java
@@ -171,6 +171,8 @@ public enum TokenType {
     IDENT          (LITERAL,  null),
     REGEX          (LITERAL,  null),
     XML            (LITERAL,  null),
+    OBJECT         (LITERAL,  null),
+    ARRAY          (LITERAL,  null),
 
     COMMALEFT      (IR,       null),
     CONVERT        (IR,       null),
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Context.java b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
index 41a700ccbb5..c7aafe2dd73 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/Context.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
@@ -478,11 +478,11 @@ public final class Context {
         return _timezone;
     }
 
-    /*
+    /**
      * Get the PropertyMap of the current global scope
      * @return the property map of the current global scope
      */
-    public PropertyMap getGlobalMap() {
+    public static PropertyMap getGlobalMap() {
         return Context.getGlobalTrusted().getMap();
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/DebugLogger.java b/nashorn/src/jdk/nashorn/internal/runtime/DebugLogger.java
index 1b558ead205..352750e5f07 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/DebugLogger.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/DebugLogger.java
@@ -41,6 +41,8 @@ public class DebugLogger {
 
     private int indent;
 
+    private static final int INDENT_SPACE = 4;
+
     /**
      * Constructor
      *
@@ -93,7 +95,24 @@ public class DebugLogger {
      */
     public void indent(final int pos) {
         if (isEnabled) {
-           indent += pos * 4;
+           indent += pos * INDENT_SPACE;
+        }
+    }
+
+    /**
+     * Add an indent position
+     */
+    public void indent() {
+        indent += INDENT_SPACE;
+    }
+
+    /**
+     * Unindent a position
+     */
+    public void unindent() {
+        indent -= INDENT_SPACE;
+        if (indent < 0) {
+            indent = 0;
         }
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/OptionsObject.java b/nashorn/src/jdk/nashorn/internal/runtime/OptionsObject.java
index 93ab5ac47be..066d8e5a427 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/OptionsObject.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/OptionsObject.java
@@ -106,6 +106,11 @@ public final class OptionsObject {
     /** time zone for this context */
     public final TimeZone _timezone;
 
+    /**
+     * Constructor
+     *
+     * @param context a context
+     */
     public OptionsObject(final Context context) {
         this._anon_functions = context._anon_functions;
         this._callsite_flags = context._callsite_flags;
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java b/nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java
index f6426387b49..399e2e94b61 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java
@@ -635,7 +635,13 @@ public final class PropertyMap implements Iterable<Object>, PropertyListener {
 
             sb.append(ScriptRuntime.safeToString(property.getKey()));
             final Class<?> ctype = property.getCurrentType();
-            sb.append(" <" + property.getClass().getSimpleName() + ":" + (ctype == null ? "undefined" : ctype.getSimpleName()) + ">");
+            sb.append(" <").
+                append(property.getClass().getSimpleName()).
+                append(':').
+                append(ctype == null ?
+                    "undefined" :
+                    ctype.getSimpleName()).
+                append('>');
         }
 
         sb.append(']');
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
index a2bcc20be94..2536f7c932f 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
@@ -1044,6 +1044,10 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
         set(key, value, getContext()._strict);
     }
 
+    /**
+     * Return true if the script object context is strict
+     * @return true if strict context
+     */
     public final boolean isStrictContext() {
         return getContext()._strict;
     }
@@ -1419,7 +1423,10 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
         return (flags & IS_SCOPE) != 0;
     }
 
-    // java.util.Map-like methods to help ScriptObjectMirror implementation
+    /**
+     * Clears the properties from a ScriptObject
+     * (java.util.Map-like method to help ScriptObjectMirror implementation)
+     */
     public void clear() {
         final boolean strict = getContext()._strict;
         final Iterator<String> iter = propertyIterator();
@@ -1428,10 +1435,24 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
         }
     }
 
+    /**
+     * Checks if a property with a given key is present in a ScriptObject
+     * (java.util.Map-like method to help ScriptObjectMirror implementation)
+     *
+     * @param key the key to check for
+     * @return true if a property with the given key exists, false otherwise
+     */
     public boolean containsKey(final Object key) {
         return has(key);
     }
 
+    /**
+     * Checks if a property with a given value is present in a ScriptObject
+     * (java.util.Map-like method to help ScriptObjectMirror implementation)
+     *
+     * @param value value to check for
+     * @return true if a property with the given value exists, false otherwise
+     */
     public boolean containsValue(final Object value) {
         final Iterator<Object> iter = valueIterator();
         while (iter.hasNext()) {
@@ -1442,6 +1463,13 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
         return false;
     }
 
+    /**
+     * Returns the set of <property, value> entries that make up this
+     * ScriptObject's properties
+     * (java.util.Map-like method to help ScriptObjectMirror implementation)
+     *
+     * @return an entry set of all the properties in this object
+     */
     public Set<Map.Entry<Object, Object>> entrySet() {
         final Iterator<String> iter = propertyIterator();
         final Set<Map.Entry<Object, Object>> entries = new HashSet<>();
@@ -1452,10 +1480,23 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
         return Collections.unmodifiableSet(entries);
     }
 
+    /**
+     * Check whether a ScriptObject contains no properties
+     * (java.util.Map-like method to help ScriptObjectMirror implementation)
+     *
+     * @return true if object has no properties
+     */
     public boolean isEmpty() {
         return !propertyIterator().hasNext();
     }
 
+    /**
+     * Return the set of keys (property names) for all properties
+     * in this ScriptObject
+     * (java.util.Map-like method to help ScriptObjectMirror implementation)
+     *
+     * @return keySet of this ScriptObject
+     */
     public Set<Object> keySet() {
         final Iterator<String> iter = propertyIterator();
         final Set<Object> keySet = new HashSet<>();
@@ -1465,12 +1506,27 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
         return Collections.unmodifiableSet(keySet);
     }
 
+    /**
+     * Put a property in the ScriptObject
+     * (java.util.Map-like method to help ScriptObjectMirror implementation)
+     *
+     * @param key property key
+     * @param value property value
+     * @return oldValue if property with same key existed already
+     */
     public Object put(final Object key, final Object value) {
         final Object oldValue = get(key);
         set(key, value, getContext()._strict);
         return oldValue;
     }
 
+    /**
+     * Put several properties in the ScriptObject given a mapping
+     * of their keys to their values
+     * (java.util.Map-like method to help ScriptObjectMirror implementation)
+     *
+     * @param otherMap a <key,value> map of properties to add
+     */
     public void putAll(final Map<?, ?> otherMap) {
         final boolean strict = getContext()._strict;
         for (final Map.Entry<?, ?> entry : otherMap.entrySet()) {
@@ -1478,12 +1534,26 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
         }
     }
 
+    /**
+     * Remove a property from the ScriptObject.
+     * (java.util.Map-like method to help ScriptObjectMirror implementation)
+     *
+     * @param key the key of the property
+     * @return the oldValue of the removed property
+     */
     public Object remove(final Object key) {
         final Object oldValue = get(key);
         delete(key, getContext()._strict);
         return oldValue;
     }
 
+    /**
+     * Return the size of the ScriptObject - i.e. the number of properties
+     * it contains
+     * (java.util.Map-like method to help ScriptObjectMirror implementation)
+     *
+     * @return number of properties in ScriptObject
+     */
     public int size() {
         int n = 0;
         for (final Iterator<String> iter = propertyIterator(); iter.hasNext(); iter.next()) {
@@ -1492,6 +1562,12 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
         return n;
     }
 
+    /**
+     * Return the values of the properties in the ScriptObject
+     * (java.util.Map-like method to help ScriptObjectMirror implementation)
+     *
+     * @return collection of values for the properties in this ScriptObject
+     */
     public Collection<Object> values() {
         final List<Object>     values = new ArrayList<>(size());
         final Iterator<Object> iter   = valueIterator();
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java
index 17737ecef74..ed3a46750dd 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java
@@ -41,13 +41,13 @@ import java.lang.invoke.MethodHandles;
  */
 public class ScriptingFunctions {
 
-    /** Handle to implementation of {@link ScriptingFunctions#read} - Nashorn extension */
+    /** Handle to implementation of {@link ScriptingFunctions#readLine} - Nashorn extension */
     public static final MethodHandle READLINE = findOwnMH("readLine", Object.class, Object.class);
 
     /** Handle to implementation of {@link ScriptingFunctions#readFully} - Nashorn extension */
     public static final MethodHandle READFULLY = findOwnMH("readFully",     Object.class, Object.class, Object.class);
 
-    /** Handle to implementation of {@link ScriptingFunctions#read} - Nashorn extension */
+    /** Handle to implementation of {@link ScriptingFunctions#quit} - Nashorn extension */
     public static final MethodHandle QUIT = findOwnMH("quit",     Object.class, Object.class, Object.class);
 
     private ScriptingFunctions() {
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayIterator.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayIterator.java
index da543ae60c4..3b9905a2577 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayIterator.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayIterator.java
@@ -25,7 +25,6 @@
 
 package jdk.nashorn.internal.runtime.arrays;
 
-import jdk.nashorn.internal.runtime.Context;
 import jdk.nashorn.internal.runtime.ScriptObject;
 
 /**
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayLikeIterator.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayLikeIterator.java
index 905a78485a3..1703b7ecf14 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayLikeIterator.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayLikeIterator.java
@@ -26,7 +26,6 @@
 package jdk.nashorn.internal.runtime.arrays;
 
 import java.util.Iterator;
-import jdk.nashorn.internal.runtime.Context;
 import jdk.nashorn.internal.runtime.JSType;
 import jdk.nashorn.internal.runtime.ScriptObject;
 
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/FrozenArrayFilter.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/FrozenArrayFilter.java
index 2a4dcc3bb31..4cd6a1f0961 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/FrozenArrayFilter.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/FrozenArrayFilter.java
@@ -27,7 +27,6 @@ package jdk.nashorn.internal.runtime.arrays;
 
 import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
 
-import jdk.nashorn.internal.runtime.Context;
 import jdk.nashorn.internal.runtime.GlobalObject;
 import jdk.nashorn.internal.runtime.PropertyDescriptor;
 
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/SealedArrayFilter.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/SealedArrayFilter.java
index 553a21a9260..5ade11349bd 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/SealedArrayFilter.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/SealedArrayFilter.java
@@ -27,7 +27,6 @@ package jdk.nashorn.internal.runtime.arrays;
 
 import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
 
-import jdk.nashorn.internal.runtime.Context;
 import jdk.nashorn.internal.runtime.GlobalObject;
 import jdk.nashorn.internal.runtime.PropertyDescriptor;
 
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java
index eb5ff52bd71..0ee1e74b133 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java
@@ -446,7 +446,7 @@ public class LinkerCallSite extends ChainedCallSite {
          *
          * @throws Throwable if invocation fails or throws exception/error
          */
-        @SuppressWarnings("unused")
+        @SuppressWarnings({"unused", "resource"})
         public Object traceObject(final MethodHandle mh, final Object... args) throws Throwable {
             final PrintWriter out = Context.getCurrentErr();
             tracePrint(out, "ENTER ", args, null);
@@ -464,7 +464,7 @@ public class LinkerCallSite extends ChainedCallSite {
          *
          * @throws Throwable if invocation fails or throws exception/error
          */
-        @SuppressWarnings("unused")
+        @SuppressWarnings({"unused", "resource"})
         public void traceVoid(final MethodHandle mh, final Object... args) throws Throwable {
             final PrintWriter out = Context.getCurrentErr();
             tracePrint(out, "ENTER ", args, null);
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/options/Options.java b/nashorn/src/jdk/nashorn/internal/runtime/options/Options.java
index 750b3f8ceac..06b1176a012 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/options/Options.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/options/Options.java
@@ -416,7 +416,7 @@ public final class Options {
                     System.setProperty(value.substring(0, eq), value.substring(eq + 1));
                 } else {
                     // -Dfoo is fine. Set System property "foo" with "" as it's value
-                    if (!value.equals("")) {
+                    if (!value.isEmpty()) {
                         System.setProperty(value, "");
                     } else {
                         // do not allow empty property name
diff --git a/nashorn/src/jdk/nashorn/tools/Shell.java b/nashorn/src/jdk/nashorn/tools/Shell.java
index 279a0ed2f27..f4ea183763c 100644
--- a/nashorn/src/jdk/nashorn/tools/Shell.java
+++ b/nashorn/src/jdk/nashorn/tools/Shell.java
@@ -178,7 +178,7 @@ public class Shell {
      * @return null if there are problems with option parsing.
      */
     @SuppressWarnings("resource")
-    private Context makeContext(final InputStream in, final OutputStream out, final OutputStream err, final String[] args) {
+    private static Context makeContext(final InputStream in, final OutputStream out, final OutputStream err, final String[] args) {
         final PrintStream pout = out instanceof PrintStream ? (PrintStream) out : new PrintStream(out);
         final PrintStream perr = err instanceof PrintStream ? (PrintStream) err : new PrintStream(err);
         final PrintWriter wout = new PrintWriter(pout, true);
@@ -230,7 +230,7 @@ public class Shell {
      * @return error code
      * @throws IOException when any script file read results in I/O error
      */
-    private int compileScripts(final Context context, final ScriptObject global, final List<String> files) throws IOException {
+    private static int compileScripts(final Context context, final ScriptObject global, final List<String> files) throws IOException {
         final ScriptObject oldGlobal = Context.getGlobal();
         final boolean globalChanged = (oldGlobal != global);
         try {
@@ -330,7 +330,7 @@ public class Shell {
      * @return return code
      */
     @SuppressWarnings("resource")
-    private int readEvalPrint(final Context context, final ScriptObject global) {
+    private static int readEvalPrint(final Context context, final ScriptObject global) {
         final String prompt = bundle.getString("shell.prompt");
         final BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
         final PrintWriter err = context.getErr();
diff --git a/nashorn/test/script/basic/access-specializer.js b/nashorn/test/script/basic/access-specializer.js
new file mode 100644
index 00000000000..d60260a9a42
--- /dev/null
+++ b/nashorn/test/script/basic/access-specializer.js
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * This is a simple test that checks that access specialization in FinalizeTypes is consistent.
+ * Here, a2 = 0 will be turned int {I}a2 = 0, and all would be fine and well, only we can't change
+ * the symbol type for a2 from double, and we can't as it's not a temporary. Either we have to put 
+ * a temporary in at the late finalize stage and add another assignment, or we genericize the check
+ * in CodeGenerator#Store so we detect whether a target is of the wrong type before storing. It 
+ * is hopefully very rare, and will only be a problem when assignment results that have been
+ * specialized live on the stack
+ *
+ * @test
+ * @run
+ */
+
+function f() {
+    var a0 = a1 = a2 = 0;
+    a0 = 16.1;
+    a1 = 17.1;
+    a2 = 18.1;
+}
+f();
diff --git a/nashorn/test/script/basic/compile-octane.js.EXPECTED b/nashorn/test/script/basic/compile-octane.js.EXPECTED
index a9b80b16c01..dab419e6d46 100644
--- a/nashorn/test/script/basic/compile-octane.js.EXPECTED
+++ b/nashorn/test/script/basic/compile-octane.js.EXPECTED
@@ -1,12 +1,36 @@
+Compiling... box2d.js
 Compiled OK: box2d.js
+
+Compiling... code-load.js
 Compiled OK: code-load.js
+
+Compiling... crypto.js
 Compiled OK: crypto.js
+
+Compiling... deltablue.js
 Compiled OK: deltablue.js
+
+Compiling... earley-boyer.js
 Compiled OK: earley-boyer.js
+
+Compiling... gbemu.js
 Compiled OK: gbemu.js
+
+Compiling... navier-stokes.js
 Compiled OK: navier-stokes.js
+
+Compiling... pdfjs.js
 Compiled OK: pdfjs.js
+
+Compiling... raytrace.js
 Compiled OK: raytrace.js
+
+Compiling... regexp.js
 Compiled OK: regexp.js
+
+Compiling... richards.js
 Compiled OK: richards.js
+
+Compiling... splay.js
 Compiled OK: splay.js
+
diff --git a/nashorn/test/script/basic/run-octane.js b/nashorn/test/script/basic/run-octane.js
index 42058f7e089..42bf77fa9e6 100644
--- a/nashorn/test/script/basic/run-octane.js
+++ b/nashorn/test/script/basic/run-octane.js
@@ -65,11 +65,7 @@ function endsWith(str, suffix) {
 
 function run_one_benchmark(arg, iters) {
 
-    load(path + 'base.js');
-    load(arg);
-
     var file_name;
-
     var file = arg.split('/');
     if (file.length == 1) {
         file = arg.split('\\');
@@ -80,9 +76,17 @@ function run_one_benchmark(arg, iters) {
 	file.pop();
     }
     file_name = file[file.length - 1];
+
+    if (typeof compile_only !== 'undefined') {
+	print("Compiling... " + file_name);
+    }
+
+    load(path + 'base.js');
+    load(arg);
     
     if (typeof compile_only !== 'undefined') {
 	print("Compiled OK: " + file_name);
+	print("");
 	return;
     }
     
diff --git a/nashorn/test/script/basic/typecoerce.js b/nashorn/test/script/basic/typecoerce.js
new file mode 100644
index 00000000000..ba95e6adf14
--- /dev/null
+++ b/nashorn/test/script/basic/typecoerce.js
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * There was a bug in the old Lower that didn't fully propagate type information
+ * by way of assignment. 'q' in the example below would have finished a double
+ * even though it can get an object value through the assignment 'q = l' 
+ * 
+ * Furthermore, this caused type coercion to be done at q = l, and not a q = q * 2, 
+ * which is a bug. This test ensures it happens in the correct order
+ *
+ * @test
+ * @run
+ */
+
+function createObject() {
+    var obj = { valueOf: function() { print("toNumber coercion"); return 17; }}
+    return obj;
+}
+
+function f() {
+    var l = 1.2; //number
+    var q = 2.3; //number
+    for (var i = 0; i < 2; i++) {
+	q = l; // q = toNumber(l), no coercion here
+	print("assignment done");
+	q = q * 2; // q = q * 2, coercion here
+	print("multiplication done");
+	l = createObject();
+    }
+}
+
+f();
diff --git a/nashorn/test/script/basic/typecoerce.js.EXPECTED b/nashorn/test/script/basic/typecoerce.js.EXPECTED
new file mode 100644
index 00000000000..619fc74f8f7
--- /dev/null
+++ b/nashorn/test/script/basic/typecoerce.js.EXPECTED
@@ -0,0 +1,5 @@
+assignment done
+multiplication done
+assignment done
+toNumber coercion
+multiplication done

From 8cd63a75f278fd3c8de4d5252355bb37a1280b80 Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Wed, 30 Jan 2013 17:52:54 +0530
Subject: [PATCH 102/311] 8007132: Java objects returned from constructor
 functions are lost

Reviewed-by: hannesw, lagergren, attila
---
 .../internal/runtime/ScriptFunction.java      |  2 +-
 nashorn/test/script/basic/JDK-8007132.js      | 54 +++++++++++++++++++
 2 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 nashorn/test/script/basic/JDK-8007132.js

diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
index 41fa730bba8..3979814d207 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
@@ -892,7 +892,7 @@ public abstract class ScriptFunction extends ScriptObject {
 
     @SuppressWarnings("unused")
     private static Object newFilter(final Object result, final Object allocation) {
-        return result instanceof ScriptObject ? result : allocation;
+        return (result instanceof ScriptObject || !JSType.isPrimitive(result))? result : allocation;
     }
 
     /**
diff --git a/nashorn/test/script/basic/JDK-8007132.js b/nashorn/test/script/basic/JDK-8007132.js
new file mode 100644
index 00000000000..363b1080dd0
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8007132.js
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/**
+ * JDK-8007232: Java objects returned from constructor functions are lost
+ *
+ * @test
+ * @run
+ */
+
+function Func() {
+    return new java.util.HashMap();
+}
+
+var f = new Func();
+if (! (f instanceof java.util.Map)) {
+    fail("instance of java.util.Map expected")
+}
+
+function check(obj) {
+    if (typeof obj != 'object') {
+        fail("expected 'object' but got " + (typeof obj));
+    }
+}
+
+// check primitive returning constructors
+check(new (function() { return 22; }));
+check(new (function() { return false }));
+check(new (function() { return "hello" }));
+
+// check null and undefined returning constructors
+check(new (function() { return null; }));
+check(new (function() { return undefined; }));

From 411b70d54a84467fabed67d7d147b45db9da596e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Wed, 30 Jan 2013 14:57:19 +0100
Subject: [PATCH 103/311] 8007109: Regression: String(ConsString) does not
 flatten argument to String

Reviewed-by: sundar, lagergren
---
 .../internal/objects/NativeString.java        |  6 +--
 nashorn/test/script/basic/consstring.js       | 40 +++++++++++++++++++
 .../internal/test/models/StringArgs.java      | 39 ++++++++++++++++++
 3 files changed, 82 insertions(+), 3 deletions(-)
 create mode 100644 nashorn/test/script/basic/consstring.js
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/test/models/StringArgs.java

diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeString.java b/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
index f9c836cc0f4..6895426f298 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
@@ -1096,8 +1096,8 @@ public final class NativeString extends ScriptObject {
      */
     @SpecializedConstructor
     public static Object constructor(final boolean newObj, final Object self, final Object arg) {
-        final CharSequence cs = JSType.toCharSequence(arg);
-        return newObj ? newObj(self, cs) : cs;
+        final CharSequence str = JSType.toCharSequence(arg);
+        return newObj ? newObj(self, str) : str.toString();
     }
 
     /**
@@ -1113,7 +1113,7 @@ public final class NativeString extends ScriptObject {
      */
     @SpecializedConstructor
     public static Object constructor(final boolean newObj, final Object self, final int arg) {
-        final CharSequence str = JSType.toCharSequence(arg);
+        final String str = JSType.toString(arg);
         return newObj ? newObj(self, str) : str;
     }
 
diff --git a/nashorn/test/script/basic/consstring.js b/nashorn/test/script/basic/consstring.js
new file mode 100644
index 00000000000..b8dc51d88f5
--- /dev/null
+++ b/nashorn/test/script/basic/consstring.js
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Conversion of ConsString to String
+ *
+ * @test
+ * @run
+ */
+
+var list = new java.util.ArrayList();
+var str = "foo";
+
+list.add(str);                               // plain string
+list.add(String(str + "1"));                 // String() called as function
+list.add(String(new String(str + "2")));     // String() called as function with String object
+list.add((str + "3").toString());            // toString() called on primitive string
+list.add(new String(str + "4").toString());  // toString() called on String object
+
+Packages.jdk.nashorn.internal.test.models.StringArgs.checkString(list);
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/models/StringArgs.java b/nashorn/test/src/jdk/nashorn/internal/test/models/StringArgs.java
new file mode 100644
index 00000000000..8ecdbfd3a4b
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/test/models/StringArgs.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.test.models;
+
+import java.util.List;
+
+public class StringArgs {
+
+    public static void checkString(List<?> list) {
+        for (Object s : list) {
+            if (!(s instanceof String)) {
+                throw new AssertionError("Not a String: " + s);
+            }
+        }
+    }
+}

From fcd28bdcc5af9725242b7ac12821fc82cd425f34 Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Wed, 30 Jan 2013 21:15:14 +0530
Subject: [PATCH 104/311] 8007140: Java.extend crashes when attempting to
 extend java.lang.Object

Reviewed-by: lagergren, hannesw
---
 .../runtime/linker/JavaAdapterFactory.java    |   4 +-
 nashorn/test/script/basic/JDK-8006424.js      |  23 ++++
 nashorn/test/script/basic/JDK-8007140.js      | 115 ++++++++++++++++++
 3 files changed, 140 insertions(+), 2 deletions(-)
 create mode 100644 nashorn/test/script/basic/JDK-8007140.js

diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
index 9c1d75a7cf2..f4b4ad2054d 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
@@ -286,8 +286,8 @@ public final class JavaAdapterFactory {
 
     private static String getGeneratedClassName(final Class<?> superType, final List<Class<?>> interfaces) {
         // The class we use to primarily name our adapter is either the superclass, or if it is Object (meaning we're
-        // just implementing interfaces), then the first implemented interface.
-        final Class<?> namingType = superType == Object.class ? interfaces.get(0) : superType;
+        // just implementing interfaces or extending Object), then the first implemented interface or Object.
+        final Class<?> namingType = superType == Object.class ? (interfaces.isEmpty()? Object.class : interfaces.get(0)) : superType;
         final Package pkg = namingType.getPackage();
         final String namingTypeName = Type.getInternalName(namingType);
         final StringBuilder buf = new StringBuilder();
diff --git a/nashorn/test/script/basic/JDK-8006424.js b/nashorn/test/script/basic/JDK-8006424.js
index fab94b11f55..88516e13741 100644
--- a/nashorn/test/script/basic/JDK-8006424.js
+++ b/nashorn/test/script/basic/JDK-8006424.js
@@ -1,3 +1,26 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
 /**
  * JDK-8006424 : Passing null or undefined to adapter class constructors results in NPE or ClassCastException
  *
diff --git a/nashorn/test/script/basic/JDK-8007140.js b/nashorn/test/script/basic/JDK-8007140.js
new file mode 100644
index 00000000000..28b419197b5
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8007140.js
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8007140: Java.extend crashes when attempting to extend java.lang.Object
+ *
+ * @test
+ * @run
+ */
+
+
+// try various Java.extend cases
+
+// Single interface
+var runReached = false;
+var r = new (Java.extend(java.lang.Runnable)) {
+    run: function() {
+        runReached = true;
+    }
+};
+
+r.run();
+if (! runReached) {
+    fail("run was not called");
+}
+
+if (! (r instanceof java.lang.Runnable)) {
+    fail("r is not a Runnable");
+}
+
+// Multiple intefaces
+var runReached = false;
+var actionPerformedReached = false;
+
+var obj = new (Java.extend(java.awt.event.ActionListener, java.lang.Runnable)) {
+    actionPerformed : function(e) {
+        actionPerformedReached = true;
+    },
+
+    run: function() {
+        runReached = true;
+    }
+};
+
+obj.actionPerformed(null);
+if (! actionPerformedReached) {
+    fail("actionPerformed was not called");
+}
+
+obj.run();
+if (! runReached) {
+    fail("run was not called");
+}
+
+if (! (obj instanceof java.lang.Runnable)) {
+    fail("obj is not a Runnable");
+}
+
+if (! (obj instanceof java.awt.event.ActionListener)) {
+    fail("obj is not an ActionListener");
+}
+
+// Single class
+var obj = new (Java.extend(java.lang.Object)) {
+    toString: function() { return "I am an Object"; }
+};
+
+if (! (obj instanceof java.lang.Object)) {
+    fail("obj is not an instance of java.lang.Object");
+}
+
+if (obj.toString() != "I am an Object") {
+    fail("Object.toString did not get called");
+}
+
+// Single class and single interface
+var runReached = false;
+var obj = new (Java.extend(java.lang.Object, java.lang.Runnable)) {
+    run: function() {
+        runReached = true;
+    },
+
+    hashCode: function() {
+        return 12;
+    }
+};
+
+obj.run();
+if (! runReached) {
+    fail("run was not called");
+}
+
+if (obj.hashCode() != 12) {
+    fail("hashCode does not return 12");
+}

From bdcffc23f7d510197930056340e7d400e1c5a33a Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Thu, 31 Jan 2013 20:07:40 +0530
Subject: [PATCH 105/311] 8007286: Add JavaAdapter and importPackage to
 compatibility script

Reviewed-by: lagergren, jlaskey
---
 .../api/scripting/NashornException.java       |   3 +
 .../api/scripting/NashornScriptEngine.java    |  43 +------
 .../nashorn/api/scripting/resources/engine.js |  10 --
 .../nashorn/internal/parser/TokenLookup.java  |   2 +-
 .../nashorn/internal/parser/TokenType.java    |   2 +-
 .../internal/runtime/ECMAException.java       |   8 +-
 .../internal/runtime/PropertyHashMap.java     |   2 +-
 .../internal/runtime/ScriptObject.java        |  10 +-
 .../runtime/resources/mozilla_compat.js       |  50 ++++++++
 nashorn/test/script/basic/importpackage.js    |  59 +++++++++
 nashorn/test/script/basic/javaadapter.js      | 119 ++++++++++++++++++
 11 files changed, 242 insertions(+), 66 deletions(-)
 create mode 100644 nashorn/test/script/basic/importpackage.js
 create mode 100644 nashorn/test/script/basic/javaadapter.js

diff --git a/nashorn/src/jdk/nashorn/api/scripting/NashornException.java b/nashorn/src/jdk/nashorn/api/scripting/NashornException.java
index 75a62a802f4..eae8c3bf127 100644
--- a/nashorn/src/jdk/nashorn/api/scripting/NashornException.java
+++ b/nashorn/src/jdk/nashorn/api/scripting/NashornException.java
@@ -44,6 +44,9 @@ public class NashornException extends RuntimeException {
     // script column number
     private int         column;
 
+    // script source name used for "engine.js"
+    protected static final String ENGINE_SCRIPT_SOURCE_NAME = "nashorn:engine/resources/engine.js";
+
     /**
      * Constructor
      *
diff --git a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
index 34425883dff..02b7e911bbd 100644
--- a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
+++ b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
@@ -242,41 +242,6 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
         return UNDEFINED;
     }
 
-    /**
-     * This hook is used to call js global functions exposed from Java code.
-     *
-     * @param self 'this' passed from the script
-     * @param ctxt current ScriptContext in which method is searched
-     * @param name name of the method
-     * @param args arguments to be passed to the method
-     * @return return value of the called method
-     */
-    public Object __noSuchMethod__(final Object self, final ScriptContext ctxt, final String name, final Object args) {
-        final int scope = ctxt.getAttributesScope(name);
-        final ScriptObject ctxtGlobal = getNashornGlobalFrom(ctxt);
-        Object value;
-
-        if (scope != -1) {
-            value = ctxt.getAttribute(name, scope);
-        } else {
-            if (self == UNDEFINED) {
-                referenceError(ctxtGlobal, "not.defined", name);
-            } else {
-                typeError(ctxtGlobal, "no.such.function", name, ScriptRuntime.safeToString(ctxtGlobal));
-            }
-            return UNDEFINED;
-        }
-
-        value = ScriptObjectMirror.unwrap(value, ctxtGlobal);
-        if (value instanceof ScriptFunction) {
-            return ScriptObjectMirror.unwrap(ScriptRuntime.apply((ScriptFunction)value, ctxtGlobal, args), ctxtGlobal);
-        }
-
-        typeError(ctxtGlobal, "not.a.function", ScriptRuntime.safeToString(name));
-
-        return UNDEFINED;
-    }
-
     private ScriptObject getNashornGlobalFrom(final ScriptContext ctxt) {
         final Bindings bindings = ctxt.getBindings(ScriptContext.ENGINE_SCOPE);
         if (bindings instanceof ScriptObjectMirror) {
@@ -320,10 +285,10 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
     }
 
     private void evalEngineScript() throws ScriptException {
-        evalSupportScript("resources/engine.js");
+        evalSupportScript("resources/engine.js", NashornException.ENGINE_SCRIPT_SOURCE_NAME);
     }
 
-    private void evalSupportScript(final String script) throws ScriptException {
+    private void evalSupportScript(final String script, final String name) throws ScriptException {
         try {
             final InputStream is = AccessController.doPrivileged(
                     new PrivilegedExceptionAction<InputStream>() {
@@ -333,7 +298,7 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
                             return url.openStream();
                         }
                     });
-            put(ScriptEngine.FILENAME, "<engine>:" + script);
+            put(ScriptEngine.FILENAME, name);
             try (final InputStreamReader isr = new InputStreamReader(is)) {
                 eval(isr);
             }
@@ -427,7 +392,7 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
             // NOTE: FIXME: If this is jrunscript's init.js, we want to run the replacement.
             // This should go away once we fix jrunscript's copy of init.js.
             if ("<system-init>".equals(fileName)) {
-                evalSupportScript("resources/init.js");
+                evalSupportScript("resources/init.js", "nashorn:engine/resources/init.js");
                 return null;
             }
 
diff --git a/nashorn/src/jdk/nashorn/api/scripting/resources/engine.js b/nashorn/src/jdk/nashorn/api/scripting/resources/engine.js
index b71f5243713..65b82dfe797 100644
--- a/nashorn/src/jdk/nashorn/api/scripting/resources/engine.js
+++ b/nashorn/src/jdk/nashorn/api/scripting/resources/engine.js
@@ -39,16 +39,6 @@ Object.defineProperty(this, "__noSuchProperty__", {
     }
 });
 
-Object.defineProperty(this, "__noSuchMethod__", {
-    configurable: true,
-    enumerable: false,
-    writable: true,
-    value: function (name, args) {
-        'use strict';
-        return engine.__noSuchMethod__(this, context, name, args);
-    }
-});
-
 function print(str) {
     var writer = context.getWriter();
     if (! (writer instanceof java.io.PrintWriter)) {
diff --git a/nashorn/src/jdk/nashorn/internal/parser/TokenLookup.java b/nashorn/src/jdk/nashorn/internal/parser/TokenLookup.java
index 1598b41b09e..56bd37c4898 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/TokenLookup.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/TokenLookup.java
@@ -32,7 +32,7 @@ import static jdk.nashorn.internal.parser.TokenType.IDENT;
  * Fast lookup of operators and keywords.
  *
  */
-public class TokenLookup {
+public final class TokenLookup {
     /**
      * Lookup table for tokens.
      */
diff --git a/nashorn/src/jdk/nashorn/internal/parser/TokenType.java b/nashorn/src/jdk/nashorn/internal/parser/TokenType.java
index d8a0dbdb59f..8cc0ee332db 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/TokenType.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/TokenType.java
@@ -275,7 +275,7 @@ public enum TokenType {
         return name != null && name.length() > 0 && name.charAt(0) == c;
     }
 
-    public static TokenType[] getValues() {
+    static TokenType[] getValues() {
        return values;
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ECMAException.java b/nashorn/src/jdk/nashorn/internal/runtime/ECMAException.java
index c554cd34755..04082455732 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ECMAException.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ECMAException.java
@@ -58,15 +58,9 @@ public final class ECMAException extends NashornException {
 
     /** We assume that compiler generates script classes into the known package. */
     private static final String scriptPackage;
-
-    /** Package (internal) name where Nashorn script engine implementation lives */
-    private static final String enginePackageInternal;
-
     static {
         String name = JS$.class.getName();
         scriptPackage = name.substring(0, name.lastIndexOf('.'));
-        name = NashornScriptEngine.class.getName();
-        enginePackageInternal = name.substring(0, name.lastIndexOf('.')).replace(".", "/");
     }
 
     /** Object thrown. */
@@ -168,7 +162,7 @@ public final class ECMAException extends NashornException {
              * also, we don't want to report JavaScript code that lives in script engine implementation
              * We want to report only user's own scripts and not any of our own scripts like "engine.js"
              */
-            return source != null && !source.endsWith(".java") && !source.contains(enginePackageInternal);
+            return source != null && !source.endsWith(".java") && !source.contains(ENGINE_SCRIPT_SOURCE_NAME);
         }
         return false;
     }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/PropertyHashMap.java b/nashorn/src/jdk/nashorn/internal/runtime/PropertyHashMap.java
index 2ae1820dc9f..9759caa2c86 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/PropertyHashMap.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/PropertyHashMap.java
@@ -268,7 +268,7 @@ public final class PropertyHashMap implements Map <String, Property> {
      *
      * @return Array of all properties.
      */
-    public Property[] getProperties() {
+    Property[] getProperties() {
         if (properties == null) {
             final Property[] array = new Property[size];
             int i = size;
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
index 2536f7c932f..86bc0afcd4f 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
@@ -1937,11 +1937,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
         final boolean      scopeCall = isScope() && NashornCallSiteDescriptor.isScope(desc);
 
         if (find == null) {
-            if (scopeCall) {
-                ECMAErrors.referenceError("not.defined", name);
-                throw new AssertionError(); // never reached
-            }
-            return createEmptyGetter(desc, name);
+            return noSuchProperty(desc, request);
         }
 
         final ScriptFunction func = (ScriptFunction)getObjectValue(find);
@@ -3335,10 +3331,10 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
     }
 
     /** This is updated only in debug mode - counts number of {@code ScriptObject} instances created */
-    protected static int count;
+    private static int count;
 
     /** This is updated only in debug mode - counts number of {@code ScriptObject} instances created that are scope */
-    protected static int scopeCount;
+    private static int scopeCount;
 
     /**
      * Get number of {@code ScriptObject} instances created. If not running in debug
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js b/nashorn/src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js
index fa16a173978..15c67f9419b 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js
+++ b/nashorn/src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js
@@ -27,6 +27,56 @@
  * often used functionality is supported.
  */
 
+// JavaAdapter
+Object.defineProperty(this, "JavaAdapter", {
+    configurable: true, enumerable: false, writable: true,
+    value: function() {
+        if (arguments.length < 2) {
+            throw new TypeError("JavaAdapter requires atleast two arguments");
+        }
+            
+        var types = Array.prototype.slice.call(arguments, 0, arguments.length - 1);
+        var NewType = Java.extend.apply(Java, types);
+        return new NewType(arguments[arguments.length - 1]);
+    }
+});
+
+// importPackage
+Object.defineProperty(this, "importPackage", {
+    configurable: true, enumerable: false, writable: true,
+    value: (function() {
+        var _packages = [];
+        var global = this;
+        var oldNoSuchProperty = global.__noSuchProperty__;
+        global.__noSuchProperty__ = function(name) {
+            for (var i in _packages) {
+                try {
+                    var type = Java.type(_packages[i] + "." + name);
+                    global[name] = type;
+                    return type;
+                } catch (e) {}
+            }
+            
+            return oldNoSuchProperty? oldNoSuchProperty(name) : undefined;
+        }
+        
+        var prefix = "[JavaPackage ";
+        return function() {
+            for (var i in arguments) {
+                var pkgName = arguments[i];
+                if ((typeof pkgName) != 'string') {
+                    pkgName = String(pkgName);
+                    // extract name from JavaPackage object
+                    if (pkgName.startsWith(prefix)) {
+                        pkgName = pkgName.substring(prefix.length, pkgName.length - 1);
+                    }
+                }
+                _packages.push(pkgName);
+            }
+        }
+    })()
+});
+
 // Object.prototype.__defineGetter__
 Object.defineProperty(Object.prototype, "__defineGetter__", {
     configurable: true, enumerable: false, writable: true,
diff --git a/nashorn/test/script/basic/importpackage.js b/nashorn/test/script/basic/importpackage.js
new file mode 100644
index 00000000000..9a2b3a3e8c3
--- /dev/null
+++ b/nashorn/test/script/basic/importpackage.js
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Test to check importPackage function.
+ *
+ * @test
+ * @run
+ */
+
+try {
+    load("nashorn:mozilla_compat.js");
+} catch (e) {
+}
+
+importPackage(java.util);
+
+var m = new HashMap();
+if (!(m instanceof java.util.HashMap)) {
+    fail("expected 'm' to be a java.util.HashMap instance");
+}
+
+function checkJavaClass(cls) {
+    if (! Java.isType(cls)) {
+        fail(cls + " is not a Java class");
+    }
+}
+
+importPackage(java.lang.reflect, javax.script);
+checkJavaClass(Method);
+checkJavaClass(Field);
+checkJavaClass(Constructor);
+checkJavaClass(ScriptContext);
+checkJavaClass(ScriptEngine);
+
+var bindings = new SimpleBindings();
+if (!(bindings instanceof javax.script.SimpleBindings)) {
+    fail("expected 'bindings' to be a javax.script.SimpleBindings instance");
+}
diff --git a/nashorn/test/script/basic/javaadapter.js b/nashorn/test/script/basic/javaadapter.js
new file mode 100644
index 00000000000..484a5d24d61
--- /dev/null
+++ b/nashorn/test/script/basic/javaadapter.js
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Test to check JavaAdapter constructor.
+ *
+ * @test
+ * @run
+ */
+
+try {
+    load("nashorn:mozilla_compat.js");
+} catch (e) {
+}
+
+// try various JavaAdapter cases
+
+// Single interface
+var runReached = false;
+var r = new JavaAdapter(java.lang.Runnable) {
+    run: function() {
+        runReached = true;
+    }
+};
+
+r.run();
+if (! runReached) {
+    fail("run was not called");
+}
+
+if (! (r instanceof java.lang.Runnable)) {
+    fail("r is not a Runnable");
+}
+
+// Multiple intefaces
+var runReached = false;
+var actionPerformedReached = false;
+
+var obj = new JavaAdapter(java.awt.event.ActionListener, java.lang.Runnable) {
+    actionPerformed : function(e) {
+        actionPerformedReached = true;
+    },
+
+    run: function() {
+        runReached = true;
+    }
+};
+
+obj.actionPerformed(null);
+if (! actionPerformedReached) {
+    fail("actionPerformed was not called");
+}
+
+obj.run();
+if (! runReached) {
+    fail("run was not called");
+}
+
+if (! (obj instanceof java.lang.Runnable)) {
+    fail("obj is not a Runnable");
+}
+
+if (! (obj instanceof java.awt.event.ActionListener)) {
+    fail("obj is not an ActionListener");
+}
+
+// Single class
+var obj = new JavaAdapter(java.lang.Object) {
+    toString: function() { return "I am an Object"; }
+};
+
+if (! (obj instanceof java.lang.Object)) {
+    fail("obj is not an instance of java.lang.Object");
+}
+
+if (obj.toString() != "I am an Object") {
+    fail("Object.toString did not get called");
+}
+
+// Single class and single interface
+var runReached = false;
+var obj = new JavaAdapter(java.lang.Object, java.lang.Runnable) {
+    run: function() {
+        runReached = true;
+    },
+
+    hashCode: function() {
+        return 12;
+    }
+};
+
+obj.run();
+if (! runReached) {
+    fail("run was not called");
+}
+
+if (obj.hashCode() != 12) {
+    fail("hashCode does not return 12");
+}

From fe52eb5992ed659d59e625d81fbc88d6d4ef4636 Mon Sep 17 00:00:00 2001
From: Attila Szegedi <attila@openjdk.org>
Date: Thu, 31 Jan 2013 18:34:42 +0100
Subject: [PATCH 106/311] 8006529: Methods always get callee - it should be
 conditional

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
---
 .../jdk/nashorn/internal/codegen/Attr.java    |  45 ++--
 .../internal/codegen/CodeGenerator.java       | 136 ++++++++----
 .../nashorn/internal/codegen/Compiler.java    |   5 +-
 .../internal/codegen/FinalizeTypes.java       |  15 +-
 .../jdk/nashorn/internal/codegen/Lower.java   |  11 +-
 .../internal/codegen/MethodEmitter.java       |  77 ++++++-
 .../codegen/objects/FieldObjectCreator.java   |  26 ++-
 .../objects/FunctionObjectCreator.java        |  12 +-
 .../nashorn/internal/codegen/types/Type.java  |   6 +-
 .../src/jdk/nashorn/internal/ir/Block.java    |   2 +-
 .../jdk/nashorn/internal/ir/FunctionNode.java | 199 ++++++++++++------
 .../src/jdk/nashorn/internal/ir/Symbol.java   |  12 +-
 .../jdk/nashorn/internal/objects/Global.java  |   2 +-
 .../internal/objects/NativeArguments.java     |   3 +-
 .../internal/objects/ScriptFunctionImpl.java  |  11 +
 .../jdk/nashorn/internal/parser/Parser.java   |  15 +-
 .../internal/runtime/ArgumentSetter.java      |  67 ++++++
 .../internal/runtime/ScriptFunction.java      |  51 +++--
 .../internal/runtime/ScriptRuntime.java       |   3 +-
 nashorn/test/script/basic/JDK-8006529-b.js    |  65 ++++++
 .../script/basic/JDK-8006529-b.js.EXPECTED    |   4 +
 nashorn/test/script/basic/JDK-8006529.js      | 158 ++++++++++++++
 .../internal/codegen/CompilerAccess.java      |  35 +++
 23 files changed, 777 insertions(+), 183 deletions(-)
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/ArgumentSetter.java
 create mode 100644 nashorn/test/script/basic/JDK-8006529-b.js
 create mode 100644 nashorn/test/script/basic/JDK-8006529-b.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/JDK-8006529.js
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/codegen/CompilerAccess.java

diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Attr.java b/nashorn/src/jdk/nashorn/internal/codegen/Attr.java
index 82e7c035992..9c2c6fb34f6 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Attr.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Attr.java
@@ -45,7 +45,6 @@ import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
-
 import jdk.nashorn.internal.codegen.types.Type;
 import jdk.nashorn.internal.ir.AccessNode;
 import jdk.nashorn.internal.ir.BinaryNode;
@@ -413,6 +412,13 @@ final class Attr extends NodeOperatorVisitor {
             // we have never seen this before, it can be undefined
             newType(symbol, Type.OBJECT); // TODO unknown -we have explicit casts anyway?
             symbol.setCanBeUndefined();
+            symbol.setIsScope();
+        }
+
+        if(symbol.isGlobal()) {
+            getCurrentFunctionNode().setUsesGlobalSymbol();
+        } else if(symbol.isScope()) {
+            getCurrentFunctionNode().setUsesScopeSymbol(symbol);
         }
 
         if (symbol != oldSymbol && !identNode.isInitializedHere()) {
@@ -666,7 +672,9 @@ final class Attr extends NodeOperatorVisitor {
             }
             final Node literalNode = LiteralNode.newInstance(unaryNode, name).accept(this);
 
-            args.add(currentFunctionNode.getScopeNode());
+            if (!failDelete) {
+                args.add(currentFunctionNode.getScopeNode());
+            }
             args.add(literalNode);
             args.add(strictFlagNode);
 
@@ -1157,21 +1165,24 @@ final class Attr extends NodeOperatorVisitor {
         //return symbol is always object as it's the __return__ thing. What returnType is is another matter though
     }
 
-    private static void initVarArg(final FunctionNode functionNode) {
-        assert functionNode.getCalleeNode() != null;
+    private void initVarArg(final FunctionNode functionNode) {
+        if (functionNode.isVarArg()) {
+            final Symbol varArgsSymbol = functionNode.defineSymbol(VARARGS.tag(), IS_PARAM | IS_INTERNAL, null);
+            varArgsSymbol.setTypeOverride(Type.OBJECT_ARRAY);
+            varArgsSymbol.setNeedsSlot(true);
+            functionNode.getVarArgsNode().setSymbol(varArgsSymbol);
+            LOG.info("Initialized varargs symbol: " + varArgsSymbol);
 
-        final Symbol varArgsSymbol = functionNode.defineSymbol(VARARGS.tag(), IS_PARAM | IS_INTERNAL, null);
-        newType(varArgsSymbol, Type.OBJECT_ARRAY);
-        varArgsSymbol.setNeedsSlot(true);
-        functionNode.getVarArgsNode().setSymbol(varArgsSymbol);
-        LOG.info("Initialized varargs symbol: " + varArgsSymbol);
-
-        final String    argumentsName   = functionNode.getArgumentsNode().getName();
-        final Symbol    argumentsSymbol = functionNode.defineSymbol(argumentsName, IS_PARAM | IS_INTERNAL, null);
-        newType(argumentsSymbol, Type.OBJECT);
-        argumentsSymbol.setNeedsSlot(true);
-        functionNode.getArgumentsNode().setSymbol(argumentsSymbol);
-        LOG.info("Initialized vararg varArgsSymbol=" + varArgsSymbol + " argumentsSymbol=" + argumentsSymbol);
+            if (functionNode.needsArguments()) {
+                final String    argumentsName   = functionNode.getArgumentsNode().getName();
+                final Symbol    argumentsSymbol = functionNode.defineSymbol(argumentsName, IS_VAR | IS_INTERNAL, null);
+                newType(argumentsSymbol, Type.typeFor(ScriptObject.class));
+                argumentsSymbol.setNeedsSlot(true);
+                functionNode.getArgumentsNode().setSymbol(argumentsSymbol);
+                addLocalDef(argumentsName);
+                LOG.info("Initialized vararg varArgsSymbol=" + varArgsSymbol + " argumentsSymbol=" + argumentsSymbol);
+            }
+        }
     }
 
     private static void initCallee(final FunctionNode functionNode) {
@@ -1238,7 +1249,7 @@ final class Attr extends NodeOperatorVisitor {
             LOG.info("parameter specialization possible: " + functionNode.getName() + " " + paramSpecializations);
         }
 
-        // parameters should not be slots for a vararg function, make sure this is the case
+        // parameters should not be slots for a function that uses variable arity signature
         if (functionNode.isVarArg()) {
             for (final IdentNode param : functionNode.getParameters()) {
                 param.getSymbol().setNeedsSlot(false);
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
index 4a21ca8ffaf..00ceb4defd4 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
@@ -201,6 +201,9 @@ public final class CodeGenerator extends NodeOperatorVisitor {
         final Symbol symbol = identNode.getSymbol();
 
         if (!symbol.isScope()) {
+            if(symbol.isParam()) {
+                return method.loadParam(symbol);
+            }
             assert symbol.hasSlot() && symbol.getSlot() != 0 || symbol.isThis();
             return method.load(symbol);
         }
@@ -383,7 +386,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
         for (final Symbol symbol : symbols) {
             /*
              * The following symbols are guaranteed to be defined and thus safe
-             * from having unsigned written to them: parameters internals this
+             * from having undefined written to them: parameters internals this
              *
              * Otherwise we must, unless we perform control/escape analysis,
              * assign them undefined.
@@ -843,6 +846,15 @@ public final class CodeGenerator extends NodeOperatorVisitor {
         /* Fix the predefined slots so they have numbers >= 0, like varargs. */
         frame.realign();
 
+        if (isFunctionNode) {
+            if (function.needsParentScope()) {
+                initParentScope();
+            }
+            if (function.needsArguments()) {
+                initArguments(function);
+            }
+        }
+
         /*
          * Determine if block needs scope, if not, just do initSymbols for this block.
          */
@@ -851,7 +863,6 @@ public final class CodeGenerator extends NodeOperatorVisitor {
              * Determine if function is varargs and consequently variables have to
              * be in the scope.
              */
-            final boolean isVarArg    = function.isVarArg();
             final boolean varsInScope = function.varsInScope();
 
             // TODO for LET we can do better: if *block* does not contain any eval/with, we don't need its vars in scope.
@@ -859,39 +870,34 @@ public final class CodeGenerator extends NodeOperatorVisitor {
             final List<String> nameList = new ArrayList<>();
             final List<Symbol> locals   = new ArrayList<>();
 
-            // If there are variable arguments, we need to load them (functions only).
-            if (isFunctionNode && isVarArg) {
-                method.loadVarArgs();
-                method.loadCallee();
-                method.load(function.getParameters().size());
-                globalAllocateArguments();
-                method.storeArguments();
-            }
 
             // Initalize symbols and values
             final List<Symbol> newSymbols = new ArrayList<>();
             final List<Symbol> values     = new ArrayList<>();
 
+            final boolean hasArguments = function.needsArguments();
             for (final Symbol symbol : symbols) {
                 if (symbol.isInternal() || symbol.isThis()) {
                     continue;
                 }
 
-                if (symbol.isVar() && (varsInScope || symbol.isScope())) {
+                if (symbol.isVar()) {
+                    if(varsInScope || symbol.isScope()) {
+                        nameList.add(symbol.getName());
+                        newSymbols.add(symbol);
+                        values.add(null);
+                        assert symbol.isScope()   : "scope for " + symbol + " should have been set in Lower already " + function.getName();
+                        assert !symbol.hasSlot()  : "slot for " + symbol + " should have been removed in Lower already" + function.getName();
+                    } else {
+                        assert symbol.hasSlot() : symbol + " should have a slot only, no scope";
+                        locals.add(symbol);
+                    }
+                } else if (symbol.isParam() && (varsInScope || hasArguments || symbol.isScope())) {
                     nameList.add(symbol.getName());
                     newSymbols.add(symbol);
-                    values.add(null);
-                    assert symbol.isScope()   : "scope for " + symbol + " should have been set in Lower already " + function.getName();
-                    assert !symbol.hasSlot()  : "slot for " + symbol + " should have been removed in Lower already" + function.getName();
-                } else if (symbol.isVar()) {
-                    assert symbol.hasSlot() : symbol + " should have a slot only, no scope";
-                    locals.add(symbol);
-                } else if (symbol.isParam() && (varsInScope || isVarArg || symbol.isScope())) {
-                    nameList.add(symbol.getName());
-                    newSymbols.add(symbol);
-                    values.add(isVarArg ? null : symbol);
-                    assert symbol.isScope()   : "scope for " + symbol + " should have been set in Lower already " + function.getName() + " varsInScope="+varsInScope+" isVarArg="+isVarArg+" symbol.isScope()=" + symbol.isScope();
-                    assert !(isVarArg && symbol.hasSlot())  : "slot for " + symbol + " should have been removed in Lower already " + function.getName();
+                    values.add(hasArguments ? null : symbol);
+                    assert symbol.isScope()   : "scope for " + symbol + " should have been set in Lower already " + function.getName() + " varsInScope="+varsInScope+" hasArguments="+hasArguments+" symbol.isScope()=" + symbol.isScope();
+                    assert !(hasArguments && symbol.hasSlot())  : "slot for " + symbol + " should have been removed in Lower already " + function.getName();
                 }
             }
 
@@ -901,15 +907,11 @@ public final class CodeGenerator extends NodeOperatorVisitor {
             // we may have locals that need to be initialized
             initSymbols(locals);
 
-            if (isFunctionNode) {
-                initScope();
-            }
-
             /*
              * Create a new object based on the symbols and values, generate
              * bootstrap code for object
              */
-            final FieldObjectCreator<Symbol> foc = new FieldObjectCreator<Symbol>(this, nameList, newSymbols, values, true, isVarArg) {
+            final FieldObjectCreator<Symbol> foc = new FieldObjectCreator<Symbol>(this, nameList, newSymbols, values, true, hasArguments) {
                 @Override
                 protected Type getValueType(final Symbol value) {
                     return value.getSymbolType();
@@ -919,6 +921,15 @@ public final class CodeGenerator extends NodeOperatorVisitor {
                 protected void loadValue(final Symbol value) {
                     method.load(value);
                 }
+
+                @Override
+                protected void loadScope(MethodEmitter m) {
+                    if(function.needsParentScope()) {
+                        m.loadScope();
+                    } else {
+                        m.loadNull();
+                    }
+                }
             };
             foc.makeObject(method);
 
@@ -929,18 +940,37 @@ public final class CodeGenerator extends NodeOperatorVisitor {
 
             method.storeScope();
         } else {
-            initSymbols(symbols);
-
-            if (isFunctionNode) {
-                initScope();
+            // Since we don't have a scope, parameters didn't get assigned array indices by the FieldObjectCreator, so
+            // we need to assign them separately here.
+            int nextParam = 0;
+            if (isFunctionNode && function.isVarArg()) {
+                for (final IdentNode param : function.getParameters()) {
+                    param.getSymbol().setFieldIndex(nextParam++);
+                }
             }
+            initSymbols(symbols);
         }
 
         // Debugging: print symbols? @see --print-symbols flag
         printSymbols(block, (isFunctionNode ? "Function " : "Block in ") + (function.getIdent() == null ? "<anonymous>" : function.getIdent().getName()));
     }
 
-    private void initScope() {
+    private void initArguments(final FunctionNode function) {
+        method.loadVarArgs();
+        if(function.needsCallee()) {
+            method.loadCallee();
+        } else {
+            // If function is strict mode, "arguments.callee" is not populated, so we don't necessarily need the
+            // caller.
+            assert function.isStrictMode();
+            method.loadNull();
+        }
+        method.load(function.getParameters().size());
+        globalAllocateArguments();
+        method.storeArguments();
+    }
+
+    private void initParentScope() {
         method.loadCallee();
         method.invoke(ScriptFunction.GET_SCOPE);
         method.storeScope();
@@ -1622,7 +1652,8 @@ public final class CodeGenerator extends NodeOperatorVisitor {
         final String name       = splitNode.getName();
 
         final Class<?>   rtype  = fn.getReturnType().getTypeClass();
-        final Class<?>[] ptypes = fn.isVarArg() ?
+        final boolean needsArguments = fn.needsArguments();
+        final Class<?>[] ptypes = needsArguments ?
                 new Class<?>[] {Object.class, ScriptFunction.class, ScriptObject.class, Object.class} :
                 new Class<?>[] {Object.class, ScriptFunction.class, ScriptObject.class};
 
@@ -1647,9 +1678,13 @@ public final class CodeGenerator extends NodeOperatorVisitor {
 
         final MethodEmitter caller = splitNode.getCaller();
         caller.loadThis();
-        caller.loadCallee();
+        if(fn.needsCallee()) {
+            caller.loadCallee();
+        } else {
+            caller.loadNull();
+        }
         caller.loadScope();
-        if (fn.isVarArg()) {
+        if (needsArguments) {
             caller.loadArguments();
         }
         caller.invoke(splitCall);
@@ -3141,18 +3176,35 @@ public final class CodeGenerator extends NodeOperatorVisitor {
             method.convert(target.getType());
 
             target.accept(new NodeVisitor(compileUnit, method) {
+                @Override
+                protected Node enterDefault(Node node) {
+                    throw new AssertionError("Unexpected node " + node + " in store epilogue");
+                };
+
+                @Override
+                public Node enter(final UnaryNode node) {
+                    if(node.tokenType() == TokenType.CONVERT && node.getSymbol() != null) {
+                        method.convert(node.rhs().getType());
+                    }
+                    return node;
+                }
+
                 @Override
                 public Node enter(final IdentNode node) {
-                    final Symbol symbol = target.getSymbol();
+                    final Symbol symbol = node.getSymbol();
                     if (symbol.isScope()) {
                         if (symbol.isFastScope(currentFunction)) {
-                            storeFastScopeVar(target.getType(), symbol, CALLSITE_SCOPE | getCallSiteFlags());
+                            storeFastScopeVar(node.getType(), symbol, CALLSITE_SCOPE | getCallSiteFlags());
                         } else {
-                            method.dynamicSet(target.getType(), node.getName(), CALLSITE_SCOPE | getCallSiteFlags());
+                            method.dynamicSet(node.getType(), node.getName(), CALLSITE_SCOPE | getCallSiteFlags());
                         }
                     } else {
-                        assert targetSymbol != null;
-                        method.store(targetSymbol);
+                        assert symbol != null;
+                        if(symbol.isParam()) {
+                            method.storeParam(symbol);
+                        } else {
+                            method.store(symbol);
+                        }
                     }
                     return null;
 
@@ -3203,7 +3255,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
     }
 
     private MethodEmitter globalAllocateArguments() {
-        return method.invokeStatic(Compiler.GLOBAL_OBJECT, "allocateArguments", methodDescriptor(Object.class, Object[].class, Object.class, int.class));
+        return method.invokeStatic(Compiler.GLOBAL_OBJECT, "allocateArguments", methodDescriptor(ScriptObject.class, Object[].class, Object.class, int.class));
     }
 
     private MethodEmitter globalNewRegExp() {
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java b/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
index addd33310dd..a70fc6924a2 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
@@ -111,8 +111,8 @@ public final class Compiler {
     /** Name of the Global object, cannot be referred to as .class, @see CodeGenerator */
     public static final String GLOBAL_OBJECT = OBJECTS_PACKAGE + '/' + "Global";
 
-    /** Name of the ScriptObjectImpl, cannot be referred to as .class @see FunctionObjectCreator */
-    public static final String SCRIPTOBJECT_IMPL_OBJECT = OBJECTS_PACKAGE + '/' + "ScriptFunctionImpl";
+    /** Name of the ScriptFunctionImpl, cannot be referred to as .class @see FunctionObjectCreator */
+    public static final String SCRIPTFUNCTION_IMPL_OBJECT = OBJECTS_PACKAGE + '/' + "ScriptFunctionImpl";
 
     /** Name of the Trampoline, cannot be referred to as .class @see FunctionObjectCreator */
     public static final String TRAMPOLINE_OBJECT = OBJECTS_PACKAGE + '/' + "Trampoline";
@@ -374,6 +374,7 @@ public final class Compiler {
                 LOG.info("Lowering '" + functionNode.getName() + "'");
                 functionNode.accept(new Lower(this));
                 state.add(State.LOWERED);
+                debugPrintAST();
 
                 LOG.info("Attributing types '" + functionNode.getName() + "'");
                 functionNode.accept(new Attr(this));
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/FinalizeTypes.java b/nashorn/src/jdk/nashorn/internal/codegen/FinalizeTypes.java
index 0bbe601fdd5..b9deb64eae7 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/FinalizeTypes.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/FinalizeTypes.java
@@ -27,7 +27,6 @@ package jdk.nashorn.internal.codegen;
 
 import java.util.HashSet;
 import java.util.List;
-
 import jdk.nashorn.internal.codegen.types.Type;
 import jdk.nashorn.internal.ir.AccessNode;
 import jdk.nashorn.internal.ir.Assignment;
@@ -425,6 +424,19 @@ final class FinalizeTypes extends NodeOperatorVisitor {
 
     @Override
     public Node enter(final FunctionNode functionNode) {
+        // If the function doesn't need a callee, we ensure its __callee__ symbol doesn't get a slot. We can't do
+        // this earlier, as access to scoped variables, self symbol, etc. in previous phases can all trigger the
+        // need for the callee.
+        if(!functionNode.needsCallee()) {
+            functionNode.getCalleeNode().getSymbol().setNeedsSlot(false);
+        }
+        // Similar reasoning applies to __scope__ symbol: if the function doesn't need either parent scope or its
+        // own scope, we ensure it doesn't get a slot, but we can't determine whether it needs a scope earlier than
+        // this phase.
+        if(!(functionNode.needsScope() || functionNode.needsParentScope())) {
+            functionNode.getScopeNode().getSymbol().setNeedsSlot(false);
+        }
+
         updateSymbols(functionNode);
         return functionNode;
     }
@@ -548,7 +560,6 @@ final class FinalizeTypes extends NodeOperatorVisitor {
      * @param block block for which to to finalize type info.
      */
     private static void updateSymbols(final Block block) {
-
         if (!block.needsScope()) {
             return; // nothing to do
         }
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Lower.java b/nashorn/src/jdk/nashorn/internal/codegen/Lower.java
index 1cb6b5bc6a2..712e076329e 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Lower.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Lower.java
@@ -38,7 +38,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Deque;
 import java.util.List;
-
 import jdk.nashorn.internal.ir.AccessNode;
 import jdk.nashorn.internal.ir.BaseNode;
 import jdk.nashorn.internal.ir.BinaryNode;
@@ -956,14 +955,16 @@ final class Lower extends NodeOperatorVisitor {
         final long token  = functionNode.getToken();
         final int  finish = functionNode.getFinish();
 
-        LOG.info("Init this, scope, result, callee, varargs and argument for " + functionNode.getName());
-
         functionNode.setThisNode(new IdentNode(source, token, finish, THIS.tag()));
         functionNode.setScopeNode(new IdentNode(source, token, finish, SCOPE.tag()));
         functionNode.setResultNode(new IdentNode(source, token, finish, SCRIPT_RETURN.tag()));
         functionNode.setCalleeNode(new IdentNode(source, token, finish, CALLEE.tag()));
-        functionNode.setVarArgsNode(new IdentNode(source, token, finish, VARARGS.tag()));
-        functionNode.setArgumentsNode(new IdentNode(source, token, finish, functionNode.hideArguments() ? compiler.uniqueName('$' + ARGUMENTS.tag()) : ARGUMENTS.tag()));
+        if(functionNode.isVarArg()) {
+            functionNode.setVarArgsNode(new IdentNode(source, token, finish, VARARGS.tag()));
+            if(functionNode.needsArguments()) {
+                functionNode.setArgumentsNode(new IdentNode(source, token, finish, ARGUMENTS.tag()));
+            }
+        }
     }
 
 }
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java b/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java
index 4599b9eb074..926e8fb4571 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java
@@ -86,10 +86,12 @@ import jdk.nashorn.internal.ir.LiteralNode;
 import jdk.nashorn.internal.ir.RuntimeNode;
 import jdk.nashorn.internal.ir.SplitNode;
 import jdk.nashorn.internal.ir.Symbol;
+import jdk.nashorn.internal.runtime.ArgumentSetter;
 import jdk.nashorn.internal.runtime.Context;
 import jdk.nashorn.internal.runtime.DebugLogger;
 import jdk.nashorn.internal.runtime.JSType;
 import jdk.nashorn.internal.runtime.Scope;
+import jdk.nashorn.internal.runtime.ScriptObject;
 import jdk.nashorn.internal.runtime.linker.Bootstrap;
 import jdk.nashorn.internal.runtime.options.Options;
 import org.dynalang.dynalink.support.NameCodec;
@@ -273,7 +275,7 @@ public class MethodEmitter implements Emitter {
      */
     private ArrayType popArray() {
         final Type type = stack.pop();
-        assert type.isArray();
+        assert type.isArray() : type;
         return (ArrayType)type;
     }
 
@@ -311,6 +313,7 @@ public class MethodEmitter implements Emitter {
      * @return the method emitter
      */
     public MethodEmitter _new(final String classDescriptor) {
+        debug("new", classDescriptor);
         method.visitTypeInsn(NEW, classDescriptor);
         pushType(Type.OBJECT);
         return this;
@@ -832,6 +835,42 @@ public class MethodEmitter implements Emitter {
         return this;
     }
 
+    /**
+     * Push a non-scope function parameter to the stack. Function parameters always arrive into a function as either
+     * explicit parameters on the stack, or collected into a final variable-arity {@code Object[]} parameter. If they
+     * end up being scoped (i.e. referenced from a child function or eval), then they're loaded as scoped symbols and
+     * this function is not invoked for them. If they aren't scoped, then they will be loaded from one of three places.
+     * First, if the function has an Arguments object, they're loaded from it. Otherwise, if the parameters come in a
+     * {@code Object[]} array, they are loaded from the array. Finally, if neither is the case, they're simply loaded
+     * from their bytecode slot.
+     *
+     * @param symbol the symbol representing the parameter.
+     *
+     * @return the method emitter
+     */
+    public MethodEmitter loadParam(final Symbol symbol) {
+        assert symbol != null && symbol.isParam() && !symbol.isScope();
+        if(symbol.hasSlot()) {
+            // Check that we aren't vararg, except if we're loading "this"
+            assert symbol.isThis() || !functionNode.isVarArg() : "Symbol=" + symbol + " functionNode=" + functionNode.getName();
+            // Just load it from a local variable
+            return load(symbol);
+        }
+        assert functionNode.isVarArg();
+        if(functionNode.needsArguments()) {
+            // ScriptObject.getArgument(int) on arguments
+            loadArguments();
+            load(symbol.getFieldIndex());
+            ScriptObject.GET_ARGUMENT.invoke(this);
+        } else {
+            // array load from __varargs__
+            loadVarArgs();
+            load(symbol.getFieldIndex());
+            arrayload();
+        }
+        return this;
+    }
+
     /**
      * Push a local variable to the stack, given an explicit bytecode slot
      * This is used e.g. for stub generation where we know where items like
@@ -917,7 +956,7 @@ public class MethodEmitter implements Emitter {
      * @return the method emitter
      */
     public MethodEmitter loadArguments() {
-        debug("load arguments " + functionNode.getVarArgsNode().getSymbol());
+        debug("load arguments ", functionNode.getArgumentsNode().getSymbol());
         assert functionNode.getArgumentsNode().getSymbol().getSlot() != 0;
         return load(functionNode.getArgumentsNode().getSymbol());
     }
@@ -999,6 +1038,40 @@ public class MethodEmitter implements Emitter {
         }
     }
 
+    /**
+     * Pop a value from the stack and store it in a non-scope function parameter. Function parameters always arrive into
+     * a function as either explicit parameters on th stack, or collected into a final variable-arity {@code Object[]}
+     * parameter. If they end up being scoped (i.e. referenced from a child function or eval), then they're stored as
+     * scoped symbols are and this function is not invoked for them. If they aren't scoped, then they will be stored
+     * to one of three places. First, if the function has an Arguments object, they're stored to it. Otherwise, if the
+     * parameters come in a {@code Object[]} array, they are stored to the array. Finally, if neither is the case,
+     * they're simply stored to their bytecode slot.
+     *
+     * @param symbol the symbol representing the parameter.
+     *
+     */
+    public void storeParam(final Symbol symbol) {
+        assert symbol != null && symbol.isParam() && !symbol.isScope();
+        if(symbol.hasSlot()) {
+            assert !functionNode.isVarArg();
+            // Just store it to a local variable
+            store(symbol);
+            return;
+        }
+        assert functionNode.isVarArg();
+        if(functionNode.needsArguments()) {
+            loadArguments();
+            load(symbol.getFieldIndex());
+            ArgumentSetter.SET_ARGUMENT.invoke(this);
+        } else {
+            // varargs without arguments object - just do array store to __varargs__
+            loadVarArgs();
+            load(symbol.getFieldIndex());
+            ArgumentSetter.SET_ARRAY_ELEMENT.invoke(this);
+        }
+    }
+
+
     /**
      * Pop a value from the stack and store it in a given local variable
      * slot.
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/objects/FieldObjectCreator.java b/nashorn/src/jdk/nashorn/internal/codegen/objects/FieldObjectCreator.java
index 3e6a69d8d1e..f6e1c262b87 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/objects/FieldObjectCreator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/objects/FieldObjectCreator.java
@@ -70,19 +70,27 @@ public abstract class FieldObjectCreator<T> extends ObjectCreator {
     /**
      * Constructor
      *
-     * @param codegen  code generator
-     * @param keys     keys for fields in object
-     * @param symbols  symbols for fields in object
-     * @param values   values (or null where no value) to be written to the fields
-     * @param isScope  is this a scope object
-     * @param isVarArg is this a vararg object
+     * @param codegen      code generator
+     * @param keys         keys for fields in object
+     * @param symbols      symbols for fields in object
+     * @param values       values (or null where no value) to be written to the fields
+     * @param isScope      is this a scope object
+     * @param hasArguments does the created object have an "arguments" object
      */
-    public FieldObjectCreator(final CodeGenerator codegen, final List<String> keys, final List<Symbol> symbols, final List<T> values, final boolean isScope, final boolean isVarArg) {
-        super(codegen, keys, symbols, isScope, isVarArg);
+    public FieldObjectCreator(final CodeGenerator codegen, final List<String> keys, final List<Symbol> symbols, final List<T> values, final boolean isScope, final boolean hasArguments) {
+        super(codegen, keys, symbols, isScope, hasArguments);
         this.values        = values;
         this.callSiteFlags = codegen.getCallSiteFlags();
     }
 
+    /**
+     * Loads the scope on the stack through the passed method emitter.
+     * @param method the method emitter to use
+     */
+    protected void loadScope(final MethodEmitter method) {
+        method.loadScope();
+    }
+
     /**
      * Construct an object.
      *
@@ -96,7 +104,7 @@ public abstract class FieldObjectCreator<T> extends ObjectCreator {
         loadMap(method); //load the map
 
         if (isScope()) {
-            method.loadScope();
+            loadScope(method);
 
             if (isVarArg()) {
                 method.loadArguments();
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/objects/FunctionObjectCreator.java b/nashorn/src/jdk/nashorn/internal/codegen/objects/FunctionObjectCreator.java
index 778ac48f812..fc916486b1f 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/objects/FunctionObjectCreator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/objects/FunctionObjectCreator.java
@@ -26,7 +26,7 @@
 package jdk.nashorn.internal.codegen.objects;
 
 import static jdk.nashorn.internal.codegen.ClassEmitter.Flag.HANDLE_STATIC;
-import static jdk.nashorn.internal.codegen.Compiler.SCRIPTOBJECT_IMPL_OBJECT;
+import static jdk.nashorn.internal.codegen.Compiler.SCRIPTFUNCTION_IMPL_OBJECT;
 import static jdk.nashorn.internal.codegen.CompilerConstants.ALLOCATE;
 import static jdk.nashorn.internal.codegen.CompilerConstants.SOURCE;
 import static jdk.nashorn.internal.codegen.CompilerConstants.constructorNoLookup;
@@ -93,10 +93,14 @@ public class FunctionObjectCreator extends ObjectCreator {
          * Instantiate the function object, must be referred to by name as
          * class is not available at compile time
          */
-        method._new(SCRIPTOBJECT_IMPL_OBJECT).dup();
+        method._new(SCRIPTFUNCTION_IMPL_OBJECT).dup();
         method.load(functionNode.isAnonymous() ? "" : identNode.getName());
         loadHandle(method, signature);
-        method.loadScope();
+        if(functionNode.needsParentScope()) {
+            method.loadScope();
+        } else {
+            method.loadNull();
+        }
         method.getStatic(compileUnit.getUnitClassName(), SOURCE.tag(), SOURCE.descriptor());
         method.load(token);
         method.loadHandle(getClassName(), ALLOCATE.tag(), methodDescriptor(ScriptObject.class, PropertyMap.class), EnumSet.of(HANDLE_STATIC));
@@ -111,7 +115,7 @@ public class FunctionObjectCreator extends ObjectCreator {
          */
         method.load(functionNode.needsCallee());
         method.load(functionNode.isStrictMode());
-        method.invoke(constructorNoLookup(SCRIPTOBJECT_IMPL_OBJECT,
+        method.invoke(constructorNoLookup(SCRIPTFUNCTION_IMPL_OBJECT,
                     String.class,
                     MethodHandle.class,
                     ScriptObject.class,
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/Type.java b/nashorn/src/jdk/nashorn/internal/codegen/types/Type.java
index 8646e7d065b..d36dd20db34 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/types/Type.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/types/Type.java
@@ -779,13 +779,13 @@ public abstract class Type implements Comparable<Type>, BytecodeOps {
     };
 
     /** Singleton for method handle arrays used for properties etc. */
-    public static final ArrayType METHODHANDLE_ARRAY = new ArrayType(new MethodHandle[0].getClass());
+    public static final ArrayType METHODHANDLE_ARRAY = new ArrayType(MethodHandle[].class);
 
     /** This is the singleton for string arrays */
-    public static final ArrayType STRING_ARRAY = new ArrayType(new String[0].getClass());
+    public static final ArrayType STRING_ARRAY = new ArrayType(String[].class);
 
     /** This is the singleton for object arrays */
-    public static final ArrayType OBJECT_ARRAY = new ArrayType(new Object[0].getClass());
+    public static final ArrayType OBJECT_ARRAY = new ArrayType(Object[].class);
 
     /** This type, always an object type, just a toString override */
     public static final Type THIS = new ObjectType() {
diff --git a/nashorn/src/jdk/nashorn/internal/ir/Block.java b/nashorn/src/jdk/nashorn/internal/ir/Block.java
index 9aeecd6572e..31448d38a35 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/Block.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/Block.java
@@ -584,7 +584,7 @@ public class Block extends Node {
      * Set the needs scope flag.
      */
     public void setNeedsScope() {
-        this.needsScope = true;
+        needsScope = true;
     }
 
 }
diff --git a/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java b/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java
index 2821f85697b..6d2b3a16e1d 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java
@@ -47,6 +47,7 @@ import jdk.nashorn.internal.ir.visitor.NodeVisitor;
 import jdk.nashorn.internal.parser.Parser;
 import jdk.nashorn.internal.runtime.Source;
 import jdk.nashorn.internal.runtime.UserAccessorProperty;
+import jdk.nashorn.internal.runtime.linker.LinkerCallSite;
 
 /**
  * IR representation for function (or script.)
@@ -150,36 +151,40 @@ public class FunctionNode extends Block {
     private int flags;
 
     /** Is anonymous function flag. */
-    private static final int IS_ANONYMOUS            = 0b0000_0000_0000_0001;
+    private static final int IS_ANONYMOUS                = 0b0000_0000_0000_0001;
     /** Is statement flag */
-    private static final int IS_STATEMENT            = 0b0000_0000_0000_0010;
+    private static final int IS_STATEMENT                = 0b0000_0000_0000_0010;
     /** is this a strict mode function? */
-    private static final int IS_STRICT_MODE          = 0b0000_0000_0000_0100;
-    /** is this is a vararg function? */
-    private static final int IS_VAR_ARG              = 0b0000_0000_0000_1000;
+    private static final int IS_STRICT_MODE              = 0b0000_0000_0000_0100;
+    /** Does the function use the "arguments" identifier ? */
+    private static final int USES_ARGUMENTS              = 0b0000_0000_0000_1000;
     /** Are we lowered ? */
-    private static final int IS_LOWERED              = 0b0000_0000_0001_0000;
+    private static final int IS_LOWERED                  = 0b0000_0000_0001_0000;
     /** Has this node been split because it was too large? */
-    private static final int IS_SPLIT                = 0b0000_0000_0010_0000;
+    private static final int IS_SPLIT                    = 0b0000_0000_0010_0000;
     /** Is this function lazily compiled? */
-    private static final int IS_LAZY                 = 0b0000_0000_0100_0000;
-    /** Does the function contain eval? */
-    private static final int HAS_EVAL                = 0b0000_0000_1000_0000;
+    private static final int IS_LAZY                     = 0b0000_0000_0100_0000;
+    /** Does the function call eval? */
+    private static final int HAS_EVAL                    = 0b0000_0000_1000_0000;
     /** Does the function contain a with block ? */
-    private static final int HAS_WITH                = 0b0000_0001_0000_0000;
-    /** Does a child function contain a with or eval? */
-    private static final int HAS_CHILD_WITH_OR_EVAL  = 0b0000_0010_0000_0000;
-    /** Hide arguments? */
-    private static final int HIDE_ARGS               = 0b0000_0100_0000_0000;
+    private static final int HAS_WITH                    = 0b0000_0001_0000_0000;
+    /** Does a descendant function contain a with or eval? */
+    private static final int HAS_DESCENDANT_WITH_OR_EVAL = 0b0000_0010_0000_0000;
+    /** Does the function define "arguments" identifier as a parameter of nested function name? */
+    private static final int DEFINES_ARGUMENTS           = 0b0000_0100_0000_0000;
     /** Does the function need a self symbol? */
-    private static final int NEEDS_SELF_SYMBOL       = 0b0000_1000_0000_0000;
+    private static final int NEEDS_SELF_SYMBOL           = 0b0000_1000_0000_0000;
+    /** Does this function or any of its descendants use variables from an ancestor function's scope (incl. globals)? */
+    private static final int USES_ANCESTOR_SCOPE         = 0b0001_0000_0000_0000;
 
     /** Does this function or any nested functions contain a with or an eval? */
-    private static final int HAS_DEEP_WITH_OR_EVAL = HAS_EVAL | HAS_WITH | HAS_CHILD_WITH_OR_EVAL;
+    private static final int HAS_DEEP_WITH_OR_EVAL = HAS_EVAL | HAS_WITH | HAS_DESCENDANT_WITH_OR_EVAL;
     /** Does this function need to store all its variables in scope? */
     private static final int HAS_ALL_VARS_IN_SCOPE = HAS_DEEP_WITH_OR_EVAL | IS_SPLIT;
-    /** Does this function need a scope object? */
-    private static final int NEEDS_SCOPE           = HAS_ALL_VARS_IN_SCOPE | IS_VAR_ARG;
+    /** Does this function potentially need "arguments"? Note that this is not a full test, as further negative check of REDEFINES_ARGS is needed. */
+    private static final int MAYBE_NEEDS_ARGUMENTS = USES_ARGUMENTS | HAS_EVAL;
+    /** Does this function need the parent scope? It needs it if either it or its descendants use variables from it, or have a deep with or eval. */
+    private static final int NEEDS_PARENT_SCOPE = USES_ANCESTOR_SCOPE | HAS_DEEP_WITH_OR_EVAL;
 
     /** What is the return type of this function? */
     private Type returnType = Type.UNKNOWN;
@@ -334,6 +339,11 @@ public class FunctionNode extends Block {
         }
     }
 
+    @Override
+    public boolean needsScope() {
+        return super.needsScope() || isScript();
+    }
+
     /*
      * Frame management.
      */
@@ -503,12 +513,29 @@ public class FunctionNode extends Block {
      * Flag this function as using the {@code with} keyword
      */
     public void setHasWith() {
-        this.flags |= HAS_WITH;
-        // with requires scope in parents.
-        FunctionNode parentFunction = findParentFunction();
-        while (parentFunction != null) {
-            parentFunction.setHasNestedWithOrEval();
-            parentFunction = parentFunction.findParentFunction();
+        if(!hasWith()) {
+            this.flags |= HAS_WITH;
+            // with requires scope in parents.
+            // TODO: refine this. with should not force all variables in parents to be in scope, only those that are
+            // actually referenced as identifiers by name
+            markParentForWithOrEval();
+        }
+    }
+
+    private void markParentForWithOrEval() {
+        // If this is invoked, then either us or a descendant uses with or eval, meaning we must have our own scope.
+        setNeedsScope();
+
+        final FunctionNode parentFunction = findParentFunction();
+        if(parentFunction != null) {
+            parentFunction.setDescendantHasWithOrEval();
+        }
+    }
+
+    private void setDescendantHasWithOrEval() {
+        if((flags & HAS_DESCENDANT_WITH_OR_EVAL) == 0) {
+            flags |= HAS_DESCENDANT_WITH_OR_EVAL;
+            markParentForWithOrEval();
         }
     }
 
@@ -522,22 +549,15 @@ public class FunctionNode extends Block {
     }
 
     /**
-     * Flag this function as using the {@code eval} keyword
+     * Flag this function as calling the {@code eval} function
      */
     public void setHasEval() {
-        this.flags |= HAS_EVAL;
-        // eval requires scope in parents.
-        FunctionNode parentFunction = findParentFunction();
-        while (parentFunction != null) {
-            parentFunction.setHasNestedWithOrEval();
-            parentFunction = parentFunction.findParentFunction();
+        if(!hasEval()) {
+            this.flags |= HAS_EVAL;
+            markParentForWithOrEval();
         }
     }
 
-    private void setHasNestedWithOrEval() {
-        flags |= HAS_CHILD_WITH_OR_EVAL;
-    }
-
     /**
      * Test whether this function or any of its nested functions contains a <tt>with</tt> statement
      * or an <tt>eval</tt> call.
@@ -623,11 +643,13 @@ public class FunctionNode extends Block {
     }
 
     /**
-     * Check if this function needs the {@code callee} parameter
-     * @return true if the function uses {@code callee}
+     * Check if this function's generated Java method needs a {@code callee} parameter. Functions that need access to
+     * their parent scope, functions that reference themselves, and non-strict functions that need an Arguments object
+     * (since it exposes {@code arguments.callee} property) will need to have a callee parameter.
+     * @return true if the function's generated Java method needs a {@code callee} parameter.
      */
     public boolean needsCallee() {
-        return getCalleeNode() != null;
+        return needsParentScope() || needsSelfSymbol() || (needsArguments() && !isStrictMode());
     }
 
     /**
@@ -666,37 +688,60 @@ public class FunctionNode extends Block {
     }
 
     /**
-     * Check if this function needs to use var args, which is the case for
-     * e.g. {@code eval} and functions where {@code arguments} is used
-     *
-     * @return true if the function needs to use var args
+     * Does this function's method needs to be variable arity (gather all script-declared parameters in a final
+     * {@code Object[]} parameter. Functions that need to have the "arguments" object as well as functions that simply
+     * declare too many arguments for JVM to handle with fixed arity will need to be variable arity.
+     * @return true if the Java method in the generated code that implements this function needs to be variable arity.
+     * @see #needsArguments()
+     * @see LinkerCallSite#ARGLIMIT
      */
     public boolean isVarArg() {
-        return (flags & IS_VAR_ARG) != 0 && !isScript();
+        return needsArguments() || parameters.size() > LinkerCallSite.ARGLIMIT;
     }
 
     /**
-     * Flag this function as needing to use var args vector
+     * Flag this function as one that defines the identifier "arguments" as a function parameter or nested function
+     * name. This precludes it from needing to have an Arguments object defined as "arguments" local variable. Note that
+     * defining a local variable named "arguments" still requires construction of the Arguments object (see
+     * ECMAScript 5.1 Chapter 10.5).
+     * @see #needsArguments()
      */
-    public void setIsVarArg() {
-        this.flags |= IS_VAR_ARG;
+    public void setDefinesArguments() {
+        this.flags |= DEFINES_ARGUMENTS;
     }
 
     /**
-     * Ugly special case:
-     * Tells the compiler if {@code arguments} variable should be hidden and given
-     * a unique name, for example if it is used as an explicit parameter name
-     * @return true of {@code arguments} should be hidden
+     * Returns true if this function needs to have an Arguments object defined as a local variable named "arguments".
+     * Functions that use "arguments" as identifier and don't define it as a name of a parameter or a nested function
+     * (see ECMAScript 5.1 Chapter 10.5), as well as any function that uses eval or with, or has a nested function that
+     * does the same, will have an "arguments" object. Also, if this function is a script, it will not have an
+     * "arguments" object, because it does not have local variables; rather the Global object will have an explicit
+     * "arguments" property that provides command-line arguments for the script.
+     * @return true if this function needs an arguments object.
      */
-    public boolean hideArguments() {
-        return (flags & HIDE_ARGS) != 0;
+    public boolean needsArguments() {
+        // uses "arguments" or calls eval, but it does not redefine "arguments", and finally, it's not a script, since
+        // for top-level script, "arguments" is picked up from Context by Global.init() instead.
+        return (flags & MAYBE_NEEDS_ARGUMENTS) != 0 && (flags & DEFINES_ARGUMENTS) == 0 && !isScript();
     }
 
     /**
-     * Flag this function as needing to hide the {@code arguments} vectir
+     * Flags this function as one that uses the "arguments" identifier.
+     * @see #needsArguments()
      */
-    public void setHideArguments() {
-        this.flags |= HIDE_ARGS;
+    public void setUsesArguments() {
+        flags |= USES_ARGUMENTS;
+    }
+
+    /**
+     * Returns true if this function needs access to its parent scope. Functions referencing variables outside their
+     * scope (including global variables), as well as functions that call eval or have a with block, or have nested
+     * functions that call eval or have a with block, will need a parent scope. Top-level script functions also need a
+     * parent scope since they might be used from within eval, and eval will need an externally passed scope.
+     * @return true if the function needs parent scope.
+     */
+    public boolean needsParentScope() {
+        return (flags & NEEDS_PARENT_SCOPE) != 0 || isScript();
     }
 
     /**
@@ -749,14 +794,9 @@ public class FunctionNode extends Block {
         this.name = name;
     }
 
-    @Override
-    public boolean needsScope() {
-        return needsScope || isScript() || (flags & NEEDS_SCOPE) != 0;
-    }
-
     /**
-     * Check if this function should have all its variables in scope, regardless
-     * of other properties.
+     * Check if this function should have all its variables in its own scope. Scripts, split sub-functions, and
+     * functions having with and/or eval blocks are such.
      *
      * @return true if all variables should be in scope
      */
@@ -780,6 +820,7 @@ public class FunctionNode extends Block {
      */
     public void setIsSplit() {
         this.flags |= IS_SPLIT;
+        setNeedsScope();
     }
 
     /**
@@ -892,6 +933,38 @@ public class FunctionNode extends Block {
         this.selfSymbolInit = selfSymbolInit;
     }
 
+    /**
+     * Marks this function as one using any global symbol. The function and all its parent functions will all be marked
+     * as needing parent scope.
+     * @see #needsParentScope()
+     */
+    public void setUsesGlobalSymbol() {
+        this.flags |= USES_ANCESTOR_SCOPE;
+        final FunctionNode parentFn = findParentFunction();
+        if(parentFn != null) {
+            parentFn.setUsesGlobalSymbol();
+        }
+    }
+
+    /**
+     * Marks this function as using a specified scoped symbol. The function and its parent functions up to but not
+     * including the function defining the symbol will be marked as needing parent scope. The function defining the
+     * symbol will be marked as one that needs to have its own scope.
+     * @param symbol the symbol being used.
+     * @see #needsParentScope()
+     */
+    public void setUsesScopeSymbol(final Symbol symbol) {
+        if(symbol.getBlock() == this) {
+            setNeedsScope();
+        } else {
+            this.flags |= USES_ANCESTOR_SCOPE;
+            final FunctionNode parentFn = findParentFunction();
+            if(parentFn != null) {
+                parentFn.setUsesScopeSymbol(symbol);
+            }
+        }
+    }
+
     /**
      * Return the node representing {@code this} in this function
      * @return IdentNode representing {@code this}
diff --git a/nashorn/src/jdk/nashorn/internal/ir/Symbol.java b/nashorn/src/jdk/nashorn/internal/ir/Symbol.java
index 21d589fe251..b6d8e9b336b 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/Symbol.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/Symbol.java
@@ -83,7 +83,7 @@ public final class Symbol implements Comparable<Symbol> {
     /** Local variable slot. -1 indicates external property. */
     private int slot;
 
-    /** Field number in scope or property. */
+    /** Field number in scope or property; array index in varargs when not using arguments object. */
     private int fieldIndex;
 
     /** Number of times this symbol is used in code */
@@ -330,7 +330,11 @@ public final class Symbol implements Comparable<Symbol> {
         }
 
         if (isScope()) {
-            sb.append(" S");
+            if(isGlobal()) {
+                sb.append(" G");
+            } else {
+                sb.append(" S");
+            }
         }
 
         if (canBePrimitive()) {
@@ -382,7 +386,9 @@ public final class Symbol implements Comparable<Symbol> {
             trace("SET IS SCOPE");
         }
         flags |= IS_SCOPE;
-        getBlock().setNeedsScope();
+        if(!isGlobal()) {
+            getBlock().setNeedsScope();
+        }
     }
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/objects/Global.java b/nashorn/src/jdk/nashorn/internal/objects/Global.java
index 82e51a05a24..0e1c06f1585 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/Global.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/Global.java
@@ -1213,7 +1213,7 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
      *
      * @return the new array
      */
-    public static Object allocateArguments(final Object[] arguments, final Object callee, final int numParams) {
+    public static ScriptObject allocateArguments(final Object[] arguments, final Object callee, final int numParams) {
         return NativeArguments.allocate(arguments, (ScriptFunction)callee, numParams);
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeArguments.java b/nashorn/src/jdk/nashorn/internal/objects/NativeArguments.java
index b8c02ae76d2..b47aa7f4be5 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeArguments.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeArguments.java
@@ -551,7 +551,8 @@ public final class NativeArguments extends ScriptObject {
      * @return Arguments Object
      */
     public static ScriptObject allocate(final Object[] arguments, final ScriptFunction callee, final int numParams) {
-        final boolean isStrict = callee.isStrict();
+        // Strict functions won't always have a callee for arguments, and will pass null instead.
+        final boolean isStrict = callee == null || callee.isStrict();
         return isStrict ? new NativeStrictArguments(arguments, numParams) : new NativeArguments(arguments, callee, numParams);
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java b/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
index 6e74f303bbc..9779cafbfdd 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
@@ -49,6 +49,7 @@ public class ScriptFunctionImpl extends ScriptFunction {
     // per-function object flags
     private static final int IS_STRICT  = 0b0000_0001;
     private static final int IS_BUILTIN = 0b0000_0010;
+    private static final int HAS_CALLEE = 0b0000_0100;
 
     // set this function to be a builtin function
     private void setIsBuiltin() {
@@ -220,6 +221,16 @@ public class ScriptFunctionImpl extends ScriptFunction {
         return (flags & IS_STRICT) != 0;
     }
 
+    @Override
+    public final boolean hasCalleeParameter() {
+        return (flags & HAS_CALLEE) != 0;
+    }
+
+    @Override
+    protected void setHasCalleeParameter() {
+        flags |= HAS_CALLEE;
+    }
+
     @Override
     public final boolean isBuiltin() {
         return (flags & IS_BUILTIN) != 0;
diff --git a/nashorn/src/jdk/nashorn/internal/parser/Parser.java b/nashorn/src/jdk/nashorn/internal/parser/Parser.java
index 0b65979fb3b..db611e2f7bd 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/Parser.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/Parser.java
@@ -98,7 +98,6 @@ import jdk.nashorn.internal.ir.WithNode;
 import jdk.nashorn.internal.runtime.Context;
 import jdk.nashorn.internal.runtime.JSErrorType;
 import jdk.nashorn.internal.runtime.ParserException;
-import jdk.nashorn.internal.runtime.linker.LinkerCallSite;
 
 /**
  * Builds the IR.
@@ -334,7 +333,6 @@ loop:
 
         if (EVAL.tag().equals(name)) {
             function.setHasEval();
-            function.setIsVarArg();
         }
     }
 
@@ -346,7 +344,7 @@ loop:
         final String name = ident.getName();
 
         if (ARGUMENTS.tag().equals(name)) {
-            function.setIsVarArg();
+            function.setUsesArguments();
         }
     }
 
@@ -2517,6 +2515,9 @@ loop:
 
         if (isStatement && !isInWithBlock()) {
             functionNode.setIsStatement();
+            if(ARGUMENTS.tag().equals(name.getName())) {
+                functionNode.findParentFunction().setDefinesArguments();
+            }
         }
 
         if (isAnonymous) {
@@ -2536,7 +2537,7 @@ loop:
                 String parameterName = parameter.getName();
 
                 if (ARGUMENTS.tag().equals(parameterName)) {
-                    functionNode.setHideArguments();
+                    functionNode.setDefinesArguments();
                 }
 
                 if (parametersSet.contains(parameterName)) {
@@ -2555,14 +2556,10 @@ loop:
             }
         } else if (arity == 1) {
             if (ARGUMENTS.tag().equals(parameters.get(0).getName())) {
-                functionNode.setHideArguments();
+                functionNode.setDefinesArguments();
             }
         }
 
-        if (arity > LinkerCallSite.ARGLIMIT) {
-            functionNode.setIsVarArg();
-        }
-
         if (isStatement) {
             final VarNode var = new VarNode(source, functionToken, finish, name, referenceNode);
             if (isInWithBlock()) {
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ArgumentSetter.java b/nashorn/src/jdk/nashorn/internal/runtime/ArgumentSetter.java
new file mode 100644
index 00000000000..bc5b6d38709
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ArgumentSetter.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.nashorn.internal.runtime;
+
+import static jdk.nashorn.internal.codegen.CompilerConstants.staticCall;
+
+import jdk.nashorn.internal.codegen.CompilerConstants.Call;
+
+/**
+ * A class with static helper methods invoked from generated bytecode for setting values of parameters of variable-arity
+ * functions.
+ */
+public class ArgumentSetter {
+
+    /** Method handle for setting a function argument at a given index in an arguments object. Used from generated bytecode */
+    public static final Call SET_ARGUMENT      = staticCall(ArgumentSetter.class, "setArgument", void.class, Object.class, ScriptObject.class, int.class);
+
+    /** Method handle for setting a function argument at a given index in an arguments array. Used from generated bytecode */
+    public static final Call SET_ARRAY_ELEMENT = staticCall(ArgumentSetter.class, "setArrayElement", void.class, Object.class, Object[].class, int.class);
+
+
+    /**
+     * Used from generated bytecode to invoke {@link ScriptObject#setArgument(int, Object)} without having to reorder
+     * the arguments on the stack. When we're generating a store into the argument, we first have the value on the
+     * stack, and only afterwards load the target object and the index.
+     * @param value the value to write at the given argument index.
+     * @param arguments the arguments object that we're writing the value to
+     * @param key the index of the argument
+     */
+    public static void setArgument(final Object value, final ScriptObject arguments, final int key) {
+        arguments.setArgument(key, value);
+    }
+
+    /**
+     * Used from generated bytecode to set a variable arity parameter - an array element - without having to reorder
+     * the arguments on the stack. When we're generating a store into the array, we first have the value on the
+     * stack, and only afterwards load the target array and the index.
+     * @param value the value to write at the given argument index.
+     * @param arguments the arguments array that we're writing the value to
+     * @param key the index of the argument
+     */
+    public static void setArrayElement(final Object value, final Object[] arguments, final int key) {
+        arguments[key] = value;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
index 3979814d207..de7adf60feb 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
@@ -128,7 +128,28 @@ public abstract class ScriptFunction extends ScriptObject {
             final PropertyMap map,
             final ScriptObject scope,
             final MethodHandle[] specs) {
-        this(name, methodHandle, map, scope, null, 0, false, specs);
+        this(name, methodHandle, map, scope, null, 0, needsCallee(methodHandle), specs);
+    }
+
+    /**
+     * Heuristic to figure out if the method handle has a callee argument. If it's type is either
+     * {@code (boolean, Object, ScriptFunction, ...)} or {@code (Object, ScriptFunction, ...)}, then we'll assume it has
+     * a callee argument. We need this as the constructor above is not passed this information, and can't just blindly
+     * assume it's false (notably, it's being invoked for creation of new scripts, and scripts have scopes, therefore
+     * they also always receive a callee.
+     * @param methodHandle the examined method handle
+     * @return true if the method handle expects a callee, false otherwise
+     */
+    private static boolean needsCallee(MethodHandle methodHandle) {
+        final MethodType type = methodHandle.type();
+        final int len = type.parameterCount();
+        if(len == 0) {
+            return false;
+        }
+        if(type.parameterType(0) == boolean.class) {
+            return len > 2 && type.parameterType(2) == ScriptFunction.class;
+        }
+        return len > 1 && type.parameterType(1) == ScriptFunction.class;
     }
 
     /**
@@ -193,27 +214,27 @@ public abstract class ScriptFunction extends ScriptObject {
             constructorCount++;
         }
 
-        // needCallee => scope != null
-        assert !needsCallee || scope != null;
         this.name   = name;
         this.source = source;
         this.token  = token;
         this.scope  = scope;
+        if(needsCallee) {
+            setHasCalleeParameter();
+        }
 
         final MethodType type       = methodHandle.type();
         final int        paramCount = type.parameterCount();
         final boolean    isVarArg   = type.parameterType(paramCount - 1).isArray();
 
-        final MethodHandle mh = MH.asType(methodHandle, adaptType(type, scope != null, isVarArg));
+        final MethodHandle mh = MH.asType(methodHandle, adaptType(type, needsCallee, isVarArg));
 
         this.arity = isVarArg ? -1 : paramCount - 1; //drop the self param for arity
 
+        if (needsCallee && !isVarArg) {
+            this.arity--;
+        }
+
         if (scope != null) {
-            if (needsCallee) {
-                if (!isVarArg) {
-                    this.arity--;
-                }
-            }
             this.invokeHandle    = mh;
             this.constructHandle = mh;
         } else if (isConstructor(mh)) {
@@ -698,9 +719,8 @@ public abstract class ScriptFunction extends ScriptObject {
         return hasCalleeParameter() ? MH.bindTo(bound, this) : bound;
     }
 
-    private boolean hasCalleeParameter() {
-        return scope != null;
-    }
+    protected abstract boolean hasCalleeParameter();
+    protected abstract void setHasCalleeParameter();
 
     /**
      * Get the construct handle - the most generic (and if no specializations are in place, only) constructor
@@ -878,12 +898,9 @@ public abstract class ScriptFunction extends ScriptObject {
         MethodHandle handle = MH.foldArguments(MH.dropArguments(NEWFILTER, 2, ctorArgs), constructor);
 
         if (hasCalleeParameter()) {
-            final MethodHandle allocate = MH.bindTo(MethodHandles.exactInvoker(ALLOCATE.type()), ScriptFunction.ALLOCATE);
-            handle = MH.foldArguments(handle, allocate);
-            handle = MH.asType(handle, handle.type().changeParameterType(0, Object.class)); // ScriptFunction => Object
+            handle = MH.foldArguments(handle, ALLOCATE);
         } else {
-            final MethodHandle allocate = MH.dropArguments(MH.bindTo(ScriptFunction.ALLOCATE, this), 0, Object.class);
-            handle = MH.filterArguments(handle, 0, allocate);
+            handle = MH.filterArguments(handle, 0, ALLOCATE);
         }
 
         final MethodHandle filterIn = MH.asType(pairArguments(handle, type), type);
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java
index c501fad2ea7..9ff04880c25 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java
@@ -566,13 +566,12 @@ public final class ScriptRuntime {
      * This is 'delete' that always fails. We have to check strict mode and throw error.
      * That is why this is a runtime function. Or else we could have inlined 'false'.
      *
-     * @param obj       object with property to delete
      * @param property  property to delete
      * @param strict    are we in strict mode
      *
      * @return false always
      */
-    public static boolean FAIL_DELETE(final Object obj, final Object property, final Object strict) {
+    public static boolean FAIL_DELETE(final Object property, final Object strict) {
         if (Boolean.TRUE.equals(strict)) {
             syntaxError("strict.cant.delete", safeToString(property));
         }
diff --git a/nashorn/test/script/basic/JDK-8006529-b.js b/nashorn/test/script/basic/JDK-8006529-b.js
new file mode 100644
index 00000000000..a7a6e3f30ee
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8006529-b.js
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8006529 : Constructor functions that don't need callees must not get
+ * linked with a MethodHandle boud to a specific function instance.
+ * @test
+ * @run
+ */
+
+Object.defineProperty(Object.prototype, "extends", {
+  value: function (superConstructor) {
+    function ProtoBridge() { }
+    ProtoBridge.prototype = superConstructor.prototype;
+    this.prototype = new ProtoBridge();
+    this.superConstructor = superConstructor;
+  }
+});
+
+function A() {
+}
+A.prototype.f = function () {
+  this.g();
+}
+
+function B() {
+  B.superConstructor.call(this);
+  this.f();
+}
+B.extends(A);
+
+B.prototype.g = function () {
+  print("It worked!")
+}
+
+function C() {
+  C.superConstructor.call(this);
+}
+C.extends(B);
+
+var x = [B, C]
+for(var i in x) {
+  print("Doing " + i)
+  new x[i]()
+}
\ No newline at end of file
diff --git a/nashorn/test/script/basic/JDK-8006529-b.js.EXPECTED b/nashorn/test/script/basic/JDK-8006529-b.js.EXPECTED
new file mode 100644
index 00000000000..e7891c7a81f
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8006529-b.js.EXPECTED
@@ -0,0 +1,4 @@
+Doing 0
+It worked!
+Doing 1
+It worked!
diff --git a/nashorn/test/script/basic/JDK-8006529.js b/nashorn/test/script/basic/JDK-8006529.js
new file mode 100644
index 00000000000..7c18603c1ac
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8006529.js
@@ -0,0 +1,158 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8006529 : Methods should not always get callee parameter, and they
+ * should not be too eager in creation of scopes.
+ *
+ * @test
+ * @run
+ */
+
+// compile(script) -- compiles a script specified as a string with its 
+// source code, returns a jdk.nashorn.internal.ir.FunctionNode object 
+// representing it.
+var compile = (function() {
+    var Compiler       = Java.type("jdk.nashorn.internal.codegen.Compiler")
+    var Context        = Java.type("jdk.nashorn.internal.runtime.Context")
+    var Source         = Java.type("jdk.nashorn.internal.runtime.Source")
+    var CompilerAccess = Java.type("jdk.nashorn.internal.codegen.CompilerAccess")
+    return function(source) {
+	    var compiler = Compiler.compiler(new Source("<no name>", source), Context.getContext())
+        compiler.compile()
+        return CompilerAccess.getScriptNode(compiler)
+    }
+})();
+
+var allAssertions = (function() {
+    var allAssertionList = ['isVarArg', 'needsParentScope', 'needsCallee', 'needsScope', 'needsSelfSymbol', 'isSplit', 'hasEval', 'hasWith', 'hasDeepWithOrEval', 'varsInScope', 'isStrictMode']
+    var allAssertions = {}
+    for(var assertion in allAssertionList) {
+        allAssertions[allAssertionList[assertion]] = true
+    }
+    return allAssertions;
+})();
+
+// test(f[, assertions...]) tests whether all the specified assertions on the
+// passed function node are true.
+function test(f) {
+    var assertions = {}
+    for(var i = 1; i < arguments.length; ++i) {
+        var assertion = arguments[i]
+        if(!allAssertions[assertion]) {
+            throw "Unknown assertion " + assertion + " for " + f;
+        }
+        assertions[assertion] = true
+    }
+    for(var assertion in allAssertions) {
+        var expectedValue = !!assertions[assertion]
+        if(f[assertion] == null) {
+            throw "Can't find " + assertion + " on " + f;
+        }
+        if(f[assertion]() !== expectedValue) {
+            throw "Expected " + assertion + " === " + expectedValue + " for " + f;
+        }
+    }
+}
+
+// testFirstFn(script[, assertions...] tests whether all the specified
+// assertions are true in the first function in the given script; "script"
+// is a string with the source text of the script.
+function testFirstFn(script) {
+    arguments[0] = compile(script).functions[0]
+    test.apply(null, arguments)
+}
+
+// ---------------------------------- ACTUAL TESTS START HERE --------------
+
+// The simplest possible functions have no attributes set
+testFirstFn("function f() { }")
+testFirstFn("function f(x) { x }")
+
+// A function referencing a global needs parent scope, and it needs callee
+// (because parent scope is passed through callee)
+testFirstFn("function f() { x }", 'needsCallee', 'needsParentScope')
+
+// A function referencing "arguments" will have to be vararg. It also needs
+// the callee, as it needs to fill out "arguments.callee".
+testFirstFn("function f() { arguments }", 'needsCallee', 'isVarArg')
+
+// A function referencing "arguments" will have to be vararg. If it is
+// strict, it will not have to have a callee, though.
+testFirstFn("function f() {'use strict'; arguments }", 'isVarArg', 'isStrictMode')
+
+// A function defining "arguments" as a parameter will not be vararg.
+testFirstFn("function f(arguments) { arguments }")
+
+// A function defining "arguments" as a nested function will not be vararg.
+testFirstFn("function f() { function arguments() {}; arguments; }")
+
+// A function defining "arguments" as a local variable will be vararg.
+testFirstFn("function f() { var arguments; arguments; }", 'isVarArg', 'needsCallee')
+
+// A self-referencing function defined as a statement doesn't need a self 
+// symbol, as it'll rather obtain itself from the parent scope.
+testFirstFn("function f() { f() }", 'needsCallee', 'needsParentScope')
+
+// A self-referencing function defined as an expression needs a self symbol,
+// as it can't obtain itself from the parent scope.
+testFirstFn("(function f() { f() })", 'needsCallee', 'needsSelfSymbol')
+
+// A child function accessing parent's variable triggers the need for scope
+// in parent
+testFirstFn("(function f() { var x; function g() { x } })", 'needsScope')
+
+// A child function accessing parent's parameter triggers the need for scope
+// in parent
+testFirstFn("(function f(x) { function g() { x } })", 'needsScope')
+
+// A child function accessing a global variable triggers the need for parent
+// scope in parent
+testFirstFn("(function f() { function g() { x } })", 'needsParentScope', 'needsCallee')
+
+// A child function redefining a local variable from its parent should not 
+// affect the parent function in any way
+testFirstFn("(function f() { var x; function g() { var x; x } })")
+
+// Using "with" unleashes a lot of needs: parent scope, callee, own scope, 
+// and all variables in scope. Actually, we could make "with" less wasteful,
+// and only put those variables in scope that it actually references, similar
+// to what nested functions do with variables in their parents.
+testFirstFn("(function f() { var o; with(o) {} })", 'needsParentScope', 'needsCallee', 'needsScope', 'hasWith', 'hasDeepWithOrEval', 'varsInScope')
+
+// Using "eval" is as bad as using "with" with the added requirement of
+// being vararg, 'cause we don't know if eval will be using "arguments".
+testFirstFn("(function f() { eval() })", 'needsParentScope', 'needsCallee', 'needsScope', 'hasEval', 'isVarArg', 'hasDeepWithOrEval', 'varsInScope')
+
+// Nested function using "with" is pretty much the same as the parent
+// function needing with.
+testFirstFn("(function f() { function g() { var o; with(o) {} } })", 'needsParentScope', 'needsCallee', 'needsScope', 'hasDeepWithOrEval', 'varsInScope')
+// Nested function using "eval" is almost the same as parent function using
+// eval, but at least the parent doesn't have to be vararg.
+testFirstFn("(function f() { function g() { eval() } })", 'needsParentScope', 'needsCallee', 'needsScope', 'hasDeepWithOrEval', 'varsInScope')
+
+// Function with 250 named parameters is ordinary
+testFirstFn("function f(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19, p20, p21, p22, p23, p24, p25, p26, p27, p28, p29, p30, p31, p32, p33, p34, p35, p36, p37, p38, p39, p40, p41, p42, p43, p44, p45, p46, p47, p48, p49, p50, p51, p52, p53, p54, p55, p56, p57, p58, p59, p60, p61, p62, p63, p64, p65, p66, p67, p68, p69, p70, p71, p72, p73, p74, p75, p76, p77, p78, p79, p80, p81, p82, p83, p84, p85, p86, p87, p88, p89, p90, p91, p92, p93, p94, p95, p96, p97, p98, p99, p100, p101, p102, p103, p104, p105, p106, p107, p108, p109, p110, p111, p112, p113, p114, p115, p116, p117, p118, p119, p120, p121, p122, p123, p124, p125, p126, p127, p128, p129, p130, p131, p132, p133, p134, p135, p136, p137, p138, p139, p140, p141, p142, p143, p144, p145, p146, p147, p148, p149, p150, p151, p152, p153, p154, p155, p156, p157, p158, p159, p160, p161, p162, p163, p164, p165, p166, p167, p168, p169, p170, p171, p172, p173, p174, p175, p176, p177, p178, p179, p180, p181, p182, p183, p184, p185, p186, p187, p188, p189, p190, p191, p192, p193, p194, p195, p196, p197, p198, p199, p200, p201, p202, p203, p204, p205, p206, p207, p208, p209, p210, p211, p212, p213, p214, p215, p216, p217, p218, p219, p220, p221, p222, p223, p224, p225, p226, p227, p228, p229, p230, p231, p232, p233, p234, p235, p236, p237, p238, p239, p240, p241, p242, p243, p244, p245, p246, p247, p248, p249, p250) { p250 = p249 }")
+
+// Function with 251 named parameters is variable arguments
+testFirstFn("function f(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19, p20, p21, p22, p23, p24, p25, p26, p27, p28, p29, p30, p31, p32, p33, p34, p35, p36, p37, p38, p39, p40, p41, p42, p43, p44, p45, p46, p47, p48, p49, p50, p51, p52, p53, p54, p55, p56, p57, p58, p59, p60, p61, p62, p63, p64, p65, p66, p67, p68, p69, p70, p71, p72, p73, p74, p75, p76, p77, p78, p79, p80, p81, p82, p83, p84, p85, p86, p87, p88, p89, p90, p91, p92, p93, p94, p95, p96, p97, p98, p99, p100, p101, p102, p103, p104, p105, p106, p107, p108, p109, p110, p111, p112, p113, p114, p115, p116, p117, p118, p119, p120, p121, p122, p123, p124, p125, p126, p127, p128, p129, p130, p131, p132, p133, p134, p135, p136, p137, p138, p139, p140, p141, p142, p143, p144, p145, p146, p147, p148, p149, p150, p151, p152, p153, p154, p155, p156, p157, p158, p159, p160, p161, p162, p163, p164, p165, p166, p167, p168, p169, p170, p171, p172, p173, p174, p175, p176, p177, p178, p179, p180, p181, p182, p183, p184, p185, p186, p187, p188, p189, p190, p191, p192, p193, p194, p195, p196, p197, p198, p199, p200, p201, p202, p203, p204, p205, p206, p207, p208, p209, p210, p211, p212, p213, p214, p215, p216, p217, p218, p219, p220, p221, p222, p223, p224, p225, p226, p227, p228, p229, p230, p231, p232, p233, p234, p235, p236, p237, p238, p239, p240, p241, p242, p243, p244, p245, p246, p247, p248, p249, p250, p251) { p250 = p251 }", 'isVarArg')
diff --git a/nashorn/test/src/jdk/nashorn/internal/codegen/CompilerAccess.java b/nashorn/test/src/jdk/nashorn/internal/codegen/CompilerAccess.java
new file mode 100644
index 00000000000..df94050d404
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/codegen/CompilerAccess.java
@@ -0,0 +1,35 @@
+
+package jdk.nashorn.internal.codegen;
+
+import java.lang.reflect.Field;
+import jdk.nashorn.internal.ir.FunctionNode;
+
+/**
+ * Since Compiler class doesn't give us access to its private {@code functionNode} field, we use this reflection-based
+ * access-check disabling helper to get to it in compilation tests.
+ *
+ */
+public class CompilerAccess {
+    private static final Field FUNCTION_NODE_FIELD = getCompilerFunctionNodeField();
+    static {
+        FUNCTION_NODE_FIELD.setAccessible(true);
+    }
+
+    /**
+     * Given a compiler, return its {@code functionNode} field, representing the root function (i.e. the compiled script).
+     * @param compiler the compiler that already run its {@link Compiler#compile()} method.
+     * @return the root function node representing the compiled script.
+     * @throws IllegalAccessException
+     */
+    public static FunctionNode getScriptNode(Compiler compiler) throws IllegalAccessException {
+        return (FunctionNode)FUNCTION_NODE_FIELD.get(compiler);
+    }
+
+    private static Field getCompilerFunctionNodeField() {
+        try {
+            return Compiler.class.getDeclaredField("functionNode");
+        } catch (NoSuchFieldException e) {
+            throw new AssertionError("", e);
+        }
+    }
+}

From 4f2891ca8d4fba1f1b7ea284d1beb69700e843d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Fri, 1 Feb 2013 02:24:15 +0100
Subject: [PATCH 107/311] 8007060: Primitive wrap filter throws
 ClassCastException in test262parallel

Reviewed-by: sundar, jlaskey, lagergren
---
 .../jdk/nashorn/internal/objects/Global.java  | 12 ---
 .../internal/objects/NativeFunction.java      | 35 +------
 .../internal/objects/ScriptFunctionImpl.java  |  3 +-
 .../internal/runtime/GlobalObject.java        |  9 --
 .../internal/runtime/ScriptFunction.java      | 84 ++++++++++------
 .../internal/runtime/ScriptObject.java        |  9 +-
 .../internal/runtime/SetMethodCreator.java    | 25 ++---
 .../linker/NashornGuardedInvocation.java      | 69 -------------
 .../runtime/linker/NashornGuards.java         | 20 ++++
 .../runtime/linker/PrimitiveLookup.java       |  2 +-
 nashorn/test/script/basic/JDK-8007060.js      | 94 ++++++++++++++++++
 .../test/script/basic/JDK-8007060.js.EXPECTED | 96 +++++++++++++++++++
 12 files changed, 284 insertions(+), 174 deletions(-)
 delete mode 100644 nashorn/src/jdk/nashorn/internal/runtime/linker/NashornGuardedInvocation.java
 create mode 100644 nashorn/test/script/basic/JDK-8007060.js
 create mode 100644 nashorn/test/script/basic/JDK-8007060.js.EXPECTED

diff --git a/nashorn/src/jdk/nashorn/internal/objects/Global.java b/nashorn/src/jdk/nashorn/internal/objects/Global.java
index 0e1c06f1585..a9fcc03d33f 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/Global.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/Global.java
@@ -418,18 +418,6 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
         }
     }
 
-    @Override
-    public MethodHandle getWrapFilter(Object obj) {
-        if (obj instanceof String || obj instanceof ConsString) {
-            return NativeString.WRAPFILTER;
-        } else if (obj instanceof Number) {
-            return NativeNumber.WRAPFILTER;
-        } else if (obj instanceof Boolean) {
-            return NativeBoolean.WRAPFILTER;
-        }
-        throw new IllegalArgumentException("Unsupported primitive: " + obj);
-    }
-
     @Override
     public GuardedInvocation primitiveLookup(final LinkRequest request, final Object self) {
         if (self instanceof String || self instanceof ConsString) {
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeFunction.java b/nashorn/src/jdk/nashorn/internal/objects/NativeFunction.java
index ac5f3c71454..ed6a876d543 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeFunction.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeFunction.java
@@ -66,17 +66,6 @@ public final class NativeFunction {
         return ((ScriptFunction)self).toSource();
     }
 
-    private static Object convertThis(final ScriptFunction func, final Object thiz) {
-        if (!(thiz instanceof ScriptObject) && func.isNonStrictFunction()) {
-            if (thiz == UNDEFINED || thiz == null) {
-                return Global.instance();
-            }
-            return JSType.toScriptObject(thiz);
-        }
-
-        return thiz;
-    }
-
     /**
      * ECMA 15.3.4.3 Function.prototype.apply (thisArg, argArray)
      *
@@ -125,12 +114,7 @@ public final class NativeFunction {
             typeError("function.apply.expects.array");
         }
 
-        final ScriptFunction func = (ScriptFunction)self;
-        // As per ECMA 5.1 spec, "this" is passed "as is". But the spec.
-        // says 'this' is transformed when callee frame is created if callee
-        // is a non-strict function. So, we convert 'this' here if callee is
-        // not strict and not builtin function.
-        return ScriptRuntime.apply(func, convertThis(func, thiz), args);
+        return ScriptRuntime.apply((ScriptFunction)self, thiz, args);
     }
 
     /**
@@ -157,15 +141,7 @@ public final class NativeFunction {
             arguments = ScriptRuntime.EMPTY_ARRAY;
         }
 
-        final ScriptFunction func = (ScriptFunction)self;
-
-        // As per ECMA 5.1 spec, "this" is passed "as is". But the spec.
-        // says 'this' is transformed when callee frame is created if callee
-        // is a non-strict function. So, we convert 'this' here if callee is
-        // not strict and not builtin function.
-        thiz = convertThis(func, thiz);
-
-        return ScriptRuntime.apply(func, thiz, arguments);
+        return ScriptRuntime.apply((ScriptFunction)self, thiz, arguments);
     }
 
     /**
@@ -182,12 +158,7 @@ public final class NativeFunction {
             return UNDEFINED;
         }
 
-        // As per ECMA 5.1 spec, "this" is passed "as is". But the spec.
-        // says 'this' is transformed when callee frame is created if callee
-        // is a non-strict function. So, we convert 'this' here if callee is
-        // not strict. Note that all builtin functions are marked as strict and
-        // so 'this' transformation is not done for such functions.
-        final Object thiz = convertThis((ScriptFunction)self, (args.length == 0) ? UNDEFINED : args[0]);
+        final Object thiz = (args.length == 0) ? UNDEFINED : args[0];
 
         Object[] arguments;
         if (args.length > 1) {
diff --git a/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java b/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
index 9779cafbfdd..94490a27d9a 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
@@ -293,7 +293,8 @@ public class ScriptFunctionImpl extends ScriptFunction {
             allArgs = ScriptRuntime.EMPTY_ARRAY;
         }
 
-        final MethodHandle   boundMethod = MH.insertArguments(BOUND_FUNCTION, 0, this, thiz, allArgs);
+        final Object boundThiz = convertThisObject(thiz);
+        final MethodHandle   boundMethod = MH.insertArguments(BOUND_FUNCTION, 0, this, boundThiz, allArgs);
         final ScriptFunction boundFunc   = makeFunction("", boundMethod, null, true);
 
         MethodHandle consHandle  = this.getConstructHandle();
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/GlobalObject.java b/nashorn/src/jdk/nashorn/internal/runtime/GlobalObject.java
index 5f91ab3320f..8e30da7fcbe 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/GlobalObject.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/GlobalObject.java
@@ -69,15 +69,6 @@ public interface GlobalObject {
    public Object wrapAsObject(Object obj);
 
 
-    /**
-     * Get a MethodHandle that converts the argument to its JavaScript object representation
-     *
-     * @param obj a JavaScript primitive object (String, Number, or Boolean)
-     *
-     * @return wrap filter methodhandle
-     */
-   public MethodHandle getWrapFilter(Object obj);
-
     /**
      * Wrapper for {@link jdk.nashorn.internal.objects.Global#primitiveLookup(LinkRequest, Object)}
      *
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
index de7adf60feb..57a4812d0ff 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
@@ -40,7 +40,6 @@ import jdk.nashorn.internal.objects.annotations.SpecializedFunction;
 import jdk.nashorn.internal.parser.Token;
 import jdk.nashorn.internal.runtime.linker.MethodHandleFactory;
 import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
-import jdk.nashorn.internal.runtime.linker.NashornGuardedInvocation;
 import jdk.nashorn.internal.runtime.linker.NashornGuards;
 import jdk.nashorn.internal.runtime.options.Options;
 import org.dynalang.dynalink.CallSiteDescriptor;
@@ -69,6 +68,8 @@ public abstract class ScriptFunction extends ScriptObject {
 
     private static final MethodHandle NEWFILTER = findOwnMH("newFilter", Object.class, Object.class, Object.class);
 
+    private static final MethodHandle WRAPFILTER = findOwnMH("wrapFilter", Object.class, Object.class);
+
     /** method handle to arity setter for this ScriptFunction */
     public static final Call SET_ARITY = virtualCallNoLookup(ScriptFunction.class, "setArity", void.class, int.class);
     /** method handle to scope getter for this ScriptFunction */
@@ -352,7 +353,7 @@ public abstract class ScriptFunction extends ScriptObject {
     public abstract boolean isBuiltin();
 
     /**
-     * Is this a non-strict (not built-in) script function?
+     * Is this a non-strict and not-built-in script function?
      * @return true if neither strict nor built-in
      */
     public boolean isNonStrictFunction() {
@@ -371,42 +372,43 @@ public abstract class ScriptFunction extends ScriptObject {
             invokes++;
         }
 
+        final Object selfObj = convertThisObject(self);
         final Object[] args = arguments == null ? ScriptRuntime.EMPTY_ARRAY : arguments;
 
         if (isVarArg(invokeHandle)) {
             if (hasCalleeParameter()) {
-                return invokeHandle.invokeExact(self, this, args);
+                return invokeHandle.invokeExact(selfObj, this, args);
             }
-            return invokeHandle.invokeExact(self, args);
+            return invokeHandle.invokeExact(selfObj, args);
         }
 
         final int paramCount = invokeHandle.type().parameterCount();
         if (hasCalleeParameter()) {
             switch (paramCount) {
             case 2:
-                return invokeHandle.invokeExact(self, this);
+                return invokeHandle.invokeExact(selfObj, this);
             case 3:
-                return invokeHandle.invokeExact(self, this, getArg(args, 0));
+                return invokeHandle.invokeExact(selfObj, this, getArg(args, 0));
             case 4:
-                return invokeHandle.invokeExact(self, this, getArg(args, 0), getArg(args, 1));
+                return invokeHandle.invokeExact(selfObj, this, getArg(args, 0), getArg(args, 1));
             case 5:
-                return invokeHandle.invokeExact(self, this, getArg(args, 0), getArg(args, 1), getArg(args, 2));
+                return invokeHandle.invokeExact(selfObj, this, getArg(args, 0), getArg(args, 1), getArg(args, 2));
             default:
-                return invokeHandle.invokeWithArguments(withArguments(self, this, paramCount, args));
+                return invokeHandle.invokeWithArguments(withArguments(selfObj, this, paramCount, args));
             }
         }
 
         switch (paramCount) {
         case 1:
-            return invokeHandle.invokeExact(self);
+            return invokeHandle.invokeExact(selfObj);
         case 2:
-            return invokeHandle.invokeExact(self, getArg(args, 0));
+            return invokeHandle.invokeExact(selfObj, getArg(args, 0));
         case 3:
-            return invokeHandle.invokeExact(self, getArg(args, 0), getArg(args, 1));
+            return invokeHandle.invokeExact(selfObj, getArg(args, 0), getArg(args, 1));
         case 4:
-            return invokeHandle.invokeExact(self, getArg(args, 0), getArg(args, 1), getArg(args, 2));
+            return invokeHandle.invokeExact(selfObj, getArg(args, 0), getArg(args, 1), getArg(args, 2));
         default:
-            return invokeHandle.invokeWithArguments(withArguments(self, null, paramCount, args));
+            return invokeHandle.invokeWithArguments(withArguments(selfObj, null, paramCount, args));
         }
     }
 
@@ -912,6 +914,14 @@ public abstract class ScriptFunction extends ScriptObject {
         return (result instanceof ScriptObject || !JSType.isPrimitive(result))? result : allocation;
     }
 
+    @SuppressWarnings("unused")
+    private static Object wrapFilter(final Object obj) {
+        if (obj instanceof ScriptObject || !isPrimitiveThis(obj)) {
+            return obj;
+        }
+        return ((GlobalObject) Context.getGlobalTrusted()).wrapAsObject(obj);
+    }
+
     /**
      * dyn:call call site signature: (callee, thiz, [args...])
      * generated method signature:   (thiz, callee, [args...])
@@ -933,11 +943,13 @@ public abstract class ScriptFunction extends ScriptObject {
             final MethodHandle collector = MH.asCollector(ScriptRuntime.APPLY.methodHandle(), Object[].class,
                     type.parameterCount() - 2);
 
-            return new GuardedInvocation(addPrimitiveWrap(collector, desc, request),
+            return new GuardedInvocation(collector,
                     desc.getMethodType().parameterType(0) == ScriptFunction.class ? null : NashornGuards.getScriptFunctionGuard());
         }
 
         MethodHandle boundHandle;
+        MethodHandle guard = null;
+
         if (hasCalleeParameter()) {
             final MethodHandle callHandle = getBestSpecializedInvokeHandle(type);
 
@@ -956,14 +968,23 @@ public abstract class ScriptFunction extends ScriptObject {
                 assert reorder[1] == 0;
                 final MethodType newType = oldType.changeParameterType(0, oldType.parameterType(1)).changeParameterType(1, oldType.parameterType(0));
                 boundHandle = MethodHandles.permuteArguments(callHandle, newType, reorder);
-                // thiz argument may be a JS primitive needing a wrapper
-                boundHandle = addPrimitiveWrap(boundHandle, desc, request);
+
+                // For non-strict functions, check whether this-object is primitive type.
+                // If so add a to-object-wrapper argument filter.
+                // Else install a guard that will trigger a relink when the argument becomes primitive.
+                if (isNonStrictFunction()) {
+                    if (isPrimitiveThis(request.getArguments()[1])) {
+                        boundHandle = MH.filterArguments(boundHandle, 1, WRAPFILTER);
+                    } else {
+                        guard = NashornGuards.getNonStrictFunctionGuard(this);
+                    }
+                }
             }
         } else {
             final MethodHandle callHandle = getBestSpecializedInvokeHandle(type.dropParameterTypes(0, 1));
 
             if(NashornCallSiteDescriptor.isScope(desc)) {
-                boundHandle = MH.bindTo(callHandle, isNonStrictFunction()? Context.getGlobalTrusted() : ScriptRuntime.UNDEFINED);
+                boundHandle = MH.bindTo(callHandle, isNonStrictFunction() ? Context.getGlobalTrusted() : ScriptRuntime.UNDEFINED);
                 boundHandle = MH.dropArguments(boundHandle, 0, Object.class, Object.class);
             } else {
                 boundHandle = MH.dropArguments(callHandle, 0, Object.class);
@@ -971,7 +992,7 @@ public abstract class ScriptFunction extends ScriptObject {
         }
 
         boundHandle = pairArguments(boundHandle, type);
-        return new NashornGuardedInvocation(boundHandle, null, NashornGuards.getFunctionGuard(this), isNonStrictFunction());
+        return new GuardedInvocation(boundHandle, guard == null ? NashornGuards.getFunctionGuard(this) : guard);
    }
 
     /**
@@ -997,16 +1018,25 @@ public abstract class ScriptFunction extends ScriptObject {
         return pairArguments(methodHandle, type);
     }
 
-    private MethodHandle addPrimitiveWrap(final MethodHandle mh, final CallSiteDescriptor desc, final LinkRequest request) {
-        // Check whether thiz is a JS primitive type and needs an object wrapper for non-strict function
-        if (!NashornCallSiteDescriptor.isScope(desc) && isNonStrictFunction()) {
-            Object self = request.getArguments()[1];
-            if (isPrimitiveThis(self)) {
-                MethodHandle wrapFilter = ((GlobalObject) Context.getGlobalTrusted()).getWrapFilter(self);
-                return MH.filterArguments(mh, 1, MH.asType(wrapFilter, wrapFilter.type().changeReturnType(Object.class)));
+    /**
+     * Convert this argument for non-strict functions according to ES 10.4.3
+     *
+     * @param thiz the this argument
+     *
+     * @return the converted this object
+     */
+    protected Object convertThisObject(final Object thiz) {
+        if (!(thiz instanceof ScriptObject) && isNonStrictFunction()) {
+            if (JSType.nullOrUndefined(thiz)) {
+                return Context.getGlobalTrusted();
+            }
+
+            if (isPrimitiveThis(thiz)) {
+                return ((GlobalObject)Context.getGlobalTrusted()).wrapAsObject(thiz);
             }
         }
-        return mh;
+
+        return thiz;
     }
 
     private static boolean isPrimitiveThis(Object obj) {
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
index 86bc0afcd4f..f4de714b5f4 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
@@ -64,7 +64,6 @@ import jdk.nashorn.internal.runtime.linker.Bootstrap;
 import jdk.nashorn.internal.runtime.linker.Lookup;
 import jdk.nashorn.internal.runtime.linker.MethodHandleFactory;
 import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
-import jdk.nashorn.internal.runtime.linker.NashornGuardedInvocation;
 import jdk.nashorn.internal.runtime.linker.NashornGuards;
 import org.dynalang.dynalink.CallSiteDescriptor;
 import org.dynalang.dynalink.linker.GuardedInvocation;
@@ -1712,11 +1711,9 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
         if (methodHandle != null) {
             assert methodHandle.type().returnType().equals(returnType);
             final ScriptFunction getter = find.getGetterFunction();
-            final boolean nonStrict = getter != null && getter.isNonStrictFunction();
             if (find.isSelf()) {
-                return new NashornGuardedInvocation(methodHandle, null, ObjectClassGenerator.OBJECT_FIELDS_ONLY &&
-                        NashornCallSiteDescriptor.isFastScope(desc) && !property.canChangeType() ? null : guard,
-                            nonStrict);
+                return new GuardedInvocation(methodHandle, ObjectClassGenerator.OBJECT_FIELDS_ONLY &&
+                        NashornCallSiteDescriptor.isFastScope(desc) && !property.canChangeType() ? null : guard);
             }
 
             final ScriptObject prototype = find.getOwner();
@@ -1724,7 +1721,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
             if (!property.hasGetterFunction()) {
                 methodHandle = bindTo(methodHandle, prototype);
             }
-            return new NashornGuardedInvocation(methodHandle, getMap().getProtoGetSwitchPoint(name), guard, nonStrict);
+            return new GuardedInvocation(methodHandle, getMap().getProtoGetSwitchPoint(name), guard);
         }
 
         assert !NashornCallSiteDescriptor.isFastScope(desc);
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/SetMethodCreator.java b/nashorn/src/jdk/nashorn/internal/runtime/SetMethodCreator.java
index 8001c327b77..fc75cf9f586 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/SetMethodCreator.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/SetMethodCreator.java
@@ -33,7 +33,6 @@ import java.lang.invoke.MethodHandle;
 import jdk.nashorn.internal.codegen.objects.ObjectClassGenerator;
 import jdk.nashorn.internal.runtime.linker.Lookup;
 import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
-import jdk.nashorn.internal.runtime.linker.NashornGuardedInvocation;
 import jdk.nashorn.internal.runtime.linker.NashornGuards;
 
 import org.dynalang.dynalink.CallSiteDescriptor;
@@ -41,8 +40,8 @@ import org.dynalang.dynalink.linker.GuardedInvocation;
 
 /**
  * Instances of this class are quite ephemeral; they only exist for the duration of an invocation of
- * {@link ScriptObject#findSetMethod(CallSiteDescriptor, boolean)} and serve as the actual encapsulation of the
- * algorithm for creating an appropriate property setter method.
+ * {@link ScriptObject#findSetMethod(CallSiteDescriptor, org.dynalang.dynalink.linker.LinkRequest)} and
+ * serve as the actual encapsulation of the algorithm for creating an appropriate property setter method.
  */
 class SetMethodCreator {
     // See constructor parameters for description of fields
@@ -89,19 +88,16 @@ class SetMethodCreator {
     private class SetMethod {
         private final MethodHandle methodHandle;
         private final Property property;
-        private final boolean nonStrict;
 
         /**
          * Creates a new lookup result.
          * @param methodHandle the actual method handle
          * @param property the property object. Can be null in case we're creating a new property in the global object.
-         * @param nonStrict True if an existing property with a non-strict function as property setter is discovered.
          */
-        SetMethod(final MethodHandle methodHandle, final Property property, final boolean nonStrict) {
+        SetMethod(final MethodHandle methodHandle, final Property property) {
             assert methodHandle != null;
             this.methodHandle = methodHandle;
             this.property = property;
-            this.nonStrict = nonStrict;
         }
 
         /**
@@ -109,7 +105,7 @@ class SetMethodCreator {
          * @return the composed guarded invocation that represents the dynamic setter method for the property.
          */
         GuardedInvocation createGuardedInvocation() {
-            return new NashornGuardedInvocation(methodHandle, null, getGuard(), nonStrict);
+            return new GuardedInvocation(methodHandle, getGuard());
         }
 
         private MethodHandle getGuard() {
@@ -162,17 +158,12 @@ class SetMethodCreator {
         } else {
             boundHandle = methodHandle;
         }
-        return new SetMethod(boundHandle, property, getExistingSetterNonStrictFlag());
-    }
-
-    private boolean getExistingSetterNonStrictFlag() {
-        final ScriptFunction setter = find.getSetterFunction();
-        return setter != null && setter.isNonStrictFunction();
+        return new SetMethod(boundHandle, property);
     }
 
     private SetMethod createGlobalPropertySetter() {
         final ScriptObject global = Context.getGlobalTrusted();
-        return new SetMethod(ScriptObject.bindTo(global.addSpill(getName()), global), null, false);
+        return new SetMethod(ScriptObject.bindTo(global.addSpill(getName()), global), null);
     }
 
     private SetMethod createNewPropertySetter() {
@@ -192,7 +183,7 @@ class SetMethodCreator {
         final int nextSpill = getMap().getSpillLength();
 
         final Property property = createSpillProperty(nextSpill);
-        return new SetMethod(createSpillMethodHandle(nextSpill, property), property, false);
+        return new SetMethod(createSpillMethodHandle(nextSpill, property), property);
     }
 
     private Property createSpillProperty(final int nextSpill) {
@@ -222,7 +213,7 @@ class SetMethodCreator {
         final Property property = new SpillProperty(getName(), 0, nextEmbed, ScriptObject.GET_EMBED[nextEmbed], ScriptObject.SET_EMBED[nextEmbed]);
         //TODO specfields
         final MethodHandle methodHandle = MH.insertArguments(ScriptObject.SETEMBED, 0, desc, getMap(), getNewMap(property), property.getSetter(Object.class, getMap()), nextEmbed);
-        return new SetMethod(methodHandle, property, false);
+        return new SetMethod(methodHandle, property);
     }
 
     private PropertyMap getNewMap(Property property) {
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornGuardedInvocation.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornGuardedInvocation.java
deleted file mode 100644
index 68d90894938..00000000000
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornGuardedInvocation.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.nashorn.internal.runtime.linker;
-
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.SwitchPoint;
-import org.dynalang.dynalink.linker.GuardedInvocation;
-
-/**
- * Guarded invocation with Nashorn specific bits.
- */
-public class NashornGuardedInvocation extends GuardedInvocation {
-
-    private final boolean nonStrict;
-
-    /**
-     * Constructor
-     *
-     * @param invocation  invocation target
-     * @param switchPoint SwitchPoint that will, when invalidated, require relinking callsite, null if no SwitchPoint
-     * @param guard       guard that will, when failed, require relinking callsite, null if no guard
-     * @param nonStrict   non-strict invocation target flag
-     */
-    public NashornGuardedInvocation(final MethodHandle invocation, final SwitchPoint switchPoint, final MethodHandle guard, final boolean nonStrict) {
-        super(invocation, switchPoint, guard);
-        this.nonStrict = nonStrict;
-
-    }
-
-    /**
-     * Is the target of this invocation a non-strict function?
-     * @return true if invocation target is non-strict
-     */
-    public boolean isNonStrict() {
-        return nonStrict;
-    }
-
-    /**
-     * Check whether the target of this invocation is a non-strict script function.
-     * @param inv guarded invocation
-     * @return true if invocation target is non-strict
-     */
-    public static boolean isNonStrict(final GuardedInvocation inv) {
-        return inv instanceof NashornGuardedInvocation && ((NashornGuardedInvocation)inv).isNonStrict();
-    }
-}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornGuards.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornGuards.java
index 2dcc355fef9..5993f932cff 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornGuards.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornGuards.java
@@ -41,6 +41,7 @@ public final class NashornGuards {
     private static final MethodHandle IS_SCRIPTFUNCTION        = findOwnMH("isScriptFunction", boolean.class, Object.class);
     private static final MethodHandle IS_MAP                   = findOwnMH("isMap", boolean.class, Object.class, PropertyMap.class);
     private static final MethodHandle IS_FUNCTION_MH           = findOwnMH("isFunctionMH", boolean.class, Object.class, MethodHandle.class);
+    private static final MethodHandle IS_NONSTRICT_FUNCTION    = findOwnMH("isNonStrictFunction", boolean.class, Object.class, Object.class, MethodHandle.class);
     private static final MethodHandle IS_INSTANCEOF_2          = findOwnMH("isInstanceOf2", boolean.class, Object.class, Class.class, Class.class);
 
     // don't create me!
@@ -99,6 +100,20 @@ public final class NashornGuards {
         return MH.insertArguments(IS_FUNCTION_MH, 1, function.getInvokeHandle());
     }
 
+    /**
+     * Get a guard that checks if a {@link ScriptFunction} is equal to
+     * a known ScriptFunction using reference comparison, and whether the type of
+     * the second argument (this-object) is not a JavaScript primitive type.
+     *
+     * @param function The ScriptFunction to check against. This will be bound to the guard method handle
+     *
+     * @return method handle for guard
+     */
+    public static MethodHandle getNonStrictFunctionGuard(final ScriptFunction function) {
+        assert function.getInvokeHandle() != null;
+        return MH.insertArguments(IS_NONSTRICT_FUNCTION, 2, function.getInvokeHandle());
+    }
+
     @SuppressWarnings("unused")
     private static boolean isScriptObject(final Object self) {
         return self instanceof ScriptObject;
@@ -119,6 +134,11 @@ public final class NashornGuards {
         return self instanceof ScriptFunction && ((ScriptFunction)self).getInvokeHandle() == mh;
     }
 
+    @SuppressWarnings("unused")
+    private static boolean isNonStrictFunction(final Object self, final Object arg, final MethodHandle mh) {
+        return self instanceof ScriptFunction && ((ScriptFunction)self).getInvokeHandle() == mh && arg instanceof ScriptObject;
+    }
+
     @SuppressWarnings("unused")
     private static boolean isInstanceOf2(final Object self, final Class<?> class1, final Class<?> class2) {
         return class1.isInstance(self) || class2.isInstance(self);
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java
index 9b593b45270..ed7be46a46c 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java
@@ -101,7 +101,7 @@ public class PrimitiveLookup {
         if (link != null) {
             MethodHandle method = link.getInvocation();
             final Class<?> receiverType = method.type().parameterType(0);
-            if (receiverType != Object.class || NashornGuardedInvocation.isNonStrict(link)) {
+            if (receiverType != Object.class) {
                 final MethodType wrapType = wrapFilter.type();
                 assert receiverType.isAssignableFrom(wrapType.returnType());
                 method = MH.filterArguments(method, 0, MH.asType(wrapFilter, wrapType.changeReturnType(receiverType)));
diff --git a/nashorn/test/script/basic/JDK-8007060.js b/nashorn/test/script/basic/JDK-8007060.js
new file mode 100644
index 00000000000..699cecb12c5
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8007060.js
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8007060 : Primitive wrap filter throws ClassCastException in test262parallel
+ *
+ * @test
+ * @run
+ */
+
+Object.prototype.T = function() {
+    print(this, typeof this);
+};
+
+function F() {
+    print(this, typeof this);
+}
+
+
+function test(obj) {
+   obj.T();
+}
+
+// Ordinary callsite - call often so we go to megamorphic
+test(1);
+test({});
+test("hello");
+test(1);
+test({});
+test("hello");
+test(1);
+test({});
+test("hello");
+test(1);
+test({});
+test("hello");
+test(1);
+test({});
+test("hello");
+test(1);
+test({});
+test("hello");
+test(1);
+test({});
+test("hello");
+test(1);
+test({});
+test("hello");
+
+// Dynamic invoker callsite used by NativeArray
+[1, 2, 3].filter(F, 1);
+[1, 2, 3].filter(F, {});
+[1, 2, 3].filter(F, "hello");
+[1, 2, 3].filter(F, 1);
+[1, 2, 3].filter(F, {});
+[1, 2, 3].filter(F, "hello");
+[1, 2, 3].filter(F, 1);
+[1, 2, 3].filter(F, {});
+[1, 2, 3].filter(F, "hello");
+[1, 2, 3].filter(F, 1);
+[1, 2, 3].filter(F, {});
+[1, 2, 3].filter(F, "hello");
+[1, 2, 3].filter(F, 1);
+[1, 2, 3].filter(F, {});
+[1, 2, 3].filter(F, "hello");
+[1, 2, 3].filter(F, 1);
+[1, 2, 3].filter(F, {});
+[1, 2, 3].filter(F, "hello");
+[1, 2, 3].filter(F, 1);
+[1, 2, 3].filter(F, {});
+[1, 2, 3].filter(F, "hello");
+[1, 2, 3].filter(F, 1);
+[1, 2, 3].filter(F, {});
+[1, 2, 3].filter(F, "hello");
\ No newline at end of file
diff --git a/nashorn/test/script/basic/JDK-8007060.js.EXPECTED b/nashorn/test/script/basic/JDK-8007060.js.EXPECTED
new file mode 100644
index 00000000000..4c504bfa1a2
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8007060.js.EXPECTED
@@ -0,0 +1,96 @@
+1 object
+[object Object] object
+hello object
+1 object
+[object Object] object
+hello object
+1 object
+[object Object] object
+hello object
+1 object
+[object Object] object
+hello object
+1 object
+[object Object] object
+hello object
+1 object
+[object Object] object
+hello object
+1 object
+[object Object] object
+hello object
+1 object
+[object Object] object
+hello object
+1 object
+1 object
+1 object
+[object Object] object
+[object Object] object
+[object Object] object
+hello object
+hello object
+hello object
+1 object
+1 object
+1 object
+[object Object] object
+[object Object] object
+[object Object] object
+hello object
+hello object
+hello object
+1 object
+1 object
+1 object
+[object Object] object
+[object Object] object
+[object Object] object
+hello object
+hello object
+hello object
+1 object
+1 object
+1 object
+[object Object] object
+[object Object] object
+[object Object] object
+hello object
+hello object
+hello object
+1 object
+1 object
+1 object
+[object Object] object
+[object Object] object
+[object Object] object
+hello object
+hello object
+hello object
+1 object
+1 object
+1 object
+[object Object] object
+[object Object] object
+[object Object] object
+hello object
+hello object
+hello object
+1 object
+1 object
+1 object
+[object Object] object
+[object Object] object
+[object Object] object
+hello object
+hello object
+hello object
+1 object
+1 object
+1 object
+[object Object] object
+[object Object] object
+[object Object] object
+hello object
+hello object
+hello object

From 58f1fb6ecdf4204dde985f484f0c71452c8cb221 Mon Sep 17 00:00:00 2001
From: James Laskey <james.laskey@oracle.com>
Date: Mon, 4 Feb 2013 08:13:05 -0400
Subject: [PATCH 108/311] 8007455: Extraneous $(ECHO) in make/Makefile

Reviewed-by: sundar
---
 nashorn/make/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nashorn/make/Makefile b/nashorn/make/Makefile
index ee7593734a8..965c30a43a1 100644
--- a/nashorn/make/Makefile
+++ b/nashorn/make/Makefile
@@ -185,7 +185,6 @@ all: test docs
 
 # Standard make clobber target
 clobber: clean
-    $(ECHO) "Cleaning Nashorn! #1"
 
 # All ant targets of interest
 ANT_TARGETS = clean externals update-externals jar javadoc shelldoc docs test test262 test262parallel octane sunspider perf alltests

From bd2303d9e48c9a876ad499346dfc88e5e82a7e97 Mon Sep 17 00:00:00 2001
From: Attila Szegedi <attila@openjdk.org>
Date: Mon, 4 Feb 2013 15:59:44 +0100
Subject: [PATCH 109/311] 8007460: var assignment to a parameter in a varargs
 method causes compilation error

Reviewed-by: jlaskey, lagergren
---
 .../internal/codegen/CodeGenerator.java       |  11 +-
 .../internal/codegen/MethodEmitter.java       | 113 ++++++------------
 nashorn/test/script/basic/JDK-8007460.js      |  40 +++++++
 .../test/script/basic/JDK-8007460.js.EXPECTED |   4 +
 4 files changed, 85 insertions(+), 83 deletions(-)
 create mode 100644 nashorn/test/script/basic/JDK-8007460.js
 create mode 100644 nashorn/test/script/basic/JDK-8007460.js.EXPECTED

diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
index 00ceb4defd4..7a23751c7a5 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
@@ -201,10 +201,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
         final Symbol symbol = identNode.getSymbol();
 
         if (!symbol.isScope()) {
-            if(symbol.isParam()) {
-                return method.loadParam(symbol);
-            }
-            assert symbol.hasSlot() && symbol.getSlot() != 0 || symbol.isThis();
+            assert symbol.hasSlot() || symbol.isParam();
             return method.load(symbol);
         }
 
@@ -3200,11 +3197,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
                         }
                     } else {
                         assert symbol != null;
-                        if(symbol.isParam()) {
-                            method.storeParam(symbol);
-                        } else {
-                            method.store(symbol);
-                        }
+                        method.store(symbol);
                     }
                     return null;
 
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java b/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java
index 926e8fb4571..417453aa6f8 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java
@@ -829,44 +829,26 @@ public class MethodEmitter implements Emitter {
     public MethodEmitter load(final Symbol symbol) {
         assert symbol != null;
         if (symbol.hasSlot()) {
-            debug("load symbol", symbol.getName() + " slot=" + symbol.getSlot());
-            pushType(symbol.getSymbolType().load(method, symbol.getSlot()));
-        }
-        return this;
-    }
-
-    /**
-     * Push a non-scope function parameter to the stack. Function parameters always arrive into a function as either
-     * explicit parameters on the stack, or collected into a final variable-arity {@code Object[]} parameter. If they
-     * end up being scoped (i.e. referenced from a child function or eval), then they're loaded as scoped symbols and
-     * this function is not invoked for them. If they aren't scoped, then they will be loaded from one of three places.
-     * First, if the function has an Arguments object, they're loaded from it. Otherwise, if the parameters come in a
-     * {@code Object[]} array, they are loaded from the array. Finally, if neither is the case, they're simply loaded
-     * from their bytecode slot.
-     *
-     * @param symbol the symbol representing the parameter.
-     *
-     * @return the method emitter
-     */
-    public MethodEmitter loadParam(final Symbol symbol) {
-        assert symbol != null && symbol.isParam() && !symbol.isScope();
-        if(symbol.hasSlot()) {
-            // Check that we aren't vararg, except if we're loading "this"
-            assert symbol.isThis() || !functionNode.isVarArg() : "Symbol=" + symbol + " functionNode=" + functionNode.getName();
-            // Just load it from a local variable
-            return load(symbol);
-        }
-        assert functionNode.isVarArg();
-        if(functionNode.needsArguments()) {
-            // ScriptObject.getArgument(int) on arguments
-            loadArguments();
-            load(symbol.getFieldIndex());
-            ScriptObject.GET_ARGUMENT.invoke(this);
-        } else {
-            // array load from __varargs__
-            loadVarArgs();
-            load(symbol.getFieldIndex());
-            arrayload();
+            final int slot = symbol.getSlot();
+            debug("load symbol", symbol.getName(), " slot=", slot);
+            pushType(symbol.getSymbolType().load(method, slot));
+        } else if (symbol.isParam()) {
+            assert !symbol.isScope();
+            assert functionNode.isVarArg() : "Non-vararg functions have slotted parameters";
+            final int index = symbol.getFieldIndex();
+            if(functionNode.needsArguments()) {
+                // ScriptObject.getArgument(int) on arguments
+                debug("load symbol", symbol.getName(), " arguments index=", index);
+                loadArguments();
+                load(index);
+                ScriptObject.GET_ARGUMENT.invoke(this);
+            } else {
+                // array load from __varargs__
+                debug("load symbol", symbol.getName(), " array index=", index);
+                loadVarArgs();
+                load(symbol.getFieldIndex());
+                arrayload();
+            }
         }
         return this;
     }
@@ -1033,45 +1015,28 @@ public class MethodEmitter implements Emitter {
     public void store(final Symbol symbol) {
         assert symbol != null : "No symbol to store";
         if (symbol.hasSlot()) {
-            debug("store", symbol);
-            popType(symbol.getSymbolType()).store(method, symbol.getSlot());
+            final int slot = symbol.getSlot();
+            debug("store symbol", symbol.getName(), " slot=", slot);
+            popType(symbol.getSymbolType()).store(method, slot);
+        } else if (symbol.isParam()) {
+            assert !symbol.isScope();
+            assert functionNode.isVarArg() : "Non-vararg functions have slotted parameters";
+            final int index = symbol.getFieldIndex();
+            if(functionNode.needsArguments()) {
+                debug("store symbol", symbol.getName(), " arguments index=", index);
+                loadArguments();
+                load(index);
+                ArgumentSetter.SET_ARGUMENT.invoke(this);
+            } else {
+                // varargs without arguments object - just do array store to __varargs__
+                debug("store symbol", symbol.getName(), " array index=", index);
+                loadVarArgs();
+                load(index);
+                ArgumentSetter.SET_ARRAY_ELEMENT.invoke(this);
+            }
         }
     }
 
-    /**
-     * Pop a value from the stack and store it in a non-scope function parameter. Function parameters always arrive into
-     * a function as either explicit parameters on th stack, or collected into a final variable-arity {@code Object[]}
-     * parameter. If they end up being scoped (i.e. referenced from a child function or eval), then they're stored as
-     * scoped symbols are and this function is not invoked for them. If they aren't scoped, then they will be stored
-     * to one of three places. First, if the function has an Arguments object, they're stored to it. Otherwise, if the
-     * parameters come in a {@code Object[]} array, they are stored to the array. Finally, if neither is the case,
-     * they're simply stored to their bytecode slot.
-     *
-     * @param symbol the symbol representing the parameter.
-     *
-     */
-    public void storeParam(final Symbol symbol) {
-        assert symbol != null && symbol.isParam() && !symbol.isScope();
-        if(symbol.hasSlot()) {
-            assert !functionNode.isVarArg();
-            // Just store it to a local variable
-            store(symbol);
-            return;
-        }
-        assert functionNode.isVarArg();
-        if(functionNode.needsArguments()) {
-            loadArguments();
-            load(symbol.getFieldIndex());
-            ArgumentSetter.SET_ARGUMENT.invoke(this);
-        } else {
-            // varargs without arguments object - just do array store to __varargs__
-            loadVarArgs();
-            load(symbol.getFieldIndex());
-            ArgumentSetter.SET_ARRAY_ELEMENT.invoke(this);
-        }
-    }
-
-
     /**
      * Pop a value from the stack and store it in a given local variable
      * slot.
diff --git a/nashorn/test/script/basic/JDK-8007460.js b/nashorn/test/script/basic/JDK-8007460.js
new file mode 100644
index 00000000000..7dc4c31f105
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8007460.js
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8007460: code generation error for variable-argument function that has a var-assignment to one of its parameters
+ *
+ * @test
+ * @run
+ */
+
+function f(y) {
+  print(y)
+  print(arguments[0])
+
+  var y = 1
+
+  print(y)
+  print(arguments[0])
+}
+f(2)
\ No newline at end of file
diff --git a/nashorn/test/script/basic/JDK-8007460.js.EXPECTED b/nashorn/test/script/basic/JDK-8007460.js.EXPECTED
new file mode 100644
index 00000000000..74cd8c6d31f
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8007460.js.EXPECTED
@@ -0,0 +1,4 @@
+2
+2
+1
+1

From 8b7a8d75b392f8ed3b61cdfa05b3e4fbf55ab77b Mon Sep 17 00:00:00 2001
From: Marcus Lagergren <lagergren@openjdk.org>
Date: Mon, 4 Feb 2013 16:20:05 +0100
Subject: [PATCH 110/311] 8007215: Varargs broken for the case of passing more
 than the arg limit arguments

Reviewed-by: jlaskey, attila
---
 .../api/scripting/NashornException.java       |  2 +-
 .../api/scripting/NashornScriptEngine.java    |  1 -
 .../internal/codegen/CodeGenerator.java       | 44 +++++++---------
 .../internal/codegen/FunctionSignature.java   | 20 ++-----
 .../internal/codegen/MethodEmitter.java       | 29 ++++++-----
 .../internal/codegen/RuntimeCallSite.java     |  8 ++-
 .../internal/codegen/SharedScopeCall.java     |  2 +-
 .../jdk/nashorn/internal/objects/Global.java  |  8 +--
 .../internal/runtime/ECMAException.java       |  1 -
 .../internal/runtime/ScriptFunction.java      |  8 +++
 .../internal/runtime/ScriptObject.java        |  2 -
 nashorn/test/script/basic/JDK-8007215.js      | 52 +++++++++++++++++++
 .../test/script/basic/JDK-8007215.js.EXPECTED |  3 ++
 13 files changed, 113 insertions(+), 67 deletions(-)
 create mode 100644 nashorn/test/script/basic/JDK-8007215.js
 create mode 100644 nashorn/test/script/basic/JDK-8007215.js.EXPECTED

diff --git a/nashorn/src/jdk/nashorn/api/scripting/NashornException.java b/nashorn/src/jdk/nashorn/api/scripting/NashornException.java
index eae8c3bf127..717046e5da8 100644
--- a/nashorn/src/jdk/nashorn/api/scripting/NashornException.java
+++ b/nashorn/src/jdk/nashorn/api/scripting/NashornException.java
@@ -44,7 +44,7 @@ public class NashornException extends RuntimeException {
     // script column number
     private int         column;
 
-    // script source name used for "engine.js"
+    /** script source name used for "engine.js" */
     protected static final String ENGINE_SCRIPT_SOURCE_NAME = "nashorn:engine/resources/engine.js";
 
     /**
diff --git a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
index 02b7e911bbd..289661f711a 100644
--- a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
+++ b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
@@ -26,7 +26,6 @@
 package jdk.nashorn.api.scripting;
 
 import static jdk.nashorn.internal.runtime.ECMAErrors.referenceError;
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
 import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 
 import java.io.IOException;
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
index 7a23751c7a5..1f3e9675516 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
@@ -490,15 +490,15 @@ public final class CodeGenerator extends NodeOperatorVisitor {
         return null;
     }
 
-    private MethodEmitter loadArgs(final List<Node> args) {
+    private int loadArgs(final List<Node> args) {
         return loadArgs(args, null, false, args.size());
     }
 
-    private MethodEmitter loadArgs(final List<Node> args, final String signature, final boolean isVarArg, final int argCount) {
+    private int loadArgs(final List<Node> args, final String signature, final boolean isVarArg, final int argCount) {
         // arg have already been converted to objects here.
         if (isVarArg || argCount > LinkerCallSite.ARGLIMIT) {
             loadArgsArray(args);
-            return method;
+            return 1;
         }
 
         // pad with undefined if size is too short. argCount is the real number of args
@@ -520,7 +520,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
             n++;
         }
 
-        return method;
+        return argCount;
     }
 
     @Override
@@ -556,9 +556,8 @@ public final class CodeGenerator extends NodeOperatorVisitor {
                 load(node);
                 method.convert(Type.OBJECT); // foo() makes no sense if foo == 3
                 // ScriptFunction will see CALLSITE_SCOPE and will bind scope accordingly.
-                method.loadNull();
-                loadArgs(args);
-                method.dynamicCall(callNode.getType(), args.size(), flags);
+                method.loadNull(); //the 'this'
+                method.dynamicCall(callNode.getType(), 2 + loadArgs(args), flags);
             }
 
             private void evalCall(final IdentNode node, final int flags) {
@@ -597,8 +596,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
                 // This is some scope 'eval' or global eval replaced by user
                 // but not the built-in ECMAScript 'eval' function call
                 method.loadNull();
-                loadArgs(args);
-                method.dynamicCall(callNode.getType(), args.size(), flags);
+                method.dynamicCall(callNode.getType(), 2 + loadArgs(args), flags);
 
                 method.label(eval_done);
             }
@@ -638,8 +636,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
                 method.dup();
                 method.dynamicGet(node.getType(), node.getProperty().getName(), getCallSiteFlags(), true);
                 method.swap();
-                loadArgs(args);
-                method.dynamicCall(callNode.getType(), args.size(), getCallSiteFlags());
+                method.dynamicCall(callNode.getType(), 2 + loadArgs(args), getCallSiteFlags());
                 assert method.peekType().equals(callNode.getType());
 
                 return null;
@@ -682,8 +679,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
                 }
                 method.dynamicGetIndex(node.getType(), getCallSiteFlags(), true);
                 method.swap();
-                loadArgs(args);
-                method.dynamicCall(callNode.getType(), args.size(), getCallSiteFlags());
+                method.dynamicCall(callNode.getType(), 2 + loadArgs(args), getCallSiteFlags());
                 assert method.peekType().equals(callNode.getType());
 
                 return null;
@@ -695,9 +691,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
                 load(function);
                 method.convert(Type.OBJECT); //TODO, e.g. booleans can be used as functions
                 method.loadNull(); // ScriptFunction will figure out the correct this when it sees CALLSITE_SCOPE
-
-                loadArgs(args);
-                method.dynamicCall(callNode.getType(), args.size(), getCallSiteFlags() | CALLSITE_SCOPE);
+                method.dynamicCall(callNode.getType(), 2 + loadArgs(args), getCallSiteFlags() | CALLSITE_SCOPE);
                 assert method.peekType().equals(callNode.getType());
 
                 return null;
@@ -1611,7 +1605,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
         // Get the request arguments.
         final List<Node> args = runtimeNode.getArgs();
 
-        if (nullCheck(runtimeNode, args, new FunctionSignature(false, runtimeNode.getType(), args).toString())) {
+        if (nullCheck(runtimeNode, args, new FunctionSignature(false, false, runtimeNode.getType(), args).toString())) {
             return null;
         }
 
@@ -1627,6 +1621,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
             CompilerConstants.className(ScriptRuntime.class),
             runtimeNode.getRequest().toString(),
             new FunctionSignature(
+                false,
                 false,
                 runtimeNode.getType(),
                 runtimeNode.getArgs().size()).toString());
@@ -2292,10 +2287,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
         // Load function reference.
         load(callNode.getFunction()).convert(Type.OBJECT); // must detect type error
 
-        // Load arguments.
-        loadArgs(args);
-
-        method.dynamicNew(args.size(), getCallSiteFlags());
+        method.dynamicNew(1 + loadArgs(args), getCallSiteFlags());
         method.store(unaryNode.getSymbol());
 
         return null;
@@ -2884,7 +2876,10 @@ public final class CodeGenerator extends NodeOperatorVisitor {
         final Label  falseLabel = new Label("ternary_false");
         final Label  exitLabel  = new Label("ternary_exit");
 
-        final Type widest = Type.widest(rhs.getType(), third.getType());
+        Type widest = Type.widest(rhs.getType(), third.getType());
+        if (rhs.getType().isArray() || third.getType().isArray()) { //loadArray creates a Java array type on the stack, calls global allocate, which creates a native array type
+            widest = Type.OBJECT;
+        }
 
         load(lhs);
         assert lhs.getType().isBoolean() : "lhs in ternary must be boolean";
@@ -3159,7 +3154,6 @@ public final class CodeGenerator extends NodeOperatorVisitor {
         }
 
         private void epilogue() {
-            final Symbol targetSymbol = target.getSymbol();
             final FunctionNode currentFunction = getCurrentFunctionNode();
 
             /**
@@ -3176,7 +3170,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
                 @Override
                 protected Node enterDefault(Node node) {
                     throw new AssertionError("Unexpected node " + node + " in store epilogue");
-                };
+                }
 
                 @Override
                 public Node enter(final UnaryNode node) {
@@ -3261,7 +3255,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
 
     private MethodEmitter globalAllocateArray(final ArrayType type) {
         //make sure the native array is treated as an array type
-        return method.invokeStatic(Compiler.GLOBAL_OBJECT, "allocate", methodDescriptor(Object.class, type.getTypeClass()), type);
+        return method.invokeStatic(Compiler.GLOBAL_OBJECT, "allocate", "(" + type.getDescriptor() + ")Ljdk/nashorn/internal/objects/NativeArray;");
     }
 
     private MethodEmitter globalIsEval() {
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/FunctionSignature.java b/nashorn/src/jdk/nashorn/internal/codegen/FunctionSignature.java
index c4b2955ad04..818c7129156 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/FunctionSignature.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/FunctionSignature.java
@@ -49,19 +49,6 @@ public final class FunctionSignature {
     /** valid Java descriptor string for function */
     private final String descriptor;
 
-    /**
-     * Constructor
-     *
-     * Create a FunctionSignature given arguments as AST Nodes
-     *
-     * @param hasSelf does the function have a self slot?
-     * @param retType what is the return type
-     * @param args    argument list of AST Nodes
-     */
-    public FunctionSignature(final boolean hasSelf, final Type retType, final List<? extends Node> args) {
-        this(hasSelf, false, retType, FunctionSignature.typeArray(args));
-    }
-
     /**
      * Constructor
      *
@@ -82,11 +69,12 @@ public final class FunctionSignature {
      * Create a FunctionSignature given arguments as AST Nodes
      *
      * @param hasSelf does the function have a self slot?
+     * @param hasCallee does the function need a callee variable
      * @param retType what is the return type
      * @param nArgs   number of arguments
      */
-    public FunctionSignature(final boolean hasSelf, final Type retType, final int nArgs) {
-        this(hasSelf, false, retType, FunctionSignature.objectArgs(nArgs));
+    public FunctionSignature(final boolean hasSelf, final boolean hasCallee, final Type retType, final int nArgs) {
+        this(hasSelf, hasCallee, retType, FunctionSignature.objectArgs(nArgs));
     }
 
     /**
@@ -99,7 +87,7 @@ public final class FunctionSignature {
      * @param retType   what is the return type
      * @param argTypes  argument list of AST Nodes
      */
-    public FunctionSignature(final boolean hasSelf, final boolean hasCallee, final Type retType, final Type... argTypes) {
+    private FunctionSignature(final boolean hasSelf, final boolean hasCallee, final Type retType, final Type... argTypes) {
         final boolean isVarArg;
 
         int count = 1;
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java b/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java
index 417453aa6f8..e87468bacc9 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java
@@ -1759,23 +1759,19 @@ public class MethodEmitter implements Emitter {
      *
      * @return function signature for stack contents
      */
-    private String getDynamicSignature(final Type returnType, final int argCount, final boolean hasSelf) {
-        final Iterator<Type> iter     = stack.iterator();
-        final Type[]         argTypes = new Type[argCount];
+    private String getDynamicSignature(final Type returnType, final int argCount) {
+        final Iterator<Type> iter       = stack.iterator();
+        final Type[]         paramTypes = new Type[argCount];
 
         for (int i = argCount - 1; i >= 0; i--) {
-            argTypes[i] = iter.next();
+            paramTypes[i] = iter.next();
         }
-
-        final FunctionSignature sig = new FunctionSignature(hasSelf, false, returnType, argTypes);
+        final String descriptor = Type.getMethodDescriptor(returnType, paramTypes);
         for (int i = 0; i < argCount; i++) {
-            popType(argTypes[argCount - i - 1]);
-        }
-        for (int i = 0 ; i < sig.size() - argTypes.length; i++) {
-            popType(Type.OBJECT);
+            popType(paramTypes[argCount - i - 1]);
         }
 
-        return sig.toString();
+        return descriptor;
     }
 
     /**
@@ -1788,7 +1784,7 @@ public class MethodEmitter implements Emitter {
      */
     public MethodEmitter dynamicNew(final int argCount, final int flags) {
         debug("dynamic_new", "argcount=" + argCount);
-        final String signature = getDynamicSignature(Type.OBJECT, argCount, true);
+        final String signature = getDynamicSignature(Type.OBJECT, argCount);
         method.visitInvokeDynamicInsn("dyn:new", signature, LINKERBOOTSTRAP, flags);
         pushType(Type.OBJECT); //TODO fix result type
         return this;
@@ -1805,7 +1801,7 @@ public class MethodEmitter implements Emitter {
      */
     public MethodEmitter dynamicCall(final Type returnType, final int argCount, final int flags) {
         debug("dynamic_call", "args=" + argCount, "returnType=" + returnType);
-        final String signature = getDynamicSignature(returnType, argCount + 1, true);
+        final String signature = getDynamicSignature(returnType, argCount); // +1 because the function itself is the 1st parameter for dynamic calls (what you call - call target)
         debug("   signature", signature);
         method.visitInvokeDynamicInsn("dyn:call", signature, LINKERBOOTSTRAP, flags);
         pushType(returnType);
@@ -1824,7 +1820,7 @@ public class MethodEmitter implements Emitter {
      */
     public MethodEmitter dynamicRuntimeCall(final String name, final Type returnType, final RuntimeNode.Request request) {
         debug("dynamic_runtime_call", name, "args=" + request.getArity(), "returnType=" + returnType);
-        final String signature = getDynamicSignature(returnType, request.getArity(), false);
+        final String signature = getDynamicSignature(returnType, request.getArity());
         debug("   signature", signature);
         method.visitInvokeDynamicInsn(name, signature, RUNTIMEBOOTSTRAP);
         pushType(returnType);
@@ -2198,6 +2194,11 @@ public class MethodEmitter implements Emitter {
                         sb.append("this");
                     } else if (t.isObject()) {
                         String desc = t.getDescriptor();
+                        int i;
+                        for (i = 0; desc.charAt(i) == '[' && i < desc.length(); i++) {
+                            sb.append('[');
+                        }
+                        desc = desc.substring(i);
                         final int slash = desc.lastIndexOf('/');
                         if (slash != -1) {
                             desc = desc.substring(slash + 1, desc.length() - 1);
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/RuntimeCallSite.java b/nashorn/src/jdk/nashorn/internal/codegen/RuntimeCallSite.java
index 180f55834fa..95b592df98b 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/RuntimeCallSite.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/RuntimeCallSite.java
@@ -327,17 +327,21 @@ public class RuntimeCallSite extends MutableCallSite {
                     }
                 }
                 addcheck = MH.explicitCastArguments(addcheck, type().changeReturnType(boolean.class));
-                guard    = MH.guardWithTest(guard, addcheck,
+                guard    = MH.guardWithTest(upcastGuard(guard), addcheck,
                                 MH.dropArguments(MH.constant(boolean.class, false), 0, type().parameterArray()));
             }
 
-            return MH.guardWithTest(guard, mh, fallback);
+            return MH.guardWithTest(upcastGuard(guard), mh, fallback);
         }
 
         // generic fallback
         return MH.explicitCastArguments(Lookup.filterReturnType(GENERIC_METHODS.get(request.name()), type().returnType()), type());
     }
 
+    private MethodHandle upcastGuard(final MethodHandle guard) {
+        return MH.asType(guard, type().changeReturnType(boolean.class));
+    }
+
     /**
      * This is public just so that the generated specialization code can
      * use it to get the next wider typed method
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/SharedScopeCall.java b/nashorn/src/jdk/nashorn/internal/codegen/SharedScopeCall.java
index a09ffc961a1..70be10876c3 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/SharedScopeCall.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/SharedScopeCall.java
@@ -163,7 +163,7 @@ public class SharedScopeCall {
                     slot++;
                 }
             }
-            method.dynamicCall(returnType, paramTypes.length, flags);
+            method.dynamicCall(returnType, 2 + paramTypes.length, flags);
         }
 
         method._return(returnType);
diff --git a/nashorn/src/jdk/nashorn/internal/objects/Global.java b/nashorn/src/jdk/nashorn/internal/objects/Global.java
index a9fcc03d33f..4cc98080bda 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/Global.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/Global.java
@@ -1158,7 +1158,7 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
      * @param initial object values.
      * @return the new array
      */
-    public static Object allocate(final Object[] initial) {
+    public static NativeArray allocate(final Object[] initial) {
         return new NativeArray(initial);
     }
 
@@ -1168,7 +1168,7 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
      * @param initial number values.
      * @return the new array
      */
-    public static Object allocate(final double[] initial) {
+    public static NativeArray allocate(final double[] initial) {
         return new NativeArray(initial);
     }
 
@@ -1178,7 +1178,7 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
      * @param initial number values.
      * @return the new array
      */
-    public static Object allocate(final long[] initial) {
+    public static NativeArray allocate(final long[] initial) {
         return new NativeArray(initial);
     }
 
@@ -1188,7 +1188,7 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
      * @param initial number values.
      * @return the new array
      */
-    public static Object allocate(final int[] initial) {
+    public static NativeArray allocate(final int[] initial) {
         return new NativeArray(initial);
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ECMAException.java b/nashorn/src/jdk/nashorn/internal/runtime/ECMAException.java
index 04082455732..191ee66913d 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ECMAException.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ECMAException.java
@@ -31,7 +31,6 @@ import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 
 import javax.script.ScriptException;
 import jdk.nashorn.api.scripting.NashornException;
-import jdk.nashorn.api.scripting.NashornScriptEngine;
 import jdk.nashorn.internal.codegen.CompilerConstants.Call;
 import jdk.nashorn.internal.codegen.CompilerConstants.FieldAccess;
 import jdk.nashorn.internal.scripts.JS$;
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
index 57a4812d0ff..c0b89be9e7e 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
@@ -721,7 +721,15 @@ public abstract class ScriptFunction extends ScriptObject {
         return hasCalleeParameter() ? MH.bindTo(bound, this) : bound;
     }
 
+    /**
+     * Check whether the ScriptFunction has callee parameter
+     * @return true if callee parameter
+     */
     protected abstract boolean hasCalleeParameter();
+
+    /**
+     * Flag ScriptFunction as needing a callee parameter
+     */
     protected abstract void setHasCalleeParameter();
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
index f4de714b5f4..8c1076285f6 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
@@ -86,7 +86,6 @@ import org.dynalang.dynalink.support.CallSiteDescriptorFactory;
  * </ul>
  */
 
-
 public abstract class ScriptObject extends PropertyListenerManager implements PropertyAccess {
 
     /** Search fall back routine name for "no such method" */
@@ -1710,7 +1709,6 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
 
         if (methodHandle != null) {
             assert methodHandle.type().returnType().equals(returnType);
-            final ScriptFunction getter = find.getGetterFunction();
             if (find.isSelf()) {
                 return new GuardedInvocation(methodHandle, ObjectClassGenerator.OBJECT_FIELDS_ONLY &&
                         NashornCallSiteDescriptor.isFastScope(desc) && !property.canChangeType() ? null : guard);
diff --git a/nashorn/test/script/basic/JDK-8007215.js b/nashorn/test/script/basic/JDK-8007215.js
new file mode 100644
index 00000000000..0dbd718588e
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8007215.js
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Varargs based on too many parameters broke. Regression test.
+ * 
+ * @test
+ * @run
+ */
+
+function f() {
+    var sum = 0;
+    for (var i = 0; i < arguments.length; i++) {
+	var a = arguments[i];
+	sum += a;
+    }
+    return sum;
+} 
+
+var res;
+
+res = f(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249);
+
+print(res);
+
+res = f(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250);
+
+print(res);
+
+res = f(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251);
+
+print(res);
diff --git a/nashorn/test/script/basic/JDK-8007215.js.EXPECTED b/nashorn/test/script/basic/JDK-8007215.js.EXPECTED
new file mode 100644
index 00000000000..5cf89c2407b
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8007215.js.EXPECTED
@@ -0,0 +1,3 @@
+31125
+31375
+31626

From 233a9042cf575cc51e2941adf990b69b3f3e62e7 Mon Sep 17 00:00:00 2001
From: James Laskey <james.laskey@oracle.com>
Date: Mon, 4 Feb 2013 14:48:35 -0400
Subject: [PATCH 111/311] 8006191: `cmd` -> exec("cmd") in script mode

Reviewed-by: sundar, lagergren, hannesw
---
 .../api/scripting/NashornScriptEngine.java    |   4 +-
 .../jdk/nashorn/internal/objects/Global.java  |   8 ++
 .../jdk/nashorn/internal/parser/Lexer.java    |  34 ++++-
 .../jdk/nashorn/internal/parser/Parser.java   |  33 ++++-
 .../nashorn/internal/parser/TokenType.java    |   1 +
 .../jdk/nashorn/internal/runtime/Context.java |  29 +++-
 .../internal/runtime/OptionsObject.java       |   4 +-
 .../internal/runtime/ScriptingFunctions.java  | 131 ++++++++++++++++++
 .../runtime/resources/Messages.properties     |   1 +
 nashorn/test/script/basic/JDK-8006191.js      |  65 +++++++++
 .../test/script/basic/JDK-8006191.js.EXPECTED |  14 ++
 11 files changed, 309 insertions(+), 15 deletions(-)
 create mode 100644 nashorn/test/script/basic/JDK-8006191.js
 create mode 100644 nashorn/test/script/basic/JDK-8006191.js.EXPECTED

diff --git a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
index 289661f711a..5217555ff39 100644
--- a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
+++ b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
@@ -259,7 +259,7 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
             @Override
             public ScriptObject run() {
                 try {
-                    return nashornContext.createGlobal();
+                    return nashornContext.newGlobal();
                 } catch (final RuntimeException e) {
                     if (Context.DEBUG) {
                         e.printStackTrace();
@@ -269,6 +269,8 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
             }
         });
 
+        nashornContext.initGlobal(newGlobal);
+
         // current ScriptContext exposed as "context"
         newGlobal.addOwnProperty("context", Property.NOT_ENUMERABLE, UNDEFINED);
         // current ScriptEngine instance exposed as "engine". We added @SuppressWarnings("LeakingThisInConstructor") as
diff --git a/nashorn/src/jdk/nashorn/internal/objects/Global.java b/nashorn/src/jdk/nashorn/internal/objects/Global.java
index 4cc98080bda..380566e2d14 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/Global.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/Global.java
@@ -1450,6 +1450,10 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
         value = ScriptFunctionImpl.makeFunction("quit", ScriptingFunctions.QUIT);
         addOwnProperty("quit", Attribute.NOT_ENUMERABLE, value);
 
+        final String execName = ScriptingFunctions.EXEC_NAME;
+        value = ScriptFunctionImpl.makeFunction(execName, ScriptingFunctions.EXEC);
+        addOwnProperty(execName, Attribute.NOT_ENUMERABLE, value);
+
         // Nashorn extension: global.echo (scripting-mode-only)
         // alias for "print"
         value = get("print");
@@ -1458,6 +1462,10 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
         // Nashorn extension: global.$OPTIONS (scripting-mode-only)
         value = new OptionsObject(this.getContext());
         addOwnProperty("$OPTIONS", Attribute.NOT_ENUMERABLE, value);
+
+        // Nashorn extension: global.$ENV (scripting-mode-only)
+        value = ScriptingFunctions.getENVValues(newEmptyInstance(), this.isStrictContext());
+        addOwnProperty(ScriptingFunctions.ENV_NAME, Attribute.NOT_ENUMERABLE, value);
     }
 
     private void initTypedArray() {
diff --git a/nashorn/src/jdk/nashorn/internal/parser/Lexer.java b/nashorn/src/jdk/nashorn/internal/parser/Lexer.java
index e5d99207cc4..954b2a5a24e 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/Lexer.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/Lexer.java
@@ -36,9 +36,11 @@ import static jdk.nashorn.internal.parser.TokenType.HEXADECIMAL;
 import static jdk.nashorn.internal.parser.TokenType.LBRACE;
 import static jdk.nashorn.internal.parser.TokenType.LPAREN;
 import static jdk.nashorn.internal.parser.TokenType.OCTAL;
+import static jdk.nashorn.internal.parser.TokenType.RBRACE;
 import static jdk.nashorn.internal.parser.TokenType.REGEX;
 import static jdk.nashorn.internal.parser.TokenType.RPAREN;
 import static jdk.nashorn.internal.parser.TokenType.STRING;
+import static jdk.nashorn.internal.parser.TokenType.EXECSTRING;
 import static jdk.nashorn.internal.parser.TokenType.XML;
 
 import jdk.nashorn.internal.runtime.ECMAErrors;
@@ -367,12 +369,13 @@ public class Lexer extends Scanner {
     }
 
     /**
-     * Test if char is a string delimiter, e.g. '\' or '"'
+     * Test if char is a string delimiter, e.g. '\' or '"'.  Also scans exec
+     * strings ('`') in scripting mode.
      * @param ch a char
      * @return true if string delimiter
      */
     protected boolean isStringDelimiter(final char ch) {
-        return ch == '\'' || ch == '"';
+        return ch == '\'' || ch == '"' || (scripting && ch == '`');
     }
 
     /**
@@ -936,12 +939,29 @@ public class Lexer extends Scanner {
             // Record end of string.
             stringState.setLimit(position - 1);
 
-            // Only edit double quoted strings.
-            if (scripting && quote == '\"' && !stringState.isEmpty()) {
-                // Edit string.
-                editString(type, stringState);
+            if (scripting && !stringState.isEmpty()) {
+                switch (quote) {
+                case '`':
+                    // Mark the beginning of an exec string.
+                    add(EXECSTRING, stringState.position, stringState.limit);
+                    // Frame edit string with left brace.
+                    add(LBRACE, stringState.position, stringState.position);
+                    // Process edit string.
+                    editString(type, stringState);
+                    // Frame edit string with right brace.
+                    add(RBRACE, stringState.limit, stringState.limit);
+                    break;
+                case '"':
+                    // Only edit double quoted strings.
+                    editString(type, stringState);
+                    break;
+                case '\'':
+                    // Add string token without editing.
+                    add(type, stringState.position, stringState.limit);
+                    break;
+                }
             } else {
-                // Add string token.
+                /// Add string token without editing.
                 add(type, stringState.position, stringState.limit);
             }
         }
diff --git a/nashorn/src/jdk/nashorn/internal/parser/Parser.java b/nashorn/src/jdk/nashorn/internal/parser/Parser.java
index db611e2f7bd..4837c9a6554 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/Parser.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/Parser.java
@@ -39,6 +39,7 @@ import static jdk.nashorn.internal.parser.TokenType.DECPREFIX;
 import static jdk.nashorn.internal.parser.TokenType.ELSE;
 import static jdk.nashorn.internal.parser.TokenType.EOF;
 import static jdk.nashorn.internal.parser.TokenType.EOL;
+import static jdk.nashorn.internal.parser.TokenType.EXECSTRING;
 import static jdk.nashorn.internal.parser.TokenType.FINALLY;
 import static jdk.nashorn.internal.parser.TokenType.FUNCTION;
 import static jdk.nashorn.internal.parser.TokenType.IDENT;
@@ -98,6 +99,7 @@ import jdk.nashorn.internal.ir.WithNode;
 import jdk.nashorn.internal.runtime.Context;
 import jdk.nashorn.internal.runtime.JSErrorType;
 import jdk.nashorn.internal.runtime.ParserException;
+import jdk.nashorn.internal.runtime.ScriptingFunctions;
 
 /**
  * Builds the IR.
@@ -107,8 +109,12 @@ public class Parser extends AbstractParser {
     /** Code generator. */
     private final Compiler compiler;
 
+    /** Current context. */
     private final Context context;
 
+    /** Is scripting mode. */
+    private final boolean scripting;
+
     /** Top level script being compiled. */
     private FunctionNode script;
 
@@ -136,6 +142,7 @@ public class Parser extends AbstractParser {
 
         this.compiler = compiler;
         this.context  = compiler.getContext();
+        this.scripting = this.context._scripting;
     }
 
     /**
@@ -146,7 +153,7 @@ public class Parser extends AbstractParser {
     public FunctionNode parse(final String scriptName) {
         try {
             stream = new TokenStream();
-            lexer  = new Lexer(source, stream, context._scripting && !context._no_syntax_extensions);
+            lexer  = new Lexer(source, stream, scripting && !context._no_syntax_extensions);
 
             // Set up first token (skips opening EOL.)
             k = -1;
@@ -1856,6 +1863,8 @@ loop:
         case REGEX:
         case XML:
             return getLiteral();
+        case EXECSTRING:
+            return execString(primaryToken);
         case FALSE:
             next();
             return LiteralNode.newInstance(source, primaryToken, finish, false);
@@ -1893,6 +1902,28 @@ loop:
         return null;
     }
 
+    /**
+     * Convert execString to a call to $EXEC.
+     *
+     * @param primaryToken Original string token.
+     * @return callNode to $EXEC.
+     */
+    Node execString(final long primaryToken) {
+        // Synthesize an ident to call $EXEC.
+        final IdentNode execIdent = new IdentNode(source, primaryToken, finish, ScriptingFunctions.EXEC_NAME);
+        // Skip over EXECSTRING.
+        next();
+        // Set up argument list for call.
+        final List<Node> arguments = new ArrayList<>();
+        // Skip beginning of edit string expression.
+        expect(LBRACE);
+        // Add the following expression to arguments.
+        arguments.add(expression());
+        // Skip ending of edit string expression.
+        expect(RBRACE);
+
+        return new CallNode(source, primaryToken, finish, execIdent, arguments);
+    }
 
     /**
      * ArrayLiteral :
diff --git a/nashorn/src/jdk/nashorn/internal/parser/TokenType.java b/nashorn/src/jdk/nashorn/internal/parser/TokenType.java
index 8cc0ee332db..9a2b7b2b768 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/TokenType.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/TokenType.java
@@ -168,6 +168,7 @@ public enum TokenType {
     FLOATING       (LITERAL,  null),
     STRING         (LITERAL,  null),
     ESCSTRING      (LITERAL,  null),
+    EXECSTRING     (LITERAL,  null),
     IDENT          (LITERAL,  null),
     REGEX          (LITERAL,  null),
     XML            (LITERAL,  null),
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Context.java b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
index c7aafe2dd73..c7137fd3050 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/Context.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
@@ -744,16 +744,37 @@ public final class Context {
     }
 
     /**
-     * Create global script object
-     * @return the global script object
+     * Create and initialize a new global scope object.
+     *
+     * @return the initialized global scope object.
      */
     public ScriptObject createGlobal() {
+        return initGlobal(newGlobal());
+    }
+
+    /**
+     * Create a new uninitialized global scope object
+     * @return the global script object
+     */
+    public ScriptObject newGlobal() {
         final SecurityManager sm = System.getSecurityManager();
         if (sm != null) {
             sm.checkPermission(new RuntimePermission("createNashornGlobal"));
         }
 
-        final ScriptObject global = newGlobal();
+        return newGlobalTrusted();
+    }
+
+    /**
+     * Initialize given global scope object.
+     *
+     * @return the initialized global scope object.
+     */
+    public ScriptObject initGlobal(final ScriptObject global) {
+        if (! (global instanceof GlobalObject)) {
+            throw new IllegalArgumentException("not a global object!");
+        }
+
         // Need only minimal global object, if we are just compiling.
         if (!_compile_only) {
             final ScriptObject oldGlobal = Context.getGlobalTrusted();
@@ -929,7 +950,7 @@ public final class Context {
              });
     }
 
-    private ScriptObject newGlobal() {
+    private ScriptObject newGlobalTrusted() {
         try {
             final Class<?> clazz = Class.forName("jdk.nashorn.internal.objects.Global", true, scriptLoader);
             return (ScriptObject) clazz.newInstance();
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/OptionsObject.java b/nashorn/src/jdk/nashorn/internal/runtime/OptionsObject.java
index 066d8e5a427..6436b862aac 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/OptionsObject.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/OptionsObject.java
@@ -40,10 +40,10 @@ public final class OptionsObject {
     /** Only compile script, do not run it or generate other ScriptObjects */
     public final boolean _compile_only;
 
-    /** Accumulated callsite flags that will be used when boostrapping script callsites */
+    /** Accumulated callsite flags that will be used when bootstrapping script callsites */
     public final int     _callsite_flags;
 
-    /** Genereate line number table in class files */
+    /** Generate line number table in class files */
     public final boolean _debug_lines;
 
     /** Package to which generated class files are added */
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java
index ed3a46750dd..fe9b97f6985 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java
@@ -32,9 +32,15 @@ import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.OutputStream;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringTokenizer;
 
 /**
  * Global functions supported only in scripting mode.
@@ -50,6 +56,19 @@ public class ScriptingFunctions {
     /** Handle to implementation of {@link ScriptingFunctions#quit} - Nashorn extension */
     public static final MethodHandle QUIT = findOwnMH("quit",     Object.class, Object.class, Object.class);
 
+    /** Handle to implementation of {@link ScriptingFunctions#quit} - Nashorn extension */
+    public static final MethodHandle EXEC = findOwnMH("exec",     Object.class, Object.class, Object.class, Object.class);
+
+    /** Names of special properties used by $EXEC API. */
+    public  static final String EXEC_NAME = "$EXEC";
+    private static final String OUT_NAME  = "$OUT";
+    private static final String ERR_NAME  = "$ERR";
+    private static final String EXIT_NAME = "$EXIT";
+
+    /** Names of special properties used by $ENV API. */
+    public  static final String ENV_NAME  = "$ENV";
+    private static final String PWD_NAME  = "PWD";
+
     private ScriptingFunctions() {
     }
 
@@ -108,6 +127,118 @@ public class ScriptingFunctions {
         return UNDEFINED;
     }
 
+    /**
+     * Nashorn extension: exec a string in a separate process.
+     *
+     * @param self   self reference
+     * @param string string to execute
+     *
+     * @return output string from the request
+     */
+    public static Object exec(final Object self, final Object string, final Object input) throws IOException, InterruptedException {
+        // Current global is need to fetch additional inputs and for additional results.
+        final ScriptObject global = Context.getGlobal();
+
+        // Current ENV property state.
+        final Object env = global.get(ENV_NAME);
+        // Make sure ENV is a valid script object.
+        if (!(env instanceof ScriptObject)) {
+            typeError("env.not.object");
+        }
+        final ScriptObject envProperties = (ScriptObject)env;
+
+        // Break exec string into tokens.
+        final StringTokenizer tokenizer = new StringTokenizer(JSType.toString(string));
+        final String[] cmdArray = new String[tokenizer.countTokens()];
+        for (int i = 0; tokenizer.hasMoreTokens(); i++) {
+            cmdArray[i] = tokenizer.nextToken();
+        }
+
+        // Set up initial process.
+        final ProcessBuilder processBuilder = new ProcessBuilder(cmdArray);
+
+        // If a working directory is present, use it.
+        final Object pwd = envProperties.get(PWD_NAME);
+        if (pwd != UNDEFINED) {
+            processBuilder.directory(new File(JSType.toString(pwd)));
+        }
+
+        // Set up ENV variables.
+        final Map<String, String> environment = processBuilder.environment();
+        environment.clear();
+        for (Map.Entry<Object, Object> entry : envProperties.entrySet()) {
+
+            environment.put(JSType.toString(entry.getKey()), JSType.toString(entry.getValue()));
+        }
+
+        // Start the process.
+        final Process process = processBuilder.start();
+
+        // If input is present, pass on to process.
+        try (OutputStream outputStream = process.getOutputStream()) {
+            if (input != UNDEFINED) {
+                outputStream.write(JSType.toString(input).getBytes());
+            }
+        }
+
+        // Wait for the process to complete.
+        final int exit = process.waitFor();
+
+        // Collect output.
+        String out;
+         try (InputStream inputStream = process.getInputStream()) {
+            final StringBuilder outBuffer = new StringBuilder();
+            for (int ch; (ch = inputStream.read()) != -1; ) {
+                outBuffer.append((char)ch);
+            }
+            out = outBuffer.toString();
+        }
+
+        // Collect errors.
+        String err;
+        try (InputStream errorStream = process.getErrorStream()) {
+            final StringBuilder errBuffer = new StringBuilder();
+            for (int ch; (ch = errorStream.read()) != -1; ) {
+                errBuffer.append((char)ch);
+            }
+            err = errBuffer.toString();
+        }
+
+        // Set globals for secondary results.
+        final boolean isStrict = global.isStrictContext();
+        global.set(OUT_NAME, out, isStrict);
+        global.set(ERR_NAME, err, isStrict);
+        global.set(EXIT_NAME, exit, isStrict);
+
+        // Return the result from stdout.
+        return out;
+    }
+
+    /**
+     * Return an object containing properties mapping to ENV variables.
+     *
+     * @param envProperties object to receive properties
+     * @param isStrict      global's strict state
+     *
+     * @return Script object with properties mapping to ENV variables.
+     */
+    public static ScriptObject getENVValues(final ScriptObject envProperties, final boolean isStrict) {
+        // Retrieve current state of ENV variables.
+        Map<String, String> envVars;
+        try {
+            envVars = System.getenv();
+        } catch(SecurityException ex) {
+            envVars = new HashMap<>();
+        }
+
+        // Map ENV variables.
+        for (Map.Entry<String, String> entry : envVars.entrySet()) {
+            envProperties.set(entry.getKey(), entry.getValue(), isStrict);
+        }
+
+        return envProperties;
+    }
+
     private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
         return MH.findStatic(MethodHandles.lookup(), ScriptingFunctions.class, name, MH.type(rtype, types));
     }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/Messages.properties b/nashorn/src/jdk/nashorn/internal/runtime/resources/Messages.properties
index 5d3162552cd..4547e444422 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/resources/Messages.properties
+++ b/nashorn/src/jdk/nashorn/internal/runtime/resources/Messages.properties
@@ -121,6 +121,7 @@ type.error.extend.ERROR_NO_COMMON_LOADER=Can not find a common class loader for
 type.error.no.constructor.matches.args=Can not construct {0} with the passed arguments; they do not match any of its constructor signatures.
 type.error.no.method.matches.args=Can not invoke method {0} with the passed arguments; they do not match any of its method signatures.
 type.error.method.not.constructor=Java method {0} can't be used as a constructor.
+type.error.env.not.object=$ENV must be an Object.
 range.error.inappropriate.array.length=inappropriate array length: {0}
 range.error.invalid.fraction.digits=fractionDigits argument to {0} must be in [0, 20]
 range.error.invalid.precision=precision argument toPrecision() must be in [1, 21]
diff --git a/nashorn/test/script/basic/JDK-8006191.js b/nashorn/test/script/basic/JDK-8006191.js
new file mode 100644
index 00000000000..b856c716284
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8006191.js
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. 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 with the distribution.
+ * 
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+ 
+/**
+ * JDK-8006191 - `cmd` -> exec("cmd") in script mode
+ *
+ * @test
+ * @option -scripting
+ * @argument ArgumentFromCommandLine
+ * @run 
+ */
+
+#!/usr/bin/jjs
+
+$ENV.PWD = ".";
+print($ENV.PWD);
+
+var files = `ls`.trim().split("\n");
+for (var i in files) {
+    var file = files[i];
+    if (file.contains("README")) {
+        print(file);
+    }
+}
+
+var result = $EXEC("cat", <<EOD);
+This is a bunch of stuff
+that I want written out
+including ${$ARG[0]}
+EOD
+print(result);
+print($OUT);
+
+var arg = "-Q";
+`ls ${arg}`;
+print($ERR);
+print($EXIT);
diff --git a/nashorn/test/script/basic/JDK-8006191.js.EXPECTED b/nashorn/test/script/basic/JDK-8006191.js.EXPECTED
new file mode 100644
index 00000000000..f0254624513
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8006191.js.EXPECTED
@@ -0,0 +1,14 @@
+.
+README
+RELEASE_README
+THIRD_PARTY_README
+This is a bunch of stuff
+that I want written out
+including ArgumentFromCommandLine
+This is a bunch of stuff
+that I want written out
+including ArgumentFromCommandLine
+ls: illegal option -- Q
+usage: ls [-ABCFGHLOPRSTUWabcdefghiklmnopqrstuwx1] [file ...]
+
+1

From 31aa060b112f6fd6d7c95eb491c1edb514700adc Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Tue, 5 Feb 2013 09:11:03 +0530
Subject: [PATCH 112/311] 8007452: add scripting programmers doc changes for
 nashorn

Reviewed-by: jlaskey, hannesw
---
 .../docs/JavaScriptingProgrammersGuide.html   | 751 ++++++++++++++++++
 nashorn/docs/source/EvalFile.java             |  44 +
 nashorn/docs/source/EvalScript.java           |  44 +
 nashorn/docs/source/InvokeScriptFunction.java |  55 ++
 nashorn/docs/source/InvokeScriptMethod.java   |  56 ++
 nashorn/docs/source/MultiScopes.java          |  58 ++
 nashorn/docs/source/RunnableImpl.java         |  57 ++
 nashorn/docs/source/RunnableImplObject.java   |  60 ++
 nashorn/docs/source/ScriptVars.java           |  51 ++
 nashorn/docs/source/importpackageclass.js     |  45 ++
 nashorn/docs/source/javaarray.js              |  51 ++
 nashorn/docs/source/javaextend.js             |  47 ++
 nashorn/docs/source/javaimporter.js           |  48 ++
 nashorn/docs/source/javatypes.js              |  50 ++
 nashorn/docs/source/overload.js               |  36 +
 nashorn/docs/source/runnable.js               |  41 +
 nashorn/docs/source/samfunc.js                |  39 +
 nashorn/docs/source/test.js                   |  32 +
 .../nashorn/internal/objects/NativeJava.java  |   4 +-
 19 files changed, 1567 insertions(+), 2 deletions(-)
 create mode 100644 nashorn/docs/JavaScriptingProgrammersGuide.html
 create mode 100644 nashorn/docs/source/EvalFile.java
 create mode 100644 nashorn/docs/source/EvalScript.java
 create mode 100644 nashorn/docs/source/InvokeScriptFunction.java
 create mode 100644 nashorn/docs/source/InvokeScriptMethod.java
 create mode 100644 nashorn/docs/source/MultiScopes.java
 create mode 100644 nashorn/docs/source/RunnableImpl.java
 create mode 100644 nashorn/docs/source/RunnableImplObject.java
 create mode 100644 nashorn/docs/source/ScriptVars.java
 create mode 100644 nashorn/docs/source/importpackageclass.js
 create mode 100644 nashorn/docs/source/javaarray.js
 create mode 100644 nashorn/docs/source/javaextend.js
 create mode 100644 nashorn/docs/source/javaimporter.js
 create mode 100644 nashorn/docs/source/javatypes.js
 create mode 100644 nashorn/docs/source/overload.js
 create mode 100644 nashorn/docs/source/runnable.js
 create mode 100644 nashorn/docs/source/samfunc.js
 create mode 100644 nashorn/docs/source/test.js

diff --git a/nashorn/docs/JavaScriptingProgrammersGuide.html b/nashorn/docs/JavaScriptingProgrammersGuide.html
new file mode 100644
index 00000000000..cf248140c15
--- /dev/null
+++ b/nashorn/docs/JavaScriptingProgrammersGuide.html
@@ -0,0 +1,751 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html class=" regenabled  gecko radius jsenabled regloaded" xmlns="http://www.w3.org/1999/xhtml"><head>
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+<title>Java Scripting Programmer's Guide</title>
+
+<!-- ============ -->
+<!-- MAIN CONTENT -->
+<!-- ============ -->
+<table summary="layout" border="0" width="100%">
+<tbody><tr>
+<td>
+
+<div id="sharepage" class="smallpagetitle"><h1>Java Scripting Programmer's Guide</h1><div class="sharepage">		<div class="sharepagew1 share-mailto">		<table summary="" cellpadding="0" cellspacing="0"><tbody><tr>		<td id="share-mailto"><a href="mailto:?subject=Java%20Documentation%20Page:%20Java%20Scripting%20Programmer%27s%20Guide&amp;body=Check%20out%20this%20page:%20%0A%0Ahttp%3A%2F%2Fdocs.oracle.com%2Fjavase%2F6%2Fdocs%2Ftechnotes%2Fguides%2Fscripting%2Fprogrammer_guide%2Findex.html" class="sharelink mailto" title="Email this page to a friend"></a></td>		<td id="share-technorati"><a href="http://technorati.com/search/http%3A%2F%2Fdocs.oracle.com%2Fjavase%2F6%2Fdocs%2Ftechnotes%2Fguides%2Fscripting%2Fprogrammer_guide%2Findex.html" class="sharelink technorati" title="See who links to this page on Technorati"></a></td>		<td id="share-delicious"><a href="http://del.icio.us/post?v=4;url=http%3A%2F%2Fdocs.oracle.com%2Fjavase%2F6%2Fdocs%2Ftechnotes%2Fguides%2Fscripting%2Fprogrammer_guide%2Findex.html;title=Java%20Scripting%20Programmer%27s%20Guide" class="sharelink delicious" title="Bookmark this page in del.icio.us"></a></td>		<td id="share-digg"><a href="http://digg.com/submit?phase=2&amp;url=http%3A%2F%2Fdocs.oracle.com%2Fjavase%2F6%2Fdocs%2Ftechnotes%2Fguides%2Fscripting%2Fprogrammer_guide%2Findex.html&amp;title=Java%20Scripting%20Programmer%27s%20Guide" class="sharelink digg" title="Submit this page to Digg"></a></td>		<td id="share-slashdot"><a href="http://slashdot.org/bookmark.pl?title=Java%20Scripting%20Programmer%27s%20Guide&amp;url=http%3A%2F%2Fdocs.oracle.com%2Fjavase%2F6%2Fdocs%2Ftechnotes%2Fguides%2Fscripting%2Fprogrammer_guide%2Findex.html" class="sharelink slashdot" title="Submit this page to Slashdot"></a></td>		<td id="share-blank"> </td></tr></tbody></table></div></div></div>
+
+</td>
+</tr>
+</tbody></table>
+<!-- Body text begins here -->
+<ul>
+<li><span><a href="#who">Who is the Java Scripting API
+For?</a></span></li>
+<li><span><a href="#package">Scripting Package</a></span></li>
+<li><span><a href="#examples">Examples</a></span>
+<ul>
+<li><span><a href="#helloworld">"Hello, World"</a></span></li>
+<li><span><a href="#evalfile">Evaluating a Script
+File</a></span></li>
+<li><span><a href="#scriptvars">Script Variables</a></span></li>
+<li><span><a href="#invoke">Invoking Script Functions and
+Methods</a></span></li>
+<li><span><a href="#interfaces">Implementing Java Interfaces by
+Scripts</a></span></li>
+<li><span><a href="#scopes">Multiple Scopes for
+Scripts</a></span></li>
+</ul>
+</li>
+<li><span><a href="#jsengine">JavaScript Script
+Engine</a></span></li>
+<li><span><a href="#jstojava">JavaScript to Java
+Communication</a></span>
+<ul>
+<li><span><a href="#jsjavaclass">Accessing Java
+Classes</a></span></li>
+<li><span><a href="#jsimport">Importing Java Packages,
+Classes</a></span></li>
+<li><span><a href="#jsarrays">Creating, Converting and Using Java
+Arrays</a></span></li>
+<li><span><a href="#jsimplement">Implementing Java
+Interfaces</a></span></li>
+<li><span><a href="#jsextend">Extending Java classes
+</a></span></li>
+<li><span><a href="#jsoverload">Overload Resolution</a></span></li>
+</ul>
+</li>
+<li><span><a href="#engineimpl">Implementing Your Own Script
+Engine</a></span></li>
+<li><span><a href="#refs">References</a></span></li>
+</ul>
+<span><a name="who" id="who"></a></span>
+<h2><span>Who is the Java Scripting API For?</span></h2>
+<span>Some useful characteristics of scripting languages
+are:</span>
+<ul>
+<li><span><b>Convenience</b>: Most scripting languages are
+dynamically typed. You can usually create new variables without
+declaring the variable type, and you can reuse variables to store
+objects of different types. Also, scripting languages tend to
+perform many type conversions automatically, for example,
+converting the number 10 to the text "10" as necessary.</span></li>
+<li><span><b>Developing rapid prototypes</b>: You can avoid the
+edit-compile-run cycle and just use edit-run!</span></li>
+<li><span><b>Application extension/customization</b>: You can
+"externalize" parts of your application - like configuration
+scripts, business logic/rules and math expressions for financial
+applications.</span></li>
+<li><span><b>"Command line" shells for applications</b> -for
+debugging, runtime/deploy time configuration etc. Most applications
+have a web-based GUI configuaration tool these days. But
+sysadmins/deployers frequently prefer command line tools. Instead
+of inventing ad-hoc scripting language for that purpose, a
+"standard" scripting language can be used.</span></li>
+</ul>
+<p><span>The Java<font size="-1"><sup>TM</sup></font> Scripting API
+is a scripting language indepedent framework for using script
+engines from Java code. With the Java Scripting API, it is possible
+to write customizable/extendable applications in the Java language
+and leave the customization scripting language choice to the end
+user. The Java application developer need not choose the extension
+language during development. If you write your application with
+JSR-223 API, then your users can use any JSR-223 compliant
+scripting language.</span></p>
+<hr>
+<span><a name="package" id="package"></a></span>
+<h2><span>Scripting Package</span></h2>
+<p><span>The Java Scripting functionality is in the <code><a href="http://docs.oracle.com/javase/6/docs/api/javax/script/package-summary.html">javax.script</a></code>
+package. This is a relatively small, simple API. The starting point
+of the scripting API is the <code>ScriptEngineManager</code> class.
+A ScriptEngineManager object can discover script engines through
+the jar file service discovery mechanism. It can also instantiate
+ScriptEngine objects that interpret scripts written in a specific
+scripting language. The simplest way to use the scripting API is as
+follows:</span></p>
+<ol>
+<li><span>Create a <code>ScriptEngineManager</code>
+object.</span></li>
+<li><span>Get a <code>ScriptEngine</code> object from the
+manager.</span></li>
+<li><span>Evaluate script using the <code>ScriptEngine</code>'s
+<code>eval</code> methods.</span></li>
+</ol>
+<p><span>Now, it is time to look at some sample code. While it is
+not mandatory, it may be useful to know a bit of JavaScript to read
+these examples.</span></p>
+<hr>
+<span><a name="examples" id="examples"></a></span>
+<h2><span>Examples</span></h2>
+<span><a name="helloworld" id="helloworld"></a></span>
+<h3><span>"Hello, World"</span></h3>
+<p><span>From the <code>ScriptEngineManager</code> instance, we
+request a JavaScript engine instance using
+<code>getEngineByName</code> method. On the script engine, the
+<code>eval</code> method is called to execute a given String as
+JavaScript code! For brevity, in this as well as in subsequent
+examples, we have not shown exception handling. There are checked
+and runtime exceptions thrown from <code>javax.script</code> API.
+Needless to say, you have to handle the exceptions
+appropriately.</span></p>
+<pre>
+<span><code>
+// <a href="source/EvalScript.java">EvalScript.java</a>
+
+import javax.script.*;
+public class EvalScript {
+    public static void main(String[] args) throws Exception {
+        // create a script engine manager
+        <span class="classref">ScriptEngineManager</span> factory = new ScriptEngineManager();
+        // create a JavaScript engine
+        <span class="classref">ScriptEngine</span> engine = factory.<span class="methodref">getEngineByName</span>("nashorn");
+        // evaluate JavaScript code from String
+        engine.<span class="methodref">eval</span>("print('Hello, World')");
+    }
+}
+</code></span>
+</pre>
+<hr>
+<a name="evalfile" id="evalfile"></a>
+<h3>Evaluating a Script File</h3>
+<p>In this example, we call the <code>eval</code> method that
+accepts <code>java.io.Reader</code> for the input source. The
+script read by the given reader is executed. This way it is
+possible to execute scripts from files, URLs and resources by
+wrapping the relevant input stream objects as readers.</p>
+<pre>
+<code>
+// <a href="source/EvalFile.java">EvalFile.java</a>
+
+import javax.script.*;
+
+public class EvalFile {
+    public static void main(String[] args) throws Exception {
+        // create a script engine manager
+        <span class="classref">ScriptEngineManager</span> factory = new ScriptEngineManager();
+        // create JavaScript engine
+        <span class="classref">ScriptEngine</span> engine = factory.<span class="methodref">getEngineByName</span>("nashorn");
+        // evaluate JavaScript code from given file - specified by first argument
+        engine.<span class="methodref">eval</span>(new java.io.FileReader(args[0]));
+    }
+}
+</code>
+</pre>
+Let us assume that we have the file named <a href="source/test.js">test.js</a> with the
+following text:
+<pre><code>
+print("This is hello from test.js");
+</code>
+</pre>
+We can run the above Java as
+<pre><code>
+java EvalFile test.js
+</code>
+</pre>
+<hr>
+<a name="scriptvars" id="scriptvars"></a>
+<h3>Script Variables</h3>
+<p>When you embed script engines and scripts with your Java
+application, you may want to expose your application objects as
+global variables to scripts. This example demonstrates how you can
+expose your application objects as global variables to a script. We
+create a <code>java.io.File</code> in the application and expose
+the same as a global variable with the name "file". The script can
+access the variable - for example, it can call public methods on
+it. Note that the syntax to access Java objects, methods and fields
+is dependent on the scripting language. JavaScript supports the
+most "natural" Java-like syntax.</p>
+<pre><code>
+// <a href="source/ScriptVars.java">ScriptVars.java</a>
+
+import javax.script.*;
+import java.io.*;
+
+public class ScriptVars { 
+    public static void main(String[] args) throws Exception {
+        ScriptEngineManager manager = new ScriptEngineManager();
+        ScriptEngine engine = manager.getEngineByName("nashorn");
+
+        File f = new File("test.txt");
+        // expose File object as variable to script
+        engine.<span class="methodref">put</span>("file", f);
+
+        // evaluate a script string. The script accesses "file" 
+        // variable and calls method on it
+        engine.eval("print(file.getAbsolutePath())");
+    }
+}
+
+</code>
+</pre>
+<hr>
+<a name="invoke" id="invoke"></a>
+<h3>Invoking Script Functions and Methods</h3>
+<p>Sometimes you may want to call a specific scripting function
+repeatedly - for example, your application menu functionality might
+be implemented by a script. In your menu's action event handler you
+may want to call a specific script function. The following example
+demonstrates invoking a specific script function from Java
+code.</p>
+<pre><code>
+// <a href="source/InvokeScriptFunction.java">InvokeScriptFunction.java</a>
+
+import javax.script.*;
+
+public class InvokeScriptFunction {
+    public static void main(String[] args) throws Exception {
+        ScriptEngineManager manager = new ScriptEngineManager();
+        ScriptEngine engine = manager.getEngineByName("nashorn");
+
+        // JavaScript code in a String
+        String script = "function hello(name) { print('Hello, ' + name); }";
+        // evaluate script
+        engine.eval(script);
+
+        // <code>javax.script.Invocable</code> is an optional interface.
+        // Check whether your script engine implements it or not!
+        // Note that the JavaScript engine implements Invocable interface.
+        <span class="classref">Invocable</span> inv = (Invocable) engine;
+
+        // invoke the global function named "hello"
+        inv.<span class="methodref">invokeFunction</span>("hello", "Scripting!!" );
+    }
+}
+
+</code>
+</pre>
+<p>If your scripting language is object based (like JavaScript) or
+object-oriented, then you can invoke a script method on a script
+object.</p>
+<pre><code>
+// <a href="source/InvokeScriptMethod.java">InvokeScriptMethod.java</a>
+
+import javax.script.*;
+
+public class InvokeScriptMethod {
+    public static void main(String[] args) throws Exception {
+        ScriptEngineManager manager = new ScriptEngineManager();
+        ScriptEngine engine = manager.getEngineByName("nashorn");
+
+        // JavaScript code in a String. This code defines a script object 'obj'
+        // with one method called 'hello'.        
+        String script = "var obj = new Object(); obj.hello = function(name) { print('Hello, ' + name); }";
+        // evaluate script
+        engine.eval(script);
+
+        // <code>javax.script.Invocable</code> is an optional interface.
+        // Check whether your script engine implements or not!
+        // Note that the JavaScript engine implements Invocable interface.
+        <span class="classref">Invocable</span> inv = (Invocable) engine;
+
+        // get script object on which we want to call the method
+        Object obj = engine.<span class="methodref">get</span>("obj");
+
+        // invoke the method named "hello" on the script object "obj"
+        inv.<span class="methodref">invokeMethod</span>(obj, "hello", "Script Method !!" );
+    }
+}
+
+</code>
+</pre>
+<hr>
+<a name="interfaces" id="interfaces"></a>
+<h3>Implementing Java Interfaces by Scripts</h3>
+<p>Instead of calling specific script functions from Java,
+sometimes it is convenient to implement a Java interface by script
+functions or methods. Also, by using interfaces we can avoid having
+to use the <code>javax.script</code> API in many places. We can get
+an interface implementor object and pass it to various Java APIs.
+The following example demonstrates implementing the
+<code>java.lang.Runnable</code> interface with a script.</p>
+<pre><code>
+// <a href="source/RunnableImpl.java">RunnableImpl.java</a>
+
+import javax.script.*;
+
+public class RunnableImpl {
+    public static void main(String[] args) throws Exception {
+        ScriptEngineManager manager = new ScriptEngineManager();
+        ScriptEngine engine = manager.getEngineByName("nashorn");
+
+        // JavaScript code in a String
+        String script = "function run() { print('run called'); }";
+
+        // evaluate script
+        engine.eval(script);
+
+        <span class="classref">Invocable</span> inv = (Invocable) engine;
+
+        // get Runnable interface object from engine. This interface methods
+        // are implemented by script functions with the matching name.
+        Runnable r = inv.<span class="methodref">getInterface</span>(Runnable.class);
+
+        // start a new thread that runs the script implemented
+        // runnable interface
+        Thread th = new Thread(r);
+        th.start();
+        th.join();
+    }
+}
+</code>
+</pre>
+<p>If your scripting language is object-based or object-oriented,
+it is possible to implement a Java interface by script methods on
+script objects. This avoids having to call script global functions
+for interface methods. The script object can store the "state"
+associated with the interface implementor.</p>
+<pre><code>
+// <a href="source/RunnableImplObject.java">RunnableImplObject.java</a>
+
+import javax.script.*;
+
+public class RunnableImplObject {
+    public static void main(String[] args) throws Exception {
+        ScriptEngineManager manager = new ScriptEngineManager();
+        ScriptEngine engine = manager.getEngineByName("nashorn");
+
+        // JavaScript code in a String
+        String script = "var obj = new Object(); obj.run = function() { print('run method called'); }";
+
+        // evaluate script
+        engine.eval(script);
+
+        // get script object on which we want to implement the interface with
+        Object obj = engine.<span class="methodref">get</span>("obj");
+
+        <span class="classref">Invocable</span> inv = (Invocable) engine;
+
+        // get Runnable interface object from engine. This interface methods
+        // are implemented by script methods of object 'obj'
+        Runnable r = inv.<span class="methodref">getInterface</span>(obj, Runnable.class);
+
+        // start a new thread that runs the script implemented
+        // runnable interface
+        Thread th = new Thread(r);
+        th.start();
+        th.join();
+    }
+}
+</code>
+</pre>
+<hr>
+<a name="scopes" id="scopes"></a>
+<h3>Multiple Scopes for Scripts</h3>
+<p>In the <a href="#scriptvars">script variables</a> example, we
+saw how to expose application objects as script global variables.
+It is possible to expose multiple global "scopes" for scripts. A
+single scope is an instance of <code>javax.script.Bindings</code>.
+This interface is derived from <code>java.util.Map&lt;String,
+Object&gt;</code>. A scope a set of name-value pairs where name is
+any non-empty, non-null String.
+<code>javax.script.ScriptContext</code> interface supports multiple
+scopes with associated Bindings for each
+scope. By default, every script engine has a default script
+context. The default script context has atleast one scope called
+"ENGINE_SCOPE". Various scopes supported by a script context are
+available through <code>getScopes</code> method.</p>
+<pre><code>
+// <a href="source/MultiScopes.java">MultiScopes.java</a>
+
+import javax.script.*;
+
+public class MultiScopes {
+    public static void main(String[] args) throws Exception {
+        ScriptEngineManager manager = new ScriptEngineManager();
+        ScriptEngine engine = manager.getEngineByName("nashorn");
+
+        engine.put("x", "hello");
+        // print global variable "x"
+        engine.eval("print(x);");
+        // the above line prints "hello"
+
+        // Now, pass a different script context
+        <span class="classref">ScriptContext</span> newContext = new <span class="classref">SimpleScriptContext</span>();
+        newContext.setBindings(engine.createBindings(), ScriptContext.ENGINE_SCOPE);
+        <span class="classref">Bindings</span> engineScope = newContext.<span class="methodref">getBindings</span>(ScriptContext.ENGINE_SCOPE);
+
+        // add new variable "x" to the new engineScope        
+        engineScope.<span class="methodref">put</span>("x", "world");
+
+        // execute the same script - but this time pass a different script context
+        engine.eval("print(x);", newContext);
+        // the above line prints "world"
+    }
+}
+
+</code>
+</pre>
+<hr>
+<a name="jsengine" id="jsengine"></a>
+<h2>JavaScript Script Engine</h2>
+<p>Oracle's implementation of JDK 8 is co-bundled with the Nashorn ECMAScript
+script engine.
+<hr>
+<a name="jstojava" id="jstojava"></a>
+<h2>JavaScript to Java Communication</h2>
+<p>For the most part, accessing Java classes, objects and methods
+is straightforward. In particular field and method access from
+JavaScript is the same as it is from Java. We highlight important
+aspects of JavaScript Java access here. 
+The following examples are JavaScript snippets accessing Java. This
+section requires knowledge of JavaScript. This section can be
+skipped if you are planning to use some other JSR-223 scripting
+language rather than JavaScript.</p>
+<hr>
+<a name="jsjavaclass" id=jsjavalass"></a>
+<h3>Accessing Java Classes</h3>
+<pre>
+<code>
+// <a href="source/javatypes.js">javatypes.js</a>
+
+ var arrayListType = Java.type("java.util.ArrayList")
+ var intType = Java.type("int")
+ var stringArrayType = Java.type("java.lang.String[]")
+ var int2DArrayType = Java.type("int[][]")
+</code>
+</pre> 
+
+Note that the name of the type is always a string for a fully qualified name. You can use any of these types to create new instances, e.g.:
+
+<pre><code>
+ var anArrayList = new Java.type("java.util.ArrayList")
+</code></pre> 
+
+or
+
+<pre><code>
+ var ArrayList = Java.type("java.util.ArrayList")
+ var anArrayList = new ArrayList
+ var anArrayListWithSize = new ArrayList(16)
+</code></pre> 
+
+In the special case of inner classes, you need to use the JVM fully qualified name, meaning using $ sign in the class name:
+
+<pre><code>
+ var ftype = Java.type("java.awt.geom.Arc2D$Float")
+</code></pre> 
+ 
+
+However, once you retrieved the outer class, you can access the inner class as a property on it:
+
+<pre><code>
+ var arctype = Java.type("java.awt.geom.Arc2D")
+ var ftype = arctype.Float
+</code></pre> 
+<p>
+You can access both static and non-static inner classes. If you want to create an instance of a non-static inner class, remember to pass an instance of its outer class as the first argument to the constructor.
+</p>
+<hr>
+<a name="jsimport" id="jsimport"></a>
+<h3>Importing Java Packages, Classes</h3>
+<p>The built-in functions <code>importPackage</code> (in compatibility script) and
+<code>importClass</code> can be used to import Java packages and
+classes.</p>
+<pre><code>
+
+// <a href="source/importpackageclass.js">importpackageclass.js</a>
+
+// load compatibility script
+load("nashorn:mozilla_compat.js");
+// Import Java packages and classes 
+// like import package.*; in Java
+<span class="functionref">importPackage</span>(java.awt);
+// like import java.awt.Frame in Java
+<span class="functionref">importClass</span>(java.awt.Frame);
+// Create Java Objects by "new ClassName"
+var frame = new java.awt.Frame("hello");
+// Call Java public methods from script
+frame.setVisible(true);
+// Access "JavaBean" properties like "fields"
+print(frame.title);
+</code>
+</pre>
+<p>The <span class="objectref">Packages</span> global variable can
+be used to access Java packages. Examples:
+<code>Packages.java.util.Vector</code>,
+<code>Packages.javax.swing.JFrame</code>. Please note that "java"
+is a shortcut for "Packages.java". There are equivalent shortcuts
+for javax, org, edu, com, net prefixes, so pratically all JDK
+platform classes can be accessed without the "Packages" prefix.</p>
+<p>Note that java.lang is not imported by default (unlike Java)
+because that would result in conflicts with JavaScript's built-in
+Object, Boolean, Math and so on.</p>
+<p><code>importPackage</code> and <code>importClass</code>
+functions "pollute" the global variable scope of JavaScript. To
+avoid that, you may use <span class="functionref">JavaImporter</span>.</p>
+<pre><code>
+
+// <a href="source/javaimporter.js">javaimporter.js</a>
+
+// create JavaImporter with specific packages and classes to import
+
+var SwingGui = new <span class="functionref">JavaImporter</span>(javax.swing,
+                            javax.swing.event,
+                            javax.swing.border,
+                            java.awt.event);
+with (SwingGui) {
+    // within this 'with' statement, we can access Swing and AWT
+    // classes by unqualified (simple) names.
+
+    var mybutton = new JButton("test");
+    var myframe = new JFrame("test");
+}
+
+</code>
+</pre>
+<hr>
+<a name="jsarrays" id="jsarrays"></a>
+<h3>Creating, Converting and Using Java Arrays</h3>
+<p>While creating a Java object is the same as in Java, to create
+Java arrays in JavaScript we can use Java reflection
+explicitly. But once created the element access or length access is
+the same as in Java. Also, a script array can be used when a Java
+method expects a Java array (auto conversion). So in most cases we
+don't have to create Java arrays explicitly.</p>
+<pre><code>
+// <a href="source/javaarray.js">javaarray.js</a>
+
+// create Java String array of 5 elements
+var a = java.lang.reflect.Array.newInstance(java.lang.String.class, 5);
+
+// Accessing elements and length access is by usual Java syntax
+a[0] = "scripting is great!";
+print(a.length);
+print(a[0]);
+</code>
+</pre>
+<p>
+It is also possible to convert between JavaScript and Java arrays.
+Given a JavaScript array and a Java type, <code>Java.toJavaArray</code> returns a Java array with the same initial contents, and with the specified component type. 
+</p>
+<pre><code>
+ var anArray = [1, "13", false]
+ var javaIntArray = Java.toJavaArray(anArray, "int")
+ print(javaIntArray[0]) // prints 1
+ print(javaIntArray[1]) // prints 13, as string "13" was converted to number 13 as per ECMAScript ToNumber conversion
+ print(javaIntArray[2]) // prints 0, as boolean false was converted to number 0 as per ECMAScript ToNumber conversion
+</code></pre>
+<p>
+Given a Java array or Collection, <code>Java.toJavaScriptArray</code> returns a JavaScript array with a shallow copy of its contents. Note that in most cases, you can use Java arrays and lists natively in Nashorn; in cases where for some reason you need to have an actual JavaScript native array (e.g. to work with the array comprehensions functions), you will want to use this method.i
+</p>
+<pre><code>
+var File = Java.type("java.io.File");
+var listCurDir = new File(".").listFiles();
+var jsList = Java.toJavaScriptArray(listCurDir);
+print(jsList);
+</code></pre>
+<hr>
+<a name="jsimplement" id="jsimplement"></a>
+<h3>Implementing Java Interfaces</h3>
+<p>A Java interface can be implemented in JavaScript by using a
+Java anonymous class-like syntax:</p>
+<pre><code>
+// <a href="source/runnable.js">runnable.js</a>
+
+var r  = new java.lang.Runnable() {
+    run: function() {
+        print("running...\n");
+    }
+};
+
+// "r" can be passed to Java methods that expect java.lang.Runnable
+var th = new java.lang.Thread(r);
+th.start();
+th.join();
+</code>
+</pre>
+<p>When an interface with a single method is expected, you can pass
+a script function directly.(auto conversion)</p>
+<pre><code>
+// <a href="source/samfunc.js">samfunc.js</a>
+
+function func() {
+     print("I am func!");
+}
+
+// pass script function for java.lang.Runnable argument
+var th = new java.lang.Thread(func);
+th.start();
+th.join();
+</code>
+</pre>
+<hr>
+<a name="jsextend" id="jsextend"></a>
+<h3>Extending Java classes</h3>
+<p>
+If a Java class is abstract, you can instantiate an anonymous subclass of it using an argument list that is applicable to any of its public or protected constructors, but inserting a JavaScript object with functions properties that provide JavaScript implementations of the abstract methods. If method names are overloaded, the JavaScript function will provide implementation for all overloads. E.g.:
+</p>
+
+<pre><code>
+ var TimerTask =  Java.type("java.util.TimerTask")
+ var task = new TimerTask({ run: function() { print("Hello World!") } })
+</code></pre>
+
+Nashorn supports a syntactic extension where a "new" expression followed by an argument is identical to invoking the constructor and passing the argument to it, so you can write the above example also as:
+
+<pre><code>
+ var task = new TimerTask {
+     run: function() {
+       print("Hello World!")
+     }
+ }
+</code></pre>
+
+which is very similar to Java anonymous inner class definition. On the other hand, if the type is an abstract type with a single abstract method (commonly referred to as a "SAM type") or all abstract methods it has share the same overloaded name), then instead of an object, you can just pass a function, so the above example can become even more simplified to:
+
+<pre><code>
+ var task = new TimerTask(function() { print("Hello World!") })
+</code></pre>
+
+<p>
+Note that in every one of these cases if you are trying to instantiate an abstract class that has constructors that take some arguments, you can invoke those simply by specifying the arguments after the initial implementation object or function.
+</p>
+<p>
+The use of functions can be taken even further; if you are invoking a Java method that takes a SAM type, you can just pass in a function object, and Nashorn will know what you meant:
+</p>
+<code><pre>
+ Java.type("java.util.Timer")
+ timer.schedule(function() { print("Hello World!") })
+</code></pre>
+
+Here, <code>Timer.schedule()</code> expects a <code>TimerTask</code> as its argument, so Nashorn creates an instance of a TimerTask subclass and uses the passed function to implement its only abstract method, run(). In this usage though, you can't use non-default constructors; the type must be either an interface, or must have a protected or public no-arg constructor.
+
+<p>
+To extend a concrete Java class, you have to use <code>Java.extend</code> function.
+<code>Java.extend</code> returns a type object for a subclass of the specified Java class (or implementation of the specified interface) that acts as a script-to-Java adapter for it.  
+</p>
+<pre><code>
+// <a href="source/javaextend.js">javaextend.js</a>
+
+var ArrayList = Java.type("java.util.ArrayList")
+var ArrayListExtender = Java.extend(ArrayList)
+var printSizeInvokedArrayList = new ArrayListExtender() {
+    size: function() { print("size invoked!"); }
+}
+var printAddInvokedArrayList = new ArrayListExtender() {
+    add: function(x, y) {
+        if(typeof(y) === "undefined") {
+            print("add(e) invoked!");
+        } else {
+            print("add(i, e) invoked!");
+        }
+    }
+};
+printSizeInvokedArrayList.size();
+printAddInvokedArrayList.add(33, 33);
+</code></pre>
+<hr>
+<a name="jsoverload" id="jsoverload"></a>
+<h3>Overload Resolution</h3>
+<p>Java methods can be overloaded by argument types. In Java,
+overload resolution occurs at compile time (performed by javac).
+When calling Java methods from a script, the script
+interpreter/compiler needs to select the appropriate method. With
+the JavaScript engine, you do not need to do anything special - the
+correct Java method overload variant is selected based on the
+argument types. But, sometimes you may want (or have) to explicitly
+select a particular overload variant.</p>
+<pre><code>
+// <a href="source/overload.js">overload.js</a>
+
+var out = java.lang.System.out;
+
+// select a particular print function 
+out["println(java.lang.Object)"]("hello");
+</code>
+</pre>
+<hr>
+<a name="engineimpl" id="engineimpl"></a>
+<h2>Implementing Your Own Script Engine</h2>
+<p>We will not cover implementation of JSR-223 compliant script
+engines in detail. Minimally, you need to implement the
+<code>javax.script.ScriptEngine</code> and
+<code>javax.script.ScriptEngineFactory</code> interfaces. The
+abstract class <code>javax.script.AbstractScriptEngine</code>
+provides useful defaults for a few methods of the
+<code>ScriptEngine</code> interface.</p>
+<p>Before starting to implement a JSR-223 engine, you may want to
+check <a href="http://java.net/projects/Scripting">http://java.net/projects/Scripting</a>
+project. This project maintains JSR-223 implementations for many
+popular open source scripting languages.</p>
+<hr>
+<a name="refs" id="refs"></a>
+<h2>References</h2>
+<ul>
+<li><a href="http://jcp.org/en/jsr/detail?id=223">JSR-223 Scripting
+for the Java Platform</a></li>
+<li><a href="http://java.net/projects/Scripting">http://java.net/projects/Scripting
+</a></li>
+</ul>
+
+
+
+<div class="hr"><hr></div>
+<table summary="layout" border="0" width="100%">
+<tbody><tr valign="TOP">
+<td width="30%"> <img src="Java%20Scripting%20Programmer%27s%20Guide_files/logo_oracle_footer.gif" alt="Oracle and/or its affiliates" border="0" height="29" width="100"><br>
+<font size="+1"> <i>Java Technology</i></font> </td>
+
+<td width="30%">
+<p><font size="-2">
+<a href="http://docs.oracle.com/javase/6/docs/legal/cpyr.html">Copyright ©</a> 2013, Oracle and/or its affiliates. All rights reserved.
+</font></p> 
+</td>
+<td width="30%">
+<p align="right"><font size="-2"><a href="http://download.oracle.com/javase/feedback.html">Contact Us</a></font></p><font size="-2">
+</font></td>
+</tr>
+</tbody></table> 
+<div class="hr"><hr></div>
+</div>
+
+<!-- Start SiteCatalyst code   -->
+<script language="JavaScript" src="Java%20Scripting%20Programmer%27s%20Guide_files/s_code_download.js"></script>
+<script language="JavaScript" src="Java%20Scripting%20Programmer%27s%20Guide_files/s_code.js"></script>
+ 
+<!-- ********** DO NOT ALTER ANYTHING BELOW THIS LINE ! *********** -->
+<!--  Below code will send the info to Omniture server -->
+<script language="javascript">var s_code=s.t();if(s_code)document.write(s_code)</script>
+ 
+<!-- End SiteCatalyst code -->
+
+
+
+</body></html>
diff --git a/nashorn/docs/source/EvalFile.java b/nashorn/docs/source/EvalFile.java
new file mode 100644
index 00000000000..6bb4e38118c
--- /dev/null
+++ b/nashorn/docs/source/EvalFile.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. 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 with the distribution.
+ *
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import javax.script.*;
+
+public class EvalFile {
+    public static void main(String[] args) throws Exception {
+        // create a script engine manager
+        ScriptEngineManager factory = new ScriptEngineManager();
+        // create JavaScript engine
+        ScriptEngine engine = factory.getEngineByName("nashorn");
+        // evaluate JavaScript code from given file - specified by first argument
+        engine.eval(new java.io.FileReader(args[0]));
+    }
+}
+
diff --git a/nashorn/docs/source/EvalScript.java b/nashorn/docs/source/EvalScript.java
new file mode 100644
index 00000000000..7fcbe1cd879
--- /dev/null
+++ b/nashorn/docs/source/EvalScript.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. 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 with the distribution.
+ *
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import javax.script.*;
+
+public class EvalScript {
+    public static void main(String[] args) throws Exception {
+        // create a script engine manager
+        ScriptEngineManager factory = new ScriptEngineManager();
+        // create a JavaScript engine
+        ScriptEngine engine = factory.getEngineByName("nashorn");
+        // evaluate JavaScript code from String
+        engine.eval("print('Hello, World')");
+    }
+}
+
diff --git a/nashorn/docs/source/InvokeScriptFunction.java b/nashorn/docs/source/InvokeScriptFunction.java
new file mode 100644
index 00000000000..26de36c4e94
--- /dev/null
+++ b/nashorn/docs/source/InvokeScriptFunction.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. 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 with the distribution.
+ *
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import javax.script.*;
+
+public class InvokeScriptFunction {
+    public static void main(String[] args) throws Exception {
+        ScriptEngineManager manager = new ScriptEngineManager();
+        ScriptEngine engine = manager.getEngineByName("nashorn");
+
+        // JavaScript code in a String
+        String script = "function hello(name) { print('Hello, ' + name); }";
+        // evaluate script
+        engine.eval(script);
+
+        // javax.script.Invocable is an optional interface.
+        // Check whether your script engine implements or not!
+        // Note that the JavaScript engine implements Invocable interface.
+        Invocable inv = (Invocable) engine;
+
+        // invoke the global function named "hello"
+        inv.invokeFunction("hello", "Scripting!!" );
+    }
+}
+
+
+
diff --git a/nashorn/docs/source/InvokeScriptMethod.java b/nashorn/docs/source/InvokeScriptMethod.java
new file mode 100644
index 00000000000..a3f5ece745f
--- /dev/null
+++ b/nashorn/docs/source/InvokeScriptMethod.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. 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 with the distribution.
+ *
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import javax.script.*;
+
+public class InvokeScriptMethod {
+    public static void main(String[] args) throws Exception {
+        ScriptEngineManager manager = new ScriptEngineManager();
+        ScriptEngine engine = manager.getEngineByName("nashorn");
+
+        // JavaScript code in a String. This code defines a script object 'obj'
+        // with one method called 'hello'.
+        String script = "var obj = new Object(); obj.hello = function(name) { print('Hello, ' + name); }";
+        // evaluate script
+        engine.eval(script);
+
+        // javax.script.Invocable is an optional interface.
+        // Check whether your script engine implements or not!
+        // Note that the JavaScript engine implements Invocable interface.
+        Invocable inv = (Invocable) engine;
+
+        // get script object on which we want to call the method
+        Object obj = engine.get("obj");
+
+        // invoke the method named "hello" on the script object "obj"
+        inv.invokeMethod(obj, "hello", "Script Method !!" );
+    }
+}
diff --git a/nashorn/docs/source/MultiScopes.java b/nashorn/docs/source/MultiScopes.java
new file mode 100644
index 00000000000..6c4fa2a27b6
--- /dev/null
+++ b/nashorn/docs/source/MultiScopes.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. 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 with the distribution.
+ *
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import javax.script.*;
+
+public class MultiScopes {
+    public static void main(String[] args) throws Exception {
+        ScriptEngineManager manager = new ScriptEngineManager();
+        ScriptEngine engine = manager.getEngineByName("nashorn");
+
+        engine.put("x", "hello");
+        // print global variable "x"
+        engine.eval("print(x);");
+        // the above line prints "hello"
+
+        // Now, pass a different script context
+        ScriptContext newContext = new SimpleScriptContext();
+        newContext.setBindings(engine.createBindings(), ScriptContext.ENGINE_SCOPE);
+        Bindings engineScope = newContext.getBindings(ScriptContext.ENGINE_SCOPE);
+
+        // add new variable "x" to the new engineScope
+        engineScope.put("x", "world");
+
+        // execute the same script - but this time pass a different script context
+        engine.eval("print(x);", newContext);
+        // the above line prints "world"
+    }
+}
+
+
diff --git a/nashorn/docs/source/RunnableImpl.java b/nashorn/docs/source/RunnableImpl.java
new file mode 100644
index 00000000000..1d858d40cd8
--- /dev/null
+++ b/nashorn/docs/source/RunnableImpl.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. 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 with the distribution.
+ *
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import javax.script.*;
+
+public class RunnableImpl {
+    public static void main(String[] args) throws Exception {
+        ScriptEngineManager manager = new ScriptEngineManager();
+        ScriptEngine engine = manager.getEngineByName("nashorn");
+
+        // JavaScript code in a String
+        String script = "function run() { print('run called'); }";
+
+        // evaluate script
+        engine.eval(script);
+
+        Invocable inv = (Invocable) engine;
+
+        // get Runnable interface object from engine. This interface methods
+        // are implemented by script functions with the matching name.
+        Runnable r = inv.getInterface(Runnable.class);
+
+        // start a new thread that runs the script implemented
+        // runnable interface
+        Thread th = new Thread(r);
+        th.start();
+        th.join();
+    }
+}
diff --git a/nashorn/docs/source/RunnableImplObject.java b/nashorn/docs/source/RunnableImplObject.java
new file mode 100644
index 00000000000..877f8c15e17
--- /dev/null
+++ b/nashorn/docs/source/RunnableImplObject.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. 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 with the distribution.
+ *
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import javax.script.*;
+
+public class RunnableImplObject {
+    public static void main(String[] args) throws Exception {
+        ScriptEngineManager manager = new ScriptEngineManager();
+        ScriptEngine engine = manager.getEngineByName("nashorn");
+
+        // JavaScript code in a String
+        String script = "var obj = new Object(); obj.run = function() { print('run method called'); }";
+
+        // evaluate script
+        engine.eval(script);
+
+        // get script object on which we want to implement the interface with
+        Object obj = engine.get("obj");
+
+        Invocable inv = (Invocable) engine;
+
+        // get Runnable interface object from engine. This interface methods
+        // are implemented by script methods of object 'obj'
+        Runnable r = inv.getInterface(obj, Runnable.class);
+
+        // start a new thread that runs the script implemented
+        // runnable interface
+        Thread th = new Thread(r);
+        th.start();
+        th.join();
+    }
+}
diff --git a/nashorn/docs/source/ScriptVars.java b/nashorn/docs/source/ScriptVars.java
new file mode 100644
index 00000000000..7e16cfca09e
--- /dev/null
+++ b/nashorn/docs/source/ScriptVars.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. 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 with the distribution.
+ *
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import javax.script.*;
+import java.io.*;
+
+public class ScriptVars {
+    public static void main(String[] args) throws Exception {
+        ScriptEngineManager manager = new ScriptEngineManager();
+        ScriptEngine engine = manager.getEngineByName("nashorn");
+
+        File f = new File("test.txt");
+        // expose File object as variable to script
+        engine.put("file", f);
+
+        // evaluate a script string. The script accesses "file"
+        // variable and calls method on it
+        engine.eval("print(file.getAbsolutePath())");
+    }
+}
+
+
+
diff --git a/nashorn/docs/source/importpackageclass.js b/nashorn/docs/source/importpackageclass.js
new file mode 100644
index 00000000000..afc02a9bf37
--- /dev/null
+++ b/nashorn/docs/source/importpackageclass.js
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. 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 with the distribution.
+ * 
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+// load compatibility script
+load("nashorn:mozilla_compat.js");
+
+// Import Java packages and classes 
+// like import package.*; in Java
+importPackage(java.awt);
+// like import java.awt.Frame in Java
+importClass(java.awt.Frame);
+// Create Java Objects by "new ClassName"
+var frame = new java.awt.Frame("hello");
+// Call Java public methods from script
+frame.setVisible(true);
+// Access "JavaBean" properties like "fields"
+print(frame.title);
diff --git a/nashorn/docs/source/javaarray.js b/nashorn/docs/source/javaarray.js
new file mode 100644
index 00000000000..b9d93f0d42c
--- /dev/null
+++ b/nashorn/docs/source/javaarray.js
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. 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 with the distribution.
+ * 
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+// create Java String array of 5 elements
+var a = java.lang.reflect.Array.newInstance(java.lang.String.class, 5);
+
+// Accessing elements and length access is by usual Java syntax
+a[0] = "scripting is great!";
+print(a.length);
+print(a[0]);
+
+// convert a script array to Java array
+var anArray = [1, "13", false];
+var javaIntArray = Java.toJavaArray(anArray, "int");
+print(javaIntArray[0]);// prints 1
+print(javaIntArray[1]); // prints 13, as string "13" was converted to number 13 as per ECMAScript ToNumber conversion
+print(javaIntArray[2]);// prints 0, as boolean false was converted to number 0 as per ECMAScript ToNumber conversion
+
+// convert a Java array to a JavaScript array
+var File = Java.type("java.io.File");
+var listCurDir = new File(".").listFiles();
+var jsList = Java.toJavaScriptArray(listCurDir);
+print(jsList);
diff --git a/nashorn/docs/source/javaextend.js b/nashorn/docs/source/javaextend.js
new file mode 100644
index 00000000000..408da320a19
--- /dev/null
+++ b/nashorn/docs/source/javaextend.js
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. 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 with the distribution.
+ * 
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+var ArrayList = Java.type("java.util.ArrayList")
+var ArrayListExtender = Java.extend(ArrayList)
+var printSizeInvokedArrayList = new ArrayListExtender() {
+    size: function() { print("size invoked!"); }
+}
+var printAddInvokedArrayList = new ArrayListExtender() {
+    add: function(x, y) {
+        if(typeof(y) === "undefined") {
+            print("add(e) invoked!");
+        } else {
+            print("add(i, e) invoked!");
+        }
+    }
+};
+printSizeInvokedArrayList.size();
+printAddInvokedArrayList.add(33, 33);
diff --git a/nashorn/docs/source/javaimporter.js b/nashorn/docs/source/javaimporter.js
new file mode 100644
index 00000000000..3bd07988d21
--- /dev/null
+++ b/nashorn/docs/source/javaimporter.js
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. 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 with the distribution.
+ * 
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+// create JavaImporter with specific packages and classes to import
+
+var SwingGui = new JavaImporter(javax.swing,
+                            javax.swing.event,
+                            javax.swing.border,
+                            java.awt.event);
+with (SwingGui) {
+    // within this 'with' statement, we can access Swing and AWT
+    // classes by unqualified (simple) names.
+
+    var mybutton = new JButton("test");
+    print(mybutton);
+    var myframe = new JFrame("test");
+    print(myframe);
+}
+
+
diff --git a/nashorn/docs/source/javatypes.js b/nashorn/docs/source/javatypes.js
new file mode 100644
index 00000000000..e0b6f07b137
--- /dev/null
+++ b/nashorn/docs/source/javatypes.js
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. 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 with the distribution.
+ * 
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+// accessing java types
+var arrayListType = Java.type("java.util.ArrayList")
+var intType = Java.type("int")
+var stringArrayType = Java.type("java.lang.String[]")
+var int2DArrayType = Java.type("int[][]")
+
+// Using java types
+var ArrayList = Java.type("java.util.ArrayList")
+var anArrayList = new ArrayList
+var anArrayListWithSize = new ArrayList(16)
+
+// fully qualified name
+var ftype = Java.type("java.awt.geom.Arc2D$Float")
+
+// inner class property
+var arctype = Java.type("java.awt.geom.Arc2D")
+var ftype = arctype.Float
+
diff --git a/nashorn/docs/source/overload.js b/nashorn/docs/source/overload.js
new file mode 100644
index 00000000000..2407d0c5a5c
--- /dev/null
+++ b/nashorn/docs/source/overload.js
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. 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 with the distribution.
+ * 
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+var out = java.lang.System.out;
+
+// select a particular print function 
+out["println(java.lang.Object)"]("hello");
+
diff --git a/nashorn/docs/source/runnable.js b/nashorn/docs/source/runnable.js
new file mode 100644
index 00000000000..67cd31c67cf
--- /dev/null
+++ b/nashorn/docs/source/runnable.js
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. 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 with the distribution.
+ * 
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+var r  = new java.lang.Runnable() {
+    run: function() {
+        print("running...\n");
+    }
+};
+
+// "r" can be passed to Java methods that expect java.lang.Runnable
+var th = new java.lang.Thread(r);
+th.start();
+th.join();
diff --git a/nashorn/docs/source/samfunc.js b/nashorn/docs/source/samfunc.js
new file mode 100644
index 00000000000..c870076e1fd
--- /dev/null
+++ b/nashorn/docs/source/samfunc.js
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. 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 with the distribution.
+ * 
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+function func() {
+     print("I am func!");
+}
+
+// pass script function for java.lang.Runnable argument
+var th = new java.lang.Thread(func);
+th.start();
+th.join();
diff --git a/nashorn/docs/source/test.js b/nashorn/docs/source/test.js
new file mode 100644
index 00000000000..6323c386479
--- /dev/null
+++ b/nashorn/docs/source/test.js
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. 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 with the distribution.
+ * 
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+print("This is hello from test.js");
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java b/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java
index 8f9ffd4ae06..2c68a417fd6 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java
@@ -351,10 +351,10 @@ public class NativeJava {
      * var ArrayList = Java.type("java.util.ArrayList")
      * var ArrayListExtender = Java.extend(ArrayList)
      * var printSizeInvokedArrayList = new ArrayListExtender() {
-     *     function size() { print("size invoked!"); }
+     *     size: function() { print("size invoked!"); }
      * }
      * var printAddInvokedArrayList = new ArrayListExtender() {
-     *     function add(x, y) {
+     *     add: function(x, y) {
      *       if(typeof(y) === "undefined") {
      *           print("add(e) invoked!");
      *       } else {

From be500502ec8445abead21e2b711cb9ebf2824b01 Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Tue, 5 Feb 2013 18:44:54 +0530
Subject: [PATCH 113/311] 8007521: $ENV should be undefined when security
 manager is present

Reviewed-by: hannesw, jlaskey
---
 .../jdk/nashorn/internal/objects/Global.java  | 17 ++++-
 .../internal/runtime/ScriptingFunctions.java  | 64 ++++++-------------
 .../JDK-8006191.js                            |  0
 .../JDK-8006191.js.EXPECTED                   |  0
 nashorn/test/script/sandbox/env.js            | 36 +++++++++++
 nashorn/test/script/sandbox/exec.js           | 39 +++++++++++
 6 files changed, 108 insertions(+), 48 deletions(-)
 rename nashorn/test/script/{basic => currently-failing}/JDK-8006191.js (100%)
 rename nashorn/test/script/{basic => currently-failing}/JDK-8006191.js.EXPECTED (100%)
 create mode 100644 nashorn/test/script/sandbox/env.js
 create mode 100644 nashorn/test/script/sandbox/exec.js

diff --git a/nashorn/src/jdk/nashorn/internal/objects/Global.java b/nashorn/src/jdk/nashorn/internal/objects/Global.java
index 380566e2d14..ed4557c045c 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/Global.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/Global.java
@@ -34,6 +34,7 @@ import java.io.PrintWriter;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.ref.SoftReference;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -1464,8 +1465,20 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
         addOwnProperty("$OPTIONS", Attribute.NOT_ENUMERABLE, value);
 
         // Nashorn extension: global.$ENV (scripting-mode-only)
-        value = ScriptingFunctions.getENVValues(newEmptyInstance(), this.isStrictContext());
-        addOwnProperty(ScriptingFunctions.ENV_NAME, Attribute.NOT_ENUMERABLE, value);
+        if (System.getSecurityManager() == null) {
+            // do not fill $ENV if we have a security manager around
+            // Retrieve current state of ENV variables.
+            final ScriptObject env = newEmptyInstance();
+            env.putAll(System.getenv());
+            addOwnProperty(ScriptingFunctions.ENV_NAME, Attribute.NOT_ENUMERABLE, env);
+        } else {
+            addOwnProperty(ScriptingFunctions.ENV_NAME, Attribute.NOT_ENUMERABLE, UNDEFINED);
+        }
+
+        // add other special properties for exec support
+        addOwnProperty(ScriptingFunctions.OUT_NAME, Attribute.NOT_ENUMERABLE, UNDEFINED);
+        addOwnProperty(ScriptingFunctions.ERR_NAME, Attribute.NOT_ENUMERABLE, UNDEFINED);
+        addOwnProperty(ScriptingFunctions.EXIT_NAME, Attribute.NOT_ENUMERABLE, UNDEFINED);
     }
 
     private void initTypedArray() {
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java
index fe9b97f6985..d3ac11e420a 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java
@@ -61,9 +61,9 @@ public class ScriptingFunctions {
 
     /** Names of special properties used by $EXEC API. */
     public  static final String EXEC_NAME = "$EXEC";
-    private static final String OUT_NAME  = "$OUT";
-    private static final String ERR_NAME  = "$ERR";
-    private static final String EXIT_NAME = "$EXIT";
+    public  static final String OUT_NAME  = "$OUT";
+    public  static final String ERR_NAME  = "$ERR";
+    public  static final String EXIT_NAME = "$EXIT";
 
     /** Names of special properties used by $ENV API. */
     public  static final String ENV_NAME  = "$ENV";
@@ -139,14 +139,6 @@ public class ScriptingFunctions {
         // Current global is need to fetch additional inputs and for additional results.
         final ScriptObject global = Context.getGlobal();
 
-        // Current ENV property state.
-        final Object env = global.get(ENV_NAME);
-        // Make sure ENV is a valid script object.
-        if (!(env instanceof ScriptObject)) {
-            typeError("env.not.object");
-        }
-        final ScriptObject envProperties = (ScriptObject)env;
-
         // Break exec string into tokens.
         final StringTokenizer tokenizer = new StringTokenizer(JSType.toString(string));
         final String[] cmdArray = new String[tokenizer.countTokens()];
@@ -157,18 +149,23 @@ public class ScriptingFunctions {
         // Set up initial process.
         final ProcessBuilder processBuilder = new ProcessBuilder(cmdArray);
 
-        // If a working directory is present, use it.
-        final Object pwd = envProperties.get(PWD_NAME);
-        if (pwd != UNDEFINED) {
-            processBuilder.directory(new File(JSType.toString(pwd)));
-        }
+        // Current ENV property state.
+        final Object env = global.get(ENV_NAME);
+        if (env instanceof ScriptObject) {
+            final ScriptObject envProperties = (ScriptObject)env;
 
-        // Set up ENV variables.
-        final Map<String, String> environment = processBuilder.environment();
-        environment.clear();
-        for (Map.Entry<Object, Object> entry : envProperties.entrySet()) {
+            // If a working directory is present, use it.
+            final Object pwd = envProperties.get(PWD_NAME);
+            if (pwd != UNDEFINED) {
+                processBuilder.directory(new File(JSType.toString(pwd)));
+            }
 
-            environment.put(JSType.toString(entry.getKey()), JSType.toString(entry.getValue()));
+            // Set up ENV variables.
+            final Map<String, String> environment = processBuilder.environment();
+            environment.clear();
+            for (Map.Entry<Object, Object> entry : envProperties.entrySet()) {
+                environment.put(JSType.toString(entry.getKey()), JSType.toString(entry.getValue()));
+            }
         }
 
         // Start the process.
@@ -214,31 +211,6 @@ public class ScriptingFunctions {
         return out;
     }
 
-    /**
-     * Return an object containing properties mapping to ENV variables.
-     *
-     * @param envProperties object to receive properties
-     * @param isStrict      global's strict state
-     *
-     * @return Script object with properties mapping to ENV variables.
-     */
-    public static ScriptObject getENVValues(final ScriptObject envProperties, final boolean isStrict) {
-        // Retrieve current state of ENV variables.
-        Map<String, String> envVars;
-        try {
-            envVars = System.getenv();
-        } catch(SecurityException ex) {
-            envVars = new HashMap<>();
-        }
-
-        // Map ENV variables.
-        for (Map.Entry<String, String> entry : envVars.entrySet()) {
-            envProperties.set(entry.getKey(), entry.getValue(), isStrict);
-        }
-
-        return envProperties;
-    }
-
     private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
         return MH.findStatic(MethodHandles.lookup(), ScriptingFunctions.class, name, MH.type(rtype, types));
     }
diff --git a/nashorn/test/script/basic/JDK-8006191.js b/nashorn/test/script/currently-failing/JDK-8006191.js
similarity index 100%
rename from nashorn/test/script/basic/JDK-8006191.js
rename to nashorn/test/script/currently-failing/JDK-8006191.js
diff --git a/nashorn/test/script/basic/JDK-8006191.js.EXPECTED b/nashorn/test/script/currently-failing/JDK-8006191.js.EXPECTED
similarity index 100%
rename from nashorn/test/script/basic/JDK-8006191.js.EXPECTED
rename to nashorn/test/script/currently-failing/JDK-8006191.js.EXPECTED
diff --git a/nashorn/test/script/sandbox/env.js b/nashorn/test/script/sandbox/env.js
new file mode 100644
index 00000000000..df80e6fb589
--- /dev/null
+++ b/nashorn/test/script/sandbox/env.js
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Try to get env object
+ *
+ * @test
+ * @security
+ * @option -scripting
+ */
+
+var env = $ENV;
+// should be empty!!
+for (i in env) {
+    print("FAILED: can get: " + i +  " = " + env[i]);
+}
diff --git a/nashorn/test/script/sandbox/exec.js b/nashorn/test/script/sandbox/exec.js
new file mode 100644
index 00000000000..86d70b3640c
--- /dev/null
+++ b/nashorn/test/script/sandbox/exec.js
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Try to get exec
+ *
+ * @test
+ * @security
+ * @option -scripting
+ */
+
+try {
+    var ans = `java -version`;
+    fail("should have thrown exception!");
+} catch (e) {
+    if (! (e instanceof java.lang.SecurityException)) {
+        fail("SecurityException expected, got " + e);
+    }
+}

From ac9ca521adb6dd429cefe466b1e48075b7138d73 Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Tue, 5 Feb 2013 21:00:04 +0530
Subject: [PATCH 114/311] 8007522: IllegalStateException thrown from
 String.prototype.search function

Reviewed-by: jlaskey
---
 .../jdk/nashorn/internal/objects/NativeRegExp.java  |  2 +-
 nashorn/test/script/basic/JDK-8007522.js            | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 nashorn/test/script/basic/JDK-8007522.js

diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java b/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java
index 487feafaccd..9d5bf104130 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java
@@ -675,7 +675,7 @@ public final class NativeRegExp extends ScriptObject {
         start = matcher.find(start) ? matcher.start() : -1;
 
         if (global) {
-            setLastIndex(matcher.end());
+            setLastIndex(start == -1? -1 : matcher.end());
         }
 
         return start;
diff --git a/nashorn/test/script/basic/JDK-8007522.js b/nashorn/test/script/basic/JDK-8007522.js
new file mode 100644
index 00000000000..7a52e922c0a
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8007522.js
@@ -0,0 +1,13 @@
+/**
+ * JDK-8007522: IllegalStateException thrown from String.prototype.search function
+ *
+ * @test
+ * @run
+ */
+
+var str = "hello";
+// search used to result in IllegalStateException
+if (str.search(/foo/g) != -1) {
+    fail("String.prototype.search failed");
+}
+

From 292a819b5322e29ea8f0abb4e30cdfc8c5fd83e8 Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Tue, 5 Feb 2013 22:07:04 +0530
Subject: [PATCH 115/311] 8007523: VerifyError on script that uses regular
 expression literals with ternary operator

Reviewed-by: lagergren
---
 .../jdk/nashorn/internal/ir/LiteralNode.java  |  5 +++
 nashorn/test/script/basic/JDK-8007522.js      | 23 ++++++++++++
 nashorn/test/script/basic/JDK-8007523.js      | 36 +++++++++++++++++++
 3 files changed, 64 insertions(+)
 create mode 100644 nashorn/test/script/basic/JDK-8007523.js

diff --git a/nashorn/src/jdk/nashorn/internal/ir/LiteralNode.java b/nashorn/src/jdk/nashorn/internal/ir/LiteralNode.java
index 51317acad32..f1bf1b80c64 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/LiteralNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/LiteralNode.java
@@ -493,6 +493,11 @@ public abstract class LiteralNode<T> extends Node implements PropertyKey {
             return new LexerTokenLiteralNode(this);
         }
 
+        @Override
+        public Type getType() {
+            return Type.OBJECT;
+        }
+
         @Override
         public void toString(final StringBuilder sb) {
             sb.append(value.toString());
diff --git a/nashorn/test/script/basic/JDK-8007522.js b/nashorn/test/script/basic/JDK-8007522.js
index 7a52e922c0a..855d7d198cc 100644
--- a/nashorn/test/script/basic/JDK-8007522.js
+++ b/nashorn/test/script/basic/JDK-8007522.js
@@ -1,3 +1,26 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
 /**
  * JDK-8007522: IllegalStateException thrown from String.prototype.search function
  *
diff --git a/nashorn/test/script/basic/JDK-8007523.js b/nashorn/test/script/basic/JDK-8007523.js
new file mode 100644
index 00000000000..2a97ce28683
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8007523.js
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8007523: VerifyError on script that uses regular expression literals with ternary operator 
+ *
+ * @test
+ * @run
+ */
+
+var flag = true;
+
+// used to throw VerifyError because of the following ternary operator
+if (String(flag? /bar1/ : /bar2/) != '/bar1/') {
+    fail("ternary operator failed to pass right value");
+}

From e84e88f4c9b8375be1764a2d59e2cf2556b3c0a2 Mon Sep 17 00:00:00 2001
From: Mandy Chung <mchung@openjdk.org>
Date: Tue, 5 Feb 2013 22:56:47 -0800
Subject: [PATCH 116/311] 8007393: Possible race condition after JDK-6664509

Reviewed-by: alanb, jgish
---
 .../classes/java/util/logging/LogManager.java | 50 +++++++++++++------
 1 file changed, 34 insertions(+), 16 deletions(-)

diff --git a/jdk/src/share/classes/java/util/logging/LogManager.java b/jdk/src/share/classes/java/util/logging/LogManager.java
index 58bd1ba7ead..55b2f206e76 100644
--- a/jdk/src/share/classes/java/util/logging/LogManager.java
+++ b/jdk/src/share/classes/java/util/logging/LogManager.java
@@ -455,7 +455,40 @@ public class LogManager {
     }
 
     Logger demandSystemLogger(String name, String resourceBundleName) {
-        return systemContext.demandLogger(name, resourceBundleName);
+        // Add a system logger in the system context's namespace
+        final Logger sysLogger = systemContext.demandLogger(name, resourceBundleName);
+
+        // Add the system logger to the LogManager's namespace if not exist
+        // so that there is only one single logger of the given name.
+        // System loggers are visible to applications unless a logger of
+        // the same name has been added.
+        Logger logger;
+        do {
+            // First attempt to call addLogger instead of getLogger
+            // This would avoid potential bug in custom LogManager.getLogger
+            // implementation that adds a logger if does not exist
+            if (addLogger(sysLogger)) {
+                // successfully added the new system logger
+                logger = sysLogger;
+            } else {
+                logger = getLogger(name);
+            }
+        } while (logger == null);
+
+        // LogManager will set the sysLogger's handlers via LogManager.addLogger method.
+        if (logger != sysLogger && sysLogger.getHandlers().length == 0) {
+            // if logger already exists but handlers not set
+            final Logger l = logger;
+            AccessController.doPrivileged(new PrivilegedAction<Void>() {
+                public Void run() {
+                    for (Handler hdl : l.getHandlers()) {
+                        sysLogger.addHandler(hdl);
+                    }
+                    return null;
+                }
+            });
+        }
+        return sysLogger;
     }
 
     // LoggerContext maintains the logger namespace per context.
@@ -663,21 +696,6 @@ public class LogManager {
                     }
                 } while (result == null);
             }
-            // Add the system logger to the LogManager's namespace if not exists
-            // The LogManager will set its handlers via the LogManager.addLogger method.
-            if (!manager.addLogger(result) && result.getHandlers().length == 0) {
-                // if logger already exists but handlers not set
-                final Logger l = manager.getLogger(name);
-                final Logger logger = result;
-                AccessController.doPrivileged(new PrivilegedAction<Void>() {
-                    public Void run() {
-                        for (Handler hdl : l.getHandlers()) {
-                            logger.addHandler(hdl);
-                        }
-                        return null;
-                    }
-                });
-            }
             return result;
         }
     }

From 4eee363f14aa377a530acdf1cd51ab1e6130c655 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Wed, 6 Feb 2013 10:31:58 +0100
Subject: [PATCH 117/311] 8007273: Creation of ScriptFunctions can be
 refactored

Reviewed-by: lagergren, attila
---
 .../objects/FunctionObjectCreator.java        |  49 +-
 .../codegen/objects/ObjectCreator.java        |   9 +-
 .../jdk/nashorn/internal/objects/Global.java  |   3 +-
 .../internal/objects/ScriptFunctionImpl.java  | 126 ++---
 .../nashorn/internal/runtime/PropertyMap.java |   1 +
 .../internal/runtime/ScriptFunction.java      | 404 ++++------------
 .../internal/runtime/ScriptFunctionData.java  | 442 ++++++++++++++++++
 7 files changed, 582 insertions(+), 452 deletions(-)
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/ScriptFunctionData.java

diff --git a/nashorn/src/jdk/nashorn/internal/codegen/objects/FunctionObjectCreator.java b/nashorn/src/jdk/nashorn/internal/codegen/objects/FunctionObjectCreator.java
index fc916486b1f..72ed43b1710 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/objects/FunctionObjectCreator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/objects/FunctionObjectCreator.java
@@ -28,7 +28,6 @@ package jdk.nashorn.internal.codegen.objects;
 import static jdk.nashorn.internal.codegen.ClassEmitter.Flag.HANDLE_STATIC;
 import static jdk.nashorn.internal.codegen.Compiler.SCRIPTFUNCTION_IMPL_OBJECT;
 import static jdk.nashorn.internal.codegen.CompilerConstants.ALLOCATE;
-import static jdk.nashorn.internal.codegen.CompilerConstants.SOURCE;
 import static jdk.nashorn.internal.codegen.CompilerConstants.constructorNoLookup;
 import static jdk.nashorn.internal.codegen.CompilerConstants.methodDescriptor;
 
@@ -40,14 +39,10 @@ import jdk.nashorn.internal.codegen.CodeGenerator;
 import jdk.nashorn.internal.codegen.FunctionSignature;
 import jdk.nashorn.internal.codegen.MethodEmitter;
 import jdk.nashorn.internal.ir.FunctionNode;
-import jdk.nashorn.internal.ir.IdentNode;
 import jdk.nashorn.internal.ir.Symbol;
-import jdk.nashorn.internal.parser.Token;
-import jdk.nashorn.internal.parser.TokenType;
 import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptFunction;
+import jdk.nashorn.internal.runtime.ScriptFunctionData;
 import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.Source;
 
 /**
  * Analyze a function object's characteristics for appropriate code
@@ -79,58 +74,28 @@ public class FunctionObjectCreator extends ObjectCreator {
      */
     @Override
     public void makeObject(final MethodEmitter method) {
-        makeMap();
 
-        final IdentNode identNode  = functionNode.getIdent();
-        final String    signature  = new FunctionSignature(true, functionNode.needsCallee(), functionNode.getReturnType(), functionNode.isVarArg() ? null : functionNode.getParameters()).toString();
-        final long      firstToken = functionNode.getFirstToken();
-        final long      lastToken  = functionNode.getLastToken();
-        final int       position   = Token.descPosition(firstToken);
-        final int       length     = Token.descPosition(lastToken) - position + Token.descLength(lastToken);
-        final long      token      = Token.toDesc(TokenType.FUNCTION, position, length);
+        final PropertyMap map = makeMap();
+        final String signature = new FunctionSignature(true, functionNode.needsCallee(), functionNode.getReturnType(), functionNode.isVarArg() ? null : functionNode.getParameters()).toString();
+        final ScriptFunctionData scriptFunctionData = new ScriptFunctionData(functionNode, map);
 
         /*
-         * Instantiate the function object, must be referred to by name as
-         * class is not available at compile time
+         * Instantiate the function object
          */
         method._new(SCRIPTFUNCTION_IMPL_OBJECT).dup();
-        method.load(functionNode.isAnonymous() ? "" : identNode.getName());
+        codegen.loadConstant(scriptFunctionData);
         loadHandle(method, signature);
         if(functionNode.needsParentScope()) {
             method.loadScope();
         } else {
             method.loadNull();
         }
-        method.getStatic(compileUnit.getUnitClassName(), SOURCE.tag(), SOURCE.descriptor());
-        method.load(token);
         method.loadHandle(getClassName(), ALLOCATE.tag(), methodDescriptor(ScriptObject.class, PropertyMap.class), EnumSet.of(HANDLE_STATIC));
 
-        /*
-         * Emit code for the correct property map for the object
-         */
-        loadMap(method);
-
         /*
          * Invoke the constructor
          */
-        method.load(functionNode.needsCallee());
-        method.load(functionNode.isStrictMode());
-        method.invoke(constructorNoLookup(SCRIPTFUNCTION_IMPL_OBJECT,
-                    String.class,
-                    MethodHandle.class,
-                    ScriptObject.class,
-                    Source.class,
-                    long.class,
-                    MethodHandle.class,
-                    PropertyMap.class,
-                    boolean.class,
-                    boolean.class));
+        method.invoke(constructorNoLookup(SCRIPTFUNCTION_IMPL_OBJECT, ScriptFunctionData.class, MethodHandle.class, ScriptObject.class, MethodHandle.class));
 
-
-        if (functionNode.isVarArg()) {
-            method.dup();
-            method.load(functionNode.getParameters().size());
-            method.invoke(ScriptFunction.SET_ARITY);
-        }
     }
 }
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectCreator.java b/nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectCreator.java
index 6a6e9dc1649..1b02aa06d2f 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectCreator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectCreator.java
@@ -127,14 +127,15 @@ public abstract class ObjectCreator {
 
     /**
      * Construct the property map appropriate for the object.
+     * @return the newly created property map
      */
-    protected void makeMap() {
+    protected PropertyMap makeMap() {
         if (keys.isEmpty()) { //empty map
             propertyMap = PropertyMap.newMap(fieldObjectClass);
-            return;
+        } else {
+            propertyMap = newMapCreator(fieldObjectClass).makeMap(isVarArg());
         }
-
-        propertyMap = newMapCreator(fieldObjectClass).makeMap(isVarArg());
+        return propertyMap;
     }
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/objects/Global.java b/nashorn/src/jdk/nashorn/internal/objects/Global.java
index ed4557c045c..c71ba27266a 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/Global.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/Global.java
@@ -34,7 +34,6 @@ import java.io.PrintWriter;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.ref.SoftReference;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -394,7 +393,7 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
 
     @Override
     public ScriptFunction newScriptFunction(final String name, final MethodHandle handle, final ScriptObject scope, final boolean strict) {
-        return new ScriptFunctionImpl(name, handle, scope, strict, null);
+        return new ScriptFunctionImpl(name, handle, scope, null, strict, false);
     }
 
     @Override
diff --git a/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java b/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
index 94490a27d9a..a3a6b33fd52 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
@@ -30,6 +30,8 @@ import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
+
+import jdk.nashorn.internal.runtime.ScriptFunctionData;
 import jdk.nashorn.internal.codegen.objects.FunctionObjectCreator;
 import jdk.nashorn.internal.runtime.GlobalFunctions;
 import jdk.nashorn.internal.runtime.Property;
@@ -37,7 +39,6 @@ import jdk.nashorn.internal.runtime.PropertyMap;
 import jdk.nashorn.internal.runtime.ScriptFunction;
 import jdk.nashorn.internal.runtime.ScriptObject;
 import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.Source;
 import jdk.nashorn.internal.runtime.linker.Lookup;
 import jdk.nashorn.internal.runtime.linker.MethodHandleFactory;
 
@@ -46,109 +47,68 @@ import jdk.nashorn.internal.runtime.linker.MethodHandleFactory;
  * function objects -- to expose properties like "prototype", "length" etc.
  */
 public class ScriptFunctionImpl extends ScriptFunction {
-    // per-function object flags
-    private static final int IS_STRICT  = 0b0000_0001;
-    private static final int IS_BUILTIN = 0b0000_0010;
-    private static final int HAS_CALLEE = 0b0000_0100;
-
-    // set this function to be a builtin function
-    private void setIsBuiltin() {
-        flags |= IS_BUILTIN;
-    }
-
-    // set this function to be a ECMAScript strict function
-    private void setIsStrict() {
-        flags |= IS_STRICT;
-    }
 
     private static final MethodHandle BOUND_FUNCTION    = findOwnMH("boundFunction",    Object.class, ScriptFunction.class, Object.class, Object[].class, Object.class, Object[].class);
     private static final MethodHandle BOUND_CONSTRUCTOR = findOwnMH("boundConstructor", Object.class, ScriptFunction.class, Object[].class, Object.class, Object[].class);
 
     private static final PropertyMap nasgenmap$;
 
-    private int flags;
-
     /**
-     * Constructor
-     *
-     * Called by Nasgen generated code, no membercount, use the default map
-     * Creates builtin functions only
+     * Constructor called by Nasgen generated code, no membercount, use the default map.
+     * Creates builtin functions only.
      *
      * @param name name of function
      * @param invokeHandle handle for invocation
      * @param specs specialized versions of this method, if available, null otherwise
      */
     ScriptFunctionImpl(final String name, final MethodHandle invokeHandle, final MethodHandle[] specs) {
-        this(name, invokeHandle, nasgenmap$, specs);
+        super(name, invokeHandle, nasgenmap$, null, specs, false, true);
+        init();
     }
 
     /**
-     * Constructor
-     *
-     * Called by Nasgen generated code, no membercount, use the default map
-     * Creates builtin functions only
+     * Constructor called by Nasgen generated code, no membercount, use the map passed as argument.
+     * Creates builtin functions only.
      *
      * @param name name of function
-     * @param methodHandle handle for invocation
+     * @param invokeHandle handle for invocation
      * @param map initial property map
      * @param specs specialized versions of this method, if available, null otherwise
      */
-    ScriptFunctionImpl(final String name, final MethodHandle methodHandle, final PropertyMap map, final MethodHandle[] specs) {
-        super(name, methodHandle, (nasgenmap$ == map) ? nasgenmap$ : map.addAll(nasgenmap$), null, null, 0, false, specs);
-        this.setIsBuiltin();
+    ScriptFunctionImpl(final String name, final MethodHandle invokeHandle, final PropertyMap map, final MethodHandle[] specs) {
+        super(name, invokeHandle, map.addAll(nasgenmap$), null, specs, false, true);
         init();
     }
 
     /**
-     * Constructor
-     *
-     * Called by Global.newScriptFunction (runtime)
+     * Constructor called by Global.newScriptFunction (runtime).
      *
      * @param name name of function
      * @param methodHandle handle for invocation
      * @param scope scope object
-     * @param strict are we in strict mode
      * @param specs specialized versions of this method, if available, null otherwise
+     * @param strict are we in strict mode
+     * @param builtin is this a built-in function
      */
-    ScriptFunctionImpl(final String name, final MethodHandle methodHandle, final ScriptObject scope, final boolean strict, final MethodHandle[] specs) {
-        super(name, methodHandle, getMap(strict), scope, specs);
-        if (strict) {
-            this.setIsStrict();
-        }
+    ScriptFunctionImpl(final String name, final MethodHandle methodHandle, final ScriptObject scope, final MethodHandle[] specs, final boolean strict, final boolean builtin) {
+        super(name, methodHandle, getMap(strict), scope, specs, strict, builtin);
         init();
     }
 
     /**
-     * Constructor
+     * Constructor called by (compiler) generated code for {@link ScriptObject}s.
+     * Code is generated by {@link FunctionObjectCreator}
      *
-     * Called by (compiler) generated code for {@link ScriptObject}s. Code is
-     * generated by {@link FunctionObjectCreator}
-     *
-     * TODO this is a horrible constructor - can we do it with fewer args?
-     *
-     * @param name name of function
+     * @param data static function data
      * @param methodHandle handle for invocation
      * @param scope scope object
-     * @param source source
-     * @param token token
      * @param allocator instance constructor for function
-     * @param allocatorMap initial map that constructor will keep reference to for future instantiations
-     * @param needCallee does the function use the {@code callee} variable
-     * @param strict are we in strict mode
      */
-    public ScriptFunctionImpl(
-            final String name,
-            final MethodHandle methodHandle,
-            final ScriptObject scope,
-            final Source source,
-            final long token,
-            final MethodHandle allocator,
-            final PropertyMap allocatorMap,
-            final boolean needCallee,
-            final boolean strict) {
-        super(name, methodHandle, getMap(strict), scope, source, token, allocator, allocatorMap, needCallee, null);
-        if (strict) {
-            this.setIsStrict();
+    public ScriptFunctionImpl(final ScriptFunctionData data, final MethodHandle methodHandle, final ScriptObject scope, final MethodHandle allocator) {
+        super(data, getMap(data.isStrict()), scope);
+        // Set method handles in script data
+        if (data.getInvoker() == null) {
+            data.setMethodHandles(methodHandle, allocator);
         }
         init();
     }
@@ -167,11 +127,11 @@ public class ScriptFunctionImpl extends ScriptFunction {
     static synchronized ScriptFunction getTypeErrorThrower() {
         if (typeErrorThrower == null) {
             //name handle
-            final ScriptFunctionImpl func = new ScriptFunctionImpl("TypeErrorThrower", Lookup.TYPE_ERROR_THROWER_SETTER, null, false, null);
+            final ScriptFunctionImpl func = new ScriptFunctionImpl("TypeErrorThrower", Lookup.TYPE_ERROR_THROWER_SETTER, null, null, false, false);
             // clear constructor handle...
-            func.constructHandle = null;
-            func.prototype       = UNDEFINED;
-            typeErrorThrower     = func;
+            func.setConstructHandle(null);
+            func.setPrototype(UNDEFINED);
+            typeErrorThrower = func;
         }
 
         return typeErrorThrower;
@@ -216,28 +176,8 @@ public class ScriptFunctionImpl extends ScriptFunction {
         return new AnonymousFunction();
     }
 
-    @Override
-    public final boolean isStrict() {
-        return (flags & IS_STRICT) != 0;
-    }
-
-    @Override
-    public final boolean hasCalleeParameter() {
-        return (flags & HAS_CALLEE) != 0;
-    }
-
-    @Override
-    protected void setHasCalleeParameter() {
-        flags |= HAS_CALLEE;
-    }
-
-    @Override
-    public final boolean isBuiltin() {
-        return (flags & IS_BUILTIN) != 0;
-    }
-
     /**
-     * Factory method for non-constructor functions
+     * Factory method for non-constructor built-in functions
      *
      * @param name   function name
      * @param methodHandle handle for invocation
@@ -246,9 +186,7 @@ public class ScriptFunctionImpl extends ScriptFunction {
      * @return new ScriptFunction
      */
     public static ScriptFunction makeFunction(final String name, final MethodHandle methodHandle, final MethodHandle[] specs, final boolean strict) {
-        final ScriptFunctionImpl func = new ScriptFunctionImpl(name, methodHandle, null, strict, specs);
-
-        func.setIsBuiltin();
+        final ScriptFunctionImpl func = new ScriptFunctionImpl(name, methodHandle, null, specs, strict, true);
         func.setConstructHandle(null);
         func.setPrototype(UNDEFINED);
 
@@ -256,7 +194,7 @@ public class ScriptFunctionImpl extends ScriptFunction {
     }
 
     /**
-     * Factory method for non-constructor functions
+     * Factory method for non-constructor built-in functions
      *
      * @param name   function name
      * @param methodHandle handle for invocation
@@ -268,7 +206,7 @@ public class ScriptFunctionImpl extends ScriptFunction {
     }
 
     /**
-     * Factory method for non-constructor functions
+     * Factory method for non-constructor built-in functions
      *
      * @param name   function name
      * @param methodHandle handle for invocation
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java b/nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java
index 399e2e94b61..0864b1c40c4 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java
@@ -383,6 +383,7 @@ public final class PropertyMap implements Iterable<Object>, PropertyListener {
      * @return New {@link PropertyMap} with added properties.
      */
     public PropertyMap addAll(final PropertyMap other) {
+        assert this != other : "adding property map to itself";
         final Property[] otherProperties = other.properties.getProperties();
         final PropertyHashMap newProperties = properties.immutableAdd(otherProperties);
 
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
index c0b89be9e7e..2fbe3ee0cf5 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
@@ -37,7 +37,6 @@ import jdk.nashorn.internal.codegen.CompilerConstants.Call;
 import jdk.nashorn.internal.codegen.types.Type;
 import jdk.nashorn.internal.objects.annotations.SpecializedConstructor;
 import jdk.nashorn.internal.objects.annotations.SpecializedFunction;
-import jdk.nashorn.internal.parser.Token;
 import jdk.nashorn.internal.runtime.linker.MethodHandleFactory;
 import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
 import jdk.nashorn.internal.runtime.linker.NashornGuards;
@@ -70,144 +69,53 @@ public abstract class ScriptFunction extends ScriptObject {
 
     private static final MethodHandle WRAPFILTER = findOwnMH("wrapFilter", Object.class, Object.class);
 
-    /** method handle to arity setter for this ScriptFunction */
-    public static final Call SET_ARITY = virtualCallNoLookup(ScriptFunction.class, "setArity", void.class, int.class);
     /** method handle to scope getter for this ScriptFunction */
     public static final Call GET_SCOPE = virtualCallNoLookup(ScriptFunction.class, "getScope", ScriptObject.class);
 
     /** Should specialized function and specialized constructors for the builtin be used if available? */
     private static final boolean DISABLE_SPECIALIZATION = Options.getBooleanProperty("nashorn.scriptfunction.specialization.disable");
 
-    /** Name of function or null. */
-    private final String name;
-
-    /** Source of function. */
-    private final Source source;
-
-    /** Start position and length in source. */
-    private final long token;
-
-    /** Reference to code for this method. */
-    private final MethodHandle invokeHandle;
-
-    /** Reference to code for this method when called to create "new" object */
-    protected MethodHandle constructHandle;
+    private final ScriptFunctionData data;
 
     /** Reference to constructor prototype. */
     protected Object prototype;
 
-    /** Constructor to create a new instance. */
-    private MethodHandle allocator;
-
-    /** Map for new instance constructor. */
-    private PropertyMap allocatorMap;
-
     /** The parent scope. */
     private final ScriptObject scope;
 
-    /** Specializations - see @SpecializedFunction */
-    private MethodHandle[] invokeSpecializations;
+    /**
+     * Constructor
+     *
+     * @param name         function name
+     * @param methodHandle method handle to function (if specializations are present, assumed to be most generic)
+     * @param map          property map
+     * @param scope        scope
+     * @param specs        specialized version of this function - other method handles
+     *
+     */
+    protected ScriptFunction(
+            final String name,
+            final MethodHandle methodHandle,
+            final PropertyMap map,
+            final ScriptObject scope,
+            final MethodHandle[] specs,
+            final boolean strict,
+            final boolean builtin) {
 
-    /** Specializations - see @SpecializedFunction */
-    private MethodHandle[] constructSpecializations;
-
-    /** This field is either computed in constructor or set explicitly by calling setArity method. */
-    private int arity;
+        this (new ScriptFunctionData(name, methodHandle, specs, strict, builtin), map, scope);
+    }
 
     /**
      * Constructor
      *
-     * @param name          function name
-     * @param methodHandle  method handle to function (if specializations are present, assumed to be most generic)
+     * @param data          static function data
      * @param map           property map
      * @param scope         scope
-     * @param specs         specialized version of this function - other method handles
      */
     protected ScriptFunction(
-            final String name,
-            final MethodHandle methodHandle,
+            final ScriptFunctionData data,
             final PropertyMap map,
-            final ScriptObject scope,
-            final MethodHandle[] specs) {
-        this(name, methodHandle, map, scope, null, 0, needsCallee(methodHandle), specs);
-    }
-
-    /**
-     * Heuristic to figure out if the method handle has a callee argument. If it's type is either
-     * {@code (boolean, Object, ScriptFunction, ...)} or {@code (Object, ScriptFunction, ...)}, then we'll assume it has
-     * a callee argument. We need this as the constructor above is not passed this information, and can't just blindly
-     * assume it's false (notably, it's being invoked for creation of new scripts, and scripts have scopes, therefore
-     * they also always receive a callee.
-     * @param methodHandle the examined method handle
-     * @return true if the method handle expects a callee, false otherwise
-     */
-    private static boolean needsCallee(MethodHandle methodHandle) {
-        final MethodType type = methodHandle.type();
-        final int len = type.parameterCount();
-        if(len == 0) {
-            return false;
-        }
-        if(type.parameterType(0) == boolean.class) {
-            return len > 2 && type.parameterType(2) == ScriptFunction.class;
-        }
-        return len > 1 && type.parameterType(1) == ScriptFunction.class;
-    }
-
-    /**
-     * Constructor
-     *
-     * @param name          function name
-     * @param methodHandle  method handle to function (if specializations are present, assumed to be most generic)
-     * @param map           property map
-     * @param scope         scope
-     * @param source        the source
-     * @param token         token
-     * @param allocator     method handle to this function's allocator - see JO$ classes
-     * @param allocatorMap  property map to be used for all constructors
-     * @param needsCallee   does this method use the {@code callee} variable
-     * @param specs         specialized version of this function - other method handles
-     */
-    protected ScriptFunction(
-            final String name,
-            final MethodHandle methodHandle,
-            final PropertyMap map,
-            final ScriptObject scope,
-            final Source source,
-            final long token,
-            final MethodHandle allocator,
-            final PropertyMap allocatorMap,
-            final boolean needsCallee,
-            final MethodHandle[] specs) {
-
-        this(name, methodHandle, map, scope, source, token, needsCallee, specs);
-
-        //this is the internal constructor
-
-        this.allocator    = allocator;
-        this.allocatorMap = allocatorMap;
-    }
-
-    /**
-     * Constructor
-     *
-     * @param name              function name
-     * @param methodHandle      method handle to function (if specializations are present, assumed to be most generic)
-     * @param map               property map
-     * @param scope             scope
-     * @param source            the source
-     * @param token             token
-     * @param needsCallee       does this method use the {@code callee} variable
-     * @param specs             specialized version of this function - other method handles
-     */
-    protected ScriptFunction(
-            final String name,
-            final MethodHandle methodHandle,
-            final PropertyMap map,
-            final ScriptObject scope,
-            final Source source,
-            final long token,
-            final boolean needsCallee,
-            final MethodHandle[] specs) {
+            final ScriptObject scope) {
 
         super(map);
 
@@ -215,89 +123,8 @@ public abstract class ScriptFunction extends ScriptObject {
             constructorCount++;
         }
 
-        this.name   = name;
-        this.source = source;
-        this.token  = token;
+        this.data = data;
         this.scope  = scope;
-        if(needsCallee) {
-            setHasCalleeParameter();
-        }
-
-        final MethodType type       = methodHandle.type();
-        final int        paramCount = type.parameterCount();
-        final boolean    isVarArg   = type.parameterType(paramCount - 1).isArray();
-
-        final MethodHandle mh = MH.asType(methodHandle, adaptType(type, needsCallee, isVarArg));
-
-        this.arity = isVarArg ? -1 : paramCount - 1; //drop the self param for arity
-
-        if (needsCallee && !isVarArg) {
-            this.arity--;
-        }
-
-        if (scope != null) {
-            this.invokeHandle    = mh;
-            this.constructHandle = mh;
-        } else if (isConstructor(mh)) {
-            if (!isVarArg) {
-                this.arity--;    // drop the boolean flag for arity
-            }
-            /*
-             * We insert a boolean argument to tell if the method was invoked as
-             * constructor or not if the method handle's first argument is boolean.
-             */
-            this.invokeHandle    = MH.insertArguments(mh, 0, false);
-            this.constructHandle = MH.insertArguments(mh, 0, true);
-
-            if (specs != null) {
-                this.invokeSpecializations    = new MethodHandle[specs.length];
-                this.constructSpecializations = new MethodHandle[specs.length];
-                for (int i = 0; i < specs.length; i++) {
-                    this.invokeSpecializations[i]    = MH.insertArguments(specs[i], 0, false);
-                    this.constructSpecializations[i] = MH.insertArguments(specs[i], 0, true);
-                }
-            }
-        } else {
-            this.invokeHandle             = mh;
-            this.constructHandle          = mh;
-            this.invokeSpecializations    = specs;
-            this.constructSpecializations = specs;
-        }
-    }
-
-    /**
-     * Takes a method type, and returns a (potentially different method type) that the method handles used by
-     * ScriptFunction must conform to in order to be usable in {@link #invoke(Object, Object...)} and
-     * {@link #construct(Object, Object...)}. The returned method type will be sure to return {@code Object}, and will
-     * have all its parameters turned into {@code Object} as well, except for the following ones:
-     * <ul>
-     * <li>an optional first {@code boolean} parameter, used for some functions to distinguish method and constructor
-     * invocation,</li>
-     * <li>a last parameter of type {@code Object[]} which is used for vararg functions,</li>
-     * <li>the second (or, in presence of boolean parameter, third) argument, which is forced to be
-     * {@link ScriptFunction}, in case the function receives itself (callee) as an argument</li>
-     * @param type the original type
-     * @param hasCallee true if the function uses the callee argument
-     * @param isVarArg if the function is a vararg
-     * @return the new type, conforming to the rules above.
-     */
-    private static MethodType adaptType(final MethodType type, final boolean hasCallee, final boolean isVarArg) {
-        // Generify broadly
-        MethodType newType = type.generic().changeReturnType(Object.class);
-        if(isVarArg) {
-            // Change back to vararg if we over-generified it
-            newType = newType.changeParameterType(type.parameterCount() - 1, Object[].class);
-        }
-        final boolean hasBoolean = type.parameterType(0) == boolean.class;
-        if(hasBoolean) {
-            // Restore the initial boolean argument
-            newType = newType.changeParameterType(0, boolean.class);
-        }
-        if(hasCallee) {
-            // Restore the ScriptFunction argument
-            newType = newType.changeParameterType(hasBoolean ? 2 : 1, ScriptFunction.class);
-        }
-        return newType;
     }
 
     @Override
@@ -329,7 +156,7 @@ public abstract class ScriptFunction extends ScriptObject {
      * @return arity
      */
     public final int getArity() {
-        return arity;
+        return data.getArity();
     }
 
     /**
@@ -337,27 +164,32 @@ public abstract class ScriptFunction extends ScriptObject {
      * @param arity arity
      */
     public final void setArity(final int arity) {
-        this.arity = arity;
+        data.setArity(arity);
     }
 
     /**
      * Is this a ECMAScript 'use strict' function?
      * @return true if function is in strict mode
      */
-    public abstract boolean isStrict();
+    public boolean isStrict() {
+        return data.isStrict();
+    }
 
     /**
      * Is this a ECMAScript built-in function (like parseInt, Array.isArray) ?
      * @return true if built-in
      */
-    public abstract boolean isBuiltin();
+    public boolean isBuiltin() {
+        return data.isBuiltin();
+    }
 
     /**
-     * Is this a non-strict and not-built-in script function?
-     * @return true if neither strict nor built-in
+     * Returns true if this is a non-strict, non-built-in function that requires non-primitive this argument
+     * according to ECMA 10.4.3.
+     * @return true if this argument must be an object
      */
-    public boolean isNonStrictFunction() {
-        return !isStrict() && !isBuiltin();
+    public boolean needsWrappedThis() {
+        return data.needsWrappedThis();
     }
 
     /**
@@ -372,43 +204,44 @@ public abstract class ScriptFunction extends ScriptObject {
             invokes++;
         }
 
+        final MethodHandle invoker = data.getGenericInvoker();
         final Object selfObj = convertThisObject(self);
         final Object[] args = arguments == null ? ScriptRuntime.EMPTY_ARRAY : arguments;
 
-        if (isVarArg(invokeHandle)) {
-            if (hasCalleeParameter()) {
-                return invokeHandle.invokeExact(selfObj, this, args);
+        if (data.isVarArg()) {
+            if (data.needsCallee()) {
+                return invoker.invokeExact(selfObj, this, args);
             }
-            return invokeHandle.invokeExact(selfObj, args);
+            return invoker.invokeExact(selfObj, args);
         }
 
-        final int paramCount = invokeHandle.type().parameterCount();
-        if (hasCalleeParameter()) {
+        final int paramCount = invoker.type().parameterCount();
+        if (data.needsCallee()) {
             switch (paramCount) {
             case 2:
-                return invokeHandle.invokeExact(selfObj, this);
+                return invoker.invokeExact(selfObj, this);
             case 3:
-                return invokeHandle.invokeExact(selfObj, this, getArg(args, 0));
+                return invoker.invokeExact(selfObj, this, getArg(args, 0));
             case 4:
-                return invokeHandle.invokeExact(selfObj, this, getArg(args, 0), getArg(args, 1));
+                return invoker.invokeExact(selfObj, this, getArg(args, 0), getArg(args, 1));
             case 5:
-                return invokeHandle.invokeExact(selfObj, this, getArg(args, 0), getArg(args, 1), getArg(args, 2));
+                return invoker.invokeExact(selfObj, this, getArg(args, 0), getArg(args, 1), getArg(args, 2));
             default:
-                return invokeHandle.invokeWithArguments(withArguments(selfObj, this, paramCount, args));
+                return invoker.invokeWithArguments(withArguments(selfObj, this, paramCount, args));
             }
         }
 
         switch (paramCount) {
         case 1:
-            return invokeHandle.invokeExact(selfObj);
+            return invoker.invokeExact(selfObj);
         case 2:
-            return invokeHandle.invokeExact(selfObj, getArg(args, 0));
+            return invoker.invokeExact(selfObj, getArg(args, 0));
         case 3:
-            return invokeHandle.invokeExact(selfObj, getArg(args, 0), getArg(args, 1));
+            return invoker.invokeExact(selfObj, getArg(args, 0), getArg(args, 1));
         case 4:
-            return invokeHandle.invokeExact(selfObj, getArg(args, 0), getArg(args, 1), getArg(args, 2));
+            return invoker.invokeExact(selfObj, getArg(args, 0), getArg(args, 1), getArg(args, 2));
         default:
-            return invokeHandle.invokeWithArguments(withArguments(selfObj, null, paramCount, args));
+            return invoker.invokeWithArguments(withArguments(selfObj, null, paramCount, args));
         }
     }
 
@@ -424,44 +257,45 @@ public abstract class ScriptFunction extends ScriptObject {
      * @throws Throwable if there is an exception/error with the constructor invocation or thrown from it
      */
     public Object construct(final Object self, final Object... args) throws Throwable {
-        if (constructHandle == null) {
+        if (data.getConstructor() == null) {
             typeError("not.a.constructor", ScriptRuntime.safeToString(this));
         }
 
-        if (isVarArg(constructHandle)) {
-            if (hasCalleeParameter()) {
-                return constructHandle.invokeExact(self, this, args);
+        final MethodHandle constructor = data.getGenericConstructor();
+        if (data.isVarArg()) {
+            if (data.needsCallee()) {
+                return constructor.invokeExact(self, this, args);
             }
-            return constructHandle.invokeExact(self, args);
+            return constructor.invokeExact(self, args);
         }
 
-        final int paramCount = constructHandle.type().parameterCount();
-        if (hasCalleeParameter()) {
+        final int paramCount = constructor.type().parameterCount();
+        if (data.needsCallee()) {
             switch (paramCount) {
             case 2:
-                return constructHandle.invokeExact(self, this);
+                return constructor.invokeExact(self, this);
             case 3:
-                return constructHandle.invokeExact(self, this, getArg(args, 0));
+                return constructor.invokeExact(self, this, getArg(args, 0));
             case 4:
-                return constructHandle.invokeExact(self, this, getArg(args, 0), getArg(args, 1));
+                return constructor.invokeExact(self, this, getArg(args, 0), getArg(args, 1));
             case 5:
-                return constructHandle.invokeExact(self, this, getArg(args, 0), getArg(args, 1), getArg(args, 2));
+                return constructor.invokeExact(self, this, getArg(args, 0), getArg(args, 1), getArg(args, 2));
             default:
-                return constructHandle.invokeWithArguments(withArguments(self, this, args));
+                return constructor.invokeWithArguments(withArguments(self, this, args));
             }
         }
 
         switch(paramCount) {
         case 1:
-            return constructHandle.invokeExact(self);
+            return constructor.invokeExact(self);
         case 2:
-            return constructHandle.invokeExact(self, getArg(args, 0));
+            return constructor.invokeExact(self, getArg(args, 0));
         case 3:
-            return constructHandle.invokeExact(self, getArg(args, 0), getArg(args, 1));
+            return constructor.invokeExact(self, getArg(args, 0), getArg(args, 1));
         case 4:
-            return constructHandle.invokeExact(self, getArg(args, 0), getArg(args, 1), getArg(args, 2));
+            return constructor.invokeExact(self, getArg(args, 0), getArg(args, 1), getArg(args, 2));
         default:
-            return constructHandle.invokeWithArguments(withArguments(self, null, args));
+            return constructor.invokeWithArguments(withArguments(self, null, args));
         }
     }
 
@@ -509,9 +343,9 @@ public abstract class ScriptFunction extends ScriptObject {
 
         ScriptObject object = null;
 
-        if (allocator != null) {
+        if (data.getAllocator() != null) {
             try {
-                object = (ScriptObject)allocator.invokeExact(allocatorMap);
+                object = (ScriptObject)data.getAllocator().invokeExact(data.getAllocatorMap());
             } catch (final RuntimeException | Error e) {
                 throw e;
             } catch (final Throwable t) {
@@ -546,25 +380,6 @@ public abstract class ScriptFunction extends ScriptObject {
      */
     public abstract ScriptFunction makeBoundFunction(Object self, Object[] args);
 
-    /**
-     * Test if a methodHandle refers to a constructor.
-     * @param methodHandle MethodHandle to test.
-     * @return True if method is a constructor.
-     */
-    private static boolean isConstructor(final MethodHandle methodHandle) {
-        return methodHandle.type().parameterCount() >= 1 && methodHandle.type().parameterType(0) == boolean.class;
-    }
-
-    /**
-     * Test if a methodHandle refers to a variable argument method.
-     * @param methodHandle MethodHandle to test.
-     * @return True if variable arguments.
-     */
-    public boolean isVarArg(final MethodHandle methodHandle) {
-        return hasCalleeParameter()
-                ? methodHandle.type().parameterCount() == 3 && methodHandle.type().parameterType(2).isArray()
-                : methodHandle.type().parameterCount() == 2 && methodHandle.type().parameterType(1).isArray();
-    }
 
     @Override
     public final String safeToString() {
@@ -573,23 +388,7 @@ public abstract class ScriptFunction extends ScriptObject {
 
     @Override
     public String toString() {
-        final StringBuilder sb = new StringBuilder();
-
-        sb.append(super.toString())
-            .append(" [ ")
-            .append(invokeHandle)
-            .append(", ")
-            .append((name == null || name.isEmpty()) ? "<anonymous>" : name);
-
-        if (source != null) {
-            sb.append(" @ ")
-               .append(source.getName())
-               .append(':')
-               .append(source.getLine(Token.descPosition(token)));
-        }
-        sb.append(" ]");
-
-        return sb.toString();
+        return data.toString();
     }
 
     /**
@@ -598,11 +397,7 @@ public abstract class ScriptFunction extends ScriptObject {
      * @return string representation of this function's source
      */
     public final String toSource() {
-        if (source != null && token != 0) {
-            return source.getString(Token.descPosition(token), Token.descLength(token));
-        }
-
-        return "function " + (name == null ? "" : name) + "() { [native code] }";
+        return data.toSource();
     }
 
     /**
@@ -696,7 +491,7 @@ public abstract class ScriptFunction extends ScriptObject {
      * @return invoke method handle
      */
     public final MethodHandle getBestSpecializedInvokeHandle(final MethodType type) {
-        return candidateWithLowestWeight(type, getInvokeHandle(), invokeSpecializations);
+        return candidateWithLowestWeight(type, getInvokeHandle(), data.getInvokeSpecializations());
     }
 
     /**
@@ -706,7 +501,7 @@ public abstract class ScriptFunction extends ScriptObject {
      * @return invokeHandle
      */
     public final MethodHandle getInvokeHandle() {
-        return invokeHandle;
+        return data.getInvoker();
     }
 
     /**
@@ -718,19 +513,9 @@ public abstract class ScriptFunction extends ScriptObject {
      */
     public final MethodHandle getBoundInvokeHandle(final ScriptObject self) {
         final MethodHandle bound = MH.bindTo(getInvokeHandle(), self);
-        return hasCalleeParameter() ? MH.bindTo(bound, this) : bound;
+        return data.needsCallee() ? MH.bindTo(bound, this) : bound;
     }
 
-    /**
-     * Check whether the ScriptFunction has callee parameter
-     * @return true if callee parameter
-     */
-    protected abstract boolean hasCalleeParameter();
-
-    /**
-     * Flag ScriptFunction as needing a callee parameter
-     */
-    protected abstract void setHasCalleeParameter();
 
     /**
      * Get the construct handle - the most generic (and if no specializations are in place, only) constructor
@@ -740,7 +525,7 @@ public abstract class ScriptFunction extends ScriptObject {
      * @return construct handle
      */
     public final MethodHandle getConstructHandle(final MethodType type) {
-        return candidateWithLowestWeight(type, getConstructHandle(), constructSpecializations);
+        return candidateWithLowestWeight(type, getConstructHandle(), data.getConstructSpecializations());
     }
 
     /**
@@ -748,7 +533,7 @@ public abstract class ScriptFunction extends ScriptObject {
      * @return constructor handle
      */
     public final MethodHandle getConstructHandle() {
-        return constructHandle;
+        return data.getConstructor();
     }
 
     /**
@@ -756,8 +541,7 @@ public abstract class ScriptFunction extends ScriptObject {
      * @param constructHandle constructor handle
      */
     public final void setConstructHandle(final MethodHandle constructHandle) {
-        this.constructHandle = constructHandle;
-        this.constructSpecializations = null;
+        data.setConstructor(constructHandle);
     }
 
     /**
@@ -765,7 +549,7 @@ public abstract class ScriptFunction extends ScriptObject {
      * @return the name
      */
     public final String getName() {
-        return name;
+        return data.getName();
     }
 
     /**
@@ -775,7 +559,7 @@ public abstract class ScriptFunction extends ScriptObject {
      * @return true if this needs compilation
      */
     public final boolean needsCompilation() {
-        return invokeHandle == null;
+        return data.getInvoker() == null;
     }
 
     /**
@@ -783,7 +567,7 @@ public abstract class ScriptFunction extends ScriptObject {
      * @return token
      */
     public final long getToken() {
-        return token;
+        return data.getToken();
     }
 
     /**
@@ -907,7 +691,7 @@ public abstract class ScriptFunction extends ScriptObject {
         final Class<?>[] ctorArgs = ctorType.dropParameterTypes(0, 1).parameterArray(); // drop self
         MethodHandle handle = MH.foldArguments(MH.dropArguments(NEWFILTER, 2, ctorArgs), constructor);
 
-        if (hasCalleeParameter()) {
+        if (data.needsCallee()) {
             handle = MH.foldArguments(handle, ALLOCATE);
         } else {
             handle = MH.filterArguments(handle, 0, ALLOCATE);
@@ -958,12 +742,12 @@ public abstract class ScriptFunction extends ScriptObject {
         MethodHandle boundHandle;
         MethodHandle guard = null;
 
-        if (hasCalleeParameter()) {
+        if (data.needsCallee()) {
             final MethodHandle callHandle = getBestSpecializedInvokeHandle(type);
 
             if(NashornCallSiteDescriptor.isScope(desc)) {
                 // (this, callee, args...) => (callee, args...) => (callee, [this], args...)
-                boundHandle = MH.bindTo(callHandle, isNonStrictFunction() ? Context.getGlobalTrusted() : ScriptRuntime.UNDEFINED);
+                boundHandle = MH.bindTo(callHandle, needsWrappedThis() ? Context.getGlobalTrusted() : ScriptRuntime.UNDEFINED);
                 boundHandle = MH.dropArguments(boundHandle, 1, Object.class);
             } else {
                 // (this, callee, args...) permute => (callee, this, args...) which is what we get in
@@ -980,7 +764,7 @@ public abstract class ScriptFunction extends ScriptObject {
                 // For non-strict functions, check whether this-object is primitive type.
                 // If so add a to-object-wrapper argument filter.
                 // Else install a guard that will trigger a relink when the argument becomes primitive.
-                if (isNonStrictFunction()) {
+                if (needsWrappedThis()) {
                     if (isPrimitiveThis(request.getArguments()[1])) {
                         boundHandle = MH.filterArguments(boundHandle, 1, WRAPFILTER);
                     } else {
@@ -992,7 +776,7 @@ public abstract class ScriptFunction extends ScriptObject {
             final MethodHandle callHandle = getBestSpecializedInvokeHandle(type.dropParameterTypes(0, 1));
 
             if(NashornCallSiteDescriptor.isScope(desc)) {
-                boundHandle = MH.bindTo(callHandle, isNonStrictFunction() ? Context.getGlobalTrusted() : ScriptRuntime.UNDEFINED);
+                boundHandle = MH.bindTo(callHandle, needsWrappedThis() ? Context.getGlobalTrusted() : ScriptRuntime.UNDEFINED);
                 boundHandle = MH.dropArguments(boundHandle, 0, Object.class, Object.class);
             } else {
                 boundHandle = MH.dropArguments(callHandle, 0, Object.class);
@@ -1012,13 +796,13 @@ public abstract class ScriptFunction extends ScriptObject {
         MethodHandle methodHandle = getBestSpecializedInvokeHandle(type);
 
         if (bindName != null) {
-            if (hasCalleeParameter()) {
+            if (data.needsCallee()) {
                 methodHandle = MH.insertArguments(methodHandle, 1, this, bindName);
             } else {
                 methodHandle = MH.insertArguments(methodHandle, 1, bindName);
             }
         } else {
-            if (hasCalleeParameter()) {
+            if (data.needsCallee()) {
                 methodHandle = MH.insertArguments(methodHandle, 1, this);
             }
         }
@@ -1034,7 +818,7 @@ public abstract class ScriptFunction extends ScriptObject {
      * @return the converted this object
      */
     protected Object convertThisObject(final Object thiz) {
-        if (!(thiz instanceof ScriptObject) && isNonStrictFunction()) {
+        if (!(thiz instanceof ScriptObject) && needsWrappedThis()) {
             if (JSType.nullOrUndefined(thiz)) {
                 return Context.getGlobalTrusted();
             }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunctionData.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunctionData.java
new file mode 100644
index 00000000000..65dbd6375b5
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunctionData.java
@@ -0,0 +1,442 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import jdk.nashorn.internal.ir.FunctionNode;
+import jdk.nashorn.internal.parser.Token;
+import jdk.nashorn.internal.parser.TokenType;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodType;
+
+import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+
+/**
+ * A container for data needed to instantiate a specific {@link ScriptFunction} at runtime.
+ * Instances of this class are created during codegen and stored in script classes'
+ * constants array to reduce function instantiation overhead during runtime.
+ */
+public class ScriptFunctionData {
+
+    // per-function object flags
+    private static final int IS_STRICT  = 0b0000_0001;
+    private static final int IS_BUILTIN = 0b0000_0010;
+    private static final int HAS_CALLEE = 0b0000_0100;
+    private static final int IS_VARARGS = 0b0000_1000;
+
+    /** Name of the function or "" */
+    private final String name;
+    /** Source of this function, or null */
+    private final Source source;
+    /** Map for new instance constructor */
+    private PropertyMap  allocatorMap;
+    /** Start position and length in source */
+    private final long   token;
+    /** Number of expected arguments, either taken from FunctionNode or calculated from method handle signature*/
+    private int          arity;
+    /** Does this function need a callee argument? */
+    private final int    flags;
+
+    /** Reference to code for this method. */
+    private MethodHandle invoker;
+    /** Reference to code for this method when called to create "new" object */
+    private MethodHandle constructor;
+    /** Constructor to create a new instance. */
+    private MethodHandle allocator;
+    /** Generic invoker to used in {@link ScriptFunction#invoke(Object, Object...)}. */
+    private MethodHandle genericInvoker;
+    /** Generic constructor used in {@link ScriptFunction#construct(Object, Object...)}. */
+    private MethodHandle genericConstructor;
+    /** Specializations - see @SpecializedFunction */
+    private MethodHandle[] invokeSpecializations;
+    /** Specializations - see @SpecializedFunction */
+    private MethodHandle[] constructSpecializations;
+
+    /**
+     * Constructor
+     * @param fn the function node
+     * @param allocatorMap the allocator property map
+     */
+    public ScriptFunctionData(final FunctionNode fn, final PropertyMap allocatorMap) {
+
+        final long firstToken = fn.getFirstToken();
+        final long lastToken  = fn.getLastToken();
+        final int  position   = Token.descPosition(firstToken);
+        final int  length     = Token.descPosition(lastToken) - position + Token.descLength(lastToken);
+
+        this.name         = fn.isAnonymous() ? "" : fn.getIdent().getName();
+        this.source       = fn.getSource();
+        this.allocatorMap = allocatorMap;
+        this.token        = Token.toDesc(TokenType.FUNCTION, position, length);
+        this.arity        = fn.getParameters().size();
+        this.flags        = makeFlags(fn.needsCallee(), fn.isVarArg(), fn.isStrictMode(), false);
+    }
+
+    /**
+     * Constructor
+     * @param name the function name
+     * @param methodHandle the method handle
+     * @param specs array of specialized method handles
+     * @param strict strict flag
+     * @param builtin builtin flag
+     */
+    public ScriptFunctionData(final String name, final MethodHandle methodHandle, final MethodHandle[] specs, final boolean strict, final boolean builtin) {
+        this.name        = name;
+        this.source      = null;
+        this.token       = 0;
+
+        final MethodType type     = methodHandle.type();
+        final int paramCount      = type.parameterCount();
+        final boolean isVarArg    = type.parameterType(paramCount - 1).isArray();
+        final boolean needsCallee = needsCallee(methodHandle);
+
+        this.flags = makeFlags(needsCallee, isVarArg, strict, builtin);
+        this.arity = isVarArg ? -1 : paramCount - 1; //drop the self param for arity
+
+        if (needsCallee && !isVarArg) {
+            this.arity--;
+        }
+
+        if (isConstructor(methodHandle)) {
+            if (!isVarArg) {
+                this.arity--;    // drop the boolean flag for arity
+            }
+            /*
+             * We insert a boolean argument to tell if the method was invoked as
+             * constructor or not if the method handle's first argument is boolean.
+             */
+            this.invoker     = MH.insertArguments(methodHandle, 0, false);
+            this.constructor = MH.insertArguments(methodHandle, 0, true);
+
+            if (specs != null) {
+                this.invokeSpecializations    = new MethodHandle[specs.length];
+                this.constructSpecializations = new MethodHandle[specs.length];
+                for (int i = 0; i < specs.length; i++) {
+                    this.invokeSpecializations[i]    = MH.insertArguments(specs[i], 0, false);
+                    this.constructSpecializations[i] = MH.insertArguments(specs[i], 0, true);
+                }
+            }
+        } else {
+            this.invoker                  = methodHandle;
+            this.constructor              = methodHandle;
+            this.invokeSpecializations    = specs;
+            this.constructSpecializations = specs;
+        }
+    }
+
+    /**
+     * Get the arity of the function.
+     * @return the arity
+     */
+    public int getArity() {
+        return arity;
+    }
+
+    /**
+     * Set the arity of the function.
+     * @param arity the arity
+     */
+    public void setArity(int arity) {
+        this.arity = arity;
+    }
+
+    /**
+     * Get the function name.
+     * @return function name
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Get the source of the function.
+     * @return the source
+     */
+    public Source getSource() {
+        return source;
+    }
+
+    /**
+     * Get this function as a String containing its source code. If no source code
+     * exists in this ScriptFunction, its contents will be displayed as {@code [native code]}
+     * @return string representation of this function's source
+     */
+    public String toSource() {
+        if (source != null && token != 0) {
+            return source.getString(Token.descPosition(token), Token.descLength(token));
+        }
+
+        return "function " + (name == null ? "" : name) + "() { [native code] }";
+    }
+
+    @Override
+    public String toString() {
+        final StringBuilder sb = new StringBuilder();
+
+        sb.append(super.toString())
+                .append(" [ ")
+                .append(invoker)
+                .append(", ")
+                .append((name == null || name.isEmpty()) ? "<anonymous>" : name);
+
+        if (source != null) {
+            sb.append(" @ ")
+                    .append(source.getName())
+                    .append(':')
+                    .append(source.getLine(Token.descPosition(token)));
+        }
+        sb.append(" ]");
+
+        return sb.toString();
+    }
+
+    /**
+     * Get the allocator property map.
+     * @return the allocator map
+     */
+    public PropertyMap getAllocatorMap() {
+        return allocatorMap;
+    }
+
+    /**
+     * Get the function's parse token.
+     * @return the token
+     */
+    public long getToken() {
+        return token;
+    }
+
+    /**
+     * Returns true if the function needs a callee argument.
+     * @return the needsCallee flag
+     */
+    public boolean needsCallee() {
+        return (flags & HAS_CALLEE) != 0;
+    }
+
+    /**
+     * Returns true if this is a strict-mode function.
+     * @return the strict flag
+     */
+    public boolean isStrict() {
+        return (flags & IS_STRICT) != 0;
+    }
+
+    /**
+     * Returns true if this is a built-in function.
+     * @return the built-in flag
+     */
+    public boolean isBuiltin() {
+        return (flags & IS_BUILTIN) != 0;
+    }
+
+    /**
+     * Returns true if this is a var-arg function.
+     * @return the var-arg flag
+     */
+    public boolean isVarArg() {
+        return (flags & IS_VARARGS) != 0;
+    }
+
+    /**
+     * Returns true if this is a non-strict, non-built-in function that requires non-primitive this argument
+     * according to ECMA 10.4.3.
+     * @return true if this argument must be an object
+     */
+    public boolean needsWrappedThis() {
+        return (flags & (IS_STRICT | IS_BUILTIN)) == 0;
+    }
+
+    /**
+     * Get the method handle used to invoke this function.
+     * @return the invoke handle
+     */
+    public MethodHandle getInvoker() {
+        return invoker;
+    }
+
+    /**
+     * Get the method handle used to invoke this function as a constructor.
+     * @return the constructor handle
+     */
+    public MethodHandle getConstructor() {
+        return constructor;
+    }
+
+    /**
+     * Set the constructor method handle.
+     * @param constructor the constructor handle
+     */
+    public void setConstructor(MethodHandle constructor) {
+        this.constructor = constructor;
+        this.constructSpecializations = null;
+    }
+
+    /**
+     * Get the method handle used to allocate a new object for this constructor.
+     * @return the allocator handle
+     */
+    public MethodHandle getAllocator() {
+        return allocator;
+    }
+
+    /**
+     * Get an adapted version of the invoker handle that only uses {@code Object} as parameter and return types.
+     * @return the generic invoke handle
+     */
+    public MethodHandle getGenericInvoker() {
+        if (genericInvoker == null) {
+            assert invoker != null : "invoker is null";
+            genericInvoker = adaptMethodType(invoker);
+        }
+        return genericInvoker;
+    }
+
+    /**
+     * Get an adapted version of the constructor handle that only uses {@code Object} as parameter and return types.
+     * @return the generic constructor handle
+     */
+    public MethodHandle getGenericConstructor() {
+        if (genericConstructor == null) {
+            assert constructor != null : "constructor is null";
+            genericConstructor = adaptMethodType(constructor);
+        }
+        return genericConstructor;
+    }
+
+    /**
+     * Get the specialized invoke handles for this function.
+     * @return array of specialized invoke handles
+     */
+    public MethodHandle[] getInvokeSpecializations() {
+        return invokeSpecializations;
+    }
+
+    /**
+     * Get the specialized construct handles for this function.
+     * @return array of specialized construct handles
+     */
+    public MethodHandle[] getConstructSpecializations() {
+        return constructSpecializations;
+    }
+
+    /**
+     * Set the method handles for this function.
+     * @param invoker the invoker handle
+     * @param allocator the allocator handle
+     */
+    public void setMethodHandles(MethodHandle invoker, MethodHandle allocator) {
+        // We can't make method handle fields final because they're not available during codegen
+        // and they're set when first called, so we enforce set-once here.
+        if (this.invoker == null) {
+            this.invoker     = invoker;
+            this.constructor = invoker;
+            this.allocator   = allocator;
+        }
+    }
+
+    /**
+     * Convert boolean flags to int.
+     * @param needsCallee needs-callee flag
+     * @param isVarArg var-arg flag
+     * @param isStrict strict flag
+     * @param isBuiltin builtin flag
+     * @return int flags
+     */
+    private static int makeFlags(final boolean needsCallee, final boolean isVarArg, final boolean isStrict, final boolean isBuiltin) {
+        int flags = 0;
+        if (needsCallee) {
+            flags |= HAS_CALLEE;
+        }
+        if (isVarArg) {
+            flags |= IS_VARARGS;
+        }
+        if (isStrict) {
+            flags |= IS_STRICT;
+        }
+        if (isBuiltin) {
+            flags |= IS_BUILTIN;
+        }
+        return flags;
+    }
+
+    /**
+     * Test if a methodHandle refers to a constructor.
+     * @param methodHandle MethodHandle to test.
+     * @return True if method is a constructor.
+     */
+    private static boolean isConstructor(final MethodHandle methodHandle) {
+        return methodHandle.type().parameterCount() >= 1 && methodHandle.type().parameterType(0) == boolean.class;
+    }
+
+    /**
+     * Heuristic to figure out if the method handle has a callee argument. If it's type is either
+     * {@code (boolean, Object, ScriptFunction, ...)} or {@code (Object, ScriptFunction, ...)}, then we'll assume it has
+     * a callee argument. We need this as the constructor above is not passed this information, and can't just blindly
+     * assume it's false (notably, it's being invoked for creation of new scripts, and scripts have scopes, therefore
+     * they also always receive a callee.
+     * @param methodHandle the examined method handle
+     * @return true if the method handle expects a callee, false otherwise
+     */
+    private static boolean needsCallee(MethodHandle methodHandle) {
+        final MethodType type = methodHandle.type();
+        final int len = type.parameterCount();
+        if(len == 0) {
+            return false;
+        }
+        if(type.parameterType(0) == boolean.class) {
+            return len > 2 && type.parameterType(2) == ScriptFunction.class;
+        }
+        return len > 1 && type.parameterType(1) == ScriptFunction.class;
+    }
+
+    /**
+     * Takes a method handle, and returns a potentially different method handle that can be used in
+     * {@link ScriptFunction#invoke(Object, Object...)} or {@link ScriptFunction#construct(Object, Object...)}.
+     * The returned method handle will be sure to return {@code Object}, and will have all its parameters turned into
+     * {@code Object} as well, except for the following ones:
+     * <ul>
+     *   <li>a last parameter of type {@code Object[]} which is used for vararg functions,</li>
+     *   <li>the second argument, which is forced to be {@link ScriptFunction}, in case the function receives itself
+     *   (callee) as an argument</li>
+     * </ul>
+     *
+     * @param handle the original method handle
+     * @return the new handle, conforming to the rules above.
+     */
+    private MethodHandle adaptMethodType(final MethodHandle handle) {
+        final MethodType type = handle.type();
+        MethodType newType = type.generic();
+        if (isVarArg()) {
+            newType = newType.changeParameterType(type.parameterCount() - 1, Object[].class);
+        }
+        if (needsCallee()) {
+            newType = newType.changeParameterType(1, ScriptFunction.class);
+        }
+        return type.equals(newType) ? handle : handle.asType(newType);
+    }
+
+}

From c95d492268e3007dd2ddce69348f0097aefa5797 Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Wed, 6 Feb 2013 17:56:12 +0530
Subject: [PATCH 118/311] 8007619: Add support for deprecated properties of
 RegExp constructor

Reviewed-by: lagergren, hannesw
---
 .../jdk/nashorn/internal/objects/Global.java  |   7 ++
 .../internal/objects/NativeRegExp.java        | 110 +++++++++++++++---
 .../internal/runtime/ScriptObject.java        |   4 +-
 nashorn/test/script/basic/JDK-8007619.js      |  49 ++++++++
 .../test/script/basic/JDK-8007619.js.EXPECTED |  14 +++
 5 files changed, 167 insertions(+), 17 deletions(-)
 create mode 100644 nashorn/test/script/basic/JDK-8007619.js
 create mode 100644 nashorn/test/script/basic/JDK-8007619.js.EXPECTED

diff --git a/nashorn/src/jdk/nashorn/internal/objects/Global.java b/nashorn/src/jdk/nashorn/internal/objects/Global.java
index c71ba27266a..cf640b865cb 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/Global.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/Global.java
@@ -1351,6 +1351,13 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
         final ScriptObject regExpProto = getRegExpPrototype();
         regExpProto.addBoundProperties(DEFAULT_REGEXP);
 
+        // add hook to support "deprecated" "static" properties of RegExp constructor object
+        final ScriptFunction handler = ScriptFunctionImpl.makeFunction(NO_SUCH_METHOD_NAME, NativeRegExp.REGEXP_STATICS_HANDLER);
+        builtinRegExp.addOwnProperty(NO_SUCH_PROPERTY_NAME, Attribute.NOT_ENUMERABLE, handler);
+
+        // add initial undefined "last successful match" property RegExp
+        builtinRegExp.addOwnProperty(NativeRegExp.LAST_REGEXP_MATCH, Attribute.NOT_ENUMERABLE, UNDEFINED);
+
         // Error stuff
         initErrorObjects();
 
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java b/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java
index 9d5bf104130..e44b929819c 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java
@@ -27,7 +27,10 @@ package jdk.nashorn.internal.objects;
 
 import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
 import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
+import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
 
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -54,6 +57,8 @@ import jdk.nashorn.internal.runtime.ScriptRuntime;
  */
 @ScriptClass("RegExp")
 public final class NativeRegExp extends ScriptObject {
+    static final MethodHandle REGEXP_STATICS_HANDLER = findOwnMH("regExpStaticsHandler", Object.class, Object.class, Object.class);
+
     /** ECMA 15.10.7.5 lastIndex property */
     @Property(attributes = Attribute.NOT_ENUMERABLE | Attribute.NOT_CONFIGURABLE)
     public Object lastIndex;
@@ -75,6 +80,9 @@ public final class NativeRegExp extends ScriptObject {
 
     private BitVector groupsInNegativeLookahead;
 
+    // RegExp constructor object. Needed to support RegExp "static" properties,
+    private Object constructor;
+
     /*
     public NativeRegExp() {
         init();
@@ -420,10 +428,81 @@ public final class NativeRegExp extends ScriptObject {
         final RegExpMatch m = execInner(string);
         // the input string
         if (m == null) {
-            return null;
+            return setLastRegExpMatch(null);
         }
 
-        return new NativeRegExpExecResult(m);
+        return setLastRegExpMatch(new NativeRegExpExecResult(m));
+    }
+
+    // Name of the "last successful match" property of the RegExp constructor
+    static final String LAST_REGEXP_MATCH = "__last_regexp_match__";
+
+    /**
+     * Handles "static" properties of RegExp constructor. These are "deprecated"
+     * properties of RegExp constructor.
+     *
+     * @param self self object passed to this method
+     * @param name name of the property being searched
+     *
+     * @return value of the specified property or undefined if not found
+     */
+    public static Object regExpStaticsHandler(final Object self, final  Object name) {
+        final String propName = JSType.toString(name);
+        if (self instanceof ScriptObject) {
+            final ScriptObject sobj = (ScriptObject)self;
+            final Object value = sobj.get(LAST_REGEXP_MATCH);
+            if (! (value instanceof NativeRegExpExecResult)) {
+                return UNDEFINED;
+            }
+
+            // get the last match object
+            final NativeRegExpExecResult lastMatch = (NativeRegExpExecResult)value;
+
+            // look for $1... $9
+            if (propName.length() > 0 && propName.charAt(0) == '$') {
+                int index = 0;
+                try {
+                    index = Integer.parseInt(propName.substring(1));
+                } catch (final Exception ignored) {
+                    return UNDEFINED;
+                }
+
+                // index out of range
+                if (index < 1 && index > 9) {
+                    return UNDEFINED;
+                }
+
+                // retrieve indexed value from last match object.
+                return lastMatch.get(index);
+            }
+
+            // misc. "static" properties supported
+            switch (propName) {
+                case "input": {
+                    return lastMatch.input;
+                }
+
+                case "lastMatch": {
+                    return lastMatch.get(0);
+                }
+
+                case "lastParen": {
+                    final int len = ((Number)NativeRegExpExecResult.length(lastMatch)).intValue();
+                    return (len > 0)? lastMatch.get(len - 1) : UNDEFINED;
+                }
+            }
+        }
+
+        return UNDEFINED;
+    }
+
+    // Support for RegExp static properties. We set last successful match
+    // to the RegExp constructor object.
+    private Object setLastRegExpMatch(final Object match) {
+        if (constructor instanceof ScriptObject) {
+            ((ScriptObject)constructor).set(LAST_REGEXP_MATCH, match, isStrictContext());
+        }
+        return match;
     }
 
     /**
@@ -665,20 +744,15 @@ public final class NativeRegExp extends ScriptObject {
      * @return Index of match.
      */
     Object search(final String string) {
-        final Matcher matcher = pattern.matcher(string);
-
-        int start = 0;
-        if (global) {
-            start = getLastIndex();
+        final RegExpMatch m = execInner(string);
+        // the input string
+        if (m == null) {
+            setLastRegExpMatch(null);
+            return -1;
         }
 
-        start = matcher.find(start) ? matcher.start() : -1;
-
-        if (global) {
-            setLastIndex(start == -1? -1 : matcher.end());
-        }
-
-        return start;
+        setLastRegExpMatch(new NativeRegExpExecResult(m));
+        return m.getIndex();
     }
 
     /**
@@ -706,7 +780,10 @@ public final class NativeRegExp extends ScriptObject {
     }
 
     private void init() {
-        this.setProto(Global.instance().getRegExpPrototype());
+        final ScriptObject proto = Global.instance().getRegExpPrototype();
+        this.setProto(proto);
+        // retrieve constructor to support "static" properties of RegExp
+        this.constructor = PrototypeObject.getConstructor(proto);
     }
 
     private static NativeRegExp checkRegExp(final Object self) {
@@ -769,4 +846,7 @@ public final class NativeRegExp extends ScriptObject {
         this.groupsInNegativeLookahead = groupsInNegativeLookahead;
     }
 
+    private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
+        return MH.findStatic(MethodHandles.publicLookup(), NativeRegExp.class, name, MH.type(rtype, types));
+    }
 }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
index 8c1076285f6..07106d84179 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
@@ -89,10 +89,10 @@ import org.dynalang.dynalink.support.CallSiteDescriptorFactory;
 public abstract class ScriptObject extends PropertyListenerManager implements PropertyAccess {
 
     /** Search fall back routine name for "no such method" */
-    static final String NO_SUCH_METHOD_NAME   = "__noSuchMethod__";
+    public static final String NO_SUCH_METHOD_NAME   = "__noSuchMethod__";
 
     /** Search fall back routine name for "no such property" */
-    static final String NO_SUCH_PROPERTY_NAME = "__noSuchProperty__";
+    public static final String NO_SUCH_PROPERTY_NAME = "__noSuchProperty__";
 
     /** Per ScriptObject flag - is this a scope object? */
     public static final int IS_SCOPE       = 0b0000_0001;
diff --git a/nashorn/test/script/basic/JDK-8007619.js b/nashorn/test/script/basic/JDK-8007619.js
new file mode 100644
index 00000000000..2c91f9cf661
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8007619.js
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8007619: Add support for deprecated properties of RegExp constructor
+ *
+ * @test
+ * @run
+ */
+
+
+var emailPattern = /(\w+)@(\w+)\.(\w+)/g;
+var input= "Please send mail to foo@acme.com and bar@gov.in ASAP!";
+
+var match = emailPattern.exec(input);
+
+while (match != null) {
+    print("Match = " + match);
+    print("RegExp.lastMatch = " + RegExp.lastMatch);
+   
+    print("RegExp.$1 = " + RegExp.$1);
+    print("RegExp.$2 = " + RegExp.$2);
+    print("RegExp.$3 = " + RegExp.$3);
+ 
+    print("RegExp.lastParen = " + RegExp.lastParen)
+    print("RegExp.input = " + RegExp.input);
+
+    match = emailPattern.exec(input);
+}
diff --git a/nashorn/test/script/basic/JDK-8007619.js.EXPECTED b/nashorn/test/script/basic/JDK-8007619.js.EXPECTED
new file mode 100644
index 00000000000..a440f1df4d0
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8007619.js.EXPECTED
@@ -0,0 +1,14 @@
+Match = foo@acme.com,foo,acme,com
+RegExp.lastMatch = foo@acme.com
+RegExp.$1 = foo
+RegExp.$2 = acme
+RegExp.$3 = com
+RegExp.lastParen = com
+RegExp.input = Please send mail to foo@acme.com and bar@gov.in ASAP!
+Match = bar@gov.in,bar,gov,in
+RegExp.lastMatch = bar@gov.in
+RegExp.$1 = bar
+RegExp.$2 = gov
+RegExp.$3 = in
+RegExp.lastParen = in
+RegExp.input = Please send mail to foo@acme.com and bar@gov.in ASAP!

From 5900e641b044eaca0f1f8f613156763b95484dd2 Mon Sep 17 00:00:00 2001
From: James Laskey <james.laskey@oracle.com>
Date: Wed, 6 Feb 2013 08:42:19 -0400
Subject: [PATCH 119/311] 8007545: jjs input evalinput need to be
 NOT_ENUMERABLE

Reviewed-by: sundar, lagergren
---
 .../src/jdk/nashorn/tools/resources/shell.js  | 96 ++++++++++++-------
 1 file changed, 61 insertions(+), 35 deletions(-)

diff --git a/nashorn/src/jdk/nashorn/tools/resources/shell.js b/nashorn/src/jdk/nashorn/tools/resources/shell.js
index bb78c72a112..87c40fd5c22 100644
--- a/nashorn/src/jdk/nashorn/tools/resources/shell.js
+++ b/nashorn/src/jdk/nashorn/tools/resources/shell.js
@@ -1,21 +1,21 @@
 /*
  * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.
- * 
+ *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * version 2 for more details (a copy is included in the LICENSE file that
  * accompanied this code).
- * 
+ *
  * You should have received a copy of the GNU General Public License version
  * 2 along with this work; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- * 
+ *
  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  * or visit www.oracle.com if you need additional information or have any
  * questions.
@@ -27,46 +27,72 @@
 
 /**
  * Reads zero or more lines from standard input and returns concatenated string
- * 
+ *
  * @param endMarker marker string that signals end of input
  * @param prompt prompt printed for each line
  */
-function input(endMarker, prompt) {
-    if (!endMarker) {
-        endMarker = "";
-    }
-    
-    if (!prompt) {
-        prompt = " >> ";
-    }
-    
-    var imports = new JavaImporter(java.io, java.lang);
-    var str = "";
-    with (imports) {
-        var reader = new BufferedReader(new InputStreamReader(System['in']));
-        var line;
-        while (true) {
-            System.out.print(prompt);
-            line = reader.readLine();
-            if (line == null || line == endMarker) {
-                break;
-            }
-            str += line + "\n";
+Object.defineProperty(this, "input", {
+    value: function input(endMarker, prompt) {
+        if (!endMarker) {
+            endMarker = "";
         }
-    }
-    
-    return str;
-}
+
+        if (!prompt) {
+            prompt = " >> ";
+        }
+
+        var imports = new JavaImporter(java.io, java.lang);
+        var str = "";
+        with (imports) {
+            var reader = new BufferedReader(new InputStreamReader(System['in']));
+            var line;
+            while (true) {
+                System.out.print(prompt);
+                line = reader.readLine();
+                if (line == null || line == endMarker) {
+                    break;
+                }
+                str += line + "\n";
+            }
+        }
+
+        return str;
+    },
+    enumerable: false,
+    writable: true,
+    configurable: true
+});
+
 
 /**
  * Reads zero or more lines from standard input and evaluates the concatenated
  * string as code
- * 
+ *
  * @param endMarker marker string that signals end of input
  * @param prompt prompt printed for each line
  */
-function evalinput(endMarker, prompt) {
-    var code = input(endMarker, prompt);
-    // make sure everything is evaluated in global scope!
-    return this.eval(code);
+Object.defineProperty(this, "evalinput", {
+    value: function evalinput(endMarker, prompt) {
+        var code = input(endMarker, prompt);
+        // make sure everything is evaluated in global scope!
+        return this.eval(code);
+    },
+    enumerable: false,
+    writable: true,
+    configurable: true
+});
+
+
+/**
+ * Elegantly exits the current session
+ */
+if (!quit) {
+Object.defineProperty(this, "quit", {
+    value: function quit() {
+        java.lang.System.exit(0);
+    },
+    enumerable: false,
+    writable: true,
+    configurable: true
+});
 }

From 574016d0d3e85183261df1092de07628e339c4d6 Mon Sep 17 00:00:00 2001
From: James Laskey <james.laskey@oracle.com>
Date: Wed, 6 Feb 2013 11:57:51 -0400
Subject: [PATCH 120/311] 8007629: Remove extraneous quit from shell.js

Reviewed-by: sundar, hannesw
---
 .../nashorn/api/scripting/resources/init.js   | 23 +---------------
 .../jdk/nashorn/internal/objects/Global.java  | 27 ++++++++++++++++---
 .../internal/runtime/ScriptingFunctions.java  | 18 +------------
 .../src/jdk/nashorn/tools/resources/shell.js  | 15 -----------
 4 files changed, 26 insertions(+), 57 deletions(-)

diff --git a/nashorn/src/jdk/nashorn/api/scripting/resources/init.js b/nashorn/src/jdk/nashorn/api/scripting/resources/init.js
index 26a81e9c62b..18cde929451 100644
--- a/nashorn/src/jdk/nashorn/api/scripting/resources/init.js
+++ b/nashorn/src/jdk/nashorn/api/scripting/resources/init.js
@@ -119,7 +119,7 @@ function jmap(map) {
         },
         toString: function() {
             return map.toString();
-        } 
+        }
     });
 }
 
@@ -705,27 +705,6 @@ function exec(cmd) {
     $exit = process.exitValue();
 }
 
-/**
- * Exit the shell program.
- *
- * @param exitCode integer code returned to OS shell.
- * optional, defaults to 0
- */
-function exit(code) {
-    if (code) {
-        java.lang.System.exit(code + 0);
-    } else {
-        java.lang.System.exit(0);
-    }
-}
-
-/**
- * synonym for exit
- */
-function quit(code) {
-    exit(code);
-}
-
 // XML utilities
 
 /**
diff --git a/nashorn/src/jdk/nashorn/internal/objects/Global.java b/nashorn/src/jdk/nashorn/internal/objects/Global.java
index cf640b865cb..aa7361a7625 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/Global.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/Global.java
@@ -115,6 +115,14 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
     @Property(attributes = Attribute.NOT_ENUMERABLE)
     public Object load;
 
+    /** Nashorn extension: global.exit */
+    @Property(attributes = Attribute.NOT_ENUMERABLE)
+    public Object exit;
+
+    /** Nashorn extension: global.quit */
+    @Property(attributes = Attribute.NOT_ENUMERABLE)
+    public Object quit;
+
     /** Value property NaN of the Global Object - ECMA 15.1.1.1 NaN */
     @Property(attributes = Attribute.NON_ENUMERABLE_CONSTANT)
     public final Object NaN = Double.NaN;
@@ -333,6 +341,7 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
     private static final MethodHandle PRINT   = findOwnMH("print",   Object.class, Object.class, Object[].class);
     private static final MethodHandle PRINTLN = findOwnMH("println", Object.class, Object.class, Object[].class);
     private static final MethodHandle LOAD    = findOwnMH("load",    Object.class, Object.class, Object.class);
+    private static final MethodHandle EXIT    = findOwnMH("exit",    Object.class, Object.class, Object.class);
 
     /**
      * Constructor
@@ -688,6 +697,19 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
         return global.getContext().load(scope, source);
     }
 
+    /**
+     * Global exit and quit implementation - Nashorn extension: perform a {@code System.exit} call from the script
+     *
+     * @param self  self reference
+     * @param code  exit code
+     *
+     * @return undefined (will never be reacheD)
+     */
+    public static Object exit(final Object self, final Object code) {
+        System.exit(JSType.toInt32(code));
+        return UNDEFINED;
+    }
+
     ScriptObject getFunctionPrototype() {
         return ScriptFunction.getPrototype(builtinFunction);
     }
@@ -1320,6 +1342,8 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
         this.unescape           = ScriptFunctionImpl.makeFunction("unescape",   GlobalFunctions.UNESCAPE);
         this.print              = ScriptFunctionImpl.makeFunction("print",      getContext()._print_no_newline ? PRINT : PRINTLN);
         this.load               = ScriptFunctionImpl.makeFunction("load",       LOAD);
+        this.exit               = ScriptFunctionImpl.makeFunction("exit",       EXIT);
+        this.quit               = ScriptFunctionImpl.makeFunction("quit",       EXIT);
 
         // built-in constructors
         this.builtinArray     = (ScriptFunction)initConstructor("Array");
@@ -1454,9 +1478,6 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
         value = ScriptFunctionImpl.makeFunction("readFully", ScriptingFunctions.READFULLY);
         addOwnProperty("readFully", Attribute.NOT_ENUMERABLE, value);
 
-        value = ScriptFunctionImpl.makeFunction("quit", ScriptingFunctions.QUIT);
-        addOwnProperty("quit", Attribute.NOT_ENUMERABLE, value);
-
         final String execName = ScriptingFunctions.EXEC_NAME;
         value = ScriptFunctionImpl.makeFunction(execName, ScriptingFunctions.EXEC);
         addOwnProperty(execName, Attribute.NOT_ENUMERABLE, value);
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java
index d3ac11e420a..71011395b46 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java
@@ -53,10 +53,7 @@ public class ScriptingFunctions {
     /** Handle to implementation of {@link ScriptingFunctions#readFully} - Nashorn extension */
     public static final MethodHandle READFULLY = findOwnMH("readFully",     Object.class, Object.class, Object.class);
 
-    /** Handle to implementation of {@link ScriptingFunctions#quit} - Nashorn extension */
-    public static final MethodHandle QUIT = findOwnMH("quit",     Object.class, Object.class, Object.class);
-
-    /** Handle to implementation of {@link ScriptingFunctions#quit} - Nashorn extension */
+    /** Handle to implementation of {@link ScriptingFunctions#exec} - Nashorn extension */
     public static final MethodHandle EXEC = findOwnMH("exec",     Object.class, Object.class, Object.class, Object.class);
 
     /** Names of special properties used by $EXEC API. */
@@ -114,19 +111,6 @@ public class ScriptingFunctions {
         return new String(Source.readFully(f));
     }
 
-    /**
-     * Nashorn extension: perform a {@code System.exit} call from the script
-     *
-     * @param self  self reference
-     * @param code  exit code
-     *
-     * @return undefined (will never be reacheD)
-     */
-    public static Object quit(final Object self, final Object code) {
-        System.exit(JSType.toInt32(code));
-        return UNDEFINED;
-    }
-
     /**
      * Nashorn extension: exec a string in a separate process.
      *
diff --git a/nashorn/src/jdk/nashorn/tools/resources/shell.js b/nashorn/src/jdk/nashorn/tools/resources/shell.js
index 87c40fd5c22..fdfde7ad78a 100644
--- a/nashorn/src/jdk/nashorn/tools/resources/shell.js
+++ b/nashorn/src/jdk/nashorn/tools/resources/shell.js
@@ -81,18 +81,3 @@ Object.defineProperty(this, "evalinput", {
     writable: true,
     configurable: true
 });
-
-
-/**
- * Elegantly exits the current session
- */
-if (!quit) {
-Object.defineProperty(this, "quit", {
-    value: function quit() {
-        java.lang.System.exit(0);
-    },
-    enumerable: false,
-    writable: true,
-    configurable: true
-});
-}

From 57ef7ce075b598cc416cb7e2274e8353aa971c06 Mon Sep 17 00:00:00 2001
From: James Laskey <james.laskey@oracle.com>
Date: Wed, 6 Feb 2013 12:51:09 -0400
Subject: [PATCH 121/311] 8007643: Add testing for quit and exit

Reviewed-by: sundar
---
 nashorn/test/script/sandbox/exit.js          | 16 +++++++++++++++-
 nashorn/test/script/sandbox/exit.js.EXPECTED |  2 ++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/nashorn/test/script/sandbox/exit.js b/nashorn/test/script/sandbox/exit.js
index d7737f53b4f..d77744fe7a8 100644
--- a/nashorn/test/script/sandbox/exit.js
+++ b/nashorn/test/script/sandbox/exit.js
@@ -22,7 +22,7 @@
  */
 
 /**
- * Try to call System.exit.
+ * Try to call System.exit, quit and exit.
  *
  * @test
  * @security
@@ -43,4 +43,18 @@ try {
     check(e);
 }
 
+try {
+    quit();
+    // will not reach here regardless of outcome..
+} catch (e) {
+    check(e);
+}
+
+try {
+    exit(0);
+    // will not reach here regardless of outcome..
+} catch (e) {
+    check(e);
+}
+
 print("Success, didn't exit!");
diff --git a/nashorn/test/script/sandbox/exit.js.EXPECTED b/nashorn/test/script/sandbox/exit.js.EXPECTED
index ef927afcfd4..c1411eb89d7 100644
--- a/nashorn/test/script/sandbox/exit.js.EXPECTED
+++ b/nashorn/test/script/sandbox/exit.js.EXPECTED
@@ -1,2 +1,4 @@
 java.security.AccessControlException: access denied ("java.lang.RuntimePermission" "exitVM.0")
+java.security.AccessControlException: access denied ("java.lang.RuntimePermission" "exitVM.0")
+java.security.AccessControlException: access denied ("java.lang.RuntimePermission" "exitVM.0")
 Success, didn't exit!

From b247ddfcc390dc47c954c0cfb1bb062c0dfdcff7 Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Thu, 7 Feb 2013 17:17:29 +0530
Subject: [PATCH 122/311] 8007715: Make sure that not all tests run with
 AllPermission

Reviewed-by: lagergren, attila
---
 nashorn/make/build.xml                        | 36 +++++---
 nashorn/make/project.properties               | 11 ++-
 .../jdk/nashorn/internal/runtime/Context.java | 28 ++++--
 .../runtime/linker/JavaAdapterFactory.java    |  4 +-
 nashorn/test/script/README                    | 26 ++++++
 nashorn/test/script/basic/NASHORN-758.js      | 12 +--
 nashorn/test/script/basic/javaexceptions.js   |  2 +-
 nashorn/test/script/basic/newexpr.js          |  2 +-
 nashorn/test/script/sandbox/interfaceimpl.js  | 63 ++++++++++++++
 nashorn/test/script/sandbox/loadcompat.js     | 50 +++++++++++
 .../script/{basic => trusted}/JDK-8006424.js  |  0
 .../script/{basic => trusted}/JDK-8006529.js  |  0
 .../script/{basic => trusted}/NASHORN-638.js  |  0
 .../NASHORN-638.js.EXPECTED                   |  0
 .../script/{basic => trusted}/NASHORN-653.js  |  0
 nashorn/test/script/trusted/README            |  4 +
 .../test/script/{basic => trusted}/getenv.js  |  0
 .../{basic => trusted}/getenv.js.EXPECTED     |  0
 .../api/scripting/ScriptEngineTest.java       | 74 ----------------
 .../nashorn/internal/runtime/ContextTest.java | 86 +++++++++++++++++++
 20 files changed, 294 insertions(+), 104 deletions(-)
 create mode 100644 nashorn/test/script/README
 create mode 100644 nashorn/test/script/sandbox/interfaceimpl.js
 create mode 100644 nashorn/test/script/sandbox/loadcompat.js
 rename nashorn/test/script/{basic => trusted}/JDK-8006424.js (100%)
 rename nashorn/test/script/{basic => trusted}/JDK-8006529.js (100%)
 rename nashorn/test/script/{basic => trusted}/NASHORN-638.js (100%)
 rename nashorn/test/script/{basic => trusted}/NASHORN-638.js.EXPECTED (100%)
 rename nashorn/test/script/{basic => trusted}/NASHORN-653.js (100%)
 create mode 100644 nashorn/test/script/trusted/README
 rename nashorn/test/script/{basic => trusted}/getenv.js (100%)
 rename nashorn/test/script/{basic => trusted}/getenv.js.EXPECTED (100%)

diff --git a/nashorn/make/build.xml b/nashorn/make/build.xml
index 8ef6b50e551..04766c17387 100644
--- a/nashorn/make/build.xml
+++ b/nashorn/make/build.xml
@@ -198,25 +198,40 @@
            debug="${javac.debug}"
            encoding="${javac.encoding}"
            includeantruntime="false"/>
+
+    <!-- tests that check nashorn internals and internal API -->
+    <jar jarfile="${nashorn.internal.tests.jar}">
+      <fileset dir="${build.test.classes.dir}" excludes="**/api/scripting/*"/>
+    </jar>
+
+    <!-- tests that check nashorn script engine (jsr-223) API -->
+    <jar jarfile="${nashorn.api.tests.jar}">
+      <fileset dir="${build.test.classes.dir}" includes="**/api/scripting/*"/>
+    </jar>
+
   </target>
 
   <target name="generate-policy-file">
     <!-- Generating nashorn.policy file -->
-    <echo message="grant codeBase &quot;file:/${basedir}/dist/nashorn.jar&quot; {" file="${build.dir}/nashorn.policy"/>
+
+    <!-- nashorn internal tests jar requires AllPermission -->
+    <echo message="grant codeBase &quot;file:/${basedir}/${nashorn.internal.tests.jar}&quot; {" file="${build.dir}/nashorn.policy"/>
     <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
-    <echo message="permission java.security.AllPermission;" file="${build.dir}/nashorn.policy" append="true"/>
+    <echo message="    permission java.security.AllPermission;" file="${build.dir}/nashorn.policy" append="true"/>
     <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
     <echo message="};" file="${build.dir}/nashorn.policy" append="true"/>
     <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
-
-    <echo message="grant codeBase &quot;file:/${basedir}/build/test/classes&quot; {" file="${build.dir}/nashorn.policy" append="true"/>
+    
+    <!-- TestNG framework jar needs AllPermission -->
+    <echo message="grant codeBase &quot;file:/${basedir}/${file.reference.testng.jar}&quot; {" file="${build.dir}/nashorn.policy" append="true"/>
     <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
     <echo message="    permission java.security.AllPermission;" file="${build.dir}/nashorn.policy" append="true"/>
     <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
     <echo message="};" file="${build.dir}/nashorn.policy" append="true"/>
     <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
 
-    <echo message="grant codeBase &quot;file:/${basedir}/${file.reference.testng.jar}&quot; {" file="${build.dir}/nashorn.policy" append="true"/>
+    <!-- AllPermission to test/script/trusted tests -->
+    <echo message="grant codeBase &quot;file:/${basedir}/test/script/trusted/*&quot; {" file="${build.dir}/nashorn.policy" append="true"/>
     <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
     <echo message="    permission java.security.AllPermission;" file="${build.dir}/nashorn.policy" append="true"/>
     <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
@@ -225,14 +240,11 @@
 
     <echo message="grant codeBase &quot;file:/${basedir}/test/script/basic/*&quot; {" file="${build.dir}/nashorn.policy" append="true"/>
     <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
-    <echo message="    permission java.security.AllPermission;" file="${build.dir}/nashorn.policy" append="true"/>
+    <!-- test/script/basic .js scripts load other script tests -->
+    <echo message="    permission java.io.FilePermission &quot;${basedir}/test/script/-&quot;, &quot;read&quot;;" file="${build.dir}/nashorn.policy" append="true"/>
     <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
-    <echo message="};" file="${build.dir}/nashorn.policy" append="true"/>
-    <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
-
-    <echo message="grant codeBase &quot;file:/${basedir}/test/perf/*&quot; {" file="${build.dir}/nashorn.policy" append="true"/>
-    <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
-    <echo message="    permission java.security.AllPermission;" file="${build.dir}/nashorn.policy" append="true"/>
+    <!-- test/script/basic .js scripts can read nashorn.test.* properties -->
+    <echo message="    permission java.util.PropertyPermission &quot;nashorn.test.*&quot;, &quot;read&quot;;" file="${build.dir}/nashorn.policy" append="true"/>
     <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
     <echo message="};" file="${build.dir}/nashorn.policy" append="true"/>
     <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
diff --git a/nashorn/make/project.properties b/nashorn/make/project.properties
index 682cdb686a5..70107f4caed 100644
--- a/nashorn/make/project.properties
+++ b/nashorn/make/project.properties
@@ -53,6 +53,10 @@ parallel.test.runner=jdk.nashorn.internal.test.framework.ParallelTestRunner
 
 # test classes directory
 build.test.classes.dir=${build.dir}/test/classes
+# nashorn test jar - internal tests jar and api tests jar
+nashorn.internal.tests.jar=${build.dir}/nashorn-internal-tests.jar
+nashorn.api.tests.jar=${build.dir}/nashorn-api-tests.jar
+
 # test results directory
 build.test.results.dir=${build.dir}/test/reports
 
@@ -116,12 +120,13 @@ test.script.dir=test/script
 test.basic.dir=test/script/basic
 test.error.dir=test/script/error
 test.sandbox.dir=test/script/sandbox
+test.trusted.dir=test/script/trusted
 test.external.dir=test/script/external
 test262.dir=${test.external.dir}/test262
 test262.suite.dir=${test262.dir}/test/suite
 
 test-sys-prop.test.dir=${test.dir}
-test-sys-prop.test.js.roots=${test.basic.dir} ${test.error.dir} ${test.sandbox.dir}
+test-sys-prop.test.js.roots=${test.basic.dir} ${test.error.dir} ${test.sandbox.dir} ${test.trusted.dir}
 test-sys-prop.test262.suite.dir=${test262.suite.dir}
 test-sys-prop.es5conform.testcases.dir=${test.external.dir}/ES5Conform/TestCases
 test-sys-prop.test.basic.dir=${test.basic.dir}
@@ -205,7 +210,9 @@ test262-test-sys-prop.test.js.framework=\
 
 run.test.classpath=\
     ${file.reference.testng.jar}:\
-    ${build.test.classes.dir}
+    ${nashorn.internal.tests.jar}:\
+    ${nashorn.api.tests.jar}
+
 src.dir=src
 test.src.dir=test/src
 
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Context.java b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
index c7137fd3050..6e04247b18d 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/Context.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
@@ -607,24 +607,38 @@ public final class Context {
         if (src instanceof String) {
             srcName = (String)src;
             final File file = new File((String)src);
-            if (file.isFile()) {
-                url = file.toURI().toURL();
-            } else if (srcName.indexOf(':') != -1) {
+            if (srcName.indexOf(':') != -1) {
                 try {
                     url = new URL((String)src);
                 } catch (final MalformedURLException e) {
                     // fallback URL - nashorn:foo.js - check under jdk/nashorn/internal/runtime/resources
-                    String str = (String)src;
+                    final String str = (String)src;
                     if (str.startsWith("nashorn:")) {
-                        str = "resources/" + str.substring("nashorn:".length());
-                        url = Context.class.getResource(str);
-                        if (url == null) {
+                        final String resource = "resources/" + str.substring("nashorn:".length());
+                        // NOTE: even sandbox scripts should be able to load scripts in nashorn: scheme
+                        // These scripts are always available and are loaded from nashorn.jar's resources.
+                        final Source code = AccessController.doPrivileged(
+                                new PrivilegedAction<Source>() {
+                                    @Override
+                                    public Source run() {
+                                        try {
+                                            final URL resURL = Context.class.getResource(resource);
+                                            return (resURL != null)? new Source(str, resURL) : null;
+                                        } catch (final IOException exp) {
+                                            return null;
+                                        }
+                                    }
+                                });
+                        if (code == null) {
                             throw e;
                         }
+                        return evaluateSource(code, scope, scope);
                     } else {
                         throw e;
                     }
                 }
+            } else if (file.isFile()) {
+                url = file.toURI().toURL();
             }
             src = url;
         }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
index f4b4ad2054d..685f141e8ae 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
@@ -456,6 +456,8 @@ public final class JavaAdapterFactory {
     private static ClassLoader createClassLoader(final ClassLoader parentLoader, final String className,
             final byte[] classBytes, final String privilegedActionClassName) {
         return new AdapterLoader(parentLoader) {
+            private final ProtectionDomain myProtectionDomain = getClass().getProtectionDomain();
+
             @Override
             protected Class<?> findClass(final String name) throws ClassNotFoundException {
                 if(name.equals(className)) {
@@ -463,7 +465,7 @@ public final class JavaAdapterFactory {
                     return defineClass(name, bytes, 0, bytes.length, GENERATED_PROTECTION_DOMAIN);
                 } else if(name.equals(privilegedActionClassName)) {
                     final byte[] bytes = generatePrivilegedActionClassBytes(privilegedActionClassName.replace('.', '/'));
-                    return defineClass(name, bytes, 0, bytes.length, getClass().getProtectionDomain());
+                    return defineClass(name, bytes, 0, bytes.length, myProtectionDomain);
                 } else {
                     throw new ClassNotFoundException(name);
                 }
diff --git a/nashorn/test/script/README b/nashorn/test/script/README
new file mode 100644
index 00000000000..3cca31eb95e
--- /dev/null
+++ b/nashorn/test/script/README
@@ -0,0 +1,26 @@
+basic:
+
+"basic" language and library tests. These need run only with File read 
+permission to read files under "test/script" or subdirs and property read
+permission to read properties named "nashorn.test.*"
+
+error:
+
+scripts that should result in compile-time error. The expected files check
+for the error message format etc.
+
+currently-failing: 
+
+Tests that fail currently - but should pass eventually.
+These are excluded for now.
+
+sandbox:
+
+Tests to check that sandbox scripts cannot access security sensitive resources.
+Scripts under this directory run with no special permissions other than
+what is given to all "sandbox" scripts.
+
+trusted:
+
+These tests run under AllPermission. Put only those scripts that really need
+AllPermission - say for eg. creating class loader, full reflective access.
diff --git a/nashorn/test/script/basic/NASHORN-758.js b/nashorn/test/script/basic/NASHORN-758.js
index 7a92a4c3e6a..f57eaf1913f 100644
--- a/nashorn/test/script/basic/NASHORN-758.js
+++ b/nashorn/test/script/basic/NASHORN-758.js
@@ -25,16 +25,16 @@
  * NASHORN-758 : nashorn shell command line options improvements
  *
  * @test
- * @option -Dfoo=bar
- * @option -Dhello=world
+ * @option -Dnashorn.test.foo=bar
+ * @option -Dnashorn.test.hello=world
  * @run
  */
 
 
-if (java.lang.System.getProperty("foo") != "bar") {
-    fail("System property 'foo' != 'bar'");
+if (java.lang.System.getProperty("nashorn.test.foo") != "bar") {
+    fail("System property 'nashorn.test.foo' != 'bar'");
 }
 
-if (java.lang.System.getProperty("hello") != "world") {
-    fail("System property 'hello' != 'world'");
+if (java.lang.System.getProperty("nashorn.test.hello") != "world") {
+    fail("System property 'nashorn.test.hello' != 'world'");
 }
diff --git a/nashorn/test/script/basic/javaexceptions.js b/nashorn/test/script/basic/javaexceptions.js
index 3db97e621f6..3f81f697245 100644
--- a/nashorn/test/script/basic/javaexceptions.js
+++ b/nashorn/test/script/basic/javaexceptions.js
@@ -31,7 +31,7 @@
 try {
     new java.io.FileInputStream("non_existent_file");
 } catch (e) {
-    print(e instanceof java.io.FileNotFoundException);
+    print(e instanceof java.io.FileNotFoundException || e instanceof java.lang.SecurityException);
 }
 
 try {
diff --git a/nashorn/test/script/basic/newexpr.js b/nashorn/test/script/basic/newexpr.js
index 78711a13965..d8d1b48cdcf 100644
--- a/nashorn/test/script/basic/newexpr.js
+++ b/nashorn/test/script/basic/newexpr.js
@@ -29,7 +29,7 @@
  */
 
 var File = java.io.File;
-print(new File(".").isDirectory());
+print(! new File(".").toString().isEmpty());
 
 var obj = {
    foo : function (x) {
diff --git a/nashorn/test/script/sandbox/interfaceimpl.js b/nashorn/test/script/sandbox/interfaceimpl.js
new file mode 100644
index 00000000000..b2ee86b5f0b
--- /dev/null
+++ b/nashorn/test/script/sandbox/interfaceimpl.js
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Check that user defined interface can be implemented.
+ *
+ * @test
+ * @run
+ * @security
+ */
+
+var Window = Java.type("jdk.nashorn.api.scripting.Window");
+var WindowEventHandler = Java.type("jdk.nashorn.api.scripting.WindowEventHandler");
+
+var w = new Window();
+
+var loadedFuncReached = false;
+// try function to SAM converter
+w.onload = function() {
+    loadedFuncReached = true;
+    return true;
+}
+
+w.onload.loaded();
+if (! loadedFuncReached) {
+    fail("Interface method impl. not called");
+}
+
+// reset
+loadedFuncReached = false;
+
+// try direct interface implementation
+w.onload = new WindowEventHandler() {
+    loaded: function() {
+        loadedFuncReached = true;
+        return true;
+    }
+};
+
+w.onload.loaded();
+if (! loadedFuncReached) {
+    fail("Interface method impl. not called");
+}
diff --git a/nashorn/test/script/sandbox/loadcompat.js b/nashorn/test/script/sandbox/loadcompat.js
new file mode 100644
index 00000000000..e99f67f2116
--- /dev/null
+++ b/nashorn/test/script/sandbox/loadcompat.js
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Check that nashorn mozilla compatibility script can be loaded in sandbox.
+ *
+ * @test
+ * @run
+ * @security
+ */
+
+load("nashorn:mozilla_compat.js");
+
+var obj = {};
+if (obj.__proto__ !== Object.prototype) {
+    fail("__proto__ does not work as expected");
+}
+
+var array = [];
+if (array.__proto__ !== Array.prototype) {
+    fail("__proto__ does not work as expected");
+}
+
+if (typeof JavaAdapter != 'function') {
+    fail("JavaAdapter constructor is missing in compatibility script");
+}
+
+if (typeof importPackage != 'function') {
+    fail("importPackage function is missing in compatibility script");
+}
diff --git a/nashorn/test/script/basic/JDK-8006424.js b/nashorn/test/script/trusted/JDK-8006424.js
similarity index 100%
rename from nashorn/test/script/basic/JDK-8006424.js
rename to nashorn/test/script/trusted/JDK-8006424.js
diff --git a/nashorn/test/script/basic/JDK-8006529.js b/nashorn/test/script/trusted/JDK-8006529.js
similarity index 100%
rename from nashorn/test/script/basic/JDK-8006529.js
rename to nashorn/test/script/trusted/JDK-8006529.js
diff --git a/nashorn/test/script/basic/NASHORN-638.js b/nashorn/test/script/trusted/NASHORN-638.js
similarity index 100%
rename from nashorn/test/script/basic/NASHORN-638.js
rename to nashorn/test/script/trusted/NASHORN-638.js
diff --git a/nashorn/test/script/basic/NASHORN-638.js.EXPECTED b/nashorn/test/script/trusted/NASHORN-638.js.EXPECTED
similarity index 100%
rename from nashorn/test/script/basic/NASHORN-638.js.EXPECTED
rename to nashorn/test/script/trusted/NASHORN-638.js.EXPECTED
diff --git a/nashorn/test/script/basic/NASHORN-653.js b/nashorn/test/script/trusted/NASHORN-653.js
similarity index 100%
rename from nashorn/test/script/basic/NASHORN-653.js
rename to nashorn/test/script/trusted/NASHORN-653.js
diff --git a/nashorn/test/script/trusted/README b/nashorn/test/script/trusted/README
new file mode 100644
index 00000000000..60260ed7525
--- /dev/null
+++ b/nashorn/test/script/trusted/README
@@ -0,0 +1,4 @@
+This directory contains tests that need AllPermission to run.
+
+Scripts that need to create classloaders, need to reflectively access
+declared members of other classes etc. should go here.
diff --git a/nashorn/test/script/basic/getenv.js b/nashorn/test/script/trusted/getenv.js
similarity index 100%
rename from nashorn/test/script/basic/getenv.js
rename to nashorn/test/script/trusted/getenv.js
diff --git a/nashorn/test/script/basic/getenv.js.EXPECTED b/nashorn/test/script/trusted/getenv.js.EXPECTED
similarity index 100%
rename from nashorn/test/script/basic/getenv.js.EXPECTED
rename to nashorn/test/script/trusted/getenv.js.EXPECTED
diff --git a/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java b/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
index 6b043f6af14..169ebf9d653 100644
--- a/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
+++ b/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
@@ -972,46 +972,6 @@ public class ScriptEngineTest {
         }
     }
 
-    private static class MyClassLoader extends ClassLoader {
-        // to check if script engine uses the specified class loader
-        private final boolean[] reached = new boolean[1];
-
-        @Override
-        protected Class findClass(final String name) throws ClassNotFoundException {
-            // flag that it reached here
-            reached[0] = true;
-            return super.findClass(name);
-        }
-
-        public boolean reached() {
-            return reached[0];
-        }
-    };
-
-    @Test
-    public void factoryClassLoaderTest() {
-        final ScriptEngineManager sm = new ScriptEngineManager();
-        for (ScriptEngineFactory fac : sm.getEngineFactories()) {
-            if (fac instanceof NashornScriptEngineFactory) {
-                final NashornScriptEngineFactory nfac = (NashornScriptEngineFactory)fac;
-                final MyClassLoader loader = new MyClassLoader();
-                // set the classloader as app class loader
-                final ScriptEngine e = nfac.getScriptEngine(loader);
-                try {
-                    e.eval("Packages.foo");
-                    // check that the class loader was attempted
-                    assertTrue(loader.reached(), "did not reach class loader!");
-                } catch (final ScriptException se) {
-                    se.printStackTrace();
-                    fail(se.getMessage());
-                }
-                return;
-            }
-        }
-
-        fail("Cannot find nashorn factory!");
-    }
-
     @Test
     public void factoryOptionsTest() {
         final ScriptEngineManager sm = new ScriptEngineManager();
@@ -1033,38 +993,4 @@ public class ScriptEngineTest {
 
         fail("Cannot find nashorn factory!");
     }
-
-    @Test
-    public void factoryClassLoaderAndOptionsTest() {
-        final ScriptEngineManager sm = new ScriptEngineManager();
-        for (ScriptEngineFactory fac : sm.getEngineFactories()) {
-            if (fac instanceof NashornScriptEngineFactory) {
-                final NashornScriptEngineFactory nfac = (NashornScriptEngineFactory)fac;
-                final String[] options = new String[] { "-strict" };
-                final MyClassLoader loader = new MyClassLoader();
-                // set the classloader as app class loader
-                final ScriptEngine e = nfac.getScriptEngine(options, loader);
-                try {
-                    e.eval("Packages.foo");
-                    // check that the class loader was attempted
-                    assertTrue(loader.reached(), "did not reach class loader!");
-                } catch (final ScriptException se) {
-                    se.printStackTrace();
-                    fail(se.getMessage());
-                }
-
-                try {
-                    // strict mode - delete of a var should throw SyntaxError
-                    e.eval("var d = 2; delete d;");
-                } catch (final ScriptException se) {
-                    // check that the error message contains "SyntaxError"
-                    assertTrue(se.getMessage().contains("SyntaxError"));
-                }
-
-                return;
-            }
-        }
-
-        fail("Cannot find nashorn factory!");
-    }
 }
diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/ContextTest.java b/nashorn/test/src/jdk/nashorn/internal/runtime/ContextTest.java
index f7e6857d32c..396847661af 100644
--- a/nashorn/test/src/jdk/nashorn/internal/runtime/ContextTest.java
+++ b/nashorn/test/src/jdk/nashorn/internal/runtime/ContextTest.java
@@ -27,8 +27,15 @@ package jdk.nashorn.internal.runtime;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
 
 import java.util.Map;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineFactory;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+import jdk.nashorn.api.scripting.NashornScriptEngineFactory;
+import jdk.nashorn.api.scripting.ScriptEngineTest;
 import jdk.nashorn.internal.runtime.options.Options;
 import org.testng.annotations.Test;
 
@@ -107,4 +114,83 @@ public class ContextTest {
         final ScriptFunction func = cx.compileScript(source, global, cx._strict);
         return func != null ? ScriptRuntime.apply(func, global) : null;
     }
+
+    // Tests for trusted client usage of nashorn script engine factory extension API
+
+    private static class MyClassLoader extends ClassLoader {
+        // to check if script engine uses the specified class loader
+        private final boolean[] reached = new boolean[1];
+
+        @Override
+        protected Class findClass(final String name) throws ClassNotFoundException {
+            // flag that it reached here
+            reached[0] = true;
+            return super.findClass(name);
+        }
+
+        public boolean reached() {
+            return reached[0];
+        }
+    };
+
+    // These are for "private" extension API of NashornScriptEngineFactory that
+    // accepts a ClassLoader and/or command line options.
+
+    @Test
+    public void factoryClassLoaderTest() {
+        final ScriptEngineManager sm = new ScriptEngineManager();
+        for (ScriptEngineFactory fac : sm.getEngineFactories()) {
+            if (fac instanceof NashornScriptEngineFactory) {
+                final NashornScriptEngineFactory nfac = (NashornScriptEngineFactory)fac;
+                final MyClassLoader loader = new MyClassLoader();
+                // set the classloader as app class loader
+                final ScriptEngine e = nfac.getScriptEngine(loader);
+                try {
+                    e.eval("Packages.foo");
+                    // check that the class loader was attempted
+                    assertTrue(loader.reached(), "did not reach class loader!");
+                } catch (final ScriptException se) {
+                    se.printStackTrace();
+                    fail(se.getMessage());
+                }
+                return;
+            }
+        }
+
+        fail("Cannot find nashorn factory!");
+    }
+
+    @Test
+    public void factoryClassLoaderAndOptionsTest() {
+        final ScriptEngineManager sm = new ScriptEngineManager();
+        for (ScriptEngineFactory fac : sm.getEngineFactories()) {
+            if (fac instanceof NashornScriptEngineFactory) {
+                final NashornScriptEngineFactory nfac = (NashornScriptEngineFactory)fac;
+                final String[] options = new String[] { "-strict" };
+                final MyClassLoader loader = new MyClassLoader();
+                // set the classloader as app class loader
+                final ScriptEngine e = nfac.getScriptEngine(options, loader);
+                try {
+                    e.eval("Packages.foo");
+                    // check that the class loader was attempted
+                    assertTrue(loader.reached(), "did not reach class loader!");
+                } catch (final ScriptException se) {
+                    se.printStackTrace();
+                    fail(se.getMessage());
+                }
+
+                try {
+                    // strict mode - delete of a var should throw SyntaxError
+                    e.eval("var d = 2; delete d;");
+                } catch (final ScriptException se) {
+                    // check that the error message contains "SyntaxError"
+                    assertTrue(se.getMessage().contains("SyntaxError"));
+                }
+
+                return;
+            }
+        }
+
+        fail("Cannot find nashorn factory!");
+    }
 }

From 37905fb387d85c619c012f9f9d9828834bd4e5bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Thu, 7 Feb 2013 14:58:41 +0100
Subject: [PATCH 123/311] 8007627: Support @Getter annotation on constructor

Reviewed-by: attila, lagergren
---
 .../jdk/nashorn/internal/tools/nasgen/ConstructorGenerator.java | 2 +-
 .../jdk/nashorn/internal/tools/nasgen/PrototypeGenerator.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ConstructorGenerator.java b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ConstructorGenerator.java
index 6da3562dc4c..836cb8930c0 100644
--- a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ConstructorGenerator.java
+++ b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ConstructorGenerator.java
@@ -135,7 +135,7 @@ public class ConstructorGenerator extends ClassGenerator {
                 linkerAddGetterSetter(mi, className, memInfo);
             } else if (memInfo.isConstructorGetter()) {
                 final MemberInfo setter = scriptClassInfo.findSetter(memInfo);
-                linkerAddGetterSetter(mi, className, memInfo, setter);
+                linkerAddGetterSetter(mi, scriptClassInfo.getJavaName(), memInfo, setter);
             }
         }
         emitStaticInitSuffix(mi, className);
diff --git a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/PrototypeGenerator.java b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/PrototypeGenerator.java
index 9aeaf8f7eaa..17750cd1bbf 100644
--- a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/PrototypeGenerator.java
+++ b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/PrototypeGenerator.java
@@ -112,7 +112,7 @@ public class PrototypeGenerator extends ClassGenerator {
                 linkerAddGetterSetter(mi, className, memInfo);
             } else if (memInfo.isPrototypeGetter()) {
                 final MemberInfo setter = scriptClassInfo.findSetter(memInfo);
-                linkerAddGetterSetter(mi, className, memInfo, setter);
+                linkerAddGetterSetter(mi, scriptClassInfo.getJavaName(), memInfo, setter);
             }
         }
         emitStaticInitSuffix(mi, className);

From f2dc010c1610c008b8513588b0e89faffb21e954 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Thu, 7 Feb 2013 15:33:17 +0100
Subject: [PATCH 124/311] 8007718: Make static RegExp properties fully
 compatible to other engines

Reviewed-by: lagergren, sundar
---
 .../jdk/nashorn/internal/objects/Global.java  |  20 +-
 .../internal/objects/NativeRegExp.java        | 287 ++++++++++++------
 .../nashorn/internal/runtime/RegExpMatch.java |  18 ++
 .../internal/runtime/ScriptObject.java        |   4 +-
 nashorn/test/script/basic/JDK-8007718.js      |  55 ++++
 .../test/script/basic/JDK-8007718.js.EXPECTED | 105 +++++++
 6 files changed, 379 insertions(+), 110 deletions(-)
 create mode 100644 nashorn/test/script/basic/JDK-8007718.js
 create mode 100644 nashorn/test/script/basic/JDK-8007718.js.EXPECTED

diff --git a/nashorn/src/jdk/nashorn/internal/objects/Global.java b/nashorn/src/jdk/nashorn/internal/objects/Global.java
index aa7361a7625..4ea7fd0979e 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/Global.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/Global.java
@@ -48,6 +48,7 @@ import jdk.nashorn.internal.runtime.JSType;
 import jdk.nashorn.internal.runtime.NativeJavaPackage;
 import jdk.nashorn.internal.runtime.OptionsObject;
 import jdk.nashorn.internal.runtime.PropertyDescriptor;
+import jdk.nashorn.internal.runtime.RegExpMatch;
 import jdk.nashorn.internal.runtime.Scope;
 import jdk.nashorn.internal.runtime.ScriptFunction;
 import jdk.nashorn.internal.runtime.ScriptObject;
@@ -337,6 +338,9 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
     // class cache
     private ClassCache classCache;
 
+    // Used to store the last RegExp result to support deprecated RegExp constructor properties
+    private RegExpMatch lastRegExpMatch;
+
     private static final MethodHandle EVAL    = findOwnMH("eval",    Object.class, Object.class, Object.class);
     private static final MethodHandle PRINT   = findOwnMH("print",   Object.class, Object.class, Object[].class);
     private static final MethodHandle PRINTLN = findOwnMH("println", Object.class, Object.class, Object[].class);
@@ -1375,13 +1379,6 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
         final ScriptObject regExpProto = getRegExpPrototype();
         regExpProto.addBoundProperties(DEFAULT_REGEXP);
 
-        // add hook to support "deprecated" "static" properties of RegExp constructor object
-        final ScriptFunction handler = ScriptFunctionImpl.makeFunction(NO_SUCH_METHOD_NAME, NativeRegExp.REGEXP_STATICS_HANDLER);
-        builtinRegExp.addOwnProperty(NO_SUCH_PROPERTY_NAME, Attribute.NOT_ENUMERABLE, handler);
-
-        // add initial undefined "last successful match" property RegExp
-        builtinRegExp.addOwnProperty(NativeRegExp.LAST_REGEXP_MATCH, Attribute.NOT_ENUMERABLE, UNDEFINED);
-
         // Error stuff
         initErrorObjects();
 
@@ -1703,4 +1700,13 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
     private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
         return MH.findStatic(MethodHandles.publicLookup(), Global.class, name, MH.type(rtype, types));
     }
+
+    RegExpMatch getLastRegExpMatch() {
+        return lastRegExpMatch;
+    }
+
+    void setLastRegExpMatch(RegExpMatch regExpMatch) {
+        this.lastRegExpMatch = regExpMatch;
+    }
+
 }
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java b/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java
index e44b929819c..781d2333b35 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java
@@ -27,10 +27,7 @@ package jdk.nashorn.internal.objects;
 
 import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
 import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
-import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
 
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -43,6 +40,7 @@ import jdk.nashorn.internal.objects.annotations.Getter;
 import jdk.nashorn.internal.objects.annotations.Property;
 import jdk.nashorn.internal.objects.annotations.ScriptClass;
 import jdk.nashorn.internal.objects.annotations.SpecializedConstructor;
+import jdk.nashorn.internal.objects.annotations.Where;
 import jdk.nashorn.internal.parser.RegExp;
 import jdk.nashorn.internal.runtime.BitVector;
 import jdk.nashorn.internal.runtime.JSType;
@@ -57,8 +55,6 @@ import jdk.nashorn.internal.runtime.ScriptRuntime;
  */
 @ScriptClass("RegExp")
 public final class NativeRegExp extends ScriptObject {
-    static final MethodHandle REGEXP_STATICS_HANDLER = findOwnMH("regExpStaticsHandler", Object.class, Object.class, Object.class);
-
     /** ECMA 15.10.7.5 lastIndex property */
     @Property(attributes = Attribute.NOT_ENUMERABLE | Attribute.NOT_CONFIGURABLE)
     public Object lastIndex;
@@ -80,8 +76,8 @@ public final class NativeRegExp extends ScriptObject {
 
     private BitVector groupsInNegativeLookahead;
 
-    // RegExp constructor object. Needed to support RegExp "static" properties,
-    private Object constructor;
+    // Reference to global object needed to support static RegExp properties
+    private Global globalObject;
 
     /*
     public NativeRegExp() {
@@ -329,7 +325,7 @@ public final class NativeRegExp extends ScriptObject {
      * @param self self reference
      * @return the input string for the regexp
      */
-    @Getter(attributes = Attribute.NOT_ENUMERABLE | Attribute.NOT_CONFIGURABLE | Attribute.NOT_WRITABLE)
+    @Getter(attributes = Attribute.NON_ENUMERABLE_CONSTANT)
     public static Object source(final Object self) {
         return checkRegExp(self).input;
     }
@@ -340,7 +336,7 @@ public final class NativeRegExp extends ScriptObject {
      * @param self self reference
      * @return true if this regexp is flagged global, false otherwise
      */
-    @Getter(attributes = Attribute.NOT_ENUMERABLE | Attribute.NOT_CONFIGURABLE | Attribute.NOT_WRITABLE)
+    @Getter(attributes = Attribute.NON_ENUMERABLE_CONSTANT)
     public static Object global(final Object self) {
         return checkRegExp(self).global;
     }
@@ -351,7 +347,7 @@ public final class NativeRegExp extends ScriptObject {
      * @param self self reference
      * @return true if this regexp if flagged to ignore case, false otherwise
      */
-    @Getter(attributes = Attribute.NOT_ENUMERABLE | Attribute.NOT_CONFIGURABLE | Attribute.NOT_WRITABLE)
+    @Getter(attributes = Attribute.NON_ENUMERABLE_CONSTANT)
     public static Object ignoreCase(final Object self) {
         return checkRegExp(self).ignoreCase;
     }
@@ -362,11 +358,175 @@ public final class NativeRegExp extends ScriptObject {
      * @param self self reference
      * @return true if this regexp is flagged to be multiline, false otherwise
      */
-    @Getter(attributes = Attribute.NOT_ENUMERABLE | Attribute.NOT_CONFIGURABLE | Attribute.NOT_WRITABLE)
+    @Getter(attributes = Attribute.NON_ENUMERABLE_CONSTANT)
     public static Object multiline(final Object self) {
         return checkRegExp(self).multiline;
     }
 
+    /**
+     * Getter for non-standard RegExp.input property.
+     * @param self self object
+     * @return last regexp input
+     */
+    @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "input")
+    public static Object getLastInput(Object self) {
+        final RegExpMatch match = Global.instance().getLastRegExpMatch();
+        return match == null ? "" : match.getInput();
+    }
+
+    /**
+     * Getter for non-standard RegExp.multiline property.
+     * @param self self object
+     * @return last regexp input
+     */
+    @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "multiline")
+    public static Object getLastMultiline(Object self) {
+        return false; // doesn't ever seem to become true and isn't documented anyhwere
+    }
+
+    /**
+     * Getter for non-standard RegExp.lastMatch property.
+     * @param self self object
+     * @return last regexp input
+     */
+    @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "lastMatch")
+    public static Object getLastMatch(Object self) {
+        final RegExpMatch match = Global.instance().getLastRegExpMatch();
+        return match == null ? "" : match.getGroup(0);
+    }
+
+    /**
+     * Getter for non-standard RegExp.lastParen property.
+     * @param self self object
+     * @return last regexp input
+     */
+    @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "lastParen")
+    public static Object getLastParen(Object self) {
+        final RegExpMatch match = Global.instance().getLastRegExpMatch();
+        return match == null ? "" : match.getLastParen();
+    }
+
+    /**
+     * Getter for non-standard RegExp.leftContext property.
+     * @param self self object
+     * @return last regexp input
+     */
+    @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "leftContext")
+    public static Object getLeftContext(Object self) {
+        final RegExpMatch match = Global.instance().getLastRegExpMatch();
+        return match == null ? "" : match.getInput().substring(0, match.getIndex());
+    }
+
+    /**
+     * Getter for non-standard RegExp.rightContext property.
+     * @param self self object
+     * @return last regexp input
+     */
+    @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "rightContext")
+    public static Object getRightContext(Object self) {
+        final RegExpMatch match = Global.instance().getLastRegExpMatch();
+        return match == null ? "" : match.getInput().substring(match.getIndex() + match.length());
+    }
+
+    /**
+     * Getter for non-standard RegExp.$1 property.
+     * @param self self object
+     * @return last regexp input
+     */
+    @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "$1")
+    public static Object getGroup1(Object self) {
+        final RegExpMatch match = Global.instance().getLastRegExpMatch();
+        return match == null ? "" : match.getGroup(1);
+    }
+
+    /**
+     * Getter for non-standard RegExp.$2 property.
+     * @param self self object
+     * @return last regexp input
+     */
+    @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "$2")
+    public static Object getGroup2(Object self) {
+        final RegExpMatch match = Global.instance().getLastRegExpMatch();
+        return match == null ? "" : match.getGroup(2);
+    }
+
+    /**
+     * Getter for non-standard RegExp.$3 property.
+     * @param self self object
+     * @return last regexp input
+     */
+    @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "$3")
+    public static Object getGroup3(Object self) {
+        final RegExpMatch match = Global.instance().getLastRegExpMatch();
+        return match == null ? "" : match.getGroup(3);
+    }
+
+    /**
+     * Getter for non-standard RegExp.$4 property.
+     * @param self self object
+     * @return last regexp input
+     */
+    @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "$4")
+    public static Object getGroup4(Object self) {
+        final RegExpMatch match = Global.instance().getLastRegExpMatch();
+        return match == null ? "" : match.getGroup(4);
+    }
+
+    /**
+     * Getter for non-standard RegExp.$5 property.
+     * @param self self object
+     * @return last regexp input
+     */
+    @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "$5")
+    public static Object getGroup5(Object self) {
+        final RegExpMatch match = Global.instance().getLastRegExpMatch();
+        return match == null ? "" : match.getGroup(5);
+    }
+
+    /**
+     * Getter for non-standard RegExp.$6 property.
+     * @param self self object
+     * @return last regexp input
+     */
+    @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "$6")
+    public static Object getGroup6(Object self) {
+        final RegExpMatch match = Global.instance().getLastRegExpMatch();
+        return match == null ? "" : match.getGroup(6);
+    }
+
+    /**
+     * Getter for non-standard RegExp.$7 property.
+     * @param self self object
+     * @return last regexp input
+     */
+    @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "$7")
+    public static Object getGroup7(Object self) {
+        final RegExpMatch match = Global.instance().getLastRegExpMatch();
+        return match == null ? "" : match.getGroup(7);
+    }
+
+    /**
+     * Getter for non-standard RegExp.$8 property.
+     * @param self self object
+     * @return last regexp input
+     */
+    @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "$8")
+    public static Object getGroup8(Object self) {
+        final RegExpMatch match = Global.instance().getLastRegExpMatch();
+        return match == null ? "" : match.getGroup(8);
+    }
+
+    /**
+     * Getter for non-standard RegExp.$9 property.
+     * @param self self object
+     * @return last regexp input
+     */
+    @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "$9")
+    public static Object getGroup9(Object self) {
+        final RegExpMatch match = Global.instance().getLastRegExpMatch();
+        return match == null ? "" : match.getGroup(9);
+    }
+
     private RegExpMatch execInner(final String string) {
         if (this.pattern == null) {
             return null; // never matches or similar, e.g. a[]
@@ -389,7 +549,9 @@ public final class NativeRegExp extends ScriptObject {
             setLastIndex(matcher.end());
         }
 
-        return new RegExpMatch(string, matcher.start(), groups(matcher));
+        final RegExpMatch match = new RegExpMatch(string, matcher.start(), groups(matcher));
+        globalObject.setLastRegExpMatch(match);
+        return match;
     }
 
     /**
@@ -425,84 +587,13 @@ public final class NativeRegExp extends ScriptObject {
      * @return NativeArray of matches, string or null.
      */
     public Object exec(final String string) {
-        final RegExpMatch m = execInner(string);
-        // the input string
-        if (m == null) {
-            return setLastRegExpMatch(null);
+        final RegExpMatch match = execInner(string);
+
+        if (match == null) {
+            return null;
         }
 
-        return setLastRegExpMatch(new NativeRegExpExecResult(m));
-    }
-
-    // Name of the "last successful match" property of the RegExp constructor
-    static final String LAST_REGEXP_MATCH = "__last_regexp_match__";
-
-    /**
-     * Handles "static" properties of RegExp constructor. These are "deprecated"
-     * properties of RegExp constructor.
-     *
-     * @param self self object passed to this method
-     * @param name name of the property being searched
-     *
-     * @return value of the specified property or undefined if not found
-     */
-    public static Object regExpStaticsHandler(final Object self, final  Object name) {
-        final String propName = JSType.toString(name);
-        if (self instanceof ScriptObject) {
-            final ScriptObject sobj = (ScriptObject)self;
-            final Object value = sobj.get(LAST_REGEXP_MATCH);
-            if (! (value instanceof NativeRegExpExecResult)) {
-                return UNDEFINED;
-            }
-
-            // get the last match object
-            final NativeRegExpExecResult lastMatch = (NativeRegExpExecResult)value;
-
-            // look for $1... $9
-            if (propName.length() > 0 && propName.charAt(0) == '$') {
-                int index = 0;
-                try {
-                    index = Integer.parseInt(propName.substring(1));
-                } catch (final Exception ignored) {
-                    return UNDEFINED;
-                }
-
-                // index out of range
-                if (index < 1 && index > 9) {
-                    return UNDEFINED;
-                }
-
-                // retrieve indexed value from last match object.
-                return lastMatch.get(index);
-            }
-
-            // misc. "static" properties supported
-            switch (propName) {
-                case "input": {
-                    return lastMatch.input;
-                }
-
-                case "lastMatch": {
-                    return lastMatch.get(0);
-                }
-
-                case "lastParen": {
-                    final int len = ((Number)NativeRegExpExecResult.length(lastMatch)).intValue();
-                    return (len > 0)? lastMatch.get(len - 1) : UNDEFINED;
-                }
-            }
-        }
-
-        return UNDEFINED;
-    }
-
-    // Support for RegExp static properties. We set last successful match
-    // to the RegExp constructor object.
-    private Object setLastRegExpMatch(final Object match) {
-        if (constructor instanceof ScriptObject) {
-            ((ScriptObject)constructor).set(LAST_REGEXP_MATCH, match, isStrictContext());
-        }
-        return match;
+        return new NativeRegExpExecResult(match);
     }
 
     /**
@@ -744,15 +835,13 @@ public final class NativeRegExp extends ScriptObject {
      * @return Index of match.
      */
     Object search(final String string) {
-        final RegExpMatch m = execInner(string);
-        // the input string
-        if (m == null) {
-            setLastRegExpMatch(null);
+        final RegExpMatch match = execInner(string);
+
+        if (match == null) {
             return -1;
         }
 
-        setLastRegExpMatch(new NativeRegExpExecResult(m));
-        return m.getIndex();
+        return match.getIndex();
     }
 
     /**
@@ -780,10 +869,9 @@ public final class NativeRegExp extends ScriptObject {
     }
 
     private void init() {
-        final ScriptObject proto = Global.instance().getRegExpPrototype();
-        this.setProto(proto);
-        // retrieve constructor to support "static" properties of RegExp
-        this.constructor = PrototypeObject.getConstructor(proto);
+        // Keep reference to global object to support "static" properties of RegExp
+        this.globalObject = Global.instance();
+        this.setProto(globalObject.getRegExpPrototype());
     }
 
     private static NativeRegExp checkRegExp(final Object self) {
@@ -846,7 +934,4 @@ public final class NativeRegExp extends ScriptObject {
         this.groupsInNegativeLookahead = groupsInNegativeLookahead;
     }
 
-    private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
-        return MH.findStatic(MethodHandles.publicLookup(), NativeRegExp.class, name, MH.type(rtype, types));
-    }
 }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/RegExpMatch.java b/nashorn/src/jdk/nashorn/internal/runtime/RegExpMatch.java
index 81ab1db3a99..80b6f06d385 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/RegExpMatch.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/RegExpMatch.java
@@ -77,4 +77,22 @@ public final class RegExpMatch {
     public int length() {
         return ((String)groups[0]).length();
     }
+
+    /**
+     * Get the group with the given index or the empty string if group index is not valid.
+     * @param index the group index
+     * @return the group or ""
+     */
+    public Object getGroup(int index) {
+        return index >= 0 && index < groups.length ? groups[index] : "";
+    }
+
+    /**
+     * Get the last parenthesis group, or the empty string if none exists.
+     * @return the last group or ""
+     */
+    public Object getLastParen() {
+        return groups.length > 1 ? groups[groups.length - 1] : "";
+    }
+
 }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
index 07106d84179..8c1076285f6 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
@@ -89,10 +89,10 @@ import org.dynalang.dynalink.support.CallSiteDescriptorFactory;
 public abstract class ScriptObject extends PropertyListenerManager implements PropertyAccess {
 
     /** Search fall back routine name for "no such method" */
-    public static final String NO_SUCH_METHOD_NAME   = "__noSuchMethod__";
+    static final String NO_SUCH_METHOD_NAME   = "__noSuchMethod__";
 
     /** Search fall back routine name for "no such property" */
-    public static final String NO_SUCH_PROPERTY_NAME = "__noSuchProperty__";
+    static final String NO_SUCH_PROPERTY_NAME = "__noSuchProperty__";
 
     /** Per ScriptObject flag - is this a scope object? */
     public static final int IS_SCOPE       = 0b0000_0001;
diff --git a/nashorn/test/script/basic/JDK-8007718.js b/nashorn/test/script/basic/JDK-8007718.js
new file mode 100644
index 00000000000..fce5d8c8a7e
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8007718.js
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8007718: Make static RegExp properties fully compatible to other engines
+ *
+ * @test
+ * @run
+ */
+
+function dumpRegExpProperties() {
+    for (var p in RegExp) {
+        print(p, RegExp[p], typeof RegExp[p]);
+    }
+}
+
+dumpRegExpProperties();
+
+/abc/.exec("xyz");
+dumpRegExpProperties();
+
+/(b)(a)(r)/gmi.exec("FOOBARfoo");
+dumpRegExpProperties();
+
+"abcdefghijklmnopq".match(/(\w)(\w)(\w)(\w)(\w)(\w)(\w)(\w)(\w)(\w)(\w)/);
+dumpRegExpProperties();
+
+"abcabcabcABCabcABC".split(/(b)/i);
+dumpRegExpProperties();
+
+"foobarfoo".search(/bar/);
+dumpRegExpProperties();
+
+/abc/.exec("xyz");
+dumpRegExpProperties();
diff --git a/nashorn/test/script/basic/JDK-8007718.js.EXPECTED b/nashorn/test/script/basic/JDK-8007718.js.EXPECTED
new file mode 100644
index 00000000000..9ffbd3cc839
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8007718.js.EXPECTED
@@ -0,0 +1,105 @@
+input  string
+multiline false boolean
+lastMatch  string
+lastParen  string
+leftContext  string
+rightContext  string
+$1  string
+$2  string
+$3  string
+$4  string
+$5  string
+$6  string
+$7  string
+$8  string
+$9  string
+input  string
+multiline false boolean
+lastMatch  string
+lastParen  string
+leftContext  string
+rightContext  string
+$1  string
+$2  string
+$3  string
+$4  string
+$5  string
+$6  string
+$7  string
+$8  string
+$9  string
+input FOOBARfoo string
+multiline false boolean
+lastMatch BAR string
+lastParen R string
+leftContext FOO string
+rightContext foo string
+$1 B string
+$2 A string
+$3 R string
+$4  string
+$5  string
+$6  string
+$7  string
+$8  string
+$9  string
+input abcdefghijklmnopq string
+multiline false boolean
+lastMatch abcdefghijk string
+lastParen k string
+leftContext  string
+rightContext lmnopq string
+$1 a string
+$2 b string
+$3 c string
+$4 d string
+$5 e string
+$6 f string
+$7 g string
+$8 h string
+$9 i string
+input abcabcabcABCabcABC string
+multiline false boolean
+lastMatch B string
+lastParen B string
+leftContext abcabcabcABCabcA string
+rightContext C string
+$1 B string
+$2  string
+$3  string
+$4  string
+$5  string
+$6  string
+$7  string
+$8  string
+$9  string
+input foobarfoo string
+multiline false boolean
+lastMatch bar string
+lastParen  string
+leftContext foo string
+rightContext foo string
+$1  string
+$2  string
+$3  string
+$4  string
+$5  string
+$6  string
+$7  string
+$8  string
+$9  string
+input foobarfoo string
+multiline false boolean
+lastMatch bar string
+lastParen  string
+leftContext foo string
+rightContext foo string
+$1  string
+$2  string
+$3  string
+$4  string
+$5  string
+$6  string
+$7  string
+$8  string
+$9  string

From 3479e4412ab65b5c582060e502348c7d81a69b0a Mon Sep 17 00:00:00 2001
From: Mandy Chung <mchung@openjdk.org>
Date: Thu, 7 Feb 2013 09:41:47 -0800
Subject: [PATCH 125/311] 8007611: logging behavior in applet changed

Reviewed-by: alanb, jgish
---
 jdk/src/share/classes/java/util/logging/LogManager.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jdk/src/share/classes/java/util/logging/LogManager.java b/jdk/src/share/classes/java/util/logging/LogManager.java
index 55b2f206e76..40537d2e46e 100644
--- a/jdk/src/share/classes/java/util/logging/LogManager.java
+++ b/jdk/src/share/classes/java/util/logging/LogManager.java
@@ -395,7 +395,10 @@ public class LogManager {
                         context = userContext;
                     } else {
                         context = new LoggerContext();
-                        context.addLocalLogger(manager.rootLogger);
+                        // during initialization, rootLogger is null when
+                        // instantiating itself RootLogger
+                        if (manager.rootLogger != null)
+                            context.addLocalLogger(manager.rootLogger);
                     }
                     javaAwtAccess.put(ecx, LoggerContext.class, context);
                 }

From e1d6f09bba5aa4bffb1ce6d2ca0b0ebc39166ed9 Mon Sep 17 00:00:00 2001
From: Xue-Lei Andrew Fan <xuelei@openjdk.org>
Date: Thu, 7 Feb 2013 16:05:55 -0800
Subject: [PATCH 126/311] 8006777: Improve TLS handling of invalid messages

Reviewed-by: wetmore, ahgross
---
 .../classes/sun/security/ssl/CipherBox.java   | 202 ++++++++++++----
 .../classes/sun/security/ssl/CipherSuite.java |  23 +-
 .../sun/security/ssl/EngineInputRecord.java   | 220 ++++++++++++------
 .../sun/security/ssl/EngineOutputRecord.java  |   4 +-
 .../classes/sun/security/ssl/InputRecord.java | 184 ++++++++++++---
 .../share/classes/sun/security/ssl/MAC.java   |  51 ++--
 .../sun/security/ssl/OutputRecord.java        |   4 +-
 .../sun/security/ssl/SSLEngineImpl.java       |  26 +--
 .../sun/security/ssl/SSLSocketImpl.java       |  22 +-
 9 files changed, 527 insertions(+), 209 deletions(-)

diff --git a/jdk/src/share/classes/sun/security/ssl/CipherBox.java b/jdk/src/share/classes/sun/security/ssl/CipherBox.java
index 362f9b5d904..52bb7d95863 100644
--- a/jdk/src/share/classes/sun/security/ssl/CipherBox.java
+++ b/jdk/src/share/classes/sun/security/ssl/CipherBox.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -392,7 +392,8 @@ final class CipherBox {
      * uniformly use the bad_record_mac alert to hide the specific type of
      * the error.
      */
-    int decrypt(byte[] buf, int offset, int len) throws BadPaddingException {
+    int decrypt(byte[] buf, int offset, int len,
+            int tagLen) throws BadPaddingException {
         if (cipher == null) {
             return len;
         }
@@ -416,9 +417,10 @@ final class CipherBox {
                         System.out);
                 } catch (IOException e) { }
             }
+
             if (blockSize != 0) {
-                newLen = removePadding(buf, offset, newLen,
-                             blockSize, protocolVersion);
+                newLen = removePadding(
+                    buf, offset, newLen, tagLen, blockSize, protocolVersion);
 
                 if (protocolVersion.v >= ProtocolVersion.TLS11.v) {
                     if (newLen < blockSize) {
@@ -448,7 +450,7 @@ final class CipherBox {
      *
      *  @see decrypt(byte[], int, int)
      */
-    int decrypt(ByteBuffer bb) throws BadPaddingException {
+    int decrypt(ByteBuffer bb, int tagLen) throws BadPaddingException {
 
         int len = bb.remaining();
 
@@ -471,7 +473,6 @@ final class CipherBox {
             }
 
             if (debug != null && Debug.isOn("plaintext")) {
-                bb.position(pos);
                 try {
                     HexDumpEncoder hd = new HexDumpEncoder();
 
@@ -479,7 +480,8 @@ final class CipherBox {
                         "Padded plaintext after DECRYPTION:  len = "
                         + newLen);
 
-                    hd.encodeBuffer(bb, System.out);
+                    hd.encodeBuffer(
+                        (ByteBuffer)bb.duplicate().position(pos), System.out);
                 } catch (IOException e) { }
             }
 
@@ -488,7 +490,8 @@ final class CipherBox {
              */
             if (blockSize != 0) {
                 bb.position(pos);
-                newLen = removePadding(bb, blockSize, protocolVersion);
+                newLen = removePadding(
+                    bb, tagLen, blockSize, protocolVersion);
 
                 if (protocolVersion.v >= ProtocolVersion.TLS11.v) {
                     if (newLen < blockSize) {
@@ -590,6 +593,65 @@ final class CipherBox {
         return newlen;
     }
 
+    /*
+     * A constant-time check of the padding.
+     *
+     * NOTE that we are checking both the padding and the padLen bytes here.
+     *
+     * The caller MUST ensure that the len parameter is a positive number.
+     */
+    private static int[] checkPadding(
+            byte[] buf, int offset, int len, byte pad) {
+
+        if (len <= 0) {
+            throw new RuntimeException("padding len must be positive");
+        }
+
+        // An array of hits is used to prevent Hotspot optimization for
+        // the purpose of a constant-time check.
+        int[] results = {0, 0};    // {missed #, matched #}
+        for (int i = 0; i <= 256;) {
+            for (int j = 0; j < len && i <= 256; j++, i++) {     // j <= i
+                if (buf[offset + j] != pad) {
+                    results[0]++;       // mismatched padding data
+                } else {
+                    results[1]++;       // matched padding data
+                }
+            }
+        }
+
+        return results;
+    }
+
+    /*
+     * A constant-time check of the padding.
+     *
+     * NOTE that we are checking both the padding and the padLen bytes here.
+     *
+     * The caller MUST ensure that the bb parameter has remaining.
+     */
+    private static int[] checkPadding(ByteBuffer bb, byte pad) {
+
+        if (!bb.hasRemaining()) {
+            throw new RuntimeException("hasRemaining() must be positive");
+        }
+
+        // An array of hits is used to prevent Hotspot optimization for
+        // the purpose of a constant-time check.
+        int[] results = {0, 0};    // {missed #, matched #}
+        bb.mark();
+        for (int i = 0; i <= 256; bb.reset()) {
+            for (; bb.hasRemaining() && i <= 256; i++) {
+                if (bb.get() != pad) {
+                    results[0]++;       // mismatched padding data
+                } else {
+                    results[1]++;       // matched padding data
+                }
+            }
+        }
+
+        return results;
+    }
 
     /*
      * Typical TLS padding format for a 64 bit block cipher is as follows:
@@ -602,86 +664,95 @@ final class CipherBox {
      * as it makes the data a multiple of the block size
      */
     private static int removePadding(byte[] buf, int offset, int len,
-            int blockSize, ProtocolVersion protocolVersion)
-            throws BadPaddingException {
+            int tagLen, int blockSize,
+            ProtocolVersion protocolVersion) throws BadPaddingException {
+
         // last byte is length byte (i.e. actual padding length - 1)
         int padOffset = offset + len - 1;
-        int pad = buf[padOffset] & 0x0ff;
+        int padLen = buf[padOffset] & 0xFF;
 
-        int newlen = len - (pad + 1);
-        if (newlen < 0) {
-            throw new BadPaddingException("Padding length invalid: " + pad);
+        int newLen = len - (padLen + 1);
+        if ((newLen - tagLen) < 0) {
+            // If the buffer is not long enough to contain the padding plus
+            // a MAC tag, do a dummy constant-time padding check.
+            //
+            // Note that it is a dummy check, so we won't care about what is
+            // the actual padding data.
+            checkPadding(buf, offset, len, (byte)(padLen & 0xFF));
+
+            throw new BadPaddingException("Invalid Padding length: " + padLen);
         }
 
+        // The padding data should be filled with the padding length value.
+        int[] results = checkPadding(buf, offset + newLen,
+                        padLen + 1, (byte)(padLen & 0xFF));
         if (protocolVersion.v >= ProtocolVersion.TLS10.v) {
-            for (int i = 1; i <= pad; i++) {
-                int val = buf[padOffset - i] & 0xff;
-                if (val != pad) {
-                    throw new BadPaddingException
-                                        ("Invalid TLS padding: " + val);
-                }
+            if (results[0] != 0) {          // padding data has invalid bytes
+                throw new BadPaddingException("Invalid TLS padding data");
             }
         } else { // SSLv3
             // SSLv3 requires 0 <= length byte < block size
             // some implementations do 1 <= length byte <= block size,
             // so accept that as well
             // v3 does not require any particular value for the other bytes
-            if (pad > blockSize) {
-                throw new BadPaddingException("Invalid SSLv3 padding: " + pad);
+            if (padLen > blockSize) {
+                throw new BadPaddingException("Invalid SSLv3 padding");
             }
         }
-        return newlen;
+        return newLen;
     }
 
     /*
      * Position/limit is equal the removed padding.
      */
     private static int removePadding(ByteBuffer bb,
-            int blockSize, ProtocolVersion protocolVersion)
-            throws BadPaddingException {
+            int tagLen, int blockSize,
+            ProtocolVersion protocolVersion) throws BadPaddingException {
 
         int len = bb.remaining();
         int offset = bb.position();
 
         // last byte is length byte (i.e. actual padding length - 1)
         int padOffset = offset + len - 1;
-        int pad = bb.get(padOffset) & 0x0ff;
+        int padLen = bb.get(padOffset) & 0xFF;
 
-        int newlen = len - (pad + 1);
-        if (newlen < 0) {
-            throw new BadPaddingException("Padding length invalid: " + pad);
+        int newLen = len - (padLen + 1);
+        if ((newLen - tagLen) < 0) {
+            // If the buffer is not long enough to contain the padding plus
+            // a MAC tag, do a dummy constant-time padding check.
+            //
+            // Note that it is a dummy check, so we won't care about what is
+            // the actual padding data.
+            checkPadding(bb.duplicate(), (byte)(padLen & 0xFF));
+
+            throw new BadPaddingException("Invalid Padding length: " + padLen);
         }
 
-        /*
-         * We could zero the padding area, but not much useful
-         * information there.
-         */
+        // The padding data should be filled with the padding length value.
+        int[] results = checkPadding(
+                (ByteBuffer)bb.duplicate().position(offset + newLen),
+                (byte)(padLen & 0xFF));
         if (protocolVersion.v >= ProtocolVersion.TLS10.v) {
-            bb.put(padOffset, (byte)0);         // zero the padding.
-            for (int i = 1; i <= pad; i++) {
-                int val = bb.get(padOffset - i) & 0xff;
-                if (val != pad) {
-                    throw new BadPaddingException
-                                        ("Invalid TLS padding: " + val);
-                }
+            if (results[0] != 0) {          // padding data has invalid bytes
+                throw new BadPaddingException("Invalid TLS padding data");
             }
         } else { // SSLv3
             // SSLv3 requires 0 <= length byte < block size
             // some implementations do 1 <= length byte <= block size,
             // so accept that as well
             // v3 does not require any particular value for the other bytes
-            if (pad > blockSize) {
-                throw new BadPaddingException("Invalid SSLv3 padding: " + pad);
+            if (padLen > blockSize) {
+                throw new BadPaddingException("Invalid SSLv3 padding");
             }
         }
 
         /*
          * Reset buffer limit to remove padding.
          */
-        bb.position(offset + newlen);
-        bb.limit(offset + newlen);
+        bb.position(offset + newLen);
+        bb.limit(offset + newLen);
 
-        return newlen;
+        return newLen;
     }
 
     /*
@@ -708,4 +779,45 @@ final class CipherBox {
     boolean isCBCMode() {
         return isCBCMode;
     }
+
+    /**
+     * Is the cipher null?
+     *
+     * @return true if the cipher is null, false otherwise.
+     */
+    boolean isNullCipher() {
+        return cipher == null;
+    }
+
+    /**
+     * Sanity check the length of a fragment before decryption.
+     *
+     * In CBC mode, check that the fragment length is one or multiple times
+     * of the block size of the cipher suite, and is at least one (one is the
+     * smallest size of padding in CBC mode) bigger than the tag size of the
+     * MAC algorithm except the explicit IV size for TLS 1.1 or later.
+     *
+     * In non-CBC mode, check that the fragment length is not less than the
+     * tag size of the MAC algorithm.
+     *
+     * @return true if the length of a fragment matches above requirements
+     */
+    boolean sanityCheck(int tagLen, int fragmentLen) {
+        if (!isCBCMode) {
+            return fragmentLen >= tagLen;
+        }
+
+        if ((fragmentLen % blockSize) == 0) {
+            int minimal = tagLen + 1;
+            minimal = (minimal >= blockSize) ? minimal : blockSize;
+            if (protocolVersion.v >= ProtocolVersion.TLS11.v) {
+                minimal += blockSize;   // plus the size of the explicit IV
+            }
+
+            return (fragmentLen >= minimal);
+        }
+
+        return false;
+    }
+
 }
diff --git a/jdk/src/share/classes/sun/security/ssl/CipherSuite.java b/jdk/src/share/classes/sun/security/ssl/CipherSuite.java
index 555304880b7..e0a081ad85d 100644
--- a/jdk/src/share/classes/sun/security/ssl/CipherSuite.java
+++ b/jdk/src/share/classes/sun/security/ssl/CipherSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -549,9 +549,18 @@ final class CipherSuite implements Comparable<CipherSuite> {
         // size of the MAC value (and MAC key) in bytes
         final int size;
 
-        MacAlg(String name, int size) {
+        // block size of the underlying hash algorithm
+        final int hashBlockSize;
+
+        // minimal padding size of the underlying hash algorithm
+        final int minimalPaddingSize;
+
+        MacAlg(String name, int size,
+                int hashBlockSize, int minimalPaddingSize) {
             this.name = name;
             this.size = size;
+            this.hashBlockSize = hashBlockSize;
+            this.minimalPaddingSize = minimalPaddingSize;
         }
 
         /**
@@ -596,11 +605,11 @@ final class CipherSuite implements Comparable<CipherSuite> {
                         new BulkCipher(CIPHER_AES,     32, 16, true);
 
     // MACs
-    final static MacAlg M_NULL = new MacAlg("NULL", 0);
-    final static MacAlg M_MD5  = new MacAlg("MD5", 16);
-    final static MacAlg M_SHA  = new MacAlg("SHA", 20);
-    final static MacAlg M_SHA256  = new MacAlg("SHA256", 32);
-    final static MacAlg M_SHA384  = new MacAlg("SHA384", 48);
+    final static MacAlg M_NULL    = new MacAlg("NULL",     0,   0,   0);
+    final static MacAlg M_MD5     = new MacAlg("MD5",     16,  64,   9);
+    final static MacAlg M_SHA     = new MacAlg("SHA",     20,  64,   9);
+    final static MacAlg M_SHA256  = new MacAlg("SHA256",  32,  64,   9);
+    final static MacAlg M_SHA384  = new MacAlg("SHA384",  48, 128,  17);
 
     /**
      * PRFs (PseudoRandom Function) from TLS specifications.
diff --git a/jdk/src/share/classes/sun/security/ssl/EngineInputRecord.java b/jdk/src/share/classes/sun/security/ssl/EngineInputRecord.java
index 6b064385203..9161d6de8ef 100644
--- a/jdk/src/share/classes/sun/security/ssl/EngineInputRecord.java
+++ b/jdk/src/share/classes/sun/security/ssl/EngineInputRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -177,71 +177,6 @@ final class EngineInputRecord extends InputRecord {
         return len;
     }
 
-    /*
-     * Verifies and removes the MAC value.  Returns true if
-     * the MAC checks out OK.
-     *
-     * On entry:
-     *     position = beginning of app/MAC data
-     *     limit = end of MAC data.
-     *
-     * On return:
-     *     position = beginning of app data
-     *     limit = end of app data
-     */
-    boolean checkMAC(MAC signer, ByteBuffer bb) {
-        if (internalData) {
-            return checkMAC(signer);
-        }
-
-        int len = signer.MAClen();
-        if (len == 0) { // no mac
-            return true;
-        }
-
-        /*
-         * Grab the original limit
-         */
-        int lim = bb.limit();
-
-        /*
-         * Delineate the area to apply a MAC on.
-         */
-        int macData = lim - len;
-        bb.limit(macData);
-
-        byte[] mac = signer.compute(contentType(), bb);
-
-        if (len != mac.length) {
-            throw new RuntimeException("Internal MAC error");
-        }
-
-        /*
-         * Delineate the MAC values, position was already set
-         * by doing the compute above.
-         *
-         * We could zero the MAC area, but not much useful information
-         * there anyway.
-         */
-        bb.position(macData);
-        bb.limit(lim);
-
-        try {
-            for (int i = 0; i < len; i++) {
-                if (bb.get() != mac[i]) {  // No BB.equals(byte []); !
-                    return false;
-                }
-            }
-            return true;
-        } finally {
-            /*
-             * Position to the data.
-             */
-            bb.rewind();
-            bb.limit(macData);
-        }
-    }
-
     /*
      * Pass the data down if it's internally cached, otherwise
      * do it here.
@@ -251,20 +186,163 @@ final class EngineInputRecord extends InputRecord {
      * If external data(app), return a new ByteBuffer with data to
      * process.
      */
-    ByteBuffer decrypt(CipherBox box, ByteBuffer bb)
-            throws BadPaddingException {
+    ByteBuffer decrypt(MAC signer,
+            CipherBox box, ByteBuffer bb) throws BadPaddingException {
 
         if (internalData) {
-            decrypt(box);
+            decrypt(signer, box);   // MAC is checked during decryption
             return tmpBB;
         }
 
-        box.decrypt(bb);
-        bb.rewind();
+        BadPaddingException reservedBPE = null;
+        int tagLen = signer.MAClen();
+        int cipheredLength = bb.remaining();
+
+        if (!box.isNullCipher()) {
+            // sanity check length of the ciphertext
+            if (!box.sanityCheck(tagLen, cipheredLength)) {
+                throw new BadPaddingException(
+                    "ciphertext sanity check failed");
+            }
+
+            try {
+                // Note that the CipherBox.decrypt() does not change
+                // the capacity of the buffer.
+                box.decrypt(bb, tagLen);
+            } catch (BadPaddingException bpe) {
+                // RFC 2246 states that decryption_failed should be used
+                // for this purpose. However, that allows certain attacks,
+                // so we just send bad record MAC. We also need to make
+                // sure to always check the MAC to avoid a timing attack
+                // for the same issue. See paper by Vaudenay et al and the
+                // update in RFC 4346/5246.
+                //
+                // Failover to message authentication code checking.
+                reservedBPE = bpe;
+            } finally {
+                bb.rewind();
+            }
+        }
+
+        if (tagLen != 0) {
+            int macOffset = bb.limit() - tagLen;
+
+            // Note that although it is not necessary, we run the same MAC
+            // computation and comparison on the payload for both stream
+            // cipher and CBC block cipher.
+            if (bb.remaining() < tagLen) {
+                // negative data length, something is wrong
+                if (reservedBPE == null) {
+                    reservedBPE = new BadPaddingException("bad record");
+                }
+
+                // set offset of the dummy MAC
+                macOffset = cipheredLength - tagLen;
+                bb.limit(cipheredLength);
+            }
+
+            // Run MAC computation and comparison on the payload.
+            if (checkMacTags(contentType(), bb, signer, false)) {
+                if (reservedBPE == null) {
+                    reservedBPE = new BadPaddingException("bad record MAC");
+                }
+            }
+
+            // Run MAC computation and comparison on the remainder.
+            //
+            // It is only necessary for CBC block cipher.  It is used to get a
+            // constant time of MAC computation and comparison on each record.
+            if (box.isCBCMode()) {
+                int remainingLen = calculateRemainingLen(
+                                        signer, cipheredLength, macOffset);
+
+                // NOTE: here we use the InputRecord.buf because I did not find
+                // an effective way to work on ByteBuffer when its capacity is
+                // less than remainingLen.
+
+                // NOTE: remainingLen may be bigger (less than 1 block of the
+                // hash algorithm of the MAC) than the cipheredLength. However,
+                // We won't need to worry about it because we always use a
+                // maximum buffer for every record.  We need a change here if
+                // we use small buffer size in the future.
+                if (remainingLen > buf.length) {
+                    // unlikely to happen, just a placehold
+                    throw new RuntimeException(
+                        "Internal buffer capacity error");
+                }
+
+                // Won't need to worry about the result on the remainder. And
+                // then we won't need to worry about what's actual data to
+                // check MAC tag on.  We start the check from the header of the
+                // buffer so that we don't need to construct a new byte buffer.
+                checkMacTags(contentType(), buf, 0, remainingLen, signer, true);
+            }
+
+            bb.limit(macOffset);
+        }
+
+        // Is it a failover?
+        if (reservedBPE != null) {
+            throw reservedBPE;
+        }
 
         return bb.slice();
     }
 
+    /*
+     * Run MAC computation and comparison
+     *
+     * Please DON'T change the content of the ByteBuffer parameter!
+     */
+    private static boolean checkMacTags(byte contentType, ByteBuffer bb,
+            MAC signer, boolean isSimulated) {
+
+        int tagLen = signer.MAClen();
+        int lim = bb.limit();
+        int macData = lim - tagLen;
+
+        bb.limit(macData);
+        byte[] hash = signer.compute(contentType, bb, isSimulated);
+        if (hash == null || tagLen != hash.length) {
+            // Something is wrong with MAC implementation.
+            throw new RuntimeException("Internal MAC error");
+        }
+
+        bb.position(macData);
+        bb.limit(lim);
+        try {
+            int[] results = compareMacTags(bb, hash);
+            return (results[0] != 0);
+        } finally {
+            bb.rewind();
+            bb.limit(macData);
+        }
+    }
+
+    /*
+     * A constant-time comparison of the MAC tags.
+     *
+     * Please DON'T change the content of the ByteBuffer parameter!
+     */
+    private static int[] compareMacTags(ByteBuffer bb, byte[] tag) {
+
+        // An array of hits is used to prevent Hotspot optimization for
+        // the purpose of a constant-time check.
+        int[] results = {0, 0};     // {missed #, matched #}
+
+        // The caller ensures there are enough bytes available in the buffer.
+        // So we won't need to check the remaining of the buffer.
+        for (int i = 0; i < tag.length; i++) {
+            if (bb.get() != tag[i]) {
+                results[0]++;       // mismatched bytes
+            } else {
+                results[1]++;       // matched bytes
+            }
+        }
+
+        return results;
+    }
+
     /*
      * Override the actual write below.  We do things this way to be
      * consistent with InputRecord.  InputRecord may try to write out
diff --git a/jdk/src/share/classes/sun/security/ssl/EngineOutputRecord.java b/jdk/src/share/classes/sun/security/ssl/EngineOutputRecord.java
index e9d39805b36..ae414c115f2 100644
--- a/jdk/src/share/classes/sun/security/ssl/EngineOutputRecord.java
+++ b/jdk/src/share/classes/sun/security/ssl/EngineOutputRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -118,7 +118,7 @@ final class EngineOutputRecord extends OutputRecord {
             throws IOException {
 
         if (signer.MAClen() != 0) {
-            byte[] hash = signer.compute(contentType(), bb);
+            byte[] hash = signer.compute(contentType(), bb, false);
 
             /*
              * position was advanced to limit in compute above.
diff --git a/jdk/src/share/classes/sun/security/ssl/InputRecord.java b/jdk/src/share/classes/sun/security/ssl/InputRecord.java
index 78e866a07ca..45fdc62dd21 100644
--- a/jdk/src/share/classes/sun/security/ssl/InputRecord.java
+++ b/jdk/src/share/classes/sun/security/ssl/InputRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -133,43 +133,173 @@ class InputRecord extends ByteArrayInputStream implements Record {
         return handshakeHash;
     }
 
+    void decrypt(MAC signer, CipherBox box) throws BadPaddingException {
+
+        BadPaddingException reservedBPE = null;
+        int tagLen = signer.MAClen();
+        int cipheredLength = count - headerSize;
+
+        if (!box.isNullCipher()) {
+            // sanity check length of the ciphertext
+            if (!box.sanityCheck(tagLen, cipheredLength)) {
+                throw new BadPaddingException(
+                    "ciphertext sanity check failed");
+            }
+
+            try {
+                // Note that the CipherBox.decrypt() does not change
+                // the capacity of the buffer.
+                count = headerSize +
+                        box.decrypt(buf, headerSize, cipheredLength, tagLen);
+            } catch (BadPaddingException bpe) {
+                // RFC 2246 states that decryption_failed should be used
+                // for this purpose. However, that allows certain attacks,
+                // so we just send bad record MAC. We also need to make
+                // sure to always check the MAC to avoid a timing attack
+                // for the same issue. See paper by Vaudenay et al and the
+                // update in RFC 4346/5246.
+                //
+                // Failover to message authentication code checking.
+                reservedBPE = bpe;
+            }
+        }
+
+        if (tagLen != 0) {
+            int macOffset = count - tagLen;
+            int contentLen = macOffset - headerSize;
+
+            // Note that although it is not necessary, we run the same MAC
+            // computation and comparison on the payload for both stream
+            // cipher and CBC block cipher.
+            if (contentLen < 0) {
+                // negative data length, something is wrong
+                if (reservedBPE == null) {
+                    reservedBPE = new BadPaddingException("bad record");
+                }
+
+                // set offset of the dummy MAC
+                macOffset = headerSize + cipheredLength - tagLen;
+                contentLen = macOffset - headerSize;
+            }
+
+            count -= tagLen;  // Set the count before any MAC checking
+                              // exception occurs, so that the following
+                              // process can read the actual decrypted
+                              // content (minus the MAC) in the fragment
+                              // if necessary.
+
+            // Run MAC computation and comparison on the payload.
+            if (checkMacTags(contentType(),
+                    buf, headerSize, contentLen, signer, false)) {
+                if (reservedBPE == null) {
+                    reservedBPE = new BadPaddingException("bad record MAC");
+                }
+            }
+
+            // Run MAC computation and comparison on the remainder.
+            //
+            // It is only necessary for CBC block cipher.  It is used to get a
+            // constant time of MAC computation and comparison on each record.
+            if (box.isCBCMode()) {
+                int remainingLen = calculateRemainingLen(
+                                        signer, cipheredLength, contentLen);
+
+                // NOTE: remainingLen may be bigger (less than 1 block of the
+                // hash algorithm of the MAC) than the cipheredLength. However,
+                // We won't need to worry about it because we always use a
+                // maximum buffer for every record.  We need a change here if
+                // we use small buffer size in the future.
+                if (remainingLen > buf.length) {
+                    // unlikely to happen, just a placehold
+                    throw new RuntimeException(
+                        "Internal buffer capacity error");
+                }
+
+                // Won't need to worry about the result on the remainder. And
+                // then we won't need to worry about what's actual data to
+                // check MAC tag on.  We start the check from the header of the
+                // buffer so that we don't need to construct a new byte buffer.
+                checkMacTags(contentType(), buf, 0, remainingLen, signer, true);
+            }
+        }
+
+        // Is it a failover?
+        if (reservedBPE != null) {
+            throw reservedBPE;
+        }
+    }
+
     /*
-     * Verify and remove the MAC ... used for all records.
+     * Run MAC computation and comparison
+     *
+     * Please DON'T change the content of the byte buffer parameter!
      */
-    boolean checkMAC(MAC signer) {
-        int len = signer.MAClen();
-        if (len == 0) { // no mac
-            return true;
-        }
+    static boolean checkMacTags(byte contentType, byte[] buffer,
+            int offset, int contentLen, MAC signer, boolean isSimulated) {
 
-        int offset = count - len;
-
-        if (offset < headerSize) {
-            // data length would be negative, something is wrong
-            return false;
-        }
-
-        byte[] mac = signer.compute(contentType(), buf,
-            headerSize, offset - headerSize);
-
-        if (len != mac.length) {
+        int tagLen = signer.MAClen();
+        byte[] hash = signer.compute(
+                contentType, buffer, offset, contentLen, isSimulated);
+        if (hash == null || tagLen != hash.length) {
+            // Something is wrong with MAC implementation.
             throw new RuntimeException("Internal MAC error");
         }
 
-        for (int i = 0; i < len; i++) {
-            if (buf[offset + i] != mac[i]) {
-                return false;
+        int[] results = compareMacTags(buffer, offset + contentLen, hash);
+        return (results[0] != 0);
+    }
+
+    /*
+     * A constant-time comparison of the MAC tags.
+     *
+     * Please DON'T change the content of the byte buffer parameter!
+     */
+    private static int[] compareMacTags(
+            byte[] buffer, int offset, byte[] tag) {
+
+        // An array of hits is used to prevent Hotspot optimization for
+        // the purpose of a constant-time check.
+        int[] results = {0, 0};    // {missed #, matched #}
+
+        // The caller ensures there are enough bytes available in the buffer.
+        // So we won't need to check the length of the buffer.
+        for (int i = 0; i < tag.length; i++) {
+            if (buffer[offset + i] != tag[i]) {
+                results[0]++;       // mismatched bytes
+            } else {
+                results[1]++;       // matched bytes
             }
         }
-        count -= len;
-        return true;
+
+        return results;
     }
 
-    void decrypt(CipherBox box) throws BadPaddingException {
-        int len = count - headerSize;
-        count = headerSize + box.decrypt(buf, headerSize, len);
-    }
+    /*
+     * Calculate the length of a dummy buffer to run MAC computation
+     * and comparison on the remainder.
+     *
+     * The caller MUST ensure that the fullLen is not less than usedLen.
+     */
+    static int calculateRemainingLen(
+            MAC signer, int fullLen, int usedLen) {
 
+        int blockLen = signer.hashBlockLen();
+        int minimalPaddingLen = signer.minimalPaddingLen();
+
+        // (blockLen - minimalPaddingLen) is the maximum message size of
+        // the last block of hash function operation. See FIPS 180-4, or
+        // MD5 specification.
+        fullLen += 13 - (blockLen - minimalPaddingLen);
+        usedLen += 13 - (blockLen - minimalPaddingLen);
+
+        // Note: fullLen is always not less than usedLen, and blockLen
+        // is always bigger than minimalPaddingLen, so we don't worry
+        // about negative values. 0x01 is added to the result to ensure
+        // that the return value is positive.  The extra one byte does
+        // not impact the overall MAC compression function evaluations.
+        return 0x01 + (int)(Math.ceil(fullLen/(1.0d * blockLen)) -
+                Math.ceil(usedLen/(1.0d * blockLen))) * signer.hashBlockLen();
+    }
 
     /*
      * Well ... hello_request messages are _never_ hashed since we can't
diff --git a/jdk/src/share/classes/sun/security/ssl/MAC.java b/jdk/src/share/classes/sun/security/ssl/MAC.java
index 753a8c57ac4..e491cc301da 100644
--- a/jdk/src/share/classes/sun/security/ssl/MAC.java
+++ b/jdk/src/share/classes/sun/security/ssl/MAC.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,8 +43,8 @@ import static sun.security.ssl.CipherSuite.*;
  * provide integrity protection for SSL messages.  The MAC is actually
  * one of several keyed hashes, as associated with the cipher suite and
  * protocol version.  (SSL v3.0 uses one construct, TLS uses another.)
- *
- * <P>NOTE: MAC computation is the only place in the SSL protocol that the
+ * <P>
+ * NOTE: MAC computation is the only place in the SSL protocol that the
  * sequence number is used.  It's also reset to zero with each change of
  * a cipher spec, so this is the only place this state is needed.
  *
@@ -58,6 +58,9 @@ final class MAC {
     // Value of the null MAC is fixed
     private static final byte nullMAC[] = new byte[0];
 
+    // internal identifier for the MAC algorithm
+    private final MacAlg        macAlg;
+
     // stuff defined by the kind of MAC algorithm
     private final int           macSize;
 
@@ -82,6 +85,7 @@ final class MAC {
 
     private MAC() {
         macSize = 0;
+        macAlg = M_NULL;
         mac = null;
         block = null;
     }
@@ -91,6 +95,7 @@ final class MAC {
      */
     MAC(MacAlg macAlg, ProtocolVersion protocolVersion, SecretKey key)
             throws NoSuchAlgorithmException, InvalidKeyException {
+        this.macAlg = macAlg;
         this.macSize = macAlg.size;
 
         String algorithm;
@@ -127,6 +132,20 @@ final class MAC {
         return macSize;
     }
 
+    /**
+     * Returns the hash function block length of the MAC alorithm.
+     */
+    int hashBlockLen() {
+        return macAlg.hashBlockSize;
+    }
+
+    /**
+     * Returns the hash function minimal padding length of the MAC alorithm.
+     */
+    int minimalPaddingLen() {
+        return macAlg.minimalPaddingSize;
+    }
+
     /**
      * Computes and returns the MAC for the data in this byte array.
      *
@@ -134,9 +153,11 @@ final class MAC {
      * @param buf compressed record on which the MAC is computed
      * @param offset start of compressed record data
      * @param len the size of the compressed record
+     * @param isSimulated if true, simulate the the MAC computation
      */
-    final byte[] compute(byte type, byte buf[], int offset, int len) {
-        return compute(type, null, buf, offset, len);
+    final byte[] compute(byte type, byte buf[],
+            int offset, int len, boolean isSimulated) {
+        return compute(type, null, buf, offset, len, isSimulated);
     }
 
     /**
@@ -149,9 +170,10 @@ final class MAC {
      * @param type record type
      * @param bb a ByteBuffer in which the position and limit
      *          demarcate the data to be MAC'd.
+     * @param isSimulated if true, simulate the the MAC computation
      */
-    final byte[] compute(byte type, ByteBuffer bb) {
-        return compute(type, bb, null, 0, bb.remaining());
+    final byte[] compute(byte type, ByteBuffer bb, boolean isSimulated) {
+        return compute(type, bb, null, 0, bb.remaining(), isSimulated);
     }
 
     /**
@@ -204,18 +226,21 @@ final class MAC {
      * or buf/offset/len.
      */
     private byte[] compute(byte type, ByteBuffer bb, byte[] buf,
-            int offset, int len) {
+            int offset, int len, boolean isSimulated) {
 
         if (macSize == 0) {
             return nullMAC;
         }
 
-        block[BLOCK_OFFSET_TYPE] = type;
-        block[block.length - 2]  = (byte)(len >> 8);
-        block[block.length - 1]  = (byte)(len     );
+        // MUST NOT increase the sequence number for a simulated computation.
+        if (!isSimulated) {
+            block[BLOCK_OFFSET_TYPE] = type;
+            block[block.length - 2]  = (byte)(len >> 8);
+            block[block.length - 1]  = (byte)(len     );
 
-        mac.update(block);
-        incrementSequenceNumber();
+            mac.update(block);
+            incrementSequenceNumber();
+        }
 
         // content
         if (bb != null) {
diff --git a/jdk/src/share/classes/sun/security/ssl/OutputRecord.java b/jdk/src/share/classes/sun/security/ssl/OutputRecord.java
index 900003dfd0f..0ff27be460d 100644
--- a/jdk/src/share/classes/sun/security/ssl/OutputRecord.java
+++ b/jdk/src/share/classes/sun/security/ssl/OutputRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -205,7 +205,7 @@ class OutputRecord extends ByteArrayOutputStream implements Record {
         }
         if (signer.MAClen() != 0) {
             byte[] hash = signer.compute(contentType, buf,
-                    headerSize, count - headerSize);
+                    headerSize, count - headerSize, false);
             write(hash);
         }
     }
diff --git a/jdk/src/share/classes/sun/security/ssl/SSLEngineImpl.java b/jdk/src/share/classes/sun/security/ssl/SSLEngineImpl.java
index 41415337ca1..5534cab0384 100644
--- a/jdk/src/share/classes/sun/security/ssl/SSLEngineImpl.java
+++ b/jdk/src/share/classes/sun/security/ssl/SSLEngineImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -958,35 +958,15 @@ final public class SSLEngineImpl extends SSLEngine {
              * throw a fatal alert if the integrity check fails.
              */
             try {
-                decryptedBB = inputRecord.decrypt(readCipher, readBB);
+                decryptedBB = inputRecord.decrypt(readMAC, readCipher, readBB);
             } catch (BadPaddingException e) {
-                // RFC 2246 states that decryption_failed should be used
-                // for this purpose. However, that allows certain attacks,
-                // so we just send bad record MAC. We also need to make
-                // sure to always check the MAC to avoid a timing attack
-                // for the same issue. See paper by Vaudenay et al.
-                //
-                // rewind the BB if necessary.
-                readBB.rewind();
-
-                inputRecord.checkMAC(readMAC, readBB);
-
-                // use the same alert types as for MAC failure below
                 byte alertType = (inputRecord.contentType() ==
                     Record.ct_handshake) ?
                         Alerts.alert_handshake_failure :
                         Alerts.alert_bad_record_mac;
-                fatal(alertType, "Invalid padding", e);
+                fatal(alertType, e.getMessage(), e);
             }
 
-            if (!inputRecord.checkMAC(readMAC, decryptedBB)) {
-                if (inputRecord.contentType() == Record.ct_handshake) {
-                    fatal(Alerts.alert_handshake_failure,
-                        "bad handshake record MAC");
-                } else {
-                    fatal(Alerts.alert_bad_record_mac, "bad record MAC");
-                }
-            }
 
             // if (!inputRecord.decompress(c))
             //     fatal(Alerts.alert_decompression_failure,
diff --git a/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java b/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java
index f807c4c58ce..cbc3db69b96 100644
--- a/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java
+++ b/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -986,29 +986,13 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
              * throw a fatal alert if the integrity check fails.
              */
             try {
-                r.decrypt(readCipher);
+                r.decrypt(readMAC, readCipher);
             } catch (BadPaddingException e) {
-                // RFC 2246 states that decryption_failed should be used
-                // for this purpose. However, that allows certain attacks,
-                // so we just send bad record MAC. We also need to make
-                // sure to always check the MAC to avoid a timing attack
-                // for the same issue. See paper by Vaudenay et al.
-                r.checkMAC(readMAC);
-                // use the same alert types as for MAC failure below
                 byte alertType = (r.contentType() == Record.ct_handshake)
                                         ? Alerts.alert_handshake_failure
                                         : Alerts.alert_bad_record_mac;
-                fatal(alertType, "Invalid padding", e);
+                fatal(alertType, e.getMessage(), e);
             }
-            if (!r.checkMAC(readMAC)) {
-                if (r.contentType() == Record.ct_handshake) {
-                    fatal(Alerts.alert_handshake_failure,
-                        "bad handshake record MAC");
-                } else {
-                    fatal(Alerts.alert_bad_record_mac, "bad record MAC");
-                }
-            }
-
 
             // if (!r.decompress(c))
             //     fatal(Alerts.alert_decompression_failure,

From 3ae3ac4f875af338d660b8d9f5998e5c327827b9 Mon Sep 17 00:00:00 2001
From: Valerie Peng <valeriep@openjdk.org>
Date: Thu, 7 Feb 2013 16:03:43 -0800
Subject: [PATCH 127/311] 8007688: Blacklist known bad certificate

Added two known bad certs to the blacklist certs.

Reviewed-by: mullan
---
 .../security/util/UntrustedCertificates.java  | 108 +++++++++++++++++-
 1 file changed, 107 insertions(+), 1 deletion(-)

diff --git a/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java b/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java
index 6aad34a73a4..03fdbc78332 100644
--- a/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java
+++ b/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -737,5 +737,111 @@ public final class UntrustedCertificates {
         "B8WfedLHjFW/TMcnXlEWKz4=\n" +
         "-----END CERTIFICATE-----");
 
+        //
+        // Revoked DigiCert code signing certificates used to sign malware
+        //
+
+        // Subject: CN=Buster Paper Comercial Ltda,
+        //          O=Buster Paper Comercial Ltda,
+        //          L=S?o Jos? Dos Campos,
+        //          ST=S?o Paulo,
+        //          C=BR
+        // Issuer:  CN=DigiCert Assured ID Code Signing CA-1,
+        //          OU=www.digicert.com,
+        //          O=DigiCert Inc,
+        //          C=US
+        // Serial:  07:b4:4c:db:ff:fb:78:de:05:f4:26:16:72:a6:73:12
+        add("buster-paper-comercial-ltda-72A67312",
+        "-----BEGIN CERTIFICATE-----\n" +
+        "MIIGwzCCBaugAwIBAgIQB7RM2//7eN4F9CYWcqZzEjANBgkqhkiG9w0BAQUFADBv\n" +
+        "MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3\n" +
+        "d3cuZGlnaWNlcnQuY29tMS4wLAYDVQQDEyVEaWdpQ2VydCBBc3N1cmVkIElEIENv\n" +
+        "ZGUgU2lnbmluZyBDQS0xMB4XDTEzMDExNzAwMDAwMFoXDTE0MDEyMjEyMDAwMFow\n" +
+        "gY4xCzAJBgNVBAYTAkJSMRMwEQYDVQQIDApTw6NvIFBhdWxvMR4wHAYDVQQHDBVT\n" +
+        "w6NvIEpvc8OpIERvcyBDYW1wb3MxJDAiBgNVBAoTG0J1c3RlciBQYXBlciBDb21l\n" +
+        "cmNpYWwgTHRkYTEkMCIGA1UEAxMbQnVzdGVyIFBhcGVyIENvbWVyY2lhbCBMdGRh\n" +
+        "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzO0l6jWIpEfO2oUpVHpL\n" +
+        "HETj5lzivNb0S9jKHgGJax917czh81PnGTxwxFXd6gLJuy/XFHvmiSi8g8jzlymn\n" +
+        "2Ji5zQ3CPaz7nomJokSUDlMVJ2qYWtctw4jrdjuI4qtn+koXXUFkWjkf8h8251I4\n" +
+        "tUs7S49HE2Go5owCYP3byajj7fsFAYR/Xb7TdVtndkZsUB/YgOjHovyACjouaNCi\n" +
+        "mDiRyQ6zLLjZGiyeD65Yiseuhp5b8/BL5h1p7w76QYMYMVQNAdtDKut2R8MBpuWf\n" +
+        "Ny7Eoi0x/gm1p9X5Rcl5aN7K0G4UtTAJKbkuUfXddsyFoM0Nx8uo8SgNQ8Y/X5Jx\n" +
+        "BwIDAQABo4IDOTCCAzUwHwYDVR0jBBgwFoAUe2jOKarAF75JeuHlP9an90WPNTIw\n" +
+        "HQYDVR0OBBYEFFLZ3n5nt/Eer7n1bvtOqMb1qKO5MA4GA1UdDwEB/wQEAwIHgDAT\n" +
+        "BgNVHSUEDDAKBggrBgEFBQcDAzBzBgNVHR8EbDBqMDOgMaAvhi1odHRwOi8vY3Js\n" +
+        "My5kaWdpY2VydC5jb20vYXNzdXJlZC1jcy0yMDExYS5jcmwwM6AxoC+GLWh0dHA6\n" +
+        "Ly9jcmw0LmRpZ2ljZXJ0LmNvbS9hc3N1cmVkLWNzLTIwMTFhLmNybDCCAcQGA1Ud\n" +
+        "IASCAbswggG3MIIBswYJYIZIAYb9bAMBMIIBpDA6BggrBgEFBQcCARYuaHR0cDov\n" +
+        "L3d3dy5kaWdpY2VydC5jb20vc3NsLWNwcy1yZXBvc2l0b3J5Lmh0bTCCAWQGCCsG\n" +
+        "AQUFBwICMIIBVh6CAVIAQQBuAHkAIAB1AHMAZQAgAG8AZgAgAHQAaABpAHMAIABD\n" +
+        "AGUAcgB0AGkAZgBpAGMAYQB0AGUAIABjAG8AbgBzAHQAaQB0AHUAdABlAHMAIABh\n" +
+        "AGMAYwBlAHAAdABhAG4AYwBlACAAbwBmACAAdABoAGUAIABEAGkAZwBpAEMAZQBy\n" +
+        "AHQAIABDAFAALwBDAFAAUwAgAGEAbgBkACAAdABoAGUAIABSAGUAbAB5AGkAbgBn\n" +
+        "ACAAUABhAHIAdAB5ACAAQQBnAHIAZQBlAG0AZQBuAHQAIAB3AGgAaQBjAGgAIABs\n" +
+        "AGkAbQBpAHQAIABsAGkAYQBiAGkAbABpAHQAeQAgAGEAbgBkACAAYQByAGUAIABp\n" +
+        "AG4AYwBvAHIAcABvAHIAYQB0AGUAZAAgAGgAZQByAGUAaQBuACAAYgB5ACAAcgBl\n" +
+        "AGYAZQByAGUAbgBjAGUALjCBggYIKwYBBQUHAQEEdjB0MCQGCCsGAQUFBzABhhho\n" +
+        "dHRwOi8vb2NzcC5kaWdpY2VydC5jb20wTAYIKwYBBQUHMAKGQGh0dHA6Ly9jYWNl\n" +
+        "cnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEFzc3VyZWRJRENvZGVTaWduaW5nQ0Et\n" +
+        "MS5jcnQwDAYDVR0TAQH/BAIwADANBgkqhkiG9w0BAQUFAAOCAQEAPTTQvpOIikXI\n" +
+        "hTLnNbajaFRR5GhQpTzUNgBfF9VYSlNw/wMjpGsrh5RxaJCip52jbehmTgjMRhft\n" +
+        "jRYyml44PAVsCcR9uEoDpCZYpI1fHI1R+F8jd1C9rqprbSwwOG4xlg4SmvTHYs6e\n" +
+        "gBItQ/1p9XY+Sf4Wv1qOuOFL1qvV/5VyR2zdlOQCmKCeMgxt6a/tHLBDiAA67D44\n" +
+        "/vfdoNJl0CU2It0PO60jdCPFNWIRcxL+OSDqAoePeUC7xQ+JsTEIxuUE8+d6w6fc\n" +
+        "BV2mYb1flh22t46GLjh4gyo7xw3aL6L0L0jzlTT6IcEw6NIbaPbIKj/npQnHobYj\n" +
+        "XMuKLxbh7g==\n" +
+        "-----END CERTIFICATE-----");
+
+        // Subject: CN=BUSTER ASSISTENCIA TECNICA ELETRONICA LTDA - ME,
+        //          O=BUSTER ASSISTENCIA TECNICA ELETRONICA LTDA - ME,
+        //          L=S?o Paulo,
+        //          ST=S?o Paulo,
+        //          C=BR
+        // Issuer:  CN=DigiCert Assured ID Code Signing CA-1,
+        //          OU=www.digicert.com,
+        //          O=DigiCert Inc,
+        //          C=US
+        // Serial:  0a:38:9b:95:ee:73:6d:d1:3b:c0:ed:74:3f:d7:4d:2f
+        add("buster-assistencia-tecnica-electronica-ltda-3FD74D2F",
+        "-----BEGIN CERTIFICATE-----\n" +
+        "MIIG4DCCBcigAwIBAgIQCjible5zbdE7wO10P9dNLzANBgkqhkiG9w0BAQUFADBv\n" +
+        "MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3\n" +
+        "d3cuZGlnaWNlcnQuY29tMS4wLAYDVQQDEyVEaWdpQ2VydCBBc3N1cmVkIElEIENv\n" +
+        "ZGUgU2lnbmluZyBDQS0xMB4XDTEyMTEwOTAwMDAwMFoXDTEzMTExNDEyMDAwMFow\n" +
+        "gasxCzAJBgNVBAYTAkJSMRMwEQYDVQQIDApTw6NvIFBhdWxvMRMwEQYDVQQHDApT\n" +
+        "w6NvIFBhdWxvMTgwNgYDVQQKEy9CVVNURVIgQVNTSVNURU5DSUEgVEVDTklDQSBF\n" +
+        "TEVUUk9OSUNBIExUREEgLSBNRTE4MDYGA1UEAxMvQlVTVEVSIEFTU0lTVEVOQ0lB\n" +
+        "IFRFQ05JQ0EgRUxFVFJPTklDQSBMVERBIC0gTUUwggEiMA0GCSqGSIb3DQEBAQUA\n" +
+        "A4IBDwAwggEKAoIBAQDAqNeEs5/B2CTXGjTOkUIdu6jV6qulOZwdw4sefHWYj1UR\n" +
+        "4z6zPk9kjpUgbnb402RFq88QtfInwddZ/wXn9OxMtDd/3TnC7HrhNS7ga79ZFL2V\n" +
+        "JnmzKHum2Yvh0q82QEJ9tHBR2X9VdKpUIH08Zs3k6cWWM1H0YX0cxA/HohhesQJW\n" +
+        "kwJ3urOIJiH/HeByDk8a1NS8safcCxk5vxvW4WvCg43iT09LeHY5Aa8abKw8lqVb\n" +
+        "0tD5ZSIjdmdj3TT1U37iAHLLRM2DXbxfdbhouUX1c5U1ZHAMA67HwjKiseOiDaHj\n" +
+        "NUGbC37C+cgbc9VVM/cURD8WvS0Kj6fQv7F2QtJDAgMBAAGjggM5MIIDNTAfBgNV\n" +
+        "HSMEGDAWgBR7aM4pqsAXvkl64eU/1qf3RY81MjAdBgNVHQ4EFgQU88EXKAyDsh30\n" +
+        "o9+Gu9a4xUy+FSMwDgYDVR0PAQH/BAQDAgeAMBMGA1UdJQQMMAoGCCsGAQUFBwMD\n" +
+        "MHMGA1UdHwRsMGowM6AxoC+GLWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9hc3N1\n" +
+        "cmVkLWNzLTIwMTFhLmNybDAzoDGgL4YtaHR0cDovL2NybDQuZGlnaWNlcnQuY29t\n" +
+        "L2Fzc3VyZWQtY3MtMjAxMWEuY3JsMIIBxAYDVR0gBIIBuzCCAbcwggGzBglghkgB\n" +
+        "hv1sAwEwggGkMDoGCCsGAQUFBwIBFi5odHRwOi8vd3d3LmRpZ2ljZXJ0LmNvbS9z\n" +
+        "c2wtY3BzLXJlcG9zaXRvcnkuaHRtMIIBZAYIKwYBBQUHAgIwggFWHoIBUgBBAG4A\n" +
+        "eQAgAHUAcwBlACAAbwBmACAAdABoAGkAcwAgAEMAZQByAHQAaQBmAGkAYwBhAHQA\n" +
+        "ZQAgAGMAbwBuAHMAdABpAHQAdQB0AGUAcwAgAGEAYwBjAGUAcAB0AGEAbgBjAGUA\n" +
+        "IABvAGYAIAB0AGgAZQAgAEQAaQBnAGkAQwBlAHIAdAAgAEMAUAAvAEMAUABTACAA\n" +
+        "YQBuAGQAIAB0AGgAZQAgAFIAZQBsAHkAaQBuAGcAIABQAGEAcgB0AHkAIABBAGcA\n" +
+        "cgBlAGUAbQBlAG4AdAAgAHcAaABpAGMAaAAgAGwAaQBtAGkAdAAgAGwAaQBhAGIA\n" +
+        "aQBsAGkAdAB5ACAAYQBuAGQAIABhAHIAZQAgAGkAbgBjAG8AcgBwAG8AcgBhAHQA\n" +
+        "ZQBkACAAaABlAHIAZQBpAG4AIABiAHkAIAByAGUAZgBlAHIAZQBuAGMAZQAuMIGC\n" +
+        "BggrBgEFBQcBAQR2MHQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0\n" +
+        "LmNvbTBMBggrBgEFBQcwAoZAaHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0Rp\n" +
+        "Z2lDZXJ0QXNzdXJlZElEQ29kZVNpZ25pbmdDQS0xLmNydDAMBgNVHRMBAf8EAjAA\n" +
+        "MA0GCSqGSIb3DQEBBQUAA4IBAQAei1QmiXepje8OIfo/WonD4MIXgpPr2dfRaquQ\n" +
+        "A8q63OpTRSveyqdQDCSPpDRF/nvO1Y30yksZvIH1tNBsW5LBdxAKN3lFdBlqBwtE\n" +
+        "Q3jHc0KVVYRJ0FBaGE/PJHmRajscdAhYIcMPhTga0u0tDK+wOHEq3993dfl6yHjA\n" +
+        "XHU2iW5pnk75ZoE39zALD5eKXT8ZXrET5c3XUFJKWA+XuGmdmyzqo0Au49PanBv9\n" +
+        "UlZnabYfqoMArqMS0tGSX4cGgi9/2E+pHG9BX4sFW+ZDumroOA2pxyMWEKjxePEL\n" +
+        "zCOfhbsRWdMLYepauaNZOIMZXmFwcrIl0TGMkTAtATz+XmZc\n" +
+        "-----END CERTIFICATE-----");
+
     }
 }

From 32d71c7cb9536531d967d00980b6992d268b688f Mon Sep 17 00:00:00 2001
From: James Laskey <james.laskey@oracle.com>
Date: Fri, 8 Feb 2013 09:19:38 -0400
Subject: [PATCH 128/311] 8006222: Move slot from SpillProperty to Property

Reviewed-by: hannesw, lagergren
---
 .../codegen/objects/FieldObjectCreator.java   |   4 +-
 .../internal/codegen/objects/MapCreator.java  |  64 ++-------
 .../codegen/objects/ObjectCreator.java        |  28 ++--
 .../internal/objects/ScriptFunctionImpl.java  |   2 +-
 .../internal/runtime/AccessorProperty.java    | 110 +++++++++------
 .../internal/runtime/FindProperty.java        | 128 ++++--------------
 .../nashorn/internal/runtime/Property.java    |  53 ++++++--
 .../nashorn/internal/runtime/PropertyMap.java |   5 +-
 .../internal/runtime/ScriptObject.java        |  27 ++--
 .../internal/runtime/SpillProperty.java       |  35 +----
 .../runtime/UserAccessorProperty.java         |  18 +--
 .../internal/runtime/linker/Lookup.java       |   2 +-
 12 files changed, 187 insertions(+), 289 deletions(-)

diff --git a/nashorn/src/jdk/nashorn/internal/codegen/objects/FieldObjectCreator.java b/nashorn/src/jdk/nashorn/internal/codegen/objects/FieldObjectCreator.java
index f6e1c262b87..46219f05cd2 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/objects/FieldObjectCreator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/objects/FieldObjectCreator.java
@@ -75,7 +75,7 @@ public abstract class FieldObjectCreator<T> extends ObjectCreator {
      * @param symbols      symbols for fields in object
      * @param values       values (or null where no value) to be written to the fields
      * @param isScope      is this a scope object
-     * @param hasArguments does the created object have an "arguments" object
+     * @param hasArguments does the created object have an "arguments" property
      */
     public FieldObjectCreator(final CodeGenerator codegen, final List<String> keys, final List<Symbol> symbols, final List<T> values, final boolean isScope, final boolean hasArguments) {
         super(codegen, keys, symbols, isScope, hasArguments);
@@ -106,7 +106,7 @@ public abstract class FieldObjectCreator<T> extends ObjectCreator {
         if (isScope()) {
             loadScope(method);
 
-            if (isVarArg()) {
+            if (hasArguments()) {
                 method.loadArguments();
                 method.invoke(constructorNoLookup(getClassName(), PropertyMap.class, ScriptObject.class, ARGUMENTS.type()));
             } else {
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/objects/MapCreator.java b/nashorn/src/jdk/nashorn/internal/codegen/objects/MapCreator.java
index da3a47fc4b2..1696597b862 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/objects/MapCreator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/objects/MapCreator.java
@@ -25,20 +25,12 @@
 
 package jdk.nashorn.internal.codegen.objects;
 
-import static jdk.nashorn.internal.codegen.objects.ObjectClassGenerator.OBJECT_FIELDS_ONLY;
-import static jdk.nashorn.internal.codegen.objects.ObjectClassGenerator.PRIMITIVE_TYPE;
-import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
-
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.List;
-import jdk.nashorn.internal.codegen.types.Type;
 import jdk.nashorn.internal.ir.Symbol;
 import jdk.nashorn.internal.runtime.AccessorProperty;
 import jdk.nashorn.internal.runtime.Property;
 import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptObject;
 import jdk.nashorn.internal.runtime.arrays.ArrayIndex;
 
 /**
@@ -72,11 +64,11 @@ public class MapCreator {
     /**
      * Constructs a property map based on a set of fields.
      *
-     * @param isVarArg is this a vararg object map
+     * @param hasArguments does the created object have an "arguments" property
      *
      * @return New map populated with accessor properties.
      */
-    public PropertyMap makeMap(final boolean isVarArg) {
+    public PropertyMap makeMap(final boolean hasArguments) {
         final List<Property> properties = new ArrayList<>();
 
         assert keys != null;
@@ -86,63 +78,31 @@ public class MapCreator {
             final Symbol symbol = symbols[i];
 
             if (symbol != null && !ArrayIndex.isIndexKey(key)) {
-                final Property property = initHandle(key, symbol.getFieldIndex(), symbol, isVarArg);
-                properties.add(property);
+                properties.add(new AccessorProperty(key, getPropertyFlags(symbol, hasArguments), structure, symbol.getFieldIndex()));
             }
         }
 
         return PropertyMap.newMap(structure, properties);
     }
 
-    private Property initHandle(final String key, final int fieldIndex, final Symbol symbol, final boolean isVarArg) {
-        assert symbol != null;
-        final boolean isParam = symbol.isParam();
-
-        final String fieldNameObject    = ObjectClassGenerator.getFieldName(fieldIndex, Type.OBJECT);
-        final String fieldNamePrimitive = ObjectClassGenerator.getFieldName(fieldIndex, ObjectClassGenerator.PRIMITIVE_TYPE);
-
-        MethodHandle primitiveGetter = null;
-        MethodHandle primitiveSetter = null;
-        MethodHandle objectGetter;
-        MethodHandle objectSetter;
-
-        final MethodHandles.Lookup lookup = MethodHandles.lookup();
-
-        if (isParam && isVarArg) {
-            final MethodHandle arguments   = MH.getter(MethodHandles.lookup(), structure, "arguments", Object.class);
-            final MethodHandle argumentsSO = MH.asType(arguments, arguments.type().changeReturnType(ScriptObject.class));
-            objectGetter = MH.insertArguments(MH.filterArguments(ScriptObject.GET_ARGUMENT.methodHandle(), 0, argumentsSO), 1, fieldIndex);
-            objectSetter = MH.insertArguments(MH.filterArguments(ScriptObject.SET_ARGUMENT.methodHandle(), 0, argumentsSO), 1, fieldIndex);
-        } else {
-            objectGetter = MH.getter(lookup, structure, fieldNameObject, Type.OBJECT.getTypeClass());
-            objectSetter = MH.setter(lookup, structure, fieldNameObject, Type.OBJECT.getTypeClass());
-            if (!OBJECT_FIELDS_ONLY) {
-                primitiveGetter = MH.getter(lookup, structure, fieldNamePrimitive, PRIMITIVE_TYPE.getTypeClass());
-                primitiveSetter = MH.setter(lookup, structure, fieldNamePrimitive, PRIMITIVE_TYPE.getTypeClass());
-            }
-        }
-
-        return new AccessorProperty(key, getPropertyFlags(symbol, isVarArg), objectGetter, objectSetter, primitiveGetter, primitiveSetter);
-    }
-
     /**
      * Compute property flags given local state of a field. Maybe be overridden and extended,
      * as is the case in {@link ObjectMapCreator}
      *
-     * @param symbol   symbol to check
-     * @param isVarArg is this a vararg
+     * @param symbol       symbol to check
+     * @param hasArguments does the created object have an "arguments" property
      *
      * @return flags to use for fields
      */
-    protected int getPropertyFlags(final Symbol symbol, final boolean isVarArg) {
-        final boolean isParam = symbol.isParam();
+    protected int getPropertyFlags(final Symbol symbol, final boolean hasArguments) {
         int flags = 0;
 
-        if (isParam || isVarArg) {
-            flags |= Property.IS_ALWAYS_OBJECT;
-            if (isParam) {
-                flags |= Property.IS_PARAMETER;
-            }
+        if (symbol.isParam()) {
+            flags |= Property.IS_ALWAYS_OBJECT | Property.IS_PARAMETER;
+        }
+
+        if (hasArguments) {
+            flags |= Property.IS_ALWAYS_OBJECT | Property.HAS_ARGUMENTS;
         }
 
         if (symbol.isScope()) {
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectCreator.java b/nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectCreator.java
index 1b02aa06d2f..71c0b699da9 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectCreator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectCreator.java
@@ -52,7 +52,7 @@ public abstract class ObjectCreator {
     protected final CodeGenerator codegen;
 
     private   final boolean       isScope;
-    private   final boolean       isVarArg;
+    private   final boolean       hasArguments;
     private         int           fieldCount;
     private         int           paramCount;
     private         String        fieldObjectClassName;
@@ -62,19 +62,19 @@ public abstract class ObjectCreator {
     /**
      * Constructor
      *
-     * @param codegen  the code generator
-     * @param keys     the keys
-     * @param symbols  the symbols corresponding to keys, same index
-     * @param isScope  is this object scope
-     * @param isVarArg is this object var arg
+     * @param codegen      the code generator
+     * @param keys         the keys
+     * @param symbols      the symbols corresponding to keys, same index
+     * @param isScope      is this object scope
+     * @param hasArguments does the created object have an "arguments" property
      */
-    protected ObjectCreator(final CodeGenerator codegen, final List<String> keys, final List<Symbol> symbols, final boolean isScope, final boolean isVarArg) {
+    protected ObjectCreator(final CodeGenerator codegen, final List<String> keys, final List<Symbol> symbols, final boolean isScope, final boolean hasArguments) {
         this.codegen       = codegen;
         this.compileUnit   = codegen.getCurrentCompileUnit();
         this.keys          = keys;
         this.symbols       = symbols;
         this.isScope       = isScope;
-        this.isVarArg      = isVarArg;
+        this.hasArguments  = hasArguments;
 
         countFields();
         findClass();
@@ -86,7 +86,7 @@ public abstract class ObjectCreator {
     private void countFields() {
         for (final Symbol symbol : this.symbols) {
             if (symbol != null) {
-                if (isVarArg() && symbol.isParam()) {
+                if (hasArguments() && symbol.isParam()) {
                     symbol.setFieldIndex(paramCount++);
                 } else {
                     symbol.setFieldIndex(fieldCount++);
@@ -133,7 +133,7 @@ public abstract class ObjectCreator {
         if (keys.isEmpty()) { //empty map
             propertyMap = PropertyMap.newMap(fieldObjectClass);
         } else {
-            propertyMap = newMapCreator(fieldObjectClass).makeMap(isVarArg());
+            propertyMap = newMapCreator(fieldObjectClass).makeMap(hasArguments());
         }
         return propertyMap;
     }
@@ -167,10 +167,10 @@ public abstract class ObjectCreator {
     }
 
     /**
-     * Is this a vararg object
-     * @return true if vararg
+     * Does the created object have an "arguments" property
+     * @return true if has an "arguments" property
      */
-    protected boolean isVarArg() {
-        return isVarArg;
+    protected boolean hasArguments() {
+        return hasArguments;
     }
 }
diff --git a/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java b/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
index a3a6b33fd52..c84d8deab61 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
@@ -139,7 +139,7 @@ public class ScriptFunctionImpl extends ScriptFunction {
 
     // add a new property that throws TypeError on get as well as set
     static synchronized PropertyMap newThrowerProperty(final PropertyMap map, final String name, final int flags) {
-        return map.newProperty(name, flags, Lookup.TYPE_ERROR_THROWER_GETTER, Lookup.TYPE_ERROR_THROWER_SETTER);
+        return map.newProperty(name, flags, -1, Lookup.TYPE_ERROR_THROWER_GETTER, Lookup.TYPE_ERROR_THROWER_SETTER);
     }
 
     // property map for strict mode functions - lazily initialized
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/AccessorProperty.java b/nashorn/src/jdk/nashorn/internal/runtime/AccessorProperty.java
index dfa07dc2cd7..d10091ee4a7 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/AccessorProperty.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/AccessorProperty.java
@@ -29,6 +29,7 @@ import static jdk.nashorn.internal.codegen.objects.ObjectClassGenerator.ACCESSOR
 import static jdk.nashorn.internal.codegen.objects.ObjectClassGenerator.DEBUG_FIELDS;
 import static jdk.nashorn.internal.codegen.objects.ObjectClassGenerator.LOG;
 import static jdk.nashorn.internal.codegen.objects.ObjectClassGenerator.OBJECT_FIELDS_ONLY;
+import static jdk.nashorn.internal.codegen.objects.ObjectClassGenerator.PRIMITIVE_TYPE;
 import static jdk.nashorn.internal.codegen.objects.ObjectClassGenerator.createGetter;
 import static jdk.nashorn.internal.codegen.objects.ObjectClassGenerator.createGuardBoxedPrimitiveSetter;
 import static jdk.nashorn.internal.codegen.objects.ObjectClassGenerator.createSetter;
@@ -41,6 +42,7 @@ import static jdk.nashorn.internal.runtime.linker.MethodHandleFactory.stripName;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
+import jdk.nashorn.internal.codegen.objects.ObjectClassGenerator;
 import jdk.nashorn.internal.codegen.types.Type;
 import jdk.nashorn.internal.runtime.linker.Lookup;
 import jdk.nashorn.internal.runtime.linker.MethodHandleFactory;
@@ -89,49 +91,6 @@ public class AccessorProperty extends Property {
         }
     }
 
-    /**
-     * Constructor
-     *
-     * primitiveGetter and setter are only used in dual fields mode. Setting them to null also
-     * works in dual field mode, it only means that the property never has a primitive
-     * representation
-     *
-     * @param key              property key
-     * @param flags            property flags
-     * @param objectGetter     seed getter for object field
-     * @param objectSetter     seed setter for object field
-     * @param primitiveGetter  seed getter for primitive field (in dual field mode)
-     * @param primitiveSetter  seed setter for primitive field (in dual field mode)
-     */
-    public AccessorProperty(final String key, final int flags, final MethodHandle objectGetter, final MethodHandle objectSetter, final MethodHandle primitiveGetter, final MethodHandle primitiveSetter) {
-        super(key, flags);
-
-        this.objectGetter    = objectGetter;
-        this.objectSetter    = objectSetter;
-        this.primitiveGetter = primitiveGetter;
-        this.primitiveSetter = primitiveSetter;
-
-        Class<?> initialType = null;
-
-        if (OBJECT_FIELDS_ONLY || isAlwaysObject()) {
-            initialType = Object.class;
-        } else {
-            if (!canBePrimitive()) {
-                info(key + " cannot be primitive");
-                initialType = Object.class;
-            } else {
-                info(key + " CAN be primitive");
-                if (!canBeUndefined()) {
-                    info(key + " is always defined");
-                    initialType = int.class; //double works too for less type invalidation, but this requires experimentation, e.g. var x = 17; x += 2 will turn it into double now because of lack of range analysis
-                }
-            }
-        }
-
-        // is always object means "is never initialized to undefined, and always of object type
-        setCurrentType(initialType);
-    }
-
     /**
      * Delegate constructor. This is used when adding properties to the Global scope, which
      * is necessary for outermost levels in a script (the ScriptObject is represented by
@@ -161,11 +120,12 @@ public class AccessorProperty extends Property {
      *
      * @param key    the property key
      * @param flags  the property flags
+     * @param slot   the property field number or spill slot
      * @param getter the property getter
      * @param setter the property setter or null if non writable, non configurable
      */
-    public AccessorProperty(final String key, final int flags, final MethodHandle getter, final MethodHandle setter) {
-        super(key, flags);
+    public AccessorProperty(final String key, final int flags, final int slot, final MethodHandle getter, final MethodHandle setter) {
+        super(key, flags, slot);
 
         // we don't need to prep the setters these will never be invalidated as this is a nasgen
         // or known type getter/setter. No invalidations will take place
@@ -192,6 +152,66 @@ public class AccessorProperty extends Property {
         setCurrentType(getterType);
     }
 
+    /**
+     * Constructor for dual field AccessorPropertys.
+     *
+     * @param key              property key
+     * @param flags            property flags
+     * @param structure        structure for objects associated with this property
+     * @param slot             property field number or spill slot
+     */
+    public AccessorProperty(final String key, final int flags, final Class<?> structure, final int slot) {
+        super(key, flags, slot);
+
+        /*
+         *
+         * primitiveGetter and primitiveSetter are only used in dual fields mode. Setting them to null also
+         * works in dual field mode, it only means that the property never has a primitive
+         * representation.
+         */
+        primitiveGetter = null;
+        primitiveSetter = null;
+
+        final MethodHandles.Lookup lookup = MethodHandles.lookup();
+
+        if (isParameter() && hasArguments()) {
+            final MethodHandle arguments   = MH.getter(MethodHandles.lookup(), structure, "arguments", Object.class);
+            final MethodHandle argumentsSO = MH.asType(arguments, arguments.type().changeReturnType(ScriptObject.class));
+
+            objectGetter = MH.insertArguments(MH.filterArguments(ScriptObject.GET_ARGUMENT.methodHandle(), 0, argumentsSO), 1, slot);
+            objectSetter = MH.insertArguments(MH.filterArguments(ScriptObject.SET_ARGUMENT.methodHandle(), 0, argumentsSO), 1, slot);
+        } else {
+            final String fieldNameObject    = ObjectClassGenerator.getFieldName(slot, Type.OBJECT);
+            final String fieldNamePrimitive = ObjectClassGenerator.getFieldName(slot, ObjectClassGenerator.PRIMITIVE_TYPE);
+
+            objectGetter = MH.getter(lookup, structure, fieldNameObject, Type.OBJECT.getTypeClass());
+            objectSetter = MH.setter(lookup, structure, fieldNameObject, Type.OBJECT.getTypeClass());
+
+            if (!OBJECT_FIELDS_ONLY) {
+                primitiveGetter = MH.getter(lookup, structure, fieldNamePrimitive, PRIMITIVE_TYPE.getTypeClass());
+                primitiveSetter = MH.setter(lookup, structure, fieldNamePrimitive, PRIMITIVE_TYPE.getTypeClass());
+            }
+        }
+
+        Class<?> initialType = null;
+
+        if (OBJECT_FIELDS_ONLY || isAlwaysObject()) {
+            initialType = Object.class;
+        } else if (!canBePrimitive()) {
+            info(key + " cannot be primitive");
+            initialType = Object.class;
+        } else {
+            info(key + " CAN be primitive");
+            if (!canBeUndefined()) {
+                info(key + " is always defined");
+                initialType = int.class; //double works too for less type invalidation, but this requires experimentation, e.g. var x = 17; x += 2 will turn it into double now because of lack of range analysis
+            }
+        }
+
+        // is always object means "is never initialized to undefined, and always of object type
+        setCurrentType(initialType);
+    }
+
     /**
      * Copy constructor
      *
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/FindProperty.java b/nashorn/src/jdk/nashorn/internal/runtime/FindProperty.java
index 87efd9f6c45..7089d1f6872 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/FindProperty.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/FindProperty.java
@@ -34,53 +34,26 @@ import jdk.nashorn.internal.codegen.objects.ObjectClassGenerator;
  * This class represents the result from a find property search.
  */
 public final class FindProperty {
+    /** Object where search began. */
     private final ScriptObject self;
+    ;
+    /** Object where search finish. */
     private final ScriptObject prototype;
-    private final PropertyMap  map;
+
+    /** Found property. */
     private final Property     property;
-    private final int          depth;
-    private final boolean      isScope;
 
     /**
      * Constructor
      *
-     * @param self      script object where property was found
+     * @param self      script object where search began
      * @param prototype prototype where property was found, may be {@code self} if not inherited
-     * @param map       property map for script object
      * @param property  property that was search result
-     * @param depth     depth walked in property chain to find result
      */
-    public FindProperty(final ScriptObject self, final ScriptObject prototype, final PropertyMap map, final Property property, final int depth) {
+    public FindProperty(final ScriptObject self, final ScriptObject prototype, final Property property) {
         this.self      = self;
         this.prototype = prototype;
-        this.map       = map;
         this.property  = property;
-        this.depth     = depth;
-        this.isScope   = prototype.isScope();
-    }
-
-    /**
-     * Get ScriptObject for search
-     * @return script object
-     */
-    public ScriptObject getSelf() {
-        return self;
-    }
-
-    /**
-     * Get search depth
-     * @return depth
-     */
-    public int getDepth() {
-        return depth;
-    }
-
-    /**
-     * Get flags for property that was found
-     * @return property flags for property returned in {@link FindProperty#getProperty()}
-     */
-    public int getFlags() {
-        return property.getFlags();
     }
 
     /**
@@ -102,20 +75,33 @@ public final class FindProperty {
     }
 
     /**
-     * In certain properties, such as {@link UserAccessorProperty}, getter and setter functions
-     * are present. This function gets the getter function as a {@code ScriptFunction}
-     * @return getter function, or null if not present
+     * Ask for a setter that sets the given type. The type has nothing to do with the
+     * internal representation of the property. It may be an Object (boxing primitives) or
+     * a primitive (primitive fields with -Dnashorn.fields.dual=true)
+     * @see ObjectClassGenerator
+     *
+     * @param type type of setter, e.g. int.class if we want a function with {@code set(I)V} signature
+     * @param strict are we in strict mode
+     *
+     * @return method handle for the getter
      */
-    public ScriptFunction getGetterFunction() {
-        return property.getGetterFunction(getOwner());
+    public MethodHandle getSetter(final Class<?> type, final boolean strict) {
+        MethodHandle setter = property.getSetter(type, getOwner().getMap());
+        if (property instanceof UserAccessorProperty) {
+            final UserAccessorProperty uc = (UserAccessorProperty) property;
+            setter = MH.insertArguments(setter, 0, (isInherited() ? getOwner() : null),
+                    uc.getSetterSlot(), strict? property.getKey() : null);
+        }
+
+        return setter;
     }
 
     /**
-     * Return the property map where the property was found
-     * @return property map
+     * Return the {@code ScriptObject} owning of the property:  this means the prototype.
+     * @return owner of property
      */
-    public PropertyMap getMap() {
-        return map;
+    public ScriptObject getOwner() {
+        return prototype;
     }
 
     /**
@@ -148,62 +134,8 @@ public final class FindProperty {
      * @return true if on scope
      */
     public boolean isScope() {
-        return isScope;
+        return prototype.isScope();
     }
 
-    /**
-     * Return the {@code ScriptObject} owning of the property:  this means the prototype.
-     * @return owner of property
-     */
-    public ScriptObject getOwner() {
-        return prototype;
-    }
-
-    /**
-     * Ask for a setter that sets the given type. The type has nothing to do with the
-     * internal representation of the property. It may be an Object (boxing primitives) or
-     * a primitive (primitive fields with -Dnashorn.fields.dual=true)
-     * @see ObjectClassGenerator
-     *
-     * @param type type of setter, e.g. int.class if we want a function with {@code set(I)V} signature
-     * @param strict are we in strict mode
-     *
-     * @return method handle for the getter
-     */
-    public MethodHandle getSetter(final Class<?> type, final boolean strict) {
-        MethodHandle setter = property.getSetter(type, getOwner().getMap());
-        if (property instanceof UserAccessorProperty) {
-            final UserAccessorProperty uc = (UserAccessorProperty) property;
-            setter = MH.insertArguments(setter, 0, (isInherited() ? getOwner() : null),
-                    uc.getSetterSlot(), strict? property.getKey() : null);
-        }
-
-        return setter;
-    }
-
-    /**
-     * In certain properties, such as {@link UserAccessorProperty}, getter and setter functions
-     * are present. This function gets the setter function as a {@code ScriptFunction}
-     * @return setter function, or null if not present
-     */
-    public ScriptFunction getSetterFunction() {
-        return property.getSetterFunction(getOwner());
-    }
-
-    /**
-     * Check if the property found is configurable
-     * @return true if configurable
-     */
-    public boolean isConfigurable() {
-        return property.isConfigurable();
-    }
-
-    /**
-     * Check if the property found is writable
-     * @return true if writable
-     */
-    public boolean isWritable() {
-        return property.isWritable();
-    }
 }
 
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Property.java b/nashorn/src/jdk/nashorn/internal/runtime/Property.java
index ae46c7a720f..0c5cf3f1f37 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/Property.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Property.java
@@ -67,17 +67,20 @@ public abstract class Property {
     /** Is this a spill property? See {@link SpillProperty} */
     public static final int IS_SPILL         = 0b0000_0001_0000;
 
-    /** Is this a function parameter ? */
+    /** Is this a function parameter? */
     public static final int IS_PARAMETER     = 0b0000_0010_0000;
 
+    /** Is parameter accessed thru arguments? */
+    public static final int HAS_ARGUMENTS    = 0b0000_0100_0000;
+
     /** Is this property always represented as an Object? See {@link ObjectClassGenerator} and dual fields flag. */
-    public static final int IS_ALWAYS_OBJECT = 0b0000_0100_0000;
+    public static final int IS_ALWAYS_OBJECT = 0b0000_1000_0000;
 
     /** Can this property be primitive? */
-    public static final int CAN_BE_PRIMITIVE = 0b0000_1000_0000;
+    public static final int CAN_BE_PRIMITIVE = 0b0001_0000_0000;
 
     /** Can this property be undefined? */
-    public static final int CAN_BE_UNDEFINED = 0b0001_0000_0000;
+    public static final int CAN_BE_UNDEFINED = 0b0010_0000_0000;
 
     /** Property key. */
     private final String key;
@@ -85,15 +88,21 @@ public abstract class Property {
     /** Property flags. */
     protected int flags;
 
+    /** Property field number or spill slot */
+    private final int slot;
+
     /**
      * Constructor
      *
      * @param key   property key
      * @param flags property flags
+     * @param slot  property field number or spill slot
      */
-    public Property(final String key, final int flags) {
+    public Property(final String key, final int flags, final int slot) {
+        assert key != null;
         this.key   = key;
         this.flags = flags;
+        this.slot  = slot;
     }
 
     /**
@@ -104,6 +113,7 @@ public abstract class Property {
     protected Property(final Property property) {
         this.key   = property.key;
         this.flags = property.flags;
+        this.slot  = property.slot;
     }
 
     /**
@@ -214,6 +224,14 @@ public abstract class Property {
         return (flags & IS_PARAMETER) == IS_PARAMETER;
     }
 
+    /**
+     * Check whether this property is in an object with arguments field
+     * @return true if has arguments
+     */
+    public boolean hasArguments() {
+        return (flags & HAS_ARGUMENTS) == HAS_ARGUMENTS;
+    }
+
     /**
      * Check whether this is a spill property, i.e. one that will not
      * be stored in a specially generated field in the property class.
@@ -371,17 +389,17 @@ public abstract class Property {
     }
 
     /**
-     * Get the spill slot as described in {@link Property#getSpillCount()}.
-     * @return spill slot, -1 if none exists
+     * Get the field number or spill slot
+     * @return number/slot, -1 if none exists
      */
     public int getSlot() {
-        return -1;
+        return slot;
     }
 
     @Override
     public int hashCode() {
         final Class<?> type = getCurrentType();
-        return Objects.hashCode(this.key) ^ flags ^ (type == null ? 0 : type.hashCode());
+        return Objects.hashCode(this.key) ^ flags ^ getSlot() ^ (type == null ? 0 : type.hashCode());
     }
 
     @Override
@@ -390,17 +408,16 @@ public abstract class Property {
             return true;
         }
 
-        if (!(other instanceof Property)) {
+        if (other == null || this.getClass() != other.getClass()) {
             return false;
         }
 
         final Property otherProperty = (Property)other;
-        final Object otherKey = otherProperty.key;
-        final Class<?> otherType = otherProperty.getCurrentType();
 
-        return flags == otherProperty.flags &&
-               (key == null ? otherKey == null : key.equals(otherKey)) &&
-               (getCurrentType() == otherType);
+        return getFlags()       == otherProperty.getFlags() &&
+               getSlot()        == otherProperty.getSlot() &&
+               getCurrentType() == otherProperty.getCurrentType() &&
+               getKey().equals(otherProperty.getKey());
     }
 
     @Override
@@ -417,6 +434,12 @@ public abstract class Property {
             append(type == null ? "UNDEFINED" : Type.typeFor(type).getDescriptor()).
             append('}');
 
+        if (slot != -1) {
+            sb.append('[');
+            sb.append(slot);
+            sb.append(']');
+        }
+
         return sb.toString();
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java b/nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java
index 0864b1c40c4..9a99c74d08b 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java
@@ -271,13 +271,14 @@ public final class PropertyMap implements Iterable<Object>, PropertyListener {
      *
      * @param key           {@link Property} key.
      * @param propertyFlags {@link Property} flags.
+     * @param slot          {@link Property} slot.
      * @param getter        {@link Property} get accessor method.
      * @param setter        {@link Property} set accessor method.
      *
      * @return  New {@link PropertyMap} with {@link AccessorProperty} added.
      */
-    public PropertyMap newProperty(final String key, final int propertyFlags, final MethodHandle getter, final MethodHandle setter) {
-        return newProperty(new AccessorProperty(key, propertyFlags, getter, setter));
+    public PropertyMap newProperty(final String key, final int propertyFlags, final int slot, final MethodHandle getter, final MethodHandle setter) {
+        return newProperty(new AccessorProperty(key, propertyFlags, slot, getter, setter));
     }
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
index 8c1076285f6..c12ec723a39 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
@@ -650,24 +650,23 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
      * @return FindPropertyData or null if not found.
      */
     public final FindProperty findProperty(final String key, final boolean deep, final boolean stopOnNonScope) {
-        int depth = 0;
-
         for (ScriptObject self = this; self != null; self = self.getProto()) {
             // if doing deep search, stop search on the first non-scope object if asked to do so
-            if (stopOnNonScope && depth != 0 && !self.isScope()) {
-                break;
+            if (stopOnNonScope && self != this && !self.isScope()) {
+                return null;
             }
+
             final PropertyMap selfMap  = self.getMap();
             final Property    property = selfMap.findProperty(key);
 
             if (property != null) {
-                return new FindProperty(this, self, selfMap, property, depth);
-            } else if (!deep) {
-                return null;
+                return new FindProperty(this, self, property);
             }
 
-            depth++;
-        }
+            if (!deep) {
+                return null;
+            }
+         }
 
         return null;
     }
@@ -999,7 +998,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
      * @return Value of property.
      */
     public final Object getWithProperty(final Property property) {
-        return getObjectValue(new FindProperty(this, this, getMap(), property, 0));
+        return getObjectValue(new FindProperty(this, this, property));
     }
 
     /**
@@ -1793,7 +1792,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
         // If it's not a scope search, then we don't want any inherited properties except those with user defined accessors.
         if (!scope && find != null && find.isInherited() && !(find.getProperty() instanceof UserAccessorProperty)) {
             // We should still check if inherited data property is not writable
-            if (isExtensible() && !find.isWritable()) {
+            if (isExtensible() && !find.getProperty().isWritable()) {
                 return createEmptySetMethod(desc, "property.not.writable", false);
             }
             // Otherwise, forget the found property
@@ -1801,7 +1800,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
         }
 
         if (find != null) {
-            if(!find.isWritable()) {
+            if(!find.getProperty().isWritable()) {
                 // Existing, non-writable property
                 return createEmptySetMethod(desc, "property.not.writable", true);
             }
@@ -2617,7 +2616,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
         MethodHandle setter;
 
         if (f != null) {
-            if (!f.isWritable()) {
+            if (!f.getProperty().isWritable()) {
                 if (strict) {
                     typeError("property.not.writable", key, ScriptRuntime.safeToString(this));
                 }
@@ -3120,7 +3119,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
             return true;
         }
 
-        if (!find.isConfigurable()) {
+        if (!find.getProperty().isConfigurable()) {
             if (strict) {
                 typeError("cant.delete.property", propName, ScriptRuntime.safeToString(this));
             }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/SpillProperty.java b/nashorn/src/jdk/nashorn/internal/runtime/SpillProperty.java
index 98e04de0067..90f5f8bfc1f 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/SpillProperty.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/SpillProperty.java
@@ -42,9 +42,6 @@ import jdk.nashorn.internal.runtime.linker.Lookup;
 public final class SpillProperty extends AccessorProperty {
     private static final MethodHandle SPILLGETTER = MH.asType(MH.getter(MethodHandles.lookup(), ScriptObject.class, "spill", Object[].class), Lookup.GET_OBJECT_TYPE);
 
-    /** Property slot in spill */
-    private final int slot;
-
     /**
      * Constructor
      *
@@ -55,14 +52,11 @@ public final class SpillProperty extends AccessorProperty {
      * @param setter setter for property, or null if not configurable and writable
      */
     public SpillProperty(final String key, final int flags, final int slot, final MethodHandle getter, final MethodHandle setter) {
-        super(key, flags, getter, setter);
-        this.slot = slot;
+        super(key, flags, slot, getter, setter);
     }
 
     private SpillProperty(final SpillProperty property) {
         super(property);
-
-        this.slot = property.slot;
     }
 
     @Override
@@ -88,31 +82,4 @@ public final class SpillProperty extends AccessorProperty {
         return super.getSetter(type, currentMap);
     }
 
-    @Override
-    public int getSlot() {
-        return slot;
-    }
-
-    @Override
-    public String toString() {
-        return super.toString() + '[' + slot + ']';
-    }
-
-    @Override
-    public int hashCode() {
-        return super.hashCode() ^ slot;
-    }
-
-    @Override
-    public boolean equals(final Object other) {
-        if (this == other) {
-            return true;
-        }
-
-        if (other instanceof SpillProperty) {
-            return super.equals(other) && slot == ((SpillProperty) other).slot;
-        }
-
-        return false;
-    }
 }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/UserAccessorProperty.java b/nashorn/src/jdk/nashorn/internal/runtime/UserAccessorProperty.java
index 6bb053a1036..c4c6f60e511 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/UserAccessorProperty.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/UserAccessorProperty.java
@@ -60,7 +60,7 @@ public final class UserAccessorProperty extends Property {
      * @param setterSlot setter slot, starting at first embed
      */
     public UserAccessorProperty(final String key, final int flags, final int getterSlot, final int setterSlot) {
-        super(key, flags);
+        super(key, flags, -1);
         this.getterSlot = getterSlot;
         this.setterSlot = setterSlot;
     }
@@ -95,17 +95,13 @@ public final class UserAccessorProperty extends Property {
 
     @Override
     public boolean equals(final Object other) {
-        if (this == other) {
-            return true;
+        if (!super.equals(other)) {
+            return false;
         }
 
-        if (other instanceof UserAccessorProperty) {
-            final UserAccessorProperty uc = (UserAccessorProperty) other;
-            return super.equals(other) && getterSlot == uc.getterSlot && setterSlot == uc.setterSlot;
-        }
-
-        return false;
-    }
+        final UserAccessorProperty uc = (UserAccessorProperty) other;
+        return getterSlot == uc.getterSlot && setterSlot == uc.setterSlot;
+     }
 
     @Override
     public int hashCode() {
@@ -158,6 +154,6 @@ public final class UserAccessorProperty extends Property {
     public ScriptFunction getSetterFunction(final ScriptObject obj) {
         final Object value = obj.getEmbedOrSpill(setterSlot);
         return (value instanceof ScriptFunction) ? (ScriptFunction) value : null;
-
     }
+
 }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/Lookup.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/Lookup.java
index 44f195ad2d0..c47a0f7984c 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/Lookup.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/Lookup.java
@@ -160,7 +160,7 @@ public final class Lookup {
             throw new IllegalArgumentException("getter/setter has wrong arguments");
         }
 
-        return map.newProperty(key, flags, getter, setter);
+        return map.newProperty(key, flags, -1, getter, setter);
     }
 
     /**

From 710f06674d267cb32a1321532a58b8f68e0eff26 Mon Sep 17 00:00:00 2001
From: Attila Szegedi <attila@openjdk.org>
Date: Sat, 9 Feb 2013 16:58:48 +0100
Subject: [PATCH 129/311] 8006943: Fix order of function method arguments to be
 (callee, thisObject)

Reviewed-by: jlaskey, lagergren
---
 .../jdk/nashorn/internal/codegen/Attr.java    |   2 +-
 .../internal/codegen/CodeGenerator.java       |  14 +-
 .../internal/codegen/CompilerConstants.java   |  13 +-
 .../internal/codegen/FunctionSignature.java   |  34 ++--
 .../internal/codegen/MethodEmitter.java       |  23 ++-
 .../codegen/objects/ObjectClassGenerator.java |  12 +-
 .../internal/codegen/types/ObjectType.java    |   5 -
 .../internal/objects/ScriptFunctionImpl.java  |   3 +-
 .../jdk/nashorn/internal/runtime/Context.java |   4 +-
 .../internal/runtime/ScriptFunction.java      | 175 +++++++++++-------
 .../internal/runtime/ScriptFunctionData.java  |  43 +++--
 11 files changed, 196 insertions(+), 132 deletions(-)

diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Attr.java b/nashorn/src/jdk/nashorn/internal/codegen/Attr.java
index 9c2c6fb34f6..bb0f3a2e95a 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Attr.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Attr.java
@@ -237,8 +237,8 @@ final class Attr extends NodeOperatorVisitor {
 
         functionNode.setFrame(functionNode.pushFrame());
 
-        initThis(functionNode);
         initCallee(functionNode);
+        initThis(functionNode);
         if (functionNode.isVarArg()) {
             initVarArg(functionNode);
         }
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
index 1f3e9675516..c8742e67772 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
@@ -650,16 +650,16 @@ public final class CodeGenerator extends NodeOperatorVisitor {
 
                 final String signature = new FunctionSignature(true, callee.needsCallee(), callee.getReturnType(), isVarArg ? null : callee.getParameters()).toString();
 
+                if (callee.needsCallee()) {
+                    new FunctionObjectCreator(CodeGenerator.this, callee).makeObject(method);
+                }
+
                 if (callee.isStrictMode()) { // self is undefined
                     method.loadUndefined(Type.OBJECT);
                 } else { // get global from scope (which is the self)
                     globalInstance();
                 }
 
-                if (callee.needsCallee()) { // TODO: always true
-                    new FunctionObjectCreator(CodeGenerator.this, callee).makeObject(method); // TODO: if callee not needed, function object is used only to pass scope (could be optimized). if neither the scope nor the function object is needed by the callee, we can pass null instead.
-                }
-
                 loadArgs(args, signature, isVarArg, argCount);
                 method.invokeStatic(callee.getCompileUnit().getUnitClassName(), callee.getName(), signature);
                 assert method.peekType().equals(callee.getReturnType()) : method.peekType() + " != " + callee.getReturnType();
@@ -1646,8 +1646,8 @@ public final class CodeGenerator extends NodeOperatorVisitor {
         final Class<?>   rtype  = fn.getReturnType().getTypeClass();
         final boolean needsArguments = fn.needsArguments();
         final Class<?>[] ptypes = needsArguments ?
-                new Class<?>[] {Object.class, ScriptFunction.class, ScriptObject.class, Object.class} :
-                new Class<?>[] {Object.class, ScriptFunction.class, ScriptObject.class};
+                new Class<?>[] {ScriptFunction.class, Object.class, ScriptObject.class, Object.class} :
+                new Class<?>[] {ScriptFunction.class, Object.class, ScriptObject.class};
 
         setCurrentCompileUnit(splitCompileUnit);
         splitNode.setCompileUnit(splitCompileUnit);
@@ -1669,12 +1669,12 @@ public final class CodeGenerator extends NodeOperatorVisitor {
         splitNode.setMethodEmitter(method);
 
         final MethodEmitter caller = splitNode.getCaller();
-        caller.loadThis();
         if(fn.needsCallee()) {
             caller.loadCallee();
         } else {
             caller.loadNull();
         }
+        caller.loadThis();
         caller.loadScope();
         if (needsArguments) {
             caller.loadArguments();
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CompilerConstants.java b/nashorn/src/jdk/nashorn/internal/codegen/CompilerConstants.java
index a77bd0b53f5..68bafc20704 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/CompilerConstants.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CompilerConstants.java
@@ -82,8 +82,12 @@ public enum CompilerConstants {
     /** method name for Java method that is script entry point */
     RUN_SCRIPT("runScript"),
 
-    /** this name and slot */
-    THIS("this", 0),
+    /**
+     * "this" name symbol for a parameter representing ECMAScript "this" in static methods that are compiled
+     * representations of ECMAScript functions. It is not assigned a slot, as its position in the method signature is
+     * dependent on other factors (most notably, callee can precede it).
+     */
+    THIS("this"),
 
     /** this debugger symbol */
     THIS_DEBUGGER("__this__"),
@@ -95,7 +99,7 @@ public enum CompilerConstants {
     SCRIPT_RETURN("__return__"),
 
     /** the callee value variable when necessary */
-    CALLEE("__callee__", ScriptFunction.class, 1),
+    CALLEE("__callee__", ScriptFunction.class),
 
     /** the varargs variable when necessary */
     VARARGS("__varargs__"),
@@ -127,6 +131,9 @@ public enum CompilerConstants {
     /** prefix for regexps */
     REGEX_PREFIX("$regex"),
 
+    /** "this" used in non-static Java methods; always in slot 0 */
+    JAVA_THIS("this", 0),
+
     /** init scope */
     INIT_SCOPE("$scope", 2),
 
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/FunctionSignature.java b/nashorn/src/jdk/nashorn/internal/codegen/FunctionSignature.java
index 818c7129156..7bb7747e547 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/FunctionSignature.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/FunctionSignature.java
@@ -25,9 +25,6 @@
 
 package jdk.nashorn.internal.codegen;
 
-import static jdk.nashorn.internal.codegen.CompilerConstants.CALLEE;
-import static jdk.nashorn.internal.codegen.CompilerConstants.THIS;
-
 import java.util.List;
 import jdk.nashorn.internal.codegen.types.Type;
 import jdk.nashorn.internal.ir.FunctionNode;
@@ -99,34 +96,31 @@ public final class FunctionSignature {
             count    = isVarArg ? 1 : argTypes.length;
         }
 
-        int first = 0;
-
-        if (hasSelf) {
-            count++;
-            first++;
-        }
         if (hasCallee) {
             count++;
-            first++;
+        }
+        if (hasSelf) {
+            count++;
         }
 
         paramTypes = new Type[count];
 
-        if (hasSelf) {
-            paramTypes[THIS.slot()] = Type.OBJECT;
-        }
+        int next = 0;
         if (hasCallee) {
-            paramTypes[CALLEE.slot()] = Type.typeFor(ScriptFunction.class);
+            paramTypes[next++] = Type.typeFor(ScriptFunction.class);
+        }
+
+        if (hasSelf) {
+            paramTypes[next++] = Type.OBJECT;
         }
 
         if (isVarArg) {
-            paramTypes[first] = Type.OBJECT_ARRAY;
+            paramTypes[next] = Type.OBJECT_ARRAY;
         } else if (argTypes != null) {
-            for (int i = first, j = 0; i < count; i++, j++) {
-                paramTypes[i] = argTypes[j];
-                if (paramTypes[i].isObject()) {
-                    paramTypes[i] = Type.OBJECT; //TODO: for now, turn java/lang/String into java/lang/Object as we aren't as specific.
-                }
+            for (int j = 0; next < count;) {
+                final Type type = argTypes[j++];
+                // TODO: for now, turn java/lang/String into java/lang/Object as we aren't as specific.
+                paramTypes[next++] = type.isObject() ? Type.OBJECT : type;
             }
         } else {
             assert false : "isVarArgs cannot be false when argTypes are null";
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java b/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java
index e87468bacc9..8553f9a9dd7 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java
@@ -831,7 +831,8 @@ public class MethodEmitter implements Emitter {
         if (symbol.hasSlot()) {
             final int slot = symbol.getSlot();
             debug("load symbol", symbol.getName(), " slot=", slot);
-            pushType(symbol.getSymbolType().load(method, slot));
+            final Type type = symbol.getSymbolType().load(method, slot);
+            pushType(type == Type.OBJECT && symbol.isThis() ? Type.THIS : type);
         } else if (symbol.isParam()) {
             assert !symbol.isScope();
             assert functionNode.isVarArg() : "Non-vararg functions have slotted parameters";
@@ -865,10 +866,21 @@ public class MethodEmitter implements Emitter {
      */
     public MethodEmitter load(final Type type, final int slot) {
         debug("explicit load", type, slot);
-        pushType(type.load(method, slot));
+        final Type loadType = type.load(method, slot);
+        pushType(loadType == Type.OBJECT && isThisSlot(slot) ? Type.THIS : loadType);
         return this;
     }
 
+    private boolean isThisSlot(final int slot) {
+        if(functionNode == null) {
+            return slot == CompilerConstants.JAVA_THIS.slot();
+        }
+        final int thisSlot = functionNode.getThisNode().getSymbol().getSlot();
+        assert !functionNode.needsCallee() || thisSlot == 1; // needsCallee -> thisSlot == 1
+        assert functionNode.needsCallee() || thisSlot == 0; // !needsCallee -> thisSlot == 0
+        return slot == thisSlot;
+    }
+
     /**
      * Push the this object to the stack.
      *
@@ -949,10 +961,11 @@ public class MethodEmitter implements Emitter {
      * @return the method emitter
      */
     public MethodEmitter loadCallee() {
-        debug("load callee " + functionNode.getCalleeNode().getSymbol());
-        assert functionNode.getCalleeNode().getSymbol().getSlot() != 0 : "callee has wrong slot " + functionNode.getCalleeNode().getSymbol().getSlot() + " in " + functionNode.getName();
+        final Symbol calleeSymbol = functionNode.getCalleeNode().getSymbol();
+        debug("load callee ", calleeSymbol);
+        assert calleeSymbol.getSlot() == 0 : "callee has wrong slot " + calleeSymbol.getSlot() + " in " + functionNode.getName();
 
-        return load(functionNode.getCalleeNode().getSymbol());
+        return load(calleeSymbol);
     }
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectClassGenerator.java b/nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectClassGenerator.java
index 813152b8ba7..3c69687ae4d 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectClassGenerator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectClassGenerator.java
@@ -29,9 +29,9 @@ import static jdk.nashorn.internal.codegen.Compiler.SCRIPTS_PACKAGE;
 import static jdk.nashorn.internal.codegen.CompilerConstants.ALLOCATE;
 import static jdk.nashorn.internal.codegen.CompilerConstants.INIT_ARGUMENTS;
 import static jdk.nashorn.internal.codegen.CompilerConstants.INIT_SCOPE;
+import static jdk.nashorn.internal.codegen.CompilerConstants.JAVA_THIS;
 import static jdk.nashorn.internal.codegen.CompilerConstants.JS_OBJECT_PREFIX;
 import static jdk.nashorn.internal.codegen.CompilerConstants.MAP;
-import static jdk.nashorn.internal.codegen.CompilerConstants.THIS;
 import static jdk.nashorn.internal.codegen.CompilerConstants.className;
 import static jdk.nashorn.internal.codegen.CompilerConstants.constructorNoLookup;
 import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
@@ -251,7 +251,7 @@ public final class ObjectClassGenerator {
         // always initialize fields to undefined, even with --dual-fields. Then it's ok to
         // remember things like "widest set type" in properties, and if it's object, don't
         // add any special "return undefined" getters, saving an invalidation
-        init.load(Type.OBJECT, THIS.slot());
+        init.load(Type.OBJECT, JAVA_THIS.slot());
         init.loadUndefined(Type.OBJECT);
 
         final Iterator<String> iter = fieldNames.iterator();
@@ -387,7 +387,7 @@ public final class ObjectClassGenerator {
     private static MethodEmitter newInitMethod(final ClassEmitter classEmitter) {
         final MethodEmitter init = classEmitter.init(PropertyMap.class);
         init.begin();
-        init.load(Type.OBJECT, THIS.slot());
+        init.load(Type.OBJECT, JAVA_THIS.slot());
         init.load(Type.OBJECT, MAP.slot());
         init.invoke(constructorNoLookup(ScriptObject.class, PropertyMap.class));
 
@@ -402,7 +402,7 @@ public final class ObjectClassGenerator {
     private static MethodEmitter newInitScopeMethod(final ClassEmitter classEmitter) {
         final MethodEmitter init = classEmitter.init(PropertyMap.class, ScriptObject.class);
         init.begin();
-        init.load(Type.OBJECT, THIS.slot());
+        init.load(Type.OBJECT, JAVA_THIS.slot());
         init.load(Type.OBJECT, MAP.slot());
         init.load(Type.OBJECT, INIT_SCOPE.slot());
         init.invoke(constructorNoLookup(FunctionScope.class, PropertyMap.class, ScriptObject.class));
@@ -418,7 +418,7 @@ public final class ObjectClassGenerator {
     private static MethodEmitter newInitScopeWithArgumentsMethod(final ClassEmitter classEmitter) {
         final MethodEmitter init = classEmitter.init(PropertyMap.class, ScriptObject.class, Object.class);
         init.begin();
-        init.load(Type.OBJECT, THIS.slot());
+        init.load(Type.OBJECT, JAVA_THIS.slot());
         init.load(Type.OBJECT, MAP.slot());
         init.load(Type.OBJECT, INIT_SCOPE.slot());
         init.load(Type.OBJECT, INIT_ARGUMENTS.slot());
@@ -436,7 +436,7 @@ public final class ObjectClassGenerator {
     private static void newEmptyInit(final ClassEmitter classEmitter, final String className) {
         final MethodEmitter emptyInit = classEmitter.init();
         emptyInit.begin();
-        emptyInit.load(Type.OBJECT, THIS.slot());
+        emptyInit.load(Type.OBJECT, JAVA_THIS.slot());
         emptyInit.loadNull();
         emptyInit.invoke(constructorNoLookup(className, PropertyMap.class));
         emptyInit.returnVoid();
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/ObjectType.java b/nashorn/src/jdk/nashorn/internal/codegen/types/ObjectType.java
index 05fd21f1e75..cb2f876bfc2 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/types/ObjectType.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/types/ObjectType.java
@@ -74,11 +74,6 @@ class ObjectType extends Type {
     public Type load(final MethodVisitor method, final int slot) {
         assert slot != -1;
         method.visitVarInsn(ALOAD, slot);
-
-        if (slot == CompilerConstants.THIS.slot()) {
-            return Type.THIS;
-        }
-
         return Type.OBJECT;
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java b/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
index c84d8deab61..f3b4a665908 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
@@ -30,13 +30,12 @@ import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
-
-import jdk.nashorn.internal.runtime.ScriptFunctionData;
 import jdk.nashorn.internal.codegen.objects.FunctionObjectCreator;
 import jdk.nashorn.internal.runtime.GlobalFunctions;
 import jdk.nashorn.internal.runtime.Property;
 import jdk.nashorn.internal.runtime.PropertyMap;
 import jdk.nashorn.internal.runtime.ScriptFunction;
+import jdk.nashorn.internal.runtime.ScriptFunctionData;
 import jdk.nashorn.internal.runtime.ScriptObject;
 import jdk.nashorn.internal.runtime.ScriptRuntime;
 import jdk.nashorn.internal.runtime.linker.Lookup;
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Context.java b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
index 6e04247b18d..46a3a7b7197 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/Context.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
@@ -886,8 +886,8 @@ public final class Context {
                     RUN_SCRIPT.tag(),
                     MH.type(
                         Object.class,
-                        Object.class,
-                        ScriptFunction.class));
+                        ScriptFunction.class,
+                        Object.class));
 
         boolean strict;
 
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
index 2fbe3ee0cf5..4542c8f7ebd 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
@@ -210,7 +210,7 @@ public abstract class ScriptFunction extends ScriptObject {
 
         if (data.isVarArg()) {
             if (data.needsCallee()) {
-                return invoker.invokeExact(selfObj, this, args);
+                return invoker.invokeExact(this, selfObj, args);
             }
             return invoker.invokeExact(selfObj, args);
         }
@@ -219,15 +219,15 @@ public abstract class ScriptFunction extends ScriptObject {
         if (data.needsCallee()) {
             switch (paramCount) {
             case 2:
-                return invoker.invokeExact(selfObj, this);
+                return invoker.invokeExact(this, selfObj);
             case 3:
-                return invoker.invokeExact(selfObj, this, getArg(args, 0));
+                return invoker.invokeExact(this, selfObj, getArg(args, 0));
             case 4:
-                return invoker.invokeExact(selfObj, this, getArg(args, 0), getArg(args, 1));
+                return invoker.invokeExact(this, selfObj, getArg(args, 0), getArg(args, 1));
             case 5:
-                return invoker.invokeExact(selfObj, this, getArg(args, 0), getArg(args, 1), getArg(args, 2));
+                return invoker.invokeExact(this, selfObj, getArg(args, 0), getArg(args, 1), getArg(args, 2));
             default:
-                return invoker.invokeWithArguments(withArguments(selfObj, this, paramCount, args));
+                return invoker.invokeWithArguments(withArguments(selfObj, paramCount, args));
             }
         }
 
@@ -241,7 +241,7 @@ public abstract class ScriptFunction extends ScriptObject {
         case 4:
             return invoker.invokeExact(selfObj, getArg(args, 0), getArg(args, 1), getArg(args, 2));
         default:
-            return invoker.invokeWithArguments(withArguments(selfObj, null, paramCount, args));
+            return invoker.invokeWithArguments(withArguments(selfObj, paramCount, args));
         }
     }
 
@@ -264,7 +264,7 @@ public abstract class ScriptFunction extends ScriptObject {
         final MethodHandle constructor = data.getGenericConstructor();
         if (data.isVarArg()) {
             if (data.needsCallee()) {
-                return constructor.invokeExact(self, this, args);
+                return constructor.invokeExact(this, self, args);
             }
             return constructor.invokeExact(self, args);
         }
@@ -273,15 +273,15 @@ public abstract class ScriptFunction extends ScriptObject {
         if (data.needsCallee()) {
             switch (paramCount) {
             case 2:
-                return constructor.invokeExact(self, this);
+                return constructor.invokeExact(this, self);
             case 3:
-                return constructor.invokeExact(self, this, getArg(args, 0));
+                return constructor.invokeExact(this, self, getArg(args, 0));
             case 4:
-                return constructor.invokeExact(self, this, getArg(args, 0), getArg(args, 1));
+                return constructor.invokeExact(this, self, getArg(args, 0), getArg(args, 1));
             case 5:
-                return constructor.invokeExact(self, this, getArg(args, 0), getArg(args, 1), getArg(args, 2));
+                return constructor.invokeExact(this, self, getArg(args, 0), getArg(args, 1), getArg(args, 2));
             default:
-                return constructor.invokeWithArguments(withArguments(self, this, args));
+                return constructor.invokeWithArguments(withArguments(self, args));
             }
         }
 
@@ -295,31 +295,30 @@ public abstract class ScriptFunction extends ScriptObject {
         case 4:
             return constructor.invokeExact(self, getArg(args, 0), getArg(args, 1), getArg(args, 2));
         default:
-            return constructor.invokeWithArguments(withArguments(self, null, args));
+            return constructor.invokeWithArguments(withArguments(self, args));
         }
     }
 
-    private static Object[] withArguments(final Object self, final ScriptFunction function, final Object... args) {
-        return withArguments(self, function, args.length + (function == null ? 1 : 2), args); // + 2 to include self and function
+    private Object[] withArguments(final Object self, final Object[] args) {
+        return withArguments(self, args.length + (data.needsCallee() ? 2 : 1), args);
     }
 
-    private static Object[] withArguments(final Object self, final ScriptFunction function, final int paramCount, final Object... args) {
-        final Object[] finalArgs = new Object[paramCount];
+    private Object[] withArguments(final Object self, final int argCount, final Object[] args) {
+        final Object[] finalArgs = new Object[argCount];
 
-        finalArgs[0] = self;
-        int nextArg = 1;
-        if (function != null) {
-            finalArgs[nextArg++] = function;
+        int nextArg = 0;
+        if (data.needsCallee()) {
+            finalArgs[nextArg++] = this;
         }
+        finalArgs[nextArg++] = self;
 
-        //don't add more args that there is paramcount in the handle (including self)
-        final int maxArgs = Math.min(args.length, paramCount - (function == null ? 1 : 2));
-        for (int i = 0; i < maxArgs;) {
+        // Don't add more args that there is argCount in the handle (including self and callee).
+        for (int i = 0; i < args.length && nextArg < argCount;) {
             finalArgs[nextArg++] = args[i++];
         }
 
-        //if we have fewer params than paramcount, pad undefined
-        while (nextArg < paramCount) {
+        // If we have fewer args than argCount, pad with undefined.
+        while (nextArg < argCount) {
             finalArgs[nextArg++] = UNDEFINED;
         }
 
@@ -512,10 +511,18 @@ public abstract class ScriptFunction extends ScriptObject {
      * @return bound invoke handle
      */
     public final MethodHandle getBoundInvokeHandle(final ScriptObject self) {
-        final MethodHandle bound = MH.bindTo(getInvokeHandle(), self);
-        return data.needsCallee() ? MH.bindTo(bound, this) : bound;
+        return MH.bindTo(bindToCalleeIfNeeded(getInvokeHandle()), self);
     }
 
+    /**
+     * Bind the method handle to this {@code ScriptFunction} instance if it needs a callee parameter. If this function's
+     * method handles don't have a callee parameter, the handle is returned unchanged.
+     * @param methodHandle the method handle to potentially bind to this function instance.
+     * @return the potentially bound method handle
+     */
+    private MethodHandle bindToCalleeIfNeeded(final MethodHandle methodHandle) {
+        return data.needsCallee() ? MH.bindTo(methodHandle, this) : methodHandle;
+    }
 
     /**
      * Get the construct handle - the most generic (and if no specializations are in place, only) constructor
@@ -524,7 +531,7 @@ public abstract class ScriptFunction extends ScriptObject {
      * @param type type for wanted constructor
      * @return construct handle
      */
-    public final MethodHandle getConstructHandle(final MethodType type) {
+    private final MethodHandle getConstructHandle(final MethodType type) {
         return candidateWithLowestWeight(type, getConstructHandle(), data.getConstructSpecializations());
     }
 
@@ -537,8 +544,8 @@ public abstract class ScriptFunction extends ScriptObject {
     }
 
     /**
-     * Set a method handle to the constructor for this function
-     * @param constructHandle constructor handle
+     * Set a method handle to the constructor for this function.
+     * @param constructHandle constructor handle. Can be null to prevent the function from being used as a constructor.
      */
     public final void setConstructHandle(final MethodHandle constructHandle) {
         data.setConstructor(constructHandle);
@@ -674,7 +681,11 @@ public abstract class ScriptFunction extends ScriptObject {
 
     @Override
     protected GuardedInvocation findNewMethod(final CallSiteDescriptor desc) {
+        // Call site type is (callee, args...) - dyn:new doesn't specify a "this", it's our job to allocate it
         final MethodType type = desc.getMethodType();
+
+        // Constructor arguments are either (callee, this, args...) or (this, args...), depending on whether it needs a
+        // callee or not.
         MethodHandle constructor = getConstructHandle(type);
 
         if (constructor == null) {
@@ -682,18 +693,30 @@ public abstract class ScriptFunction extends ScriptObject {
             return null;
         }
 
+        // If it was (callee, this, args...), permute it to (this, callee, args...). We're doing this because having
+        // "this" in the first argument position is what allows the elegant folded composition of
+        // (newFilter x constructor x allocator) further down below in the code.
+        constructor = swapCalleeAndThis(constructor);
+
         final MethodType ctorType = constructor.type();
-
-        // guard against primitive constructor return types
-        constructor = MH.asType(constructor, constructor.type().changeReturnType(Object.class));
-
-        // apply new filter
-        final Class<?>[] ctorArgs = ctorType.dropParameterTypes(0, 1).parameterArray(); // drop self
+        // Drop constructor "this", so it's also captured as "allocation" parameter of newFilter after we fold the
+        // constructor into newFilter.
+        // (this, [callee, ]args...) => ([callee, ]args...)
+        final Class<?>[] ctorArgs = ctorType.dropParameterTypes(0, 1).parameterArray();
+        // Fold constructor into newFilter that replaces the return value from the constructor with the originally
+        // allocated value when the originally allocated value is a primitive.
+        // (result, this, [callee, ]args...) x (this, [callee, ]args...) => (this, [callee, ]args...)
         MethodHandle handle = MH.foldArguments(MH.dropArguments(NEWFILTER, 2, ctorArgs), constructor);
 
+        // allocate() takes a ScriptFunction and returns a newly allocated ScriptObject...
         if (data.needsCallee()) {
+            // ...we either fold it into the previous composition, if we need both the ScriptFunction callee object and
+            // the newly allocated object in the arguments, so (this, callee, args...) x (callee) => (callee, args...),
+            // or...
             handle = MH.foldArguments(handle, ALLOCATE);
         } else {
+            // ...replace the ScriptFunction argument with the newly allocated object, if it doesn't need the callee
+            // (this, args...) filter (callee) => (callee, args...)
             handle = MH.filterArguments(handle, 0, ALLOCATE);
         }
 
@@ -701,6 +724,30 @@ public abstract class ScriptFunction extends ScriptObject {
         return new GuardedInvocation(filterIn, null, NashornGuards.getFunctionGuard(this));
     }
 
+    /**
+     * If this function's method handles need a callee parameter, swap the order of first two arguments for the passed
+     * method handle. If this function's method handles don't need a callee parameter, returns the original method
+     * handle unchanged.
+     * @param mh a method handle with order of arguments {@code (callee, this, args...)}
+     * @return a method handle with order of arguments {@code (this, callee, args...)}
+     */
+    private MethodHandle swapCalleeAndThis(final MethodHandle mh) {
+        if (!data.needsCallee()) {
+            return mh;
+        }
+        final MethodType type = mh.type();
+        assert type.parameterType(0) == ScriptFunction.class;
+        assert type.parameterType(1) == Object.class;
+        final MethodType newType = type.changeParameterType(0, Object.class).changeParameterType(1, ScriptFunction.class);
+        final int[] reorder = new int[type.parameterCount()];
+        reorder[0] = 1;
+        assert reorder[1] == 0;
+        for (int i = 2; i < reorder.length; ++i) {
+            reorder[i] = i;
+        }
+        return MethodHandles.permuteArguments(mh, newType, reorder);
+    }
+
     @SuppressWarnings("unused")
     private static Object newFilter(final Object result, final Object allocation) {
         return (result instanceof ScriptObject || !JSType.isPrimitive(result))? result : allocation;
@@ -716,7 +763,7 @@ public abstract class ScriptFunction extends ScriptObject {
 
     /**
      * dyn:call call site signature: (callee, thiz, [args...])
-     * generated method signature:   (thiz, callee, [args...])
+     * generated method signature:   (callee, thiz, [args...])
      *
      * cases:
      * (a) method has callee parameter
@@ -735,8 +782,10 @@ public abstract class ScriptFunction extends ScriptObject {
             final MethodHandle collector = MH.asCollector(ScriptRuntime.APPLY.methodHandle(), Object[].class,
                     type.parameterCount() - 2);
 
-            return new GuardedInvocation(collector,
-                    desc.getMethodType().parameterType(0) == ScriptFunction.class ? null : NashornGuards.getScriptFunctionGuard());
+            // If call site is statically typed to take a ScriptFunction, we don't need a guard, otherwise we need a
+            // generic "is this a ScriptFunction?" guard.
+            return new GuardedInvocation(collector, ScriptFunction.class.isAssignableFrom(desc.getMethodType().parameterType(0))
+                    ? null : NashornGuards.getScriptFunctionGuard());
         }
 
         MethodHandle boundHandle;
@@ -745,21 +794,15 @@ public abstract class ScriptFunction extends ScriptObject {
         if (data.needsCallee()) {
             final MethodHandle callHandle = getBestSpecializedInvokeHandle(type);
 
-            if(NashornCallSiteDescriptor.isScope(desc)) {
-                // (this, callee, args...) => (callee, args...) => (callee, [this], args...)
-                boundHandle = MH.bindTo(callHandle, needsWrappedThis() ? Context.getGlobalTrusted() : ScriptRuntime.UNDEFINED);
+            if (NashornCallSiteDescriptor.isScope(desc)) {
+                // Make a handle that drops the passed "this" argument and substitutes either Global or Undefined
+                // (callee, this, args...) => (callee, args...)
+                boundHandle = MH.insertArguments(callHandle, 1, needsWrappedThis() ? Context.getGlobalTrusted() : ScriptRuntime.UNDEFINED);
+                // (callee, args...) => (callee, [this], args...)
                 boundHandle = MH.dropArguments(boundHandle, 1, Object.class);
             } else {
-                // (this, callee, args...) permute => (callee, this, args...) which is what we get in
-                final MethodType oldType = callHandle.type();
-                final int[] reorder = new int[oldType.parameterCount()];
-                for (int i = 2; i < reorder.length; i++) {
-                    reorder[i] = i;
-                }
-                reorder[0] = 1;
-                assert reorder[1] == 0;
-                final MethodType newType = oldType.changeParameterType(0, oldType.parameterType(1)).changeParameterType(1, oldType.parameterType(0));
-                boundHandle = MethodHandles.permuteArguments(callHandle, newType, reorder);
+                // It's already (callee, this, args...), just what we need
+                boundHandle = callHandle;
 
                 // For non-strict functions, check whether this-object is primitive type.
                 // If so add a to-object-wrapper argument filter.
@@ -775,10 +818,14 @@ public abstract class ScriptFunction extends ScriptObject {
         } else {
             final MethodHandle callHandle = getBestSpecializedInvokeHandle(type.dropParameterTypes(0, 1));
 
-            if(NashornCallSiteDescriptor.isScope(desc)) {
+            if (NashornCallSiteDescriptor.isScope(desc)) {
+                // Make a handle that drops the passed "this" argument and substitutes either Global or Undefined
+                // (this, args...) => (args...)
                 boundHandle = MH.bindTo(callHandle, needsWrappedThis() ? Context.getGlobalTrusted() : ScriptRuntime.UNDEFINED);
+                // (args...) => ([callee], [this], args...)
                 boundHandle = MH.dropArguments(boundHandle, 0, Object.class, Object.class);
             } else {
+                // (this, args...) => ([callee], this, args...)
                 boundHandle = MH.dropArguments(callHandle, 0, Object.class);
             }
         }
@@ -793,21 +840,11 @@ public abstract class ScriptFunction extends ScriptObject {
      * These don't want a callee parameter, so bind that. Name binding is optional.
      */
     MethodHandle getCallMethodHandle(final MethodType type, final String bindName) {
-        MethodHandle methodHandle = getBestSpecializedInvokeHandle(type);
+        return pairArguments(bindToNameIfNeeded(bindToCalleeIfNeeded(getBestSpecializedInvokeHandle(type)), bindName), type);
+    }
 
-        if (bindName != null) {
-            if (data.needsCallee()) {
-                methodHandle = MH.insertArguments(methodHandle, 1, this, bindName);
-            } else {
-                methodHandle = MH.insertArguments(methodHandle, 1, bindName);
-            }
-        } else {
-            if (data.needsCallee()) {
-                methodHandle = MH.insertArguments(methodHandle, 1, this);
-            }
-        }
-
-        return pairArguments(methodHandle, type);
+    private static MethodHandle bindToNameIfNeeded(final MethodHandle methodHandle, final String bindName) {
+        return bindName == null ? methodHandle : MH.insertArguments(methodHandle, 1, bindName);
     }
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunctionData.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunctionData.java
index 65dbd6375b5..c72037c24a0 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunctionData.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunctionData.java
@@ -25,14 +25,13 @@
 
 package jdk.nashorn.internal.runtime;
 
-import jdk.nashorn.internal.ir.FunctionNode;
-import jdk.nashorn.internal.parser.Token;
-import jdk.nashorn.internal.parser.TokenType;
+import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodType;
-
-import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+import jdk.nashorn.internal.ir.FunctionNode;
+import jdk.nashorn.internal.parser.Token;
+import jdk.nashorn.internal.parser.TokenType;
 
 /**
  * A container for data needed to instantiate a specific {@link ScriptFunction} at runtime.
@@ -129,19 +128,19 @@ public class ScriptFunctionData {
              * constructor or not if the method handle's first argument is boolean.
              */
             this.invoker     = MH.insertArguments(methodHandle, 0, false);
-            this.constructor = MH.insertArguments(methodHandle, 0, true);
+            this.constructor = adaptConstructor(MH.insertArguments(methodHandle, 0, true));
 
             if (specs != null) {
                 this.invokeSpecializations    = new MethodHandle[specs.length];
                 this.constructSpecializations = new MethodHandle[specs.length];
                 for (int i = 0; i < specs.length; i++) {
                     this.invokeSpecializations[i]    = MH.insertArguments(specs[i], 0, false);
-                    this.constructSpecializations[i] = MH.insertArguments(specs[i], 0, true);
+                    this.constructSpecializations[i] = adaptConstructor(MH.insertArguments(specs[i], 0, true));
                 }
             }
         } else {
             this.invoker                  = methodHandle;
-            this.constructor              = methodHandle;
+            this.constructor              = adaptConstructor(methodHandle);
             this.invokeSpecializations    = specs;
             this.constructSpecializations = specs;
         }
@@ -353,7 +352,7 @@ public class ScriptFunctionData {
         // and they're set when first called, so we enforce set-once here.
         if (this.invoker == null) {
             this.invoker     = invoker;
-            this.constructor = invoker;
+            this.constructor = adaptConstructor(invoker);
             this.allocator   = allocator;
         }
     }
@@ -408,9 +407,9 @@ public class ScriptFunctionData {
             return false;
         }
         if(type.parameterType(0) == boolean.class) {
-            return len > 2 && type.parameterType(2) == ScriptFunction.class;
+            return len > 1 && type.parameterType(1) == ScriptFunction.class;
         }
-        return len > 1 && type.parameterType(1) == ScriptFunction.class;
+        return type.parameterType(0) == ScriptFunction.class;
     }
 
     /**
@@ -434,9 +433,29 @@ public class ScriptFunctionData {
             newType = newType.changeParameterType(type.parameterCount() - 1, Object[].class);
         }
         if (needsCallee()) {
-            newType = newType.changeParameterType(1, ScriptFunction.class);
+            newType = newType.changeParameterType(0, ScriptFunction.class);
         }
         return type.equals(newType) ? handle : handle.asType(newType);
     }
 
+    /**
+     * Adapts a method handle to conform to requirements of a constructor. Right now this consists of making sure its
+     * return value is {@code Object}. We might consider moving the caller-this argument swap here too from
+     * {@link ScriptFunction#findNewMethod(org.dynalang.dynalink.CallSiteDescriptor)}.
+     * @param ctorHandle the constructor method handle
+     * @return adapted constructor method handle
+     */
+    private static MethodHandle adaptConstructor(final MethodHandle ctorHandle) {
+        return changeReturnTypeToObject(ctorHandle);
+    }
+
+    /**
+     * Adapts the method handle so its return type is {@code Object}. If the handle's return type is already
+     * {@code Object}, the handle is returned unchanged.
+     * @param mh the handle to adapt
+     * @return the adapted handle
+     */
+    private static MethodHandle changeReturnTypeToObject(final MethodHandle mh) {
+        return MH.asType(mh, mh.type().changeReturnType(Object.class));
+    }
 }

From 1e1537c13f84a7daaaa6aa429bdf90b995945a9a Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Mon, 11 Feb 2013 21:26:06 +0530
Subject: [PATCH 130/311] 8007915: Nashorn IR, codegen, parser packages and
 Context instance should be inaccessible to user code

Reviewed-by: lagergren, jlaskey, attila
---
 nashorn/bin/jjssecure                         |   2 +-
 nashorn/bin/jjssecure.bat                     |   2 +-
 nashorn/bin/nashornsecure                     |   2 +-
 nashorn/bin/nashornsecure.bat                 |   2 +-
 nashorn/make/Makefile                         |   2 +-
 nashorn/make/build.xml                        |   4 +-
 nashorn/make/java.security.override           |  14 ++
 nashorn/make/project.properties               |   2 +-
 .../jdk/nashorn/internal/codegen/Attr.java    |   1 +
 .../internal/codegen/CodeGenerator.java       |   2 +-
 .../nashorn/internal/codegen/Compiler.java    |   3 +
 .../internal/codegen/RuntimeCallSite.java     |  20 +-
 .../src/jdk/nashorn/internal/ir/Symbol.java   |   2 +-
 .../nashorn/internal/ir/debug/JSONWriter.java |  10 +-
 .../objects/AccessorPropertyDescriptor.java   |   2 +-
 .../objects/DataPropertyDescriptor.java       |   2 +-
 .../objects/GenericPropertyDescriptor.java    |   2 +-
 .../jdk/nashorn/internal/objects/Global.java  |  33 ++-
 .../nashorn/internal/objects/NativeArray.java |   4 +-
 .../internal/objects/NativeArrayBuffer.java   |   2 +-
 .../nashorn/internal/objects/NativeDebug.java |   6 +-
 .../nashorn/internal/objects/NativeError.java |   2 +-
 .../internal/objects/NativeEvalError.java     |   2 +-
 .../internal/objects/NativeFloat32Array.java  |   2 +-
 .../internal/objects/NativeFloat64Array.java  |   2 +-
 .../internal/objects/NativeFunction.java      |   2 +-
 .../internal/objects/NativeInt16Array.java    |   2 +-
 .../internal/objects/NativeInt32Array.java    |   2 +-
 .../internal/objects/NativeInt8Array.java     |   2 +-
 .../internal/objects/NativeJSAdapter.java     |   2 +-
 .../nashorn/internal/objects/NativeJSON.java  | 173 +-------------
 .../nashorn/internal/objects/NativeJava.java  |   2 +-
 .../internal/objects/NativeJavaImporter.java  |   4 +-
 .../internal/objects/NativeRangeError.java    |   2 +-
 .../objects/NativeReferenceError.java         |   2 +-
 .../internal/objects/NativeRegExp.java        |   2 +-
 .../objects/NativeRegExpExecResult.java       |   2 +-
 .../internal/objects/NativeString.java        |   5 +-
 .../internal/objects/NativeSyntaxError.java   |   2 +-
 .../internal/objects/NativeTypeError.java     |   2 +-
 .../internal/objects/NativeURIError.java      |   2 +-
 .../internal/objects/NativeUint16Array.java   |   2 +-
 .../internal/objects/NativeUint32Array.java   |   2 +-
 .../internal/objects/NativeUint8Array.java    |   2 +-
 .../objects/NativeUint8ClampedArray.java      |   2 +-
 .../internal/objects/ScriptFunctionImpl.java  |  12 +-
 .../internal/parser/AbstractParser.java       |   1 +
 .../jdk/nashorn/internal/parser/Lexer.java    |   2 +-
 .../internal/runtime/ArgumentSetter.java      |   3 +-
 .../nashorn/internal/runtime/BitVector.java   |   2 +-
 .../nashorn/internal/runtime/ConsString.java  |   2 +-
 .../jdk/nashorn/internal/runtime/Context.java |  22 +-
 .../jdk/nashorn/internal/runtime/Debug.java   |   2 +-
 .../nashorn/internal/runtime/DebugLogger.java |   2 +-
 .../internal/runtime/GlobalFunctions.java     |   2 +-
 .../internal/runtime/JSONFunctions.java       | 224 ++++++++++++++++++
 .../jdk/nashorn/internal/runtime/Logging.java |   2 +-
 .../internal/runtime/NashornLoader.java       |  13 +-
 .../internal/runtime/NativeJavaPackage.java   |   2 +-
 .../internal/{parser => runtime}/RegExp.java  |   5 +-
 .../{parser => runtime}/RegExpScanner.java    |   7 +-
 .../internal/runtime/ScriptFunction.java      |   2 +-
 .../internal/runtime/ScriptFunctionData.java  |   2 +-
 .../internal/runtime/ScriptLoader.java        |  21 +-
 .../internal/runtime/ScriptObject.java        |   2 +-
 .../internal/runtime/ScriptRuntime.java       |  28 +++
 .../internal/runtime/ScriptingFunctions.java  |   4 +-
 .../internal/runtime/SetMethodCreator.java    |   2 +-
 .../internal/runtime/StructureLoader.java     |  13 +-
 .../nashorn/internal/runtime/WithObject.java  |   2 +-
 .../arrays/EmptyArrayLikeIterator.java        |   4 +-
 .../internal/runtime/arrays/MapIterator.java  |   7 +-
 .../internal/runtime/linker/Bootstrap.java    |  16 ++
 .../internal/runtime/resources/parser.js      |   2 +-
 .../test/script/sandbox/nashorninternals.js   |  57 +++++
 nashorn/test/script/trusted/JDK-8006529.js    |  85 +++++--
 .../javaaccess}/BooleanAccessTest.java        |   2 +-
 .../javaaccess}/MethodAccessTest.java         |   2 +-
 .../javaaccess}/NumberAccessTest.java         |   2 +-
 .../javaaccess}/NumberBoxingTest.java         |   2 +-
 .../javaaccess}/ObjectAccessTest.java         |   2 +-
 .../access => api/javaaccess}/Person.java     |   2 +-
 .../javaaccess}/SharedObject.java             |   2 +-
 .../javaaccess}/StringAccessTest.java         |   2 +-
 .../internal/codegen/CompilerAccess.java      |  35 ---
 85 files changed, 559 insertions(+), 385 deletions(-)
 create mode 100644 nashorn/make/java.security.override
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/JSONFunctions.java
 rename nashorn/src/jdk/nashorn/internal/{parser => runtime}/RegExp.java (96%)
 rename nashorn/src/jdk/nashorn/internal/{parser => runtime}/RegExpScanner.java (99%)
 create mode 100644 nashorn/test/script/sandbox/nashorninternals.js
 rename nashorn/test/src/jdk/nashorn/{internal/access => api/javaaccess}/BooleanAccessTest.java (99%)
 rename nashorn/test/src/jdk/nashorn/{internal/access => api/javaaccess}/MethodAccessTest.java (99%)
 rename nashorn/test/src/jdk/nashorn/{internal/access => api/javaaccess}/NumberAccessTest.java (99%)
 rename nashorn/test/src/jdk/nashorn/{internal/access => api/javaaccess}/NumberBoxingTest.java (99%)
 rename nashorn/test/src/jdk/nashorn/{internal/access => api/javaaccess}/ObjectAccessTest.java (99%)
 rename nashorn/test/src/jdk/nashorn/{internal/access => api/javaaccess}/Person.java (97%)
 rename nashorn/test/src/jdk/nashorn/{internal/access => api/javaaccess}/SharedObject.java (99%)
 rename nashorn/test/src/jdk/nashorn/{internal/access => api/javaaccess}/StringAccessTest.java (99%)
 delete mode 100644 nashorn/test/src/jdk/nashorn/internal/codegen/CompilerAccess.java

diff --git a/nashorn/bin/jjssecure b/nashorn/bin/jjssecure
index 93d38218ac6..614ffd36213 100644
--- a/nashorn/bin/jjssecure
+++ b/nashorn/bin/jjssecure
@@ -26,4 +26,4 @@
 
 [ -z "$JAVA_HOME" ] && echo "Please set JAVA_HOME" && exit 1;
 
-$JAVA_HOME/bin/java -Xms2G -Xmx2G -XX:-TieredCompilation -server -esa -ea -Djava.ext.dirs=$JAVA_HOME/jre/lib/ext:`dirname $0`/../dist -XX:+HeapDumpOnOutOfMemoryError -Dnashorn.debug=true -Djava.lang.invoke.MethodHandle.DEBUG_NAMES=true -Dnashorn.home=`dirname $0`/.. -Djava.security.manager jdk.nashorn.tools.Shell $*
+$JAVA_HOME/bin/java -Xms2G -Xmx2G -XX:-TieredCompilation -server -esa -ea -Djava.security.properties=`dirname $0`/../make/java.security.override -Djava.ext.dirs=$JAVA_HOME/jre/lib/ext:`dirname $0`/../dist -XX:+HeapDumpOnOutOfMemoryError -Dnashorn.debug=true -Djava.lang.invoke.MethodHandle.DEBUG_NAMES=true -Dnashorn.home=`dirname $0`/.. -Djava.security.manager jdk.nashorn.tools.Shell $*
diff --git a/nashorn/bin/jjssecure.bat b/nashorn/bin/jjssecure.bat
index 2960cfc0acf..f8da10aaaf6 100644
--- a/nashorn/bin/jjssecure.bat
+++ b/nashorn/bin/jjssecure.bat
@@ -24,4 +24,4 @@ rem questions.
 rem
 @echo off
 
-java -Xms2G -Xmx2G -XX:-TieredCompilation -server -esa -ea -Djava.ext.dirs=%~dp0\..\dist -XX:+HeapDumpOnOutOfMemoryError -Dnashorn.debug=true -Djava.lang.invoke.MethodHandle.DEBUG_NAMES=false -Dnashorn.home=%~dp0\.. -Djava.security.manager jdk.nashorn.tools.Shell
+java -Xms2G -Xmx2G -XX:-TieredCompilation -server -esa -ea -Djava.security.properties=%~dp0\..\make\java.security.override -Djava.ext.dirs=%~dp0\..\dist -XX:+HeapDumpOnOutOfMemoryError -Dnashorn.debug=true -Djava.lang.invoke.MethodHandle.DEBUG_NAMES=false -Dnashorn.home=%~dp0\.. -Djava.security.manager jdk.nashorn.tools.Shell
diff --git a/nashorn/bin/nashornsecure b/nashorn/bin/nashornsecure
index caec38731d0..3d02c5293e5 100644
--- a/nashorn/bin/nashornsecure
+++ b/nashorn/bin/nashornsecure
@@ -26,4 +26,4 @@
 
 [ -z "$JAVA_HOME" ] && echo "Please set JAVA_HOME" && exit 1;
 
-$JAVA_HOME/bin/jrunscript -J-Djava.security.manager -J-Xms2G -J-Xmx2G -J-XX:-TieredCompilation -J-server -J-esa -J-ea -J-Djava.ext.dirs=$JAVA_HOME/jre/lib/ext:`dirname $0`/../dist -J-XX:+HeapDumpOnOutOfMemoryError -J-Djava.lang.invoke.MethodHandle.DEBUG_NAMES=false -J-Dnashorn.debug=true -l nashorn $*
+$JAVA_HOME/bin/jrunscript -J-Djava.security.properties=`dirname $0`/../make/java.security.override -J-Djava.security.manager -J-Xms2G -J-Xmx2G -J-XX:-TieredCompilation -J-server -J-esa -J-ea -J-Djava.ext.dirs=$JAVA_HOME/jre/lib/ext:`dirname $0`/../dist -J-XX:+HeapDumpOnOutOfMemoryError -J-Djava.lang.invoke.MethodHandle.DEBUG_NAMES=false -J-Dnashorn.debug=true -l nashorn $*
diff --git a/nashorn/bin/nashornsecure.bat b/nashorn/bin/nashornsecure.bat
index d35eeb48f25..5a4eca63c64 100644
--- a/nashorn/bin/nashornsecure.bat
+++ b/nashorn/bin/nashornsecure.bat
@@ -24,4 +24,4 @@ rem questions.
 rem
 @echo off
 
-jrunscript -J-Djava.security.manager -J-Xms2G -J-Xmx2G -J-XX:-TieredCompilation -J-server -J-esa -J-ea -J-Djava.ext.dirs=%~dp0\..\dist -J-XX:+HeapDumpOnOutOfMemoryError -J-Dnashorn.debug=true -J-Djava.lang.invoke.MethodHandle.DEBUG_NAMES=false -l nashorn
+jrunscript -J-Djava.security.properties=%~dp0\..\make\java.security.override -J-Djava.security.manager -J-Xms2G -J-Xmx2G -J-XX:-TieredCompilation -J-server -J-esa -J-ea -J-Djava.ext.dirs=%~dp0\..\dist -J-XX:+HeapDumpOnOutOfMemoryError -J-Dnashorn.debug=true -J-Djava.lang.invoke.MethodHandle.DEBUG_NAMES=false -l nashorn
diff --git a/nashorn/make/Makefile b/nashorn/make/Makefile
index 965c30a43a1..899f9362a82 100644
--- a/nashorn/make/Makefile
+++ b/nashorn/make/Makefile
@@ -181,7 +181,7 @@ else
 endif
 
 # Default target and expected 'do everything' target
-all: test docs
+all: test
 
 # Standard make clobber target
 clobber: clean
diff --git a/nashorn/make/build.xml b/nashorn/make/build.xml
index 04766c17387..fbf9a9e5dd2 100644
--- a/nashorn/make/build.xml
+++ b/nashorn/make/build.xml
@@ -201,12 +201,12 @@
 
     <!-- tests that check nashorn internals and internal API -->
     <jar jarfile="${nashorn.internal.tests.jar}">
-      <fileset dir="${build.test.classes.dir}" excludes="**/api/scripting/*"/>
+      <fileset dir="${build.test.classes.dir}" excludes="**/api/*"/>
     </jar>
 
     <!-- tests that check nashorn script engine (jsr-223) API -->
     <jar jarfile="${nashorn.api.tests.jar}">
-      <fileset dir="${build.test.classes.dir}" includes="**/api/scripting/*"/>
+      <fileset dir="${build.test.classes.dir}" includes="**/api/*"/>
     </jar>
 
   </target>
diff --git a/nashorn/make/java.security.override b/nashorn/make/java.security.override
new file mode 100644
index 00000000000..45f2687a6d7
--- /dev/null
+++ b/nashorn/make/java.security.override
@@ -0,0 +1,14 @@
+# We would like to avoid references from anywhere outside nashorn
+# to codegen, IR and parser packages, in particular script generated classes.
+# We ensure that by overriding "package.access" security property.
+
+# The following "package.access" value was copied from  default java.security 
+# of jre/lib/security and appended with nashorn IR, Codegen and Parser packages.
+
+#
+# List of comma-separated packages that start with or equal this string
+# will cause a security exception to be thrown when
+# passed to checkPackageAccess unless the
+# corresponding RuntimePermission ("accessClassInPackage."+package) has
+# been granted.
+package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.,jdk.internal.,jdk.nashorn.internal.ir., jdk.nashorn.internal.codegen., jdk.nashorn.internal.parser.
diff --git a/nashorn/make/project.properties b/nashorn/make/project.properties
index 70107f4caed..544b1e91388 100644
--- a/nashorn/make/project.properties
+++ b/nashorn/make/project.properties
@@ -225,7 +225,7 @@ run.test.jvmargs=-server -Xmx${run.test.xmx} -XX:-TieredCompilation -esa -ea -Dn
 #-XX:+HeapDumpOnOutOfMemoryError -XX:-UseCompressedKlassPointers -XX:+PrintHeapAtGC -XX:ClassMetaspaceSize=300M  
 run.test.jvmargs.octane=-Xms${run.test.xms} ${run.test.jvmargs}
 
-run.test.jvmsecurityargs=-Xverify:all -Djava.security.manager -Djava.security.policy=${basedir}/build/nashorn.policy
+run.test.jvmsecurityargs=-Xverify:all -Djava.security.properties=${basedir}/make/java.security.override -Djava.security.manager -Djava.security.policy=${basedir}/build/nashorn.policy
 
 # path of rhino.jar for benchmarks
 rhino.jar=
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Attr.java b/nashorn/src/jdk/nashorn/internal/codegen/Attr.java
index bb0f3a2e95a..e3bd8ab3881 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Attr.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Attr.java
@@ -415,6 +415,7 @@ final class Attr extends NodeOperatorVisitor {
             symbol.setIsScope();
         }
 
+        assert symbol != null;
         if(symbol.isGlobal()) {
             getCurrentFunctionNode().setUsesGlobalSymbol();
         } else if(symbol.isScope()) {
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
index c8742e67772..da7c72147c1 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
@@ -3183,6 +3183,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
                 @Override
                 public Node enter(final IdentNode node) {
                     final Symbol symbol = node.getSymbol();
+                    assert symbol != null;
                     if (symbol.isScope()) {
                         if (symbol.isFastScope(currentFunction)) {
                             storeFastScopeVar(node.getType(), symbol, CALLSITE_SCOPE | getCallSiteFlags());
@@ -3190,7 +3191,6 @@ public final class CodeGenerator extends NodeOperatorVisitor {
                             method.dynamicSet(node.getType(), node.getName(), CALLSITE_SCOPE | getCallSiteFlags());
                         }
                     } else {
-                        assert symbol != null;
                         method.store(symbol);
                     }
                     return null;
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java b/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
index a70fc6924a2..3b21ab581a7 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
@@ -108,6 +108,9 @@ public final class Compiler {
     /** Name of the objects package */
     public static final String OBJECTS_PACKAGE = "jdk/nashorn/internal/objects";
 
+    /** Name of the runtime package */
+    public static final String RUNTIME_PACKAGE = "jdk/nashorn/internal/runtime";
+
     /** Name of the Global object, cannot be referred to as .class, @see CodeGenerator */
     public static final String GLOBAL_OBJECT = OBJECTS_PACKAGE + '/' + "Global";
 
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/RuntimeCallSite.java b/nashorn/src/jdk/nashorn/internal/codegen/RuntimeCallSite.java
index 95b592df98b..96ed8a48a2c 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/RuntimeCallSite.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/RuntimeCallSite.java
@@ -42,6 +42,7 @@ import jdk.nashorn.internal.codegen.types.Type;
 import jdk.nashorn.internal.ir.RuntimeNode;
 import jdk.nashorn.internal.ir.RuntimeNode.Request;
 import jdk.nashorn.internal.runtime.ScriptRuntime;
+import jdk.nashorn.internal.runtime.linker.Bootstrap;
 import jdk.nashorn.internal.runtime.linker.Lookup;
 import jdk.nashorn.internal.runtime.linker.MethodHandleFactory;
 
@@ -55,8 +56,8 @@ import jdk.nashorn.internal.runtime.linker.MethodHandleFactory;
  * {@code Object a === int b} is a good idea to specialize to {@code ((Integer)a).intValue() == b}
  * surrounded by catch blocks that will try less narrow specializations
  */
-public class RuntimeCallSite extends MutableCallSite {
-    static final Call BOOTSTRAP = staticCallNoLookup(RuntimeCallSite.class, "bootstrap", CallSite.class, MethodHandles.Lookup.class, String.class, MethodType.class);
+public final class RuntimeCallSite extends MutableCallSite {
+    static final Call BOOTSTRAP = staticCallNoLookup(Bootstrap.class, "runtimeBootstrap", CallSite.class, MethodHandles.Lookup.class, String.class, MethodType.class);
 
     private static final MethodHandle NEXT = findOwnMH("next",  MethodHandle.class);
 
@@ -200,26 +201,13 @@ public class RuntimeCallSite extends MutableCallSite {
      * @param type method type for call site
      * @param name name of runtime call
      */
-    RuntimeCallSite(final MethodType type, final String name) {
+    public RuntimeCallSite(final MethodType type, final String name) {
         super(type);
         this.name    = name;
         this.request = Request.valueOf(name.substring(0, name.indexOf(SpecializedRuntimeNode.REQUEST_SEPARATOR)));
         setTarget(makeMethod(name));
     }
 
-    /**
-     * Bootstrapper for a specialized Runtime call
-     *
-     * @param lookup       lookup
-     * @param initialName  initial name for callsite
-     * @param type         method type for call site
-     *
-     * @return callsite for a runtime node
-     */
-    public static CallSite bootstrap(final MethodHandles.Lookup lookup, final String initialName, final MethodType type) {
-        return new RuntimeCallSite(type, initialName);
-    }
-
     private String nextName(final String requestName) {
         if (requestName.equals(request.toString())) {
             return null;
diff --git a/nashorn/src/jdk/nashorn/internal/ir/Symbol.java b/nashorn/src/jdk/nashorn/internal/ir/Symbol.java
index b6d8e9b336b..081df86604d 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/Symbol.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/Symbol.java
@@ -660,7 +660,7 @@ public final class Symbol implements Comparable<Symbol> {
         if (TRACE_SYMBOLS != null && (TRACE_SYMBOLS.isEmpty() || TRACE_SYMBOLS.contains(name))) {
             Context.err("SYMBOL: '" + name + "' " + desc);
             if (TRACE_SYMBOLS_STACKTRACE != null && (TRACE_SYMBOLS_STACKTRACE.isEmpty() || TRACE_SYMBOLS_STACKTRACE.contains(name))) {
-                new Throwable().printStackTrace(Context.getContext().getErr());
+                new Throwable().printStackTrace(Context.getCurrentErr());
             }
         }
     }
diff --git a/nashorn/src/jdk/nashorn/internal/ir/debug/JSONWriter.java b/nashorn/src/jdk/nashorn/internal/ir/debug/JSONWriter.java
index 122d3edc10c..103670d024a 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/debug/JSONWriter.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/debug/JSONWriter.java
@@ -80,19 +80,13 @@ public final class JSONWriter extends NodeVisitor {
     /**
      * Returns AST as JSON compatible string.
      *
+     * @param context nashorn context to use
      * @param code code to be parsed
      * @param name name of the code source (used for location)
      * @param includeLoc tells whether to include location information for nodes or not
      * @return JSON string representation of AST of the supplied code
      */
-    public static String parse(final String code, final String name, final boolean includeLoc) {
-        final Context      context    = AccessController.doPrivileged(
-                new PrivilegedAction<Context>() {
-                    @Override
-                    public Context run() {
-                        return Context.getContext();
-                    }
-                });
+    public static String parse(final Context context, final String code, final String name, final boolean includeLoc) {
         final Compiler     compiler   = Compiler.compiler(new Source(name, code), context, new Context.ThrowErrorManager(), context._strict);
         final Parser       parser     = new Parser(compiler, context._strict);
         final JSONWriter   jsonWriter = new JSONWriter(includeLoc);
diff --git a/nashorn/src/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java b/nashorn/src/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java
index 6951c0389fe..bef0a86827d 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java
@@ -138,7 +138,7 @@ public final class AccessorPropertyDescriptor extends ScriptObject implements Pr
 
     @Override
     public PropertyDescriptor fillFrom(final ScriptObject sobj) {
-        final boolean strict = getContext()._strict;
+        final boolean strict = isStrictContext();
 
         if (sobj.has(CONFIGURABLE)) {
             this.configurable = JSType.toBoolean(sobj.get(CONFIGURABLE));
diff --git a/nashorn/src/jdk/nashorn/internal/objects/DataPropertyDescriptor.java b/nashorn/src/jdk/nashorn/internal/objects/DataPropertyDescriptor.java
index cfc704765d1..e5f7de318ab 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/DataPropertyDescriptor.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/DataPropertyDescriptor.java
@@ -136,7 +136,7 @@ public final class DataPropertyDescriptor extends ScriptObject implements Proper
 
     @Override
     public PropertyDescriptor fillFrom(final ScriptObject sobj) {
-        final boolean strict = getContext()._strict;
+        final boolean strict = isStrictContext();
         if (sobj.has(CONFIGURABLE)) {
             this.configurable = JSType.toBoolean(sobj.get(CONFIGURABLE));
         } else {
diff --git a/nashorn/src/jdk/nashorn/internal/objects/GenericPropertyDescriptor.java b/nashorn/src/jdk/nashorn/internal/objects/GenericPropertyDescriptor.java
index bd8ad453d5a..f76f7f19878 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/GenericPropertyDescriptor.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/GenericPropertyDescriptor.java
@@ -124,7 +124,7 @@ public final class GenericPropertyDescriptor extends ScriptObject implements Pro
 
     @Override
     public PropertyDescriptor fillFrom(final ScriptObject sobj) {
-        final boolean strict = getContext()._strict;
+        final boolean strict = isStrictContext();
         if (sobj.has(CONFIGURABLE)) {
             this.configurable = JSType.toBoolean(sobj.get(CONFIGURABLE));
         } else {
diff --git a/nashorn/src/jdk/nashorn/internal/objects/Global.java b/nashorn/src/jdk/nashorn/internal/objects/Global.java
index 4ea7fd0979e..d1664d11296 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/Global.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/Global.java
@@ -347,10 +347,13 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
     private static final MethodHandle LOAD    = findOwnMH("load",    Object.class, Object.class, Object.class);
     private static final MethodHandle EXIT    = findOwnMH("exit",    Object.class, Object.class, Object.class);
 
+    private final Context context;
+
     /**
      * Constructor
      */
-    public Global() {
+    public Global(final Context context) {
+        this.context = context;
         this.setIsScope();
         /*
          * Duplicate global's map and use it. This way the initial Map filled
@@ -359,19 +362,23 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
          */
         this.setMap(getMap().duplicate());
 
-        final int cacheSize = getContext()._class_cache_size;
+        final int cacheSize = context._class_cache_size;
         if (cacheSize > 0) {
             classCache = new ClassCache(cacheSize);
         }
     }
 
     /**
-     * Script access to unique context specific Global instance
+     * Script access to "current" Global instance
      *
      * @return the global singleton
      */
     public static Global instance() {
-        return (Global)Context.getGlobal();
+        ScriptObject global = Context.getGlobal();
+        if (! (global instanceof Global)) {
+            throw new IllegalStateException("no current global instance");
+        }
+        return (Global)global;
     }
 
     /**
@@ -380,7 +387,7 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
      * @return the context
      */
     static Context getThisContext() {
-        return instance().getContext();
+        return instance().context;
     }
 
     /**
@@ -569,7 +576,7 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
     public PropertyDescriptor newAccessorDescriptor(final Object get, final Object set, final boolean configurable, final boolean enumerable) {
         final AccessorPropertyDescriptor desc = new AccessorPropertyDescriptor(configurable, enumerable, get == null ? UNDEFINED : get, set == null ? UNDEFINED : set);
 
-        final boolean strict = getContext()._strict;
+        final boolean strict = context._strict;
 
         if (get == null) {
             desc.delete(PropertyDescriptor.GET, strict);
@@ -658,7 +665,7 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
         final Global global = Global.instance();
         final ScriptObject scope = (self instanceof ScriptObject) ? (ScriptObject)self : global;
 
-        return global.getContext().eval(scope, str.toString(), callThis, location, Boolean.TRUE.equals(strict));
+        return global.context.eval(scope, str.toString(), callThis, location, Boolean.TRUE.equals(strict));
     }
 
     /**
@@ -698,7 +705,7 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
     public static Object load(final Object self, final Object source) throws IOException {
         final Global global = Global.instance();
         final ScriptObject scope = (self instanceof ScriptObject) ? (ScriptObject)self : global;
-        return global.getContext().load(scope, source);
+        return global.context.load(scope, source);
     }
 
     /**
@@ -1344,7 +1351,7 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
         this.decodeURIComponent = ScriptFunctionImpl.makeFunction("decodeURIComponent", GlobalFunctions.DECODE_URICOMPONENT);
         this.escape             = ScriptFunctionImpl.makeFunction("escape",     GlobalFunctions.ESCAPE);
         this.unescape           = ScriptFunctionImpl.makeFunction("unescape",   GlobalFunctions.UNESCAPE);
-        this.print              = ScriptFunctionImpl.makeFunction("print",      getContext()._print_no_newline ? PRINT : PRINTLN);
+        this.print              = ScriptFunctionImpl.makeFunction("print",      context._print_no_newline ? PRINT : PRINTLN);
         this.load               = ScriptFunctionImpl.makeFunction("load",       LOAD);
         this.exit               = ScriptFunctionImpl.makeFunction("exit",       EXIT);
         this.quit               = ScriptFunctionImpl.makeFunction("quit",       EXIT);
@@ -1387,7 +1394,7 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
 
         initTypedArray();
 
-        if (getContext()._scripting) {
+        if (context._scripting) {
             initScripting();
         }
 
@@ -1403,11 +1410,11 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
         this.__LINE__ = 0.0;
 
         // expose script (command line) arguments as "arguments" property of global
-        final List<String> arguments = getContext().getOptions().getArguments();
+        final List<String> arguments = context.getOptions().getArguments();
         final Object argsObj = wrapAsObject(arguments.toArray());
 
         addOwnProperty("arguments", Attribute.NOT_ENUMERABLE, argsObj);
-        if (getContext()._scripting) {
+        if (context._scripting) {
             // synonym for "arguments" in scripting mode
             addOwnProperty("$ARG", Attribute.NOT_ENUMERABLE, argsObj);
         }
@@ -1485,7 +1492,7 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
         addOwnProperty("echo", Attribute.NOT_ENUMERABLE, value);
 
         // Nashorn extension: global.$OPTIONS (scripting-mode-only)
-        value = new OptionsObject(this.getContext());
+        value = new OptionsObject(context);
         addOwnProperty("$OPTIONS", Attribute.NOT_ENUMERABLE, value);
 
         // Nashorn extension: global.$ENV (scripting-mode-only)
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeArray.java b/nashorn/src/jdk/nashorn/internal/objects/NativeArray.java
index 923afa34598..7edd2419573 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeArray.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeArray.java
@@ -118,7 +118,7 @@ public final class NativeArray extends ScriptObject {
             if (value == ScriptRuntime.EMPTY) {
                 arrayData = arrayData.delete(index);
             } else {
-                arrayData = arrayData.set(index, value, getContext()._strict);
+                arrayData = arrayData.set(index, value, isStrictContext());
             }
         }
 
@@ -644,7 +644,7 @@ public final class NativeArray extends ScriptObject {
             if (bulkable(sobj)) {
                 final NativeArray nativeArray = (NativeArray)sobj;
                 if (nativeArray.getArray().length() + args.length <= JSType.MAX_UINT) {
-                    final ArrayData newData = nativeArray.getArray().push(nativeArray.getContext()._strict, args);
+                    final ArrayData newData = nativeArray.getArray().push(nativeArray.isStrictContext(), args);
                     nativeArray.setArray(newData);
                     return newData.length();
                 }
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeArrayBuffer.java b/nashorn/src/jdk/nashorn/internal/objects/NativeArrayBuffer.java
index ce954f893bc..542b2aebb46 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeArrayBuffer.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeArrayBuffer.java
@@ -36,7 +36,7 @@ import jdk.nashorn.internal.runtime.ScriptObject;
 import jdk.nashorn.internal.runtime.ScriptRuntime;
 
 @ScriptClass("ArrayBuffer")
-class NativeArrayBuffer extends ScriptObject {
+final class NativeArrayBuffer extends ScriptObject {
     private final byte[] buffer;
 
     @Constructor(arity = 1)
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeDebug.java b/nashorn/src/jdk/nashorn/internal/objects/NativeDebug.java
index 9100cb1a699..3d6fcbc8e7a 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeDebug.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeDebug.java
@@ -46,7 +46,7 @@ import jdk.nashorn.internal.runtime.linker.LinkerCallSite;
  *
  */
 @ScriptClass("Debug")
-public class NativeDebug extends ScriptObject {
+public final class NativeDebug extends ScriptObject {
     NativeDebug() {
         this.setProto(Global.objectPrototype());
     }
@@ -64,6 +64,10 @@ public class NativeDebug extends ScriptObject {
      */
     @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
     public static Object getContext(final Object self) {
+        final SecurityManager sm = System.getSecurityManager();
+        if (sm != null) {
+            sm.checkPermission(new RuntimePermission("getNashornContext"));
+        }
         return Global.getThisContext();
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeError.java b/nashorn/src/jdk/nashorn/internal/objects/NativeError.java
index 9ab4e983d80..626c3c0991a 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeError.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeError.java
@@ -47,7 +47,7 @@ import jdk.nashorn.internal.runtime.ScriptRuntime;
  * ECMA 15.11 Error Objects
  */
 @ScriptClass("Error")
-public class NativeError extends ScriptObject {
+public final class NativeError extends ScriptObject {
 
     static final MethodHandle GET_COLUMNNUMBER = findOwnMH("getColumnNumber", Object.class, Object.class);
     static final MethodHandle SET_COLUMNNUMBER = findOwnMH("setColumnNumber", Object.class, Object.class, Object.class);
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeEvalError.java b/nashorn/src/jdk/nashorn/internal/objects/NativeEvalError.java
index e4e0498fc29..a33fb0db351 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeEvalError.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeEvalError.java
@@ -40,7 +40,7 @@ import jdk.nashorn.internal.runtime.ScriptObject;
  *
  */
 @ScriptClass("Error")
-public class NativeEvalError extends ScriptObject {
+public final class NativeEvalError extends ScriptObject {
 
     /** message property in instance */
     @Property(name = NativeError.MESSAGE)
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeFloat32Array.java b/nashorn/src/jdk/nashorn/internal/objects/NativeFloat32Array.java
index 7275320e114..98db34ba046 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeFloat32Array.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeFloat32Array.java
@@ -37,7 +37,7 @@ import jdk.nashorn.internal.runtime.arrays.ArrayData;
  * Float32 array for the TypedArray extension
  */
 @ScriptClass("Float32Array")
-public class NativeFloat32Array extends ArrayBufferView {
+public final class NativeFloat32Array extends ArrayBufferView {
     private static final int BYTES_PER_ELEMENT = 4;
     private static final Factory FACTORY = new Factory(BYTES_PER_ELEMENT) {
         @Override
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeFloat64Array.java b/nashorn/src/jdk/nashorn/internal/objects/NativeFloat64Array.java
index 21cc35488d0..e2ce624753f 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeFloat64Array.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeFloat64Array.java
@@ -37,7 +37,7 @@ import jdk.nashorn.internal.runtime.arrays.ArrayData;
  * Float64 array for the TypedArray extension
  */
 @ScriptClass("Float64Array")
-public class NativeFloat64Array extends ArrayBufferView {
+public final class NativeFloat64Array extends ArrayBufferView {
     private static final int BYTES_PER_ELEMENT = 8;
     private static final Factory FACTORY = new Factory(BYTES_PER_ELEMENT) {
         @Override
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeFunction.java b/nashorn/src/jdk/nashorn/internal/objects/NativeFunction.java
index ed6a876d543..86863a143bb 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeFunction.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeFunction.java
@@ -168,7 +168,7 @@ public final class NativeFunction {
             arguments = ScriptRuntime.EMPTY_ARRAY;
         }
 
-        return ((ScriptFunction)self).makeBoundFunction(thiz, arguments);
+        return ((ScriptFunctionImpl)self).makeBoundFunction(thiz, arguments);
     }
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeInt16Array.java b/nashorn/src/jdk/nashorn/internal/objects/NativeInt16Array.java
index 9991b29b4b9..c5951d91760 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeInt16Array.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeInt16Array.java
@@ -36,7 +36,7 @@ import jdk.nashorn.internal.runtime.arrays.ArrayData;
  * Int16 array for the TypedArray extension
  */
 @ScriptClass("Int16Array")
-public class NativeInt16Array extends ArrayBufferView {
+public final class NativeInt16Array extends ArrayBufferView {
     private static final int BYTES_PER_ELEMENT = 2;
     private static final Factory FACTORY = new Factory(BYTES_PER_ELEMENT) {
         @Override
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeInt32Array.java b/nashorn/src/jdk/nashorn/internal/objects/NativeInt32Array.java
index 833e2dce957..486e7a61fd5 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeInt32Array.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeInt32Array.java
@@ -36,7 +36,7 @@ import jdk.nashorn.internal.runtime.arrays.ArrayData;
  * Int32 array for the TypedArray extension
  */
 @ScriptClass("Int32Array")
-public class NativeInt32Array extends ArrayBufferView {
+public final class NativeInt32Array extends ArrayBufferView {
     private static final int BYTES_PER_ELEMENT = 4;
     private static final Factory FACTORY = new Factory(BYTES_PER_ELEMENT) {
         @Override
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeInt8Array.java b/nashorn/src/jdk/nashorn/internal/objects/NativeInt8Array.java
index 1d527ba9139..9ad7d24c280 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeInt8Array.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeInt8Array.java
@@ -36,7 +36,7 @@ import jdk.nashorn.internal.runtime.arrays.ArrayData;
  * Int8Array for the TypedArray extension
  */
 @ScriptClass("Int8Array")
-public class NativeInt8Array extends ArrayBufferView {
+public final class NativeInt8Array extends ArrayBufferView {
     private static final int BYTES_PER_ELEMENT = 1;
     private static final Factory FACTORY = new Factory(BYTES_PER_ELEMENT) {
         @Override
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java b/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java
index a4eef8068ca..f8aafb70bdd 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java
@@ -617,7 +617,7 @@ public final class NativeJSAdapter extends ScriptObject {
         case "getMethod":
             final FindProperty find = adaptee.findProperty(__call__, true);
             if (find != null) {
-                final ScriptFunction func = (ScriptFunction)getObjectValue(find);
+                final ScriptFunctionImpl func = (ScriptFunctionImpl)getObjectValue(find);
                 // TODO: It's a shame we need to produce a function bound to this and name, when we'd only need it bound
                 // to name. Probably not a big deal, but if we can ever make it leaner, it'd be nice.
                 return new GuardedInvocation(MH.dropArguments(MH.constant(Object.class,
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeJSON.java b/nashorn/src/jdk/nashorn/internal/objects/NativeJSON.java
index 5c7d74015f0..68f59a5b111 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeJSON.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeJSON.java
@@ -25,7 +25,6 @@
 
 package jdk.nashorn.internal.objects;
 
-import static jdk.nashorn.internal.runtime.ECMAErrors.syntaxError;
 import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
 import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 
@@ -36,25 +35,15 @@ import java.util.IdentityHashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import jdk.nashorn.internal.ir.LiteralNode;
-import jdk.nashorn.internal.ir.LiteralNode.ArrayLiteralNode;
-import jdk.nashorn.internal.ir.Node;
-import jdk.nashorn.internal.ir.ObjectNode;
-import jdk.nashorn.internal.ir.PropertyNode;
-import jdk.nashorn.internal.ir.UnaryNode;
 import jdk.nashorn.internal.objects.annotations.Attribute;
 import jdk.nashorn.internal.objects.annotations.Function;
 import jdk.nashorn.internal.objects.annotations.ScriptClass;
 import jdk.nashorn.internal.objects.annotations.Where;
-import jdk.nashorn.internal.parser.JSONParser;
-import jdk.nashorn.internal.parser.TokenType;
 import jdk.nashorn.internal.runtime.ConsString;
-import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.runtime.JSONFunctions;
 import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.ParserException;
 import jdk.nashorn.internal.runtime.ScriptFunction;
 import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.Source;
 import jdk.nashorn.internal.runtime.arrays.ArrayLikeIterator;
 import jdk.nashorn.internal.runtime.linker.Bootstrap;
 import jdk.nashorn.internal.runtime.linker.InvokeByName;
@@ -68,8 +57,6 @@ public final class NativeJSON extends ScriptObject {
     private static final InvokeByName TO_JSON = new InvokeByName("toJSON", ScriptObject.class, Object.class, Object.class);
     private static final MethodHandle REPLACER_INVOKER = Bootstrap.createDynamicInvoker("dyn:call", Object.class,
             ScriptFunction.class, ScriptObject.class, Object.class, Object.class);
-    private static final MethodHandle REVIVER_INVOKER = Bootstrap.createDynamicInvoker("dyn:call", Object.class,
-            ScriptFunction.class, ScriptObject.class, String.class, Object.class);
 
 
     NativeJSON() {
@@ -87,27 +74,7 @@ public final class NativeJSON extends ScriptObject {
      */
     @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
     public static Object parse(final Object self, final Object text, final Object reviver) {
-        final String     str     = JSType.toString(text);
-        final Context    context = Global.getThisContext();
-        final JSONParser parser  = new JSONParser(
-                new Source("<json>", str),
-                new Context.ThrowErrorManager(),
-                (context != null) ?
-                    context._strict :
-                    false);
-
-        Node node;
-
-        try {
-            node = parser.parse();
-        } catch (final ParserException e) {
-            syntaxError(e, "invalid.json", e.getMessage());
-            return UNDEFINED;
-        }
-
-        final Object unfiltered = convertNode(node);
-
-        return applyReviver(unfiltered, reviver);
+        return JSONFunctions.parse(text, reviver);
     }
 
     /**
@@ -198,136 +165,6 @@ public final class NativeJSON extends ScriptObject {
 
     // -- Internals only below this point
 
-    // parse helpers
-
-    // apply 'reviver' function if available
-    private static Object applyReviver(final Object unfiltered, final Object reviver) {
-        if (reviver instanceof ScriptFunction) {
-            final ScriptObject root = Global.newEmptyInstance();
-            root.set("", unfiltered, Global.isStrict());
-            return walk(root, "", (ScriptFunction)reviver);
-        }
-        return unfiltered;
-    }
-
-    // This is the abstract "Walk" operation from the spec.
-    private static Object walk(final ScriptObject holder, final Object name, final ScriptFunction reviver) {
-        final Object val = holder.get(name);
-        if (val == UNDEFINED) {
-            return val;
-        } else if (val instanceof ScriptObject) {
-            final ScriptObject     valueObj = (ScriptObject)val;
-            final boolean          strict   = Global.isStrict();
-            final Iterator<String> iter     = valueObj.propertyIterator();
-
-            while (iter.hasNext()) {
-                final String key        = iter.next();
-                final Object newElement = walk(valueObj, key, reviver);
-
-                if (newElement == UNDEFINED) {
-                    valueObj.delete(key, strict);
-                } else {
-                    valueObj.set(key, newElement, strict);
-                }
-            }
-
-            return valueObj;
-        } else if (isArray(val)) {
-            final NativeArray      valueArray = (NativeArray)val;
-            final boolean          strict     = Global.isStrict();
-            final Iterator<String> iter       = valueArray.propertyIterator();
-
-            while (iter.hasNext()) {
-                final String key        = iter.next();
-                final Object newElement = walk(valueArray, valueArray.get(key), reviver);
-
-                if (newElement == UNDEFINED) {
-                    valueArray.delete(key, strict);
-                } else {
-                    valueArray.set(key, newElement, strict);
-                }
-            }
-            return valueArray;
-        } else {
-            try {
-                // Object.class, ScriptFunction.class, ScriptObject.class, String.class, Object.class);
-                return REVIVER_INVOKER.invokeExact(reviver, holder, JSType.toString(name), val);
-            } catch(Error|RuntimeException t) {
-                throw t;
-            } catch(final Throwable t) {
-                throw new RuntimeException(t);
-            }
-        }
-    }
-
-    // Converts IR node to runtime value
-    private static Object convertNode(final Node node) {
-
-       if (node instanceof LiteralNode) {
-            // check for array literal
-            if (node.tokenType() == TokenType.ARRAY) {
-                assert node instanceof ArrayLiteralNode;
-                final Node[] elements = ((ArrayLiteralNode)node).getValue();
-
-                // NOTE: We cannot use LiteralNode.isNumericArray() here as that
-                // method uses symbols of element nodes. Since we don't do lower
-                // pass, there won't be any symbols!
-                if (isNumericArray(elements)) {
-                    final double[] values = new double[elements.length];
-                    int   index = 0;
-
-                    for (final Node elem : elements) {
-                        values[index++] = JSType.toNumber(convertNode(elem));
-                    }
-                    return Global.allocate(values);
-                }
-
-                final Object[] values = new Object[elements.length];
-                int   index = 0;
-
-                for (final Node elem : elements) {
-                    values[index++] = convertNode(elem);
-                }
-
-                return Global.allocate(values);
-            }
-
-            return ((LiteralNode<?>)node).getValue();
-
-        } else if (node instanceof ObjectNode) {
-            final ObjectNode   objNode  = (ObjectNode) node;
-            final ScriptObject object   = Global.newEmptyInstance();
-            final boolean      strict   = Global.isStrict();
-            final List<Node>   elements = objNode.getElements();
-
-            for (final Node elem : elements) {
-                final PropertyNode pNode     = (PropertyNode) elem;
-                final Node         valueNode = pNode.getValue();
-
-                object.set(pNode.getKeyName(), convertNode(valueNode), strict);
-            }
-
-            return object;
-        } else if (node instanceof UnaryNode) {
-            // UnaryNode used only to represent negative number JSON value
-            final UnaryNode unaryNode = (UnaryNode)node;
-            return -((LiteralNode<?>)unaryNode.rhs()).getNumber();
-        } else {
-            return null;
-        }
-    }
-
-    // does the given IR node represent a numeric array?
-    private static boolean isNumericArray(final Node[] values) {
-        for (final Node node : values) {
-            if (node instanceof LiteralNode && ((LiteralNode<?>)node).getValue() instanceof Number) {
-                continue;
-            }
-            return false;
-        }
-        return true;
-    }
-
     // stringify helpers.
 
     private static class StringifyState {
@@ -380,9 +217,9 @@ public final class NativeJSON extends ScriptObject {
         }
 
         if (value instanceof String) {
-            return JSONParser.quote((String)value);
+            return JSONFunctions.quote((String)value);
         } else if (value instanceof ConsString) {
-            return JSONParser.quote(value.toString());
+            return JSONFunctions.quote(value.toString());
         }
 
         if (value instanceof Number) {
@@ -421,7 +258,7 @@ public final class NativeJSON extends ScriptObject {
             if (strP != UNDEFINED) {
                 final StringBuilder member = new StringBuilder();
 
-                member.append(JSONParser.quote(p.toString())).append(':');
+                member.append(JSONFunctions.quote(p.toString())).append(':');
                 if (!state.gap.isEmpty()) {
                     member.append(' ');
                 }
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java b/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java
index 2c68a417fd6..5fa845d5141 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java
@@ -47,7 +47,7 @@ import org.dynalang.dynalink.support.TypeUtilities;
  * arrays, and so forth.
  */
 @ScriptClass("Java")
-public class NativeJava {
+public final class NativeJava {
 
     private NativeJava() {
     }
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeJavaImporter.java b/nashorn/src/jdk/nashorn/internal/objects/NativeJavaImporter.java
index b31f853bc14..22923b1c4fd 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeJavaImporter.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeJavaImporter.java
@@ -52,7 +52,7 @@ import org.dynalang.dynalink.linker.LinkRequest;
  * {@link NativeJava#type(Object, Object) Java.type()} method.
  */
 @ScriptClass("JavaImporter")
-public class NativeJavaImporter extends ScriptObject {
+public final class NativeJavaImporter extends ScriptObject {
     private final Object[] args;
 
     NativeJavaImporter(final Object[] args) {
@@ -121,7 +121,7 @@ public class NativeJavaImporter extends ScriptObject {
         final String name = desc.getNameToken(CallSiteDescriptor.NAME_OPERAND);
         final Object value = createProperty(name);
         if(value != null) {
-            set(name, value, getContext()._strict);
+            set(name, value, isStrictContext());
             return true;
         }
         return false;
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeRangeError.java b/nashorn/src/jdk/nashorn/internal/objects/NativeRangeError.java
index 460edf44b84..dcdd517edd2 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeRangeError.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeRangeError.java
@@ -40,7 +40,7 @@ import jdk.nashorn.internal.runtime.ScriptObject;
  *
  */
 @ScriptClass("Error")
-public class NativeRangeError extends ScriptObject {
+public final class NativeRangeError extends ScriptObject {
 
     /** message property in instance */
     @Property(name = NativeError.MESSAGE)
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeReferenceError.java b/nashorn/src/jdk/nashorn/internal/objects/NativeReferenceError.java
index 16d7752dfd5..a3ae89e8013 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeReferenceError.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeReferenceError.java
@@ -40,7 +40,7 @@ import jdk.nashorn.internal.runtime.ScriptObject;
  *
  */
 @ScriptClass("Error")
-public class NativeReferenceError extends ScriptObject {
+public final class NativeReferenceError extends ScriptObject {
 
     /** message property in instance */
     @Property(name = NativeError.MESSAGE)
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java b/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java
index 781d2333b35..19cca84bdc3 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java
@@ -41,10 +41,10 @@ import jdk.nashorn.internal.objects.annotations.Property;
 import jdk.nashorn.internal.objects.annotations.ScriptClass;
 import jdk.nashorn.internal.objects.annotations.SpecializedConstructor;
 import jdk.nashorn.internal.objects.annotations.Where;
-import jdk.nashorn.internal.parser.RegExp;
 import jdk.nashorn.internal.runtime.BitVector;
 import jdk.nashorn.internal.runtime.JSType;
 import jdk.nashorn.internal.runtime.ParserException;
+import jdk.nashorn.internal.runtime.RegExp;
 import jdk.nashorn.internal.runtime.RegExpMatch;
 import jdk.nashorn.internal.runtime.ScriptFunction;
 import jdk.nashorn.internal.runtime.ScriptObject;
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeRegExpExecResult.java b/nashorn/src/jdk/nashorn/internal/objects/NativeRegExpExecResult.java
index 628441cf541..5291c76a504 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeRegExpExecResult.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeRegExpExecResult.java
@@ -40,7 +40,7 @@ import jdk.nashorn.internal.runtime.arrays.ArrayData;
  * RegExp.prototype.exec method.
  */
 @ScriptClass("RegExpExecResult")
-public class NativeRegExpExecResult extends ScriptObject {
+public final class NativeRegExpExecResult extends ScriptObject {
     /** index property */
     @Property
     public Object index;
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeString.java b/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
index 6895426f298..20a40f99737 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
@@ -47,7 +47,6 @@ import jdk.nashorn.internal.objects.annotations.ScriptClass;
 import jdk.nashorn.internal.objects.annotations.SpecializedConstructor;
 import jdk.nashorn.internal.objects.annotations.SpecializedFunction;
 import jdk.nashorn.internal.objects.annotations.Where;
-import jdk.nashorn.internal.parser.Lexer;
 import jdk.nashorn.internal.runtime.ConsString;
 import jdk.nashorn.internal.runtime.JSType;
 import jdk.nashorn.internal.runtime.ScriptFunction;
@@ -1034,10 +1033,10 @@ public final class NativeString extends ScriptObject {
         int start = 0;
         int end   = len - 1;
 
-        while (start <= end && Lexer.isJSWhitespace(str.charAt(start))) {
+        while (start <= end && ScriptRuntime.isJSWhitespace(str.charAt(start))) {
             start++;
         }
-        while (end > start && Lexer.isJSWhitespace(str.charAt(end))) {
+        while (end > start && ScriptRuntime.isJSWhitespace(str.charAt(end))) {
             end--;
         }
 
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeSyntaxError.java b/nashorn/src/jdk/nashorn/internal/objects/NativeSyntaxError.java
index 477006f4005..db54c48397e 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeSyntaxError.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeSyntaxError.java
@@ -40,7 +40,7 @@ import jdk.nashorn.internal.runtime.ScriptObject;
  *
  */
 @ScriptClass("Error")
-public class NativeSyntaxError extends ScriptObject {
+public final class NativeSyntaxError extends ScriptObject {
 
     /** message property in instance */
     @Property(name = NativeError.MESSAGE)
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeTypeError.java b/nashorn/src/jdk/nashorn/internal/objects/NativeTypeError.java
index 9d7d524153a..5e87fbb2676 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeTypeError.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeTypeError.java
@@ -40,7 +40,7 @@ import jdk.nashorn.internal.runtime.ScriptObject;
  *
  */
 @ScriptClass("Error")
-public class NativeTypeError extends ScriptObject {
+public final class NativeTypeError extends ScriptObject {
 
     /** message property in instance */
     @Property(name = NativeError.MESSAGE)
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeURIError.java b/nashorn/src/jdk/nashorn/internal/objects/NativeURIError.java
index eaad3400939..958c14acd81 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeURIError.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeURIError.java
@@ -39,7 +39,7 @@ import jdk.nashorn.internal.runtime.ScriptObject;
  * ECMA 15.11.6.6 URIError
  */
 @ScriptClass("Error")
-public class NativeURIError extends ScriptObject {
+public final class NativeURIError extends ScriptObject {
 
     /** message property in instance */
     @Property(name = NativeError.MESSAGE)
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeUint16Array.java b/nashorn/src/jdk/nashorn/internal/objects/NativeUint16Array.java
index 1e508963294..740bb394511 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeUint16Array.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeUint16Array.java
@@ -36,7 +36,7 @@ import jdk.nashorn.internal.runtime.arrays.ArrayData;
  * Uint16 array for TypedArray extension
  */
 @ScriptClass("Uint16Array")
-public class NativeUint16Array extends ArrayBufferView {
+public final class NativeUint16Array extends ArrayBufferView {
     private static final int BYTES_PER_ELEMENT = 2;
     private static final Factory FACTORY = new Factory(BYTES_PER_ELEMENT) {
         @Override
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeUint32Array.java b/nashorn/src/jdk/nashorn/internal/objects/NativeUint32Array.java
index 8956fe5583e..7ad8a9390a1 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeUint32Array.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeUint32Array.java
@@ -36,7 +36,7 @@ import jdk.nashorn.internal.runtime.arrays.ArrayData;
  * Uint32 array for TypedArray extension
  */
 @ScriptClass("Uint32Array")
-public class NativeUint32Array extends ArrayBufferView {
+public final class NativeUint32Array extends ArrayBufferView {
     private static final int BYTES_PER_ELEMENT = 4;
     private static final Factory FACTORY = new Factory(BYTES_PER_ELEMENT) {
         @Override
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeUint8Array.java b/nashorn/src/jdk/nashorn/internal/objects/NativeUint8Array.java
index 349a43c33db..7d506c1d6b9 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeUint8Array.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeUint8Array.java
@@ -36,7 +36,7 @@ import jdk.nashorn.internal.runtime.arrays.ArrayData;
  * Uint8 array for TypedArray extension
  */
 @ScriptClass("Uint8Array")
-public class NativeUint8Array extends ArrayBufferView {
+public final class NativeUint8Array extends ArrayBufferView {
     private static final int BYTES_PER_ELEMENT = 1;
     private static final Factory FACTORY = new Factory(BYTES_PER_ELEMENT) {
         @Override
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeUint8ClampedArray.java b/nashorn/src/jdk/nashorn/internal/objects/NativeUint8ClampedArray.java
index 8ce922476af..e3bacc2b9db 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeUint8ClampedArray.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeUint8ClampedArray.java
@@ -37,7 +37,7 @@ import jdk.nashorn.internal.runtime.arrays.ArrayData;
  * Uint8 clamped array for TypedArray extension
  */
 @ScriptClass("Uint8ClampedArray")
-public class NativeUint8ClampedArray extends ArrayBufferView {
+public final class NativeUint8ClampedArray extends ArrayBufferView {
     private static final int BYTES_PER_ELEMENT = 1;
     private static final Factory FACTORY = new Factory(BYTES_PER_ELEMENT) {
         @Override
diff --git a/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java b/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
index f3b4a665908..9caf498aa90 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
@@ -30,12 +30,12 @@ import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
-import jdk.nashorn.internal.codegen.objects.FunctionObjectCreator;
+
+import jdk.nashorn.internal.runtime.ScriptFunctionData;
 import jdk.nashorn.internal.runtime.GlobalFunctions;
 import jdk.nashorn.internal.runtime.Property;
 import jdk.nashorn.internal.runtime.PropertyMap;
 import jdk.nashorn.internal.runtime.ScriptFunction;
-import jdk.nashorn.internal.runtime.ScriptFunctionData;
 import jdk.nashorn.internal.runtime.ScriptObject;
 import jdk.nashorn.internal.runtime.ScriptRuntime;
 import jdk.nashorn.internal.runtime.linker.Lookup;
@@ -184,7 +184,7 @@ public class ScriptFunctionImpl extends ScriptFunction {
      * @param strict are we in strict mode
      * @return new ScriptFunction
      */
-    public static ScriptFunction makeFunction(final String name, final MethodHandle methodHandle, final MethodHandle[] specs, final boolean strict) {
+    static ScriptFunction makeFunction(final String name, final MethodHandle methodHandle, final MethodHandle[] specs, final boolean strict) {
         final ScriptFunctionImpl func = new ScriptFunctionImpl(name, methodHandle, null, specs, strict, true);
         func.setConstructHandle(null);
         func.setPrototype(UNDEFINED);
@@ -200,7 +200,7 @@ public class ScriptFunctionImpl extends ScriptFunction {
      * @param specs  specialized versions of function if available, null otherwise
      * @return new ScriptFunction
      */
-    public static ScriptFunction makeFunction(final String name, final MethodHandle methodHandle, final MethodHandle[] specs) {
+    static ScriptFunction makeFunction(final String name, final MethodHandle methodHandle, final MethodHandle[] specs) {
         return makeFunction(name, methodHandle, specs, false);
     }
 
@@ -211,7 +211,7 @@ public class ScriptFunctionImpl extends ScriptFunction {
      * @param methodHandle handle for invocation
      * @return new ScriptFunction
      */
-    public static ScriptFunction makeFunction(final String name, final MethodHandle methodHandle) {
+    static ScriptFunction makeFunction(final String name, final MethodHandle methodHandle) {
         return makeFunction(name, methodHandle, null);
     }
 
@@ -223,7 +223,7 @@ public class ScriptFunctionImpl extends ScriptFunction {
      * @param args arguments to bind
      */
     @Override
-    public ScriptFunction makeBoundFunction(final Object thiz, final Object[] args) {
+    protected ScriptFunction makeBoundFunction(final Object thiz, final Object[] args) {
         Object[] allArgs = args;
 
         if (allArgs == null) {
diff --git a/nashorn/src/jdk/nashorn/internal/parser/AbstractParser.java b/nashorn/src/jdk/nashorn/internal/parser/AbstractParser.java
index 5dd5d187bbb..6a91565be77 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/AbstractParser.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/AbstractParser.java
@@ -37,6 +37,7 @@ import jdk.nashorn.internal.runtime.ECMAErrors;
 import jdk.nashorn.internal.runtime.ErrorManager;
 import jdk.nashorn.internal.runtime.JSErrorType;
 import jdk.nashorn.internal.runtime.ParserException;
+import jdk.nashorn.internal.runtime.RegExp;
 import jdk.nashorn.internal.runtime.Source;
 
 /**
diff --git a/nashorn/src/jdk/nashorn/internal/parser/Lexer.java b/nashorn/src/jdk/nashorn/internal/parser/Lexer.java
index 954b2a5a24e..5b890b350d5 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/Lexer.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/Lexer.java
@@ -289,7 +289,7 @@ public class Lexer extends Scanner {
         add(type, start, position);
     }
 
-    static String getWhitespaceRegExp() {
+    public static String getWhitespaceRegExp() {
         return JAVASCRIPT_WHITESPACE_IN_REGEXP;
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ArgumentSetter.java b/nashorn/src/jdk/nashorn/internal/runtime/ArgumentSetter.java
index bc5b6d38709..5efca4a7436 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ArgumentSetter.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ArgumentSetter.java
@@ -32,7 +32,8 @@ import jdk.nashorn.internal.codegen.CompilerConstants.Call;
  * A class with static helper methods invoked from generated bytecode for setting values of parameters of variable-arity
  * functions.
  */
-public class ArgumentSetter {
+public final class ArgumentSetter {
+    private ArgumentSetter() {}
 
     /** Method handle for setting a function argument at a given index in an arguments object. Used from generated bytecode */
     public static final Call SET_ARGUMENT      = staticCall(ArgumentSetter.class, "setArgument", void.class, Object.class, ScriptObject.class, int.class);
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/BitVector.java b/nashorn/src/jdk/nashorn/internal/runtime/BitVector.java
index 59580b24e6e..b64e1bd4867 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/BitVector.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/BitVector.java
@@ -30,7 +30,7 @@ import java.util.Arrays;
 /**
  * Faster implementation of BitSet
  */
-public class BitVector implements Cloneable {
+public final class BitVector implements Cloneable {
     /** Number of bits per slot. */
     private static final int BITSPERSLOT = 64;
 
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ConsString.java b/nashorn/src/jdk/nashorn/internal/runtime/ConsString.java
index 5a15fdf6e94..9cf51552f94 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ConsString.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ConsString.java
@@ -33,7 +33,7 @@ import java.util.Deque;
  * instances of <tt>ConsString</tt> or {@link String}. Copying of characters to
  * a proper string is delayed until it becomes necessary.
  */
-public class ConsString implements CharSequence {
+public final class ConsString implements CharSequence {
 
     private CharSequence left, right;
     final private int length;
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Context.java b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
index 46a3a7b7197..4f5cb1296fd 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/Context.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
@@ -36,6 +36,7 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
+import java.lang.reflect.Constructor;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.security.AccessController;
@@ -84,11 +85,11 @@ public final class Context {
             Class<?> caller = Reflection.getCallerClass(2);
             ClassLoader callerLoader = caller.getClassLoader();
 
-            // Allow this method only for nashorn's own classes, script
-            // generated classes and Java adapter classes. Rest should
+            // Allow this method only for nashorn's own classes, objects
+            // package classes and Java adapter classes. Rest should
             // have the necessary security permission.
             if (callerLoader != myLoader &&
-                !(callerLoader instanceof NashornLoader) &&
+                !(callerLoader instanceof StructureLoader) &&
                 !(JavaAdapterFactory.isAdapterClass(caller))) {
                 sm.checkPermission(new RuntimePermission("getNashornGlobal"));
             }
@@ -332,7 +333,7 @@ public final class Context {
              new PrivilegedAction<ClassLoader>() {
                 @Override
                 public ClassLoader run() {
-                    final ClassLoader structureLoader = new StructureLoader(sharedLoader, Context.this);
+                    final StructureLoader structureLoader = new StructureLoader(sharedLoader, Context.this);
                     return new ScriptLoader(structureLoader, Context.this);
                 }
              });
@@ -959,7 +960,7 @@ public final class Context {
                     // Generated code won't refer to any class generated by context
                     // script loader and so parent loader can be the structure
                     // loader -- which is parent of the context script loader.
-                    return new ScriptLoader(scriptLoader.getParent(), Context.this);
+                    return new ScriptLoader((StructureLoader)scriptLoader.getParent(), Context.this);
                 }
              });
     }
@@ -967,10 +968,15 @@ public final class Context {
     private ScriptObject newGlobalTrusted() {
         try {
             final Class<?> clazz = Class.forName("jdk.nashorn.internal.objects.Global", true, scriptLoader);
-            return (ScriptObject) clazz.newInstance();
-        } catch (final ClassNotFoundException | SecurityException | InstantiationException | IllegalAccessException | IllegalArgumentException e) {
+            final Constructor cstr = clazz.getConstructor(Context.class);
+            return (ScriptObject) cstr.newInstance(this);
+        } catch (final Exception e) {
             printStackTrace(e);
-            throw new RuntimeException(e);
+            if (e instanceof RuntimeException) {
+                throw (RuntimeException)e;
+            } else {
+                throw new RuntimeException(e);
+            }
         }
     }
 }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Debug.java b/nashorn/src/jdk/nashorn/internal/runtime/Debug.java
index a087792c6c4..b712f1d0401 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/Debug.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Debug.java
@@ -36,7 +36,7 @@ import jdk.nashorn.internal.parser.TokenType;
  * Utilities for debugging Nashorn.
  *
  */
-public class Debug {
+public final class Debug {
     private Debug() {
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/DebugLogger.java b/nashorn/src/jdk/nashorn/internal/runtime/DebugLogger.java
index 352750e5f07..dbbaeef6f2a 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/DebugLogger.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/DebugLogger.java
@@ -34,7 +34,7 @@ import jdk.nashorn.internal.runtime.options.Options;
  * Wrapper class for Logging system. This is how you are supposed to register a logger and use it
  */
 
-public class DebugLogger {
+public final class DebugLogger {
     @SuppressWarnings("NonConstantLogger")
     private final Logger  logger;
     private final boolean isEnabled;
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/GlobalFunctions.java b/nashorn/src/jdk/nashorn/internal/runtime/GlobalFunctions.java
index 425548433f2..96ce6c33063 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/GlobalFunctions.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/GlobalFunctions.java
@@ -37,7 +37,7 @@ import java.lang.invoke.MethodHandles;
  * These are actual implementation methods for functions exposed by global
  * scope. The code lives here to share the code across the contexts.
  */
-public class GlobalFunctions {
+public final class GlobalFunctions {
 
     /** Methodhandle to implementation of ECMA 15.1.2.2, parseInt */
     public static final MethodHandle PARSEINT = findOwnMH("parseInt",   double.class, Object.class, Object.class, Object.class);
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/JSONFunctions.java b/nashorn/src/jdk/nashorn/internal/runtime/JSONFunctions.java
new file mode 100644
index 00000000000..4a2f73d55d1
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/JSONFunctions.java
@@ -0,0 +1,224 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import static jdk.nashorn.internal.runtime.ScriptObject.isArray;
+
+import java.lang.invoke.MethodHandle;
+import java.util.Iterator;
+import java.util.List;
+import jdk.nashorn.internal.ir.LiteralNode;
+import jdk.nashorn.internal.ir.Node;
+import jdk.nashorn.internal.ir.ObjectNode;
+import jdk.nashorn.internal.ir.PropertyNode;
+import jdk.nashorn.internal.ir.UnaryNode;
+import jdk.nashorn.internal.parser.JSONParser;
+import jdk.nashorn.internal.parser.TokenType;
+import jdk.nashorn.internal.runtime.linker.Bootstrap;
+
+/**
+ * Utilities used by "JSON" object implementation.
+ */
+public final class JSONFunctions {
+    private JSONFunctions() {}
+    private static final MethodHandle REVIVER_INVOKER = Bootstrap.createDynamicInvoker("dyn:call", Object.class,
+            ScriptFunction.class, ScriptObject.class, String.class, Object.class);
+
+    /**
+     * Returns JSON-compatible quoted version of the given string.
+     *
+     * @param str String to be quoted
+     * @return JSON-compatible quoted string
+     */
+    public static String quote(final String str) {
+        return JSONParser.quote(str);
+    }
+
+    /**
+     * Parses the given JSON text string and returns object representation.
+     *
+     * @param text JSON text to be parsed
+     * @param reviver  optional value: function that takes two parameters (key, value)
+     * @return Object representation of JSON text given
+     */
+    public static Object parse(final Object text, final Object reviver) {
+        final String     str     = JSType.toString(text);
+        final Context    context = Context.getContextTrusted();
+        final JSONParser parser  = new JSONParser(
+                new Source("<json>", str),
+                new Context.ThrowErrorManager(),
+                (context != null) ?
+                    context._strict :
+                    false);
+
+        Node node;
+
+        try {
+            node = parser.parse();
+        } catch (final ParserException e) {
+            ECMAErrors.syntaxError(e, "invalid.json", e.getMessage());
+            return ScriptRuntime.UNDEFINED;
+        }
+
+        final ScriptObject global = Context.getGlobalTrusted();
+        Object unfiltered = convertNode(global, node);
+        return applyReviver(global, unfiltered, reviver);
+    }
+
+    // -- Internals only below this point
+
+    // parse helpers
+
+    // apply 'reviver' function if available
+    private static Object applyReviver(final ScriptObject global, final Object unfiltered, final Object reviver) {
+        if (reviver instanceof ScriptFunction) {
+            assert global instanceof GlobalObject;
+            final ScriptObject root = ((GlobalObject)global).newObject();
+            root.set("", unfiltered, root.isStrictContext());
+            return walk(root, "", (ScriptFunction)reviver);
+        }
+        return unfiltered;
+    }
+
+    // This is the abstract "Walk" operation from the spec.
+    private static Object walk(final ScriptObject holder, final Object name, final ScriptFunction reviver) {
+        final Object val = holder.get(name);
+        if (val == ScriptRuntime.UNDEFINED) {
+            return val;
+        } else if (val instanceof ScriptObject) {
+            final ScriptObject     valueObj = (ScriptObject)val;
+            final boolean          strict   = valueObj.isStrictContext();
+            final Iterator<String> iter     = valueObj.propertyIterator();
+
+            while (iter.hasNext()) {
+                final String key        = iter.next();
+                final Object newElement = walk(valueObj, key, reviver);
+
+                if (newElement == ScriptRuntime.UNDEFINED) {
+                    valueObj.delete(key, strict);
+                } else {
+                    valueObj.set(key, newElement, strict);
+                }
+            }
+
+            return valueObj;
+        } else if (isArray(val)) {
+            final ScriptObject      valueArray = (ScriptObject)val;
+            final boolean          strict     = valueArray.isStrictContext();
+            final Iterator<String> iter       = valueArray.propertyIterator();
+
+            while (iter.hasNext()) {
+                final String key        = iter.next();
+                final Object newElement = walk(valueArray, valueArray.get(key), reviver);
+
+                if (newElement == ScriptRuntime.UNDEFINED) {
+                    valueArray.delete(key, strict);
+                } else {
+                    valueArray.set(key, newElement, strict);
+                }
+            }
+            return valueArray;
+        } else {
+            try {
+                // Object.class, ScriptFunction.class, ScriptObject.class, String.class, Object.class);
+                return REVIVER_INVOKER.invokeExact(reviver, holder, JSType.toString(name), val);
+            } catch(Error|RuntimeException t) {
+                throw t;
+            } catch(final Throwable t) {
+                throw new RuntimeException(t);
+            }
+        }
+    }
+
+    // Converts IR node to runtime value
+    private static Object convertNode(final ScriptObject global, final Node node) {
+        assert global instanceof GlobalObject;
+
+        if (node instanceof LiteralNode) {
+            // check for array literal
+            if (node.tokenType() == TokenType.ARRAY) {
+                assert node instanceof LiteralNode.ArrayLiteralNode;
+                final Node[] elements = ((LiteralNode.ArrayLiteralNode)node).getValue();
+
+                // NOTE: We cannot use LiteralNode.isNumericArray() here as that
+                // method uses symbols of element nodes. Since we don't do lower
+                // pass, there won't be any symbols!
+                if (isNumericArray(elements)) {
+                    final double[] values = new double[elements.length];
+                    int   index = 0;
+
+                    for (final Node elem : elements) {
+                        values[index++] = JSType.toNumber(convertNode(global, elem));
+                    }
+                    return ((GlobalObject)global).wrapAsObject(values);
+                }
+
+                final Object[] values = new Object[elements.length];
+                int   index = 0;
+
+                for (final Node elem : elements) {
+                    values[index++] = convertNode(global, elem);
+                }
+
+                return ((GlobalObject)global).wrapAsObject(values);
+            }
+
+            return ((LiteralNode<?>)node).getValue();
+
+        } else if (node instanceof ObjectNode) {
+            final ObjectNode   objNode  = (ObjectNode) node;
+            final ScriptObject object   = ((GlobalObject)global).newObject();
+            final boolean      strict   = global.isStrictContext();
+            final List<Node>   elements = objNode.getElements();
+
+            for (final Node elem : elements) {
+                final PropertyNode pNode     = (PropertyNode) elem;
+                final Node         valueNode = pNode.getValue();
+
+                object.set(pNode.getKeyName(), convertNode(global, valueNode), strict);
+            }
+
+            return object;
+        } else if (node instanceof UnaryNode) {
+            // UnaryNode used only to represent negative number JSON value
+            final UnaryNode unaryNode = (UnaryNode)node;
+            return -((LiteralNode<?>)unaryNode.rhs()).getNumber();
+        } else {
+            return null;
+        }
+    }
+
+    // does the given IR node represent a numeric array?
+    private static boolean isNumericArray(final Node[] values) {
+        for (final Node node : values) {
+            if (node instanceof LiteralNode && ((LiteralNode<?>)node).getValue() instanceof Number) {
+                continue;
+            }
+            return false;
+        }
+        return true;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Logging.java b/nashorn/src/jdk/nashorn/internal/runtime/Logging.java
index 6aca193c325..8a69ebf93a7 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/Logging.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Logging.java
@@ -40,7 +40,7 @@ import java.util.logging.Logger;
  * specified on the command line. Supports all standard log levels
  *
  */
-public class Logging {
+public final class Logging {
 
     private Logging() {
     }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/NashornLoader.java b/nashorn/src/jdk/nashorn/internal/runtime/NashornLoader.java
index 57c33c1dd0b..cf82ac67f3a 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/NashornLoader.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/NashornLoader.java
@@ -51,13 +51,16 @@ abstract class NashornLoader extends SecureClassLoader {
         this.context = context;
     }
 
+
     /**
-     * Override loadClass so that we can checkPackageAccess.
+     * Called by subclass after package access check is done
+     * @param name name of the class to be loaded
+     * @param resolve whether the class should be resolved or not
+     * @return Class object
+     * @throws ClassNotFoundException
      */
-    @Override
-    public Class<?> loadClass(final String name) throws ClassNotFoundException {
-        checkPackageAccess(name);
-        return super.loadClass(name);
+    protected final Class<?> loadClassTrusted(final String name, final boolean resolve) throws ClassNotFoundException {
+        return super.loadClass(name, resolve);
     }
 
     protected static void checkPackageAccess(final String name) {
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/NativeJavaPackage.java b/nashorn/src/jdk/nashorn/internal/runtime/NativeJavaPackage.java
index 1809247e750..296473a390b 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/NativeJavaPackage.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/NativeJavaPackage.java
@@ -64,7 +64,7 @@ import org.dynalang.dynalink.linker.LinkRequest;
  * var ftype4 = Java.asType("java.awt.geom.Arc2D").Float
  * </pre>
  */
-public class NativeJavaPackage extends ScriptObject {
+public final class NativeJavaPackage extends ScriptObject {
     /** Full name of package (includes path.) */
     private final String name;
 
diff --git a/nashorn/src/jdk/nashorn/internal/parser/RegExp.java b/nashorn/src/jdk/nashorn/internal/runtime/RegExp.java
similarity index 96%
rename from nashorn/src/jdk/nashorn/internal/parser/RegExp.java
rename to nashorn/src/jdk/nashorn/internal/runtime/RegExp.java
index 1b20eab7419..b318b754ab1 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/RegExp.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/RegExp.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.parser;
+package jdk.nashorn.internal.runtime;
 
 import static java.util.regex.Pattern.CASE_INSENSITIVE;
 import static java.util.regex.Pattern.MULTILINE;
@@ -32,9 +32,6 @@ import static java.util.regex.Pattern.UNICODE_CASE;
 import java.util.HashSet;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
-import jdk.nashorn.internal.runtime.BitVector;
-import jdk.nashorn.internal.runtime.ECMAErrors;
-import jdk.nashorn.internal.runtime.ParserException;
 
 /**
  * This class is used to represent a parsed regular expression. Accepts input
diff --git a/nashorn/src/jdk/nashorn/internal/parser/RegExpScanner.java b/nashorn/src/jdk/nashorn/internal/runtime/RegExpScanner.java
similarity index 99%
rename from nashorn/src/jdk/nashorn/internal/parser/RegExpScanner.java
rename to nashorn/src/jdk/nashorn/internal/runtime/RegExpScanner.java
index fba2f3f2471..0d7038e6627 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/RegExpScanner.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/RegExpScanner.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.parser;
+package jdk.nashorn.internal.runtime;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -33,13 +33,14 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.regex.PatternSyntaxException;
-import jdk.nashorn.internal.runtime.BitVector;
+import jdk.nashorn.internal.parser.Lexer;
+import jdk.nashorn.internal.parser.Scanner;
 
 /**
  * Scan a JavaScript regexp, converting to Java regex if necessary.
  *
  */
-public class RegExpScanner extends Scanner {
+final class RegExpScanner extends Scanner {
 
     /**
      * String builder to accumulate the result - this contains verbatim parsed JavaScript.
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
index 4542c8f7ebd..17e5b2d15a7 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
@@ -377,7 +377,7 @@ public abstract class ScriptFunction extends ScriptObject {
      * @param args other arguments (beside self) to bind the function to
      * @return the bound function
      */
-    public abstract ScriptFunction makeBoundFunction(Object self, Object[] args);
+    protected abstract ScriptFunction makeBoundFunction(Object self, Object[] args);
 
 
     @Override
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunctionData.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunctionData.java
index c72037c24a0..a701ceabeb7 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunctionData.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunctionData.java
@@ -38,7 +38,7 @@ import jdk.nashorn.internal.parser.TokenType;
  * Instances of this class are created during codegen and stored in script classes'
  * constants array to reduce function instantiation overhead during runtime.
  */
-public class ScriptFunctionData {
+public final class ScriptFunctionData {
 
     // per-function object flags
     private static final int IS_STRICT  = 0b0000_0001;
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptLoader.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptLoader.java
index 4d89292a14b..689ca1ab5a9 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptLoader.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptLoader.java
@@ -28,34 +28,17 @@ package jdk.nashorn.internal.runtime;
 import java.security.CodeSource;
 
 /**
- * Responsible for loading generated and disk based classes.
+ * Responsible for loading script generated classes.
  *
  */
 final class ScriptLoader extends NashornLoader {
     /**
      * Constructor.
      */
-    ScriptLoader(final ClassLoader parent, final Context context) {
+    ScriptLoader(final StructureLoader parent, final Context context) {
         super(parent, context);
     }
 
-    @Override
-    protected synchronized Class<?> loadClass(final String name, final boolean resolve) throws ClassNotFoundException {
-        checkPackageAccess(name);
-
-        // check the cache first
-        Class<?> cl = findLoadedClass(name);
-        if (cl == null) {
-            cl = getParent().loadClass(name);
-        }
-
-        if (resolve) {
-            resolveClass(cl);
-        }
-
-        return cl;
-    }
-
     // package-private and private stuff below this point
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
index c12ec723a39..33a68a8cd26 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
@@ -1053,7 +1053,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
      * Return the current context from the object's map.
      * @return Current context.
      */
-    protected final Context getContext() {
+    final Context getContext() {
         return getMap().getContext();
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java
index 9ff04880c25..4b455621f24 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java
@@ -36,8 +36,11 @@ import java.lang.invoke.MethodHandle;
 import java.lang.reflect.Array;
 import java.util.Collections;
 import java.util.Iterator;
+import java.util.NoSuchElementException;
 import java.util.Objects;
 import jdk.nashorn.internal.codegen.CompilerConstants.Call;
+import jdk.nashorn.internal.ir.debug.JSONWriter;
+import jdk.nashorn.internal.parser.Lexer;
 import jdk.nashorn.internal.runtime.linker.Bootstrap;
 import org.dynalang.dynalink.beans.StaticClass;
 
@@ -265,6 +268,9 @@ public final class ScriptRuntime {
 
                 @Override
                 public Object next() {
+                    if (index >= length) {
+                        throw new NoSuchElementException();
+                    }
                     return Array.get(array, index++);
                 }
 
@@ -376,6 +382,28 @@ public final class ScriptRuntime {
         return (x == y);
     }
 
+    /**
+     * Returns AST as JSON compatible string. This is used to
+     * implement "parse" function in resources/parse.js script.
+     *
+     * @param code code to be parsed
+     * @param name name of the code source (used for location)
+     * @param includeLoc tells whether to include location information for nodes or not
+     * @return JSON string representation of AST of the supplied code
+     */
+    public static String parse(final String code, final String name, final boolean includeLoc) {
+        return JSONWriter.parse(Context.getContextTrusted(), code, name, includeLoc);
+    }
+
+    /**
+     * Test whether a char is valid JavaScript whitespace
+     * @param ch a char
+     * @return true if valid JavaScript whitespace
+     */
+    public static boolean isJSWhitespace(final char ch) {
+        return Lexer.isJSWhitespace(ch);
+    }
+
     /**
      * Entering a {@code with} node requires new scope. This is the implementation
      *
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java
index 71011395b46..523179ad820 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java
@@ -37,15 +37,13 @@ import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
-import java.util.HashMap;
 import java.util.Map;
-import java.util.Set;
 import java.util.StringTokenizer;
 
 /**
  * Global functions supported only in scripting mode.
  */
-public class ScriptingFunctions {
+public final class ScriptingFunctions {
 
     /** Handle to implementation of {@link ScriptingFunctions#readLine} - Nashorn extension */
     public static final MethodHandle READLINE = findOwnMH("readLine", Object.class, Object.class);
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/SetMethodCreator.java b/nashorn/src/jdk/nashorn/internal/runtime/SetMethodCreator.java
index fc75cf9f586..6bd3a3fdcc4 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/SetMethodCreator.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/SetMethodCreator.java
@@ -43,7 +43,7 @@ import org.dynalang.dynalink.linker.GuardedInvocation;
  * {@link ScriptObject#findSetMethod(CallSiteDescriptor, org.dynalang.dynalink.linker.LinkRequest)} and
  * serve as the actual encapsulation of the algorithm for creating an appropriate property setter method.
  */
-class SetMethodCreator {
+final class SetMethodCreator {
     // See constructor parameters for description of fields
     private final ScriptObject sobj;
     private final PropertyMap map;
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/StructureLoader.java b/nashorn/src/jdk/nashorn/internal/runtime/StructureLoader.java
index 18f3c30ded7..b14e43ccd31 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/StructureLoader.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/StructureLoader.java
@@ -104,7 +104,7 @@ final class StructureLoader extends NashornLoader {
             }
         }
 
-        return super.loadClass(name, resolve);
+        return super.loadClassTrusted(name, resolve);
     }
 
 
@@ -117,8 +117,6 @@ final class StructureLoader extends NashornLoader {
         return super.findClass(name);
     }
 
-    private static final boolean IS_JAVA_7 = System.getProperty("java.version").indexOf("1.7") != -1;
-
     /**
      * Generate a layout class.
      * @param name       Name of class.
@@ -133,13 +131,6 @@ final class StructureLoader extends NashornLoader {
         }
 
         final byte[] code = new ObjectClassGenerator(context).generate(descriptor);
-
-        try {
-            return IS_JAVA_7 ? sun.misc.Unsafe.getUnsafe().defineClass(name, code, 0, code.length) : defineClass(name, code, 0, code.length);
-        } catch (final SecurityException e) {
-            throw new AssertionError("Nashorn needs to run in the bootclasspath when using Java7, or the NoClassDefFoundError bug in Java7 will trigger." +
-                                     "(This may not be enough - it has been known to happen anyway. Please use Java8)");
-        }
-
+        return defineClass(name, code, 0, code.length);
     }
 }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java b/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java
index 84e4d542ca9..b16cf923acb 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java
@@ -40,7 +40,7 @@ import org.dynalang.dynalink.support.CallSiteDescriptorFactory;
  * This class supports the handling of scope in a with body.
  *
  */
-public class WithObject extends ScriptObject implements Scope {
+public final class WithObject extends ScriptObject implements Scope {
 
     private static final MethodHandle WITHEXPRESSIONFILTER = findOwnMH("withFilterExpression", Object.class, Object.class);
     private static final MethodHandle WITHSCOPEFILTER      = findOwnMH("withFilterScope",      Object.class, Object.class);
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/EmptyArrayLikeIterator.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/EmptyArrayLikeIterator.java
index 0feab2fa5db..5264283a3a9 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/EmptyArrayLikeIterator.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/EmptyArrayLikeIterator.java
@@ -25,6 +25,8 @@
 
 package jdk.nashorn.internal.runtime.arrays;
 
+import java.util.NoSuchElementException;
+
 /**
  * Dummy array iterator that has no elements
  */
@@ -41,7 +43,7 @@ final class EmptyArrayLikeIterator extends ArrayLikeIterator<Object> {
 
     @Override
     public Object next() {
-        return null;
+        throw new NoSuchElementException();
     }
 
     @Override
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/MapIterator.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/MapIterator.java
index 6eaa216229c..be9bc23dd1e 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/MapIterator.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/MapIterator.java
@@ -25,6 +25,7 @@
 
 package jdk.nashorn.internal.runtime.arrays;
 
+import java.util.NoSuchElementException;
 import jdk.nashorn.internal.runtime.JSType;
 import jdk.nashorn.internal.runtime.ScriptObject;
 
@@ -71,6 +72,10 @@ class MapIterator extends ArrayLikeIterator<Object> {
 
     @Override
     public Object next() {
-        return indexInArray() ? obj.get(bumpIndex()) : null;
+        if (indexInArray()) {
+            return obj.get(bumpIndex());
+        }
+
+        throw new NoSuchElementException();
     }
 }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/Bootstrap.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/Bootstrap.java
index a658960ac29..73d3663a978 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/Bootstrap.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/Bootstrap.java
@@ -29,9 +29,11 @@ import static jdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
 
 import java.lang.invoke.CallSite;
 import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodHandles.Lookup;
 import java.lang.invoke.MethodType;
 import jdk.nashorn.internal.codegen.CompilerConstants.Call;
+import jdk.nashorn.internal.codegen.RuntimeCallSite;
 import jdk.nashorn.internal.runtime.options.Options;
 import org.dynalang.dynalink.CallSiteDescriptor;
 import org.dynalang.dynalink.DynamicLinker;
@@ -79,6 +81,20 @@ public final class Bootstrap {
         return dynamicLinker.link(LinkerCallSite.newLinkerCallSite(opDesc, type, flags));
     }
 
+    /**
+     * Bootstrapper for a specialized Runtime call
+     *
+     * @param lookup       lookup
+     * @param initialName  initial name for callsite
+     * @param type         method type for call site
+     *
+     * @return callsite for a runtime node
+     */
+    public static CallSite runtimeBootstrap(final MethodHandles.Lookup lookup, final String initialName, final MethodType type) {
+        return new RuntimeCallSite(type, initialName);
+    }
+
+
     /**
      * Returns a dynamic invoker for a specified dynamic operation. You can use this method to create a method handle
      * that when invoked acts completely as if it were a Nashorn-linked call site. An overview of available dynamic
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/resources/parser.js b/nashorn/src/jdk/nashorn/internal/runtime/resources/parser.js
index a721fd97c8d..b89f7e12873 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/resources/parser.js
+++ b/nashorn/src/jdk/nashorn/internal/runtime/resources/parser.js
@@ -47,7 +47,7 @@ function parse(/*code, [name], [location]*/) {
             code = arguments[0];
     }
 
-    var jsonStr = Packages.jdk.nashorn.internal.ir.debug.JSONWriter.parse(code, name, location);
+    var jsonStr = Packages.jdk.nashorn.internal.runtime.ScriptRuntime.parse(code, name, location);
     return JSON.parse(jsonStr,
         function (prop, value) {
             if (typeof(value) == 'string' && prop == "value") {
diff --git a/nashorn/test/script/sandbox/nashorninternals.js b/nashorn/test/script/sandbox/nashorninternals.js
new file mode 100644
index 00000000000..4072e0719a8
--- /dev/null
+++ b/nashorn/test/script/sandbox/nashorninternals.js
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/**
+ * Test to check that nashorn "internal" classes in codegen, parser, ir 
+ * packages cannot * be accessed from sandbox scripts.
+ *
+ * @test
+ * @run
+ * @security
+ */
+
+function checkClass(name) {
+    try {
+        Java.type(name);
+        fail("should have thrown exception for: " + name);
+    } catch (e) {
+        if (! (e instanceof java.lang.SecurityException)) {
+            fail("Expected SecurityException, but got " + e);
+        }
+    }
+}
+
+// Not exhaustive - but a representative list of classes
+checkClass("jdk.nashorn.internal.codegen.Compiler");
+checkClass("jdk.nashorn.internal.codegen.objects.MapCreator");
+checkClass("jdk.nashorn.internal.codegen.types.Type");
+checkClass("jdk.nashorn.internal.ir.Node");
+checkClass("jdk.nashorn.internal.ir.FunctionNode");
+checkClass("jdk.nashorn.internal.ir.debug.JSONWriter");
+checkClass("jdk.nashorn.internal.ir.visitor.NodeVisitor");
+checkClass("jdk.nashorn.internal.parser.AbstractParser");
+checkClass("jdk.nashorn.internal.parser.Parser");
+checkClass("jdk.nashorn.internal.parser.JSONParser");
+checkClass("jdk.nashorn.internal.parser.Lexer");
+checkClass("jdk.nashorn.internal.parser.Scanner");
diff --git a/nashorn/test/script/trusted/JDK-8006529.js b/nashorn/test/script/trusted/JDK-8006529.js
index 7c18603c1ac..f748649f727 100644
--- a/nashorn/test/script/trusted/JDK-8006529.js
+++ b/nashorn/test/script/trusted/JDK-8006529.js
@@ -29,23 +29,74 @@
  * @run
  */
 
-// compile(script) -- compiles a script specified as a string with its 
-// source code, returns a jdk.nashorn.internal.ir.FunctionNode object 
-// representing it.
-var compile = (function() {
-    var Compiler       = Java.type("jdk.nashorn.internal.codegen.Compiler")
-    var Context        = Java.type("jdk.nashorn.internal.runtime.Context")
-    var Source         = Java.type("jdk.nashorn.internal.runtime.Source")
-    var CompilerAccess = Java.type("jdk.nashorn.internal.codegen.CompilerAccess")
-    return function(source) {
-	    var compiler = Compiler.compiler(new Source("<no name>", source), Context.getContext())
-        compiler.compile()
-        return CompilerAccess.getScriptNode(compiler)
+/*
+ * This test script depends on nashorn Compiler internals. It uses reflection
+ * to get access to private field and many public methods of Compiler and
+ * FunctionNode classes. Note that this is trusted code and access to such
+ * internal package classes and methods is okay. But, if you modify any 
+ * Compiler or FunctionNode class, you may have to revisit this script.
+ * We cannot use direct Java class (via dynalink bean linker) to Compiler
+ * and FunctionNode because of package-access check and so reflective calls.
+ */
+
+var Compiler       = Java.type("jdk.nashorn.internal.codegen.Compiler")
+var Context        = Java.type("jdk.nashorn.internal.runtime.Context")
+var Source         = Java.type("jdk.nashorn.internal.runtime.Source")
+var FunctionNode   = Java.type("jdk.nashorn.internal.ir.FunctionNode")
+
+// Compiler class methods and fields
+
+// Compiler.compile(Source, Context)
+var compilerMethod = Compiler.class.getMethod("compiler", Source.class, Context.class);
+// Compiler.compile()
+var compileMethod  = Compiler.class.getMethod("compile");
+
+// NOTE: private field. But this is a trusted test!
+// Compiler.functionNode
+var functionNodeField = Compiler.class.getDeclaredField("functionNode");
+functionNodeField.setAccessible(true);
+
+// FunctionNode methods
+
+// FunctionNode.getFunctions method
+var getFunctionsMethod = FunctionNode.class.getMethod("getFunctions");
+
+// These are method names of methods in FunctionNode class
+var allAssertionList = ['isVarArg', 'needsParentScope', 'needsCallee', 'needsScope', 'needsSelfSymbol', 'isSplit', 'hasEval', 'hasWith', 'hasDeepWithOrEval', 'varsInScope', 'isStrictMode']
+
+// corresponding Method objects of FunctionNode class
+var functionNodeMethods = {};
+// initialize FunctionNode methods
+(function() {
+    for (var f in allAssertionList) {
+        var method = allAssertionList[f];
+        functionNodeMethods[method] = FunctionNode.class.getMethod(method);
     }
 })();
 
+// returns "script" functionNode from Compiler instance
+function getScriptNode(compiler) {
+    // compiler.functionNode
+    return functionNodeField.get(compiler);
+}
+
+// returns functionNode.getFunctions().get(0)
+function getFirstFunction(functionNode) {
+    // functionNode.getFunctions().get(0)
+    return getFunctionsMethod.invoke(functionNode).get(0);
+}
+
+// compile(script) -- compiles a script specified as a string with its 
+// source code, returns a jdk.nashorn.internal.ir.FunctionNode object 
+// representing it.
+function compile(source) {
+   var compiler = compilerMethod.invoke(null,
+       new Source("<no name>", source), Context.getContext())
+   compileMethod.invoke(compiler);
+   return getScriptNode(compiler)
+};
+
 var allAssertions = (function() {
-    var allAssertionList = ['isVarArg', 'needsParentScope', 'needsCallee', 'needsScope', 'needsSelfSymbol', 'isSplit', 'hasEval', 'hasWith', 'hasDeepWithOrEval', 'varsInScope', 'isStrictMode']
     var allAssertions = {}
     for(var assertion in allAssertionList) {
         allAssertions[allAssertionList[assertion]] = true
@@ -53,6 +104,7 @@ var allAssertions = (function() {
     return allAssertions;
 })();
 
+
 // test(f[, assertions...]) tests whether all the specified assertions on the
 // passed function node are true.
 function test(f) {
@@ -66,10 +118,7 @@ function test(f) {
     }
     for(var assertion in allAssertions) {
         var expectedValue = !!assertions[assertion]
-        if(f[assertion] == null) {
-            throw "Can't find " + assertion + " on " + f;
-        }
-        if(f[assertion]() !== expectedValue) {
+        if(functionNodeMethods[assertion].invoke(f) !== expectedValue) {
             throw "Expected " + assertion + " === " + expectedValue + " for " + f;
         }
     }
@@ -79,7 +128,7 @@ function test(f) {
 // assertions are true in the first function in the given script; "script"
 // is a string with the source text of the script.
 function testFirstFn(script) {
-    arguments[0] = compile(script).functions[0]
+    arguments[0] = getFirstFunction(compile(script))
     test.apply(null, arguments)
 }
 
diff --git a/nashorn/test/src/jdk/nashorn/internal/access/BooleanAccessTest.java b/nashorn/test/src/jdk/nashorn/api/javaaccess/BooleanAccessTest.java
similarity index 99%
rename from nashorn/test/src/jdk/nashorn/internal/access/BooleanAccessTest.java
rename to nashorn/test/src/jdk/nashorn/api/javaaccess/BooleanAccessTest.java
index 1cbef249f5e..c7dbc2e7629 100644
--- a/nashorn/test/src/jdk/nashorn/internal/access/BooleanAccessTest.java
+++ b/nashorn/test/src/jdk/nashorn/api/javaaccess/BooleanAccessTest.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.access;
+package jdk.nashorn.api.javaaccess;
 
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertTrue;
diff --git a/nashorn/test/src/jdk/nashorn/internal/access/MethodAccessTest.java b/nashorn/test/src/jdk/nashorn/api/javaaccess/MethodAccessTest.java
similarity index 99%
rename from nashorn/test/src/jdk/nashorn/internal/access/MethodAccessTest.java
rename to nashorn/test/src/jdk/nashorn/api/javaaccess/MethodAccessTest.java
index 655a11eee9d..21adc9c1343 100644
--- a/nashorn/test/src/jdk/nashorn/internal/access/MethodAccessTest.java
+++ b/nashorn/test/src/jdk/nashorn/api/javaaccess/MethodAccessTest.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.access;
+package jdk.nashorn.api.javaaccess;
 
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertTrue;
diff --git a/nashorn/test/src/jdk/nashorn/internal/access/NumberAccessTest.java b/nashorn/test/src/jdk/nashorn/api/javaaccess/NumberAccessTest.java
similarity index 99%
rename from nashorn/test/src/jdk/nashorn/internal/access/NumberAccessTest.java
rename to nashorn/test/src/jdk/nashorn/api/javaaccess/NumberAccessTest.java
index 579cfd6f00e..63c471fd3b6 100644
--- a/nashorn/test/src/jdk/nashorn/internal/access/NumberAccessTest.java
+++ b/nashorn/test/src/jdk/nashorn/api/javaaccess/NumberAccessTest.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.access;
+package jdk.nashorn.api.javaaccess;
 
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertTrue;
diff --git a/nashorn/test/src/jdk/nashorn/internal/access/NumberBoxingTest.java b/nashorn/test/src/jdk/nashorn/api/javaaccess/NumberBoxingTest.java
similarity index 99%
rename from nashorn/test/src/jdk/nashorn/internal/access/NumberBoxingTest.java
rename to nashorn/test/src/jdk/nashorn/api/javaaccess/NumberBoxingTest.java
index 179f397a45b..ae2a9827233 100644
--- a/nashorn/test/src/jdk/nashorn/internal/access/NumberBoxingTest.java
+++ b/nashorn/test/src/jdk/nashorn/api/javaaccess/NumberBoxingTest.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.access;
+package jdk.nashorn.api.javaaccess;
 
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertTrue;
diff --git a/nashorn/test/src/jdk/nashorn/internal/access/ObjectAccessTest.java b/nashorn/test/src/jdk/nashorn/api/javaaccess/ObjectAccessTest.java
similarity index 99%
rename from nashorn/test/src/jdk/nashorn/internal/access/ObjectAccessTest.java
rename to nashorn/test/src/jdk/nashorn/api/javaaccess/ObjectAccessTest.java
index 05d1f698534..d082fc0e579 100644
--- a/nashorn/test/src/jdk/nashorn/internal/access/ObjectAccessTest.java
+++ b/nashorn/test/src/jdk/nashorn/api/javaaccess/ObjectAccessTest.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.access;
+package jdk.nashorn.api.javaaccess;
 
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.internal.junit.ArrayAsserts.assertArrayEquals;
diff --git a/nashorn/test/src/jdk/nashorn/internal/access/Person.java b/nashorn/test/src/jdk/nashorn/api/javaaccess/Person.java
similarity index 97%
rename from nashorn/test/src/jdk/nashorn/internal/access/Person.java
rename to nashorn/test/src/jdk/nashorn/api/javaaccess/Person.java
index 232146a2c46..9012e6365a3 100644
--- a/nashorn/test/src/jdk/nashorn/internal/access/Person.java
+++ b/nashorn/test/src/jdk/nashorn/api/javaaccess/Person.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.access;
+package jdk.nashorn.api.javaaccess;
 
 public class Person {
 
diff --git a/nashorn/test/src/jdk/nashorn/internal/access/SharedObject.java b/nashorn/test/src/jdk/nashorn/api/javaaccess/SharedObject.java
similarity index 99%
rename from nashorn/test/src/jdk/nashorn/internal/access/SharedObject.java
rename to nashorn/test/src/jdk/nashorn/api/javaaccess/SharedObject.java
index d9046fa94bc..a7ef3ab3edc 100644
--- a/nashorn/test/src/jdk/nashorn/internal/access/SharedObject.java
+++ b/nashorn/test/src/jdk/nashorn/api/javaaccess/SharedObject.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.access;
+package jdk.nashorn.api.javaaccess;
 
 import javax.script.Invocable;
 import javax.script.ScriptEngine;
diff --git a/nashorn/test/src/jdk/nashorn/internal/access/StringAccessTest.java b/nashorn/test/src/jdk/nashorn/api/javaaccess/StringAccessTest.java
similarity index 99%
rename from nashorn/test/src/jdk/nashorn/internal/access/StringAccessTest.java
rename to nashorn/test/src/jdk/nashorn/api/javaaccess/StringAccessTest.java
index 3eec154b9b2..423c99a640e 100644
--- a/nashorn/test/src/jdk/nashorn/internal/access/StringAccessTest.java
+++ b/nashorn/test/src/jdk/nashorn/api/javaaccess/StringAccessTest.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.access;
+package jdk.nashorn.api.javaaccess;
 
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.internal.junit.ArrayAsserts.assertArrayEquals;
diff --git a/nashorn/test/src/jdk/nashorn/internal/codegen/CompilerAccess.java b/nashorn/test/src/jdk/nashorn/internal/codegen/CompilerAccess.java
deleted file mode 100644
index df94050d404..00000000000
--- a/nashorn/test/src/jdk/nashorn/internal/codegen/CompilerAccess.java
+++ /dev/null
@@ -1,35 +0,0 @@
-
-package jdk.nashorn.internal.codegen;
-
-import java.lang.reflect.Field;
-import jdk.nashorn.internal.ir.FunctionNode;
-
-/**
- * Since Compiler class doesn't give us access to its private {@code functionNode} field, we use this reflection-based
- * access-check disabling helper to get to it in compilation tests.
- *
- */
-public class CompilerAccess {
-    private static final Field FUNCTION_NODE_FIELD = getCompilerFunctionNodeField();
-    static {
-        FUNCTION_NODE_FIELD.setAccessible(true);
-    }
-
-    /**
-     * Given a compiler, return its {@code functionNode} field, representing the root function (i.e. the compiled script).
-     * @param compiler the compiler that already run its {@link Compiler#compile()} method.
-     * @return the root function node representing the compiled script.
-     * @throws IllegalAccessException
-     */
-    public static FunctionNode getScriptNode(Compiler compiler) throws IllegalAccessException {
-        return (FunctionNode)FUNCTION_NODE_FIELD.get(compiler);
-    }
-
-    private static Field getCompilerFunctionNodeField() {
-        try {
-            return Compiler.class.getDeclaredField("functionNode");
-        } catch (NoSuchFieldException e) {
-            throw new AssertionError("", e);
-        }
-    }
-}

From b98a77d26c2b079e3cedda213f186e555d733d02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Tue, 12 Feb 2013 13:55:05 +0100
Subject: [PATCH 131/311] 8007956: Wrong or obsolete system properties in
 docs/DEVELOPER_README

Reviewed-by: attila, jlaskey
---
 nashorn/docs/DEVELOPER_README | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/nashorn/docs/DEVELOPER_README b/nashorn/docs/DEVELOPER_README
index f628d0c058f..f88091cde24 100644
--- a/nashorn/docs/DEVELOPER_README
+++ b/nashorn/docs/DEVELOPER_README
@@ -23,20 +23,14 @@ has a default value (currently 8 relinks) for this property if it
 is not explicitly set.
 
 
-SYSTEM PROPERTY: -Dnashorn.compiler.split.threshold=x
+SYSTEM PROPERTY: -Dnashorn.compiler.splitter.threshold=x
 
 This will change the node weight that requires a subgraph of the IR to
 be split into several classes in order not to run out of bytecode space.
 The default value is 0x8000 (32768).
 
 
-SYSTEM PROPERTY: -Dnashorn.callsiteaccess.debug
-
-See the description of the access logger below. This flag is
-equivalent to enabling the access logger with "info" level.
-
-
-SYSTEM PROPERTY: -Dnashorn.compiler.intarithmetic 
+SYSTEM PROPERTY: -Dnashorn.compiler.intarithmetic
 
 Arithmetic operations in Nashorn (except bitwise ones) typically
 coerce the operands to doubles (as per the JavaScript spec). To switch

From d50e3823e4a4f468403301d2d99af4a3c9235371 Mon Sep 17 00:00:00 2001
From: Attila Szegedi <attila@openjdk.org>
Date: Tue, 12 Feb 2013 12:47:51 +0100
Subject: [PATCH 132/311] 8007900: Function binding is inefficient

Reviewed-by: jlaskey, lagergren
---
 .../objects/BoundScriptFunctionImpl.java      |  51 ++
 .../jdk/nashorn/internal/objects/Global.java  |   3 +-
 .../objects/NativeStrictArguments.java        |   4 +-
 .../internal/objects/ScriptFunctionImpl.java  | 167 ++----
 .../internal/runtime/ArgumentSetter.java      |   6 +-
 .../nashorn/internal/runtime/PropertyMap.java |   2 +-
 .../internal/runtime/ScriptFunction.java      | 414 ++-----------
 .../internal/runtime/ScriptFunctionData.java  | 563 ++++++++++++++----
 .../internal/runtime/ScriptRuntime.java       |  18 -
 .../runtime/SpecializedMethodChooser.java     |  99 +++
 nashorn/test/script/basic/funcbind2.js        |  94 +++
 .../test/script/basic/funcbind2.js.EXPECTED   |  42 ++
 nashorn/test/script/basic/funcbind3.js        |  59 ++
 .../test/script/basic/funcbind3.js.EXPECTED   |  15 +
 14 files changed, 924 insertions(+), 613 deletions(-)
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/BoundScriptFunctionImpl.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/SpecializedMethodChooser.java
 create mode 100644 nashorn/test/script/basic/funcbind2.js
 create mode 100644 nashorn/test/script/basic/funcbind2.js.EXPECTED
 create mode 100644 nashorn/test/script/basic/funcbind3.js
 create mode 100644 nashorn/test/script/basic/funcbind3.js.EXPECTED

diff --git a/nashorn/src/jdk/nashorn/internal/objects/BoundScriptFunctionImpl.java b/nashorn/src/jdk/nashorn/internal/objects/BoundScriptFunctionImpl.java
new file mode 100644
index 00000000000..2b8691946b0
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/BoundScriptFunctionImpl.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.objects;
+
+import jdk.nashorn.internal.runtime.ScriptFunction;
+import jdk.nashorn.internal.runtime.ScriptFunctionData;
+import jdk.nashorn.internal.runtime.ScriptObject;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
+
+/**
+ * A {@code ScriptFunctionImpl} subclass for functions created using {@code Function.prototype.bind}. Such functions
+ * must track their {@code [[TargetFunction]] property for purposes of correctly implementing {@code [[HasInstance]]};
+ * see {@link ScriptFunction#isInstance(ScriptObject)}.
+ */
+class BoundScriptFunctionImpl extends ScriptFunctionImpl {
+    private final ScriptFunction targetFunction;
+
+    BoundScriptFunctionImpl(ScriptFunctionData data, ScriptFunction targetFunction) {
+        super(data);
+        this.prototype = ScriptRuntime.UNDEFINED;
+        this.targetFunction = targetFunction;
+    }
+
+    @Override
+    protected ScriptFunction getTargetFunction() {
+        return targetFunction;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/objects/Global.java b/nashorn/src/jdk/nashorn/internal/objects/Global.java
index d1664d11296..f1993f7f542 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/Global.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/Global.java
@@ -413,7 +413,7 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
 
     @Override
     public ScriptFunction newScriptFunction(final String name, final MethodHandle handle, final ScriptObject scope, final boolean strict) {
-        return new ScriptFunctionImpl(name, handle, scope, null, strict, false);
+        return new ScriptFunctionImpl(name, handle, scope, null, strict, false, true);
     }
 
     @Override
@@ -1339,7 +1339,6 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
 
         // initialize global function properties
         this.eval = this.builtinEval = ScriptFunctionImpl.makeFunction("eval", EVAL);
-        ((ScriptFunction)this.eval).setArity(1);
 
         this.parseInt           = ScriptFunctionImpl.makeFunction("parseInt",   GlobalFunctions.PARSEINT);
         this.parseFloat         = ScriptFunctionImpl.makeFunction("parseFloat", GlobalFunctions.PARSEFLOAT);
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeStrictArguments.java b/nashorn/src/jdk/nashorn/internal/objects/NativeStrictArguments.java
index dce6c4fef95..8b5a7b5ed47 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeStrictArguments.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeStrictArguments.java
@@ -56,8 +56,8 @@ public final class NativeStrictArguments extends ScriptObject {
         PropertyMap map = PropertyMap.newMap(NativeStrictArguments.class);
         map = Lookup.newProperty(map, "length", Property.NOT_ENUMERABLE, G$LENGTH, S$LENGTH);
         // In strict mode, the caller and callee properties should throw TypeError
-        map = ScriptFunctionImpl.newThrowerProperty(map, "caller", Property.NOT_ENUMERABLE | Property.NOT_CONFIGURABLE);
-        map = ScriptFunctionImpl.newThrowerProperty(map, "callee", Property.NOT_ENUMERABLE | Property.NOT_CONFIGURABLE);
+        map = ScriptFunctionImpl.newThrowerProperty(map, "caller");
+        map = ScriptFunctionImpl.newThrowerProperty(map, "callee");
         nasgenmap$ = map;
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java b/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
index 9caf498aa90..3ca57ee8062 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
@@ -26,30 +26,27 @@
 package jdk.nashorn.internal.objects;
 
 import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
-import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-
-import jdk.nashorn.internal.runtime.ScriptFunctionData;
+import jdk.nashorn.internal.codegen.objects.FunctionObjectCreator;
 import jdk.nashorn.internal.runtime.GlobalFunctions;
 import jdk.nashorn.internal.runtime.Property;
 import jdk.nashorn.internal.runtime.PropertyMap;
 import jdk.nashorn.internal.runtime.ScriptFunction;
+import jdk.nashorn.internal.runtime.ScriptFunctionData;
 import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
 import jdk.nashorn.internal.runtime.linker.Lookup;
-import jdk.nashorn.internal.runtime.linker.MethodHandleFactory;
 
 /**
  * Concrete implementation of ScriptFunction. This sets correct map for the
  * function objects -- to expose properties like "prototype", "length" etc.
  */
 public class ScriptFunctionImpl extends ScriptFunction {
-
-    private static final MethodHandle BOUND_FUNCTION    = findOwnMH("boundFunction",    Object.class, ScriptFunction.class, Object.class, Object[].class, Object.class, Object[].class);
-    private static final MethodHandle BOUND_CONSTRUCTOR = findOwnMH("boundConstructor", Object.class, ScriptFunction.class, Object[].class, Object.class, Object[].class);
-
+    // property map for strict mode functions
+    private static final PropertyMap strictmodemap$;
+    // property map for bound functions
+    private static final PropertyMap boundfunctionmap$;
+    // property map for non-strict, non-bound functions.
     private static final PropertyMap nasgenmap$;
 
     /**
@@ -61,7 +58,7 @@ public class ScriptFunctionImpl extends ScriptFunction {
      * @param specs specialized versions of this method, if available, null otherwise
      */
     ScriptFunctionImpl(final String name, final MethodHandle invokeHandle, final MethodHandle[] specs) {
-        super(name, invokeHandle, nasgenmap$, null, specs, false, true);
+        super(name, invokeHandle, nasgenmap$, null, specs, false, true, true);
         init();
     }
 
@@ -75,7 +72,7 @@ public class ScriptFunctionImpl extends ScriptFunction {
      * @param specs specialized versions of this method, if available, null otherwise
      */
     ScriptFunctionImpl(final String name, final MethodHandle invokeHandle, final PropertyMap map, final MethodHandle[] specs) {
-        super(name, invokeHandle, map.addAll(nasgenmap$), null, specs, false, true);
+        super(name, invokeHandle, map.addAll(nasgenmap$), null, specs, false, true, true);
         init();
     }
 
@@ -88,9 +85,10 @@ public class ScriptFunctionImpl extends ScriptFunction {
      * @param specs specialized versions of this method, if available, null otherwise
      * @param strict are we in strict mode
      * @param builtin is this a built-in function
+     * @param isConstructor can the function be used as a constructor (most can; some built-ins are restricted).
      */
-    ScriptFunctionImpl(final String name, final MethodHandle methodHandle, final ScriptObject scope, final MethodHandle[] specs, final boolean strict, final boolean builtin) {
-        super(name, methodHandle, getMap(strict), scope, specs, strict, builtin);
+    ScriptFunctionImpl(final String name, final MethodHandle methodHandle, final ScriptObject scope, final MethodHandle[] specs, final boolean strict, final boolean builtin, final boolean isConstructor) {
+        super(name, methodHandle, getMap(strict), scope, specs, strict, builtin, isConstructor);
         init();
     }
 
@@ -106,9 +104,16 @@ public class ScriptFunctionImpl extends ScriptFunction {
     public ScriptFunctionImpl(final ScriptFunctionData data, final MethodHandle methodHandle, final ScriptObject scope, final MethodHandle allocator) {
         super(data, getMap(data.isStrict()), scope);
         // Set method handles in script data
-        if (data.getInvoker() == null) {
-            data.setMethodHandles(methodHandle, allocator);
-        }
+        data.setMethodHandles(methodHandle, allocator);
+        init();
+    }
+
+    /**
+     * Only invoked internally from {@link BoundScriptFunctionImpl} constructor.
+     * @param data the script function data for the bound function.
+     */
+    ScriptFunctionImpl(final ScriptFunctionData data) {
+        super(data, boundfunctionmap$, null);
         init();
     }
 
@@ -118,6 +123,8 @@ public class ScriptFunctionImpl extends ScriptFunction {
         map = Lookup.newProperty(map, "length",    Property.NOT_ENUMERABLE | Property.NOT_CONFIGURABLE | Property.NOT_WRITABLE, G$LENGTH, null);
         map = Lookup.newProperty(map, "name",      Property.NOT_ENUMERABLE | Property.NOT_CONFIGURABLE | Property.NOT_WRITABLE, G$NAME, null);
         nasgenmap$ = map;
+        strictmodemap$ = createStrictModeMap(nasgenmap$);
+        boundfunctionmap$ = createBoundFunctionMap(strictmodemap$);
     }
 
     // function object representing TypeErrorThrower
@@ -126,9 +133,7 @@ public class ScriptFunctionImpl extends ScriptFunction {
     static synchronized ScriptFunction getTypeErrorThrower() {
         if (typeErrorThrower == null) {
             //name handle
-            final ScriptFunctionImpl func = new ScriptFunctionImpl("TypeErrorThrower", Lookup.TYPE_ERROR_THROWER_SETTER, null, null, false, false);
-            // clear constructor handle...
-            func.setConstructHandle(null);
+            final ScriptFunctionImpl func = new ScriptFunctionImpl("TypeErrorThrower", Lookup.TYPE_ERROR_THROWER_SETTER, null, null, false, false, false);
             func.setPrototype(UNDEFINED);
             typeErrorThrower = func;
         }
@@ -137,28 +142,24 @@ public class ScriptFunctionImpl extends ScriptFunction {
     }
 
     // add a new property that throws TypeError on get as well as set
-    static synchronized PropertyMap newThrowerProperty(final PropertyMap map, final String name, final int flags) {
-        return map.newProperty(name, flags, -1, Lookup.TYPE_ERROR_THROWER_GETTER, Lookup.TYPE_ERROR_THROWER_SETTER);
+    static synchronized PropertyMap newThrowerProperty(final PropertyMap map, final String name) {
+        return map.newProperty(name, Property.NOT_ENUMERABLE | Property.NOT_CONFIGURABLE, -1,
+                Lookup.TYPE_ERROR_THROWER_GETTER, Lookup.TYPE_ERROR_THROWER_SETTER);
     }
 
-    // property map for strict mode functions - lazily initialized
-    private static PropertyMap strictmodemap$;
+    private static PropertyMap createStrictModeMap(final PropertyMap functionMap) {
+        return newThrowerProperty(newThrowerProperty(functionMap, "arguments"), "caller");
+    }
 
     // Choose the map based on strict mode!
     private static PropertyMap getMap(final boolean strict) {
-        if (strict) {
-            synchronized (ScriptFunctionImpl.class) {
-                if (strictmodemap$ == null) {
-                    // In strict mode, the following properties should throw TypeError
-                    strictmodemap$ = nasgenmap$;
-                    strictmodemap$ = newThrowerProperty(strictmodemap$, "arguments", Property.NOT_ENUMERABLE | Property.NOT_CONFIGURABLE);
-                    strictmodemap$ = newThrowerProperty(strictmodemap$, "caller",    Property.NOT_ENUMERABLE | Property.NOT_CONFIGURABLE);
-                }
-            }
-            return strictmodemap$;
-        }
+        return strict ? strictmodemap$ : nasgenmap$;
+    }
 
-        return nasgenmap$;
+    private static PropertyMap createBoundFunctionMap(final PropertyMap strictModeMap) {
+        // Bond function map is same as strict function map, but additionally lacks the "prototype" property, see
+        // ECMAScript 5.1 section 15.3.4.5
+        return strictModeMap.deleteProperty(strictModeMap.findProperty("prototype"));
     }
 
     // Instance of this class is used as global anonymous function which
@@ -175,23 +176,6 @@ public class ScriptFunctionImpl extends ScriptFunction {
         return new AnonymousFunction();
     }
 
-    /**
-     * Factory method for non-constructor built-in functions
-     *
-     * @param name   function name
-     * @param methodHandle handle for invocation
-     * @param specs  specialized versions of function if available, null otherwise
-     * @param strict are we in strict mode
-     * @return new ScriptFunction
-     */
-    static ScriptFunction makeFunction(final String name, final MethodHandle methodHandle, final MethodHandle[] specs, final boolean strict) {
-        final ScriptFunctionImpl func = new ScriptFunctionImpl(name, methodHandle, null, specs, strict, true);
-        func.setConstructHandle(null);
-        func.setPrototype(UNDEFINED);
-
-        return func;
-    }
-
     /**
      * Factory method for non-constructor built-in functions
      *
@@ -201,7 +185,10 @@ public class ScriptFunctionImpl extends ScriptFunction {
      * @return new ScriptFunction
      */
     static ScriptFunction makeFunction(final String name, final MethodHandle methodHandle, final MethodHandle[] specs) {
-        return makeFunction(name, methodHandle, specs, false);
+        final ScriptFunctionImpl func = new ScriptFunctionImpl(name, methodHandle, null, specs, false, true, false);
+        func.setPrototype(UNDEFINED);
+
+        return func;
     }
 
     /**
@@ -216,57 +203,27 @@ public class ScriptFunctionImpl extends ScriptFunction {
     }
 
     /**
-     * This method is used to create a bound function. See also
-     * {@link NativeFunction#bind(Object, Object...)} method implementation.
-     *
-     * @param thiz this reference to bind
-     * @param args arguments to bind
+     * Same as {@link ScriptFunction#makeBoundFunction(Object, Object[])}. The only reason we override it is so that we
+     * can expose it to methods in this package.
+     * @param self the self to bind to this function. Can be null (in which case, null is bound as this).
+     * @param args additional arguments to bind to this function. Can be null or empty to not bind additional arguments.
+     * @return a function with the specified self and parameters bound.
      */
     @Override
-    protected ScriptFunction makeBoundFunction(final Object thiz, final Object[] args) {
-        Object[] allArgs = args;
-
-        if (allArgs == null) {
-            allArgs = ScriptRuntime.EMPTY_ARRAY;
-        }
-
-        final Object boundThiz = convertThisObject(thiz);
-        final MethodHandle   boundMethod = MH.insertArguments(BOUND_FUNCTION, 0, this, boundThiz, allArgs);
-        final ScriptFunction boundFunc   = makeFunction("", boundMethod, null, true);
-
-        MethodHandle consHandle  = this.getConstructHandle();
-
-        if (consHandle != null) {
-            consHandle = MH.insertArguments(BOUND_CONSTRUCTOR, 0, this, allArgs);
-        }
-
-        boundFunc.setConstructHandle(consHandle);
-        int newArity = this.getArity();
-        if (newArity != -1) {
-            newArity -= Math.min(newArity, allArgs.length);
-        }
-        boundFunc.setArity(newArity);
-
-        return boundFunc;
+    protected ScriptFunction makeBoundFunction(Object self, Object[] args) {
+        return super.makeBoundFunction(self, args);
     }
 
-    @SuppressWarnings("unused")
-    private static Object boundFunction(final ScriptFunction wrapped, final Object boundThiz, final Object[] boundArgs, final Object thiz, final Object[] args) {
-        final Object[] allArgs = new Object[boundArgs.length + args.length];
-
-        System.arraycopy(boundArgs, 0, allArgs, 0, boundArgs.length);
-        System.arraycopy(args, 0, allArgs, boundArgs.length, args.length);
-
-        return ScriptRuntime.apply(wrapped, boundThiz, allArgs);
-    }
-
-    @SuppressWarnings("unused")
-    private static Object boundConstructor(final ScriptFunction wrapped, final Object[] boundArgs, final Object thiz, final Object[] args) {
-        final Object[] allArgs = new Object[boundArgs.length + args.length];
-        System.arraycopy(boundArgs, 0, allArgs, 0, boundArgs.length);
-        System.arraycopy(args, 0, allArgs, boundArgs.length, args.length);
-
-        return ScriptRuntime.construct(wrapped, allArgs);
+    /**
+     * This method is used to create a bound function based on this function.
+     *
+     * @param data the {@code ScriptFunctionData} specifying the functions immutable portion.
+     * @return a function initialized from the specified data. Its parent scope will be set to null, therefore the
+     * passed in data should not expect a callee.
+     */
+    @Override
+    protected ScriptFunction makeBoundFunction(final ScriptFunctionData data) {
+        return new BoundScriptFunctionImpl(data, getTargetFunction());
     }
 
     // return Object.prototype - used by "allocate"
@@ -288,12 +245,4 @@ public class ScriptFunctionImpl extends ScriptFunction {
             setUserAccessors("caller", func, func);
         }
     }
-
-    private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
-        try {
-            return MethodHandles.lookup().findStatic(ScriptFunctionImpl.class, name, MH.type(rtype, types));
-        } catch (final NoSuchMethodException | IllegalAccessException e) {
-            throw new MethodHandleFactory.LookupException(e);
-        }
-    }
 }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ArgumentSetter.java b/nashorn/src/jdk/nashorn/internal/runtime/ArgumentSetter.java
index 5efca4a7436..8546ead188f 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ArgumentSetter.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ArgumentSetter.java
@@ -24,7 +24,7 @@
  */
 package jdk.nashorn.internal.runtime;
 
-import static jdk.nashorn.internal.codegen.CompilerConstants.staticCall;
+import static jdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
 
 import jdk.nashorn.internal.codegen.CompilerConstants.Call;
 
@@ -36,10 +36,10 @@ public final class ArgumentSetter {
     private ArgumentSetter() {}
 
     /** Method handle for setting a function argument at a given index in an arguments object. Used from generated bytecode */
-    public static final Call SET_ARGUMENT      = staticCall(ArgumentSetter.class, "setArgument", void.class, Object.class, ScriptObject.class, int.class);
+    public static final Call SET_ARGUMENT      = staticCallNoLookup(ArgumentSetter.class, "setArgument", void.class, Object.class, ScriptObject.class, int.class);
 
     /** Method handle for setting a function argument at a given index in an arguments array. Used from generated bytecode */
-    public static final Call SET_ARRAY_ELEMENT = staticCall(ArgumentSetter.class, "setArrayElement", void.class, Object.class, Object[].class, int.class);
+    public static final Call SET_ARRAY_ELEMENT = staticCallNoLookup(ArgumentSetter.class, "setArrayElement", void.class, Object.class, Object[].class, int.class);
 
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java b/nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java
index 9a99c74d08b..872200ba5fe 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java
@@ -308,7 +308,7 @@ public final class PropertyMap implements Iterable<Object>, PropertyListener {
      *
      * @return New {@link PropertyMap} with {@link Property} removed or {@code null} if not found.
      */
-    PropertyMap deleteProperty(final Property property) {
+    public PropertyMap deleteProperty(final Property property) {
         PropertyMap newMap = checkHistory(property);
         final String key = property.getKey();
 
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
index 17e5b2d15a7..fb3b419e150 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
@@ -34,13 +34,10 @@ import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import jdk.nashorn.internal.codegen.CompilerConstants.Call;
-import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.objects.annotations.SpecializedConstructor;
 import jdk.nashorn.internal.objects.annotations.SpecializedFunction;
 import jdk.nashorn.internal.runtime.linker.MethodHandleFactory;
 import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
 import jdk.nashorn.internal.runtime.linker.NashornGuards;
-import jdk.nashorn.internal.runtime.options.Options;
 import org.dynalang.dynalink.CallSiteDescriptor;
 import org.dynalang.dynalink.linker.GuardedInvocation;
 import org.dynalang.dynalink.linker.LinkRequest;
@@ -63,18 +60,13 @@ public abstract class ScriptFunction extends ScriptObject {
     public static final MethodHandle G$NAME       = findOwnMH("G$name",       Object.class, Object.class);
 
     /** Method handle for allocate function for this ScriptFunction */
-    public static final MethodHandle ALLOCATE     = findOwnMH("allocate", Object.class);
-
-    private static final MethodHandle NEWFILTER = findOwnMH("newFilter", Object.class, Object.class, Object.class);
+    static final MethodHandle ALLOCATE = findOwnMH("allocate", Object.class);
 
     private static final MethodHandle WRAPFILTER = findOwnMH("wrapFilter", Object.class, Object.class);
 
     /** method handle to scope getter for this ScriptFunction */
     public static final Call GET_SCOPE = virtualCallNoLookup(ScriptFunction.class, "getScope", ScriptObject.class);
 
-    /** Should specialized function and specialized constructors for the builtin be used if available? */
-    private static final boolean DISABLE_SPECIALIZATION = Options.getBooleanProperty("nashorn.scriptfunction.specialization.disable");
-
     private final ScriptFunctionData data;
 
     /** Reference to constructor prototype. */
@@ -100,9 +92,10 @@ public abstract class ScriptFunction extends ScriptObject {
             final ScriptObject scope,
             final MethodHandle[] specs,
             final boolean strict,
-            final boolean builtin) {
+            final boolean builtin,
+            final boolean isConstructor) {
 
-        this (new ScriptFunctionData(name, methodHandle, specs, strict, builtin), map, scope);
+        this (new ScriptFunctionData(name, methodHandle, specs, strict, builtin, isConstructor), map, scope);
     }
 
     /**
@@ -138,12 +131,13 @@ public abstract class ScriptFunction extends ScriptObject {
      */
     @Override
     public boolean isInstance(final ScriptObject instance) {
-        if (!(prototype instanceof ScriptObject)) {
-            typeError("prototype.not.an.object", ScriptRuntime.safeToString(this), ScriptRuntime.safeToString(prototype));
+        final Object basePrototype = getTargetFunction().getPrototype();
+        if (!(basePrototype instanceof ScriptObject)) {
+            typeError("prototype.not.an.object", ScriptRuntime.safeToString(getTargetFunction()), ScriptRuntime.safeToString(basePrototype));
         }
 
         for (ScriptObject proto = instance.getProto(); proto != null; proto = proto.getProto()) {
-            if (proto == prototype) {
+            if (proto == basePrototype) {
                 return true;
             }
         }
@@ -152,11 +146,18 @@ public abstract class ScriptFunction extends ScriptObject {
     }
 
     /**
-     * Get the arity of this ScriptFunction
-     * @return arity
+     * Returns the target function for this function. If the function was not created using
+     * {@link #makeBoundFunction(Object, Object[])}, its target function is itself. If it is bound, its target function
+     * is the target function of the function it was made from (therefore, the target function is always the final,
+     * unbound recipient of the calls).
+     * @return the target function for this function.
      */
-    public final int getArity() {
-        return data.getArity();
+    protected ScriptFunction getTargetFunction() {
+        return this;
+    }
+
+    boolean isBoundFunction() {
+        return getTargetFunction() != this;
     }
 
     /**
@@ -175,14 +176,6 @@ public abstract class ScriptFunction extends ScriptObject {
         return data.isStrict();
     }
 
-    /**
-     * Is this a ECMAScript built-in function (like parseInt, Array.isArray) ?
-     * @return true if built-in
-     */
-    public boolean isBuiltin() {
-        return data.isBuiltin();
-    }
-
     /**
      * Returns true if this is a non-strict, non-built-in function that requires non-primitive this argument
      * according to ECMA 10.4.3.
@@ -203,126 +196,7 @@ public abstract class ScriptFunction extends ScriptObject {
         if (Context.DEBUG) {
             invokes++;
         }
-
-        final MethodHandle invoker = data.getGenericInvoker();
-        final Object selfObj = convertThisObject(self);
-        final Object[] args = arguments == null ? ScriptRuntime.EMPTY_ARRAY : arguments;
-
-        if (data.isVarArg()) {
-            if (data.needsCallee()) {
-                return invoker.invokeExact(this, selfObj, args);
-            }
-            return invoker.invokeExact(selfObj, args);
-        }
-
-        final int paramCount = invoker.type().parameterCount();
-        if (data.needsCallee()) {
-            switch (paramCount) {
-            case 2:
-                return invoker.invokeExact(this, selfObj);
-            case 3:
-                return invoker.invokeExact(this, selfObj, getArg(args, 0));
-            case 4:
-                return invoker.invokeExact(this, selfObj, getArg(args, 0), getArg(args, 1));
-            case 5:
-                return invoker.invokeExact(this, selfObj, getArg(args, 0), getArg(args, 1), getArg(args, 2));
-            default:
-                return invoker.invokeWithArguments(withArguments(selfObj, paramCount, args));
-            }
-        }
-
-        switch (paramCount) {
-        case 1:
-            return invoker.invokeExact(selfObj);
-        case 2:
-            return invoker.invokeExact(selfObj, getArg(args, 0));
-        case 3:
-            return invoker.invokeExact(selfObj, getArg(args, 0), getArg(args, 1));
-        case 4:
-            return invoker.invokeExact(selfObj, getArg(args, 0), getArg(args, 1), getArg(args, 2));
-        default:
-            return invoker.invokeWithArguments(withArguments(selfObj, paramCount, args));
-        }
-    }
-
-    private static Object getArg(final Object[] args, final int i) {
-        return i < args.length ? args[i] : UNDEFINED;
-    }
-
-    /**
-     * Construct new object using this constructor.
-     * @param self  Target object.
-     * @param args  Call arguments.
-     * @return ScriptFunction result.
-     * @throws Throwable if there is an exception/error with the constructor invocation or thrown from it
-     */
-    public Object construct(final Object self, final Object... args) throws Throwable {
-        if (data.getConstructor() == null) {
-            typeError("not.a.constructor", ScriptRuntime.safeToString(this));
-        }
-
-        final MethodHandle constructor = data.getGenericConstructor();
-        if (data.isVarArg()) {
-            if (data.needsCallee()) {
-                return constructor.invokeExact(this, self, args);
-            }
-            return constructor.invokeExact(self, args);
-        }
-
-        final int paramCount = constructor.type().parameterCount();
-        if (data.needsCallee()) {
-            switch (paramCount) {
-            case 2:
-                return constructor.invokeExact(this, self);
-            case 3:
-                return constructor.invokeExact(this, self, getArg(args, 0));
-            case 4:
-                return constructor.invokeExact(this, self, getArg(args, 0), getArg(args, 1));
-            case 5:
-                return constructor.invokeExact(this, self, getArg(args, 0), getArg(args, 1), getArg(args, 2));
-            default:
-                return constructor.invokeWithArguments(withArguments(self, args));
-            }
-        }
-
-        switch(paramCount) {
-        case 1:
-            return constructor.invokeExact(self);
-        case 2:
-            return constructor.invokeExact(self, getArg(args, 0));
-        case 3:
-            return constructor.invokeExact(self, getArg(args, 0), getArg(args, 1));
-        case 4:
-            return constructor.invokeExact(self, getArg(args, 0), getArg(args, 1), getArg(args, 2));
-        default:
-            return constructor.invokeWithArguments(withArguments(self, args));
-        }
-    }
-
-    private Object[] withArguments(final Object self, final Object[] args) {
-        return withArguments(self, args.length + (data.needsCallee() ? 2 : 1), args);
-    }
-
-    private Object[] withArguments(final Object self, final int argCount, final Object[] args) {
-        final Object[] finalArgs = new Object[argCount];
-
-        int nextArg = 0;
-        if (data.needsCallee()) {
-            finalArgs[nextArg++] = this;
-        }
-        finalArgs[nextArg++] = self;
-
-        // Don't add more args that there is argCount in the handle (including self and callee).
-        for (int i = 0; i < args.length && nextArg < argCount;) {
-            finalArgs[nextArg++] = args[i++];
-        }
-
-        // If we have fewer args than argCount, pad with undefined.
-        while (nextArg < argCount) {
-            finalArgs[nextArg++] = UNDEFINED;
-        }
-
-        return finalArgs;
+        return data.invoke(this, self, arguments);
     }
 
     /**
@@ -331,26 +205,14 @@ public abstract class ScriptFunction extends ScriptObject {
      *
      * @return a new instance of the {@link ScriptObject} whose allocator this is
      */
-    public Object allocate() {
+    @SuppressWarnings("unused")
+    private Object allocate() {
         if (Context.DEBUG) {
             allocations++;
         }
+        assert !isBoundFunction(); // allocate never invoked on bound functions
 
-        if (getConstructHandle() == null) {
-            typeError("not.a.constructor", ScriptRuntime.safeToString(this));
-        }
-
-        ScriptObject object = null;
-
-        if (data.getAllocator() != null) {
-            try {
-                object = (ScriptObject)data.getAllocator().invokeExact(data.getAllocatorMap());
-            } catch (final RuntimeException | Error e) {
-                throw e;
-            } catch (final Throwable t) {
-                throw new RuntimeException(t);
-            }
-        }
+        final ScriptObject object = data.allocate();
 
         if (object != null) {
             if (prototype instanceof ScriptObject) {
@@ -372,13 +234,17 @@ public abstract class ScriptFunction extends ScriptObject {
     protected abstract ScriptObject getObjectPrototype();
 
     /**
-     * Creates a version of this function bound to a specific "self" and other argumentss
-     * @param self the self to bind the function to
-     * @param args other arguments (beside self) to bind the function to
-     * @return the bound function
+     * Creates a version of this function bound to a specific "self" and other arguments, as per
+     * {@code Function.prototype.bind} functionality in ECMAScript 5.1 section 15.3.4.5.
+     * @param self the self to bind to this function. Can be null (in which case, null is bound as this).
+     * @param args additional arguments to bind to this function. Can be null or empty to not bind additional arguments.
+     * @return a function with the specified self and parameters bound.
      */
-    protected abstract ScriptFunction makeBoundFunction(Object self, Object[] args);
+    protected ScriptFunction makeBoundFunction(Object self, Object[] args) {
+        return makeBoundFunction(data.makeBoundFunctionData(this, self, args));
+    }
 
+    protected abstract ScriptFunction makeBoundFunction(ScriptFunctionData boundData);
 
     @Override
     public final String safeToString() {
@@ -417,80 +283,13 @@ public abstract class ScriptFunction extends ScriptObject {
         return prototype;
     }
 
-    private static int weigh(final MethodType t) {
-        int weight = Type.typeFor(t.returnType()).getWeight();
-        for (final Class<?> paramType : t.parameterArray()) {
-            final int pweight = Type.typeFor(paramType).getWeight();
-            weight += pweight;
-        }
-        return weight;
-    }
-
-    private static boolean typeCompatible(final MethodType desc, final MethodType spec) {
-        //spec must fit in desc
-        final Class<?>[] dparray = desc.parameterArray();
-        final Class<?>[] sparray = spec.parameterArray();
-
-        if (dparray.length != sparray.length) {
-            return false;
-        }
-
-        for (int i = 0; i < dparray.length; i++) {
-            final Type dp = Type.typeFor(dparray[i]);
-            final Type sp = Type.typeFor(sparray[i]);
-
-            if (dp.isBoolean()) {
-                return false; //don't specialize on booleans, we have the "true" vs int 1 ambiguity in resolution
-            }
-
-            //specialization arguments must be at least as wide as dp, if not wider
-            if (Type.widest(dp, sp) != sp) {
-                //e.g. specialization takes double and callsite says "object". reject.
-                //but if specialization says double and callsite says "int" or "long" or "double", that's fine
-                return false;
-            }
-        }
-
-        return true; // anything goes for return type, take the convenient one and it will be upcasted thru dynalink magic.
-    }
-
-    private MethodHandle candidateWithLowestWeight(final MethodType descType, final MethodHandle initialCandidate, final MethodHandle[] specs) {
-        if (DISABLE_SPECIALIZATION || specs == null) {
-            return initialCandidate;
-        }
-
-        int          minimumWeight = Integer.MAX_VALUE;
-        MethodHandle candidate     = initialCandidate;
-
-        for (final MethodHandle spec : specs) {
-            final MethodType specType = spec.type();
-
-            if (!typeCompatible(descType, specType)) {
-                continue;
-            }
-
-            //return type is ok. we want a wider or equal one for our callsite.
-            final int specWeight = weigh(specType);
-            if (specWeight < minimumWeight) {
-                candidate = spec;
-                minimumWeight = specWeight;
-            }
-        }
-
-        if (DISABLE_SPECIALIZATION && candidate != initialCandidate) {
-            Context.err("### Specializing builtin " + getName() + " -> " + candidate + "?");
-        }
-
-        return candidate;
-    }
-
     /**
      * Return the most appropriate invoke handle if there are specializations
      * @param type most specific method type to look for invocation with
      * @return invoke method handle
      */
-    public final MethodHandle getBestSpecializedInvokeHandle(final MethodType type) {
-        return candidateWithLowestWeight(type, getInvokeHandle(), data.getInvokeSpecializations());
+    private final MethodHandle getBestInvoker(final MethodType type) {
+        return data.getBestInvoker(type);
     }
 
     /**
@@ -524,33 +323,6 @@ public abstract class ScriptFunction extends ScriptObject {
         return data.needsCallee() ? MH.bindTo(methodHandle, this) : methodHandle;
     }
 
-    /**
-     * Get the construct handle - the most generic (and if no specializations are in place, only) constructor
-     * method handle for this ScriptFunction
-     * @see SpecializedConstructor
-     * @param type type for wanted constructor
-     * @return construct handle
-     */
-    private final MethodHandle getConstructHandle(final MethodType type) {
-        return candidateWithLowestWeight(type, getConstructHandle(), data.getConstructSpecializations());
-    }
-
-    /**
-     * Get a method handle to the constructor for this function
-     * @return constructor handle
-     */
-    public final MethodHandle getConstructHandle() {
-        return data.getConstructor();
-    }
-
-    /**
-     * Set a method handle to the constructor for this function.
-     * @param constructHandle constructor handle. Can be null to prevent the function from being used as a constructor.
-     */
-    public final void setConstructHandle(final MethodHandle constructHandle) {
-        data.setConstructor(constructHandle);
-    }
-
     /**
      * Get the name for this function
      * @return the name
@@ -569,14 +341,6 @@ public abstract class ScriptFunction extends ScriptObject {
         return data.getInvoker() == null;
     }
 
-    /**
-     * Get token for this function
-     * @return token
-     */
-    public final long getToken() {
-        return data.getToken();
-    }
-
     /**
      * Get the scope for this function
      * @return the scope
@@ -618,7 +382,7 @@ public abstract class ScriptFunction extends ScriptObject {
      */
     public static int G$length(final Object self) {
         if (self instanceof ScriptFunction) {
-            return ((ScriptFunction)self).getArity();
+            return ((ScriptFunction)self).data.getArity();
         }
 
         return 0;
@@ -681,81 +445,13 @@ public abstract class ScriptFunction extends ScriptObject {
 
     @Override
     protected GuardedInvocation findNewMethod(final CallSiteDescriptor desc) {
-        // Call site type is (callee, args...) - dyn:new doesn't specify a "this", it's our job to allocate it
         final MethodType type = desc.getMethodType();
-
-        // Constructor arguments are either (callee, this, args...) or (this, args...), depending on whether it needs a
-        // callee or not.
-        MethodHandle constructor = getConstructHandle(type);
-
-        if (constructor == null) {
-            typeError("not.a.constructor", ScriptRuntime.safeToString(this));
-            return null;
-        }
-
-        // If it was (callee, this, args...), permute it to (this, callee, args...). We're doing this because having
-        // "this" in the first argument position is what allows the elegant folded composition of
-        // (newFilter x constructor x allocator) further down below in the code.
-        constructor = swapCalleeAndThis(constructor);
-
-        final MethodType ctorType = constructor.type();
-        // Drop constructor "this", so it's also captured as "allocation" parameter of newFilter after we fold the
-        // constructor into newFilter.
-        // (this, [callee, ]args...) => ([callee, ]args...)
-        final Class<?>[] ctorArgs = ctorType.dropParameterTypes(0, 1).parameterArray();
-        // Fold constructor into newFilter that replaces the return value from the constructor with the originally
-        // allocated value when the originally allocated value is a primitive.
-        // (result, this, [callee, ]args...) x (this, [callee, ]args...) => (this, [callee, ]args...)
-        MethodHandle handle = MH.foldArguments(MH.dropArguments(NEWFILTER, 2, ctorArgs), constructor);
-
-        // allocate() takes a ScriptFunction and returns a newly allocated ScriptObject...
-        if (data.needsCallee()) {
-            // ...we either fold it into the previous composition, if we need both the ScriptFunction callee object and
-            // the newly allocated object in the arguments, so (this, callee, args...) x (callee) => (callee, args...),
-            // or...
-            handle = MH.foldArguments(handle, ALLOCATE);
-        } else {
-            // ...replace the ScriptFunction argument with the newly allocated object, if it doesn't need the callee
-            // (this, args...) filter (callee) => (callee, args...)
-            handle = MH.filterArguments(handle, 0, ALLOCATE);
-        }
-
-        final MethodHandle filterIn = MH.asType(pairArguments(handle, type), type);
-        return new GuardedInvocation(filterIn, null, NashornGuards.getFunctionGuard(this));
-    }
-
-    /**
-     * If this function's method handles need a callee parameter, swap the order of first two arguments for the passed
-     * method handle. If this function's method handles don't need a callee parameter, returns the original method
-     * handle unchanged.
-     * @param mh a method handle with order of arguments {@code (callee, this, args...)}
-     * @return a method handle with order of arguments {@code (this, callee, args...)}
-     */
-    private MethodHandle swapCalleeAndThis(final MethodHandle mh) {
-        if (!data.needsCallee()) {
-            return mh;
-        }
-        final MethodType type = mh.type();
-        assert type.parameterType(0) == ScriptFunction.class;
-        assert type.parameterType(1) == Object.class;
-        final MethodType newType = type.changeParameterType(0, Object.class).changeParameterType(1, ScriptFunction.class);
-        final int[] reorder = new int[type.parameterCount()];
-        reorder[0] = 1;
-        assert reorder[1] == 0;
-        for (int i = 2; i < reorder.length; ++i) {
-            reorder[i] = i;
-        }
-        return MethodHandles.permuteArguments(mh, newType, reorder);
-    }
-
-    @SuppressWarnings("unused")
-    private static Object newFilter(final Object result, final Object allocation) {
-        return (result instanceof ScriptObject || !JSType.isPrimitive(result))? result : allocation;
+        return new GuardedInvocation(pairArguments(data.getBestConstructor(type), type), null, NashornGuards.getFunctionGuard(this));
     }
 
     @SuppressWarnings("unused")
     private static Object wrapFilter(final Object obj) {
-        if (obj instanceof ScriptObject || !isPrimitiveThis(obj)) {
+        if (obj instanceof ScriptObject || !ScriptFunctionData.isPrimitiveThis(obj)) {
             return obj;
         }
         return ((GlobalObject) Context.getGlobalTrusted()).wrapAsObject(obj);
@@ -792,7 +488,7 @@ public abstract class ScriptFunction extends ScriptObject {
         MethodHandle guard = null;
 
         if (data.needsCallee()) {
-            final MethodHandle callHandle = getBestSpecializedInvokeHandle(type);
+            final MethodHandle callHandle = getBestInvoker(type);
 
             if (NashornCallSiteDescriptor.isScope(desc)) {
                 // Make a handle that drops the passed "this" argument and substitutes either Global or Undefined
@@ -808,7 +504,7 @@ public abstract class ScriptFunction extends ScriptObject {
                 // If so add a to-object-wrapper argument filter.
                 // Else install a guard that will trigger a relink when the argument becomes primitive.
                 if (needsWrappedThis()) {
-                    if (isPrimitiveThis(request.getArguments()[1])) {
+                    if (ScriptFunctionData.isPrimitiveThis(request.getArguments()[1])) {
                         boundHandle = MH.filterArguments(boundHandle, 1, WRAPFILTER);
                     } else {
                         guard = NashornGuards.getNonStrictFunctionGuard(this);
@@ -816,7 +512,7 @@ public abstract class ScriptFunction extends ScriptObject {
                 }
             }
         } else {
-            final MethodHandle callHandle = getBestSpecializedInvokeHandle(type.dropParameterTypes(0, 1));
+            final MethodHandle callHandle = getBestInvoker(type.dropParameterTypes(0, 1));
 
             if (NashornCallSiteDescriptor.isScope(desc)) {
                 // Make a handle that drops the passed "this" argument and substitutes either Global or Undefined
@@ -840,39 +536,13 @@ public abstract class ScriptFunction extends ScriptObject {
      * These don't want a callee parameter, so bind that. Name binding is optional.
      */
     MethodHandle getCallMethodHandle(final MethodType type, final String bindName) {
-        return pairArguments(bindToNameIfNeeded(bindToCalleeIfNeeded(getBestSpecializedInvokeHandle(type)), bindName), type);
+        return pairArguments(bindToNameIfNeeded(bindToCalleeIfNeeded(getBestInvoker(type)), bindName), type);
     }
 
     private static MethodHandle bindToNameIfNeeded(final MethodHandle methodHandle, final String bindName) {
         return bindName == null ? methodHandle : MH.insertArguments(methodHandle, 1, bindName);
     }
 
-    /**
-     * Convert this argument for non-strict functions according to ES 10.4.3
-     *
-     * @param thiz the this argument
-     *
-     * @return the converted this object
-     */
-    protected Object convertThisObject(final Object thiz) {
-        if (!(thiz instanceof ScriptObject) && needsWrappedThis()) {
-            if (JSType.nullOrUndefined(thiz)) {
-                return Context.getGlobalTrusted();
-            }
-
-            if (isPrimitiveThis(thiz)) {
-                return ((GlobalObject)Context.getGlobalTrusted()).wrapAsObject(thiz);
-            }
-        }
-
-        return thiz;
-    }
-
-    private static boolean isPrimitiveThis(Object obj) {
-        return obj instanceof String || obj instanceof ConsString ||
-               obj instanceof Number || obj instanceof Boolean;
-    }
-
     private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
         final Class<?>   own = ScriptFunction.class;
         final MethodType mt  = MH.type(rtype, types);
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunctionData.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunctionData.java
index a701ceabeb7..3366993cdf1 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunctionData.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunctionData.java
@@ -25,9 +25,12 @@
 
 package jdk.nashorn.internal.runtime;
 
+import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
+import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import jdk.nashorn.internal.ir.FunctionNode;
 import jdk.nashorn.internal.parser.Token;
@@ -39,12 +42,15 @@ import jdk.nashorn.internal.parser.TokenType;
  * constants array to reduce function instantiation overhead during runtime.
  */
 public final class ScriptFunctionData {
+    private static final MethodHandle BIND_VAR_ARGS = findOwnMH("bindVarArgs", Object[].class, Object[].class, Object[].class);
+    private static final MethodHandle NEWFILTER     = findOwnMH("newFilter", Object.class, Object.class, Object.class);
 
     // per-function object flags
-    private static final int IS_STRICT  = 0b0000_0001;
-    private static final int IS_BUILTIN = 0b0000_0010;
-    private static final int HAS_CALLEE = 0b0000_0100;
-    private static final int IS_VARARGS = 0b0000_1000;
+    private static final int IS_STRICT      = 0b0000_0001;
+    private static final int IS_BUILTIN     = 0b0000_0010;
+    private static final int HAS_CALLEE     = 0b0000_0100;
+    private static final int IS_VARARGS     = 0b0000_1000;
+    private static final int IS_CONSTRUCTOR = 0b0001_0000;
 
     /** Name of the function or "" */
     private final String name;
@@ -56,22 +62,21 @@ public final class ScriptFunctionData {
     private final long   token;
     /** Number of expected arguments, either taken from FunctionNode or calculated from method handle signature*/
     private int          arity;
-    /** Does this function need a callee argument? */
     private final int    flags;
 
     /** Reference to code for this method. */
     private MethodHandle invoker;
-    /** Reference to code for this method when called to create "new" object */
+    /** Reference to code for this method when called to create "new" object. This must always be populated with a
+     * result of calling {@link #composeConstructor(MethodHandle)} on the value of the {@link #invoker} field. */
     private MethodHandle constructor;
     /** Constructor to create a new instance. */
     private MethodHandle allocator;
     /** Generic invoker to used in {@link ScriptFunction#invoke(Object, Object...)}. */
     private MethodHandle genericInvoker;
-    /** Generic constructor used in {@link ScriptFunction#construct(Object, Object...)}. */
-    private MethodHandle genericConstructor;
     /** Specializations - see @SpecializedFunction */
     private MethodHandle[] invokeSpecializations;
-    /** Specializations - see @SpecializedFunction */
+    /** Specializations - see @SpecializedFunction. Same restrictions as for {@link #constructor} apply; only populate
+     * with method handles returned from {@link #composeConstructor(MethodHandle)}. */
     private MethodHandle[] constructSpecializations;
 
     /**
@@ -91,7 +96,7 @@ public final class ScriptFunctionData {
         this.allocatorMap = allocatorMap;
         this.token        = Token.toDesc(TokenType.FUNCTION, position, length);
         this.arity        = fn.getParameters().size();
-        this.flags        = makeFlags(fn.needsCallee(), fn.isVarArg(), fn.isStrictMode(), false);
+        this.flags        = makeFlags(fn.needsCallee(), fn.isVarArg(), fn.isStrictMode(), false, true);
     }
 
     /**
@@ -102,55 +107,59 @@ public final class ScriptFunctionData {
      * @param strict strict flag
      * @param builtin builtin flag
      */
-    public ScriptFunctionData(final String name, final MethodHandle methodHandle, final MethodHandle[] specs, final boolean strict, final boolean builtin) {
-        this.name        = name;
-        this.source      = null;
-        this.token       = 0;
+    public ScriptFunctionData(final String name, final MethodHandle methodHandle, final MethodHandle[] specs, final boolean strict, final boolean builtin, final boolean isConstructor) {
+        this(name, null, 0L, methodHandle, specs, strict, builtin, isConstructor);
+    }
 
-        final MethodType type     = methodHandle.type();
-        final int paramCount      = type.parameterCount();
-        final boolean isVarArg    = type.parameterType(paramCount - 1).isArray();
+    private ScriptFunctionData(final String name, final Source source, final long token, final MethodHandle methodHandle, final MethodHandle[] specs, final boolean strict, final boolean builtin, final boolean isConstructor) {
+        this.name   = name;
+        this.source = source;
+        this.token  = token;
+
+        final boolean isVarArg = isVarArg(methodHandle);
         final boolean needsCallee = needsCallee(methodHandle);
 
-        this.flags = makeFlags(needsCallee, isVarArg, strict, builtin);
-        this.arity = isVarArg ? -1 : paramCount - 1; //drop the self param for arity
+        this.flags = makeFlags(needsCallee, isVarArg, strict, builtin, isConstructor);
+        int lArity = isVarArg ? -1 : methodHandle.type().parameterCount() - 1; //drop the self param for arity
 
         if (needsCallee && !isVarArg) {
-            this.arity--;
+            lArity--;
         }
 
         if (isConstructor(methodHandle)) {
+            assert isConstructor;
             if (!isVarArg) {
-                this.arity--;    // drop the boolean flag for arity
+                lArity--;    // drop the boolean flag for arity
             }
             /*
-             * We insert a boolean argument to tell if the method was invoked as
-             * constructor or not if the method handle's first argument is boolean.
+             * We insert a boolean argument to tell if the method was invoked as constructor or not if the method
+             * handle's first argument is boolean.
              */
             this.invoker     = MH.insertArguments(methodHandle, 0, false);
-            this.constructor = adaptConstructor(MH.insertArguments(methodHandle, 0, true));
+            this.constructor = composeConstructor(MH.insertArguments(methodHandle, 0, true));
 
             if (specs != null) {
                 this.invokeSpecializations    = new MethodHandle[specs.length];
                 this.constructSpecializations = new MethodHandle[specs.length];
                 for (int i = 0; i < specs.length; i++) {
                     this.invokeSpecializations[i]    = MH.insertArguments(specs[i], 0, false);
-                    this.constructSpecializations[i] = adaptConstructor(MH.insertArguments(specs[i], 0, true));
+                    this.constructSpecializations[i] = composeConstructor(MH.insertArguments(specs[i], 0, true));
                 }
             }
         } else {
             this.invoker                  = methodHandle;
-            this.constructor              = adaptConstructor(methodHandle);
+            this.constructor              = null; // delay composition of the constructor
             this.invokeSpecializations    = specs;
-            this.constructSpecializations = specs;
+            this.constructSpecializations = null; // delay composition of the constructors
         }
+        this.arity = lArity;
     }
 
     /**
      * Get the arity of the function.
      * @return the arity
      */
-    public int getArity() {
+    int getArity() {
         return arity;
     }
 
@@ -158,7 +167,7 @@ public final class ScriptFunctionData {
      * Set the arity of the function.
      * @param arity the arity
      */
-    public void setArity(int arity) {
+    void setArity(int arity) {
         this.arity = arity;
     }
 
@@ -166,24 +175,16 @@ public final class ScriptFunctionData {
      * Get the function name.
      * @return function name
      */
-    public String getName() {
+    String getName() {
         return name;
     }
 
-    /**
-     * Get the source of the function.
-     * @return the source
-     */
-    public Source getSource() {
-        return source;
-    }
-
     /**
      * Get this function as a String containing its source code. If no source code
      * exists in this ScriptFunction, its contents will be displayed as {@code [native code]}
      * @return string representation of this function's source
      */
-    public String toSource() {
+    String toSource() {
         if (source != null && token != 0) {
             return source.getString(Token.descPosition(token), Token.descLength(token));
         }
@@ -212,27 +213,11 @@ public final class ScriptFunctionData {
         return sb.toString();
     }
 
-    /**
-     * Get the allocator property map.
-     * @return the allocator map
-     */
-    public PropertyMap getAllocatorMap() {
-        return allocatorMap;
-    }
-
-    /**
-     * Get the function's parse token.
-     * @return the token
-     */
-    public long getToken() {
-        return token;
-    }
-
     /**
      * Returns true if the function needs a callee argument.
      * @return the needsCallee flag
      */
-    public boolean needsCallee() {
+    boolean needsCallee() {
         return (flags & HAS_CALLEE) != 0;
     }
 
@@ -248,15 +233,23 @@ public final class ScriptFunctionData {
      * Returns true if this is a built-in function.
      * @return the built-in flag
      */
-    public boolean isBuiltin() {
+    private boolean isBuiltin() {
         return (flags & IS_BUILTIN) != 0;
     }
 
+    /**
+     * Returns true if this function can be used as a constructor.
+     * @return the constructor flag
+     */
+    private boolean isConstructor() {
+        return (flags & IS_CONSTRUCTOR) != 0;
+    }
+
     /**
      * Returns true if this is a var-arg function.
      * @return the var-arg flag
      */
-    public boolean isVarArg() {
+    private boolean isVarArg() {
         return (flags & IS_VARARGS) != 0;
     }
 
@@ -265,7 +258,7 @@ public final class ScriptFunctionData {
      * according to ECMA 10.4.3.
      * @return true if this argument must be an object
      */
-    public boolean needsWrappedThis() {
+    boolean needsWrappedThis() {
         return (flags & (IS_STRICT | IS_BUILTIN)) == 0;
     }
 
@@ -273,72 +266,164 @@ public final class ScriptFunctionData {
      * Get the method handle used to invoke this function.
      * @return the invoke handle
      */
-    public MethodHandle getInvoker() {
+    MethodHandle getInvoker() {
         return invoker;
     }
 
+    MethodHandle getBestInvoker(final MethodType type) {
+        return SpecializedMethodChooser.candidateWithLowestWeight(type, invoker, invokeSpecializations);
+    }
+
     /**
      * Get the method handle used to invoke this function as a constructor.
      * @return the constructor handle
      */
-    public MethodHandle getConstructor() {
+    private MethodHandle getConstructor() {
+        if (constructor == null) {
+            constructor = composeConstructor(invoker);
+        }
+
         return constructor;
     }
 
-    /**
-     * Set the constructor method handle.
-     * @param constructor the constructor handle
-     */
-    public void setConstructor(MethodHandle constructor) {
-        this.constructor = constructor;
-        this.constructSpecializations = null;
+    MethodHandle getBestConstructor(MethodType descType) {
+        if (!isConstructor()) {
+            typeError("not.a.constructor", toSource());
+        }
+        return SpecializedMethodChooser.candidateWithLowestWeight(descType, getConstructor(), getConstructSpecializations());
     }
 
-    /**
-     * Get the method handle used to allocate a new object for this constructor.
-     * @return the allocator handle
-     */
-    public MethodHandle getAllocator() {
-        return allocator;
+    private MethodHandle composeConstructor(MethodHandle ctor) {
+        // If it was (callee, this, args...), permute it to (this, callee, args...). We're doing this because having
+        // "this" in the first argument position is what allows the elegant folded composition of
+        // (newFilter x constructor x allocator) further down below in the code. Also, ensure the composite constructor
+        // always returns Object.
+        MethodHandle composedCtor = changeReturnTypeToObject(swapCalleeAndThis(ctor));
+
+        final MethodType ctorType = composedCtor.type();
+        // Construct a dropping type list for NEWFILTER, but don't include constructor "this" into it, so it's actually
+        // captured as "allocation" parameter of NEWFILTER after we fold the constructor into it.
+        // (this, [callee, ]args...) => ([callee, ]args...)
+        final Class<?>[] ctorArgs = ctorType.dropParameterTypes(0, 1).parameterArray();
+        // Fold constructor into newFilter that replaces the return value from the constructor with the originally
+        // allocated value when the originally allocated value is a primitive.
+        // (result, this, [callee, ]args...) x (this, [callee, ]args...) => (this, [callee, ]args...)
+        composedCtor = MH.foldArguments(MH.dropArguments(NEWFILTER, 2, ctorArgs), composedCtor);
+
+        // allocate() takes a ScriptFunction and returns a newly allocated ScriptObject...
+        if (needsCallee()) {
+            // ...we either fold it into the previous composition, if we need both the ScriptFunction callee object and
+            // the newly allocated object in the arguments, so (this, callee, args...) x (callee) => (callee, args...),
+            // or...
+            return MH.foldArguments(composedCtor, ScriptFunction.ALLOCATE);
+        }
+        // ...replace the ScriptFunction argument with the newly allocated object, if it doesn't need the callee
+        // (this, args...) filter (callee) => (callee, args...)
+        return MH.filterArguments(composedCtor, 0, ScriptFunction.ALLOCATE);
     }
 
     /**
      * Get an adapted version of the invoker handle that only uses {@code Object} as parameter and return types.
      * @return the generic invoke handle
      */
-    public MethodHandle getGenericInvoker() {
+    private MethodHandle getGenericInvoker() {
         if (genericInvoker == null) {
             assert invoker != null : "invoker is null";
-            genericInvoker = adaptMethodType(invoker);
+            genericInvoker = makeGenericMethod(invoker);
         }
         return genericInvoker;
     }
 
     /**
-     * Get an adapted version of the constructor handle that only uses {@code Object} as parameter and return types.
-     * @return the generic constructor handle
+     * Execute this script function.
+     * @param self  Target object.
+     * @param arguments  Call arguments.
+     * @return ScriptFunction result.
+     * @throws Throwable if there is an exception/error with the invocation or thrown from it
      */
-    public MethodHandle getGenericConstructor() {
-        if (genericConstructor == null) {
-            assert constructor != null : "constructor is null";
-            genericConstructor = adaptMethodType(constructor);
+    Object invoke(final ScriptFunction fn, final Object self, final Object... arguments) throws Throwable {
+        final MethodHandle genInvoker = getGenericInvoker();
+        final Object selfObj = convertThisObject(self);
+        final Object[] args = arguments == null ? ScriptRuntime.EMPTY_ARRAY : arguments;
+
+        if (isVarArg()) {
+            if (needsCallee()) {
+                return genInvoker.invokeExact(fn, selfObj, args);
+            }
+            return genInvoker.invokeExact(selfObj, args);
+        }
+
+        final int paramCount = genInvoker.type().parameterCount();
+        if (needsCallee()) {
+            switch (paramCount) {
+            case 2:
+                return genInvoker.invokeExact(fn, selfObj);
+            case 3:
+                return genInvoker.invokeExact(fn, selfObj, getArg(args, 0));
+            case 4:
+                return genInvoker.invokeExact(fn, selfObj, getArg(args, 0), getArg(args, 1));
+            case 5:
+                return genInvoker.invokeExact(fn, selfObj, getArg(args, 0), getArg(args, 1), getArg(args, 2));
+            default:
+                return genInvoker.invokeWithArguments(withArguments(fn, selfObj, paramCount, args));
+            }
+        }
+
+        switch (paramCount) {
+        case 1:
+            return genInvoker.invokeExact(selfObj);
+        case 2:
+            return genInvoker.invokeExact(selfObj, getArg(args, 0));
+        case 3:
+            return genInvoker.invokeExact(selfObj, getArg(args, 0), getArg(args, 1));
+        case 4:
+            return genInvoker.invokeExact(selfObj, getArg(args, 0), getArg(args, 1), getArg(args, 2));
+        default:
+            return genInvoker.invokeWithArguments(withArguments(null, selfObj, paramCount, args));
         }
-        return genericConstructor;
     }
 
-    /**
-     * Get the specialized invoke handles for this function.
-     * @return array of specialized invoke handles
-     */
-    public MethodHandle[] getInvokeSpecializations() {
-        return invokeSpecializations;
+    private static Object getArg(final Object[] args, final int i) {
+        return i < args.length ? args[i] : UNDEFINED;
+    }
+
+    private Object[] withArguments(final ScriptFunction fn, final Object self, final int argCount, final Object[] args) {
+        final Object[] finalArgs = new Object[argCount];
+
+        int nextArg = 0;
+        if (needsCallee()) {
+            assert fn != null;
+            finalArgs[nextArg++] = fn;
+        } else {
+            assert fn == null;
+        }
+        finalArgs[nextArg++] = self;
+
+        // Don't add more args that there is argCount in the handle (including self and callee).
+        for (int i = 0; i < args.length && nextArg < argCount;) {
+            finalArgs[nextArg++] = args[i++];
+        }
+
+        // If we have fewer args than argCount, pad with undefined.
+        while (nextArg < argCount) {
+            finalArgs[nextArg++] = UNDEFINED;
+        }
+
+        return finalArgs;
     }
 
     /**
      * Get the specialized construct handles for this function.
      * @return array of specialized construct handles
      */
-    public MethodHandle[] getConstructSpecializations() {
+    private MethodHandle[] getConstructSpecializations() {
+        if(constructSpecializations == null && invokeSpecializations != null) {
+            final MethodHandle[] ctors = new MethodHandle[invokeSpecializations.length];
+            for(int i = 0; i < ctors.length; ++i) {
+                ctors[i] = composeConstructor(invokeSpecializations[i]);
+            }
+            constructSpecializations = ctors;
+        }
         return constructSpecializations;
     }
 
@@ -352,11 +437,227 @@ public final class ScriptFunctionData {
         // and they're set when first called, so we enforce set-once here.
         if (this.invoker == null) {
             this.invoker     = invoker;
-            this.constructor = adaptConstructor(invoker);
+            this.constructor = null; // delay constructor composition
             this.allocator   = allocator;
         }
     }
 
+    /**
+     * Allocates an object using this function's allocator.
+     * @return the object allocated using this function's allocator, or null if the function doesn't have an allocator.
+     */
+    ScriptObject allocate() {
+        if (allocator == null) {
+            return null;
+        }
+
+        try {
+            return (ScriptObject)allocator.invokeExact(allocatorMap);
+        } catch (final RuntimeException | Error e) {
+            throw e;
+        } catch (final Throwable t) {
+            throw new RuntimeException(t);
+        }
+    }
+
+    /**
+     * This method is used to create the immutable portion of a bound function.
+     * See {@link ScriptFunction#makeBoundFunction(Object, Object[])}
+     *
+     * @param fn the original function being bound
+     * @param self this reference to bind. Can be null.
+     * @param args additional arguments to bind. Can be null.
+     */
+    ScriptFunctionData makeBoundFunctionData(final ScriptFunction fn, final Object self, final Object[] args) {
+        final Object[] allArgs = args == null ? ScriptRuntime.EMPTY_ARRAY : args;
+
+        final boolean isConstructor = isConstructor();
+        // Note that the new ScriptFunctionData's method handle will not need a callee regardless of whether the
+        // original did.
+        final ScriptFunctionData boundData = new ScriptFunctionData(name, source, token,
+                bindInvokeHandle(invoker, fn, self, allArgs), bindInvokeSpecializations(fn, self, allArgs), isStrict(), isBuiltin(), isConstructor);
+        if(isConstructor) {
+            // Can't just rely on bound invoke as a basis for constructor, as it ignores the passed "this" in favor of the
+            // bound "this"; constructor on the other hand must see the actual "this" received from the allocator.
+
+            // Binding a function will force constructor composition in getConstructor(); not really any way around that
+            // as it's the composed constructor that has to be bound to the function.
+            boundData.constructor = bindConstructHandle(getConstructor(), fn, allArgs);
+            boundData.constructSpecializations = bindConstructorSpecializations(fn, allArgs);
+        }
+        assert boundData.allocator == null;
+        final int thisArity = getArity();
+        if(thisArity != -1) {
+            boundData.setArity(Math.max(0, thisArity - args.length));
+        } else {
+            assert boundData.getArity() == -1;
+        }
+        return boundData;
+    }
+
+    /**
+     * Convert this argument for non-strict functions according to ES 10.4.3
+     *
+     * @param thiz the this argument
+     *
+     * @return the converted this object
+     */
+    Object convertThisObject(final Object thiz) {
+        if (!(thiz instanceof ScriptObject) && needsWrappedThis()) {
+            if (JSType.nullOrUndefined(thiz)) {
+                return Context.getGlobalTrusted();
+            }
+
+            if (isPrimitiveThis(thiz)) {
+                return ((GlobalObject)Context.getGlobalTrusted()).wrapAsObject(thiz);
+            }
+        }
+
+        return thiz;
+    }
+
+    static boolean isPrimitiveThis(Object obj) {
+        return obj instanceof String || obj instanceof ConsString ||
+               obj instanceof Number || obj instanceof Boolean;
+    }
+
+    /**
+     * Creates an invoker method handle for a bound function.
+     * @param targetFn the function being bound
+     * @param originalInvoker an original invoker method handle for the function. This can be its generic invoker or
+     * any of its specializations.
+     * @param self the "this" value being bound
+     * @param args additional arguments being bound
+     * @return a bound invoker method handle that will bind the self value and the specified arguments. The resulting
+     * invoker never needs a callee; if the original invoker needed it, it will be bound to {@code fn}. The resulting
+     * invoker still takes an initial {@code this} parameter, but it is always dropped and the bound {@code self} passed
+     * to the original invoker on invocation.
+     */
+    private MethodHandle bindInvokeHandle(final MethodHandle originalInvoker, final ScriptFunction targetFn, final Object self, final Object[] args) {
+        // Is the target already bound? If it is, we won't bother binding either callee or self as they're already bound
+        // in the target and will be ignored anyway.
+        final boolean isTargetBound = targetFn.isBoundFunction();
+        assert !(isTargetBound && needsCallee()); // already bound functions don't need a callee
+        final Object boundSelf = isTargetBound ? null : convertThisObject(self);
+        final MethodHandle boundInvoker;
+        if(isVarArg(originalInvoker)) {
+            // First, bind callee and this without arguments
+            final MethodHandle noArgBoundInvoker;
+            if(isTargetBound) {
+                // Don't bind either callee or this
+                noArgBoundInvoker = originalInvoker;
+            } else if(needsCallee()) {
+                // Bind callee and this
+                noArgBoundInvoker = MH.insertArguments(originalInvoker, 0, targetFn, boundSelf);
+            } else {
+                // Only bind this
+                noArgBoundInvoker = MH.bindTo(originalInvoker, boundSelf);
+            }
+            // Now bind arguments
+            if(args.length > 0) {
+                boundInvoker = varArgBinder(noArgBoundInvoker, args);
+            } else {
+                boundInvoker = noArgBoundInvoker;
+            }
+        } else {
+            final Object[] boundArgs = new Object[Math.min(originalInvoker.type().parameterCount(),
+                    args.length + (isTargetBound ? 0 : (needsCallee() ? 2 : 1)))];
+            int next = 0;
+            if(!isTargetBound) {
+                if(needsCallee()) {
+                    boundArgs[next++] = targetFn;
+                }
+                boundArgs[next++] = boundSelf;
+            }
+            // If more bound args were specified than the function can take, we'll just drop those.
+            System.arraycopy(args, 0, boundArgs, next, boundArgs.length - next);
+            // If target is already bound, insert additional bound arguments after "this" argument, at position 1;
+            // "this" will get dropped anyway by the target invoker. We previously asserted that already bound functions
+            // don't take a callee parameter, so we can know that the signature is (this[, args...]) therefore args
+            // start at position 1. If the function is not bound, we start inserting arguments at position 0.
+            boundInvoker = MH.insertArguments(originalInvoker, isTargetBound ? 1 : 0, boundArgs);
+        }
+        if(isTargetBound) {
+            return boundInvoker;
+        }
+        // If the target is not already bound, add a dropArguments that'll throw away the passed this
+        return MH.dropArguments(boundInvoker, 0, Object.class);
+    }
+
+    private MethodHandle[] bindInvokeSpecializations(final ScriptFunction fn, final Object self, final Object[] args) {
+        if(invokeSpecializations == null) {
+            return null;
+        }
+        final MethodHandle[] boundSpecializations = new MethodHandle[invokeSpecializations.length];
+        for(int i = 0; i < invokeSpecializations.length; ++i) {
+            boundSpecializations[i] = bindInvokeHandle(invokeSpecializations[i], fn, self, args);
+        }
+        return boundSpecializations;
+    }
+
+    /**
+     * Creates a constructor method handle for a bound function using the passed constructor handle.
+     * @param originalConstructor the constructor handle to bind. It must be a composed constructor.
+     * @param fn the function being bound
+     * @param args arguments being bound
+     * @return a bound constructor method handle that will bind the specified arguments. The resulting constructor never
+     * needs a callee; if the original constructor needed it, it will be bound to {@code fn}. The resulting constructor
+     * still takes an initial {@code this} parameter and passes it to the underlying original constructor. Finally, if
+     * this script function data object has no constructor handle, null is returned.
+     */
+    private static MethodHandle bindConstructHandle(final MethodHandle originalConstructor, final ScriptFunction fn, final Object[] args) {
+        if(originalConstructor == null) {
+            return null;
+        }
+
+        // If target function is already bound, don't bother binding the callee.
+        final MethodHandle calleeBoundConstructor = fn.isBoundFunction() ? originalConstructor :
+            MH.dropArguments(MH.bindTo(originalConstructor, fn), 0, ScriptFunction.class);
+        if(args.length == 0) {
+            return calleeBoundConstructor;
+        }
+
+        if(isVarArg(calleeBoundConstructor)) {
+            return varArgBinder(calleeBoundConstructor, args);
+        }
+
+        final Object[] boundArgs;
+        final int maxArgCount = calleeBoundConstructor.type().parameterCount() - 1;
+        if (args.length <= maxArgCount) {
+            boundArgs = args;
+        } else {
+            boundArgs = new Object[maxArgCount];
+            System.arraycopy(args, 0, boundArgs, 0, maxArgCount);
+        }
+        return MH.insertArguments(calleeBoundConstructor, 1, boundArgs);
+    }
+
+    private MethodHandle[] bindConstructorSpecializations(final ScriptFunction fn, final Object[] args) {
+        final MethodHandle[] ctorSpecs = getConstructSpecializations();
+        if(ctorSpecs == null) {
+            return null;
+        }
+        final MethodHandle[] boundSpecializations = new MethodHandle[ctorSpecs.length];
+        for(int i = 0; i < ctorSpecs.length; ++i) {
+            boundSpecializations[i] = bindConstructHandle(ctorSpecs[i], fn, args);
+        }
+        return boundSpecializations;
+    }
+
+    /**
+     * Takes a variable-arity method and binds a variable number of arguments in it. The returned method will filter the
+     * vararg array and pass a different array that prepends the bound arguments in front of the arguments passed on
+     * invocation
+     * @param mh the handle
+     * @param args the bound arguments
+     * @return the bound method handle
+     */
+    private static MethodHandle varArgBinder(final MethodHandle mh, final Object[] args) {
+        assert args != null;
+        assert args.length > 0;
+        return MH.filterArguments(mh, mh.type().parameterCount() - 1, MH.bindTo(BIND_VAR_ARGS, args));
+    }
+
     /**
      * Convert boolean flags to int.
      * @param needsCallee needs-callee flag
@@ -365,7 +666,7 @@ public final class ScriptFunctionData {
      * @param isBuiltin builtin flag
      * @return int flags
      */
-    private static int makeFlags(final boolean needsCallee, final boolean isVarArg, final boolean isStrict, final boolean isBuiltin) {
+    private static int makeFlags(final boolean needsCallee, final boolean isVarArg, final boolean isStrict, final boolean isBuiltin, final boolean isConstructor) {
         int flags = 0;
         if (needsCallee) {
             flags |= HAS_CALLEE;
@@ -379,6 +680,10 @@ public final class ScriptFunctionData {
         if (isBuiltin) {
             flags |= IS_BUILTIN;
         }
+        if (isConstructor) {
+            flags |= IS_CONSTRUCTOR;
+        }
+
         return flags;
     }
 
@@ -412,6 +717,11 @@ public final class ScriptFunctionData {
         return type.parameterType(0) == ScriptFunction.class;
     }
 
+    private static boolean isVarArg(MethodHandle methodHandle) {
+        final MethodType type = methodHandle.type();
+        return type.parameterType(type.parameterCount() - 1).isArray();
+    }
+
     /**
      * Takes a method handle, and returns a potentially different method handle that can be used in
      * {@link ScriptFunction#invoke(Object, Object...)} or {@link ScriptFunction#construct(Object, Object...)}.
@@ -419,14 +729,14 @@ public final class ScriptFunctionData {
      * {@code Object} as well, except for the following ones:
      * <ul>
      *   <li>a last parameter of type {@code Object[]} which is used for vararg functions,</li>
-     *   <li>the second argument, which is forced to be {@link ScriptFunction}, in case the function receives itself
-     *   (callee) as an argument</li>
+     *   <li>the first argument, which is forced to be {@link ScriptFunction}, in case the function receives itself
+     *   (callee) as an argument.</li>
      * </ul>
      *
      * @param handle the original method handle
      * @return the new handle, conforming to the rules above.
      */
-    private MethodHandle adaptMethodType(final MethodHandle handle) {
+    private MethodHandle makeGenericMethod(final MethodHandle handle) {
         final MethodType type = handle.type();
         MethodType newType = type.generic();
         if (isVarArg()) {
@@ -438,17 +748,6 @@ public final class ScriptFunctionData {
         return type.equals(newType) ? handle : handle.asType(newType);
     }
 
-    /**
-     * Adapts a method handle to conform to requirements of a constructor. Right now this consists of making sure its
-     * return value is {@code Object}. We might consider moving the caller-this argument swap here too from
-     * {@link ScriptFunction#findNewMethod(org.dynalang.dynalink.CallSiteDescriptor)}.
-     * @param ctorHandle the constructor method handle
-     * @return adapted constructor method handle
-     */
-    private static MethodHandle adaptConstructor(final MethodHandle ctorHandle) {
-        return changeReturnTypeToObject(ctorHandle);
-    }
-
     /**
      * Adapts the method handle so its return type is {@code Object}. If the handle's return type is already
      * {@code Object}, the handle is returned unchanged.
@@ -458,4 +757,56 @@ public final class ScriptFunctionData {
     private static MethodHandle changeReturnTypeToObject(final MethodHandle mh) {
         return MH.asType(mh, mh.type().changeReturnType(Object.class));
     }
+
+
+    /**
+     * If this function's method handles need a callee parameter, swap the order of first two arguments for the passed
+     * method handle. If this function's method handles don't need a callee parameter, returns the original method
+     * handle unchanged.
+     * @param mh a method handle with order of arguments {@code (callee, this, args...)}
+     * @return a method handle with order of arguments {@code (this, callee, args...)}
+     */
+    private MethodHandle swapCalleeAndThis(final MethodHandle mh) {
+        if (!needsCallee()) {
+            return mh;
+        }
+        final MethodType type = mh.type();
+        assert type.parameterType(0) == ScriptFunction.class;
+        assert type.parameterType(1) == Object.class;
+        final MethodType newType = type.changeParameterType(0, Object.class).changeParameterType(1, ScriptFunction.class);
+        final int[] reorder = new int[type.parameterCount()];
+        reorder[0] = 1;
+        assert reorder[1] == 0;
+        for (int i = 2; i < reorder.length; ++i) {
+            reorder[i] = i;
+        }
+        return MethodHandles.permuteArguments(mh, newType, reorder);
+    }
+
+    @SuppressWarnings("unused")
+    private static Object[] bindVarArgs(final Object[] array1, final Object[] array2) {
+        if(array2 == null) {
+            // Must clone it, as we can't allow the receiving method to alter the array
+            return array1.clone();
+        }
+        final int l2 = array2.length;
+        if(l2 == 0) {
+            return array1.clone();
+        }
+        final int l1 = array1.length;
+        final Object[] concat = new Object[l1 + l2];
+        System.arraycopy(array1, 0, concat, 0, l1);
+        System.arraycopy(array2, 0, concat, l1, l2);
+        return concat;
+    }
+
+    @SuppressWarnings("unused")
+    private static Object newFilter(final Object result, final Object allocation) {
+        return (result instanceof ScriptObject || !JSType.isPrimitive(result))? result : allocation;
+    }
+
+    private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
+        return MH.findStatic(MethodHandles.lookup(), ScriptFunctionData.class, name, MH.type(rtype, types));
+    }
+
 }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java
index 4b455621f24..f491d388a91 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java
@@ -321,24 +321,6 @@ public final class ScriptRuntime {
         }
     }
 
-    /**
-     * Constructor new object using given constructor function
-     * @param target ScriptFunction object.
-     * @param args   Constructor arguments.
-     * @return newly constructed object.
-     */
-    public static Object construct(final ScriptFunction target, final Object... args) {
-        try {
-            final ScriptObject allocation = (ScriptObject)target.allocate();
-            final Object result = target.construct(allocation, args);
-            return result instanceof ScriptObject ? result : allocation;
-        } catch (final RuntimeException | Error e) {
-            throw e;
-        } catch (final Throwable t) {
-            throw new RuntimeException(t);
-        }
-    }
-
     /**
      * Generic implementation of ECMA 9.12 - SameValue algorithm
      *
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/SpecializedMethodChooser.java b/nashorn/src/jdk/nashorn/internal/runtime/SpecializedMethodChooser.java
new file mode 100644
index 00000000000..2853cdf2464
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/SpecializedMethodChooser.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodType;
+import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.runtime.options.Options;
+
+class SpecializedMethodChooser {
+    /** Should specialized function and specialized constructors for the builtin be used if available? */
+    private static final boolean DISABLE_SPECIALIZATION = Options.getBooleanProperty("nashorn.scriptfunction.specialization.disable");
+
+    static MethodHandle candidateWithLowestWeight(final MethodType descType, final MethodHandle initialCandidate, final MethodHandle[] specs) {
+        if (DISABLE_SPECIALIZATION || specs == null) {
+            return initialCandidate;
+        }
+
+        int          minimumWeight = Integer.MAX_VALUE;
+        MethodHandle candidate     = initialCandidate;
+
+        for (final MethodHandle spec : specs) {
+            final MethodType specType = spec.type();
+
+            if (!typeCompatible(descType, specType)) {
+                continue;
+            }
+
+            //return type is ok. we want a wider or equal one for our callsite.
+            final int specWeight = weigh(specType);
+            if (specWeight < minimumWeight) {
+                candidate = spec;
+                minimumWeight = specWeight;
+            }
+        }
+
+        return candidate;
+    }
+
+    private static boolean typeCompatible(final MethodType desc, final MethodType spec) {
+        //spec must fit in desc
+        final Class<?>[] dparray = desc.parameterArray();
+        final Class<?>[] sparray = spec.parameterArray();
+
+        if (dparray.length != sparray.length) {
+            return false;
+        }
+
+        for (int i = 0; i < dparray.length; i++) {
+            final Type dp = Type.typeFor(dparray[i]);
+            final Type sp = Type.typeFor(sparray[i]);
+
+            if (dp.isBoolean()) {
+                return false; //don't specialize on booleans, we have the "true" vs int 1 ambiguity in resolution
+            }
+
+            //specialization arguments must be at least as wide as dp, if not wider
+            if (Type.widest(dp, sp) != sp) {
+                //e.g. specialization takes double and callsite says "object". reject.
+                //but if specialization says double and callsite says "int" or "long" or "double", that's fine
+                return false;
+            }
+        }
+
+        return true; // anything goes for return type, take the convenient one and it will be upcasted thru dynalink magic.
+    }
+
+    private static int weigh(final MethodType t) {
+        int weight = Type.typeFor(t.returnType()).getWeight();
+        for (final Class<?> paramType : t.parameterArray()) {
+            final int pweight = Type.typeFor(paramType).getWeight();
+            weight += pweight;
+        }
+        return weight;
+    }
+}
diff --git a/nashorn/test/script/basic/funcbind2.js b/nashorn/test/script/basic/funcbind2.js
new file mode 100644
index 00000000000..697ee5292da
--- /dev/null
+++ b/nashorn/test/script/basic/funcbind2.js
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Test the functionality of Function.prototype.bind.
+ *
+ * @test
+ * @run
+ */
+
+function f(a, b) {
+    print("f: this=" + this + ", a=" + a + ", b=" + b);
+}
+function v(a, b) {
+    print("v: this=" + this + ", a=" + a + ", b=" + b + ", c=" + arguments[2]);
+}
+
+(f.bind(null))();
+(v.bind(null))();
+
+var boundThis = "boundThis";
+(f.bind(boundThis))();
+(v.bind(boundThis))();
+
+(f.bind(boundThis))("a0");
+(v.bind(boundThis))("a1");
+
+(f.bind(boundThis, "a2"))();
+(v.bind(boundThis, "a3"))();
+
+(f.bind(boundThis, "a4"))("b4");
+(v.bind(boundThis, "a5"))("b5");
+
+(f.bind(boundThis, "a6", "b6"))();
+(v.bind(boundThis, "a7", "b7"))();
+
+(f.bind(boundThis, "a8", "b8"))("c8"); // invoking with extra args after all were bound!
+(v.bind(boundThis, "a9", "b9"))("c9");
+
+(f.bind(boundThis, "a10", "b10", "c10"))(); // binding more args than it receives!
+(v.bind(boundThis, "a11", "b11", "c11"))();
+
+print("\nTest constructors\n");
+
+new (f.bind(boundThis))();
+new (v.bind(boundThis))();
+
+new (f.bind(boundThis))("a0");
+new (v.bind(boundThis))("a1");
+
+new (f.bind(boundThis, "a2"))();
+new (v.bind(boundThis, "a3"))();
+
+new (f.bind(boundThis, "a4"))("b4");
+new (v.bind(boundThis, "a5"))("b5");
+
+new (f.bind(boundThis, "a6", "b6"))();
+new (v.bind(boundThis, "a7", "b7"))();
+
+new (f.bind(boundThis, "a8", "b8"))("c8");
+new (v.bind(boundThis, "a9", "b9"))("c9");
+
+new (f.bind(boundThis, "a10", "b10", "c10"))();
+new (v.bind(boundThis, "a11", "b11", "c11"))();
+
+print("\nTest double binding\n");
+
+(f.bind(boundThis).bind("thisIsIgnored"))();
+new (f.bind("thisIsIgnored").bind("thisIsIgnoredToo"))();
+new (f.bind("thisIsIgnored", "a12").bind("thisIsIgnoredToo"))();
+
+(v.bind(boundThis).bind("thisIsIgnored"))();
+new (v.bind("thisIsIgnored").bind("thisIsIgnoredToo"))();
+new (v.bind("thisIsIgnored", "a13").bind("thisIsIgnoredToo"))();
diff --git a/nashorn/test/script/basic/funcbind2.js.EXPECTED b/nashorn/test/script/basic/funcbind2.js.EXPECTED
new file mode 100644
index 00000000000..5b874535252
--- /dev/null
+++ b/nashorn/test/script/basic/funcbind2.js.EXPECTED
@@ -0,0 +1,42 @@
+f: this=[object global], a=undefined, b=undefined
+v: this=[object global], a=undefined, b=undefined, c=undefined
+f: this=boundThis, a=undefined, b=undefined
+v: this=boundThis, a=undefined, b=undefined, c=undefined
+f: this=boundThis, a=a0, b=undefined
+v: this=boundThis, a=a1, b=undefined, c=undefined
+f: this=boundThis, a=a2, b=undefined
+v: this=boundThis, a=a3, b=undefined, c=undefined
+f: this=boundThis, a=a4, b=b4
+v: this=boundThis, a=a5, b=b5, c=undefined
+f: this=boundThis, a=a6, b=b6
+v: this=boundThis, a=a7, b=b7, c=undefined
+f: this=boundThis, a=a8, b=b8
+v: this=boundThis, a=a9, b=b9, c=c9
+f: this=boundThis, a=a10, b=b10
+v: this=boundThis, a=a11, b=b11, c=c11
+
+Test constructors
+
+f: this=[object Object], a=undefined, b=undefined
+v: this=[object Object], a=undefined, b=undefined, c=undefined
+f: this=[object Object], a=a0, b=undefined
+v: this=[object Object], a=a1, b=undefined, c=undefined
+f: this=[object Object], a=a2, b=undefined
+v: this=[object Object], a=a3, b=undefined, c=undefined
+f: this=[object Object], a=a4, b=b4
+v: this=[object Object], a=a5, b=b5, c=undefined
+f: this=[object Object], a=a6, b=b6
+v: this=[object Object], a=a7, b=b7, c=undefined
+f: this=[object Object], a=a8, b=b8
+v: this=[object Object], a=a9, b=b9, c=c9
+f: this=[object Object], a=a10, b=b10
+v: this=[object Object], a=a11, b=b11, c=c11
+
+Test double binding
+
+f: this=boundThis, a=undefined, b=undefined
+f: this=[object Object], a=undefined, b=undefined
+f: this=[object Object], a=a12, b=undefined
+v: this=boundThis, a=undefined, b=undefined, c=undefined
+v: this=[object Object], a=undefined, b=undefined, c=undefined
+v: this=[object Object], a=a13, b=undefined, c=undefined
diff --git a/nashorn/test/script/basic/funcbind3.js b/nashorn/test/script/basic/funcbind3.js
new file mode 100644
index 00000000000..25f448d2a87
--- /dev/null
+++ b/nashorn/test/script/basic/funcbind3.js
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Test the assumptions about bound function prototypes
+ *
+ * @test
+ * @run
+ */
+
+function printAssumption(__x__) {
+  print(__x__ + ": " + eval(__x__));
+}
+
+function f() { }
+
+var b = f.bind(null)
+
+var x = new f()
+var y = new b()
+
+printAssumption("x instanceof f")
+printAssumption("x instanceof b")
+printAssumption("y instanceof f")
+printAssumption("y instanceof b")
+
+print("\nChanging prototype\n");
+
+f.prototype=new Object()
+
+printAssumption("x instanceof f")
+printAssumption("x instanceof b")
+printAssumption("y instanceof f")
+printAssumption("y instanceof b")
+
+print("\Bound function prototype\n");
+
+printAssumption("f.hasOwnProperty('prototype')")
+printAssumption("b.hasOwnProperty('prototype')")
diff --git a/nashorn/test/script/basic/funcbind3.js.EXPECTED b/nashorn/test/script/basic/funcbind3.js.EXPECTED
new file mode 100644
index 00000000000..f69126d3e9d
--- /dev/null
+++ b/nashorn/test/script/basic/funcbind3.js.EXPECTED
@@ -0,0 +1,15 @@
+x instanceof f: true
+x instanceof b: true
+y instanceof f: true
+y instanceof b: true
+
+Changing prototype
+
+x instanceof f: false
+x instanceof b: false
+y instanceof f: false
+y instanceof b: false
+Bound function prototype
+
+f.hasOwnProperty('prototype'): true
+b.hasOwnProperty('prototype'): false

From 71666c4c5ac79f96e2987e24c9015b0a03659ed0 Mon Sep 17 00:00:00 2001
From: Mike Duigou <mduigou@openjdk.org>
Date: Tue, 19 Feb 2013 11:56:49 -0800
Subject: [PATCH 133/311] 8004561: Additional functional interfaces, extension
 methods and name changes

Adds additional functional interfaces for primitives and "Bi" (two operand). Adds utility extension methods. Includes some name changes for existing functional interfaces per EG decisions.

Reviewed-by: briangoetz, darcy, chegar, dholmes
---
 .../time/chrono/HijrahDeviationReader.java    |   8 +-
 .../util/concurrent/atomic/AtomicInteger.java |   8 +-
 .../concurrent/atomic/AtomicIntegerArray.java |   8 +-
 .../atomic/AtomicIntegerFieldUpdater.java     |   8 +-
 .../util/concurrent/atomic/AtomicLong.java    |   8 +-
 .../concurrent/atomic/AtomicLongArray.java    |   8 +-
 .../atomic/AtomicLongFieldUpdater.java        |   8 +-
 .../concurrent/atomic/AtomicReference.java    |   8 +-
 .../atomic/AtomicReferenceArray.java          |   8 +-
 .../atomic/AtomicReferenceFieldUpdater.java   |   8 +-
 .../concurrent/atomic/DoubleAccumulator.java  |   8 +-
 .../concurrent/atomic/LongAccumulator.java    |   8 +-
 .../util/concurrent/atomic/Striped64.java     |   8 +-
 .../java/util/function/BiConsumer.java        |  50 +++++++++
 .../java/util/function/BiFunction.java        |  51 +++++++++
 .../java/util/function/BiPredicate.java       | 103 ++++++++++++++++++
 .../java/util/function/BinaryOperator.java    |  20 +---
 .../java/util/function/BooleanSupplier.java   |  44 ++++++++
 .../function/{Block.java => Consumer.java}    |  10 +-
 .../util/function/DoubleBinaryOperator.java   |  13 +--
 .../{DoubleBlock.java => DoubleConsumer.java} |  19 ++--
 .../java/util/function/DoubleFunction.java    |  19 ++--
 .../java/util/function/DoublePredicate.java   | 101 +++++++++++++++++
 .../java/util/function/DoubleSupplier.java    |   7 +-
 .../util/function/DoubleUnaryOperator.java    |   8 +-
 .../classes/java/util/function/Function.java  |  10 +-
 .../java/util/function/IntBinaryOperator.java |   5 +-
 .../{IntBlock.java => IntConsumer.java}       |  19 ++--
 .../java/util/function/IntFunction.java       |  19 ++--
 .../java/util/function/IntPredicate.java      | 100 +++++++++++++++++
 .../java/util/function/IntSupplier.java       |   7 +-
 .../java/util/function/IntUnaryOperator.java  |   9 +-
 .../util/function/LongBinaryOperator.java     |   5 +-
 .../{LongBlock.java => LongConsumer.java}     |  19 ++--
 .../java/util/function/LongFunction.java      |  19 ++--
 .../java/util/function/LongPredicate.java     | 100 +++++++++++++++++
 .../java/util/function/LongSupplier.java      |   9 +-
 .../java/util/function/LongUnaryOperator.java |   5 +-
 .../java/util/function/ObjDoubleConsumer.java |  48 ++++++++
 .../java/util/function/ObjIntConsumer.java    |  48 ++++++++
 .../java/util/function/ObjLongConsumer.java   |  48 ++++++++
 .../classes/java/util/function/Predicate.java |  57 +++++++++-
 .../util/function/ToDoubleBiFunction.java     |  50 +++++++++
 .../java/util/function/ToDoubleFunction.java  |  46 ++++++++
 .../java/util/function/ToIntBiFunction.java   |  50 +++++++++
 .../java/util/function/ToIntFunction.java     |  46 ++++++++
 .../java/util/function/ToLongBiFunction.java  |  50 +++++++++
 .../java/util/function/ToLongFunction.java    |  46 ++++++++
 .../java/util/function/UnaryOperator.java     |  16 +--
 .../java/util/function/package-info.java      |  69 +++++++++---
 .../java/lang/PrimitiveSumMinMaxTest.java     |  66 +++++------
 51 files changed, 1290 insertions(+), 225 deletions(-)
 create mode 100644 jdk/src/share/classes/java/util/function/BiConsumer.java
 create mode 100644 jdk/src/share/classes/java/util/function/BiFunction.java
 create mode 100644 jdk/src/share/classes/java/util/function/BiPredicate.java
 create mode 100644 jdk/src/share/classes/java/util/function/BooleanSupplier.java
 rename jdk/src/share/classes/java/util/function/{Block.java => Consumer.java} (84%)
 rename jdk/src/share/classes/java/util/function/{DoubleBlock.java => DoubleConsumer.java} (75%)
 create mode 100644 jdk/src/share/classes/java/util/function/DoublePredicate.java
 rename jdk/src/share/classes/java/util/function/{IntBlock.java => IntConsumer.java} (75%)
 create mode 100644 jdk/src/share/classes/java/util/function/IntPredicate.java
 rename jdk/src/share/classes/java/util/function/{LongBlock.java => LongConsumer.java} (75%)
 create mode 100644 jdk/src/share/classes/java/util/function/LongPredicate.java
 create mode 100644 jdk/src/share/classes/java/util/function/ObjDoubleConsumer.java
 create mode 100644 jdk/src/share/classes/java/util/function/ObjIntConsumer.java
 create mode 100644 jdk/src/share/classes/java/util/function/ObjLongConsumer.java
 create mode 100644 jdk/src/share/classes/java/util/function/ToDoubleBiFunction.java
 create mode 100644 jdk/src/share/classes/java/util/function/ToDoubleFunction.java
 create mode 100644 jdk/src/share/classes/java/util/function/ToIntBiFunction.java
 create mode 100644 jdk/src/share/classes/java/util/function/ToIntFunction.java
 create mode 100644 jdk/src/share/classes/java/util/function/ToLongBiFunction.java
 create mode 100644 jdk/src/share/classes/java/util/function/ToLongFunction.java

diff --git a/jdk/src/share/classes/java/time/chrono/HijrahDeviationReader.java b/jdk/src/share/classes/java/time/chrono/HijrahDeviationReader.java
index 67495d040eb..0c207af62bc 100644
--- a/jdk/src/share/classes/java/time/chrono/HijrahDeviationReader.java
+++ b/jdk/src/share/classes/java/time/chrono/HijrahDeviationReader.java
@@ -70,7 +70,7 @@ import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoField;
 import java.util.Arrays;
-import java.util.function.Block;
+import java.util.function.Consumer;
 
 /**
  * A reader for Hijrah Deviation files.
@@ -126,13 +126,13 @@ final class HijrahDeviationReader {
      * @param typeId the name of the calendar
      * @param calendarType the calendar type
      * @return {@code true} if the file was read and each entry accepted by the
-     * Block; else {@code false} no configuration was done
+     * Consumer; else {@code false} no configuration was done
      *
      * @throws IOException for zip/jar file handling exception.
      * @throws ParseException if the format of the configuration file is wrong.
      */
     static boolean readDeviation(String typeId, String calendarType,
-            Block<HijrahChronology.Deviation> block) throws IOException, ParseException {
+            Consumer<HijrahChronology.Deviation> consumer) throws IOException, ParseException {
         InputStream is = getConfigFileInputStream(typeId);
         if (is != null) {
             try (BufferedReader br = new BufferedReader(new InputStreamReader(is))) {
@@ -142,7 +142,7 @@ final class HijrahDeviationReader {
                     num++;
                     HijrahChronology.Deviation entry = parseLine(line, num);
                     if (entry != null) {
-                        block.accept(entry);
+                        consumer.accept(entry);
                     }
                 }
             }
diff --git a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicInteger.java b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicInteger.java
index b48ef72dfc9..8fed658a54c 100644
--- a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicInteger.java
+++ b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicInteger.java
@@ -219,7 +219,7 @@ public class AtomicInteger extends Number implements java.io.Serializable {
         int prev, next;
         do {
             prev = get();
-            next = updateFunction.operateAsInt(prev);
+            next = updateFunction.applyAsInt(prev);
         } while (!compareAndSet(prev, next));
         return prev;
     }
@@ -238,7 +238,7 @@ public class AtomicInteger extends Number implements java.io.Serializable {
         int prev, next;
         do {
             prev = get();
-            next = updateFunction.operateAsInt(prev);
+            next = updateFunction.applyAsInt(prev);
         } while (!compareAndSet(prev, next));
         return next;
     }
@@ -262,7 +262,7 @@ public class AtomicInteger extends Number implements java.io.Serializable {
         int prev, next;
         do {
             prev = get();
-            next = accumulatorFunction.operateAsInt(prev, x);
+            next = accumulatorFunction.applyAsInt(prev, x);
         } while (!compareAndSet(prev, next));
         return prev;
     }
@@ -286,7 +286,7 @@ public class AtomicInteger extends Number implements java.io.Serializable {
         int prev, next;
         do {
             prev = get();
-            next = accumulatorFunction.operateAsInt(prev, x);
+            next = accumulatorFunction.applyAsInt(prev, x);
         } while (!compareAndSet(prev, next));
         return next;
     }
diff --git a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicIntegerArray.java b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicIntegerArray.java
index 6e4d226ba80..7c259fee06f 100644
--- a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicIntegerArray.java
+++ b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicIntegerArray.java
@@ -263,7 +263,7 @@ public class AtomicIntegerArray implements java.io.Serializable {
         int prev, next;
         do {
             prev = getRaw(offset);
-            next = updateFunction.operateAsInt(prev);
+            next = updateFunction.applyAsInt(prev);
         } while (!compareAndSetRaw(offset, prev, next));
         return prev;
     }
@@ -284,7 +284,7 @@ public class AtomicIntegerArray implements java.io.Serializable {
         int prev, next;
         do {
             prev = getRaw(offset);
-            next = updateFunction.operateAsInt(prev);
+            next = updateFunction.applyAsInt(prev);
         } while (!compareAndSetRaw(offset, prev, next));
         return next;
     }
@@ -310,7 +310,7 @@ public class AtomicIntegerArray implements java.io.Serializable {
         int prev, next;
         do {
             prev = getRaw(offset);
-            next = accumulatorFunction.operateAsInt(prev, x);
+            next = accumulatorFunction.applyAsInt(prev, x);
         } while (!compareAndSetRaw(offset, prev, next));
         return prev;
     }
@@ -336,7 +336,7 @@ public class AtomicIntegerArray implements java.io.Serializable {
         int prev, next;
         do {
             prev = getRaw(offset);
-            next = accumulatorFunction.operateAsInt(prev, x);
+            next = accumulatorFunction.applyAsInt(prev, x);
         } while (!compareAndSetRaw(offset, prev, next));
         return next;
     }
diff --git a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java
index fcd5dd05f28..4a8d1df5a63 100644
--- a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java
+++ b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java
@@ -281,7 +281,7 @@ public abstract class AtomicIntegerFieldUpdater<T> {
         int prev, next;
         do {
             prev = get(obj);
-            next = updateFunction.operateAsInt(prev);
+            next = updateFunction.applyAsInt(prev);
         } while (!compareAndSet(obj, prev, next));
         return prev;
     }
@@ -301,7 +301,7 @@ public abstract class AtomicIntegerFieldUpdater<T> {
         int prev, next;
         do {
             prev = get(obj);
-            next = updateFunction.operateAsInt(prev);
+            next = updateFunction.applyAsInt(prev);
         } while (!compareAndSet(obj, prev, next));
         return next;
     }
@@ -326,7 +326,7 @@ public abstract class AtomicIntegerFieldUpdater<T> {
         int prev, next;
         do {
             prev = get(obj);
-            next = accumulatorFunction.operateAsInt(prev, x);
+            next = accumulatorFunction.applyAsInt(prev, x);
         } while (!compareAndSet(obj, prev, next));
         return prev;
     }
@@ -351,7 +351,7 @@ public abstract class AtomicIntegerFieldUpdater<T> {
         int prev, next;
         do {
             prev = get(obj);
-            next = accumulatorFunction.operateAsInt(prev, x);
+            next = accumulatorFunction.applyAsInt(prev, x);
         } while (!compareAndSet(obj, prev, next));
         return next;
     }
diff --git a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicLong.java b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicLong.java
index 2e58d29b211..35af7759ac7 100644
--- a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicLong.java
+++ b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicLong.java
@@ -233,7 +233,7 @@ public class AtomicLong extends Number implements java.io.Serializable {
         long prev, next;
         do {
             prev = get();
-            next = updateFunction.operateAsLong(prev);
+            next = updateFunction.applyAsLong(prev);
         } while (!compareAndSet(prev, next));
         return prev;
     }
@@ -252,7 +252,7 @@ public class AtomicLong extends Number implements java.io.Serializable {
         long prev, next;
         do {
             prev = get();
-            next = updateFunction.operateAsLong(prev);
+            next = updateFunction.applyAsLong(prev);
         } while (!compareAndSet(prev, next));
         return next;
     }
@@ -276,7 +276,7 @@ public class AtomicLong extends Number implements java.io.Serializable {
         long prev, next;
         do {
             prev = get();
-            next = accumulatorFunction.operateAsLong(prev, x);
+            next = accumulatorFunction.applyAsLong(prev, x);
         } while (!compareAndSet(prev, next));
         return prev;
     }
@@ -300,7 +300,7 @@ public class AtomicLong extends Number implements java.io.Serializable {
         long prev, next;
         do {
             prev = get();
-            next = accumulatorFunction.operateAsLong(prev, x);
+            next = accumulatorFunction.applyAsLong(prev, x);
         } while (!compareAndSet(prev, next));
         return next;
     }
diff --git a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicLongArray.java b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicLongArray.java
index 2536a9b8e93..216479abeca 100644
--- a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicLongArray.java
+++ b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicLongArray.java
@@ -262,7 +262,7 @@ public class AtomicLongArray implements java.io.Serializable {
         long prev, next;
         do {
             prev = getRaw(offset);
-            next = updateFunction.operateAsLong(prev);
+            next = updateFunction.applyAsLong(prev);
         } while (!compareAndSetRaw(offset, prev, next));
         return prev;
     }
@@ -283,7 +283,7 @@ public class AtomicLongArray implements java.io.Serializable {
         long prev, next;
         do {
             prev = getRaw(offset);
-            next = updateFunction.operateAsLong(prev);
+            next = updateFunction.applyAsLong(prev);
         } while (!compareAndSetRaw(offset, prev, next));
         return next;
     }
@@ -309,7 +309,7 @@ public class AtomicLongArray implements java.io.Serializable {
         long prev, next;
         do {
             prev = getRaw(offset);
-            next = accumulatorFunction.operateAsLong(prev, x);
+            next = accumulatorFunction.applyAsLong(prev, x);
         } while (!compareAndSetRaw(offset, prev, next));
         return prev;
     }
@@ -335,7 +335,7 @@ public class AtomicLongArray implements java.io.Serializable {
         long prev, next;
         do {
             prev = getRaw(offset);
-            next = accumulatorFunction.operateAsLong(prev, x);
+            next = accumulatorFunction.applyAsLong(prev, x);
         } while (!compareAndSetRaw(offset, prev, next));
         return next;
     }
diff --git a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java
index a7672263a77..e5c6e8a0044 100644
--- a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java
+++ b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java
@@ -284,7 +284,7 @@ public abstract class AtomicLongFieldUpdater<T> {
         long prev, next;
         do {
             prev = get(obj);
-            next = updateFunction.operateAsLong(prev);
+            next = updateFunction.applyAsLong(prev);
         } while (!compareAndSet(obj, prev, next));
         return prev;
     }
@@ -304,7 +304,7 @@ public abstract class AtomicLongFieldUpdater<T> {
         long prev, next;
         do {
             prev = get(obj);
-            next = updateFunction.operateAsLong(prev);
+            next = updateFunction.applyAsLong(prev);
         } while (!compareAndSet(obj, prev, next));
         return next;
     }
@@ -329,7 +329,7 @@ public abstract class AtomicLongFieldUpdater<T> {
         long prev, next;
         do {
             prev = get(obj);
-            next = accumulatorFunction.operateAsLong(prev, x);
+            next = accumulatorFunction.applyAsLong(prev, x);
         } while (!compareAndSet(obj, prev, next));
         return prev;
     }
@@ -354,7 +354,7 @@ public abstract class AtomicLongFieldUpdater<T> {
         long prev, next;
         do {
             prev = get(obj);
-            next = accumulatorFunction.operateAsLong(prev, x);
+            next = accumulatorFunction.applyAsLong(prev, x);
         } while (!compareAndSet(obj, prev, next));
         return next;
     }
diff --git a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicReference.java b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicReference.java
index 95b88d127e2..ddce0734300 100644
--- a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicReference.java
+++ b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicReference.java
@@ -157,7 +157,7 @@ public class AtomicReference<V> implements java.io.Serializable {
         V prev, next;
         do {
             prev = get();
-            next = updateFunction.operate(prev);
+            next = updateFunction.apply(prev);
         } while (!compareAndSet(prev, next));
         return prev;
     }
@@ -176,7 +176,7 @@ public class AtomicReference<V> implements java.io.Serializable {
         V prev, next;
         do {
             prev = get();
-            next = updateFunction.operate(prev);
+            next = updateFunction.apply(prev);
         } while (!compareAndSet(prev, next));
         return next;
     }
@@ -200,7 +200,7 @@ public class AtomicReference<V> implements java.io.Serializable {
         V prev, next;
         do {
             prev = get();
-            next = accumulatorFunction.operate(prev, x);
+            next = accumulatorFunction.apply(prev, x);
         } while (!compareAndSet(prev, next));
         return prev;
     }
@@ -224,7 +224,7 @@ public class AtomicReference<V> implements java.io.Serializable {
         V prev, next;
         do {
             prev = get();
-            next = accumulatorFunction.operate(prev, x);
+            next = accumulatorFunction.apply(prev, x);
         } while (!compareAndSet(prev, next));
         return next;
     }
diff --git a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java
index 3e6ce969847..f8787ba1d40 100644
--- a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java
+++ b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java
@@ -217,7 +217,7 @@ public class AtomicReferenceArray<E> implements java.io.Serializable {
         E prev, next;
         do {
             prev = getRaw(offset);
-            next = updateFunction.operate(prev);
+            next = updateFunction.apply(prev);
         } while (!compareAndSetRaw(offset, prev, next));
         return prev;
     }
@@ -238,7 +238,7 @@ public class AtomicReferenceArray<E> implements java.io.Serializable {
         E prev, next;
         do {
             prev = getRaw(offset);
-            next = updateFunction.operate(prev);
+            next = updateFunction.apply(prev);
         } while (!compareAndSetRaw(offset, prev, next));
         return next;
     }
@@ -264,7 +264,7 @@ public class AtomicReferenceArray<E> implements java.io.Serializable {
         E prev, next;
         do {
             prev = getRaw(offset);
-            next = accumulatorFunction.operate(prev, x);
+            next = accumulatorFunction.apply(prev, x);
         } while (!compareAndSetRaw(offset, prev, next));
         return prev;
     }
@@ -290,7 +290,7 @@ public class AtomicReferenceArray<E> implements java.io.Serializable {
         E prev, next;
         do {
             prev = getRaw(offset);
-            next = accumulatorFunction.operate(prev, x);
+            next = accumulatorFunction.apply(prev, x);
         } while (!compareAndSetRaw(offset, prev, next));
         return next;
     }
diff --git a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java
index a92d914ff77..933e5e4fc92 100644
--- a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java
+++ b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java
@@ -200,7 +200,7 @@ public abstract class AtomicReferenceFieldUpdater<T, V> {
         V prev, next;
         do {
             prev = get(obj);
-            next = updateFunction.operate(prev);
+            next = updateFunction.apply(prev);
         } while (!compareAndSet(obj, prev, next));
         return prev;
     }
@@ -220,7 +220,7 @@ public abstract class AtomicReferenceFieldUpdater<T, V> {
         V prev, next;
         do {
             prev = get(obj);
-            next = updateFunction.operate(prev);
+            next = updateFunction.apply(prev);
         } while (!compareAndSet(obj, prev, next));
         return next;
     }
@@ -245,7 +245,7 @@ public abstract class AtomicReferenceFieldUpdater<T, V> {
         V prev, next;
         do {
             prev = get(obj);
-            next = accumulatorFunction.operate(prev, x);
+            next = accumulatorFunction.apply(prev, x);
         } while (!compareAndSet(obj, prev, next));
         return prev;
     }
@@ -270,7 +270,7 @@ public abstract class AtomicReferenceFieldUpdater<T, V> {
         V prev, next;
         do {
             prev = get(obj);
-            next = accumulatorFunction.operate(prev, x);
+            next = accumulatorFunction.apply(prev, x);
         } while (!compareAndSet(obj, prev, next));
         return next;
     }
diff --git a/jdk/src/share/classes/java/util/concurrent/atomic/DoubleAccumulator.java b/jdk/src/share/classes/java/util/concurrent/atomic/DoubleAccumulator.java
index 17556500af3..277f185f869 100644
--- a/jdk/src/share/classes/java/util/concurrent/atomic/DoubleAccumulator.java
+++ b/jdk/src/share/classes/java/util/concurrent/atomic/DoubleAccumulator.java
@@ -100,14 +100,14 @@ public class DoubleAccumulator extends Striped64 implements Serializable {
         Cell[] as; long b, v, r; int m; Cell a;
         if ((as = cells) != null ||
             (r = Double.doubleToRawLongBits
-             (function.operateAsDouble
+             (function.applyAsDouble
               (Double.longBitsToDouble(b = base), x))) != b  && !casBase(b, r)) {
             boolean uncontended = true;
             if (as == null || (m = as.length - 1) < 0 ||
                 (a = as[getProbe() & m]) == null ||
                 !(uncontended =
                   (r = Double.doubleToRawLongBits
-                   (function.operateAsDouble
+                   (function.applyAsDouble
                     (Double.longBitsToDouble(v = a.value), x))) == v ||
                   a.cas(v, r)))
                 doubleAccumulate(x, function, uncontended);
@@ -129,7 +129,7 @@ public class DoubleAccumulator extends Striped64 implements Serializable {
         if (as != null) {
             for (int i = 0; i < as.length; ++i) {
                 if ((a = as[i]) != null)
-                    result = function.operateAsDouble
+                    result = function.applyAsDouble
                         (result, Double.longBitsToDouble(a.value));
             }
         }
@@ -174,7 +174,7 @@ public class DoubleAccumulator extends Striped64 implements Serializable {
                 if ((a = as[i]) != null) {
                     double v = Double.longBitsToDouble(a.value);
                     a.value = identity;
-                    result = function.operateAsDouble(result, v);
+                    result = function.applyAsDouble(result, v);
                 }
             }
         }
diff --git a/jdk/src/share/classes/java/util/concurrent/atomic/LongAccumulator.java b/jdk/src/share/classes/java/util/concurrent/atomic/LongAccumulator.java
index 855b09e44de..bfddcd3dcbd 100644
--- a/jdk/src/share/classes/java/util/concurrent/atomic/LongAccumulator.java
+++ b/jdk/src/share/classes/java/util/concurrent/atomic/LongAccumulator.java
@@ -101,12 +101,12 @@ public class LongAccumulator extends Striped64 implements Serializable {
     public void accumulate(long x) {
         Cell[] as; long b, v, r; int m; Cell a;
         if ((as = cells) != null ||
-            (r = function.operateAsLong(b = base, x)) != b && !casBase(b, r)) {
+            (r = function.applyAsLong(b = base, x)) != b && !casBase(b, r)) {
             boolean uncontended = true;
             if (as == null || (m = as.length - 1) < 0 ||
                 (a = as[getProbe() & m]) == null ||
                 !(uncontended =
-                  (r = function.operateAsLong(v = a.value, x)) == v ||
+                  (r = function.applyAsLong(v = a.value, x)) == v ||
                   a.cas(v, r)))
                 longAccumulate(x, function, uncontended);
         }
@@ -127,7 +127,7 @@ public class LongAccumulator extends Striped64 implements Serializable {
         if (as != null) {
             for (int i = 0; i < as.length; ++i) {
                 if ((a = as[i]) != null)
-                    result = function.operateAsLong(result, a.value);
+                    result = function.applyAsLong(result, a.value);
             }
         }
         return result;
@@ -171,7 +171,7 @@ public class LongAccumulator extends Striped64 implements Serializable {
                 if ((a = as[i]) != null) {
                     long v = a.value;
                     a.value = identity;
-                    result = function.operateAsLong(result, v);
+                    result = function.applyAsLong(result, v);
                 }
             }
         }
diff --git a/jdk/src/share/classes/java/util/concurrent/atomic/Striped64.java b/jdk/src/share/classes/java/util/concurrent/atomic/Striped64.java
index 03969d76dca..708b4c2574f 100644
--- a/jdk/src/share/classes/java/util/concurrent/atomic/Striped64.java
+++ b/jdk/src/share/classes/java/util/concurrent/atomic/Striped64.java
@@ -253,7 +253,7 @@ abstract class Striped64 extends Number {
                 else if (!wasUncontended)       // CAS already known to fail
                     wasUncontended = true;      // Continue after rehash
                 else if (a.cas(v = a.value, ((fn == null) ? v + x :
-                                             fn.operateAsLong(v, x))))
+                                             fn.applyAsLong(v, x))))
                     break;
                 else if (n >= NCPU || cells != as)
                     collide = false;            // At max size or stale
@@ -291,7 +291,7 @@ abstract class Striped64 extends Number {
                     break;
             }
             else if (casBase(v = base, ((fn == null) ? v + x :
-                                        fn.operateAsLong(v, x))))
+                                        fn.applyAsLong(v, x))))
                 break;                          // Fall back on using base
         }
     }
@@ -344,7 +344,7 @@ abstract class Striped64 extends Number {
                                 Double.doubleToRawLongBits
                                 (Double.longBitsToDouble(v) + x) :
                                 Double.doubleToRawLongBits
-                                (fn.operateAsDouble
+                                (fn.applyAsDouble
                                  (Double.longBitsToDouble(v), x)))))
                     break;
                 else if (n >= NCPU || cells != as)
@@ -387,7 +387,7 @@ abstract class Striped64 extends Number {
                               Double.doubleToRawLongBits
                               (Double.longBitsToDouble(v) + x) :
                               Double.doubleToRawLongBits
-                              (fn.operateAsDouble
+                              (fn.applyAsDouble
                                (Double.longBitsToDouble(v), x)))))
                 break;                          // Fall back on using base
         }
diff --git a/jdk/src/share/classes/java/util/function/BiConsumer.java b/jdk/src/share/classes/java/util/function/BiConsumer.java
new file mode 100644
index 00000000000..80bdcfa3b15
--- /dev/null
+++ b/jdk/src/share/classes/java/util/function/BiConsumer.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.util.function;
+
+/**
+ * An operation which accepts two input arguments and returns no result. This is
+ * the two-arity specialization of {@link Consumer}. Unlike most other
+ * functional interfaces, {@code BiConsumer} is expected to operate via
+ * side-effects.
+ *
+ * @param <T> the type of the first argument to the {@code accept} operation.
+ * @param <U> the type of the second argument to the {@code accept} operation.
+ *
+ * @see Consumer
+ * @since 1.8
+ */
+@FunctionalInterface
+public interface BiConsumer<T, U> {
+
+    /**
+     * Performs operations upon the provided objects which may modify those
+     * objects and/or external state.
+     *
+     * @param t an input object
+     * @param u an input object
+     */
+    void accept(T t, U u);
+}
diff --git a/jdk/src/share/classes/java/util/function/BiFunction.java b/jdk/src/share/classes/java/util/function/BiFunction.java
new file mode 100644
index 00000000000..85dc2a0a3cb
--- /dev/null
+++ b/jdk/src/share/classes/java/util/function/BiFunction.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.util.function;
+
+/**
+ * Apply a function to the input arguments, yielding an appropriate result. This
+ * is the two-arity specialization of {@link Function}. A function may
+ * variously provide a mapping between types, object instances or keys and
+ * values or any other form of transformation upon the input.
+ *
+ * @param <T> the type of the first argument to the {@code apply} operation.
+ * @param <U> the type of the second argument to the {@code apply} operation.
+ * @param <R> the type of results returned by the {@code apply} operation.
+ *
+ * @see Function
+ * @since 1.8
+ */
+@FunctionalInterface
+public interface BiFunction<T, U, R> {
+
+    /**
+     * Compute the result of applying the function to the input arguments
+     *
+     * @param t an input object
+     * @param u an input object
+     * @return the function result
+     */
+    R apply(T t, U u);
+}
diff --git a/jdk/src/share/classes/java/util/function/BiPredicate.java b/jdk/src/share/classes/java/util/function/BiPredicate.java
new file mode 100644
index 00000000000..9a8665fa151
--- /dev/null
+++ b/jdk/src/share/classes/java/util/function/BiPredicate.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.util.function;
+
+import java.util.Objects;
+
+/**
+ * Determines if the input objects match some criteria. This is the two-arity
+ * specialization of {@link Predicate}.
+ *
+ * @param <T> the type of the first argument to {@code test}.
+ * @param <U> the type of the second argument to {@code test}.
+ *
+ * @see Predicate
+ * @since 1.8
+ */
+@FunctionalInterface
+public interface BiPredicate<T, U> {
+
+    /**
+     * Return {@code true} if the inputs match some criteria.
+     *
+     * @param t an input object.
+     * @param u an input object.
+     * @return {@code true} if the inputs match some criteria.
+     */
+    boolean test(T t, U u);
+
+    /**
+     * Returns a predicate which evaluates to {@code true} only if this
+     * predicate and the provided predicate both evaluate to {@code true}. If
+     * this predicate returns {@code false} then the remaining predicate is not
+     * evaluated.
+     *
+     * @param p a predicate which will be logically-ANDed with this predicate.
+     * @return a new predicate which returns {@code true} only if both
+     * predicates return {@code true}.
+     */
+    public default BiPredicate<T, U> and(BiPredicate<? super T, ? super U> p) {
+        Objects.requireNonNull(p);
+        return (T t, U u) -> test(t, u) && p.test(t, u);
+    }
+
+    /**
+     * Returns a predicate which negates the result of this predicate.
+     *
+     * @return a new predicate who's result is always the opposite of this
+     * predicate.
+     */
+    public default BiPredicate<T, U> negate() {
+        return (T t, U u) -> !test(t, u);
+    }
+
+    /**
+     * Returns a predicate which evaluates to {@code true} if either this
+     * predicate or the provided predicate evaluates to {@code true}. If this
+     * predicate returns {@code true} then the remaining predicate is not
+     * evaluated.
+     *
+     * @param p a predicate which will be logically-ORed with this predicate.
+     * @return a new predicate which returns {@code true} if either predicate
+     * returns {@code true}.
+     */
+    public default BiPredicate<T, U> or(BiPredicate<? super T, ? super U> p) {
+        Objects.requireNonNull(p);
+        return (T t, U u) -> test(t, u) || p.test(t, u);
+    }
+
+    /**
+     * Returns a predicate that evaluates to {@code true} if both or neither of
+     * the component predicates evaluate to {@code true}.
+     *
+     * @param p a predicate which will be logically-XORed with this predicate.
+     * @return a predicate that evaluates to {@code true} if both or neither of
+     * the component predicates evaluate to {@code true}.
+     */
+    public default BiPredicate<T, U> xor(BiPredicate<? super T, ? super U> p) {
+        Objects.requireNonNull(p);
+        return (T t, U u) -> test(t, u) ^ p.test(t, u);
+    }
+}
diff --git a/jdk/src/share/classes/java/util/function/BinaryOperator.java b/jdk/src/share/classes/java/util/function/BinaryOperator.java
index 2e9050e59f2..5f1d5a41d83 100644
--- a/jdk/src/share/classes/java/util/function/BinaryOperator.java
+++ b/jdk/src/share/classes/java/util/function/BinaryOperator.java
@@ -25,24 +25,14 @@
 package java.util.function;
 
 /**
- * An operation upon two operands yielding a result. The operands and the result
- * are all of the same type.
+ * An operation upon two operands yielding a result. This is a specialization of
+ * {@code BiFunction} where the operands and the result are all of the same type.
  *
- * @param <T> the type of operands to {@code operate} and of the result
+ * @param <T> the type of operands to {@code apply} and of the result
  *
+ * @see BiFunction.
  * @since 1.8
  */
 @FunctionalInterface
-public interface BinaryOperator<T> {
-
-    /**
-     * Returns the result of the operation upon the operands.
-     * The operands are named {@code left} and {@code right} for operations
-     * where the order of operands matters.
-     *
-     * @param left the left operand
-     * @param right the right operand
-     * @return the result of the operation
-     */
-    public T operate(T left, T right);
+public interface BinaryOperator<T> extends BiFunction<T,T,T> {
 }
diff --git a/jdk/src/share/classes/java/util/function/BooleanSupplier.java b/jdk/src/share/classes/java/util/function/BooleanSupplier.java
new file mode 100644
index 00000000000..f145b621156
--- /dev/null
+++ b/jdk/src/share/classes/java/util/function/BooleanSupplier.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.util.function;
+
+
+/**
+ * A supplier of {@code boolean} values. This is the {@code boolean}-providing
+ * primitive specialization of {@link Supplier}.
+ *
+ * @see Supplier
+ * @since 1.8
+ */
+@FunctionalInterface
+public interface BooleanSupplier {
+
+    /**
+     * Returns a {@code boolean} value.
+     *
+     * @return a {@code boolean} value
+     */
+    public boolean getAsBoolean();
+}
diff --git a/jdk/src/share/classes/java/util/function/Block.java b/jdk/src/share/classes/java/util/function/Consumer.java
similarity index 84%
rename from jdk/src/share/classes/java/util/function/Block.java
rename to jdk/src/share/classes/java/util/function/Consumer.java
index c41e9a45a5a..e9cb175d59b 100644
--- a/jdk/src/share/classes/java/util/function/Block.java
+++ b/jdk/src/share/classes/java/util/function/Consumer.java
@@ -25,19 +25,19 @@
 package java.util.function;
 
 /**
- * An operation upon an input object. The operation may modify that object or
- * external state (other objects).
+ * An operation which accepts a single input argument and returns no result.
+ * Unlike most other functional interfaces, {@code Consumer} is expected to
+ * operate via side-effects.
  *
  * @param <T> The type of input objects to {@code accept}
  *
  * @since 1.8
  */
 @FunctionalInterface
-public interface Block<T> {
+public interface Consumer<T> {
 
     /**
-     * Use the input object in operations which may modify that object or
-     * external state (other objects).
+     * Accept an input value.
      *
      * @param t the input object
      */
diff --git a/jdk/src/share/classes/java/util/function/DoubleBinaryOperator.java b/jdk/src/share/classes/java/util/function/DoubleBinaryOperator.java
index f63403bb37e..de9855bd4d1 100644
--- a/jdk/src/share/classes/java/util/function/DoubleBinaryOperator.java
+++ b/jdk/src/share/classes/java/util/function/DoubleBinaryOperator.java
@@ -26,23 +26,22 @@ package java.util.function;
 
 /**
  * An operation on two {@code double} operands yielding a {@code double} result.
+ * This is the primitive type specialization of {@link BinaryOperator} for
+ * {@code double}.
  *
+ * @see BinaryOperator
  * @since 1.8
  */
 @FunctionalInterface
-public interface DoubleBinaryOperator /* extends BinaryOperator<Double> */ {
-//
-//    @Override
-//    public default Double operate(Double left, Double right) { return operateAsDouble((double) left, (double) right); }
-
+public interface DoubleBinaryOperator {
     /**
      * Returns the {@code double} result of the operation upon the
      * {@code double} operands. The parameters are named {@code left} and
      * {@code right} for operations where the order of parameters matters.
      *
      * @param left the left operand value
-     * @param right  the right operand value
+     * @param right the right operand value
      * @return the result of the operation
      */
-    public double operateAsDouble(double left, double right);
+    public double applyAsDouble(double left, double right);
 }
diff --git a/jdk/src/share/classes/java/util/function/DoubleBlock.java b/jdk/src/share/classes/java/util/function/DoubleConsumer.java
similarity index 75%
rename from jdk/src/share/classes/java/util/function/DoubleBlock.java
rename to jdk/src/share/classes/java/util/function/DoubleConsumer.java
index ae000841ae1..2ea35749737 100644
--- a/jdk/src/share/classes/java/util/function/DoubleBlock.java
+++ b/jdk/src/share/classes/java/util/function/DoubleConsumer.java
@@ -25,22 +25,21 @@
 package java.util.function;
 
 /**
- * An operation upon a {@code double} input value. The operation may modify
- * external state.
- *
- * <p/>This is the primitive type specialization of {@link Block} for
- * {@code double} and also may be used as a {@code Block<Double>}.
+ * An operation which accepts a single double argument and returns no result.
+ * This is the primitive type specialization of {@link Consumer} for
+ * {@code double}. Unlike most other functional interfaces,
+ * {@code DoubleConsumer} is expected to operate via side-effects.
  *
+ * @see Consumer
  * @since 1.8
  */
 @FunctionalInterface
-public interface DoubleBlock {
+public interface DoubleConsumer {
 
     /**
-     * Use the {@code double} input value in an operation which may modify
-     * external state.
+     * Accept an input value.
      *
-     * @param t the input value
+     * @param value the input value
      */
-    public void accept(double t);
+    public void accept(double value);
 }
diff --git a/jdk/src/share/classes/java/util/function/DoubleFunction.java b/jdk/src/share/classes/java/util/function/DoubleFunction.java
index d9c522c8e94..fcc6bb9dfde 100644
--- a/jdk/src/share/classes/java/util/function/DoubleFunction.java
+++ b/jdk/src/share/classes/java/util/function/DoubleFunction.java
@@ -25,22 +25,23 @@
 package java.util.function;
 
 /**
- * Apply a function to the input object yielding an appropriate {@code double}
- * value; this is the {@code double}-bearing specialization for {@link Function}.
+ * Apply a function to the double-valued input argument, yielding an appropriate
+ * result. This is the {@code double}-consuming primitive specialization for
+ * {@link Function}.
  *
- * @param <T> the type of input objects to the function
+ * @param <R> the type of output objects from the function
  *
+ * @see Function
  * @since 1.8
  */
 @FunctionalInterface
-public interface DoubleFunction<T> {
+public interface DoubleFunction<R> {
 
     /**
-     * Apply a function to the input object yielding an appropriate
-     * {@code double} value.
+     * Compute the result of applying the function to the input argument
      *
-     * @param t the input object
-     * @return the function result value
+     * @param value the input value
+     * @return the function result
      */
-    public double applyAsDouble(T t);
+    public R apply(double value);
 }
diff --git a/jdk/src/share/classes/java/util/function/DoublePredicate.java b/jdk/src/share/classes/java/util/function/DoublePredicate.java
new file mode 100644
index 00000000000..e132f9b74d2
--- /dev/null
+++ b/jdk/src/share/classes/java/util/function/DoublePredicate.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2010, 2013 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.util.function;
+
+import java.util.Objects;
+
+/**
+ * Determines if the {@code double} input value matches some criteria. This is
+ * the {@code double}-consuming primitive type specialization of
+ * {@link Predicate}.
+ *
+ * @see Predicate
+ * @since 1.8
+ */
+@FunctionalInterface
+public interface DoublePredicate {
+
+    /**
+     * Returns {@code true} if the input value matches some criteria.
+     *
+     * @param value the value to be tested.
+     * @return {@code true} if the input value matches some criteria, otherwise
+     * {@code false}.
+     */
+    public boolean test(double value);
+
+    /**
+     * Returns a predicate which evaluates to {@code true} only if this
+     * predicate and the provided predicate both evaluate to {@code true}. If
+     * this predicate returns {@code false} then the remaining predicate is not
+     * evaluated.
+     *
+     * @param p a predicate which will be logically-ANDed with this predicate.
+     * @return a new predicate which returns {@code true} only if both
+     * predicates return {@code true}.
+     */
+    public default DoublePredicate and(DoublePredicate p) {
+        Objects.requireNonNull(p);
+        return (value) -> test(value) && p.test(value);
+    }
+
+    /**
+     * Returns a predicate which negates the result of this predicate.
+     *
+     * @return a new predicate who's result is always the opposite of this
+     * predicate.
+     */
+    public default DoublePredicate negate() {
+        return (value) -> !test(value);
+    }
+
+    /**
+     * Returns a predicate which evaluates to {@code true} if either this
+     * predicate or the provided predicate evaluates to {@code true}. If this
+     * predicate returns {@code true} then the remaining predicate is not
+     * evaluated.
+     *
+     * @param p a predicate which will be logically-ANDed with this predicate.
+     * @return a new predicate which returns {@code true} if either predicate
+     * returns {@code true}.
+     */
+    public default DoublePredicate or(DoublePredicate p) {
+        Objects.requireNonNull(p);
+        return (value) -> test(value) || p.test(value);
+    }
+
+    /**
+     * Returns a predicate that evaluates to {@code true} if both or neither of
+     * the component predicates evaluate to {@code true}.
+     *
+     * @param p a predicate which will be logically-XORed with this predicate.
+     * @return a predicate that evaluates to {@code true} if all or none of the
+     * component predicates evaluate to {@code true}.
+     */
+    public default DoublePredicate xor(DoublePredicate p) {
+        Objects.requireNonNull(p);
+        return (value) -> test(value) ^ p.test(value);
+    }
+}
diff --git a/jdk/src/share/classes/java/util/function/DoubleSupplier.java b/jdk/src/share/classes/java/util/function/DoubleSupplier.java
index 19d75353045..9f9ab4e9f5a 100644
--- a/jdk/src/share/classes/java/util/function/DoubleSupplier.java
+++ b/jdk/src/share/classes/java/util/function/DoubleSupplier.java
@@ -25,11 +25,10 @@
 package java.util.function;
 
 /**
- * A supplier of {@code double} values.
- *
- * <p/>This is the primitive type specialization of {@link Supplier} for
- * {@code double} and also may be used as a {@code Supplier<Double>}.
+ * A supplier of {@code double} values. This is the {@code double}-providing
+ * primitive specialization of {@link Supplier}.
  *
+ * @see Supplier
  * @since 1.8
  */
 @FunctionalInterface
diff --git a/jdk/src/share/classes/java/util/function/DoubleUnaryOperator.java b/jdk/src/share/classes/java/util/function/DoubleUnaryOperator.java
index 3843f8bc7ee..e9be79f5bb9 100644
--- a/jdk/src/share/classes/java/util/function/DoubleUnaryOperator.java
+++ b/jdk/src/share/classes/java/util/function/DoubleUnaryOperator.java
@@ -25,9 +25,11 @@
 package java.util.function;
 
 /**
- * An operation on a single {@code double} operand yielding a {@code double}
- * result.
+ * An operation on a {@code double} operand yielding a {@code double}
+ * result. This is the primitive type specialization of {@link UnaryOperator}
+ * for {@code double}.
  *
+ * @see UnaryOperator
  * @since 1.8
  */
 @FunctionalInterface
@@ -40,5 +42,5 @@ public interface DoubleUnaryOperator {
      * @param operand the operand value
      * @return the operation result value
      */
-    public double operateAsDouble(double operand);
+    public double applyAsDouble(double operand);
 }
diff --git a/jdk/src/share/classes/java/util/function/Function.java b/jdk/src/share/classes/java/util/function/Function.java
index 82bae01701d..ff4b538c1a9 100644
--- a/jdk/src/share/classes/java/util/function/Function.java
+++ b/jdk/src/share/classes/java/util/function/Function.java
@@ -24,14 +24,14 @@
  */
 package java.util.function;
 
+
 /**
- * Apply a function to the input object yielding an appropriate result object. A
+ * Apply a function to the input argument, yielding an appropriate result.  A
  * function may variously provide a mapping between types, object instances or
  * keys and values or any other form of transformation upon the input.
  *
- * @param <T> the type of input objects to the {@code apply} operation
- * @param <R> the type of result objects from the {@code apply} operation. May
- * be the same type as {@code <T>}.
+ * @param <T> the type of the input to the {@code apply} operation.
+ * @param <R> the type of the result of the {@code apply} operation.
  *
  * @since 1.8
  */
@@ -39,7 +39,7 @@ package java.util.function;
 public interface Function<T, R> {
 
     /**
-     * Yield an appropriate result object for the input object.
+     * Compute the result of applying the function to the input argument
      *
      * @param t the input object
      * @return the function result
diff --git a/jdk/src/share/classes/java/util/function/IntBinaryOperator.java b/jdk/src/share/classes/java/util/function/IntBinaryOperator.java
index e25c2ba101f..f139118e3f1 100644
--- a/jdk/src/share/classes/java/util/function/IntBinaryOperator.java
+++ b/jdk/src/share/classes/java/util/function/IntBinaryOperator.java
@@ -26,7 +26,10 @@ package java.util.function;
 
 /**
  * An operation on two {@code int} operands yielding an {@code int} result.
+ * This is the primitive type specialization of {@link BinaryOperator} for
+ * {@code int}.
  *
+ * @see BinaryOperator
  * @since 1.8
  */
 @FunctionalInterface
@@ -41,5 +44,5 @@ public interface IntBinaryOperator {
      * @param right  the right operand value
      * @return the result of the operation
      */
-    public int operateAsInt(int left, int right);
+    public int applyAsInt(int left, int right);
 }
diff --git a/jdk/src/share/classes/java/util/function/IntBlock.java b/jdk/src/share/classes/java/util/function/IntConsumer.java
similarity index 75%
rename from jdk/src/share/classes/java/util/function/IntBlock.java
rename to jdk/src/share/classes/java/util/function/IntConsumer.java
index 33cdbe79f51..28a6ec46e2f 100644
--- a/jdk/src/share/classes/java/util/function/IntBlock.java
+++ b/jdk/src/share/classes/java/util/function/IntConsumer.java
@@ -25,22 +25,21 @@
 package java.util.function;
 
 /**
- * An operation upon an {@code int} input value. The operation may modify
- * external state.
- *
- * <p/>This is the primitive type specialization of {@link Block} for
- * {@code int} and also may be used as a {@code Block<Integer>}.
+ * An operation which accepts a single integer argument and returns no result.
+ * This is the primitive type specialization of {@link Consumer} for {@code int}.
+ * Unlike most other functional interfaces, {@code IntConsumer} is expected to
+ * operate via side-effects.
  *
+ * @see Consumer
  * @since 1.8
  */
 @FunctionalInterface
-public interface IntBlock {
+public interface IntConsumer {
 
     /**
-     * Use the {@code int} input value in an operation which may modify external
-     * state.
+     * Accept an input value.
      *
-     * @param t the input value
+     * @param value the input value
      */
-   public void accept(int t);
+    public void accept(int value);
 }
diff --git a/jdk/src/share/classes/java/util/function/IntFunction.java b/jdk/src/share/classes/java/util/function/IntFunction.java
index 6e1418533fe..b5faecc0ea7 100644
--- a/jdk/src/share/classes/java/util/function/IntFunction.java
+++ b/jdk/src/share/classes/java/util/function/IntFunction.java
@@ -25,22 +25,23 @@
 package java.util.function;
 
 /**
- * Apply a function to the input object yielding an appropriate {@code int}
- * value; this is the {@code int}-bearing specialization for {@link Function}.
+ * Apply a function to the integer-valued input argument, yielding an
+ * appropriate result. This is the {@code int}-consuming primitive
+ * specialization for {@link Function}.
  *
- * @param <T> the type of input objects to the function
+ * @param <R> the type of output objects from the function
  *
+ * @see Function
  * @since 1.8
  */
 @FunctionalInterface
-public interface IntFunction<T> {
+public interface IntFunction<R> {
 
     /**
-     * Apply a function to the input object yielding an appropriate {@code int}
-     * value.
+     * Compute the result of applying the function to the input argument
      *
-     * @param t the input object
-     * @return the function result value
+     * @param value the input value
+     * @return the function result
      */
-    public int applyAsInt(T t);
+    public R apply(int value);
 }
diff --git a/jdk/src/share/classes/java/util/function/IntPredicate.java b/jdk/src/share/classes/java/util/function/IntPredicate.java
new file mode 100644
index 00000000000..17cc49c754e
--- /dev/null
+++ b/jdk/src/share/classes/java/util/function/IntPredicate.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2010, 2013 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.util.function;
+
+import java.util.Objects;
+
+/**
+ * Determines if the {@code int} input value matches some criteria. This is the
+ * {@code int}-consuming primitive type specialization of {@link Predicate}.
+ *
+ * @see Predicate
+ * @since 1.8
+ */
+@FunctionalInterface
+public interface IntPredicate {
+
+    /**
+     * Returns {@code true} if the input value matches some criteria.
+     *
+     * @param value the value to be tested.
+     * @return {@code true} if the input value matches some criteria, otherwise
+     * {@code false}
+     */
+    public boolean test(int value);
+
+    /**
+     * Returns a predicate which evaluates to {@code true} only if this
+     * predicate and the provided predicate both evaluate to {@code true}. If
+     * this predicate returns {@code false} then the remaining predicate is not
+     * evaluated.
+     *
+     * @param p a predicate which will be logically-ANDed with this predicate.
+     * @return a new predicate which returns {@code true} only if both
+     * predicates return {@code true}.
+     */
+    public default IntPredicate and(IntPredicate p) {
+        Objects.requireNonNull(p);
+        return (value) -> test(value) && p.test(value);
+    }
+
+    /**
+     * Returns a predicate which negates the result of this predicate.
+     *
+     * @return a new predicate who's result is always the opposite of this
+     * predicate.
+     */
+    public default IntPredicate negate() {
+        return (value) -> !test(value);
+    }
+
+    /**
+     * Returns a predicate which evaluates to {@code true} if either this
+     * predicate or the provided predicate evaluates to {@code true}. If this
+     * predicate returns {@code true} then the remaining predicate is not
+     * evaluated.
+     *
+     * @param p a predicate which will be logically-ORed with this predicate.
+     * @return a new predicate which returns {@code true} if either predicate
+     * returns {@code true}.
+     */
+    public default IntPredicate or(IntPredicate p) {
+        Objects.requireNonNull(p);
+        return (value) -> test(value) || p.test(value);
+    }
+
+    /**
+     * Returns a predicate that evaluates to {@code true} if both or neither of
+     * the component predicates evaluate to {@code true}.
+     *
+     * @param p a predicate which will be logically-XORed with this predicate.
+     * @return a predicate that evaluates to {@code true} if both or neither of
+     * the component predicates evaluate to {@code true}
+     */
+    public default IntPredicate xor(IntPredicate p) {
+        Objects.requireNonNull(p);
+        return (value) -> test(value) ^ p.test(value);
+    }
+}
diff --git a/jdk/src/share/classes/java/util/function/IntSupplier.java b/jdk/src/share/classes/java/util/function/IntSupplier.java
index c73fc84e3be..d857b7882b4 100644
--- a/jdk/src/share/classes/java/util/function/IntSupplier.java
+++ b/jdk/src/share/classes/java/util/function/IntSupplier.java
@@ -25,11 +25,10 @@
 package java.util.function;
 
 /**
- * A supplier of {@code int} values.
- *
- * <p/>This is the primitive type specialization of {@link Supplier} for
- * {@code int} and also may be used as a {@code Supplier<Integer>}.
+ * A supplier of {@code int} values. This is the {@code int}-providing
+ * primitive specialization of {@link Supplier}.
  *
+ * @see Supplier
  * @since 1.8
  */
 @FunctionalInterface
diff --git a/jdk/src/share/classes/java/util/function/IntUnaryOperator.java b/jdk/src/share/classes/java/util/function/IntUnaryOperator.java
index 2c429951c28..a3b868dff54 100644
--- a/jdk/src/share/classes/java/util/function/IntUnaryOperator.java
+++ b/jdk/src/share/classes/java/util/function/IntUnaryOperator.java
@@ -26,18 +26,21 @@ package java.util.function;
 
 /**
  * An operation on a single {@code int} operand yielding an {@code int} result.
+ * This is the primitive type specialization of {@link UnaryOperator} for
+ * {@code int}.
  *
+ * @see UnaryOperator
  * @since 1.8
  */
 @FunctionalInterface
 public interface IntUnaryOperator {
 
     /**
-     * Returns the {@code int} result of the operation upon the {@code int}
-     * operand.
+     * Returns the {@code int} value result of the operation upon the
+     * {@code int}  operand.
      *
      * @param operand the operand value
      * @return the operation result value
      */
-    public int operateAsInt(int operand);
+    public int applyAsInt(int operand);
 }
diff --git a/jdk/src/share/classes/java/util/function/LongBinaryOperator.java b/jdk/src/share/classes/java/util/function/LongBinaryOperator.java
index f767c92a355..d08271d30b1 100644
--- a/jdk/src/share/classes/java/util/function/LongBinaryOperator.java
+++ b/jdk/src/share/classes/java/util/function/LongBinaryOperator.java
@@ -26,7 +26,10 @@ package java.util.function;
 
 /**
  * An operation on two {@code long} operands yielding a {@code long} result.
+ * This is the primitive type specialization of {@link BinaryOperator} for
+ * {@code long}.
  *
+ * @see BinaryOperator
  * @since 1.8
  */
 @FunctionalInterface
@@ -41,5 +44,5 @@ public interface LongBinaryOperator {
      * @param right  the right operand value
      * @return the result of the operation
      */
-    public long operateAsLong(long left, long right);
+    public long applyAsLong(long left, long right);
 }
diff --git a/jdk/src/share/classes/java/util/function/LongBlock.java b/jdk/src/share/classes/java/util/function/LongConsumer.java
similarity index 75%
rename from jdk/src/share/classes/java/util/function/LongBlock.java
rename to jdk/src/share/classes/java/util/function/LongConsumer.java
index 71606ecf9ed..072c0972a60 100644
--- a/jdk/src/share/classes/java/util/function/LongBlock.java
+++ b/jdk/src/share/classes/java/util/function/LongConsumer.java
@@ -25,22 +25,21 @@
 package java.util.function;
 
 /**
- * An operation upon a {@code long} input value. The operation may modify
- * external state.
- *
- * <p/>This is the primitive type specialization of {@link Block} for
- * {@code long} and also may be used as a {@code Block<Long>}.
+ * An operation which accepts a single long argument and returns no result.
+ * This is the {@code long}-consuming primitive type specialization of
+ * {@link Consumer}. Unlike most other functional interfaces, {@code LongConsumer}
+ * is expected to operate via side-effects.
  *
+ * @see Consumer
  * @since 1.8
  */
 @FunctionalInterface
-public interface LongBlock {
+public interface LongConsumer {
 
     /**
-     * Use the {@code long} input value in an operation which may modify
-     * external state.
+     * Accept an input value.
      *
-     * @param t the input value
+     * @param value the input value
      */
-    public void accept(long t);
+    public void accept(long value);
 }
diff --git a/jdk/src/share/classes/java/util/function/LongFunction.java b/jdk/src/share/classes/java/util/function/LongFunction.java
index 61c4fbf6475..924eb43be17 100644
--- a/jdk/src/share/classes/java/util/function/LongFunction.java
+++ b/jdk/src/share/classes/java/util/function/LongFunction.java
@@ -25,22 +25,23 @@
 package java.util.function;
 
 /**
- * Apply a function to the input object yielding an appropriate {@code long}
- * value; this is the {@code long}-bearing specialization for {@link Function}.
+ * Apply a function to the long-valued input argument, yielding an appropriate
+ * result. This is the {@code long}-consuming primitive specialization for
+ * {@link Function}.
  *
- * @param <T> the type of input objects to the function
+ * @param <R> the type of output objects from the function
  *
+ * @see Function
  * @since 1.8
  */
 @FunctionalInterface
-public interface LongFunction<T> {
+public interface LongFunction<R> {
 
     /**
-     * Apply a function to the input object yielding an appropriate {@code long}
-     * value.
+     * Compute the result of applying the function to the input argument
      *
-     * @param t the input object
-     * @return the function result value
+     * @param value the input value
+     * @return the function result
      */
-    public long applyAsLong(T t);
+    public R apply(long value);
 }
diff --git a/jdk/src/share/classes/java/util/function/LongPredicate.java b/jdk/src/share/classes/java/util/function/LongPredicate.java
new file mode 100644
index 00000000000..ca542a41246
--- /dev/null
+++ b/jdk/src/share/classes/java/util/function/LongPredicate.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2010, 2013 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.util.function;
+
+import java.util.Objects;
+
+/**
+ * Determines if the {@code long} input value matches some criteria. This is the
+ * {@code long}-consuming primitive type specialization of {@link Predicate}.
+ *
+ * @see Predicate
+ * @since 1.8
+ */
+@FunctionalInterface
+public interface LongPredicate {
+
+    /**
+     * Returns {@code true} if the input value matches some criteria.
+     *
+     * @param value the value to be tested.
+     * @return {@code true} if the input value matches some criteria, otherwise
+     * {@code false}.
+     */
+    public boolean test(long value);
+
+    /**
+     * Returns a predicate which evaluates to {@code true} only if this
+     * predicate and the provided predicate both evaluate to {@code true}. If
+     * this predicate returns {@code false} then the remaining predicate is not
+     * evaluated.
+     *
+     * @param p a predicate which will be logically-ANDed with this predicate.
+     * @return a new predicate which returns {@code true} only if both
+     * predicates return {@code true}.
+     */
+    public default LongPredicate and(LongPredicate p) {
+        Objects.requireNonNull(p);
+        return (value) -> test(value) && p.test(value);
+    }
+
+    /**
+     * Returns a predicate which negates the result of this predicate.
+     *
+     * @return a new predicate who's result is always the opposite of this
+     * predicate.
+     */
+    public default LongPredicate negate() {
+        return (value) -> !test(value);
+    }
+
+    /**
+     * Returns a predicate which evaluates to {@code true} if either this
+     * predicate or the provided predicate evaluates to {@code true}. If this
+     * predicate returns {@code true} then the remaining predicate is not
+     * evaluated.
+     *
+     * @param p a predicate which will be logically-ORed with this predicate.
+     * @return a new predicate which returns {@code true} if either predicate
+     * returns {@code true}.
+     */
+    public default LongPredicate or(LongPredicate p) {
+        Objects.requireNonNull(p);
+        return (value) -> test(value) || p.test(value);
+    }
+
+    /**
+     * Returns a predicate that evaluates to {@code true} if both or neither of
+     * the component predicates evaluate to {@code true}.
+     *
+     * @param p a predicate which will be logically-XORed with this predicate.
+     * @return a predicate that evaluates to {@code true} if both or neither of
+     * the component predicates evaluate to {@code true}.
+     */
+    public default LongPredicate xor(LongPredicate p) {
+        Objects.requireNonNull(p);
+        return (value) -> test(value) ^ p.test(value);
+    }
+}
diff --git a/jdk/src/share/classes/java/util/function/LongSupplier.java b/jdk/src/share/classes/java/util/function/LongSupplier.java
index f56ad7df282..2d5a3def105 100644
--- a/jdk/src/share/classes/java/util/function/LongSupplier.java
+++ b/jdk/src/share/classes/java/util/function/LongSupplier.java
@@ -25,11 +25,10 @@
 package java.util.function;
 
 /**
- * A supplier of {@code long} values.
- *
- * <p/>This is the primitive type specialization of {@link Supplier} for
- * {@code long} and also may be used as a {@code Supplier<Long>}.
+ * A supplier of {@code long} values. This is the {@code long}-providing
+ * primitive specialization of {@link Supplier}.
  *
+ * @see Supplier
  * @since 1.8
  */
 @FunctionalInterface
@@ -38,7 +37,7 @@ public interface LongSupplier {
     /**
      * Returns a {@code long} value.
      *
-     * @return a {@code long} value.
+     * @return a {@code long} value
      */
     public long getAsLong();
 }
diff --git a/jdk/src/share/classes/java/util/function/LongUnaryOperator.java b/jdk/src/share/classes/java/util/function/LongUnaryOperator.java
index f27ddf5a81a..3632e2a118a 100644
--- a/jdk/src/share/classes/java/util/function/LongUnaryOperator.java
+++ b/jdk/src/share/classes/java/util/function/LongUnaryOperator.java
@@ -26,7 +26,10 @@ package java.util.function;
 
 /**
  * An operation on a single {@code long} operand yielding a {@code long} result.
+ * This is the primitive type specialization of {@link UnaryOperator} for
+ * {@code long}.
  *
+ * @see UnaryOperator
  * @since 1.8
  */
 @FunctionalInterface
@@ -39,5 +42,5 @@ public interface LongUnaryOperator {
      * @param operand the operand value
      * @return the operation result value
      */
-    public long operateAsLong(long operand);
+    public long applyAsLong(long operand);
 }
diff --git a/jdk/src/share/classes/java/util/function/ObjDoubleConsumer.java b/jdk/src/share/classes/java/util/function/ObjDoubleConsumer.java
new file mode 100644
index 00000000000..24e4c29327c
--- /dev/null
+++ b/jdk/src/share/classes/java/util/function/ObjDoubleConsumer.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.util.function;
+
+/**
+ * An operation which accepts an object reference and a double, and returns no
+ * result. This is the {@code (reference, double)} specialization of
+ * {@link BiConsumer}. Unlike most other functional interfaces,
+ * {@code ObjDoubleConsumer} is expected to operate via side-effects.
+ *
+ * @param <T> Type of reference argument to {@code accept()}.
+ *
+ * @see BiConsumer
+ * @since 1.8
+ */
+@FunctionalInterface
+public interface ObjDoubleConsumer<T> {
+
+    /**
+     * Accept a set of input values.
+     *
+     * @param t an input object
+     * @param value an input value
+     */
+    public void accept(T t, double value);
+}
diff --git a/jdk/src/share/classes/java/util/function/ObjIntConsumer.java b/jdk/src/share/classes/java/util/function/ObjIntConsumer.java
new file mode 100644
index 00000000000..fa63af5cff6
--- /dev/null
+++ b/jdk/src/share/classes/java/util/function/ObjIntConsumer.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2012, 2013 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.util.function;
+
+/**
+ * An operation which accepts an object reference and an int, and returns no
+ * result. This is the {@code (reference, int)} specialization of
+ * {@link BiConsumer}. Unlike most other functional interfaces,
+ * {@code ObjIntConsumer} is expected to operate via side-effects.
+ *
+ * @param <T> Type of reference argument to {@code accept()}.
+ *
+ * @see BiConsumer
+ * @since 1.8
+ */
+@FunctionalInterface
+public interface ObjIntConsumer<T> {
+
+    /**
+     * Accept a set of input values.
+     *
+     * @param t an input object
+     * @param value an input value
+     */
+    public void accept(T t, int value);
+}
diff --git a/jdk/src/share/classes/java/util/function/ObjLongConsumer.java b/jdk/src/share/classes/java/util/function/ObjLongConsumer.java
new file mode 100644
index 00000000000..c2f19fba741
--- /dev/null
+++ b/jdk/src/share/classes/java/util/function/ObjLongConsumer.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.util.function;
+
+/**
+ * An operation which accepts an object reference and a long, and returns no
+ * result. This is the {@code (reference, long)} specialization of
+ * {@link BiConsumer}. Unlike most other functional interfaces,
+ * {@code ObjLongConsumer} is expected to operate via side-effects.
+ *
+ * @param <T> Type of reference argument to {@code accept()}.
+ *
+ * @see BiConsumer
+ * @since 1.8
+ */
+@FunctionalInterface
+public interface ObjLongConsumer<T> {
+
+    /**
+     * Accept a set of input values.
+     *
+     * @param t an input object
+     * @param value an input value
+     */
+    public void accept(T t, long value);
+}
diff --git a/jdk/src/share/classes/java/util/function/Predicate.java b/jdk/src/share/classes/java/util/function/Predicate.java
index 9b440787485..627771e26af 100644
--- a/jdk/src/share/classes/java/util/function/Predicate.java
+++ b/jdk/src/share/classes/java/util/function/Predicate.java
@@ -24,10 +24,12 @@
  */
 package java.util.function;
 
+import java.util.Objects;
+
 /**
  * Determines if the input object matches some criteria.
  *
- * @param <T> the type of input objects to {@code test}
+ * @param <T> the type of argument to {@code test}
  *
  * @since 1.8
  */
@@ -42,4 +44,57 @@ public interface Predicate<T> {
      * {@code false}
      */
     public boolean test(T t);
+
+    /**
+     * Returns a predicate which evaluates to {@code true} only if this
+     * predicate and the provided predicate both evaluate to {@code true}. If
+     * this predicate returns {@code false} then the remaining predicate is not
+     * evaluated.
+     *
+     * @param p a predicate which will be logically-ANDed with this predicate.
+     * @return a new predicate which returns {@code true} only if both
+     * predicates return {@code true}.
+     */
+    public default Predicate<T> and(Predicate<? super T> p) {
+        Objects.requireNonNull(p);
+        return (t) -> test(t) && p.test(t);
+    }
+
+    /**
+     * Returns a predicate which negates the result of this predicate.
+     *
+     * @return a new predicate who's result is always the opposite of this
+     * predicate.
+     */
+    public default Predicate<T> negate() {
+        return (t) -> !test(t);
+    }
+
+    /**
+     * Returns a predicate which evaluates to {@code true} if either this
+     * predicate or the provided predicate evaluates to {@code true}. If this
+     * predicate returns {@code true} then the remaining predicate is not
+     * evaluated.
+     *
+     * @param p a predicate which will be logically-ORed with this predicate.
+     * @return a new predicate which returns {@code true} if either predicate
+     * returns {@code true}.
+     */
+    public default Predicate<T> or(Predicate<? super T> p) {
+        Objects.requireNonNull(p);
+        return (t) -> test(t) || p.test(t);
+    }
+
+    /**
+     * Returns a predicate that evaluates to {@code true} if both or neither of
+     * the component predicates evaluate to {@code true}.
+     *
+     * @param p a predicate which will be logically-XORed with this predicte.
+     * @return a predicate that evaluates to {@code true} if both or neither of
+     * the component predicates evaluate to {@code true}.
+     */
+    public default Predicate<T> xor(Predicate<? super T> p) {
+        Objects.requireNonNull(p);
+        return (t) -> test(t) ^ p.test(t);
+    }
 }
diff --git a/jdk/src/share/classes/java/util/function/ToDoubleBiFunction.java b/jdk/src/share/classes/java/util/function/ToDoubleBiFunction.java
new file mode 100644
index 00000000000..df299aa58d7
--- /dev/null
+++ b/jdk/src/share/classes/java/util/function/ToDoubleBiFunction.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2012, 2013 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.util.function;
+
+/**
+ * Apply a function to the input arguments, yielding an appropriate result.
+ * This is the {@code double}-bearing specialization for {@link BiFunction}.
+ *
+ * @param <T> the type of the first argument to the {@code applyAsDouble}
+ * operation.
+ * @param <U> the type of the second argument to the {@code applyAsDouble}
+ * operation.
+ *
+ * @see BiFunction.
+ * @since 1.8
+ */
+@FunctionalInterface
+public interface ToDoubleBiFunction<T, U> {
+
+    /**
+     * Compute the result of applying the function to the input arguments
+     *
+     * @param t an input object
+     * @param u an input object
+     * @return the function result value
+     */
+    public double applyAsDouble(T t, U u);
+}
diff --git a/jdk/src/share/classes/java/util/function/ToDoubleFunction.java b/jdk/src/share/classes/java/util/function/ToDoubleFunction.java
new file mode 100644
index 00000000000..87f19fce41e
--- /dev/null
+++ b/jdk/src/share/classes/java/util/function/ToDoubleFunction.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.util.function;
+
+/**
+ * Apply a function to the input argument, yielding an appropriate result.
+ * This is the {@code double}-bearing specialization for {@link Function}.
+ *
+ * @param <T> the type of input objects to the function
+ *
+ * @see Function
+ * @since 1.8
+ */
+@FunctionalInterface
+public interface ToDoubleFunction<T> {
+
+    /**
+     * Compute the result of applying the function to the input argument
+     *
+     * @param t the input object
+     * @return the function result value
+     */
+    public double applyAsDouble(T t);
+}
diff --git a/jdk/src/share/classes/java/util/function/ToIntBiFunction.java b/jdk/src/share/classes/java/util/function/ToIntBiFunction.java
new file mode 100644
index 00000000000..d7c727fa31c
--- /dev/null
+++ b/jdk/src/share/classes/java/util/function/ToIntBiFunction.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.util.function;
+
+/**
+ * Apply a function to the input arguments, yielding an appropriate result.
+ * This is the {@code int}-bearing specialization for {@link BiFunction}.
+ *
+ * @param <T> the type of the first argument to the {@code applyAsLong}
+ * operation.
+ * @param <U> the type of the second argument to the {@code applyAsLong}
+ * operation.
+ *
+ * @see BiFunction
+ * @since 1.8
+ */
+@FunctionalInterface
+public interface ToIntBiFunction<T, U> {
+
+    /**
+     * Compute the result of applying the function to the input arguments
+     *
+     * @param t an input object
+     * @param u an input object
+     * @return the function result value
+     */
+    public int applyAsInt(T t, U u);
+}
diff --git a/jdk/src/share/classes/java/util/function/ToIntFunction.java b/jdk/src/share/classes/java/util/function/ToIntFunction.java
new file mode 100644
index 00000000000..848a7b4486c
--- /dev/null
+++ b/jdk/src/share/classes/java/util/function/ToIntFunction.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.util.function;
+
+/**
+ * Apply a function to the input argument, yielding an appropriate result.
+ * This is the {@code int}-bearing specialization for {@link Function}.
+ *
+ * @param <T> the type of input objects to the function
+ *
+ * @see Function
+ * @since 1.8
+ */
+@FunctionalInterface
+public interface ToIntFunction<T> {
+
+    /**
+     * Compute the result of applying the function to the input arguments
+     *
+     * @param t the input object
+     * @return the function result value
+     */
+    public int applyAsInt(T t);
+}
diff --git a/jdk/src/share/classes/java/util/function/ToLongBiFunction.java b/jdk/src/share/classes/java/util/function/ToLongBiFunction.java
new file mode 100644
index 00000000000..994fa49a536
--- /dev/null
+++ b/jdk/src/share/classes/java/util/function/ToLongBiFunction.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.util.function;
+
+/**
+ * Apply a function to the input arguments, yielding an appropriate result.
+ * This is the {@code long}-bearing specialization for {@link BiFunction}.
+ *
+ * @param <T> the type of the first argument to the {@code applyAsLong}
+ * operation.
+ * @param <U> the type of the second argument to the {@code applyAsLong}
+ * operation.
+ *
+ * @see BiFunction
+ * @since 1.8
+ */
+@FunctionalInterface
+public interface ToLongBiFunction<T, U> {
+
+    /**
+     * Compute the result of applying the function to the input arguments.
+     *
+     * @param t an input object
+     * @param u an input object
+     * @return the function result value
+     */
+    public long applyAsLong(T t, U u);
+}
diff --git a/jdk/src/share/classes/java/util/function/ToLongFunction.java b/jdk/src/share/classes/java/util/function/ToLongFunction.java
new file mode 100644
index 00000000000..6d5877b6814
--- /dev/null
+++ b/jdk/src/share/classes/java/util/function/ToLongFunction.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.util.function;
+
+/**
+ * Apply a function to the input argument, yielding an appropriate result.
+ * This is the {@code long}-bearing specialization for {@link Function}.
+ *
+ * @param <T> the type of input objects to the function
+ *
+ * @see Function
+ * @since 1.8
+ */
+@FunctionalInterface
+public interface ToLongFunction<T> {
+
+    /**
+     * Compute the result of applying the function to the input arguments.
+     *
+     * @param t the input object
+     * @return the function result value
+     */
+    public long applyAsLong(T t);
+}
diff --git a/jdk/src/share/classes/java/util/function/UnaryOperator.java b/jdk/src/share/classes/java/util/function/UnaryOperator.java
index a8aaa0dcd6b..8e92291887e 100644
--- a/jdk/src/share/classes/java/util/function/UnaryOperator.java
+++ b/jdk/src/share/classes/java/util/function/UnaryOperator.java
@@ -26,20 +26,14 @@ package java.util.function;
 
 /**
  * An operation upon a single operand yielding a result. The operand and the
- * result are of the same type.
+ * result are of the same type. This is a specialization of {@code Function} for
+ * the case where the operand and result are of the same type.
  *
- * @param <T> the type of operand to {@code operate} and of the result
+ * @param <T> the type of operand to {@code apply} and of the result
  *
+ * @see Function
  * @since 1.8
  */
 @FunctionalInterface
-public interface UnaryOperator<T> {
-
-    /**
-     * Returns the result of the operation upon the operand.
-     *
-     * @param operand the operand
-     * @return the operation result
-     */
-    public T operate(T operand);
+public interface UnaryOperator<T> extends Function<T, T> {
 }
diff --git a/jdk/src/share/classes/java/util/function/package-info.java b/jdk/src/share/classes/java/util/function/package-info.java
index 0d1eecf5139..36eda330d19 100644
--- a/jdk/src/share/classes/java/util/function/package-info.java
+++ b/jdk/src/share/classes/java/util/function/package-info.java
@@ -22,27 +22,62 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 /**
- * <em>Functional interfaces</em> provide typing for lambda expressions. Each
- * functional interface provides a single abstract method to which the lambda
- * expression's parameter and return types are matched.
+ * <em>Functional interfaces</em> provide target types for lambda expressions
+ * and method references.  Each functional interface has a single abstract method
+ * to which the lambda expression's parameter and return types are matched or
+ * adapted.  Functional interfaces can provide a target type in multiple contexts,
+ * such as assignment context, method invocation, or cast context:
  *
- * <p>The interfaces in this package are all functional interfaces used with the
- * collections and streams frameworks. The operation identified by each
- * interface is generally applied to a collection or stream of objects.
+ * <pre>
+ *     Predicate&lt;String> p = String::isEmpty;
+ *
+ *     stream.filter(e -> e.getSize() > 10)...
+ *
+ *     stream.map((ToIntFunction) e -> e.getSize())...
+ * </pre>
+ *
+ * <p>The interfaces in this package are functional interfaces used by the JDK,
+ * and are available to be used by user code as well.  While they do not identify
+ * a complete set of function shapes to which lambda expressions might be adapted,
+ * they provide enough to cover common requirements.
+ *
+ * <p>The interfaces in this package are annotated with @{link FunctionalInterface}.
+ * This annotation is not a requirement for the compiler to recognize an interface
+ * as a functional interface, but merely an aid to capture design intent and enlist the
+ * help of the compiler in identifying accidental violations of design intent.
+ *
+ * <p>The functional interfaces in this package follow an extensible naming convention,
+ * as follows:
  *
- * <p>All functional interface implementations are expected to ensure that:
  * <ul>
- * <li>When used for aggregate operations upon many elements it should not be
- * assumed that the operation will be called upon elements in any specific order.
- * </li>
- * <li>{@code null} values are accepted and returned by these functional
- * interfaces according to the constraints of the specification in which the
- * functional interfaces are used. The functional interfaces themselves do not
- * constrain or mandate use of {@code null} values. Most usages of the
- * functional interfaces will define the role, if any, of {@code null} for that
- * context.
- * </li>
+ *     <li>There are several basic function shapes, including {@link java.util.function.Function} ({@code T -> R}),
+ *     {@link java.util.function.Consumer} ({@code T -> void}),
+ *     {@link java.util.function.Predicate} ({@code T -> boolean}),
+ *     and {@link java.util.function.Supplier} ({@code () -> T}).
+ *     </li>
+ *     <li>Function shapes have a natural arity based on how they are most commonly used.
+ *     The basic shapes can be modified by an arity prefix to indicate a different arity,
+ *     such as {@link java.util.function.BiFunction} ({@code (T, U) -> R}).
+ *     </li>
+ *     <li>There are additional derived function shapes which extend the basic function
+ *     shapes, including {@link java.util.function.UnaryOperator} (extends {@code Function}) and
+ *     {@link java.util.function.BinaryOperator} (extends {@code BiFunction}).
+ *     </li>
+ *     <li>Type parameters of functional interfaces can be specialized to primitives with
+ *     additional type prefixes.  To specialize the return type for a type that has both
+ *     generic return type and generic arguments, we prefix {@code ToXxx}, as in
+ *     {@link java.util.function.ToIntFunction}.  Otherwise, type arguments are specialized left-to-right,
+ *     as in {@link java.util.function.DoubleConsumer} or {@link java.util.function.ObjIntConsumer}.
+ *     (The type prefix {@code Obj} is used to indicate that we don't want to specialize this parameter,
+ *     but want to move on to the next parameter.)  These schemes can be combined as in {@code IntToDoubleFunction}.
+ *     </li>
+ *     <li>If there are specialization prefixes for all arguments, the arity prefix may be left
+ *     out (as in {@link java.util.function.ObjIntConsumer}).
+ *     </li>
  * </ul>
+ *
+ * @see java.lang.FunctionalInterface
  */
 package java.util.function;
diff --git a/jdk/test/java/lang/PrimitiveSumMinMaxTest.java b/jdk/test/java/lang/PrimitiveSumMinMaxTest.java
index 1c44109c83f..56ab6740a83 100644
--- a/jdk/test/java/lang/PrimitiveSumMinMaxTest.java
+++ b/jdk/test/java/lang/PrimitiveSumMinMaxTest.java
@@ -50,20 +50,20 @@ public class PrimitiveSumMinMaxTest {
         BinaryOperator<Boolean> xor = Boolean::logicalXor;
         Comparator<Boolean> cmp = Boolean::compare;
 
-        assertTrue(and.operate(true, true));
-        assertFalse(and.operate(true, false));
-        assertFalse(and.operate(false, true));
-        assertFalse(and.operate(false, false));
+        assertTrue(and.apply(true, true));
+        assertFalse(and.apply(true, false));
+        assertFalse(and.apply(false, true));
+        assertFalse(and.apply(false, false));
 
-        assertTrue(or.operate(true, true));
-        assertTrue(or.operate(true, false));
-        assertTrue(or.operate(false, true));
-        assertFalse(or.operate(false, false));
+        assertTrue(or.apply(true, true));
+        assertTrue(or.apply(true, false));
+        assertTrue(or.apply(false, true));
+        assertFalse(or.apply(false, false));
 
-        assertFalse(xor.operate(true, true));
-        assertTrue(xor.operate(true, false));
-        assertTrue(xor.operate(false, true));
-        assertFalse(xor.operate(false, false));
+        assertFalse(xor.apply(true, true));
+        assertTrue(xor.apply(true, false));
+        assertTrue(xor.apply(false, true));
+        assertFalse(xor.apply(false, false));
 
         assertEquals(Boolean.TRUE.compareTo(Boolean.TRUE), cmp.compare(true, true));
         assertEquals(Boolean.TRUE.compareTo(Boolean.FALSE), cmp.compare(true, false));
@@ -83,12 +83,12 @@ public class PrimitiveSumMinMaxTest {
         int[] numbers = { -1, 0, 1, 100, Integer.MAX_VALUE, Integer.MIN_VALUE };
         for (int i : numbers) {
             for (int j : numbers) {
-                assertEquals(i+j, (int) sum1.operate(i, j));
-                assertEquals(i+j, sum2.operateAsInt(i, j));
-                assertEquals(Math.max(i,j), (int) max1.operate(i, j));
-                assertEquals(Math.max(i,j), max2.operateAsInt(i, j));
-                assertEquals(Math.min(i,j), (int) min1.operate(i, j));
-                assertEquals(Math.min(i,j), min2.operateAsInt(i, j));
+                assertEquals(i+j, (int) sum1.apply(i, j));
+                assertEquals(i+j, sum2.applyAsInt(i, j));
+                assertEquals(Math.max(i,j), (int) max1.apply(i, j));
+                assertEquals(Math.max(i,j), max2.applyAsInt(i, j));
+                assertEquals(Math.min(i,j), (int) min1.apply(i, j));
+                assertEquals(Math.min(i,j), min2.applyAsInt(i, j));
                 assertEquals(((Integer) i).compareTo(j), cmp.compare(i, j));
             }
         }
@@ -106,12 +106,12 @@ public class PrimitiveSumMinMaxTest {
         long[] numbers = { -1, 0, 1, 100, Long.MAX_VALUE, Long.MIN_VALUE };
         for (long i : numbers) {
             for (long j : numbers) {
-                assertEquals(i+j, (long) sum1.operate(i, j));
-                assertEquals(i+j, sum2.operateAsLong(i, j));
-                assertEquals(Math.max(i,j), (long) max1.operate(i, j));
-                assertEquals(Math.max(i,j), max2.operateAsLong(i, j));
-                assertEquals(Math.min(i,j), (long) min1.operate(i, j));
-                assertEquals(Math.min(i,j), min2.operateAsLong(i, j));
+                assertEquals(i+j, (long) sum1.apply(i, j));
+                assertEquals(i+j, sum2.applyAsLong(i, j));
+                assertEquals(Math.max(i,j), (long) max1.apply(i, j));
+                assertEquals(Math.max(i,j), max2.applyAsLong(i, j));
+                assertEquals(Math.min(i,j), (long) min1.apply(i, j));
+                assertEquals(Math.min(i,j), min2.applyAsLong(i, j));
                 assertEquals(((Long) i).compareTo(j), cmp.compare(i, j));
             }
         }
@@ -126,9 +126,9 @@ public class PrimitiveSumMinMaxTest {
         float[] numbers = { -1, 0, 1, 100, Float.MAX_VALUE, Float.MIN_VALUE };
         for (float i : numbers) {
             for (float j : numbers) {
-                assertEquals(i+j, (float) sum1.operate(i, j));
-                assertEquals(Math.max(i,j), (float) max1.operate(i, j));
-                assertEquals(Math.min(i,j), (float) min1.operate(i, j));
+                assertEquals(i+j, (float) sum1.apply(i, j));
+                assertEquals(Math.max(i,j), (float) max1.apply(i, j));
+                assertEquals(Math.min(i,j), (float) min1.apply(i, j));
                 assertEquals(((Float) i).compareTo(j), cmp.compare(i, j));
             }
         }
@@ -146,12 +146,12 @@ public class PrimitiveSumMinMaxTest {
         double[] numbers = { -1, 0, 1, 100, Double.MAX_VALUE, Double.MIN_VALUE };
         for (double i : numbers) {
             for (double j : numbers) {
-                assertEquals(i+j, (double) sum1.operate(i, j));
-                assertEquals(i+j, sum2.operateAsDouble(i, j));
-                assertEquals(Math.max(i,j), (double) max1.operate(i, j));
-                assertEquals(Math.max(i,j), max2.operateAsDouble(i, j));
-                assertEquals(Math.min(i,j), (double) min1.operate(i, j));
-                assertEquals(Math.min(i,j), min2.operateAsDouble(i, j));
+                assertEquals(i+j, (double) sum1.apply(i, j));
+                assertEquals(i+j, sum2.applyAsDouble(i, j));
+                assertEquals(Math.max(i,j), (double) max1.apply(i, j));
+                assertEquals(Math.max(i,j), max2.applyAsDouble(i, j));
+                assertEquals(Math.min(i,j), (double) min1.apply(i, j));
+                assertEquals(Math.min(i,j), min2.applyAsDouble(i, j));
                 assertEquals(((Double) i).compareTo(j), cmp.compare(i, j));
             }
         }

From ab4a830be8e7d3fe905afab852fe686764866aed Mon Sep 17 00:00:00 2001
From: John Zavgren <jzavgren@openjdk.org>
Date: Tue, 19 Feb 2013 15:31:19 -0500
Subject: [PATCH 134/311] 8008107: [parfait] Use after free of pointer in
 jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c

Reviewed-by: mullan, chegar
---
 jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c b/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c
index bd0eab3c113..7ec69fda633 100644
--- a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c
+++ b/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c
@@ -687,8 +687,8 @@ CK_SSL3_KEY_MAT_PARAMS jSsl3KeyMatParamToCKSsl3KeyMatParam(JNIEnv *env, jobject
     if ((*env)->ExceptionCheck(env)) {
         free(ckParam.RandomInfo.pClientRandom);
         free(ckParam.RandomInfo.pServerRandom);
-        free(ckParam.pReturnedKeyMaterial);
         free(ckParam.pReturnedKeyMaterial->pIVClient);
+        free(ckParam.pReturnedKeyMaterial);
         return ckParam;
     }
 

From 2373a6318843669afbbd118567a42aeff69fb49f Mon Sep 17 00:00:00 2001
From: Kumar Srinivasan <ksrini@openjdk.org>
Date: Tue, 19 Feb 2013 16:49:28 -0800
Subject: [PATCH 135/311] 8008262: pack200 should support MethodParameters -
 part 2

Reviewed-by: jrose
---
 .../com/sun/java/util/jar/pack/Attribute.java |  2 +-
 .../sun/java/util/jar/pack/BandStructure.java |  6 ++---
 .../sun/java/util/jar/pack/PackageReader.java |  2 +-
 .../com/sun/java/util/jar/pack/bands.cpp      |  2 +-
 .../native/com/sun/java/util/jar/pack/bands.h |  4 ++--
 .../com/sun/java/util/jar/pack/unpack.cpp     |  4 ++--
 jdk/test/tools/pack200/AttributeTests.java    | 22 +++++++++---------
 jdk/test/tools/pack200/Utils.java             | 23 ++++++++++++++++++-
 8 files changed, 43 insertions(+), 22 deletions(-)

diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java b/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java
index f6ff030263e..a6033c97b14 100644
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java
@@ -177,7 +177,7 @@ class Attribute implements Comparable<Attribute> {
         define(sd, ATTR_CONTEXT_METHOD, "Synthetic", "");
         define(sd, ATTR_CONTEXT_METHOD, "Deprecated", "");
         define(sd, ATTR_CONTEXT_METHOD, "Exceptions", "NH[RCH]");
-        define(sd, ATTR_CONTEXT_METHOD, "MethodParameters", "NB[RUNHI]");
+        define(sd, ATTR_CONTEXT_METHOD, "MethodParameters", "NB[RUNHFH]");
         //define(sd, ATTR_CONTEXT_METHOD, "Code", "HHNI[B]NH[PHPOHPOHRCNH]NH[RUHNI[B]]");
 
         define(sd, ATTR_CONTEXT_CODE, "StackMapTable",
diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java b/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java
index fdfb87dc136..1a1ecef9055 100644
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java
@@ -1505,7 +1505,7 @@ class BandStructure {
     // band for predefine method parameters
     IntBand  method_MethodParameters_NB = method_attr_bands.newIntBand("method_MethodParameters_NB", BYTE1);
     CPRefBand method_MethodParameters_name_RUN = method_attr_bands.newCPRefBand("method_MethodParameters_name_RUN", UNSIGNED5, CONSTANT_Utf8, NULL_IS_OK);
-    IntBand   method_MethodParameters_flag_I = method_attr_bands.newIntBand("method_MethodParameters_flag_I");
+    IntBand   method_MethodParameters_flag_FH = method_attr_bands.newIntBand("method_MethodParameters_flag_FH");
 
     MultiBand class_attr_bands = class_bands.newMultiBand("(class_attr_bands)", UNSIGNED5);
     IntBand class_flags_hi = class_attr_bands.newIntBand("class_flags_hi");
@@ -1776,9 +1776,9 @@ class BandStructure {
                            new Band[]{
                                 method_MethodParameters_NB,
                                 method_MethodParameters_name_RUN,
-                                method_MethodParameters_flag_I
+                                method_MethodParameters_flag_FH
                            },
-                           "MethodParameters", "NB[RUNHI]");
+                           "MethodParameters", "NB[RUNHFH]");
         assert(attrCodeEmpty == Package.attrCodeEmpty);
         predefineAttribute(X_ATTR_Signature, ATTR_CONTEXT_METHOD,
                            new Band[] { method_Signature_RS },
diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java b/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java
index 319b8793347..df4687b4aff 100644
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java
@@ -1521,7 +1521,7 @@ class PackageReader extends BandStructure {
         //        *method_Exceptions_RC :UNSIGNED5  (cp_Class)
         //        *method_MethodParameters_NB: BYTE1
         //        *method_MethodParameters_RUN: UNSIGNED5 (cp_Utf8)
-        //        *method_MethodParameters_I:  UNSIGNED5 (flag)
+        //        *method_MethodParameters_FH:  UNSIGNED5 (flag)
         //
         //  code_attr_bands:
         //        *code_flags :UNSIGNED5
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/bands.cpp b/jdk/src/share/native/com/sun/java/util/jar/pack/bands.cpp
index 8ad5e556c41..42340fa5cfd 100644
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/bands.cpp
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/bands.cpp
@@ -354,7 +354,7 @@ const band_init all_band_inits[] = {
   BAND_INIT(method_metadata_bands, -1, -1),
   BAND_INIT(method_MethodParameters_NB, BYTE1_spec, 0),
   BAND_INIT(method_MethodParameters_name_RUN, UNSIGNED5_spec, NULL_OR_INDEX(CONSTANT_Utf8)),
-  BAND_INIT(method_MethodParameters_flag_I, UNSIGNED5_spec, 0),
+  BAND_INIT(method_MethodParameters_flag_FH, UNSIGNED5_spec, 0),
   BAND_INIT(method_attr_bands, -1, -1),
   BAND_INIT(class_flags_hi, UNSIGNED5_spec, 0),
   BAND_INIT(class_flags_lo, UNSIGNED5_spec, 0),
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/bands.h b/jdk/src/share/native/com/sun/java/util/jar/pack/bands.h
index c555936d02e..052cd5d71a5 100644
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/bands.h
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/bands.h
@@ -214,7 +214,7 @@ enum band_number {
     e_method_metadata_bands,
     e_method_MethodParameters_NB,
     e_method_MethodParameters_name_RUN,
-    e_method_MethodParameters_flag_I,
+    e_method_MethodParameters_flag_FH,
     e_method_attr_bands,
 
     e_class_flags_hi,
@@ -393,7 +393,7 @@ enum band_number {
 #define method_Signature_RS all_bands[e_method_Signature_RS]
 #define method_MethodParameters_NB all_bands[e_method_MethodParameters_NB]
 #define method_MethodParameters_name_RUN all_bands[e_method_MethodParameters_name_RUN]
-#define method_MethodParameters_flag_I all_bands[e_method_MethodParameters_flag_I]
+#define method_MethodParameters_flag_FH all_bands[e_method_MethodParameters_flag_FH]
 #define method_attr_bands all_bands[e_method_attr_bands]
 #define class_flags_hi all_bands[e_class_flags_hi]
 #define class_flags_lo all_bands[e_class_flags_lo]
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp b/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
index 4b5e38a0de1..9ce0308089f 100644
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
@@ -2488,7 +2488,7 @@ void unpacker::read_attrs(int attrc, int obj_count) {
     method_MethodParameters_NB.readData(count);
     count = method_MethodParameters_NB.getIntTotal();
     method_MethodParameters_name_RUN.readData(count);
-    method_MethodParameters_flag_I.readData(count);
+    method_MethodParameters_flag_FH.readData(count);
     CHECK;
     break;
 
@@ -4431,7 +4431,7 @@ int unpacker::write_attrs(int attrc, julong indexBits) {
         putu1(count = method_MethodParameters_NB.getByte());
         for (j = 0; j < count; j++) {
           putref(method_MethodParameters_name_RUN.getRefN());
-          putu4(method_MethodParameters_flag_I.getInt());
+          putu2(method_MethodParameters_flag_FH.getInt());
         }
         break;
 
diff --git a/jdk/test/tools/pack200/AttributeTests.java b/jdk/test/tools/pack200/AttributeTests.java
index d4a40a90cc5..6526737b732 100644
--- a/jdk/test/tools/pack200/AttributeTests.java
+++ b/jdk/test/tools/pack200/AttributeTests.java
@@ -29,7 +29,7 @@ import java.util.List;
 import static java.nio.file.StandardOpenOption.*;
 /*
  * @test
- * @bug 6746111 8005252
+ * @bug 6746111 8005252 8008262
  * @summary tests various classfile format and attribute handling by pack200
  * @compile -XDignore.symbol.file Utils.java AttributeTests.java
  * @run main AttributeTests
@@ -67,17 +67,17 @@ public class AttributeTests {
         File testjarFile = new File(cwd, "test" + Utils.JAR_FILE_EXT);
         Utils.jar("cvf", testjarFile.getName(), javaClassName);
 
-        // pack using --repack
-        File outjarFile = new File(cwd, "out" + Utils.JAR_FILE_EXT);
-        scratch.clear();
-        scratch.add(Utils.getPack200Cmd());
-        scratch.add("--repack");
-        scratch.add("--unknown-attribute=error");
-        scratch.add(outjarFile.getName());
-        scratch.add(testjarFile.getName());
-        Utils.runExec(scratch);
+        // pack using native --repack
+        File nativejarFile = new File(cwd, "out-n" + Utils.JAR_FILE_EXT);
+        Utils.repack(testjarFile, nativejarFile, false,
+                     "--unknown-attribute=error");
+        Utils.doCompareVerify(testjarFile, nativejarFile);
 
-        Utils.doCompareVerify(testjarFile, outjarFile);
+        // pack using java --repack
+        File javajarFile = new File(cwd, "out-j" + Utils.JAR_FILE_EXT);
+        Utils.repack(testjarFile, javajarFile, true,
+                     "--unknown-attribute=error");
+        Utils.doCompareBitWise(nativejarFile, javajarFile);
     }
     /*
      * this test checks to see if we get the expected strings for output
diff --git a/jdk/test/tools/pack200/Utils.java b/jdk/test/tools/pack200/Utils.java
index 0e2269822f5..07a64595e9f 100644
--- a/jdk/test/tools/pack200/Utils.java
+++ b/jdk/test/tools/pack200/Utils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -314,6 +314,27 @@ class Utils {
             throw new RuntimeException("jar command failed");
         }
     }
+    static List<String> repack(File inFile, File outFile,
+            boolean disableNative, String... extraOpts) {
+        List<String> cmdList = new ArrayList<>();
+        cmdList.clear();
+        cmdList.add(Utils.getJavaCmd());
+        cmdList.add("-ea");
+        cmdList.add("-esa");
+        if (disableNative) {
+            cmdList.add("-Dcom.sun.java.util.jar.pack.disable.native=true");
+        }
+        cmdList.add("com.sun.java.util.jar.pack.Driver");
+        cmdList.add("--repack");
+        if (extraOpts != null) {
+           for (String opt: extraOpts) {
+               cmdList.add(opt);
+           }
+        }
+        cmdList.add(outFile.getName());
+        cmdList.add(inFile.getName());
+        return Utils.runExec(cmdList);
+    }
 
     // given a jar file foo.jar will write to foo.pack
     static void pack(JarFile jarFile, File packFile) throws IOException {

From 0a5d02aaa60acf6be9426a2fc7ea06e6f826c9bd Mon Sep 17 00:00:00 2001
From: Katja Kantserova <ykantser@openjdk.org>
Date: Wed, 13 Feb 2013 10:24:24 +0100
Subject: [PATCH 136/311] 8008089: Delete OS dependent check in
 JdkFinder.getExecutable()

Reviewed-by: egahlin, alanb
---
 jdk/test/lib/testlibrary/jdk/testlibrary/JdkFinder.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/jdk/test/lib/testlibrary/jdk/testlibrary/JdkFinder.java b/jdk/test/lib/testlibrary/jdk/testlibrary/JdkFinder.java
index fa038faccd4..d109778f22a 100644
--- a/jdk/test/lib/testlibrary/jdk/testlibrary/JdkFinder.java
+++ b/jdk/test/lib/testlibrary/jdk/testlibrary/JdkFinder.java
@@ -38,10 +38,6 @@ public final class JdkFinder {
         }
 
         binPath += File.separatorChar + "bin" + File.separatorChar + executable;
-        File toolFile = new File(binPath);
-        if (!toolFile.exists()) {
-            throw new RuntimeException(binPath + " does not exist");
-        }
 
         return binPath;
     }

From 05b1c69fc0b1d62bd103e33d29e59b6e1de33401 Mon Sep 17 00:00:00 2001
From: Roland Westrelin <roland@openjdk.org>
Date: Wed, 13 Mar 2013 09:44:45 +0100
Subject: [PATCH 137/311] 8009761: Deoptimization on sparc doesn't set Llast_SP
 correctly in the interpreter frames it creates

Deoptimization doesn't set up callee frames so that they restore caller frames correctly.

Reviewed-by: kvn
---
 .../src/cpu/sparc/vm/cppInterpreter_sparc.cpp |   3 +-
 .../sparc/vm/templateInterpreter_sparc.cpp    |  12 +-
 hotspot/src/cpu/x86/vm/cppInterpreter_x86.cpp |   3 +-
 .../cpu/x86/vm/templateInterpreter_x86_32.cpp |   3 +-
 .../cpu/x86/vm/templateInterpreter_x86_64.cpp |   3 +-
 .../src/cpu/zero/vm/cppInterpreter_zero.cpp   |   3 +-
 .../vm/interpreter/abstractInterpreter.hpp    |   9 +-
 .../src/share/vm/runtime/deoptimization.cpp   |   1 +
 hotspot/src/share/vm/runtime/vframeArray.cpp  |  15 +-
 hotspot/src/share/vm/runtime/vframeArray.hpp  |   2 +
 .../test/compiler/8009761/Test8009761.java    | 255 ++++++++++++++++++
 11 files changed, 295 insertions(+), 14 deletions(-)
 create mode 100644 hotspot/test/compiler/8009761/Test8009761.java

diff --git a/hotspot/src/cpu/sparc/vm/cppInterpreter_sparc.cpp b/hotspot/src/cpu/sparc/vm/cppInterpreter_sparc.cpp
index 4918746db13..b1451fb0bae 100644
--- a/hotspot/src/cpu/sparc/vm/cppInterpreter_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/cppInterpreter_sparc.cpp
@@ -2194,7 +2194,8 @@ int AbstractInterpreter::layout_activation(Method* method,
                                            int callee_locals_size,
                                            frame* caller,
                                            frame* interpreter_frame,
-                                           bool is_top_frame) {
+                                           bool is_top_frame,
+                                           bool is_bottom_frame) {
 
   assert(popframe_extra_args == 0, "NEED TO FIX");
   // NOTE this code must exactly mimic what InterpreterGenerator::generate_compute_interpreter_state()
diff --git a/hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp b/hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp
index b5cfa00f975..4a6372ae0de 100644
--- a/hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp
@@ -1581,7 +1581,8 @@ int AbstractInterpreter::layout_activation(Method* method,
                                            int callee_local_count,
                                            frame* caller,
                                            frame* interpreter_frame,
-                                           bool is_top_frame) {
+                                           bool is_top_frame,
+                                           bool is_bottom_frame) {
   // Note: This calculation must exactly parallel the frame setup
   // in InterpreterGenerator::generate_fixed_frame.
   // If f!=NULL, set up the following variables:
@@ -1664,6 +1665,15 @@ int AbstractInterpreter::layout_activation(Method* method,
       int delta = local_words - parm_words;
       int computed_sp_adjustment = (delta > 0) ? round_to(delta, WordsPerLong) : 0;
       *interpreter_frame->register_addr(I5_savedSP)    = (intptr_t) (fp + computed_sp_adjustment) - STACK_BIAS;
+      if (!is_bottom_frame) {
+        // Llast_SP is set below for the current frame to SP (with the
+        // extra space for the callee's locals). Here we adjust
+        // Llast_SP for the caller's frame, removing the extra space
+        // for the current method's locals.
+        *caller->register_addr(Llast_SP) = *interpreter_frame->register_addr(I5_savedSP);
+      } else {
+        assert(*caller->register_addr(Llast_SP) >= *interpreter_frame->register_addr(I5_savedSP), "strange Llast_SP");
+      }
     } else {
       assert(caller->is_compiled_frame() || caller->is_entry_frame(), "only possible cases");
       // Don't have Lesp available; lay out locals block in the caller
diff --git a/hotspot/src/cpu/x86/vm/cppInterpreter_x86.cpp b/hotspot/src/cpu/x86/vm/cppInterpreter_x86.cpp
index 55b29fb2f6c..c568c6f4d3a 100644
--- a/hotspot/src/cpu/x86/vm/cppInterpreter_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/cppInterpreter_x86.cpp
@@ -2361,7 +2361,8 @@ int AbstractInterpreter::layout_activation(Method* method,
                                            int callee_locals,
                                            frame* caller,
                                            frame* interpreter_frame,
-                                           bool is_top_frame) {
+                                           bool is_top_frame,
+                                           bool is_bottom_frame) {
 
   assert(popframe_extra_args == 0, "FIX ME");
   // NOTE this code must exactly mimic what InterpreterGenerator::generate_compute_interpreter_state()
diff --git a/hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp b/hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp
index a562bee3e53..5df98394cf5 100644
--- a/hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp
+++ b/hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp
@@ -1585,7 +1585,8 @@ int AbstractInterpreter::layout_activation(Method* method,
                                            int callee_locals,
                                            frame* caller,
                                            frame* interpreter_frame,
-                                           bool is_top_frame) {
+                                           bool is_top_frame,
+                                           bool is_bottom_frame) {
   // Note: This calculation must exactly parallel the frame setup
   // in AbstractInterpreterGenerator::generate_method_entry.
   // If interpreter_frame!=NULL, set up the method, locals, and monitors.
diff --git a/hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp b/hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp
index 26eadba79b2..c446cb3c9b1 100644
--- a/hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp
+++ b/hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp
@@ -1599,7 +1599,8 @@ int AbstractInterpreter::layout_activation(Method* method,
                                            int callee_locals,
                                            frame* caller,
                                            frame* interpreter_frame,
-                                           bool is_top_frame) {
+                                           bool is_top_frame,
+                                           bool is_bottom_frame) {
   // Note: This calculation must exactly parallel the frame setup
   // in AbstractInterpreterGenerator::generate_method_entry.
   // If interpreter_frame!=NULL, set up the method, locals, and monitors.
diff --git a/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp b/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
index a199d037cbc..10501655dbb 100644
--- a/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
+++ b/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
@@ -919,7 +919,8 @@ int AbstractInterpreter::layout_activation(Method* method,
                                            int       callee_locals,
                                            frame*    caller,
                                            frame*    interpreter_frame,
-                                           bool      is_top_frame) {
+                                           bool      is_top_frame,
+                                           bool      is_bottom_frame) {
   assert(popframe_extra_args == 0, "what to do?");
   assert(!is_top_frame || (!callee_locals && !callee_param_count),
          "top frame should have no caller");
diff --git a/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp b/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp
index 7cd621318f7..264d4fffbf6 100644
--- a/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp
+++ b/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp
@@ -186,7 +186,8 @@ class AbstractInterpreter: AllStatic {
                                     int caller_actual_parameters,
                                     int callee_params,
                                     int callee_locals,
-                                    bool is_top_frame) {
+                                    bool is_top_frame,
+                                    bool is_bottom_frame) {
     return layout_activation(method,
                              temps,
                              popframe_args,
@@ -196,7 +197,8 @@ class AbstractInterpreter: AllStatic {
                              callee_locals,
                              (frame*)NULL,
                              (frame*)NULL,
-                             is_top_frame);
+                             is_top_frame,
+                             is_bottom_frame);
   }
 
   static int       layout_activation(Method* method,
@@ -208,7 +210,8 @@ class AbstractInterpreter: AllStatic {
                                      int callee_locals,
                                      frame* caller,
                                      frame* interpreter_frame,
-                                     bool is_top_frame);
+                                     bool is_top_frame,
+                                     bool is_bottom_frame);
 
   // Runtime support
   static bool       is_not_reached(                       methodHandle method, int bci);
diff --git a/hotspot/src/share/vm/runtime/deoptimization.cpp b/hotspot/src/share/vm/runtime/deoptimization.cpp
index 8f735b7d6fb..4a8d52b1284 100644
--- a/hotspot/src/share/vm/runtime/deoptimization.cpp
+++ b/hotspot/src/share/vm/runtime/deoptimization.cpp
@@ -425,6 +425,7 @@ Deoptimization::UnrollBlock* Deoptimization::fetch_unroll_info_helper(JavaThread
                                                                                                     callee_parameters,
                                                                                                     callee_locals,
                                                                                                     index == 0,
+                                                                                                    index == array->frames() - 1,
                                                                                                     popframe_extra_args);
     // This pc doesn't have to be perfect just good enough to identify the frame
     // as interpreted so the skeleton frame will be walkable
diff --git a/hotspot/src/share/vm/runtime/vframeArray.cpp b/hotspot/src/share/vm/runtime/vframeArray.cpp
index d00e9f00954..3fda9e6dc1d 100644
--- a/hotspot/src/share/vm/runtime/vframeArray.cpp
+++ b/hotspot/src/share/vm/runtime/vframeArray.cpp
@@ -160,6 +160,7 @@ void vframeArrayElement::unpack_on_stack(int caller_actual_parameters,
                                          int callee_locals,
                                          frame* caller,
                                          bool is_top_frame,
+                                         bool is_bottom_frame,
                                          int exec_mode) {
   JavaThread* thread = (JavaThread*) Thread::current();
 
@@ -275,7 +276,8 @@ void vframeArrayElement::unpack_on_stack(int caller_actual_parameters,
                                  callee_locals,
                                  caller,
                                  iframe(),
-                                 is_top_frame);
+                                 is_top_frame,
+                                 is_bottom_frame);
 
   // Update the pc in the frame object and overwrite the temporary pc
   // we placed in the skeletal frame now that we finally know the
@@ -420,6 +422,7 @@ int vframeArrayElement::on_stack_size(int caller_actual_parameters,
                                       int callee_parameters,
                                       int callee_locals,
                                       bool is_top_frame,
+                                      bool is_bottom_frame,
                                       int popframe_extra_stack_expression_els) const {
   assert(method()->max_locals() == locals()->size(), "just checking");
   int locks = monitors() == NULL ? 0 : monitors()->number_of_monitors();
@@ -431,7 +434,8 @@ int vframeArrayElement::on_stack_size(int caller_actual_parameters,
                                       caller_actual_parameters,
                                       callee_parameters,
                                       callee_locals,
-                                      is_top_frame);
+                                      is_top_frame,
+                                      is_bottom_frame);
 }
 
 
@@ -522,7 +526,7 @@ void vframeArray::unpack_to_stack(frame &unpack_frame, int exec_mode, int caller
 
   // Do the unpacking of interpreter frames; the frame at index 0 represents the top activation, so it has no callee
   // Unpack the frames from the oldest (frames() -1) to the youngest (0)
-  frame caller_frame = me;
+  frame* caller_frame = &me;
   for (index = frames() - 1; index >= 0 ; index--) {
     vframeArrayElement* elem = element(index);  // caller
     int callee_parameters, callee_locals;
@@ -542,13 +546,14 @@ void vframeArray::unpack_to_stack(frame &unpack_frame, int exec_mode, int caller
     elem->unpack_on_stack(caller_actual_parameters,
                           callee_parameters,
                           callee_locals,
-                          &caller_frame,
+                          caller_frame,
                           index == 0,
+                          index == frames() - 1,
                           exec_mode);
     if (index == frames() - 1) {
       Deoptimization::unwind_callee_save_values(elem->iframe(), this);
     }
-    caller_frame = *elem->iframe();
+    caller_frame = elem->iframe();
     caller_actual_parameters = callee_parameters;
   }
   deallocate_monitor_chunks();
diff --git a/hotspot/src/share/vm/runtime/vframeArray.hpp b/hotspot/src/share/vm/runtime/vframeArray.hpp
index b505c35712f..5ebe7b897eb 100644
--- a/hotspot/src/share/vm/runtime/vframeArray.hpp
+++ b/hotspot/src/share/vm/runtime/vframeArray.hpp
@@ -88,6 +88,7 @@ class vframeArrayElement : public _ValueObj {
   int on_stack_size(int caller_actual_parameters,
                     int callee_parameters,
                     int callee_locals,
+                    bool is_bottom_frame,
                     bool is_top_frame,
                     int popframe_extra_stack_expression_els) const;
 
@@ -97,6 +98,7 @@ class vframeArrayElement : public _ValueObj {
                        int callee_locals,
                        frame* caller,
                        bool is_top_frame,
+                       bool is_bottom_frame,
                        int exec_mode);
 
 #ifndef PRODUCT
diff --git a/hotspot/test/compiler/8009761/Test8009761.java b/hotspot/test/compiler/8009761/Test8009761.java
new file mode 100644
index 00000000000..c897ab40069
--- /dev/null
+++ b/hotspot/test/compiler/8009761/Test8009761.java
@@ -0,0 +1,255 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8009761
+ * @summary Deoptimization on sparc doesn't set Llast_SP correctly in the interpreter frames it creates
+ * @run main/othervm -XX:-UseOnStackReplacement -XX:-BackgroundCompilation Test8009761
+ *
+ */
+
+public class Test8009761 {
+
+    static class UnloadedClass {
+        volatile int i;
+    }
+
+    static Object m1(boolean deopt) {
+        // When running interpreted, on sparc, the caller's stack is
+        // extended for the locals and the caller's frame is restored
+        // on return.
+        long l0, l1, l2, l3, l4, l5, l6, l7, l8, l9, l10, l11, l12,
+        l13, l14, l15, l16, l17, l18, l19, l20, l21, l22, l23, l24,
+        l25, l26, l27, l28, l29, l30, l31, l32, l33, l34, l35, l36,
+        l37, l38, l39, l40, l41, l42, l43, l44, l45, l46, l47, l48,
+        l49, l50, l51, l52, l53, l54, l55, l56, l57, l58, l59, l60,
+        l61, l62, l63, l64, l65, l66, l67, l68, l69, l70, l71, l72,
+        l73, l74, l75, l76, l77, l78, l79, l80, l81, l82, l83, l84,
+        l85, l86, l87, l88, l89, l90, l91, l92, l93, l94, l95, l96,
+        l97, l98, l99, l100, l101, l102, l103, l104, l105, l106, l107,
+        l108, l109, l110, l111, l112, l113, l114, l115, l116, l117,
+        l118, l119, l120, l121, l122, l123, l124, l125, l126, l127,
+        l128, l129, l130, l131, l132, l133, l134, l135, l136, l137,
+        l138, l139, l140, l141, l142, l143, l144, l145, l146, l147,
+        l148, l149, l150, l151, l152, l153, l154, l155, l156, l157,
+        l158, l159, l160, l161, l162, l163, l164, l165, l166, l167,
+        l168, l169, l170, l171, l172, l173, l174, l175, l176, l177,
+        l178, l179, l180, l181, l182, l183, l184, l185, l186, l187,
+        l188, l189, l190, l191, l192, l193, l194, l195, l196, l197,
+        l198, l199, l200, l201, l202, l203, l204, l205, l206, l207,
+        l208, l209, l210, l211, l212, l213, l214, l215, l216, l217,
+        l218, l219, l220, l221, l222, l223, l224, l225, l226, l227,
+        l228, l229, l230, l231, l232, l233, l234, l235, l236, l237,
+        l238, l239, l240, l241, l242, l243, l244, l245, l246, l247,
+        l248, l249, l250, l251, l252, l253, l254, l255, l256, l257,
+        l258, l259, l260, l261, l262, l263, l264, l265, l266, l267,
+        l268, l269, l270, l271, l272, l273, l274, l275, l276, l277,
+        l278, l279, l280, l281, l282, l283, l284, l285, l286, l287,
+        l288, l289, l290, l291, l292, l293, l294, l295, l296, l297,
+        l298, l299, l300, l301, l302, l303, l304, l305, l306, l307,
+        l308, l309, l310, l311, l312, l313, l314, l315, l316, l317,
+        l318, l319, l320, l321, l322, l323, l324, l325, l326, l327,
+        l328, l329, l330, l331, l332, l333, l334, l335, l336, l337,
+        l338, l339, l340, l341, l342, l343, l344, l345, l346, l347,
+        l348, l349, l350, l351, l352, l353, l354, l355, l356, l357,
+        l358, l359, l360, l361, l362, l363, l364, l365, l366, l367,
+        l368, l369, l370, l371, l372, l373, l374, l375, l376, l377,
+        l378, l379, l380, l381, l382, l383, l384, l385, l386, l387,
+        l388, l389, l390, l391, l392, l393, l394, l395, l396, l397,
+        l398, l399, l400, l401, l402, l403, l404, l405, l406, l407,
+        l408, l409, l410, l411, l412, l413, l414, l415, l416, l417,
+        l418, l419, l420, l421, l422, l423, l424, l425, l426, l427,
+        l428, l429, l430, l431, l432, l433, l434, l435, l436, l437,
+        l438, l439, l440, l441, l442, l443, l444, l445, l446, l447,
+        l448, l449, l450, l451, l452, l453, l454, l455, l456, l457,
+        l458, l459, l460, l461, l462, l463, l464, l465, l466, l467,
+        l468, l469, l470, l471, l472, l473, l474, l475, l476, l477,
+        l478, l479, l480, l481, l482, l483, l484, l485, l486, l487,
+        l488, l489, l490, l491, l492, l493, l494, l495, l496, l497,
+        l498, l499, l500, l501, l502, l503, l504, l505, l506, l507,
+        l508, l509, l510, l511;
+
+        long ll0, ll1, ll2, ll3, ll4, ll5, ll6, ll7, ll8, ll9, ll10, ll11, ll12,
+        ll13, ll14, ll15, ll16, ll17, ll18, ll19, ll20, ll21, ll22, ll23, ll24,
+        ll25, ll26, ll27, ll28, ll29, ll30, ll31, ll32, ll33, ll34, ll35, ll36,
+        ll37, ll38, ll39, ll40, ll41, ll42, ll43, ll44, ll45, ll46, ll47, ll48,
+        ll49, ll50, ll51, ll52, ll53, ll54, ll55, ll56, ll57, ll58, ll59, ll60,
+        ll61, ll62, ll63, ll64, ll65, ll66, ll67, ll68, ll69, ll70, ll71, ll72,
+        ll73, ll74, ll75, ll76, ll77, ll78, ll79, ll80, ll81, ll82, ll83, ll84,
+        ll85, ll86, ll87, ll88, ll89, ll90, ll91, ll92, ll93, ll94, ll95, ll96,
+        ll97, ll98, ll99, ll100, ll101, ll102, ll103, ll104, ll105, ll106, ll107,
+        ll108, ll109, ll110, ll111, ll112, ll113, ll114, ll115, ll116, ll117,
+        ll118, ll119, ll120, ll121, ll122, ll123, ll124, ll125, ll126, ll127,
+        ll128, ll129, ll130, ll131, ll132, ll133, ll134, ll135, ll136, ll137,
+        ll138, ll139, ll140, ll141, ll142, ll143, ll144, ll145, ll146, ll147,
+        ll148, ll149, ll150, ll151, ll152, ll153, ll154, ll155, ll156, ll157,
+        ll158, ll159, ll160, ll161, ll162, ll163, ll164, ll165, ll166, ll167,
+        ll168, ll169, ll170, ll171, ll172, ll173, ll174, ll175, ll176, ll177,
+        ll178, ll179, ll180, ll181, ll182, ll183, ll184, ll185, ll186, ll187,
+        ll188, ll189, ll190, ll191, ll192, ll193, ll194, ll195, ll196, ll197,
+        ll198, ll199, ll200, ll201, ll202, ll203, ll204, ll205, ll206, ll207,
+        ll208, ll209, ll210, ll211, ll212, ll213, ll214, ll215, ll216, ll217,
+        ll218, ll219, ll220, ll221, ll222, ll223, ll224, ll225, ll226, ll227,
+        ll228, ll229, ll230, ll231, ll232, ll233, ll234, ll235, ll236, ll237,
+        ll238, ll239, ll240, ll241, ll242, ll243, ll244, ll245, ll246, ll247,
+        ll248, ll249, ll250, ll251, ll252, ll253, ll254, ll255, ll256, ll257,
+        ll258, ll259, ll260, ll261, ll262, ll263, ll264, ll265, ll266, ll267,
+        ll268, ll269, ll270, ll271, ll272, ll273, ll274, ll275, ll276, ll277,
+        ll278, ll279, ll280, ll281, ll282, ll283, ll284, ll285, ll286, ll287,
+        ll288, ll289, ll290, ll291, ll292, ll293, ll294, ll295, ll296, ll297,
+        ll298, ll299, ll300, ll301, ll302, ll303, ll304, ll305, ll306, ll307,
+        ll308, ll309, ll310, ll311, ll312, ll313, ll314, ll315, ll316, ll317,
+        ll318, ll319, ll320, ll321, ll322, ll323, ll324, ll325, ll326, ll327,
+        ll328, ll329, ll330, ll331, ll332, ll333, ll334, ll335, ll336, ll337,
+        ll338, ll339, ll340, ll341, ll342, ll343, ll344, ll345, ll346, ll347,
+        ll348, ll349, ll350, ll351, ll352, ll353, ll354, ll355, ll356, ll357,
+        ll358, ll359, ll360, ll361, ll362, ll363, ll364, ll365, ll366, ll367,
+        ll368, ll369, ll370, ll371, ll372, ll373, ll374, ll375, ll376, ll377,
+        ll378, ll379, ll380, ll381, ll382, ll383, ll384, ll385, ll386, ll387,
+        ll388, ll389, ll390, ll391, ll392, ll393, ll394, ll395, ll396, ll397,
+        ll398, ll399, ll400, ll401, ll402, ll403, ll404, ll405, ll406, ll407,
+        ll408, ll409, ll410, ll411, ll412, ll413, ll414, ll415, ll416, ll417,
+        ll418, ll419, ll420, ll421, ll422, ll423, ll424, ll425, ll426, ll427,
+        ll428, ll429, ll430, ll431, ll432, ll433, ll434, ll435, ll436, ll437,
+        ll438, ll439, ll440, ll441, ll442, ll443, ll444, ll445, ll446, ll447,
+        ll448, ll449, ll450, ll451, ll452, ll453, ll454, ll455, ll456, ll457,
+        ll458, ll459, ll460, ll461, ll462, ll463, ll464, ll465, ll466, ll467,
+        ll468, ll469, ll470, ll471, ll472, ll473, ll474, ll475, ll476, ll477,
+        ll478, ll479, ll480, ll481, ll482, ll483, ll484, ll485, ll486, ll487,
+        ll488, ll489, ll490, ll491, ll492, ll493, ll494, ll495, ll496, ll497,
+        ll498, ll499, ll500, ll501, ll502, ll503, ll504, ll505, ll506, ll507,
+        ll508, ll509, ll510, ll511;
+
+        if (deopt) {
+            UnloadedClass res = new UnloadedClass(); // sufficient to force deopt with c2 but not c1
+            res.i = 0; // forces deopt with c1
+            return res;
+        }
+        return null;
+    }
+
+    static int count = 0;
+
+    static void m2() {
+        // Will be called recursively until a stack overflow
+        // exception. Makes sure it has a lot of locals so that it's
+        // not called a sufficient number of times to trigger
+        // compilation.
+
+        long l0, l1, l2, l3, l4, l5, l6, l7, l8, l9, l10, l11, l12,
+        l13, l14, l15, l16, l17, l18, l19, l20, l21, l22, l23, l24,
+        l25, l26, l27, l28, l29, l30, l31, l32, l33, l34, l35, l36,
+        l37, l38, l39, l40, l41, l42, l43, l44, l45, l46, l47, l48,
+        l49, l50, l51, l52, l53, l54, l55, l56, l57, l58, l59, l60,
+        l61, l62, l63, l64, l65, l66, l67, l68, l69, l70, l71, l72,
+        l73, l74, l75, l76, l77, l78, l79, l80, l81, l82, l83, l84,
+        l85, l86, l87, l88, l89, l90, l91, l92, l93, l94, l95, l96,
+        l97, l98, l99, l100, l101, l102, l103, l104, l105, l106, l107,
+        l108, l109, l110, l111, l112, l113, l114, l115, l116, l117,
+        l118, l119, l120, l121, l122, l123, l124, l125, l126, l127,
+        l128, l129, l130, l131, l132, l133, l134, l135, l136, l137,
+        l138, l139, l140, l141, l142, l143, l144, l145, l146, l147,
+        l148, l149, l150, l151, l152, l153, l154, l155, l156, l157,
+        l158, l159, l160, l161, l162, l163, l164, l165, l166, l167,
+        l168, l169, l170, l171, l172, l173, l174, l175, l176, l177,
+        l178, l179, l180, l181, l182, l183, l184, l185, l186, l187,
+        l188, l189, l190, l191, l192, l193, l194, l195, l196, l197,
+        l198, l199, l200, l201, l202, l203, l204, l205, l206, l207,
+        l208, l209, l210, l211, l212, l213, l214, l215, l216, l217,
+        l218, l219, l220, l221, l222, l223, l224, l225, l226, l227,
+        l228, l229, l230, l231, l232, l233, l234, l235, l236, l237,
+        l238, l239, l240, l241, l242, l243, l244, l245, l246, l247,
+        l248, l249, l250, l251, l252, l253, l254, l255, l256, l257,
+        l258, l259, l260, l261, l262, l263, l264, l265, l266, l267,
+        l268, l269, l270, l271, l272, l273, l274, l275, l276, l277,
+        l278, l279, l280, l281, l282, l283, l284, l285, l286, l287,
+        l288, l289, l290, l291, l292, l293, l294, l295, l296, l297,
+        l298, l299, l300, l301, l302, l303, l304, l305, l306, l307,
+        l308, l309, l310, l311, l312, l313, l314, l315, l316, l317,
+        l318, l319, l320, l321, l322, l323, l324, l325, l326, l327,
+        l328, l329, l330, l331, l332, l333, l334, l335, l336, l337,
+        l338, l339, l340, l341, l342, l343, l344, l345, l346, l347,
+        l348, l349, l350, l351, l352, l353, l354, l355, l356, l357,
+        l358, l359, l360, l361, l362, l363, l364, l365, l366, l367,
+        l368, l369, l370, l371, l372, l373, l374, l375, l376, l377,
+        l378, l379, l380, l381, l382, l383, l384, l385, l386, l387,
+        l388, l389, l390, l391, l392, l393, l394, l395, l396, l397,
+        l398, l399, l400, l401, l402, l403, l404, l405, l406, l407,
+        l408, l409, l410, l411, l412, l413, l414, l415, l416, l417,
+        l418, l419, l420, l421, l422, l423, l424, l425, l426, l427,
+        l428, l429, l430, l431, l432, l433, l434, l435, l436, l437,
+        l438, l439, l440, l441, l442, l443, l444, l445, l446, l447,
+        l448, l449, l450, l451, l452, l453, l454, l455, l456, l457,
+        l458, l459, l460, l461, l462, l463, l464, l465, l466, l467,
+        l468, l469, l470, l471, l472, l473, l474, l475, l476, l477,
+        l478, l479, l480, l481, l482, l483, l484, l485, l486, l487,
+        l488, l489, l490, l491, l492, l493, l494, l495, l496, l497,
+        l498, l499, l500, l501, l502, l503, l504, l505, l506, l507,
+        l508, l509, l510, l511;
+
+        count++;
+        m2();
+    }
+
+    static Object m3(boolean overflow_stack, boolean deopt) {
+        if (overflow_stack) {
+            m2();
+            return null;
+        }
+        Object o = m1(deopt);
+        if (deopt) {
+            m2();
+        }
+        return o;
+    }
+
+    static public void main(String[] args) {
+        int c1;
+        // Call m2 from m3 recursively until stack overflow. Count the number of recursive calls.
+        try {
+            m3(true, false);
+        } catch(StackOverflowError soe) {
+        }
+        c1 = count;
+        // Force the compilation of m3() that will inline m1()
+        for (int i = 0; i < 20000; i++) {
+            m3(false, false);
+        }
+        count = 0;
+        // Force deoptimization of m3() in m1(), then return from m1()
+        // to m3(), call recursively m2(). If deoptimization correctly
+        // built the interpreter stack for m3()/m1() then we should be
+        // able to call m2() recursively as many times as before.
+        try {
+            m3(false, true);
+        } catch(StackOverflowError soe) {
+        }
+        if (c1 != count) {
+            System.out.println("Failed: init recursive calls: " + c1 + ". After deopt " + count);
+            System.exit(97);
+        } else {
+            System.out.println("PASSED");
+        }
+    }
+}

From b26473a6cfc7886e194478ee90944c12eda6b06d Mon Sep 17 00:00:00 2001
From: Niclas Adlertz <niclas.adlertz@oracle.com>
Date: Wed, 13 Mar 2013 10:56:54 +0100
Subject: [PATCH 138/311] 8009721: Make PhaseLive independent from regalloc

Moved class definition of LRG_List from chaitin.hpp to live.hpp

Reviewed-by: kvn, rbackman, roland
---
 hotspot/src/share/vm/opto/chaitin.hpp | 25 -------------------------
 hotspot/src/share/vm/opto/live.hpp    | 26 +++++++++++++++++++++++++-
 2 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/hotspot/src/share/vm/opto/chaitin.hpp b/hotspot/src/share/vm/opto/chaitin.hpp
index 340e46d49b1..fc8010b851e 100644
--- a/hotspot/src/share/vm/opto/chaitin.hpp
+++ b/hotspot/src/share/vm/opto/chaitin.hpp
@@ -187,31 +187,6 @@ public:
 #endif
 };
 
-//------------------------------LRG_List---------------------------------------
-// Map Node indices to Live RanGe indices.
-// Array lookup in the optimized case.
-class LRG_List : public ResourceObj {
-  friend class VMStructs;
-  uint _cnt, _max;
-  uint* _lidxs;
-  ReallocMark _nesting;         // assertion check for reallocations
-public:
-  LRG_List( uint max );
-
-  uint lookup( uint nidx ) const {
-    return _lidxs[nidx];
-  }
-  uint operator[] (uint nidx) const { return lookup(nidx); }
-
-  void map( uint nidx, uint lidx ) {
-    assert( nidx < _cnt, "oob" );
-    _lidxs[nidx] = lidx;
-  }
-  void extend( uint nidx, uint lidx );
-
-  uint Size() const { return _cnt; }
-};
-
 //------------------------------IFG--------------------------------------------
 //                         InterFerence Graph
 // An undirected graph implementation.  Created with a fixed number of
diff --git a/hotspot/src/share/vm/opto/live.hpp b/hotspot/src/share/vm/opto/live.hpp
index c7714fecc4f..8a266c19067 100644
--- a/hotspot/src/share/vm/opto/live.hpp
+++ b/hotspot/src/share/vm/opto/live.hpp
@@ -33,11 +33,35 @@
 #include "opto/regmask.hpp"
 
 class Block;
-class LRG_List;
 class PhaseCFG;
 class VectorSet;
 class IndexSet;
 
+//------------------------------LRG_List---------------------------------------
+// Map Node indices to Live RanGe indices.
+// Array lookup in the optimized case.
+class LRG_List : public ResourceObj {
+  friend class VMStructs;
+  uint _cnt, _max;
+  uint* _lidxs;
+  ReallocMark _nesting;         // assertion check for reallocations
+public:
+  LRG_List( uint max );
+
+  uint lookup( uint nidx ) const {
+    return _lidxs[nidx];
+  }
+  uint operator[] (uint nidx) const { return lookup(nidx); }
+
+  void map( uint nidx, uint lidx ) {
+    assert( nidx < _cnt, "oob" );
+    _lidxs[nidx] = lidx;
+  }
+  void extend( uint nidx, uint lidx );
+
+  uint Size() const { return _cnt; }
+};
+
 //------------------------------PhaseLive--------------------------------------
 // Compute live-in/live-out
 class PhaseLive : public Phase {

From bcbdbf99960a47faf45fd8ee12864ac989d2bfd1 Mon Sep 17 00:00:00 2001
From: Nils Eliasson <neliasso@openjdk.org>
Date: Wed, 13 Feb 2013 10:25:09 +0100
Subject: [PATCH 139/311] 8005772: Stubs report compile id -1 in phase events

Use 0 to indicate id is NA, -1 for error or uninitalized

Reviewed-by: kvn, twisti
---
 hotspot/src/share/vm/compiler/compileBroker.cpp | 2 +-
 hotspot/src/share/vm/opto/compile.cpp           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hotspot/src/share/vm/compiler/compileBroker.cpp b/hotspot/src/share/vm/compiler/compileBroker.cpp
index 6f4e671c165..9214166e905 100644
--- a/hotspot/src/share/vm/compiler/compileBroker.cpp
+++ b/hotspot/src/share/vm/compiler/compileBroker.cpp
@@ -505,7 +505,7 @@ void CompileTask::log_task(xmlStream* log) {
   ResourceMark rm(thread);
 
   // <task id='9' method='M' osr_bci='X' level='1' blocking='1' stamp='1.234'>
-  if (_compile_id != 0)   log->print(" compile_id='%d'", _compile_id);
+  log->print(" compile_id='%d'", _compile_id);
   if (_osr_bci != CompileBroker::standard_entry_bci) {
     log->print(" compile_kind='osr'");  // same as nmethod::compile_kind
   } // else compile_kind='c2c'
diff --git a/hotspot/src/share/vm/opto/compile.cpp b/hotspot/src/share/vm/opto/compile.cpp
index 568af91f127..a4657819c44 100644
--- a/hotspot/src/share/vm/opto/compile.cpp
+++ b/hotspot/src/share/vm/opto/compile.cpp
@@ -892,7 +892,7 @@ Compile::Compile( ciEnv* ci_env,
   : Phase(Compiler),
     _env(ci_env),
     _log(ci_env->log()),
-    _compile_id(-1),
+    _compile_id(0),
     _save_argument_registers(save_arg_registers),
     _method(NULL),
     _stub_name(stub_name),

From b8d10c0a0e214f8c87beaab9dd9a425beee0c218 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Wed, 13 Feb 2013 13:30:21 +0100
Subject: [PATCH 140/311] 8008096: TokenStream buffer should grow exponentially

Reviewed-by: attila, lagergren, sundar
---
 nashorn/src/jdk/nashorn/internal/parser/TokenStream.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nashorn/src/jdk/nashorn/internal/parser/TokenStream.java b/nashorn/src/jdk/nashorn/internal/parser/TokenStream.java
index c31f5f4c9f0..ee81ce3921b 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/TokenStream.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/TokenStream.java
@@ -34,8 +34,8 @@ package jdk.nashorn.internal.parser;
  *
  */
 public class TokenStream {
-    /** Buffer growth factor. */
-    private static final int growth = 256;
+    /** Initial buffer size. */
+    private static final int INITIAL_SIZE = 256;
 
     /** Token buffer. */
     private long[] buffer;
@@ -56,7 +56,7 @@ public class TokenStream {
      * Constructor.
      */
     public TokenStream() {
-        buffer = new long[growth];
+        buffer = new long[INITIAL_SIZE];
         count = 0;
         in = 0;
         out = 0;
@@ -193,7 +193,7 @@ public class TokenStream {
      */
     public void grow() {
         // Allocate new buffer.
-        final long[] newBuffer = new long[buffer.length + growth];
+        final long[] newBuffer = new long[buffer.length * 2];
 
         // If single chunk.
         if (in > out) {

From ecc2be22e3dedc96c6e95d0d9eda2bc571760821 Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Wed, 13 Feb 2013 19:59:30 +0530
Subject: [PATCH 141/311] 8008103: Source object should maintain URL of the
 script source as a private field

Reviewed-by: lagergren, jlaskey
---
 .../api/scripting/NashornScriptEngine.java    |   2 +-
 .../jdk/nashorn/internal/runtime/Context.java | 107 +++++-------------
 .../jdk/nashorn/internal/runtime/Source.java  |  35 +++++-
 nashorn/src/jdk/nashorn/tools/Shell.java      |   2 +-
 .../internal/codegen/CompilerTest.java        |   2 +-
 .../nashorn/internal/runtime/ContextTest.java |   2 +-
 .../framework/SharedContextEvaluator.java     |   3 +-
 7 files changed, 64 insertions(+), 89 deletions(-)

diff --git a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
index 5217555ff39..ded9afb7e6e 100644
--- a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
+++ b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
@@ -453,7 +453,7 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
                 setNashornGlobal(ctxtGlobal);
             }
 
-            return nashornContext.compileScript(source, ctxtGlobal, nashornContext._strict);
+            return nashornContext.compileScript(source, ctxtGlobal);
         } catch (final Exception e) {
             throwAsScriptException(e);
             throw new AssertionError("should not reach here");
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Context.java b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
index 4f5cb1296fd..d220e29948c 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/Context.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
@@ -492,29 +492,11 @@ public final class Context {
      *
      * @param source the source
      * @param scope  the scope
-     * @param strict are we in strict mode
      *
      * @return top level function for script
      */
-    public ScriptFunction compileScript(final Source source, final ScriptObject scope, final boolean strict) {
-        return compileScript(source, scope, this.errors, strict);
-    }
-
-    /**
-     * Compile a top level script - no Source given, but an URL to
-     * load it from
-     *
-     * @param name    name of script/source
-     * @param url     URL to source
-     * @param scope   the scope
-     * @param strict  are we in strict mode
-     *
-     * @return top level function for the script
-     *
-     * @throws IOException if URL cannot be resolved
-     */
-    public ScriptFunction compileScript(final String name, final URL url, final ScriptObject scope, final boolean strict) throws IOException {
-        return compileScript(name, url, scope, this.errors, strict);
+    public ScriptFunction compileScript(final Source source, final ScriptObject scope) {
+        return compileScript(source, scope, this.errors);
     }
 
     /**
@@ -591,26 +573,25 @@ public final class Context {
      * expression
      *
      * @param scope  the scope
-     * @param source source expression for script
+     * @param from   source expression for script
      *
      * @return return value for load call (undefined)
      *
      * @throws IOException if source cannot be found or loaded
      */
-    public Object load(final ScriptObject scope, final Object source) throws IOException {
-        Object src = source;
-        URL url = null;
-        String srcName = null;
+    public Object load(final ScriptObject scope, final Object from) throws IOException {
+        Object src = (from instanceof ConsString)?  from.toString() : from;
+        Source source = null;
 
-        if (src instanceof ConsString) {
-            src = src.toString();
-        }
+        // load accepts a String (which could be a URL or a file name), a File, a URL
+        // or a ScriptObject that has "name" and "source" (string valued) properties.
         if (src instanceof String) {
-            srcName = (String)src;
+            String srcStr = (String)src;
             final File file = new File((String)src);
-            if (srcName.indexOf(':') != -1) {
+            if (srcStr.indexOf(':') != -1) {
                 try {
-                    url = new URL((String)src);
+                    final URL url = new URL((String)src);
+                    source = new Source(url.toString(), url);
                 } catch (final MalformedURLException e) {
                     // fallback URL - nashorn:foo.js - check under jdk/nashorn/internal/runtime/resources
                     final String str = (String)src;
@@ -618,7 +599,7 @@ public final class Context {
                         final String resource = "resources/" + str.substring("nashorn:".length());
                         // NOTE: even sandbox scripts should be able to load scripts in nashorn: scheme
                         // These scripts are always available and are loaded from nashorn.jar's resources.
-                        final Source code = AccessController.doPrivileged(
+                        source = AccessController.doPrivileged(
                                 new PrivilegedAction<Source>() {
                                     @Override
                                     public Source run() {
@@ -630,45 +611,32 @@ public final class Context {
                                         }
                                     }
                                 });
-                        if (code == null) {
-                            throw e;
-                        }
-                        return evaluateSource(code, scope, scope);
                     } else {
                         throw e;
                     }
                 }
             } else if (file.isFile()) {
-                url = file.toURI().toURL();
+                source = new Source(srcStr, file);
             }
-            src = url;
-        }
-
-        if (src instanceof File && ((File)src).isFile()) {
+        } else if (src instanceof File && ((File)src).isFile()) {
             final File file = (File)src;
-            url = file.toURI().toURL();
-            if (srcName == null) {
-                srcName = file.getCanonicalPath();
-            }
+            source = new Source(file.getName(), file);
         } else if (src instanceof URL) {
-            url = (URL)src;
-            if (srcName == null) {
-                srcName = url.toString();
-            }
-        }
-
-        if (url != null) {
-            assert srcName != null : "srcName null here!";
-            return evaluateSource(srcName, url, scope, scope);
+            final URL url = (URL)src;
+            source = new Source(url.toString(), url);
         } else if (src instanceof ScriptObject) {
             final ScriptObject sobj = (ScriptObject)src;
             if (sobj.has("script") && sobj.has("name")) {
                 final String script = JSType.toString(sobj.get("script"));
                 final String name   = JSType.toString(sobj.get("name"));
-                return evaluateSource(new Source(name, script), scope, scope);
+                source = new Source(name, script);
             }
         }
 
+        if (source != null) {
+            return evaluateSource(source, scope, scope);
+        }
+
         typeError("cant.load.script", ScriptRuntime.safeToString(source));
 
         return UNDEFINED;
@@ -850,23 +818,11 @@ public final class Context {
         return (context != null) ? context : Context.getContextTrusted();
     }
 
-    private Object evaluateSource(final String name, final URL url, final ScriptObject scope, final ScriptObject thiz) throws IOException {
-        ScriptFunction script = null;
-
-        try {
-            script = compileScript(name, url, scope, new Context.ThrowErrorManager(), _strict);
-        } catch (final ParserException e) {
-            e.throwAsEcmaException();
-        }
-
-        return ScriptRuntime.apply(script, thiz);
-    }
-
     private Object evaluateSource(final Source source, final ScriptObject scope, final ScriptObject thiz) {
         ScriptFunction script = null;
 
         try {
-            script = compileScript(source, scope, new Context.ThrowErrorManager(), _strict);
+            script = compileScript(source, scope, new Context.ThrowErrorManager());
         } catch (final ParserException e) {
             e.throwAsEcmaException();
         }
@@ -902,19 +858,11 @@ public final class Context {
         return ((GlobalObject)Context.getGlobalTrusted()).newScriptFunction(RUN_SCRIPT.tag(), runMethodHandle, scope, strict);
     }
 
-    private ScriptFunction compileScript(final String name, final URL url, final ScriptObject scope, final ErrorManager errMan, final boolean strict) throws IOException {
-        return getRunScriptFunction(compile(new Source(name, url), url, errMan, strict), scope);
+    private ScriptFunction compileScript(final Source source, final ScriptObject scope, final ErrorManager errMan) {
+        return getRunScriptFunction(compile(source, errMan, this._strict), scope);
     }
 
-    private ScriptFunction compileScript(final Source source, final ScriptObject scope, final ErrorManager errMan, final boolean strict) {
-        return getRunScriptFunction(compile(source, null, errMan, strict), scope);
-    }
-
-    private Class<?> compile(final Source source, final ErrorManager errMan, final boolean strict) {
-        return compile(source, null, errMan, strict);
-    }
-
-   private synchronized Class<?> compile(final Source source, final URL url, final ErrorManager errMan, final boolean strict) {
+    private synchronized Class<?> compile(final Source source, final ErrorManager errMan, final boolean strict) {
         // start with no errors, no warnings.
         errMan.reset();
 
@@ -935,6 +883,7 @@ public final class Context {
             return null;
         }
 
+        final URL url = source.getURL();
         final ScriptLoader loader = _loader_per_compile ? createNewLoader() : scriptLoader;
         final CodeSource   cs     = url == null ? null : new CodeSource(url, (CodeSigner[])null);
 
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Source.java b/nashorn/src/jdk/nashorn/internal/runtime/Source.java
index 822e0bb5242..1d093429f21 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/Source.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Source.java
@@ -71,13 +71,20 @@ public final class Source {
     /** Cached hash code */
     private int hash;
 
+    /** Source URL if available */
+    private final URL url;
+
     private static final int BUFSIZE = 8 * 1024;
 
-    private Source(final String name, final String base, final char[] content) {
+    // Do *not* make this public ever! Trusts the URL and content. So has to be called
+    // from other public constructors. Note that this can not be some init method as
+    // we initialize final fields from here.
+    private Source(final String name, final String base, final char[] content, final URL url) {
         this.name    = name;
         this.base    = base;
         this.content = content;
         this.length  = content.length;
+        this.url     = url;
     }
 
     /**
@@ -87,7 +94,7 @@ public final class Source {
      * @param content contents as char array
      */
     public Source(final String name, final char[] content) {
-        this(name, baseName(name, null), content);
+        this(name, baseName(name, null), content, null);
     }
 
     /**
@@ -109,7 +116,7 @@ public final class Source {
      * @throws IOException if source cannot be loaded
      */
     public Source(final String name, final URL url) throws IOException {
-        this(name, baseURL(url, null), readFully(url.openStream()));
+        this(name, baseURL(url, null), readFully(url.openStream()), url);
     }
 
     /**
@@ -121,7 +128,7 @@ public final class Source {
      * @throws IOException if source cannot be loaded
      */
     public Source(final String name, final File file) throws IOException {
-        this(name, dirName(file, null), readFully(file));
+        this(name, dirName(file, null), readFully(file), getURLFromFile(file));
     }
 
     @Override
@@ -205,6 +212,16 @@ public final class Source {
         return new String(content, start, end - start);
     }
 
+    /**
+     * Returns the source URL of this script Source. Can be null if Source
+     * was created from a String or a char[].
+     *
+     * @return URL source or null
+     */
+    public URL getURL() {
+        return url;
+    }
+
     /**
      * Find the beginning of the line containing position.
      * @param position Index to offending token.
@@ -288,7 +305,7 @@ public final class Source {
      * @return content
      */
     public char[] getContent() {
-        return content;
+        return content.clone();
     }
 
     /**
@@ -433,4 +450,12 @@ public final class Source {
     public String toString() {
         return getName();
     }
+
+    private static URL getURLFromFile(final File file) {
+        try {
+            return file.toURI().toURL();
+        } catch (final SecurityException | MalformedURLException ignored) {
+            return null;
+        }
+    }
 }
diff --git a/nashorn/src/jdk/nashorn/tools/Shell.java b/nashorn/src/jdk/nashorn/tools/Shell.java
index f4ea183763c..124e83c70c4 100644
--- a/nashorn/src/jdk/nashorn/tools/Shell.java
+++ b/nashorn/src/jdk/nashorn/tools/Shell.java
@@ -282,7 +282,7 @@ public class Shell {
             // For each file on the command line.
             for (final String fileName : files) {
                 final File file = new File(fileName);
-                ScriptFunction script = context.compileScript(fileName, file.toURI().toURL(), global, context._strict);
+                ScriptFunction script = context.compileScript(new Source(fileName, file.toURI().toURL()), global);
                 if (script == null || errors.getNumberOfErrors() != 0) {
                     return COMPILATION_ERROR;
                 }
diff --git a/nashorn/test/src/jdk/nashorn/internal/codegen/CompilerTest.java b/nashorn/test/src/jdk/nashorn/internal/codegen/CompilerTest.java
index 7e1c8715c76..adf361f4944 100644
--- a/nashorn/test/src/jdk/nashorn/internal/codegen/CompilerTest.java
+++ b/nashorn/test/src/jdk/nashorn/internal/codegen/CompilerTest.java
@@ -159,7 +159,7 @@ public class CompilerTest {
                 Context.setGlobal(global);
             }
             final Source source = new Source(file.getAbsolutePath(), buffer);
-            final ScriptFunction script = context.compileScript(source, global, context._strict);
+            final ScriptFunction script = context.compileScript(source, global);
             if (script == null || context.getErrorManager().getNumberOfErrors() > 0) {
                 log("Compile failed: " + file.getAbsolutePath());
                 failed++;
diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/ContextTest.java b/nashorn/test/src/jdk/nashorn/internal/runtime/ContextTest.java
index 396847661af..e894a371af2 100644
--- a/nashorn/test/src/jdk/nashorn/internal/runtime/ContextTest.java
+++ b/nashorn/test/src/jdk/nashorn/internal/runtime/ContextTest.java
@@ -111,7 +111,7 @@ public class ContextTest {
     private Object eval(final Context cx, final String name, final String code) {
         final Source source = new Source(name, code);
         final ScriptObject global = Context.getGlobal();
-        final ScriptFunction func = cx.compileScript(source, global, cx._strict);
+        final ScriptFunction func = cx.compileScript(source, global);
         return func != null ? ScriptRuntime.apply(func, global) : null;
     }
 
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/SharedContextEvaluator.java b/nashorn/test/src/jdk/nashorn/internal/test/framework/SharedContextEvaluator.java
index 305106b73d3..58557374e91 100644
--- a/nashorn/test/src/jdk/nashorn/internal/test/framework/SharedContextEvaluator.java
+++ b/nashorn/test/src/jdk/nashorn/internal/test/framework/SharedContextEvaluator.java
@@ -39,6 +39,7 @@ import jdk.nashorn.internal.runtime.ErrorManager;
 import jdk.nashorn.internal.runtime.ScriptFunction;
 import jdk.nashorn.internal.runtime.ScriptObject;
 import jdk.nashorn.internal.runtime.ScriptRuntime;
+import jdk.nashorn.internal.runtime.Source;
 import jdk.nashorn.internal.runtime.options.Options;
 
 /**
@@ -124,7 +125,7 @@ public final class SharedContextEvaluator implements ScriptEvaluator {
                     continue;
                 }
                 final File file = new File(fileName);
-                ScriptFunction script = context.compileScript(fileName, file.toURI().toURL(), global, context._strict);
+                ScriptFunction script = context.compileScript(new Source(fileName, file.toURI().toURL()), global);
                 if (script == null || errors.getNumberOfErrors() != 0) {
                     return COMPILATION_ERROR;
                 }

From 24b144ccd9f9de649d43d7f4ef49d23f620d75e5 Mon Sep 17 00:00:00 2001
From: Chris Hegarty <chegar@openjdk.org>
Date: Thu, 14 Feb 2013 13:01:03 +0000
Subject: [PATCH 142/311] 8008201: Add
 java/lang/Class/asSubclass/BasicUnit.java to the ProblemList

Reviewed-by: mcimadamore
---
 jdk/test/ProblemList.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt
index 840a9274293..7c621e00884 100644
--- a/jdk/test/ProblemList.txt
+++ b/jdk/test/ProblemList.txt
@@ -134,6 +134,9 @@ java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java	generic-all
 # 7196801
 java/lang/management/MemoryMXBean/LowMemoryTest2.sh		generic-all
 
+# 8008200
+java/lang/Class/asSubclass/BasicUnit.java                       generic-all
+
 ############################################################################
 
 # jdk_management

From 1930d1f090ff59cfbeda117ea9a8c6739f1c70a1 Mon Sep 17 00:00:00 2001
From: Peter Levart <peter.levary@gmail.com>
Date: Wed, 13 Feb 2013 14:50:14 -0800
Subject: [PATCH 143/311] 8008167:
 IdentityHashMap.[keySet|values|entrySet].toArray speed-up

Reviewed-by: mduigou, martin
---
 .../classes/java/util/IdentityHashMap.java    | 98 ++++++++++++++++---
 1 file changed, 85 insertions(+), 13 deletions(-)

diff --git a/jdk/src/share/classes/java/util/IdentityHashMap.java b/jdk/src/share/classes/java/util/IdentityHashMap.java
index 0a71e5bd5a9..f05bd144e04 100644
--- a/jdk/src/share/classes/java/util/IdentityHashMap.java
+++ b/jdk/src/share/classes/java/util/IdentityHashMap.java
@@ -25,6 +25,7 @@
 
 package java.util;
 import java.io.*;
+import java.lang.reflect.Array;
 
 /**
  * This class implements the <tt>Map</tt> interface with a hash table, using
@@ -1010,6 +1011,37 @@ public class IdentityHashMap<K,V>
                 result += System.identityHashCode(key);
             return result;
         }
+        public Object[] toArray() {
+            return toArray(new Object[size()]);
+        }
+        @SuppressWarnings("unchecked")
+        public <T> T[] toArray(T[] a) {
+            int expectedModCount = modCount;
+            int size = size();
+            if (a.length < size)
+                a = (T[]) Array.newInstance(a.getClass().getComponentType(), size);
+            Object[] tab = table;
+            int ti = 0;
+            for (int si = 0; si < tab.length; si += 2) {
+                Object key;
+                if ((key = tab[si]) != null) { // key present ?
+                    // more elements than expected -> concurrent modification from other thread
+                    if (ti >= size) {
+                        throw new ConcurrentModificationException();
+                    }
+                    a[ti++] = (T) unmaskNull(key); // unmask key
+                }
+            }
+            // fewer elements than expected or concurrent modification from other thread detected
+            if (ti < size || expectedModCount != modCount) {
+                throw new ConcurrentModificationException();
+            }
+            // final null marker as per spec
+            if (ti < a.length) {
+                a[ti] = null;
+            }
+            return a;
+        }
     }
 
     /**
@@ -1062,6 +1094,36 @@ public class IdentityHashMap<K,V>
         public void clear() {
             IdentityHashMap.this.clear();
         }
+        public Object[] toArray() {
+            return toArray(new Object[size()]);
+        }
+        @SuppressWarnings("unchecked")
+        public <T> T[] toArray(T[] a) {
+            int expectedModCount = modCount;
+            int size = size();
+            if (a.length < size)
+                a = (T[]) Array.newInstance(a.getClass().getComponentType(), size);
+            Object[] tab = table;
+            int ti = 0;
+            for (int si = 0; si < tab.length; si += 2) {
+                if (tab[si++] != null) { // key present ?
+                    // more elements than expected -> concurrent modification from other thread
+                    if (ti >= size) {
+                        throw new ConcurrentModificationException();
+                    }
+                    a[ti++] = (T) tab[si]; // copy value
+                }
+            }
+            // fewer elements than expected or concurrent modification from other thread detected
+            if (ti < size || expectedModCount != modCount) {
+                throw new ConcurrentModificationException();
+            }
+            // final null marker as per spec
+            if (ti < a.length) {
+                a[ti] = null;
+            }
+            return a;
+        }
     }
 
     /**
@@ -1149,25 +1211,35 @@ public class IdentityHashMap<K,V>
         }
 
         public Object[] toArray() {
-            int size = size();
-            Object[] result = new Object[size];
-            Iterator<Map.Entry<K,V>> it = iterator();
-            for (int i = 0; i < size; i++)
-                result[i] = new AbstractMap.SimpleEntry<>(it.next());
-            return result;
+            return toArray(new Object[size()]);
         }
 
         @SuppressWarnings("unchecked")
         public <T> T[] toArray(T[] a) {
+            int expectedModCount = modCount;
             int size = size();
             if (a.length < size)
-                a = (T[])java.lang.reflect.Array
-                    .newInstance(a.getClass().getComponentType(), size);
-            Iterator<Map.Entry<K,V>> it = iterator();
-            for (int i = 0; i < size; i++)
-                a[i] = (T) new AbstractMap.SimpleEntry<>(it.next());
-            if (a.length > size)
-                a[size] = null;
+                a = (T[]) Array.newInstance(a.getClass().getComponentType(), size);
+            Object[] tab = table;
+            int ti = 0;
+            for (int si = 0; si < tab.length; si += 2) {
+                Object key;
+                if ((key = tab[si]) != null) { // key present ?
+                    // more elements than expected -> concurrent modification from other thread
+                    if (ti >= size) {
+                        throw new ConcurrentModificationException();
+                    }
+                    a[ti++] = (T) new AbstractMap.SimpleEntry(unmaskNull(key), tab[si + 1]);
+                }
+            }
+            // fewer elements than expected or concurrent modification from other thread detected
+            if (ti < size || expectedModCount != modCount) {
+                throw new ConcurrentModificationException();
+            }
+            // final null marker as per spec
+            if (ti < a.length) {
+                a[ti] = null;
+            }
             return a;
         }
     }

From 9f6e3f08f2f1ac176e5a21ee18eaf349d6be3707 Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Thu, 14 Feb 2013 09:14:31 +0530
Subject: [PATCH 144/311] 8008193: test262 tests should be run with security
 manager enabled

Reviewed-by: jlaskey
---
 nashorn/make/build.xml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/nashorn/make/build.xml b/nashorn/make/build.xml
index fbf9a9e5dd2..d5264cc70be 100644
--- a/nashorn/make/build.xml
+++ b/nashorn/make/build.xml
@@ -317,7 +317,7 @@
       </java>
   </target>
 
-  <target name="test262" depends="jar, check-testng, check-external-tests, compile-test" if="testng.available">
+  <target name="test262" depends="jar, check-testng, check-external-tests, compile-test, generate-policy-file" if="testng.available">
     <fileset id="test.classes" dir="${build.test.classes.dir}">
        <include name="**/framework/*Test.class"/>
     </fileset>
@@ -325,7 +325,7 @@
     <testng outputdir="${build.test.results.dir}" classfilesetref="test.classes"
        verbose="${testng.verbose}" haltonfailure="true" useDefaultListeners="false" listeners="${testng.listeners}" workingDir="${basedir}">
       <jvmarg line="${ext.class.path}"/>
-      <jvmarg line="${run.test.jvmargs}"/>
+      <jvmarg line="${run.test.jvmargs} ${run.test.jvmsecurityargs}"/>
       <propertyset>
         <propertyref prefix="test262-test-sys-prop."/>
         <mapper from="test262-test-sys-prop.*" to="*" type="glob"/>
@@ -338,11 +338,14 @@
 
   <target name="test262parallel" depends="test262-parallel"/>
 
-  <target name="test262-parallel" depends="jar, check-testng, check-external-tests, compile-test" if="testng.available">
+  <target name="test262-parallel" depends="jar, check-testng, check-external-tests, compile-test, generate-policy-file" if="testng.available">
     <!-- use just build.test.classes.dir to avoid referring to TestNG -->
-    <java classname="${parallel.test.runner}" dir="${basedir}" classpath="${build.test.classes.dir}" fork="true">
+    <java classname="${parallel.test.runner}" dir="${basedir}" fork="true">
       <jvmarg line="${ext.class.path}"/>
-      <jvmarg line="${run.test.jvmargs}"/>
+      <jvmarg line="${run.test.jvmargs} ${run.test.jvmsecurityargs}"/>
+      <classpath>
+          <pathelement path="${run.test.classpath}"/>
+      </classpath>
       <syspropertyset>
           <propertyref prefix="test262-test-sys-prop."/>
           <mapper type="glob" from="test262-test-sys-prop.*" to="*"/>

From 022533a7498b793ae8de0f8660ebb3096a291f63 Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Thu, 14 Feb 2013 14:16:58 +0530
Subject: [PATCH 145/311] 8008197: Cross script engine function calls do not
 work as expected

Reviewed-by: lagergren, hannesw
---
 .../api/scripting/NashornScriptEngine.java    |  5 +-
 .../api/scripting/ScriptObjectMirror.java     | 57 ++++++++-------
 .../internal/runtime/ScriptFunction.java      |  2 +-
 .../internal/runtime/ScriptRuntime.java       | 31 +++++++++
 nashorn/test/script/basic/JDK-8008197.js      | 69 +++++++++++++++++++
 nashorn/test/script/basic/jquery.js           | 22 ++----
 6 files changed, 137 insertions(+), 49 deletions(-)
 create mode 100644 nashorn/test/script/basic/JDK-8008197.js

diff --git a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
index ded9afb7e6e..fa8c3814302 100644
--- a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
+++ b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
@@ -329,7 +329,7 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
         final ScriptObject ctxtGlobal    = getNashornGlobalFrom(context);
         final boolean globalChanged = (oldGlobal != ctxtGlobal);
 
-        Object self = selfObject;
+        Object self = globalChanged? ScriptObjectMirror.wrap(selfObject, oldGlobal) : selfObject;
 
         try {
             if (globalChanged) {
@@ -354,7 +354,8 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
             if (value instanceof ScriptFunction) {
                 final Object res;
                 try {
-                    res = ScriptRuntime.apply((ScriptFunction)value, self, ScriptObjectMirror.unwrapArray(args, ctxtGlobal));
+                    final Object[] modArgs = globalChanged? ScriptObjectMirror.wrapArray(args, oldGlobal) : args;
+                    res = ScriptRuntime.checkAndApply((ScriptFunction)value, self, ScriptObjectMirror.unwrapArray(modArgs, ctxtGlobal));
                 } catch (final Exception e) {
                     throwAsScriptException(e);
                     throw new AssertionError("should not reach here");
diff --git a/nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java b/nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java
index 2aa9ad184c5..266ce87f48d 100644
--- a/nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java
+++ b/nashorn/src/jdk/nashorn/api/scripting/ScriptObjectMirror.java
@@ -104,38 +104,30 @@ final class ScriptObjectMirror extends JSObject implements Bindings {
     // JSObject methods
     @Override
     public Object call(final String methodName, final Object args[]) {
-        final Object val = sobj.get(methodName);
         final ScriptObject oldGlobal = NashornScriptEngine.getNashornGlobal();
         final boolean globalChanged = (oldGlobal != global);
 
-        if (val instanceof ScriptFunction) {
-            final Object[] modifiedArgs = unwrapArray(args, global);
-            if (modifiedArgs != null) {
-                for (int i = 0; i < modifiedArgs.length; i++) {
-                    final Object arg = modifiedArgs[i];
-                    if (arg instanceof ScriptObject) {
-                        modifiedArgs[i] = wrap(arg, oldGlobal);
-                    }
-                }
+        try {
+            if (globalChanged) {
+                NashornScriptEngine.setNashornGlobal(global);
             }
 
-            try {
-                if (globalChanged) {
-                    NashornScriptEngine.setNashornGlobal(global);
-                }
-                return wrap(((ScriptFunction)val).invoke(sobj, modifiedArgs), global);
-            } catch (final RuntimeException | Error e) {
-                throw e;
-            } catch (final Throwable t) {
-                throw new RuntimeException(t);
-            } finally {
-                if (globalChanged) {
-                    NashornScriptEngine.setNashornGlobal(oldGlobal);
-                }
+            final Object val = sobj.get(methodName);
+            if (! (val instanceof ScriptFunction)) {
+                throw new RuntimeException("No such method: " + methodName);
             }
-       }
 
-       throw new RuntimeException("No such method: " + methodName);
+            final Object[] modArgs = globalChanged? wrapArray(args, oldGlobal) : args;
+            return wrap(ScriptRuntime.checkAndApply((ScriptFunction)val, sobj, unwrapArray(modArgs, global)), global);
+        } catch (final RuntimeException | Error e) {
+            throw e;
+        } catch (final Throwable t) {
+            throw new RuntimeException(t);
+        } finally {
+            if (globalChanged) {
+                NashornScriptEngine.setNashornGlobal(oldGlobal);
+            }
+        }
     }
 
     @Override
@@ -180,7 +172,7 @@ final class ScriptObjectMirror extends JSObject implements Bindings {
 
     @Override
     public void setMember(final String name, final Object value) {
-        put(name, wrap(value, NashornScriptEngine.getNashornGlobal()));
+        put(name, value);
     }
 
     @Override
@@ -275,20 +267,27 @@ final class ScriptObjectMirror extends JSObject implements Bindings {
 
     @Override
     public Object put(final String key, final Object value) {
+        final ScriptObject oldGlobal = NashornScriptEngine.getNashornGlobal();
+        final boolean globalChanged = (oldGlobal != global);
         return inGlobal(new Callable<Object>() {
             @Override public Object call() {
-                return sobj.put(key, unwrap(value, global));
+                final Object modValue = globalChanged? wrap(value, oldGlobal) : value;
+                return translateUndefined(wrap(sobj.put(key, unwrap(modValue, global)), global));
             }
         });
     }
 
     @Override
     public void putAll(final Map<? extends String, ? extends Object> map) {
+        final ScriptObject oldGlobal = NashornScriptEngine.getNashornGlobal();
+        final boolean globalChanged = (oldGlobal != global);
         final boolean strict = sobj.isStrictContext();
         inGlobal(new Callable<Object>() {
             @Override public Object call() {
                 for (final Map.Entry<? extends String, ? extends Object> entry : map.entrySet()) {
-                    sobj.set(entry.getKey(), unwrap(entry.getValue(), global), strict);
+                    final Object value = entry.getValue();
+                    final Object modValue = globalChanged? wrap(value, oldGlobal) : value;
+                    sobj.set(entry.getKey(), unwrap(modValue, global), strict);
                 }
                 return null;
             }
@@ -321,7 +320,7 @@ final class ScriptObjectMirror extends JSObject implements Bindings {
                 final Iterator<Object> iter   = sobj.valueIterator();
 
                 while (iter.hasNext()) {
-                    values.add(wrap(iter.next(), global));
+                    values.add(translateUndefined(wrap(iter.next(), global)));
                 }
 
                 return Collections.unmodifiableList(values);
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
index fb3b419e150..d0b24b2c80e 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
@@ -192,7 +192,7 @@ public abstract class ScriptFunction extends ScriptObject {
      * @return ScriptFunction result.
      * @throws Throwable if there is an exception/error with the invocation or thrown from it
      */
-    public Object invoke(final Object self, final Object... arguments) throws Throwable {
+    Object invoke(final Object self, final Object... arguments) throws Throwable {
         if (Context.DEBUG) {
             invokes++;
         }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java
index f491d388a91..3c910f4344c 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java
@@ -301,6 +301,37 @@ public final class ScriptRuntime {
         return global;
     }
 
+    /**
+     * Check that the target function is associated with current Context. And also make sure that 'self', if
+     * ScriptObject, is from current context.
+     *
+     * Call a function given self and args. If the number of the arguments is known in advance, you can likely achieve
+     * better performance by {@link Bootstrap#createDynamicInvoker(String, Class, Class...) creating a dynamic invoker}
+     * for operation {@code "dyn:call"}, then using its {@link MethodHandle#invokeExact(Object...)} method instead.
+     *
+     * @param target ScriptFunction object.
+     * @param self   Receiver in call.
+     * @param args   Call arguments.
+     * @return Call result.
+     */
+    public static Object checkAndApply(final ScriptFunction target, final Object self, final Object... args) {
+        final ScriptObject global = Context.getGlobalTrusted();
+        if (! (global instanceof GlobalObject)) {
+            throw new IllegalStateException("No current global set");
+        }
+
+        if (target.getContext() != global.getContext()) {
+            throw new IllegalArgumentException("'target' function is not from current Context");
+        }
+
+        if (self instanceof ScriptObject && ((ScriptObject)self).getContext() != global.getContext()) {
+            throw new IllegalArgumentException("'self' object is not from current Context");
+        }
+
+        // all in order - call real 'apply'
+        return apply(target, self, args);
+    }
+
     /**
      * Call a function given self and args. If the number of the arguments is known in advance, you can likely achieve
      * better performance by {@link Bootstrap#createDynamicInvoker(String, Class, Class...) creating a dynamic invoker}
diff --git a/nashorn/test/script/basic/JDK-8008197.js b/nashorn/test/script/basic/JDK-8008197.js
new file mode 100644
index 00000000000..e77a13a9ba1
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8008197.js
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8008197: Cross script engine function calls do not work as expected
+ *
+ * @test
+ * @run
+ */
+
+
+var m = new javax.script.ScriptEngineManager();
+var e = m.getEngineByName("nashorn");
+
+var obj = {
+    func: function(str) { 
+        return /hello/.exec(str);
+    }
+};
+
+// set our object as object to the engine created
+e.put("obj", obj);
+
+// try to invoke method from the other engine
+if (e.eval("obj.func('hello')") == null) {
+    fail("FAILED: #1 obj.func('hello') returns null");
+}
+
+// define an object in the engine
+ e.eval("var foo = { callMe: function(callback) { return callback() } }");
+
+// try to invoke a script method from here but callback is from this engine
+var res = e.invokeMethod(e.get("foo"), "callMe", function() {
+    return /nashorn/;
+});
+
+if (! res.exec("nashorn")) {
+    fail("FAILED: #2 /nashorn/ does not match 'nashorn'");
+}
+
+// invoke a script method from here with callback from this engine.
+// This uses JSObject.call interface
+res = e.get("foo").callMe(function() {
+    return /ecmascript/;
+});
+
+if (! res.exec("ecmascript")) {
+    fail("FAILED: #3 /ecmascript/ does not match 'ecmascript'");
+}
diff --git a/nashorn/test/script/basic/jquery.js b/nashorn/test/script/basic/jquery.js
index 16cb077d07c..f88d94b0235 100644
--- a/nashorn/test/script/basic/jquery.js
+++ b/nashorn/test/script/basic/jquery.js
@@ -60,23 +60,13 @@ function test_jquery(url) {
     var name;
     
     try {    
+	var split = url.split('/');
+	name = split[split.length - 1];
+	var path  = __DIR__ + "../external/jquery/" + name;
 	try {
-	    var split = url.split('/');
-	    name = split[split.length - 1];
-	    var path  = __DIR__ + "../external/jquery/" + name;
-	    try {
-		load(path);
-	    } catch (e) {
-		checkWindow(e);
-	    }
+	    load(path);
 	} catch (e) {
-	    // try to load it from the internet, if we for some licensing reason
-	    // aren't allowed to ship third party code under MIT license
-	    try {
-		load(url);
-	    } catch (e) {
-		checkWindow(e);
-	    }
+	    checkWindow(e);
 	}
     } catch (e) {
 	print("Unexpected exception " + e);
@@ -85,8 +75,6 @@ function test_jquery(url) {
     print("done " + name);
 }
 
-
-
 for each (url in urls) {
     test_jquery(url);
 }

From 7c466c84eb53948edc585ac82fb618dfc275770f Mon Sep 17 00:00:00 2001
From: Marcus Lagergren <lagergren@openjdk.org>
Date: Thu, 14 Feb 2013 13:01:52 +0100
Subject: [PATCH 146/311] 8008199: Lazy compilation and trampoline
 implementation

The code pipeline now supports lazy compilation, which can be used to only compile certain FunctionNodes and leave others be, saving startup time. When these uncompiled nodes are hit, a trampoline will force them to be recompiled. This can also be used to specialize compilation fixing parameter types and return types to a callsite specific compilation. This will give performance.

Reviewed-by: attila, sundar
---
 .../jdk/nashorn/internal/codegen/Attr.java    |  98 +-
 .../internal/codegen/ClassEmitter.java        |  45 +-
 .../internal/codegen/CodeGenerator.java       | 168 +--
 .../internal/codegen/CompilationPhase.java    | 366 +++++++
 .../nashorn/internal/codegen/CompileUnit.java |   4 +-
 .../nashorn/internal/codegen/Compiler.java    | 975 ++++++------------
 .../internal/codegen/ConstantData.java        |   2 +-
 .../internal/codegen/FinalizeTypes.java       |  30 +-
 .../internal/codegen/FoldConstants.java       |   5 +-
 .../internal/codegen/FunctionSignature.java   |  51 +-
 .../jdk/nashorn/internal/codegen/Lower.java   |  39 +-
 .../internal/codegen/SharedScopeCall.java     |   6 +-
 .../nashorn/internal/codegen/Splitter.java    |  49 +-
 .../nashorn/internal/codegen/WeighNodes.java  |   2 +-
 .../objects/FunctionObjectCreator.java        | 101 --
 .../codegen/objects/ObjectClassGenerator.java |   4 +-
 .../jdk/nashorn/internal/ir/FunctionNode.java | 117 ++-
 .../nashorn/internal/ir/debug/JSONWriter.java |   6 +-
 .../internal/ir/visitor/NodeVisitor.java      |   2 +-
 .../objects/BoundScriptFunctionImpl.java      |   2 +-
 .../jdk/nashorn/internal/objects/Global.java  |   2 +
 .../nashorn/internal/objects/NativeJava.java  |   1 +
 .../internal/objects/ScriptFunctionImpl.java  |   6 +-
 .../objects/ScriptFunctionTrampolineImpl.java | 122 +++
 .../jdk/nashorn/internal/parser/Lexer.java    |   7 +
 .../jdk/nashorn/internal/parser/Parser.java   |  74 +-
 .../internal/runtime/CodeInstaller.java       |  13 +-
 .../jdk/nashorn/internal/runtime/Context.java |  62 +-
 .../nashorn/internal/runtime/DebugLogger.java |   3 +
 .../internal/runtime/FindProperty.java        |   2 +-
 .../internal/runtime/ScriptFunction.java      |  32 +-
 .../internal/runtime/ScriptFunctionData.java  |  14 +-
 .../internal/runtime/ScriptingFunctions.java  |  20 +-
 nashorn/src/jdk/nashorn/tools/Shell.java      |  13 +-
 nashorn/test/script/trusted/JDK-8006529.js    |  20 +-
 .../nashorn/internal/parser/ParserTest.java   |   5 +-
 .../framework/SharedContextEvaluator.java     |   1 +
 37 files changed, 1425 insertions(+), 1044 deletions(-)
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/CompilationPhase.java
 delete mode 100644 nashorn/src/jdk/nashorn/internal/codegen/objects/FunctionObjectCreator.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionTrampolineImpl.java

diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Attr.java b/nashorn/src/jdk/nashorn/internal/codegen/Attr.java
index e3bd8ab3881..1752cfbd3f1 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Attr.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Attr.java
@@ -84,7 +84,6 @@ import jdk.nashorn.internal.runtime.Property;
 import jdk.nashorn.internal.runtime.PropertyMap;
 import jdk.nashorn.internal.runtime.ScriptFunction;
 import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.Source;
 
 /**
  * This is the attribution pass of the code generator. Attr takes Lowered IR,
@@ -102,11 +101,8 @@ import jdk.nashorn.internal.runtime.Source;
  */
 
 final class Attr extends NodeOperatorVisitor {
-    /** Current compiler. */
-    private final Compiler compiler;
-
-    /** Current source. */
-    private final Source source;
+    /** Context compiler. */
+    private final Context context;
 
     /**
      * Local definitions in current block (to discriminate from function
@@ -122,16 +118,16 @@ final class Attr extends NodeOperatorVisitor {
      */
     private Set<String> localUses;
 
-    private static final DebugLogger LOG = new DebugLogger("attr");
+    private static final DebugLogger LOG   = new DebugLogger("attr");
+    private static final boolean     DEBUG = LOG.isEnabled();
 
     /**
      * Constructor.
      *
      * @param compiler the compiler
      */
-    Attr(final Compiler compiler) {
-        this.compiler = compiler;
-        this.source   = compiler.getSource();
+    Attr(final Context context) {
+        this.context = context;
     }
 
     @Override
@@ -231,6 +227,11 @@ final class Attr extends NodeOperatorVisitor {
     @Override
     public Node enter(final FunctionNode functionNode) {
         start(functionNode, false);
+        if (functionNode.isLazy()) {
+            LOG.info("LAZY: " + functionNode.getName());
+            end(functionNode);
+            return null;
+        }
 
         clearLocalDefs();
         clearLocalUses();
@@ -257,7 +258,7 @@ final class Attr extends NodeOperatorVisitor {
         }
 
         if (functionNode.isScript()) {
-            initFromPropertyMap(compiler.getContext(), functionNode);
+            initFromPropertyMap(context, functionNode);
         }
 
         // Add function name as local symbol
@@ -378,7 +379,7 @@ final class Attr extends NodeOperatorVisitor {
                 final FunctionNode functionNode = (FunctionNode)symbol.getNode();
                 assert functionNode.getCalleeNode() != null;
 
-                final VarNode var = new VarNode(source, functionNode.getToken(), functionNode.getFinish(), functionNode.getIdent(), functionNode.getCalleeNode());
+                final VarNode var = new VarNode(functionNode.getSource(), functionNode.getToken(), functionNode.getFinish(), functionNode.getIdent(), functionNode.getCalleeNode());
                 //newTemporary(Type.OBJECT, var); //ScriptFunction? TODO
 
                 functionNode.setNeedsSelfSymbol(var);
@@ -489,15 +490,21 @@ final class Attr extends NodeOperatorVisitor {
         if (functionNode != null) {
             functionNode.addReferencingParentBlock(getCurrentBlock());
         }
-        end(referenceNode);
-
         return referenceNode;
     }
 
     @Override
     public Node leave(final ReferenceNode referenceNode) {
         newTemporary(Type.OBJECT, referenceNode); //reference node type is always an object, i.e. the scriptFunction. the function return type varies though
+
+        final FunctionNode functionNode = referenceNode.getReference();
+        //assert !functionNode.getType().isUnknown() || functionNode.isLazy() : functionNode.getType();
+        if (functionNode.isLazy()) {
+            LOG.info("Lazy function node call reference: " + functionNode.getName() + " => Promoting to OBJECT");
+            functionNode.setReturnType(Type.OBJECT);
+        }
         end(referenceNode);
+
         return referenceNode;
     }
 
@@ -546,7 +553,7 @@ final class Attr extends NodeOperatorVisitor {
             type = Type.OBJECT;
         }
 
-        switchNode.setTag(newInternal(compiler.uniqueName(SWITCH_TAG_PREFIX.tag()), type));
+        switchNode.setTag(newInternal(getCurrentFunctionNode().uniqueName(SWITCH_TAG_PREFIX.tag()), type));
 
         end(switchNode);
 
@@ -1111,7 +1118,7 @@ final class Attr extends NodeOperatorVisitor {
     @Override
     public Node leave(final ForNode forNode) {
         if (forNode.isForIn()) {
-            forNode.setIterator(newInternal(getCurrentFunctionNode(), compiler.uniqueName(ITERATOR_PREFIX.tag()), Type.OBJECT)); //NASHORN-73
+            forNode.setIterator(newInternal(getCurrentFunctionNode(), getCurrentFunctionNode().uniqueName(ITERATOR_PREFIX.tag()), Type.OBJECT)); //NASHORN-73
             /*
              * Iterators return objects, so we need to widen the scope of the
              * init variable if it, for example, has been assigned double type
@@ -1321,7 +1328,7 @@ final class Attr extends NodeOperatorVisitor {
     }
 
     private Symbol exceptionSymbol() {
-        return newInternal(compiler.uniqueName(EXCEPTION_PREFIX.tag()), Type.typeFor(ECMAException.class));
+        return newInternal(getCurrentFunctionNode().uniqueName(EXCEPTION_PREFIX.tag()), Type.typeFor(ECMAException.class));
     }
 
     /**
@@ -1382,6 +1389,11 @@ final class Attr extends NodeOperatorVisitor {
                     }
                 }
 
+                @Override
+                public Node enter(final FunctionNode node) {
+                    return node.isLazy() ? null : node;
+                }
+
                 /**
                  * Eg.
                  *
@@ -1553,17 +1565,19 @@ final class Attr extends NodeOperatorVisitor {
     }
 
     private Node start(final Node node, final boolean printNode) {
-        final StringBuilder sb = new StringBuilder();
+        if (DEBUG) {
+            final StringBuilder sb = new StringBuilder();
 
-        sb.append("[ENTER ").
-            append(name(node)).
-            append("] ").
-            append(printNode ? node.toString() : "").
-            append(" in '").
-            append(getCurrentFunctionNode().getName()).
-            append("'");
-        LOG.info(sb.toString());
-        LOG.indent();
+            sb.append("[ENTER ").
+                append(name(node)).
+                append("] ").
+                append(printNode ? node.toString() : "").
+                append(" in '").
+                append(getCurrentFunctionNode().getName()).
+                append("'");
+            LOG.info(sb.toString());
+            LOG.indent();
+        }
 
         return node;
     }
@@ -1573,24 +1587,26 @@ final class Attr extends NodeOperatorVisitor {
     }
 
     private Node end(final Node node, final boolean printNode) {
-        final StringBuilder sb = new StringBuilder();
+        if (DEBUG) {
+            final StringBuilder sb = new StringBuilder();
 
-        sb.append("[LEAVE ").
-            append(name(node)).
-            append("] ").
-            append(printNode ? node.toString() : "").
-            append(" in '").
-            append(getCurrentFunctionNode().getName());
+            sb.append("[LEAVE ").
+                append(name(node)).
+                append("] ").
+                append(printNode ? node.toString() : "").
+                append(" in '").
+                append(getCurrentFunctionNode().getName());
 
-        if (node.getSymbol() == null) {
-            sb.append(" <NO SYMBOL>");
-        } else {
-            sb.append(" <symbol=").append(node.getSymbol()).append('>');
+            if (node.getSymbol() == null) {
+                sb.append(" <NO SYMBOL>");
+            } else {
+                sb.append(" <symbol=").append(node.getSymbol()).append('>');
+            }
+
+            LOG.unindent();
+            LOG.info(sb.toString());
         }
 
-        LOG.unindent();
-        LOG.info(sb.toString());
-
         return node;
     }
 }
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/ClassEmitter.java b/nashorn/src/jdk/nashorn/internal/codegen/ClassEmitter.java
index 8ad8123822b..b9f645e47f5 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/ClassEmitter.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/ClassEmitter.java
@@ -52,6 +52,8 @@ import static jdk.nashorn.internal.codegen.CompilerConstants.methodDescriptor;
 import static jdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
 import static jdk.nashorn.internal.codegen.CompilerConstants.typeDescriptor;
 
+import java.io.ByteArrayOutputStream;
+import java.io.PrintWriter;
 import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.HashSet;
@@ -166,8 +168,8 @@ public class ClassEmitter implements Emitter {
      * @param unitClassName Compile unit class name.
      * @param strictMode    Should we generate this method in strict mode
      */
-    ClassEmitter(final Compiler compiler, final String unitClassName, final boolean strictMode) {
-        this(compiler.getContext(),
+    ClassEmitter(final Context context, final String sourceName, final String unitClassName, final boolean strictMode) {
+        this(context,
              new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS) {
                 private static final String OBJECT_CLASS  = "java/lang/Object";
 
@@ -187,12 +189,22 @@ public class ClassEmitter implements Emitter {
         this.unitClassName        = unitClassName;
         this.constantMethodNeeded = new HashSet<>();
 
-        cw.visit(V1_7, ACC_PUBLIC | ACC_SUPER, unitClassName, null, Compiler.pathName(jdk.nashorn.internal.scripts.JS$.class.getName()), null);
-        cw.visitSource(compiler.getSource().getName(), null);
+        cw.visit(V1_7, ACC_PUBLIC | ACC_SUPER, unitClassName, null, pathName(jdk.nashorn.internal.scripts.JS$.class.getName()), null);
+        cw.visitSource(sourceName, null);
 
         defineCommonStatics(strictMode);
     }
 
+    /**
+     * Convert a binary name to a package/class name.
+     *
+     * @param name Binary name.
+     * @return Package/class name.
+     */
+    private static String pathName(final String name) {
+        return name.replace('.', '/');
+    }
+
     /**
      * Define the static fields common in all scripts.
      * @param strictMode Should we generate this method in strict mode
@@ -295,7 +307,7 @@ public class ClassEmitter implements Emitter {
      * Ensure a get constant method is issued for the class.
      * @param cls Class of constant.
      */
-    public void needGetConstantMethod(final Class<?> cls) {
+    void needGetConstantMethod(final Class<?> cls) {
         constantMethodNeeded.add(cls);
     }
 
@@ -348,22 +360,15 @@ public class ClassEmitter implements Emitter {
 
     /**
      * Disassemble an array of byte code.
-     *
-     * @param context   the context
      * @param bytecode  byte array representing bytecode
+     * @return disassembly as human readable string
      */
-    public static void disassemble(final Context context, final byte[] bytecode) {
-        new ClassReader(bytecode).accept(new TraceClassVisitor(context.getErr()), 0);
-    }
-
-    /**
-     * Verify an array of byte code as a valid Java class
-     *
-     * @param context  the context
-     * @param bytecode the bytecode array
-     */
-    public static void verify(final Context context, final byte[] bytecode) {
-        context.verify(bytecode);
+    public static String disassemble(final byte[] bytecode) {
+        final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        try (final PrintWriter pw = new PrintWriter(baos)) {
+            new ClassReader(bytecode).accept(new TraceClassVisitor(pw), 0);
+        }
+        return new String(baos.toByteArray());
     }
 
     /**
@@ -459,7 +464,7 @@ public class ClassEmitter implements Emitter {
         final MethodVisitor mv = cw.visitMethod(
             ACC_PUBLIC | ACC_STATIC | (functionNode.isVarArg() ? ACC_VARARGS : 0),
             functionNode.getName(),
-            FunctionSignature.functionSignature(functionNode),
+            new FunctionSignature(functionNode).toString(),
             null,
             null);
 
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
index da7c72147c1..544d8c5ebb7 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
@@ -25,8 +25,10 @@
 
 package jdk.nashorn.internal.codegen;
 
+import static jdk.nashorn.internal.codegen.ClassEmitter.Flag.HANDLE_STATIC;
 import static jdk.nashorn.internal.codegen.ClassEmitter.Flag.PRIVATE;
 import static jdk.nashorn.internal.codegen.ClassEmitter.Flag.STATIC;
+import static jdk.nashorn.internal.codegen.CompilerConstants.ALLOCATE;
 import static jdk.nashorn.internal.codegen.CompilerConstants.GET_MAP;
 import static jdk.nashorn.internal.codegen.CompilerConstants.GET_STRING;
 import static jdk.nashorn.internal.codegen.CompilerConstants.LEAF;
@@ -35,6 +37,7 @@ import static jdk.nashorn.internal.codegen.CompilerConstants.REGEX_PREFIX;
 import static jdk.nashorn.internal.codegen.CompilerConstants.SCOPE;
 import static jdk.nashorn.internal.codegen.CompilerConstants.SPLIT_ARRAY_ARG;
 import static jdk.nashorn.internal.codegen.CompilerConstants.SPLIT_PREFIX;
+import static jdk.nashorn.internal.codegen.CompilerConstants.constructorNoLookup;
 import static jdk.nashorn.internal.codegen.CompilerConstants.interfaceCallNoLookup;
 import static jdk.nashorn.internal.codegen.CompilerConstants.methodDescriptor;
 import static jdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
@@ -48,6 +51,7 @@ import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALL
 import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_STRICT;
 
 import java.io.PrintWriter;
+import java.lang.invoke.MethodHandle;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.EnumSet;
@@ -63,8 +67,8 @@ import jdk.nashorn.internal.codegen.MethodEmitter.Condition;
 import jdk.nashorn.internal.codegen.MethodEmitter.Label;
 import jdk.nashorn.internal.codegen.RuntimeCallSite.SpecializedRuntimeNode;
 import jdk.nashorn.internal.codegen.objects.FieldObjectCreator;
-import jdk.nashorn.internal.codegen.objects.FunctionObjectCreator;
 import jdk.nashorn.internal.codegen.objects.MapCreator;
+import jdk.nashorn.internal.codegen.objects.ObjectCreator;
 import jdk.nashorn.internal.codegen.objects.ObjectMapCreator;
 import jdk.nashorn.internal.codegen.types.ArrayType;
 import jdk.nashorn.internal.codegen.types.Type;
@@ -111,11 +115,13 @@ import jdk.nashorn.internal.ir.visitor.NodeOperatorVisitor;
 import jdk.nashorn.internal.ir.visitor.NodeVisitor;
 import jdk.nashorn.internal.parser.Lexer.RegexToken;
 import jdk.nashorn.internal.parser.TokenType;
+import jdk.nashorn.internal.runtime.CodeInstaller;
 import jdk.nashorn.internal.runtime.Context;
 import jdk.nashorn.internal.runtime.ECMAException;
 import jdk.nashorn.internal.runtime.PropertyMap;
 import jdk.nashorn.internal.runtime.Scope;
 import jdk.nashorn.internal.runtime.ScriptFunction;
+import jdk.nashorn.internal.runtime.ScriptFunctionData;
 import jdk.nashorn.internal.runtime.ScriptObject;
 import jdk.nashorn.internal.runtime.ScriptRuntime;
 import jdk.nashorn.internal.runtime.Source;
@@ -143,11 +149,17 @@ import jdk.nashorn.internal.runtime.linker.LinkerCallSite;
  */
 public final class CodeGenerator extends NodeOperatorVisitor {
 
-    /** Current compiler */
-    private final Compiler compiler;
+    /** Name of the Global object, cannot be referred to as .class, @see CodeGenerator */
+    private static final String GLOBAL_OBJECT = Compiler.OBJECTS_PACKAGE + '/' + "Global";
 
-    /** Compiler context */
-    private final Context context;
+    /** Name of the ScriptFunctionImpl, cannot be referred to as .class @see FunctionObjectCreator */
+    private static final String SCRIPTFUNCTION_IMPL_OBJECT = Compiler.OBJECTS_PACKAGE + '/' + "ScriptFunctionImpl";
+
+    private static final String SCRIPTFUNCTION_TRAMPOLINE_OBJECT = Compiler.OBJECTS_PACKAGE + '/' + "ScriptFunctionTrampolineImpl";
+
+    /** Constant data & installation. The only reason the compiler keeps this is because it is assigned
+     *  by reflection in class installation */
+    private final Compiler compiler;
 
     /** Call site flags given to the code generator to be used for all generated call sites */
     private final int callSiteFlags;
@@ -168,17 +180,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
      */
     CodeGenerator(final Compiler compiler) {
         this.compiler      = compiler;
-        this.context       = compiler.getContext();
-        this.callSiteFlags = context._callsite_flags;
-    }
-
-    /**
-     * Get the compiler
-     *
-     * @return the compiler used
-     */
-    public Compiler getCompiler() {
-        return compiler;
+        this.callSiteFlags = compiler.getContext()._callsite_flags;
     }
 
     /**
@@ -320,7 +322,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
          */
         final CodeGenerator codegen = this;
 
-        node.accept(new NodeVisitor(compileUnit, method) {
+        node.accept(new NodeVisitor(getCurrentCompileUnit(), method) {
             @Override
             public Node enter(final IdentNode identNode) {
                 loadIdent(identNode);
@@ -534,7 +536,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
         final FunctionNode currentFunction = getCurrentFunctionNode();
         final Block        currentBlock    = getCurrentBlock();
 
-        function.accept(new NodeVisitor(compileUnit, method) {
+        function.accept(new NodeVisitor(getCurrentCompileUnit(), method) {
 
             private void sharedScopeCall(final IdentNode identNode, final int flags) {
                 final Symbol symbol = identNode.getSymbol();
@@ -651,7 +653,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
                 final String signature = new FunctionSignature(true, callee.needsCallee(), callee.getReturnType(), isVarArg ? null : callee.getParameters()).toString();
 
                 if (callee.needsCallee()) {
-                    new FunctionObjectCreator(CodeGenerator.this, callee).makeObject(method);
+                    newFunctionObject(callee);
                 }
 
                 if (callee.isStrictMode()) { // self is undefined
@@ -969,14 +971,18 @@ public final class CodeGenerator extends NodeOperatorVisitor {
 
     @Override
     public Node enter(final FunctionNode functionNode) {
+        if (functionNode.isLazy()) {
+            return null;
+        }
+
         if (functionNode.testResolved()) {
             return null;
         }
 
-        compileUnit = functionNode.getCompileUnit();
-        assert compileUnit != null;
+        setCurrentCompileUnit(functionNode.getCompileUnit());
+        assert getCurrentCompileUnit() != null;
 
-        method = compileUnit.getClassEmitter().method(functionNode);
+        method = getCurrentCompileUnit().getClassEmitter().method(functionNode);
         functionNode.setMethodEmitter(method);
         // Mark end for variable tables.
         method.begin();
@@ -1100,18 +1106,18 @@ public final class CodeGenerator extends NodeOperatorVisitor {
         final Type elementType = arrayType.getElementType();
 
         if (units != null) {
-            final CompileUnit   savedCompileUnit = compileUnit;
-            final MethodEmitter savedMethod      = method;
+            final CompileUnit   savedCompileUnit = getCurrentCompileUnit();
+            final MethodEmitter savedMethod      = getCurrentMethodEmitter();
 
             try {
                 for (final ArrayUnit unit : units) {
-                    compileUnit = unit.getCompileUnit();
+                    setCurrentCompileUnit(unit.getCompileUnit());
 
-                    final String className = compileUnit.getUnitClassName();
-                    final String name      = compiler.uniqueName(SPLIT_PREFIX.tag());
+                    final String className = getCurrentCompileUnit().getUnitClassName();
+                    final String name      = getCurrentFunctionNode().uniqueName(SPLIT_PREFIX.tag());
                     final String signature = methodDescriptor(type, Object.class, ScriptFunction.class, ScriptObject.class, type);
 
-                    method = compileUnit.getClassEmitter().method(EnumSet.of(Flag.PUBLIC, Flag.STATIC), name, signature);
+                    method = getCurrentCompileUnit().getClassEmitter().method(EnumSet.of(Flag.PUBLIC, Flag.STATIC), name, signature);
                     method.setFunctionNode(getCurrentFunctionNode());
                     method.begin();
 
@@ -1135,8 +1141,8 @@ public final class CodeGenerator extends NodeOperatorVisitor {
                     savedMethod.invokeStatic(className, name, signature);
                 }
             } finally {
-                compileUnit = savedCompileUnit;
-                method      = savedMethod;
+                setCurrentCompileUnit(savedCompileUnit);
+                setCurrentMethodEmitter(savedMethod);
             }
 
             return method;
@@ -1186,8 +1192,8 @@ public final class CodeGenerator extends NodeOperatorVisitor {
      * @param string string to load
      */
     public void loadConstant(final String string) {
-        final String       unitClassName = compileUnit.getUnitClassName();
-        final ClassEmitter classEmitter  = compileUnit.getClassEmitter();
+        final String       unitClassName = getCurrentCompileUnit().getUnitClassName();
+        final ClassEmitter classEmitter  = getCurrentCompileUnit().getClassEmitter();
         final int          index         = compiler.getConstantData().add(string);
 
         method.load(index);
@@ -1202,8 +1208,8 @@ public final class CodeGenerator extends NodeOperatorVisitor {
      * @param object object to load
      */
     public void loadConstant(final Object object) {
-        final String       unitClassName = compileUnit.getUnitClassName();
-        final ClassEmitter classEmitter  = compileUnit.getClassEmitter();
+        final String       unitClassName = getCurrentCompileUnit().getUnitClassName();
+        final ClassEmitter classEmitter  = getCurrentCompileUnit().getClassEmitter();
         final int          index         = compiler.getConstantData().add(object);
         final Class<?>     cls           = object.getClass();
 
@@ -1272,14 +1278,14 @@ public final class CodeGenerator extends NodeOperatorVisitor {
             return loadRegexToken(regexToken);
         }
         // emit field
-        final String       regexName    = compiler.uniqueName(REGEX_PREFIX.tag());
-        final ClassEmitter classEmitter = compileUnit.getClassEmitter();
+        final String       regexName    = getCurrentFunctionNode().uniqueName(REGEX_PREFIX.tag());
+        final ClassEmitter classEmitter = getCurrentCompileUnit().getClassEmitter();
 
         classEmitter.field(EnumSet.of(PRIVATE, STATIC), regexName, Object.class);
         regexFieldCount++;
 
         // get field, if null create new regex, finally clone regex object
-        method.getStatic(compileUnit.getUnitClassName(), regexName, typeDescriptor(Object.class));
+        method.getStatic(getCurrentCompileUnit().getUnitClassName(), regexName, typeDescriptor(Object.class));
         method.dup();
         final Label cachedLabel = new Label("cached");
         method.ifnonnull(cachedLabel);
@@ -1287,7 +1293,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
         method.pop();
         loadRegexToken(regexToken);
         method.dup();
-        method.putStatic(compileUnit.getUnitClassName(), regexName, typeDescriptor(Object.class));
+        method.putStatic(getCurrentCompileUnit().getUnitClassName(), regexName, typeDescriptor(Object.class));
 
         method.label(cachedLabel);
         globalRegExpCopy();
@@ -1409,7 +1415,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
             return null;
         }
 
-        new FunctionObjectCreator(this, referenceNode.getReference()).makeObject(method);
+        newFunctionObject(referenceNode.getReference());
 
         return null;
     }
@@ -1551,6 +1557,10 @@ public final class CodeGenerator extends NodeOperatorVisitor {
         return true;
     }
 
+    private static boolean isReducible(final Request request) {
+        return Request.isComparison(request) || request == Request.ADD;
+    }
+
     @Override
     public Node enter(final RuntimeNode runtimeNode) {
         if (runtimeNode.testResolved()) {
@@ -1563,9 +1573,10 @@ public final class CodeGenerator extends NodeOperatorVisitor {
          *
          * TODO - remove this - Access Specializer will always know after Attr/Lower
          */
-        if (runtimeNode.isPrimitive() && !runtimeNode.isFinal()) {
+        if (runtimeNode.isPrimitive() && !runtimeNode.isFinal() && isReducible(runtimeNode.getRequest())) {
             final Node lhs = runtimeNode.getArgs().get(0);
-            final Node rhs = runtimeNode.getArgs().size() > 1 ? runtimeNode.getArgs().get(1) : null;
+            assert runtimeNode.getArgs().size() > 1 : runtimeNode + " must have two args";
+            final Node rhs = runtimeNode.getArgs().get(1);
 
             final Type   type   = runtimeNode.getType();
             final Symbol symbol = runtimeNode.getSymbol();
@@ -1709,7 +1720,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
             method.end();
         } catch (final Throwable t) {
             Context.printStackTrace(t);
-            final VerifyError e = new VerifyError("Code generation bug in \"" + splitNode.getName() + "\": likely stack misaligned: " + t + " " + compiler.getSource().getName());
+            final VerifyError e = new VerifyError("Code generation bug in \"" + splitNode.getName() + "\": likely stack misaligned: " + t + " " + getCurrentFunctionNode().getSource().getName());
             e.initCause(t);
             throw e;
         }
@@ -1898,7 +1909,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
         method._new(ECMAException.class).dup();
 
         final Node   expression = throwNode.getExpression();
-        final Source source     = compiler.getSource();
+        final Source source     = throwNode.getSource();
         final int    position   = throwNode.position();
         final int    line       = source.getLine(position);
         final int    column     = source.getColumn(position);
@@ -2928,7 +2939,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
         if (scopeCalls.containsKey(scopeCall)) {
             return scopeCalls.get(scopeCall);
         }
-        scopeCall.setClassAndName(compileUnit, compiler);
+        scopeCall.setClassAndName(getCurrentCompileUnit(), getCurrentFunctionNode().uniqueName("scopeCall"));
         scopeCalls.put(scopeCall, scopeCall);
         return scopeCall;
     }
@@ -2947,7 +2958,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
         if (scopeCalls.containsKey(scopeCall)) {
             return scopeCalls.get(scopeCall);
         }
-        scopeCall.setClassAndName(compileUnit, compiler);
+        scopeCall.setClassAndName(getCurrentCompileUnit(), getCurrentFunctionNode().uniqueName("scopeCall"));
         scopeCalls.put(scopeCall, scopeCall);
         return scopeCall;
     }
@@ -2959,12 +2970,12 @@ public final class CodeGenerator extends NodeOperatorVisitor {
      * @param ident identifier for block or function where applicable
      */
     private void printSymbols(final Block block, final String ident) {
-        if (!context._print_symbols) {
+        if (!compiler.getContext()._print_symbols) {
             return;
         }
 
         @SuppressWarnings("resource")
-        final PrintWriter out = context.getErr();
+        final PrintWriter out = compiler.getContext().getErr();
         out.println("[BLOCK in '" + ident + "']");
         if (!block.printSymbols(out)) {
             out.println("<no symbols>");
@@ -3057,7 +3068,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
              * on the stack throughout the store and used at the end to execute it
              */
 
-            target.accept(new NodeVisitor(compileUnit, method) {
+            target.accept(new NodeVisitor(getCurrentCompileUnit(), method) {
                 @Override
                 public Node enter(final IdentNode node) {
                     if (targetSymbol.isScope()) {
@@ -3124,7 +3135,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
          * @return the quick symbol
          */
         private Symbol quickSymbol(final Type type, final String prefix) {
-            final String name = compiler.uniqueName(prefix);
+            final String name = getCurrentFunctionNode().uniqueName(prefix);
             final Symbol symbol = new Symbol(name, IS_TEMP | IS_INTERNAL, null, null);
 
             symbol.setType(type);
@@ -3166,7 +3177,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
              */
             method.convert(target.getType());
 
-            target.accept(new NodeVisitor(compileUnit, method) {
+            target.accept(new NodeVisitor(getCurrentCompileUnit(), method) {
                 @Override
                 protected Node enterDefault(Node node) {
                     throw new AssertionError("Unexpected node " + node + " in store epilogue");
@@ -3228,42 +3239,83 @@ public final class CodeGenerator extends NodeOperatorVisitor {
 
     }
 
+    private void newFunctionObject(final FunctionNode functionNode) {
+        final boolean isLazy = functionNode.isLazy();
+        final Class<?>[] cparams = new Class<?>[] { ScriptFunctionData.class, ScriptObject.class, MethodHandle.class };
+
+        new ObjectCreator(this, new ArrayList<String>(), new ArrayList<Symbol>(), false, false) {
+            @Override
+            public void makeObject(final MethodEmitter method) {
+                final String className = isLazy ? SCRIPTFUNCTION_TRAMPOLINE_OBJECT : SCRIPTFUNCTION_IMPL_OBJECT;
+
+                method._new(className).dup();
+                if (isLazy) {
+                    loadConstant(compiler.getCodeInstaller());
+                    loadConstant(functionNode);
+                } else {
+                    final String signature = new FunctionSignature(true, functionNode.needsCallee(), functionNode.getReturnType(), functionNode.isVarArg() ? null : functionNode.getParameters()).toString();
+                    method.loadHandle(functionNode.getCompileUnit().getUnitClassName(), functionNode.getName(), signature, EnumSet.of(HANDLE_STATIC)); // function
+                }
+                loadConstant(new ScriptFunctionData(functionNode, makeMap()));
+
+                if (isLazy || functionNode.needsParentScope()) {
+                    method.loadScope();
+                } else {
+                    method.loadNull();
+                }
+
+                method.loadHandle(getClassName(), ALLOCATE.tag(), methodDescriptor(ScriptObject.class, PropertyMap.class), EnumSet.of(HANDLE_STATIC));
+
+                final List<Class<?>> cparamList = new ArrayList<>();
+                if (isLazy) {
+                    cparamList.add(CodeInstaller.class);
+                    cparamList.add(FunctionNode.class);
+                } else {
+                    cparamList.add(MethodHandle.class);
+                }
+                cparamList.addAll(Arrays.asList(cparams));
+
+                method.invoke(constructorNoLookup(className, cparamList.toArray(new Class<?>[cparamList.size()])));
+            }
+        }.makeObject(method);
+    }
+
     /*
      * Globals are special. We cannot refer to any Global (or NativeObject) class by .class, as they are different
      * for different contexts. As far as I can tell, the only NativeObject that we need to deal with like this
      * is from the code pipeline is Global
      */
     private MethodEmitter globalInstance() {
-        return method.invokeStatic(Compiler.GLOBAL_OBJECT, "instance", "()L" + Compiler.GLOBAL_OBJECT + ';');
+        return method.invokeStatic(GLOBAL_OBJECT, "instance", "()L" + GLOBAL_OBJECT + ';');
     }
 
     private MethodEmitter globalObjectPrototype() {
-        return method.invokeStatic(Compiler.GLOBAL_OBJECT, "objectPrototype", methodDescriptor(ScriptObject.class));
+        return method.invokeStatic(GLOBAL_OBJECT, "objectPrototype", methodDescriptor(ScriptObject.class));
     }
 
     private MethodEmitter globalAllocateArguments() {
-        return method.invokeStatic(Compiler.GLOBAL_OBJECT, "allocateArguments", methodDescriptor(ScriptObject.class, Object[].class, Object.class, int.class));
+        return method.invokeStatic(GLOBAL_OBJECT, "allocateArguments", methodDescriptor(ScriptObject.class, Object[].class, Object.class, int.class));
     }
 
     private MethodEmitter globalNewRegExp() {
-        return method.invokeStatic(Compiler.GLOBAL_OBJECT, "newRegExp", methodDescriptor(Object.class, String.class, String.class));
+        return method.invokeStatic(GLOBAL_OBJECT, "newRegExp", methodDescriptor(Object.class, String.class, String.class));
     }
 
     private MethodEmitter globalRegExpCopy() {
-        return method.invokeStatic(Compiler.GLOBAL_OBJECT, "regExpCopy", methodDescriptor(Object.class, Object.class));
+        return method.invokeStatic(GLOBAL_OBJECT, "regExpCopy", methodDescriptor(Object.class, Object.class));
     }
 
     private MethodEmitter globalAllocateArray(final ArrayType type) {
         //make sure the native array is treated as an array type
-        return method.invokeStatic(Compiler.GLOBAL_OBJECT, "allocate", "(" + type.getDescriptor() + ")Ljdk/nashorn/internal/objects/NativeArray;");
+        return method.invokeStatic(GLOBAL_OBJECT, "allocate", "(" + type.getDescriptor() + ")Ljdk/nashorn/internal/objects/NativeArray;");
     }
 
     private MethodEmitter globalIsEval() {
-        return method.invokeStatic(Compiler.GLOBAL_OBJECT, "isEval", methodDescriptor(boolean.class, Object.class));
+        return method.invokeStatic(GLOBAL_OBJECT, "isEval", methodDescriptor(boolean.class, Object.class));
     }
 
     private MethodEmitter globalDirectEval() {
-        return method.invokeStatic(Compiler.GLOBAL_OBJECT, "directEval",
+        return method.invokeStatic(GLOBAL_OBJECT, "directEval",
                 methodDescriptor(Object.class, Object.class, Object.class, Object.class, Object.class, Object.class));
     }
 }
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CompilationPhase.java b/nashorn/src/jdk/nashorn/internal/codegen/CompilationPhase.java
new file mode 100644
index 00000000000..4d41e57ac8e
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CompilationPhase.java
@@ -0,0 +1,366 @@
+package jdk.nashorn.internal.codegen;
+
+import static jdk.nashorn.internal.ir.FunctionNode.CompilationState.ATTR;
+import static jdk.nashorn.internal.ir.FunctionNode.CompilationState.CONSTANT_FOLDED;
+import static jdk.nashorn.internal.ir.FunctionNode.CompilationState.EMITTED;
+import static jdk.nashorn.internal.ir.FunctionNode.CompilationState.FINALIZED;
+import static jdk.nashorn.internal.ir.FunctionNode.CompilationState.INITIALIZED;
+import static jdk.nashorn.internal.ir.FunctionNode.CompilationState.LOWERED;
+import static jdk.nashorn.internal.ir.FunctionNode.CompilationState.SPLIT;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.EnumSet;
+import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.ir.FunctionNode;
+import jdk.nashorn.internal.ir.FunctionNode.CompilationState;
+import jdk.nashorn.internal.ir.Node;
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.ir.debug.ASTWriter;
+import jdk.nashorn.internal.ir.debug.PrintVisitor;
+import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.runtime.ECMAErrors;
+
+/**
+ * A compilation phase is a step in the processes of turning a JavaScript FunctionNode
+ * into bytecode. It has an optional return value.
+ */
+enum CompilationPhase {
+
+    /*
+     * Lazy initialization - tag all function nodes not the script as lazy as
+     * default policy. The will get trampolines and only be generated when
+     * called
+     */
+    LAZY_INITIALIZATION_PHASE(EnumSet.of(FunctionNode.CompilationState.INITIALIZED)) {
+        @Override
+        boolean transform(final Compiler compiler, final FunctionNode fn) {
+
+            /*
+             * For lazy compilation, we might be given a node previously marked as lazy
+             * to compile as the outermost function node in the compiler. Unmark it
+             * so it can be compiled and not cause recursion. Make sure the return type
+             * is unknown so it can be correctly deduced. Return types are always
+             * Objects in Lazy nodes as we haven't got a change to generate code for
+             * them and decude its parameter specialization
+             *
+             * TODO: in the future specializations from a callsite will be passed here
+             * so we can generate a better non-lazy version of a function from a trampoline
+             */
+            //compute the signature from the callsite - todo - now just clone object params
+            final FunctionNode outermostFunctionNode = compiler.getFunctionNode();
+            outermostFunctionNode.setIsLazy(false);
+            outermostFunctionNode.setReturnType(Type.UNKNOWN);
+
+            outermostFunctionNode.accept(new NodeVisitor() {
+                @Override
+                public Node enter(final FunctionNode node) {
+                    assert Compiler.LAZY_JIT;
+                    node.setIsLazy(node != outermostFunctionNode);
+                    return node;
+                }
+            });
+            return true;
+        }
+
+        @Override
+        public String toString() {
+            return "[Lazy JIT Initialization]";
+        }
+    },
+
+    /*
+     * Constant folding pass
+     *   Simple constant folding that will make elementary constructs go away
+     */
+    CONSTANT_FOLDING_PHASE(EnumSet.of(INITIALIZED), CONSTANT_FOLDED) {
+        @Override
+        boolean transform(final Compiler compiler, final FunctionNode fn) {
+            final Context context = compiler.getContext();
+
+            if (context._print_ast) {
+                context.getErr().println(new ASTWriter(fn));
+            }
+
+            if (context._print_parse) {
+                context.getErr().println(new PrintVisitor(fn));
+            }
+
+            fn.accept(new FoldConstants());
+
+            return true;
+        }
+
+        @Override
+        public String toString() {
+            return "[Constant Folding]";
+        }
+    },
+
+    /*
+     * Lower (Control flow pass)
+     *   Finalizes the control flow. Clones blocks for finally constructs and
+     *   similar things. Establishes termination criteria for nodes
+     *   Guarantee return instructions to method making sure control flow
+     *   cannot fall off the end. Replacing high level nodes with lower such
+     *   as runtime nodes where applicable.
+     *
+     */
+    LOWERING_PHASE(EnumSet.of(INITIALIZED, CONSTANT_FOLDED), LOWERED) {
+        @Override
+        boolean transform(final Compiler compiler, final FunctionNode fn) {
+            fn.accept(new Lower());
+            return true;
+        }
+
+        @Override
+        public String toString() {
+            return "[Control Flow Lowering]";
+        }
+    },
+
+    /*
+     * Attribution
+     *   Assign symbols and types to all nodes.
+     */
+    ATTRIBUTION_PHASE(EnumSet.of(INITIALIZED, CONSTANT_FOLDED, LOWERED), ATTR) {
+        @Override
+        boolean transform(final Compiler compiler, final FunctionNode fn) {
+            final Context context = compiler.getContext();
+            try {
+                fn.accept(new Attr(context));
+                return true;
+            } finally {
+                if (context._print_lower_ast) {
+                    context.getErr().println(new ASTWriter(fn));
+                }
+
+                if (context._print_lower_parse) {
+                    context.getErr().println(new PrintVisitor(fn));
+                }
+            }
+        }
+
+        @Override
+        public String toString() {
+            return "[Type Attribution]";
+        }
+    },
+
+    /*
+     * Splitter
+     *   Split the AST into several compile units based on a size heuristic
+     *   Splitter needs attributed AST for weight calculations (e.g. is
+     *   a + b a ScriptRuntime.ADD with call overhead or a dadd with much
+     *   less). Split IR can lead to scope information being changed.
+     */
+    SPLITTING_PHASE(EnumSet.of(INITIALIZED, CONSTANT_FOLDED, LOWERED, ATTR), SPLIT) {
+        @Override
+        boolean transform(final Compiler compiler, final FunctionNode fn) {
+            final CompileUnit outermostCompileUnit = compiler.addCompileUnit(compiler.firstCompileUnitName());
+
+            new Splitter(compiler, fn, outermostCompileUnit).split();
+
+            assert fn.getCompileUnit() == outermostCompileUnit : "fn.compileUnit (" + fn.getCompileUnit() + ") != " + outermostCompileUnit;
+
+            if (fn.isStrictMode()) {
+                assert compiler.getStrictMode();
+                compiler.setStrictMode(true);
+            }
+            return true;
+        }
+
+        @Override
+        public String toString() {
+            return "[Code Splitting]";
+        }
+    },
+
+    /*
+     * FinalizeTypes
+     *
+     *   This pass finalizes the types for nodes. If Attr created wider types than
+     *   known during the first pass, convert nodes are inserted or access nodes
+     *   are specialized where scope accesses.
+     *
+     *   Runtime nodes may be removed and primitivized or reintroduced depending
+     *   on information that was established in Attr.
+     *
+     * Contract: all variables must have slot assignments and scope assignments
+     * before type finalization.
+     */
+    TYPE_FINALIZATION_PHASE(EnumSet.of(INITIALIZED, CONSTANT_FOLDED, LOWERED, ATTR, SPLIT), FINALIZED) {
+        @Override
+        boolean transform(final Compiler compiler, final FunctionNode fn) {
+            fn.accept(new FinalizeTypes());
+            return true;
+        }
+
+        @Override
+        public String toString() {
+            return "[Type Finalization]";
+        }
+    },
+
+    /*
+     * Bytecode generation:
+     *
+     *   Generate the byte code class(es) resulting from the compiled FunctionNode
+     */
+    BYTECODE_GENERATION_PHASE(EnumSet.of(INITIALIZED, CONSTANT_FOLDED, LOWERED, ATTR, SPLIT, FINALIZED), EMITTED) {
+        @Override
+        boolean transform(final Compiler compiler, final FunctionNode fn) {
+            final Context context = compiler.getContext();
+
+            try {
+                final CodeGenerator codegen = new CodeGenerator(compiler);
+                fn.accept(codegen);
+                codegen.generateScopeCalls();
+
+            } catch (final VerifyError e) {
+                if (context._verify_code || context._print_code) {
+                    context.getErr().println(e.getClass().getSimpleName() + ": " + e.getMessage());
+                    if (context._dump_on_error) {
+                        e.printStackTrace(context.getErr());
+                    }
+                } else {
+                    throw e;
+                }
+            }
+
+            for (final CompileUnit compileUnit : compiler.getCompileUnits()) {
+                final ClassEmitter classEmitter = compileUnit.getClassEmitter();
+                classEmitter.end();
+
+                final byte[] bytecode = classEmitter.toByteArray();
+                assert bytecode != null;
+
+                final String className = compileUnit.getUnitClassName();
+
+                compiler.addClass(className, bytecode);
+
+                //should could be printed to stderr for generate class?
+                if (context._print_code) {
+                    final StringBuilder sb = new StringBuilder();
+                    sb.append("class: " + className).
+                        append('\n').
+                        append(ClassEmitter.disassemble(bytecode)).
+                        append("=====");
+                    context.getErr().println(sb);
+                }
+
+                //should we verify the generated code?
+                if (context._verify_code) {
+                    context.verify(bytecode);
+                }
+
+                //should code be dumped to disk - only valid in compile_only mode?
+                if (context._dest_dir != null && context._compile_only) {
+                    final String fileName = className.replace('.', File.separatorChar) + ".class";
+                    final int    index    = fileName.lastIndexOf(File.separatorChar);
+
+                    if (index != -1) {
+                        final File dir = new File(fileName.substring(0, index));
+                        try {
+                            if (!dir.exists() && !dir.mkdirs()) {
+                                throw new IOException();
+                            }
+                            final File file = new File(context._dest_dir, fileName);
+                            try (final FileOutputStream fos = new FileOutputStream(file)) {
+                                fos.write(bytecode);
+                            }
+                        } catch (final IOException e) {
+                            Compiler.LOG.warning("Skipping class dump for " + className + ": " + ECMAErrors.getMessage("io.error.cant.write", dir.toString()));
+                        }
+                    }
+                }
+            }
+
+            return true;
+        }
+
+        @Override
+        public String toString() {
+            return "[Bytecode Generation]";
+        }
+    };
+
+    private final EnumSet<CompilationState> pre;
+    private final CompilationState post;
+    private long startTime;
+    private long endTime;
+    private boolean isFinished;
+
+    private static final long[] accumulatedTime = new long[CompilationPhase.values().length];
+
+    private CompilationPhase(final EnumSet<CompilationState> pre) {
+        this(pre, null);
+    }
+
+    private CompilationPhase(final EnumSet<CompilationState> pre, final CompilationState post) {
+        this.pre  = pre;
+        this.post = post;
+    }
+
+    boolean isApplicable(final FunctionNode functionNode) {
+        return functionNode.hasState(pre);
+    }
+
+    protected void begin(final FunctionNode functionNode) {
+        if (pre != null) {
+            //check that everything in pre is present
+            for (final CompilationState state : pre) {
+                assert functionNode.hasState(state);
+            }
+            //check that nothing else is present
+            for (final CompilationState state : CompilationState.values()) {
+                assert !(functionNode.hasState(state) && !pre.contains(state));
+            }
+        }
+
+        startTime = System.currentTimeMillis();
+    }
+
+    protected void end(final FunctionNode functionNode) {
+        endTime = System.currentTimeMillis();
+        accumulatedTime[ordinal()] += (endTime - startTime);
+
+        if (post != null) {
+            functionNode.setState(post);
+        }
+
+        isFinished = true;
+    }
+
+    boolean isFinished() {
+        return isFinished;
+    }
+
+    long getStartTime() {
+        return startTime;
+    }
+
+    long getEndTime() {
+        return endTime;
+    }
+
+    public static long getAccumulatedTime(final CompilationPhase phase) {
+        return accumulatedTime[phase.ordinal()];
+    }
+
+    abstract boolean transform(final Compiler compiler, final FunctionNode functionNode);
+
+    final boolean apply(final Compiler compiler, final FunctionNode functionNode) {
+        try {
+            if (!isApplicable(functionNode)) {
+                return false;
+            }
+            begin(functionNode);
+            transform(compiler, functionNode);
+            return true;
+        } finally {
+            end(functionNode);
+        }
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CompileUnit.java b/nashorn/src/jdk/nashorn/internal/codegen/CompileUnit.java
index 727d9e34eba..5e62116b9a1 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/CompileUnit.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CompileUnit.java
@@ -51,7 +51,7 @@ public class CompileUnit {
      * Add weight to this compile unit
      * @param w weight to add
      */
-    public void addWeight(final long w) {
+    void addWeight(final long w) {
         this.weight += w;
     }
 
@@ -59,7 +59,7 @@ public class CompileUnit {
      * Get the current weight of the compile unit.
      * @return the unit's weight
      */
-    public long getWeight() {
+    long getWeight() {
         return weight;
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java b/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
index 3b21ab581a7..23f38749068 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
@@ -27,124 +27,377 @@ package jdk.nashorn.internal.codegen;
 
 import static jdk.nashorn.internal.codegen.CompilerConstants.CONSTANTS;
 import static jdk.nashorn.internal.codegen.CompilerConstants.DEFAULT_SCRIPT_NAME;
-import static jdk.nashorn.internal.codegen.CompilerConstants.RUN_SCRIPT;
+import static jdk.nashorn.internal.codegen.CompilerConstants.LAZY;
 import static jdk.nashorn.internal.codegen.CompilerConstants.SCOPE;
 import static jdk.nashorn.internal.codegen.CompilerConstants.SOURCE;
 import static jdk.nashorn.internal.codegen.CompilerConstants.THIS;
-
 import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
+import java.util.Arrays;
 import java.util.EnumSet;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedList;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
-import java.util.TreeMap;
 import jdk.nashorn.internal.codegen.ClassEmitter.Flag;
 import jdk.nashorn.internal.codegen.types.Type;
 import jdk.nashorn.internal.ir.FunctionNode;
-import jdk.nashorn.internal.ir.Node;
-import jdk.nashorn.internal.ir.debug.ASTWriter;
-import jdk.nashorn.internal.ir.debug.PrintVisitor;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
-import jdk.nashorn.internal.parser.Parser;
+import jdk.nashorn.internal.ir.FunctionNode.CompilationState;
 import jdk.nashorn.internal.runtime.CodeInstaller;
 import jdk.nashorn.internal.runtime.Context;
 import jdk.nashorn.internal.runtime.DebugLogger;
-import jdk.nashorn.internal.runtime.ECMAErrors;
-import jdk.nashorn.internal.runtime.ErrorManager;
 import jdk.nashorn.internal.runtime.Source;
 import jdk.nashorn.internal.runtime.options.Options;
 import org.dynalang.dynalink.support.NameCodec;
 
 /**
  * Responsible for converting JavaScripts to java byte code. Main entry
- * point for code generator
+ * point for code generator. The compiler may also install classes given some
+ * predefined Code installation policy, given to it at construction time.
+ * @see CodeInstaller
  */
 public final class Compiler {
 
-    /** Compiler states available */
-    public enum State {
-        /** compiler is ready */
-        INITIALIZED,
-        /** method has been parsed */
-        PARSED,
-        /** constant folding pass */
-        CONSTANT_FOLDED,
-        /** method has been lowered */
-        LOWERED,
-        /** method hass been attributed */
-        ATTR,
-        /** method has been split */
-        SPLIT,
-        /** method has had its types finalized */
-        FINALIZED,
-        /** method has been emitted to bytecode */
-        EMITTED
-    }
-
-    /** Current context */
-    private final Context context;
-
-    /** Currently compiled source */
-    private final Source source;
-
-    /** Current error manager */
-    private final ErrorManager errors;
-
-    /** Names uniqueName for this compile. */
-    private final Namespace namespace;
-
-    /** Current function node, or null if compiling from source until parsed */
-    private FunctionNode functionNode;
-
-    /** Current compiler state */
-    private final EnumSet<State> state;
-
     /** Name of the scripts package */
     public static final String SCRIPTS_PACKAGE = "jdk/nashorn/internal/scripts";
 
     /** Name of the objects package */
     public static final String OBJECTS_PACKAGE = "jdk/nashorn/internal/objects";
 
-    /** Name of the runtime package */
-    public static final String RUNTIME_PACKAGE = "jdk/nashorn/internal/runtime";
+    static final boolean LAZY_JIT = Options.getBooleanProperty("nashorn.compiler.lazy");
 
-    /** Name of the Global object, cannot be referred to as .class, @see CodeGenerator */
-    public static final String GLOBAL_OBJECT = OBJECTS_PACKAGE + '/' + "Global";
+    static final boolean TIME_COMPILATION = Options.getBooleanProperty("nashorn.compiler.time");
 
-    /** Name of the ScriptFunctionImpl, cannot be referred to as .class @see FunctionObjectCreator */
-    public static final String SCRIPTFUNCTION_IMPL_OBJECT = OBJECTS_PACKAGE + '/' + "ScriptFunctionImpl";
+    private final Map<String, byte[]> bytecode;
 
-    /** Name of the Trampoline, cannot be referred to as .class @see FunctionObjectCreator */
-    public static final String TRAMPOLINE_OBJECT = OBJECTS_PACKAGE + '/' + "Trampoline";
-
-    /** Compile unit (class) table. */
     private final Set<CompileUnit> compileUnits;
 
-    /** All the "complex" constants used in the code. */
     private final ConstantData constantData;
 
+    private final FunctionNode functionNode;
+
+    private final CompilationSequence sequence;
+
+    private final Context context;
+
+    private final String scriptName;
+
+    private boolean strict;
+
+    private CodeInstaller<Context> installer;
+
     static final DebugLogger LOG = new DebugLogger("compiler");
 
-    /** Script name */
-    private String scriptName;
+    /**
+     * This array contains names that need to be reserved at the start
+     * of a compile, to avoid conflict with variable names later introduced.
+     * See {@link CompilerConstants} for special names used for structures
+     * during a compile.
+     */
+    private static String[] RESERVED_NAMES = {
+        SCOPE.tag(),
+        THIS.tag()
+    };
 
-    /** Should we dump classes to disk and compile only? */
-    private final boolean dumpClass;
+    /**
+     * This class makes it possible to do your own compilation sequence
+     * from the code generation package. There are predefined compilation
+     * sequences already
+     */
+    @SuppressWarnings("serial")
+    static class CompilationSequence extends LinkedList<CompilationPhase> {
 
-    /** Code map class name -> byte code for all classes generated from this Source or FunctionNode */
-    private Map<String, byte[]> code;
+        CompilationSequence(final CompilationPhase... phases) {
+            super(Arrays.asList(phases));
+        }
 
-    /** Are we compiling in strict mode? */
-    private boolean strict;
+        CompilationSequence(final CompilationSequence sequence) {
+            this(sequence.toArray(new CompilationPhase[sequence.size()]));
+        }
 
-    /** Is this a lazy compilation - i.e. not from source, but jitting a previously parsed FunctionNode? */
-    private boolean isLazy;
+        CompilationSequence insertAfter(final CompilationPhase phase, final CompilationPhase newPhase) {
+            final CompilationSequence newSeq = new CompilationSequence();
+            for (final CompilationPhase elem : this) {
+                newSeq.add(phase);
+                if (elem.equals(phase)) {
+                    newSeq.add(newPhase);
+                }
+            }
+            assert newSeq.contains(newPhase);
+            return newSeq;
+        }
 
-    /** Lazy jitting is disabled by default */
-    private static final boolean LAZY_JIT = false;
+        CompilationSequence insertBefore(final CompilationPhase phase, final CompilationPhase newPhase) {
+            final CompilationSequence newSeq = new CompilationSequence();
+            for (final CompilationPhase elem : this) {
+                if (elem.equals(phase)) {
+                    newSeq.add(newPhase);
+                }
+                newSeq.add(phase);
+            }
+            assert newSeq.contains(newPhase);
+            return newSeq;
+        }
+
+        CompilationSequence insertFirst(final CompilationPhase phase) {
+            final CompilationSequence newSeq = new CompilationSequence(this);
+            newSeq.addFirst(phase);
+            return newSeq;
+        }
+
+        CompilationSequence insertLast(final CompilationPhase phase) {
+            final CompilationSequence newSeq = new CompilationSequence(this);
+            newSeq.addLast(phase);
+            return newSeq;
+        }
+    }
+
+    /**
+     * Standard (non-lazy) compilation, that basically will take an entire script
+     * and JIT it at once. This can lead to long startup time and fewer type
+     * specializations
+     */
+    final static CompilationSequence SEQUENCE_NORMAL = new CompilationSequence(
+        CompilationPhase.CONSTANT_FOLDING_PHASE,
+        CompilationPhase.LOWERING_PHASE,
+        CompilationPhase.ATTRIBUTION_PHASE,
+        CompilationPhase.SPLITTING_PHASE,
+        CompilationPhase.TYPE_FINALIZATION_PHASE,
+        CompilationPhase.BYTECODE_GENERATION_PHASE);
+
+    final static CompilationSequence SEQUENCE_LAZY =
+        SEQUENCE_NORMAL.insertFirst(CompilationPhase.LAZY_INITIALIZATION_PHASE);
+
+    final static CompilationSequence SEQUENCE_DEFAULT =
+        LAZY_JIT ?
+            SEQUENCE_LAZY :
+            SEQUENCE_NORMAL;
+
+    /**
+     * Constructor
+     *
+     * @param installer    code installer from
+     * @param functionNode function node (in any available {@link CompilationState}) to compile
+     * @param sequence     {@link Compiler#CompilationSequence} of {@link CompilationPhase}s to apply as this compilation
+     * @param strict       should this compilation use strict mode semantics
+     */
+    Compiler(final Context context, final CodeInstaller<Context> installer, final FunctionNode functionNode, final CompilationSequence sequence, final boolean strict) {
+        this.context       = context;
+        this.functionNode  = functionNode;
+        this.sequence      = sequence;
+        this.installer     = installer;
+        this.strict        = strict || functionNode.isStrictMode();
+        this.constantData  = new ConstantData();
+        this.compileUnits  = new HashSet<>();
+        this.bytecode      = new HashMap<>();
+
+        final StringBuilder sb = new StringBuilder();
+        sb.append(functionNode.uniqueName(DEFAULT_SCRIPT_NAME.tag())).
+                append('$').
+                append(safeSourceName(functionNode.getSource())).
+                append(functionNode.isLazy() ? LAZY.tag() : "");
+
+        this.scriptName = sb.toString();
+
+        LOG.info("Initializing compiler for scriptName = " + scriptName + ", root function: '" + functionNode.getName() + "'");
+    }
+
+    /**
+     * Constructor
+     *
+     * @param installer    code installer from context
+     * @param functionNode function node (in any available {@link CompilationState}) to compile
+     * @param strict       should this compilation use strict mode semantics
+     */
+    public Compiler(final CodeInstaller<Context> installer, final FunctionNode functionNode, final boolean strict) {
+        this(installer.getOwner(), installer, functionNode, SEQUENCE_DEFAULT, strict);
+    }
+
+    /**
+     * Constructor - compilation will use the same strict semantics as context
+     *
+     * @param installer    code installer from context
+     * @param functionNode function node (in any available {@link CompilationState}) to compile
+     */
+    public Compiler(final CodeInstaller<Context> installer, final FunctionNode functionNode) {
+        this(installer.getOwner(), installer, functionNode, SEQUENCE_DEFAULT, installer.getOwner()._strict);
+    }
+
+    /**
+     * Constructor - compilation needs no installer, but uses a context
+     * Used in "compile only" scenarios
+     * @param context a context
+     * @param functionNode functionNode to compile
+     */
+    public Compiler(final Context context, final FunctionNode functionNode) {
+        this(context, null, functionNode, SEQUENCE_DEFAULT, context._strict);
+    }
+
+    /**
+     * Execute the compilation this Compiler was created with
+     * @return true if compilation succeeds.
+     */
+    public boolean compile() {
+        for (final String reservedName : RESERVED_NAMES) {
+            functionNode.uniqueName(reservedName);
+        }
+
+        for (final CompilationPhase phase : sequence) {
+            LOG.info("Entering compile phase " + phase + " for function '" + functionNode.getName() + "'");
+            if (phase.isApplicable(functionNode)) {
+                if (!phase.apply(this, functionNode)) { //TODO exceptions, error logging
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Install compiled classes into a given loader
+     * @return root script class - if there are several compile units they will also be installed
+     */
+    public Class<?> install() {
+        Class<?> rootClass = null;
+
+        for (final Entry<String, byte[]> entry : bytecode.entrySet()) {
+            final String     className = entry.getKey();
+            LOG.info("Installing class " + className);
+
+            final byte[]     code  = entry.getValue();
+            final Class<?>   clazz = installer.install(Compiler.binaryName(className), code);
+
+            if (rootClass == null && firstCompileUnitName().equals(className)) {
+                rootClass = clazz;
+            }
+
+            try {
+                //use reflection to write source and constants table to installed classes
+                clazz.getField(SOURCE.tag()).set(null, getSource());
+                clazz.getField(CONSTANTS.tag()).set(null, getConstantData().toArray());
+            } catch (final NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        LOG.info("Root class: " + rootClass);
+        return rootClass;
+    }
+
+    Set<CompileUnit> getCompileUnits() {
+        return compileUnits;
+    }
+
+    boolean getStrictMode() {
+        return strict;
+    }
+
+    void setStrictMode(final boolean strict) {
+        this.strict = strict;
+    }
+
+    FunctionNode getFunctionNode() {
+        return functionNode;
+    }
+
+    ConstantData getConstantData() {
+        return constantData;
+    }
+
+    CodeInstaller<Context> getCodeInstaller() {
+        return installer;
+    }
+
+    Source getSource() {
+        return functionNode.getSource();
+    }
+
+    void addClass(final String name, final byte[] code) {
+        bytecode.put(name, code);
+    }
+
+    Context getContext() {
+        return this.context;
+    }
+
+    private static String safeSourceName(final Source source) {
+        String baseName = new File(source.getName()).getName();
+
+        final int index = baseName.lastIndexOf(".js");
+        if (index != -1) {
+            baseName = baseName.substring(0, index);
+        }
+
+        baseName = baseName.replace('.', '_').replace('-', '_');
+        final String mangled = NameCodec.encode(baseName);
+
+        return mangled != null ? mangled : baseName;
+    }
+
+    private int nextCompileUnitIndex() {
+        return compileUnits.size() + 1;
+    }
+
+    String firstCompileUnitName() {
+        return SCRIPTS_PACKAGE + '/' + scriptName;
+    }
+
+    private String nextCompileUnitName() {
+        return firstCompileUnitName() + '$' + nextCompileUnitIndex();
+    }
+
+    CompileUnit addCompileUnit(final long initialWeight) {
+        return addCompileUnit(nextCompileUnitName(), initialWeight);
+    }
+
+    CompileUnit addCompileUnit(final String unitClassName) {
+        return addCompileUnit(unitClassName, 0L);
+    }
+
+    private CompileUnit addCompileUnit(final String unitClassName, final long initialWeight) {
+        final CompileUnit compileUnit = initCompileUnit(unitClassName, initialWeight);
+        compileUnits.add(compileUnit);
+        LOG.info("Added compile unit " + compileUnit);
+        return compileUnit;
+    }
+
+    private CompileUnit initCompileUnit(final String unitClassName, final long initialWeight) {
+        final ClassEmitter classEmitter = new ClassEmitter(context, functionNode.getSource().getName(), unitClassName, strict);
+        final CompileUnit  compileUnit  = new CompileUnit(unitClassName, classEmitter, initialWeight);
+
+        classEmitter.begin();
+
+        final MethodEmitter initMethod = classEmitter.init(EnumSet.of(Flag.PRIVATE));
+        initMethod.begin();
+        initMethod.load(Type.OBJECT, 0);
+        initMethod.newInstance(jdk.nashorn.internal.scripts.JS$.class);
+        initMethod.returnVoid();
+        initMethod.end();
+
+        return compileUnit;
+    }
+
+    CompileUnit findUnit(final long weight) {
+        for (final CompileUnit unit : compileUnits) {
+            if (unit.canHold(weight)) {
+                unit.addWeight(weight);
+                return unit;
+            }
+        }
+
+        return addCompileUnit(weight);
+    }
+
+    /**
+     * Convert a package/class name to a binary name.
+     *
+     * @param name Package/class name.
+     * @return Binary name.
+     */
+    public static String binaryName(final String name) {
+        return name.replace('/', '.');
+    }
 
     /**
      * Should we use integers for arithmetic operations as well?
@@ -164,573 +417,27 @@ public final class Compiler {
 
     static {
         USE_INT_ARITH  =  Options.getBooleanProperty("nashorn.compiler.intarithmetic");
-
         assert !USE_INT_ARITH : "Integer arithmetic is not enabled";
     }
 
-    /**
-     * Factory method for compiler that should compile from source to bytecode
-     *
-     * @param source  the source
-     * @param context context
-     *
-     * @return compiler instance
-     */
-    public static Compiler compiler(final Source source, final Context context) {
-        return Compiler.compiler(source, context, context.getErrorManager(), context._strict);
-    }
-
-    /**
-     * Factory method to get a compiler that goes from from source to bytecode
-     *
-     * @param source  source code
-     * @param context context
-     * @param errors  error manager
-     * @param strict  compilation in strict mode?
-     *
-     * @return compiler instance
-     */
-    public static Compiler compiler(final Source source, final Context context, final ErrorManager errors, final boolean strict) {
-        return new Compiler(source, context, errors, strict);
-    }
-
-    /**
-     * Factory method to get a compiler that goes from FunctionNode (parsed) to bytecode
-     * Requires previous compiler for state
-     *
-     * @param compiler primordial compiler
-     * @param functionNode functionNode to compile
-     *
-     * @return compiler
-     */
-    public static Compiler compiler(final Compiler compiler, final FunctionNode functionNode) {
-        assert false : "lazy jit - not implemented";
-        final Compiler newCompiler = new Compiler(compiler);
-        newCompiler.state.add(State.PARSED);
-        newCompiler.functionNode = functionNode;
-        newCompiler.isLazy = true;
-        return compiler;
-    }
-
-    private Compiler(final Compiler compiler) {
-        this(compiler.source, compiler.context, compiler.errors, compiler.strict);
-    }
-
-    /**
-     * Constructor
-     *
-     * @param source  the source to compile
-     * @param context context
-     * @param errors  error manager
-     * @param strict  compile in strict mode
-     */
-    private Compiler(final Source source, final Context context, final ErrorManager errors, final boolean strict) {
-        this.source       = source;
-        this.context      = context;
-        this.errors       = errors;
-        this.strict       = strict;
-        this.namespace    = new Namespace(context.getNamespace());
-        this.compileUnits = new HashSet<>();
-        this.constantData = new ConstantData();
-        this.state        = EnumSet.of(State.INITIALIZED);
-        this.dumpClass    = context._compile_only && context._dest_dir != null;
-    }
-
-    private String scriptsPackageName() {
-        return dumpClass ? "" : (SCRIPTS_PACKAGE + '/');
-    }
-
-    private int nextCompileUnitIndex() {
-        return compileUnits.size() + 1;
-    }
-
-    private String firstCompileUnitName() {
-        return scriptsPackageName() + scriptName;
-    }
-
-    private String nextCompileUnitName() {
-        return firstCompileUnitName() + '$' + nextCompileUnitIndex();
-    }
-
-    private CompileUnit addCompileUnit(final long initialWeight) {
-        return addCompileUnit(nextCompileUnitName(), initialWeight);
-    }
-
-    private CompileUnit addCompileUnit(final String unitClassName, final long initialWeight) {
-        final CompileUnit compileUnit = initCompileUnit(unitClassName, initialWeight);
-        compileUnits.add(compileUnit);
-        LOG.info("Added compile unit " + compileUnit);
-        return compileUnit;
-    }
-
-    private CompileUnit initCompileUnit(final String unitClassName, final long initialWeight) {
-        final ClassEmitter classEmitter = new ClassEmitter(this, unitClassName, strict);
-        final CompileUnit  compileUnit  = new CompileUnit(unitClassName, classEmitter, initialWeight);
-
-        classEmitter.begin();
-
-        final MethodEmitter initMethod = classEmitter.init(EnumSet.of(Flag.PRIVATE));
-        initMethod.begin();
-        initMethod.load(Type.OBJECT, 0);
-        initMethod.newInstance(jdk.nashorn.internal.scripts.JS$.class);
-        initMethod.returnVoid();
-        initMethod.end();
-
-        return compileUnit;
-    }
-
-    /**
-     * Perform compilation
-     *
-     * @return true if successful, false otherwise - if false check the error manager
-     */
-    public boolean compile() {
-        assert state.contains(State.INITIALIZED);
-
-        /** do we need to parse source? */
-        if (!state.contains(State.PARSED)) {
-            LOG.info("Parsing '" + source + "'");
-
-            assert this.functionNode == null;
-            this.functionNode = new Parser(this, strict).parse(RUN_SCRIPT.tag());
-
-            state.add(State.PARSED);
-            debugPrintParse();
-
-            if (errors.hasErrors() || context._parse_only) {
-                return false;
-            }
-
-            assert !isLazy;
-            //tag lazy nodes for later code generation and trampolines
-            functionNode.accept(new NodeVisitor() {
+    static {
+        if (TIME_COMPILATION) {
+            Runtime.getRuntime().addShutdownHook(new Thread() {
                 @Override
-                public Node enter(final FunctionNode node) {
-                    if (LAZY_JIT) {
-                        node.setIsLazy(!node.isScript());
+                public void run() {
+                    for (final CompilationPhase phase : CompilationPhase.values()) {
+                        final StringBuilder sb = new StringBuilder();
+                        sb.append(phase);
+                        while (sb.length() < 32) {
+                            sb.append(' ');
+                        }
+                        sb.append(CompilationPhase.getAccumulatedTime(phase));
+                        sb.append(' ');
+                        sb.append(" ms");
+                        System.err.println(sb.toString()); //Context err is gone by shutdown TODO
                     }
-                    return node;
-                }
-            });
-        } else {
-            assert isLazy;
-            functionNode.accept(new NodeVisitor() {
-                @Override
-                public Node enter(final FunctionNode node) {
-                    node.setIsLazy(false);
-                    return null; //TODO do we want to do this recursively? then return "node" instead
                 }
             });
         }
-
-        assert functionNode != null;
-        final boolean oldStrict = strict;
-
-        try {
-            strict |= functionNode.isStrictMode();
-
-            /*
-             * These are the compile phases:
-             *
-             * Constant folding pass
-             *   Simple constant folding that will make elementary constructs go away
-             *
-             * Lower (Control flow pass)
-             *   Finalizes the control flow. Clones blocks for finally constructs and
-             *   similar things. Establishes termination criteria for nodes
-             *   Guarantee return instructions to method making sure control flow
-             *   cannot fall off the end. Replacing high level nodes with lower such
-             *   as runtime nodes where applicable.
-             *
-             * Attr
-             *   Assign symbols and types to all nodes.
-             *
-             * Splitter
-             *   Split the AST into several compile units based on a size heuristic
-             *   Splitter needs attributed AST for weight calculations (e.g. is
-             *   a + b a ScriptRuntime.ADD with call overhead or a dadd with much
-             *   less). Split IR can lead to scope information being changed.
-             *
-             * Contract: all variables must have slot assignments and scope assignments
-             * before lowering.
-             *
-             * FinalizeTypes
-             *   This pass finalizes the types for nodes. If Attr created wider types than
-             *   known during the first pass, convert nodes are inserted or access nodes
-             *   are specialized where scope accesses.
-             *
-             *   Runtime nodes may be removed and primitivized or reintroduced depending
-             *   on information that was established in Attr.
-             *
-             * CodeGeneration
-             *   Emit bytecode
-             *
-             */
-
-            debugPrintAST();
-
-            if (!state.contains(State.FINALIZED)) {
-                LOG.info("Folding constants in '" + functionNode.getName() + "'");
-                functionNode.accept(new FoldConstants());
-                state.add(State.CONSTANT_FOLDED);
-
-                LOG.info("Lowering '" + functionNode.getName() + "'");
-                functionNode.accept(new Lower(this));
-                state.add(State.LOWERED);
-                debugPrintAST();
-
-                LOG.info("Attributing types '" + functionNode.getName() + "'");
-                functionNode.accept(new Attr(this));
-                state.add(State.ATTR);
-
-                this.scriptName = computeNames();
-
-                // Main script code always goes to this compile unit. Note that since we start this with zero weight
-                // and add script code last this class may end up slightly larger than others, but reserving one class
-                // just for the main script seems wasteful.
-                final CompileUnit scriptCompileUnit = addCompileUnit(firstCompileUnitName(), 0L);
-                LOG.info("Splitting '" + functionNode.getName() + "'");
-                new Splitter(this, functionNode, scriptCompileUnit).split();
-                state.add(State.SPLIT);
-                assert functionNode.getCompileUnit() == scriptCompileUnit;
-
-                assert strict == functionNode.isStrictMode() : "strict == " + strict + " but functionNode == " + functionNode.isStrictMode();
-                if (functionNode.isStrictMode()) {
-                    strict = true;
-                }
-
-                LOG.info("Finalizing types for '" + functionNode.getName() + "'");
-                functionNode.accept(new FinalizeTypes(this));
-                state.add(State.FINALIZED);
-
-                // print ast and parse if --print-lower-ast and/or --print-lower-parse are selected
-                debugPrintAST();
-                debugPrintParse();
-
-                if (errors.hasErrors()) {
-                    return false;
-                }
-            }
-
-            try {
-                LOG.info("Emitting bytecode for '" + functionNode.getName() + "'");
-                final CodeGenerator codegen = new CodeGenerator(this);
-                functionNode.accept(codegen);
-                codegen.generateScopeCalls();
-            } catch (final VerifyError e) {
-                if (context._verify_code || context._print_code) {
-                    context.getErr().println(e.getClass().getSimpleName() + ": " + e.getMessage());
-                    if (context._dump_on_error) {
-                        e.printStackTrace(context.getErr());
-                    }
-                } else {
-                    throw e;
-                }
-            }
-
-            state.add(State.EMITTED);
-
-            code = new TreeMap<>();
-            for (final CompileUnit compileUnit : compileUnits) {
-                final ClassEmitter classEmitter = compileUnit.getClassEmitter();
-                classEmitter.end();
-
-                if (!errors.hasErrors()) {
-                    final byte[] bytecode = classEmitter.toByteArray();
-                    if (bytecode != null) {
-                        code.put(compileUnit.getUnitClassName(), bytecode);
-                        debugDisassemble();
-                        debugVerify();
-                    }
-               }
-            }
-
-            if (code.isEmpty()) {
-                return false;
-            }
-
-            try {
-                dumpClassFiles();
-            } catch (final IOException e) {
-                throw new RuntimeException(e);
-            }
-
-            return true;
-        } finally {
-            strict = oldStrict;
-            LOG.info("Done with '" + functionNode.getName() + "'");
-        }
     }
-
-    /**
-     * Install compiled classes into a given loader
-     * @param installer that takes the generated classes and puts them in the system
-     * @return root script class - if there are several compile units they will also be installed
-     */
-    public Class<?> install(final CodeInstaller installer) {
-        assert state.contains(State.EMITTED);
-        assert scriptName != null;
-
-        Class<?> rootClass = null;
-
-        for (final Entry<String, byte[]> entry : code.entrySet()) {
-            final String     className = entry.getKey();
-            LOG.info("Installing class " + className);
-
-            final byte[]     bytecode  = entry.getValue();
-            final Class<?>   clazz     = installer.install(Compiler.binaryName(className), bytecode);
-
-            if (rootClass == null && firstCompileUnitName().equals(className)) {
-                rootClass = clazz;
-            }
-
-            try {
-                //use reflection to write source and constants table to installed classes
-                clazz.getField(SOURCE.tag()).set(null, source);
-                clazz.getField(CONSTANTS.tag()).set(null, constantData.toArray());
-            } catch (final NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        LOG.info("Root class: " + rootClass);
-
-        return rootClass;
-    }
-
-    /**
-     * Find a unit that will hold a node of the specified weight.
-     *
-     * @param weight Weight of a node
-     * @return Unit to hold node.
-     */
-    CompileUnit findUnit(final long weight) {
-        for (final CompileUnit unit : compileUnits) {
-            if (unit.canHold(weight)) {
-                unit.addWeight(weight);
-                return unit;
-            }
-        }
-
-        return addCompileUnit(weight);
-    }
-
-    /**
-     * Generate a uniqueName name. Public as {@link Parser} is using this to
-     * create symbols in a different package
-     *
-     * @param  name to base unique name on
-     * @return unique name
-     */
-    public String uniqueName(final String name) {
-        return namespace.uniqueName(name);
-    }
-
-    /**
-     * Internal function to compute reserved names and base names for class to
-     * be generated
-     *
-     * @return scriptName
-     */
-    private String computeNames() {
-        // Reserve internally used names.
-        addReservedNames();
-
-        if (dumpClass) {
-            // get source file name and remove ".js"
-            final String baseName = getSource().getName();
-            final int    index    = baseName.lastIndexOf(".js");
-            if (index != -1) {
-                return baseName.substring(0, index);
-            }
-            return baseName;
-        }
-
-        return namespace.getParent().uniqueName(
-            DEFAULT_SCRIPT_NAME.tag() +
-            '$' +
-            safeSourceName(source) +
-            (isLazy ? CompilerConstants.LAZY.tag() : "")
-        );
-    }
-
-    private static String safeSourceName(final Source source) {
-        String baseName = new File(source.getName()).getName();
-        final int index = baseName.lastIndexOf(".js");
-        if (index != -1) {
-            baseName = baseName.substring(0, index);
-        }
-
-        baseName = baseName.replace('.', '_').replace('-', '_');
-        final String mangled = NameCodec.encode(baseName);
-
-        baseName = mangled != null ? mangled : baseName;
-        return baseName;
-    }
-
-    static void verify(final Context context, final byte[] code) {
-        context.verify(code);
-    }
-
-    /**
-     * Fill in the namespace with internally reserved names.
-     */
-    private void addReservedNames() {
-        namespace.uniqueName(SCOPE.tag());
-        namespace.uniqueName(THIS.tag());
-    }
-
-    /**
-     * Get the constant data for this Compiler
-     *
-     * @return the constant data
-     */
-    public ConstantData getConstantData() {
-        return constantData;
-    }
-
-    /**
-     * Get the Context used for Compilation
-     * @see Context
-     * @return the context
-     */
-    public Context getContext() {
-        return context;
-    }
-
-    /**
-     * Get the Source being compiled
-     * @see Source
-     * @return the source
-     */
-    public Source getSource() {
-        return source;
-    }
-
-    /**
-     * Get the error manager used for this compiler
-     * @return the error manager
-     */
-    public ErrorManager getErrors() {
-        return errors;
-    }
-
-    /**
-     * Get the namespace used for this Compiler
-     * @see Namespace
-     * @return the namespace
-     */
-    public Namespace getNamespace() {
-        return namespace;
-    }
-
-    /*
-     * Debugging
-     */
-
-    /**
-     * Print the AST before or after lowering, see --print-ast, --print-lower-ast
-     */
-    private void debugPrintAST() {
-        assert functionNode != null;
-        if (context._print_lower_ast && state.contains(State.LOWERED) ||
-            context._print_ast && !state.contains(State.LOWERED)) {
-            context.getErr().println(new ASTWriter(functionNode));
-        }
-    }
-
-    /**
-     * Print the parsed code before or after lowering, see --print-parse, --print-lower-parse
-     */
-    private boolean debugPrintParse() {
-        if (errors.hasErrors()) {
-            return false;
-        }
-
-        assert functionNode != null;
-
-        if (context._print_lower_parse && state.contains(State.LOWERED) ||
-             context._print_parse && !state.contains(State.LOWERED)) {
-            final PrintVisitor pv = new PrintVisitor();
-            functionNode.accept(pv);
-            context.getErr().print(pv);
-            context.getErr().flush();
-        }
-
-        return true;
-    }
-
-    private void debugDisassemble() {
-        assert code != null;
-        if (context._print_code) {
-            for (final Map.Entry<String, byte[]> entry : code.entrySet()) {
-                context.getErr().println("CLASS: " + entry.getKey());
-                context.getErr().println();
-                ClassEmitter.disassemble(context, entry.getValue());
-                context.getErr().println("======");
-            }
-        }
-    }
-
-    private void debugVerify() {
-        if (context._verify_code) {
-            for (final Map.Entry<String, byte[]> entry : code.entrySet()) {
-                Compiler.verify(context, entry.getValue());
-            }
-        }
-    }
-
-    /**
-     * Implements the "-d" option - dump class files from script to specified output directory
-     *
-     * @throws IOException if classes cannot be written
-     */
-    private void dumpClassFiles() throws IOException {
-        if (context._dest_dir == null) {
-            return;
-        }
-
-        assert code != null;
-
-        for (final Entry<String, byte[]> entry : code.entrySet()) {
-            final String className = entry.getKey();
-            final String fileName  = className.replace('.', File.separatorChar) + ".class";
-            final int    index     = fileName.lastIndexOf(File.separatorChar);
-
-            if (index != -1) {
-                final File dir = new File(fileName.substring(0, index));
-                if (!dir.exists() && !dir.mkdirs()) {
-                    throw new IOException(ECMAErrors.getMessage("io.error.cant.write", dir.toString()));
-                }
-            }
-
-            final byte[] bytecode = entry.getValue();
-            final File outFile = new File(context._dest_dir, fileName);
-            try (final FileOutputStream fos = new FileOutputStream(outFile)) {
-                fos.write(bytecode);
-            }
-        }
-    }
-
-    /**
-     * Convert a package/class name to a binary name.
-     *
-     * @param name Package/class name.
-     * @return Binary name.
-     */
-    public static String binaryName(final String name) {
-        return name.replace('/', '.');
-    }
-
-    /**
-     * Convert a binary name to a package/class name.
-     *
-     * @param name Binary name.
-     * @return Package/class name.
-     */
-    public static String pathName(final String name) {
-        return name.replace('.', '/');
-    }
-
-
 }
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/ConstantData.java b/nashorn/src/jdk/nashorn/internal/codegen/ConstantData.java
index 0862f1efc8a..631cdb3e3ea 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/ConstantData.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/ConstantData.java
@@ -35,7 +35,7 @@ import java.util.Map;
  * Manages constants needed by code generation.  Objects are maintained in an
  * interning maps to remove duplicates.
  */
-public class ConstantData {
+class ConstantData {
     /** Constant table. */
     final List<Object> constants;
 
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/FinalizeTypes.java b/nashorn/src/jdk/nashorn/internal/codegen/FinalizeTypes.java
index b9deb64eae7..ffa4a55bcd3 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/FinalizeTypes.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/FinalizeTypes.java
@@ -66,7 +66,6 @@ import jdk.nashorn.internal.parser.TokenType;
 import jdk.nashorn.internal.runtime.Debug;
 import jdk.nashorn.internal.runtime.DebugLogger;
 import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.Source;
 
 /**
  * Lower to more primitive operations. After lowering, an AST has symbols and
@@ -83,18 +82,9 @@ import jdk.nashorn.internal.runtime.Source;
 
 final class FinalizeTypes extends NodeOperatorVisitor {
 
-    /** Current source. */
-    private final Source source;
-
     private static final DebugLogger LOG = new DebugLogger("finalize");
 
-    /**
-     * Constructor.
-     *
-     * @param compiler the compiler
-     */
-    FinalizeTypes(final Compiler compiler) {
-        this.source = compiler.getSource();
+    FinalizeTypes() {
     }
 
     @Override
@@ -424,16 +414,20 @@ final class FinalizeTypes extends NodeOperatorVisitor {
 
     @Override
     public Node enter(final FunctionNode functionNode) {
+        if (functionNode.isLazy()) {
+            return null;
+        }
+
         // If the function doesn't need a callee, we ensure its __callee__ symbol doesn't get a slot. We can't do
         // this earlier, as access to scoped variables, self symbol, etc. in previous phases can all trigger the
         // need for the callee.
-        if(!functionNode.needsCallee()) {
+        if (!functionNode.needsCallee()) {
             functionNode.getCalleeNode().getSymbol().setNeedsSlot(false);
         }
         // Similar reasoning applies to __scope__ symbol: if the function doesn't need either parent scope or its
         // own scope, we ensure it doesn't get a slot, but we can't determine whether it needs a scope earlier than
         // this phase.
-        if(!(functionNode.needsScope() || functionNode.needsParentScope())) {
+        if (!(functionNode.needsScope() || functionNode.needsParentScope())) {
             functionNode.getScopeNode().getSymbol().setNeedsSlot(false);
         }
 
@@ -443,8 +437,7 @@ final class FinalizeTypes extends NodeOperatorVisitor {
 
     @Override
     public Node leave(final IfNode ifNode) {
-        final Node test = convert(ifNode.getTest(), Type.BOOLEAN);
-        ifNode.setTest(test);
+        ifNode.setTest(convert(ifNode.getTest(), Type.BOOLEAN));
         return ifNode;
     }
 
@@ -518,6 +511,7 @@ final class FinalizeTypes extends NodeOperatorVisitor {
 
     @Override
     public Node leave(final VarNode varNode) {
+
         final Node rhs = varNode.getInit();
         if (rhs != null) {
             Type destType = specialize(varNode);
@@ -823,7 +817,7 @@ final class FinalizeTypes extends NodeOperatorVisitor {
                 setTypeOverride(node, to);
                 return resultNode;
             }
-            resultNode = new UnaryNode(source, Token.recast(node.getToken(), TokenType.CONVERT), node);
+            resultNode = new UnaryNode(node.getSource(), Token.recast(node.getToken(), TokenType.CONVERT), node);
         }
 
         LOG.info("CONVERT('" + node + "', " + to + ") => '" + resultNode + "'");
@@ -836,11 +830,11 @@ final class FinalizeTypes extends NodeOperatorVisitor {
         return resultNode;
     }
 
-    private Node discard(final Node node) {
+    private static Node discard(final Node node) {
         node.setDiscard(true);
 
         if (node.getSymbol() != null) {
-            final Node discard = new UnaryNode(source, Token.recast(node.getToken(), TokenType.DISCARD), node);
+            final Node discard = new UnaryNode(node.getSource(), Token.recast(node.getToken(), TokenType.DISCARD), node);
             //discard never has a symbol in the discard node - then it would be a nop
             discard.copyTerminalFlags(node);
             return discard;
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/FoldConstants.java b/nashorn/src/jdk/nashorn/internal/codegen/FoldConstants.java
index a7e7aa2d3b7..4ea53a04351 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/FoldConstants.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/FoldConstants.java
@@ -44,10 +44,13 @@ import jdk.nashorn.internal.runtime.Source;
 /**
  * Simple constant folding pass, executed before IR is starting to be lowered.
  */
-public class FoldConstants extends NodeVisitor {
+final class FoldConstants extends NodeVisitor {
 
     private static final DebugLogger LOG = new DebugLogger("fold");
 
+    FoldConstants() {
+    }
+
     @Override
     public Node leave(final UnaryNode unaryNode) {
         final LiteralNode<?> literalNode = new UnaryNodeConstantEvaluator(unaryNode).eval();
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/FunctionSignature.java b/nashorn/src/jdk/nashorn/internal/codegen/FunctionSignature.java
index 7bb7747e547..26d040cdb62 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/FunctionSignature.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/FunctionSignature.java
@@ -25,6 +25,8 @@
 
 package jdk.nashorn.internal.codegen;
 
+import java.lang.invoke.MethodType;
+import java.util.ArrayList;
 import java.util.List;
 import jdk.nashorn.internal.codegen.types.Type;
 import jdk.nashorn.internal.ir.FunctionNode;
@@ -32,6 +34,8 @@ import jdk.nashorn.internal.ir.Node;
 import jdk.nashorn.internal.runtime.ScriptFunction;
 import jdk.nashorn.internal.runtime.linker.LinkerCallSite;
 
+import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+
 /**
  * Class that generates function signatures for dynamic calls
  */
@@ -46,6 +50,9 @@ public final class FunctionSignature {
     /** valid Java descriptor string for function */
     private final String descriptor;
 
+    /** {@link MethodType} for function */
+    private final MethodType methodType;
+
     /**
      * Constructor
      *
@@ -126,8 +133,31 @@ public final class FunctionSignature {
             assert false : "isVarArgs cannot be false when argTypes are null";
         }
 
-        returnType = retType;
-        descriptor = Type.getMethodDescriptor(returnType, paramTypes);
+        this.returnType = retType;
+        this.descriptor = Type.getMethodDescriptor(returnType, paramTypes);
+
+        final List<Class<?>> paramTypeList = new ArrayList<>();
+        for (final Type paramType : paramTypes) {
+            paramTypeList.add(paramType.getTypeClass());
+        }
+
+        this.methodType = MH.type(returnType.getTypeClass(), paramTypeList.toArray(new Class[paramTypes.length]));
+    }
+
+    /**
+     * Create a function signature given a function node, using as much
+     * type information for parameters and return types that is availabe
+     *
+     * @param functionNode the function node
+     */
+    public FunctionSignature(final FunctionNode functionNode) {
+        this(
+            true,
+            functionNode.needsCallee(),
+            functionNode.getReturnType(),
+            (functionNode.isVarArg() && !functionNode.isScript()) ?
+                null :
+                functionNode.getParameters());
     }
 
     /**
@@ -165,21 +195,14 @@ public final class FunctionSignature {
     }
 
     /**
-     * Returns the generic signature of the function being compiled.
-     *
-     * @param functionNode function being compiled.
-     * @return function signature.
+     * Return the {@link MethodType} for this function signature
+     * @return the method type
      */
-    public static String functionSignature(final FunctionNode functionNode) {
-        return new FunctionSignature(
-            true,
-            functionNode.needsCallee(),
-            functionNode.getReturnType(),
-            (functionNode.isVarArg() && !functionNode.isScript()) ?
-                null :
-                functionNode.getParameters()).toString();
+    public MethodType getMethodType() {
+        return methodType;
     }
 
+
     private static Type[] objectArgs(final int nArgs) {
         final Type[] array = new Type[nArgs];
         for (int i = 0; i < nArgs; i++) {
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Lower.java b/nashorn/src/jdk/nashorn/internal/codegen/Lower.java
index 712e076329e..5f0026893c9 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Lower.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Lower.java
@@ -89,10 +89,6 @@ import jdk.nashorn.internal.runtime.Source;
 
 final class Lower extends NodeOperatorVisitor {
 
-    private final Compiler compiler;
-
-    private final Source source;
-
     /**
      * Nesting level stack. Currently just used for loops to avoid the problem
      * with terminal bodies that end with throw/return but still do continues to
@@ -111,9 +107,7 @@ final class Lower extends NodeOperatorVisitor {
      *
      * @param compiler the compiler
      */
-    Lower(final Compiler compiler) {
-        this.compiler   = compiler;
-        this.source     = compiler.getSource();
+    Lower() {
         this.nesting    = new ArrayDeque<>();
         this.statements = new ArrayList<>();
     }
@@ -204,7 +198,7 @@ final class Lower extends NodeOperatorVisitor {
         if (getCurrentFunctionNode().isScript()) {
             if (!(expr instanceof Block)) {
                 if (!isInternalExpression(expr) && !isEvalResultAssignment(expr)) {
-                    executeNode.setExpression(new BinaryNode(source, Token.recast(executeNode.getToken(), TokenType.ASSIGN),
+                    executeNode.setExpression(new BinaryNode(executeNode.getSource(), Token.recast(executeNode.getToken(), TokenType.ASSIGN),
                             getCurrentFunctionNode().getResultNode(),
                             expr));
                 }
@@ -254,6 +248,11 @@ final class Lower extends NodeOperatorVisitor {
     public Node enter(final FunctionNode functionNode) {
         LOG.info("START FunctionNode: " + functionNode.getName());
 
+        if (functionNode.isLazy()) {
+            LOG.info("LAZY: " + functionNode.getName());
+            return null;
+        }
+
         initFunctionNode(functionNode);
 
         Node initialEvalResult = LiteralNode.newInstance(functionNode, ScriptRuntime.UNDEFINED);
@@ -299,7 +298,7 @@ final class Lower extends NodeOperatorVisitor {
             }
 
             if (functionNode.isScript()) {
-                new ExecuteNode(source, functionNode.getFirstToken(), functionNode.getFinish(), initialEvalResult).accept(this);
+                new ExecuteNode(functionNode.getSource(), functionNode.getFirstToken(), functionNode.getFinish(), initialEvalResult).accept(this);
             }
 
             //do the statements - this fills the block with code
@@ -379,6 +378,8 @@ final class Lower extends NodeOperatorVisitor {
         if (tryNode != null) {
             //we are inside a try block - we don't necessarily have a result node yet. attr will do that.
             if (expr != null) {
+                final Source source = getCurrentFunctionNode().getSource();
+
                 //we need to evaluate the result of the return in case it is complex while
                 //still in the try block, store it in a result value and return it afterwards
                 final long token        = returnNode.getToken();
@@ -518,6 +519,7 @@ final class Lower extends NodeOperatorVisitor {
          * finally_body_inlined marked (*) will fix it before rethrowing
          * whatever problem there was for identical semantic.
          */
+        final Source source = getCurrentFunctionNode().getSource();
 
         // if try node does not contain a catch we can skip creation of a new
         // try node and just append our synthetic catch to the existing try node.
@@ -559,7 +561,7 @@ final class Lower extends NodeOperatorVisitor {
         final CatchNode catchAllNode;
         final IdentNode exception;
 
-        exception    = new IdentNode(source, token, finish, compiler.uniqueName("catch_all"));
+        exception    = new IdentNode(source, token, finish, getCurrentFunctionNode().uniqueName("catch_all"));
         catchAllNode = new CatchNode(source, token, finish, new IdentNode(exception), null, catchBody);
         catchAllNode.setIsSyntheticRethrow();
 
@@ -632,7 +634,7 @@ final class Lower extends NodeOperatorVisitor {
             if (whileNode instanceof DoWhileNode) {
                 setTerminal(whileNode, true);
             } else if (conservativeAlwaysTrue(test)) {
-                node = new ForNode(source, whileNode.getToken(), whileNode.getFinish());
+                node = new ForNode(whileNode.getSource(), whileNode.getToken(), whileNode.getFinish());
                 ((ForNode)node).setBody(body);
                 ((ForNode)node).accept(this);
                 setTerminal(node, !escapes);
@@ -799,7 +801,7 @@ final class Lower extends NodeOperatorVisitor {
         }
 
         //create a return statement
-        final Node returnNode = new ReturnNode(source, functionNode.getLastToken(), functionNode.getFinish(), resultNode, null);
+        final Node returnNode = new ReturnNode(functionNode.getSource(), functionNode.getLastToken(), functionNode.getFinish(), resultNode, null);
         returnNode.accept(this);
     }
 
@@ -897,7 +899,7 @@ final class Lower extends NodeOperatorVisitor {
             finallyBody = (Block)finallyBody.clone();
             final boolean hasTerminalFlags = finallyBody.hasTerminalFlags();
 
-            new ExecuteNode(source, finallyBody.getToken(), finallyBody.getFinish(), finallyBody).accept(this);
+            new ExecuteNode(finallyBody.getSource(), finallyBody.getToken(), finallyBody.getFinish(), finallyBody).accept(this);
 
             if (hasTerminalFlags) {
                 getCurrentBlock().copyTerminalFlags(finallyBody);
@@ -951,17 +953,18 @@ final class Lower extends NodeOperatorVisitor {
      * TODO : only create those that are needed.
      * TODO : make sure slot numbering is not hardcoded in {@link CompilerConstants} - now creation order is significant
      */
-    private void initFunctionNode(final FunctionNode functionNode) {
-        final long token  = functionNode.getToken();
-        final int  finish = functionNode.getFinish();
+    private static void initFunctionNode(final FunctionNode functionNode) {
+        final Source source = functionNode.getSource();
+        final long token    = functionNode.getToken();
+        final int  finish   = functionNode.getFinish();
 
         functionNode.setThisNode(new IdentNode(source, token, finish, THIS.tag()));
         functionNode.setScopeNode(new IdentNode(source, token, finish, SCOPE.tag()));
         functionNode.setResultNode(new IdentNode(source, token, finish, SCRIPT_RETURN.tag()));
         functionNode.setCalleeNode(new IdentNode(source, token, finish, CALLEE.tag()));
-        if(functionNode.isVarArg()) {
+        if (functionNode.isVarArg()) {
             functionNode.setVarArgsNode(new IdentNode(source, token, finish, VARARGS.tag()));
-            if(functionNode.needsArguments()) {
+            if (functionNode.needsArguments()) {
                 functionNode.setArgumentsNode(new IdentNode(source, token, finish, ARGUMENTS.tag()));
             }
         }
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/SharedScopeCall.java b/nashorn/src/jdk/nashorn/internal/codegen/SharedScopeCall.java
index 70be10876c3..f8e26996298 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/SharedScopeCall.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/SharedScopeCall.java
@@ -106,11 +106,11 @@ public class SharedScopeCall {
     /**
      * Set the compile unit and method name.
      * @param compileUnit the compile unit
-     * @param compiler the compiler to generate a unique method name
+     * @param methodName the method name
      */
-    protected void setClassAndName(final CompileUnit compileUnit, final Compiler compiler) {
+    protected void setClassAndName(final CompileUnit compileUnit, final String methodName) {
         this.compileUnit = compileUnit;
-        this.methodName = compiler.uniqueName("scopeCall");
+        this.methodName  = methodName;
     }
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Splitter.java b/nashorn/src/jdk/nashorn/internal/codegen/Splitter.java
index abaab42b0fb..d95fd4b6c37 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Splitter.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Splitter.java
@@ -49,13 +49,14 @@ import jdk.nashorn.internal.ir.SplitNode;
 import jdk.nashorn.internal.ir.SwitchNode;
 import jdk.nashorn.internal.ir.WhileNode;
 import jdk.nashorn.internal.ir.visitor.NodeVisitor;
+import jdk.nashorn.internal.runtime.DebugLogger;
 import jdk.nashorn.internal.runtime.Source;
 import jdk.nashorn.internal.runtime.options.Options;
 
 /**
  * Split the IR into smaller compile units.
  */
-public class Splitter extends NodeVisitor {
+final class Splitter extends NodeVisitor {
     /** Current compiler. */
     private final Compiler compiler;
 
@@ -63,7 +64,7 @@ public class Splitter extends NodeVisitor {
     private final FunctionNode functionNode;
 
     /** Compile unit for the main script. */
-    private final CompileUnit scriptCompileUnit;
+    private final CompileUnit outermostCompileUnit;
 
     /** Cache for calculated block weights. */
     private final Map<Node, Long> weightCache = new HashMap<>();
@@ -71,27 +72,35 @@ public class Splitter extends NodeVisitor {
     /** Weight threshold for when to start a split. */
     public static final long SPLIT_THRESHOLD = Options.getIntProperty("nashorn.compiler.splitter.threshold", 32 * 1024);
 
+    private static final DebugLogger LOG = Compiler.LOG;
+
     /**
      * Constructor.
      *
-     * @param compiler           the compiler
-     * @param functionNode       function node to split
-     * @param scriptCompileUnit  script compile unit
+     * @param compiler              the compiler
+     * @param functionNode          function node to split
+     * @param outermostCompileUnit  compile unit for outermost function, if non-lazy this is the script's compile unit
      */
-    public Splitter(final Compiler compiler, final FunctionNode functionNode, final CompileUnit scriptCompileUnit) {
-        this.compiler     = compiler;
-        this.functionNode = functionNode;
-        this.scriptCompileUnit = scriptCompileUnit;
+    public Splitter(final Compiler compiler, final FunctionNode functionNode, final CompileUnit outermostCompileUnit) {
+        this.compiler             = compiler;
+        this.functionNode         = functionNode;
+        this.outermostCompileUnit = outermostCompileUnit;
     }
 
     /**
      * Execute the split
      */
     void split() {
+        if (functionNode.isLazy()) {
+            LOG.info("Postponing split of '" + functionNode.getName() + "' as it's lazy");
+            return;
+        }
+        LOG.info("Initiating split of '" + functionNode.getName() + "'");
+
         long weight = WeighNodes.weigh(functionNode);
 
         if (weight >= SPLIT_THRESHOLD) {
-            Compiler.LOG.info("Splitting '" + functionNode.getName() + "' as its weight " + weight + " exceeds split threshold " + SPLIT_THRESHOLD);
+            LOG.info("Splitting '" + functionNode.getName() + "' as its weight " + weight + " exceeds split threshold " + SPLIT_THRESHOLD);
 
             functionNode.accept(this);
 
@@ -111,20 +120,18 @@ public class Splitter extends NodeVisitor {
 
         assert functionNode.getCompileUnit() == null : "compile unit already set";
 
-        if (functionNode.isScript()) {
-            assert scriptCompileUnit != null : "script compile unit is null";
+        if (compiler.getFunctionNode() == functionNode) { //functionNode.isScript()) {
+            assert outermostCompileUnit != null : "outermost compile unit is null";
 
-            functionNode.setCompileUnit(scriptCompileUnit);
-            scriptCompileUnit.addWeight(weight + WeighNodes.FUNCTION_WEIGHT);
+            functionNode.setCompileUnit(outermostCompileUnit);
+            outermostCompileUnit.addWeight(weight + WeighNodes.FUNCTION_WEIGHT);
         } else {
             functionNode.setCompileUnit(findUnit(weight));
         }
 
         // Recursively split nested functions
-        final List<FunctionNode> functions = functionNode.getFunctions();
-
-        for (final FunctionNode function : functions) {
-            new Splitter(compiler, function, scriptCompileUnit).split();
+        for (final FunctionNode function : functionNode.getFunctions()) {
+            new Splitter(compiler, function, outermostCompileUnit).split();
         }
     }
 
@@ -192,7 +199,7 @@ public class Splitter extends NodeVisitor {
         final Source source = parent.getSource();
         final long   token  = parent.getToken();
         final int    finish = parent.getFinish();
-        final String name   = compiler.uniqueName(SPLIT_PREFIX.tag());
+        final String name   = parent.getFunction().uniqueName(SPLIT_PREFIX.tag());
 
         final Block newBlock = new Block(source, token, finish, parent, functionNode);
         newBlock.setFrame(new Frame(parent.getFrame()));
@@ -284,6 +291,10 @@ public class Splitter extends NodeVisitor {
 
     @Override
     public Node enter(final FunctionNode node) {
+        if (node.isLazy()) {
+            return null;
+        }
+
         final List<Node> statements = node.getStatements();
 
         for (final Node statement : statements) {
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/WeighNodes.java b/nashorn/src/jdk/nashorn/internal/codegen/WeighNodes.java
index 76bf61936c9..006f1e27e6e 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/WeighNodes.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/WeighNodes.java
@@ -66,7 +66,7 @@ import jdk.nashorn.internal.ir.visitor.NodeOperatorVisitor;
  * Computes the "byte code" weight of an AST segment. This is used
  * for Splitting too large class files
  */
-public class WeighNodes extends NodeOperatorVisitor {
+final class WeighNodes extends NodeOperatorVisitor {
     /*
      * Weight constants.
      */
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/objects/FunctionObjectCreator.java b/nashorn/src/jdk/nashorn/internal/codegen/objects/FunctionObjectCreator.java
deleted file mode 100644
index 72ed43b1710..00000000000
--- a/nashorn/src/jdk/nashorn/internal/codegen/objects/FunctionObjectCreator.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.nashorn.internal.codegen.objects;
-
-import static jdk.nashorn.internal.codegen.ClassEmitter.Flag.HANDLE_STATIC;
-import static jdk.nashorn.internal.codegen.Compiler.SCRIPTFUNCTION_IMPL_OBJECT;
-import static jdk.nashorn.internal.codegen.CompilerConstants.ALLOCATE;
-import static jdk.nashorn.internal.codegen.CompilerConstants.constructorNoLookup;
-import static jdk.nashorn.internal.codegen.CompilerConstants.methodDescriptor;
-
-import java.lang.invoke.MethodHandle;
-import java.util.ArrayList;
-import java.util.EnumSet;
-
-import jdk.nashorn.internal.codegen.CodeGenerator;
-import jdk.nashorn.internal.codegen.FunctionSignature;
-import jdk.nashorn.internal.codegen.MethodEmitter;
-import jdk.nashorn.internal.ir.FunctionNode;
-import jdk.nashorn.internal.ir.Symbol;
-import jdk.nashorn.internal.runtime.PropertyMap;
-import jdk.nashorn.internal.runtime.ScriptFunctionData;
-import jdk.nashorn.internal.runtime.ScriptObject;
-
-/**
- * Analyze a function object's characteristics for appropriate code
- * generation. This generates code for the instantiation of ScriptFunctions.
- */
-public class FunctionObjectCreator extends ObjectCreator {
-
-    private final FunctionNode functionNode;
-
-    /**
-     * Constructor
-     *
-     * @param codegen      the code generator
-     * @param functionNode the function node to turn into a ScriptFunction implementation
-     */
-    public FunctionObjectCreator(final CodeGenerator codegen, final FunctionNode functionNode) {
-        super(codegen, new ArrayList<String>(), new ArrayList<Symbol>(), false, false);
-        this.functionNode = functionNode;
-    }
-
-    private void loadHandle(final MethodEmitter method, final String signature) {
-        method.loadHandle(functionNode.getCompileUnit().getUnitClassName(), functionNode.getName(), signature, EnumSet.of(HANDLE_STATIC)); // function
-    }
-
-    /**
-     * Emit code for creating the object
-     *
-     * @param method the method emitter
-     */
-    @Override
-    public void makeObject(final MethodEmitter method) {
-
-        final PropertyMap map = makeMap();
-        final String signature = new FunctionSignature(true, functionNode.needsCallee(), functionNode.getReturnType(), functionNode.isVarArg() ? null : functionNode.getParameters()).toString();
-        final ScriptFunctionData scriptFunctionData = new ScriptFunctionData(functionNode, map);
-
-        /*
-         * Instantiate the function object
-         */
-        method._new(SCRIPTFUNCTION_IMPL_OBJECT).dup();
-        codegen.loadConstant(scriptFunctionData);
-        loadHandle(method, signature);
-        if(functionNode.needsParentScope()) {
-            method.loadScope();
-        } else {
-            method.loadNull();
-        }
-        method.loadHandle(getClassName(), ALLOCATE.tag(), methodDescriptor(ScriptObject.class, PropertyMap.class), EnumSet.of(HANDLE_STATIC));
-
-        /*
-         * Invoke the constructor
-         */
-        method.invoke(constructorNoLookup(SCRIPTFUNCTION_IMPL_OBJECT, ScriptFunctionData.class, MethodHandle.class, ScriptObject.class, MethodHandle.class));
-
-    }
-}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectClassGenerator.java b/nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectClassGenerator.java
index 3c69687ae4d..72f9181845d 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectClassGenerator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectClassGenerator.java
@@ -472,11 +472,11 @@ public final class ObjectClassGenerator {
         final byte[] code = classEmitter.toByteArray();
 
         if (context != null && context._print_code) {
-            ClassEmitter.disassemble(context, code);
+            Context.getCurrentErr().println(ClassEmitter.disassemble(code));
         }
 
         if (context != null && context._verify_code) {
-            ClassEmitter.verify(context, code);
+            context.verify(code);
         }
 
         return code;
diff --git a/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java b/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java
index 6d2b3a16e1d..958f7b757fc 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java
@@ -32,15 +32,16 @@ import static jdk.nashorn.internal.ir.Symbol.IS_TEMP;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.EnumSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Stack;
+
 import jdk.nashorn.internal.codegen.CompileUnit;
 import jdk.nashorn.internal.codegen.Compiler;
 import jdk.nashorn.internal.codegen.Frame;
 import jdk.nashorn.internal.codegen.MethodEmitter;
 import jdk.nashorn.internal.codegen.Namespace;
-import jdk.nashorn.internal.codegen.Splitter;
 import jdk.nashorn.internal.codegen.types.Type;
 import jdk.nashorn.internal.ir.annotations.Ignore;
 import jdk.nashorn.internal.ir.visitor.NodeVisitor;
@@ -67,6 +68,28 @@ public class FunctionNode extends Block {
         SETTER
     }
 
+    /** Compilation states available */
+    public enum CompilationState {
+        /** compiler is ready */
+        INITIALIZED,
+        /** method has been parsed */
+        PARSED,
+        /** method has been parsed */
+        PARSE_ERROR,
+        /** constant folding pass */
+        CONSTANT_FOLDED,
+        /** method has been lowered */
+        LOWERED,
+        /** method hass been attributed */
+        ATTR,
+        /** method has been split */
+        SPLIT,
+        /** method has had its types finalized */
+        FINALIZED,
+        /** method has been emitted to bytecode */
+        EMITTED
+    }
+
     /** External function identifier. */
     @Ignore
     private IdentNode ident;
@@ -147,6 +170,10 @@ public class FunctionNode extends Block {
     @Ignore
     private Node selfSymbolInit;
 
+    /** Current compilation state */
+    @Ignore
+    private final EnumSet<CompilationState> compilationState;
+
     /** Function flags. */
     private int flags;
 
@@ -200,16 +227,16 @@ public class FunctionNode extends Block {
     /**
      * Constructor
      *
-     * @param source   the source
-     * @param token    token
-     * @param finish   finish
-     * @param compiler the compiler
-     * @param parent   the parent block
-     * @param ident    the identifier
-     * @param name     the name of the function
+     * @param source    the source
+     * @param token     token
+     * @param finish    finish
+     * @param namespace the namespace
+     * @param parent    the parent block
+     * @param ident     the identifier
+     * @param name      the name of the function
      */
     @SuppressWarnings("LeakingThisInConstructor")
-    public FunctionNode(final Source source, final long token, final int finish, final Compiler compiler, final Block parent, final IdentNode ident, final String name) {
+    public FunctionNode(final Source source, final long token, final int finish, final Namespace namespace, final Block parent, final IdentNode ident, final String name) {
         super(source, token, finish, parent, null);
 
         this.ident             = ident;
@@ -219,7 +246,7 @@ public class FunctionNode extends Block {
         this.functions         = new ArrayList<>();
         this.firstToken        = token;
         this.lastToken         = token;
-        this.namespace         = new Namespace(compiler.getNamespace().getParent());
+        this.namespace         = namespace;
         this.labelStack        = new Stack<>();
         this.controlStack      = new Stack<>();
         this.declarations      = new ArrayList<>();
@@ -227,6 +254,7 @@ public class FunctionNode extends Block {
         // it as such a leak - this is a false positive as we're setting this into a field of the object being
         // constructed, so it can't be seen from other threads.
         this.function          = this;
+        this.compilationState  = EnumSet.of(CompilationState.INITIALIZED);
     }
 
     @SuppressWarnings("LeakingThisInConstructor")
@@ -269,6 +297,8 @@ public class FunctionNode extends Block {
         // it as such a leak - this is a false positive as we're setting this into a field of the object being
         // constructed, so it can't be seen from other threads.
         this.function = this;
+
+        this.compilationState = EnumSet.copyOf(functionNode.compilationState);
     }
 
     @Override
@@ -344,6 +374,41 @@ public class FunctionNode extends Block {
         return super.needsScope() || isScript();
     }
 
+    /**
+     * Check whether this FunctionNode has reached a give CompilationState.
+     *
+     * @param state the state to check for
+     * @return true of the node is in the given state
+     */
+    public boolean hasState(final EnumSet<CompilationState> state) {
+        return compilationState.equals(state);
+    }
+
+    /**
+     * Check whether the state of this FunctionNode contains a given compilation
+     * state.
+     *
+     * A node can be in many states at once, e.g. both lowered and initialized.
+     * To check for an exact state, use {FunctionNode{@link #hasState(EnumSet)}
+     *
+     * @param state state to check for
+     * @return true if state is present in the total compilation state of this FunctionNode
+     */
+    public boolean hasState(final CompilationState state) {
+        return compilationState.contains(state);
+    }
+
+    /**
+     * Add a state to the total CompilationState of this node, e.g. if
+     * FunctionNode has been lowered, the compiler will add
+     * {@code CompilationState#LOWERED} to the state vector
+     *
+     * @param state {@link CompilationState} to add
+     */
+    public void setState(final CompilationState state) {
+        compilationState.add(state);
+    }
+
     /*
      * Frame management.
      */
@@ -365,17 +430,6 @@ public class FunctionNode extends Block {
         frames = frames.getPrevious();
     }
 
-    /**
-     * return a unique name in the scope of the function.
-     *
-     * @param base Base string.
-     *
-     * @return Unique name.
-     */
-    public String uniqueName(final String base) {
-        return namespace.uniqueName(base);
-    }
-
     /**
      * Create a temporary variable to the current frame.
      *
@@ -407,6 +461,15 @@ public class FunctionNode extends Block {
         return symbol;
     }
 
+    /**
+     * Create a unique name in the namespace of this FunctionNode
+     * @param base prefix for name
+     * @return base if no collision exists, otherwise a name prefix with base
+     */
+    public String uniqueName(final String base) {
+        return namespace.uniqueName(base);
+    }
+
     /**
      * Add a new temporary variable to the current frame
      *
@@ -428,11 +491,11 @@ public class FunctionNode extends Block {
      */
     public Symbol newLiteral(final LiteralNode<?> literalNode) {
         final String uname = uniqueName(LITERAL_PREFIX.tag());
-        final Symbol sym = new Symbol(uname, IS_CONSTANT, literalNode.getType());
-        sym.setNode(literalNode);
-        literalNode.setSymbol(sym);
+        final Symbol symbol = new Symbol(uname, IS_CONSTANT, literalNode.getType());
+        symbol.setNode(literalNode);
+        literalNode.setSymbol(symbol);
 
-        return sym;
+        return symbol;
     }
 
     @Override
@@ -806,7 +869,6 @@ public class FunctionNode extends Block {
 
     /**
      * Checks if this function is a sub-function generated by splitting a larger one
-     * @see Splitter
      *
      * @return true if this function is split from a larger one
      */
@@ -816,7 +878,6 @@ public class FunctionNode extends Block {
 
     /**
      * Flag this function node as being a sub-function generated by the splitter
-     * @see Splitter
      */
     public void setIsSplit() {
         this.flags |= IS_SPLIT;
@@ -1149,7 +1210,6 @@ public class FunctionNode extends Block {
     /**
      * Get the compile unit used to compile this function
      * @see Compiler
-     * @see Splitter
      * @return the compile unit
      */
     public CompileUnit getCompileUnit() {
@@ -1159,7 +1219,6 @@ public class FunctionNode extends Block {
     /**
      * Reset the compile unit used to compile this function
      * @see Compiler
-     * @see Splitter
      * @param compileUnit the compile unit
      */
     public void setCompileUnit(final CompileUnit compileUnit) {
diff --git a/nashorn/src/jdk/nashorn/internal/ir/debug/JSONWriter.java b/nashorn/src/jdk/nashorn/internal/ir/debug/JSONWriter.java
index 103670d024a..79d93499161 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/debug/JSONWriter.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/debug/JSONWriter.java
@@ -25,11 +25,8 @@
 
 package jdk.nashorn.internal.ir.debug;
 
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.Arrays;
 import java.util.List;
-import jdk.nashorn.internal.codegen.Compiler;
 import jdk.nashorn.internal.codegen.CompilerConstants;
 import jdk.nashorn.internal.ir.AccessNode;
 import jdk.nashorn.internal.ir.BinaryNode;
@@ -87,8 +84,7 @@ public final class JSONWriter extends NodeVisitor {
      * @return JSON string representation of AST of the supplied code
      */
     public static String parse(final Context context, final String code, final String name, final boolean includeLoc) {
-        final Compiler     compiler   = Compiler.compiler(new Source(name, code), context, new Context.ThrowErrorManager(), context._strict);
-        final Parser       parser     = new Parser(compiler, context._strict);
+        final Parser       parser     = new Parser(context, new Source(name, code), new Context.ThrowErrorManager(), context._strict);
         final JSONWriter   jsonWriter = new JSONWriter(includeLoc);
         try {
             final FunctionNode functionNode = parser.parse(CompilerConstants.RUN_SCRIPT.tag());
diff --git a/nashorn/src/jdk/nashorn/internal/ir/visitor/NodeVisitor.java b/nashorn/src/jdk/nashorn/internal/ir/visitor/NodeVisitor.java
index 63cb5bd9e00..9ce6fd02b3e 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/visitor/NodeVisitor.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/visitor/NodeVisitor.java
@@ -70,7 +70,7 @@ public abstract class NodeVisitor {
     private FunctionNode currentFunctionNode;
 
     /** Current compile unit used for class generation. */
-    protected CompileUnit compileUnit;
+    private CompileUnit compileUnit;
 
     /**
      * Current method visitor used for method generation.
diff --git a/nashorn/src/jdk/nashorn/internal/objects/BoundScriptFunctionImpl.java b/nashorn/src/jdk/nashorn/internal/objects/BoundScriptFunctionImpl.java
index 2b8691946b0..1e9e9d187b7 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/BoundScriptFunctionImpl.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/BoundScriptFunctionImpl.java
@@ -32,7 +32,7 @@ import jdk.nashorn.internal.runtime.ScriptRuntime;
 
 /**
  * A {@code ScriptFunctionImpl} subclass for functions created using {@code Function.prototype.bind}. Such functions
- * must track their {@code [[TargetFunction]] property for purposes of correctly implementing {@code [[HasInstance]]};
+ * must track their {@code [[TargetFunction]]} property for purposes of correctly implementing {@code [[HasInstance]]};
  * see {@link ScriptFunction#isInstance(ScriptObject)}.
  */
 class BoundScriptFunctionImpl extends ScriptFunctionImpl {
diff --git a/nashorn/src/jdk/nashorn/internal/objects/Global.java b/nashorn/src/jdk/nashorn/internal/objects/Global.java
index f1993f7f542..66316d1dca4 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/Global.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/Global.java
@@ -351,6 +351,8 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
 
     /**
      * Constructor
+     *
+     * @param context the context
      */
     public Global(final Context context) {
         this.context = context;
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java b/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java
index 5fa845d5141..b63e2f5b843 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java
@@ -385,6 +385,7 @@ public final class NativeJava {
     public static Object extend(final Object self, final Object... types) {
         if(types == null || types.length == 0) {
             typeError("extend.expects.at.least.one.argument");
+            throw new AssertionError(); //circumvent warning for types == null below
         }
         final Class<?>[] stypes = new Class<?>[types.length];
         try {
diff --git a/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java b/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
index 3ca57ee8062..5f559fb0f6d 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
@@ -28,7 +28,7 @@ package jdk.nashorn.internal.objects;
 import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 
 import java.lang.invoke.MethodHandle;
-import jdk.nashorn.internal.codegen.objects.FunctionObjectCreator;
+
 import jdk.nashorn.internal.runtime.GlobalFunctions;
 import jdk.nashorn.internal.runtime.Property;
 import jdk.nashorn.internal.runtime.PropertyMap;
@@ -94,14 +94,14 @@ public class ScriptFunctionImpl extends ScriptFunction {
 
     /**
      * Constructor called by (compiler) generated code for {@link ScriptObject}s.
-     * Code is generated by {@link FunctionObjectCreator}
+     * Code is generated by {@link jdk.nashorn.internal.codegen.CodeGenerator#newFunctionObject}
      *
      * @param data static function data
      * @param methodHandle handle for invocation
      * @param scope scope object
      * @param allocator instance constructor for function
      */
-    public ScriptFunctionImpl(final ScriptFunctionData data, final MethodHandle methodHandle, final ScriptObject scope, final MethodHandle allocator) {
+    public ScriptFunctionImpl(final MethodHandle methodHandle, final ScriptFunctionData data, final ScriptObject scope, final MethodHandle allocator) {
         super(data, getMap(data.isStrict()), scope);
         // Set method handles in script data
         data.setMethodHandles(methodHandle, allocator);
diff --git a/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionTrampolineImpl.java b/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionTrampolineImpl.java
new file mode 100644
index 00000000000..22dd74a0149
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionTrampolineImpl.java
@@ -0,0 +1,122 @@
+package jdk.nashorn.internal.objects;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+
+
+import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+
+import jdk.nashorn.internal.codegen.Compiler;
+import jdk.nashorn.internal.codegen.FunctionSignature;
+import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.ir.FunctionNode;
+import jdk.nashorn.internal.runtime.CodeInstaller;
+import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.runtime.ScriptFunction;
+import jdk.nashorn.internal.runtime.ScriptFunctionData;
+import jdk.nashorn.internal.runtime.ScriptObject;
+
+/**
+ * A trampoline is a promise to compile a {@link ScriptFunction} later. It just looks like
+ * the call to the script function, but when invoked it will compile the script function
+ * (in a new compile unit) and invoke it
+ */
+public final class ScriptFunctionTrampolineImpl extends ScriptFunctionImpl {
+
+    private CodeInstaller<Context> installer;
+
+    /** Function node to lazily recompile when trampoline is hit */
+    private FunctionNode functionNode;
+
+    /**
+     * Constructor
+     *
+     * @param installer    opaque code installer from context
+     * @param functionNode function node to lazily compile when trampoline is hit
+     * @param data         {@link ScriptFunctionData} for function
+     * @param scope        scope
+     * @param allocator    allocator
+     */
+    public ScriptFunctionTrampolineImpl(final CodeInstaller<Context> installer, final FunctionNode functionNode, final ScriptFunctionData data, final ScriptObject scope, final MethodHandle allocator) {
+        super(null, data, scope, allocator);
+
+        this.installer    = installer;
+        this.functionNode = functionNode;
+
+        data.setMethodHandles(makeTrampoline(), allocator);
+    }
+
+    private final MethodHandle makeTrampoline() {
+        final MethodType mt =
+            new FunctionSignature(
+                true,
+                functionNode.needsCallee(),
+                Type.OBJECT,
+                functionNode.getParameters().size()).
+            getMethodType();
+
+        return
+            MH.bindTo(
+                MH.asCollector(
+                    findOwnMH(
+                        "trampoline",
+                        Object.class,
+                        Object[].class),
+                    Object[].class,
+                    mt.parameterCount()),
+                this);
+    }
+
+    private static MethodHandle findOwnMH(final String name, final Class<?> rtype, final Class<?>... types) {
+        return MH.findVirtual(MethodHandles.lookup(), ScriptFunctionTrampolineImpl.class, name, MH.type(rtype, types));
+    }
+
+    @Override
+    protected ScriptFunction makeBoundFunction(final ScriptFunctionData data) {
+        //prevent trampoline recompilation cycle if a function is bound before use
+        compile();
+        return super.makeBoundFunction(data);
+    }
+
+    private MethodHandle compile() {
+        final Compiler compiler = new Compiler(installer, functionNode);
+        if (!compiler.compile()) {
+            assert false : "compilation error in trampoline for " + functionNode.getName();
+            return null;
+        }
+
+        final Class<?> clazz = compiler.install();
+        /* compute function signature for lazy method. this can be done first after compilation, as only then do we know
+         * the final state about callees, scopes and specialized parameter types */
+        final FunctionSignature signature = new FunctionSignature(true, functionNode.needsCallee(), Type.OBJECT, functionNode.getParameters().size());
+        final MethodType        mt        = signature.getMethodType();
+
+        MethodHandle mh = MH.findStatic(MethodHandles.publicLookup(), clazz, functionNode.getName(), mt);
+        mh = MH.bindTo(mh, this);
+
+        // now the invoker method looks like the one our superclass is expecting
+        resetInvoker(mh);
+
+        return mh;
+    }
+
+    @SuppressWarnings("unused")
+    private Object trampoline(final Object... args) {
+        /** Create a new compiler for the lazy node, using the same installation policy as the old one */
+
+        MethodHandle mh = compile();
+
+        // spread the array to invididual args of the correct type
+        mh = MH.asSpreader(mh, Object[].class, mh.type().parameterCount());
+
+        try {
+            //invoke the real method the trampoline points to. this only happens once
+            return mh.invoke(args);
+        } catch (final RuntimeException | Error e) {
+            throw e;
+        } catch (final Throwable t) {
+            throw new RuntimeException(t);
+        }
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/parser/Lexer.java b/nashorn/src/jdk/nashorn/internal/parser/Lexer.java
index 5b890b350d5..2ae029730a9 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/Lexer.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/Lexer.java
@@ -289,6 +289,11 @@ public class Lexer extends Scanner {
         add(type, start, position);
     }
 
+    /**
+     * Return the String of valid whitespace characters for regular
+     * expressions in JavaScript
+     * @return regexp whitespace string
+     */
     public static String getWhitespaceRegExp() {
         return JAVASCRIPT_WHITESPACE_IN_REGEXP;
     }
@@ -959,6 +964,8 @@ public class Lexer extends Scanner {
                     // Add string token without editing.
                     add(type, stringState.position, stringState.limit);
                     break;
+                default:
+                    break;
                 }
             } else {
                 /// Add string token without editing.
diff --git a/nashorn/src/jdk/nashorn/internal/parser/Parser.java b/nashorn/src/jdk/nashorn/internal/parser/Parser.java
index 4837c9a6554..1875ee02915 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/Parser.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/Parser.java
@@ -39,7 +39,6 @@ import static jdk.nashorn.internal.parser.TokenType.DECPREFIX;
 import static jdk.nashorn.internal.parser.TokenType.ELSE;
 import static jdk.nashorn.internal.parser.TokenType.EOF;
 import static jdk.nashorn.internal.parser.TokenType.EOL;
-import static jdk.nashorn.internal.parser.TokenType.EXECSTRING;
 import static jdk.nashorn.internal.parser.TokenType.FINALLY;
 import static jdk.nashorn.internal.parser.TokenType.FUNCTION;
 import static jdk.nashorn.internal.parser.TokenType.IDENT;
@@ -60,7 +59,9 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Stack;
-import jdk.nashorn.internal.codegen.Compiler;
+
+import jdk.nashorn.internal.codegen.CompilerConstants;
+import jdk.nashorn.internal.codegen.Namespace;
 import jdk.nashorn.internal.ir.AccessNode;
 import jdk.nashorn.internal.ir.BinaryNode;
 import jdk.nashorn.internal.ir.Block;
@@ -97,8 +98,10 @@ import jdk.nashorn.internal.ir.VarNode;
 import jdk.nashorn.internal.ir.WhileNode;
 import jdk.nashorn.internal.ir.WithNode;
 import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.runtime.ErrorManager;
 import jdk.nashorn.internal.runtime.JSErrorType;
 import jdk.nashorn.internal.runtime.ParserException;
+import jdk.nashorn.internal.runtime.Source;
 import jdk.nashorn.internal.runtime.ScriptingFunctions;
 
 /**
@@ -106,49 +109,72 @@ import jdk.nashorn.internal.runtime.ScriptingFunctions;
  *
  */
 public class Parser extends AbstractParser {
-    /** Code generator. */
-    private final Compiler compiler;
-
     /** Current context. */
     private final Context context;
 
     /** Is scripting mode. */
     private final boolean scripting;
 
-    /** Top level script being compiled. */
+    /** Top level script being parsed. */
     private FunctionNode script;
 
-    /** Current function being compiled. */
+    /** Current function being parsed. */
     private FunctionNode function;
 
     /** Current parsing block. */
     private Block block;
 
+    /** Namespace for function names where not explicitly given */
+    private final Namespace namespace;
+
     /**
-     * Construct a parser.
-     * @param compiler Compiler state used to parse.
+     * Constructor
+     *
+     * @param context parser context
+     * @param source  source to parse
+     * @param errors  error manager
      */
-    public Parser(final Compiler compiler) {
-        this(compiler, compiler.getContext()._strict);
+    public Parser(final Context context, final Source source, final ErrorManager errors) {
+        this(context, source, errors, context._strict);
     }
 
     /**
      * Construct a parser.
-     * @param compiler Compiler state used to parse.
-     * @param strict parser created with strict mode enabled.
+     *
+     * @param context parser context
+     * @param source  source to parse
+     * @param errors  error manager
+     * @param strict  parser created with strict mode enabled.
      */
-    public Parser(final Compiler compiler, final boolean strict) {
-        super(compiler.getSource(), compiler.getErrors(), strict);
-
-        this.compiler = compiler;
-        this.context  = compiler.getContext();
-        this.scripting = this.context._scripting;
+    public Parser(final Context context, final Source source, final ErrorManager errors, final boolean strict) {
+        super(source, errors, strict);
+        this.context   = context;
+        this.namespace = new Namespace(context.getNamespace());
+        this.scripting = context._scripting;
     }
 
     /**
-     * Parse source content.
-     * @param scriptName file name for script
-     * @return Top level function (script).
+     * Execute parse and return the resulting function node.
+     * Errors will be thrown and the error manager will contain information
+     * if parsing should fail
+     *
+     * This is the default parse call, which will name the function node
+     * "runScript" {@link CompilerConstants#RUN_SCRIPT}
+     *
+     * @return function node resulting from successful parse
+     */
+    public FunctionNode parse() {
+        return parse(RUN_SCRIPT.tag());
+    }
+
+    /**
+     * Execute parse and return the resulting function node.
+     * Errors will be thrown and the error manager will contain information
+     * if parsing should fail
+     *
+     * @param scriptName name for the script, given to the parsed FunctionNode
+     *
+     * @return function node resulting from successful parse
      */
     public FunctionNode parse(final String scriptName) {
         try {
@@ -257,11 +283,11 @@ loop:
         }
 
         sb.append(ident != null ? ident.getName() : FUNCTION_PREFIX.tag());
-        final String name = compiler.uniqueName(sb.toString());
+        final String name = namespace.uniqueName(sb.toString());
         assert function != null || name.equals(RUN_SCRIPT.tag())  : "name = " + name;// must not rename runScript().
 
         // Start new block.
-        final FunctionNode functionBlock = new FunctionNode(source, token, Token.descPosition(token), compiler, block, ident, name);
+        final FunctionNode functionBlock = new FunctionNode(source, token, Token.descPosition(token), namespace, block, ident, name);
         block = function = functionBlock;
         function.setStrictMode(isStrictMode);
 
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/CodeInstaller.java b/nashorn/src/jdk/nashorn/internal/runtime/CodeInstaller.java
index 789eb2ce520..3ec272a8eb9 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/CodeInstaller.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/CodeInstaller.java
@@ -34,14 +34,21 @@ package jdk.nashorn.internal.runtime;
  * The compiler still retains most of the state around code emission
  * and management internally, so this is to avoid passing around any
  * logic that isn't directly related to installing a class
+ * @param <T> owner class type for this code installer
  *
  */
-public interface CodeInstaller {
+public interface CodeInstaller<T> {
+    /**
+     * Return the owner for the CodeInstaller, e.g. a {@link Context}
+     * @return owner
+     */
+    public T getOwner();
+
     /**
      * Install a class
      * @param className name of the class with / separation
-      * @param bytecode  bytecode
-      * @return the installed class
+     * @param bytecode  bytecode
+     * @return the installed class
      */
     public Class<?> install(final String className, final byte[] bytecode);
 }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Context.java b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
index d220e29948c..8a7507fd5e8 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/Context.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
@@ -45,12 +45,16 @@ import java.security.CodeSource;
 import java.security.PrivilegedAction;
 import java.util.Locale;
 import java.util.TimeZone;
+
 import jdk.internal.org.objectweb.asm.ClassReader;
 import jdk.internal.org.objectweb.asm.util.CheckClassAdapter;
 import jdk.nashorn.internal.codegen.ClassEmitter;
 import jdk.nashorn.internal.codegen.Compiler;
 import jdk.nashorn.internal.codegen.Namespace;
 import jdk.nashorn.internal.codegen.objects.ObjectClassGenerator;
+import jdk.nashorn.internal.ir.FunctionNode;
+import jdk.nashorn.internal.ir.debug.PrintVisitor;
+import jdk.nashorn.internal.parser.Parser;
 import jdk.nashorn.internal.runtime.linker.JavaAdapterFactory;
 import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
 import jdk.nashorn.internal.runtime.options.KeyValueOption;
@@ -63,6 +67,36 @@ import sun.reflect.Reflection;
  */
 public final class Context {
 
+    /**
+     * ContextCodeInstaller that has the privilege of installing classes in the Context.
+     * Can only be instantiated from inside the context and is opaque to other classes
+     */
+    public static class ContextCodeInstaller implements CodeInstaller<Context> {
+        private final Context      context;
+        private final ScriptLoader loader;
+        private final CodeSource   codeSource;
+
+        private ContextCodeInstaller(final Context context, final ScriptLoader loader, final CodeSource codeSource) {
+            this.context    = context;
+            this.loader     = loader;
+            this.codeSource = codeSource;
+        }
+
+        /**
+         * Return the context for this installer
+         * @return context
+         */
+        @Override
+        public Context getOwner() {
+            return context;
+        }
+
+        @Override
+        public Class<?> install(final String className, final byte[] bytecode) {
+            return loader.installClass(className, bytecode, codeSource);
+        }
+    }
+
     /** Is Context global debug mode enabled ? */
     public static final boolean DEBUG = Options.getBooleanProperty("nashorn.debug");
 
@@ -751,6 +785,7 @@ public final class Context {
     /**
      * Initialize given global scope object.
      *
+     * @param global the global
      * @return the initialized global scope object.
      */
     public ScriptObject initGlobal(final ScriptObject global) {
@@ -877,22 +912,24 @@ public final class Context {
             }
         }
 
-        final Compiler compiler = Compiler.compiler(source, this, errMan, strict);
-
-        if (!compiler.compile()) {
+        final FunctionNode functionNode = new Parser(this, source, errMan, strict).parse();
+        if (errors.hasErrors() || _parse_only) {
             return null;
         }
 
-        final URL url = source.getURL();
+        if (_print_lower_parse) {
+            getErr().println(new PrintVisitor(functionNode));
+        }
+
+        final URL          url    = source.getURL();
         final ScriptLoader loader = _loader_per_compile ? createNewLoader() : scriptLoader;
         final CodeSource   cs     = url == null ? null : new CodeSource(url, (CodeSigner[])null);
+        final CodeInstaller<Context> installer = new ContextCodeInstaller(this, loader, cs);
 
-        script = compiler.install(new CodeInstaller() {
-            @Override
-            public Class<?> install(final String className, final byte[] bytecode) {
-                return loader.installClass(className, bytecode, cs);
-            }
-        });
+        final Compiler compiler = new Compiler(installer, functionNode, strict);
+
+        compiler.compile();
+        script = compiler.install();
 
         if (global != null) {
             global.cacheClass(source, script);
@@ -917,15 +954,14 @@ public final class Context {
     private ScriptObject newGlobalTrusted() {
         try {
             final Class<?> clazz = Class.forName("jdk.nashorn.internal.objects.Global", true, scriptLoader);
-            final Constructor cstr = clazz.getConstructor(Context.class);
+            final Constructor<?> cstr = clazz.getConstructor(Context.class);
             return (ScriptObject) cstr.newInstance(this);
         } catch (final Exception e) {
             printStackTrace(e);
             if (e instanceof RuntimeException) {
                 throw (RuntimeException)e;
-            } else {
-                throw new RuntimeException(e);
             }
+            throw new RuntimeException(e);
         }
     }
 }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/DebugLogger.java b/nashorn/src/jdk/nashorn/internal/runtime/DebugLogger.java
index dbbaeef6f2a..aa7f05d4dfe 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/DebugLogger.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/DebugLogger.java
@@ -73,8 +73,11 @@ public final class DebugLogger {
      * Get the output writer for the logger. Loggers always default to
      * stderr for output as they are used mainly to output debug info
      *
+     * Can be inherited so this should not be static.
+     *
      * @return print writer for log output.
      */
+    @SuppressWarnings("static-method")
     public PrintWriter getOutputStream() {
         return Context.getCurrentErr();
     }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/FindProperty.java b/nashorn/src/jdk/nashorn/internal/runtime/FindProperty.java
index 7089d1f6872..2df165a153d 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/FindProperty.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/FindProperty.java
@@ -36,7 +36,7 @@ import jdk.nashorn.internal.codegen.objects.ObjectClassGenerator;
 public final class FindProperty {
     /** Object where search began. */
     private final ScriptObject self;
-    ;
+
     /** Object where search finish. */
     private final ScriptObject prototype;
 
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
index d0b24b2c80e..48525058a72 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
@@ -78,12 +78,14 @@ public abstract class ScriptFunction extends ScriptObject {
     /**
      * Constructor
      *
-     * @param name         function name
-     * @param methodHandle method handle to function (if specializations are present, assumed to be most generic)
-     * @param map          property map
-     * @param scope        scope
-     * @param specs        specialized version of this function - other method handles
-     *
+     * @param name          function name
+     * @param methodHandle  method handle to function (if specializations are present, assumed to be most generic)
+     * @param map           property map
+     * @param scope         scope
+     * @param specs         specialized version of this function - other method handles
+     * @param strict        is this a strict mode function?
+     * @param builtin       is this a built in function?
+     * @param isConstructor is this a constructor?
      */
     protected ScriptFunction(
             final String name,
@@ -240,10 +242,17 @@ public abstract class ScriptFunction extends ScriptObject {
      * @param args additional arguments to bind to this function. Can be null or empty to not bind additional arguments.
      * @return a function with the specified self and parameters bound.
      */
-    protected ScriptFunction makeBoundFunction(Object self, Object[] args) {
+    protected ScriptFunction makeBoundFunction(final Object self, final Object[] args) {
         return makeBoundFunction(data.makeBoundFunctionData(this, self, args));
     }
 
+    /**
+     * Create a version of this function as in {@link ScriptFunction#makeBoundFunction(Object, Object[])},
+     * but using a {@link ScriptFunctionData} for the bound data.
+     *
+     * @param boundData ScriptFuntionData for the bound function
+     * @return a function with the bindings performed according to the given data
+     */
     protected abstract ScriptFunction makeBoundFunction(ScriptFunctionData boundData);
 
     @Override
@@ -349,6 +358,15 @@ public abstract class ScriptFunction extends ScriptObject {
         return scope;
     }
 
+    /**
+     * Reset the invoker handle. This is used by trampolines for
+     * lazy code generation
+     * @param invoker new invoker
+     */
+    protected void resetInvoker(final MethodHandle invoker) {
+        data.resetInvoker(invoker);
+    }
+
     /**
      * Prototype getter for this ScriptFunction - follows the naming convention
      * used by Nasgen and the code generator
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunctionData.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunctionData.java
index 3366993cdf1..37e0246f486 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunctionData.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunctionData.java
@@ -101,11 +101,13 @@ public final class ScriptFunctionData {
 
     /**
      * Constructor
+     *
      * @param name the function name
      * @param methodHandle the method handle
      * @param specs array of specialized method handles
      * @param strict strict flag
      * @param builtin builtin flag
+     * @param isConstructor constructor flags
      */
     public ScriptFunctionData(final String name, final MethodHandle methodHandle, final MethodHandle[] specs, final boolean strict, final boolean builtin, final boolean isConstructor) {
         this(name, null, 0L, methodHandle, specs, strict, builtin, isConstructor);
@@ -432,7 +434,7 @@ public final class ScriptFunctionData {
      * @param invoker the invoker handle
      * @param allocator the allocator handle
      */
-    public void setMethodHandles(MethodHandle invoker, MethodHandle allocator) {
+    public void setMethodHandles(final MethodHandle invoker, final MethodHandle allocator) {
         // We can't make method handle fields final because they're not available during codegen
         // and they're set when first called, so we enforce set-once here.
         if (this.invoker == null) {
@@ -442,6 +444,16 @@ public final class ScriptFunctionData {
         }
     }
 
+    /**
+     * Used by the trampoline. Must not be any wider than package
+     * private
+     * @param invoker new invoker
+     */
+    void resetInvoker(final MethodHandle invoker) {
+        this.invoker     = invoker;
+        this.constructor = null; //delay constructor composition
+    }
+
     /**
      * Allocates an object using this function's allocator.
      * @return the object allocated using this function's allocator, or null if the function doesn't have an allocator.
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java
index 523179ad820..2925c8da6b5 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java
@@ -54,14 +54,21 @@ public final class ScriptingFunctions {
     /** Handle to implementation of {@link ScriptingFunctions#exec} - Nashorn extension */
     public static final MethodHandle EXEC = findOwnMH("exec",     Object.class, Object.class, Object.class, Object.class);
 
-    /** Names of special properties used by $EXEC API. */
-    public  static final String EXEC_NAME = "$EXEC";
-    public  static final String OUT_NAME  = "$OUT";
-    public  static final String ERR_NAME  = "$ERR";
-    public  static final String EXIT_NAME = "$EXIT";
+    /** EXEC name - special property used by $EXEC API. */
+    public static final String EXEC_NAME = "$EXEC";
+
+    /** OUT name - special property used by $EXEC API. */
+    public static final String OUT_NAME  = "$OUT";
+
+    /** ERR name - special property used by $EXEC API. */
+    public static final String ERR_NAME  = "$ERR";
+
+    /** EXIT name - special property used by $EXEC API. */
+    public static final String EXIT_NAME = "$EXIT";
 
     /** Names of special properties used by $ENV API. */
     public  static final String ENV_NAME  = "$ENV";
+
     private static final String PWD_NAME  = "PWD";
 
     private ScriptingFunctions() {
@@ -114,8 +121,11 @@ public final class ScriptingFunctions {
      *
      * @param self   self reference
      * @param string string to execute
+     * @param input
      *
      * @return output string from the request
+     * @throws IOException
+     * @throws InterruptedException
      */
     public static Object exec(final Object self, final Object string, final Object input) throws IOException, InterruptedException {
         // Current global is need to fetch additional inputs and for additional results.
diff --git a/nashorn/src/jdk/nashorn/tools/Shell.java b/nashorn/src/jdk/nashorn/tools/Shell.java
index 124e83c70c4..d353c5f969e 100644
--- a/nashorn/src/jdk/nashorn/tools/Shell.java
+++ b/nashorn/src/jdk/nashorn/tools/Shell.java
@@ -41,6 +41,8 @@ import java.util.Locale;
 import java.util.ResourceBundle;
 import jdk.nashorn.api.scripting.NashornException;
 import jdk.nashorn.internal.codegen.Compiler;
+import jdk.nashorn.internal.ir.FunctionNode;
+import jdk.nashorn.internal.parser.Parser;
 import jdk.nashorn.internal.runtime.Context;
 import jdk.nashorn.internal.runtime.ErrorManager;
 import jdk.nashorn.internal.runtime.ScriptFunction;
@@ -241,13 +243,14 @@ public class Shell {
 
             // For each file on the command line.
             for (final String fileName : files) {
-                final File file = new File(fileName);
-                final Source source = new Source(fileName, file);
-                final Compiler compiler = Compiler.compiler(source, context);
-                compiler.compile();
+                final FunctionNode functionNode = new Parser(context, new Source(fileName, new File(fileName)), errors).parse();
+
                 if (errors.getNumberOfErrors() != 0) {
                     return COMPILATION_ERROR;
                 }
+
+                //null - pass no code installer - this is compile only
+                new Compiler(context, functionNode).compile();
             }
         } finally {
             context.getOut().flush();
@@ -282,7 +285,7 @@ public class Shell {
             // For each file on the command line.
             for (final String fileName : files) {
                 final File file = new File(fileName);
-                ScriptFunction script = context.compileScript(new Source(fileName, file.toURI().toURL()), global);
+                final ScriptFunction script = context.compileScript(new Source(fileName, file.toURI().toURL()), global);
                 if (script == null || errors.getNumberOfErrors() != 0) {
                     return COMPILATION_ERROR;
                 }
diff --git a/nashorn/test/script/trusted/JDK-8006529.js b/nashorn/test/script/trusted/JDK-8006529.js
index f748649f727..0ad1db31795 100644
--- a/nashorn/test/script/trusted/JDK-8006529.js
+++ b/nashorn/test/script/trusted/JDK-8006529.js
@@ -39,17 +39,15 @@
  * and FunctionNode because of package-access check and so reflective calls.
  */
 
+var Parser         = Java.type("jdk.nashorn.internal.parser.Parser")
 var Compiler       = Java.type("jdk.nashorn.internal.codegen.Compiler")
 var Context        = Java.type("jdk.nashorn.internal.runtime.Context")
 var Source         = Java.type("jdk.nashorn.internal.runtime.Source")
 var FunctionNode   = Java.type("jdk.nashorn.internal.ir.FunctionNode")
 
 // Compiler class methods and fields
-
-// Compiler.compile(Source, Context)
-var compilerMethod = Compiler.class.getMethod("compiler", Source.class, Context.class);
-// Compiler.compile()
-var compileMethod  = Compiler.class.getMethod("compile");
+var parseMethod = Parser.class.getMethod("parse");
+var compileMethod = Compiler.class.getMethod("compile");
 
 // NOTE: private field. But this is a trusted test!
 // Compiler.functionNode
@@ -90,10 +88,14 @@ function getFirstFunction(functionNode) {
 // source code, returns a jdk.nashorn.internal.ir.FunctionNode object 
 // representing it.
 function compile(source) {
-   var compiler = compilerMethod.invoke(null,
-       new Source("<no name>", source), Context.getContext())
-   compileMethod.invoke(compiler);
-   return getScriptNode(compiler)
+    var source   = new Source("<no name>", source);
+    var parser   = new Parser(Context.getContext(), source, null);
+    var func     = parseMethod.invoke(parser);
+    var compiler = new Compiler(Context.getContext(), func);
+
+    compileMethod.invoke(compiler);
+
+    return getScriptNode(compiler);
 };
 
 var allAssertions = (function() {
diff --git a/nashorn/test/src/jdk/nashorn/internal/parser/ParserTest.java b/nashorn/test/src/jdk/nashorn/internal/parser/ParserTest.java
index 27a637ea78a..08e20df3aa1 100644
--- a/nashorn/test/src/jdk/nashorn/internal/parser/ParserTest.java
+++ b/nashorn/test/src/jdk/nashorn/internal/parser/ParserTest.java
@@ -156,10 +156,7 @@ public class ParserTest {
                 Context.setGlobal(global);
             }
             final Source   source   = new Source(file.getAbsolutePath(), buffer);
-            final Compiler compiler = Compiler.compiler(source, context, errors, context._strict);
-
-            final Parser parser = new Parser(compiler);
-            parser.parse(CompilerConstants.RUN_SCRIPT.tag());
+            new Parser(context, source, errors).parse();
             if (errors.getNumberOfErrors() > 0) {
                 log("Parse failed: " + file.getAbsolutePath());
                 failed++;
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/SharedContextEvaluator.java b/nashorn/test/src/jdk/nashorn/internal/test/framework/SharedContextEvaluator.java
index 58557374e91..4ea77ac44a0 100644
--- a/nashorn/test/src/jdk/nashorn/internal/test/framework/SharedContextEvaluator.java
+++ b/nashorn/test/src/jdk/nashorn/internal/test/framework/SharedContextEvaluator.java
@@ -126,6 +126,7 @@ public final class SharedContextEvaluator implements ScriptEvaluator {
                 }
                 final File file = new File(fileName);
                 ScriptFunction script = context.compileScript(new Source(fileName, file.toURI().toURL()), global);
+
                 if (script == null || errors.getNumberOfErrors() != 0) {
                     return COMPILATION_ERROR;
                 }

From 82f8cef55c565ed46dc5de964478f4c0405692d1 Mon Sep 17 00:00:00 2001
From: Attila Szegedi <attila@openjdk.org>
Date: Thu, 14 Feb 2013 13:22:26 +0100
Subject: [PATCH 147/311] 8008085: Integrate Dynalink source code into Nashorn
 codebase

Reviewed-by: jlaskey, lagergren, sundar
---
 nashorn/THIRD_PARTY_README                    |  31 +
 nashorn/make/build.xml                        |  39 +-
 nashorn/make/nbproject/project.xml            |   1 -
 nashorn/make/project.properties               |  15 +-
 .../internal/dynalink/CallSiteDescriptor.java | 175 +++++
 .../internal/dynalink/ChainedCallSite.java    | 212 ++++++
 .../dynalink/DefaultBootstrapper.java         | 144 ++++
 .../jdk/internal/dynalink/DynamicLinker.java  | 281 +++++++
 .../dynalink/DynamicLinkerFactory.java        | 311 ++++++++
 .../dynalink/MonomorphicCallSite.java         | 116 +++
 .../NoSuchDynamicMethodException.java         | 103 +++
 .../internal/dynalink/RelinkableCallSite.java | 148 ++++
 .../dynalink/beans/AbstractJavaLinker.java    | 690 ++++++++++++++++++
 .../beans/AccessibleMembersLookup.java        | 262 +++++++
 .../beans/ApplicableOverloadedMethods.java    | 221 ++++++
 .../dynalink/beans/BeanIntrospector.java      | 104 +++
 .../internal/dynalink/beans/BeanLinker.java   | 493 +++++++++++++
 .../internal/dynalink/beans/BeansLinker.java  | 180 +++++
 .../beans/CheckRestrictedPackage.java         | 109 +++
 .../beans/CheckRestrictedPackageInternal.java | 252 +++++++
 .../internal/dynalink/beans/ClassLinker.java  | 110 +++
 .../internal/dynalink/beans/ClassString.java  | 209 ++++++
 .../dynalink/beans/DynamicMethod.java         | 169 +++++
 .../dynalink/beans/DynamicMethodLinker.java   | 130 ++++
 .../dynalink/beans/FacetIntrospector.java     | 188 +++++
 .../beans/GuardedInvocationComponent.java     | 251 +++++++
 .../dynalink/beans/MaximallySpecific.java     | 211 ++++++
 .../beans/OverloadedDynamicMethod.java        | 313 ++++++++
 .../dynalink/beans/OverloadedMethod.java      | 266 +++++++
 .../beans/RestrictedPackageTester.java        | 113 +++
 .../dynalink/beans/SimpleDynamicMethod.java   | 241 ++++++
 .../internal/dynalink/beans/StaticClass.java  | 138 ++++
 .../beans/StaticClassIntrospector.java        | 117 +++
 .../dynalink/beans/StaticClassLinker.java     | 204 ++++++
 .../dynalink/beans/messages.properties        |  25 +
 .../jdk/internal/dynalink/beans/package.html  |  86 +++
 .../dynalink/linker/ConversionComparator.java | 114 +++
 .../dynalink/linker/GuardedInvocation.java    | 315 ++++++++
 .../linker/GuardingDynamicLinker.java         | 112 +++
 .../linker/GuardingTypeConverterFactory.java  | 114 +++
 .../internal/dynalink/linker/LinkRequest.java | 149 ++++
 .../dynalink/linker/LinkerServices.java       | 165 +++++
 .../TypeBasedGuardingDynamicLinker.java       | 102 +++
 .../jdk/internal/dynalink/linker/package.html |  87 +++
 .../src/jdk/internal/dynalink/package.html    |  93 +++
 .../support/AbstractCallSiteDescriptor.java   | 186 +++++
 .../support/AbstractRelinkableCallSite.java   | 118 +++
 .../dynalink/support/AutoDiscovery.java       | 134 ++++
 .../internal/dynalink/support/Backport.java   |  99 +++
 .../support/BottomGuardingDynamicLinker.java  | 116 +++
 .../support/CallSiteDescriptorFactory.java    | 265 +++++++
 .../internal/dynalink/support/ClassMap.java   | 177 +++++
 .../CompositeGuardingDynamicLinker.java       | 132 ++++
 ...mpositeTypeBasedGuardingDynamicLinker.java | 226 ++++++
 .../support/DefaultCallSiteDescriptor.java    | 135 ++++
 .../jdk/internal/dynalink/support/Guards.java | 360 +++++++++
 .../dynalink/support/LinkRequestImpl.java     | 143 ++++
 .../dynalink/support/LinkerServicesImpl.java  | 141 ++++
 .../jdk/internal/dynalink/support/Lookup.java | 361 +++++++++
 .../support/LookupCallSiteDescriptor.java     | 118 +++
 .../internal/dynalink/support/NameCodec.java  | 218 ++++++
 .../support/NamedDynCallSiteDescriptor.java   | 118 +++
 .../RuntimeContextLinkRequestImpl.java        | 142 ++++
 .../support/TypeConverterFactory.java         | 320 ++++++++
 .../dynalink/support/TypeUtilities.java       | 442 +++++++++++
 .../support/UnnamedDynCallSiteDescriptor.java | 127 ++++
 .../dynalink/support/messages.properties      |  86 +++
 .../internal/dynalink/support/package.html    |  89 +++
 .../nashorn/internal/codegen/Compiler.java    |   3 +-
 .../internal/codegen/MethodEmitter.java       |   2 +-
 .../nashorn/internal/codegen/WeighNodes.java  |   1 -
 .../src/jdk/nashorn/internal/ir/Block.java    |   1 -
 .../src/jdk/nashorn/internal/ir/CallNode.java |   1 -
 nashorn/src/jdk/nashorn/internal/ir/Node.java |   1 -
 .../src/jdk/nashorn/internal/ir/Symbol.java   |   1 -
 .../jdk/nashorn/internal/objects/Global.java  |   4 +-
 .../internal/objects/NativeBoolean.java       |   4 +-
 .../internal/objects/NativeJSAdapter.java     |   6 +-
 .../nashorn/internal/objects/NativeJava.java  |   4 +-
 .../internal/objects/NativeJavaImporter.java  |   8 +-
 .../internal/objects/NativeNumber.java        |   4 +-
 .../internal/objects/NativeString.java        |   6 +-
 .../jdk/nashorn/internal/parser/Lexer.java    |   2 +-
 .../internal/runtime/GlobalObject.java        |   4 +-
 .../jdk/nashorn/internal/runtime/JSType.java  |   2 +-
 .../internal/runtime/NativeJavaPackage.java   |   8 +-
 .../internal/runtime/ScriptFunction.java      |   6 +-
 .../internal/runtime/ScriptLoader.java        |   6 +
 .../internal/runtime/ScriptObject.java        |   8 +-
 .../internal/runtime/ScriptRuntime.java       |   2 +-
 .../internal/runtime/SetMethodCreator.java    |   7 +-
 .../internal/runtime/StructureLoader.java     |   2 -
 .../nashorn/internal/runtime/Undefined.java   |   8 +-
 .../nashorn/internal/runtime/WithObject.java  |   8 +-
 .../internal/runtime/linker/Bootstrap.java    |  12 +-
 .../runtime/linker/JSObjectLinker.java        |  12 +-
 .../runtime/linker/JavaAdapterFactory.java    |   4 +-
 .../linker/JavaArgumentConverters.java        |   2 +-
 .../runtime/linker/LinkerCallSite.java        |   6 +-
 .../runtime/linker/NashornBottomLinker.java   |  12 +-
 .../linker/NashornCallSiteDescriptor.java     |   6 +-
 .../runtime/linker/NashornLinker.java         |  19 +-
 .../linker/NashornPrimitiveLinker.java        |  16 +-
 .../linker/NashornStaticClassLinker.java      |  18 +-
 .../runtime/linker/PrimitiveLookup.java       |  10 +-
 .../internal/runtime/options/Options.java     |   1 -
 .../test/script/sandbox/nashorninternals.js   |   4 +
 .../api/scripting/ScriptEngineTest.java       |   2 +-
 .../nashorn/internal/runtime/ContextTest.java |   1 -
 .../nashorn/internal/runtime/JSTypeTest.java  |   2 +-
 110 files changed, 12230 insertions(+), 168 deletions(-)
 create mode 100644 nashorn/src/jdk/internal/dynalink/CallSiteDescriptor.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/ChainedCallSite.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/DefaultBootstrapper.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/DynamicLinker.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/DynamicLinkerFactory.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/MonomorphicCallSite.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/NoSuchDynamicMethodException.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/RelinkableCallSite.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/beans/AbstractJavaLinker.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/beans/AccessibleMembersLookup.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/beans/ApplicableOverloadedMethods.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/beans/BeanIntrospector.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/beans/BeanLinker.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/beans/BeansLinker.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/beans/CheckRestrictedPackage.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/beans/CheckRestrictedPackageInternal.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/beans/ClassLinker.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/beans/ClassString.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/beans/DynamicMethod.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/beans/DynamicMethodLinker.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/beans/FacetIntrospector.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/beans/GuardedInvocationComponent.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/beans/MaximallySpecific.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/beans/OverloadedDynamicMethod.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/beans/OverloadedMethod.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/beans/RestrictedPackageTester.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/beans/SimpleDynamicMethod.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/beans/StaticClass.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/beans/StaticClassIntrospector.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/beans/StaticClassLinker.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/beans/messages.properties
 create mode 100644 nashorn/src/jdk/internal/dynalink/beans/package.html
 create mode 100644 nashorn/src/jdk/internal/dynalink/linker/ConversionComparator.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/linker/GuardedInvocation.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/linker/GuardingDynamicLinker.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/linker/GuardingTypeConverterFactory.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/linker/LinkRequest.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/linker/LinkerServices.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/linker/TypeBasedGuardingDynamicLinker.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/linker/package.html
 create mode 100644 nashorn/src/jdk/internal/dynalink/package.html
 create mode 100644 nashorn/src/jdk/internal/dynalink/support/AbstractCallSiteDescriptor.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/support/AbstractRelinkableCallSite.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/support/AutoDiscovery.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/support/Backport.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/support/BottomGuardingDynamicLinker.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/support/CallSiteDescriptorFactory.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/support/ClassMap.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/support/CompositeGuardingDynamicLinker.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/support/CompositeTypeBasedGuardingDynamicLinker.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/support/DefaultCallSiteDescriptor.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/support/Guards.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/support/LinkRequestImpl.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/support/LinkerServicesImpl.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/support/Lookup.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/support/LookupCallSiteDescriptor.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/support/NameCodec.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/support/NamedDynCallSiteDescriptor.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/support/RuntimeContextLinkRequestImpl.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/support/TypeConverterFactory.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/support/TypeUtilities.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/support/UnnamedDynCallSiteDescriptor.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/support/messages.properties
 create mode 100644 nashorn/src/jdk/internal/dynalink/support/package.html

diff --git a/nashorn/THIRD_PARTY_README b/nashorn/THIRD_PARTY_README
index 44318349aed..546280f129c 100644
--- a/nashorn/THIRD_PARTY_README
+++ b/nashorn/THIRD_PARTY_README
@@ -67,3 +67,34 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
 IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
 OF SUCH DAMAGE.
 --- end of LICENSE ---
+
+%% This notice is provided with respect to Dynalink library which is included
+with the Nashorn technology.
+
+--- begin of LICENSE ---
+Copyright (c) 2009-2013, Attila Szegedi
+
+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 with the distribution.
+* Neither the name of the copyright holder nor the names of
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+--- end of LICENSE ---
diff --git a/nashorn/make/build.xml b/nashorn/make/build.xml
index d5264cc70be..3043b1890e7 100644
--- a/nashorn/make/build.xml
+++ b/nashorn/make/build.xml
@@ -54,19 +54,11 @@
 
   <target name="clean" depends="init, clean-nasgen">
     <delete includeemptydirs="true">
-      <fileset dir="${build.dir}" excludes="${dynalink.dir.name}/**/*" erroronmissingdir="false"/>
+      <fileset dir="${build.dir}" erroronmissingdir="false"/>
     </delete>
     <delete dir="${dist.dir}"/>
   </target>
 
-  <target name="clean-dynalink">
-    <delete dir="${dynalink.dir}"/>
-  </target>
-
-  <target name="clean-all" depends="clean-dynalink, clean">
-    <delete dir="${build.dir}"/>
-  </target>
-
   <!-- do it only if ASM is not available -->
   <target name="compile-asm" depends="prepare" unless="asm.available">
     <javac srcdir="${jdk.asm.src.dir}"
@@ -79,29 +71,7 @@
            includeantruntime="false"/>
   </target>
 
-  <target name="check-dynalink-uptodate" depends="init">
-    <property name="versioned.dynalink.jar" value="${dynalink.dir}/dynalink-${dynalink.jar.version}.jar"/>
-    <condition property="dynalink.uptodate">
-      <and>
-        <available file="${versioned.dynalink.jar}"/>
-        <filesmatch file1="${versioned.dynalink.jar}" file2="${dynalink.jar}"/>
-      </and>
-    </condition>
-  </target>
-
-  <target name="get-dynalink" depends="check-dynalink-uptodate" unless="dynalink.uptodate">
-    <mkdir dir="${dynalink.dir}"/>
-    <!-- Delete previous snapshots, if any -->
-    <delete>
-      <fileset dir="${dynalink.dir}" includes="*"/>
-    </delete>
-    <property name="dynalink.download.base.url" value="http://oss.sonatype.org/content/repositories/${dynalink.version.type}s/org/dynalang/dynalink/${dynalink.version}/dynalink-${dynalink.jar.version}"/>
-    <get src="${dynalink.download.base.url}.jar" dest="${versioned.dynalink.jar}" usetimestamp="true"/>
-    <get src="${dynalink.download.base.url}-sources.jar" dest="${dynalink.dir}/dynalink-sources.jar" usetimestamp="true"/>
-    <copy file="${versioned.dynalink.jar}" tofile="${dynalink.jar}" overwrite="true"/>
-  </target>
-
-  <target name="compile" depends="compile-asm, get-dynalink" description="Compiles nashorn">
+  <target name="compile" depends="compile-asm" description="Compiles nashorn">
     <javac srcdir="${src.dir}"
            destdir="${build.classes.dir}"
            classpath="${javac.classpath}"
@@ -126,6 +96,8 @@
     <copy todir="${build.classes.dir}/jdk/nashorn/tools/resources">
        <fileset dir="${src.dir}/jdk/nashorn/tools/resources/"/>
     </copy>
+    <copy file="${src.dir}/jdk/internal/dynalink/support/messages.properties" todir="${build.classes.dir}/jdk/internal/dynalink/support"/>
+
     <echo message="full=${nashorn.fullversion}" file="${build.classes.dir}/jdk/nashorn/internal/runtime/resources/version.properties"/>
     <echo file="${build.classes.dir}/jdk/nashorn/internal/runtime/resources/version.properties" append="true">${line.separator}</echo>
     <echo message="release=${nashorn.version}" file="${build.classes.dir}/jdk/nashorn/internal/runtime/resources/version.properties" append="true"/>
@@ -134,7 +106,6 @@
   <target name="jar" depends="compile, run-nasgen" description="Creates nashorn.jar">
     <jar jarfile="${dist.jar}" manifest="${meta.inf.dir}/MANIFEST.MF" index="true" filesetmanifest="merge">
       <fileset dir="${build.classes.dir}"/>
-      <zipfileset src="${dynalink.jar}"/>
       <manifest>
         <attribute name="Archiver-Version" value="n/a"/>
         <attribute name="Build-Jdk" value="${java.runtime.version}"/>
@@ -152,12 +123,10 @@
     <javadoc destdir="${dist.javadoc.dir}" use="yes" overview="src/overview.html" windowtitle="${nashorn.product.name} ${nashorn.version}" additionalparam="-quiet" failonerror="true">
       <classpath>
         <pathelement location="${build.classes.dir}"/>
-        <pathelement location="${dynalink.jar}"/>
       </classpath>
       <fileset dir="${src.dir}" includes="**/*.java"/>
       <fileset dir="${jdk.asm.src.dir}" includes="**/*.java"/>
       <link href="http://docs.oracle.com/javase/7/docs/api/"/>
-      <link href="http://szegedi.github.com/dynalink/0.4/javadoc/"/>
       <!-- The following tags are used only in ASM sources - just ignore these -->
       <tag name="label" description="label tag in ASM sources" enabled="false"/>
       <tag name="linked" description="linked tag in ASM sources" enabled="false"/>
diff --git a/nashorn/make/nbproject/project.xml b/nashorn/make/nbproject/project.xml
index bde88f6d66c..828dc29d16b 100644
--- a/nashorn/make/nbproject/project.xml
+++ b/nashorn/make/nbproject/project.xml
@@ -164,7 +164,6 @@
             </compilation-unit>
             <compilation-unit>
                 <package-root>../src</package-root>
-                <classpath mode="compile">../build/dynalink/dynalink.jar</classpath>
                 <source-level>1.7</source-level>
             </compilation-unit>
             <compilation-unit>
diff --git a/nashorn/make/project.properties b/nashorn/make/project.properties
index 544b1e91388..3e1bbd266d4 100644
--- a/nashorn/make/project.properties
+++ b/nashorn/make/project.properties
@@ -87,23 +87,10 @@ testng.listeners=\
  org.testng.reporters.EmailableReporter, \
  jdk.nashorn.internal.test.framework.JSJUnitReportReporter
 
-# Define the version of Dynalink that is used. Version types are either
-# 'snapshot' or 'release'. When it is 'snapshot', the version must have
-# "-SNAPSHOT" suffix and the jar version will have a timestamp in it. When
-# it's 'release', the version has no suffix, and the jar version is 
-# identical to version - fun with Maven central.
-dynalink.version=0.5-SNAPSHOT
-dynalink.version.type=snapshot
-dynalink.jar.version=0.5-20130109.113843-12
-dynalink.dir.name=dynalink
-dynalink.dir=build/${dynalink.dir.name}
-dynalink.jar=${dynalink.dir}/dynalink.jar
-
 javac.debug=true
 javac.encoding=ascii
 javac.classpath=\
-    ${build.classes.dir}:\
-    ${dynalink.jar}
+    ${build.classes.dir}
 javac.test.classpath=\
     ${build.classes.dir}:\
     ${build.test.classes.dir}:\
diff --git a/nashorn/src/jdk/internal/dynalink/CallSiteDescriptor.java b/nashorn/src/jdk/internal/dynalink/CallSiteDescriptor.java
new file mode 100644
index 00000000000..bb2a09f273c
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/CallSiteDescriptor.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink;
+
+import java.lang.invoke.MethodHandles.Lookup;
+import java.lang.invoke.MethodType;
+import jdk.internal.dynalink.support.CallSiteDescriptorFactory;
+
+
+/**
+ * An immutable descriptor of a call site. It is an immutable object that contains all the information about a call
+ * site: the class performing the lookups, the name of the method being invoked, and the method signature. The library
+ * has a default {@link CallSiteDescriptorFactory} for descriptors that you can use, or you can create your own
+ * descriptor classes, especially if you need to add further information (values passed in additional parameters to the
+ * bootstrap method) to them. Call site descriptors are used in this library in place of passing a real call site to
+ * guarding linkers so they aren't tempted to directly manipulate the call sites. The constructors of built-in
+ * {@link RelinkableCallSite} implementations all need a call site descriptor. Even if you create your own call site
+ * descriptors consider using {@link CallSiteDescriptorFactory#tokenizeName(String)} in your implementation.
+ *
+ * @author Attila Szegedi
+ */
+public interface CallSiteDescriptor {
+    /**
+     * The index of the name token that will carry the operation scheme prefix (usually, "dyn").
+     */
+    public static final int SCHEME = 0;
+    /**
+     * The index of the name token that will usually carry the operation name.
+     */
+
+    public static final int OPERATOR=1;
+    /**
+     * The index of the name token that will usually carry a name of an operand (of a property, method, etc.)
+     */
+
+    public static final int NAME_OPERAND=2;
+
+    /**
+     * Character used to delimit tokens in an call site name.
+     */
+    public static final String TOKEN_DELIMITER = ":";
+
+    /**
+     * Character used to delimit operation names in a composite operation specification.
+     */
+    public static final String OPERATOR_DELIMITER = "|";
+
+    /**
+     * Returns the number of tokens in the name of the method at the call site. Method names are tokenized with the
+     * colon ":" character, i.e. "dyn:getProp:color" would be the name used to describe a method that retrieves the
+     * property named "color" on the object it is invoked on.
+     * @return the number of tokens in the name of the method at the call site.
+     */
+    public int getNameTokenCount();
+
+    /**
+     * Returns the <i>i<sup>th</sup></i> token in the method name at the call site. Method names are tokenized with the
+     * colon ":" character.
+     * @param i the index of the token. Must be between 0 (inclusive) and {@link #getNameTokenCount()} (exclusive)
+     * @throws IllegalArgumentException if the index is outside the allowed range.
+     * @return the <i>i<sup>th</sup></i> token in the method name at the call site. The returned strings are interned.
+     */
+    public String getNameToken(int i);
+
+    /**
+     * Returns the name of the method at the call site. Note that the object internally only stores the tokenized name,
+     * and has to reconstruct the full name from tokens on each invocation.
+     * @return the name of the method at the call site.
+     */
+    public String getName();
+
+    /**
+     * The type of the method at the call site.
+     *
+     * @return type of the method at the call site.
+     */
+    public MethodType getMethodType();
+
+    /**
+     * Returns the lookup passed to the bootstrap method.
+     * @return the lookup passed to the bootstrap method.
+     */
+    public Lookup getLookup();
+
+    /**
+     * Creates a new call site descriptor from this descriptor, which is identical to this, except it changes the method
+     * type.
+     *
+     * @param newMethodType the new method type
+     * @return a new call site descriptor, with the method type changed.
+     */
+    public CallSiteDescriptor changeMethodType(MethodType newMethodType);
+
+}
\ No newline at end of file
diff --git a/nashorn/src/jdk/internal/dynalink/ChainedCallSite.java b/nashorn/src/jdk/internal/dynalink/ChainedCallSite.java
new file mode 100644
index 00000000000..feb03e28bae
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/ChainedCallSite.java
@@ -0,0 +1,212 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.concurrent.atomic.AtomicReference;
+import jdk.internal.dynalink.linker.GuardedInvocation;
+import jdk.internal.dynalink.support.AbstractRelinkableCallSite;
+
+
+/**
+ * A relinkable call site that maintains a chain of linked method handles. In the default implementation, up to 8 method
+ * handles can be chained, cascading from one to the other through
+ * {@link MethodHandles#guardWithTest(MethodHandle, MethodHandle, MethodHandle)}. When this call site has to link a new
+ * method handle and the length of the chain is already at the maximum, it will throw away the oldest method handle.
+ * Switchpoint-invalidated handles in the chain are removed eagerly (on each linking request, and whenever a
+ * switchpoint-invalidated method handle is traversed during invocation). There is currently no profiling
+ * attached to the handles in the chain, so they are never reordered based on usage; the most recently linked method
+ * handle is always at the start of the chain.
+ */
+public class ChainedCallSite extends AbstractRelinkableCallSite {
+    private final AtomicReference<LinkedList<GuardedInvocation>> invocations = new AtomicReference<>();
+
+    /**
+     * Creates a new chained call site.
+     * @param descriptor the descriptor for the call site.
+     */
+    public ChainedCallSite(CallSiteDescriptor descriptor) {
+        super(descriptor);
+    }
+
+    /**
+     * The maximum number of method handles in the chain. Defaults to 8. You can override it in a subclass if you need
+     * to change the value. If your override returns a value less than 1, the code will break.
+     * @return the maximum number of method handles in the chain.
+     */
+    @SuppressWarnings("static-method")
+    protected int getMaxChainLength() {
+        return 8;
+    }
+
+    @Override
+    public void relink(GuardedInvocation guardedInvocation, MethodHandle fallback) {
+        relinkInternal(guardedInvocation, fallback, false);
+    }
+
+    @Override
+    public void resetAndRelink(GuardedInvocation guardedInvocation, MethodHandle fallback) {
+        relinkInternal(guardedInvocation, fallback, true);
+    }
+
+    private MethodHandle relinkInternal(GuardedInvocation invocation, MethodHandle relink, boolean reset) {
+        final LinkedList<GuardedInvocation> currentInvocations = invocations.get();
+        @SuppressWarnings({ "unchecked", "rawtypes" })
+        final LinkedList<GuardedInvocation> newInvocations =
+            currentInvocations == null || reset ? new LinkedList<>() : (LinkedList)currentInvocations.clone();
+
+        // First, prune the chain of invalidated switchpoints.
+        for(Iterator<GuardedInvocation> it = newInvocations.iterator(); it.hasNext();) {
+            if(it.next().hasBeenInvalidated()) {
+                it.remove();
+            }
+        }
+
+        // prune() is allowed to invoke this method with invocation == null meaning we're just pruning the chain and not
+        // adding any new invocations to it.
+        if(invocation != null) {
+            // Remove oldest entry if we're at max length
+            if(newInvocations.size() == getMaxChainLength()) {
+                newInvocations.removeFirst();
+            }
+            newInvocations.addLast(invocation);
+        }
+
+        // prune-and-invoke is used as the fallback for invalidated switchpoints. If a switchpoint gets invalidated, we
+        // rebuild the chain and get rid of all invalidated switchpoints instead of letting them linger.
+        final MethodHandle pruneAndInvoke = makePruneAndInvokeMethod(relink);
+
+        // Fold the new chain
+        MethodHandle target = relink;
+        for(GuardedInvocation inv: newInvocations) {
+            target = inv.compose(pruneAndInvoke, target);
+        }
+
+        // If nobody else updated the call site while we were rebuilding the chain, set the target to our chain. In case
+        // we lost the race for multithreaded update, just do nothing. Either the other thread installed the same thing
+        // we wanted to install, or otherwise, we'll be asked to relink again.
+        if(invocations.compareAndSet(currentInvocations, newInvocations)) {
+            setTarget(target);
+        }
+        return target;
+    }
+
+    /**
+     * Creates a method that rebuilds our call chain, pruning it of any invalidated switchpoints, and then invokes that
+     * chain.
+     * @param relink the ultimate fallback for the chain (the {@code DynamicLinker}'s relink).
+     * @return a method handle for prune-and-invoke
+     */
+    private MethodHandle makePruneAndInvokeMethod(MethodHandle relink) {
+        // Bind prune to (this, relink)
+        final MethodHandle boundPrune = MethodHandles.insertArguments(PRUNE, 0, this, relink);
+        // Make it ignore all incoming arguments
+        final MethodHandle ignoreArgsPrune = MethodHandles.dropArguments(boundPrune, 0, type().parameterList());
+        // Invoke prune, then invoke the call site target with original arguments
+        return MethodHandles.foldArguments(MethodHandles.exactInvoker(type()), ignoreArgsPrune);
+    }
+
+    @SuppressWarnings("unused")
+    private MethodHandle prune(MethodHandle relink) {
+        return relinkInternal(null, relink, false);
+    }
+
+    private static final MethodHandle PRUNE;
+    static {
+        try {
+            PRUNE = MethodHandles.lookup().findSpecial(ChainedCallSite.class, "prune", MethodType.methodType(
+                    MethodHandle.class, MethodHandle.class), ChainedCallSite.class);
+        // NOTE: using two catch blocks so we don't introduce a reference to 1.7 ReflectiveOperationException, allowing
+        // Dynalink to be used on 1.6 JVMs with Remi's backport library.
+        } catch(IllegalAccessException e) {
+            throw new AssertionError(e.getMessage(), e); // Can not happen
+        } catch(NoSuchMethodException e) {
+            throw new AssertionError(e.getMessage(), e); // Can not happen
+        }
+    }
+}
\ No newline at end of file
diff --git a/nashorn/src/jdk/internal/dynalink/DefaultBootstrapper.java b/nashorn/src/jdk/internal/dynalink/DefaultBootstrapper.java
new file mode 100644
index 00000000000..d5be13478ab
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/DefaultBootstrapper.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink;
+
+import java.lang.invoke.CallSite;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import jdk.internal.dynalink.support.CallSiteDescriptorFactory;
+
+
+/**
+ * A convenience default bootstrapper that exposes static bootstrap methods which language runtimes that need the very
+ * default behavior can use with minimal setup. When first referenced, it will create a dynamic linker with default
+ * settings for the {@link DynamicLinkerFactory}, and its bootstrap methods will create {@link MonomorphicCallSite} for
+ * all call sites. It has two bootstrap methods: one creates call sites that use the
+ * {@link MethodHandles#publicLookup()} as the lookup for all call sites and disregard the one passed in as the caller,
+ * and one that just uses the passed caller as the lookup scope. Using the public lookup one is advised if your language
+ * runtime has no concept of interacting with Java visibility scopes, as it results in a more lightweight runtime
+ * information.
+ *
+ * @author Attila Szegedi
+ */
+public class DefaultBootstrapper {
+    private static final DynamicLinker dynamicLinker = new DynamicLinkerFactory().createLinker();
+
+    private DefaultBootstrapper() {
+    }
+
+    /**
+     * Use this method as your bootstrap method (see the documentation of the java.lang.invoke package for how to do
+     * this). In case your language runtime doesn't have a concept of interaction with Java access scopes, you might
+     * want to consider using
+     * {@link #publicBootstrap(java.lang.invoke.MethodHandles.Lookup, String, MethodType)} instead.
+     *
+     * @param caller the caller's lookup
+     * @param name the name of the method at the call site
+     * @param type the method signature at the call site
+     * @return a new {@link MonomorphicCallSite} linked with the default dynamic linker.
+     */
+    public static CallSite bootstrap(MethodHandles.Lookup caller, String name, MethodType type) {
+        return bootstrapInternal(caller, name, type);
+    }
+
+    /**
+     * Use this method as your bootstrap method (see the documentation of the java.lang.invoke package for how to do
+     * this) when your language runtime doesn't have a concept of interaction with Java access scopes. If you need to
+     * preserve the different caller Lookup objects in the call sites, use
+     * {@link #bootstrap(java.lang.invoke.MethodHandles.Lookup, String, MethodType)} instead
+     *
+     * @param caller the caller's lookup. It is ignored as the call sites will be created with
+     * {@link MethodHandles#publicLookup()} instead.
+     * @param name the name of the method at the call site
+     * @param type the method signature at the call site
+     * @return a new {@link MonomorphicCallSite} linked with the default dynamic linker.
+     */
+    public static CallSite publicBootstrap(@SuppressWarnings("unused") MethodHandles.Lookup caller, String name, MethodType type) {
+        return bootstrapInternal(MethodHandles.publicLookup(), name, type);
+    }
+
+    private static CallSite bootstrapInternal(MethodHandles.Lookup caller, String name, MethodType type) {
+        return dynamicLinker.link(new MonomorphicCallSite(CallSiteDescriptorFactory.create(caller, name, type)));
+    }
+}
\ No newline at end of file
diff --git a/nashorn/src/jdk/internal/dynalink/DynamicLinker.java b/nashorn/src/jdk/internal/dynalink/DynamicLinker.java
new file mode 100644
index 00000000000..ccdfa4fb9e2
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/DynamicLinker.java
@@ -0,0 +1,281 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.lang.invoke.MutableCallSite;
+import java.util.List;
+import jdk.internal.dynalink.linker.GuardedInvocation;
+import jdk.internal.dynalink.linker.GuardingDynamicLinker;
+import jdk.internal.dynalink.linker.LinkRequest;
+import jdk.internal.dynalink.linker.LinkerServices;
+import jdk.internal.dynalink.support.CallSiteDescriptorFactory;
+import jdk.internal.dynalink.support.LinkRequestImpl;
+import jdk.internal.dynalink.support.Lookup;
+import jdk.internal.dynalink.support.RuntimeContextLinkRequestImpl;
+
+
+/**
+ * The linker for {@link RelinkableCallSite} objects. Users of it (scripting frameworks and language runtimes) have to
+ * create a linker using the {@link DynamicLinkerFactory} and invoke its link method from the invokedynamic bootstrap
+ * methods to set the target of all the call sites in the code they generate. Usual usage would be to create one class
+ * per language runtime to contain one linker instance as:
+ *
+ * <pre>
+ * class MyLanguageRuntime {
+ *     private static final GuardingDynamicLinker myLanguageLinker = new MyLanguageLinker();
+ *     private static final DynamicLinker dynamicLinker = createDynamicLinker();
+ *
+ *     private static DynamicLinker createDynamicLinker() {
+ *         final DynamicLinkerFactory factory = new DynamicLinkerFactory();
+ *         factory.setPrioritizedLinker(myLanguageLinker);
+ *         return factory.createLinker();
+ *     }
+ *
+ *     public static CallSite bootstrap(MethodHandles.Lookup caller, String name, MethodType type) {
+ *         return dynamicLinker.link(new MonomorphicCallSite(CallSiteDescriptorFactory.create(lookup, name, type)));
+ *     }
+ * }
+ * </pre>
+ *
+ * Note how there are three components you will need to provide here:
+ * <ul>
+ * <li>You're expected to provide a {@link GuardingDynamicLinker} for your own language. If your runtime doesn't
+ * have its own language and/or object model (i.e. it's a generic scripting shell), you don't need to implement a
+ * dynamic linker; you would simply not invoke the {@code setPrioritizedLinker} method on the factory, or even better,
+ * simply use {@link DefaultBootstrapper}.</li>
+ * <li>The performance of the programs can depend on your choice of the class to represent call sites. The above
+ * example used {@link MonomorphicCallSite}, but you might want to use {@link ChainedCallSite} instead. You'll need to
+ * experiment and decide what fits your language runtime the best. You can subclass either of these or roll your own if
+ * you need to.</li>
+ * <li>You also need to provide {@link CallSiteDescriptor}s to your call sites. They are immutable objects that contain
+ * all the information about the call site: the class performing the lookups, the name of the method being invoked, and
+ * the method signature. The library has a default {@link CallSiteDescriptorFactory} for descriptors that you can use,
+ * or you can create your own descriptor classes, especially if you need to add further information (values passed in
+ * additional parameters to the bootstrap method) to them.</li>
+ * </ul>
+ *
+ * @author Attila Szegedi
+ */
+public class DynamicLinker {
+
+    private static final String CLASS_NAME = DynamicLinker.class.getName();
+    private static final String RELINK_METHOD_NAME = "relink";
+
+    private final LinkerServices linkerServices;
+    private final int runtimeContextArgCount;
+    private final boolean syncOnRelink;
+    private final int unstableRelinkThreshold;
+
+    /**
+     * Creates a new dynamic linker.
+     *
+     * @param linkerServices the linkerServices used by the linker, created by the factory.
+     * @param runtimeContextArgCount see {@link DynamicLinkerFactory#setRuntimeContextArgCount(int)}
+     */
+    DynamicLinker(LinkerServices linkerServices, int runtimeContextArgCount, boolean syncOnRelink,
+            int unstableRelinkThreshold) {
+        if(runtimeContextArgCount < 0) {
+            throw new IllegalArgumentException("runtimeContextArgCount < 0");
+        }
+        if(unstableRelinkThreshold < 0) {
+            throw new IllegalArgumentException("unstableRelinkThreshold < 0");
+        }
+        this.runtimeContextArgCount = runtimeContextArgCount;
+        this.linkerServices = linkerServices;
+        this.syncOnRelink = syncOnRelink;
+        this.unstableRelinkThreshold = unstableRelinkThreshold;
+    }
+
+    /**
+     * Links an invokedynamic call site. It will install a method handle into the call site that invokes the relinking
+     * mechanism of this linker. Next time the call site is invoked, it will be linked for the actual arguments it was
+     * invoked with.
+     *
+     * @param callSite the call site to link.
+     * @return the callSite, for easy call chaining.
+     */
+    public <T extends RelinkableCallSite> T link(final T callSite) {
+        callSite.initialize(createRelinkAndInvokeMethod(callSite, 0));
+        return callSite;
+    }
+
+    /**
+     * Returns the object representing the lower level linker services of this class that are normally exposed to
+     * individual language-specific linkers. While as a user of this class you normally only care about the
+     * {@link #link(RelinkableCallSite)} method, in certain circumstances you might want to use the lower level services
+     * directly; either to lookup specific method handles, to access the type converters, and so on.
+     * @return the object representing the linker services of this class.
+     */
+    public LinkerServices getLinkerServices() {
+        return linkerServices;
+    }
+
+    private static final MethodHandle RELINK = Lookup.findOwnSpecial(MethodHandles.lookup(), RELINK_METHOD_NAME,
+            MethodHandle.class, RelinkableCallSite.class, int.class, Object[].class);
+
+    private MethodHandle createRelinkAndInvokeMethod(final RelinkableCallSite callSite, int relinkCount) {
+        // Make a bound MH of invoke() for this linker and call site
+        final MethodHandle boundRelinker = MethodHandles.insertArguments(RELINK, 0, this, callSite, Integer.valueOf(
+                relinkCount));
+        // Make a MH that gathers all arguments to the invocation into an Object[]
+        final MethodType type = callSite.getDescriptor().getMethodType();
+        final MethodHandle collectingRelinker = boundRelinker.asCollector(Object[].class, type.parameterCount());
+        return MethodHandles.foldArguments(MethodHandles.exactInvoker(type), collectingRelinker.asType(
+                type.changeReturnType(MethodHandle.class)));
+    }
+
+    /**
+     * Relinks a call site conforming to the invocation arguments.
+     *
+     * @param callSite the call site itself
+     * @param arguments arguments to the invocation
+     * @return return the method handle for the invocation
+     * @throws Exception rethrows any exception thrown by the linkers
+     */
+    @SuppressWarnings("unused")
+    private MethodHandle relink(RelinkableCallSite callSite, int relinkCount, Object... arguments) throws Exception {
+        final CallSiteDescriptor callSiteDescriptor = callSite.getDescriptor();
+        final boolean unstableDetectionEnabled = unstableRelinkThreshold > 0;
+        final boolean callSiteUnstable = unstableDetectionEnabled && relinkCount >= unstableRelinkThreshold;
+        final LinkRequest linkRequest =
+                runtimeContextArgCount == 0 ? new LinkRequestImpl(callSiteDescriptor, callSiteUnstable, arguments)
+                        : new RuntimeContextLinkRequestImpl(callSiteDescriptor, callSiteUnstable, arguments,
+                                runtimeContextArgCount);
+
+        // Find a suitable method handle with a guard
+        GuardedInvocation guardedInvocation = linkerServices.getGuardedInvocation(linkRequest);
+
+        // None found - throw an exception
+        if(guardedInvocation == null) {
+            throw new NoSuchDynamicMethodException(callSiteDescriptor.toString());
+        }
+
+        // If our call sites have a runtime context, and the linker produced a context-stripped invocation, adapt the
+        // produced invocation into contextual invocation (by dropping the context...)
+        if(runtimeContextArgCount > 0) {
+            final MethodType origType = callSiteDescriptor.getMethodType();
+            final MethodHandle invocation = guardedInvocation.getInvocation();
+            if(invocation.type().parameterCount() == origType.parameterCount() - runtimeContextArgCount) {
+                final List<Class<?>> prefix = origType.parameterList().subList(1, runtimeContextArgCount + 1);
+                final MethodHandle guard = guardedInvocation.getGuard();
+                guardedInvocation = guardedInvocation.dropArguments(1, prefix);
+            }
+        }
+
+        if(unstableDetectionEnabled && relinkCount <= unstableRelinkThreshold && relinkCount++ == unstableRelinkThreshold) {
+            // Note that we'll increase the relinkCount until threshold+1 and not increase it beyond that. Threshold+1
+            // is treated as a special value to signal that resetAndRelink has already executed once for the unstable
+            // call site; we only want the call site to throw away its current linkage once, when it transitions to
+            // unstable.
+            callSite.resetAndRelink(guardedInvocation, createRelinkAndInvokeMethod(callSite, relinkCount));
+        } else {
+            callSite.relink(guardedInvocation, createRelinkAndInvokeMethod(callSite, relinkCount));
+        }
+        if(syncOnRelink) {
+            MutableCallSite.syncAll(new MutableCallSite[] { (MutableCallSite)callSite });
+        }
+        return guardedInvocation.getInvocation();
+    }
+
+    /**
+     * Returns a stack trace element describing the location of the call site currently being relinked on the current
+     * thread. The operation internally creates a Throwable object and inspects its stack trace, so it's potentially
+     * expensive. The recommended usage for it is in writing diagnostics code.
+     * @return a stack trace element describing the location of the call site currently being relinked, or null if it is
+     * not invoked while a call site is being relinked.
+     */
+    public static StackTraceElement getRelinkedCallSiteLocation() {
+        final StackTraceElement[] trace = new Throwable().getStackTrace();
+        for(int i = 0; i < trace.length - 1; ++i) {
+            final StackTraceElement frame = trace[i];
+            if(RELINK_METHOD_NAME.equals(frame.getMethodName()) && CLASS_NAME.equals(frame.getClassName())) {
+                return trace[i + 1];
+            }
+        }
+        return null;
+    }
+}
diff --git a/nashorn/src/jdk/internal/dynalink/DynamicLinkerFactory.java b/nashorn/src/jdk/internal/dynalink/DynamicLinkerFactory.java
new file mode 100644
index 00000000000..49e821ef489
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/DynamicLinkerFactory.java
@@ -0,0 +1,311 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink;
+
+import java.lang.invoke.MutableCallSite;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+import jdk.internal.dynalink.beans.BeansLinker;
+import jdk.internal.dynalink.linker.GuardingDynamicLinker;
+import jdk.internal.dynalink.linker.GuardingTypeConverterFactory;
+import jdk.internal.dynalink.linker.LinkRequest;
+import jdk.internal.dynalink.support.AutoDiscovery;
+import jdk.internal.dynalink.support.BottomGuardingDynamicLinker;
+import jdk.internal.dynalink.support.CompositeGuardingDynamicLinker;
+import jdk.internal.dynalink.support.CompositeTypeBasedGuardingDynamicLinker;
+import jdk.internal.dynalink.support.LinkerServicesImpl;
+import jdk.internal.dynalink.support.TypeConverterFactory;
+
+
+/**
+ * A factory class for creating {@link DynamicLinker}s. The most usual dynamic linker is a linker that is a composition
+ * of all {@link GuardingDynamicLinker}s known and pre-created by the caller as well as any
+ * {@link AutoDiscovery automatically discovered} guarding linkers and the standard fallback {@link BeansLinker}. See
+ * {@link DynamicLinker} documentation for tips on how to use this class.
+ *
+ * @author Attila Szegedi
+ */
+public class DynamicLinkerFactory {
+
+    /**
+     * Default value for {@link #setUnstableRelinkThreshold(int) unstable relink threshold}.
+     */
+    public static final int DEFAULT_UNSTABLE_RELINK_THRESHOLD = 8;
+
+    private ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+    private List<? extends GuardingDynamicLinker> prioritizedLinkers;
+    private List<? extends GuardingDynamicLinker> fallbackLinkers;
+    private int runtimeContextArgCount = 0;
+    private boolean syncOnRelink = false;
+    private int unstableRelinkThreshold = DEFAULT_UNSTABLE_RELINK_THRESHOLD;
+
+    /**
+     * Sets the class loader for automatic discovery of available linkers. If not set explicitly, then the thread
+     * context class loader at the time of the constructor invocation will be used.
+     *
+     * @param classLoader the class loader used for the autodiscovery of available linkers.
+     */
+    public void setClassLoader(ClassLoader classLoader) {
+        this.classLoader = classLoader;
+    }
+
+    /**
+     * Sets the prioritized linkers. Language runtimes using this framework will usually precreate at least the linker
+     * for their own language. These linkers will be consulted first in the resulting dynamic linker, before any
+     * autodiscovered linkers. If the framework also autodiscovers a linker of the same class as one of the prioritized
+     * linkers, it will be ignored and the explicit prioritized instance will be used.
+     *
+     * @param prioritizedLinkers the list of prioritized linkers. Null can be passed to indicate no prioritized linkers
+     * (this is also the default value).
+     */
+    public void setPrioritizedLinkers(List<? extends GuardingDynamicLinker> prioritizedLinkers) {
+        this.prioritizedLinkers =
+                prioritizedLinkers == null ? null : new ArrayList<>(prioritizedLinkers);
+    }
+
+    /**
+     * Sets the prioritized linkers. Language runtimes using this framework will usually precreate at least the linker
+     * for their own language. These linkers will be consulted first in the resulting dynamic linker, before any
+     * autodiscovered linkers. If the framework also autodiscovers a linker of the same class as one of the prioritized
+     * linkers, it will be ignored and the explicit prioritized instance will be used.
+     *
+     * @param prioritizedLinkers a list of prioritized linkers.
+     */
+    public void setPrioritizedLinkers(GuardingDynamicLinker... prioritizedLinkers) {
+        setPrioritizedLinkers(Arrays.asList(prioritizedLinkers));
+    }
+
+    /**
+     * Sets a single prioritized linker. Identical to calling {@link #setPrioritizedLinkers(List)} with a single-element
+     * list.
+     *
+     * @param prioritizedLinker the single prioritized linker. Must not be null.
+     * @throws IllegalArgumentException if null is passed.
+     */
+    public void setPrioritizedLinker(GuardingDynamicLinker prioritizedLinker) {
+        if(prioritizedLinker == null) {
+            throw new IllegalArgumentException("prioritizedLinker == null");
+        }
+        this.prioritizedLinkers = Collections.singletonList(prioritizedLinker);
+    }
+
+    /**
+     * Sets the fallback linkers. These linkers will be consulted last in the resulting composite linker, after any
+     * autodiscovered linkers. If the framework also autodiscovers a linker of the same class as one of the fallback
+     * linkers, it will be ignored and the explicit fallback instance will be used.
+     *
+     * @param fallbackLinkers the list of fallback linkers. Can be empty to indicate the caller wishes to set no
+     * fallback linkers.
+     */
+    public void setFallbackLinkers(List<? extends GuardingDynamicLinker> fallbackLinkers) {
+        this.fallbackLinkers = fallbackLinkers == null ? null : new ArrayList<>(fallbackLinkers);
+    }
+
+    /**
+     * Sets the fallback linkers. These linkers will be consulted last in the resulting composite linker, after any
+     * autodiscovered linkers. If the framework also autodiscovers a linker of the same class as one of the fallback
+     * linkers, it will be ignored and the explicit fallback instance will be used.
+     *
+     * @param fallbackLinkers the list of fallback linkers. Can be empty to indicate the caller wishes to set no
+     * fallback linkers. If it is left as null, the standard fallback {@link BeansLinker} will be used.
+     */
+    public void setFallbackLinkers(GuardingDynamicLinker... fallbackLinkers) {
+        setFallbackLinkers(Arrays.asList(fallbackLinkers));
+    }
+
+    /**
+     * Sets the number of arguments in the call sites that represent the stack context of the language runtime creating
+     * the linker. If the language runtime uses no context information passed on stack, then it should be zero
+     * (the default value). If it is set to nonzero value, then every dynamic call site emitted by this runtime must
+     * have the argument list of the form: {@code (this, contextArg1[, contextArg2[, ...]], normalArgs)}. It is
+     * advisable to only pass one context-specific argument, though, of an easily recognizable, runtime specific type
+     * encapsulating the runtime thread local state.
+     *
+     * @param runtimeContextArgCount the number of language runtime context arguments in call sites.
+     */
+    public void setRuntimeContextArgCount(int runtimeContextArgCount) {
+        if(runtimeContextArgCount < 0) {
+            throw new IllegalArgumentException("runtimeContextArgCount < 0");
+        }
+        this.runtimeContextArgCount = runtimeContextArgCount;
+    }
+
+    /**
+     * Sets whether the linker created by this factory will invoke {@link MutableCallSite#syncAll(MutableCallSite[])}
+     * after a call site is relinked. Defaults to false. You probably want to set it to true if your runtime supports
+     * multithreaded execution of dynamically linked code.
+     * @param syncOnRelink true for invoking sync on relink, false otherwise.
+     */
+    public void setSyncOnRelink(boolean syncOnRelink) {
+        this.syncOnRelink = syncOnRelink;
+    }
+
+    /**
+     * Sets the unstable relink threshold; the number of times a call site is relinked after which it will be
+     * considered unstable, and subsequent link requests for it will indicate this.
+     * @param unstableRelinkThreshold the new threshold. Must not be less than zero. The value of zero means that
+     * call sites will never be considered unstable.
+     * @see LinkRequest#isCallSiteUnstable()
+     */
+    public void setUnstableRelinkThreshold(int unstableRelinkThreshold) {
+        if(unstableRelinkThreshold < 0) {
+            throw new IllegalArgumentException("unstableRelinkThreshold < 0");
+        }
+        this.unstableRelinkThreshold = unstableRelinkThreshold;
+    }
+
+    /**
+     * Creates a new dynamic linker consisting of all the prioritized, autodiscovered, and fallback linkers.
+     *
+     * @return the new dynamic Linker
+     */
+    public DynamicLinker createLinker() {
+        // Treat nulls appropriately
+        if(prioritizedLinkers == null) {
+            prioritizedLinkers = Collections.emptyList();
+        }
+        if(fallbackLinkers == null) {
+            fallbackLinkers = Collections.singletonList(new BeansLinker());
+        }
+
+        // Gather classes of all precreated (prioritized and fallback) linkers.
+        // We'll filter out any discovered linkers of the same class.
+        final Set<Class<? extends GuardingDynamicLinker>> knownLinkerClasses = new HashSet<>();
+        addClasses(knownLinkerClasses, prioritizedLinkers);
+        addClasses(knownLinkerClasses, fallbackLinkers);
+
+        final List<GuardingDynamicLinker> discovered = AutoDiscovery.loadLinkers(classLoader);
+        // Now, concatenate ...
+        final List<GuardingDynamicLinker> linkers = new ArrayList<>(prioritizedLinkers.size() + discovered.size()
+                + fallbackLinkers.size());
+        // ... prioritized linkers, ...
+        linkers.addAll(prioritizedLinkers);
+        // ... filtered discovered linkers, ...
+        for(GuardingDynamicLinker linker: discovered) {
+            if(!knownLinkerClasses.contains(linker.getClass())) {
+                linkers.add(linker);
+            }
+        }
+        // ... and finally fallback linkers.
+        linkers.addAll(fallbackLinkers);
+        final List<GuardingDynamicLinker> optimized = CompositeTypeBasedGuardingDynamicLinker.optimize(linkers);
+        final GuardingDynamicLinker composite;
+        switch(linkers.size()) {
+            case 0: {
+                composite = BottomGuardingDynamicLinker.INSTANCE;
+                break;
+            }
+            case 1: {
+                composite = optimized.get(0);
+                break;
+            }
+            default: {
+                composite = new CompositeGuardingDynamicLinker(optimized);
+                break;
+            }
+        }
+
+        final List<GuardingTypeConverterFactory> typeConverters = new LinkedList<>();
+        for(GuardingDynamicLinker linker: linkers) {
+            if(linker instanceof GuardingTypeConverterFactory) {
+                typeConverters.add((GuardingTypeConverterFactory)linker);
+            }
+        }
+
+        return new DynamicLinker(new LinkerServicesImpl(new TypeConverterFactory(typeConverters), composite),
+                runtimeContextArgCount, syncOnRelink, unstableRelinkThreshold);
+    }
+
+    private static void addClasses(Set<Class<? extends GuardingDynamicLinker>> knownLinkerClasses,
+            List<? extends GuardingDynamicLinker> linkers) {
+        for(GuardingDynamicLinker linker: linkers) {
+            knownLinkerClasses.add(linker.getClass());
+        }
+    }
+}
\ No newline at end of file
diff --git a/nashorn/src/jdk/internal/dynalink/MonomorphicCallSite.java b/nashorn/src/jdk/internal/dynalink/MonomorphicCallSite.java
new file mode 100644
index 00000000000..96784f0ec43
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/MonomorphicCallSite.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink;
+
+import java.lang.invoke.MethodHandle;
+import jdk.internal.dynalink.linker.GuardedInvocation;
+import jdk.internal.dynalink.support.AbstractRelinkableCallSite;
+
+
+/**
+ * A relinkable call site that implements monomorphic inline caching strategy. After it linked a method, it will keep it
+ * until either its guard evaluates to false, or its switchpoint is invalidated, at which time it will throw away the
+ * previous linkage, and trigger relinking with its associated {@link DynamicLinker}.
+ *
+ * @author Attila Szegedi
+ */
+public class MonomorphicCallSite extends AbstractRelinkableCallSite {
+    /**
+     * Creates a new call site with monomorphic inline caching strategy.
+     * @param descriptor the descriptor for this call site
+     */
+    public MonomorphicCallSite(CallSiteDescriptor descriptor) {
+        super(descriptor);
+    }
+
+    @Override
+    public void relink(GuardedInvocation guardedInvocation, MethodHandle relink) {
+        setTarget(guardedInvocation.compose(relink));
+    }
+
+    @Override
+    public void resetAndRelink(GuardedInvocation guardedInvocation, MethodHandle relink) {
+        relink(guardedInvocation, relink);
+    }
+}
\ No newline at end of file
diff --git a/nashorn/src/jdk/internal/dynalink/NoSuchDynamicMethodException.java b/nashorn/src/jdk/internal/dynalink/NoSuchDynamicMethodException.java
new file mode 100644
index 00000000000..af956037890
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/NoSuchDynamicMethodException.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink;
+
+import jdk.internal.dynalink.linker.GuardingDynamicLinker;
+
+/**
+ * Thrown at the invocation if the call site can not be linked by any available {@link GuardingDynamicLinker}.
+ *
+ * @author Attila Szegedi
+ */
+public class NoSuchDynamicMethodException extends RuntimeException {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Creates a new NoSuchDynamicMethodException
+     * @param message the message of the exception.
+     */
+    public NoSuchDynamicMethodException(String message) {
+        super(message);
+    }
+}
\ No newline at end of file
diff --git a/nashorn/src/jdk/internal/dynalink/RelinkableCallSite.java b/nashorn/src/jdk/internal/dynalink/RelinkableCallSite.java
new file mode 100644
index 00000000000..f9407cb0b3f
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/RelinkableCallSite.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink;
+
+import java.lang.invoke.CallSite;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MutableCallSite;
+import java.lang.invoke.VolatileCallSite;
+import jdk.internal.dynalink.linker.GuardedInvocation;
+
+
+/**
+ * Interface for relinkable call sites. Language runtimes wishing to use this framework must use subclasses of
+ * {@link CallSite} that also implement this interface as their call sites. There is a readily usable
+ * {@link MonomorphicCallSite} subclass that implements monomorphic inline caching strategy as well as a
+ * {@link ChainedCallSite} that retains a chain of already linked method handles. The reason this is defined as an
+ * interface instead of a concrete, albeit abstract class is that it allows independent implementations to choose
+ * between {@link MutableCallSite} and {@link VolatileCallSite} as they see fit.
+ *
+ * @author Attila Szegedi
+ */
+public interface RelinkableCallSite {
+    /**
+     * Initializes the relinkable call site by setting a relink-and-invoke method handle. The call site implementation
+     * is supposed to set this method handle as its target.
+     * @param relinkAndInvoke a relink-and-invoke method handle supplied by the {@link DynamicLinker}.
+     */
+    public void initialize(MethodHandle relinkAndInvoke);
+
+    /**
+     * Returns the descriptor for this call site.
+     *
+     * @return the descriptor for this call site.
+     */
+    public CallSiteDescriptor getDescriptor();
+
+    /**
+     * This method will be called by the dynamic linker every time the call site is normally relinked. It will be passed
+     * a {@code GuardedInvocation} that the call site should incorporate into its target method handle. When this method
+     * is called, the call site is allowed to keep other non-invalidated invocations around for implementation of
+     * polymorphic inline caches and compose them with this invocation to form its final target.
+     *
+     * @param guardedInvocation the guarded invocation that the call site should incorporate into its target method
+     * handle.
+     * @param fallback the fallback method. This is a method matching the method type of the call site that is supplied
+     * by the {@link DynamicLinker} to be used by this call site as a fallback when it can't invoke its target with the
+     * passed arguments. The fallback method is such that when it's invoked, it'll try to discover the adequate target
+     * for the invocation, subsequently invoke {@link #relink(GuardedInvocation, MethodHandle)} or
+     * {@link #resetAndRelink(GuardedInvocation, MethodHandle)}, and finally invoke the target.
+     */
+    public void relink(GuardedInvocation guardedInvocation, MethodHandle fallback);
+
+    /**
+     * This method will be called by the dynamic linker every time the call site is relinked and the linker wishes the
+     * call site to throw away any prior linkage state. It will be passed a {@code GuardedInvocation} that the call site
+     * should use to build its target method handle. When this method is called, the call site is discouraged from
+     * keeping previous state around, and is supposed to only link the current invocation.
+     *
+     * @param guardedInvocation the guarded invocation that the call site should use to build its target method handle.
+     * @param fallback the fallback method. This is a method matching the method type of the call site that is supplied
+     * by the {@link DynamicLinker} to be used by this call site as a fallback when it can't invoke its target with the
+     * passed arguments. The fallback method is such that when it's invoked, it'll try to discover the adequate target
+     * for the invocation, subsequently invoke {@link #relink(GuardedInvocation, MethodHandle)} or
+     * {@link #resetAndRelink(GuardedInvocation, MethodHandle)}, and finally invoke the target.
+     */
+    public void resetAndRelink(GuardedInvocation guardedInvocation, MethodHandle fallback);
+}
\ No newline at end of file
diff --git a/nashorn/src/jdk/internal/dynalink/beans/AbstractJavaLinker.java b/nashorn/src/jdk/internal/dynalink/beans/AbstractJavaLinker.java
new file mode 100644
index 00000000000..d9e1cecd283
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/beans/AbstractJavaLinker.java
@@ -0,0 +1,690 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.beans;
+
+import java.beans.Introspector;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import jdk.internal.dynalink.CallSiteDescriptor;
+import jdk.internal.dynalink.beans.GuardedInvocationComponent.ValidationType;
+import jdk.internal.dynalink.linker.GuardedInvocation;
+import jdk.internal.dynalink.linker.GuardingDynamicLinker;
+import jdk.internal.dynalink.linker.LinkRequest;
+import jdk.internal.dynalink.linker.LinkerServices;
+import jdk.internal.dynalink.support.CallSiteDescriptorFactory;
+import jdk.internal.dynalink.support.Guards;
+import jdk.internal.dynalink.support.Lookup;
+
+
+/**
+ * A base class for both {@link StaticClassLinker} and {@link BeanLinker}. Deals with common aspects of property
+ * exposure and method calls for both static and instance facets of a class.
+ *
+ * @author Attila Szegedi
+ */
+abstract class AbstractJavaLinker implements GuardingDynamicLinker {
+    final Class<?> clazz;
+    private final MethodHandle classGuard;
+    private final MethodHandle assignableGuard;
+    private final Map<String, AnnotatedMethodHandle> propertyGetters = new HashMap<>();
+    private final Map<String, DynamicMethod> propertySetters = new HashMap<>();
+    private final Map<String, DynamicMethod> methods = new HashMap<>();
+
+    AbstractJavaLinker(Class<?> clazz, MethodHandle classGuard) {
+        this(clazz, classGuard, classGuard);
+    }
+
+    AbstractJavaLinker(Class<?> clazz, MethodHandle classGuard, MethodHandle assignableGuard) {
+        this.clazz = clazz;
+        this.classGuard = classGuard;
+        this.assignableGuard = assignableGuard;
+
+        final FacetIntrospector introspector = createFacetIntrospector();
+        try {
+            // Add methods and properties
+            for(Method method: introspector.getMethods()) {
+                final String name = method.getName();
+                final MethodHandle methodHandle = introspector.unreflect(method);
+                // Add method
+                addMember(name, methodHandle, methods);
+                // Add the method as a property getter and/or setter
+                if(name.startsWith("get") && name.length() > 3 && method.getParameterTypes().length == 0) {
+                    // Property getter
+                    setPropertyGetter(Introspector.decapitalize(name.substring(3)), introspector.unreflect(
+                            getMostGenericGetter(method)), ValidationType.INSTANCE_OF);
+                } else if(name.startsWith("is") && name.length() > 2 && method.getParameterTypes().length == 0 &&
+                        method.getReturnType() == boolean.class) {
+                    // Boolean property getter
+                    setPropertyGetter(Introspector.decapitalize(name.substring(2)), introspector.unreflect(
+                            getMostGenericGetter(method)), ValidationType.INSTANCE_OF);
+                } else if(name.startsWith("set") && name.length() > 3 && method.getParameterTypes().length == 1) {
+                    // Property setter
+                    addMember(Introspector.decapitalize(name.substring(3)), methodHandle, propertySetters);
+                }
+            }
+
+            // Add field getter/setters as property getters/setters.
+            for(Field field: introspector.getFields()) {
+                final String name = field.getName();
+                // Only add a property getter when one is not defined already as a getXxx()/isXxx() method.
+                if(!propertyGetters.containsKey(name)) {
+                    setPropertyGetter(name, introspector.unreflectGetter(field), ValidationType.EXACT_CLASS);
+                }
+                if(!(Modifier.isFinal(field.getModifiers()) || propertySetters.containsKey(name))) {
+                    addMember(name, introspector.unreflectSetter(field), propertySetters);
+                }
+            }
+
+            // Add inner classes, but only those for which we don't hide a property with it
+            for(Map.Entry<String, MethodHandle> innerClassSpec: introspector.getInnerClassGetters().entrySet()) {
+                final String name = innerClassSpec.getKey();
+                if(!propertyGetters.containsKey(name)) {
+                    setPropertyGetter(name, innerClassSpec.getValue(), ValidationType.EXACT_CLASS);
+                }
+            }
+        } finally {
+            introspector.close();
+        }
+    }
+
+    abstract FacetIntrospector createFacetIntrospector();
+
+    void setPropertyGetter(String name, MethodHandle handle, ValidationType validationType) {
+        propertyGetters.put(name, new AnnotatedMethodHandle(handle, validationType));
+    }
+
+    private void addMember(String name, MethodHandle mh, Map<String, DynamicMethod> methodMap) {
+        final DynamicMethod existingMethod = methodMap.get(name);
+        final DynamicMethod newMethod = addMember(mh, existingMethod, clazz, name);
+        if(newMethod != existingMethod) {
+            methodMap.put(name, newMethod);
+        }
+    }
+
+    static DynamicMethod createDynamicMethod(Iterable<MethodHandle> methodHandles, Class<?> clazz, String name) {
+        DynamicMethod dynMethod = null;
+        for(MethodHandle methodHandle: methodHandles) {
+            dynMethod = addMember(methodHandle, dynMethod, clazz, name);
+        }
+        return dynMethod;
+    }
+
+    private static DynamicMethod addMember(MethodHandle mh, DynamicMethod existing, Class<?> clazz, String name) {
+        if(existing == null) {
+            return new SimpleDynamicMethod(mh, clazz, name);
+        } else if(existing.contains(mh)) {
+            return existing;
+        } else if(existing instanceof SimpleDynamicMethod) {
+            final OverloadedDynamicMethod odm = new OverloadedDynamicMethod(clazz, name);
+            odm.addMethod(((SimpleDynamicMethod)existing));
+            odm.addMethod(mh);
+            return odm;
+        } else if(existing instanceof OverloadedDynamicMethod) {
+            ((OverloadedDynamicMethod)existing).addMethod(mh);
+            return existing;
+        }
+        throw new AssertionError();
+    }
+
+    @Override
+    public GuardedInvocation getGuardedInvocation(LinkRequest request, final LinkerServices linkerServices)
+            throws Exception {
+        final LinkRequest ncrequest = request.withoutRuntimeContext();
+        // BeansLinker already checked that the name is at least 2 elements long and the first element is "dyn".
+        final CallSiteDescriptor callSiteDescriptor = ncrequest.getCallSiteDescriptor();
+        final String op = callSiteDescriptor.getNameToken(CallSiteDescriptor.OPERATOR);
+        // Either dyn:callMethod:name(this[,args]) or dyn:callMethod(this,name[,args]).
+        if("callMethod" == op) {
+            return getCallPropWithThis(callSiteDescriptor, linkerServices);
+        }
+        List<String> operations = CallSiteDescriptorFactory.tokenizeOperators(callSiteDescriptor);
+        while(!operations.isEmpty()) {
+            final GuardedInvocationComponent gic = getGuardedInvocationComponent(callSiteDescriptor, linkerServices,
+                    operations);
+            if(gic != null) {
+                return gic.getGuardedInvocation();
+            }
+            operations = pop(operations);
+        }
+        return null;
+    }
+
+    protected GuardedInvocationComponent getGuardedInvocationComponent(CallSiteDescriptor callSiteDescriptor,
+            LinkerServices linkerServices, List<String> operations) throws Exception {
+        if(operations.isEmpty()) {
+            return null;
+        }
+        final String op = operations.get(0);
+        // Either dyn:getProp:name(this) or dyn:getProp(this, name)
+        if("getProp".equals(op)) {
+            return getPropertyGetter(callSiteDescriptor, linkerServices, pop(operations));
+        }
+        // Either dyn:setProp:name(this, value) or dyn:setProp(this, name, value)
+        if("setProp".equals(op)) {
+            return getPropertySetter(callSiteDescriptor, linkerServices, pop(operations));
+        }
+        // Either dyn:getMethod:name(this), or dyn:getMethod(this, name)
+        if("getMethod".equals(op)) {
+            return getMethodGetter(callSiteDescriptor, linkerServices, pop(operations));
+        }
+        return null;
+    }
+
+    static final <T> List<T> pop(List<T> l) {
+        return l.subList(1, l.size());
+    }
+
+    MethodHandle getClassGuard(CallSiteDescriptor desc) {
+        return getClassGuard(desc.getMethodType());
+    }
+
+    MethodHandle getClassGuard(MethodType type) {
+        return Guards.asType(classGuard, type);
+    }
+
+    GuardedInvocationComponent getClassGuardedInvocationComponent(MethodHandle invocation, MethodType type) {
+        return new GuardedInvocationComponent(invocation, getClassGuard(type), clazz, ValidationType.EXACT_CLASS);
+    }
+
+    private MethodHandle getAssignableGuard(MethodType type) {
+        return Guards.asType(assignableGuard, type);
+    }
+
+    private GuardedInvocation getCallPropWithThis(CallSiteDescriptor callSiteDescriptor, LinkerServices linkerServices) {
+        switch(callSiteDescriptor.getNameTokenCount()) {
+            case 3: {
+                return createGuardedDynamicMethodInvocation(callSiteDescriptor.getMethodType(), linkerServices,
+                        callSiteDescriptor.getNameToken(CallSiteDescriptor.NAME_OPERAND), methods);
+            }
+            default: {
+                return null;
+            }
+        }
+    }
+
+    private GuardedInvocation createGuardedDynamicMethodInvocation(MethodType callSiteType,
+            LinkerServices linkerServices, String methodName, Map<String, DynamicMethod> methodMap){
+        final MethodHandle inv = getDynamicMethodInvocation(callSiteType, linkerServices, methodName, methodMap);
+        return inv == null ? null : new GuardedInvocation(inv, getClassGuard(callSiteType));
+    }
+
+    private static MethodHandle getDynamicMethodInvocation(MethodType callSiteType, LinkerServices linkerServices,
+            String methodName, Map<String, DynamicMethod> methodMap) {
+        final DynamicMethod dynaMethod = getDynamicMethod(methodName, methodMap);
+        return dynaMethod != null ? dynaMethod.getInvocation(callSiteType, linkerServices) : null;
+    }
+
+    private static DynamicMethod getDynamicMethod(String methodName, Map<String, DynamicMethod> methodMap) {
+        final DynamicMethod dynaMethod = methodMap.get(methodName);
+        return dynaMethod != null ? dynaMethod : getExplicitSignatureDynamicMethod(methodName, methodMap);
+    }
+
+    private static SimpleDynamicMethod getExplicitSignatureDynamicMethod(String methodName,
+            Map<String, DynamicMethod> methodsMap) {
+        // What's below is meant to support the "name(type, type, ...)" syntax that programmers can use in a method name
+        // to manually pin down an exact overloaded variant. This is not usually required, as the overloaded method
+        // resolution works correctly in almost every situation. However, in presence of many language-specific
+        // conversions with a radically dynamic language, most overloaded methods will end up being constantly selected
+        // at invocation time, so a programmer knowledgable of the situation might choose to pin down an exact overload
+        // for performance reasons.
+
+        // Is the method name lexically of the form "name(types)"?
+        final int lastChar = methodName.length() - 1;
+        if(methodName.charAt(lastChar) != ')') {
+            return null;
+        }
+        final int openBrace = methodName.indexOf('(');
+        if(openBrace == -1) {
+            return null;
+        }
+
+        // Find an existing method for the "name" part
+        final DynamicMethod simpleNamedMethod = methodsMap.get(methodName.substring(0, openBrace));
+        if(simpleNamedMethod == null) {
+            return null;
+        }
+
+        // Try to get a narrowed dynamic method for the explicit parameter types.
+        return simpleNamedMethod.getMethodForExactParamTypes(methodName.substring(openBrace + 1, lastChar));
+    }
+
+    private static final MethodHandle IS_METHOD_HANDLE_NOT_NULL = Guards.isNotNull().asType(MethodType.methodType(
+            boolean.class, MethodHandle.class));
+    private static final MethodHandle CONSTANT_NULL_DROP_METHOD_HANDLE = MethodHandles.dropArguments(
+            MethodHandles.constant(Object.class, null), 0, MethodHandle.class);
+
+    private GuardedInvocationComponent getPropertySetter(CallSiteDescriptor callSiteDescriptor,
+            LinkerServices linkerServices, List<String> operations) throws Exception {
+        final MethodType type = callSiteDescriptor.getMethodType();
+        switch(callSiteDescriptor.getNameTokenCount()) {
+            case 2: {
+                // Must have three arguments: target object, property name, and property value.
+                assertParameterCount(callSiteDescriptor, 3);
+
+                // What's below is basically:
+                //   foldArguments(guardWithTest(isNotNull, invoke, null|nextComponent.invocation),
+                //     get_setter_handle(type, linkerServices))
+                // only with a bunch of method signature adjustments. Basically, retrieve method setter
+                // MethodHandle; if it is non-null, invoke it, otherwise either return null, or delegate to next
+                // component's invocation.
+
+                // Call site type is "ret_type(object_type,property_name_type,property_value_type)", which we'll
+                // abbreviate to R(O, N, V) going forward.
+                // We want setters that conform to "R(O, V)"
+                final MethodType setterType = type.dropParameterTypes(1, 2);
+                // Bind property setter handle to the expected setter type and linker services. Type is
+                // MethodHandle(Object, String, Object)
+                final MethodHandle boundGetter = MethodHandles.insertArguments(getPropertySetterHandle, 0, setterType,
+                        linkerServices);
+
+                // Cast getter to MethodHandle(O, N, V)
+                final MethodHandle typedGetter = linkerServices.asType(boundGetter, type.changeReturnType(
+                        MethodHandle.class));
+
+                // Handle to invoke the setter R(MethodHandle, O, V)
+                final MethodHandle invokeHandle = MethodHandles.exactInvoker(setterType);
+                // Handle to invoke the setter, dropping unnecessary fold arguments R(MethodHandle, O, N, V)
+                final MethodHandle invokeHandleFolded = MethodHandles.dropArguments(invokeHandle, 2, type.parameterType(
+                        1));
+                final GuardedInvocationComponent nextComponent = getGuardedInvocationComponent(callSiteDescriptor,
+                        linkerServices, operations);
+
+                final MethodHandle fallbackFolded;
+                if(nextComponent == null) {
+                    // Object(MethodHandle)->R(MethodHandle, O, N, V); returns constant null
+                    fallbackFolded = MethodHandles.dropArguments(CONSTANT_NULL_DROP_METHOD_HANDLE, 1,
+                            type.parameterList()).asType(type.insertParameterTypes(0, MethodHandle.class));
+                } else {
+                    // R(O, N, V)->R(MethodHandle, O, N, V); adapts the next component's invocation to drop the
+                    // extra argument resulting from fold
+                    fallbackFolded = MethodHandles.dropArguments(nextComponent.getGuardedInvocation().getInvocation(),
+                            0, MethodHandle.class);
+                }
+
+                // fold(R(MethodHandle, O, N, V), MethodHandle(O, N, V))
+                final MethodHandle compositeSetter = MethodHandles.foldArguments(MethodHandles.guardWithTest(
+                            IS_METHOD_HANDLE_NOT_NULL, invokeHandleFolded, fallbackFolded), typedGetter);
+                if(nextComponent == null) {
+                    return getClassGuardedInvocationComponent(compositeSetter, type);
+                } else {
+                    return nextComponent.compose(compositeSetter, getClassGuard(type), clazz,
+                            ValidationType.EXACT_CLASS);
+                }
+            }
+            case 3: {
+                // Must have two arguments: target object and property value
+                assertParameterCount(callSiteDescriptor, 2);
+                final GuardedInvocation gi = createGuardedDynamicMethodInvocation(callSiteDescriptor.getMethodType(),
+                        linkerServices, callSiteDescriptor.getNameToken(CallSiteDescriptor.NAME_OPERAND),
+                        propertySetters);
+                // If we have a property setter with this name, this composite operation will always stop here
+                if(gi != null) {
+                    return new GuardedInvocationComponent(gi, clazz, ValidationType.EXACT_CLASS);
+                }
+                // If we don't have a property setter with this name, always fall back to the next operation in the
+                // composite (if any)
+                return getGuardedInvocationComponent(callSiteDescriptor, linkerServices, operations);
+            }
+            default: {
+                // More than two name components; don't know what to do with it.
+                return null;
+            }
+        }
+    }
+
+    private static final Lookup privateLookup = new Lookup(MethodHandles.lookup());
+
+    private static final MethodHandle IS_ANNOTATED_HANDLE_NOT_NULL = Guards.isNotNull().asType(MethodType.methodType(
+            boolean.class, AnnotatedMethodHandle.class));
+    private static final MethodHandle CONSTANT_NULL_DROP_ANNOTATED_HANDLE = MethodHandles.dropArguments(
+            MethodHandles.constant(Object.class, null), 0, AnnotatedMethodHandle.class);
+    private static final MethodHandle GET_ANNOTATED_HANDLE = privateLookup.findGetter(AnnotatedMethodHandle.class,
+            "handle", MethodHandle.class);
+    private static final MethodHandle GENERIC_PROPERTY_GETTER_HANDLER_INVOKER = MethodHandles.filterArguments(
+            MethodHandles.invoker(MethodType.methodType(Object.class, Object.class)), 0, GET_ANNOTATED_HANDLE);
+
+    private GuardedInvocationComponent getPropertyGetter(CallSiteDescriptor callSiteDescriptor,
+            LinkerServices linkerServices, List<String> ops) throws Exception {
+        final MethodType type = callSiteDescriptor.getMethodType();
+        switch(callSiteDescriptor.getNameTokenCount()) {
+            case 2: {
+                // Must have exactly two arguments: receiver and name
+                assertParameterCount(callSiteDescriptor, 2);
+
+                // What's below is basically:
+                //   foldArguments(guardWithTest(isNotNull, invoke(get_handle), null|nextComponent.invocation), get_getter_handle)
+                // only with a bunch of method signature adjustments. Basically, retrieve method getter
+                // AnnotatedMethodHandle; if it is non-null, invoke its "handle" field, otherwise either return null,
+                // or delegate to next component's invocation.
+
+                final MethodHandle typedGetter = linkerServices.asType(getPropertyGetterHandle, type.changeReturnType(
+                        AnnotatedMethodHandle.class));
+                // Object(AnnotatedMethodHandle, Object)->R(AnnotatedMethodHandle, T0)
+                final MethodHandle invokeHandleTyped = linkerServices.asType(GENERIC_PROPERTY_GETTER_HANDLER_INVOKER,
+                        MethodType.methodType(type.returnType(), AnnotatedMethodHandle.class, type.parameterType(0)));
+                // Since it's in the target of a fold, drop the unnecessary second argument
+                // R(AnnotatedMethodHandle, T0)->R(AnnotatedMethodHandle, T0, T1)
+                final MethodHandle invokeHandleFolded = MethodHandles.dropArguments(invokeHandleTyped, 2,
+                        type.parameterType(1));
+                final GuardedInvocationComponent nextComponent = getGuardedInvocationComponent(callSiteDescriptor,
+                        linkerServices, ops);
+
+                final MethodHandle fallbackFolded;
+                if(nextComponent == null) {
+                    // Object(AnnotatedMethodHandle)->R(AnnotatedMethodHandle, T0, T1); returns constant null
+                    fallbackFolded = MethodHandles.dropArguments(CONSTANT_NULL_DROP_ANNOTATED_HANDLE, 1,
+                            type.parameterList()).asType(type.insertParameterTypes(0, AnnotatedMethodHandle.class));
+                } else {
+                    // R(T0, T1)->R(AnnotatedMethodHAndle, T0, T1); adapts the next component's invocation to drop the
+                    // extra argument resulting from fold
+                    fallbackFolded = MethodHandles.dropArguments(nextComponent.getGuardedInvocation().getInvocation(),
+                            0, AnnotatedMethodHandle.class);
+                }
+
+                // fold(R(AnnotatedMethodHandle, T0, T1), AnnotatedMethodHandle(T0, T1))
+                final MethodHandle compositeGetter = MethodHandles.foldArguments(MethodHandles.guardWithTest(
+                            IS_ANNOTATED_HANDLE_NOT_NULL, invokeHandleFolded, fallbackFolded), typedGetter);
+                if(nextComponent == null) {
+                    return getClassGuardedInvocationComponent(compositeGetter, type);
+                } else {
+                    return nextComponent.compose(compositeGetter, getClassGuard(type), clazz,
+                            ValidationType.EXACT_CLASS);
+                }
+            }
+            case 3: {
+                // Must have exactly one argument: receiver
+                assertParameterCount(callSiteDescriptor, 1);
+                // Fixed name
+                final AnnotatedMethodHandle annGetter = propertyGetters.get(callSiteDescriptor.getNameToken(
+                        CallSiteDescriptor.NAME_OPERAND));
+                if(annGetter == null) {
+                    // We have no such property, always delegate to the next component operation
+                    return getGuardedInvocationComponent(callSiteDescriptor, linkerServices, ops);
+                }
+                final MethodHandle getter = annGetter.handle;
+                // NOTE: since property getters (not field getters!) are no-arg, we don't have to worry about them being
+                // overloaded in a subclass. Therefore, we can discover the most abstract superclass that has the
+                // method, and use that as the guard with Guards.isInstance() for a more stably linked call site. If
+                // we're linking against a field getter, don't make the assumption.
+                // NOTE: No delegation to the next component operation if we have a property with this name, even if its
+                // value is null.
+                final ValidationType validationType = annGetter.validationType;
+                return new GuardedInvocationComponent(linkerServices.asType(getter, type), getGuard(validationType,
+                        type), clazz, validationType);
+            }
+            default: {
+                // Can't do anything with more than 3 name components
+                return null;
+            }
+        }
+    }
+
+    private MethodHandle getGuard(ValidationType validationType, MethodType methodType) {
+        switch(validationType) {
+            case EXACT_CLASS: {
+                return getClassGuard(methodType);
+            }
+            case INSTANCE_OF: {
+                return getAssignableGuard(methodType);
+            }
+            case IS_ARRAY: {
+                return Guards.isArray(0, methodType);
+            }
+            case NONE: {
+                return null;
+            }
+        }
+        throw new AssertionError();
+    }
+
+    private static final MethodHandle IS_DYNAMIC_METHOD_NOT_NULL = Guards.asType(Guards.isNotNull(),
+            MethodType.methodType(boolean.class, DynamicMethod.class));
+    private static final MethodHandle DYNAMIC_METHOD_IDENTITY = MethodHandles.identity(DynamicMethod.class);
+
+    private GuardedInvocationComponent getMethodGetter(CallSiteDescriptor callSiteDescriptor,
+            LinkerServices linkerServices, List<String> ops) throws Exception {
+        final MethodType type = callSiteDescriptor.getMethodType();
+        switch(callSiteDescriptor.getNameTokenCount()) {
+            case 2: {
+                // Must have exactly two arguments: receiver and name
+                assertParameterCount(callSiteDescriptor, 2);
+                final GuardedInvocationComponent nextComponent = getGuardedInvocationComponent(callSiteDescriptor,
+                        linkerServices, ops);
+                if(nextComponent == null) {
+                    // No next component operation; just return a component for this operation.
+                    return getClassGuardedInvocationComponent(linkerServices.asType(getDynamicMethod, type), type);
+                } else {
+                    // What's below is basically:
+                    //   foldArguments(guardWithTest(isNotNull, identity, nextComponent.invocation), getter)
+                    // only with a bunch of method signature adjustments. Basically, execute method getter; if
+                    // it returns a non-null DynamicMethod, use identity to return it, otherwise delegate to
+                    // nextComponent's invocation.
+
+                    final MethodHandle typedGetter = linkerServices.asType(getDynamicMethod, type.changeReturnType(
+                            DynamicMethod.class));
+                    // Since it is part of the foldArgument() target, it will have extra args that we need to drop.
+                    final MethodHandle returnMethodHandle = linkerServices.asType(MethodHandles.dropArguments(
+                            DYNAMIC_METHOD_IDENTITY, 1, type.parameterList()), type.insertParameterTypes(0,
+                                    DynamicMethod.class));
+                    final MethodHandle nextComponentInvocation = nextComponent.getGuardedInvocation().getInvocation();
+                    // The assumption is that getGuardedInvocationComponent() already asType()'d it correctly
+                    assert nextComponentInvocation.type().equals(type);
+                    // Since it is part of the foldArgument() target, we have to drop an extra arg it receives.
+                    final MethodHandle nextCombinedInvocation = MethodHandles.dropArguments(nextComponentInvocation, 0,
+                            DynamicMethod.class);
+                    // Assemble it all into a fold(guard(isNotNull, identity, nextInvocation), get)
+                    final MethodHandle compositeGetter = MethodHandles.foldArguments(MethodHandles.guardWithTest(
+                            IS_DYNAMIC_METHOD_NOT_NULL, returnMethodHandle, nextCombinedInvocation), typedGetter);
+
+                    return nextComponent.compose(compositeGetter, getClassGuard(type), clazz,
+                            ValidationType.EXACT_CLASS);
+                }
+            }
+            case 3: {
+                // Must have exactly one argument: receiver
+                assertParameterCount(callSiteDescriptor, 1);
+                final DynamicMethod method = getDynamicMethod(callSiteDescriptor.getNameToken(
+                        CallSiteDescriptor.NAME_OPERAND));
+                if(method == null) {
+                    // We have no such method, always delegate to the next component
+                    return getGuardedInvocationComponent(callSiteDescriptor, linkerServices, ops);
+                }
+                // No delegation to the next component of the composite operation; if we have a method with that name,
+                // we'll always return it at this point.
+                return getClassGuardedInvocationComponent(linkerServices.asType(MethodHandles.dropArguments(
+                        MethodHandles.constant(DynamicMethod.class, method), 0, type.parameterType(0)), type), type);
+            }
+            default: {
+                // Can't do anything with more than 3 name components
+                return null;
+            }
+        }
+    }
+
+    private static void assertParameterCount(CallSiteDescriptor descriptor, int paramCount) {
+        if(descriptor.getMethodType().parameterCount() != paramCount) {
+            throw new BootstrapMethodError(descriptor.getName() + " must have exactly " + paramCount + " parameters.");
+        }
+    }
+
+    private static MethodHandle GET_PROPERTY_GETTER_HANDLE = MethodHandles.dropArguments(privateLookup.findOwnSpecial(
+            "getPropertyGetterHandle", Object.class, Object.class), 1, Object.class);
+    private final MethodHandle getPropertyGetterHandle = GET_PROPERTY_GETTER_HANDLE.bindTo(this);
+
+    /**
+     * @param id the property ID
+     * @return the method handle for retrieving the property, or null if the property does not exist
+     */
+    @SuppressWarnings("unused")
+    private Object getPropertyGetterHandle(Object id) {
+        return propertyGetters.get(id);
+    }
+
+    // Type is MethodHandle(BeanLinker, MethodType, LinkerServices, Object, String, Object), of which the two "Object"
+    // args are dropped; this makes handles with first three args conform to "Object, String, Object" though, which is
+    // a typical property setter with variable name signature (target, name, value).
+    private static final MethodHandle GET_PROPERTY_SETTER_HANDLE = MethodHandles.dropArguments(MethodHandles.dropArguments(
+            privateLookup.findOwnSpecial("getPropertySetterHandle", MethodHandle.class, MethodType.class,
+                    LinkerServices.class, Object.class), 3, Object.class), 5, Object.class);
+    // Type is MethodHandle(MethodType, LinkerServices, Object, String, Object)
+    private final MethodHandle getPropertySetterHandle = GET_PROPERTY_SETTER_HANDLE.bindTo(this);
+
+    @SuppressWarnings("unused")
+    private MethodHandle getPropertySetterHandle(MethodType setterType, LinkerServices linkerServices, Object id) {
+        return getDynamicMethodInvocation(setterType, linkerServices, String.valueOf(id), propertySetters);
+    }
+
+    private static MethodHandle GET_DYNAMIC_METHOD = MethodHandles.dropArguments(privateLookup.findOwnSpecial(
+            "getDynamicMethod", DynamicMethod.class, Object.class), 1, Object.class);
+    private final MethodHandle getDynamicMethod = GET_DYNAMIC_METHOD.bindTo(this);
+
+    @SuppressWarnings("unused")
+    private DynamicMethod getDynamicMethod(Object name) {
+        return getDynamicMethod(String.valueOf(name), methods);
+    }
+
+    /**
+     * Returns a dynamic method of the specified name.
+     *
+     * @param name name of the method
+     * @return the dynamic method (either {@link SimpleDynamicMethod} or {@link OverloadedDynamicMethod}, or null if the
+     * method with the specified name does not exist.
+     */
+    public DynamicMethod getDynamicMethod(String name) {
+        return getDynamicMethod(name, methods);
+    }
+
+    /**
+     * Find the most generic superclass that declares this getter. Since getters have zero args (aside from the
+     * receiver), they can't be overloaded, so we're free to link with an instanceof guard for the most generic one,
+     * creating more stable call sites.
+     * @param getter the getter
+     * @return getter with same name, declared on the most generic superclass/interface of the declaring class
+     */
+    private static Method getMostGenericGetter(Method getter) {
+        return getMostGenericGetter(getter.getName(), getter.getReturnType(), getter.getDeclaringClass());
+    }
+
+    private static Method getMostGenericGetter(String name, Class<?> returnType, Class<?> declaringClass) {
+        if(declaringClass == null) {
+            return null;
+        }
+        // Prefer interfaces
+        for(Class<?> itf: declaringClass.getInterfaces()) {
+            final Method itfGetter = getMostGenericGetter(name, returnType, itf);
+            if(itfGetter != null) {
+                return itfGetter;
+            }
+        }
+        final Method superGetter = getMostGenericGetter(name, returnType, declaringClass.getSuperclass());
+        if(superGetter != null) {
+            return superGetter;
+        }
+        if(!CheckRestrictedPackage.isRestrictedClass(declaringClass)) {
+            try {
+                return declaringClass.getMethod(name);
+            } catch(NoSuchMethodException e) {
+                // Intentionally ignored, meant to fall through
+            }
+        }
+        return null;
+    }
+
+    private static final class AnnotatedMethodHandle {
+        final MethodHandle handle;
+        /*private*/ final ValidationType validationType;
+
+        AnnotatedMethodHandle(MethodHandle handle, ValidationType validationType) {
+            this.handle = handle;
+            this.validationType = validationType;
+        }
+    }
+}
\ No newline at end of file
diff --git a/nashorn/src/jdk/internal/dynalink/beans/AccessibleMembersLookup.java b/nashorn/src/jdk/internal/dynalink/beans/AccessibleMembersLookup.java
new file mode 100644
index 00000000000..c82e334acde
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/beans/AccessibleMembersLookup.java
@@ -0,0 +1,262 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.beans;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Utility class for discovering accessible methods and inner classes. Normally, a public member declared on a class is
+ * accessible (that is, it can be invoked from anywhere). However, this is not the case if the class itself is not
+ * public, or belongs to a restricted-access package. In that case, it is required to lookup a member in a publicly
+ * accessible superclass or implemented interface of the class, and use it instead of the member discovered on the
+ * class.
+ *
+ * @author Attila Szegedi
+ */
+class AccessibleMembersLookup {
+    private final Map<MethodSignature, Method> methods;
+    private final Set<Class<?>> innerClasses;
+    private boolean instance;
+
+    /**
+     * Creates a mapping for all accessible methods and inner classes on a class.
+     *
+     * @param clazz the inspected class
+     * @param instance true to inspect instance methods, false to inspect static methods.
+     */
+    AccessibleMembersLookup(final Class<?> clazz, boolean instance) {
+        this.methods = new HashMap<>();
+        this.innerClasses = new LinkedHashSet<>();
+        this.instance = instance;
+        lookupAccessibleMembers(clazz);
+    }
+
+    /**
+     * Returns an accessible method equivalent of a method.
+     *
+     * @param m the method whose accessible equivalent is requested.
+     * @return the accessible equivalent for the method (can be the same as the passed in method), or null if there is
+     * no accessible method equivalent.
+     */
+    Method getAccessibleMethod(final Method m) {
+        return m == null ? null : methods.get(new MethodSignature(m));
+    }
+
+    Collection<Method> getMethods() {
+        return methods.values();
+    }
+
+    Class<?>[] getInnerClasses() {
+        return innerClasses.toArray(new Class<?>[innerClasses.size()]);
+    }
+
+    /**
+     * A helper class that represents a method signature - name and argument types.
+     *
+     * @author Attila Szegedi
+     */
+    static final class MethodSignature {
+        private final String name;
+        private final Class<?>[] args;
+
+        /**
+         * Creates a new method signature from arbitrary data.
+         *
+         * @param name the name of the method this signature represents.
+         * @param args the argument types of the method.
+         */
+        MethodSignature(String name, Class<?>[] args) {
+            this.name = name;
+            this.args = args;
+        }
+
+        /**
+         * Creates a signature for the given method.
+         *
+         * @param method the method for which a signature is created.
+         */
+        MethodSignature(final Method method) {
+            this(method.getName(), method.getParameterTypes());
+        }
+
+        /**
+         * Compares this object to another object
+         *
+         * @param o the other object
+         * @return true if the other object is also a method signature with the same name, same number of arguments, and
+         * same types of arguments.
+         */
+        @Override
+        public boolean equals(final Object o) {
+            if(o instanceof MethodSignature) {
+                final MethodSignature ms = (MethodSignature)o;
+                return ms.name.equals(name) && Arrays.equals(args, ms.args);
+            }
+            return false;
+        }
+
+        /**
+         * Returns a hash code, consistent with the overridden {@link #equals(Object)}.
+         */
+        @Override
+        public int hashCode() {
+            return name.hashCode() ^ Arrays.hashCode(args);
+        }
+
+        @Override
+        public String toString() {
+            final StringBuilder b = new StringBuilder();
+            b.append("[MethodSignature ").append(name).append('(');
+            if(args.length > 0) {
+                b.append(args[0].getCanonicalName());
+                for(int i = 1; i < args.length; ++i) {
+                    b.append(", ").append(args[i].getCanonicalName());
+                }
+            }
+            return b.append(")]").toString();
+        }
+    }
+
+    private void lookupAccessibleMembers(final Class<?> clazz) {
+        boolean searchSuperTypes;
+
+        if(!CheckRestrictedPackage.isRestrictedClass(clazz)) {
+            searchSuperTypes = false;
+            for(Method method: clazz.getMethods()) {
+                if(instance != Modifier.isStatic(method.getModifiers())) {
+                    final MethodSignature sig = new MethodSignature(method);
+                    if(!methods.containsKey(sig)) {
+                        final Class<?> declaringClass = method.getDeclaringClass();
+                        if(declaringClass != clazz && CheckRestrictedPackage.isRestrictedClass(declaringClass)) {
+                            //Sometimes, the declaring class of a method (Method.getDeclaringClass())
+                            //retrieved through Class.getMethods() for a public class will be a
+                            //non-public superclass. For such a method, we need to find a method with
+                            //the same name and signature in a public superclass or implemented
+                            //interface.
+                            //This typically doesn't happen with classes emitted by a reasonably modern
+                            //javac, as it'll create synthetic delegator methods in all public
+                            //immediate subclasses of the non-public class. We have, however, observed
+                            //this in the wild with class files compiled with older javac that doesn't
+                            //generate the said synthetic delegators.
+                            searchSuperTypes = true;
+                        } else {
+                            methods.put(sig, method);
+                        }
+                    }
+                }
+            }
+            for(Class<?> innerClass: clazz.getClasses()) {
+                // Add both static and non-static classes, regardless of instance flag. StaticClassLinker will just
+                // expose non-static classes with explicit constructor outer class argument.
+                // NOTE: getting inner class objects through getClasses() does not resolve them, so if those classes
+                // were not yet loaded, they'll only get loaded in a non-resolved state; no static initializers for
+                // them will trigger just by doing this.
+                innerClasses.add(innerClass);
+            }
+        } else {
+            searchSuperTypes = true;
+        }
+
+        if(searchSuperTypes) {
+            // If we reach here, the class is either not public, or it is in a restricted package. Alternatively, it is
+            // public, but some of its methods claim that their declaring class is non-public. We'll try superclasses
+            // and implemented interfaces then looking for public ones.
+            final Class<?>[] interfaces = clazz.getInterfaces();
+            for(int i = 0; i < interfaces.length; i++) {
+                lookupAccessibleMembers(interfaces[i]);
+            }
+            final Class<?> superclass = clazz.getSuperclass();
+            if(superclass != null) {
+                lookupAccessibleMembers(superclass);
+            }
+        }
+    }
+}
diff --git a/nashorn/src/jdk/internal/dynalink/beans/ApplicableOverloadedMethods.java b/nashorn/src/jdk/internal/dynalink/beans/ApplicableOverloadedMethods.java
new file mode 100644
index 00000000000..7f860dfe807
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/beans/ApplicableOverloadedMethods.java
@@ -0,0 +1,221 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.beans;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodType;
+import java.util.LinkedList;
+import java.util.List;
+import jdk.internal.dynalink.support.TypeUtilities;
+
+
+/**
+ * Represents overloaded methods applicable to a specific call site signature.
+ *
+ * @author Attila Szegedi
+ */
+class ApplicableOverloadedMethods {
+    private final List<MethodHandle> methods;
+    private final boolean varArgs;
+
+    /**
+     * Creates a new ApplicableOverloadedMethods instance
+     *
+     * @param methods a list of all overloaded methods with the same name for a class.
+     * @param callSiteType the type of the call site
+     * @param test applicability test. One of {@link #APPLICABLE_BY_SUBTYPING},
+     * {@link #APPLICABLE_BY_METHOD_INVOCATION_CONVERSION}, or {@link #APPLICABLE_BY_VARIABLE_ARITY}.
+     */
+    ApplicableOverloadedMethods(final List<MethodHandle> methods, final MethodType callSiteType,
+            final ApplicabilityTest test) {
+        this.methods = new LinkedList<>();
+        for(MethodHandle m: methods) {
+            if(test.isApplicable(callSiteType, m)) {
+                this.methods.add(m);
+            }
+        }
+        varArgs = test == APPLICABLE_BY_VARIABLE_ARITY;
+    }
+
+    /**
+     * Retrieves all the methods this object holds.
+     *
+     * @return list of all methods.
+     */
+    List<MethodHandle> getMethods() {
+        return methods;
+    }
+
+    /**
+     * Returns a list of all methods in this objects that are maximally specific.
+     *
+     * @return a list of maximally specific methods.
+     */
+    List<MethodHandle> findMaximallySpecificMethods() {
+        return MaximallySpecific.getMaximallySpecificMethods(methods, varArgs);
+    }
+
+    abstract static class ApplicabilityTest {
+        abstract boolean isApplicable(MethodType callSiteType, MethodHandle method);
+    }
+
+    /**
+     * Implements the applicability-by-subtyping test from JLS 15.12.2.2.
+     */
+    static final ApplicabilityTest APPLICABLE_BY_SUBTYPING = new ApplicabilityTest() {
+        @Override
+        boolean isApplicable(MethodType callSiteType, MethodHandle method) {
+            final MethodType methodType = method.type();
+            final int methodArity = methodType.parameterCount();
+            if(methodArity != callSiteType.parameterCount()) {
+                return false;
+            }
+            // 0th arg is receiver; it doesn't matter for overload
+            // resolution.
+            for(int i = 1; i < methodArity; ++i) {
+                if(!TypeUtilities.isSubtype(callSiteType.parameterType(i), methodType.parameterType(i))) {
+                    return false;
+                }
+            }
+            return true;
+        }
+    };
+
+    /**
+     * Implements the applicability-by-method-invocation-conversion test from JLS 15.12.2.3.
+     */
+    static final ApplicabilityTest APPLICABLE_BY_METHOD_INVOCATION_CONVERSION = new ApplicabilityTest() {
+        @Override
+        boolean isApplicable(MethodType callSiteType, MethodHandle method) {
+            final MethodType methodType = method.type();
+            final int methodArity = methodType.parameterCount();
+            if(methodArity != callSiteType.parameterCount()) {
+                return false;
+            }
+            // 0th arg is receiver; it doesn't matter for overload
+            // resolution.
+            for(int i = 1; i < methodArity; ++i) {
+                if(!TypeUtilities.isMethodInvocationConvertible(callSiteType.parameterType(i),
+                        methodType.parameterType(i))) {
+                    return false;
+                }
+            }
+            return true;
+        }
+    };
+
+    /**
+     * Implements the applicability-by-variable-arity test from JLS 15.12.2.4.
+     */
+    static final ApplicabilityTest APPLICABLE_BY_VARIABLE_ARITY = new ApplicabilityTest() {
+        @Override
+        boolean isApplicable(MethodType callSiteType, MethodHandle method) {
+            if(!method.isVarargsCollector()) {
+                return false;
+            }
+            final MethodType methodType = method.type();
+            final int methodArity = methodType.parameterCount();
+            final int fixArity = methodArity - 1;
+            final int callSiteArity = callSiteType.parameterCount();
+            if(fixArity > callSiteArity) {
+                return false;
+            }
+            // 0th arg is receiver; it doesn't matter for overload
+            // resolution.
+            for(int i = 1; i < fixArity; ++i) {
+                if(!TypeUtilities.isMethodInvocationConvertible(callSiteType.parameterType(i),
+                        methodType.parameterType(i))) {
+                    return false;
+                }
+            }
+            final Class<?> varArgType = methodType.parameterType(fixArity).getComponentType();
+            for(int i = fixArity; i < callSiteArity; ++i) {
+                if(!TypeUtilities.isMethodInvocationConvertible(callSiteType.parameterType(i), varArgType)) {
+                    return false;
+                }
+            }
+            return true;
+        }
+    };
+}
diff --git a/nashorn/src/jdk/internal/dynalink/beans/BeanIntrospector.java b/nashorn/src/jdk/internal/dynalink/beans/BeanIntrospector.java
new file mode 100644
index 00000000000..fc54e353a6e
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/beans/BeanIntrospector.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.beans;
+
+import java.lang.invoke.MethodHandle;
+import java.util.Collections;
+import java.util.Map;
+
+class BeanIntrospector extends FacetIntrospector {
+    BeanIntrospector(Class<?> clazz) {
+        super(clazz, true);
+    }
+
+    @Override
+    Map<String, MethodHandle> getInnerClassGetters() {
+        return Collections.emptyMap(); // NOTE: non-static inner classes are also on StaticClassIntrospector.
+    }
+
+    @Override
+    MethodHandle editMethodHandle(MethodHandle mh) {
+        return mh;
+    }
+}
diff --git a/nashorn/src/jdk/internal/dynalink/beans/BeanLinker.java b/nashorn/src/jdk/internal/dynalink/beans/BeanLinker.java
new file mode 100644
index 00000000000..14c3a68bbe7
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/beans/BeanLinker.java
@@ -0,0 +1,493 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.beans;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.lang.reflect.Array;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import jdk.internal.dynalink.CallSiteDescriptor;
+import jdk.internal.dynalink.beans.GuardedInvocationComponent.ValidationType;
+import jdk.internal.dynalink.linker.GuardedInvocation;
+import jdk.internal.dynalink.linker.LinkerServices;
+import jdk.internal.dynalink.linker.TypeBasedGuardingDynamicLinker;
+import jdk.internal.dynalink.support.Guards;
+import jdk.internal.dynalink.support.Lookup;
+import jdk.internal.dynalink.support.TypeUtilities;
+
+
+/**
+ * A class that provides linking capabilities for a single POJO class. Normally not used directly, but managed by
+ * {@link BeansLinker}.
+ *
+ * @author Attila Szegedi
+ */
+class BeanLinker extends AbstractJavaLinker implements TypeBasedGuardingDynamicLinker {
+    BeanLinker(Class<?> clazz) {
+        super(clazz, Guards.getClassGuard(clazz), Guards.getInstanceOfGuard(clazz));
+        if(clazz.isArray()) {
+            // Some languages won't have a notion of manipulating collections. Exposing "length" on arrays as an
+            // explicit property is beneficial for them.
+            // REVISIT: is it maybe a code smell that "dyn:getLength" is not needed?
+            setPropertyGetter("length", GET_ARRAY_LENGTH, ValidationType.IS_ARRAY);
+        }
+    }
+
+    @Override
+    public boolean canLinkType(Class<?> type) {
+        return type == clazz;
+    }
+
+    @Override
+    FacetIntrospector createFacetIntrospector() {
+        return new BeanIntrospector(clazz);
+    }
+
+    @Override
+    protected GuardedInvocationComponent getGuardedInvocationComponent(CallSiteDescriptor callSiteDescriptor,
+            LinkerServices linkerServices, List<String> operations) throws Exception {
+        final GuardedInvocationComponent superGic = super.getGuardedInvocationComponent(callSiteDescriptor,
+                linkerServices, operations);
+        if(superGic != null) {
+            return superGic;
+        }
+        if(operations.isEmpty()) {
+            return null;
+        }
+        final String op = operations.get(0);
+        // dyn:getElem(this, id)
+        // id is typically either an int (for arrays and lists) or an object (for maps). linkerServices can provide
+        // conversion from call site argument type though.
+        if("getElem".equals(op)) {
+            return getElementGetter(callSiteDescriptor, linkerServices, pop(operations));
+        }
+        if("setElem".equals(op)) {
+            return getElementSetter(callSiteDescriptor, linkerServices, pop(operations));
+        }
+        // dyn:getLength(this) (works on Java arrays, collections, and maps)
+        if("getLength".equals(op)) {
+            return getLengthGetter(callSiteDescriptor);
+        }
+        return null;
+    }
+
+    private static MethodHandle GET_LIST_ELEMENT = Lookup.PUBLIC.findVirtual(List.class, "get",
+            MethodType.methodType(Object.class, int.class));
+
+    private static MethodHandle GET_MAP_ELEMENT = Lookup.PUBLIC.findVirtual(Map.class, "get",
+            MethodType.methodType(Object.class, Object.class));
+
+    private static MethodHandle LIST_GUARD = Guards.getInstanceOfGuard(List.class);
+    private static MethodHandle MAP_GUARD = Guards.getInstanceOfGuard(Map.class);
+
+    private GuardedInvocationComponent getElementGetter(final CallSiteDescriptor callSiteDescriptor,
+            final LinkerServices linkerServices, List<String> operations) throws Exception {
+        final MethodType callSiteType = callSiteDescriptor.getMethodType();
+        final Class<?> declaredType = callSiteType.parameterType(0);
+        final GuardedInvocationComponent nextComponent = getGuardedInvocationComponent(callSiteDescriptor,
+                linkerServices, operations);
+
+        // If declared type of receiver at the call site is already an array, a list or map, bind without guard. Thing
+        // is, it'd be quite stupid of a call site creator to go though invokedynamic when it knows in advance they're
+        // dealing with an array, or a list or map, but hey...
+        // Note that for arrays and lists, using LinkerServices.asType() will ensure that any language specific linkers
+        // in use will get a chance to perform any (if there's any) implicit conversion to integer for the indices.
+        final GuardedInvocationComponent gic;;
+        final boolean isMap;
+        if(declaredType.isArray()) {
+            gic = new GuardedInvocationComponent(MethodHandles.arrayElementGetter(declaredType));
+            isMap = false;
+        } else if(List.class.isAssignableFrom(declaredType)) {
+            gic = new GuardedInvocationComponent(GET_LIST_ELEMENT);
+            isMap = false;
+        } else if(Map.class.isAssignableFrom(declaredType)) {
+            gic = new GuardedInvocationComponent(GET_MAP_ELEMENT);
+            isMap = true;
+        } else if(clazz.isArray()) {
+            gic = getClassGuardedInvocationComponent(MethodHandles.arrayElementGetter(clazz), callSiteType);
+            isMap = false;
+        } else if(List.class.isAssignableFrom(clazz)) {
+            gic = new GuardedInvocationComponent(GET_LIST_ELEMENT, Guards.asType(LIST_GUARD, callSiteType), List.class,
+                    ValidationType.INSTANCE_OF);
+            isMap = false;
+        } else if(Map.class.isAssignableFrom(clazz)) {
+            gic = new GuardedInvocationComponent(GET_MAP_ELEMENT, Guards.asType(MAP_GUARD, callSiteType), Map.class,
+                    ValidationType.INSTANCE_OF);
+            isMap = true;
+        } else {
+            // Can't retrieve elements for objects that are neither arrays, nor list, nor maps.
+            return nextComponent;
+        }
+
+        // We can have "dyn:getElem:foo", especially in composites, i.e. "dyn:getElem|getProp|getMethod:foo"
+        final String fixedKey = getFixedKey(callSiteDescriptor);
+        // Convert the key to a number if we're working with a list or array
+        final Object typedFixedKey;
+        if(!isMap && fixedKey != null) {
+            typedFixedKey = convertKeyToInteger(fixedKey, linkerServices);
+            if(typedFixedKey == null) {
+                // key is not numeric, it can never succeed
+                return nextComponent;
+            }
+        } else {
+            typedFixedKey = fixedKey;
+        }
+
+        final GuardedInvocation gi = gic.getGuardedInvocation();
+        final Binder binder = new Binder(linkerServices, callSiteType, typedFixedKey);
+        final MethodHandle invocation = gi.getInvocation();
+
+        if(nextComponent == null) {
+            return gic.replaceInvocation(binder.bind(invocation));
+        } else {
+            final MethodHandle checkGuard;
+            if(invocation == GET_LIST_ELEMENT) {
+                checkGuard = convertArgToInt(RANGE_CHECK_LIST, linkerServices, callSiteDescriptor);
+            } else if(invocation == GET_MAP_ELEMENT) {
+                // TODO: A more complex solution could be devised for maps, one where we do a get() first, and fold it
+                // into a GWT that tests if it returned null, and if it did, do another GWT with containsKey()
+                // that returns constant null (on true), or falls back to next component (on false)
+                checkGuard = CONTAINS_MAP;
+            } else {
+                checkGuard = convertArgToInt(RANGE_CHECK_ARRAY, linkerServices, callSiteDescriptor);
+            }
+            return nextComponent.compose(MethodHandles.guardWithTest(binder.bindTest(checkGuard),
+                    binder.bind(invocation), nextComponent.getGuardedInvocation().getInvocation()), gi.getGuard(),
+                    gic.getValidatorClass(), gic.getValidationType());
+        }
+    }
+
+    private static String getFixedKey(final CallSiteDescriptor callSiteDescriptor) {
+        return callSiteDescriptor.getNameTokenCount() == 2 ? null : callSiteDescriptor.getNameToken(
+                CallSiteDescriptor.NAME_OPERAND);
+    }
+
+    private static Object convertKeyToInteger(String fixedKey, LinkerServices linkerServices) throws Exception {
+        try {
+            if(linkerServices.canConvert(String.class, Number.class)) {
+                try {
+                    final Object val = linkerServices.getTypeConverter(String.class, Number.class).invoke(fixedKey);
+                    if(!(val instanceof Number)) {
+                        return null; // not a number
+                    }
+                    final Number n = (Number)val;
+                    if(n instanceof Integer) {
+                        return n;
+                    }
+                    final int intIndex = n.intValue();
+                    final double doubleValue = n.doubleValue();
+                    if(intIndex != doubleValue && !Double.isInfinite(doubleValue)) { // let infinites trigger IOOBE
+                        return null; // not an exact integer
+                    }
+                    return Integer.valueOf(intIndex);
+                } catch(Exception|Error e) {
+                    throw e;
+                } catch(Throwable t) {
+                    throw new RuntimeException(t);
+                }
+            }
+            return Integer.valueOf(fixedKey);
+        } catch(NumberFormatException e) {
+            // key is not a number
+            return null;
+        }
+    }
+
+    private static MethodHandle convertArgToInt(MethodHandle mh, LinkerServices ls, CallSiteDescriptor desc) {
+        final Class<?> sourceType = desc.getMethodType().parameterType(1);
+        if(TypeUtilities.isMethodInvocationConvertible(sourceType, Number.class)) {
+            return mh;
+        } else if(ls.canConvert(sourceType, Number.class)) {
+            final MethodHandle converter = ls.getTypeConverter(sourceType, Number.class);
+            return MethodHandles.filterArguments(mh, 1, converter.asType(converter.type().changeReturnType(
+                    mh.type().parameterType(1))));
+        }
+        return mh;
+    }
+
+    /**
+     * Contains methods to adapt an item getter/setter method handle to the requested type, optionally binding it to a
+     * fixed key first.
+     * @author Attila Szegedi
+     * @version $Id: $
+     */
+    private static class Binder {
+        private final LinkerServices linkerServices;
+        private final MethodType methodType;
+        private final Object fixedKey;
+
+        Binder(LinkerServices linkerServices, MethodType methodType, Object fixedKey) {
+            this.linkerServices = linkerServices;
+            this.methodType = fixedKey == null ? methodType : methodType.insertParameterTypes(1, fixedKey.getClass());
+            this.fixedKey = fixedKey;
+        }
+
+        /*private*/ MethodHandle bind(MethodHandle handle) {
+            return bindToFixedKey(linkerServices.asType(handle, methodType));
+        }
+
+        /*private*/ MethodHandle bindTest(MethodHandle handle) {
+            return bindToFixedKey(Guards.asType(handle, methodType));
+        }
+
+        private MethodHandle bindToFixedKey(MethodHandle handle) {
+            return fixedKey == null ? handle : MethodHandles.insertArguments(handle, 1, fixedKey);
+        }
+    }
+
+    private static MethodHandle RANGE_CHECK_ARRAY = findRangeCheck(Object.class);
+    private static MethodHandle RANGE_CHECK_LIST = findRangeCheck(List.class);
+    private static MethodHandle CONTAINS_MAP = Lookup.PUBLIC.findVirtual(Map.class, "containsKey",
+            MethodType.methodType(boolean.class, Object.class));
+
+    private static MethodHandle findRangeCheck(Class<?> collectionType) {
+        return Lookup.findOwnStatic(MethodHandles.lookup(), "rangeCheck", boolean.class, collectionType, Object.class);
+    }
+
+    @SuppressWarnings("unused")
+    private static final boolean rangeCheck(Object array, Object index) {
+        if(!(index instanceof Number)) {
+            return false;
+        }
+        final Number n = (Number)index;
+        final int intIndex = n.intValue();
+        final double doubleValue = n.doubleValue();
+        if(intIndex != doubleValue && !Double.isInfinite(doubleValue)) { // let infinite trigger IOOBE
+            return false;
+        }
+        if(0 <= intIndex && intIndex < Array.getLength(array)) {
+            return true;
+        }
+        throw new ArrayIndexOutOfBoundsException("Array index out of range: " + n);
+    }
+
+    @SuppressWarnings("unused")
+    private static final boolean rangeCheck(List<?> list, Object index) {
+        if(!(index instanceof Number)) {
+            return false;
+        }
+        final Number n = (Number)index;
+        final int intIndex = n.intValue();
+        final double doubleValue = n.doubleValue();
+        if(intIndex != doubleValue && !Double.isInfinite(doubleValue)) { // let infinite trigger IOOBE
+            return false;
+        }
+        if(0 <= intIndex && intIndex < list.size()) {
+            return true;
+        }
+        throw new IndexOutOfBoundsException("Index: " + n + ", Size: " + list.size());
+    }
+
+    private static MethodHandle SET_LIST_ELEMENT = Lookup.PUBLIC.findVirtual(List.class, "set",
+            MethodType.methodType(Object.class, int.class, Object.class));
+
+    private static MethodHandle PUT_MAP_ELEMENT = Lookup.PUBLIC.findVirtual(Map.class, "put",
+            MethodType.methodType(Object.class, Object.class, Object.class));
+
+    private GuardedInvocationComponent getElementSetter(CallSiteDescriptor callSiteDescriptor,
+            LinkerServices linkerServices, List<String> operations) throws Exception {
+        final MethodType callSiteType = callSiteDescriptor.getMethodType();
+        final Class<?> declaredType = callSiteType.parameterType(0);
+
+        final GuardedInvocationComponent gic;
+        // If declared type of receiver at the call site is already an array, a list or map, bind without guard. Thing
+        // is, it'd be quite stupid of a call site creator to go though invokedynamic when it knows in advance they're
+        // dealing with an array, or a list or map, but hey...
+        // Note that for arrays and lists, using LinkerServices.asType() will ensure that any language specific linkers
+        // in use will get a chance to perform any (if there's any) implicit conversion to integer for the indices.
+        final boolean isMap;
+        if(declaredType.isArray()) {
+            gic = new GuardedInvocationComponent(MethodHandles.arrayElementSetter(declaredType));
+            isMap = false;
+        } else if(List.class.isAssignableFrom(declaredType)) {
+            gic = new GuardedInvocationComponent(SET_LIST_ELEMENT);
+            isMap = false;
+        } else if(Map.class.isAssignableFrom(declaredType)) {
+            gic = new GuardedInvocationComponent(PUT_MAP_ELEMENT);
+            isMap = true;
+        } else if(clazz.isArray()) {
+            gic = getClassGuardedInvocationComponent(MethodHandles.arrayElementSetter(clazz), callSiteType);
+            isMap = false;
+        } else if(List.class.isAssignableFrom(clazz)) {
+            gic = new GuardedInvocationComponent(SET_LIST_ELEMENT, Guards.asType(LIST_GUARD, callSiteType), List.class,
+                    ValidationType.INSTANCE_OF);
+            isMap = false;
+        } else if(Map.class.isAssignableFrom(clazz)) {
+            gic = new GuardedInvocationComponent(PUT_MAP_ELEMENT, Guards.asType(MAP_GUARD, callSiteType), Map.class,
+                    ValidationType.INSTANCE_OF);
+            isMap = true;
+        } else {
+            // Can't set elements for objects that are neither arrays, nor list, nor maps.
+            gic = null;
+            isMap = false;
+        }
+
+        // In contrast to, say, getElementGetter, we only compute the nextComponent if the target object is not a map,
+        // as maps will always succeed in setting the element and will never need to fall back to the next component
+        // operation.
+        final GuardedInvocationComponent nextComponent = isMap ? null : getGuardedInvocationComponent(
+                callSiteDescriptor, linkerServices, operations);
+        if(gic == null) {
+            return nextComponent;
+        }
+
+        // We can have "dyn:setElem:foo", especially in composites, i.e. "dyn:setElem|setProp:foo"
+        final String fixedKey = getFixedKey(callSiteDescriptor);
+        // Convert the key to a number if we're working with a list or array
+        final Object typedFixedKey;
+        if(!isMap && fixedKey != null) {
+            typedFixedKey = convertKeyToInteger(fixedKey, linkerServices);
+            if(typedFixedKey == null) {
+                // key is not numeric, it can never succeed
+                return nextComponent;
+            }
+        } else {
+            typedFixedKey = fixedKey;
+        }
+
+        final GuardedInvocation gi = gic.getGuardedInvocation();
+        final Binder binder = new Binder(linkerServices, callSiteType, typedFixedKey);
+        final MethodHandle invocation = gi.getInvocation();
+
+        if(nextComponent == null) {
+            return gic.replaceInvocation(binder.bind(invocation));
+        } else {
+            final MethodHandle checkGuard = convertArgToInt(invocation == SET_LIST_ELEMENT ? RANGE_CHECK_LIST :
+                RANGE_CHECK_ARRAY, linkerServices, callSiteDescriptor);
+            return nextComponent.compose(MethodHandles.guardWithTest(binder.bindTest(checkGuard),
+                    binder.bind(invocation), nextComponent.getGuardedInvocation().getInvocation()), gi.getGuard(),
+                    gic.getValidatorClass(), gic.getValidationType());
+        }
+    }
+
+    private static MethodHandle GET_ARRAY_LENGTH = Lookup.PUBLIC.findStatic(Array.class, "getLength",
+            MethodType.methodType(int.class, Object.class));
+
+    private static MethodHandle GET_COLLECTION_LENGTH = Lookup.PUBLIC.findVirtual(Collection.class, "size",
+            MethodType.methodType(int.class));
+
+    private static MethodHandle GET_MAP_LENGTH = Lookup.PUBLIC.findVirtual(Map.class, "size",
+            MethodType.methodType(int.class));
+
+    private static MethodHandle COLLECTION_GUARD = Guards.getInstanceOfGuard(Collection.class);
+
+    private GuardedInvocationComponent getLengthGetter(CallSiteDescriptor callSiteDescriptor) {
+        assertParameterCount(callSiteDescriptor, 1);
+        final MethodType callSiteType = callSiteDescriptor.getMethodType();
+        final Class<?> declaredType = callSiteType.parameterType(0);
+        // If declared type of receiver at the call site is already an array, collection, or map, bind without guard.
+        // Thing is, it'd be quite stupid of a call site creator to go though invokedynamic when it knows in advance
+        // they're dealing with an array, collection, or map, but hey...
+        if(declaredType.isArray()) {
+            return new GuardedInvocationComponent(GET_ARRAY_LENGTH.asType(callSiteType));
+        } else if(Collection.class.isAssignableFrom(declaredType)) {
+            return new GuardedInvocationComponent(GET_COLLECTION_LENGTH.asType(callSiteType));
+        } else if(Map.class.isAssignableFrom(declaredType)) {
+            return new GuardedInvocationComponent(GET_MAP_LENGTH.asType(callSiteType));
+        }
+
+        // Otherwise, create a binding based on the actual type of the argument with an appropriate guard.
+        if(clazz.isArray()) {
+            return new GuardedInvocationComponent(GET_ARRAY_LENGTH.asType(callSiteType), Guards.isArray(0,
+                    callSiteType), ValidationType.IS_ARRAY);
+        } if(Collection.class.isAssignableFrom(clazz)) {
+            return new GuardedInvocationComponent(GET_COLLECTION_LENGTH.asType(callSiteType), Guards.asType(
+                    COLLECTION_GUARD, callSiteType), Collection.class, ValidationType.INSTANCE_OF);
+        } if(Map.class.isAssignableFrom(clazz)) {
+            return new GuardedInvocationComponent(GET_MAP_LENGTH.asType(callSiteType), Guards.asType(MAP_GUARD,
+                    callSiteType), Map.class, ValidationType.INSTANCE_OF);
+        }
+        // Can't retrieve length for objects that are neither arrays, nor collections, nor maps.
+        return null;
+    }
+
+    private static void assertParameterCount(CallSiteDescriptor descriptor, int paramCount) {
+        if(descriptor.getMethodType().parameterCount() != paramCount) {
+            throw new BootstrapMethodError(descriptor.getName() + " must have exactly " + paramCount + " parameters.");
+        }
+    }
+}
\ No newline at end of file
diff --git a/nashorn/src/jdk/internal/dynalink/beans/BeansLinker.java b/nashorn/src/jdk/internal/dynalink/beans/BeansLinker.java
new file mode 100644
index 00000000000..b372a7f26a0
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/beans/BeansLinker.java
@@ -0,0 +1,180 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.beans;
+
+import java.beans.BeanInfo;
+import java.lang.invoke.MethodHandles;
+import jdk.internal.dynalink.CallSiteDescriptor;
+import jdk.internal.dynalink.DynamicLinkerFactory;
+import jdk.internal.dynalink.linker.GuardedInvocation;
+import jdk.internal.dynalink.linker.GuardingDynamicLinker;
+import jdk.internal.dynalink.linker.LinkRequest;
+import jdk.internal.dynalink.linker.LinkerServices;
+import jdk.internal.dynalink.linker.TypeBasedGuardingDynamicLinker;
+
+
+/**
+ * A linker for POJOs. Normally used as the ultimate fallback linker by the {@link DynamicLinkerFactory} so it is given
+ * the chance to link calls to all objects that no other language runtime recognizes. Specifically, this linker will:
+ * <ul>
+ * <li>expose all public methods of form {@code setXxx()}, {@code getXxx()}, and {@code isXxx()} as property setters and
+ * getters for {@code dyn:setProp} and {@code dyn:getProp} operations;</li>
+ * <li>expose all property getters and setters declared by the class' {@link BeanInfo};</li>
+ * <li>expose all public methods and methods declared by the class' {@link BeanInfo} for invocation through
+ * {@code dyn:callMethod} operation;</li>
+ * <li>expose all public methods and methods declared by the class' {@link BeanInfo} for retrieval for
+ * {@code dyn:getMethod} operation; the methods thus retrieved can then be invoked using {@code dyn:call};</li>
+ * <li>expose all public fields as properties, unless there are getters or setters for the properties of the same name;</li>
+ * <li>expose {@code dyn:getLength}, {@code dyn:getElem} and {@code dyn:setElem} on native Java arrays, as well as
+ * {@link java.util.List} and {@link java.util.Map} objects; ({@code dyn:getLength} works on any
+ * {@link java.util.Collection});</li>
+ * <li>expose a virtual property named {@code length} on Java arrays;</li>
+ * <li>expose {@code dyn:new} on instances of {@link StaticClass} as calls to constructors, including those static class
+ * objects that represent Java arrays (their constructors take a single {@code int} parameter representing the length of
+ * the array to create);</li>
+ * <li>expose static methods, fields, and properties of classes in a similar manner to how instance method, fields, and
+ * properties are exposed, on {@link StaticClass} objects.</li>
+ * <li>expose a virtual property named {@code static} on instances of {@link java.lang.Class} to access their
+ * {@link StaticClass}.</li>
+ * </ul>
+ * <p><strong>Overloaded method resolution</strong> is performed automatically for property setters, methods, and
+ * constructors. Additionally, manual overloaded method selection is supported by having a call site specify a name for
+ * a method that contains an explicit signature, i.e. {@code dyn:getMethod:parseInt(String,int)}. You can use
+ * non-qualified class names in such signatures regardless of those classes' packages, they will match any class with
+ * the same non-qualified name. You only have to use a fully qualified class name in case non-qualified class names
+ * would cause selection ambiguity (that is extremely rare).</p>
+ * <p><strong>Variable argument invocation</strong> is handled for both methods and constructors.</p>
+ * <p>Currently, only public fields and methods are supported. Any Lookup objects passed in the
+ * {@link LinkRequest}s are ignored and {@link MethodHandles#publicLookup()} is used instead.</p>
+ *
+ * @author Attila Szegedi
+ */
+public class BeansLinker implements GuardingDynamicLinker {
+    private static final ClassValue<TypeBasedGuardingDynamicLinker> linkers = new ClassValue<TypeBasedGuardingDynamicLinker>() {
+        @Override
+        protected TypeBasedGuardingDynamicLinker computeValue(Class<?> clazz) {
+            // If ClassValue.put() were public, we could just pre-populate with these known mappings...
+            return
+                clazz == Class.class ? new ClassLinker() :
+                clazz == StaticClass.class ? new StaticClassLinker() :
+                DynamicMethod.class.isAssignableFrom(clazz) ? new DynamicMethodLinker() :
+                new BeanLinker(clazz);
+        }
+    };
+
+    /**
+     * Creates a new POJO linker.
+     */
+    public BeansLinker() {
+    }
+
+    /**
+     * Returns a bean linker for a particular single class. Useful when you need to override or extend the behavior of
+     * linking for some classes in your language runtime's linker, but still want to delegate to the default behavior in
+     * some cases.
+     * @param clazz the class
+     * @return a bean linker for that class
+     */
+    public static TypeBasedGuardingDynamicLinker getLinkerForClass(Class<?> clazz) {
+        return linkers.get(clazz);
+    }
+
+    @Override
+    public GuardedInvocation getGuardedInvocation(LinkRequest request, final LinkerServices linkerServices)
+            throws Exception {
+        final CallSiteDescriptor callSiteDescriptor = request.getCallSiteDescriptor();
+        final int l = callSiteDescriptor.getNameTokenCount();
+        // All names conforming to the dynalang MOP should have at least two tokens, the first one being "dyn"
+        if(l < 2 || "dyn" != callSiteDescriptor.getNameToken(CallSiteDescriptor.SCHEME)) {
+            return null;
+        }
+
+        final Object receiver = request.getReceiver();
+        if(receiver == null) {
+            // Can't operate on null
+            return null;
+        }
+        return getLinkerForClass(receiver.getClass()).getGuardedInvocation(request, linkerServices);
+    }
+}
\ No newline at end of file
diff --git a/nashorn/src/jdk/internal/dynalink/beans/CheckRestrictedPackage.java b/nashorn/src/jdk/internal/dynalink/beans/CheckRestrictedPackage.java
new file mode 100644
index 00000000000..6c877a4d5d6
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/beans/CheckRestrictedPackage.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.beans;
+
+import java.lang.reflect.Modifier;
+
+/**
+ * A utility class to check whether a given class is in a package with restricted access e.g. "sun.*" etc. See
+ * {@link CheckRestrictedPackageInternal} for implementation details.
+ */
+class CheckRestrictedPackage {
+    /**
+     * Returns true if the class is either not public, or it resides in a package with restricted access.
+     * @param clazz the class to test
+     * @return true if the class is either not public, or it resides in a package with restricted access.
+     */
+    static boolean isRestrictedClass(Class<?> clazz) {
+        return !Modifier.isPublic(clazz.getModifiers()) ||
+                (System.getSecurityManager() != null && isRestrictedPackage(clazz.getPackage()));
+    }
+
+    private static boolean isRestrictedPackage(Package pkg) {
+        // Note: we broke out the actual implementation into CheckRestrictedPackageInternal, so we only load it when
+        // needed - that is, if we need to check a non-public class with a non-null package, in presence of a security
+        // manager.
+        return pkg == null ? false : CheckRestrictedPackageInternal.isRestrictedPackageName(pkg.getName());
+    }
+}
diff --git a/nashorn/src/jdk/internal/dynalink/beans/CheckRestrictedPackageInternal.java b/nashorn/src/jdk/internal/dynalink/beans/CheckRestrictedPackageInternal.java
new file mode 100644
index 00000000000..c7401c9febc
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/beans/CheckRestrictedPackageInternal.java
@@ -0,0 +1,252 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.beans;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.reflect.Method;
+import java.security.AccessController;
+import java.security.Permissions;
+import java.security.PrivilegedAction;
+import java.security.ProtectionDomain;
+import java.security.SecureClassLoader;
+
+/**
+ * A utility class to check whether a given class is in a package with restricted access e.g. "sun.*". These packages
+ * are normally listed in the security property "package.access" for most JRE implementations, although we fortunately
+ * don't rely on it but solely on {@link SecurityManager#checkPackageAccess(String)}).
+ *
+ * This class accomplishes the check in a fashion that works reliably even if Dynalink itself (and all the code on the
+ * stack that led to the invocation) has the permission to access the restricted package.
+ *
+ * If Dynalink has a broad set of privileges (notably, it is loaded from boot or extension class path), then it loads
+ * the {@link RestrictedPackageTester} class into a isolated secure class loader that gives it no permissions
+ * whatsoever, and uses this completely unprivileged class to subsequently invoke
+ * {@link SecurityManager#checkPackageAccess(String)}. This will reliably throw a {@link SecurityException} for every
+ * restricted package even if Dynalink and other code on the stack have the requisite {@code "accessClassInPackage.*"}
+ * {@link RuntimePermission} privilege.
+ *
+ * On the other hand, if Dynalink does not have a broad set of privileges normally granted by the boot or extension
+ * class path, it will probably lack the privilege to create a new secure class loader into which to load the tester
+ * class. In this case, it will invoke {@link SecurityManager#checkPackageAccess(String)} itself with the reasoning that
+ * it will also be sufficient to discover whether a package is restricted or not.
+ *
+ * The rationale for this design is that if Dynalink is running as part of a privileged classpath - boot or extension
+ * class path, it will have all privileges, so a security manager's package access check might succeed if all other code
+ * on the stack when requesting linking with a particular restricted class is also privileged. A subsequent linking
+ * request from less privileged code would then also succeed in requesting methods in privileged package. On the other
+ * hand, if Dynalink is privileged, it will be able to delegate the package access check to the unprivileged class and
+ * narrow the access based on its result. Finally, if Dynalink itself is unprivileged, it will not be able to load the
+ * unprivileged class, but then it will also fail the security manager's package access.
+ *
+ * With this design, Dynalink effectively restrains itself from giving unauthorized access to restricted packages from
+ * classes doing the linking in case it itself has access to those packages. The only way to defeat it would be to
+ * selectively give Dynalink some {@code "accessClassInPackage.*"} permissions while denying it the privilege to
+ * manipulate class loaders.
+ */
+class CheckRestrictedPackageInternal {
+    private static final MethodHandle PACKAGE_ACCESS_CHECK = getPackageAccessCheckMethod();
+    private static final String TESTER_CLASS_NAME = "jdk.internal.dynalink.beans.RestrictedPackageTester";
+
+    /**
+     * Returns true if the specified package has restricted access.
+     * @param pkgName the name of the package to check.
+     * @return true if the specified package has restricted access, false otherwise.
+     * @throws NullPointerException if pkgName is null, or if there is {@link System#getSecurityManager()} returns null
+     * as this method is only expected to be invoked in the presence of a security manager.
+     */
+    static boolean isRestrictedPackageName(String pkgName) {
+        try {
+            if(PACKAGE_ACCESS_CHECK != null) {
+                // If we were able to load our unprivileged tester class, use it to check package access
+                try {
+                    PACKAGE_ACCESS_CHECK.invokeExact(pkgName);
+                } catch(Error|RuntimeException e) {
+                    throw e;
+                } catch(Throwable t) {
+                    throw new RuntimeException(t);
+                }
+            } else {
+                // If we didn't have sufficient permissions to load our unprivileged tester class, we're definitely not
+                // running in a privileged class path, so invoking SecurityManager.checkPackageAccess() directly should
+                // have the same effect as going through an unprivileged tester.
+                System.getSecurityManager().checkPackageAccess(pkgName);
+            }
+            return false;
+        } catch(SecurityException e) {
+            return true;
+        }
+    }
+
+    private static MethodHandle getPackageAccessCheckMethod() {
+        try {
+            return AccessController.doPrivileged(new PrivilegedAction<MethodHandle>() {
+                @Override
+                public MethodHandle run() {
+                    return getPackageAccessCheckMethodInternal();
+                }
+            });
+        } catch(SecurityException e) {
+            // We don't have sufficient privileges to load our tester class into a separate protection domain, so just
+            // return null so isRestrictedPackageName() will default to itself invoking
+            // SecurityManager.checkPackageAccess().
+            return null;
+        }
+    }
+
+    static MethodHandle getPackageAccessCheckMethodInternal() {
+        try {
+            // Can't use MethodHandles.lookup().findStatic() -- even though both this class and the loaded class are in
+            // the same package, findStatic() will throw an IllegalAccessException since they have different class
+            // loaders. That's why we have to use unreflect with a setAccessible(true)...
+            final Method m = getTesterClass().getDeclaredMethod("checkPackageAccess", String.class);
+            m.setAccessible(true);
+            return MethodHandles.lookup().unreflect(m);
+        } catch(IllegalAccessException|NoSuchMethodException e) {
+            throw new AssertionError(e);
+        }
+    }
+
+    private static Class<?> getTesterClass() {
+        final ClassLoader loader = getTesterClassLoader();
+        try {
+            final Class<?> checkerClass = Class.forName(TESTER_CLASS_NAME, true, loader);
+            // Sanity check to ensure we didn't accidentally pick up the class from elsewhere
+            if(checkerClass.getClassLoader() != loader) {
+                throw new AssertionError(TESTER_CLASS_NAME + " was loaded from a different class loader");
+            }
+            return checkerClass;
+        } catch(ClassNotFoundException e) {
+            throw new AssertionError(e);
+        }
+    }
+
+    private static ClassLoader getTesterClassLoader() {
+        // We deliberately override loadClass instead of findClass so that we don't give a chance to finding this
+        // class already loaded anywhere else. Not that there's a big possibility for this, especially since the parent
+        // class loader is the bootstrap class loader, but still...
+        return new SecureClassLoader(null) {
+
+            @Override
+            protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
+                if(name.equals(TESTER_CLASS_NAME)) {
+                    final byte[] bytes = getTesterClassBytes();
+                    // Define the class with a protection domain that grants no permissions.
+                    Class<?> clazz = defineClass(name, bytes, 0, bytes.length, new ProtectionDomain(null,
+                            new Permissions()));
+                    if(resolve) {
+                        resolveClass(clazz);
+                    }
+                    return clazz;
+                } else {
+                    return super.loadClass(name, resolve);
+                }
+            }
+        };
+    }
+
+    private static byte[] getTesterClassBytes() {
+        try {
+            final InputStream in = CheckRestrictedPackage.class.getResourceAsStream("RestrictedPackageTester.class");
+            try {
+                final ByteArrayOutputStream out = new ByteArrayOutputStream(2048);
+                for(;;) {
+                    final int b = in.read();
+                    if(b == -1) {
+                        break;
+                    }
+                    out.write(b);
+                }
+                return out.toByteArray();
+            } finally {
+                in.close();
+            }
+        } catch(IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/nashorn/src/jdk/internal/dynalink/beans/ClassLinker.java b/nashorn/src/jdk/internal/dynalink/beans/ClassLinker.java
new file mode 100644
index 00000000000..6b7f17deaae
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/beans/ClassLinker.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.beans;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import jdk.internal.dynalink.beans.GuardedInvocationComponent.ValidationType;
+import jdk.internal.dynalink.support.Lookup;
+
+
+/**
+ * A linker for java.lang.Class objects. Provides a synthetic property "static" that allows access to static fields and
+ * methods on the class (respecting property getter/setter conventions). Note that Class objects are not recognized by
+ * the Dynalink as constructors for the instances of the class, {@link StaticClass} is used for this purpose.
+ * @author Attila Szegedi
+ */
+class ClassLinker extends BeanLinker {
+
+    ClassLinker() {
+        super(Class.class);
+        // Map "classObject.static" to StaticClass.forClass(classObject). Can use EXACT_CLASS since class Class is final.
+        setPropertyGetter("static", FOR_CLASS, ValidationType.EXACT_CLASS);
+    }
+
+    private static final MethodHandle FOR_CLASS = new Lookup(MethodHandles.lookup()).findStatic(StaticClass.class,
+            "forClass", MethodType.methodType(StaticClass.class, Class.class));
+
+}
\ No newline at end of file
diff --git a/nashorn/src/jdk/internal/dynalink/beans/ClassString.java b/nashorn/src/jdk/internal/dynalink/beans/ClassString.java
new file mode 100644
index 00000000000..9fd3b1eba8f
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/beans/ClassString.java
@@ -0,0 +1,209 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.beans;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodType;
+import java.util.LinkedList;
+import java.util.List;
+import jdk.internal.dynalink.linker.LinkerServices;
+import jdk.internal.dynalink.support.Guards;
+import jdk.internal.dynalink.support.TypeUtilities;
+
+
+/**
+ *
+ * @author Attila Szegedi
+ */
+final class ClassString {
+    private final Class<?>[] classes;
+    private int hashCode;
+
+    ClassString(Class<?>[] classes) {
+        this.classes = classes;
+    }
+
+    ClassString(MethodType type) {
+        this(type.parameterArray());
+    }
+
+    Class<?>[] getClasses() {
+        return classes;
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if(!(other instanceof ClassString)) {
+            return false;
+        }
+        final Class<?>[] otherClasses = ((ClassString)other).classes;
+        if(otherClasses.length != classes.length) {
+            return false;
+        }
+        for(int i = 0; i < otherClasses.length; ++i) {
+            if(otherClasses[i] != classes[i]) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        if(hashCode == 0) {
+            int h = 0;
+            for(int i = 0; i < classes.length; ++i) {
+                h ^= classes[i].hashCode();
+            }
+            hashCode = h;
+        }
+        return hashCode;
+    }
+
+    boolean isVisibleFrom(final ClassLoader classLoader) {
+        for(int i = 0; i < classes.length; ++i) {
+            if(!Guards.canReferenceDirectly(classLoader, classes[i].getClassLoader())) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    List<MethodHandle> getMaximallySpecifics(List<MethodHandle> methods, LinkerServices linkerServices, boolean varArg) {
+        return MaximallySpecific.getMaximallySpecificMethods(getApplicables(methods, linkerServices, varArg), varArg,
+                classes, linkerServices);
+    }
+
+    /**
+     * Returns all methods that are applicable to actual parameter classes represented by this ClassString object.
+     */
+    LinkedList<MethodHandle> getApplicables(List<MethodHandle> methods, LinkerServices linkerServices, boolean varArg) {
+        final LinkedList<MethodHandle> list = new LinkedList<>();
+        for(final MethodHandle member: methods) {
+            if(isApplicable(member, linkerServices, varArg)) {
+                list.add(member);
+            }
+        }
+        return list;
+    }
+
+    /**
+     * Returns true if the supplied method is applicable to actual parameter classes represented by this ClassString
+     * object.
+     *
+     */
+    private boolean isApplicable(MethodHandle method, LinkerServices linkerServices, boolean varArg) {
+        final Class<?>[] formalTypes = method.type().parameterArray();
+        final int cl = classes.length;
+        final int fl = formalTypes.length - (varArg ? 1 : 0);
+        if(varArg) {
+            if(cl < fl) {
+                return false;
+            }
+        } else {
+            if(cl != fl) {
+                return false;
+            }
+        }
+        // Starting from 1 as we ignore the receiver type
+        for(int i = 1; i < fl; ++i) {
+            if(!canConvert(linkerServices, classes[i], formalTypes[i])) {
+                return false;
+            }
+        }
+        if(varArg) {
+            final Class<?> varArgType = formalTypes[fl].getComponentType();
+            for(int i = fl; i < cl; ++i) {
+                if(!canConvert(linkerServices, classes[i], varArgType)) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    private static boolean canConvert(LinkerServices ls, Class<?> from, Class<?> to) {
+        return ls == null ? TypeUtilities.isMethodInvocationConvertible(from, to) : ls.canConvert(from, to);
+    }
+}
\ No newline at end of file
diff --git a/nashorn/src/jdk/internal/dynalink/beans/DynamicMethod.java b/nashorn/src/jdk/internal/dynalink/beans/DynamicMethod.java
new file mode 100644
index 00000000000..a4edeeef800
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/beans/DynamicMethod.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.beans;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodType;
+import java.util.StringTokenizer;
+import jdk.internal.dynalink.linker.LinkerServices;
+
+
+/**
+ * Represents a single dynamic method. A "dynamic" method can be bound to a single Java method, or can be bound to all
+ * overloaded methods of the same name on a class. Getting an invocation of a dynamic method bound to multiple
+ * overloaded methods will perform overload resolution (actually, it will perform partial overloaded resolution at link
+ * time, but if that fails to identify exactly one target method, it will generate a method handle that will perform the
+ * rest of the overload resolution at invocation time for actual argument types).
+ *
+ * @author Attila Szegedi
+ */
+abstract class DynamicMethod {
+    private final String name;
+
+    DynamicMethod(String name) {
+        this.name = name;
+    }
+
+    String getName() {
+        return name;
+    }
+
+    /**
+     * Creates an invocation for the dynamic method. If the method is overloaded, it will perform overloaded method
+     * resolution based on the specified method type. The resulting resolution can either identify a single method to be
+     * invoked among the overloads, or it can identify multiple ones. In the latter case, the returned method handle
+     * will perform further overload resolution among these candidates at every invocation. If the method to be invoked
+     * is a variable arguments (vararg) method, it will pack the extra arguments in an array before the invocation of
+     * the underlying method if it is not already done.
+     *
+     * @param callSiteType the method type at a call site
+     * @param linkerServices linker services. Used for language-specific type conversions.
+     * @return an invocation suitable for calling the method from the specified call site.
+     */
+    abstract MethodHandle getInvocation(MethodType callSiteType, LinkerServices linkerServices);
+
+    /**
+     * Returns a simple dynamic method representing a single underlying Java method (possibly selected among several
+     * overloads) with formal parameter types exactly matching the passed signature.
+     * @param paramTypes the comma-separated list of requested parameter type names. The names will match both
+     * qualified and unqualified type names.
+     * @return a simple dynamic method representing a single underlying Java method, or null if none of the Java methods
+     * behind this dynamic method exactly match the requested parameter types.
+     */
+    abstract SimpleDynamicMethod getMethodForExactParamTypes(String paramTypes);
+
+    /**
+     * True if this dynamic method already contains a method handle with an identical signature as the passed in method
+     * handle.
+     * @param mh the method handle to check
+     * @return true if it already contains an equivalent method handle.
+     */
+    abstract boolean contains(MethodHandle mh);
+
+    static boolean typeMatchesDescription(String paramTypes, MethodType type) {
+        final StringTokenizer tok = new StringTokenizer(paramTypes, ", ");
+        for(int i = 1; i < type.parameterCount(); ++i) { // i = 1 as we ignore the receiver
+            if(!(tok.hasMoreTokens() && typeNameMatches(tok.nextToken(), type.parameterType(i)))) {
+                return false;
+            }
+        }
+        return !tok.hasMoreTokens();
+    }
+
+    private static boolean typeNameMatches(String typeName, Class<?> type) {
+        final int lastDot = typeName.lastIndexOf('.');
+        final String fullTypeName = type.getCanonicalName();
+        return lastDot != -1 && fullTypeName.endsWith(typeName.substring(lastDot)) || typeName.equals(fullTypeName);
+    }
+
+    static String getClassAndMethodName(Class<?> clazz, String name) {
+        final String clazzName = clazz.getCanonicalName();
+        return (clazzName == null ? clazz.getName() : clazzName) + "." + name;
+    }
+
+    @Override
+    public String toString() {
+        return "[" + getClass().getName() + " " + getName() + "]";
+    }
+}
\ No newline at end of file
diff --git a/nashorn/src/jdk/internal/dynalink/beans/DynamicMethodLinker.java b/nashorn/src/jdk/internal/dynalink/beans/DynamicMethodLinker.java
new file mode 100644
index 00000000000..d1994553c89
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/beans/DynamicMethodLinker.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.beans;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import jdk.internal.dynalink.CallSiteDescriptor;
+import jdk.internal.dynalink.linker.GuardedInvocation;
+import jdk.internal.dynalink.linker.LinkRequest;
+import jdk.internal.dynalink.linker.LinkerServices;
+import jdk.internal.dynalink.linker.TypeBasedGuardingDynamicLinker;
+import jdk.internal.dynalink.support.Guards;
+
+
+/**
+ * Simple linker that implements the "dyn:call" operation for {@link DynamicMethod} objects - the objects returned by
+ * "dyn:getMethod" from {@link AbstractJavaLinker}.
+ */
+class DynamicMethodLinker implements TypeBasedGuardingDynamicLinker {
+    @Override
+    public boolean canLinkType(Class<?> type) {
+        return DynamicMethod.class.isAssignableFrom(type);
+    };
+
+    @Override
+    public GuardedInvocation getGuardedInvocation(LinkRequest linkRequest, LinkerServices linkerServices) {
+        final Object receiver = linkRequest.getReceiver();
+        if(!(receiver instanceof DynamicMethod)) {
+            return null;
+        }
+        final CallSiteDescriptor desc = linkRequest.getCallSiteDescriptor();
+        if(desc.getNameTokenCount() != 2 && desc.getNameToken(CallSiteDescriptor.SCHEME) != "dyn")  {
+            return null;
+        }
+        final String operator = desc.getNameToken(CallSiteDescriptor.OPERATOR);
+        if(operator == "call") {
+            final MethodType type = desc.getMethodType();
+            final MethodHandle invocation = ((DynamicMethod)receiver).getInvocation(type.dropParameterTypes(0, 1),
+                    linkerServices);
+            if(invocation == null) {
+                return null;
+            }
+            return new GuardedInvocation(MethodHandles.dropArguments(invocation, 0, type.parameterType(0)),
+                    Guards.getIdentityGuard(receiver));
+        }
+        return null;
+    }
+}
diff --git a/nashorn/src/jdk/internal/dynalink/beans/FacetIntrospector.java b/nashorn/src/jdk/internal/dynalink/beans/FacetIntrospector.java
new file mode 100644
index 00000000000..2002c4da552
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/beans/FacetIntrospector.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.beans;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.reflect.Field;
+import java.lang.reflect.Member;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import jdk.internal.dynalink.support.Lookup;
+
+
+/**
+ * Base for classes that expose class field and method information to an {@link AbstractJavaLinker}. There are
+ * subclasses for instance (bean) and static facet of a class.
+ * @author Attila Szegedi
+ */
+abstract class FacetIntrospector implements AutoCloseable {
+    private final Class<?> clazz;
+    private final boolean instance;
+    private final boolean isRestricted;
+
+    protected final AccessibleMembersLookup membersLookup;
+
+    FacetIntrospector(Class<?> clazz, boolean instance) {
+        this.clazz = clazz;
+        this.instance = instance;
+        isRestricted = CheckRestrictedPackage.isRestrictedClass(clazz);
+        membersLookup = new AccessibleMembersLookup(clazz, instance);
+    }
+
+    /**
+     * Returns getters for inner classes.
+     * @return getters for inner classes.
+     */
+    abstract Map<String, MethodHandle> getInnerClassGetters();
+
+    /**
+     * Returns the fields for the class facet.
+     * @return the fields for the class facet.
+     */
+    Collection<Field> getFields() {
+        if(isRestricted) {
+            // NOTE: we can't do anything here. Unlike with methods in AccessibleMethodsLookup, we can't just return
+            // the fields from a public superclass, because this class might define same-named fields which will shadow
+            // the superclass fields, and we have no way to know if they do, since we're denied invocation of
+            // getFields(). Therefore, the only correct course of action is to not expose any public fields from a class
+            // defined in a restricted package.
+            return Collections.emptySet();
+        }
+
+        final Field[] fields = clazz.getFields();
+        final Collection<Field> cfields = new ArrayList<>(fields.length);
+        for(Field field: fields) {
+            if(instance != Modifier.isStatic(field.getModifiers()) && isAccessible(field)) {
+                cfields.add(field);
+            }
+        }
+        return cfields;
+    }
+
+    boolean isAccessible(Member m) {
+        final Class<?> declaring = m.getDeclaringClass();
+        // (declaring == clazz) is just an optimization - we're calling this only from code that operates on a
+        // non-restriced class, so if the declaring class is identical to the class being inspected, then forego
+        // a potentially expensive restricted-package check.
+        return declaring == clazz || !CheckRestrictedPackage.isRestrictedClass(declaring);
+    }
+
+    /**
+     * Returns all the methods in the facet.
+     * @return all the methods in the facet.
+     */
+    Collection<Method> getMethods() {
+        return membersLookup.getMethods();
+    }
+
+
+    MethodHandle unreflectGetter(Field field) {
+        return editMethodHandle(Lookup.PUBLIC.unreflectGetter(field));
+    }
+
+    MethodHandle unreflectSetter(Field field) {
+        return editMethodHandle(Lookup.PUBLIC.unreflectSetter(field));
+    }
+
+    MethodHandle unreflect(Method method) {
+        return editMethodHandle(Lookup.PUBLIC.unreflect(method));
+    }
+
+    /**
+     * Returns an edited method handle. A facet might need to edit an unreflected method handle before it is usable with
+     * the facet. By default, returns the passed method handle unchanged. The class' static facet will introduce a
+     * dropArguments.
+     * @param mh the method handle to edit.
+     * @return the edited method handle.
+     */
+    abstract MethodHandle editMethodHandle(MethodHandle mh);
+
+    @Override
+    public void close() {
+    }
+}
\ No newline at end of file
diff --git a/nashorn/src/jdk/internal/dynalink/beans/GuardedInvocationComponent.java b/nashorn/src/jdk/internal/dynalink/beans/GuardedInvocationComponent.java
new file mode 100644
index 00000000000..11d5929b45d
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/beans/GuardedInvocationComponent.java
@@ -0,0 +1,251 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.beans;
+
+import java.lang.invoke.MethodHandle;
+import jdk.internal.dynalink.linker.GuardedInvocation;
+
+
+/**
+ * Represents one component for a GuardedInvocation of a potentially composite operation of an
+ * {@link AbstractJavaLinker}. In addition to holding a guarded invocation, it holds semantic information about its
+ * guard. All guards produced in the AbstractJavaLinker are either "Class.isInstance()" or "getClass() == clazz"
+ * expressions. This allows choosing the most restrictive guard as the guard for the composition of two components.
+ * @author Attila Szegedi
+ * @version $Id: $
+ */
+class GuardedInvocationComponent {
+    enum ValidationType {
+        NONE, // No guard; the operation can be linked unconditionally (quite rare); least strict.
+        INSTANCE_OF, // "validatorClass.isInstance(obj)" guard
+        EXACT_CLASS, // "obj.getClass() == validatorClass" guard; most strict.
+        IS_ARRAY, // "obj.getClass().isArray()"
+    }
+
+    private final GuardedInvocation guardedInvocation;
+    private final Validator validator;
+
+    GuardedInvocationComponent(MethodHandle invocation) {
+        this(invocation, null, ValidationType.NONE);
+    }
+
+    GuardedInvocationComponent(MethodHandle invocation, MethodHandle guard, ValidationType validationType) {
+        this(invocation, guard, null, validationType);
+    }
+
+    GuardedInvocationComponent(MethodHandle invocation, MethodHandle guard, Class<?> validatorClass,
+            ValidationType validationType) {
+        this(invocation, guard, new Validator(validatorClass, validationType));
+    }
+
+    GuardedInvocationComponent(GuardedInvocation guardedInvocation, Class<?> validatorClass,
+            ValidationType validationType) {
+        this(guardedInvocation, new Validator(validatorClass, validationType));
+    }
+
+    GuardedInvocationComponent replaceInvocation(MethodHandle newInvocation) {
+        return replaceInvocation(newInvocation, guardedInvocation.getGuard());
+    }
+
+    GuardedInvocationComponent replaceInvocation(MethodHandle newInvocation, MethodHandle newGuard) {
+        return new GuardedInvocationComponent(guardedInvocation.replaceMethods(newInvocation,
+                newGuard), validator);
+    }
+
+    private GuardedInvocationComponent(MethodHandle invocation, MethodHandle guard, Validator validator) {
+        this(new GuardedInvocation(invocation, guard), validator);
+    }
+
+    private GuardedInvocationComponent(GuardedInvocation guardedInvocation, Validator validator) {
+        this.guardedInvocation = guardedInvocation;
+        this.validator = validator;
+    }
+
+    GuardedInvocation getGuardedInvocation() {
+        return guardedInvocation;
+    }
+
+    Class<?> getValidatorClass() {
+        return validator.validatorClass;
+    }
+
+    ValidationType getValidationType() {
+        return validator.validationType;
+    }
+
+    GuardedInvocationComponent compose(MethodHandle compositeInvocation, MethodHandle otherGuard,
+            Class<?> otherValidatorClass, ValidationType otherValidationType) {
+        final Validator compositeValidator = validator.compose(new Validator(otherValidatorClass, otherValidationType));
+        final MethodHandle compositeGuard = compositeValidator == validator ? guardedInvocation.getGuard() : otherGuard;
+        return new GuardedInvocationComponent(compositeInvocation, compositeGuard, compositeValidator);
+    }
+
+    private static class Validator {
+        /*private*/ final Class<?> validatorClass;
+        /*private*/ final ValidationType validationType;
+
+        Validator(Class<?> validatorClass, ValidationType validationType) {
+            this.validatorClass = validatorClass;
+            this.validationType = validationType;
+        }
+
+        Validator compose(Validator other) {
+            if(other.validationType == ValidationType.NONE) {
+                return this;
+            }
+            switch(validationType) {
+                case NONE:
+                    return other;
+                case INSTANCE_OF:
+                    switch(other.validationType) {
+                        case INSTANCE_OF:
+                            if(isAssignableFrom(other)) {
+                                return other;
+                            } else if(other.isAssignableFrom(this)) {
+                                return this;
+                            }
+                            break;
+                        case EXACT_CLASS:
+                            if(isAssignableFrom(other)) {
+                                return other;
+                            }
+                            break;
+                        case IS_ARRAY:
+                            if(validatorClass.isArray()) {
+                                return this;
+                            }
+                            break;
+                        case NONE:
+                            throw new AssertionError(); // Not possible
+                    }
+                    break;
+                case EXACT_CLASS:
+                    switch(other.validationType) {
+                        case INSTANCE_OF:
+                            if(other.isAssignableFrom(this)) {
+                                return this;
+                            }
+                            break;
+                        case EXACT_CLASS:
+                            if(validatorClass == other.validatorClass) {
+                                return this;
+                            }
+                            break;
+                        case IS_ARRAY:
+                            if(validatorClass.isArray()) {
+                                return this;
+                            }
+                            break;
+                        case NONE:
+                            throw new AssertionError(); // Not possible
+                    }
+                    break;
+                case IS_ARRAY:
+                    switch(other.validationType) {
+                        case INSTANCE_OF:
+                        case EXACT_CLASS:
+                            if(other.validatorClass.isArray()) {
+                                return other;
+                            }
+                            break;
+                        case IS_ARRAY:
+                            return this;
+                        case NONE:
+                            throw new AssertionError(); // Not possible
+                    }
+                    break;
+            }
+            throw new AssertionError("Incompatible composition " + this + " vs " + other);
+        }
+
+        private boolean isAssignableFrom(Validator other) {
+            return validatorClass.isAssignableFrom(other.validatorClass);
+        }
+
+        @Override
+        public String toString() {
+            return "Validator[" + validationType + (validatorClass == null ? "" : (" " + validatorClass.getName())) + "]";
+        }
+    }
+}
diff --git a/nashorn/src/jdk/internal/dynalink/beans/MaximallySpecific.java b/nashorn/src/jdk/internal/dynalink/beans/MaximallySpecific.java
new file mode 100644
index 00000000000..9366abdc0db
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/beans/MaximallySpecific.java
@@ -0,0 +1,211 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.beans;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodType;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import jdk.internal.dynalink.linker.ConversionComparator.Comparison;
+import jdk.internal.dynalink.linker.LinkerServices;
+import jdk.internal.dynalink.support.TypeUtilities;
+
+
+/**
+ * Utility class that encapsulates the algorithm for choosing the maximally specific methods.
+ *
+ * @author Attila Szegedi
+ */
+class MaximallySpecific {
+    /**
+     * Given a list of methods, returns a list of maximally specific methods.
+     *
+     * @param methods the list of methods
+     * @param varArgs whether to assume the methods are varargs
+     * @return the list of maximally specific methods.
+     */
+    static List<MethodHandle> getMaximallySpecificMethods(List<MethodHandle> methods, boolean varArgs) {
+        return getMaximallySpecificMethods(methods, varArgs, null, null);
+    }
+
+    /**
+     * Given a list of methods, returns a list of maximally specific methods, applying language-runtime specific
+     * conversion preferences.
+     *
+     * @param methods the list of methods
+     * @param varArgs whether to assume the methods are varargs
+     * @param argTypes concrete argument types for the invocation
+     * @return the list of maximally specific methods.
+     */
+    static List<MethodHandle> getMaximallySpecificMethods(List<MethodHandle> methods, boolean varArgs,
+            Class<?>[] argTypes, LinkerServices ls) {
+        if(methods.size() < 2) {
+            return methods;
+        }
+        final LinkedList<MethodHandle> maximals = new LinkedList<>();
+        for(MethodHandle m: methods) {
+            final MethodType methodType = m.type();
+            boolean lessSpecific = false;
+            for(Iterator<MethodHandle> maximal = maximals.iterator(); maximal.hasNext();) {
+                final MethodHandle max = maximal.next();
+                switch(isMoreSpecific(methodType, max.type(), varArgs, argTypes, ls)) {
+                    case TYPE_1_BETTER: {
+                        maximal.remove();
+                        break;
+                    }
+                    case TYPE_2_BETTER: {
+                        lessSpecific = true;
+                        break;
+                    }
+                    case INDETERMINATE: {
+                        // do nothing
+                    }
+                }
+            }
+            if(!lessSpecific) {
+                maximals.addLast(m);
+            }
+        }
+        return maximals;
+    }
+
+    private static Comparison isMoreSpecific(MethodType t1, MethodType t2, boolean varArgs, Class<?>[] argTypes,
+            LinkerServices ls) {
+        final int pc1 = t1.parameterCount();
+        final int pc2 = t2.parameterCount();
+        assert varArgs || (pc1 == pc2) && (argTypes == null || argTypes.length == pc1);
+        assert (argTypes == null) == (ls == null);
+        final int maxPc = Math.max(Math.max(pc1, pc2), argTypes == null ? 0 : argTypes.length);
+        boolean t1MoreSpecific = false;
+        boolean t2MoreSpecific = false;
+        // NOTE: Starting from 1 as overloaded method resolution doesn't depend on 0th element, which is the type of
+        // 'this'. We're only dealing with instance methods here, not static methods. Actually, static methods will have
+        // a fake 'this' of type StaticClass.
+        for(int i = 1; i < maxPc; ++i) {
+            final Class<?> c1 = getParameterClass(t1, pc1, i, varArgs);
+            final Class<?> c2 = getParameterClass(t2, pc2, i, varArgs);
+            if(c1 != c2) {
+                final Comparison cmp = compare(c1, c2, argTypes, i, ls);
+                if(cmp == Comparison.TYPE_1_BETTER && !t1MoreSpecific) {
+                    t1MoreSpecific = true;
+                    if(t2MoreSpecific) {
+                        return Comparison.INDETERMINATE;
+                    }
+                }
+                if(cmp == Comparison.TYPE_2_BETTER && !t2MoreSpecific) {
+                    t2MoreSpecific = true;
+                    if(t1MoreSpecific) {
+                        return Comparison.INDETERMINATE;
+                    }
+                }
+            }
+        }
+        if(t1MoreSpecific) {
+            return Comparison.TYPE_1_BETTER;
+        } else if(t2MoreSpecific) {
+            return Comparison.TYPE_2_BETTER;
+        }
+        return Comparison.INDETERMINATE;
+    }
+
+    private static Comparison compare(Class<?> c1, Class<?> c2, Class<?>[] argTypes, int i, LinkerServices cmp) {
+        if(cmp != null) {
+            final Comparison c = cmp.compareConversion(argTypes[i], c1, c2);
+            if(c != Comparison.INDETERMINATE) {
+                return c;
+            }
+        }
+        if(TypeUtilities.isSubtype(c1, c2)) {
+            return Comparison.TYPE_1_BETTER;
+        } if(TypeUtilities.isSubtype(c2, c1)) {
+            return Comparison.TYPE_2_BETTER;
+        }
+        return Comparison.INDETERMINATE;
+    }
+
+    private static Class<?> getParameterClass(MethodType t, int l, int i, boolean varArgs) {
+        return varArgs && i >= l - 1 ? t.parameterType(l - 1).getComponentType() : t.parameterType(i);
+    }
+}
diff --git a/nashorn/src/jdk/internal/dynalink/beans/OverloadedDynamicMethod.java b/nashorn/src/jdk/internal/dynalink/beans/OverloadedDynamicMethod.java
new file mode 100644
index 00000000000..a3bb21ddbf1
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/beans/OverloadedDynamicMethod.java
@@ -0,0 +1,313 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.beans;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodType;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import jdk.internal.dynalink.beans.ApplicableOverloadedMethods.ApplicabilityTest;
+import jdk.internal.dynalink.linker.LinkerServices;
+import jdk.internal.dynalink.support.TypeUtilities;
+
+
+/**
+ * Represents an overloaded method.
+ *
+ * @author Attila Szegedi
+ */
+class OverloadedDynamicMethod extends DynamicMethod {
+    /**
+     * Holds a list of all methods.
+     */
+    private final LinkedList<MethodHandle> methods;
+    private final ClassLoader classLoader;
+
+    /**
+     * Creates a new overloaded dynamic method.
+     *
+     * @param clazz the class this method belongs to
+     * @param name the name of the method
+     */
+    OverloadedDynamicMethod(Class<?> clazz, String name) {
+        this(new LinkedList<MethodHandle>(), clazz.getClassLoader(), getClassAndMethodName(clazz, name));
+    }
+
+    private OverloadedDynamicMethod(LinkedList<MethodHandle> methods, ClassLoader classLoader, String name) {
+        super(name);
+        this.methods = methods;
+        this.classLoader = classLoader;
+    }
+
+    @Override
+    SimpleDynamicMethod getMethodForExactParamTypes(String paramTypes) {
+        final LinkedList<MethodHandle> matchingMethods = new LinkedList<>();
+        for(MethodHandle method: methods) {
+            if(typeMatchesDescription(paramTypes, method.type())) {
+                matchingMethods.add(method);
+            }
+        }
+        switch(matchingMethods.size()) {
+            case 0: {
+                return null;
+            }
+            case 1: {
+                final MethodHandle target = matchingMethods.get(0);
+                return new SimpleDynamicMethod(target, SimpleDynamicMethod.getMethodNameWithSignature(target, getName()));
+            }
+            default: {
+                throw new BootstrapMethodError("Can't choose among " + matchingMethods + " for argument types "
+                        + paramTypes + " for method " + getName());
+            }
+        }
+    }
+
+    @Override
+    public MethodHandle getInvocation(final MethodType callSiteType, final LinkerServices linkerServices) {
+        // First, find all methods applicable to the call site by subtyping (JLS 15.12.2.2)
+        final ApplicableOverloadedMethods subtypingApplicables = getApplicables(callSiteType,
+                ApplicableOverloadedMethods.APPLICABLE_BY_SUBTYPING);
+        // Next, find all methods applicable by method invocation conversion to the call site (JLS 15.12.2.3).
+        final ApplicableOverloadedMethods methodInvocationApplicables = getApplicables(callSiteType,
+                ApplicableOverloadedMethods.APPLICABLE_BY_METHOD_INVOCATION_CONVERSION);
+        // Finally, find all methods applicable by variable arity invocation. (JLS 15.12.2.4).
+        final ApplicableOverloadedMethods variableArityApplicables = getApplicables(callSiteType,
+                ApplicableOverloadedMethods.APPLICABLE_BY_VARIABLE_ARITY);
+
+        // Find the methods that are maximally specific based on the call site signature
+        List<MethodHandle> maximallySpecifics = subtypingApplicables.findMaximallySpecificMethods();
+        if(maximallySpecifics.isEmpty()) {
+            maximallySpecifics = methodInvocationApplicables.findMaximallySpecificMethods();
+            if(maximallySpecifics.isEmpty()) {
+                maximallySpecifics = variableArityApplicables.findMaximallySpecificMethods();
+            }
+        }
+
+        // Now, get a list of the rest of the methods; those that are *not* applicable to the call site signature based
+        // on JLS rules. As paradoxical as that might sound, we have to consider these for dynamic invocation, as they
+        // might match more concrete types passed in invocations. That's why we provisionally call them "invokables".
+        // This is typical for very generic signatures at call sites. Typical example: call site specifies
+        // (Object, Object), and we have a method whose parameter types are (String, int). None of the JLS applicability
+        // rules will trigger, but we must consider the method, as it can be the right match for a concrete invocation.
+        @SuppressWarnings({ "unchecked", "rawtypes" })
+        final List<MethodHandle> invokables = (List)methods.clone();
+        invokables.removeAll(subtypingApplicables.getMethods());
+        invokables.removeAll(methodInvocationApplicables.getMethods());
+        invokables.removeAll(variableArityApplicables.getMethods());
+        for(final Iterator<MethodHandle> it = invokables.iterator(); it.hasNext();) {
+            final MethodHandle m = it.next();
+            if(!isApplicableDynamically(linkerServices, callSiteType, m)) {
+                it.remove();
+            }
+        }
+
+        // If no additional methods can apply at invocation time, and there's more than one maximally specific method
+        // based on call site signature, that is a link-time ambiguity. In a static scenario, javac would report an
+        // ambiguity error.
+        if(invokables.isEmpty() && maximallySpecifics.size() > 1) {
+            throw new BootstrapMethodError("Can't choose among " + maximallySpecifics + " for argument types "
+                    + callSiteType);
+        }
+
+        // Merge them all.
+        invokables.addAll(maximallySpecifics);
+        switch(invokables.size()) {
+            case 0: {
+                // No overloads can ever match the call site type
+                return null;
+            }
+            case 1: {
+                // Very lucky, we ended up with a single candidate method handle based on the call site signature; we
+                // can link it very simply by delegating to a SimpleDynamicMethod.
+                final MethodHandle mh = invokables.iterator().next();
+                return new SimpleDynamicMethod(mh).getInvocation(callSiteType, linkerServices);
+            }
+        }
+
+        // We have more than one candidate. We have no choice but to link to a method that resolves overloads on every
+        // invocation (alternatively, we could opportunistically link the one method that resolves for the current
+        // arguments, but we'd need to install a fairly complex guard for that and when it'd fail, we'd go back all the
+        // way to candidate selection.
+        // TODO: cache per call site type
+        return new OverloadedMethod(invokables, this, callSiteType, linkerServices).getInvoker();
+    }
+
+    @Override
+    public boolean contains(MethodHandle mh) {
+        final MethodType type = mh.type();
+        for(MethodHandle method: methods) {
+            if(typesEqualNoReceiver(type, method.type())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private static boolean typesEqualNoReceiver(MethodType type1, MethodType type2) {
+        final int pc = type1.parameterCount();
+        if(pc != type2.parameterCount()) {
+            return false;
+        }
+        for(int i = 1; i < pc; ++i) { // i = 1: ignore receiver
+            if(type1.parameterType(i) != type2.parameterType(i)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    ClassLoader getClassLoader() {
+        return classLoader;
+    }
+
+    private static boolean isApplicableDynamically(LinkerServices linkerServices, MethodType callSiteType,
+            MethodHandle m) {
+        final MethodType methodType = m.type();
+        final boolean varArgs = m.isVarargsCollector();
+        final int fixedArgLen = methodType.parameterCount() - (varArgs ? 1 : 0);
+        final int callSiteArgLen = callSiteType.parameterCount();
+        if(varArgs) {
+            if(callSiteArgLen < fixedArgLen) {
+                return false;
+            }
+        } else if(callSiteArgLen != fixedArgLen) {
+            return false;
+        }
+        // Starting from 1, as receiver type doesn't participate
+        for(int i = 1; i < fixedArgLen; ++i) {
+            if(!isApplicableDynamically(linkerServices, callSiteType.parameterType(i), methodType.parameterType(i))) {
+                return false;
+            }
+        }
+        if(varArgs) {
+            final Class<?> varArgArrayType = methodType.parameterType(fixedArgLen);
+            final Class<?> varArgType = varArgArrayType.getComponentType();
+            if(fixedArgLen == callSiteArgLen - 1) {
+                final Class<?> callSiteArgType = callSiteType.parameterType(fixedArgLen);
+                // Exactly one vararg; check both exact matching and component
+                // matching.
+                return isApplicableDynamically(linkerServices, callSiteArgType, varArgArrayType)
+                        || isApplicableDynamically(linkerServices, callSiteArgType, varArgType);
+            } else {
+                for(int i = fixedArgLen; i < callSiteArgLen; ++i) {
+                    if(!isApplicableDynamically(linkerServices, callSiteType.parameterType(i), varArgType)) {
+                        return false;
+                    }
+                }
+                return true;
+            }
+        } else {
+            return true;
+        }
+    }
+
+    private static boolean isApplicableDynamically(LinkerServices linkerServices, Class<?> callSiteType,
+            Class<?> methodType) {
+        return TypeUtilities.isPotentiallyConvertible(callSiteType, methodType)
+                || linkerServices.canConvert(callSiteType, methodType);
+    }
+
+    private ApplicableOverloadedMethods getApplicables(MethodType callSiteType, ApplicabilityTest test) {
+        return new ApplicableOverloadedMethods(methods, callSiteType, test);
+    }
+
+    /**
+     * Add a method identified by a {@link SimpleDynamicMethod} to this overloaded method's set.
+     *
+     * @param method the method to add.
+     */
+    public void addMethod(SimpleDynamicMethod method) {
+        addMethod(method.getTarget());
+    }
+
+    /**
+     * Add a method to this overloaded method's set.
+     *
+     * @param method a method to add
+     */
+    public void addMethod(MethodHandle method) {
+        methods.add(method);
+    }
+}
\ No newline at end of file
diff --git a/nashorn/src/jdk/internal/dynalink/beans/OverloadedMethod.java b/nashorn/src/jdk/internal/dynalink/beans/OverloadedMethod.java
new file mode 100644
index 00000000000..da8e4c3dec6
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/beans/OverloadedMethod.java
@@ -0,0 +1,266 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.beans;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import jdk.internal.dynalink.linker.LinkerServices;
+import jdk.internal.dynalink.support.Lookup;
+
+
+/**
+ * Represents a subset of overloaded methods for a certain method name on a certain class. It can be either a fixarg or
+ * a vararg subset depending on the subclass. The method is for a fixed number of arguments though (as it is generated
+ * for a concrete call site). As such, all methods in the subset can be invoked with the specified number of arguments
+ * (exactly matching for fixargs, or having less than or equal fixed arguments, for varargs).
+ *
+ * @author Attila Szegedi
+ */
+class OverloadedMethod {
+    private final Map<ClassString, MethodHandle> argTypesToMethods = new ConcurrentHashMap<>();
+    private final OverloadedDynamicMethod parent;
+    private final MethodType callSiteType;
+    private final MethodHandle invoker;
+    private final LinkerServices linkerServices;
+    private final ArrayList<MethodHandle> fixArgMethods;
+    private final ArrayList<MethodHandle> varArgMethods;
+
+    OverloadedMethod(List<MethodHandle> methodHandles, OverloadedDynamicMethod parent, MethodType callSiteType,
+            LinkerServices linkerServices) {
+        this.parent = parent;
+        this.callSiteType = callSiteType;
+        this.linkerServices = linkerServices;
+
+        fixArgMethods = new ArrayList<>(methodHandles.size());
+        varArgMethods = new ArrayList<>(methodHandles.size());
+        final int argNum = callSiteType.parameterCount();
+        for(MethodHandle mh: methodHandles) {
+            if(mh.isVarargsCollector()) {
+                final MethodHandle asFixed = mh.asFixedArity();
+                if(argNum == asFixed.type().parameterCount()) {
+                    fixArgMethods.add(asFixed);
+                }
+                varArgMethods.add(mh);
+            } else {
+                fixArgMethods.add(mh);
+            }
+        }
+        fixArgMethods.trimToSize();
+        varArgMethods.trimToSize();
+
+        final MethodHandle bound = SELECT_METHOD.bindTo(this);
+        final MethodHandle collecting = SimpleDynamicMethod.collectArguments(bound, argNum).asType(
+                callSiteType.changeReturnType(MethodHandle.class));
+        invoker = MethodHandles.foldArguments(MethodHandles.exactInvoker(callSiteType), collecting);
+    }
+
+    MethodHandle getInvoker() {
+        return invoker;
+    }
+
+    private static final MethodHandle SELECT_METHOD = Lookup.findOwnSpecial(MethodHandles.lookup(), "selectMethod",
+            MethodHandle.class, Object[].class);
+
+    @SuppressWarnings("unused")
+    private MethodHandle selectMethod(Object[] args) throws NoSuchMethodException {
+        final Class<?>[] argTypes = new Class[args.length];
+        for(int i = 0; i < argTypes.length; ++i) {
+            final Object arg = args[i];
+            argTypes[i] = arg == null ? callSiteType.parameterType(i) : arg.getClass();
+        }
+        final ClassString classString = new ClassString(argTypes);
+        MethodHandle method = argTypesToMethods.get(classString);
+        if(method == null) {
+            List<MethodHandle> methods = classString.getMaximallySpecifics(fixArgMethods, linkerServices, false);
+            if(methods.isEmpty()) {
+                methods = classString.getMaximallySpecifics(varArgMethods, linkerServices, true);
+            }
+            switch(methods.size()) {
+                case 0: {
+                    method = getNoSuchMethodThrower(argTypes);
+                    break;
+                }
+                case 1: {
+                    method = new SimpleDynamicMethod(methods.get(0)).getInvocation(callSiteType, linkerServices);
+                    break;
+                }
+                default: {
+                    // This is unfortunate - invocation time ambiguity. We can still save the day if
+                    method = getAmbiguousMethodThrower(argTypes, methods);
+                    break;
+                }
+            }
+            // Avoid keeping references to unrelated classes; this ruins the performance a bit, but avoids class loader
+            // memory leaks.
+            if(classString.isVisibleFrom(parent.getClassLoader())) {
+                argTypesToMethods.put(classString, method);
+            }
+        }
+        return method;
+    }
+
+    private MethodHandle getNoSuchMethodThrower(Class<?>[] argTypes) {
+        return adaptThrower(MethodHandles.insertArguments(THROW_NO_SUCH_METHOD, 0, this, argTypes));
+    }
+
+    private static final MethodHandle THROW_NO_SUCH_METHOD = Lookup.findOwnSpecial(MethodHandles.lookup(),
+            "throwNoSuchMethod", void.class, Class[].class);
+
+    @SuppressWarnings("unused")
+    private void throwNoSuchMethod(Class<?>[] argTypes) throws NoSuchMethodException {
+        if(varArgMethods.isEmpty()) {
+            throw new NoSuchMethodException("None of the fixed arity signatures " + getSignatureList(fixArgMethods) +
+                    " of method " + parent.getName() + " match the argument types " + argTypesString(argTypes));
+        }
+        throw new NoSuchMethodException("None of the fixed arity signatures " + getSignatureList(fixArgMethods) +
+                " or the variable arity signatures " + getSignatureList(varArgMethods) + " of the method " +
+                parent.getName() + " match the argument types " + argTypesString(argTypes));
+    }
+
+    private MethodHandle getAmbiguousMethodThrower(Class<?>[] argTypes, List<MethodHandle> methods) {
+        return adaptThrower(MethodHandles.insertArguments(THROW_AMBIGUOUS_METHOD, 0, this, argTypes, methods));
+    }
+
+    private MethodHandle adaptThrower(MethodHandle rawThrower) {
+        return MethodHandles.dropArguments(rawThrower, 0, callSiteType.parameterList()).asType(callSiteType);
+    }
+
+    private static final MethodHandle THROW_AMBIGUOUS_METHOD = Lookup.findOwnSpecial(MethodHandles.lookup(),
+            "throwAmbiguousMethod", void.class, Class[].class, List.class);
+
+    @SuppressWarnings("unused")
+    private void throwAmbiguousMethod(Class<?>[] argTypes, List<MethodHandle> methods) throws NoSuchMethodException {
+        final String arity = methods.get(0).isVarargsCollector() ? "variable" : "fixed";
+        throw new NoSuchMethodException("Can't unambiguously select between " + arity + " arity signatures " +
+                getSignatureList(methods) + " of the method " + parent.getName() + " for argument types " +
+                argTypesString(argTypes));
+    }
+
+    private static String argTypesString(Class<?>[] classes) {
+        final StringBuilder b = new StringBuilder().append('[');
+        appendTypes(b, classes, false);
+        return b.append(']').toString();
+    }
+
+    private static String getSignatureList(List<MethodHandle> methods) {
+        final StringBuilder b = new StringBuilder().append('[');
+        final Iterator<MethodHandle> it = methods.iterator();
+        if(it.hasNext()) {
+            appendSig(b, it.next());
+            while(it.hasNext()) {
+                appendSig(b.append(", "), it.next());
+            }
+        }
+        return b.append(']').toString();
+    }
+
+    private static void appendSig(StringBuilder b, MethodHandle m) {
+        b.append('(');
+        appendTypes(b, m.type().parameterArray(), m.isVarargsCollector());
+        b.append(')');
+    }
+
+    private static void appendTypes(StringBuilder b, Class<?>[] classes, boolean varArg) {
+        final int l = classes.length;
+        if(!varArg) {
+            if(l > 1) {
+                b.append(classes[1].getCanonicalName());
+                for(int i = 2; i < l; ++i) {
+                    b.append(", ").append(classes[i].getCanonicalName());
+                }
+            }
+        } else {
+            for(int i = 1; i < l - 1; ++i) {
+                b.append(classes[i].getCanonicalName()).append(", ");
+            }
+            b.append(classes[l - 1].getComponentType().getCanonicalName()).append("...");
+        }
+    }
+}
\ No newline at end of file
diff --git a/nashorn/src/jdk/internal/dynalink/beans/RestrictedPackageTester.java b/nashorn/src/jdk/internal/dynalink/beans/RestrictedPackageTester.java
new file mode 100644
index 00000000000..622ddb75365
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/beans/RestrictedPackageTester.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.beans;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+/**
+ * This class is never referenced directly from code of any other class, but is loaded into a secure class loader that
+ * gives it no permissions whatsoever, so it can be used to reliably test whether a given package has restricted access
+ * or not. See {@link CheckRestrictedPackageInternal} for details.
+ * @author Attila Szegedi
+ * @version $Id: $
+ */
+class RestrictedPackageTester implements PrivilegedAction<Void> {
+
+    private final String pkgName;
+
+    private RestrictedPackageTester(String pkgName) {
+        this.pkgName = pkgName;
+    }
+
+    static void checkPackageAccess(String pkgName) {
+        AccessController.doPrivileged(new RestrictedPackageTester(pkgName));
+    }
+
+    @Override
+    public Void run() {
+        System.getSecurityManager().checkPackageAccess(pkgName);
+        return null;
+    }
+}
diff --git a/nashorn/src/jdk/internal/dynalink/beans/SimpleDynamicMethod.java b/nashorn/src/jdk/internal/dynalink/beans/SimpleDynamicMethod.java
new file mode 100644
index 00000000000..649c0e1edf0
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/beans/SimpleDynamicMethod.java
@@ -0,0 +1,241 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.beans;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.lang.reflect.Array;
+import jdk.internal.dynalink.linker.LinkerServices;
+import jdk.internal.dynalink.support.Guards;
+
+
+/**
+ * A dynamic method bound to exactly one, non-overloaded Java method. Handles varargs.
+ *
+ * @author Attila Szegedi
+ */
+class SimpleDynamicMethod extends DynamicMethod {
+    private final MethodHandle target;
+
+    /**
+     * Creates a simple dynamic method with no name.
+     * @param target the target method handle
+     */
+    SimpleDynamicMethod(MethodHandle target) {
+        this(target, null);
+    }
+
+    /**
+     * Creates a new simple dynamic method, with a name constructed from the class name, method name, and handle
+     * signature.
+     *
+     * @param target the target method handle
+     * @param clazz the class declaring the method
+     * @param name the simple name of the method
+     */
+    SimpleDynamicMethod(MethodHandle target, Class<?> clazz, String name) {
+        this(target, getName(target, clazz, name));
+    }
+
+    SimpleDynamicMethod(MethodHandle target, String name) {
+        super(name);
+        this.target = target;
+    }
+
+    private static String getName(MethodHandle target, Class<?> clazz, String name) {
+        return getMethodNameWithSignature(target, getClassAndMethodName(clazz, name));
+    }
+
+    static String getMethodNameWithSignature(MethodHandle target, String methodName) {
+        final String typeStr = target.type().toString();
+        final int retTypeIndex = typeStr.lastIndexOf(')') + 1;
+        int secondParamIndex = typeStr.indexOf(',') + 1;
+        if(secondParamIndex == 0) {
+            secondParamIndex = retTypeIndex - 1;
+        }
+        return typeStr.substring(retTypeIndex) + " " + methodName + "(" + typeStr.substring(secondParamIndex, retTypeIndex);
+    }
+
+    /**
+     * Returns the target of this dynamic method
+     *
+     * @return the target of this dynamic method
+     */
+    MethodHandle getTarget() {
+        return target;
+    }
+
+    @Override
+    SimpleDynamicMethod getMethodForExactParamTypes(String paramTypes) {
+        return typeMatchesDescription(paramTypes, target.type()) ? this : null;
+    }
+
+    @Override
+    MethodHandle getInvocation(MethodType callSiteType, LinkerServices linkerServices) {
+        final MethodType methodType = target.type();
+        final int paramsLen = methodType.parameterCount();
+        final boolean varArgs = target.isVarargsCollector();
+        final MethodHandle fixTarget = varArgs ? target.asFixedArity() : target;
+        final int fixParamsLen = varArgs ? paramsLen - 1 : paramsLen;
+        final int argsLen = callSiteType.parameterCount();
+        if(argsLen < fixParamsLen) {
+            // Less actual arguments than number of fixed declared arguments; can't invoke.
+            return null;
+        }
+        // Method handle of the same number of arguments as the call site type
+        if(argsLen == fixParamsLen) {
+            // Method handle that matches the number of actual arguments as the number of fixed arguments
+            final MethodHandle matchedMethod;
+            if(varArgs) {
+                // If vararg, add a zero-length array of the expected type as the last argument to signify no variable
+                // arguments.
+                // TODO: check whether collectArguments() would handle this too.
+                matchedMethod = MethodHandles.insertArguments(fixTarget, fixParamsLen, Array.newInstance(
+                        methodType.parameterType(fixParamsLen).getComponentType(), 0));
+            } else {
+                // Otherwise, just use the method
+                matchedMethod = fixTarget;
+            }
+            return createConvertingInvocation(matchedMethod, linkerServices, callSiteType);
+        }
+
+        // What's below only works for varargs
+        if(!varArgs) {
+            return null;
+        }
+
+        final Class<?> varArgType = methodType.parameterType(fixParamsLen);
+        // Handle a somewhat sinister corner case: caller passes exactly one argument in the vararg position, and we
+        // must handle both a prepacked vararg array as well as a genuine 1-long vararg sequence.
+        if(argsLen == paramsLen) {
+            final Class<?> callSiteLastArgType = callSiteType.parameterType(fixParamsLen);
+            if(varArgType.isAssignableFrom(callSiteLastArgType)) {
+                // Call site signature guarantees we'll always be passed a single compatible array; just link directly
+                // to the method.
+                return createConvertingInvocation(fixTarget, linkerServices, callSiteType);
+            } else if(!linkerServices.canConvert(callSiteLastArgType, varArgType)) {
+                // Call site signature guarantees the argument can definitely not be an array (i.e. it is primitive);
+                // link immediately to a vararg-packing method handle.
+                return createConvertingInvocation(collectArguments(fixTarget, argsLen), linkerServices, callSiteType);
+            } else {
+                // Call site signature makes no guarantees that the single argument in the vararg position will be
+                // compatible across all invocations. Need to insert an appropriate guard and fall back to generic
+                // vararg method when it is not.
+                return MethodHandles.guardWithTest(Guards.isInstance(varArgType, fixParamsLen, callSiteType),
+                        createConvertingInvocation(fixTarget, linkerServices, callSiteType),
+                        createConvertingInvocation(collectArguments(fixTarget, argsLen), linkerServices, callSiteType));
+            }
+        } else {
+            // Remaining case: more than one vararg.
+            return createConvertingInvocation(collectArguments(fixTarget, argsLen), linkerServices, callSiteType);
+        }
+    }
+
+    @Override
+    public boolean contains(MethodHandle mh) {
+        return target.type().parameterList().equals(mh.type().parameterList());
+    }
+
+    /**
+     * Creates a method handle out of the original target that will collect the varargs for the exact component type of
+     * the varArg array. Note that this will nicely trigger language-specific type converters for exactly those varargs
+     * for which it is necessary when later passed to linkerServices.convertArguments().
+     *
+     * @param target the original method handle
+     * @param parameterCount the total number of arguments in the new method handle
+     * @return a collecting method handle
+     */
+    static MethodHandle collectArguments(MethodHandle target, final int parameterCount) {
+        final MethodType methodType = target.type();
+        final int fixParamsLen = methodType.parameterCount() - 1;
+        final Class<?> arrayType = methodType.parameterType(fixParamsLen);
+        return target.asCollector(arrayType, parameterCount - fixParamsLen);
+    }
+
+    private static MethodHandle createConvertingInvocation(final MethodHandle sizedMethod,
+            final LinkerServices linkerServices, final MethodType callSiteType) {
+        return linkerServices.asType(sizedMethod, callSiteType);
+    }
+}
\ No newline at end of file
diff --git a/nashorn/src/jdk/internal/dynalink/beans/StaticClass.java b/nashorn/src/jdk/internal/dynalink/beans/StaticClass.java
new file mode 100644
index 00000000000..48f30255f65
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/beans/StaticClass.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.beans;
+
+import java.io.Serializable;
+
+/**
+ * Object that represents the static facet of a class (its static methods, properties, and fields, as well as
+ * construction of instances using "dyn:new"). Objects of this class are recognized by the {@link BeansLinker} as being
+ * special, and operations on them will be linked against the represented class' static facet. The "class" synthetic
+ * property is additionally recognized and returns the Java {@link Class} object, as per {@link #getRepresentedClass()}
+ * method. Conversely, {@link Class} objects exposed through {@link BeansLinker} expose the "static" synthetic property
+ * which returns an instance of this class.
+ */
+public class StaticClass implements Serializable {
+    private static final ClassValue<StaticClass> staticClasses = new ClassValue<StaticClass>() {
+        @Override
+        protected StaticClass computeValue(Class<?> type) {
+            return new StaticClass(type);
+        }
+    };
+
+    private static final long serialVersionUID = 1L;
+
+    private final Class<?> clazz;
+
+    /*private*/ StaticClass(Class<?> clazz) {
+        clazz.getClass(); // NPE check
+        this.clazz = clazz;
+    }
+
+    /**
+     * Retrieves the {@link StaticClass} instance for the specified class.
+     * @param clazz the class for which the static facet is requested.
+     * @return the {@link StaticClass} instance representing the specified class.
+     */
+    public static StaticClass forClass(Class<?> clazz) {
+        return staticClasses.get(clazz);
+    }
+
+    /**
+     * Returns the represented Java class.
+     * @return the represented Java class.
+     */
+    public Class<?> getRepresentedClass() {
+        return clazz;
+    }
+
+    @Override
+    public String toString() {
+        return "JavaClassStatics[" + clazz.getName() + "]";
+    }
+
+    private Object readResolve() {
+        return forClass(clazz);
+    }
+}
\ No newline at end of file
diff --git a/nashorn/src/jdk/internal/dynalink/beans/StaticClassIntrospector.java b/nashorn/src/jdk/internal/dynalink/beans/StaticClassIntrospector.java
new file mode 100644
index 00000000000..d4cedb7f284
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/beans/StaticClassIntrospector.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.beans;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.util.HashMap;
+import java.util.Map;
+
+class StaticClassIntrospector extends FacetIntrospector {
+    StaticClassIntrospector(Class<?> clazz) {
+        super(clazz, false);
+    }
+
+    @Override
+    Map<String, MethodHandle> getInnerClassGetters() {
+        final Map<String, MethodHandle> map = new HashMap<>();
+        for(Class<?> innerClass: membersLookup.getInnerClasses()) {
+            map.put(innerClass.getSimpleName(), editMethodHandle(MethodHandles.constant(StaticClass.class,
+                    StaticClass.forClass(innerClass))));
+        }
+        return map;
+    }
+
+    @Override
+    MethodHandle editMethodHandle(MethodHandle mh) {
+        MethodHandle newHandle = MethodHandles.dropArguments(mh, 0, Object.class);
+        // NOTE: this is a workaround for the fact that dropArguments doesn't preserve vararg collector state.
+        if(mh.isVarargsCollector() && !newHandle.isVarargsCollector()) {
+            final MethodType type = mh.type();
+            newHandle = newHandle.asVarargsCollector(type.parameterType(type.parameterCount() - 1));
+        }
+        return newHandle;
+    }
+}
diff --git a/nashorn/src/jdk/internal/dynalink/beans/StaticClassLinker.java b/nashorn/src/jdk/internal/dynalink/beans/StaticClassLinker.java
new file mode 100644
index 00000000000..2c500ea8403
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/beans/StaticClassLinker.java
@@ -0,0 +1,204 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.beans;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.lang.reflect.Array;
+import java.lang.reflect.Constructor;
+import java.util.ArrayList;
+import java.util.List;
+import jdk.internal.dynalink.CallSiteDescriptor;
+import jdk.internal.dynalink.beans.GuardedInvocationComponent.ValidationType;
+import jdk.internal.dynalink.linker.GuardedInvocation;
+import jdk.internal.dynalink.linker.GuardingDynamicLinker;
+import jdk.internal.dynalink.linker.LinkRequest;
+import jdk.internal.dynalink.linker.LinkerServices;
+import jdk.internal.dynalink.linker.TypeBasedGuardingDynamicLinker;
+import jdk.internal.dynalink.support.Lookup;
+
+
+/**
+ * Provides a linker for the {@link StaticClass} objects.
+ * @author Attila Szegedi
+ */
+class StaticClassLinker implements TypeBasedGuardingDynamicLinker {
+    private final ClassValue<GuardingDynamicLinker> linkers = new ClassValue<GuardingDynamicLinker>() {
+        @Override
+        protected GuardingDynamicLinker computeValue(Class<?> clazz) {
+            return new SingleClassStaticsLinker(clazz);
+        }
+    };
+
+    private static class SingleClassStaticsLinker extends AbstractJavaLinker {
+        private final DynamicMethod constructor;
+
+        SingleClassStaticsLinker(Class<?> clazz) {
+            super(clazz, IS_CLASS.bindTo(clazz));
+            // Map "staticClassObject.class" to StaticClass.getRepresentedClass(). Some adventurous soul could subclass
+            // StaticClass, so we use INSTANCE_OF validation instead of EXACT_CLASS.
+            setPropertyGetter("class", GET_CLASS, ValidationType.INSTANCE_OF);
+            constructor = createConstructorMethod(clazz);
+        }
+
+        /**
+         * Creates a dynamic method containing all overloads of a class' public constructor
+         * @param clazz the target class
+         * @return a dynamic method containing all overloads of a class' public constructor. If the class has no public
+         * constructors, returns null.
+         */
+        private static DynamicMethod createConstructorMethod(Class<?> clazz) {
+            if(clazz.isArray()) {
+                final MethodHandle boundArrayCtor = ARRAY_CTOR.bindTo(clazz.getComponentType());
+                return new SimpleDynamicMethod(drop(boundArrayCtor.asType(boundArrayCtor.type().changeReturnType(
+                        clazz))), clazz, "<init>");
+            }
+
+            final Constructor<?>[] ctrs = clazz.getConstructors();
+            final List<MethodHandle> mhs = new ArrayList<>(ctrs.length);
+            for(int i = 0; i < ctrs.length; ++i) {
+                mhs.add(drop(Lookup.PUBLIC.unreflectConstructor(ctrs[i])));
+            }
+            return createDynamicMethod(mhs, clazz, "<init>");
+        }
+
+        private static MethodHandle drop(MethodHandle mh) {
+            return MethodHandles.dropArguments(mh, 0, StaticClass.class);
+        }
+
+        @Override
+        FacetIntrospector createFacetIntrospector() {
+            return new StaticClassIntrospector(clazz);
+        }
+
+        @Override
+        public GuardedInvocation getGuardedInvocation(LinkRequest request, LinkerServices linkerServices)
+                throws Exception {
+            final GuardedInvocation gi = super.getGuardedInvocation(request, linkerServices);
+            if(gi != null) {
+                return gi;
+            }
+            final CallSiteDescriptor desc = request.getCallSiteDescriptor();
+            final String op = desc.getNameToken(CallSiteDescriptor.OPERATOR);
+            final MethodType methodType = desc.getMethodType();
+            if("new" == op && constructor != null) {
+                final MethodHandle ctorInvocation = constructor.getInvocation(methodType, linkerServices);
+                if(ctorInvocation != null) {
+                    return new GuardedInvocation(ctorInvocation, getClassGuard(methodType));
+                }
+            }
+            return null;
+        }
+    }
+
+    @Override
+    public GuardedInvocation getGuardedInvocation(LinkRequest request, LinkerServices linkerServices) throws Exception {
+        final Object receiver = request.getReceiver();
+        if(receiver instanceof StaticClass) {
+            return linkers.get(((StaticClass)receiver).getRepresentedClass()).getGuardedInvocation(request,
+                    linkerServices);
+        }
+        return null;
+    }
+
+    @Override
+    public boolean canLinkType(Class<?> type) {
+        return type == StaticClass.class;
+    }
+
+    /*private*/ static final MethodHandle GET_CLASS = new Lookup(MethodHandles.lookup()).findVirtual(StaticClass.class,
+            "getRepresentedClass", MethodType.methodType(Class.class));
+
+    /*private*/ static final MethodHandle IS_CLASS = new Lookup(MethodHandles.lookup()).findStatic(StaticClassLinker.class,
+            "isClass", MethodType.methodType(Boolean.TYPE, Class.class, Object.class));
+
+    /*private*/ static final MethodHandle ARRAY_CTOR = Lookup.PUBLIC.findStatic(Array.class, "newInstance",
+            MethodType.methodType(Object.class, Class.class, int.class));
+
+    @SuppressWarnings("unused")
+    private static boolean isClass(Class<?> clazz, Object obj) {
+        return obj instanceof StaticClass && ((StaticClass)obj).getRepresentedClass() == clazz;
+    }
+}
\ No newline at end of file
diff --git a/nashorn/src/jdk/internal/dynalink/beans/messages.properties b/nashorn/src/jdk/internal/dynalink/beans/messages.properties
new file mode 100644
index 00000000000..b930988c1b5
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/beans/messages.properties
@@ -0,0 +1,25 @@
+#  Copyright 2009-2013 Attila Szegedi
+#
+#  Licensed under either the Apache License, Version 2.0 (the "Apache 
+#  License") or the BSD License (the "BSD License"), with licensee
+#  being free to choose either of the two at their discretion.
+#
+#  You may not use this file except in compliance with either the Apache 
+#  License or the BSD License.
+#
+#  A copy of the BSD License is available in the root directory of the 
+#  source distribution of the project under the file name
+#  "Dynalink-License-BSD.txt".
+#
+#  A copy of the Apache License is available in the root directory of the
+#  source distribution of the project under the file name 
+#  "Dynalink-License-Apache-2.0.txt". Alternatively, you may obtain a 
+#  copy of the Apache License at <http://www.apache.org/licenses/LICENSE-2.0>
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See your chosen License for the specific language governing permissions
+#  and limitations under that License.
+
+couldNotDiscoverAccessibleMethods=Could not discover accessible methods of class {0}, trying its superclasses and interfaces.
\ No newline at end of file
diff --git a/nashorn/src/jdk/internal/dynalink/beans/package.html b/nashorn/src/jdk/internal/dynalink/beans/package.html
new file mode 100644
index 00000000000..f405d1649e2
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/beans/package.html
@@ -0,0 +1,86 @@
+<!--
+   Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+
+   This code is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License version 2 only, as
+   published by the Free Software Foundation.  Oracle designates this
+   particular file as subject to the "Classpath" exception as provided
+   by Oracle in the LICENSE file that accompanied this code.
+
+   This code is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+   version 2 for more details (a copy is included in the LICENSE file that
+   accompanied this code).
+
+   You should have received a copy of the GNU General Public License version
+   2 along with this work; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+
+   Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+   or visit www.oracle.com if you need additional information or have any
+   questions.
+-->
+
+<!--
+   This file is available under and governed by the GNU General Public
+   License version 2 only, as published by the Free Software Foundation.
+   However, the following notice accompanied the original version of this
+   file, and Oracle licenses the original version of this file under the BSD
+   license:
+
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+  <body>
+    <p>
+      Contains the linker for POJOs.
+    </p>
+  </body>
diff --git a/nashorn/src/jdk/internal/dynalink/linker/ConversionComparator.java b/nashorn/src/jdk/internal/dynalink/linker/ConversionComparator.java
new file mode 100644
index 00000000000..8f2d1e0d0f7
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/linker/ConversionComparator.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.linker;
+
+
+/**
+ * Optional interface to be implemented by {@link GuardingTypeConverterFactory} implementers. Language-specific
+ * conversions can cause increased overloaded method resolution ambiguity, as many methods can become applicable because
+ * of additional conversions. The static way of selecting the "most specific" method will fail more often, because there
+ * will be multiple maximally specific method with unrelated signatures. In these cases, language runtimes can be asked
+ * to resolve the ambiguity by expressing preferences for one conversion over the other.
+ * @author Attila Szegedi
+ */
+public interface ConversionComparator {
+    /**
+     * Enumeration of possible outcomes of comparing one conversion to another.
+     */
+    enum Comparison {
+        INDETERMINATE,
+        TYPE_1_BETTER,
+        TYPE_2_BETTER,
+    }
+
+    /**
+     * Determines which of the two target types is the preferred conversion target from a source type.
+     * @param sourceType the source type.
+     * @param targetType1 one potential target type
+     * @param targetType2 another potential target type.
+     * @return one of Comparison constants that establish which - if any - of the target types is preferred for the
+     * conversion.
+     */
+    public Comparison compareConversion(Class<?> sourceType, Class<?> targetType1, Class<?> targetType2);
+}
diff --git a/nashorn/src/jdk/internal/dynalink/linker/GuardedInvocation.java b/nashorn/src/jdk/internal/dynalink/linker/GuardedInvocation.java
new file mode 100644
index 00000000000..f045dd2c59b
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/linker/GuardedInvocation.java
@@ -0,0 +1,315 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.linker;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.lang.invoke.SwitchPoint;
+import java.lang.invoke.WrongMethodTypeException;
+import java.util.List;
+import jdk.internal.dynalink.CallSiteDescriptor;
+import jdk.internal.dynalink.support.Guards;
+
+
+/**
+ * Represents a conditionally valid method handle. It is an immutable triple of an invocation method handle, a guard
+ * method handle that defines the applicability of the invocation handle, and a switch point that can be used for
+ * external invalidation of the invocation handle. The invocation handle is suitable for invocation if the guard
+ * handle returns true for its arguments, and as long as the switch point is not invalidated. Both the guard and the
+ * switch point are optional; neither, one, or both can be present.
+ *
+ * @author Attila Szegedi
+ */
+public class GuardedInvocation {
+    private final MethodHandle invocation;
+    private final MethodHandle guard;
+    private final SwitchPoint switchPoint;
+
+    /**
+     * Creates a new guarded invocation.
+     *
+     * @param invocation the method handle representing the invocation. Must not be null.
+     * @param guard the method handle representing the guard. Must have the same method type as the invocation, except
+     * it must return boolean. For some useful guards, check out the {@link Guards} class. It can be null to represent
+     * an unconditional invocation, although that is unusual.
+     * @throws NullPointerException if invocation is null.
+     */
+    public GuardedInvocation(MethodHandle invocation, MethodHandle guard) {
+        this(invocation, guard, null);
+    }
+
+    /**
+     * Creates a new guarded invocation.
+     *
+     * @param invocation the method handle representing the invocation. Must not be null.
+     * @param guard the method handle representing the guard. Must have the same method type as the invocation, except
+     * it must return boolean. For some useful guards, check out the {@link Guards} class. It can be null. If both it
+     * and the switch point are null, this represents an unconditional invocation, which is legal but unusual.
+     * @param switchPoint the optional switch point that can be used to invalidate this linkage.
+     * @throws NullPointerException if invocation is null.
+     */
+    public GuardedInvocation(MethodHandle invocation, MethodHandle guard, SwitchPoint switchPoint) {
+        invocation.getClass(); // NPE check
+        this.invocation = invocation;
+        this.guard = guard;
+        this.switchPoint = switchPoint;
+    }
+
+    /**
+     * Creates a new guarded invocation.
+     *
+     * @param invocation the method handle representing the invocation. Must not be null.
+     * @param switchPoint the optional switch point that can be used to invalidate this linkage.
+     * @param guard the method handle representing the guard. Must have the same method type as the invocation, except
+     * it must return boolean. For some useful guards, check out the {@link Guards} class. It can be null. If both it
+     * and the switch point are null, this represents an unconditional invocation, which is legal but unusual.
+     * @throws NullPointerException if invocation is null.
+     */
+    public GuardedInvocation(MethodHandle invocation, SwitchPoint switchPoint, MethodHandle guard) {
+        this(invocation, guard, switchPoint);
+    }
+    /**
+     * Returns the invocation method handle.
+     *
+     * @return the invocation method handle. It will never be null.
+     */
+    public MethodHandle getInvocation() {
+        return invocation;
+    }
+
+    /**
+     * Returns the guard method handle.
+     *
+     * @return the guard method handle. Can be null.
+     */
+    public MethodHandle getGuard() {
+        return guard;
+    }
+
+    /**
+     * Returns the switch point that can be used to invalidate the invocation handle.
+     *
+     * @return the switch point that can be used to invalidate the invocation handle. Can be null.
+     */
+    public SwitchPoint getSwitchPoint() {
+        return switchPoint;
+    }
+
+    /**
+     * Returns true if and only if this guarded invocation has a switchpoint, and that switchpoint has been invalidated.
+     * @return true if and only if this guarded invocation has a switchpoint, and that switchpoint has been invalidated.
+     */
+    public boolean hasBeenInvalidated() {
+        return switchPoint != null && switchPoint.hasBeenInvalidated();
+    }
+
+    /**
+     * Asserts that the invocation is of the specified type, and the guard (if present) is of the specified type with a
+     * boolean return type.
+     *
+     * @param type the asserted type
+     * @throws WrongMethodTypeException if the invocation and the guard are not of the expected method type.
+     */
+    public void assertType(MethodType type) {
+        assertType(invocation, type);
+        if(guard != null) {
+            assertType(guard, type.changeReturnType(Boolean.TYPE));
+        }
+    }
+
+    /**
+     * Creates a new guarded invocation with different methods, preserving the switch point.
+     *
+     * @param newInvocation the new invocation
+     * @param newGuard the new guard
+     * @return a new guarded invocation with the replaced methods and the same switch point as this invocation.
+     */
+    public GuardedInvocation replaceMethods(MethodHandle newInvocation, MethodHandle newGuard) {
+        return new GuardedInvocation(newInvocation, newGuard, switchPoint);
+    }
+
+    private GuardedInvocation replaceMethodsOrThis(MethodHandle newInvocation, MethodHandle newGuard) {
+        if(newInvocation == invocation && newGuard == guard) {
+            return this;
+        }
+        return replaceMethods(newInvocation, newGuard);
+    }
+
+    /**
+     * Changes the type of the invocation, as if {@link MethodHandle#asType(MethodType)} was applied to its invocation
+     * and its guard, if it has one (with return type changed to boolean, and parameter count potentially truncated for
+     * the guard). If the invocation already is of the required type, returns this object.
+     * @param newType the new type of the invocation.
+     * @return a guarded invocation with the new type applied to it.
+     */
+    public GuardedInvocation asType(MethodType newType) {
+        return replaceMethodsOrThis(invocation.asType(newType), guard == null ? null : Guards.asType(guard, newType));
+    }
+
+    /**
+     * Changes the type of the invocation, as if {@link LinkerServices#asType(MethodHandle, MethodType)} was applied to
+     * its invocation and its guard, if it has one (with return type changed to boolean, and parameter count potentially
+     * truncated for the guard). If the invocation already is of the required type, returns this object.
+     * @param linkerServices the linker services to use for the conversion
+     * @param newType the new type of the invocation.
+     * @return a guarded invocation with the new type applied to it.
+     */
+    public GuardedInvocation asType(LinkerServices linkerServices, MethodType newType) {
+        return replaceMethodsOrThis(linkerServices.asType(invocation, newType), guard == null ? null :
+            Guards.asType(linkerServices, guard, newType));
+    }
+
+    /**
+     * Changes the type of the invocation, as if {@link MethodHandle#asType(MethodType)} was applied to its invocation
+     * and its guard, if it has one (with return type changed to boolean for guard). If the invocation already is of the
+     * required type, returns this object.
+     * @param desc a call descriptor whose method type is adapted.
+     * @return a guarded invocation with the new type applied to it.
+     */
+    public GuardedInvocation asType(CallSiteDescriptor desc) {
+        return asType(desc.getMethodType());
+    }
+
+    /**
+     * Applies argument filters to both the invocation and the guard (if there is one).
+     * @param pos the position of the first argumen being filtered
+     * @param filters the argument filters
+     * @return a filtered invocation
+     */
+    public GuardedInvocation filterArguments(int pos, MethodHandle... filters) {
+        return replaceMethods(MethodHandles.filterArguments(invocation, pos, filters), guard == null ? null :
+            MethodHandles.filterArguments(guard, pos, filters));
+    }
+
+    /**
+     * Makes an invocation that drops arguments in both the invocation and the guard (if there is one).
+     * @param pos the position of the first argument being dropped
+     * @param valueTypes the types of the values being dropped
+     * @return an invocation that drops arguments
+     */
+    public GuardedInvocation dropArguments(int pos, List<Class<?>> valueTypes) {
+        return replaceMethods(MethodHandles.dropArguments(invocation, pos, valueTypes), guard == null ? null :
+            MethodHandles.dropArguments(guard, pos, valueTypes));
+    }
+
+    /**
+     * Makes an invocation that drops arguments in both the invocation and the guard (if there is one).
+     * @param pos the position of the first argument being dropped
+     * @param valueTypes the types of the values being dropped
+     * @return an invocation that drops arguments
+     */
+    public GuardedInvocation dropArguments(int pos, Class<?>... valueTypes) {
+        return replaceMethods(MethodHandles.dropArguments(invocation, pos, valueTypes), guard == null ? null :
+            MethodHandles.dropArguments(guard, pos, valueTypes));
+    }
+
+
+    /**
+     * Composes the invocation, switchpoint, and the guard into a composite method handle that knows how to fall back.
+     * @param fallback the fallback method handle in case switchpoint is invalidated or guard returns false.
+     * @return a composite method handle.
+     */
+    public MethodHandle compose(MethodHandle fallback) {
+        return compose(fallback, fallback);
+    }
+
+    /**
+     * Composes the invocation, switchpoint, and the guard into a composite method handle that knows how to fall back.
+     * @param switchpointFallback the fallback method handle in case switchpoint is invalidated.
+     * @param guardFallback the fallback method handle in case guard returns false.
+     * @return a composite method handle.
+     */
+    public MethodHandle compose(MethodHandle switchpointFallback, MethodHandle guardFallback) {
+        final MethodHandle guarded =
+                guard == null ? invocation : MethodHandles.guardWithTest(guard, invocation, guardFallback);
+        return switchPoint == null ? guarded : switchPoint.guardWithTest(guarded, switchpointFallback);
+    }
+
+    private static void assertType(MethodHandle mh, MethodType type) {
+        if(!mh.type().equals(type)) {
+            throw new WrongMethodTypeException("Expected type: " + type + " actual type: " + mh.type());
+        }
+    }
+}
\ No newline at end of file
diff --git a/nashorn/src/jdk/internal/dynalink/linker/GuardingDynamicLinker.java b/nashorn/src/jdk/internal/dynalink/linker/GuardingDynamicLinker.java
new file mode 100644
index 00000000000..a2acee3cef4
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/linker/GuardingDynamicLinker.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.linker;
+
+/**
+ * The base interface for language-specific dynamic linkers. Such linkers always have to produce method handles with
+ * guards, as the validity of the method handle for calls at a call site inevitably depends on some condition (at the
+ * very least, it depends on the receiver belonging to the language runtime of the linker). Language runtime
+ * implementors will normally implement one for their own language, and declare it in the
+ * <tt>META-INF/services/jdk.internal.dynalink.linker.GuardingDynamicLinker</tt> file within their JAR file.
+ *
+ * @author Attila Szegedi
+ */
+public interface GuardingDynamicLinker {
+    /**
+     * Creates a guarded invocation appropriate for a particular invocation with the specified arguments at a call site.
+     *
+     * @param linkRequest the object describing the request for linking a particular invocation
+     * @param linkerServices linker services
+     * @return a guarded invocation with a method handle suitable for the arguments, as well as a guard condition that
+     * if fails should trigger relinking. Must return null if it can't resolve the invocation. If the returned
+     * invocation is unconditional (which is actually quite rare), the guard in the return value can be null. The
+     * invocation can also have a switch point for asynchronous invalidation of the linkage. If the linker does not
+     * recognize any native language runtime contexts in arguments, or does recognize its own, but receives a call site
+     * descriptor without its recognized context in the arguments, it should invoke
+     * {@link LinkRequest#withoutRuntimeContext()} and link for that.
+     * @throws Exception if the operation fails for whatever reason
+     */
+    public GuardedInvocation getGuardedInvocation(LinkRequest linkRequest, LinkerServices linkerServices)
+            throws Exception;
+}
\ No newline at end of file
diff --git a/nashorn/src/jdk/internal/dynalink/linker/GuardingTypeConverterFactory.java b/nashorn/src/jdk/internal/dynalink/linker/GuardingTypeConverterFactory.java
new file mode 100644
index 00000000000..138bd894ff1
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/linker/GuardingTypeConverterFactory.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.linker;
+
+import jdk.internal.dynalink.support.TypeUtilities;
+
+/**
+ * Optional interface that can be implemented by {@link GuardingDynamicLinker} implementations to provide
+ * language-runtime specific implicit type conversion capabilities. Note that if you implement this interface, you will
+ * very likely want to implement {@link ConversionComparator} interface too, as your additional language-specific
+ * conversions, in absence of a strategy for prioritizing these conversions, will cause more ambiguity in selecting the
+ * correct overload when trying to link to an overloaded POJO method.
+ *
+ * @author Attila Szegedi
+ */
+public interface GuardingTypeConverterFactory {
+    /**
+     * Returns a guarded invocation that receives an Object of the specified source type and returns an Object converted
+     * to the specified target type. The type of the invocation is targetType(sourceType), while the type of the guard
+     * is boolean(sourceType). Note that this will never be invoked for type conversions allowed by the JLS 5.3 "Method
+     * Invocation Conversion", see {@link TypeUtilities#isMethodInvocationConvertible(Class, Class)} for details. An
+     * implementation can assume it is never requested to produce a converter for these conversions.
+     *
+     * @param sourceType source type
+     * @param targetType the target type.
+     * @return a guarded invocation that can take an object (if it passes guard) and returns another object that is its
+     * representation coerced into the target type. In case the factory is certain it is unable to handle a conversion,
+     * it can return null. In case the factory is certain that it can always handle the conversion, it can return an
+     * unconditional invocation (one whose guard is null).
+     * @throws Exception if there was an error during creation of the converter
+     */
+    public GuardedInvocation convertToType(Class<?> sourceType, Class<?> targetType) throws Exception;
+}
\ No newline at end of file
diff --git a/nashorn/src/jdk/internal/dynalink/linker/LinkRequest.java b/nashorn/src/jdk/internal/dynalink/linker/LinkRequest.java
new file mode 100644
index 00000000000..528be640c32
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/linker/LinkRequest.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.linker;
+
+import jdk.internal.dynalink.CallSiteDescriptor;
+import jdk.internal.dynalink.DynamicLinkerFactory;
+
+/**
+ * Represents a request to link a particular invocation at a particular call site. Instances of these requests are being
+ * passed to {@link GuardingDynamicLinker}.
+ *
+ * @author Attila Szegedi
+ */
+public interface LinkRequest {
+    /**
+     * Returns the call site descriptor for the call site being linked.
+     *
+     * @return the call site descriptor for the call site being linked.
+     */
+    public CallSiteDescriptor getCallSiteDescriptor();
+
+    /**
+     * Returns the arguments for the invocation being linked. The returned array is a clone; modifications to it won't
+     * affect the arguments in this request.
+     *
+     * @return the arguments for the invocation being linked.
+     */
+    public Object[] getArguments();
+
+    /**
+     * Returns the 0th argument for the invocation being linked; this is typically the receiver object.
+     *
+     * @return the receiver object.
+     */
+    public Object getReceiver();
+
+    /**
+     * Returns true if the call site is considered unstable, that is, it has been relinked more times than was
+     * specified in {@link DynamicLinkerFactory#setUnstableRelinkThreshold(int)}. Linkers should use this as a
+     * hint to prefer producing linkage that is more stable (its guard fails less frequently), even if that assumption
+     * causes a less effective version of an operation to be linked. This is just a hint, of course, and linkers are
+     * free to ignore this property.
+     * @return true if the call site is considered unstable.
+     */
+    public boolean isCallSiteUnstable();
+
+    /**
+     * Returns a request stripped from runtime context arguments. Some language runtimes will include runtime-specific
+     * context parameters in their call sites as few arguments between 0th argument "this" and the normal arguments. If
+     * a linker does not recognize such contexts at all, or does not recognize the call site as one with its own
+     * context, it can ask for the alternative link request with context parameters and arguments removed, and link
+     * against it instead.
+     *
+     * @return the context-stripped request. If the link request does not have any language runtime specific context
+     * parameters, the same link request is returned.
+     */
+    public LinkRequest withoutRuntimeContext();
+
+    /**
+     * Returns a request identical to this one with call site descriptor and arguments replaced with the ones specified.
+     *
+     * @param callSiteDescriptor the new call site descriptor
+     * @param arguments the new arguments
+     * @return a new request identical to this one, except with the call site descriptor and arguments replaced with the
+     * specified ones.
+     */
+    public LinkRequest replaceArguments(CallSiteDescriptor callSiteDescriptor, Object[] arguments);
+}
\ No newline at end of file
diff --git a/nashorn/src/jdk/internal/dynalink/linker/LinkerServices.java b/nashorn/src/jdk/internal/dynalink/linker/LinkerServices.java
new file mode 100644
index 00000000000..ab821db161b
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/linker/LinkerServices.java
@@ -0,0 +1,165 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.linker;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import jdk.internal.dynalink.DynamicLinker;
+import jdk.internal.dynalink.linker.ConversionComparator.Comparison;
+
+
+/**
+ * Interface for services provided to {@link GuardingDynamicLinker} instances by the {@link DynamicLinker} that owns
+ * them. You can think of it as the interface of the {@link DynamicLinker} that faces the {@link GuardingDynamicLinker}
+ * s.
+ *
+ * @author Attila Szegedi
+ */
+public interface LinkerServices {
+    /**
+     * Similar to {@link MethodHandle#asType(MethodType)} except it also hooks in method handles produced by
+     * {@link GuardingTypeConverterFactory} implementations, providing for language-specific type coercing of
+     * parameters. It will apply {@link MethodHandle#asType(MethodType)} for all primitive-to-primitive,
+     * wrapper-to-primitive, primitive-to-wrapper conversions as well as for all upcasts. For all other conversions,
+     * it'll insert {@link MethodHandles#filterArguments(MethodHandle, int, MethodHandle...)} with composite filters
+     * provided by {@link GuardingTypeConverterFactory} implementations. It doesn't use language-specific conversions on
+     * the return type.
+     *
+     * @param handle target method handle
+     * @param fromType the types of source arguments
+     * @return a method handle that is a suitable combination of {@link MethodHandle#asType(MethodType)} and
+     * {@link MethodHandles#filterArguments(MethodHandle, int, MethodHandle...)} with
+     * {@link GuardingTypeConverterFactory} produced type converters as filters.
+     */
+    public MethodHandle asType(MethodHandle handle, MethodType fromType);
+
+    /**
+     * Given a source and target type, returns a method handle that converts between them. Never returns null; in worst
+     * case it will return an identity conversion (that might fail for some values at runtime). You rarely need to use
+     * this method directly; you should mostly rely on {@link #asType(MethodHandle, MethodType)} instead. You really
+     * only need this method if you have a piece of your program that is written in Java, and you need to reuse existing
+     * type conversion machinery in a non-invokedynamic context.
+     * @param sourceType the type to convert from
+     * @param targetType the type to convert to
+     * @return a method handle performing the conversion.
+     */
+    public MethodHandle getTypeConverter(Class<?> sourceType, Class<?> targetType);
+
+    /**
+     * Returns true if there might exist a conversion between the requested types (either an automatic JVM conversion,
+     * or one provided by any available {@link GuardingTypeConverterFactory}), or false if there definitely does not
+     * exist a conversion between the requested types. Note that returning true does not guarantee that the conversion
+     * will succeed at runtime (notably, if the "from" or "to" types are sufficiently generic), but returning false
+     * guarantees that it would fail.
+     *
+     * @param from the source type for the conversion
+     * @param to the target type for the conversion
+     * @return true if there can be a conversion, false if there can not.
+     */
+    public boolean canConvert(Class<?> from, Class<?> to);
+
+    /**
+     * Creates a guarded invocation using the {@link DynamicLinker} that exposes this linker services interface. Linkers
+     * can typically use them to delegate linking of wrapped objects.
+     *
+     * @param linkRequest a request for linking the invocation
+     * @return a guarded invocation linked by the top-level linker (or any of its delegates). Can be null if no
+     * available linker is able to link the invocation.
+     * @throws Exception in case the top-level linker throws an exception
+     */
+    public GuardedInvocation getGuardedInvocation(LinkRequest linkRequest) throws Exception;
+
+    /**
+     * Determines which of the two type conversions from a source type to the two target types is preferred. This is
+     * used for dynamic overloaded method resolution. If the source type is convertible to exactly one target type with
+     * a method invocation conversion, it is chosen, otherwise available {@link ConversionComparator}s are consulted.
+     * @param sourceType the source type.
+     * @param targetType1 one potential target type
+     * @param targetType2 another potential target type.
+     * @return one of Comparison constants that establish which - if any - of the target types is preferable for the
+     * conversion.
+     */
+    public Comparison compareConversion(Class<?> sourceType, Class<?> targetType1, Class<?> targetType2);
+}
\ No newline at end of file
diff --git a/nashorn/src/jdk/internal/dynalink/linker/TypeBasedGuardingDynamicLinker.java b/nashorn/src/jdk/internal/dynalink/linker/TypeBasedGuardingDynamicLinker.java
new file mode 100644
index 00000000000..c7fac02d500
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/linker/TypeBasedGuardingDynamicLinker.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.linker;
+
+/**
+ * A guarding dynamic linker that can determine whether it can link the call site solely based on the type of the first
+ * argument at linking invocation time. (The first argument is usually the receiver class). Most language-specific
+ * linkers will fall into this category, as they recognize their native objects as Java objects of classes implementing
+ * a specific language-native interface or superclass. The linker mechanism can optimize the dispatch for these linkers.
+ *
+ * @author Attila Szegedi
+ */
+public interface TypeBasedGuardingDynamicLinker extends GuardingDynamicLinker {
+    /**
+     * Returns true if the linker can link an invocation where the first argument (receiver) is of the specified type.
+     *
+     * @param type the type to link
+     * @return true if the linker can link calls for the receiver type, or false otherwise.
+     */
+    public boolean canLinkType(Class<?> type);
+}
diff --git a/nashorn/src/jdk/internal/dynalink/linker/package.html b/nashorn/src/jdk/internal/dynalink/linker/package.html
new file mode 100644
index 00000000000..4e3991d7614
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/linker/package.html
@@ -0,0 +1,87 @@
+<!--
+   Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+
+   This code is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License version 2 only, as
+   published by the Free Software Foundation.  Oracle designates this
+   particular file as subject to the "Classpath" exception as provided
+   by Oracle in the LICENSE file that accompanied this code.
+
+   This code is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+   version 2 for more details (a copy is included in the LICENSE file that
+   accompanied this code).
+
+   You should have received a copy of the GNU General Public License version
+   2 along with this work; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+
+   Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+   or visit www.oracle.com if you need additional information or have any
+   questions.
+-->
+
+<!--
+   This file is available under and governed by the GNU General Public
+   License version 2 only, as published by the Free Software Foundation.
+   However, the following notice accompanied the original version of this
+   file, and Oracle licenses the original version of this file under the BSD
+   license:
+
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+  <body>
+    <p>
+      Contains interfaces and classes needed by language runtimes to implement
+      their own language-specific linkers.
+    </p>
+  </body>
diff --git a/nashorn/src/jdk/internal/dynalink/package.html b/nashorn/src/jdk/internal/dynalink/package.html
new file mode 100644
index 00000000000..588823ac8c3
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/package.html
@@ -0,0 +1,93 @@
+<!--
+   Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+
+   This code is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License version 2 only, as
+   published by the Free Software Foundation.  Oracle designates this
+   particular file as subject to the "Classpath" exception as provided
+   by Oracle in the LICENSE file that accompanied this code.
+
+   This code is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+   version 2 for more details (a copy is included in the LICENSE file that
+   accompanied this code).
+
+   You should have received a copy of the GNU General Public License version
+   2 along with this work; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+
+   Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+   or visit www.oracle.com if you need additional information or have any
+   questions.
+-->
+
+<!--
+   This file is available under and governed by the GNU General Public
+   License version 2 only, as published by the Free Software Foundation.
+   However, the following notice accompanied the original version of this
+   file, and Oracle licenses the original version of this file under the BSD
+   license:
+
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+  <body>
+    <p>
+      Contains the main API for using the dynamic linking facilities. A
+      scripting framework or a language runtime that does not define its own
+      linker but only uses linkers available in the system will only need to
+      use classes and interfaces from this package.
+    </p>
+    <p>
+      Languages that wish to define and use their own linkers will also need to
+      use the {@link jdk.internal.dynalink.linker} package.
+    </p>
+  </body>
diff --git a/nashorn/src/jdk/internal/dynalink/support/AbstractCallSiteDescriptor.java b/nashorn/src/jdk/internal/dynalink/support/AbstractCallSiteDescriptor.java
new file mode 100644
index 00000000000..401ab1a2636
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/support/AbstractCallSiteDescriptor.java
@@ -0,0 +1,186 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.support;
+
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodHandles.Lookup;
+import java.util.Objects;
+import jdk.internal.dynalink.CallSiteDescriptor;
+
+
+/**
+ * A base class for call site descriptor implementations. Provides reconstruction of the name from the tokens, as well
+ * as a generally useful {@code equals} and {@code hashCode} methods.
+ * @author Attila Szegedi
+ */
+public abstract class AbstractCallSiteDescriptor implements CallSiteDescriptor {
+
+    @Override
+    public String getName() {
+        return appendName(new StringBuilder(getNameLength())).toString();
+    }
+
+   @Override
+   public Lookup getLookup() {
+       return MethodHandles.publicLookup();
+   }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof CallSiteDescriptor && equals((CallSiteDescriptor)obj);
+    }
+
+    /**
+     * Returns true if this call site descriptor is equal to the passed call site descriptor.
+     * @param csd the other call site descriptor.
+     * @return true if they are equal.
+     */
+    public boolean equals(CallSiteDescriptor csd) {
+        if(csd == null) {
+            return false;
+        }
+        if(csd == this) {
+            return true;
+        }
+        final int ntc = getNameTokenCount();
+        if(ntc != csd.getNameTokenCount()) {
+            return false;
+        }
+        for(int i = ntc; i-- > 0;) { // Reverse order as variability is higher at the end
+            if(!Objects.equals(getNameToken(i), csd.getNameToken(i))) {
+                return false;
+            }
+        }
+        if(!getMethodType().equals(csd.getMethodType())) {
+            return false;
+        }
+        return lookupsEqual(getLookup(), csd.getLookup());
+    }
+
+    @Override
+    public int hashCode() {
+        final int c = getNameTokenCount();
+        int h = 0;
+        for(int i = 0; i < c; ++i) {
+            h = h * 31 + getNameToken(i).hashCode();
+        }
+        return h * 31 + getMethodType().hashCode();
+    }
+
+    @Override
+    public String toString() {
+        final String mt = getMethodType().toString();
+        final String l = getLookup().toString();
+        final StringBuilder b = new StringBuilder(l.length() + 1 + mt.length() + getNameLength());
+        return appendName(b).append(mt).append("@").append(l).toString();
+    }
+
+    private int getNameLength() {
+        final int c = getNameTokenCount();
+        int l = 0;
+        for(int i = 0; i < c; ++i) {
+            l += getNameToken(i).length();
+        }
+        return l +  c - 1;
+    }
+
+    private StringBuilder appendName(StringBuilder b) {
+        b.append(getNameToken(0));
+        final int c = getNameTokenCount();
+        for(int i = 1; i < c; ++i) {
+            b.append(':').append(getNameToken(i));
+        }
+        return b;
+    }
+
+    private static boolean lookupsEqual(Lookup l1, Lookup l2) {
+        if(l1 == l2) {
+            return true;
+        }
+        if(l1.lookupClass() != l2.lookupClass()) {
+            return false;
+        }
+        return l1.lookupModes() == l2.lookupModes();
+    }
+}
diff --git a/nashorn/src/jdk/internal/dynalink/support/AbstractRelinkableCallSite.java b/nashorn/src/jdk/internal/dynalink/support/AbstractRelinkableCallSite.java
new file mode 100644
index 00000000000..248ce9b2b63
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/support/AbstractRelinkableCallSite.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.support;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MutableCallSite;
+import jdk.internal.dynalink.CallSiteDescriptor;
+import jdk.internal.dynalink.RelinkableCallSite;
+
+
+/**
+ * A basic implementation of the {@link RelinkableCallSite} as a {@link MutableCallSite} subclass.
+ *
+ * @author Attila Szegedi
+ */
+public abstract class AbstractRelinkableCallSite extends MutableCallSite implements RelinkableCallSite {
+    private final CallSiteDescriptor descriptor;
+
+    /**
+     * Creates a new relinkable call site.
+     * @param descriptor the descriptor for this call site
+     */
+    protected AbstractRelinkableCallSite(CallSiteDescriptor descriptor) {
+        super(descriptor.getMethodType());
+        this.descriptor = descriptor;
+    }
+
+    @Override
+    public CallSiteDescriptor getDescriptor() {
+        return descriptor;
+    }
+
+    @Override
+    public void initialize(MethodHandle relinkAndInvoke) {
+        setTarget(relinkAndInvoke);
+    }
+}
\ No newline at end of file
diff --git a/nashorn/src/jdk/internal/dynalink/support/AutoDiscovery.java b/nashorn/src/jdk/internal/dynalink/support/AutoDiscovery.java
new file mode 100644
index 00000000000..72e93cc2418
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/support/AutoDiscovery.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.support;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ServiceLoader;
+import jdk.internal.dynalink.DynamicLinkerFactory;
+import jdk.internal.dynalink.linker.GuardingDynamicLinker;
+
+
+/**
+ * Provides methods for automatic discovery of all guarding dynamic linkers listed in the
+ * <tt>/META-INF/services/jdk.internal.dynalink.linker.GuardingDynamicLinker</tt> resources of all JAR files for a
+ * particular class loader. Ordinarily, you will not use this class directly, but you will use a
+ * {@link DynamicLinkerFactory} instead.
+ */
+public class AutoDiscovery {
+
+    private AutoDiscovery() {
+    }
+
+    /**
+     * Discovers all guarding dynamic linkers listed in JAR files of the context class loader of the current thread.
+     *
+     * @return a list of available linkers. Can be zero-length list but not null.
+     */
+    public static List<GuardingDynamicLinker> loadLinkers() {
+        return getLinkers(ServiceLoader.load(GuardingDynamicLinker.class));
+    }
+
+    /**
+     * Discovers all guarding dynamic linkers listed in JAR files of the specified class loader.
+     *
+     * @param cl the class loader to use
+     * @return a list of guarding dynamic linkers available through the specified class loader. Can be zero-length list
+     * but not null.
+     */
+    public static List<GuardingDynamicLinker> loadLinkers(ClassLoader cl) {
+        return getLinkers(ServiceLoader.load(GuardingDynamicLinker.class, cl));
+    }
+
+    /**
+     * I can't believe there's no Collections API for making a List given an Iterator...
+     */
+    private static <T> List<T> getLinkers(ServiceLoader<T> loader) {
+        final List<T> list = new LinkedList<>();
+        for(final T linker: loader) {
+            list.add(linker);
+        }
+        return list;
+    }
+}
\ No newline at end of file
diff --git a/nashorn/src/jdk/internal/dynalink/support/Backport.java b/nashorn/src/jdk/internal/dynalink/support/Backport.java
new file mode 100644
index 00000000000..1be7dc32acc
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/support/Backport.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.support;
+
+import java.lang.invoke.MethodHandles;
+
+/**
+ * @author Attila Szegedi
+ */
+public class Backport {
+    /**
+     * True if Remi's JSR-292 backport agent is active; false if we're using native OpenJDK JSR-292 support.
+     */
+    public static final boolean inUse = MethodHandles.class.getName().startsWith("jsr292");
+
+    private Backport() {
+    }
+}
diff --git a/nashorn/src/jdk/internal/dynalink/support/BottomGuardingDynamicLinker.java b/nashorn/src/jdk/internal/dynalink/support/BottomGuardingDynamicLinker.java
new file mode 100644
index 00000000000..bab8f59e174
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/support/BottomGuardingDynamicLinker.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.support;
+
+import jdk.internal.dynalink.linker.GuardedInvocation;
+import jdk.internal.dynalink.linker.LinkRequest;
+import jdk.internal.dynalink.linker.LinkerServices;
+import jdk.internal.dynalink.linker.TypeBasedGuardingDynamicLinker;
+
+/**
+ * A linker that can't link any call site. Only used internally by {@link CompositeTypeBasedGuardingDynamicLinker}. Can
+ * be used by other language runtimes if they need it though.
+ *
+ * @author Attila Szegedi
+ */
+public class BottomGuardingDynamicLinker implements TypeBasedGuardingDynamicLinker {
+
+    /**
+     * The sole instance of this stateless linker.
+     */
+    public static final BottomGuardingDynamicLinker INSTANCE = new BottomGuardingDynamicLinker();
+
+    private BottomGuardingDynamicLinker() {
+    }
+
+    @Override
+    public boolean canLinkType(Class<?> type) {
+        return false;
+    }
+
+    @Override
+    public GuardedInvocation getGuardedInvocation(LinkRequest linkRequest, LinkerServices linkerServices) {
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/nashorn/src/jdk/internal/dynalink/support/CallSiteDescriptorFactory.java b/nashorn/src/jdk/internal/dynalink/support/CallSiteDescriptorFactory.java
new file mode 100644
index 00000000000..d74f73711d0
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/support/CallSiteDescriptorFactory.java
@@ -0,0 +1,265 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.support;
+
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodHandles.Lookup;
+import java.lang.invoke.MethodType;
+import java.lang.ref.WeakReference;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.StringTokenizer;
+import java.util.WeakHashMap;
+import jdk.internal.dynalink.CallSiteDescriptor;
+
+
+/**
+ * Usable as a default factory for call site descriptor implementations. It is weakly canonicalizing, meaning it will
+ * return the same immutable call site descriptor for identical inputs, i.e. repeated requests for a descriptor
+ * signifying public lookup for "dyn:getProp:color" of type "Object(Object)" will return the same object as long as
+ * a previously created, at least softly reachable one exists. It also uses several different implementations of the
+ * {@link CallSiteDescriptor} internally, and chooses the most space-efficient one based on the input.
+ * @author Attila Szegedi
+ */
+public class CallSiteDescriptorFactory {
+    private static final WeakHashMap<CallSiteDescriptor, WeakReference<CallSiteDescriptor>> publicDescs =
+            new WeakHashMap<>();
+
+
+    private CallSiteDescriptorFactory() {
+    }
+
+    /**
+     * Creates a new call site descriptor instance. The actual underlying class of the instance is dependent on the
+     * passed arguments to be space efficient; i.e. if you  only use the public lookup, you'll get back an
+     * implementation that doesn't waste space on storing the lookup object.
+     * @param lookup the lookup that determines access rights at the call site. If your language runtime doesn't have
+     * equivalents of Java access concepts, just use {@link MethodHandles#publicLookup()}. Must not be null.
+     * @param name the name of the method at the call site. Must not be null.
+     * @param methodType the type of the method at the call site. Must not be null.
+     * @return a call site descriptor representing the input. Note that although the method name is "create", it will
+     * in fact return a weakly-referenced canonical instance.
+     */
+    public static CallSiteDescriptor create(Lookup lookup, String name, MethodType methodType) {
+        name.getClass(); // NPE check
+        methodType.getClass(); // NPE check
+        lookup.getClass(); // NPE check
+        final String[] tokenizedName = tokenizeName(name);
+        if(isPublicLookup(lookup)) {
+            return getCanonicalPublicDescriptor(createPublicCallSiteDescriptor(tokenizedName, methodType));
+        } else {
+            return new LookupCallSiteDescriptor(tokenizedName, methodType, lookup);
+        }
+    }
+
+    static CallSiteDescriptor getCanonicalPublicDescriptor(final CallSiteDescriptor desc) {
+        synchronized(publicDescs) {
+            final WeakReference<CallSiteDescriptor> ref = publicDescs.get(desc);
+            if(ref != null) {
+                final CallSiteDescriptor canonical = ref.get();
+                if(canonical != null) {
+                    return canonical;
+                }
+            }
+            publicDescs.put(desc, new WeakReference<>(desc));
+        }
+        return desc;
+    }
+
+    private static CallSiteDescriptor createPublicCallSiteDescriptor(String[] tokenizedName, MethodType methodType) {
+        final int l = tokenizedName.length;
+        if(l > 0 && tokenizedName[0] == "dyn") {
+            if(l == 2) {
+                return new UnnamedDynCallSiteDescriptor(tokenizedName[1], methodType);
+            } if (l == 3) {
+                return new NamedDynCallSiteDescriptor(tokenizedName[1], tokenizedName[2], methodType);
+            }
+        }
+        return new DefaultCallSiteDescriptor(tokenizedName, methodType);
+    }
+
+    private static boolean isPublicLookup(Lookup lookup) {
+        return lookup == MethodHandles.publicLookup();
+    }
+
+    /**
+     * Tokenizes the composite name along colons, as well as {@link NameCodec#decode(String) demangles} and interns
+     * the tokens. The first two tokens are not demangled as they are supposed to be the naming scheme and the name of
+     * the operation which can be expected to consist of just alphabetical characters.
+     * @param name the composite name consisting of colon-separated, possibly mangled tokens.
+     * @return an array of tokens
+     */
+    public static String[] tokenizeName(String name) {
+        final StringTokenizer tok = new StringTokenizer(name, CallSiteDescriptor.TOKEN_DELIMITER);
+        final String[] tokens = new String[tok.countTokens()];
+        for(int i = 0; i < tokens.length; ++i) {
+            String token = tok.nextToken();
+            if(i > 1) {
+                token = NameCodec.decode(token);
+            }
+            tokens[i] = token.intern();
+        }
+        return tokens;
+    }
+
+    /**
+     * Tokenizes a composite operation name along pipe characters. I.e. if you have a "dyn:getElem|getProp|getMethod"
+     * operation, returns a list of ["getElem", "getProp", "getMethod"]. The tokens are not interned.
+     * @param desc the call site descriptor with the operation
+     * @return a list of tokens
+     */
+    public static List<String> tokenizeOperators(CallSiteDescriptor desc) {
+        final String ops = desc.getNameToken(CallSiteDescriptor.OPERATOR);
+        final StringTokenizer tok = new StringTokenizer(ops, CallSiteDescriptor.OPERATOR_DELIMITER);
+        final int count = tok.countTokens();
+        if(count == 1) {
+            return Collections.singletonList(ops);
+        }
+        final String[] tokens = new String[count];
+        for(int i = 0; i < count; ++i) {
+            tokens[i] = tok.nextToken();
+        }
+        return Arrays.asList(tokens);
+    }
+
+    /**
+     * Returns a new call site descriptor that is identical to the passed one, except that it has some parameter types
+     * removed from its method type.
+     * @param desc the original call site descriptor
+     * @param start index of the first parameter to remove
+     * @param end index of the first parameter to not remove
+     * @return a new call site descriptor with modified method type
+     */
+    public static CallSiteDescriptor dropParameterTypes(CallSiteDescriptor desc, int start, int end) {
+        return desc.changeMethodType(desc.getMethodType().dropParameterTypes(start, end));
+    }
+
+    /**
+     * Returns a new call site descriptor that is identical to the passed one, except that it has a single parameter
+     * type changed in its method type.
+     * @param desc the original call site descriptor
+     * @param num index of the parameter to change
+     * @param nptype the new parameter type
+     * @return a new call site descriptor with modified method type
+     */
+    public static CallSiteDescriptor changeParameterType(CallSiteDescriptor desc, int num, Class<?> nptype) {
+        return desc.changeMethodType(desc.getMethodType().changeParameterType(num, nptype));
+    }
+
+    /**
+     * Returns a new call site descriptor that is identical to the passed one, except that it has the return type
+     * changed in its method type.
+     * @param desc the original call site descriptor
+     * @param nrtype the new return type
+     * @return a new call site descriptor with modified method type
+     */
+    public static CallSiteDescriptor changeReturnType(CallSiteDescriptor desc, Class<?> nrtype) {
+        return desc.changeMethodType(desc.getMethodType().changeReturnType(nrtype));
+    }
+
+    /**
+     * Returns a new call site descriptor that is identical to the passed one, except that it has additional parameter
+     * types inserted into its method type.
+     * @param desc the original call site descriptor
+     * @param num index at which the new parameters are inserted
+     * @param ptypesToInsert the new types to insert
+     * @return a new call site descriptor with modified method type
+     */
+    public static CallSiteDescriptor insertParameterTypes(CallSiteDescriptor desc, int num, Class<?>... ptypesToInsert) {
+        return desc.changeMethodType(desc.getMethodType().insertParameterTypes(num, ptypesToInsert));
+    }
+
+    /**
+     * Returns a new call site descriptor that is identical to the passed one, except that it has additional parameter
+     * types inserted into its method type.
+     * @param desc the original call site descriptor
+     * @param num index at which the new parameters are inserted
+     * @param ptypesToInsert the new types to insert
+     * @return a new call site descriptor with modified method type
+     */
+    public static CallSiteDescriptor insertParameterTypes(CallSiteDescriptor desc, int num, List<Class<?>> ptypesToInsert) {
+        return desc.changeMethodType(desc.getMethodType().insertParameterTypes(num, ptypesToInsert));
+    }
+}
\ No newline at end of file
diff --git a/nashorn/src/jdk/internal/dynalink/support/ClassMap.java b/nashorn/src/jdk/internal/dynalink/support/ClassMap.java
new file mode 100644
index 00000000000..7369d2557cf
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/support/ClassMap.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.support;
+
+import java.lang.ref.Reference;
+import java.lang.ref.SoftReference;
+import java.util.Map;
+import java.util.WeakHashMap;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+/**
+ * A dual map that can either strongly or weakly reference a given class depending on whether the class is visible from
+ * a class loader or not.
+ *
+ * @author Attila Szegedi
+ * @param <T> the type of the values in the map
+ */
+public abstract class ClassMap<T> {
+    private final ConcurrentMap<Class<?>, T> map = new ConcurrentHashMap<>();
+    private final Map<Class<?>, Reference<T>> weakMap = new WeakHashMap<>();
+    private final ClassLoader classLoader;
+
+    /**
+     * Creates a new class map. It will use strong references for all keys and values where the key is a class visible
+     * from the class loader, and will use weak keys and soft values for all other classes.
+     *
+     * @param classLoader the classloader that determines strong referenceability.
+     */
+    protected ClassMap(ClassLoader classLoader) {
+        this.classLoader = classLoader;
+    }
+
+    /**
+     * Compute the value associated with the given class. It is possible that the method will be invoked several times
+     * (or even concurrently) for the same class parameter.
+     *
+     * @param clazz the class to compute the value for
+     * @return the return value. Must not be null.
+     */
+    protected abstract T computeValue(Class<?> clazz);
+
+    /**
+     * Returns the class loader that governs the strong referenceability of this class map.
+     *
+     * @return the class loader that governs the strong referenceability of this class map.
+     */
+    public ClassLoader getClassLoader() {
+        return classLoader;
+    }
+
+    /**
+     * Returns the value associated with the class
+     *
+     * @param clazz the class
+     * @return the value associated with the class
+     */
+    public T get(Class<?> clazz) {
+        // Check in fastest first - objects we're allowed to strongly reference
+        final T v = map.get(clazz);
+        if(v != null) {
+            return v;
+        }
+        // Check objects we're not allowed to strongly reference
+        Reference<T> ref;
+        synchronized(weakMap) {
+            ref = weakMap.get(clazz);
+        }
+        if(ref != null) {
+            final T refv = ref.get();
+            if(refv != null) {
+                return refv;
+            }
+        }
+        // Not found in either place; create a new value
+        final T newV = computeValue(clazz);
+        assert newV != null;
+        // If allowed to strongly reference, put it in the fast map
+        if(Guards.canReferenceDirectly(classLoader, clazz.getClassLoader())) {
+            final T oldV = map.putIfAbsent(clazz, newV);
+            return oldV != null ? oldV : newV;
+        }
+        // Otherwise, put it into the weak map
+        synchronized(weakMap) {
+            ref = weakMap.get(clazz);
+            if(ref != null) {
+                final T oldV = ref.get();
+                if(oldV != null) {
+                    return oldV;
+                }
+            }
+            weakMap.put(clazz, new SoftReference<>(newV));
+            return newV;
+        }
+    }
+}
diff --git a/nashorn/src/jdk/internal/dynalink/support/CompositeGuardingDynamicLinker.java b/nashorn/src/jdk/internal/dynalink/support/CompositeGuardingDynamicLinker.java
new file mode 100644
index 00000000000..f13eb9b24c5
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/support/CompositeGuardingDynamicLinker.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.support;
+
+import java.io.Serializable;
+import java.util.LinkedList;
+import java.util.List;
+import jdk.internal.dynalink.linker.GuardedInvocation;
+import jdk.internal.dynalink.linker.GuardingDynamicLinker;
+import jdk.internal.dynalink.linker.LinkRequest;
+import jdk.internal.dynalink.linker.LinkerServices;
+
+
+/**
+ * A {@link GuardingDynamicLinker} that delegates sequentially to a list of other guarding dynamic linkers. The first
+ * value returned from a component linker other than null is returned. If no component linker returns an invocation,
+ * null is returned.
+ *
+ * @author Attila Szegedi
+ */
+public class CompositeGuardingDynamicLinker implements GuardingDynamicLinker, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private final GuardingDynamicLinker[] linkers;
+
+    /**
+     * Creates a new composite linker.
+     *
+     * @param linkers a list of component linkers.
+     */
+    public CompositeGuardingDynamicLinker(Iterable<? extends GuardingDynamicLinker> linkers) {
+        final List<GuardingDynamicLinker> l = new LinkedList<>();
+        for(GuardingDynamicLinker linker: linkers) {
+            l.add(linker);
+        }
+        this.linkers = l.toArray(new GuardingDynamicLinker[l.size()]);
+    }
+
+    @Override
+    public GuardedInvocation getGuardedInvocation(LinkRequest linkRequest, final LinkerServices linkerServices)
+            throws Exception {
+        for(final GuardingDynamicLinker linker: linkers) {
+            final GuardedInvocation invocation = linker.getGuardedInvocation(linkRequest, linkerServices);
+            if(invocation != null) {
+                return invocation;
+            }
+        }
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/nashorn/src/jdk/internal/dynalink/support/CompositeTypeBasedGuardingDynamicLinker.java b/nashorn/src/jdk/internal/dynalink/support/CompositeTypeBasedGuardingDynamicLinker.java
new file mode 100644
index 00000000000..b0ea761a415
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/support/CompositeTypeBasedGuardingDynamicLinker.java
@@ -0,0 +1,226 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.support;
+
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import jdk.internal.dynalink.linker.GuardedInvocation;
+import jdk.internal.dynalink.linker.GuardingDynamicLinker;
+import jdk.internal.dynalink.linker.LinkRequest;
+import jdk.internal.dynalink.linker.LinkerServices;
+import jdk.internal.dynalink.linker.TypeBasedGuardingDynamicLinker;
+
+
+/**
+ * A composite type-based guarding dynamic linker. When a receiver of a not yet seen class is encountered, all linkers
+ * are queried sequentially on their {@link TypeBasedGuardingDynamicLinker#canLinkType(Class)} method. The linkers
+ * returning true are then bound to the class, and next time a receiver of same type is encountered, the linking is
+ * delegated to those linkers only, speeding up dispatch.
+ *
+ * @author Attila Szegedi
+ */
+public class CompositeTypeBasedGuardingDynamicLinker implements TypeBasedGuardingDynamicLinker, Serializable {
+    private static final long serialVersionUID = 1L;
+
+    // Using a separate static class instance so there's no strong reference from the class value back to the composite
+    // linker.
+    private static class ClassToLinker extends ClassValue<List<TypeBasedGuardingDynamicLinker>> {
+        private static final List<TypeBasedGuardingDynamicLinker> NO_LINKER = Collections.emptyList();
+        private final TypeBasedGuardingDynamicLinker[] linkers;
+        private final List<TypeBasedGuardingDynamicLinker>[] singletonLinkers;
+
+        @SuppressWarnings("unchecked")
+        ClassToLinker(TypeBasedGuardingDynamicLinker[] linkers) {
+            this.linkers = linkers;
+            singletonLinkers = new List[linkers.length];
+            for(int i = 0; i < linkers.length; ++i) {
+                singletonLinkers[i] = Collections.singletonList(linkers[i]);
+            }
+        }
+
+        @Override
+        protected List<TypeBasedGuardingDynamicLinker> computeValue(Class<?> clazz) {
+            List<TypeBasedGuardingDynamicLinker> list = NO_LINKER;
+            for(int i = 0; i < linkers.length; ++i) {
+                final TypeBasedGuardingDynamicLinker linker = linkers[i];
+                if(linker.canLinkType(clazz)) {
+                    switch(list.size()) {
+                        case 0: {
+                            list = singletonLinkers[i];
+                            break;
+                        }
+                        case 1: {
+                            list = new LinkedList<>(list);
+                        }
+                        //$FALL-THROUGH$
+                        default: {
+                            list.add(linker);
+                        }
+                    }
+                }
+            }
+            return list;
+        }
+    }
+
+    private final ClassValue<List<TypeBasedGuardingDynamicLinker>> classToLinker;
+
+    /**
+     * Creates a new composite type-based linker.
+     *
+     * @param linkers the component linkers
+     */
+    public CompositeTypeBasedGuardingDynamicLinker(Iterable<? extends TypeBasedGuardingDynamicLinker> linkers) {
+        final List<TypeBasedGuardingDynamicLinker> l = new LinkedList<>();
+        for(TypeBasedGuardingDynamicLinker linker: linkers) {
+            l.add(linker);
+        }
+        this.classToLinker = new ClassToLinker(l.toArray(new TypeBasedGuardingDynamicLinker[l.size()]));
+    }
+
+    @Override
+    public boolean canLinkType(Class<?> type) {
+        return !classToLinker.get(type).isEmpty();
+    }
+
+    @Override
+    public GuardedInvocation getGuardedInvocation(LinkRequest linkRequest, final LinkerServices linkerServices)
+            throws Exception {
+        final Object obj = linkRequest.getReceiver();
+        if(obj == null) {
+            return null;
+        }
+        for(TypeBasedGuardingDynamicLinker linker: classToLinker.get(obj.getClass())) {
+            final GuardedInvocation invocation = linker.getGuardedInvocation(linkRequest, linkerServices);
+            if(invocation != null) {
+                return invocation;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Optimizes a list of type-based linkers. If a group of adjacent linkers in the list all implement
+     * {@link TypeBasedGuardingDynamicLinker}, they will be replaced with a single instance of
+     * {@link CompositeTypeBasedGuardingDynamicLinker} that contains them.
+     *
+     * @param linkers the list of linkers to optimize
+     * @return the optimized list
+     */
+    public static List<GuardingDynamicLinker> optimize(Iterable<? extends GuardingDynamicLinker> linkers) {
+        final List<GuardingDynamicLinker> llinkers = new LinkedList<>();
+        final List<TypeBasedGuardingDynamicLinker> tblinkers = new LinkedList<>();
+        for(GuardingDynamicLinker linker: linkers) {
+            if(linker instanceof TypeBasedGuardingDynamicLinker) {
+                tblinkers.add((TypeBasedGuardingDynamicLinker)linker);
+            } else {
+                addTypeBased(llinkers, tblinkers);
+                llinkers.add(linker);
+            }
+        }
+        addTypeBased(llinkers, tblinkers);
+        return llinkers;
+    }
+
+    private static void addTypeBased(List<GuardingDynamicLinker> llinkers,
+            List<TypeBasedGuardingDynamicLinker> tblinkers) {
+        switch(tblinkers.size()) {
+            case 0: {
+                break;
+            }
+            case 1: {
+                llinkers.addAll(tblinkers);
+                tblinkers.clear();
+                break;
+            }
+            default: {
+                llinkers.add(new CompositeTypeBasedGuardingDynamicLinker(tblinkers));
+                tblinkers.clear();
+                break;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/nashorn/src/jdk/internal/dynalink/support/DefaultCallSiteDescriptor.java b/nashorn/src/jdk/internal/dynalink/support/DefaultCallSiteDescriptor.java
new file mode 100644
index 00000000000..abf3ddad1a4
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/support/DefaultCallSiteDescriptor.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.support;
+
+import java.lang.invoke.MethodHandles.Lookup;
+import java.lang.invoke.MethodType;
+import jdk.internal.dynalink.CallSiteDescriptor;
+
+
+/**
+ * A default, fairly light implementation of a call site descriptor used for describing non-standard operations. It does
+ * not store {@link Lookup} objects but always returns the public lookup from its {@link #getLookup()} method. If you
+ * need to support non-public lookup, you can use {@link LookupCallSiteDescriptor}.
+ * @author Attila Szegedi
+ */
+class DefaultCallSiteDescriptor extends AbstractCallSiteDescriptor {
+
+    private final String[] tokenizedName;
+    private final MethodType methodType;
+
+    DefaultCallSiteDescriptor(String[] tokenizedName, MethodType methodType) {
+        this.tokenizedName = tokenizedName;
+        this.methodType = methodType;
+    }
+
+    @Override
+    public int getNameTokenCount() {
+        return tokenizedName.length;
+    }
+
+    @Override
+    public String getNameToken(int i) {
+        try {
+            return tokenizedName[i];
+        } catch(ArrayIndexOutOfBoundsException e) {
+            throw new IllegalArgumentException(e.getMessage());
+        }
+    }
+
+    String[] getTokenizedName() {
+        return tokenizedName;
+    }
+
+    @Override
+    public MethodType getMethodType() {
+        return methodType;
+    }
+
+    @Override
+    public CallSiteDescriptor changeMethodType(MethodType newMethodType) {
+        return CallSiteDescriptorFactory.getCanonicalPublicDescriptor(new DefaultCallSiteDescriptor(tokenizedName,
+                newMethodType));
+    }
+}
diff --git a/nashorn/src/jdk/internal/dynalink/support/Guards.java b/nashorn/src/jdk/internal/dynalink/support/Guards.java
new file mode 100644
index 00000000000..6107d4acca9
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/support/Guards.java
@@ -0,0 +1,360 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.support;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import jdk.internal.dynalink.linker.LinkerServices;
+
+
+/**
+ * Utility methods for creating typical guards. TODO: introduce reasonable caching of created guards.
+ *
+ * @author Attila Szegedi
+ */
+public class Guards {
+    private static final Logger LOG = Logger
+            .getLogger(Guards.class.getName(), "jdk.internal.dynalink.support.messages");
+
+    private Guards() {
+    }
+
+    /**
+     * Creates a guard method handle with arguments of a specified type, but with boolean return value. When invoked, it
+     * returns true if the first argument is of the specified class (exactly of it, not a subclass). The rest of the
+     * arguments will be ignored.
+     *
+     * @param clazz the class of the first argument to test for
+     * @param type the method type
+     * @return a method handle testing whether its first argument is of the specified class.
+     */
+    @SuppressWarnings("boxing")
+    public static MethodHandle isOfClass(Class<?> clazz, MethodType type) {
+        final Class<?> declaredType = type.parameterType(0);
+        if(clazz == declaredType) {
+            LOG.log(Level.WARNING, "isOfClassGuardAlwaysTrue", new Object[] { clazz.getName(), 0, type });
+            return constantTrue(type);
+        }
+        if(!declaredType.isAssignableFrom(clazz)) {
+            LOG.log(Level.WARNING, "isOfClassGuardAlwaysFalse", new Object[] { clazz.getName(), 0, type });
+            return constantFalse(type);
+        }
+        return getClassBoundArgumentTest(IS_OF_CLASS, clazz, 0, type);
+    }
+
+    /**
+     * Creates a method handle with arguments of a specified type, but with boolean return value. When invoked, it
+     * returns true if the first argument is instance of the specified class or its subclass). The rest of the arguments
+     * will be ignored.
+     *
+     * @param clazz the class of the first argument to test for
+     * @param type the method type
+     * @return a method handle testing whether its first argument is of the specified class or subclass.
+     */
+    public static MethodHandle isInstance(Class<?> clazz, MethodType type) {
+        return isInstance(clazz, 0, type);
+    }
+
+    /**
+     * Creates a method handle with arguments of a specified type, but with boolean return value. When invoked, it
+     * returns true if the n'th argument is instance of the specified class or its subclass). The rest of the arguments
+     * will be ignored.
+     *
+     * @param clazz the class of the first argument to test for
+     * @param pos the position on the argument list to test
+     * @param type the method type
+     * @return a method handle testing whether its first argument is of the specified class or subclass.
+     */
+    @SuppressWarnings("boxing")
+    public static MethodHandle isInstance(Class<?> clazz, int pos, MethodType type) {
+        final Class<?> declaredType = type.parameterType(pos);
+        if(clazz.isAssignableFrom(declaredType)) {
+            LOG.log(Level.WARNING, "isInstanceGuardAlwaysTrue", new Object[] { clazz.getName(), pos, type });
+            return constantTrue(type);
+        }
+        if(!declaredType.isAssignableFrom(clazz)) {
+            LOG.log(Level.WARNING, "isInstanceGuardAlwaysFalse", new Object[] { clazz.getName(), pos, type });
+            return constantFalse(type);
+        }
+        return getClassBoundArgumentTest(IS_INSTANCE, clazz, pos, type);
+    }
+
+    /**
+     * Creates a method handle that returns true if the argument in the specified position is a Java array.
+     *
+     * @param pos the position in the argument lit
+     * @param type the method type of the handle
+     * @return a method handle that returns true if the argument in the specified position is a Java array; the rest of
+     * the arguments are ignored.
+     */
+    @SuppressWarnings("boxing")
+    public static MethodHandle isArray(int pos, MethodType type) {
+        final Class<?> declaredType = type.parameterType(pos);
+        if(declaredType.isArray()) {
+            LOG.log(Level.WARNING, "isArrayGuardAlwaysTrue", new Object[] { pos, type });
+            return constantTrue(type);
+        }
+        if(!declaredType.isAssignableFrom(Object[].class)) {
+            LOG.log(Level.WARNING, "isArrayGuardAlwaysFalse", new Object[] { pos, type });
+            return constantFalse(type);
+        }
+        return asType(IS_ARRAY, pos, type);
+    }
+
+    /**
+     * Return true if it is safe to strongly reference a class from the referred class loader from a class associated
+     * with the referring class loader without risking a class loader memory leak.
+     *
+     * @param referrerLoader the referrer class loader
+     * @param referredLoader the referred class loader
+     * @return true if it is safe to strongly reference the class
+     */
+    public static boolean canReferenceDirectly(ClassLoader referrerLoader, final ClassLoader referredLoader) {
+        if(referredLoader == null) {
+            // Can always refer directly to a system class
+            return true;
+        }
+        if(referrerLoader == null) {
+            // System classes can't refer directly to any non-system class
+            return false;
+        }
+        // Otherwise, can only refer directly to classes residing in same or
+        // parent class loader.
+
+        ClassLoader referrer = referrerLoader;
+        do {
+            if(referrer == referredLoader) {
+                return true;
+            }
+            referrer = referrer.getParent();
+        } while(referrer != null);
+        return false;
+    }
+
+    private static MethodHandle getClassBoundArgumentTest(MethodHandle test, Class<?> clazz, int pos, MethodType type) {
+        // Bind the class to the first argument of the test
+        return asType(test.bindTo(clazz), pos, type);
+    }
+
+    /**
+     * Takes a guard-test method handle, and adapts it to the requested type, returning a boolean. Only applies
+     * conversions as per {@link MethodHandle#asType(MethodType)}.
+     * @param test the test method handle
+     * @param type the type to adapt the method handle to
+     * @return the adapted method handle
+     */
+    public static MethodHandle asType(MethodHandle test, MethodType type) {
+        return test.asType(getTestType(test, type));
+    }
+
+    /**
+     * Takes a guard-test method handle, and adapts it to the requested type, returning a boolean. Applies the passed
+     * {@link LinkerServices} object's {@link LinkerServices#asType(MethodHandle, MethodType)}.
+     * @param linkerServices the linker services to use for type conversions
+     * @param test the test method handle
+     * @param type the type to adapt the method handle to
+     * @return the adapted method handle
+     */
+    public static MethodHandle asType(LinkerServices linkerServices, MethodHandle test, MethodType type) {
+        return linkerServices.asType(test, getTestType(test, type));
+    }
+
+    private static MethodType getTestType(MethodHandle test, MethodType type) {
+        return type.dropParameterTypes(test.type().parameterCount(),
+                type.parameterCount()).changeReturnType(boolean.class);
+    }
+
+    private static MethodHandle asType(MethodHandle test, int pos, MethodType type) {
+        assert test != null;
+        assert type != null;
+        assert type.parameterCount() > 0;
+        assert pos >= 0 && pos < type.parameterCount();
+        assert test.type().parameterCount() == 1;
+        assert test.type().returnType() == Boolean.TYPE;
+        return MethodHandles.permuteArguments(test.asType(test.type().changeParameterType(0, type.parameterType(pos))),
+                type.changeReturnType(Boolean.TYPE), new int[] { pos });
+    }
+
+    private static final MethodHandle IS_OF_CLASS = new Lookup(MethodHandles.lookup()).findStatic(Guards.class,
+            "isOfClass", MethodType.methodType(Boolean.TYPE, Class.class, Object.class));
+
+    private static final MethodHandle IS_INSTANCE = Lookup.PUBLIC.findVirtual(Class.class, "isInstance",
+            MethodType.methodType(Boolean.TYPE, Object.class));
+
+    private static final MethodHandle IS_ARRAY = new Lookup(MethodHandles.lookup()).findStatic(Guards.class, "isArray",
+            MethodType.methodType(Boolean.TYPE, Object.class));
+
+    private static final MethodHandle IS_IDENTICAL = new Lookup(MethodHandles.lookup()).findStatic(Guards.class,
+            "isIdentical", MethodType.methodType(Boolean.TYPE, Object.class, Object.class));
+
+    private static final MethodHandle IS_NULL = new Lookup(MethodHandles.lookup()).findStatic(Guards.class,
+            "isNull", MethodType.methodType(Boolean.TYPE, Object.class));
+
+    private static final MethodHandle IS_NOT_NULL = new Lookup(MethodHandles.lookup()).findStatic(Guards.class,
+            "isNotNull", MethodType.methodType(Boolean.TYPE, Object.class));
+
+    /**
+     * Creates a guard method that tests its only argument for being of an exact particular class.
+     * @param clazz the class to test for.
+     * @return the desired guard method.
+     */
+    public static MethodHandle getClassGuard(Class<?> clazz) {
+        return IS_OF_CLASS.bindTo(clazz);
+    }
+
+    /**
+     * Creates a guard method that tests its only argument for being an instance of a particular class.
+     * @param clazz the class to test for.
+     * @return the desired guard method.
+     */
+    public static MethodHandle getInstanceOfGuard(Class<?> clazz) {
+        return IS_INSTANCE.bindTo(clazz);
+    }
+
+    /**
+     * Creates a guard method that tests its only argument for being referentially identical to another object
+     * @param obj the object used as referential identity test
+     * @return the desired guard method.
+     */
+    public static MethodHandle getIdentityGuard(Object obj) {
+        return IS_IDENTICAL.bindTo(obj);
+    }
+
+    /**
+     * Returns a guard that tests whether the first argument is null.
+     * @return a guard that tests whether the first argument is null.
+     */
+    public static MethodHandle isNull() {
+        return IS_NULL;
+    }
+
+    /**
+     * Returns a guard that tests whether the first argument is not null.
+     * @return a guard that tests whether the first argument is not null.
+     */
+    public static MethodHandle isNotNull() {
+        return IS_NOT_NULL;
+    }
+
+    @SuppressWarnings("unused")
+    private static boolean isNull(Object obj) {
+        return obj == null;
+    }
+
+    @SuppressWarnings("unused")
+    private static boolean isNotNull(Object obj) {
+        return obj != null;
+    }
+
+    @SuppressWarnings("unused")
+    private static boolean isArray(Object o) {
+        return o != null && o.getClass().isArray();
+    }
+
+    @SuppressWarnings("unused")
+    private static boolean isOfClass(Class<?> c, Object o) {
+        return o != null && o.getClass() == c;
+    }
+
+    @SuppressWarnings("unused")
+    private static boolean isIdentical(Object o1, Object o2) {
+        return o1 == o2;
+    }
+
+    private static MethodHandle constantTrue(MethodType type) {
+        return constantBoolean(Boolean.TRUE, type);
+    }
+
+    private static MethodHandle constantFalse(MethodType type) {
+        return constantBoolean(Boolean.FALSE, type);
+    }
+
+    private static MethodHandle constantBoolean(Boolean value, MethodType type) {
+        return MethodHandles.permuteArguments(MethodHandles.constant(Boolean.TYPE, value),
+                type.changeReturnType(Boolean.TYPE));
+    }
+}
\ No newline at end of file
diff --git a/nashorn/src/jdk/internal/dynalink/support/LinkRequestImpl.java b/nashorn/src/jdk/internal/dynalink/support/LinkRequestImpl.java
new file mode 100644
index 00000000000..1ca14cffbef
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/support/LinkRequestImpl.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.support;
+
+import jdk.internal.dynalink.CallSiteDescriptor;
+import jdk.internal.dynalink.linker.LinkRequest;
+
+/**
+ * Default implementation of the {@link LinkRequest}, representing a link request to a call site that passes no language
+ * runtime specific native context arguments on the stack.
+ *
+ * @author Attila Szegedi
+ */
+public class LinkRequestImpl implements LinkRequest {
+
+    private final CallSiteDescriptor callSiteDescriptor;
+    private final Object[] arguments;
+    private final boolean callSiteUnstable;
+
+    /**
+     * Creates a new link request.
+     *
+     * @param callSiteDescriptor the descriptor for the call site being linked
+     * @param callSiteUnstable true if the call site being linked is considered unstable
+     * @param arguments the arguments for the invocation
+     */
+    public LinkRequestImpl(CallSiteDescriptor callSiteDescriptor, boolean callSiteUnstable, Object... arguments) {
+        this.callSiteDescriptor = callSiteDescriptor;
+        this.callSiteUnstable = callSiteUnstable;
+        this.arguments = arguments;
+    }
+
+    @Override
+    public Object[] getArguments() {
+        return arguments != null ? arguments.clone() : null;
+    }
+
+    @Override
+    public Object getReceiver() {
+        return arguments != null && arguments.length > 0 ? arguments[0] : null;
+    }
+
+    @Override
+    public CallSiteDescriptor getCallSiteDescriptor() {
+        return callSiteDescriptor;
+    }
+
+    @Override
+    public boolean isCallSiteUnstable() {
+        return callSiteUnstable;
+    }
+
+    @Override
+    public LinkRequest withoutRuntimeContext() {
+        return this;
+    }
+
+    @Override
+    public LinkRequest replaceArguments(CallSiteDescriptor newCallSiteDescriptor, Object[] newArguments) {
+        return new LinkRequestImpl(newCallSiteDescriptor, callSiteUnstable, newArguments);
+    }
+}
\ No newline at end of file
diff --git a/nashorn/src/jdk/internal/dynalink/support/LinkerServicesImpl.java b/nashorn/src/jdk/internal/dynalink/support/LinkerServicesImpl.java
new file mode 100644
index 00000000000..42c37cbda27
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/support/LinkerServicesImpl.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.support;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodType;
+import jdk.internal.dynalink.linker.ConversionComparator.Comparison;
+import jdk.internal.dynalink.linker.GuardedInvocation;
+import jdk.internal.dynalink.linker.GuardingDynamicLinker;
+import jdk.internal.dynalink.linker.LinkRequest;
+import jdk.internal.dynalink.linker.LinkerServices;
+
+
+/**
+ * Default implementation of the {@link LinkerServices} interface.
+ *
+ * @author Attila Szegedi
+ */
+public class LinkerServicesImpl implements LinkerServices {
+
+    private final TypeConverterFactory typeConverterFactory;
+    private final GuardingDynamicLinker topLevelLinker;
+
+    /**
+     * Creates a new linker services object.
+     *
+     * @param typeConverterFactory the type converter factory exposed by the services.
+     * @param topLevelLinker the top level linker used by the services.
+     */
+    public LinkerServicesImpl(final TypeConverterFactory typeConverterFactory,
+            final GuardingDynamicLinker topLevelLinker) {
+        this.typeConverterFactory = typeConverterFactory;
+        this.topLevelLinker = topLevelLinker;
+    }
+
+    @Override
+    public boolean canConvert(Class<?> from, Class<?> to) {
+        return typeConverterFactory.canConvert(from, to);
+    }
+
+    @Override
+    public MethodHandle asType(MethodHandle handle, MethodType fromType) {
+        return typeConverterFactory.asType(handle, fromType);
+    }
+
+    @Override
+    public MethodHandle getTypeConverter(Class<?> sourceType, Class<?> targetType) {
+        return typeConverterFactory.getTypeConverter(sourceType, targetType);
+    }
+
+    @Override
+    public Comparison compareConversion(Class<?> sourceType, Class<?> targetType1, Class<?> targetType2) {
+        return typeConverterFactory.compareConversion(sourceType, targetType1, targetType2);
+    }
+
+    @Override
+    public GuardedInvocation getGuardedInvocation(LinkRequest linkRequest) throws Exception {
+        return topLevelLinker.getGuardedInvocation(linkRequest, this);
+    }
+}
\ No newline at end of file
diff --git a/nashorn/src/jdk/internal/dynalink/support/Lookup.java b/nashorn/src/jdk/internal/dynalink/support/Lookup.java
new file mode 100644
index 00000000000..cff6e943cea
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/support/Lookup.java
@@ -0,0 +1,361 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.support;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+
+/**
+ * A wrapper around MethodHandles.Lookup that masks checked exceptions in those cases when you're looking up methods
+ * within your own codebase (therefore it is an error if they are not present).
+ *
+ * @author Attila Szegedi
+ */
+public class Lookup {
+    private final MethodHandles.Lookup lookup;
+
+    /**
+     * Creates a new instance, bound to an instance of {@link java.lang.invoke.MethodHandles.Lookup}.
+     *
+     * @param lookup the {@link java.lang.invoke.MethodHandles.Lookup} it delegates to.
+     */
+    public Lookup(MethodHandles.Lookup lookup) {
+        this.lookup = lookup;
+    }
+
+    /**
+     * A canonical Lookup object that wraps {@link MethodHandles#publicLookup()}.
+     */
+    public static final Lookup PUBLIC = new Lookup(MethodHandles.publicLookup());
+
+    /**
+     * Performs a {@link java.lang.invoke.MethodHandles.Lookup#unreflect(Method)}, converting any encountered
+     * {@link IllegalAccessException} into an {@link IllegalAccessError}.
+     *
+     * @param m the method to unreflect
+     * @return the unreflected method handle.
+     */
+    public MethodHandle unreflect(Method m) {
+        try {
+            return lookup.unreflect(m);
+        } catch(IllegalAccessException e) {
+            final IllegalAccessError ee = new IllegalAccessError("Failed to unreflect method " + m);
+            ee.initCause(e);
+            throw ee;
+        }
+    }
+
+
+    /**
+     * Performs a {@link java.lang.invoke.MethodHandles.Lookup#unreflectGetter(Field)}, converting any encountered
+     * {@link IllegalAccessException} into an {@link IllegalAccessError}.
+     *
+     * @param f the field for which a getter is unreflected
+     * @return the unreflected field getter handle.
+     */
+    public MethodHandle unreflectGetter(Field f) {
+        try {
+            return lookup.unreflectGetter(f);
+        } catch(IllegalAccessException e) {
+            final IllegalAccessError ee = new IllegalAccessError("Failed to unreflect getter for field " + f);
+            ee.initCause(e);
+            throw ee;
+        }
+    }
+
+    /**
+     * Performs a {@link java.lang.invoke.MethodHandles.Lookup#findGetter(Class, String, Class)}, converting any
+     * encountered {@link IllegalAccessException} into an {@link IllegalAccessError} and {@link NoSuchFieldException}
+     * into a {@link NoSuchFieldError}.
+     *
+     * @param refc the class declaring the field
+     * @param name the name of the field
+     * @param type the type of the field
+     * @return the unreflected field getter handle.
+     * @throws IllegalAccessError if the field is inaccessible.
+     * @throws NoSuchFieldError if the field does not exist.
+     */
+    public MethodHandle findGetter(Class<?>refc, String name, Class<?> type) {
+        try {
+            return lookup.findGetter(refc, name, type);
+        } catch(IllegalAccessException e) {
+            final IllegalAccessError ee = new IllegalAccessError("Failed to access getter for field " + refc.getName() +
+                    "." + name + " of type " + type.getName());
+            ee.initCause(e);
+            throw ee;
+        } catch(NoSuchFieldException e) {
+            final NoSuchFieldError ee = new NoSuchFieldError("Failed to find getter for field " + refc.getName() +
+                    "." + name + " of type " + type.getName());
+            ee.initCause(e);
+            throw ee;
+        }
+    }
+
+    /**
+     * Performs a {@link java.lang.invoke.MethodHandles.Lookup#unreflectSetter(Field)}, converting any encountered
+     * {@link IllegalAccessException} into an {@link IllegalAccessError}.
+     *
+     * @param f the field for which a setter is unreflected
+     * @return the unreflected field setter handle.
+     */
+    public MethodHandle unreflectSetter(Field f) {
+        try {
+            return lookup.unreflectSetter(f);
+        } catch(IllegalAccessException e) {
+            final IllegalAccessError ee = new IllegalAccessError("Failed to unreflect setter for field " + f);
+            ee.initCause(e);
+            throw ee;
+        }
+    }
+
+    /**
+     * Performs a {@link java.lang.invoke.MethodHandles.Lookup#unreflectConstructor(Constructor)}, converting any
+     * encountered {@link IllegalAccessException} into an {@link IllegalAccessError}.
+     *
+     * @param c the constructor to unreflect
+     * @return the unreflected constructor handle.
+     */
+    public MethodHandle unreflectConstructor(Constructor<?> c) {
+        try {
+            return lookup.unreflectConstructor(c);
+        } catch(IllegalAccessException e) {
+            final IllegalAccessError ee = new IllegalAccessError("Failed to unreflect constructor " + c);
+            ee.initCause(e);
+            throw ee;
+        }
+    }
+
+    /**
+     * Performs a findSpecial on the underlying lookup, except for the backport where it rather uses unreflect. Converts
+     * any encountered {@link IllegalAccessException} into an {@link IllegalAccessError} and a
+     * {@link NoSuchMethodException} into a {@link NoSuchMethodError}.
+     *
+     * @param declaringClass class declaring the method
+     * @param name the name of the method
+     * @param type the type of the method
+     * @return a method handle for the method
+     * @throws IllegalAccessError if the method is inaccessible.
+     * @throws NoSuchMethodError if the method does not exist.
+     */
+    public MethodHandle findSpecial(Class<?> declaringClass, String name, MethodType type) {
+        try {
+            if(Backport.inUse) {
+                final Method m = declaringClass.getDeclaredMethod(name, type.parameterArray());
+                if(!Modifier.isPublic(declaringClass.getModifiers()) || !Modifier.isPublic(m.getModifiers())) {
+                    m.setAccessible(true);
+                }
+                return unreflect(m);
+            } else {
+                return lookup.findSpecial(declaringClass, name, type, declaringClass);
+            }
+        } catch(IllegalAccessException e) {
+            final IllegalAccessError ee = new IllegalAccessError("Failed to access special method " + methodDescription(
+                    declaringClass, name, type));
+            ee.initCause(e);
+            throw ee;
+        } catch(NoSuchMethodException e) {
+            final NoSuchMethodError ee = new NoSuchMethodError("Failed to find special method " + methodDescription(
+                    declaringClass, name, type));
+            ee.initCause(e);
+            throw ee;
+        }
+    }
+
+    private static String methodDescription(Class<?> declaringClass, String name, MethodType type) {
+        return declaringClass.getName() + "#" + name + type;
+    }
+
+    /**
+     * Performs a findStatic on the underlying lookup. Converts any encountered {@link IllegalAccessException} into an
+     * {@link IllegalAccessError} and a {@link NoSuchMethodException} into a {@link NoSuchMethodError}.
+     *
+     * @param declaringClass class declaring the method
+     * @param name the name of the method
+     * @param type the type of the method
+     * @return a method handle for the method
+     * @throws IllegalAccessError if the method is inaccessible.
+     * @throws NoSuchMethodError if the method does not exist.
+     */
+    public MethodHandle findStatic(Class<?> declaringClass, String name, MethodType type) {
+        try {
+            return lookup.findStatic(declaringClass, name, type);
+        } catch(IllegalAccessException e) {
+            final IllegalAccessError ee = new IllegalAccessError("Failed to access static method " + methodDescription(
+                    declaringClass, name, type));
+            ee.initCause(e);
+            throw ee;
+        } catch(NoSuchMethodException e) {
+            final NoSuchMethodError ee = new NoSuchMethodError("Failed to find static method " + methodDescription(
+                    declaringClass, name, type));
+            ee.initCause(e);
+            throw ee;
+        }
+    }
+
+    /**
+     * Performs a findVirtual on the underlying lookup. Converts any encountered {@link IllegalAccessException} into an
+     * {@link IllegalAccessError} and a {@link NoSuchMethodException} into a {@link NoSuchMethodError}.
+     *
+     * @param declaringClass class declaring the method
+     * @param name the name of the method
+     * @param type the type of the method
+     * @return a method handle for the method
+     * @throws IllegalAccessError if the method is inaccessible.
+     * @throws NoSuchMethodError if the method does not exist.
+     */
+    public MethodHandle findVirtual(Class<?> declaringClass, String name, MethodType type) {
+        try {
+            return lookup.findVirtual(declaringClass, name, type);
+        } catch(IllegalAccessException e) {
+            final IllegalAccessError ee = new IllegalAccessError("Failed to access virtual method " + methodDescription(
+                    declaringClass, name, type));
+            ee.initCause(e);
+            throw ee;
+        } catch(NoSuchMethodException e) {
+            final NoSuchMethodError ee = new NoSuchMethodError("Failed to find virtual method " + methodDescription(
+                    declaringClass, name, type));
+            ee.initCause(e);
+            throw ee;
+        }
+    }
+
+    /**
+     * Given a lookup, finds using {@link #findSpecial(Class, String, MethodType)} a method on that lookup's class.
+     * Useful in classes' code for convenient linking to their own privates.
+     * @param lookup the lookup for the class
+     * @param name the name of the method
+     * @param rtype the return type of the method
+     * @param ptypes the parameter types of the method
+     * @return the method handle for the method
+     */
+    public static MethodHandle findOwnSpecial(MethodHandles.Lookup lookup, String name, Class<?> rtype, Class<?>... ptypes) {
+        return new Lookup(lookup).findOwnSpecial(name, rtype, ptypes);
+    }
+
+
+    /**
+     * Finds using {@link #findSpecial(Class, String, MethodType)} a method on that lookup's class. Useful in classes'
+     * code for convenient linking to their own privates. It's easier to use than {@code findSpecial} in that you can
+     * just list the parameter types, and don't have to specify lookup class.
+     * @param name the name of the method
+     * @param rtype the return type of the method
+     * @param ptypes the parameter types of the method
+     * @return the method handle for the method
+     */
+    public MethodHandle findOwnSpecial(String name, Class<?> rtype, Class<?>... ptypes) {
+        return findSpecial(lookup.lookupClass(), name, MethodType.methodType(rtype, ptypes));
+    }
+
+    /**
+     * Given a lookup, finds using {@link #findStatic(Class, String, MethodType)} a method on that lookup's class.
+     * Useful in classes' code for convenient linking to their own privates. It's easier to use than {@code findStatic}
+     * in that you can just list the parameter types, and don't have to specify lookup class.
+     * @param lookup the lookup for the class
+     * @param name the name of the method
+     * @param rtype the return type of the method
+     * @param ptypes the parameter types of the method
+     * @return the method handle for the method
+     */
+    public static MethodHandle findOwnStatic(MethodHandles.Lookup lookup, String name, Class<?> rtype, Class<?>... ptypes) {
+        return new Lookup(lookup).findOwnStatic(name, rtype, ptypes);
+    }
+
+    /**
+     * Finds using {@link #findStatic(Class, String, MethodType)} a method on that lookup's class. Useful in classes'
+     * code for convenient linking to their own privates. It's easier to use than {@code findStatic} in that you can
+     * just list the parameter types, and don't have to specify lookup class.
+     * @param name the name of the method
+     * @param rtype the return type of the method
+     * @param ptypes the parameter types of the method
+     * @return the method handle for the method
+     */
+    public MethodHandle findOwnStatic(String name, Class<?> rtype, Class<?>... ptypes) {
+        return findStatic(lookup.lookupClass(), name, MethodType.methodType(rtype, ptypes));
+    }
+}
diff --git a/nashorn/src/jdk/internal/dynalink/support/LookupCallSiteDescriptor.java b/nashorn/src/jdk/internal/dynalink/support/LookupCallSiteDescriptor.java
new file mode 100644
index 00000000000..655685c4aa3
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/support/LookupCallSiteDescriptor.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.support;
+
+import java.lang.invoke.MethodHandles.Lookup;
+import java.lang.invoke.MethodType;
+import jdk.internal.dynalink.CallSiteDescriptor;
+
+
+/**
+ * A call site descriptor that stores a specific {@link Lookup}. It does not, however, store static bootstrap arguments.
+ * @author Attila Szegedi
+ */
+class LookupCallSiteDescriptor extends DefaultCallSiteDescriptor {
+    private Lookup lookup;
+
+    /**
+     * Create a new call site descriptor from explicit information.
+     * @param tokenizedName the name of the method
+     * @param methodType the method type
+     * @param lookup the lookup
+     */
+    LookupCallSiteDescriptor(String[] tokenizedName, MethodType methodType, Lookup lookup) {
+        super(tokenizedName, methodType);
+        this.lookup = lookup;
+    }
+
+    @Override
+    public Lookup getLookup() {
+        return lookup;
+    }
+
+    @Override
+    public CallSiteDescriptor changeMethodType(MethodType newMethodType) {
+        return new LookupCallSiteDescriptor(getTokenizedName(), newMethodType, lookup);
+    }
+}
diff --git a/nashorn/src/jdk/internal/dynalink/support/NameCodec.java b/nashorn/src/jdk/internal/dynalink/support/NameCodec.java
new file mode 100644
index 00000000000..1c7cd29b95f
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/support/NameCodec.java
@@ -0,0 +1,218 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.support;
+
+import jdk.internal.dynalink.CallSiteDescriptor;
+
+/**
+ * Implements the name mangling and demangling as specified by John Rose's
+ * <a href="https://blogs.oracle.com/jrose/entry/symbolic_freedom_in_the_vm" target="_blank">"Symbolic Freedom in the
+ * VM"</a> article. It is recommended that implementers of languages on the JVM uniformly adopt this for symbolic
+ * interoperability between languages. Normally, you would mangle the names as you're generating bytecode, and then
+ * demangle them when you're creating {@link CallSiteDescriptor} objects. Note that you are expected to mangle
+ * individual tokens, and not the whole name at the call site, i.e. the colon character normally separating the tokens
+ * is never mangled. I.e. you wouldn't mangle {@code dyn:getProp:color} into {@code dyn\!getProp\!color}, but you would
+ * mangle {@code dyn:getProp:color$} into {@code dyn:getProp:\=color\%} (only mangling the individual token containing
+ * the symbol {@code color$}). {@link CallSiteDescriptorFactory#tokenizeName(String)} (and by implication, all call site
+ * descriptors it creates) will automatically perform demangling on the passed names. If you use this factory, or you
+ * have your own way of creating call site descriptors, but you still delegate to this method of the default factory
+ * (it is recommended that you do), then you have demangling handled for you already, and only need to ensure that you
+ * mangle the names when you're emitting them in the bytecode.
+ *
+ * @author Attila Szegedi
+ */
+public class NameCodec {
+    private static final char ESCAPE_CHAR = '\\';
+    private static final char EMPTY_ESCAPE = '=';
+    private static final String EMPTY_NAME = new String(new char[] { ESCAPE_CHAR, EMPTY_ESCAPE });
+    private static final char EMPTY_CHAR = 0xFEFF;
+
+    private static final int MIN_ENCODING = '$';
+    private static final int MAX_ENCODING = ']';
+    private static final char[] ENCODING = new char[MAX_ENCODING - MIN_ENCODING + 1];
+    private static final int MIN_DECODING = '!';
+    private static final int MAX_DECODING = '}';
+    private static final char[] DECODING = new char[MAX_DECODING - MIN_DECODING + 1];
+
+    static {
+        addEncoding('/', '|');
+        addEncoding('.', ',');
+        addEncoding(';', '?');
+        addEncoding('$', '%');
+        addEncoding('<', '^');
+        addEncoding('>', '_');
+        addEncoding('[', '{');
+        addEncoding(']', '}');
+        addEncoding(':', '!');
+        addEncoding('\\', '-');
+        DECODING[EMPTY_ESCAPE - MIN_DECODING] = EMPTY_CHAR;
+    }
+
+    private NameCodec() {
+    }
+
+    /**
+     * Encodes ("mangles") an unencoded symbolic name.
+     * @param name the symbolic name to mangle
+     * @return the mangled form of the symbolic name.
+     */
+    public static String encode(String name) {
+        final int l = name.length();
+        if(l == 0) {
+            return EMPTY_NAME;
+        }
+        StringBuilder b = null;
+        int lastEscape = -1;
+        for(int i = 0; i < l; ++i) {
+            final int encodeIndex = name.charAt(i) - MIN_ENCODING;
+            if(encodeIndex >= 0 && encodeIndex < ENCODING.length) {
+                final char e = ENCODING[encodeIndex];
+                if(e != 0) {
+                    if(b == null) {
+                        b = new StringBuilder(name.length() + 3);
+                        if(name.charAt(0) != ESCAPE_CHAR && i > 0) {
+                            b.append(EMPTY_NAME);
+                        }
+                        b.append(name, 0, i);
+                    } else {
+                        b.append(name, lastEscape + 1, i);
+                    }
+                    b.append(ESCAPE_CHAR).append(e);
+                    lastEscape = i;
+                }
+            }
+        }
+        if(b == null) {
+            return name.toString();
+        }
+        assert lastEscape != -1;
+        b.append(name, lastEscape + 1, l);
+        return b.toString();
+    }
+
+    /**
+     * Decodes ("demangles") an encoded symbolic name.
+     * @param name the symbolic name to demangle
+     * @return the demangled form of the symbolic name.
+     */
+    public static String decode(String name) {
+        if(name.charAt(0) != ESCAPE_CHAR) {
+            return name;
+        }
+        final int l = name.length();
+        if(l == 2 && name.charAt(1) == EMPTY_CHAR) {
+            return "";
+        }
+        StringBuilder b = new StringBuilder(name.length());
+        int lastEscape = -2;
+        int lastBackslash = -1;
+        for(;;) {
+            int nextBackslash = name.indexOf(ESCAPE_CHAR, lastBackslash + 1);
+            if(nextBackslash == -1 || nextBackslash == l - 1) {
+                break;
+            }
+            final int decodeIndex = name.charAt(nextBackslash + 1) - MIN_DECODING;
+            if(decodeIndex >= 0 && decodeIndex < DECODING.length) {
+                final char d = DECODING[decodeIndex];
+                if(d == EMPTY_CHAR) {
+                    // "\=" is only valid at the beginning of a mangled string
+                    if(nextBackslash == 0) {
+                        lastEscape = 0;
+                    }
+                } else if(d != 0) {
+                    b.append(name, lastEscape + 2, nextBackslash).append(d);
+                    lastEscape = nextBackslash;
+                }
+            }
+            lastBackslash = nextBackslash;
+        }
+        b.append(name, lastEscape + 2, l);
+        return b.toString();
+    }
+
+    private static void addEncoding(char from, char to) {
+        ENCODING[from - MIN_ENCODING] = to;
+        DECODING[to - MIN_DECODING] = from;
+    }
+}
diff --git a/nashorn/src/jdk/internal/dynalink/support/NamedDynCallSiteDescriptor.java b/nashorn/src/jdk/internal/dynalink/support/NamedDynCallSiteDescriptor.java
new file mode 100644
index 00000000000..79c5d1f3e77
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/support/NamedDynCallSiteDescriptor.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.support;
+
+import java.lang.invoke.MethodType;
+import jdk.internal.dynalink.CallSiteDescriptor;
+
+
+class NamedDynCallSiteDescriptor extends UnnamedDynCallSiteDescriptor {
+    private final String name;
+
+    NamedDynCallSiteDescriptor(String op, String name, MethodType methodType) {
+        super(op, methodType);
+        this.name = name;
+    }
+
+    @Override
+    public int getNameTokenCount() {
+        return 3;
+    }
+
+    @Override
+    public String getNameToken(int i) {
+        switch(i) {
+            case 0: return "dyn";
+            case 1: return getOp();
+            case 2: return name;
+            default: throw new IndexOutOfBoundsException(String.valueOf(i));
+        }
+    }
+
+    @Override
+    public CallSiteDescriptor changeMethodType(MethodType newMethodType) {
+        return CallSiteDescriptorFactory.getCanonicalPublicDescriptor(new NamedDynCallSiteDescriptor(getOp(), name,
+                newMethodType));
+    }
+}
diff --git a/nashorn/src/jdk/internal/dynalink/support/RuntimeContextLinkRequestImpl.java b/nashorn/src/jdk/internal/dynalink/support/RuntimeContextLinkRequestImpl.java
new file mode 100644
index 00000000000..efd20455965
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/support/RuntimeContextLinkRequestImpl.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.support;
+
+import jdk.internal.dynalink.CallSiteDescriptor;
+import jdk.internal.dynalink.linker.LinkRequest;
+
+/**
+ * A link request implementation for call sites that pass language runtime specific context arguments on the stack. The
+ * context specific arguments should be the first "n" arguments.
+ *
+ * @author Attila Szegedi
+ */
+public class RuntimeContextLinkRequestImpl extends LinkRequestImpl {
+
+    private final int runtimeContextArgCount;
+    private LinkRequestImpl contextStrippedRequest;
+
+    /**
+     * Creates a new link request.
+     *
+     * @param callSiteDescriptor the descriptor for the call site being linked
+     * @param arguments the arguments for the invocation
+     * @param callSiteUnstable true if the call site being linked is considered unstable
+     * @param runtimeContextArgCount the number of the leading arguments on the stack that represent the language
+     * runtime specific context arguments.
+     * @throws IllegalArgumentException if runtimeContextArgCount is less than 1.
+     */
+    public RuntimeContextLinkRequestImpl(CallSiteDescriptor callSiteDescriptor, boolean callSiteUnstable,
+            Object[] arguments, int runtimeContextArgCount) {
+        super(callSiteDescriptor, callSiteUnstable, arguments);
+        if(runtimeContextArgCount < 1) {
+            throw new IllegalArgumentException("runtimeContextArgCount < 1");
+        }
+        this.runtimeContextArgCount = runtimeContextArgCount;
+    }
+
+    @Override
+    public LinkRequest withoutRuntimeContext() {
+        if(contextStrippedRequest == null) {
+            contextStrippedRequest =
+                    new LinkRequestImpl(CallSiteDescriptorFactory.dropParameterTypes(getCallSiteDescriptor(), 1,
+                            runtimeContextArgCount + 1), isCallSiteUnstable(), getTruncatedArguments());
+        }
+        return contextStrippedRequest;
+    }
+
+    @Override
+    public LinkRequest replaceArguments(CallSiteDescriptor callSiteDescriptor, Object[] arguments) {
+        return new RuntimeContextLinkRequestImpl(callSiteDescriptor, isCallSiteUnstable(), arguments,
+                runtimeContextArgCount);
+    }
+
+    private Object[] getTruncatedArguments() {
+        final Object[] args = getArguments();
+        final Object[] newargs = new Object[args.length - runtimeContextArgCount];
+        newargs[0] = args[0]; // "this" remains at the 0th position
+        System.arraycopy(args, runtimeContextArgCount + 1, newargs, 1, newargs.length - 1);
+        return newargs;
+    }
+}
\ No newline at end of file
diff --git a/nashorn/src/jdk/internal/dynalink/support/TypeConverterFactory.java b/nashorn/src/jdk/internal/dynalink/support/TypeConverterFactory.java
new file mode 100644
index 00000000000..2fed7db7a8f
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/support/TypeConverterFactory.java
@@ -0,0 +1,320 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.support;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.lang.invoke.WrongMethodTypeException;
+import java.util.LinkedList;
+import java.util.List;
+import jdk.internal.dynalink.linker.ConversionComparator;
+import jdk.internal.dynalink.linker.ConversionComparator.Comparison;
+import jdk.internal.dynalink.linker.GuardedInvocation;
+import jdk.internal.dynalink.linker.GuardingTypeConverterFactory;
+import jdk.internal.dynalink.linker.LinkerServices;
+
+
+/**
+ * A factory for type converters. This class is the main implementation behind the
+ * {@link LinkerServices#asType(MethodHandle, MethodType)}. It manages the known {@link GuardingTypeConverterFactory}
+ * instances and creates appropriate converters for method handles.
+ *
+ * @author Attila Szegedi
+ */
+public class TypeConverterFactory {
+
+    private final GuardingTypeConverterFactory[] factories;
+    private final ConversionComparator[] comparators;
+
+    private final ClassValue<ClassMap<MethodHandle>> converterMap = new ClassValue<ClassMap<MethodHandle>>() {
+        @Override
+        protected ClassMap<MethodHandle> computeValue(final Class<?> sourceType) {
+            return new ClassMap<MethodHandle>(sourceType.getClassLoader()) {
+                @Override
+                protected MethodHandle computeValue(Class<?> targetType) {
+                    try {
+                        return createConverter(sourceType, targetType);
+                    } catch (RuntimeException e) {
+                        throw e;
+                    } catch (Exception e) {
+                        throw new RuntimeException(e);
+                    }
+                }
+            };
+        }
+    };
+
+    private final ClassValue<ClassMap<MethodHandle>> converterIdentityMap = new ClassValue<ClassMap<MethodHandle>>() {
+        @Override
+        protected ClassMap<MethodHandle> computeValue(final Class<?> sourceType) {
+            return new ClassMap<MethodHandle>(sourceType.getClassLoader()) {
+                @Override
+                protected MethodHandle computeValue(Class<?> targetType) {
+                    if(!canAutoConvert(sourceType, targetType)) {
+                        final MethodHandle converter = getTypeConverterNull(sourceType, targetType);
+                        if(converter != null) {
+                            return converter;
+                        }
+                    }
+                    return IDENTITY_CONVERSION.asType(MethodType.methodType(targetType, sourceType));
+                }
+            };
+        }
+    };
+
+    /**
+     * Creates a new type converter factory from the available {@link GuardingTypeConverterFactory} instances.
+     *
+     * @param factories the {@link GuardingTypeConverterFactory} instances to compose.
+     */
+    public TypeConverterFactory(Iterable<? extends GuardingTypeConverterFactory> factories) {
+        final List<GuardingTypeConverterFactory> l = new LinkedList<>();
+        final List<ConversionComparator> c = new LinkedList<>();
+        for(GuardingTypeConverterFactory factory: factories) {
+            l.add(factory);
+            if(factory instanceof ConversionComparator) {
+                c.add((ConversionComparator)factory);
+            }
+        }
+        this.factories = l.toArray(new GuardingTypeConverterFactory[l.size()]);
+        this.comparators = c.toArray(new ConversionComparator[c.size()]);
+
+    }
+
+    /**
+     * Similar to {@link MethodHandle#asType(MethodType)} except it also hooks in method handles produced by
+     * {@link GuardingTypeConverterFactory} implementations, providing for language-specific type coercing of
+     * parameters. It will apply {@link MethodHandle#asType(MethodType)} for all primitive-to-primitive,
+     * wrapper-to-primitive, primitive-to-wrapper conversions as well as for all upcasts. For all other conversions,
+     * it'll insert {@link MethodHandles#filterArguments(MethodHandle, int, MethodHandle...)} with composite filters
+     * provided by {@link GuardingTypeConverterFactory} implementations.
+     *
+     * @param handle target method handle
+     * @param fromType the types of source arguments
+     * @return a method handle that is a suitable combination of {@link MethodHandle#asType(MethodType)} and
+     * {@link MethodHandles#filterArguments(MethodHandle, int, MethodHandle...)} with
+     * {@link GuardingTypeConverterFactory} produced type converters as filters.
+     */
+    public MethodHandle asType(MethodHandle handle, final MethodType fromType) {
+        MethodHandle newHandle = handle;
+        final MethodType toType = newHandle.type();
+        final int l = toType.parameterCount();
+        if(l != fromType.parameterCount()) {
+            throw new WrongMethodTypeException("Parameter counts differ: " + handle.type() + " vs. " + fromType);
+        }
+        int pos = 0;
+        final List<MethodHandle> converters = new LinkedList<>();
+        for(int i = 0; i < l; ++i) {
+            final Class<?> fromParamType = fromType.parameterType(i);
+            final Class<?> toParamType = toType.parameterType(i);
+            if(canAutoConvert(fromParamType, toParamType)) {
+                newHandle = applyConverters(newHandle, pos, converters);
+            } else {
+                final MethodHandle converter = getTypeConverterNull(fromParamType, toParamType);
+                if(converter != null) {
+                    if(converters.isEmpty()) {
+                        pos = i;
+                    }
+                    converters.add(converter);
+                } else {
+                    newHandle = applyConverters(newHandle, pos, converters);
+                }
+            }
+        }
+        newHandle = applyConverters(newHandle, pos, converters);
+
+        // Convert return type
+        final Class<?> fromRetType = fromType.returnType();
+        final Class<?> toRetType = toType.returnType();
+        if(fromRetType != Void.TYPE && toRetType != Void.TYPE) {
+            if(!canAutoConvert(toRetType, fromRetType)) {
+                final MethodHandle converter = getTypeConverterNull(toRetType, fromRetType);
+                if(converter != null) {
+                    newHandle = MethodHandles.filterReturnValue(newHandle, converter);
+                }
+            }
+        }
+
+        // Take care of automatic conversions
+        return newHandle.asType(fromType);
+    }
+
+    private static MethodHandle applyConverters(MethodHandle handle, int pos, List<MethodHandle> converters) {
+        if(converters.isEmpty()) {
+            return handle;
+        }
+        final MethodHandle newHandle =
+                MethodHandles.filterArguments(handle, pos, converters.toArray(new MethodHandle[converters.size()]));
+        converters.clear();
+        return newHandle;
+    }
+
+    /**
+     * Returns true if there might exist a conversion between the requested types (either an automatic JVM conversion,
+     * or one provided by any available {@link GuardingTypeConverterFactory}), or false if there definitely does not
+     * exist a conversion between the requested types. Note that returning true does not guarantee that the conversion
+     * will succeed at runtime (notably, if the "from" or "to" types are sufficiently generic), but returning false
+     * guarantees that it would fail.
+     *
+     * @param from the source type for the conversion
+     * @param to the target type for the conversion
+     * @return true if there can be a conversion, false if there can not.
+     */
+    public boolean canConvert(final Class<?> from, final Class<?> to) {
+        return canAutoConvert(from, to) || getTypeConverterNull(from, to) != null;
+    }
+
+    /**
+     * Determines which of the two type conversions from a source type to the two target types is preferred. This is
+     * used for dynamic overloaded method resolution. If the source type is convertible to exactly one target type with
+     * a method invocation conversion, it is chosen, otherwise available {@link ConversionComparator}s are consulted.
+     * @param sourceType the source type.
+     * @param targetType1 one potential target type
+     * @param targetType2 another potential target type.
+     * @return one of Comparison constants that establish which - if any - of the target types is preferable for the
+     * conversion.
+     */
+    public Comparison compareConversion(Class<?> sourceType, Class<?> targetType1, Class<?> targetType2) {
+        for(ConversionComparator comparator: comparators) {
+            final Comparison result = comparator.compareConversion(sourceType, targetType1, targetType2);
+            if(result != Comparison.INDETERMINATE) {
+                return result;
+            }
+        }
+        if(TypeUtilities.isMethodInvocationConvertible(sourceType, targetType1)) {
+            if(!TypeUtilities.isMethodInvocationConvertible(sourceType, targetType2)) {
+                return Comparison.TYPE_1_BETTER;
+            }
+        } else if(TypeUtilities.isMethodInvocationConvertible(sourceType, targetType2)) {
+            return Comparison.TYPE_2_BETTER;
+        }
+        return Comparison.INDETERMINATE;
+    }
+
+    /**
+     * Determines whether it's safe to perform an automatic conversion between the source and target class.
+     *
+     * @param fromType convert from this class
+     * @param toType convert to this class
+     * @return true if it's safe to let MethodHandles.convertArguments() to handle this conversion.
+     */
+    /*private*/ static boolean canAutoConvert(final Class<?> fromType, final Class<?> toType) {
+        return TypeUtilities.isMethodInvocationConvertible(fromType, toType);
+    }
+
+    /*private*/ MethodHandle getTypeConverterNull(Class<?> sourceType, Class<?> targetType) {
+        final MethodHandle converter = converterMap.get(sourceType).get(targetType);
+        return converter == IDENTITY_CONVERSION ? null : converter;
+    }
+
+    /**
+     * Given a source and target type, returns a method handle that converts between them. Never returns null; in worst
+     * case it will return an identity conversion (that might fail for some values at runtime). You can use this method
+     * if you have a piece of your program that is written in Java, and you need to reuse existing type conversion
+     * machinery in a non-invokedynamic context.
+     * @param sourceType the type to convert from
+     * @param targetType the type to convert to
+     * @return a method handle performing the conversion.
+     */
+    public MethodHandle getTypeConverter(Class<?> sourceType, Class<?> targetType) {
+        return converterIdentityMap.get(sourceType).get(targetType);
+    }
+
+    /*private*/ MethodHandle createConverter(Class<?> sourceType, Class<?> targetType) throws Exception {
+        final MethodType type = MethodType.methodType(targetType, sourceType);
+        final MethodHandle identity = IDENTITY_CONVERSION.asType(type);
+        MethodHandle last = identity;
+        for(int i = factories.length; i-- > 0;) {
+            final GuardedInvocation next = factories[i].convertToType(sourceType, targetType);
+            if(next != null) {
+                next.assertType(type);
+                last = next.compose(last);
+            }
+        }
+        return last == identity ? IDENTITY_CONVERSION : last;
+    }
+
+    /*private*/ static final MethodHandle IDENTITY_CONVERSION = MethodHandles.identity(Object.class);
+}
\ No newline at end of file
diff --git a/nashorn/src/jdk/internal/dynalink/support/TypeUtilities.java b/nashorn/src/jdk/internal/dynalink/support/TypeUtilities.java
new file mode 100644
index 00000000000..a534b091b26
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/support/TypeUtilities.java
@@ -0,0 +1,442 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.support;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.IdentityHashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Various static utility methods for testing type relationships.
+ *
+ * @author Attila Szegedi
+ */
+public class TypeUtilities {
+    static final Class<Object> OBJECT_CLASS = Object.class;
+
+    private TypeUtilities() {
+    }
+
+    /**
+     * Given two types represented by c1 and c2, returns a type that is their most specific common superclass or
+     * superinterface.
+     *
+     * @param c1 one type
+     * @param c2 another type
+     * @return their most common superclass or superinterface. If they have several unrelated superinterfaces as their
+     * most specific common type, or the types themselves are completely unrelated interfaces, {@link java.lang.Object}
+     * is returned.
+     */
+    public static Class<?> getMostSpecificCommonType(Class<?> c1, Class<?> c2) {
+        if(c1 == c2) {
+            return c1;
+        }
+        Class<?> c3 = c2;
+        if(c3.isPrimitive()) {
+            if(c3 == Byte.TYPE)
+                c3 = Byte.class;
+            else if(c3 == Short.TYPE)
+                c3 = Short.class;
+            else if(c3 == Character.TYPE)
+                c3 = Character.class;
+            else if(c3 == Integer.TYPE)
+                c3 = Integer.class;
+            else if(c3 == Float.TYPE)
+                c3 = Float.class;
+            else if(c3 == Long.TYPE)
+                c3 = Long.class;
+            else if(c3 == Double.TYPE)
+                c3 = Double.class;
+        }
+        Set<Class<?>> a1 = getAssignables(c1, c3);
+        Set<Class<?>> a2 = getAssignables(c3, c1);
+        a1.retainAll(a2);
+        if(a1.isEmpty()) {
+            // Can happen when at least one of the arguments is an interface,
+            // as they don't have Object at the root of their hierarchy.
+            return Object.class;
+        }
+        // Gather maximally specific elements. Yes, there can be more than one
+        // thank to interfaces. I.e., if you call this method for String.class
+        // and Number.class, you'll have Comparable, Serializable, and Object
+        // as maximal elements.
+        List<Class<?>> max = new ArrayList<>();
+        outer: for(Class<?> clazz: a1) {
+            for(Iterator<Class<?>> maxiter = max.iterator(); maxiter.hasNext();) {
+                Class<?> maxClazz = maxiter.next();
+                if(isSubtype(maxClazz, clazz)) {
+                    // It can't be maximal, if there's already a more specific
+                    // maximal than it.
+                    continue outer;
+                }
+                if(isSubtype(clazz, maxClazz)) {
+                    // If it's more specific than a currently maximal element,
+                    // that currently maximal is no longer a maximal.
+                    maxiter.remove();
+                }
+            }
+            // If we get here, no current maximal is more specific than the
+            // current class, so it is considered maximal as well
+            max.add(clazz);
+        }
+        if(max.size() > 1) {
+            return OBJECT_CLASS;
+        }
+        return max.get(0);
+    }
+
+    private static Set<Class<?>> getAssignables(Class<?> c1, Class<?> c2) {
+        Set<Class<?>> s = new HashSet<>();
+        collectAssignables(c1, c2, s);
+        return s;
+    }
+
+    private static void collectAssignables(Class<?> c1, Class<?> c2, Set<Class<?>> s) {
+        if(c1.isAssignableFrom(c2)) {
+            s.add(c1);
+        }
+        Class<?> sc = c1.getSuperclass();
+        if(sc != null) {
+            collectAssignables(sc, c2, s);
+        }
+        Class<?>[] itf = c1.getInterfaces();
+        for(int i = 0; i < itf.length; ++i) {
+            collectAssignables(itf[i], c2, s);
+        }
+    }
+
+    private static final Map<Class<?>, Class<?>> WRAPPER_TYPES = createWrapperTypes();
+    private static final Map<Class<?>, Class<?>> PRIMITIVE_TYPES = invertMap(WRAPPER_TYPES);
+    private static final Map<String, Class<?>> PRIMITIVE_TYPES_BY_NAME = createClassNameMapping(WRAPPER_TYPES.keySet());
+
+    private static Map<Class<?>, Class<?>> createWrapperTypes() {
+        final Map<Class<?>, Class<?>> wrapperTypes = new IdentityHashMap<>(8);
+        wrapperTypes.put(Boolean.TYPE, Boolean.class);
+        wrapperTypes.put(Byte.TYPE, Byte.class);
+        wrapperTypes.put(Character.TYPE, Character.class);
+        wrapperTypes.put(Short.TYPE, Short.class);
+        wrapperTypes.put(Integer.TYPE, Integer.class);
+        wrapperTypes.put(Long.TYPE, Long.class);
+        wrapperTypes.put(Float.TYPE, Float.class);
+        wrapperTypes.put(Double.TYPE, Double.class);
+        return Collections.unmodifiableMap(wrapperTypes);
+    }
+
+    private static Map<String, Class<?>> createClassNameMapping(Collection<Class<?>> classes) {
+        final Map<String, Class<?>> map = new HashMap<>();
+        for(Class<?> clazz: classes) {
+            map.put(clazz.getName(), clazz);
+        }
+        return map;
+    }
+
+    private static <K, V> Map<V, K> invertMap(Map<K, V> map) {
+        final Map<V, K> inverted = new IdentityHashMap<>(map.size());
+        for(Map.Entry<K, V> entry: map.entrySet()) {
+            inverted.put(entry.getValue(), entry.getKey());
+        }
+        return Collections.unmodifiableMap(inverted);
+    }
+
+    /**
+     * Determines whether one type can be converted to another type using a method invocation conversion, as per JLS 5.3
+     * "Method Invocation Conversion". This is basically all conversions allowed by subtyping (see
+     * {@link #isSubtype(Class, Class)}) as well as boxing conversion (JLS 5.1.7) optionally followed by widening
+     * reference conversion and unboxing conversion (JLS 5.1.8) optionally followed by widening primitive conversion.
+     *
+     * @param callSiteType the parameter type at the call site
+     * @param methodType the parameter type in the method declaration
+     * @return true if callSiteType is method invocation convertible to the methodType.
+     */
+    public static boolean isMethodInvocationConvertible(Class<?> callSiteType, Class<?> methodType) {
+        if(methodType.isAssignableFrom(callSiteType)) {
+            return true;
+        }
+        if(callSiteType.isPrimitive()) {
+            if(methodType.isPrimitive()) {
+                return isProperPrimitiveSubtype(callSiteType, methodType);
+            }
+            // Boxing + widening reference conversion
+            return methodType.isAssignableFrom(WRAPPER_TYPES.get(callSiteType));
+        }
+        if(methodType.isPrimitive()) {
+            final Class<?> unboxedCallSiteType = PRIMITIVE_TYPES.get(callSiteType);
+            return unboxedCallSiteType != null
+                    && (unboxedCallSiteType == methodType || isProperPrimitiveSubtype(unboxedCallSiteType, methodType));
+        }
+        return false;
+    }
+
+    /**
+     * Determines whether one type can be potentially converted to another type at runtime. Allows a conversion between
+     * any subtype and supertype in either direction, and also allows a conversion between any two primitive types, as
+     * well as between any primitive type and any reference type that can hold a boxed primitive.
+     *
+     * @param callSiteType the parameter type at the call site
+     * @param methodType the parameter type in the method declaration
+     * @return true if callSiteType is potentially convertible to the methodType.
+     */
+    public static boolean isPotentiallyConvertible(Class<?> callSiteType, Class<?> methodType) {
+        // Widening or narrowing reference conversion
+        if(methodType.isAssignableFrom(callSiteType) || callSiteType.isAssignableFrom(methodType)) {
+            return true;
+        }
+        if(callSiteType.isPrimitive()) {
+            // Allow any conversion among primitives, as well as from any
+            // primitive to any type that can receive a boxed primitive.
+            // TODO: narrow this a bit, i.e. allow, say, boolean to Character?
+            // MethodHandles.convertArguments() allows it, so we might need to
+            // too.
+            return methodType.isPrimitive() || isAssignableFromBoxedPrimitive(methodType);
+        }
+        if(methodType.isPrimitive()) {
+            // Allow conversion from any reference type that can contain a
+            // boxed primitive to any primitive.
+            // TODO: narrow this a bit too?
+            return isAssignableFromBoxedPrimitive(callSiteType);
+        }
+        return false;
+    }
+
+    /**
+     * Determines whether one type is a subtype of another type, as per JLS 4.10 "Subtyping". Note: this is not strict
+     * or proper subtype, therefore true is also returned for identical types; to be completely precise, it allows
+     * identity conversion (JLS 5.1.1), widening primitive conversion (JLS 5.1.2) and widening reference conversion (JLS
+     * 5.1.5).
+     *
+     * @param subType the supposed subtype
+     * @param superType the supposed supertype of the subtype
+     * @return true if subType can be converted by identity conversion, widening primitive conversion, or widening
+     * reference conversion to superType.
+     */
+    public static boolean isSubtype(Class<?> subType, Class<?> superType) {
+        // Covers both JLS 4.10.2 "Subtyping among Class and Interface Types"
+        // and JLS 4.10.3 "Subtyping among Array Types", as well as primitive
+        // type identity.
+        if(superType.isAssignableFrom(subType)) {
+            return true;
+        }
+        // JLS 4.10.1 "Subtyping among Primitive Types". Note we don't test for
+        // identity, as identical types were taken care of in the
+        // isAssignableFrom test. As per 4.10.1, the supertype relation is as
+        // follows:
+        // double > float
+        // float > long
+        // long > int
+        // int > short
+        // int > char
+        // short > byte
+        if(superType.isPrimitive() && subType.isPrimitive()) {
+            return isProperPrimitiveSubtype(subType, superType);
+        }
+        return false;
+    }
+
+    /**
+     * Returns true if a supposed primitive subtype is a proper subtype ( meaning, subtype and not identical) of the
+     * supposed primitive supertype
+     *
+     * @param subType the supposed subtype
+     * @param superType the supposed supertype
+     * @return true if subType is a proper (not identical to) primitive subtype of the superType
+     */
+    private static boolean isProperPrimitiveSubtype(Class<?> subType, Class<?> superType) {
+        if(superType == boolean.class || subType == boolean.class) {
+            return false;
+        }
+        if(subType == byte.class) {
+            return superType != char.class;
+        }
+        if(subType == char.class) {
+            return superType != short.class && superType != byte.class;
+        }
+        if(subType == short.class) {
+            return superType != char.class && superType != byte.class;
+        }
+        if(subType == int.class) {
+            return superType == long.class || superType == float.class || superType == double.class;
+        }
+        if(subType == long.class) {
+            return superType == float.class || superType == double.class;
+        }
+        if(subType == float.class) {
+            return superType == double.class;
+        }
+        return false;
+    }
+
+    private static final Map<Class<?>, Class<?>> WRAPPER_TO_PRIMITIVE_TYPES = createWrapperToPrimitiveTypes();
+
+    private static Map<Class<?>, Class<?>> createWrapperToPrimitiveTypes() {
+        final Map<Class<?>, Class<?>> classes = new IdentityHashMap<>();
+        classes.put(Void.class, Void.TYPE);
+        classes.put(Boolean.class, Boolean.TYPE);
+        classes.put(Byte.class, Byte.TYPE);
+        classes.put(Character.class, Character.TYPE);
+        classes.put(Short.class, Short.TYPE);
+        classes.put(Integer.class, Integer.TYPE);
+        classes.put(Long.class, Long.TYPE);
+        classes.put(Float.class, Float.TYPE);
+        classes.put(Double.class, Double.TYPE);
+        return classes;
+    }
+
+    private static final Set<Class<?>> PRIMITIVE_WRAPPER_TYPES = createPrimitiveWrapperTypes();
+
+    private static Set<Class<?>> createPrimitiveWrapperTypes() {
+        final Map<Class<?>, Class<?>> classes = new IdentityHashMap<>();
+        addClassHierarchy(classes, Boolean.class);
+        addClassHierarchy(classes, Byte.class);
+        addClassHierarchy(classes, Character.class);
+        addClassHierarchy(classes, Short.class);
+        addClassHierarchy(classes, Integer.class);
+        addClassHierarchy(classes, Long.class);
+        addClassHierarchy(classes, Float.class);
+        addClassHierarchy(classes, Double.class);
+        return classes.keySet();
+    }
+
+    private static void addClassHierarchy(Map<Class<?>, Class<?>> map, Class<?> clazz) {
+        if(clazz == null) {
+            return;
+        }
+        map.put(clazz, clazz);
+        addClassHierarchy(map, clazz.getSuperclass());
+        for(Class<?> itf: clazz.getInterfaces()) {
+            addClassHierarchy(map, itf);
+        }
+    }
+
+    /**
+     * Returns true if the class can be assigned from any boxed primitive.
+     *
+     * @param clazz the class
+     * @return true if the class can be assigned from any boxed primitive. Basically, it is true if the class is any
+     * primitive wrapper class, or a superclass or superinterface of any primitive wrapper class.
+     */
+    private static boolean isAssignableFromBoxedPrimitive(Class<?> clazz) {
+        return PRIMITIVE_WRAPPER_TYPES.contains(clazz);
+    }
+
+    /**
+     * Given a name of a primitive type (except "void"), returns the class representing it. I.e. when invoked with
+     * "int", returns {@link Integer#TYPE}.
+     * @param name the name of the primitive type
+     * @return the class representing the primitive type, or null if the name does not correspond to a primitive type
+     * or is "void".
+     */
+    public static Class<?> getPrimitiveTypeByName(String name) {
+        return PRIMITIVE_TYPES_BY_NAME.get(name);
+    }
+
+    /**
+     * When passed a class representing a wrapper for a primitive type, returns the class representing the corresponding
+     * primitive type. I.e. calling it with {@code Integer.class} will return {@code Integer.TYPE}. If passed a class
+     * that is not a wrapper for primitive type, returns null.
+     * @param wrapperType the class object representing a wrapper for a primitive type
+     * @return the class object representing the primitive type, or null if the passed class is not a primitive wrapper.
+     */
+    public static Class<?> getPrimitiveType(Class<?> wrapperType) {
+        return WRAPPER_TO_PRIMITIVE_TYPES.get(wrapperType);
+    }
+
+
+    /**
+     * When passed a class representing a primitive type, returns the class representing the corresponding
+     * wrapper type. I.e. calling it with {@code int.class} will return {@code Integer.class}. If passed a class
+     * that is not a primitive type, returns null.
+     * @param primitiveType the class object representing a primitive type
+     * @return the class object representing the wrapper type, or null if the passed class is not a primitive.
+     */
+    public static Class<?> getWrapperType(Class<?> primitiveType) {
+        return WRAPPER_TYPES.get(primitiveType);
+    }
+}
\ No newline at end of file
diff --git a/nashorn/src/jdk/internal/dynalink/support/UnnamedDynCallSiteDescriptor.java b/nashorn/src/jdk/internal/dynalink/support/UnnamedDynCallSiteDescriptor.java
new file mode 100644
index 00000000000..716080022fb
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/support/UnnamedDynCallSiteDescriptor.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.support;
+
+import java.lang.invoke.MethodType;
+import jdk.internal.dynalink.CallSiteDescriptor;
+
+
+class UnnamedDynCallSiteDescriptor extends AbstractCallSiteDescriptor {
+    private final MethodType methodType;
+    private final String op;
+
+    UnnamedDynCallSiteDescriptor(String op, MethodType methodType) {
+        this.op = op;
+        this.methodType = methodType;
+    }
+
+    @Override
+    public int getNameTokenCount() {
+        return 2;
+    }
+
+    String getOp() {
+        return op;
+    }
+
+    @Override
+    public String getNameToken(int i) {
+        switch(i) {
+            case 0: return "dyn";
+            case 1: return op;
+            default: throw new IndexOutOfBoundsException(String.valueOf(i));
+        }
+    }
+
+    @Override
+    public MethodType getMethodType() {
+        return methodType;
+    }
+
+    @Override
+    public CallSiteDescriptor changeMethodType(MethodType newMethodType) {
+        return CallSiteDescriptorFactory.getCanonicalPublicDescriptor(new UnnamedDynCallSiteDescriptor(op,
+                newMethodType));
+    }
+}
diff --git a/nashorn/src/jdk/internal/dynalink/support/messages.properties b/nashorn/src/jdk/internal/dynalink/support/messages.properties
new file mode 100644
index 00000000000..eaf1f630d09
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/support/messages.properties
@@ -0,0 +1,86 @@
+#  Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+#  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+#  This code is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License version 2 only, as
+#  published by the Free Software Foundation.  Oracle designates this
+#  particular file as subject to the "Classpath" exception as provided
+#  by Oracle in the LICENSE file that accompanied this code.
+#
+#  This code is distributed in the hope that it will be useful, but WITHOUT
+#  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#  version 2 for more details (a copy is included in the LICENSE file that
+#  accompanied this code).
+#
+#  You should have received a copy of the GNU General Public License version
+#  2 along with this work; if not, write to the Free Software Foundation,
+#  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+#  Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+#  or visit www.oracle.com if you need additional information or have any
+#  questions.
+
+#  This file is available under and governed by the GNU General Public
+#  License version 2 only, as published by the Free Software Foundation.
+#  However, the following notice accompanied the original version of this
+#  file, and Oracle licenses the original version of this file under the BSD
+#  license:
+#
+#  Copyright 2009-2013 Attila Szegedi
+#
+#  Licensed under both the Apache License, Version 2.0 (the "Apache License")
+#  and the BSD License (the "BSD License"), with licensee being free to
+#  choose either of the two at their discretion.
+#
+#  You may not use this file except in compliance with either the Apache
+#  License or the BSD License.
+#
+#  If you choose to use this file in compliance with the Apache License, the
+#  following notice applies to you:
+#
+#      You may obtain a copy of the Apache License at
+#
+#          http://www.apache.org/licenses/LICENSE-2.0
+#
+#      Unless required by applicable law or agreed to in writing, software
+#      distributed under the License is distributed on an "AS IS" BASIS,
+#      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+#      implied. See the License for the specific language governing
+#      permissions and limitations under the License.
+#
+#  If you choose to use this file in compliance with the BSD License, the
+#  following notice applies to you:
+#
+#      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 with the distribution.
+#      * Neither the name of the copyright holder nor the names of
+#        contributors may be used to endorse or promote products derived from
+#        this software without specific prior written permission.
+#
+#      THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+#      IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+#      TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+#      PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+#      BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#      CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+#      SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+#      BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#      WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#      OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#      ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+isInstanceGuardAlwaysTrue=isInstance guard for {0} in position {1} in method type {2} will always return true
+isInstanceGuardAlwaysFalse=isInstance guard for {0} in position {1} in method type {2} will always return false
+
+isOfClassGuardAlwaysTrue=isOfClass guard for {0} in position {1} in method type {2} will always return true
+isOfClassGuardAlwaysFalse=isOfClass guard for {0} in position {1} in method type {2} will always return false
+
+isArrayGuardAlwaysTrue=isArray guard in position {0} in method type {1} will always return true
+isArrayGuardAlwaysFalse=isArray guard in position {0} in method type {1} will always return false
\ No newline at end of file
diff --git a/nashorn/src/jdk/internal/dynalink/support/package.html b/nashorn/src/jdk/internal/dynalink/support/package.html
new file mode 100644
index 00000000000..7bf9efcdc21
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/support/package.html
@@ -0,0 +1,89 @@
+<!--
+   Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+
+   This code is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License version 2 only, as
+   published by the Free Software Foundation.  Oracle designates this
+   particular file as subject to the "Classpath" exception as provided
+   by Oracle in the LICENSE file that accompanied this code.
+
+   This code is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+   version 2 for more details (a copy is included in the LICENSE file that
+   accompanied this code).
+
+   You should have received a copy of the GNU General Public License version
+   2 along with this work; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+
+   Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+   or visit www.oracle.com if you need additional information or have any
+   questions.
+-->
+
+<!--
+   This file is available under and governed by the GNU General Public
+   License version 2 only, as published by the Free Software Foundation.
+   However, the following notice accompanied the original version of this
+   file, and Oracle licenses the original version of this file under the BSD
+   license:
+
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+  <body>
+    <p>
+      Contains supporting classes for other packages. There is no guarantee that
+      any of these classes or interfaces will not change in a manner that breaks
+      backwards compatibility; they are not considered to be part of the public
+      API.
+    </p>
+  </body>
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java b/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
index 23f38749068..dc5b2e206c9 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
@@ -31,6 +31,7 @@ import static jdk.nashorn.internal.codegen.CompilerConstants.LAZY;
 import static jdk.nashorn.internal.codegen.CompilerConstants.SCOPE;
 import static jdk.nashorn.internal.codegen.CompilerConstants.SOURCE;
 import static jdk.nashorn.internal.codegen.CompilerConstants.THIS;
+
 import java.io.File;
 import java.util.Arrays;
 import java.util.EnumSet;
@@ -40,6 +41,7 @@ import java.util.LinkedList;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import jdk.internal.dynalink.support.NameCodec;
 import jdk.nashorn.internal.codegen.ClassEmitter.Flag;
 import jdk.nashorn.internal.codegen.types.Type;
 import jdk.nashorn.internal.ir.FunctionNode;
@@ -49,7 +51,6 @@ import jdk.nashorn.internal.runtime.Context;
 import jdk.nashorn.internal.runtime.DebugLogger;
 import jdk.nashorn.internal.runtime.Source;
 import jdk.nashorn.internal.runtime.options.Options;
-import org.dynalang.dynalink.support.NameCodec;
 
 /**
  * Responsible for converting JavaScripts to java byte code. Main entry
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java b/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java
index 8553f9a9dd7..4aaa8fecbbe 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java
@@ -71,6 +71,7 @@ import java.lang.reflect.Array;
 import java.util.ArrayDeque;
 import java.util.EnumSet;
 import java.util.Iterator;
+import jdk.internal.dynalink.support.NameCodec;
 import jdk.internal.org.objectweb.asm.Handle;
 import jdk.internal.org.objectweb.asm.MethodVisitor;
 import jdk.nashorn.internal.codegen.ClassEmitter.Flag;
@@ -94,7 +95,6 @@ import jdk.nashorn.internal.runtime.Scope;
 import jdk.nashorn.internal.runtime.ScriptObject;
 import jdk.nashorn.internal.runtime.linker.Bootstrap;
 import jdk.nashorn.internal.runtime.options.Options;
-import org.dynalang.dynalink.support.NameCodec;
 
 /**
  * This is the main function responsible for emitting method code
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/WeighNodes.java b/nashorn/src/jdk/nashorn/internal/codegen/WeighNodes.java
index 006f1e27e6e..9f2e8be44e0 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/WeighNodes.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/WeighNodes.java
@@ -27,7 +27,6 @@ package jdk.nashorn.internal.codegen;
 
 import java.util.List;
 import java.util.Map;
-
 import jdk.nashorn.internal.codegen.types.Type;
 import jdk.nashorn.internal.ir.AccessNode;
 import jdk.nashorn.internal.ir.BinaryNode;
diff --git a/nashorn/src/jdk/nashorn/internal/ir/Block.java b/nashorn/src/jdk/nashorn/internal/ir/Block.java
index 31448d38a35..e15c51d1788 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/Block.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/Block.java
@@ -39,7 +39,6 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
-
 import jdk.nashorn.internal.codegen.Frame;
 import jdk.nashorn.internal.codegen.MethodEmitter.Label;
 import jdk.nashorn.internal.ir.annotations.Ignore;
diff --git a/nashorn/src/jdk/nashorn/internal/ir/CallNode.java b/nashorn/src/jdk/nashorn/internal/ir/CallNode.java
index 7ddf3a779b4..9e48bc6e8de 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/CallNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/CallNode.java
@@ -28,7 +28,6 @@ package jdk.nashorn.internal.ir;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-
 import jdk.nashorn.internal.codegen.types.Type;
 import jdk.nashorn.internal.ir.annotations.Ignore;
 import jdk.nashorn.internal.ir.visitor.NodeVisitor;
diff --git a/nashorn/src/jdk/nashorn/internal/ir/Node.java b/nashorn/src/jdk/nashorn/internal/ir/Node.java
index 102dc288fb7..24ad87936bb 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/Node.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/Node.java
@@ -26,7 +26,6 @@
 package jdk.nashorn.internal.ir;
 
 import java.util.IdentityHashMap;
-
 import jdk.nashorn.internal.codegen.types.Type;
 import jdk.nashorn.internal.ir.visitor.NodeVisitor;
 import jdk.nashorn.internal.parser.Token;
diff --git a/nashorn/src/jdk/nashorn/internal/ir/Symbol.java b/nashorn/src/jdk/nashorn/internal/ir/Symbol.java
index 081df86604d..92a98ed5f55 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/Symbol.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/Symbol.java
@@ -29,7 +29,6 @@ import java.io.PrintWriter;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.StringTokenizer;
-
 import jdk.nashorn.internal.codegen.types.Type;
 import jdk.nashorn.internal.runtime.Context;
 import jdk.nashorn.internal.runtime.options.Options;
diff --git a/nashorn/src/jdk/nashorn/internal/objects/Global.java b/nashorn/src/jdk/nashorn/internal/objects/Global.java
index 66316d1dca4..3a9ca905a8a 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/Global.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/Global.java
@@ -37,6 +37,8 @@ import java.lang.ref.SoftReference;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import jdk.internal.dynalink.linker.GuardedInvocation;
+import jdk.internal.dynalink.linker.LinkRequest;
 import jdk.nashorn.internal.objects.annotations.Attribute;
 import jdk.nashorn.internal.objects.annotations.Property;
 import jdk.nashorn.internal.objects.annotations.ScriptClass;
@@ -57,8 +59,6 @@ import jdk.nashorn.internal.runtime.ScriptingFunctions;
 import jdk.nashorn.internal.runtime.Source;
 import jdk.nashorn.internal.runtime.linker.InvokeByName;
 import jdk.nashorn.internal.scripts.JO$;
-import org.dynalang.dynalink.linker.GuardedInvocation;
-import org.dynalang.dynalink.linker.LinkRequest;
 
 /**
  * Representation of global scope.
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeBoolean.java b/nashorn/src/jdk/nashorn/internal/objects/NativeBoolean.java
index 4592ad91f4b..a8b79235a33 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeBoolean.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeBoolean.java
@@ -30,6 +30,8 @@ import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
+import jdk.internal.dynalink.linker.GuardedInvocation;
+import jdk.internal.dynalink.linker.LinkRequest;
 import jdk.nashorn.internal.objects.annotations.Attribute;
 import jdk.nashorn.internal.objects.annotations.Constructor;
 import jdk.nashorn.internal.objects.annotations.Function;
@@ -39,8 +41,6 @@ import jdk.nashorn.internal.runtime.ScriptObject;
 import jdk.nashorn.internal.runtime.ScriptRuntime;
 import jdk.nashorn.internal.runtime.linker.MethodHandleFactory;
 import jdk.nashorn.internal.runtime.linker.PrimitiveLookup;
-import org.dynalang.dynalink.linker.GuardedInvocation;
-import org.dynalang.dynalink.linker.LinkRequest;
 
 /**
  * ECMA 15.6 Boolean Objects.
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java b/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java
index f8aafb70bdd..d1981ff8f1f 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java
@@ -35,6 +35,9 @@ import java.lang.invoke.MethodType;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import jdk.internal.dynalink.CallSiteDescriptor;
+import jdk.internal.dynalink.linker.GuardedInvocation;
+import jdk.internal.dynalink.linker.LinkRequest;
 import jdk.nashorn.internal.objects.annotations.Constructor;
 import jdk.nashorn.internal.objects.annotations.ScriptClass;
 import jdk.nashorn.internal.runtime.FindProperty;
@@ -45,9 +48,6 @@ import jdk.nashorn.internal.runtime.ScriptRuntime;
 import jdk.nashorn.internal.runtime.arrays.ArrayLikeIterator;
 import jdk.nashorn.internal.runtime.linker.Lookup;
 import jdk.nashorn.internal.runtime.linker.MethodHandleFactory;
-import org.dynalang.dynalink.CallSiteDescriptor;
-import org.dynalang.dynalink.linker.GuardedInvocation;
-import org.dynalang.dynalink.linker.LinkRequest;
 
 /**
  * This class is the implementation of the Nashorn-specific global object named {@code JSAdapter}. It can be
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java b/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java
index b63e2f5b843..d3d6df992cd 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java
@@ -30,6 +30,8 @@ import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 
 import java.lang.reflect.Array;
 import java.util.Collection;
+import jdk.internal.dynalink.beans.StaticClass;
+import jdk.internal.dynalink.support.TypeUtilities;
 import jdk.nashorn.internal.objects.annotations.Attribute;
 import jdk.nashorn.internal.objects.annotations.Function;
 import jdk.nashorn.internal.objects.annotations.ScriptClass;
@@ -37,8 +39,6 @@ import jdk.nashorn.internal.objects.annotations.Where;
 import jdk.nashorn.internal.runtime.JSType;
 import jdk.nashorn.internal.runtime.ScriptObject;
 import jdk.nashorn.internal.runtime.linker.JavaAdapterFactory;
-import org.dynalang.dynalink.beans.StaticClass;
-import org.dynalang.dynalink.support.TypeUtilities;
 
 /**
  * This class is the implementation for the {@code Java} global object exposed to programs running under Nashorn. This
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeJavaImporter.java b/nashorn/src/jdk/nashorn/internal/objects/NativeJavaImporter.java
index 22923b1c4fd..88d0e6a3473 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeJavaImporter.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeJavaImporter.java
@@ -25,16 +25,16 @@
 
 package jdk.nashorn.internal.objects;
 
+import jdk.internal.dynalink.CallSiteDescriptor;
+import jdk.internal.dynalink.beans.StaticClass;
+import jdk.internal.dynalink.linker.GuardedInvocation;
+import jdk.internal.dynalink.linker.LinkRequest;
 import jdk.nashorn.internal.objects.annotations.Attribute;
 import jdk.nashorn.internal.objects.annotations.Constructor;
 import jdk.nashorn.internal.objects.annotations.Function;
 import jdk.nashorn.internal.objects.annotations.ScriptClass;
 import jdk.nashorn.internal.runtime.NativeJavaPackage;
 import jdk.nashorn.internal.runtime.ScriptObject;
-import org.dynalang.dynalink.CallSiteDescriptor;
-import org.dynalang.dynalink.beans.StaticClass;
-import org.dynalang.dynalink.linker.GuardedInvocation;
-import org.dynalang.dynalink.linker.LinkRequest;
 
 /**
  * This is "JavaImporter" constructor. This constructor allows you to use Java types omitting explicit package names.
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java b/nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java
index b2325d05f91..40aa8c2fba7 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java
@@ -36,6 +36,8 @@ import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.text.NumberFormat;
 import java.util.Locale;
+import jdk.internal.dynalink.linker.GuardedInvocation;
+import jdk.internal.dynalink.linker.LinkRequest;
 import jdk.nashorn.internal.objects.annotations.Attribute;
 import jdk.nashorn.internal.objects.annotations.Constructor;
 import jdk.nashorn.internal.objects.annotations.Function;
@@ -47,8 +49,6 @@ import jdk.nashorn.internal.runtime.ScriptObject;
 import jdk.nashorn.internal.runtime.ScriptRuntime;
 import jdk.nashorn.internal.runtime.linker.MethodHandleFactory;
 import jdk.nashorn.internal.runtime.linker.PrimitiveLookup;
-import org.dynalang.dynalink.linker.GuardedInvocation;
-import org.dynalang.dynalink.linker.LinkRequest;
 
 /**
  * ECMA 15.7 Number Objects.
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeString.java b/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
index 20a40f99737..e4ba4b53d6d 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
@@ -39,6 +39,9 @@ import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.regex.Pattern;
+import jdk.internal.dynalink.CallSiteDescriptor;
+import jdk.internal.dynalink.linker.GuardedInvocation;
+import jdk.internal.dynalink.linker.LinkRequest;
 import jdk.nashorn.internal.objects.annotations.Attribute;
 import jdk.nashorn.internal.objects.annotations.Constructor;
 import jdk.nashorn.internal.objects.annotations.Function;
@@ -56,9 +59,6 @@ import jdk.nashorn.internal.runtime.arrays.ArrayIndex;
 import jdk.nashorn.internal.runtime.linker.MethodHandleFactory;
 import jdk.nashorn.internal.runtime.linker.NashornGuards;
 import jdk.nashorn.internal.runtime.linker.PrimitiveLookup;
-import org.dynalang.dynalink.CallSiteDescriptor;
-import org.dynalang.dynalink.linker.GuardedInvocation;
-import org.dynalang.dynalink.linker.LinkRequest;
 
 
 /**
diff --git a/nashorn/src/jdk/nashorn/internal/parser/Lexer.java b/nashorn/src/jdk/nashorn/internal/parser/Lexer.java
index 2ae029730a9..d7856d44447 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/Lexer.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/Lexer.java
@@ -31,6 +31,7 @@ import static jdk.nashorn.internal.parser.TokenType.EOF;
 import static jdk.nashorn.internal.parser.TokenType.EOL;
 import static jdk.nashorn.internal.parser.TokenType.ERROR;
 import static jdk.nashorn.internal.parser.TokenType.ESCSTRING;
+import static jdk.nashorn.internal.parser.TokenType.EXECSTRING;
 import static jdk.nashorn.internal.parser.TokenType.FLOATING;
 import static jdk.nashorn.internal.parser.TokenType.HEXADECIMAL;
 import static jdk.nashorn.internal.parser.TokenType.LBRACE;
@@ -40,7 +41,6 @@ import static jdk.nashorn.internal.parser.TokenType.RBRACE;
 import static jdk.nashorn.internal.parser.TokenType.REGEX;
 import static jdk.nashorn.internal.parser.TokenType.RPAREN;
 import static jdk.nashorn.internal.parser.TokenType.STRING;
-import static jdk.nashorn.internal.parser.TokenType.EXECSTRING;
 import static jdk.nashorn.internal.parser.TokenType.XML;
 
 import jdk.nashorn.internal.runtime.ECMAErrors;
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/GlobalObject.java b/nashorn/src/jdk/nashorn/internal/runtime/GlobalObject.java
index 8e30da7fcbe..b802a1a136f 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/GlobalObject.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/GlobalObject.java
@@ -26,8 +26,8 @@
 package jdk.nashorn.internal.runtime;
 
 import java.lang.invoke.MethodHandle;
-import org.dynalang.dynalink.linker.GuardedInvocation;
-import org.dynalang.dynalink.linker.LinkRequest;
+import jdk.internal.dynalink.linker.GuardedInvocation;
+import jdk.internal.dynalink.linker.LinkRequest;
 
 /**
  * Runtime interface to the global scope of the current context.
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/JSType.java b/nashorn/src/jdk/nashorn/internal/runtime/JSType.java
index 32d940fa7f2..06010b805b4 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/JSType.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/JSType.java
@@ -28,9 +28,9 @@ package jdk.nashorn.internal.runtime;
 import static jdk.nashorn.internal.codegen.CompilerConstants.staticCall;
 import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
 
+import jdk.internal.dynalink.beans.StaticClass;
 import jdk.nashorn.internal.codegen.CompilerConstants.Call;
 import jdk.nashorn.internal.parser.Lexer;
-import org.dynalang.dynalink.beans.StaticClass;
 
 /**
  * Representation for ECMAScript types - this maps directly to the ECMA script standard
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/NativeJavaPackage.java b/nashorn/src/jdk/nashorn/internal/runtime/NativeJavaPackage.java
index 296473a390b..d75abd35845 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/NativeJavaPackage.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/NativeJavaPackage.java
@@ -25,13 +25,13 @@
 
 package jdk.nashorn.internal.runtime;
 
+import jdk.internal.dynalink.CallSiteDescriptor;
+import jdk.internal.dynalink.beans.StaticClass;
+import jdk.internal.dynalink.linker.GuardedInvocation;
+import jdk.internal.dynalink.linker.LinkRequest;
 import jdk.nashorn.internal.objects.NativeJava;
 import jdk.nashorn.internal.objects.annotations.Attribute;
 import jdk.nashorn.internal.objects.annotations.Function;
-import org.dynalang.dynalink.CallSiteDescriptor;
-import org.dynalang.dynalink.beans.StaticClass;
-import org.dynalang.dynalink.linker.GuardedInvocation;
-import org.dynalang.dynalink.linker.LinkRequest;
 
 /**
  * An object that exposes Java packages and classes as its properties. Packages are exposed as objects that have further
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
index 48525058a72..c3901d29198 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
@@ -33,14 +33,14 @@ import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
+import jdk.internal.dynalink.CallSiteDescriptor;
+import jdk.internal.dynalink.linker.GuardedInvocation;
+import jdk.internal.dynalink.linker.LinkRequest;
 import jdk.nashorn.internal.codegen.CompilerConstants.Call;
 import jdk.nashorn.internal.objects.annotations.SpecializedFunction;
 import jdk.nashorn.internal.runtime.linker.MethodHandleFactory;
 import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
 import jdk.nashorn.internal.runtime.linker.NashornGuards;
-import org.dynalang.dynalink.CallSiteDescriptor;
-import org.dynalang.dynalink.linker.GuardedInvocation;
-import org.dynalang.dynalink.linker.LinkRequest;
 
 /**
  * Runtime representation of a JavaScript function.
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptLoader.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptLoader.java
index 689ca1ab5a9..d632166270a 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptLoader.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptLoader.java
@@ -39,6 +39,12 @@ final class ScriptLoader extends NashornLoader {
         super(parent, context);
     }
 
+    @Override
+    protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
+        checkPackageAccess(name);
+        return super.loadClassTrusted(name, resolve);
+    }
+
     // package-private and private stuff below this point
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
index 33a68a8cd26..85cf460f8a1 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
@@ -55,6 +55,10 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import jdk.internal.dynalink.CallSiteDescriptor;
+import jdk.internal.dynalink.linker.GuardedInvocation;
+import jdk.internal.dynalink.linker.LinkRequest;
+import jdk.internal.dynalink.support.CallSiteDescriptorFactory;
 import jdk.nashorn.internal.codegen.CompilerConstants.Call;
 import jdk.nashorn.internal.codegen.objects.ObjectClassGenerator;
 import jdk.nashorn.internal.objects.AccessorPropertyDescriptor;
@@ -65,10 +69,6 @@ import jdk.nashorn.internal.runtime.linker.Lookup;
 import jdk.nashorn.internal.runtime.linker.MethodHandleFactory;
 import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
 import jdk.nashorn.internal.runtime.linker.NashornGuards;
-import org.dynalang.dynalink.CallSiteDescriptor;
-import org.dynalang.dynalink.linker.GuardedInvocation;
-import org.dynalang.dynalink.linker.LinkRequest;
-import org.dynalang.dynalink.support.CallSiteDescriptorFactory;
 
 /**
  * Base class for generic JavaScript objects.
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java
index 3c910f4344c..c49ce203c72 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java
@@ -38,11 +38,11 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 import java.util.Objects;
+import jdk.internal.dynalink.beans.StaticClass;
 import jdk.nashorn.internal.codegen.CompilerConstants.Call;
 import jdk.nashorn.internal.ir.debug.JSONWriter;
 import jdk.nashorn.internal.parser.Lexer;
 import jdk.nashorn.internal.runtime.linker.Bootstrap;
-import org.dynalang.dynalink.beans.StaticClass;
 
 
 /**
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/SetMethodCreator.java b/nashorn/src/jdk/nashorn/internal/runtime/SetMethodCreator.java
index 6bd3a3fdcc4..8e430f45870 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/SetMethodCreator.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/SetMethodCreator.java
@@ -29,18 +29,17 @@ import static jdk.nashorn.internal.runtime.ECMAErrors.referenceError;
 import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
-
+import jdk.internal.dynalink.CallSiteDescriptor;
+import jdk.internal.dynalink.linker.GuardedInvocation;
 import jdk.nashorn.internal.codegen.objects.ObjectClassGenerator;
 import jdk.nashorn.internal.runtime.linker.Lookup;
 import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
 import jdk.nashorn.internal.runtime.linker.NashornGuards;
 
-import org.dynalang.dynalink.CallSiteDescriptor;
-import org.dynalang.dynalink.linker.GuardedInvocation;
 
 /**
  * Instances of this class are quite ephemeral; they only exist for the duration of an invocation of
- * {@link ScriptObject#findSetMethod(CallSiteDescriptor, org.dynalang.dynalink.linker.LinkRequest)} and
+ * {@link ScriptObject#findSetMethod(CallSiteDescriptor, jdk.internal.dynalink.linker.LinkRequest)} and
  * serve as the actual encapsulation of the algorithm for creating an appropriate property setter method.
  */
 final class SetMethodCreator {
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/StructureLoader.java b/nashorn/src/jdk/nashorn/internal/runtime/StructureLoader.java
index b14e43ccd31..2c50382e462 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/StructureLoader.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/StructureLoader.java
@@ -58,8 +58,6 @@ final class StructureLoader extends NashornLoader {
 
     @Override
     protected synchronized Class<?> loadClass(final String name, final boolean resolve) throws ClassNotFoundException {
-        checkPackageAccess(name);
-
         // check the cache first
         final Class<?> loadedClass = findLoadedClass(name);
         if (loadedClass != null) {
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Undefined.java b/nashorn/src/jdk/nashorn/internal/runtime/Undefined.java
index 41024e500ae..6d9c69c156f 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/Undefined.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Undefined.java
@@ -31,10 +31,10 @@ import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
-import org.dynalang.dynalink.CallSiteDescriptor;
-import org.dynalang.dynalink.linker.GuardedInvocation;
-import org.dynalang.dynalink.support.CallSiteDescriptorFactory;
-import org.dynalang.dynalink.support.Guards;
+import jdk.internal.dynalink.CallSiteDescriptor;
+import jdk.internal.dynalink.linker.GuardedInvocation;
+import jdk.internal.dynalink.support.CallSiteDescriptorFactory;
+import jdk.internal.dynalink.support.Guards;
 
 /**
  * Unique instance of this class is used to represent JavaScript undefined.
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java b/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java
index b16cf923acb..e42088c2626 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java
@@ -29,11 +29,11 @@ import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
+import jdk.internal.dynalink.CallSiteDescriptor;
+import jdk.internal.dynalink.linker.GuardedInvocation;
+import jdk.internal.dynalink.linker.LinkRequest;
+import jdk.internal.dynalink.support.CallSiteDescriptorFactory;
 import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
-import org.dynalang.dynalink.CallSiteDescriptor;
-import org.dynalang.dynalink.linker.GuardedInvocation;
-import org.dynalang.dynalink.linker.LinkRequest;
-import org.dynalang.dynalink.support.CallSiteDescriptorFactory;
 
 
 /**
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/Bootstrap.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/Bootstrap.java
index 73d3663a978..3c5e2d81b51 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/Bootstrap.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/Bootstrap.java
@@ -32,15 +32,15 @@ import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodHandles.Lookup;
 import java.lang.invoke.MethodType;
+import jdk.internal.dynalink.CallSiteDescriptor;
+import jdk.internal.dynalink.DynamicLinker;
+import jdk.internal.dynalink.DynamicLinkerFactory;
+import jdk.internal.dynalink.beans.BeansLinker;
+import jdk.internal.dynalink.linker.GuardedInvocation;
+import jdk.internal.dynalink.linker.LinkerServices;
 import jdk.nashorn.internal.codegen.CompilerConstants.Call;
 import jdk.nashorn.internal.codegen.RuntimeCallSite;
 import jdk.nashorn.internal.runtime.options.Options;
-import org.dynalang.dynalink.CallSiteDescriptor;
-import org.dynalang.dynalink.DynamicLinker;
-import org.dynalang.dynalink.DynamicLinkerFactory;
-import org.dynalang.dynalink.beans.BeansLinker;
-import org.dynalang.dynalink.linker.GuardedInvocation;
-import org.dynalang.dynalink.linker.LinkerServices;
 
 /**
  * This class houses bootstrap method for invokedynamic instructions generated by compiler.
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java
index 5ec1f4c9831..458469afe9f 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java
@@ -29,14 +29,14 @@ import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.util.Objects;
+import jdk.internal.dynalink.CallSiteDescriptor;
+import jdk.internal.dynalink.linker.GuardedInvocation;
+import jdk.internal.dynalink.linker.LinkRequest;
+import jdk.internal.dynalink.linker.LinkerServices;
+import jdk.internal.dynalink.linker.TypeBasedGuardingDynamicLinker;
+import jdk.internal.dynalink.support.CallSiteDescriptorFactory;
 import jdk.nashorn.internal.runtime.JSType;
 import netscape.javascript.JSObject;
-import org.dynalang.dynalink.CallSiteDescriptor;
-import org.dynalang.dynalink.linker.GuardedInvocation;
-import org.dynalang.dynalink.linker.LinkRequest;
-import org.dynalang.dynalink.linker.LinkerServices;
-import org.dynalang.dynalink.linker.TypeBasedGuardingDynamicLinker;
-import org.dynalang.dynalink.support.CallSiteDescriptorFactory;
 
 /**
  * A Dynalink linker to handle web browser built-in JS (DOM etc.) objects as well
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
index 685f141e8ae..c8189d7dd64 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
@@ -70,6 +70,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Random;
 import java.util.Set;
+import jdk.internal.dynalink.beans.StaticClass;
+import jdk.internal.dynalink.support.LinkRequestImpl;
 import jdk.internal.org.objectweb.asm.ClassWriter;
 import jdk.internal.org.objectweb.asm.Label;
 import jdk.internal.org.objectweb.asm.Opcodes;
@@ -83,8 +85,6 @@ import jdk.nashorn.internal.runtime.ScriptFunction;
 import jdk.nashorn.internal.runtime.ScriptObject;
 import jdk.nashorn.internal.runtime.ScriptRuntime;
 import jdk.nashorn.internal.runtime.Undefined;
-import org.dynalang.dynalink.beans.StaticClass;
-import org.dynalang.dynalink.support.LinkRequestImpl;
 
 /**
  * A factory class that generates adapter classes. Adapter classes allow implementation of Java interfaces and
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java
index 1329ccd74fb..00125e490d2 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java
@@ -33,10 +33,10 @@ import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.util.HashMap;
 import java.util.Map;
+import jdk.internal.dynalink.support.TypeUtilities;
 import jdk.nashorn.internal.runtime.ConsString;
 import jdk.nashorn.internal.runtime.JSType;
 import jdk.nashorn.internal.runtime.ScriptObject;
-import org.dynalang.dynalink.support.TypeUtilities;
 
 /**
  * Utility class shared by {@link NashornLinker} and {@code NashornPrimitiveLinker} for converting JS values to Java
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java
index 0ee1e74b133..445f87d8bd1 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java
@@ -43,14 +43,14 @@ import java.util.Map.Entry;
 import java.util.Random;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
+import jdk.internal.dynalink.ChainedCallSite;
+import jdk.internal.dynalink.DynamicLinker;
+import jdk.internal.dynalink.linker.GuardedInvocation;
 import jdk.nashorn.internal.runtime.Context;
 import jdk.nashorn.internal.runtime.Debug;
 import jdk.nashorn.internal.runtime.ScriptObject;
 import jdk.nashorn.internal.runtime.ScriptRuntime;
 import jdk.nashorn.internal.runtime.options.Options;
-import org.dynalang.dynalink.ChainedCallSite;
-import org.dynalang.dynalink.DynamicLinker;
-import org.dynalang.dynalink.linker.GuardedInvocation;
 
 
 /**
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java
index 6c80fd566e3..5c20bfc3ed8 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java
@@ -30,13 +30,13 @@ import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
+import jdk.internal.dynalink.CallSiteDescriptor;
+import jdk.internal.dynalink.linker.GuardedInvocation;
+import jdk.internal.dynalink.linker.GuardingDynamicLinker;
+import jdk.internal.dynalink.linker.LinkRequest;
+import jdk.internal.dynalink.linker.LinkerServices;
+import jdk.internal.dynalink.support.Guards;
 import jdk.nashorn.internal.runtime.ScriptRuntime;
-import org.dynalang.dynalink.CallSiteDescriptor;
-import org.dynalang.dynalink.linker.GuardedInvocation;
-import org.dynalang.dynalink.linker.GuardingDynamicLinker;
-import org.dynalang.dynalink.linker.LinkRequest;
-import org.dynalang.dynalink.linker.LinkerServices;
-import org.dynalang.dynalink.support.Guards;
 
 /**
  * Nashorn bottom linker; used as a last-resort catch-all linker for all linking requests that fall through all other
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java
index 79654f54509..a4fbc0740c3 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java
@@ -28,9 +28,9 @@ package jdk.nashorn.internal.runtime.linker;
 import java.lang.invoke.MethodType;
 import java.lang.ref.WeakReference;
 import java.util.WeakHashMap;
-import org.dynalang.dynalink.CallSiteDescriptor;
-import org.dynalang.dynalink.support.AbstractCallSiteDescriptor;
-import org.dynalang.dynalink.support.CallSiteDescriptorFactory;
+import jdk.internal.dynalink.CallSiteDescriptor;
+import jdk.internal.dynalink.support.AbstractCallSiteDescriptor;
+import jdk.internal.dynalink.support.CallSiteDescriptorFactory;
 
 /**
  * Nashorn-specific implementation of Dynalink's {@link CallSiteDescriptor}. The reason we have our own subclass is that
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornLinker.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornLinker.java
index 53d69976684..74260dd80f0 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornLinker.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornLinker.java
@@ -29,23 +29,22 @@ import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
-
+import jdk.internal.dynalink.CallSiteDescriptor;
+import jdk.internal.dynalink.linker.ConversionComparator;
+import jdk.internal.dynalink.linker.GuardedInvocation;
+import jdk.internal.dynalink.linker.GuardingTypeConverterFactory;
+import jdk.internal.dynalink.linker.LinkRequest;
+import jdk.internal.dynalink.linker.LinkerServices;
+import jdk.internal.dynalink.linker.TypeBasedGuardingDynamicLinker;
+import jdk.internal.dynalink.support.Guards;
 import jdk.nashorn.internal.runtime.ScriptFunction;
 import jdk.nashorn.internal.runtime.ScriptObject;
 import jdk.nashorn.internal.runtime.Undefined;
-import org.dynalang.dynalink.CallSiteDescriptor;
-import org.dynalang.dynalink.linker.ConversionComparator;
-import org.dynalang.dynalink.linker.GuardedInvocation;
-import org.dynalang.dynalink.linker.GuardingTypeConverterFactory;
-import org.dynalang.dynalink.linker.LinkRequest;
-import org.dynalang.dynalink.linker.LinkerServices;
-import org.dynalang.dynalink.linker.TypeBasedGuardingDynamicLinker;
-import org.dynalang.dynalink.support.Guards;
 
 /**
  * This is the main dynamic linker for Nashorn. It is used for linking all {@link ScriptObject} and its subclasses (this
  * includes {@link ScriptFunction} and its subclasses) as well as {@link Undefined}. This linker is exported to other
- * language runtimes by being declared in {@code META-INF/services/org.dynalang.dynalink.linker.GuardingDynamicLinker}
+ * language runtimes by being declared in {@code META-INF/services/jdk.internal.dynalink.linker.GuardingDynamicLinker}
  * file of Nashorn's distribution.
  */
 public class NashornLinker implements TypeBasedGuardingDynamicLinker, GuardingTypeConverterFactory, ConversionComparator {
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java
index 0456e00f304..71edc44acc0 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java
@@ -29,16 +29,16 @@ import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
+import jdk.internal.dynalink.linker.ConversionComparator;
+import jdk.internal.dynalink.linker.GuardedInvocation;
+import jdk.internal.dynalink.linker.GuardingTypeConverterFactory;
+import jdk.internal.dynalink.linker.LinkRequest;
+import jdk.internal.dynalink.linker.LinkerServices;
+import jdk.internal.dynalink.linker.TypeBasedGuardingDynamicLinker;
+import jdk.internal.dynalink.support.TypeUtilities;
 import jdk.nashorn.internal.runtime.ConsString;
 import jdk.nashorn.internal.runtime.Context;
 import jdk.nashorn.internal.runtime.GlobalObject;
-import org.dynalang.dynalink.linker.ConversionComparator;
-import org.dynalang.dynalink.linker.GuardedInvocation;
-import org.dynalang.dynalink.linker.GuardingTypeConverterFactory;
-import org.dynalang.dynalink.linker.LinkRequest;
-import org.dynalang.dynalink.linker.LinkerServices;
-import org.dynalang.dynalink.linker.TypeBasedGuardingDynamicLinker;
-import org.dynalang.dynalink.support.TypeUtilities;
 
 /**
  * Internal linker for String, Boolean, and Number objects, only ever used by Nashorn engine and not exposed to other
@@ -90,7 +90,7 @@ class NashornPrimitiveLinker implements TypeBasedGuardingDynamicLinker, Guarding
      * @param sourceType the source type to convert from
      * @param targetType1 one candidate target type
      * @param targetType2 another candidate target type
-     * @return one of {@link org.dynalang.dynalink.linker.ConversionComparator.Comparison} values signifying which
+     * @return one of {@link jdk.internal.dynalink.linker.ConversionComparator.Comparison} values signifying which
      * target type should be favored for conversion.
      */
     @Override
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java
index 4e7c68bd920..de3a1f16a86 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java
@@ -25,16 +25,16 @@
 
 package jdk.nashorn.internal.runtime.linker;
 
+import jdk.internal.dynalink.CallSiteDescriptor;
+import jdk.internal.dynalink.beans.BeansLinker;
+import jdk.internal.dynalink.beans.StaticClass;
+import jdk.internal.dynalink.linker.GuardedInvocation;
+import jdk.internal.dynalink.linker.GuardingDynamicLinker;
+import jdk.internal.dynalink.linker.LinkRequest;
+import jdk.internal.dynalink.linker.LinkerServices;
+import jdk.internal.dynalink.linker.TypeBasedGuardingDynamicLinker;
+import jdk.internal.dynalink.support.Guards;
 import jdk.nashorn.internal.runtime.ECMAErrors;
-import org.dynalang.dynalink.CallSiteDescriptor;
-import org.dynalang.dynalink.beans.BeansLinker;
-import org.dynalang.dynalink.beans.StaticClass;
-import org.dynalang.dynalink.linker.GuardedInvocation;
-import org.dynalang.dynalink.linker.GuardingDynamicLinker;
-import org.dynalang.dynalink.linker.LinkRequest;
-import org.dynalang.dynalink.linker.LinkerServices;
-import org.dynalang.dynalink.linker.TypeBasedGuardingDynamicLinker;
-import org.dynalang.dynalink.support.Guards;
 
 /**
  * Internal linker for {@link StaticClass} objects, only ever used by Nashorn engine and not exposed to other engines.
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java
index ed7be46a46c..131b63b17fc 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java
@@ -29,12 +29,12 @@ import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodType;
+import jdk.internal.dynalink.CallSiteDescriptor;
+import jdk.internal.dynalink.linker.GuardedInvocation;
+import jdk.internal.dynalink.linker.LinkRequest;
+import jdk.internal.dynalink.support.CallSiteDescriptorFactory;
+import jdk.internal.dynalink.support.Guards;
 import jdk.nashorn.internal.runtime.ScriptObject;
-import org.dynalang.dynalink.CallSiteDescriptor;
-import org.dynalang.dynalink.linker.GuardedInvocation;
-import org.dynalang.dynalink.linker.LinkRequest;
-import org.dynalang.dynalink.support.CallSiteDescriptorFactory;
-import org.dynalang.dynalink.support.Guards;
 
 /**
  * Implements lookup of methods to link for dynamic operations on JavaScript primitive values (booleans, strings, and
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/options/Options.java b/nashorn/src/jdk/nashorn/internal/runtime/options/Options.java
index 06b1176a012..7cca54122df 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/options/Options.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/options/Options.java
@@ -44,7 +44,6 @@ import java.util.StringTokenizer;
 import java.util.TimeZone;
 import java.util.TreeMap;
 import java.util.TreeSet;
-
 import jdk.nashorn.internal.runtime.Logging;
 import jdk.nashorn.internal.runtime.QuotedStringTokenizer;
 
diff --git a/nashorn/test/script/sandbox/nashorninternals.js b/nashorn/test/script/sandbox/nashorninternals.js
index 4072e0719a8..35e8e757478 100644
--- a/nashorn/test/script/sandbox/nashorninternals.js
+++ b/nashorn/test/script/sandbox/nashorninternals.js
@@ -55,3 +55,7 @@ checkClass("jdk.nashorn.internal.parser.Parser");
 checkClass("jdk.nashorn.internal.parser.JSONParser");
 checkClass("jdk.nashorn.internal.parser.Lexer");
 checkClass("jdk.nashorn.internal.parser.Scanner");
+checkClass("jdk.internal.dynalink.CallSiteDescriptor");
+checkClass("jdk.internal.dynalink.beans.StaticClass");
+checkClass("jdk.internal.dynalink.linker.LinkRequest");
+checkClass("jdk.internal.dynalink.support.AbstractRelinkableCallSite");
diff --git a/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java b/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
index 169ebf9d653..26b478e9805 100644
--- a/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
+++ b/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
@@ -26,8 +26,8 @@
 package jdk.nashorn.api.scripting;
 
 import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
 
diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/ContextTest.java b/nashorn/test/src/jdk/nashorn/internal/runtime/ContextTest.java
index e894a371af2..783fba9694c 100644
--- a/nashorn/test/src/jdk/nashorn/internal/runtime/ContextTest.java
+++ b/nashorn/test/src/jdk/nashorn/internal/runtime/ContextTest.java
@@ -35,7 +35,6 @@ import javax.script.ScriptEngineFactory;
 import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
 import jdk.nashorn.api.scripting.NashornScriptEngineFactory;
-import jdk.nashorn.api.scripting.ScriptEngineTest;
 import jdk.nashorn.internal.runtime.options.Options;
 import org.testng.annotations.Test;
 
diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/JSTypeTest.java b/nashorn/test/src/jdk/nashorn/internal/runtime/JSTypeTest.java
index f9594197b8e..f9b500e9072 100644
--- a/nashorn/test/src/jdk/nashorn/internal/runtime/JSTypeTest.java
+++ b/nashorn/test/src/jdk/nashorn/internal/runtime/JSTypeTest.java
@@ -26,8 +26,8 @@
 package jdk.nashorn.internal.runtime;
 
 import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
 
 import org.testng.annotations.Test;
 

From af9c882b95869dbd3acf9ae14fb8b7c560fcc963 Mon Sep 17 00:00:00 2001
From: Marcus Lagergren <lagergren@openjdk.org>
Date: Thu, 14 Feb 2013 13:52:12 +0100
Subject: [PATCH 148/311] 8008206: The allInteger case for SwitchNode
 generation in CodeGenerator assumes integer LITERALS only

Reviewed-by: sundar, jlaskey
---
 .../jdk/nashorn/internal/codegen/Attr.java    |  4 +++
 .../internal/codegen/CodeGenerator.java       |  2 +-
 nashorn/test/script/basic/JDK-8008206.js      | 36 +++++++++++++++++++
 .../test/script/basic/JDK-8008206.js.EXPECTED |  1 +
 4 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 nashorn/test/script/basic/JDK-8008206.js
 create mode 100644 nashorn/test/script/basic/JDK-8008206.js.EXPECTED

diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Attr.java b/nashorn/src/jdk/nashorn/internal/codegen/Attr.java
index 1752cfbd3f1..3bf8856955b 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Attr.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Attr.java
@@ -542,6 +542,10 @@ final class Attr extends NodeOperatorVisitor {
                             caseNode.setTest(LiteralNode.newInstance(lit, lit.getInt32()).accept(this));
                         }
                     }
+                } else {
+                    // the "all integer" case that CodeGenerator optimizes for currently assumes literals only
+                    type = Type.OBJECT;
+                    break;
                 }
 
                 type = Type.widest(type, caseNode.getTest().getType());
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
index 544d8c5ebb7..a37aa24049c 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
@@ -1803,7 +1803,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
                 final Node test = caseNode.getTest();
 
                 if (test != null) {
-                    final Integer value = (Integer)((LiteralNode<?>) test).getValue();
+                    final Integer value = (Integer)((LiteralNode<?>)test).getValue();
                     final Label   entry = caseNode.getEntry();
 
                     // Take first duplicate.
diff --git a/nashorn/test/script/basic/JDK-8008206.js b/nashorn/test/script/basic/JDK-8008206.js
new file mode 100644
index 00000000000..be84f51b910
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8008206.js
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8008026 : allInteger case in Switch nodes requiers integer literals only
+ *
+ * @test
+ * @run
+ */
+
+var x = 1; 
+
+switch (x) { 
+  case foo = false, 1: 
+     print("ok"); 
+} 
diff --git a/nashorn/test/script/basic/JDK-8008206.js.EXPECTED b/nashorn/test/script/basic/JDK-8008206.js.EXPECTED
new file mode 100644
index 00000000000..9766475a418
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8008206.js.EXPECTED
@@ -0,0 +1 @@
+ok

From 85c55a2aa457b82fe1c2fe463847f660f16ee06e Mon Sep 17 00:00:00 2001
From: Attila Szegedi <attila@openjdk.org>
Date: Thu, 14 Feb 2013 13:51:54 +0100
Subject: [PATCH 149/311] 8007990: No access to interface methods on a
 restricted class

Reviewed-by: jlaskey, lagergren, sundar
---
 nashorn/make/build.xml                        |  2 +-
 nashorn/test/script/basic/JDK-8007990.js      | 36 +++++++++++++++++++
 .../test/script/basic/JDK-8007990.js.EXPECTED |  1 +
 3 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 nashorn/test/script/basic/JDK-8007990.js
 create mode 100644 nashorn/test/script/basic/JDK-8007990.js.EXPECTED

diff --git a/nashorn/make/build.xml b/nashorn/make/build.xml
index 3043b1890e7..342dc2c10c1 100644
--- a/nashorn/make/build.xml
+++ b/nashorn/make/build.xml
@@ -180,7 +180,7 @@
 
   </target>
 
-  <target name="generate-policy-file">
+  <target name="generate-policy-file" depends="prepare">
     <!-- Generating nashorn.policy file -->
 
     <!-- nashorn internal tests jar requires AllPermission -->
diff --git a/nashorn/test/script/basic/JDK-8007990.js b/nashorn/test/script/basic/JDK-8007990.js
new file mode 100644
index 00000000000..7f4f7399b8d
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8007990.js
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8007990: Access methods declared on public interfaces implemented by 
+ * non-public classes
+ *
+ * @test
+ * @run
+ */
+
+var p = new Packages.java.io.File("test/script/basic/JDK-8007990.js"); 
+var path = p.toPath(); 
+var basicView = Packages.java.nio.file.Files.getFileAttributeView(path, Packages.java.nio.file.attribute.BasicFileAttributeView.class); 
+// We just want to confirm we can access the readAttributes() function
+print(basicView.readAttributes().directory);
diff --git a/nashorn/test/script/basic/JDK-8007990.js.EXPECTED b/nashorn/test/script/basic/JDK-8007990.js.EXPECTED
new file mode 100644
index 00000000000..c508d5366f7
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8007990.js.EXPECTED
@@ -0,0 +1 @@
+false

From 6aeeee6b63ec7f8fa8ee27a36d99b20d45380384 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Thu, 14 Feb 2013 14:07:53 +0100
Subject: [PATCH 150/311] 8008198: java.lang.AssertionError: Invalid break
 target class jdk.nashorn.internal.ir.TryNode

Reviewed-by: attila, jlaskey
---
 .../jdk/nashorn/internal/ir/LabelNode.java    |  2 +
 .../jdk/nashorn/internal/parser/Parser.java   |  3 +-
 nashorn/test/script/basic/JDK-8008198.js      | 55 +++++++++++++++++++
 .../test/script/basic/JDK-8008198.js.EXPECTED |  6 ++
 4 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 nashorn/test/script/basic/JDK-8008198.js
 create mode 100644 nashorn/test/script/basic/JDK-8008198.js.EXPECTED

diff --git a/nashorn/src/jdk/nashorn/internal/ir/LabelNode.java b/nashorn/src/jdk/nashorn/internal/ir/LabelNode.java
index 6830dca87e2..b74d5637b53 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/LabelNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/LabelNode.java
@@ -125,6 +125,7 @@ public class LabelNode extends Node {
      * @param breakNode the break node
      */
     public void setBreakNode(final Node breakNode) {
+        assert breakNode instanceof BreakableNode || breakNode instanceof Block : "Invalid break node: " + breakNode;
         this.breakNode = breakNode;
     }
 
@@ -141,6 +142,7 @@ public class LabelNode extends Node {
      * @param continueNode the continue node
      */
     public void setContinueNode(final Node continueNode) {
+        assert continueNode instanceof WhileNode : "invalid continue node: " + continueNode;
         this.continueNode = continueNode;
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/parser/Parser.java b/nashorn/src/jdk/nashorn/internal/parser/Parser.java
index 1875ee02915..6fc7de587bb 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/Parser.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/Parser.java
@@ -498,10 +498,11 @@ loop:
      */
     private void pushControlNode(final Node node) {
         final boolean isLoop = node instanceof WhileNode;
+        final boolean isBreakable = node instanceof BreakableNode || node instanceof Block;
         function.getControlStack().push(node);
 
         for (final LabelNode labelNode : function.getLabelStack()) {
-            if (labelNode.getBreakNode() == null) {
+            if (isBreakable && labelNode.getBreakNode() == null) {
                 labelNode.setBreakNode(node);
             }
 
diff --git a/nashorn/test/script/basic/JDK-8008198.js b/nashorn/test/script/basic/JDK-8008198.js
new file mode 100644
index 00000000000..745cea77a59
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8008198.js
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8008198 : java.lang.AssertionError: Invalid break target class jdk.nashorn.internal.ir.TryNode
+ *
+ * @test
+ * @run
+ */
+
+a: try {
+    print("try");
+    break a;
+    print("wrong");
+} catch (e) {
+    print("error");
+} finally {
+    print("finally");
+}
+print("done");
+
+a: b: if (true) {
+   c: d: with({}) {
+      print("with");
+      break c;
+      print("wrong");
+   }
+   print("if");
+   break a;
+   print("wrong");
+}
+print("done");
+
+
+
diff --git a/nashorn/test/script/basic/JDK-8008198.js.EXPECTED b/nashorn/test/script/basic/JDK-8008198.js.EXPECTED
new file mode 100644
index 00000000000..a7350d75018
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8008198.js.EXPECTED
@@ -0,0 +1,6 @@
+try
+finally
+done
+with
+if
+done

From f95919ab1e89d6d8ccd94e6472816637cf3681c3 Mon Sep 17 00:00:00 2001
From: James Laskey <james.laskey@oracle.com>
Date: Thu, 14 Feb 2013 11:32:49 -0400
Subject: [PATCH 151/311] 8008231: Fix build system to accommodate integration
 of dynalink

Reviewed-by: jlaskey
---
 nashorn/makefiles/BuildNashorn.gmk | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/nashorn/makefiles/BuildNashorn.gmk b/nashorn/makefiles/BuildNashorn.gmk
index bab28ba1cc4..33ef441e22b 100644
--- a/nashorn/makefiles/BuildNashorn.gmk
+++ b/nashorn/makefiles/BuildNashorn.gmk
@@ -35,8 +35,6 @@ JAVAC_JARS ?= "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac
 		-jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar
 
 JDK_CLASSES := $(JDK_OUTPUTDIR)/classes
-# TODO: Remove dependency?
-DYNALINK_JAR := $(NASHORN_TOPDIR)/build/dynalink/dynalink.jar
 
 NASHORN_JAR := $(NASHORN_DIST)/nashorn.jar
 NASHORN_VERSION := $(JDK_VERSION)
@@ -61,8 +59,7 @@ $(eval $(call SetupJavaCompilation,BUILD_NASHORN,\
     SETUP:=COMPILER_SETUP,\
     SRC:=$(NASHORN_TOPDIR)/src,\
     COPY:=.properties .js,\
-    BIN:=$(NASHORN_OUTPUTDIR)/nashorn_classes,\
-    ADD_JAVAC_FLAGS:=-cp $(DYNALINK_JAR)))
+    BIN:=$(NASHORN_OUTPUTDIR)/nashorn_classes))
 
 # Build nasgen
 $(eval $(call SetupJavaCompilation,BUILD_NASGEN,\
@@ -89,14 +86,6 @@ $(NASHORN_OUTPUTDIR)/classes/_the.nasgen.run: $(BUILD_NASGEN)
         done
 	$(TOUCH) $@
 
-# Unpack dynalink.jar for inclusion in nashorn.jar
-$(NASHORN_OUTPUTDIR)/classes/_the.dynalink.unpacked: $(DYNALINK_JAR)
-	$(ECHO) Unpacking dynalink.jar
-	$(MKDIR) -p $(@D)
-	$(RM) -rf $(@D)/org
-	$(UNZIP) -q $(DYNALINK_JAR) -x "META-INF*" -d $(@D)
-	$(TOUCH) $@
-
 # Version file needs to be processed with version numbers
 VERSION_FILE := $(NASHORN_OUTPUTDIR)/classes/jdk/nashorn/internal/runtime/resources/version.properties
 # Needs to happen after nasgen run since nasgen run deletes it
@@ -114,7 +103,6 @@ MANIFEST_ATTRIBUTES:=Name: jdk/nashorn/\nImplementation-Title: Oracle Nashorn\nI
 # Create nashorn.jar from the final classes dir
 $(eval $(call SetupArchive,BUILD_NASHORN_JAR,\
     $(NASHORN_OUTPUTDIR)/classes/_the.nasgen.run \
-    $(NASHORN_OUTPUTDIR)/classes/_the.dynalink.unpacked \
     $(VERSION_FILE),\
     SRCS:=$(NASHORN_OUTPUTDIR)/classes,\
     SUFFIXES:=.class .clazz .js .properties Factory,\

From 07c7afeaac66498536cee778971c4df14d5da520 Mon Sep 17 00:00:00 2001
From: Bharadwaj Yadavalli <bharadwaj@openjdk.org>
Date: Thu, 14 Feb 2013 11:09:07 -0800
Subject: [PATCH 152/311] 8007736: VerifyError for use of static method in
 interface

Reviewed-by: mchung
---
 jdk/src/share/native/common/check_code.c | 25 +++++++++++---
 jdk/test/vm/verifier/TestStaticIF.java   | 44 ++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 5 deletions(-)
 create mode 100644 jdk/test/vm/verifier/TestStaticIF.java

diff --git a/jdk/src/share/native/common/check_code.c b/jdk/src/share/native/common/check_code.c
index c761a3d9158..7ecf096a679 100644
--- a/jdk/src/share/native/common/check_code.c
+++ b/jdk/src/share/native/common/check_code.c
@@ -206,6 +206,8 @@ enum {
 
 #define LDC_METHOD_HANDLE_MAJOR_VERSION 51
 
+#define STATIC_METHOD_IN_INTERFACE_MAJOR_VERSION  52
+
 #define ALLOC_STACK_SIZE 16 /* big enough */
 
 typedef struct alloc_stack_type {
@@ -1246,11 +1248,24 @@ verify_opcode_operands(context_type *context, unsigned int inumber, int offset)
         jclass cb = context->class;
         fullinfo_type clazz_info;
         int is_constructor, is_internal, is_invokedynamic;
-        int kind = (opcode == JVM_OPC_invokeinterface
-                            ? 1 << JVM_CONSTANT_InterfaceMethodref
-                  : opcode == JVM_OPC_invokedynamic
-                            ? 1 << JVM_CONSTANT_NameAndType
-                            : 1 << JVM_CONSTANT_Methodref);
+        int kind;
+
+        switch (opcode ) {
+        case JVM_OPC_invokestatic:
+            kind = ((context->major_version < STATIC_METHOD_IN_INTERFACE_MAJOR_VERSION)
+                       ? (1 << JVM_CONSTANT_Methodref)
+                       : ((1 << JVM_CONSTANT_InterfaceMethodref) | (1 << JVM_CONSTANT_Methodref)));
+            break;
+        case JVM_OPC_invokedynamic:
+            kind = 1 << JVM_CONSTANT_NameAndType;
+            break;
+        case JVM_OPC_invokeinterface:
+            kind = 1 << JVM_CONSTANT_InterfaceMethodref;
+            break;
+        default:
+            kind = 1 << JVM_CONSTANT_Methodref;
+        }
+
         is_invokedynamic = opcode == JVM_OPC_invokedynamic;
         /* Make sure the constant pool item is the right type. */
         verify_constant_pool_type(context, key, kind);
diff --git a/jdk/test/vm/verifier/TestStaticIF.java b/jdk/test/vm/verifier/TestStaticIF.java
new file mode 100644
index 00000000000..5a6776f3fc6
--- /dev/null
+++ b/jdk/test/vm/verifier/TestStaticIF.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/*
+ * @test
+ * @bug 8007736
+ * @summary Test static interface method.
+ * @run main/othervm -Xverify:all -XX:-UseSplitVerifier TestStaticIF
+ */
+
+public class TestStaticIF implements StaticMethodInInterface {
+
+    public static void main(String[] args) {
+        System.out.printf("main: %s%n", StaticMethodInInterface.get());
+    }
+}
+
+interface StaticMethodInInterface {
+
+    public static String get() {
+        return "Hello from StaticMethodInInterface.get()";
+    }
+}

From 2fd9426c20bd546c9007b4f29821f5359e6033df Mon Sep 17 00:00:00 2001
From: Dmeetry Degrave <dmeetry@openjdk.org>
Date: Fri, 15 Feb 2013 01:49:36 +0400
Subject: [PATCH 153/311] 7199858: Marshal exception is wrong

Reviewed-by: lancea
---
 .../classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java    | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/corba/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java b/corba/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java
index c9b6e55fd6a..7e926ddba63 100644
--- a/corba/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java
+++ b/corba/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java
@@ -2189,10 +2189,7 @@ public final class TypeCodeImpl extends TypeCode
 
                 if (labelIndex == _unionLabels.length) {
                     // check if label has not been found
-                    if (_defaultIndex == -1)
-                        // throw exception if default was not expected
-                        throw wrapper.unexpectedUnionDefault() ;
-                    else
+                    if (_defaultIndex != -1)
                         // must be of the default branch type
                         _memberTypes[_defaultIndex].copy(src, dst);
                 }

From f5e3306d7504137bcfe7f0c493b2d4d74f761aa2 Mon Sep 17 00:00:00 2001
From: Jia-Hong Chen <jia-hong.chen@oracle.com>
Date: Thu, 14 Feb 2013 14:14:38 -0800
Subject: [PATCH 154/311] 8008173: [parfait] #1173 Uninitialised variable --
 TransformHelper.cpp

Reviewed-by: prr, vadim
---
 jdk/src/share/native/sun/java2d/loops/TransformHelper.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/jdk/src/share/native/sun/java2d/loops/TransformHelper.c b/jdk/src/share/native/sun/java2d/loops/TransformHelper.c
index 23bba354756..72334550250 100644
--- a/jdk/src/share/native/sun/java2d/loops/TransformHelper.c
+++ b/jdk/src/share/native/sun/java2d/loops/TransformHelper.c
@@ -353,6 +353,9 @@ Java_sun_java2d_loops_TransformHelper_Transform
         pInterpFunc = pBicubicFunc;
         maxlinepix = LINE_SIZE / 16;
         break;
+    default:
+        // Should not happen, but just in case.
+        return;
     }
 
     srcInfo.bounds.x1 = sx1;

From a433a8918dfd3fcf59935706a68571c043f8bb11 Mon Sep 17 00:00:00 2001
From: Xueming Shen <sherman@openjdk.org>
Date: Fri, 15 Feb 2013 01:17:31 +0000
Subject: [PATCH 155/311] 8008254: j.u.Calendar.JavatimeTest failed at TL b78
 pit testing

To use j.t.ZoneId zone name to keep round-trip

Reviewed-by: okutsu
---
 jdk/test/java/util/Calendar/JavatimeTest.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/jdk/test/java/util/Calendar/JavatimeTest.java b/jdk/test/java/util/Calendar/JavatimeTest.java
index 5b9a7101805..d7b211705f4 100644
--- a/jdk/test/java/util/Calendar/JavatimeTest.java
+++ b/jdk/test/java/util/Calendar/JavatimeTest.java
@@ -23,7 +23,7 @@
 
 /*
  *@test
- *@bug 8007520
+ *@bug 8007520 8008254
  *@summary Test those bridge methods to/from java.time date/time classes
  */
 
@@ -53,13 +53,10 @@ public class JavatimeTest {
             int nanos = r.nextInt(NANOS_PER_SECOND);
             int nanos_ms = nanos / 1000000 * 1000000; // millis precision
             long millis = secs * 1000 + r.nextInt(1000);
-
             LocalDateTime ldt = LocalDateTime.ofEpochSecond(secs, nanos, ZoneOffset.UTC);
             LocalDateTime ldt_ms = LocalDateTime.ofEpochSecond(secs, nanos_ms, ZoneOffset.UTC);
             Instant inst = Instant.ofEpochSecond(secs, nanos);
             Instant inst_ms = Instant.ofEpochSecond(secs, nanos_ms);
-            //System.out.printf("ms: %16d  ns: %10d  ldt:[%s]%n", millis, nanos, ldt);
-
             ///////////// java.util.Date /////////////////////////
             Date jud = new java.util.Date(millis);
             Instant inst0 = jud.toInstant();
@@ -77,6 +74,8 @@ public class JavatimeTest {
             }
             //////////// java.util.GregorianCalendar /////////////
             GregorianCalendar cal = new GregorianCalendar();
+            // non-roundtrip of tz name between j.u.tz and j.t.zid
+            cal.setTimeZone(TimeZone.getTimeZone(ZoneId.systemDefault()));
             cal.setGregorianChange(new java.util.Date(Long.MIN_VALUE));
             cal.setFirstDayOfWeek(Calendar.MONDAY);
             cal.setMinimalDaysInFirstWeek(4);
@@ -84,6 +83,9 @@ public class JavatimeTest {
             ZonedDateTime zdt0 = cal.toZonedDateTime();
             if (cal.getTimeInMillis() != zdt0.toInstant().toEpochMilli() ||
                 !cal.equals(GregorianCalendar.from(zdt0))) {
+                System.out.println("cal:" + cal);
+                System.out.println("zdt:" + zdt0);
+                System.out.println("calNew:" + GregorianCalendar.from(zdt0));
                 System.out.printf("ms: %16d  ns: %10d  ldt:[%s]%n", millis, nanos, ldt);
                 throw new RuntimeException("FAILED: gcal -> zdt -> gcal");
             }

From 8edbed784ded6c8aa108f94fbb207cbef194fed2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Fri, 15 Feb 2013 09:18:05 +0100
Subject: [PATCH 156/311] 8008215: break in catch clause causes
 java.lang.VerifyError: Inconsistent stackmap

Reviewed-by: jlaskey, lagergren
---
 .../jdk/nashorn/internal/parser/Parser.java   | 11 ++++-
 nashorn/test/script/basic/JDK-8008215.js      | 41 +++++++++++++++++++
 .../test/script/basic/JDK-8008215.js.EXPECTED |  4 ++
 3 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 nashorn/test/script/basic/JDK-8008215.js
 create mode 100644 nashorn/test/script/basic/JDK-8008215.js.EXPECTED

diff --git a/nashorn/src/jdk/nashorn/internal/parser/Parser.java b/nashorn/src/jdk/nashorn/internal/parser/Parser.java
index 6fc7de587bb..7d3e3a1a5ee 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/Parser.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/Parser.java
@@ -1742,6 +1742,10 @@ loop:
         // TRY tested in caller.
         next();
 
+        // Container block needed to act as target for labeled break statements
+        final Block outer = newBlock();
+        pushControlNode(outer);
+
         // Create try.
         final TryNode tryNode = new TryNode(source, tryToken, Token.descPosition(tryToken), findControl(TryNode.class));
         pushControlNode(tryNode);
@@ -1819,12 +1823,17 @@ loop:
             tryNode.setCatchBlocks(catchBlocks);
             tryNode.setFinallyBody(finallyStatements);
             tryNode.setFinish(finish);
+            outer.setFinish(finish);
 
             // Add try.
-            block.addStatement(tryNode);
+            outer.addStatement(tryNode);
         } finally {
             popControlNode(tryNode);
+            restoreBlock();
+            popControlNode(outer);
         }
+
+        block.addStatement(new ExecuteNode(source, outer.getToken(), outer.getFinish(), outer));
     }
 
     /**
diff --git a/nashorn/test/script/basic/JDK-8008215.js b/nashorn/test/script/basic/JDK-8008215.js
new file mode 100644
index 00000000000..691b9a4562d
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8008215.js
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8008215 : break in catch clause causes java.lang.VerifyError: Inconsistent stackmap
+ *
+ * @test
+ * @run
+ */
+
+a: try {
+    print("try");
+    throw new Error();
+} catch (e) {
+    print("catch");
+    break a;
+    print("error");
+} finally {
+    print("finally");
+}
+print("done");
diff --git a/nashorn/test/script/basic/JDK-8008215.js.EXPECTED b/nashorn/test/script/basic/JDK-8008215.js.EXPECTED
new file mode 100644
index 00000000000..a7088738af7
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8008215.js.EXPECTED
@@ -0,0 +1,4 @@
+try
+catch
+finally
+done

From 7d9a872e3fb44ac5c53d10a7efc281df6642da63 Mon Sep 17 00:00:00 2001
From: Marcus Lagergren <lagergren@openjdk.org>
Date: Fri, 15 Feb 2013 09:44:15 +0100
Subject: [PATCH 157/311] 8008239: Unpublicized parts of the code generator
 package that were only package internal

Reviewed-by: hannesw, attila
---
 .../internal/codegen/BranchOptimizer.java     |  14 +-
 .../internal/codegen/ClassEmitter.java        |  39 +-
 .../internal/codegen/CodeGenerator.java       |  65 ++--
 .../internal/codegen/CompilationPhase.java    |  13 +-
 .../internal/codegen/CompilerConstants.java   |  12 +-
 .../nashorn/internal/codegen/Condition.java   | 107 +++++
 .../{objects => }/FieldObjectCreator.java     |  11 +-
 .../internal/codegen/FunctionSignature.java   |   1 -
 .../ObjectMapCreator.java => Label.java}      |  59 ++-
 .../codegen/{objects => }/MapCreator.java     |   9 +-
 .../internal/codegen/MethodEmitter.java       | 364 ++++++------------
 .../{objects => }/ObjectClassGenerator.java   |   6 +-
 .../codegen/{objects => }/ObjectCreator.java  |  10 +-
 .../internal/codegen/SharedScopeCall.java     |   8 +-
 .../nashorn/internal/codegen/Splitter.java    |   4 +-
 .../internal/codegen/types/BooleanType.java   |   2 +-
 .../internal/codegen/types/IntType.java       |   2 +-
 .../internal/codegen/types/LongType.java      |   2 +-
 .../internal/codegen/types/NumberType.java    |   2 +-
 .../jdk/nashorn/internal/ir/AccessNode.java   |   4 +-
 .../src/jdk/nashorn/internal/ir/BaseNode.java |   2 +-
 .../src/jdk/nashorn/internal/ir/Block.java    |  17 +-
 .../jdk/nashorn/internal/ir/BreakNode.java    |   4 +-
 .../nashorn/internal/ir/BreakableNode.java    |   6 +-
 .../src/jdk/nashorn/internal/ir/CallNode.java |   8 +-
 .../src/jdk/nashorn/internal/ir/CaseNode.java |   2 +-
 .../jdk/nashorn/internal/ir/CatchNode.java    |   8 +-
 .../jdk/nashorn/internal/ir/ContinueNode.java |   4 +-
 .../jdk/nashorn/internal/ir/IdentNode.java    |   4 +-
 .../jdk/nashorn/internal/ir/IndexNode.java    |   4 +-
 .../jdk/nashorn/internal/ir/LabelNode.java    |   8 +-
 .../nashorn/internal/ir/LineNumberNode.java   |   2 +-
 .../jdk/nashorn/internal/ir/ObjectNode.java   |   4 +-
 .../jdk/nashorn/internal/ir/ReturnNode.java   |   4 +-
 .../jdk/nashorn/internal/ir/SplitNode.java    |  15 +-
 .../jdk/nashorn/internal/ir/SwitchNode.java   |  19 +-
 .../jdk/nashorn/internal/ir/ThrowNode.java    |   4 +-
 .../src/jdk/nashorn/internal/ir/TryNode.java  |   2 +-
 .../jdk/nashorn/internal/ir/UnaryNode.java    |   2 +-
 .../jdk/nashorn/internal/ir/WhileNode.java    |  16 +-
 .../src/jdk/nashorn/internal/ir/WithNode.java |   4 +-
 .../internal/objects/NativeRegExp.java        |   3 +-
 .../internal/objects/ScriptFunctionImpl.java  |   1 -
 .../internal/runtime/AccessorProperty.java    |  24 +-
 .../jdk/nashorn/internal/runtime/Context.java |   9 +-
 .../internal/runtime/ECMAException.java       |   1 -
 .../internal/runtime/FindProperty.java        |   2 +-
 .../nashorn/internal/runtime/Property.java    |   2 +-
 .../jdk/nashorn/internal/runtime/Scope.java   |   5 +-
 .../internal/runtime/ScriptObject.java        |   8 +-
 .../internal/runtime/ScriptRuntime.java       |   8 +-
 .../internal/runtime/SetMethodCreator.java    |   2 +-
 .../internal/runtime/StructureLoader.java     |   2 +-
 53 files changed, 459 insertions(+), 481 deletions(-)
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/Condition.java
 rename nashorn/src/jdk/nashorn/internal/codegen/{objects => }/FieldObjectCreator.java (92%)
 rename nashorn/src/jdk/nashorn/internal/codegen/{objects/ObjectMapCreator.java => Label.java} (50%)
 rename nashorn/src/jdk/nashorn/internal/codegen/{objects => }/MapCreator.java (91%)
 rename nashorn/src/jdk/nashorn/internal/codegen/{objects => }/ObjectClassGenerator.java (99%)
 rename nashorn/src/jdk/nashorn/internal/codegen/{objects => }/ObjectCreator.java (94%)

diff --git a/nashorn/src/jdk/nashorn/internal/codegen/BranchOptimizer.java b/nashorn/src/jdk/nashorn/internal/codegen/BranchOptimizer.java
index a864d5537f7..84cef43764a 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/BranchOptimizer.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/BranchOptimizer.java
@@ -25,14 +25,14 @@
 
 package jdk.nashorn.internal.codegen;
 
-import static jdk.nashorn.internal.codegen.MethodEmitter.Condition.EQ;
-import static jdk.nashorn.internal.codegen.MethodEmitter.Condition.GE;
-import static jdk.nashorn.internal.codegen.MethodEmitter.Condition.GT;
-import static jdk.nashorn.internal.codegen.MethodEmitter.Condition.LE;
-import static jdk.nashorn.internal.codegen.MethodEmitter.Condition.LT;
-import static jdk.nashorn.internal.codegen.MethodEmitter.Condition.NE;
+import static jdk.nashorn.internal.codegen.Condition.EQ;
+import static jdk.nashorn.internal.codegen.Condition.GE;
+import static jdk.nashorn.internal.codegen.Condition.GT;
+import static jdk.nashorn.internal.codegen.Condition.LE;
+import static jdk.nashorn.internal.codegen.Condition.LT;
+import static jdk.nashorn.internal.codegen.Condition.NE;
 
-import jdk.nashorn.internal.codegen.MethodEmitter.Label;
+import jdk.nashorn.internal.codegen.Label;
 import jdk.nashorn.internal.codegen.types.Type;
 import jdk.nashorn.internal.ir.BinaryNode;
 import jdk.nashorn.internal.ir.Node;
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/ClassEmitter.java b/nashorn/src/jdk/nashorn/internal/codegen/ClassEmitter.java
index b9f645e47f5..7a293a3f3b0 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/ClassEmitter.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/ClassEmitter.java
@@ -62,6 +62,7 @@ import jdk.internal.org.objectweb.asm.ClassReader;
 import jdk.internal.org.objectweb.asm.ClassWriter;
 import jdk.internal.org.objectweb.asm.MethodVisitor;
 import jdk.internal.org.objectweb.asm.util.TraceClassVisitor;
+import jdk.nashorn.internal.codegen.Emitter;
 import jdk.nashorn.internal.codegen.types.Type;
 import jdk.nashorn.internal.ir.FunctionNode;
 import jdk.nashorn.internal.runtime.Context;
@@ -102,7 +103,6 @@ import jdk.nashorn.internal.runtime.Source;
  * detect if this is not true
  *
  * @see Compiler
- * @see CodeGenerator
  */
 public class ClassEmitter implements Emitter {
 
@@ -156,7 +156,7 @@ public class ClassEmitter implements Emitter {
      * @param superClassName  super class name for class
      * @param interfaceNames  names of interfaces implemented by this class, or null if none
      */
-    public ClassEmitter(final Context context, final String className, final String superClassName, final String... interfaceNames) {
+    ClassEmitter(final Context context, final String className, final String superClassName, final String... interfaceNames) {
         this(context, new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS));
         cw.visit(V1_7, ACC_PUBLIC | ACC_SUPER, className, null, superClassName, interfaceNames);
     }
@@ -363,7 +363,7 @@ public class ClassEmitter implements Emitter {
      * @param bytecode  byte array representing bytecode
      * @return disassembly as human readable string
      */
-    public static String disassemble(final byte[] bytecode) {
+    static String disassemble(final byte[] bytecode) {
         final ByteArrayOutputStream baos = new ByteArrayOutputStream();
         try (final PrintWriter pw = new PrintWriter(baos)) {
             new ClassReader(bytecode).accept(new TraceClassVisitor(pw), 0);
@@ -411,7 +411,7 @@ public class ClassEmitter implements Emitter {
      *
      * @return method emitter to use for weaving this method
      */
-    public MethodEmitter method(final String methodName, final Class<?> rtype, final Class<?>... ptypes) {
+    MethodEmitter method(final String methodName, final Class<?> rtype, final Class<?>... ptypes) {
         return method(DEFAULT_METHOD_FLAGS, methodName, rtype, ptypes); //TODO why public default ?
     }
 
@@ -425,7 +425,7 @@ public class ClassEmitter implements Emitter {
      *
      * @return method emitter to use for weaving this method
      */
-    public MethodEmitter method(final EnumSet<Flag> methodFlags, final String methodName, final Class<?> rtype, final Class<?>... ptypes) {
+    MethodEmitter method(final EnumSet<Flag> methodFlags, final String methodName, final Class<?> rtype, final Class<?>... ptypes) {
         return new MethodEmitter(this, cw.visitMethod(Flag.getValue(methodFlags), methodName, methodDescriptor(rtype, ptypes), null, null));
     }
 
@@ -437,7 +437,7 @@ public class ClassEmitter implements Emitter {
      *
      * @return method emitter to use for weaving this method
      */
-    public MethodEmitter method(final String methodName, final String descriptor) {
+    MethodEmitter method(final String methodName, final String descriptor) {
         return method(DEFAULT_METHOD_FLAGS, methodName, descriptor);
     }
 
@@ -450,7 +450,7 @@ public class ClassEmitter implements Emitter {
      *
      * @return method emitter to use for weaving this method
      */
-    public MethodEmitter method(final EnumSet<Flag> methodFlags, final String methodName, final String descriptor) {
+    MethodEmitter method(final EnumSet<Flag> methodFlags, final String methodName, final String descriptor) {
         return new MethodEmitter(this, cw.visitMethod(Flag.getValue(methodFlags), methodName, descriptor, null, null));
     }
 
@@ -460,7 +460,7 @@ public class ClassEmitter implements Emitter {
      * @param functionNode the function node to generate a method for
      * @return method emitter to use for weaving this method
      */
-    public MethodEmitter method(final FunctionNode functionNode) {
+    MethodEmitter method(final FunctionNode functionNode) {
         final MethodVisitor mv = cw.visitMethod(
             ACC_PUBLIC | ACC_STATIC | (functionNode.isVarArg() ? ACC_VARARGS : 0),
             functionNode.getName(),
@@ -476,7 +476,7 @@ public class ClassEmitter implements Emitter {
      *
      * @return method emitter to use for weaving <clinit>
      */
-    public MethodEmitter clinit() {
+    MethodEmitter clinit() {
         return method(EnumSet.of(Flag.STATIC), CLINIT.tag(), void.class);
     }
 
@@ -485,7 +485,7 @@ public class ClassEmitter implements Emitter {
      *
      * @return method emitter to use for weaving <init>()V
      */
-    public MethodEmitter init() {
+    MethodEmitter init() {
         return method(INIT.tag(), void.class);
     }
 
@@ -495,7 +495,7 @@ public class ClassEmitter implements Emitter {
      * @param ptypes parameter types for constructor
      * @return method emitter to use for weaving <init>()V
      */
-    public MethodEmitter init(final Class<?>... ptypes) {
+    MethodEmitter init(final Class<?>... ptypes) {
         return method(INIT.tag(), void.class, ptypes);
     }
 
@@ -507,7 +507,7 @@ public class ClassEmitter implements Emitter {
      *
      * @return method emitter to use for weaving <init>(...)V
      */
-    public MethodEmitter init(final EnumSet<Flag> flags, final Class<?>... ptypes) {
+    MethodEmitter init(final EnumSet<Flag> flags, final Class<?>... ptypes) {
         return method(flags, INIT.tag(), void.class, ptypes);
     }
 
@@ -521,7 +521,7 @@ public class ClassEmitter implements Emitter {
      *
      * @see ClassEmitter.Flag
      */
-    public final void field(final EnumSet<Flag> fieldFlags, final String fieldName, final Class<?> fieldType, final Object value) {
+    final void field(final EnumSet<Flag> fieldFlags, final String fieldName, final Class<?> fieldType, final Object value) {
         cw.visitField(Flag.getValue(fieldFlags), fieldName, typeDescriptor(fieldType), null, value).visitEnd();
     }
 
@@ -534,7 +534,7 @@ public class ClassEmitter implements Emitter {
      *
      * @see ClassEmitter.Flag
      */
-    public final void field(final EnumSet<Flag> fieldFlags, final String fieldName, final Class<?> fieldType) {
+    final void field(final EnumSet<Flag> fieldFlags, final String fieldName, final Class<?> fieldType) {
         field(fieldFlags, fieldName, fieldType, null);
     }
 
@@ -544,7 +544,7 @@ public class ClassEmitter implements Emitter {
      * @param fieldName  name of field
      * @param fieldType  type of field
      */
-    public final void field(final String fieldName, final Class<?> fieldType) {
+    final void field(final String fieldName, final Class<?> fieldType) {
         field(EnumSet.of(Flag.PUBLIC), fieldName, fieldType, null);
     }
 
@@ -554,7 +554,7 @@ public class ClassEmitter implements Emitter {
      *
      * @return byte code array for generated class, null if class generation hasn't been ended with {@link ClassEmitter#end()}
      */
-    public byte[] toByteArray() {
+    byte[] toByteArray() {
         assert classEnded;
         if (!classEnded) {
             return null;
@@ -572,7 +572,7 @@ public class ClassEmitter implements Emitter {
      * Flags are provided for method handles, protection levels, static/virtual
      * fields/methods.
      */
-    public static enum Flag {
+    static enum Flag {
         /** method handle with static access */
         HANDLE_STATIC(H_INVOKESTATIC),
         /** method handle with new invoke special access */
@@ -603,7 +603,7 @@ public class ClassEmitter implements Emitter {
          * Get the value of this flag
          * @return the int value
          */
-        public int getValue() {
+        int getValue() {
             return value;
         }
 
@@ -613,7 +613,7 @@ public class ClassEmitter implements Emitter {
          * @param flags enum set of flags
          * @return an integer value representing the flags intrinsic values or:ed together
          */
-        public static int getValue(final EnumSet<Flag> flags) {
+        static int getValue(final EnumSet<Flag> flags) {
             int v = 0;
             for (final Flag flag : flags) {
                 v |= flag.getValue();
@@ -621,5 +621,4 @@ public class ClassEmitter implements Emitter {
             return v;
         }
     }
-
 }
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
index a37aa24049c..53f45241b98 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
@@ -63,13 +63,7 @@ import java.util.Map;
 import java.util.TreeMap;
 import jdk.nashorn.internal.codegen.ClassEmitter.Flag;
 import jdk.nashorn.internal.codegen.CompilerConstants.Call;
-import jdk.nashorn.internal.codegen.MethodEmitter.Condition;
-import jdk.nashorn.internal.codegen.MethodEmitter.Label;
 import jdk.nashorn.internal.codegen.RuntimeCallSite.SpecializedRuntimeNode;
-import jdk.nashorn.internal.codegen.objects.FieldObjectCreator;
-import jdk.nashorn.internal.codegen.objects.MapCreator;
-import jdk.nashorn.internal.codegen.objects.ObjectCreator;
-import jdk.nashorn.internal.codegen.objects.ObjectMapCreator;
 import jdk.nashorn.internal.codegen.types.ArrayType;
 import jdk.nashorn.internal.codegen.types.Type;
 import jdk.nashorn.internal.ir.AccessNode;
@@ -118,6 +112,7 @@ import jdk.nashorn.internal.parser.TokenType;
 import jdk.nashorn.internal.runtime.CodeInstaller;
 import jdk.nashorn.internal.runtime.Context;
 import jdk.nashorn.internal.runtime.ECMAException;
+import jdk.nashorn.internal.runtime.Property;
 import jdk.nashorn.internal.runtime.PropertyMap;
 import jdk.nashorn.internal.runtime.Scope;
 import jdk.nashorn.internal.runtime.ScriptFunction;
@@ -147,7 +142,7 @@ import jdk.nashorn.internal.runtime.linker.LinkerCallSite;
  * The CodeGenerator visits nodes only once, tags them as resolved and emits
  * bytecode for them.
  */
-public final class CodeGenerator extends NodeOperatorVisitor {
+final class CodeGenerator extends NodeOperatorVisitor {
 
     /** Name of the Global object, cannot be referred to as .class, @see CodeGenerator */
     private static final String GLOBAL_OBJECT = Compiler.OBJECTS_PACKAGE + '/' + "Global";
@@ -189,7 +184,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
      *
      * @return the correct flags for a call site in the current function
      */
-    public int getCallSiteFlags() {
+    int getCallSiteFlags() {
         return getCurrentFunctionNode().isStrictMode() ? callSiteFlags | CALLSITE_STRICT : callSiteFlags;
     }
 
@@ -302,7 +297,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
      *
      * @return the method emitter used
      */
-    public MethodEmitter load(final Node node) {
+    MethodEmitter load(final Node node) {
         return load(node, false);
     }
 
@@ -661,9 +656,8 @@ public final class CodeGenerator extends NodeOperatorVisitor {
                 } else { // get global from scope (which is the self)
                     globalInstance();
                 }
-
                 loadArgs(args, signature, isVarArg, argCount);
-                method.invokeStatic(callee.getCompileUnit().getUnitClassName(), callee.getName(), signature);
+                method.invokestatic(callee.getCompileUnit().getUnitClassName(), callee.getName(), signature);
                 assert method.peekType().equals(callee.getReturnType()) : method.peekType() + " != " + callee.getReturnType();
 
                 return null;
@@ -1138,7 +1132,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
                     savedMethod.swap();
                     savedMethod.loadScope();
                     savedMethod.swap();
-                    savedMethod.invokeStatic(className, name, signature);
+                    savedMethod.invokestatic(className, name, signature);
                 }
             } finally {
                 setCurrentCompileUnit(savedCompileUnit);
@@ -1191,13 +1185,13 @@ public final class CodeGenerator extends NodeOperatorVisitor {
      *
      * @param string string to load
      */
-    public void loadConstant(final String string) {
+    void loadConstant(final String string) {
         final String       unitClassName = getCurrentCompileUnit().getUnitClassName();
         final ClassEmitter classEmitter  = getCurrentCompileUnit().getClassEmitter();
         final int          index         = compiler.getConstantData().add(string);
 
         method.load(index);
-        method.invokeStatic(unitClassName, GET_STRING.tag(), methodDescriptor(String.class, int.class));
+        method.invokestatic(unitClassName, GET_STRING.tag(), methodDescriptor(String.class, int.class));
         classEmitter.needGetConstantMethod(String.class);
     }
 
@@ -1207,7 +1201,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
      *
      * @param object object to load
      */
-    public void loadConstant(final Object object) {
+    void loadConstant(final Object object) {
         final String       unitClassName = getCurrentCompileUnit().getUnitClassName();
         final ClassEmitter classEmitter  = getCurrentCompileUnit().getClassEmitter();
         final int          index         = compiler.getConstantData().add(object);
@@ -1215,12 +1209,12 @@ public final class CodeGenerator extends NodeOperatorVisitor {
 
         if (cls == PropertyMap.class) {
             method.load(index);
-            method.invokeStatic(unitClassName, GET_MAP.tag(), methodDescriptor(PropertyMap.class, int.class));
+            method.invokestatic(unitClassName, GET_MAP.tag(), methodDescriptor(PropertyMap.class, int.class));
             classEmitter.needGetConstantMethod(PropertyMap.class);
         } else if (cls.isArray()) {
             method.load(index);
             final String methodName = ClassEmitter.getArrayMethodName(cls);
-            method.invokeStatic(unitClassName, methodName, methodDescriptor(cls, int.class));
+            method.invokestatic(unitClassName, methodName, methodDescriptor(cls, int.class));
             classEmitter.needGetConstantMethod(cls);
         } else {
             method.loadConstants(unitClassName).load(index).arrayload();
@@ -1363,7 +1357,12 @@ public final class CodeGenerator extends NodeOperatorVisitor {
              */
             @Override
             protected MapCreator newMapCreator(final Class<?> fieldObjectClass) {
-                return new ObjectMapCreator(fieldObjectClass, keys, symbols);
+                return new MapCreator(fieldObjectClass, keys, symbols) {
+                    @Override
+                    protected int getPropertyFlags(final Symbol symbol, final boolean isVarArg) {
+                        return super.getPropertyFlags(symbol, isVarArg) | Property.IS_ALWAYS_OBJECT;
+                    }
+                };
             }
 
         }.makeObject(method);
@@ -1487,7 +1486,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
 
             method.label(falseLabel);
             load(rhs);
-            method.invokeStatic(CompilerConstants.className(ScriptRuntime.class), request.toString(), signature);
+            method.invokestatic(CompilerConstants.className(ScriptRuntime.class), request.toString(), signature);
             method._goto(endLabel);
 
             method.label(trueLabel);
@@ -1628,7 +1627,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
             load(arg).convert(Type.OBJECT); //TODO this should not be necessary below Lower
         }
 
-        method.invokeStatic(
+        method.invokestatic(
             CompilerConstants.className(ScriptRuntime.class),
             runtimeNode.getRequest().toString(),
             new FunctionSignature(
@@ -1746,7 +1745,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
                 labels[i] = new Label("split_state_" + i);
             }
 
-            caller.tableSwitch(low, targetCount, breakLabel, labels);
+            caller.tableswitch(low, targetCount, breakLabel, labels);
             for (int i = low; i <= targetCount; i++) {
                 caller.label(labels[i - low]);
                 if (i == 0) {
@@ -1853,7 +1852,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
                     table[value - lo] = labels[i];
                 }
 
-                method.tableSwitch(lo, hi, defaultLabel, table);
+                method.tableswitch(lo, hi, defaultLabel, table);
             } else {
                 final int[] ints = new int[size];
 
@@ -1861,7 +1860,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
                     ints[i] = values[i];
                 }
 
-                method.lookupSwitch(defaultLabel, ints, labels);
+                method.lookupswitch(defaultLabel, ints, labels);
             }
         } else {
             load(expression);
@@ -1869,7 +1868,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
             if (expression.getType().isInteger()) {
                 method.convert(Type.NUMBER).dup();
                 method.store(tag);
-                method.conditionalJump(MethodEmitter.Condition.NE, true, defaultLabel);
+                method.conditionalJump(Condition.NE, true, defaultLabel);
             } else {
                 method.store(tag);
             }
@@ -3245,7 +3244,7 @@ public final class CodeGenerator extends NodeOperatorVisitor {
 
         new ObjectCreator(this, new ArrayList<String>(), new ArrayList<Symbol>(), false, false) {
             @Override
-            public void makeObject(final MethodEmitter method) {
+            protected void makeObject(final MethodEmitter method) {
                 final String className = isLazy ? SCRIPTFUNCTION_TRAMPOLINE_OBJECT : SCRIPTFUNCTION_IMPL_OBJECT;
 
                 method._new(className).dup();
@@ -3286,36 +3285,36 @@ public final class CodeGenerator extends NodeOperatorVisitor {
      * is from the code pipeline is Global
      */
     private MethodEmitter globalInstance() {
-        return method.invokeStatic(GLOBAL_OBJECT, "instance", "()L" + GLOBAL_OBJECT + ';');
+        return method.invokestatic(GLOBAL_OBJECT, "instance", "()L" + GLOBAL_OBJECT + ';');
     }
 
     private MethodEmitter globalObjectPrototype() {
-        return method.invokeStatic(GLOBAL_OBJECT, "objectPrototype", methodDescriptor(ScriptObject.class));
+        return method.invokestatic(GLOBAL_OBJECT, "objectPrototype", methodDescriptor(ScriptObject.class));
     }
 
     private MethodEmitter globalAllocateArguments() {
-        return method.invokeStatic(GLOBAL_OBJECT, "allocateArguments", methodDescriptor(ScriptObject.class, Object[].class, Object.class, int.class));
+        return method.invokestatic(GLOBAL_OBJECT, "allocateArguments", methodDescriptor(ScriptObject.class, Object[].class, Object.class, int.class));
     }
 
     private MethodEmitter globalNewRegExp() {
-        return method.invokeStatic(GLOBAL_OBJECT, "newRegExp", methodDescriptor(Object.class, String.class, String.class));
+        return method.invokestatic(GLOBAL_OBJECT, "newRegExp", methodDescriptor(Object.class, String.class, String.class));
     }
 
     private MethodEmitter globalRegExpCopy() {
-        return method.invokeStatic(GLOBAL_OBJECT, "regExpCopy", methodDescriptor(Object.class, Object.class));
+        return method.invokestatic(GLOBAL_OBJECT, "regExpCopy", methodDescriptor(Object.class, Object.class));
     }
 
     private MethodEmitter globalAllocateArray(final ArrayType type) {
         //make sure the native array is treated as an array type
-        return method.invokeStatic(GLOBAL_OBJECT, "allocate", "(" + type.getDescriptor() + ")Ljdk/nashorn/internal/objects/NativeArray;");
+        return method.invokestatic(GLOBAL_OBJECT, "allocate", "(" + type.getDescriptor() + ")Ljdk/nashorn/internal/objects/NativeArray;");
     }
 
     private MethodEmitter globalIsEval() {
-        return method.invokeStatic(GLOBAL_OBJECT, "isEval", methodDescriptor(boolean.class, Object.class));
+        return method.invokestatic(GLOBAL_OBJECT, "isEval", methodDescriptor(boolean.class, Object.class));
     }
 
     private MethodEmitter globalDirectEval() {
-        return method.invokeStatic(GLOBAL_OBJECT, "directEval",
+        return method.invokestatic(GLOBAL_OBJECT, "directEval",
                 methodDescriptor(Object.class, Object.class, Object.class, Object.class, Object.class, Object.class));
     }
 }
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CompilationPhase.java b/nashorn/src/jdk/nashorn/internal/codegen/CompilationPhase.java
index 4d41e57ac8e..a756d4a4b03 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/CompilationPhase.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CompilationPhase.java
@@ -76,18 +76,7 @@ enum CompilationPhase {
     CONSTANT_FOLDING_PHASE(EnumSet.of(INITIALIZED), CONSTANT_FOLDED) {
         @Override
         boolean transform(final Compiler compiler, final FunctionNode fn) {
-            final Context context = compiler.getContext();
-
-            if (context._print_ast) {
-                context.getErr().println(new ASTWriter(fn));
-            }
-
-            if (context._print_parse) {
-                context.getErr().println(new PrintVisitor(fn));
-            }
-
             fn.accept(new FoldConstants());
-
             return true;
         }
 
@@ -137,7 +126,7 @@ enum CompilationPhase {
 
                 if (context._print_lower_parse) {
                     context.getErr().println(new PrintVisitor(fn));
-                }
+               }
             }
         }
 
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CompilerConstants.java b/nashorn/src/jdk/nashorn/internal/codegen/CompilerConstants.java
index 68bafc20704..23a50685993 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/CompilerConstants.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CompilerConstants.java
@@ -320,7 +320,7 @@ public enum CompilerConstants {
         return new Call(null, className, name, desc) {
             @Override
             public MethodEmitter invoke(final MethodEmitter method) {
-                return method.invokeSpecial(className, name, descriptor);
+                return method.invokespecial(className, name, descriptor);
             }
         };
     }
@@ -354,7 +354,7 @@ public enum CompilerConstants {
         return new Call(null, className, name, desc) {
             @Override
             public MethodEmitter invoke(final MethodEmitter method) {
-                return method.invokeStatic(className, name, descriptor);
+                return method.invokestatic(className, name, descriptor);
             }
         };
     }
@@ -389,7 +389,7 @@ public enum CompilerConstants {
         return new Call(null, className(clazz), name, methodDescriptor(rtype, ptypes)) {
             @Override
             public MethodEmitter invoke(final MethodEmitter method) {
-                return method.invokeVirtual(className, name, descriptor);
+                return method.invokevirtual(className, name, descriptor);
             }
         };
     }
@@ -409,7 +409,7 @@ public enum CompilerConstants {
         return new Call(null, className(clazz), name, methodDescriptor(rtype, ptypes)) {
             @Override
             public MethodEmitter invoke(final MethodEmitter method) {
-                return method.invokeInterface(className, name, descriptor);
+                return method.invokeinterface(className, name, descriptor);
             }
         };
     }
@@ -519,7 +519,7 @@ public enum CompilerConstants {
         return new Call(MH.findStatic(lookup, clazz, name, MH.type(rtype, ptypes)), className(clazz), name, methodDescriptor(rtype, ptypes)) {
             @Override
             public MethodEmitter invoke(final MethodEmitter method) {
-                return method.invokeStatic(className, name, descriptor);
+                return method.invokestatic(className, name, descriptor);
             }
         };
     }
@@ -553,7 +553,7 @@ public enum CompilerConstants {
         return new Call(MH.findVirtual(lookup, clazz, name, MH.type(rtype, ptypes)), className(clazz), name, methodDescriptor(rtype, ptypes)) {
             @Override
             public MethodEmitter invoke(final MethodEmitter method) {
-                return method.invokeVirtual(className, name, descriptor);
+                return method.invokevirtual(className, name, descriptor);
             }
         };
     }
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Condition.java b/nashorn/src/jdk/nashorn/internal/codegen/Condition.java
new file mode 100644
index 00000000000..f2fb59926c8
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Condition.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.codegen;
+
+import static jdk.internal.org.objectweb.asm.Opcodes.IFEQ;
+import static jdk.internal.org.objectweb.asm.Opcodes.IFGE;
+import static jdk.internal.org.objectweb.asm.Opcodes.IFGT;
+import static jdk.internal.org.objectweb.asm.Opcodes.IFLE;
+import static jdk.internal.org.objectweb.asm.Opcodes.IFLT;
+import static jdk.internal.org.objectweb.asm.Opcodes.IFNE;
+import static jdk.internal.org.objectweb.asm.Opcodes.IF_ACMPEQ;
+import static jdk.internal.org.objectweb.asm.Opcodes.IF_ACMPNE;
+import static jdk.internal.org.objectweb.asm.Opcodes.IF_ICMPEQ;
+import static jdk.internal.org.objectweb.asm.Opcodes.IF_ICMPGE;
+import static jdk.internal.org.objectweb.asm.Opcodes.IF_ICMPGT;
+import static jdk.internal.org.objectweb.asm.Opcodes.IF_ICMPLE;
+import static jdk.internal.org.objectweb.asm.Opcodes.IF_ICMPLT;
+import static jdk.internal.org.objectweb.asm.Opcodes.IF_ICMPNE;
+import jdk.nashorn.internal.ir.RuntimeNode;
+
+/**
+ * Condition enum used for all kinds of jumps, regardless of type
+ */
+enum Condition {
+    EQ,
+    NE,
+    LE,
+    LT,
+    GE,
+    GT;
+
+    static Condition forRuntimeRequest(final RuntimeNode.Request request) {
+        try {
+            final String reqString = request.toString().replace("_STRICT", "");
+            return Condition.valueOf(reqString);
+        } catch (final IllegalArgumentException e) {
+            return null;
+        }
+    }
+
+    static int toUnary(final Condition c) {
+        switch (c) {
+        case EQ:
+            return IFEQ;
+        case NE:
+            return IFNE;
+        case LE:
+            return IFLE;
+        case LT:
+            return IFLT;
+        case GE:
+            return IFGE;
+        case GT:
+            return IFGT;
+        default:
+            assert false;
+            return -1;
+        }
+    }
+
+    static int toBinary(final Condition c) {
+        return toBinary(c, false);
+    }
+
+    static int toBinary(final Condition c, final boolean isObject) {
+        switch (c) {
+        case EQ:
+            return isObject ? IF_ACMPEQ : IF_ICMPEQ;
+        case NE:
+            return isObject ? IF_ACMPNE : IF_ICMPNE;
+        case LE:
+            return IF_ICMPLE;
+        case LT:
+            return IF_ICMPLT;
+        case GE:
+            return IF_ICMPGE;
+        case GT:
+            return IF_ICMPGT;
+        default:
+            assert false;
+            return -1;
+        }
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/objects/FieldObjectCreator.java b/nashorn/src/jdk/nashorn/internal/codegen/FieldObjectCreator.java
similarity index 92%
rename from nashorn/src/jdk/nashorn/internal/codegen/objects/FieldObjectCreator.java
rename to nashorn/src/jdk/nashorn/internal/codegen/FieldObjectCreator.java
index 46219f05cd2..83e75cc7ed3 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/objects/FieldObjectCreator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/FieldObjectCreator.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen.objects;
+package jdk.nashorn.internal.codegen;
 
 import static jdk.nashorn.internal.codegen.CompilerConstants.ARGUMENTS;
 import static jdk.nashorn.internal.codegen.CompilerConstants.constructorNoLookup;
@@ -32,8 +32,6 @@ import static jdk.nashorn.internal.codegen.types.Type.OBJECT;
 
 import java.util.Iterator;
 import java.util.List;
-import jdk.nashorn.internal.codegen.CodeGenerator;
-import jdk.nashorn.internal.codegen.MethodEmitter;
 import jdk.nashorn.internal.codegen.types.Type;
 import jdk.nashorn.internal.ir.Symbol;
 import jdk.nashorn.internal.runtime.PropertyMap;
@@ -63,7 +61,7 @@ public abstract class FieldObjectCreator<T> extends ObjectCreator {
      * @param symbols  symbols for fields in object
      * @param values   list of values corresponding to keys
      */
-    public FieldObjectCreator(final CodeGenerator codegen, final List<String> keys, final List<Symbol> symbols, final List<T> values) {
+    FieldObjectCreator(final CodeGenerator codegen, final List<String> keys, final List<Symbol> symbols, final List<T> values) {
         this(codegen, keys, symbols, values, false, false);
     }
 
@@ -77,7 +75,7 @@ public abstract class FieldObjectCreator<T> extends ObjectCreator {
      * @param isScope      is this a scope object
      * @param hasArguments does the created object have an "arguments" property
      */
-    public FieldObjectCreator(final CodeGenerator codegen, final List<String> keys, final List<Symbol> symbols, final List<T> values, final boolean isScope, final boolean hasArguments) {
+    FieldObjectCreator(final CodeGenerator codegen, final List<String> keys, final List<Symbol> symbols, final List<T> values, final boolean isScope, final boolean hasArguments) {
         super(codegen, keys, symbols, isScope, hasArguments);
         this.values        = values;
         this.callSiteFlags = codegen.getCallSiteFlags();
@@ -97,7 +95,7 @@ public abstract class FieldObjectCreator<T> extends ObjectCreator {
      * @param method the method emitter
      */
     @Override
-    public void makeObject(final MethodEmitter method) {
+    protected void makeObject(final MethodEmitter method) {
         makeMap();
 
         method._new(getClassName()).dup(); // create instance
@@ -190,5 +188,4 @@ public abstract class FieldObjectCreator<T> extends ObjectCreator {
         loadValue(value);
         method.dynamicSetIndex(callSiteFlags);
     }
-
 }
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/FunctionSignature.java b/nashorn/src/jdk/nashorn/internal/codegen/FunctionSignature.java
index 26d040cdb62..fcfdf624814 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/FunctionSignature.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/FunctionSignature.java
@@ -202,7 +202,6 @@ public final class FunctionSignature {
         return methodType;
     }
 
-
     private static Type[] objectArgs(final int nArgs) {
         final Type[] array = new Type[nArgs];
         for (int i = 0; i < nArgs; i++) {
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectMapCreator.java b/nashorn/src/jdk/nashorn/internal/codegen/Label.java
similarity index 50%
rename from nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectMapCreator.java
rename to nashorn/src/jdk/nashorn/internal/codegen/Label.java
index c61100a3845..9d28caafd1d 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectMapCreator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Label.java
@@ -22,33 +22,62 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+package jdk.nashorn.internal.codegen;
 
-package jdk.nashorn.internal.codegen.objects;
+import java.util.ArrayDeque;
 
-import java.util.List;
-import jdk.nashorn.internal.ir.Symbol;
-import jdk.nashorn.internal.runtime.Property;
+import jdk.nashorn.internal.codegen.types.Type;
 
 /**
- * This map creator is used to guarantee that all properties start out as
- * object types. Only semantically significant in the -Dnashorn.fields.dual=true world,
- * where we want to avoid invalidation upon initialization e.g. for var x = {a:"str"};
+ * Abstraction for labels, separating a label from the underlying
+ * byte code emitter. Also augmenting label with e.g. a name
+ * for easier debugging and reading code
+ *
+ * see -Dnashorn.codegen.debug, --log=codegen
  */
+public class Label extends jdk.internal.org.objectweb.asm.Label {
+    /** Name of this label */
+    private final String name;
+
+    /** Type stack at this label */
+    private ArrayDeque<Type> stack;
 
-public class ObjectMapCreator extends MapCreator {
     /**
      * Constructor
      *
-     * @param structure structure for object class
-     * @param keys      keys in object
-     * @param symbols   symbols in object corresponding to keys
+     * @param name name of this label
      */
-    public ObjectMapCreator(final Class<?> structure, final List<String> keys, final List<Symbol> symbols) {
-        super(structure, keys, symbols);
+    public Label(final String name) {
+        super();
+        this.name = name;
+    }
+
+    /**
+     * Copy constructor
+     *
+     * @param label a label to clone
+     */
+    public Label(final Label label) {
+        super();
+        this.name = label.name;
+    }
+
+    ArrayDeque<Type> getStack() {
+        return stack;
+    }
+
+    void setStack(final ArrayDeque<Type> stack) {
+        this.stack = stack;
     }
 
     @Override
-    protected int getPropertyFlags(final Symbol symbol, final boolean isVarArg) {
-        return super.getPropertyFlags(symbol, isVarArg) | Property.IS_ALWAYS_OBJECT;
+    public String toString() {
+        final StringBuilder sb = new StringBuilder();
+        String s = super.toString();
+        s = s.substring(1, s.length());
+        sb.append(name).append('_').append(Long.toHexString(Long.parseLong(s)));
+
+        return sb.toString();
     }
 }
+
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/objects/MapCreator.java b/nashorn/src/jdk/nashorn/internal/codegen/MapCreator.java
similarity index 91%
rename from nashorn/src/jdk/nashorn/internal/codegen/objects/MapCreator.java
rename to nashorn/src/jdk/nashorn/internal/codegen/MapCreator.java
index 1696597b862..865c46bf010 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/objects/MapCreator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/MapCreator.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen.objects;
+package jdk.nashorn.internal.codegen;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -53,7 +53,7 @@ public class MapCreator {
      * @param keys      list of keys for map
      * @param symbols   list of symbols for map
      */
-    public MapCreator(final Class<?> structure, final List<String> keys, final List<Symbol> symbols) {
+    MapCreator(final Class<?> structure, final List<String> keys, final List<Symbol> symbols) {
         final int size   = keys.size();
 
         this.structure = structure;
@@ -68,7 +68,7 @@ public class MapCreator {
      *
      * @return New map populated with accessor properties.
      */
-    public PropertyMap makeMap(final boolean hasArguments) {
+    PropertyMap makeMap(final boolean hasArguments) {
         final List<Property> properties = new ArrayList<>();
 
         assert keys != null;
@@ -86,8 +86,7 @@ public class MapCreator {
     }
 
     /**
-     * Compute property flags given local state of a field. Maybe be overridden and extended,
-     * as is the case in {@link ObjectMapCreator}
+     * Compute property flags given local state of a field. May be overridden and extended,
      *
      * @param symbol       symbol to check
      * @param hasArguments does the created object have an "arguments" property
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java b/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java
index 4aaa8fecbbe..dc1eac9ff28 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java
@@ -43,10 +43,6 @@ import static jdk.internal.org.objectweb.asm.Opcodes.IFNULL;
 import static jdk.internal.org.objectweb.asm.Opcodes.IF_ACMPEQ;
 import static jdk.internal.org.objectweb.asm.Opcodes.IF_ACMPNE;
 import static jdk.internal.org.objectweb.asm.Opcodes.IF_ICMPEQ;
-import static jdk.internal.org.objectweb.asm.Opcodes.IF_ICMPGE;
-import static jdk.internal.org.objectweb.asm.Opcodes.IF_ICMPGT;
-import static jdk.internal.org.objectweb.asm.Opcodes.IF_ICMPLE;
-import static jdk.internal.org.objectweb.asm.Opcodes.IF_ICMPLT;
 import static jdk.internal.org.objectweb.asm.Opcodes.IF_ICMPNE;
 import static jdk.internal.org.objectweb.asm.Opcodes.INSTANCEOF;
 import static jdk.internal.org.objectweb.asm.Opcodes.INVOKEINTERFACE;
@@ -114,7 +110,7 @@ public class MethodEmitter implements Emitter {
     private final MethodVisitor method;
 
     /** Current type stack for current evaluation */
-    protected ArrayDeque<Type> stack;
+    private ArrayDeque<Type> stack;
 
     /** Parent classEmitter representing the class of this method */
     private final ClassEmitter classEmitter;
@@ -287,7 +283,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the type at position "pos" on the stack
      */
-    public final Type peekType(final int pos) {
+    final Type peekType(final int pos) {
         final Iterator<Type> iter = stack.iterator();
         for (int i = 0; i < pos; i++) {
             iter.next();
@@ -300,7 +296,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the type at the top of the stack
      */
-    public final Type peekType() {
+    final Type peekType() {
         return stack.peek();
     }
 
@@ -312,7 +308,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter _new(final String classDescriptor) {
+    MethodEmitter _new(final String classDescriptor) {
         debug("new", classDescriptor);
         method.visitTypeInsn(NEW, classDescriptor);
         pushType(Type.OBJECT);
@@ -327,7 +323,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter _new(final Class<?> clazz) {
+    MethodEmitter _new(final Class<?> clazz) {
         return _new(className(clazz));
     }
 
@@ -338,7 +334,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter newInstance(final Class<?> clazz) {
+    MethodEmitter newInstance(final Class<?> clazz) {
         return invoke(constructorNoLookup(clazz));
     }
 
@@ -352,7 +348,7 @@ public class MethodEmitter implements Emitter {
      * @return the method emitter, or null if depth is illegal and
      *  has no instruction equivalent.
      */
-    public MethodEmitter dup(final int depth) {
+    MethodEmitter dup(final int depth) {
         if (peekType().dup(method, depth) == null) {
             return null;
         }
@@ -396,7 +392,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter dup2() {
+    MethodEmitter dup2() {
         debug("dup2");
 
         if (peekType().isCategory2()) {
@@ -417,7 +413,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter dup() {
+    MethodEmitter dup() {
         return dup(0);
     }
 
@@ -426,7 +422,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter pop() {
+    MethodEmitter pop() {
         debug("pop", peekType());
         popType().pop(method);
         return this;
@@ -438,7 +434,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter pop2() {
+    MethodEmitter pop2() {
         if (peekType().isCategory2()) {
             popType();
         } else {
@@ -453,7 +449,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter swap() {
+    MethodEmitter swap() {
         debug("swap");
 
         final Type p0 = popType();
@@ -473,7 +469,7 @@ public class MethodEmitter implements Emitter {
      * @param start  start of scope
      * @param end    end of scope
      */
-    public void localVariable(final Symbol symbol, final Label start, final Label end) {
+    void localVariable(final Symbol symbol, final Label start, final Label end) {
         if (!symbol.hasSlot()) {
             return;
         }
@@ -492,7 +488,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter newStringBuilder() {
+    MethodEmitter newStringBuilder() {
         return invoke(constructorNoLookup(StringBuilder.class)).dup();
     }
 
@@ -503,7 +499,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter stringBuilderAppend() {
+    MethodEmitter stringBuilderAppend() {
         convert(Type.STRING);
         return invoke(virtualCallNoLookup(StringBuilder.class, "append", StringBuilder.class, String.class));
     }
@@ -515,7 +511,7 @@ public class MethodEmitter implements Emitter {
      * @param start start
      * @param end   end
      */
-    public void markerVariable(final String name, final Label start, final Label end) {
+    void markerVariable(final String name, final Label start, final Label end) {
         method.visitLocalVariable(name, Type.OBJECT.getDescriptor(), null, start, end, 0);
     }
 
@@ -525,7 +521,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter and() {
+    MethodEmitter and() {
         debug("and");
         pushType(get2i().and(method));
         return this;
@@ -537,7 +533,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter or() {
+    MethodEmitter or() {
         debug("or");
         pushType(get2i().or(method));
         return this;
@@ -549,7 +545,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter xor() {
+    MethodEmitter xor() {
         debug("xor");
         pushType(get2i().xor(method));
         return this;
@@ -561,7 +557,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter shr() {
+    MethodEmitter shr() {
         debug("shr");
         popType(Type.INT);
         pushType(popInteger().shr(method));
@@ -574,7 +570,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter shl() {
+    MethodEmitter shl() {
         debug("shl");
         popType(Type.INT);
         pushType(popInteger().shl(method));
@@ -587,7 +583,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter sar() {
+    MethodEmitter sar() {
         debug("sar");
         popType(Type.INT);
         pushType(popInteger().sar(method));
@@ -599,7 +595,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter neg() {
+    MethodEmitter neg() {
         debug("neg");
         pushType(popNumeric().neg(method));
         return this;
@@ -611,7 +607,7 @@ public class MethodEmitter implements Emitter {
      *
      * @param recovery label pointing to start of catch block
      */
-    public void _catch(final Label recovery) {
+    void _catch(final Label recovery) {
         stack.clear();
         stack.push(Type.OBJECT);
         label(recovery);
@@ -625,7 +621,7 @@ public class MethodEmitter implements Emitter {
      * @param recovery       start label for catch
      * @param typeDescriptor type descriptor for exception
      */
-    public void _try(final Label entry, final Label exit, final Label recovery, final String typeDescriptor) {
+    void _try(final Label entry, final Label exit, final Label recovery, final String typeDescriptor) {
         method.visitTryCatchBlock(entry, exit, recovery, typeDescriptor);
     }
 
@@ -637,7 +633,7 @@ public class MethodEmitter implements Emitter {
      * @param recovery start label for catch
      * @param clazz    exception class
      */
-    public void _try(final Label entry, final Label exit, final Label recovery, final Class<?> clazz) {
+    void _try(final Label entry, final Label exit, final Label recovery, final Class<?> clazz) {
         method.visitTryCatchBlock(entry, exit, recovery, CompilerConstants.className(clazz));
     }
 
@@ -648,7 +644,7 @@ public class MethodEmitter implements Emitter {
      * @param exit     end label for try
      * @param recovery start label for catch
      */
-    public void _try(final Label entry, final Label exit, final Label recovery) {
+    void _try(final Label entry, final Label exit, final Label recovery) {
         _try(entry, exit, recovery, (String)null);
     }
 
@@ -658,7 +654,7 @@ public class MethodEmitter implements Emitter {
      * @param unitClassName name of the compile unit from which to load constants
      * @return this method emitter
      */
-    public MethodEmitter loadConstants(final String unitClassName) {
+    MethodEmitter loadConstants(final String unitClassName) {
         getStatic(unitClassName, CONSTANTS.tag(), CONSTANTS.descriptor());
         assert peekType().isArray() : peekType();
         return this;
@@ -673,7 +669,7 @@ public class MethodEmitter implements Emitter {
      * @param type the type for which to push UNDEFINED
      * @return the method emitter
      */
-    public MethodEmitter loadUndefined(final Type type) {
+    MethodEmitter loadUndefined(final Type type) {
         debug("load undefined " + type);
         pushType(type.loadUndefined(method));
         return this;
@@ -685,7 +681,7 @@ public class MethodEmitter implements Emitter {
      * @param type the type
      * @return the method emitter
      */
-    public MethodEmitter loadEmpty(final Type type) {
+    MethodEmitter loadEmpty(final Type type) {
         debug("load empty " + type);
         pushType(type.loadEmpty(method));
         return this;
@@ -696,7 +692,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter loadNull() {
+    MethodEmitter loadNull() {
         debug("aconst_null");
         pushType(Type.OBJECT.ldc(method, null));
         return this;
@@ -709,7 +705,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter loadType(final String className) {
+    MethodEmitter loadType(final String className) {
         debug("load type", className);
         method.visitLdcInsn(jdk.internal.org.objectweb.asm.Type.getObjectType(className));
         pushType(Type.OBJECT);
@@ -723,7 +719,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter load(final boolean b) {
+    MethodEmitter load(final boolean b) {
         debug("load boolean", b);
         pushType(Type.BOOLEAN.ldc(method, b));
         return this;
@@ -736,7 +732,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter load(final int i) {
+    MethodEmitter load(final int i) {
         debug("load int", i);
         pushType(Type.INT.ldc(method, i));
         return this;
@@ -749,7 +745,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter load(final double d) {
+    MethodEmitter load(final double d) {
         debug("load double", d);
         pushType(Type.NUMBER.ldc(method, d));
         return this;
@@ -762,7 +758,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter load(final long l) {
+    MethodEmitter load(final long l) {
         debug("load long", l);
         pushType(Type.LONG.ldc(method, l));
         return this;
@@ -772,7 +768,7 @@ public class MethodEmitter implements Emitter {
      * Fetch the length of an array.
      * @return Array length.
      */
-    public MethodEmitter arraylength() {
+    MethodEmitter arraylength() {
         debug("arraylength");
         popType(Type.OBJECT);
         pushType(Type.OBJECT_ARRAY.arraylength(method));
@@ -786,7 +782,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter load(final String s) {
+    MethodEmitter load(final String s) {
         debug("load string", s);
 
         if (s == null) {
@@ -826,7 +822,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter load(final Symbol symbol) {
+    MethodEmitter load(final Symbol symbol) {
         assert symbol != null;
         if (symbol.hasSlot()) {
             final int slot = symbol.getSlot();
@@ -837,7 +833,7 @@ public class MethodEmitter implements Emitter {
             assert !symbol.isScope();
             assert functionNode.isVarArg() : "Non-vararg functions have slotted parameters";
             final int index = symbol.getFieldIndex();
-            if(functionNode.needsArguments()) {
+            if (functionNode.needsArguments()) {
                 // ScriptObject.getArgument(int) on arguments
                 debug("load symbol", symbol.getName(), " arguments index=", index);
                 loadArguments();
@@ -864,7 +860,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter load(final Type type, final int slot) {
+    MethodEmitter load(final Type type, final int slot) {
         debug("explicit load", type, slot);
         final Type loadType = type.load(method, slot);
         pushType(loadType == Type.OBJECT && isThisSlot(slot) ? Type.THIS : loadType);
@@ -886,7 +882,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter loadThis() {
+    MethodEmitter loadThis() {
         load(functionNode.getThisNode().getSymbol());
         return this;
     }
@@ -896,7 +892,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter loadScope() {
+    MethodEmitter loadScope() {
         if (peekType() == Type.SCOPE) {
             dup();
             return this;
@@ -910,7 +906,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter loadResult() {
+    MethodEmitter loadResult() {
         load(functionNode.getResultNode().getSymbol());
         return this;
     }
@@ -924,11 +920,9 @@ public class MethodEmitter implements Emitter {
      * @param descName   descriptor
      * @param flags      flags that describe this handle, e.g. invokespecial new, or invoke virtual
      *
-     * @see ClassEmitter.Flag
-     *
      * @return the method emitter
      */
-    public MethodEmitter loadHandle(final String className, final String methodName, final String descName, final EnumSet<Flag> flags) {
+    MethodEmitter loadHandle(final String className, final String methodName, final String descName, final EnumSet<Flag> flags) {
         debug("load handle ");
         pushType(Type.OBJECT.ldc(method, new Handle(Flag.getValue(flags), className, methodName, descName)));
         return this;
@@ -939,7 +933,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter loadVarArgs() {
+    MethodEmitter loadVarArgs() {
         debug("load var args " + functionNode.getVarArgsNode().getSymbol());
         return load(functionNode.getVarArgsNode().getSymbol());
     }
@@ -949,7 +943,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter loadArguments() {
+    MethodEmitter loadArguments() {
         debug("load arguments ", functionNode.getArgumentsNode().getSymbol());
         assert functionNode.getArgumentsNode().getSymbol().getSlot() != 0;
         return load(functionNode.getArgumentsNode().getSymbol());
@@ -960,7 +954,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter loadCallee() {
+    MethodEmitter loadCallee() {
         final Symbol calleeSymbol = functionNode.getCalleeNode().getSymbol();
         debug("load callee ", calleeSymbol);
         assert calleeSymbol.getSlot() == 0 : "callee has wrong slot " + calleeSymbol.getSlot() + " in " + functionNode.getName();
@@ -971,7 +965,7 @@ public class MethodEmitter implements Emitter {
     /**
      * Pop the scope from the stack and store it in its predefined slot
      */
-    public void storeScope() {
+    void storeScope() {
         debug("store scope");
         store(functionNode.getScopeNode().getSymbol());
     }
@@ -979,7 +973,7 @@ public class MethodEmitter implements Emitter {
     /**
      * Pop the return from the stack and store it in its predefined slot
      */
-    public void storeResult() {
+    void storeResult() {
         debug("store result");
         store(functionNode.getResultNode().getSymbol());
     }
@@ -987,7 +981,7 @@ public class MethodEmitter implements Emitter {
     /**
      * Pop the arguments array from the stack and store it in its predefined slot
      */
-    public void storeArguments() {
+    void storeArguments() {
         debug("store arguments");
         store(functionNode.getArgumentsNode().getSymbol());
     }
@@ -996,7 +990,7 @@ public class MethodEmitter implements Emitter {
      * Load an element from an array, determining type automatically
      * @return the method emitter
      */
-    public MethodEmitter arrayload() {
+    MethodEmitter arrayload() {
         debug("Xaload");
         popType(Type.INT);
         pushType(popArray().aload(method));
@@ -1007,7 +1001,7 @@ public class MethodEmitter implements Emitter {
      * Pop a value, an index and an array from the stack and store
      * the value at the given index in the array.
      */
-    public void arraystore() {
+    void arraystore() {
         debug("Xastore");
         final Type value = popType();
         final Type index = popType(Type.INT);
@@ -1025,7 +1019,7 @@ public class MethodEmitter implements Emitter {
      *
      * @param symbol symbol to store stack to
      */
-    public void store(final Symbol symbol) {
+    void store(final Symbol symbol) {
         assert symbol != null : "No symbol to store";
         if (symbol.hasSlot()) {
             final int slot = symbol.getSlot();
@@ -1035,7 +1029,7 @@ public class MethodEmitter implements Emitter {
             assert !symbol.isScope();
             assert functionNode.isVarArg() : "Non-vararg functions have slotted parameters";
             final int index = symbol.getFieldIndex();
-            if(functionNode.needsArguments()) {
+            if (functionNode.needsArguments()) {
                 debug("store symbol", symbol.getName(), " arguments index=", index);
                 loadArguments();
                 load(index);
@@ -1057,7 +1051,7 @@ public class MethodEmitter implements Emitter {
      * @param type the type to pop
      * @param slot the slot
      */
-    public void store(final Type type, final int slot) {
+    void store(final Type type, final int slot) {
         popType(type);
         type.store(method, slot);
     }
@@ -1068,7 +1062,7 @@ public class MethodEmitter implements Emitter {
      * @param slot the int slot
      * @param increment the amount to increment
      */
-    public void iinc(final int slot, final int increment) {
+    void iinc(final int slot, final int increment) {
         debug("iinc");
         method.visitIincInsn(slot, increment);
     }
@@ -1094,7 +1088,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter _instanceof(final String classDescriptor) {
+    MethodEmitter _instanceof(final String classDescriptor) {
         debug("instanceof", classDescriptor);
         popType(Type.OBJECT);
         method.visitTypeInsn(INSTANCEOF, classDescriptor);
@@ -1111,7 +1105,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter _instanceof(final Class<?> clazz) {
+    MethodEmitter _instanceof(final Class<?> clazz) {
         return _instanceof(CompilerConstants.className(clazz));
     }
 
@@ -1123,7 +1117,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter checkcast(final String classDescriptor) {
+    MethodEmitter checkcast(final String classDescriptor) {
         debug("checkcast", classDescriptor);
         assert peekType().isObject();
         method.visitTypeInsn(CHECKCAST, classDescriptor);
@@ -1138,7 +1132,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter checkcast(final Class<?> clazz) {
+    MethodEmitter checkcast(final Class<?> clazz) {
         return checkcast(CompilerConstants.className(clazz));
     }
 
@@ -1150,7 +1144,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter newarray(final ArrayType arrayType) {
+    MethodEmitter newarray(final ArrayType arrayType) {
         debug("newarray ", "arrayType=" + arrayType);
         popType(Type.INT); //LENGTH
         pushType(arrayType.newarray(method));
@@ -1166,7 +1160,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter multinewarray(final ArrayType arrayType, final int dims) {
+    MethodEmitter multinewarray(final ArrayType arrayType, final int dims) {
         debug("multianewarray ", arrayType, dims);
         for (int i = 0; i < dims; i++) {
             popType(Type.INT); //LENGTH
@@ -1200,7 +1194,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter invoke(final Call call) {
+    MethodEmitter invoke(final Call call) {
         return call.invoke(this);
     }
 
@@ -1229,7 +1223,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter invokeSpecial(final String className, final String methodName, final String methodDescriptor) {
+    MethodEmitter invokespecial(final String className, final String methodName, final String methodDescriptor) {
         debug("invokespecial", className + "." + methodName + methodDescriptor);
         return invoke(INVOKESPECIAL, className, methodName, methodDescriptor, true);
     }
@@ -1243,7 +1237,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter invokeVirtual(final String className, final String methodName, final String methodDescriptor) {
+    MethodEmitter invokevirtual(final String className, final String methodName, final String methodDescriptor) {
         debug("invokevirtual", className + "." + methodName + methodDescriptor + " " + stack);
         return invoke(INVOKEVIRTUAL, className, methodName, methodDescriptor, true);
     }
@@ -1257,7 +1251,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter invokeStatic(final String className, final String methodName, final String methodDescriptor) {
+    MethodEmitter invokestatic(final String className, final String methodName, final String methodDescriptor) {
         debug("invokestatic", className + "." + methodName + methodDescriptor);
         invoke(INVOKESTATIC, className, methodName, methodDescriptor, false);
         return this;
@@ -1274,8 +1268,8 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter invokeStatic(final String className, final String methodName, final String methodDescriptor, final Type returnType) {
-        invokeStatic(className, methodName, methodDescriptor);
+    MethodEmitter invokeStatic(final String className, final String methodName, final String methodDescriptor, final Type returnType) {
+        invokestatic(className, methodName, methodDescriptor);
         popType();
         pushType(returnType);
         return this;
@@ -1290,7 +1284,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter invokeInterface(final String className, final String methodName, final String methodDescriptor) {
+    MethodEmitter invokeinterface(final String className, final String methodName, final String methodDescriptor) {
         debug("invokeinterface", className + "." + methodName + methodDescriptor);
         return invoke(INVOKEINTERFACE, className, methodName, methodDescriptor, true);
     }
@@ -1302,7 +1296,7 @@ public class MethodEmitter implements Emitter {
      * @param values       case values for the table
      * @param table        default label
      */
-    public void lookupSwitch(final Label defaultLabel, final int[] values, final Label[] table) {
+    void lookupswitch(final Label defaultLabel, final int[] values, final Label[] table) {
         debug("lookupswitch", peekType());
         popType(Type.INT);
         method.visitLookupSwitchInsn(defaultLabel, values, table);
@@ -1315,7 +1309,7 @@ public class MethodEmitter implements Emitter {
      * @param defaultLabel  default label
      * @param table         label table
      */
-    public void tableSwitch(final int lo, final int hi, final Label defaultLabel, final Label[] table) {
+    void tableswitch(final int lo, final int hi, final Label defaultLabel, final Label[] table) {
         debug("tableswitch", peekType());
         popType(Type.INT);
         method.visitTableSwitchInsn(lo, hi, defaultLabel, table);
@@ -1357,7 +1351,7 @@ public class MethodEmitter implements Emitter {
      *
      * @param type the type for the return
      */
-    public void _return(final Type type) {
+    void _return(final Type type) {
         debug("return", type);
         assert stack.size() == 1 : "Only return value on stack allowed at return point - depth=" + stack.size() + " stack = " + stack;
         final Type stackType = peekType();
@@ -1371,14 +1365,14 @@ public class MethodEmitter implements Emitter {
     /**
      * Perform a return using the stack top value as the guide for the type
      */
-    public void _return() {
+    void _return() {
         _return(peekType());
     }
 
     /**
      * Perform a void return.
      */
-    public void returnVoid() {
+    void returnVoid() {
         debug("return [void]");
         assert stack.isEmpty() : stack;
         method.visitInsn(RETURN);
@@ -1392,7 +1386,7 @@ public class MethodEmitter implements Emitter {
      *
      * @param label destination label
      */
-    public void splitAwareGoto(final Label label) {
+    void splitAwareGoto(final Label label) {
 
         if (splitNode != null) {
             final int index = splitNode.getExternalTargets().indexOf(label);
@@ -1418,7 +1412,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter cmp(final boolean isCmpG) {
+    MethodEmitter cmp(final boolean isCmpG) {
         pushType(get2n().cmp(method, isCmpG));
         return this;
     }
@@ -1443,7 +1437,7 @@ public class MethodEmitter implements Emitter {
      *
      * @param label label to true case
      */
-    public void if_acmpeq(final Label label) {
+    void if_acmpeq(final Label label) {
         debug("if_acmpeq", label);
         jump(IF_ACMPEQ, label, 2);
     }
@@ -1453,7 +1447,7 @@ public class MethodEmitter implements Emitter {
      *
      * @param label label to true case
      */
-    public void if_acmpne(final Label label) {
+    void if_acmpne(final Label label) {
         debug("if_acmpne", label);
         jump(IF_ACMPNE, label, 2);
     }
@@ -1463,7 +1457,7 @@ public class MethodEmitter implements Emitter {
      *
      * @param label label to true case
      */
-    public void ifnull(final Label label) {
+    void ifnull(final Label label) {
         debug("ifnull", label);
         jump(IFNULL, label, 1);
     }
@@ -1473,7 +1467,7 @@ public class MethodEmitter implements Emitter {
      *
      * @param label label to true case
      */
-    public void ifnonnull(final Label label) {
+    void ifnonnull(final Label label) {
         debug("ifnonnull", label);
         jump(IFNONNULL, label, 1);
     }
@@ -1483,7 +1477,7 @@ public class MethodEmitter implements Emitter {
      *
      * @param label label to true case
      */
-    public void ifeq(final Label label) {
+    void ifeq(final Label label) {
         debug("ifeq ", label);
         jump(IFEQ, label, 1);
     }
@@ -1493,7 +1487,7 @@ public class MethodEmitter implements Emitter {
      *
      * @param label label to true case
      */
-    public void if_icmpeq(final Label label) {
+    void if_icmpeq(final Label label) {
         debug("if_icmpeq", label);
         jump(IF_ICMPEQ, label, 2);
     }
@@ -1503,8 +1497,7 @@ public class MethodEmitter implements Emitter {
      *
      * @param label label to true case
      */
-
-    public void ifne(final Label label) {
+    void ifne(final Label label) {
         debug("ifne", label);
         jump(IFNE, label, 1);
     }
@@ -1514,7 +1507,7 @@ public class MethodEmitter implements Emitter {
      *
      * @param label label to true case
      */
-    public void if_icmpne(final Label label) {
+    void if_icmpne(final Label label) {
         debug("if_icmpne", label);
         jump(IF_ICMPNE, label, 2);
     }
@@ -1524,7 +1517,7 @@ public class MethodEmitter implements Emitter {
      *
      * @param label label to true case
      */
-    public void iflt(final Label label) {
+    void iflt(final Label label) {
         debug("iflt", label);
         jump(IFLT, label, 1);
     }
@@ -1534,7 +1527,7 @@ public class MethodEmitter implements Emitter {
      *
      * @param label label to true case
      */
-    public void ifle(final Label label) {
+    void ifle(final Label label) {
         debug("ifle", label);
         jump(IFLE, label, 1);
     }
@@ -1544,7 +1537,7 @@ public class MethodEmitter implements Emitter {
      *
      * @param label label to true case
      */
-    public void ifgt(final Label label) {
+    void ifgt(final Label label) {
         debug("ifgt", label);
         jump(IFGT, label, 1);
     }
@@ -1554,7 +1547,7 @@ public class MethodEmitter implements Emitter {
      *
      * @param label label to true case
      */
-    public void ifge(final Label label) {
+    void ifge(final Label label) {
         debug("ifge", label);
         jump(IFGE, label, 1);
     }
@@ -1564,7 +1557,7 @@ public class MethodEmitter implements Emitter {
      *
      * @param label destination label
      */
-    public void _goto(final Label label) {
+    void _goto(final Label label) {
         debug("goto", label);
         jump(GOTO, label, 0);
         stack = null;
@@ -1617,7 +1610,7 @@ public class MethodEmitter implements Emitter {
      *
      * @param label the label
      */
-    public void label(final Label label) {
+    void label(final Label label) {
         /*
          * If stack == null, this means that we came here not through a fallthrough.
          * E.g. a label after an athrow. Then we create a new stack if one doesn't exist
@@ -1643,7 +1636,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter convert(final Type to) {
+    MethodEmitter convert(final Type to) {
         final Type type = peekType().convert(method, to);
         if (type != null) {
             if (peekType() != to) {
@@ -1696,7 +1689,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter add() {
+    MethodEmitter add() {
         debug("add");
         pushType(get2().add(method));
         return this;
@@ -1707,7 +1700,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter sub() {
+    MethodEmitter sub() {
         debug("sub");
         pushType(get2n().sub(method));
         return this;
@@ -1718,7 +1711,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter mul() {
+    MethodEmitter mul() {
         debug("mul ");
         pushType(get2n().mul(method));
         return this;
@@ -1729,7 +1722,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter div() {
+    MethodEmitter div() {
         debug("div");
         pushType(get2n().div(method));
         return this;
@@ -1740,7 +1733,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter rem() {
+    MethodEmitter rem() {
         debug("rem");
         pushType(get2n().rem(method));
         return this;
@@ -1795,7 +1788,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter dynamicNew(final int argCount, final int flags) {
+    MethodEmitter dynamicNew(final int argCount, final int flags) {
         debug("dynamic_new", "argcount=" + argCount);
         final String signature = getDynamicSignature(Type.OBJECT, argCount);
         method.visitInvokeDynamicInsn("dyn:new", signature, LINKERBOOTSTRAP, flags);
@@ -1812,7 +1805,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter dynamicCall(final Type returnType, final int argCount, final int flags) {
+    MethodEmitter dynamicCall(final Type returnType, final int argCount, final int flags) {
         debug("dynamic_call", "args=" + argCount, "returnType=" + returnType);
         final String signature = getDynamicSignature(returnType, argCount); // +1 because the function itself is the 1st parameter for dynamic calls (what you call - call target)
         debug("   signature", signature);
@@ -1831,7 +1824,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter dynamicRuntimeCall(final String name, final Type returnType, final RuntimeNode.Request request) {
+    MethodEmitter dynamicRuntimeCall(final String name, final Type returnType, final RuntimeNode.Request request) {
         debug("dynamic_runtime_call", name, "args=" + request.getArity(), "returnType=" + returnType);
         final String signature = getDynamicSignature(returnType, request.getArity());
         debug("   signature", signature);
@@ -1851,7 +1844,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter dynamicGet(final Type valueType, final String name, final int flags, final boolean isMethod) {
+    MethodEmitter dynamicGet(final Type valueType, final String name, final int flags, final boolean isMethod) {
         debug("dynamic_get", name, valueType);
 
         Type type = valueType;
@@ -1877,7 +1870,7 @@ public class MethodEmitter implements Emitter {
      * @param name      name of property
      * @param flags     call site flags
      */
-     public void dynamicSet(final Type valueType, final String name, final int flags) {
+     void dynamicSet(final Type valueType, final String name, final int flags) {
         debug("dynamic_set", name, peekType());
 
         Type type = valueType;
@@ -1902,7 +1895,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter dynamicGetIndex(final Type result, final int flags, final boolean isMethod) {
+    MethodEmitter dynamicGetIndex(final Type result, final int flags, final boolean isMethod) {
         debug("dynamic_get_index", peekType(1) + "[" + peekType() + "]");
 
         Type resultType = result;
@@ -1938,7 +1931,7 @@ public class MethodEmitter implements Emitter {
      *
      * @param flags call site flags for setter
      */
-    public void dynamicSetIndex(final int flags) {
+    void dynamicSetIndex(final int flags) {
         debug("dynamic_set_index", peekType(2) + "[" + peekType(1) + "] =", peekType());
 
         Type value = peekType();
@@ -2015,7 +2008,7 @@ public class MethodEmitter implements Emitter {
       *
       * @return the method emitter
       */
-    public MethodEmitter getField(final FieldAccess fa) {
+    MethodEmitter getField(final FieldAccess fa) {
         return fa.get(this);
     }
 
@@ -2024,7 +2017,7 @@ public class MethodEmitter implements Emitter {
       *
       * @param fa the field access
       */
-    public void putField(final FieldAccess fa) {
+    void putField(final FieldAccess fa) {
         fa.put(this);
     }
 
@@ -2038,7 +2031,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter getField(final String className, final String fieldName, final String fieldDescriptor) {
+    MethodEmitter getField(final String className, final String fieldName, final String fieldDescriptor) {
         debug("getfield", "receiver=" + peekType(), className + "." + fieldName + fieldDescriptor);
         final Type receiver = popType();
         assert receiver.isObject();
@@ -2056,7 +2049,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return the method emitter
      */
-    public MethodEmitter getStatic(final String className, final String fieldName, final String fieldDescriptor) {
+    MethodEmitter getStatic(final String className, final String fieldName, final String fieldDescriptor) {
         debug("getstatic", className + "." + fieldName + "." + fieldDescriptor);
         method.visitFieldInsn(GETSTATIC, className, fieldName, fieldDescriptor);
         pushType(fieldType(fieldDescriptor));
@@ -2070,7 +2063,7 @@ public class MethodEmitter implements Emitter {
      * @param fieldName       field name
      * @param fieldDescriptor field descriptor
      */
-    public void putField(final String className, final String fieldName, final String fieldDescriptor) {
+    void putField(final String className, final String fieldName, final String fieldDescriptor) {
         debug("putfield", "receiver=" + peekType(1), "value=" + peekType());
         popType(fieldType(fieldDescriptor));
         popType(Type.OBJECT);
@@ -2084,7 +2077,7 @@ public class MethodEmitter implements Emitter {
      * @param fieldName       field name
      * @param fieldDescriptor field descriptor
      */
-    public void putStatic(final String className, final String fieldName, final String fieldDescriptor) {
+    void putStatic(final String className, final String fieldName, final String fieldDescriptor) {
         debug("putfield", "value=" + peekType());
         popType(fieldType(fieldDescriptor));
         method.visitFieldInsn(PUTSTATIC, className, fieldName, fieldDescriptor);
@@ -2096,7 +2089,7 @@ public class MethodEmitter implements Emitter {
      * @param line  line number
      * @param label label
      */
-    public void lineNumber(final int line, final Label label) {
+    void lineNumber(final int line, final Label label) {
         method.visitLineNumber(line, label);
     }
 
@@ -2112,7 +2105,7 @@ public class MethodEmitter implements Emitter {
     /**
      * Emit a System.err.print statement of whatever is on top of the bytecode stack
      */
-     public void print() {
+     void print() {
          getField(ERR_STREAM);
          swap();
          convert(Type.OBJECT);
@@ -2122,7 +2115,7 @@ public class MethodEmitter implements Emitter {
     /**
      * Emit a System.err.println statement of whatever is on top of the bytecode stack
      */
-     public void println() {
+     void println() {
          getField(ERR_STREAM);
          swap();
          convert(Type.OBJECT);
@@ -2133,7 +2126,7 @@ public class MethodEmitter implements Emitter {
       * Emit a System.err.print statement
       * @param string string to print
       */
-     public void print(final String string) {
+     void print(final String string) {
          getField(ERR_STREAM);
          load(string);
          invoke(PRINT);
@@ -2143,7 +2136,7 @@ public class MethodEmitter implements Emitter {
       * Emit a System.err.println statement
       * @param string string to print
       */
-     public void println(final String string) {
+     void println(final String string) {
          getField(ERR_STREAM);
          load(string);
          invoke(PRINTLN);
@@ -2152,7 +2145,7 @@ public class MethodEmitter implements Emitter {
      /**
       * Print a stacktrace to S
       */
-     public void stacktrace() {
+     void stacktrace() {
          _new(Throwable.class);
          dup();
          invoke(constructorNoLookup(Throwable.class));
@@ -2254,130 +2247,11 @@ public class MethodEmitter implements Emitter {
         }
     }
 
-
-    /**
-     * Abstraction for labels, separating a label from the underlying
-     * byte code emitter. Also augmenting label with e.g. a name
-     * for easier debugging and reading code
-     *
-     * see -Dnashorn.codegen.debug, --log=codegen
-     */
-    public static class Label extends jdk.internal.org.objectweb.asm.Label {
-        /** Name of this label */
-        private final String name;
-
-        /** Type stack at this label */
-        private ArrayDeque<Type> stack;
-
-        /**
-         * Constructor
-         *
-         * @param name name of this label
-         */
-        public Label(final String name) {
-            super();
-            this.name = name;
-        }
-
-        /**
-         * Copy constructor
-         *
-         * @param label a label to clone
-         */
-        public Label(final Label label) {
-            super();
-            name = label.name;
-        }
-
-        ArrayDeque<Type> getStack() {
-            return stack;
-        }
-
-        void setStack(final ArrayDeque<Type> stack) {
-            this.stack = stack;
-        }
-
-        @Override
-        public String toString() {
-            final StringBuilder sb = new StringBuilder();
-            String s = super.toString();
-            s = s.substring(1, s.length());
-            sb.append(name).append('_').append(Long.toHexString(Long.parseLong(s)));
-
-            return sb.toString();
-        }
-    }
-
-    /**
-     * Condition enum used for all kinds of jumps, regardless of type
-     */
-    static enum Condition {
-        EQ,
-        NE,
-        LE,
-        LT,
-        GE,
-        GT;
-
-        public static Condition forRuntimeRequest(final RuntimeNode.Request request) {
-            try {
-                final String reqString = request.toString().replace("_STRICT", "");
-                return Condition.valueOf(reqString);
-            } catch (final IllegalArgumentException e) {
-                return null;
-            }
-        }
-
-        public static int toUnary(final Condition c) {
-            switch (c) {
-            case EQ:
-                return IFEQ;
-            case NE:
-                return IFNE;
-            case LE:
-                return IFLE;
-            case LT:
-                return IFLT;
-            case GE:
-                return IFGE;
-            case GT:
-                return IFGT;
-            default:
-                assert false;
-                return -1;
-            }
-        }
-
-        public static int toBinary(final Condition c) {
-            return toBinary(c, false);
-        }
-
-        public static int toBinary(final Condition c, final boolean isObject) {
-            switch (c) {
-            case EQ:
-                return isObject ? IF_ACMPEQ : IF_ICMPEQ;
-            case NE:
-                return isObject ? IF_ACMPNE : IF_ICMPNE;
-            case LE:
-                return IF_ICMPLE;
-            case LT:
-                return IF_ICMPLT;
-            case GE:
-                return IF_ICMPGE;
-            case GT:
-                return IF_ICMPGT;
-            default:
-                assert false;
-                return -1;
-            }
-        }
-    }
-
     /**
      * Set the current function node being emitted
      * @param functionNode the function node
      */
-    public void setFunctionNode(final FunctionNode functionNode) {
+    void setFunctionNode(final FunctionNode functionNode) {
         this.functionNode = functionNode;
     }
 
@@ -2387,7 +2261,7 @@ public class MethodEmitter implements Emitter {
      *
      * @return split node
      */
-    public SplitNode getSplitNode() {
+    SplitNode getSplitNode() {
         return splitNode;
     }
 
@@ -2395,7 +2269,7 @@ public class MethodEmitter implements Emitter {
      * Set the split node for this method emitter
      * @param splitNode split node
      */
-    public void setSplitNode(final SplitNode splitNode) {
+    void setSplitNode(final SplitNode splitNode) {
         this.splitNode = splitNode;
     }
 }
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectClassGenerator.java b/nashorn/src/jdk/nashorn/internal/codegen/ObjectClassGenerator.java
similarity index 99%
rename from nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectClassGenerator.java
rename to nashorn/src/jdk/nashorn/internal/codegen/ObjectClassGenerator.java
index 72f9181845d..25175db821a 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectClassGenerator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/ObjectClassGenerator.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen.objects;
+package jdk.nashorn.internal.codegen;
 
 import static jdk.nashorn.internal.codegen.Compiler.SCRIPTS_PACKAGE;
 import static jdk.nashorn.internal.codegen.CompilerConstants.ALLOCATE;
@@ -45,9 +45,7 @@ import java.util.EnumSet;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
-import jdk.nashorn.internal.codegen.ClassEmitter;
 import jdk.nashorn.internal.codegen.ClassEmitter.Flag;
-import jdk.nashorn.internal.codegen.MethodEmitter;
 import jdk.nashorn.internal.codegen.types.Type;
 import jdk.nashorn.internal.runtime.AccessorProperty;
 import jdk.nashorn.internal.runtime.Context;
@@ -67,7 +65,7 @@ public final class ObjectClassGenerator {
     /**
      * Marker for scope parameters.
      */
-    public static final String SCOPE_MARKER = "P";
+    static final String SCOPE_MARKER = "P";
 
     /**
      * Debug field logger
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectCreator.java b/nashorn/src/jdk/nashorn/internal/codegen/ObjectCreator.java
similarity index 94%
rename from nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectCreator.java
rename to nashorn/src/jdk/nashorn/internal/codegen/ObjectCreator.java
index 71c0b699da9..69a200d75a4 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/objects/ObjectCreator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/ObjectCreator.java
@@ -23,13 +23,9 @@
  * questions.
  */
 
-package jdk.nashorn.internal.codegen.objects;
+package jdk.nashorn.internal.codegen;
 
 import java.util.List;
-import jdk.nashorn.internal.codegen.CodeGenerator;
-import jdk.nashorn.internal.codegen.CompileUnit;
-import jdk.nashorn.internal.codegen.Compiler;
-import jdk.nashorn.internal.codegen.MethodEmitter;
 import jdk.nashorn.internal.ir.Symbol;
 import jdk.nashorn.internal.runtime.Context;
 import jdk.nashorn.internal.runtime.PropertyMap;
@@ -114,7 +110,7 @@ public abstract class ObjectCreator {
      * Generate code for making the object.
      * @param method Script method.
      */
-    public abstract void makeObject(final MethodEmitter method);
+    protected abstract void makeObject(final MethodEmitter method);
 
     /**
      * Create a new MapCreator
@@ -154,7 +150,7 @@ public abstract class ObjectCreator {
      *
      * @return script class name
      */
-    public String getClassName() {
+    String getClassName() {
         return fieldObjectClassName;
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/SharedScopeCall.java b/nashorn/src/jdk/nashorn/internal/codegen/SharedScopeCall.java
index f8e26996298..588e2f4878e 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/SharedScopeCall.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/SharedScopeCall.java
@@ -48,7 +48,7 @@ import jdk.nashorn.internal.runtime.ScriptObject;
  * <p>Scope calls must not be shared between normal callsites and callsites contained in a <tt>with</tt>
  * statement as this condition is not handled by current guards and will cause a runtime error.</p>
  */
-public class SharedScopeCall {
+class SharedScopeCall {
 
     /** Threshold for using shared scope calls with fast scope access. */
     public static final int FAST_SCOPE_CALL_THRESHOLD = 4;
@@ -118,7 +118,7 @@ public class SharedScopeCall {
      * @param method the method emitter
      */
     public void generateInvoke(final MethodEmitter method) {
-        method.invokeStatic(compileUnit.getUnitClassName(), methodName, getStaticSignature());
+        method.invokestatic(compileUnit.getUnitClassName(), methodName, getStaticSignature());
     }
 
     /**
@@ -138,8 +138,8 @@ public class SharedScopeCall {
 
         // Load correct scope by calling getProto() on the scope argument as often as specified
         // by the second argument.
-        final MethodEmitter.Label parentLoopStart = new MethodEmitter.Label("parent_loop_start");
-        final MethodEmitter.Label parentLoopDone = new MethodEmitter.Label("parent_loop_done");
+        final Label parentLoopStart = new Label("parent_loop_start");
+        final Label parentLoopDone  = new Label("parent_loop_done");
         method.load(Type.OBJECT, 0);
         method.label(parentLoopStart);
         method.load(Type.INT, 1);
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Splitter.java b/nashorn/src/jdk/nashorn/internal/codegen/Splitter.java
index d95fd4b6c37..de66869334a 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Splitter.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Splitter.java
@@ -396,7 +396,7 @@ final class Splitter extends NodeVisitor {
          * @param targetNode the jump target node.
          * @param targetLabel the jump target label.
          */
-        private void searchJumpTarget(final Node targetNode, final MethodEmitter.Label targetLabel) {
+        private void searchJumpTarget(final Node targetNode, final Label targetLabel) {
 
             final SplitNode targetSplit = targetNodes.get(targetNode);
             // Note that targetSplit may be null, indicating that targetNode is in top level method.
@@ -406,7 +406,7 @@ final class Splitter extends NodeVisitor {
                 if (split == targetSplit) {
                     break;
                 }
-                final List<MethodEmitter.Label> externalTargets = split.getExternalTargets();
+                final List<Label> externalTargets = split.getExternalTargets();
                 if (!externalTargets.contains(targetLabel)) {
                     split.addExternalTarget(targetLabel);
                 }
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/BooleanType.java b/nashorn/src/jdk/nashorn/internal/codegen/types/BooleanType.java
index 2a7a5044d7d..c27c0584491 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/types/BooleanType.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/types/BooleanType.java
@@ -59,7 +59,7 @@ import static jdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
 
 import jdk.internal.org.objectweb.asm.MethodVisitor;
 import jdk.nashorn.internal.codegen.CompilerConstants;
-import jdk.nashorn.internal.codegen.objects.ObjectClassGenerator;
+import jdk.nashorn.internal.codegen.ObjectClassGenerator;
 import jdk.nashorn.internal.runtime.JSType;
 
 /**
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/IntType.java b/nashorn/src/jdk/nashorn/internal/codegen/types/IntType.java
index fc54b1248f7..9b859dddcbc 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/types/IntType.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/types/IntType.java
@@ -55,7 +55,7 @@ import static jdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
 
 import jdk.internal.org.objectweb.asm.MethodVisitor;
 import jdk.nashorn.internal.codegen.CompilerConstants;
-import jdk.nashorn.internal.codegen.objects.ObjectClassGenerator;
+import jdk.nashorn.internal.codegen.ObjectClassGenerator;
 
 /**
  * Type class: INT
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/LongType.java b/nashorn/src/jdk/nashorn/internal/codegen/types/LongType.java
index 7df5bfedfe3..d3e00b67817 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/types/LongType.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/types/LongType.java
@@ -49,7 +49,7 @@ import static jdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
 
 import jdk.internal.org.objectweb.asm.MethodVisitor;
 import jdk.nashorn.internal.codegen.CompilerConstants;
-import jdk.nashorn.internal.codegen.objects.ObjectClassGenerator;
+import jdk.nashorn.internal.codegen.ObjectClassGenerator;
 
 /**
  * Type class: LONG
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/types/NumberType.java b/nashorn/src/jdk/nashorn/internal/codegen/types/NumberType.java
index 980c002f59a..4dc62c52cb5 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/types/NumberType.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/types/NumberType.java
@@ -42,7 +42,7 @@ import static jdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
 
 import jdk.internal.org.objectweb.asm.MethodVisitor;
 import jdk.nashorn.internal.codegen.CompilerConstants;
-import jdk.nashorn.internal.codegen.objects.ObjectClassGenerator;
+import jdk.nashorn.internal.codegen.ObjectClassGenerator;
 import jdk.nashorn.internal.runtime.JSType;
 
 class NumberType extends NumericType {
diff --git a/nashorn/src/jdk/nashorn/internal/ir/AccessNode.java b/nashorn/src/jdk/nashorn/internal/ir/AccessNode.java
index 4f85bd4785a..481e3855447 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/AccessNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/AccessNode.java
@@ -25,9 +25,9 @@
 
 package jdk.nashorn.internal.ir;
 
-import static jdk.nashorn.internal.codegen.objects.ObjectClassGenerator.DEBUG_FIELDS;
+import static jdk.nashorn.internal.codegen.ObjectClassGenerator.DEBUG_FIELDS;
 
-import jdk.nashorn.internal.codegen.objects.ObjectClassGenerator;
+import jdk.nashorn.internal.codegen.ObjectClassGenerator;
 import jdk.nashorn.internal.codegen.types.Type;
 import jdk.nashorn.internal.ir.visitor.NodeVisitor;
 import jdk.nashorn.internal.runtime.Source;
diff --git a/nashorn/src/jdk/nashorn/internal/ir/BaseNode.java b/nashorn/src/jdk/nashorn/internal/ir/BaseNode.java
index a0522ff422f..ea632d1b672 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/BaseNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/BaseNode.java
@@ -60,7 +60,7 @@ public abstract class BaseNode extends Node implements FunctionCall {
      */
     protected BaseNode(final BaseNode baseNode, final CopyState cs) {
         super(baseNode);
-        base = cs.existingOrCopy(baseNode.getBase());
+        this.base = cs.existingOrCopy(baseNode.getBase());
         setStart(base.getStart());
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/ir/Block.java b/nashorn/src/jdk/nashorn/internal/ir/Block.java
index e15c51d1788..9449be5b0a5 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/Block.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/Block.java
@@ -40,7 +40,7 @@ import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import jdk.nashorn.internal.codegen.Frame;
-import jdk.nashorn.internal.codegen.MethodEmitter.Label;
+import jdk.nashorn.internal.codegen.Label;
 import jdk.nashorn.internal.ir.annotations.Ignore;
 import jdk.nashorn.internal.ir.annotations.ParentNode;
 import jdk.nashorn.internal.ir.visitor.NodeVisitor;
@@ -94,7 +94,6 @@ public class Block extends Node {
         this.function   = function;
         this.statements = new ArrayList<>();
         this.symbols    = new HashMap<>();
-        this.frame      = null;
         this.entryLabel = new Label("block_entry");
         this.breakLabel = new Label("block_break");
     }
@@ -108,16 +107,16 @@ public class Block extends Node {
     protected Block(final Block block, final CopyState cs) {
         super(block);
 
-        parent     = block.parent;
-        function   = block.function;
-        statements = new ArrayList<>();
+        this.parent     = block.parent;
+        this.function   = block.function;
+        this.statements = new ArrayList<>();
         for (final Node statement : block.getStatements()) {
             statements.add(cs.existingOrCopy(statement));
         }
-        symbols    = new HashMap<>();
-        frame      = block.frame == null ? null : block.frame.copy();
-        entryLabel = new Label(block.entryLabel);
-        breakLabel = new Label(block.breakLabel);
+        this.symbols    = new HashMap<>();
+        this.frame      = block.frame == null ? null : block.frame.copy();
+        this.entryLabel = new Label(block.entryLabel);
+        this.breakLabel = new Label(block.breakLabel);
 
         assert block.symbols.isEmpty() : "must not clone with symbols";
     }
diff --git a/nashorn/src/jdk/nashorn/internal/ir/BreakNode.java b/nashorn/src/jdk/nashorn/internal/ir/BreakNode.java
index ae792cf82b0..81c572d4b1b 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/BreakNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/BreakNode.java
@@ -25,7 +25,7 @@
 
 package jdk.nashorn.internal.ir;
 
-import jdk.nashorn.internal.codegen.MethodEmitter;
+import jdk.nashorn.internal.codegen.Label;
 import jdk.nashorn.internal.ir.visitor.NodeVisitor;
 import jdk.nashorn.internal.runtime.Source;
 
@@ -75,7 +75,7 @@ public class BreakNode extends LabeledNode {
      * Return the target label of this break node.
      * @return the target label.
      */
-    public MethodEmitter.Label getTargetLabel() {
+    public Label getTargetLabel() {
         if (targetNode instanceof BreakableNode) {
             return ((BreakableNode)targetNode).getBreakLabel();
         } else if (targetNode instanceof Block) {
diff --git a/nashorn/src/jdk/nashorn/internal/ir/BreakableNode.java b/nashorn/src/jdk/nashorn/internal/ir/BreakableNode.java
index 10334818133..d15b756492e 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/BreakableNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/BreakableNode.java
@@ -25,7 +25,7 @@
 
 package jdk.nashorn.internal.ir;
 
-import jdk.nashorn.internal.codegen.MethodEmitter;
+import jdk.nashorn.internal.codegen.Label;
 import jdk.nashorn.internal.runtime.Source;
 
 /**
@@ -35,7 +35,7 @@ import jdk.nashorn.internal.runtime.Source;
 public abstract class BreakableNode extends Node {
 
     /** break label. */
-    protected MethodEmitter.Label breakLabel;
+    protected Label breakLabel;
 
     /**
      * Constructor
@@ -61,7 +61,7 @@ public abstract class BreakableNode extends Node {
      * Return the break label, i.e. the location to go to on break.
      * @return the break label
      */
-    public MethodEmitter.Label getBreakLabel() {
+    public Label getBreakLabel() {
         return breakLabel;
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/ir/CallNode.java b/nashorn/src/jdk/nashorn/internal/ir/CallNode.java
index 9e48bc6e8de..387369e62be 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/CallNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/CallNode.java
@@ -164,10 +164,10 @@ public class CallNode extends Node implements TypeOverride {
             newArgs.add(cs.existingOrCopy(arg));
         }
 
-        function     = cs.existingOrCopy(callNode.function);     //TODO existing or same?
-        args         = newArgs;
-        isNew        = callNode.isNew;
-        inWithBlock  = callNode.inWithBlock;
+        this.function     = cs.existingOrCopy(callNode.function);     //TODO existing or same?
+        this.args         = newArgs;
+        this.isNew        = callNode.isNew;
+        this.inWithBlock  = callNode.inWithBlock;
     }
 
 
diff --git a/nashorn/src/jdk/nashorn/internal/ir/CaseNode.java b/nashorn/src/jdk/nashorn/internal/ir/CaseNode.java
index fa13776cf54..928ba5bec61 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/CaseNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/CaseNode.java
@@ -25,7 +25,7 @@
 
 package jdk.nashorn.internal.ir;
 
-import jdk.nashorn.internal.codegen.MethodEmitter.Label;
+import jdk.nashorn.internal.codegen.Label;
 import jdk.nashorn.internal.ir.visitor.NodeVisitor;
 import jdk.nashorn.internal.runtime.Source;
 
diff --git a/nashorn/src/jdk/nashorn/internal/ir/CatchNode.java b/nashorn/src/jdk/nashorn/internal/ir/CatchNode.java
index f7147e6c093..187c3949ec2 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/CatchNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/CatchNode.java
@@ -67,10 +67,10 @@ public class CatchNode extends Node {
     private CatchNode(final CatchNode catchNode, final CopyState cs) {
         super(catchNode);
 
-        exception          = (IdentNode)cs.existingOrCopy(catchNode.exception);
-        exceptionCondition = cs.existingOrCopy(catchNode.exceptionCondition);
-        body               = (Block)cs.existingOrCopy(catchNode.body);
-        isSyntheticRethrow = catchNode.isSyntheticRethrow;
+        this.exception          = (IdentNode)cs.existingOrCopy(catchNode.exception);
+        this.exceptionCondition = cs.existingOrCopy(catchNode.exceptionCondition);
+        this.body               = (Block)cs.existingOrCopy(catchNode.body);
+        this.isSyntheticRethrow = catchNode.isSyntheticRethrow;
      }
 
     @Override
diff --git a/nashorn/src/jdk/nashorn/internal/ir/ContinueNode.java b/nashorn/src/jdk/nashorn/internal/ir/ContinueNode.java
index ce817d85e43..2063d6b2525 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/ContinueNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/ContinueNode.java
@@ -25,7 +25,7 @@
 
 package jdk.nashorn.internal.ir;
 
-import jdk.nashorn.internal.codegen.MethodEmitter;
+import jdk.nashorn.internal.codegen.Label;
 import jdk.nashorn.internal.ir.visitor.NodeVisitor;
 import jdk.nashorn.internal.runtime.Source;
 
@@ -72,7 +72,7 @@ public class ContinueNode extends LabeledNode {
      * Return the target label of this continue node.
      * @return the target label.
      */
-    public MethodEmitter.Label getTargetLabel() {
+    public Label getTargetLabel() {
         assert targetNode instanceof WhileNode : "continue target must be a while node";
         return ((WhileNode)targetNode).getContinueLabel();
     }
diff --git a/nashorn/src/jdk/nashorn/internal/ir/IdentNode.java b/nashorn/src/jdk/nashorn/internal/ir/IdentNode.java
index 19692a70cde..b0570a25ce5 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/IdentNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/IdentNode.java
@@ -28,9 +28,9 @@ package jdk.nashorn.internal.ir;
 import static jdk.nashorn.internal.codegen.CompilerConstants.__DIR__;
 import static jdk.nashorn.internal.codegen.CompilerConstants.__FILE__;
 import static jdk.nashorn.internal.codegen.CompilerConstants.__LINE__;
-import static jdk.nashorn.internal.codegen.objects.ObjectClassGenerator.DEBUG_FIELDS;
+import static jdk.nashorn.internal.codegen.ObjectClassGenerator.DEBUG_FIELDS;
 
-import jdk.nashorn.internal.codegen.objects.ObjectClassGenerator;
+import jdk.nashorn.internal.codegen.ObjectClassGenerator;
 import jdk.nashorn.internal.codegen.types.Type;
 import jdk.nashorn.internal.ir.visitor.NodeVisitor;
 import jdk.nashorn.internal.runtime.Source;
diff --git a/nashorn/src/jdk/nashorn/internal/ir/IndexNode.java b/nashorn/src/jdk/nashorn/internal/ir/IndexNode.java
index bbce0a3b726..9feb5ebf2bf 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/IndexNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/IndexNode.java
@@ -25,9 +25,9 @@
 
 package jdk.nashorn.internal.ir;
 
-import static jdk.nashorn.internal.codegen.objects.ObjectClassGenerator.DEBUG_FIELDS;
+import static jdk.nashorn.internal.codegen.ObjectClassGenerator.DEBUG_FIELDS;
 
-import jdk.nashorn.internal.codegen.objects.ObjectClassGenerator;
+import jdk.nashorn.internal.codegen.ObjectClassGenerator;
 import jdk.nashorn.internal.codegen.types.Type;
 import jdk.nashorn.internal.ir.visitor.NodeVisitor;
 import jdk.nashorn.internal.runtime.Source;
diff --git a/nashorn/src/jdk/nashorn/internal/ir/LabelNode.java b/nashorn/src/jdk/nashorn/internal/ir/LabelNode.java
index b74d5637b53..c61bfcbd107 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/LabelNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/LabelNode.java
@@ -68,10 +68,10 @@ public class LabelNode extends Node {
     private LabelNode(final LabelNode labelNode, final CopyState cs) {
         super(labelNode);
 
-        label        = (IdentNode)cs.existingOrCopy(labelNode.label);
-        body         = (Block)cs.existingOrCopy(labelNode.body);
-        breakNode    = cs.existingOrSame(labelNode.breakNode);
-        continueNode = cs.existingOrSame(labelNode.continueNode);
+        this.label        = (IdentNode)cs.existingOrCopy(labelNode.label);
+        this.body         = (Block)cs.existingOrCopy(labelNode.body);
+        this.breakNode    = cs.existingOrSame(labelNode.breakNode);
+        this.continueNode = cs.existingOrSame(labelNode.continueNode);
     }
 
     @Override
diff --git a/nashorn/src/jdk/nashorn/internal/ir/LineNumberNode.java b/nashorn/src/jdk/nashorn/internal/ir/LineNumberNode.java
index a826afbb843..ef1c05e13e8 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/LineNumberNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/LineNumberNode.java
@@ -53,7 +53,7 @@ public class LineNumberNode extends Node {
    private LineNumberNode(final LineNumberNode lineNumberNode) {
         super(lineNumberNode);
 
-        lineNumber = lineNumberNode.getLineNumber();
+        this.lineNumber = lineNumberNode.getLineNumber();
     }
 
     @Override
diff --git a/nashorn/src/jdk/nashorn/internal/ir/ObjectNode.java b/nashorn/src/jdk/nashorn/internal/ir/ObjectNode.java
index acb2ddec45a..ab7e49e4650 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/ObjectNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/ObjectNode.java
@@ -68,8 +68,8 @@ public class ObjectNode extends Node {
             newElements.add(cs.existingOrCopy(element));
         }
 
-        context  = (Block)cs.existingOrCopy(objectNode.context);
-        elements = newElements;
+        this.context  = (Block)cs.existingOrCopy(objectNode.context);
+        this.elements = newElements;
     }
 
     @Override
diff --git a/nashorn/src/jdk/nashorn/internal/ir/ReturnNode.java b/nashorn/src/jdk/nashorn/internal/ir/ReturnNode.java
index cf5cb89cd23..35395b30d79 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/ReturnNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/ReturnNode.java
@@ -65,8 +65,8 @@ public class ReturnNode extends Node {
     private ReturnNode(final ReturnNode returnNode, final CopyState cs) {
         super(returnNode);
 
-        expression = cs.existingOrCopy(returnNode.expression);
-        tryChain   = (TryNode)cs.existingOrSame(returnNode.tryChain);
+        this.expression = cs.existingOrCopy(returnNode.expression);
+        this.tryChain   = (TryNode)cs.existingOrSame(returnNode.tryChain);
     }
 
     @Override
diff --git a/nashorn/src/jdk/nashorn/internal/ir/SplitNode.java b/nashorn/src/jdk/nashorn/internal/ir/SplitNode.java
index d51ccb7e02e..c09a4f025a6 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/SplitNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/SplitNode.java
@@ -29,6 +29,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import jdk.nashorn.internal.codegen.CompileUnit;
+import jdk.nashorn.internal.codegen.Label;
 import jdk.nashorn.internal.codegen.MethodEmitter;
 import jdk.nashorn.internal.ir.annotations.Ignore;
 import jdk.nashorn.internal.ir.annotations.Reference;
@@ -57,7 +58,7 @@ public class SplitNode extends Node {
 
     /** A list of target labels in parent methods this split node may encounter. */
     @Ignore
-    private final List<MethodEmitter.Label> externalTargets;
+    private final List<Label> externalTargets;
 
     /** True if this split node or any of its children contain a return statement. */
     private boolean hasReturn;
@@ -85,10 +86,10 @@ public class SplitNode extends Node {
     private SplitNode(final SplitNode splitNode, final CopyState cs) {
         super(splitNode);
 
-        name         = splitNode.name;
-        functionNode = (FunctionNode)cs.existingOrSame(splitNode.functionNode);
-        body         = cs.existingOrCopy(splitNode.body);
-        externalTargets = new ArrayList<>();
+        this.name         = splitNode.name;
+        this.functionNode = (FunctionNode)cs.existingOrSame(splitNode.functionNode);
+        this.body         = cs.existingOrCopy(splitNode.body);
+        this.externalTargets = new ArrayList<>();
     }
 
     @Override
@@ -196,7 +197,7 @@ public class SplitNode extends Node {
      * Get the external targets for this SplitNode
      * @return list of external targets
      */
-    public List<MethodEmitter.Label> getExternalTargets() {
+    public List<Label> getExternalTargets() {
         return Collections.unmodifiableList(externalTargets);
     }
 
@@ -204,7 +205,7 @@ public class SplitNode extends Node {
      * Add an external target for this SplitNode
      * @param targetLabel target label
      */
-    public void addExternalTarget(final MethodEmitter.Label targetLabel) {
+    public void addExternalTarget(final Label targetLabel) {
         externalTargets.add(targetLabel);
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/ir/SwitchNode.java b/nashorn/src/jdk/nashorn/internal/ir/SwitchNode.java
index 74ad922eb52..068398ee375 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/SwitchNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/SwitchNode.java
@@ -28,7 +28,7 @@ package jdk.nashorn.internal.ir;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import jdk.nashorn.internal.codegen.MethodEmitter.Label;
+import jdk.nashorn.internal.codegen.Label;
 import jdk.nashorn.internal.ir.annotations.Ignore;
 import jdk.nashorn.internal.ir.visitor.NodeVisitor;
 import jdk.nashorn.internal.runtime.Source;
@@ -59,12 +59,7 @@ public class SwitchNode extends BreakableNode {
      */
     public SwitchNode(final Source source, final long token, final int finish) {
         super(source, token, finish);
-
-        expression  = null;
-        tag         = null;
-        cases       = null;
-        defaultCase = null;
-        breakLabel  = new Label("switch_break");
+        this.breakLabel  = new Label("switch_break");
     }
 
     private SwitchNode(final SwitchNode switchNode, final CopyState cs) {
@@ -76,11 +71,11 @@ public class SwitchNode extends BreakableNode {
            newCases.add((CaseNode)cs.existingOrCopy(caseNode));
         }
 
-        expression  = cs.existingOrCopy(switchNode.getExpression());
-        tag         = switchNode.getTag();
-        cases       = newCases;
-        defaultCase = (CaseNode)cs.existingOrCopy(switchNode.getDefaultCase());
-        breakLabel  = new Label(switchNode.getBreakLabel());
+        this.expression  = cs.existingOrCopy(switchNode.getExpression());
+        this.tag         = switchNode.getTag();
+        this.cases       = newCases;
+        this.defaultCase = (CaseNode)cs.existingOrCopy(switchNode.getDefaultCase());
+        this.breakLabel  = new Label(switchNode.getBreakLabel());
     }
 
     @Override
diff --git a/nashorn/src/jdk/nashorn/internal/ir/ThrowNode.java b/nashorn/src/jdk/nashorn/internal/ir/ThrowNode.java
index 3aa3543a349..efa63d962be 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/ThrowNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/ThrowNode.java
@@ -60,8 +60,8 @@ public class ThrowNode extends Node {
     private ThrowNode(final ThrowNode throwNode, final CopyState cs) {
         super(throwNode);
 
-        expression = cs.existingOrCopy(throwNode.expression);
-        tryChain = (TryNode)cs.existingOrSame(throwNode.tryChain);
+        this.expression = cs.existingOrCopy(throwNode.expression);
+        this.tryChain = (TryNode)cs.existingOrSame(throwNode.tryChain);
     }
 
     @Override
diff --git a/nashorn/src/jdk/nashorn/internal/ir/TryNode.java b/nashorn/src/jdk/nashorn/internal/ir/TryNode.java
index 8bc20929a8f..b6aa439d4ed 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/TryNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/TryNode.java
@@ -28,7 +28,7 @@ package jdk.nashorn.internal.ir;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import jdk.nashorn.internal.codegen.MethodEmitter.Label;
+import jdk.nashorn.internal.codegen.Label;
 import jdk.nashorn.internal.ir.annotations.Ignore;
 import jdk.nashorn.internal.ir.visitor.NodeVisitor;
 import jdk.nashorn.internal.runtime.Source;
diff --git a/nashorn/src/jdk/nashorn/internal/ir/UnaryNode.java b/nashorn/src/jdk/nashorn/internal/ir/UnaryNode.java
index 405a9b3a0a4..99a749903e1 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/UnaryNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/UnaryNode.java
@@ -67,7 +67,7 @@ public class UnaryNode extends Node implements Assignment<Node> {
     protected UnaryNode(final UnaryNode unaryNode, final CopyState cs) {
         super(unaryNode);
 
-        rhs = cs.existingOrCopy(unaryNode.rhs);
+        this.rhs = cs.existingOrCopy(unaryNode.rhs);
     }
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/ir/WhileNode.java b/nashorn/src/jdk/nashorn/internal/ir/WhileNode.java
index 3af2f53ce74..c51659b855b 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/WhileNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/WhileNode.java
@@ -25,7 +25,7 @@
 
 package jdk.nashorn.internal.ir;
 
-import jdk.nashorn.internal.codegen.MethodEmitter.Label;
+import jdk.nashorn.internal.codegen.Label;
 import jdk.nashorn.internal.ir.visitor.NodeVisitor;
 import jdk.nashorn.internal.runtime.Source;
 
@@ -53,10 +53,8 @@ public class WhileNode extends BreakableNode {
     public WhileNode(final Source source, final long token, final int finish) {
         super(source, token, finish);
 
-        test          = null;
-        body          = null;
-        breakLabel    = new Label("while_break");
-        continueLabel = new Label("while_continue");
+        this.breakLabel    = new Label("while_break");
+        this.continueLabel = new Label("while_continue");
     }
 
     /**
@@ -68,10 +66,10 @@ public class WhileNode extends BreakableNode {
     protected WhileNode(final WhileNode whileNode, final CopyState cs) {
         super(whileNode);
 
-        test          = cs.existingOrCopy(whileNode.test);
-        body          = (Block)cs.existingOrCopy(whileNode.body);
-        breakLabel    = new Label(whileNode.breakLabel);
-        continueLabel = new Label(whileNode.continueLabel);
+        this.test          = cs.existingOrCopy(whileNode.test);
+        this.body          = (Block)cs.existingOrCopy(whileNode.body);
+        this.breakLabel    = new Label(whileNode.breakLabel);
+        this.continueLabel = new Label(whileNode.continueLabel);
     }
 
     @Override
diff --git a/nashorn/src/jdk/nashorn/internal/ir/WithNode.java b/nashorn/src/jdk/nashorn/internal/ir/WithNode.java
index 1586ab5a8bc..52f4e9b57c1 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/WithNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/WithNode.java
@@ -57,8 +57,8 @@ public class WithNode extends Node {
     private WithNode(final WithNode withNode, final CopyState cs) {
         super(withNode);
 
-        expression = cs.existingOrCopy(withNode.expression);
-        body       = (Block)cs.existingOrCopy(withNode.body);
+        this.expression = cs.existingOrCopy(withNode.expression);
+        this.body       = (Block)cs.existingOrCopy(withNode.body);
     }
 
     @Override
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java b/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java
index 19cca84bdc3..6a9b9db1e2f 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java
@@ -203,8 +203,7 @@ public final class NativeRegExp extends ScriptObject {
     }
 
     /**
-     * External constructor used in generated code created by {@link jdk.nashorn.internal.codegen.CodeGenerator}, which
-     * explain the {@code public} access.
+     * External constructor used in generated code, which explains the public access
      *
      * @param regexp regexp
      * @param flags  flags
diff --git a/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java b/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
index 5f559fb0f6d..78fe88dfd2f 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
@@ -94,7 +94,6 @@ public class ScriptFunctionImpl extends ScriptFunction {
 
     /**
      * Constructor called by (compiler) generated code for {@link ScriptObject}s.
-     * Code is generated by {@link jdk.nashorn.internal.codegen.CodeGenerator#newFunctionObject}
      *
      * @param data static function data
      * @param methodHandle handle for invocation
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/AccessorProperty.java b/nashorn/src/jdk/nashorn/internal/runtime/AccessorProperty.java
index d10091ee4a7..b69806cc97a 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/AccessorProperty.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/AccessorProperty.java
@@ -25,24 +25,24 @@
 
 package jdk.nashorn.internal.runtime;
 
-import static jdk.nashorn.internal.codegen.objects.ObjectClassGenerator.ACCESSOR_TYPES;
-import static jdk.nashorn.internal.codegen.objects.ObjectClassGenerator.DEBUG_FIELDS;
-import static jdk.nashorn.internal.codegen.objects.ObjectClassGenerator.LOG;
-import static jdk.nashorn.internal.codegen.objects.ObjectClassGenerator.OBJECT_FIELDS_ONLY;
-import static jdk.nashorn.internal.codegen.objects.ObjectClassGenerator.PRIMITIVE_TYPE;
-import static jdk.nashorn.internal.codegen.objects.ObjectClassGenerator.createGetter;
-import static jdk.nashorn.internal.codegen.objects.ObjectClassGenerator.createGuardBoxedPrimitiveSetter;
-import static jdk.nashorn.internal.codegen.objects.ObjectClassGenerator.createSetter;
-import static jdk.nashorn.internal.codegen.objects.ObjectClassGenerator.getAccessorType;
-import static jdk.nashorn.internal.codegen.objects.ObjectClassGenerator.getAccessorTypeIndex;
-import static jdk.nashorn.internal.codegen.objects.ObjectClassGenerator.getNumberOfAccessorTypes;
+import static jdk.nashorn.internal.codegen.ObjectClassGenerator.ACCESSOR_TYPES;
+import static jdk.nashorn.internal.codegen.ObjectClassGenerator.DEBUG_FIELDS;
+import static jdk.nashorn.internal.codegen.ObjectClassGenerator.LOG;
+import static jdk.nashorn.internal.codegen.ObjectClassGenerator.OBJECT_FIELDS_ONLY;
+import static jdk.nashorn.internal.codegen.ObjectClassGenerator.PRIMITIVE_TYPE;
+import static jdk.nashorn.internal.codegen.ObjectClassGenerator.createGetter;
+import static jdk.nashorn.internal.codegen.ObjectClassGenerator.createGuardBoxedPrimitiveSetter;
+import static jdk.nashorn.internal.codegen.ObjectClassGenerator.createSetter;
+import static jdk.nashorn.internal.codegen.ObjectClassGenerator.getAccessorType;
+import static jdk.nashorn.internal.codegen.ObjectClassGenerator.getAccessorTypeIndex;
+import static jdk.nashorn.internal.codegen.ObjectClassGenerator.getNumberOfAccessorTypes;
 import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
 import static jdk.nashorn.internal.runtime.linker.MethodHandleFactory.stripName;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
-import jdk.nashorn.internal.codegen.objects.ObjectClassGenerator;
+import jdk.nashorn.internal.codegen.ObjectClassGenerator;
 import jdk.nashorn.internal.codegen.types.Type;
 import jdk.nashorn.internal.runtime.linker.Lookup;
 import jdk.nashorn.internal.runtime.linker.MethodHandleFactory;
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Context.java b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
index 8a7507fd5e8..26cbd11afee 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/Context.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
@@ -51,8 +51,9 @@ import jdk.internal.org.objectweb.asm.util.CheckClassAdapter;
 import jdk.nashorn.internal.codegen.ClassEmitter;
 import jdk.nashorn.internal.codegen.Compiler;
 import jdk.nashorn.internal.codegen.Namespace;
-import jdk.nashorn.internal.codegen.objects.ObjectClassGenerator;
+import jdk.nashorn.internal.codegen.ObjectClassGenerator;
 import jdk.nashorn.internal.ir.FunctionNode;
+import jdk.nashorn.internal.ir.debug.ASTWriter;
 import jdk.nashorn.internal.ir.debug.PrintVisitor;
 import jdk.nashorn.internal.parser.Parser;
 import jdk.nashorn.internal.runtime.linker.JavaAdapterFactory;
@@ -917,7 +918,11 @@ public final class Context {
             return null;
         }
 
-        if (_print_lower_parse) {
+        if (_print_ast) {
+            getErr().println(new ASTWriter(functionNode));
+        }
+
+        if (_print_parse) {
             getErr().println(new PrintVisitor(functionNode));
         }
 
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ECMAException.java b/nashorn/src/jdk/nashorn/internal/runtime/ECMAException.java
index 191ee66913d..7da66800cc6 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ECMAException.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ECMAException.java
@@ -46,7 +46,6 @@ import jdk.nashorn.internal.scripts.JS$;
 public final class ECMAException extends NashornException {
     /**
      * Method handle pointing to the constructor {@link ECMAException#ECMAException(Object, String, int, int)},
-     * used from {@link jdk.nashorn.internal.codegen.CodeGenerator}
      */
     public static final Call THROW_INIT = constructorNoLookup(ECMAException.class, Object.class, String.class, int.class, int.class);
 
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/FindProperty.java b/nashorn/src/jdk/nashorn/internal/runtime/FindProperty.java
index 2df165a153d..f81af9a9b35 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/FindProperty.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/FindProperty.java
@@ -28,7 +28,7 @@ package jdk.nashorn.internal.runtime;
 import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
-import jdk.nashorn.internal.codegen.objects.ObjectClassGenerator;
+import jdk.nashorn.internal.codegen.ObjectClassGenerator;
 
 /**
  * This class represents the result from a find property search.
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Property.java b/nashorn/src/jdk/nashorn/internal/runtime/Property.java
index 0c5cf3f1f37..dfb8bf5d642 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/Property.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Property.java
@@ -31,7 +31,7 @@ import static jdk.nashorn.internal.runtime.PropertyDescriptor.WRITABLE;
 
 import java.lang.invoke.MethodHandle;
 import java.util.Objects;
-import jdk.nashorn.internal.codegen.objects.ObjectClassGenerator;
+import jdk.nashorn.internal.codegen.ObjectClassGenerator;
 import jdk.nashorn.internal.codegen.types.Type;
 
 /**
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Scope.java b/nashorn/src/jdk/nashorn/internal/runtime/Scope.java
index 577b5b617a2..eb7eb1f376d 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/Scope.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Scope.java
@@ -27,7 +27,6 @@ package jdk.nashorn.internal.runtime;
 
 import static jdk.nashorn.internal.codegen.CompilerConstants.interfaceCallNoLookup;
 
-import jdk.nashorn.internal.codegen.CodeGenerator;
 import jdk.nashorn.internal.codegen.CompilerConstants;
 
 /**
@@ -35,10 +34,10 @@ import jdk.nashorn.internal.codegen.CompilerConstants;
  */
 public interface Scope {
 
-    /** Method handle that points to {@link Scope#getSplitState}. Used by {@link CodeGenerator} */
+    /** Method handle that points to {@link Scope#getSplitState}. */
     public static final CompilerConstants.Call GET_SPLIT_STATE = interfaceCallNoLookup(Scope.class, "getSplitState", int.class);
 
-    /** Method handle that points to {@link Scope#setSplitState(int)}. Used by {@link CodeGenerator} */
+    /** Method handle that points to {@link Scope#setSplitState(int)}. */
     public static final CompilerConstants.Call SET_SPLIT_STATE = interfaceCallNoLookup(Scope.class, "setSplitState", void.class, int.class);
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
index 85cf460f8a1..4fb295f6f9d 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
@@ -60,7 +60,7 @@ import jdk.internal.dynalink.linker.GuardedInvocation;
 import jdk.internal.dynalink.linker.LinkRequest;
 import jdk.internal.dynalink.support.CallSiteDescriptorFactory;
 import jdk.nashorn.internal.codegen.CompilerConstants.Call;
-import jdk.nashorn.internal.codegen.objects.ObjectClassGenerator;
+import jdk.nashorn.internal.codegen.ObjectClassGenerator;
 import jdk.nashorn.internal.objects.AccessorPropertyDescriptor;
 import jdk.nashorn.internal.objects.DataPropertyDescriptor;
 import jdk.nashorn.internal.runtime.arrays.ArrayData;
@@ -144,13 +144,13 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
     /** Method handle for setting a function argument at a given index. Used from MapCreator */
     public static final Call SET_ARGUMENT       = virtualCall(ScriptObject.class, "setArgument", void.class, int.class, Object.class);
 
-    /** Method handle for getting the proto of a ScriptObject - used by {@link jdk.nashorn.internal.codegen.CodeGenerator} */
+    /** Method handle for getting the proto of a ScriptObject */
     public static final Call GET_PROTO          = virtualCallNoLookup(ScriptObject.class, "getProto", ScriptObject.class);
 
-    /** Method handle for setting the proto of a ScriptObject - used by {@link jdk.nashorn.internal.codegen.CodeGenerator} */
+    /** Method handle for setting the proto of a ScriptObject */
     public static final Call SET_PROTO          = virtualCallNoLookup(ScriptObject.class, "setProto", void.class, ScriptObject.class);
 
-    /** Method handle for setting the user accessors of a ScriptObject - used by {@link jdk.nashorn.internal.codegen.CodeGenerator} */
+    /** Method handle for setting the user accessors of a ScriptObject */
     public static final Call SET_USER_ACCESSORS = virtualCall(ScriptObject.class, "setUserAccessors", void.class, String.class, ScriptFunction.class, ScriptFunction.class);
 
     /** Method handle for getter for {@link UserAccessorProperty}, given a slot */
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java
index c49ce203c72..6ec6f86c668 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java
@@ -71,27 +71,25 @@ public final class ScriptRuntime {
     /** Method handle to generic === operator, operating on objects */
     public static final Call EQ_STRICT = staticCallNoLookup(ScriptRuntime.class, "EQ_STRICT", boolean.class, Object.class, Object.class);
 
-    /** Method handle used to enter a {@code with} scope at runtime. Used from {@link jdk.nashorn.internal.codegen.CodeGenerator} */
+    /** Method handle used to enter a {@code with} scope at runtime. */
     public static final Call OPEN_WITH = staticCallNoLookup(ScriptRuntime.class, "openWith", ScriptObject.class, ScriptObject.class, Object.class);
 
-    /** Method handle used to exit a {@code with} scope at runtime. Used from {@link jdk.nashorn.internal.codegen.CodeGenerator} */
+    /** Method handle used to exit a {@code with} scope at runtime. */
     public static final Call CLOSE_WITH = staticCallNoLookup(ScriptRuntime.class, "closeWith", ScriptObject.class, ScriptObject.class);
 
     /**
      * Method used to place a scope's variable into the Global scope, which has to be done for the
-     * properties declared at outermost script level. Used from {@link jdk.nashorn.internal.codegen.CodeGenerator}
+     * properties declared at outermost script level.
      */
     public static final Call MERGE_SCOPE = staticCallNoLookup(ScriptRuntime.class, "mergeScope", ScriptObject.class, ScriptObject.class);
 
     /**
      * Return an appropriate iterator for the elements in a for-in construct
-     * Used from {@link jdk.nashorn.internal.codegen.CodeGenerator}
      */
     public static final Call TO_PROPERTY_ITERATOR = staticCallNoLookup(ScriptRuntime.class, "toPropertyIterator", Iterator.class, Object.class);
 
     /**
      * Return an appropriate iterator for the elements in a for-each construct
-     * Used from {@link jdk.nashorn.internal.codegen.CodeGenerator}
      */
     public static final Call TO_VALUE_ITERATOR = staticCallNoLookup(ScriptRuntime.class, "toValueIterator", Iterator.class, Object.class);
 
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/SetMethodCreator.java b/nashorn/src/jdk/nashorn/internal/runtime/SetMethodCreator.java
index 8e430f45870..6cafe00b74a 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/SetMethodCreator.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/SetMethodCreator.java
@@ -31,7 +31,7 @@ import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
 import java.lang.invoke.MethodHandle;
 import jdk.internal.dynalink.CallSiteDescriptor;
 import jdk.internal.dynalink.linker.GuardedInvocation;
-import jdk.nashorn.internal.codegen.objects.ObjectClassGenerator;
+import jdk.nashorn.internal.codegen.ObjectClassGenerator;
 import jdk.nashorn.internal.runtime.linker.Lookup;
 import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
 import jdk.nashorn.internal.runtime.linker.NashornGuards;
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/StructureLoader.java b/nashorn/src/jdk/nashorn/internal/runtime/StructureLoader.java
index 2c50382e462..da64655f9a5 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/StructureLoader.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/StructureLoader.java
@@ -38,7 +38,7 @@ import java.security.CodeSigner;
 import java.security.CodeSource;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
-import jdk.nashorn.internal.codegen.objects.ObjectClassGenerator;
+import jdk.nashorn.internal.codegen.ObjectClassGenerator;
 
 /**
  * Responsible for on the fly construction of structure classes as well

From 5287640ec65a3b3541ff7dfd689f5471f2e4f427 Mon Sep 17 00:00:00 2001
From: Alexander Scherbatiy <alexsch@openjdk.org>
Date: Fri, 15 Feb 2013 14:24:42 +0400
Subject: [PATCH 158/311] 7173873:
 JFrame.setDefaultCloseOperation(EXIT_ON_CLOSE) will never lead to SE if
 EXIT_ON_CLOSE is already set

Reviewed-by: malenkov, serb
---
 jdk/src/share/classes/javax/swing/JFrame.java | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/jdk/src/share/classes/javax/swing/JFrame.java b/jdk/src/share/classes/javax/swing/JFrame.java
index cccd6f98aa5..aee994eecf9 100644
--- a/jdk/src/share/classes/javax/swing/JFrame.java
+++ b/jdk/src/share/classes/javax/swing/JFrame.java
@@ -387,13 +387,14 @@ public class JFrame  extends Frame implements WindowConstants,
             operation != EXIT_ON_CLOSE) {
             throw new IllegalArgumentException("defaultCloseOperation must be one of: DO_NOTHING_ON_CLOSE, HIDE_ON_CLOSE, DISPOSE_ON_CLOSE, or EXIT_ON_CLOSE");
         }
-        if (this.defaultCloseOperation != operation) {
-            if (operation == EXIT_ON_CLOSE) {
-                SecurityManager security = System.getSecurityManager();
-                if (security != null) {
-                    security.checkExit(0);
-                }
+
+        if (operation == EXIT_ON_CLOSE) {
+            SecurityManager security = System.getSecurityManager();
+            if (security != null) {
+                security.checkExit(0);
             }
+        }
+        if (this.defaultCloseOperation != operation) {
             int oldValue = this.defaultCloseOperation;
             this.defaultCloseOperation = operation;
             firePropertyChange("defaultCloseOperation", oldValue, operation);

From 4615442550640167be71a639b992519b14522cc0 Mon Sep 17 00:00:00 2001
From: Frank Ding <dingxmin@openjdk.org>
Date: Fri, 15 Feb 2013 15:05:58 +0400
Subject: [PATCH 159/311] 8008289: DefaultButtonModel instance keeps stale
 listeners in html FormView

Reviewed-by: malenkov, alexsch
---
 .../javax/swing/text/html/FormView.java       |  63 +++++++-
 .../swing/text/html/7189299/bug7189299.java   | 138 ++++++++++++++++++
 2 files changed, 200 insertions(+), 1 deletion(-)
 create mode 100644 jdk/test/javax/swing/text/html/7189299/bug7189299.java

diff --git a/jdk/src/share/classes/javax/swing/text/html/FormView.java b/jdk/src/share/classes/javax/swing/text/html/FormView.java
index 294637272f3..2d25516f339 100644
--- a/jdk/src/share/classes/javax/swing/text/html/FormView.java
+++ b/jdk/src/share/classes/javax/swing/text/html/FormView.java
@@ -159,6 +159,10 @@ public class FormView extends ComponentView implements ActionListener {
             attr.getAttribute(StyleConstants.NameAttribute);
         JComponent c = null;
         Object model = attr.getAttribute(StyleConstants.ModelAttribute);
+
+        // Remove listeners previously registered in shared model
+        // when a new UI component is replaced.  See bug 7189299.
+        removeStaleListenerForModel(model);
         if (t == HTML.Tag.INPUT) {
             c = createInputComponent(attr, model);
         } else if (t == HTML.Tag.SELECT) {
@@ -310,6 +314,63 @@ public class FormView extends ComponentView implements ActionListener {
         return c;
     }
 
+    private void removeStaleListenerForModel(Object model) {
+        if (model instanceof DefaultButtonModel) {
+            // case of JButton whose model is DefaultButtonModel
+            // Need to remove stale ActionListener, ChangeListener and
+            // ItemListener that are instance of AbstractButton$Handler.
+            DefaultButtonModel buttonModel = (DefaultButtonModel) model;
+            String listenerClass = "javax.swing.AbstractButton$Handler";
+            for (ActionListener listener : buttonModel.getActionListeners()) {
+                if (listenerClass.equals(listener.getClass().getName())) {
+                    buttonModel.removeActionListener(listener);
+                }
+            }
+            for (ChangeListener listener : buttonModel.getChangeListeners()) {
+                if (listenerClass.equals(listener.getClass().getName())) {
+                    buttonModel.removeChangeListener(listener);
+                }
+            }
+            for (ItemListener listener : buttonModel.getItemListeners()) {
+                if (listenerClass.equals(listener.getClass().getName())) {
+                    buttonModel.removeItemListener(listener);
+                }
+            }
+        } else if (model instanceof AbstractListModel) {
+            // case of JComboBox and JList
+            // For JList, the stale ListDataListener is instance
+            // BasicListUI$Handler.
+            // For JComboBox, there are 2 stale ListDataListeners, which are
+            // BasicListUI$Handler and BasicComboBoxUI$Handler.
+            AbstractListModel listModel = (AbstractListModel) model;
+            String listenerClass1 =
+                    "javax.swing.plaf.basic.BasicListUI$Handler";
+            String listenerClass2 =
+                    "javax.swing.plaf.basic.BasicComboBoxUI$Handler";
+            for (ListDataListener listener : listModel.getListDataListeners()) {
+                if (listenerClass1.equals(listener.getClass().getName())
+                        || listenerClass2.equals(listener.getClass().getName()))
+                {
+                    listModel.removeListDataListener(listener);
+                }
+            }
+        } else if (model instanceof AbstractDocument) {
+            // case of JPasswordField, JTextField and JTextArea
+            // All have 2 stale DocumentListeners.
+            String listenerClass1 =
+                    "javax.swing.plaf.basic.BasicTextUI$UpdateHandler";
+            String listenerClass2 =
+                    "javax.swing.text.DefaultCaret$Handler";
+            AbstractDocument docModel = (AbstractDocument) model;
+            for (DocumentListener listener : docModel.getDocumentListeners()) {
+                if (listenerClass1.equals(listener.getClass().getName())
+                        || listenerClass2.equals(listener.getClass().getName()))
+                {
+                    docModel.removeDocumentListener(listener);
+                }
+            }
+        }
+    }
 
     /**
      * Determines the maximum span for this view along an
@@ -347,7 +408,7 @@ public class FormView extends ComponentView implements ActionListener {
 
 
     /**
-     * Responsible for processeing the ActionEvent.
+     * Responsible for processing the ActionEvent.
      * If the element associated with the FormView,
      * has a type of "submit", "reset", "text" or "password"
      * then the action is processed.  In the case of a "submit"
diff --git a/jdk/test/javax/swing/text/html/7189299/bug7189299.java b/jdk/test/javax/swing/text/html/7189299/bug7189299.java
new file mode 100644
index 00000000000..70d2057c89f
--- /dev/null
+++ b/jdk/test/javax/swing/text/html/7189299/bug7189299.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * Portions Copyright (c) 2013 IBM Corporation
+ */
+import java.awt.BorderLayout;
+import java.awt.Toolkit;
+
+import java.awt.event.ActionListener;
+import javax.swing.DefaultButtonModel;
+import javax.swing.JEditorPane;
+import javax.swing.JFrame;
+import javax.swing.SwingUtilities;
+import javax.swing.text.StyleConstants;
+import javax.swing.text.StyleContext;
+import javax.swing.text.html.HTMLEditorKit;
+import sun.awt.SunToolkit;
+
+
+/*
+ * @test
+ * @bug 8008289
+ * @summary Shared ButtonModel instance should deregister previous listeners.
+ * @author Frank Ding
+ */
+public class bug7189299 {
+
+    private static JEditorPane html;
+    private static JFrame frame;
+
+    private static void setup() {
+        /**
+         * Note the input type is not restricted to "submit". Types "image",
+         * "checkbox", "radio" have the same problem.
+         */
+        html = new JEditorPane("text/html",
+                "<html><body><form action=\"http://localhost.cgi\">"
+                        + "<input type=submit name=submit value=\"submit\"/>"
+                        + "</form></body></html>");
+        frame = new JFrame();
+        frame.setLayout(new BorderLayout());
+        frame.add(html, BorderLayout.CENTER);
+        frame.setSize(200, 100);
+        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        frame.setVisible(true);
+    }
+
+    private static void doTest() {
+        /*
+         * Calling updateComponentTreeUI creates a new FormView instance with
+         * its own associated JButton instance. The same DefaultButtonModel
+         * instance is used for both FormView's.
+         *
+         * The action listeners associated with (the JButton for) the first
+         * FormView should be unregistered from this common DefaultButtonModel,
+         * such that only those for the new FormView remain.
+         */
+        SwingUtilities.updateComponentTreeUI(html);
+    }
+
+    private static void verifySingleDefaultButtonModelListener() {
+        HTMLEditorKit htmlEditorKit = (HTMLEditorKit) html.getEditorKit();
+        StyleContext.NamedStyle style = ((StyleContext.NamedStyle) htmlEditorKit
+                .getInputAttributes());
+        DefaultButtonModel model = ((DefaultButtonModel) style
+                .getAttribute(StyleConstants.ModelAttribute));
+        ActionListener[] listeners = model.getActionListeners();
+        int actionListenerNum = listeners.length;
+        if (actionListenerNum != 1) {
+            throw new RuntimeException(
+                    "Expected single ActionListener object registered with "
+                    + "DefaultButtonModel; found " + actionListenerNum
+                    + " listeners registered.");
+        }
+
+        int changeListenerNum = model.getChangeListeners().length;
+        if (changeListenerNum != 1) {
+            throw new RuntimeException(
+                    "Expected at most one ChangeListener object registered "
+                    + "with DefaultButtonModel; found " + changeListenerNum
+                    + " listeners registered.");
+        }
+        int itemListenerNum = model.getItemListeners().length;
+        if (itemListenerNum != 1) {
+            throw new RuntimeException(
+                    "Expected at most one ItemListener object registered "
+                    + "with DefaultButtonModel; found " + itemListenerNum
+                    + " listeners registered.");
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        final SunToolkit toolkit = ((SunToolkit) Toolkit.getDefaultToolkit());
+
+        SwingUtilities.invokeAndWait(new Runnable() {
+
+            @Override
+            public void run() {
+                setup();
+            }
+        });
+        toolkit.realSync();
+        SwingUtilities.invokeAndWait(new Runnable() {
+
+            @Override
+            public void run() {
+                try {
+                    verifySingleDefaultButtonModelListener();
+                    doTest();
+                    verifySingleDefaultButtonModelListener();
+                } finally {
+                    frame.dispose();
+                }
+            }
+        });
+    }
+}

From 5c9a25d2d24fcd098fc0d901b90f7fa99d6c3f14 Mon Sep 17 00:00:00 2001
From: Chris Hegarty <chegar@openjdk.org>
Date: Fri, 15 Feb 2013 11:06:52 +0000
Subject: [PATCH 160/311] 8008223: java/net/BindException/Test.java fails
 rarely

Reviewed-by: khazra, alanb
---
 jdk/test/java/net/BindException/Test.java | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/jdk/test/java/net/BindException/Test.java b/jdk/test/java/net/BindException/Test.java
index 19bba9af90b..11d37e4b9c9 100644
--- a/jdk/test/java/net/BindException/Test.java
+++ b/jdk/test/java/net/BindException/Test.java
@@ -46,7 +46,7 @@ public class Test {
     static int failures;
 
     static void doTest(Object test[], InetAddress ia1, InetAddress ia2,
-                       boolean silent) {
+                       boolean silent) throws Exception {
         String s1_type = (String)test[0];
         String s2_type = (String)test[1];
         int port = 0;
@@ -64,11 +64,10 @@ public class Test {
         boolean failed = false;
         Exception failed_exc = null;
 
+        Socket sock1 = null;
+        ServerSocket ss = null;
+        DatagramSocket dsock1 = null;
         try {
-            Socket sock1, sock2;
-            ServerSocket ss;
-            DatagramSocket dsock1, dsock2;
-
             /* bind the first socket */
 
             if (s1_type.equals("Socket")) {
@@ -90,16 +89,18 @@ public class Test {
             /* bind the second socket */
 
             if (s2_type.equals("Socket")) {
-                sock2 = new Socket();
-                sock2.bind( new InetSocketAddress(ia2, port));
+                try (Socket sock2 = new Socket()) {
+                    sock2.bind( new InetSocketAddress(ia2, port));
+                }
             }
 
             if (s2_type.equals("ServerSocket")) {
-                ss = new ServerSocket(port, 0, ia2);
+                try (ServerSocket ss2 = new ServerSocket(port, 0, ia2)) { }
             }
 
             if (s2_type.equals("DatagramSocket")) {
-                dsock2 = new DatagramSocket( new InetSocketAddress(ia2, port) );
+                try (DatagramSocket ds =
+                        new DatagramSocket(new InetSocketAddress(ia2, port))) { }
             }
 
         } catch (BindException be) {
@@ -107,6 +108,10 @@ public class Test {
         } catch (Exception e) {
             failed = true;
             failed_exc = e;
+        } finally {
+            if (sock1 != null) sock1.close();
+            if (ss != null) ss.close();
+            if (dsock1 != null) dsock1.close();
         }
 
         /*

From c09d1ba6d76822a35f4feafee2254274891f7052 Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Fri, 15 Feb 2013 18:30:19 +0530
Subject: [PATCH 161/311] 8008291: Add more tests for better coverage of
 objects, scripting and parser packages

Reviewed-by: lagergren, jlaskey
---
 .../internal/parser/AbstractParser.java       | 11 +---
 .../jdk/nashorn/internal/parser/Scanner.java  |  4 +-
 .../nashorn/internal/runtime/BitVector.java   |  4 +-
 .../jdk/nashorn/internal/runtime/Context.java |  2 +-
 .../runtime/QuotedStringTokenizer.java        |  4 +-
 .../internal/runtime/RegExpScanner.java       |  6 +-
 .../jdk/nashorn/internal/runtime/Source.java  | 12 ----
 nashorn/src/jdk/nashorn/tools/Shell.java      | 14 +++--
 nashorn/test/script/basic/NASHORN-401.js      |  1 +
 .../test/script/basic/NASHORN-401.js.EXPECTED |  1 +
 .../script/basic/assign_builtin_func_props.js | 56 +++++++++++++++++++
 nashorn/test/script/basic/debugger.js         | 32 +++++++++++
 nashorn/test/script/basic/yield.js            | 34 +++++++++++
 .../api/scripting/MultipleEngineTest.java     |  5 --
 .../api/scripting/ScriptEngineTest.java       |  9 ++-
 .../src/jdk/nashorn/api/scripting/Window.java |  9 ---
 .../nashorn/internal/parser/ParserTest.java   |  2 -
 17 files changed, 145 insertions(+), 61 deletions(-)
 create mode 100644 nashorn/test/script/basic/assign_builtin_func_props.js
 create mode 100644 nashorn/test/script/basic/debugger.js
 create mode 100644 nashorn/test/script/basic/yield.js

diff --git a/nashorn/src/jdk/nashorn/internal/parser/AbstractParser.java b/nashorn/src/jdk/nashorn/internal/parser/AbstractParser.java
index 6a91565be77..6d9826eda5b 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/AbstractParser.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/AbstractParser.java
@@ -100,15 +100,6 @@ public abstract class AbstractParser {
         this.isStrictMode = strict;
     }
 
-    /**
-     * Get the Source
-     *
-     * @return the Source
-     */
-    public Source getSource() {
-        return source;
-    }
-
     /**
      * Get the ith token.
      *
@@ -261,7 +252,7 @@ public abstract class AbstractParser {
      * @return the message string
      */
     protected final String expectMessage(final TokenType expected) {
-        final String tokenString = Token.toString(source, token, false);
+        final String tokenString = Token.toString(source, token);
         String msg;
 
         if (expected == null) {
diff --git a/nashorn/src/jdk/nashorn/internal/parser/Scanner.java b/nashorn/src/jdk/nashorn/internal/parser/Scanner.java
index b8257d45007..33034394089 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/Scanner.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/Scanner.java
@@ -59,7 +59,7 @@ public class Scanner {
      * @param start   position index in content where to start
      * @param length  length of input
      */
-    public Scanner(final char[] content, final int line, final int start, final int length) {
+    protected Scanner(final char[] content, final int line, final int start, final int length) {
         this.content  = content;
         this.position = start;
         this.limit    = start + length;
@@ -75,7 +75,7 @@ public class Scanner {
      *
      * @param content content to scan
      */
-    public Scanner(final String content) {
+    protected Scanner(final String content) {
         this(content.toCharArray(), 0, 0, content.length());
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/BitVector.java b/nashorn/src/jdk/nashorn/internal/runtime/BitVector.java
index b64e1bd4867..cbf4eb8cce8 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/BitVector.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/BitVector.java
@@ -67,7 +67,7 @@ public final class BitVector implements Cloneable {
      * @param bits a bits array from another bit vector
      */
     public BitVector(final long[] bits) {
-        this.bits = bits;
+        this.bits = bits.clone();
     }
 
     /**
@@ -75,7 +75,7 @@ public final class BitVector implements Cloneable {
      * @param other the source
      */
     public void copy(final BitVector other) {
-        bits = Arrays.copyOf(other.bits, other.bits.length);
+        bits = other.bits.clone();
     }
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Context.java b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
index 26cbd11afee..b31b764fffe 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/Context.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
@@ -672,7 +672,7 @@ public final class Context {
             return evaluateSource(source, scope, scope);
         }
 
-        typeError("cant.load.script", ScriptRuntime.safeToString(source));
+        typeError("cant.load.script", ScriptRuntime.safeToString(from));
 
         return UNDEFINED;
     }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/QuotedStringTokenizer.java b/nashorn/src/jdk/nashorn/internal/runtime/QuotedStringTokenizer.java
index 7848caf1fd1..3aae7fd23a5 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/QuotedStringTokenizer.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/QuotedStringTokenizer.java
@@ -34,7 +34,7 @@ import java.util.StringTokenizer;
  * the separators are quoted either by ' and ", or whatever quotes the user
  * supplies they will be ignored and considered part of another token
  */
-public class QuotedStringTokenizer {
+public final class QuotedStringTokenizer {
     private final LinkedList<String> tokens;
 
     private final char quotes[];
@@ -72,7 +72,7 @@ public class QuotedStringTokenizer {
      *            all the characters that should be accepted as quotes, default
      *            is ' or "
      */
-    public QuotedStringTokenizer(final String str, final String delim, final char[] quotes) {
+    private QuotedStringTokenizer(final String str, final String delim, final char[] quotes) {
         this.quotes = quotes;
 
         boolean delimIsWhitespace = true;
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/RegExpScanner.java b/nashorn/src/jdk/nashorn/internal/runtime/RegExpScanner.java
index 0d7038e6627..a25ec0ef232 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/RegExpScanner.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/RegExpScanner.java
@@ -614,11 +614,7 @@ final class RegExpScanner extends Scanner {
         final Token token = new Token(Token.Type.PATTERN);
 
         final Token child = disjunction();
-        if (child != null) {
-            return token.add(child);
-        }
-
-        return null;
+        return token.add(child);
     }
 
     /*
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Source.java b/nashorn/src/jdk/nashorn/internal/runtime/Source.java
index 1d093429f21..24c041a81aa 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/Source.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Source.java
@@ -200,18 +200,6 @@ public final class Source {
         return new String(content, start, len);
     }
 
-    /**
-     * Fetch a portion of source content associated with a range of tokens.
-     * @param startTokenDesc Starting token descriptor.
-     * @param endTokenDesc   Ending token descriptor.
-     * @return Source content portion.
-     */
-    public String getString(final long startTokenDesc, final long endTokenDesc) {
-        final int start = Token.descPosition(startTokenDesc);
-        final int end   = Token.descPosition(endTokenDesc) + Token.descLength(endTokenDesc);
-        return new String(content, start, end - start);
-    }
-
     /**
      * Returns the source URL of this script Source. Can be null if Source
      * was created from a String or a char[].
diff --git a/nashorn/src/jdk/nashorn/tools/Shell.java b/nashorn/src/jdk/nashorn/tools/Shell.java
index d353c5f969e..d0cb2a6b97d 100644
--- a/nashorn/src/jdk/nashorn/tools/Shell.java
+++ b/nashorn/src/jdk/nashorn/tools/Shell.java
@@ -192,12 +192,14 @@ public class Shell {
         final Options options = new Options("nashorn", werr);
 
         // parse options
-        try {
-            options.process(args);
-        } catch (final IllegalArgumentException e) {
-            werr.println(bundle.getString("shell.usage"));
-            options.displayHelp(e);
-            return null;
+        if (args != null) {
+            try {
+                options.process(args);
+            } catch (final IllegalArgumentException e) {
+                werr.println(bundle.getString("shell.usage"));
+                options.displayHelp(e);
+                return null;
+            }
         }
 
         // detect scripting mode by any source's first character being '#'
diff --git a/nashorn/test/script/basic/NASHORN-401.js b/nashorn/test/script/basic/NASHORN-401.js
index b795dadb3b1..b6058a9bdc1 100644
--- a/nashorn/test/script/basic/NASHORN-401.js
+++ b/nashorn/test/script/basic/NASHORN-401.js
@@ -34,6 +34,7 @@ print(t.method2(10));
 print(t.method2(10.2));
 print(t.method2("a"));
 
+print(t.method3(10));
 print(t.method3("10"));
 print(t.method3("10.2"));
 print(t.method3("foo"));
diff --git a/nashorn/test/script/basic/NASHORN-401.js.EXPECTED b/nashorn/test/script/basic/NASHORN-401.js.EXPECTED
index a8ee40669b9..b7d33039243 100644
--- a/nashorn/test/script/basic/NASHORN-401.js.EXPECTED
+++ b/nashorn/test/script/basic/NASHORN-401.js.EXPECTED
@@ -1,6 +1,7 @@
 int method 2
 double method 2
 string method 2
+int method 3: 10
 double method 3: 10.0
 double method 3: 10.2
 double method 3: NaN
diff --git a/nashorn/test/script/basic/assign_builtin_func_props.js b/nashorn/test/script/basic/assign_builtin_func_props.js
new file mode 100644
index 00000000000..faf297d8f4a
--- /dev/null
+++ b/nashorn/test/script/basic/assign_builtin_func_props.js
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/**
+ * Check that we can assign to all properties from builtin functions and their
+ * prototypes. This is to make sure all such properties are writable.
+ *
+ * @test
+ * @run
+ */
+
+(function() {
+    var PropNamesGetter = Object.getOwnPropertyNames;
+    var ObjectType = Object;
+
+    function assignAll(obj) {
+        if (! (obj instanceof ObjectType)) {
+            return;
+        }
+        var props = PropNamesGetter(obj);
+        for (var p in props) {
+            var value = obj[props[p]];
+            obj[props[p]] = value;
+        }
+    }
+
+    var globalProps = PropNamesGetter(this);
+    for (var i in globalProps) {
+        var prop = globalProps[i];
+        if (typeof this[prop] == 'function') {
+            assignAll(this[prop].prototype);
+            assignAll(this[prop]);
+        }
+    }
+})();
diff --git a/nashorn/test/script/basic/debugger.js b/nashorn/test/script/basic/debugger.js
new file mode 100644
index 00000000000..5e795a275b0
--- /dev/null
+++ b/nashorn/test/script/basic/debugger.js
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/**
+ * Check that the debugger statement is parsed and does nothing as of now.
+ *
+ * @test
+ * @run
+ */
+
+debugger;
diff --git a/nashorn/test/script/basic/yield.js b/nashorn/test/script/basic/yield.js
new file mode 100644
index 00000000000..935f6402ea6
--- /dev/null
+++ b/nashorn/test/script/basic/yield.js
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/**
+ * Check yield keyword is parsed and yield statement does nothing (yet).
+ *
+ * @test
+ * @run
+ */
+
+function func() {
+    yield 2;
+}
diff --git a/nashorn/test/src/jdk/nashorn/api/scripting/MultipleEngineTest.java b/nashorn/test/src/jdk/nashorn/api/scripting/MultipleEngineTest.java
index a7483209524..be28c2409cc 100644
--- a/nashorn/test/src/jdk/nashorn/api/scripting/MultipleEngineTest.java
+++ b/nashorn/test/src/jdk/nashorn/api/scripting/MultipleEngineTest.java
@@ -28,7 +28,6 @@ package jdk.nashorn.api.scripting;
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
-import org.testng.TestNG;
 import org.testng.annotations.Test;
 
 /**
@@ -37,10 +36,6 @@ import org.testng.annotations.Test;
  */
 
 public class MultipleEngineTest {
-    public static void main(final String[] args) {
-        TestNG.main(args);
-    }
-
     @Test
     public void createAndUseManyEngine() throws ScriptException {
         final ScriptEngineManager m = new ScriptEngineManager();
diff --git a/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java b/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
index 26b478e9805..f488feee9c5 100644
--- a/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
+++ b/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
@@ -50,7 +50,6 @@ import javax.script.SimpleScriptContext;
 import jdk.nashorn.internal.runtime.Version;
 import netscape.javascript.JSObject;
 import org.testng.Assert;
-import org.testng.TestNG;
 import org.testng.annotations.Test;
 
 /**
@@ -58,10 +57,6 @@ import org.testng.annotations.Test;
  */
 public class ScriptEngineTest {
 
-    public static void main(final String[] args) {
-        TestNG.main(args);
-    }
-
     private void log(String msg) {
         org.testng.Reporter.log(msg, true);
     }
@@ -132,6 +127,7 @@ public class ScriptEngineTest {
         assertEquals(fac.getEngineName(), "Oracle Nashorn");
         assertEquals(fac.getEngineVersion(), Version.version());
         assertEquals(fac.getOutputStatement("context"), "print(context)");
+        assertEquals(fac.getProgram("print('hello')", "print('world')"), "print('hello');print('world');");
         assertEquals(fac.getParameter(ScriptEngine.NAME), "javascript");
 
         boolean seenJS = false;
@@ -808,6 +804,9 @@ public class ScriptEngineTest {
                 fail("obj.prop is not deleted!");
             }
 
+            // Simple eval tests
+            assertEquals(obj.eval("typeof Object"), "function");
+            assertEquals(obj.eval("'nashorn'.substring(3)"), "horn");
         } catch (final Exception exp) {
             exp.printStackTrace();
             fail(exp.getMessage());
diff --git a/nashorn/test/src/jdk/nashorn/api/scripting/Window.java b/nashorn/test/src/jdk/nashorn/api/scripting/Window.java
index 33d8001288b..bde2394119f 100644
--- a/nashorn/test/src/jdk/nashorn/api/scripting/Window.java
+++ b/nashorn/test/src/jdk/nashorn/api/scripting/Window.java
@@ -59,17 +59,8 @@ public class Window {
         return self.setTimeout(code, delay);
     }
 
-    public static void clearTimeout(final Window self, final int id) {
-        self.clearTimeout(id);
-    }
-
     public int setTimeout(final String code, final int delay) {
         System.out.println("window.setTimeout: " + delay + ", code: " + code);
         return 0;
     }
-
-    public void clearTimeout(final int id) {
-        System.out.println("window.clearTimeout: " + id);
-    }
-
 }
diff --git a/nashorn/test/src/jdk/nashorn/internal/parser/ParserTest.java b/nashorn/test/src/jdk/nashorn/internal/parser/ParserTest.java
index 08e20df3aa1..da7236450e0 100644
--- a/nashorn/test/src/jdk/nashorn/internal/parser/ParserTest.java
+++ b/nashorn/test/src/jdk/nashorn/internal/parser/ParserTest.java
@@ -26,8 +26,6 @@
 package jdk.nashorn.internal.parser;
 
 import java.io.File;
-import jdk.nashorn.internal.codegen.Compiler;
-import jdk.nashorn.internal.codegen.CompilerConstants;
 import jdk.nashorn.internal.runtime.Context;
 import jdk.nashorn.internal.runtime.ErrorManager;
 import jdk.nashorn.internal.runtime.ScriptObject;

From d273278133c0c40521669c741791c2d4a22c005f Mon Sep 17 00:00:00 2001
From: Vera Akulova <vera.akulova@oracle.com>
Date: Fri, 15 Feb 2013 17:46:39 +0400
Subject: [PATCH 162/311] 8005920: After pressing combination Windows Key and M
 key, the frame, the instruction and the dialog can't be minimized

Reviewed-by: serb, denis
---
 .../java/awt/Modal/WsDisabledStyle/Winkey/Winkey.java     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/jdk/test/java/awt/Modal/WsDisabledStyle/Winkey/Winkey.java b/jdk/test/java/awt/Modal/WsDisabledStyle/Winkey/Winkey.java
index 9136e79f40e..5b927f8d520 100644
--- a/jdk/test/java/awt/Modal/WsDisabledStyle/Winkey/Winkey.java
+++ b/jdk/test/java/awt/Modal/WsDisabledStyle/Winkey/Winkey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  */
 
 /*
-  @test %I% %E%
-  @bug 6572263 6571808
+  @test
+  @bug 6572263 6571808 8005920
   @summary  PIT:FileDialog minimized to taskbar(through 'Show Desktop')selecting the fileDialog using windowList
   @author dmitry.cherepanov: area=awt.modal
   @run main/manual Winkey
@@ -48,12 +48,14 @@ public class Winkey
 
         String[] instructions =
         {
+            " 0. This test is for MS Windows only, if you use other OS, press \"pass\" button.",
             " 1. there is a frame with a 'show modal' button, ",
             " 2. press the button to show a modal dialog, ",
             " 3. the modal dialog will be shown over the frame, ",
             " 4. please verify that all (5.1, 5.2.1, 5.2.2) the following tests pass: ",
             " ",
             " 5.1. press combination Windows Key and M key to minimize all windows, ",
+            "      note that the modal dialog and modal blocked windows are NOT minimized",
             " 5.2. press combination Windows Key and D key to show desktop, ",
             "      5.2.1. restore the dialog by choosing this one in the ALT-TAB list, ",
             "      5.2.2. restore the dialog by mouse click on taskbar (on java or any other item)",

From 1fb8213bb01d4ea0c7004f7563fa81fbf31a87cb Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Fri, 15 Feb 2013 20:40:05 +0530
Subject: [PATCH 163/311] 8008298: Add tests to cover specialized versions of
 Math functions

Reviewed-by: jlaskey, lagergren
---
 nashorn/test/script/basic/JDK-8008298.js | 111 +++++++++++++++++++++++
 1 file changed, 111 insertions(+)
 create mode 100644 nashorn/test/script/basic/JDK-8008298.js

diff --git a/nashorn/test/script/basic/JDK-8008298.js b/nashorn/test/script/basic/JDK-8008298.js
new file mode 100644
index 00000000000..4f1fd1a4551
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8008298.js
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/**
+ * JDK-8008298: Add tests to cover specialized versions of Math functions.
+ * Excerise all specialized Math functions with various literal values.
+ *
+ * @test
+ * @run
+ */
+
+if (Math.abs(-88) != 88) {
+    fail("Math.abs for int value");
+}
+
+if (Math.abs(-2147483648) != 2147483648) {
+    fail("Math.abs failed for long value");
+}
+
+if (Math.acos(1.0) != 0) {
+    fail("Math.acos failed on double value");
+}
+
+if (Math.asin(0.0) != 0) {
+    fail("Math.asin failed on double value");
+}
+
+if (Math.atan(0.0) != 0) {
+    fail("Math.atan failed on double value");
+}
+
+if (Math.ceil(1) != 1) {
+    fail("Math.ceil failed on int value");
+}
+
+if (Math.ceil(2147483648) != 2147483648) {
+    fail("Math.ceil failed on long value");
+}
+
+if (Math.ceil(-0.3) != 0) {
+    fail("Math.ceil failed on double value");
+}
+
+if (Math.floor(1) != 1) {
+    fail("Math.floor failed on int value");
+}
+
+if (Math.floor(2147483648) != 2147483648) {
+    fail("Math.floor failed on long value");
+}
+
+if (Math.floor(0.3) != 0) {
+    fail("Math.floor failed on double value");
+}
+
+if (Math.log(1.0) != 0) {
+    fail("Math.log failed on double value");
+}
+
+if (Math.max(2, 28) != 28) {
+    fail("Math.max failed for int values");
+}
+
+if (Math.max(2147483649, 2147483648) != 2147483649) {
+    fail("Math.max failed for long values");
+}
+
+if (Math.max(0.0, -2.5) != 0.0) {
+    fail("Math.max failed for double values");
+}
+
+if (Math.min(2, 28) != 2) {
+    fail("Math.min failed for int values");
+}
+
+if (Math.min(2147483649, 2147483648) != 2147483648) {
+    fail("Math.min failed for long values");
+}
+
+if (Math.min(0.0, 2.5) != 0.0) {
+    fail("Math.min failed for double values");
+}
+
+if (Math.sqrt(4) != 2) {
+    fail("Math.sqrt failed for int value");
+}
+
+if (Math.tan(0.0) != 0.0) {
+    fail("Math.tan failed for double value");
+}

From 381aecb7c2c6cb88891be2bbfdfe377cdc4ad7f5 Mon Sep 17 00:00:00 2001
From: Robert Field <rfield@openjdk.org>
Date: Sat, 16 Feb 2013 12:36:54 -0800
Subject: [PATCH 164/311] 8004970: Implement serialization in the lambda
 metafactory

Reviewed-by: forax
---
 .../AbstractValidatingLambdaMetafactory.java  | 156 ++++++++-----
 .../invoke/InnerClassLambdaMetafactory.java   | 168 +++++++-------
 .../java/lang/invoke/LambdaMetafactory.java   | 112 +++++++++-
 .../java/lang/invoke/MethodHandleInfo.java    |  33 ++-
 .../java/lang/invoke/SerializedLambda.java    | 209 ++++++++++++++++++
 .../invoke/TypeConvertingMethodAdapter.java   |  36 ++-
 .../invoke/lambda/LambdaSerialization.java    |  84 +++++++
 7 files changed, 639 insertions(+), 159 deletions(-)
 create mode 100644 jdk/src/share/classes/java/lang/invoke/SerializedLambda.java
 create mode 100644 jdk/test/java/lang/invoke/lambda/LambdaSerialization.java

diff --git a/jdk/src/share/classes/java/lang/invoke/AbstractValidatingLambdaMetafactory.java b/jdk/src/share/classes/java/lang/invoke/AbstractValidatingLambdaMetafactory.java
index 516443dc186..892a9dd5316 100644
--- a/jdk/src/share/classes/java/lang/invoke/AbstractValidatingLambdaMetafactory.java
+++ b/jdk/src/share/classes/java/lang/invoke/AbstractValidatingLambdaMetafactory.java
@@ -34,11 +34,11 @@ import sun.invoke.util.Wrapper;
 import static sun.invoke.util.Wrapper.*;
 
 /**
- * Abstract implementation of a meta-factory which provides parameter unrolling and input validation.
+ * Abstract implementation of a lambda metafactory which provides parameter unrolling and input validation.
  *
- * @author Robert Field
+ * @see LambdaMetafactory
  */
-/*non-public*/ abstract class AbstractValidatingLambdaMetafactory {
+/* package */ abstract class AbstractValidatingLambdaMetafactory {
 
     /*
      * For context, the comments for the following fields are marked in quotes with their values, given this program:
@@ -54,16 +54,19 @@ import static sun.invoke.util.Wrapper.*;
     final Class<?> targetClass;               // The class calling the meta-factory via invokedynamic "class X"
     final MethodType invokedType;             // The type of the invoked method "(CC)II"
     final Class<?> samBase;                   // The type of the returned instance "interface JJ"
-    final boolean isSerializable;             // Should the returned instance be serializable
+    final MethodHandle samMethod;             // Raw method handle for the functional interface method
     final MethodHandleInfo samInfo;           // Info about the SAM method handle "MethodHandleInfo[9 II.foo(Object)Object]"
     final Class<?> samClass;                  // Interface containing the SAM method "interface II"
     final MethodType samMethodType;           // Type of the SAM method "(Object)Object"
+    final MethodHandle implMethod;            // Raw method handle for the implementation method
     final MethodHandleInfo implInfo;          // Info about the implementation method handle "MethodHandleInfo[5 CC.impl(int)String]"
     final int implKind;                       // Invocation kind for implementation "5"=invokevirtual
     final boolean implIsInstanceMethod;       // Is the implementation an instance method "true"
     final Class<?> implDefiningClass;         // Type defining the implementation "class CC"
     final MethodType implMethodType;          // Type of the implementation method "(int)String"
     final MethodType instantiatedMethodType;  // Instantiated erased functional interface method type "(Integer)Object"
+    final boolean isSerializable;             // Should the returned instance be serializable
+    final Class<?>[] markerInterfaces;        // Additional marker interfaces to be implemented
 
 
     /**
@@ -80,27 +83,35 @@ import static sun.invoke.util.Wrapper.*;
      * @param implMethod The implementation method which should be called (with suitable adaptation of argument
      *                   types, return types, and adjustment for captured arguments) when methods of the resulting
      *                   functional interface instance are invoked.
-     * @param instantiatedMethodType The signature of the SAM method from the functional interface's perspective
+     * @param instantiatedMethodType The signature of the primary functional interface method after type variables
+     *                               are substituted with their instantiation from the capture site
      * @throws ReflectiveOperationException
+     * @throws LambdaConversionException If any of the meta-factory protocol invariants are violated
      */
     AbstractValidatingLambdaMetafactory(MethodHandles.Lookup caller,
                                        MethodType invokedType,
                                        MethodHandle samMethod,
                                        MethodHandle implMethod,
-                                       MethodType instantiatedMethodType)
-            throws ReflectiveOperationException {
+                                       MethodType instantiatedMethodType,
+                                       int flags,
+                                       Class<?>[] markerInterfaces)
+            throws ReflectiveOperationException, LambdaConversionException {
         this.targetClass = caller.lookupClass();
         this.invokedType = invokedType;
 
         this.samBase = invokedType.returnType();
-        this.isSerializable = Serializable.class.isAssignableFrom(samBase);
 
+        this.samMethod = samMethod;
         this.samInfo = new MethodHandleInfo(samMethod);
         this.samClass = samInfo.getDeclaringClass();
         this.samMethodType  = samInfo.getMethodType();
 
+        this.implMethod = implMethod;
         this.implInfo = new MethodHandleInfo(implMethod);
-        this.implKind = implInfo.getReferenceKind() == MethodHandleInfo.REF_invokeSpecial? MethodHandleInfo.REF_invokeVirtual : implInfo.getReferenceKind(); // @@@ Temp work-around to hotspot incorrectly converting to invokespecial
+        // @@@ Temporary work-around pending resolution of 8005119
+        this.implKind = (implInfo.getReferenceKind() == MethodHandleInfo.REF_invokeSpecial)
+                        ? MethodHandleInfo.REF_invokeVirtual
+                        : implInfo.getReferenceKind();
         this.implIsInstanceMethod =
                 implKind == MethodHandleInfo.REF_invokeVirtual ||
                 implKind == MethodHandleInfo.REF_invokeSpecial ||
@@ -109,6 +120,30 @@ import static sun.invoke.util.Wrapper.*;
         this.implMethodType = implInfo.getMethodType();
 
         this.instantiatedMethodType = instantiatedMethodType;
+
+        if (!samClass.isInterface()) {
+            throw new LambdaConversionException(String.format(
+                    "Functional interface %s is not an interface",
+                    samClass.getName()));
+        }
+
+        boolean foundSerializableSupertype = Serializable.class.isAssignableFrom(samBase);
+        for (Class<?> c : markerInterfaces) {
+            if (!c.isInterface()) {
+                throw new LambdaConversionException(String.format(
+                        "Marker interface %s is not an interface",
+                        c.getName()));
+            }
+            foundSerializableSupertype |= Serializable.class.isAssignableFrom(c);
+        }
+        this.isSerializable = ((flags & LambdaMetafactory.FLAG_SERIALIZABLE) != 0)
+                              || foundSerializableSupertype;
+
+        if (isSerializable && !foundSerializableSupertype) {
+            markerInterfaces = Arrays.copyOf(markerInterfaces, markerInterfaces.length + 1);
+            markerInterfaces[markerInterfaces.length-1] = Serializable.class;
+        }
+        this.markerInterfaces = markerInterfaces;
     }
 
     /**
@@ -127,8 +162,9 @@ import static sun.invoke.util.Wrapper.*;
     void validateMetafactoryArgs() throws LambdaConversionException {
         // Check target type is a subtype of class where SAM method is defined
         if (!samClass.isAssignableFrom(samBase)) {
-            throw new LambdaConversionException(String.format("Invalid target type %s for lambda conversion; not a subtype of functional interface %s",
-                    samBase.getName(), samClass.getName()));
+            throw new LambdaConversionException(
+                    String.format("Invalid target type %s for lambda conversion; not a subtype of functional interface %s",
+                                  samBase.getName(), samClass.getName()));
         }
 
         switch (implKind) {
@@ -149,14 +185,16 @@ import static sun.invoke.util.Wrapper.*;
         final int samArity = samMethodType.parameterCount();
         final int instantiatedArity = instantiatedMethodType.parameterCount();
         if (implArity + receiverArity != capturedArity + samArity) {
-            throw new LambdaConversionException(String.format("Incorrect number of parameters for %s method %s; %d captured parameters, %d functional interface parameters, %d implementation parameters",
-                    implIsInstanceMethod ? "instance" : "static", implInfo,
-                    capturedArity, samArity, implArity));
+            throw new LambdaConversionException(
+                    String.format("Incorrect number of parameters for %s method %s; %d captured parameters, %d functional interface method parameters, %d implementation parameters",
+                                  implIsInstanceMethod ? "instance" : "static", implInfo,
+                                  capturedArity, samArity, implArity));
         }
         if (instantiatedArity != samArity) {
-            throw new LambdaConversionException(String.format("Incorrect number of parameters for %s method %s; %d functional interface parameters, %d SAM method parameters",
-                    implIsInstanceMethod ? "instance" : "static", implInfo,
-                    instantiatedArity, samArity));
+            throw new LambdaConversionException(
+                    String.format("Incorrect number of parameters for %s method %s; %d instantiated parameters, %d functional interface method parameters",
+                                  implIsInstanceMethod ? "instance" : "static", implInfo,
+                                  instantiatedArity, samArity));
         }
 
         // If instance: first captured arg (receiver) must be subtype of class where impl method is defined
@@ -180,8 +218,9 @@ import static sun.invoke.util.Wrapper.*;
 
             // check receiver type
             if (!implDefiningClass.isAssignableFrom(receiverClass)) {
-                throw new LambdaConversionException(String.format("Invalid receiver type %s; not a subtype of implementation type %s",
-                                                                  receiverClass, implDefiningClass));
+                throw new LambdaConversionException(
+                        String.format("Invalid receiver type %s; not a subtype of implementation type %s",
+                                      receiverClass, implDefiningClass));
             }
         } else {
             // no receiver
@@ -196,7 +235,8 @@ import static sun.invoke.util.Wrapper.*;
             Class<?> capturedParamType = invokedType.parameterType(i + capturedStart);
             if (!capturedParamType.equals(implParamType)) {
                 throw new LambdaConversionException(
-                        String.format("Type mismatch in captured lambda parameter %d: expecting %s, found %s", i, capturedParamType, implParamType));
+                        String.format("Type mismatch in captured lambda parameter %d: expecting %s, found %s",
+                                      i, capturedParamType, implParamType));
             }
         }
         // Check for adaptation match on SAM arguments
@@ -206,7 +246,8 @@ import static sun.invoke.util.Wrapper.*;
             Class<?> instantiatedParamType = instantiatedMethodType.parameterType(i + samOffset);
             if (!isAdaptableTo(instantiatedParamType, implParamType, true)) {
                 throw new LambdaConversionException(
-                        String.format("Type mismatch for lambda argument %d: %s is not convertible to %s", i, instantiatedParamType, implParamType));
+                        String.format("Type mismatch for lambda argument %d: %s is not convertible to %s",
+                                      i, instantiatedParamType, implParamType));
             }
         }
 
@@ -218,7 +259,8 @@ import static sun.invoke.util.Wrapper.*;
                   : implMethodType.returnType();
         if (!isAdaptableToAsReturn(actualReturnType, expectedType)) {
             throw new LambdaConversionException(
-                    String.format("Type mismatch for lambda return: %s is not convertible to %s", actualReturnType, expectedType));
+                    String.format("Type mismatch for lambda return: %s is not convertible to %s",
+                                  actualReturnType, expectedType));
         }
      }
 
@@ -274,8 +316,8 @@ import static sun.invoke.util.Wrapper.*;
     }
 
 
-    /*********** Logging support -- for debugging only
-    static final Executor logPool = Executors.newSingleThreadExecutor(); // @@@ For debugging only
+    /*********** Logging support -- for debugging only, uncomment as needed
+    static final Executor logPool = Executors.newSingleThreadExecutor();
     protected static void log(final String s) {
         MethodHandleProxyLambdaMetafactory.logPool.execute(new Runnable() {
             @Override
@@ -297,17 +339,21 @@ import static sun.invoke.util.Wrapper.*;
     ***********************/
 
     /**
-     * Find the SAM method and corresponding methods which should be bridged. SAM method and those to be bridged
-     * will have the same name and number of parameters. Check for matching default methods (non-abstract), they
-     * should not be bridged-over and indicate a complex bridging situation.
+     * Find the functional interface method and corresponding abstract methods
+     * which should be bridged. The functional interface method and those to be
+     * bridged will have the same name and number of parameters. Check for
+     * matching default methods (non-abstract), the VM will create bridges for
+     * default methods; We don't have enough readily available type information
+     * to distinguish between where the functional interface method should be
+     * bridged and where the default method should be bridged; This situation is
+     * flagged.
      */
     class MethodAnalyzer {
         private final Method[] methods = samBase.getMethods();
-        private final List<Method> methodsFound = new ArrayList<>(methods.length);
 
         private Method samMethod = null;
         private final List<Method> methodsToBridge = new ArrayList<>(methods.length);
-        private boolean defaultMethodFound = false;
+        private boolean conflictFoundBetweenDefaultAndBridge = false;
 
         MethodAnalyzer() {
             String samMethodName = samInfo.getName();
@@ -315,31 +361,36 @@ import static sun.invoke.util.Wrapper.*;
             int samParamLength = samParamTypes.length;
             Class<?> samReturnType = samMethodType.returnType();
             Class<?> objectClass = Object.class;
+            List<Method> defaultMethods = new ArrayList<>(methods.length);
 
             for (Method m : methods) {
                 if (m.getName().equals(samMethodName) && m.getDeclaringClass() != objectClass) {
                     Class<?>[] mParamTypes = m.getParameterTypes();
                     if (mParamTypes.length == samParamLength) {
+                        // Method matches name and parameter length -- and is not Object
                         if (Modifier.isAbstract(m.getModifiers())) {
-                            // Exclude methods with duplicate signatures
-                            if (methodUnique(m)) {
-                                if (m.getReturnType().equals(samReturnType) && Arrays.equals(mParamTypes, samParamTypes)) {
-                                    // Exact match, this is the SAM method signature
-                                    samMethod = m;
-                                } else {
-                                    methodsToBridge.add(m);
-                                }
+                            // Method is abstract
+                            if (m.getReturnType().equals(samReturnType)
+                                    && Arrays.equals(mParamTypes, samParamTypes)) {
+                                // Exact match, this is the SAM method signature
+                                samMethod = m;
+                            } else if (!hasMatchingBridgeSignature(m)) {
+                                // Record bridges, exclude methods with duplicate signatures
+                                methodsToBridge.add(m);
                             }
                         } else {
-                            // This is a default method, flag for special processing
-                            defaultMethodFound = true;
-                            // Ignore future matching abstracts.
-                            // Note, due to reabstraction, this is really a punt, hence pass-off to VM
-                            methodUnique(m);
+                            // Record default methods for conflict testing
+                            defaultMethods.add(m);
                         }
                     }
                 }
             }
+            for (Method dm : defaultMethods) {
+                if (hasMatchingBridgeSignature(dm)) {
+                    conflictFoundBetweenDefaultAndBridge = true;
+                    break;
+                }
+            }
         }
 
         Method getSamMethod() {
@@ -350,27 +401,26 @@ import static sun.invoke.util.Wrapper.*;
             return methodsToBridge;
         }
 
-        boolean wasDefaultMethodFound() {
-            return defaultMethodFound;
+        boolean conflictFoundBetweenDefaultAndBridge() {
+            return conflictFoundBetweenDefaultAndBridge;
         }
 
         /**
-         * Search the list of previously found methods to determine if there is a method with the same signature
-         * (return and parameter types) as the specified method. If it wasn't found before, add to the found list.
+         * Search the list of previously found bridge methods to determine if there is a method with the same signature
+         * (return and parameter types) as the specified method.
          *
          * @param m The method to match
-         * @return False if the method was found, True otherwise
+         * @return True if the method was found, False otherwise
          */
-        private boolean methodUnique(Method m) {
+        private boolean hasMatchingBridgeSignature(Method m) {
             Class<?>[] ptypes = m.getParameterTypes();
             Class<?> rtype = m.getReturnType();
-            for (Method md : methodsFound) {
+            for (Method md : methodsToBridge) {
                 if (md.getReturnType().equals(rtype) && Arrays.equals(ptypes, md.getParameterTypes())) {
+                    return true;
+                }
+            }
                     return false;
                 }
             }
-            methodsFound.add(m);
-            return true;
-        }
-    }
 }
diff --git a/jdk/src/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java b/jdk/src/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java
index 13999001cdc..f2bb8ebc62c 100644
--- a/jdk/src/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java
+++ b/jdk/src/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java
@@ -36,21 +36,28 @@ import java.security.AccessController;
 import java.security.PrivilegedAction;
 
 /**
- * InnerClassLambdaMetafactory
+ * Lambda metafactory implementation which dynamically creates an inner-class-like class per lambda callsite.
+ *
+ * @see LambdaMetafactory
  */
-/*non-public*/ final class InnerClassLambdaMetafactory extends AbstractValidatingLambdaMetafactory {
+/* package */ final class InnerClassLambdaMetafactory extends AbstractValidatingLambdaMetafactory {
     private static final int CLASSFILE_VERSION = 51;
-    private static final Type TYPE_VOID = Type.getType(void.class);
     private static final String METHOD_DESCRIPTOR_VOID = Type.getMethodDescriptor(Type.VOID_TYPE);
     private static final String NAME_MAGIC_ACCESSOR_IMPL = "java/lang/invoke/MagicLambdaImpl";
-    private static final String NAME_SERIALIZABLE = "java/io/Serializable";
     private static final String NAME_CTOR = "<init>";
 
     //Serialization support
-    private static final String NAME_SERIALIZED_LAMBDA = "com/oracle/java/lang/invoke/SerializedLambdaImpl";
+    private static final String NAME_SERIALIZED_LAMBDA = "java/lang/invoke/SerializedLambda";
     private static final String DESCR_METHOD_WRITE_REPLACE = "()Ljava/lang/Object;";
     private static final String NAME_METHOD_WRITE_REPLACE = "writeReplace";
     private static final String NAME_OBJECT = "java/lang/Object";
+    private static final String DESCR_CTOR_SERIALIZED_LAMBDA
+            = MethodType.methodType(void.class,
+                                    String.class,
+                                    int.class, String.class, String.class, String.class,
+                                    int.class, String.class, String.class, String.class,
+                                    String.class,
+                                    Object[].class).toMethodDescriptorString();
 
     // Used to ensure that each spun class name is unique
     private static final AtomicInteger counter = new AtomicInteger(0);
@@ -70,7 +77,7 @@ import java.security.PrivilegedAction;
     private final Type[] instantiatedArgumentTypes;  // ASM types for the functional interface arguments
 
     /**
-     * Meta-factory constructor.
+     * General meta-factory constructor, standard cases and allowing for uncommon options such as serialization.
      *
      * @param caller Stacked automatically by VM; represents a lookup context with the accessibility privileges
      *               of the caller.
@@ -83,16 +90,23 @@ import java.security.PrivilegedAction;
      * @param implMethod The implementation method which should be called (with suitable adaptation of argument
      *                   types, return types, and adjustment for captured arguments) when methods of the resulting
      *                   functional interface instance are invoked.
-     * @param instantiatedMethodType The signature of the SAM method from the functional interface's perspective
+     * @param instantiatedMethodType The signature of the primary functional interface method after type variables
+     *                               are substituted with their instantiation from the capture site
+     * @param flags A bitmask containing flags that may influence the translation of this lambda expression.  Defined
+     *              fields include FLAG_SERIALIZABLE.
+     * @param markerInterfaces Additional interfaces which the lambda object should implement.
      * @throws ReflectiveOperationException
+     * @throws LambdaConversionException If any of the meta-factory protocol invariants are violated
      */
     public InnerClassLambdaMetafactory(MethodHandles.Lookup caller,
                                        MethodType invokedType,
                                        MethodHandle samMethod,
                                        MethodHandle implMethod,
-                                       MethodType instantiatedMethodType)
-            throws ReflectiveOperationException {
-        super(caller, invokedType, samMethod, implMethod, instantiatedMethodType);
+                                       MethodType instantiatedMethodType,
+                                       int flags,
+                                       Class<?>[] markerInterfaces)
+            throws ReflectiveOperationException, LambdaConversionException {
+        super(caller, invokedType, samMethod, implMethod, instantiatedMethodType, flags, markerInterfaces);
         implMethodClassName = implDefiningClass.getName().replace('.', '/');
         implMethodName = implInfo.getName();
         implMethodDesc = implMethodType.toMethodDescriptorString();
@@ -109,7 +123,6 @@ import java.security.PrivilegedAction;
             argNames[i] = "arg$" + (i + 1);
         }
         instantiatedArgumentTypes = Type.getArgumentTypes(instantiatedMethodType.toMethodDescriptorString());
-
     }
 
     /**
@@ -120,7 +133,8 @@ import java.security.PrivilegedAction;
      *
      * @return a CallSite, which, when invoked, will return an instance of the
      * functional interface
-     * @throws ReflectiveOperationException, LambdaConversionException
+     * @throws ReflectiveOperationException
+     * @throws LambdaConversionException If properly formed functional interface is not found
      */
     @Override
     CallSite buildCallSite() throws ReflectiveOperationException, LambdaConversionException {
@@ -151,8 +165,8 @@ import java.security.PrivilegedAction;
         } else {
             return new ConstantCallSite(
                     MethodHandles.Lookup.IMPL_LOOKUP
-                    .findConstructor(innerClass, constructorType)
-                    .asType(constructorType.changeReturnType(samBase)));
+                                        .findConstructor(innerClass, constructorType)
+                                        .asType(constructorType.changeReturnType(samBase)));
         }
     }
 
@@ -161,16 +175,23 @@ import java.security.PrivilegedAction;
      * interface, define and return the class.
      *
      * @return a Class which implements the functional interface
+     * @throws LambdaConversionException If properly formed functional interface is not found
      */
-    private <T> Class<? extends T> spinInnerClass() throws LambdaConversionException {
+    private Class<?> spinInnerClass() throws LambdaConversionException {
         String samName = samBase.getName().replace('.', '/');
-
-        cw.visit(CLASSFILE_VERSION, ACC_SUPER, lambdaClassName, null, NAME_MAGIC_ACCESSOR_IMPL,
-                 isSerializable ? new String[]{samName, NAME_SERIALIZABLE} : new String[]{samName});
+        String[] interfaces = new String[markerInterfaces.length + 1];
+        interfaces[0] = samName;
+        for (int i=0; i<markerInterfaces.length; i++) {
+            interfaces[i+1] = markerInterfaces[i].getName().replace('.', '/');
+        }
+        cw.visit(CLASSFILE_VERSION, ACC_SUPER,
+                 lambdaClassName, null,
+                 NAME_MAGIC_ACCESSOR_IMPL, interfaces);
 
         // Generate final fields to be filled in by constructor
         for (int i = 0; i < argTypes.length; i++) {
-            FieldVisitor fv = cw.visitField(ACC_PRIVATE + ACC_FINAL, argNames[i], argTypes[i].getDescriptor(), null, null);
+            FieldVisitor fv = cw.visitField(ACC_PRIVATE + ACC_FINAL, argNames[i], argTypes[i].getDescriptor(),
+                                            null, null);
             fv.visitEnd();
         }
 
@@ -180,26 +201,24 @@ import java.security.PrivilegedAction;
 
         // Forward the SAM method
         if (ma.getSamMethod() == null) {
-            throw new LambdaConversionException(String.format("SAM method not found: %s", samMethodType));
+            throw new LambdaConversionException(String.format("Functional interface method not found: %s", samMethodType));
         } else {
             generateForwardingMethod(ma.getSamMethod(), false);
         }
 
         // Forward the bridges
-        // @@@ Once the VM can do fail-over, uncomment the default method test
-        if (!ma.getMethodsToBridge().isEmpty() /* && !ma.wasDefaultMethodFound() */) {
+        // @@@ The commented-out code is temporary, pending the VM's ability to bridge all methods on request
+        // @@@ Once the VM can do fail-over, uncomment the !ma.wasDefaultMethodFound() test, and emit the appropriate
+        // @@@ classfile attribute to request custom bridging.  See 8002092.
+        if (!ma.getMethodsToBridge().isEmpty() /* && !ma.conflictFoundBetweenDefaultAndBridge() */ ) {
             for (Method m : ma.getMethodsToBridge()) {
                 generateForwardingMethod(m, true);
             }
         }
 
-        /***** Serialization not yet supported
         if (isSerializable) {
-            String samMethodName = samInfo.getName();
-            Type samType = Type.getType(samBase);
-            generateSerializationMethod(samType, samMethodName);
+            generateWriteReplace();
         }
-        ******/
 
         cw.visitEnd();
 
@@ -212,7 +231,7 @@ import java.security.PrivilegedAction;
             try (FileOutputStream fos = new FileOutputStream(lambdaClassName.replace('/', '.') + ".class")) {
                 fos.write(classBytes);
             } catch (IOException ex) {
-                Logger.getLogger(InnerClassLambdaMetafactory.class.getName()).log(Level.SEVERE, null, ex);
+                PlatformLogger.getLogger(InnerClassLambdaMetafactory.class.getName()).severe(ex.getMessage(), ex);
             }
         ***/
 
@@ -228,7 +247,8 @@ import java.security.PrivilegedAction;
             }
         );
 
-        return (Class<? extends T>) Unsafe.getUnsafe().defineClass(lambdaClassName, classBytes, 0, classBytes.length, loader, pd);
+        return (Class<?>) Unsafe.getUnsafe().defineClass(lambdaClassName, classBytes, 0, classBytes.length,
+                                                                   loader, pd);
     }
 
     /**
@@ -253,40 +273,44 @@ import java.security.PrivilegedAction;
     }
 
     /**
-     * Generate the serialization method (if needed)
+     * Generate the writeReplace method (if needed for serialization)
      */
-    /****** This code is out of date -- known to be wrong -- and not currently used ******
-    private void generateSerializationMethod(Type samType, String samMethodName) {
-        String samMethodDesc = samMethodType.toMethodDescriptorString();
-        TypeConvertingMethodAdapter mv = new TypeConvertingMethodAdapter(cw.visitMethod(ACC_PRIVATE + ACC_FINAL, NAME_METHOD_WRITE_REPLACE, DESCR_METHOD_WRITE_REPLACE, null, null));
+    private void generateWriteReplace() {
+        TypeConvertingMethodAdapter mv
+                = new TypeConvertingMethodAdapter(cw.visitMethod(ACC_PRIVATE + ACC_FINAL,
+                                                                 NAME_METHOD_WRITE_REPLACE, DESCR_METHOD_WRITE_REPLACE,
+                                                                 null, null));
 
         mv.visitCode();
         mv.visitTypeInsn(NEW, NAME_SERIALIZED_LAMBDA);
-        mv.dup();
-        mv.visitLdcInsn(samType);
-        mv.visitLdcInsn(samMethodName);
-        mv.visitLdcInsn(samMethodDesc);
-        mv.visitLdcInsn(Type.getType(implDefiningClass));
-        mv.visitLdcInsn(implMethodName);
-        mv.visitLdcInsn(implMethodDesc);
+        mv.visitInsn(DUP);;
+        mv.visitLdcInsn(targetClass.getName().replace('.', '/'));
+        mv.visitLdcInsn(samInfo.getReferenceKind());
+        mv.visitLdcInsn(invokedType.returnType().getName().replace('.', '/'));
+        mv.visitLdcInsn(samInfo.getName());
+        mv.visitLdcInsn(samInfo.getMethodType().toMethodDescriptorString());
+        mv.visitLdcInsn(implInfo.getReferenceKind());
+        mv.visitLdcInsn(implInfo.getDeclaringClass().getName().replace('.', '/'));
+        mv.visitLdcInsn(implInfo.getName());
+        mv.visitLdcInsn(implInfo.getMethodType().toMethodDescriptorString());
+        mv.visitLdcInsn(instantiatedMethodType.toMethodDescriptorString());
 
         mv.iconst(argTypes.length);
         mv.visitTypeInsn(ANEWARRAY, NAME_OBJECT);
         for (int i = 0; i < argTypes.length; i++) {
-            mv.dup();
+            mv.visitInsn(DUP);
             mv.iconst(i);
             mv.visitVarInsn(ALOAD, 0);
-            mv.getfield(lambdaClassName, argNames[i], argTypes[i].getDescriptor());
-            mv.boxIfPrimitive(argTypes[i]);
+            mv.visitFieldInsn(GETFIELD, lambdaClassName, argNames[i], argTypes[i].getDescriptor());
+            mv.boxIfTypePrimitive(argTypes[i]);
             mv.visitInsn(AASTORE);
         }
-        mv.invokespecial(NAME_SERIALIZED_LAMBDA, NAME_CTOR,
-                           "(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)V");
+        mv.visitMethodInsn(INVOKESPECIAL, NAME_SERIALIZED_LAMBDA, NAME_CTOR,
+                DESCR_CTOR_SERIALIZED_LAMBDA);
         mv.visitInsn(ARETURN);
         mv.visitMaxs(-1, -1); // Maxs computed by ClassWriter.COMPUTE_MAXS, these arguments ignored
         mv.visitEnd();
     }
-    ********/
 
     /**
      * Generate a method which calls the lambda implementation method,
@@ -321,11 +345,11 @@ import java.security.PrivilegedAction;
 
             if (implKind == MethodHandleInfo.REF_newInvokeSpecial) {
                 visitTypeInsn(NEW, implMethodClassName);
-                dup();
+                visitInsn(DUP);;
             }
             for (int i = 0; i < argTypes.length; i++) {
                 visitVarInsn(ALOAD, 0);
-                getfield(lambdaClassName, argNames[i], argTypes[i].getDescriptor());
+                visitFieldInsn(GETFIELD, lambdaClassName, argNames[i], argTypes[i].getDescriptor());
             }
 
             convertArgumentTypes(Type.getArgumentTypes(m));
@@ -337,7 +361,7 @@ import java.security.PrivilegedAction;
             // Note: if adapting from non-void to void, the 'return' instruction will pop the unneeded result
             Type samReturnType = Type.getReturnType(m);
             convertType(implMethodReturnType, samReturnType, samReturnType);
-            areturn(samReturnType);
+            visitInsn(samReturnType.getOpcode(Opcodes.IRETURN));
 
             visitMaxs(-1, -1); // Maxs computed by ClassWriter.COMPUTE_MAXS, these arguments ignored
             visitEnd();
@@ -352,7 +376,7 @@ import java.security.PrivilegedAction;
                 Type rcvrType = samArgumentTypes[0];
                 Type instantiatedRcvrType = instantiatedArgumentTypes[0];
 
-                load(lvIndex + 1, rcvrType);
+                visitVarInsn(rcvrType.getOpcode(ILOAD), lvIndex + 1);
                 lvIndex += rcvrType.getSize();
                 convertType(rcvrType, Type.getType(implDefiningClass), instantiatedRcvrType);
             }
@@ -362,7 +386,7 @@ import java.security.PrivilegedAction;
                 Type targetType = implMethodArgumentTypes[argOffset + i];
                 Type instantiatedArgType = instantiatedArgumentTypes[i];
 
-                load(lvIndex + 1, argType);
+                visitVarInsn(argType.getOpcode(ILOAD), lvIndex + 1);
                 lvIndex += argType.getSize();
                 convertType(argType, targetType, instantiatedArgType);
             }
@@ -388,45 +412,5 @@ import java.security.PrivilegedAction;
                     throw new InternalError("Unexpected invocation kind: " + implKind);
             }
         }
-
-        /**
-         * The following methods are copied from
-         * org.objectweb.asm.commons.InstructionAdapter. Part of ASM: a very
-         * small and fast Java bytecode manipulation framework. Copyright (c)
-         * 2000-2005 INRIA, France Telecom All rights reserved.
-         *
-         * Subclass with that (removing these methods) if that package/class is
-         * ever added to the JDK.
-         */
-        private void iconst(final int cst) {
-            if (cst >= -1 && cst <= 5) {
-                mv.visitInsn(Opcodes.ICONST_0 + cst);
-            } else if (cst >= Byte.MIN_VALUE && cst <= Byte.MAX_VALUE) {
-                mv.visitIntInsn(Opcodes.BIPUSH, cst);
-            } else if (cst >= Short.MIN_VALUE && cst <= Short.MAX_VALUE) {
-                mv.visitIntInsn(Opcodes.SIPUSH, cst);
-            } else {
-                mv.visitLdcInsn(cst);
-            }
-        }
-
-        private void load(final int var, final Type type) {
-            mv.visitVarInsn(type.getOpcode(Opcodes.ILOAD), var);
-        }
-
-        private void dup() {
-            mv.visitInsn(Opcodes.DUP);
-        }
-
-        private void areturn(final Type t) {
-            mv.visitInsn(t.getOpcode(Opcodes.IRETURN));
-        }
-
-        private void getfield(
-                final String owner,
-                final String name,
-                final String desc) {
-            mv.visitFieldInsn(Opcodes.GETFIELD, owner, name, desc);
-        }
     }
 }
diff --git a/jdk/src/share/classes/java/lang/invoke/LambdaMetafactory.java b/jdk/src/share/classes/java/lang/invoke/LambdaMetafactory.java
index 378494b48d3..24c0c72c71c 100644
--- a/jdk/src/share/classes/java/lang/invoke/LambdaMetafactory.java
+++ b/jdk/src/share/classes/java/lang/invoke/LambdaMetafactory.java
@@ -42,14 +42,13 @@ package java.lang.invoke;
  * method, and the static types of the captured lambda arguments, and link a call site which, when invoked,
  * produces the lambda object.
  *
- * <p>Two pieces of information are needed about the functional interface: the SAM method and the type of the SAM
- * method in the functional interface. The type can be different when parameterized types are used. For example,
- * consider
- * <code>interface I&lt;T&gt; { int m(T x); }</code> if this SAM type is used in a lambda
- * <code>I&lt;Byte&gt; v = ...</code>, we need both the actual SAM method which has the signature
- * <code>(Object)int</code> and the functional interface type of the method, which has signature
- * <code>(Byte)int</code>.  The latter is the instantiated erased functional interface method type, or
- * simply <I>instantiated method type</I>.
+ * <p>When parameterized types are used, the instantiated type of the functional interface method may be different
+ * from that in the functional interface. For example, consider
+ * <code>interface I&lt;T&gt; { int m(T x); }</code> if this functional interface type is used in a lambda
+ * <code>I&lt;Byte&gt; v = ...</code>, we need both the actual functional interface method which has the signature
+ * <code>(Object)int</code> and the erased instantiated type of the functional interface method (or simply
+ * <I>instantiated method type</I>), which has signature
+ * <code>(Byte)int</code>.
  *
  * <p>While functional interfaces only have a single abstract method from the language perspective (concrete
  * methods in Object are and default methods may be present), at the bytecode level they may actually have multiple
@@ -138,11 +137,25 @@ package java.lang.invoke;
  *     </tr>
  * </table>
  *
+ * The default bootstrap ({@link #metaFactory}) represents the common cases and uses an optimized protocol.
+ * Alternate bootstraps (e.g., {@link #altMetaFactory}) exist to support uncommon cases such as serialization
+ * or additional marker superinterfaces.
  *
  */
 public class LambdaMetafactory {
 
+    /** Flag for alternate metafactories indicating the lambda object is must to be serializable */
+    public static final int FLAG_SERIALIZABLE = 1 << 0;
+
     /**
+     * Flag for alternate metafactories indicating the lambda object implements other marker interfaces
+     * besides Serializable
+     */
+    public static final int FLAG_MARKERS = 1 << 1;
+
+    private static final Class<?>[] EMPTY_CLASS_ARRAY = new Class<?>[0];
+
+/**
      * Standard meta-factory for conversion of lambda expressions or method references to functional interfaces.
      *
      * @param caller Stacked automatically by VM; represents a lookup context with the accessibility privileges
@@ -158,7 +171,8 @@ public class LambdaMetafactory {
      * @param implMethod The implementation method which should be called (with suitable adaptation of argument
      *                   types, return types, and adjustment for captured arguments) when methods of the resulting
      *                   functional interface instance are invoked.
-     * @param instantiatedMethodType The signature of the SAM method from the functional interface's perspective
+     * @param instantiatedMethodType The signature of the primary functional interface method after type variables
+     *                               are substituted with their instantiation from the capture site
      * @return a CallSite, which, when invoked, will return an instance of the functional interface
      * @throws ReflectiveOperationException
      * @throws LambdaConversionException If any of the meta-factory protocol invariants are violated
@@ -171,7 +185,85 @@ public class LambdaMetafactory {
                                        MethodType instantiatedMethodType)
                    throws ReflectiveOperationException, LambdaConversionException {
         AbstractValidatingLambdaMetafactory mf;
-        mf = new InnerClassLambdaMetafactory(caller, invokedType, samMethod, implMethod, instantiatedMethodType);
+        mf = new InnerClassLambdaMetafactory(caller, invokedType, samMethod, implMethod, instantiatedMethodType,
+                0, EMPTY_CLASS_ARRAY);
+        mf.validateMetafactoryArgs();
+        return mf.buildCallSite();
+    }
+
+    /**
+     * Alternate meta-factory for conversion of lambda expressions or method references to functional interfaces,
+     * which supports serialization and other uncommon options.
+     *
+     * The declared argument list for this method is:
+     *
+     *  CallSite altMetaFactory(MethodHandles.Lookup caller,
+     *                          String invokedName,
+     *                          MethodType invokedType,
+     *                          Object... args)
+     *
+     * but it behaves as if the argument list is:
+     *
+     *  CallSite altMetaFactory(MethodHandles.Lookup caller,
+     *                          String invokedName,
+     *                          MethodType invokedType,
+     *                          MethodHandle samMethod
+     *                          MethodHandle implMethod,
+     *                          MethodType instantiatedMethodType,
+     *                          int flags,
+     *                          int markerInterfaceCount, // IF flags has MARKERS set
+     *                          Class... markerInterfaces // IF flags has MARKERS set
+     *                          )
+     *
+     *
+     * @param caller Stacked automatically by VM; represents a lookup context with the accessibility privileges
+     *               of the caller.
+     * @param invokedName Stacked automatically by VM; the name of the invoked method as it appears at the call site.
+     *                    Currently unused.
+     * @param invokedType Stacked automatically by VM; the signature of the invoked method, which includes the
+     *                    expected static type of the returned lambda object, and the static types of the captured
+     *                    arguments for the lambda.  In the event that the implementation method is an instance method,
+     *                    the first argument in the invocation signature will correspond to the receiver.
+     * @param samMethod The primary method in the functional interface to which the lambda or method reference is
+     *                  being converted, represented as a method handle.
+     * @param implMethod The implementation method which should be called (with suitable adaptation of argument
+     *                   types, return types, and adjustment for captured arguments) when methods of the resulting
+     *                   functional interface instance are invoked.
+     * @param instantiatedMethodType The signature of the primary functional interface method after type variables
+     *                               are substituted with their instantiation from the capture site
+     * @param flags A bitmask containing flags that may influence the translation of this lambda expression.  Defined
+     *              fields include FLAG_SERIALIZABLE and FLAG_MARKERS.
+     * @param markerInterfaceCount If the FLAG_MARKERS flag is set, this is a count of the number of additional
+     *                             marker interfaces
+     * @param markerInterfaces If the FLAG_MARKERS flag is set, this consists of Class objects identifying additional
+     *                         marker interfaces which the lambda object should implement, whose count equals
+     *                         markerInterfaceCount
+     * @return a CallSite, which, when invoked, will return an instance of the functional interface
+     * @throws ReflectiveOperationException
+     * @throws LambdaConversionException If any of the meta-factory protocol invariants are violated
+     */
+    public static CallSite altMetaFactory(MethodHandles.Lookup caller,
+                                          String invokedName,
+                                          MethodType invokedType,
+                                          Object... args)
+            throws ReflectiveOperationException, LambdaConversionException {
+        MethodHandle samMethod = (MethodHandle)args[0];
+        MethodHandle implMethod = (MethodHandle)args[1];
+        MethodType instantiatedMethodType = (MethodType)args[2];
+        int flags = (Integer) args[3];
+        Class<?>[] markerInterfaces;
+        int argIndex = 4;
+        if ((flags & FLAG_MARKERS) != 0) {
+            int markerCount = (Integer) args[argIndex++];
+            markerInterfaces = new Class<?>[markerCount];
+            System.arraycopy(args, argIndex, markerInterfaces, 0, markerCount);
+            argIndex += markerCount;
+        }
+        else
+            markerInterfaces = EMPTY_CLASS_ARRAY;
+        AbstractValidatingLambdaMetafactory mf;
+        mf = new InnerClassLambdaMetafactory(caller, invokedType, samMethod, implMethod, instantiatedMethodType,
+                                             flags, markerInterfaces);
         mf.validateMetafactoryArgs();
         return mf.buildCallSite();
     }
diff --git a/jdk/src/share/classes/java/lang/invoke/MethodHandleInfo.java b/jdk/src/share/classes/java/lang/invoke/MethodHandleInfo.java
index b73dd6350cd..ae579ab84c4 100644
--- a/jdk/src/share/classes/java/lang/invoke/MethodHandleInfo.java
+++ b/jdk/src/share/classes/java/lang/invoke/MethodHandleInfo.java
@@ -26,8 +26,11 @@
 package java.lang.invoke;
 import java.lang.invoke.MethodHandleNatives.Constants;
 
-//Not yet public: public
-class MethodHandleInfo {
+/**
+ * Cracking (reflecting) method handles back into their constituent symbolic parts.
+ *
+ */
+final class MethodHandleInfo {
    public static final int
        REF_NONE                    = Constants.REF_NONE,
        REF_getField                = Constants.REF_getField,
@@ -65,7 +68,33 @@ class MethodHandleInfo {
        return methodType;
    }
 
+   public int getModifiers() {
+       return -1; //TODO
+   }
+
    public int getReferenceKind() {
        return referenceKind;
    }
+
+   static String getReferenceKindString(int referenceKind) {
+        switch (referenceKind) {
+            case REF_NONE: return "REF_NONE";
+            case REF_getField: return "getfield";
+            case REF_getStatic: return "getstatic";
+            case REF_putField: return "putfield";
+            case REF_putStatic: return "putstatic";
+            case REF_invokeVirtual: return "invokevirtual";
+            case REF_invokeStatic: return "invokestatic";
+            case REF_invokeSpecial: return "invokespecial";
+            case REF_newInvokeSpecial: return "newinvokespecial";
+            case REF_invokeInterface: return "invokeinterface";
+            default: return "UNKNOWN_REFENCE_KIND" + "[" + referenceKind + "]";
+        }
+    }
+
+    @Override
+    public String toString() {
+        return String.format("%s %s.%s:%s", getReferenceKindString(referenceKind),
+                             declaringClass.getName(), name, methodType);
+    }
 }
diff --git a/jdk/src/share/classes/java/lang/invoke/SerializedLambda.java b/jdk/src/share/classes/java/lang/invoke/SerializedLambda.java
new file mode 100644
index 00000000000..1a2db3f072a
--- /dev/null
+++ b/jdk/src/share/classes/java/lang/invoke/SerializedLambda.java
@@ -0,0 +1,209 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.lang.invoke;
+
+import java.io.Serializable;
+import java.lang.reflect.Method;
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.util.Objects;
+
+/**
+ * Serialized form of a lambda expression.  The properties of this class represent the information that is present
+ * at the lambda factory site, including the identity of the primary functional interface method, the identity of the
+ * implementation method, and any variables captured from the local environment at the time of lambda capture.
+ *
+ * @see LambdaMetafactory
+ */
+public final class SerializedLambda implements Serializable {
+    private static final long serialVersionUID = 8025925345765570181L;
+    private final String capturingClass;
+    private final String functionalInterfaceClass;
+    private final String functionalInterfaceMethodName;
+    private final String functionalInterfaceMethodSignature;
+    private final int functionalInterfaceMethodKind;
+    private final String implClass;
+    private final String implMethodName;
+    private final String implMethodSignature;
+    private final int implMethodKind;
+    private final String instantiatedMethodType;
+    private final Object[] capturedArgs;
+
+    /**
+     * Create a {@code SerializedLambda} from the low-level information present at the lambda factory site.
+     *
+     * @param capturingClass The class in which the lambda expression appears
+     * @param functionalInterfaceMethodKind Method handle kind (see {@link MethodHandleInfo}) for the
+     *                                      functional interface method handle present at the lambda factory site
+     * @param functionalInterfaceClass Name, in slash-delimited form, for the functional interface class present at the
+     *                                 lambda factory site
+     * @param functionalInterfaceMethodName Name of the primary method for the functional interface present at the
+     *                                      lambda factory site
+     * @param functionalInterfaceMethodSignature Signature of the primary method for the functional interface present
+     *                                           at the lambda factory site
+     * @param implMethodKind Method handle kind for the implementation method
+     * @param implClass Name, in slash-delimited form, for the class holding the implementation method
+     * @param implMethodName Name of the implementation method
+     * @param implMethodSignature Signature of the implementation method
+     * @param instantiatedMethodType The signature of the primary functional interface method after type variables
+     *                               are substituted with their instantiation from the capture site
+     * @param capturedArgs The dynamic arguments to the lambda factory site, which represent variables captured by
+     *                     the lambda
+     */
+    public SerializedLambda(String capturingClass,
+                            int functionalInterfaceMethodKind,
+                            String functionalInterfaceClass,
+                            String functionalInterfaceMethodName,
+                            String functionalInterfaceMethodSignature,
+                            int implMethodKind,
+                            String implClass,
+                            String implMethodName,
+                            String implMethodSignature,
+                            String instantiatedMethodType,
+                            Object[] capturedArgs) {
+        this.capturingClass = capturingClass;
+        this.functionalInterfaceMethodKind = functionalInterfaceMethodKind;
+        this.functionalInterfaceClass = functionalInterfaceClass;
+        this.functionalInterfaceMethodName = functionalInterfaceMethodName;
+        this.functionalInterfaceMethodSignature = functionalInterfaceMethodSignature;
+        this.implMethodKind = implMethodKind;
+        this.implClass = implClass;
+        this.implMethodName = implMethodName;
+        this.implMethodSignature = implMethodSignature;
+        this.instantiatedMethodType = instantiatedMethodType;
+        this.capturedArgs = Objects.requireNonNull(capturedArgs).clone();
+    }
+
+    /** Get the name of the class that captured this lambda */
+    public String getCapturingClass() {
+        return capturingClass;
+    }
+
+    /** Get the name of the functional interface class to which this lambda has been converted */
+    public String getFunctionalInterfaceClass() {
+        return functionalInterfaceClass;
+    }
+
+    /** Get the name of the primary method for the functional interface to which this lambda has been converted */
+    public String getFunctionalInterfaceMethodName() {
+        return functionalInterfaceMethodName;
+    }
+
+    /** Get the signature of the primary method for the functional interface to which this lambda has been converted */
+    public String getFunctionalInterfaceMethodSignature() {
+        return functionalInterfaceMethodSignature;
+    }
+
+    /** Get the method handle kind (see {@link MethodHandleInfo}) of the primary method for the functional interface
+     * to which this lambda has been converted */
+    public int getFunctionalInterfaceMethodKind() {
+        return functionalInterfaceMethodKind;
+    }
+
+    /** Get the name of the class containing the implementation method */
+    public String getImplClass() {
+        return implClass;
+    }
+
+    /** Get the name of the implementation method */
+    public String getImplMethodName() {
+        return implMethodName;
+    }
+
+    /** Get the signature of the implementation method */
+    public String getImplMethodSignature() {
+        return implMethodSignature;
+    }
+
+    /** Get the method handle kind (see {@link MethodHandleInfo}) of the implementation method */
+    public int getImplMethodKind() {
+        return implMethodKind;
+    }
+
+    /**
+     * Get the signature of the primary functional interface method after type variables are substituted with
+     * their instantiation from the capture site
+     */
+    public final String getInstantiatedMethodType() {
+        return instantiatedMethodType;
+    }
+
+    /** Get the count of dynamic arguments to the lambda capture site */
+    public int getCapturedArgCount() {
+        return capturedArgs.length;
+    }
+
+    /** Get a dynamic argument to the lambda capture site */
+    public Object getCapturedArg(int i) {
+        return capturedArgs[i];
+    }
+
+    private Object readResolve() throws ReflectiveOperationException {
+        try {
+            Method deserialize = AccessController.doPrivileged(new PrivilegedExceptionAction<Method>() {
+                @Override
+                public Method run() throws Exception {
+                    Class<?> clazz = Class.forName(capturingClass.replace('/', '.'), true,
+                                                   Thread.currentThread().getContextClassLoader());
+                    Method m = clazz.getDeclaredMethod("$deserializeLambda$", SerializedLambda.class);
+                    m.setAccessible(true);
+                    return m;
+                }
+            });
+
+            return deserialize.invoke(null, this);
+        }
+        catch (PrivilegedActionException e) {
+            Exception cause = e.getException();
+            if (cause instanceof ReflectiveOperationException)
+                throw (ReflectiveOperationException) cause;
+            else if (cause instanceof RuntimeException)
+                throw (RuntimeException) cause;
+            else
+                throw new RuntimeException("Exception in SerializedLambda.readResolve", e);
+        }
+    }
+
+    @Override
+    public String toString() {
+        return String.format("SerializedLambda[capturingClass=%s, functionalInterfaceMethod=%s %s.%s:%s, " +
+                             "implementation=%s %s.%s:%s, instantiatedMethodType=%s, numCaptured=%d]",
+                             capturingClass, MethodHandleInfo.getReferenceKindString(functionalInterfaceMethodKind),
+                             functionalInterfaceClass, functionalInterfaceMethodName, functionalInterfaceMethodSignature,
+                             MethodHandleInfo.getReferenceKindString(implMethodKind), implClass, implMethodName,
+                             implMethodSignature, instantiatedMethodType, capturedArgs.length);
+    }
+
+    /*
+    // @@@ Review question: is it worthwhile implementing a versioned serialization protocol?
+
+    private void readObject(java.io.ObjectInputStream s) throws java.io.IOException, ClassNotFoundException {
+    }
+
+    private void writeObject(java.io.ObjectOutputStream s) throws java.io.IOException {
+    }
+*/
+}
diff --git a/jdk/src/share/classes/java/lang/invoke/TypeConvertingMethodAdapter.java b/jdk/src/share/classes/java/lang/invoke/TypeConvertingMethodAdapter.java
index 7384bee464c..3aa63c84ae7 100644
--- a/jdk/src/share/classes/java/lang/invoke/TypeConvertingMethodAdapter.java
+++ b/jdk/src/share/classes/java/lang/invoke/TypeConvertingMethodAdapter.java
@@ -27,6 +27,7 @@ package java.lang.invoke;
 
 import jdk.internal.org.objectweb.asm.MethodVisitor;
 import jdk.internal.org.objectweb.asm.Opcodes;
+import jdk.internal.org.objectweb.asm.Type;
 import sun.invoke.util.Wrapper;
 import static sun.invoke.util.Wrapper.*;
 
@@ -49,6 +50,9 @@ class TypeConvertingMethodAdapter extends MethodVisitor {
 
     private static final Wrapper[] FROM_WRAPPER_NAME = new Wrapper[16];
 
+    // Table of wrappers for primitives, indexed by ASM type sorts
+    private static final Wrapper[] FROM_TYPE_SORT = new Wrapper[16];
+
     static {
         for (Wrapper w : Wrapper.values()) {
             if (w.basicTypeChar() != 'L') {
@@ -71,6 +75,15 @@ class TypeConvertingMethodAdapter extends MethodVisitor {
         initWidening(DOUBLE, Opcodes.I2D, BYTE, SHORT, INT, CHAR);
         initWidening(DOUBLE, Opcodes.F2D, FLOAT);
         initWidening(DOUBLE, Opcodes.L2D, LONG);
+
+        FROM_TYPE_SORT[Type.BYTE] = Wrapper.BYTE;
+        FROM_TYPE_SORT[Type.SHORT] = Wrapper.SHORT;
+        FROM_TYPE_SORT[Type.INT] = Wrapper.INT;
+        FROM_TYPE_SORT[Type.LONG] = Wrapper.LONG;
+        FROM_TYPE_SORT[Type.CHAR] = Wrapper.CHAR;
+        FROM_TYPE_SORT[Type.FLOAT] = Wrapper.FLOAT;
+        FROM_TYPE_SORT[Type.DOUBLE] = Wrapper.DOUBLE;
+        FROM_TYPE_SORT[Type.BOOLEAN] = Wrapper.BOOLEAN;
     }
 
     private static void initWidening(Wrapper to, int opcode, Wrapper... from) {
@@ -124,8 +137,9 @@ class TypeConvertingMethodAdapter extends MethodVisitor {
         return "()" + w.basicTypeChar();
     }
 
-    void boxIfPrimitive(Wrapper w) {
-        if (w.zero() != null) {
+    void boxIfTypePrimitive(Type t) {
+        Wrapper w = FROM_TYPE_SORT[t.getSort()];
+        if (w != null) {
             box(w);
         }
     }
@@ -264,4 +278,22 @@ class TypeConvertingMethodAdapter extends MethodVisitor {
             }
         }
     }
+
+    /**
+     * The following method is copied from
+     * org.objectweb.asm.commons.InstructionAdapter. Part of ASM: a very small
+     * and fast Java bytecode manipulation framework.
+     * Copyright (c) 2000-2005 INRIA, France Telecom All rights reserved.
+     */
+    void iconst(final int cst) {
+        if (cst >= -1 && cst <= 5) {
+            mv.visitInsn(Opcodes.ICONST_0 + cst);
+        } else if (cst >= Byte.MIN_VALUE && cst <= Byte.MAX_VALUE) {
+            mv.visitIntInsn(Opcodes.BIPUSH, cst);
+        } else if (cst >= Short.MIN_VALUE && cst <= Short.MAX_VALUE) {
+            mv.visitIntInsn(Opcodes.SIPUSH, cst);
+        } else {
+            mv.visitLdcInsn(cst);
+        }
+    }
 }
diff --git a/jdk/test/java/lang/invoke/lambda/LambdaSerialization.java b/jdk/test/java/lang/invoke/lambda/LambdaSerialization.java
new file mode 100644
index 00000000000..1e7ba6dbe5b
--- /dev/null
+++ b/jdk/test/java/lang/invoke/lambda/LambdaSerialization.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+@test
+@bug 8004970
+@summary Lambda serialization
+
+*/
+
+import java.io.*;
+
+public class LambdaSerialization {
+
+    static int assertionCount = 0;
+
+    static void assertTrue(boolean cond) {
+        assertionCount++;
+        if (!cond)
+            throw new AssertionError();
+    }
+
+    public static void main(String[] args) throws Exception {
+        try {
+            // Write lambdas out
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            ObjectOutput out = new ObjectOutputStream(baos);
+
+            write(out, z -> "[" + z + "]" );
+            write(out, z -> z + z );
+            write(out, z -> "blah" );
+            out.flush();
+            out.close();
+
+            // Read them back
+            ByteArrayInputStream bais =
+                new ByteArrayInputStream(baos.toByteArray());
+            ObjectInputStream in = new ObjectInputStream(bais);
+            readAssert(in, "[X]");
+            readAssert(in, "XX");
+            readAssert(in, "blah");
+            in.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+            throw e;
+        }
+        assertTrue(assertionCount == 3);
+    }
+
+    static void write(ObjectOutput out, LSI lamb) throws IOException {
+        out.writeObject(lamb);
+    }
+
+    static void readAssert(ObjectInputStream in, String expected)  throws IOException, ClassNotFoundException {
+        LSI ls = (LSI) in.readObject();
+        String result = ls.convert("X");
+        System.out.printf("Result: %s\n", result);
+        assertTrue(result.equals(expected));
+    }
+}
+
+interface LSI extends Serializable {
+    String convert(String x);
+}

From c64f5833d2a76756309b2f4a71b4ee3090f98d94 Mon Sep 17 00:00:00 2001
From: Xueming Shen <sherman@openjdk.org>
Date: Sun, 17 Feb 2013 01:01:15 +0000
Subject: [PATCH 165/311] 8008348: The leftover jdk/make/tools/javazic causes
 build problems with hs25-b19 control

To remove jdk/make/tools/javazic from the jdk repo

Reviewed-by: alanb
---
 jdk/make/tools/javazic/Makefile               |  43 -
 .../src/build/tools/javazic/BackEnd.java      |  70 --
 .../src/build/tools/javazic/Checksum.java     |  69 --
 .../src/build/tools/javazic/DayOfWeek.java    |  56 --
 .../tools/src/build/tools/javazic/Gen.java    | 347 --------
 .../tools/src/build/tools/javazic/GenDoc.java | 781 ------------------
 .../tools/src/build/tools/javazic/Main.java   | 238 ------
 .../src/build/tools/javazic/Mappings.java     | 197 -----
 .../tools/src/build/tools/javazic/Month.java  |  94 ---
 .../tools/src/build/tools/javazic/Rule.java   | 184 -----
 .../src/build/tools/javazic/RuleDay.java      | 190 -----
 .../src/build/tools/javazic/RuleRec.java      | 232 ------
 .../tools/src/build/tools/javazic/Simple.java | 188 -----
 .../tools/src/build/tools/javazic/Time.java   | 343 --------
 .../src/build/tools/javazic/Timezone.java     | 454 ----------
 .../tools/src/build/tools/javazic/Zone.java   | 168 ----
 .../src/build/tools/javazic/ZoneRec.java      | 252 ------
 .../src/build/tools/javazic/Zoneinfo.java     | 569 -------------
 18 files changed, 4475 deletions(-)
 delete mode 100644 jdk/make/tools/javazic/Makefile
 delete mode 100644 jdk/make/tools/src/build/tools/javazic/BackEnd.java
 delete mode 100644 jdk/make/tools/src/build/tools/javazic/Checksum.java
 delete mode 100644 jdk/make/tools/src/build/tools/javazic/DayOfWeek.java
 delete mode 100644 jdk/make/tools/src/build/tools/javazic/Gen.java
 delete mode 100644 jdk/make/tools/src/build/tools/javazic/GenDoc.java
 delete mode 100644 jdk/make/tools/src/build/tools/javazic/Main.java
 delete mode 100644 jdk/make/tools/src/build/tools/javazic/Mappings.java
 delete mode 100644 jdk/make/tools/src/build/tools/javazic/Month.java
 delete mode 100644 jdk/make/tools/src/build/tools/javazic/Rule.java
 delete mode 100644 jdk/make/tools/src/build/tools/javazic/RuleDay.java
 delete mode 100644 jdk/make/tools/src/build/tools/javazic/RuleRec.java
 delete mode 100644 jdk/make/tools/src/build/tools/javazic/Simple.java
 delete mode 100644 jdk/make/tools/src/build/tools/javazic/Time.java
 delete mode 100644 jdk/make/tools/src/build/tools/javazic/Timezone.java
 delete mode 100644 jdk/make/tools/src/build/tools/javazic/Zone.java
 delete mode 100644 jdk/make/tools/src/build/tools/javazic/ZoneRec.java
 delete mode 100644 jdk/make/tools/src/build/tools/javazic/Zoneinfo.java

diff --git a/jdk/make/tools/javazic/Makefile b/jdk/make/tools/javazic/Makefile
deleted file mode 100644
index 4545c4d491c..00000000000
--- a/jdk/make/tools/javazic/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Makefile for building the javazic tool
-#
-
-BUILDDIR = ../..
-PACKAGE = build.tools.javazic
-PRODUCT = javazic
-PROGRAM = javazic
-include $(BUILDDIR)/common/Defs.gmk
-
-BUILDTOOL_SOURCE_ROOT = $(BUILDDIR)/tools/src
-BUILDTOOL_MAIN        = $(PKGDIR)/Main.java
-
-#
-# Build tool jar rules.
-#
-include $(BUILDDIR)/common/BuildToolJar.gmk
-
diff --git a/jdk/make/tools/src/build/tools/javazic/BackEnd.java b/jdk/make/tools/src/build/tools/javazic/BackEnd.java
deleted file mode 100644
index bfeda032037..00000000000
--- a/jdk/make/tools/src/build/tools/javazic/BackEnd.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package build.tools.javazic;
-
-/**
- * <code>BackEnd</code> is an abstract base class for a back-end of compiling
- * Olson's zoneinfo database and generating Java zoneinfo database.
- *
- * @since 1.4
- */
-abstract class BackEnd {
-
-    /**
-     * Receives each zone's TimeZone information which was created by
-     * {@link Zoneinfo#parse} in class <code>Zoneinfo</code>,
-     * and processes it.
-     *
-     * @param tz Timezone object for each zone
-     * @return 0 if no error occurred, otherwise 1.
-     */
-    abstract int processZoneinfo(Timezone tz);
-
-    /**
-     * Receives whole information which is generated by JavaZic's front-end
-     * in the form of Mapping object and generates all Java zone information
-     * files.
-     *
-     * @param m Mappings object which is generated by
-     *          {@link Main#compile() Main.compile()}.
-     * @return 0 if no error occurred, otherwise 1.
-     */
-    abstract int generateSrc(Mappings m);
-
-    /**
-     * Decides which backend class should be used and returns its instance.
-     * @return an instance of backend class
-     */
-    static BackEnd getBackEnd() {
-        if (Zoneinfo.isYearForTimeZoneDataSpecified) {
-            return new Simple();
-        } else if (Main.outputDoc) {
-            return new GenDoc();
-        } else {
-            return new Gen();
-        }
-    }
-}
diff --git a/jdk/make/tools/src/build/tools/javazic/Checksum.java b/jdk/make/tools/src/build/tools/javazic/Checksum.java
deleted file mode 100644
index 565395d5c8d..00000000000
--- a/jdk/make/tools/src/build/tools/javazic/Checksum.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package build.tools.javazic;
-
-import java.util.zip.CRC32;
-
-/**
- * Checksum provides methods for calculating a CRC32 value for a
- * transitions table.
- *
- * @since 1.4
- */
-public class Checksum extends CRC32
-{
-    /**
-     * Updates the CRC32 value from each byte of the given int
-     * value. The bytes are used in the big endian order.
-     * @param val the int value
-     */
-    public void update(int val) {
-        byte[] b = new byte[4];
-        b[0] = (byte)((val >>> 24) & 0xff);
-        b[1] = (byte)((val >>> 16) & 0xff);
-        b[2] = (byte)((val >>> 8) & 0xff);
-        b[3] = (byte)(val & 0xff);
-        update(b);
-    }
-
-    /**
-     * Updates the CRC32 value from each byte of the given long
-     * value. The bytes are used in the big endian order.
-     * @param val the long value
-     */
-    void update(long val) {
-        byte[] b = new byte[8];
-        b[0] = (byte)((val >>> 56) & 0xff);
-        b[1] = (byte)((val >>> 48) & 0xff);
-        b[2] = (byte)((val >>> 40) & 0xff);
-        b[3] = (byte)((val >>> 32) & 0xff);
-        b[4] = (byte)((val >>> 24) & 0xff);
-        b[5] = (byte)((val >>> 16) & 0xff);
-        b[6] = (byte)((val >>> 8) & 0xff);
-        b[7] = (byte)(val & 0xff);
-        update(b);
-    }
-}
diff --git a/jdk/make/tools/src/build/tools/javazic/DayOfWeek.java b/jdk/make/tools/src/build/tools/javazic/DayOfWeek.java
deleted file mode 100644
index 9df8163fe5e..00000000000
--- a/jdk/make/tools/src/build/tools/javazic/DayOfWeek.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package build.tools.javazic;
-
-/**
- * Day of week enum.
- *
- * @since 1.6
- */
-
-enum DayOfWeek {
-    SUNDAY("Sun"),
-    MONDAY("Mon"),
-    TUESDAY("Tue"),
-    WEDNESDAY("Wed"),
-    THURSDAY("Thu"),
-    FRIDAY("Fri"),
-    SATURDAY("Sat");
-
-    private final String abbr;
-
-    private DayOfWeek(String abbr) {
-        this.abbr = abbr;
-    }
-
-    String getAbbr() {
-        return abbr;
-    }
-
-    int value() {
-        return ordinal() + 1;
-    }
-}
diff --git a/jdk/make/tools/src/build/tools/javazic/Gen.java b/jdk/make/tools/src/build/tools/javazic/Gen.java
deleted file mode 100644
index 8f3a8c5a37a..00000000000
--- a/jdk/make/tools/src/build/tools/javazic/Gen.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package build.tools.javazic;
-
-import  java.io.IOException;
-import  java.io.File;
-import  java.io.FileOutputStream;
-import  java.io.DataOutputStream;
-import  java.io.RandomAccessFile;
-import  java.util.List;
-import  java.util.Map;
-import  java.util.Set;
-import  sun.util.calendar.ZoneInfoFile;
-
-/**
- * <code>Gen</code> is one of back-end classes of javazic, and generates
- * ZoneInfoMappings and zone-specific file for each zone.
- */
-class Gen extends BackEnd {
-
-    /**
-     * Generates datafile in binary TLV format for each time zone.
-     * Regarding contents of output files, see {@link ZoneInfoFile}.
-     *
-     * @param Timezone
-     * @return 0 if no errors, or 1 if error occurred.
-     */
-    int processZoneinfo(Timezone tz) {
-        try {
-            int size;
-            String outputDir = Main.getOutputDir();
-            String zonefile = ZoneInfoFile.getFileName(tz.getName());
-
-            /* If outputDir doesn't end with file-separator, adds it. */
-            if (!outputDir.endsWith(File.separator)) {
-                outputDir += File.separatorChar;
-            }
-
-            /* If zonefile includes file-separator, it's treated as part of
-             * pathname. And make directory if necessary.
-             */
-            int index = zonefile.lastIndexOf(File.separatorChar);
-            if (index != -1) {
-                outputDir += zonefile.substring(0, index+1);
-            }
-            File outD = new File(outputDir);
-            outD.mkdirs();
-
-            FileOutputStream fos =
-                new FileOutputStream(outputDir + zonefile.substring(index+1));
-            DataOutputStream dos = new DataOutputStream(fos);
-
-            /* Output Label */
-            dos.write(ZoneInfoFile.JAVAZI_LABEL, 0,
-                      ZoneInfoFile.JAVAZI_LABEL.length);
-
-            /* Output Version of ZoneInfoFile */
-            dos.writeByte(ZoneInfoFile.JAVAZI_VERSION);
-
-            List<Long> transitions = tz.getTransitions();
-            if (transitions != null) {
-                List<Integer> dstOffsets = tz.getDstOffsets();
-                List<Integer> offsets = tz.getOffsets();
-
-                if ((dstOffsets == null && offsets != null) ||
-                    (dstOffsets != null && offsets == null)) {
-                    Main.panic("Data not exist. (dstOffsets or offsets)");
-                    return 1;
-                }
-
-                /* Output Transition records */
-                dos.writeByte(ZoneInfoFile.TAG_Transition);
-                size = transitions.size();
-                dos.writeShort((size * 8) & 0xFFFF);
-                int dstoffset;
-                for (int i = 0; i < size; i++) {
-                    /* if DST offset is 0, this means DST isn't used.
-                     * (NOT: offset's index is 0.)
-                     */
-                    if ((dstoffset = dstOffsets.get(i).intValue()) == -1) {
-                        dstoffset = 0;
-                    }
-
-                    dos.writeLong((transitions.get(i).longValue() << 12)
-                                  | (dstoffset << 4)
-                                  | offsets.get(i).intValue());
-
-                }
-
-                /* Output data for GMTOffset */
-                List<Integer> gmtoffset = tz.getGmtOffsets();
-                dos.writeByte(ZoneInfoFile.TAG_Offset);
-                size = gmtoffset.size();
-                dos.writeShort((size * 4) & 0xFFFF);
-                for (int i = 0; i < size; i++) {
-                    dos.writeInt(gmtoffset.get(i));
-                }
-            }
-
-            /* Output data for SimpleTimeZone */
-            List<RuleRec> stz = tz.getLastRules();
-            if (stz != null) {
-                RuleRec[] rr = new RuleRec[2];
-                boolean wall = true;
-
-                rr[0] = stz.get(0);
-                rr[1] = stz.get(1);
-
-                dos.writeByte(ZoneInfoFile.TAG_SimpleTimeZone);
-                wall = rr[0].getTime().isWall() && rr[1].getTime().isWall();
-                if (wall) {
-                    dos.writeShort(32);
-                } else {
-                    dos.writeShort(40);
-                }
-
-                for (int i = 0; i < 2; i++) {
-                    dos.writeInt(rr[i].getMonthNum() - 1); // 0-based month number
-                    dos.writeInt(rr[i].getDay().getDayForSimpleTimeZone());
-                    dos.writeInt(rr[i].getDay().getDayOfWeekForSimpleTimeZoneInt());
-                    dos.writeInt((int)rr[i].getTime().getTime());
-                    if (!wall) {
-                        dos.writeInt((rr[i].getTime().getType() & 0xFF) - 1);
-                    }
-                }
-            }
-
-            /* Output RawOffset */
-            dos.writeByte(ZoneInfoFile.TAG_RawOffset);
-            dos.writeShort(4);
-            dos.writeInt(tz.getRawOffset());
-
-            /* Output willGMTOffsetChange flag */
-            if (tz.willGMTOffsetChange()) {
-                dos.writeByte(ZoneInfoFile.TAG_GMTOffsetWillChange);
-                dos.writeShort(1);
-                dos.writeByte(1);
-            }
-
-            /* Output LastDSTSaving */
-            dos.writeByte(ZoneInfoFile.TAG_LastDSTSaving);
-            dos.writeShort(2);
-            dos.writeShort(tz.getLastDSTSaving()/1000);
-
-            /* Output checksum */
-            dos.writeByte(ZoneInfoFile.TAG_CRC32);
-            dos.writeShort(4);
-            dos.writeInt(tz.getCRC32());
-
-            fos.close();
-            dos.close();
-        } catch(IOException e) {
-            Main.panic("IO error: "+e.getMessage());
-            return 1;
-        }
-
-        return 0;
-    }
-
-    /**
-     * Generates ZoneInfoMappings in binary TLV format for each zone.
-     * Regarding contents of output files, see {@link ZoneInfoFile}.
-     *
-     * @param Mappings
-     * @return 0 if no errors, or 1 if error occurred.
-     */
-    int generateSrc(Mappings map) {
-        try {
-            int index;
-            int block_size;
-            int roi_size;
-            long fp;
-            String outputDir = Main.getOutputDir();
-
-            /* If outputDir doesn't end with file-separator, adds it. */
-            if (!outputDir.endsWith(File.separator)) {
-                outputDir += File.separatorChar;
-            }
-
-            File outD = new File(outputDir);
-            outD.mkdirs();
-
-            /* Open ZoneInfoMapping file to write. */
-            RandomAccessFile raf =
-                new RandomAccessFile(outputDir + ZoneInfoFile.JAVAZM_FILE_NAME, "rw");
-
-            /* Whether rawOffsetIndex list exists or not. */
-            List<Integer> roi = map.getRawOffsetsIndex();
-            if (roi == null) {
-                Main.panic("Data not exist. (rawOffsetsIndex)");
-                return 1;
-            }
-            roi_size = roi.size();
-
-            /* Whether rawOffsetIndexTable list exists or not. */
-            List<Set<String>> roit = map.getRawOffsetsIndexTable();
-            if (roit == null || roit.size() != roi_size) {
-                Main.panic("Data not exist. (rawOffsetsIndexTable) Otherwise, Invalid size");
-                return 1;
-            }
-
-            /* Output Label */
-            raf.write(ZoneInfoFile.JAVAZM_LABEL, 0,
-                      ZoneInfoFile.JAVAZM_LABEL.length);
-
-            /* Output Version */
-            raf.writeByte(ZoneInfoFile.JAVAZM_VERSION);
-
-            index = ZoneInfoFile.JAVAZM_LABEL.length + 2;
-
-            /* Output Version of Olson's tzdata */
-            byte[] b = Main.getVersionName().getBytes("UTF-8");
-            raf.writeByte(ZoneInfoFile.TAG_TZDataVersion);
-            raf.writeShort((b.length+1) & 0xFFFF);
-            raf.write(b);
-            raf.writeByte(0x00);
-            index += b.length + 4;
-
-            /* Output ID list. */
-            raf.writeByte(ZoneInfoFile.TAG_ZoneIDs);
-            block_size = 2;
-            raf.writeShort(block_size & 0xFFFF);
-            short nID = 0;
-            raf.writeShort(nID & 0xFFFF);
-            for (int i = 0; i < roi_size; i++) {
-                for (String key : roit.get(i)) {
-                    byte size = (byte)key.getBytes("UTF-8").length;
-                    raf.writeByte(size & 0xFF);
-                    raf.write(key.getBytes("UTF-8"), 0, size);
-                    block_size += 1 + size;
-                    nID++;
-                }
-            }
-            fp = raf.getFilePointer();
-            raf.seek(index);
-            raf.writeShort((block_size) & 0xFFFF);
-            raf.writeShort(nID & 0xFFFF);
-            raf.seek(fp);
-
-            /* Output sorted rawOffset list. */
-            raf.writeByte(ZoneInfoFile.TAG_RawOffsets);
-            index += 3 + block_size;
-            block_size = roi_size * 4;
-            raf.writeShort(block_size & 0xFFFF);
-            for (int i = 0; i < roi_size; i++) {
-                raf.writeInt(Integer.parseInt(roi.get(i).toString()));
-            }
-
-            /* Output sorted rawOffsetIndex list. */
-            raf.writeByte(ZoneInfoFile.TAG_RawOffsetIndices);
-            index += 3 + block_size;
-            block_size = 0;
-            raf.writeShort(block_size & 0xFFFF);
-            int num;
-            for (int i = 0; i < roi_size; i++) {
-                num = roit.get(i).size();
-                block_size += num;
-                for (int j = 0; j < num; j++) {
-                    raf.writeByte(i);
-                }
-            }
-            fp = raf.getFilePointer();
-            raf.seek(index);
-            raf.writeShort((block_size) & 0xFFFF);
-            raf.seek(fp);
-
-            /* Whether alias list exists or not. */
-            Map<String,String> a = map.getAliases();
-            if (a == null) {
-                Main.panic("Data not exist. (aliases)");
-                return 0;
-            }
-
-            /* Output ID list. */
-            raf.writeByte(ZoneInfoFile.TAG_ZoneAliases);
-            index += 3 + block_size;
-            block_size = 2;
-            raf.writeShort(block_size & 0xFFFF);
-            raf.writeShort(a.size() & 0xFFFF);
-            for (String key : a.keySet()) {
-                String alias = a.get(key);
-                byte key_size = (byte)key.length();
-                byte alias_size = (byte)alias.length();
-                raf.writeByte(key_size & 0xFF);
-                raf.write(key.getBytes("UTF-8"), 0, key_size);
-                raf.writeByte(alias_size & 0xFF);
-                raf.write(alias.getBytes("UTF-8"), 0, alias_size);
-                block_size += 2 + key_size + alias_size;
-            }
-            fp = raf.getFilePointer();
-            raf.seek(index);
-            raf.writeShort((block_size) & 0xFFFF);
-            raf.seek(fp);
-
-            /* Output the exclude list if it exists. */
-            List<String> excludedZones = map.getExcludeList();
-            if (excludedZones != null) {
-                raf.writeByte(ZoneInfoFile.TAG_ExcludedZones);
-                index += 3 + block_size;
-                block_size = 2;
-                raf.writeShort(block_size & 0xFFFF);  // place holder
-                raf.writeShort(excludedZones.size()); // the number of excluded zones
-                for (String name : excludedZones) {
-                    byte size = (byte) name.length();
-                    raf.writeByte(size);                 // byte length
-                    raf.write(name.getBytes("UTF-8"), 0, size); // zone name
-                    block_size += 1 + size;
-                }
-                fp = raf.getFilePointer();
-                raf.seek(index);
-                raf.writeShort(block_size & 0xFFFF);
-                raf.seek(fp);
-            }
-
-            /* Close ZoneInfoMapping file. */
-            raf.close();
-        } catch(IOException e) {
-            Main.panic("IO error: "+e.getMessage());
-            return 1;
-        }
-
-        return 0;
-    }
-}
diff --git a/jdk/make/tools/src/build/tools/javazic/GenDoc.java b/jdk/make/tools/src/build/tools/javazic/GenDoc.java
deleted file mode 100644
index c598b9b9dc5..00000000000
--- a/jdk/make/tools/src/build/tools/javazic/GenDoc.java
+++ /dev/null
@@ -1,781 +0,0 @@
-/*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package build.tools.javazic;
-
-import  java.io.BufferedReader;
-import  java.io.BufferedWriter;
-import  java.io.File;
-import  java.io.FileReader;
-import  java.io.FileWriter;
-import  java.io.IOException;
-import  java.util.Date;
-import  java.util.HashMap;
-import  java.util.List;
-import  java.util.Map;
-import  java.util.Set;
-import  java.util.SortedMap;
-import  java.util.StringTokenizer;
-import  java.util.TreeMap;
-import  java.util.TreeSet;
-import  sun.util.calendar.ZoneInfoFile;
-
-/**
- * <code>GenDoc</code> is one of back-end classes of javazic, and generates
- * index.html and other html files which prints the detailed time zone
- * information for each zone.
- */
-class GenDoc extends BackEnd {
-
-    private static final String docDir = "doc";
-
-    private static final String header1 =
-        "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Frameset//EN\"" +
-        "\"http://www.w3.org/TR/REC-html40/frameset.dtd\">\n" +
-        "<HTML>\n<HEAD>\n<!-- Generated by javazic on ";
-    private static final String header2 =
-        "-->\n<TITLE>\n" +
-        "Java Platform, Standard Edition - TimeZone information based on ";
-    private static final String header3 =
-        "-->\n<TITLE>\n" +
-        "Java Platform, Standard Edition  TimeZone - ";
-    private static final String header4 =
-        "</TITLE>\n" +
-        "</HEAD>\n\n";
-
-    private static final String body1 =
-        "<BODY BGCOLOR=\"white\">\n";
-    private static final String body2 =
-        "</BODY>\n";
-
-    private static final String footer =
-        "</HTML>\n";
-
-
-    // list of time zone name and zonefile name/real time zone name
-    //   e.g.
-    //      key (String)       : value (String)
-    //      "America/Denver"   : "America/Denver.html" (real time zone)
-    //      "America/Shiprock" : "America/Denver"      (alias)
-    TreeMap<String,String> timezoneList = new TreeMap<String,String>();
-
-    // list of time zone's display name and time zone name
-    //   e.g.
-    //      key (String)                : value (String)
-    //      "Tokyo, Asia"               : "Asia/Tokyo"
-    //      "Marengo, Indiana, America" : "America/Indiana/Marengo"
-    //          (aliases included)
-    TreeMap<String,String> displayNameList = new TreeMap<String,String>();
-
-    // list of top level regions
-    //   e.g.
-    //      key (String) : value (String)
-    //      "America"    : "America.html"
-    //          (including entries in America/Indiana/, America/Kentucky/, ...)
-    TreeMap<String,String> regionList = new TreeMap<String,String>();
-
-    // mapping list from zone name to latitude & longitude
-    //   This list is generated from zone.tab.
-    //   e.g.
-    //      key (String) : value (LatitudeAndLongitude object)
-    //      "Asia/Tokyo" : latitude=35.3916, longitude=13.9444
-    //          (aliases not included)
-    HashMap<String,LatitudeAndLongitude> mapList = null;
-
-    // SortedMap of zone IDs sorted by their GMT offsets. If zone's GMT
-    // offset will change in the future, its last known offset is
-    // used.
-    SortedMap<Integer, Set<String>> zonesByOffset = new TreeMap<Integer, Set<String>>();
-
-    /**
-     * Generates HTML document for each zone.
-     * @param Timezone
-     * @return 0 if no errors, or 1 if error occurred.
-     */
-    int processZoneinfo(Timezone tz) {
-        try {
-            int size;
-            int index;
-            String outputDir = Main.getOutputDir();
-            String zonename = tz.getName();
-            String zonefile = ZoneInfoFile.getFileName(zonename) + ".html";
-            List<RuleRec> stz = tz.getLastRules();
-            timezoneList.put(zonename, zonefile);
-            displayNameList.put(transform(zonename), zonename);
-
-            // Populate zonesByOffset. (Zones that will change their
-            // GMT offsets are also added to zonesByOffset here.)
-            int lastKnownOffset = tz.getRawOffset();
-            Set<String> set = zonesByOffset.get(lastKnownOffset);
-            if (set == null) {
-                set = new TreeSet<String>();
-                zonesByOffset.put(lastKnownOffset, set);
-            }
-            set.add(zonename);
-
-            /* If outputDir doesn't end with file-separator, adds it. */
-            if (!outputDir.endsWith(File.separator)) {
-                outputDir += File.separatorChar;
-            }
-            outputDir += docDir + File.separatorChar;
-
-            index = zonename.indexOf('/');
-            if (index != -1) {
-                regionList.put(zonename.substring(0, index),
-                               zonename.substring(0, index) + ".html");
-            }
-
-            /* If zonefile includes file-separator, it's treated as part of
-             * pathname. And make directory if necessary.
-             */
-            index = zonefile.lastIndexOf('/');
-            if (index != -1) {
-                zonefile.replace('/', File.separatorChar);
-                outputDir += zonefile.substring(0, index+1);
-            }
-            File outD = new File(outputDir);
-            outD.mkdirs();
-
-            /* If mapfile is available, add a link to the appropriate map */
-            if ((mapList == null) && (Main.getMapFile() != null)) {
-                FileReader fr = new FileReader(Main.getMapFile());
-                BufferedReader in = new BufferedReader(fr);
-                mapList = new HashMap<String,LatitudeAndLongitude>();
-                String line;
-                while ((line = in.readLine()) != null) {
-                    // skip blank and comment lines
-                    if (line.length() == 0 || line.charAt(0) == '#') {
-                        continue;
-                    }
-                    StringTokenizer tokens = new StringTokenizer(line);
-                    String token = tokens.nextToken();  /* We don't use the first token. */
-                    token = tokens.nextToken();
-                    LatitudeAndLongitude location = new LatitudeAndLongitude(token);
-                    token = tokens.nextToken();
-                    mapList.put(token, location);
-                }
-                in.close();
-            }
-
-            /* Open zoneinfo file to write. */
-            FileWriter fw = new FileWriter(outputDir + zonefile.substring(index+1));
-            BufferedWriter out = new BufferedWriter(fw);
-
-            out.write(header1 + new Date() + header3 + zonename + header4);
-            out.write(body1 + "<FONT size=\"+2\"><B>" + zonename + "</B></FONT>");
-            LatitudeAndLongitude location = mapList.get(zonename);
-            if (location != null) {
-                int deg, min, sec;
-
-                deg = location.getLatDeg();
-                min = location.getLatMin();
-                sec = location.getLatSec();
-                if (deg < 0) {
-                    min = -min;
-                    sec = -sec;
-                } else if (min < 0) {
-                    sec = -sec;
-                }
-                out.write("&nbsp;&nbsp;&nbsp;" +
-                          "<A HREF=\"http://www.mapquest.com/maps/map.adp?" +
-                          "latlongtype=degrees" +
-                          "&latdeg=" + deg +
-                          "&latmin=" + min +
-                          "&latsec=" + sec);
-
-                deg = location.getLongDeg();
-                min = location.getLongMin();
-                sec = location.getLongSec();
-                if (deg < 0) {
-                    min = -min;
-                    sec = -sec;
-                } else if (min < 0) {
-                    sec = -sec;
-                }
-                out.write("&longdeg=" + deg +
-                          "&longmin=" + min +
-                          "&longsec=" + sec +
-                          "\" target=\"_blank\">[map]</A>");
-            }
-            out.write("\n<P>\n");
-
-            List<ZoneRec> zone = tz.getZones();
-            List<RuleRec> rule = tz.getRules();
-            if (rule != null && zone != null) {
-                out.write("<TABLE BORDER=\"0\" WIDTH=\"100%\" CELLPADDING=\"1\" CELLSPACING=\"0\">\n" +
-                          "<TR>\n" +
-                          "<TD BGCOLOR=\"#EEEEFF\" WIDTH=\"50%\" ALIGN=\"CENTER\"><BR>" +
-                          "<A HREF=\"#Rules\">Rules</A><BR></TD>\n" +
-                          "<TD BGCOLOR=\"#EEEEFF\" WIDTH=\"50%\" ALIGN=\"CENTER\">" +
-                          "<A HREF=\"#Zone\"><BR>Zone<BR></A></TD>\n" +
-                          "</TR>\n</TABLE>\n");
-            }
-
-            /* Output Rule records. */
-            if (rule != null) {
-                size = rule.size();
-                out.write("<P>\n<A NAME=\"Rules\">" +
-                          "<FONT SIZE=\"+1\"><B>Rules</B></FONT></A>\n" +
-                          "<TABLE BORDER=\"1\" WIDTH=\"100%\" CELLPADDING=\"3\" CELLSPACING=\"0\">\n" +
-                          "<TR BGCOLOR=\"#CCCCFF\">\n" +
-                          "<TD>NAME</TD><TD>FROM</TD><TD>TO</TD><TD>TYPE</TD>" +
-                          "<TD>IN</TD><TD>ON</TD><TD>AT</TD><TD>SAVE</TD>" +
-                          "<TD>LETTER/S</TD><TD>NOTES</TD>\n</TR>\n");
-                for (int i = 0; i < size; i++) {
-                    out.write("<TR BGCOLOR=\"#FFFFFF\">\n");
-                    StringTokenizer st = new StringTokenizer(rule.get(i).getLine());
-                    String s;
-                    if (st.hasMoreTokens()) {   /* RULE - truncated */
-                        st.nextToken();
-                    }
-                    if (st.hasMoreTokens()) {   /* NAME */
-                        out.write("<TD>" + st.nextToken() + "</TD>");
-                    }
-                    if (st.hasMoreTokens()) {   /* FROM */
-                        out.write("<TD>" + st.nextToken() + "</TD>");
-                    }
-                    if (st.hasMoreTokens()) {   /* TO */
-                        s = st.nextToken();
-                        if (s.equals("min") || s.equals("max")) {
-                            out.write("<TD><FONT COLOR=\"red\">" + s + "</FONT></TD>");
-                        } else {
-                            out.write("<TD>" + s + "</TD>");
-                        }
-                    }
-                    if (st.hasMoreTokens()) {   /* TYPE */
-                        out.write("<TD>" + st.nextToken() + "</TD>");
-                    }
-                    if (st.hasMoreTokens()) {   /* IN */
-                        out.write("<TD>" + st.nextToken() + "</TD>");
-                    }
-                    if (st.hasMoreTokens()) {   /* ON */
-                        out.write("<TD>" + st.nextToken() + "</TD>");
-                    }
-                    if (st.hasMoreTokens()) {   /* AT */
-                        out.write("<TD>" + st.nextToken() + "</TD>");
-                    }
-                    if (st.hasMoreTokens()) {   /* SAVE */
-                        out.write("<TD>" + st.nextToken() + "</TD>");
-                    }
-                    if (st.hasMoreTokens()) {   /* LETTER/S */
-                        out.write("<TD>" + st.nextToken() + "</TD>");
-                    }
-                    if (st.hasMoreTokens()) {   /* NOTES */
-                        s = st.nextToken();
-                        while (st.hasMoreTokens()) {
-                            s += " " + st.nextToken();
-                        }
-                        index = s.indexOf('#');
-                        out.write("<TD>" + s.substring(index+1) + "</TD>\n");
-                    } else {
-                        out.write("<TD>&nbsp;</TD>\n");
-                    }
-                    out.write("</TR>\n");
-                }
-                out.write("</TABLE>\n<P>&nbsp;<P>\n");
-            }
-
-            /* Output Zone records. */
-            if (zone != null) {
-                size = zone.size();
-                out.write("<P>\n<A NAME=\"Zone\">" +
-                          "<FONT SIZE=\"+1\"><B>Zone</B></FONT></A>\n" +
-                          "<TABLE BORDER=\"1\" WIDTH=\"100%\" CELLPADDING=\"3\" CELLSPACING=\"0\">\n" +
-                          "<TR BGCOLOR=\"#CCCCFF\">\n<TD>GMTOFF</TD>" +
-                          "<TD>RULES</TD><TD>FORMAT</TD><TD>UNTIL</TD>" +
-                          "<TD>NOTES</TD>\n</TR>\n");
-                for (int i = 0; i < size; i++) {
-                    out.write("<TR>\n");
-                    StringTokenizer st = new StringTokenizer(zone.get(i).getLine());
-                    String s = st.nextToken();
-                    if (s.equals("Zone")) {     /* NAME */
-                        s = st.nextToken();
-                        s = st.nextToken();
-                    }
-                    out.write("<TD>" + s + "</TD>");    /* GMTOFFSET */
-                    if (st.hasMoreTokens()) {   /* RULES */
-                        out.write("<TD>" + st.nextToken() + "</TD>");
-                    }
-                    if (st.hasMoreTokens()) {   /* FORMAT */
-                        s = st.nextToken();
-                        index = s.indexOf('#');
-                        if (index != -1) {
-                            if (index != 0) {
-                                out.write("<TD>" + s.substring(0, index-1) +
-                                          "</TD>");     /* FORMAT */
-                                s = s.substring(index+1);
-                            } else {
-                                out.write("<TD>&nbsp;</TD>");   /* FORMAT */
-                            }
-                            while (st.hasMoreTokens()) {
-                                s += " " + st.nextToken();
-                            }
-                            out.write("<TD>&nbsp;</TD>");       /* UNTIL */
-                            out.write("<TD>" + s + "</TD>\n</TR>\n");   /* NOTES */
-                            continue;
-                        } else {
-                            out.write("<TD>" + s + "</TD>");    /* FORMAT */
-                        }
-                    }
-
-                    if (st.hasMoreTokens()) {   /* UNTIL */
-                        s = st.nextToken();
-                        while (st.hasMoreTokens()) {
-                            s += " " + st.nextToken();
-                        }
-                        index = s.indexOf('#');
-                        if (index != -1) {
-                            if (index != 0) {
-                                out.write("<TD>" + s.substring(0, index-1) +
-                                          "</TD>");     /* UNTIL */
-                            } else {
-                                out.write("<TD>&nbsp;</TD>");   /* UNTIL */
-                            }
-                            out.write("<TD>" + s.substring(index+1) +
-                                      "</TD>\n");       /* NOTES */
-                        } else {
-                            out.write("<TD>" + s + "</TD>");    /* UNTIL */
-                            out.write("<TD>&nbsp;</TD>\n");     /* NOTES */
-                        }
-                    } else {
-                        out.write("<TD>&nbsp;</TD>");           /* UNTIL */
-                        out.write("<TD>&nbsp;</TD>\n");         /* NOTES */
-                    }
-                    out.write("</TR>\n");
-                }
-                out.write("</TABLE>\n");
-            }
-            out.write(body2 + footer);
-
-            out.close();
-            fw.close();
-        } catch(IOException e) {
-            Main.panic("IO error: "+e.getMessage());
-            return 1;
-        }
-
-        return 0;
-    }
-
-    /**
-     * Generates index.html and other top-level frame files.
-     * @param Mappings
-     * @return 0 if no errors, or 1 if error occurred.
-     */
-    int generateSrc(Mappings map) {
-        try {
-            int len;
-            Object o[];
-            String outputDir = Main.getOutputDir();
-            FileWriter fw1, fw2;
-            BufferedWriter out1, out2;
-
-            /* Whether alias list exists or not. */
-            Map<String,String> a = map.getAliases();
-            if (a == null) {
-                Main.panic("Data not exist. (aliases)");
-                return 1;
-            }
-
-            timezoneList.putAll(a);
-
-            /* If outputDir doesn't end with file-separator, adds it. */
-            if (!outputDir.endsWith(File.separator)) {
-                outputDir += File.separatorChar;
-            }
-            outputDir += docDir + File.separatorChar;
-
-            File outD = new File(outputDir);
-            outD.mkdirs();
-
-            /* Creates index.html */
-            fw1 = new FileWriter(outputDir + "index.html", false);
-            out1 = new BufferedWriter(fw1);
-
-            out1.write(header1 + new Date() + header2 + Main.getVersionName() +
-                       header4 +
-                       "<FRAMESET cols=\"20%,80%\">\n" +
-                       "<FRAMESET rows=\"30%,70%\">\n" +
-                       "<FRAME src=\"overview-frame.html\" name=\"TimeZoneListFrame\">\n" +
-                       "<FRAME src=\"allTimeZone-frame1.html\" name=\"allTimeZoneFrame\">\n" +
-                       "</FRAMESET>" +
-                       "<FRAME src=\"overview-summary.html\" name=\"rightFrame\">\n" +
-                       "</FRAMESET>\n" +
-                       "<NOFRAMES>\n" +
-                       "<H2>\nFrame Alert\n</H2>\n\n" +
-                       "<P>\n\n" +
-                       "This document is designed to be viewed using the frames feature. If you see this\n" +
-                       "message, you are using a non-frame-capable web client.\n" +
-                       "<BR>\n" +
-                       "Link to<A HREF=\"overview-summary.html\">Non-frame version.</A>\n" +
-                       "</NOFRAMES>\n" + footer);
-
-            out1.close();
-            fw1.close();
-
-
-            /* Creates overview-frame.html */
-            fw1 = new FileWriter(outputDir + "overview-frame.html", false);
-            out1 = new BufferedWriter(fw1);
-
-            out1.write(header1 + new Date() + header2 + Main.getVersionName() +
-                       header4 + body1 +
-                       "<TABLE BORDER=\"0\" WIDTH=\"100%\">\n<TR>\n" +
-                       "<TD NOWRAP><FONT size=\"+1\">\n" +
-                       "<B>Java<sup><font size=-2>TM</font></sup>&nbsp;Platform<br>Standard&nbsp;Ed.</B></FONT></TD>\n" +
-                       "</TR>\n</TABLE>\n\n" +
-                       "<TABLE BORDER=\"0\" WIDTH=\"100%\">\n<TR>\n<TD NOWRAP>" +
-                       "<P>\n<FONT size=\"+1\">\nAll Time Zones Sorted By:</FONT>\n<BR>\n" +
-                       "&nbsp;&nbsp;<A HREF=\"allTimeZone-frame1.html\" TARGET=\"allTimeZoneFrame\">GMT offsets</A></FONT>\n<BR>\n" +
-                       "&nbsp;&nbsp;<A HREF=\"allTimeZone-frame2.html\" TARGET=\"allTimeZoneFrame\">Zone names</A></FONT>\n<BR>" +
-                       "&nbsp;&nbsp;<A HREF=\"allTimeZone-frame3.html\" TARGET=\"allTimeZoneFrame\">City names</A></FONT>\n" +
-                       "<P>\n<FONT size=\"+1\">\nContinents and Oceans</FONT>\n<BR>\n");
-
-            for (String regionKey : regionList.keySet()) {
-                out1.write("&nbsp;&nbsp;<A HREF=\"" + regionList.get(regionKey) +
-                           "\" TARGET=\"allTimeZoneFrame\">" + regionKey +
-                           "</A><BR>\n");
-
-                fw2 = new FileWriter(outputDir + regionList.get(regionKey),
-                                     false);
-                out2 = new BufferedWriter(fw2);
-
-                out2.write(header1 + new Date() + header3 + regionKey +
-                           header4 + body1 + "<FONT size=\"+1\"><B>" +
-                           regionKey + "</B></FONT>\n<BR>\n<TABLE>\n<TR>\n<TD>");
-
-                boolean found = false;
-                for (String timezoneKey : timezoneList.keySet()) {
-                    int regionIndex = timezoneKey.indexOf('/');
-                    if (regionIndex == -1 ||
-                        !regionKey.equals(timezoneKey.substring(0, regionIndex))) {
-                        if (found) {
-                            break;
-                        } else {
-                            continue;
-                        }
-                    }
-
-                    found = true;
-                    if (a.containsKey(timezoneKey)) {
-                        Object realName = a.get(timezoneKey);
-                        while (a.containsKey(realName)) {
-                            realName = a.get(realName);
-                        }
-                        out2.write(timezoneKey +
-                                   " (alias for " + "<A HREF=\"" +
-                                   timezoneList.get(realName) +
-                                   "\" TARGET=\"rightFrame\">" +
-                                   realName + "</A>)");
-                    } else {
-                        out2.write("<A HREF=\"" + timezoneList.get(timezoneKey) +
-                                   "\" TARGET=\"rightFrame\">" + timezoneKey +
-                                   "</A>");
-                    }
-                    out2.write("<BR>\n");
-                }
-                out2.write("</TD>\n</TR>\n</TABLE>\n" + body2 + footer);
-
-                out2.close();
-                fw2.close();
-            }
-            out1.write("</FONT></TD>\n</TR></TABLE>\n" + body2 + footer);
-
-            out1.close();
-            fw1.close();
-
-
-            /* Creates allTimeZone-frame1.html (Sorted by GMT offsets) */
-            fw1 = new FileWriter(outputDir + "allTimeZone-frame1.html", false);
-            out1 = new BufferedWriter(fw1);
-
-            out1.write(header1 + new Date() + header2 + Main.getVersionName() +
-                       header4 + body1 +
-                       "<FONT size=\"+1\"><B>Sorted by GMT offsets</B></FONT>\n" +
-                       "<BR>\n\n" + "<TABLE BORDER=\"0\" WIDTH=\"100%\">\n" +
-                       "<TR>\n<TD NOWRAP>\n");
-
-            List<Integer> roi = map.getRawOffsetsIndex();
-            List<Set<String>> roit = map.getRawOffsetsIndexTable();
-
-            int index = 0;
-            for (Integer offset : zonesByOffset.keySet()) {
-                int off = roi.get(index);
-                Set<String> perRO = zonesByOffset.get(offset);
-                if (offset == off) {
-                    // Merge aliases into zonesByOffset
-                    perRO.addAll(roit.get(index));
-                }
-                index++;
-
-                for (String timezoneKey : perRO) {
-                    out1.write("<TR>\n<TD><FONT SIZE=\"-1\">(" +
-                               Time.toGMTFormat(offset.toString()) +
-                               ")</FONT></TD>\n<TD>");
-
-                    if (a.containsKey(timezoneKey)) {
-                        Object realName = a.get(timezoneKey);
-                        while (a.containsKey(realName)) {
-                            realName = a.get(realName);
-                        }
-                        out1.write(timezoneKey +
-                                   " (alias for " + "<A HREF=\"" +
-                                   timezoneList.get(realName) +
-                                   "\" TARGET=\"rightFrame\">" + realName +
-                                   "</A>)");
-                    } else {
-                        out1.write("<A HREF=\"" + timezoneList.get(timezoneKey) +
-                                   "\" TARGET=\"rightFrame\">" + timezoneKey +
-                                   "</A>");
-                    }
-                    out1.write("</TD>\n</TR>\n");
-                }
-            }
-            out1.write("</FONT></TD>\n</TR>\n</TABLE>\n" + body2 + footer);
-
-            out1.close();
-            fw1.close();
-
-
-            /* Creates allTimeZone-frame2.html (Sorted by zone names) */
-            fw1 = new FileWriter(outputDir + "allTimeZone-frame2.html", false);
-            out1 = new BufferedWriter(fw1);
-
-            out1.write(header1 + new Date() + header2 + Main.getVersionName() +
-                       header4 + body1 +
-                       "<FONT size=\"+1\"><B>Sorted by zone names</B></FONT>\n" +
-                       "<BR>\n\n" + "<TABLE BORDER=\"0\" WIDTH=\"100%\">\n" +
-                       "<TR>\n<TD NOWRAP>\n");
-            o = timezoneList.keySet().toArray();
-            len = timezoneList.size();
-            for (int i = 0; i < len; i++) {
-                Object timezoneKey = o[i];
-                if (a.containsKey(timezoneKey)) {
-                    Object realName = a.get(timezoneKey);
-                    while (a.containsKey(realName)) {
-                        realName = a.get(realName);
-                    }
-                    out1.write(timezoneKey +
-                               " (alias for " +
-                               "<A HREF=\"" + timezoneList.get(realName) +
-                               "\" TARGET=\"rightFrame\">" + realName +
-                               "</A>)");
-                } else {
-                    out1.write("<A HREF=\"" + timezoneList.get(timezoneKey) +
-                               "\" TARGET=\"rightFrame\">" + timezoneKey +
-                               "</A>");
-                }
-                out1.write("<BR> \n");
-            }
-            out1.write("</FONT></TD>\n</TR>\n</TABLE>\n" + body2 + footer);
-
-            out1.close();
-            fw1.close();
-
-            /* Creates allTimeZone-frame3.html (Sorted by city names) */
-            fw1 = new FileWriter(outputDir + "allTimeZone-frame3.html", false);
-            out1 = new BufferedWriter(fw1);
-
-            out1.write(header1 + new Date() + header2 + Main.getVersionName() +
-                       header4 + body1 +
-                       "<FONT size=\"+1\"><B>Sorted by city names</B></FONT>\n" +
-                       "<BR>\n\n" + "<TABLE BORDER=\"0\" WIDTH=\"100%\">\n" +
-                       "<TR>\n<TD NOWRAP>\n");
-
-            Set<String> aliasSet = a.keySet();
-            len = aliasSet.size();
-            String aliasNames[] = aliasSet.toArray(new String[0]);
-            for (int i = 0; i < len; i++) {
-                displayNameList.put(transform(aliasNames[i]),
-                                    aliasNames[i]);
-            }
-
-            o = displayNameList.keySet().toArray();
-            len = displayNameList.size();
-            for (int i = 0; i < len; i++) {
-                Object displayName = o[i];
-                Object timezoneKey = displayNameList.get(o[i]);
-                if (a.containsKey(timezoneKey)) {
-                    Object realName = a.get(timezoneKey);
-                    while (a.containsKey(realName)) {
-                        realName = a.get(realName);
-                    }
-                    out1.write(displayName +
-                               " (alias for " +
-                               "<A HREF=\"" + timezoneList.get(realName) +
-                               "\" TARGET=\"rightFrame\">" + realName +
-                               "</A>)");
-                } else {
-                    out1.write("<A HREF=\"" + timezoneList.get(timezoneKey) +
-                               "\" TARGET=\"rightFrame\">" + displayName +
-                               "</A>");
-                }
-                out1.write("<BR> \n");
-            }
-
-            out1.write("</FONT></TD>\n</TR>\n</TABLE>\n" + body2 + footer);
-
-            out1.close();
-            fw1.close();
-
-            /* Creates overview-summary.html */
-            fw1 = new FileWriter(outputDir + "overview-summary.html", false);
-            out1 = new BufferedWriter(fw1);
-
-            out1.write(header1 + new Date() + header2 + Main.getVersionName() +
-                       header4 + body1 +
-                       "<p>This is the list of time zones generated from <B>" +
-                       Main.getVersionName() + "</B> for Java Platform, " +
-                       "Standard Edition. The source code can be obtained " +
-                       "from ftp site <a href=\"ftp://elsie.nci.nih.gov/pub/\">" +
-                       "ftp://elsie.nci.nih.gov/pub/</a>. A total of <B>" +
-                       len +
-                       "</B> time zones and aliases are supported " +
-                       "in this edition. For the " +
-                       "format of rules and zones, refer to the zic " +
-                       "(zoneinfo compiler) man page on " +
-                       "Solaris or Linux.</p>\n" +
-                       "<p>Note that the time zone data is not " +
-                       "a public interface of the Java Platform. No " +
-                       "applications should rely on the time zone data of " +
-                       "this document. Time zone names and data " +
-                       "may change without any prior notice.</p>\n" +
-                       body2 + footer);
-
-            out1.close();
-            fw1.close();
-        } catch(IOException e) {
-            Main.panic("IO error: "+e.getMessage());
-            return 1;
-        }
-
-        return 0;
-    }
-
-    String transform(String s) {
-        int index = s.lastIndexOf("/");
-
-        /* If the string doesn't include any delimiter, return */
-        if (index == -1) {
-            return s;
-        }
-
-        int lastIndex = index;
-        String str = s.substring(index+1);
-        do {
-            index = s.substring(0, lastIndex).lastIndexOf('/');
-            str += ", " + s.substring(index+1, lastIndex);
-            lastIndex = index;
-        } while (index > -1);
-
-        return str;
-    }
-
-    static class LatitudeAndLongitude {
-
-        private int latDeg, latMin, latSec, longDeg, longMin, longSec;
-
-        LatitudeAndLongitude(String s) {
-            try {
-                // First of all, check the string has the correct format:
-                //    either +-DDMM+-DDDMM or +-DDMMSS+-DDDMMSS
-
-                if (!s.startsWith("+") && !s.startsWith("-")) {
-                    Main.warning("Wrong latitude&longitude data: " + s);
-                    return;
-                }
-                int index;
-                if (((index = s.lastIndexOf("+")) <= 0) &&
-                    ((index = s.lastIndexOf("-")) <= 0)) {
-                    Main.warning("Wrong latitude&longitude data: " + s);
-                    return;
-                }
-
-                if (index == 5) {
-                    latDeg = Integer.parseInt(s.substring(1, 3));
-                    latMin = Integer.parseInt(s.substring(3, 5));
-                    latSec = 0;
-                } else if (index == 7) {
-                    latDeg = Integer.parseInt(s.substring(1, 3));
-                    latMin = Integer.parseInt(s.substring(3, 5));
-                    latSec = Integer.parseInt(s.substring(5, 7));
-                } else {
-                    Main.warning("Wrong latitude&longitude data: " + s);
-                    return;
-                }
-                if (s.startsWith("-")){
-                        latDeg = -latDeg;
-                        latMin = -latMin;
-                        latSec = -latSec;
-                }
-
-                int len = s.length();
-                if (index == 5 && len == 11) {
-                    longDeg = Integer.parseInt(s.substring(index+1, index+4));
-                    longMin = Integer.parseInt(s.substring(index+4, index+6));
-                    longSec = 0;
-                } else if (index == 7 && len == 15) {
-                    longDeg = Integer.parseInt(s.substring(index+1, index+4));
-                    longMin = Integer.parseInt(s.substring(index+4, index+6));
-                    longSec = Integer.parseInt(s.substring(index+6, index+8));
-                } else {
-                    Main.warning("Wrong latitude&longitude data: " + s);
-                    return;
-                }
-                if (s.charAt(index) == '-'){
-                        longDeg = -longDeg;
-                        longMin = -longMin;
-                        longSec = -longSec;
-                }
-            } catch(Exception e) {
-                Main.warning("LatitudeAndLongitude() Parse error: " + s);
-            }
-        }
-
-        int getLatDeg() {
-            return latDeg;
-        }
-
-        int getLatMin() {
-            return latMin;
-        }
-
-        int getLatSec() {
-            return latSec;
-        }
-
-        int getLongDeg() {
-            return longDeg;
-        }
-
-        int getLongMin() {
-            return longMin;
-        }
-
-        int getLongSec() {
-            return longSec;
-        }
-    }
-}
diff --git a/jdk/make/tools/src/build/tools/javazic/Main.java b/jdk/make/tools/src/build/tools/javazic/Main.java
deleted file mode 100644
index a91ab91fff8..00000000000
--- a/jdk/make/tools/src/build/tools/javazic/Main.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package build.tools.javazic;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Main class for the javazic time zone data compiler.
- *
- * @since 1.4
- */
-public class Main {
-
-    private static boolean verbose = false;
-    static boolean outputDoc = false;
-
-    private List<String> ziFiles = new ArrayList<String>();
-    private static String zoneNamesFile = null;
-    private static String versionName = "unknown";
-    private static String outputDir = "zoneinfo";
-    private static String mapFile = null;
-
-    /**
-     * Parses the specified arguments and sets up the variables.
-     * @param argv the arguments
-     */
-    void processArgs(String[] argv) {
-        for (int i = 0; i < argv.length; i++) {
-            String arg = argv[i];
-            if (arg.startsWith("-h")) {
-                usage();
-                System.exit(0);
-            } else if (arg.equals("-d")) {
-                outputDir = argv[++i];
-            } else if (arg.equals("-v")) {
-                verbose = true;
-            } else if (arg.equals("-V")) {
-                versionName = argv[++i];
-            } else if (arg.equals("-doc")) {
-                outputDoc = true;
-            } else if (arg.equals("-map")) {
-                outputDoc = true;
-                mapFile = argv[++i];
-            } else if (arg.equals("-f")) {
-                zoneNamesFile = argv[++i];
-            } else if (arg.equals("-S")) {
-                try {
-                    Zoneinfo.setYear(Integer.parseInt(argv[++i]));
-                } catch (Exception e) {
-                    error("invalid year: " + argv[i]);
-                    usage();
-                    System.exit(1);
-                }
-            } else {
-                boolean isStartYear = arg.equals("-s");
-                if (isStartYear || arg.equals("-e")) {
-                    try {
-                        int year = Integer.parseInt(argv[++i]);
-                        if (isStartYear) {
-                            Zoneinfo.setStartYear(year);
-                        } else {
-                            Zoneinfo.setEndYear(year);
-                        }
-                    } catch (Exception e) {
-                        error("invalid year: " + argv[i]);
-                        usage();
-                        System.exit(1);
-                    }
-                } else {
-                    // the rest of args are zoneinfo source files
-                    while (i < argv.length) {
-                        ziFiles.add(argv[i++]);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Parses zoneinfo source files
-     */
-    int compile() {
-        int nFiles = ziFiles.size();
-        int status = 0;
-        Mappings maps = new Mappings();
-        BackEnd backend = BackEnd.getBackEnd();
-
-        for (int i = 0; i < nFiles; i++) {
-            Zoneinfo frontend = Zoneinfo.parse(ziFiles.get(i));
-
-            for (String key : frontend.getZones().keySet()) {
-                info(key);
-
-                Timezone tz = frontend.phase2(key);
-                status |= backend.processZoneinfo(tz);
-            }
-
-            maps.add(frontend);
-        }
-
-        // special code for dealing with the conflicting name "MET"
-        Zone.addMET();
-
-        maps.resolve();
-
-        status |= backend.generateSrc(maps);
-
-        return status;
-    }
-
-    public static void main(String[] argv) {
-        Main zic = new Main();
-
-        /*
-         * Parse args
-         */
-        zic.processArgs(argv);
-
-        /*
-         * Read target zone names
-         */
-        if (zoneNamesFile != null) {
-            Zone.readZoneNames(zoneNamesFile);
-        }
-
-        int status = zic.compile();
-
-        System.exit(status);
-    }
-
-    void usage() {
-        System.err.println("Usage: javazic [options] file...\n"+
-                           "         -f namefile  file containing zone names\n"+
-                           "                      to be generated (ie, generating subset)\n"+
-                           "         -d dir       output directory\n"+
-                           "         -v           verbose\n"+
-                           "         -V datavers  specifies the tzdata version string\n"+
-                           "                      (eg, \"tzdata2000g\")"+
-                           "         -S year      output only SimleTimeZone data of that year\n"+
-                           "         -s year      start year (default: 1900)\n"+
-                           "         -e year      end year (default: 2037)\n"+
-                           "         -doc         generates HTML documents\n"+
-                           "         -map mapfile generates HTML documents with map information\n"+
-                           "         file...      zoneinfo source file(s)");
-    }
-
-    /**
-     * @return the output directory path name
-     */
-    static String getOutputDir() {
-        return outputDir;
-    }
-
-    /**
-     * @return the map file's path and name
-     */
-    static String getMapFile() {
-        return mapFile;
-    }
-
-    /**
-     * Returns the time zone data version string specified by the -V
-     * option. If it is not specified, "unknown" is returned.
-     * @return the time zone data version string
-     */
-    static String getVersionName() {
-        return versionName;
-    }
-
-    /**
-     * Prints out the specified fatal error message and calls {@link
-     * java.lang.System#exit System.exit(1)}.
-     * @param msg the fatal error message
-     */
-    static void panic(String msg) {
-        printMessage("fatal error", msg);
-        System.exit(1);
-    }
-
-    /**
-     * Prints out the specified error message.
-     * @param msg the error message
-     */
-    static void error(String msg) {
-        printMessage("error", msg);
-    }
-
-    /**
-     * Prints out the specified warning message.
-     * @param msg the warning message
-     */
-    static void warning(String msg) {
-        printMessage("warning", msg);
-    }
-
-    /**
-     * Prints out the informative message.
-     * @param msg the informative message
-     */
-    static void info(String msg) {
-        if (verbose) {
-            printMessage(null, msg);
-        }
-    }
-
-    private static void printMessage(String type, String msg) {
-        if (type != null) {
-            type += ": ";
-        } else {
-            type = "";
-        }
-        System.err.println("javazic: " + type + msg);
-    }
-}
diff --git a/jdk/make/tools/src/build/tools/javazic/Mappings.java b/jdk/make/tools/src/build/tools/javazic/Mappings.java
deleted file mode 100644
index 885b9a091b6..00000000000
--- a/jdk/make/tools/src/build/tools/javazic/Mappings.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package build.tools.javazic;
-
-import  java.util.ArrayList;
-import  java.util.HashMap;
-import  java.util.LinkedList;
-import  java.util.List;
-import  java.util.Map;
-import  java.util.Set;
-import  java.util.TreeMap;
-import  java.util.TreeSet;
-
-/**
- * <code>Mappings</code> generates two Maps and a List which are used by
- * javazic BackEnd.
- *
- * @since 1.4
- */
-class Mappings {
-    // All aliases specified by Link statements. It's alias name to
-    // real name mappings.
-    private Map<String,String> aliases;
-
-    private List<Integer> rawOffsetsIndex;
-
-    private List<Set<String>> rawOffsetsIndexTable;
-
-    // Zone names to be excluded from rawOffset table. Those have GMT
-    // offsets to change some future time.
-    private List<String> excludeList;
-
-    /**
-     * Constructor creates some necessary instances.
-     */
-    Mappings() {
-        aliases = new TreeMap<String,String>();
-        rawOffsetsIndex = new LinkedList<Integer>();
-        rawOffsetsIndexTable = new LinkedList<Set<String>>();
-    }
-
-    /**
-     * Generates aliases and rawOffsets tables.
-     * @param zi a Zoneinfo containing Zones
-     */
-    void add(Zoneinfo zi) {
-        Map<String,Zone> zones = zi.getZones();
-
-        for (String zoneName : zones.keySet()) {
-            Zone zone = zones.get(zoneName);
-            String zonename = zone.getName();
-            int rawOffset = zone.get(zone.size()-1).getGmtOffset();
-
-            // If the GMT offset of this Zone will change in some
-            // future time, this Zone is added to the exclude list.
-            boolean isExcluded = false;
-            for (int i = 0; i < zone.size(); i++) {
-                ZoneRec zrec = zone.get(i);
-                if ((zrec.getGmtOffset() != rawOffset)
-                    && (zrec.getUntilTime(0) > Time.getCurrentTime())) {
-                    if (excludeList == null) {
-                        excludeList = new ArrayList<String>();
-                    }
-                    excludeList.add(zone.getName());
-                    isExcluded = true;
-                    break;
-                }
-            }
-
-            if (!rawOffsetsIndex.contains(new Integer(rawOffset))) {
-                // Find the index to insert this raw offset zones
-                int n = rawOffsetsIndex.size();
-                int i;
-                for (i = 0; i < n; i++) {
-                    if (rawOffsetsIndex.get(i) > rawOffset) {
-                        break;
-                    }
-                }
-                rawOffsetsIndex.add(i, rawOffset);
-
-                Set<String> perRawOffset = new TreeSet<String>();
-                if (!isExcluded) {
-                    perRawOffset.add(zonename);
-                }
-                rawOffsetsIndexTable.add(i, perRawOffset);
-            } else if (!isExcluded) {
-                int i = rawOffsetsIndex.indexOf(new Integer(rawOffset));
-                Set<String> perRawOffset = rawOffsetsIndexTable.get(i);
-                perRawOffset.add(zonename);
-            }
-        }
-
-        Map<String,String> a = zi.getAliases();
-        // If there are time zone names which refer to any of the
-        // excluded zones, add those names to the excluded list.
-        if (excludeList != null) {
-            for (String zoneName : a.keySet()) {
-                String realname = a.get(zoneName);
-                if (excludeList.contains(realname)) {
-                    excludeList.add(zoneName);
-                }
-            }
-        }
-        aliases.putAll(a);
-    }
-
-    /**
-     * Adds valid aliases to one of per-RawOffset table and removes
-     * invalid aliases from aliases List. Aliases referring to
-     * excluded zones are not added to a per-RawOffset table.
-     */
-    void resolve() {
-        int index = rawOffsetsIndexTable.size();
-        List<String> toBeRemoved = new ArrayList<String>();
-        for (String key : aliases.keySet()) {
-            boolean validname = false;
-            for (int j = 0; j < index; j++) {
-                Set<String> perRO = rawOffsetsIndexTable.get(j);
-                boolean isExcluded = (excludeList == null) ?
-                                        false : excludeList.contains(key);
-
-                if ((perRO.contains(aliases.get(key)) || isExcluded)
-                    && Zone.isTargetZone(key)) {
-                    validname = true;
-                    if (!isExcluded) {
-                        perRO.add(key);
-                        Main.info("Alias <"+key+"> added to the list.");
-                    }
-                    break;
-                }
-            }
-
-            if (!validname) {
-                Main.info("Alias <"+key+"> removed from the list.");
-                toBeRemoved.add(key);
-            }
-        }
-
-        // Remove zones, if any, from the list.
-        for (String key : toBeRemoved) {
-            aliases.remove(key);
-        }
-        // Eliminate any alias-to-alias mappings. For example, if
-        // there are A->B and B->C, A->B is changed to A->C.
-        Map<String, String> newMap = new HashMap<String, String>();
-        for (String key : aliases.keySet()) {
-            String realid = aliases.get(key);
-            String leaf = realid;
-            while (aliases.get(leaf) != null) {
-                leaf = aliases.get(leaf);
-            }
-            if (!realid.equals(leaf)) {
-                newMap.put(key, leaf);
-            }
-        }
-        aliases.putAll(newMap);
-    }
-
-    Map<String,String> getAliases() {
-        return(aliases);
-    }
-
-    List<Integer> getRawOffsetsIndex() {
-        return(rawOffsetsIndex);
-    }
-
-    List<Set<String>> getRawOffsetsIndexTable() {
-        return(rawOffsetsIndexTable);
-    }
-
-    List<String> getExcludeList() {
-        return excludeList;
-    }
-}
diff --git a/jdk/make/tools/src/build/tools/javazic/Month.java b/jdk/make/tools/src/build/tools/javazic/Month.java
deleted file mode 100644
index 9e70808809f..00000000000
--- a/jdk/make/tools/src/build/tools/javazic/Month.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package build.tools.javazic;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Month enum handles month related manipulation.
- *
- * @since 1.4
- */
-enum Month {
-    JANUARY("Jan"),
-    FEBRUARY("Feb"),
-    MARCH("Mar"),
-    APRIL("Apr"),
-    MAY("May"),
-    JUNE("Jun"),
-    JULY("Jul"),
-    AUGUST("Aug"),
-    SEPTEMBER("Sep"),
-    OCTOBER("Oct"),
-    NOVEMBER("Nov"),
-    DECEMBER("Dec");
-
-    private final String abbr;
-
-    private static final Map<String,Month> abbreviations
-                                = new HashMap<String,Month>(12);
-
-    static {
-        for (Month m : Month.values()) {
-            abbreviations.put(m.abbr, m);
-        }
-    }
-
-    private Month(String abbr) {
-        this.abbr = abbr;
-    }
-
-    int value() {
-        return ordinal() + 1;
-    }
-
-    /**
-     * Parses the specified string as a month abbreviation.
-     * @param name the month abbreviation
-     * @return the Month value
-     */
-    static Month parse(String name) {
-        Month m = abbreviations.get(name);
-        if (m != null) {
-            return m;
-        }
-        return null;
-    }
-
-    /**
-     * @param month the nunmth number (1-based)
-     * @return the month name in uppercase of the specified month
-     */
-    static String toString(int month) {
-        if (month >= JANUARY.value() && month <= DECEMBER.value()) {
-            return "Calendar." + Month.values()[month - 1];
-        }
-        throw new IllegalArgumentException("wrong month number: " + month);
-    }
-}
diff --git a/jdk/make/tools/src/build/tools/javazic/Rule.java b/jdk/make/tools/src/build/tools/javazic/Rule.java
deleted file mode 100644
index c8e97fccae2..00000000000
--- a/jdk/make/tools/src/build/tools/javazic/Rule.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package build.tools.javazic;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-import java.util.StringTokenizer;
-
-/**
- * Rule manipulates Rule records.
- *
- * @since 1.4
- */
-class Rule {
-
-    private List<RuleRec> list;
-    private String name;
-
-    /**
-     * Constructs a Rule which consists of a Rule record list. The
-     * specified name is given to this Rule.
-     * @param name the Rule name
-     */
-    Rule(String name) {
-        this.name = name;
-        list = new ArrayList<RuleRec>();
-    }
-
-    /**
-     * Added a RuleRec to the Rule record list.
-     */
-    void add(RuleRec rec) {
-        list.add(rec);
-    }
-
-    /**
-     * @return the Rule name
-     */
-    String getName() {
-        return name;
-    }
-
-    /**
-     * Gets all rule records that cover the given year.
-     *
-     * @param year the year number for which the rule is applicable.
-     * @return rules in List that are collated in time. If no rule is found, an empty
-     * List is returned.
-     */
-    List<RuleRec> getRules(int year) {
-        List<RuleRec> rules = new ArrayList<RuleRec>(3);
-        for (RuleRec rec : list) {
-            if (year >= rec.getFromYear() && year <= rec.getToYear()) {
-                if ((rec.isOdd() && year % 2 == 0) || (rec.isEven() && year % 2 == 1))
-                    continue;
-                rules.add(rec);
-            }
-        }
-        int n = rules.size();
-        if (n <= 1) {
-            return rules;
-        }
-        if (n == 2) {
-            RuleRec rec1 = rules.get(0);
-            RuleRec rec2 = rules.get(1);
-            if (rec1.getMonthNum() > rec2.getMonthNum()) {
-                rules.set(0, rec2);
-                rules.set(1, rec1);
-            } else if (rec1.getMonthNum() == rec2.getMonthNum()) {
-                // TODO: it's not accurate to ignore time types (STD, WALL, UTC)
-                long t1 = Time.getLocalTime(year, rec1.getMonth(),
-                                            rec1.getDay(), rec1.getTime().getTime());
-                long t2 = Time.getLocalTime(year, rec2.getMonth(),
-                                            rec2.getDay(), rec2.getTime().getTime());
-                if (t1 > t2) {
-                    rules.set(0, rec2);
-                    rules.set(1, rec1);
-                }
-            }
-            return rules;
-        }
-
-        final int y = year;
-        RuleRec[] recs = new RuleRec[rules.size()];
-        rules.toArray(recs);
-        Arrays.sort(recs, new Comparator<RuleRec>() {
-                public int compare(RuleRec r1, RuleRec r2) {
-                    int n = r1.getMonthNum() - r2.getMonthNum();
-                    if (n != 0) {
-                        return n;
-                    }
-                    // TODO: it's not accurate to ignore time types (STD, WALL, UTC)
-                    long t1 = Time.getLocalTime(y, r1.getMonth(),
-                                                r1.getDay(), r1.getTime().getTime());
-                    long t2 = Time.getLocalTime(y, r2.getMonth(),
-                                                r2.getDay(), r2.getTime().getTime());
-                    return (int)(t1 - t2);
-                }
-                public boolean equals(Object o) {
-                    return this == o;
-                }
-            });
-        rules.clear();
-        for (int i = 0; i < n; i++) {
-            rules.add(recs[i]);
-        }
-        return rules;
-    }
-
-    /**
-     * Gets rule records that have either "max" or cover the endYear
-     * value in its DST schedule.
-     *
-     * @return rules that contain last DST schedule. An empty
-     * ArrayList is returned if no last rules are found.
-     */
-    List<RuleRec> getLastRules() {
-        RuleRec start = null;
-        RuleRec end = null;
-
-        for (int i = 0; i < list.size(); i++) {
-            RuleRec rec = list.get(i);
-            if (rec.isLastRule()) {
-                if (rec.getSave() > 0) {
-                    start = rec;
-                } else {
-                    end = rec;
-                }
-            }
-        }
-        if (start == null || end == null) {
-            int endYear = Zoneinfo.getEndYear();
-            for (int i  = 0; i < list.size(); i++) {
-                RuleRec rec = list.get(i);
-                if (endYear >= rec.getFromYear() && endYear <= rec.getToYear()) {
-                    if (start == null && rec.getSave() > 0) {
-                        start = rec;
-                    } else {
-                        if (end == null && rec.getSave() == 0) {
-                            end = rec;
-                        }
-                    }
-                }
-            }
-        }
-
-        List<RuleRec> r = new ArrayList<RuleRec>(2);
-        if (start == null || end == null) {
-            if (start != null || end != null) {
-                Main.warning("found last rules for "+name+" inconsistent.");
-            }
-            return r;
-        }
-
-        r.add(start);
-        r.add(end);
-        return r;
-    }
-}
diff --git a/jdk/make/tools/src/build/tools/javazic/RuleDay.java b/jdk/make/tools/src/build/tools/javazic/RuleDay.java
deleted file mode 100644
index 5ce43f19fce..00000000000
--- a/jdk/make/tools/src/build/tools/javazic/RuleDay.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package build.tools.javazic;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * RuleDay class represents the value of the "ON" field.  The day of
- * week values start from 1 following the {@link java.util.Calendar}
- * convention.
- *
- * @since 1.4
- */
-class RuleDay {
-    private static final Map<String,DayOfWeek> abbreviations = new HashMap<String,DayOfWeek>(7);
-    static {
-        for (DayOfWeek day : DayOfWeek.values()) {
-            abbreviations.put(day.getAbbr(), day);
-        }
-    }
-
-    private String dayName = null;
-    private DayOfWeek dow;
-    private boolean lastOne = false;
-    private int soonerOrLater = 0;
-    private int thanDayOfMonth; // day of month (e.g., 8 for "Sun>=8")
-
-    RuleDay() {
-    }
-
-    RuleDay(int day) {
-        thanDayOfMonth = day;
-    }
-
-    int getDay() {
-        return thanDayOfMonth;
-    }
-
-    /**
-     * @return the day of week value (1-based)
-     */
-    int getDayOfWeekNum() {
-        return dow.value();
-    }
-
-    /**
-     * @return true if this rule day represents the last day of
-     * week. (e.g., lastSun).
-     */
-    boolean isLast() {
-        return lastOne;
-    }
-
-    /**
-     * @return true if this rule day represents the day of week on or
-     * later than (after) the {@link #getDay}. (e.g., Sun>=1)
-     */
-    boolean isLater() {
-        return soonerOrLater > 0;
-    }
-
-    /**
-     * @return true if this rule day represents the day of week on or
-     * earlier than (before) the {@link #getDay}. (e.g., Sun<=15)
-     */
-    boolean isEarlier() {
-        return soonerOrLater < 0;
-    }
-
-    /**
-     * @return true if this rule day represents an exact day.
-     */
-    boolean isExact() {
-        return soonerOrLater == 0;
-    }
-
-    /**
-     * Parses the "ON" field and constructs a RuleDay.
-     * @param day an "ON" field string (e.g., "Sun>=1")
-     * @return a RuleDay representing the given "ON" field
-     */
-    static RuleDay parse(String day) {
-        RuleDay d = new RuleDay();
-        if (day.startsWith("last")) {
-            d.lastOne = true;
-            d.dayName = day.substring(4);
-            d.dow = getDOW(d.dayName);
-        } else {
-            int index;
-            if ((index = day.indexOf(">=")) != -1) {
-                d.dayName = day.substring(0, index);
-                d.dow = getDOW(d.dayName);
-                d.soonerOrLater = 1; // greater or equal
-                d.thanDayOfMonth = Integer.parseInt(day.substring(index+2));
-            } else if ((index = day.indexOf("<=")) != -1) {
-                d.dayName = day.substring(0, index);
-                d.dow = getDOW(d.dayName);
-                d.soonerOrLater = -1; // less or equal
-                d.thanDayOfMonth = Integer.parseInt(day.substring(index+2));
-            } else {
-                // it should be an integer value.
-                d.thanDayOfMonth = Integer.parseInt(day);
-            }
-        }
-        return d;
-    }
-
-    /**
-     * Converts this RuleDay to the SimpleTimeZone day rule.
-     * @return the converted SimpleTimeZone day rule
-     */
-    int getDayForSimpleTimeZone() {
-        if (isLast()) {
-            return -1;
-        }
-        return isEarlier() ? -getDay() : getDay();
-    }
-
-    /**
-     * Converts this RuleDay to the SimpleTimeZone day-of-week rule.
-     * @return the SimpleTimeZone day-of-week rule value
-     */
-    int getDayOfWeekForSimpleTimeZoneInt() {
-        if (isEarlier() || isLater()) {
-            return -getDayOfWeekNum();
-        }
-        return isLast() ? getDayOfWeekNum() : 0;
-    }
-
-    /**
-     * @return the string representation of the {@link
-     * #getDayOfWeekForSimpleTimeZoneInt} value
-     */
-    String getDayOfWeekForSimpleTimeZone() {
-        int d = getDayOfWeekForSimpleTimeZoneInt();
-        if (d == 0) {
-            return "0";
-        }
-        String sign = "";
-        if (d < 0) {
-            sign = "-";
-            d = -d;
-        }
-        return sign + toString(d);
-    }
-
-    private static DayOfWeek getDOW(String abbr) {
-        return abbreviations.get(abbr);
-    }
-
-    /**
-     * Converts the specified day of week value to the day-of-week
-     * name defined in {@link java.util.Calenda}.
-     * @param dow 1-based day of week value
-     * @return the Calendar day of week name with "Calendar." prefix.
-     * @throws IllegalArgumentException if the specified dow value is out of range.
-     */
-    static String toString(int dow) {
-        if (dow >= DayOfWeek.SUNDAY.value() && dow <= DayOfWeek.SATURDAY.value()) {
-            return "Calendar." + DayOfWeek.values()[dow - 1];
-        }
-        throw new IllegalArgumentException("wrong Day_of_Week number: " + dow);
-    }
-}
diff --git a/jdk/make/tools/src/build/tools/javazic/RuleRec.java b/jdk/make/tools/src/build/tools/javazic/RuleRec.java
deleted file mode 100644
index 37743725729..00000000000
--- a/jdk/make/tools/src/build/tools/javazic/RuleRec.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package build.tools.javazic;
-
-import java.util.StringTokenizer;
-
-/**
- * RuleRec class represents one record of the Rule set.
- *
- * @since 1.4
- */
-class RuleRec {
-    private int fromYear;
-    private int toYear;
-    private String type;
-    private Month inMonth;
-    private RuleDay onDay;
-    private Time atTime;
-    private int save;
-    private String letters;
-    private String line;
-    private boolean isLastRule;
-
-    int getFromYear() {
-        return fromYear;
-    }
-
-    int getToYear() {
-        return toYear;
-    }
-
-    Month getMonth() {
-        return inMonth;
-    }
-
-    int getMonthNum() {
-        return inMonth.value();
-    }
-
-    RuleDay getDay() {
-        return onDay;
-    }
-
-    Time getTime() {
-        return atTime;
-    }
-
-    int getSave() {
-        return save;
-    }
-
-    String getLine() {
-        return line;
-    }
-
-    /**
-     * Sets the line from the text file.
-     * @param line the text of the line
-     */
-    void setLine(String line) {
-        this.line = line;
-    }
-
-    /**
-     * @return true if the rule type is "odd".
-     */
-    boolean isOdd() {
-        return "odd".equals(type);
-    }
-
-    /**
-     * @return true if the rule type is "even".
-     */
-    boolean isEven() {
-        return "even".equals(type);
-    }
-
-    /**
-     * Determines if this rule record is the last DST schedule rule.
-     *
-     * @return true if this rule record has "max" as TO (year).
-     */
-    boolean isLastRule() {
-        return isLastRule;
-    }
-
-    /**
-     * Determines if the unadjusted until time of the specified ZoneRec
-     * is the same as the transition time of this rule in the same
-     * year as the ZoneRec until year.
-     *
-     * @param zrec ZoneRec to compare to
-     * @param save the amount of daylight saving in milliseconds
-     * @param gmtOffset the GMT offset value in milliseconds
-     * @return true if the unadjusted until time is the same as rule's
-     * transition time.
-     */
-    boolean isSameTransition(ZoneRec zrec, int save, int gmtOffset) {
-        long    until, transition;
-
-        if (zrec.getUntilTime().getType() != atTime.getType()) {
-            until = zrec.getLocalUntilTime(save, gmtOffset);
-            transition = Time.getLocalTime(zrec.getUntilYear(),
-                                           getMonth(),
-                                           getDay(),
-                                           save,
-                                           gmtOffset,
-                                           atTime);
-        } else {
-            until = zrec.getLocalUntilTime();
-            transition = Time.getLocalTime(zrec.getUntilYear(),
-                                           getMonth(),
-                                           getDay(),
-                                           atTime.getTime());
-        }
-
-        return until == transition;
-    }
-
-    /**
-     * Parses a Rule line and returns a RuleRec object.
-     *
-     * @param tokens a StringTokenizer object that should contain a
-     * token for the "FROM" field and the rest.
-     * @return a RuleRec object.
-     */
-    static RuleRec parse(StringTokenizer tokens) {
-        RuleRec rec = new RuleRec();
-        try {
-            // FROM
-            String token = tokens.nextToken();
-            try {
-                rec.fromYear = Integer.parseInt(token);
-            } catch (NumberFormatException e) {
-                // it's not integer
-                if ("min".equals(token) || "minimum".equals(token)) {
-                    rec.fromYear = Zoneinfo.getMinYear();
-                } else if ("max".equals(token) || "maximum".equals(token)) {
-                    rec.fromYear = Zoneinfo.getMaxYear();
-                } else {
-                    Main.panic("invalid year value: "+token);
-                }
-            }
-
-            // TO
-            token = tokens.nextToken();
-            rec.isLastRule = false;
-            try {
-                rec.toYear = Integer.parseInt(token);
-            } catch (NumberFormatException e) {
-                // it's not integer
-                if ("min".equals(token) || "minimum".equals(token)) {
-                    rec.fromYear = Zoneinfo.getMinYear();
-                } else if ("max".equals(token) || "maximum".equals(token)) {
-                    rec.toYear = Integer.MAX_VALUE;
-                    rec.isLastRule = true;
-                } else if ("only".equals(token)) {
-                    rec.toYear = rec.fromYear;
-                } else {
-                    Main.panic("invalid year value: "+token);
-                }
-            }
-
-            // TYPE
-            rec.type = tokens.nextToken();
-
-            // IN
-            rec.inMonth = Month.parse(tokens.nextToken());
-
-            // ON
-            rec.onDay = RuleDay.parse(tokens.nextToken());
-
-            // AT
-            rec.atTime = Time.parse(tokens.nextToken());
-
-            // SAVE
-            rec.save = (int) Time.parse(tokens.nextToken()).getTime();
-
-            // LETTER/S
-            rec.letters = tokens.nextToken();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return rec;
-    }
-
-    /**
-     * Calculates the transition time of the given year under this rule.
-     * @param year the year value
-     * @param gmtOffset the GMT offset value in milliseconds
-     * @param save the amount of daylight save time
-     * @return the transition time in milliseconds of the given year in UTC.
-     */
-    long getTransitionTime(int year, int gmtOffset, int save) {
-        long time = Time.getLocalTime(year, getMonth(),
-                                      getDay(), atTime.getTime());
-        if (atTime.isSTD()) {
-            time -= gmtOffset;
-        } else if (atTime.isWall()) {
-            time -= gmtOffset + save;
-        }
-        return time;
-    }
-
-    private static int getInt(StringTokenizer tokens) {
-        String token = tokens.nextToken();
-        return Integer.parseInt(token);
-    }
-}
diff --git a/jdk/make/tools/src/build/tools/javazic/Simple.java b/jdk/make/tools/src/build/tools/javazic/Simple.java
deleted file mode 100644
index 69c7fe783f5..00000000000
--- a/jdk/make/tools/src/build/tools/javazic/Simple.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package build.tools.javazic;
-
-import  java.io.BufferedWriter;
-import  java.io.File;
-import  java.io.FileWriter;
-import  java.io.IOException;
-import  java.util.HashMap;
-import  java.util.List;
-import  java.util.Map;
-import  java.util.Set;
-import  java.util.SortedMap;
-import  java.util.TreeMap;
-import  java.util.TreeSet;
-
-/**
- * <code>Simple</code> generates TimeZoneData, which had been used as internal
- * data of TimeZone before J2SDK1.3.
- * Since J2SDK1.4 doesn't need TimeZoneData, this class is for maintenance
- * of old JDK release.
- */
-class Simple extends BackEnd {
-
-    /**
-     * Zone records which are applied for given year.
-     */
-    private static Map<String,ZoneRec> lastZoneRecs = new HashMap<>();
-
-    /**
-     * Rule records which are applied for given year.
-     */
-    private static Map<String,List<RuleRec>> lastRules = new TreeMap<>();
-
-    /**
-     * zone IDs sorted by their GMT offsets. If zone's GMT
-     * offset will change in the future, its last known offset is
-     * used.
-     */
-    private SortedMap<Integer, Set<String>> zonesByOffset = new TreeMap<>();
-
-    /**
-     * Sets last Rule records and Zone records for given timezone to
-     * each Map.
-     *
-     * @param tz Timezone object for each zone
-     * @return always 0
-     */
-    int processZoneinfo(Timezone tz) {
-        String zonename = tz.getName();
-
-        lastRules.put(zonename, tz.getLastRules());
-        lastZoneRecs.put(zonename, tz.getLastZoneRec());
-
-        // Populate zonesByOffset. (Zones that will change their
-        // GMT offsets are also added to zonesByOffset here.)
-        int lastKnownOffset = tz.getRawOffset();
-        Set<String> set = zonesByOffset.get(lastKnownOffset);
-        if (set == null) {
-            set = new TreeSet<>();
-            zonesByOffset.put(lastKnownOffset, set);
-        }
-        set.add(zonename);
-
-        return 0;
-    }
-
-    /**
-     * Generates TimeZoneData to output SimpleTimeZone data.
-     * @param map Mappings object which is generated by {@link Main#compile}.
-     * @return 0 if no error occurred, otherwise 1.
-     */
-    int generateSrc(Mappings map) {
-        try {
-            File outD = new File(Main.getOutputDir());
-            outD.mkdirs();
-
-            FileWriter fw =
-                new FileWriter(new File(outD, "TimeZoneData.java"), false);
-            BufferedWriter out = new BufferedWriter(fw);
-
-            out.write("import java.util.SimpleTimeZone;\n\n");
-            out.write("    static SimpleTimeZone zones[] = {\n");
-
-            Map<String,String> a = map.getAliases();
-            List<Integer> roi = map.getRawOffsetsIndex();
-            List<Set<String>> roit = map.getRawOffsetsIndexTable();
-
-            int index = 0;
-            for (int offset : zonesByOffset.keySet()) {
-                int o = roi.get(index);
-                Set<String> set = zonesByOffset.get(offset);
-                if (offset == o) {
-                    // Merge aliases into zonesByOffset
-                    set.addAll(roit.get(index));
-                }
-                index++;
-
-                for (String key : set) {
-                    ZoneRec zrec;
-                    String realname;
-                    List<RuleRec> stz;
-                    if ((realname = a.get(key)) != null) {
-                        // if this alias is not targeted, ignore it.
-                        if (!Zone.isTargetZone(key)) {
-                            continue;
-                        }
-                        stz = lastRules.get(realname);
-                        zrec = lastZoneRecs.get(realname);
-                    } else {
-                        stz = lastRules.get(key);
-                        zrec = lastZoneRecs.get(key);
-                    }
-
-                    out.write("\t//--------------------------------------------------------------------\n");
-                    String s = Time.toFormedString(offset);
-                    out.write("\tnew SimpleTimeZone(" +
-                        Time.toFormedString(offset) + ", \"" + key + "\"");
-                    if (realname != null) {
-                        out.write(" /* " + realname + " */");
-                    }
-
-                    if (stz == null) {
-                        out.write("),\n");
-                    } else {
-                        RuleRec rr0 = stz.get(0);
-                        RuleRec rr1 = stz.get(1);
-
-                        out.write(",\n\t  " + Month.toString(rr0.getMonthNum()) +
-                                  ", " + rr0.getDay().getDayForSimpleTimeZone() + ", " +
-                                  rr0.getDay().getDayOfWeekForSimpleTimeZone() + ", " +
-                                  Time.toFormedString((int)rr0.getTime().getTime()) + ", " +
-                                  rr0.getTime().getTypeForSimpleTimeZone() + ",\n" +
-
-                                  "\t  " + Month.toString(rr1.getMonthNum()) + ", " +
-                                  rr1.getDay().getDayForSimpleTimeZone() + ", " +
-                                  rr1.getDay().getDayOfWeekForSimpleTimeZone() + ", " +
-                                  Time.toFormedString((int)rr1.getTime().getTime())+ ", " +
-                                  rr1.getTime().getTypeForSimpleTimeZone() + ",\n" +
-
-                                  "\t  " + Time.toFormedString(rr0.getSave()) + "),\n");
-
-                        out.write("\t// " + rr0.getLine() + "\n");
-                        out.write("\t// " + rr1.getLine() + "\n");
-                    }
-
-                    String zline = zrec.getLine();
-                    if (zline.indexOf("Zone") == -1) {
-                        zline = "Zone " + key + "\t" + zline.trim();
-                    }
-                    out.write("\t// " + zline + "\n");
-                }
-            }
-            out.write("    };\n");
-
-            out.close();
-            fw.close();
-        } catch(IOException e) {
-            Main.panic("IO error: "+e.getMessage());
-            return 1;
-        }
-
-        return 0;
-    }
-}
diff --git a/jdk/make/tools/src/build/tools/javazic/Time.java b/jdk/make/tools/src/build/tools/javazic/Time.java
deleted file mode 100644
index 66458a0020d..00000000000
--- a/jdk/make/tools/src/build/tools/javazic/Time.java
+++ /dev/null
@@ -1,343 +0,0 @@
-/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package build.tools.javazic;
-
-import java.util.Locale;
-import sun.util.calendar.CalendarDate;
-import sun.util.calendar.CalendarSystem;
-import sun.util.calendar.Gregorian;
-
-/**
- * Time class represents the "AT" field and other time related information.
- *
- * @since 1.4
- */
-class Time {
-
-    static final Gregorian gcal = CalendarSystem.getGregorianCalendar();
-
-    // type is wall clock time
-    private static final int WALL = 1;
-
-    // type is standard time
-    private static final int STD = 2;
-
-    // type is UTC
-    private static final int UTC = 3;
-
-    // type of representing time
-    private int type;
-
-    /**
-     * Time from the EPOCH in milliseconds
-     */
-    private long time;
-
-    /**
-     * Current time in milliseconds
-     */
-    private static final long currentTime = System.currentTimeMillis();
-
-    Time() {
-        time = 0L;
-    }
-
-    Time(long time) {
-        this.time = time;
-    }
-
-    void setType(int type) {
-        this.type = type;
-    }
-
-    long getTime() {
-        return time;
-    }
-
-    int getType() {
-        return type;
-    }
-
-    static long getCurrentTime() {
-        return currentTime;
-    }
-
-    /**
-     * @return true if the time is represented in wall-clock time.
-     */
-    boolean isWall() {
-        return type == WALL;
-    }
-
-    /**
-     * @return true if the time is represented in standard time.
-     */
-    boolean isSTD() {
-        return type == STD;
-    }
-
-    /**
-     * @return true if the time is represented in UTC time.
-     */
-    boolean isUTC() {
-        return type == UTC;
-    }
-
-    /**
-     * Converts the type to a string that represents the type in the
-     * SimpleTimeZone time mode. (e.g., "SimpleTimeZone.WALL_TIME").
-     * @return the converted string or null if the type is undefined.
-     */
-    String getTypeForSimpleTimeZone() {
-        String  stz = "SimpleTimeZone.";
-        if (isWall()) {
-            return stz+"WALL_TIME";
-        }
-        else if (isSTD()) {
-            return stz+"STANDARD_TIME";
-        }
-        else if (isUTC()) {
-            return stz+"UTC_TIME";
-        }
-        else {
-            return null;
-        }
-    }
-
-    /**
-     * Converts the given Gregorian calendar field values to local time.
-     * Local time is represented by the amount of milliseconds from
-     * January 1, 1970 0:00 GMT.
-     * @param year the year value
-     * @param month the Month value
-     * @param day the day represented by {@link RuleDay}
-     * @param save the amount of daylight time in milliseconds
-     * @param gmtOffset the GMT offset in milliseconds
-     * @param time the time of the day represented by {@link Time}
-     * @return local time
-     */
-    static long getLocalTime(int year, Month month, RuleDay day, int save,
-                             int gmtOffset, Time time) {
-        long    t = time.getTime();
-
-        if (time.isSTD())
-            t = time.getTime() + save;
-        else if (time.isUTC())
-            t = time.getTime() + save + gmtOffset;
-
-        return getLocalTime(year, month, day, t);
-    }
-
-    /**
-     * Converts the given Gregorian calendar field values to local time.
-     * Local time is represented by the amount of milliseconds from
-     * January 1, 1970 0:00 GMT.
-     * @param year the year value
-     * @param month the Month value
-     * @param day the day value
-     * @param time the time of the day in milliseconds
-     * @return local time
-     */
-    static long getLocalTime(int year, Month month, int day, long time) {
-        CalendarDate date = gcal.newCalendarDate(null);
-        date.setDate(year, month.value(), day);
-        long millis = gcal.getTime(date);
-        return millis + time;
-    }
-
-    /**
-     * Equivalent to <code>getLocalTime(year, month, day, (long)time)</code>.
-     * @param year the year value
-     * @param month the Month value
-     * @param day the day value
-     * @param time the time of the day in milliseconds
-     * @return local time
-     */
-    static long getLocalTime(int year, Month month, int day, int time) {
-        return getLocalTime(year, month, day, (long)time);
-    }
-
-    /**
-     * Equivalent to {@link #getLocalTime(int, Month, RuleDay, int)
-     * getLocalTime(year, month, day, (int) time)}.
-     * @param year the year value
-     * @param month the Month value
-     * @param day the day represented by {@link RuleDay}
-     * @param time the time of the day represented by {@link Time}
-     * @return local time
-     */
-    static long getLocalTime(int year, Month month, RuleDay day, long time) {
-        return getLocalTime(year, month, day, (int) time);
-    }
-
-    /**
-     * Converts the given Gregorian calendar field values to local time.
-     * Local time is represented by the amount of milliseconds from
-     * January 1, 1970 0:00 GMT.
-     * @param year the year value
-     * @param month the Month value
-     * @param day the day represented by {@link RuleDay}
-     * @param time the time of the day represented by {@link Time}
-     * @return local time
-     */
-    static long getLocalTime(int year, Month month, RuleDay day, int time) {
-        CalendarDate cdate = gcal.newCalendarDate(null);
-        int monthValue = month.value();
-
-        if (day.isLast()) {     // e.g., "lastSun"
-            cdate.setDate(year, monthValue, 1);
-            cdate.setDayOfMonth(gcal.getMonthLength(cdate));
-            cdate = gcal.getNthDayOfWeek(-1, day.getDayOfWeekNum(), cdate);
-        } else if (day.isLater()) { // e.g., "Sun>=1"
-            cdate.setDate(year, monthValue, day.getDay());
-            cdate = gcal.getNthDayOfWeek(1, day.getDayOfWeekNum(), cdate);
-        } else if (day.isExact()) {
-            cdate.setDate(year, monthValue, day.getDay());
-        } else if (day.isEarlier()) {   // e.g., "Sun<=15"
-            cdate.setDate(year, monthValue, day.getDay());
-            cdate = gcal.getNthDayOfWeek(-1, day.getDayOfWeekNum(), cdate);
-        } else {
-            Main.panic("invalid day type: " + day);
-        }
-        return gcal.getTime(cdate) + time;
-    }
-
-    /**
-     * Parses the given "AT" field and constructs a Time object.
-     * @param the "AT" field string
-     * @return the Time object
-     */
-    static Time parse(String time) {
-        int sign;
-        int index = 0;
-        Time tm;
-
-        if (time.charAt(0) == '-') {
-            sign = -1;
-            index++;
-        } else {
-            sign = 1;
-        }
-        int val = 0;
-        int num = 0;
-        int countDelim = 0;
-        while (index < time.length()) {
-            char c = time.charAt(index++);
-            if (c == ':') {
-                val = val * 60 + num;
-                countDelim++;
-                num = 0;
-                continue;
-            }
-            int d = Character.digit(c, 10);
-            if (d == -1) {
-                --index;
-                break;
-            }
-            num = num * 10 + d;
-        }
-        val = val * 60 + num;
-        // convert val to second
-        for (; countDelim < 2; countDelim++) {
-            val *= 60;
-        }
-        tm = new Time((long)val * 1000 * sign);
-        if (index < time.length()) {
-            char c = time.charAt(index++);
-            if (c == 's') {
-                tm.setType(Time.STD);
-            } else if (c == 'u' || c == 'g' || c == 'z') {
-                tm.setType(Time.UTC);
-            } else if (c == 'w') {
-                tm.setType(Time.WALL);
-            } else {
-                Main.panic("unknown time mode: "+c);
-            }
-        } else {
-            tm.setType(Time.WALL);
-        }
-        return tm;
-    }
-
-    /**
-     * Converts the given milliseconds string to a "[+-]hh:mm" string.
-     * @param ms the milliseconds string
-     */
-    static String toGMTFormat(String ms) {
-        long sec = Long.parseLong(ms) / 1000;
-        char sign;
-        if (sec < 0) {
-            sign = '-';
-            sec = -sec;
-        } else {
-            sign = '+';
-        }
-        return String.format((Locale)null, "%c%02d:%02d",
-                             sign, sec/3600, (sec%3600)/60);
-    }
-
-    /**
-     * Converts the given millisecond value to a string for a
-     * SimpleTimeZone parameter.
-     * @param ms the millisecond value
-     * @return the string in a human readable form
-     */
-    static String toFormedString(int ms) {
-        StringBuilder s = new StringBuilder();
-        boolean minus = false;
-
-        if (ms < 0) {
-            s.append("-");
-            minus = true;
-            ms = -ms;
-        } else if (ms == 0) {
-            return "0";
-        }
-
-        int hour = ms / (60 * 60 * 1000);
-        ms %= (60 * 60 * 1000);
-        int minute = ms / (60 * 1000);
-
-        if (hour != 0) {
-            if (minus && minute != 0) {
-                s.append("(");
-            }
-            s.append(Integer.toString(hour) + "*ONE_HOUR");
-        }
-
-        if (minute != 0) {
-            if (hour != 0) {
-                s.append("+");
-            }
-            s.append(Integer.toString(minute) + "*ONE_MINUTE");
-            if (minus && hour != 0) {
-                s.append(")");
-            }
-        }
-
-        return s.toString();
-    }
-}
diff --git a/jdk/make/tools/src/build/tools/javazic/Timezone.java b/jdk/make/tools/src/build/tools/javazic/Timezone.java
deleted file mode 100644
index 941ea454563..00000000000
--- a/jdk/make/tools/src/build/tools/javazic/Timezone.java
+++ /dev/null
@@ -1,454 +0,0 @@
-/*
- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package build.tools.javazic;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Timezone represents all information of a single point of time to
- * generate its time zone database.
- *
- * @since 1.4
- */
-class Timezone {
-    /**
-     * zone name of this time zone
-     */
-    private String name;
-
-    /**
-     * transition time values in UTC (millisecond)
-     */
-    private List<Long> transitions;
-
-    /**
-     * All offset values in millisecond
-     * @see sun.util.calendar.ZoneInfo
-     */
-    private List<Integer> offsets;
-
-    /**
-     * Indices of GMT offset values (both raw and raw+saving)
-     * at transitions
-     */
-    private List<Integer> gmtOffsets;
-
-    /**
-     * Indices of regular or "direct" saving time values
-     * at transitions
-     */
-    private List<Integer> dstOffsets;
-
-    /**
-     * Zone records of this time zone
-     */
-    private List<ZoneRec> usedZoneRecs;
-
-    /**
-     * Rule records referred to by this time zone
-     */
-    private List<RuleRec> usedRuleRecs;
-
-    /**
-     * Type of DST rules in this time zone
-     */
-    private int dstType;
-    static final int UNDEF_DST = 0;     // DST type not set yet
-    static final int NO_DST = 1;        // never observed DST
-    static final int LAST_DST = 2;      // last rule ends in DST (all year round DST-only)
-    static final int X_DST = 3;         // used to observe DST
-    static final int DST = 4;           // observing DST regularly
-
-    /**
-     * Raw GMT offset of this time zone in the last rule
-     */
-    private int rawOffset;
-
-    /**
-     * The CRC32 value of the transitions data
-     */
-    private int crc32;
-
-    /**
-     * The last ZoneRec
-     */
-    private ZoneRec lastZoneRec;
-
-    /**
-     * The last DST rules. lastRules[0] is the DST start
-     * rule. lastRules[1] is the DST end rules.
-     */
-    private List<RuleRec> lastRules;
-
-    /**
-     * The amount of DST saving value (millisecond) in the last DST
-     * rule.
-     */
-    private int lastSaving;
-
-    /**
-     * true if the raw offset will change in the future time.
-     */
-    private boolean willRawOffsetChange = false;
-
-
-    /**
-     * Constracts a Timezone object with the given zone name.
-     * @param name the zone name
-     */
-    Timezone(String name) {
-        this.name = name;
-    }
-
-    /**
-     * @return the number of transitions
-     */
-    int getNTransitions() {
-        if (transitions == null) {
-            return 0;
-        }
-        return transitions.size();
-    }
-
-    /**
-     * @return the zone name
-     */
-    String getName() {
-        return name;
-    }
-
-    /**
-     * Returns the list of all rule records that have been referred to
-     * by this time zone.
-     * @return the rule records list
-     */
-    List<RuleRec> getRules() {
-        return usedRuleRecs;
-    }
-
-    /**
-     * Returns the list of all zone records that have been referred to
-     * by this time zone.
-     * @return the zone records list
-     */
-    List<ZoneRec> getZones() {
-        return usedZoneRecs;
-    }
-
-    /**
-     * @return the transition table (list)
-     */
-    List<Long> getTransitions() {
-        return transitions;
-    }
-
-    /**
-     * @return the offsets list
-     */
-    List<Integer> getOffsets() {
-        return offsets;
-    }
-
-    /**
-     * @return the DST saving offsets list
-     */
-    List<Integer> getDstOffsets() {
-        return dstOffsets;
-    }
-
-    /**
-     * @return the GMT offsets list
-     */
-    List<Integer> getGmtOffsets() {
-        return gmtOffsets;
-    }
-
-    /**
-     * @return the checksum (crc32) value of the trasition table
-     */
-    int getCRC32() {
-        return crc32;
-    }
-
-    /**
-     * @return true if the GMT offset of this time zone would change
-     * after the time zone database has been generated, false, otherwise.
-     */
-    boolean willGMTOffsetChange() {
-        return willRawOffsetChange;
-    }
-
-    /**
-     * @return the last known GMT offset value in milliseconds
-     */
-    int getRawOffset() {
-        return rawOffset;
-    }
-
-    /**
-     * Sets time zone's GMT offset to <code>offset</code>.
-     * @param offset the GMT offset value in milliseconds
-     */
-    void setRawOffset(int offset) {
-        rawOffset = offset;
-    }
-
-    /**
-     * Sets time zone's GMT offset value to <code>offset</code>. If
-     * <code>startTime</code> is future time, then the {@link
-     * #willRawOffsetChange} value is set to true.
-     * @param offset the GMT offset value in milliseconds
-     * @param startTime the UTC time at which the GMT offset is in effective
-     */
-    void setRawOffset(int offset, long startTime) {
-        // if this rawOffset is for the future time, let the run-time
-        // look for the current GMT offset.
-        if (startTime > Time.getCurrentTime()) {
-            willRawOffsetChange = true;
-        }
-        setRawOffset(offset);
-    }
-
-    /**
-     * Adds the specified transition information to the end of the transition table.
-     * @param time the UTC time at which this transition happens
-     * @param offset the total amount of the offset from GMT in milliseconds
-     * @param dstOffset the amount of time in milliseconds saved at this transition
-     */
-    void addTransition(long time, int offset, int dstOffset) {
-        if (transitions == null) {
-            transitions = new ArrayList<Long>();
-            offsets = new ArrayList<Integer>();
-            dstOffsets = new ArrayList<Integer>();
-        }
-        transitions.add(time);
-        offsets.add(offset);
-        dstOffsets.add(dstOffset);
-    }
-
-    /**
-     * Sets the type of historical daylight saving time
-     * observation. For example, China used to observed daylight
-     * saving time, but it no longer does. Then, X_DST is set to the
-     * China time zone.
-     * @param type the type of daylight saving time
-     */
-    void setDSTType(int type) {
-        dstType = type;
-    }
-
-    /**
-     * @return the type of historical daylight saving time
-     * observation.
-     */
-    int getDSTType() {
-        return dstType;
-    }
-
-    /**
-     * Adds the specified zone record to the zone records list.
-     * @param rec the zone record
-     */
-    void addUsedRec(ZoneRec rec) {
-        if (usedZoneRecs == null) {
-            usedZoneRecs = new ArrayList<ZoneRec>();
-        }
-        usedZoneRecs.add(rec);
-    }
-
-    /**
-     * Adds the specified rule record to the rule records list.
-     * @param rec the rule record
-     */
-    void addUsedRec(RuleRec rec) {
-        if (usedRuleRecs == null) {
-            usedRuleRecs = new ArrayList<RuleRec>();
-        }
-        // if the last used rec is the same as the given rec, avoid
-        // putting the same rule.
-        int n = usedRuleRecs.size();
-        for (int i = 0; i < n; i++) {
-            if (usedRuleRecs.get(i).equals(rec)) {
-                return;
-            }
-        }
-        usedRuleRecs.add(rec);
-    }
-
-    /**
-     * Sets the last zone record for this time zone.
-     * @param the last zone record
-     */
-    void setLastZoneRec(ZoneRec zrec) {
-        lastZoneRec = zrec;
-    }
-
-    /**
-     * @return the last zone record for this time zone.
-     */
-    ZoneRec getLastZoneRec() {
-        return lastZoneRec;
-    }
-
-    /**
-     * Sets the last rule records for this time zone. Those are used
-     * for generating SimpleTimeZone parameters.
-     * @param rules the last rule records
-     */
-    void setLastRules(List<RuleRec> rules) {
-        int n = rules.size();
-        if (n > 0) {
-            lastRules = rules;
-            RuleRec rec = rules.get(0);
-            int offset = rec.getSave();
-            if (offset > 0) {
-                setLastDSTSaving(offset);
-            } else {
-                System.err.println("\t    No DST starting rule in the last rules.");
-            }
-        }
-    }
-
-    /**
-     * @return the last rule records for this time zone.
-     */
-    List<RuleRec> getLastRules() {
-        return lastRules;
-    }
-
-    /**
-     * Sets the last daylight saving amount.
-     * @param the daylight saving amount
-     */
-    void setLastDSTSaving(int offset) {
-        lastSaving = offset;
-    }
-
-    /**
-     * @return the last daylight saving amount.
-     */
-    int getLastDSTSaving() {
-        return lastSaving;
-    }
-
-    /**
-     * Calculates the CRC32 value from the transition table and sets
-     * the value to <code>crc32</code>.
-     */
-    void checksum() {
-        if (transitions == null) {
-            crc32 = 0;
-            return;
-        }
-        Checksum sum = new Checksum();
-        for (int i = 0; i < transitions.size(); i++) {
-            int offset = offsets.get(i);
-            // adjust back to make the transition in local time
-            sum.update(transitions.get(i) + offset);
-            sum.update(offset);
-            sum.update(dstOffsets.get(i));
-        }
-        crc32 = (int)sum.getValue();
-    }
-
-    /**
-     * Removes unnecessary transitions for Java time zone support.
-     */
-    void optimize() {
-        // if there is only one offset, delete all transitions. This
-        // could happen if only time zone abbreviations changed.
-        if (gmtOffsets.size() == 1) {
-            transitions = null;
-            usedRuleRecs =  null;
-            setDSTType(NO_DST);
-            return;
-        }
-        for (int i = 0; i < (transitions.size() - 2); i++) { // don't remove the last one
-            if (transitions.get(i) == transitions.get(i+1)) {
-                transitions.remove(i);
-                offsets.remove(i);
-                dstOffsets.remove(i);
-                i--;
-            }
-        }
-
-        for (int i = 0; i < (transitions.size() - 2); i++) { // don't remove the last one
-            if (offsets.get(i) == offsets.get(i+1)
-                && dstOffsets.get(i) == dstOffsets.get(i+1)) {
-                transitions.remove(i+1);
-                offsets.remove(i+1);
-                dstOffsets.remove(i+1);
-                i--;
-            }
-        }
-    }
-
-    /**
-     * Stores the specified offset value from GMT in the GMT offsets
-     * table and returns its index. The offset value includes the base
-     * GMT offset and any additional daylight saving if applicable. If
-     * the same value as the specified offset is already in the table,
-     * its index is returned.
-     * @param offset the offset value in milliseconds
-     * @return the index to the offset value in the GMT offsets table.
-     */
-    int getOffsetIndex(int offset) {
-        return getOffsetIndex(offset, 0);
-    }
-
-    /**
-     * Stores the specified daylight saving value in the GMT offsets
-     * table and returns its index. If the same value as the specified
-     * offset is already in the table, its index is returned. If 0 is
-     * specified, it's not stored in the table and -1 is returned.
-     * @param offset the offset value in milliseconds
-     * @return the index to the specified offset value in the GMT
-     * offsets table, or -1 if 0 is specified.
-     */
-    int getDstOffsetIndex(int offset) {
-        if (offset == 0) {
-            return -1;
-        }
-        return getOffsetIndex(offset, 1);
-    }
-
-    private int getOffsetIndex(int offset, int index) {
-        if (gmtOffsets == null) {
-            gmtOffsets = new ArrayList<Integer>();
-        }
-        for (int i = index; i < gmtOffsets.size(); i++) {
-            if (offset == gmtOffsets.get(i)) {
-                return i;
-            }
-        }
-        if (gmtOffsets.size() < index) {
-            gmtOffsets.add(0);
-        }
-        gmtOffsets.add(offset);
-        return gmtOffsets.size() - 1;
-    }
-}
diff --git a/jdk/make/tools/src/build/tools/javazic/Zone.java b/jdk/make/tools/src/build/tools/javazic/Zone.java
deleted file mode 100644
index 1f4e7029c15..00000000000
--- a/jdk/make/tools/src/build/tools/javazic/Zone.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package build.tools.javazic;
-
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
-
-/**
- * Zone holds information corresponding to a "Zone" part of a time
- * zone definition file.
- *
- * @since 1.4
- */
-class Zone {
-    // zone name (e.g., "America/Los_Angeles")
-    private String name;
-
-    // zone records
-    private List<ZoneRec> list;
-
-    // target zone names for this compilation
-    private static Set<String> targetZones;
-
-    /**
-     * Constructs a Zone with the specified zone name.
-     * @param name the zone name
-     */
-    Zone(String name) {
-        this.name = name;
-        list = new ArrayList<ZoneRec>();
-    }
-
-    /**
-     * Reads time zone names to be generated, called "target zone
-     * name", from the specified text file and creats an internal hash
-     * table to keep those names. It's assumed that one text line
-     * contains a zone name or comments if it starts with
-     * '#'. Comments can't follow a zone name in a single line.
-     * @param fileName the text file name
-     */
-    static void readZoneNames(String fileName) {
-        if (fileName == null) {
-            return;
-        }
-        BufferedReader in = null;
-        try {
-            FileReader fr = new FileReader(fileName);
-            in = new BufferedReader(fr);
-        } catch (FileNotFoundException e) {
-            Main.panic("can't open file: " + fileName);
-        }
-        targetZones = new HashSet<String>();
-        String line;
-
-        try {
-            while ((line = in.readLine()) != null) {
-                line = line.trim();
-                if (line.length() == 0 || line.charAt(0) == '#') {
-                    continue;
-                }
-                if (!targetZones.add(line)) {
-                    Main.warning("duplicated target zone name: " + line);
-                }
-            }
-            in.close();
-        } catch (IOException e) {
-            Main.panic("IO error: "+e.getMessage());
-        }
-    }
-
-    /**
-     * Determines whether the specified zone is one of the target zones.
-     * If no target zones are specified, this method always returns
-     * true for any zone name.
-     * @param zoneName the zone name
-     * @return true if the specified name is a target zone.
-     */
-    static boolean isTargetZone(String zoneName) {
-        if (targetZones == null) {
-            return true;
-        }
-        return targetZones.contains(zoneName);
-    }
-
-    /**
-     * Forces to add "MET" to the target zone table. This is because
-     * there is a conflict between Java zone name "WET" and Olson zone
-     * name.
-     */
-    static void addMET() {
-        if (targetZones != null) {
-            targetZones.add("MET");
-        }
-    }
-
-    /**
-     * @return the zone name
-     */
-    String getName() {
-        return name;
-    }
-
-    /**
-     * Adds the specified zone record to the zone record list.
-     */
-    void add(ZoneRec rec) {
-        list.add(rec);
-    }
-
-    /**
-     * @param index the index at which the zone record in the list is returned.
-     * @return the zone record specified by the index.
-     */
-    ZoneRec get(int index) {
-        return list.get(index);
-    }
-
-    /**
-     * @return the size of the zone record list
-     */
-    int size() {
-        return list.size();
-    }
-
-    /**
-     * Resolves the reference to a rule in each zone record.
-     * @param zi the Zoneinfo object with which the rule reference is
-     * resolved.
-     */
-    void resolve(Zoneinfo zi) {
-        for (int i = 0; i < list.size(); i++) {
-            ZoneRec rec = list.get(i);
-            rec.resolve(zi);
-        }
-    }
-}
diff --git a/jdk/make/tools/src/build/tools/javazic/ZoneRec.java b/jdk/make/tools/src/build/tools/javazic/ZoneRec.java
deleted file mode 100644
index b175e0e93d4..00000000000
--- a/jdk/make/tools/src/build/tools/javazic/ZoneRec.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package build.tools.javazic;
-
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
-
-/**
- * ZoneRec hold information of time zone corresponding to each text
- * line of the "Zone" part.
- *
- * @since 1.4
- */
-class ZoneRec {
-    private int gmtOffset;
-    private String ruleName;
-    private int directSave;
-    private Rule ruleRef;
-    private String format;
-    private boolean hasUntil;
-    private int untilYear;
-    private Month untilMonth;
-    private RuleDay untilDay;
-    private Time untilTime;
-    private long untilInMillis;
-    private String line;
-
-    /**
-     * @return the "UNTIL" value in milliseconds
-     */
-    Time getUntilTime() {
-        return untilTime;
-    }
-
-    /**
-     * @return the GMT offset value in milliseconds
-     */
-    int getGmtOffset() {
-        return gmtOffset;
-    }
-
-    /**
-     * @return the rule name to which this zone record refers
-     */
-    String getRuleName() {
-        return ruleName;
-    }
-
-    /**
-     * @return the amount of saving time directly defined in the
-     * "RULES/SAVE" field.
-     */
-    int getDirectSave() {
-        return directSave;
-    }
-
-    /**
-     * @return true if this zone record has a reference to a rule
-     */
-    boolean hasRuleReference() {
-        return ruleRef != null;
-    }
-
-    /**
-     * Returns the "FORMAT" field string of this zone record. This
-     * @return the "FORMAT" field
-     */
-    String getFormat() {
-        return format;
-    }
-
-    /**
-     * @return the year in the "UNTIL" field
-     */
-    int getUntilYear() {
-        return untilYear;
-    }
-
-    /**
-     * Returns the "UNTIL" field value in milliseconds from Janurary
-     * 1, 1970 0:00 GMT.
-     * @param currentSave the amount of daylight saving in
-     * milliseconds that is used to adjust wall-clock time.
-     * @return the milliseconds value of the "UNTIL" field
-     */
-    long getUntilTime(int currentSave) {
-        if (untilTime.isWall()) {
-            return untilInMillis - currentSave;
-        }
-        return untilInMillis;
-    }
-
-    /**
-     * Returns the "UNTIL" time in milliseconds without adjusting GMT
-     * offsets or daylight saving.
-     * @return local "UNTIL" time in milliseconds
-     */
-    long getLocalUntilTime() {
-        return Time.getLocalTime(untilYear,
-                                 untilMonth,
-                                 untilDay,
-                                 untilTime.getTime());
-    }
-
-    /**
-     * Returns the "UNTIL" time in milliseconds with adjusting GMT offsets and daylight saving.
-     * @return the "UNTIL" time after the adjustment
-     */
-    long getLocalUntilTime(int save, int gmtOffset) {
-        return Time.getLocalTime(untilYear,
-                                 untilMonth,
-                                 untilDay,
-                                 save,
-                                 gmtOffset,
-                                 untilTime);
-    }
-
-    /**
-     * @return the text line of this zone record
-     */
-    String getLine() {
-        return line;
-    }
-
-    /**
-     * Sets the specified text line to this zone record
-     */
-    void setLine(String line) {
-        this.line = line;
-    }
-
-    /**
-     * @return true if this zone record has the "UNTIL" field
-     */
-    boolean hasUntil() {
-        return this.hasUntil;
-    }
-
-    /**
-     * Adjusts the "UNTIL" time to GMT offset if this zone record has
-     * it.  <code>untilTime</code> is not adjusted to daylight saving
-     * in this method.
-     */
-    void adjustTime() {
-        if (!hasUntil()) {
-            return;
-        }
-        if (untilTime.isSTD() || untilTime.isWall()) {
-            // adjust to gmt offset only here.  adjust to real
-            // wall-clock time when tracking rules
-            untilInMillis -= gmtOffset;
-        }
-    }
-
-    /**
-     * @return the reference to the Rule object
-     */
-    Rule getRuleRef() {
-        return ruleRef;
-    }
-
-    /**
-     * Resolves the reference to a Rule and adjusts its "UNTIL" time
-     * to GMT offset.
-     */
-    void resolve(Zoneinfo zi) {
-        if (ruleName != null && (!"-".equals(ruleName))) {
-                ruleRef = zi.getRule(ruleName);
-        }
-        adjustTime();
-    }
-
-    /**
-     * Parses a Zone text line that is described by a StringTokenizer.
-     * @param tokens represents tokens of a Zone text line
-     * @return the zone record produced by parsing the text
-     */
-    static ZoneRec parse(StringTokenizer tokens) {
-        ZoneRec rec = new ZoneRec();
-        try {
-            rec.gmtOffset = (int) Time.parse(tokens.nextToken()).getTime();
-            String token = tokens.nextToken();
-            char c = token.charAt(0);
-            if (c >= '0' && c <= '9') {
-                rec.directSave = (int) Time.parse(token).getTime();
-            } else {
-                rec.ruleName = token;
-            }
-            rec.format = tokens.nextToken();
-            if (tokens.hasMoreTokens()) {
-                rec.hasUntil = true;
-                rec.untilYear = Integer.parseInt(tokens.nextToken());
-                if (tokens.hasMoreTokens()) {
-                    rec.untilMonth = Month.parse(tokens.nextToken());
-                } else {
-                    rec.untilMonth = Month.JANUARY;
-                }
-                if (tokens.hasMoreTokens()) {
-                    rec.untilDay = RuleDay.parse(tokens.nextToken());
-                } else {
-                    rec.untilDay = new RuleDay(1);
-                }
-                if (tokens.hasMoreTokens()) {
-                    rec.untilTime = Time.parse(tokens.nextToken());
-                } else {
-                    rec.untilTime = Time.parse("0:00");
-                }
-                rec.untilInMillis = rec.getLocalUntilTime();
-            }
-        } catch (Exception e) {
-            // TODO: error reporting
-            e.printStackTrace();
-        }
-        return rec;
-    }
-
-    private static void panic(String msg) {
-        Main.panic(msg);
-    }
-}
diff --git a/jdk/make/tools/src/build/tools/javazic/Zoneinfo.java b/jdk/make/tools/src/build/tools/javazic/Zoneinfo.java
deleted file mode 100644
index 129f87c57d2..00000000000
--- a/jdk/make/tools/src/build/tools/javazic/Zoneinfo.java
+++ /dev/null
@@ -1,569 +0,0 @@
-/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package build.tools.javazic;
-
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-/**
- * Zoneinfo provides javazic compiler front-end functionality.
- * @since 1.4
- */
-class Zoneinfo {
-
-    private static final int minYear = 1900;
-    private static final int maxYear = 2037;
-    private static final long minTime = Time.getLocalTime(minYear, Month.JANUARY, 1, 0);
-    private static int startYear = minYear;
-    private static int endYear = maxYear;
-
-    /**
-     * True if javazic should generate a list of SimpleTimeZone
-     * instances for the SimpleTimeZone-based time zone support.
-     */
-    static boolean isYearForTimeZoneDataSpecified = false;
-
-    /**
-     * Zone name to Zone mappings
-     */
-    private Map<String,Zone> zones;
-
-    /**
-     * Rule name to Rule mappings
-     */
-    private Map<String,Rule> rules;
-
-    /**
-     * Alias name to real name mappings
-     */
-    private Map<String,String> aliases;
-
-    /**
-     * Constracts a Zoneinfo.
-     */
-    Zoneinfo() {
-        zones = new HashMap<String,Zone>();
-        rules = new HashMap<String,Rule>();
-        aliases = new HashMap<String,String>();
-    }
-
-    /**
-     * Adds the given zone to the list of Zones.
-     * @param zone Zone to be added to the list.
-     */
-    void add(Zone zone) {
-        String name = zone.getName();
-        zones.put(name, zone);
-    }
-
-    /**
-     * Adds the given rule to the list of Rules.
-     * @param rule Rule to be added to the list.
-     */
-    void add(Rule rule) {
-        String name = rule.getName();
-        rules.put(name, rule);
-    }
-
-    /**
-     * Puts the specifid name pair to the alias table.
-     * @param name1 an alias time zone name
-     * @param name2 the real time zone of the alias name
-     */
-    void putAlias(String name1, String name2) {
-        aliases.put(name1, name2);
-    }
-
-    /**
-     * Sets the given year for SimpleTimeZone list output.
-     * This method is called when the -S option is specified.
-     * @param year the year for which SimpleTimeZone list should be generated
-     */
-    static void setYear(int year) {
-        setStartYear(year);
-        setEndYear(year);
-        isYearForTimeZoneDataSpecified = true;
-    }
-
-    /**
-     * Sets the start year.
-     * @param year the start year value
-     * @throws IllegalArgumentException if the specified year value is
-     * smaller than the minimum year or greater than the end year.
-     */
-    static void setStartYear(int year) {
-        if (year < minYear || year > endYear) {
-            throw new IllegalArgumentException("invalid start year specified: " + year);
-        }
-        startYear = year;
-    }
-
-    /**
-     * @return the start year value
-     */
-    static int getStartYear() {
-        return startYear;
-    }
-
-    /**
-     * Sets the end year.
-     * @param year the end year value
-     * @throws IllegalArgumentException if the specified year value is
-     * smaller than the start year or greater than the maximum year.
-     */
-    static void setEndYear(int year) {
-        if (year < startYear || year > maxYear) {
-            throw new IllegalArgumentException();
-        }
-        endYear = year;
-    }
-
-    /**
-     * @return the end year value
-     */
-    static int getEndYear() {
-        return endYear;
-    }
-
-    /**
-     * @return the minimum year value
-     */
-    static int getMinYear() {
-        return minYear;
-    }
-
-    /**
-     * @return the maximum year value
-     */
-    static int getMaxYear() {
-        return maxYear;
-    }
-
-    /**
-     * @return the alias table
-     */
-    Map<String,String> getAliases() {
-        return aliases;
-    }
-
-    /**
-     * @return the Zone list
-     */
-    Map<String,Zone> getZones() {
-        return zones;
-    }
-
-    /**
-     * @return a Zone specified by name.
-     * @param name a zone name
-     */
-    Zone getZone(String name) {
-        return zones.get(name);
-    }
-
-    /**
-     * @return a Rule specified by name.
-     * @param name a rule name
-     */
-    Rule getRule(String name) {
-        return rules.get(name);
-    }
-
-    private static String line;
-
-    private static int lineNum;
-
-    /**
-     * Parses the specified time zone data file and creates a Zoneinfo
-     * that has all Rules, Zones and Links (aliases) information.
-     * @param fname the time zone data file name
-     * @return a Zoneinfo object
-     */
-    static Zoneinfo parse(String fname) {
-        BufferedReader in = null;
-        try {
-            FileReader fr = new FileReader(fname);
-            in = new BufferedReader(fr);
-        } catch (FileNotFoundException e) {
-            panic("can't open file: "+fname);
-        }
-        Zoneinfo zi = new Zoneinfo();
-        boolean continued = false;
-        Zone zone = null;
-        String l;
-        lineNum = 0;
-
-        try {
-            while ((line = in.readLine()) != null) {
-                lineNum++;
-                // skip blank and comment lines
-                if (line.length() == 0 || line.charAt(0) == '#') {
-                    continue;
-                }
-
-                // trim trailing comments
-                int rindex = line.lastIndexOf('#');
-                if (rindex != -1) {
-                    // take the data part of the line
-                    l = line.substring(0, rindex);
-                } else {
-                    l = line;
-                }
-
-                StringTokenizer tokens = new StringTokenizer(l);
-                if (!tokens.hasMoreTokens()) {
-                    continue;
-                }
-                String token = tokens.nextToken();
-
-                if (continued || "Zone".equals(token)) {
-                    if (zone == null) {
-                        if (!tokens.hasMoreTokens()) {
-                            panic("syntax error: zone no more token");
-                        }
-                        token = tokens.nextToken();
-                        // if the zone name is in "GMT+hh" or "GMT-hh"
-                        // format, ignore it due to spec conflict.
-                        if (token.startsWith("GMT+") || token.startsWith("GMT-")) {
-                            continue;
-                        }
-                        zone = new Zone(token);
-                    } else {
-                        // no way to push the current token back...
-                        tokens = new StringTokenizer(l);
-                    }
-
-                    ZoneRec zrec = ZoneRec.parse(tokens);
-                    zrec.setLine(line);
-                    zone.add(zrec);
-                    if ((continued = zrec.hasUntil()) == false) {
-                        if (Zone.isTargetZone(zone.getName())) {
-                            // zone.resolve(zi);
-                            zi.add(zone);
-                        }
-                        zone = null;
-                    }
-                } else if ("Rule".equals(token)) {
-                    if (!tokens.hasMoreTokens()) {
-                        panic("syntax error: rule no more token");
-                    }
-                    token = tokens.nextToken();
-                    Rule rule = zi.getRule(token);
-                    if (rule == null) {
-                        rule = new Rule(token);
-                        zi.add(rule);
-                    }
-                    RuleRec rrec = RuleRec.parse(tokens);
-                    rrec.setLine(line);
-                    rule.add(rrec);
-                } else if ("Link".equals(token)) {
-                    // Link <newname> <oldname>
-                    try {
-                        String name1 = tokens.nextToken();
-                        String name2 = tokens.nextToken();
-
-                        // if the zone name is in "GMT+hh" or "GMT-hh"
-                        // format, ignore it due to spec conflict with
-                        // custom time zones. Also, ignore "ROC" for
-                        // PC-ness.
-                        if (name2.startsWith("GMT+") || name2.startsWith("GMT-")
-                            || "ROC".equals(name2)) {
-                            continue;
-                        }
-                        zi.putAlias(name2, name1);
-                    } catch (Exception e) {
-                        panic("syntax error: no more token for Link");
-                    }
-                }
-            }
-            in.close();
-        } catch (IOException ex) {
-            panic("IO error: " + ex.getMessage());
-        }
-
-        return zi;
-    }
-
-    /**
-     * Interprets a zone and constructs a Timezone object that
-     * contains enough information on GMT offsets and DST schedules to
-     * generate a zone info database.
-     *
-     * @param zoneName the zone name for which a Timezone object is
-     * constructed.
-     *
-     * @return a Timezone object that contains all GMT offsets and DST
-     * rules information.
-     */
-    Timezone phase2(String zoneName) {
-        Timezone tz = new Timezone(zoneName);
-        Zone zone = getZone(zoneName);
-        zone.resolve(this);
-
-        // TODO: merge phase2's for the regular and SimpleTimeZone ones.
-        if (isYearForTimeZoneDataSpecified) {
-            ZoneRec zrec = zone.get(zone.size()-1);
-            tz.setLastZoneRec(zrec);
-            tz.setRawOffset(zrec.getGmtOffset());
-            if (zrec.hasRuleReference()) {
-                /*
-                 * This part assumes that the specified year is covered by
-                 * the rules referred to by the last zone record.
-                 */
-                List<RuleRec> rrecs = zrec.getRuleRef().getRules(startYear);
-
-                if (rrecs.size() == 2) {
-                    // make sure that one is a start rule and the other is
-                    // an end rule.
-                    RuleRec r0 = rrecs.get(0);
-                    RuleRec r1 = rrecs.get(1);
-                    if (r0.getSave() == 0 && r1.getSave() > 0) {
-                        rrecs.set(0, r1);
-                        rrecs.set(1, r0);
-                    } else if (!(r0.getSave() > 0 && r1.getSave() == 0)) {
-                        rrecs = null;
-                        Main.error(zoneName + ": rules for " +  startYear + " not found.");
-                    }
-                } else {
-                    rrecs = null;
-                }
-                if (rrecs != null) {
-                    tz.setLastRules(rrecs);
-                }
-            }
-            return tz;
-        }
-
-        int gmtOffset;
-        int year = minYear;
-        int fromYear = year;
-        long fromTime = Time.getLocalTime(startYear,
-                                          Month.JANUARY,
-                                          1, 0);
-
-        // take the index 0 for the GMT offset of the last zone record
-        ZoneRec zrec = zone.get(zone.size()-1);
-        tz.getOffsetIndex(zrec.getGmtOffset());
-
-        int currentSave = 0;
-        boolean usedZone;
-        for (int zindex = 0; zindex < zone.size(); zindex++) {
-            zrec = zone.get(zindex);
-            usedZone = false;
-            gmtOffset = zrec.getGmtOffset();
-            int stdOffset = zrec.getDirectSave();
-
-            // If this is the last zone record, take the last rule info.
-            if (!zrec.hasUntil()) {
-                tz.setRawOffset(gmtOffset, fromTime);
-                if (zrec.hasRuleReference()) {
-                    tz.setLastRules(zrec.getRuleRef().getLastRules());
-                } else if (stdOffset != 0) {
-                    // in case the last rule is all year round DST-only
-                    // (Asia/Amman once announced this rule.)
-                    tz.setLastDSTSaving(stdOffset);
-                }
-            }
-            if (!zrec.hasRuleReference()) {
-                if (!zrec.hasUntil() || zrec.getUntilTime(stdOffset) >= fromTime) {
-                    tz.addTransition(fromTime,
-                                     tz.getOffsetIndex(gmtOffset+stdOffset),
-                                     tz.getDstOffsetIndex(stdOffset));
-                    usedZone = true;
-                }
-                currentSave = stdOffset;
-                // optimization in case the last rule is fixed.
-                if (!zrec.hasUntil()) {
-                    if (tz.getNTransitions() > 0) {
-                        if (stdOffset == 0) {
-                            tz.setDSTType(Timezone.X_DST);
-                        } else {
-                            tz.setDSTType(Timezone.LAST_DST);
-                        }
-                        long time = Time.getLocalTime(maxYear,
-                                                      Month.JANUARY, 1, 0);
-                        time -= zrec.getGmtOffset();
-                        tz.addTransition(time,
-                                         tz.getOffsetIndex(gmtOffset+stdOffset),
-                                         tz.getDstOffsetIndex(stdOffset));
-                        tz.addUsedRec(zrec);
-                    } else {
-                        tz.setDSTType(Timezone.NO_DST);
-                    }
-                    break;
-                }
-            } else {
-                Rule rule = zrec.getRuleRef();
-                boolean fromTimeUsed = false;
-                currentSave = 0;
-            year_loop:
-                for (year = getMinYear(); year <= endYear; year++) {
-                    if (zrec.hasUntil() && year > zrec.getUntilYear()) {
-                        break;
-                    }
-                    List<RuleRec> rules = rule.getRules(year);
-                    if (rules.size() > 0) {
-                        for (int i = 0; i < rules.size(); i++) {
-                            RuleRec rrec = rules.get(i);
-                            long transition = rrec.getTransitionTime(year,
-                                                                     gmtOffset,
-                                                                     currentSave);
-                            if (zrec.hasUntil()) {
-                                if (transition >= zrec.getUntilTime(currentSave)) {
-                                    break year_loop;
-                                }
-                            }
-
-                            if (fromTimeUsed == false) {
-                                if (fromTime <= transition) {
-                                    fromTimeUsed = true;
-
-                                    if (fromTime != minTime) {
-                                        int prevsave;
-
-                                        ZoneRec prevzrec = zone.get(zindex - 1);
-
-                                        // See if until time in the previous
-                                        // ZoneRec is the same thing as the
-                                        // local time in the next rule.
-                                        // (examples are Asia/Ashkhabad in 1991,
-                                        // Europe/Riga in 1989)
-
-                                        if (i > 0) {
-                                            prevsave = rules.get(i-1).getSave();
-                                        } else {
-                                            List<RuleRec> prevrules = rule.getRules(year-1);
-
-                                            if (prevrules.size() > 0) {
-                                                prevsave = prevrules.get(prevrules.size()-1).getSave();
-                                            } else {
-                                                prevsave = 0;
-                                            }
-                                        }
-
-                                        if (rrec.isSameTransition(prevzrec, prevsave, gmtOffset)) {
-                                            currentSave = rrec.getSave();
-                                            tz.addTransition(fromTime,
-                                                         tz.getOffsetIndex(gmtOffset+currentSave),
-                                                         tz.getDstOffsetIndex(currentSave));
-                                            tz.addUsedRec(rrec);
-                                            usedZone = true;
-                                            continue;
-                                        }
-                                        if (!prevzrec.hasRuleReference()
-                                            || rule != prevzrec.getRuleRef()
-                                            || (rule == prevzrec.getRuleRef()
-                                                && gmtOffset != prevzrec.getGmtOffset())) {
-                                            int save = (fromTime == transition) ? rrec.getSave() : currentSave;
-                                            tz.addTransition(fromTime,
-                                                         tz.getOffsetIndex(gmtOffset+save),
-                                                         tz.getDstOffsetIndex(save));
-                                            tz.addUsedRec(rrec);
-                                            usedZone = true;
-                                        }
-                                    } else {  // fromTime == minTime
-                                        int save = rrec.getSave();
-                                        tz.addTransition(minTime,
-                                                         tz.getOffsetIndex(gmtOffset),
-                                                         tz.getDstOffsetIndex(0));
-
-                                        tz.addTransition(transition,
-                                                         tz.getOffsetIndex(gmtOffset+save),
-                                                         tz.getDstOffsetIndex(save));
-
-                                        tz.addUsedRec(rrec);
-                                        usedZone = true;
-                                    }
-                                } else if (year == fromYear && i == rules.size()-1) {
-                                    int save = rrec.getSave();
-                                    tz.addTransition(fromTime,
-                                                     tz.getOffsetIndex(gmtOffset+save),
-                                                     tz.getDstOffsetIndex(save));
-                                }
-                            }
-
-                            currentSave = rrec.getSave();
-                            if (fromTime < transition) {
-                                tz.addTransition(transition,
-                                                 tz.getOffsetIndex(gmtOffset+currentSave),
-                                                 tz.getDstOffsetIndex(currentSave));
-                                tz.addUsedRec(rrec);
-                                usedZone = true;
-                            }
-                        }
-                    } else {
-                        if (year == fromYear) {
-                            tz.addTransition(fromTime,
-                                             tz.getOffsetIndex(gmtOffset+currentSave),
-                                             tz.getDstOffsetIndex(currentSave));
-                            fromTimeUsed = true;
-                        }
-                        if (year == endYear && !zrec.hasUntil()) {
-                            if (tz.getNTransitions() > 0) {
-                                // Assume that this Zone stopped DST
-                                tz.setDSTType(Timezone.X_DST);
-                                long time = Time.getLocalTime(maxYear, Month.JANUARY,
-                                                              1, 0);
-                                time -= zrec.getGmtOffset();
-                                tz.addTransition(time,
-                                                 tz.getOffsetIndex(gmtOffset),
-                                                 tz.getDstOffsetIndex(0));
-                                usedZone = true;
-                            } else {
-                                tz.setDSTType(Timezone.NO_DST);
-                            }
-                        }
-                    }
-                }
-            }
-            if (usedZone) {
-                tz.addUsedRec(zrec);
-            }
-            if (zrec.hasUntil() && zrec.getUntilTime(currentSave) > fromTime) {
-                fromTime = zrec.getUntilTime(currentSave);
-                fromYear = zrec.getUntilYear();
-                year = zrec.getUntilYear();
-            }
-        }
-
-        if (tz.getDSTType() == Timezone.UNDEF_DST) {
-            tz.setDSTType(Timezone.DST);
-        }
-        tz.optimize();
-        tz.checksum();
-        return tz;
-    }
-
-    private static void panic(String msg) {
-        Main.panic(msg);
-    }
-}

From bf26c0a143801c1ae7f53e47dc2960dbb5c35892 Mon Sep 17 00:00:00 2001
From: Yong Jeffrey Huang <yhuang@openjdk.org>
Date: Sat, 16 Feb 2013 21:22:11 -0800
Subject: [PATCH 166/311] 8006748: getISO3Country() returns wrong value

Reviewed-by: naoto
---
 jdk/src/share/classes/java/util/LocaleISOData.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jdk/src/share/classes/java/util/LocaleISOData.java b/jdk/src/share/classes/java/util/LocaleISOData.java
index c49abb06eaf..170fef69193 100644
--- a/jdk/src/share/classes/java/util/LocaleISOData.java
+++ b/jdk/src/share/classes/java/util/LocaleISOData.java
@@ -473,7 +473,7 @@ class LocaleISOData {
         + "YE" + "YEM"  // Yemen
         + "YT" + "MYT"  // Mayotte
         + "ZA" + "ZAF"  // South Africa, Republic of
-        + "ZM" + "ZMW"  // Zambia, Republic of
+        + "ZM" + "ZMB"  // Zambia, Republic of
         + "ZW" + "ZWE"  // Zimbabwe
         ;
 

From 7886b3e26b17b3759e68d691a9c8112c8eaae86f Mon Sep 17 00:00:00 2001
From: Frank Ding <dingxmin@openjdk.org>
Date: Mon, 18 Feb 2013 08:14:18 +0000
Subject: [PATCH 167/311] 6429204: (se) Concurrent Selector.register and
 SelectionKey.interestOps can ignore interestOps

Reviewed-by: alanb
---
 .../sun/nio/ch/WindowsSelectorImpl.java       |  25 +--
 .../nio/channels/Selector/RacyDeregister.java | 148 ++++++++++++++++++
 2 files changed, 164 insertions(+), 9 deletions(-)
 create mode 100644 jdk/test/java/nio/channels/Selector/RacyDeregister.java

diff --git a/jdk/src/windows/classes/sun/nio/ch/WindowsSelectorImpl.java b/jdk/src/windows/classes/sun/nio/ch/WindowsSelectorImpl.java
index beb3e861f83..1034bb7d82f 100644
--- a/jdk/src/windows/classes/sun/nio/ch/WindowsSelectorImpl.java
+++ b/jdk/src/windows/classes/sun/nio/ch/WindowsSelectorImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,7 @@ import java.nio.channels.ClosedSelectorException;
 import java.nio.channels.Pipe;
 import java.nio.channels.SelectableChannel;
 import java.io.IOException;
+import java.nio.channels.CancelledKeyException;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -561,17 +562,19 @@ final class WindowsSelectorImpl extends SelectorImpl {
     protected void implDereg(SelectionKeyImpl ski) throws IOException{
         int i = ski.getIndex();
         assert (i >= 0);
-        if (i != totalChannels - 1) {
-            // Copy end one over it
-            SelectionKeyImpl endChannel = channelArray[totalChannels-1];
-            channelArray[i] = endChannel;
-            endChannel.setIndex(i);
-            pollWrapper.replaceEntry(pollWrapper, totalChannels - 1,
+        synchronized (closeLock) {
+            if (i != totalChannels - 1) {
+                // Copy end one over it
+                SelectionKeyImpl endChannel = channelArray[totalChannels-1];
+                channelArray[i] = endChannel;
+                endChannel.setIndex(i);
+                pollWrapper.replaceEntry(pollWrapper, totalChannels - 1,
                                                                 pollWrapper, i);
+            }
+            ski.setIndex(-1);
         }
         channelArray[totalChannels - 1] = null;
         totalChannels--;
-        ski.setIndex(-1);
         if ( totalChannels != 1 && totalChannels % MAX_SELECTABLE_FDS == 1) {
             totalChannels--;
             threadsCount--; // The last thread has become redundant.
@@ -589,7 +592,11 @@ final class WindowsSelectorImpl extends SelectorImpl {
         synchronized (closeLock) {
             if (pollWrapper == null)
                 throw new ClosedSelectorException();
-            pollWrapper.putEventOps(sk.getIndex(), ops);
+            // make sure this sk has not been removed yet
+            int index = sk.getIndex();
+            if (index == -1)
+                throw new CancelledKeyException();
+            pollWrapper.putEventOps(index, ops);
         }
     }
 
diff --git a/jdk/test/java/nio/channels/Selector/RacyDeregister.java b/jdk/test/java/nio/channels/Selector/RacyDeregister.java
new file mode 100644
index 00000000000..5a72df18107
--- /dev/null
+++ b/jdk/test/java/nio/channels/Selector/RacyDeregister.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * Portions Copyright (c) 2012 IBM Corporation
+ */
+
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.nio.channels.SelectionKey;
+import java.nio.channels.Selector;
+import java.nio.channels.ServerSocketChannel;
+import java.nio.channels.SocketChannel;
+
+/*
+ * @test
+ * @bug 6429204
+ * @summary SelectionKey.interestOps does not update interest set on Windows.
+ * @author Frank Ding
+ */
+public class RacyDeregister {
+
+    static boolean notified;
+    static final Object selectorLock = new Object();
+    static final Object notifyLock = new Object();
+    /**
+     * null: not terminated
+     * true: passed
+     * false: failed
+     */
+    static volatile Boolean succTermination = null;
+
+    public static void main(String[] args) throws Exception {
+        InetAddress addr = InetAddress.getByName(null);
+        ServerSocketChannel sc = ServerSocketChannel.open();
+        sc.socket().bind(new InetSocketAddress(addr, 0));
+
+        SocketChannel.open(new InetSocketAddress(addr,
+                sc.socket().getLocalPort()));
+
+        SocketChannel accepted = sc.accept();
+        accepted.configureBlocking(false);
+
+        SocketChannel.open(new InetSocketAddress(addr,
+                sc.socket().getLocalPort()));
+        SocketChannel accepted2 = sc.accept();
+        accepted2.configureBlocking(false);
+
+        final Selector sel = Selector.open();
+        SelectionKey key2 = accepted2.register(sel, SelectionKey.OP_READ);
+        final SelectionKey[] key = new SelectionKey[]{
+            accepted.register(sel, SelectionKey.OP_READ)};
+
+
+        // thread that will be changing key[0].interestOps to OP_READ | OP_WRITE
+        new Thread() {
+
+            public void run() {
+                try {
+                    for (int k = 0; k < 15; k++) {
+                        for (int i = 0; i < 10000; i++) {
+                            synchronized (notifyLock) {
+                                synchronized (selectorLock) {
+                                    sel.wakeup();
+                                    key[0].interestOps(SelectionKey.OP_READ
+                                            | SelectionKey.OP_WRITE);
+                                }
+                                notified = false;
+                                long beginTime = System.currentTimeMillis();
+                                while (true) {
+                                    notifyLock.wait(5000);
+                                    if (notified) {
+                                        break;
+                                    }
+                                    long endTime = System.currentTimeMillis();
+                                    if (endTime - beginTime > 5000) {
+                                        succTermination = false;
+                                        // wake up main thread doing select()
+                                        sel.wakeup();
+                                        return;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    succTermination = true;
+                    // wake up main thread doing select()
+                    sel.wakeup();
+                } catch (Exception e) {
+                    System.out.println(e);
+                    succTermination = true;
+                    // wake up main thread doing select()
+                    sel.wakeup();
+                }
+            }
+        }.start();
+
+        // main thread will be doing registering/deregistering with the sel
+        while (true) {
+            sel.select();
+            if (Boolean.TRUE.equals(succTermination)) {
+                System.out.println("Test passed");
+                sel.close();
+                sc.close();
+                break;
+            } else if (Boolean.FALSE.equals(succTermination)) {
+                System.out.println("Failed to pass the test");
+                sel.close();
+                sc.close();
+                throw new RuntimeException("Failed to pass the test");
+            }
+            synchronized (selectorLock) {
+            }
+            if (sel.selectedKeys().contains(key[0]) && key[0].isWritable()) {
+                synchronized (notifyLock) {
+                    notified = true;
+                    notifyLock.notify();
+                    key[0].cancel();
+                    sel.selectNow();
+                    key2 = accepted2.register(sel, SelectionKey.OP_READ);
+                    key[0] = accepted.register(sel, SelectionKey.OP_READ);
+                }
+            }
+            key2.cancel();
+            sel.selectedKeys().clear();
+        }
+    }
+}

From b1f72f6fd2f26d52977fa1e595a20047a2ad7838 Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Mon, 18 Feb 2013 14:41:58 +0530
Subject: [PATCH 168/311] 8008305: ScriptEngine.eval should offer the ability
 to provide a codebase

Reviewed-by: lagergren, hannesw, attila
---
 .../api/scripting/NashornScriptEngine.java    | 17 +++--
 .../jdk/nashorn/api/scripting/URLReader.java  | 75 +++++++++++++++++++
 nashorn/test/script/trusted/JDK-8008305.js    | 59 +++++++++++++++
 .../script/trusted/JDK-8008305_subtest.js     | 33 ++++++++
 nashorn/test/script/trusted/urlreader.js      | 27 +++++++
 5 files changed, 206 insertions(+), 5 deletions(-)
 create mode 100644 nashorn/src/jdk/nashorn/api/scripting/URLReader.java
 create mode 100644 nashorn/test/script/trusted/JDK-8008305.js
 create mode 100644 nashorn/test/script/trusted/JDK-8008305_subtest.js
 create mode 100644 nashorn/test/script/trusted/urlreader.js

diff --git a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
index fa8c3814302..82a7852b9a7 100644
--- a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
+++ b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
@@ -119,7 +119,12 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
     @Override
     public Object eval(final Reader reader, final ScriptContext ctxt) throws ScriptException {
         try {
-            return evalImpl(Source.readFully(reader), ctxt);
+            if (reader instanceof URLReader) {
+                final URL url = ((URLReader)reader).getURL();
+                return evalImpl(compileImpl(new Source(url.toString(), url), ctxt), ctxt);
+            } else {
+                return evalImpl(Source.readFully(reader), ctxt);
+            }
         } catch (final IOException e) {
             throw new ScriptException(e);
         }
@@ -442,14 +447,16 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
     }
 
     private ScriptFunction compileImpl(final char[] buf, final ScriptContext ctxt) throws ScriptException {
+        final Object val = ctxt.getAttribute(ScriptEngine.FILENAME);
+        final String fileName = (val != null) ? val.toString() : "<eval>";
+        return compileImpl(new Source(fileName, buf), ctxt);
+    }
+
+    private ScriptFunction compileImpl(final Source source, final ScriptContext ctxt) throws ScriptException {
         final ScriptObject oldGlobal = getNashornGlobal();
         final ScriptObject ctxtGlobal = getNashornGlobalFrom(ctxt);
         final boolean globalChanged = (oldGlobal != ctxtGlobal);
         try {
-            final Object val = ctxt.getAttribute(ScriptEngine.FILENAME);
-            final String fileName = (val != null) ? val.toString() : "<eval>";
-
-            final Source source = new Source(fileName, buf);
             if (globalChanged) {
                 setNashornGlobal(ctxtGlobal);
             }
diff --git a/nashorn/src/jdk/nashorn/api/scripting/URLReader.java b/nashorn/src/jdk/nashorn/api/scripting/URLReader.java
new file mode 100644
index 00000000000..0e8dbbbfe6f
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/api/scripting/URLReader.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.api.scripting;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.net.URL;
+
+/**
+ * A Reader that reads from a URL. Used to make sure that the reader
+ * reads content from given URL and can be trusted to do so.
+ */
+public final class URLReader extends Reader {
+    // underlying URL
+    private URL url;
+    // lazily initialized underlying reader for URL
+    private Reader reader;
+
+    public URLReader(final URL url) {
+        this.url = url;
+    }
+
+    @Override
+    public int read(char cbuf[], int off, int len) throws IOException {
+        return getReader().read(cbuf, off, len);
+    }
+
+    @Override
+    public void close() throws IOException {
+        getReader().close();
+    }
+
+    /**
+     * URL of this reader
+     * @return the URL from which this reader reads.
+     */
+    public URL getURL() {
+        return url;
+    }
+
+    // lazily initialize char array reader using URL content
+    private Reader getReader() throws IOException {
+        synchronized (lock) {
+            if (reader == null) {
+                reader = new InputStreamReader(url.openStream());
+            }
+        }
+
+        return reader;
+    }
+}
diff --git a/nashorn/test/script/trusted/JDK-8008305.js b/nashorn/test/script/trusted/JDK-8008305.js
new file mode 100644
index 00000000000..e4d052cbce8
--- /dev/null
+++ b/nashorn/test/script/trusted/JDK-8008305.js
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8008305: ScriptEngine.eval should offer the ability to provide a codebase *
+ * @test
+ * @run
+ */
+
+var URLReader = Java.type("jdk.nashorn.api.scripting.URLReader");
+var File = Java.type("java.io.File");
+var FileReader = Java.type("java.io.FileReader");
+var ScriptEngineManager = Java.type("javax.script.ScriptEngineManager");
+var SecurityException = Java.type("java.lang.SecurityException");
+
+var m = new ScriptEngineManager();
+var e = m.getEngineByName("nashorn");
+
+
+// subtest script file
+var scriptFile = new File(__DIR__ + "JDK-8008305_subtest.js");
+
+// evaluate the subtest via a URLReader
+var res = e.eval(new URLReader(scriptFile.toURI().toURL()));
+
+// subtest should execute with AllPermission and so return absolute path
+if (! res.equals(new File(".").getAbsolutePath())) {
+    fail("eval result is not equal to expected value");
+}
+
+// try same subtest without URLReader and so it runs with null code source
+try {
+    e.eval(new FileReader(scriptFile));
+    fail("Expected SecurityException from script!");
+} catch (e) {
+    if (! (e instanceof SecurityException)) {
+        faile("Expected SecurityException, but got " + e);
+    }
+}
diff --git a/nashorn/test/script/trusted/JDK-8008305_subtest.js b/nashorn/test/script/trusted/JDK-8008305_subtest.js
new file mode 100644
index 00000000000..2485f39d731
--- /dev/null
+++ b/nashorn/test/script/trusted/JDK-8008305_subtest.js
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/**
+ * JDK-8008305: ScriptEngine.eval should offer the ability to provide a codebase *
+ * @subtest
+ */
+
+// If this test runs with sandbox permissions, the following should
+// result in SecurityException or else it should succeed.
+
+new java.io.File(".").getAbsolutePath();
diff --git a/nashorn/test/script/trusted/urlreader.js b/nashorn/test/script/trusted/urlreader.js
new file mode 100644
index 00000000000..a5e06ee5328
--- /dev/null
+++ b/nashorn/test/script/trusted/urlreader.js
@@ -0,0 +1,27 @@
+/**
+ * JDK-8008305: ScriptEngine.eval should offer the ability to provide a codebase
+ *
+ * @test
+ * @run
+ */
+
+var URLReader = Java.type("jdk.nashorn.api.scripting.URLReader");
+var URL = Java.type("java.net.URL");
+var File = Java.type("java.io.File");
+var JString = Java.type("java.lang.String");
+var Source = Java.type("jdk.nashorn.internal.runtime.Source");
+
+var url = new File(__FILE__).toURI().toURL();
+var reader = new URLReader(url);
+
+// check URLReader.getURL() method
+//Assert.assertEquals(url, reader.getURL());
+
+// check URL read
+// read URL content by directly reading from URL
+var str = new Source(url.toString(), url).getString();
+// read URL content via URLReader
+var content = new JString(Source.readFully(reader));
+
+// assert that the content is same
+Assert.assertEquals(str, content);

From 9a4e9fe31e56700ac12b4786c139325d513f8b58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Mon, 18 Feb 2013 10:36:18 +0100
Subject: [PATCH 169/311] 8008351: Avoid using String.replace(String, String)
 in codegen

Reviewed-by: sundar, attila
---
 .../jdk/nashorn/internal/codegen/Condition.java  | 14 --------------
 .../internal/codegen/RuntimeCallSite.java        |  2 +-
 .../src/jdk/nashorn/internal/ir/RuntimeNode.java | 16 ++++++++++++++++
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Condition.java b/nashorn/src/jdk/nashorn/internal/codegen/Condition.java
index f2fb59926c8..80ed029c406 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Condition.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Condition.java
@@ -39,7 +39,6 @@ import static jdk.internal.org.objectweb.asm.Opcodes.IF_ICMPGT;
 import static jdk.internal.org.objectweb.asm.Opcodes.IF_ICMPLE;
 import static jdk.internal.org.objectweb.asm.Opcodes.IF_ICMPLT;
 import static jdk.internal.org.objectweb.asm.Opcodes.IF_ICMPNE;
-import jdk.nashorn.internal.ir.RuntimeNode;
 
 /**
  * Condition enum used for all kinds of jumps, regardless of type
@@ -52,15 +51,6 @@ enum Condition {
     GE,
     GT;
 
-    static Condition forRuntimeRequest(final RuntimeNode.Request request) {
-        try {
-            final String reqString = request.toString().replace("_STRICT", "");
-            return Condition.valueOf(reqString);
-        } catch (final IllegalArgumentException e) {
-            return null;
-        }
-    }
-
     static int toUnary(final Condition c) {
         switch (c) {
         case EQ:
@@ -81,10 +71,6 @@ enum Condition {
         }
     }
 
-    static int toBinary(final Condition c) {
-        return toBinary(c, false);
-    }
-
     static int toBinary(final Condition c, final boolean isObject) {
         switch (c) {
         case EQ:
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/RuntimeCallSite.java b/nashorn/src/jdk/nashorn/internal/codegen/RuntimeCallSite.java
index 96ed8a48a2c..efa8e141590 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/RuntimeCallSite.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/RuntimeCallSite.java
@@ -279,7 +279,7 @@ public final class RuntimeCallSite extends MutableCallSite {
                 // number and boolean are never strictly equal, e.g. 0 !== false
                 mh = MH.dropArguments(MH.constant(boolean.class, request == Request.NE_STRICT), 0, type().parameterArray());
             } else {
-                mh = METHODS.get(request.name().replace("_STRICT", "") + primitiveType.getSimpleName());
+                mh = METHODS.get(request.nonStrictName() + primitiveType.getSimpleName());
                 // unbox objects
 
                 for (int i = 0; i < type().parameterCount(); i++) {
diff --git a/nashorn/src/jdk/nashorn/internal/ir/RuntimeNode.java b/nashorn/src/jdk/nashorn/internal/ir/RuntimeNode.java
index 371ba491107..474da4998e4 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/RuntimeNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/RuntimeNode.java
@@ -144,6 +144,22 @@ public class RuntimeNode extends Node implements TypeOverride {
             return tokenType;
         }
 
+        /**
+         * Get the non-strict name for this request.
+         *
+         * @return the name without _STRICT suffix
+         */
+        public String nonStrictName() {
+            switch(this) {
+            case NE_STRICT:
+                return NE.name();
+            case EQ_STRICT:
+                return EQ.name();
+            default:
+                return name();
+            }
+        }
+
         /**
          * Is this an EQ or EQ_STRICT?
          *

From ccce3fa8036a93df3e8c74434b87daf7400f82ae Mon Sep 17 00:00:00 2001
From: Attila Szegedi <attila@openjdk.org>
Date: Mon, 18 Feb 2013 16:00:15 +0100
Subject: [PATCH 170/311] 8008371: Fix Dynalink compiler warnings and
 whitespace

Reviewed-by: jlaskey, sundar
---
 .../internal/dynalink/CallSiteDescriptor.java |   3 +-
 .../internal/dynalink/ChainedCallSite.java    |   3 +-
 .../dynalink/DefaultBootstrapper.java         |   3 +-
 .../jdk/internal/dynalink/DynamicLinker.java  |  16 +-
 .../dynalink/DynamicLinkerFactory.java        |  11 +-
 .../dynalink/MonomorphicCallSite.java         |   3 +-
 .../NoSuchDynamicMethodException.java         |   2 +-
 .../internal/dynalink/RelinkableCallSite.java |   3 +-
 .../dynalink/beans/AbstractJavaLinker.java    | 139 ++++++++----------
 .../beans/ApplicableOverloadedMethods.java    |   1 -
 .../internal/dynalink/beans/BeanLinker.java   |  47 +++---
 .../internal/dynalink/beans/BeansLinker.java  |   3 +-
 .../beans/CheckRestrictedPackageInternal.java |   6 +-
 .../internal/dynalink/beans/ClassLinker.java  |   3 +-
 .../internal/dynalink/beans/ClassString.java  |   3 +-
 .../dynalink/beans/DynamicMethod.java         |   3 +-
 .../dynalink/beans/DynamicMethodLinker.java   |   3 +-
 .../dynalink/beans/FacetIntrospector.java     |   9 +-
 .../beans/GuardedInvocationComponent.java     |  15 +-
 .../dynalink/beans/MaximallySpecific.java     |   5 +-
 .../beans/OverloadedDynamicMethod.java        |  63 ++++----
 .../dynalink/beans/OverloadedMethod.java      |   3 +-
 .../dynalink/beans/SimpleDynamicMethod.java   |  28 ++--
 .../internal/dynalink/beans/StaticClass.java  |   2 +-
 .../dynalink/beans/StaticClassLinker.java     |   3 +-
 .../dynalink/linker/GuardedInvocation.java    |   3 +-
 .../linker/GuardingDynamicLinker.java         |   2 +-
 .../linker/GuardingTypeConverterFactory.java  |   2 +-
 .../internal/dynalink/linker/LinkRequest.java |   2 +-
 .../dynalink/linker/LinkerServices.java       |   3 +-
 .../support/AbstractCallSiteDescriptor.java   |   1 -
 .../support/AbstractRelinkableCallSite.java   |   3 +-
 .../dynalink/support/AutoDiscovery.java       |   3 +-
 .../support/BottomGuardingDynamicLinker.java  |   2 +-
 .../support/CallSiteDescriptorFactory.java    |   6 +-
 .../CompositeGuardingDynamicLinker.java       |   3 +-
 ...mpositeTypeBasedGuardingDynamicLinker.java |   3 +-
 .../support/DefaultCallSiteDescriptor.java    |   1 -
 .../jdk/internal/dynalink/support/Guards.java |   3 +-
 .../dynalink/support/LinkRequestImpl.java     |   2 +-
 .../dynalink/support/LinkerServicesImpl.java  |   3 +-
 .../jdk/internal/dynalink/support/Lookup.java |   3 +-
 .../support/LookupCallSiteDescriptor.java     |   1 -
 .../support/NamedDynCallSiteDescriptor.java   |   1 -
 .../RuntimeContextLinkRequestImpl.java        |   2 +-
 .../support/TypeConverterFactory.java         |   3 +-
 .../dynalink/support/TypeUtilities.java       |   2 +-
 .../support/UnnamedDynCallSiteDescriptor.java |   1 -
 .../internal/codegen/CompilationPhase.java    |   3 +-
 .../internal/codegen/FunctionSignature.java   |   4 +-
 .../jdk/nashorn/internal/ir/FunctionNode.java |   1 -
 .../internal/objects/ScriptFunctionImpl.java  |   1 -
 .../objects/ScriptFunctionTrampolineImpl.java |   6 +-
 .../jdk/nashorn/internal/parser/Parser.java   |   3 +-
 .../jdk/nashorn/internal/runtime/Context.java |   1 -
 55 files changed, 207 insertions(+), 247 deletions(-)

diff --git a/nashorn/src/jdk/internal/dynalink/CallSiteDescriptor.java b/nashorn/src/jdk/internal/dynalink/CallSiteDescriptor.java
index bb2a09f273c..c2bf93be328 100644
--- a/nashorn/src/jdk/internal/dynalink/CallSiteDescriptor.java
+++ b/nashorn/src/jdk/internal/dynalink/CallSiteDescriptor.java
@@ -87,7 +87,6 @@ import java.lang.invoke.MethodHandles.Lookup;
 import java.lang.invoke.MethodType;
 import jdk.internal.dynalink.support.CallSiteDescriptorFactory;
 
-
 /**
  * An immutable descriptor of a call site. It is an immutable object that contains all the information about a call
  * site: the class performing the lookups, the name of the method being invoked, and the method signature. The library
@@ -172,4 +171,4 @@ public interface CallSiteDescriptor {
      */
     public CallSiteDescriptor changeMethodType(MethodType newMethodType);
 
-}
\ No newline at end of file
+}
diff --git a/nashorn/src/jdk/internal/dynalink/ChainedCallSite.java b/nashorn/src/jdk/internal/dynalink/ChainedCallSite.java
index feb03e28bae..c242fedfbb9 100644
--- a/nashorn/src/jdk/internal/dynalink/ChainedCallSite.java
+++ b/nashorn/src/jdk/internal/dynalink/ChainedCallSite.java
@@ -92,7 +92,6 @@ import java.util.concurrent.atomic.AtomicReference;
 import jdk.internal.dynalink.linker.GuardedInvocation;
 import jdk.internal.dynalink.support.AbstractRelinkableCallSite;
 
-
 /**
  * A relinkable call site that maintains a chain of linked method handles. In the default implementation, up to 8 method
  * handles can be chained, cascading from one to the other through
@@ -209,4 +208,4 @@ public class ChainedCallSite extends AbstractRelinkableCallSite {
             throw new AssertionError(e.getMessage(), e); // Can not happen
         }
     }
-}
\ No newline at end of file
+}
diff --git a/nashorn/src/jdk/internal/dynalink/DefaultBootstrapper.java b/nashorn/src/jdk/internal/dynalink/DefaultBootstrapper.java
index d5be13478ab..c62afe60213 100644
--- a/nashorn/src/jdk/internal/dynalink/DefaultBootstrapper.java
+++ b/nashorn/src/jdk/internal/dynalink/DefaultBootstrapper.java
@@ -88,7 +88,6 @@ import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import jdk.internal.dynalink.support.CallSiteDescriptorFactory;
 
-
 /**
  * A convenience default bootstrapper that exposes static bootstrap methods which language runtimes that need the very
  * default behavior can use with minimal setup. When first referenced, it will create a dynamic linker with default
@@ -141,4 +140,4 @@ public class DefaultBootstrapper {
     private static CallSite bootstrapInternal(MethodHandles.Lookup caller, String name, MethodType type) {
         return dynamicLinker.link(new MonomorphicCallSite(CallSiteDescriptorFactory.create(caller, name, type)));
     }
-}
\ No newline at end of file
+}
diff --git a/nashorn/src/jdk/internal/dynalink/DynamicLinker.java b/nashorn/src/jdk/internal/dynalink/DynamicLinker.java
index ccdfa4fb9e2..c0930dae790 100644
--- a/nashorn/src/jdk/internal/dynalink/DynamicLinker.java
+++ b/nashorn/src/jdk/internal/dynalink/DynamicLinker.java
@@ -97,7 +97,6 @@ import jdk.internal.dynalink.support.LinkRequestImpl;
 import jdk.internal.dynalink.support.Lookup;
 import jdk.internal.dynalink.support.RuntimeContextLinkRequestImpl;
 
-
 /**
  * The linker for {@link RelinkableCallSite} objects. Users of it (scripting frameworks and language runtimes) have to
  * create a linker using the {@link DynamicLinkerFactory} and invoke its link method from the invokedynamic bootstrap
@@ -246,14 +245,15 @@ public class DynamicLinker {
             }
         }
 
-        if(unstableDetectionEnabled && relinkCount <= unstableRelinkThreshold && relinkCount++ == unstableRelinkThreshold) {
-            // Note that we'll increase the relinkCount until threshold+1 and not increase it beyond that. Threshold+1
-            // is treated as a special value to signal that resetAndRelink has already executed once for the unstable
-            // call site; we only want the call site to throw away its current linkage once, when it transitions to
-            // unstable.
-            callSite.resetAndRelink(guardedInvocation, createRelinkAndInvokeMethod(callSite, relinkCount));
+        int newRelinkCount = relinkCount;
+        // Note that the short-circuited "&&" evaluation below ensures we'll increment the relinkCount until
+        // threshold + 1 but not beyond that. Threshold + 1 is treated as a special value to signal that resetAndRelink
+        // has already executed once for the unstable call site; we only want the call site to throw away its current
+        // linkage once, when it transitions to unstable.
+        if(unstableDetectionEnabled && newRelinkCount <= unstableRelinkThreshold && newRelinkCount++ == unstableRelinkThreshold) {
+            callSite.resetAndRelink(guardedInvocation, createRelinkAndInvokeMethod(callSite, newRelinkCount));
         } else {
-            callSite.relink(guardedInvocation, createRelinkAndInvokeMethod(callSite, relinkCount));
+            callSite.relink(guardedInvocation, createRelinkAndInvokeMethod(callSite, newRelinkCount));
         }
         if(syncOnRelink) {
             MutableCallSite.syncAll(new MutableCallSite[] { (MutableCallSite)callSite });
diff --git a/nashorn/src/jdk/internal/dynalink/DynamicLinkerFactory.java b/nashorn/src/jdk/internal/dynalink/DynamicLinkerFactory.java
index 49e821ef489..0f0a347be5a 100644
--- a/nashorn/src/jdk/internal/dynalink/DynamicLinkerFactory.java
+++ b/nashorn/src/jdk/internal/dynalink/DynamicLinkerFactory.java
@@ -102,7 +102,6 @@ import jdk.internal.dynalink.support.CompositeTypeBasedGuardingDynamicLinker;
 import jdk.internal.dynalink.support.LinkerServicesImpl;
 import jdk.internal.dynalink.support.TypeConverterFactory;
 
-
 /**
  * A factory class for creating {@link DynamicLinker}s. The most usual dynamic linker is a linker that is a composition
  * of all {@link GuardingDynamicLinker}s known and pre-created by the caller as well as any
@@ -256,14 +255,16 @@ public class DynamicLinkerFactory {
 
         // Gather classes of all precreated (prioritized and fallback) linkers.
         // We'll filter out any discovered linkers of the same class.
-        final Set<Class<? extends GuardingDynamicLinker>> knownLinkerClasses = new HashSet<>();
+        final Set<Class<? extends GuardingDynamicLinker>> knownLinkerClasses =
+                new HashSet<>();
         addClasses(knownLinkerClasses, prioritizedLinkers);
         addClasses(knownLinkerClasses, fallbackLinkers);
 
         final List<GuardingDynamicLinker> discovered = AutoDiscovery.loadLinkers(classLoader);
         // Now, concatenate ...
-        final List<GuardingDynamicLinker> linkers = new ArrayList<>(prioritizedLinkers.size() + discovered.size()
-                + fallbackLinkers.size());
+        final List<GuardingDynamicLinker> linkers =
+                new ArrayList<>(prioritizedLinkers.size() + discovered.size()
+                        + fallbackLinkers.size());
         // ... prioritized linkers, ...
         linkers.addAll(prioritizedLinkers);
         // ... filtered discovered linkers, ...
@@ -308,4 +309,4 @@ public class DynamicLinkerFactory {
             knownLinkerClasses.add(linker.getClass());
         }
     }
-}
\ No newline at end of file
+}
diff --git a/nashorn/src/jdk/internal/dynalink/MonomorphicCallSite.java b/nashorn/src/jdk/internal/dynalink/MonomorphicCallSite.java
index 96784f0ec43..7f1bbedebaf 100644
--- a/nashorn/src/jdk/internal/dynalink/MonomorphicCallSite.java
+++ b/nashorn/src/jdk/internal/dynalink/MonomorphicCallSite.java
@@ -87,7 +87,6 @@ import java.lang.invoke.MethodHandle;
 import jdk.internal.dynalink.linker.GuardedInvocation;
 import jdk.internal.dynalink.support.AbstractRelinkableCallSite;
 
-
 /**
  * A relinkable call site that implements monomorphic inline caching strategy. After it linked a method, it will keep it
  * until either its guard evaluates to false, or its switchpoint is invalidated, at which time it will throw away the
@@ -113,4 +112,4 @@ public class MonomorphicCallSite extends AbstractRelinkableCallSite {
     public void resetAndRelink(GuardedInvocation guardedInvocation, MethodHandle relink) {
         relink(guardedInvocation, relink);
     }
-}
\ No newline at end of file
+}
diff --git a/nashorn/src/jdk/internal/dynalink/NoSuchDynamicMethodException.java b/nashorn/src/jdk/internal/dynalink/NoSuchDynamicMethodException.java
index af956037890..8a73af922ea 100644
--- a/nashorn/src/jdk/internal/dynalink/NoSuchDynamicMethodException.java
+++ b/nashorn/src/jdk/internal/dynalink/NoSuchDynamicMethodException.java
@@ -100,4 +100,4 @@ public class NoSuchDynamicMethodException extends RuntimeException {
     public NoSuchDynamicMethodException(String message) {
         super(message);
     }
-}
\ No newline at end of file
+}
diff --git a/nashorn/src/jdk/internal/dynalink/RelinkableCallSite.java b/nashorn/src/jdk/internal/dynalink/RelinkableCallSite.java
index f9407cb0b3f..4b680459229 100644
--- a/nashorn/src/jdk/internal/dynalink/RelinkableCallSite.java
+++ b/nashorn/src/jdk/internal/dynalink/RelinkableCallSite.java
@@ -89,7 +89,6 @@ import java.lang.invoke.MutableCallSite;
 import java.lang.invoke.VolatileCallSite;
 import jdk.internal.dynalink.linker.GuardedInvocation;
 
-
 /**
  * Interface for relinkable call sites. Language runtimes wishing to use this framework must use subclasses of
  * {@link CallSite} that also implement this interface as their call sites. There is a readily usable
@@ -145,4 +144,4 @@ public interface RelinkableCallSite {
      * {@link #resetAndRelink(GuardedInvocation, MethodHandle)}, and finally invoke the target.
      */
     public void resetAndRelink(GuardedInvocation guardedInvocation, MethodHandle fallback);
-}
\ No newline at end of file
+}
diff --git a/nashorn/src/jdk/internal/dynalink/beans/AbstractJavaLinker.java b/nashorn/src/jdk/internal/dynalink/beans/AbstractJavaLinker.java
index d9e1cecd283..8fc76f049af 100644
--- a/nashorn/src/jdk/internal/dynalink/beans/AbstractJavaLinker.java
+++ b/nashorn/src/jdk/internal/dynalink/beans/AbstractJavaLinker.java
@@ -103,7 +103,6 @@ import jdk.internal.dynalink.support.CallSiteDescriptorFactory;
 import jdk.internal.dynalink.support.Guards;
 import jdk.internal.dynalink.support.Lookup;
 
-
 /**
  * A base class for both {@link StaticClassLinker} and {@link BeanLinker}. Deals with common aspects of property
  * exposure and method calls for both static and instance facets of a class.
@@ -128,50 +127,46 @@ abstract class AbstractJavaLinker implements GuardingDynamicLinker {
         this.assignableGuard = assignableGuard;
 
         final FacetIntrospector introspector = createFacetIntrospector();
-        try {
-            // Add methods and properties
-            for(Method method: introspector.getMethods()) {
-                final String name = method.getName();
-                final MethodHandle methodHandle = introspector.unreflect(method);
-                // Add method
-                addMember(name, methodHandle, methods);
-                // Add the method as a property getter and/or setter
-                if(name.startsWith("get") && name.length() > 3 && method.getParameterTypes().length == 0) {
-                    // Property getter
-                    setPropertyGetter(Introspector.decapitalize(name.substring(3)), introspector.unreflect(
-                            getMostGenericGetter(method)), ValidationType.INSTANCE_OF);
-                } else if(name.startsWith("is") && name.length() > 2 && method.getParameterTypes().length == 0 &&
-                        method.getReturnType() == boolean.class) {
-                    // Boolean property getter
-                    setPropertyGetter(Introspector.decapitalize(name.substring(2)), introspector.unreflect(
-                            getMostGenericGetter(method)), ValidationType.INSTANCE_OF);
-                } else if(name.startsWith("set") && name.length() > 3 && method.getParameterTypes().length == 1) {
-                    // Property setter
-                    addMember(Introspector.decapitalize(name.substring(3)), methodHandle, propertySetters);
-                }
+        // Add methods and properties
+        for(Method method: introspector.getMethods()) {
+            final String name = method.getName();
+            final MethodHandle methodHandle = introspector.unreflect(method);
+            // Add method
+            addMember(name, methodHandle, methods);
+            // Add the method as a property getter and/or setter
+            if(name.startsWith("get") && name.length() > 3 && method.getParameterTypes().length == 0) {
+                // Property getter
+                setPropertyGetter(Introspector.decapitalize(name.substring(3)), introspector.unreflect(
+                        getMostGenericGetter(method)), ValidationType.INSTANCE_OF);
+            } else if(name.startsWith("is") && name.length() > 2 && method.getParameterTypes().length == 0 &&
+                    method.getReturnType() == boolean.class) {
+                // Boolean property getter
+                setPropertyGetter(Introspector.decapitalize(name.substring(2)), introspector.unreflect(
+                        getMostGenericGetter(method)), ValidationType.INSTANCE_OF);
+            } else if(name.startsWith("set") && name.length() > 3 && method.getParameterTypes().length == 1) {
+                // Property setter
+                addMember(Introspector.decapitalize(name.substring(3)), methodHandle, propertySetters);
             }
+        }
 
-            // Add field getter/setters as property getters/setters.
-            for(Field field: introspector.getFields()) {
-                final String name = field.getName();
-                // Only add a property getter when one is not defined already as a getXxx()/isXxx() method.
-                if(!propertyGetters.containsKey(name)) {
-                    setPropertyGetter(name, introspector.unreflectGetter(field), ValidationType.EXACT_CLASS);
-                }
-                if(!(Modifier.isFinal(field.getModifiers()) || propertySetters.containsKey(name))) {
-                    addMember(name, introspector.unreflectSetter(field), propertySetters);
-                }
+        // Add field getter/setters as property getters/setters.
+        for(Field field: introspector.getFields()) {
+            final String name = field.getName();
+            // Only add a property getter when one is not defined already as a getXxx()/isXxx() method.
+            if(!propertyGetters.containsKey(name)) {
+                setPropertyGetter(name, introspector.unreflectGetter(field), ValidationType.EXACT_CLASS);
             }
+            if(!(Modifier.isFinal(field.getModifiers()) || propertySetters.containsKey(name))) {
+                addMember(name, introspector.unreflectSetter(field), propertySetters);
+            }
+        }
 
-            // Add inner classes, but only those for which we don't hide a property with it
-            for(Map.Entry<String, MethodHandle> innerClassSpec: introspector.getInnerClassGetters().entrySet()) {
-                final String name = innerClassSpec.getKey();
-                if(!propertyGetters.containsKey(name)) {
-                    setPropertyGetter(name, innerClassSpec.getValue(), ValidationType.EXACT_CLASS);
-                }
+        // Add inner classes, but only those for which we don't hide a property with it
+        for(Map.Entry<String, MethodHandle> innerClassSpec: introspector.getInnerClassGetters().entrySet()) {
+            final String name = innerClassSpec.getKey();
+            if(!propertyGetters.containsKey(name)) {
+                setPropertyGetter(name, innerClassSpec.getValue(), ValidationType.EXACT_CLASS);
             }
-        } finally {
-            introspector.close();
         }
     }
 
@@ -394,10 +389,8 @@ abstract class AbstractJavaLinker implements GuardingDynamicLinker {
                             IS_METHOD_HANDLE_NOT_NULL, invokeHandleFolded, fallbackFolded), typedGetter);
                 if(nextComponent == null) {
                     return getClassGuardedInvocationComponent(compositeSetter, type);
-                } else {
-                    return nextComponent.compose(compositeSetter, getClassGuard(type), clazz,
-                            ValidationType.EXACT_CLASS);
                 }
+                return nextComponent.compose(compositeSetter, getClassGuard(type), clazz, ValidationType.EXACT_CLASS);
             }
             case 3: {
                 // Must have two arguments: target object and property value
@@ -474,10 +467,8 @@ abstract class AbstractJavaLinker implements GuardingDynamicLinker {
                             IS_ANNOTATED_HANDLE_NOT_NULL, invokeHandleFolded, fallbackFolded), typedGetter);
                 if(nextComponent == null) {
                     return getClassGuardedInvocationComponent(compositeGetter, type);
-                } else {
-                    return nextComponent.compose(compositeGetter, getClassGuard(type), clazz,
-                            ValidationType.EXACT_CLASS);
                 }
+                return nextComponent.compose(compositeGetter, getClassGuard(type), clazz, ValidationType.EXACT_CLASS);
             }
             case 3: {
                 // Must have exactly one argument: receiver
@@ -521,8 +512,10 @@ abstract class AbstractJavaLinker implements GuardingDynamicLinker {
             case NONE: {
                 return null;
             }
+            default: {
+                throw new AssertionError();
+            }
         }
-        throw new AssertionError();
     }
 
     private static final MethodHandle IS_DYNAMIC_METHOD_NOT_NULL = Guards.asType(Guards.isNotNull(),
@@ -541,32 +534,30 @@ abstract class AbstractJavaLinker implements GuardingDynamicLinker {
                 if(nextComponent == null) {
                     // No next component operation; just return a component for this operation.
                     return getClassGuardedInvocationComponent(linkerServices.asType(getDynamicMethod, type), type);
-                } else {
-                    // What's below is basically:
-                    //   foldArguments(guardWithTest(isNotNull, identity, nextComponent.invocation), getter)
-                    // only with a bunch of method signature adjustments. Basically, execute method getter; if
-                    // it returns a non-null DynamicMethod, use identity to return it, otherwise delegate to
-                    // nextComponent's invocation.
-
-                    final MethodHandle typedGetter = linkerServices.asType(getDynamicMethod, type.changeReturnType(
-                            DynamicMethod.class));
-                    // Since it is part of the foldArgument() target, it will have extra args that we need to drop.
-                    final MethodHandle returnMethodHandle = linkerServices.asType(MethodHandles.dropArguments(
-                            DYNAMIC_METHOD_IDENTITY, 1, type.parameterList()), type.insertParameterTypes(0,
-                                    DynamicMethod.class));
-                    final MethodHandle nextComponentInvocation = nextComponent.getGuardedInvocation().getInvocation();
-                    // The assumption is that getGuardedInvocationComponent() already asType()'d it correctly
-                    assert nextComponentInvocation.type().equals(type);
-                    // Since it is part of the foldArgument() target, we have to drop an extra arg it receives.
-                    final MethodHandle nextCombinedInvocation = MethodHandles.dropArguments(nextComponentInvocation, 0,
-                            DynamicMethod.class);
-                    // Assemble it all into a fold(guard(isNotNull, identity, nextInvocation), get)
-                    final MethodHandle compositeGetter = MethodHandles.foldArguments(MethodHandles.guardWithTest(
-                            IS_DYNAMIC_METHOD_NOT_NULL, returnMethodHandle, nextCombinedInvocation), typedGetter);
-
-                    return nextComponent.compose(compositeGetter, getClassGuard(type), clazz,
-                            ValidationType.EXACT_CLASS);
                 }
+
+                // What's below is basically:
+                // foldArguments(guardWithTest(isNotNull, identity, nextComponent.invocation), getter) only with a
+                // bunch of method signature adjustments. Basically, execute method getter; if it returns a non-null
+                // DynamicMethod, use identity to return it, otherwise delegate to nextComponent's invocation.
+
+                final MethodHandle typedGetter = linkerServices.asType(getDynamicMethod, type.changeReturnType(
+                        DynamicMethod.class));
+                // Since it is part of the foldArgument() target, it will have extra args that we need to drop.
+                final MethodHandle returnMethodHandle = linkerServices.asType(MethodHandles.dropArguments(
+                        DYNAMIC_METHOD_IDENTITY, 1, type.parameterList()), type.insertParameterTypes(0,
+                                DynamicMethod.class));
+                final MethodHandle nextComponentInvocation = nextComponent.getGuardedInvocation().getInvocation();
+                // The assumption is that getGuardedInvocationComponent() already asType()'d it correctly
+                assert nextComponentInvocation.type().equals(type);
+                // Since it is part of the foldArgument() target, we have to drop an extra arg it receives.
+                final MethodHandle nextCombinedInvocation = MethodHandles.dropArguments(nextComponentInvocation, 0,
+                        DynamicMethod.class);
+                // Assemble it all into a fold(guard(isNotNull, identity, nextInvocation), get)
+                final MethodHandle compositeGetter = MethodHandles.foldArguments(MethodHandles.guardWithTest(
+                        IS_DYNAMIC_METHOD_NOT_NULL, returnMethodHandle, nextCombinedInvocation), typedGetter);
+
+                return nextComponent.compose(compositeGetter, getClassGuard(type), clazz, ValidationType.EXACT_CLASS);
             }
             case 3: {
                 // Must have exactly one argument: receiver
@@ -638,7 +629,7 @@ abstract class AbstractJavaLinker implements GuardingDynamicLinker {
      * @return the dynamic method (either {@link SimpleDynamicMethod} or {@link OverloadedDynamicMethod}, or null if the
      * method with the specified name does not exist.
      */
-    public DynamicMethod getDynamicMethod(String name) {
+    DynamicMethod getDynamicMethod(String name) {
         return getDynamicMethod(name, methods);
     }
 
@@ -687,4 +678,4 @@ abstract class AbstractJavaLinker implements GuardingDynamicLinker {
             this.validationType = validationType;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/nashorn/src/jdk/internal/dynalink/beans/ApplicableOverloadedMethods.java b/nashorn/src/jdk/internal/dynalink/beans/ApplicableOverloadedMethods.java
index 7f860dfe807..a232caf137a 100644
--- a/nashorn/src/jdk/internal/dynalink/beans/ApplicableOverloadedMethods.java
+++ b/nashorn/src/jdk/internal/dynalink/beans/ApplicableOverloadedMethods.java
@@ -89,7 +89,6 @@ import java.util.LinkedList;
 import java.util.List;
 import jdk.internal.dynalink.support.TypeUtilities;
 
-
 /**
  * Represents overloaded methods applicable to a specific call site signature.
  *
diff --git a/nashorn/src/jdk/internal/dynalink/beans/BeanLinker.java b/nashorn/src/jdk/internal/dynalink/beans/BeanLinker.java
index 14c3a68bbe7..519036b37cc 100644
--- a/nashorn/src/jdk/internal/dynalink/beans/BeanLinker.java
+++ b/nashorn/src/jdk/internal/dynalink/beans/BeanLinker.java
@@ -99,7 +99,6 @@ import jdk.internal.dynalink.support.Guards;
 import jdk.internal.dynalink.support.Lookup;
 import jdk.internal.dynalink.support.TypeUtilities;
 
-
 /**
  * A class that provides linking capabilities for a single POJO class. Normally not used directly, but managed by
  * {@link BeansLinker}.
@@ -176,7 +175,7 @@ class BeanLinker extends AbstractJavaLinker implements TypeBasedGuardingDynamicL
         // dealing with an array, or a list or map, but hey...
         // Note that for arrays and lists, using LinkerServices.asType() will ensure that any language specific linkers
         // in use will get a chance to perform any (if there's any) implicit conversion to integer for the indices.
-        final GuardedInvocationComponent gic;;
+        final GuardedInvocationComponent gic;
         final boolean isMap;
         if(declaredType.isArray()) {
             gic = new GuardedInvocationComponent(MethodHandles.arrayElementGetter(declaredType));
@@ -223,22 +222,22 @@ class BeanLinker extends AbstractJavaLinker implements TypeBasedGuardingDynamicL
 
         if(nextComponent == null) {
             return gic.replaceInvocation(binder.bind(invocation));
-        } else {
-            final MethodHandle checkGuard;
-            if(invocation == GET_LIST_ELEMENT) {
-                checkGuard = convertArgToInt(RANGE_CHECK_LIST, linkerServices, callSiteDescriptor);
-            } else if(invocation == GET_MAP_ELEMENT) {
-                // TODO: A more complex solution could be devised for maps, one where we do a get() first, and fold it
-                // into a GWT that tests if it returned null, and if it did, do another GWT with containsKey()
-                // that returns constant null (on true), or falls back to next component (on false)
-                checkGuard = CONTAINS_MAP;
-            } else {
-                checkGuard = convertArgToInt(RANGE_CHECK_ARRAY, linkerServices, callSiteDescriptor);
-            }
-            return nextComponent.compose(MethodHandles.guardWithTest(binder.bindTest(checkGuard),
-                    binder.bind(invocation), nextComponent.getGuardedInvocation().getInvocation()), gi.getGuard(),
-                    gic.getValidatorClass(), gic.getValidationType());
         }
+
+        final MethodHandle checkGuard;
+        if(invocation == GET_LIST_ELEMENT) {
+            checkGuard = convertArgToInt(RANGE_CHECK_LIST, linkerServices, callSiteDescriptor);
+        } else if(invocation == GET_MAP_ELEMENT) {
+            // TODO: A more complex solution could be devised for maps, one where we do a get() first, and fold it
+            // into a GWT that tests if it returned null, and if it did, do another GWT with containsKey()
+            // that returns constant null (on true), or falls back to next component (on false)
+            checkGuard = CONTAINS_MAP;
+        } else {
+            checkGuard = convertArgToInt(RANGE_CHECK_ARRAY, linkerServices, callSiteDescriptor);
+        }
+        return nextComponent.compose(MethodHandles.guardWithTest(binder.bindTest(checkGuard),
+                binder.bind(invocation), nextComponent.getGuardedInvocation().getInvocation()), gi.getGuard(),
+                gic.getValidatorClass(), gic.getValidationType());
     }
 
     private static String getFixedKey(final CallSiteDescriptor callSiteDescriptor) {
@@ -435,13 +434,13 @@ class BeanLinker extends AbstractJavaLinker implements TypeBasedGuardingDynamicL
 
         if(nextComponent == null) {
             return gic.replaceInvocation(binder.bind(invocation));
-        } else {
-            final MethodHandle checkGuard = convertArgToInt(invocation == SET_LIST_ELEMENT ? RANGE_CHECK_LIST :
-                RANGE_CHECK_ARRAY, linkerServices, callSiteDescriptor);
-            return nextComponent.compose(MethodHandles.guardWithTest(binder.bindTest(checkGuard),
-                    binder.bind(invocation), nextComponent.getGuardedInvocation().getInvocation()), gi.getGuard(),
-                    gic.getValidatorClass(), gic.getValidationType());
         }
+
+        final MethodHandle checkGuard = convertArgToInt(invocation == SET_LIST_ELEMENT ? RANGE_CHECK_LIST :
+            RANGE_CHECK_ARRAY, linkerServices, callSiteDescriptor);
+        return nextComponent.compose(MethodHandles.guardWithTest(binder.bindTest(checkGuard),
+                binder.bind(invocation), nextComponent.getGuardedInvocation().getInvocation()), gi.getGuard(),
+                gic.getValidatorClass(), gic.getValidationType());
     }
 
     private static MethodHandle GET_ARRAY_LENGTH = Lookup.PUBLIC.findStatic(Array.class, "getLength",
@@ -490,4 +489,4 @@ class BeanLinker extends AbstractJavaLinker implements TypeBasedGuardingDynamicL
             throw new BootstrapMethodError(descriptor.getName() + " must have exactly " + paramCount + " parameters.");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/nashorn/src/jdk/internal/dynalink/beans/BeansLinker.java b/nashorn/src/jdk/internal/dynalink/beans/BeansLinker.java
index b372a7f26a0..8fa0d2105e6 100644
--- a/nashorn/src/jdk/internal/dynalink/beans/BeansLinker.java
+++ b/nashorn/src/jdk/internal/dynalink/beans/BeansLinker.java
@@ -93,7 +93,6 @@ import jdk.internal.dynalink.linker.LinkRequest;
 import jdk.internal.dynalink.linker.LinkerServices;
 import jdk.internal.dynalink.linker.TypeBasedGuardingDynamicLinker;
 
-
 /**
  * A linker for POJOs. Normally used as the ultimate fallback linker by the {@link DynamicLinkerFactory} so it is given
  * the chance to link calls to all objects that no other language runtime recognizes. Specifically, this linker will:
@@ -177,4 +176,4 @@ public class BeansLinker implements GuardingDynamicLinker {
         }
         return getLinkerForClass(receiver.getClass()).getGuardedInvocation(request, linkerServices);
     }
-}
\ No newline at end of file
+}
diff --git a/nashorn/src/jdk/internal/dynalink/beans/CheckRestrictedPackageInternal.java b/nashorn/src/jdk/internal/dynalink/beans/CheckRestrictedPackageInternal.java
index c7401c9febc..2ab6cfc404e 100644
--- a/nashorn/src/jdk/internal/dynalink/beans/CheckRestrictedPackageInternal.java
+++ b/nashorn/src/jdk/internal/dynalink/beans/CheckRestrictedPackageInternal.java
@@ -222,14 +222,14 @@ class CheckRestrictedPackageInternal {
                         resolveClass(clazz);
                     }
                     return clazz;
-                } else {
-                    return super.loadClass(name, resolve);
                 }
+
+                return super.loadClass(name, resolve);
             }
         };
     }
 
-    private static byte[] getTesterClassBytes() {
+    static byte[] getTesterClassBytes() {
         try {
             final InputStream in = CheckRestrictedPackage.class.getResourceAsStream("RestrictedPackageTester.class");
             try {
diff --git a/nashorn/src/jdk/internal/dynalink/beans/ClassLinker.java b/nashorn/src/jdk/internal/dynalink/beans/ClassLinker.java
index 6b7f17deaae..15c9e18d891 100644
--- a/nashorn/src/jdk/internal/dynalink/beans/ClassLinker.java
+++ b/nashorn/src/jdk/internal/dynalink/beans/ClassLinker.java
@@ -89,7 +89,6 @@ import java.lang.invoke.MethodType;
 import jdk.internal.dynalink.beans.GuardedInvocationComponent.ValidationType;
 import jdk.internal.dynalink.support.Lookup;
 
-
 /**
  * A linker for java.lang.Class objects. Provides a synthetic property "static" that allows access to static fields and
  * methods on the class (respecting property getter/setter conventions). Note that Class objects are not recognized by
@@ -107,4 +106,4 @@ class ClassLinker extends BeanLinker {
     private static final MethodHandle FOR_CLASS = new Lookup(MethodHandles.lookup()).findStatic(StaticClass.class,
             "forClass", MethodType.methodType(StaticClass.class, Class.class));
 
-}
\ No newline at end of file
+}
diff --git a/nashorn/src/jdk/internal/dynalink/beans/ClassString.java b/nashorn/src/jdk/internal/dynalink/beans/ClassString.java
index 9fd3b1eba8f..d6c6da08933 100644
--- a/nashorn/src/jdk/internal/dynalink/beans/ClassString.java
+++ b/nashorn/src/jdk/internal/dynalink/beans/ClassString.java
@@ -91,7 +91,6 @@ import jdk.internal.dynalink.linker.LinkerServices;
 import jdk.internal.dynalink.support.Guards;
 import jdk.internal.dynalink.support.TypeUtilities;
 
-
 /**
  *
  * @author Attila Szegedi
@@ -206,4 +205,4 @@ final class ClassString {
     private static boolean canConvert(LinkerServices ls, Class<?> from, Class<?> to) {
         return ls == null ? TypeUtilities.isMethodInvocationConvertible(from, to) : ls.canConvert(from, to);
     }
-}
\ No newline at end of file
+}
diff --git a/nashorn/src/jdk/internal/dynalink/beans/DynamicMethod.java b/nashorn/src/jdk/internal/dynalink/beans/DynamicMethod.java
index a4edeeef800..aee69ff722e 100644
--- a/nashorn/src/jdk/internal/dynalink/beans/DynamicMethod.java
+++ b/nashorn/src/jdk/internal/dynalink/beans/DynamicMethod.java
@@ -88,7 +88,6 @@ import java.lang.invoke.MethodType;
 import java.util.StringTokenizer;
 import jdk.internal.dynalink.linker.LinkerServices;
 
-
 /**
  * Represents a single dynamic method. A "dynamic" method can be bound to a single Java method, or can be bound to all
  * overloaded methods of the same name on a class. Getting an invocation of a dynamic method bound to multiple
@@ -166,4 +165,4 @@ abstract class DynamicMethod {
     public String toString() {
         return "[" + getClass().getName() + " " + getName() + "]";
     }
-}
\ No newline at end of file
+}
diff --git a/nashorn/src/jdk/internal/dynalink/beans/DynamicMethodLinker.java b/nashorn/src/jdk/internal/dynalink/beans/DynamicMethodLinker.java
index d1994553c89..d8ceeea0045 100644
--- a/nashorn/src/jdk/internal/dynalink/beans/DynamicMethodLinker.java
+++ b/nashorn/src/jdk/internal/dynalink/beans/DynamicMethodLinker.java
@@ -93,7 +93,6 @@ import jdk.internal.dynalink.linker.LinkerServices;
 import jdk.internal.dynalink.linker.TypeBasedGuardingDynamicLinker;
 import jdk.internal.dynalink.support.Guards;
 
-
 /**
  * Simple linker that implements the "dyn:call" operation for {@link DynamicMethod} objects - the objects returned by
  * "dyn:getMethod" from {@link AbstractJavaLinker}.
@@ -102,7 +101,7 @@ class DynamicMethodLinker implements TypeBasedGuardingDynamicLinker {
     @Override
     public boolean canLinkType(Class<?> type) {
         return DynamicMethod.class.isAssignableFrom(type);
-    };
+    }
 
     @Override
     public GuardedInvocation getGuardedInvocation(LinkRequest linkRequest, LinkerServices linkerServices) {
diff --git a/nashorn/src/jdk/internal/dynalink/beans/FacetIntrospector.java b/nashorn/src/jdk/internal/dynalink/beans/FacetIntrospector.java
index 2002c4da552..c1480fc5a3c 100644
--- a/nashorn/src/jdk/internal/dynalink/beans/FacetIntrospector.java
+++ b/nashorn/src/jdk/internal/dynalink/beans/FacetIntrospector.java
@@ -94,13 +94,12 @@ import java.util.Collections;
 import java.util.Map;
 import jdk.internal.dynalink.support.Lookup;
 
-
 /**
  * Base for classes that expose class field and method information to an {@link AbstractJavaLinker}. There are
  * subclasses for instance (bean) and static facet of a class.
  * @author Attila Szegedi
  */
-abstract class FacetIntrospector implements AutoCloseable {
+abstract class FacetIntrospector {
     private final Class<?> clazz;
     private final boolean instance;
     private final boolean isRestricted;
@@ -181,8 +180,4 @@ abstract class FacetIntrospector implements AutoCloseable {
      * @return the edited method handle.
      */
     abstract MethodHandle editMethodHandle(MethodHandle mh);
-
-    @Override
-    public void close() {
-    }
-}
\ No newline at end of file
+}
diff --git a/nashorn/src/jdk/internal/dynalink/beans/GuardedInvocationComponent.java b/nashorn/src/jdk/internal/dynalink/beans/GuardedInvocationComponent.java
index 11d5929b45d..f2c76dba828 100644
--- a/nashorn/src/jdk/internal/dynalink/beans/GuardedInvocationComponent.java
+++ b/nashorn/src/jdk/internal/dynalink/beans/GuardedInvocationComponent.java
@@ -86,7 +86,6 @@ package jdk.internal.dynalink.beans;
 import java.lang.invoke.MethodHandle;
 import jdk.internal.dynalink.linker.GuardedInvocation;
 
-
 /**
  * Represents one component for a GuardedInvocation of a potentially composite operation of an
  * {@link AbstractJavaLinker}. In addition to holding a guarded invocation, it holds semantic information about its
@@ -196,8 +195,8 @@ class GuardedInvocationComponent {
                                 return this;
                             }
                             break;
-                        case NONE:
-                            throw new AssertionError(); // Not possible
+                        default:
+                            throw new AssertionError();
                     }
                     break;
                 case EXACT_CLASS:
@@ -217,8 +216,8 @@ class GuardedInvocationComponent {
                                 return this;
                             }
                             break;
-                        case NONE:
-                            throw new AssertionError(); // Not possible
+                        default:
+                            throw new AssertionError();
                     }
                     break;
                 case IS_ARRAY:
@@ -231,10 +230,12 @@ class GuardedInvocationComponent {
                             break;
                         case IS_ARRAY:
                             return this;
-                        case NONE:
-                            throw new AssertionError(); // Not possible
+                        default:
+                            throw new AssertionError();
                     }
                     break;
+                default:
+                    throw new AssertionError();
             }
             throw new AssertionError("Incompatible composition " + this + " vs " + other);
         }
diff --git a/nashorn/src/jdk/internal/dynalink/beans/MaximallySpecific.java b/nashorn/src/jdk/internal/dynalink/beans/MaximallySpecific.java
index 9366abdc0db..182fd01695d 100644
--- a/nashorn/src/jdk/internal/dynalink/beans/MaximallySpecific.java
+++ b/nashorn/src/jdk/internal/dynalink/beans/MaximallySpecific.java
@@ -92,7 +92,6 @@ import jdk.internal.dynalink.linker.ConversionComparator.Comparison;
 import jdk.internal.dynalink.linker.LinkerServices;
 import jdk.internal.dynalink.support.TypeUtilities;
 
-
 /**
  * Utility class that encapsulates the algorithm for choosing the maximally specific methods.
  *
@@ -141,6 +140,10 @@ class MaximallySpecific {
                     }
                     case INDETERMINATE: {
                         // do nothing
+                        break;
+                    }
+                    default: {
+                        throw new AssertionError();
                     }
                 }
             }
diff --git a/nashorn/src/jdk/internal/dynalink/beans/OverloadedDynamicMethod.java b/nashorn/src/jdk/internal/dynalink/beans/OverloadedDynamicMethod.java
index a3bb21ddbf1..7873cf1520e 100644
--- a/nashorn/src/jdk/internal/dynalink/beans/OverloadedDynamicMethod.java
+++ b/nashorn/src/jdk/internal/dynalink/beans/OverloadedDynamicMethod.java
@@ -92,7 +92,6 @@ import jdk.internal.dynalink.beans.ApplicableOverloadedMethods.ApplicabilityTest
 import jdk.internal.dynalink.linker.LinkerServices;
 import jdk.internal.dynalink.support.TypeUtilities;
 
-
 /**
  * Represents an overloaded method.
  *
@@ -204,14 +203,16 @@ class OverloadedDynamicMethod extends DynamicMethod {
                 final MethodHandle mh = invokables.iterator().next();
                 return new SimpleDynamicMethod(mh).getInvocation(callSiteType, linkerServices);
             }
+            default: {
+                // We have more than one candidate. We have no choice but to link to a method that resolves overloads on
+                // every invocation (alternatively, we could opportunistically link the one method that resolves for the
+                // current arguments, but we'd need to install a fairly complex guard for that and when it'd fail, we'd
+                // go back all the way to candidate selection.
+                // TODO: cache per call site type
+                return new OverloadedMethod(invokables, this, callSiteType, linkerServices).getInvoker();
+            }
         }
 
-        // We have more than one candidate. We have no choice but to link to a method that resolves overloads on every
-        // invocation (alternatively, we could opportunistically link the one method that resolves for the current
-        // arguments, but we'd need to install a fairly complex guard for that and when it'd fail, we'd go back all the
-        // way to candidate selection.
-        // TODO: cache per call site type
-        return new OverloadedMethod(invokables, this, callSiteType, linkerServices).getInvoker();
     }
 
     @Override
@@ -248,6 +249,8 @@ class OverloadedDynamicMethod extends DynamicMethod {
         final boolean varArgs = m.isVarargsCollector();
         final int fixedArgLen = methodType.parameterCount() - (varArgs ? 1 : 0);
         final int callSiteArgLen = callSiteType.parameterCount();
+
+        // Arity checks
         if(varArgs) {
             if(callSiteArgLen < fixedArgLen) {
                 return false;
@@ -255,32 +258,36 @@ class OverloadedDynamicMethod extends DynamicMethod {
         } else if(callSiteArgLen != fixedArgLen) {
             return false;
         }
-        // Starting from 1, as receiver type doesn't participate
+
+        // Fixed arguments type checks, starting from 1, as receiver type doesn't participate
         for(int i = 1; i < fixedArgLen; ++i) {
             if(!isApplicableDynamically(linkerServices, callSiteType.parameterType(i), methodType.parameterType(i))) {
                 return false;
             }
         }
-        if(varArgs) {
-            final Class<?> varArgArrayType = methodType.parameterType(fixedArgLen);
-            final Class<?> varArgType = varArgArrayType.getComponentType();
-            if(fixedArgLen == callSiteArgLen - 1) {
-                final Class<?> callSiteArgType = callSiteType.parameterType(fixedArgLen);
-                // Exactly one vararg; check both exact matching and component
-                // matching.
-                return isApplicableDynamically(linkerServices, callSiteArgType, varArgArrayType)
-                        || isApplicableDynamically(linkerServices, callSiteArgType, varArgType);
-            } else {
-                for(int i = fixedArgLen; i < callSiteArgLen; ++i) {
-                    if(!isApplicableDynamically(linkerServices, callSiteType.parameterType(i), varArgType)) {
-                        return false;
-                    }
-                }
-                return true;
-            }
-        } else {
+        if(!varArgs) {
+            // Not vararg; both arity and types matched.
             return true;
         }
+
+        final Class<?> varArgArrayType = methodType.parameterType(fixedArgLen);
+        final Class<?> varArgType = varArgArrayType.getComponentType();
+
+        if(fixedArgLen == callSiteArgLen - 1) {
+            // Exactly one vararg; check both array type matching and array component type matching.
+            final Class<?> callSiteArgType = callSiteType.parameterType(fixedArgLen);
+            return isApplicableDynamically(linkerServices, callSiteArgType, varArgArrayType)
+                    || isApplicableDynamically(linkerServices, callSiteArgType, varArgType);
+        }
+
+        // Either zero, or more than one vararg; check if all actual vararg types match the vararg array component type.
+        for(int i = fixedArgLen; i < callSiteArgLen; ++i) {
+            if(!isApplicableDynamically(linkerServices, callSiteType.parameterType(i), varArgType)) {
+                return false;
+            }
+        }
+
+        return true;
     }
 
     private static boolean isApplicableDynamically(LinkerServices linkerServices, Class<?> callSiteType,
@@ -298,7 +305,7 @@ class OverloadedDynamicMethod extends DynamicMethod {
      *
      * @param method the method to add.
      */
-    public void addMethod(SimpleDynamicMethod method) {
+    void addMethod(SimpleDynamicMethod method) {
         addMethod(method.getTarget());
     }
 
@@ -310,4 +317,4 @@ class OverloadedDynamicMethod extends DynamicMethod {
     public void addMethod(MethodHandle method) {
         methods.add(method);
     }
-}
\ No newline at end of file
+}
diff --git a/nashorn/src/jdk/internal/dynalink/beans/OverloadedMethod.java b/nashorn/src/jdk/internal/dynalink/beans/OverloadedMethod.java
index da8e4c3dec6..d001516284f 100644
--- a/nashorn/src/jdk/internal/dynalink/beans/OverloadedMethod.java
+++ b/nashorn/src/jdk/internal/dynalink/beans/OverloadedMethod.java
@@ -94,7 +94,6 @@ import java.util.concurrent.ConcurrentHashMap;
 import jdk.internal.dynalink.linker.LinkerServices;
 import jdk.internal.dynalink.support.Lookup;
 
-
 /**
  * Represents a subset of overloaded methods for a certain method name on a certain class. It can be either a fixarg or
  * a vararg subset depending on the subclass. The method is for a fixed number of arguments though (as it is generated
@@ -263,4 +262,4 @@ class OverloadedMethod {
             b.append(classes[l - 1].getComponentType().getCanonicalName()).append("...");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/nashorn/src/jdk/internal/dynalink/beans/SimpleDynamicMethod.java b/nashorn/src/jdk/internal/dynalink/beans/SimpleDynamicMethod.java
index 649c0e1edf0..1fbf7dbb1a0 100644
--- a/nashorn/src/jdk/internal/dynalink/beans/SimpleDynamicMethod.java
+++ b/nashorn/src/jdk/internal/dynalink/beans/SimpleDynamicMethod.java
@@ -90,7 +90,6 @@ import java.lang.reflect.Array;
 import jdk.internal.dynalink.linker.LinkerServices;
 import jdk.internal.dynalink.support.Guards;
 
-
 /**
  * A dynamic method bound to exactly one, non-overloaded Java method. Handles varargs.
  *
@@ -164,14 +163,13 @@ class SimpleDynamicMethod extends DynamicMethod {
             // Less actual arguments than number of fixed declared arguments; can't invoke.
             return null;
         }
-        // Method handle of the same number of arguments as the call site type
+        // Method handle has the same number of fixed arguments as the call site type
         if(argsLen == fixParamsLen) {
             // Method handle that matches the number of actual arguments as the number of fixed arguments
             final MethodHandle matchedMethod;
             if(varArgs) {
                 // If vararg, add a zero-length array of the expected type as the last argument to signify no variable
                 // arguments.
-                // TODO: check whether collectArguments() would handle this too.
                 matchedMethod = MethodHandles.insertArguments(fixTarget, fixParamsLen, Array.newInstance(
                         methodType.parameterType(fixParamsLen).getComponentType(), 0));
             } else {
@@ -195,22 +193,22 @@ class SimpleDynamicMethod extends DynamicMethod {
                 // Call site signature guarantees we'll always be passed a single compatible array; just link directly
                 // to the method.
                 return createConvertingInvocation(fixTarget, linkerServices, callSiteType);
-            } else if(!linkerServices.canConvert(callSiteLastArgType, varArgType)) {
+            }
+            if(!linkerServices.canConvert(callSiteLastArgType, varArgType)) {
                 // Call site signature guarantees the argument can definitely not be an array (i.e. it is primitive);
                 // link immediately to a vararg-packing method handle.
                 return createConvertingInvocation(collectArguments(fixTarget, argsLen), linkerServices, callSiteType);
-            } else {
-                // Call site signature makes no guarantees that the single argument in the vararg position will be
-                // compatible across all invocations. Need to insert an appropriate guard and fall back to generic
-                // vararg method when it is not.
-                return MethodHandles.guardWithTest(Guards.isInstance(varArgType, fixParamsLen, callSiteType),
-                        createConvertingInvocation(fixTarget, linkerServices, callSiteType),
-                        createConvertingInvocation(collectArguments(fixTarget, argsLen), linkerServices, callSiteType));
             }
-        } else {
-            // Remaining case: more than one vararg.
-            return createConvertingInvocation(collectArguments(fixTarget, argsLen), linkerServices, callSiteType);
+            // Call site signature makes no guarantees that the single argument in the vararg position will be
+            // compatible across all invocations. Need to insert an appropriate guard and fall back to generic vararg
+            // method when it is not.
+            return MethodHandles.guardWithTest(Guards.isInstance(varArgType, fixParamsLen, callSiteType),
+                    createConvertingInvocation(fixTarget, linkerServices, callSiteType),
+                    createConvertingInvocation(collectArguments(fixTarget, argsLen), linkerServices, callSiteType));
         }
+
+        // Remaining case: more than one vararg.
+        return createConvertingInvocation(collectArguments(fixTarget, argsLen), linkerServices, callSiteType);
     }
 
     @Override
@@ -238,4 +236,4 @@ class SimpleDynamicMethod extends DynamicMethod {
             final LinkerServices linkerServices, final MethodType callSiteType) {
         return linkerServices.asType(sizedMethod, callSiteType);
     }
-}
\ No newline at end of file
+}
diff --git a/nashorn/src/jdk/internal/dynalink/beans/StaticClass.java b/nashorn/src/jdk/internal/dynalink/beans/StaticClass.java
index 48f30255f65..5008c211432 100644
--- a/nashorn/src/jdk/internal/dynalink/beans/StaticClass.java
+++ b/nashorn/src/jdk/internal/dynalink/beans/StaticClass.java
@@ -135,4 +135,4 @@ public class StaticClass implements Serializable {
     private Object readResolve() {
         return forClass(clazz);
     }
-}
\ No newline at end of file
+}
diff --git a/nashorn/src/jdk/internal/dynalink/beans/StaticClassLinker.java b/nashorn/src/jdk/internal/dynalink/beans/StaticClassLinker.java
index 2c500ea8403..333ad8ff4c1 100644
--- a/nashorn/src/jdk/internal/dynalink/beans/StaticClassLinker.java
+++ b/nashorn/src/jdk/internal/dynalink/beans/StaticClassLinker.java
@@ -99,7 +99,6 @@ import jdk.internal.dynalink.linker.LinkerServices;
 import jdk.internal.dynalink.linker.TypeBasedGuardingDynamicLinker;
 import jdk.internal.dynalink.support.Lookup;
 
-
 /**
  * Provides a linker for the {@link StaticClass} objects.
  * @author Attila Szegedi
@@ -201,4 +200,4 @@ class StaticClassLinker implements TypeBasedGuardingDynamicLinker {
     private static boolean isClass(Class<?> clazz, Object obj) {
         return obj instanceof StaticClass && ((StaticClass)obj).getRepresentedClass() == clazz;
     }
-}
\ No newline at end of file
+}
diff --git a/nashorn/src/jdk/internal/dynalink/linker/GuardedInvocation.java b/nashorn/src/jdk/internal/dynalink/linker/GuardedInvocation.java
index f045dd2c59b..26a741e8288 100644
--- a/nashorn/src/jdk/internal/dynalink/linker/GuardedInvocation.java
+++ b/nashorn/src/jdk/internal/dynalink/linker/GuardedInvocation.java
@@ -92,7 +92,6 @@ import java.util.List;
 import jdk.internal.dynalink.CallSiteDescriptor;
 import jdk.internal.dynalink.support.Guards;
 
-
 /**
  * Represents a conditionally valid method handle. It is an immutable triple of an invocation method handle, a guard
  * method handle that defines the applicability of the invocation handle, and a switch point that can be used for
@@ -312,4 +311,4 @@ public class GuardedInvocation {
             throw new WrongMethodTypeException("Expected type: " + type + " actual type: " + mh.type());
         }
     }
-}
\ No newline at end of file
+}
diff --git a/nashorn/src/jdk/internal/dynalink/linker/GuardingDynamicLinker.java b/nashorn/src/jdk/internal/dynalink/linker/GuardingDynamicLinker.java
index a2acee3cef4..2cd0d0f04d1 100644
--- a/nashorn/src/jdk/internal/dynalink/linker/GuardingDynamicLinker.java
+++ b/nashorn/src/jdk/internal/dynalink/linker/GuardingDynamicLinker.java
@@ -109,4 +109,4 @@ public interface GuardingDynamicLinker {
      */
     public GuardedInvocation getGuardedInvocation(LinkRequest linkRequest, LinkerServices linkerServices)
             throws Exception;
-}
\ No newline at end of file
+}
diff --git a/nashorn/src/jdk/internal/dynalink/linker/GuardingTypeConverterFactory.java b/nashorn/src/jdk/internal/dynalink/linker/GuardingTypeConverterFactory.java
index 138bd894ff1..30ab9467ec4 100644
--- a/nashorn/src/jdk/internal/dynalink/linker/GuardingTypeConverterFactory.java
+++ b/nashorn/src/jdk/internal/dynalink/linker/GuardingTypeConverterFactory.java
@@ -111,4 +111,4 @@ public interface GuardingTypeConverterFactory {
      * @throws Exception if there was an error during creation of the converter
      */
     public GuardedInvocation convertToType(Class<?> sourceType, Class<?> targetType) throws Exception;
-}
\ No newline at end of file
+}
diff --git a/nashorn/src/jdk/internal/dynalink/linker/LinkRequest.java b/nashorn/src/jdk/internal/dynalink/linker/LinkRequest.java
index 528be640c32..1a82a4fab7b 100644
--- a/nashorn/src/jdk/internal/dynalink/linker/LinkRequest.java
+++ b/nashorn/src/jdk/internal/dynalink/linker/LinkRequest.java
@@ -146,4 +146,4 @@ public interface LinkRequest {
      * specified ones.
      */
     public LinkRequest replaceArguments(CallSiteDescriptor callSiteDescriptor, Object[] arguments);
-}
\ No newline at end of file
+}
diff --git a/nashorn/src/jdk/internal/dynalink/linker/LinkerServices.java b/nashorn/src/jdk/internal/dynalink/linker/LinkerServices.java
index ab821db161b..deaf820f11b 100644
--- a/nashorn/src/jdk/internal/dynalink/linker/LinkerServices.java
+++ b/nashorn/src/jdk/internal/dynalink/linker/LinkerServices.java
@@ -89,7 +89,6 @@ import java.lang.invoke.MethodType;
 import jdk.internal.dynalink.DynamicLinker;
 import jdk.internal.dynalink.linker.ConversionComparator.Comparison;
 
-
 /**
  * Interface for services provided to {@link GuardingDynamicLinker} instances by the {@link DynamicLinker} that owns
  * them. You can think of it as the interface of the {@link DynamicLinker} that faces the {@link GuardingDynamicLinker}
@@ -162,4 +161,4 @@ public interface LinkerServices {
      * conversion.
      */
     public Comparison compareConversion(Class<?> sourceType, Class<?> targetType1, Class<?> targetType2);
-}
\ No newline at end of file
+}
diff --git a/nashorn/src/jdk/internal/dynalink/support/AbstractCallSiteDescriptor.java b/nashorn/src/jdk/internal/dynalink/support/AbstractCallSiteDescriptor.java
index 401ab1a2636..e51f6fe2f2a 100644
--- a/nashorn/src/jdk/internal/dynalink/support/AbstractCallSiteDescriptor.java
+++ b/nashorn/src/jdk/internal/dynalink/support/AbstractCallSiteDescriptor.java
@@ -88,7 +88,6 @@ import java.lang.invoke.MethodHandles.Lookup;
 import java.util.Objects;
 import jdk.internal.dynalink.CallSiteDescriptor;
 
-
 /**
  * A base class for call site descriptor implementations. Provides reconstruction of the name from the tokens, as well
  * as a generally useful {@code equals} and {@code hashCode} methods.
diff --git a/nashorn/src/jdk/internal/dynalink/support/AbstractRelinkableCallSite.java b/nashorn/src/jdk/internal/dynalink/support/AbstractRelinkableCallSite.java
index 248ce9b2b63..c05d35e0948 100644
--- a/nashorn/src/jdk/internal/dynalink/support/AbstractRelinkableCallSite.java
+++ b/nashorn/src/jdk/internal/dynalink/support/AbstractRelinkableCallSite.java
@@ -88,7 +88,6 @@ import java.lang.invoke.MutableCallSite;
 import jdk.internal.dynalink.CallSiteDescriptor;
 import jdk.internal.dynalink.RelinkableCallSite;
 
-
 /**
  * A basic implementation of the {@link RelinkableCallSite} as a {@link MutableCallSite} subclass.
  *
@@ -115,4 +114,4 @@ public abstract class AbstractRelinkableCallSite extends MutableCallSite impleme
     public void initialize(MethodHandle relinkAndInvoke) {
         setTarget(relinkAndInvoke);
     }
-}
\ No newline at end of file
+}
diff --git a/nashorn/src/jdk/internal/dynalink/support/AutoDiscovery.java b/nashorn/src/jdk/internal/dynalink/support/AutoDiscovery.java
index 72e93cc2418..2909365935b 100644
--- a/nashorn/src/jdk/internal/dynalink/support/AutoDiscovery.java
+++ b/nashorn/src/jdk/internal/dynalink/support/AutoDiscovery.java
@@ -89,7 +89,6 @@ import java.util.ServiceLoader;
 import jdk.internal.dynalink.DynamicLinkerFactory;
 import jdk.internal.dynalink.linker.GuardingDynamicLinker;
 
-
 /**
  * Provides methods for automatic discovery of all guarding dynamic linkers listed in the
  * <tt>/META-INF/services/jdk.internal.dynalink.linker.GuardingDynamicLinker</tt> resources of all JAR files for a
@@ -131,4 +130,4 @@ public class AutoDiscovery {
         }
         return list;
     }
-}
\ No newline at end of file
+}
diff --git a/nashorn/src/jdk/internal/dynalink/support/BottomGuardingDynamicLinker.java b/nashorn/src/jdk/internal/dynalink/support/BottomGuardingDynamicLinker.java
index bab8f59e174..7a2700e10ff 100644
--- a/nashorn/src/jdk/internal/dynalink/support/BottomGuardingDynamicLinker.java
+++ b/nashorn/src/jdk/internal/dynalink/support/BottomGuardingDynamicLinker.java
@@ -113,4 +113,4 @@ public class BottomGuardingDynamicLinker implements TypeBasedGuardingDynamicLink
     public GuardedInvocation getGuardedInvocation(LinkRequest linkRequest, LinkerServices linkerServices) {
         return null;
     }
-}
\ No newline at end of file
+}
diff --git a/nashorn/src/jdk/internal/dynalink/support/CallSiteDescriptorFactory.java b/nashorn/src/jdk/internal/dynalink/support/CallSiteDescriptorFactory.java
index d74f73711d0..b0039d21c2c 100644
--- a/nashorn/src/jdk/internal/dynalink/support/CallSiteDescriptorFactory.java
+++ b/nashorn/src/jdk/internal/dynalink/support/CallSiteDescriptorFactory.java
@@ -94,7 +94,6 @@ import java.util.StringTokenizer;
 import java.util.WeakHashMap;
 import jdk.internal.dynalink.CallSiteDescriptor;
 
-
 /**
  * Usable as a default factory for call site descriptor implementations. It is weakly canonicalizing, meaning it will
  * return the same immutable call site descriptor for identical inputs, i.e. repeated requests for a descriptor
@@ -129,9 +128,8 @@ public class CallSiteDescriptorFactory {
         final String[] tokenizedName = tokenizeName(name);
         if(isPublicLookup(lookup)) {
             return getCanonicalPublicDescriptor(createPublicCallSiteDescriptor(tokenizedName, methodType));
-        } else {
-            return new LookupCallSiteDescriptor(tokenizedName, methodType, lookup);
         }
+        return new LookupCallSiteDescriptor(tokenizedName, methodType, lookup);
     }
 
     static CallSiteDescriptor getCanonicalPublicDescriptor(final CallSiteDescriptor desc) {
@@ -262,4 +260,4 @@ public class CallSiteDescriptorFactory {
     public static CallSiteDescriptor insertParameterTypes(CallSiteDescriptor desc, int num, List<Class<?>> ptypesToInsert) {
         return desc.changeMethodType(desc.getMethodType().insertParameterTypes(num, ptypesToInsert));
     }
-}
\ No newline at end of file
+}
diff --git a/nashorn/src/jdk/internal/dynalink/support/CompositeGuardingDynamicLinker.java b/nashorn/src/jdk/internal/dynalink/support/CompositeGuardingDynamicLinker.java
index f13eb9b24c5..44f5c4b3874 100644
--- a/nashorn/src/jdk/internal/dynalink/support/CompositeGuardingDynamicLinker.java
+++ b/nashorn/src/jdk/internal/dynalink/support/CompositeGuardingDynamicLinker.java
@@ -91,7 +91,6 @@ import jdk.internal.dynalink.linker.GuardingDynamicLinker;
 import jdk.internal.dynalink.linker.LinkRequest;
 import jdk.internal.dynalink.linker.LinkerServices;
 
-
 /**
  * A {@link GuardingDynamicLinker} that delegates sequentially to a list of other guarding dynamic linkers. The first
  * value returned from a component linker other than null is returned. If no component linker returns an invocation,
@@ -129,4 +128,4 @@ public class CompositeGuardingDynamicLinker implements GuardingDynamicLinker, Se
         }
         return null;
     }
-}
\ No newline at end of file
+}
diff --git a/nashorn/src/jdk/internal/dynalink/support/CompositeTypeBasedGuardingDynamicLinker.java b/nashorn/src/jdk/internal/dynalink/support/CompositeTypeBasedGuardingDynamicLinker.java
index b0ea761a415..180ab0c6b1a 100644
--- a/nashorn/src/jdk/internal/dynalink/support/CompositeTypeBasedGuardingDynamicLinker.java
+++ b/nashorn/src/jdk/internal/dynalink/support/CompositeTypeBasedGuardingDynamicLinker.java
@@ -93,7 +93,6 @@ import jdk.internal.dynalink.linker.LinkRequest;
 import jdk.internal.dynalink.linker.LinkerServices;
 import jdk.internal.dynalink.linker.TypeBasedGuardingDynamicLinker;
 
-
 /**
  * A composite type-based guarding dynamic linker. When a receiver of a not yet seen class is encountered, all linkers
  * are queried sequentially on their {@link TypeBasedGuardingDynamicLinker#canLinkType(Class)} method. The linkers
@@ -223,4 +222,4 @@ public class CompositeTypeBasedGuardingDynamicLinker implements TypeBasedGuardin
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/nashorn/src/jdk/internal/dynalink/support/DefaultCallSiteDescriptor.java b/nashorn/src/jdk/internal/dynalink/support/DefaultCallSiteDescriptor.java
index abf3ddad1a4..46d4fc8bba9 100644
--- a/nashorn/src/jdk/internal/dynalink/support/DefaultCallSiteDescriptor.java
+++ b/nashorn/src/jdk/internal/dynalink/support/DefaultCallSiteDescriptor.java
@@ -87,7 +87,6 @@ import java.lang.invoke.MethodHandles.Lookup;
 import java.lang.invoke.MethodType;
 import jdk.internal.dynalink.CallSiteDescriptor;
 
-
 /**
  * A default, fairly light implementation of a call site descriptor used for describing non-standard operations. It does
  * not store {@link Lookup} objects but always returns the public lookup from its {@link #getLookup()} method. If you
diff --git a/nashorn/src/jdk/internal/dynalink/support/Guards.java b/nashorn/src/jdk/internal/dynalink/support/Guards.java
index 6107d4acca9..bab6e1dc6ca 100644
--- a/nashorn/src/jdk/internal/dynalink/support/Guards.java
+++ b/nashorn/src/jdk/internal/dynalink/support/Guards.java
@@ -90,7 +90,6 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import jdk.internal.dynalink.linker.LinkerServices;
 
-
 /**
  * Utility methods for creating typical guards. TODO: introduce reasonable caching of created guards.
  *
@@ -357,4 +356,4 @@ public class Guards {
         return MethodHandles.permuteArguments(MethodHandles.constant(Boolean.TYPE, value),
                 type.changeReturnType(Boolean.TYPE));
     }
-}
\ No newline at end of file
+}
diff --git a/nashorn/src/jdk/internal/dynalink/support/LinkRequestImpl.java b/nashorn/src/jdk/internal/dynalink/support/LinkRequestImpl.java
index 1ca14cffbef..c2b0092bf99 100644
--- a/nashorn/src/jdk/internal/dynalink/support/LinkRequestImpl.java
+++ b/nashorn/src/jdk/internal/dynalink/support/LinkRequestImpl.java
@@ -140,4 +140,4 @@ public class LinkRequestImpl implements LinkRequest {
     public LinkRequest replaceArguments(CallSiteDescriptor newCallSiteDescriptor, Object[] newArguments) {
         return new LinkRequestImpl(newCallSiteDescriptor, callSiteUnstable, newArguments);
     }
-}
\ No newline at end of file
+}
diff --git a/nashorn/src/jdk/internal/dynalink/support/LinkerServicesImpl.java b/nashorn/src/jdk/internal/dynalink/support/LinkerServicesImpl.java
index 42c37cbda27..4eb0ca9da7e 100644
--- a/nashorn/src/jdk/internal/dynalink/support/LinkerServicesImpl.java
+++ b/nashorn/src/jdk/internal/dynalink/support/LinkerServicesImpl.java
@@ -91,7 +91,6 @@ import jdk.internal.dynalink.linker.GuardingDynamicLinker;
 import jdk.internal.dynalink.linker.LinkRequest;
 import jdk.internal.dynalink.linker.LinkerServices;
 
-
 /**
  * Default implementation of the {@link LinkerServices} interface.
  *
@@ -138,4 +137,4 @@ public class LinkerServicesImpl implements LinkerServices {
     public GuardedInvocation getGuardedInvocation(LinkRequest linkRequest) throws Exception {
         return topLevelLinker.getGuardedInvocation(linkRequest, this);
     }
-}
\ No newline at end of file
+}
diff --git a/nashorn/src/jdk/internal/dynalink/support/Lookup.java b/nashorn/src/jdk/internal/dynalink/support/Lookup.java
index cff6e943cea..52a610246a8 100644
--- a/nashorn/src/jdk/internal/dynalink/support/Lookup.java
+++ b/nashorn/src/jdk/internal/dynalink/support/Lookup.java
@@ -231,9 +231,8 @@ public class Lookup {
                     m.setAccessible(true);
                 }
                 return unreflect(m);
-            } else {
-                return lookup.findSpecial(declaringClass, name, type, declaringClass);
             }
+            return lookup.findSpecial(declaringClass, name, type, declaringClass);
         } catch(IllegalAccessException e) {
             final IllegalAccessError ee = new IllegalAccessError("Failed to access special method " + methodDescription(
                     declaringClass, name, type));
diff --git a/nashorn/src/jdk/internal/dynalink/support/LookupCallSiteDescriptor.java b/nashorn/src/jdk/internal/dynalink/support/LookupCallSiteDescriptor.java
index 655685c4aa3..bc5521bbfc7 100644
--- a/nashorn/src/jdk/internal/dynalink/support/LookupCallSiteDescriptor.java
+++ b/nashorn/src/jdk/internal/dynalink/support/LookupCallSiteDescriptor.java
@@ -87,7 +87,6 @@ import java.lang.invoke.MethodHandles.Lookup;
 import java.lang.invoke.MethodType;
 import jdk.internal.dynalink.CallSiteDescriptor;
 
-
 /**
  * A call site descriptor that stores a specific {@link Lookup}. It does not, however, store static bootstrap arguments.
  * @author Attila Szegedi
diff --git a/nashorn/src/jdk/internal/dynalink/support/NamedDynCallSiteDescriptor.java b/nashorn/src/jdk/internal/dynalink/support/NamedDynCallSiteDescriptor.java
index 79c5d1f3e77..71cbb1d299e 100644
--- a/nashorn/src/jdk/internal/dynalink/support/NamedDynCallSiteDescriptor.java
+++ b/nashorn/src/jdk/internal/dynalink/support/NamedDynCallSiteDescriptor.java
@@ -86,7 +86,6 @@ package jdk.internal.dynalink.support;
 import java.lang.invoke.MethodType;
 import jdk.internal.dynalink.CallSiteDescriptor;
 
-
 class NamedDynCallSiteDescriptor extends UnnamedDynCallSiteDescriptor {
     private final String name;
 
diff --git a/nashorn/src/jdk/internal/dynalink/support/RuntimeContextLinkRequestImpl.java b/nashorn/src/jdk/internal/dynalink/support/RuntimeContextLinkRequestImpl.java
index efd20455965..03309a7c26a 100644
--- a/nashorn/src/jdk/internal/dynalink/support/RuntimeContextLinkRequestImpl.java
+++ b/nashorn/src/jdk/internal/dynalink/support/RuntimeContextLinkRequestImpl.java
@@ -139,4 +139,4 @@ public class RuntimeContextLinkRequestImpl extends LinkRequestImpl {
         System.arraycopy(args, runtimeContextArgCount + 1, newargs, 1, newargs.length - 1);
         return newargs;
     }
-}
\ No newline at end of file
+}
diff --git a/nashorn/src/jdk/internal/dynalink/support/TypeConverterFactory.java b/nashorn/src/jdk/internal/dynalink/support/TypeConverterFactory.java
index 2fed7db7a8f..71fb4eb7228 100644
--- a/nashorn/src/jdk/internal/dynalink/support/TypeConverterFactory.java
+++ b/nashorn/src/jdk/internal/dynalink/support/TypeConverterFactory.java
@@ -95,7 +95,6 @@ import jdk.internal.dynalink.linker.GuardedInvocation;
 import jdk.internal.dynalink.linker.GuardingTypeConverterFactory;
 import jdk.internal.dynalink.linker.LinkerServices;
 
-
 /**
  * A factory for type converters. This class is the main implementation behind the
  * {@link LinkerServices#asType(MethodHandle, MethodType)}. It manages the known {@link GuardingTypeConverterFactory}
@@ -317,4 +316,4 @@ public class TypeConverterFactory {
     }
 
     /*private*/ static final MethodHandle IDENTITY_CONVERSION = MethodHandles.identity(Object.class);
-}
\ No newline at end of file
+}
diff --git a/nashorn/src/jdk/internal/dynalink/support/TypeUtilities.java b/nashorn/src/jdk/internal/dynalink/support/TypeUtilities.java
index a534b091b26..57fea990efa 100644
--- a/nashorn/src/jdk/internal/dynalink/support/TypeUtilities.java
+++ b/nashorn/src/jdk/internal/dynalink/support/TypeUtilities.java
@@ -439,4 +439,4 @@ public class TypeUtilities {
     public static Class<?> getWrapperType(Class<?> primitiveType) {
         return WRAPPER_TYPES.get(primitiveType);
     }
-}
\ No newline at end of file
+}
diff --git a/nashorn/src/jdk/internal/dynalink/support/UnnamedDynCallSiteDescriptor.java b/nashorn/src/jdk/internal/dynalink/support/UnnamedDynCallSiteDescriptor.java
index 716080022fb..da8c0096f49 100644
--- a/nashorn/src/jdk/internal/dynalink/support/UnnamedDynCallSiteDescriptor.java
+++ b/nashorn/src/jdk/internal/dynalink/support/UnnamedDynCallSiteDescriptor.java
@@ -86,7 +86,6 @@ package jdk.internal.dynalink.support;
 import java.lang.invoke.MethodType;
 import jdk.internal.dynalink.CallSiteDescriptor;
 
-
 class UnnamedDynCallSiteDescriptor extends AbstractCallSiteDescriptor {
     private final MethodType methodType;
     private final String op;
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CompilationPhase.java b/nashorn/src/jdk/nashorn/internal/codegen/CompilationPhase.java
index a756d4a4b03..4c6ca63d608 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/CompilationPhase.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CompilationPhase.java
@@ -7,6 +7,7 @@ import static jdk.nashorn.internal.ir.FunctionNode.CompilationState.FINALIZED;
 import static jdk.nashorn.internal.ir.FunctionNode.CompilationState.INITIALIZED;
 import static jdk.nashorn.internal.ir.FunctionNode.CompilationState.LOWERED;
 import static jdk.nashorn.internal.ir.FunctionNode.CompilationState.SPLIT;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -15,9 +16,9 @@ import jdk.nashorn.internal.codegen.types.Type;
 import jdk.nashorn.internal.ir.FunctionNode;
 import jdk.nashorn.internal.ir.FunctionNode.CompilationState;
 import jdk.nashorn.internal.ir.Node;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
 import jdk.nashorn.internal.ir.debug.ASTWriter;
 import jdk.nashorn.internal.ir.debug.PrintVisitor;
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
 import jdk.nashorn.internal.runtime.Context;
 import jdk.nashorn.internal.runtime.ECMAErrors;
 
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/FunctionSignature.java b/nashorn/src/jdk/nashorn/internal/codegen/FunctionSignature.java
index fcfdf624814..bc61678fc2d 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/FunctionSignature.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/FunctionSignature.java
@@ -25,6 +25,8 @@
 
 package jdk.nashorn.internal.codegen;
 
+import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+
 import java.lang.invoke.MethodType;
 import java.util.ArrayList;
 import java.util.List;
@@ -34,8 +36,6 @@ import jdk.nashorn.internal.ir.Node;
 import jdk.nashorn.internal.runtime.ScriptFunction;
 import jdk.nashorn.internal.runtime.linker.LinkerCallSite;
 
-import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
-
 /**
  * Class that generates function signatures for dynamic calls
  */
diff --git a/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java b/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java
index 958f7b757fc..b31f32ba24c 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java
@@ -36,7 +36,6 @@ import java.util.EnumSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Stack;
-
 import jdk.nashorn.internal.codegen.CompileUnit;
 import jdk.nashorn.internal.codegen.Compiler;
 import jdk.nashorn.internal.codegen.Frame;
diff --git a/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java b/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
index 78fe88dfd2f..fad137ba23a 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
@@ -28,7 +28,6 @@ package jdk.nashorn.internal.objects;
 import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 
 import java.lang.invoke.MethodHandle;
-
 import jdk.nashorn.internal.runtime.GlobalFunctions;
 import jdk.nashorn.internal.runtime.Property;
 import jdk.nashorn.internal.runtime.PropertyMap;
diff --git a/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionTrampolineImpl.java b/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionTrampolineImpl.java
index 22dd74a0149..339aa430204 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionTrampolineImpl.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionTrampolineImpl.java
@@ -1,12 +1,10 @@
 package jdk.nashorn.internal.objects;
 
+import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
-
-
-import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
-
 import jdk.nashorn.internal.codegen.Compiler;
 import jdk.nashorn.internal.codegen.FunctionSignature;
 import jdk.nashorn.internal.codegen.types.Type;
diff --git a/nashorn/src/jdk/nashorn/internal/parser/Parser.java b/nashorn/src/jdk/nashorn/internal/parser/Parser.java
index 7d3e3a1a5ee..24ae2716898 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/Parser.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/Parser.java
@@ -59,7 +59,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Stack;
-
 import jdk.nashorn.internal.codegen.CompilerConstants;
 import jdk.nashorn.internal.codegen.Namespace;
 import jdk.nashorn.internal.ir.AccessNode;
@@ -101,8 +100,8 @@ import jdk.nashorn.internal.runtime.Context;
 import jdk.nashorn.internal.runtime.ErrorManager;
 import jdk.nashorn.internal.runtime.JSErrorType;
 import jdk.nashorn.internal.runtime.ParserException;
-import jdk.nashorn.internal.runtime.Source;
 import jdk.nashorn.internal.runtime.ScriptingFunctions;
+import jdk.nashorn.internal.runtime.Source;
 
 /**
  * Builds the IR.
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Context.java b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
index b31b764fffe..e03aa3e83df 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/Context.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
@@ -45,7 +45,6 @@ import java.security.CodeSource;
 import java.security.PrivilegedAction;
 import java.util.Locale;
 import java.util.TimeZone;
-
 import jdk.internal.org.objectweb.asm.ClassReader;
 import jdk.internal.org.objectweb.asm.util.CheckClassAdapter;
 import jdk.nashorn.internal.codegen.ClassEmitter;

From 350c3e01c1046a47e68fbadee9c7261b04cf24a2 Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Mon, 18 Feb 2013 20:41:12 +0530
Subject: [PATCH 171/311] 8008387: Improve code coverage tests for
 JSObjectLinker and NashornBottomLinker

Reviewed-by: lagergren, jlaskey, hannesw
---
 .../internal/dynalink/beans/BeansLinker.java  | 10 +++
 .../runtime/linker/NashornBottomLinker.java   | 15 +---
 .../test/script/basic/javamethodcallerrors.js | 52 +++++++++++
 nashorn/test/script/basic/jsobject.js         | 89 +++++++++++++++++++
 4 files changed, 154 insertions(+), 12 deletions(-)
 create mode 100644 nashorn/test/script/basic/javamethodcallerrors.js
 create mode 100644 nashorn/test/script/basic/jsobject.js

diff --git a/nashorn/src/jdk/internal/dynalink/beans/BeansLinker.java b/nashorn/src/jdk/internal/dynalink/beans/BeansLinker.java
index 8fa0d2105e6..9bdcb4e5bd2 100644
--- a/nashorn/src/jdk/internal/dynalink/beans/BeansLinker.java
+++ b/nashorn/src/jdk/internal/dynalink/beans/BeansLinker.java
@@ -159,6 +159,16 @@ public class BeansLinker implements GuardingDynamicLinker {
         return linkers.get(clazz);
     }
 
+    /*
+     * Returns true if the object is a Dynalink Java dynamic method.
+     *
+     * @param obj the object we want to test for being a dynamic method
+     * @return true if it is a dynamic method, false otherwise.
+     */
+    public static boolean isDynamicMethod(final Object obj) {
+        return obj instanceof DynamicMethod;
+    }
+
     @Override
     public GuardedInvocation getGuardedInvocation(LinkRequest request, final LinkerServices linkerServices)
             throws Exception {
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java
index 5c20bfc3ed8..ba99e1361b5 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java
@@ -31,6 +31,7 @@ import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import jdk.internal.dynalink.CallSiteDescriptor;
+import jdk.internal.dynalink.beans.BeansLinker;
 import jdk.internal.dynalink.linker.GuardedInvocation;
 import jdk.internal.dynalink.linker.GuardingDynamicLinker;
 import jdk.internal.dynalink.linker.LinkRequest;
@@ -78,14 +79,14 @@ class NashornBottomLinker implements GuardingDynamicLinker {
         final String operator = desc.getFirstOperator();
         switch (operator) {
         case "new":
-            if(isJavaDynamicMethod(self)) {
+            if(BeansLinker.isDynamicMethod(self)) {
                 typeError("method.not.constructor", ScriptRuntime.safeToString(self));
             } else {
                 typeError("not.a.function", ScriptRuntime.safeToString(self));
             }
             break;
         case "call":
-            if(isJavaDynamicMethod(self)) {
+            if(BeansLinker.isDynamicMethod(self)) {
                 typeError("no.method.matches.args", ScriptRuntime.safeToString(self));
             } else {
                 typeError("not.a.function", ScriptRuntime.safeToString(self));
@@ -113,16 +114,6 @@ class NashornBottomLinker implements GuardingDynamicLinker {
         throw new AssertionError("unknown call type " + desc);
     }
 
-    /**
-     * Returns true if the object is a Dynalink dynamic method. Unfortunately, the dynamic method classes are package
-     * private in Dynalink, so this is the closest we can get to determining it.
-     * @param obj the object we want to test for being a dynamic method
-     * @return true if it is a dynamic method, false otherwise.
-     */
-    private static boolean isJavaDynamicMethod(Object obj) {
-        return obj.getClass().getName().endsWith("DynamicMethod");
-    }
-
     private static GuardedInvocation getInvocation(final MethodHandle handle, final Object self, final LinkerServices linkerServices, final CallSiteDescriptor desc) {
         return Bootstrap.asType(new GuardedInvocation(handle, Guards.getClassGuard(self.getClass())), linkerServices, desc);
     }
diff --git a/nashorn/test/script/basic/javamethodcallerrors.js b/nashorn/test/script/basic/javamethodcallerrors.js
new file mode 100644
index 00000000000..4610900ad76
--- /dev/null
+++ b/nashorn/test/script/basic/javamethodcallerrors.js
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Expect TypeError on wrong Java method invocations.
+ *
+ * @test
+ * @run
+ */
+
+var Exit = java.lang.System.exit;
+
+// Try to invoke it as constructor
+try {
+    new Exit();
+    fail("Should have thrown TypeError");
+} catch (e) {
+    if (! (e instanceof TypeError)) {
+        fail("TypeError expected, got " + e);
+    }
+}
+
+// Try to invoke with wrong number of args
+
+try {
+    Exit(33, 44);
+    fail("Should have thrown TypeError");
+} catch (e) {
+    if (! (e instanceof TypeError)) {
+        fail("TypeError expected, got " + e);
+    }
+}
diff --git a/nashorn/test/script/basic/jsobject.js b/nashorn/test/script/basic/jsobject.js
new file mode 100644
index 00000000000..fd544d90a9d
--- /dev/null
+++ b/nashorn/test/script/basic/jsobject.js
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JSObject tests
+ *
+ * @test
+ * @run
+ */
+
+var m = new javax.script.ScriptEngineManager();
+var e = m.getEngineByName("nashorn");
+
+e.eval("obj = { foo:'hello', 0: 'world', func: function(x) { return x.toUpperCase() } } ");
+var obj = e.get("obj");
+
+
+// try various getters
+if (obj.foo != 'hello') {
+    fail("obj.foo does have expected value");
+}
+
+function checkPropGetter(obj, prop, expected) {
+    if (obj[prop] != expected) {
+        fail(prop + " does not have value: " + expected);
+    }
+}
+
+checkPropGetter(obj, "foo", "hello");
+checkPropGetter(obj, 0, "world");
+checkPropGetter(obj, "0", "world");
+
+// try various setters
+
+obj.foo = "HELLO";
+if (obj.foo != "HELLO") {
+    fail("obj.foo set does not work as expected");
+}
+
+function checkPropSetter(obj, prop, newValue) {
+    obj[prop] = newValue;
+    checkPropGetter(obj, prop, newValue);
+}
+
+checkPropSetter(obj, "foo", "NASHORN");
+checkPropSetter(obj, 0, "ECMASCRIPT");
+checkPropSetter(obj, "0", "CHANGED");
+
+function callFunc(input, expected) {
+   if (obj.func(input) != expected) {
+       fail("obj.func(..) does not work as expected");
+   }
+}
+
+callFunc("nashorn", "NASHORN");
+callFunc("javascript", "JAVASCRIPT");
+callFunc("hello", "HELLO");
+
+var Func = obj.func;
+
+function callWithoutObject(input, expected) {
+   if (Func(input) != expected) {
+       fail("obj.func(..) does not work as expected");
+   }
+}
+
+callWithoutObject("nashorn", "NASHORN");
+callWithoutObject("javascript", "JAVASCRIPT");
+callWithoutObject("hello", "HELLO");

From 80da999bf3267060b1a38a4f022df6ed0cbc1aab Mon Sep 17 00:00:00 2001
From: Jia-Hong Chen <jia-hong.chen@oracle.com>
Date: Mon, 18 Feb 2013 14:04:00 -0800
Subject: [PATCH 172/311] 8005191: [parfait] #384
 sun/font/layout/LookupProcessor.cpp Null pointer dereference

Reviewed-by: prr, vadim
---
 jdk/src/share/native/sun/font/layout/LookupProcessor.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/jdk/src/share/native/sun/font/layout/LookupProcessor.cpp b/jdk/src/share/native/sun/font/layout/LookupProcessor.cpp
index 60727aa3f3a..88e9f25ddeb 100644
--- a/jdk/src/share/native/sun/font/layout/LookupProcessor.cpp
+++ b/jdk/src/share/native/sun/font/layout/LookupProcessor.cpp
@@ -125,6 +125,10 @@ le_uint32 LookupProcessor::applySingleLookup(le_uint16 lookupTableIndex, GlyphIt
     }
 
     const LookupTable *lookupTable = lookupListTable->getLookupTable(lookupTableIndex);
+    if (lookupTable == NULL) {
+        success = LE_INTERNAL_ERROR;
+        return 0;
+    }
     le_uint16 lookupFlags = SWAPW(lookupTable->lookupFlags);
     GlyphIterator tempIterator(*glyphIterator, lookupFlags);
     le_uint32 delta = applyLookupTable(lookupTable, &tempIterator, fontInstance, success);

From 66b344c616ffc9e47019d491f15789c81ab6333d Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Tue, 19 Feb 2013 00:19:15 -0800
Subject: [PATCH 173/311] 8008434: Misc javadoc warning fixes in
 DateTimeFormatterBuilder and TimeZone

Reviewed-by: mduigou, okutsu
---
 .../classes/java/time/format/DateTimeFormatterBuilder.java      | 2 +-
 jdk/src/share/classes/java/util/TimeZone.java                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jdk/src/share/classes/java/time/format/DateTimeFormatterBuilder.java b/jdk/src/share/classes/java/time/format/DateTimeFormatterBuilder.java
index f2ed2317865..e413d4b1e64 100644
--- a/jdk/src/share/classes/java/time/format/DateTimeFormatterBuilder.java
+++ b/jdk/src/share/classes/java/time/format/DateTimeFormatterBuilder.java
@@ -1007,7 +1007,7 @@ public final class DateTimeFormatterBuilder {
      * is used, with {@code IsoChronology} as the fallback.
      * <p>
      * Note that this method provides similar functionality to methods on
-     * {@code DateFormat} such as {@link DateFormat#getDateTimeInstance(int, int)}.
+     * {@code DateFormat} such as {@link java.text.DateFormat#getDateTimeInstance(int, int)}.
      *
      * @param dateStyle  the date style to use, null means no date required
      * @param timeStyle  the time style to use, null means no time required
diff --git a/jdk/src/share/classes/java/util/TimeZone.java b/jdk/src/share/classes/java/util/TimeZone.java
index 66297c015b9..cc8fe5dc356 100644
--- a/jdk/src/share/classes/java/util/TimeZone.java
+++ b/jdk/src/share/classes/java/util/TimeZone.java
@@ -534,7 +534,7 @@ abstract public class TimeZone implements Serializable, Cloneable {
     /**
      * Gets the {@code TimeZone} for the given {@code zoneId}.
      *
-     * @param zoneid a {@link ZoneId} from which the time zone ID is obtained
+     * @param zoneId a {@link ZoneId} from which the time zone ID is obtained
      * @return the specified {@code TimeZone}, or the GMT zone if the given ID
      *         cannot be understood.
      * @throws NullPointerException if {@code zoneId} is {@code null}

From d6a99026903001d71b13c29dfd49c7d9910fbafe Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Tue, 19 Feb 2013 00:24:55 -0800
Subject: [PATCH 174/311] 8008435: Fix new build to include jdk.Supported in
 ct.sym

Reviewed-by: erikj
---
 common/makefiles/javadoc/NON_CORE_PKGS.gmk | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/common/makefiles/javadoc/NON_CORE_PKGS.gmk b/common/makefiles/javadoc/NON_CORE_PKGS.gmk
index 1d944d3dd19..c2e481119eb 100644
--- a/common/makefiles/javadoc/NON_CORE_PKGS.gmk
+++ b/common/makefiles/javadoc/NON_CORE_PKGS.gmk
@@ -80,7 +80,8 @@ JCONSOLE_PKGS    = com.sun.tools.jconsole
 
 TREEAPI_PKGS 	 = com.sun.source.doctree \
 		   com.sun.source.tree \
-		   com.sun.source.util
+		   com.sun.source.util \
+		   jdk
 
 SMARTCARDIO_PKGS = javax.smartcardio
 
@@ -93,6 +94,8 @@ APPLE_EXT_PKGS   = com.apple.concurrent   \
                    com.apple.eio
 endif
 
+JDK_PKGS     = jdk
+
 # non-core packages in rt.jar
 NON_CORE_PKGS    = $(DOMAPI_PKGS) \
                    $(MGMT_PKGS) \
@@ -103,5 +106,5 @@ NON_CORE_PKGS    = $(DOMAPI_PKGS) \
                    $(HTTPSERVER_PKGS) \
                    $(SMARTCARDIO_PKGS) \
                    $(SCTPAPI_PKGS) \
-                   $(APPLE_EXT_PKGS)
-
+                   $(APPLE_EXT_PKGS) \
+                   $(JDK_PKGS)

From 49ba72c4637cae1971144040db6cf5a6d85e8cfa Mon Sep 17 00:00:00 2001
From: Petr Pchelko <pchelko@openjdk.org>
Date: Tue, 19 Feb 2013 11:26:43 +0000
Subject: [PATCH 175/311] 8008374: Build failure (NEWBUILD=false) on Mac

Fixed an old build system failure

Reviewed-by: art, anthony
---
 jdk/make/sun/lwawt/FILES_export_macosx.gmk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/jdk/make/sun/lwawt/FILES_export_macosx.gmk b/jdk/make/sun/lwawt/FILES_export_macosx.gmk
index 2101fd8ac39..6a2e2f9e93b 100644
--- a/jdk/make/sun/lwawt/FILES_export_macosx.gmk
+++ b/jdk/make/sun/lwawt/FILES_export_macosx.gmk
@@ -122,7 +122,6 @@ FILES_export = \
         sun/lwawt/macosx/CTextPipe.java \
         sun/lwawt/macosx/CDesktopPeer.java \
         sun/java2d/CRenderer.java \
-        sun/lwawt/macosx/EventDispatchAccess.java \
         sun/lwawt/macosx/NSPrintInfo.java \
         sun/lwawt/macosx/CAccessibility.java \
         sun/lwawt/macosx/CAccessible.java \

From 88eea092fb2de66a9c547464fef118231b673f12 Mon Sep 17 00:00:00 2001
From: Konstantin Shefov <kshefov@openjdk.org>
Date: Tue, 19 Feb 2013 17:26:40 +0400
Subject: [PATCH 176/311] 8008379: TEST_BUG: Fail automatically with
 java.lang.NullPointerException

Reviewed-by: serb, anthony
---
 .../ModalDialogMultiscreenTest.java           | 441 ++++++++++++++++++
 1 file changed, 441 insertions(+)
 create mode 100644 jdk/test/java/awt/Modal/ModalDialogMultiscreenTest/ModalDialogMultiscreenTest.java

diff --git a/jdk/test/java/awt/Modal/ModalDialogMultiscreenTest/ModalDialogMultiscreenTest.java b/jdk/test/java/awt/Modal/ModalDialogMultiscreenTest/ModalDialogMultiscreenTest.java
new file mode 100644
index 00000000000..156bfe5df0e
--- /dev/null
+++ b/jdk/test/java/awt/Modal/ModalDialogMultiscreenTest/ModalDialogMultiscreenTest.java
@@ -0,0 +1,441 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+  @test
+  @bug 6430802 8008379
+  @summary WM should not hang after show()/close()
+  @author anthony.petrov@sun.com: area=awt.modal
+  @run main/manual ModalDialogMultiscreenTest
+*/
+
+
+/**
+ * ModalDialogMultiscreenTest.java
+ *
+ * summary: Tests whether a WM will hang on show()/close() a modal dialog in multiscreen mode
+ */
+
+import java.awt.*;
+import java.awt.event.*;
+import javax.swing.*;
+
+
+public class ModalDialogMultiscreenTest
+{
+
+    private static class ButtonActionListener implements ActionListener {
+        JFrame frame;
+        JDialog dialog;
+        public ButtonActionListener(JFrame frame, JDialog dialog) {
+            this.frame = frame;
+            this.dialog = dialog;
+        }
+        public void actionPerformed(ActionEvent e) {
+            dialog.setLocationRelativeTo(frame);
+            dialog.setVisible(true);
+        }
+    }
+    public static class TestDialog extends JDialog {
+        public TestDialog(Frame owner, String title, boolean modal, GraphicsConfiguration gc) {
+            super(owner, title, modal, gc);
+            setSize(200, 100);
+            JButton button = new JButton("Close");
+            button.addActionListener(new ActionListener() {
+                public void actionPerformed(ActionEvent e) {
+                    dispose();
+                }
+            });
+            getContentPane().add(button);
+        }
+    }
+
+    private static void init()
+    {
+        GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
+        GraphicsDevice[] gs = ge.getScreenDevices();
+
+        Sysout.createDialog( );
+
+        if (gs.length < 2) {
+            System.out.println("Not multi-head environment, test not valid!");
+            ModalDialogMultiscreenTest.pass( );
+        }
+
+        String[] instructions =
+        {
+            "The test should be run on a multi-head X (non-xinerama) systems.",
+            "Otherwise click the Pass button right now.",
+            "You will see an open Frame on each screen your system has.",
+            "The frame has an 'Open dialog' button.",
+            "Clicking the button opens a modal dialog with a Close button.",
+            "The test procedure:",
+            "1. Open a dialog and close it with appropriate buttons.",
+            "2. Switch to another screen ($ DISPLAY=X.Y xprop)",
+            "3. Repeat steps 1-2 several times (about 3*<number-of-screens>)",
+            "If the test doesn't cause the window manager to hang, it's passed."
+        };
+        Sysout.printInstructions( instructions );
+
+
+        for (int i = 0; i < gs.length; i++) {
+            JFrame frame = new JFrame("Frame "+i,gs[i].getDefaultConfiguration());
+            JButton button = new JButton("Open Dialog");
+            button.setMinimumSize(new Dimension(200, 100));
+            button.setPreferredSize(new Dimension(200, 100));
+            button.setSize(new Dimension(200, 100));
+            button.addActionListener(new ButtonActionListener(frame, new TestDialog(frame, "Dialog #"+i, true, gs[i].getDefaultConfiguration())));
+            frame.getContentPane().add(button);
+            frame.pack();
+            frame.setVisible(true);
+        }
+
+    }//End  init()
+
+
+    //ap203012: NO MORE CHANGES BELOW THIS LINE
+
+
+
+    /*****************************************************
+     * Standard Test Machinery Section
+     * DO NOT modify anything in this section -- it's a
+     * standard chunk of code which has all of the
+     * synchronisation necessary for the test harness.
+     * By keeping it the same in all tests, it is easier
+     * to read and understand someone else's test, as
+     * well as insuring that all tests behave correctly
+     * with the test harness.
+     * There is a section following this for test-defined
+     * classes
+     ******************************************************/
+    private static boolean theTestPassed = false;
+    private static boolean testGeneratedInterrupt = false;
+    private static String failureMessage = "";
+
+    private static Thread mainThread = null;
+
+    private static int sleepTime = 300000;
+
+    public static void main( String args[] ) throws InterruptedException
+    {
+        mainThread = Thread.currentThread();
+        try
+        {
+            init();
+        }
+        catch( TestPassedException e )
+        {
+            //The test passed, so just return from main and harness will
+            // interepret this return as a pass
+            return;
+        }
+        //At this point, neither test passed nor test failed has been
+        // called -- either would have thrown an exception and ended the
+        // test, so we know we have multiple threads.
+
+        //Test involves other threads, so sleep and wait for them to
+        // called pass() or fail()
+        try
+        {
+            Thread.sleep( sleepTime );
+            //Timed out, so fail the test
+            throw new RuntimeException( "Timed out after " + sleepTime/1000 + " seconds" );
+        }
+        catch (InterruptedException e)
+        {
+            if( ! testGeneratedInterrupt ) throw e;
+
+            //reset flag in case hit this code more than once for some reason (just safety)
+            testGeneratedInterrupt = false;
+            if ( theTestPassed == false )
+            {
+                throw new RuntimeException( failureMessage );
+            }
+        }
+
+    }//main
+
+    public static synchronized void setTimeoutTo( int seconds )
+    {
+        sleepTime = seconds * 1000;
+    }
+
+    public static synchronized void pass()
+    {
+        Sysout.println( "The test passed." );
+        Sysout.println( "The test is over, hit  Ctl-C to stop Java VM" );
+        //first check if this is executing in main thread
+        if ( mainThread == Thread.currentThread() )
+        {
+            //Still in the main thread, so set the flag just for kicks,
+            // and throw a test passed exception which will be caught
+            // and end the test.
+            theTestPassed = true;
+            throw new TestPassedException();
+        }
+        //pass was called from a different thread, so set the flag and interrupt
+        // the main thead.
+        theTestPassed = true;
+        testGeneratedInterrupt = true;
+        mainThread.interrupt();
+    }//pass()
+
+    public static synchronized void fail()
+    {
+        //test writer didn't specify why test failed, so give generic
+        fail( "it just plain failed! :-)" );
+    }
+
+    public static synchronized void fail( String whyFailed )
+    {
+        Sysout.println( "The test failed: " + whyFailed );
+        Sysout.println( "The test is over, hit  Ctl-C to stop Java VM" );
+        //check if this called from main thread
+        if ( mainThread == Thread.currentThread() )
+        {
+            //If main thread, fail now 'cause not sleeping
+            throw new RuntimeException( whyFailed );
+        }
+        theTestPassed = false;
+        testGeneratedInterrupt = true;
+        failureMessage = whyFailed;
+        mainThread.interrupt();
+    }//fail()
+
+}// class ModalDialogMultiscreenTest
+
+//This exception is used to exit from any level of call nesting
+// when it's determined that the test has passed, and immediately
+// end the test.
+class TestPassedException extends RuntimeException
+{
+}
+
+//*********** End Standard Test Machinery Section **********
+
+
+//************ Begin classes defined for the test ****************
+
+// make listeners in a class defined here, and instantiate them in init()
+
+/* Example of a class which may be written as part of a test
+class NewClass implements anInterface
+ {
+   static int newVar = 0;
+
+   public void eventDispatched(AWTEvent e)
+    {
+      //Counting events to see if we get enough
+      eventCount++;
+
+      if( eventCount == 20 )
+       {
+         //got enough events, so pass
+
+         ModalDialogMultiscreenTest.pass();
+       }
+      else if( tries == 20 )
+       {
+         //tried too many times without getting enough events so fail
+
+         ModalDialogMultiscreenTest.fail();
+       }
+
+    }// eventDispatched()
+
+ }// NewClass class
+
+*/
+
+
+//************** End classes defined for the test *******************
+
+
+
+
+/****************************************************
+ Standard Test Machinery
+ DO NOT modify anything below -- it's a standard
+  chunk of code whose purpose is to make user
+  interaction uniform, and thereby make it simpler
+  to read and understand someone else's test.
+ ****************************************************/
+
+/**
+ This is part of the standard test machinery.
+ It creates a dialog (with the instructions), and is the interface
+  for sending text messages to the user.
+ To print the instructions, send an array of strings to Sysout.createDialog
+  WithInstructions method.  Put one line of instructions per array entry.
+ To display a message for the tester to see, simply call Sysout.println
+  with the string to be displayed.
+ This mimics System.out.println but works within the test harness as well
+  as standalone.
+ */
+
+class Sysout
+{
+    private static TestDialog dialog;
+
+    public static void createDialogWithInstructions( String[] instructions )
+    {
+        dialog = new TestDialog( new Frame(), "Instructions" );
+        dialog.printInstructions( instructions );
+        dialog.setVisible(true);
+        println( "Any messages for the tester will display here." );
+    }
+
+    public static void createDialog( )
+    {
+        dialog = new TestDialog( new Frame(), "Instructions" );
+        String[] defInstr = { "Instructions will appear here. ", "" } ;
+        dialog.printInstructions( defInstr );
+        dialog.setVisible(true);
+        println( "Any messages for the tester will display here." );
+    }
+
+
+    public static void printInstructions( String[] instructions )
+    {
+        dialog.printInstructions( instructions );
+    }
+
+
+    public static void println( String messageIn )
+    {
+        dialog.displayMessage( messageIn );
+    }
+
+}// Sysout  class
+
+/**
+  This is part of the standard test machinery.  It provides a place for the
+   test instructions to be displayed, and a place for interactive messages
+   to the user to be displayed.
+  To have the test instructions displayed, see Sysout.
+  To have a message to the user be displayed, see Sysout.
+  Do not call anything in this dialog directly.
+  */
+class TestDialog extends Dialog implements ActionListener
+{
+
+    TextArea instructionsText;
+    TextArea messageText;
+    int maxStringLength = 80;
+    Panel  buttonP = new Panel();
+    Button passB = new Button( "pass" );
+    Button failB = new Button( "fail" );
+
+    //DO NOT call this directly, go through Sysout
+    public TestDialog( Frame frame, String name )
+    {
+        super( frame, name );
+        int scrollBoth = TextArea.SCROLLBARS_BOTH;
+        instructionsText = new TextArea( "", 15, maxStringLength, scrollBoth );
+        add( "North", instructionsText );
+
+        messageText = new TextArea( "", 5, maxStringLength, scrollBoth );
+        add("Center", messageText);
+
+        passB = new Button( "pass" );
+        passB.setActionCommand( "pass" );
+        passB.addActionListener( this );
+        buttonP.add( "East", passB );
+
+        failB = new Button( "fail" );
+        failB.setActionCommand( "fail" );
+        failB.addActionListener( this );
+        buttonP.add( "West", failB );
+
+        add( "South", buttonP );
+        pack();
+
+        setVisible(true);
+    }// TestDialog()
+
+    //DO NOT call this directly, go through Sysout
+    public void printInstructions( String[] instructions )
+    {
+        //Clear out any current instructions
+        instructionsText.setText( "" );
+
+        //Go down array of instruction strings
+
+        String printStr, remainingStr;
+        for( int i=0; i < instructions.length; i++ )
+        {
+            //chop up each into pieces maxSringLength long
+            remainingStr = instructions[ i ];
+            while( remainingStr.length() > 0 )
+            {
+                //if longer than max then chop off first max chars to print
+                if( remainingStr.length() >= maxStringLength )
+                {
+                    //Try to chop on a word boundary
+                    int posOfSpace = remainingStr.
+                        lastIndexOf( ' ', maxStringLength - 1 );
+
+                    if( posOfSpace <= 0 ) posOfSpace = maxStringLength - 1;
+
+                    printStr = remainingStr.substring( 0, posOfSpace + 1 );
+                    remainingStr = remainingStr.substring( posOfSpace + 1 );
+                }
+                //else just print
+                else
+                {
+                    printStr = remainingStr;
+                    remainingStr = "";
+                }
+
+                instructionsText.append( printStr + "\n" );
+
+            }// while
+
+        }// for
+
+    }//printInstructions()
+
+    //DO NOT call this directly, go through Sysout
+    public void displayMessage( String messageIn )
+    {
+        messageText.append( messageIn + "\n" );
+        System.out.println(messageIn);
+    }
+
+    //catch presses of the passed and failed buttons.
+    //simply call the standard pass() or fail() static methods of
+    //ModalDialogMultiscreenTest
+    public void actionPerformed( ActionEvent e )
+    {
+        if( e.getActionCommand() == "pass" )
+        {
+            ModalDialogMultiscreenTest.pass();
+        }
+        else
+        {
+            ModalDialogMultiscreenTest.fail();
+        }
+    }
+
+}// TestDialog  class

From 564d7d3add5ba2a2cb2afbd9d14d59883dca8898 Mon Sep 17 00:00:00 2001
From: James Laskey <james.laskey@oracle.com>
Date: Tue, 19 Feb 2013 09:46:28 -0400
Subject: [PATCH 177/311] 8008420: Tweaks to make all NEWBUILD=false round 2

Reviewed-by: jjh
---
 nashorn/make/Makefile | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/nashorn/make/Makefile b/nashorn/make/Makefile
index 899f9362a82..280070337f8 100644
--- a/nashorn/make/Makefile
+++ b/nashorn/make/Makefile
@@ -129,11 +129,6 @@ else
   endif
 endif 
 
-ifdef ALT_BOOTDIR
-  ANT_OPTIONS += -Dboot.java.home=$(ALT_BOOTDIR)
-  ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
-endif
-
 # To facilitate bootstrapping, much of langtools can be compiled with (just)
 # a boot JDK. However, some source files need to be compiled against 
 # new JDK API. In a bootstrap build, an import JDK may not be available,

From 05a3bdceae77867dac24a6a4a3272a9e09d16ede Mon Sep 17 00:00:00 2001
From: Sean Coffey <coffeys@openjdk.org>
Date: Tue, 19 Feb 2013 14:07:25 +0000
Subject: [PATCH 178/311] 7197187: Currency.isPastCutoverDate should be made
 more robust

Reviewed-by: alanb
---
 jdk/src/share/classes/java/util/Currency.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/jdk/src/share/classes/java/util/Currency.java b/jdk/src/share/classes/java/util/Currency.java
index f201dae410a..aa792ea3175 100644
--- a/jdk/src/share/classes/java/util/Currency.java
+++ b/jdk/src/share/classes/java/util/Currency.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -702,7 +702,7 @@ public final class Currency implements Serializable {
                         " ignored since cutover date has not passed :" + curdata, null);
                 return;
             }
-        } catch (IndexOutOfBoundsException | NullPointerException | ParseException ex) {
+        } catch (ParseException ex) {
             info("currency.properties entry for " + ctry +
                         " ignored since exception encountered :" + ex.getMessage(), null);
             return;
@@ -732,8 +732,7 @@ public final class Currency implements Serializable {
         setMainTableEntry(ctry.charAt(0), ctry.charAt(1), entry);
     }
 
-    private static boolean isPastCutoverDate(String s)
-            throws IndexOutOfBoundsException, NullPointerException, ParseException {
+    private static boolean isPastCutoverDate(String s) throws ParseException {
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.ROOT);
         format.setTimeZone(TimeZone.getTimeZone("UTC"));
         format.setLenient(false);

From 117010c6ec3bf38059f43a08787755ce888a6d3e Mon Sep 17 00:00:00 2001
From: Sean Coffey <coffeys@openjdk.org>
Date: Tue, 19 Feb 2013 14:12:09 +0000
Subject: [PATCH 179/311] 8007315: HttpURLConnection.filterHeaderField method
 returns null where empty string is expected

Reviewed-by: chegar
---
 .../www/protocol/http/HttpURLConnection.java  |  4 +--
 .../sun/net/www/protocol/http/HttpOnly.java   | 36 +++++++++++++++++--
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java b/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
index 8003b5a5433..711a1b15a84 100644
--- a/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
+++ b/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2637,7 +2637,7 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
                 multipleCookies = true;
             }
 
-            return retValue.length() == 0 ? null : retValue.toString();
+            return retValue.length() == 0 ? "" : retValue.toString();
         }
 
         return value;
diff --git a/jdk/test/sun/net/www/protocol/http/HttpOnly.java b/jdk/test/sun/net/www/protocol/http/HttpOnly.java
index 60596bad219..6a2ce8256d9 100644
--- a/jdk/test/sun/net/www/protocol/http/HttpOnly.java
+++ b/jdk/test/sun/net/www/protocol/http/HttpOnly.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,7 @@
  */
 /**
  * @test
- * @bug 7095980
+ * @bug 7095980 8007315
  * @summary Ensure HttpURLConnection (and supporting APIs) don't expose
  *          HttpOnly cookies
  */
@@ -52,6 +52,8 @@ import com.sun.net.httpserver.HttpServer;
  * 4) check HttpOnly cookies received by server
  * 5) server reply with Set-Cookie containing HttpOnly cookie
  * 6) check HttpOnly cookies are not accessible from Http client
+ * 7) check that non-null (empty string) values are returned for
+      scenario where all values are stripped from original key values
  */
 
 public class HttpOnly {
@@ -177,6 +179,36 @@ public class HttpOnly {
                           " value " + val);
             }
         }
+
+        // TEST 7 : check that header keys containing empty key values don't return null
+        int i = 1;
+        String key = "";
+        String value = "";
+
+        while (true) {
+            key = uc.getHeaderFieldKey(i);
+            value = uc.getHeaderField(i++);
+            if (key == null && value == null)
+                break;
+
+            if (key != null)
+                check(value != null,
+                    "Encountered a null value for key value : " + key);
+        }
+
+        // TEST 7.5 similar test but use getHeaderFields
+        respHeaders = uc.getHeaderFields();
+        respEntries = respHeaders.entrySet();
+        for (Map.Entry<String,List<String>> entry : respEntries) {
+            String header = entry.getKey();
+            if (header != null) {
+                List<String> listValues = entry.getValue();
+                for (String value1 : listValues)
+                    check(value1 != null,
+                        "getHeaderFields returned null values for header:, "
+                        + header);
+            }
+        }
     }
 
     // HTTP Server

From be8f1b2b3577c5aa58a6033a0c0df2fc4c263d1b Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Tue, 19 Feb 2013 20:33:07 +0530
Subject: [PATCH 180/311] 8008448: Add coverage test for
 jdk.nashorn.internal.ir.debug.JSONWriter

Reviewed-by: jlaskey, attila
---
 .../nashorn/internal/ir/debug/JSONWriter.java | 25 +++++++---
 nashorn/test/script/basic/JDK-8008448.js      | 48 +++++++++++++++++++
 2 files changed, 66 insertions(+), 7 deletions(-)
 create mode 100644 nashorn/test/script/basic/JDK-8008448.js

diff --git a/nashorn/src/jdk/nashorn/internal/ir/debug/JSONWriter.java b/nashorn/src/jdk/nashorn/internal/ir/debug/JSONWriter.java
index 79d93499161..bb42e30320c 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/debug/JSONWriter.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/debug/JSONWriter.java
@@ -323,16 +323,20 @@ public final class JSONWriter extends NodeVisitor {
     public Node enter(final ForNode forNode) {
         enterDefault(forNode);
 
-        if (forNode.isForIn() || forNode.isForEach()) {
+        if (forNode.isForIn() || (forNode.isForEach() && forNode.getInit() != null)) {
             type("ForInStatement");
             comma();
 
+            Node init = forNode.getInit();
+            assert init != null;
             property("left");
-            forNode.getInit().accept(this);
+            init.accept(this);
             comma();
 
+            Node modify = forNode.getModify();
+            assert modify != null;
             property("right");
-            forNode.getModify().accept(this);
+            modify.accept(this);
             comma();
 
             property("body");
@@ -618,6 +622,9 @@ public final class JSONWriter extends NodeVisitor {
             // setter
             final Node setter = propertyNode.getSetter();
             if (setter != null) {
+                if (getter != null) {
+                    comma();
+                }
                 objectStart();
                 location(propertyNode);
 
@@ -770,11 +777,11 @@ public final class JSONWriter extends NodeVisitor {
             final boolean prefix;
             final String operator;
             switch (tokenType) {
-                case DECPOSTFIX:
+                case INCPOSTFIX:
                     prefix = false;
                     operator = "++";
                     break;
-                case INCPOSTFIX:
+                case DECPOSTFIX:
                     prefix = false;
                     operator = "--";
                     break;
@@ -938,8 +945,12 @@ public final class JSONWriter extends NodeVisitor {
         int idx = 0;
         arrayStart(name);
         for (final Node node : nodes) {
-            if (! node.isDebug()) {
-                node.accept(this);
+            if (node == null || !node.isDebug()) {
+                if (node != null) {
+                    node.accept(this);
+                } else {
+                    nullValue();
+                }
                 if (idx != (size - 1)) {
                     comma();
                 }
diff --git a/nashorn/test/script/basic/JDK-8008448.js b/nashorn/test/script/basic/JDK-8008448.js
new file mode 100644
index 00000000000..d5ffbd4c729
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8008448.js
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8008448: Add coverage test for jdk.nashorn.internal.ir.debug.JSONWriter
+ * Ensure that all parseable files can be parsed using parser API.
+ *
+ * @test
+ * @option -scripting
+ * @run
+ */
+
+var File = Java.type("java.io.File");
+var FilenameFilter = Java.type("java.io.FilenameFilter");
+var Source = Java.type("jdk.nashorn.internal.runtime.Source")
+
+// Filter out non .js files
+var files = new File(__DIR__).listFiles(new FilenameFilter() {
+    accept: function(f, n) { return n.endsWith(".js") }
+});
+
+// load parser API
+load("nashorn:parser.js");
+
+// parse each file to make sure it does not result in exception
+for each (var f in files) {
+    parse(new Source(f.toString(), f).getString());
+}

From a97003cb2242d44f567200b78cb0604878c2e677 Mon Sep 17 00:00:00 2001
From: Konstantin Shefov <kshefov@openjdk.org>
Date: Tue, 19 Feb 2013 20:00:02 +0400
Subject: [PATCH 181/311] 8006070: TEST_BUG: Up and down the Y coordinate of
 the mouse position, the selected item doesn't change for the single list

Reviewed-by: serb, anthony
---
 .../MouseDraggedOutCauseScrollingTest.html    |  43 +++
 .../MouseDraggedOutCauseScrollingTest.java    | 246 ++++++++++++++++++
 2 files changed, 289 insertions(+)
 create mode 100644 jdk/test/java/awt/List/MouseDraggedOutCauseScrollingTest/MouseDraggedOutCauseScrollingTest.html
 create mode 100644 jdk/test/java/awt/List/MouseDraggedOutCauseScrollingTest/MouseDraggedOutCauseScrollingTest.java

diff --git a/jdk/test/java/awt/List/MouseDraggedOutCauseScrollingTest/MouseDraggedOutCauseScrollingTest.html b/jdk/test/java/awt/List/MouseDraggedOutCauseScrollingTest/MouseDraggedOutCauseScrollingTest.html
new file mode 100644
index 00000000000..7049e827033
--- /dev/null
+++ b/jdk/test/java/awt/List/MouseDraggedOutCauseScrollingTest/MouseDraggedOutCauseScrollingTest.html
@@ -0,0 +1,43 @@
+<html>
+<!--
+  Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+
+  This code is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License version 2 only, as
+  published by the Free Software Foundation.
+
+  This code is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+  version 2 for more details (a copy is included in the LICENSE file that
+  accompanied this code).
+
+  You should have received a copy of the GNU General Public License version
+  2 along with this work; if not, write to the Free Software Foundation,
+  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+
+  Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+  or visit www.oracle.com if you need additional information or have any
+  questions.
+  -->
+
+<!--  
+  @test
+  @bug 6243382 8006070
+  @summary Dragging of mouse outside of a List and Choice area don't work properly on XAWT
+  @author Dmitry.Cherepanov@SUN.COM area=awt.list
+  @run applet/manual=yesno MouseDraggedOutCauseScrollingTest.html
+  -->
+<head>
+<title> ManualYesNoTest </title>
+</head>
+<body>
+
+<h1>ManualYesNoTest<br>Bug ID: </h1>
+
+<p> See the dialog box (usually in upper left corner) for instructions</p>
+
+<APPLET CODE="MouseDraggedOutCauseScrollingTest.class" WIDTH=200 HEIGHT=200></APPLET>
+</body>
+</html>
diff --git a/jdk/test/java/awt/List/MouseDraggedOutCauseScrollingTest/MouseDraggedOutCauseScrollingTest.java b/jdk/test/java/awt/List/MouseDraggedOutCauseScrollingTest/MouseDraggedOutCauseScrollingTest.java
new file mode 100644
index 00000000000..8b509a12311
--- /dev/null
+++ b/jdk/test/java/awt/List/MouseDraggedOutCauseScrollingTest/MouseDraggedOutCauseScrollingTest.java
@@ -0,0 +1,246 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+  test
+  @bug 6243382 8006070
+  @summary Dragging of mouse outside of a List and Choice area don't work properly on XAWT
+  @author Dmitry.Cherepanov@SUN.COM area=awt.list
+  @run applet/manual=yesno MouseDraggedOutCauseScrollingTest.html
+*/
+
+import java.applet.Applet;
+import java.awt.*;
+
+public class MouseDraggedOutCauseScrollingTest extends Applet
+{
+    Choice choice;
+    List singleList;
+    List multipleList;
+
+    public void init()
+    {
+        this.setLayout (new GridLayout (1, 3));
+
+        choice = new Choice();
+        singleList = new List(3, false);
+        multipleList = new List(3, true);
+
+        choice.add("Choice");
+        for (int i = 1; i < 100; i++){
+            choice.add(""+i);
+        }
+
+        singleList.add("Single list");
+        for (int i = 1; i < 100; i++)
+            singleList.add(""+i);
+
+        multipleList.add("Multiple list");
+        for (int i = 1; i < 100; i++)
+            multipleList.add(""+i);
+
+        this.add(choice);
+        this.add(singleList);
+        this.add(multipleList);
+
+        String toolkitName = Toolkit.getDefaultToolkit().getClass().getName();
+        if (!toolkitName.equals("sun.awt.X11.XToolkit")) {
+            String[] instructions =
+            {
+                "This test is not applicable to the current platform. Press PASS"
+            };
+            Sysout.createDialogWithInstructions( instructions );
+        } else {
+            String[] instructions =
+            {
+                "0) Please note, that this is only Motif/XAWT test. At first, make the applet active",
+                "1.1) Click on the choice",
+                "1.2) Press the left button of the mouse and keep on any item of the choice, for example 5",
+                "1.3) Drag mouse out of the area of the unfurled list, at the same time hold the X coordinate of the mouse position about the same",
+                "1.4) To make sure, that when the Y coordinate of the mouse position higher of the upper bound of the list then scrolling UP of the list and selected item changes on the upper. If not, the test failed",
+                "1.5) To make sure, that when the Y coordinate of the mouse position under of the lower bound of the list then scrolling DOWN of the list and selected item changes on the lower. If not, the test failed",
+                "-----------------------------------",
+                "2.1) Click on the single list",
+                "2.2) Press the left button of the mouse and keep on any item of the list, for example 5",
+                "2.3) Drag mouse out of the area of the unfurled list, at the same time hold the X coordinate of the mouse position about the same",
+                "2.4) To make sure, that when the Y coordinate of the mouse position higher of the upper bound of the list then scrolling UP of the list and selected item changes on the upper. If not, the test failed",
+                "2.5) To make sure, that when the Y coordinate of the mouse position under of the lower bound of the list then scrolling DOWN of the list and selected item changes on the lower. If not, the test failed",
+                "-----------------------------------",
+                "3.1) Click on the multiple list",
+                "3.2) Press the left button of the mouse and keep on any item of the list, for example 5",
+                "3.3) Drag mouse out of the area of the unfurled list, at the same time hold the X coordinate of the mouse position about the same",
+                "3.4) To make sure, that when the Y coordinate of the mouse position higher of the upper bound of the list then scrolling of the list NO OCCURED and selected item NO CHANGES on the upper. If not, the test failed",
+                "3.5) To make sure, that when the Y coordinate of the mouse position under of the lower bound of the list then scrolling of the list NO OCCURED and selected item NO CHANGES on the lower. If not, the test failed",
+                "4) Test passed."
+            };
+            Sysout.createDialogWithInstructions( instructions );
+        }
+
+    }//End  init()
+
+    public void start ()
+    {
+        setSize (400,100);
+        setVisible(true);
+        validate();
+
+    }// start()
+
+}// class ManualYesNoTest
+
+/****************************************************
+ Standard Test Machinery
+ DO NOT modify anything below -- it's a standard
+  chunk of code whose purpose is to make user
+  interaction uniform, and thereby make it simpler
+  to read and understand someone else's test.
+ ****************************************************/
+
+/**
+ This is part of the standard test machinery.
+ It creates a dialog (with the instructions), and is the interface
+  for sending text messages to the user.
+ To print the instructions, send an array of strings to Sysout.createDialog
+  WithInstructions method.  Put one line of instructions per array entry.
+ To display a message for the tester to see, simply call Sysout.println
+  with the string to be displayed.
+ This mimics System.out.println but works within the test harness as well
+  as standalone.
+ */
+
+class Sysout
+{
+    private static TestDialog dialog;
+
+    public static void createDialogWithInstructions( String[] instructions )
+    {
+        dialog = new TestDialog( new Frame(), "Instructions" );
+        dialog.printInstructions( instructions );
+        dialog.setVisible(true);
+        println( "Any messages for the tester will display here." );
+    }
+
+    public static void createDialog( )
+    {
+        dialog = new TestDialog( new Frame(), "Instructions" );
+        String[] defInstr = { "Instructions will appear here. ", "" } ;
+        dialog.printInstructions( defInstr );
+        dialog.setVisible(true);
+        println( "Any messages for the tester will display here." );
+    }
+
+
+    public static void printInstructions( String[] instructions )
+    {
+        dialog.printInstructions( instructions );
+    }
+
+
+    public static void println( String messageIn )
+    {
+        dialog.displayMessage( messageIn );
+    }
+
+}// Sysout  class
+
+/**
+  This is part of the standard test machinery.  It provides a place for the
+   test instructions to be displayed, and a place for interactive messages
+   to the user to be displayed.
+  To have the test instructions displayed, see Sysout.
+  To have a message to the user be displayed, see Sysout.
+  Do not call anything in this dialog directly.
+  */
+class TestDialog extends Dialog
+{
+
+    TextArea instructionsText;
+    TextArea messageText;
+    int maxStringLength = 80;
+
+    //DO NOT call this directly, go through Sysout
+    public TestDialog( Frame frame, String name )
+    {
+        super( frame, name );
+        int scrollBoth = TextArea.SCROLLBARS_BOTH;
+        instructionsText = new TextArea( "", 15, maxStringLength, scrollBoth );
+        add( "North", instructionsText );
+
+        messageText = new TextArea( "", 5, maxStringLength, scrollBoth );
+        add("Center", messageText);
+
+        pack();
+
+        setVisible(true);
+    }// TestDialog()
+
+    //DO NOT call this directly, go through Sysout
+    public void printInstructions( String[] instructions )
+    {
+        //Clear out any current instructions
+        instructionsText.setText( "" );
+
+        //Go down array of instruction strings
+
+        String printStr, remainingStr;
+        for( int i=0; i < instructions.length; i++ )
+        {
+            //chop up each into pieces maxSringLength long
+            remainingStr = instructions[ i ];
+            while( remainingStr.length() > 0 )
+            {
+                //if longer than max then chop off first max chars to print
+                if( remainingStr.length() >= maxStringLength )
+                {
+                    //Try to chop on a word boundary
+                    int posOfSpace = remainingStr.
+                        lastIndexOf( ' ', maxStringLength - 1 );
+
+                    if( posOfSpace <= 0 ) posOfSpace = maxStringLength - 1;
+
+                    printStr = remainingStr.substring( 0, posOfSpace + 1 );
+                    remainingStr = remainingStr.substring( posOfSpace + 1 );
+                }
+                //else just print
+                else
+                {
+                    printStr = remainingStr;
+                    remainingStr = "";
+                }
+
+                instructionsText.append( printStr + "\n" );
+
+            }// while
+
+        }// for
+
+    }//printInstructions()
+
+    //DO NOT call this directly, go through Sysout
+    public void displayMessage( String messageIn )
+    {
+        messageText.append( messageIn + "\n" );
+        System.out.println(messageIn);
+    }
+
+}// TestDialog  class

From 8d2a55d5b7185e88dd46420dce4eec477b41a37c Mon Sep 17 00:00:00 2001
From: John Zavgren <jzavgren@openjdk.org>
Date: Tue, 19 Feb 2013 16:19:09 +0000
Subject: [PATCH 182/311] 8007609: WinNTFileSystem_md.c should correctly check
 value returned from realloc

Reviewed-by: alanb, chegar, dholmes
---
 jdk/src/windows/native/java/io/WinNTFileSystem_md.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/jdk/src/windows/native/java/io/WinNTFileSystem_md.c b/jdk/src/windows/native/java/io/WinNTFileSystem_md.c
index f1eb449275e..60cc71e0aeb 100644
--- a/jdk/src/windows/native/java/io/WinNTFileSystem_md.c
+++ b/jdk/src/windows/native/java/io/WinNTFileSystem_md.c
@@ -36,9 +36,7 @@
 #include <windows.h>
 #include <io.h>
 
-#include "jvm.h"
 #include "jni.h"
-#include "jni_util.h"
 #include "io_util.h"
 #include "jlong.h"
 #include "io_util_md.h"
@@ -115,13 +113,15 @@ static WCHAR* getFinalPath(const WCHAR *path)
         DWORD len = (*GetFinalPathNameByHandle_func)(h, result, MAX_PATH, 0);
         if (len >= MAX_PATH) {
             /* retry with a buffer of the right size */
-            result = (WCHAR*)realloc(result, (len+1) * sizeof(WCHAR));
-            if (result != NULL) {
+            WCHAR* newResult = (WCHAR*)realloc(result, (len+1) * sizeof(WCHAR));
+            if (newResult != NULL) {
+                result = newResult;
                 len = (*GetFinalPathNameByHandle_func)(h, result, len, 0);
             } else {
                 len = 0;
             }
         }
+
         if (len > 0) {
             /**
              * Strip prefix (should be \\?\ or \\?\UNC)

From 78fe727c6d75fdb4de25144dbaaa25cbc9b43e81 Mon Sep 17 00:00:00 2001
From: Eric McCorkle <emc@openjdk.org>
Date: Tue, 19 Feb 2013 17:09:25 +0000
Subject: [PATCH 183/311] 8008312: Re-enable MethodParameter tests in JDK

Reviewed-by: darcy
---
 .../classes/java/lang/reflect/Parameter.java  |  4 ++-
 .../reflect/Parameter/WithParameters.java     | 25 +++++++++----------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/jdk/src/share/classes/java/lang/reflect/Parameter.java b/jdk/src/share/classes/java/lang/reflect/Parameter.java
index 9c808310c0c..e479bfd9326 100644
--- a/jdk/src/share/classes/java/lang/reflect/Parameter.java
+++ b/jdk/src/share/classes/java/lang/reflect/Parameter.java
@@ -115,7 +115,9 @@ public final class Parameter implements AnnotatedElement {
             (type.toString());
 
         sb.append(Modifier.toString(getModifiers()));
-        sb.append(" ");
+
+        if(0 != modifiers)
+            sb.append(" ");
 
         if(isVarArgs())
             sb.append(typename.replaceFirst("\\[\\]$", "..."));
diff --git a/jdk/test/java/lang/reflect/Parameter/WithParameters.java b/jdk/test/java/lang/reflect/Parameter/WithParameters.java
index c4ffec6de30..bddebf1c782 100644
--- a/jdk/test/java/lang/reflect/Parameter/WithParameters.java
+++ b/jdk/test/java/lang/reflect/Parameter/WithParameters.java
@@ -22,7 +22,6 @@
  */
 
 /*
- * @ignore
  * @test
  * @compile -parameters WithParameters.java
  * @run main WithParameters
@@ -85,8 +84,8 @@ public class WithParameters {
                         error++;
                     }
                 }
-                if(parameters[0].toString().equals("int quux")) {
-                    System.err.println("toString for quux is wrong");
+                if(!parameters[0].toString().equals("final int quux")) {
+                    System.err.println("toString for quux is wrong, expected \"final int quux\", got \"" + parameters[0] + "\"");
                     error++;
                 }
                 if(parameters[0].getModifiers() != Modifier.FINAL) {
@@ -101,8 +100,8 @@ public class WithParameters {
                     System.err.println("getParameterizedType for quux is wrong");
                     error++;
                 }
-                if(parameters[1].toString().equals("WithParameters$Foo quuux")) {
-                    System.err.println("toString for quuux is wrong");
+                if(!parameters[1].toString().equals("WithParameters$Foo quuux")) {
+                    System.err.println("toString for quuux is wrong, expected \"WithParameters$Foo quuux\", got \"" + parameters[1] + "\"");
                     error++;
                 }
                 if(parameters[1].isVarArgs()) {
@@ -121,8 +120,8 @@ public class WithParameters {
                     System.err.println("getAnnotations has the wrong annotation");
                     error++;
                 }
-                if(parameters[2].toString().equals("java.util.List<?> quuux")) {
-                    System.err.println("toString for l is wrong");
+                if(!parameters[2].toString().equals("java.util.List<?> l")) {
+                    System.err.println("toString for l is wrong, expected \"java.util.List<?> l\", got \"" + parameters[2] + "\"");
                     error++;
                 }
                 if(parameters[2].isVarArgs()) {
@@ -149,8 +148,8 @@ public class WithParameters {
                         error++;
                     }
                 }
-                if(parameters[3].toString().equals("java.util.List<WithParameters$Foo> l")) {
-                    System.err.println("toString for l2 is wrong");
+                if(!parameters[3].toString().equals("java.util.List<WithParameters$Foo> l2")) {
+                    System.err.println("toString for l2 is wrong, expected \"java.util.List<WithParameters$Foo> l2\", got \"" + parameters[3] + "\"");
                     error++;
                 }
                 if(parameters[3].isVarArgs()) {
@@ -177,8 +176,8 @@ public class WithParameters {
                         error++;
                     }
                 }
-                if(parameters[4].toString().equals("java.util.List<? extends WithParameters$Foo> l")) {
-                    System.err.println("toString for l3 is wrong");
+                if(!parameters[4].toString().equals("java.util.List<? extends WithParameters$Foo> l3")) {
+                    System.err.println("toString for l3 is wrong, expected \"java.util.List<? extends WithParameters$Foo> l3\", got \"" + parameters[3] + "\"");
                     error++;
                 }
                 if(parameters[4].isVarArgs()) {
@@ -212,8 +211,8 @@ public class WithParameters {
                         }
                     }
                 }
-                if(parameters[5].toString().equals("java.lang.String... rest")) {
-                    System.err.println("toString for l is wrong");
+                if(!parameters[5].toString().equals("java.lang.String... rest")) {
+                    System.err.println("toString for rest is wrong, expected \"java.lang.String... rest\", got \"" + parameters[5] + "\"");
                     error++;
                 }
                 if(!parameters[5].isVarArgs()) {

From 872cd491a72ff586ad960d40f1c7760d62a4a500 Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Tue, 19 Feb 2013 10:34:26 -0800
Subject: [PATCH 184/311] 7092447: Clarify the default locale used in each
 locale sensitive operation

Reviewed-by: okutsu
---
 .../share/classes/java/text/DateFormat.java   | 42 ++++++++++++---
 .../classes/java/text/DateFormatSymbols.java  | 13 ++++-
 .../classes/java/text/DecimalFormat.java      |  6 ++-
 .../java/text/DecimalFormatSymbols.java       | 13 ++++-
 .../classes/java/text/MessageFormat.java      |  3 +-
 .../share/classes/java/text/NumberFormat.java | 37 ++++++++++++--
 .../classes/java/text/SimpleDateFormat.java   | 11 +++-
 .../time/format/DateTimeFormatSymbols.java    |  8 ++-
 jdk/src/share/classes/java/util/Calendar.java |  9 ++--
 jdk/src/share/classes/java/util/Currency.java | 20 ++++++--
 .../share/classes/java/util/Formatter.java    | 51 ++++++++++++-------
 .../classes/java/util/GregorianCalendar.java  |  6 ++-
 jdk/src/share/classes/java/util/Locale.java   | 42 ++++++++++-----
 jdk/src/share/classes/java/util/Scanner.java  |  5 +-
 14 files changed, 204 insertions(+), 62 deletions(-)

diff --git a/jdk/src/share/classes/java/text/DateFormat.java b/jdk/src/share/classes/java/text/DateFormat.java
index d1bb6e682dd..fcb21e6928c 100644
--- a/jdk/src/share/classes/java/text/DateFormat.java
+++ b/jdk/src/share/classes/java/text/DateFormat.java
@@ -439,7 +439,12 @@ public abstract class DateFormat extends Format {
 
     /**
      * Gets the time formatter with the default formatting style
-     * for the default locale.
+     * for the default {@link java.util.Locale.Category#FORMAT FORMAT} locale.
+     * <p>This is equivalent to calling
+     * {@link #getTimeInstance(int, Locale) getTimeInstance(DEFAULT,
+     *     Locale.getDefault(Locale.Category.FORMAT))}.
+     * @see java.util.Locale#getDefault(java.util.Locale.Category)
+     * @see java.util.Locale.Category#FORMAT
      * @return a time formatter.
      */
     public final static DateFormat getTimeInstance()
@@ -449,7 +454,12 @@ public abstract class DateFormat extends Format {
 
     /**
      * Gets the time formatter with the given formatting style
-     * for the default locale.
+     * for the default {@link java.util.Locale.Category#FORMAT FORMAT} locale.
+     * <p>This is equivalent to calling
+     * {@link #getTimeInstance(int, Locale) getTimeInstance(style,
+     *     Locale.getDefault(Locale.Category.FORMAT))}.
+     * @see java.util.Locale#getDefault(java.util.Locale.Category)
+     * @see java.util.Locale.Category#FORMAT
      * @param style the given formatting style. For example,
      * SHORT for "h:mm a" in the US locale.
      * @return a time formatter.
@@ -475,7 +485,12 @@ public abstract class DateFormat extends Format {
 
     /**
      * Gets the date formatter with the default formatting style
-     * for the default locale.
+     * for the default {@link java.util.Locale.Category#FORMAT FORMAT} locale.
+     * <p>This is equivalent to calling
+     * {@link #getDateInstance(int, Locale) getDateInstance(DEFAULT,
+     *     Locale.getDefault(Locale.Category.FORMAT))}.
+     * @see java.util.Locale#getDefault(java.util.Locale.Category)
+     * @see java.util.Locale.Category#FORMAT
      * @return a date formatter.
      */
     public final static DateFormat getDateInstance()
@@ -485,7 +500,12 @@ public abstract class DateFormat extends Format {
 
     /**
      * Gets the date formatter with the given formatting style
-     * for the default locale.
+     * for the default {@link java.util.Locale.Category#FORMAT FORMAT} locale.
+     * <p>This is equivalent to calling
+     * {@link #getDateInstance(int, Locale) getDateInstance(style,
+     *     Locale.getDefault(Locale.Category.FORMAT))}.
+     * @see java.util.Locale#getDefault(java.util.Locale.Category)
+     * @see java.util.Locale.Category#FORMAT
      * @param style the given formatting style. For example,
      * SHORT for "M/d/yy" in the US locale.
      * @return a date formatter.
@@ -511,7 +531,12 @@ public abstract class DateFormat extends Format {
 
     /**
      * Gets the date/time formatter with the default formatting style
-     * for the default locale.
+     * for the default {@link java.util.Locale.Category#FORMAT FORMAT} locale.
+     * <p>This is equivalent to calling
+     * {@link #getDateTimeInstance(int, int, Locale) getDateTimeInstance(DEFAULT,
+     *     DEFAULT, Locale.getDefault(Locale.Category.FORMAT))}.
+     * @see java.util.Locale#getDefault(java.util.Locale.Category)
+     * @see java.util.Locale.Category#FORMAT
      * @return a date/time formatter.
      */
     public final static DateFormat getDateTimeInstance()
@@ -521,7 +546,12 @@ public abstract class DateFormat extends Format {
 
     /**
      * Gets the date/time formatter with the given date and time
-     * formatting styles for the default locale.
+     * formatting styles for the default {@link java.util.Locale.Category#FORMAT FORMAT} locale.
+     * <p>This is equivalent to calling
+     * {@link #getDateTimeInstance(int, int, Locale) getDateTimeInstance(dateStyle,
+     *     timeStyle, Locale.getDefault(Locale.Category.FORMAT))}.
+     * @see java.util.Locale#getDefault(java.util.Locale.Category)
+     * @see java.util.Locale.Category#FORMAT
      * @param dateStyle the given date formatting style. For example,
      * SHORT for "M/d/yy" in the US locale.
      * @param timeStyle the given time formatting style. For example,
diff --git a/jdk/src/share/classes/java/text/DateFormatSymbols.java b/jdk/src/share/classes/java/text/DateFormatSymbols.java
index b4c380d2c05..80e4f03a38a 100644
--- a/jdk/src/share/classes/java/text/DateFormatSymbols.java
+++ b/jdk/src/share/classes/java/text/DateFormatSymbols.java
@@ -104,14 +104,19 @@ public class DateFormatSymbols implements Serializable, Cloneable {
 
     /**
      * Construct a DateFormatSymbols object by loading format data from
-     * resources for the default locale. This constructor can only
+     * resources for the default {@link java.util.Locale.Category#FORMAT FORMAT}
+     * locale. This constructor can only
      * construct instances for the locales supported by the Java
      * runtime environment, not for those supported by installed
      * {@link java.text.spi.DateFormatSymbolsProvider DateFormatSymbolsProvider}
      * implementations. For full locale coverage, use the
      * {@link #getInstance(Locale) getInstance} method.
-     *
+     * <p>This is equivalent to calling
+     * {@link #DateFormatSymbols(Locale)
+     *     DateFormatSymbols(Locale.getDefault(Locale.Category.FORMAT))}.
      * @see #getInstance()
+     * @see java.util.Locale#getDefault(java.util.Locale.Category)
+     * @see java.util.Locale.Category#FORMAT
      * @exception  java.util.MissingResourceException
      *             if the resources for the default locale cannot be
      *             found or cannot be loaded.
@@ -302,6 +307,10 @@ public class DateFormatSymbols implements Serializable, Cloneable {
      * as for those supported by installed
      * {@link java.text.spi.DateFormatSymbolsProvider DateFormatSymbolsProvider}
      * implementations.
+     * <p>This is equivalent to calling {@link #getInstance(Locale)
+     *     getInstance(Locale.getDefault(Locale.Category.FORMAT))}.
+     * @see java.util.Locale#getDefault(java.util.Locale.Category)
+     * @see java.util.Locale.Category#FORMAT
      * @return a <code>DateFormatSymbols</code> instance.
      * @since 1.6
      */
diff --git a/jdk/src/share/classes/java/text/DecimalFormat.java b/jdk/src/share/classes/java/text/DecimalFormat.java
index 38c930372c1..bd37b2ed471 100644
--- a/jdk/src/share/classes/java/text/DecimalFormat.java
+++ b/jdk/src/share/classes/java/text/DecimalFormat.java
@@ -381,7 +381,8 @@ public class DecimalFormat extends NumberFormat {
 
     /**
      * Creates a DecimalFormat using the default pattern and symbols
-     * for the default locale. This is a convenient way to obtain a
+     * for the default {@link java.util.Locale.Category#FORMAT FORMAT} locale.
+     * This is a convenient way to obtain a
      * DecimalFormat when internationalization is not the main concern.
      * <p>
      * To obtain standard formats for a given locale, use the factory methods
@@ -411,7 +412,8 @@ public class DecimalFormat extends NumberFormat {
 
     /**
      * Creates a DecimalFormat using the given pattern and the symbols
-     * for the default locale. This is a convenient way to obtain a
+     * for the default {@link java.util.Locale.Category#FORMAT FORMAT} locale.
+     * This is a convenient way to obtain a
      * DecimalFormat when internationalization is not the main concern.
      * <p>
      * To obtain standard formats for a given locale, use the factory methods
diff --git a/jdk/src/share/classes/java/text/DecimalFormatSymbols.java b/jdk/src/share/classes/java/text/DecimalFormatSymbols.java
index 9274208fe8f..f0b2212eaf5 100644
--- a/jdk/src/share/classes/java/text/DecimalFormatSymbols.java
+++ b/jdk/src/share/classes/java/text/DecimalFormatSymbols.java
@@ -71,13 +71,19 @@ import sun.util.locale.provider.ResourceBundleBasedAdapter;
 public class DecimalFormatSymbols implements Cloneable, Serializable {
 
     /**
-     * Create a DecimalFormatSymbols object for the default locale.
+     * Create a DecimalFormatSymbols object for the default
+     * {@link java.util.Locale.Category#FORMAT FORMAT} locale.
      * This constructor can only construct instances for the locales
      * supported by the Java runtime environment, not for those
      * supported by installed
      * {@link java.text.spi.DecimalFormatSymbolsProvider DecimalFormatSymbolsProvider}
      * implementations. For full locale coverage, use the
      * {@link #getInstance(Locale) getInstance} method.
+     * <p>This is equivalent to calling
+     * {@link #DecimalFormatSymbols(Locale)
+     *     DecimalFormatSymbols(Locale.getDefault(Locale.Category.FORMAT))}.
+     * @see java.util.Locale#getDefault(java.util.Locale.Category)
+     * @see java.util.Locale.Category#FORMAT
      */
     public DecimalFormatSymbols() {
         initialize( Locale.getDefault(Locale.Category.FORMAT) );
@@ -133,6 +139,11 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
      * as for those supported by installed
      * {@link java.text.spi.DecimalFormatSymbolsProvider
      * DecimalFormatSymbolsProvider} implementations.
+     * <p>This is equivalent to calling
+     * {@link #getInstance(Locale)
+     *     getInstance(Locale.getDefault(Locale.Category.FORMAT))}.
+     * @see java.util.Locale#getDefault(java.util.Locale.Category)
+     * @see java.util.Locale.Category#FORMAT
      * @return a <code>DecimalFormatSymbols</code> instance.
      * @since 1.6
      */
diff --git a/jdk/src/share/classes/java/text/MessageFormat.java b/jdk/src/share/classes/java/text/MessageFormat.java
index e695b37a679..e5c8c811f04 100644
--- a/jdk/src/share/classes/java/text/MessageFormat.java
+++ b/jdk/src/share/classes/java/text/MessageFormat.java
@@ -348,7 +348,8 @@ public class MessageFormat extends Format {
     private static final long serialVersionUID = 6479157306784022952L;
 
     /**
-     * Constructs a MessageFormat for the default locale and the
+     * Constructs a MessageFormat for the default
+     * {@link java.util.Locale.Category#FORMAT FORMAT} locale and the
      * specified pattern.
      * The constructor first sets the locale, then parses the pattern and
      * creates a list of subformats for the format elements contained in it.
diff --git a/jdk/src/share/classes/java/text/NumberFormat.java b/jdk/src/share/classes/java/text/NumberFormat.java
index eaed665e54c..c1b8310096b 100644
--- a/jdk/src/share/classes/java/text/NumberFormat.java
+++ b/jdk/src/share/classes/java/text/NumberFormat.java
@@ -389,7 +389,8 @@ public abstract class NumberFormat extends Format  {
     //============== Locale Stuff =====================
 
     /**
-     * Returns a general-purpose number format for the current default locale.
+     * Returns a general-purpose number format for the current default
+     * {@link java.util.Locale.Category#FORMAT FORMAT} locale.
      * This is the same as calling
      * {@link #getNumberInstance() getNumberInstance()}.
      */
@@ -407,7 +408,13 @@ public abstract class NumberFormat extends Format  {
     }
 
     /**
-     * Returns a general-purpose number format for the current default locale.
+     * Returns a general-purpose number format for the current default
+     * {@link java.util.Locale.Category#FORMAT FORMAT} locale.
+     * <p>This is equivalent to calling
+     * {@link #getNumberInstance(Locale)
+     *     getNumberInstance(Locale.getDefault(Locale.Category.FORMAT))}.
+     * @see java.util.Locale#getDefault(java.util.Locale.Category)
+     * @see java.util.Locale.Category#FORMAT
      */
     public final static NumberFormat getNumberInstance() {
         return getInstance(Locale.getDefault(Locale.Category.FORMAT), NUMBERSTYLE);
@@ -421,14 +428,20 @@ public abstract class NumberFormat extends Format  {
     }
 
     /**
-     * Returns an integer number format for the current default locale. The
+     * Returns an integer number format for the current default
+     * {@link java.util.Locale.Category#FORMAT FORMAT} locale. The
      * returned number format is configured to round floating point numbers
      * to the nearest integer using half-even rounding (see {@link
      * java.math.RoundingMode#HALF_EVEN RoundingMode.HALF_EVEN}) for formatting,
      * and to parse only the integer part of an input string (see {@link
      * #isParseIntegerOnly isParseIntegerOnly}).
+     * <p>This is equivalent to calling
+     * {@link #getIntegerInstance(Locale)
+     *     getIntegerInstance(Locale.getDefault(Locale.Category.FORMAT))}.
      *
      * @see #getRoundingMode()
+     * @see java.util.Locale#getDefault(java.util.Locale.Category)
+     * @see java.util.Locale.Category#FORMAT
      * @return a number format for integer values
      * @since 1.4
      */
@@ -453,7 +466,14 @@ public abstract class NumberFormat extends Format  {
     }
 
     /**
-     * Returns a currency format for the current default locale.
+     * Returns a currency format for the current default
+     * {@link java.util.Locale.Category#FORMAT FORMAT} locale.
+     * <p>This is equivalent to calling
+     * {@link #getCurrencyInstance(Locale)
+     *     getCurrencyInstance(Locale.getDefault(Locale.Category.FORMAT))}.
+     *
+     * @see java.util.Locale#getDefault(java.util.Locale.Category)
+     * @see java.util.Locale.Category#FORMAT
      */
     public final static NumberFormat getCurrencyInstance() {
         return getInstance(Locale.getDefault(Locale.Category.FORMAT), CURRENCYSTYLE);
@@ -467,7 +487,14 @@ public abstract class NumberFormat extends Format  {
     }
 
     /**
-     * Returns a percentage format for the current default locale.
+     * Returns a percentage format for the current default
+     * {@link java.util.Locale.Category#FORMAT FORMAT} locale.
+     * <p>This is equivalent to calling
+     * {@link #getPercentInstance(Locale)
+     *     getPercentInstance(Locale.getDefault(Locale.Category.FORMAT))}.
+     *
+     * @see java.util.Locale#getDefault(java.util.Locale.Category)
+     * @see java.util.Locale.Category#FORMAT
      */
     public final static NumberFormat getPercentInstance() {
         return getInstance(Locale.getDefault(Locale.Category.FORMAT), PERCENTSTYLE);
diff --git a/jdk/src/share/classes/java/text/SimpleDateFormat.java b/jdk/src/share/classes/java/text/SimpleDateFormat.java
index 0c1f4aa6a61..82b48964eea 100644
--- a/jdk/src/share/classes/java/text/SimpleDateFormat.java
+++ b/jdk/src/share/classes/java/text/SimpleDateFormat.java
@@ -547,7 +547,8 @@ public class SimpleDateFormat extends DateFormat {
 
     /**
      * Constructs a <code>SimpleDateFormat</code> using the default pattern and
-     * date format symbols for the default locale.
+     * date format symbols for the default
+     * {@link java.util.Locale.Category#FORMAT FORMAT} locale.
      * <b>Note:</b> This constructor may not support all locales.
      * For full coverage, use the factory methods in the {@link DateFormat}
      * class.
@@ -560,11 +561,17 @@ public class SimpleDateFormat extends DateFormat {
 
     /**
      * Constructs a <code>SimpleDateFormat</code> using the given pattern and
-     * the default date format symbols for the default locale.
+     * the default date format symbols for the default
+     * {@link java.util.Locale.Category#FORMAT FORMAT} locale.
      * <b>Note:</b> This constructor may not support all locales.
      * For full coverage, use the factory methods in the {@link DateFormat}
      * class.
+     * <p>This is equivalent to calling
+     * {@link #SimpleDateFormat(String, Locale)
+     *     SimpleDateFormat(pattern, Locale.getDefault(Locale.Category.FORMAT))}.
      *
+     * @see java.util.Locale#getDefault(java.util.Locale.Category)
+     * @see java.util.Locale.Category#FORMAT
      * @param pattern the pattern describing the date and time format
      * @exception NullPointerException if the given pattern is null
      * @exception IllegalArgumentException if the given pattern is invalid
diff --git a/jdk/src/share/classes/java/time/format/DateTimeFormatSymbols.java b/jdk/src/share/classes/java/time/format/DateTimeFormatSymbols.java
index 14a116760f1..0bfe8441020 100644
--- a/jdk/src/share/classes/java/time/format/DateTimeFormatSymbols.java
+++ b/jdk/src/share/classes/java/time/format/DateTimeFormatSymbols.java
@@ -121,10 +121,16 @@ public final class DateTimeFormatSymbols {
     }
 
     /**
-     * Obtains symbols for the default locale.
+     * Obtains symbols for the default
+     * {@link java.util.Locale.Category#FORMAT FORMAT} locale.
      * <p>
      * This method provides access to locale sensitive symbols.
+     * <p>
+     * This is equivalent to calling
+     * {@link #of(Locale)
+     *     of(Locale.getDefault(Locale.Category.FORMAT))}.
      *
+     * @see java.util.Locale.Category#FORMAT
      * @return the info, not null
      */
     public static DateTimeFormatSymbols ofDefaultLocale() {
diff --git a/jdk/src/share/classes/java/util/Calendar.java b/jdk/src/share/classes/java/util/Calendar.java
index f14ee6d6ef4..c57f50c59b3 100644
--- a/jdk/src/share/classes/java/util/Calendar.java
+++ b/jdk/src/share/classes/java/util/Calendar.java
@@ -1572,7 +1572,8 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
 
     /**
      * Constructs a Calendar with the default time zone
-     * and locale.
+     * and the default {@link java.util.Locale.Category#FORMAT FORMAT}
+     * locale.
      * @see     TimeZone#getDefault
      */
     protected Calendar()
@@ -1600,7 +1601,8 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
     /**
      * Gets a calendar using the default time zone and locale. The
      * <code>Calendar</code> returned is based on the current time
-     * in the default time zone with the default locale.
+     * in the default time zone with the default
+     * {@link Locale.Category#FORMAT FORMAT} locale.
      *
      * @return a Calendar.
      */
@@ -1614,7 +1616,8 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
     /**
      * Gets a calendar using the specified time zone and default locale.
      * The <code>Calendar</code> returned is based on the current time
-     * in the given time zone with the default locale.
+     * in the given time zone with the default
+     * {@link Locale.Category#FORMAT FORMAT} locale.
      *
      * @param zone the time zone to use
      * @return a Calendar.
diff --git a/jdk/src/share/classes/java/util/Currency.java b/jdk/src/share/classes/java/util/Currency.java
index aa792ea3175..09e7046849b 100644
--- a/jdk/src/share/classes/java/util/Currency.java
+++ b/jdk/src/share/classes/java/util/Currency.java
@@ -472,12 +472,18 @@ public final class Currency implements Serializable {
     }
 
     /**
-     * Gets the symbol of this currency for the default locale.
+     * Gets the symbol of this currency for the default
+     * {@link Locale.Category#DISPLAY DISPLAY} locale.
      * For example, for the US Dollar, the symbol is "$" if the default
      * locale is the US, while for other locales it may be "US$". If no
      * symbol can be determined, the ISO 4217 currency code is returned.
+     * <p>
+     * This is equivalent to calling
+     * {@link #getSymbol(Locale)
+     *     getSymbol(Locale.getDefault(Locale.Category.DISPLAY))}.
      *
-     * @return the symbol of this currency for the default locale
+     * @return the symbol of this currency for the default
+     *     {@link Locale.Category#DISPLAY DISPLAY} locale
      */
     public String getSymbol() {
         return getSymbol(Locale.getDefault(Locale.Category.DISPLAY));
@@ -533,10 +539,16 @@ public final class Currency implements Serializable {
 
     /**
      * Gets the name that is suitable for displaying this currency for
-     * the default locale.  If there is no suitable display name found
+     * the default {@link Locale.Category#DISPLAY DISPLAY} locale.
+     * If there is no suitable display name found
      * for the default locale, the ISO 4217 currency code is returned.
+     * <p>
+     * This is equivalent to calling
+     * {@link #getDisplayName(Locale)
+     *     getDisplayName(Locale.getDefault(Locale.Category.DISPLAY))}.
      *
-     * @return the display name of this currency for the default locale
+     * @return the display name of this currency for the default
+     *     {@link Locale.Category#DISPLAY DISPLAY} locale
      * @since 1.7
      */
     public String getDisplayName() {
diff --git a/jdk/src/share/classes/java/util/Formatter.java b/jdk/src/share/classes/java/util/Formatter.java
index c645861521c..65a6f0b3634 100644
--- a/jdk/src/share/classes/java/util/Formatter.java
+++ b/jdk/src/share/classes/java/util/Formatter.java
@@ -1900,7 +1900,8 @@ public final class Formatter implements Closeable, Flushable {
      * which may be retrieved by invoking {@link #out out()} and whose
      * current content may be converted into a string by invoking {@link
      * #toString toString()}.  The locale used is the {@linkplain
-     * Locale#getDefault() default locale} for this instance of the Java
+     * Locale#getDefault(Locale.Category) default locale} for
+     * {@linkplain Locale.Category#FORMAT formatting} for this instance of the Java
      * virtual machine.
      */
     public Formatter() {
@@ -1910,8 +1911,10 @@ public final class Formatter implements Closeable, Flushable {
     /**
      * Constructs a new formatter with the specified destination.
      *
-     * <p> The locale used is the {@linkplain Locale#getDefault() default
-     * locale} for this instance of the Java virtual machine.
+     * <p> The locale used is the {@linkplain
+     * Locale#getDefault(Locale.Category) default locale} for
+     * {@linkplain Locale.Category#FORMAT formatting} for this instance of the Java
+     * virtual machine.
      *
      * @param  a
      *         Destination for the formatted output.  If {@code a} is
@@ -1961,8 +1964,10 @@ public final class Formatter implements Closeable, Flushable {
      * java.nio.charset.Charset#defaultCharset() default charset} for this
      * instance of the Java virtual machine.
      *
-     * <p> The locale used is the {@linkplain Locale#getDefault() default
-     * locale} for this instance of the Java virtual machine.
+     * <p> The locale used is the {@linkplain
+     * Locale#getDefault(Locale.Category) default locale} for
+     * {@linkplain Locale.Category#FORMAT formatting} for this instance of the Java
+     * virtual machine.
      *
      * @param  fileName
      *         The name of the file to use as the destination of this
@@ -1989,8 +1994,10 @@ public final class Formatter implements Closeable, Flushable {
     /**
      * Constructs a new formatter with the specified file name and charset.
      *
-     * <p> The locale used is the {@linkplain Locale#getDefault default
-     * locale} for this instance of the Java virtual machine.
+     * <p> The locale used is the {@linkplain
+     * Locale#getDefault(Locale.Category) default locale} for
+     * {@linkplain Locale.Category#FORMAT formatting} for this instance of the Java
+     * virtual machine.
      *
      * @param  fileName
      *         The name of the file to use as the destination of this
@@ -2068,8 +2075,10 @@ public final class Formatter implements Closeable, Flushable {
      * java.nio.charset.Charset#defaultCharset() default charset} for this
      * instance of the Java virtual machine.
      *
-     * <p> The locale used is the {@linkplain Locale#getDefault() default
-     * locale} for this instance of the Java virtual machine.
+     * <p> The locale used is the {@linkplain
+     * Locale#getDefault(Locale.Category) default locale} for
+     * {@linkplain Locale.Category#FORMAT formatting} for this instance of the Java
+     * virtual machine.
      *
      * @param  file
      *         The file to use as the destination of this formatter.  If the
@@ -2096,8 +2105,10 @@ public final class Formatter implements Closeable, Flushable {
     /**
      * Constructs a new formatter with the specified file and charset.
      *
-     * <p> The locale used is the {@linkplain Locale#getDefault default
-     * locale} for this instance of the Java virtual machine.
+     * <p> The locale used is the {@linkplain
+     * Locale#getDefault(Locale.Category) default locale} for
+     * {@linkplain Locale.Category#FORMAT formatting} for this instance of the Java
+     * virtual machine.
      *
      * @param  file
      *         The file to use as the destination of this formatter.  If the
@@ -2171,8 +2182,10 @@ public final class Formatter implements Closeable, Flushable {
     /**
      * Constructs a new formatter with the specified print stream.
      *
-     * <p> The locale used is the {@linkplain Locale#getDefault() default
-     * locale} for this instance of the Java virtual machine.
+     * <p> The locale used is the {@linkplain
+     * Locale#getDefault(Locale.Category) default locale} for
+     * {@linkplain Locale.Category#FORMAT formatting} for this instance of the Java
+     * virtual machine.
      *
      * <p> Characters are written to the given {@link java.io.PrintStream
      * PrintStream} object and are therefore encoded using that object's
@@ -2193,8 +2206,10 @@ public final class Formatter implements Closeable, Flushable {
      * java.nio.charset.Charset#defaultCharset() default charset} for this
      * instance of the Java virtual machine.
      *
-     * <p> The locale used is the {@linkplain Locale#getDefault() default
-     * locale} for this instance of the Java virtual machine.
+     * <p> The locale used is the {@linkplain
+     * Locale#getDefault(Locale.Category) default locale} for
+     * {@linkplain Locale.Category#FORMAT formatting} for this instance of the Java
+     * virtual machine.
      *
      * @param  os
      *         The output stream to use as the destination of this formatter.
@@ -2209,8 +2224,10 @@ public final class Formatter implements Closeable, Flushable {
      * Constructs a new formatter with the specified output stream and
      * charset.
      *
-     * <p> The locale used is the {@linkplain Locale#getDefault default
-     * locale} for this instance of the Java virtual machine.
+     * <p> The locale used is the {@linkplain
+     * Locale#getDefault(Locale.Category) default locale} for
+     * {@linkplain Locale.Category#FORMAT formatting} for this instance of the Java
+     * virtual machine.
      *
      * @param  os
      *         The output stream to use as the destination of this formatter.
diff --git a/jdk/src/share/classes/java/util/GregorianCalendar.java b/jdk/src/share/classes/java/util/GregorianCalendar.java
index 4e063ee70ba..96501286e75 100644
--- a/jdk/src/share/classes/java/util/GregorianCalendar.java
+++ b/jdk/src/share/classes/java/util/GregorianCalendar.java
@@ -587,7 +587,8 @@ public class GregorianCalendar extends Calendar {
 
     /**
      * Constructs a default <code>GregorianCalendar</code> using the current time
-     * in the default time zone with the default locale.
+     * in the default time zone with the default
+     * {@link Locale.Category#FORMAT FORMAT} locale.
      */
     public GregorianCalendar() {
         this(TimeZone.getDefaultRef(), Locale.getDefault(Locale.Category.FORMAT));
@@ -596,7 +597,8 @@ public class GregorianCalendar extends Calendar {
 
     /**
      * Constructs a <code>GregorianCalendar</code> based on the current time
-     * in the given time zone with the default locale.
+     * in the given time zone with the default
+     * {@link Locale.Category#FORMAT FORMAT} locale.
      *
      * @param zone the given time zone.
      */
diff --git a/jdk/src/share/classes/java/util/Locale.java b/jdk/src/share/classes/java/util/Locale.java
index 198148206d1..69f277659ab 100644
--- a/jdk/src/share/classes/java/util/Locale.java
+++ b/jdk/src/share/classes/java/util/Locale.java
@@ -351,7 +351,8 @@ import sun.util.locale.provider.ResourceBundleBasedAdapter;
  * you can use <code>getDisplayLanguage</code> to get the name of
  * the language suitable for displaying to the user. Interestingly,
  * the <code>getDisplayXXX</code> methods are themselves locale-sensitive
- * and have two versions: one that uses the default locale and one
+ * and have two versions: one that uses the default
+ * {@link Locale.Category#DISPLAY DISPLAY} locale and one
  * that uses the locale specified as an argument.
  *
  * <p>The Java Platform provides a number of classes that perform locale-sensitive
@@ -369,7 +370,8 @@ import sun.util.locale.provider.ResourceBundleBasedAdapter;
  * </pre>
  * </blockquote>
  * Each of these methods has two variants; one with an explicit locale
- * and one without; the latter uses the default locale:
+ * and one without; the latter uses the default
+ * {@link Locale.Category#FORMAT FORMAT} locale:
  * <blockquote>
  * <pre>
  *     NumberFormat.getInstance(myLocale)
@@ -1645,11 +1647,15 @@ public final class Locale implements Cloneable, Serializable {
     /**
      * Returns a name for the locale's language that is appropriate for display to the
      * user.
-     * If possible, the name returned will be localized for the default locale.
-     * For example, if the locale is fr_FR and the default locale
+     * If possible, the name returned will be localized for the default
+     * {@link Locale.Category#DISPLAY DISPLAY} locale.
+     * For example, if the locale is fr_FR and the default
+     * {@link Locale.Category#DISPLAY DISPLAY} locale
      * is en_US, getDisplayLanguage() will return "French"; if the locale is en_US and
-     * the default locale is fr_FR, getDisplayLanguage() will return "anglais".
-     * If the name returned cannot be localized for the default locale,
+     * the default {@link Locale.Category#DISPLAY DISPLAY} locale is fr_FR,
+     * getDisplayLanguage() will return "anglais".
+     * If the name returned cannot be localized for the default
+     * {@link Locale.Category#DISPLAY DISPLAY} locale,
      * (say, we don't have a Japanese name for Croatian),
      * this function falls back on the English name, and uses the ISO code as a last-resort
      * value.  If the locale doesn't specify a language, this function returns the empty string.
@@ -1679,10 +1685,12 @@ public final class Locale implements Cloneable, Serializable {
 
     /**
      * Returns a name for the the locale's script that is appropriate for display to
-     * the user. If possible, the name will be localized for the default locale.  Returns
+     * the user. If possible, the name will be localized for the default
+     * {@link Locale.Category#DISPLAY DISPLAY} locale.  Returns
      * the empty string if this locale doesn't specify a script code.
      *
-     * @return the display name of the script code for the current default locale
+     * @return the display name of the script code for the current default
+     *     {@link Locale.Category#DISPLAY DISPLAY} locale
      * @since 1.7
      */
     public String getDisplayScript() {
@@ -1695,7 +1703,8 @@ public final class Locale implements Cloneable, Serializable {
      * localized for the given locale. Returns the empty string if
      * this locale doesn't specify a script code.
      *
-     * @return the display name of the script code for the current default locale
+     * @return the display name of the script code for the current default
+     * {@link Locale.Category#DISPLAY DISPLAY} locale
      * @throws NullPointerException if <code>inLocale</code> is <code>null</code>
      * @since 1.7
      */
@@ -1706,11 +1715,15 @@ public final class Locale implements Cloneable, Serializable {
     /**
      * Returns a name for the locale's country that is appropriate for display to the
      * user.
-     * If possible, the name returned will be localized for the default locale.
-     * For example, if the locale is fr_FR and the default locale
+     * If possible, the name returned will be localized for the default
+     * {@link Locale.Category#DISPLAY DISPLAY} locale.
+     * For example, if the locale is fr_FR and the default
+     * {@link Locale.Category#DISPLAY DISPLAY} locale
      * is en_US, getDisplayCountry() will return "France"; if the locale is en_US and
-     * the default locale is fr_FR, getDisplayCountry() will return "Etats-Unis".
-     * If the name returned cannot be localized for the default locale,
+     * the default {@link Locale.Category#DISPLAY DISPLAY} locale is fr_FR,
+     * getDisplayCountry() will return "Etats-Unis".
+     * If the name returned cannot be localized for the default
+     * {@link Locale.Category#DISPLAY DISPLAY} locale,
      * (say, we don't have a Japanese name for Croatia),
      * this function falls back on the English name, and uses the ISO code as a last-resort
      * value.  If the locale doesn't specify a country, this function returns the empty string.
@@ -1762,7 +1775,8 @@ public final class Locale implements Cloneable, Serializable {
 
     /**
      * Returns a name for the locale's variant code that is appropriate for display to the
-     * user.  If possible, the name will be localized for the default locale.  If the locale
+     * user.  If possible, the name will be localized for the default
+     * {@link Locale.Category#DISPLAY DISPLAY} locale.  If the locale
      * doesn't specify a variant code, this function returns the empty string.
      */
     public final String getDisplayVariant() {
diff --git a/jdk/src/share/classes/java/util/Scanner.java b/jdk/src/share/classes/java/util/Scanner.java
index 3c558114ac7..cc19b0d1257 100644
--- a/jdk/src/share/classes/java/util/Scanner.java
+++ b/jdk/src/share/classes/java/util/Scanner.java
@@ -151,7 +151,8 @@ import sun.misc.LRUCache;
  * <p> An instance of this class is capable of scanning numbers in the standard
  * formats as well as in the formats of the scanner's locale. A scanner's
  * <a name="initial-locale">initial locale </a>is the value returned by the {@link
- * java.util.Locale#getDefault} method; it may be changed via the {@link
+ * java.util.Locale#getDefault(Locale.Category)
+ * Locale.getDefault(Locale.Category.FORMAT)} method; it may be changed via the {@link
  * #useLocale} method. The {@link #reset} method will reset the value of the
  * scanner's locale to the initial locale regardless of whether it was
  * previously changed.
@@ -2641,7 +2642,7 @@ public final class Scanner implements Iterator<String>, Closeable {
      *
      * <blockquote><pre>
      *   scanner.useDelimiter("\\p{javaWhitespace}+")
-     *          .useLocale(Locale.getDefault())
+     *          .useLocale(Locale.getDefault(Locale.Category.FORMAT))
      *          .useRadix(10);
      * </pre></blockquote>
      *

From 4a5a1e4404fba42bdf37b9eebed16f8c4b57df25 Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Wed, 20 Feb 2013 17:08:32 +0530
Subject: [PATCH 185/311] 8008207: Make constants array and source fields
 private

Reviewed-by: hannesw, lagergren
---
 .../internal/codegen/ClassEmitter.java        |  4 +--
 .../nashorn/internal/codegen/Compiler.java    | 25 ++++++++++++++++---
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/nashorn/src/jdk/nashorn/internal/codegen/ClassEmitter.java b/nashorn/src/jdk/nashorn/internal/codegen/ClassEmitter.java
index 7a293a3f3b0..208e64568d1 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/ClassEmitter.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/ClassEmitter.java
@@ -212,11 +212,11 @@ public class ClassEmitter implements Emitter {
     private void defineCommonStatics(final boolean strictMode) {
         // source - used to store the source data (text) for this script.  Shared across
         // compile units.  Set externally by the compiler.
-        field(EnumSet.of(Flag.PUBLIC, Flag.STATIC), SOURCE.tag(), Source.class);
+        field(EnumSet.of(Flag.PRIVATE, Flag.STATIC), SOURCE.tag(), Source.class);
 
         // constants - used to the constants array for this script.  Shared across
         // compile units.  Set externally by the compiler.
-        field(EnumSet.of(Flag.PUBLIC, Flag.STATIC), CONSTANTS.tag(), Object[].class);
+        field(EnumSet.of(Flag.PRIVATE, Flag.STATIC), CONSTANTS.tag(), Object[].class);
 
         // strictMode - was this script compiled in strict mode.  Set externally by the compiler.
         field(EnumSet.of(Flag.PUBLIC, Flag.STATIC, Flag.FINAL), STRICT_MODE.tag(), boolean.class, strictMode);
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java b/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
index dc5b2e206c9..5c4f0892b64 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
@@ -33,6 +33,10 @@ import static jdk.nashorn.internal.codegen.CompilerConstants.SOURCE;
 import static jdk.nashorn.internal.codegen.CompilerConstants.THIS;
 
 import java.io.File;
+import java.lang.reflect.Field;
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
 import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.HashMap;
@@ -274,10 +278,23 @@ public final class Compiler {
             }
 
             try {
-                //use reflection to write source and constants table to installed classes
-                clazz.getField(SOURCE.tag()).set(null, getSource());
-                clazz.getField(CONSTANTS.tag()).set(null, getConstantData().toArray());
-            } catch (final NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException e) {
+                final Source source = getSource();
+                final Object[] constants = getConstantData().toArray();
+                // Need doPrivileged because these fields are private
+                AccessController.doPrivileged(new PrivilegedExceptionAction<Void>() {
+                    @Override
+                    public Void run() throws Exception {
+                        //use reflection to write source and constants table to installed classes
+                        final Field sourceField = clazz.getDeclaredField(SOURCE.tag());
+                        final Field constantsField = clazz.getDeclaredField(CONSTANTS.tag());
+                        sourceField.setAccessible(true);
+                        constantsField.setAccessible(true);
+                        sourceField.set(null, source);
+                        constantsField.set(null, constants);
+                        return null;
+                    }
+                });
+            } catch (final PrivilegedActionException e) {
                 throw new RuntimeException(e);
             }
         }

From 29658bd3b437d93701610a25551b0c7f6c46a4e9 Mon Sep 17 00:00:00 2001
From: Alexey Utkin <uta@openjdk.org>
Date: Wed, 20 Feb 2013 16:39:35 +0400
Subject: [PATCH 186/311] 8007454: (process) SetHandleInformation parameters
 DWORD (not BOOLEAN)

The SetHandleInformation arguments list was fixed.

Reviewed-by: alanb
---
 .../windows/native/java/lang/ProcessImpl_md.c  | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/jdk/src/windows/native/java/lang/ProcessImpl_md.c b/jdk/src/windows/native/java/lang/ProcessImpl_md.c
index dfa59f99efd..5b45f8f24f2 100644
--- a/jdk/src/windows/native/java/lang/ProcessImpl_md.c
+++ b/jdk/src/windows/native/java/lang/ProcessImpl_md.c
@@ -120,10 +120,12 @@ Java_java_lang_ProcessImpl_create(JNIEnv *env, jclass ignored,
             goto Catch;
         }
         si.hStdInput = inRead;
-        SetHandleInformation(inWrite, HANDLE_FLAG_INHERIT, FALSE);
+        SetHandleInformation(inWrite, HANDLE_FLAG_INHERIT, 0);
         handles[0] = (jlong) inWrite;
     }
-    SetHandleInformation(si.hStdInput, HANDLE_FLAG_INHERIT, TRUE);
+    SetHandleInformation(si.hStdInput,
+        HANDLE_FLAG_INHERIT,
+        HANDLE_FLAG_INHERIT);
 
     if (handles[1] != (jlong) -1) {
         si.hStdOutput = (HANDLE) handles[1];
@@ -134,10 +136,12 @@ Java_java_lang_ProcessImpl_create(JNIEnv *env, jclass ignored,
             goto Catch;
         }
         si.hStdOutput = outWrite;
-        SetHandleInformation(outRead, HANDLE_FLAG_INHERIT, FALSE);
+        SetHandleInformation(outRead, HANDLE_FLAG_INHERIT, 0);
         handles[1] = (jlong) outRead;
     }
-    SetHandleInformation(si.hStdOutput, HANDLE_FLAG_INHERIT, TRUE);
+    SetHandleInformation(si.hStdOutput,
+        HANDLE_FLAG_INHERIT,
+        HANDLE_FLAG_INHERIT);
 
     if (redirectErrorStream) {
         si.hStdError = si.hStdOutput;
@@ -151,10 +155,12 @@ Java_java_lang_ProcessImpl_create(JNIEnv *env, jclass ignored,
             goto Catch;
         }
         si.hStdError = errWrite;
-        SetHandleInformation(errRead, HANDLE_FLAG_INHERIT, FALSE);
+        SetHandleInformation(errRead, HANDLE_FLAG_INHERIT, 0);
         handles[2] = (jlong) errRead;
     }
-    SetHandleInformation(si.hStdError, HANDLE_FLAG_INHERIT, TRUE);
+    SetHandleInformation(si.hStdError,
+        HANDLE_FLAG_INHERIT,
+        HANDLE_FLAG_INHERIT);
 
     processFlag = CREATE_NO_WINDOW | CREATE_UNICODE_ENVIRONMENT;
     ret = CreateProcessW(0,                /* executable name */

From 017e73cbd0065546082a23fc7f1b91991b71f655 Mon Sep 17 00:00:00 2001
From: Klara Ward <klara.ward@oracle.com>
Date: Wed, 20 Feb 2013 16:43:21 +0100
Subject: [PATCH 187/311] 8008166: URL handling was broken on windows, causing
 "load" to malfunction

Reviewed-by: attila, jlaskey
---
 nashorn/make/build.xml                        |  2 +
 .../jdk/nashorn/internal/runtime/Context.java | 47 ++++++++-----------
 2 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/nashorn/make/build.xml b/nashorn/make/build.xml
index 342dc2c10c1..0982a27221a 100644
--- a/nashorn/make/build.xml
+++ b/nashorn/make/build.xml
@@ -211,6 +211,8 @@
     <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
     <!-- test/script/basic .js scripts load other script tests -->
     <echo message="    permission java.io.FilePermission &quot;${basedir}/test/script/-&quot;, &quot;read&quot;;" file="${build.dir}/nashorn.policy" append="true"/>
+    <echo message="    permission java.io.FilePermission &quot;user.dir&quot;, &quot;read&quot;;" file="${build.dir}/nashorn.policy" append="true"/>
+    <echo message="    permission java.util.PropertyPermission &quot;user.dir&quot;, &quot;read&quot;;" file="${build.dir}/nashorn.policy" append="true"/>
     <echo message="" file="${build.dir}/nashorn.policy" append="true"/>
     <!-- test/script/basic .js scripts can read nashorn.test.* properties -->
     <echo message="    permission java.util.PropertyPermission &quot;nashorn.test.*&quot;, &quot;read&quot;;" file="${build.dir}/nashorn.policy" append="true"/>
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Context.java b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
index e03aa3e83df..67b35432b5c 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/Context.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
@@ -37,7 +37,6 @@ import java.io.PrintWriter;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.reflect.Constructor;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.security.AccessController;
 import java.security.CodeSigner;
@@ -620,34 +619,28 @@ public final class Context {
         // load accepts a String (which could be a URL or a file name), a File, a URL
         // or a ScriptObject that has "name" and "source" (string valued) properties.
         if (src instanceof String) {
-            String srcStr = (String)src;
-            final File file = new File((String)src);
+            final String srcStr = (String)src;
+            final File   file   = new File(srcStr);
             if (srcStr.indexOf(':') != -1) {
-                try {
-                    final URL url = new URL((String)src);
-                    source = new Source(url.toString(), url);
-                } catch (final MalformedURLException e) {
-                    // fallback URL - nashorn:foo.js - check under jdk/nashorn/internal/runtime/resources
-                    final String str = (String)src;
-                    if (str.startsWith("nashorn:")) {
-                        final String resource = "resources/" + str.substring("nashorn:".length());
-                        // NOTE: even sandbox scripts should be able to load scripts in nashorn: scheme
-                        // These scripts are always available and are loaded from nashorn.jar's resources.
-                        source = AccessController.doPrivileged(
-                                new PrivilegedAction<Source>() {
-                                    @Override
-                                    public Source run() {
-                                        try {
-                                            final URL resURL = Context.class.getResource(resource);
-                                            return (resURL != null)? new Source(str, resURL) : null;
-                                        } catch (final IOException exp) {
-                                            return null;
-                                        }
+                if (srcStr.startsWith("nashorn:")) {
+                    final String resource = "resources/" + srcStr.substring("nashorn:".length());
+                    // NOTE: even sandbox scripts should be able to load scripts in nashorn: scheme
+                    // These scripts are always available and are loaded from nashorn.jar's resources.
+                    source = AccessController.doPrivileged(
+                            new PrivilegedAction<Source>() {
+                                @Override
+                                public Source run() {
+                                    try {
+                                        final URL resURL = Context.class.getResource(resource);
+                                        return (resURL != null)? new Source(srcStr, resURL) : null;
+                                    } catch (final IOException exp) {
+                                        return null;
                                     }
-                                });
-                    } else {
-                        throw e;
-                    }
+                                }
+                            });
+                } else {
+                    final URL url = file.toURI().toURL();
+                    source = new Source(url.toString(), url);
                 }
             } else if (file.isFile()) {
                 source = new Source(srcStr, file);

From 5eb01d191d98da090682a3f85842e01b357ca7d9 Mon Sep 17 00:00:00 2001
From: "Daniel D. Daugherty" <dcubed@openjdk.org>
Date: Wed, 20 Feb 2013 13:23:56 -0800
Subject: [PATCH 188/311] 8008352:
 java/lang/instrument/RedefineSubclassWithTwoInterfaces.sh fails on MKS

Use more portable pattern counting constructs in test driver.

Reviewed-by: sspitsyn, sla, coleenp
---
 .../RedefineSubclassWithTwoInterfaces.sh      | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/jdk/test/java/lang/instrument/RedefineSubclassWithTwoInterfaces.sh b/jdk/test/java/lang/instrument/RedefineSubclassWithTwoInterfaces.sh
index 6deb7ce6e44..850fac252a1 100644
--- a/jdk/test/java/lang/instrument/RedefineSubclassWithTwoInterfaces.sh
+++ b/jdk/test/java/lang/instrument/RedefineSubclassWithTwoInterfaces.sh
@@ -141,32 +141,30 @@ else
 fi
 
 PASS1_MESG="before any redefines"
-cnt=`grep "$PASS1_MESG" output.log | grep 'version-0' | wc -l | sed 's/^ *//'`
-case "$cnt" in
-2)
+cnt=`grep "$PASS1_MESG" output.log | grep 'version-0' | wc -l`
+# no quotes around $cnt so any whitespace from 'wc -l' is ignored
+if [ $cnt = 2 ]; then
     echo "INFO: found 2 version-0 '$PASS1_MESG' mesgs."
-    ;;
-*)
+else
     echo "FAIL: did NOT find 2 version-0 '$PASS1_MESG' mesgs."
+    echo "INFO: cnt='$cnt'"
     echo "INFO: grep '$PASS1_MESG' output:"
     grep "$PASS1_MESG" output.log
     result=1
-    ;;
-esac
+fi
 
 PASS2_MESG="after redefine"
-cnt=`grep "$PASS2_MESG" output.log | grep 'version-1' | wc -l | sed 's/^ *//'`
-case "$cnt" in
-2)
+cnt=`grep "$PASS2_MESG" output.log | grep 'version-1' | wc -l`
+# no quotes around $cnt so any whitespace from 'wc -l' is ignored
+if [ $cnt = 2 ]; then
     echo "INFO: found 2 version-1 '$PASS2_MESG' mesgs."
-    ;;
-*)
+else
     echo "FAIL: did NOT find 2 version-1 '$PASS2_MESG' mesgs."
+    echo "INFO: cnt='$cnt'"
     echo "INFO: grep '$PASS2_MESG' output:"
     grep "$PASS2_MESG" output.log
     result=1
-    ;;
-esac
+fi
 
 if [ "$result" = 0 ]; then
     echo "PASS: test passed both positive and negative output checks."

From debd718fc141e223cbd829041cdd463cba225b7b Mon Sep 17 00:00:00 2001
From: Mike Duigou <mduigou@openjdk.org>
Date: Wed, 20 Feb 2013 17:56:16 -0800
Subject: [PATCH 189/311] 8008629: webrev.ksh needs to quote bug title it gets
 back from scraping bugs.sun.com

Reviewed-by: darcy
---
 make/scripts/webrev.ksh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make/scripts/webrev.ksh b/make/scripts/webrev.ksh
index 527b5d45003..cfb14f37ca3 100644
--- a/make/scripts/webrev.ksh
+++ b/make/scripts/webrev.ksh
@@ -3023,7 +3023,7 @@ if [[ -n $CRID ]]; then
             cleanup='s|\[#\(JDK-[0-9]\{5,\}\)\] \(.*\)|\1 : \2|'
         fi
         if [[ -n $WGET ]]; then
-            msg=`$WGET --timeout=10 --tries=1 -q $url -O - | grep '<title>' | sed 's/<title>\(.*\)<\/title>/\1/' | sed "$cleanup"`
+            msg=`$WGET --timeout=10 --tries=1 -q $url -O - | grep '<title>' | sed 's/<title>\(.*\)<\/title>/\1/' | sed "$cleanup" | html_quote`
         fi
         if [[ -z $msg ]]; then
             msg="${id}"

From 9ff7a57a0f97cbd68954849388697e20ac4345b9 Mon Sep 17 00:00:00 2001
From: Marcus Lagergren <lagergren@openjdk.org>
Date: Thu, 21 Feb 2013 16:57:21 +0100
Subject: [PATCH 190/311] 8008648: Lazy JIT scope and callee semantics
 bugfixes. Broke out wallclock timer

Reviewed-by: attila, hannesw
---
 .../internal/dynalink/beans/BeansLinker.java  |   2 +-
 .../internal/codegen/CodeGenerator.java       |   5 +-
 .../codegen/CompilationException.java         |  41 +++++++
 .../internal/codegen/CompilationPhase.java    | 110 +++++++++++-------
 .../nashorn/internal/codegen/Compiler.java    |  78 +++++++------
 .../internal/codegen/FinalizeTypes.java       |   2 +-
 .../jdk/nashorn/internal/codegen/Lower.java   |   1 -
 .../internal/codegen/MethodEmitter.java       |   2 +-
 .../nashorn/internal/codegen/Splitter.java    |   6 +-
 .../jdk/nashorn/internal/ir/FunctionNode.java |  39 +++++--
 .../jdk/nashorn/internal/ir/TernaryNode.java  |   2 +-
 .../objects/ScriptFunctionTrampolineImpl.java |  19 +--
 .../jdk/nashorn/internal/parser/Parser.java   |  20 +++-
 .../internal/runtime/NashornLoader.java       |   2 +-
 .../internal/runtime/ScriptingFunctions.java  |   6 +-
 .../jdk/nashorn/internal/runtime/Timing.java  | 109 +++++++++++++++++
 nashorn/test/script/trusted/JDK-8006529.js    |  10 +-
 17 files changed, 331 insertions(+), 123 deletions(-)
 create mode 100644 nashorn/src/jdk/nashorn/internal/codegen/CompilationException.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/Timing.java

diff --git a/nashorn/src/jdk/internal/dynalink/beans/BeansLinker.java b/nashorn/src/jdk/internal/dynalink/beans/BeansLinker.java
index 9bdcb4e5bd2..706d89f07c9 100644
--- a/nashorn/src/jdk/internal/dynalink/beans/BeansLinker.java
+++ b/nashorn/src/jdk/internal/dynalink/beans/BeansLinker.java
@@ -159,7 +159,7 @@ public class BeansLinker implements GuardingDynamicLinker {
         return linkers.get(clazz);
     }
 
-    /*
+    /**
      * Returns true if the object is a Dynalink Java dynamic method.
      *
      * @param obj the object we want to test for being a dynamic method
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
index 53f45241b98..0c17fa25f8f 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
@@ -850,7 +850,7 @@ final class CodeGenerator extends NodeOperatorVisitor {
              * Determine if function is varargs and consequently variables have to
              * be in the scope.
              */
-            final boolean varsInScope = function.varsInScope();
+            final boolean varsInScope = function.allVarsInScope();
 
             // TODO for LET we can do better: if *block* does not contain any eval/with, we don't need its vars in scope.
 
@@ -2040,7 +2040,6 @@ final class CodeGenerator extends NodeOperatorVisitor {
         }
 
         final Symbol varSymbol = varNode.getSymbol();
-
         assert varSymbol != null : "variable node " + varNode + " requires a symbol";
 
         assert method != null;
@@ -2058,7 +2057,7 @@ final class CodeGenerator extends NodeOperatorVisitor {
             }
             final IdentNode identNode = varNode.getName();
             final Type type = identNode.getType();
-            if(varSymbol.isFastScope(getCurrentFunctionNode())) {
+            if (varSymbol.isFastScope(getCurrentFunctionNode())) {
                 storeFastScopeVar(type, varSymbol, flags);
             } else {
                 method.dynamicSet(type, identNode.getName(), flags);
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CompilationException.java b/nashorn/src/jdk/nashorn/internal/codegen/CompilationException.java
new file mode 100644
index 00000000000..66fa3240508
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CompilationException.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.nashorn.internal.codegen;
+
+/**
+ * Exception when something in the compiler breaks down. Can only
+ * be instantiated by the codegen package
+ */
+@SuppressWarnings("serial")
+public class CompilationException extends RuntimeException {
+
+    CompilationException(final String description) {
+        super(description);
+    }
+
+    CompilationException(final Exception cause) {
+        super(cause);
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CompilationPhase.java b/nashorn/src/jdk/nashorn/internal/codegen/CompilationPhase.java
index 4c6ca63d608..031b87988da 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/CompilationPhase.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CompilationPhase.java
@@ -12,15 +12,21 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.EnumSet;
+import java.util.HashSet;
+import java.util.Set;
+
 import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.ir.CallNode;
 import jdk.nashorn.internal.ir.FunctionNode;
 import jdk.nashorn.internal.ir.FunctionNode.CompilationState;
 import jdk.nashorn.internal.ir.Node;
+import jdk.nashorn.internal.ir.ReferenceNode;
+import jdk.nashorn.internal.ir.visitor.NodeVisitor;
 import jdk.nashorn.internal.ir.debug.ASTWriter;
 import jdk.nashorn.internal.ir.debug.PrintVisitor;
-import jdk.nashorn.internal.ir.visitor.NodeVisitor;
 import jdk.nashorn.internal.runtime.Context;
 import jdk.nashorn.internal.runtime.ECMAErrors;
+import jdk.nashorn.internal.runtime.Timing;
 
 /**
  * A compilation phase is a step in the processes of turning a JavaScript FunctionNode
@@ -35,7 +41,7 @@ enum CompilationPhase {
      */
     LAZY_INITIALIZATION_PHASE(EnumSet.of(FunctionNode.CompilationState.INITIALIZED)) {
         @Override
-        boolean transform(final Compiler compiler, final FunctionNode fn) {
+        void transform(final Compiler compiler, final FunctionNode fn) {
 
             /*
              * For lazy compilation, we might be given a node previously marked as lazy
@@ -53,15 +59,48 @@ enum CompilationPhase {
             outermostFunctionNode.setIsLazy(false);
             outermostFunctionNode.setReturnType(Type.UNKNOWN);
 
+            final Set<FunctionNode> neverLazy = new HashSet<>();
+            final Set<FunctionNode> lazy = new HashSet<>();
+
             outermostFunctionNode.accept(new NodeVisitor() {
+                // self references are done with invokestatic and thus cannot have trampolines - never lazy
+                @Override
+                public Node enter(final CallNode node) {
+                    final Node callee = node.getFunction();
+                    if (callee instanceof ReferenceNode) {
+                        neverLazy.add(((ReferenceNode)callee).getReference());
+                        return null;
+                    }
+                    return node;
+                }
+
                 @Override
                 public Node enter(final FunctionNode node) {
+                    if (node == outermostFunctionNode) {
+                        return node;
+                    }
                     assert Compiler.LAZY_JIT;
-                    node.setIsLazy(node != outermostFunctionNode);
+                    lazy.add(node);
+
                     return node;
                 }
             });
-            return true;
+
+            for (final FunctionNode node : neverLazy) {
+                Compiler.LOG.fine("Marking " + node.getName() + " as non lazy, as it's a self reference");
+                node.setIsLazy(false);
+                lazy.remove(node);
+            }
+
+            for (final FunctionNode node : lazy) {
+                Compiler.LOG.fine("Marking " + node.getName() + " as lazy");
+                node.setIsLazy(true);
+                final FunctionNode parent = node.findParentFunction();
+                if (parent != null) {
+                    Compiler.LOG.fine("Marking " + parent.getName() + " as having lazy children - it needs scope for all variables");
+                    parent.setHasLazyChildren();
+                }
+            }
         }
 
         @Override
@@ -76,9 +115,8 @@ enum CompilationPhase {
      */
     CONSTANT_FOLDING_PHASE(EnumSet.of(INITIALIZED), CONSTANT_FOLDED) {
         @Override
-        boolean transform(final Compiler compiler, final FunctionNode fn) {
+        void transform(final Compiler compiler, final FunctionNode fn) {
             fn.accept(new FoldConstants());
-            return true;
         }
 
         @Override
@@ -98,9 +136,8 @@ enum CompilationPhase {
      */
     LOWERING_PHASE(EnumSet.of(INITIALIZED, CONSTANT_FOLDED), LOWERED) {
         @Override
-        boolean transform(final Compiler compiler, final FunctionNode fn) {
+        void transform(final Compiler compiler, final FunctionNode fn) {
             fn.accept(new Lower());
-            return true;
         }
 
         @Override
@@ -115,20 +152,17 @@ enum CompilationPhase {
      */
     ATTRIBUTION_PHASE(EnumSet.of(INITIALIZED, CONSTANT_FOLDED, LOWERED), ATTR) {
         @Override
-        boolean transform(final Compiler compiler, final FunctionNode fn) {
+        void transform(final Compiler compiler, final FunctionNode fn) {
             final Context context = compiler.getContext();
-            try {
-                fn.accept(new Attr(context));
-                return true;
-            } finally {
-                if (context._print_lower_ast) {
-                    context.getErr().println(new ASTWriter(fn));
-                }
 
-                if (context._print_lower_parse) {
-                    context.getErr().println(new PrintVisitor(fn));
-               }
+            fn.accept(new Attr(context));
+            if (context._print_lower_ast) {
+                context.getErr().println(new ASTWriter(fn));
             }
+
+            if (context._print_lower_parse) {
+                context.getErr().println(new PrintVisitor(fn));
+           }
         }
 
         @Override
@@ -146,7 +180,7 @@ enum CompilationPhase {
      */
     SPLITTING_PHASE(EnumSet.of(INITIALIZED, CONSTANT_FOLDED, LOWERED, ATTR), SPLIT) {
         @Override
-        boolean transform(final Compiler compiler, final FunctionNode fn) {
+        void transform(final Compiler compiler, final FunctionNode fn) {
             final CompileUnit outermostCompileUnit = compiler.addCompileUnit(compiler.firstCompileUnitName());
 
             new Splitter(compiler, fn, outermostCompileUnit).split();
@@ -157,7 +191,6 @@ enum CompilationPhase {
                 assert compiler.getStrictMode();
                 compiler.setStrictMode(true);
             }
-            return true;
         }
 
         @Override
@@ -181,9 +214,8 @@ enum CompilationPhase {
      */
     TYPE_FINALIZATION_PHASE(EnumSet.of(INITIALIZED, CONSTANT_FOLDED, LOWERED, ATTR, SPLIT), FINALIZED) {
         @Override
-        boolean transform(final Compiler compiler, final FunctionNode fn) {
+        void transform(final Compiler compiler, final FunctionNode fn) {
             fn.accept(new FinalizeTypes());
-            return true;
         }
 
         @Override
@@ -199,7 +231,7 @@ enum CompilationPhase {
      */
     BYTECODE_GENERATION_PHASE(EnumSet.of(INITIALIZED, CONSTANT_FOLDED, LOWERED, ATTR, SPLIT, FINALIZED), EMITTED) {
         @Override
-        boolean transform(final Compiler compiler, final FunctionNode fn) {
+        void transform(final Compiler compiler, final FunctionNode fn) {
             final Context context = compiler.getContext();
 
             try {
@@ -253,7 +285,7 @@ enum CompilationPhase {
                         final File dir = new File(fileName.substring(0, index));
                         try {
                             if (!dir.exists() && !dir.mkdirs()) {
-                                throw new IOException();
+                                throw new IOException(dir.toString());
                             }
                             final File file = new File(context._dest_dir, fileName);
                             try (final FileOutputStream fos = new FileOutputStream(file)) {
@@ -265,8 +297,6 @@ enum CompilationPhase {
                     }
                 }
             }
-
-            return true;
         }
 
         @Override
@@ -281,8 +311,6 @@ enum CompilationPhase {
     private long endTime;
     private boolean isFinished;
 
-    private static final long[] accumulatedTime = new long[CompilationPhase.values().length];
-
     private CompilationPhase(final EnumSet<CompilationState> pre) {
         this(pre, null);
     }
@@ -313,7 +341,7 @@ enum CompilationPhase {
 
     protected void end(final FunctionNode functionNode) {
         endTime = System.currentTimeMillis();
-        accumulatedTime[ordinal()] += (endTime - startTime);
+        Timing.accumulateTime(toString(), endTime - startTime);
 
         if (post != null) {
             functionNode.setState(post);
@@ -334,23 +362,15 @@ enum CompilationPhase {
         return endTime;
     }
 
-    public static long getAccumulatedTime(final CompilationPhase phase) {
-        return accumulatedTime[phase.ordinal()];
-    }
+    abstract void transform(final Compiler compiler, final FunctionNode functionNode) throws CompilationException;
 
-    abstract boolean transform(final Compiler compiler, final FunctionNode functionNode);
-
-    final boolean apply(final Compiler compiler, final FunctionNode functionNode) {
-        try {
-            if (!isApplicable(functionNode)) {
-                return false;
-            }
-            begin(functionNode);
-            transform(compiler, functionNode);
-            return true;
-        } finally {
-            end(functionNode);
+    final void apply(final Compiler compiler, final FunctionNode functionNode) throws CompilationException {
+        if (!isApplicable(functionNode)) {
+            throw new CompilationException("compile phase not applicable: " + this);
         }
+        begin(functionNode);
+        transform(compiler, functionNode);
+        end(functionNode);
     }
 
 }
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java b/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
index 5c4f0892b64..7a9a300dee3 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
@@ -54,6 +54,7 @@ import jdk.nashorn.internal.runtime.CodeInstaller;
 import jdk.nashorn.internal.runtime.Context;
 import jdk.nashorn.internal.runtime.DebugLogger;
 import jdk.nashorn.internal.runtime.Source;
+import jdk.nashorn.internal.runtime.Timing;
 import jdk.nashorn.internal.runtime.options.Options;
 
 /**
@@ -72,8 +73,6 @@ public final class Compiler {
 
     static final boolean LAZY_JIT = Options.getBooleanProperty("nashorn.compiler.lazy");
 
-    static final boolean TIME_COMPILATION = Options.getBooleanProperty("nashorn.compiler.time");
-
     private final Map<String, byte[]> bytecode;
 
     private final Set<CompileUnit> compileUnits;
@@ -92,7 +91,9 @@ public final class Compiler {
 
     private CodeInstaller<Context> installer;
 
-    static final DebugLogger LOG = new DebugLogger("compiler");
+    /** logger for compiler, trampolines, splits and related code generation events
+     *  that affect classes */
+    public static final DebugLogger LOG = new DebugLogger("compiler");
 
     /**
      * This array contains names that need to be reserved at the start
@@ -179,6 +180,13 @@ public final class Compiler {
             SEQUENCE_LAZY :
             SEQUENCE_NORMAL;
 
+    private static String lazyTag(final FunctionNode functionNode) {
+        if (functionNode.isLazy()) {
+            return '$' + LAZY.tag() + '$' + functionNode.getName();
+        }
+        return "";
+    }
+
     /**
      * Constructor
      *
@@ -187,6 +195,7 @@ public final class Compiler {
      * @param sequence     {@link Compiler#CompilationSequence} of {@link CompilationPhase}s to apply as this compilation
      * @param strict       should this compilation use strict mode semantics
      */
+    //TODO support an array of FunctionNodes for batch lazy compilation
     Compiler(final Context context, final CodeInstaller<Context> installer, final FunctionNode functionNode, final CompilationSequence sequence, final boolean strict) {
         this.context       = context;
         this.functionNode  = functionNode;
@@ -198,14 +207,16 @@ public final class Compiler {
         this.bytecode      = new HashMap<>();
 
         final StringBuilder sb = new StringBuilder();
-        sb.append(functionNode.uniqueName(DEFAULT_SCRIPT_NAME.tag())).
+        sb.append(functionNode.uniqueName(DEFAULT_SCRIPT_NAME.tag() + lazyTag(functionNode))).
                 append('$').
-                append(safeSourceName(functionNode.getSource())).
-                append(functionNode.isLazy() ? LAZY.tag() : "");
+                append(safeSourceName(functionNode.getSource()));
 
         this.scriptName = sb.toString();
 
-        LOG.info("Initializing compiler for scriptName = " + scriptName + ", root function: '" + functionNode.getName() + "'");
+        LOG.info("Initializing compiler for '" + functionNode.getName() + "' scriptName = " + scriptName + ", root function: '" + functionNode.getName() + "'");
+        if (functionNode.isLazy()) {
+            LOG.info(">>> This is a lazy recompilation triggered by a trampoline");
+        }
     }
 
     /**
@@ -241,22 +252,23 @@ public final class Compiler {
 
     /**
      * Execute the compilation this Compiler was created with
-     * @return true if compilation succeeds.
+     * @throws CompilationException if something goes wrong
      */
-    public boolean compile() {
+    public void compile() throws CompilationException {
         for (final String reservedName : RESERVED_NAMES) {
             functionNode.uniqueName(reservedName);
         }
 
         for (final CompilationPhase phase : sequence) {
-            LOG.info("Entering compile phase " + phase + " for function '" + functionNode.getName() + "'");
-            if (phase.isApplicable(functionNode)) {
-                if (!phase.apply(this, functionNode)) { //TODO exceptions, error logging
-                    return false;
-                }
+            phase.apply(this, functionNode);
+            final String end = phase.toString() + " done for function '" + functionNode.getName() + "'";
+            if (Timing.isEnabled()) {
+                final long duration = phase.getEndTime() - phase.getStartTime();
+                LOG.info(end + " in " + duration + " ms");
+            } else {
+                LOG.info(end);
             }
         }
-        return true;
     }
 
     /**
@@ -264,11 +276,15 @@ public final class Compiler {
      * @return root script class - if there are several compile units they will also be installed
      */
     public Class<?> install() {
+        final long t0 = Timing.isEnabled() ? System.currentTimeMillis() : 0L;
+
+        assert functionNode.hasState(CompilationState.EMITTED) : functionNode.getName() + " has no bytecode and cannot be installed";
+
         Class<?> rootClass = null;
 
         for (final Entry<String, byte[]> entry : bytecode.entrySet()) {
             final String     className = entry.getKey();
-            LOG.info("Installing class " + className);
+            LOG.fine("Installing class " + className);
 
             final byte[]     code  = entry.getValue();
             final Class<?>   clazz = installer.install(Compiler.binaryName(className), code);
@@ -299,7 +315,13 @@ public final class Compiler {
             }
         }
 
-        LOG.info("Root class: " + rootClass);
+        LOG.info("Installed root class: " + rootClass + " and " + bytecode.size() + " compile unit classes");
+        if (Timing.isEnabled()) {
+            final long duration = System.currentTimeMillis() - t0;
+            Timing.accumulateTime("[Code Installation]", duration);
+            LOG.info("Installation time: " + duration + " ms");
+        }
+
         return rootClass;
     }
 
@@ -376,7 +398,7 @@ public final class Compiler {
     private CompileUnit addCompileUnit(final String unitClassName, final long initialWeight) {
         final CompileUnit compileUnit = initCompileUnit(unitClassName, initialWeight);
         compileUnits.add(compileUnit);
-        LOG.info("Added compile unit " + compileUnit);
+        LOG.fine("Added compile unit " + compileUnit);
         return compileUnit;
     }
 
@@ -438,24 +460,4 @@ public final class Compiler {
         assert !USE_INT_ARITH : "Integer arithmetic is not enabled";
     }
 
-    static {
-        if (TIME_COMPILATION) {
-            Runtime.getRuntime().addShutdownHook(new Thread() {
-                @Override
-                public void run() {
-                    for (final CompilationPhase phase : CompilationPhase.values()) {
-                        final StringBuilder sb = new StringBuilder();
-                        sb.append(phase);
-                        while (sb.length() < 32) {
-                            sb.append(' ');
-                        }
-                        sb.append(CompilationPhase.getAccumulatedTime(phase));
-                        sb.append(' ');
-                        sb.append(" ms");
-                        System.err.println(sb.toString()); //Context err is gone by shutdown TODO
-                    }
-                }
-            });
-        }
-    }
 }
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/FinalizeTypes.java b/nashorn/src/jdk/nashorn/internal/codegen/FinalizeTypes.java
index ffa4a55bcd3..28dfda7da9a 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/FinalizeTypes.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/FinalizeTypes.java
@@ -562,7 +562,7 @@ final class FinalizeTypes extends NodeOperatorVisitor {
 
         final FunctionNode functionNode   = block.getFunction();
         final List<Symbol> symbols        = block.getFrame().getSymbols();
-        final boolean      allVarsInScope = functionNode.varsInScope();
+        final boolean      allVarsInScope = functionNode.allVarsInScope();
         final boolean      isVarArg       = functionNode.isVarArg();
 
         for (final Symbol symbol : symbols) {
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Lower.java b/nashorn/src/jdk/nashorn/internal/codegen/Lower.java
index 5f0026893c9..7a83469bc98 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Lower.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Lower.java
@@ -709,7 +709,6 @@ final class Lower extends NodeOperatorVisitor {
      * @return eval location
      */
     private static String evalLocation(final IdentNode node) {
-        //final StringBuilder sb = new StringBuilder(node.getSource().getName());
         return new StringBuilder().
             append(node.getSource().getName()).
             append('#').
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java b/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java
index dc1eac9ff28..661ee746054 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java
@@ -203,7 +203,7 @@ public class MethodEmitter implements Emitter {
 
     @Override
     public String toString() {
-        return "methodEmitter: " + (functionNode == null ? method : functionNode.getName()).toString();
+        return "methodEmitter: " + (functionNode == null ? method : functionNode.getName()).toString() + ' ' + stack;
     }
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Splitter.java b/nashorn/src/jdk/nashorn/internal/codegen/Splitter.java
index de66869334a..b92f2383b3a 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Splitter.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Splitter.java
@@ -92,15 +92,15 @@ final class Splitter extends NodeVisitor {
      */
     void split() {
         if (functionNode.isLazy()) {
-            LOG.info("Postponing split of '" + functionNode.getName() + "' as it's lazy");
+            LOG.fine("Postponing split of '" + functionNode.getName() + "' as it's lazy");
             return;
         }
-        LOG.info("Initiating split of '" + functionNode.getName() + "'");
+        LOG.fine("Initiating split of '" + functionNode.getName() + "'");
 
         long weight = WeighNodes.weigh(functionNode);
 
         if (weight >= SPLIT_THRESHOLD) {
-            LOG.info("Splitting '" + functionNode.getName() + "' as its weight " + weight + " exceeds split threshold " + SPLIT_THRESHOLD);
+            LOG.fine("Splitting '" + functionNode.getName() + "' as its weight " + weight + " exceeds split threshold " + SPLIT_THRESHOLD);
 
             functionNode.accept(this);
 
diff --git a/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java b/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java
index b31f32ba24c..d928aa71529 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/FunctionNode.java
@@ -188,25 +188,27 @@ public class FunctionNode extends Block {
     private static final int IS_LOWERED                  = 0b0000_0000_0001_0000;
     /** Has this node been split because it was too large? */
     private static final int IS_SPLIT                    = 0b0000_0000_0010_0000;
-    /** Is this function lazily compiled? */
-    private static final int IS_LAZY                     = 0b0000_0000_0100_0000;
     /** Does the function call eval? */
-    private static final int HAS_EVAL                    = 0b0000_0000_1000_0000;
+    private static final int HAS_EVAL                    = 0b0000_0000_0100_0000;
     /** Does the function contain a with block ? */
-    private static final int HAS_WITH                    = 0b0000_0001_0000_0000;
+    private static final int HAS_WITH                    = 0b0000_0000_1000_0000;
     /** Does a descendant function contain a with or eval? */
-    private static final int HAS_DESCENDANT_WITH_OR_EVAL = 0b0000_0010_0000_0000;
+    private static final int HAS_DESCENDANT_WITH_OR_EVAL = 0b0000_0001_0000_0000;
     /** Does the function define "arguments" identifier as a parameter of nested function name? */
-    private static final int DEFINES_ARGUMENTS           = 0b0000_0100_0000_0000;
+    private static final int DEFINES_ARGUMENTS           = 0b0000_0010_0000_0000;
     /** Does the function need a self symbol? */
-    private static final int NEEDS_SELF_SYMBOL           = 0b0000_1000_0000_0000;
+    private static final int NEEDS_SELF_SYMBOL           = 0b0000_0100_0000_0000;
     /** Does this function or any of its descendants use variables from an ancestor function's scope (incl. globals)? */
-    private static final int USES_ANCESTOR_SCOPE         = 0b0001_0000_0000_0000;
+    private static final int USES_ANCESTOR_SCOPE         = 0b0000_1000_0000_0000;
+    /** Is this function lazily compiled? */
+    private static final int IS_LAZY                     = 0b0001_0000_0000_0000;
+    /** Does this function have lazy, yet uncompiled children */
+    private static final int HAS_LAZY_CHILDREN           = 0b0010_0000_0000_0000;
 
     /** Does this function or any nested functions contain a with or an eval? */
     private static final int HAS_DEEP_WITH_OR_EVAL = HAS_EVAL | HAS_WITH | HAS_DESCENDANT_WITH_OR_EVAL;
     /** Does this function need to store all its variables in scope? */
-    private static final int HAS_ALL_VARS_IN_SCOPE = HAS_DEEP_WITH_OR_EVAL | IS_SPLIT;
+    private static final int HAS_ALL_VARS_IN_SCOPE = HAS_DEEP_WITH_OR_EVAL | IS_SPLIT | HAS_LAZY_CHILDREN;
     /** Does this function potentially need "arguments"? Note that this is not a full test, as further negative check of REDEFINES_ARGS is needed. */
     private static final int MAYBE_NEEDS_ARGUMENTS = USES_ARGUMENTS | HAS_EVAL;
     /** Does this function need the parent scope? It needs it if either it or its descendants use variables from it, or have a deep with or eval. */
@@ -862,7 +864,7 @@ public class FunctionNode extends Block {
      *
      * @return true if all variables should be in scope
      */
-    public boolean varsInScope() {
+    public boolean allVarsInScope() {
         return isScript() || (flags & HAS_ALL_VARS_IN_SCOPE) != 0;
     }
 
@@ -883,6 +885,23 @@ public class FunctionNode extends Block {
         setNeedsScope();
     }
 
+    /**
+     * Checks if this function has yet-to-be-generated child functions
+     *
+     * @return true if there are lazy child functions
+     */
+    public boolean hasLazyChildren() {
+        return (flags & HAS_LAZY_CHILDREN) != 0;
+    }
+
+    /**
+     * Flag this function node as having yet-to-be-generated child functions
+     */
+    public void setHasLazyChildren() {
+        this.flags |= HAS_LAZY_CHILDREN;
+        setNeedsScope();
+    }
+
     /**
      * Get the parameters to this function
      * @return a list of IdentNodes which represent the function parameters, in order
diff --git a/nashorn/src/jdk/nashorn/internal/ir/TernaryNode.java b/nashorn/src/jdk/nashorn/internal/ir/TernaryNode.java
index d25a7886a8a..a82991f9ab9 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/TernaryNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/TernaryNode.java
@@ -54,7 +54,7 @@ public class TernaryNode extends BinaryNode {
     private TernaryNode(final TernaryNode ternaryNode, final CopyState cs) {
         super(ternaryNode, cs);
 
-        third = cs.existingOrCopy(ternaryNode.third);
+        this.third = cs.existingOrCopy(ternaryNode.third);
     }
 
     @Override
diff --git a/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionTrampolineImpl.java b/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionTrampolineImpl.java
index 339aa430204..fa2bc2b129a 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionTrampolineImpl.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionTrampolineImpl.java
@@ -5,6 +5,7 @@ import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
+import jdk.nashorn.internal.codegen.CompilationException;
 import jdk.nashorn.internal.codegen.Compiler;
 import jdk.nashorn.internal.codegen.FunctionSignature;
 import jdk.nashorn.internal.codegen.types.Type;
@@ -77,12 +78,10 @@ public final class ScriptFunctionTrampolineImpl extends ScriptFunctionImpl {
         return super.makeBoundFunction(data);
     }
 
-    private MethodHandle compile() {
+    private MethodHandle compile() throws CompilationException {
         final Compiler compiler = new Compiler(installer, functionNode);
-        if (!compiler.compile()) {
-            assert false : "compilation error in trampoline for " + functionNode.getName();
-            return null;
-        }
+
+        compiler.compile();
 
         final Class<?> clazz = compiler.install();
         /* compute function signature for lazy method. this can be done first after compilation, as only then do we know
@@ -91,7 +90,9 @@ public final class ScriptFunctionTrampolineImpl extends ScriptFunctionImpl {
         final MethodType        mt        = signature.getMethodType();
 
         MethodHandle mh = MH.findStatic(MethodHandles.publicLookup(), clazz, functionNode.getName(), mt);
-        mh = MH.bindTo(mh, this);
+        if (functionNode.needsCallee()) {
+            mh = MH.bindTo(mh, this);
+        }
 
         // now the invoker method looks like the one our superclass is expecting
         resetInvoker(mh);
@@ -100,11 +101,11 @@ public final class ScriptFunctionTrampolineImpl extends ScriptFunctionImpl {
     }
 
     @SuppressWarnings("unused")
-    private Object trampoline(final Object... args) {
-        /** Create a new compiler for the lazy node, using the same installation policy as the old one */
-
+    private Object trampoline(final Object... args) throws CompilationException {
+        Compiler.LOG.info(">>> TRAMPOLINE: Hitting trampoline for '" + functionNode.getName() + "'");
         MethodHandle mh = compile();
 
+        Compiler.LOG.info("<<< COMPILED TO: " + mh);
         // spread the array to invididual args of the correct type
         mh = MH.asSpreader(mh, Object[].class, mh.type().parameterCount());
 
diff --git a/nashorn/src/jdk/nashorn/internal/parser/Parser.java b/nashorn/src/jdk/nashorn/internal/parser/Parser.java
index 24ae2716898..aa12d7a95b5 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/Parser.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/Parser.java
@@ -97,15 +97,16 @@ import jdk.nashorn.internal.ir.VarNode;
 import jdk.nashorn.internal.ir.WhileNode;
 import jdk.nashorn.internal.ir.WithNode;
 import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.runtime.DebugLogger;
 import jdk.nashorn.internal.runtime.ErrorManager;
 import jdk.nashorn.internal.runtime.JSErrorType;
 import jdk.nashorn.internal.runtime.ParserException;
 import jdk.nashorn.internal.runtime.ScriptingFunctions;
 import jdk.nashorn.internal.runtime.Source;
+import jdk.nashorn.internal.runtime.Timing;
 
 /**
  * Builds the IR.
- *
  */
 public class Parser extends AbstractParser {
     /** Current context. */
@@ -126,6 +127,8 @@ public class Parser extends AbstractParser {
     /** Namespace for function names where not explicitly given */
     private final Namespace namespace;
 
+    private static DebugLogger LOG = new DebugLogger("parser");
+
     /**
      * Constructor
      *
@@ -176,6 +179,9 @@ public class Parser extends AbstractParser {
      * @return function node resulting from successful parse
      */
     public FunctionNode parse(final String scriptName) {
+        final long t0 = Timing.isEnabled() ? System.currentTimeMillis() : 0L;
+        LOG.info(this + " begin for '" + scriptName + "'");
+
         try {
             stream = new TokenStream();
             lexer  = new Lexer(source, stream, scripting && !context._no_syntax_extensions);
@@ -208,6 +214,14 @@ public class Parser extends AbstractParser {
             }
 
             return null;
+         } finally {
+             final String end = this + " end '" + scriptName + "'";
+             if (Timing.isEnabled()) {
+                 Timing.accumulateTime(toString(), System.currentTimeMillis() - t0);
+                 LOG.info(end + "' in " + (System.currentTimeMillis() - t0) + " ms");
+             } else {
+                 LOG.info(end);
+             }
          }
     }
 
@@ -3064,4 +3078,8 @@ loop:
         return null;
     }
 
+    @Override
+    public String toString() {
+        return "[JavaScript Parsing]";
+    }
 }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/NashornLoader.java b/nashorn/src/jdk/nashorn/internal/runtime/NashornLoader.java
index cf82ac67f3a..80a0b8e6ef1 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/NashornLoader.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/NashornLoader.java
@@ -57,7 +57,7 @@ abstract class NashornLoader extends SecureClassLoader {
      * @param name name of the class to be loaded
      * @param resolve whether the class should be resolved or not
      * @return Class object
-     * @throws ClassNotFoundException
+     * @throws ClassNotFoundException if class cannot be loaded
      */
     protected final Class<?> loadClassTrusted(final String name, final boolean resolve) throws ClassNotFoundException {
         return super.loadClass(name, resolve);
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java
index 2925c8da6b5..d9f38c20625 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java
@@ -121,11 +121,11 @@ public final class ScriptingFunctions {
      *
      * @param self   self reference
      * @param string string to execute
-     * @param input
+     * @param input  input
      *
      * @return output string from the request
-     * @throws IOException
-     * @throws InterruptedException
+     * @throws IOException           if any stream access fails
+     * @throws InterruptedException  if execution is interrupted
      */
     public static Object exec(final Object self, final Object string, final Object input) throws IOException, InterruptedException {
         // Current global is need to fetch additional inputs and for additional results.
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Timing.java b/nashorn/src/jdk/nashorn/internal/runtime/Timing.java
new file mode 100644
index 00000000000..aa32f1c4ab9
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Timing.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.nashorn.internal.runtime;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import jdk.nashorn.internal.runtime.options.Options;
+
+/**
+ * Simple wallclock timing framework
+ */
+public final class Timing {
+    private static final boolean ENABLED = Options.getBooleanProperty("nashorn.time");
+    private static final Map<String, Long> TIMINGS;
+    private static final long START_TIME;
+
+    static {
+        if (ENABLED) {
+            TIMINGS    = new LinkedHashMap<>();
+            START_TIME = System.currentTimeMillis();
+            Runtime.getRuntime().addShutdownHook(new Thread() {
+                @Override
+                public void run() {
+                    final long t = System.currentTimeMillis();
+                    long knownTime = 0L;
+                    int  maxLength = 0;
+
+                    for (final Map.Entry<String, Long> entry : TIMINGS.entrySet()) {
+                        maxLength = Math.max(maxLength, entry.getKey().length());
+                    }
+                    maxLength++;
+
+                    for (final Map.Entry<String, Long> entry : TIMINGS.entrySet()) {
+                        final StringBuilder sb = new StringBuilder();
+
+                        sb.append(entry.getKey());
+                        while (sb.length() < maxLength) {
+                            sb.append(' ');
+                        }
+
+                        final long duration = entry.getValue();
+                        sb.append(duration);
+                        sb.append(' ');
+                        sb.append(" ms");
+
+                        knownTime += duration;
+
+                        System.err.println(sb.toString()); //Context err is gone by shutdown TODO
+                    }
+
+                    final long total = t - START_TIME;
+                    System.err.println("Total runtime: " + total + " ms (Non-runtime: " + knownTime + " ms [" + (int)(knownTime * 100.0 / total) + "%])");
+                }
+            });
+        } else {
+            TIMINGS = null;
+            START_TIME = 0L;
+        }
+    }
+
+    /**
+     * Check if timing is inabled
+     * @return true if timing is enabled
+     */
+    public static boolean isEnabled() {
+        return ENABLED;
+    }
+
+    /**
+     * When timing, this can be called to register a new module for timing
+     * or add to its accumulated time
+     *
+     * @param module   module name
+     * @param duration duration to add to accumulated time for module
+     */
+    public static void accumulateTime(final String module, final long duration) {
+        if (Timing.isEnabled()) {
+            Long accumulatedTime = TIMINGS.get(module);
+            if (accumulatedTime == null) {
+                accumulatedTime = 0L;
+            }
+            TIMINGS.put(module, accumulatedTime + duration);
+        }
+    }
+
+}
diff --git a/nashorn/test/script/trusted/JDK-8006529.js b/nashorn/test/script/trusted/JDK-8006529.js
index 0ad1db31795..b5d2643c928 100644
--- a/nashorn/test/script/trusted/JDK-8006529.js
+++ b/nashorn/test/script/trusted/JDK-8006529.js
@@ -60,7 +60,7 @@ functionNodeField.setAccessible(true);
 var getFunctionsMethod = FunctionNode.class.getMethod("getFunctions");
 
 // These are method names of methods in FunctionNode class
-var allAssertionList = ['isVarArg', 'needsParentScope', 'needsCallee', 'needsScope', 'needsSelfSymbol', 'isSplit', 'hasEval', 'hasWith', 'hasDeepWithOrEval', 'varsInScope', 'isStrictMode']
+var allAssertionList = ['isVarArg', 'needsParentScope', 'needsCallee', 'needsScope', 'needsSelfSymbol', 'isSplit', 'hasEval', 'hasWith', 'hasDeepWithOrEval', 'allVarsInScope', 'isStrictMode']
 
 // corresponding Method objects of FunctionNode class
 var functionNodeMethods = {};
@@ -189,18 +189,18 @@ testFirstFn("(function f() { var x; function g() { var x; x } })")
 // and all variables in scope. Actually, we could make "with" less wasteful,
 // and only put those variables in scope that it actually references, similar
 // to what nested functions do with variables in their parents.
-testFirstFn("(function f() { var o; with(o) {} })", 'needsParentScope', 'needsCallee', 'needsScope', 'hasWith', 'hasDeepWithOrEval', 'varsInScope')
+testFirstFn("(function f() { var o; with(o) {} })", 'needsParentScope', 'needsCallee', 'needsScope', 'hasWith', 'hasDeepWithOrEval', 'allVarsInScope')
 
 // Using "eval" is as bad as using "with" with the added requirement of
 // being vararg, 'cause we don't know if eval will be using "arguments".
-testFirstFn("(function f() { eval() })", 'needsParentScope', 'needsCallee', 'needsScope', 'hasEval', 'isVarArg', 'hasDeepWithOrEval', 'varsInScope')
+testFirstFn("(function f() { eval() })", 'needsParentScope', 'needsCallee', 'needsScope', 'hasEval', 'isVarArg', 'hasDeepWithOrEval', 'allVarsInScope')
 
 // Nested function using "with" is pretty much the same as the parent
 // function needing with.
-testFirstFn("(function f() { function g() { var o; with(o) {} } })", 'needsParentScope', 'needsCallee', 'needsScope', 'hasDeepWithOrEval', 'varsInScope')
+testFirstFn("(function f() { function g() { var o; with(o) {} } })", 'needsParentScope', 'needsCallee', 'needsScope', 'hasDeepWithOrEval', 'allVarsInScope')
 // Nested function using "eval" is almost the same as parent function using
 // eval, but at least the parent doesn't have to be vararg.
-testFirstFn("(function f() { function g() { eval() } })", 'needsParentScope', 'needsCallee', 'needsScope', 'hasDeepWithOrEval', 'varsInScope')
+testFirstFn("(function f() { function g() { eval() } })", 'needsParentScope', 'needsCallee', 'needsScope', 'hasDeepWithOrEval', 'allVarsInScope')
 
 // Function with 250 named parameters is ordinary
 testFirstFn("function f(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19, p20, p21, p22, p23, p24, p25, p26, p27, p28, p29, p30, p31, p32, p33, p34, p35, p36, p37, p38, p39, p40, p41, p42, p43, p44, p45, p46, p47, p48, p49, p50, p51, p52, p53, p54, p55, p56, p57, p58, p59, p60, p61, p62, p63, p64, p65, p66, p67, p68, p69, p70, p71, p72, p73, p74, p75, p76, p77, p78, p79, p80, p81, p82, p83, p84, p85, p86, p87, p88, p89, p90, p91, p92, p93, p94, p95, p96, p97, p98, p99, p100, p101, p102, p103, p104, p105, p106, p107, p108, p109, p110, p111, p112, p113, p114, p115, p116, p117, p118, p119, p120, p121, p122, p123, p124, p125, p126, p127, p128, p129, p130, p131, p132, p133, p134, p135, p136, p137, p138, p139, p140, p141, p142, p143, p144, p145, p146, p147, p148, p149, p150, p151, p152, p153, p154, p155, p156, p157, p158, p159, p160, p161, p162, p163, p164, p165, p166, p167, p168, p169, p170, p171, p172, p173, p174, p175, p176, p177, p178, p179, p180, p181, p182, p183, p184, p185, p186, p187, p188, p189, p190, p191, p192, p193, p194, p195, p196, p197, p198, p199, p200, p201, p202, p203, p204, p205, p206, p207, p208, p209, p210, p211, p212, p213, p214, p215, p216, p217, p218, p219, p220, p221, p222, p223, p224, p225, p226, p227, p228, p229, p230, p231, p232, p233, p234, p235, p236, p237, p238, p239, p240, p241, p242, p243, p244, p245, p246, p247, p248, p249, p250) { p250 = p249 }")

From fc7f562588e00bf03a4e90cf92f1dace30525cd2 Mon Sep 17 00:00:00 2001
From: James Laskey <james.laskey@oracle.com>
Date: Thu, 21 Feb 2013 15:24:31 -0400
Subject: [PATCH 191/311] 8008447: Tweaks to make all NEWBUILD=false round 3

Reviewed-by: jjh, sundar
---
 nashorn/make/Makefile | 163 +-----------------------------------------
 1 file changed, 3 insertions(+), 160 deletions(-)

diff --git a/nashorn/make/Makefile b/nashorn/make/Makefile
index 280070337f8..443f8db6c67 100644
--- a/nashorn/make/Makefile
+++ b/nashorn/make/Makefile
@@ -23,8 +23,6 @@
 # questions.
 #
 
-# Makefile for nashorn: wrapper around Ant build.xml file
-
 #
 # On Solaris, the standard 'make' utility will not work with these makefiles.
 #    This little rule is only understood by Solaris make, and is harmless
@@ -33,168 +31,13 @@
 #
 SUN_MAKE_TEST:sh = @echo "ERROR: PLEASE USE GNU VERSION OF MAKE"; exit 33
 
-#
-# Minimal platform defs
-# Need FullPath because we can't rely on gnumake abspath, until we use v3.81
-#
-
-SYSTEM_UNAME := $(shell uname)
-
-# Where is unwanted output to be delivered?
-# On Windows, MKS uses the special file "NUL", cygwin uses the customary unix file.
-ifeq ($(SYSTEM_UNAME), Windows_NT)
-DEV_NULL = NUL
-else
-DEV_NULL = /dev/null 
-endif
-
-ifneq (,$(findstring CYGWIN,$(SYSTEM_UNAME)))
-USING_CYGWIN = true
-endif
-
-ifdef USING_CYGWIN
-define FullPath
-$(shell cygpath -a -s -m $1 2> $(DEV_NULL))
-endef
-else
-define FullPath
-$(shell cd $1 2> $(DEV_NULL) && pwd)
-endef
-endif
-
-#
-# Makefile args
-#
-
-ifdef QUIET
-  ANT_OPTIONS += -quiet
-endif
-
-ifdef VERBOSE
-  ANT_OPTIONS += -verbose -debug
-endif
-
-ifdef JDK_VERSION
-  ANT_OPTIONS += -Djdk.version=$(JDK_VERSION)
-endif 
-
-ifdef FULL_VERSION
-  ANT_OPTIONS += -Dfull.version='$(FULL_VERSION)' # will contain spaces
-endif 
-
-ifdef MILESTONE
-ifneq ($(MILESTONE),fcs)
-  ANT_OPTIONS += -Dmilestone=$(MILESTONE)
-else
-  ANT_OPTIONS += -Drelease=$(JDK_VERSION)
-endif
-endif
-
-ifdef BUILD_NUMBER
-  ANT_OPTIONS += -Dbuild.number=$(BUILD_NUMBER)
-else
-  ifdef JDK_BUILD_NUMBER
-    ANT_OPTIONS += -Dbuild.number=$(JDK_BUILD_NUMBER)
-  endif
-endif
-
-ifeq ($(VARIANT), DBG)
-  ANT_OPTIONS += -Djavac.debug=true
-else
-  ifeq ($(VARIANT), OPT)
-    ANT_OPTIONS += -Djavac.debug=false
-  endif
-endif
-
-ifeq ($(DEBUG_CLASSFILES), true)
-  ANT_OPTIONS += -Djavac.debug=true
-  ANT_OPTIONS += -Ddebug.classfiles=true
-endif
-
-# Note: jdk/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN)
-# and the somewhat misnamed CLASS_VERSION (-target NN)
-ifdef TARGET_CLASS_VERSION
-  ANT_OPTIONS += -Djavac.target=$(TARGET_CLASS_VERSION)
-else
-  ifdef JAVAC_TARGET_ARG 
-    ANT_OPTIONS += -Djavac.target=$(JAVAC_TARGET_ARG)
-  endif
-endif 
-
-ifdef SOURCE_LANGUAGE_VERSION
-  ANT_OPTIONS += -Djavac.source=$(SOURCE_LANGUAGE_VERSION)
-else
-  ifdef JAVAC_SOURCE_ARG 
-    ANT_OPTIONS += -Djavac.source=$(JAVAC_SOURCE_ARG)
-  endif
-endif 
-
-# To facilitate bootstrapping, much of langtools can be compiled with (just)
-# a boot JDK. However, some source files need to be compiled against 
-# new JDK API. In a bootstrap build, an import JDK may not be available,
-# so build.xml can also build against the source files in a jdk repo,
-# in which case it will automatically generate stub files for the new JDK API.
-ifdef JDK_TOPDIR
-  ANT_OPTIONS += -Dimport.jdk=$(JDK_TOPDIR)
-else 
-  ifdef ALT_JDK_TOPDIR
-    ANT_OPTIONS += -Dimport.jdk=$(ALT_JDK_TOPDIR)
-  else 
-    ifdef ALT_JDK_IMPORT_PATH
-      ANT_OPTIONS += -Dimport.jdk=$(ALT_JDK_IMPORT_PATH)
-    endif
-  endif
-endif
-
-ifdef ALT_OUTPUTDIR
-  OUTPUTDIR = $(ALT_OUTPUTDIR)
-  ANT_OPTIONS += -Dbuild.dir=$(ALT_OUTPUTDIR)/build
-  ANT_OPTIONS += -Ddist.dir=$(ALT_OUTPUTDIR)/dist
-else
-  OUTPUTDIR = ..
-endif
-#ABS_OUTPUTDIR = $(abspath $(OUTPUTDIR))
-ABS_OUTPUTDIR = $(call FullPath,$(OUTPUTDIR))
-
-ANT_TMPDIR = $(ABS_OUTPUTDIR)/build/ant-tmp
-ANT_OPTS = ANT_OPTS=-Djava.io.tmpdir='$(ANT_TMPDIR)'
-
-ifdef FINDBUGS_HOME
-  ANT_OPTIONS += -Dfindbugs.home=$(FINDBUGS_HOME)
-endif
-
-ifdef ANT_HOME
-  ANT = $(ANT_HOME)/bin/ant
-  ifneq ($(shell test -x $(ANT) && echo OK), OK)
-    $(error $(ANT) not found -- please update ANT_HOME)
-  endif
-else
-  ANT = ant
-  ifneq ($(shell test -x "`which $(ANT)`" && echo OK), OK)
-    $(error 'ant' not found -- please set ANT_HOME or put 'ant' on your PATH)
-  endif
-endif
 
 # Default target and expected 'do everything' target
-all: test
+all:
+	echo Nashorn can only be built with NEWBUILD=true
 
 # Standard make clobber target
-clobber: clean
-
-# All ant targets of interest
-ANT_TARGETS = clean externals update-externals jar javadoc shelldoc docs test test262 test262parallel octane sunspider perf alltests
-
-# Create diagnostics log (careful, ant 1.8.0 -diagnostics always does an exit 1)
-$(OUTPUTDIR)/build/ant-diagnostics.log:
-	@mkdir -p $(OUTPUTDIR)/build $(ANT_TMPDIR)
-	@$(RM) $@
-	$(ANT_JAVA_HOME) $(ANT_OPTS) $(ANT) -diagnostics > $@ ; \
-	  $(ANT_JAVA_HOME) $(ANT_OPTS) $(ANT) -version >> $@
-
-# Create a make target for each
-$(ANT_TARGETS): $(OUTPUTDIR)/build/ant-diagnostics.log
-	@ mkdir -p $(OUTPUTDIR)/build $(ANT_TMPDIR)
-	$(ANT_JAVA_HOME) $(ANT_OPTS) $(ANT) $(ANT_OPTIONS) $@
+clobber:
 
 #-------------------------------------------------------------------
 #

From 56baa11720fa000e773edb8873a8e2b2bb9c6842 Mon Sep 17 00:00:00 2001
From: Robert Field <rfield@openjdk.org>
Date: Thu, 21 Feb 2013 15:46:37 -0800
Subject: [PATCH 192/311] 8008356: Test LambdaSerialization.java failing

Run in /othervm mode

Reviewed-by: ksrini
---
 jdk/test/java/lang/invoke/lambda/LambdaSerialization.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jdk/test/java/lang/invoke/lambda/LambdaSerialization.java b/jdk/test/java/lang/invoke/lambda/LambdaSerialization.java
index 1e7ba6dbe5b..ebe846b173e 100644
--- a/jdk/test/java/lang/invoke/lambda/LambdaSerialization.java
+++ b/jdk/test/java/lang/invoke/lambda/LambdaSerialization.java
@@ -25,7 +25,7 @@
 @test
 @bug 8004970
 @summary Lambda serialization
-
+@run main/othervm LambdaSerialization
 */
 
 import java.io.*;

From ec9e303630158405d0faaabb74f466f0a376c1fc Mon Sep 17 00:00:00 2001
From: Mark Sheppard <msheppar@openjdk.org>
Date: Thu, 21 Feb 2013 20:01:22 +0000
Subject: [PATCH 193/311] 8006182: cleanup to use java.util.Base64 in java
 security component, providers, and regression tests

Refactored code to use java.util.Base64 Mime Encoder and Decoder as a replacement for sun.misc.BASE64Encoder and sun.misc.BASE64Decoder

Reviewed-by: vinnie, chegar, sherman
---
 .../classes/sun/security/pkcs10/PKCS10.java   |  5 +--
 .../sun/security/provider/X509Factory.java    |  7 ++--
 .../sun/security/tools/jarsigner/Main.java    | 41 +++++--------------
 .../sun/security/tools/keytool/Main.java      | 22 +++++-----
 .../security/util/ManifestEntryVerifier.java  |  6 +--
 .../security/util/SignatureFileVerifier.java  | 22 ++++------
 .../sun/security/x509/X509CertImpl.java       |  5 +--
 .../share/classes/sun/tools/jar/Manifest.java |  6 +--
 .../classes/sun/tools/jar/SignatureFile.java  |  7 ++--
 .../auth/kerberos/KerberosTixDateTest.java    |  4 +-
 .../krb5/auto/HttpNegotiateServer.java        |  8 ++--
 .../ssl/SSLContextImpl/MD2InTrustAnchor.java  |  5 +--
 .../ssl/SSLContextImpl/TrustTrustedCert.java  |  4 +-
 .../BasicConstraints.java                     |  6 +--
 .../X509TrustManagerImpl/SelfIssuedCert.java  |  4 +-
 .../https/HttpsClient/ProxyTunnelServer.java  |  9 ++--
 .../ssl/ServerName/SSLSocketSNISensitive.java |  4 +-
 .../net/ssl/TLSv12/DisabledShortRSAKeys.java  |  4 +-
 .../javax/net/ssl/TLSv12/ShortRSAKey512.java  |  4 +-
 .../HttpsURLConnection/ProxyTunnelServer.java |  8 ++--
 20 files changed, 75 insertions(+), 106 deletions(-)

diff --git a/jdk/src/share/classes/sun/security/pkcs10/PKCS10.java b/jdk/src/share/classes/sun/security/pkcs10/PKCS10.java
index c5418c67d07..3caf6ca1941 100644
--- a/jdk/src/share/classes/sun/security/pkcs10/PKCS10.java
+++ b/jdk/src/share/classes/sun/security/pkcs10/PKCS10.java
@@ -37,7 +37,7 @@ import java.security.Signature;
 import java.security.SignatureException;
 import java.security.PublicKey;
 
-import sun.misc.BASE64Encoder;
+import java.util.Base64;
 
 import sun.security.util.*;
 import sun.security.x509.AlgorithmId;
@@ -289,10 +289,9 @@ public class PKCS10 {
         if (encoded == null)
             throw new SignatureException("Cert request was not signed");
 
-        BASE64Encoder   encoder = new BASE64Encoder();
 
         out.println("-----BEGIN NEW CERTIFICATE REQUEST-----");
-        encoder.encodeBuffer(encoded, out);
+        out.println(Base64.getMimeEncoder().encodeToString(encoded));
         out.println("-----END NEW CERTIFICATE REQUEST-----");
     }
 
diff --git a/jdk/src/share/classes/sun/security/provider/X509Factory.java b/jdk/src/share/classes/sun/security/provider/X509Factory.java
index 28b7aa55666..3a491a1c080 100644
--- a/jdk/src/share/classes/sun/security/provider/X509Factory.java
+++ b/jdk/src/share/classes/sun/security/provider/X509Factory.java
@@ -35,7 +35,7 @@ import sun.security.provider.certpath.X509CertPath;
 import sun.security.provider.certpath.X509CertificatePair;
 import sun.security.util.DerValue;
 import sun.security.util.Cache;
-import sun.misc.BASE64Decoder;
+import java.util.Base64;
 import sun.security.pkcs.ParsingException;
 
 /**
@@ -512,7 +512,7 @@ public class X509Factory extends CertificateFactorySpi {
                     hyphen = 0;
                     last = next;
                 }
-                if (hyphen == 5 && (last==-1 || last=='\r' || last=='\n')) {
+                if (hyphen == 5 && (last == -1 || last == '\r' || last == '\n')) {
                     break;
                 }
             }
@@ -575,8 +575,7 @@ public class X509Factory extends CertificateFactorySpi {
 
             checkHeaderFooter(header.toString(), footer.toString());
 
-            BASE64Decoder decoder = new BASE64Decoder();
-            return decoder.decodeBuffer(new String(data, 0, pos));
+            return Base64.getMimeDecoder().decode(new String(data, 0, pos));
         }
     }
 
diff --git a/jdk/src/share/classes/sun/security/tools/jarsigner/Main.java b/jdk/src/share/classes/sun/security/tools/jarsigner/Main.java
index 159de08695a..9828a1a9a1d 100644
--- a/jdk/src/share/classes/sun/security/tools/jarsigner/Main.java
+++ b/jdk/src/share/classes/sun/security/tools/jarsigner/Main.java
@@ -57,7 +57,7 @@ import sun.security.tools.KeyStoreUtil;
 import sun.security.tools.PathList;
 import sun.security.x509.*;
 import sun.security.util.*;
-import sun.misc.BASE64Encoder;
+import java.util.Base64;
 
 
 /**
@@ -1120,7 +1120,6 @@ public class Main {
              *   different, replace the hash in the manifest with the newly
              *   generated one. (This may invalidate existing signatures!)
              */
-            BASE64Encoder encoder = new JarBASE64Encoder();
             Vector<ZipEntry> mfFiles = new Vector<>();
 
             boolean wasSigned = false;
@@ -1148,15 +1147,14 @@ public class Main {
                 if (manifest.getAttributes(ze.getName()) != null) {
                     // jar entry is contained in manifest, check and
                     // possibly update its digest attributes
-                    if (updateDigests(ze, zipFile, digests, encoder,
+                    if (updateDigests(ze, zipFile, digests,
                                       manifest) == true) {
                         mfModified = true;
                     }
                 } else if (!ze.isDirectory()) {
                     // Add entry to manifest
                     Attributes attrs = getDigestAttributes(ze, zipFile,
-                                                           digests,
-                                                           encoder);
+                                                           digests);
                     mfEntries.put(ze.getName(), attrs);
                     mfModified = true;
                 }
@@ -1955,8 +1953,7 @@ public class Main {
      * of base64-encoded strings.
      */
     private synchronized String[] getDigests(ZipEntry ze, ZipFile zf,
-                                             MessageDigest[] digests,
-                                             BASE64Encoder encoder)
+                                             MessageDigest[] digests)
         throws IOException {
 
         int n, i;
@@ -1980,7 +1977,7 @@ public class Main {
         // complete the digests
         String[] base64Digests = new String[digests.length];
         for (i=0; i<digests.length; i++) {
-            base64Digests[i] = encoder.encode(digests[i].digest());
+            base64Digests[i] = Base64.getEncoder().encodeToString(digests[i].digest());
         }
         return base64Digests;
     }
@@ -1990,11 +1987,10 @@ public class Main {
      * attributes
      */
     private Attributes getDigestAttributes(ZipEntry ze, ZipFile zf,
-                                           MessageDigest[] digests,
-                                           BASE64Encoder encoder)
+                                           MessageDigest[] digests)
         throws IOException {
 
-        String[] base64Digests = getDigests(ze, zf, digests, encoder);
+        String[] base64Digests = getDigests(ze, zf, digests);
         Attributes attrs = new Attributes();
 
         for (int i=0; i<digests.length; i++) {
@@ -2016,12 +2012,11 @@ public class Main {
      */
     private boolean updateDigests(ZipEntry ze, ZipFile zf,
                                   MessageDigest[] digests,
-                                  BASE64Encoder encoder,
                                   Manifest mf) throws IOException {
         boolean update = false;
 
         Attributes attrs = mf.getAttributes(ze.getName());
-        String[] base64Digests = getDigests(ze, zf, digests, encoder);
+        String[] base64Digests = getDigests(ze, zf, digests);
 
         for (int i=0; i<digests.length; i++) {
             // The entry name to be written into attrs
@@ -2094,19 +2089,6 @@ public class Main {
     }
 }
 
-/**
- * This is a BASE64Encoder that does not insert a default newline at the end of
- * every output line. This is necessary because java.util.jar does its own
- * line management (see Manifest.make72Safe()). Inserting additional new lines
- * can cause line-wrapping problems (see CR 6219522).
- */
-class JarBASE64Encoder extends BASE64Encoder {
-    /**
-     * Encode the suffix that ends every output line.
-     */
-    protected void encodeLineSuffix(OutputStream aStream) throws IOException { }
-}
-
 class SignatureFile {
 
     /** SignatureFile */
@@ -2129,7 +2111,6 @@ class SignatureFile {
 
         sf = new Manifest();
         Attributes mattr = sf.getMainAttributes();
-        BASE64Encoder encoder = new JarBASE64Encoder();
 
         mattr.putValue(Attributes.Name.SIGNATURE_VERSION.toString(), "1.0");
         mattr.putValue("Created-By", version + " (" + javaVendor + ")");
@@ -2138,7 +2119,7 @@ class SignatureFile {
             // sign the whole manifest
             for (int i=0; i < digests.length; i++) {
                 mattr.putValue(digests[i].getAlgorithm()+"-Digest-Manifest",
-                               encoder.encode(md.manifestDigest(digests[i])));
+                               Base64.getEncoder().encodeToString(md.manifestDigest(digests[i])));
             }
         }
 
@@ -2149,7 +2130,7 @@ class SignatureFile {
             for (int i=0; i < digests.length; i++) {
                 mattr.putValue(digests[i].getAlgorithm() +
                         "-Digest-" + ManifestDigester.MF_MAIN_ATTRS,
-                        encoder.encode(mde.digest(digests[i])));
+                        Base64.getEncoder().encodeToString(mde.digest(digests[i])));
             }
         } else {
             throw new IllegalStateException
@@ -2170,7 +2151,7 @@ class SignatureFile {
                 Attributes attr = new Attributes();
                 for (int i=0; i < digests.length; i++) {
                     attr.putValue(digests[i].getAlgorithm()+"-Digest",
-                                  encoder.encode(mde.digest(digests[i])));
+                                  Base64.getEncoder().encodeToString(mde.digest(digests[i])));
                 }
                 entries.put(name, attr);
             }
diff --git a/jdk/src/share/classes/sun/security/tools/keytool/Main.java b/jdk/src/share/classes/sun/security/tools/keytool/Main.java
index d0a6d6b53c4..a33e00a0c46 100644
--- a/jdk/src/share/classes/sun/security/tools/keytool/Main.java
+++ b/jdk/src/share/classes/sun/security/tools/keytool/Main.java
@@ -63,7 +63,7 @@ import java.security.cert.X509CRL;
 import java.security.cert.X509CRLEntry;
 import java.security.cert.X509CRLSelector;
 import javax.security.auth.x500.X500Principal;
-import sun.misc.BASE64Encoder;
+import java.util.Base64;
 import sun.security.util.ObjectIdentifier;
 import sun.security.pkcs10.PKCS10;
 import sun.security.pkcs10.PKCS10Attribute;
@@ -73,7 +73,6 @@ import sun.security.util.Password;
 import javax.crypto.KeyGenerator;
 import javax.crypto.SecretKey;
 
-import sun.misc.BASE64Decoder;
 import sun.security.pkcs.PKCS9Attribute;
 import sun.security.tools.KeyStoreUtil;
 import sun.security.tools.PathList;
@@ -555,11 +554,11 @@ public final class Main {
         return cmd != PRINTCERT && cmd != PRINTCERTREQ;
     }
 
+
     /**
      * Execute the commands.
      */
     void doCommands(PrintStream out) throws Exception {
-
         if (storetype == null) {
             storetype = KeyStore.getDefaultType();
         }
@@ -1189,7 +1188,7 @@ public final class Main {
                 sb.append(s);
             }
         }
-        byte[] rawReq = new BASE64Decoder().decodeBuffer(new String(sb));
+        byte[] rawReq = Base64.getMimeDecoder().decode(new String(sb));
         PKCS10 req = new PKCS10(rawReq);
 
         info.set(X509CertInfo.KEY, new CertificateX509Key(req.getSubjectPublicKeyInfo()));
@@ -1266,7 +1265,7 @@ public final class Main {
         crl.sign(privateKey, sigAlgName);
         if (rfc) {
             out.println("-----BEGIN X509 CRL-----");
-            new BASE64Encoder().encodeBuffer(crl.getEncodedInternal(), out);
+            out.println(Base64.getMimeEncoder().encodeToString(crl.getEncodedInternal()));
             out.println("-----END X509 CRL-----");
         } else {
             out.write(crl.getEncodedInternal());
@@ -2148,7 +2147,7 @@ public final class Main {
         if (rfc) {
             X509CRL xcrl = (X509CRL)crl;
             out.println("-----BEGIN X509 CRL-----");
-            new BASE64Encoder().encodeBuffer(xcrl.getEncoded(), out);
+            out.println(Base64.getMimeEncoder().encodeToString(xcrl.getEncoded()));
             out.println("-----END X509 CRL-----");
         } else {
             out.println(crl.toString());
@@ -2175,7 +2174,7 @@ public final class Main {
                 sb.append(s);
             }
         }
-        PKCS10 req = new PKCS10(new BASE64Decoder().decodeBuffer(new String(sb)));
+        PKCS10 req = new PKCS10(Base64.getMimeDecoder().decode(new String(sb)));
 
         PublicKey pkey = req.getSubjectPublicKeyInfo();
         out.printf(rb.getString("PKCS.10.Certificate.Request.Version.1.0.Subject.s.Public.Key.s.format.s.key."),
@@ -2227,8 +2226,10 @@ public final class Main {
                 Object[] source = {new Integer(i + 1)};
                 out.println(form.format(source));
             }
-            if (rfc) dumpCert(x509Cert, out);
-            else printX509Cert(x509Cert, out);
+            if (rfc)
+                dumpCert(x509Cert, out);
+            else
+                printX509Cert(x509Cert, out);
             if (i < (certs.length-1)) {
                 out.println();
             }
@@ -2946,9 +2947,8 @@ public final class Main {
         throws IOException, CertificateException
     {
         if (rfc) {
-            BASE64Encoder encoder = new BASE64Encoder();
             out.println(X509Factory.BEGIN_CERT);
-            encoder.encodeBuffer(cert.getEncoded(), out);
+            out.println(Base64.getMimeEncoder().encodeToString(cert.getEncoded()));
             out.println(X509Factory.END_CERT);
         } else {
             out.write(cert.getEncoded()); // binary
diff --git a/jdk/src/share/classes/sun/security/util/ManifestEntryVerifier.java b/jdk/src/share/classes/sun/security/util/ManifestEntryVerifier.java
index 3d1b4733c30..548133cfa40 100644
--- a/jdk/src/share/classes/sun/security/util/ManifestEntryVerifier.java
+++ b/jdk/src/share/classes/sun/security/util/ManifestEntryVerifier.java
@@ -31,7 +31,7 @@ import java.security.CodeSigner;
 import java.util.*;
 import java.util.jar.*;
 
-import sun.misc.BASE64Decoder;
+import java.util.Base64;
 
 import sun.security.jca.Providers;
 
@@ -63,7 +63,6 @@ public class ManifestEntryVerifier {
     /** the manifest hashes for the digests in use */
     ArrayList<byte[]> manifestHashes;
 
-    private BASE64Decoder decoder = null;
     private String name = null;
     private Manifest man;
 
@@ -81,7 +80,6 @@ public class ManifestEntryVerifier {
         createdDigests = new HashMap<String, MessageDigest>(11);
         digests = new ArrayList<MessageDigest>();
         manifestHashes = new ArrayList<byte[]>();
-        decoder = new BASE64Decoder();
         this.man = man;
     }
 
@@ -147,7 +145,7 @@ public class ManifestEntryVerifier {
                     digest.reset();
                     digests.add(digest);
                     manifestHashes.add(
-                                decoder.decodeBuffer((String)se.getValue()));
+                                Base64.getMimeDecoder().decode((String)se.getValue()));
                 }
             }
         }
diff --git a/jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java b/jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java
index 715a5da356b..e84cc2c37a8 100644
--- a/jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java
+++ b/jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java
@@ -35,7 +35,7 @@ import java.util.*;
 import java.util.jar.*;
 
 import sun.security.pkcs.*;
-import sun.misc.BASE64Decoder;
+import java.util.Base64;
 
 import sun.security.jca.Providers;
 
@@ -220,7 +220,6 @@ public class SignatureFileVerifier {
                                         name);
         }
 
-        BASE64Decoder decoder = new BASE64Decoder();
 
         CodeSigner[] newSigners = getSigners(infos, block);
 
@@ -232,10 +231,10 @@ public class SignatureFileVerifier {
                                 sf.getEntries().entrySet().iterator();
 
         // see if we can verify the whole manifest first
-        boolean manifestSigned = verifyManifestHash(sf, md, decoder, manifestDigests);
+        boolean manifestSigned = verifyManifestHash(sf, md, manifestDigests);
 
         // verify manifest main attributes
-        if (!manifestSigned && !verifyManifestMainAttrs(sf, md, decoder)) {
+        if (!manifestSigned && !verifyManifestMainAttrs(sf, md)) {
             throw new SecurityException
                 ("Invalid signature file digest for Manifest main attributes");
         }
@@ -247,7 +246,7 @@ public class SignatureFileVerifier {
             String name = e.getKey();
 
             if (manifestSigned ||
-                (verifySection(e.getValue(), name, md, decoder))) {
+                (verifySection(e.getValue(), name, md))) {
 
                 if (name.startsWith("./"))
                     name = name.substring(2);
@@ -275,7 +274,6 @@ public class SignatureFileVerifier {
      */
     private boolean verifyManifestHash(Manifest sf,
                                        ManifestDigester md,
-                                       BASE64Decoder decoder,
                                        List<Object> manifestDigests)
          throws IOException
     {
@@ -297,7 +295,7 @@ public class SignatureFileVerifier {
                 if (digest != null) {
                     byte[] computedHash = md.manifestDigest(digest);
                     byte[] expectedHash =
-                        decoder.decodeBuffer((String)se.getValue());
+                        Base64.getMimeDecoder().decode((String)se.getValue());
 
                     if (debug != null) {
                      debug.println("Signature File: Manifest digest " +
@@ -320,8 +318,7 @@ public class SignatureFileVerifier {
     }
 
     private boolean verifyManifestMainAttrs(Manifest sf,
-                                        ManifestDigester md,
-                                        BASE64Decoder decoder)
+                                        ManifestDigester md)
          throws IOException
     {
         Attributes mattr = sf.getMainAttributes();
@@ -342,7 +339,7 @@ public class SignatureFileVerifier {
                         md.get(ManifestDigester.MF_MAIN_ATTRS, false);
                     byte[] computedHash = mde.digest(digest);
                     byte[] expectedHash =
-                        decoder.decodeBuffer((String)se.getValue());
+                        Base64.getMimeDecoder().decode((String)se.getValue());
 
                     if (debug != null) {
                      debug.println("Signature File: " +
@@ -387,8 +384,7 @@ public class SignatureFileVerifier {
 
     private boolean verifySection(Attributes sfAttr,
                                   String name,
-                                  ManifestDigester md,
-                                  BASE64Decoder decoder)
+                                  ManifestDigester md)
          throws IOException
     {
         boolean oneDigestVerified = false;
@@ -418,7 +414,7 @@ public class SignatureFileVerifier {
                         boolean ok = false;
 
                         byte[] expected =
-                            decoder.decodeBuffer((String)se.getValue());
+                            Base64.getMimeDecoder().decode((String)se.getValue());
                         byte[] computed;
                         if (workaround) {
                             computed = mde.digestWorkaround(digest);
diff --git a/jdk/src/share/classes/sun/security/x509/X509CertImpl.java b/jdk/src/share/classes/sun/security/x509/X509CertImpl.java
index 64e06ceaebf..1593e5ed4ab 100644
--- a/jdk/src/share/classes/sun/security/x509/X509CertImpl.java
+++ b/jdk/src/share/classes/sun/security/x509/X509CertImpl.java
@@ -41,7 +41,7 @@ import java.util.*;
 import javax.security.auth.x500.X500Principal;
 
 import sun.misc.HexDumpEncoder;
-import sun.misc.BASE64Decoder;
+import java.util.Base64;
 import sun.security.util.*;
 import sun.security.provider.X509Factory;
 
@@ -263,7 +263,6 @@ public class X509CertImpl extends X509Certificate implements DerEncoder {
         }
         if (line.equals(X509Factory.BEGIN_CERT)) {
             /* stream appears to be hex-encoded bytes */
-            BASE64Decoder         decoder   = new BASE64Decoder();
             ByteArrayOutputStream decstream = new ByteArrayOutputStream();
             try {
                 while ((line = certBufferedReader.readLine()) != null) {
@@ -271,7 +270,7 @@ public class X509CertImpl extends X509Certificate implements DerEncoder {
                         der = new DerValue(decstream.toByteArray());
                         break;
                     } else {
-                        decstream.write(decoder.decodeBuffer(line));
+                        decstream.write(Base64.getMimeDecoder().decode(line));
                     }
                 }
             } catch (IOException ioe2) {
diff --git a/jdk/src/share/classes/sun/tools/jar/Manifest.java b/jdk/src/share/classes/sun/tools/jar/Manifest.java
index 7a8cf74a906..b1e23ce8e81 100644
--- a/jdk/src/share/classes/sun/tools/jar/Manifest.java
+++ b/jdk/src/share/classes/sun/tools/jar/Manifest.java
@@ -30,8 +30,7 @@ import java.util.*;
 import java.security.*;
 
 import sun.net.www.MessageHeader;
-import sun.misc.BASE64Encoder;
-import sun.misc.BASE64Decoder;
+import java.util.Base64;
 
 /**
  * This is OBSOLETE. DO NOT USE THIS. Use java.util.jar.Manifest
@@ -178,7 +177,6 @@ public class Manifest {
             return;
         }
 
-        BASE64Encoder enc = new BASE64Encoder();
 
         /* compute hashes, write over any other "Hash-Algorithms" (?) */
         for (int j = 0; j < hashes.length; ++j) {
@@ -190,7 +188,7 @@ public class Manifest {
                 while ((len = is.read(tmpbuf, 0, tmpbuf.length)) != -1) {
                     dig.update(tmpbuf, 0, len);
                 }
-                mh.set(hashes[j] + "-Digest", enc.encode(dig.digest()));
+                mh.set(hashes[j] + "-Digest", Base64.getMimeEncoder().encodeToString(dig.digest()));
             } catch (NoSuchAlgorithmException e) {
                 throw new JarException("Digest algorithm " + hashes[j] +
                                        " not available.");
diff --git a/jdk/src/share/classes/sun/tools/jar/SignatureFile.java b/jdk/src/share/classes/sun/tools/jar/SignatureFile.java
index 8e7d3f59435..007b67962e5 100644
--- a/jdk/src/share/classes/sun/tools/jar/SignatureFile.java
+++ b/jdk/src/share/classes/sun/tools/jar/SignatureFile.java
@@ -30,8 +30,8 @@ import java.util.*;
 import java.security.*;
 
 import sun.net.www.MessageHeader;
-import sun.misc.BASE64Encoder;
-import sun.misc.BASE64Decoder;
+import java.util.Base64;
+
 
 import sun.security.pkcs.*;
 import sun.security.x509.AlgorithmId;
@@ -305,7 +305,6 @@ public class SignatureFile {
         }
         smh.set("Name", name);
 
-        BASE64Encoder encoder = new BASE64Encoder();
         try {
             for (int i = 0; i < hashes.length; ++i) {
                 MessageDigest dig = getDigest(hashes[i]);
@@ -314,7 +313,7 @@ public class SignatureFile {
                 mh.print(ps);
                 byte[] headerBytes = baos.toByteArray();
                 byte[] digest = dig.digest(headerBytes);
-                smh.set(hashes[i] + "-Digest", encoder.encode(digest));
+                smh.set(hashes[i] + "-Digest", Base64.getMimeEncoder().encodeToString(digest));
             }
             return smh;
         } catch (NoSuchAlgorithmException e) {
diff --git a/jdk/test/javax/security/auth/kerberos/KerberosTixDateTest.java b/jdk/test/javax/security/auth/kerberos/KerberosTixDateTest.java
index c2f9e619ac4..00ee727401c 100644
--- a/jdk/test/javax/security/auth/kerberos/KerberosTixDateTest.java
+++ b/jdk/test/javax/security/auth/kerberos/KerberosTixDateTest.java
@@ -34,7 +34,7 @@ import java.io.*;
 import javax.security.auth.kerberos.KerberosKey;
 import javax.security.auth.kerberos.KerberosPrincipal;
 import javax.security.auth.kerberos.KerberosTicket;
-import sun.misc.BASE64Decoder;
+import java.util.Base64;
 
 public class KerberosTixDateTest {
 
@@ -127,7 +127,7 @@ public class KerberosTixDateTest {
 
         System.out.println("Testing against KerberosTicket from JDK6...");
         byte[] serializedBytes =
-            new BASE64Decoder().decodeBuffer(serializedKerberosTix);
+            Base64.getMimeDecoder().decode(serializedKerberosTix);
         checkEqualsAndHashCode(serializedBytes, t);
 
         System.out.println("Testing against KerberosTicket from current rel...");
diff --git a/jdk/test/sun/security/krb5/auto/HttpNegotiateServer.java b/jdk/test/sun/security/krb5/auto/HttpNegotiateServer.java
index 19f3355ce09..82333d7783b 100644
--- a/jdk/test/sun/security/krb5/auto/HttpNegotiateServer.java
+++ b/jdk/test/sun/security/krb5/auto/HttpNegotiateServer.java
@@ -55,6 +55,7 @@ import org.ietf.jgss.GSSCredential;
 import org.ietf.jgss.GSSManager;
 import sun.security.jgss.GSSUtil;
 import sun.security.krb5.Config;
+import java.util.Base64;
 
 /**
  * Basic JGSS/krb5 test with 3 parties: client, server, backend server. Each
@@ -341,12 +342,11 @@ public class HttpNegotiateServer {
                     exch.getHttpContext().getAttributes().put("GSSContext", c);
                     return new com.sun.net.httpserver.Authenticator.Retry(err);
                 } else {                            // Later requests
-                    byte[] token = new sun.misc.BASE64Decoder()
-                            .decodeBuffer(auth.split(" ")[1]);
+                    byte[] token = Base64.getMimeDecoder().decode(auth.split(" ")[1]);
                     token = c.acceptSecContext(token, 0, token.length);
                     Headers map = exch.getResponseHeaders();
-                    map.set (reqHdr, scheme + " " + new sun.misc.BASE64Encoder()
-                            .encode(token).replaceAll("\\s", ""));
+                    map.set (reqHdr, scheme + " " + Base64.getMimeEncoder()
+                            .encodeToString(token).replaceAll("\\s", ""));
                     if (c.isEstablished()) {
                         return new com.sun.net.httpserver.Authenticator.Success(
                                 new HttpPrincipal(c.getSrcName().toString(), ""));
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/MD2InTrustAnchor.java b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/MD2InTrustAnchor.java
index 0a25f7f21ce..9cf0fbb7185 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/MD2InTrustAnchor.java
+++ b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/MD2InTrustAnchor.java
@@ -46,8 +46,7 @@ import java.security.cert.Certificate;
 import java.security.cert.CertificateFactory;
 import java.security.spec.*;
 import java.security.interfaces.*;
-import sun.misc.BASE64Decoder;
-
+import java.util.Base64;
 
 public class MD2InTrustAnchor {
 
@@ -238,7 +237,7 @@ public class MD2InTrustAnchor {
         if (keyCertStr != null) {
             // generate the private key.
             PKCS8EncodedKeySpec priKeySpec = new PKCS8EncodedKeySpec(
-                                new BASE64Decoder().decodeBuffer(keySpecStr));
+                                Base64.getMimeDecoder().decode(keySpecStr));
             KeyFactory kf = KeyFactory.getInstance("RSA");
             RSAPrivateKey priKey =
                     (RSAPrivateKey)kf.generatePrivate(priKeySpec);
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/TrustTrustedCert.java b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/TrustTrustedCert.java
index 3aeeb081b34..ff8887c212a 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/TrustTrustedCert.java
+++ b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/TrustTrustedCert.java
@@ -44,7 +44,7 @@ import java.security.*;
 import java.security.cert.*;
 import java.security.spec.*;
 import java.security.interfaces.*;
-import sun.misc.BASE64Decoder;
+import java.util.Base64;
 
 
 public class TrustTrustedCert {
@@ -230,7 +230,7 @@ public class TrustTrustedCert {
 
         // generate the private key.
         PKCS8EncodedKeySpec priKeySpec = new PKCS8EncodedKeySpec(
-                            new BASE64Decoder().decodeBuffer(targetPrivateKey));
+                                Base64.getMimeDecoder().decode(targetPrivateKey));
         KeyFactory kf = KeyFactory.getInstance("RSA");
         RSAPrivateKey priKey =
                 (RSAPrivateKey)kf.generatePrivate(priKeySpec);
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/BasicConstraints.java b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/BasicConstraints.java
index 1756ba0cacd..8f1e71622c4 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/BasicConstraints.java
+++ b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/BasicConstraints.java
@@ -44,7 +44,7 @@ import java.security.spec.*;
 import java.security.interfaces.*;
 import java.math.BigInteger;
 
-import sun.misc.BASE64Decoder;
+import java.util.Base64;
 
 public class BasicConstraints {
 
@@ -400,11 +400,11 @@ public class BasicConstraints {
         PKCS8EncodedKeySpec priKeySpec = null;
         if (isServer) {
             priKeySpec = new PKCS8EncodedKeySpec(
-                            new BASE64Decoder().decodeBuffer(serverPrivateKey));
+                            Base64.getMimeDecoder().decode(serverPrivateKey));
             is = new ByteArrayInputStream(serverCertStr.getBytes());
         } else {
             priKeySpec = new PKCS8EncodedKeySpec(
-                            new BASE64Decoder().decodeBuffer(clientPrivateKey));
+                            Base64.getMimeDecoder().decode(clientPrivateKey));
             is = new ByteArrayInputStream(clientCertStr.getBytes());
         }
         KeyFactory kf = KeyFactory.getInstance("RSA");
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/SelfIssuedCert.java b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/SelfIssuedCert.java
index 0037b6f379f..1f8f7298383 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/SelfIssuedCert.java
+++ b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/SelfIssuedCert.java
@@ -45,7 +45,7 @@ import java.security.spec.*;
 import java.security.interfaces.*;
 import java.math.BigInteger;
 
-import sun.misc.BASE64Decoder;
+import java.util.Base64;
 
 public class SelfIssuedCert {
 
@@ -242,7 +242,7 @@ public class SelfIssuedCert {
         if (keyCertStr != null) {
             // generate the private key.
             PKCS8EncodedKeySpec priKeySpec = new PKCS8EncodedKeySpec(
-                                new BASE64Decoder().decodeBuffer(keySpecStr));
+                                Base64.getMimeDecoder().decode(keySpecStr));
             KeyFactory kf = KeyFactory.getInstance("RSA");
             RSAPrivateKey priKey =
                     (RSAPrivateKey)kf.generatePrivate(priKeySpec);
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/ProxyTunnelServer.java b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/ProxyTunnelServer.java
index 9d77078f12e..e5fa754391e 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/ProxyTunnelServer.java
+++ b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/ProxyTunnelServer.java
@@ -33,6 +33,7 @@ import java.net.*;
 import javax.net.ssl.*;
 import javax.net.ServerSocketFactory;
 import sun.net.www.*;
+import java.util.Base64;
 
 public class ProxyTunnelServer extends Thread {
 
@@ -292,12 +293,12 @@ public class ProxyTunnelServer extends Thread {
             authInfo.trim();
             int ind = authInfo.indexOf(' ');
             String recvdUserPlusPass = authInfo.substring(ind + 1).trim();
+
             // extract encoded (username:passwd
             if (userPlusPass.equals(
-                                new String(
-                                (new sun.misc.BASE64Decoder()).
-                                decodeBuffer(recvdUserPlusPass)
-                                ))) {
+                            new String( Base64.getMimeDecoder()
+                                        .decode(recvdUserPlusPass))))
+            {
                 matched = true;
             }
         } catch (Exception e) {
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketSNISensitive.java b/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketSNISensitive.java
index 03a841bfd85..1b93237a544 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketSNISensitive.java
+++ b/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketSNISensitive.java
@@ -51,7 +51,7 @@ import java.security.cert.X509Certificate;
 import java.security.cert.CertificateFactory;
 import java.security.spec.*;
 import java.security.interfaces.*;
-import sun.misc.BASE64Decoder;
+import java.util.Base64;
 
 
 public class SSLSocketSNISensitive {
@@ -391,7 +391,7 @@ public class SSLSocketSNISensitive {
             // generate the private key.
             String keySpecStr = keyStrs[i];
             PKCS8EncodedKeySpec priKeySpec = new PKCS8EncodedKeySpec(
-                                new BASE64Decoder().decodeBuffer(keySpecStr));
+                                Base64.getMimeDecoder().decode(keySpecStr));
             KeyFactory kf = KeyFactory.getInstance("RSA");
             RSAPrivateKey priKey =
                     (RSAPrivateKey)kf.generatePrivate(priKeySpec);
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/TLSv12/DisabledShortRSAKeys.java b/jdk/test/sun/security/ssl/javax/net/ssl/TLSv12/DisabledShortRSAKeys.java
index 4a7130964b8..f92d7f69c05 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/TLSv12/DisabledShortRSAKeys.java
+++ b/jdk/test/sun/security/ssl/javax/net/ssl/TLSv12/DisabledShortRSAKeys.java
@@ -53,7 +53,7 @@ import java.security.cert.Certificate;
 import java.security.cert.CertificateFactory;
 import java.security.spec.*;
 import java.security.interfaces.*;
-import sun.misc.BASE64Decoder;
+import java.util.Base64;
 
 
 public class DisabledShortRSAKeys {
@@ -244,7 +244,7 @@ public class DisabledShortRSAKeys {
         if (keyCertStr != null) {
             // generate the private key.
             PKCS8EncodedKeySpec priKeySpec = new PKCS8EncodedKeySpec(
-                                new BASE64Decoder().decodeBuffer(keySpecStr));
+                                Base64.getMimeDecoder().decode(keySpecStr));
             KeyFactory kf = KeyFactory.getInstance("RSA");
             RSAPrivateKey priKey =
                     (RSAPrivateKey)kf.generatePrivate(priKeySpec);
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/TLSv12/ShortRSAKey512.java b/jdk/test/sun/security/ssl/javax/net/ssl/TLSv12/ShortRSAKey512.java
index c3c170205a4..8370f9d3525 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/TLSv12/ShortRSAKey512.java
+++ b/jdk/test/sun/security/ssl/javax/net/ssl/TLSv12/ShortRSAKey512.java
@@ -48,7 +48,7 @@ import java.security.cert.Certificate;
 import java.security.cert.CertificateFactory;
 import java.security.spec.*;
 import java.security.interfaces.*;
-import sun.misc.BASE64Decoder;
+import java.util.Base64;
 
 
 public class ShortRSAKey512 {
@@ -229,7 +229,7 @@ public class ShortRSAKey512 {
         if (keyCertStr != null) {
             // generate the private key.
             PKCS8EncodedKeySpec priKeySpec = new PKCS8EncodedKeySpec(
-                                new BASE64Decoder().decodeBuffer(keySpecStr));
+                                Base64.getMimeDecoder().decode(keySpecStr));
             KeyFactory kf = KeyFactory.getInstance("RSA");
             RSAPrivateKey priKey =
                     (RSAPrivateKey)kf.generatePrivate(priKeySpec);
diff --git a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/ProxyTunnelServer.java b/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/ProxyTunnelServer.java
index a70eb7fb680..f2f3430e12e 100644
--- a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/ProxyTunnelServer.java
+++ b/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/ProxyTunnelServer.java
@@ -35,6 +35,7 @@ import java.net.*;
 import javax.net.ssl.*;
 import javax.net.ServerSocketFactory;
 import sun.net.www.*;
+import java.util.Base64;
 
 public class ProxyTunnelServer extends Thread {
 
@@ -296,10 +297,9 @@ public class ProxyTunnelServer extends Thread {
             String recvdUserPlusPass = authInfo.substring(ind + 1).trim();
             // extract encoded (username:passwd
             if (userPlusPass.equals(
-                                new String(
-                                (new sun.misc.BASE64Decoder()).
-                                decodeBuffer(recvdUserPlusPass)
-                                ))) {
+                            new String( Base64.getMimeDecoder()
+                                        .decode(recvdUserPlusPass))))
+            {
                 matched = true;
             }
         } catch (Exception e) {

From 90b971a60d45fa40c3e1b5d954d68065d8399e7e Mon Sep 17 00:00:00 2001
From: Marcus Lagergren <lagergren@openjdk.org>
Date: Fri, 22 Feb 2013 08:57:22 +0100
Subject: [PATCH 194/311] 8008554: load was broken for URLs

Reviewed-by: attila, sundar
---
 .../jdk/nashorn/internal/runtime/Context.java |  9 ++++-
 nashorn/test/script/basic/JDK-8008554.js      | 36 +++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 nashorn/test/script/basic/JDK-8008554.js

diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Context.java b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
index 67b35432b5c..cd17428aa2c 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/Context.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
@@ -37,6 +37,7 @@ import java.io.PrintWriter;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.reflect.Constructor;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.security.AccessController;
 import java.security.CodeSigner;
@@ -639,7 +640,13 @@ public final class Context {
                                 }
                             });
                 } else {
-                    final URL url = file.toURI().toURL();
+                    URL url = null;
+                    try {
+                        //check for malformed url. if malformed, it may still be a valid file
+                        url = new URL(srcStr);
+                    } catch (final MalformedURLException e) {
+                        url = file.toURI().toURL();
+                    }
                     source = new Source(url.toString(), url);
                 }
             } else if (file.isFile()) {
diff --git a/nashorn/test/script/basic/JDK-8008554.js b/nashorn/test/script/basic/JDK-8008554.js
new file mode 100644
index 00000000000..0cbe8b8e699
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8008554.js
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/**
+ * JDK-8008554: Try loading another output free test in this dir both as file and as url
+ *
+ * @test
+ * @run
+ */
+
+var dir = __DIR__;
+var file = __FILE__.replace("JDK-8008554", "NASHORN-99");
+load(file);
+file = "file://" + __DIR__ + "NASHORN-99.js";
+load(file);

From 406f72e5e9073a3a3235b59c7761ad2921dde667 Mon Sep 17 00:00:00 2001
From: Eugene Drobitko <eugene.drobitko@oracle.com>
Date: Fri, 22 Feb 2013 11:27:40 +0100
Subject: [PATCH 195/311] 8008575: Re-integrate code coverage

Co-authored-by: Ilya Dergalin <ilya.dergalin@oracle.com>
Reviewed-by: attila, hannesw
---
 nashorn/make/build.xml          |  25 ++++++-
 nashorn/make/code_coverage.xml  | 117 ++++++++++++++++++++++++++++++++
 nashorn/make/project.properties |  22 +++++-
 3 files changed, 160 insertions(+), 4 deletions(-)
 create mode 100644 nashorn/make/code_coverage.xml

diff --git a/nashorn/make/build.xml b/nashorn/make/build.xml
index 0982a27221a..0ffd177cee0 100644
--- a/nashorn/make/build.xml
+++ b/nashorn/make/build.xml
@@ -24,8 +24,13 @@
 <project name="nashorn" default="all" basedir="..">
   <import file="build-nasgen.xml"/>
   <import file="build-benchmark.xml"/>
+  <import file="code_coverage.xml"/>
+
+
+  <target name="init-conditions">
+    <!-- loading locally defined resources and properties. NB they owerwrite default ones defined later -->
+    <property file="${user.home}/.nashorn.project.local.properties"/>
 
-  <target name="init">
     <loadproperties srcFile="make/project.properties"/>
     <path id="nashorn.ext.path">
       <pathelement location="${dist.dir}"/>
@@ -41,6 +46,22 @@
     <available property="asm.available" classname="jdk.internal.org.objectweb.asm.Type"/>
     <!-- check if testng.jar is avaiable -->
     <available property="testng.available" file="${file.reference.testng.jar}"/>
+
+	<!-- enable/disable make code coverage -->
+	<condition property="cc.enabled">
+		<istrue value="${make.code.coverage}" />
+	</condition>
+  </target>
+
+  <target name="init" depends="init-conditions, init-cc">
+
+	<!-- extends jvm args -->
+	<property name="run.test.jvmargs">${run.test.jvmargs.main}  ${run.test.cc.jvmargs}</property>
+	<property name="run.test.jvmargs.octane" value="${run.test.jvmargs.octane.main}  ${run.test.cc.jvmargs}" />
+
+    <echo message="run.test.jvmargs=${run.test.jvmargs}"/>
+    <echo message="run.test.jvmargs.octane=${run.test.jvmargs.octane}"/>
+
   </target>
 
   <target name="prepare" depends="init">
@@ -52,7 +73,7 @@
     <mkdir dir="${dist.javadoc.dir}"/>
   </target>
 
-  <target name="clean" depends="init, clean-nasgen">
+  <target name="clean" depends="init, clean-nasgen, init-cc-cleanup">
     <delete includeemptydirs="true">
       <fileset dir="${build.dir}" erroronmissingdir="false"/>
     </delete>
diff --git a/nashorn/make/code_coverage.xml b/nashorn/make/code_coverage.xml
new file mode 100644
index 00000000000..41d85ff3ef1
--- /dev/null
+++ b/nashorn/make/code_coverage.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ 
+ This code is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 2 only, as
+ published by the Free Software Foundation.
+ 
+ This code is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ version 2 for more details (a copy is included in the LICENSE file that
+ accompanied this code).
+ 
+ You should have received a copy of the GNU General Public License version
+ 2 along with this work; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ 
+ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ or visit www.oracle.com if you need additional information or have any
+ questions.
+-->
+<project name="code-coverage" default="generate-code-coverage-report" basedir="..">
+
+  <!-- CODE COVERAGE -->
+  <target name="init-cc-enabled" if="${cc.enabled}">
+
+    <echo message="initialize [${jcov}] java coverage"/>
+
+
+    <property name="cc.report.dir" value="${cc.dir}/CC_${jcov}_report"/>
+    <property name="cc.merged.xml" value="${cc.dir}/CC_${jcov}_result-merged.xml"/>
+
+    <condition property="run.test.cc.jvmargs" value="${cc.dynamic.args}">
+      <equals arg1="${jcov}" arg2="dynamic" trim="true"/>
+    </condition>
+
+    <mkdir dir="${cc.dir}"/>
+
+    <!-- info -->
+    <echo message="jcov=${jcov}"/>
+    <echo message="cc.generate.template=${cc.generate.template}"/>
+    <echo message="cc.instrument=${cc.instrument}"/>
+    <echo message="run.test.cc.jvmargs=${run.test.cc.jvmargs}"/>
+    <echo message="cc.report.dir=${cc.report.dir}"/>
+    <echo message="cc.merged.xml=${cc.merged.xml}"/>
+  </target>
+
+  <target name="init-cc-disabled" unless="${cc.enabled}">
+    <property name="run.test.cc.jvmargs" value=""/>
+  </target>
+
+  <target name="init-cc" depends="init-cc-disabled, init-cc-enabled">
+    <property name="run.test.cc.jvmargs" value=""/>
+  </target>
+
+  <target name="init-cc-cleanup" if="${cc.enabled}">
+    <delete dir="${cc.dir}" failonerror="false" />
+  </target>
+
+  <target name="check-merging-files" depends="init">
+	<resourcecount property="cc.xmls">
+  		<filelist dir="${cc.dir}" files="*.xml" />
+	</resourcecount>	
+    <condition property="nothing-to-merge" value="true">
+      <equals arg1="${cc.xmls}" arg2="1" trim="true"/>
+    </condition>
+  </target>
+
+  <target name="fix-merging-files" depends="check-merging-files" if="${nothing-to-merge}">
+	<echo message="making pre-merge workaround"/>
+	<move todir="${cc.dir}" includeemptydirs="false">
+		<fileset dir="${cc.dir}">
+			<include name="*.xml"/>
+		</fileset>
+		<mapper type="glob" from="*.xml" to="CC_${jcov}_result-merged.xml"/>
+	</move>
+  </target>
+ 
+  <target name="merge-code-coverage" depends="fix-merging-files" unless="${nothing-to-merge}">
+	<echo message="merging files"/>
+    <fileset dir="${cc.dir}" id="cc.xmls">
+      <include name="**/*${jcov}*.xml"/>
+      <include name="**/CC_template.xml"/>
+    </fileset>
+
+    <pathconvert pathsep=" " property="cc.all.xmls" refid="cc.xmls"/>
+
+    <java classname="com.sun.tdk.jcov.Merger">
+      <arg value="-verbose"/>
+      <arg value="-output"/>
+      <arg value="${cc.merged.xml}"/>
+      <arg value="-exclude"/>
+      <arg value="com\.oracle\.nashorn\.runtime\.ScriptRuntime*"/>
+      <arg line="${cc.all.xmls}"/>
+      <classpath>
+        <pathelement location="${jcov.jar}"/>
+      </classpath>
+    </java>
+
+  </target>
+
+  <target name="generate-code-coverage-report" depends="merge-code-coverage">
+    <java classname="com.sun.tdk.jcov.RepGen">
+      <arg value="-verbose"/>
+<!--      <arg line ="-exclude_list CC.report.exclude"/> -->
+      <arg line="-output ${cc.report.dir}"/>
+      <arg value="${cc.merged.xml}"/>
+      <classpath>
+        <pathelement location="${jcov.jar}"/>
+      </classpath>
+    </java>
+  </target>
+
+
+</project>
diff --git a/nashorn/make/project.properties b/nashorn/make/project.properties
index 3e1bbd266d4..0d85d02942b 100644
--- a/nashorn/make/project.properties
+++ b/nashorn/make/project.properties
@@ -208,9 +208,9 @@ run.test.xms=2G
 
 #  -XX:+PrintCompilation -XX:+UnlockDiagnosticVMOptions -XX:+PrintNMethods
 # add '-Dtest.js.outofprocess' to run each test in a new sub-process
-run.test.jvmargs=-server -Xmx${run.test.xmx} -XX:-TieredCompilation -esa -ea -Dnashorn.debug=true -Dfile.encoding=UTF-8 
+run.test.jvmargs.main=-server -Xmx${run.test.xmx} -XX:-TieredCompilation -esa -ea -Dnashorn.debug=true -Dfile.encoding=UTF-8
 #-XX:+HeapDumpOnOutOfMemoryError -XX:-UseCompressedKlassPointers -XX:+PrintHeapAtGC -XX:ClassMetaspaceSize=300M  
-run.test.jvmargs.octane=-Xms${run.test.xms} ${run.test.jvmargs}
+run.test.jvmargs.octane.main=-Xms${run.test.xms} ${run.test.jvmargs}
 
 run.test.jvmsecurityargs=-Xverify:all -Djava.security.properties=${basedir}/make/java.security.override -Djava.security.manager -Djava.security.policy=${basedir}/build/nashorn.policy
 
@@ -224,3 +224,21 @@ octaneperf-sys-prop.rhino.jar=${rhino.jar}
 
 #timeout for performance tests in minutes
 octaneperf-sys-prop.timeout.value=10
+
+################
+# codecoverage #
+################
+	#enable/disable code coverage; please redifine in the ${user.home}/.nashorn.project.local.properties
+make.code.coverage=false
+	#type of codecoverage; one of static or dynamic. Now only dynamic is supported
+jcov=dynamic
+	#naming of CC results
+	#NB directory specified in the cc.dir will be cleaned up!!!
+cc.dir=${basedir}/../Codecoverage_Nashorn
+cc.result.file.name=cc_nashorn.xml
+	#dynamic CC parameters; please redefine in the ${user.home}/.nashorn.project.local.properties
+jcov2.lib.dir=${basedir}/../jcov2/lib
+jcov.jar=${jcov2.lib.dir}/jcov.jar
+cc.include=jdk\.nashorn\.*
+cc.exclude=jdk\.nashorn\.internal\.scripts\.*
+cc.dynamic.args=-javaagent:${jcov.jar}=include=${cc.include},exclude=${cc.exclude},type=all,verbose=0,file=${cc.dir}/${cc.result.file.name}

From 98e5a4b3938563472ee1572373bacf845936b7d4 Mon Sep 17 00:00:00 2001
From: Vladimir Ivanov <vlivanov@openjdk.org>
Date: Fri, 22 Feb 2013 03:00:48 -0800
Subject: [PATCH 196/311] 8006439: Improve MethodHandles coverage

Reviewed-by: jrose, twisti
---
 .../java/lang/invoke/MethodHandleImpl.java    | 24 +-------
 .../java/lang/invoke/MethodHandleNatives.java | 16 ++++-
 .../java/lang/invoke/MethodHandles.java       | 60 ++++++++++++++-----
 3 files changed, 62 insertions(+), 38 deletions(-)

diff --git a/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java b/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java
index 3cdd99cc4a1..1b35e0fc8bf 100644
--- a/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java
+++ b/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java
@@ -801,12 +801,11 @@ import static java.lang.invoke.MethodHandles.Lookup.IMPL_LOOKUP;
         static
         MethodHandle bindCaller(MethodHandle mh, Class<?> hostClass) {
             // Do not use this function to inject calls into system classes.
-            if (hostClass == null) {
-                hostClass = C_Trampoline;
-            } else if (hostClass.isArray() ||
+            if (hostClass == null
+                ||    (hostClass.isArray() ||
                        hostClass.isPrimitive() ||
                        hostClass.getName().startsWith("java.") ||
-                       hostClass.getName().startsWith("sun.")) {
+                       hostClass.getName().startsWith("sun."))) {
                 throw new InternalError();  // does not happen, and should not anyway
             }
             // For simplicity, convert mh to a varargs-like method.
@@ -816,23 +815,6 @@ import static java.lang.invoke.MethodHandles.Lookup.IMPL_LOOKUP;
             return restoreToType(bccInvoker.bindTo(vamh), mh.type());
         }
 
-        // This class ("Trampoline") is known to be inside a dead-end class loader.
-        // Inject all doubtful calls into this class.
-        private static Class<?> C_Trampoline;
-        static {
-            Class<?> tramp = null;
-            try {
-                final int FRAME_COUNT_ARG = 1;  // [0] Reflection [1] Trampoline
-                java.lang.reflect.Method gcc = sun.reflect.Reflection.class.getMethod("getCallerClass", int.class);
-                tramp = (Class<?>) sun.reflect.misc.MethodUtil.invoke(gcc, null, new Object[]{ FRAME_COUNT_ARG });
-                if (tramp.getClassLoader() == BindCaller.class.getClassLoader())
-                    throw new RuntimeException(tramp.getName()+" class loader");
-            } catch (Throwable ex) {
-                throw new InternalError(ex);
-            }
-            C_Trampoline = tramp;
-        }
-
         private static MethodHandle makeInjectedInvoker(Class<?> hostClass) {
             Class<?> bcc = UNSAFE.defineAnonymousClass(hostClass, T_BYTES, null);
             if (hostClass.getClassLoader() != bcc.getClassLoader())
diff --git a/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java b/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java
index 8f1d0c3164e..8d40ac96726 100644
--- a/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java
+++ b/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java
@@ -393,11 +393,14 @@ class MethodHandleNatives {
      */
     // FIXME: Replace this pattern match by an annotation @sun.reflect.CallerSensitive.
     static boolean isCallerSensitive(MemberName mem) {
-        assert(mem.isInvocable());
+        if (!mem.isInvocable())  return false;  // fields are not caller sensitive
         Class<?> defc = mem.getDeclaringClass();
         switch (mem.getName()) {
         case "doPrivileged":
+        case "doPrivilegedWithCombiner":
             return defc == java.security.AccessController.class;
+        case "checkMemberAccess":
+            return canBeCalledVirtual(mem, java.lang.SecurityManager.class);
         case "getUnsafe":
             return defc == sun.misc.Unsafe.class;
         case "lookup":
@@ -455,7 +458,7 @@ class MethodHandleNatives {
             if (defc == java.util.concurrent.atomic.AtomicReferenceFieldUpdater.class)  return true;
             break;
         case "getContextClassLoader":
-            return defc == java.lang.Thread.class;
+            return canBeCalledVirtual(mem, java.lang.Thread.class);
         case "getPackage":
         case "getPackages":
             return defc == java.lang.Package.class;
@@ -473,6 +476,8 @@ class MethodHandleNatives {
             break;
         case "getCallerClassLoader":
             return defc == java.lang.ClassLoader.class;
+        case "registerAsParallelCapable":
+            return canBeCalledVirtual(mem, java.lang.ClassLoader.class);
         case "getProxyClass":
         case "newProxyInstance":
             return defc == java.lang.reflect.Proxy.class;
@@ -494,4 +499,11 @@ class MethodHandleNatives {
             throw new InternalError(e);
         }
     }
+    static boolean canBeCalledVirtual(MemberName symbolicRef, Class<?> definingClass) {
+        Class<?> symbolicRefClass = symbolicRef.getDeclaringClass();
+        if (symbolicRefClass == definingClass)  return true;
+        if (symbolicRef.isStatic() || symbolicRef.isPrivate())  return false;
+        return (definingClass.isAssignableFrom(symbolicRefClass) ||  // Msym overrides Mdef
+                symbolicRefClass.isInterface());                     // Mdef implements Msym
+    }
 }
diff --git a/jdk/src/share/classes/java/lang/invoke/MethodHandles.java b/jdk/src/share/classes/java/lang/invoke/MethodHandles.java
index e7007dd2b89..d2a499e9867 100644
--- a/jdk/src/share/classes/java/lang/invoke/MethodHandles.java
+++ b/jdk/src/share/classes/java/lang/invoke/MethodHandles.java
@@ -598,7 +598,8 @@ public class MethodHandles {
         MethodHandle findStatic(Class<?> refc, String name, MethodType type) throws NoSuchMethodException, IllegalAccessException {
             MemberName method = resolveOrFail(REF_invokeStatic, refc, name, type);
             checkSecurityManager(refc, method);  // stack walk magic: do not refactor
-            return getDirectMethod(REF_invokeStatic, refc, method);
+            Class<?> callerClass = findBoundCallerClass(method);  // stack walk magic: do not refactor
+            return getDirectMethod(REF_invokeStatic, refc, method, callerClass);
         }
 
         /**
@@ -652,7 +653,8 @@ public class MethodHandles {
             byte refKind = (refc.isInterface() ? REF_invokeInterface : REF_invokeVirtual);
             MemberName method = resolveOrFail(refKind, refc, name, type);
             checkSecurityManager(refc, method);  // stack walk magic: do not refactor
-            return getDirectMethod(refKind, refc, method);
+            Class<?> callerClass = findBoundCallerClass(method);
+            return getDirectMethod(refKind, refc, method, callerClass);
         }
         private MethodHandle findVirtualForMH(String name, MethodType type) {
             // these names require special lookups because of the implicit MethodType argument
@@ -736,7 +738,8 @@ public class MethodHandles {
             Lookup specialLookup = this.in(specialCaller);
             MemberName method = specialLookup.resolveOrFail(REF_invokeSpecial, refc, name, type);
             checkSecurityManager(refc, method);  // stack walk magic: do not refactor
-            return specialLookup.getDirectMethod(REF_invokeSpecial, refc, method);
+            Class<?> callerClass = findBoundCallerClass(method);
+            return specialLookup.getDirectMethod(REF_invokeSpecial, refc, method, callerClass);
         }
 
         /**
@@ -879,7 +882,8 @@ return mh1;
             Class<? extends Object> refc = receiver.getClass(); // may get NPE
             MemberName method = resolveOrFail(REF_invokeSpecial, refc, name, type);
             checkSecurityManager(refc, method);  // stack walk magic: do not refactor
-            MethodHandle mh = getDirectMethodNoRestrict(REF_invokeSpecial, refc, method);
+            Class<?> callerClass = findBoundCallerClass(method);  // stack walk magic: do not refactor
+            MethodHandle mh = getDirectMethodNoRestrict(REF_invokeSpecial, refc, method, callerClass);
             return mh.bindReceiver(receiver).setVarargs(method);
         }
 
@@ -910,8 +914,9 @@ return mh1;
             if (refKind == REF_invokeSpecial)
                 refKind = REF_invokeVirtual;
             assert(method.isMethod());
+            Class<?> callerClass = findBoundCallerClass(method);  // stack walk magic: do not refactor
             Lookup lookup = m.isAccessible() ? IMPL_LOOKUP : this;
-            return lookup.getDirectMethod(refKind, method.getDeclaringClass(), method);
+            return lookup.getDirectMethod(refKind, method.getDeclaringClass(), method, callerClass);
         }
 
         /**
@@ -940,8 +945,9 @@ return mh1;
             Lookup specialLookup = this.in(specialCaller);
             MemberName method = new MemberName(m, true);
             assert(method.isMethod());
+            Class<?> callerClass = findBoundCallerClass(method);  // stack walk magic: do not refactor
             // ignore m.isAccessible:  this is a new kind of access
-            return specialLookup.getDirectMethod(REF_invokeSpecial, method.getDeclaringClass(), method);
+            return specialLookup.getDirectMethod(REF_invokeSpecial, method.getDeclaringClass(), method, callerClass);
         }
 
         /**
@@ -1039,8 +1045,30 @@ return mh1;
                 throw new MemberName(refc).makeAccessException("symbolic reference class is not public", this);
         }
 
+        /**
+         * Find my trustable caller class if m is a caller sensitive method.
+         * If this lookup object has private access, then the caller class is the lookupClass.
+         * Otherwise, it is the caller of the currently executing public API method (e.g., findVirtual).
+         * This is the same caller class as is used by checkSecurityManager.
+         * This function performs stack walk magic: do not refactor it.
+         */
+        Class<?> findBoundCallerClass(MemberName m) {
+            Class<?> callerClass = null;
+            if (MethodHandleNatives.isCallerSensitive(m)) {
+                // Do not refactor this to a more "logical" place, since it is stack walk magic.
+                // Note that this is the same expression as in Step 2 below in checkSecurityManager.
+                callerClass = ((allowedModes & PRIVATE) != 0
+                               ? lookupClass  // for strong access modes, no extra check
+                               // next line does stack walk magic; do not refactor:
+                               : getCallerClassAtEntryPoint(true));
+            }
+            return callerClass;
+        }
         /**
          * Perform necessary <a href="MethodHandles.Lookup.html#secmgr">access checks</a>.
+         * Determines a trustable caller class to compare with refc, the symbolic reference class.
+         * If this lookup object has private access, then the caller class is the lookupClass.
+         * Otherwise, it is the caller of the currently executing public API method (e.g., findVirtual).
          * This function performs stack walk magic: do not refactor it.
          */
         void checkSecurityManager(Class<?> refc, MemberName m) {
@@ -1195,22 +1223,22 @@ return mh1;
             return mh.viewAsType(narrowType);
         }
 
-        private MethodHandle getDirectMethod(byte refKind, Class<?> refc, MemberName method) throws IllegalAccessException {
+        private MethodHandle getDirectMethod(byte refKind, Class<?> refc, MemberName method, Class<?> callerClass) throws IllegalAccessException {
             return getDirectMethodCommon(refKind, refc, method,
                     (refKind == REF_invokeSpecial ||
                         (MethodHandleNatives.refKindHasReceiver(refKind) &&
-                            restrictProtectedReceiver(method))));
+                            restrictProtectedReceiver(method))), callerClass);
         }
-        private MethodHandle getDirectMethodNoRestrict(byte refKind, Class<?> refc, MemberName method) throws IllegalAccessException {
-            return getDirectMethodCommon(refKind, refc, method, false);
+        private MethodHandle getDirectMethodNoRestrict(byte refKind, Class<?> refc, MemberName method, Class<?> callerClass) throws IllegalAccessException {
+            return getDirectMethodCommon(refKind, refc, method, false, callerClass);
         }
         private MethodHandle getDirectMethodCommon(byte refKind, Class<?> refc, MemberName method,
-                                                   boolean doRestrict) throws IllegalAccessException {
+                                                   boolean doRestrict, Class<?> callerClass) throws IllegalAccessException {
             checkMethod(refKind, refc, method);
             if (method.isMethodHandleInvoke())
                 return fakeMethodHandleInvoke(method);
             MethodHandle mh = DirectMethodHandle.make(refc, method);
-            mh = maybeBindCaller(method, mh);
+            mh = maybeBindCaller(method, mh, callerClass);
             mh = mh.setVarargs(method);
             if (doRestrict)
                 mh = restrictReceiver(method, mh, lookupClass());
@@ -1219,12 +1247,14 @@ return mh1;
         private MethodHandle fakeMethodHandleInvoke(MemberName method) {
             return throwException(method.getReturnType(), UnsupportedOperationException.class);
         }
-        private MethodHandle maybeBindCaller(MemberName method, MethodHandle mh) throws IllegalAccessException {
+        private MethodHandle maybeBindCaller(MemberName method, MethodHandle mh,
+                                             Class<?> callerClass)
+                                             throws IllegalAccessException {
             if (allowedModes == TRUSTED || !MethodHandleNatives.isCallerSensitive(method))
                 return mh;
             Class<?> hostClass = lookupClass;
             if ((allowedModes & PRIVATE) == 0)  // caller must use full-power lookup
-                hostClass = null;
+                hostClass = callerClass;  // callerClass came from a security manager style stack walk
             MethodHandle cbmh = MethodHandleImpl.bindCaller(mh, hostClass);
             // Note: caller will apply varargs after this step happens.
             return cbmh;
@@ -1262,7 +1292,7 @@ return mh1;
             } else if (MethodHandleNatives.refKindIsMethod(refKind)) {
                 MemberName method = (resolved != null) ? resolved
                         : resolveOrFail(refKind, defc, name, (MethodType) type);
-                return getDirectMethod(refKind, defc, method);
+                return getDirectMethod(refKind, defc, method, lookupClass);
             } else if (refKind == REF_newInvokeSpecial) {
                 assert(name == null || name.equals("<init>"));
                 MemberName ctor = (resolved != null) ? resolved

From f179e269b978443b6e45f86faffb5cfcd2cfa92b Mon Sep 17 00:00:00 2001
From: Vladimir Ivanov <vlivanov@openjdk.org>
Date: Fri, 22 Feb 2013 03:00:12 -0800
Subject: [PATCH 197/311] 8006179: JSR292 MethodHandles lookup with interface
 using findVirtual()

Reviewed-by: jrose, twisti
---
 .../classes/java/lang/invoke/DirectMethodHandle.java   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java b/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java
index 0df8e730937..db8d35fd400 100644
--- a/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java
+++ b/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java
@@ -51,6 +51,16 @@ class DirectMethodHandle extends MethodHandle {
     private DirectMethodHandle(MethodType mtype, LambdaForm form, MemberName member) {
         super(mtype, form);
         if (!member.isResolved())  throw new InternalError();
+
+        if (member.getDeclaringClass().isInterface() && !member.isAbstract()) {
+            // Check for corner case: invokeinterface of Object method
+            MemberName m = new MemberName(Object.class, member.getName(), member.getMethodType(), member.getReferenceKind());
+            m = MemberName.getFactory().resolveOrNull(m.getReferenceKind(), m, null);
+            if (m != null && m.isPublic()) {
+                member = m;
+            }
+        }
+
         this.member = member;
     }
 

From 0ae708ca99b6aebd91cf3486ddffc7fc8e742722 Mon Sep 17 00:00:00 2001
From: Vladimir Ivanov <vlivanov@openjdk.org>
Date: Fri, 22 Feb 2013 02:59:24 -0800
Subject: [PATCH 198/311] 8006125: Update MethodHandles library interactions

Reviewed-by: jrose
---
 jdk/src/share/classes/sun/reflect/misc/MethodUtil.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/jdk/src/share/classes/sun/reflect/misc/MethodUtil.java b/jdk/src/share/classes/sun/reflect/misc/MethodUtil.java
index 0eade8de571..9d9c5ab6015 100644
--- a/jdk/src/share/classes/sun/reflect/misc/MethodUtil.java
+++ b/jdk/src/share/classes/sun/reflect/misc/MethodUtil.java
@@ -252,6 +252,12 @@ public final class MethodUtil extends SecureClassLoader {
     public static Object invoke(Method m, Object obj, Object[] params)
         throws InvocationTargetException, IllegalAccessException {
         if (m.getDeclaringClass().equals(AccessController.class) ||
+           (m.getDeclaringClass().equals(java.lang.invoke.MethodHandles.class)
+            && m.getName().equals("lookup")) ||
+           (m.getDeclaringClass().equals(java.lang.invoke.MethodHandles.Lookup.class)
+            && (m.getName().startsWith("find") ||
+                m.getName().startsWith("bind") ||
+                m.getName().startsWith("unreflect"))) ||
             m.getDeclaringClass().equals(Method.class))
             throw new InvocationTargetException(
                 new UnsupportedOperationException("invocation not supported"));

From 17992b9ac9c1509c24eb0d072c7ff79cdb294151 Mon Sep 17 00:00:00 2001
From: Vladimir Ivanov <vlivanov@openjdk.org>
Date: Fri, 22 Feb 2013 02:58:38 -0800
Subject: [PATCH 199/311] 8004933: Improve MethodHandle interaction with
 libraries

Reviewed-by: jrose
---
 .../java/lang/invoke/MethodHandleNatives.java     | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java b/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java
index 8d40ac96726..db072126e1f 100644
--- a/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java
+++ b/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java
@@ -405,6 +405,21 @@ class MethodHandleNatives {
             return defc == sun.misc.Unsafe.class;
         case "lookup":
             return defc == java.lang.invoke.MethodHandles.class;
+        case "findStatic":
+        case "findVirtual":
+        case "findConstructor":
+        case "findSpecial":
+        case "findGetter":
+        case "findSetter":
+        case "findStaticGetter":
+        case "findStaticSetter":
+        case "bind":
+        case "unreflect":
+        case "unreflectSpecial":
+        case "unreflectConstructor":
+        case "unreflectGetter":
+        case "unreflectSetter":
+            return defc == java.lang.invoke.MethodHandles.Lookup.class;
         case "invoke":
             return defc == java.lang.reflect.Method.class;
         case "get":

From a8305fc6e6f713c2c2762d8dbed869bd158d9aa9 Mon Sep 17 00:00:00 2001
From: Anton Tarasov <ant@openjdk.org>
Date: Fri, 22 Feb 2013 15:13:13 +0400
Subject: [PATCH 200/311] 8006406: lightweight embedding in other Java UI
 toolkits

Reviewed-by: serb, anthony, art
---
 .../classes/sun/lwawt/LWComponentPeer.java    |   2 +-
 .../sun/lwawt/LWLightweightFramePeer.java     | 115 ++++++++
 .../macosx/classes/sun/lwawt/LWToolkit.java   |  19 ++
 .../classes/sun/lwawt/LWWindowPeer.java       |  12 +-
 .../sun/lwawt/macosx/CPlatformComponent.java  |   2 +-
 .../lwawt/macosx/CPlatformLWComponent.java    |  53 ++++
 .../sun/lwawt/macosx/CPlatformLWView.java     |  82 ++++++
 .../sun/lwawt/macosx/CPlatformLWWindow.java   | 202 ++++++++++++++
 .../sun/lwawt/macosx/CPlatformView.java       |   8 +-
 .../sun/lwawt/macosx/CPlatformWindow.java     |  18 +-
 .../classes/sun/lwawt/macosx/LWCToolkit.java  |   7 +
 .../classes/java/awt/peer/FramePeer.java      |   6 +
 .../classes/java/awt/peer/WindowPeer.java     |   2 -
 .../share/classes/sun/awt/EmbeddedFrame.java  |   5 +-
 jdk/src/share/classes/sun/awt/HToolkit.java   |   5 +
 .../classes/sun/awt/LightweightFrame.java     | 127 +++++++++
 jdk/src/share/classes/sun/awt/SunToolkit.java |   3 +
 .../classes/sun/swing/JLightweightFrame.java  | 250 ++++++++++++++++++
 .../classes/sun/swing/LightweightContent.java | 164 ++++++++++++
 .../classes/sun/awt/X11/XFramePeer.java       |   2 +
 .../solaris/classes/sun/awt/X11/XToolkit.java |   4 +
 .../sun/awt/windows/WEmbeddedFrame.java       |   8 +-
 .../sun/awt/windows/WEmbeddedFramePeer.java   |   2 -
 .../classes/sun/awt/windows/WFramePeer.java   |   7 +
 .../awt/windows/WLightweightFramePeer.java    |  86 ++++++
 .../classes/sun/awt/windows/WToolkit.java     |   7 +
 .../windows/native/sun/windows/awt_Frame.cpp  |  55 +++-
 .../windows/native/sun/windows/awt_Frame.h    |   5 +
 .../windows/native/sun/windows/awt_Window.h   |   5 +-
 29 files changed, 1229 insertions(+), 34 deletions(-)
 create mode 100644 jdk/src/macosx/classes/sun/lwawt/LWLightweightFramePeer.java
 create mode 100644 jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformLWComponent.java
 create mode 100644 jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformLWView.java
 create mode 100644 jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformLWWindow.java
 create mode 100644 jdk/src/share/classes/sun/awt/LightweightFrame.java
 create mode 100644 jdk/src/share/classes/sun/swing/JLightweightFrame.java
 create mode 100644 jdk/src/share/classes/sun/swing/LightweightContent.java
 create mode 100644 jdk/src/windows/classes/sun/awt/windows/WLightweightFramePeer.java

diff --git a/jdk/src/macosx/classes/sun/lwawt/LWComponentPeer.java b/jdk/src/macosx/classes/sun/lwawt/LWComponentPeer.java
index aa9b798c617..301fbb476d8 100644
--- a/jdk/src/macosx/classes/sun/lwawt/LWComponentPeer.java
+++ b/jdk/src/macosx/classes/sun/lwawt/LWComponentPeer.java
@@ -439,7 +439,7 @@ public abstract class LWComponentPeer<T extends Component, D extends JComponent>
     }
 
     @Override
-    public final Graphics getGraphics() {
+    public Graphics getGraphics() {
         final Graphics g = getOnscreenGraphics();
         if (g != null) {
             synchronized (getPeerTreeLock()){
diff --git a/jdk/src/macosx/classes/sun/lwawt/LWLightweightFramePeer.java b/jdk/src/macosx/classes/sun/lwawt/LWLightweightFramePeer.java
new file mode 100644
index 00000000000..90e2e88c441
--- /dev/null
+++ b/jdk/src/macosx/classes/sun/lwawt/LWLightweightFramePeer.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package sun.lwawt;
+
+import java.awt.Graphics;
+import java.awt.Insets;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Window;
+import java.awt.dnd.DropTarget;
+
+import sun.awt.CausedFocusEvent;
+import sun.awt.LightweightFrame;
+
+public class LWLightweightFramePeer extends LWWindowPeer {
+
+    public LWLightweightFramePeer(LightweightFrame target,
+                                  PlatformComponent platformComponent,
+                                  PlatformWindow platformWindow)
+    {
+        super(target, platformComponent, platformWindow, LWWindowPeer.PeerType.LW_FRAME);
+    }
+
+    private LightweightFrame getLwTarget() {
+        return (LightweightFrame)getTarget();
+    }
+
+    @Override
+    public Graphics getGraphics() {
+        return getLwTarget().getGraphics();
+    }
+
+    @Override
+    protected void setVisibleImpl(final boolean visible) {
+    }
+
+    @Override
+    public boolean requestWindowFocus(CausedFocusEvent.Cause cause) {
+        if (!focusAllowedFor()) {
+            return false;
+        }
+        if (getPlatformWindow().rejectFocusRequest(cause)) {
+            return false;
+        }
+
+        Window opposite = LWKeyboardFocusManagerPeer.getInstance().
+            getCurrentFocusedWindow();
+
+        changeFocusedWindow(true, opposite);
+
+        return true;
+    }
+
+    @Override
+    public Point getLocationOnScreen() {
+        Rectangle bounds = getBounds();
+        return new Point(bounds.x, bounds.y); // todo
+    }
+
+    @Override
+    public Insets getInsets() {
+        return new Insets(0, 0, 0, 0);
+    }
+
+    @Override
+    public void setBounds(int x, int y, int w, int h, int op) {
+        setBounds(x, y, w, h, op, true, false);
+    }
+
+    @Override
+    public void updateCursorImmediately() {
+        // TODO: tries to switch to the awt/fx toolkit thread and causes a deadlock on macosx
+    }
+
+    @Override
+    public void addDropTarget(DropTarget dt) {
+    }
+
+    @Override
+    public void removeDropTarget(DropTarget dt) {
+    }
+
+    @Override
+    public void grab() {
+        getLwTarget().grabFocus();
+    }
+
+    @Override
+    public void ungrab() {
+        getLwTarget().ungrabFocus();
+    }
+}
diff --git a/jdk/src/macosx/classes/sun/lwawt/LWToolkit.java b/jdk/src/macosx/classes/sun/lwawt/LWToolkit.java
index 89f39fccbf8..cad6e4353ba 100644
--- a/jdk/src/macosx/classes/sun/lwawt/LWToolkit.java
+++ b/jdk/src/macosx/classes/sun/lwawt/LWToolkit.java
@@ -218,6 +218,23 @@ public abstract class LWToolkit extends SunToolkit implements Runnable {
         return peer;
     }
 
+    private LWLightweightFramePeer createDelegatedLwPeer(LightweightFrame target,
+                                                         PlatformComponent platformComponent,
+                                                         PlatformWindow platformWindow)
+    {
+        LWLightweightFramePeer peer = new LWLightweightFramePeer(target, platformComponent, platformWindow);
+        targetCreatedPeer(target, peer);
+        peer.initialize();
+        return peer;
+    }
+
+    @Override
+    public FramePeer createLightweightFrame(LightweightFrame target) {
+        PlatformComponent platformComponent = createLwPlatformComponent();
+        PlatformWindow platformWindow = createPlatformWindow(LWWindowPeer.PeerType.LW_FRAME);
+        return createDelegatedLwPeer(target, platformComponent, platformWindow);
+    }
+
     @Override
     public WindowPeer createWindow(Window target) {
         PlatformComponent platformComponent = createPlatformComponent();
@@ -502,6 +519,8 @@ public abstract class LWToolkit extends SunToolkit implements Runnable {
 
     protected abstract PlatformComponent createPlatformComponent();
 
+    protected abstract PlatformComponent createLwPlatformComponent();
+
     protected abstract FileDialogPeer createFileDialogPeer(FileDialog target);
 
     // ---- UTILITY METHODS ---- //
diff --git a/jdk/src/macosx/classes/sun/lwawt/LWWindowPeer.java b/jdk/src/macosx/classes/sun/lwawt/LWWindowPeer.java
index 5b19788f244..d50335f7cd5 100644
--- a/jdk/src/macosx/classes/sun/lwawt/LWWindowPeer.java
+++ b/jdk/src/macosx/classes/sun/lwawt/LWWindowPeer.java
@@ -48,7 +48,8 @@ public class LWWindowPeer
         FRAME,
         DIALOG,
         EMBEDDED_FRAME,
-        VIEW_EMBEDDED_FRAME
+        VIEW_EMBEDDED_FRAME,
+        LW_FRAME
     }
 
     private static final PlatformLogger focusLog = PlatformLogger.getLogger("sun.lwawt.focus.LWWindowPeer");
@@ -1090,7 +1091,7 @@ public class LWWindowPeer
         return platformWindow.requestWindowFocus();
     }
 
-    private boolean focusAllowedFor() {
+    protected boolean focusAllowedFor() {
         Window window = getTarget();
         // TODO: check if modal blocked
         return window.isVisible() && window.isEnabled() && isFocusableWindow();
@@ -1113,10 +1114,15 @@ public class LWWindowPeer
         return !(window instanceof Dialog || window instanceof Frame);
     }
 
+    @Override
+    public void emulateActivation(boolean activate) {
+        changeFocusedWindow(activate, null);
+    }
+
     /*
      * Changes focused window on java level.
      */
-    private void changeFocusedWindow(boolean becomesFocused, Window opposite) {
+    protected void changeFocusedWindow(boolean becomesFocused, Window opposite) {
         if (focusLog.isLoggable(PlatformLogger.FINE)) {
             focusLog.fine((becomesFocused?"gaining":"loosing") + " focus window: " + this);
         }
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformComponent.java b/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformComponent.java
index 370b930ea98..978f65c3c91 100644
--- a/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformComponent.java
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformComponent.java
@@ -35,7 +35,7 @@ import sun.lwawt.PlatformWindow;
  * On OSX {@code CPlatformComponent} stores pointer to the native CAlayer which
  * can be used from JAWT.
  */
-final class CPlatformComponent extends CFRetainedResource
+class CPlatformComponent extends CFRetainedResource
         implements PlatformComponent {
 
     private volatile PlatformWindow platformWindow;
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformLWComponent.java b/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformLWComponent.java
new file mode 100644
index 00000000000..fd76cf5c898
--- /dev/null
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformLWComponent.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+package sun.lwawt.macosx;
+
+import sun.lwawt.PlatformWindow;
+
+class CPlatformLWComponent extends CPlatformComponent {
+
+    CPlatformLWComponent() {
+        super();
+    }
+
+    @Override
+    public long getPointer() {
+        return 0;
+    }
+
+    @Override
+    public void initialize(final PlatformWindow platformWindow) {
+    }
+
+    @Override
+    public void setBounds(final int x, final int y, final int w, final int h) {
+    }
+
+    @Override
+    public void dispose() {
+    }
+}
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformLWView.java b/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformLWView.java
new file mode 100644
index 00000000000..e5d99678b18
--- /dev/null
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformLWView.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package sun.lwawt.macosx;
+
+import sun.lwawt.LWWindowPeer;
+import sun.java2d.SurfaceData;
+
+public class CPlatformLWView extends CPlatformView {
+
+    public CPlatformLWView() {
+        super();
+    }
+
+    @Override
+    public void initialize(LWWindowPeer peer, CPlatformResponder responder) {
+        initializeBase(peer, responder);
+    }
+
+    @Override
+    public long getAWTView() {
+        return 0;
+    }
+
+    @Override
+    public boolean isOpaque() {
+        return true;
+    }
+
+    @Override
+    public void setBounds(int x, int y, int width, int height) {
+    }
+
+    @Override
+    public void enterFullScreenMode() {
+    }
+
+    @Override
+    public void exitFullScreenMode() {
+    }
+
+    @Override
+    public SurfaceData replaceSurfaceData() {
+        return null;
+    }
+
+    @Override
+    public SurfaceData getSurfaceData() {
+        return null;
+    }
+
+    @Override
+    public void dispose() {
+    }
+
+    @Override
+    public long getWindowLayerPtr() {
+        return 0;
+    }
+}
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformLWWindow.java b/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformLWWindow.java
new file mode 100644
index 00000000000..d7a91264328
--- /dev/null
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformLWWindow.java
@@ -0,0 +1,202 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package sun.lwawt.macosx;
+
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.GraphicsDevice;
+import java.awt.Insets;
+import java.awt.MenuBar;
+import java.awt.Point;
+import java.awt.Window;
+import sun.awt.CausedFocusEvent;
+import sun.java2d.SurfaceData;
+import sun.lwawt.LWWindowPeer;
+import sun.lwawt.PlatformWindow;
+
+public class CPlatformLWWindow extends CPlatformWindow {
+
+    @Override
+    public void initialize(Window target, LWWindowPeer peer, PlatformWindow owner) {
+        initializeBase(target, peer, owner, new CPlatformLWView());
+    }
+
+    @Override
+    public void toggleFullScreen() {
+    }
+
+    @Override
+    public void setMenuBar(MenuBar mb) {
+    }
+
+    @Override
+    public void dispose() {
+    }
+
+    @Override
+    public FontMetrics getFontMetrics(Font f) {
+        return null;
+    }
+
+    @Override
+    public Insets getInsets() {
+        return new Insets(0, 0, 0, 0);
+    }
+
+    @Override
+    public Point getLocationOnScreen() {
+        return null;
+    }
+
+    @Override
+    public GraphicsDevice getGraphicsDevice() {
+        return null;
+    }
+
+    @Override
+    public SurfaceData getScreenSurface() {
+        return null;
+    }
+
+    @Override
+    public SurfaceData replaceSurfaceData() {
+        return null;
+    }
+
+    @Override
+    public void setBounds(int x, int y, int w, int h) {
+        if (getPeer() != null) {
+            getPeer().notifyReshape(x, y, w, h);
+        }
+    }
+
+    @Override
+    public void setVisible(boolean visible) {
+    }
+
+    @Override
+    public void setTitle(String title) {
+    }
+
+    @Override
+    public void updateIconImages() {
+    }
+
+    @Override
+    public long getNSWindowPtr() {
+        return 0;
+    }
+
+    @Override
+    public SurfaceData getSurfaceData() {
+        return null;
+    }
+
+    @Override
+    public void toBack() {
+    }
+
+    @Override
+    public void toFront() {
+    }
+
+    @Override
+    public void setResizable(final boolean resizable) {
+    }
+
+    @Override
+    public void setSizeConstraints(int minW, int minH, int maxW, int maxH) {
+    }
+
+    @Override
+    public boolean rejectFocusRequest(CausedFocusEvent.Cause cause) {
+        return false;
+    }
+
+    @Override
+    public boolean requestWindowFocus() {
+        return true;
+    }
+
+    @Override
+    public boolean isActive() {
+        return true;
+    }
+
+    @Override
+    public void updateFocusableWindowState() {
+    }
+
+    @Override
+    public Graphics transformGraphics(Graphics g) {
+        return null;
+    }
+
+    @Override
+    public void setAlwaysOnTop(boolean isAlwaysOnTop) {
+    }
+
+    @Override
+    public PlatformWindow getTopmostPlatformWindowUnderMouse(){
+        return null;
+    }
+
+    @Override
+    public void setOpacity(float opacity) {
+    }
+
+    @Override
+    public void setOpaque(boolean isOpaque) {
+    }
+
+    @Override
+    public void enterFullScreenMode() {
+    }
+
+    @Override
+    public void exitFullScreenMode() {
+    }
+
+    @Override
+    public void setWindowState(int windowState) {
+    }
+
+    @Override
+    public LWWindowPeer getPeer() {
+        return super.getPeer();
+    }
+
+    @Override
+    public CPlatformView getContentView() {
+        return super.getContentView();
+    }
+
+    @Override
+    public long getLayerPtr() {
+        return 0;
+    }
+}
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformView.java b/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformView.java
index 495657963bd..3a0bec48629 100644
--- a/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformView.java
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformView.java
@@ -54,8 +54,7 @@ public class CPlatformView extends CFRetainedResource {
     }
 
     public void initialize(LWWindowPeer peer, CPlatformResponder responder) {
-        this.peer = peer;
-        this.responder = responder;
+        initializeBase(peer, responder);
 
         if (!LWCToolkit.getSunAwtDisableCALayers()) {
             this.windowLayer = new CGLLayer(peer);
@@ -63,6 +62,11 @@ public class CPlatformView extends CFRetainedResource {
         setPtr(nativeCreateView(0, 0, 0, 0, getWindowLayerPtr()));
     }
 
+    protected void initializeBase(LWWindowPeer peer, CPlatformResponder responder) {
+        this.peer = peer;
+        this.responder = responder;
+    }
+
     public long getAWTView() {
         return ptr;
         }
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java b/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
index 8f83702a209..dc51373cc1b 100644
--- a/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
@@ -44,7 +44,7 @@ import com.apple.laf.*;
 import com.apple.laf.ClientPropertyApplicator.Property;
 import com.sun.awt.AWTUtilities;
 
-public final class CPlatformWindow extends CFRetainedResource implements PlatformWindow {
+public class CPlatformWindow extends CFRetainedResource implements PlatformWindow {
     private native long nativeCreateNSWindow(long nsViewPtr, long styleBits, double x, double y, double w, double h);
     private static native void nativeSetNSWindowStyleBits(long nsWindowPtr, int mask, int data);
     private static native void nativeSetNSWindowMenuBar(long nsWindowPtr, long menuBarPtr);
@@ -218,11 +218,7 @@ public final class CPlatformWindow extends CFRetainedResource implements Platfor
      */
     @Override // PlatformWindow
     public void initialize(Window _target, LWWindowPeer _peer, PlatformWindow _owner) {
-        this.peer = _peer;
-        this.target = _target;
-        if (_owner instanceof CPlatformWindow) {
-            this.owner = (CPlatformWindow)_owner;
-        }
+        initializeBase(_target, _peer, _owner, new CPlatformView());
 
         final int styleBits = getInitialStyleBits();
 
@@ -231,7 +227,6 @@ public final class CPlatformWindow extends CFRetainedResource implements Platfor
         String warningString = target.getWarningString();
 
         responder = new CPlatformResponder(peer, false);
-        contentView = new CPlatformView();
         contentView.initialize(peer, responder);
 
         final long nativeWindowPtr = nativeCreateNSWindow(contentView.getAWTView(), styleBits, 0, 0, 0, 0);
@@ -253,6 +248,15 @@ public final class CPlatformWindow extends CFRetainedResource implements Platfor
         validateSurface();
     }
 
+    protected void initializeBase(Window target, LWWindowPeer peer, PlatformWindow owner, CPlatformView view) {
+        this.peer = peer;
+        this.target = target;
+        if (owner instanceof CPlatformWindow) {
+            this.owner = (CPlatformWindow)owner;
+        }
+        this.contentView = view;
+    }
+
     private int getInitialStyleBits() {
         // defaults style bits
         int styleBits = DECORATED | HAS_SHADOW | CLOSEABLE | MINIMIZABLE | ZOOMABLE | RESIZABLE;
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java b/jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java
index ae6a4f77662..801c3d41605 100644
--- a/jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java
@@ -160,6 +160,8 @@ public final class LWCToolkit extends LWToolkit {
             return new CPlatformEmbeddedFrame();
         } else if (peerType == PeerType.VIEW_EMBEDDED_FRAME) {
             return new CViewPlatformEmbeddedFrame();
+        } else if (peerType == PeerType.LW_FRAME) {
+            return new CPlatformLWWindow();
         } else {
             assert (peerType == PeerType.SIMPLEWINDOW || peerType == PeerType.DIALOG || peerType == PeerType.FRAME);
             return new CPlatformWindow();
@@ -171,6 +173,11 @@ public final class LWCToolkit extends LWToolkit {
         return new CPlatformComponent();
     }
 
+    @Override
+    protected PlatformComponent createLwPlatformComponent() {
+        return new CPlatformLWComponent();
+    }
+
     @Override
     protected FileDialogPeer createFileDialogPeer(FileDialog target) {
         return new CFileDialog(target);
diff --git a/jdk/src/share/classes/java/awt/peer/FramePeer.java b/jdk/src/share/classes/java/awt/peer/FramePeer.java
index 8bb3b07add9..e9d2b002fb0 100644
--- a/jdk/src/share/classes/java/awt/peer/FramePeer.java
+++ b/jdk/src/share/classes/java/awt/peer/FramePeer.java
@@ -125,4 +125,10 @@ public interface FramePeer extends WindowPeer {
     // into an EmbeddedFramePeer which would extend FramePeer
     Rectangle getBoundsPrivate();
 
+    /**
+     * Requests the peer to emulate window activation.
+     *
+     * @param activate activate or deactivate the window
+     */
+    void emulateActivation(boolean activate);
 }
diff --git a/jdk/src/share/classes/java/awt/peer/WindowPeer.java b/jdk/src/share/classes/java/awt/peer/WindowPeer.java
index f2e8993e101..fca78b7eed4 100644
--- a/jdk/src/share/classes/java/awt/peer/WindowPeer.java
+++ b/jdk/src/share/classes/java/awt/peer/WindowPeer.java
@@ -27,8 +27,6 @@ package java.awt.peer;
 
 import java.awt.*;
 
-import java.awt.image.BufferedImage;
-
 /**
  * The peer interface for {@link Window}.
  *
diff --git a/jdk/src/share/classes/sun/awt/EmbeddedFrame.java b/jdk/src/share/classes/sun/awt/EmbeddedFrame.java
index d05e30fe742..0ae1ec762df 100644
--- a/jdk/src/share/classes/sun/awt/EmbeddedFrame.java
+++ b/jdk/src/share/classes/sun/awt/EmbeddedFrame.java
@@ -582,5 +582,8 @@ public abstract class EmbeddedFrame extends Frame
 
         public void repositionSecurityWarning() {
         }
-     }
+
+        public void emulateActivation(boolean activate) {
+        }
+    }
 } // class EmbeddedFrame
diff --git a/jdk/src/share/classes/sun/awt/HToolkit.java b/jdk/src/share/classes/sun/awt/HToolkit.java
index 57217678bfc..8671d8b5150 100644
--- a/jdk/src/share/classes/sun/awt/HToolkit.java
+++ b/jdk/src/share/classes/sun/awt/HToolkit.java
@@ -64,6 +64,11 @@ public class HToolkit extends SunToolkit
         throw new HeadlessException();
     }
 
+    public FramePeer createLightweightFrame(LightweightFrame target)
+        throws HeadlessException {
+        throw new HeadlessException();
+    }
+
     public FramePeer createFrame(Frame target)
         throws HeadlessException {
         throw new HeadlessException();
diff --git a/jdk/src/share/classes/sun/awt/LightweightFrame.java b/jdk/src/share/classes/sun/awt/LightweightFrame.java
new file mode 100644
index 00000000000..71e3dd30333
--- /dev/null
+++ b/jdk/src/share/classes/sun/awt/LightweightFrame.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package sun.awt;
+
+import java.awt.Container;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.Image;
+import java.awt.MenuBar;
+import java.awt.MenuComponent;
+import java.awt.Toolkit;
+import java.awt.peer.FramePeer;
+
+/**
+ * The class provides basic functionality for a lightweight frame
+ * implementation. A subclass is expected to provide painting to an
+ * offscreen image and access to it. Thus it can be used for lightweight
+ * embedding.
+ *
+ * @author Artem Ananiev
+ * @author Anton Tarasov
+ */
+@SuppressWarnings("serial")
+public abstract class LightweightFrame extends Frame {
+
+    /**
+     * Constructs a new, initially invisible {@code LightweightFrame}
+     * instance.
+     */
+    public LightweightFrame() {
+        setUndecorated(true);
+        setResizable(true);
+        setEnabled(true);
+    }
+
+    /**
+     * Blocks introspection of a parent window by this child.
+     *
+     * @return null
+     */
+    @Override public final Container getParent() { return null; }
+
+    @Override public Graphics getGraphics() { return null; }
+
+    @Override public final boolean isResizable() { return true; }
+
+    // Block modification of any frame attributes, since they aren't
+    // applicable for a lightweight frame.
+
+    @Override public final void setTitle(String title) {}
+    @Override public final void setIconImage(Image image) {}
+    @Override public final void setIconImages(java.util.List<? extends Image> icons) {}
+    @Override public final void setMenuBar(MenuBar mb) {}
+    @Override public final void setResizable(boolean resizable) {}
+    @Override public final void remove(MenuComponent m) {}
+    @Override public final void toFront() {}
+    @Override public final void toBack() {}
+
+    @Override public void addNotify() {
+        synchronized (getTreeLock()) {
+            if (getPeer() == null) {
+                SunToolkit stk = (SunToolkit)Toolkit.getDefaultToolkit();
+                try {
+                    setPeer(stk.createLightweightFrame(this));
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+            }
+            super.addNotify();
+        }
+    }
+
+    private void setPeer(final FramePeer p) {
+        AWTAccessor.getComponentAccessor().setPeer(this, p);
+    }
+
+    /**
+     * Requests the peer to emulate activation or deactivation of the
+     * frame. Peers should override this method if they are to implement
+     * this functionality.
+     *
+     * @param activate if <code>true</code>, activates the frame;
+     *                 otherwise, deactivates the frame
+     */
+    public void emulateActivation(boolean activate) {
+        ((FramePeer)getPeer()).emulateActivation(activate);
+    }
+
+    /**
+     * Delegates the focus grab action to the client (embedding) application.
+     * The method is called by the AWT grab machinery.
+     *
+     * @see SunToolkit#grab(java.awt.Window)
+     */
+    public abstract void grabFocus();
+
+    /**
+     * Delegates the focus ungrab action to the client (embedding) application.
+     * The method is called by the AWT grab machinery.
+     *
+     * @see SunToolkit#ungrab(java.awt.Window)
+     */
+    public abstract void ungrabFocus();
+}
diff --git a/jdk/src/share/classes/sun/awt/SunToolkit.java b/jdk/src/share/classes/sun/awt/SunToolkit.java
index 4ae6a94f0dc..8fc568913fb 100644
--- a/jdk/src/share/classes/sun/awt/SunToolkit.java
+++ b/jdk/src/share/classes/sun/awt/SunToolkit.java
@@ -131,6 +131,9 @@ public abstract class SunToolkit extends Toolkit
     public abstract FramePeer createFrame(Frame target)
         throws HeadlessException;
 
+    public abstract FramePeer createLightweightFrame(LightweightFrame target)
+        throws HeadlessException;
+
     public abstract DialogPeer createDialog(Dialog target)
         throws HeadlessException;
 
diff --git a/jdk/src/share/classes/sun/swing/JLightweightFrame.java b/jdk/src/share/classes/sun/swing/JLightweightFrame.java
new file mode 100644
index 00000000000..f7ea0aead1e
--- /dev/null
+++ b/jdk/src/share/classes/sun/swing/JLightweightFrame.java
@@ -0,0 +1,250 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package sun.swing;
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.EventQueue;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Rectangle;
+import java.awt.image.BufferedImage;
+import java.awt.image.DataBufferInt;
+
+import javax.swing.JLayeredPane;
+import javax.swing.JPanel;
+import javax.swing.JRootPane;
+import javax.swing.LayoutFocusTraversalPolicy;
+import javax.swing.RootPaneContainer;
+
+import sun.awt.LightweightFrame;
+
+/**
+ * The frame serves as a lightweight container which paints its content
+ * to an offscreen image and provides access to the image's data via the
+ * {@link LightweightContent} interface. Note, that it may not be shown
+ * as a standalone toplevel frame. Its purpose is to provide functionality
+ * for lightweight embedding.
+ *
+ * @author Artem Ananiev
+ * @author Anton Tarasov
+ */
+public final class JLightweightFrame extends LightweightFrame implements RootPaneContainer {
+
+    private final JRootPane rootPane = new JRootPane();
+
+    private LightweightContent content;
+
+    private Component component;
+    private JPanel contentPane;
+
+    private BufferedImage bbImage;
+
+    /**
+     * Constructs a new, initially invisible {@code JLightweightFrame}
+     * instance.
+     */
+    public JLightweightFrame() {
+        super();
+        add(rootPane, BorderLayout.CENTER);
+        setBackground(new Color(0, 0, 0, 0));
+        setFocusTraversalPolicy(new LayoutFocusTraversalPolicy());
+    }
+
+    /**
+     * Sets the {@link LightweightContent} instance for this frame.
+     * The {@code JComponent} object returned by the
+     * {@link LightweightContent#getComponent()} method is immediately
+     * added to the frame's content pane.
+     *
+     * @param content the {@link LightweightContent} instance
+     */
+    public void setContent(LightweightContent content) {
+        this.content = content;
+        this.component = content.getComponent();
+
+        initInterior();
+    }
+
+    @Override
+    public Graphics getGraphics() {
+        if (bbImage == null) return null;
+
+        Graphics2D g = bbImage.createGraphics();
+        g.setBackground(getBackground());
+        g.setColor(getForeground());
+        g.setFont(getFont());
+        return g;
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @see LightweightContent#focusGrabbed()
+     */
+    @Override
+    public void grabFocus() {
+        if (content != null) content.focusGrabbed();
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @see LightweightContent#focusUngrabbed()
+     */
+    @Override
+    public void ungrabFocus() {
+        if (content != null) content.focusUngrabbed();
+    }
+
+    private void initInterior() {
+        contentPane = new JPanel() {
+            @Override
+            public void paint(Graphics g) {
+                content.paintLock();
+                try {
+                    super.paint(g);
+
+                    final Rectangle clip = g.getClipBounds() != null ?
+                            g.getClipBounds() : new Rectangle(0, 0, contentPane.getWidth(), contentPane.getHeight());
+
+                    clip.x = Math.max(0, clip.x);
+                    clip.y = Math.max(0, clip.y);
+                    clip.width = Math.min(contentPane.getWidth(), clip.width);
+                    clip.height = Math.min(contentPane.getHeight(), clip.height);
+
+                    EventQueue.invokeLater(new Runnable() {
+                        @Override
+                        public void run() {
+                            content.imageUpdated(clip.x, clip.y, clip.width, clip.height);
+                        }
+                    });
+                } finally {
+                    content.paintUnlock();
+                }
+            }
+            @Override
+            protected boolean isPaintingOrigin() {
+                return true;
+            }
+        };
+        contentPane.setLayout(new BorderLayout());
+        contentPane.add(component);
+        setContentPane(contentPane);
+    }
+
+    @SuppressWarnings("deprecation")
+    @Override public void reshape(int x, int y, int width, int height) {
+        super.reshape(x, y, width, height);
+
+        if (width == 0 || height == 0) {
+            return;
+        }
+
+        content.paintLock();
+        try {
+            if ((bbImage == null) || (width != bbImage.getWidth()) || (height != bbImage.getHeight())) {
+                boolean createBB = true;
+                int newW = width;
+                int newH = height;
+                if (bbImage != null) {
+                    int oldW = bbImage.getWidth();
+                    int oldH = bbImage.getHeight();
+                    if ((oldW >= newW) && (oldH >= newH)) {
+                        createBB = false;
+                    } else {
+                        if (oldW >= newW) {
+                            newW = oldW;
+                        } else {
+                            newW = Math.max((int)(oldW * 1.2), width);
+                        }
+                        if (oldH >= newH) {
+                            newH = oldH;
+                        } else {
+                            newH = Math.max((int)(oldH * 1.2), height);
+                        }
+                    }
+                }
+                if (createBB) {
+                    BufferedImage oldBB = bbImage;
+                    bbImage = new BufferedImage(newW, newH, BufferedImage.TYPE_INT_ARGB_PRE);
+                    if (oldBB != null) {
+                        Graphics g = bbImage.getGraphics();
+                        try {
+                            g.drawImage(oldBB, 0, 0, newW, newH, null);
+                        } finally {
+                            g.dispose();
+                            oldBB.flush();
+                        }
+                    }
+                    DataBufferInt dataBuf = (DataBufferInt)bbImage.getRaster().getDataBuffer();
+                    content.imageBufferReset(dataBuf.getData(), 0, 0, width, height, bbImage.getWidth());
+                } else {
+                    content.imageReshaped(0, 0, width, height);
+                }
+            }
+        } finally {
+            content.paintUnlock();
+        }
+    }
+
+    @Override
+    public JRootPane getRootPane() {
+        return rootPane;
+    }
+
+    @Override
+    public void setContentPane(Container contentPane) {
+        getRootPane().setContentPane(contentPane);
+    }
+
+    @Override
+    public Container getContentPane() {
+        return getRootPane().getContentPane();
+    }
+
+    @Override
+    public void setLayeredPane(JLayeredPane layeredPane) {
+        getRootPane().setLayeredPane(layeredPane);
+    }
+
+    @Override
+    public JLayeredPane getLayeredPane() {
+        return getRootPane().getLayeredPane();
+    }
+
+    @Override
+    public void setGlassPane(Component glassPane) {
+        getRootPane().setGlassPane(glassPane);
+    }
+
+    @Override
+    public Component getGlassPane() {
+        return getRootPane().getGlassPane();
+    }
+}
diff --git a/jdk/src/share/classes/sun/swing/LightweightContent.java b/jdk/src/share/classes/sun/swing/LightweightContent.java
new file mode 100644
index 00000000000..2d443fba23c
--- /dev/null
+++ b/jdk/src/share/classes/sun/swing/LightweightContent.java
@@ -0,0 +1,164 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package sun.swing;
+
+import javax.swing.JComponent;
+
+/**
+ * The interface by means of which the {@link JLightweightFrame} class
+ * communicates to its client application.
+ * <p>
+ * The client application implements this interface so it can response
+ * to requests and process notifications from {@code JLightweightFrame}.
+ * An implementation of this interface is associated with a {@code
+ * JLightweightFrame} instance via the {@link JLightweightFrame#setContent}
+ * method.
+ *
+ * A hierarchy of components contained in the {@code JComponent} instance
+ * returned by the {@link #getComponent} method should not contain any
+ * heavyweight components, otherwise {@code JLightweightFrame} may fail
+ * to paint it.
+ *
+ * @author Artem Ananiev
+ * @author Anton Tarasov
+ * @author Jim Graham
+ */
+public interface LightweightContent {
+
+    /**
+     * The client application overrides this method to return the {@code
+     * JComponent} instance which the {@code JLightweightFrame} container
+     * will paint as its lightweight content. A hierarchy of components
+     * contained in this component should not contain any heavyweight objects.
+     *
+     * @return the component to paint
+     */
+    public JComponent getComponent();
+
+    /**
+     * {@code JLightweightFrame} calls this method to notify the client
+     * application that it acquires the paint lock. The client application
+     * should implement the locking mechanism in order to synchronize access
+     * to the content image data, shared between {@code JLightweightFrame}
+     * and the client application.
+     *
+     * @see #paintUnlock
+     */
+    public void paintLock();
+
+    /**
+     * {@code JLightweightFrame} calls this method to notify the client
+     * application that it releases the paint lock. The client application
+     * should implement the locking mechanism in order to synchronize access
+     * to the content image data, shared between {@code JLightweightFrame}
+     * and the client application.
+     *
+     * @see #paintLock
+     */
+    public void paintUnlock();
+
+    /**
+     * {@code JLightweightFrame} calls this method to notify the client
+     * application that a new data buffer has been set as a content pixel
+     * buffer. Typically this occurs when a buffer of a larger size is
+     * created in response to a content resize event. The method reports
+     * a reference to the pixel data buffer, the content image bounds
+     * within the buffer and the line stride of the buffer. These values
+     * have the following correlation.
+     * <p>
+     * The {@code width} and {@code height} matches the size of the content
+     * (the component returned from the {@link #getComponent} method). The
+     * {@code x} and {@code y} is the origin of the content, {@code (0, 0)}
+     * in the coordinate space of the content, appearing at
+     * {@code data[y * linestride + x]} in the buffer. All indices
+     * {@code data[(y + j) * linestride + (x + i)]} where
+     * {@code (0 <= i < width)} and {@code (0 <= j < height)} will represent
+     * valid pixel data, {@code (i, j)} in the coordinate space of the content.
+     *
+     * @param data the content pixel data buffer of INT_ARGB_PRE type
+     * @param x the x coordinate of the image
+     * @param y the y coordinate of the image
+     * @param width the width of the image
+     * @param height the height of the image
+     * @param linestride the line stride of the pixel buffer
+     */
+    public void imageBufferReset(int[] data,
+                                 int x, int y,
+                                 int width, int height,
+                                 int linestride);
+
+    /**
+     * {@code JLightweightFrame} calls this method to notify the client
+     * application that the content image bounds have been changed within the
+     * image's pixel buffer.
+     *
+     * @param x the x coordinate of the image
+     * @param y the y coordinate of the image
+     * @param width the width of the image
+     * @param height the height of the image
+     *
+     * @see #imageBufferReset
+     */
+    public void imageReshaped(int x, int y, int width, int height);
+
+    /**
+     * {@code JLightweightFrame} calls this method to notify the client
+     * application that a part of the content image, or the whole image has
+     * been updated. The method reports bounds of the rectangular dirty region.
+     * The {@code dirtyX} and {@code dirtyY} is the origin of the dirty
+     * rectangle, which is relative to the origin of the content, appearing
+     * at {@code data[(y + dirtyY] * linestride + (x + dirtyX)]} in the pixel
+     * buffer (see {@link #imageBufferReset}). All indices
+     * {@code data[(y + dirtyY + j) * linestride + (x + dirtyX + i)]} where
+     * {@code (0 <= i < dirtyWidth)} and {@code (0 <= j < dirtyHeight)}
+     * will represent valid pixel data, {@code (i, j)} in the coordinate space
+     * of the dirty rectangle.
+     *
+     * @param dirtyX the x coordinate of the dirty rectangle,
+     *        relative to the image origin
+     * @param dirtyY the y coordinate of the dirty rectangle,
+     *        relative to the image origin
+     * @param dirtyWidth the width of the dirty rectangle
+     * @param dirtyHeight the height of the dirty rectangle
+     *
+     * @see #imageBufferReset
+     * @see #imageReshaped
+     */
+    public void imageUpdated(int dirtyX, int dirtyY,
+                             int dirtyWidth, int dirtyHeight);
+
+    /**
+     * {@code JLightweightFrame} calls this method to notify the client
+     * application that the frame has grabbed focus.
+     */
+    public void focusGrabbed();
+
+    /**
+     * {@code JLightweightFrame} calls this method to notify the client
+     * application that the frame has ungrabbed focus.
+     */
+    public void focusUngrabbed();
+}
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XFramePeer.java b/jdk/src/solaris/classes/sun/awt/X11/XFramePeer.java
index fdefb1047ce..0c540b17855 100644
--- a/jdk/src/solaris/classes/sun/awt/X11/XFramePeer.java
+++ b/jdk/src/solaris/classes/sun/awt/X11/XFramePeer.java
@@ -641,4 +641,6 @@ class XFramePeer extends XDecoratedPeer implements FramePeer {
     public Rectangle getBoundsPrivate() {
         return getBounds();
     }
+
+    public void emulateActivation(boolean doActivate) {}
 }
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java b/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java
index 7c40e8260ef..b4fb9c76f17 100644
--- a/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java
+++ b/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java
@@ -419,6 +419,10 @@ public final class XToolkit extends UNIXToolkit implements Runnable {
         return peer;
     }
 
+    public FramePeer createLightweightFrame(LightweightFrame target) {
+        return null;
+    }
+
     public FramePeer createFrame(Frame target) {
         FramePeer peer = new XFramePeer(target);
         targetCreatedPeer(target, peer);
diff --git a/jdk/src/windows/classes/sun/awt/windows/WEmbeddedFrame.java b/jdk/src/windows/classes/sun/awt/windows/WEmbeddedFrame.java
index b0f9cd3279d..ba6ae8aefb2 100644
--- a/jdk/src/windows/classes/sun/awt/windows/WEmbeddedFrame.java
+++ b/jdk/src/windows/classes/sun/awt/windows/WEmbeddedFrame.java
@@ -226,15 +226,15 @@ public class WEmbeddedFrame extends EmbeddedFrame {
     }
 
     @SuppressWarnings("deprecation")
-    public void synthesizeWindowActivation(final boolean doActivate) {
-        if (!doActivate || EventQueue.isDispatchThread()) {
-            ((WEmbeddedFramePeer)getPeer()).synthesizeWmActivate(doActivate);
+    public void synthesizeWindowActivation(final boolean activate) {
+        if (!activate || EventQueue.isDispatchThread()) {
+            ((WFramePeer)getPeer()).emulateActivation(activate);
         } else {
             // To avoid focus concurrence b/w IE and EmbeddedFrame
             // activation is postponed by means of posting it to EDT.
             EventQueue.invokeLater(new Runnable() {
                     public void run() {
-                        ((WEmbeddedFramePeer)getPeer()).synthesizeWmActivate(true);
+                        ((WFramePeer)getPeer()).emulateActivation(true);
                     }
                 });
         }
diff --git a/jdk/src/windows/classes/sun/awt/windows/WEmbeddedFramePeer.java b/jdk/src/windows/classes/sun/awt/windows/WEmbeddedFramePeer.java
index 3b6d298bda8..ec551e30ced 100644
--- a/jdk/src/windows/classes/sun/awt/windows/WEmbeddedFramePeer.java
+++ b/jdk/src/windows/classes/sun/awt/windows/WEmbeddedFramePeer.java
@@ -65,8 +65,6 @@ public class WEmbeddedFramePeer extends WFramePeer {
 
     public native Rectangle getBoundsPrivate();
 
-    public native void synthesizeWmActivate(boolean doActivate);
-
     @Override
     public boolean isAccelCapable() {
         // REMIND: Temp workaround for issues with using HW acceleration
diff --git a/jdk/src/windows/classes/sun/awt/windows/WFramePeer.java b/jdk/src/windows/classes/sun/awt/windows/WFramePeer.java
index 368b8f60696..588b3caebdd 100644
--- a/jdk/src/windows/classes/sun/awt/windows/WFramePeer.java
+++ b/jdk/src/windows/classes/sun/awt/windows/WFramePeer.java
@@ -200,4 +200,11 @@ class WFramePeer extends WWindowPeer implements FramePeer {
     public Rectangle getBoundsPrivate() {
         return getBounds();
     }
+
+    // TODO: implement it in peers. WLightweightFramePeer may implement lw version.
+    public void emulateActivation(boolean activate) {
+        synthesizeWmActivate(activate);
+    }
+
+    private native void synthesizeWmActivate(boolean activate);
 }
diff --git a/jdk/src/windows/classes/sun/awt/windows/WLightweightFramePeer.java b/jdk/src/windows/classes/sun/awt/windows/WLightweightFramePeer.java
new file mode 100644
index 00000000000..c2c1604bef4
--- /dev/null
+++ b/jdk/src/windows/classes/sun/awt/windows/WLightweightFramePeer.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package sun.awt.windows;
+
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.event.ComponentEvent;
+import java.awt.event.MouseEvent;
+
+import sun.awt.LightweightFrame;
+
+public class WLightweightFramePeer extends WFramePeer {
+
+    public WLightweightFramePeer(LightweightFrame target) {
+        super(target);
+    }
+
+    private LightweightFrame getLwTarget() {
+        return (LightweightFrame)target;
+    }
+
+    @Override
+    public Graphics getGraphics() {
+        return getLwTarget().getGraphics();
+    }
+
+    @Override
+    public void show() {
+        super.show();
+        postEvent(new ComponentEvent((Component)getTarget(), ComponentEvent.COMPONENT_SHOWN));
+    }
+
+    @Override
+    public void hide() {
+        super.hide();
+        postEvent(new ComponentEvent((Component)getTarget(), ComponentEvent.COMPONENT_HIDDEN));
+    }
+
+    @Override
+    public void reshape(int x, int y, int width, int height) {
+        super.reshape(x, y, width, height);
+        postEvent(new ComponentEvent((Component) getTarget(), ComponentEvent.COMPONENT_MOVED));
+        postEvent(new ComponentEvent((Component) getTarget(), ComponentEvent.COMPONENT_RESIZED));
+    }
+
+    @Override
+    public void handleEvent(java.awt.AWTEvent e) {
+        if (e.getID() == MouseEvent.MOUSE_PRESSED) {
+            emulateActivation(true);
+        }
+        super.handleEvent(e);
+    }
+
+    @Override
+    public void grab() {
+        getLwTarget().grabFocus();
+    }
+
+    @Override
+    public void ungrab() {
+        getLwTarget().ungrabFocus();
+    }
+}
diff --git a/jdk/src/windows/classes/sun/awt/windows/WToolkit.java b/jdk/src/windows/classes/sun/awt/windows/WToolkit.java
index afbdfa6c1f9..e87b0ad8c08 100644
--- a/jdk/src/windows/classes/sun/awt/windows/WToolkit.java
+++ b/jdk/src/windows/classes/sun/awt/windows/WToolkit.java
@@ -37,6 +37,7 @@ import java.beans.PropertyChangeListener;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import sun.awt.AWTAutoShutdown;
+import sun.awt.LightweightFrame;
 import sun.awt.SunToolkit;
 import sun.awt.Win32GraphicsDevice;
 import sun.awt.Win32GraphicsEnvironment;
@@ -398,6 +399,12 @@ public class WToolkit extends SunToolkit implements Runnable {
         return peer;
     }
 
+    public FramePeer createLightweightFrame(LightweightFrame target) {
+        FramePeer peer = new WLightweightFramePeer(target);
+        targetCreatedPeer(target, peer);
+        return peer;
+    }
+
     public CanvasPeer createCanvas(Canvas target) {
         CanvasPeer peer = new WCanvasPeer(target);
         targetCreatedPeer(target, peer);
diff --git a/jdk/src/windows/native/sun/windows/awt_Frame.cpp b/jdk/src/windows/native/sun/windows/awt_Frame.cpp
index da1df839535..41c5624f001 100644
--- a/jdk/src/windows/native/sun/windows/awt_Frame.cpp
+++ b/jdk/src/windows/native/sun/windows/awt_Frame.cpp
@@ -105,6 +105,7 @@ AwtFrame::AwtFrame() {
     m_parentWnd = NULL;
     menuBar = NULL;
     m_isEmbedded = FALSE;
+    m_isLightweight = FALSE;
     m_ignoreWmSize = FALSE;
     m_isMenuDropped = FALSE;
     m_isInputMethodWindow = FALSE;
@@ -170,14 +171,13 @@ AwtFrame* AwtFrame::Create(jobject self, jobject parent)
              * area of the browser is a Java Frame for parenting purposes, but
              * really a Windows child window
              */
+            BOOL isEmbeddedInstance = FALSE;
+            BOOL isEmbedded = FALSE;
             cls = env->FindClass("sun/awt/EmbeddedFrame");
-            if (cls == NULL) {
-                return NULL;
+            if (cls) {
+                isEmbeddedInstance = env->IsInstanceOf(target, cls);
             }
             INT_PTR handle;
-            jboolean isEmbeddedInstance = env->IsInstanceOf(target, cls);
-            jboolean isEmbedded = FALSE;
-
             if (isEmbeddedInstance) {
                 handle = static_cast<INT_PTR>(env->GetLongField(target, AwtFrame::handleID));
                 if (handle != 0) {
@@ -186,6 +186,13 @@ AwtFrame* AwtFrame::Create(jobject self, jobject parent)
             }
             frame->m_isEmbedded = isEmbedded;
 
+            BOOL isLightweight = FALSE;
+            cls = env->FindClass("sun/awt/LightweightFrame");
+            if (cls) {
+                isLightweight = env->IsInstanceOf(target, cls);
+            }
+            frame->m_isLightweight = isLightweight;
+
             if (isEmbedded) {
                 hwndParent = (HWND)handle;
                 RECT rect;
@@ -230,6 +237,23 @@ AwtFrame* AwtFrame::Create(jobject self, jobject parent)
                                  rect.bottom-rect.top);
                 frame->InitPeerGraphicsConfig(env, self);
                 AwtToolkit::GetInstance().RegisterEmbedderProcessId(hwndParent);
+            } else if (isLightweight) {
+                frame->m_isUndecorated = true;
+                frame->m_peerObject = env->NewGlobalRef(self);
+                frame->RegisterClass();
+
+                DWORD exStyle = 0;
+                DWORD style = WS_POPUP;
+
+                frame->CreateHWnd(env, L"",
+                                  style,
+                                  exStyle,
+                                  0, 0, 0, 0,
+                                  0,
+                                  NULL,
+                                  ::GetSysColor(COLOR_WINDOWTEXT),
+                                  ::GetSysColor(COLOR_WINDOWFRAME),
+                                  self);
             } else {
                 jint state = env->CallIntMethod(self, AwtFrame::getExtendedStateMID);
                 DWORD exStyle;
@@ -345,16 +369,20 @@ LRESULT AwtFrame::ProxyWindowProc(UINT message, WPARAM wParam, LPARAM lParam, Ms
         case WM_SETFOCUS:
             if (sm_inSynthesizeFocus) break; // pass it up the WindowProc chain
 
-            if (!sm_suppressFocusAndActivation && IsEmbeddedFrame()) {
-                AwtSetActiveWindow();
+            if (!sm_suppressFocusAndActivation) {
+                if (IsLightweightFrame() || IsEmbeddedFrame()) {
+                    AwtSetActiveWindow();
+                }
             }
             mr = mrConsume;
             break;
         case WM_KILLFOCUS:
             if (sm_inSynthesizeFocus) break; // pass it up the WindowProc chain
 
-            if (!sm_suppressFocusAndActivation && IsEmbeddedFrame()) {
-                AwtWindow::SynthesizeWmActivate(FALSE, GetHWnd(), NULL);
+            if (!sm_suppressFocusAndActivation) {
+                if (IsLightweightFrame() || IsEmbeddedFrame()) {
+                    AwtWindow::SynthesizeWmActivate(FALSE, GetHWnd(), NULL);
+                }
 
             } else if (sm_restoreFocusAndActivation) {
                 if (AwtComponent::GetFocusedWindow() != NULL) {
@@ -640,6 +668,10 @@ AwtFrame::Show()
     HWND hwnd = GetHWnd();
     JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
 
+    if (IsLightweightFrame()) {
+        return;
+    }
+
     DTRACE_PRINTLN3("AwtFrame::Show:%s%s%s",
                   m_iconic ? " iconic" : "",
                   m_zoomed ? " zoomed" : "",
@@ -992,6 +1024,9 @@ BOOL AwtFrame::AwtSetActiveWindow(BOOL isMouseEventCause, UINT hittest)
         // b) focus is requested to some of the frame's child.
         m_actualFocusedWindow = NULL;
     }
+    if (IsLightweightFrame()) {
+        return TRUE;
+    }
     return AwtWindow::AwtSetActiveWindow(isMouseEventCause);
 }
 
@@ -1873,7 +1908,7 @@ Java_sun_awt_windows_WEmbeddedFramePeer_getBoundsPrivate(JNIEnv *env, jobject se
 }
 
 JNIEXPORT void JNICALL
-Java_sun_awt_windows_WEmbeddedFramePeer_synthesizeWmActivate(JNIEnv *env, jobject self, jboolean doActivate)
+Java_sun_awt_windows_WFramePeer_synthesizeWmActivate(JNIEnv *env, jobject self, jboolean doActivate)
 {
     TRY;
 
diff --git a/jdk/src/windows/native/sun/windows/awt_Frame.h b/jdk/src/windows/native/sun/windows/awt_Frame.h
index f6d692b87eb..e151c17c2a5 100644
--- a/jdk/src/windows/native/sun/windows/awt_Frame.h
+++ b/jdk/src/windows/native/sun/windows/awt_Frame.h
@@ -72,6 +72,8 @@ public:
 
     /* Returns whether this frame is embedded in an external native frame. */
     INLINE BOOL IsEmbeddedFrame() { return m_isEmbedded; }
+    /* Returns whether this frame is lightweight. */
+    INLINE virtual BOOL IsLightweightFrame() { return m_isLightweight; }
 
     INLINE BOOL IsSimpleWindow() { return FALSE; }
 
@@ -169,6 +171,9 @@ private:
     /* The frame is an EmbeddedFrame. */
     BOOL m_isEmbedded;
 
+    /* The frame is a LightweightFrame */
+    BOOL m_isLightweight;
+
     /* used so that calls to ::MoveWindow in SetMenuBar don't propogate
        because they are immediately followed by calls to Component.resize */
     BOOL m_ignoreWmSize;
diff --git a/jdk/src/windows/native/sun/windows/awt_Window.h b/jdk/src/windows/native/sun/windows/awt_Window.h
index 8ad2b0902b2..0ee23322d4b 100644
--- a/jdk/src/windows/native/sun/windows/awt_Window.h
+++ b/jdk/src/windows/native/sun/windows/awt_Window.h
@@ -143,6 +143,7 @@ public:
     INLINE HICON GetHIcon() {return m_hIcon;};
     INLINE HICON GetHIconSm() {return m_hIconSm;};
     INLINE BOOL IsIconInherited() {return m_iconInherited;};
+    INLINE virtual BOOL IsLightweightFrame() {return FALSE;}
 
     /* Post events to the EventQueue */
     void SendComponentEvent(jint eventId);
@@ -193,8 +194,10 @@ public:
 
     // Execute on Toolkit only.
     INLINE static LRESULT SynthesizeWmActivate(BOOL doActivate, HWND targetHWnd, HWND oppositeHWnd) {
+        AwtWindow *win = static_cast<AwtWindow*>(AwtComponent::GetComponent(targetHWnd));
         if (doActivate &&
-            (!::IsWindowVisible(targetHWnd) || ::IsIconic(::GetAncestor(targetHWnd, GA_ROOT))))
+            (!::IsWindowVisible(targetHWnd) || ::IsIconic(::GetAncestor(targetHWnd, GA_ROOT))) &&
+            (win == NULL || !win->IsLightweightFrame()))
         {
             // The activation is rejected if either:
             // - The toplevel is not visible

From 0685f8e9387af288372fccc7afe0dd0ec529c2dc Mon Sep 17 00:00:00 2001
From: Marcus Lagergren <lagergren@openjdk.org>
Date: Fri, 22 Feb 2013 12:22:16 +0100
Subject: [PATCH 201/311] 8007002: Replace implicit exception throwing methods
 with explicit throws - simplify control flow and remove useless code

Reviewed-by: attila, hannesw
---
 .../api/scripting/NashornException.java       | 129 +++++----
 .../api/scripting/NashornScriptEngine.java    |   5 +-
 .../jdk/nashorn/api/scripting/URLReader.java  |   5 +
 .../objects/AccessorPropertyDescriptor.java   |   4 +-
 .../jdk/nashorn/internal/objects/Global.java  |  10 +-
 .../internal/objects/NativeArguments.java     |   2 +-
 .../nashorn/internal/objects/NativeArray.java |  32 +--
 .../internal/objects/NativeBoolean.java       |   3 +-
 .../nashorn/internal/objects/NativeDate.java  |  15 +-
 .../nashorn/internal/objects/NativeError.java |   3 +-
 .../internal/objects/NativeFunction.java      |  21 +-
 .../internal/objects/NativeJSAdapter.java     |  11 +-
 .../nashorn/internal/objects/NativeJSON.java  |   4 +-
 .../nashorn/internal/objects/NativeJava.java  |   9 +-
 .../internal/objects/NativeNumber.java        |  14 +-
 .../internal/objects/NativeObject.java        |   3 +-
 .../internal/objects/NativeRegExp.java        |   5 +-
 .../internal/objects/NativeString.java        |   8 +-
 .../internal/parser/AbstractParser.java       |   8 +-
 .../jdk/nashorn/internal/parser/Lexer.java    |   3 +-
 .../jdk/nashorn/internal/runtime/Context.java |   4 +-
 .../nashorn/internal/runtime/ECMAErrors.java  | 244 +++++++++++-------
 .../internal/runtime/ECMAException.java       |  57 +---
 .../internal/runtime/ErrorManager.java        |   2 +-
 .../internal/runtime/JSONFunctions.java       |   3 +-
 .../jdk/nashorn/internal/runtime/JSType.java  |   4 +-
 .../internal/runtime/ParserException.java     |  62 ++---
 .../internal/runtime/ScriptFunction.java      |   2 +-
 .../internal/runtime/ScriptFunctionData.java  |   2 +-
 .../internal/runtime/ScriptObject.java        |  45 ++--
 .../internal/runtime/ScriptRuntime.java       |  21 +-
 .../internal/runtime/ScriptingFunctions.java  |   3 +-
 .../internal/runtime/SetMethodCreator.java    |   2 +-
 .../nashorn/internal/runtime/URIUtils.java    |   9 +-
 .../nashorn/internal/runtime/Undefined.java   |  24 +-
 .../runtime/arrays/FrozenArrayFilter.java     |   8 +-
 .../runtime/arrays/IteratorAction.java        |   3 +-
 .../runtime/arrays/SealedArrayFilter.java     |   2 +-
 .../runtime/linker/JavaAdapterFactory.java    |  11 +-
 .../linker/JavaArgumentConverters.java        |   4 +-
 .../internal/runtime/linker/Lookup.java       |   5 +-
 .../runtime/linker/NashornBottomLinker.java   |  27 +-
 .../linker/NashornStaticClassLinker.java      |   2 +-
 43 files changed, 387 insertions(+), 453 deletions(-)

diff --git a/nashorn/src/jdk/nashorn/api/scripting/NashornException.java b/nashorn/src/jdk/nashorn/api/scripting/NashornException.java
index 717046e5da8..d1d47b1dc08 100644
--- a/nashorn/src/jdk/nashorn/api/scripting/NashornException.java
+++ b/nashorn/src/jdk/nashorn/api/scripting/NashornException.java
@@ -25,100 +25,115 @@
 
 package jdk.nashorn.api.scripting;
 
+import jdk.nashorn.internal.runtime.ECMAErrors;
+
 /**
- * This is base exception for all Nashorn exceptions. These originate from user's
- * ECMAScript code. Example: script parse errors, exceptions thrown from scripts.
- * Note that ScriptEngine methods like "eval", "invokeMethod", "invokeFunction"
- * will wrap this as ScriptException and throw it. But, there are cases where user
- * may need to access this exception (or implementation defined subtype of this).
- * For example, if java interface is implemented by a script object or Java access
- * to script object properties via java.util.Map interface. In these cases, user
- * code will get an instance of this or implementation defined subclass.
+ * This is base exception for all Nashorn exceptions. These originate from
+ * user's ECMAScript code. Example: script parse errors, exceptions thrown from
+ * scripts. Note that ScriptEngine methods like "eval", "invokeMethod",
+ * "invokeFunction" will wrap this as ScriptException and throw it. But, there
+ * are cases where user may need to access this exception (or implementation
+ * defined subtype of this). For example, if java interface is implemented by a
+ * script object or Java access to script object properties via java.util.Map
+ * interface. In these cases, user code will get an instance of this or
+ * implementation defined subclass.
  */
 @SuppressWarnings("serial")
-public class NashornException extends RuntimeException {
+public abstract class NashornException extends RuntimeException {
     // script file name
-    private String      fileName;
+    private final String fileName;
     // script line number
-    private int         line;
+    private final int line;
     // script column number
-    private int         column;
+    private final int column;
 
     /** script source name used for "engine.js" */
-    protected static final String ENGINE_SCRIPT_SOURCE_NAME = "nashorn:engine/resources/engine.js";
+    public static final String ENGINE_SCRIPT_SOURCE_NAME = "nashorn:engine/resources/engine.js";
 
     /**
      * Constructor
      *
-     * @param msg exception message
+     * @param msg       exception message
+     * @param fileName  file name
+     * @param line      line number
+     * @param column    column number
      */
-    protected NashornException(final String msg) {
-        super(msg);
+    protected NashornException(final String msg, final String fileName, final int line, final int column) {
+        this(msg, null, fileName, line, column);
     }
 
     /**
      * Constructor
-     * @param msg   exception message
-     * @param cause exception cause
+     *
+     * @param msg       exception message
+     * @param cause     exception cause
+     * @param fileName  file name
+     * @param line      line number
+     * @param column    column number
+     */
+    protected NashornException(final String msg, final Throwable cause, final String fileName, final int line, final int column) {
+        super(msg, cause == null ? null : cause);
+        this.fileName = fileName;
+        this.line = line;
+        this.column = column;
+    }
+
+    /**
+     * Constructor
+     *
+     * @param msg       exception message
+     * @param cause     exception cause
      */
     protected NashornException(final String msg, final Throwable cause) {
-        super(msg, cause);
+        super(msg, cause == null ? null : cause);
+        // This is not so pretty - but it gets the job done. Note that the stack
+        // trace has been already filled by "fillInStackTrace" call from
+        // Throwable
+        // constructor and so we don't pay additional cost for it.
+
+        // Hard luck - no column number info
+        this.column = -1;
+
+        // Find the first JavaScript frame by walking and set file, line from it
+        // Usually, we should be able to find it in just few frames depth.
+        for (final StackTraceElement ste : getStackTrace()) {
+            if (ECMAErrors.isScriptFrame(ste)) {
+                // Whatever here is compiled from JavaScript code
+                this.fileName = ste.getFileName();
+                this.line = ste.getLineNumber();
+                return;
+            }
+        }
+
+        this.fileName = null;
+        this.line = 0;
     }
 
     /**
-     * Constructor
+     * Get the source file name for this {@code NashornException}
      *
-     * @param cause exception cause
+     * @return the file name
      */
-    protected NashornException(final Throwable cause) {
-        super(cause);
+    public final String getFileName() {
+        return fileName;
     }
 
-     /**
-      * Get the source file name for this {@code NashornException}
-      * @return the file name
-      */
-     public final String getFileName() {
-         return fileName;
-     }
-
-    /**
-     * Set the source file name for this {@code NashornException}
-     * @param fileName file name
-     */
-    protected final void setFileName(final String fileName) {
-         this.fileName = fileName;
-     }
-
     /**
      * Get the line number for this {@code NashornException}
+     *
      * @return the line number
      */
-     public final int getLineNumber() {
-         return line;
-     }
-
-    /**
-     * Set the line number for this {@code NashornException}
-     * @param line line number
-     */
-    protected final void setLineNumber(final int line) {
-         this.line = line;
-     }
+    public final int getLineNumber() {
+        return line;
+    }
 
     /**
      * Get the column for this {@code NashornException}
+     *
      * @return the column
      */
     public final int getColumnNumber() {
         return column;
     }
 
-   /**
-    * Set the column number for this {@code NashornException}
-    * @param column the column
-    */
-    public final void setColumnNumber(final int column) {
-        this.column = column;
-    }
 }
diff --git a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
index 82a7852b9a7..ce16a7e82d0 100644
--- a/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
+++ b/nashorn/src/jdk/nashorn/api/scripting/NashornScriptEngine.java
@@ -122,9 +122,8 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
             if (reader instanceof URLReader) {
                 final URL url = ((URLReader)reader).getURL();
                 return evalImpl(compileImpl(new Source(url.toString(), url), ctxt), ctxt);
-            } else {
-                return evalImpl(Source.readFully(reader), ctxt);
             }
+            return evalImpl(Source.readFully(reader), ctxt);
         } catch (final IOException e) {
             throw new ScriptException(e);
         }
@@ -240,7 +239,7 @@ public final class NashornScriptEngine extends AbstractScriptEngine implements C
 
         if (self == UNDEFINED) {
             // scope access and so throw ReferenceError
-            referenceError(ctxtGlobal, "not.defined", name);
+            throw referenceError(ctxtGlobal, "not.defined", name);
         }
 
         return UNDEFINED;
diff --git a/nashorn/src/jdk/nashorn/api/scripting/URLReader.java b/nashorn/src/jdk/nashorn/api/scripting/URLReader.java
index 0e8dbbbfe6f..d21d6263611 100644
--- a/nashorn/src/jdk/nashorn/api/scripting/URLReader.java
+++ b/nashorn/src/jdk/nashorn/api/scripting/URLReader.java
@@ -40,6 +40,11 @@ public final class URLReader extends Reader {
     // lazily initialized underlying reader for URL
     private Reader reader;
 
+    /**
+     * Constructor
+     *
+     * @param url URL for this URLReader
+     */
     public URLReader(final URL url) {
         this.url = url;
     }
diff --git a/nashorn/src/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java b/nashorn/src/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java
index bef0a86827d..73397b59f82 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/AccessorPropertyDescriptor.java
@@ -157,7 +157,7 @@ public final class AccessorPropertyDescriptor extends ScriptObject implements Pr
             if (getter == UNDEFINED || getter instanceof ScriptFunction) {
                 this.get = getter;
             } else {
-                typeError("not.a.function", ScriptRuntime.safeToString(getter));
+                throw typeError("not.a.function", ScriptRuntime.safeToString(getter));
             }
         } else {
             delete(GET, strict);
@@ -168,7 +168,7 @@ public final class AccessorPropertyDescriptor extends ScriptObject implements Pr
             if (setter == UNDEFINED || setter instanceof ScriptFunction) {
                 this.set = setter;
             } else {
-                typeError("not.a.function", ScriptRuntime.safeToString(setter));
+                throw typeError("not.a.function", ScriptRuntime.safeToString(setter));
             }
         } else {
             delete(SET, strict);
diff --git a/nashorn/src/jdk/nashorn/internal/objects/Global.java b/nashorn/src/jdk/nashorn/internal/objects/Global.java
index 3a9ca905a8a..11cb917bed9 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/Global.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/Global.java
@@ -485,7 +485,7 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
                         return value;
                     }
                 }
-                typeError(this, "cannot.get.default.string");
+                throw typeError(this, "cannot.get.default.string");
             }
 
             if (hint == Number.class) {
@@ -505,7 +505,7 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
                     }
                 }
 
-                typeError(this, "cannot.get.default.number");
+                throw typeError(this, "cannot.get.default.number");
             }
         } catch (final RuntimeException | Error e) {
             throw e;
@@ -1177,7 +1177,7 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
      */
     public static Object toObject(final Object obj) {
         if (obj == null || obj == UNDEFINED) {
-            typeError("not.an.object", ScriptRuntime.safeToString(obj));
+            throw typeError("not.an.object", ScriptRuntime.safeToString(obj));
         }
 
         if (obj instanceof ScriptObject) {
@@ -1294,7 +1294,7 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
      */
     public static void checkObject(final Object obj) {
         if (!(obj instanceof ScriptObject)) {
-            typeError("not.an.object", ScriptRuntime.safeToString(obj));
+            throw typeError("not.an.object", ScriptRuntime.safeToString(obj));
         }
     }
 
@@ -1306,7 +1306,7 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
      */
     public static void checkObjectCoercible(final Object obj) {
         if (obj == null || obj == UNDEFINED) {
-            typeError("not.an.object", ScriptRuntime.safeToString(obj));
+            throw typeError("not.an.object", ScriptRuntime.safeToString(obj));
         }
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeArguments.java b/nashorn/src/jdk/nashorn/internal/objects/NativeArguments.java
index b47aa7f4be5..d3ffefc1eab 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeArguments.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeArguments.java
@@ -485,7 +485,7 @@ public final class NativeArguments extends ScriptObject {
             final boolean allowed = super.defineOwnProperty(key, propertyDesc, false);
             if (!allowed) {
                 if (reject) {
-                    typeError("cant.redefine.property",  key, ScriptRuntime.safeToString(this));
+                    throw typeError("cant.redefine.property",  key, ScriptRuntime.safeToString(this));
                 }
                 return false;
             }
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeArray.java b/nashorn/src/jdk/nashorn/internal/objects/NativeArray.java
index 7edd2419573..31c1d972cad 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeArray.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeArray.java
@@ -181,7 +181,7 @@ public final class NativeArray extends ScriptObject {
             // Step 3g
             if (!oldLenDesc.isWritable()) {
                 if (reject) {
-                    typeError("property.not.writable", "length", ScriptRuntime.safeToString(this));
+                    throw typeError("property.not.writable", "length", ScriptRuntime.safeToString(this));
                 }
                 return false;
             }
@@ -210,7 +210,7 @@ public final class NativeArray extends ScriptObject {
                     }
                     super.defineOwnProperty("length", newLenDesc, false);
                     if (reject) {
-                        typeError("property.not.writable", "length", ScriptRuntime.safeToString(this));
+                        throw typeError("property.not.writable", "length", ScriptRuntime.safeToString(this));
                     }
                     return false;
                 }
@@ -235,7 +235,7 @@ public final class NativeArray extends ScriptObject {
             // setting an element beyond current length, but 'length' is not writable
             if (longIndex >= oldLen && !oldLenDesc.isWritable()) {
                 if (reject) {
-                    typeError("property.not.writable", Long.toString(longIndex), ScriptRuntime.safeToString(this));
+                    throw typeError("property.not.writable", Long.toString(longIndex), ScriptRuntime.safeToString(this));
                 }
                 return false;
             }
@@ -247,7 +247,7 @@ public final class NativeArray extends ScriptObject {
             // Step 4d
             if (!succeeded) {
                 if (reject) {
-                    typeError("cant.redefine.property", key, ScriptRuntime.safeToString(this));
+                    throw typeError("cant.redefine.property", key, ScriptRuntime.safeToString(this));
                 }
                 return false;
             }
@@ -324,7 +324,7 @@ public final class NativeArray extends ScriptObject {
             }
         }
         if (reject) {
-            rangeError("inappropriate.array.length", ScriptRuntime.safeToString(length));
+            throw rangeError("inappropriate.array.length", ScriptRuntime.safeToString(length));
         }
         return -1;
     }
@@ -380,7 +380,7 @@ public final class NativeArray extends ScriptObject {
                         if (toLocaleString instanceof ScriptFunction) {
                             sb.append((String)TO_LOCALE_STRING.getInvoker().invokeExact(toLocaleString, sobj));
                         } else {
-                            typeError("not.a.function", "toLocaleString");
+                            throw typeError("not.a.function", "toLocaleString");
                         }
                     }
                 } catch (final Error|RuntimeException t) {
@@ -433,7 +433,7 @@ public final class NativeArray extends ScriptObject {
                  */
                 final double numberLength = ((Number) len).doubleValue();
                 if (length != numberLength) {
-                    rangeError("inappropriate.array.length", JSType.toString(numberLength));
+                    throw rangeError("inappropriate.array.length", JSType.toString(numberLength));
                 }
 
                 return new NativeArray(length);
@@ -623,8 +623,7 @@ public final class NativeArray extends ScriptObject {
 
             return element;
         } catch (final ClassCastException | NullPointerException e) {
-            typeError("not.an.object", ScriptRuntime.safeToString(self));
-            return ScriptRuntime.UNDEFINED;
+            throw typeError("not.an.object", ScriptRuntime.safeToString(self));
         }
     }
 
@@ -659,8 +658,7 @@ public final class NativeArray extends ScriptObject {
 
             return len;
         } catch (final ClassCastException | NullPointerException e) {
-            typeError("not.an.object", ScriptRuntime.safeToString(self));
-            return ScriptRuntime.UNDEFINED;
+            throw typeError("not.an.object", ScriptRuntime.safeToString(self));
         }
     }
 
@@ -698,8 +696,7 @@ public final class NativeArray extends ScriptObject {
             }
             return sobj;
         } catch (final ClassCastException | NullPointerException e) {
-            typeError("not.an.object", ScriptRuntime.safeToString(self));
-            return ScriptRuntime.UNDEFINED;
+            throw typeError("not.an.object", ScriptRuntime.safeToString(self));
         }
     }
 
@@ -864,8 +861,7 @@ public final class NativeArray extends ScriptObject {
 
             return sobj;
         } catch (final ClassCastException | NullPointerException e) {
-            typeError("not.an.object", ScriptRuntime.safeToString(self));
-            return ScriptRuntime.UNDEFINED;
+            throw typeError("not.an.object", ScriptRuntime.safeToString(self));
         }
     }
 
@@ -1079,7 +1075,7 @@ public final class NativeArray extends ScriptObject {
                 }
             }
         } catch (final ClassCastException | NullPointerException e) {
-            typeError("not.an.object", ScriptRuntime.safeToString(self));
+            throw typeError("not.an.object", ScriptRuntime.safeToString(self));
         }
 
         return -1;
@@ -1201,14 +1197,14 @@ public final class NativeArray extends ScriptObject {
         Object initialValue = initialValuePresent ? args[1] : ScriptRuntime.UNDEFINED;
 
         if (callbackfn == ScriptRuntime.UNDEFINED) {
-            typeError("not.a.function", "undefined");
+            throw typeError("not.a.function", "undefined");
         }
 
         if (!initialValuePresent) {
             if (iter.hasNext()) {
                 initialValue = iter.next();
             } else {
-                typeError("array.reduce.invalid.init");
+                throw typeError("array.reduce.invalid.init");
             }
         }
 
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeBoolean.java b/nashorn/src/jdk/nashorn/internal/objects/NativeBoolean.java
index a8b79235a33..0c87f6c8b43 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeBoolean.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeBoolean.java
@@ -145,8 +145,7 @@ public final class NativeBoolean extends ScriptObject {
         } else if (self != null && self == Global.instance().getBooleanPrototype()) {
             return false;
         } else {
-            typeError("not.a.boolean", ScriptRuntime.safeToString(self));
-            return false;
+            throw typeError("not.a.boolean", ScriptRuntime.safeToString(self));
         }
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeDate.java b/nashorn/src/jdk/nashorn/internal/objects/NativeDate.java
index 0b90ed6b8ff..893e5d2ec04 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeDate.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeDate.java
@@ -867,14 +867,12 @@ public final class NativeDate extends ScriptObject {
             if (func instanceof ScriptFunction) {
                 return TO_ISO_STRING.getInvoker().invokeExact(func, sobj, key);
             }
-            typeError("not.a.function", ScriptRuntime.safeToString(func));
+            throw typeError("not.a.function", ScriptRuntime.safeToString(func));
         } catch (final RuntimeException | Error e) {
             throw e;
         } catch (final Throwable t) {
             throw new RuntimeException(t);
         }
-
-        return null;
     }
 
     // -- Internals below this point
@@ -1006,9 +1004,7 @@ public final class NativeDate extends ScriptObject {
             return sb.toString();
         }
 
-        rangeError("invalid.date");
-
-        return INVALID_DATE;
+        throw rangeError("invalid.date");
     }
 
     private static String toISOStringImpl(final Object self) {
@@ -1035,9 +1031,7 @@ public final class NativeDate extends ScriptObject {
             return sb.toString();
         }
 
-        rangeError("invalid.date");
-
-        return INVALID_DATE;
+        throw rangeError("invalid.date");
     }
 
     // ECMA 15.9.1.2 Day (t)
@@ -1268,8 +1262,7 @@ public final class NativeDate extends ScriptObject {
         } else if (self != null && self == Global.instance().getDatePrototype()) {
             return Global.instance().DEFAULT_DATE;
         } else {
-            typeError("not.a.date", ScriptRuntime.safeToString(self));
-            return null;
+            throw typeError("not.a.date", ScriptRuntime.safeToString(self));
         }
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeError.java b/nashorn/src/jdk/nashorn/internal/objects/NativeError.java
index 626c3c0991a..eff8af866b5 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeError.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeError.java
@@ -38,6 +38,7 @@ import jdk.nashorn.internal.objects.annotations.Function;
 import jdk.nashorn.internal.objects.annotations.Property;
 import jdk.nashorn.internal.objects.annotations.ScriptClass;
 import jdk.nashorn.internal.objects.annotations.Where;
+import jdk.nashorn.internal.runtime.ECMAErrors;
 import jdk.nashorn.internal.runtime.ECMAException;
 import jdk.nashorn.internal.runtime.JSType;
 import jdk.nashorn.internal.runtime.ScriptObject;
@@ -246,7 +247,7 @@ public final class NativeError extends ScriptObject {
             final StackTraceElement[] frames = ((Throwable)exception).getStackTrace();
             final List<StackTraceElement> filtered = new ArrayList<>();
             for (final StackTraceElement st : frames) {
-                if (ECMAException.isScriptFrame(st)) {
+                if (ECMAErrors.isScriptFrame(st)) {
                     filtered.add(st);
                 }
             }
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeFunction.java b/nashorn/src/jdk/nashorn/internal/objects/NativeFunction.java
index 86863a143bb..f5c0c290632 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeFunction.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeFunction.java
@@ -60,8 +60,7 @@ public final class NativeFunction {
     @Function(attributes = Attribute.NOT_ENUMERABLE)
     public static Object toString(final Object self) {
         if (!(self instanceof ScriptFunction)) {
-            typeError("not.a.function", ScriptRuntime.safeToString(self));
-            return UNDEFINED;
+            throw typeError("not.a.function", ScriptRuntime.safeToString(self));
         }
         return ((ScriptFunction)self).toSource();
     }
@@ -77,8 +76,7 @@ public final class NativeFunction {
     @Function(attributes = Attribute.NOT_ENUMERABLE)
     public static Object apply(final Object self, final Object thiz, final Object array) {
         if (!(self instanceof ScriptFunction)) {
-            typeError("not.a.function", ScriptRuntime.safeToString(self));
-            return UNDEFINED;
+            throw typeError("not.a.function", ScriptRuntime.safeToString(self));
         }
 
         Object[] args = null;
@@ -91,12 +89,12 @@ public final class NativeFunction {
             final Object       len  = sobj.getLength();
 
             if (len == UNDEFINED || len == null) {
-                typeError("function.apply.expects.array");
+                throw typeError("function.apply.expects.array");
             }
 
             final int n = (int)JSType.toUint32(len);
             if (n != JSType.toNumber(len)) {
-                typeError("function.apply.expects.array");
+                throw typeError("function.apply.expects.array");
             }
 
             args = new Object[(int)JSType.toUint32(len)];
@@ -111,7 +109,7 @@ public final class NativeFunction {
         } else if (array == null || array == UNDEFINED) {
             args = ScriptRuntime.EMPTY_ARRAY;
         } else {
-            typeError("function.apply.expects.array");
+            throw typeError("function.apply.expects.array");
         }
 
         return ScriptRuntime.apply((ScriptFunction)self, thiz, args);
@@ -127,8 +125,7 @@ public final class NativeFunction {
     @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
     public static Object call(final Object self, final Object... args) {
         if (!(self instanceof ScriptFunction)) {
-            typeError("not.a.function", ScriptRuntime.safeToString(self));
-            return UNDEFINED;
+            throw typeError("not.a.function", ScriptRuntime.safeToString(self));
         }
 
         Object thiz = (args.length == 0) ? UNDEFINED : args[0];
@@ -154,8 +151,7 @@ public final class NativeFunction {
     @Function(attributes = Attribute.NOT_ENUMERABLE, arity = 1)
     public static Object bind(final Object self, final Object... args) {
         if (!(self instanceof ScriptFunction)) {
-            typeError("not.a.function", ScriptRuntime.safeToString(self));
-            return UNDEFINED;
+            throw typeError("not.a.function", ScriptRuntime.safeToString(self));
         }
 
         final Object thiz = (args.length == 0) ? UNDEFINED : args[0];
@@ -180,8 +176,7 @@ public final class NativeFunction {
     @Function(attributes = Attribute.NOT_ENUMERABLE)
     public static Object toSource(final Object self) {
         if (!(self instanceof ScriptFunction)) {
-            typeError("not.a.function", ScriptRuntime.safeToString(self));
-            return UNDEFINED;
+            throw typeError("not.a.function", ScriptRuntime.safeToString(self));
         }
         return ((ScriptFunction)self).toSource();
     }
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java b/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java
index d1981ff8f1f..edef6241a0f 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java
@@ -541,8 +541,7 @@ public final class NativeJSAdapter extends ScriptObject {
         Object adaptee;
 
         if (args == null || args.length == 0) {
-            typeError("not.an.object", "null");
-            return null; //won't reach, but fixed warning
+            throw typeError("not.an.object", "null");
         }
 
         switch (args.length) {
@@ -565,7 +564,7 @@ public final class NativeJSAdapter extends ScriptObject {
         }
 
         if (!(adaptee instanceof ScriptObject)) {
-            typeError("not.an.object", ScriptRuntime.safeToString(adaptee));
+            throw typeError("not.an.object", ScriptRuntime.safeToString(adaptee));
         }
 
         if (proto != null && !(proto instanceof ScriptObject)) {
@@ -624,8 +623,7 @@ public final class NativeJSAdapter extends ScriptObject {
                         func.makeBoundFunction(this, new Object[] { name })), 0, Object.class),
                         adaptee.getMap().getProtoGetSwitchPoint(__call__), testJSAdaptor(adaptee, null, null, null));
             }
-            typeError("no.such.function", desc.getNameToken(2), ScriptRuntime.safeToString(this));
-            break;
+            throw typeError("no.such.function", desc.getNameToken(2), ScriptRuntime.safeToString(this));
         default:
             break;
         }
@@ -697,8 +695,7 @@ public final class NativeJSAdapter extends ScriptObject {
 
         switch (hook) {
         case __call__:
-            typeError("no.such.function", desc.getNameToken(2), ScriptRuntime.safeToString(this));
-            throw new AssertionError("should not reach here");
+            throw typeError("no.such.function", desc.getNameToken(2), ScriptRuntime.safeToString(this));
         default:
             final MethodHandle methodHandle = hook.equals(__put__) ?
             MH.asType(Lookup.EMPTY_SETTER, type) :
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeJSON.java b/nashorn/src/jdk/nashorn/internal/objects/NativeJSON.java
index 68f59a5b111..faeebc1d4e6 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeJSON.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeJSON.java
@@ -241,7 +241,7 @@ public final class NativeJSON extends ScriptObject {
     // Spec: The abstract operation JO(value) serializes an object.
     private static String JO(final ScriptObject value, final StringifyState state) {
         if (state.stack.containsKey(value)) {
-            typeError("JSON.stringify.cyclic");
+            throw typeError("JSON.stringify.cyclic");
         }
 
         state.stack.put(value, value);
@@ -317,7 +317,7 @@ public final class NativeJSON extends ScriptObject {
     // Spec: The abstract operation JA(value) serializes an array.
     private static Object JA(final NativeArray value, final StringifyState state) {
         if (state.stack.containsKey(value)) {
-            typeError("JSON.stringify.cyclic");
+            throw typeError("JSON.stringify.cyclic");
         }
 
         state.stack.put(value, value);
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java b/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java
index d3d6df992cd..c50a568779f 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java
@@ -287,9 +287,7 @@ public final class NativeJava {
             return new NativeArray(copyArray((boolean[])objArray));
         }
 
-        typeError("cant.convert.to.javascript.array", objArray.getClass().getName());
-
-        throw new AssertionError();
+        throw typeError("cant.convert.to.javascript.array", objArray.getClass().getName());
     }
 
     private static int[] copyArray(final byte[] in) {
@@ -384,8 +382,7 @@ public final class NativeJava {
     @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
     public static Object extend(final Object self, final Object... types) {
         if(types == null || types.length == 0) {
-            typeError("extend.expects.at.least.one.argument");
-            throw new AssertionError(); //circumvent warning for types == null below
+            throw typeError("extend.expects.at.least.one.argument");
         }
         final Class<?>[] stypes = new Class<?>[types.length];
         try {
@@ -393,7 +390,7 @@ public final class NativeJava {
                 stypes[i] = ((StaticClass)types[i]).getRepresentedClass();
             }
         } catch(final ClassCastException e) {
-            typeError("extend.expects.java.types");
+            throw typeError("extend.expects.java.types");
         }
         return JavaAdapterFactory.getAdapterClassFor(stypes);
     }
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java b/nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java
index 40aa8c2fba7..87209ca0001 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java
@@ -185,8 +185,7 @@ public final class NativeNumber extends ScriptObject {
     public static Object toFixed(final Object self, final Object fractionDigits) {
         final int f = JSType.toInteger(fractionDigits);
         if (f < 0 || f > 20) {
-            rangeError("invalid.fraction.digits", "toFixed");
-            return UNDEFINED;
+            throw rangeError("invalid.fraction.digits", "toFixed");
         }
 
         final double x = getNumberValue(self);
@@ -227,8 +226,7 @@ public final class NativeNumber extends ScriptObject {
         }
 
         if (fractionDigits != UNDEFINED && (f < 0 || f > 20)) {
-            rangeError("invalid.fraction.digits", "toExponential");
-            return UNDEFINED;
+            throw rangeError("invalid.fraction.digits", "toExponential");
         }
 
         final String res = String.format(Locale.US, "%1." + f + "e", x);
@@ -258,8 +256,7 @@ public final class NativeNumber extends ScriptObject {
         }
 
         if (p < 1 || p > 21) {
-            rangeError("invalid.precision");
-            return UNDEFINED;
+            throw rangeError("invalid.precision");
         }
 
         // workaround for http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6469160
@@ -283,7 +280,7 @@ public final class NativeNumber extends ScriptObject {
             final int intRadix = JSType.toInteger(radix);
             if (intRadix != 10) {
                 if (intRadix < 2 || intRadix > 36) {
-                    rangeError("invalid.radix");
+                    throw rangeError("invalid.radix");
                 }
                 return JSType.toString(getNumberValue(self), intRadix);
             }
@@ -338,8 +335,7 @@ public final class NativeNumber extends ScriptObject {
         } else if (self != null && self == Global.instance().getNumberPrototype()) {
             return 0.0;
         } else {
-            typeError("not.a.number", ScriptRuntime.safeToString(self));
-            return Double.NaN;
+            throw typeError("not.a.number", ScriptRuntime.safeToString(self));
         }
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeObject.java b/nashorn/src/jdk/nashorn/internal/objects/NativeObject.java
index effc0f067bc..5162d89b391 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeObject.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeObject.java
@@ -331,8 +331,7 @@ public final class NativeObject {
                 throw new RuntimeException(t);
             }
 
-            typeError("not.a.function", "toString");
-            throw new AssertionError(); // never reached
+            throw typeError("not.a.function", "toString");
         }
 
         return ScriptRuntime.builtinObjectToString(self);
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java b/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java
index 6a9b9db1e2f..53eb285dd57 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java
@@ -224,7 +224,7 @@ public final class NativeRegExp extends ScriptObject {
                 if (!flagsDefined) {
                     return (NativeRegExp)regexp; // 15.10.3.1 - undefined flags and regexp as
                 }
-                typeError("regex.cant.supply.flags");
+                throw typeError("regex.cant.supply.flags");
             }
             patternString = JSType.toString(regexp);
         }
@@ -880,8 +880,7 @@ public final class NativeRegExp extends ScriptObject {
         } else if (self != null && self == Global.instance().getRegExpPrototype()) {
             return Global.instance().DEFAULT_REGEXP;
         } else {
-            typeError("not.a.regexp", ScriptRuntime.safeToString(self));
-            return null;
+            throw typeError("not.a.regexp", ScriptRuntime.safeToString(self));
         }
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeString.java b/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
index e4ba4b53d6d..946097dba54 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
@@ -342,7 +342,7 @@ public final class NativeString extends ScriptObject {
     private boolean checkDeleteIndex(final int index, final boolean strict) {
         if (isValid(index)) {
             if (strict) {
-                typeError("cant.delete.property", Integer.toString(index), ScriptRuntime.safeToString(this));
+                throw typeError("cant.delete.property", Integer.toString(index), ScriptRuntime.safeToString(this));
             }
             return true;
         }
@@ -1141,8 +1141,7 @@ public final class NativeString extends ScriptObject {
         } else if (self != null && self == Global.instance().getStringPrototype()) {
             return "";
         } else {
-            typeError("not.a.string", ScriptRuntime.safeToString(self));
-            return null;
+            throw typeError("not.a.string", ScriptRuntime.safeToString(self));
         }
     }
 
@@ -1156,8 +1155,7 @@ public final class NativeString extends ScriptObject {
         } else if (self != null && self == Global.instance().getStringPrototype()) {
             return "";
         } else {
-            typeError( "not.a.string", ScriptRuntime.safeToString(self));
-            return null;
+            throw typeError( "not.a.string", ScriptRuntime.safeToString(self));
         }
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/parser/AbstractParser.java b/nashorn/src/jdk/nashorn/internal/parser/AbstractParser.java
index 6d9826eda5b..2e9f273d2a9 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/AbstractParser.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/AbstractParser.java
@@ -214,9 +214,7 @@ public abstract class AbstractParser {
         final int lineNum   = source.getLine(position);
         final int columnNum = source.getColumn(position);
         final String formatted = ErrorManager.format(message, source, lineNum, columnNum, errorToken);
-        final ParserException exp = new ParserException(formatted, source, lineNum, columnNum, errorToken);
-        exp.setErrorType(errorType);
-        throw exp;
+        throw new ParserException(errorType, formatted, source, lineNum, columnNum, errorToken);
     }
 
     /**
@@ -239,9 +237,7 @@ public abstract class AbstractParser {
         final int position = Token.descPosition(token);
         final int column = position - linePosition;
         final String formatted = ErrorManager.format(message, source, line, column, token);
-        final ParserException exp = new ParserException(formatted, source, line, column, token);
-        exp.setErrorType(errorType);
-        throw exp;
+        throw new ParserException(errorType, formatted, source, line, column, token);
     }
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/parser/Lexer.java b/nashorn/src/jdk/nashorn/internal/parser/Lexer.java
index d7856d44447..0c2255d4564 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/Lexer.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/Lexer.java
@@ -45,6 +45,7 @@ import static jdk.nashorn.internal.parser.TokenType.XML;
 
 import jdk.nashorn.internal.runtime.ECMAErrors;
 import jdk.nashorn.internal.runtime.ErrorManager;
+import jdk.nashorn.internal.runtime.JSErrorType;
 import jdk.nashorn.internal.runtime.JSType;
 import jdk.nashorn.internal.runtime.ParserException;
 import jdk.nashorn.internal.runtime.Source;
@@ -1598,7 +1599,7 @@ public class Lexer extends Scanner {
         final int  lineNum   = source.getLine(pos);
         final int  columnNum = source.getColumn(pos);
         final String formatted = ErrorManager.format(message, source, lineNum, columnNum, token);
-        throw new ParserException(formatted, source, lineNum, columnNum, token);
+        throw new ParserException(JSErrorType.SYNTAX_ERROR, formatted, source, lineNum, columnNum, token);
     }
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Context.java b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
index cd17428aa2c..2d4b1648673 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/Context.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
@@ -671,9 +671,7 @@ public final class Context {
             return evaluateSource(source, scope, scope);
         }
 
-        typeError("cant.load.script", ScriptRuntime.safeToString(from));
-
-        return UNDEFINED;
+        throw typeError("cant.load.script", ScriptRuntime.safeToString(from));
     }
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ECMAErrors.java b/nashorn/src/jdk/nashorn/internal/runtime/ECMAErrors.java
index 9e5db1913f5..3c5c1fb6064 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ECMAErrors.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ECMAErrors.java
@@ -31,6 +31,9 @@ import java.text.MessageFormat;
 import java.util.Locale;
 import java.util.ResourceBundle;
 
+import jdk.nashorn.api.scripting.NashornException;
+import jdk.nashorn.internal.scripts.JS$;
+
 /**
  * Helper class to throw various standard "ECMA error" exceptions such as Error, ReferenceError, TypeError etc.
  */
@@ -49,36 +52,44 @@ public final class ECMAErrors {
         });
     }
 
+    /** We assume that compiler generates script classes into the known package. */
+    private static final String scriptPackage;
+    static {
+        String name = JS$.class.getName();
+        scriptPackage = name.substring(0, name.lastIndexOf('.'));
+    }
+
     private ECMAErrors() {
     }
 
-    private static void throwError(final Object thrown, final Throwable cause) {
-        throw new ECMAException(thrown, cause);
+    private static ECMAException error(final Object thrown, final Throwable cause) {
+        return new ECMAException(thrown, cause);
     }
 
      /**
      * Error dispatch mechanism.
-     * Throw a {@link ParserException} as the correct JavaScript error
+     * Create a {@link ParserException} as the correct JavaScript error
      *
      * @param e {@code ParserException} for error dispatcher
+     *
+     * @return the resulting {@link ECMAException}
      */
-    public static void throwAsEcmaException(final ParserException e) {
-        throwAsEcmaException(Context.getGlobalTrusted(), e);
+    public static ECMAException asEcmaException(final ParserException e) {
+        return asEcmaException(Context.getGlobalTrusted(), e);
     }
 
     /**
      * Error dispatch mechanism.
-     * Throw a {@link ParserException} as the correct JavaScript error
+     * Create a {@link ParserException} as the correct JavaScript error
      *
      * @param global global scope object
      * @param e {@code ParserException} for error dispatcher
+     *
+     * @return the resulting {@link ECMAException}
      */
-    public static void throwAsEcmaException(final ScriptObject global, final ParserException e) {
+    public static ECMAException asEcmaException(final ScriptObject global, final ParserException e) {
         final JSErrorType errorType = e.getErrorType();
-        if (errorType == null) {
-            // no errorType set, throw ParserException object 'as is'
-            throw e;
-        }
+        assert errorType != null : "error type for " + e + " was null";
 
         final GlobalObject globalObj = (GlobalObject)global;
         final String       msg    = e.getMessage();
@@ -86,256 +97,288 @@ public final class ECMAErrors {
         // translate to ECMAScript Error object using error type
         switch (errorType) {
         case ERROR:
-            throwError(globalObj.newError(msg), e);
-            break;
+            return error(globalObj.newError(msg), e);
         case EVAL_ERROR:
-            throwError(globalObj.newEvalError(msg), e);
-            break;
+            return error(globalObj.newEvalError(msg), e);
         case RANGE_ERROR:
-            throwError(globalObj.newRangeError(msg), e);
-            break;
+            return error(globalObj.newRangeError(msg), e);
         case REFERENCE_ERROR:
-            throwError(globalObj.newReferenceError(msg), e);
-            break;
+            return error(globalObj.newReferenceError(msg), e);
         case SYNTAX_ERROR:
-            throwError(globalObj.newSyntaxError(msg), e);
-            break;
+            return error(globalObj.newSyntaxError(msg), e);
         case TYPE_ERROR:
-            throwError(globalObj.newTypeError(msg), e);
-            break;
+            return error(globalObj.newTypeError(msg), e);
         case URI_ERROR:
-            throwError(globalObj.newURIError(msg), e);
-            break;
+            return error(globalObj.newURIError(msg), e);
         default:
-            break;
+            // should not happen - perhaps unknown error type?
+            throw new AssertionError(e.getMessage());
         }
-
-        // should not happen - perhaps unknown error type?
-        throw e;
     }
+
     /**
-     * Throw a syntax error (ECMA 15.11.6.4)
+     * Create a syntax error (ECMA 15.11.6.4)
      *
      * @param msgId   resource tag for error message
      * @param args    arguments to resource
+     *
+     * @return the resulting {@link ECMAException}
      */
-    public static void syntaxError(final String msgId, final String... args) {
-        syntaxError(Context.getGlobalTrusted(), msgId, args);
+    public static ECMAException syntaxError(final String msgId, final String... args) {
+        return syntaxError(Context.getGlobalTrusted(), msgId, args);
     }
 
     /**
-     * Throw a syntax error (ECMA 15.11.6.4)
+     * Create a syntax error (ECMA 15.11.6.4)
      *
      * @param global  global scope object
      * @param msgId   resource tag for error message
      * @param args    arguments to resource
+     *
+     * @return the resulting {@link ECMAException}
      */
-    public static void syntaxError(final ScriptObject global, final String msgId, final String... args) {
-        syntaxError(global, null, msgId, args);
+    public static ECMAException syntaxError(final ScriptObject global, final String msgId, final String... args) {
+        return syntaxError(global, null, msgId, args);
     }
 
     /**
-     * Throw a syntax error (ECMA 15.11.6.4)
+     * Create a syntax error (ECMA 15.11.6.4)
      *
      * @param cause   native Java {@code Throwable} that is the cause of error
      * @param msgId   resource tag for error message
      * @param args    arguments to resource
+     *
+     * @return the resulting {@link ECMAException}
      */
-    public static void syntaxError(final Throwable cause, final String msgId, final String... args) {
-        syntaxError(Context.getGlobalTrusted(), cause, msgId, args);
+    public static ECMAException syntaxError(final Throwable cause, final String msgId, final String... args) {
+        return syntaxError(Context.getGlobalTrusted(), cause, msgId, args);
     }
 
     /**
-     * Throw a syntax error (ECMA 15.11.6.4)
+     * Create a syntax error (ECMA 15.11.6.4)
      *
      * @param global  global scope object
      * @param cause   native Java {@code Throwable} that is the cause of error
      * @param msgId   resource tag for error message
      * @param args    arguments to resource
+     *
+     * @return the resulting {@link ECMAException}
      */
-    public static void syntaxError(final ScriptObject global, final Throwable cause, final String msgId, final String... args) {
+    public static ECMAException syntaxError(final ScriptObject global, final Throwable cause, final String msgId, final String... args) {
         final String msg = getMessage("syntax.error." + msgId, args);
-        throwError(((GlobalObject)global).newSyntaxError(msg), cause);
+        return error(((GlobalObject)global).newSyntaxError(msg), cause);
     }
 
     /**
-     * Throw a type error (ECMA 15.11.6.5)
+     * Create a type error (ECMA 15.11.6.5)
      *
      * @param msgId   resource tag for error message
      * @param args    arguments to resource
+     *
+     * @return the resulting {@link ECMAException}
      */
-    public static void typeError(final String msgId, final String... args) {
-        typeError(Context.getGlobalTrusted(), msgId, args);
+    public static ECMAException typeError(final String msgId, final String... args) {
+        return typeError(Context.getGlobalTrusted(), msgId, args);
     }
 
     /**
-     * Throw a type error (ECMA 15.11.6.5)
+     * Create a type error (ECMA 15.11.6.5)
      *
      * @param global  global scope object
      * @param msgId   resource tag for error message
      * @param args    arguments to resource
+     *
+     * @return the resulting {@link ECMAException}
      */
-    public static void typeError(final ScriptObject global, final String msgId, final String... args) {
-        typeError(global, null, msgId, args);
+    public static ECMAException typeError(final ScriptObject global, final String msgId, final String... args) {
+        return typeError(global, null, msgId, args);
     }
 
     /**
-     * Throw a type error (ECMA 15.11.6.5)
+     * Create a type error (ECMA 15.11.6.5)
      *
      * @param cause   native Java {@code Throwable} that is the cause of error
      * @param msgId   resource tag for error message
      * @param args    arguments to resource
+     *
+     * @return the resulting {@link ECMAException}
      */
-    public static void typeError(final Throwable cause, final String msgId, final String... args) {
-        typeError(Context.getGlobalTrusted(), cause, msgId, args);
+    public static ECMAException typeError(final Throwable cause, final String msgId, final String... args) {
+        return typeError(Context.getGlobalTrusted(), cause, msgId, args);
     }
 
     /**
-     * Throw a type error (ECMA 15.11.6.5)
+     * Create a type error (ECMA 15.11.6.5)
      *
      * @param global  global scope object
      * @param cause   native Java {@code Throwable} that is the cause of error
      * @param msgId   resource tag for error message
      * @param args    arguments to resource
+     *
+     * @return the resulting {@link ECMAException}
      */
-    public static void typeError(final ScriptObject global, final Throwable cause, final String msgId, final String... args) {
+    public static ECMAException typeError(final ScriptObject global, final Throwable cause, final String msgId, final String... args) {
         final String msg = getMessage("type.error." + msgId, args);
-        throwError(((GlobalObject)global).newTypeError(msg), cause);
+        return error(((GlobalObject)global).newTypeError(msg), cause);
     }
 
     /**
-     * Throw a range error (ECMA 15.11.6.2)
+     * Create a range error (ECMA 15.11.6.2)
      *
      * @param msgId   resource tag for error message
      * @param args    arguments to resource
+     *
+     * @return the resulting {@link ECMAException}
      */
-    public static void rangeError(final String msgId, final String... args) {
-        rangeError(Context.getGlobalTrusted(), msgId, args);
+    public static ECMAException rangeError(final String msgId, final String... args) {
+        return rangeError(Context.getGlobalTrusted(), msgId, args);
     }
 
     /**
-     * Throw a range error (ECMA 15.11.6.2)
+     * Create a range error (ECMA 15.11.6.2)
      *
      * @param global  global scope object
      * @param msgId   resource tag for error message
      * @param args    arguments to resource
+     *
+     * @return the resulting {@link ECMAException}
      */
-    public static void rangeError(final ScriptObject global, final String msgId, final String... args) {
-        rangeError(global, null, msgId, args);
+    public static ECMAException rangeError(final ScriptObject global, final String msgId, final String... args) {
+        return rangeError(global, null, msgId, args);
     }
 
     /**
-     * Throw a range error (ECMA 15.11.6.2)
+     * Create a range error (ECMA 15.11.6.2)
      *
      * @param cause   native Java {@code Throwable} that is the cause of error
      * @param msgId   resource tag for error message
      * @param args    arguments to resource
+     *
+     * @return the resulting {@link ECMAException}
      */
-    public static void rangeError(final Throwable cause, final String msgId, final String... args) {
-        rangeError(Context.getGlobalTrusted(), cause, msgId, args);
+    public static ECMAException rangeError(final Throwable cause, final String msgId, final String... args) {
+        return rangeError(Context.getGlobalTrusted(), cause, msgId, args);
     }
 
     /**
-     * Throw a range error (ECMA 15.11.6.2)
+     * Create a range error (ECMA 15.11.6.2)
      *
      * @param global  global scope object
      * @param cause   native Java {@code Throwable} that is the cause of error
      * @param msgId   resource tag for error message
      * @param args    arguments to resource
+     *
+     * @return the resulting {@link ECMAException}
      */
-    public static void rangeError(final ScriptObject global, final Throwable cause, final String msgId, final String... args) {
+    public static ECMAException rangeError(final ScriptObject global, final Throwable cause, final String msgId, final String... args) {
         final String msg = getMessage("range.error." + msgId, args);
-        throwError(((GlobalObject)global).newRangeError(msg), cause);
+        return error(((GlobalObject)global).newRangeError(msg), cause);
     }
 
     /**
-     * Throw a reference error (ECMA 15.11.6.3)
+     * Create a reference error (ECMA 15.11.6.3)
      *
      * @param msgId   resource tag for error message
      * @param args    arguments to resource
+     *
+     * @return the resulting {@link ECMAException}
      */
-    public static void referenceError(final String msgId, final String... args) {
-        referenceError(Context.getGlobalTrusted(), msgId, args);
+    public static ECMAException referenceError(final String msgId, final String... args) {
+        return referenceError(Context.getGlobalTrusted(), msgId, args);
     }
 
     /**
-     * Throw a reference error (ECMA 15.11.6.3)
+     * Create a reference error (ECMA 15.11.6.3)
      *
      * @param global  global scope object
      * @param msgId   resource tag for error message
      * @param args    arguments to resource
+     *
+     * @return the resulting {@link ECMAException}
      */
-    public static void referenceError(final ScriptObject global, final String msgId, final String... args) {
-        referenceError(global, null, msgId, args);
+    public static ECMAException referenceError(final ScriptObject global, final String msgId, final String... args) {
+        return referenceError(global, null, msgId, args);
     }
 
     /**
-     * Throw a reference error (ECMA 15.11.6.3)
+     * Create a reference error (ECMA 15.11.6.3)
      *
      * @param cause   native Java {@code Throwable} that is the cause of error
      * @param msgId   resource tag for error message
      * @param args    arguments to resource
+     *
+     * @return the resulting {@link ECMAException}
      */
-    public static void referenceError(final Throwable cause, final String msgId, final String... args) {
-        referenceError(Context.getGlobalTrusted(), cause, msgId, args);
+    public static ECMAException referenceError(final Throwable cause, final String msgId, final String... args) {
+        return referenceError(Context.getGlobalTrusted(), cause, msgId, args);
     }
 
     /**
-     * Throw a reference error (ECMA 15.11.6.3)
+     * Create a reference error (ECMA 15.11.6.3)
      *
      * @param global  global scope object
      * @param cause   native Java {@code Throwable} that is the cause of error
      * @param msgId   resource tag for error message
      * @param args    arguments to resource
+     *
+     * @return the resulting {@link ECMAException}
      */
-    public static void referenceError(final ScriptObject global, final Throwable cause, final String msgId, final String... args) {
+    public static ECMAException referenceError(final ScriptObject global, final Throwable cause, final String msgId, final String... args) {
         final String msg = getMessage("reference.error." + msgId, args);
-        throwError(((GlobalObject)global).newReferenceError(msg), cause);
+        return error(((GlobalObject)global).newReferenceError(msg), cause);
     }
 
     /**
-     * Throw a URI error (ECMA 15.11.6.6)
+     * Create a URI error (ECMA 15.11.6.6)
      *
      * @param msgId   resource tag for error message
      * @param args    arguments to resource
+     *
+     * @return the resulting {@link ECMAException}
      */
-    public static void uriError(final String msgId, final String... args) {
-        uriError(Context.getGlobalTrusted(), msgId, args);
+    public static ECMAException uriError(final String msgId, final String... args) {
+        return uriError(Context.getGlobalTrusted(), msgId, args);
     }
 
     /**
-     * Throw a URI error (ECMA 15.11.6.6)
+     * Create a URI error (ECMA 15.11.6.6)
      *
      * @param global  global scope object
      * @param msgId   resource tag for error message
      * @param args    arguments to resource
+     *
+     * @return the resulting {@link ECMAException}
      */
-    public static void uriError(final ScriptObject global, final String msgId, final String... args) {
-        uriError(global, null, msgId, args);
+    public static ECMAException uriError(final ScriptObject global, final String msgId, final String... args) {
+        return uriError(global, null, msgId, args);
     }
 
     /**
-     * Throw a URI error (ECMA 15.11.6.6)
+     * Create a URI error (ECMA 15.11.6.6)
      *
      * @param cause   native Java {@code Throwable} that is the cause of error
      * @param msgId   resource tag for error message
      * @param args    arguments to resource
+     *
+     * @return the resulting {@link ECMAException}
      */
-    public static void uriError(final Throwable cause, final String msgId, final String... args) {
-        uriError(Context.getGlobalTrusted(), cause, msgId, args);
+    public static ECMAException uriError(final Throwable cause, final String msgId, final String... args) {
+        return uriError(Context.getGlobalTrusted(), cause, msgId, args);
     }
 
     /**
-     * Throw a URI error (ECMA 15.11.6.6)
+     * Create a URI error (ECMA 15.11.6.6)
      *
      * @param global  global scope object
      * @param cause   native Java {@code Throwable} that is the cause of error
      * @param msgId   resource tag for error message
      * @param args    arguments to resource
+     *
+     * @return the resulting {@link ECMAException}
      */
-    public static void uriError(final ScriptObject global, final Throwable cause, final String msgId, final String... args) {
+    public static ECMAException uriError(final ScriptObject global, final Throwable cause, final String msgId, final String... args) {
         final String msg = getMessage("uri.error." + msgId, args);
-        throwError(((GlobalObject)global).newURIError(msg), cause);
+        return error(((GlobalObject)global).newURIError(msg), cause);
     }
 
     /**
@@ -356,4 +399,27 @@ public final class ECMAErrors {
         }
     }
 
+
+    /**
+     * Check if a stack trace element is in JavaScript
+     *
+     * @param frame frame
+     *
+     * @return true if frame is in the script
+     */
+    public static boolean isScriptFrame(final StackTraceElement frame) {
+        final String className = frame.getClassName();
+
+        // Look for script package in class name (into which compiler puts generated code)
+        if (className.startsWith(scriptPackage)) {
+            final String source = frame.getFileName();
+            /*
+             * Make sure that it is not some Java code that Nashorn has in that package!
+             * also, we don't want to report JavaScript code that lives in script engine implementation
+             * We want to report only user's own scripts and not any of our own scripts like "engine.js"
+             */
+            return source != null && !source.endsWith(".java") && !source.contains(NashornException.ENGINE_SCRIPT_SOURCE_NAME);
+        }
+        return false;
+    }
 }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ECMAException.java b/nashorn/src/jdk/nashorn/internal/runtime/ECMAException.java
index 7da66800cc6..a07fb580d69 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ECMAException.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ECMAException.java
@@ -33,7 +33,6 @@ import javax.script.ScriptException;
 import jdk.nashorn.api.scripting.NashornException;
 import jdk.nashorn.internal.codegen.CompilerConstants.Call;
 import jdk.nashorn.internal.codegen.CompilerConstants.FieldAccess;
-import jdk.nashorn.internal.scripts.JS$;
 
 /**
  * Exception used to implement ECMAScript "throw" from scripts. The actual thrown
@@ -54,13 +53,6 @@ public final class ECMAException extends NashornException {
 
     private static final String EXCEPTION_PROPERTY = "nashornException";
 
-    /** We assume that compiler generates script classes into the known package. */
-    private static final String scriptPackage;
-    static {
-        String name = JS$.class.getName();
-        scriptPackage = name.substring(0, name.lastIndexOf('.'));
-    }
-
     /** Object thrown. */
     public final Object thrown;
 
@@ -74,10 +66,7 @@ public final class ECMAException extends NashornException {
      * @param column    column number of throw
      */
     public ECMAException(final Object thrown, final String fileName, final int line, final int column) {
-        super(ScriptRuntime.safeToString(thrown), asThrowable(thrown));
-        setFileName(fileName);
-        setLineNumber(line);
-        setColumnNumber(column);
+        super(ScriptRuntime.safeToString(thrown), asThrowable(thrown), fileName, line, column);
         this.thrown = thrown;
         setExceptionToThrown();
     }
@@ -93,8 +82,6 @@ public final class ECMAException extends NashornException {
         super(ScriptRuntime.safeToString(thrown), cause);
         this.thrown = thrown;
         setExceptionToThrown();
-        // location is not directly available, get it from stack trace
-        setLocationFromStack();
     }
 
     /**
@@ -142,29 +129,6 @@ public final class ECMAException extends NashornException {
         return errObj.get(ECMAException.EXCEPTION_PROPERTY);
     }
 
-    /**
-     * Check if a stack trace element is in JavaScript
-     *
-     * @param frame frame
-     *
-     * @return true if frame is in the script
-     */
-    public static boolean isScriptFrame(final StackTraceElement frame) {
-        final String className = frame.getClassName();
-
-        // Look for script package in class name (into which compiler puts generated code)
-        if (className.startsWith(scriptPackage)) {
-            final String source = frame.getFileName();
-            /*
-             * Make sure that it is not some Java code that Nashorn has in that package!
-             * also, we don't want to report JavaScript code that lives in script engine implementation
-             * We want to report only user's own scripts and not any of our own scripts like "engine.js"
-             */
-            return source != null && !source.endsWith(".java") && !source.contains(ENGINE_SCRIPT_SOURCE_NAME);
-        }
-        return false;
-    }
-
     /**
      * Print the stack trace for a {@code ScriptObject} representing an error
      *
@@ -295,23 +259,4 @@ public final class ECMAException extends NashornException {
             }
         }
     }
-
-    private void setLocationFromStack() {
-        // This is not so pretty - but it gets the job done. Note that the stack
-        // trace has been already filled by "fillInStackTrace" call from Throwable
-        // constructor and so we don't pay additional cost for it.
-
-        // Find the first JavaScript frame by walking and set file, line from it
-        // Usually, we should be able to find it in just few frames depth.
-        for (final StackTraceElement ste : getStackTrace()) {
-            if (isScriptFrame(ste)) {
-                // Whatever here is compiled from JavaScript code
-                setFileName(ste.getFileName());
-                setLineNumber(ste.getLineNumber());
-                // Hard luck - no column number info
-                setColumnNumber(-1);
-                break;
-            }
-        }
-    }
 }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ErrorManager.java b/nashorn/src/jdk/nashorn/internal/runtime/ErrorManager.java
index 7fa637577dc..9a203819599 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ErrorManager.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ErrorManager.java
@@ -79,7 +79,7 @@ public class ErrorManager {
         }
 
         if (limit != 0 && count > limit) {
-            rangeError("too.many.errors", Integer.toString(limit));
+            throw rangeError("too.many.errors", Integer.toString(limit));
         }
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/JSONFunctions.java b/nashorn/src/jdk/nashorn/internal/runtime/JSONFunctions.java
index 4a2f73d55d1..675780b414d 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/JSONFunctions.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/JSONFunctions.java
@@ -79,8 +79,7 @@ public final class JSONFunctions {
         try {
             node = parser.parse();
         } catch (final ParserException e) {
-            ECMAErrors.syntaxError(e, "invalid.json", e.getMessage());
-            return ScriptRuntime.UNDEFINED;
+            throw ECMAErrors.syntaxError(e, "invalid.json", e.getMessage());
         }
 
         final ScriptObject global = Context.getGlobalTrusted();
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/JSType.java b/nashorn/src/jdk/nashorn/internal/runtime/JSType.java
index 06010b805b4..21977816aba 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/JSType.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/JSType.java
@@ -248,7 +248,7 @@ public enum JSType {
         final Object       result = sobj.getDefaultValue(hint);
 
         if (!isPrimitive(result)) {
-            typeError("bad.default.value", result.toString());
+            throw typeError("bad.default.value", result.toString());
         }
 
         return result;
@@ -823,7 +823,7 @@ public enum JSType {
      */
     public static Object toScriptObject(final ScriptObject global, final Object obj) {
         if (nullOrUndefined(obj)) {
-            typeError(global, "not.an.object", ScriptRuntime.safeToString(obj));
+            throw typeError(global, "not.an.object", ScriptRuntime.safeToString(obj));
         }
 
         if (obj instanceof ScriptObject) {
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ParserException.java b/nashorn/src/jdk/nashorn/internal/runtime/ParserException.java
index 9a7d16f842b..2424bc3f1be 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ParserException.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ParserException.java
@@ -34,11 +34,11 @@ import jdk.nashorn.internal.parser.Token;
 @SuppressWarnings("serial")
 public final class ParserException extends NashornException {
     // Source from which this ParserException originated
-    private Source source;
+    private final Source source;
     // token responsible for this exception
-    private long token;
+    private final long token;
     // if this is traslated as ECMA error, which type should be used?
-    private JSErrorType errorType;
+    private final JSErrorType errorType;
 
     /**
      * Constructor
@@ -46,29 +46,25 @@ public final class ParserException extends NashornException {
      * @param msg exception message for this parser error.
      */
     public ParserException(final String msg) {
-        this(msg, null, -1, -1, -1);
+        this(JSErrorType.SYNTAX_ERROR, msg, null, -1, -1, -1);
     }
 
     /**
      * Constructor
      *
-     * @param msg      exception message
-     * @param source   source from which this exception originates
-     * @param line     line number of exception
-     * @param column   column number of exception
-     * @param token    token from which this exception originates
+     * @param errorType error type
+     * @param msg       exception message
+     * @param source    source from which this exception originates
+     * @param line      line number of exception
+     * @param column    column number of exception
+     * @param token     token from which this exception originates
      *
      */
-    public ParserException(final String msg, final Source source, final int line, final int column, final long token) {
-        super(msg);
-        setSource(source);
-        if (source != null) {
-            setFileName(source.getName());
-        }
-        setLineNumber(line);
-        setColumnNumber(column);
-        setToken(token);
-        setErrorType(JSErrorType.SYNTAX_ERROR);
+    public ParserException(final JSErrorType errorType, final String msg, final Source source, final int line, final int column, final long token) {
+        super(msg, source != null ? source.getName() : null, line, column);
+        this.source = source;
+        this.token = token;
+        this.errorType = errorType;
     }
 
     /**
@@ -79,14 +75,6 @@ public final class ParserException extends NashornException {
         return source;
     }
 
-    /**
-     * Set the {@code Source} of this {@code ParserException}
-     * @param source script source
-     */
-    public void setSource(Source source) {
-        this.source = source;
-    }
-
     /**
      * Get the token responsible for this {@code ParserException}
      * @return token
@@ -95,14 +83,6 @@ public final class ParserException extends NashornException {
         return token;
     }
 
-    /**
-     * Set the errand token of this {@code ParserException}
-     * @param token token responsible for this ParserException
-     */
-    public void setToken(final long token) {
-        this.token = token;
-    }
-
     /**
      * Get token position within source where the error originated.
      * @return token position if available, else -1
@@ -119,19 +99,11 @@ public final class ParserException extends NashornException {
         return errorType;
     }
 
-    /**
-     * Set the {@code JSErrorType} of this {@code ParserException}
-     * @param errorType error type
-     */
-    public void setErrorType(final JSErrorType errorType) {
-        this.errorType = errorType;
-    }
-
     /**
      * Throw this {@code ParserException} as one of the 7 native JavaScript errors
      */
     public void throwAsEcmaException() {
-        ECMAErrors.throwAsEcmaException(this);
+        throw ECMAErrors.asEcmaException(this);
     }
 
     /**
@@ -139,7 +111,7 @@ public final class ParserException extends NashornException {
      * @param global global scope object
      */
     public void throwAsEcmaException(final ScriptObject global) {
-        ECMAErrors.throwAsEcmaException(global, this);
+        throw ECMAErrors.asEcmaException(global, this);
     }
 }
 
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
index c3901d29198..61f49e874fa 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
@@ -135,7 +135,7 @@ public abstract class ScriptFunction extends ScriptObject {
     public boolean isInstance(final ScriptObject instance) {
         final Object basePrototype = getTargetFunction().getPrototype();
         if (!(basePrototype instanceof ScriptObject)) {
-            typeError("prototype.not.an.object", ScriptRuntime.safeToString(getTargetFunction()), ScriptRuntime.safeToString(basePrototype));
+            throw typeError("prototype.not.an.object", ScriptRuntime.safeToString(getTargetFunction()), ScriptRuntime.safeToString(basePrototype));
         }
 
         for (ScriptObject proto = instance.getProto(); proto != null; proto = proto.getProto()) {
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunctionData.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunctionData.java
index 37e0246f486..047bf3f0617 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunctionData.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunctionData.java
@@ -290,7 +290,7 @@ public final class ScriptFunctionData {
 
     MethodHandle getBestConstructor(MethodType descType) {
         if (!isConstructor()) {
-            typeError("not.a.constructor", toSource());
+            throw typeError("not.a.constructor", toSource());
         }
         return SpecializedMethodChooser.candidateWithLowestWeight(descType, getConstructor(), getConstructSpecializations());
     }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
index 4fb295f6f9d..8c645d8704d 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
@@ -278,13 +278,13 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
         final PropertyDescriptor desc;
         if (isDataDescriptor()) {
             if (has(SET) || has(GET)) {
-                typeError((ScriptObject)global, "inconsistent.property.descriptor");
+                throw typeError((ScriptObject)global, "inconsistent.property.descriptor");
             }
 
             desc = global.newDataDescriptor(UNDEFINED, false, false, false);
         } else if (isAccessorDescriptor()) {
             if (has(VALUE) || has(WRITABLE)) {
-                typeError((ScriptObject)global, "inconsistent.property.descriptor");
+                throw typeError((ScriptObject)global, "inconsistent.property.descriptor");
             }
 
             desc = global.newAccessorDescriptor(UNDEFINED, UNDEFINED, false, false);
@@ -308,8 +308,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
             return ((ScriptObject)obj).toPropertyDescriptor();
         }
 
-        typeError(global, "not.an.object", ScriptRuntime.safeToString(obj));
-        return null;
+        throw typeError(global, "not.an.object", ScriptRuntime.safeToString(obj));
     }
 
     /**
@@ -401,7 +400,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
             }
             // new property added to non-extensible object
             if (reject) {
-                typeError(global, "object.non.extensible", name, ScriptRuntime.safeToString(this));
+                throw typeError(global, "object.non.extensible", name, ScriptRuntime.safeToString(this));
             }
             return false;
         }
@@ -424,7 +423,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
             if (newDesc.has(CONFIGURABLE) && newDesc.isConfigurable()) {
                 // not configurable can not be made configurable
                 if (reject) {
-                    typeError(global, "cant.redefine.property", name, ScriptRuntime.safeToString(this));
+                    throw typeError(global, "cant.redefine.property", name, ScriptRuntime.safeToString(this));
                 }
                 return false;
             }
@@ -433,7 +432,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
                 currentDesc.isEnumerable() != newDesc.isEnumerable()) {
                 // cannot make non-enumerable as enumerable or vice-versa
                 if (reject) {
-                    typeError(global, "cant.redefine.property", name, ScriptRuntime.safeToString(this));
+                    throw typeError(global, "cant.redefine.property", name, ScriptRuntime.safeToString(this));
                 }
                 return false;
             }
@@ -448,7 +447,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
                 if (newDesc.has(WRITABLE) && newDesc.isWritable() ||
                     newDesc.has(VALUE) && ! ScriptRuntime.sameValue(currentDesc.getValue(), newDesc.getValue())) {
                     if (reject) {
-                        typeError(global, "cant.redefine.property", name, ScriptRuntime.safeToString(this));
+                        throw typeError(global, "cant.redefine.property", name, ScriptRuntime.safeToString(this));
                     }
                     return false;
                 }
@@ -477,7 +476,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
                 if (newDesc.has(PropertyDescriptor.GET) && ! ScriptRuntime.sameValue(currentDesc.getGetter(), newDesc.getGetter()) ||
                     newDesc.has(PropertyDescriptor.SET) && ! ScriptRuntime.sameValue(currentDesc.getSetter(), newDesc.getSetter())) {
                     if (reject) {
-                        typeError(global, "cant.redefine.property", name, ScriptRuntime.safeToString(this));
+                        throw typeError(global, "cant.redefine.property", name, ScriptRuntime.safeToString(this));
                     }
                     return false;
                 }
@@ -492,7 +491,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
             if (! currentDesc.isConfigurable()) {
                 // not configurable can not be made configurable
                 if (reject) {
-                    typeError(global, "cant.redefine.property", name, ScriptRuntime.safeToString(this));
+                    throw typeError(global, "cant.redefine.property", name, ScriptRuntime.safeToString(this));
                 }
                 return false;
             }
@@ -1150,7 +1149,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
             if (newProtoObject instanceof ScriptObject) {
                 setProto((ScriptObject)newProtoObject);
             } else {
-                typeError(global, "cant.set.proto.to.non.object", ScriptRuntime.safeToString(this), ScriptRuntime.safeToString(newProto));
+                throw typeError(global, "cant.set.proto.to.non.object", ScriptRuntime.safeToString(this), ScriptRuntime.safeToString(newProto));
             }
         }
     }
@@ -1638,8 +1637,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
     }
 
     private GuardedInvocation notAFunction() {
-        typeError("not.a.function", ScriptRuntime.safeToString(this));
-        return null;
+        throw typeError("not.a.function", ScriptRuntime.safeToString(this));
     }
 
     /**
@@ -1815,7 +1813,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
     private GuardedInvocation createEmptySetMethod(final CallSiteDescriptor desc, String strictErrorMessage, boolean canBeFastScope) {
         final String name = desc.getNameToken(CallSiteDescriptor.NAME_OPERAND);
         if (NashornCallSiteDescriptor.isStrict(desc)) {
-               typeError(strictErrorMessage, name, ScriptRuntime.safeToString((this)));
+               throw typeError(strictErrorMessage, name, ScriptRuntime.safeToString((this)));
            }
            assert canBeFastScope || !NashornCallSiteDescriptor.isFastScope(desc);
            final PropertyMap myMap = getMap();
@@ -1842,8 +1840,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
     private boolean trySetEmbedOrSpill(final CallSiteDescriptor desc, final PropertyMap oldMap, final PropertyMap newMap, final Object value) {
         final boolean isStrict = NashornCallSiteDescriptor.isStrict(desc);
         if (!isExtensible() && isStrict) {
-            typeError("object.non.extensible", desc.getNameToken(2), ScriptRuntime.safeToString(this));
-            throw new AssertionError(); // never reached
+            throw typeError("object.non.extensible", desc.getNameToken(2), ScriptRuntime.safeToString(this));
         } else if (compareAndSetMap(oldMap, newMap)) {
             return true;
         } else {
@@ -1859,7 +1856,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
 
         if (!obj.isExtensible()) {
             if (isStrict) {
-                typeError("object.non.extensible", desc.getNameToken(2), ScriptRuntime.safeToString(obj));
+                throw typeError("object.non.extensible", desc.getNameToken(2), ScriptRuntime.safeToString(obj));
             }
         } else if (obj.compareAndSetMap(oldMap, newMap)) {
             obj.spill = new Object[SPILL_RATE];
@@ -1876,7 +1873,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
 
         if (!obj.isExtensible()) {
             if (isStrict) {
-                typeError("object.non.extensible", desc.getNameToken(2), ScriptRuntime.safeToString(obj));
+                throw typeError("object.non.extensible", desc.getNameToken(2), ScriptRuntime.safeToString(obj));
             }
         } else if (obj.compareAndSetMap(oldMap, newMap)) {
             final int oldLength = obj.spill.length;
@@ -1968,7 +1965,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
         }
 
         if (scopeAccess) {
-            referenceError("not.defined", name);
+            throw referenceError("not.defined", name);
         }
 
         return createEmptyGetter(desc, name);
@@ -2569,7 +2566,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
         if (longIndex >= oldLength) {
             if (!isExtensible()) {
                 if (strict) {
-                    typeError("object.non.extensible", JSType.toString(index), ScriptRuntime.safeToString(this));
+                    throw typeError("object.non.extensible", JSType.toString(index), ScriptRuntime.safeToString(this));
                 }
                 return;
             }
@@ -2618,7 +2615,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
         if (f != null) {
             if (!f.getProperty().isWritable()) {
                 if (strict) {
-                    typeError("property.not.writable", key, ScriptRuntime.safeToString(this));
+                    throw typeError("property.not.writable", key, ScriptRuntime.safeToString(this));
                 }
 
                 return;
@@ -2634,7 +2631,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
             }
         } else if (!isExtensible()) {
             if (strict) {
-                typeError("object.non.extensible", key, ScriptRuntime.safeToString(this));
+                throw typeError("object.non.extensible", key, ScriptRuntime.safeToString(this));
             }
         } else {
             spill(key, value);
@@ -3121,7 +3118,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
 
         if (!find.getProperty().isConfigurable()) {
             if (strict) {
-                typeError("cant.delete.property", propName, ScriptRuntime.safeToString(this));
+                throw typeError("cant.delete.property", propName, ScriptRuntime.safeToString(this));
             }
             return false;
         }
@@ -3291,7 +3288,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
                 throw new RuntimeException(t);
             }
         }  else if (name != null) {
-            typeError("property.has.no.setter", name, ScriptRuntime.safeToString(self));
+            throw typeError("property.has.no.setter", name, ScriptRuntime.safeToString(self));
         }
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java
index 6ec6f86c668..2528dc5a17a 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java
@@ -426,9 +426,9 @@ public final class ScriptRuntime {
     public static ScriptObject openWith(final ScriptObject scope, final Object expression) {
         final ScriptObject global = Context.getGlobalTrusted();
         if (expression == UNDEFINED) {
-            typeError(global, "cant.apply.with.to.undefined");
+            throw typeError(global, "cant.apply.with.to.undefined");
         } else if (expression == null) {
-            typeError(global, "cant.apply.with.to.null");
+            throw typeError(global, "cant.apply.with.to.null");
         }
 
         final ScriptObject withObject = new WithObject(scope, JSType.toScriptObject(global, expression));
@@ -527,7 +527,7 @@ public final class ScriptRuntime {
             } else if (object instanceof Undefined) {
                 obj = ((Undefined)obj).get(property);
             } else if (object == null) {
-                typeError("cant.get.property", safeToString(property), "null");
+                throw typeError("cant.get.property", safeToString(property), "null");
             } else if (JSType.isPrimitive(obj)) {
                 obj = ((ScriptObject)JSType.toScriptObject(obj)).get(property);
             } else {
@@ -565,8 +565,7 @@ public final class ScriptRuntime {
      * @return undefined
      */
     public static Object REFERENCE_ERROR(final Object lhs, final Object rhs, final Object msg) {
-        referenceError("cant.be.used.as.lhs", Objects.toString(msg));
-        return UNDEFINED;
+        throw referenceError("cant.be.used.as.lhs", Objects.toString(msg));
     }
 
     /**
@@ -588,7 +587,7 @@ public final class ScriptRuntime {
         }
 
         if (obj == null) {
-            typeError("cant.delete.property", safeToString(property), "null");
+            throw typeError("cant.delete.property", safeToString(property), "null");
         }
 
         if (JSType.isPrimitive(obj)) {
@@ -612,7 +611,7 @@ public final class ScriptRuntime {
      */
     public static boolean FAIL_DELETE(final Object property, final Object strict) {
         if (Boolean.TRUE.equals(strict)) {
-            syntaxError("strict.cant.delete", safeToString(property));
+            throw syntaxError("strict.cant.delete", safeToString(property));
         }
         return false;
     }
@@ -789,9 +788,7 @@ public final class ScriptRuntime {
             return false;
         }
 
-        typeError("in.with.non.object", rvalType.toString().toLowerCase());
-
-        return false;
+        throw typeError("in.with.non.object", rvalType.toString().toLowerCase());
     }
 
     /**
@@ -814,9 +811,7 @@ public final class ScriptRuntime {
             return ((StaticClass)clazz).getRepresentedClass().isInstance(obj);
         }
 
-        typeError("instanceof.on.non.object");
-
-        return false;
+        throw typeError("instanceof.on.non.object");
     }
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java
index d9f38c20625..4bf4859e0cf 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java
@@ -109,8 +109,7 @@ public final class ScriptingFunctions {
         }
 
         if (f == null || !f.isFile()) {
-            typeError("not.a.file", ScriptRuntime.safeToString(file));
-            return UNDEFINED;
+            throw typeError("not.a.file", ScriptRuntime.safeToString(file));
         }
 
         return new String(Source.readFully(f));
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/SetMethodCreator.java b/nashorn/src/jdk/nashorn/internal/runtime/SetMethodCreator.java
index 6cafe00b74a..4790e3ef4d7 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/SetMethodCreator.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/SetMethodCreator.java
@@ -139,7 +139,7 @@ final class SetMethodCreator {
         // In strict mode, assignment can not create a new variable.
         // See also ECMA Annex C item 4. ReferenceError is thrown.
         if (NashornCallSiteDescriptor.isScope(desc) && NashornCallSiteDescriptor.isStrict(desc)) {
-            referenceError("not.defined", getName());
+            throw referenceError("not.defined", getName());
         }
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/URIUtils.java b/nashorn/src/jdk/nashorn/internal/runtime/URIUtils.java
index 7ecd1023fa5..448d72c364f 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/URIUtils.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/URIUtils.java
@@ -93,8 +93,7 @@ public final class URIUtils {
             try {
                 sb.append(toHexEscape(V));
             } catch (final Exception e) {
-                uriError( e, "bad.uri", string, Integer.toString(k));
-                return null;
+                throw uriError(e, "bad.uri", string, Integer.toString(k));
             }
         }
 
@@ -179,8 +178,7 @@ public final class URIUtils {
                 try {
                     V = ucs4Char(bbuf);
                 } catch (final Exception e) {
-                    uriError(e, "bad.uri", string, Integer.toString(k));
-                    return null;
+                    throw uriError(e, "bad.uri", string, Integer.toString(k));
                 }
                 if (V < 0x10000) {
                     C = (char) V;
@@ -269,8 +267,7 @@ public final class URIUtils {
     }
 
     private static String error(final String string, final int index) {
-        uriError("bad.uri", string, Integer.toString(index));
-        return null;
+        throw uriError("bad.uri", string, Integer.toString(index));
     }
 
     // 'uriEscaped' except for alphanumeric chars
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Undefined.java b/nashorn/src/jdk/nashorn/internal/runtime/Undefined.java
index 6d9c69c156f..b9286cbeaff 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/Undefined.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Undefined.java
@@ -97,30 +97,26 @@ public final class Undefined extends DefaultPropertyAccess {
         switch (operator) {
         case "new":
         case "call":
-            lookupTypeError("cant.call.undefined", desc);
-            break;
+            throw lookupTypeError("cant.call.undefined", desc);
         case "callMethod":
-            lookupTypeError("cant.read.property.of.undefined", desc);
+            throw lookupTypeError("cant.read.property.of.undefined", desc);
         // NOTE: we support getElem and setItem as JavaScript doesn't distinguish items from properties. Nashorn itself
         // emits "dyn:getProp:identifier" for "<expr>.<identifier>" and "dyn:getElem" for "<expr>[<expr>]", but we are
         // more flexible here and dispatch not on operation name (getProp vs. getElem), but rather on whether the
         // operation has an associated name or not.
-            break;
         case "getProp":
         case "getElem":
         case "getMethod":
             if (desc.getNameTokenCount() < 3) {
                 return findGetIndexMethod(desc);
             }
-            lookupTypeError("cant.read.property.of.undefined", desc);
-            break;
+            throw lookupTypeError("cant.read.property.of.undefined", desc);
         case "setProp":
         case "setElem":
             if (desc.getNameTokenCount() < 3) {
                 return findSetIndexMethod(desc);
             }
-            lookupTypeError("cant.set.property.of.undefined", desc);
-            break;
+            throw lookupTypeError("cant.set.property.of.undefined", desc);
         default:
             break;
         }
@@ -128,8 +124,8 @@ public final class Undefined extends DefaultPropertyAccess {
         return null;
     }
 
-    private static void lookupTypeError(final String msg, final CallSiteDescriptor desc) {
-        typeError(msg, desc.getNameTokenCount() > 2 ? desc.getNameToken(2) : null);
+    private static ECMAException lookupTypeError(final String msg, final CallSiteDescriptor desc) {
+        return typeError(msg, desc.getNameTokenCount() > 2 ? desc.getNameToken(2) : null);
     }
 
     /**
@@ -174,19 +170,17 @@ public final class Undefined extends DefaultPropertyAccess {
 
     @Override
     public Object get(final Object key) {
-        typeError("cant.read.property.of.undefined", ScriptRuntime.safeToString(key));
-        return ScriptRuntime.UNDEFINED;
+        throw typeError("cant.read.property.of.undefined", ScriptRuntime.safeToString(key));
     }
 
     @Override
     public void set(final Object key, final Object value, final boolean strict) {
-        typeError("cant.set.property.of.undefined", ScriptRuntime.safeToString(key));
+        throw typeError("cant.set.property.of.undefined", ScriptRuntime.safeToString(key));
     }
 
     @Override
     public boolean delete(final Object key, final boolean strict) {
-        typeError("cant.delete.property.of.undefined", ScriptRuntime.safeToString(key));
-        return false;
+        throw typeError("cant.delete.property.of.undefined", ScriptRuntime.safeToString(key));
     }
 
     @Override
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/FrozenArrayFilter.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/FrozenArrayFilter.java
index 4cd6a1f0961..07a53fd7cee 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/FrozenArrayFilter.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/FrozenArrayFilter.java
@@ -46,7 +46,7 @@ final class FrozenArrayFilter extends SealedArrayFilter {
     @Override
     public ArrayData set(final int index, final int value, final boolean strict) {
         if (strict) {
-            typeError("cant.set.property", Integer.toString(index), "frozen array");
+            throw typeError("cant.set.property", Integer.toString(index), "frozen array");
         }
         return this;
     }
@@ -54,7 +54,7 @@ final class FrozenArrayFilter extends SealedArrayFilter {
     @Override
     public ArrayData set(final int index, final long value, final boolean strict) {
         if (strict) {
-            typeError("cant.set.property", Integer.toString(index), "frozen array");
+            throw typeError("cant.set.property", Integer.toString(index), "frozen array");
         }
         return this;
     }
@@ -62,7 +62,7 @@ final class FrozenArrayFilter extends SealedArrayFilter {
     @Override
     public ArrayData set(final int index, final double value, final boolean strict) {
         if (strict) {
-            typeError("cant.set.property", Integer.toString(index), "frozen array");
+            throw typeError("cant.set.property", Integer.toString(index), "frozen array");
         }
         return this;
     }
@@ -70,7 +70,7 @@ final class FrozenArrayFilter extends SealedArrayFilter {
     @Override
     public ArrayData set(final int index, final Object value, final boolean strict) {
         if (strict) {
-            typeError("cant.set.property", Integer.toString(index), "frozen array");
+            throw typeError("cant.set.property", Integer.toString(index), "frozen array");
         }
         return this;
     }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/IteratorAction.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/IteratorAction.java
index 205e20fd45c..9fb4eed895e 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/IteratorAction.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/IteratorAction.java
@@ -97,8 +97,7 @@ public abstract class IteratorAction<T> {
      */
     public final T apply() {
         if (!(callbackfn instanceof ScriptFunction)) {
-            typeError("not.a.function", ScriptRuntime.safeToString(callbackfn));
-            return result;
+            throw typeError("not.a.function", ScriptRuntime.safeToString(callbackfn));
         }
         final ScriptFunction func = ((ScriptFunction)callbackfn);
         // for non-strict callback, need to translate undefined thisArg to be global object
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/arrays/SealedArrayFilter.java b/nashorn/src/jdk/nashorn/internal/runtime/arrays/SealedArrayFilter.java
index 5ade11349bd..7cf7321bf72 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/arrays/SealedArrayFilter.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/arrays/SealedArrayFilter.java
@@ -46,7 +46,7 @@ class SealedArrayFilter extends ArrayFilter {
     @Override
     public boolean canDelete(final int index, final boolean strict) {
         if (strict) {
-            typeError("cant.delete.property", Integer.toString(index), "sealed array");
+            throw typeError("cant.delete.property", Integer.toString(index), "sealed array");
         }
         return false;
     }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
index c8189d7dd64..190ada59d82 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
@@ -705,8 +705,7 @@ public final class JavaAdapterFactory {
      */
     public static MethodHandle getHandle(final Object obj, final String name, final MethodType type, final boolean varArg) {
         if (! (obj instanceof ScriptObject)) {
-            typeError("not.an.object", ScriptRuntime.safeToString(obj));
-            throw new AssertionError();
+            throw typeError("not.an.object", ScriptRuntime.safeToString(obj));
         }
 
         final ScriptObject sobj = (ScriptObject)obj;
@@ -721,8 +720,7 @@ public final class JavaAdapterFactory {
         } else if(fnObj == null || fnObj instanceof Undefined) {
             return null;
         } else {
-            typeError("not.a.function", name);
-            throw new AssertionError();
+            throw typeError("not.a.function", name);
         }
     }
 
@@ -1093,7 +1091,7 @@ public final class JavaAdapterFactory {
 
         void typeError() {
             assert adaptationOutcome != AdaptationOutcome.SUCCESS;
-            ECMAErrors.typeError("extend." + adaptationOutcome, classList);
+            throw ECMAErrors.typeError("extend." + adaptationOutcome, classList);
         }
     }
 
@@ -1236,8 +1234,7 @@ public final class JavaAdapterFactory {
         while(it.hasNext()) {
             b.append(", ").append(it.next().clazz.getCanonicalName());
         }
-        typeError("extend.ambiguous.defining.class", b.toString());
-        throw new AssertionError(); // never reached
+        throw typeError("extend.ambiguous.defining.class", b.toString());
     }
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java
index 00125e490d2..a8e14a1689b 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java
@@ -109,7 +109,7 @@ public class JavaArgumentConverters {
                 return Character.valueOf((char) ival);
             }
 
-            typeError("cant.convert.number.to.char");
+            throw typeError("cant.convert.number.to.char");
         }
 
         final String s = toString(o);
@@ -118,7 +118,7 @@ public class JavaArgumentConverters {
         }
 
         if (s.length() != 1) {
-            typeError("cant.convert.string.to.char");
+            throw typeError("cant.convert.string.to.char");
         }
 
         return s.charAt(0);
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/Lookup.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/Lookup.java
index c47a0f7984c..6a95a3c4422 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/Lookup.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/Lookup.java
@@ -111,8 +111,7 @@ public final class Lookup {
      * @return undefined (but throws error before return point)
      */
     public static Object typeErrorThrowerGetter(final Object self) {
-        typeError("strict.getter.setter.poison", ScriptRuntime.safeToString(self));
-        return UNDEFINED;
+        throw typeError("strict.getter.setter.poison", ScriptRuntime.safeToString(self));
     }
 
     /**
@@ -122,7 +121,7 @@ public final class Lookup {
      * @param value (ignored)
      */
     public static void typeErrorThrowerSetter(final Object self, final Object value) {
-        typeError("strict.getter.setter.poison", ScriptRuntime.safeToString(self));
+        throw typeError("strict.getter.setter.poison", ScriptRuntime.safeToString(self));
     }
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java
index ba99e1361b5..1ab9c42cc81 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java
@@ -80,22 +80,17 @@ class NashornBottomLinker implements GuardingDynamicLinker {
         switch (operator) {
         case "new":
             if(BeansLinker.isDynamicMethod(self)) {
-                typeError("method.not.constructor", ScriptRuntime.safeToString(self));
-            } else {
-                typeError("not.a.function", ScriptRuntime.safeToString(self));
+                throw typeError("method.not.constructor", ScriptRuntime.safeToString(self));
             }
-            break;
+            throw typeError("not.a.function", ScriptRuntime.safeToString(self));
         case "call":
             if(BeansLinker.isDynamicMethod(self)) {
-                typeError("no.method.matches.args", ScriptRuntime.safeToString(self));
-            } else {
-                typeError("not.a.function", ScriptRuntime.safeToString(self));
+                throw typeError("no.method.matches.args", ScriptRuntime.safeToString(self));
             }
-            break;
+            throw typeError("not.a.function", ScriptRuntime.safeToString(self));
         case "callMethod":
         case "getMethod":
-            typeError("no.such.function", getArgument(linkRequest), ScriptRuntime.safeToString(self));
-            break;
+            throw typeError("no.such.function", getArgument(linkRequest), ScriptRuntime.safeToString(self));
         case "getProp":
         case "getElem":
             if (desc.getOperand() != null) {
@@ -130,20 +125,16 @@ class NashornBottomLinker implements GuardingDynamicLinker {
         switch (operator) {
         case "new":
         case "call":
-            typeError("not.a.function", "null");
-            break;
+            throw typeError("not.a.function", "null");
         case "callMethod":
         case "getMethod":
-            typeError("no.such.function", getArgument(linkRequest), "null");
-            break;
+            throw typeError("no.such.function", getArgument(linkRequest), "null");
         case "getProp":
         case "getElem":
-            typeError("cant.get.property", getArgument(linkRequest), "null");
-            break;
+            throw typeError("cant.get.property", getArgument(linkRequest), "null");
         case "setProp":
         case "setElem":
-            typeError("cant.set.property", getArgument(linkRequest), "null");
-            break;
+            throw typeError("cant.set.property", getArgument(linkRequest), "null");
         default:
             break;
         }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java
index de3a1f16a86..d912b586604 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java
@@ -93,7 +93,7 @@ class NashornStaticClassLinker implements TypeBasedGuardingDynamicLinker {
 
     private static GuardedInvocation checkNullConstructor(final GuardedInvocation ctorInvocation, final Class<?> receiverClass) {
         if(ctorInvocation == null) {
-            ECMAErrors.typeError("no.constructor.matches.args", receiverClass.getName());
+            throw ECMAErrors.typeError("no.constructor.matches.args", receiverClass.getName());
         }
         return ctorInvocation;
     }

From ba7a50ebcfccfe0e03c058a8f66a622403664b80 Mon Sep 17 00:00:00 2001
From: Alan Bateman <alanb@openjdk.org>
Date: Fri, 22 Feb 2013 14:04:06 +0000
Subject: [PATCH 202/311] 8008290: (profiles) Startup regression due to
 additional checking of JAR file manifests

Reviewed-by: lancea, chegar, iris, mchung, sherman
---
 .../share/classes/java/util/jar/JarFile.java  | 147 ++++++++++++------
 .../java/util/jar/JavaUtilJarAccessImpl.java  |   4 +
 .../classes/sun/misc/JavaUtilJarAccess.java   |   1 +
 .../share/classes/sun/misc/URLClassPath.java  |   6 +-
 4 files changed, 105 insertions(+), 53 deletions(-)

diff --git a/jdk/src/share/classes/java/util/jar/JarFile.java b/jdk/src/share/classes/java/util/jar/JarFile.java
index 513d509e2f8..a225d95fce7 100644
--- a/jdk/src/share/classes/java/util/jar/JarFile.java
+++ b/jdk/src/share/classes/java/util/jar/JarFile.java
@@ -63,8 +63,13 @@ class JarFile extends ZipFile {
     private JarVerifier jv;
     private boolean jvInitialized;
     private boolean verify;
-    private boolean computedHasClassPathAttribute;
+
+    // indicates if Class-Path attribute present (only valid if hasCheckedSpecialAttributes true)
     private boolean hasClassPathAttribute;
+    // indicates if Profile attribute present (only valid if hasCheckedSpecialAttributes true)
+    private boolean hasProfileAttribute;
+    // true if manifest checked for special attributes
+    private volatile boolean hasCheckedSpecialAttributes;
 
     // Set up JavaUtilJarAccess in SharedSecrets
     static {
@@ -421,27 +426,45 @@ class JarFile extends ZipFile {
             jv);
     }
 
-    // Statics for hand-coded Boyer-Moore search in hasClassPathAttribute()
+    // Statics for hand-coded Boyer-Moore search
+    private static final char[] CLASSPATH_CHARS = {'c','l','a','s','s','-','p','a','t','h'};
+    private static final char[] PROFILE_CHARS = { 'p', 'r', 'o', 'f', 'i', 'l', 'e' };
     // The bad character shift for "class-path"
-    private static int[] lastOcc;
+    private static final int[] CLASSPATH_LASTOCC;
     // The good suffix shift for "class-path"
-    private static int[] optoSft;
-    // Initialize the shift arrays to search for "class-path"
-    private static char[] src = {'c','l','a','s','s','-','p','a','t','h'};
+    private static final int[] CLASSPATH_OPTOSFT;
+    // The bad character shift for "profile"
+    private static final int[] PROFILE_LASTOCC;
+    // The good suffix shift for "profile"
+    private static final int[] PROFILE_OPTOSFT;
+
     static {
-        lastOcc = new int[128];
-        optoSft = new int[10];
-        lastOcc[(int)'c']=1;
-        lastOcc[(int)'l']=2;
-        lastOcc[(int)'s']=5;
-        lastOcc[(int)'-']=6;
-        lastOcc[(int)'p']=7;
-        lastOcc[(int)'a']=8;
-        lastOcc[(int)'t']=9;
-        lastOcc[(int)'h']=10;
+        CLASSPATH_LASTOCC = new int[128];
+        CLASSPATH_OPTOSFT = new int[10];
+        CLASSPATH_LASTOCC[(int)'c'] = 1;
+        CLASSPATH_LASTOCC[(int)'l'] = 2;
+        CLASSPATH_LASTOCC[(int)'s'] = 5;
+        CLASSPATH_LASTOCC[(int)'-'] = 6;
+        CLASSPATH_LASTOCC[(int)'p'] = 7;
+        CLASSPATH_LASTOCC[(int)'a'] = 8;
+        CLASSPATH_LASTOCC[(int)'t'] = 9;
+        CLASSPATH_LASTOCC[(int)'h'] = 10;
         for (int i=0; i<9; i++)
-            optoSft[i]=10;
-        optoSft[9]=1;
+            CLASSPATH_OPTOSFT[i] = 10;
+        CLASSPATH_OPTOSFT[9]=1;
+
+        PROFILE_LASTOCC = new int[128];
+        PROFILE_OPTOSFT = new int[7];
+        PROFILE_LASTOCC[(int)'p'] = 1;
+        PROFILE_LASTOCC[(int)'r'] = 2;
+        PROFILE_LASTOCC[(int)'o'] = 3;
+        PROFILE_LASTOCC[(int)'f'] = 4;
+        PROFILE_LASTOCC[(int)'i'] = 5;
+        PROFILE_LASTOCC[(int)'l'] = 6;
+        PROFILE_LASTOCC[(int)'e'] = 7;
+        for (int i=0; i<6; i++)
+            PROFILE_OPTOSFT[i] = 7;
+        PROFILE_OPTOSFT[6] = 1;
     }
 
     private JarEntry getManEntry() {
@@ -466,17 +489,55 @@ class JarFile extends ZipFile {
         return manEntry;
     }
 
-    // Returns true iff this jar file has a manifest with a class path
-    // attribute. Returns false if there is no manifest or the manifest
-    // does not contain a "Class-Path" attribute. Currently exported to
-    // core libraries via sun.misc.SharedSecrets.
+   /**
+    * Returns {@code true} iff this JAR file has a manifest with the
+    * Class-Path attribute
+    */
     boolean hasClassPathAttribute() throws IOException {
-        if (computedHasClassPathAttribute) {
-            return hasClassPathAttribute;
-        }
+        checkForSpecialAttributes();
+        return hasClassPathAttribute;
+    }
 
-        hasClassPathAttribute = false;
-        if (!isKnownToNotHaveClassPathAttribute()) {
+    /**
+     * Returns {@code true} iff this JAR file has a manifest with the
+     * Profile attribute
+     */
+    boolean hasProfileAttribute() throws IOException {
+        checkForSpecialAttributes();
+        return hasProfileAttribute;
+    }
+
+    /**
+     * Returns true if the pattern {@code src} is found in {@code b}.
+     * The {@code lastOcc} and {@code optoSft} arrays are the precomputed
+     * bad character and good suffix shifts.
+     */
+    private boolean match(char[] src, byte[] b, int[] lastOcc, int[] optoSft) {
+        int len = src.length;
+        int last = b.length - len;
+        int i = 0;
+        next:
+        while (i<=last) {
+            for (int j=(len-1); j>=0; j--) {
+                char c = (char) b[i+j];
+                c = (((c-'A')|('Z'-c)) >= 0) ? (char)(c + 32) : c;
+                if (c != src[j]) {
+                    i += Math.max(j + 1 - lastOcc[c&0x7F], optoSft[j]);
+                    continue next;
+                 }
+            }
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * On first invocation, check if the JAR file has the Class-Path
+     * and/or Profile attributes. A no-op on subsequent calls.
+     */
+    private void checkForSpecialAttributes() throws IOException {
+        if (hasCheckedSpecialAttributes) return;
+        if (!isKnownNotToHaveSpecialAttributes()) {
             JarEntry manEntry = getManEntry();
             if (manEntry != null) {
                 byte[] b = new byte[(int)manEntry.getSize()];
@@ -484,31 +545,18 @@ class JarFile extends ZipFile {
                          super.getInputStream(manEntry))) {
                     dis.readFully(b, 0, b.length);
                 }
-
-                int last = b.length - src.length;
-                int i = 0;
-                next:
-                while (i<=last) {
-                    for (int j=9; j>=0; j--) {
-                        char c = (char) b[i+j];
-                        c = (((c-'A')|('Z'-c)) >= 0) ? (char)(c + 32) : c;
-                        if (c != src[j]) {
-                            i += Math.max(j + 1 - lastOcc[c&0x7F], optoSft[j]);
-                            continue next;
-                        }
-                    }
+                if (match(CLASSPATH_CHARS, b, CLASSPATH_LASTOCC, CLASSPATH_OPTOSFT))
                     hasClassPathAttribute = true;
-                    break;
-                }
+                if (match(PROFILE_CHARS, b, PROFILE_LASTOCC, PROFILE_OPTOSFT))
+                    hasProfileAttribute = true;
             }
         }
-        computedHasClassPathAttribute = true;
-        return hasClassPathAttribute;
+        hasCheckedSpecialAttributes = true;
     }
 
     private static String javaHome;
-    private static String[] jarNames;
-    private boolean isKnownToNotHaveClassPathAttribute() {
+    private static volatile String[] jarNames;
+    private boolean isKnownNotToHaveSpecialAttributes() {
         // Optimize away even scanning of manifest for jar files we
         // deliver which don't have a class-path attribute. If one of
         // these jars is changed to include such an attribute this code
@@ -518,19 +566,20 @@ class JarFile extends ZipFile {
                 new GetPropertyAction("java.home"));
         }
         if (jarNames == null) {
-            String[] names = new String[10];
+            String[] names = new String[11];
             String fileSep = File.separator;
             int i = 0;
             names[i++] = fileSep + "rt.jar";
-            names[i++] = fileSep + "sunrsasign.jar";
             names[i++] = fileSep + "jsse.jar";
             names[i++] = fileSep + "jce.jar";
             names[i++] = fileSep + "charsets.jar";
             names[i++] = fileSep + "dnsns.jar";
-            names[i++] = fileSep + "ldapsec.jar";
+            names[i++] = fileSep + "zipfs.jar";
             names[i++] = fileSep + "localedata.jar";
+            names[i++] = fileSep = "cldrdata.jar";
             names[i++] = fileSep + "sunjce_provider.jar";
             names[i++] = fileSep + "sunpkcs11.jar";
+            names[i++] = fileSep + "sunec.jar";
             jarNames = names;
         }
 
diff --git a/jdk/src/share/classes/java/util/jar/JavaUtilJarAccessImpl.java b/jdk/src/share/classes/java/util/jar/JavaUtilJarAccessImpl.java
index 9541a5a45f3..86a7ec5d2c6 100644
--- a/jdk/src/share/classes/java/util/jar/JavaUtilJarAccessImpl.java
+++ b/jdk/src/share/classes/java/util/jar/JavaUtilJarAccessImpl.java
@@ -37,6 +37,10 @@ class JavaUtilJarAccessImpl implements JavaUtilJarAccess {
         return jar.hasClassPathAttribute();
     }
 
+    public boolean jarFileHasProfileAttribute(JarFile jar) throws IOException {
+        return jar.hasProfileAttribute();
+    }
+
     public CodeSource[] getCodeSources(JarFile jar, URL url) {
         return jar.getCodeSources(url);
     }
diff --git a/jdk/src/share/classes/sun/misc/JavaUtilJarAccess.java b/jdk/src/share/classes/sun/misc/JavaUtilJarAccess.java
index 81654824c3a..9b09cd23b1a 100644
--- a/jdk/src/share/classes/sun/misc/JavaUtilJarAccess.java
+++ b/jdk/src/share/classes/sun/misc/JavaUtilJarAccess.java
@@ -35,6 +35,7 @@ import java.util.jar.JarFile;
 
 public interface JavaUtilJarAccess {
     public boolean jarFileHasClassPathAttribute(JarFile jar) throws IOException;
+    public boolean jarFileHasProfileAttribute(JarFile jar) throws IOException;
     public CodeSource[] getCodeSources(JarFile jar, URL url);
     public CodeSource getCodeSource(JarFile jar, URL url, String name);
     public Enumeration<String> entryNames(JarFile jar, CodeSource[] cs);
diff --git a/jdk/src/share/classes/sun/misc/URLClassPath.java b/jdk/src/share/classes/sun/misc/URLClassPath.java
index b8036ab3864..068bd72897c 100644
--- a/jdk/src/share/classes/sun/misc/URLClassPath.java
+++ b/jdk/src/share/classes/sun/misc/URLClassPath.java
@@ -808,9 +808,6 @@ public class URLClassPath {
         /**
          * If the Profile attribute is present then this method checks that the runtime
          * supports that profile.
-         *
-         * ## Add a fast path like Class-Path to avoid reading the manifest when the attribute
-         *    is not present.
          */
         void checkProfileAttribute() throws IOException {
             Manifest man = jar.getManifest();
@@ -998,7 +995,8 @@ public class URLClassPath {
             parseExtensionsDependencies();
 
             // check Profile attribute if present
-            if (!profileCheckSuppressedByLauncher) {
+            if (!profileCheckSuppressedByLauncher &&
+                    SharedSecrets.javaUtilJarAccess().jarFileHasProfileAttribute(jar)) {
                 checkProfileAttribute();
             }
 

From 36b43451a79f1b49e937028e3ecc880567a706f4 Mon Sep 17 00:00:00 2001
From: Lance Andersen <lancea@openjdk.org>
Date: Fri, 22 Feb 2013 09:29:50 -0500
Subject: [PATCH 203/311] 8008716: address typo in CallableStatement javadocs

Reviewed-by: chegar
---
 jdk/src/share/classes/java/sql/CallableStatement.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/jdk/src/share/classes/java/sql/CallableStatement.java b/jdk/src/share/classes/java/sql/CallableStatement.java
index 1200f771dad..a39af405220 100644
--- a/jdk/src/share/classes/java/sql/CallableStatement.java
+++ b/jdk/src/share/classes/java/sql/CallableStatement.java
@@ -2621,7 +2621,7 @@ public interface CallableStatement extends PreparedStatement {
      * parameter determines the Java type that must be used
      * in the {@code get} method to read the value of that parameter.
      * <p>
-     * This version of {@code  registrOutParameter} should be
+     * This version of {@code  registerOutParameter} should be
      * used when the parameter is of JDBC type {@code JDBCType.NUMERIC}
      * or {@code JDBCType.DECIMAL}.
      *<P>
@@ -2649,7 +2649,7 @@ public interface CallableStatement extends PreparedStatement {
     /**
      * Registers the designated output parameter.
      * This version of
-     * the method {@code  registrOutParameter}
+     * the method {@code  registerOutParameter}
      * should be used for a user-defined or {@code REF} output parameter.
      * Examples
      * of user-defined types include: {@code STRUCT}, {@code DISTINCT},
@@ -2717,7 +2717,7 @@ public interface CallableStatement extends PreparedStatement {
      * register the OUT Parameter.
      * If the parameter is of JDBC type {@code JDBCType.NUMERIC}
      * or {@code JDBCType.DECIMAL}, the version of
-     * {@code  registrOutParameter} that accepts a scale value
+     * {@code  registerOutParameter} that accepts a scale value
      * should be used.
      * @exception SQLException if parameterName does not correspond to a named
      * parameter; if a database access error occurs or
@@ -2745,7 +2745,7 @@ public interface CallableStatement extends PreparedStatement {
      * parameter determines the Java type that must be used
      * in the {@code get} method to read the value of that parameter.
      * <p>
-     * This version of {@code  registrOutParameter} should be
+     * This version of {@code  registerOutParameter} should be
      * used when the parameter is of JDBC type {@code JDBCType.NUMERIC}
      * or {@code JDBCType.DECIMAL}.
      *<P>
@@ -2774,7 +2774,7 @@ public interface CallableStatement extends PreparedStatement {
 
     /**
      * Registers the designated output parameter.  This version of
-     * the method {@code  registrOutParameter}
+     * the method {@code  registerOutParameter}
      * should be used for a user-named or REF output parameter.  Examples
      * of user-named types include: STRUCT, DISTINCT, JAVA_OBJECT, and
      * named array types.

From 33ebb8d71df5f8cb168ce8bf3e97bfa11bed57a8 Mon Sep 17 00:00:00 2001
From: James Laskey <james.laskey@oracle.com>
Date: Fri, 22 Feb 2013 10:39:00 -0400
Subject: [PATCH 204/311] 8008721: Tweaks to make all NEWBUILD=false round 4

Reviewed-by: jjh
---
 nashorn/makefiles/BuildNashorn.gmk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nashorn/makefiles/BuildNashorn.gmk b/nashorn/makefiles/BuildNashorn.gmk
index 33ef441e22b..56896c65e15 100644
--- a/nashorn/makefiles/BuildNashorn.gmk
+++ b/nashorn/makefiles/BuildNashorn.gmk
@@ -78,8 +78,8 @@ $(NASHORN_OUTPUTDIR)/classes/_the.nasgen.run: $(BUILD_NASGEN)
 	$(MKDIR) -p $(@D)
 	$(RM) -rf $(@D)/jdk $(@D)/netscape
 	$(CP) -R -p $(NASHORN_OUTPUTDIR)/nashorn_classes/* $(@D)/
-	$(JDK_OUTPUTDIR)/bin/java \
-		-cp $(NASHORN_OUTPUTDIR)/nasgen_classes$(PATH_SEP)$(NASHORN_OUTPUTDIR)/nashorn_classes \
+	$(FIXPATH) $(JDK_OUTPUTDIR)/bin/java \
+		-cp "$(NASHORN_OUTPUTDIR)/nasgen_classes$(PATH_SEP)$(NASHORN_OUTPUTDIR)/nashorn_classes" \
 		jdk.nashorn.internal.tools.nasgen.Main $(@D) jdk.nashorn.internal.objects $(@D)
 	for f in `$(FIND) $(@D)/jdk/nashorn/internal/objects/ -name "*.class"`; do \
 	  mv "$$f" `$(ECHO) "$$f" | $(SED) "s/\.class$$/\.clazz/"`; \

From 1c711a064a2bd463ba577811082c6d4f64d94b8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Fri, 22 Feb 2013 16:31:10 +0100
Subject: [PATCH 205/311] 8008093: Make RegExp engine pluggable

Reviewed-by: lagergren, attila
---
 .../jdk/nashorn/internal/objects/Global.java  |  12 +-
 .../internal/objects/NativeRegExp.java        | 271 ++++++++----------
 .../objects/NativeRegExpExecResult.java       |  10 +-
 .../internal/objects/NativeString.java        |   3 +-
 .../internal/parser/AbstractParser.java       |   4 +-
 .../jdk/nashorn/internal/runtime/RegExp.java  | 177 ------------
 .../runtime/regexp/DefaultRegExp.java         | 163 +++++++++++
 .../internal/runtime/regexp/RegExp.java       | 164 +++++++++++
 .../runtime/regexp/RegExpFactory.java         | 103 +++++++
 .../runtime/regexp/RegExpMatcher.java         |  51 ++++
 .../RegExpResult.java}                        |   6 +-
 .../runtime/{ => regexp}/RegExpScanner.java   |  52 ++--
 12 files changed, 630 insertions(+), 386 deletions(-)
 delete mode 100644 nashorn/src/jdk/nashorn/internal/runtime/RegExp.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/DefaultRegExp.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExp.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpFactory.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpMatcher.java
 rename nashorn/src/jdk/nashorn/internal/runtime/{RegExpMatch.java => regexp/RegExpResult.java} (94%)
 rename nashorn/src/jdk/nashorn/internal/runtime/{ => regexp}/RegExpScanner.java (96%)

diff --git a/nashorn/src/jdk/nashorn/internal/objects/Global.java b/nashorn/src/jdk/nashorn/internal/objects/Global.java
index 11cb917bed9..ed3973f3d8f 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/Global.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/Global.java
@@ -50,7 +50,7 @@ import jdk.nashorn.internal.runtime.JSType;
 import jdk.nashorn.internal.runtime.NativeJavaPackage;
 import jdk.nashorn.internal.runtime.OptionsObject;
 import jdk.nashorn.internal.runtime.PropertyDescriptor;
-import jdk.nashorn.internal.runtime.RegExpMatch;
+import jdk.nashorn.internal.runtime.regexp.RegExpResult;
 import jdk.nashorn.internal.runtime.Scope;
 import jdk.nashorn.internal.runtime.ScriptFunction;
 import jdk.nashorn.internal.runtime.ScriptObject;
@@ -339,7 +339,7 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
     private ClassCache classCache;
 
     // Used to store the last RegExp result to support deprecated RegExp constructor properties
-    private RegExpMatch lastRegExpMatch;
+    private RegExpResult lastRegExpResult;
 
     private static final MethodHandle EVAL    = findOwnMH("eval",    Object.class, Object.class, Object.class);
     private static final MethodHandle PRINT   = findOwnMH("print",   Object.class, Object.class, Object[].class);
@@ -1709,12 +1709,12 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
         return MH.findStatic(MethodHandles.publicLookup(), Global.class, name, MH.type(rtype, types));
     }
 
-    RegExpMatch getLastRegExpMatch() {
-        return lastRegExpMatch;
+    RegExpResult getLastRegExpResult() {
+        return lastRegExpResult;
     }
 
-    void setLastRegExpMatch(RegExpMatch regExpMatch) {
-        this.lastRegExpMatch = regExpMatch;
+    void setLastRegExpResult(final RegExpResult regExpResult) {
+        this.lastRegExpResult = regExpResult;
     }
 
 }
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java b/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java
index 53eb285dd57..d386531f797 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeRegExp.java
@@ -31,8 +31,7 @@ import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+
 import jdk.nashorn.internal.objects.annotations.Attribute;
 import jdk.nashorn.internal.objects.annotations.Constructor;
 import jdk.nashorn.internal.objects.annotations.Function;
@@ -44,8 +43,10 @@ import jdk.nashorn.internal.objects.annotations.Where;
 import jdk.nashorn.internal.runtime.BitVector;
 import jdk.nashorn.internal.runtime.JSType;
 import jdk.nashorn.internal.runtime.ParserException;
-import jdk.nashorn.internal.runtime.RegExp;
-import jdk.nashorn.internal.runtime.RegExpMatch;
+import jdk.nashorn.internal.runtime.regexp.RegExp;
+import jdk.nashorn.internal.runtime.regexp.RegExpFactory;
+import jdk.nashorn.internal.runtime.regexp.RegExpResult;
+import jdk.nashorn.internal.runtime.regexp.RegExpMatcher;
 import jdk.nashorn.internal.runtime.ScriptFunction;
 import jdk.nashorn.internal.runtime.ScriptObject;
 import jdk.nashorn.internal.runtime.ScriptRuntime;
@@ -59,35 +60,15 @@ public final class NativeRegExp extends ScriptObject {
     @Property(attributes = Attribute.NOT_ENUMERABLE | Attribute.NOT_CONFIGURABLE)
     public Object lastIndex;
 
-    /** Pattern string. */
-    private String input;
-
-    /** Global search flag for this regexp. */
-    private boolean global;
-
-    /** Case insensitive flag for this regexp */
-    private boolean ignoreCase;
-
-    /** Multi-line flag for this regexp */
-    private boolean multiline;
-
-    /** Java regex pattern to use for match. We compile to one of these */
-    private Pattern pattern;
-
-    private BitVector groupsInNegativeLookahead;
+    /** Compiled regexp */
+    private RegExp regexp;
 
     // Reference to global object needed to support static RegExp properties
     private Global globalObject;
 
-    /*
-    public NativeRegExp() {
-        init();
-    }*/
-
     NativeRegExp(final String input, final String flagString) {
-        RegExp regExp = null;
         try {
-            regExp = new RegExp(input, flagString);
+            this.regexp = RegExpFactory.create(input, flagString);
         } catch (final ParserException e) {
             // translate it as SyntaxError object and throw it
             e.throwAsEcmaException();
@@ -95,13 +76,6 @@ public final class NativeRegExp extends ScriptObject {
         }
 
         this.setLastIndex(0);
-        this.input = regExp.getInput();
-        this.global = regExp.isGlobal();
-        this.ignoreCase = regExp.isIgnoreCase();
-        this.multiline = regExp.isMultiline();
-        this.pattern = regExp.getPattern();
-        this.groupsInNegativeLookahead = regExp.getGroupsInNegativeLookahead();
-
         init();
     }
 
@@ -110,24 +84,8 @@ public final class NativeRegExp extends ScriptObject {
     }
 
     NativeRegExp(final NativeRegExp regExp) {
-        this.input      = regExp.getInput();
-        this.global     = regExp.getGlobal();
-        this.multiline  = regExp.getMultiline();
-        this.ignoreCase = regExp.getIgnoreCase();
         this.lastIndex  = regExp.getLastIndexObject();
-        this.pattern    = regExp.getPattern();
-        this.groupsInNegativeLookahead = regExp.getGroupsInNegativeLookahead();
-
-        init();
-    }
-
-    NativeRegExp(final Pattern pattern) {
-        this.input      = pattern.pattern();
-        this.multiline  = (pattern.flags() & Pattern.MULTILINE) != 0;
-        this.ignoreCase = (pattern.flags() & Pattern.CASE_INSENSITIVE) != 0;
-        this.lastIndex  = 0;
-        this.pattern    = pattern;
-
+        this.regexp      = regExp.getRegExp();
         init();
     }
 
@@ -232,16 +190,59 @@ public final class NativeRegExp extends ScriptObject {
         return new NativeRegExp(patternString, flagString);
     }
 
-    private String getFlagString() {
-        final StringBuilder sb = new StringBuilder();
+    /**
+     * Build a regexp that matches {@code string} as-is. All meta-characters will be escaped.
+     *
+     * @param string pattern string
+     * @return flat regexp
+     */
+    static NativeRegExp flatRegExp(String string) {
+        // escape special characters
+        StringBuilder sb = null;
+        final int length = string.length();
 
-        if (global) {
+        for (int i = 0; i < length; i++) {
+            final char c = string.charAt(i);
+            switch (c) {
+                case '^':
+                case '$':
+                case '\\':
+                case '.':
+                case '*':
+                case '+':
+                case '?':
+                case '(':
+                case ')':
+                case '[':
+                case '{':
+                case '|':
+                    if (sb == null) {
+                        sb = new StringBuilder(length * 2);
+                        sb.append(string, 0, i);
+                    }
+                    sb.append('\\');
+                    sb.append(c);
+                    break;
+                default:
+                    if (sb != null) {
+                        sb.append(c);
+                    }
+                    break;
+            }
+        }
+        return new NativeRegExp(sb == null ? string : sb.toString(), "");
+    }
+
+    private String getFlagString() {
+        final StringBuilder sb = new StringBuilder(3);
+
+        if (regexp.isGlobal()) {
             sb.append('g');
         }
-        if (ignoreCase) {
+        if (regexp.isIgnoreCase()) {
             sb.append('i');
         }
-        if (multiline) {
+        if (regexp.isMultiline()) {
             sb.append('m');
         }
 
@@ -255,7 +256,7 @@ public final class NativeRegExp extends ScriptObject {
 
     @Override
     public String toString() {
-        return "/" + input + "/" + getFlagString();
+        return "/" + regexp.getSource() + "/" + getFlagString();
     }
 
     /**
@@ -270,13 +271,8 @@ public final class NativeRegExp extends ScriptObject {
     public static Object compile(final Object self, final Object pattern, final Object flags) {
         final NativeRegExp regExp   = checkRegExp(self);
         final NativeRegExp compiled = newRegExp(pattern, flags);
-        // copy over fields to 'self'
-        regExp.setInput(compiled.getInput());
-        regExp.setGlobal(compiled.getGlobal());
-        regExp.setIgnoreCase(compiled.getIgnoreCase());
-        regExp.setMultiline(compiled.getMultiline());
-        regExp.setPattern(compiled.getPattern());
-        regExp.setGroupsInNegativeLookahead(compiled.getGroupsInNegativeLookahead());
+        // copy over regexp to 'self'
+        regExp.setRegExp(compiled.getRegExp());
 
         // Some implementations return undefined. Some return 'self'. Since return
         // value is most likely be ignored, we can play safe and return 'self'.
@@ -326,7 +322,7 @@ public final class NativeRegExp extends ScriptObject {
      */
     @Getter(attributes = Attribute.NON_ENUMERABLE_CONSTANT)
     public static Object source(final Object self) {
-        return checkRegExp(self).input;
+        return checkRegExp(self).getRegExp().getSource();
     }
 
     /**
@@ -337,7 +333,7 @@ public final class NativeRegExp extends ScriptObject {
      */
     @Getter(attributes = Attribute.NON_ENUMERABLE_CONSTANT)
     public static Object global(final Object self) {
-        return checkRegExp(self).global;
+        return checkRegExp(self).getRegExp().isGlobal();
     }
 
     /**
@@ -348,7 +344,7 @@ public final class NativeRegExp extends ScriptObject {
      */
     @Getter(attributes = Attribute.NON_ENUMERABLE_CONSTANT)
     public static Object ignoreCase(final Object self) {
-        return checkRegExp(self).ignoreCase;
+        return checkRegExp(self).getRegExp().isIgnoreCase();
     }
 
     /**
@@ -359,7 +355,7 @@ public final class NativeRegExp extends ScriptObject {
      */
     @Getter(attributes = Attribute.NON_ENUMERABLE_CONSTANT)
     public static Object multiline(final Object self) {
-        return checkRegExp(self).multiline;
+        return checkRegExp(self).getRegExp().isMultiline();
     }
 
     /**
@@ -369,7 +365,7 @@ public final class NativeRegExp extends ScriptObject {
      */
     @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "input")
     public static Object getLastInput(Object self) {
-        final RegExpMatch match = Global.instance().getLastRegExpMatch();
+        final RegExpResult match = Global.instance().getLastRegExpResult();
         return match == null ? "" : match.getInput();
     }
 
@@ -390,7 +386,7 @@ public final class NativeRegExp extends ScriptObject {
      */
     @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "lastMatch")
     public static Object getLastMatch(Object self) {
-        final RegExpMatch match = Global.instance().getLastRegExpMatch();
+        final RegExpResult match = Global.instance().getLastRegExpResult();
         return match == null ? "" : match.getGroup(0);
     }
 
@@ -401,7 +397,7 @@ public final class NativeRegExp extends ScriptObject {
      */
     @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "lastParen")
     public static Object getLastParen(Object self) {
-        final RegExpMatch match = Global.instance().getLastRegExpMatch();
+        final RegExpResult match = Global.instance().getLastRegExpResult();
         return match == null ? "" : match.getLastParen();
     }
 
@@ -412,7 +408,7 @@ public final class NativeRegExp extends ScriptObject {
      */
     @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "leftContext")
     public static Object getLeftContext(Object self) {
-        final RegExpMatch match = Global.instance().getLastRegExpMatch();
+        final RegExpResult match = Global.instance().getLastRegExpResult();
         return match == null ? "" : match.getInput().substring(0, match.getIndex());
     }
 
@@ -423,7 +419,7 @@ public final class NativeRegExp extends ScriptObject {
      */
     @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "rightContext")
     public static Object getRightContext(Object self) {
-        final RegExpMatch match = Global.instance().getLastRegExpMatch();
+        final RegExpResult match = Global.instance().getLastRegExpResult();
         return match == null ? "" : match.getInput().substring(match.getIndex() + match.length());
     }
 
@@ -434,7 +430,7 @@ public final class NativeRegExp extends ScriptObject {
      */
     @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "$1")
     public static Object getGroup1(Object self) {
-        final RegExpMatch match = Global.instance().getLastRegExpMatch();
+        final RegExpResult match = Global.instance().getLastRegExpResult();
         return match == null ? "" : match.getGroup(1);
     }
 
@@ -445,7 +441,7 @@ public final class NativeRegExp extends ScriptObject {
      */
     @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "$2")
     public static Object getGroup2(Object self) {
-        final RegExpMatch match = Global.instance().getLastRegExpMatch();
+        final RegExpResult match = Global.instance().getLastRegExpResult();
         return match == null ? "" : match.getGroup(2);
     }
 
@@ -456,7 +452,7 @@ public final class NativeRegExp extends ScriptObject {
      */
     @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "$3")
     public static Object getGroup3(Object self) {
-        final RegExpMatch match = Global.instance().getLastRegExpMatch();
+        final RegExpResult match = Global.instance().getLastRegExpResult();
         return match == null ? "" : match.getGroup(3);
     }
 
@@ -467,7 +463,7 @@ public final class NativeRegExp extends ScriptObject {
      */
     @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "$4")
     public static Object getGroup4(Object self) {
-        final RegExpMatch match = Global.instance().getLastRegExpMatch();
+        final RegExpResult match = Global.instance().getLastRegExpResult();
         return match == null ? "" : match.getGroup(4);
     }
 
@@ -478,7 +474,7 @@ public final class NativeRegExp extends ScriptObject {
      */
     @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "$5")
     public static Object getGroup5(Object self) {
-        final RegExpMatch match = Global.instance().getLastRegExpMatch();
+        final RegExpResult match = Global.instance().getLastRegExpResult();
         return match == null ? "" : match.getGroup(5);
     }
 
@@ -489,7 +485,7 @@ public final class NativeRegExp extends ScriptObject {
      */
     @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "$6")
     public static Object getGroup6(Object self) {
-        final RegExpMatch match = Global.instance().getLastRegExpMatch();
+        final RegExpResult match = Global.instance().getLastRegExpResult();
         return match == null ? "" : match.getGroup(6);
     }
 
@@ -500,7 +496,7 @@ public final class NativeRegExp extends ScriptObject {
      */
     @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "$7")
     public static Object getGroup7(Object self) {
-        final RegExpMatch match = Global.instance().getLastRegExpMatch();
+        final RegExpResult match = Global.instance().getLastRegExpResult();
         return match == null ? "" : match.getGroup(7);
     }
 
@@ -511,7 +507,7 @@ public final class NativeRegExp extends ScriptObject {
      */
     @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "$8")
     public static Object getGroup8(Object self) {
-        final RegExpMatch match = Global.instance().getLastRegExpMatch();
+        final RegExpResult match = Global.instance().getLastRegExpResult();
         return match == null ? "" : match.getGroup(8);
     }
 
@@ -522,34 +518,30 @@ public final class NativeRegExp extends ScriptObject {
      */
     @Getter(where = Where.CONSTRUCTOR, attributes = Attribute.CONSTANT, name = "$9")
     public static Object getGroup9(Object self) {
-        final RegExpMatch match = Global.instance().getLastRegExpMatch();
+        final RegExpResult match = Global.instance().getLastRegExpResult();
         return match == null ? "" : match.getGroup(9);
     }
 
-    private RegExpMatch execInner(final String string) {
-        if (this.pattern == null) {
-            return null; // never matches or similar, e.g. a[]
-        }
-
-        final Matcher matcher = pattern.matcher(string);
-        final int start = this.global ? getLastIndex() : 0;
+    private RegExpResult execInner(final String string) {
 
+        final int start = regexp.isGlobal() ? getLastIndex() : 0;
         if (start < 0 || start > string.length()) {
             setLastIndex(0);
             return null;
         }
 
-        if (!matcher.find(start)) {
+        final RegExpMatcher matcher = regexp.match(string);
+        if (matcher == null || !matcher.search(start)) {
             setLastIndex(0);
             return null;
         }
 
-        if (global) {
+        if (regexp.isGlobal()) {
             setLastIndex(matcher.end());
         }
 
-        final RegExpMatch match = new RegExpMatch(string, matcher.start(), groups(matcher));
-        globalObject.setLastRegExpMatch(match);
+        final RegExpResult match = new RegExpResult(string, matcher.start(), groups(matcher));
+        globalObject.setLastRegExpResult(match);
         return match;
     }
 
@@ -557,9 +549,11 @@ public final class NativeRegExp extends ScriptObject {
      * Convert java.util.regex.Matcher groups to JavaScript groups.
      * That is, replace null and groups that didn't match with undefined.
      */
-    private Object[] groups(final Matcher matcher) {
+    private Object[] groups(final RegExpMatcher matcher) {
         final int groupCount = matcher.groupCount();
         final Object[] groups = new Object[groupCount + 1];
+        final BitVector groupsInNegativeLookahead  = regexp.getGroupsInNegativeLookahead();
+
         for (int i = 0, lastGroupStart = matcher.start(); i <= groupCount; i++) {
             final int groupStart = matcher.start(i);
             if (lastGroupStart > groupStart
@@ -586,7 +580,7 @@ public final class NativeRegExp extends ScriptObject {
      * @return NativeArray of matches, string or null.
      */
     public Object exec(final String string) {
-        final RegExpMatch match = execInner(string);
+        final RegExpResult match = execInner(string);
 
         if (match == null) {
             return null;
@@ -617,7 +611,12 @@ public final class NativeRegExp extends ScriptObject {
      * @return String with substitutions.
      */
     Object replace(final String string, final String replacement, final ScriptFunction function) {
-        final Matcher matcher = pattern.matcher(string);
+        final RegExpMatcher matcher = regexp.match(string);
+
+        if (matcher == null) {
+            return string;
+        }
+
         /*
          * $$ -> $
          * $& -> the matched substring
@@ -628,8 +627,8 @@ public final class NativeRegExp extends ScriptObject {
          */
         String replace = replacement;
 
-        if (!global) {
-            if (!matcher.find()) {
+        if (!regexp.isGlobal()) {
+            if (!matcher.search(0)) {
                 return string;
             }
 
@@ -642,45 +641,39 @@ public final class NativeRegExp extends ScriptObject {
             return sb.toString();
         }
 
-        int end = 0; // a.k.a. lastAppendPosition
         setLastIndex(0);
 
-        boolean found;
-        try {
-            found = matcher.find(end);
-        } catch (final IndexOutOfBoundsException e) {
-            found = false;
-        }
-
-        if (!found) {
+        if (!matcher.search(0)) {
             return string;
         }
 
+        int thisIndex = 0;
         int previousLastIndex = 0;
         final StringBuilder sb = new StringBuilder();
+
         do {
             if (function != null) {
                 replace = callReplaceValue(function, matcher, string);
             }
-            appendReplacement(matcher, string, replace, sb, end);
-            end = matcher.end();
+
+            appendReplacement(matcher, string, replace, sb, thisIndex);
 
             // ECMA 15.5.4.10 String.prototype.match(regexp)
-            final int thisIndex = end;
+            thisIndex = matcher.end();
             if (thisIndex == previousLastIndex) {
                 setLastIndex(thisIndex + 1);
                 previousLastIndex = thisIndex + 1;
             } else {
                 previousLastIndex = thisIndex;
             }
-        } while (matcher.find());
+        } while (previousLastIndex <= string.length() && matcher.search(previousLastIndex));
 
-        sb.append(string, end, string.length());
+        sb.append(string, thisIndex, string.length());
 
         return sb.toString();
     }
 
-    private void appendReplacement(final Matcher matcher, final String text, final String replacement, final StringBuilder sb, final int lastAppendPosition) {
+    private void appendReplacement(final RegExpMatcher matcher, final String text, final String replacement, final StringBuilder sb, final int lastAppendPosition) {
         // Process substitution string to replace group references with groups
         int cursor = 0;
         final StringBuilder result = new StringBuilder();
@@ -748,7 +741,7 @@ public final class NativeRegExp extends ScriptObject {
         sb.append(result);
     }
 
-    private String callReplaceValue(final ScriptFunction function, final Matcher matcher, final String string) {
+    private String callReplaceValue(final ScriptFunction function, final RegExpMatcher matcher, final String string) {
         final Object[] groups = groups(matcher);
         final Object[] args   = Arrays.copyOf(groups, groups.length + 2);
 
@@ -782,7 +775,7 @@ public final class NativeRegExp extends ScriptObject {
             return new NativeArray();
         }
 
-        RegExpMatch match;
+        RegExpResult match;
         final int inputLength = input.length();
         int lastLength = -1;
         int lastLastIndex = 0;
@@ -834,7 +827,7 @@ public final class NativeRegExp extends ScriptObject {
      * @return Index of match.
      */
     Object search(final String string) {
-        final RegExpMatch match = execInner(string);
+        final RegExpResult match = execInner(string);
 
         if (match == null) {
             return -1;
@@ -884,52 +877,20 @@ public final class NativeRegExp extends ScriptObject {
         }
     }
 
-    private String getInput() {
-        return input;
-    }
-
-    private void setInput(final String input) {
-        this.input = input;
+    private void setGlobal(final boolean global) {
+        regexp.setGlobal(global);
     }
 
     boolean getGlobal() {
-        return global;
+        return regexp.isGlobal();
     }
 
-    private void setGlobal(final boolean global) {
-        this.global = global;
+    private RegExp getRegExp() {
+        return regexp;
     }
 
-    private boolean getIgnoreCase() {
-        return ignoreCase;
-    }
-
-    private void setIgnoreCase(final boolean ignoreCase) {
-        this.ignoreCase = ignoreCase;
-    }
-
-    private boolean getMultiline() {
-        return multiline;
-    }
-
-    private void setMultiline(final boolean multiline) {
-        this.multiline = multiline;
-    }
-
-    private Pattern getPattern() {
-        return pattern;
-    }
-
-    private void setPattern(final Pattern pattern) {
-        this.pattern = pattern;
-    }
-
-    private BitVector getGroupsInNegativeLookahead() {
-        return groupsInNegativeLookahead;
-    }
-
-    private void setGroupsInNegativeLookahead(final BitVector groupsInNegativeLookahead) {
-        this.groupsInNegativeLookahead = groupsInNegativeLookahead;
+    private void setRegExp(final RegExp regexp) {
+        this.regexp = regexp;
     }
 
 }
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeRegExpExecResult.java b/nashorn/src/jdk/nashorn/internal/objects/NativeRegExpExecResult.java
index 5291c76a504..5d4f8578ad1 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeRegExpExecResult.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeRegExpExecResult.java
@@ -31,7 +31,7 @@ import jdk.nashorn.internal.objects.annotations.Property;
 import jdk.nashorn.internal.objects.annotations.ScriptClass;
 import jdk.nashorn.internal.objects.annotations.Setter;
 import jdk.nashorn.internal.runtime.JSType;
-import jdk.nashorn.internal.runtime.RegExpMatch;
+import jdk.nashorn.internal.runtime.regexp.RegExpResult;
 import jdk.nashorn.internal.runtime.ScriptObject;
 import jdk.nashorn.internal.runtime.arrays.ArrayData;
 
@@ -49,11 +49,11 @@ public final class NativeRegExpExecResult extends ScriptObject {
     @Property
     public Object input;
 
-    NativeRegExpExecResult(final RegExpMatch match) {
+    NativeRegExpExecResult(final RegExpResult result) {
         setProto(Global.instance().getArrayPrototype());
-        this.setArray(ArrayData.allocate(match.getGroups().clone()));
-        this.index = match.getIndex();
-        this.input = match.getInput();
+        this.setArray(ArrayData.allocate(result.getGroups().clone()));
+        this.index = result.getIndex();
+        this.input = result.getInput();
     }
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeString.java b/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
index 946097dba54..e6b72579c00 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
@@ -38,7 +38,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.regex.Pattern;
 import jdk.internal.dynalink.CallSiteDescriptor;
 import jdk.internal.dynalink.linker.GuardedInvocation;
 import jdk.internal.dynalink.linker.LinkRequest;
@@ -712,7 +711,7 @@ public final class NativeString extends ScriptObject {
         if (string instanceof NativeRegExp) {
             nativeRegExp = (NativeRegExp) string;
         } else {
-            nativeRegExp = new NativeRegExp(Pattern.compile(JSType.toString(string), Pattern.LITERAL));
+            nativeRegExp = NativeRegExp.flatRegExp(JSType.toString(string));
         }
 
         if (replacement instanceof ScriptFunction) {
diff --git a/nashorn/src/jdk/nashorn/internal/parser/AbstractParser.java b/nashorn/src/jdk/nashorn/internal/parser/AbstractParser.java
index 2e9f273d2a9..a3263b81af9 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/AbstractParser.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/AbstractParser.java
@@ -37,7 +37,7 @@ import jdk.nashorn.internal.runtime.ECMAErrors;
 import jdk.nashorn.internal.runtime.ErrorManager;
 import jdk.nashorn.internal.runtime.JSErrorType;
 import jdk.nashorn.internal.runtime.ParserException;
-import jdk.nashorn.internal.runtime.RegExp;
+import jdk.nashorn.internal.runtime.regexp.RegExpFactory;
 import jdk.nashorn.internal.runtime.Source;
 
 /**
@@ -427,7 +427,7 @@ public abstract class AbstractParser {
             if (value instanceof RegexToken) {
                 final RegexToken regex = (RegexToken)value;
                 try {
-                    RegExp.validate(regex.getExpression(), regex.getOptions());
+                    RegExpFactory.validate(regex.getExpression(), regex.getOptions());
                 } catch (final ParserException e) {
                     error(e.getMessage());
                 }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/RegExp.java b/nashorn/src/jdk/nashorn/internal/runtime/RegExp.java
deleted file mode 100644
index b318b754ab1..00000000000
--- a/nashorn/src/jdk/nashorn/internal/runtime/RegExp.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.nashorn.internal.runtime;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
-import static java.util.regex.Pattern.MULTILINE;
-import static java.util.regex.Pattern.UNICODE_CASE;
-
-import java.util.HashSet;
-import java.util.regex.Pattern;
-import java.util.regex.PatternSyntaxException;
-
-/**
- * This class is used to represent a parsed regular expression. Accepts input
- * pattern string and flagString. This is used by AbstractParser to validate
- * RegExp literals as well as by NativeRegExp to parse RegExp constructor arguments.
- */
-public final class RegExp {
-    /** Pattern string. */
-    private final String input;
-
-    /** Global search flag for this regexp.*/
-    private boolean global;
-
-    /** Case insensitive flag for this regexp */
-    private boolean ignoreCase;
-
-    /** Multi-line flag for this regexp */
-    private boolean multiline;
-
-    /** Java regexp pattern to use for match. We compile to one of these */
-    private Pattern pattern;
-
-    /** BitVector that keeps track of groups in negative lookahead */
-    private BitVector groupsInNegativeLookahead;
-
-    /**
-     * Creates RegExpLiteral object from given input and flagString.
-     *
-     * @param input RegExp pattern string
-     * @param flagString RegExp flags
-     * @throws ParserException if flagString is invalid or input string has syntax error.
-     */
-    public RegExp(final String input, final String flagString) throws ParserException {
-        this.input = input;
-        final HashSet<Character> usedFlags = new HashSet<>();
-        int flags = 0;
-
-        for (final char ch : flagString.toCharArray()) {
-            if (usedFlags.contains(ch)) {
-                throwParserException("repeated.flag", Character.toString(ch));
-            }
-
-            switch (ch) {
-            case 'g':
-                this.global = true;
-                usedFlags.add(ch);
-                break;
-            case 'i':
-                this.ignoreCase = true;
-                flags |= CASE_INSENSITIVE | UNICODE_CASE;
-                usedFlags.add(ch);
-                break;
-            case 'm':
-                this.multiline = true;
-                flags |= MULTILINE;
-                usedFlags.add(ch);
-                break;
-            default:
-                throwParserException("unsupported.flag", Character.toString(ch));
-            }
-        }
-
-        try {
-            RegExpScanner parsed;
-
-            try {
-                parsed = RegExpScanner.scan(input);
-            } catch (final PatternSyntaxException e) {
-                // refine the exception with a better syntax error, if this
-                // passes, just rethrow what we have
-                Pattern.compile(input, flags);
-                throw e;
-            }
-
-            if (parsed != null) {
-                this.pattern = Pattern.compile(parsed.getJavaPattern(), flags);
-                this.groupsInNegativeLookahead = parsed.getGroupsInNegativeLookahead();
-            }
-        } catch (final PatternSyntaxException e2) {
-            throwParserException("syntax", e2.getMessage());
-        }
-
-    }
-
-    /**
-     * @return the input
-     */
-    public String getInput() {
-        return input;
-    }
-
-    /**
-     * @return the global
-     */
-    public boolean isGlobal() {
-        return global;
-    }
-
-    /**
-     * @return the ignoreCase
-     */
-    public boolean isIgnoreCase() {
-        return ignoreCase;
-    }
-
-    /**
-     * @return the multiline
-     */
-    public boolean isMultiline() {
-        return multiline;
-    }
-
-    /**
-     * @return the pattern
-     */
-    public Pattern getPattern() {
-        return pattern;
-    }
-
-    /**
-     * @return the groupsInNegativeLookahead
-     */
-    public BitVector getGroupsInNegativeLookahead() {
-        return groupsInNegativeLookahead;
-    }
-
-    /**
-     * Validation method for RegExp input and flagString - we don't care about the RegExp object
-     *
-     * @param input        regexp input
-     * @param flagString   flag string
-     *
-     * @throws ParserException if invalid regexp and flags
-     */
-    @SuppressWarnings({"unused", "ResultOfObjectAllocationIgnored"})
-    public static void validate(final String input, final String flagString) throws ParserException {
-        new RegExp(input, flagString);
-    }
-
-    private static void throwParserException(final String key, final String str) throws ParserException {
-        throw new ParserException(ECMAErrors.getMessage("parser.error.regex." + key, str));
-    }
-}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/DefaultRegExp.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/DefaultRegExp.java
new file mode 100644
index 00000000000..7c1dd8b448d
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/DefaultRegExp.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.regexp;
+
+import jdk.nashorn.internal.runtime.ParserException;
+
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import static java.util.regex.Pattern.MULTILINE;
+import static java.util.regex.Pattern.UNICODE_CASE;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
+
+/**
+ * Default regular expression implementation based on java.util.regex package.
+ *
+ * Note that this class is not thread-safe as it stores the current match result
+ * and the string being matched in instance fields.
+ */
+public class DefaultRegExp extends RegExp {
+
+    /** Java regexp pattern to use for match. We compile to one of these */
+    private Pattern pattern;
+
+    /** The matcher */
+    private RegExpMatcher matcher;
+
+    /**
+     * Construct a Regular expression from the given {@code source} and {@code flags} strings.
+     *
+     * @param source RegExp source string
+     * @param flags RegExp flag string
+     * @throws ParserException if flags is invalid or source string has syntax error.
+     */
+    public DefaultRegExp(final String source, final String flags) throws ParserException {
+        super(source, flags);
+
+        int intFlags = 0;
+
+        if (isIgnoreCase()) {
+            intFlags |= CASE_INSENSITIVE | UNICODE_CASE;
+        }
+        if (isMultiline()) {
+            intFlags |= MULTILINE;
+        }
+
+        try {
+            RegExpScanner parsed;
+
+            try {
+                parsed = RegExpScanner.scan(source);
+            } catch (final PatternSyntaxException e) {
+                // refine the exception with a better syntax error, if this
+                // passes, just rethrow what we have
+                Pattern.compile(source, intFlags);
+                throw e;
+            }
+
+            if (parsed != null) {
+                this.pattern = Pattern.compile(parsed.getJavaPattern(), intFlags);
+                this.groupsInNegativeLookahead = parsed.getGroupsInNegativeLookahead();
+            }
+        } catch (final PatternSyntaxException e2) {
+            throwParserException("syntax", e2.getMessage());
+        }
+    }
+
+    @Override
+    public RegExpMatcher match(final String str) {
+        if (pattern == null) {
+            return null; // never matches or similar, e.g. a[]
+        }
+
+        RegExpMatcher matcher = this.matcher;
+
+        if (matcher == null || matcher.getInput() != str) {
+            matcher = new DefaultMatcher(str);
+            this.matcher = matcher;
+        }
+
+        return matcher;
+    }
+
+    class DefaultMatcher implements RegExpMatcher {
+        final String input;
+        final Matcher matcher;
+
+        DefaultMatcher(final String input) {
+            this.input = input;
+            this.matcher = pattern.matcher(input);
+        }
+
+        @Override
+        public boolean search(final int start) {
+            return matcher.find(start);
+        }
+
+        @Override
+        public String getInput() {
+            return input;
+        }
+
+        @Override
+        public int start() {
+            return matcher.start();
+        }
+
+        @Override
+        public int start(final int group) {
+            return matcher.start(group);
+        }
+
+        @Override
+        public int end() {
+            return matcher.end();
+        }
+
+        @Override
+        public int end(final int group) {
+            return matcher.end(group);
+        }
+
+        @Override
+        public String group() {
+            return matcher.group();
+        }
+
+        @Override
+        public String group(final int group) {
+            return matcher.group(group);
+        }
+
+        @Override
+        public int groupCount() {
+            return matcher.groupCount();
+        }
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExp.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExp.java
new file mode 100644
index 00000000000..a4274f6ae8b
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExp.java
@@ -0,0 +1,164 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.regexp;
+
+import jdk.nashorn.internal.runtime.BitVector;
+import jdk.nashorn.internal.runtime.ECMAErrors;
+import jdk.nashorn.internal.runtime.ParserException;
+
+import java.util.regex.MatchResult;
+
+/**
+ * This is the base class for representing a parsed regular expression.
+ *
+ * Instances of this class are created by a {@link RegExpFactory}.
+ */
+public abstract class RegExp {
+
+    /** Pattern string. */
+    private final String source;
+
+    /** Global search flag for this regexp.*/
+    private boolean global;
+
+    /** Case insensitive flag for this regexp */
+    private boolean ignoreCase;
+
+    /** Multi-line flag for this regexp */
+    private boolean multiline;
+
+    /** BitVector that keeps track of groups in negative lookahead */
+    protected BitVector groupsInNegativeLookahead;
+
+    /**
+     * Constructor.
+     *
+     * @param source the source string
+     * @param flags the flags string
+     */
+    protected RegExp(final String source, final String flags) {
+        this.source = source;
+        for (int i = 0; i < flags.length(); i++) {
+            final char ch = flags.charAt(i);
+            switch (ch) {
+            case 'g':
+                if (this.global) {
+                    throwParserException("repeated.flag", "g");
+                }
+                this.global = true;
+                break;
+            case 'i':
+                if (this.ignoreCase) {
+                    throwParserException("repeated.flag", "i");
+                }
+                this.ignoreCase = true;
+                break;
+            case 'm':
+                if (this.multiline) {
+                    throwParserException("repeated.flag", "m");
+                }
+                this.multiline = true;
+                break;
+            default:
+                throwParserException("unsupported.flag", Character.toString(ch));
+            }
+        }
+    }
+
+    /**
+     * Get the source pattern of this regular expression.
+     *
+     * @return the source string
+     */
+    public String getSource() {
+        return source;
+    }
+
+    /**
+     * Set the global flag of this regular expression to {@code global}.
+     *
+     * @param global the new global flag
+     */
+    public void setGlobal(final boolean global) {
+        this.global = global;
+    }
+
+    /**
+     * Get the global flag of this regular expression.
+     *
+     * @return the global flag
+     */
+    public boolean isGlobal() {
+        return global;
+    }
+
+    /**
+     * Get the ignore-case flag of this regular expression.
+     *
+     * @return the ignore-case flag
+     */
+    public boolean isIgnoreCase() {
+        return ignoreCase;
+    }
+
+    /**
+     * Get the multiline flag of this regular expression.
+     *
+     * @return the multiline flag
+     */
+    public boolean isMultiline() {
+        return multiline;
+    }
+
+    /**
+     * Get a bitset indicating which of the groups in this regular expression are inside a negative lookahead.
+     *
+     * @return the groups-in-negative-lookahead bitset
+     */
+    public BitVector getGroupsInNegativeLookahead() {
+        return groupsInNegativeLookahead;
+    }
+
+    /**
+     * Match this regular expression against {@code str}, starting at index {@code start}
+     * and return a {@link MatchResult} with the result.
+     *
+     * @param str the string
+     * @return the matcher
+     */
+    public abstract RegExpMatcher match(String str);
+
+    /**
+     * Throw a regexp parser exception.
+     *
+     * @param key the message key
+     * @param str string argument
+     * @throws jdk.nashorn.internal.runtime.ParserException
+     */
+    protected static void throwParserException(final String key, final String str) throws ParserException {
+        throw new ParserException(ECMAErrors.getMessage("parser.error.regex." + key, str));
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpFactory.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpFactory.java
new file mode 100644
index 00000000000..158396b70a7
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpFactory.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.regexp;
+
+import jdk.nashorn.internal.parser.Lexer;
+import jdk.nashorn.internal.runtime.ParserException;
+
+/**
+ * Factory class for regular expressions. This class creates instances of {@link DefaultRegExp}.
+ */
+public class RegExpFactory {
+
+
+    private final static RegExpFactory instance = new RegExpFactory();
+
+    /**
+     * Creates a Regular expression from the given {@code pattern} and {@code flags} strings.
+     *
+     * @param pattern RegExp pattern string
+     * @param flags RegExp flags string
+     * @throws ParserException if flags is invalid or pattern string has syntax error.
+     */
+    protected RegExp compile(final String pattern, final String flags) throws ParserException {
+        return new DefaultRegExp(pattern, flags);
+    }
+
+    /**
+     * Replace a regexp token as suitable for regexp instances created by this factory.
+     *
+     * @param str a regular expression token
+     * @return the replacement token
+     */
+    protected String replaceToken(final String str) {
+        switch (str) {
+            case "\\s":
+                return "[" + Lexer.getWhitespaceRegExp() + "]";
+            case "\\S":
+                return "[^" + Lexer.getWhitespaceRegExp() + "]";
+            case "[^]":
+                return "[\\s\\S]";
+            default:
+                return str;
+        }
+    }
+
+    /**
+     * Compile a regexp with the given {@code source} and {@code flags}.
+     *
+     * @param pattern RegExp pattern string
+     * @param flags  flag string
+     *
+     * @throws ParserException if invalid source or flags
+     */
+    public static RegExp create(final String pattern, final String flags) {
+        return instance.compile(pattern,  flags);
+    }
+
+    /**
+     * Replace a regexp token as needed by the currently installed factory instance.
+     *
+     * @param token a regexp token
+     * @return the replacement token
+     */
+    public static String replace(final String token) {
+        return instance.replaceToken(token);
+    }
+
+    /**
+     * Validate a regexp with the given {@code source} and {@code flags}.
+     *
+     * @param pattern RegExp pattern string
+     * @param flags  flag string
+     *
+     * @throws ParserException if invalid source or flags
+     */
+    // @SuppressWarnings({"unused"})
+    public static void validate(final String pattern, final String flags) throws ParserException {
+        instance.compile(pattern, flags);
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpMatcher.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpMatcher.java
new file mode 100644
index 00000000000..2697cdf757f
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpMatcher.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.regexp;
+
+import java.util.regex.MatchResult;
+
+/**
+ * Interface for matching a regular expression against a string and retrieving the
+ * match result. Extends {@link MatchResult}.
+ */
+public interface RegExpMatcher extends MatchResult {
+
+    /**
+     * Searches for pattern starting at {@code start}. Returns {@code true} if a match was found.
+     *
+     * @param start the start index in the input string
+     * @return {@code true} if a match was found
+     */
+    boolean search(int start);
+
+    /**
+     * Get the input string.
+     *
+     * @return the input string
+     */
+    String getInput();
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/RegExpMatch.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpResult.java
similarity index 94%
rename from nashorn/src/jdk/nashorn/internal/runtime/RegExpMatch.java
rename to nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpResult.java
index 80b6f06d385..ff838b6f346 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/RegExpMatch.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpResult.java
@@ -23,12 +23,12 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package jdk.nashorn.internal.runtime.regexp;
 
 /**
  * Match tuple to keep track of ongoing regexp match.
  */
-public final class RegExpMatch {
+public final class RegExpResult {
     final Object[] groups;
     final int      index;
     final String   input;
@@ -40,7 +40,7 @@ public final class RegExpMatch {
      * @param index  index of match
      * @param groups groups vector
      */
-    public RegExpMatch(final String input, final int index, final Object[] groups) {
+    public RegExpResult(final String input, final int index, final Object[] groups) {
         this.input  = input;
         this.index  = index;
         this.groups = groups;
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/RegExpScanner.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java
similarity index 96%
rename from nashorn/src/jdk/nashorn/internal/runtime/RegExpScanner.java
rename to nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java
index a25ec0ef232..bad878cd737 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/RegExpScanner.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime;
+package jdk.nashorn.internal.runtime.regexp;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -33,8 +33,9 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.regex.PatternSyntaxException;
-import jdk.nashorn.internal.parser.Lexer;
+
 import jdk.nashorn.internal.parser.Scanner;
+import jdk.nashorn.internal.runtime.BitVector;
 
 /**
  * Scan a JavaScript regexp, converting to Java regex if necessary.
@@ -48,9 +49,6 @@ final class RegExpScanner extends Scanner {
      */
     private final StringBuilder sb;
 
-    /** An optional error message if one occurred during parse. */
-    private String errorMessage;
-
     /** Is this the special case of a regexp that never matches anything */
     private boolean neverMatches;
 
@@ -102,7 +100,6 @@ final class RegExpScanner extends Scanner {
     /**
      * This is a token - the JavaScript regexp is scanned into a token tree
      * A token has other tokens as children as well as "atoms", i.e. Strings.
-     *
      */
     private static class Token {
 
@@ -220,31 +217,24 @@ final class RegExpScanner extends Scanner {
 
         /**
          * JavaScript Token to Java regex substring framework.
-         *
          */
         private static class ToString {
             String toString(final Token token) {
-                final StringBuilder sb = new StringBuilder();
-                for (final Object child : token.getChildren()) {
-                    sb.append(child);
-                }
+                final Object[] children = token.getChildren();
 
-                //perform global substitutions that hold true for any evaluated form
-                String str = sb.toString();
-                switch (str) {
-                case "\\s":
-                    str = "[" + Lexer.getWhitespaceRegExp() + "]";
-                    break;
-                case "\\S":
-                    str = "[^" + Lexer.getWhitespaceRegExp() + "]";
-                    break;
-                case "[^]":
-                    str = "[\\s\\S]";
-                    break;
-                default:
-                    break;
+                // Allow the installed regexp factory to perform global substitutions.
+                switch (children.length) {
+                    case 0:
+                        return "";
+                    case 1:
+                        return RegExpFactory.replace(children[0].toString());
+                    default:
+                        final StringBuilder sb = new StringBuilder();
+                        for (final Object child : children) {
+                            sb.append(child);
+                        }
+                        return RegExpFactory.replace(sb.toString());
                 }
-                return str;
             }
         }
 
@@ -513,16 +503,6 @@ final class RegExpScanner extends Scanner {
         return neverMatches;
     }
 
-    /**
-     * This is used to set better error messages that can be reused
-     * in NativeRegExp for augmenting e.g. SyntaxErrors.
-     *
-     * @return an error message or null if no extra info
-     */
-    public String getErrorMessage() {
-        return errorMessage;
-    }
-
     final StringBuilder getStringBuilder() {
         return sb;
     }

From 1867421e9b997721603b4218e8f8b95dc0abb8a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Fri, 22 Feb 2013 17:00:22 +0100
Subject: [PATCH 206/311] 8006028: Integrate Joni regexp engine with Nashorn

Reviewed-by: lagergren, attila
---
 nashorn/THIRD_PARTY_README                    |   23 +
 nashorn/docs/DEVELOPER_README                 |    9 +
 .../internal/runtime/regexp/JoniRegExp.java   |  185 ++
 .../runtime/regexp/RegExpFactory.java         |   22 +-
 .../runtime/regexp/joni/Analyser.java         | 2162 +++++++++++++++++
 .../runtime/regexp/joni/ApplyCaseFold.java    |   91 +
 .../runtime/regexp/joni/ApplyCaseFoldArg.java |   35 +
 .../runtime/regexp/joni/ArrayCompiler.java    | 1263 ++++++++++
 .../runtime/regexp/joni/AsmCompiler.java      |  109 +
 .../regexp/joni/AsmCompilerSupport.java       |  267 ++
 .../internal/runtime/regexp/joni/BitSet.java  |  115 +
 .../runtime/regexp/joni/BitStatus.java        |   55 +
 .../runtime/regexp/joni/ByteCodeMachine.java  | 1462 +++++++++++
 .../runtime/regexp/joni/ByteCodePrinter.java  |  416 ++++
 .../runtime/regexp/joni/CaptureTreeNode.java  |   74 +
 .../runtime/regexp/joni/CodeRangeBuffer.java  |  378 +++
 .../runtime/regexp/joni/Compiler.java         |  178 ++
 .../internal/runtime/regexp/joni/Config.java  |  100 +
 .../runtime/regexp/joni/EncodingHelper.java   |  285 +++
 .../internal/runtime/regexp/joni/Lexer.java   | 1274 ++++++++++
 .../internal/runtime/regexp/joni/Matcher.java |  556 +++++
 .../runtime/regexp/joni/MatcherFactory.java   |   31 +
 .../runtime/regexp/joni/MinMaxLen.java        |  139 ++
 .../runtime/regexp/joni/NameEntry.java        |   97 +
 .../runtime/regexp/joni/NativeMachine.java    |   27 +
 .../runtime/regexp/joni/NodeOptInfo.java      |  125 +
 .../runtime/regexp/joni/OptAnchorInfo.java    |   92 +
 .../runtime/regexp/joni/OptEnvironment.java   |   35 +
 .../runtime/regexp/joni/OptExactInfo.java     |  153 ++
 .../runtime/regexp/joni/OptMapInfo.java       |  120 +
 .../internal/runtime/regexp/joni/Option.java  |  122 +
 .../internal/runtime/regexp/joni/Parser.java  |  953 ++++++++
 .../internal/runtime/regexp/joni/Regex.java   |  413 ++++
 .../internal/runtime/regexp/joni/Region.java  |   66 +
 .../runtime/regexp/joni/ScanEnvironment.java  |  137 ++
 .../runtime/regexp/joni/ScannerSupport.java   |  178 ++
 .../runtime/regexp/joni/SearchAlgorithm.java  |  294 +++
 .../runtime/regexp/joni/StackEntry.java       |  164 ++
 .../runtime/regexp/joni/StackMachine.java     |  621 +++++
 .../internal/runtime/regexp/joni/Syntax.java  |  628 +++++
 .../internal/runtime/regexp/joni/Token.java   |  172 ++
 .../runtime/regexp/joni/UnsetAddrList.java    |   69 +
 .../runtime/regexp/joni/WarnCallback.java     |   33 +
 .../runtime/regexp/joni/Warnings.java         |   26 +
 .../runtime/regexp/joni/ast/AnchorNode.java   |   92 +
 .../runtime/regexp/joni/ast/AnyCharNode.java  |   40 +
 .../runtime/regexp/joni/ast/BackRefNode.java  |   98 +
 .../runtime/regexp/joni/ast/CClassNode.java   |  545 +++++
 .../runtime/regexp/joni/ast/CTypeNode.java    |   50 +
 .../runtime/regexp/joni/ast/CallNode.java     |   86 +
 .../runtime/regexp/joni/ast/ConsAltNode.java  |  152 ++
 .../runtime/regexp/joni/ast/EncloseNode.java  |  151 ++
 .../runtime/regexp/joni/ast/Node.java         |  135 +
 .../regexp/joni/ast/QuantifierNode.java       |  272 +++
 .../runtime/regexp/joni/ast/StateNode.java    |  232 ++
 .../runtime/regexp/joni/ast/StringNode.java   |  207 ++
 .../regexp/joni/bench/AbstractBench.java      |   49 +
 .../joni/bench/BenchGreedyBacktrack.java      |    7 +
 .../regexp/joni/bench/BenchRailsRegs.java     |   31 +
 .../joni/bench/BenchSeveralRegexps.java       |   17 +
 .../regexp/joni/constants/AnchorType.java     |   58 +
 .../regexp/joni/constants/Arguments.java      |   31 +
 .../regexp/joni/constants/AsmConstants.java   |   49 +
 .../regexp/joni/constants/CCSTATE.java        |   27 +
 .../regexp/joni/constants/CCVALTYPE.java      |   26 +
 .../regexp/joni/constants/EncloseType.java    |   29 +
 .../regexp/joni/constants/MetaChar.java       |   31 +
 .../regexp/joni/constants/NodeStatus.java     |   39 +
 .../regexp/joni/constants/NodeType.java       |   66 +
 .../runtime/regexp/joni/constants/OPCode.java |  387 +++
 .../runtime/regexp/joni/constants/OPSize.java |   76 +
 .../runtime/regexp/joni/constants/Reduce.java |   61 +
 .../regexp/joni/constants/RegexState.java     |   28 +
 .../regexp/joni/constants/StackPopLevel.java  |   27 +
 .../regexp/joni/constants/StackType.java      |   51 +
 .../regexp/joni/constants/StringType.java     |   27 +
 .../joni/constants/SyntaxProperties.java      |  124 +
 .../regexp/joni/constants/TargetInfo.java     |   27 +
 .../regexp/joni/constants/TokenType.java      |   48 +
 .../regexp/joni/constants/Traverse.java       |   26 +
 .../regexp/joni/encoding/AsciiTables.java     |  157 ++
 .../regexp/joni/encoding/CharacterType.java   |   79 +
 .../regexp/joni/encoding/IntHolder.java       |   24 +
 .../runtime/regexp/joni/encoding/ObjPtr.java  |   35 +
 .../regexp/joni/encoding/PosixBracket.java    |   77 +
 .../runtime/regexp/joni/encoding/Ptr.java     |   35 +
 .../regexp/joni/exception/ErrorMessages.java  |   98 +
 .../joni/exception/InternalException.java     |   28 +
 .../regexp/joni/exception/JOniException.java  |   28 +
 .../joni/exception/SyntaxException.java       |   28 +
 .../regexp/joni/exception/ValueException.java |   37 +
 91 files changed, 17781 insertions(+), 1 deletion(-)
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/JoniRegExp.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Analyser.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFold.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFoldArg.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ArrayCompiler.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/AsmCompiler.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/AsmCompilerSupport.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/BitSet.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/BitStatus.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ByteCodeMachine.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ByteCodePrinter.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/CaptureTreeNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/CodeRangeBuffer.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Compiler.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Config.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/EncodingHelper.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Lexer.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Matcher.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/MatcherFactory.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/MinMaxLen.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/NameEntry.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/NativeMachine.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/NodeOptInfo.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/OptAnchorInfo.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/OptEnvironment.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/OptExactInfo.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/OptMapInfo.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Option.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Parser.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Regex.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Region.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ScanEnvironment.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ScannerSupport.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/SearchAlgorithm.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/StackEntry.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/StackMachine.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Syntax.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Token.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/UnsetAddrList.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/WarnCallback.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Warnings.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/AnchorNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/AnyCharNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/BackRefNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/CClassNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/CTypeNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/CallNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/ConsAltNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/EncloseNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/Node.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/QuantifierNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/StateNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/StringNode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/bench/AbstractBench.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/bench/BenchGreedyBacktrack.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/bench/BenchRailsRegs.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/bench/BenchSeveralRegexps.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/AnchorType.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/Arguments.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/AsmConstants.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/CCSTATE.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/CCVALTYPE.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/EncloseType.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/MetaChar.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/NodeStatus.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/NodeType.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/OPCode.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/OPSize.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/Reduce.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/RegexState.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/StackPopLevel.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/StackType.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/StringType.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/SyntaxProperties.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/TargetInfo.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/TokenType.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/Traverse.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/encoding/AsciiTables.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/encoding/CharacterType.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/encoding/IntHolder.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/encoding/ObjPtr.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/encoding/PosixBracket.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/encoding/Ptr.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/ErrorMessages.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/InternalException.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/JOniException.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/SyntaxException.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/ValueException.java

diff --git a/nashorn/THIRD_PARTY_README b/nashorn/THIRD_PARTY_README
index 546280f129c..02202a16573 100644
--- a/nashorn/THIRD_PARTY_README
+++ b/nashorn/THIRD_PARTY_README
@@ -98,3 +98,26 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --- end of LICENSE ---
+
+%% This notice is provided with respect to Joni library which is included
+with the Nashorn technology.
+
+--- begin of LICENSE ---
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+--- end of LICENSE ---
diff --git a/nashorn/docs/DEVELOPER_README b/nashorn/docs/DEVELOPER_README
index f88091cde24..3bd220b2a7c 100644
--- a/nashorn/docs/DEVELOPER_README
+++ b/nashorn/docs/DEVELOPER_README
@@ -338,6 +338,15 @@ instead redirect this to a file, specify the path to the file using
 this system property.
 
 
+SYSTEM_PROPERTY: nashorn.regexp.impl=[jdk|joni]
+
+This property defines the regular expression engine to be used by
+Nashorn. The default implementation is "jdk" which is based on the
+JDK's java.util.regex package. Set this property to "joni" to install
+an implementation based on Joni, the regular expression engine used by
+the JRuby project.
+
+
 ===============
 2. The loggers.
 ===============
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/JoniRegExp.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/JoniRegExp.java
new file mode 100644
index 00000000000..918ec20f30c
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/JoniRegExp.java
@@ -0,0 +1,185 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime.regexp;
+
+import jdk.nashorn.internal.runtime.ParserException;
+import jdk.nashorn.internal.runtime.regexp.joni.Matcher;
+import jdk.nashorn.internal.runtime.regexp.joni.Option;
+import jdk.nashorn.internal.runtime.regexp.joni.Regex;
+import jdk.nashorn.internal.runtime.regexp.joni.Region;
+import jdk.nashorn.internal.runtime.regexp.joni.Syntax;
+import jdk.nashorn.internal.runtime.regexp.joni.exception.JOniException;
+
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
+
+/**
+ * Regular expression implementation based on the Joni engine from the JRuby project.
+ */
+public class JoniRegExp extends RegExp {
+
+    /** Compiled Joni Regex */
+    private Regex regex;
+
+    /** Matcher */
+    private RegExpMatcher matcher;
+
+    /**
+     * Construct a Regular expression from the given {@code pattern} and {@code flags} strings.
+     *
+     * @param pattern RegExp pattern string
+     * @param flags RegExp flag string
+     * @throws ParserException if flags is invalid or pattern string has syntax error.
+     */
+    public JoniRegExp(final String pattern, final String flags) throws ParserException {
+        super(pattern, flags);
+
+        int option = Option.SINGLELINE;
+
+        if (this.isIgnoreCase()) {
+            option |= Option.IGNORECASE;
+        }
+        if (this.isMultiline()) {
+            option &= ~Option.SINGLELINE;
+            option |= Option.NEGATE_SINGLELINE;
+        }
+
+        try {
+            RegExpScanner parsed;
+
+            try {
+                parsed = RegExpScanner.scan(pattern);
+            } catch (final PatternSyntaxException e) {
+                // refine the exception with a better syntax error, if this
+                // passes, just rethrow what we have
+                Pattern.compile(pattern, 0);
+                throw e;
+            }
+
+            if (parsed != null) {
+                char[] javaPattern = parsed.getJavaPattern().toCharArray();
+                this.regex = new Regex(javaPattern, 0, javaPattern.length, option, Syntax.JAVASCRIPT);
+                this.groupsInNegativeLookahead = parsed.getGroupsInNegativeLookahead();
+            }
+        } catch (final PatternSyntaxException e2) {
+            throwParserException("syntax", e2.getMessage());
+        } catch (JOniException e2) {
+            throwParserException("syntax", e2.getMessage());
+        }
+    }
+
+    @Override
+    public RegExpMatcher match(final String input) {
+        if (regex == null) {
+            return null;
+        }
+
+        RegExpMatcher matcher = this.matcher;
+
+        if (matcher == null || input != matcher.getInput()) {
+            matcher = new JoniMatcher(input);
+            this.matcher = matcher;
+        }
+
+        return matcher;
+    }
+
+    /**
+     * RegExp Factory class for Joni regexp engine.
+     */
+    public static class Factory extends RegExpFactory {
+
+        @Override
+        protected RegExp compile(final String pattern, final String flags) throws ParserException {
+            return new JoniRegExp(pattern, flags);
+        }
+
+        @Override
+        protected String replaceToken(final String str) {
+            return str.equals("[^]") ? "[\\s\\S]" : str;
+        }
+    }
+
+    class JoniMatcher implements RegExpMatcher {
+        final String input;
+        final Matcher matcher;
+
+        JoniMatcher(final String input) {
+            this.input = input;
+            this.matcher = regex.matcher(input.toCharArray());
+        }
+
+        @Override
+        public boolean search(final int start) {
+            return matcher.search(start, input.length(), Option.NONE) > -1;
+        }
+
+        @Override
+        public String getInput() {
+            return input;
+        }
+
+        @Override
+        public int start() {
+            return matcher.getBegin();
+        }
+
+        @Override
+        public int start(final int group) {
+            return group == 0 ? start() : matcher.getRegion().beg[group];
+        }
+
+        @Override
+        public int end() {
+            return matcher.getEnd();
+        }
+
+        @Override
+        public int end(final int group) {
+            return group == 0 ? end() : matcher.getRegion().end[group];
+        }
+
+        @Override
+        public String group() {
+            return input.substring(matcher.getBegin(), matcher.getEnd());
+        }
+
+        @Override
+        public String group(final int group) {
+            if (group == 0) {
+                return group();
+            }
+            final Region region = matcher.getRegion();
+            return input.substring(region.beg[group], region.end[group]);
+        }
+
+        @Override
+        public int groupCount() {
+            final Region region = matcher.getRegion();
+            return region == null ? 0 : region.numRegs - 1;
+        }
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpFactory.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpFactory.java
index 158396b70a7..2cf65be76be 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpFactory.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpFactory.java
@@ -27,14 +27,34 @@ package jdk.nashorn.internal.runtime.regexp;
 
 import jdk.nashorn.internal.parser.Lexer;
 import jdk.nashorn.internal.runtime.ParserException;
+import jdk.nashorn.internal.runtime.options.Options;
 
 /**
  * Factory class for regular expressions. This class creates instances of {@link DefaultRegExp}.
+ * An alternative factory can be installed using the {@code nashorn.regexp.impl} system property.
  */
 public class RegExpFactory {
 
 
-    private final static RegExpFactory instance = new RegExpFactory();
+    private final static RegExpFactory instance;
+
+    private final static String JDK  = "jdk";
+    private final static String JONI = "joni";
+
+    static {
+        final String impl = Options.getStringProperty("nashorn.regexp.impl", JDK);
+        switch (impl) {
+            case JONI:
+                instance = new JoniRegExp.Factory();
+                break;
+            case JDK:
+                instance = new RegExpFactory();
+                break;
+            default:
+                instance = null;
+                throw new InternalError("Unsupported RegExp factory: " + impl);
+        }
+    }
 
     /**
      * Creates a Regular expression from the given {@code pattern} and {@code flags} strings.
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Analyser.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Analyser.java
new file mode 100644
index 00000000000..65d3fcd3c9a
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Analyser.java
@@ -0,0 +1,2162 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni;
+
+import static jdk.nashorn.internal.runtime.regexp.joni.BitStatus.bsAll;
+import static jdk.nashorn.internal.runtime.regexp.joni.BitStatus.bsAt;
+import static jdk.nashorn.internal.runtime.regexp.joni.BitStatus.bsClear;
+import static jdk.nashorn.internal.runtime.regexp.joni.BitStatus.bsOnAt;
+import static jdk.nashorn.internal.runtime.regexp.joni.BitStatus.bsOnAtSimple;
+import static jdk.nashorn.internal.runtime.regexp.joni.Option.isCaptureGroup;
+import static jdk.nashorn.internal.runtime.regexp.joni.Option.isFindCondition;
+import static jdk.nashorn.internal.runtime.regexp.joni.Option.isIgnoreCase;
+import static jdk.nashorn.internal.runtime.regexp.joni.Option.isMultiline;
+import static jdk.nashorn.internal.runtime.regexp.joni.ast.ConsAltNode.newAltNode;
+import static jdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode.isRepeatInfinite;
+
+import java.util.HashSet;
+
+import jdk.nashorn.internal.runtime.regexp.joni.ast.AnchorNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.BackRefNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.CClassNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.CTypeNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.CallNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.ConsAltNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.EncloseNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.Node;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.StringNode;
+import jdk.nashorn.internal.runtime.regexp.joni.constants.AnchorType;
+import jdk.nashorn.internal.runtime.regexp.joni.constants.EncloseType;
+import jdk.nashorn.internal.runtime.regexp.joni.constants.NodeType;
+import jdk.nashorn.internal.runtime.regexp.joni.constants.RegexState;
+import jdk.nashorn.internal.runtime.regexp.joni.constants.StackPopLevel;
+import jdk.nashorn.internal.runtime.regexp.joni.constants.TargetInfo;
+import jdk.nashorn.internal.runtime.regexp.joni.encoding.CharacterType;
+import jdk.nashorn.internal.runtime.regexp.joni.encoding.ObjPtr;
+import jdk.nashorn.internal.runtime.regexp.joni.encoding.Ptr;
+
+final class Analyser extends Parser {
+
+    protected Analyser(ScanEnvironment env, char[] chars, int p, int end) {
+        super(env, chars, p, end);
+    }
+
+    protected final void compile() {
+        regex.state = RegexState.COMPILING;
+
+        if (Config.DEBUG) {
+            Config.log.println(new String(chars, getBegin(), getEnd()));
+        }
+
+        reset();
+
+        regex.numMem = 0;
+        regex.numRepeat = 0;
+        regex.numNullCheck = 0;
+        //regex.repeatRangeAlloc = 0;
+        regex.repeatRangeLo = null;
+        regex.repeatRangeHi = null;
+        regex.numCombExpCheck = 0;
+
+        if (Config.USE_COMBINATION_EXPLOSION_CHECK) regex.numCombExpCheck = 0;
+
+        parse();
+
+        if (Config.USE_NAMED_GROUP) {
+            /* mixed use named group and no-named group */
+            if (env.numNamed > 0 && syntax.captureOnlyNamedGroup() && !isCaptureGroup(regex.options)) {
+                if (env.numNamed != env.numMem) {
+                    root = disableNoNameGroupCapture(root);
+                } else {
+                    numberedRefCheck(root);
+                }
+            }
+        } // USE_NAMED_GROUP
+
+        if (Config.USE_NAMED_GROUP) {
+            if (env.numCall > 0) {
+                env.unsetAddrList = new UnsetAddrList(env.numCall);
+                setupSubExpCall(root);
+                // r != 0 ???
+                subexpRecursiveCheckTrav(root);
+                // r < 0 -< err, FOUND_CALLED_NODE = 1
+                subexpInfRecursiveCheckTrav(root);
+                // r != 0  recursion infinite ???
+                regex.numCall = env.numCall;
+            } else {
+                regex.numCall = 0;
+            }
+        } // USE_NAMED_GROUP
+
+        if (Config.DEBUG_PARSE_TREE_RAW && Config.DEBUG_PARSE_TREE) {
+            Config.log.println("<RAW TREE>");
+            Config.log.println(root + "\n");
+        }
+
+        root = setupTree(root, 0);
+        if (Config.DEBUG_PARSE_TREE) {
+            if (Config.DEBUG_PARSE_TREE_RAW) Config.log.println("<TREE>");
+            root.verifyTree(new HashSet<Node>(), env.reg.warnings);
+            Config.log.println(root + "\n");
+        }
+
+        regex.captureHistory = env.captureHistory;
+        regex.btMemStart = env.btMemStart;
+        regex.btMemEnd = env.btMemEnd;
+
+        if (isFindCondition(regex.options)) {
+            regex.btMemEnd = bsAll();
+        } else {
+            regex.btMemEnd = env.btMemEnd;
+            regex.btMemEnd |= regex.captureHistory;
+        }
+
+        if (Config.USE_COMBINATION_EXPLOSION_CHECK) {
+            if (env.backrefedMem == 0 || (Config.USE_SUBEXP_CALL && env.numCall == 0)) {
+                setupCombExpCheck(root, 0);
+
+                if (Config.USE_SUBEXP_CALL && env.hasRecursion) {
+                    env.numCombExpCheck = 0;
+                } else { // USE_SUBEXP_CALL
+                    if (env.combExpMaxRegNum > 0) {
+                        for (int i=1; i<env.combExpMaxRegNum; i++) {
+                            if (bsAt(env.backrefedMem, i)) {
+                                env.numCombExpCheck = 0;
+                                break;
+                            }
+                        }
+                    }
+                }
+
+            } // USE_SUBEXP_CALL
+            regex.numCombExpCheck = env.numCombExpCheck;
+        } // USE_COMBINATION_EXPLOSION_CHECK
+
+        regex.clearOptimizeInfo();
+
+        if (!Config.DONT_OPTIMIZE) setOptimizedInfoFromTree(root);
+
+        env.memNodes = null;
+
+        new ArrayCompiler(this).compile();
+        //new AsmCompiler(this).compile();
+
+        if (regex.numRepeat != 0 || regex.btMemEnd != 0) {
+            regex.stackPopLevel = StackPopLevel.ALL;
+        } else {
+            if (regex.btMemStart != 0) {
+                regex.stackPopLevel = StackPopLevel.MEM_START;
+            } else {
+                regex.stackPopLevel = StackPopLevel.FREE;
+            }
+        }
+
+        if (Config.DEBUG_COMPILE) {
+            if (Config.USE_NAMED_GROUP) Config.log.print(regex.nameTableToString());
+            Config.log.println("stack used: " + regex.stackNeeded);
+            if (Config.USE_STRING_TEMPLATES) Config.log.print("templates: " + regex.templateNum + "\n");
+            Config.log.println(new ByteCodePrinter(regex).byteCodeListToString());
+
+        } // DEBUG_COMPILE
+
+        regex.state = RegexState.NORMAL;
+    }
+
+    private void noNameDisableMapFor_cosAlt(Node node, int[]map, Ptr counter) {
+        ConsAltNode can = (ConsAltNode)node;
+        do {
+            can.setCar(noNameDisableMap(can.car, map, counter));
+        } while ((can = can.cdr) != null);
+    }
+
+    private void noNameDisableMapFor_quantifier(Node node, int[]map, Ptr counter) {
+        QuantifierNode qn = (QuantifierNode)node;
+        Node target = qn.target;
+        Node old = target;
+        target = noNameDisableMap(target, map, counter);
+
+        if (target != old) {
+            qn.setTarget(target);
+            if (target.getType() == NodeType.QTFR) qn.reduceNestedQuantifier((QuantifierNode)target);
+        }
+    }
+
+    private Node noNameDisableMapFor_enclose(Node node, int[]map, Ptr counter) {
+        EncloseNode en = (EncloseNode)node;
+        if (en.type == EncloseType.MEMORY) {
+            if (en.isNamedGroup()) {
+                counter.p++;
+                map[en.regNum] = counter.p;
+                en.regNum = counter.p;
+                //en.target = noNameDisableMap(en.target, map, counter);
+                en.setTarget(noNameDisableMap(en.target, map, counter)); // ???
+            } else {
+                node = en.target;
+                en.target = null; // remove first enclose: /(a)(?<b>c)/
+                node = noNameDisableMap(node, map, counter);
+            }
+        } else {
+            //en.target = noNameDisableMap(en.target, map, counter);
+            en.setTarget(noNameDisableMap(en.target, map, counter)); // ???
+        }
+        return node;
+    }
+
+    private void noNameDisableMapFor_anchor(Node node, int[]map, Ptr counter) {
+        AnchorNode an = (AnchorNode)node;
+        switch (an.type) {
+            case AnchorNode.PREC_READ:
+            case AnchorNode.PREC_READ_NOT:
+            case AnchorNode.LOOK_BEHIND:
+            case AnchorNode.LOOK_BEHIND_NOT:
+                an.setTarget(noNameDisableMap(an.target, map, counter));
+        }
+    }
+
+    private Node noNameDisableMap(Node node, int[]map, Ptr counter) {
+        switch (node.getType()) {
+        case NodeType.LIST:
+        case NodeType.ALT:
+            noNameDisableMapFor_cosAlt(node, map, counter);
+            break;
+        case NodeType.QTFR:
+            noNameDisableMapFor_quantifier(node, map, counter);
+            break;
+        case NodeType.ENCLOSE:
+            node = noNameDisableMapFor_enclose(node, map, counter);
+            break;
+        case NodeType.ANCHOR:
+            noNameDisableMapFor_anchor(node, map, counter);
+            break;
+        } // switch
+        return node;
+    }
+
+    private void renumberByMap(Node node, int[]map) {
+        switch (node.getType()) {
+        case NodeType.LIST:
+        case NodeType.ALT:
+            ConsAltNode can = (ConsAltNode)node;
+            do {
+                renumberByMap(can.car, map);
+            } while ((can = can.cdr) != null);
+            break;
+
+        case NodeType.QTFR:
+            renumberByMap(((QuantifierNode)node).target, map);
+            break;
+
+        case NodeType.ENCLOSE:
+            renumberByMap(((EncloseNode)node).target, map);
+            break;
+
+        case NodeType.BREF:
+            ((BackRefNode)node).renumber(map);
+            break;
+        } // switch
+    }
+
+    protected final void numberedRefCheck(Node node) {
+        switch (node.getType()) {
+        case NodeType.LIST:
+        case NodeType.ALT:
+            ConsAltNode can = (ConsAltNode)node;
+            do {
+                numberedRefCheck(can.car);
+            } while ((can = can.cdr) != null);
+            break;
+
+        case NodeType.QTFR:
+            numberedRefCheck(((QuantifierNode)node).target);
+            break;
+
+        case NodeType.ENCLOSE:
+            numberedRefCheck(((EncloseNode)node).target);
+            break;
+
+        case NodeType.BREF:
+            BackRefNode br = (BackRefNode)node;
+            if (!br.isNameRef()) newValueException(ERR_NUMBERED_BACKREF_OR_CALL_NOT_ALLOWED);
+            break;
+        } // switch
+    }
+
+    protected final Node disableNoNameGroupCapture(Node root) {
+        int[]map = new int[env.numMem + 1];
+
+        for (int i=1; i<=env.numMem; i++) map[i] = 0;
+
+        root = noNameDisableMap(root, map, new Ptr(0));
+        renumberByMap(root, map);
+
+        for (int i=1, pos=1; i<=env.numMem; i++) {
+            if (map[i] > 0) {
+                env.memNodes[pos] = env.memNodes[i];
+                pos++;
+            }
+        }
+
+        int loc = env.captureHistory;
+        env.captureHistory = bsClear();
+
+        for (int i=1; i<=Config.MAX_CAPTURE_HISTORY_GROUP; i++) {
+            if (bsAt(loc, i)) {
+                env.captureHistory = bsOnAtSimple(env.captureHistory, map[i]);
+            }
+        }
+
+        env.numMem = env.numNamed;
+        regex.numMem = env.numNamed;
+
+        regex.renumberNameTable(map);
+
+        return root;
+    }
+
+    private void swap(Node a, Node b) {
+        a.swap(b);
+
+        if (root == b) {
+            root = a;
+        } else if (root == a) {
+            root = b;
+        }
+    }
+
+    // USE_INFINITE_REPEAT_MONOMANIAC_MEM_STATUS_CHECK
+    private int quantifiersMemoryInfo(Node node) {
+        int info = 0;
+
+        switch(node.getType()) {
+        case NodeType.LIST:
+        case NodeType.ALT:
+            ConsAltNode can = (ConsAltNode)node;
+            do {
+                int v = quantifiersMemoryInfo(can.car);
+                if (v > info) info = v;
+            } while ((can = can.cdr) != null);
+            break;
+
+        case NodeType.CALL:
+            if (Config.USE_SUBEXP_CALL) {
+                CallNode cn = (CallNode)node;
+                if (cn.isRecursion()) {
+                    return TargetInfo.IS_EMPTY_REC; /* tiny version */
+                } else {
+                    info = quantifiersMemoryInfo(cn.target);
+                }
+            } // USE_SUBEXP_CALL
+            break;
+
+        case NodeType.QTFR:
+            QuantifierNode qn = (QuantifierNode)node;
+            if (qn.upper != 0) {
+                info = quantifiersMemoryInfo(qn.target);
+            }
+            break;
+
+        case NodeType.ENCLOSE:
+            EncloseNode en = (EncloseNode)node;
+            switch (en.type) {
+            case EncloseType.MEMORY:
+                return TargetInfo.IS_EMPTY_MEM;
+
+            case EncloseType.OPTION:
+            case EncloseNode.STOP_BACKTRACK:
+                info = quantifiersMemoryInfo(en.target);
+                break;
+
+            default:
+                break;
+            } // inner switch
+            break;
+
+        case NodeType.BREF:
+        case NodeType.STR:
+        case NodeType.CTYPE:
+        case NodeType.CCLASS:
+        case NodeType.CANY:
+        case NodeType.ANCHOR:
+        default:
+            break;
+        } // switch
+
+        return info;
+    }
+
+    private int getMinMatchLength(Node node) {
+        int min = 0;
+
+        switch (node.getType()) {
+        case NodeType.BREF:
+            BackRefNode br = (BackRefNode)node;
+            if (br.isRecursion()) break;
+
+            if (br.back[0] > env.numMem) newValueException(ERR_INVALID_BACKREF);
+            min = getMinMatchLength(env.memNodes[br.back[0]]);
+
+            for (int i=1; i<br.backNum; i++) {
+                if (br.back[i] > env.numMem) newValueException(ERR_INVALID_BACKREF);
+                int tmin = getMinMatchLength(env.memNodes[br.back[i]]);
+                if (min > tmin) min = tmin;
+            }
+            break;
+
+        case NodeType.CALL:
+            if (Config.USE_SUBEXP_CALL) {
+                CallNode cn = (CallNode)node;
+                if (cn.isRecursion()) {
+                    EncloseNode en = (EncloseNode)cn.target;
+                    if (en.isMinFixed()) min = en.minLength;
+                } else {
+                    min = getMinMatchLength(cn.target);
+                }
+            } // USE_SUBEXP_CALL
+            break;
+
+        case NodeType.LIST:
+            ConsAltNode can = (ConsAltNode)node;
+            do {
+                min += getMinMatchLength(can.car);
+            } while ((can = can.cdr) != null);
+            break;
+
+        case NodeType.ALT:
+            ConsAltNode y = (ConsAltNode)node;
+            do {
+                Node x = y.car;
+                int tmin = getMinMatchLength(x);
+                if (y == node) {
+                    min = tmin;
+                } else if (min > tmin) {
+                    min = tmin;
+                }
+            } while ((y = y.cdr) != null);
+            break;
+
+        case NodeType.STR:
+            min = ((StringNode)node).length();
+            break;
+
+        case NodeType.CTYPE:
+            min = 1;
+            break;
+
+        case NodeType.CCLASS:
+        case NodeType.CANY:
+            min = 1;
+            break;
+
+        case NodeType.QTFR:
+            QuantifierNode qn = (QuantifierNode)node;
+            if (qn.lower > 0) {
+                min = getMinMatchLength(qn.target);
+                min = MinMaxLen.distanceMultiply(min, qn.lower);
+            }
+            break;
+
+        case NodeType.ENCLOSE:
+            EncloseNode en = (EncloseNode)node;
+            switch (en.type) {
+            case EncloseType.MEMORY:
+                if (Config.USE_SUBEXP_CALL) {
+                    if (en.isMinFixed()) {
+                        min = en.minLength;
+                    } else {
+                        min = getMinMatchLength(en.target);
+                        en.minLength = min;
+                        en.setMinFixed();
+                    }
+                } // USE_SUBEXP_CALL
+                break;
+
+            case EncloseType.OPTION:
+            case EncloseType.STOP_BACKTRACK:
+                min = getMinMatchLength(en.target);
+                break;
+            } // inner switch
+            break;
+
+        case NodeType.ANCHOR:
+        default:
+            break;
+        } // switch
+
+        return min;
+    }
+
+    private int getMaxMatchLength(Node node) {
+        int max = 0;
+
+        switch (node.getType()) {
+        case NodeType.LIST:
+            ConsAltNode ln = (ConsAltNode)node;
+            do {
+                int tmax = getMaxMatchLength(ln.car);
+                max = MinMaxLen.distanceAdd(max, tmax);
+            } while ((ln = ln.cdr) != null);
+            break;
+
+        case NodeType.ALT:
+            ConsAltNode an = (ConsAltNode)node;
+            do {
+                int tmax = getMaxMatchLength(an.car);
+                if (max < tmax) max = tmax;
+            } while ((an = an.cdr) != null);
+            break;
+
+        case NodeType.STR:
+            max = ((StringNode)node).length();
+            break;
+
+        case NodeType.CTYPE:
+            max = 1;
+            break;
+
+        case NodeType.CCLASS:
+        case NodeType.CANY:
+            max = 1;
+            break;
+
+        case NodeType.BREF:
+            BackRefNode br = (BackRefNode)node;
+            if (br.isRecursion()) {
+                max = MinMaxLen.INFINITE_DISTANCE;
+                break;
+            }
+
+            for (int i=0; i<br.backNum; i++) {
+                if (br.back[i] > env.numMem) newValueException(ERR_INVALID_BACKREF);
+                int tmax = getMaxMatchLength(env.memNodes[br.back[i]]);
+                if (max < tmax) max = tmax;
+            }
+            break;
+
+        case NodeType.CALL:
+            if (Config.USE_SUBEXP_CALL) {
+                CallNode cn = (CallNode)node;
+                if (!cn.isRecursion()) {
+                    max = getMaxMatchLength(cn.target);
+                } else {
+                    max = MinMaxLen.INFINITE_DISTANCE;
+                }
+            } // USE_SUBEXP_CALL
+            break;
+
+        case NodeType.QTFR:
+            QuantifierNode qn = (QuantifierNode)node;
+            if (qn.upper != 0) {
+                max = getMaxMatchLength(qn.target);
+                if (max != 0) {
+                    if (!isRepeatInfinite(qn.upper)) {
+                        max = MinMaxLen.distanceMultiply(max, qn.upper);
+                    } else {
+                        max = MinMaxLen.INFINITE_DISTANCE;
+                    }
+                }
+            }
+            break;
+
+        case NodeType.ENCLOSE:
+            EncloseNode en = (EncloseNode)node;
+            switch (en.type) {
+            case EncloseType.MEMORY:
+                if (Config.USE_SUBEXP_CALL) {
+                    if (en.isMaxFixed()) {
+                        max = en.maxLength;
+                    } else {
+                        max = getMaxMatchLength(en.target);
+                        en.maxLength = max;
+                        en.setMaxFixed();
+                    }
+                } // USE_SUBEXP_CALL
+                break;
+
+            case EncloseType.OPTION:
+            case EncloseType.STOP_BACKTRACK:
+                max = getMaxMatchLength(en.target);
+                break;
+            } // inner switch
+            break;
+
+        case NodeType.ANCHOR:
+        default:
+            break;
+        } // switch
+
+        return max;
+    }
+
+    private static final int GET_CHAR_LEN_VARLEN            = -1;
+    private static final int GET_CHAR_LEN_TOP_ALT_VARLEN    = -2;
+    protected final int getCharLengthTree(Node node) {
+        return getCharLengthTree(node, 0);
+    }
+
+    private int getCharLengthTree(Node node, int level) {
+        level++;
+
+        int len = 0;
+        returnCode = 0;
+
+        switch(node.getType()) {
+        case NodeType.LIST:
+            ConsAltNode ln = (ConsAltNode)node;
+            do {
+                int tlen = getCharLengthTree(ln.car, level);
+                if (returnCode == 0) len = MinMaxLen.distanceAdd(len, tlen);
+            } while (returnCode == 0 && (ln = ln.cdr) != null);
+            break;
+
+        case NodeType.ALT:
+            ConsAltNode an = (ConsAltNode)node;
+            boolean varLen = false;
+
+            int tlen = getCharLengthTree(an.car, level);
+            while (returnCode == 0 && (an = an.cdr) != null) {
+                int tlen2 = getCharLengthTree(an.car, level);
+                if (returnCode == 0) {
+                    if (tlen != tlen2) varLen = true;
+                }
+            }
+
+            if (returnCode == 0) {
+                if (varLen) {
+                    if (level == 1) {
+                        returnCode = GET_CHAR_LEN_TOP_ALT_VARLEN;
+                    } else {
+                        returnCode = GET_CHAR_LEN_VARLEN;
+                    }
+                } else {
+                    len = tlen;
+                }
+            }
+            break;
+
+        case NodeType.STR:
+            StringNode sn = (StringNode)node;
+            len = sn.length();
+            break;
+
+        case NodeType.QTFR:
+            QuantifierNode qn = (QuantifierNode)node;
+            if (qn.lower == qn.upper) {
+                tlen = getCharLengthTree(qn.target, level);
+                if (returnCode == 0) len = MinMaxLen.distanceMultiply(tlen, qn.lower);
+            } else {
+                returnCode = GET_CHAR_LEN_VARLEN;
+            }
+            break;
+
+        case NodeType.CALL:
+            if (Config.USE_SUBEXP_CALL) {
+                CallNode cn = (CallNode)node;
+                if (!cn.isRecursion()) {
+                    len = getCharLengthTree(cn.target, level);
+                } else {
+                    returnCode = GET_CHAR_LEN_VARLEN;
+                }
+            } // USE_SUBEXP_CALL
+            break;
+
+        case NodeType.CTYPE:
+            len = 1;
+
+        case NodeType.CCLASS:
+        case NodeType.CANY:
+            len = 1;
+            break;
+
+        case NodeType.ENCLOSE:
+            EncloseNode en = (EncloseNode)node;
+            switch(en.type) {
+            case EncloseType.MEMORY:
+                if (Config.USE_SUBEXP_CALL) {
+                    if (en.isCLenFixed()) {
+                        len = en.charLength;
+                    } else {
+                        len = getCharLengthTree(en.target, level);
+                        if (returnCode == 0) {
+                            en.charLength = len;
+                            en.setCLenFixed();
+                        }
+                    }
+                } // USE_SUBEXP_CALL
+                break;
+
+            case EncloseType.OPTION:
+            case EncloseType.STOP_BACKTRACK:
+                len = getCharLengthTree(en.target, level);
+                break;
+            } // inner switch
+            break;
+
+        case NodeType.ANCHOR:
+            break;
+
+        default:
+            returnCode = GET_CHAR_LEN_VARLEN;
+        } // switch
+        return len;
+    }
+
+    /* x is not included y ==>  1 : 0 */
+    private boolean isNotIncluded(Node x, Node y) {
+        Node tmp;
+
+        // !retry:!
+        retry: while(true) {
+
+        int yType = y.getType();
+
+        switch(x.getType()) {
+        case NodeType.CTYPE:
+            switch(yType) {
+            case NodeType.CTYPE:
+                CTypeNode cny = (CTypeNode)y;
+                CTypeNode cnx = (CTypeNode)x;
+                return cny.ctype == cnx.ctype && cny.not != cnx.not;
+
+            case NodeType.CCLASS:
+                // !swap:!
+                tmp = x;
+                x = y;
+                y = tmp;
+                // !goto retry;!
+                continue retry;
+
+            case NodeType.STR:
+                // !goto swap;!
+                tmp = x;
+                x = y;
+                y = tmp;
+                continue retry;
+
+            default:
+                break;
+            } // inner switch
+            break;
+
+        case NodeType.CCLASS:
+            CClassNode xc = (CClassNode)x;
+
+            switch(yType) {
+            case NodeType.CTYPE:
+                switch(((CTypeNode)y).ctype) {
+                case CharacterType.WORD:
+                    if (!((CTypeNode)y).not) {
+                        if (xc.mbuf == null && !xc.isNot()) {
+                            for (int i=0; i<BitSet.SINGLE_BYTE_SIZE; i++) {
+                                if (xc.bs.at(i)) {
+                                    if (EncodingHelper.isWord(i)) return false;
+                                }
+                            }
+                            return true;
+                        }
+                        return false;
+                    } else {
+                        for (int i=0; i<BitSet.SINGLE_BYTE_SIZE; i++) {
+                            if (!EncodingHelper.isWord(i)) {
+                                if (!xc.isNot()) {
+                                    if (xc.bs.at(i)) return false;
+                                } else {
+                                    if (!xc.bs.at(i)) return false;
+                                }
+                            }
+                        }
+                        return true;
+                    }
+                    // break; not reached
+
+                default:
+                    break;
+                } // inner switch
+                break;
+
+            case NodeType.CCLASS:
+                CClassNode yc = (CClassNode)y;
+
+                for (int i=0; i<BitSet.SINGLE_BYTE_SIZE; i++) {
+                    boolean v = xc.bs.at(i);
+                    if ((v && !xc.isNot()) || (!v && xc.isNot())) {
+                        v = yc.bs.at(i);
+                        if ((v && !yc.isNot()) || (!v && yc.isNot())) return false;
+                    }
+                }
+                if ((xc.mbuf == null && !xc.isNot()) || yc.mbuf == null && !yc.isNot()) return true;
+                return false;
+                // break; not reached
+
+            case NodeType.STR:
+                // !goto swap;!
+                tmp = x;
+                x = y;
+                y = tmp;
+                continue retry;
+
+            default:
+                break;
+
+            } // inner switch
+            break; // case NodeType.CCLASS
+
+        case NodeType.STR:
+            StringNode xs = (StringNode)x;
+            if (xs.length() == 0) break;
+
+            switch (yType) {
+            case NodeType.CTYPE:
+                CTypeNode cy = ((CTypeNode)y);
+                switch (cy.ctype) {
+                case CharacterType.WORD:
+                    return !cy.not;
+
+                default:
+                    break;
+
+                } // inner switch
+                break;
+
+            case NodeType.CCLASS:
+                CClassNode cc = (CClassNode)y;
+                int code = xs.chars[xs.p];
+                return !cc.isCodeInCC(code);
+
+            case NodeType.STR:
+                StringNode ys = (StringNode)y;
+                int len = xs.length();
+                if (len > ys.length()) len = ys.length();
+                if (xs.isAmbig() || ys.isAmbig()) {
+                    /* tiny version */
+                    return false;
+                } else {
+                    for (int i=0, p=ys.p, q=xs.p; i<len; i++, p++, q++) {
+                        if (ys.chars[p] != xs.chars[q]) return true;
+                    }
+                }
+                break;
+
+            default:
+                break;
+            } // inner switch
+
+            break; // case NodeType.STR
+
+        } // switch
+
+        break;
+        } // retry: while
+        return false;
+    }
+
+    private Node getHeadValueNode(Node node, boolean exact) {
+        Node n = null;
+
+        switch(node.getType()) {
+        case NodeType.BREF:
+        case NodeType.ALT:
+        case NodeType.CANY:
+            break;
+
+        case NodeType.CALL:
+            break; // if (Config.USE_SUBEXP_CALL)
+
+        case NodeType.CTYPE:
+        case NodeType.CCLASS:
+            if (!exact) n = node;
+            break;
+
+        case NodeType.LIST:
+            n = getHeadValueNode(((ConsAltNode)node).car, exact);
+            break;
+
+        case NodeType.STR:
+            StringNode sn = (StringNode)node;
+            if (sn.end <= sn.p) break; // ???
+
+            if (exact && !sn.isRaw() && isIgnoreCase(regex.options)){
+                // nothing
+            } else {
+                n = node;
+            }
+            break;
+
+        case NodeType.QTFR:
+            QuantifierNode qn = (QuantifierNode)node;
+            if (qn.lower > 0) {
+                if (qn.headExact != null) {
+                    n = qn.headExact;
+                } else {
+                    n = getHeadValueNode(qn.target, exact);
+                }
+            }
+            break;
+
+        case NodeType.ENCLOSE:
+            EncloseNode en = (EncloseNode)node;
+
+            switch (en.type) {
+            case EncloseType.OPTION:
+                int options = regex.options;
+                regex.options = en.option;
+                n = getHeadValueNode(en.target, exact);
+                regex.options = options;
+                break;
+
+            case EncloseType.MEMORY:
+            case EncloseType.STOP_BACKTRACK:
+                n = getHeadValueNode(en.target, exact);
+                break;
+            } // inner switch
+            break;
+
+        case NodeType.ANCHOR:
+            AnchorNode an = (AnchorNode)node;
+            if (an.type == AnchorType.PREC_READ) n = getHeadValueNode(an.target, exact);
+            break;
+
+        default:
+            break;
+        } // switch
+
+        return n;
+    }
+
+    // true: invalid
+    private boolean checkTypeTree(Node node, int typeMask, int encloseMask, int anchorMask) {
+        if ((node.getType2Bit() & typeMask) == 0) return true;
+
+        boolean invalid = false;
+
+        switch(node.getType()) {
+        case NodeType.LIST:
+        case NodeType.ALT:
+            ConsAltNode can = (ConsAltNode)node;
+            do {
+                invalid = checkTypeTree(can.car, typeMask, encloseMask, anchorMask);
+            } while (!invalid && (can = can.cdr) != null);
+            break;
+
+        case NodeType.QTFR:
+            invalid = checkTypeTree(((QuantifierNode)node).target, typeMask, encloseMask, anchorMask);
+            break;
+
+        case NodeType.ENCLOSE:
+            EncloseNode en = (EncloseNode)node;
+            if ((en.type & encloseMask) == 0) return true;
+            invalid = checkTypeTree(en.target, typeMask, encloseMask, anchorMask);
+            break;
+
+        case NodeType.ANCHOR:
+            AnchorNode an = (AnchorNode)node;
+            if ((an.type & anchorMask) == 0) return true;
+
+            if (an.target != null) invalid = checkTypeTree(an.target, typeMask, encloseMask, anchorMask);
+            break;
+
+        default:
+            break;
+
+        } // switch
+
+        return invalid;
+    }
+
+    private static final int RECURSION_EXIST       = 1;
+    private static final int RECURSION_INFINITE    = 2;
+    private int subexpInfRecursiveCheck(Node node, boolean head) {
+        int r = 0;
+
+        switch (node.getType()) {
+        case NodeType.LIST:
+            int min;
+            ConsAltNode x = (ConsAltNode)node;
+            do {
+                int ret = subexpInfRecursiveCheck(x.car, head);
+                if (ret == RECURSION_INFINITE) return ret;
+                r |= ret;
+                if (head) {
+                    min = getMinMatchLength(x.car);
+                    if (min != 0) head = false;
+                }
+            } while ((x = x.cdr) != null);
+            break;
+
+        case NodeType.ALT:
+            ConsAltNode can = (ConsAltNode)node;
+            r = RECURSION_EXIST;
+            do {
+                int ret = subexpInfRecursiveCheck(can.car, head);
+                if (ret == RECURSION_INFINITE) return ret;
+                r &= ret;
+            } while ((can = can.cdr) != null);
+            break;
+
+        case NodeType.QTFR:
+            QuantifierNode qn = (QuantifierNode)node;
+            r = subexpInfRecursiveCheck(qn.target, head);
+            if (r == RECURSION_EXIST) {
+                if (qn.lower == 0) r = 0;
+            }
+            break;
+
+        case NodeType.ANCHOR:
+            AnchorNode an = (AnchorNode)node;
+            switch (an.type) {
+            case AnchorType.PREC_READ:
+            case AnchorType.PREC_READ_NOT:
+            case AnchorType.LOOK_BEHIND:
+            case AnchorType.LOOK_BEHIND_NOT:
+                r = subexpInfRecursiveCheck(an.target, head);
+                break;
+            } // inner switch
+            break;
+
+        case NodeType.CALL:
+            r = subexpInfRecursiveCheck(((CallNode)node).target, head);
+            break;
+
+        case NodeType.ENCLOSE:
+            EncloseNode en = (EncloseNode)node;
+            if (en.isMark2()) {
+                return 0;
+            } else if (en.isMark1()) {
+                return !head ? RECURSION_EXIST : RECURSION_INFINITE;
+                // throw exception here ???
+            } else {
+                en.setMark2();
+                r = subexpInfRecursiveCheck(en.target, head);
+                en.clearMark2();
+            }
+            break;
+
+        default:
+            break;
+        } // switch
+        return r;
+    }
+
+    protected final int subexpInfRecursiveCheckTrav(Node node) {
+        int r = 0;
+
+        switch (node.getType()) {
+        case NodeType.LIST:
+        case NodeType.ALT:
+            ConsAltNode can = (ConsAltNode)node;
+            do {
+                r = subexpInfRecursiveCheckTrav(can.car);
+            } while (r == 0 && (can = can.cdr) != null);
+            break;
+
+        case NodeType.QTFR:
+            r = subexpInfRecursiveCheckTrav(((QuantifierNode)node).target);
+            break;
+
+        case NodeType.ANCHOR:
+            AnchorNode an = (AnchorNode)node;
+            switch (an.type) {
+            case AnchorType.PREC_READ:
+            case AnchorType.PREC_READ_NOT:
+            case AnchorType.LOOK_BEHIND:
+            case AnchorType.LOOK_BEHIND_NOT:
+                r = subexpInfRecursiveCheckTrav(an.target);
+                break;
+            } // inner switch
+            break;
+
+        case NodeType.ENCLOSE:
+            EncloseNode en = (EncloseNode)node;
+            if (en.isRecursion()) {
+                en.setMark1();
+                r = subexpInfRecursiveCheck(en.target, true);
+                if (r > 0) newValueException(ERR_NEVER_ENDING_RECURSION);
+                en.clearMark1();
+            }
+            r = subexpInfRecursiveCheckTrav(en.target);
+            break;
+
+        default:
+            break;
+        } // switch
+
+        return r;
+    }
+
+    private int subexpRecursiveCheck(Node node) {
+        int r = 0;
+
+        switch (node.getType()) {
+        case NodeType.LIST:
+        case NodeType.ALT:
+            ConsAltNode can = (ConsAltNode)node;
+            do {
+                r |= subexpRecursiveCheck(can.car);
+            } while ((can = can.cdr) != null);
+            break;
+
+        case NodeType.QTFR:
+            r = subexpRecursiveCheck(((QuantifierNode)node).target);
+            break;
+
+        case NodeType.ANCHOR:
+            AnchorNode an = (AnchorNode)node;
+            switch (an.type) {
+            case AnchorType.PREC_READ:
+            case AnchorType.PREC_READ_NOT:
+            case AnchorType.LOOK_BEHIND:
+            case AnchorType.LOOK_BEHIND_NOT:
+                r = subexpRecursiveCheck(an.target);
+                break;
+            } // inner switch
+            break;
+
+        case NodeType.CALL:
+            CallNode cn = (CallNode)node;
+            r = subexpRecursiveCheck(cn.target);
+            if (r != 0) cn.setRecursion();
+            break;
+
+        case NodeType.ENCLOSE:
+            EncloseNode en = (EncloseNode)node;
+            if (en.isMark2()) {
+                return 0;
+            } else if (en.isMark1()) {
+                return 1; /* recursion */
+            } else {
+                en.setMark2();
+                r = subexpRecursiveCheck(en.target);
+                en.clearMark2();
+            }
+            break;
+
+        default:
+            break;
+        } // switch
+
+        return r;
+    }
+
+    private static final int FOUND_CALLED_NODE  = 1;
+    protected final int subexpRecursiveCheckTrav(Node node) {
+        int r = 0;
+
+        switch (node.getType()) {
+        case NodeType.LIST:
+        case NodeType.ALT:
+            ConsAltNode can = (ConsAltNode)node;
+            do {
+                int ret = subexpRecursiveCheckTrav(can.car);
+                if (ret == FOUND_CALLED_NODE) {
+                    r = FOUND_CALLED_NODE;
+                }
+                // else if (ret < 0) return ret; ???
+            } while ((can = can.cdr) != null);
+            break;
+
+        case NodeType.QTFR:
+            QuantifierNode qn = (QuantifierNode)node;
+            r = subexpRecursiveCheckTrav(qn.target);
+            if (qn.upper == 0) {
+                if (r == FOUND_CALLED_NODE) qn.isRefered = true;
+            }
+            break;
+
+        case NodeType.ANCHOR:
+            AnchorNode an = (AnchorNode)node;
+            switch (an.type) {
+            case AnchorType.PREC_READ:
+            case AnchorType.PREC_READ_NOT:
+            case AnchorType.LOOK_BEHIND:
+            case AnchorType.LOOK_BEHIND_NOT:
+                r = subexpRecursiveCheckTrav(an.target);
+                break;
+            } // inner switch
+            break;
+
+        case NodeType.ENCLOSE:
+            EncloseNode en = (EncloseNode)node;
+            if (!en.isRecursion()) {
+                if (en.isCalled()) {
+                    en.setMark1();
+                    r = subexpRecursiveCheck(en.target);
+                    if (r != 0) en.setRecursion();
+                    en.clearMark1();
+                }
+            }
+            r = subexpRecursiveCheckTrav(en.target);
+            if (en.isCalled()) r |= FOUND_CALLED_NODE;
+            break;
+
+        default:
+            break;
+        } // switch
+
+        return r;
+    }
+
+    private void setCallAttr(CallNode cn) {
+        cn.target = env.memNodes[cn.groupNum]; // no setTarget in call nodes!
+        if (cn.target == null) newValueException(ERR_UNDEFINED_NAME_REFERENCE, cn.nameP, cn.nameEnd);
+
+        ((EncloseNode)cn.target).setCalled();
+        env.btMemStart = BitStatus.bsOnAt(env.btMemStart, cn.groupNum);
+        cn.unsetAddrList = env.unsetAddrList;
+    }
+
+    protected final void setupSubExpCall(Node node) {
+
+        switch(node.getType()) {
+        case NodeType.LIST:
+            ConsAltNode ln = (ConsAltNode)node;
+            do {
+                setupSubExpCall(ln.car);
+            } while ((ln = ln.cdr) != null);
+            break;
+
+        case NodeType.ALT:
+            ConsAltNode can = (ConsAltNode)node;
+            do {
+                setupSubExpCall(can.car);
+            } while ((can = can.cdr) != null);
+            break;
+
+        case NodeType.QTFR:
+            setupSubExpCall(((QuantifierNode)node).target);
+            break;
+
+        case NodeType.ENCLOSE:
+            setupSubExpCall(((EncloseNode)node).target);
+            break;
+
+        case NodeType.CALL:
+            CallNode cn = (CallNode)node;
+
+            if (cn.groupNum != 0) {
+                int gNum = cn.groupNum;
+
+                if (Config.USE_NAMED_GROUP) {
+                    if (env.numNamed > 0 && syntax.captureOnlyNamedGroup() && !isCaptureGroup(env.option)) {
+                        newValueException(ERR_NUMBERED_BACKREF_OR_CALL_NOT_ALLOWED);
+                    }
+                } // USE_NAMED_GROUP
+                if (gNum > env.numMem) newValueException(ERR_UNDEFINED_GROUP_REFERENCE, cn.nameP, cn.nameEnd);
+                setCallAttr(cn);
+            } else {
+                if (Config.USE_NAMED_GROUP) {
+                    NameEntry ne = regex.nameToGroupNumbers(cn.name, cn.nameP, cn.nameEnd);
+
+                    if (ne == null) {
+                        newValueException(ERR_UNDEFINED_NAME_REFERENCE, cn.nameP, cn.nameEnd);
+                    } else if (ne.backNum > 1) {
+                        newValueException(ERR_MULTIPLEX_DEFINITION_NAME_CALL, cn.nameP, cn.nameEnd);
+                    } else {
+                        cn.groupNum = ne.backRef1; // ne.backNum == 1 ? ne.backRef1 : ne.backRefs[0]; // ??? need to check ?
+                        setCallAttr(cn);
+                    }
+                }
+            }
+            break;
+
+        case NodeType.ANCHOR:
+            AnchorNode an = (AnchorNode)node;
+            switch (an.type) {
+            case AnchorType.PREC_READ:
+            case AnchorType.PREC_READ_NOT:
+            case AnchorType.LOOK_BEHIND:
+            case AnchorType.LOOK_BEHIND_NOT:
+                setupSubExpCall(an.target);
+                break;
+            }
+            break;
+
+        } // switch
+    }
+
+    /* divide different length alternatives in look-behind.
+    (?<=A|B) ==> (?<=A)|(?<=B)
+    (?<!A|B) ==> (?<!A)(?<!B)
+     */
+    private Node divideLookBehindAlternatives(Node node) {
+        AnchorNode an = (AnchorNode)node;
+        int anchorType = an.type;
+        Node head = an.target;
+        Node np = ((ConsAltNode)head).car;
+
+        swap(node, head);
+
+        Node tmp = node;
+        node = head;
+        head = tmp;
+
+        ((ConsAltNode)node).setCar(head);
+        ((AnchorNode)head).setTarget(np);
+        np = node;
+
+        while ((np = ((ConsAltNode)np).cdr) != null) {
+            AnchorNode insert = new AnchorNode(anchorType);
+            insert.setTarget(((ConsAltNode)np).car);
+            ((ConsAltNode)np).setCar(insert);
+        }
+
+        if (anchorType == AnchorType.LOOK_BEHIND_NOT) {
+            np = node;
+            do {
+                ((ConsAltNode)np).toListNode(); /* alt -> list */
+            } while ((np = ((ConsAltNode)np).cdr) != null);
+        }
+
+        return node;
+    }
+
+    private Node setupLookBehind(Node node) {
+        AnchorNode an = (AnchorNode)node;
+        int len = getCharLengthTree(an.target);
+        switch(returnCode) {
+        case 0:
+            an.charLength = len;
+            break;
+        case GET_CHAR_LEN_VARLEN:
+            newSyntaxException(ERR_INVALID_LOOK_BEHIND_PATTERN);
+            break;
+        case GET_CHAR_LEN_TOP_ALT_VARLEN:
+            if (syntax.differentLengthAltLookBehind()) {
+                return divideLookBehindAlternatives(node);
+            } else {
+                newSyntaxException(ERR_INVALID_LOOK_BEHIND_PATTERN);
+            }
+        }
+        return node;
+    }
+
+    private void nextSetup(Node node, Node nextNode) {
+        // retry:
+        retry: while(true) {
+
+        int type = node.getType();
+        if (type == NodeType.QTFR) {
+            QuantifierNode qn = (QuantifierNode)node;
+            if (qn.greedy && isRepeatInfinite(qn.upper)) {
+                if (Config.USE_QTFR_PEEK_NEXT) {
+                    StringNode n = (StringNode)getHeadValueNode(nextNode, true);
+                    /* '\0': for UTF-16BE etc... */
+                    if (n != null && n.chars[n.p] != 0) { // ?????????
+                        qn.nextHeadExact = n;
+                    }
+                } // USE_QTFR_PEEK_NEXT
+                /* automatic posseivation a*b ==> (?>a*)b */
+                if (qn.lower <= 1) {
+                    if (qn.target.isSimple()) {
+                        Node x = getHeadValueNode(qn.target, false);
+                        if (x != null) {
+                            Node y = getHeadValueNode(nextNode, false);
+                            if (y != null && isNotIncluded(x, y)) {
+                                EncloseNode en = new EncloseNode(EncloseType.STOP_BACKTRACK); //onig_node_new_enclose
+                                en.setStopBtSimpleRepeat();
+                                //en.setTarget(qn.target); // optimize it ??
+                                swap(node, en);
+
+                                en.setTarget(node);
+                            }
+                        }
+                    }
+                }
+            }
+        } else if (type == NodeType.ENCLOSE) {
+            EncloseNode en = (EncloseNode)node;
+            if (en.isMemory()) {
+                node = en.target;
+                // !goto retry;!
+                continue retry;
+            }
+        }
+
+        break;
+        } // while
+    }
+
+    private void updateStringNodeCaseFoldMultiByte(StringNode sn) {
+        char[] chars = sn.chars;
+        int end = sn.end;
+        value = sn.p;
+        int sp = 0;
+        char buf;
+
+        while (value < end) {
+            int ovalue = value;
+            buf = Character.toLowerCase(chars[value++]);
+
+            if (chars[ovalue] != buf) {
+
+                char[] sbuf = new char[sn.length() << 1];
+                System.arraycopy(chars, sn.p, sbuf, 0, ovalue - sn.p);
+                value = ovalue;
+                while (value < end) {
+                    buf = Character.toLowerCase(chars[value++]);
+                    if (sp >= sbuf.length) {
+                        char[]tmp = new char[sbuf.length << 1];
+                        System.arraycopy(sbuf, 0, tmp, 0, sbuf.length);
+                        sbuf = tmp;
+                    }
+                    sbuf[sp++] = buf;
+                }
+                sn.set(sbuf, 0, sp);
+                return;
+            }
+            sp++;
+        }
+    }
+
+    private void updateStringNodeCaseFold(Node node) {
+        StringNode sn = (StringNode)node;
+        updateStringNodeCaseFoldMultiByte(sn);
+    }
+
+    private Node expandCaseFoldMakeRemString(char[] chars, int p, int end) {
+        StringNode node = new StringNode(chars, p, end);
+
+        updateStringNodeCaseFold(node);
+        node.setAmbig();
+        node.setDontGetOptInfo();
+        return node;
+    }
+
+    private boolean expandCaseFoldStringAlt(int itemNum, char[] items,
+                                              char[] chars, int p, int slen, int end, ObjPtr<Node> node) {
+
+        ConsAltNode altNode;
+        node.p = altNode = newAltNode(null, null);
+
+        StringNode snode = new StringNode(chars, p, p + slen);
+        altNode.setCar(snode);
+
+        for (int i=0; i<itemNum; i++) {
+            snode = new StringNode();
+
+            snode.catCode(items[i]);
+
+            ConsAltNode an = newAltNode(null, null);
+            an.setCar(snode);
+            altNode.setCdr(an);
+            altNode = an;
+        }
+        return false;
+    }
+
+    private static final int THRESHOLD_CASE_FOLD_ALT_FOR_EXPANSION = 8;
+    private Node expandCaseFoldString(Node node) {
+        StringNode sn = (StringNode)node;
+
+        if (sn.isAmbig() || sn.length() <= 0) return node;
+
+        char[] chars = sn.chars;
+        int p = sn.p;
+        int end = sn.end;
+        int altNum = 1;
+
+        ConsAltNode topRoot = null, root = null;
+        ObjPtr<Node> prevNode = new ObjPtr<Node>();
+        StringNode stringNode = null;
+
+        while (p < end) {
+            char[] items = EncodingHelper.caseFoldCodesByString(regex.caseFoldFlag, chars[p]);
+
+            if (items.length == 0) {
+                if (stringNode == null) {
+                    if (root == null && prevNode.p != null) {
+                        topRoot = root = ConsAltNode.listAdd(null, prevNode.p);
+                    }
+
+                    prevNode.p = stringNode = new StringNode(); // onig_node_new_str(NULL, NULL);
+
+                    if (root != null) ConsAltNode.listAdd(root, stringNode);
+
+                }
+
+                stringNode.cat(chars, p, p + 1);
+            } else {
+                altNum *= (items.length + 1);
+                if (altNum > THRESHOLD_CASE_FOLD_ALT_FOR_EXPANSION) break;
+
+                if (root == null && prevNode.p != null) {
+                    topRoot = root = ConsAltNode.listAdd(null, prevNode.p);
+                }
+
+                expandCaseFoldStringAlt(items.length, items, chars, p, 1, end, prevNode);
+                if (root != null) ConsAltNode.listAdd(root, prevNode.p);
+                stringNode = null;
+            }
+            p++;
+        }
+
+        if (p < end) {
+            Node srem = expandCaseFoldMakeRemString(chars, p, end);
+
+            if (prevNode.p != null && root == null) {
+                topRoot = root = ConsAltNode.listAdd(null, prevNode.p);
+            }
+
+            if (root == null) {
+                prevNode.p = srem;
+            } else {
+                ConsAltNode.listAdd(root, srem);
+            }
+        }
+        /* ending */
+        Node xnode = topRoot != null ? topRoot : prevNode.p;
+
+        swap(node, xnode);
+        return xnode;
+    }
+
+    private static final int CEC_THRES_NUM_BIG_REPEAT       = 512;
+    private static final int CEC_INFINITE_NUM               = 0x7fffffff;
+
+    private static final int CEC_IN_INFINITE_REPEAT         = (1<<0);
+    private static final int CEC_IN_FINITE_REPEAT           = (1<<1);
+    private static final int CEC_CONT_BIG_REPEAT            = (1<<2);
+
+    protected final int setupCombExpCheck(Node node, int state) {
+        int r = state;
+        int ret;
+
+        switch (node.getType()) {
+        case NodeType.LIST:
+            ConsAltNode ln = (ConsAltNode)node;
+
+            do {
+                r = setupCombExpCheck(ln.car, r);
+                //prev = ((ConsAltNode)node).car;
+            } while (r >= 0 && (ln = ln.cdr) != null);
+            break;
+
+        case NodeType.ALT:
+            ConsAltNode an = (ConsAltNode)node;
+            do {
+                ret = setupCombExpCheck(an.car, state);
+                r |= ret;
+            } while (ret >= 0 && (an = an.cdr) != null);
+            break;
+
+        case NodeType.QTFR:
+            QuantifierNode qn = (QuantifierNode)node;
+            int childState = state;
+            int addState = 0;
+            int varNum;
+
+            if (!isRepeatInfinite(qn.upper)) {
+                if (qn.upper > 1) {
+                    /* {0,1}, {1,1} are allowed */
+                    childState |= CEC_IN_FINITE_REPEAT;
+
+                    /* check (a*){n,m}, (a+){n,m} => (a*){n,n}, (a+){n,n} */
+                    if (env.backrefedMem == 0) {
+                        if (qn.target.getType() == NodeType.ENCLOSE) {
+                            EncloseNode en = (EncloseNode)qn.target;
+                            if (en.type == EncloseType.MEMORY) {
+                                if (en.target.getType() == NodeType.QTFR) {
+                                    QuantifierNode q = (QuantifierNode)en.target;
+                                    if (isRepeatInfinite(q.upper) && q.greedy == qn.greedy) {
+                                        qn.upper = qn.lower == 0 ? 1 : qn.lower;
+                                        if (qn.upper == 1) childState = state;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            if ((state & CEC_IN_FINITE_REPEAT) != 0) {
+                qn.combExpCheckNum = -1;
+            } else {
+                if (isRepeatInfinite(qn.upper)) {
+                    varNum = CEC_INFINITE_NUM;
+                    childState |= CEC_IN_INFINITE_REPEAT;
+                } else {
+                    varNum = qn.upper - qn.lower;
+                }
+
+                if (varNum >= CEC_THRES_NUM_BIG_REPEAT) addState |= CEC_CONT_BIG_REPEAT;
+
+                if (((state & CEC_IN_INFINITE_REPEAT) != 0 && varNum != 0) ||
+                   ((state & CEC_CONT_BIG_REPEAT) != 0 && varNum >= CEC_THRES_NUM_BIG_REPEAT)) {
+                    if (qn.combExpCheckNum == 0) {
+                        env.numCombExpCheck++;
+                        qn.combExpCheckNum = env.numCombExpCheck;
+                        if (env.currMaxRegNum > env.combExpMaxRegNum) {
+                            env.combExpMaxRegNum = env.currMaxRegNum;
+                        }
+                    }
+                }
+            }
+            r = setupCombExpCheck(qn.target, childState);
+            r |= addState;
+            break;
+
+        case NodeType.ENCLOSE:
+            EncloseNode en = (EncloseNode)node;
+            switch( en.type) {
+            case EncloseNode.MEMORY:
+                if (env.currMaxRegNum < en.regNum) {
+                    env.currMaxRegNum = en.regNum;
+                }
+                r = setupCombExpCheck(en.target, state);
+                break;
+
+            default:
+                r = setupCombExpCheck(en.target, state);
+            } // inner switch
+            break;
+
+        case NodeType.CALL:
+            if (Config.USE_SUBEXP_CALL) {
+                CallNode cn = (CallNode)node;
+                if (cn.isRecursion()) {
+                    env.hasRecursion = true;
+                } else {
+                    r = setupCombExpCheck(cn.target, state);
+                }
+            } // USE_SUBEXP_CALL
+            break;
+
+        default:
+            break;
+
+        } // switch
+
+        return r;
+    }
+
+    private static final int IN_ALT                     = (1<<0);
+    private static final int IN_NOT                     = (1<<1);
+    private static final int IN_REPEAT                  = (1<<2);
+    private static final int IN_VAR_REPEAT              = (1<<3);
+    private static final int EXPAND_STRING_MAX_LENGTH   = 100;
+
+    /* setup_tree does the following work.
+    1. check empty loop. (set qn->target_empty_info)
+    2. expand ignore-case in char class.
+    3. set memory status bit flags. (reg->mem_stats)
+    4. set qn->head_exact for [push, exact] -> [push_or_jump_exact1, exact].
+    5. find invalid patterns in look-behind.
+    6. expand repeated string.
+    */
+    protected final Node setupTree(Node node, int state) {
+        restart: while (true) {
+        switch (node.getType()) {
+        case NodeType.LIST:
+            ConsAltNode lin = (ConsAltNode)node;
+            Node prev = null;
+            do {
+                setupTree(lin.car, state);
+                if (prev != null) {
+                    nextSetup(prev, lin.car);
+                }
+                prev = lin.car;
+            } while ((lin = lin.cdr) != null);
+            break;
+
+        case NodeType.ALT:
+            ConsAltNode aln = (ConsAltNode)node;
+            do {
+                setupTree(aln.car, (state | IN_ALT));
+            } while ((aln = aln.cdr) != null);
+            break;
+
+        case NodeType.CCLASS:
+            break;
+
+        case NodeType.STR:
+            if (isIgnoreCase(regex.options) && !((StringNode)node).isRaw()) {
+                node = expandCaseFoldString(node);
+            }
+            break;
+
+        case NodeType.CTYPE:
+        case NodeType.CANY:
+            break;
+
+        case NodeType.CALL: // if (Config.USE_SUBEXP_CALL) ?
+            break;
+
+        case NodeType.BREF:
+            BackRefNode br = (BackRefNode)node;
+            for (int i=0; i<br.backNum; i++) {
+                if (br.back[i] > env.numMem) newValueException(ERR_INVALID_BACKREF);
+                env.backrefedMem = bsOnAt(env.backrefedMem, br.back[i]);
+                env.btMemStart = bsOnAt(env.btMemStart, br.back[i]);
+                if (Config.USE_BACKREF_WITH_LEVEL) {
+                    if (br.isNestLevel()) {
+                        env.btMemEnd = bsOnAt(env.btMemEnd, br.back[i]);
+                    }
+                } // USE_BACKREF_AT_LEVEL
+                ((EncloseNode)env.memNodes[br.back[i]]).setMemBackrefed();
+            }
+            break;
+
+        case NodeType.QTFR:
+            QuantifierNode qn = (QuantifierNode)node;
+            Node target = qn.target;
+
+            if ((state & IN_REPEAT) != 0) qn.setInRepeat();
+
+            if (isRepeatInfinite(qn.upper) || qn.lower >= 1) {
+                int d = getMinMatchLength(target);
+                if (d == 0) {
+                    qn.targetEmptyInfo = TargetInfo.IS_EMPTY;
+                    if (Config.USE_MONOMANIAC_CHECK_CAPTURES_IN_ENDLESS_REPEAT) {
+                        int info = quantifiersMemoryInfo(target);
+                        if (info > 0) qn.targetEmptyInfo = info;
+                    } // USE_INFINITE_REPEAT_MONOMANIAC_MEM_STATUS_CHECK
+                    // strange stuff here (turned off)
+                }
+            }
+
+            state |= IN_REPEAT;
+            if (qn.lower != qn.upper) state |= IN_VAR_REPEAT;
+
+            target = setupTree(target, state);
+
+            /* expand string */
+            if (target.getType() == NodeType.STR) {
+                if (!isRepeatInfinite(qn.lower) && qn.lower == qn.upper &&
+                    qn.lower > 1 && qn.lower <= EXPAND_STRING_MAX_LENGTH) {
+                    StringNode sn = (StringNode)target;
+                    int len = sn.length();
+
+                    if (len * qn.lower <= EXPAND_STRING_MAX_LENGTH) {
+                        StringNode str = qn.convertToString(sn.flag);
+                        int n = qn.lower;
+                        for (int i = 0; i < n; i++) {
+                            str.cat(sn.chars, sn.p, sn.end);
+                        }
+                        break; /* break case NT_QTFR: */
+                    }
+
+                }
+            }
+            if (Config.USE_OP_PUSH_OR_JUMP_EXACT) {
+                if (qn.greedy && qn.targetEmptyInfo != 0) {
+                    if (target.getType() == NodeType.QTFR) {
+                        QuantifierNode tqn = (QuantifierNode)target;
+                        if (tqn.headExact != null) {
+                            qn.headExact = tqn.headExact;
+                            tqn.headExact = null;
+                        }
+                    } else {
+                        qn.headExact = getHeadValueNode(qn.target, true);
+                    }
+                }
+            } // USE_OP_PUSH_OR_JUMP_EXACT
+            break;
+
+        case NodeType.ENCLOSE:
+            EncloseNode en = (EncloseNode)node;
+            switch (en.type) {
+            case EncloseType.OPTION:
+                int options = regex.options;
+                regex.options = en.option;
+                setupTree(en.target, state);
+                regex.options = options;
+                break;
+
+            case EncloseType.MEMORY:
+                if ((state & (IN_ALT | IN_NOT | IN_VAR_REPEAT)) != 0) {
+                    env.btMemStart = bsOnAt(env.btMemStart, en.regNum);
+                    /* SET_ENCLOSE_STATUS(node, NST_MEM_IN_ALT_NOT); */
+
+                }
+                setupTree(en.target, state);
+                break;
+
+            case EncloseType.STOP_BACKTRACK:
+                setupTree(en.target, state);
+                if (en.target.getType() == NodeType.QTFR) {
+                    QuantifierNode tqn = (QuantifierNode)en.target;
+                    if (isRepeatInfinite(tqn.upper) && tqn.lower <= 1 && tqn.greedy) {
+                        /* (?>a*), a*+ etc... */
+                        if (tqn.target.isSimple()) en.setStopBtSimpleRepeat();
+                    }
+                }
+                break;
+
+            } // inner switch
+            break;
+
+        case NodeType.ANCHOR:
+            AnchorNode an = (AnchorNode)node;
+            switch (an.type) {
+            case AnchorType.PREC_READ:
+                setupTree(an.target, state);
+                break;
+
+            case AnchorType.PREC_READ_NOT:
+                setupTree(an.target, (state | IN_NOT));
+                break;
+
+            case AnchorType.LOOK_BEHIND:
+                if (checkTypeTree(an.target, NodeType.ALLOWED_IN_LB, EncloseType.ALLOWED_IN_LB, AnchorType.ALLOWED_IN_LB)) newSyntaxException(ERR_INVALID_LOOK_BEHIND_PATTERN);
+                node = setupLookBehind(node);
+                if (node.getType() != NodeType.ANCHOR) continue restart;
+                setupTree(((AnchorNode)node).target, state);
+                break;
+
+            case AnchorType.LOOK_BEHIND_NOT:
+                if (checkTypeTree(an.target, NodeType.ALLOWED_IN_LB, EncloseType.ALLOWED_IN_LB, AnchorType.ALLOWED_IN_LB)) newSyntaxException(ERR_INVALID_LOOK_BEHIND_PATTERN);
+                node = setupLookBehind(node);
+                if (node.getType() != NodeType.ANCHOR) continue restart;
+                setupTree(((AnchorNode)node).target, (state | IN_NOT));
+                break;
+
+            } // inner switch
+            break;
+        } // switch
+        return node;
+        } // restart: while
+    }
+
+    private static final int MAX_NODE_OPT_INFO_REF_COUNT   = 5;
+    private void optimizeNodeLeft(Node node, NodeOptInfo opt, OptEnvironment oenv) { // oenv remove, pass mmd
+        opt.clear();
+        opt.setBoundNode(oenv.mmd);
+
+        switch (node.getType()) {
+        case NodeType.LIST: {
+            OptEnvironment nenv = new OptEnvironment();
+            NodeOptInfo nopt = new NodeOptInfo();
+            nenv.copy(oenv);
+            ConsAltNode lin = (ConsAltNode)node;
+            do {
+                optimizeNodeLeft(lin.car, nopt, nenv);
+                nenv.mmd.add(nopt.length);
+                opt.concatLeftNode(nopt);
+            } while ((lin = lin.cdr) != null);
+            break;
+        }
+
+        case NodeType.ALT: {
+            NodeOptInfo nopt = new NodeOptInfo();
+            ConsAltNode aln = (ConsAltNode)node;
+            do {
+                optimizeNodeLeft(aln.car, nopt, oenv);
+                if (aln == node) {
+                    opt.copy(nopt);
+                } else {
+                    opt.altMerge(nopt, oenv);
+                }
+            } while ((aln = aln.cdr) != null);
+            break;
+        }
+
+        case NodeType.STR: {
+            StringNode sn = (StringNode)node;
+
+            int slen = sn.length();
+
+            if (!sn.isAmbig()) {
+                opt.exb.concatStr(sn.chars, sn.p, sn.end, sn.isRaw());
+
+                if (slen > 0) {
+                    opt.map.addChar(sn.chars[sn.p]);
+                }
+
+                opt.length.set(slen, slen);
+            } else {
+                int max;
+                if (sn.isDontGetOptInfo()) {
+                    max = sn.length();
+                } else {
+                    opt.exb.concatStr(sn.chars, sn.p, sn.end, sn.isRaw());
+                    opt.exb.ignoreCase = true;
+
+                    if (slen > 0) {
+                        opt.map.addCharAmb(sn.chars, sn.p, sn.end, oenv.caseFoldFlag);
+                    }
+
+                    max = slen;
+                }
+                opt.length.set(slen, max);
+            }
+
+            if (opt.exb.length == slen) {
+                opt.exb.reachEnd = true;
+            }
+            break;
+        }
+
+        case NodeType.CCLASS: {
+            CClassNode cc = (CClassNode)node;
+            /* no need to check ignore case. (setted in setup_tree()) */
+            if (cc.mbuf != null || cc.isNot()) {
+                opt.length.set(1, 1);
+            } else {
+                for (int i=0; i<BitSet.SINGLE_BYTE_SIZE; i++) {
+                    boolean z = cc.bs.at(i);
+                    if ((z && !cc.isNot()) || (!z && cc.isNot())) {
+                        opt.map.addChar(i);
+                    }
+                }
+                opt.length.set(1, 1);
+            }
+            break;
+        }
+
+        case NodeType.CTYPE: {
+            int min;
+            int max = 1;
+            if (max == 1) {
+                min = 1;
+                CTypeNode cn = (CTypeNode)node;
+
+                switch (cn.ctype) {
+                case CharacterType.WORD:
+                    if (cn.not) {
+                        for (int i=0; i<BitSet.SINGLE_BYTE_SIZE; i++) {
+                            if (!EncodingHelper.isWord(i)) {
+                                opt.map.addChar(i);
+                            }
+                        }
+                    } else {
+                        for (int i=0; i<BitSet.SINGLE_BYTE_SIZE; i++) {
+                            if (EncodingHelper.isWord(i)) {
+                                opt.map.addChar(i);
+                            }
+                        }
+                    }
+                    break;
+                } // inner switch
+            } else {
+                min = 1;
+            }
+            opt.length.set(min, max);
+            break;
+        }
+
+        case NodeType.CANY: {
+            opt.length.set(1, 1);
+            break;
+        }
+
+        case NodeType.ANCHOR: {
+            AnchorNode an = (AnchorNode)node;
+            switch (an.type) {
+            case AnchorType.BEGIN_BUF:
+            case AnchorType.BEGIN_POSITION:
+            case AnchorType.BEGIN_LINE:
+            case AnchorType.END_BUF:
+            case AnchorType.SEMI_END_BUF:
+            case AnchorType.END_LINE:
+                opt.anchor.add(an.type);
+                break;
+
+            case AnchorType.PREC_READ:
+                NodeOptInfo nopt = new NodeOptInfo();
+                optimizeNodeLeft(an.target, nopt, oenv);
+                if (nopt.exb.length > 0) {
+                    opt.expr.copy(nopt.exb);
+                } else if (nopt.exm.length > 0) {
+                    opt.expr.copy(nopt.exm);
+                }
+                opt.expr.reachEnd = false;
+                if (nopt.map.value > 0) opt.map.copy(nopt.map);
+                break;
+
+            case AnchorType.PREC_READ_NOT:
+            case AnchorType.LOOK_BEHIND:    /* Sorry, I can't make use of it. */
+            case AnchorType.LOOK_BEHIND_NOT:
+                break;
+
+            } // inner switch
+            break;
+        }
+
+        case NodeType.BREF: {
+            BackRefNode br = (BackRefNode)node;
+
+            if (br.isRecursion()) {
+                opt.length.set(0, MinMaxLen.INFINITE_DISTANCE);
+                break;
+            }
+
+            Node[]nodes = oenv.scanEnv.memNodes;
+
+            int min = getMinMatchLength(nodes[br.back[0]]);
+            int max = getMaxMatchLength(nodes[br.back[0]]);
+
+            for (int i=1; i<br.backNum; i++) {
+                int tmin = getMinMatchLength(nodes[br.back[i]]);
+                int tmax = getMaxMatchLength(nodes[br.back[i]]);
+                if (min > tmin) min = tmin;
+                if (max < tmax) max = tmax;
+            }
+            opt.length.set(min, max);
+            break;
+        }
+
+        case NodeType.CALL: {
+            if (Config.USE_SUBEXP_CALL) {
+                CallNode cn = (CallNode)node;
+                if (cn.isRecursion()) {
+                    opt.length.set(0, MinMaxLen.INFINITE_DISTANCE);
+                } else {
+                    int safe = oenv.options;
+                    oenv.options = ((EncloseNode)cn.target).option;
+                    optimizeNodeLeft(cn.target, opt, oenv);
+                    oenv.options = safe;
+                }
+            } // USE_SUBEXP_CALL
+            break;
+        }
+
+        case NodeType.QTFR: {
+            NodeOptInfo nopt = new NodeOptInfo();
+            QuantifierNode qn = (QuantifierNode)node;
+            optimizeNodeLeft(qn.target, nopt, oenv);
+            if (qn.lower == 0 && isRepeatInfinite(qn.upper)) {
+                if (oenv.mmd.max == 0 && qn.target.getType() == NodeType.CANY && qn.greedy) {
+                    if (isMultiline(oenv.options)) {
+                        opt.anchor.add(AnchorType.ANYCHAR_STAR_ML);
+                    } else {
+                        opt.anchor.add(AnchorType.ANYCHAR_STAR);
+                    }
+                }
+            } else {
+                if (qn.lower > 0) {
+                    opt.copy(nopt);
+                    if (nopt.exb.length > 0) {
+                        if (nopt.exb.reachEnd) {
+                            int i;
+                            for (i = 2; i <= qn.lower && !opt.exb.isFull(); i++) {
+                                opt.exb.concat(nopt.exb);
+                            }
+                            if (i < qn.lower) {
+                                opt.exb.reachEnd = false;
+                            }
+                        }
+                    }
+                    if (qn.lower != qn.upper) {
+                        opt.exb.reachEnd = false;
+                        opt.exm.reachEnd = false;
+                    }
+                    if (qn.lower > 1) {
+                        opt.exm.reachEnd = false;
+                    }
+
+                }
+            }
+            int min = MinMaxLen.distanceMultiply(nopt.length.min, qn.lower);
+            int max;
+            if (isRepeatInfinite(qn.upper)) {
+                max = nopt.length.max > 0 ? MinMaxLen.INFINITE_DISTANCE : 0;
+            } else {
+                max = MinMaxLen.distanceMultiply(nopt.length.max, qn.upper);
+            }
+            opt.length.set(min, max);
+            break;
+        }
+
+        case NodeType.ENCLOSE: {
+            EncloseNode en = (EncloseNode)node;
+            switch (en.type) {
+            case EncloseType.OPTION:
+                int save = oenv.options;
+                oenv.options = en.option;
+                optimizeNodeLeft(en.target, opt, oenv);
+                oenv.options = save;
+                break;
+
+            case EncloseType.MEMORY:
+                if (Config.USE_SUBEXP_CALL && ++en.optCount > MAX_NODE_OPT_INFO_REF_COUNT) {
+                    int min = 0;
+                    int max = MinMaxLen.INFINITE_DISTANCE;
+                    if (en.isMinFixed()) min = en.minLength;
+                    if (en.isMaxFixed()) max = en.maxLength;
+                    opt.length.set(min, max);
+                } else { // USE_SUBEXP_CALL
+                    optimizeNodeLeft(en.target, opt, oenv);
+                    if (opt.anchor.isSet(AnchorType.ANYCHAR_STAR_MASK)) {
+                        if (bsAt(oenv.scanEnv.backrefedMem, en.regNum)) {
+                            opt.anchor.remove(AnchorType.ANYCHAR_STAR_MASK);
+                        }
+                    }
+                }
+                break;
+
+            case EncloseType.STOP_BACKTRACK:
+                optimizeNodeLeft(en.target, opt, oenv);
+                break;
+            } // inner switch
+            break;
+        }
+
+        default:
+            newInternalException(ERR_PARSER_BUG);
+        } // switch
+    }
+
+    protected final void setOptimizedInfoFromTree(Node node) {
+        NodeOptInfo opt = new NodeOptInfo();
+        OptEnvironment oenv = new OptEnvironment();
+
+        oenv.options = regex.options;
+        oenv.caseFoldFlag = regex.caseFoldFlag;
+        oenv.scanEnv = env;
+        oenv.mmd.clear(); // ??
+
+        optimizeNodeLeft(node, opt, oenv);
+
+        regex.anchor = opt.anchor.leftAnchor & (AnchorType.BEGIN_BUF |
+                                                AnchorType.BEGIN_POSITION |
+                                                AnchorType.ANYCHAR_STAR |
+                                                AnchorType.ANYCHAR_STAR_ML);
+
+        regex.anchor |= opt.anchor.rightAnchor & (AnchorType.END_BUF |
+                                                  AnchorType.SEMI_END_BUF);
+
+        if ((regex.anchor & (AnchorType.END_BUF | AnchorType.SEMI_END_BUF)) != 0) {
+            regex.anchorDmin = opt.length.min;
+            regex.anchorDmax = opt.length.max;
+        }
+
+        if (opt.exb.length > 0 || opt.exm.length > 0) {
+            opt.exb.select(opt.exm);
+            if (opt.map.value > 0 && opt.exb.compare(opt.map) > 0) {
+                // !goto set_map;!
+                regex.setOptimizeMapInfo(opt.map);
+                regex.setSubAnchor(opt.map.anchor);
+            } else {
+                regex.setExactInfo(opt.exb);
+                regex.setSubAnchor(opt.exb.anchor);
+            }
+        } else if (opt.map.value > 0) {
+            // !set_map:!
+            regex.setOptimizeMapInfo(opt.map);
+            regex.setSubAnchor(opt.map.anchor);
+        } else {
+            regex.subAnchor |= opt.anchor.leftAnchor & AnchorType.BEGIN_LINE;
+            if (opt.length.max == 0) regex.subAnchor |= opt.anchor.rightAnchor & AnchorType.END_LINE;
+        }
+
+        if (Config.DEBUG_COMPILE || Config.DEBUG_MATCH) {
+            Config.log.println(regex.optimizeInfoToString());
+        }
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFold.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFold.java
new file mode 100644
index 00000000000..397b05cef47
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFold.java
@@ -0,0 +1,91 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni;
+
+import jdk.nashorn.internal.runtime.regexp.joni.ast.CClassNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.ConsAltNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.StringNode;
+
+final class ApplyCaseFold {
+
+    // i_apply_case_fold
+    public void apply(int from, int[]to, int length, Object o) {
+        ApplyCaseFoldArg arg = (ApplyCaseFoldArg)o;
+
+        ScanEnvironment env = arg.env;
+        CClassNode cc = arg.cc;
+        BitSet bs = cc.bs;
+
+        if (length == 1) {
+            boolean inCC = cc.isCodeInCC(from);
+
+            if (Config.CASE_FOLD_IS_APPLIED_INSIDE_NEGATIVE_CCLASS) {
+                if ((inCC && !cc.isNot()) || (!inCC && cc.isNot())) {
+                    if (to[0] >= BitSet.SINGLE_BYTE_SIZE) {
+                        cc.addCodeRange(env, to[0], to[0]);
+                    } else {
+                        /* /(?i:[^A-C])/.match("a") ==> fail. */
+                        bs.set(to[0]);
+                    }
+                }
+            } else {
+                if (inCC) {
+                    if (to[0] >= BitSet.SINGLE_BYTE_SIZE) {
+                        if (cc.isNot()) cc.clearNotFlag();
+                        cc.addCodeRange(env, to[0], to[0]);
+                    } else {
+                        if (cc.isNot()) {
+                            bs.clear(to[0]);
+                        } else {
+                            bs.set(to[0]);
+                        }
+                    }
+                }
+            } // CASE_FOLD_IS_APPLIED_INSIDE_NEGATIVE_CCLASS
+
+        } else {
+            if (cc.isCodeInCC(from) && (!Config.CASE_FOLD_IS_APPLIED_INSIDE_NEGATIVE_CCLASS || !cc.isNot())) {
+                StringNode node = null;
+                for (int i=0; i<length; i++) {
+                    if (i == 0) {
+                        node = new StringNode();
+                        /* char-class expanded multi-char only
+                        compare with string folded at match time. */
+                        node.setAmbig();
+                    }
+                    node.catCode(to[i]);
+                }
+
+                ConsAltNode alt = ConsAltNode.newAltNode(node, null);
+
+                if (arg.tail == null) {
+                    arg.altRoot = alt;
+                } else {
+                    arg.tail.setCdr(alt);
+                }
+                arg.tail = alt;
+            }
+
+        }
+
+    }
+
+    static final ApplyCaseFold INSTANCE = new ApplyCaseFold();
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFoldArg.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFoldArg.java
new file mode 100644
index 00000000000..e991aed11fc
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ApplyCaseFoldArg.java
@@ -0,0 +1,35 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni;
+
+import jdk.nashorn.internal.runtime.regexp.joni.ast.CClassNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.ConsAltNode;
+
+public final class ApplyCaseFoldArg {
+    final ScanEnvironment env;
+    final CClassNode cc;
+    ConsAltNode altRoot;
+    ConsAltNode tail;
+
+    public ApplyCaseFoldArg(ScanEnvironment env, CClassNode cc) {
+        this.env = env;
+        this.cc = cc;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ArrayCompiler.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ArrayCompiler.java
new file mode 100644
index 00000000000..b55991698b6
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ArrayCompiler.java
@@ -0,0 +1,1263 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni;
+
+import static jdk.nashorn.internal.runtime.regexp.joni.BitStatus.bsAt;
+import static jdk.nashorn.internal.runtime.regexp.joni.Option.isDynamic;
+import static jdk.nashorn.internal.runtime.regexp.joni.Option.isIgnoreCase;
+import static jdk.nashorn.internal.runtime.regexp.joni.Option.isMultiline;
+import static jdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode.isRepeatInfinite;
+
+import jdk.nashorn.internal.runtime.regexp.joni.ast.AnchorNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.BackRefNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.CClassNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.CTypeNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.CallNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.ConsAltNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.EncloseNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.Node;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.StringNode;
+import jdk.nashorn.internal.runtime.regexp.joni.constants.AnchorType;
+import jdk.nashorn.internal.runtime.regexp.joni.constants.EncloseType;
+import jdk.nashorn.internal.runtime.regexp.joni.constants.NodeType;
+import jdk.nashorn.internal.runtime.regexp.joni.constants.OPCode;
+import jdk.nashorn.internal.runtime.regexp.joni.constants.OPSize;
+import jdk.nashorn.internal.runtime.regexp.joni.constants.TargetInfo;
+import jdk.nashorn.internal.runtime.regexp.joni.encoding.CharacterType;
+
+final class ArrayCompiler extends Compiler {
+    private int[] code;
+    private int codeLength;
+
+    private char[][] templates;
+    private int templateNum;
+
+    ArrayCompiler(Analyser analyser) {
+        super(analyser);
+    }
+
+    @Override
+    protected final void prepare() {
+        int codeSize = Config.USE_STRING_TEMPLATES ? 8 : ((analyser.getEnd() - analyser.getBegin()) * 2 + 2);
+        code = new int[codeSize];
+        codeLength = 0;
+    }
+
+    @Override
+    protected final void finish() {
+        addOpcode(OPCode.END);
+        addOpcode(OPCode.FINISH); // for stack bottom
+
+        regex.code = code;
+        regex.codeLength = codeLength;
+        regex.templates = templates;
+        regex.templateNum = templateNum;
+        regex.factory = MatcherFactory.DEFAULT;
+
+        if (Config.USE_SUBEXP_CALL && analyser.env.unsetAddrList != null) {
+            analyser.env.unsetAddrList.fix(regex);
+            analyser.env.unsetAddrList = null;
+        }
+    }
+
+    @Override
+    protected void compileAltNode(ConsAltNode node) {
+        ConsAltNode aln = node;
+        int len = 0;
+
+        do {
+            len += compileLengthTree(aln.car);
+            if (aln.cdr != null) {
+                len += OPSize.PUSH + OPSize.JUMP;
+            }
+        } while ((aln = aln.cdr) != null);
+
+        int pos = codeLength + len;  /* goal position */
+
+        aln = node;
+        do {
+            len = compileLengthTree(aln.car);
+            if (aln.cdr != null) {
+                addOpcodeRelAddr(OPCode.PUSH, len + OPSize.JUMP);
+            }
+            compileTree(aln.car);
+            if (aln.cdr != null) {
+                len = pos - (codeLength + OPSize.JUMP);
+                addOpcodeRelAddr(OPCode.JUMP, len);
+            }
+        } while ((aln = aln.cdr) != null);
+    }
+
+    private boolean isNeedStrLenOpExact(int op) {
+        return  op == OPCode.EXACTN         ||
+                op == OPCode.EXACTMB2N      ||
+                op == OPCode.EXACTMB3N      ||
+                op == OPCode.EXACTMBN       ||
+                op == OPCode.EXACTN_IC      ||
+                op == OPCode.EXACTN_IC_SB;
+    }
+
+    private boolean opTemplated(int op) {
+        return isNeedStrLenOpExact(op);
+    }
+
+    private int selectStrOpcode(int mbLength, int strLength, boolean ignoreCase) {
+        int op;
+
+        if (ignoreCase) {
+            switch(strLength) {
+            case 1: op = OPCode.EXACT1_IC; break;
+            default:op = OPCode.EXACTN_IC; break;
+            } // switch
+        } else {
+            switch (mbLength) {
+            case 1:
+                switch (strLength) {
+                case 1: op = OPCode.EXACT1; break;
+                case 2: op = OPCode.EXACT2; break;
+                case 3: op = OPCode.EXACT3; break;
+                case 4: op = OPCode.EXACT4; break;
+                case 5: op = OPCode.EXACT5; break;
+                default:op = OPCode.EXACTN; break;
+                } // inner switch
+                break;
+            case 2:
+                switch (strLength) {
+                case 1: op = OPCode.EXACTMB2N1; break;
+                case 2: op = OPCode.EXACTMB2N2; break;
+                case 3: op = OPCode.EXACTMB2N3; break;
+                default:op = OPCode.EXACTMB2N;  break;
+                } // inner switch
+                break;
+            case 3:
+                op = OPCode.EXACTMB3N;
+                break;
+            default:
+                op = OPCode.EXACTMBN;
+            } // switch
+        }
+        return op;
+    }
+
+    private void compileTreeEmptyCheck(Node node, int emptyInfo) {
+        int savedNumNullCheck = regex.numNullCheck;
+
+        if (emptyInfo != 0) {
+            addOpcode(OPCode.NULL_CHECK_START);
+            addMemNum(regex.numNullCheck); /* NULL CHECK ID */
+            regex.numNullCheck++;
+        }
+
+        compileTree(node);
+
+        if (emptyInfo != 0) {
+            switch(emptyInfo) {
+            case TargetInfo.IS_EMPTY:
+                addOpcode(OPCode.NULL_CHECK_END);
+                break;
+            case TargetInfo.IS_EMPTY_MEM:
+                addOpcode(OPCode.NULL_CHECK_END_MEMST);
+                break;
+            case TargetInfo.IS_EMPTY_REC:
+                addOpcode(OPCode.NULL_CHECK_END_MEMST_PUSH);
+                break;
+            } // switch
+
+            addMemNum(savedNumNullCheck); /* NULL CHECK ID */
+        }
+    }
+
+    private int addCompileStringlength(char[] chars, int p, int mbLength, int strLength, boolean ignoreCase) {
+        int op = selectStrOpcode(mbLength, strLength, ignoreCase);
+        int len = OPSize.OPCODE;
+
+        if (Config.USE_STRING_TEMPLATES && opTemplated(op)) {
+            // string length, template index, template string pointer
+            len += OPSize.LENGTH + OPSize.INDEX + OPSize.INDEX;
+        } else {
+            if (isNeedStrLenOpExact(op)) len += OPSize.LENGTH;
+            len += mbLength * strLength;
+        }
+        if (op == OPCode.EXACTMBN) len += OPSize.LENGTH;
+        return len;
+    }
+
+    @Override
+    protected final void addCompileString(char[] chars, int p, int mbLength, int strLength, boolean ignoreCase) {
+        int op = selectStrOpcode(mbLength, strLength, ignoreCase);
+        addOpcode(op);
+
+        if (op == OPCode.EXACTMBN) addLength(mbLength);
+
+        if (isNeedStrLenOpExact(op)) {
+            if (op == OPCode.EXACTN_IC || op == OPCode.EXACTN_IC_SB) {
+                addLength(mbLength * strLength);
+            } else {
+                addLength(strLength);
+            }
+        }
+
+        if (Config.USE_STRING_TEMPLATES && opTemplated(op)) {
+            addInt(templateNum);
+            addInt(p);
+            addTemplate(chars);
+        } else {
+            addChars(chars, p, mbLength * strLength);
+        }
+    }
+
+    private int compileLengthStringNode(Node node) {
+        StringNode sn = (StringNode)node;
+        if (sn.length() <= 0) return 0;
+        boolean ambig = sn.isAmbig();
+
+        int p, prev;
+        p = prev = sn.p;
+        int end = sn.end;
+        char[] chars = sn.chars;
+        p++;
+
+        int slen = 1;
+        int rlen = 0;
+
+        while (p < end) {
+            slen++;
+            p++;
+        }
+        int r = addCompileStringlength(chars, prev, 1, slen, ambig);
+        rlen += r;
+        return rlen;
+    }
+
+    private int compileLengthStringRawNode(StringNode sn) {
+        if (sn.length() <= 0) return 0;
+        return addCompileStringlength(sn.chars, sn.p, 1 /*sb*/, sn.length(), false);
+    }
+
+    private void addMultiByteCClass(CodeRangeBuffer mbuf) {
+        addLength(mbuf.used);
+        addInts(mbuf.p, mbuf.used);
+    }
+
+    private int compileLengthCClassNode(CClassNode cc) {
+        if (cc.isShare()) return OPSize.OPCODE + OPSize.POINTER;
+
+        int len;
+        if (cc.mbuf == null) {
+            len = OPSize.OPCODE + BitSet.BITSET_SIZE;
+        } else {
+            if (cc.bs.isEmpty()) {
+                len = OPSize.OPCODE;
+            } else {
+                len = OPSize.OPCODE + BitSet.BITSET_SIZE;
+            }
+
+            len += OPSize.LENGTH + cc.mbuf.used;
+        }
+        return len;
+    }
+
+    @Override
+    protected void compileCClassNode(CClassNode cc) {
+        if (cc.isShare()) { // shared char class
+            addOpcode(OPCode.CCLASS_NODE);
+            addPointer(cc);
+            return;
+        }
+
+        if (cc.mbuf == null) {
+            if (cc.isNot()) {
+                addOpcode(OPCode.CCLASS_NOT);
+            } else {
+                addOpcode(OPCode.CCLASS);
+            }
+            addInts(cc.bs.bits, BitSet.BITSET_SIZE); // add_bitset
+        } else {
+            if (cc.bs.isEmpty()) {
+                if (cc.isNot()) {
+                    addOpcode(OPCode.CCLASS_MB_NOT);
+                } else {
+                    addOpcode(OPCode.CCLASS_MB);
+                }
+                addMultiByteCClass(cc.mbuf);
+            } else {
+                if (cc.isNot()) {
+                    addOpcode(OPCode.CCLASS_MIX_NOT);
+                } else {
+                    addOpcode(OPCode.CCLASS_MIX);
+                }
+                // store the bit set and mbuf themself!
+                addInts(cc.bs.bits, BitSet.BITSET_SIZE); // add_bitset
+                addMultiByteCClass(cc.mbuf);
+            }
+        }
+    }
+
+    @Override
+    protected void compileCTypeNode(CTypeNode node) {
+        CTypeNode cn = node;
+        int op;
+        switch (cn.ctype) {
+        case CharacterType.WORD:
+            if (cn.not) {
+                op = OPCode.NOT_WORD;
+            } else {
+                op = OPCode.WORD;
+            }
+            break;
+
+        default:
+            newInternalException(ERR_PARSER_BUG);
+            return; // not reached
+        } // inner switch
+        addOpcode(op);
+    }
+
+    @Override
+    protected void compileAnyCharNode() {
+        if (isMultiline(regex.options)) {
+            addOpcode(OPCode.ANYCHAR_ML);
+        } else {
+            addOpcode(OPCode.ANYCHAR);
+        }
+    }
+
+    @Override
+    protected void compileCallNode(CallNode node) {
+        addOpcode(OPCode.CALL);
+        node.unsetAddrList.add(codeLength, node.target);
+        addAbsAddr(0); /*dummy addr.*/
+    }
+
+    @Override
+    protected void compileBackrefNode(BackRefNode node) {
+        BackRefNode br = node;
+        if (Config.USE_BACKREF_WITH_LEVEL && br.isNestLevel()) {
+            addOpcode(OPCode.BACKREF_WITH_LEVEL);
+            addOption(regex.options & Option.IGNORECASE);
+            addLength(br.nestLevel);
+            // !goto add_bacref_mems;!
+            addLength(br.backNum);
+            for (int i=br.backNum-1; i>=0; i--) addMemNum(br.back[i]);
+            return;
+        } else { // USE_BACKREF_AT_LEVEL
+            if (br.backNum == 1) {
+                if (isIgnoreCase(regex.options)) {
+                    addOpcode(OPCode.BACKREFN_IC);
+                    addMemNum(br.back[0]);
+                } else {
+                    switch (br.back[0]) {
+                    case 1:
+                        addOpcode(OPCode.BACKREF1);
+                        break;
+                    case 2:
+                        addOpcode(OPCode.BACKREF2);
+                        break;
+                    default:
+                        addOpcode(OPCode.BACKREFN);
+                        addOpcode(br.back[0]);
+                        break;
+                    } // switch
+                }
+            } else {
+                if (isIgnoreCase(regex.options)) {
+                    addOpcode(OPCode.BACKREF_MULTI_IC);
+                } else {
+                    addOpcode(OPCode.BACKREF_MULTI);
+                }
+                // !add_bacref_mems:!
+                addLength(br.backNum);
+                for (int i=br.backNum-1; i>=0; i--) addMemNum(br.back[i]);
+            }
+        }
+    }
+
+    private static final int REPEAT_RANGE_ALLOC = 8;
+    private void entryRepeatRange(int id, int lower, int upper) {
+        if (regex.repeatRangeLo == null) {
+            regex.repeatRangeLo = new int[REPEAT_RANGE_ALLOC];
+            regex.repeatRangeHi = new int[REPEAT_RANGE_ALLOC];
+        } else if (id >= regex.repeatRangeLo.length){
+            int[]tmp = new int[regex.repeatRangeLo.length + REPEAT_RANGE_ALLOC];
+            System.arraycopy(regex.repeatRangeLo, 0, tmp, 0, regex.repeatRangeLo.length);
+            regex.repeatRangeLo = tmp;
+            tmp = new int[regex.repeatRangeHi.length + REPEAT_RANGE_ALLOC];
+            System.arraycopy(regex.repeatRangeHi, 0, tmp, 0, regex.repeatRangeHi.length);
+            regex.repeatRangeHi = tmp;
+        }
+
+        regex.repeatRangeLo[id] = lower;
+        regex.repeatRangeHi[id] = isRepeatInfinite(upper) ? 0x7fffffff : upper;
+    }
+
+    private void compileRangeRepeatNode(QuantifierNode qn, int targetLen, int emptyInfo) {
+        int numRepeat = regex.numRepeat;
+        addOpcode(qn.greedy ? OPCode.REPEAT : OPCode.REPEAT_NG);
+        addMemNum(numRepeat); /* OP_REPEAT ID */
+        regex.numRepeat++;
+        addRelAddr(targetLen + OPSize.REPEAT_INC);
+
+        entryRepeatRange(numRepeat, qn.lower, qn.upper);
+
+        compileTreeEmptyCheck(qn.target, emptyInfo);
+
+        if ((Config.USE_SUBEXP_CALL && regex.numCall > 0) || qn.isInRepeat()) {
+            addOpcode(qn.greedy ? OPCode.REPEAT_INC_SG : OPCode.REPEAT_INC_NG_SG);
+        } else {
+            addOpcode(qn.greedy ? OPCode.REPEAT_INC : OPCode.REPEAT_INC_NG);
+        }
+
+        addMemNum(numRepeat); /* OP_REPEAT ID */
+    }
+
+    private static final int QUANTIFIER_EXPAND_LIMIT_SIZE   = 50; // was 50
+
+    private static boolean cknOn(int ckn) {
+        return ckn > 0;
+    }
+
+    private int compileCECLengthQuantifierNode(QuantifierNode qn) {
+        boolean infinite = isRepeatInfinite(qn.upper);
+        int emptyInfo = qn.targetEmptyInfo;
+
+        int tlen = compileLengthTree(qn.target);
+        int ckn = regex.numCombExpCheck > 0 ? qn.combExpCheckNum : 0;
+        int cklen = cknOn(ckn) ? OPSize.STATE_CHECK_NUM : 0;
+
+        /* anychar repeat */
+        if (qn.target.getType() == NodeType.CANY) {
+            if (qn.greedy && infinite) {
+                if (qn.nextHeadExact != null && !cknOn(ckn)) {
+                    return OPSize.ANYCHAR_STAR_PEEK_NEXT + tlen * qn.lower + cklen;
+                } else {
+                    return OPSize.ANYCHAR_STAR + tlen * qn.lower + cklen;
+                }
+            }
+        }
+
+        int modTLen;
+        if (emptyInfo != 0) {
+            modTLen = tlen + (OPSize.NULL_CHECK_START + OPSize.NULL_CHECK_END);
+        } else {
+            modTLen = tlen;
+        }
+
+        int len;
+        if (infinite && qn.lower <= 1) {
+            if (qn.greedy) {
+                if (qn.lower == 1) {
+                    len = OPSize.JUMP;
+                } else {
+                    len = 0;
+                }
+                len += OPSize.PUSH + cklen + modTLen + OPSize.JUMP;
+            } else {
+                if (qn.lower == 0) {
+                    len = OPSize.JUMP;
+                } else {
+                    len = 0;
+                }
+                len += modTLen + OPSize.PUSH + cklen;
+            }
+        } else if (qn.upper == 0) {
+            if (qn.isRefered) { /* /(?<n>..){0}/ */
+                len = OPSize.JUMP + tlen;
+            } else {
+                len = 0;
+            }
+        } else if (qn.upper == 1 && qn.greedy) {
+            if (qn.lower == 0) {
+                if (cknOn(ckn)) {
+                    len = OPSize.STATE_CHECK_PUSH + tlen;
+                } else {
+                    len = OPSize.PUSH + tlen;
+                }
+            } else {
+                len = tlen;
+            }
+        } else if (!qn.greedy && qn.upper == 1 && qn.lower == 0) { /* '??' */
+            len = OPSize.PUSH + cklen + OPSize.JUMP + tlen;
+        } else {
+            len = OPSize.REPEAT_INC + modTLen + OPSize.OPCODE + OPSize.RELADDR + OPSize.MEMNUM;
+
+            if (cknOn(ckn)) {
+                len += OPSize.STATE_CHECK;
+            }
+        }
+        return len;
+    }
+
+    @Override
+    protected void compileCECQuantifierNode(QuantifierNode qn) {
+        boolean infinite = isRepeatInfinite(qn.upper);
+        int emptyInfo = qn.targetEmptyInfo;
+
+        int tlen = compileLengthTree(qn.target);
+
+        int ckn = regex.numCombExpCheck > 0 ? qn.combExpCheckNum : 0;
+
+        if (qn.isAnyCharStar()) {
+            compileTreeNTimes(qn.target, qn.lower);
+            if (qn.nextHeadExact != null && !cknOn(ckn)) {
+                if (isMultiline(regex.options)) {
+                    addOpcode(OPCode.ANYCHAR_ML_STAR_PEEK_NEXT);
+                } else {
+                    addOpcode(OPCode.ANYCHAR_STAR_PEEK_NEXT);
+                }
+                if (cknOn(ckn)) {
+                    addStateCheckNum(ckn);
+                }
+                StringNode sn = (StringNode)qn.nextHeadExact;
+                addChars(sn.chars, sn.p, 1);
+                return;
+            } else {
+                if (isMultiline(regex.options)) {
+                    if (cknOn(ckn)) {
+                        addOpcode(OPCode.STATE_CHECK_ANYCHAR_ML_STAR);
+                    } else {
+                        addOpcode(OPCode.ANYCHAR_ML_STAR);
+                    }
+                } else {
+                    if (cknOn(ckn)) {
+                        addOpcode(OPCode.STATE_CHECK_ANYCHAR_STAR);
+                    } else {
+                        addOpcode(OPCode.ANYCHAR_STAR);
+                    }
+                }
+                if (cknOn(ckn)) {
+                    addStateCheckNum(ckn);
+                }
+                return;
+            }
+        }
+
+        int modTLen;
+        if (emptyInfo != 0) {
+            modTLen = tlen + (OPSize.NULL_CHECK_START + OPSize.NULL_CHECK_END);
+        } else {
+            modTLen = tlen;
+        }
+        if (infinite && qn.lower <= 1) {
+            if (qn.greedy) {
+                if (qn.lower == 1) {
+                    addOpcodeRelAddr(OPCode.JUMP, cknOn(ckn) ? OPSize.STATE_CHECK_PUSH :
+                                                                     OPSize.PUSH);
+                }
+                if (cknOn(ckn)) {
+                    addOpcode(OPCode.STATE_CHECK_PUSH);
+                    addStateCheckNum(ckn);
+                    addRelAddr(modTLen + OPSize.JUMP);
+                } else {
+                    addOpcodeRelAddr(OPCode.PUSH, modTLen + OPSize.JUMP);
+                }
+                compileTreeEmptyCheck(qn.target, emptyInfo);
+                addOpcodeRelAddr(OPCode.JUMP, -(modTLen + OPSize.JUMP + (cknOn(ckn) ?
+                                                                               OPSize.STATE_CHECK_PUSH :
+                                                                               OPSize.PUSH)));
+            } else {
+                if (qn.lower == 0) {
+                    addOpcodeRelAddr(OPCode.JUMP, modTLen);
+                }
+                compileTreeEmptyCheck(qn.target, emptyInfo);
+                if (cknOn(ckn)) {
+                    addOpcode(OPCode.STATE_CHECK_PUSH_OR_JUMP);
+                    addStateCheckNum(ckn);
+                    addRelAddr(-(modTLen + OPSize.STATE_CHECK_PUSH_OR_JUMP));
+                } else {
+                    addOpcodeRelAddr(OPCode.PUSH, -(modTLen + OPSize.PUSH));
+                }
+            }
+        } else if (qn.upper == 0) {
+            if (qn.isRefered) { /* /(?<n>..){0}/ */
+                addOpcodeRelAddr(OPCode.JUMP, tlen);
+                compileTree(qn.target);
+            } // else r=0 ???
+        } else if (qn.upper == 1 && qn.greedy) {
+            if (qn.lower == 0) {
+                if (cknOn(ckn)) {
+                    addOpcode(OPCode.STATE_CHECK_PUSH);
+                    addStateCheckNum(ckn);
+                    addRelAddr(tlen);
+                } else {
+                    addOpcodeRelAddr(OPCode.PUSH, tlen);
+                }
+            }
+            compileTree(qn.target);
+        } else if (!qn.greedy && qn.upper == 1 && qn.lower == 0){ /* '??' */
+            if (cknOn(ckn)) {
+                addOpcode(OPCode.STATE_CHECK_PUSH);
+                addStateCheckNum(ckn);
+                addRelAddr(OPSize.JUMP);
+            } else {
+                addOpcodeRelAddr(OPCode.PUSH, OPSize.JUMP);
+            }
+
+            addOpcodeRelAddr(OPCode.JUMP, tlen);
+            compileTree(qn.target);
+        } else {
+            compileRangeRepeatNode(qn, modTLen, emptyInfo);
+            if (cknOn(ckn)) {
+                addOpcode(OPCode.STATE_CHECK);
+                addStateCheckNum(ckn);
+            }
+        }
+    }
+
+    private int compileNonCECLengthQuantifierNode(QuantifierNode qn) {
+        boolean infinite = isRepeatInfinite(qn.upper);
+        int emptyInfo = qn.targetEmptyInfo;
+
+        int tlen = compileLengthTree(qn.target);
+
+        /* anychar repeat */
+        if (qn.target.getType() == NodeType.CANY) {
+            if (qn.greedy && infinite) {
+                if (qn.nextHeadExact != null) {
+                    return OPSize.ANYCHAR_STAR_PEEK_NEXT + tlen * qn.lower;
+                } else {
+                    return OPSize.ANYCHAR_STAR + tlen * qn.lower;
+                }
+            }
+        }
+
+        int modTLen = 0;
+        if (emptyInfo != 0) {
+            modTLen = tlen + (OPSize.NULL_CHECK_START + OPSize.NULL_CHECK_END);
+        } else {
+            modTLen = tlen;
+        }
+
+        int len;
+        if (infinite && (qn.lower <= 1 || tlen * qn.lower <= QUANTIFIER_EXPAND_LIMIT_SIZE)) {
+            if (qn.lower == 1 && tlen > QUANTIFIER_EXPAND_LIMIT_SIZE) {
+                len = OPSize.JUMP;
+            } else {
+                len = tlen * qn.lower;
+            }
+
+            if (qn.greedy) {
+                if (qn.headExact != null) {
+                    len += OPSize.PUSH_OR_JUMP_EXACT1 + modTLen + OPSize.JUMP;
+                } else if (qn.nextHeadExact != null) {
+                    len += OPSize.PUSH_IF_PEEK_NEXT + modTLen + OPSize.JUMP;
+                } else {
+                    len += OPSize.PUSH + modTLen + OPSize.JUMP;
+                }
+            } else {
+                len += OPSize.JUMP + modTLen + OPSize.PUSH;
+            }
+
+        } else if (qn.upper == 0 && qn.isRefered) { /* /(?<n>..){0}/ */
+            len = OPSize.JUMP + tlen;
+        } else if (!infinite && qn.greedy &&
+                  (qn.upper == 1 || (tlen + OPSize.PUSH) * qn.upper <= QUANTIFIER_EXPAND_LIMIT_SIZE )) {
+            len = tlen * qn.lower;
+            len += (OPSize.PUSH + tlen) * (qn.upper - qn.lower);
+        } else if (!qn.greedy && qn.upper == 1 && qn.lower == 0) { /* '??' */
+            len = OPSize.PUSH + OPSize.JUMP + tlen;
+        } else {
+            len = OPSize.REPEAT_INC + modTLen + OPSize.OPCODE + OPSize.RELADDR + OPSize.MEMNUM;
+        }
+        return len;
+    }
+
+    @Override
+    protected void compileNonCECQuantifierNode(QuantifierNode qn) {
+        boolean infinite = isRepeatInfinite(qn.upper);
+        int emptyInfo = qn.targetEmptyInfo;
+
+        int tlen = compileLengthTree(qn.target);
+
+        if (qn.isAnyCharStar()) {
+            compileTreeNTimes(qn.target, qn.lower);
+            if (qn.nextHeadExact != null) {
+                if (isMultiline(regex.options)) {
+                    addOpcode(OPCode.ANYCHAR_ML_STAR_PEEK_NEXT);
+                } else {
+                    addOpcode(OPCode.ANYCHAR_STAR_PEEK_NEXT);
+                }
+                StringNode sn = (StringNode)qn.nextHeadExact;
+                addChars(sn.chars, sn.p, 1);
+                return;
+            } else {
+                if (isMultiline(regex.options)) {
+                    addOpcode(OPCode.ANYCHAR_ML_STAR);
+                } else {
+                    addOpcode(OPCode.ANYCHAR_STAR);
+                }
+                return;
+            }
+        }
+
+        int modTLen;
+        if (emptyInfo != 0) {
+            modTLen = tlen + (OPSize.NULL_CHECK_START + OPSize.NULL_CHECK_END);
+        } else {
+            modTLen = tlen;
+        }
+        if (infinite && (qn.lower <= 1 || tlen * qn.lower <= QUANTIFIER_EXPAND_LIMIT_SIZE)) {
+            if (qn.lower == 1 && tlen > QUANTIFIER_EXPAND_LIMIT_SIZE) {
+                if (qn.greedy) {
+                    if (qn.headExact != null) {
+                        addOpcodeRelAddr(OPCode.JUMP, OPSize.PUSH_OR_JUMP_EXACT1);
+                    } else if (qn.nextHeadExact != null) {
+                        addOpcodeRelAddr(OPCode.JUMP, OPSize.PUSH_IF_PEEK_NEXT);
+                    } else {
+                        addOpcodeRelAddr(OPCode.JUMP, OPSize.PUSH);
+                    }
+                } else {
+                    addOpcodeRelAddr(OPCode.JUMP, OPSize.JUMP);
+                }
+            } else {
+                compileTreeNTimes(qn.target, qn.lower);
+            }
+
+            if (qn.greedy) {
+                if (qn.headExact != null) {
+                    addOpcodeRelAddr(OPCode.PUSH_OR_JUMP_EXACT1, modTLen + OPSize.JUMP);
+                    StringNode sn = (StringNode)qn.headExact;
+                    addChars(sn.chars, sn.p, 1);
+                    compileTreeEmptyCheck(qn.target, emptyInfo);
+                    addOpcodeRelAddr(OPCode.JUMP, -(modTLen + OPSize.JUMP + OPSize.PUSH_OR_JUMP_EXACT1));
+                } else if (qn.nextHeadExact != null) {
+                    addOpcodeRelAddr(OPCode.PUSH_IF_PEEK_NEXT, modTLen + OPSize.JUMP);
+                    StringNode sn = (StringNode)qn.nextHeadExact;
+                    addChars(sn.chars, sn.p, 1);
+                    compileTreeEmptyCheck(qn.target, emptyInfo);
+                    addOpcodeRelAddr(OPCode.JUMP, -(modTLen + OPSize.JUMP + OPSize.PUSH_IF_PEEK_NEXT));
+                } else {
+                    addOpcodeRelAddr(OPCode.PUSH, modTLen + OPSize.JUMP);
+                    compileTreeEmptyCheck(qn.target, emptyInfo);
+                    addOpcodeRelAddr(OPCode.JUMP, -(modTLen + OPSize.JUMP + OPSize.PUSH));
+                }
+            } else {
+                addOpcodeRelAddr(OPCode.JUMP, modTLen);
+                compileTreeEmptyCheck(qn.target, emptyInfo);
+                addOpcodeRelAddr(OPCode.PUSH, -(modTLen + OPSize.PUSH));
+            }
+        } else if (qn.upper == 0 && qn.isRefered) { /* /(?<n>..){0}/ */
+            addOpcodeRelAddr(OPCode.JUMP, tlen);
+            compileTree(qn.target);
+        } else if (!infinite && qn.greedy &&
+                  (qn.upper == 1 || (tlen + OPSize.PUSH) * qn.upper <= QUANTIFIER_EXPAND_LIMIT_SIZE)) {
+            int n = qn.upper - qn.lower;
+            compileTreeNTimes(qn.target, qn.lower);
+
+            for (int i=0; i<n; i++) {
+                addOpcodeRelAddr(OPCode.PUSH, (n - i) * tlen + (n - i - 1) * OPSize.PUSH);
+                compileTree(qn.target);
+            }
+        } else if (!qn.greedy && qn.upper == 1 && qn.lower == 0) { /* '??' */
+            addOpcodeRelAddr(OPCode.PUSH, OPSize.JUMP);
+            addOpcodeRelAddr(OPCode.JUMP, tlen);
+            compileTree(qn.target);
+        } else {
+            compileRangeRepeatNode(qn, modTLen, emptyInfo);
+        }
+    }
+
+    private int compileLengthOptionNode(EncloseNode node) {
+        int prev = regex.options;
+        regex.options = node.option;
+        int tlen = compileLengthTree(node.target);
+        regex.options = prev;
+
+        if (isDynamic(prev ^ node.option)) {
+            return OPSize.SET_OPTION_PUSH + OPSize.SET_OPTION + OPSize.FAIL + tlen + OPSize.SET_OPTION;
+        } else {
+            return tlen;
+        }
+    }
+
+    @Override
+    protected void compileOptionNode(EncloseNode node) {
+        int prev = regex.options;
+
+        if (isDynamic(prev ^ node.option)) {
+            addOpcodeOption(OPCode.SET_OPTION_PUSH, node.option);
+            addOpcodeOption(OPCode.SET_OPTION, prev);
+            addOpcode(OPCode.FAIL);
+        }
+
+        regex.options = node.option;
+        compileTree(node.target);
+        regex.options = prev;
+
+        if (isDynamic(prev ^ node.option)) {
+            addOpcodeOption(OPCode.SET_OPTION, prev);
+        }
+    }
+
+    private int compileLengthEncloseNode(EncloseNode node) {
+        if (node.isOption()) {
+            return compileLengthOptionNode(node);
+        }
+
+        int tlen;
+        if (node.target != null) {
+            tlen = compileLengthTree(node.target);
+        } else {
+            tlen = 0;
+        }
+
+        int len;
+        switch (node.type) {
+        case EncloseType.MEMORY:
+            if (Config.USE_SUBEXP_CALL && node.isCalled()) {
+                len = OPSize.MEMORY_START_PUSH + tlen + OPSize.CALL + OPSize.JUMP + OPSize.RETURN;
+                if (bsAt(regex.btMemEnd, node.regNum)) {
+                    len += node.isRecursion() ? OPSize.MEMORY_END_PUSH_REC : OPSize.MEMORY_END_PUSH;
+                } else {
+                    len += node.isRecursion() ? OPSize.MEMORY_END_REC : OPSize.MEMORY_END;
+                }
+            } else { // USE_SUBEXP_CALL
+                if (bsAt(regex.btMemStart, node.regNum)) {
+                    len = OPSize.MEMORY_START_PUSH;
+                } else {
+                    len = OPSize.MEMORY_START;
+                }
+                len += tlen + (bsAt(regex.btMemEnd, node.regNum) ? OPSize.MEMORY_END_PUSH : OPSize.MEMORY_END);
+            }
+            break;
+
+        case EncloseType.STOP_BACKTRACK:
+            if (node.isStopBtSimpleRepeat()) {
+                QuantifierNode qn = (QuantifierNode)node.target;
+                tlen = compileLengthTree(qn.target);
+                len = tlen * qn.lower + OPSize.PUSH + tlen + OPSize.POP + OPSize.JUMP;
+            } else {
+                len = OPSize.PUSH_STOP_BT + tlen + OPSize.POP_STOP_BT;
+            }
+            break;
+
+        default:
+            newInternalException(ERR_PARSER_BUG);
+            return 0; // not reached
+        } // switch
+        return len;
+    }
+
+    @Override
+    protected void compileEncloseNode(EncloseNode node) {
+        int len;
+        switch (node.type) {
+        case EncloseType.MEMORY:
+            if (Config.USE_SUBEXP_CALL) {
+                if (node.isCalled()) {
+                    addOpcode(OPCode.CALL);
+                    node.callAddr = codeLength + OPSize.ABSADDR + OPSize.JUMP;
+                    node.setAddrFixed();
+                    addAbsAddr(node.callAddr);
+                    len = compileLengthTree(node.target);
+                    len += OPSize.MEMORY_START_PUSH + OPSize.RETURN;
+                    if (bsAt(regex.btMemEnd, node.regNum)) {
+                        len += node.isRecursion() ? OPSize.MEMORY_END_PUSH_REC : OPSize.MEMORY_END_PUSH;
+                    } else {
+                        len += node.isRecursion() ? OPSize.MEMORY_END_REC : OPSize.MEMORY_END;
+                    }
+                    addOpcodeRelAddr(OPCode.JUMP, len);
+                }
+            } // USE_SUBEXP_CALL
+
+            if (bsAt(regex.btMemStart, node.regNum)) {
+                addOpcode(OPCode.MEMORY_START_PUSH);
+            } else {
+                addOpcode(OPCode.MEMORY_START);
+            }
+
+            addMemNum(node.regNum);
+            compileTree(node.target);
+
+            if (Config.USE_SUBEXP_CALL && node.isCalled()) {
+                if (bsAt(regex.btMemEnd, node.regNum)) {
+                    addOpcode(node.isRecursion() ? OPCode.MEMORY_END_PUSH_REC : OPCode.MEMORY_END_PUSH);
+                } else {
+                    addOpcode(node.isRecursion() ? OPCode.MEMORY_END_REC : OPCode.MEMORY_END);
+                }
+                addMemNum(node.regNum);
+                addOpcode(OPCode.RETURN);
+            } else { // USE_SUBEXP_CALL
+                if (bsAt(regex.btMemEnd, node.regNum)) {
+                    addOpcode(OPCode.MEMORY_END_PUSH);
+                } else {
+                    addOpcode(OPCode.MEMORY_END);
+                }
+                addMemNum(node.regNum);
+            }
+            break;
+
+        case EncloseType.STOP_BACKTRACK:
+            if (node.isStopBtSimpleRepeat()) {
+                QuantifierNode qn = (QuantifierNode)node.target;
+
+                compileTreeNTimes(qn.target, qn.lower);
+
+                len = compileLengthTree(qn.target);
+                addOpcodeRelAddr(OPCode.PUSH, len + OPSize.POP + OPSize.JUMP);
+                compileTree(qn.target);
+                addOpcode(OPCode.POP);
+                addOpcodeRelAddr(OPCode.JUMP, -(OPSize.PUSH + len + OPSize.POP + OPSize.JUMP));
+            } else {
+                addOpcode(OPCode.PUSH_STOP_BT);
+                compileTree(node.target);
+                addOpcode(OPCode.POP_STOP_BT);
+            }
+            break;
+
+        default:
+            newInternalException(ERR_PARSER_BUG);
+            break;
+        } // switch
+    }
+
+    private int compileLengthAnchorNode(AnchorNode node) {
+        int tlen;
+        if (node.target != null) {
+            tlen = compileLengthTree(node.target);
+        } else {
+            tlen = 0;
+        }
+
+        int len;
+        switch (node.type) {
+        case AnchorType.PREC_READ:
+            len = OPSize.PUSH_POS + tlen + OPSize.POP_POS;
+            break;
+
+        case AnchorType.PREC_READ_NOT:
+            len = OPSize.PUSH_POS_NOT + tlen + OPSize.FAIL_POS;
+            break;
+
+        case AnchorType.LOOK_BEHIND:
+            len = OPSize.LOOK_BEHIND + tlen;
+            break;
+
+        case AnchorType.LOOK_BEHIND_NOT:
+            len = OPSize.PUSH_LOOK_BEHIND_NOT + tlen + OPSize.FAIL_LOOK_BEHIND_NOT;
+            break;
+
+        default:
+            len = OPSize.OPCODE;
+            break;
+        } // switch
+        return len;
+    }
+
+    @Override
+    protected void compileAnchorNode(AnchorNode node) {
+        int len;
+        int n;
+
+        switch (node.type) {
+        case AnchorType.BEGIN_BUF:          addOpcode(OPCode.BEGIN_BUF);            break;
+        case AnchorType.END_BUF:            addOpcode(OPCode.END_BUF);              break;
+        case AnchorType.BEGIN_LINE:         addOpcode(OPCode.BEGIN_LINE);           break;
+        case AnchorType.END_LINE:           addOpcode(OPCode.END_LINE);             break;
+        case AnchorType.SEMI_END_BUF:       addOpcode(OPCode.SEMI_END_BUF);         break;
+        case AnchorType.BEGIN_POSITION:     addOpcode(OPCode.BEGIN_POSITION);       break;
+
+        case AnchorType.WORD_BOUND:
+            addOpcode(OPCode.WORD_BOUND);
+            break;
+
+        case AnchorType.NOT_WORD_BOUND:
+            addOpcode(OPCode.NOT_WORD_BOUND);
+            break;
+
+        case AnchorType.WORD_BEGIN:
+            if (Config.USE_WORD_BEGIN_END)
+                addOpcode(OPCode.WORD_BEGIN);
+            break;
+
+        case AnchorType.WORD_END:
+            if (Config.USE_WORD_BEGIN_END)
+                addOpcode(OPCode.WORD_END);
+            break;
+
+        case AnchorType.PREC_READ:
+            addOpcode(OPCode.PUSH_POS);
+            compileTree(node.target);
+            addOpcode(OPCode.POP_POS);
+            break;
+
+        case AnchorType.PREC_READ_NOT:
+            len = compileLengthTree(node.target);
+            addOpcodeRelAddr(OPCode.PUSH_POS_NOT, len + OPSize.FAIL_POS);
+            compileTree(node.target);
+            addOpcode(OPCode.FAIL_POS);
+            break;
+
+        case AnchorType.LOOK_BEHIND:
+            addOpcode(OPCode.LOOK_BEHIND);
+            if (node.charLength < 0) {
+                n = analyser.getCharLengthTree(node.target);
+                if (analyser.returnCode != 0) newSyntaxException(ERR_INVALID_LOOK_BEHIND_PATTERN);
+            } else {
+                n = node.charLength;
+            }
+            addLength(n);
+            compileTree(node.target);
+            break;
+
+        case AnchorType.LOOK_BEHIND_NOT:
+            len = compileLengthTree(node.target);
+            addOpcodeRelAddr(OPCode.PUSH_LOOK_BEHIND_NOT, len + OPSize.FAIL_LOOK_BEHIND_NOT);
+            if (node.charLength < 0) {
+                n = analyser.getCharLengthTree(node.target);
+                if (analyser.returnCode != 0) newSyntaxException(ERR_INVALID_LOOK_BEHIND_PATTERN);
+            } else {
+                n = node.charLength;
+            }
+            addLength(n);
+            compileTree(node.target);
+            addOpcode(OPCode.FAIL_LOOK_BEHIND_NOT);
+            break;
+
+        default:
+            newInternalException(ERR_PARSER_BUG);
+        } // switch
+    }
+
+    private int compileLengthTree(Node node) {
+        int len = 0;
+
+        switch (node.getType()) {
+        case NodeType.LIST:
+            ConsAltNode lin = (ConsAltNode)node;
+            do {
+                len += compileLengthTree(lin.car);
+            } while ((lin = lin.cdr) != null);
+            break;
+
+        case NodeType.ALT:
+            ConsAltNode aln = (ConsAltNode)node;
+            int n = 0;
+            do {
+                len += compileLengthTree(aln.car);
+                n++;
+            } while ((aln = aln.cdr) != null);
+            len += (OPSize.PUSH + OPSize.JUMP) * (n - 1);
+            break;
+
+        case NodeType.STR:
+            StringNode sn = (StringNode)node;
+            if (sn.isRaw()) {
+                len = compileLengthStringRawNode(sn);
+            } else {
+                len = compileLengthStringNode(sn);
+            }
+            break;
+
+        case NodeType.CCLASS:
+            len = compileLengthCClassNode((CClassNode)node);
+            break;
+
+        case NodeType.CTYPE:
+        case NodeType.CANY:
+            len = OPSize.OPCODE;
+            break;
+
+        case NodeType.BREF:
+            BackRefNode br = (BackRefNode)node;
+
+            if (Config.USE_BACKREF_WITH_LEVEL && br.isNestLevel()) {
+                len = OPSize.OPCODE + OPSize.OPTION + OPSize.LENGTH +
+                      OPSize.LENGTH + (OPSize.MEMNUM * br.backNum);
+            } else { // USE_BACKREF_AT_LEVEL
+                if (br.backNum == 1) {
+                    len = ((!isIgnoreCase(regex.options) && br.back[0] <= 2)
+                            ? OPSize.OPCODE : (OPSize.OPCODE + OPSize.MEMNUM));
+                } else {
+                    len = OPSize.OPCODE + OPSize.LENGTH + (OPSize.MEMNUM * br.backNum);
+                }
+            }
+            break;
+
+        case NodeType.CALL:
+            if (Config.USE_SUBEXP_CALL) {
+                len = OPSize.CALL;
+                break;
+            } // USE_SUBEXP_CALL
+            break;
+
+        case NodeType.QTFR:
+            if (Config.USE_COMBINATION_EXPLOSION_CHECK) {
+                len = compileCECLengthQuantifierNode((QuantifierNode)node);
+            } else {
+                len = compileNonCECLengthQuantifierNode((QuantifierNode)node);
+            }
+            break;
+
+        case NodeType.ENCLOSE:
+            len = compileLengthEncloseNode((EncloseNode)node);
+            break;
+
+        case NodeType.ANCHOR:
+            len = compileLengthAnchorNode((AnchorNode)node);
+            break;
+
+        default:
+            newInternalException(ERR_PARSER_BUG);
+
+        } //switch
+        return len;
+    }
+
+    private void ensure(int size) {
+        if (size >= code.length) {
+            int length = code.length << 1;
+            while (length <= size) length <<= 1;
+            int[]tmp = new int[length];
+            System.arraycopy(code, 0, tmp, 0, code.length);
+            code = tmp;
+        }
+    }
+
+    private void addInt(int i) {
+        if (codeLength >= code.length) {
+            int[]tmp = new int[code.length << 1];
+            System.arraycopy(code, 0, tmp, 0, code.length);
+            code = tmp;
+        }
+        code[codeLength++] = i;
+    }
+
+    void setInt(int i, int offset) {
+        ensure(offset);
+        regex.code[offset] = i;
+    }
+
+    private void addObject(Object o) {
+        if (regex.operands == null) {
+            regex.operands = new Object[4];
+        } else if (regex.operandLength >= regex.operands.length) {
+            Object[]tmp = new Object[regex.operands.length << 1];
+            System.arraycopy(regex.operands, 0, tmp, 0, regex.operands.length);
+            regex.operands = tmp;
+        }
+        addInt(regex.operandLength);
+        regex.operands[regex.operandLength++] = o;
+    }
+
+    private void addChars(char[] chars, int p ,int length) {
+        ensure(codeLength + length);
+        int end = p + length;
+
+        while (p < end) code[codeLength++] = chars[p++];
+    }
+
+    private void addInts(int[]ints, int length) {
+        ensure(codeLength + length);
+        System.arraycopy(ints, 0, code, codeLength, length);
+        codeLength += length;
+    }
+
+    private void addOpcode(int opcode) {
+        addInt(opcode);
+
+        switch(opcode) {
+        case OPCode.ANYCHAR_STAR:
+        case OPCode.ANYCHAR_STAR_SB:
+        case OPCode.ANYCHAR_ML_STAR:
+        case OPCode.ANYCHAR_ML_STAR_SB:
+        case OPCode.ANYCHAR_STAR_PEEK_NEXT:
+        case OPCode.ANYCHAR_STAR_PEEK_NEXT_SB:
+        case OPCode.ANYCHAR_ML_STAR_PEEK_NEXT:
+        case OPCode.ANYCHAR_ML_STAR_PEEK_NEXT_SB:
+        case OPCode.STATE_CHECK_ANYCHAR_STAR:
+        case OPCode.STATE_CHECK_ANYCHAR_STAR_SB:
+        case OPCode.STATE_CHECK_ANYCHAR_ML_STAR:
+        case OPCode.MEMORY_START_PUSH:
+        case OPCode.MEMORY_END_PUSH:
+        case OPCode.MEMORY_END_PUSH_REC:
+        case OPCode.MEMORY_END_REC:
+        case OPCode.NULL_CHECK_START:
+        case OPCode.NULL_CHECK_END_MEMST_PUSH:
+        case OPCode.PUSH:
+        case OPCode.STATE_CHECK_PUSH:
+        case OPCode.STATE_CHECK_PUSH_OR_JUMP:
+        case OPCode.STATE_CHECK:
+        case OPCode.PUSH_OR_JUMP_EXACT1:
+        case OPCode.PUSH_IF_PEEK_NEXT:
+        case OPCode.REPEAT:
+        case OPCode.REPEAT_NG:
+        case OPCode.REPEAT_INC_SG:
+        case OPCode.REPEAT_INC_NG:
+        case OPCode.REPEAT_INC_NG_SG:
+        case OPCode.PUSH_POS:
+        case OPCode.PUSH_POS_NOT:
+        case OPCode.PUSH_STOP_BT:
+        case OPCode.PUSH_LOOK_BEHIND_NOT:
+        case OPCode.CALL:
+        case OPCode.RETURN: // it will appear only with CALL though
+            regex.stackNeeded = true;
+        }
+    }
+
+    private void addStateCheckNum(int num) {
+        addInt(num);
+    }
+
+    private void addRelAddr(int addr) {
+        addInt(addr);
+    }
+
+    private void addAbsAddr(int addr) {
+        addInt(addr);
+    }
+
+    private void addLength(int length) {
+        addInt(length);
+    }
+
+    private void addMemNum(int num) {
+        addInt(num);
+    }
+
+    private void addPointer(Object o) {
+        addObject(o);
+    }
+
+    private void addOption(int option) {
+        addInt(option);
+    }
+
+    private void addOpcodeRelAddr(int opcode, int addr) {
+        addOpcode(opcode);
+        addRelAddr(addr);
+    }
+
+    private void addOpcodeOption(int opcode, int option) {
+        addOpcode(opcode);
+        addOption(option);
+    }
+
+    private void addTemplate(char[] chars) {
+        if (templateNum == 0) {
+            templates = new char[2][];
+        } else if (templateNum == templates.length) {
+            char[][] tmp = new char[templateNum * 2][];
+            System.arraycopy(templates, 0, tmp, 0, templateNum);
+            templates = tmp;
+        }
+        templates[templateNum++] = chars;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/AsmCompiler.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/AsmCompiler.java
new file mode 100644
index 00000000000..475d6595bcd
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/AsmCompiler.java
@@ -0,0 +1,109 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni;
+
+import jdk.nashorn.internal.runtime.regexp.joni.ast.AnchorNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.BackRefNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.CClassNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.CTypeNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.CallNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.ConsAltNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.EncloseNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode;
+
+final class AsmCompiler extends AsmCompilerSupport {
+
+    public AsmCompiler(Analyser analyser) {
+        super(analyser);
+    }
+
+    @Override
+    protected void prepare() {
+        REG_NUM++;
+        prepareMachine();
+        prepareMachineInit();
+        prepareMachineMatch();
+
+        prepareFactory();
+        prepareFactoryInit();
+    }
+
+    @Override
+    protected void finish() {
+        setupFactoryInit();
+
+        setupMachineInit();
+        setupMachineMatch();
+
+        setupClasses();
+    }
+
+    @Override
+    protected void compileAltNode(ConsAltNode node) {
+    }
+
+    @Override
+    protected void addCompileString(char[] chars, int p, int mbLength, int strLength, boolean ignoreCase) {
+        String template = installTemplate(chars, p, strLength);
+    }
+
+    @Override
+    protected void compileCClassNode(CClassNode node) {
+        if (node.bs != null) {
+            String bitsetName = installBitSet(node.bs.bits);
+        }
+    }
+
+    @Override
+    protected void compileCTypeNode(CTypeNode node) {
+    }
+
+    @Override
+    protected void compileAnyCharNode() {
+    }
+
+    @Override
+    protected void compileBackrefNode(BackRefNode node) {
+    }
+
+    @Override
+    protected void compileCallNode(CallNode node) {
+    }
+
+    @Override
+    protected void compileCECQuantifierNode(QuantifierNode node) {
+    }
+
+    @Override
+    protected void compileNonCECQuantifierNode(QuantifierNode node) {
+    }
+
+    @Override
+    protected void compileOptionNode(EncloseNode node) {
+    }
+
+    @Override
+    protected void compileEncloseNode(EncloseNode node) {
+    }
+
+    @Override
+    protected void compileAnchorNode(AnchorNode node) {
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/AsmCompilerSupport.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/AsmCompilerSupport.java
new file mode 100644
index 00000000000..06ca21a9b06
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/AsmCompilerSupport.java
@@ -0,0 +1,267 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+import jdk.nashorn.internal.runtime.regexp.joni.constants.AsmConstants;
+import jdk.internal.org.objectweb.asm.ClassWriter;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+
+abstract class AsmCompilerSupport extends Compiler implements Opcodes, AsmConstants {
+    protected ClassWriter factory;      // matcher allocator, also bit set, code rage and string template container
+    protected MethodVisitor factoryInit;// factory constructor
+    protected String factoryName;
+
+    protected ClassWriter machine;      // matcher
+    protected MethodVisitor machineInit;// matcher constructor
+    protected MethodVisitor match;      // actual matcher implementation (the matchAt method)
+    protected String machineName;
+
+    // we will? try to manage visitMaxs ourselves for efficiency
+    protected int maxStack = 1;
+    protected int maxVars = LAST_INDEX;
+
+    // for field generation
+    protected int bitsets, ranges, templates;
+
+    // simple class name postfix scheme for now
+    static int REG_NUM = 0;
+
+    // dummy class loader for now
+    private static final class DummyClassLoader extends ClassLoader {
+        public Class<?> defineClass(String name, byte[] bytes) {
+            return super.defineClass(name, bytes, 0, bytes.length);
+        }
+    };
+
+    private static final DummyClassLoader loader = new DummyClassLoader();
+
+    AsmCompilerSupport(Analyser analyser) {
+        super(analyser);
+    }
+
+    protected final void prepareFactory() {
+        factory = new ClassWriter(ClassWriter.COMPUTE_MAXS);
+        factoryName = "jdk/nashorn/internal/runtime/regexp/joni/MatcherFactory" + REG_NUM;
+
+        factory.visit(V1_4, ACC_PUBLIC + ACC_FINAL, factoryName, null, "jdk/nashorn/internal/runtime/regexp/joni/MatcherFactory", null);
+
+        MethodVisitor create = factory.visitMethod(ACC_SYNTHETIC, "create", "(Lorg/joni/Regex;[BII)Lorg/joni/Matcher;", null, null);
+        create.visitTypeInsn(NEW, machineName);
+        create.visitInsn(DUP);          // instance
+        create.visitVarInsn(ALOAD, 1);  // Regex
+        create.visitVarInsn(ALOAD, 2);  // bytes[]
+        create.visitVarInsn(ILOAD, 3);  // p
+        create.visitVarInsn(ILOAD, 4);  // end
+        create.visitMethodInsn(INVOKESPECIAL, machineName, "<init>", "(Lorg/joni/Regex;[BII)V");
+        create.visitInsn(ARETURN);
+        create.visitMaxs(0, 0);
+        //create.visitMaxs(6, 5);
+        create.visitEnd();
+    }
+
+    protected final void prepareFactoryInit() {
+        factoryInit = factory.visitMethod(ACC_PUBLIC, "<init>", "()V", null, null);
+        factoryInit.visitVarInsn(ALOAD, 0);
+        factoryInit.visitMethodInsn(INVOKESPECIAL, "jdk/nashorn/internal/runtime/regexp/joni/MatcherFactory", "<init>", "()V");
+    }
+
+    protected final void setupFactoryInit() {
+        factoryInit.visitInsn(RETURN);
+        factoryInit.visitMaxs(0, 0);
+        //init.visitMaxs(1, 1);
+        factoryInit.visitEnd();
+    }
+
+    protected final void prepareMachine() {
+        machine = new ClassWriter(ClassWriter.COMPUTE_MAXS);
+        machineName = "jdk/nashorn/internal/runtime/regexp/joni/NativeMachine" + REG_NUM;
+    }
+
+    protected final void prepareMachineInit() {
+        machine.visit(V1_4, ACC_PUBLIC + ACC_FINAL, machineName, null, "jdk/nashorn/internal/runtime/regexp/joni/NativeMachine", null);
+        machineInit = machine.visitMethod(ACC_PROTECTED, "<init>", "(Lorg/joni/Regex;[BII)V", null, null);
+        machineInit.visitVarInsn(ALOAD, THIS);  // this
+        machineInit.visitVarInsn(ALOAD, 1);     // Regex
+        machineInit.visitVarInsn(ALOAD, 2);     // bytes[]
+        machineInit.visitVarInsn(ILOAD, 3);     // p
+        machineInit.visitVarInsn(ILOAD, 4);     // end
+        machineInit.visitMethodInsn(INVOKESPECIAL, "jdk/nashorn/internal/runtime/regexp/joni/NativeMachine", "<init>", "(Lorg/joni/Regex;[BII)V");
+    }
+
+    protected final void setupMachineInit() {
+        if (bitsets + ranges + templates > 0) { // ok, some of these are in use, we'd like to cache the factory
+            machine.visitField(ACC_PRIVATE + ACC_FINAL, "factory", "L" + factoryName + ";", null, null);
+            machineInit.visitVarInsn(ALOAD, THIS);  // this
+            machineInit.visitVarInsn(ALOAD, 1);     // this, Regex
+            machineInit.visitFieldInsn(GETFIELD, "jdk/nashorn/internal/runtime/regexp/joni/Regex", "factory", "Lorg/joni/MatcherFactory;"); // this, factory
+            machineInit.visitTypeInsn(CHECKCAST, factoryName);
+            machineInit.visitFieldInsn(PUTFIELD, machineName, "factory", "L" + factoryName + ";"); // []
+        }
+
+        machineInit.visitInsn(RETURN);
+        machineInit.visitMaxs(0, 0);
+        //init.visitMaxs(5, 5);
+        machineInit.visitEnd();
+    }
+
+    protected final void prepareMachineMatch() {
+        match = machine.visitMethod(ACC_SYNTHETIC, "matchAt", "(III)I", null, null);
+        move(S, SSTART);        // s = sstart
+        load("bytes", "[B");    //
+        astore(BYTES);          // byte[]bytes = this.bytes
+    }
+
+    protected final void setupMachineMatch() {
+        match.visitInsn(ICONST_M1);
+        match.visitInsn(IRETURN);
+
+        match.visitMaxs(maxStack, maxVars);
+        match.visitEnd();
+    }
+
+    protected final void setupClasses() {
+        byte[]factoryCode = factory.toByteArray();
+        byte[]machineCode = machine.toByteArray();
+
+        if (Config.DEBUG_ASM) {
+            try {
+                FileOutputStream fos;
+                fos = new FileOutputStream(factoryName.substring(factoryName.lastIndexOf('/') + 1) + ".class");
+                fos.write(factoryCode);
+                fos.close();
+                fos = new FileOutputStream(machineName.substring(machineName.lastIndexOf('/') + 1) + ".class");
+                fos.write(machineCode);
+                fos.close();
+            } catch (IOException ioe) {
+                ioe.printStackTrace(Config.err);
+            }
+        }
+
+        loader.defineClass(machineName.replace('/', '.'), machineCode);
+        Class<?> cls = loader.defineClass(factoryName.replace('/', '.'), factoryCode);
+        try {
+            regex.factory = (MatcherFactory)cls.newInstance();
+        } catch(Exception e) {
+            e.printStackTrace(Config.err);
+        }
+    }
+
+    protected final void aload(int var) {
+        match.visitVarInsn(ALOAD, var);
+    }
+
+    protected final void astore(int var) {
+        match.visitVarInsn(ASTORE, var);
+    }
+
+    protected final void loadThis() {
+        match.visitVarInsn(ALOAD, THIS);
+    }
+
+    protected final void load(int var) {
+        match.visitVarInsn(ILOAD, var);
+    }
+
+    protected final void store(int var) {
+        match.visitVarInsn(ISTORE, var);
+    }
+
+    protected final void move(int to, int from) {
+        load(from);
+        store(to);
+    }
+
+    protected final void load(String field, String singature) {
+        loadThis();
+        match.visitFieldInsn(GETFIELD, machineName, field, singature);
+    }
+
+    protected final void load(String field) {
+        load(field, "I");
+    }
+
+    protected final void store(String field, String singature) {
+        loadThis();
+        match.visitFieldInsn(PUTFIELD, machineName, field, singature);
+    }
+
+    protected final void store(String field) {
+        store(field, "I");
+    }
+
+    protected final String installTemplate(char[] arr, int p, int length) {
+        String templateName = TEMPLATE + ++templates;
+        installArray(templateName, arr, p, length);
+        return templateName;
+    }
+
+    protected final String installCodeRange(int[]arr) {
+        String coreRangeName = CODERANGE + ++ranges;
+        installArray(coreRangeName, arr);
+        return coreRangeName;
+    }
+
+    protected final String installBitSet(int[]arr) {
+        String bitsetName = BITSET + ++bitsets;
+        installArray(bitsetName, arr);
+        return bitsetName;
+    }
+
+    private void installArray(String name, int[]arr) {
+        factory.visitField(ACC_PRIVATE + ACC_FINAL, name, "[I", null, null);
+        factoryInit.visitVarInsn(ALOAD, THIS);          // this;
+        loadInt(factoryInit, arr.length);               // this, length
+        factoryInit.visitIntInsn(NEWARRAY, T_INT);      // this, arr
+        for (int i=0;i < arr.length; i++) buildArray(i, arr[i], IASTORE);
+        factoryInit.visitFieldInsn(PUTFIELD, factoryName, name, "[I");
+    }
+
+    private void installArray(String name, char[]arr, int p, int length) {
+        factory.visitField(ACC_PRIVATE + ACC_FINAL, name, "[B", null, null);
+        factoryInit.visitVarInsn(ALOAD, THIS);          // this;
+        loadInt(factoryInit, arr.length);               // this, length
+        factoryInit.visitIntInsn(NEWARRAY, T_BYTE);     // this, arr
+        for (int i=p, j=0; i < p + length; i++, j++) buildArray(j, arr[i] & 0xff, BASTORE);
+        factoryInit.visitFieldInsn(PUTFIELD, factoryName, name, "[B");
+    }
+
+    private void buildArray(int index, int value, int type) {
+        factoryInit.visitInsn(DUP);     // ... arr, arr
+        loadInt(factoryInit, index);    // ... arr, arr, index
+        loadInt(factoryInit, value);    // ... arr, arr, index, value
+        factoryInit.visitInsn(type);    // ... arr
+    }
+
+    private void loadInt(MethodVisitor mv, int value) {
+        if (value >= -1 && value <= 5) {
+            mv.visitInsn(value + ICONST_0); // ICONST_0 == 3
+        } else if (value >= 6 && value <= 127 || value >= -128 && value <= -2) {
+            mv.visitIntInsn(BIPUSH, value);
+        } else if (value >= 128 && value <= 32767 || value >= -32768 && value <= -129) {
+            mv.visitIntInsn(SIPUSH, value);
+        } else {
+            mv.visitLdcInsn(new Integer(value));
+        }
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/BitSet.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/BitSet.java
new file mode 100644
index 00000000000..bf715987428
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/BitSet.java
@@ -0,0 +1,115 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni;
+
+public final class BitSet {
+    static final int BITS_PER_BYTE = 8;
+    public static final int SINGLE_BYTE_SIZE = (1 << BITS_PER_BYTE);
+    private static final int BITS_IN_ROOM = 4 * BITS_PER_BYTE;
+    static final int BITSET_SIZE = (SINGLE_BYTE_SIZE / BITS_IN_ROOM);
+    static final int ROOM_SHIFT = log2(BITS_IN_ROOM);
+
+    final int[] bits = new int[BITSET_SIZE];
+
+    private static final int BITS_TO_STRING_WRAP = 4;
+    public String toString() {
+        StringBuilder buffer = new StringBuilder();
+        buffer.append("BitSet");
+        for (int i=0; i<SINGLE_BYTE_SIZE; i++) {
+            if ((i % (SINGLE_BYTE_SIZE / BITS_TO_STRING_WRAP)) == 0) buffer.append("\n  ");
+            buffer.append(at(i) ? "1" : "0");
+        }
+        return buffer.toString();
+    }
+
+    public boolean at(int pos) {
+        return (bits[pos >>> ROOM_SHIFT] & bit(pos)) != 0;
+    }
+
+    public void set(int pos) {
+        bits[pos >>> ROOM_SHIFT] |= bit(pos);
+    }
+
+    public void clear(int pos) {
+        bits[pos >>> ROOM_SHIFT] &= ~bit(pos);
+    }
+
+    public void invert(int pos) {
+        bits[pos >>> ROOM_SHIFT] ^= bit(pos);
+    }
+
+    public void clear() {
+        for (int i=0; i<BITSET_SIZE; i++) bits[i]=0;
+    }
+
+    public boolean isEmpty() {
+        for (int i=0; i<BITSET_SIZE; i++) {
+            if (bits[i] != 0) return false;
+        }
+        return true;
+    }
+
+    public void setRange(int from, int to) {
+        for (int i=from; i<=to && i < SINGLE_BYTE_SIZE; i++) set(i);
+    }
+
+    public void setAll() {
+        for (int i=0; i<BITSET_SIZE; i++) bits[i] = ~0;
+    }
+
+    public void invert() {
+        for (int i=0; i<BITSET_SIZE; i++) bits[i] = ~bits[i];
+    }
+
+    public void invertTo(BitSet to) {
+        for (int i=0; i<BITSET_SIZE; i++) to.bits[i] = ~bits[i];
+    }
+
+    public void and(BitSet other) {
+        for (int i=0; i<BITSET_SIZE; i++) bits[i] &= other.bits[i];
+    }
+
+    public void or(BitSet other) {
+        for (int i=0; i<BITSET_SIZE; i++) bits[i] |= other.bits[i];
+    }
+
+    public void copy(BitSet other) {
+        for (int i=0; i<BITSET_SIZE; i++) bits[i] = other.bits[i];
+    }
+
+    public int numOn() {
+        int num = 0;
+        for (int i=0; i<SINGLE_BYTE_SIZE; i++) {
+            if (at(i)) num++;
+        }
+        return num;
+    }
+
+    static int bit(int pos){
+        return 1 << (pos % SINGLE_BYTE_SIZE);
+    }
+
+    private static int log2(int n){
+        int log = 0;
+        while ((n >>>= 1) != 0) log++;
+        return log;
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/BitStatus.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/BitStatus.java
new file mode 100644
index 00000000000..758a4e57457
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/BitStatus.java
@@ -0,0 +1,55 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni;
+
+final class BitStatus {
+    public static final int BIT_STATUS_BITS_NUM = 4 * 8;
+
+    public static int bsClear() {
+        return 0;
+    }
+    public static int bsAll() {
+        return -1;
+    }
+    public static boolean bsAt(int stats, int n) {
+        return (n < BIT_STATUS_BITS_NUM ? stats & (1 << n) : (stats & 1)) != 0;
+    }
+    public static int bsOnAt(int stats, int n) {
+        if (n < BIT_STATUS_BITS_NUM) {
+            stats |= (1 << n);
+        } else {
+            stats |= 1;
+        }
+        return stats;
+    }
+    public static int bsOnAtSimple(int stats, int n) {
+        if (n < BIT_STATUS_BITS_NUM) stats |= (1 << n);
+        return stats;
+    }
+
+    public static int bsOnOff(int v, int f, boolean negative) {
+        if (negative) {
+            v &= ~f;
+        } else {
+            v |= f;
+        }
+        return v;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ByteCodeMachine.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ByteCodeMachine.java
new file mode 100644
index 00000000000..8aaabe2deca
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ByteCodeMachine.java
@@ -0,0 +1,1462 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni;
+
+import static jdk.nashorn.internal.runtime.regexp.joni.BitStatus.bsAt;
+import static jdk.nashorn.internal.runtime.regexp.joni.Option.isFindCondition;
+import static jdk.nashorn.internal.runtime.regexp.joni.Option.isFindLongest;
+import static jdk.nashorn.internal.runtime.regexp.joni.Option.isFindNotEmpty;
+import static jdk.nashorn.internal.runtime.regexp.joni.Option.isNotBol;
+import static jdk.nashorn.internal.runtime.regexp.joni.Option.isNotEol;
+import static jdk.nashorn.internal.runtime.regexp.joni.Option.isPosixRegion;
+import static jdk.nashorn.internal.runtime.regexp.joni.EncodingHelper.isCrnl;
+import static jdk.nashorn.internal.runtime.regexp.joni.EncodingHelper.isNewLine;
+
+import jdk.nashorn.internal.runtime.regexp.joni.ast.CClassNode;
+import jdk.nashorn.internal.runtime.regexp.joni.constants.OPCode;
+import jdk.nashorn.internal.runtime.regexp.joni.constants.OPSize;
+import jdk.nashorn.internal.runtime.regexp.joni.encoding.IntHolder;
+import jdk.nashorn.internal.runtime.regexp.joni.exception.ErrorMessages;
+import jdk.nashorn.internal.runtime.regexp.joni.exception.InternalException;
+
+class ByteCodeMachine extends StackMachine {
+    private int bestLen;          // return value
+    private int s = 0;            // current char
+
+    private int range;            // right range
+    private int sprev;
+    private int sstart;
+    private int sbegin;
+
+    private final int[]code;        // byte code
+    private int ip;                 // instruction pointer
+
+    ByteCodeMachine(Regex regex, char[] chars, int p, int end) {
+        super(regex, chars, p, end);
+        this.code = regex.code;
+    }
+
+    protected int stkp; // a temporary
+    private boolean makeCaptureHistoryTree(CaptureTreeNode node) {
+        //CaptureTreeNode child;
+        int k = stkp;
+        //int k = kp;
+
+        while (k < stk) {
+            StackEntry e = stack[k];
+            if (e.type == MEM_START) {
+                int n = e.getMemNum();
+                if (n <= Config.MAX_CAPTURE_HISTORY_GROUP && bsAt(regex.captureHistory, n)) {
+                    CaptureTreeNode child = new CaptureTreeNode();
+                    child.group = n;
+                    child.beg = e.getMemPStr() - str;
+                    node.addChild(child);
+                    stkp = k + 1;
+                    if (makeCaptureHistoryTree(child)) return true;
+
+                    k = stkp;
+                    child.end = e.getMemPStr() - str;
+                }
+            } else if (e.type == MEM_END) {
+                if (e.getMemNum() == node.group) {
+                    node.end = e.getMemPStr() - str;
+                    stkp = k;
+                    return false;
+                }
+            }
+        }
+        return true; /* 1: root node ending. */
+    }
+
+    private void checkCaptureHistory(Region region) {
+        CaptureTreeNode node;
+        if (region.historyRoot == null) {
+            node = region.historyRoot = new CaptureTreeNode();
+        } else {
+            node = region.historyRoot;
+            node.clear();
+        }
+
+        // was clear ???
+        node.group = 0;
+        node.beg = sstart - str;
+        node.end = s      - str;
+
+        stkp = 0;
+        makeCaptureHistoryTree(region.historyRoot);
+    }
+
+    private boolean stringCmpIC(int caseFlodFlag, int s1, IntHolder ps2, int mbLen, int textEnd) {
+
+        int s2 = ps2.value;
+        int end1 = s1 + mbLen;
+
+        while (s1 < end1) {
+            char c1 = Character.toLowerCase(chars[s1++]);
+            char c2 = Character.toLowerCase(chars[s2++]);
+
+            if (c1 != c2) {
+                return false;
+            }
+        }
+        ps2.value = s2;
+        return true;
+    }
+
+    private void debugMatchBegin() {
+        Config.log.println("match_at: " +
+                "str: " + str +
+                ", end: " + end +
+                ", start: " + this.sstart +
+                ", sprev: " + this.sprev);
+        Config.log.println("size: " + (end - str) + ", start offset: " + (this.sstart - str));
+    }
+
+    private void debugMatchLoop() {
+        if (Config.DEBUG_MATCH) {
+            Config.log.printf("%4d", (s - str)).print("> \"");
+            int q, i;
+            for (i=0, q=s; i<7 && q<end && s>=0; i++) {
+                if (q < end) Config.log.print(new String(new char[]{chars[q++]}));
+            }
+            String str = q < end ? "...\"" : "\"";
+            q += str.length();
+            Config.log.print(str);
+            for (i=0; i<20-(q-s);i++) Config.log.print(" ");
+            StringBuilder sb = new StringBuilder();
+            new ByteCodePrinter(regex).compiledByteCodeToString(sb, ip);
+            Config.log.println(sb.toString());
+        }
+    }
+
+    protected final int matchAt(int range, int sstart, int sprev) {
+        this.range = range;
+        this.sstart = sstart;
+        this.sprev = sprev;
+
+        stk = 0;
+        ip = 0;
+
+        if (Config.DEBUG_MATCH) debugMatchBegin();
+
+        init();
+
+        bestLen = -1;
+        s = sstart;
+
+        final int[]code = this.code;
+        while (true) {
+            if (Config.DEBUG_MATCH) debugMatchLoop();
+
+            sbegin = s;
+            switch (code[ip++]) {
+                case OPCode.END:    if (opEnd()) return finish();                  break;
+                case OPCode.EXACT1:                     opExact1();                break;
+                case OPCode.EXACT2:                     opExact2();                continue;
+                case OPCode.EXACT3:                     opExact3();                continue;
+                case OPCode.EXACT4:                     opExact4();                continue;
+                case OPCode.EXACT5:                     opExact5();                continue;
+                case OPCode.EXACTN:                     opExactN();                continue;
+
+                case OPCode.EXACTMB2N1:                 opExactMB2N1();            break;
+                case OPCode.EXACTMB2N2:                 opExactMB2N2();            continue;
+                case OPCode.EXACTMB2N3:                 opExactMB2N3();            continue;
+                case OPCode.EXACTMB2N:                  opExactMB2N();             continue;
+                case OPCode.EXACTMB3N:                  opExactMB3N();             continue;
+                case OPCode.EXACTMBN:                   opExactMBN();              continue;
+
+                case OPCode.EXACT1_IC:                  opExact1IC();              break;
+                case OPCode.EXACTN_IC:                  opExactNIC();              continue;
+
+                case OPCode.CCLASS:                     opCClass();                break;
+                case OPCode.CCLASS_MB:                  opCClassMB();              break;
+                case OPCode.CCLASS_MIX:                 opCClassMIX();             break;
+                case OPCode.CCLASS_NOT:                 opCClassNot();             break;
+                case OPCode.CCLASS_MB_NOT:              opCClassMBNot();           break;
+                case OPCode.CCLASS_MIX_NOT:             opCClassMIXNot();          break;
+                case OPCode.CCLASS_NODE:                opCClassNode();            break;
+
+                case OPCode.ANYCHAR:                    opAnyChar();               break;
+                case OPCode.ANYCHAR_ML:                 opAnyCharML();             break;
+                case OPCode.ANYCHAR_STAR:               opAnyCharStar();           break;
+                case OPCode.ANYCHAR_ML_STAR:            opAnyCharMLStar();         break;
+                case OPCode.ANYCHAR_STAR_PEEK_NEXT:     opAnyCharStarPeekNext();   break;
+                case OPCode.ANYCHAR_ML_STAR_PEEK_NEXT:  opAnyCharMLStarPeekNext(); break;
+                case OPCode.STATE_CHECK_ANYCHAR_STAR:   opStateCheckAnyCharStar(); break;
+                case OPCode.STATE_CHECK_ANYCHAR_ML_STAR:opStateCheckAnyCharMLStar();break;
+
+                case OPCode.WORD:                       opWord();                  break;
+                case OPCode.NOT_WORD:                   opNotWord();               break;
+                case OPCode.WORD_BOUND:                 opWordBound();             continue;
+                case OPCode.NOT_WORD_BOUND:             opNotWordBound();          continue;
+                case OPCode.WORD_BEGIN:                 opWordBegin();             continue;
+                case OPCode.WORD_END:                   opWordEnd();               continue;
+
+                case OPCode.BEGIN_BUF:                  opBeginBuf();              continue;
+                case OPCode.END_BUF:                    opEndBuf();                continue;
+                case OPCode.BEGIN_LINE:                 opBeginLine();             continue;
+                case OPCode.END_LINE:                   opEndLine();               continue;
+                case OPCode.SEMI_END_BUF:               opSemiEndBuf();            continue;
+                case OPCode.BEGIN_POSITION:             opBeginPosition();         continue;
+
+                case OPCode.MEMORY_START_PUSH:          opMemoryStartPush();       continue;
+                case OPCode.MEMORY_START:               opMemoryStart();           continue;
+                case OPCode.MEMORY_END_PUSH:            opMemoryEndPush();         continue;
+                case OPCode.MEMORY_END:                 opMemoryEnd();             continue;
+                case OPCode.MEMORY_END_PUSH_REC:        opMemoryEndPushRec();      continue;
+                case OPCode.MEMORY_END_REC:             opMemoryEndRec();          continue;
+
+                case OPCode.BACKREF1:                   opBackRef1();              continue;
+                case OPCode.BACKREF2:                   opBackRef2();              continue;
+                case OPCode.BACKREFN:                   opBackRefN();              continue;
+                case OPCode.BACKREFN_IC:                opBackRefNIC();            continue;
+                case OPCode.BACKREF_MULTI:              opBackRefMulti();          continue;
+                case OPCode.BACKREF_MULTI_IC:           opBackRefMultiIC();        continue;
+                case OPCode.BACKREF_WITH_LEVEL:         opBackRefAtLevel();        continue;
+
+                case OPCode.NULL_CHECK_START:           opNullCheckStart();        continue;
+                case OPCode.NULL_CHECK_END:             opNullCheckEnd();          continue;
+                case OPCode.NULL_CHECK_END_MEMST:       opNullCheckEndMemST();     continue;
+                case OPCode.NULL_CHECK_END_MEMST_PUSH:  opNullCheckEndMemSTPush(); continue;
+
+                case OPCode.JUMP:                       opJump();                  continue;
+                case OPCode.PUSH:                       opPush();                  continue;
+
+                // CEC
+                case OPCode.STATE_CHECK_PUSH:           opStateCheckPush();        continue;
+                case OPCode.STATE_CHECK_PUSH_OR_JUMP:   opStateCheckPushOrJump();  continue;
+                case OPCode.STATE_CHECK:                opStateCheck();            continue;
+
+                case OPCode.POP:                        opPop();                   continue;
+                case OPCode.PUSH_OR_JUMP_EXACT1:        opPushOrJumpExact1();      continue;
+                case OPCode.PUSH_IF_PEEK_NEXT:          opPushIfPeekNext();        continue;
+
+                case OPCode.REPEAT:                     opRepeat();                continue;
+                case OPCode.REPEAT_NG:                  opRepeatNG();              continue;
+                case OPCode.REPEAT_INC:                 opRepeatInc();             continue;
+                case OPCode.REPEAT_INC_SG:              opRepeatIncSG();           continue;
+                case OPCode.REPEAT_INC_NG:              opRepeatIncNG();           continue;
+                case OPCode.REPEAT_INC_NG_SG:           opRepeatIncNGSG();         continue;
+
+                case OPCode.PUSH_POS:                   opPushPos();               continue;
+                case OPCode.POP_POS:                    opPopPos();                continue;
+                case OPCode.PUSH_POS_NOT:               opPushPosNot();            continue;
+                case OPCode.FAIL_POS:                   opFailPos();               continue;
+                case OPCode.PUSH_STOP_BT:               opPushStopBT();            continue;
+                case OPCode.POP_STOP_BT:                opPopStopBT();             continue;
+
+                case OPCode.LOOK_BEHIND:                opLookBehind();            continue;
+                case OPCode.PUSH_LOOK_BEHIND_NOT:       opPushLookBehindNot();     continue;
+                case OPCode.FAIL_LOOK_BEHIND_NOT:       opFailLookBehindNot();     continue;
+
+                // USE_SUBEXP_CALL
+                case OPCode.CALL:                       opCall();                  continue;
+                case OPCode.RETURN:                     opReturn();                continue;
+
+                case OPCode.FINISH:
+                    return finish();
+
+                case OPCode.FAIL:                       opFail();                  continue;
+
+                default:
+                    throw new InternalException(ErrorMessages.ERR_UNDEFINED_BYTECODE);
+
+            } // main switch
+        } // main while
+    }
+
+    private boolean opEnd() {
+        int n = s - sstart;
+
+        if (n > bestLen) {
+            if (Config.USE_FIND_LONGEST_SEARCH_ALL_OF_RANGE) {
+                if (isFindLongest(regex.options)) {
+                    if (n > msaBestLen) {
+                        msaBestLen = n;
+                        msaBestS = sstart;
+                    } else {
+                        // goto end_best_len;
+                        return endBestLength();
+                    }
+                }
+            } // USE_FIND_LONGEST_SEARCH_ALL_OF_RANGE
+
+            bestLen = n;
+            final Region region = msaRegion;
+            if (region != null) {
+                // USE_POSIX_REGION_OPTION ... else ...
+                region.beg[0] = msaBegin = sstart - str;
+                region.end[0] = msaEnd   = s      - str;
+                for (int i = 1; i <= regex.numMem; i++) {
+                    // opt!
+                    if (repeatStk[memEndStk + i] != INVALID_INDEX) {
+                        region.beg[i] = bsAt(regex.btMemStart, i) ?
+                                        stack[repeatStk[memStartStk + i]].getMemPStr() - str :
+                                        repeatStk[memStartStk + i] - str;
+
+
+                        region.end[i] = bsAt(regex.btMemEnd, i) ?
+                                        stack[repeatStk[memEndStk + i]].getMemPStr() :
+                                        repeatStk[memEndStk + i] - str;
+
+                    } else {
+                        region.beg[i] = region.end[i] = Region.REGION_NOTPOS;
+                    }
+
+                }
+
+                if (Config.USE_CAPTURE_HISTORY) {
+                    if (regex.captureHistory != 0) checkCaptureHistory(region);
+                }
+            } else {
+                msaBegin = sstart - str;
+                msaEnd   = s      - str;
+            }
+        } else {
+            Region region = msaRegion;
+            if (Config.USE_POSIX_API_REGION_OPTION) {
+                if (!isPosixRegion(regex.options)) {
+                    if (region != null) {
+                        region.clear();
+                    } else {
+                        msaBegin = msaEnd = 0;
+                    }
+                }
+            } else {
+                if (region != null) {
+                    region.clear();
+                } else {
+                    msaBegin = msaEnd = 0;
+                }
+            } // USE_POSIX_REGION_OPTION
+        }
+        // end_best_len:
+        /* default behavior: return first-matching result. */
+        return endBestLength();
+    }
+
+    private boolean endBestLength() {
+        if (isFindCondition(regex.options)) {
+            if (isFindNotEmpty(regex.options) && s == sstart) {
+                bestLen = -1;
+                {opFail(); return false;} /* for retry */
+            }
+            if (isFindLongest(regex.options) && s < range) {
+                {opFail(); return false;} /* for retry */
+            }
+        }
+        // goto finish;
+        return true;
+    }
+
+    private void opExact1() {
+        if (s >= range || code[ip] != chars[s++]) {opFail(); return;}
+        //if (s > range) {opFail(); return;}
+        ip++;
+        sprev = sbegin; // break;
+    }
+
+    private void opExact2() {
+        if (s + 2 > range) {opFail(); return;}
+        if (code[ip] != chars[s]) {opFail(); return;}
+        ip++; s++;
+        if (code[ip] != chars[s]) {opFail(); return;}
+        sprev = s;
+        ip++; s++;
+    }
+
+    private void opExact3() {
+        if (s + 3 > range) {opFail(); return;}
+        if (code[ip] != chars[s]) {opFail(); return;}
+        ip++; s++;
+        if (code[ip] != chars[s]) {opFail(); return;}
+        ip++; s++;
+        if (code[ip] != chars[s]) {opFail(); return;}
+        sprev = s;
+        ip++; s++;
+    }
+
+    private void opExact4() {
+        if (s + 4 > range) {opFail(); return;}
+        if (code[ip] != chars[s]) {opFail(); return;}
+        ip++; s++;
+        if (code[ip] != chars[s]) {opFail(); return;}
+        ip++; s++;
+        if (code[ip] != chars[s]) {opFail(); return;}
+        ip++; s++;
+        if (code[ip] != chars[s]) {opFail(); return;}
+        sprev = s;
+        ip++; s++;
+    }
+
+    private void opExact5() {
+        if (s + 5 > range) {opFail(); return;}
+        if (code[ip] != chars[s]) {opFail(); return;}
+        ip++; s++;
+        if (code[ip] != chars[s]) {opFail(); return;}
+        ip++; s++;
+        if (code[ip] != chars[s]) {opFail(); return;}
+        ip++; s++;
+        if (code[ip] != chars[s]) {opFail(); return;}
+        ip++; s++;
+        if (code[ip] != chars[s]) {opFail(); return;}
+        sprev = s;
+        ip++; s++;
+    }
+
+    private void opExactN() {
+        int tlen = code[ip++];
+        if (s + tlen > range) {opFail(); return;}
+
+        if (Config.USE_STRING_TEMPLATES) {
+            char[] bs = regex.templates[code[ip++]];
+            int ps = code[ip++];
+
+            while (tlen-- > 0) if (bs[ps++] != chars[s++]) {opFail(); return;}
+
+        } else {
+            while (tlen-- > 0) if (code[ip++] != chars[s++]) {opFail(); return;}
+        }
+        sprev = s - 1;
+    }
+
+    private void opExactMB2N1() {
+        if (s + 2 > range) {opFail(); return;}
+        if (code[ip] != chars[s]) {opFail(); return;}
+        ip++; s++;
+        if (code[ip] != chars[s]) {opFail(); return;}
+        ip++; s++;
+        sprev = sbegin; // break;
+    }
+
+    private void opExactMB2N2() {
+        if (s + 4 > range) {opFail(); return;}
+        if (code[ip] != chars[s]) {opFail(); return;}
+        ip++; s++;
+        if (code[ip] != chars[s]) {opFail(); return;}
+        ip++; s++;
+        sprev = s;
+        if (code[ip] != chars[s]) {opFail(); return;}
+        ip++; s++;
+        if (code[ip] != chars[s]) {opFail(); return;}
+        ip++; s++;
+   }
+
+    private void opExactMB2N3() {
+        if (s + 6 > range) {opFail(); return;}
+        if (code[ip] != chars[s]) {opFail(); return;}
+        ip++; s++;
+        if (code[ip] != chars[s]) {opFail(); return;}
+        ip++; s++;
+        if (code[ip] != chars[s]) {opFail(); return;}
+        ip++; s++;
+        if (code[ip] != chars[s]) {opFail(); return;}
+        ip++; s++;
+        sprev = s;
+        if (code[ip] != chars[s]) {opFail(); return;}
+        ip++; s++;
+        if (code[ip] != chars[s]) {opFail(); return;}
+        ip++; s++;
+    }
+
+    private void opExactMB2N() {
+        int tlen = code[ip++];
+        if (s + tlen * 2 > range) {opFail(); return;}
+
+        if (Config.USE_STRING_TEMPLATES) {
+            char[] bs = regex.templates[code[ip++]];
+            int ps = code[ip++];
+
+            while(tlen-- > 0) {
+                if (bs[ps] != chars[s]) {opFail(); return;}
+                ps++; s++;
+                if (bs[ps] != chars[s]) {opFail(); return;}
+                ps++; s++;
+            }
+        } else {
+            while(tlen-- > 0) {
+                if (code[ip] != chars[s]) {opFail(); return;}
+                ip++; s++;
+                if (code[ip] != chars[s]) {opFail(); return;}
+                ip++; s++;
+            }
+        }
+        sprev = s - 2;
+    }
+
+    private void opExactMB3N() {
+        int tlen = code[ip++];
+        if (s + tlen * 3 > range) {opFail(); return;}
+
+        if (Config.USE_STRING_TEMPLATES) {
+            char[] bs = regex.templates[code[ip++]];
+            int ps = code[ip++];
+
+            while (tlen-- > 0) {
+                if (bs[ps] != chars[s]) {opFail(); return;}
+                ps++; s++;
+                if (bs[ps] != chars[s]) {opFail(); return;}
+                ps++; s++;
+                if (bs[ps] != chars[s]) {opFail(); return;}
+                ps++; s++;
+            }
+        } else {
+            while (tlen-- > 0) {
+                if (code[ip] != chars[s]) {opFail(); return;}
+                ip++; s++;
+                if (code[ip] != chars[s]) {opFail(); return;}
+                ip++; s++;
+                if (code[ip] != chars[s]) {opFail(); return;}
+                ip++; s++;
+            }
+        }
+
+        sprev = s - 3;
+    }
+
+    private void opExactMBN() {
+        int tlen = code[ip++];   /* mb-len */
+        int tlen2= code[ip++];   /* string len */
+
+        tlen2 *= tlen;
+        if (s + tlen2 > range) {opFail(); return;}
+
+        if (Config.USE_STRING_TEMPLATES) {
+            char[] bs = regex.templates[code[ip++]];
+            int ps = code[ip++];
+
+            while (tlen2-- > 0) {
+                if (bs[ps] != chars[s]) {opFail(); return;}
+                ps++; s++;
+            }
+        } else {
+            while (tlen2-- > 0) {
+                if (code[ip] != chars[s]) {opFail(); return;}
+                ip++; s++;
+            }
+        }
+
+        sprev = s - tlen;
+    }
+
+    private void opExact1IC() {
+        if (s >= range || code[ip] != Character.toLowerCase(chars[s++])) {opFail(); return;}
+        ip++;
+        sprev = sbegin; // break;
+    }
+
+    private void opExactNIC() {
+        int tlen = code[ip++];
+        if (s + tlen > range) {opFail(); return;}
+
+        if (Config.USE_STRING_TEMPLATES) {
+            char[] bs = regex.templates[code[ip++]];
+            int ps = code[ip++];
+
+            while (tlen-- > 0) if (bs[ps++] != Character.toLowerCase(chars[s++])) {opFail(); return;}
+        } else {
+
+            while (tlen-- > 0) if (code[ip++] != Character.toLowerCase(chars[s++])) {opFail(); return;}
+        }
+        sprev = s - 1;
+    }
+
+    private boolean isInBitSet() {
+        int c = chars[s];
+        return (c <= 0xff && (code[ip + (c >>> BitSet.ROOM_SHIFT)] & (1 << c)) != 0);
+    }
+
+    private void opCClass() {
+        if (s >= range || !isInBitSet()) {opFail(); return;}
+        ip += BitSet.BITSET_SIZE;
+        s++;
+        sprev = sbegin; // break;
+    }
+
+    private boolean isInClassMB() {
+        int tlen = code[ip++];
+        if (s >= range) return false;
+        int ss = s;
+        s++;
+        int c = chars[ss];
+        if (!EncodingHelper.isInCodeRange(code, ip, c)) return false;
+        ip += tlen;
+        return true;
+    }
+
+    private void opCClassMB() {
+        // beyond string check
+        if (s >= range || chars[s] <= 0xff) {opFail(); return;}
+        if (!isInClassMB()) {opFail(); return;} // not!!!
+        sprev = sbegin; // break;
+    }
+
+    private void opCClassMIX() {
+        if (s >= range) {opFail(); return;}
+        if (chars[s] > 0xff) {
+            ip += BitSet.BITSET_SIZE;
+            if (!isInClassMB()) {opFail(); return;}
+        } else {
+            if (!isInBitSet()) {opFail(); return;}
+            ip += BitSet.BITSET_SIZE;
+            int tlen = code[ip++]; // by code range length
+            ip += tlen;
+            s++;
+        }
+        sprev = sbegin; // break;
+    }
+
+    private void opCClassNot() {
+        if (s >= range || isInBitSet()) {opFail(); return;}
+        ip += BitSet.BITSET_SIZE;
+        s++;
+        sprev = sbegin; // break;
+    }
+
+    private boolean isNotInClassMB() {
+        int tlen = code[ip++];
+
+        if (!(s + 1 <= range)) {
+            if (s >= range) return false;
+            s = end;
+            ip += tlen;
+            return true;
+        }
+
+        int ss = s;
+        s++;
+        int c = chars[ss];
+
+        if (EncodingHelper.isInCodeRange(code, ip, c)) return false;
+        ip += tlen;
+        return true;
+    }
+
+    private void opCClassMBNot() {
+        if (s >= range) {opFail(); return;}
+        if (chars[s] <= 0xff) {
+            s++;
+            int tlen = code[ip++];
+            ip += tlen;
+            sprev = sbegin; // break;
+            return;
+        }
+        if (!isNotInClassMB()) {opFail(); return;}
+        sprev = sbegin; // break;
+    }
+
+    private void opCClassMIXNot() {
+        if (s >= range) {opFail(); return;}
+        if (chars[s] > 0xff) {
+            ip += BitSet.BITSET_SIZE;
+            if (!isNotInClassMB()) {opFail(); return;}
+        } else {
+            if (isInBitSet()) {opFail(); return;}
+            ip += BitSet.BITSET_SIZE;
+            int tlen = code[ip++];
+            ip += tlen;
+            s++;
+        }
+        sprev = sbegin; // break;
+    }
+
+    private void opCClassNode() {
+        if (s >= range) {opFail(); return;}
+        CClassNode cc = (CClassNode)regex.operands[code[ip++]];
+        int ss = s;
+        s++;
+        int c = chars[ss];
+        if (!cc.isCodeInCCLength(c)) {opFail(); return;}
+        sprev = sbegin; // break;
+    }
+
+    private void opAnyChar() {
+        if (s >= range) {opFail(); return;}
+        if (chars[s] == EncodingHelper.NEW_LINE) {opFail(); return;}
+        s++;
+        sprev = sbegin; // break;
+    }
+
+    private void opAnyCharML() {
+        if (s >= range) {opFail(); return;}
+        s++;
+        sprev = sbegin; // break;
+    }
+
+    private void opAnyCharStar() {
+        final char[] chars = this.chars;
+        while (s < range) {
+            pushAlt(ip, s, sprev);
+            if (isNewLine(chars, s, end)) {opFail(); return;}
+            sprev = s;
+            s++;
+        }
+        sprev = sbegin; // break;
+    }
+
+    private void opAnyCharMLStar() {
+        while (s < range) {
+            pushAlt(ip, s, sprev);
+            sprev = s;
+            s++;
+        }
+        sprev = sbegin; // break;
+    }
+
+    private void opAnyCharStarPeekNext() {
+        final char c = (char)code[ip];
+        final char[] chars = this.chars;
+
+        while (s < range) {
+            char b = chars[s];
+            if (c == b) pushAlt(ip + 1, s, sprev);
+            if (b == EncodingHelper.NEW_LINE) {opFail(); return;}
+            sprev = s;
+            s++;
+        }
+        ip++;
+        sprev = sbegin; // break;
+    }
+
+    private void opAnyCharMLStarPeekNext() {
+        final char c = (char)code[ip];
+        final char[] chars = this.chars;
+
+        while (s < range) {
+            if (c == chars[s]) pushAlt(ip + 1, s, sprev);
+            sprev = s;
+            s++;
+        }
+        ip++;
+        sprev = sbegin; // break;
+    }
+
+    // CEC
+    private void opStateCheckAnyCharStar() {
+        int mem = code[ip++];
+        final char[] chars = this.chars;
+
+        while (s < range) {
+            if (stateCheckVal(s, mem)) {opFail(); return;}
+            pushAltWithStateCheck(ip, s, sprev, mem);
+            if (chars[s] == EncodingHelper.NEW_LINE) {opFail(); return;}
+            sprev = s;
+            s++;
+        }
+        sprev = sbegin; // break;
+    }
+
+    // CEC
+    private void opStateCheckAnyCharMLStar() {
+        int mem = code[ip++];
+
+        while (s < range) {
+            if (stateCheckVal(s, mem)) {opFail(); return;}
+            pushAltWithStateCheck(ip, s, sprev, mem);
+            sprev = s;
+            s++;
+        }
+        sprev = sbegin; // break;
+    }
+
+    private void opWord() {
+        if (s >= range || !EncodingHelper.isWord(chars[s])) {opFail(); return;}
+        s++;
+        sprev = sbegin; // break;
+    }
+
+    private void opNotWord() {
+        if (s >= range || EncodingHelper.isWord(chars[s])) {opFail(); return;}
+        s++;
+        sprev = sbegin; // break;
+    }
+
+    private void opWordBound() {
+        if (s == str) {
+            if (s >= range || !EncodingHelper.isWord(chars[s])) {opFail(); return;}
+        } else if (s == end) {
+            if (sprev >= end || !EncodingHelper.isWord(chars[sprev])) {opFail(); return;}
+        } else {
+            if (EncodingHelper.isWord(chars[s]) == EncodingHelper.isWord(chars[sprev])) {opFail(); return;}
+        }
+    }
+
+    private void opNotWordBound() {
+        if (s == str) {
+            if (s < range && EncodingHelper.isWord(chars[s])) {opFail(); return;}
+        } else if (s == end) {
+            if (sprev < end && EncodingHelper.isWord(chars[sprev])) {opFail(); return;}
+        } else {
+            if (EncodingHelper.isWord(chars[s]) != EncodingHelper.isWord(chars[sprev])) {opFail(); return;}
+        }
+    }
+
+    private void opWordBegin() {
+        if (s < range && EncodingHelper.isWord(chars[s])) {
+            if (s == str || !EncodingHelper.isWord(chars[sprev])) return;
+        }
+        opFail();
+    }
+
+    private void opWordEnd() {
+        if (s != str && EncodingHelper.isWord(chars[sprev])) {
+            if (s == end || !EncodingHelper.isWord(chars[s])) return;
+        }
+        opFail();
+    }
+
+    private void opBeginBuf() {
+        if (s != str) opFail();
+    }
+
+    private void opEndBuf() {
+        if (s != end) opFail();
+    }
+
+    private void opBeginLine() {
+        if (s == str) {
+            if (isNotBol(msaOptions)) opFail();
+            return;
+        } else if (EncodingHelper.isNewLine(chars, sprev, end) && s != end) {
+            return;
+        }
+        opFail();
+    }
+
+    private void opEndLine()  {
+        if (s == end) {
+            if (Config.USE_NEWLINE_AT_END_OF_STRING_HAS_EMPTY_LINE) {
+                if (str == end || !EncodingHelper.isNewLine(chars, sprev, end)) {
+                    if (isNotEol(msaOptions)) opFail();
+                }
+                return;
+            } else {
+                if (isNotEol(msaOptions)) opFail();
+                return;
+            }
+        } else if (isNewLine(chars, s, end) || (Config.USE_CRNL_AS_LINE_TERMINATOR && isCrnl(chars, s, end))) {
+            return;
+        }
+        opFail();
+    }
+
+    private void opSemiEndBuf() {
+        if (s == end) {
+            if (Config.USE_NEWLINE_AT_END_OF_STRING_HAS_EMPTY_LINE) {
+                if (str == end || !isNewLine(chars, sprev, end)) {
+                    if (isNotEol(msaOptions)) opFail();
+                }
+                return;
+            } else {
+                if (isNotEol(msaOptions)) opFail();
+                return;
+            }
+        } else if (isNewLine(chars, s, end) && s + 1 == end) {
+            return;
+        } else if (Config.USE_CRNL_AS_LINE_TERMINATOR && isCrnl(chars, s, end)) {
+            int ss = s + 2;
+            if (ss == end) return;
+        }
+        opFail();
+    }
+
+    private void opBeginPosition() {
+        if (s != msaStart) opFail();
+    }
+
+    private void opMemoryStartPush() {
+        int mem = code[ip++];
+        pushMemStart(mem, s);
+    }
+
+    private void opMemoryStart() {
+        int mem = code[ip++];
+        repeatStk[memStartStk + mem] = s;
+    }
+
+    private void opMemoryEndPush() {
+        int mem = code[ip++];
+        pushMemEnd(mem, s);
+    }
+
+    private void opMemoryEnd() {
+        int mem = code[ip++];
+        repeatStk[memEndStk + mem] = s;
+    }
+
+    private void opMemoryEndPushRec() {
+        int mem = code[ip++];
+        int stkp = getMemStart(mem); /* should be before push mem-end. */
+        pushMemEnd(mem, s);
+        repeatStk[memStartStk + mem] = stkp;
+    }
+
+    private void opMemoryEndRec() {
+        int mem = code[ip++];
+        repeatStk[memEndStk + mem] = s;
+        int stkp = getMemStart(mem);
+
+        if (BitStatus.bsAt(regex.btMemStart, mem)) {
+            repeatStk[memStartStk + mem] = stkp;
+        } else {
+            repeatStk[memStartStk + mem] = stack[stkp].getMemPStr();
+        }
+
+        pushMemEndMark(mem);
+    }
+
+    private boolean backrefInvalid(int mem) {
+        return repeatStk[memEndStk + mem] == INVALID_INDEX || repeatStk[memStartStk + mem] == INVALID_INDEX;
+    }
+
+    private int backrefStart(int mem) {
+        return bsAt(regex.btMemStart, mem) ? stack[repeatStk[memStartStk + mem]].getMemPStr() : repeatStk[memStartStk + mem];
+    }
+
+    private int backrefEnd(int mem) {
+        return bsAt(regex.btMemEnd, mem) ? stack[repeatStk[memEndStk + mem]].getMemPStr() : repeatStk[memEndStk + mem];
+    }
+
+    private void backref(int mem) {
+        /* if you want to remove following line,
+        you should check in parse and compile time. (numMem) */
+        if (mem > regex.numMem || backrefInvalid(mem)) {opFail(); return;}
+
+        int pstart = backrefStart(mem);
+        int pend = backrefEnd(mem);
+
+        int n = pend - pstart;
+        if (s + n > range) {opFail(); return;}
+        sprev = s;
+
+        // STRING_CMP
+        while(n-- > 0) if (chars[pstart++] != chars[s++]) {opFail(); return;}
+
+        int len;
+
+        // beyond string check
+        if (sprev < range) {
+            while (sprev + 1 < s) sprev++;
+        }
+    }
+
+    private void opBackRef1() {
+        backref(1);
+    }
+
+    private void opBackRef2() {
+        backref(2);
+    }
+
+    private void opBackRefN() {
+        backref(code[ip++]);
+    }
+
+    private void opBackRefNIC() {
+        int mem = code[ip++];
+        /* if you want to remove following line,
+        you should check in parse and compile time. (numMem) */
+        if (mem > regex.numMem || backrefInvalid(mem)) {opFail(); return;}
+
+        int pstart = backrefStart(mem);
+        int pend = backrefEnd(mem);
+
+        int n = pend - pstart;
+        if (s + n > range) {opFail(); return;}
+        sprev = s;
+
+        value = s;
+        if (!stringCmpIC(regex.caseFoldFlag, pstart, this, n, end)) {opFail(); return;}
+        s = value;
+
+        int len;
+        // if (sprev < chars.length)
+        while (sprev + 1 < s) sprev++;
+    }
+
+    private void opBackRefMulti() {
+        int tlen = code[ip++];
+
+        int i;
+        loop:for (i=0; i<tlen; i++) {
+            int mem = code[ip++];
+            if (backrefInvalid(mem)) continue;
+
+            int pstart = backrefStart(mem);
+            int pend = backrefEnd(mem);
+
+            int n = pend - pstart;
+            if (s + n > range) {opFail(); return;}
+
+            sprev = s;
+            int swork = s;
+
+            while (n-- > 0) {
+                if (chars[pstart++] != chars[swork++]) continue loop;
+            }
+
+            s = swork;
+
+            int len;
+
+            // beyond string check
+            if (sprev < range) {
+                while (sprev + 1 < s) sprev++;
+            }
+
+            ip += tlen - i  - 1; // * SIZE_MEMNUM (1)
+            break; /* success */
+        }
+        if (i == tlen) {opFail(); return;}
+    }
+
+    private void opBackRefMultiIC() {
+        int tlen = code[ip++];
+
+        int i;
+        loop:for (i=0; i<tlen; i++) {
+            int mem = code[ip++];
+            if (backrefInvalid(mem)) continue;
+
+            int pstart = backrefStart(mem);
+            int pend = backrefEnd(mem);
+
+            int n = pend - pstart;
+            if (s + n > range) {opFail(); return;}
+
+            sprev = s;
+
+            value = s;
+            if (!stringCmpIC(regex.caseFoldFlag, pstart, this, n, end)) continue loop; // STRING_CMP_VALUE_IC
+            s = value;
+
+            int len;
+            // if (sprev < chars.length)
+            while (sprev + 1 < s) sprev++;
+
+            ip += tlen - i  - 1; // * SIZE_MEMNUM (1)
+            break;  /* success */
+        }
+        if (i == tlen) {opFail(); return;}
+    }
+
+    private boolean memIsInMemp(int mem, int num, int memp) {
+        for (int i=0; i<num; i++) {
+            int m = code[memp++];
+            if (mem == m) return true;
+        }
+        return false;
+    }
+
+    // USE_BACKREF_AT_LEVEL // (s) and (end) implicit
+    private boolean backrefMatchAtNestedLevel(boolean ignoreCase, int caseFoldFlag,
+                                              int nest, int memNum, int memp) {
+        int pend = -1;
+        int level = 0;
+        int k = stk - 1;
+
+        while (k >= 0) {
+            StackEntry e = stack[k];
+
+            if (e.type == CALL_FRAME) {
+                level--;
+            } else if (e.type == RETURN) {
+                level++;
+            } else if (level == nest) {
+                if (e.type == MEM_START) {
+                    if (memIsInMemp(e.getMemNum(), memNum, memp)) {
+                        int pstart = e.getMemPStr();
+                        if (pend != -1) {
+                            if (pend - pstart > end - s) return false; /* or goto next_mem; */
+                            int p = pstart;
+
+                            value = s;
+                            if (ignoreCase) {
+                                if (!stringCmpIC(caseFoldFlag, pstart, this, pend - pstart, end)) {
+                                    return false; /* or goto next_mem; */
+                                }
+                            } else {
+                                while (p < pend) {
+                                    if (chars[p++] != chars[value++]) return false; /* or goto next_mem; */
+                                }
+                            }
+                            s = value;
+
+                            return true;
+                        }
+                    }
+                } else if (e.type == MEM_END) {
+                    if (memIsInMemp(e.getMemNum(), memNum, memp)) {
+                        pend = e.getMemPStr();
+                    }
+                }
+            }
+            k--;
+        }
+        return false;
+    }
+
+    private void opBackRefAtLevel() {
+        int ic      = code[ip++];
+        int level   = code[ip++];
+        int tlen    = code[ip++];
+
+        sprev = s;
+        if (backrefMatchAtNestedLevel(ic != 0, regex.caseFoldFlag, level, tlen, ip)) { // (s) and (end) implicit
+            int len;
+            while (sprev + 1 < s) sprev++;
+            ip += tlen; // * SIZE_MEMNUM
+        } else {
+            {opFail(); return;}
+        }
+    }
+
+    /* no need: IS_DYNAMIC_OPTION() == 0 */
+    private void opSetOptionPush() {
+        // option = code[ip++]; // final for now
+        pushAlt(ip, s, sprev);
+        ip += OPSize.SET_OPTION + OPSize.FAIL;
+    }
+
+    private void opSetOption() {
+        // option = code[ip++]; // final for now
+    }
+
+    private void opNullCheckStart() {
+        int mem = code[ip++];
+        pushNullCheckStart(mem, s);
+    }
+
+    private void nullCheckFound() {
+        // null_check_found:
+        /* empty loop founded, skip next instruction */
+        switch(code[ip++]) {
+        case OPCode.JUMP:
+        case OPCode.PUSH:
+            ip++;       // p += SIZE_RELADDR;
+            break;
+        case OPCode.REPEAT_INC:
+        case OPCode.REPEAT_INC_NG:
+        case OPCode.REPEAT_INC_SG:
+        case OPCode.REPEAT_INC_NG_SG:
+            ip++;        // p += SIZE_MEMNUM;
+            break;
+        default:
+            throw new InternalException(ErrorMessages.ERR_UNEXPECTED_BYTECODE);
+        } // switch
+    }
+
+    private void opNullCheckEnd() {
+        int mem = code[ip++];
+        int isNull = nullCheck(mem, s); /* mem: null check id */
+
+        if (isNull != 0) {
+            if (Config.DEBUG_MATCH) {
+                Config.log.println("NULL_CHECK_END: skip  id:" + mem + ", s:" + s);
+            }
+
+            nullCheckFound();
+        }
+    }
+
+    // USE_INFINITE_REPEAT_MONOMANIAC_MEM_STATUS_CHECK
+    private void opNullCheckEndMemST() {
+        int mem = code[ip++];   /* mem: null check id */
+        int isNull = nullCheckMemSt(mem, s);
+
+        if (isNull != 0) {
+            if (Config.DEBUG_MATCH) {
+                Config.log.println("NULL_CHECK_END_MEMST: skip  id:" + mem + ", s:" + s);
+            }
+
+            if (isNull == -1) {opFail(); return;}
+            nullCheckFound();
+        }
+    }
+
+    // USE_SUBEXP_CALL
+    private void opNullCheckEndMemSTPush() {
+        int mem = code[ip++];   /* mem: null check id */
+
+        int isNull;
+        if (Config.USE_MONOMANIAC_CHECK_CAPTURES_IN_ENDLESS_REPEAT) {
+            isNull = nullCheckMemStRec(mem, s);
+        } else {
+            isNull = nullCheckRec(mem, s);
+        }
+
+        if (isNull != 0) {
+            if (Config.DEBUG_MATCH) {
+                Config.log.println("NULL_CHECK_END_MEMST_PUSH: skip  id:" + mem + ", s:" + s);
+            }
+
+            if (isNull == -1) {opFail(); return;}
+            nullCheckFound();
+        } else {
+            pushNullCheckEnd(mem);
+        }
+    }
+
+    private void opJump() {
+        ip += code[ip] + 1;
+    }
+
+    private void opPush() {
+        int addr = code[ip++];
+        pushAlt(ip + addr, s, sprev);
+    }
+
+    // CEC
+    private void opStateCheckPush() {
+        int mem = code[ip++];
+        if (stateCheckVal(s, mem)) {opFail(); return;}
+        int addr = code[ip++];
+        pushAltWithStateCheck(ip + addr, s, sprev, mem);
+    }
+
+    // CEC
+    private void opStateCheckPushOrJump() {
+        int mem = code[ip++];
+        int addr= code[ip++];
+
+        if (stateCheckVal(s, mem)) {
+            ip += addr;
+        } else {
+            pushAltWithStateCheck(ip + addr, s, sprev, mem);
+        }
+    }
+
+    // CEC
+    private void opStateCheck() {
+        int mem = code[ip++];
+        if (stateCheckVal(s, mem)) {opFail(); return;}
+        pushStateCheck(s, mem);
+    }
+
+    private void opPop() {
+        popOne();
+    }
+
+    private void opPushOrJumpExact1() {
+        int addr = code[ip++];
+        // beyond string check
+        if (s < range && code[ip] == chars[s]) {
+            ip++;
+            pushAlt(ip + addr, s, sprev);
+            return;
+        }
+        ip += addr + 1;
+    }
+
+    private void opPushIfPeekNext() {
+        int addr = code[ip++];
+        // beyond string check
+        if (s < range && code[ip] == chars[s]) {
+            ip++;
+            pushAlt(ip + addr, s, sprev);
+            return;
+        }
+        ip++;
+    }
+
+    private void opRepeat() {
+        int mem = code[ip++];   /* mem: OP_REPEAT ID */
+        int addr= code[ip++];
+
+        // ensure1();
+        repeatStk[mem] = stk;
+        pushRepeat(mem, ip);
+
+        if (regex.repeatRangeLo[mem] == 0) { // lower
+            pushAlt(ip + addr, s, sprev);
+        }
+    }
+
+    private void opRepeatNG() {
+        int mem = code[ip++];   /* mem: OP_REPEAT ID */
+        int addr= code[ip++];
+
+        // ensure1();
+        repeatStk[mem] = stk;
+        pushRepeat(mem, ip);
+
+        if (regex.repeatRangeLo[mem] == 0) {
+            pushAlt(ip, s, sprev);
+            ip += addr;
+        }
+    }
+
+    private void repeatInc(int mem, int si) {
+        StackEntry e = stack[si];
+
+        e.increaseRepeatCount();
+
+        if (e.getRepeatCount() >= regex.repeatRangeHi[mem]) {
+            /* end of repeat. Nothing to do. */
+        } else if (e.getRepeatCount() >= regex.repeatRangeLo[mem]) {
+            pushAlt(ip, s, sprev);
+            ip = e.getRepeatPCode(); /* Don't use stkp after PUSH. */
+        } else {
+            ip = e.getRepeatPCode();
+        }
+        pushRepeatInc(si);
+    }
+
+    private void opRepeatInc() {
+        int mem = code[ip++];   /* mem: OP_REPEAT ID */
+        int si = repeatStk[mem];
+        repeatInc(mem, si);
+    }
+
+    private void opRepeatIncSG() {
+        int mem = code[ip++];   /* mem: OP_REPEAT ID */
+        int si = getRepeat(mem);
+        repeatInc(mem, si);
+    }
+
+    private void repeatIncNG(int mem, int si) {
+        StackEntry e = stack[si];
+
+        e.increaseRepeatCount();
+
+        if (e.getRepeatCount() < regex.repeatRangeHi[mem]) {
+            if (e.getRepeatCount() >= regex.repeatRangeLo[mem]) {
+                int pcode = e.getRepeatPCode();
+                pushRepeatInc(si);
+                pushAlt(pcode, s, sprev);
+            } else {
+                ip = e.getRepeatPCode();
+                pushRepeatInc(si);
+            }
+        } else if (e.getRepeatCount() == regex.repeatRangeHi[mem]) {
+            pushRepeatInc(si);
+        }
+    }
+
+    private void opRepeatIncNG() {
+        int mem = code[ip++];
+        int si = repeatStk[mem];
+        repeatIncNG(mem, si);
+    }
+
+    private void opRepeatIncNGSG() {
+        int mem = code[ip++];
+        int si = getRepeat(mem);
+        repeatIncNG(mem, si);
+    }
+
+    private void opPushPos() {
+        pushPos(s, sprev);
+    }
+
+    private void opPopPos() {
+        StackEntry e = stack[posEnd()];
+        s    = e.getStatePStr();
+        sprev= e.getStatePStrPrev();
+    }
+
+    private void opPushPosNot() {
+        int addr = code[ip++];
+        pushPosNot(ip + addr, s, sprev);
+    }
+
+    private void opFailPos() {
+        popTilPosNot();
+        opFail();
+    }
+
+    private void opPushStopBT() {
+        pushStopBT();
+    }
+
+    private void opPopStopBT() {
+        stopBtEnd();
+    }
+
+    private void opLookBehind() {
+        int tlen = code[ip++];
+        s = EncodingHelper.stepBack(str, s, tlen);
+        if (s == -1) {opFail(); return;}
+        sprev = EncodingHelper.prevCharHead(str, s);
+    }
+
+    private void opLookBehindSb() {
+        int tlen = code[ip++];
+        s -= tlen;
+        if (s < str) {opFail(); return;}
+        sprev = s == str ? -1 : s - 1;
+    }
+
+    private void opPushLookBehindNot() {
+        int addr = code[ip++];
+        int tlen = code[ip++];
+        int q = EncodingHelper.stepBack(str, s, tlen);
+        if (q == -1) {
+            /* too short case -> success. ex. /(?<!XXX)a/.match("a")
+            If you want to change to fail, replace following line. */
+            ip += addr;
+            // return FAIL;
+        } else {
+            pushLookBehindNot(ip + addr, s, sprev);
+            s = q;
+            sprev = EncodingHelper.prevCharHead(str, s);
+        }
+    }
+
+    private void opFailLookBehindNot() {
+        popTilLookBehindNot();
+        opFail();
+    }
+
+    private void opCall() {
+        int addr = code[ip++];
+        pushCallFrame(ip);
+        ip = addr; // absolute address
+    }
+
+    private void opReturn() {
+        ip = sreturn();
+        pushReturn();
+    }
+
+    private void opFail() {
+        if (stack == null) {
+            ip = regex.codeLength - 1;
+            return;
+        }
+
+
+        StackEntry e = pop();
+        ip    = e.getStatePCode();
+        s     = e.getStatePStr();
+        sprev = e.getStatePStrPrev();
+
+        if (Config.USE_COMBINATION_EXPLOSION_CHECK) {
+            if (e.getStateCheck() != 0) {
+                e.type = STATE_CHECK_MARK;
+                stk++;
+            }
+        }
+    }
+
+    private int finish() {
+        return bestLen;
+    }
+}
\ No newline at end of file
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ByteCodePrinter.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ByteCodePrinter.java
new file mode 100644
index 00000000000..86a558b0e0c
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ByteCodePrinter.java
@@ -0,0 +1,416 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni;
+
+import jdk.nashorn.internal.runtime.regexp.joni.ast.CClassNode;
+import jdk.nashorn.internal.runtime.regexp.joni.constants.Arguments;
+import jdk.nashorn.internal.runtime.regexp.joni.constants.OPCode;
+import jdk.nashorn.internal.runtime.regexp.joni.constants.OPSize;
+import jdk.nashorn.internal.runtime.regexp.joni.exception.InternalException;
+
+class ByteCodePrinter {
+    final int[]code;
+    final int codeLength;
+    final char[][] templates;
+
+    Object[]operands;
+    int operantCount;
+    WarnCallback warnings;
+
+    public ByteCodePrinter(Regex regex) {
+        code = regex.code;
+        codeLength = regex.codeLength;
+        operands = regex.operands;
+        operantCount = regex.operandLength;
+
+        templates = regex.templates;
+        warnings = regex.warnings;
+    }
+
+    public String byteCodeListToString() {
+        return compiledByteCodeListToString();
+    }
+
+    private void pString(StringBuilder sb, int len, int s) {
+        sb.append(":");
+        while (len-- > 0) sb.append(new String(new byte[]{(byte)code[s++]}));
+    }
+
+    private void pStringFromTemplate(StringBuilder sb, int len, byte[]tm, int idx) {
+        sb.append(":T:");
+        while (len-- > 0) sb.append(new String(new byte[]{tm[idx++]}));
+    }
+
+    private void pLenString(StringBuilder sb, int len, int mbLen, int s) {
+        int x = len * mbLen;
+        sb.append(":" + len + ":");
+        while (x-- > 0) sb.append(new String(new byte[]{(byte)code[s++]}));
+    }
+
+    private void pLenStringFromTemplate(StringBuilder sb, int len, int mbLen, char[] tm, int idx) {
+        int x = len * mbLen;
+        sb.append(":T:" + len + ":");
+        while (x-- > 0) sb.append(new String(new byte[]{(byte)tm[idx++]}));
+    }
+
+    public int compiledByteCodeToString(StringBuilder sb, int bp) {
+        int len, n, mem, addr, scn, cod;
+        BitSet bs;
+        CClassNode cc;
+        int tm, idx;
+
+        sb.append("[" + OPCode.OpCodeNames[code[bp]]);
+        int argType = OPCode.OpCodeArgTypes[code[bp]];
+        int ip = bp;
+        if (argType != Arguments.SPECIAL) {
+            bp++;
+            switch (argType) {
+            case Arguments.NON:
+                break;
+
+            case Arguments.RELADDR:
+                sb.append(":(" + code[bp] + ")");
+                bp += OPSize.RELADDR;
+                break;
+
+            case Arguments.ABSADDR:
+                sb.append(":(" + code[bp] + ")");
+                bp += OPSize.ABSADDR;
+                break;
+
+            case Arguments.LENGTH:
+                sb.append(":" + code[bp]);
+                bp += OPSize.LENGTH;
+                break;
+
+            case Arguments.MEMNUM:
+                sb.append(":" + code[bp]);
+                bp += OPSize.MEMNUM;
+                break;
+
+            case Arguments.OPTION:
+                sb.append(":" + code[bp]);
+                bp += OPSize.OPTION;
+                break;
+
+            case Arguments.STATE_CHECK:
+                sb.append(":" + code[bp]);
+                bp += OPSize.STATE_CHECK;
+                break;
+            }
+        } else {
+            switch (code[bp++]) {
+            case OPCode.EXACT1:
+            case OPCode.ANYCHAR_STAR_PEEK_NEXT:
+            case OPCode.ANYCHAR_ML_STAR_PEEK_NEXT:
+            case OPCode.ANYCHAR_STAR_PEEK_NEXT_SB:
+            case OPCode.ANYCHAR_ML_STAR_PEEK_NEXT_SB:
+                pString(sb, 1, bp++);
+                break;
+
+            case OPCode.EXACT2:
+                pString(sb, 2, bp);
+                bp += 2;
+                break;
+
+            case OPCode.EXACT3:
+                pString(sb, 3, bp);
+                bp += 3;
+                break;
+
+            case OPCode.EXACT4:
+                pString(sb, 4, bp);
+                bp += 4;
+                break;
+
+            case OPCode.EXACT5:
+                pString(sb, 5, bp);
+                bp += 5;
+                break;
+
+            case OPCode.EXACTN:
+                len = code[bp];
+                bp += OPSize.LENGTH;
+                if (Config.USE_STRING_TEMPLATES) {
+                    tm = code[bp];
+                    bp += OPSize.INDEX;
+                    idx = code[bp];
+                    bp += OPSize.INDEX;
+                    pLenStringFromTemplate(sb, len, 1, templates[tm], idx);
+                } else {
+                    pLenString(sb, len, 1, bp);
+                    bp += len;
+                }
+                break;
+
+            case OPCode.EXACTMB2N1:
+                pString(sb, 2, bp);
+                bp += 2;
+                break;
+
+            case OPCode.EXACTMB2N2:
+                pString(sb, 4, bp);
+                bp += 4;
+                break;
+
+            case OPCode.EXACTMB2N3:
+                pString(sb, 6, bp);
+                bp += 6;
+                break;
+
+            case OPCode.EXACTMB2N:
+                len = code[bp];
+                bp += OPSize.LENGTH;
+                if (Config.USE_STRING_TEMPLATES) {
+                    tm = code[bp];
+                    bp += OPSize.INDEX;
+                    idx = code[bp];
+                    bp += OPSize.INDEX;
+                    pLenStringFromTemplate(sb, len, 2, templates[tm], idx);
+                } else {
+                    pLenString(sb, len, 2, bp);
+                    bp += len * 2;
+                }
+                break;
+
+            case OPCode.EXACTMB3N:
+                len = code[bp];
+                bp += OPSize.LENGTH;
+                if (Config.USE_STRING_TEMPLATES) {
+                    tm = code[bp];
+                    bp += OPSize.INDEX;
+                    idx = code[bp];
+                    bp += OPSize.INDEX;
+                    pLenStringFromTemplate(sb, len, 3, templates[tm], idx);
+                } else {
+                    pLenString(sb, len, 3, bp);
+                    bp += len * 3;
+                }
+                break;
+
+            case OPCode.EXACTMBN:
+                int mbLen = code[bp];
+                bp += OPSize.LENGTH;
+                len = code[bp];
+                bp += OPSize.LENGTH;
+                n = len * mbLen;
+
+                if (Config.USE_STRING_TEMPLATES) {
+                    tm = code[bp];
+                    bp += OPSize.INDEX;
+                    idx = code[bp];
+                    bp += OPSize.INDEX;
+                    sb.append(":T:" + mbLen + ":" + len + ":");
+
+                    while (n-- > 0) sb.append(new String(new char[]{templates[tm][idx++]}));
+                } else {
+                    sb.append(":" + mbLen + ":" + len + ":");
+
+                    while (n-- > 0) sb.append(new String(new byte[]{(byte)code[bp++]}));
+                }
+
+                break;
+
+            case OPCode.EXACT1_IC:
+            case OPCode.EXACT1_IC_SB:
+                final int MAX_CHAR_LENGTH = 6;
+                byte[]bytes = new byte[MAX_CHAR_LENGTH];
+                for (int i = 0; bp + i < code.length && i < MAX_CHAR_LENGTH; i++) bytes[i] = (byte)code[bp + i];
+                pString(sb, 1, bp);
+                bp++;
+                break;
+
+            case OPCode.EXACTN_IC:
+            case OPCode.EXACTN_IC_SB:
+                len = code[bp];
+                bp += OPSize.LENGTH;
+                if (Config.USE_STRING_TEMPLATES) {
+                    tm = code[bp];
+                    bp += OPSize.INDEX;
+                    idx = code[bp];
+                    bp += OPSize.INDEX;
+                    pLenStringFromTemplate(sb, len, 1, templates[tm], idx);
+                } else {
+                    pLenString(sb, len, 1, bp);
+                    bp += len;
+                }
+                break;
+
+            case OPCode.CCLASS:
+            case OPCode.CCLASS_SB:
+                bs = new BitSet();
+                System.arraycopy(code, bp, bs.bits, 0, BitSet.BITSET_SIZE);
+                n = bs.numOn();
+                bp += BitSet.BITSET_SIZE;
+                sb.append(":" + n);
+                break;
+
+            case OPCode.CCLASS_NOT:
+            case OPCode.CCLASS_NOT_SB:
+                bs = new BitSet();
+                System.arraycopy(code, bp, bs.bits, 0, BitSet.BITSET_SIZE);
+                n = bs.numOn();
+                bp += BitSet.BITSET_SIZE;
+                sb.append(":" + n);
+                break;
+
+            case OPCode.CCLASS_MB:
+            case OPCode.CCLASS_MB_NOT:
+                len = code[bp];
+                bp += OPSize.LENGTH;
+                cod = code[bp];
+                //bp += OPSize.CODE_POINT;
+                bp += len;
+                sb.append(":" + cod + ":" + len);
+                break;
+
+            case OPCode.CCLASS_MIX:
+            case OPCode.CCLASS_MIX_NOT:
+                bs = new BitSet();
+                System.arraycopy(code, bp, bs.bits, 0, BitSet.BITSET_SIZE);
+                n = bs.numOn();
+                bp += BitSet.BITSET_SIZE;
+                len = code[bp];
+                bp += OPSize.LENGTH;
+                cod = code[bp];
+                //bp += OPSize.CODE_POINT;
+                bp += len;
+                sb.append(":" + n + ":" + cod + ":" + len);
+                break;
+
+            case OPCode.CCLASS_NODE:
+                cc = (CClassNode)operands[code[bp]];
+                bp += OPSize.POINTER;
+                n = cc.bs.numOn();
+                sb.append(":" + cc + ":" + n);
+                break;
+
+            case OPCode.BACKREFN_IC:
+                mem = code[bp];
+                bp += OPSize.MEMNUM;
+                sb.append(":" + mem);
+                break;
+
+            case OPCode.BACKREF_MULTI_IC:
+            case OPCode.BACKREF_MULTI:
+                sb.append(" ");
+                len = code[bp];
+                bp += OPSize.LENGTH;
+                for (int i=0; i<len; i++) {
+                    mem = code[bp];
+                    bp += OPSize.MEMNUM;
+                    if (i > 0) sb.append(", ");
+                    sb.append(mem);
+                }
+                break;
+
+            case OPCode.BACKREF_WITH_LEVEL: {
+                int option = code[bp];
+                bp += OPSize.OPTION;
+                sb.append(":" + option);
+                int level = code[bp];
+                bp += OPSize.LENGTH;
+                sb.append(":" + level);
+                sb.append(" ");
+                len = code[bp];
+                bp += OPSize.LENGTH;
+                for (int i=0; i<len; i++) {
+                    mem = code[bp];
+                    bp += OPSize.MEMNUM;
+                    if (i > 0) sb.append(", ");
+                    sb.append(mem);
+                }
+                break;
+            }
+
+            case OPCode.REPEAT:
+            case OPCode.REPEAT_NG:
+                mem = code[bp];
+                bp += OPSize.MEMNUM;
+                addr = code[bp];
+                bp += OPSize.RELADDR;
+                sb.append(":" + mem + ":" + addr);
+                break;
+
+            case OPCode.PUSH_OR_JUMP_EXACT1:
+            case OPCode.PUSH_IF_PEEK_NEXT:
+                addr = code[bp];
+                bp += OPSize.RELADDR;
+                sb.append(":(" + addr + ")");
+                pString(sb, 1, bp);
+                bp++;
+                break;
+
+            case OPCode.LOOK_BEHIND:
+            case OPCode.LOOK_BEHIND_SB:
+                len = code[bp];
+                bp += OPSize.LENGTH;
+                sb.append(":" + len);
+                break;
+
+            case OPCode.PUSH_LOOK_BEHIND_NOT:
+                addr = code[bp];
+                bp += OPSize.RELADDR;
+                len = code[bp];
+                bp += OPSize.LENGTH;
+                sb.append(":" + len + ":(" + addr + ")");
+                break;
+
+            case OPCode.STATE_CHECK_PUSH:
+            case OPCode.STATE_CHECK_PUSH_OR_JUMP:
+                scn = code[bp];
+                bp += OPSize.STATE_CHECK_NUM;
+                addr = code[bp];
+                bp += OPSize.RELADDR;
+                sb.append(":" + scn + ":(" + addr + ")");
+                break;
+
+            default:
+                throw new InternalException("undefined code: " + code[--bp]);
+            }
+        }
+
+        sb.append("]");
+
+        // @opcode_address(opcode_size)
+        if (Config.DEBUG_COMPILE_BYTE_CODE_INFO) sb.append("@" + ip + "(" + (bp - ip) + ")");
+
+        return bp;
+    }
+
+    private String compiledByteCodeListToString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("code length: " + codeLength + "\n");
+
+        int ncode = 0;
+        int bp = 0;
+        int end = codeLength;
+
+        while (bp < end) {
+            ncode++;
+
+            if (bp > 0) sb.append(ncode % 5 == 0 ? "\n" : " ");
+
+            bp = compiledByteCodeToString(sb, bp);
+        }
+        sb.append("\n");
+        return sb.toString();
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/CaptureTreeNode.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/CaptureTreeNode.java
new file mode 100644
index 00000000000..268f682c92e
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/CaptureTreeNode.java
@@ -0,0 +1,74 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni;
+
+public class CaptureTreeNode {
+
+
+    int group;
+    int beg;
+    int end;
+    // int allocated;
+    int numChildren;
+    CaptureTreeNode[]children;
+
+    CaptureTreeNode() {
+        beg = Region.REGION_NOTPOS;
+        end = Region.REGION_NOTPOS;
+        group = -1;
+    }
+
+    static final int HISTORY_TREE_INIT_ALLOC_SIZE = 8;
+    void addChild(CaptureTreeNode child) {
+        if (children == null) {
+            children = new CaptureTreeNode[HISTORY_TREE_INIT_ALLOC_SIZE];
+        } else if (numChildren >= children.length) {
+            CaptureTreeNode[]tmp = new CaptureTreeNode[children.length << 1];
+            System.arraycopy(children, 0, tmp, 0, children.length);
+            children = tmp;
+        }
+
+        children[numChildren] = child;
+        numChildren++;
+    }
+
+    void clear() {
+        for (int i=0; i<numChildren; i++) {
+            children[i] = null; // ???
+        }
+        numChildren = 0;
+        beg = end = Region.REGION_NOTPOS;
+        group = -1;
+    }
+
+    CaptureTreeNode cloneTree() {
+        CaptureTreeNode clone = new CaptureTreeNode();
+        clone.beg = beg;
+        clone.end = end;
+
+        for (int i=0; i<numChildren; i++) {
+            CaptureTreeNode child = children[i].cloneTree();
+            clone.addChild(child);
+        }
+        return clone;
+    }
+
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/CodeRangeBuffer.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/CodeRangeBuffer.java
new file mode 100644
index 00000000000..87e0f8e1fc3
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/CodeRangeBuffer.java
@@ -0,0 +1,378 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni;
+
+import jdk.nashorn.internal.runtime.regexp.joni.exception.ErrorMessages;
+import jdk.nashorn.internal.runtime.regexp.joni.exception.ValueException;
+
+public final class CodeRangeBuffer {
+    private static final int INIT_MULTI_BYTE_RANGE_SIZE = 5;
+    private static final int ALL_MULTI_BYTE_RANGE = 0x7fffffff;
+
+    int[]p;
+    int used;
+
+    public CodeRangeBuffer(int[]ranges) {
+        p = ranges;
+        used = ranges[0] + 1;
+    }
+
+    public CodeRangeBuffer() {
+        p = new int[INIT_MULTI_BYTE_RANGE_SIZE];
+        writeCodePoint(0, 0);
+    }
+
+    public int[]getCodeRange() {
+        return p;
+    }
+
+    private CodeRangeBuffer(CodeRangeBuffer orig) {
+        p = new int[orig.p.length];
+        System.arraycopy(orig.p, 0, p, 0, p.length);
+        used = orig.used;
+    }
+
+    public String toString() {
+        StringBuilder buf = new StringBuilder();
+        buf.append("CodeRange");
+        buf.append("\n  used: " + used);
+        buf.append("\n  code point: " + p[0]);
+        buf.append("\n  ranges: ");
+
+        for (int i=0; i<p[0]; i++) {
+            buf.append("[" + rangeNumToString(p[i * 2 + 1]) + ".." + rangeNumToString(p[i * 2 + 2]) + "]");
+            if (i > 0 && i % 6 == 0) buf.append("\n          ");
+        }
+
+        return buf.toString();
+    }
+
+    private static String rangeNumToString(int num){
+        return "0x" + Integer.toString(num, 16);
+    }
+
+    public void expand(int low) {
+        int length = p.length;
+        do { length <<= 1; } while (length < low);
+        int[]tmp = new int[length];
+        System.arraycopy(p, 0, tmp, 0, used);
+        p = tmp;
+    }
+
+    public void ensureSize(int size) {
+        int length = p.length;
+        while (length < size ) { length <<= 1; }
+        if (p.length != length) {
+            int[]tmp = new int[length];
+            System.arraycopy(p, 0, tmp, 0, used);
+            p = tmp;
+        }
+    }
+
+    private void moveRight(int from, int to, int n) {
+        if (to + n > p.length) expand(to + n);
+        System.arraycopy(p, from, p, to, n);
+        if (to + n > used) used = to + n;
+    }
+
+    protected void moveLeft(int from, int to, int n) {
+        System.arraycopy(p, from, p, to, n);
+    }
+
+    private void moveLeftAndReduce(int from, int to) {
+        System.arraycopy(p, from, p, to, used - from);
+        used -= from - to;
+    }
+
+    public void writeCodePoint(int pos, int b) {
+        int u = pos + 1;
+        if (p.length < u) expand(u);
+        p[pos] = b;
+        if (used < u) used = u;
+    }
+
+    public CodeRangeBuffer clone() {
+        return new CodeRangeBuffer(this);
+    }
+
+    // ugly part: these methods should be made OO
+    // add_code_range_to_buf
+    public static CodeRangeBuffer addCodeRangeToBuff(CodeRangeBuffer pbuf, int from, int to) {
+        if (from > to) {
+            int n = from;
+            from = to;
+            to = n;
+        }
+
+        if (pbuf == null) pbuf = new CodeRangeBuffer(); // move to CClassNode
+
+        int[]p = pbuf.p;
+        int n = p[0];
+
+        int low = 0;
+        int bound = n;
+
+        while (low < bound) {
+            int x = (low + bound) >>> 1;
+            if (from > p[x * 2 + 2]) {
+                low = x + 1;
+            } else {
+                bound = x;
+            }
+        }
+
+        int high = low;
+        bound = n;
+
+        while (high < bound) {
+            int x = (high + bound) >>> 1;
+            if (to >= p[x * 2 + 1] - 1) {
+                high = x + 1;
+            } else {
+                bound = x;
+            }
+        }
+
+        int incN = low + 1 - high;
+
+        if (n + incN > Config.MAX_MULTI_BYTE_RANGES_NUM) throw new ValueException(ErrorMessages.ERR_TOO_MANY_MULTI_BYTE_RANGES);
+
+        if (incN != 1) {
+            if (from > p[low * 2 + 1]) from = p[low * 2 + 1];
+            if (to < p[(high - 1) * 2 + 2]) to = p[(high - 1) * 2 + 2];
+        }
+
+        if (incN != 0 && high < n) {
+            int fromPos = 1 + high * 2;
+            int toPos = 1 + (low + 1) * 2;
+            int size = (n - high) * 2;
+
+            if (incN > 0) {
+                pbuf.moveRight(fromPos, toPos, size);
+            } else {
+                pbuf.moveLeftAndReduce(fromPos, toPos);
+            }
+        }
+
+        int pos = 1 + low * 2;
+        // pbuf.ensureSize(pos + 2);
+        pbuf.writeCodePoint(pos, from);
+        pbuf.writeCodePoint(pos + 1, to);
+        n += incN;
+        pbuf.writeCodePoint(0, n);
+
+        return pbuf;
+    }
+
+    // add_code_range, be aware of it returning null!
+    public static CodeRangeBuffer addCodeRange(CodeRangeBuffer pbuf, ScanEnvironment env, int from, int to) {
+        if (from >to) {
+            if (env.syntax.allowEmptyRangeInCC()) {
+                return pbuf;
+            } else {
+                throw new ValueException(ErrorMessages.ERR_EMPTY_RANGE_IN_CHAR_CLASS);
+            }
+        }
+        return addCodeRangeToBuff(pbuf, from, to);
+    }
+
+    // SET_ALL_MULTI_BYTE_RANGE
+    protected static CodeRangeBuffer setAllMultiByteRange(CodeRangeBuffer pbuf) {
+        return addCodeRangeToBuff(pbuf, EncodingHelper.mbcodeStartPosition(), ALL_MULTI_BYTE_RANGE);
+    }
+
+    // ADD_ALL_MULTI_BYTE_RANGE
+    public static CodeRangeBuffer addAllMultiByteRange(CodeRangeBuffer pbuf) {
+        return setAllMultiByteRange(pbuf);
+    }
+
+    // not_code_range_buf
+    public static CodeRangeBuffer notCodeRangeBuff(CodeRangeBuffer bbuf) {
+        CodeRangeBuffer pbuf = null;
+
+        if (bbuf == null) return setAllMultiByteRange(pbuf);
+
+        int[]p = bbuf.p;
+        int n = p[0];
+
+        if (n <= 0) return setAllMultiByteRange(pbuf);
+
+        int pre = EncodingHelper.mbcodeStartPosition();
+
+        int from;
+        int to = 0;
+        for (int i=0; i<n; i++) {
+            from = p[i * 2 + 1];
+            to = p[i * 2 + 2];
+            if (pre <= from - 1) {
+                pbuf = addCodeRangeToBuff(pbuf, pre, from - 1);
+            }
+            if (to == ALL_MULTI_BYTE_RANGE) break;
+            pre = to + 1;
+        }
+
+        if (to < ALL_MULTI_BYTE_RANGE) pbuf = addCodeRangeToBuff(pbuf, to + 1, ALL_MULTI_BYTE_RANGE);
+        return pbuf;
+    }
+
+    // or_code_range_buf
+    public static CodeRangeBuffer orCodeRangeBuff(CodeRangeBuffer bbuf1, boolean not1,
+                                                  CodeRangeBuffer bbuf2, boolean not2) {
+        CodeRangeBuffer pbuf = null;
+
+        if (bbuf1 == null && bbuf2 == null) {
+            if (not1 || not2) {
+                return setAllMultiByteRange(pbuf);
+            }
+            return null;
+        }
+
+        if (bbuf2 == null) {
+            CodeRangeBuffer tbuf;
+            boolean tnot;
+            // swap
+            tnot = not1; not1 = not2; not2 = tnot;
+            tbuf = bbuf1; bbuf1 = bbuf2; bbuf2 = tbuf;
+        }
+
+        if (bbuf1 == null) {
+            if (not1) {
+                return setAllMultiByteRange(pbuf);
+            } else {
+                if (!not2) {
+                    return bbuf2.clone();
+                } else {
+                    return notCodeRangeBuff(bbuf2);
+                }
+            }
+        }
+
+        if (not1) {
+            CodeRangeBuffer tbuf;
+            boolean tnot;
+            // swap
+            tnot = not1; not1 = not2; not2 = tnot;
+            tbuf = bbuf1; bbuf1 = bbuf2; bbuf2 = tbuf;
+        }
+
+        if (!not2 && !not1) { /* 1 OR 2 */
+            pbuf = bbuf2.clone();
+        } else if (!not1) { /* 1 OR (not 2) */
+            pbuf = notCodeRangeBuff(bbuf2);
+        }
+
+        int[]p1 = bbuf1.p;
+        int n1 = p1[0];
+
+        for (int i=0; i<n1; i++) {
+            int from = p1[i * 2 + 1];
+            int to = p1[i * 2 + 2];
+            pbuf = addCodeRangeToBuff(pbuf, from, to);
+        }
+
+        return pbuf;
+    }
+
+    // and_code_range1
+    public static CodeRangeBuffer andCodeRange1(CodeRangeBuffer pbuf, int from1, int to1, int[]data, int n) {
+        for (int i=0; i<n; i++) {
+            int from2 = data[i * 2 + 1];
+            int to2 = data[i * 2 + 2];
+            if (from2 < from1) {
+                if (to2 < from1) {
+                    continue;
+                } else {
+                    from1 = to2 + 1;
+                }
+            } else if (from2 <= to1) {
+                if (to2 < to1) {
+                    if (from1 <= from2 - 1) {
+                        pbuf = addCodeRangeToBuff(pbuf, from1, from2 - 1);
+                    }
+                    from1 = to2 + 1;
+                } else {
+                    to1 = from2 - 1;
+                }
+            } else {
+                from1 = from2;
+            }
+            if (from1 > to1) break;
+        }
+
+        if (from1 <= to1) {
+            pbuf = addCodeRangeToBuff(pbuf, from1, to1);
+        }
+
+        return pbuf;
+    }
+
+    // and_code_range_buf
+    public static CodeRangeBuffer andCodeRangeBuff(CodeRangeBuffer bbuf1, boolean not1,
+                                                   CodeRangeBuffer bbuf2, boolean not2) {
+        CodeRangeBuffer pbuf = null;
+
+        if (bbuf1 == null) {
+            if (not1 && bbuf2 != null) return bbuf2.clone(); /* not1 != 0 -> not2 == 0 */
+            return null;
+        } else if (bbuf2 == null) {
+            if (not2) return bbuf1.clone();
+            return null;
+        }
+
+        if (not1) {
+            CodeRangeBuffer tbuf;
+            boolean tnot;
+            // swap
+            tnot = not1; not1 = not2; not2 = tnot;
+            tbuf = bbuf1; bbuf1 = bbuf2; bbuf2 = tbuf;
+        }
+
+        int[]p1 = bbuf1.p;
+        int n1 = p1[0];
+        int[]p2 = bbuf2.p;
+        int n2 = p2[0];
+
+        if (!not2 && !not1) { /* 1 AND 2 */
+            for (int i=0; i<n1; i++) {
+                int from1 = p1[i * 2 + 1];
+                int to1 = p1[i * 2 + 2];
+
+                for (int j=0; j<n2; j++) {
+                    int from2 = p2[j * 2 + 1];
+                    int to2 = p2[j * 2 + 2];
+
+                    if (from2 > to1) break;
+                    if (to2 < from1) continue;
+                    int from = from1 > from2 ? from1 : from2;
+                    int to = to1 < to2 ? to1 : to2;
+                    pbuf = addCodeRangeToBuff(pbuf, from, to);
+                }
+            }
+        } else if (!not1) { /* 1 AND (not 2) */
+            for (int i=0; i<n1; i++) {
+                int from1 = p1[i * 2 + 1];
+                int to1 = p1[i * 2 + 2];
+                pbuf = andCodeRange1(pbuf, from1, to1, p2, n2);
+            }
+        }
+
+        return pbuf;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Compiler.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Compiler.java
new file mode 100644
index 00000000000..8fdc240f421
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Compiler.java
@@ -0,0 +1,178 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni;
+
+import jdk.nashorn.internal.runtime.regexp.joni.ast.AnchorNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.BackRefNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.CClassNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.CTypeNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.CallNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.ConsAltNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.EncloseNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.Node;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.StringNode;
+import jdk.nashorn.internal.runtime.regexp.joni.constants.NodeType;
+import jdk.nashorn.internal.runtime.regexp.joni.exception.ErrorMessages;
+import jdk.nashorn.internal.runtime.regexp.joni.exception.InternalException;
+import jdk.nashorn.internal.runtime.regexp.joni.exception.SyntaxException;
+
+abstract class Compiler implements ErrorMessages {
+    protected final Analyser analyser;
+    protected final Regex regex;
+
+    protected Compiler(Analyser analyser) {
+        this.analyser = analyser;
+        this.regex = analyser.regex;
+    }
+
+    final void compile() {
+        prepare();
+        compileTree(analyser.root);
+        finish();
+    }
+
+    protected abstract void prepare();
+    protected abstract void finish();
+
+    protected abstract void compileAltNode(ConsAltNode node);
+
+    private void compileStringRawNode(StringNode sn) {
+        if (sn.length() <= 0) return;
+        addCompileString(sn.chars, sn.p, 1 /*sb*/, sn.length(), false);
+    }
+
+    private void compileStringNode(StringNode node) {
+        StringNode sn = node;
+        if (sn.length() <= 0) return;
+
+        boolean ambig = sn.isAmbig();
+
+        int p, prev;
+        p = prev = sn.p;
+        int end = sn.end;
+        char[] chars = sn.chars;
+        p++;
+        int slen = 1;
+
+        while (p < end) {
+            slen++;
+            p++;
+        }
+        addCompileString(chars, prev, 1, slen, ambig);
+    }
+
+    protected abstract void addCompileString(char[] chars, int p, int mbLength, int strLength, boolean ignoreCase);
+
+    protected abstract void compileCClassNode(CClassNode node);
+    protected abstract void compileCTypeNode(CTypeNode node);
+    protected abstract void compileAnyCharNode();
+    protected abstract void compileCallNode(CallNode node);
+    protected abstract void compileBackrefNode(BackRefNode node);
+    protected abstract void compileCECQuantifierNode(QuantifierNode node);
+    protected abstract void compileNonCECQuantifierNode(QuantifierNode node);
+    protected abstract void compileOptionNode(EncloseNode node);
+    protected abstract void compileEncloseNode(EncloseNode node);
+    protected abstract void compileAnchorNode(AnchorNode node);
+
+    protected final void compileTree(Node node) {
+        switch (node.getType()) {
+        case NodeType.LIST:
+            ConsAltNode lin = (ConsAltNode)node;
+            do {
+                compileTree(lin.car);
+            } while ((lin = lin.cdr) != null);
+            break;
+
+        case NodeType.ALT:
+            compileAltNode((ConsAltNode)node);
+            break;
+
+        case NodeType.STR:
+            StringNode sn = (StringNode)node;
+            if (sn.isRaw()) {
+                compileStringRawNode(sn);
+            } else {
+                compileStringNode(sn);
+            }
+            break;
+
+        case NodeType.CCLASS:
+            compileCClassNode((CClassNode)node);
+            break;
+
+        case NodeType.CTYPE:
+            compileCTypeNode((CTypeNode)node);
+            break;
+
+        case NodeType.CANY:
+            compileAnyCharNode();
+            break;
+
+        case NodeType.BREF:
+            compileBackrefNode((BackRefNode)node);
+            break;
+
+        case NodeType.CALL:
+            if (Config.USE_SUBEXP_CALL) {
+                compileCallNode((CallNode)node);
+                break;
+            } // USE_SUBEXP_CALL
+            break;
+
+        case NodeType.QTFR:
+            if (Config.USE_COMBINATION_EXPLOSION_CHECK) {
+                compileCECQuantifierNode((QuantifierNode)node);
+            } else {
+                compileNonCECQuantifierNode((QuantifierNode)node);
+            }
+            break;
+
+        case NodeType.ENCLOSE:
+            EncloseNode enode = (EncloseNode)node;
+            if (enode.isOption()) {
+                compileOptionNode(enode);
+            } else {
+                compileEncloseNode(enode);
+            }
+            break;
+
+        case NodeType.ANCHOR:
+            compileAnchorNode((AnchorNode)node);
+            break;
+
+        default:
+            // undefined node type
+            newInternalException(ERR_PARSER_BUG);
+        } // switch
+    }
+
+    protected final void compileTreeNTimes(Node node, int n) {
+        for (int i=0; i<n; i++) compileTree(node);
+    }
+
+    protected void newSyntaxException(String message) {
+        throw new SyntaxException(message);
+    }
+
+    protected void newInternalException(String message) {
+        throw new InternalException(message);
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Config.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Config.java
new file mode 100644
index 00000000000..04f5b47bebc
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Config.java
@@ -0,0 +1,100 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni;
+
+import java.io.PrintStream;
+
+public interface Config {
+    final int CHAR_TABLE_SIZE = 256;
+
+    /* from jcodings */
+    final boolean VANILLA = false;
+    final int INTERNAL_ENC_CASE_FOLD_MULTI_CHAR = (1<<30);
+    final int ENC_CASE_FOLD_MIN = INTERNAL_ENC_CASE_FOLD_MULTI_CHAR;
+    final int ENC_CASE_FOLD_DEFAULT = ENC_CASE_FOLD_MIN;
+    final boolean USE_CRNL_AS_LINE_TERMINATOR = false;
+
+    final boolean USE_NAMED_GROUP = true;
+    final boolean USE_SUBEXP_CALL = true;
+    final boolean USE_BACKREF_WITH_LEVEL = true;                            /* \k<name+n>, \k<name-n> */
+
+    final boolean USE_MONOMANIAC_CHECK_CAPTURES_IN_ENDLESS_REPEAT = true; /* /(?:()|())*\2/ */
+    final boolean USE_NEWLINE_AT_END_OF_STRING_HAS_EMPTY_LINE = true;     /* /\n$/ =~ "\n" */
+    final boolean USE_WARNING_REDUNDANT_NESTED_REPEAT_OPERATOR = false;
+
+    final boolean CASE_FOLD_IS_APPLIED_INSIDE_NEGATIVE_CCLASS = true;
+
+    final boolean USE_MATCH_RANGE_MUST_BE_INSIDE_OF_SPECIFIED_RANGE = false;
+    final boolean USE_CAPTURE_HISTORY = false;
+    final boolean USE_VARIABLE_META_CHARS = true;
+    final boolean USE_WORD_BEGIN_END = true;                                /* "\<": word-begin, "\>": word-end */
+    final boolean USE_POSIX_API_REGION_OPTION = true;                           /* needed for POSIX API support */
+    final boolean USE_FIND_LONGEST_SEARCH_ALL_OF_RANGE = true;
+    final boolean USE_COMBINATION_EXPLOSION_CHECK = false;
+
+    final int NREGION                   = 10;
+    final int MAX_BACKREF_NUM           = 1000;
+    final int MAX_REPEAT_NUM            = 100000;
+    final int MAX_MULTI_BYTE_RANGES_NUM = 10000;
+
+
+    final boolean USE_WARN = true;
+
+    // internal config
+    final boolean USE_PARSE_TREE_NODE_RECYCLE       = true;
+    final boolean USE_OP_PUSH_OR_JUMP_EXACT         = true;
+    final boolean USE_SHARED_CCLASS_TABLE           = false;
+    final boolean USE_QTFR_PEEK_NEXT                = true;
+
+    final int INIT_MATCH_STACK_SIZE                 = 64;
+    final int DEFAULT_MATCH_STACK_LIMIT_SIZE        = 0;        /* unlimited */
+    final int NUMBER_OF_POOLED_STACKS               = 4;
+
+
+
+    final boolean DONT_OPTIMIZE                     = false;
+
+    final boolean USE_STRING_TEMPLATES              = true; // use embeded string templates in Regex object as byte arrays instead of compiling them into int bytecode array
+
+
+    final int MAX_CAPTURE_HISTORY_GROUP             = 31;
+
+
+    final int CHECK_STRING_THRESHOLD_LEN            = 7;
+    final int CHECK_BUFF_MAX_SIZE                   = 0x4000;
+
+    final boolean NON_UNICODE_SDW                   = true;
+
+
+    final PrintStream log = System.out;
+    final PrintStream err = System.err;
+
+    final boolean DEBUG_ALL                         = false;
+
+    final boolean DEBUG                             = DEBUG_ALL;
+    final boolean DEBUG_PARSE_TREE                  = DEBUG_ALL;
+    final boolean DEBUG_PARSE_TREE_RAW              = true;
+    final boolean DEBUG_COMPILE                     = DEBUG_ALL;
+    final boolean DEBUG_COMPILE_BYTE_CODE_INFO      = DEBUG_ALL;
+    final boolean DEBUG_SEARCH                      = DEBUG_ALL;
+    final boolean DEBUG_MATCH                       = DEBUG_ALL;
+    final boolean DEBUG_ASM                         = true;
+    final boolean DEBUG_ASM_EXEC                    = true;
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/EncodingHelper.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/EncodingHelper.java
new file mode 100644
index 00000000000..04d67c2e177
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/EncodingHelper.java
@@ -0,0 +1,285 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni;
+
+import jdk.nashorn.internal.runtime.regexp.joni.encoding.CharacterType;
+import jdk.nashorn.internal.runtime.regexp.joni.encoding.IntHolder;
+
+import java.util.Arrays;
+
+public class EncodingHelper {
+
+    public final static char NEW_LINE = 0xa;
+    public final static char RETURN   = 0xd;
+
+    final static char[] EMPTYCHARS = new char[0];
+    final static int[][] codeRanges = new int[15][];
+
+    public static int digitVal(int code) {
+        return code - '0';
+    }
+
+    public static int odigitVal(int code) {
+        return digitVal(code);
+    }
+
+    public static boolean isXDigit(int code) {
+        return Character.isDigit(code) || (code >= 'a' && code <= 'f') || (code >= 'A' && code <= 'F');
+    }
+
+    public static int xdigitVal(int code) {
+        if (Character.isDigit(code)) {
+            return code - '0';
+        } else if (code >= 'a' && code <= 'f') {
+            return code - 'a' + 10;
+        } else {
+            return code - 'A' + 10;
+        }
+    }
+
+    public static boolean isDigit(int code) {
+        return code >= '0' && code <= '9';
+    }
+
+    public static boolean isWord(int code) {
+        // letter, digit, or '_'
+        return (1 << Character.getType(code) & CharacterType.WORD_MASK) != 0;
+    }
+
+    public static boolean isNewLine(int code) {
+        return code == NEW_LINE;
+    }
+
+    public static boolean isNewLine(char[] chars, int p, int end) {
+        return p < end && chars[p] == NEW_LINE;
+    }
+
+    public static boolean isCrnl(char[] chars, int p, int end) {
+        return p + 1 < end && chars[p] == RETURN && chars[p + 1] == NEW_LINE;
+    }
+
+    // Encoding.prevCharHead
+    public static int prevCharHead(int p, int s) {
+        return s <= p ? -1 : s - 1;
+    }
+
+    /* onigenc_get_right_adjust_char_head_with_prev */
+    public static int rightAdjustCharHeadWithPrev(int s, IntHolder prev) {
+        if (prev != null) prev.value = -1; /* Sorry */
+        return s;
+    }
+
+    // Encoding.stepBack
+    public static int stepBack(int p, int s, int n) {
+       while (s != -1 && n-- > 0) {
+           if (s <= p) return -1;
+           s--;
+       }
+       return s;
+    }
+
+    /* onigenc_with_ascii_strncmp */
+    public static int strNCmp(char[] chars1, int p1, int end, char[] chars2, int p2, int n) {
+        while (n-- > 0) {
+            if (p1 >= end) return chars2[p2];
+            int c = chars1[p1];
+            int x = chars2[p2] - c;
+            if (x != 0) return x;
+
+            p2++;
+            p1++;
+        }
+        return 0;
+    }
+
+    public static int mbcToCode(byte[] bytes, int p, int end) {
+        int code = 0;
+        for (int i = p; i < end; i++) {
+            code = (code << 8) | (bytes[i] & 0xff);
+        }
+        return code;
+    }
+
+    public static int mbcodeStartPosition() {
+        return 0x80;
+    }
+
+    public static char[] caseFoldCodesByString(int flag, char c) {
+        if (Character.isUpperCase(c)) {
+            return new char[] {Character.toLowerCase(c)};
+        } else if (Character.isLowerCase(c)) {
+            return new char[] {Character.toUpperCase(c)};
+        } else {
+            return EMPTYCHARS;
+        }
+    }
+
+    public static void applyAllCaseFold(int flag, ApplyCaseFold fun, Object arg) {
+        int[] code = new int[1];
+
+        for (int c = 0; c < 0xffff; c++) {
+            if (Character.getType(c) == Character.LOWERCASE_LETTER) {
+
+                int upper = code[0] = Character.toUpperCase(c);
+                fun.apply(c, code, 1, arg);
+
+                code[0] = c;
+                fun.apply(upper, code, 1, arg);
+            }
+        }
+    }
+
+    // CodeRange.isInCodeRange
+    public static boolean isInCodeRange(int[]p, int code) {
+        int low = 0;
+        int n = p[0];
+        int high = n;
+
+        while (low < high) {
+            int x = (low + high) >> 1;
+            if (code > p[(x << 1) + 2]) {
+                low = x + 1;
+            } else {
+                high = x;
+            }
+        }
+        return low < n && code >= p[(low << 1) + 1];
+    }
+
+    public static int[] ctypeCodeRange(int ctype, IntHolder sbOut) {
+        sbOut.value = 0x100; // use bitset for codes smaller than 256
+        int[] range = null;
+
+        if (ctype < codeRanges.length) {
+            range = codeRanges[ctype];
+
+            if (range == null) {
+                // format: [numberOfRanges, rangeStart, rangeEnd, ...]
+                range = new int[16];
+                int rangeCount = 0;
+                int lastCode = -2;
+
+                for (int code = 0; code <= 0xffff; code++) {
+                    if (isCodeCType(code, ctype)) {
+                        if (lastCode < code -1) {
+                            if (rangeCount * 2 + 2 >= range.length) {
+                                range = Arrays.copyOf(range, range.length * 2);
+                            }
+                            range[rangeCount * 2 + 1] = code;
+                            rangeCount++;
+                        }
+                        range[rangeCount * 2] = lastCode = code;
+                    }
+                }
+
+                if (rangeCount * 2 + 1 < range.length) {
+                    range = Arrays.copyOf(range, rangeCount * 2 + 1);
+                }
+
+                range[0] = rangeCount;
+                codeRanges[ctype] = range;
+            }
+        }
+
+        return range;
+    }
+
+    // CodeRange.isInCodeRange
+    public static boolean isInCodeRange(int[]p, int offset, int code) {
+        int low = 0;
+        int n = p[offset];
+        int high = n ;
+
+        while (low < high) {
+            int x = (low + high) >> 1;
+            if (code > p[(x << 1) + 2 + offset]) {
+                low = x + 1;
+            } else {
+                high = x;
+            }
+        }
+        return low < n && code >= p[(low << 1) + 1 + offset];
+    }
+
+    /**
+     * @see [http://www.geocities.jp/kosako3/oniguruma/doc/RE.txt]
+     */
+    public static boolean isCodeCType(int code, int ctype) {
+        int type;
+        switch (ctype) {
+            case CharacterType.NEWLINE:
+                return code == EncodingHelper.NEW_LINE;
+            case CharacterType.ALPHA:
+                return (1 << Character.getType(code) & CharacterType.ALPHA_MASK) != 0;
+            case CharacterType.BLANK:
+                return code == 0x09 || Character.getType(code) == Character.SPACE_SEPARATOR;
+            case CharacterType.CNTRL:
+                type = Character.getType(code);
+                return (1 << type & CharacterType.CNTRL_MASK) != 0 || type == Character.UNASSIGNED;
+            case CharacterType.DIGIT:
+                return EncodingHelper.isDigit(code);
+            case CharacterType.GRAPH:
+                switch (code) {
+                    case 0x09:
+                    case 0x0a:
+                    case 0x0b:
+                    case 0x0c:
+                    case 0x0d:
+                        return false;
+                    default:
+                        type = Character.getType(code);
+                        return (1 << type & CharacterType.GRAPH_MASK) == 0 && type != Character.UNASSIGNED;
+                }
+            case CharacterType.LOWER:
+                return Character.isLowerCase(code);
+            case CharacterType.PRINT:
+                type = Character.getType(code);
+                return (1 << type & CharacterType.PRINT_MASK) == 0 && type != Character.UNASSIGNED;
+            case CharacterType.PUNCT:
+                return (1 << Character.getType(code) & CharacterType.PUNCT_MASK) != 0;
+            case CharacterType.SPACE:
+                // ECMA 7.2 and 7.3
+                switch (code) {
+                    case 0x09:
+                    case 0x0a:
+                    case 0x0b:
+                    case 0x0c:
+                    case 0x0d:
+                        return true;
+                    default:
+                        // true if Unicode separator or BOM
+                        return (1 << Character.getType(code) & CharacterType.SPACE_MASK) != 0 || code == 0xfeff;
+                }
+            case CharacterType.UPPER:
+                return Character.isUpperCase(code);
+            case CharacterType.XDIGIT:
+                return EncodingHelper.isXDigit(code);
+            case CharacterType.WORD:
+                return (1 << Character.getType(code) & CharacterType.WORD_MASK) != 0;
+            case CharacterType.ALNUM:
+                return (1 << Character.getType(code) & CharacterType.ALNUM_MASK) != 0;
+            case CharacterType.ASCII:
+                return code < 0x80;
+            default:
+                throw new RuntimeException("illegal character type: " + ctype);
+        }
+    }
+}
+
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Lexer.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Lexer.java
new file mode 100644
index 00000000000..c289f33d34d
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Lexer.java
@@ -0,0 +1,1274 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni;
+
+import static jdk.nashorn.internal.runtime.regexp.joni.Option.isSingleline;
+import static jdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode.isRepeatInfinite;
+
+import jdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode;
+import jdk.nashorn.internal.runtime.regexp.joni.constants.AnchorType;
+import jdk.nashorn.internal.runtime.regexp.joni.constants.MetaChar;
+import jdk.nashorn.internal.runtime.regexp.joni.constants.TokenType;
+import jdk.nashorn.internal.runtime.regexp.joni.encoding.CharacterType;
+import jdk.nashorn.internal.runtime.regexp.joni.encoding.PosixBracket;
+import jdk.nashorn.internal.runtime.regexp.joni.encoding.Ptr;
+import jdk.nashorn.internal.runtime.regexp.joni.exception.ErrorMessages;
+import jdk.nashorn.internal.runtime.regexp.joni.exception.JOniException;
+
+class Lexer extends ScannerSupport {
+    protected final ScanEnvironment env;
+    protected final Syntax syntax;              // fast access to syntax
+    protected final Token token = new Token();  // current token
+
+    protected Lexer(ScanEnvironment env, char[] chars, int p, int end) {
+        super(chars, p, end);
+        this.env = env;
+        this.syntax = env.syntax;
+    }
+
+    /**
+     * @return 0: normal {n,m}, 2: fixed {n}
+     * !introduce returnCode here
+     */
+    private int fetchRangeQuantifier() {
+        mark();
+        boolean synAllow = syntax.allowInvalidInterval();
+
+        if (!left()) {
+            if (synAllow) {
+                return 1; /* "....{" : OK! */
+            } else {
+                newSyntaxException(ERR_END_PATTERN_AT_LEFT_BRACE);
+            }
+        }
+
+        if (!synAllow) {
+            c = peek();
+            if (c == ')' || c == '(' || c == '|') {
+                newSyntaxException(ERR_END_PATTERN_AT_LEFT_BRACE);
+            }
+        }
+
+        int low = scanUnsignedNumber();
+        if (low < 0) newSyntaxException(ErrorMessages.ERR_TOO_BIG_NUMBER_FOR_REPEAT_RANGE);
+        if (low > Config.MAX_REPEAT_NUM) newSyntaxException(ErrorMessages.ERR_TOO_BIG_NUMBER_FOR_REPEAT_RANGE);
+
+        boolean nonLow = false;
+        if (p == _p) { /* can't read low */
+            if (syntax.allowIntervalLowAbbrev()) {
+                low = 0;
+                nonLow = true;
+            } else {
+                return invalidRangeQuantifier(synAllow);
+            }
+        }
+
+        if (!left()) return invalidRangeQuantifier(synAllow);
+
+        fetch();
+        int up;
+        int ret = 0;
+        if (c == ',') {
+            int prev = p; // ??? last
+            up = scanUnsignedNumber();
+            if (up < 0) newValueException(ERR_TOO_BIG_NUMBER_FOR_REPEAT_RANGE);
+            if (up > Config.MAX_REPEAT_NUM) newValueException(ERR_TOO_BIG_NUMBER_FOR_REPEAT_RANGE);
+
+            if (p == prev) {
+                if (nonLow) return invalidRangeQuantifier(synAllow);
+                up = QuantifierNode.REPEAT_INFINITE; /* {n,} : {n,infinite} */
+            }
+        } else {
+            if (nonLow) return invalidRangeQuantifier(synAllow);
+            unfetch();
+            up = low; /* {n} : exact n times */
+            ret = 2; /* fixed */
+        }
+
+        if (!left()) return invalidRangeQuantifier(synAllow);
+        fetch();
+
+        if (syntax.opEscBraceInterval()) {
+            if (c != syntax.metaCharTable.esc) return invalidRangeQuantifier(synAllow);
+            fetch();
+        }
+
+        if (c != '}') return invalidRangeQuantifier(synAllow);
+
+        if (!isRepeatInfinite(up) && low > up) {
+            newValueException(ERR_UPPER_SMALLER_THAN_LOWER_IN_REPEAT_RANGE);
+        }
+
+        token.type = TokenType.INTERVAL;
+        token.setRepeatLower(low);
+        token.setRepeatUpper(up);
+
+        return ret; /* 0: normal {n,m}, 2: fixed {n} */
+    }
+
+    private int invalidRangeQuantifier(boolean synAllow) {
+        if (synAllow) {
+            restore();
+            return 1;
+        } else {
+            newSyntaxException(ERR_INVALID_REPEAT_RANGE_PATTERN);
+            return 0; // not reached
+        }
+    }
+
+    /* \M-, \C-, \c, or \... */
+    private int fetchEscapedValue() {
+        if (!left()) newSyntaxException(ERR_END_PATTERN_AT_ESCAPE);
+        fetch();
+
+        switch(c) {
+
+        case 'M':
+            if (syntax.op2EscCapitalMBarMeta()) {
+                if (!left()) newSyntaxException(ERR_END_PATTERN_AT_META);
+                fetch();
+                if (c != '-') newSyntaxException(ERR_META_CODE_SYNTAX);
+                if (!left()) newSyntaxException(ERR_END_PATTERN_AT_META);
+                fetch();
+                if (c == syntax.metaCharTable.esc) {
+                    c = fetchEscapedValue();
+                }
+                c = ((c & 0xff) | 0x80);
+            } else {
+                fetchEscapedValueBackSlash();
+            }
+            break;
+
+        case 'C':
+            if (syntax.op2EscCapitalCBarControl()) {
+                if (!left()) newSyntaxException(ERR_END_PATTERN_AT_CONTROL);
+                fetch();
+                if (c != '-') newSyntaxException(ERR_CONTROL_CODE_SYNTAX);
+                fetchEscapedValueControl();
+            } else {
+                fetchEscapedValueBackSlash();
+            }
+            break;
+
+        case 'c':
+            if (syntax.opEscCControl()) {
+                fetchEscapedValueControl();
+            }
+            /* fall through */
+
+        default:
+            fetchEscapedValueBackSlash();
+        } // switch
+
+        return c; // ???
+    }
+
+    private void fetchEscapedValueBackSlash() {
+        c = env.convertBackslashValue(c);
+    }
+
+    private void fetchEscapedValueControl() {
+        if (!left()) newSyntaxException(ERR_END_PATTERN_AT_CONTROL);
+        fetch();
+        if (c == '?') {
+            c = 0177;
+        } else {
+            if (c == syntax.metaCharTable.esc) {
+                c = fetchEscapedValue();
+            }
+            c &= 0x9f;
+        }
+    }
+
+    private int nameEndCodePoint(int start) {
+        switch(start) {
+        case '<':
+            return '>';
+        case '\'':
+            return '\'';
+        default:
+            return 0;
+        }
+    }
+
+    // USE_NAMED_GROUP && USE_BACKREF_AT_LEVEL
+    /*
+        \k<name+n>, \k<name-n>
+        \k<num+n>,  \k<num-n>
+        \k<-num+n>, \k<-num-n>
+     */
+
+    // value implicit (rnameEnd)
+    private boolean fetchNameWithLevel(int startCode, Ptr rbackNum, Ptr rlevel) {
+        int src = p;
+        boolean existLevel = false;
+        int isNum = 0;
+        int sign = 1;
+
+        int endCode = nameEndCodePoint(startCode);
+        int pnumHead = p;
+        int nameEnd = stop;
+
+        String err = null;
+        if (!left()) {
+            newValueException(ERR_EMPTY_GROUP_NAME);
+        } else {
+            fetch();
+            if (c == endCode) newValueException(ERR_EMPTY_GROUP_NAME);
+            if (Character.isDigit(c)) {
+                isNum = 1;
+            } else if (c == '-') {
+                isNum = 2;
+                sign = -1;
+                pnumHead = p;
+            } else if (!EncodingHelper.isWord(c)) {
+                err = ERR_INVALID_GROUP_NAME;
+            }
+        }
+
+        while (left()) {
+            nameEnd = p;
+            fetch();
+            if (c == endCode || c == ')' || c == '+' || c == '-') {
+                if (isNum == 2) err = ERR_INVALID_GROUP_NAME;
+                break;
+            }
+
+            if (isNum != 0) {
+                if (EncodingHelper.isDigit(c)) {
+                    isNum = 1;
+                } else {
+                    err = ERR_INVALID_GROUP_NAME;
+                    // isNum = 0;
+                }
+            } else if (!EncodingHelper.isWord(c)) {
+                err = ERR_INVALID_CHAR_IN_GROUP_NAME;
+            }
+        }
+
+        boolean isEndCode = false;
+        if (err == null && c != endCode) {
+            if (c == '+' || c == '-') {
+                int flag = c == '-' ? -1 : 1;
+
+                fetch();
+                if (!EncodingHelper.isDigit(c)) newValueException(ERR_INVALID_GROUP_NAME, src, stop);
+                unfetch();
+                int level = scanUnsignedNumber();
+                if (level < 0) newValueException(ERR_TOO_BIG_NUMBER);
+                rlevel.p = level * flag;
+                existLevel = true;
+
+                fetch();
+                isEndCode = c == endCode;
+            }
+
+            if (!isEndCode) {
+                err = ERR_INVALID_GROUP_NAME;
+                nameEnd = stop;
+            }
+        }
+
+        if (err == null) {
+            if (isNum != 0) {
+                mark();
+                p = pnumHead;
+                int backNum = scanUnsignedNumber();
+                restore();
+                if (backNum < 0) {
+                    newValueException(ERR_TOO_BIG_NUMBER);
+                } else if (backNum == 0) {
+                    newValueException(ERR_INVALID_GROUP_NAME, src, stop);
+                }
+                rbackNum.p = backNum * sign;
+            }
+            value = nameEnd;
+            return existLevel;
+        } else {
+            newValueException(ERR_INVALID_GROUP_NAME, src, nameEnd);
+            return false; // not reached
+        }
+    }
+
+    // USE_NAMED_GROUP
+    // ref: 0 -> define name    (don't allow number name)
+    //      1 -> reference name (allow number name)
+    private int fetchNameForNamedGroup(int startCode, boolean ref) {
+        int src = p;
+        value = 0;
+
+        int isNum = 0;
+        int sign = 1;
+
+        int endCode = nameEndCodePoint(startCode);
+        int pnumHead = p;
+        int nameEnd = stop;
+
+        String err = null;
+        if (!left()) {
+            newValueException(ERR_EMPTY_GROUP_NAME);
+        } else {
+            fetch();
+            if (c == endCode) newValueException(ERR_EMPTY_GROUP_NAME);
+            if (EncodingHelper.isDigit(c)) {
+                if (ref) {
+                    isNum = 1;
+                } else {
+                    err = ERR_INVALID_GROUP_NAME;
+                    // isNum = 0;
+                }
+            } else if (c == '-') {
+                if (ref) {
+                    isNum = 2;
+                    sign = -1;
+                    pnumHead = p;
+                } else {
+                    err = ERR_INVALID_GROUP_NAME;
+                    // isNum = 0;
+                }
+            } else if (!EncodingHelper.isWord(c)) {
+                err = ERR_INVALID_CHAR_IN_GROUP_NAME;
+            }
+        }
+
+        if (err == null) {
+            while (left()) {
+                nameEnd = p;
+                fetch();
+                if (c == endCode || c == ')') {
+                    if (isNum == 2) err = ERR_INVALID_GROUP_NAME;
+                    break;
+                }
+
+                if (isNum != 0) {
+                    if (EncodingHelper.isDigit(c)) {
+                        isNum = 1;
+                    } else {
+                        if (!EncodingHelper.isWord(c)) {
+                            err = ERR_INVALID_CHAR_IN_GROUP_NAME;
+                        } else {
+                            err = ERR_INVALID_GROUP_NAME;
+                        }
+                        // isNum = 0;
+                    }
+                } else {
+                    if (!EncodingHelper.isWord(c)) {
+                        err = ERR_INVALID_CHAR_IN_GROUP_NAME;
+                    }
+                }
+            }
+
+            if (c != endCode) {
+                err = ERR_INVALID_GROUP_NAME;
+                nameEnd = stop;
+            }
+
+            int backNum = 0;
+            if (isNum != 0) {
+                mark();
+                p = pnumHead;
+                backNum = scanUnsignedNumber();
+                restore();
+                if (backNum < 0) {
+                    newValueException(ERR_TOO_BIG_NUMBER);
+                } else if (backNum == 0) {
+                    newValueException(ERR_INVALID_GROUP_NAME, src, nameEnd);
+                }
+                backNum *= sign;
+            }
+            value = nameEnd;
+            return backNum;
+        } else {
+            while (left()) {
+                nameEnd = p;
+                fetch();
+                if (c == endCode || c == ')') break;
+            }
+            if (!left()) nameEnd = stop;
+            newValueException(err, src, nameEnd);
+            return 0; // not reached
+        }
+    }
+
+    // #else USE_NAMED_GROUP
+    // make it return nameEnd!
+    private final int fetchNameForNoNamedGroup(int startCode, boolean ref) {
+        int src = p;
+        value = 0;
+
+        int isNum = 0;
+        int sign = 1;
+
+        int endCode = nameEndCodePoint(startCode);
+        int pnumHead = p;
+        int nameEnd = stop;
+
+        String err = null;
+        if (!left()) {
+            newValueException(ERR_EMPTY_GROUP_NAME);
+        } else {
+            fetch();
+            if (c == endCode) newValueException(ERR_EMPTY_GROUP_NAME);
+
+            if (EncodingHelper.isDigit(c)) {
+                isNum = 1;
+            } else if (c == '-') {
+                isNum = 2;
+                sign = -1;
+                pnumHead = p;
+            } else {
+                err = ERR_INVALID_CHAR_IN_GROUP_NAME;
+            }
+        }
+
+        while(left()) {
+            nameEnd = p;
+
+            fetch();
+            if (c == endCode || c == ')') break;
+            if (!EncodingHelper.isDigit(c)) err = ERR_INVALID_CHAR_IN_GROUP_NAME;
+        }
+
+        if (err == null && c != endCode) {
+            err = ERR_INVALID_GROUP_NAME;
+            nameEnd = stop;
+        }
+
+        if (err == null) {
+            mark();
+            p = pnumHead;
+            int backNum = scanUnsignedNumber();
+            restore();
+            if (backNum < 0) {
+                newValueException(ERR_TOO_BIG_NUMBER);
+            } else if (backNum == 0){
+                newValueException(ERR_INVALID_GROUP_NAME, src, nameEnd);
+            }
+            backNum *= sign;
+
+            value = nameEnd;
+            return backNum;
+        } else {
+            newValueException(err, src, nameEnd);
+            return 0; // not reached
+        }
+    }
+
+    protected final int fetchName(int startCode, boolean ref) {
+        if (Config.USE_NAMED_GROUP) {
+            return fetchNameForNamedGroup(startCode, ref);
+        } else {
+            return fetchNameForNoNamedGroup(startCode, ref);
+        }
+    }
+
+    private boolean strExistCheckWithEsc(int[]s, int n, int bad) {
+        int p = this.p;
+        int to = this.stop;
+
+        boolean inEsc = false;
+        int i=0;
+        while(p < to) {
+            if (inEsc) {
+                inEsc = false;
+                p ++;
+            } else {
+                int x = chars[p];
+                int q = p + 1;
+                if (x == s[0]) {
+                    for (i=1; i<n && q < to; i++) {
+                        x = chars[q];
+                        if (x != s[i]) break;
+                        q++;
+                    }
+                    if (i >= n) return true;
+                    p++;
+                } else {
+                    x = chars[p];
+                    if (x == bad) return false;
+                    else if (x == syntax.metaCharTable.esc) inEsc = true;
+                    p = q;
+                }
+            }
+        }
+        return false;
+    }
+
+    private static final int send[] = new int[]{':', ']'};
+
+    private void fetchTokenInCCFor_charType(boolean flag, int type) {
+        token.type = TokenType.CHAR_TYPE;
+        token.setPropCType(type);
+        token.setPropNot(flag);
+    }
+
+    private void fetchTokenInCCFor_p() {
+        int c2 = peek(); // !!! migrate to peekIs
+        if (c2 == '{' && syntax.op2EscPBraceCharProperty()) {
+            inc();
+            token.type = TokenType.CHAR_PROPERTY;
+            token.setPropNot(c == 'P');
+
+            if (syntax.op2EscPBraceCircumflexNot()) {
+                c2 = fetchTo();
+                if (c2 == '^') {
+                    token.setPropNot(!token.getPropNot());
+                } else {
+                    unfetch();
+                }
+            }
+        } else {
+            syntaxWarn(Warnings.INVALID_UNICODE_PROPERTY, (char)c);
+        }
+    }
+
+    private void fetchTokenInCCFor_x() {
+        if (!left()) return;
+        int last = p;
+
+        if (peekIs('{') && syntax.opEscXBraceHex8()) {
+            inc();
+            int num = scanUnsignedHexadecimalNumber(8);
+            if (num < 0) newValueException(ERR_TOO_BIG_WIDE_CHAR_VALUE);
+            if (left()) {
+                int c2 = peek();
+                if (EncodingHelper.isXDigit(c2)) newValueException(ERR_TOO_LONG_WIDE_CHAR_VALUE);
+            }
+
+            if (p > last + 1 && left() && peekIs('}')) {
+                inc();
+                token.type = TokenType.CODE_POINT;
+                token.base = 16;
+                token.setCode(num);
+            } else {
+                /* can't read nothing or invalid format */
+                p = last;
+            }
+        } else if (syntax.opEscXHex2()) {
+            int num = scanUnsignedHexadecimalNumber(2);
+            if (num < 0) newValueException(ERR_TOO_BIG_NUMBER);
+            if (p == last) { /* can't read nothing. */
+                num = 0; /* but, it's not error */
+            }
+            token.type = TokenType.RAW_BYTE;
+            token.base = 16;
+            token.setC(num);
+        }
+    }
+
+    private void fetchTokenInCCFor_u() {
+        if (!left()) return;
+        int last = p;
+
+        if (syntax.op2EscUHex4()) {
+            int num = scanUnsignedHexadecimalNumber(4);
+            if (num < 0) newValueException(ERR_TOO_BIG_NUMBER);
+            if (p == last) {  /* can't read nothing. */
+                num = 0; /* but, it's not error */
+            }
+            token.type = TokenType.CODE_POINT;
+            token.base = 16;
+            token.setCode(num);
+        }
+    }
+
+    private void fetchTokenInCCFor_digit() {
+        if (syntax.opEscOctal3()) {
+            unfetch();
+            int last = p;
+            int num = scanUnsignedOctalNumber(3);
+            if (num < 0) newValueException(ERR_TOO_BIG_NUMBER);
+            if (p == last) {  /* can't read nothing. */
+                num = 0; /* but, it's not error */
+            }
+            token.type = TokenType.RAW_BYTE;
+            token.base = 8;
+            token.setC(num);
+        }
+    }
+
+    private void fetchTokenInCCFor_posixBracket() {
+        if (syntax.opPosixBracket() && peekIs(':')) {
+            token.backP = p; /* point at '[' is readed */
+            inc();
+            if (strExistCheckWithEsc(send, send.length, ']')) {
+                token.type = TokenType.POSIX_BRACKET_OPEN;
+            } else {
+                unfetch();
+                // remove duplication, goto cc_in_cc;
+                if (syntax.op2CClassSetOp()) {
+                    token.type = TokenType.CC_CC_OPEN;
+                } else {
+                    env.ccEscWarn("[");
+                }
+            }
+        } else { // cc_in_cc:
+            if (syntax.op2CClassSetOp()) {
+                token.type = TokenType.CC_CC_OPEN;
+            } else {
+                env.ccEscWarn("[");
+            }
+        }
+    }
+
+    private void fetchTokenInCCFor_and() {
+        if (syntax.op2CClassSetOp() && left() && peekIs('&')) {
+            inc();
+            token.type = TokenType.CC_AND;
+        }
+    }
+
+    protected final TokenType fetchTokenInCC() {
+        if (!left()) {
+            token.type = TokenType.EOT;
+            return token.type;
+        }
+
+        fetch();
+        token.type = TokenType.CHAR;
+        token.base = 0;
+        token.setC(c);
+        token.escaped = false;
+
+        if (c == ']') {
+            token.type = TokenType.CC_CLOSE;
+        } else if (c == '-') {
+            token.type = TokenType.CC_RANGE;
+        } else if (c == syntax.metaCharTable.esc) {
+            if (!syntax.backSlashEscapeInCC()) return token.type;
+            if (!left()) newSyntaxException(ERR_END_PATTERN_AT_ESCAPE);
+            fetch();
+            token.escaped = true;
+            token.setC(c);
+
+            switch (c) {
+            case 'w':
+                fetchTokenInCCFor_charType(false, Config.NON_UNICODE_SDW ? CharacterType.W : CharacterType.WORD);
+                break;
+            case 'W':
+                fetchTokenInCCFor_charType(true, Config.NON_UNICODE_SDW ? CharacterType.W : CharacterType.WORD);
+                break;
+            case 'd':
+                fetchTokenInCCFor_charType(false, Config.NON_UNICODE_SDW ? CharacterType.D : CharacterType.DIGIT);
+                break;
+            case 'D':
+                fetchTokenInCCFor_charType(true, Config.NON_UNICODE_SDW ? CharacterType.D : CharacterType.DIGIT);
+                break;
+            case 's':
+                fetchTokenInCCFor_charType(false, Config.NON_UNICODE_SDW ? CharacterType.S : CharacterType.SPACE);
+                break;
+            case 'S':
+                fetchTokenInCCFor_charType(true, Config.NON_UNICODE_SDW ? CharacterType.S : CharacterType.SPACE);
+                break;
+            case 'h':
+                if (syntax.op2EscHXDigit()) fetchTokenInCCFor_charType(false, CharacterType.XDIGIT);
+                break;
+            case 'H':
+                if (syntax.op2EscHXDigit()) fetchTokenInCCFor_charType(true, CharacterType.XDIGIT);
+                break;
+            case 'p':
+            case 'P':
+                fetchTokenInCCFor_p();
+                break;
+            case 'x':
+                fetchTokenInCCFor_x();
+                break;
+            case 'u':
+                fetchTokenInCCFor_u();
+                break;
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+                fetchTokenInCCFor_digit();
+                break;
+
+            default:
+                unfetch();
+                int num = fetchEscapedValue();
+                if (token.getC() != num) {
+                    token.setCode(num);
+                    token.type = TokenType.CODE_POINT;
+                }
+                break;
+            } // switch
+
+        } else if (c == '[') {
+            fetchTokenInCCFor_posixBracket();
+        } else if (c == '&') {
+            fetchTokenInCCFor_and();
+        }
+        return token.type;
+    }
+
+    protected final int backrefRelToAbs(int relNo) {
+        return env.numMem + 1 + relNo;
+    }
+
+    private void fetchTokenFor_repeat(int lower, int upper) {
+        token.type = TokenType.OP_REPEAT;
+        token.setRepeatLower(lower);
+        token.setRepeatUpper(upper);
+        greedyCheck();
+    }
+
+    private void fetchTokenFor_openBrace() {
+        switch (fetchRangeQuantifier()) {
+        case 0:
+            greedyCheck();
+            break;
+        case 2:
+            if (syntax.fixedIntervalIsGreedyOnly()) {
+                possessiveCheck();
+            } else {
+                greedyCheck();
+            }
+            break;
+        default: /* 1 : normal char */
+        } // inner switch
+    }
+
+    private void fetchTokenFor_anchor(int subType) {
+        token.type = TokenType.ANCHOR;
+        token.setAnchor(subType);
+    }
+
+    private void fetchTokenFor_xBrace() {
+        if (!left()) return;
+
+        int last = p;
+        if (peekIs('{') && syntax.opEscXBraceHex8()) {
+            inc();
+            int num = scanUnsignedHexadecimalNumber(8);
+            if (num < 0) newValueException(ERR_TOO_BIG_WIDE_CHAR_VALUE);
+            if (left()) {
+                if (EncodingHelper.isXDigit(peek())) newValueException(ERR_TOO_LONG_WIDE_CHAR_VALUE);
+            }
+
+            if (p > last + 1 && left() && peekIs('}')) {
+                inc();
+                token.type = TokenType.CODE_POINT;
+                token.setCode(num);
+            } else {
+                /* can't read nothing or invalid format */
+                p = last;
+            }
+        } else if (syntax.opEscXHex2()) {
+            int num = scanUnsignedHexadecimalNumber(2);
+            if (num < 0) newValueException(ERR_TOO_BIG_NUMBER);
+            if (p == last) { /* can't read nothing. */
+                num = 0; /* but, it's not error */
+            }
+            token.type = TokenType.RAW_BYTE;
+            token.base = 16;
+            token.setC(num);
+        }
+    }
+
+    private void fetchTokenFor_uHex() {
+        if (!left()) return;
+        int last = p;
+
+        if (syntax.op2EscUHex4()) {
+            int num = scanUnsignedHexadecimalNumber(4);
+            if (num < 0) newValueException(ERR_TOO_BIG_NUMBER);
+            if (p == last) { /* can't read nothing. */
+                num = 0; /* but, it's not error */
+            }
+            token.type = TokenType.CODE_POINT;
+            token.base = 16;
+            token.setCode(num);
+        }
+    }
+
+    private void fetchTokenFor_digit() {
+        unfetch();
+        int last = p;
+        int num = scanUnsignedNumber();
+        if (num < 0 || num > Config.MAX_BACKREF_NUM) { // goto skip_backref
+        } else if (syntax.opDecimalBackref() && (num <= env.numMem || num <= 9)) { /* This spec. from GNU regex */
+            if (syntax.strictCheckBackref()) {
+                if (num > env.numMem || env.memNodes == null || env.memNodes[num] == null) newValueException(ERR_INVALID_BACKREF);
+            }
+            token.type = TokenType.BACKREF;
+            token.setBackrefNum(1);
+            token.setBackrefRef1(num);
+            token.setBackrefByName(false);
+            if (Config.USE_BACKREF_WITH_LEVEL) token.setBackrefExistLevel(false);
+            return;
+        }
+
+        if (c == '8' || c == '9') { /* normal char */ // skip_backref:
+            p = last;
+            inc();
+            return;
+        }
+        p = last;
+
+        fetchTokenFor_zero(); /* fall through */
+    }
+
+    private void fetchTokenFor_zero() {
+        if (syntax.opEscOctal3()) {
+            int last = p;
+            int num = scanUnsignedOctalNumber(c == '0' ? 2 : 3);
+            if (num < 0) newValueException(ERR_TOO_BIG_NUMBER);
+            if (p == last) { /* can't read nothing. */
+                num = 0; /* but, it's not error */
+            }
+            token.type = TokenType.RAW_BYTE;
+            token.base = 8;
+            token.setC(num);
+        } else if (c != '0') {
+            inc();
+        }
+    }
+
+    private void fetchTokenFor_namedBackref() {
+        if (syntax.op2EscKNamedBackref()) {
+            if (left()) {
+                fetch();
+                if (c =='<' || c == '\'') {
+                    int last = p;
+                    int backNum;
+                    if (Config.USE_BACKREF_WITH_LEVEL) {
+                        Ptr rbackNum = new Ptr();
+                        Ptr rlevel = new Ptr();
+                        token.setBackrefExistLevel(fetchNameWithLevel(c, rbackNum, rlevel));
+                        token.setBackrefLevel(rlevel.p);
+                        backNum = rbackNum.p;
+                    } else {
+                        backNum = fetchName(c, true);
+                    } // USE_BACKREF_AT_LEVEL
+                    int nameEnd = value; // set by fetchNameWithLevel/fetchName
+
+                    if (backNum != 0) {
+                        if (backNum < 0) {
+                            backNum = backrefRelToAbs(backNum);
+                            if (backNum <= 0) newValueException(ERR_INVALID_BACKREF);
+                        }
+
+                        if (syntax.strictCheckBackref() && (backNum > env.numMem || env.memNodes == null)) {
+                            newValueException(ERR_INVALID_BACKREF);
+                        }
+                        token.type = TokenType.BACKREF;
+                        token.setBackrefByName(false);
+                        token.setBackrefNum(1);
+                        token.setBackrefRef1(backNum);
+                    } else {
+                        NameEntry e = env.reg.nameToGroupNumbers(chars, last, nameEnd);
+                        if (e == null) newValueException(ERR_UNDEFINED_NAME_REFERENCE, last, nameEnd);
+
+                        if (syntax.strictCheckBackref()) {
+                            if (e.backNum == 1) {
+                                if (e.backRef1 > env.numMem ||
+                                    env.memNodes == null ||
+                                    env.memNodes[e.backRef1] == null) newValueException(ERR_INVALID_BACKREF);
+                            } else {
+                                for (int i=0; i<e.backNum; i++) {
+                                    if (e.backRefs[i] > env.numMem ||
+                                        env.memNodes == null ||
+                                        env.memNodes[e.backRefs[i]] == null) newValueException(ERR_INVALID_BACKREF);
+                                }
+                            }
+                        }
+
+                        token.type = TokenType.BACKREF;
+                        token.setBackrefByName(true);
+
+                        if (e.backNum == 1) {
+                            token.setBackrefNum(1);
+                            token.setBackrefRef1(e.backRef1);
+                        } else {
+                            token.setBackrefNum(e.backNum);
+                            token.setBackrefRefs(e.backRefs);
+                        }
+                    }
+                } else {
+                    unfetch();
+                    syntaxWarn(Warnings.INVALID_BACKREFERENCE);
+                }
+            } else {
+                syntaxWarn(Warnings.INVALID_BACKREFERENCE);
+            }
+        }
+    }
+
+    private void fetchTokenFor_subexpCall() {
+        if (syntax.op2EscGSubexpCall()) {
+            if (left()) {
+                fetch();
+                if (c == '<' || c == '\'') {
+                    int last = p;
+                    int gNum = fetchName(c, true);
+                    int nameEnd = value;
+                    token.type = TokenType.CALL;
+                    token.setCallNameP(last);
+                    token.setCallNameEnd(nameEnd);
+                    token.setCallGNum(gNum);
+                } else {
+                    unfetch();
+                    syntaxWarn(Warnings.INVALID_SUBEXP_CALL);
+                }
+            } else {
+                syntaxWarn(Warnings.INVALID_SUBEXP_CALL);
+            }
+        }
+    }
+
+    private void fetchTokenFor_charProperty() {
+        if (peekIs('{') && syntax.op2EscPBraceCharProperty()) {
+            inc();
+            token.type = TokenType.CHAR_PROPERTY;
+            token.setPropNot(c == 'P');
+
+            if (syntax.op2EscPBraceCircumflexNot()) {
+                fetch();
+                if (c == '^') {
+                    token.setPropNot(!token.getPropNot());
+                } else {
+                    unfetch();
+                }
+            }
+        } else {
+            syntaxWarn(Warnings.INVALID_UNICODE_PROPERTY, (char)c);
+        }
+    }
+
+    private void fetchTokenFor_metaChars() {
+        if (c == syntax.metaCharTable.anyChar) {
+            token.type = TokenType.ANYCHAR;
+        } else if (c == syntax.metaCharTable.anyTime) {
+            fetchTokenFor_repeat(0, QuantifierNode.REPEAT_INFINITE);
+        }  else if (c == syntax.metaCharTable.zeroOrOneTime) {
+            fetchTokenFor_repeat(0, 1);
+        } else if (c == syntax.metaCharTable.oneOrMoreTime) {
+            fetchTokenFor_repeat(1, QuantifierNode.REPEAT_INFINITE);
+        } else if (c == syntax.metaCharTable.anyCharAnyTime) {
+            token.type = TokenType.ANYCHAR_ANYTIME;
+            // goto out
+        }
+    }
+
+    protected final TokenType fetchToken() {
+        // mark(); // out
+        start:
+        while(true) {
+            if (!left()) {
+                token.type = TokenType.EOT;
+                return token.type;
+            }
+
+            token.type = TokenType.STRING;
+            token.base = 0;
+            token.backP = p;
+
+            fetch();
+
+            if (c == syntax.metaCharTable.esc && !syntax.op2IneffectiveEscape()) { // IS_MC_ESC_CODE(code, syn)
+                if (!left()) newSyntaxException(ERR_END_PATTERN_AT_ESCAPE);
+
+                token.backP = p;
+                fetch();
+
+                token.setC(c);
+                token.escaped = true;
+                switch(c) {
+
+                case '*':
+                    if (syntax.opEscAsteriskZeroInf()) fetchTokenFor_repeat(0, QuantifierNode.REPEAT_INFINITE);
+                    break;
+                case '+':
+                    if (syntax.opEscPlusOneInf()) fetchTokenFor_repeat(1, QuantifierNode.REPEAT_INFINITE);
+                    break;
+                case '?':
+                    if (syntax.opEscQMarkZeroOne()) fetchTokenFor_repeat(0, 1);
+                    break;
+                case '{':
+                    if (syntax.opEscBraceInterval()) fetchTokenFor_openBrace();
+                    break;
+                case '|':
+                    if (syntax.opEscVBarAlt()) token.type = TokenType.ALT;
+                    break;
+                case '(':
+                    if (syntax.opEscLParenSubexp()) token.type = TokenType.SUBEXP_OPEN;
+                    break;
+                case ')':
+                    if (syntax.opEscLParenSubexp()) token.type = TokenType.SUBEXP_CLOSE;
+                    break;
+                case 'w':
+                    if (syntax.opEscWWord()) fetchTokenInCCFor_charType(false, Config.NON_UNICODE_SDW ? CharacterType.W : CharacterType.WORD);
+                    break;
+                case 'W':
+                    if (syntax.opEscWWord()) fetchTokenInCCFor_charType(true, Config.NON_UNICODE_SDW ? CharacterType.W : CharacterType.WORD);
+                    break;
+                case 'b':
+                    if (syntax.opEscBWordBound()) fetchTokenFor_anchor(AnchorType.WORD_BOUND);
+                    break;
+                case 'B':
+                    if (syntax.opEscBWordBound()) fetchTokenFor_anchor(AnchorType.NOT_WORD_BOUND);
+                    break;
+                case '<':
+                    if (Config.USE_WORD_BEGIN_END && syntax.opEscLtGtWordBeginEnd()) fetchTokenFor_anchor(AnchorType.WORD_BEGIN);
+                    break;
+                case '>':
+                    if (Config.USE_WORD_BEGIN_END && syntax.opEscLtGtWordBeginEnd()) fetchTokenFor_anchor(AnchorType.WORD_END);
+                    break;
+                case 's':
+                    if (syntax.opEscSWhiteSpace()) fetchTokenInCCFor_charType(false, Config.NON_UNICODE_SDW ? CharacterType.S : CharacterType.SPACE);
+                    break;
+                case 'S':
+                    if (syntax.opEscSWhiteSpace()) fetchTokenInCCFor_charType(true, Config.NON_UNICODE_SDW ? CharacterType.S : CharacterType.SPACE);
+                    break;
+                case 'd':
+                    if (syntax.opEscDDigit()) fetchTokenInCCFor_charType(false, Config.NON_UNICODE_SDW ? CharacterType.D : CharacterType.DIGIT);
+                    break;
+                case 'D':
+                    if (syntax.opEscDDigit()) fetchTokenInCCFor_charType(true, Config.NON_UNICODE_SDW ? CharacterType.D : CharacterType.DIGIT);
+                    break;
+                case 'h':
+                    if (syntax.op2EscHXDigit()) fetchTokenInCCFor_charType(false, CharacterType.XDIGIT);
+                    break;
+                case 'H':
+                    if (syntax.op2EscHXDigit()) fetchTokenInCCFor_charType(true, CharacterType.XDIGIT);
+                    break;
+                case 'A':
+                    if (syntax.opEscAZBufAnchor()) fetchTokenFor_anchor(AnchorType.BEGIN_BUF);
+                    break;
+                case 'Z':
+                    if (syntax.opEscAZBufAnchor()) fetchTokenFor_anchor(AnchorType.SEMI_END_BUF);
+                    break;
+                case 'z':
+                    if (syntax.opEscAZBufAnchor()) fetchTokenFor_anchor(AnchorType.END_BUF);
+                    break;
+                case 'G':
+                    if (syntax.opEscCapitalGBeginAnchor()) fetchTokenFor_anchor(AnchorType.BEGIN_POSITION);
+                    break;
+                case '`':
+                    if (syntax.op2EscGnuBufAnchor()) fetchTokenFor_anchor(AnchorType.BEGIN_BUF);
+                    break;
+                case '\'':
+                    if (syntax.op2EscGnuBufAnchor()) fetchTokenFor_anchor(AnchorType.END_BUF);
+                    break;
+                case 'x':
+                    fetchTokenFor_xBrace();
+                    break;
+                case 'u':
+                    fetchTokenFor_uHex();
+                    break;
+                case '1':
+                case '2':
+                case '3':
+                case '4':
+                case '5':
+                case '6':
+                case '7':
+                case '8':
+                case '9':
+                    fetchTokenFor_digit();
+                    break;
+                case '0':
+                    fetchTokenFor_zero();
+                    break;
+                case 'k':
+                    if (Config.USE_NAMED_GROUP) fetchTokenFor_namedBackref();
+                    break;
+                case 'g':
+                    if (Config.USE_SUBEXP_CALL) fetchTokenFor_subexpCall();
+                    break;
+                case 'Q':
+                    if (syntax.op2EscCapitalQQuote()) token.type = TokenType.QUOTE_OPEN;
+                    break;
+                case 'p':
+                case 'P':
+                    fetchTokenFor_charProperty();
+                    break;
+
+                default:
+                    unfetch();
+                    int num = fetchEscapedValue();
+
+                    /* set_raw: */
+                    if (token.getC() != num) {
+                        token.type = TokenType.CODE_POINT;
+                        token.setCode(num);
+                    } else { /* string */
+                        p = token.backP + 1;
+                    }
+                    break;
+
+                } // switch (c)
+
+            } else {
+                token.setC(c);
+                token.escaped = false;
+
+                if (Config.USE_VARIABLE_META_CHARS && (c != MetaChar.INEFFECTIVE_META_CHAR && syntax.opVariableMetaCharacters())) {
+                    fetchTokenFor_metaChars();
+                    break;
+                }
+
+                {
+                    switch(c) {
+                    case '.':
+                        if (syntax.opDotAnyChar()) token.type = TokenType.ANYCHAR;
+                        break;
+                    case '*':
+                        if (syntax.opAsteriskZeroInf()) fetchTokenFor_repeat(0, QuantifierNode.REPEAT_INFINITE);
+                        break;
+                    case '+':
+                        if (syntax.opPlusOneInf()) fetchTokenFor_repeat(1, QuantifierNode.REPEAT_INFINITE);
+                        break;
+                    case '?':
+                        if (syntax.opQMarkZeroOne()) fetchTokenFor_repeat(0, 1);
+                        break;
+                    case '{':
+                        if (syntax.opBraceInterval()) fetchTokenFor_openBrace();
+                        break;
+                    case '|':
+                        if (syntax.opVBarAlt()) token.type = TokenType.ALT;
+                        break;
+
+                    case '(':
+                        if (peekIs('?') && syntax.op2QMarkGroupEffect()) {
+                            inc();
+                            if (peekIs('#')) {
+                                fetch();
+                                while (true) {
+                                    if (!left()) newSyntaxException(ERR_END_PATTERN_IN_GROUP);
+                                    fetch();
+                                    if (c == syntax.metaCharTable.esc) {
+                                        if (left()) fetch();
+                                    } else {
+                                        if (c == ')') break;
+                                    }
+                                }
+                                continue start; // goto start
+                            }
+                            unfetch();
+                        }
+
+                        if (syntax.opLParenSubexp()) token.type = TokenType.SUBEXP_OPEN;
+                        break;
+                    case ')':
+                        if (syntax.opLParenSubexp()) token.type = TokenType.SUBEXP_CLOSE;
+                        break;
+                    case '^':
+                        if (syntax.opLineAnchor()) fetchTokenFor_anchor(isSingleline(env.option) ? AnchorType.BEGIN_BUF : AnchorType.BEGIN_LINE);
+                        break;
+                    case '$':
+                        if (syntax.opLineAnchor()) fetchTokenFor_anchor(isSingleline(env.option) ? AnchorType.SEMI_END_BUF : AnchorType.END_LINE);
+                        break;
+                    case '[':
+                        if (syntax.opBracketCC()) token.type = TokenType.CC_CC_OPEN;
+                        break;
+                    case ']':
+                        //if (*src > env->pattern)   /* /].../ is allowed. */
+                        //CLOSE_BRACKET_WITHOUT_ESC_WARN(env, (UChar* )"]");
+                        break;
+                    case '#':
+                        if (Option.isExtend(env.option)) {
+                            while (left()) {
+                                fetch();
+                                if (EncodingHelper.isNewLine(c)) break;
+                            }
+                            continue start; // goto start
+                        }
+                        break;
+
+                    case ' ':
+                    case '\t':
+                    case '\n':
+                    case '\r':
+                    case '\f':
+                        if (Option.isExtend(env.option)) continue start; // goto start
+                        break;
+
+                    default: // string
+                        break;
+
+                    } // switch
+                }
+            }
+
+            break;
+        } // while
+        return token.type;
+    }
+
+    private void greedyCheck() {
+        if (left() && peekIs('?') && syntax.opQMarkNonGreedy()) {
+
+            fetch();
+
+            token.setRepeatGreedy(false);
+            token.setRepeatPossessive(false);
+        } else {
+            possessiveCheck();
+        }
+    }
+
+    private void possessiveCheck() {
+        if (left() && peekIs('+') &&
+            (syntax.op2PlusPossessiveRepeat() && token.type != TokenType.INTERVAL ||
+             syntax.op2PlusPossessiveInterval() && token.type == TokenType.INTERVAL)) {
+
+            fetch();
+
+            token.setRepeatGreedy(true);
+            token.setRepeatPossessive(true);
+        } else {
+            token.setRepeatGreedy(true);
+            token.setRepeatPossessive(false);
+        }
+    }
+
+    protected final int fetchCharPropertyToCType() {
+        mark();
+
+        while (left()) {
+            int last = p;
+            fetch();
+            if (c == '}') {
+                String name = new String(chars, _p, last - _p);
+                return PosixBracket.propertyNameToCType(name);
+            } else if (c == '(' || c == ')' || c == '{' || c == '|') {
+                String name = new String(chars, _p, last - _p);
+                throw new JOniException(ERR_INVALID_CHAR_PROPERTY_NAME.replaceAll("%n", name));
+            }
+        }
+        newInternalException(ERR_PARSER_BUG);
+        return 0; // not reached
+    }
+
+    protected final void syntaxWarn(String message, char c) {
+        syntaxWarn(message.replace("<%n>", Character.toString(c)));
+    }
+
+    protected final void syntaxWarn(String message) {
+        if (Config.USE_WARN) {
+            env.reg.warnings.warn(message + ": /" + new String(chars, getBegin(), getEnd()) + "/");
+        }
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Matcher.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Matcher.java
new file mode 100644
index 00000000000..4aea4acb787
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Matcher.java
@@ -0,0 +1,556 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package jdk.nashorn.internal.runtime.regexp.joni;
+
+import static jdk.nashorn.internal.runtime.regexp.joni.Option.isFindLongest;
+
+import jdk.nashorn.internal.runtime.regexp.joni.constants.AnchorType;
+import jdk.nashorn.internal.runtime.regexp.joni.encoding.IntHolder;
+
+public abstract class Matcher extends IntHolder {
+    protected final Regex regex;
+
+    protected final char[] chars;
+    protected final int str;
+    protected final int end;
+
+    protected int msaStart;
+    protected int msaOptions;
+    protected final Region msaRegion;
+    protected int msaBestLen;
+    protected int msaBestS;
+
+    protected int msaBegin;
+    protected int msaEnd;
+
+    public Matcher(Regex regex, char[] chars) {
+        this(regex, chars, 0, chars.length);
+    }
+
+    public Matcher(Regex regex, char[] chars, int p, int end) {
+        this.regex = regex;
+
+        this.chars = chars;
+        this.str = p;
+        this.end = end;
+
+        this.msaRegion = regex.numMem == 0 ? null : new Region(regex.numMem + 1);
+    }
+
+    // main matching method
+    protected abstract int matchAt(int range, int sstart, int sprev);
+
+    protected abstract void stateCheckBuffInit(int strLength, int offset, int stateNum);
+    protected abstract void stateCheckBuffClear();
+
+    public final Region getRegion() {
+        return msaRegion;
+    }
+
+    public final Region getEagerRegion() {
+        return msaRegion != null ? msaRegion : new Region(msaBegin, msaEnd);
+    }
+
+    public final int getBegin() {
+        return msaBegin;
+    }
+
+    public final int getEnd() {
+        return msaEnd;
+    }
+
+    protected final void msaInit(int option, int start) {
+        msaOptions = option;
+        msaStart = start;
+        if (Config.USE_FIND_LONGEST_SEARCH_ALL_OF_RANGE) msaBestLen = -1;
+    }
+
+    public final int match(int at, int range, int option) {
+        msaInit(option, at);
+
+        if (Config.USE_COMBINATION_EXPLOSION_CHECK) {
+            int offset = at = str;
+            stateCheckBuffInit(end - str, offset, regex.numCombExpCheck); // move it to construction?
+        } // USE_COMBINATION_EXPLOSION_CHECK
+
+        int prev = EncodingHelper.prevCharHead(str, at);
+
+        if (Config.USE_MATCH_RANGE_MUST_BE_INSIDE_OF_SPECIFIED_RANGE) {
+            return matchAt(end /*range*/, at, prev);
+        } else {
+            return matchAt(range /*range*/, at, prev);
+        }
+    }
+
+    int low, high; // these are the return values
+    private boolean forwardSearchRange(char[] chars, int str, int end, int s, int range, IntHolder lowPrev) {
+        int pprev = -1;
+        int p = s;
+
+        if (Config.DEBUG_SEARCH) {
+            Config.log.println("forward_search_range: "+
+                                "str: " + str +
+                                ", end: " + end +
+                                ", s: " + s +
+                                ", range: " + range);
+        }
+
+        if (regex.dMin > 0) {
+            p += regex.dMin;
+        }
+
+        retry:while (true) {
+            p = regex.searchAlgorithm.search(regex, chars, p, end, range);
+
+            if (p != -1 && p < range) {
+                if (p - regex.dMin < s) {
+                    // retry_gate:
+                    pprev = p;
+                    p++;
+                    continue retry;
+                }
+
+                if (regex.subAnchor != 0) {
+                    switch (regex.subAnchor) {
+                    case AnchorType.BEGIN_LINE:
+                        if (p != str) {
+                            int prev = EncodingHelper.prevCharHead((pprev != -1) ? pprev : str, p);
+                            if (!EncodingHelper.isNewLine(chars, prev, end)) {
+                                // goto retry_gate;
+                                pprev = p;
+                                p++;
+                                continue retry;
+                            }
+                        }
+                        break;
+
+                    case AnchorType.END_LINE:
+                        if (p == end) {
+                            if (!Config.USE_NEWLINE_AT_END_OF_STRING_HAS_EMPTY_LINE) {
+                                int prev = EncodingHelper.prevCharHead((pprev != -1) ? pprev : str, p);
+                                if (prev != -1 && EncodingHelper.isNewLine(chars, prev, end)) {
+                                    // goto retry_gate;
+                                    pprev = p;
+                                    p++;
+                                    continue retry;
+                                }
+                            }
+                        } else if (!EncodingHelper.isNewLine(chars, p, end) && (!Config.USE_CRNL_AS_LINE_TERMINATOR || !EncodingHelper.isCrnl(chars, p, end))) {
+                            //if () break;
+                            // goto retry_gate;
+                            pprev = p;
+                            p++;
+                            continue retry;
+                        }
+                        break;
+                    } // switch
+                }
+
+                if (regex.dMax == 0) {
+                    low = p;
+                    if (lowPrev != null) { // ??? // remove null checks
+                        if (low > s) {
+                            lowPrev.value = EncodingHelper.prevCharHead(s, p);
+                        } else {
+                            lowPrev.value = EncodingHelper.prevCharHead((pprev != -1) ? pprev : str, p);
+                        }
+                    }
+                } else {
+                    if (regex.dMax != MinMaxLen.INFINITE_DISTANCE) {
+                        low = p - regex.dMax;
+
+                        if (low > s) {
+                            low = EncodingHelper.rightAdjustCharHeadWithPrev(low, lowPrev);
+                            if (lowPrev != null && lowPrev.value == -1) {
+                                lowPrev.value = EncodingHelper.prevCharHead((pprev != -1) ? pprev : s, low);
+                            }
+                        } else {
+                            if (lowPrev != null) {
+                                lowPrev.value = EncodingHelper.prevCharHead((pprev != -1) ? pprev : str, low);
+                            }
+                        }
+                    }
+                }
+                /* no needs to adjust *high, *high is used as range check only */
+                high = p - regex.dMin;
+
+                if (Config.DEBUG_SEARCH) {
+                    Config.log.println("forward_search_range success: "+
+                                        "low: " + (low - str) +
+                                        ", high: " + (high - str) +
+                                        ", dmin: " + regex.dMin +
+                                        ", dmax: " + regex.dMax);
+                }
+
+                return true;    /* success */
+            }
+
+            return false;   /* fail */
+        } //while
+    }
+
+    // low, high
+    private boolean backwardSearchRange(char[] chars, int str, int end, int s, int range, int adjrange) {
+        range += regex.dMin;
+        int p = s;
+
+        retry:while (true) {
+            p = regex.searchAlgorithm.searchBackward(regex, chars, range, adjrange, end, p, s, range);
+
+            if (p != -1) {
+                if (regex.subAnchor != 0) {
+                    switch (regex.subAnchor) {
+                    case AnchorType.BEGIN_LINE:
+                        if (p != str) {
+                            int prev = EncodingHelper.prevCharHead(str, p);
+                            if (!EncodingHelper.isNewLine(chars, prev, end)) {
+                                p = prev;
+                                continue retry;
+                            }
+                        }
+                        break;
+
+                    case AnchorType.END_LINE:
+                        if (p == end) {
+                            if (!Config.USE_NEWLINE_AT_END_OF_STRING_HAS_EMPTY_LINE) {
+                                int prev = EncodingHelper.prevCharHead(adjrange, p);
+                                if (prev == -1) return false;
+                                if (EncodingHelper.isNewLine(chars, prev, end)) {
+                                    p = prev;
+                                    continue retry;
+                                }
+                            }
+                        } else if (!EncodingHelper.isNewLine(chars, p, end) && (!Config.USE_CRNL_AS_LINE_TERMINATOR || !EncodingHelper.isCrnl(chars, p, end))) {
+                            p = EncodingHelper.prevCharHead(adjrange, p);
+                            if (p == -1) return false;
+                            continue retry;
+                        }
+                        break;
+                    } // switch
+                }
+
+                /* no needs to adjust *high, *high is used as range check only */
+                if (regex.dMax != MinMaxLen.INFINITE_DISTANCE) {
+                    low = p - regex.dMax;
+                    high = p - regex.dMin;
+                }
+
+                if (Config.DEBUG_SEARCH) {
+                    Config.log.println("backward_search_range: "+
+                                        "low: " + (low - str) +
+                                        ", high: " + (high - str));
+                }
+
+                return true;
+            }
+
+            if (Config.DEBUG_SEARCH) Config.log.println("backward_search_range: fail.");
+            return false;
+        } // while
+    }
+
+    // MATCH_AND_RETURN_CHECK
+    private boolean matchCheck(int upperRange, int s, int prev) {
+        if (Config.USE_MATCH_RANGE_MUST_BE_INSIDE_OF_SPECIFIED_RANGE) {
+            if (Config.USE_FIND_LONGEST_SEARCH_ALL_OF_RANGE) {
+                //range = upperRange;
+                if (matchAt(upperRange, s, prev) != -1) {
+                    if (!isFindLongest(regex.options)) return true;
+                }
+            } else {
+                //range = upperRange;
+                if (matchAt(upperRange, s, prev) != -1) return true;
+            }
+        } else {
+            if (Config.USE_FIND_LONGEST_SEARCH_ALL_OF_RANGE) {
+                if (matchAt(end, s, prev) != -1) {
+                    //range = upperRange;
+                    if (!isFindLongest(regex.options)) return true;
+                }
+            } else {
+                //range = upperRange;
+                if (matchAt(end, s, prev) != -1) return true;
+            }
+        }
+        return false;
+    }
+
+    public final int search(int start, int range, int option) {
+        int s, prev;
+        int origStart = start;
+        int origRange = range;
+
+        if (Config.DEBUG_SEARCH) {
+            Config.log.println("onig_search (entry point): "+
+                    "str: " + str +
+                    ", end: " + (end - str) +
+                    ", start: " + (start - str) +
+                    ", range " + (range - str));
+        }
+
+        if (start > end || start < str) return -1;
+
+        /* anchor optimize: resume search range */
+        if (regex.anchor != 0 && str < end) {
+            int minSemiEnd, maxSemiEnd;
+
+            if ((regex.anchor & AnchorType.BEGIN_POSITION) != 0) {
+                /* search start-position only */
+                // !begin_position:!
+                if (range > start) {
+                    range = start + 1;
+                } else {
+                    range = start;
+                }
+            } else if ((regex.anchor & AnchorType.BEGIN_BUF) != 0) {
+                /* search str-position only */
+                if (range > start) {
+                    if (start != str) return -1; // mismatch_no_msa;
+                    range = str + 1;
+                } else {
+                    if (range <= str) {
+                        start = str;
+                        range = str;
+                    } else {
+                        return -1; // mismatch_no_msa;
+                    }
+                }
+            } else if ((regex.anchor & AnchorType.END_BUF) != 0) {
+                minSemiEnd = maxSemiEnd = end;
+                // !end_buf:!
+                if (endBuf(start, range, minSemiEnd, maxSemiEnd)) return -1; // mismatch_no_msa;
+            } else if ((regex.anchor & AnchorType.SEMI_END_BUF) != 0) {
+                int preEnd = EncodingHelper.stepBack(str, end, 1);
+                maxSemiEnd = end;
+                if (EncodingHelper.isNewLine(chars, preEnd, end)) {
+                    minSemiEnd = preEnd;
+                    if (Config.USE_CRNL_AS_LINE_TERMINATOR) {
+                        preEnd = EncodingHelper.stepBack(str, preEnd, 1);
+                        if (preEnd != -1 && EncodingHelper.isCrnl(chars, preEnd, end)) {
+                            minSemiEnd = preEnd;
+                        }
+                    }
+                    if (minSemiEnd > str && start <= minSemiEnd) {
+                        // !goto end_buf;!
+                        if (endBuf(start, range, minSemiEnd, maxSemiEnd)) return -1; // mismatch_no_msa;
+                    }
+                } else {
+                    minSemiEnd = end;
+                    // !goto end_buf;!
+                    if (endBuf(start, range, minSemiEnd, maxSemiEnd)) return -1; // mismatch_no_msa;
+                }
+            } else if ((regex.anchor & AnchorType.ANYCHAR_STAR_ML) != 0) {
+                // goto !begin_position;!
+                if (range > start) {
+                    range = start + 1;
+                } else {
+                    range = start;
+                }
+            }
+
+        } else if (str == end) { /* empty string */
+            // empty address ?
+            if (Config.DEBUG_SEARCH) {
+                Config.log.println("onig_search: empty string.");
+            }
+
+            if (regex.thresholdLength == 0) {
+                s = start = str;
+                prev = -1;
+                msaInit(option, start);
+
+                if (Config.USE_COMBINATION_EXPLOSION_CHECK) stateCheckBuffClear();
+
+                if (matchCheck(end, s, prev)) return match(s);
+                return mismatch();
+            }
+            return -1; // goto mismatch_no_msa;
+        }
+
+        if (Config.DEBUG_SEARCH) {
+            Config.log.println("onig_search(apply anchor): " +
+                                "end: " + (end - str) +
+                                ", start " + (start - str) +
+                                ", range " + (range - str));
+        }
+
+        msaInit(option, origStart);
+        if (Config.USE_COMBINATION_EXPLOSION_CHECK) {
+            int offset = Math.min(start, range) - str;
+            stateCheckBuffInit(end - str, offset, regex.numCombExpCheck);
+        }
+
+        s = start;
+        if (range > start) {    /* forward search */
+            if (s > str) {
+                prev = EncodingHelper.prevCharHead(str, s);
+            } else {
+                prev = 0; // -1
+            }
+
+            if (regex.searchAlgorithm != SearchAlgorithm.NONE) {
+                int schRange = range;
+                if (regex.dMax != 0) {
+                    if (regex.dMax == MinMaxLen.INFINITE_DISTANCE) {
+                        schRange = end;
+                    } else {
+                        schRange += regex.dMax;
+                        if (schRange > end) schRange = end;
+                    }
+                }
+                if ((end - start) < regex.thresholdLength) return mismatch();
+
+                if (regex.dMax != MinMaxLen.INFINITE_DISTANCE) {
+                    do {
+                        if (!forwardSearchRange(chars, str, end, s, schRange, this)) return mismatch(); // low, high, lowPrev
+                        if (s < low) {
+                            s = low;
+                            prev = value;
+                        }
+                        while (s <= high) {
+                            if (matchCheck(origRange, s, prev)) return match(s); // ???
+                            prev = s;
+                            s++;
+                        }
+                    } while (s < range);
+                    return mismatch();
+
+                } else { /* check only. */
+                    if (!forwardSearchRange(chars, str, end, s, schRange, null)) return mismatch();
+
+                    if ((regex.anchor & AnchorType.ANYCHAR_STAR) != 0) {
+                        do {
+                            if (matchCheck(origRange, s, prev)) return match(s);
+                            prev = s;
+                            s++;
+                        } while (s < range);
+                        return mismatch();
+                    }
+
+                }
+            }
+
+            do {
+                if (matchCheck(origRange, s, prev)) return match(s);
+                prev = s;
+                s++;
+            } while (s < range);
+
+            if (s == range) { /* because empty match with /$/. */
+                if (matchCheck(origRange, s, prev)) return match(s);
+            }
+        } else { /* backward search */
+            if (Config.USE_MATCH_RANGE_MUST_BE_INSIDE_OF_SPECIFIED_RANGE) {
+                if (origStart < end) {
+                    origStart++; // /* is upper range */
+                }
+            }
+
+            if (regex.searchAlgorithm != SearchAlgorithm.NONE) {
+                int adjrange;
+                if (range < end) {
+                    adjrange = range;
+                } else {
+                    adjrange = end;
+                }
+                if (regex.dMax != MinMaxLen.INFINITE_DISTANCE && (end - range) >= regex.thresholdLength) {
+                    do {
+                        int schStart = s + regex.dMax;
+                        if (schStart > end) schStart = end;
+                        if (!backwardSearchRange(chars, str, end, schStart, range, adjrange)) return mismatch(); // low, high
+                        if (s > high) s = high;
+                        while (s != -1 && s >= low) {
+                            prev = EncodingHelper.prevCharHead(str, s);
+                            if (matchCheck(origStart, s, prev)) return match(s);
+                            s = prev;
+                        }
+                    } while (s >= range);
+                    return mismatch();
+                } else { /* check only. */
+                    if ((end - range) < regex.thresholdLength) return mismatch();
+
+                    int schStart = s;
+                    if (regex.dMax != 0) {
+                        if (regex.dMax == MinMaxLen.INFINITE_DISTANCE) {
+                            schStart = end;
+                        } else {
+                            schStart += regex.dMax;
+                            if (schStart > end) {
+                                schStart = end;
+                            }
+                        }
+                    }
+                    if (!backwardSearchRange(chars, str, end, schStart, range, adjrange)) return mismatch();
+                }
+            }
+
+            do {
+                prev = EncodingHelper.prevCharHead(str, s);
+                if (matchCheck(origStart, s, prev)) return match(s);
+                s = prev;
+            } while (s >= range);
+
+        }
+        return mismatch();
+    }
+
+    private boolean endBuf(int start, int range, int minSemiEnd, int maxSemiEnd) {
+        if ((maxSemiEnd - str) < regex.anchorDmin) return true; // mismatch_no_msa;
+
+        if (range > start) {
+            if ((minSemiEnd - start) > regex.anchorDmax) {
+                start = minSemiEnd - regex.anchorDmax;
+                if (start >= end) {
+                    /* match with empty at end */
+                    start = EncodingHelper.prevCharHead(str, end);
+                }
+            }
+            if ((maxSemiEnd - (range - 1)) < regex.anchorDmin) {
+                range = maxSemiEnd - regex.anchorDmin + 1;
+            }
+            if (start >= range) return true; // mismatch_no_msa;
+        } else {
+            if ((minSemiEnd - range) > regex.anchorDmax) {
+                range = minSemiEnd - regex.anchorDmax;
+            }
+            if ((maxSemiEnd - start) < regex.anchorDmin) {
+                start = maxSemiEnd - regex.anchorDmin;
+            }
+            if (range > start) return true; // mismatch_no_msa;
+        }
+        return false;
+    }
+
+    private int match(int s) {
+        return s - str; // sstart ???
+    }
+
+    private int mismatch() {
+        if (Config.USE_FIND_LONGEST_SEARCH_ALL_OF_RANGE) {
+            if (msaBestLen >= 0) {
+                int s = msaBestS;
+                return match(s);
+            }
+        }
+        // falls through finish:
+        return -1;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/MatcherFactory.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/MatcherFactory.java
new file mode 100644
index 00000000000..f507018ff8e
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/MatcherFactory.java
@@ -0,0 +1,31 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni;
+
+public abstract class MatcherFactory {
+    public abstract Matcher create(Regex regex, char[] chars, int p, int end);
+
+    static final MatcherFactory DEFAULT = new MatcherFactory() {
+        @Override
+        public Matcher create(Regex regex, char[] chars, int p, int end) {
+            return new ByteCodeMachine(regex, chars, p, end);
+        }
+    };
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/MinMaxLen.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/MinMaxLen.java
new file mode 100644
index 00000000000..388c0c52865
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/MinMaxLen.java
@@ -0,0 +1,139 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni;
+
+final class MinMaxLen {
+    int min; /* min byte length */
+    int max; /* max byte length */
+
+    MinMaxLen() {
+    }
+
+    MinMaxLen(int min, int max) {
+        this.min = min;
+        this.max = max;
+    }
+
+    /* 1000 / (min-max-dist + 1) */
+    private static final short distValues[] = {
+        1000,  500,  333,  250,  200,  167,  143,  125,  111,  100,
+          91,   83,   77,   71,   67,   63,   59,   56,   53,   50,
+          48,   45,   43,   42,   40,   38,   37,   36,   34,   33,
+          32,   31,   30,   29,   29,   28,   27,   26,   26,   25,
+          24,   24,   23,   23,   22,   22,   21,   21,   20,   20,
+          20,   19,   19,   19,   18,   18,   18,   17,   17,   17,
+          16,   16,   16,   16,   15,   15,   15,   15,   14,   14,
+          14,   14,   14,   14,   13,   13,   13,   13,   13,   13,
+          12,   12,   12,   12,   12,   12,   11,   11,   11,   11,
+          11,   11,   11,   11,   11,   10,   10,   10,   10,   10
+    };
+
+    int distanceValue() {
+        if (max == INFINITE_DISTANCE) return 0;
+        int d = max - min;
+        /* return dist_vals[d] * 16 / (mm->min + 12); */
+        return d < distValues.length ? distValues[d] : 1;
+    }
+
+    int compareDistanceValue(MinMaxLen other, int v1, int v2) {
+        if (v2 <= 0) return -1;
+        if (v1 <= 0) return 1;
+
+        v1 *= distanceValue();
+        v2 *= other.distanceValue();
+
+        if (v2 > v1) return 1;
+        if (v2 < v1) return -1;
+
+        if (other.min < min) return 1;
+        if (other.min > min) return -1;
+        return 0;
+    }
+
+    boolean equal(MinMaxLen other) {
+        return min == other.min && max == other.max;
+    }
+
+    void set(int min, int max) {
+        this.min = min;
+        this.max = max;
+    }
+
+    void clear() {
+        min = max = 0;
+    }
+
+    void copy(MinMaxLen other) {
+        min = other.min;
+        max = other.max;
+    }
+
+    void add(MinMaxLen other) {
+        min = distanceAdd(min, other.min);
+        max = distanceAdd(max, other.max);
+    }
+
+    void addLength(int len) {
+        min = distanceAdd(min, len);
+        max = distanceAdd(max, len);
+    }
+
+    void altMerge(MinMaxLen other) {
+        if (min > other.min) min = other.min;
+        if (max < other.max) max = other.max;
+    }
+
+    static final int INFINITE_DISTANCE = 0x7FFFFFFF;
+    static int distanceAdd(int d1, int d2) {
+        if (d1 == INFINITE_DISTANCE || d2 == INFINITE_DISTANCE) {
+            return INFINITE_DISTANCE;
+        } else {
+            if (d1 <= INFINITE_DISTANCE - d2) return d1 + d2;
+            else return INFINITE_DISTANCE;
+        }
+    }
+
+    static int distanceMultiply(int d, int m) {
+        if (m == 0) return 0;
+        if (d < INFINITE_DISTANCE / m) {
+            return d * m;
+        } else {
+            return INFINITE_DISTANCE;
+        }
+    }
+
+    static String distanceRangeToString(int a, int b) {
+        String s = "";
+        if (a == INFINITE_DISTANCE) {
+            s += "inf";
+        } else {
+            s += "(" + a + ")";
+        }
+
+        s += "-";
+
+        if (b == INFINITE_DISTANCE) {
+            s += "inf";
+        } else {
+            s += "(" + b + ")";
+        }
+        return s;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/NameEntry.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/NameEntry.java
new file mode 100644
index 00000000000..d35f725155e
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/NameEntry.java
@@ -0,0 +1,97 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni;
+
+public final class NameEntry {
+    static final int INIT_NAME_BACKREFS_ALLOC_NUM = 8;
+
+    public final char[] name;
+    public final int nameP;
+    public final int nameEnd;
+
+    int backNum;
+    int backRef1;
+    int backRefs[];
+
+    public NameEntry(char[] chars, int p, int end) {
+        name = chars;
+        nameP = p;
+        nameEnd = end;
+    }
+
+    public int[] getBackRefs() {
+        switch (backNum) {
+        case 0:
+            return new int[]{};
+        case 1:
+            return new int[]{backRef1};
+        default:
+            int[]result = new int[backNum];
+            System.arraycopy(backRefs, 0, result, 0, backNum);
+            return result;
+        }
+    }
+
+    private void alloc() {
+        backRefs = new int[INIT_NAME_BACKREFS_ALLOC_NUM];
+    }
+
+    private void ensureSize() {
+        if (backNum > backRefs.length) {
+            int[]tmp = new int[backRefs.length << 1];
+            System.arraycopy(backRefs, 0, tmp, 0, backRefs.length);
+            backRefs = tmp;
+        }
+    }
+
+    public void addBackref(int backRef) {
+        backNum++;
+
+        switch (backNum) {
+            case 1:
+                backRef1 = backRef;
+                break;
+            case 2:
+                alloc();
+                backRefs[0] = backRef1;
+                backRefs[1] = backRef;
+                break;
+            default:
+                ensureSize();
+                backRefs[backNum - 1] = backRef;
+        }
+    }
+
+    public String toString() {
+        StringBuilder buff = new StringBuilder(new String(name, nameP, nameEnd - nameP) + " ");
+        if (backNum == 0) {
+            buff.append("-");
+        } else if (backNum == 1){
+            buff.append(backRef1);
+        } else {
+            for (int i=0; i<backNum; i++){
+                if (i > 0) buff.append(", ");
+                buff.append(backRefs[i]);
+            }
+        }
+        return buff.toString();
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/NativeMachine.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/NativeMachine.java
new file mode 100644
index 00000000000..2a3f2a13144
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/NativeMachine.java
@@ -0,0 +1,27 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni;
+
+public abstract class NativeMachine extends Matcher {
+
+    protected NativeMachine(Regex regex, char[] chars, int p, int end) {
+        super(regex, chars, p, end);
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/NodeOptInfo.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/NodeOptInfo.java
new file mode 100644
index 00000000000..76b1d5f6b14
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/NodeOptInfo.java
@@ -0,0 +1,125 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni;
+
+public final class NodeOptInfo {
+    final MinMaxLen length = new  MinMaxLen();
+    final OptAnchorInfo anchor = new OptAnchorInfo();
+    final OptExactInfo exb = new OptExactInfo();            /* boundary */
+    final OptExactInfo exm = new OptExactInfo();            /* middle */
+    final OptExactInfo expr = new OptExactInfo();           /* prec read (?=...) */
+    final OptMapInfo map = new OptMapInfo();                /* boundary */
+
+    public void setBoundNode(MinMaxLen mmd) {
+        exb.mmd.copy(mmd);
+        expr.mmd.copy(mmd);
+        map.mmd.copy(mmd);
+    }
+
+    public void clear() {
+        length.clear();
+        anchor.clear();
+        exb.clear();
+        exm.clear();
+        expr.clear();
+        map.clear();
+    }
+
+    public void copy(NodeOptInfo other) {
+        length.copy(other.length);
+        anchor.copy(other.anchor);
+        exb.copy(other.exb);
+        exm.copy(other.exm);
+        expr.copy(other.expr);
+        map.copy(other.map);
+    }
+
+    public void concatLeftNode(NodeOptInfo other) {
+        OptAnchorInfo tanchor = new OptAnchorInfo(); // remove it somehow ?
+        tanchor.concat(anchor, other.anchor, length.max, other.length.max);
+        anchor.copy(tanchor);
+
+        if (other.exb.length > 0 && length.max == 0) {
+            tanchor.concat(anchor, other.exb.anchor, length.max, other.length.max);
+            other.exb.anchor.copy(tanchor);
+        }
+
+        if (other.map.value > 0 && length.max == 0) {
+            if (other.map.mmd.max == 0) {
+                other.map.anchor.leftAnchor |= anchor.leftAnchor;
+            }
+        }
+
+        boolean exbReach = exb.reachEnd;
+        boolean exmReach = exm.reachEnd;
+
+        if (other.length.max != 0) {
+            exb.reachEnd = exm.reachEnd = false;
+        }
+
+        if (other.exb.length > 0) {
+            if (exbReach) {
+                exb.concat(other.exb);
+                other.exb.clear();
+            } else if (exmReach) {
+                exm.concat(other.exb);
+                other.exb.clear();
+            }
+        }
+
+        exm.select(other.exb);
+        exm.select(other.exm);
+
+        if (expr.length > 0) {
+            if (other.length.max > 0) {
+                // TODO: make sure it is not an Oniguruma bug (casting unsigned int to int for arithmetic comparison)
+                int otherLengthMax = other.length.max;
+                if (otherLengthMax == MinMaxLen.INFINITE_DISTANCE) otherLengthMax = -1;
+                if (expr.length > otherLengthMax) expr.length = otherLengthMax;
+                if (expr.mmd.max == 0) {
+                    exb.select(expr);
+                } else {
+                    exm.select(expr);
+                }
+            }
+        } else if (other.expr.length > 0) {
+            expr.copy(other.expr);
+        }
+
+        map.select(other.map);
+        length.add(other.length);
+    }
+
+    public void altMerge(NodeOptInfo other, OptEnvironment env) {
+        anchor.altMerge(other.anchor);
+        exb.altMerge(other.exb, env);
+        exm.altMerge(other.exm, env);
+        expr.altMerge(other.expr, env);
+        map.altMerge(other.map);
+        length.altMerge(other.length);
+    }
+
+    public void setBound(MinMaxLen mmd) {
+        exb.mmd.copy(mmd);
+        expr.mmd.copy(mmd);
+        map.mmd.copy(mmd);
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/OptAnchorInfo.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/OptAnchorInfo.java
new file mode 100644
index 00000000000..4ed24e0b84f
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/OptAnchorInfo.java
@@ -0,0 +1,92 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni;
+
+import jdk.nashorn.internal.runtime.regexp.joni.constants.AnchorType;
+
+final class OptAnchorInfo implements AnchorType {
+    int leftAnchor;
+    int rightAnchor;
+
+    void clear() {
+        leftAnchor = rightAnchor = 0;
+    }
+
+    void copy(OptAnchorInfo other) {
+        leftAnchor = other.leftAnchor;
+        rightAnchor = other.rightAnchor;
+    }
+
+    void concat(OptAnchorInfo left, OptAnchorInfo right, int leftLength, int rightLength) {
+        leftAnchor = left.leftAnchor;
+        if (leftLength == 0) leftAnchor |= right.leftAnchor;
+
+        rightAnchor = right.rightAnchor;
+        if (rightLength == 0) rightAnchor |= left.rightAnchor;
+    }
+
+    boolean isSet(int anchor) {
+        if ((leftAnchor & anchor) != 0) return true;
+        return (rightAnchor & anchor) != 0;
+    }
+
+    void add(int anchor) {
+        if (isLeftAnchor(anchor)) {
+            leftAnchor |= anchor;
+        } else {
+            rightAnchor |= anchor;
+        }
+    }
+
+    void remove(int anchor) {
+        if (isLeftAnchor(anchor)) {
+            leftAnchor &= ~anchor;
+        } else {
+            rightAnchor &= ~anchor;
+        }
+    }
+
+    void altMerge(OptAnchorInfo other) {
+        leftAnchor &= other.leftAnchor;
+        rightAnchor &= other.rightAnchor;
+    }
+
+    static boolean isLeftAnchor(int anchor) { // make a mask for it ?
+        return !(anchor == END_BUF || anchor == SEMI_END_BUF ||
+                 anchor == END_LINE || anchor == PREC_READ ||
+                 anchor == PREC_READ_NOT);
+    }
+
+    static String anchorToString(int anchor) {
+        StringBuffer s = new StringBuffer("[");
+
+        if ((anchor & AnchorType.BEGIN_BUF) !=0 ) s.append("begin-buf ");
+        if ((anchor & AnchorType.BEGIN_LINE) !=0 ) s.append("begin-line ");
+        if ((anchor & AnchorType.BEGIN_POSITION) !=0 ) s.append("begin-pos ");
+        if ((anchor & AnchorType.END_BUF) !=0 ) s.append("end-buf ");
+        if ((anchor & AnchorType.SEMI_END_BUF) !=0 ) s.append("semi-end-buf ");
+        if ((anchor & AnchorType.END_LINE) !=0 ) s.append("end-line ");
+        if ((anchor & AnchorType.ANYCHAR_STAR) !=0 ) s.append("anychar-star ");
+        if ((anchor & AnchorType.ANYCHAR_STAR_ML) !=0 ) s.append("anychar-star-pl ");
+        s.append("]");
+
+        return s.toString();
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/OptEnvironment.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/OptEnvironment.java
new file mode 100644
index 00000000000..8c75e03d091
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/OptEnvironment.java
@@ -0,0 +1,35 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni;
+
+// remove this one in future and pass mmd directly
+final class OptEnvironment {
+    final MinMaxLen mmd = new MinMaxLen();
+    int options;
+    int caseFoldFlag;
+    ScanEnvironment scanEnv;
+
+    void copy(OptEnvironment other) {
+        mmd.copy(other.mmd);
+        options = other.options;
+        caseFoldFlag = other.caseFoldFlag;
+        scanEnv = other.scanEnv;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/OptExactInfo.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/OptExactInfo.java
new file mode 100644
index 00000000000..f7992a3291c
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/OptExactInfo.java
@@ -0,0 +1,153 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni;
+
+final class OptExactInfo {
+    static final int OPT_EXACT_MAXLEN = 24;
+
+    final MinMaxLen mmd = new MinMaxLen();
+    final OptAnchorInfo anchor = new OptAnchorInfo();
+
+    boolean reachEnd;
+    boolean ignoreCase;
+
+    final char chars[] = new char[OPT_EXACT_MAXLEN];
+    int length;
+
+    boolean isFull() {
+        return length >= OPT_EXACT_MAXLEN;
+    }
+
+    void clear() {
+        mmd.clear();
+        anchor.clear();
+
+        reachEnd = false;
+        ignoreCase = false;
+        length = 0;
+    }
+
+    void copy(OptExactInfo other) {
+        mmd.copy(other.mmd);
+        anchor.copy(other.anchor);
+        reachEnd = other.reachEnd;
+        ignoreCase = other.ignoreCase;
+        length = other.length;
+
+        System.arraycopy(other.chars, 0, chars, 0, OPT_EXACT_MAXLEN);
+    }
+
+    void concat(OptExactInfo other) {
+        if (!ignoreCase && other.ignoreCase) {
+            if (length >= other.length) return; /* avoid */
+            ignoreCase = true;
+        }
+
+        int p = 0; // add->s;
+        int end = p + other.length;
+
+        int i;
+        for (i = length; p < end;) {
+            if (i + 1 > OPT_EXACT_MAXLEN) break;
+            chars[i++] = other.chars[p++];
+        }
+
+        length = i;
+        reachEnd = (p == end ? other.reachEnd : false);
+
+        OptAnchorInfo tmp = new OptAnchorInfo();
+        tmp.concat(anchor, other.anchor, 1, 1);
+        if (!other.reachEnd) tmp.rightAnchor = 0;
+        anchor.copy(tmp);
+    }
+
+    // ?? raw is not used here
+    void concatStr(char[] lchars, int p, int end, boolean raw) {
+        int i;
+        for (i = length; p < end && i < OPT_EXACT_MAXLEN;) {
+            if (i + 1 > OPT_EXACT_MAXLEN) break;
+            chars[i++] = lchars[p++];
+        }
+
+        length = i;
+    }
+
+    void altMerge(OptExactInfo other, OptEnvironment env) {
+        if (other.length == 0 || length == 0) {
+            clear();
+            return;
+        }
+
+        if (!mmd.equal(other.mmd)) {
+            clear();
+            return;
+        }
+
+        int i;
+        for (i = 0; i < length && i < other.length; i++) {
+            if (chars[i] != other.chars[i]) break;
+        }
+
+        if (!other.reachEnd || i<other.length || i<length) reachEnd = false;
+
+        length = i;
+        ignoreCase |= other.ignoreCase;
+
+        anchor.altMerge(other.anchor);
+
+        if (!reachEnd) anchor.rightAnchor = 0;
+    }
+
+
+    void select(OptExactInfo alt) {
+        int v1 = length;
+        int v2 = alt.length;
+
+        if (v2 == 0) {
+            return;
+        } else if (v1 == 0) {
+            copy(alt);
+            return;
+        } else if (v1 <= 2 && v2 <= 2) {
+            /* ByteValTable[x] is big value --> low price */
+            v2 = OptMapInfo.positionValue(chars[0] & 0xff);
+            v1 = OptMapInfo.positionValue(alt.chars[0] & 0xff);
+
+            if (length > 1) v1 += 5;
+            if (alt.length > 1) v2 += 5;
+        }
+
+        if (!ignoreCase) v1 *= 2;
+        if (!alt.ignoreCase) v2 *= 2;
+
+        if (mmd.compareDistanceValue(alt.mmd, v1, v2) > 0) copy(alt);
+    }
+
+    // comp_opt_exact_or_map_info
+    private static final int COMP_EM_BASE   = 20;
+    int compare(OptMapInfo m) {
+        if (m.value <= 0) return -1;
+
+        int ve = COMP_EM_BASE * length * (ignoreCase ? 1 : 2);
+        int vm = COMP_EM_BASE * 5 * 2 / m.value;
+
+        return mmd.compareDistanceValue(m.mmd, ve, vm);
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/OptMapInfo.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/OptMapInfo.java
new file mode 100644
index 00000000000..9cf6a50db9f
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/OptMapInfo.java
@@ -0,0 +1,120 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni;
+
+final class OptMapInfo {
+
+    final MinMaxLen mmd = new MinMaxLen();          /* info position */
+    final OptAnchorInfo anchor = new OptAnchorInfo();
+
+    int value;                                      /* weighted value */
+    final byte map[] = new byte[Config.CHAR_TABLE_SIZE];
+
+    void clear() {
+        mmd.clear();
+        anchor.clear();
+        value = 0;
+        for (int i=0; i<map.length; i++) map[i] = 0;
+    }
+
+    void copy(OptMapInfo other) {
+        mmd.copy(other.mmd);
+        anchor.copy(other.anchor);
+        value = other.value;
+        //for(int i=0; i<map.length; i++) map[i] = other.map[i];
+        System.arraycopy(other.map, 0, map, 0, other.map.length);
+    }
+
+    void addChar(int c) {
+        int c_ = c & 0xff;
+        if (map[c_] == 0) {
+            map[c_] = 1;
+            value += positionValue(c_);
+        }
+    }
+
+    void addCharAmb(char[] chars, int p, int end, int caseFoldFlag) {
+        addChar(chars[p]);
+
+        caseFoldFlag &= ~Config.INTERNAL_ENC_CASE_FOLD_MULTI_CHAR;
+        char[]items = EncodingHelper.caseFoldCodesByString(caseFoldFlag, chars[p]);
+
+        for (int i=0; i<items.length; i++) {
+            addChar(items[i]);
+        }
+    }
+
+    // select_opt_map_info
+    private static final int z = 1<<15; /* 32768: something big value */
+    void select(OptMapInfo alt) {
+        if (alt.value == 0) return;
+        if (value == 0) {
+            copy(alt);
+            return;
+        }
+
+        int v1 = z / value;
+        int v2 = z /alt.value;
+
+        if (mmd.compareDistanceValue(alt.mmd, v1, v2) > 0) copy(alt);
+    }
+
+    // alt_merge_opt_map_info
+    void altMerge(OptMapInfo other) {
+        /* if (! is_equal_mml(&to->mmd, &add->mmd)) return ; */
+        if (value == 0) return;
+        if (other.value == 0 || mmd.max < other.mmd.max) {
+            clear();
+            return;
+        }
+
+        mmd.altMerge(other.mmd);
+
+        int val = 0;
+        for (int i=0; i<Config.CHAR_TABLE_SIZE; i++) {
+            if (other.map[i] != 0) map[i] = 1;
+            if (map[i] != 0) val += positionValue(i);
+        }
+
+        value = val;
+        anchor.altMerge(other.anchor);
+    }
+
+    static final short ByteValTable[] = {
+        5,  1,  1,  1,  1,  1,  1,  1,  1, 10, 10,  1,  1, 10,  1,  1,
+        1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+       12,  4,  7,  4,  4,  4,  4,  4,  4,  5,  5,  5,  5,  5,  5,  5,
+        6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  5,  5,  5,  5,  5,  5,
+        5,  6,  6,  6,  6,  7,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,
+        6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  5,  6,  5,  5,  5,
+        5,  6,  6,  6,  6,  7,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,
+        6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  5,  5,  5,  5,  1
+     };
+
+    // map_position_value
+    static int positionValue(int i) {
+        if (i < ByteValTable.length) {
+            return ByteValTable[i];
+        } else {
+            return 4; /* Take it easy. */
+        }
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Option.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Option.java
new file mode 100644
index 00000000000..26f3e560c5b
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Option.java
@@ -0,0 +1,122 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni;
+
+public class Option {
+
+    /* options */
+    public static final int NONE                 = 0;
+    public static final int IGNORECASE           = (1<<0);
+    public static final int EXTEND               = (1<<1);
+    public static final int MULTILINE            = (1<<2);
+    public static final int SINGLELINE           = (1<<3);
+    public static final int FIND_LONGEST         = (1<<4);
+    public static final int FIND_NOT_EMPTY       = (1<<5);
+    public static final int NEGATE_SINGLELINE    = (1<<6);
+    public static final int DONT_CAPTURE_GROUP   = (1<<7);
+    public static final int CAPTURE_GROUP        = (1<<8);
+
+    /* options (search time) */
+    public static final int NOTBOL               = (1<<9);
+    public static final int NOTEOL               = (1<<10);
+    public static final int POSIX_REGION         = (1<<11);
+    public static final int MAXBIT               = (1<<12); /* limit */
+
+    public static final int DEFAULT              = NONE;
+
+    public static String toString(int option) {
+        String options = "";
+        if (isIgnoreCase(option)) options += "IGNORECASE ";
+        if (isExtend(option)) options += "EXTEND ";
+        if (isMultiline(option)) options += "MULTILINE ";
+        if (isSingleline(option)) options += "SINGLELINE ";
+        if (isFindLongest(option)) options += "FIND_LONGEST ";
+        if (isFindNotEmpty(option)) options += "FIND_NOT_EMPTY  ";
+        if (isNegateSingleline(option)) options += "NEGATE_SINGLELINE ";
+        if (isDontCaptureGroup(option)) options += "DONT_CAPTURE_GROUP ";
+        if (isCaptureGroup(option)) options += "CAPTURE_GROUP ";
+
+        if (isNotBol(option)) options += "NOTBOL ";
+        if (isNotEol(option)) options += "NOTEOL ";
+        if (isPosixRegion(option)) options += "POSIX_REGION ";
+
+        return options;
+    }
+
+    public static boolean isIgnoreCase(int option) {
+        return (option & IGNORECASE) != 0;
+    }
+
+    public static boolean isExtend(int option) {
+        return (option & EXTEND) != 0;
+    }
+
+    public static boolean isSingleline(int option) {
+        return (option & SINGLELINE) != 0;
+    }
+
+    public static boolean isMultiline(int option) {
+        return (option & MULTILINE) != 0;
+    }
+
+    public static boolean isFindLongest(int option) {
+        return (option & FIND_LONGEST) != 0;
+    }
+
+    public static boolean isFindNotEmpty(int option) {
+        return (option & FIND_NOT_EMPTY) != 0;
+    }
+
+    public static boolean isFindCondition(int option) {
+        return (option & (FIND_LONGEST | FIND_NOT_EMPTY)) != 0;
+    }
+
+    public static boolean isNegateSingleline(int option) {
+        return (option & NEGATE_SINGLELINE) != 0;
+    }
+
+    public static boolean isDontCaptureGroup(int option) {
+        return (option & DONT_CAPTURE_GROUP) != 0;
+    }
+
+    public static boolean isCaptureGroup(int option) {
+        return (option & CAPTURE_GROUP) != 0;
+    }
+
+    public static boolean isNotBol(int option) {
+        return (option & NOTBOL) != 0;
+    }
+
+    public static boolean isNotEol(int option) {
+        return (option & NOTEOL) != 0;
+    }
+
+    public static boolean isPosixRegion(int option) {
+        return (option & POSIX_REGION) != 0;
+    }
+
+    /* OP_SET_OPTION is required for these options.  ??? */
+    //    public static boolean isDynamic(int option) {
+    //        return (option & (MULTILINE | IGNORECASE)) != 0;
+    //    }
+    public static boolean isDynamic(int option) {
+        return false;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Parser.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Parser.java
new file mode 100644
index 00000000000..1b5a5861002
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Parser.java
@@ -0,0 +1,953 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni;
+
+import static jdk.nashorn.internal.runtime.regexp.joni.BitStatus.bsOnAtSimple;
+import static jdk.nashorn.internal.runtime.regexp.joni.BitStatus.bsOnOff;
+import static jdk.nashorn.internal.runtime.regexp.joni.Option.isDontCaptureGroup;
+import static jdk.nashorn.internal.runtime.regexp.joni.Option.isIgnoreCase;
+
+import jdk.nashorn.internal.runtime.regexp.joni.encoding.CharacterType;
+import jdk.nashorn.internal.runtime.regexp.joni.encoding.PosixBracket;
+import jdk.nashorn.internal.runtime.regexp.joni.encoding.Ptr;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.AnchorNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.AnyCharNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.BackRefNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.CClassNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.CTypeNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.CallNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.ConsAltNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.EncloseNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.Node;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.QuantifierNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.StringNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.CClassNode.CCStateArg;
+import jdk.nashorn.internal.runtime.regexp.joni.constants.AnchorType;
+import jdk.nashorn.internal.runtime.regexp.joni.constants.CCSTATE;
+import jdk.nashorn.internal.runtime.regexp.joni.constants.CCVALTYPE;
+import jdk.nashorn.internal.runtime.regexp.joni.constants.EncloseType;
+import jdk.nashorn.internal.runtime.regexp.joni.constants.NodeType;
+import jdk.nashorn.internal.runtime.regexp.joni.constants.TokenType;
+
+class Parser extends Lexer {
+
+    protected final Regex regex;
+    protected Node root;
+
+    protected int returnCode; // return code used by parser methods (they itself return parsed nodes)
+                              // this approach will not affect recursive calls
+
+    protected Parser(ScanEnvironment env, char[] chars, int p, int end) {
+        super(env, chars, p, end);
+        regex = env.reg;
+    }
+
+    // onig_parse_make_tree
+    protected final Node parse() {
+        root = parseRegexp();
+        regex.numMem = env.numMem;
+        return root;
+    }
+
+    private static final int POSIX_BRACKET_NAME_MIN_LEN            = 4;
+    private static final int POSIX_BRACKET_CHECK_LIMIT_LENGTH      = 20;
+    private static final char BRACKET_END[]                        = ":]".toCharArray();
+    private boolean parsePosixBracket(CClassNode cc) {
+        mark();
+
+        boolean not;
+        if (peekIs('^')) {
+            inc();
+            not = true;
+        } else {
+            not = false;
+        }
+        if (stop - p >= POSIX_BRACKET_NAME_MIN_LEN + 3) { // else goto not_posix_bracket
+            char[][] pbs = PosixBracket.PBSNamesLower;
+            for (int i=0; i<pbs.length; i++) {
+                char[] name = pbs[i];
+                // hash lookup here ?
+                if (EncodingHelper.strNCmp(chars, p, stop, name, 0, name.length) == 0) {
+                    p += name.length;
+                    if (EncodingHelper.strNCmp(chars, p, stop, BRACKET_END, 0, BRACKET_END.length) != 0) {
+                        newSyntaxException(ERR_INVALID_POSIX_BRACKET_TYPE);
+                    }
+                    cc.addCType(PosixBracket.PBSValues[i], not, env, this);
+                    inc();
+                    inc();
+                    return false;
+                }
+            }
+
+        }
+
+        // not_posix_bracket:
+        c = 0;
+        int i= 0;
+        while (left() && ((c=peek()) != ':') && c != ']') {
+            inc();
+            if (++i > POSIX_BRACKET_CHECK_LIMIT_LENGTH) break;
+        }
+
+        if (c == ':' && left()) {
+            inc();
+            if (left()) {
+                fetch();
+                if (c == ']') newSyntaxException(ERR_INVALID_POSIX_BRACKET_TYPE);
+            }
+        }
+        restore();
+        return true; /* 1: is not POSIX bracket, but no error. */
+    }
+
+    private CClassNode parseCharProperty() {
+        int ctype = fetchCharPropertyToCType();
+        CClassNode n = new CClassNode();
+        n.addCType(ctype, false, env, this);
+        if (token.getPropNot()) n.setNot();
+        return n;
+    }
+
+    private boolean codeExistCheck(int code, boolean ignoreEscaped) {
+        mark();
+
+        boolean inEsc = false;
+        while (left()) {
+            if (ignoreEscaped && inEsc) {
+                inEsc = false;
+            } else {
+                fetch();
+                if (c == code) {
+                    restore();
+                    return true;
+                }
+                if (c == syntax.metaCharTable.esc) inEsc = true;
+            }
+        }
+
+        restore();
+        return false;
+    }
+
+    private CClassNode parseCharClass() {
+        fetchTokenInCC();
+
+        final boolean neg;
+        if (token.type == TokenType.CHAR && token.getC() == '^' && !token.escaped) {
+            neg = true;
+            fetchTokenInCC();
+        } else {
+            neg = false;
+        }
+
+        if (token.type == TokenType.CC_CLOSE) {
+            if (!codeExistCheck(']', true)) newSyntaxException(ERR_EMPTY_CHAR_CLASS);
+            env.ccEscWarn("]");
+            token.type = TokenType.CHAR; /* allow []...] */
+        }
+
+        CClassNode cc = new CClassNode();
+        CClassNode prevCC = null;
+        CClassNode workCC = null;
+
+        CCStateArg arg = new CCStateArg();
+
+        boolean andStart = false;
+        arg.state = CCSTATE.START;
+
+        while (token.type != TokenType.CC_CLOSE) {
+            boolean fetched = false;
+
+            switch (token.type) {
+
+            case CHAR:
+                if (token.getC() > 0xff) {
+                    arg.inType = CCVALTYPE.CODE_POINT;
+                } else {
+                    arg.inType = CCVALTYPE.SB; // sb_char:
+                }
+                arg.v = token.getC();
+                arg.vIsRaw = false;
+                parseCharClassValEntry2(cc, arg); // goto val_entry2
+                break;
+
+            case RAW_BYTE:
+                if (token.base != 0) { /* tok->base != 0 : octal or hexadec. */
+                    byte[] buf = new byte[4];
+                    int psave = p;
+                    int base = token.base;
+                    buf[0] = (byte)token.getC();
+                    int i;
+                    for (i=1; i<4; i++) {
+                        fetchTokenInCC();
+                        if (token.type != TokenType.RAW_BYTE || token.base != base) {
+                            fetched = true;
+                            break;
+                        }
+                        buf[i] = (byte)token.getC();
+                    }
+
+                    if (i == 1) {
+                        arg.v = buf[0] & 0xff;
+                        arg.inType = CCVALTYPE.SB; // goto raw_single
+                    } else {
+                        arg.v = EncodingHelper.mbcToCode(buf, 0, buf.length);
+                        arg.inType = CCVALTYPE.CODE_POINT;
+                    }
+                } else {
+                    arg.v = token.getC();
+                    arg.inType = CCVALTYPE.SB; // raw_single:
+                }
+                arg.vIsRaw = true;
+                parseCharClassValEntry2(cc, arg); // goto val_entry2
+                break;
+
+            case CODE_POINT:
+                arg.v = token.getCode();
+                arg.vIsRaw = true;
+                parseCharClassValEntry(cc, arg); // val_entry:, val_entry2
+                break;
+
+            case POSIX_BRACKET_OPEN:
+                if (parsePosixBracket(cc)) { /* true: is not POSIX bracket */
+                    env.ccEscWarn("[");
+                    p = token.backP;
+                    arg.v = token.getC();
+                    arg.vIsRaw = false;
+                    parseCharClassValEntry(cc, arg); // goto val_entry
+                    break;
+                }
+                cc.nextStateClass(arg, env); // goto next_class
+                break;
+
+            case CHAR_TYPE:
+                cc.addCType(token.getPropCType(), token.getPropNot(), env, this);
+                cc.nextStateClass(arg, env); // next_class:
+                break;
+
+            case CHAR_PROPERTY:
+                int ctype = fetchCharPropertyToCType();
+                cc.addCType(ctype, token.getPropNot(), env, this);
+                cc.nextStateClass(arg, env); // goto next_class
+                break;
+
+            case CC_RANGE:
+                if (arg.state == CCSTATE.VALUE) {
+                    fetchTokenInCC();
+                    fetched = true;
+                    if (token.type == TokenType.CC_CLOSE) { /* allow [x-] */
+                        parseCharClassRangeEndVal(cc, arg); // range_end_val:, goto val_entry;
+                        break;
+                    } else if (token.type == TokenType.CC_AND) {
+                        env.ccEscWarn("-");
+                        parseCharClassRangeEndVal(cc, arg); // goto range_end_val
+                        break;
+                    }
+                    arg.state = CCSTATE.RANGE;
+                } else if (arg.state == CCSTATE.START) {
+                    arg.v = token.getC(); /* [-xa] is allowed */
+                    arg.vIsRaw = false;
+                    fetchTokenInCC();
+                    fetched = true;
+                    if (token.type == TokenType.CC_RANGE || andStart) env.ccEscWarn("-"); /* [--x] or [a&&-x] is warned. */
+                    parseCharClassValEntry(cc, arg); // goto val_entry
+                    break;
+                } else if (arg.state == CCSTATE.RANGE) {
+                    env.ccEscWarn("-");
+                    parseCharClassSbChar(cc, arg); // goto sb_char /* [!--x] is allowed */
+                    break;
+                } else { /* CCS_COMPLETE */
+                    fetchTokenInCC();
+                    fetched = true;
+                    if (token.type == TokenType.CC_CLOSE) { /* allow [a-b-] */
+                        parseCharClassRangeEndVal(cc, arg); // goto range_end_val
+                        break;
+                    } else if (token.type == TokenType.CC_AND) {
+                        env.ccEscWarn("-");
+                        parseCharClassRangeEndVal(cc, arg); // goto range_end_val
+                        break;
+                    }
+
+                    if (syntax.allowDoubleRangeOpInCC()) {
+                        env.ccEscWarn("-");
+                        parseCharClassSbChar(cc, arg); // goto sb_char /* [0-9-a] is allowed as [0-9\-a] */
+                        break;
+                    }
+                    newSyntaxException(ERR_UNMATCHED_RANGE_SPECIFIER_IN_CHAR_CLASS);
+                }
+                break;
+
+            case CC_CC_OPEN: /* [ */
+                CClassNode acc = parseCharClass();
+                cc.or(acc);
+                break;
+
+            case CC_AND:     /* && */
+                if (arg.state == CCSTATE.VALUE) {
+                    arg.v = 0; // ??? safe v ?
+                    arg.vIsRaw = false;
+                    cc.nextStateValue(arg, env);
+                }
+                /* initialize local variables */
+                andStart = true;
+                arg.state = CCSTATE.START;
+                if (prevCC != null) {
+                    prevCC.and(cc);
+                } else {
+                    prevCC = cc;
+                    if (workCC == null) workCC = new CClassNode();
+                    cc = workCC;
+                }
+                cc.clear();
+                break;
+
+            case EOT:
+                newSyntaxException(ERR_PREMATURE_END_OF_CHAR_CLASS);
+
+            default:
+                newInternalException(ERR_PARSER_BUG);
+            } // switch
+
+            if (!fetched) fetchTokenInCC();
+
+        } // while
+
+        if (arg.state == CCSTATE.VALUE) {
+            arg.v = 0; // ??? safe v ?
+            arg.vIsRaw = false;
+            cc.nextStateValue(arg, env);
+        }
+
+        if (prevCC != null) {
+            prevCC.and(cc);
+            cc = prevCC;
+        }
+
+        if (neg) {
+            cc.setNot();
+        } else {
+            cc.clearNot();
+        }
+
+        if (cc.isNot() && syntax.notNewlineInNegativeCC()) {
+            if (!cc.isEmpty()) {
+                final int NEW_LINE = 0x0a;
+                if (EncodingHelper.isNewLine(NEW_LINE)) {
+                    cc.bs.set(NEW_LINE);
+                }
+            }
+        }
+
+        return cc;
+    }
+
+    private void parseCharClassSbChar(CClassNode cc, CCStateArg arg) {
+        arg.inType = CCVALTYPE.SB;
+        arg.v = token.getC();
+        arg.vIsRaw = false;
+        parseCharClassValEntry2(cc, arg); // goto val_entry2
+    }
+
+    private void parseCharClassRangeEndVal(CClassNode cc, CCStateArg arg) {
+        arg.v = '-';
+        arg.vIsRaw = false;
+        parseCharClassValEntry(cc, arg); // goto val_entry
+    }
+
+    private void parseCharClassValEntry(CClassNode cc, CCStateArg arg) {
+        arg.inType = arg.v <= 0xff ? CCVALTYPE.SB : CCVALTYPE.CODE_POINT;
+        parseCharClassValEntry2(cc, arg); // val_entry2:
+    }
+
+    private void parseCharClassValEntry2(CClassNode cc, CCStateArg arg) {
+        cc.nextStateValue(arg, env);
+    }
+
+    private Node parseEnclose(TokenType term) {
+        Node node = null;
+
+        if (!left()) newSyntaxException(ERR_END_PATTERN_WITH_UNMATCHED_PARENTHESIS);
+
+        int option = env.option;
+
+        if (peekIs('?') && syntax.op2QMarkGroupEffect()) {
+            inc();
+            if (!left()) newSyntaxException(ERR_END_PATTERN_IN_GROUP);
+
+            boolean listCapture = false;
+
+            fetch();
+            switch(c) {
+            case ':':  /* (?:...) grouping only */
+                fetchToken(); // group:
+                node = parseSubExp(term);
+                returnCode = 1; /* group */
+                return node;
+            case '=':
+                node = new AnchorNode(AnchorType.PREC_READ);
+                break;
+            case '!':  /*         preceding read */
+                node = new AnchorNode(AnchorType.PREC_READ_NOT);
+                break;
+            case '>':  /* (?>...) stop backtrack */
+                node = new EncloseNode(EncloseType.STOP_BACKTRACK); // node_new_enclose
+                break;
+            case '\'':
+                if (Config.USE_NAMED_GROUP) {
+                    if (syntax.op2QMarkLtNamedGroup()) {
+                        listCapture = false; // goto named_group1
+                        node = parseEncloseNamedGroup2(listCapture);
+                        break;
+                    } else {
+                        newSyntaxException(ERR_UNDEFINED_GROUP_OPTION);
+                    }
+                } // USE_NAMED_GROUP
+                break;
+            case '<':  /* look behind (?<=...), (?<!...) */
+                fetch();
+                if (c == '=') {
+                    node = new AnchorNode(AnchorType.LOOK_BEHIND);
+                } else if (c == '!') {
+                    node = new AnchorNode(AnchorType.LOOK_BEHIND_NOT);
+                } else {
+                    if (Config.USE_NAMED_GROUP) {
+                        if (syntax.op2QMarkLtNamedGroup()) {
+                            unfetch();
+                            c = '<';
+
+                            listCapture = false; // named_group1:
+                            node = parseEncloseNamedGroup2(listCapture); // named_group2:
+                            break;
+                        } else {
+                            newSyntaxException(ERR_UNDEFINED_GROUP_OPTION);
+                        }
+
+                    } else { // USE_NAMED_GROUP
+                        newSyntaxException(ERR_UNDEFINED_GROUP_OPTION);
+                    } // USE_NAMED_GROUP
+                }
+                break;
+            case '@':
+                if (syntax.op2AtMarkCaptureHistory()) {
+                    if (Config.USE_NAMED_GROUP) {
+                        if (syntax.op2QMarkLtNamedGroup()) {
+                            fetch();
+                            if (c == '<' || c == '\'') {
+                                listCapture = true;
+                                node = parseEncloseNamedGroup2(listCapture); // goto named_group2 /* (?@<name>...) */
+                            }
+                            unfetch();
+                        }
+                    } // USE_NAMED_GROUP
+                    EncloseNode en = new EncloseNode(env.option, false); // node_new_enclose_memory
+                    int num = env.addMemEntry();
+                    if (num >= BitStatus.BIT_STATUS_BITS_NUM) newValueException(ERR_GROUP_NUMBER_OVER_FOR_CAPTURE_HISTORY);
+                    en.regNum = num;
+                    node = en;
+                } else {
+                    newSyntaxException(ERR_UNDEFINED_GROUP_OPTION);
+                }
+                break;
+
+            // case 'p': #ifdef USE_POSIXLINE_OPTION
+            case '-':
+            case 'i':
+            case 'm':
+            case 's':
+            case 'x':
+                boolean neg = false;
+                while (true) {
+                    switch(c) {
+                    case ':':
+                    case ')':
+                        break;
+                    case '-':
+                        neg = true;
+                        break;
+                    case 'x':
+                        option = bsOnOff(option, Option.EXTEND, neg);
+                        break;
+                    case 'i':
+                        option = bsOnOff(option, Option.IGNORECASE, neg);
+                        break;
+                    case 's':
+                        if (syntax.op2OptionPerl()) {
+                            option = bsOnOff(option, Option.MULTILINE, neg);
+                        } else {
+                            newSyntaxException(ERR_UNDEFINED_GROUP_OPTION);
+                        }
+                        break;
+                    case 'm':
+                        if (syntax.op2OptionPerl()) {
+                            option = bsOnOff(option, Option.SINGLELINE, !neg);
+                        } else if (syntax.op2OptionRuby()) {
+                            option = bsOnOff(option, Option.MULTILINE, neg);
+                        } else {
+                            newSyntaxException(ERR_UNDEFINED_GROUP_OPTION);
+                        }
+                        break;
+                    // case 'p': #ifdef USE_POSIXLINE_OPTION // not defined
+                    // option = bsOnOff(option, Option.MULTILINE|Option.SINGLELINE, neg);
+                    // break;
+
+                    default:
+                        newSyntaxException(ERR_UNDEFINED_GROUP_OPTION);
+                    } // switch
+
+                    if (c == ')') {
+                        EncloseNode en = new EncloseNode(option, 0); // node_new_option
+                        node = en;
+                        returnCode = 2; /* option only */
+                        return node;
+                    } else if (c == ':') {
+                        int prev = env.option;
+                        env.option = option;
+                        fetchToken();
+                        Node target = parseSubExp(term);
+                        env.option = prev;
+                        EncloseNode en = new EncloseNode(option, 0); // node_new_option
+                        en.setTarget(target);
+                        node = en;
+                        returnCode = 0;
+                        return node;
+                    }
+                    if (!left()) newSyntaxException(ERR_END_PATTERN_IN_GROUP);
+                    fetch();
+                } // while
+
+            default:
+                newSyntaxException(ERR_UNDEFINED_GROUP_OPTION);
+            } // switch
+
+        } else {
+            if (isDontCaptureGroup(env.option)) {
+                fetchToken(); // goto group
+                node = parseSubExp(term);
+                returnCode = 1; /* group */
+                return node;
+            }
+            EncloseNode en = new EncloseNode(env.option, false); // node_new_enclose_memory
+            int num = env.addMemEntry();
+            en.regNum = num;
+            node = en;
+        }
+
+        fetchToken();
+        Node target = parseSubExp(term);
+
+        if (node.getType() == NodeType.ANCHOR) {
+            AnchorNode an = (AnchorNode) node;
+            an.setTarget(target);
+        } else {
+            EncloseNode en = (EncloseNode)node;
+            en.setTarget(target);
+            if (en.type == EncloseType.MEMORY) {
+                /* Don't move this to previous of parse_subexp() */
+                env.setMemNode(en.regNum, node);
+            }
+        }
+        returnCode = 0;
+        return node; // ??
+    }
+
+    private Node parseEncloseNamedGroup2(boolean listCapture) {
+        int nm = p;
+        int num = fetchName(c, false);
+        int nameEnd = value;
+        num = env.addMemEntry();
+        if (listCapture && num >= BitStatus.BIT_STATUS_BITS_NUM) newValueException(ERR_GROUP_NUMBER_OVER_FOR_CAPTURE_HISTORY);
+
+        regex.nameAdd(chars, nm, nameEnd, num, syntax);
+        EncloseNode en = new EncloseNode(env.option, true); // node_new_enclose_memory
+        en.regNum = num;
+
+        Node node = en;
+
+        if (listCapture) env.captureHistory = bsOnAtSimple(env.captureHistory, num);
+        env.numNamed++;
+        return node;
+    }
+
+    private int findStrPosition(int[]s, int n, int from, int to, Ptr nextChar) {
+        int x;
+        int q;
+        int p = from;
+        int i = 0;
+        while (p < to) {
+            x = chars[p];
+            q = p + 1;
+            if (x == s[0]) {
+                for (i=1; i<n && q<to; i++) {
+                    x = chars[q];
+                    if (x != s[i]) break;
+                    q++;
+                }
+                if (i >= n) {
+                    if (chars[nextChar.p] != 0) nextChar.p = q; // we may need zero term semantics...
+                    return p;
+                }
+            }
+            p = q;
+        }
+        return -1;
+    }
+
+    private Node parseExp(TokenType term) {
+        if (token.type == term) return StringNode.EMPTY; // goto end_of_token
+
+        Node node = null;
+        boolean group = false;
+
+        switch(token.type) {
+        case ALT:
+        case EOT:
+            return StringNode.EMPTY; // end_of_token:, node_new_empty
+
+        case SUBEXP_OPEN:
+            node = parseEnclose(TokenType.SUBEXP_CLOSE);
+            if (returnCode == 1) {
+                group = true;
+            } else if (returnCode == 2) { /* option only */
+                int prev = env.option;
+                EncloseNode en = (EncloseNode)node;
+                env.option = en.option;
+                fetchToken();
+                Node target = parseSubExp(term);
+                env.option = prev;
+                en.setTarget(target);
+                return node;
+            }
+            break;
+        case SUBEXP_CLOSE:
+            if (!syntax.allowUnmatchedCloseSubexp()) newSyntaxException(ERR_UNMATCHED_CLOSE_PARENTHESIS);
+            if (token.escaped) {
+                return parseExpTkRawByte(group); // goto tk_raw_byte
+            } else {
+                return parseExpTkByte(group); // goto tk_byte
+            }
+        case STRING:
+            return parseExpTkByte(group); // tk_byte:
+
+        case RAW_BYTE:
+            return parseExpTkRawByte(group); // tk_raw_byte:
+        case CODE_POINT:
+            char[] buf = new char[] {(char)token.getCode()};
+            // #ifdef NUMBERED_CHAR_IS_NOT_CASE_AMBIG ... // setRaw() #else
+            node = new StringNode(buf, 0, 1);
+            break;
+
+        case QUOTE_OPEN:
+            int[] endOp = new int[] {syntax.metaCharTable.esc, 'E'};
+            int qstart = p;
+            Ptr nextChar = new Ptr();
+            int qend = findStrPosition(endOp, endOp.length, qstart, stop, nextChar);
+            if (qend == -1) nextChar.p = qend = stop;
+            node = new StringNode(chars, qstart, qend);
+            p = nextChar.p;
+            break;
+
+        case CHAR_TYPE:
+            switch(token.getPropCType()) {
+            case CharacterType.D:
+            case CharacterType.S:
+            case CharacterType.W:
+                if (Config.NON_UNICODE_SDW) {
+                    CClassNode cc = new CClassNode();
+                    cc.addCType(token.getPropCType(), false, env, this);
+                    if (token.getPropNot()) cc.setNot();
+                    node = cc;
+                }
+                break;
+
+            case CharacterType.WORD:
+                node = new CTypeNode(token.getPropCType(), token.getPropNot());
+                break;
+
+            case CharacterType.SPACE:
+            case CharacterType.DIGIT:
+            case CharacterType.XDIGIT:
+                // #ifdef USE_SHARED_CCLASS_TABLE ... #endif
+                CClassNode ccn = new CClassNode();
+                ccn.addCType(token.getPropCType(), false, env, this);
+                if (token.getPropNot()) ccn.setNot();
+                node = ccn;
+                break;
+
+            default:
+                newInternalException(ERR_PARSER_BUG);
+
+            } // inner switch
+            break;
+
+        case CHAR_PROPERTY:
+            node = parseCharProperty();
+            break;
+
+        case CC_CC_OPEN:
+            CClassNode cc = parseCharClass();
+            node = cc;
+            if (isIgnoreCase(env.option)) {
+                ApplyCaseFoldArg arg = new ApplyCaseFoldArg(env, cc);
+                EncodingHelper.applyAllCaseFold(env.caseFoldFlag, ApplyCaseFold.INSTANCE, arg);
+
+                if (arg.altRoot != null) {
+                    node = ConsAltNode.newAltNode(node, arg.altRoot);
+                }
+            }
+            break;
+
+        case ANYCHAR:
+            node = new AnyCharNode();
+            break;
+
+        case ANYCHAR_ANYTIME:
+            node = new AnyCharNode();
+            QuantifierNode qn = new QuantifierNode(0, QuantifierNode.REPEAT_INFINITE, false);
+            qn.setTarget(node);
+            node = qn;
+            break;
+
+        case BACKREF:
+            int[]backRefs = token.getBackrefNum() > 1 ? token.getBackrefRefs() : new int[]{token.getBackrefRef1()};
+            node = new BackRefNode(token.getBackrefNum(),
+                            backRefs,
+                            token.getBackrefByName(),
+                            token.getBackrefExistLevel(), // #ifdef USE_BACKREF_AT_LEVEL
+                            token.getBackrefLevel(),      // ...
+                            env);
+
+            break;
+
+        case CALL:
+            if (Config.USE_SUBEXP_CALL) {
+                int gNum = token.getCallGNum();
+
+                if (gNum < 0) {
+                    gNum = backrefRelToAbs(gNum);
+                    if (gNum <= 0) newValueException(ERR_INVALID_BACKREF);
+                }
+                node = new CallNode(chars, token.getCallNameP(), token.getCallNameEnd(), gNum);
+                env.numCall++;
+            } // USE_SUBEXP_CALL
+            break;
+
+        case ANCHOR:
+            node = new AnchorNode(token.getAnchor()); // possible bug in oniguruma
+            break;
+
+        case OP_REPEAT:
+        case INTERVAL:
+            if (syntax.contextIndepRepeatOps()) {
+                if (syntax.contextInvalidRepeatOps()) {
+                    newSyntaxException(ERR_TARGET_OF_REPEAT_OPERATOR_NOT_SPECIFIED);
+                } else {
+                    node = StringNode.EMPTY; // node_new_empty
+                }
+            } else {
+                return parseExpTkByte(group); // goto tk_byte
+            }
+            break;
+
+        default:
+            newInternalException(ERR_PARSER_BUG);
+        } //switch
+
+        //targetp = node;
+
+        fetchToken(); // re_entry:
+
+        return parseExpRepeat(node, group); // repeat:
+    }
+
+    private Node parseExpTkByte(boolean group) {
+        StringNode node = new StringNode(chars, token.backP, p); // tk_byte:
+        while (true) {
+            fetchToken();
+            if (token.type != TokenType.STRING) break;
+
+            if (token.backP == node.end) {
+                node.end = p; // non escaped character, remain shared, just increase shared range
+            } else {
+                node.cat(chars, token.backP, p); // non continuous string stream, need to COW
+            }
+        }
+        // targetp = node;
+        return parseExpRepeat(node, group); // string_end:, goto repeat
+    }
+
+    private Node parseExpTkRawByte(boolean group) {
+        // tk_raw_byte:
+
+        // important: we don't use 0xff mask here neither in the compiler
+        // (in the template string) so we won't have to mask target
+        // strings when comparing against them in the matcher
+        StringNode node = new StringNode((char)token.getC());
+        node.setRaw();
+
+        int len = 1;
+        while (true) {
+            if (len >= 1) {
+                if (len == 1) {
+                    fetchToken();
+                    node.clearRaw();
+                    // !goto string_end;!
+                    return parseExpRepeat(node, group);
+                }
+            }
+
+            fetchToken();
+            if (token.type != TokenType.RAW_BYTE) {
+                /* Don't use this, it is wrong for little endian encodings. */
+                // USE_PAD_TO_SHORT_BYTE_CHAR ...
+
+                newValueException(ERR_TOO_SHORT_MULTI_BYTE_STRING);
+            }
+
+            // important: we don't use 0xff mask here neither in the compiler
+            // (in the template string) so we won't have to mask target
+            // strings when comparing against them in the matcher
+            node.cat((char)token.getC());
+            len++;
+        } // while
+    }
+
+    private Node parseExpRepeat(Node target, boolean group) {
+        while (token.type == TokenType.OP_REPEAT || token.type == TokenType.INTERVAL) { // repeat:
+            if (target.isInvalidQuantifier()) newSyntaxException(ERR_TARGET_OF_REPEAT_OPERATOR_INVALID);
+
+            QuantifierNode qtfr = new QuantifierNode(token.getRepeatLower(),
+                                                     token.getRepeatUpper(),
+                                                     token.type == TokenType.INTERVAL);
+
+            qtfr.greedy = token.getRepeatGreedy();
+            int ret = qtfr.setQuantifier(target, group, env, chars, getBegin(), getEnd());
+            Node qn = qtfr;
+
+            if (token.getRepeatPossessive()) {
+                EncloseNode en = new EncloseNode(EncloseType.STOP_BACKTRACK); // node_new_enclose
+                en.setTarget(qn);
+                qn = en;
+            }
+
+            if (ret == 0) {
+                target = qn;
+            } else if (ret == 2) { /* split case: /abc+/ */
+                target = ConsAltNode.newListNode(target, null);
+                ConsAltNode tmp = ((ConsAltNode)target).setCdr(ConsAltNode.newListNode(qn, null));
+
+                fetchToken();
+                return parseExpRepeatForCar(target, tmp, group);
+            }
+            fetchToken(); // goto re_entry
+        }
+        return target;
+    }
+
+    private Node parseExpRepeatForCar(Node top, ConsAltNode target, boolean group) {
+        while (token.type == TokenType.OP_REPEAT || token.type == TokenType.INTERVAL) { // repeat:
+            if (target.car.isInvalidQuantifier()) newSyntaxException(ERR_TARGET_OF_REPEAT_OPERATOR_INVALID);
+
+            QuantifierNode qtfr = new QuantifierNode(token.getRepeatLower(),
+                                                     token.getRepeatUpper(),
+                                                     token.type == TokenType.INTERVAL);
+
+            qtfr.greedy = token.getRepeatGreedy();
+            int ret = qtfr.setQuantifier(target.car, group, env, chars, getBegin(), getEnd());
+            Node qn = qtfr;
+
+            if (token.getRepeatPossessive()) {
+                EncloseNode en = new EncloseNode(EncloseType.STOP_BACKTRACK); // node_new_enclose
+                en.setTarget(qn);
+                qn = en;
+            }
+
+            if (ret == 0) {
+                target.setCar(qn);
+            } else if (ret == 2) { /* split case: /abc+/ */
+                assert false;
+            }
+            fetchToken(); // goto re_entry
+        }
+        return top;
+    }
+
+    private Node parseBranch(TokenType term) {
+        Node node = parseExp(term);
+
+        if (token.type == TokenType.EOT || token.type == term || token.type == TokenType.ALT) {
+            return node;
+        } else {
+            ConsAltNode top = ConsAltNode.newListNode(node, null);
+            ConsAltNode t = top;
+
+            while (token.type != TokenType.EOT && token.type != term && token.type != TokenType.ALT) {
+                node = parseExp(term);
+                if (node.getType() == NodeType.LIST) {
+                    t.setCdr((ConsAltNode)node);
+                    while (((ConsAltNode)node).cdr != null ) node = ((ConsAltNode)node).cdr;
+
+                    t = ((ConsAltNode)node);
+                } else {
+                    t.setCdr(ConsAltNode.newListNode(node, null));
+                    t = t.cdr;
+                }
+            }
+            return top;
+        }
+    }
+
+    /* term_tok: TK_EOT or TK_SUBEXP_CLOSE */
+    private Node parseSubExp(TokenType term) {
+        Node node = parseBranch(term);
+
+        if (token.type == term) {
+            return node;
+        } else if (token.type == TokenType.ALT) {
+            ConsAltNode top = ConsAltNode.newAltNode(node, null);
+            ConsAltNode t = top;
+            while (token.type == TokenType.ALT) {
+                fetchToken();
+                node = parseBranch(term);
+
+                t.setCdr(ConsAltNode.newAltNode(node, null));
+                t = t.cdr;
+            }
+
+            if (token.type != term) parseSubExpError(term);
+            return top;
+        } else {
+            parseSubExpError(term);
+            return null; //not reached
+        }
+    }
+
+    private void parseSubExpError(TokenType term) {
+        if (term == TokenType.SUBEXP_CLOSE) {
+            newSyntaxException(ERR_END_PATTERN_WITH_UNMATCHED_PARENTHESIS);
+        } else {
+            newInternalException(ERR_PARSER_BUG);
+        }
+    }
+
+    private Node parseRegexp() {
+        fetchToken();
+        return parseSubExp(TokenType.EOT);
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Regex.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Regex.java
new file mode 100644
index 00000000000..ae98cb56cbc
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Regex.java
@@ -0,0 +1,413 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni;
+
+import static jdk.nashorn.internal.runtime.regexp.joni.BitStatus.bsAt;
+import static jdk.nashorn.internal.runtime.regexp.joni.Option.isCaptureGroup;
+import static jdk.nashorn.internal.runtime.regexp.joni.Option.isDontCaptureGroup;
+
+import java.util.HashMap;
+import java.util.Iterator;
+
+import jdk.nashorn.internal.runtime.regexp.joni.constants.AnchorType;
+import jdk.nashorn.internal.runtime.regexp.joni.constants.RegexState;
+import jdk.nashorn.internal.runtime.regexp.joni.exception.ErrorMessages;
+import jdk.nashorn.internal.runtime.regexp.joni.exception.InternalException;
+import jdk.nashorn.internal.runtime.regexp.joni.exception.ValueException;
+
+public final class Regex implements RegexState {
+
+    int[] code;             /* compiled pattern */
+    int codeLength;
+    boolean stackNeeded;
+    Object[]operands;       /* e.g. shared CClassNode */
+    int operandLength;
+
+    int state;              /* normal, searching, compiling */ // remove
+    int numMem;             /* used memory(...) num counted from 1 */
+    int numRepeat;          /* OP_REPEAT/OP_REPEAT_NG id-counter */
+    int numNullCheck;       /* OP_NULL_CHECK_START/END id counter */
+    int numCombExpCheck;    /* combination explosion check */
+    int numCall;            /* number of subexp call */
+    int captureHistory;     /* (?@...) flag (1-31) */
+    int btMemStart;         /* need backtrack flag */
+    int btMemEnd;           /* need backtrack flag */
+
+    int stackPopLevel;
+
+    int[]repeatRangeLo;
+    int[]repeatRangeHi;
+
+    public WarnCallback warnings;
+    public MatcherFactory factory;
+
+    int options;
+    int userOptions;
+    Object userObject;
+    //final Syntax syntax;
+    final int caseFoldFlag;
+
+    HashMap<String,NameEntry> nameTable;        // named entries
+
+    /* optimization info (string search, char-map and anchors) */
+    SearchAlgorithm searchAlgorithm;        /* optimize flag */
+    int thresholdLength;                    /* search str-length for apply optimize */
+    int anchor;                             /* BEGIN_BUF, BEGIN_POS, (SEMI_)END_BUF */
+    int anchorDmin;                         /* (SEMI_)END_BUF anchor distance */
+    int anchorDmax;                         /* (SEMI_)END_BUF anchor distance */
+    int subAnchor;                          /* start-anchor for exact or map */
+
+    char[] exact;
+    int exactP;
+    int exactEnd;
+
+    byte[] map;                              /* used as BM skip or char-map */
+    int[] intMap;                            /* BM skip for exact_len > 255 */
+    int[] intMapBackward;                    /* BM skip for backward search */
+    int dMin;                               /* min-distance of exact or map */
+    int dMax;                               /* max-distance of exact or map */
+
+    char[][] templates;
+    int templateNum;
+
+    public Regex(CharSequence cs) {
+        this(cs.toString());
+    }
+
+    public Regex(String str) {
+        this(str.toCharArray(), 0, str.length(), 0);
+    }
+
+    public Regex(char[] chars) {
+        this(chars, 0, chars.length, 0);
+    }
+
+    public Regex(char[] chars, int p, int end) {
+        this(chars, p, end, 0);
+    }
+
+    public Regex(char[] chars, int p, int end, int option) {
+        this(chars, p, end, option, Syntax.RUBY, WarnCallback.DEFAULT);
+    }
+
+    // onig_new
+    public Regex(char[] chars, int p, int end, int option, Syntax syntax) {
+        this(chars, p, end, option, Config.ENC_CASE_FOLD_DEFAULT, syntax, WarnCallback.DEFAULT);
+    }
+
+    public Regex(char[]chars, int p, int end, int option, WarnCallback warnings) {
+        this(chars, p, end, option, Syntax.RUBY, warnings);
+    }
+
+    // onig_new
+    public Regex(char[] chars, int p, int end, int option, Syntax syntax, WarnCallback warnings) {
+        this(chars, p, end, option, Config.ENC_CASE_FOLD_DEFAULT, syntax, warnings);
+    }
+
+    // onig_alloc_init
+    public Regex(char[] chars, int p, int end, int option, int caseFoldFlag, Syntax syntax, WarnCallback warnings) {
+
+        if ((option & (Option.DONT_CAPTURE_GROUP | Option.CAPTURE_GROUP)) ==
+            (Option.DONT_CAPTURE_GROUP | Option.CAPTURE_GROUP)) {
+            throw new ValueException(ErrorMessages.ERR_INVALID_COMBINATION_OF_OPTIONS);
+        }
+
+        if ((option & Option.NEGATE_SINGLELINE) != 0) {
+            option |= syntax.options;
+            option &= ~Option.SINGLELINE;
+        } else {
+            option |= syntax.options;
+        }
+
+        this.options = option;
+        this.caseFoldFlag = caseFoldFlag;
+        this.warnings = warnings;
+
+        new Analyser(new ScanEnvironment(this, syntax), chars, p, end).compile();
+
+        this.warnings = null;
+    }
+
+    public Matcher matcher(char[] chars) {
+        return matcher(chars, 0, chars.length);
+    }
+
+    public Matcher matcher(char[] chars, int p, int end) {
+        return factory.create(this, chars, p, end);
+    }
+
+    public int numberOfCaptures() {
+        return numMem;
+    }
+
+    public int numberOfCaptureHistories() {
+        if (Config.USE_CAPTURE_HISTORY) {
+            int n = 0;
+            for (int i=0; i<=Config.MAX_CAPTURE_HISTORY_GROUP; i++) {
+                if (bsAt(captureHistory, i)) n++;
+            }
+            return n;
+        } else {
+            return 0;
+        }
+    }
+
+    String nameTableToString() {
+        StringBuilder sb = new StringBuilder();
+
+        if (nameTable != null) {
+            sb.append("name table\n");
+            for (NameEntry ne : nameTable.values()) {
+                sb.append("  " + ne + "\n");
+            }
+            sb.append("\n");
+        }
+        return sb.toString();
+    }
+
+    NameEntry nameFind(char[] name, int nameP, int nameEnd) {
+        if (nameTable != null) return nameTable.get(new String(name, nameP, nameEnd - nameP));
+        return null;
+    }
+
+    void renumberNameTable(int[]map) {
+        if (nameTable != null) {
+            for (NameEntry e : nameTable.values()) {
+                if (e.backNum > 1) {
+                    for (int i=0; i<e.backNum; i++) {
+                        e.backRefs[i] = map[e.backRefs[i]];
+                    }
+                } else if (e.backNum == 1) {
+                    e.backRef1 = map[e.backRef1];
+                }
+            }
+        }
+    }
+
+    public int numberOfNames() {
+        return nameTable == null ? 0 : nameTable.size();
+    }
+
+    void nameAdd(char[] name, int nameP, int nameEnd, int backRef, Syntax syntax) {
+        if (nameEnd - nameP <= 0) throw new ValueException(ErrorMessages.ERR_EMPTY_GROUP_NAME);
+
+        NameEntry e = null;
+        if (nameTable == null) {
+            nameTable = new HashMap<String,NameEntry>(); // 13, oni defaults to 5
+        } else {
+            e = nameFind(name, nameP, nameEnd);
+        }
+
+        if (e == null) {
+            // dup the name here as oni does ?, what for ? (it has to manage it, we don't)
+            e = new NameEntry(name, nameP, nameEnd);
+            nameTable.put(new String(name, nameP, nameEnd - nameP), e);
+        } else if (e.backNum >= 1 && !syntax.allowMultiplexDefinitionName()) {
+            throw new ValueException(ErrorMessages.ERR_MULTIPLEX_DEFINED_NAME, new String(name, nameP, nameEnd - nameP));
+        }
+
+        e.addBackref(backRef);
+    }
+
+    NameEntry nameToGroupNumbers(char[] name, int nameP, int nameEnd) {
+        return nameFind(name, nameP, nameEnd);
+    }
+
+    public int nameToBackrefNumber(char[] name, int nameP, int nameEnd, Region region) {
+        NameEntry e = nameToGroupNumbers(name, nameP, nameEnd);
+        if (e == null) throw new ValueException(ErrorMessages.ERR_UNDEFINED_NAME_REFERENCE,
+                                                new String(name, nameP, nameEnd - nameP));
+
+        switch(e.backNum) {
+        case 0:
+            throw new InternalException(ErrorMessages.ERR_PARSER_BUG);
+        case 1:
+            return e.backRef1;
+        default:
+            if (region != null) {
+                for (int i = e.backNum - 1; i >= 0; i--) {
+                    if (region.beg[e.backRefs[i]] != Region.REGION_NOTPOS) return e.backRefs[i];
+                }
+            }
+            return e.backRefs[e.backNum - 1];
+        }
+    }
+
+    public Iterator<NameEntry> namedBackrefIterator() {
+        return nameTable.values().iterator();
+    }
+
+    public boolean noNameGroupIsActive(Syntax syntax) {
+        if (isDontCaptureGroup(options)) return false;
+
+        if (Config.USE_NAMED_GROUP) {
+            if (numberOfNames() > 0 && syntax.captureOnlyNamedGroup() && !isCaptureGroup(options)) return false;
+        }
+        return true;
+    }
+
+    /* set skip map for Boyer-Moor search */
+    void setupBMSkipMap() {
+        char[] chars = exact;
+        int p = exactP;
+        int end = exactEnd;
+        int len = end - p;
+
+        if (len < Config.CHAR_TABLE_SIZE) {
+            // map/skip
+            if (map == null) map = new byte[Config.CHAR_TABLE_SIZE];
+
+            for (int i=0; i<Config.CHAR_TABLE_SIZE; i++) map[i] = (byte)len;
+            for (int i=0; i<len-1; i++) map[chars[p + i] & 0xff] = (byte)(len - 1 -i); // oxff ??
+        } else {
+            if (intMap == null) intMap = new int[Config.CHAR_TABLE_SIZE];
+
+            for (int i=0; i<len-1; i++) intMap[chars[p + i] & 0xff] = len - 1 - i; // oxff ??
+        }
+    }
+
+    void setExactInfo(OptExactInfo e) {
+        if (e.length == 0) return;
+
+        // shall we copy that ?
+        exact = e.chars;
+        exactP = 0;
+        exactEnd = e.length;
+
+        if (e.ignoreCase) {
+            searchAlgorithm = new SearchAlgorithm.SLOW_IC(this);
+        } else {
+            if (e.length >= 2) {
+                setupBMSkipMap();
+                searchAlgorithm = SearchAlgorithm.BM;
+            } else {
+                searchAlgorithm = SearchAlgorithm.SLOW;
+            }
+        }
+
+        dMin = e.mmd.min;
+        dMax = e.mmd.max;
+
+        if (dMin != MinMaxLen.INFINITE_DISTANCE) {
+            thresholdLength = dMin + (exactEnd - exactP);
+        }
+    }
+
+    void setOptimizeMapInfo(OptMapInfo m) {
+        map = m.map;
+
+        searchAlgorithm = SearchAlgorithm.MAP;
+        dMin = m.mmd.min;
+        dMax = m.mmd.max;
+
+        if (dMin != MinMaxLen.INFINITE_DISTANCE) {
+            thresholdLength = dMin + 1;
+        }
+    }
+
+    void setSubAnchor(OptAnchorInfo anc) {
+        subAnchor |= anc.leftAnchor & AnchorType.BEGIN_LINE;
+        subAnchor |= anc.rightAnchor & AnchorType.END_LINE;
+    }
+
+    void clearOptimizeInfo() {
+        searchAlgorithm = SearchAlgorithm.NONE;
+        anchor = 0;
+        anchorDmax = 0;
+        anchorDmin = 0;
+        subAnchor = 0;
+
+        exact = null;
+        exactP = exactEnd = 0;
+    }
+
+    public String encStringToString(byte[]bytes, int p, int end) {
+        StringBuilder sb = new StringBuilder("\nPATTERN: /");
+
+        while (p < end) {
+            sb.append(new String(new byte[]{bytes[p]}));
+            p++;
+        }
+        return sb.append("/").toString();
+    }
+
+    public String optimizeInfoToString() {
+        String s = "";
+        s += "optimize: " + searchAlgorithm.getName() + "\n";
+        s += "  anchor:     " + OptAnchorInfo.anchorToString(anchor);
+
+        if ((anchor & AnchorType.END_BUF_MASK) != 0) {
+            s += MinMaxLen.distanceRangeToString(anchorDmin, anchorDmax);
+        }
+
+        s += "\n";
+
+        if (searchAlgorithm != SearchAlgorithm.NONE) {
+            s += "  sub anchor: " + OptAnchorInfo.anchorToString(subAnchor) + "\n";
+        }
+
+        s += "dmin: " + dMin + " dmax: " + dMax + "\n";
+        s += "threshold length: " + thresholdLength + "\n";
+
+        if (exact != null) {
+            s += "exact: [" + new String(exact, exactP, exactEnd - exactP) + "]: length: " + (exactEnd - exactP) + "\n";
+        } else if (searchAlgorithm == SearchAlgorithm.MAP) {
+            int n=0;
+            for (int i=0; i<Config.CHAR_TABLE_SIZE; i++) if (map[i] != 0) n++;
+
+            s += "map: n = " + n + "\n";
+            if (n > 0) {
+                int c=0;
+                s += "[";
+                for (int i=0; i<Config.CHAR_TABLE_SIZE; i++) {
+                    if (map[i] != 0) {
+                        if (c > 0) s += ", ";
+                        c++;
+                        // TODO if (enc.isPrint(i)
+                        s += ((char)i);
+                    }
+                }
+                s += "]\n";
+            }
+        }
+
+        return s;
+    }
+
+    public int getOptions() {
+        return options;
+    }
+
+    public void setUserOptions(int options) {
+        this.userOptions = options;
+    }
+
+    public int getUserOptions() {
+        return userOptions;
+    }
+
+    public void setUserObject(Object object) {
+        this.userObject = object;
+    }
+
+    public Object getUserObject() {
+        return userObject;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Region.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Region.java
new file mode 100644
index 00000000000..d685a249593
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Region.java
@@ -0,0 +1,66 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni;
+
+public final class Region {
+    static final int REGION_NOTPOS = -1;
+
+    public final int numRegs;
+    public final int[]beg;
+    public final int[]end;
+    public CaptureTreeNode historyRoot;
+
+    public Region(int num) {
+        this.numRegs = num;
+        this.beg = new int[num];
+        this.end = new int[num];
+    }
+
+    public Region(int begin, int end) {
+        this.numRegs = 1;
+        this.beg = new int[]{begin};
+        this.end = new int[]{end};
+    }
+
+    public Region clone() {
+        Region region = new Region(numRegs);
+        System.arraycopy(beg, 0, region.beg, 0, beg.length);
+        System.arraycopy(end, 0, region.end, 0, end.length);
+        if (historyRoot != null) region.historyRoot = historyRoot.cloneTree();
+        return region;
+    }
+
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("Region: \n");
+        for (int i=0; i<beg.length; i++) sb.append(" " + i + ": (" + beg[i] + "-" + end[i] + ")");
+        return sb.toString();
+    }
+
+    CaptureTreeNode getCaptureTree() {
+        return historyRoot;
+    }
+
+    void clear() {
+        for (int i=0; i<beg.length; i++) {
+            beg[i] = end[i] = REGION_NOTPOS;
+        }
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ScanEnvironment.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ScanEnvironment.java
new file mode 100644
index 00000000000..a604bfa2c3e
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ScanEnvironment.java
@@ -0,0 +1,137 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni;
+
+import static jdk.nashorn.internal.runtime.regexp.joni.BitStatus.bsClear;
+
+import jdk.nashorn.internal.runtime.regexp.joni.ast.Node;
+import jdk.nashorn.internal.runtime.regexp.joni.exception.ErrorMessages;
+import jdk.nashorn.internal.runtime.regexp.joni.exception.InternalException;
+
+public final class ScanEnvironment {
+
+    private static final int SCANENV_MEMNODES_SIZE = 8;
+
+    int option;
+    final int caseFoldFlag;
+    final public Syntax syntax;
+    int captureHistory;
+    int btMemStart;
+    int btMemEnd;
+    int backrefedMem;
+
+    final public Regex reg;
+
+    int numCall;
+    UnsetAddrList unsetAddrList; // USE_SUBEXP_CALL
+    public int numMem;
+
+    int numNamed; // USE_NAMED_GROUP
+
+    public Node memNodes[];
+
+    // USE_COMBINATION_EXPLOSION_CHECK
+    int numCombExpCheck;
+    int combExpMaxRegNum;
+    int currMaxRegNum;
+    boolean hasRecursion;
+
+    public ScanEnvironment(Regex regex, Syntax syntax) {
+        this.reg = regex;
+        option = regex.options;
+        caseFoldFlag = regex.caseFoldFlag;
+        this.syntax = syntax;
+    }
+
+    public void clear() {
+        captureHistory = bsClear();
+        btMemStart = bsClear();
+        btMemEnd = bsClear();
+        backrefedMem = bsClear();
+
+        numCall = 0;
+        numMem = 0;
+
+        numNamed = 0;
+
+        memNodes = null;
+
+        numCombExpCheck = 0;
+        combExpMaxRegNum = 0;
+        currMaxRegNum = 0;
+        hasRecursion = false;
+    }
+
+    public int addMemEntry() {
+        if (numMem++ == 0) {
+            memNodes = new Node[SCANENV_MEMNODES_SIZE];
+        } else if (numMem >= memNodes.length) {
+            Node[]tmp = new Node[memNodes.length << 1];
+            System.arraycopy(memNodes, 0, tmp, 0, memNodes.length);
+            memNodes = tmp;
+        }
+
+        return numMem;
+    }
+
+    public void setMemNode(int num, Node node) {
+        if (numMem >= num) {
+            memNodes[num] = node;
+        } else {
+            throw new InternalException(ErrorMessages.ERR_PARSER_BUG);
+        }
+    }
+
+    public int convertBackslashValue(int c) {
+        if (syntax.opEscControlChars()) {
+            switch (c) {
+            case 'n': return '\n';
+            case 't': return '\t';
+            case 'r': return '\r';
+            case 'f': return '\f';
+            case 'a': return '\007';
+            case 'b': return '\010';
+            case 'e': return '\033';
+            case 'v':
+                if (syntax.op2EscVVtab()) return 11; // ???
+                break;
+            default:
+                break;
+            }
+        }
+        return c;
+    }
+
+    void ccEscWarn(String s) {
+        if (Config.USE_WARN) {
+            if (syntax.warnCCOpNotEscaped() && syntax.backSlashEscapeInCC()) {
+                reg.warnings.warn("character class has '" + s + "' without escape");
+            }
+        }
+    }
+
+    void closeBracketWithoutEscapeWarn(String s) {
+        if (Config.USE_WARN) {
+            if (syntax.warnCCOpNotEscaped()) {
+                reg.warnings.warn("regular expression has '" + s + "' without escape");
+            }
+        }
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ScannerSupport.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ScannerSupport.java
new file mode 100644
index 00000000000..f3d8165cc5f
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ScannerSupport.java
@@ -0,0 +1,178 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni;
+
+import jdk.nashorn.internal.runtime.regexp.joni.encoding.IntHolder;
+import jdk.nashorn.internal.runtime.regexp.joni.exception.ErrorMessages;
+import jdk.nashorn.internal.runtime.regexp.joni.exception.InternalException;
+import jdk.nashorn.internal.runtime.regexp.joni.exception.SyntaxException;
+import jdk.nashorn.internal.runtime.regexp.joni.exception.ValueException;
+
+abstract class ScannerSupport extends IntHolder implements ErrorMessages {
+
+    protected final char[] chars;       // pattern
+    protected int p;                    // current scanner position
+    protected int stop;                 // pattern end (mutable)
+    private int lastFetched;            // last fetched value for unfetch support
+    protected int c;                    // current code point
+
+    private final int begin;            // pattern begin position for reset() support
+    private final int end;              // pattern end position for reset() support
+    protected int _p;                   // used by mark()/restore() to mark positions
+
+    protected ScannerSupport(char[] chars, int p, int end) {
+        this.chars = chars;
+        this.begin = p;
+        this.end = end;
+
+        reset();
+    }
+
+    protected int getBegin() {
+        return begin;
+    }
+
+    protected int getEnd() {
+        return end;
+    }
+
+    private final int INT_SIGN_BIT = 1 << 31;
+
+    protected final int scanUnsignedNumber() {
+        int last = c;
+        int num = 0; // long ???
+        while(left()) {
+            fetch();
+            if (Character.isDigit(c)) {
+                int onum = num;
+                num = num * 10 + EncodingHelper.digitVal(c);
+                if (((onum ^ num) & INT_SIGN_BIT) != 0) return -1;
+            } else {
+                unfetch();
+                break;
+            }
+        }
+        c = last;
+        return num;
+    }
+
+    protected final int scanUnsignedHexadecimalNumber(int maxLength) {
+        int last = c;
+        int num = 0;
+        while(left() && maxLength-- != 0) {
+            fetch();
+            if (EncodingHelper.isXDigit(c)) {
+                int onum = num;
+                int val = EncodingHelper.xdigitVal(c);
+                num = (num << 4) + val;
+                if (((onum ^ num) & INT_SIGN_BIT) != 0) return -1;
+            } else {
+                unfetch();
+                break;
+            }
+        }
+        c = last;
+        return num;
+    }
+
+    protected final int scanUnsignedOctalNumber(int maxLength) {
+        int last = c;
+        int num = 0;
+        while(left() && maxLength-- != 0) {
+            fetch();
+            if (Character.isDigit(c) && c < '8') {
+                int onum = num;
+                int val = EncodingHelper.odigitVal(c);
+                num = (num << 3) + val;
+                if (((onum ^ num) & INT_SIGN_BIT) != 0) return -1;
+            } else {
+                unfetch();
+                break;
+            }
+        }
+        c = last;
+        return num;
+    }
+
+    protected final void reset() {
+        p = begin;
+        stop = end;
+    }
+
+    protected final void mark() {
+        _p = p;
+    }
+
+    protected final void restore() {
+        p = _p;
+    }
+
+    protected final void inc() {
+        lastFetched = p;
+        p++;
+    }
+
+    protected final void fetch() {
+        lastFetched = p;
+        c = chars[p++];
+    }
+
+    protected int fetchTo() {
+        lastFetched = p;
+        return chars[p++];
+    }
+
+    protected final void unfetch() {
+        p = lastFetched;
+    }
+
+    protected final int peek() {
+        return p < stop ? chars[p] : 0;
+    }
+
+    protected final boolean peekIs(int c) {
+        return peek() == c;
+    }
+
+    protected final boolean left() {
+        return p < stop;
+    }
+
+    protected void newSyntaxException(String message) {
+        throw new SyntaxException(message);
+    }
+
+    protected void newValueException(String message) {
+        throw new ValueException(message);
+    }
+
+    protected void newValueException(String message, String str) {
+        throw new ValueException(message, str);
+    }
+
+    protected void newValueException(String message, int p, int end) {
+        throw new ValueException(message, new String(chars, p, end - p));
+    }
+
+    protected void newInternalException(String message) {
+        throw new InternalException(message);
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/SearchAlgorithm.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/SearchAlgorithm.java
new file mode 100644
index 00000000000..3b5a54744ca
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/SearchAlgorithm.java
@@ -0,0 +1,294 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni;
+
+public abstract class SearchAlgorithm {
+
+    public abstract String getName();
+    public abstract int search(Regex regex, char[] text, int textP, int textEnd, int textRange);
+    public abstract int searchBackward(Regex regex, char[] text, int textP, int adjustText, int textEnd, int textStart, int s_, int range_);
+
+
+    public static final SearchAlgorithm NONE = new SearchAlgorithm() {
+
+        public final String getName() {
+            return "NONE";
+        }
+
+        public final int search(Regex regex, char[] text, int textP, int textEnd, int textRange) {
+            return textP;
+        }
+
+        public final int searchBackward(Regex regex, char[] text, int textP, int adjustText, int textEnd, int textStart, int s_, int range_) {
+            return textP;
+        }
+
+    };
+
+    public static final SearchAlgorithm SLOW = new SearchAlgorithm() {
+
+        public final String getName() {
+            return "EXACT";
+        }
+
+        public final int search(Regex regex, char[] text, int textP, int textEnd, int textRange) {
+            char[] target = regex.exact;
+            int targetP = regex.exactP;
+            int targetEnd = regex.exactEnd;
+
+
+            int end = textEnd;
+            end -= targetEnd - targetP - 1;
+
+            if (end > textRange) end = textRange;
+
+            int s = textP;
+
+            while (s < end) {
+                if (text[s] == target[targetP]) {
+                    int p = s + 1;
+                    int t = targetP + 1;
+                    while (t < targetEnd) {
+                        if (target[t] != text[p++]) break;
+                        t++;
+                    }
+
+                    if (t == targetEnd) return s;
+                }
+                s++;
+            }
+
+            return -1;
+        }
+
+        public final int searchBackward(Regex regex, char[] text, int textP, int adjustText, int textEnd, int textStart, int s_, int range_) {
+            char[] target = regex.exact;
+            int targetP = regex.exactP;
+            int targetEnd = regex.exactEnd;
+
+            int s = textEnd;
+            s -= targetEnd - targetP;
+
+            if (s > textStart) {
+                s = textStart;
+            }
+
+            while (s >= textP) {
+                if (text[s] == target[targetP]) {
+                    int p = s + 1;
+                    int t = targetP + 1;
+                    while (t < targetEnd) {
+                        if (target[t] != text[p++]) break;
+                        t++;
+                    }
+                    if (t == targetEnd) return s;
+                }
+                // s = enc.prevCharHead or s = s <= adjustText ? -1 : s - 1;
+                s--;
+            }
+            return -1;
+        }
+    };
+
+    public static final class SLOW_IC extends SearchAlgorithm {
+        private final int caseFoldFlag;
+
+        public SLOW_IC(Regex regex) {
+            this.caseFoldFlag = regex.caseFoldFlag;
+        }
+
+        public final String getName() {
+            return "EXACT_IC";
+        }
+
+        public final int search(Regex regex, char[] text, int textP, int textEnd, int textRange) {
+            char[] target = regex.exact;
+            int targetP = regex.exactP;
+            int targetEnd = regex.exactEnd;
+
+            int end = textEnd;
+            end -= targetEnd - targetP - 1;
+
+            if (end > textRange) end = textRange;
+            int s = textP;
+
+            while (s < end) {
+                if (lowerCaseMatch(target, targetP, targetEnd, text, s, textEnd)) return s;
+                s++;
+            }
+            return -1;
+        }
+
+        public final int searchBackward(Regex regex, char[] text, int textP, int adjustText, int textEnd, int textStart, int s_, int range_) {
+            char[] target = regex.exact;
+            int targetP = regex.exactP;
+            int targetEnd = regex.exactEnd;
+
+            int s = textEnd;
+            s -= targetEnd - targetP;
+
+            if (s > textStart) {
+                s = textStart;
+            }
+
+            while (s >= textP) {
+                if (lowerCaseMatch(target, targetP, targetEnd, text, s, textEnd)) return s;
+                s = EncodingHelper.prevCharHead(adjustText, s);
+            }
+            return -1;
+        }
+
+        private boolean lowerCaseMatch(char[] t, int tP, int tEnd,
+                                       char[] chars, int p, int end) {
+
+            while (tP < tEnd) {
+                if (t[tP++] != Character.toLowerCase(chars[p++])) return false;
+            }
+            return true;
+        }
+    };
+
+    public static final SearchAlgorithm BM = new SearchAlgorithm() {
+
+        public final String getName() {
+            return "EXACT_BM";
+        }
+
+        public final int search(Regex regex, char[] text, int textP, int textEnd, int textRange) {
+            char[] target = regex.exact;
+            int targetP = regex.exactP;
+            int targetEnd = regex.exactEnd;
+
+            int end = textRange + (targetEnd - targetP) - 1;
+            if (end > textEnd) end = textEnd;
+
+            int tail = targetEnd - 1;
+            int s = textP + (targetEnd - targetP) - 1;
+
+            if (regex.intMap == null) {
+                while (s < end) {
+                    int p = s;
+                    int t = tail;
+
+                    while (text[p] == target[t]) {
+                        if (t == targetP) return p;
+                        p--; t--;
+                    }
+
+                    s += regex.map[text[s] & 0xff];
+                }
+            } else { /* see int_map[] */
+                while (s < end) {
+                    int p = s;
+                    int t = tail;
+
+                    while (text[p] == target[t]) {
+                        if (t == targetP) return p;
+                        p--; t--;
+                    }
+
+                    s += regex.intMap[text[s] & 0xff];
+                }
+            }
+            return -1;
+        }
+
+        private static final int BM_BACKWARD_SEARCH_LENGTH_THRESHOLD = 100;
+
+        public final int searchBackward(Regex regex, char[] text, int textP, int adjustText, int textEnd, int textStart, int s_, int range_) {
+            char[] target = regex.exact;
+            int targetP = regex.exactP;
+            int targetEnd = regex.exactEnd;
+
+            if (regex.intMapBackward == null) {
+                if (s_ - range_ < BM_BACKWARD_SEARCH_LENGTH_THRESHOLD) {
+                    // goto exact_method;
+                    return SLOW.searchBackward(regex, text, textP, adjustText, textEnd, textStart, s_, range_);
+                }
+                setBmBackwardSkip(regex, target, targetP, targetEnd);
+            }
+
+            int s = textEnd - (targetEnd - targetP);
+
+            if (textStart < s) {
+                s = textStart;
+            }
+
+            while (s >= textP) {
+                int p = s;
+                int t = targetP;
+                while (t < targetEnd && text[p] == target[t]) {
+                    p++; t++;
+                }
+                if (t == targetEnd) return s;
+
+                s -= regex.intMapBackward[text[s] & 0xff];
+            }
+            return -1;
+        }
+
+
+        private void setBmBackwardSkip(Regex regex, char[] chars, int p, int end) {
+            int[] skip;
+            if (regex.intMapBackward == null) {
+                skip = new int[Config.CHAR_TABLE_SIZE];
+                regex.intMapBackward = skip;
+            } else {
+                skip = regex.intMapBackward;
+            }
+
+            int len = end - p;
+
+            for (int i=0; i<Config.CHAR_TABLE_SIZE; i++) skip[i] = len;
+            for (int i=len-1; i>0; i--) skip[chars[i] & 0xff] = i;
+        }
+    };
+
+    public static final SearchAlgorithm MAP = new SearchAlgorithm() {
+
+        public final String getName() {
+            return "MAP";
+        }
+
+        public final int search(Regex regex, char[] text, int textP, int textEnd, int textRange) {
+            byte[] map = regex.map;
+            int s = textP;
+
+            while (s < textRange) {
+                if (text[s] > 0xff || map[text[s]] != 0) return s;
+                s++;
+            }
+            return -1;
+        }
+
+        public final int searchBackward(Regex regex, char[] text, int textP, int adjustText, int textEnd, int textStart, int s_, int range_) {
+            byte[] map = regex.map;
+            int s = textStart;
+
+            if (s >= textEnd) s = textEnd - 1;
+            while (s >= textP) {
+                if (text[s] > 0xff || map[text[s]] != 0) return s;
+                s--;
+            }
+            return -1;
+        }
+    };
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/StackEntry.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/StackEntry.java
new file mode 100644
index 00000000000..9161336a446
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/StackEntry.java
@@ -0,0 +1,164 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni;
+
+final class StackEntry {
+    int type;
+    private int E1, E2, E3, E4;
+
+    // first union member
+    /* byte code position */
+    void setStatePCode(int pcode) {
+        E1 = pcode;
+    }
+    int getStatePCode() {
+        return E1;
+    }
+    /* string position */
+    void setStatePStr(int pstr) {
+        E2 = pstr;
+    }
+    int getStatePStr() {
+        return E2;
+    }
+    /* previous char position of pstr */
+    void setStatePStrPrev(int pstrPrev) {
+        E3 = pstrPrev;
+    }
+    int getStatePStrPrev() {
+        return E3;
+    }
+
+    void setStateCheck(int check) {
+        E4 = check;
+    }
+    int getStateCheck() {
+        return E4;
+    }
+
+    // second union member
+    /* for OP_REPEAT_INC, OP_REPEAT_INC_NG */
+    void setRepeatCount(int count) {
+        E1 = count;
+    }
+    int getRepeatCount() {
+        return E1;
+    }
+    void decreaseRepeatCount() {
+        E1--;
+    }
+    void increaseRepeatCount() {
+        E1++;
+    }
+    /* byte code position (head of repeated target) */
+    void setRepeatPCode(int pcode) {
+        E2 = pcode;
+    }
+    int getRepeatPCode() {
+        return E2;
+    }
+    /* repeat id */
+    void setRepeatNum(int num) {
+        E3 = num;
+    }
+    int getRepeatNum() {
+        return E3;
+    }
+
+    // third union member
+    /* index of stack */ /*int repeat_inc struct*/
+    void setSi(int si) {
+        E1 = si;
+    }
+    int getSi() {
+        return E1;
+    }
+
+    // fourth union member
+    /* memory num */
+    void setMemNum(int num) {
+        E1 = num;
+    }
+    int getMemNum() {
+        return E1;
+    }
+    /* start/end position */
+    void setMemPstr(int pstr) {
+        E2 = pstr;
+    }
+    int getMemPStr() {
+        return E2;
+    }
+
+    /* Following information is set, if this stack type is MEM-START */
+    /* prev. info (for backtrack  "(...)*" ) */
+    void setMemStart(int start) {
+        E3 = start;
+    }
+    int getMemStart() {
+        return E3;
+    }
+    /* prev. info (for backtrack  "(...)*" ) */
+    void setMemEnd(int end) {
+        E4 = end;
+    }
+    int getMemEnd() {
+        return E4;
+    }
+
+    // fifth union member
+    /* null check id */
+    void setNullCheckNum(int num) {
+        E1 = num;
+    }
+    int getNullCheckNum() {
+        return E1;
+    }
+    /* start position */
+    void setNullCheckPStr(int pstr) {
+        E2 = pstr;
+    }
+    int getNullCheckPStr() {
+        return E2;
+    }
+
+    // sixth union member
+    /* byte code position */
+    void setCallFrameRetAddr(int addr) {
+        E1 = addr;
+    }
+    int getCallFrameRetAddr() {
+        return E1;
+    }
+    /* null check id */
+    void setCallFrameNum(int num) {
+        E2 = num;
+    }
+    int getCallFrameNum() {
+        return E2;
+    }
+    /* string position */
+    void setCallFramePStr(int pstr) {
+        E3 = pstr;
+    }
+    int getCallFramePStr() {
+        return E3;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/StackMachine.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/StackMachine.java
new file mode 100644
index 00000000000..898a4f10d46
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/StackMachine.java
@@ -0,0 +1,621 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni;
+
+import static jdk.nashorn.internal.runtime.regexp.joni.BitStatus.bsAt;
+
+import java.lang.ref.WeakReference;
+import java.util.Arrays;
+
+import jdk.nashorn.internal.runtime.regexp.joni.constants.StackPopLevel;
+import jdk.nashorn.internal.runtime.regexp.joni.constants.StackType;
+
+abstract class StackMachine extends Matcher implements StackType {
+    protected static final int INVALID_INDEX = -1;
+
+    protected StackEntry[]stack;
+    protected int stk;  // stkEnd
+
+    protected final int[]repeatStk;
+    protected final int memStartStk, memEndStk;
+
+    // CEC
+    protected byte[] stateCheckBuff; // move to int[] ?
+    int stateCheckBuffSize;
+
+    protected StackMachine(Regex regex, char[] chars, int p , int end) {
+        super(regex, chars, p, end);
+
+        this.stack = regex.stackNeeded ? fetchStack() : null;
+        int n = regex.numRepeat + (regex.numMem << 1);
+        this.repeatStk = n > 0 ? new int[n] : null;
+
+        memStartStk = regex.numRepeat - 1;
+        memEndStk   = memStartStk + regex.numMem;
+        /* for index start from 1, mem_start_stk[1]..mem_start_stk[num_mem] */
+        /* for index start from 1, mem_end_stk[1]..mem_end_stk[num_mem] */
+    }
+
+    private static StackEntry[] allocateStack() {
+        StackEntry[]stack = new StackEntry[Config.INIT_MATCH_STACK_SIZE];
+        stack[0] = new StackEntry();
+        return stack;
+    }
+
+    private void doubleStack() {
+        StackEntry[] newStack = new StackEntry[stack.length << 1];
+        System.arraycopy(stack, 0, newStack, 0, stack.length);
+        stack = newStack;
+    }
+
+    static final ThreadLocal<WeakReference<StackEntry[]>> stacks
+            = new ThreadLocal<WeakReference<StackEntry[]>>() {
+        @Override
+        protected WeakReference<StackEntry[]> initialValue() {
+            return new WeakReference<StackEntry[]>(allocateStack());
+        }
+    };
+
+    private static StackEntry[] fetchStack() {
+        WeakReference<StackEntry[]> ref = stacks.get();
+        StackEntry[] stack = ref.get();
+        if (stack == null) {
+            ref = new WeakReference<StackEntry[]>(stack = allocateStack());
+            stacks.set(ref);
+        }
+        return stack;
+    }
+
+    protected final void init() {
+        if (stack != null) pushEnsured(ALT, regex.codeLength - 1); /* bottom stack */
+        if (repeatStk != null) {
+            for (int i=1; i<=regex.numMem; i++) {
+                repeatStk[i + memStartStk] = repeatStk[i + memEndStk] = INVALID_INDEX;
+            }
+        }
+    }
+
+    protected final StackEntry ensure1() {
+        if (stk >= stack.length) doubleStack();
+        StackEntry e = stack[stk];
+        if (e == null) stack[stk] = e = new StackEntry();
+        return e;
+    }
+
+    protected final void pushType(int type) {
+        ensure1().type = type;
+        stk++;
+    }
+
+    // CEC
+
+    // STATE_CHECK_POS
+    private int stateCheckPos(int s, int snum) {
+        return (s - str) * regex.numCombExpCheck + (snum - 1);
+    }
+
+    // STATE_CHECK_VAL
+    protected final boolean stateCheckVal(int s, int snum) {
+        if (stateCheckBuff != null) {
+            int x = stateCheckPos(s, snum);
+            return (stateCheckBuff[x / 8] & (1 << (x % 8))) != 0;
+        }
+        return false;
+    }
+
+    // ELSE_IF_STATE_CHECK_MARK
+    private void stateCheckMark() {
+        StackEntry e = stack[stk];
+        int x = stateCheckPos(e.getStatePStr(), e.getStateCheck());
+        stateCheckBuff[x / 8] |= (1 << (x % 8));
+    }
+
+    // STATE_CHECK_BUFF_INIT
+    private static final int STATE_CHECK_BUFF_MALLOC_THRESHOLD_SIZE = 16;
+    protected final void stateCheckBuffInit(int strLength, int offset, int stateNum) {
+        if (stateNum > 0 && strLength >= Config.CHECK_STRING_THRESHOLD_LEN) {
+            int size = ((strLength + 1) * stateNum + 7) >>> 3;
+            offset = (offset * stateNum) >>> 3;
+
+            if (size > 0 && offset < size && size < Config.CHECK_BUFF_MAX_SIZE) {
+                if (size >= STATE_CHECK_BUFF_MALLOC_THRESHOLD_SIZE) {
+                    stateCheckBuff = new byte[size];
+                } else {
+                    // same impl, reduce...
+                    stateCheckBuff = new byte[size];
+                }
+                Arrays.fill(stateCheckBuff, offset, (size - offset), (byte)0);
+                stateCheckBuffSize = size;
+            } else {
+                stateCheckBuff = null; // reduce
+                stateCheckBuffSize = 0;
+            }
+        } else {
+            stateCheckBuff = null; // reduce
+            stateCheckBuffSize = 0;
+        }
+    }
+
+    protected final void stateCheckBuffClear() {
+        stateCheckBuff = null;
+        stateCheckBuffSize = 0;
+    }
+
+    private void push(int type, int pat, int s, int prev) {
+        StackEntry e = ensure1();
+        e.type = type;
+        e.setStatePCode(pat);
+        e.setStatePStr(s);
+        e.setStatePStrPrev(prev);
+        if (Config.USE_COMBINATION_EXPLOSION_CHECK) e.setStateCheck(0);
+        stk++;
+    }
+
+    protected final void pushEnsured(int type, int pat) {
+        StackEntry e = stack[stk];
+        e.type = type;
+        e.setStatePCode(pat);
+        if (Config.USE_COMBINATION_EXPLOSION_CHECK) e.setStateCheck(0);
+        stk++;
+    }
+
+    protected final void pushAltWithStateCheck(int pat, int s, int sprev, int snum) {
+        StackEntry e = ensure1();
+        e.type = ALT;
+        e.setStatePCode(pat);
+        e.setStatePStr(s);
+        e.setStatePStrPrev(sprev);
+        if (Config.USE_COMBINATION_EXPLOSION_CHECK) e.setStateCheck(stateCheckBuff != null ? snum : 0);
+        stk++;
+    }
+
+    protected final void pushStateCheck(int s, int snum) {
+        if (stateCheckBuff != null) {
+            StackEntry e = ensure1();
+            e.type = STATE_CHECK_MARK;
+            e.setStatePStr(s);
+            e.setStateCheck(snum);
+            stk++;
+        }
+    }
+
+    protected final void pushAlt(int pat, int s, int prev) {
+        push(ALT, pat, s, prev);
+    }
+
+    protected final void pushPos(int s, int prev) {
+        push(POS, -1 /*NULL_UCHARP*/, s, prev);
+    }
+
+    protected final void pushPosNot(int pat, int s, int prev) {
+        push(POS_NOT, pat, s, prev);
+    }
+
+    protected final void pushStopBT() {
+        pushType(STOP_BT);
+    }
+
+    protected final void pushLookBehindNot(int pat, int s, int sprev) {
+        push(LOOK_BEHIND_NOT, pat, s, sprev);
+    }
+
+    protected final void pushRepeat(int id, int pat) {
+        StackEntry e = ensure1();
+        e.type = REPEAT;
+        e.setRepeatNum(id);
+        e.setRepeatPCode(pat);
+        e.setRepeatCount(0);
+        stk++;
+    }
+
+    protected final void pushRepeatInc(int sindex) {
+        StackEntry e = ensure1();
+        e.type = REPEAT_INC;
+        e.setSi(sindex);
+        stk++;
+    }
+
+    protected final void pushMemStart(int mnum, int s) {
+        StackEntry e = ensure1();
+        e.type = MEM_START;
+        e.setMemNum(mnum);
+        e.setMemPstr(s);
+        e.setMemStart(repeatStk[memStartStk + mnum]);
+        e.setMemEnd(repeatStk[memEndStk + mnum]);
+        repeatStk[memStartStk + mnum] = stk;
+        repeatStk[memEndStk + mnum] = INVALID_INDEX;
+        stk++;
+    }
+
+    protected final void pushMemEnd(int mnum, int s) {
+        StackEntry e = ensure1();
+        e.type = MEM_END;
+        e.setMemNum(mnum);
+        e.setMemPstr(s);
+        e.setMemStart(repeatStk[memStartStk + mnum]);
+        e.setMemEnd(repeatStk[memEndStk + mnum]);
+        repeatStk[memEndStk + mnum] = stk;
+        stk++;
+    }
+
+    protected final void pushMemEndMark(int mnum) {
+        StackEntry e = ensure1();
+        e.type = MEM_END_MARK;
+        e.setMemNum(mnum);
+        stk++;
+    }
+
+    protected final int getMemStart(int mnum) {
+        int level = 0;
+        int stkp = stk;
+
+        while (stkp > 0) {
+            stkp--;
+            StackEntry e = stack[stkp];
+            if ((e.type & MASK_MEM_END_OR_MARK) != 0 && e.getMemNum() == mnum) {
+                level++;
+            } else if (e.type == MEM_START && e.getMemNum() == mnum) {
+                if (level == 0) break;
+                level--;
+            }
+        }
+        return stkp;
+    }
+
+    protected final void pushNullCheckStart(int cnum, int s) {
+        StackEntry e = ensure1();
+        e.type = NULL_CHECK_START;
+        e.setNullCheckNum(cnum);
+        e.setNullCheckPStr(s);
+        stk++;
+    }
+
+    protected final void pushNullCheckEnd(int cnum) {
+        StackEntry e = ensure1();
+        e.type = NULL_CHECK_END;
+        e.setNullCheckNum(cnum);
+        stk++;
+    }
+
+    protected final void pushCallFrame(int pat) {
+        StackEntry e = ensure1();
+        e.type = CALL_FRAME;
+        e.setCallFrameRetAddr(pat);
+        stk++;
+    }
+
+    protected final void pushReturn() {
+        StackEntry e = ensure1();
+        e.type = RETURN;
+        stk++;
+    }
+
+    // stack debug routines here
+    // ...
+
+    protected final void popOne() {
+        stk--;
+    }
+
+    protected final StackEntry pop() {
+        switch (regex.stackPopLevel) {
+        case StackPopLevel.FREE:
+            return popFree();
+        case StackPopLevel.MEM_START:
+            return popMemStart();
+        default:
+            return popDefault();
+        }
+    }
+
+    private StackEntry popFree() {
+        while (true) {
+            StackEntry e = stack[--stk];
+
+            if ((e.type & MASK_POP_USED) != 0) {
+                return e;
+            } else if (Config.USE_COMBINATION_EXPLOSION_CHECK) {
+                if (e.type == STATE_CHECK_MARK) stateCheckMark();
+            }
+        }
+    }
+
+    private StackEntry popMemStart() {
+        while (true) {
+            StackEntry e = stack[--stk];
+
+            if ((e.type & MASK_POP_USED) != 0) {
+                return e;
+            } else if (e.type == MEM_START) {
+                repeatStk[memStartStk + e.getMemNum()] = e.getMemStart();
+                repeatStk[memEndStk + e.getMemNum()] = e.getMemEnd();
+            } else if (Config.USE_COMBINATION_EXPLOSION_CHECK) {
+                if (e.type == STATE_CHECK_MARK) stateCheckMark();
+            }
+        }
+    }
+
+    private StackEntry popDefault() {
+        while (true) {
+            StackEntry e = stack[--stk];
+
+            if ((e.type & MASK_POP_USED) != 0) {
+                return e;
+            } else if (e.type == MEM_START) {
+                repeatStk[memStartStk + e.getMemNum()] = e.getMemStart();
+                repeatStk[memEndStk + e.getMemNum()] = e.getMemEnd();
+            } else if (e.type == REPEAT_INC) {
+                //int si = stack[stk + IREPEAT_INC_SI];
+                //stack[si + IREPEAT_COUNT]--;
+                stack[e.getSi()].decreaseRepeatCount();
+            } else if (e.type == MEM_END) {
+                repeatStk[memStartStk + e.getMemNum()] = e.getMemStart();
+                repeatStk[memEndStk + e.getMemNum()] = e.getMemEnd();
+            } else if (Config.USE_COMBINATION_EXPLOSION_CHECK) {
+                if (e.type == STATE_CHECK_MARK) stateCheckMark();
+            }
+        }
+    }
+
+    protected final void popTilPosNot() {
+        while (true) {
+            stk--;
+            StackEntry e = stack[stk];
+
+            if (e.type == POS_NOT) {
+                break;
+            } else if (e.type == MEM_START) {
+                repeatStk[memStartStk + e.getMemNum()] = e.getMemStart();
+                repeatStk[memEndStk + e.getMemNum()] = e.getMemStart();
+            } else if (e.type == REPEAT_INC) {
+                //int si = stack[stk + IREPEAT_INC_SI];
+                //stack[si + IREPEAT_COUNT]--;
+                stack[e.getSi()].decreaseRepeatCount();
+            } else if (e.type == MEM_END){
+                repeatStk[memStartStk + e.getMemNum()] = e.getMemStart();
+                repeatStk[memEndStk + e.getMemNum()] = e.getMemStart();
+            } else if (Config.USE_COMBINATION_EXPLOSION_CHECK) {
+                if (e.type == STATE_CHECK_MARK) stateCheckMark();
+            }
+        }
+    }
+
+    protected final void popTilLookBehindNot() {
+        while (true) {
+            stk--;
+            StackEntry e = stack[stk];
+
+            if (e.type == LOOK_BEHIND_NOT) {
+                break;
+            } else if (e.type == MEM_START) {
+                repeatStk[memStartStk + e.getMemNum()] = e.getMemStart();
+                repeatStk[memEndStk + e.getMemNum()] = e.getMemEnd();
+            } else if (e.type == REPEAT_INC) {
+                //int si = stack[stk + IREPEAT_INC_SI];
+                //stack[si + IREPEAT_COUNT]--;
+                stack[e.getSi()].decreaseRepeatCount();
+            } else if (e.type == MEM_END) {
+                repeatStk[memStartStk + e.getMemNum()] = e.getMemStart();
+                repeatStk[memEndStk + e.getMemNum()] = e.getMemEnd();
+            } else if (Config.USE_COMBINATION_EXPLOSION_CHECK) {
+                if (e.type == STATE_CHECK_MARK) stateCheckMark();
+            }
+        }
+    }
+
+    protected final int posEnd() {
+        int k = stk;
+        while (true) {
+            k--;
+            StackEntry e = stack[k];
+            if ((e.type & MASK_TO_VOID_TARGET) != 0) {
+                e.type = VOID;
+            } else if (e.type == POS) {
+                e.type = VOID;
+                break;
+            }
+        }
+        return k;
+    }
+
+    protected final void stopBtEnd() {
+        int k = stk;
+        while (true) {
+            k--;
+            StackEntry e = stack[k];
+
+            if ((e.type & MASK_TO_VOID_TARGET) != 0) {
+                e.type = VOID;
+            } else if (e.type == STOP_BT) {
+                e.type = VOID;
+                break;
+            }
+        }
+    }
+
+    // int for consistency with other null check routines
+    protected final int nullCheck(int id, int s) {
+        int k = stk;
+        while (true) {
+            k--;
+            StackEntry e = stack[k];
+
+            if (e.type == NULL_CHECK_START) {
+                if (e.getNullCheckNum() == id) {
+                    return e.getNullCheckPStr() == s ? 1 : 0;
+                }
+            }
+        }
+    }
+
+    protected final int nullCheckRec(int id, int s) {
+        int level = 0;
+        int k = stk;
+        while (true) {
+            k--;
+            StackEntry e = stack[k];
+
+            if (e.type == NULL_CHECK_START) {
+                if (e.getNullCheckNum() == id) {
+                    if (level == 0) {
+                        return e.getNullCheckPStr() == s ? 1 : 0;
+                    } else {
+                        level--;
+                    }
+                }
+            } else if (e.type == NULL_CHECK_END) {
+                level++;
+            }
+        }
+    }
+
+    protected final int nullCheckMemSt(int id, int s) {
+        int k = stk;
+        int isNull;
+        while (true) {
+            k--;
+            StackEntry e = stack[k];
+
+            if (e.type == NULL_CHECK_START) {
+                if (e.getNullCheckNum() == id) {
+                    if (e.getNullCheckPStr() != s) {
+                        isNull = 0;
+                        break;
+                    } else {
+                        int endp;
+                        isNull = 1;
+                        while (k < stk) {
+                            if (e.type == MEM_START) {
+                                if (e.getMemEnd() == INVALID_INDEX) {
+                                    isNull = 0;
+                                    break;
+                                }
+                                if (bsAt(regex.btMemEnd, e.getMemNum())) {
+                                    endp = stack[e.getMemEnd()].getMemPStr();
+                                } else {
+                                    endp = e.getMemEnd();
+                                }
+                                if (stack[e.getMemStart()].getMemPStr() != endp) {
+                                    isNull = 0;
+                                    break;
+                                } else if (endp != s) {
+                                    isNull = -1; /* empty, but position changed */
+                                }
+                            }
+                            k++;
+                            e = stack[k]; // !!
+                        }
+                        break;
+                    }
+                }
+            }
+        }
+        return isNull;
+    }
+
+    protected final int nullCheckMemStRec(int id, int s) {
+        int level = 0;
+        int k = stk;
+        int isNull;
+        while (true) {
+            k--;
+            StackEntry e = stack[k];
+
+            if (e.type == NULL_CHECK_START) {
+                if (e.getNullCheckNum() == id) {
+                    if (level == 0) {
+                        if (e.getNullCheckPStr() != s) {
+                            isNull = 0;
+                            break;
+                        } else {
+                            int endp;
+                            isNull = 1;
+                            while (k < stk) {
+                                if (e.type == MEM_START) {
+                                    if (e.getMemEnd() == INVALID_INDEX) {
+                                        isNull = 0;
+                                        break;
+                                    }
+                                    if (bsAt(regex.btMemEnd, e.getMemNum())) {
+                                        endp = stack[e.getMemEnd()].getMemPStr();
+                                    } else {
+                                        endp = e.getMemEnd();
+                                    }
+                                    if (stack[e.getMemStart()].getMemPStr() != endp) {
+                                        isNull = 0;
+                                        break;
+                                    } else if (endp != s) {
+                                        isNull = -1;; /* empty, but position changed */
+                                    }
+                                }
+                                k++;
+                                e = stack[k];
+                            }
+                            break;
+                        }
+                    } else {
+                        level--;
+                    }
+                }
+            } else if (e.type == NULL_CHECK_END) {
+                if (e.getNullCheckNum() == id) level++;
+            }
+        }
+        return isNull;
+    }
+
+    protected final int getRepeat(int id) {
+        int level = 0;
+        int k = stk;
+        while (true) {
+            k--;
+            StackEntry e = stack[k];
+
+            if (e.type == REPEAT) {
+                if (level == 0) {
+                    if (e.getRepeatNum() == id) return k;
+                }
+            } else if (e.type == CALL_FRAME) {
+                level--;
+            } else if (e.type == RETURN) {
+                level++;
+            }
+        }
+    }
+
+    protected final int sreturn() {
+        int level = 0;
+        int k = stk;
+        while (true) {
+            k--;
+            StackEntry e = stack[k];
+
+            if (e.type == CALL_FRAME) {
+                if (level == 0) {
+                    return e.getCallFrameRetAddr();
+                } else {
+                    level--;
+                }
+            } else if (e.type == RETURN) {
+                level++;
+            }
+        }
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Syntax.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Syntax.java
new file mode 100644
index 00000000000..07b52626eda
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Syntax.java
@@ -0,0 +1,628 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni;
+
+import static jdk.nashorn.internal.runtime.regexp.joni.constants.MetaChar.INEFFECTIVE_META_CHAR;
+
+import jdk.nashorn.internal.runtime.regexp.joni.constants.SyntaxProperties;
+
+public final class Syntax implements SyntaxProperties{
+    private final int op;
+    private final int op2;
+    private final int behavior;
+    public final int options;
+    public final MetaCharTable metaCharTable;
+
+    public Syntax(int op, int op2, int behavior, int options, MetaCharTable metaCharTable) {
+        this.op = op;
+        this.op2 = op2;
+        this.behavior = behavior;
+        this.options = options;
+        this.metaCharTable = metaCharTable;
+    }
+
+    public static class MetaCharTable {
+        public final int esc;
+        public final int anyChar;
+        public final int anyTime;
+        public final int zeroOrOneTime;
+        public final int oneOrMoreTime;
+        public final int anyCharAnyTime;
+
+        public MetaCharTable(int esc, int anyChar, int anyTime,
+                             int zeroOrOneTime, int oneOrMoreTime, int anyCharAnyTime) {
+            this.esc = esc;
+            this.anyChar = anyChar;
+            this.anyTime = anyTime;
+            this.zeroOrOneTime = zeroOrOneTime;
+            this.oneOrMoreTime = oneOrMoreTime;
+            this.anyCharAnyTime = anyCharAnyTime;
+        }
+    }
+
+    /**
+     * OP
+     *
+     */
+    protected boolean isOp(int opm) {
+        return (op & opm) != 0;
+    }
+
+    public boolean opVariableMetaCharacters() {
+        return isOp(OP_VARIABLE_META_CHARACTERS);
+    }
+
+    public boolean opDotAnyChar() {
+        return isOp(OP_DOT_ANYCHAR);
+    }
+
+    public boolean opAsteriskZeroInf() {
+        return isOp(OP_ASTERISK_ZERO_INF);
+    }
+
+    public boolean opEscAsteriskZeroInf() {
+        return isOp(OP_ESC_ASTERISK_ZERO_INF);
+    }
+
+    public boolean opPlusOneInf() {
+        return isOp(OP_PLUS_ONE_INF);
+    }
+
+    public boolean opEscPlusOneInf() {
+        return isOp(OP_ESC_PLUS_ONE_INF);
+    }
+
+    public boolean opQMarkZeroOne() {
+        return isOp(OP_QMARK_ZERO_ONE);
+    }
+
+    public boolean opEscQMarkZeroOne() {
+        return isOp(OP_ESC_QMARK_ZERO_ONE);
+    }
+
+    public boolean opBraceInterval() {
+        return isOp(OP_BRACE_INTERVAL);
+    }
+
+    public boolean opEscBraceInterval() {
+        return isOp(OP_ESC_BRACE_INTERVAL);
+    }
+
+    public boolean opVBarAlt() {
+        return isOp(OP_VBAR_ALT);
+    }
+
+    public boolean opEscVBarAlt() {
+        return isOp(OP_ESC_VBAR_ALT);
+    }
+
+    public boolean opLParenSubexp() {
+        return isOp(OP_LPAREN_SUBEXP);
+    }
+
+    public boolean opEscLParenSubexp() {
+        return isOp(OP_ESC_LPAREN_SUBEXP);
+    }
+
+    public boolean opEscAZBufAnchor() {
+        return isOp(OP_ESC_AZ_BUF_ANCHOR);
+    }
+
+    public boolean opEscCapitalGBeginAnchor() {
+        return isOp(OP_ESC_CAPITAL_G_BEGIN_ANCHOR);
+    }
+
+    public boolean opDecimalBackref() {
+        return isOp(OP_DECIMAL_BACKREF);
+    }
+
+    public boolean opBracketCC() {
+        return isOp(OP_BRACKET_CC);
+    }
+
+    public boolean opEscWWord() {
+        return isOp(OP_ESC_W_WORD);
+    }
+
+    public boolean opEscLtGtWordBeginEnd() {
+        return isOp(OP_ESC_LTGT_WORD_BEGIN_END);
+    }
+
+    public boolean opEscBWordBound() {
+        return isOp(OP_ESC_B_WORD_BOUND);
+    }
+
+    public boolean opEscSWhiteSpace() {
+        return isOp(OP_ESC_S_WHITE_SPACE);
+    }
+
+    public boolean opEscDDigit() {
+        return isOp(OP_ESC_D_DIGIT);
+    }
+
+    public boolean opLineAnchor() {
+        return isOp(OP_LINE_ANCHOR);
+    }
+
+    public boolean opPosixBracket() {
+        return isOp(OP_POSIX_BRACKET);
+    }
+
+    public boolean opQMarkNonGreedy() {
+        return isOp(OP_QMARK_NON_GREEDY);
+    }
+
+    public boolean opEscControlChars() {
+        return isOp(OP_ESC_CONTROL_CHARS);
+    }
+
+    public boolean opEscCControl() {
+        return isOp(OP_ESC_C_CONTROL);
+    }
+
+    public boolean opEscOctal3() {
+        return isOp(OP_ESC_OCTAL3);
+    }
+
+    public boolean opEscXHex2() {
+        return isOp(OP_ESC_X_HEX2);
+    }
+
+    public boolean opEscXBraceHex8() {
+        return isOp(OP_ESC_X_BRACE_HEX8);
+    }
+
+
+    /**
+     * OP
+     *
+     */
+    protected boolean isOp2(int opm) {
+        return (op2 & opm) != 0;
+    }
+
+    public boolean op2EscCapitalQQuote() {
+        return isOp2(OP2_ESC_CAPITAL_Q_QUOTE);
+    }
+
+    public boolean op2QMarkGroupEffect() {
+        return isOp2(OP2_QMARK_GROUP_EFFECT);
+    }
+
+    public boolean op2OptionPerl() {
+        return isOp2(OP2_OPTION_PERL);
+    }
+
+    public boolean op2OptionRuby() {
+        return isOp2(OP2_OPTION_RUBY);
+    }
+
+    public boolean op2PlusPossessiveRepeat() {
+        return isOp2(OP2_PLUS_POSSESSIVE_REPEAT);
+    }
+
+    public boolean op2PlusPossessiveInterval() {
+        return isOp2(OP2_PLUS_POSSESSIVE_INTERVAL);
+    }
+
+    public boolean op2CClassSetOp() {
+        return isOp2(OP2_CCLASS_SET_OP);
+    }
+
+    public boolean op2QMarkLtNamedGroup() {
+        return isOp2(OP2_QMARK_LT_NAMED_GROUP);
+    }
+
+    public boolean op2EscKNamedBackref() {
+        return isOp2(OP2_ESC_K_NAMED_BACKREF);
+    }
+
+    public boolean op2EscGSubexpCall() {
+        return isOp2(OP2_ESC_G_SUBEXP_CALL);
+    }
+
+    public boolean op2AtMarkCaptureHistory() {
+        return isOp2(OP2_ATMARK_CAPTURE_HISTORY);
+    }
+
+    public boolean op2EscCapitalCBarControl() {
+        return isOp2(OP2_ESC_CAPITAL_C_BAR_CONTROL);
+    }
+
+    public boolean op2EscCapitalMBarMeta() {
+        return isOp2(OP2_ESC_CAPITAL_M_BAR_META);
+    }
+
+    public boolean op2EscVVtab() {
+        return isOp2(OP2_ESC_V_VTAB);
+    }
+
+    public boolean op2EscUHex4() {
+        return isOp2(OP2_ESC_U_HEX4);
+    }
+
+    public boolean op2EscGnuBufAnchor() {
+        return isOp2(OP2_ESC_GNU_BUF_ANCHOR);
+    }
+
+    public boolean op2EscPBraceCharProperty() {
+        return isOp2(OP2_ESC_P_BRACE_CHAR_PROPERTY);
+    }
+
+    public boolean op2EscPBraceCircumflexNot() {
+        return isOp2(OP2_ESC_P_BRACE_CIRCUMFLEX_NOT);
+    }
+
+    public boolean op2EscHXDigit() {
+        return isOp2(OP2_ESC_H_XDIGIT);
+    }
+
+    public boolean op2IneffectiveEscape() {
+        return isOp2(OP2_INEFFECTIVE_ESCAPE);
+    }
+
+    /**
+     * BEHAVIOR
+     *
+     */
+    protected boolean isBehavior(int bvm) {
+        return (behavior & bvm) != 0;
+    }
+
+    public boolean contextIndepRepeatOps() {
+        return isBehavior(CONTEXT_INDEP_REPEAT_OPS);
+    }
+
+    public boolean contextInvalidRepeatOps() {
+        return isBehavior(CONTEXT_INVALID_REPEAT_OPS);
+    }
+
+    public boolean allowUnmatchedCloseSubexp() {
+        return isBehavior(ALLOW_UNMATCHED_CLOSE_SUBEXP);
+    }
+
+    public boolean allowInvalidInterval() {
+        return isBehavior(ALLOW_INVALID_INTERVAL);
+    }
+
+    public boolean allowIntervalLowAbbrev() {
+        return isBehavior(ALLOW_INTERVAL_LOW_ABBREV);
+    }
+
+    public boolean strictCheckBackref() {
+        return isBehavior(STRICT_CHECK_BACKREF);
+    }
+
+    public boolean differentLengthAltLookBehind() {
+        return isBehavior(DIFFERENT_LEN_ALT_LOOK_BEHIND);
+    }
+
+    public boolean captureOnlyNamedGroup() {
+        return isBehavior(CAPTURE_ONLY_NAMED_GROUP);
+    }
+
+    public boolean allowMultiplexDefinitionName() {
+        return isBehavior(ALLOW_MULTIPLEX_DEFINITION_NAME);
+    }
+
+    public boolean fixedIntervalIsGreedyOnly() {
+        return isBehavior(FIXED_INTERVAL_IS_GREEDY_ONLY);
+    }
+
+
+    public boolean notNewlineInNegativeCC() {
+        return isBehavior(NOT_NEWLINE_IN_NEGATIVE_CC);
+    }
+
+    public boolean backSlashEscapeInCC() {
+        return isBehavior(BACKSLASH_ESCAPE_IN_CC);
+    }
+
+    public boolean allowEmptyRangeInCC() {
+        return isBehavior(ALLOW_EMPTY_RANGE_IN_CC);
+    }
+
+    public boolean allowDoubleRangeOpInCC() {
+        return isBehavior(ALLOW_DOUBLE_RANGE_OP_IN_CC);
+    }
+
+    public boolean warnCCOpNotEscaped() {
+        return isBehavior(WARN_CC_OP_NOT_ESCAPED);
+    }
+
+    public boolean warnReduntantNestedRepeat() {
+        return isBehavior(WARN_REDUNDANT_NESTED_REPEAT);
+    }
+
+    public static final Syntax RUBY = new Syntax(
+        (( GNU_REGEX_OP | OP_QMARK_NON_GREEDY |
+        OP_ESC_OCTAL3 | OP_ESC_X_HEX2 |
+        OP_ESC_X_BRACE_HEX8 | OP_ESC_CONTROL_CHARS |
+        OP_ESC_C_CONTROL )
+        & ~OP_ESC_LTGT_WORD_BEGIN_END ),
+
+        ( OP2_QMARK_GROUP_EFFECT |
+        OP2_OPTION_RUBY |
+        OP2_QMARK_LT_NAMED_GROUP | OP2_ESC_K_NAMED_BACKREF |
+        OP2_ESC_G_SUBEXP_CALL |
+        OP2_ESC_P_BRACE_CHAR_PROPERTY  |
+        OP2_ESC_P_BRACE_CIRCUMFLEX_NOT |
+        OP2_PLUS_POSSESSIVE_REPEAT |
+        OP2_CCLASS_SET_OP | OP2_ESC_CAPITAL_C_BAR_CONTROL |
+        OP2_ESC_CAPITAL_M_BAR_META | OP2_ESC_V_VTAB |
+        OP2_ESC_H_XDIGIT ),
+
+        ( GNU_REGEX_BV |
+        ALLOW_INTERVAL_LOW_ABBREV |
+        DIFFERENT_LEN_ALT_LOOK_BEHIND |
+        CAPTURE_ONLY_NAMED_GROUP |
+        ALLOW_MULTIPLEX_DEFINITION_NAME |
+        FIXED_INTERVAL_IS_GREEDY_ONLY |
+        WARN_CC_OP_NOT_ESCAPED |
+        WARN_REDUNDANT_NESTED_REPEAT ),
+
+        Option.NONE,
+
+        new MetaCharTable(
+            '\\',                           /* esc */
+            INEFFECTIVE_META_CHAR,          /* anychar '.' */
+            INEFFECTIVE_META_CHAR,          /* anytime '*' */
+            INEFFECTIVE_META_CHAR,          /* zero or one time '?' */
+            INEFFECTIVE_META_CHAR,          /* one or more time '+' */
+            INEFFECTIVE_META_CHAR           /* anychar anytime */
+        )
+    );
+
+    public static final Syntax DEFAULT = RUBY;
+
+    public static final Syntax ASIS = new Syntax(
+        0,
+
+        OP2_INEFFECTIVE_ESCAPE,
+
+        0,
+
+        Option.NONE,
+
+        new MetaCharTable(
+            '\\',                          /* esc */
+            INEFFECTIVE_META_CHAR,         /* anychar '.' */
+            INEFFECTIVE_META_CHAR,         /* anytime '*' */
+            INEFFECTIVE_META_CHAR,         /* zero or one time '?' */
+            INEFFECTIVE_META_CHAR,         /* one or more time '+' */
+            INEFFECTIVE_META_CHAR          /* anychar anytime */
+        )
+    );
+
+    public static final Syntax PosixBasic = new Syntax(
+        (POSIX_COMMON_OP | OP_ESC_LPAREN_SUBEXP |
+        OP_ESC_BRACE_INTERVAL ),
+
+        0,
+
+        0,
+
+        ( Option.SINGLELINE | Option.MULTILINE ),
+
+        new MetaCharTable(
+            '\\',                          /* esc */
+            INEFFECTIVE_META_CHAR,         /* anychar '.' */
+            INEFFECTIVE_META_CHAR,         /* anytime '*' */
+            INEFFECTIVE_META_CHAR,         /* zero or one time '?' */
+            INEFFECTIVE_META_CHAR,         /* one or more time '+' */
+            INEFFECTIVE_META_CHAR          /* anychar anytime */
+        )
+    );
+
+    public static final Syntax PosixExtended = new Syntax(
+        ( POSIX_COMMON_OP | OP_LPAREN_SUBEXP |
+        OP_BRACE_INTERVAL |
+        OP_PLUS_ONE_INF | OP_QMARK_ZERO_ONE |OP_VBAR_ALT ),
+
+        0,
+
+        ( CONTEXT_INDEP_ANCHORS |
+        CONTEXT_INDEP_REPEAT_OPS | CONTEXT_INVALID_REPEAT_OPS |
+        ALLOW_UNMATCHED_CLOSE_SUBEXP |
+        ALLOW_DOUBLE_RANGE_OP_IN_CC ),
+
+        ( Option.SINGLELINE | Option.MULTILINE ),
+
+        new MetaCharTable(
+            '\\',                          /* esc */
+            INEFFECTIVE_META_CHAR,         /* anychar '.' */
+            INEFFECTIVE_META_CHAR,         /* anytime '*' */
+            INEFFECTIVE_META_CHAR,         /* zero or one time '?' */
+            INEFFECTIVE_META_CHAR,         /* one or more time '+' */
+            INEFFECTIVE_META_CHAR          /* anychar anytime */
+        )
+    );
+
+    public static final Syntax Emacs = new Syntax(
+        ( OP_DOT_ANYCHAR | OP_BRACKET_CC |
+        OP_ESC_BRACE_INTERVAL |
+        OP_ESC_LPAREN_SUBEXP | OP_ESC_VBAR_ALT |
+        OP_ASTERISK_ZERO_INF | OP_PLUS_ONE_INF |
+        OP_QMARK_ZERO_ONE | OP_DECIMAL_BACKREF |
+        OP_LINE_ANCHOR | OP_ESC_CONTROL_CHARS ),
+
+        OP2_ESC_GNU_BUF_ANCHOR,
+
+        ALLOW_EMPTY_RANGE_IN_CC,
+
+        Option.NONE,
+
+        new MetaCharTable(
+            '\\',                          /* esc */
+            INEFFECTIVE_META_CHAR,         /* anychar '.' */
+            INEFFECTIVE_META_CHAR,         /* anytime '*' */
+            INEFFECTIVE_META_CHAR,         /* zero or one time '?' */
+            INEFFECTIVE_META_CHAR,         /* one or more time '+' */
+            INEFFECTIVE_META_CHAR          /* anychar anytime */
+        )
+    );
+
+    public static final Syntax Grep = new Syntax(
+        ( OP_DOT_ANYCHAR | OP_BRACKET_CC | OP_POSIX_BRACKET |
+        OP_ESC_BRACE_INTERVAL | OP_ESC_LPAREN_SUBEXP |
+        OP_ESC_VBAR_ALT |
+        OP_ASTERISK_ZERO_INF | OP_ESC_PLUS_ONE_INF |
+        OP_ESC_QMARK_ZERO_ONE | OP_LINE_ANCHOR |
+        OP_ESC_W_WORD | OP_ESC_B_WORD_BOUND |
+        OP_ESC_LTGT_WORD_BEGIN_END | OP_DECIMAL_BACKREF ),
+
+        0,
+
+        ( ALLOW_EMPTY_RANGE_IN_CC | NOT_NEWLINE_IN_NEGATIVE_CC ),
+
+        Option.NONE,
+
+        new MetaCharTable(
+            '\\',                          /* esc */
+            INEFFECTIVE_META_CHAR,         /* anychar '.' */
+            INEFFECTIVE_META_CHAR,         /* anytime '*' */
+            INEFFECTIVE_META_CHAR,         /* zero or one time '?' */
+            INEFFECTIVE_META_CHAR,         /* one or more time '+' */
+            INEFFECTIVE_META_CHAR          /* anychar anytime */
+        )
+    );
+
+    public static final Syntax GnuRegex = new Syntax(
+        GNU_REGEX_OP,
+        0,
+        GNU_REGEX_BV,
+
+        Option.NONE,
+
+        new MetaCharTable(
+            '\\',                          /* esc */
+            INEFFECTIVE_META_CHAR,         /* anychar '.' */
+            INEFFECTIVE_META_CHAR,         /* anytime '*' */
+            INEFFECTIVE_META_CHAR,         /* zero or one time '?' */
+            INEFFECTIVE_META_CHAR,         /* one or more time '+' */
+            INEFFECTIVE_META_CHAR          /* anychar anytime */
+        )
+    );
+
+    public static final Syntax Java = new Syntax(
+        (( GNU_REGEX_OP | OP_QMARK_NON_GREEDY |
+        OP_ESC_CONTROL_CHARS | OP_ESC_C_CONTROL |
+        OP_ESC_OCTAL3 | OP_ESC_X_HEX2 )
+        & ~OP_ESC_LTGT_WORD_BEGIN_END ),
+
+        ( OP2_ESC_CAPITAL_Q_QUOTE | OP2_QMARK_GROUP_EFFECT |
+        OP2_OPTION_PERL | OP2_PLUS_POSSESSIVE_REPEAT |
+        OP2_PLUS_POSSESSIVE_INTERVAL | OP2_CCLASS_SET_OP |
+        OP2_ESC_V_VTAB | OP2_ESC_U_HEX4 |
+        OP2_ESC_P_BRACE_CHAR_PROPERTY ),
+
+        ( GNU_REGEX_BV | DIFFERENT_LEN_ALT_LOOK_BEHIND ),
+
+        Option.SINGLELINE,
+
+        new MetaCharTable(
+            '\\',                          /* esc */
+            INEFFECTIVE_META_CHAR,         /* anychar '.' */
+            INEFFECTIVE_META_CHAR,         /* anytime '*' */
+            INEFFECTIVE_META_CHAR,         /* zero or one time '?' */
+            INEFFECTIVE_META_CHAR,         /* one or more time '+' */
+            INEFFECTIVE_META_CHAR          /* anychar anytime */
+        )
+    );
+
+    public static final Syntax Perl = new Syntax(
+        (( GNU_REGEX_OP | OP_QMARK_NON_GREEDY |
+        OP_ESC_OCTAL3 | OP_ESC_X_HEX2 |
+        OP_ESC_X_BRACE_HEX8 | OP_ESC_CONTROL_CHARS |
+        OP_ESC_C_CONTROL )
+        & ~OP_ESC_LTGT_WORD_BEGIN_END ),
+
+        ( OP2_ESC_CAPITAL_Q_QUOTE |
+        OP2_QMARK_GROUP_EFFECT | OP2_OPTION_PERL |
+        OP2_ESC_P_BRACE_CHAR_PROPERTY |
+        OP2_ESC_P_BRACE_CIRCUMFLEX_NOT ),
+
+        GNU_REGEX_BV,
+
+        Option.SINGLELINE,
+
+        new MetaCharTable(
+            '\\',                          /* esc */
+            INEFFECTIVE_META_CHAR,         /* anychar '.' */
+            INEFFECTIVE_META_CHAR,         /* anytime '*' */
+            INEFFECTIVE_META_CHAR,         /* zero or one time '?' */
+            INEFFECTIVE_META_CHAR,         /* one or more time '+' */
+            INEFFECTIVE_META_CHAR          /* anychar anytime */
+        )
+    );
+
+    public static final Syntax PerlNG = new Syntax(
+        (( GNU_REGEX_OP | OP_QMARK_NON_GREEDY |
+        OP_ESC_OCTAL3 | OP_ESC_X_HEX2 |
+        OP_ESC_X_BRACE_HEX8 | OP_ESC_CONTROL_CHARS |
+        OP_ESC_C_CONTROL )
+        & ~OP_ESC_LTGT_WORD_BEGIN_END ),
+
+        ( OP2_ESC_CAPITAL_Q_QUOTE |
+        OP2_QMARK_GROUP_EFFECT | OP2_OPTION_PERL |
+        OP2_ESC_P_BRACE_CHAR_PROPERTY  |
+        OP2_ESC_P_BRACE_CIRCUMFLEX_NOT |
+        OP2_QMARK_LT_NAMED_GROUP       |
+        OP2_ESC_K_NAMED_BACKREF        |
+        OP2_ESC_G_SUBEXP_CALL ),
+
+        ( GNU_REGEX_BV |
+        CAPTURE_ONLY_NAMED_GROUP |
+        ALLOW_MULTIPLEX_DEFINITION_NAME ),
+
+        Option.SINGLELINE,
+
+        new MetaCharTable(
+            '\\',                          /* esc */
+            INEFFECTIVE_META_CHAR,         /* anychar '.' */
+            INEFFECTIVE_META_CHAR,         /* anytime '*' */
+            INEFFECTIVE_META_CHAR,         /* zero or one time '?' */
+            INEFFECTIVE_META_CHAR,         /* one or more time '+' */
+            INEFFECTIVE_META_CHAR          /* anychar anytime */
+        )
+    );
+
+    public static final Syntax JAVASCRIPT = new Syntax(
+        (( GNU_REGEX_OP | OP_QMARK_NON_GREEDY |
+        OP_ESC_CONTROL_CHARS | OP_ESC_C_CONTROL | OP_ESC_X_HEX2)
+        & ~OP_ESC_LTGT_WORD_BEGIN_END ),
+
+        ( OP2_QMARK_GROUP_EFFECT | OP2_CCLASS_SET_OP |
+        OP2_ESC_V_VTAB | OP2_ESC_U_HEX4 ),
+
+        ( GNU_REGEX_BV | DIFFERENT_LEN_ALT_LOOK_BEHIND ),
+
+        Option.SINGLELINE,
+
+        new MetaCharTable(
+            '\\',                          /* esc */
+            INEFFECTIVE_META_CHAR,         /* anychar '.' */
+            INEFFECTIVE_META_CHAR,         /* anytime '*' */
+            INEFFECTIVE_META_CHAR,         /* zero or one time '?' */
+            INEFFECTIVE_META_CHAR,         /* one or more time '+' */
+            INEFFECTIVE_META_CHAR          /* anychar anytime */
+        )
+    );
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Token.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Token.java
new file mode 100644
index 00000000000..bcaf352cd0f
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Token.java
@@ -0,0 +1,172 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni;
+
+import jdk.nashorn.internal.runtime.regexp.joni.constants.TokenType;
+
+final class Token {
+    TokenType type;
+    boolean escaped;
+    int base;               /* is number: 8, 16 (used in [....]) */
+    int backP;
+
+    // union fields
+    private int INT1, INT2, INT3, INT4, INT5;
+    private int []INTA1;
+
+    // union accessors
+    int getC() {
+        return INT1;
+    }
+    void setC(int c) {
+        INT1 = c;
+    }
+
+    int getCode() {
+        return INT1;
+    }
+    void setCode(int code) {
+        INT1 = code;
+    }
+
+    int getAnchor() {
+        return INT1;
+    }
+    void setAnchor(int anchor) {
+        INT1 = anchor;
+    }
+
+    int getSubtype() {
+        return INT1;
+    }
+    void setSubtype(int subtype) {
+        INT1 = subtype;
+    }
+
+    // repeat union member
+    int getRepeatLower() {
+        return INT1;
+    }
+    void setRepeatLower(int lower) {
+        INT1 = lower;
+    }
+
+    int getRepeatUpper() {
+        return INT2;
+    }
+    void setRepeatUpper(int upper) {
+        INT2 = upper;
+    }
+
+    boolean getRepeatGreedy() {
+        return INT3 != 0;
+    }
+    void setRepeatGreedy(boolean greedy) {
+        INT3 = greedy ? 1 : 0;
+    }
+
+    boolean getRepeatPossessive() {
+        return INT4 != 0;
+    }
+    void setRepeatPossessive(boolean possessive) {
+        INT4 = possessive ? 1 : 0;
+    }
+
+    // backref union member
+    int getBackrefNum() {
+        return INT1;
+    }
+    void setBackrefNum(int num) {
+        INT1 = num;
+    }
+
+    int getBackrefRef1() {
+        return INT2;
+    }
+    void setBackrefRef1(int ref1) {
+        INT2 = ref1;
+    }
+
+    int[]getBackrefRefs() {
+        return INTA1;
+    }
+    void setBackrefRefs(int[]refs) {
+        INTA1 = refs;
+    }
+
+    boolean getBackrefByName() {
+        return INT3 != 0;
+    }
+    void setBackrefByName(boolean byName) {
+        INT3 = byName ? 1 : 0;
+    }
+
+    // USE_BACKREF_AT_LEVEL
+    boolean getBackrefExistLevel() {
+        return INT4 != 0;
+    }
+    void setBackrefExistLevel(boolean existLevel) {
+        INT4 = existLevel ? 1 : 0;
+    }
+
+    int getBackrefLevel() {
+        return INT5;
+    }
+    void setBackrefLevel(int level) {
+        INT5 = level;
+    }
+
+    // call union member
+    int getCallNameP() {
+        return INT1;
+    }
+    void setCallNameP(int nameP) {
+        INT1 = nameP;
+    }
+
+    int getCallNameEnd() {
+        return INT2;
+    }
+    void setCallNameEnd(int nameEnd) {
+        INT2 = nameEnd;
+    }
+
+    int getCallGNum() {
+        return INT3;
+    }
+    void setCallGNum(int gnum) {
+        INT3 = gnum;
+    }
+
+    // prop union member
+    int getPropCType() {
+        return INT1;
+    }
+    void setPropCType(int ctype) {
+        INT1 = ctype;
+    }
+
+    boolean getPropNot() {
+        return INT2 != 0;
+    }
+    void setPropNot(boolean not) {
+        INT2 = not ? 1 : 0;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/UnsetAddrList.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/UnsetAddrList.java
new file mode 100644
index 00000000000..ca72e16742f
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/UnsetAddrList.java
@@ -0,0 +1,69 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni;
+
+import jdk.nashorn.internal.runtime.regexp.joni.ast.EncloseNode;
+import jdk.nashorn.internal.runtime.regexp.joni.ast.Node;
+import jdk.nashorn.internal.runtime.regexp.joni.exception.ErrorMessages;
+import jdk.nashorn.internal.runtime.regexp.joni.exception.InternalException;
+
+public final class UnsetAddrList {
+    int num;
+    Node[]targets;
+    int[]offsets;
+
+    public UnsetAddrList(int size) {
+        targets = new Node[size];
+        offsets = new int[size];
+    }
+
+    public void add(int offset, Node node) {
+        if (num >= offsets.length) {
+            Node []ttmp = new Node[targets.length << 1];
+            System.arraycopy(targets, 0, ttmp, 0, num);
+            targets = ttmp;
+            int[]otmp = new int[offsets.length << 1];
+            System.arraycopy(offsets, 0, otmp, 0, num);
+            offsets = otmp;
+        }
+        targets[num] = node;
+        offsets[num] = offset;
+
+        num++;
+    }
+
+    public void fix(Regex regex) {
+        for (int i=0; i<num; i++) {
+            EncloseNode en = (EncloseNode)targets[i];
+            if (!en.isAddrFixed()) new InternalException(ErrorMessages.ERR_PARSER_BUG);
+            regex.code[offsets[i]] = en.callAddr; // is this safe ?
+        }
+    }
+
+    public String toString() {
+        StringBuilder value = new StringBuilder();
+        if (num > 0) {
+            for (int i=0; i<num; i++) {
+                value.append("offset + " + offsets[i] + " target: " + targets[i].getAddressName());
+            }
+        }
+        return value.toString();
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/WarnCallback.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/WarnCallback.java
new file mode 100644
index 00000000000..f2a035353c5
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/WarnCallback.java
@@ -0,0 +1,33 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni;
+
+/**
+ * @author <a href="mailto:ola.bini@gmail.com">Ola Bini</a>
+ */
+public interface WarnCallback {
+    WarnCallback DEFAULT = new WarnCallback() {
+        public void warn(String message) {
+            System.err.println(message);
+        }
+    };
+
+    void warn(String message);
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Warnings.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Warnings.java
new file mode 100644
index 00000000000..890a0818a8b
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/Warnings.java
@@ -0,0 +1,26 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni;
+
+public interface Warnings {
+    final String INVALID_BACKREFERENCE =            "invalid back reference";
+    final String INVALID_SUBEXP_CALL =              "invalid subexp call";
+    final String INVALID_UNICODE_PROPERTY =         "invalid Unicode Property \\<%n>";
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/AnchorNode.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/AnchorNode.java
new file mode 100644
index 00000000000..d07a26982d1
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/AnchorNode.java
@@ -0,0 +1,92 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni.ast;
+
+import jdk.nashorn.internal.runtime.regexp.joni.constants.AnchorType;
+
+public final class AnchorNode extends Node implements AnchorType {
+    public int type;
+    public Node target;
+    public int charLength;
+
+    public AnchorNode(int type) {
+        this.type = type;
+        charLength = -1;
+    }
+
+    @Override
+    public int getType() {
+        return ANCHOR;
+    }
+
+    @Override
+    protected void setChild(Node newChild) {
+        target = newChild;
+    }
+
+    @Override
+    protected Node getChild() {
+        return target;
+    }
+
+    public void setTarget(Node tgt) {
+        target = tgt;
+        tgt.parent = this;
+    }
+
+    @Override
+    public String getName() {
+        return "Anchor";
+    }
+
+    @Override
+    public String toString(int level) {
+        StringBuilder value = new StringBuilder();
+        value.append("\n  type: " + typeToString());
+        value.append("\n  target: " + pad(target, level + 1));
+        return value.toString();
+    }
+
+    public String typeToString() {
+        StringBuilder type = new StringBuilder();
+        if (isType(BEGIN_BUF)) type.append("BEGIN_BUF ");
+        if (isType(BEGIN_LINE)) type.append("BEGIN_LINE ");
+        if (isType(BEGIN_POSITION)) type.append("BEGIN_POSITION ");
+        if (isType(END_BUF)) type.append("END_BUF ");
+        if (isType(SEMI_END_BUF)) type.append("SEMI_END_BUF ");
+        if (isType(END_LINE)) type.append("END_LINE ");
+        if (isType(WORD_BOUND)) type.append("WORD_BOUND ");
+        if (isType(NOT_WORD_BOUND)) type.append("NOT_WORD_BOUND ");
+        if (isType(WORD_BEGIN)) type.append("WORD_BEGIN ");
+        if (isType(WORD_END)) type.append("WORD_END ");
+        if (isType(PREC_READ)) type.append("PREC_READ ");
+        if (isType(PREC_READ_NOT)) type.append("PREC_READ_NOT ");
+        if (isType(LOOK_BEHIND)) type.append("LOOK_BEHIND ");
+        if (isType(LOOK_BEHIND_NOT)) type.append("LOOK_BEHIND_NOT ");
+        if (isType(ANYCHAR_STAR)) type.append("ANYCHAR_STAR ");
+        if (isType(ANYCHAR_STAR_ML)) type.append("ANYCHAR_STAR_ML ");
+        return type.toString();
+    }
+
+    private boolean isType(int type) {
+        return (this.type & type) != 0;
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/AnyCharNode.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/AnyCharNode.java
new file mode 100644
index 00000000000..9558ce26353
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/AnyCharNode.java
@@ -0,0 +1,40 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni.ast;
+
+public final class AnyCharNode extends Node {
+    public AnyCharNode(){}
+
+    @Override
+    public int getType() {
+        return CANY;
+    }
+
+    @Override
+    public String getName() {
+        return "Any Char";
+    }
+
+    @Override
+    public String toString(int level) {
+        String value = "";
+        return value;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/BackRefNode.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/BackRefNode.java
new file mode 100644
index 00000000000..dde4f88d8f3
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/BackRefNode.java
@@ -0,0 +1,98 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni.ast;
+
+import jdk.nashorn.internal.runtime.regexp.joni.ScanEnvironment;
+import jdk.nashorn.internal.runtime.regexp.joni.exception.ErrorMessages;
+import jdk.nashorn.internal.runtime.regexp.joni.exception.ValueException;
+
+public final class BackRefNode extends StateNode {
+    //private static int NODE_BACKREFS_SIZE = 6;
+
+    //int state;
+    public int backNum;
+    public int back[];
+
+    public int nestLevel;
+
+    public BackRefNode(int backNum, int[]backRefs, boolean byName, ScanEnvironment env) {
+        this.backNum = backNum;
+        if (byName) setNameRef();
+
+        for (int i=0; i<backNum; i++) {
+            if (backRefs[i] <= env.numMem && env.memNodes[backRefs[i]] == null) {
+                setRecursion(); /* /...(\1).../ */
+                break;
+            }
+        }
+
+        back = new int[backNum];
+        System.arraycopy(backRefs, 0, back, 0, backNum); // shall we really dup it ???
+    }
+
+    // #ifdef USE_BACKREF_AT_LEVEL
+    public BackRefNode(int backNum, int[]backRefs, boolean byName, boolean existLevel, int nestLevel, ScanEnvironment env) {
+        this(backNum, backRefs, byName, env);
+
+        if (existLevel) {
+            //state |= NST_NEST_LEVEL;
+            setNestLevel();
+            this.nestLevel = nestLevel;
+        }
+    }
+
+    @Override
+    public int getType() {
+        return BREF;
+    }
+
+    @Override
+    public String getName() {
+        return "Back Ref";
+    }
+
+    @Override
+    public String toString(int level) {
+        StringBuilder value = new StringBuilder(super.toString(level));
+        value.append("\n  backNum: " + backNum);
+        String backs = "";
+        for (int i=0; i<back.length; i++) backs += back[i] + ", ";
+        value.append("\n  back: " + backs);
+        value.append("\n  nextLevel: " + nestLevel);
+        return value.toString();
+    }
+
+    public void renumber(int[]map) {
+        if (!isNameRef()) throw new ValueException(ErrorMessages.ERR_NUMBERED_BACKREF_OR_CALL_NOT_ALLOWED);
+
+        int oldNum = backNum;
+
+        int pos = 0;
+        for (int i=0; i<oldNum; i++) {
+            int n = map[back[i]];
+            if (n > 0) {
+                back[pos] = n;
+                pos++;
+            }
+        }
+        backNum = pos;
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/CClassNode.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/CClassNode.java
new file mode 100644
index 00000000000..4a73e266abf
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/CClassNode.java
@@ -0,0 +1,545 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni.ast;
+
+import jdk.nashorn.internal.runtime.regexp.joni.*;
+import jdk.nashorn.internal.runtime.regexp.joni.constants.CCSTATE;
+import jdk.nashorn.internal.runtime.regexp.joni.constants.CCVALTYPE;
+import jdk.nashorn.internal.runtime.regexp.joni.encoding.AsciiTables;
+import jdk.nashorn.internal.runtime.regexp.joni.encoding.CharacterType;
+import jdk.nashorn.internal.runtime.regexp.joni.encoding.IntHolder;
+import jdk.nashorn.internal.runtime.regexp.joni.exception.ErrorMessages;
+import jdk.nashorn.internal.runtime.regexp.joni.exception.InternalException;
+import jdk.nashorn.internal.runtime.regexp.joni.exception.SyntaxException;
+import jdk.nashorn.internal.runtime.regexp.joni.exception.ValueException;
+
+public final class CClassNode extends Node {
+    private static final int FLAG_NCCLASS_NOT = 1<<0;
+    private static final int FLAG_NCCLASS_SHARE = 1<<1;
+
+    int flags;
+    public final BitSet bs = new BitSet();  // conditional creation ?
+    public CodeRangeBuffer mbuf;            /* multi-byte info or NULL */
+
+    private int ctype;                      // for hashing purposes
+
+    // node_new_cclass
+    public CClassNode() {}
+
+    public CClassNode(int ctype, boolean not, int sbOut, int[]ranges) {
+        this(not, sbOut, ranges);
+        this.ctype = ctype;
+    }
+
+    public void clear() {
+        bs.clear();
+        flags = 0;
+        mbuf = null;
+    }
+
+    // node_new_cclass_by_codepoint_range, only used by shared Char Classes
+    public CClassNode(boolean not, int sbOut, int[]ranges) {
+        if (not) setNot();
+        // bs.clear();
+
+        if (sbOut > 0 && ranges != null) {
+            int n = ranges[0];
+            for (int i=0; i<n; i++) {
+                int from = ranges[i * 2 + 1];
+                int to = ranges[i * 2 + 2];
+                for (int j=from; j<=to; j++) {
+                    if (j >= sbOut) {
+                        setupBuffer(ranges);
+                        return;
+                    }
+                    bs.set(j);
+                }
+            }
+        }
+        setupBuffer(ranges);
+    }
+
+    @Override
+    public int getType() {
+        return CCLASS;
+    }
+
+    @Override
+    public String getName() {
+        return "Character Class";
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (!(other instanceof CClassNode)) return false;
+        CClassNode cc = (CClassNode)other;
+        return ctype == cc.ctype && isNot() == cc.isNot();
+    }
+
+    @Override
+    public int hashCode() {
+        if (Config.USE_SHARED_CCLASS_TABLE) {
+            int hash = 0;
+            hash += ctype;
+            if (isNot()) hash++;
+            return hash + (hash >> 5);
+        } else {
+            return super.hashCode();
+        }
+    }
+
+    @Override
+    public String toString(int level) {
+        StringBuilder value = new StringBuilder();
+        value.append("\n  flags: " + flagsToString());
+        value.append("\n  bs: " + pad(bs, level + 1));
+        value.append("\n  mbuf: " + pad(mbuf, level + 1));
+
+        return value.toString();
+    }
+
+    public String flagsToString() {
+        StringBuilder flags = new StringBuilder();
+        if (isNot()) flags.append("NOT ");
+        if (isShare()) flags.append("SHARE ");
+        return flags.toString();
+    }
+
+    private void setupBuffer(int[]ranges) {
+        if (ranges != null) {
+            if (ranges[0] == 0) return;
+            mbuf = new CodeRangeBuffer(ranges);
+        }
+    }
+
+    public boolean isEmpty() {
+        return mbuf == null && bs.isEmpty();
+    }
+
+    public void addCodeRangeToBuf(int from, int to) {
+        mbuf = CodeRangeBuffer.addCodeRangeToBuff(mbuf, from, to);
+    }
+
+    public void addCodeRange(ScanEnvironment env, int from, int to) {
+        mbuf = CodeRangeBuffer.addCodeRange(mbuf, env, from, to);
+    }
+
+    public void addAllMultiByteRange() {
+        mbuf = CodeRangeBuffer.addAllMultiByteRange(mbuf);
+    }
+
+    public void clearNotFlag() {
+        if (isNot()) {
+            bs.invert();
+
+            mbuf = CodeRangeBuffer.notCodeRangeBuff(mbuf);
+            clearNot();
+        }
+    }
+
+    // and_cclass
+    public void and(CClassNode other) {
+        boolean not1 = isNot();
+        BitSet bsr1 = bs;
+        CodeRangeBuffer buf1 = mbuf;
+        boolean not2 = other.isNot();
+        BitSet bsr2 = other.bs;
+        CodeRangeBuffer buf2 = other.mbuf;
+
+        if (not1) {
+            BitSet bs1 = new BitSet();
+            bsr1.invertTo(bs1);
+            bsr1 = bs1;
+        }
+
+        if (not2) {
+            BitSet bs2 = new BitSet();
+            bsr2.invertTo(bs2);
+            bsr2 = bs2;
+        }
+
+        bsr1.and(bsr2);
+
+        if (bsr1 != bs) {
+            bs.copy(bsr1);
+            bsr1 = bs;
+        }
+
+        if (not1) {
+            bs.invert();
+        }
+
+        CodeRangeBuffer pbuf = null;
+
+        if (not1 && not2) {
+            pbuf = CodeRangeBuffer.orCodeRangeBuff(buf1, false, buf2, false);
+        } else {
+            pbuf = CodeRangeBuffer.andCodeRangeBuff(buf1, not1, buf2, not2);
+
+            if (not1) {
+                pbuf = CodeRangeBuffer.notCodeRangeBuff(pbuf);
+            }
+        }
+        mbuf = pbuf;
+
+    }
+
+    // or_cclass
+    public void or(CClassNode other) {
+        boolean not1 = isNot();
+        BitSet bsr1 = bs;
+        CodeRangeBuffer buf1 = mbuf;
+        boolean not2 = other.isNot();
+        BitSet bsr2 = other.bs;
+        CodeRangeBuffer buf2 = other.mbuf;
+
+        if (not1) {
+            BitSet bs1 = new BitSet();
+            bsr1.invertTo(bs1);
+            bsr1 = bs1;
+        }
+
+        if (not2) {
+            BitSet bs2 = new BitSet();
+            bsr2.invertTo(bs2);
+            bsr2 = bs2;
+        }
+
+        bsr1.or(bsr2);
+
+        if (bsr1 != bs) {
+            bs.copy(bsr1);
+            bsr1 = bs;
+        }
+
+        if (not1) {
+            bs.invert();
+        }
+
+        CodeRangeBuffer pbuf = null;
+        if (not1 && not2) {
+            pbuf = CodeRangeBuffer.andCodeRangeBuff(buf1, false, buf2, false);
+        } else {
+            pbuf = CodeRangeBuffer.orCodeRangeBuff(buf1, not1, buf2, not2);
+            if (not1) {
+                pbuf = CodeRangeBuffer.notCodeRangeBuff(pbuf);
+            }
+        }
+        mbuf = pbuf;
+    }
+
+    // add_ctype_to_cc_by_range // Encoding out!
+    public void addCTypeByRange(int ctype, boolean not, int sbOut, int mbr[]) {
+        int n = mbr[0];
+
+        if (!not) {
+            for (int i=0; i<n; i++) {
+                for (int j=mbr[i * 2 + 1]; j<=mbr[i * 2 + 2]; j++) {
+                    if (j >= sbOut) {
+                        if (Config.VANILLA) {
+                            if (j == mbr[i * 2 + 2]) {
+                                i++;
+                            } else if (j > mbr[i * 2 + 1]) {
+                                addCodeRangeToBuf(j, mbr[i * 2 + 2]);
+                                i++;
+                            }
+                        } else {
+                            if (j >= mbr[i * 2 + 1]) {
+                                addCodeRangeToBuf(j, mbr[i * 2 + 2]);
+                                i++;
+                            }
+                        }
+                        // !goto sb_end!, remove duplication!
+                        for (; i<n; i++) {
+                            addCodeRangeToBuf(mbr[2 * i + 1], mbr[2 * i + 2]);
+                        }
+                        return;
+                    }
+                    bs.set(j);
+                }
+            }
+            // !sb_end:!
+            for (int i=0; i<n; i++) {
+                addCodeRangeToBuf(mbr[2 * i + 1], mbr[2 * i + 2]);
+            }
+
+        } else {
+            int prev = 0;
+
+            for (int i=0; i<n; i++) {
+                for (int j=prev; j < mbr[2 * i + 1]; j++) {
+                    if (j >= sbOut) {
+                        // !goto sb_end2!, remove duplication
+                        prev = sbOut;
+                        for (i=0; i<n; i++) {
+                            if (prev < mbr[2 * i + 1]) addCodeRangeToBuf(prev, mbr[i * 2 + 1] - 1);
+                            prev = mbr[i * 2 + 2] + 1;
+                        }
+                        if (prev < 0x7fffffff/*!!!*/) addCodeRangeToBuf(prev, 0x7fffffff);
+                        return;
+                    }
+                    bs.set(j);
+                }
+                prev = mbr[2 * i + 2] + 1;
+            }
+
+            for (int j=prev; j<sbOut; j++) {
+                bs.set(j);
+            }
+
+            // !sb_end2:!
+            prev = sbOut;
+            for (int i=0; i<n; i++) {
+                if (prev < mbr[2 * i + 1]) addCodeRangeToBuf(prev, mbr[i * 2 + 1] - 1);
+                prev = mbr[i * 2 + 2] + 1;
+            }
+            if (prev < 0x7fffffff/*!!!*/) addCodeRangeToBuf(prev, 0x7fffffff);
+        }
+    }
+
+    public void addCType(int ctype, boolean not, ScanEnvironment env, IntHolder sbOut) {
+        if (Config.NON_UNICODE_SDW) {
+            switch(ctype) {
+            case CharacterType.D:
+            case CharacterType.S:
+            case CharacterType.W:
+                ctype ^= CharacterType.SPECIAL_MASK;
+
+                if (env.syntax == Syntax.JAVASCRIPT && ctype == CharacterType.SPACE) {
+                    // \s in JavaScript includes unicode characters.
+                    break;
+                }
+
+                if (not) {
+                    for (int c = 0; c < BitSet.SINGLE_BYTE_SIZE; c++) {
+                        // if (!ASCIIEncoding.INSTANCE.isCodeCType(c, ctype)) bs.set(c);
+                        if ((AsciiTables.AsciiCtypeTable[c] & (1 << ctype)) == 0) bs.set(c);
+                    }
+                    addAllMultiByteRange();
+                } else {
+                    for (int c = 0; c < BitSet.SINGLE_BYTE_SIZE; c++) {
+                        // if (ASCIIEncoding.INSTANCE.isCodeCType(c, ctype)) bs.set(c);
+                        if ((AsciiTables.AsciiCtypeTable[c] & (1 << ctype)) != 0) bs.set(c);
+                    }
+                }
+                return;
+            }
+        }
+
+        int[] ranges = EncodingHelper.ctypeCodeRange(ctype, sbOut);
+        if (ranges != null) {
+            addCTypeByRange(ctype, not, sbOut.value, ranges);
+            return;
+        }
+
+        switch(ctype) {
+        case CharacterType.ALPHA:
+        case CharacterType.BLANK:
+        case CharacterType.CNTRL:
+        case CharacterType.DIGIT:
+        case CharacterType.LOWER:
+        case CharacterType.PUNCT:
+        case CharacterType.SPACE:
+        case CharacterType.UPPER:
+        case CharacterType.XDIGIT:
+        case CharacterType.ASCII:
+        case CharacterType.ALNUM:
+            if (not) {
+                for (int c=0; c<BitSet.SINGLE_BYTE_SIZE; c++) {
+                    if (!EncodingHelper.isCodeCType(c, ctype)) bs.set(c);
+                }
+                addAllMultiByteRange();
+            } else {
+                for (int c=0; c<BitSet.SINGLE_BYTE_SIZE; c++) {
+                    if (EncodingHelper.isCodeCType(c, ctype)) bs.set(c);
+                }
+            }
+            break;
+
+        case CharacterType.GRAPH:
+        case CharacterType.PRINT:
+            if (not) {
+                for (int c=0; c<BitSet.SINGLE_BYTE_SIZE; c++) {
+                    if (!EncodingHelper.isCodeCType(c, ctype)) bs.set(c);
+                }
+            } else {
+                for (int c=0; c<BitSet.SINGLE_BYTE_SIZE; c++) {
+                    if (EncodingHelper.isCodeCType(c, ctype)) bs.set(c);
+                }
+                addAllMultiByteRange();
+            }
+            break;
+
+        case CharacterType.WORD:
+            if (!not) {
+                for (int c=0; c<BitSet.SINGLE_BYTE_SIZE; c++) {
+                    if (EncodingHelper.isWord(c)) bs.set(c);
+                }
+
+                addAllMultiByteRange();
+            } else {
+                for (int c=0; c<BitSet.SINGLE_BYTE_SIZE; c++) {
+                    if (!EncodingHelper.isWord(c)) bs.set(c);
+                }
+            }
+            break;
+
+        default:
+            throw new InternalException(ErrorMessages.ERR_PARSER_BUG);
+        } // switch
+    }
+
+    public static final class CCStateArg {
+        public int v;
+        public int vs;
+        public boolean vsIsRaw;
+        public boolean vIsRaw;
+        public CCVALTYPE inType;
+        public CCVALTYPE type;
+        public CCSTATE state;
+    }
+
+    public void nextStateClass(CCStateArg arg, ScanEnvironment env) {
+        if (arg.state == CCSTATE.RANGE) throw new SyntaxException(ErrorMessages.ERR_CHAR_CLASS_VALUE_AT_END_OF_RANGE);
+
+        if (arg.state == CCSTATE.VALUE && arg.type != CCVALTYPE.CLASS) {
+            if (arg.type == CCVALTYPE.SB) {
+                bs.set(arg.vs);
+            } else if (arg.type == CCVALTYPE.CODE_POINT) {
+                addCodeRange(env, arg.vs, arg.vs);
+            }
+        }
+        arg.state = CCSTATE.VALUE;
+        arg.type = CCVALTYPE.CLASS;
+    }
+
+    public void nextStateValue(CCStateArg arg, ScanEnvironment env) {
+
+        switch(arg.state) {
+        case VALUE:
+            if (arg.type == CCVALTYPE.SB) {
+                if (arg.vs > 0xff) throw new ValueException(ErrorMessages.ERR_INVALID_CODE_POINT_VALUE);
+                bs.set(arg.vs);
+            } else if (arg.type == CCVALTYPE.CODE_POINT) {
+                addCodeRange(env, arg.vs, arg.vs);
+            }
+            break;
+
+        case RANGE:
+            if (arg.inType == arg.type) {
+                if (arg.inType == CCVALTYPE.SB) {
+                    if (arg.vs > 0xff || arg.v > 0xff) throw new ValueException(ErrorMessages.ERR_INVALID_CODE_POINT_VALUE);
+
+                    if (arg.vs > arg.v) {
+                        if (env.syntax.allowEmptyRangeInCC()) {
+                            // goto ccs_range_end
+                            arg.state = CCSTATE.COMPLETE;
+                            break;
+                        } else {
+                            throw new ValueException(ErrorMessages.ERR_EMPTY_RANGE_IN_CHAR_CLASS);
+                        }
+                    }
+                    bs.setRange(arg.vs, arg.v);
+                } else {
+                    addCodeRange(env, arg.vs, arg.v);
+                }
+            } else {
+                if (arg.vs > arg.v) {
+                    if (env.syntax.allowEmptyRangeInCC()) {
+                        // goto ccs_range_end
+                        arg.state = CCSTATE.COMPLETE;
+                        break;
+                    } else {
+                        throw new ValueException(ErrorMessages.ERR_EMPTY_RANGE_IN_CHAR_CLASS);
+                    }
+                }
+                bs.setRange(arg.vs, arg.v < 0xff ? arg.v : 0xff);
+                addCodeRange(env, arg.vs, arg.v);
+            }
+            // ccs_range_end:
+            arg.state = CCSTATE.COMPLETE;
+            break;
+
+        case COMPLETE:
+        case START:
+            arg.state = CCSTATE.VALUE;
+            break;
+
+        default:
+            break;
+
+        } // switch
+
+        arg.vsIsRaw = arg.vIsRaw;
+        arg.vs = arg.v;
+        arg.type = arg.inType;
+    }
+
+    // onig_is_code_in_cc_len
+    public boolean isCodeInCCLength(int code) {
+        boolean found;
+
+        if (code > 0xff) {
+            if (mbuf == null) {
+                found = false;
+            } else {
+                found = EncodingHelper.isInCodeRange(mbuf.getCodeRange(), code);
+            }
+        } else {
+            found = bs.at(code);
+        }
+
+        if (isNot()) {
+            return !found;
+        } else {
+            return found;
+        }
+    }
+
+    // onig_is_code_in_cc
+    public boolean isCodeInCC(int code) {
+         return isCodeInCCLength(code);
+    }
+
+    public void setNot() {
+        flags |= FLAG_NCCLASS_NOT;
+    }
+
+    public void clearNot() {
+        flags &= ~FLAG_NCCLASS_NOT;
+    }
+
+    public boolean isNot() {
+        return (flags & FLAG_NCCLASS_NOT) != 0;
+    }
+
+    public void setShare() {
+        flags |= FLAG_NCCLASS_SHARE;
+    }
+
+    public void clearShare() {
+        flags &= ~FLAG_NCCLASS_SHARE;
+    }
+
+    public boolean isShare() {
+        return (flags & FLAG_NCCLASS_SHARE) != 0;
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/CTypeNode.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/CTypeNode.java
new file mode 100644
index 00000000000..b03f9900777
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/CTypeNode.java
@@ -0,0 +1,50 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni.ast;
+
+public final class CTypeNode extends Node {
+    public int ctype;
+    public boolean not;
+
+    public CTypeNode(int type, boolean not) {
+        this.ctype= type;
+        this.not = not;
+    }
+
+    @Override
+    public int getType() {
+        return CTYPE;
+    }
+
+    @Override
+    public String getName() {
+        return "Character Type";
+    }
+
+    @Override
+    public String toString(int level) {
+        StringBuilder value = new StringBuilder();
+        value.append("\n  ctype: " + ctype);
+        value.append("\n  not: " + not);
+
+        return value.toString();
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/CallNode.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/CallNode.java
new file mode 100644
index 00000000000..361471b5607
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/CallNode.java
@@ -0,0 +1,86 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni.ast;
+
+import java.util.Set;
+
+import jdk.nashorn.internal.runtime.regexp.joni.UnsetAddrList;
+import jdk.nashorn.internal.runtime.regexp.joni.WarnCallback;
+
+public final class CallNode extends StateNode {
+    public char[] name;
+    public int nameP;
+    public int nameEnd;
+
+    public int groupNum;
+    public Node target;             // is it an EncloseNode always ?
+    public UnsetAddrList unsetAddrList;
+
+    public CallNode(char[] name, int nameP, int nameEnd, int gnum) {
+        this.name = name;
+        this.nameP = nameP;
+        this.nameEnd = nameEnd;
+        this.groupNum = gnum; /* call by number if gnum != 0 */
+    }
+
+    @Override
+    public int getType() {
+        return CALL;
+    }
+
+    @Override
+    protected void setChild(Node newChild) {
+        target = newChild;
+    }
+
+    @Override
+    protected Node getChild() {
+        return target;
+    }
+
+    public void setTarget(Node tgt) {
+        target = tgt;
+        tgt.parent = this;
+    }
+
+    @Override
+    public String getName() {
+        return "Call";
+    }
+
+    @Override
+    public void verifyTree(Set<Node> set, WarnCallback warnings) {
+        if (target == null || target.parent == this)
+            warnings.warn(this.getAddressName() + " doesn't point to a target or the target has been stolen");
+        // do not recurse here
+    }
+
+    @Override
+    public String toString(int level) {
+        StringBuilder value = new StringBuilder(super.toString(level));
+        value.append("\n  name: " + new String(name, nameP, nameEnd - nameP));
+        value.append("\n  groupNum: " + groupNum);
+        value.append("\n  target: " + pad(target.getAddressName(), level + 1));
+        value.append("\n  unsetAddrList: " + pad(unsetAddrList, level + 1));
+
+        return value.toString();
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/ConsAltNode.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/ConsAltNode.java
new file mode 100644
index 00000000000..e8bcb303901
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/ConsAltNode.java
@@ -0,0 +1,152 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni.ast;
+
+import java.util.Set;
+
+import jdk.nashorn.internal.runtime.regexp.joni.WarnCallback;
+import jdk.nashorn.internal.runtime.regexp.joni.exception.ErrorMessages;
+import jdk.nashorn.internal.runtime.regexp.joni.exception.InternalException;
+
+public final class ConsAltNode extends Node {
+    public Node car;
+    public ConsAltNode cdr;
+    private int type;           // List or Alt
+
+    private ConsAltNode(Node car, ConsAltNode cdr, int type) {
+        this.car = car;
+        if (car != null) car.parent = this;
+        this.cdr = cdr;
+        if (cdr != null) cdr.parent = this;
+
+        this.type = type;
+    }
+
+    public static ConsAltNode newAltNode(Node left, ConsAltNode right) {
+        return new ConsAltNode(left, right, ALT);
+    }
+
+    public static ConsAltNode newListNode(Node left, ConsAltNode right) {
+        return new ConsAltNode(left, right, LIST);
+    }
+
+    public static ConsAltNode listAdd(ConsAltNode list, Node x) {
+        ConsAltNode n = newListNode(x, null);
+
+        if (list != null) {
+            while (list.cdr != null) {
+                list = list.cdr;
+            }
+            list.setCdr(n);
+        }
+        return n;
+    }
+
+    public void toListNode() {
+        type = LIST;
+    }
+
+    public void toAltNode() {
+        type = ALT;
+    }
+
+    @Override
+    public int getType() {
+        return type;
+    }
+
+    @Override
+    protected void setChild(Node newChild) {
+        car = newChild;
+    }
+
+    @Override
+    protected Node getChild() {
+        return car;
+    }
+
+    @Override
+    public void swap(Node with) {
+        if (cdr != null) {
+            cdr.parent = with;
+            if (with instanceof ConsAltNode) {
+                ConsAltNode withCan = (ConsAltNode)with;
+                withCan.cdr.parent = this;
+                ConsAltNode tmp = cdr;
+                cdr = withCan.cdr;
+                withCan.cdr = tmp;
+            }
+        }
+        super.swap(with);
+    }
+
+    @Override
+    public void verifyTree(Set<Node> set, WarnCallback warnings) {
+        if (!set.contains(this)) {
+            set.add(this);
+            if (car != null) {
+                if (car.parent != this) {
+                    warnings.warn("broken list car: " + this.getAddressName() + " -> " +  car.getAddressName());
+                }
+                car.verifyTree(set,warnings);
+            }
+            if (cdr != null) {
+                if (cdr.parent != this) {
+                    warnings.warn("broken list cdr: " + this.getAddressName() + " -> " +  cdr.getAddressName());
+                }
+                cdr.verifyTree(set,warnings);
+            }
+        }
+    }
+
+    public Node setCar(Node ca) {
+        car = ca;
+        ca.parent = this;
+        return car;
+    }
+
+    public ConsAltNode setCdr(ConsAltNode cd) {
+        cdr = cd;
+        cd.parent = this;
+        return cdr;
+    }
+
+    @Override
+    public String getName() {
+        switch (type) {
+        case ALT:
+            return "Alt";
+        case LIST:
+            return "List";
+        default:
+            throw new InternalException(ErrorMessages.ERR_PARSER_BUG);
+        }
+    }
+
+    @Override
+    public String toString(int level) {
+        StringBuilder value = new StringBuilder();
+        value.append("\n  car: " + pad(car, level + 1));
+        value.append("\n  cdr: " + (cdr == null ? "NULL" : cdr.toString()));
+
+        return value.toString();
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/EncloseNode.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/EncloseNode.java
new file mode 100644
index 00000000000..a60afb1d1d6
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/EncloseNode.java
@@ -0,0 +1,151 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni.ast;
+
+import jdk.nashorn.internal.runtime.regexp.joni.Config;
+import jdk.nashorn.internal.runtime.regexp.joni.Option;
+import jdk.nashorn.internal.runtime.regexp.joni.constants.EncloseType;
+
+public final class EncloseNode extends StateNode implements EncloseType {
+
+    public int type;                // enclose type
+    public int regNum;
+    public int option;
+    public Node target;             /* EncloseNode : ENCLOSE_MEMORY */
+    public int callAddr;            // AbsAddrType
+    public int minLength;           // OnigDistance
+    public int maxLength;           // OnigDistance
+    public int charLength;
+    public int optCount;            // referenced count in optimize_node_left()
+
+    // node_new_enclose / onig_node_new_enclose
+    public EncloseNode(int type) {
+        this.type = type;
+        callAddr = -1;
+    }
+
+    // node_new_enclose_memory
+    public EncloseNode(int option, boolean isNamed) {
+        this(MEMORY);
+        if (isNamed) setNamedGroup();
+        if (Config.USE_SUBEXP_CALL) this.option = option;
+    }
+
+    // node_new_option
+    public EncloseNode(int option, int i) {
+        this(OPTION);
+        this.option = option;
+    }
+
+    @Override
+    public int getType() {
+        return ENCLOSE;
+    }
+
+    @Override
+    protected void setChild(Node newChild) {
+        target = newChild;
+    }
+
+    @Override
+    protected Node getChild() {
+        return target;
+    }
+
+    public void setTarget(Node tgt) {
+        target = tgt;
+        tgt.parent = this;
+    }
+
+    @Override
+    public String getName() {
+        return "Enclose";
+    }
+
+    @Override
+    public String toString(int level) {
+        StringBuilder value = new StringBuilder(super.toString(level));
+        value.append("\n  type: " + typeToString());
+        value.append("\n  regNum: " + regNum);
+        value.append("\n  option: " + Option.toString(option));
+        value.append("\n  target: " + pad(target, level + 1));
+        value.append("\n  callAddr: " + callAddr);
+        value.append("\n  minLength: " + minLength);
+        value.append("\n  maxLength: " + maxLength);
+        value.append("\n  charLength: " + charLength);
+        value.append("\n  optCount: " + optCount);
+
+        return value.toString();
+    }
+
+    public String typeToString() {
+        StringBuilder types = new StringBuilder();
+        if (isStopBacktrack()) types.append("STOP_BACKTRACK ");
+        if (isMemory()) types.append("MEMORY ");
+        if (isOption()) types.append("OPTION ");
+
+        return types.toString();
+    }
+
+    public void setEncloseStatus(int flag) {
+        state |= flag;
+    }
+
+    public void clearEncloseStatus(int flag) {
+        state &= ~flag;
+    }
+
+    public void clearMemory() {
+        type &= ~MEMORY;
+    }
+
+    public void setMemory() {
+        type |= MEMORY;
+    }
+
+    public boolean isMemory() {
+        return (type & MEMORY) != 0;
+    }
+
+    public void clearOption() {
+        type &= ~OPTION;
+    }
+
+    public void setOption() {
+        type |= OPTION;
+    }
+
+    public boolean isOption() {
+        return (type & OPTION) != 0;
+    }
+
+    public void clearStopBacktrack() {
+        type &= ~STOP_BACKTRACK;
+    }
+
+    public void setStopBacktrack() {
+        type |= STOP_BACKTRACK;
+    }
+
+    public boolean isStopBacktrack() {
+        return (type & STOP_BACKTRACK) != 0;
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/Node.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/Node.java
new file mode 100644
index 00000000000..5bdf3487713
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/Node.java
@@ -0,0 +1,135 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni.ast;
+
+import java.util.Set;
+
+import jdk.nashorn.internal.runtime.regexp.joni.Config;
+import jdk.nashorn.internal.runtime.regexp.joni.WarnCallback;
+import jdk.nashorn.internal.runtime.regexp.joni.constants.NodeType;
+
+public abstract class Node implements NodeType {
+    public Node parent;
+
+    public abstract int getType();
+
+    public final int getType2Bit() {
+        return 1 << getType();
+    }
+
+    protected void setChild(Node tgt){}         // default definition
+    protected Node getChild(){return null;};    // default definition
+
+    public void swap(Node with) {
+        Node tmp;
+
+        //if (getChild() != null) getChild().parent = with;
+        //if (with.getChild() != null) with.getChild().parent = this;
+
+        //tmp = getChild();
+        //setChild(with.getChild());
+        //with.setChild(tmp);
+
+        if (parent != null) parent.setChild(with);
+
+        if (with.parent != null) with.parent.setChild(this);
+
+        tmp = parent;
+        parent = with.parent;
+        with.parent = tmp;
+    }
+
+    // overridden by ConsAltNode and CallNode
+    public void verifyTree(Set<Node> set, WarnCallback warnings) {
+        if (!set.contains(this) && getChild() != null) {
+            set.add(this);
+            if (getChild().parent != this) {
+                warnings.warn("broken link to child: " + this.getAddressName() + " -> " + getChild().getAddressName());
+            }
+            getChild().verifyTree(set, warnings);
+        }
+    }
+
+    public abstract String getName();
+    protected abstract String toString(int level);
+
+    public String getAddressName() {
+        return getName() + ":0x" + Integer.toHexString(System.identityHashCode(this));
+    }
+
+    public final String toString() {
+        StringBuilder s = new StringBuilder();
+        s.append("<" + getAddressName() + " (" + (parent == null ? "NULL" : parent.getAddressName())  + ")>");
+        return s + toString(0);
+    }
+
+    protected static String pad(Object value, int level) {
+        if (value == null) return "NULL";
+
+        StringBuilder pad = new StringBuilder("  ");
+        for (int i=0; i<level; i++) pad.append(pad);
+
+        return value.toString().replace("\n",  "\n" + pad);
+    }
+
+    public final boolean isInvalidQuantifier() {
+        if (!Config.VANILLA) return false;
+
+        ConsAltNode node;
+
+        switch(getType()) {
+
+        case ANCHOR:
+            return true;
+
+        case ENCLOSE:
+            /* allow enclosed elements */
+            /* return is_invalid_quantifier_target(NENCLOSE(node)->target); */
+            break;
+
+        case LIST:
+            node = (ConsAltNode)this;
+            do {
+                if (!node.car.isInvalidQuantifier()) return false;
+            } while ((node = node.cdr) != null);
+            return false;
+
+        case ALT:
+            node = (ConsAltNode)this;
+            do {
+                if (node.car.isInvalidQuantifier()) return true;
+            } while ((node = node.cdr) != null);
+            break;
+
+        default:
+            break;
+        }
+
+        return false;
+    }
+
+    public final boolean isAllowedInLookBehind() {
+        return (getType2Bit() & ALLOWED_IN_LB) != 0;
+    }
+
+    public final boolean isSimple() {
+        return (getType2Bit() & SIMPLE) != 0;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/QuantifierNode.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/QuantifierNode.java
new file mode 100644
index 00000000000..76a5868d000
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/QuantifierNode.java
@@ -0,0 +1,272 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni.ast;
+
+import jdk.nashorn.internal.runtime.regexp.joni.Config;
+import jdk.nashorn.internal.runtime.regexp.joni.ScanEnvironment;
+import jdk.nashorn.internal.runtime.regexp.joni.constants.Reduce;
+import jdk.nashorn.internal.runtime.regexp.joni.constants.TargetInfo;
+
+public final class QuantifierNode extends StateNode {
+
+    public Node target;
+    public int lower;
+    public int upper;
+    public boolean greedy;
+
+    public int targetEmptyInfo;
+
+    public Node headExact;
+    public Node nextHeadExact;
+    public boolean isRefered;           /* include called node. don't eliminate even if {0} */
+
+    // USE_COMBINATION_EXPLOSION_CHECK
+    public int  combExpCheckNum;        /* 1,2,3...: check,  0: no check  */
+
+    public QuantifierNode(int lower, int upper, boolean byNumber) {
+        this.lower = lower;
+        this.upper = upper;
+        greedy = true;
+        targetEmptyInfo = TargetInfo.ISNOT_EMPTY;
+
+        if (byNumber) setByNumber();
+    }
+
+    @Override
+    public int getType() {
+        return QTFR;
+    }
+
+    @Override
+    protected void setChild(Node newChild) {
+        target = newChild;
+    }
+
+    @Override
+    protected Node getChild() {
+        return target;
+    }
+
+    public void setTarget(Node tgt) {
+        target = tgt;
+        tgt.parent = this;
+    }
+
+    public StringNode convertToString(int flag) {
+        StringNode sn = new StringNode();
+        sn.flag = flag;
+        sn.swap(this);
+        return sn;
+    }
+
+    @Override
+    public String getName() {
+        return "Quantifier";
+    }
+
+    @Override
+    public String toString(int level) {
+        StringBuilder value = new StringBuilder(super.toString(level));
+        value.append("\n  target: " + pad(target, level + 1));
+        value.append("\n  lower: " + lower);
+        value.append("\n  upper: " + upper);
+        value.append("\n  greedy: " + greedy);
+        value.append("\n  targetEmptyInfo: " + targetEmptyInfo);
+        value.append("\n  headExact: " + pad(headExact, level + 1));
+        value.append("\n  nextHeadExact: " + pad(nextHeadExact, level + 1));
+        value.append("\n  isRefered: " + isRefered);
+        value.append("\n  combExpCheckNum: " + combExpCheckNum);
+
+        return value.toString();
+    }
+
+    public boolean isAnyCharStar() {
+        return greedy && isRepeatInfinite(upper) && target.getType() == CANY;
+    }
+
+    /* ?:0, *:1, +:2, ??:3, *?:4, +?:5 */
+    protected int popularNum() {
+        if (greedy) {
+            if (lower == 0) {
+                if (upper == 1) return 0;
+                else if (isRepeatInfinite(upper)) return 1;
+            } else if (lower == 1) {
+                if (isRepeatInfinite(upper)) return 2;
+            }
+        } else {
+            if (lower == 0) {
+                if (upper == 1) return 3;
+                else if (isRepeatInfinite(upper)) return 4;
+            } else if (lower == 1) {
+                if (isRepeatInfinite(upper)) return 5;
+            }
+        }
+        return -1;
+    }
+
+    protected void set(QuantifierNode other) {
+        setTarget(other.target);
+        other.target = null;
+        lower = other.lower;
+        upper = other.upper;
+        greedy = other.greedy;
+        targetEmptyInfo = other.targetEmptyInfo;
+
+        //setHeadExact(other.headExact);
+        //setNextHeadExact(other.nextHeadExact);
+        headExact = other.headExact;
+        nextHeadExact = other.nextHeadExact;
+        isRefered = other.isRefered;
+        combExpCheckNum = other.combExpCheckNum;
+    }
+
+    public void reduceNestedQuantifier(QuantifierNode other) {
+        int pnum = popularNum();
+        int cnum = other.popularNum();
+
+        if (pnum < 0 || cnum < 0) return;
+
+        switch(Reduce.REDUCE_TABLE[cnum][pnum]) {
+        case DEL:
+            // no need to set the parent here...
+            // swap ?
+            set(other); // *pnode = *cnode; ???
+            break;
+
+        case A:
+            setTarget(other.target);
+            lower = 0;
+            upper = REPEAT_INFINITE;
+            greedy = true;
+            break;
+
+        case AQ:
+            setTarget(other.target);
+            lower = 0;
+            upper = REPEAT_INFINITE;
+            greedy = false;
+            break;
+
+        case QQ:
+            setTarget(other.target);
+            lower = 0;
+            upper = 1;
+            greedy = false;
+            break;
+
+        case P_QQ:
+            setTarget(other);
+            lower = 0;
+            upper = 1;
+            greedy = false;
+            other.lower = 1;
+            other.upper = REPEAT_INFINITE;
+            other.greedy = true;
+            return;
+
+        case PQ_Q:
+            setTarget(other);
+            lower = 0;
+            upper = 1;
+            greedy = true;
+            other.lower = 1;
+            other.upper = REPEAT_INFINITE;
+            other.greedy = false;
+            return;
+
+        case ASIS:
+            setTarget(other);
+            return;
+        }
+        // ??? remove the parent from target ???
+        other.target = null; // remove target from reduced quantifier
+    }
+
+    public int setQuantifier(Node tgt, boolean group, ScanEnvironment env, char[] chars, int p, int end) {
+        if (lower == 1 && upper == 1) return 1;
+
+        switch(tgt.getType()) {
+
+        case STR:
+            if (!group) {
+                StringNode sn = (StringNode)tgt;
+                if (sn.canBeSplit()) {
+                    StringNode n = sn.splitLastChar();
+                    if (n != null) {
+                        setTarget(n);
+                        return 2;
+                    }
+                }
+            }
+            break;
+
+        case QTFR:
+            /* check redundant double repeat. */
+            /* verbose warn (?:.?)? etc... but not warn (.?)? etc... */
+            QuantifierNode qnt = (QuantifierNode)tgt;
+            int nestQNum = popularNum();
+            int targetQNum = qnt.popularNum();
+
+            if (Config.USE_WARNING_REDUNDANT_NESTED_REPEAT_OPERATOR) {
+                if (!isByNumber() && !qnt.isByNumber() && env.syntax.warnReduntantNestedRepeat()) {
+                    switch(Reduce.REDUCE_TABLE[targetQNum][nestQNum]) {
+                    case ASIS:
+                        break;
+
+                    case DEL:
+                        env.reg.warnings.warn(new String(chars, p, end) +
+                                " redundant nested repeat operator");
+                        break;
+
+                    default:
+                        env.reg.warnings.warn(new String(chars, p, end) +
+                                " nested repeat operator " + Reduce.PopularQStr[targetQNum] +
+                                " and " + Reduce.PopularQStr[nestQNum] + " was replaced with '" +
+                                Reduce.ReduceQStr[Reduce.REDUCE_TABLE[targetQNum][nestQNum].ordinal()] + "'");
+                    }
+                }
+            } // USE_WARNING_REDUNDANT_NESTED_REPEAT_OPERATOR
+
+            if (targetQNum >= 0) {
+                if (nestQNum >= 0) {
+                    reduceNestedQuantifier(qnt);
+                    return 0;
+                } else if (targetQNum == 1 || targetQNum == 2) { /* * or + */
+                    /* (?:a*){n,m}, (?:a+){n,m} => (?:a*){n,n}, (?:a+){n,n} */
+                    if (!isRepeatInfinite(upper) && upper > 1 && greedy) {
+                        upper = lower == 0 ? 1 : lower;
+                    }
+                }
+            }
+
+        default:
+            break;
+        }
+
+        setTarget(tgt);
+        return 0;
+    }
+
+    public static final int REPEAT_INFINITE         = -1;
+    public static boolean isRepeatInfinite(int n) {
+        return n == REPEAT_INFINITE;
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/StateNode.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/StateNode.java
new file mode 100644
index 00000000000..18101a4aed4
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/StateNode.java
@@ -0,0 +1,232 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni.ast;
+
+import jdk.nashorn.internal.runtime.regexp.joni.constants.NodeStatus;
+
+public abstract class StateNode extends Node implements NodeStatus {
+    protected int state;
+
+    @Override
+    public String toString(int level) {
+        return "\n  state: " + stateToString();
+    }
+
+    public String stateToString() {
+        StringBuilder states = new StringBuilder();
+        if (isMinFixed()) states.append("MIN_FIXED ");
+        if (isMaxFixed()) states.append("MAX_FIXED ");
+        if (isMark1()) states.append("MARK1 ");
+        if (isMark2()) states.append("MARK2 ");
+        if (isMemBackrefed()) states.append("MEM_BACKREFED ");
+        if (isStopBtSimpleRepeat()) states.append("STOP_BT_SIMPLE_REPEAT ");
+        if (isRecursion()) states.append("RECURSION ");
+        if (isCalled()) states.append("CALLED ");
+        if (isAddrFixed()) states.append("ADDR_FIXED ");
+        if (isNamedGroup()) states.append("NAMED_GROUP ");
+        if (isNameRef()) states.append("NAME_REF ");
+        if (isInRepeat()) states.append("IN_REPEAT ");
+        if (isNestLevel()) states.append("NEST_LEVEL ");
+        if (isByNumber()) states.append("BY_NUMBER ");
+
+        return states.toString();
+    }
+
+    public boolean isMinFixed() {
+        return (state & NST_MIN_FIXED) != 0;
+    }
+
+    public void setMinFixed() {
+        state |= NST_MIN_FIXED;
+    }
+
+    public void clearMinFixed() {
+        state &= ~NST_MIN_FIXED;
+    }
+
+    public boolean isMaxFixed() {
+        return (state & NST_MAX_FIXED) != 0;
+    }
+
+    public void setMaxFixed() {
+        state |= NST_MAX_FIXED;
+    }
+
+    public void clearMaxFixed() {
+        state &= ~NST_MAX_FIXED;
+    }
+
+    public boolean isCLenFixed() {
+        return (state & NST_CLEN_FIXED) != 0;
+    }
+
+    public void setCLenFixed() {
+        state |= NST_CLEN_FIXED;
+    }
+
+    public void clearCLenFixed() {
+        state &= ~NST_CLEN_FIXED;
+    }
+
+    public boolean isMark1() {
+        return (state & NST_MARK1) != 0;
+    }
+
+    public void setMark1() {
+        state |= NST_MARK1;
+    }
+
+    public void clearMark1() {
+        state &= ~NST_MARK1;
+    }
+
+    public boolean isMark2() {
+        return (state & NST_MARK2) != 0;
+    }
+
+    public void setMark2() {
+        state |= NST_MARK2;
+    }
+
+    public void clearMark2() {
+        state &= ~NST_MARK2;
+    }
+
+    public boolean isMemBackrefed() {
+        return (state & NST_MEM_BACKREFED) != 0;
+    }
+
+    public void setMemBackrefed() {
+        state |= NST_MEM_BACKREFED;
+    }
+
+    public void clearMemBackrefed() {
+        state &= ~NST_MEM_BACKREFED;
+    }
+
+    public boolean isStopBtSimpleRepeat() {
+        return (state & NST_STOP_BT_SIMPLE_REPEAT) != 0;
+    }
+
+    public void setStopBtSimpleRepeat() {
+        state |= NST_STOP_BT_SIMPLE_REPEAT;
+    }
+
+    public void clearStopBtSimpleRepeat() {
+        state &= ~NST_STOP_BT_SIMPLE_REPEAT;
+    }
+
+    public boolean isRecursion() {
+        return (state & NST_RECURSION) != 0;
+    }
+
+    public void setRecursion() {
+        state |= NST_RECURSION;
+    }
+
+    public void clearRecursion() {
+        state &= ~NST_RECURSION;
+    }
+
+    public boolean isCalled() {
+        return (state & NST_CALLED) != 0;
+    }
+
+    public void setCalled() {
+        state |= NST_CALLED;
+    }
+
+    public void clearCAlled() {
+        state &= ~NST_CALLED;
+    }
+
+    public boolean isAddrFixed() {
+        return (state & NST_ADDR_FIXED) != 0;
+    }
+
+    public void setAddrFixed() {
+        state |= NST_ADDR_FIXED;
+    }
+
+    public void clearAddrFixed() {
+        state &= ~NST_ADDR_FIXED;
+    }
+
+    public boolean isNamedGroup() {
+        return (state & NST_NAMED_GROUP) != 0;
+    }
+
+    public void setNamedGroup() {
+        state |= NST_NAMED_GROUP;
+    }
+
+    public void clearNamedGroup() {
+        state &= ~NST_NAMED_GROUP;
+    }
+
+    public boolean isNameRef() {
+        return (state & NST_NAME_REF) != 0;
+    }
+
+    public void setNameRef() {
+        state |= NST_NAME_REF;
+    }
+
+    public void clearNameRef() {
+        state &= ~NST_NAME_REF;
+    }
+
+    public boolean isInRepeat() {
+        return (state & NST_IN_REPEAT) != 0;
+    }
+
+    public void setInRepeat() {
+        state |= NST_IN_REPEAT;
+    }
+
+    public void clearInRepeat() {
+        state &= ~NST_IN_REPEAT;
+    }
+
+    public boolean isNestLevel() {
+        return (state & NST_NEST_LEVEL) != 0;
+    }
+
+    public void setNestLevel() {
+        state |= NST_NEST_LEVEL;
+    }
+
+    public void clearNestLevel() {
+        state &= ~NST_NEST_LEVEL;
+    }
+
+    public boolean isByNumber() {
+        return (state & NST_BY_NUMBER) != 0;
+    }
+
+    public void setByNumber() {
+        state |= NST_BY_NUMBER;
+    }
+
+    public void clearByNumber() {
+        state &= ~NST_BY_NUMBER;
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/StringNode.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/StringNode.java
new file mode 100644
index 00000000000..941b5c00192
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/ast/StringNode.java
@@ -0,0 +1,207 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni.ast;
+
+import jdk.nashorn.internal.runtime.regexp.joni.EncodingHelper;
+import jdk.nashorn.internal.runtime.regexp.joni.constants.StringType;
+
+public final class StringNode extends Node implements StringType {
+
+    private static final int NODE_STR_MARGIN = 16;
+    private static final int NODE_STR_BUF_SIZE = 24;
+    public static final StringNode EMPTY = new StringNode(null, Integer.MAX_VALUE, Integer.MAX_VALUE);
+
+    public char[] chars;
+    public int p;
+    public int end;
+
+    public int flag;
+
+    public StringNode() {
+        this.chars = new char[NODE_STR_BUF_SIZE];
+    }
+
+    public StringNode(char[] chars, int p, int end) {
+        this.chars = chars;
+        this.p = p;
+        this.end = end;
+        setShared();
+    }
+
+    public StringNode(char c) {
+        this();
+        chars[end++] = c;
+    }
+
+    /* Ensure there is ahead bytes available in node's buffer
+     * (assumes that the node is not shared)
+     */
+    public void ensure(int ahead) {
+        int len = (end - p) + ahead;
+        if (len >= chars.length) {
+            char[] tmp = new char[len + NODE_STR_MARGIN];
+            System.arraycopy(chars, p, tmp, 0, end - p);
+            chars = tmp;
+        }
+    }
+
+    /* COW and/or ensure there is ahead bytes available in node's buffer
+     */
+    private void modifyEnsure(int ahead) {
+        if (isShared()) {
+            int len = (end - p) + ahead;
+            char[] tmp = new char[len + NODE_STR_MARGIN];
+            System.arraycopy(chars, p, tmp, 0, end - p);
+            chars = tmp;
+            end = end - p;
+            p = 0;
+            clearShared();
+        } else {
+            ensure(ahead);
+        }
+    }
+
+    @Override
+    public int getType() {
+        return STR;
+    }
+
+    @Override
+    public String getName() {
+        return "String";
+    }
+
+    @Override
+    public String toString(int level) {
+        StringBuilder value = new StringBuilder();
+        value.append("\n  bytes: '");
+        for (int i=p; i<end; i++) {
+            if (chars[i] >= 0x20 && chars[i] < 0x7f) {
+                value.append(chars[i]);
+            } else {
+                value.append(String.format("[0x%04x]", chars[i]));
+            }
+        }
+        value.append("'");
+        return value.toString();
+    }
+
+    public int length() {
+        return end - p;
+    }
+
+    public StringNode splitLastChar() {
+        StringNode n = null;
+
+        if (end > p) {
+            int prev = EncodingHelper.prevCharHead(p, end);
+            if (prev != -1 && prev > p) { /* can be splitted. */
+                n = new StringNode(chars, prev, end);
+                if (isRaw()) n.setRaw();
+                end = prev;
+            }
+        }
+        return n;
+    }
+
+    public boolean canBeSplit() {
+        if (end > p) {
+            return 1 < (end - p);
+        }
+        return false;
+    }
+
+    public void set(char[] chars, int p, int end) {
+        this.chars = chars;
+        this.p = p;
+        this.end = end;
+        setShared();
+    }
+
+    public void cat(char[] cat, int catP, int catEnd) {
+        int len = catEnd - catP;
+        modifyEnsure(len);
+        System.arraycopy(cat, catP, chars, end, len);
+        end += len;
+    }
+
+    public void cat(char c) {
+        modifyEnsure(1);
+        chars[end++] = c;
+    }
+
+    public void catCode(int code) {
+        cat((char)code);
+    }
+
+    public void clear() {
+        if (chars.length > NODE_STR_BUF_SIZE) chars = new char[NODE_STR_BUF_SIZE];
+        flag = 0;
+        p = end = 0;
+    }
+
+    public void setRaw() {
+        flag |= NSTR_RAW;
+    }
+
+    public void clearRaw() {
+        flag &= ~NSTR_RAW;
+    }
+
+    public boolean isRaw() {
+        return (flag & NSTR_RAW) != 0;
+    }
+
+    public void setAmbig() {
+        flag |= NSTR_AMBIG;
+    }
+
+    public void clearAmbig() {
+        flag &= ~NSTR_AMBIG;
+    }
+
+    public boolean isAmbig() {
+        return (flag & NSTR_AMBIG) != 0;
+    }
+
+    public void setDontGetOptInfo() {
+        flag |= NSTR_DONT_GET_OPT_INFO;
+    }
+
+    public void clearDontGetOptInfo() {
+        flag &= ~NSTR_DONT_GET_OPT_INFO;
+    }
+
+    public boolean isDontGetOptInfo() {
+        return (flag & NSTR_DONT_GET_OPT_INFO) != 0;
+    }
+
+    public void setShared() {
+        flag |= NSTR_SHARED;
+    }
+
+    public void clearShared() {
+        flag &= ~NSTR_SHARED;
+    }
+
+    public boolean isShared() {
+        return (flag & NSTR_SHARED) != 0;
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/bench/AbstractBench.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/bench/AbstractBench.java
new file mode 100644
index 00000000000..9751b51d5c0
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/bench/AbstractBench.java
@@ -0,0 +1,49 @@
+package jdk.nashorn.internal.runtime.regexp.joni.bench;
+
+import jdk.nashorn.internal.runtime.regexp.joni.Option;
+import jdk.nashorn.internal.runtime.regexp.joni.Regex;
+import jdk.nashorn.internal.runtime.regexp.joni.Syntax;
+
+public abstract class AbstractBench {
+    protected void bench(String _reg, String _str, int warmup, int times) throws Exception {
+        char[] reg = _reg.toCharArray();
+        char[] str = _str.toCharArray();
+
+        Regex p = new Regex(reg,0,reg.length,Option.DEFAULT,Syntax.DEFAULT);
+
+        System.err.println("::: /" + _reg + "/ =~ \"" + _str + "\", " + warmup + " * " + times + " times");
+
+        for(int j=0;j<warmup;j++) {
+            long before = System.currentTimeMillis();
+            for(int i = 0; i < times; i++) {
+                p.matcher(str, 0, str.length).search(0, str.length, Option.NONE);
+            }
+            long time = System.currentTimeMillis() - before;
+            System.err.println(":  " + time + "ms");
+        }
+    }
+
+    protected void benchBestOf(String _reg, String _str, int warmup, int times) throws Exception {
+        char[] reg = _reg.toCharArray();
+        char[] str = _str.toCharArray();
+
+        Regex p = new Regex(reg,0,reg.length,Option.DEFAULT,Syntax.DEFAULT);
+
+        System.err.println("::: /" + _reg + "/ =~ \"" + _str + "\", " + warmup + " * " + times + " times");
+
+        long best = Long.MAX_VALUE;
+
+        for(int j=0;j<warmup;j++) {
+            long before = System.currentTimeMillis();
+            for(int i = 0; i < times; i++) {
+                p.matcher(str, 0, str.length).search(0, str.length, Option.NONE);
+            }
+            long time = System.currentTimeMillis() - before;
+            if(time < best) {
+                best = time;
+            }
+            System.err.print(".");
+        }
+        System.err.println(":  " + best + "ms");
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/bench/BenchGreedyBacktrack.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/bench/BenchGreedyBacktrack.java
new file mode 100644
index 00000000000..116352dadb9
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/bench/BenchGreedyBacktrack.java
@@ -0,0 +1,7 @@
+package jdk.nashorn.internal.runtime.regexp.joni.bench;
+
+public class BenchGreedyBacktrack extends AbstractBench {
+    public static void main(String[] args) throws Exception {
+        new BenchGreedyBacktrack().bench(".*_p","_petstore_session_id=1b341ffe23b5298676d535fcabd3d0d7; path=/",10,1000000);
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/bench/BenchRailsRegs.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/bench/BenchRailsRegs.java
new file mode 100644
index 00000000000..eb339af3e03
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/bench/BenchRailsRegs.java
@@ -0,0 +1,31 @@
+package jdk.nashorn.internal.runtime.regexp.joni.bench;
+
+public class BenchRailsRegs extends AbstractBench {
+    public static void main(String[] args) throws Exception {
+        final String[][] regexps = {{"a.*?[b-z]{2,4}aaaaaa","afdgdsgderaabxxaaaaaaaaaaaaaaaaaaaaaaaa"},
+                                    {"://","/shop/viewCategory.shtml?category=DOGS"},
+                                    {"^\\w+\\://[^/]+(/.*|$)$","/shop/viewCategory.shtml?category=DOGS"},
+                                    {"\\A/?\\Z","/shop/viewCategory.shtml"},
+                                    {"\\A/shop/signonForm\\.shtml/?\\Z","/shop/viewCategory.shtml"},
+                                    {"\\A/shop/newAccountForm\\.shtml/?\\Z","/shop/viewCategory.shtml"},
+                                    {"\\A/shop/newAccount\\.shtml/?\\Z","/shop/viewCategory.shtml"},
+                                    {"\\A/shop/viewCart\\.shtml/?\\Z","/shop/viewCategory.shtml"},
+                                    {"\\A/shop/index\\.shtml/?\\Z","/shop/viewCategory.shtml"},
+                                    {"\\A/shop/viewCategory\\.shtml/?\\Z","/shop/viewCategory.shtml"},
+                                    {"\\A(?:::)?([A-Z]\\w*(?:::[A-Z]\\w*)*)\\z","CategoriesController"},
+                                    {"\\Ainsert","SELECT * FROM sessions WHERE (session_id = '1b341ffe23b5298676d535fcabd3d0d7')  LIMIT 1"},
+                                    {"\\A\\(?\\s*(select|show)","SELECT * FROM sessions WHERE (session_id = '1b341ffe23b5298676d535fcabd3d0d7')  LIMIT 1"},
+                                    {".*?\n","1b341ffe23b5298676d535fcabd3d0d7"},
+                                    {"^find_(all_by|by)_([_a-zA-Z]\\w*)$","find_by_string_id"},
+                                    {"\\.rjs$","categories/show.rhtml"},
+                                    {"^[-a-z]+://","petstore.css"},
+                                    {"^get$",""},
+                                    {"^post$",""},
+                                    {"^[^:]+","www.example.com"},
+                                    {"(=|\\?|_before_type_cast)$", "updated_on"},
+                                    {"^(.*?)=(.*?);","_petstore_session_id=1b341ffe23b5298676d535fcabd3d0d7; path=/"}};
+        for(String[] reg : regexps) {
+            new BenchRailsRegs().benchBestOf(reg[0],reg[1],10,1000000);
+        }
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/bench/BenchSeveralRegexps.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/bench/BenchSeveralRegexps.java
new file mode 100644
index 00000000000..3c118cfe402
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/bench/BenchSeveralRegexps.java
@@ -0,0 +1,17 @@
+package jdk.nashorn.internal.runtime.regexp.joni.bench;
+
+public class BenchSeveralRegexps extends AbstractBench {
+    public static void main(String[] args) throws Exception {
+        int BASE = 1000000;
+
+        new BenchSeveralRegexps().benchBestOf("a"," a",10,4*BASE);
+
+        new BenchSeveralRegexps().benchBestOf(".*?=","_petstore_session_id=1b341ffe23b5298676d535fcabd3d0d7; path=/",10,BASE);
+
+        new BenchSeveralRegexps().benchBestOf("^(.*?)=(.*?);","_petstore_session_id=1b341ffe23b5298676d535fcabd3d0d7; path=/",10,BASE);
+
+        new BenchSeveralRegexps().benchBestOf(".*_p","_petstore_session_id=1b341ffe23b5298676d535fcabd3d0d7; path=/",10,4*BASE);
+
+        new BenchSeveralRegexps().benchBestOf(".*=","_petstore_session_id=1b341ffe23b5298676d535fcabd3d0d7; path=/",10,4*BASE);
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/AnchorType.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/AnchorType.java
new file mode 100644
index 00000000000..d3e8ccb6f45
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/AnchorType.java
@@ -0,0 +1,58 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni.constants;
+
+public interface AnchorType {
+    final int BEGIN_BUF         = (1<<0);
+    final int BEGIN_LINE        = (1<<1);
+    final int BEGIN_POSITION    = (1<<2);
+    final int END_BUF           = (1<<3);
+    final int SEMI_END_BUF      = (1<<4);
+    final int END_LINE          = (1<<5);
+
+    final int WORD_BOUND        = (1<<6);
+    final int NOT_WORD_BOUND    = (1<<7);
+    final int WORD_BEGIN        = (1<<8);
+    final int WORD_END          = (1<<9);
+    final int PREC_READ         = (1<<10);
+    final int PREC_READ_NOT     = (1<<11);
+    final int LOOK_BEHIND       = (1<<12);
+    final int LOOK_BEHIND_NOT   = (1<<13);
+
+    final int ANYCHAR_STAR      = (1<<14);   /* ".*" optimize info */
+    final int ANYCHAR_STAR_ML   = (1<<15);   /* ".*" optimize info (multi-line) */
+
+    final int ANYCHAR_STAR_MASK = (ANYCHAR_STAR | ANYCHAR_STAR_ML);
+    final int END_BUF_MASK      = (END_BUF | SEMI_END_BUF);
+
+    final int ALLOWED_IN_LB =     ( LOOK_BEHIND |
+                                    BEGIN_LINE |
+                                    END_LINE |
+                                    BEGIN_BUF |
+                                    BEGIN_POSITION );
+
+    final int ALLOWED_IN_LB_NOT = ( LOOK_BEHIND |
+                                    LOOK_BEHIND_NOT |
+                                    BEGIN_LINE |
+                                    END_LINE |
+                                    BEGIN_BUF |
+                                    BEGIN_POSITION );
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/Arguments.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/Arguments.java
new file mode 100644
index 00000000000..543b170f2c1
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/Arguments.java
@@ -0,0 +1,31 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni.constants;
+
+public interface Arguments {
+    final int SPECIAL       = -1;
+    final int NON           = 0;
+    final int RELADDR       = 1;
+    final int ABSADDR       = 2;
+    final int LENGTH        = 3;
+    final int MEMNUM        = 4;
+    final int OPTION        = 5;
+    final int STATE_CHECK   = 6;
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/AsmConstants.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/AsmConstants.java
new file mode 100644
index 00000000000..afde7610727
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/AsmConstants.java
@@ -0,0 +1,49 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni.constants;
+
+public interface AsmConstants {
+    final int THIS = 0;
+
+    // argument indexes
+    final int RANGE             = 1;
+    final int SSTART            = 2;
+    final int SPREV             = 3;
+
+    // local var indexes
+    final int S                 = 4;            // current index
+    final int BYTES             = 5;            // string
+    final int LAST_INDEX        = BYTES + 1;
+
+    // frequently used field names (all ints)
+    final String STR            = "str";
+    final String END            = "end";
+    final String MSA_START      = "msaStart";
+    final String MSA_OPTONS     = "msaOptions";
+    final String MSA_BEST_LEN   = "msaBestLen";
+    final String MSA_BEST_S     = "msaBestS";
+    final String MSA_BEGIN      = "msaBegin";
+    final String MSA_END        = "msaEnd";
+
+    // generated field names
+    final String BITSET         = "bitset";
+    final String CODERANGE      = "range";
+    final String TEMPLATE       = "template";
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/CCSTATE.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/CCSTATE.java
new file mode 100644
index 00000000000..6760b6a953a
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/CCSTATE.java
@@ -0,0 +1,27 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni.constants;
+
+public enum CCSTATE {
+    VALUE,
+    RANGE,
+    COMPLETE,
+    START
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/CCVALTYPE.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/CCVALTYPE.java
new file mode 100644
index 00000000000..fa20a4c6970
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/CCVALTYPE.java
@@ -0,0 +1,26 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni.constants;
+
+public enum CCVALTYPE {
+    SB,
+    CODE_POINT,
+    CLASS
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/EncloseType.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/EncloseType.java
new file mode 100644
index 00000000000..88aba98757f
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/EncloseType.java
@@ -0,0 +1,29 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni.constants;
+
+public interface EncloseType {
+    final int MEMORY                = 1<<0;
+    final int OPTION                = 1<<1;
+    final int STOP_BACKTRACK        = 1<<2;
+
+    final int ALLOWED_IN_LB         = MEMORY;
+    final int ALLOWED_IN_LB_NOT     = 0;
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/MetaChar.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/MetaChar.java
new file mode 100644
index 00000000000..2c9d338e799
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/MetaChar.java
@@ -0,0 +1,31 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni.constants;
+
+public interface MetaChar {
+    final int ESCAPE            = 0;
+    final int ANYCHAR           = 1;
+    final int ANYTIME           = 2;
+    final int ZERO_OR_ONE_TIME  = 3;
+    final int ONE_OR_MORE_TIME  = 4;
+    final int ANYCHAR_ANYTIME   = 5;
+
+    final int INEFFECTIVE_META_CHAR = 0;
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/NodeStatus.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/NodeStatus.java
new file mode 100644
index 00000000000..ef983d79b12
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/NodeStatus.java
@@ -0,0 +1,39 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni.constants;
+
+public interface NodeStatus {
+    /* status bits */
+    final int NST_MIN_FIXED            = (1<<0);
+    final int NST_MAX_FIXED            = (1<<1);
+    final int NST_CLEN_FIXED           = (1<<2);
+    final int NST_MARK1                = (1<<3);
+    final int NST_MARK2                = (1<<4);
+    final int NST_MEM_BACKREFED        = (1<<5);
+    final int NST_STOP_BT_SIMPLE_REPEAT= (1<<6);
+    final int NST_RECURSION            = (1<<7);
+    final int NST_CALLED               = (1<<8);
+    final int NST_ADDR_FIXED           = (1<<9);
+    final int NST_NAMED_GROUP          = (1<<10);
+    final int NST_NAME_REF             = (1<<11);
+    final int NST_IN_REPEAT            = (1<<12);   /* STK_REPEAT is nested in stack. */
+    final int NST_NEST_LEVEL           = (1<<13);
+    final int NST_BY_NUMBER            = (1<<14);   /* {n,m} */
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/NodeType.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/NodeType.java
new file mode 100644
index 00000000000..c3061ffd50c
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/NodeType.java
@@ -0,0 +1,66 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni.constants;
+
+public interface NodeType {
+    /* node type */
+    final int  STR        = 0;
+    final int  CCLASS     = 1;
+    final int  CTYPE      = 2;
+    final int  CANY       = 3;
+    final int  BREF       = 4;
+    final int  QTFR       = 5;
+    final int  ENCLOSE    = 6;
+    final int  ANCHOR     = 7;
+    final int  LIST       = 8;
+    final int  ALT        = 9;
+    final int  CALL       = 10;
+
+    final int BIT_STR        = 1 << STR;
+    final int BIT_CCLASS     = 1 << CCLASS;
+    final int BIT_CTYPE      = 1 << CTYPE;
+    final int BIT_CANY       = 1 << CANY;
+    final int BIT_BREF       = 1 << BREF;
+    final int BIT_QTFR       = 1 << QTFR;
+    final int BIT_ENCLOSE    = 1 << ENCLOSE;
+    final int BIT_ANCHOR     = 1 << ANCHOR;
+    final int BIT_LIST       = 1 << LIST;
+    final int BIT_ALT        = 1 << ALT;
+    final int BIT_CALL       = 1 << CALL;
+
+    /* allowed node types in look-behind */
+    final int ALLOWED_IN_LB = ( BIT_LIST |
+                                BIT_ALT |
+                                BIT_STR |
+                                BIT_CCLASS |
+                                BIT_CTYPE |
+                                BIT_CANY |
+                                BIT_ANCHOR |
+                                BIT_ENCLOSE |
+                                BIT_QTFR |
+                                BIT_CALL );
+
+    final int SIMPLE =        ( BIT_STR |
+                                BIT_CCLASS |
+                                BIT_CTYPE |
+                                BIT_CANY |
+                                BIT_BREF);
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/OPCode.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/OPCode.java
new file mode 100644
index 00000000000..7f2c534b7ab
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/OPCode.java
@@ -0,0 +1,387 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni.constants;
+
+import jdk.nashorn.internal.runtime.regexp.joni.Config;
+
+public interface OPCode {
+    final int FINISH                        = 0;            /* matching process terminator (no more alternative) */
+    final int END                           = 1;            /* pattern code terminator (success end) */
+
+    final int EXACT1                        = 2;            /* single byte, N = 1 */
+    final int EXACT2                        = 3;            /* single byte, N = 2 */
+    final int EXACT3                        = 4;            /* single byte, N = 3 */
+    final int EXACT4                        = 5;            /* single byte, N = 4 */
+    final int EXACT5                        = 6;            /* single byte, N = 5 */
+    final int EXACTN                        = 7;            /* single byte */
+    final int EXACTMB2N1                    = 8;            /* mb-length = 2 N = 1 */
+    final int EXACTMB2N2                    = 9;            /* mb-length = 2 N = 2 */
+    final int EXACTMB2N3                    = 10;           /* mb-length = 2 N = 3 */
+    final int EXACTMB2N                     = 11;           /* mb-length = 2 */
+    final int EXACTMB3N                     = 12;           /* mb-length = 3 */
+    final int EXACTMBN                      = 13;           /* other length */
+
+    final int EXACT1_IC                     = 14;           /* single byte, N = 1, ignore case */
+    final int EXACTN_IC                     = 15;           /* single byte,        ignore case */
+
+    final int CCLASS                        = 16;
+    final int CCLASS_MB                     = 17;
+    final int CCLASS_MIX                    = 18;
+    final int CCLASS_NOT                    = 19;
+    final int CCLASS_MB_NOT                 = 20;
+    final int CCLASS_MIX_NOT                = 21;
+    final int CCLASS_NODE                   = 22;           /* pointer to CClassNode node */
+
+    final int ANYCHAR                       = 23;           /* "."  */
+    final int ANYCHAR_ML                    = 24;           /* "."  multi-line */
+    final int ANYCHAR_STAR                  = 25;           /* ".*" */
+    final int ANYCHAR_ML_STAR               = 26;           /* ".*" multi-line */
+    final int ANYCHAR_STAR_PEEK_NEXT        = 27;
+    final int ANYCHAR_ML_STAR_PEEK_NEXT     = 28;
+
+    final int WORD                          = 29;
+    final int NOT_WORD                      = 30;
+    final int WORD_BOUND                    = 31;
+    final int NOT_WORD_BOUND                = 32;
+    final int WORD_BEGIN                    = 33;
+    final int WORD_END                      = 34;
+
+    final int BEGIN_BUF                     = 35;
+    final int END_BUF                       = 36;
+    final int BEGIN_LINE                    = 37;
+    final int END_LINE                      = 38;
+    final int SEMI_END_BUF                  = 39;
+    final int BEGIN_POSITION                = 40;
+
+    final int BACKREF1                      = 41;
+    final int BACKREF2                      = 42;
+    final int BACKREFN                      = 43;
+    final int BACKREFN_IC                   = 44;
+    final int BACKREF_MULTI                 = 45;
+    final int BACKREF_MULTI_IC              = 46;
+    final int BACKREF_WITH_LEVEL            = 47;           /* \k<xxx+n>, \k<xxx-n> */
+
+    final int MEMORY_START                  = 48;
+    final int MEMORY_START_PUSH             = 49;           /* push back-tracker to stack */
+    final int MEMORY_END_PUSH               = 50;           /* push back-tracker to stack */
+    final int MEMORY_END_PUSH_REC           = 51;           /* push back-tracker to stack */
+    final int MEMORY_END                    = 52;
+    final int MEMORY_END_REC                = 53;           /* push marker to stack */
+
+    final int FAIL                          = 54;           /* pop stack and move */
+    final int JUMP                          = 55;
+    final int PUSH                          = 56;
+    final int POP                           = 57;
+    final int PUSH_OR_JUMP_EXACT1           = 58;           /* if match exact then push, else jump. */
+    final int PUSH_IF_PEEK_NEXT             = 59;           /* if match exact then push, else none. */
+
+    final int REPEAT                        = 60;           /* {n,m} */
+    final int REPEAT_NG                     = 61;           /* {n,m}? (non greedy) */
+    final int REPEAT_INC                    = 62;
+    final int REPEAT_INC_NG                 = 63;           /* non greedy */
+    final int REPEAT_INC_SG                 = 64;           /* search and get in stack */
+    final int REPEAT_INC_NG_SG              = 65;           /* search and get in stack (non greedy) */
+
+    final int NULL_CHECK_START              = 66;           /* null loop checker start */
+    final int NULL_CHECK_END                = 67;           /* null loop checker end   */
+    final int NULL_CHECK_END_MEMST          = 68;           /* null loop checker end (with capture status) */
+    final int NULL_CHECK_END_MEMST_PUSH     = 69;           /* with capture status and push check-end */
+
+    final int PUSH_POS                      = 70;           /* (?=...)  start */
+    final int POP_POS                       = 71;           /* (?=...)  end   */
+    final int PUSH_POS_NOT                  = 72;           /* (?!...)  start */
+    final int FAIL_POS                      = 73;           /* (?!...)  end   */
+    final int PUSH_STOP_BT                  = 74;           /* (?>...)  start */
+    final int POP_STOP_BT                   = 75;           /* (?>...)  end   */
+    final int LOOK_BEHIND                   = 76;           /* (?<=...) start (no needs end opcode) */
+    final int PUSH_LOOK_BEHIND_NOT          = 77;           /* (?<!...) start */
+    final int FAIL_LOOK_BEHIND_NOT          = 78;           /* (?<!...) end   */
+
+    final int CALL                          = 79;           /* \g<name> */
+    final int RETURN                        = 80;
+
+    final int STATE_CHECK_PUSH              = 81;           /* combination explosion check and push */
+    final int STATE_CHECK_PUSH_OR_JUMP      = 82;           /* check ok -> push, else jump  */
+    final int STATE_CHECK                   = 83;           /* check only */
+    final int STATE_CHECK_ANYCHAR_STAR      = 84;
+    final int STATE_CHECK_ANYCHAR_ML_STAR   = 85;
+
+      /* no need: IS_DYNAMIC_OPTION() == 0 */
+    final int SET_OPTION_PUSH               = 86;           /* set option and push recover option */
+    final int SET_OPTION                    = 87;           /* set option */
+
+    // single byte versions
+    final int ANYCHAR_SB                    = 88;           /* "."  */
+    final int ANYCHAR_ML_SB                 = 89;           /* "."  multi-line */
+    final int ANYCHAR_STAR_SB               = 90;           /* ".*" */
+    final int ANYCHAR_ML_STAR_SB            = 91;           /* ".*" multi-line */
+    final int ANYCHAR_STAR_PEEK_NEXT_SB     = 92;
+    final int ANYCHAR_ML_STAR_PEEK_NEXT_SB  = 93;
+    final int STATE_CHECK_ANYCHAR_STAR_SB   = 94;
+    final int STATE_CHECK_ANYCHAR_ML_STAR_SB= 95;
+
+    final int CCLASS_SB                     = 96;
+    final int CCLASS_NOT_SB                 = 97;
+    final int WORD_SB                       = 98;
+    final int NOT_WORD_SB                   = 99;
+    final int WORD_BOUND_SB                 = 100;
+    final int NOT_WORD_BOUND_SB             = 101;
+    final int WORD_BEGIN_SB                 = 102;
+    final int WORD_END_SB                   = 103;
+
+    final int LOOK_BEHIND_SB                = 104;
+
+    final int EXACT1_IC_SB                  = 105;           /* single byte, N = 1, ignore case */
+    final int EXACTN_IC_SB                  = 106;           /* single byte,        ignore case */
+
+
+    public final String OpCodeNames[] = Config.DEBUG_COMPILE ? new String[] {
+        "finish", /*OP_FINISH*/
+        "end", /*OP_END*/
+        "exact1", /*OP_EXACT1*/
+        "exact2", /*OP_EXACT2*/
+        "exact3", /*OP_EXACT3*/
+        "exact4", /*OP_EXACT4*/
+        "exact5", /*OP_EXACT5*/
+        "exactn", /*OP_EXACTN*/
+        "exactmb2-n1", /*OP_EXACTMB2N1*/
+        "exactmb2-n2", /*OP_EXACTMB2N2*/
+        "exactmb2-n3", /*OP_EXACTMB2N3*/
+        "exactmb2-n", /*OP_EXACTMB2N*/
+        "exactmb3n", /*OP_EXACTMB3N*/
+        "exactmbn", /*OP_EXACTMBN*/
+        "exact1-ic", /*OP_EXACT1_IC*/
+        "exactn-ic", /*OP_EXACTN_IC*/
+        "cclass", /*OP_CCLASS*/
+        "cclass-mb", /*OP_CCLASS_MB*/
+        "cclass-mix", /*OP_CCLASS_MIX*/
+        "cclass-not", /*OP_CCLASS_NOT*/
+        "cclass-mb-not", /*OP_CCLASS_MB_NOT*/
+        "cclass-mix-not", /*OP_CCLASS_MIX_NOT*/
+        "cclass-node", /*OP_CCLASS_NODE*/
+        "anychar", /*OP_ANYCHAR*/
+        "anychar-ml", /*OP_ANYCHAR_ML*/
+        "anychar*", /*OP_ANYCHAR_STAR*/
+        "anychar-ml*", /*OP_ANYCHAR_ML_STAR*/
+        "anychar*-peek-next", /*OP_ANYCHAR_STAR_PEEK_NEXT*/
+        "anychar-ml*-peek-next", /*OP_ANYCHAR_ML_STAR_PEEK_NEXT*/
+        "word", /*OP_WORD*/
+        "not-word", /*OP_NOT_WORD*/
+        "word-bound", /*OP_WORD_BOUND*/
+        "not-word-bound", /*OP_NOT_WORD_BOUND*/
+        "word-begin", /*OP_WORD_BEGIN*/
+        "word-end", /*OP_WORD_END*/
+        "begin-buf", /*OP_BEGIN_BUF*/
+        "end-buf", /*OP_END_BUF*/
+        "begin-line", /*OP_BEGIN_LINE*/
+        "end-line", /*OP_END_LINE*/
+        "semi-end-buf", /*OP_SEMI_END_BUF*/
+        "begin-position", /*OP_BEGIN_POSITION*/
+        "backref1", /*OP_BACKREF1*/
+        "backref2", /*OP_BACKREF2*/
+        "backrefn", /*OP_BACKREFN*/
+        "backrefn-ic", /*OP_BACKREFN_IC*/
+        "backref_multi", /*OP_BACKREF_MULTI*/
+        "backref_multi-ic", /*OP_BACKREF_MULTI_IC*/
+        "backref_at_level", /*OP_BACKREF_AT_LEVEL*/
+        "mem-start", /*OP_MEMORY_START*/
+        "mem-start-push", /*OP_MEMORY_START_PUSH*/
+        "mem-end-push", /*OP_MEMORY_END_PUSH*/
+        "mem-end-push-rec", /*OP_MEMORY_END_PUSH_REC*/
+        "mem-end", /*OP_MEMORY_END*/
+        "mem-end-rec", /*OP_MEMORY_END_REC*/
+        "fail", /*OP_FAIL*/
+        "jump", /*OP_JUMP*/
+        "push", /*OP_PUSH*/
+        "pop", /*OP_POP*/
+        "push-or-jump-e1", /*OP_PUSH_OR_JUMP_EXACT1*/
+        "push-if-peek-next", /*OP_PUSH_IF_PEEK_NEXT*/
+        "repeat", /*OP_REPEAT*/
+        "repeat-ng", /*OP_REPEAT_NG*/
+        "repeat-inc", /*OP_REPEAT_INC*/
+        "repeat-inc-ng", /*OP_REPEAT_INC_NG*/
+        "repeat-inc-sg", /*OP_REPEAT_INC_SG*/
+        "repeat-inc-ng-sg", /*OP_REPEAT_INC_NG_SG*/
+        "null-check-start", /*OP_NULL_CHECK_START*/
+        "null-check-end", /*OP_NULL_CHECK_END*/
+        "null-check-end-memst", /*OP_NULL_CHECK_END_MEMST*/
+        "null-check-end-memst-push", /*OP_NULL_CHECK_END_MEMST_PUSH*/
+        "push-pos", /*OP_PUSH_POS*/
+        "pop-pos", /*OP_POP_POS*/
+        "push-pos-not", /*OP_PUSH_POS_NOT*/
+        "fail-pos", /*OP_FAIL_POS*/
+        "push-stop-bt", /*OP_PUSH_STOP_BT*/
+        "pop-stop-bt", /*OP_POP_STOP_BT*/
+        "look-behind", /*OP_LOOK_BEHIND*/
+        "push-look-behind-not", /*OP_PUSH_LOOK_BEHIND_NOT*/
+        "fail-look-behind-not", /*OP_FAIL_LOOK_BEHIND_NOT*/
+        "call", /*OP_CALL*/
+        "return", /*OP_RETURN*/
+        "state-check-push", /*OP_STATE_CHECK_PUSH*/
+        "state-check-push-or-jump", /*OP_STATE_CHECK_PUSH_OR_JUMP*/
+        "state-check", /*OP_STATE_CHECK*/
+        "state-check-anychar*", /*OP_STATE_CHECK_ANYCHAR_STAR*/
+        "state-check-anychar-ml*", /*OP_STATE_CHECK_ANYCHAR_ML_STAR*/
+        "set-option-push", /*OP_SET_OPTION_PUSH*/
+        "set-option", /*OP_SET_OPTION*/
+
+        // single byte versions
+        "anychar-sb", /*OP_ANYCHAR*/
+        "anychar-ml-sb", /*OP_ANYCHAR_ML*/
+        "anychar*-sb", /*OP_ANYCHAR_STAR*/
+        "anychar-ml*-sb", /*OP_ANYCHAR_ML_STAR*/
+        "anychar*-peek-next-sb", /*OP_ANYCHAR_STAR_PEEK_NEXT*/
+        "anychar-ml*-peek-next-sb", /*OP_ANYCHAR_ML_STAR_PEEK_NEXT*/
+        "state-check-anychar*-sb", /*OP_STATE_CHECK_ANYCHAR_STAR*/
+        "state-check-anychar-ml*-sb", /*OP_STATE_CHECK_ANYCHAR_ML_STAR*/
+
+        "cclass-sb", /*OP_CCLASS*/
+        "cclass-not-sb", /*OP_CCLASS_NOT*/
+
+        "word-sb", /*OP_WORD*/
+        "not-word-sb", /*OP_NOT_WORD*/
+        "word-bound-sb", /*OP_WORD_BOUND*/
+        "not-word-bound-sb", /*OP_NOT_WORD_BOUND*/
+        "word-begin-sb", /*OP_WORD_BEGIN*/
+        "word-end-sb", /*OP_WORD_END*/
+
+        "look-behind-sb", /*OP_LOOK_BEHIND*/
+
+        "exact1-ic-sb", /*OP_EXACT1_IC*/
+        "exactn-ic-sb", /*OP_EXACTN_IC*/
+
+    } : null;
+
+    public final int OpCodeArgTypes[] = Config.DEBUG_COMPILE ? new int[] {
+        Arguments.NON, /*OP_FINISH*/
+        Arguments.NON, /*OP_END*/
+        Arguments.SPECIAL, /*OP_EXACT1*/
+        Arguments.SPECIAL, /*OP_EXACT2*/
+        Arguments.SPECIAL, /*OP_EXACT3*/
+        Arguments.SPECIAL, /*OP_EXACT4*/
+        Arguments.SPECIAL, /*OP_EXACT5*/
+        Arguments.SPECIAL, /*OP_EXACTN*/
+        Arguments.SPECIAL, /*OP_EXACTMB2N1*/
+        Arguments.SPECIAL, /*OP_EXACTMB2N2*/
+        Arguments.SPECIAL, /*OP_EXACTMB2N3*/
+        Arguments.SPECIAL, /*OP_EXACTMB2N*/
+        Arguments.SPECIAL, /*OP_EXACTMB3N*/
+        Arguments.SPECIAL, /*OP_EXACTMBN*/
+        Arguments.SPECIAL, /*OP_EXACT1_IC*/
+        Arguments.SPECIAL, /*OP_EXACTN_IC*/
+        Arguments.SPECIAL, /*OP_CCLASS*/
+        Arguments.SPECIAL, /*OP_CCLASS_MB*/
+        Arguments.SPECIAL, /*OP_CCLASS_MIX*/
+        Arguments.SPECIAL, /*OP_CCLASS_NOT*/
+        Arguments.SPECIAL, /*OP_CCLASS_MB_NOT*/
+        Arguments.SPECIAL, /*OP_CCLASS_MIX_NOT*/
+        Arguments.SPECIAL, /*OP_CCLASS_NODE*/
+        Arguments.NON, /*OP_ANYCHAR*/
+        Arguments.NON, /*OP_ANYCHAR_ML*/
+        Arguments.NON, /*OP_ANYCHAR_STAR*/
+        Arguments.NON, /*OP_ANYCHAR_ML_STAR*/
+        Arguments.SPECIAL, /*OP_ANYCHAR_STAR_PEEK_NEXT*/
+        Arguments.SPECIAL, /*OP_ANYCHAR_ML_STAR_PEEK_NEXT*/
+        Arguments.NON, /*OP_WORD*/
+        Arguments.NON, /*OP_NOT_WORD*/
+        Arguments.NON, /*OP_WORD_BOUND*/
+        Arguments.NON, /*OP_NOT_WORD_BOUND*/
+        Arguments.NON, /*OP_WORD_BEGIN*/
+        Arguments.NON, /*OP_WORD_END*/
+        Arguments.NON, /*OP_BEGIN_BUF*/
+        Arguments.NON, /*OP_END_BUF*/
+        Arguments.NON, /*OP_BEGIN_LINE*/
+        Arguments.NON, /*OP_END_LINE*/
+        Arguments.NON, /*OP_SEMI_END_BUF*/
+        Arguments.NON, /*OP_BEGIN_POSITION*/
+        Arguments.NON, /*OP_BACKREF1*/
+        Arguments.NON, /*OP_BACKREF2*/
+        Arguments.MEMNUM, /*OP_BACKREFN*/
+        Arguments.SPECIAL, /*OP_BACKREFN_IC*/
+        Arguments.SPECIAL, /*OP_BACKREF_MULTI*/
+        Arguments.SPECIAL, /*OP_BACKREF_MULTI_IC*/
+        Arguments.SPECIAL, /*OP_BACKREF_AT_LEVEL*/
+        Arguments.MEMNUM, /*OP_MEMORY_START*/
+        Arguments.MEMNUM, /*OP_MEMORY_START_PUSH*/
+        Arguments.MEMNUM, /*OP_MEMORY_END_PUSH*/
+        Arguments.MEMNUM, /*OP_MEMORY_END_PUSH_REC*/
+        Arguments.MEMNUM, /*OP_MEMORY_END*/
+        Arguments.MEMNUM, /*OP_MEMORY_END_REC*/
+        Arguments.NON, /*OP_FAIL*/
+        Arguments.RELADDR, /*OP_JUMP*/
+        Arguments.RELADDR, /*OP_PUSH*/
+        Arguments.NON, /*OP_POP*/
+        Arguments.SPECIAL, /*OP_PUSH_OR_JUMP_EXACT1*/
+        Arguments.SPECIAL, /*OP_PUSH_IF_PEEK_NEXT*/
+        Arguments.SPECIAL, /*OP_REPEAT*/
+        Arguments.SPECIAL, /*OP_REPEAT_NG*/
+        Arguments.MEMNUM, /*OP_REPEAT_INC*/
+        Arguments.MEMNUM, /*OP_REPEAT_INC_NG*/
+        Arguments.MEMNUM, /*OP_REPEAT_INC_SG*/
+        Arguments.MEMNUM, /*OP_REPEAT_INC_NG_SG*/
+        Arguments.MEMNUM, /*OP_NULL_CHECK_START*/
+        Arguments.MEMNUM, /*OP_NULL_CHECK_END*/
+        Arguments.MEMNUM, /*OP_NULL_CHECK_END_MEMST*/
+        Arguments.MEMNUM, /*OP_NULL_CHECK_END_MEMST_PUSH*/
+        Arguments.NON, /*OP_PUSH_POS*/
+        Arguments.NON, /*OP_POP_POS*/
+        Arguments.RELADDR, /*OP_PUSH_POS_NOT*/
+        Arguments.NON, /*OP_FAIL_POS*/
+        Arguments.NON, /*OP_PUSH_STOP_BT*/
+        Arguments.NON, /*OP_POP_STOP_BT*/
+        Arguments.SPECIAL, /*OP_LOOK_BEHIND*/
+        Arguments.SPECIAL, /*OP_PUSH_LOOK_BEHIND_NOT*/
+        Arguments.NON, /*OP_FAIL_LOOK_BEHIND_NOT*/
+        Arguments.ABSADDR, /*OP_CALL*/
+        Arguments.NON, /*OP_RETURN*/
+        Arguments.SPECIAL, /*OP_STATE_CHECK_PUSH*/
+        Arguments.SPECIAL, /*OP_STATE_CHECK_PUSH_OR_JUMP*/
+        Arguments.STATE_CHECK, /*OP_STATE_CHECK*/
+        Arguments.STATE_CHECK, /*OP_STATE_CHECK_ANYCHAR_STAR*/
+        Arguments.STATE_CHECK, /*OP_STATE_CHECK_ANYCHAR_ML_STAR*/
+        Arguments.OPTION, /*OP_SET_OPTION_PUSH*/
+        Arguments.OPTION, /*OP_SET_OPTION*/
+
+        // single byte versions
+        Arguments.NON, /*OP_ANYCHAR*/
+        Arguments.NON, /*OP_ANYCHAR_ML*/
+        Arguments.NON, /*OP_ANYCHAR_STAR*/
+        Arguments.NON, /*OP_ANYCHAR_ML_STAR*/
+        Arguments.SPECIAL, /*OP_ANYCHAR_STAR_PEEK_NEXT*/
+        Arguments.SPECIAL, /*OP_ANYCHAR_ML_STAR_PEEK_NEXT*/
+        Arguments.STATE_CHECK, /*OP_STATE_CHECK_ANYCHAR_STAR*/
+        Arguments.STATE_CHECK, /*OP_STATE_CHECK_ANYCHAR_ML_STAR*/
+
+        Arguments.SPECIAL, /*OP_CCLASS*/
+        Arguments.SPECIAL, /*OP_CCLASS_NOT*/
+
+        Arguments.NON, /*OP_WORD*/
+        Arguments.NON, /*OP_NOT_WORD*/
+        Arguments.NON, /*OP_WORD_BOUND*/
+        Arguments.NON, /*OP_NOT_WORD_BOUND*/
+        Arguments.NON, /*OP_WORD_BEGIN*/
+        Arguments.NON, /*OP_WORD_END*/
+
+        Arguments.SPECIAL, /*OP_LOOK_BEHIND*/
+
+        Arguments.SPECIAL, /*OP_EXACT1_IC*/
+        Arguments.SPECIAL, /*OP_EXACTN_IC*/
+    } : null;
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/OPSize.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/OPSize.java
new file mode 100644
index 00000000000..c0a8b148fe5
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/OPSize.java
@@ -0,0 +1,76 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni.constants;
+
+public interface OPSize {
+
+    // this might be helpful for potential byte[] migration
+    final int OPCODE                = 1;
+    final int RELADDR               = 1;
+    final int ABSADDR               = 1;
+    final int LENGTH                = 1;
+    final int MEMNUM                = 1;
+    final int STATE_CHECK_NUM       = 1;
+    final int REPEATNUM             = 1;
+    final int OPTION                = 1;
+    final int CODE_POINT            = 1;
+    final int POINTER               = 1;
+    final int INDEX                 = 1;
+
+    /* op-code + arg size */
+
+    final int ANYCHAR_STAR                  = OPCODE;
+    final int ANYCHAR_STAR_PEEK_NEXT        = (OPCODE + 1);
+    final int JUMP                          = (OPCODE + RELADDR);
+    final int PUSH                          = (OPCODE + RELADDR);
+    final int POP                           = OPCODE;
+    final int PUSH_OR_JUMP_EXACT1           = (OPCODE + RELADDR + 1);
+    final int PUSH_IF_PEEK_NEXT             = (OPCODE + RELADDR + 1);
+    final int REPEAT_INC                    = (OPCODE + MEMNUM);
+    final int REPEAT_INC_NG                 = (OPCODE + MEMNUM);
+    final int PUSH_POS                      = OPCODE;
+    final int PUSH_POS_NOT                  = (OPCODE + RELADDR);
+    final int POP_POS                       = OPCODE;
+    final int FAIL_POS                      = OPCODE;
+    final int SET_OPTION                    = (OPCODE + OPTION);
+    final int SET_OPTION_PUSH               = (OPCODE + OPTION);
+    final int FAIL                          = OPCODE;
+    final int MEMORY_START                  = (OPCODE + MEMNUM);
+    final int MEMORY_START_PUSH             = (OPCODE + MEMNUM);
+    final int MEMORY_END_PUSH               = (OPCODE + MEMNUM);
+    final int MEMORY_END_PUSH_REC           = (OPCODE + MEMNUM);
+    final int MEMORY_END                    = (OPCODE + MEMNUM);
+    final int MEMORY_END_REC                = (OPCODE + MEMNUM);
+    final int PUSH_STOP_BT                  = OPCODE;
+    final int POP_STOP_BT                   = OPCODE;
+    final int NULL_CHECK_START              = (OPCODE + MEMNUM);
+    final int NULL_CHECK_END                = (OPCODE + MEMNUM);
+    final int LOOK_BEHIND                   = (OPCODE + LENGTH);
+    final int PUSH_LOOK_BEHIND_NOT          = (OPCODE + RELADDR + LENGTH);
+    final int FAIL_LOOK_BEHIND_NOT          = OPCODE;
+    final int CALL                          = (OPCODE + ABSADDR);
+    final int RETURN                        = OPCODE;
+
+    // #ifdef USE_COMBINATION_EXPLOSION_CHECK
+    final int STATE_CHECK                   = (OPCODE + STATE_CHECK_NUM);
+    final int STATE_CHECK_PUSH              = (OPCODE + STATE_CHECK_NUM + RELADDR);
+    final int STATE_CHECK_PUSH_OR_JUMP      = (OPCODE + STATE_CHECK_NUM + RELADDR);
+    final int STATE_CHECK_ANYCHAR_STAR      = (OPCODE + STATE_CHECK_NUM);
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/Reduce.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/Reduce.java
new file mode 100644
index 00000000000..a906e84dff1
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/Reduce.java
@@ -0,0 +1,61 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni.constants;
+
+import static jdk.nashorn.internal.runtime.regexp.joni.constants.Reduce.ReduceType.A;
+import static jdk.nashorn.internal.runtime.regexp.joni.constants.Reduce.ReduceType.AQ;
+import static jdk.nashorn.internal.runtime.regexp.joni.constants.Reduce.ReduceType.ASIS;
+import static jdk.nashorn.internal.runtime.regexp.joni.constants.Reduce.ReduceType.DEL;
+import static jdk.nashorn.internal.runtime.regexp.joni.constants.Reduce.ReduceType.PQ_Q;
+import static jdk.nashorn.internal.runtime.regexp.joni.constants.Reduce.ReduceType.P_QQ;
+import static jdk.nashorn.internal.runtime.regexp.joni.constants.Reduce.ReduceType.QQ;
+
+public interface Reduce {
+
+    enum ReduceType {
+        ASIS,       /* as is */
+        DEL,        /* delete parent */
+        A,          /* to '*'    */
+        AQ,         /* to '*?'   */
+        QQ,         /* to '??'   */
+        P_QQ,       /* to '+)??' */
+        PQ_Q,       /* to '+?)?' */
+    }
+
+    final ReduceType[][]REDUCE_TABLE = {
+      {DEL,     A,      A,      QQ,     AQ,     ASIS}, /* '?'  */
+      {DEL,     DEL,    DEL,    P_QQ,   P_QQ,   DEL},  /* '*'  */
+      {A,       A,      DEL,    ASIS,   P_QQ,   DEL},  /* '+'  */
+      {DEL,     AQ,     AQ,     DEL,    AQ,     AQ},   /* '??' */
+      {DEL,     DEL,    DEL,    DEL,    DEL,    DEL},  /* '*?' */
+      {ASIS,    PQ_Q,   DEL,    AQ,     AQ,     DEL}   /* '+?' */
+    };
+
+
+    final String PopularQStr[] = new String[] {
+        "?", "*", "+", "??", "*?", "+?"
+    };
+
+    String ReduceQStr[]= new String[] {
+        "", "", "*", "*?", "??", "+ and ??", "+? and ?"
+    };
+
+}
+
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/RegexState.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/RegexState.java
new file mode 100644
index 00000000000..dd3bd6d7807
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/RegexState.java
@@ -0,0 +1,28 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni.constants;
+
+// we dont need this ATM
+public interface RegexState {
+    final int NORMAL          = 0;
+    final int SEARCHING       = 1;
+    final int COMPILING       = -1;
+    final int MODIFY          = -2;
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/StackPopLevel.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/StackPopLevel.java
new file mode 100644
index 00000000000..efe7e4f5e9d
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/StackPopLevel.java
@@ -0,0 +1,27 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni.constants;
+
+public interface StackPopLevel {
+    final int FREE      = 0;
+    final int MEM_START = 1;
+    final int ALL       = 2;
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/StackType.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/StackType.java
new file mode 100644
index 00000000000..0e0ebc6a422
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/StackType.java
@@ -0,0 +1,51 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni.constants;
+
+public interface StackType {
+    /** stack **/
+    final int INVALID_STACK_INDEX           = -1;
+
+    /* stack type */
+    /* used by normal-POP */
+    final int ALT                           = 0x0001;
+    final int LOOK_BEHIND_NOT               = 0x0002;
+    final int POS_NOT                       = 0x0003;
+    /* handled by normal-POP */
+    final int MEM_START                     = 0x0100;
+    final int MEM_END                       = 0x8200;
+    final int REPEAT_INC                    = 0x0300;
+    final int STATE_CHECK_MARK              = 0x1000;
+    /* avoided by normal-POP */
+    final int NULL_CHECK_START              = 0x3000;
+    final int NULL_CHECK_END                = 0x5000;  /* for recursive call */
+    final int MEM_END_MARK                  = 0x8400;
+    final int POS                           = 0x0500;  /* used when POP-POS */
+    final int STOP_BT                       = 0x0600;  /* mark for "(?>...)" */
+    final int REPEAT                        = 0x0700;
+    final int CALL_FRAME                    = 0x0800;
+    final int RETURN                        = 0x0900;
+    final int VOID                          = 0x0a00;  /* for fill a blank */
+
+    /* stack type check mask */
+    final int MASK_POP_USED                 = 0x00ff;
+    final int MASK_TO_VOID_TARGET           = 0x10ff;
+    final int MASK_MEM_END_OR_MARK          = 0x8000;  /* MEM_END or MEM_END_MARK */
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/StringType.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/StringType.java
new file mode 100644
index 00000000000..d16c93ea08b
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/StringType.java
@@ -0,0 +1,27 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni.constants;
+
+public interface StringType {
+    final int NSTR_RAW               = 1<<0;
+    final int NSTR_AMBIG             = 1<<1;
+    final int NSTR_DONT_GET_OPT_INFO = 1<<2;
+    final int NSTR_SHARED            = 1<<3;
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/SyntaxProperties.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/SyntaxProperties.java
new file mode 100644
index 00000000000..3da439a660f
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/SyntaxProperties.java
@@ -0,0 +1,124 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni.constants;
+
+public interface SyntaxProperties {
+    /* syntax (operators); */
+    final int OP_VARIABLE_META_CHARACTERS    = (1<<0);
+    final int OP_DOT_ANYCHAR                 = (1<<1);   /* . */
+    final int OP_ASTERISK_ZERO_INF           = (1<<2);   /* * */
+    final int OP_ESC_ASTERISK_ZERO_INF       = (1<<3);
+    final int OP_PLUS_ONE_INF                = (1<<4);   /* + */
+    final int OP_ESC_PLUS_ONE_INF            = (1<<5);
+    final int OP_QMARK_ZERO_ONE              = (1<<6);   /* ? */
+    final int OP_ESC_QMARK_ZERO_ONE          = (1<<7);
+    final int OP_BRACE_INTERVAL              = (1<<8);   /* {lower,upper} */
+    final int OP_ESC_BRACE_INTERVAL          = (1<<9);   /* \{lower,upper\} */
+    final int OP_VBAR_ALT                    = (1<<10);   /* | */
+    final int OP_ESC_VBAR_ALT                = (1<<11);  /* \| */
+    final int OP_LPAREN_SUBEXP               = (1<<12);  /* (...);   */
+    final int OP_ESC_LPAREN_SUBEXP           = (1<<13);  /* \(...\); */
+    final int OP_ESC_AZ_BUF_ANCHOR           = (1<<14);  /* \A, \Z, \z */
+    final int OP_ESC_CAPITAL_G_BEGIN_ANCHOR  = (1<<15);  /* \G     */
+    final int OP_DECIMAL_BACKREF             = (1<<16);  /* \num   */
+    final int OP_BRACKET_CC                  = (1<<17);  /* [...]  */
+    final int OP_ESC_W_WORD                  = (1<<18);  /* \w, \W */
+    final int OP_ESC_LTGT_WORD_BEGIN_END     = (1<<19);  /* \<. \> */
+    final int OP_ESC_B_WORD_BOUND            = (1<<20);  /* \b, \B */
+    final int OP_ESC_S_WHITE_SPACE           = (1<<21);  /* \s, \S */
+    final int OP_ESC_D_DIGIT                 = (1<<22);  /* \d, \D */
+    final int OP_LINE_ANCHOR                 = (1<<23);  /* ^, $   */
+    final int OP_POSIX_BRACKET               = (1<<24);  /* [:xxxx:] */
+    final int OP_QMARK_NON_GREEDY            = (1<<25);  /* ??,*?,+?,{n,m}? */
+    final int OP_ESC_CONTROL_CHARS           = (1<<26);  /* \n,\r,\t,\a ... */
+    final int OP_ESC_C_CONTROL               = (1<<27);  /* \cx  */
+    final int OP_ESC_OCTAL3                  = (1<<28);  /* \OOO */
+    final int OP_ESC_X_HEX2                  = (1<<29);  /* \xHH */
+    final int OP_ESC_X_BRACE_HEX8            = (1<<30);  /* \x{7HHHHHHH} */
+
+    final int OP2_ESC_CAPITAL_Q_QUOTE        = (1<<0);  /* \Q...\E */
+    final int OP2_QMARK_GROUP_EFFECT         = (1<<1);  /* (?...); */
+    final int OP2_OPTION_PERL                = (1<<2);  /* (?imsx);,(?-imsx); */
+    final int OP2_OPTION_RUBY                = (1<<3);  /* (?imx);, (?-imx);  */
+    final int OP2_PLUS_POSSESSIVE_REPEAT     = (1<<4);  /* ?+,*+,++ */
+    final int OP2_PLUS_POSSESSIVE_INTERVAL   = (1<<5);  /* {n,m}+   */
+    final int OP2_CCLASS_SET_OP              = (1<<6);  /* [...&&..[..]..] */
+    final int OP2_QMARK_LT_NAMED_GROUP       = (1<<7);  /* (?<name>...); */
+    final int OP2_ESC_K_NAMED_BACKREF        = (1<<8);  /* \k<name> */
+    final int OP2_ESC_G_SUBEXP_CALL          = (1<<9);  /* \g<name>, \g<n> */
+    final int OP2_ATMARK_CAPTURE_HISTORY     = (1<<10); /* (?@..);,(?@<x>..); */
+    final int OP2_ESC_CAPITAL_C_BAR_CONTROL  = (1<<11); /* \C-x */
+    final int OP2_ESC_CAPITAL_M_BAR_META     = (1<<12); /* \M-x */
+    final int OP2_ESC_V_VTAB                 = (1<<13); /* \v as VTAB */
+    final int OP2_ESC_U_HEX4                 = (1<<14); /* \\uHHHH */
+    final int OP2_ESC_GNU_BUF_ANCHOR         = (1<<15); /* \`, \' */
+    final int OP2_ESC_P_BRACE_CHAR_PROPERTY  = (1<<16); /* \p{...}, \P{...} */
+    final int OP2_ESC_P_BRACE_CIRCUMFLEX_NOT = (1<<17); /* \p{^..}, \P{^..} */
+    /* final int OP2_CHAR_PROPERTY_PREFIX_IS = (1<<18); */
+    final int OP2_ESC_H_XDIGIT               = (1<<19); /* \h, \H */
+    final int OP2_INEFFECTIVE_ESCAPE         = (1<<20); /* \ */
+
+    /* syntax (behavior); */
+    final int CONTEXT_INDEP_ANCHORS           = (1<<31); /* not implemented */
+    final int CONTEXT_INDEP_REPEAT_OPS        = (1<<0);  /* ?, *, +, {n,m} */
+    final int CONTEXT_INVALID_REPEAT_OPS      = (1<<1);  /* error or ignore */
+    final int ALLOW_UNMATCHED_CLOSE_SUBEXP    = (1<<2);  /* ...);... */
+    final int ALLOW_INVALID_INTERVAL          = (1<<3);  /* {??? */
+    final int ALLOW_INTERVAL_LOW_ABBREV       = (1<<4);  /* {,n} => {0,n} */
+    final int STRICT_CHECK_BACKREF            = (1<<5);  /* /(\1);/,/\1();/ ..*/
+    final int DIFFERENT_LEN_ALT_LOOK_BEHIND   = (1<<6);  /* (?<=a|bc); */
+    final int CAPTURE_ONLY_NAMED_GROUP        = (1<<7);  /* see doc/RE */
+    final int ALLOW_MULTIPLEX_DEFINITION_NAME = (1<<8);  /* (?<x>);(?<x>); */
+    final int FIXED_INTERVAL_IS_GREEDY_ONLY   = (1<<9);  /* a{n}?=(?:a{n});? */
+
+    /* syntax (behavior); in char class [...] */
+    final int NOT_NEWLINE_IN_NEGATIVE_CC      = (1<<20); /* [^...] */
+    final int BACKSLASH_ESCAPE_IN_CC          = (1<<21); /* [..\w..] etc.. */
+    final int ALLOW_EMPTY_RANGE_IN_CC         = (1<<22);
+    final int ALLOW_DOUBLE_RANGE_OP_IN_CC     = (1<<23); /* [0-9-a]=[0-9\-a] */
+    /* syntax (behavior); warning */
+    final int WARN_CC_OP_NOT_ESCAPED          = (1<<24); /* [,-,] */
+    final int WARN_REDUNDANT_NESTED_REPEAT    = (1<<25); /* (?:a*);+ */
+
+    final int POSIX_COMMON_OP =
+                            OP_DOT_ANYCHAR | OP_POSIX_BRACKET |
+                            OP_DECIMAL_BACKREF |
+                            OP_BRACKET_CC | OP_ASTERISK_ZERO_INF |
+                            OP_LINE_ANCHOR |
+                            OP_ESC_CONTROL_CHARS;
+
+    final int GNU_REGEX_OP =
+                            OP_DOT_ANYCHAR | OP_BRACKET_CC |
+                            OP_POSIX_BRACKET | OP_DECIMAL_BACKREF |
+                            OP_BRACE_INTERVAL | OP_LPAREN_SUBEXP |
+                            OP_VBAR_ALT |
+                            OP_ASTERISK_ZERO_INF | OP_PLUS_ONE_INF |
+                            OP_QMARK_ZERO_ONE |
+                            OP_ESC_AZ_BUF_ANCHOR | OP_ESC_CAPITAL_G_BEGIN_ANCHOR |
+                            OP_ESC_W_WORD |
+                            OP_ESC_B_WORD_BOUND | OP_ESC_LTGT_WORD_BEGIN_END |
+                            OP_ESC_S_WHITE_SPACE | OP_ESC_D_DIGIT |
+                            OP_LINE_ANCHOR;
+
+    final int GNU_REGEX_BV =
+                            CONTEXT_INDEP_ANCHORS | CONTEXT_INDEP_REPEAT_OPS |
+                            CONTEXT_INVALID_REPEAT_OPS | ALLOW_INVALID_INTERVAL |
+                            BACKSLASH_ESCAPE_IN_CC | ALLOW_DOUBLE_RANGE_OP_IN_CC;
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/TargetInfo.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/TargetInfo.java
new file mode 100644
index 00000000000..0c965596a3a
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/TargetInfo.java
@@ -0,0 +1,27 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni.constants;
+
+public interface TargetInfo {
+    final int ISNOT_EMPTY   = 0;
+    final int IS_EMPTY      = 1;
+    final int IS_EMPTY_MEM  = 2;
+    final int IS_EMPTY_REC  = 3;
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/TokenType.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/TokenType.java
new file mode 100644
index 00000000000..342455f2b7e
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/TokenType.java
@@ -0,0 +1,48 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni.constants;
+
+public enum TokenType {
+      EOT,            /* end of token */
+      RAW_BYTE,
+      CHAR,
+      STRING,
+      CODE_POINT,
+      ANYCHAR,
+      CHAR_TYPE,
+      BACKREF,
+      CALL,
+      ANCHOR,
+      OP_REPEAT,
+      INTERVAL,
+      ANYCHAR_ANYTIME,  /* SQL '%' == .* */
+      ALT,
+      SUBEXP_OPEN,
+      SUBEXP_CLOSE,
+      CC_OPEN,
+      QUOTE_OPEN,
+      CHAR_PROPERTY,    /* \p{...}, \P{...} */
+      /* in cc */
+      CC_CLOSE,
+      CC_RANGE,
+      POSIX_BRACKET_OPEN,
+      CC_AND,             /* && */
+      CC_CC_OPEN          /* [ */
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/Traverse.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/Traverse.java
new file mode 100644
index 00000000000..8cc366722a7
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/constants/Traverse.java
@@ -0,0 +1,26 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni.constants;
+
+public interface Traverse {
+    final int TRAVERSE_CALLBACK_AT_FIRST = 1;
+    final int TRAVERSE_CALLBACK_AT_LAST = 2;
+    final int TRAVERSE_CALLBACK_AT_BOTH = TRAVERSE_CALLBACK_AT_FIRST | TRAVERSE_CALLBACK_AT_LAST;
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/encoding/AsciiTables.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/encoding/AsciiTables.java
new file mode 100644
index 00000000000..77eba2deb86
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/encoding/AsciiTables.java
@@ -0,0 +1,157 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni.encoding;
+
+public class AsciiTables {
+
+    public static final short AsciiCtypeTable[] = {
+            0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+            0x4008, 0x420c, 0x4209, 0x4208, 0x4208, 0x4208, 0x4008, 0x4008,
+            0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+            0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008, 0x4008,
+            0x4284, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+            0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+            0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0, 0x78b0,
+            0x78b0, 0x78b0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x41a0,
+            0x41a0, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x7ca2, 0x74a2,
+            0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
+            0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2, 0x74a2,
+            0x74a2, 0x74a2, 0x74a2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x51a0,
+            0x41a0, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x78e2, 0x70e2,
+            0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
+            0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2, 0x70e2,
+            0x70e2, 0x70e2, 0x70e2, 0x41a0, 0x41a0, 0x41a0, 0x41a0, 0x4008,
+            0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+            0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+            0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+            0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+            0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+            0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+            0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+            0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+            0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+            0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+            0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+            0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+            0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+            0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+            0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+            0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
+    };
+
+    public static final byte ToLowerCaseTable[] = {
+            (byte)'\000', (byte)'\001', (byte)'\002', (byte)'\003', (byte)'\004', (byte)'\005', (byte)'\006', (byte)'\007',
+            (byte)'\010', (byte)'\011', (byte)'\012', (byte)'\013', (byte)'\014', (byte)'\015', (byte)'\016', (byte)'\017',
+            (byte)'\020', (byte)'\021', (byte)'\022', (byte)'\023', (byte)'\024', (byte)'\025', (byte)'\026', (byte)'\027',
+            (byte)'\030', (byte)'\031', (byte)'\032', (byte)'\033', (byte)'\034', (byte)'\035', (byte)'\036', (byte)'\037',
+            (byte)'\040', (byte)'\041', (byte)'\042', (byte)'\043', (byte)'\044', (byte)'\045', (byte)'\046', (byte)'\047',
+            (byte)'\050', (byte)'\051', (byte)'\052', (byte)'\053', (byte)'\054', (byte)'\055', (byte)'\056', (byte)'\057',
+            (byte)'\060', (byte)'\061', (byte)'\062', (byte)'\063', (byte)'\064', (byte)'\065', (byte)'\066', (byte)'\067',
+            (byte)'\070', (byte)'\071', (byte)'\072', (byte)'\073', (byte)'\074', (byte)'\075', (byte)'\076', (byte)'\077',
+            (byte)'\100', (byte)'\141', (byte)'\142', (byte)'\143', (byte)'\144', (byte)'\145', (byte)'\146', (byte)'\147',
+            (byte)'\150', (byte)'\151', (byte)'\152', (byte)'\153', (byte)'\154', (byte)'\155', (byte)'\156', (byte)'\157',
+            (byte)'\160', (byte)'\161', (byte)'\162', (byte)'\163', (byte)'\164', (byte)'\165', (byte)'\166', (byte)'\167',
+            (byte)'\170', (byte)'\171', (byte)'\172', (byte)'\133', (byte)'\134', (byte)'\135', (byte)'\136', (byte)'\137',
+            (byte)'\140', (byte)'\141', (byte)'\142', (byte)'\143', (byte)'\144', (byte)'\145', (byte)'\146', (byte)'\147',
+            (byte)'\150', (byte)'\151', (byte)'\152', (byte)'\153', (byte)'\154', (byte)'\155', (byte)'\156', (byte)'\157',
+            (byte)'\160', (byte)'\161', (byte)'\162', (byte)'\163', (byte)'\164', (byte)'\165', (byte)'\166', (byte)'\167',
+            (byte)'\170', (byte)'\171', (byte)'\172', (byte)'\173', (byte)'\174', (byte)'\175', (byte)'\176', (byte)'\177',
+            (byte)'\200', (byte)'\201', (byte)'\202', (byte)'\203', (byte)'\204', (byte)'\205', (byte)'\206', (byte)'\207',
+            (byte)'\210', (byte)'\211', (byte)'\212', (byte)'\213', (byte)'\214', (byte)'\215', (byte)'\216', (byte)'\217',
+            (byte)'\220', (byte)'\221', (byte)'\222', (byte)'\223', (byte)'\224', (byte)'\225', (byte)'\226', (byte)'\227',
+            (byte)'\230', (byte)'\231', (byte)'\232', (byte)'\233', (byte)'\234', (byte)'\235', (byte)'\236', (byte)'\237',
+            (byte)'\240', (byte)'\241', (byte)'\242', (byte)'\243', (byte)'\244', (byte)'\245', (byte)'\246', (byte)'\247',
+            (byte)'\250', (byte)'\251', (byte)'\252', (byte)'\253', (byte)'\254', (byte)'\255', (byte)'\256', (byte)'\257',
+            (byte)'\260', (byte)'\261', (byte)'\262', (byte)'\263', (byte)'\264', (byte)'\265', (byte)'\266', (byte)'\267',
+            (byte)'\270', (byte)'\271', (byte)'\272', (byte)'\273', (byte)'\274', (byte)'\275', (byte)'\276', (byte)'\277',
+            (byte)'\300', (byte)'\301', (byte)'\302', (byte)'\303', (byte)'\304', (byte)'\305', (byte)'\306', (byte)'\307',
+            (byte)'\310', (byte)'\311', (byte)'\312', (byte)'\313', (byte)'\314', (byte)'\315', (byte)'\316', (byte)'\317',
+            (byte)'\320', (byte)'\321', (byte)'\322', (byte)'\323', (byte)'\324', (byte)'\325', (byte)'\326', (byte)'\327',
+            (byte)'\330', (byte)'\331', (byte)'\332', (byte)'\333', (byte)'\334', (byte)'\335', (byte)'\336', (byte)'\337',
+            (byte)'\340', (byte)'\341', (byte)'\342', (byte)'\343', (byte)'\344', (byte)'\345', (byte)'\346', (byte)'\347',
+            (byte)'\350', (byte)'\351', (byte)'\352', (byte)'\353', (byte)'\354', (byte)'\355', (byte)'\356', (byte)'\357',
+            (byte)'\360', (byte)'\361', (byte)'\362', (byte)'\363', (byte)'\364', (byte)'\365', (byte)'\366', (byte)'\367',
+            (byte)'\370', (byte)'\371', (byte)'\372', (byte)'\373', (byte)'\374', (byte)'\375', (byte)'\376', (byte)'\377',
+    };
+
+    public static final byte ToUpperCaseTable[] = {
+            (byte)'\000', (byte)'\001', (byte)'\002', (byte)'\003', (byte)'\004', (byte)'\005', (byte)'\006', (byte)'\007',
+            (byte)'\010', (byte)'\011', (byte)'\012', (byte)'\013', (byte)'\014', (byte)'\015', (byte)'\016', (byte)'\017',
+            (byte)'\020', (byte)'\021', (byte)'\022', (byte)'\023', (byte)'\024', (byte)'\025', (byte)'\026', (byte)'\027',
+            (byte)'\030', (byte)'\031', (byte)'\032', (byte)'\033', (byte)'\034', (byte)'\035', (byte)'\036', (byte)'\037',
+            (byte)'\040', (byte)'\041', (byte)'\042', (byte)'\043', (byte)'\044', (byte)'\045', (byte)'\046', (byte)'\047',
+            (byte)'\050', (byte)'\051', (byte)'\052', (byte)'\053', (byte)'\054', (byte)'\055', (byte)'\056', (byte)'\057',
+            (byte)'\060', (byte)'\061', (byte)'\062', (byte)'\063', (byte)'\064', (byte)'\065', (byte)'\066', (byte)'\067',
+            (byte)'\070', (byte)'\071', (byte)'\072', (byte)'\073', (byte)'\074', (byte)'\075', (byte)'\076', (byte)'\077',
+            (byte)'\100', (byte)'\101', (byte)'\102', (byte)'\103', (byte)'\104', (byte)'\105', (byte)'\106', (byte)'\107',
+            (byte)'\110', (byte)'\111', (byte)'\112', (byte)'\113', (byte)'\114', (byte)'\115', (byte)'\116', (byte)'\117',
+            (byte)'\120', (byte)'\121', (byte)'\122', (byte)'\123', (byte)'\124', (byte)'\125', (byte)'\126', (byte)'\127',
+            (byte)'\130', (byte)'\131', (byte)'\132', (byte)'\133', (byte)'\134', (byte)'\135', (byte)'\136', (byte)'\137',
+            (byte)'\140', (byte)'\101', (byte)'\102', (byte)'\103', (byte)'\104', (byte)'\105', (byte)'\106', (byte)'\107',
+            (byte)'\110', (byte)'\111', (byte)'\112', (byte)'\113', (byte)'\114', (byte)'\115', (byte)'\116', (byte)'\117',
+            (byte)'\120', (byte)'\121', (byte)'\122', (byte)'\123', (byte)'\124', (byte)'\125', (byte)'\126', (byte)'\127',
+            (byte)'\130', (byte)'\131', (byte)'\132', (byte)'\173', (byte)'\174', (byte)'\175', (byte)'\176', (byte)'\177',
+            (byte)'\200', (byte)'\201', (byte)'\202', (byte)'\203', (byte)'\204', (byte)'\205', (byte)'\206', (byte)'\207',
+            (byte)'\210', (byte)'\211', (byte)'\212', (byte)'\213', (byte)'\214', (byte)'\215', (byte)'\216', (byte)'\217',
+            (byte)'\220', (byte)'\221', (byte)'\222', (byte)'\223', (byte)'\224', (byte)'\225', (byte)'\226', (byte)'\227',
+            (byte)'\230', (byte)'\231', (byte)'\232', (byte)'\233', (byte)'\234', (byte)'\235', (byte)'\236', (byte)'\237',
+            (byte)'\240', (byte)'\241', (byte)'\242', (byte)'\243', (byte)'\244', (byte)'\245', (byte)'\246', (byte)'\247',
+            (byte)'\250', (byte)'\251', (byte)'\252', (byte)'\253', (byte)'\254', (byte)'\255', (byte)'\256', (byte)'\257',
+            (byte)'\260', (byte)'\261', (byte)'\262', (byte)'\263', (byte)'\264', (byte)'\265', (byte)'\266', (byte)'\267',
+            (byte)'\270', (byte)'\271', (byte)'\272', (byte)'\273', (byte)'\274', (byte)'\275', (byte)'\276', (byte)'\277',
+            (byte)'\300', (byte)'\301', (byte)'\302', (byte)'\303', (byte)'\304', (byte)'\305', (byte)'\306', (byte)'\307',
+            (byte)'\310', (byte)'\311', (byte)'\312', (byte)'\313', (byte)'\314', (byte)'\315', (byte)'\316', (byte)'\317',
+            (byte)'\320', (byte)'\321', (byte)'\322', (byte)'\323', (byte)'\324', (byte)'\325', (byte)'\326', (byte)'\327',
+            (byte)'\330', (byte)'\331', (byte)'\332', (byte)'\333', (byte)'\334', (byte)'\335', (byte)'\336', (byte)'\337',
+            (byte)'\340', (byte)'\341', (byte)'\342', (byte)'\343', (byte)'\344', (byte)'\345', (byte)'\346', (byte)'\347',
+            (byte)'\350', (byte)'\351', (byte)'\352', (byte)'\353', (byte)'\354', (byte)'\355', (byte)'\356', (byte)'\357',
+            (byte)'\360', (byte)'\361', (byte)'\362', (byte)'\363', (byte)'\364', (byte)'\365', (byte)'\366', (byte)'\367',
+            (byte)'\370', (byte)'\371', (byte)'\372', (byte)'\373', (byte)'\374', (byte)'\375', (byte)'\376', (byte)'\377',
+    };
+
+    public static final int LowerMap[][] = {
+            {0x41, 0x61},
+            {0x42, 0x62},
+            {0x43, 0x63},
+            {0x44, 0x64},
+            {0x45, 0x65},
+            {0x46, 0x66},
+            {0x47, 0x67},
+            {0x48, 0x68},
+            {0x49, 0x69},
+            {0x4a, 0x6a},
+            {0x4b, 0x6b},
+            {0x4c, 0x6c},
+            {0x4d, 0x6d},
+            {0x4e, 0x6e},
+            {0x4f, 0x6f},
+            {0x50, 0x70},
+            {0x51, 0x71},
+            {0x52, 0x72},
+            {0x53, 0x73},
+            {0x54, 0x74},
+            {0x55, 0x75},
+            {0x56, 0x76},
+            {0x57, 0x77},
+            {0x58, 0x78},
+            {0x59, 0x79},
+            {0x5a, 0x7a}
+    };
+}
\ No newline at end of file
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/encoding/CharacterType.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/encoding/CharacterType.java
new file mode 100644
index 00000000000..79e1c01adb0
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/encoding/CharacterType.java
@@ -0,0 +1,79 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni.encoding;
+
+public interface CharacterType {
+
+    final int NEWLINE   = 0;
+    final int ALPHA     = 1;
+    final int BLANK     = 2;
+    final int CNTRL     = 3;
+    final int DIGIT     = 4;
+    final int GRAPH     = 5;
+    final int LOWER     = 6;
+    final int PRINT     = 7;
+    final int PUNCT     = 8;
+    final int SPACE     = 9;
+    final int UPPER     = 10;
+    final int XDIGIT    = 11;
+    final int WORD      = 12;
+    final int ALNUM     = 13;      /* alpha || digit */
+    final int ASCII     = 14;
+
+    final int SPECIAL_MASK = 256;
+    final int S = SPECIAL_MASK | SPACE;
+    final int D = SPECIAL_MASK | DIGIT;
+    final int W = SPECIAL_MASK | WORD;
+
+    final int LETTER_MASK = (1 << Character.UPPERCASE_LETTER)
+                          | (1 << Character.LOWERCASE_LETTER)
+                          | (1 << Character.TITLECASE_LETTER)
+                          | (1 << Character.MODIFIER_LETTER)
+                          | (1 << Character.OTHER_LETTER);
+    final int ALPHA_MASK = LETTER_MASK
+                          | (1 << Character.COMBINING_SPACING_MARK)
+                          | (1 << Character.NON_SPACING_MARK)
+                          | (1 << Character.ENCLOSING_MARK);
+    final int ALNUM_MASK = ALPHA_MASK
+                          | (1 << Character.DECIMAL_DIGIT_NUMBER);
+    final int WORD_MASK = ALNUM_MASK
+                          | (1 << Character.CONNECTOR_PUNCTUATION);
+    final int PUNCT_MASK =  (1 << Character.CONNECTOR_PUNCTUATION)
+                          | (1 << Character.DASH_PUNCTUATION)
+                          | (1 << Character.END_PUNCTUATION)
+                          | (1 << Character.FINAL_QUOTE_PUNCTUATION)
+                          | (1 << Character.INITIAL_QUOTE_PUNCTUATION)
+                          | (1 << Character.OTHER_PUNCTUATION)
+                          | (1 << Character.START_PUNCTUATION);
+    final int CNTRL_MASK =  (1 << Character.CONTROL)
+                          | (1 << Character.FORMAT)
+                          | (1 << Character.PRIVATE_USE)
+                          | (1 << Character.SURROGATE);
+    final int SPACE_MASK =  (1 << Character.SPACE_SEPARATOR)
+                          | (1 << Character.LINE_SEPARATOR)        // 0x2028
+                          | (1 << Character.PARAGRAPH_SEPARATOR);  // 0x2029
+    final int GRAPH_MASK = SPACE_MASK
+                          | (1 << Character.CONTROL)
+                          | (1 << Character.SURROGATE);
+    final int PRINT_MASK =  (1 << Character.CONTROL)
+                          | (1 << Character.SURROGATE);
+
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/encoding/IntHolder.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/encoding/IntHolder.java
new file mode 100644
index 00000000000..248538b8886
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/encoding/IntHolder.java
@@ -0,0 +1,24 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni.encoding;
+
+public class IntHolder {
+    public int value;
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/encoding/ObjPtr.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/encoding/ObjPtr.java
new file mode 100644
index 00000000000..5238a03b2c8
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/encoding/ObjPtr.java
@@ -0,0 +1,35 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni.encoding;
+
+public final class ObjPtr<T> {
+    public ObjPtr() {
+        this(null);
+    }
+
+    public ObjPtr(T p) {
+        this.p = p;
+    }
+
+    public T p;
+
+    static final ObjPtr<Void> NULL = new ObjPtr<Void>();
+}
+
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/encoding/PosixBracket.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/encoding/PosixBracket.java
new file mode 100644
index 00000000000..48978bf48ee
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/encoding/PosixBracket.java
@@ -0,0 +1,77 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS".toCharArray(), WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni.encoding;
+
+import jdk.nashorn.internal.runtime.regexp.joni.exception.ErrorMessages;
+import jdk.nashorn.internal.runtime.regexp.joni.exception.JOniException;
+
+import java.util.HashMap;
+
+public class PosixBracket {
+
+    public static final char[][] PBSNamesLower = {
+            "alnum".toCharArray(),
+            "alpha".toCharArray(),
+            "blank".toCharArray(),
+            "cntrl".toCharArray(),
+            "digit".toCharArray(),
+            "graph".toCharArray(),
+            "lower".toCharArray(),
+            "print".toCharArray(),
+            "punct".toCharArray(),
+            "space".toCharArray(),
+            "upper".toCharArray(),
+            "xdigit".toCharArray(),
+            "ascii".toCharArray(),
+            "word".toCharArray()
+    };
+
+    public static final int PBSValues[] = {
+            CharacterType.ALNUM,
+            CharacterType.ALPHA,
+            CharacterType.BLANK,
+            CharacterType.CNTRL,
+            CharacterType.DIGIT,
+            CharacterType.GRAPH,
+            CharacterType.LOWER,
+            CharacterType.PRINT,
+            CharacterType.PUNCT,
+            CharacterType.SPACE,
+            CharacterType.UPPER,
+            CharacterType.XDIGIT,
+            CharacterType.ASCII,
+            CharacterType.WORD,
+    };
+
+    public static int propertyNameToCType(String name) {
+        name = name.toLowerCase();
+        if (!PBSTableUpper.containsKey(name)) {
+            throw new JOniException(ErrorMessages.ERR_INVALID_CHAR_PROPERTY_NAME.replaceAll("%n", name));
+        }
+        return PBSTableUpper.get(name);
+    }
+
+    private static final HashMap<String,Integer> PBSTableUpper = new HashMap<String,Integer>();
+
+    static {
+        for (int i=0; i<PBSValues.length; i++) PBSTableUpper.put(new String(PBSNamesLower[i]), PBSValues[i]);
+    }
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/encoding/Ptr.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/encoding/Ptr.java
new file mode 100644
index 00000000000..57a28b9c2c9
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/encoding/Ptr.java
@@ -0,0 +1,35 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni.encoding;
+
+public final class Ptr {
+    public Ptr() {
+        this(0);
+    }
+
+    public Ptr(int p) {
+        this.p = p;
+    }
+
+    public int p;
+
+    public static final Ptr NULL = new Ptr(0);
+}
+
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/ErrorMessages.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/ErrorMessages.java
new file mode 100644
index 00000000000..87e2a49aadc
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/ErrorMessages.java
@@ -0,0 +1,98 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni.exception;
+
+import jdk.nashorn.internal.runtime.regexp.joni.Config;
+
+public interface ErrorMessages {
+    final String MISMATCH = "mismatch";
+    final String NO_SUPPORT_CONFIG = "no support in this configuration";
+
+    /* from jcodings */
+    final String ERR_INVALID_CHAR_PROPERTY_NAME = "invalid character property name <%n>";
+    final String ERR_INVALID_CODE_POINT_VALUE = "invalid code point value";
+    final String ERR_TOO_BIG_WIDE_CHAR_VALUE = "too big wide-char value";
+    final String ERR_TOO_LONG_WIDE_CHAR_VALUE = "too long wide-char value";
+
+    /* internal error */
+    final String ERR_MEMORY = "fail to memory allocation";
+    final String ERR_MATCH_STACK_LIMIT_OVER = "match-stack limit over";
+    final String ERR_TYPE_BUG = "undefined type (bug)";
+    final String ERR_PARSER_BUG = "internal parser error (bug)";
+    final String ERR_STACK_BUG = "stack error (bug)";
+    final String ERR_UNDEFINED_BYTECODE = "undefined bytecode (bug)";
+    final String ERR_UNEXPECTED_BYTECODE = "unexpected bytecode (bug)";
+    final String ERR_DEFAULT_ENCODING_IS_NOT_SETTED = "default multibyte-encoding is not setted";
+    final String ERR_SPECIFIED_ENCODING_CANT_CONVERT_TO_WIDE_CHAR = "can't convert to wide-char on specified multibyte-encoding";
+
+    /* general error */
+    final String ERR_INVALID_ARGUMENT = "invalid argument";
+
+    /* syntax error */
+    final String ERR_END_PATTERN_AT_LEFT_BRACE = "end pattern at left brace";
+    final String ERR_END_PATTERN_AT_LEFT_BRACKET = "end pattern at left bracket";
+    final String ERR_EMPTY_CHAR_CLASS = "empty char-class";
+    final String ERR_PREMATURE_END_OF_CHAR_CLASS = "premature end of char-class";
+    final String ERR_END_PATTERN_AT_ESCAPE = "end pattern at escape";
+    final String ERR_END_PATTERN_AT_META = "end pattern at meta";
+    final String ERR_END_PATTERN_AT_CONTROL = "end pattern at control";
+    final String ERR_META_CODE_SYNTAX = "invalid meta-code syntax";
+    final String ERR_CONTROL_CODE_SYNTAX = "invalid control-code syntax";
+    final String ERR_CHAR_CLASS_VALUE_AT_END_OF_RANGE = "char-class value at end of range";
+    final String ERR_CHAR_CLASS_VALUE_AT_START_OF_RANGE = "char-class value at start of range";
+    final String ERR_UNMATCHED_RANGE_SPECIFIER_IN_CHAR_CLASS = "unmatched range specifier in char-class";
+    final String ERR_TARGET_OF_REPEAT_OPERATOR_NOT_SPECIFIED = "target of repeat operator is not specified";
+    final String ERR_TARGET_OF_REPEAT_OPERATOR_INVALID = "target of repeat operator is invalid";
+    final String ERR_NESTED_REPEAT_OPERATOR = "nested repeat operator";
+    final String ERR_UNMATCHED_CLOSE_PARENTHESIS = "unmatched close parenthesis";
+    final String ERR_END_PATTERN_WITH_UNMATCHED_PARENTHESIS = "end pattern with unmatched parenthesis";
+    final String ERR_END_PATTERN_IN_GROUP = "end pattern in group";
+    final String ERR_UNDEFINED_GROUP_OPTION = "undefined group option";
+    final String ERR_INVALID_POSIX_BRACKET_TYPE = "invalid POSIX bracket type";
+    final String ERR_INVALID_LOOK_BEHIND_PATTERN = "invalid pattern in look-behind";
+    final String ERR_INVALID_REPEAT_RANGE_PATTERN = "invalid repeat range {lower,upper}";
+
+    /* values error (syntax error) */
+    final String ERR_TOO_BIG_NUMBER = "too big number";
+    final String ERR_TOO_BIG_NUMBER_FOR_REPEAT_RANGE = "too big number for repeat range";
+    final String ERR_UPPER_SMALLER_THAN_LOWER_IN_REPEAT_RANGE = "upper is smaller than lower in repeat range";
+    final String ERR_EMPTY_RANGE_IN_CHAR_CLASS = "empty range in char class";
+    final String ERR_MISMATCH_CODE_LENGTH_IN_CLASS_RANGE = "mismatch multibyte code length in char-class range";
+    final String ERR_TOO_MANY_MULTI_BYTE_RANGES = "too many multibyte code ranges are specified";
+    final String ERR_TOO_SHORT_MULTI_BYTE_STRING = "too short multibyte code string";
+    final String ERR_TOO_BIG_BACKREF_NUMBER = "too big backref number";
+    final String ERR_INVALID_BACKREF = Config.USE_NAMED_GROUP ? "invalid backref number/name" : "invalid backref number";
+    final String ERR_NUMBERED_BACKREF_OR_CALL_NOT_ALLOWED = "numbered backref/call is not allowed. (use name)";
+    final String ERR_INVALID_WIDE_CHAR_VALUE = "invalid wide-char value";
+    final String ERR_EMPTY_GROUP_NAME = "group name is empty";
+    final String ERR_INVALID_GROUP_NAME = "invalid group name <%n>";
+    final String ERR_INVALID_CHAR_IN_GROUP_NAME = Config.USE_NAMED_GROUP ? "invalid char in group name <%n>" : "invalid char in group number <%n>";
+    final String ERR_UNDEFINED_NAME_REFERENCE = "undefined name <%n> reference";
+    final String ERR_UNDEFINED_GROUP_REFERENCE = "undefined group <%n> reference";
+    final String ERR_MULTIPLEX_DEFINED_NAME = "multiplex defined name <%n>";
+    final String ERR_MULTIPLEX_DEFINITION_NAME_CALL = "multiplex definition name <%n> call";
+    final String ERR_NEVER_ENDING_RECURSION = "never ending recursion";
+    final String ERR_GROUP_NUMBER_OVER_FOR_CAPTURE_HISTORY = "group number is too big for capture history";
+    final String ERR_NOT_SUPPORTED_ENCODING_COMBINATION = "not supported encoding combination";
+    final String ERR_INVALID_COMBINATION_OF_OPTIONS = "invalid combination of options";
+    final String ERR_OVER_THREAD_PASS_LIMIT_COUNT = "over thread pass limit count";
+    final String ERR_TOO_BIG_SB_CHAR_VALUE = "too big singlebyte char value";
+
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/InternalException.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/InternalException.java
new file mode 100644
index 00000000000..47028aea0d5
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/InternalException.java
@@ -0,0 +1,28 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni.exception;
+
+public class InternalException extends JOniException{
+    private static final long serialVersionUID = -3871816465397927992L;
+
+    public InternalException(String message) {
+        super(message);
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/JOniException.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/JOniException.java
new file mode 100644
index 00000000000..a5f237f5d03
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/JOniException.java
@@ -0,0 +1,28 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni.exception;
+
+public class JOniException extends RuntimeException{
+    private static final long serialVersionUID = -6027192180014164667L;
+
+    public JOniException(String message) {
+        super(message);
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/SyntaxException.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/SyntaxException.java
new file mode 100644
index 00000000000..e53fe36c7f8
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/SyntaxException.java
@@ -0,0 +1,28 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni.exception;
+
+public class SyntaxException extends JOniException{
+    private static final long serialVersionUID = 7862720128961874288L;
+
+    public SyntaxException(String message) {
+        super(message);
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/ValueException.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/ValueException.java
new file mode 100644
index 00000000000..d56a35a4190
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/exception/ValueException.java
@@ -0,0 +1,37 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package jdk.nashorn.internal.runtime.regexp.joni.exception;
+
+public class ValueException extends SyntaxException{
+    private static final long serialVersionUID = -196013852479929134L;
+
+    public ValueException(String message) {
+        super(message);
+    }
+
+    public ValueException(String message, String str) {
+        super(message.replaceAll("%n", str));
+    }
+
+    public ValueException(String message, byte[]bytes, int p, int end) {
+        this(message, new String(bytes, p, end - p));
+    }
+
+}

From 48a5d9cb5fe29cac585c16d8cf2b783d8a03f569 Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Fri, 22 Feb 2013 22:39:23 +0530
Subject: [PATCH 207/311] 8008729: Make sure that we can run basic jsr223 tests
 using jtreg

Reviewed-by: jlaskey, hannesw, lagergren
---
 nashorn/test/TEST.ROOT                        |   7 +
 .../api/scripting/MultipleEngineTest.java     |   3 +
 .../scripting/ScriptEngineSecurityTest.java   | 142 ++++++++++++++++++
 .../api/scripting/ScriptEngineTest.java       | 104 +------------
 4 files changed, 156 insertions(+), 100 deletions(-)
 create mode 100644 nashorn/test/TEST.ROOT
 create mode 100644 nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineSecurityTest.java

diff --git a/nashorn/test/TEST.ROOT b/nashorn/test/TEST.ROOT
new file mode 100644
index 00000000000..7869746450b
--- /dev/null
+++ b/nashorn/test/TEST.ROOT
@@ -0,0 +1,7 @@
+# This file identifies the root of the test-suite hierarchy.
+# It also contains test-suite configuration information.
+# DO NOT EDIT without first contacting jdk-regtest@sun.com.
+
+# The list of keywords supported in the entire test suite
+keys=2d dnd i18n
+
diff --git a/nashorn/test/src/jdk/nashorn/api/scripting/MultipleEngineTest.java b/nashorn/test/src/jdk/nashorn/api/scripting/MultipleEngineTest.java
index be28c2409cc..f72f8e613a0 100644
--- a/nashorn/test/src/jdk/nashorn/api/scripting/MultipleEngineTest.java
+++ b/nashorn/test/src/jdk/nashorn/api/scripting/MultipleEngineTest.java
@@ -33,6 +33,9 @@ import org.testng.annotations.Test;
 /**
  * Test that we can create multiple, independent script engines and use those
  * independently.
+ *
+ * @test
+ * @run testng jdk.nashorn.api.scripting.MultipleEngineTest
  */
 
 public class MultipleEngineTest {
diff --git a/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineSecurityTest.java b/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineSecurityTest.java
new file mode 100644
index 00000000000..6346313a7e8
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineSecurityTest.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.api.scripting;
+
+import static org.testng.Assert.fail;
+
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import org.testng.annotations.Test;
+
+/**
+ * jsr223 tests for security access checks.
+ */
+public class ScriptEngineSecurityTest {
+
+    private void log(String msg) {
+        org.testng.Reporter.log(msg, true);
+    }
+
+    @Test
+    public void securityPackagesTest() {
+        if (System.getSecurityManager() == null) {
+            // pass vacuously
+        }
+
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+        try {
+            e.eval("var v = Packages.sun.misc.Unsafe;");
+            fail("should have thrown SecurityException");
+        } catch (final Exception exp) {
+            if (exp instanceof SecurityException) {
+                log("got " + exp + " as expected");
+            } else {
+                fail(exp.getMessage());
+            }
+        }
+    }
+
+    @Test
+    public void securityJavaTypeTest() {
+        if (System.getSecurityManager() == null) {
+            // pass vacuously
+        }
+
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+        try {
+            e.eval("var v = Java.type('sun.misc.Unsafe');");
+            fail("should have thrown SecurityException");
+        } catch (final Exception exp) {
+            if (exp instanceof SecurityException) {
+                log("got " + exp + " as expected");
+            } else {
+                fail(exp.getMessage());
+            }
+        }
+    }
+
+    @Test
+    public void securityClassForNameTest() {
+        if (System.getSecurityManager() == null) {
+            // pass vacuously
+        }
+
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+        try {
+            e.eval("var v = java.lang.Class.forName('sun.misc.Unsafe');");
+            fail("should have thrown SecurityException");
+        } catch (final Exception exp) {
+            if (exp instanceof SecurityException) {
+                log("got " + exp + " as expected");
+            } else {
+                fail(exp.getMessage());
+            }
+        }
+    }
+
+    @Test
+    public void securitySystemExit() {
+        if (System.getSecurityManager() == null) {
+            // pass vacuously
+        }
+
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+        try {
+            e.eval("java.lang.System.exit(0);");
+            fail("should have thrown SecurityException");
+        } catch (final Exception exp) {
+            if (exp instanceof SecurityException) {
+                log("got " + exp + " as expected");
+            } else {
+                fail(exp.getMessage());
+            }
+        }
+    }
+
+    @Test
+    public void securitySystemLoadLibrary() {
+        if (System.getSecurityManager() == null) {
+            // pass vacuously
+        }
+
+        final ScriptEngineManager m = new ScriptEngineManager();
+        final ScriptEngine e = m.getEngineByName("nashorn");
+        try {
+            e.eval("java.lang.System.loadLibrary('foo');");
+            fail("should have thrown SecurityException");
+        } catch (final Exception exp) {
+            if (exp instanceof SecurityException) {
+                log("got " + exp + " as expected");
+            } else {
+                fail(exp.getMessage());
+            }
+        }
+    }
+}
diff --git a/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java b/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
index f488feee9c5..f4fd114fa89 100644
--- a/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
+++ b/nashorn/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java
@@ -54,6 +54,10 @@ import org.testng.annotations.Test;
 
 /**
  * Tests for JSR-223 script engine for Nashorn.
+ *
+ * @test
+ * @build jdk.nashorn.api.scripting.Window jdk.nashorn.api.scripting.WindowEventHandler jdk.nashorn.api.scripting.ScriptEngineTest
+ * @run testng jdk.nashorn.api.scripting.ScriptEngineTest
  */
 public class ScriptEngineTest {
 
@@ -655,106 +659,6 @@ public class ScriptEngineTest {
         }
     }
 
-    @Test
-    public void securityPackagesTest() {
-        if (System.getSecurityManager() == null) {
-            // pass vacuously
-        }
-
-        final ScriptEngineManager m = new ScriptEngineManager();
-        final ScriptEngine e = m.getEngineByName("nashorn");
-        try {
-            e.eval("var v = Packages.sun.misc.Unsafe;");
-            fail("should have thrown SecurityException");
-        } catch (final Exception exp) {
-            if (exp instanceof SecurityException) {
-                log("got " + exp + " as expected");
-            } else {
-                fail(exp.getMessage());
-            }
-        }
-    }
-
-    @Test
-    public void securityJavaTypeTest() {
-        if (System.getSecurityManager() == null) {
-            // pass vacuously
-        }
-
-        final ScriptEngineManager m = new ScriptEngineManager();
-        final ScriptEngine e = m.getEngineByName("nashorn");
-        try {
-            e.eval("var v = Java.type('sun.misc.Unsafe');");
-            fail("should have thrown SecurityException");
-        } catch (final Exception exp) {
-            if (exp instanceof SecurityException) {
-                log("got " + exp + " as expected");
-            } else {
-                fail(exp.getMessage());
-            }
-        }
-    }
-
-    @Test
-    public void securityClassForNameTest() {
-        if (System.getSecurityManager() == null) {
-            // pass vacuously
-        }
-
-        final ScriptEngineManager m = new ScriptEngineManager();
-        final ScriptEngine e = m.getEngineByName("nashorn");
-        try {
-            e.eval("var v = java.lang.Class.forName('sun.misc.Unsafe');");
-            fail("should have thrown SecurityException");
-        } catch (final Exception exp) {
-            if (exp instanceof SecurityException) {
-                log("got " + exp + " as expected");
-            } else {
-                fail(exp.getMessage());
-            }
-        }
-    }
-
-    @Test
-    public void securitySystemExit() {
-        if (System.getSecurityManager() == null) {
-            // pass vacuously
-        }
-
-        final ScriptEngineManager m = new ScriptEngineManager();
-        final ScriptEngine e = m.getEngineByName("nashorn");
-        try {
-            e.eval("java.lang.System.exit(0);");
-            fail("should have thrown SecurityException");
-        } catch (final Exception exp) {
-            if (exp instanceof SecurityException) {
-                log("got " + exp + " as expected");
-            } else {
-                fail(exp.getMessage());
-            }
-        }
-    }
-
-    @Test
-    public void securitySystemLoadLibrary() {
-        if (System.getSecurityManager() == null) {
-            // pass vacuously
-        }
-
-        final ScriptEngineManager m = new ScriptEngineManager();
-        final ScriptEngine e = m.getEngineByName("nashorn");
-        try {
-            e.eval("java.lang.System.loadLibrary('foo');");
-            fail("should have thrown SecurityException");
-        } catch (final Exception exp) {
-            if (exp instanceof SecurityException) {
-                log("got " + exp + " as expected");
-            } else {
-                fail(exp.getMessage());
-            }
-        }
-    }
-
     @Test
     public void jsobjectTest() {
         final ScriptEngineManager m = new ScriptEngineManager();

From 3cc83d24adb47c31e1deba1ef1b8586a0d64a495 Mon Sep 17 00:00:00 2001
From: Jennifer Godinez <jgodinez@openjdk.org>
Date: Fri, 22 Feb 2013 11:01:23 -0800
Subject: [PATCH 208/311] 8006110: pageDialog is showing the swing dialog with
 DialogTypeSelection.NATIVE

Reviewed-by: bae, prr
---
 .../classes/sun/print/RasterPrinterJob.java   | 169 ++++++++++--------
 1 file changed, 96 insertions(+), 73 deletions(-)

diff --git a/jdk/src/share/classes/sun/print/RasterPrinterJob.java b/jdk/src/share/classes/sun/print/RasterPrinterJob.java
index 404f66cc26f..24bece595f8 100644
--- a/jdk/src/share/classes/sun/print/RasterPrinterJob.java
+++ b/jdk/src/share/classes/sun/print/RasterPrinterJob.java
@@ -527,9 +527,92 @@ public abstract class RasterPrinterJob extends PrinterJob {
         }
     }
 
+    private PageFormat attributeToPageFormat(PrintService service,
+                                               PrintRequestAttributeSet attSet) {
+        PageFormat page = defaultPage();
+
+        if (service == null) {
+            return page;
+        }
+
+        OrientationRequested orient = (OrientationRequested)
+                                      attSet.get(OrientationRequested.class);
+        if (orient == null) {
+            orient = (OrientationRequested)
+                    service.getDefaultAttributeValue(OrientationRequested.class);
+        }
+        if (orient == OrientationRequested.REVERSE_LANDSCAPE) {
+            page.setOrientation(PageFormat.REVERSE_LANDSCAPE);
+        } else if (orient == OrientationRequested.LANDSCAPE) {
+            page.setOrientation(PageFormat.LANDSCAPE);
+        } else {
+            page.setOrientation(PageFormat.PORTRAIT);
+        }
+
+        Media media = (Media)attSet.get(Media.class);
+        if (media == null) {
+            media =
+                (Media)service.getDefaultAttributeValue(Media.class);
+        }
+        if (!(media instanceof MediaSizeName)) {
+            media = MediaSizeName.NA_LETTER;
+        }
+        MediaSize size =
+            MediaSize.getMediaSizeForName((MediaSizeName)media);
+        if (size == null) {
+            size = MediaSize.NA.LETTER;
+        }
+        Paper paper = new Paper();
+        float dim[] = size.getSize(1); //units == 1 to avoid FP error
+        double w = Math.rint((dim[0]*72.0)/Size2DSyntax.INCH);
+        double h = Math.rint((dim[1]*72.0)/Size2DSyntax.INCH);
+        paper.setSize(w, h);
+        MediaPrintableArea area =
+             (MediaPrintableArea)
+             attSet.get(MediaPrintableArea.class);
+        double ix, iw, iy, ih;
+
+        if (area != null) {
+            // Should pass in same unit as updatePageAttributes
+            // to avoid rounding off errors.
+            ix = Math.rint(
+                           area.getX(MediaPrintableArea.INCH) * DPI);
+            iy = Math.rint(
+                           area.getY(MediaPrintableArea.INCH) * DPI);
+            iw = Math.rint(
+                           area.getWidth(MediaPrintableArea.INCH) * DPI);
+            ih = Math.rint(
+                           area.getHeight(MediaPrintableArea.INCH) * DPI);
+        }
+        else {
+            if (w >= 72.0 * 6.0) {
+                ix = 72.0;
+                iw = w - 2 * 72.0;
+            } else {
+                ix = w / 6.0;
+                iw = w * 0.75;
+            }
+            if (h >= 72.0 * 6.0) {
+                iy = 72.0;
+                ih = h - 2 * 72.0;
+            } else {
+                iy = h / 6.0;
+                ih = h * 0.75;
+            }
+        }
+        paper.setImageableArea(ix, iy, iw, ih);
+        page.setPaper(paper);
+        return page;
+    }
 
     protected void updatePageAttributes(PrintService service,
                                         PageFormat page) {
+        updateAttributesWithPageFormat(service, page, this.attributes);
+    }
+
+    protected void updateAttributesWithPageFormat(PrintService service,
+                                        PageFormat page,
+                                        PrintRequestAttributeSet attributes) {
         if (service == null || page == null) {
             return;
         }
@@ -659,6 +742,18 @@ public abstract class RasterPrinterJob extends PrinterJob {
             throw new HeadlessException();
         }
 
+        DialogTypeSelection dlg =
+            (DialogTypeSelection)attributes.get(DialogTypeSelection.class);
+
+        // Check for native, note that default dialog is COMMON.
+        if (dlg == DialogTypeSelection.NATIVE) {
+            PrintService pservice = getPrintService();
+            PageFormat page = pageDialog(attributeToPageFormat(pservice,
+                                                               attributes));
+            updateAttributesWithPageFormat(pservice, page, attributes);
+            return page;
+        }
+
         final GraphicsConfiguration gc =
             GraphicsEnvironment.getLocalGraphicsEnvironment().
             getDefaultScreenDevice().getDefaultConfiguration();
@@ -698,77 +793,7 @@ public abstract class RasterPrinterJob extends PrinterJob {
                 attributes.remove(amCategory);
             }
             attributes.addAll(newas);
-
-            PageFormat page = defaultPage();
-
-            OrientationRequested orient =
-                (OrientationRequested)
-                attributes.get(OrientationRequested.class);
-            int pfOrient =  PageFormat.PORTRAIT;
-            if (orient != null) {
-                if (orient == OrientationRequested.REVERSE_LANDSCAPE) {
-                    pfOrient = PageFormat.REVERSE_LANDSCAPE;
-                } else if (orient == OrientationRequested.LANDSCAPE) {
-                    pfOrient = PageFormat.LANDSCAPE;
-                }
-            }
-            page.setOrientation(pfOrient);
-
-            Media media = (Media)attributes.get(Media.class);
-            if (media == null) {
-                media =
-                    (Media)service.getDefaultAttributeValue(Media.class);
-            }
-            if (!(media instanceof MediaSizeName)) {
-                media = MediaSizeName.NA_LETTER;
-            }
-            MediaSize size =
-                MediaSize.getMediaSizeForName((MediaSizeName)media);
-            if (size == null) {
-                size = MediaSize.NA.LETTER;
-            }
-            Paper paper = new Paper();
-            float dim[] = size.getSize(1); //units == 1 to avoid FP error
-            double w = Math.rint((dim[0]*72.0)/Size2DSyntax.INCH);
-            double h = Math.rint((dim[1]*72.0)/Size2DSyntax.INCH);
-            paper.setSize(w, h);
-            MediaPrintableArea area =
-                (MediaPrintableArea)
-                attributes.get(MediaPrintableArea.class);
-            double ix, iw, iy, ih;
-
-            if (area != null) {
-                // Should pass in same unit as updatePageAttributes
-                // to avoid rounding off errors.
-                ix = Math.rint(
-                               area.getX(MediaPrintableArea.INCH) * DPI);
-                iy = Math.rint(
-                               area.getY(MediaPrintableArea.INCH) * DPI);
-                iw = Math.rint(
-                               area.getWidth(MediaPrintableArea.INCH) * DPI);
-                ih = Math.rint(
-                               area.getHeight(MediaPrintableArea.INCH) * DPI);
-            }
-            else {
-                if (w >= 72.0 * 6.0) {
-                    ix = 72.0;
-                    iw = w - 2 * 72.0;
-                } else {
-                    ix = w / 6.0;
-                    iw = w * 0.75;
-                }
-                if (h >= 72.0 * 6.0) {
-                    iy = 72.0;
-                    ih = h - 2 * 72.0;
-                } else {
-                    iy = h / 6.0;
-                    ih = h * 0.75;
-                }
-            }
-            paper.setImageableArea(ix, iy, iw, ih);
-            page.setPaper(paper);
-
-            return page;
+            return attributeToPageFormat(service, attributes);
         } else {
             return null;
         }
@@ -795,7 +820,6 @@ public abstract class RasterPrinterJob extends PrinterJob {
             throw new HeadlessException();
         }
 
-
         DialogTypeSelection dlg =
             (DialogTypeSelection)attributes.get(DialogTypeSelection.class);
 
@@ -816,7 +840,6 @@ public abstract class RasterPrinterJob extends PrinterJob {
 
         }
 
-
         /* A security check has already been performed in the
          * java.awt.print.printerJob.getPrinterJob method.
          * So by the time we get here, it is OK for the current thread

From d1643f183326476e986c22393b66a9bdb1137745 Mon Sep 17 00:00:00 2001
From: Jia-Hong Chen <jia-hong.chen@oracle.com>
Date: Fri, 22 Feb 2013 13:20:16 -0800
Subject: [PATCH 209/311] 8005796: [parfait] Possible uninitialised variable at
 jdk/src/share/native/sun/java2d/loops/ByteBinary1Bit.c

Reviewed-by: prr, vadim, flar
---
 jdk/src/share/native/sun/java2d/loops/AnyByteBinary.h  | 5 ++++-
 jdk/src/share/native/sun/java2d/loops/ByteIndexed.h    | 5 ++++-
 jdk/src/share/native/sun/java2d/loops/IntArgb.h        | 3 ++-
 jdk/src/share/native/sun/java2d/loops/IntArgbBm.h      | 3 ++-
 jdk/src/share/native/sun/java2d/loops/IntArgbPre.h     | 3 ++-
 jdk/src/share/native/sun/java2d/loops/Ushort4444Argb.h | 3 ++-
 jdk/src/share/native/sun/java2d/loops/UshortIndexed.h  | 5 ++++-
 7 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/jdk/src/share/native/sun/java2d/loops/AnyByteBinary.h b/jdk/src/share/native/sun/java2d/loops/AnyByteBinary.h
index abe7f230bee..3b1fa03b06a 100644
--- a/jdk/src/share/native/sun/java2d/loops/AnyByteBinary.h
+++ b/jdk/src/share/native/sun/java2d/loops/AnyByteBinary.h
@@ -153,7 +153,10 @@
     jint PREFIX ## rgb;
 
 #define InitByteBinaryAlphaLoadData(TYPE, PREFIX, pRasInfo) \
-    PREFIX ## Lut = (pRasInfo)->lutBase
+    do { \
+        PREFIX ## Lut = (pRasInfo)->lutBase; \
+        PREFIX ## rgb = 0; \
+    } while (0)
 
 #define LoadAlphaFromByteBinaryFor4ByteArgb(TYPE, pRas, PREFIX, COMP_PREFIX) \
     do { \
diff --git a/jdk/src/share/native/sun/java2d/loops/ByteIndexed.h b/jdk/src/share/native/sun/java2d/loops/ByteIndexed.h
index 3917c238e48..215cfc0e111 100644
--- a/jdk/src/share/native/sun/java2d/loops/ByteIndexed.h
+++ b/jdk/src/share/native/sun/java2d/loops/ByteIndexed.h
@@ -202,7 +202,10 @@ typedef jubyte  ByteIndexedBmDataType;
     jint PREFIX ## rgb;
 
 #define InitByteIndexedAlphaLoadData(PREFIX, pRasInfo) \
-    PREFIX ## Lut = (pRasInfo)->lutBase
+    do { \
+        PREFIX ## Lut = (pRasInfo)->lutBase; \
+        PREFIX ## rgb = 0; \
+    } while (0)
 
 #define LoadAlphaFromByteIndexedFor4ByteArgb(pRas, PREFIX, COMP_PREFIX) \
     do { \
diff --git a/jdk/src/share/native/sun/java2d/loops/IntArgb.h b/jdk/src/share/native/sun/java2d/loops/IntArgb.h
index aec63431cb1..f4ec00524cc 100644
--- a/jdk/src/share/native/sun/java2d/loops/IntArgb.h
+++ b/jdk/src/share/native/sun/java2d/loops/IntArgb.h
@@ -122,7 +122,8 @@ typedef jint    IntArgbDataType;
 #define DeclareIntArgbAlphaLoadData(PREFIX) \
     jint PREFIX;
 
-#define InitIntArgbAlphaLoadData(PREFIX, pRasInfo)
+#define InitIntArgbAlphaLoadData(PREFIX, pRasInfo) \
+    PREFIX = 0
 
 #define LoadAlphaFromIntArgbFor4ByteArgb(pRas, PREFIX, COMP_PREFIX) \
     do { \
diff --git a/jdk/src/share/native/sun/java2d/loops/IntArgbBm.h b/jdk/src/share/native/sun/java2d/loops/IntArgbBm.h
index 81d551820a8..675fba1d228 100644
--- a/jdk/src/share/native/sun/java2d/loops/IntArgbBm.h
+++ b/jdk/src/share/native/sun/java2d/loops/IntArgbBm.h
@@ -133,7 +133,8 @@ typedef jint    IntArgbBmDataType;
 #define DeclareIntArgbBmAlphaLoadData(PREFIX) \
     jint PREFIX;
 
-#define InitIntArgbBmAlphaLoadData(PREFIX, pRasInfo)
+#define InitIntArgbBmAlphaLoadData(PREFIX, pRasInfo) \
+    PREFIX = 0
 
 #define LoadAlphaFromIntArgbBmFor4ByteArgb(pRas, PREFIX, COMP_PREFIX) \
     do { \
diff --git a/jdk/src/share/native/sun/java2d/loops/IntArgbPre.h b/jdk/src/share/native/sun/java2d/loops/IntArgbPre.h
index 5ffb9dacb0b..c45013d0e00 100644
--- a/jdk/src/share/native/sun/java2d/loops/IntArgbPre.h
+++ b/jdk/src/share/native/sun/java2d/loops/IntArgbPre.h
@@ -153,7 +153,8 @@ typedef jint    IntArgbPreDataType;
 #define DeclareIntArgbPreAlphaLoadData(PREFIX) \
     jint PREFIX;
 
-#define InitIntArgbPreAlphaLoadData(PREFIX, pRasInfo)
+#define InitIntArgbPreAlphaLoadData(PREFIX, pRasInfo) \
+    PREFIX = 0
 
 #define LoadAlphaFromIntArgbPreFor4ByteArgb(pRas, PREFIX, COMP_PREFIX) \
     do { \
diff --git a/jdk/src/share/native/sun/java2d/loops/Ushort4444Argb.h b/jdk/src/share/native/sun/java2d/loops/Ushort4444Argb.h
index 348e03b7df4..aa50d8b0ff3 100644
--- a/jdk/src/share/native/sun/java2d/loops/Ushort4444Argb.h
+++ b/jdk/src/share/native/sun/java2d/loops/Ushort4444Argb.h
@@ -120,7 +120,8 @@ typedef jushort Ushort4444ArgbDataType;
 #define DeclareUshort4444ArgbAlphaLoadData(PREFIX) \
     jint PREFIX;
 
-#define InitUshort4444ArgbAlphaLoadData(PREFIX, pRasInfo)
+#define InitUshort4444ArgbAlphaLoadData(PREFIX, pRasInfo) \
+    PREFIX = 0
 
 #define LoadAlphaFromUshort4444ArgbFor4ByteArgb(pRas, PREFIX, COMP_PREFIX) \
     do { \
diff --git a/jdk/src/share/native/sun/java2d/loops/UshortIndexed.h b/jdk/src/share/native/sun/java2d/loops/UshortIndexed.h
index 7786bda3829..6a4b5b13e5d 100644
--- a/jdk/src/share/native/sun/java2d/loops/UshortIndexed.h
+++ b/jdk/src/share/native/sun/java2d/loops/UshortIndexed.h
@@ -170,7 +170,10 @@ typedef jushort UshortIndexedBmDataType;
     jint PREFIX ## rgb;
 
 #define InitUshortIndexedAlphaLoadData(PREFIX, pRasInfo) \
-    PREFIX ## Lut = (pRasInfo)->lutBase
+    do { \
+        PREFIX ## Lut = (pRasInfo)->lutBase; \
+        PREFIX ## rgb = 0; \
+    } while (0)
 
 #define LoadAlphaFromUshortIndexedFor4ByteArgb(pRas, PREFIX, COMP_PREFIX) \
     do { \

From b7511e7609a4f33e759bbc8352d099ce883811ba Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Wed, 27 Feb 2013 17:22:44 +0530
Subject: [PATCH 210/311] 8009115: jtreg tests under jdk/test/javax/script
 should use nashorn as script engine

Reviewed-by: alanb
---
 jdk/test/javax/script/CauseExceptionTest.java |  6 +++---
 ...oExceptionTest.java => ExceptionTest.java} |  4 ++--
 jdk/test/javax/script/GetInterfaceTest.java   |  5 +++--
 jdk/test/javax/script/Helper.java             |  4 ++--
 .../javax/script/StringWriterPrintTest.java   |  4 ++--
 jdk/test/javax/script/Test3.js                |  8 +++++---
 jdk/test/javax/script/Test5.java              | 20 +++++++++++++------
 jdk/test/javax/script/Test5.js                |  9 ++++-----
 jdk/test/javax/script/Test6.java              | 20 +++++++++++++++----
 jdk/test/javax/script/Test7.js                |  7 ++++++-
 .../script/UnescapedBracketRegExTest.java     |  6 +++---
 jdk/test/javax/script/VersionTest.java        | 19 ++++++++++++------
 12 files changed, 73 insertions(+), 39 deletions(-)
 rename jdk/test/javax/script/{RhinoExceptionTest.java => ExceptionTest.java} (96%)

diff --git a/jdk/test/javax/script/CauseExceptionTest.java b/jdk/test/javax/script/CauseExceptionTest.java
index f1ff708bc1e..41fa5e4b493 100644
--- a/jdk/test/javax/script/CauseExceptionTest.java
+++ b/jdk/test/javax/script/CauseExceptionTest.java
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 6869617
- * @summary RhinoScriptEngine bug : ScriptException cause not set (with fix)
+ * @summary ScriptEngine bug : ScriptException cause not set (with fix)
  */
 
 import javax.script.*;
@@ -33,12 +33,12 @@ import java.io.*;
 public class CauseExceptionTest {
     public static void main(String[] args) throws ScriptException, NoSuchMethodException {
         ScriptEngineManager sem = new ScriptEngineManager();
-        ScriptEngine engine = sem.getEngineByName("js");
+        ScriptEngine engine = sem.getEngineByName("nashorn");
         if (engine == null) {
             System.out.println("Warning: No js engine found; test vacuously passes.");
             return;
         }
-        engine.eval("function hello_world() { println('hello world'); throw 'out of here'; } ");
+        engine.eval("function hello_world() { print('hello world'); throw 'out of here'; } ");
         Invocable invocable = (Invocable) engine;
         try {
             invocable.invokeFunction("hello_world", (Object[])null);
diff --git a/jdk/test/javax/script/RhinoExceptionTest.java b/jdk/test/javax/script/ExceptionTest.java
similarity index 96%
rename from jdk/test/javax/script/RhinoExceptionTest.java
rename to jdk/test/javax/script/ExceptionTest.java
index 22d5f0fd6fb..9ea2d4e3f7a 100644
--- a/jdk/test/javax/script/RhinoExceptionTest.java
+++ b/jdk/test/javax/script/ExceptionTest.java
@@ -24,14 +24,14 @@
 /*
  * @test
  * @bug 6474943 6705893
- * @summary Test that Rhino exception messages are
+ * @summary Test that script engine exception messages are
  * available from ScriptException.
  */
 
 import java.io.*;
 import javax.script.*;
 
-public class RhinoExceptionTest {
+public class ExceptionTest {
     private static final String ERROR_MSG = "error from JavaScript";
 
     public static void main(String[] args) throws Exception {
diff --git a/jdk/test/javax/script/GetInterfaceTest.java b/jdk/test/javax/script/GetInterfaceTest.java
index d780a6db08b..dffc74ea3b4 100644
--- a/jdk/test/javax/script/GetInterfaceTest.java
+++ b/jdk/test/javax/script/GetInterfaceTest.java
@@ -22,6 +22,7 @@
  */
 
 /*
+ * @run ignore
  * @test
  * @bug 6960211
  * @summary JavaScript engine allows creation of interface although methods not available.
@@ -32,10 +33,10 @@ import javax.script.*;
 public class GetInterfaceTest {
     public static void main(String[] args) throws Exception {
         ScriptEngineManager manager = new ScriptEngineManager();
-        ScriptEngine engine = manager.getEngineByName("js");
+        ScriptEngine engine = manager.getEngineByName("nashorn");
 
         if (engine == null) {
-            System.out.println("Warning: No engine engine found; test vacuously passes.");
+            System.out.println("Warning: No js engine engine found; test vacuously passes.");
             return;
         }
 
diff --git a/jdk/test/javax/script/Helper.java b/jdk/test/javax/script/Helper.java
index 73617bf5e93..fc132a457d1 100644
--- a/jdk/test/javax/script/Helper.java
+++ b/jdk/test/javax/script/Helper.java
@@ -24,13 +24,13 @@ import javax.script.*;
 
 /**
  * Helper class to consolidate testing requirements for a js engine.
- * A js engine is required as part of Sun's product JDK.
+ * A js engine is required as part of Oracle's product JDK.
  */
 public class Helper {
     private Helper() {}; // Don't instantiate
 
     public static ScriptEngine getJsEngine(ScriptEngineManager m) {
-        ScriptEngine e  = m.getEngineByName("js");
+        ScriptEngine e  = m.getEngineByName("nashorn");
         if (e == null &&
             System.getProperty("java.runtime.name").startsWith("Java(TM)")) {
             // A js engine is requied for Sun's product JDK
diff --git a/jdk/test/javax/script/StringWriterPrintTest.java b/jdk/test/javax/script/StringWriterPrintTest.java
index 42345791878..7a75b6f0396 100644
--- a/jdk/test/javax/script/StringWriterPrintTest.java
+++ b/jdk/test/javax/script/StringWriterPrintTest.java
@@ -33,9 +33,9 @@ import java.io.*;
 public class StringWriterPrintTest {
     public static void main(String[] args) throws ScriptException {
         ScriptEngineManager sem = new ScriptEngineManager();
-        ScriptEngine engine = sem.getEngineByName("js");
+        ScriptEngine engine = sem.getEngineByName("nashorn");
         if (engine == null) {
-            System.out.println("Warning: No js engine found; test vacuously passes.");
+            System.out.println("Warning: No nashorn engine found; test vacuously passes.");
             return;
         }
         StringWriter sw = new StringWriter();
diff --git a/jdk/test/javax/script/Test3.js b/jdk/test/javax/script/Test3.js
index 4cdb8286843..5f7aba45e93 100644
--- a/jdk/test/javax/script/Test3.js
+++ b/jdk/test/javax/script/Test3.js
@@ -1,22 +1,24 @@
+var ScriptContext = javax.script.ScriptContext;
+
 if (key == undefined || key != 'engine value') {
     throw "unexpected engine scope value";
 }
 
 // pre-defined context variable refers to current ScriptContext
-if (context.getAttribute('key', context.GLOBAL_SCOPE) != 'global value') {
+if (context.getAttribute('key', ScriptContext.GLOBAL_SCOPE) != 'global value') {
     throw "unexpected global scope value";
 }
 
 // change the engine scope value
 key = 'new engine value';
 
-if (context.getAttribute('key', context.GLOBAL_SCOPE) != 'global value') {
+if (context.getAttribute('key', ScriptContext.GLOBAL_SCOPE) != 'global value') {
     throw "global scope should not change here";
 }
 
 // delete engine scope value
 delete key;
 
-if (key == undefined && key != 'xglobal value') {
+if (key == undefined && key != 'global value') {
     throw 'global scope should be visible after engine scope removal';
 }
diff --git a/jdk/test/javax/script/Test5.java b/jdk/test/javax/script/Test5.java
index 107bd148b63..acdd3a47448 100644
--- a/jdk/test/javax/script/Test5.java
+++ b/jdk/test/javax/script/Test5.java
@@ -48,16 +48,24 @@ public class Test5 {
                 System.out.println("engine scope only");
                 e.put("count", new Integer(1));
 
-                Reader reader = new FileReader(
-                    new File(System.getProperty("test.src", "."), "Test5.js"));
-                engine.eval(reader,ctxt);
+                try (Reader reader = new FileReader(
+                    new File(System.getProperty("test.src", "."), "Test5.js"))) {
+                    engine.eval(reader,ctxt);
+                }
+
                 System.out.println("both scopes");
                 ctxt.setBindings(g, ScriptContext.GLOBAL_SCOPE);
                 e.put("count", new Integer(2));
-                engine.eval(reader,ctxt);
+                try (Reader reader = new FileReader(
+                    new File(System.getProperty("test.src", "."), "Test5.js"))) {
+                    engine.eval(reader,ctxt);
+                }
                 System.out.println("only global");
                 e.put("count", new Integer(3));
-                ctxt.setAttribute("key", null, ScriptContext.ENGINE_SCOPE);
-                engine.eval(reader,ctxt);
+                ctxt.removeAttribute("key", ScriptContext.ENGINE_SCOPE);
+                try (Reader reader = new FileReader(
+                    new File(System.getProperty("test.src", "."), "Test5.js"))) {
+                    engine.eval(reader,ctxt);
+                }
         }
 }
diff --git a/jdk/test/javax/script/Test5.js b/jdk/test/javax/script/Test5.js
index c607cbc8604..708b482d00c 100644
--- a/jdk/test/javax/script/Test5.js
+++ b/jdk/test/javax/script/Test5.js
@@ -1,6 +1,5 @@
-var key;
-var count;
 
+var ScriptContext = javax.script.ScriptContext;
 print(count);
 
 switch (count) {
@@ -9,7 +8,7 @@ switch (count) {
             if (key != 'value in engine') {
                 throw "unexpected engine scope value";
             }
-            if (context.getAttribute("key", context.GLOBAL_SCOPE ) != null) {
+            if (context.getAttribute("key", ScriptContext.GLOBAL_SCOPE ) != null) {
                 throw "unexpected global scope value";
             }
             break;
@@ -19,7 +18,7 @@ switch (count) {
             if (key != 'value in engine') {
                 throw "unexpected engine scope value";
             }
-            if (context.getAttribute("key", context.GLOBAL_SCOPE ) != 
+            if (context.getAttribute("key", ScriptContext.GLOBAL_SCOPE ) != 
                 "value in global") {
                 throw "unexpected global scope value";
             }
@@ -30,7 +29,7 @@ switch (count) {
             if (key != 'value in global') {
                 throw "unexpected global scope value";
             }
-            if (context.getAttribute("key", context.GLOBAL_SCOPE ) != 
+            if (context.getAttribute("key", ScriptContext.GLOBAL_SCOPE ) != 
                 "value in global") {
                 throw "unexpected global scope value";
             }
diff --git a/jdk/test/javax/script/Test6.java b/jdk/test/javax/script/Test6.java
index 82758879fdb..5582b0a9025 100644
--- a/jdk/test/javax/script/Test6.java
+++ b/jdk/test/javax/script/Test6.java
@@ -40,11 +40,23 @@ public class Test6 {
                 System.out.println("Warning: No js engine found; test vacuously passes.");
                 return;
             }
-            Reader reader = new FileReader(
-                new File(System.getProperty("test.src", "."), "Test6.js"));
-            engine.eval(reader);
+
+            try (Reader reader = new FileReader(
+                new File(System.getProperty("test.src", "."), "Test6.js"))) {
+                engine.eval(reader);
+            }
             Object res = engine.get("res");
-            CompiledScript scr = ((Compilable)engine).compile(reader);
+
+            CompiledScript scr = null;
+            try (Reader reader = new FileReader(
+                new File(System.getProperty("test.src", "."), "Test6.js"))) {
+                scr = ((Compilable)engine).compile(reader);
+            }
+
+            if (scr == null) {
+                throw new RuntimeException("compilation failed!");
+            }
+
             scr.eval();
             Object res1 = engine.get("res");
             if (! res.equals(res1)) {
diff --git a/jdk/test/javax/script/Test7.js b/jdk/test/javax/script/Test7.js
index b1ec2a8fd9f..d79db96067d 100644
--- a/jdk/test/javax/script/Test7.js
+++ b/jdk/test/javax/script/Test7.js
@@ -1,9 +1,14 @@
 //this is the first line of Test7.js
 var filename;
+try {
+    load("nashorn:mozilla_compat.js");
+} catch (e) {
+    //ignored
+}
 importPackage(java.io);
 importPackage(java);
 var f = new File(filename);
 var r = new BufferedReader(new InputStreamReader(new FileInputStream(f)));
 
-var firstLine = r.readLine() + '';
+var firstLine = r.readLine();
 print(firstLine);
diff --git a/jdk/test/javax/script/UnescapedBracketRegExTest.java b/jdk/test/javax/script/UnescapedBracketRegExTest.java
index f2a807065f7..472ae107ed9 100644
--- a/jdk/test/javax/script/UnescapedBracketRegExTest.java
+++ b/jdk/test/javax/script/UnescapedBracketRegExTest.java
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 7012701
- * @summary 7012701 Add a test to check that Rhino's RegExp parser accepts unescaped '['
+ * @summary 7012701 Add a test to check that RegExp parser accepts unescaped '['
  */
 
 import javax.script.*;
@@ -33,9 +33,9 @@ import java.io.*;
 public class UnescapedBracketRegExTest {
     public static void main(String[] args) throws ScriptException {
         ScriptEngineManager sem = new ScriptEngineManager();
-        ScriptEngine engine = sem.getEngineByName("js");
+        ScriptEngine engine = sem.getEngineByName("nashorn");
         if (engine == null) {
-            System.out.println("Warning: No js engine found; test vacuously passes.");
+            System.out.println("Warning: No nashorn engine found; test vacuously passes.");
             return;
         }
         // the following throws exception
diff --git a/jdk/test/javax/script/VersionTest.java b/jdk/test/javax/script/VersionTest.java
index 374f43be51c..87fa8bcfa51 100644
--- a/jdk/test/javax/script/VersionTest.java
+++ b/jdk/test/javax/script/VersionTest.java
@@ -31,9 +31,7 @@ import javax.script.*;
 import java.io.*;
 
 public class VersionTest  {
-
-        private static final String JS_LANG_VERSION = "1.8";
-        private static final String JS_ENGINE_VERSION = "1.7 release 3 PRERELEASE";
+        private static final String JS_LANG_VERSION = "ECMA - 262 Edition 5.1";
 
         public static void main(String[] args) throws Exception {
             ScriptEngineManager manager = new ScriptEngineManager();
@@ -48,9 +46,18 @@ public class VersionTest  {
                             JS_LANG_VERSION);
             }
             String engineVersion = jsengine.getFactory().getEngineVersion();
-            if (! engineVersion.equals(JS_ENGINE_VERSION)) {
-                throw new RuntimeException("Expected Rhino version is " +
-                            JS_ENGINE_VERSION);
+            String expectedVersion = getNashornVersion();
+            if (! engineVersion.equals(expectedVersion)) {
+                throw new RuntimeException("Expected version is " + expectedVersion);
+            }
+        }
+
+        private static String getNashornVersion() {
+            try {
+                Class versionClass = Class.forName("jdk.nashorn.internal.runtime.Version");
+                return (String) versionClass.getMethod("version").invoke(null);
+            } catch (Exception e) {
+                return "Version Unknown!";
             }
         }
 }

From f99a5d722e62e915351f8d753a3ebf31352b1cdf Mon Sep 17 00:00:00 2001
From: Alan Bateman <alanb@openjdk.org>
Date: Wed, 27 Feb 2013 14:24:45 +0000
Subject: [PATCH 211/311] 8008793: SecurityManager.checkXXX behavior not
 specified for methods that check AWTPermission and AWT not present

Reviewed-by: hawtin, mullan, dsamersoff, mchung
---
 .../classes/java/lang/SecurityManager.java    | 28 ++++++++-
 .../sun/security/util/SecurityConstants.java  | 63 +++++--------------
 jdk/test/java/lang/SecurityManager/NoAWT.java | 33 +++++++++-
 3 files changed, 71 insertions(+), 53 deletions(-)

diff --git a/jdk/src/share/classes/java/lang/SecurityManager.java b/jdk/src/share/classes/java/lang/SecurityManager.java
index 80181cd4e80..31664dc6cb2 100644
--- a/jdk/src/share/classes/java/lang/SecurityManager.java
+++ b/jdk/src/share/classes/java/lang/SecurityManager.java
@@ -1320,6 +1320,9 @@ class SecurityManager {
      * <code>AWTPermission("showWindowWithoutWarningBanner")</code> permission,
      * and returns <code>true</code> if a SecurityException is not thrown,
      * otherwise it returns <code>false</code>.
+     * In the case of subset Profiles of Java SE that do not include the
+     * {@code java.awt} package, {@code checkPermission} is instead called
+     * to check the permission {@code java.security.AllPermission}.
      * <p>
      * If you override this method, then you should make a call to
      * <code>super.checkTopLevelWindow</code>
@@ -1340,8 +1343,12 @@ class SecurityManager {
         if (window == null) {
             throw new NullPointerException("window can't be null");
         }
+        Permission perm = SecurityConstants.AWT.TOPLEVEL_WINDOW_PERMISSION;
+        if (perm == null) {
+            perm = SecurityConstants.ALL_PERMISSION;
+        }
         try {
-            checkPermission(SecurityConstants.AWT.TOPLEVEL_WINDOW_PERMISSION);
+            checkPermission(perm);
             return true;
         } catch (SecurityException se) {
             // just return false
@@ -1379,6 +1386,9 @@ class SecurityManager {
      * This method calls <code>checkPermission</code> with the
      * <code>AWTPermission("accessClipboard")</code>
      * permission.
+     * In the case of subset Profiles of Java SE that do not include the
+     * {@code java.awt} package, {@code checkPermission} is instead called
+     * to check the permission {@code java.security.AllPermission}.
      * <p>
      * If you override this method, then you should make a call to
      * <code>super.checkSystemClipboardAccess</code>
@@ -1391,7 +1401,11 @@ class SecurityManager {
      * @see        #checkPermission(java.security.Permission) checkPermission
      */
     public void checkSystemClipboardAccess() {
-        checkPermission(SecurityConstants.AWT.ACCESS_CLIPBOARD_PERMISSION);
+        Permission perm = SecurityConstants.AWT.ACCESS_CLIPBOARD_PERMISSION;
+        if (perm == null) {
+            perm = SecurityConstants.ALL_PERMISSION;
+        }
+        checkPermission(perm);
     }
 
     /**
@@ -1400,6 +1414,10 @@ class SecurityManager {
      * <p>
      * This method calls <code>checkPermission</code> with the
      * <code>AWTPermission("accessEventQueue")</code> permission.
+     * In the case of subset Profiles of Java SE that do not include the
+     * {@code java.awt} package, {@code checkPermission} is instead called
+     * to check the permission {@code java.security.AllPermission}.
+     *
      * <p>
      * If you override this method, then you should make a call to
      * <code>super.checkAwtEventQueueAccess</code>
@@ -1412,7 +1430,11 @@ class SecurityManager {
      * @see        #checkPermission(java.security.Permission) checkPermission
      */
     public void checkAwtEventQueueAccess() {
-        checkPermission(SecurityConstants.AWT.CHECK_AWT_EVENTQUEUE_PERMISSION);
+        Permission perm = SecurityConstants.AWT.CHECK_AWT_EVENTQUEUE_PERMISSION;
+        if (perm == null) {
+            perm = SecurityConstants.ALL_PERMISSION;
+        }
+        checkPermission(perm);
     }
 
     /*
diff --git a/jdk/src/share/classes/sun/security/util/SecurityConstants.java b/jdk/src/share/classes/sun/security/util/SecurityConstants.java
index c9d321f7c15..2b985ad0f65 100644
--- a/jdk/src/share/classes/sun/security/util/SecurityConstants.java
+++ b/jdk/src/share/classes/sun/security/util/SecurityConstants.java
@@ -70,31 +70,6 @@ public final class SecurityConstants {
     // sun.security.provider.PolicyFile
     public static final AllPermission ALL_PERMISSION = new AllPermission();
 
-    /**
-     * Permission type used when AWT is not present.
-     */
-    private static class FakeAWTPermission extends BasicPermission {
-        private static final long serialVersionUID = -1L;
-        public FakeAWTPermission(String name) {
-            super(name);
-        }
-        public String toString() {
-            return "(\"java.awt.AWTPermission\" \"" + getName() + "\")";
-        }
-    }
-
-    /**
-     * Permission factory used when AWT is not present.
-     */
-    private static class FakeAWTPermissionFactory
-        implements PermissionFactory<FakeAWTPermission>
-    {
-        @Override
-        public FakeAWTPermission newPermission(String name) {
-            return new FakeAWTPermission(name);
-        }
-    }
-
     /**
      * AWT Permissions used in the JDK.
      */
@@ -107,37 +82,29 @@ public final class SecurityConstants {
         private static final String AWTFactory = "sun.awt.AWTPermissionFactory";
 
         /**
-         * The PermissionFactory to create AWT permissions (or fake permissions
-         * if AWT is not present).
+         * The PermissionFactory to create AWT permissions (or null if AWT is
+         * not present)
          */
         private static final PermissionFactory<?> factory = permissionFactory();
 
         private static PermissionFactory<?> permissionFactory() {
-            Class<?> c = AccessController
-                .doPrivileged(new PrivilegedAction<Class<?>>() {
-                    public Class<?> run() {
-                        try {
-                           return Class.forName(AWTFactory, true, null);
-                        } catch (ClassNotFoundException e) {
-                            // not available
-                            return null;
-                        }
-                    }});
-            if (c != null) {
-                // AWT present
-                try {
-                    return (PermissionFactory<?>)c.newInstance();
-                } catch (ReflectiveOperationException x) {
-                    throw new InternalError(x.getMessage(), x);
-                }
-            } else {
-                // AWT not present
-                return new FakeAWTPermissionFactory();
+            Class<?> c;
+            try {
+                c = Class.forName(AWTFactory, false, AWT.class.getClassLoader());
+            } catch (ClassNotFoundException e) {
+                // not available
+                return null;
+            }
+            // AWT present
+            try {
+                return (PermissionFactory<?>)c.newInstance();
+            } catch (ReflectiveOperationException x) {
+                throw new InternalError(x);
             }
         }
 
         private static Permission newAWTPermission(String name) {
-            return factory.newPermission(name);
+            return (factory == null) ? null : factory.newPermission(name);
         }
 
         // java.lang.SecurityManager
diff --git a/jdk/test/java/lang/SecurityManager/NoAWT.java b/jdk/test/java/lang/SecurityManager/NoAWT.java
index 3224af46dd4..d55e05c1027 100644
--- a/jdk/test/java/lang/SecurityManager/NoAWT.java
+++ b/jdk/test/java/lang/SecurityManager/NoAWT.java
@@ -22,14 +22,43 @@
  */
 
 /* @test
- * @bug 8004502
+ * @bug 8004502 8008793
  * @summary Sanity check that SecurityManager methods that check AWTPermission
  *   behave as expected when AWT is not present
  */
 
+import java.security.AllPermission;
+import java.security.Permission;
+
 public class NoAWT {
+
+    static class MySecurityManager extends SecurityManager {
+        Class<?> expectedClass;
+
+        void setExpectedPermissionClass(Class<?> c) {
+            expectedClass = c;
+        }
+
+        @Override
+        public void checkPermission(Permission perm) {
+            if (perm.getClass() != expectedClass)
+                throw new RuntimeException("Got: " + perm.getClass() + ", expected: " + expectedClass);
+            super.checkPermission(perm);
+        }
+    }
+
     public static void main(String[] args) {
-        SecurityManager sm = new SecurityManager();
+        Class<?> awtPermissionClass = null;
+        try {
+            awtPermissionClass = Class.forName("java.awt.AWTPermission");
+        } catch (ClassNotFoundException ignore) { }
+
+        MySecurityManager sm = new MySecurityManager();
+        if (awtPermissionClass != null) {
+            sm.setExpectedPermissionClass(awtPermissionClass);
+        } else {
+            sm.setExpectedPermissionClass(AllPermission.class);
+        }
 
         try {
             sm.checkAwtEventQueueAccess();

From 6715b64842a40ef4b5f63da0778292c0def0205a Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Wed, 27 Feb 2013 20:34:12 +0530
Subject: [PATCH 212/311] 8009140: jtreg tests under sun/tools/jrunscript
 should use nashorn engine

Reviewed-by: alanb
---
 .../sun/tools/jrunscript/CheckEngine.java     |  2 +-
 .../sun/tools/jrunscript/jrunscript-DTest.sh  |  2 +-
 .../tools/jrunscript/jrunscript-argsTest.sh   |  2 +-
 .../sun/tools/jrunscript/jrunscript-cpTest.sh |  4 ++--
 .../sun/tools/jrunscript/jrunscript-eTest.sh  | 13 +----------
 .../sun/tools/jrunscript/jrunscript-fTest.sh  | 13 +----------
 .../sun/tools/jrunscript/jrunscriptTest.sh    | 22 ++-----------------
 jdk/test/sun/tools/jrunscript/repl.out        | 14 ++++++------
 8 files changed, 16 insertions(+), 56 deletions(-)

diff --git a/jdk/test/sun/tools/jrunscript/CheckEngine.java b/jdk/test/sun/tools/jrunscript/CheckEngine.java
index 023e5e0920a..752411da2ac 100644
--- a/jdk/test/sun/tools/jrunscript/CheckEngine.java
+++ b/jdk/test/sun/tools/jrunscript/CheckEngine.java
@@ -33,7 +33,7 @@ public class CheckEngine {
     public static void main(String... args) {
         int exitCode = 0;
         ScriptEngine engine =
-            (new ScriptEngineManager()).getEngineByName("js");
+            (new ScriptEngineManager()).getEngineByName("nashorn");
 
         if (engine == null &&
             !(System.getProperty("java.runtime.name").startsWith("Java(TM)"))) {
diff --git a/jdk/test/sun/tools/jrunscript/jrunscript-DTest.sh b/jdk/test/sun/tools/jrunscript/jrunscript-DTest.sh
index 4d9e792c43f..b2102ef6a62 100644
--- a/jdk/test/sun/tools/jrunscript/jrunscript-DTest.sh
+++ b/jdk/test/sun/tools/jrunscript/jrunscript-DTest.sh
@@ -43,7 +43,7 @@ fi
 # to script as java.lang.System property.  sysProps is
 # jrunscript shell built-in variable for System properties.
 
-${JRUNSCRIPT} -Djrunscript.foo=bar <<EOF
+${JRUNSCRIPT} -l nashorn -Djrunscript.foo=bar <<EOF
 if (sysProps["jrunscript.foo"] == "bar") { println("Passed"); exit(0); }
 // unexpected value
 println("Unexpected System property value");
diff --git a/jdk/test/sun/tools/jrunscript/jrunscript-argsTest.sh b/jdk/test/sun/tools/jrunscript/jrunscript-argsTest.sh
index 55f3147039a..b104e965ddf 100644
--- a/jdk/test/sun/tools/jrunscript/jrunscript-argsTest.sh
+++ b/jdk/test/sun/tools/jrunscript/jrunscript-argsTest.sh
@@ -41,7 +41,7 @@ fi
 
 # we check whether "excess" args are passed as script arguments
 
-${JRUNSCRIPT} -J-Djava.awt.headless=true -f - hello world <<EOF
+${JRUNSCRIPT} -l nashorn -J-Djava.awt.headless=true -f - hello world <<EOF
 
 if (typeof(arguments) == 'undefined') { println("arguments expected"); exit(1); }
 
diff --git a/jdk/test/sun/tools/jrunscript/jrunscript-cpTest.sh b/jdk/test/sun/tools/jrunscript/jrunscript-cpTest.sh
index 05019636521..4b989ef2de1 100644
--- a/jdk/test/sun/tools/jrunscript/jrunscript-cpTest.sh
+++ b/jdk/test/sun/tools/jrunscript/jrunscript-cpTest.sh
@@ -46,7 +46,7 @@ ${JAVAC} ${TESTSRC}/Hello.java -d .
 # work with jrunscript. Script should be able to
 # access Java class "Hello".
 
-${JRUNSCRIPT} -cp . <<EOF
+${JRUNSCRIPT} -l nashorn -cp . <<EOF
 var v;  
 try { v = new Packages.Hello(); } catch (e) { println(e); exit(1) }
 if (v.string != 'hello') { println("Unexpected property value"); exit(1); }
@@ -58,7 +58,7 @@ fi
 
 # -classpath and -cp are synonyms
 
-${JRUNSCRIPT} -classpath . <<EOF
+${JRUNSCRIPT} -l nashorn -classpath . <<EOF
 var v;
 try { v = new Packages.Hello(); } catch (e) { println(e); exit(1) }
 if (v.string != 'hello') { println("unexpected property value"); exit(1); }
diff --git a/jdk/test/sun/tools/jrunscript/jrunscript-eTest.sh b/jdk/test/sun/tools/jrunscript/jrunscript-eTest.sh
index e9867b84ffa..97c62a261f9 100644
--- a/jdk/test/sun/tools/jrunscript/jrunscript-eTest.sh
+++ b/jdk/test/sun/tools/jrunscript/jrunscript-eTest.sh
@@ -39,21 +39,10 @@ if [ $? -eq 2 ]; then
     exit 0
 fi
 
-rm -f jrunscript-eTest.out 2>/dev/null
-${JRUNSCRIPT} -J-Djava.awt.headless=true -e "println('hello')" > jrunscript-eTest.out 2>&1
-
-$golden_diff jrunscript-eTest.out ${TESTSRC}/dash-e.out
-if [ $? != 0 ]
-then
-  echo "Output of jrunscript -e differ from expected output. Failed."
-  rm -f jrunscript-eTest.out 2>/dev/null
-  exit 1
-fi
-
 # -e option with JavaScript explicitly choosen as language
 
 rm -f jrunscript-eTest.out 2>/dev/null
-${JRUNSCRIPT} -J-Djava.awt.headless=true -l js -e "println('hello')" > jrunscript-eTest.out 2>&1
+${JRUNSCRIPT} -J-Djava.awt.headless=true -l nashorn -e "println('hello')" > jrunscript-eTest.out 2>&1
 
 $golden_diff jrunscript-eTest.out ${TESTSRC}/dash-e.out
 if [ $? != 0 ]
diff --git a/jdk/test/sun/tools/jrunscript/jrunscript-fTest.sh b/jdk/test/sun/tools/jrunscript/jrunscript-fTest.sh
index 170a7dd0d11..8c402a316ea 100644
--- a/jdk/test/sun/tools/jrunscript/jrunscript-fTest.sh
+++ b/jdk/test/sun/tools/jrunscript/jrunscript-fTest.sh
@@ -39,22 +39,11 @@ if [ $? -eq 2 ]; then
     exit 0
 fi
 
-rm -f jrunscript-fTest.out 2>/dev/null
-${JRUNSCRIPT} -J-Djava.awt.headless=true -f ${TESTSRC}/hello.js > jrunscript-fTest.out 2>&1
-
-$golden_diff jrunscript-fTest.out ${TESTSRC}/dash-f.out
-if [ $? != 0 ]
-then
-  echo "Output of jrunscript -f differ from expected output. Failed."
-  rm -f jrunscript-fTest.out 2>/dev/null
-  exit 1
-fi
-
 # -f option used with JavaScript as language chosen explicitly
 # with -l option
 
 rm -f jrunscript-fTest.out 2>/dev/null
-${JRUNSCRIPT} -J-Djava.awt.headless=true -l js -f ${TESTSRC}/hello.js > jrunscript-fTest.out 2>&1
+${JRUNSCRIPT} -J-Djava.awt.headless=true -l nashorn -f ${TESTSRC}/hello.js > jrunscript-fTest.out 2>&1
 
 $golden_diff jrunscript-fTest.out ${TESTSRC}/dash-f.out
 if [ $? != 0 ]
diff --git a/jdk/test/sun/tools/jrunscript/jrunscriptTest.sh b/jdk/test/sun/tools/jrunscript/jrunscriptTest.sh
index 0a3237536db..921524be9e0 100644
--- a/jdk/test/sun/tools/jrunscript/jrunscriptTest.sh
+++ b/jdk/test/sun/tools/jrunscript/jrunscriptTest.sh
@@ -40,7 +40,7 @@ if [ $? -eq 2 ]; then
 fi
 
 rm -f jrunscriptTest.out 2>/dev/null
-${JRUNSCRIPT} -J-Djava.awt.headless=true > jrunscriptTest.out 2>&1 <<EOF
+${JRUNSCRIPT} -J-Djava.awt.headless=true -l nashorn > jrunscriptTest.out 2>&1 <<EOF
 v = 2 + 5;
 v *= 5;
 v = v + " is the value";
@@ -52,25 +52,7 @@ EOF
 $golden_diff jrunscriptTest.out ${TESTSRC}/repl.out
 if [ $? != 0 ]
 then
-  echo "Output of jrunscript session differ from expected output. Failed."
-  rm -f jrunscriptTest.out 2>/dev/null
-  exit 1
-fi
-
-rm -f jrunscriptTest.out 2>/dev/null
-${JRUNSCRIPT} -J-Djava.awt.headless=true -l js > jrunscriptTest.out 2>&1 <<EOF
-v = 2 + 5;
-v *= 5;
-v = v + " is the value";
-if (v != 0) { println('yes v != 0'); }
-java.lang.System.out.println('hello world from script');
-new java.lang.Runnable() { run: function() { println('I am runnable'); }}.run();
-EOF
-
-$golden_diff jrunscriptTest.out ${TESTSRC}/repl.out
-if [ $? != 0 ]
-then
-  echo "Output of jrunscript -l js differ from expected output. Failed."
+  echo "Output of jrunscript -l nashorn differ from expected output. Failed."
   rm -f jrunscriptTest.out 2>/dev/null
   exit 1
 fi
diff --git a/jdk/test/sun/tools/jrunscript/repl.out b/jdk/test/sun/tools/jrunscript/repl.out
index 13b390fc29b..156b8263fce 100644
--- a/jdk/test/sun/tools/jrunscript/repl.out
+++ b/jdk/test/sun/tools/jrunscript/repl.out
@@ -1,7 +1,7 @@
-js> 7.0
-js> 35.0
-js> 35 is the value
-js> yes v != 0
-js> hello world from script
-js> I am runnable
-js> 
\ No newline at end of file
+nashorn> 7
+nashorn> 35.0
+nashorn> 35 is the value
+nashorn> yes v != 0
+nashorn> hello world from script
+nashorn> I am runnable
+nashorn> 
\ No newline at end of file

From 78a060dbde5465d75377756320f7326fe45512ad Mon Sep 17 00:00:00 2001
From: Vladimir Danushevsky <vladidan@openjdk.org>
Date: Fri, 22 Feb 2013 17:12:35 -0500
Subject: [PATCH 213/311] 8005545: Add System property to identify ARCH
 specific details such as ARM hard-float binaries

Adding sun.os.abi Java Property support

Reviewed-by: bobv, alanb, dholmes
---
 jdk/makefiles/Images.gmk                         | 1 +
 jdk/src/share/native/java/lang/System.c          | 4 ++++
 jdk/src/share/native/java/lang/java_props.h      | 4 ++++
 jdk/src/solaris/native/java/lang/java_props_md.c | 5 +++++
 4 files changed, 14 insertions(+)

diff --git a/jdk/makefiles/Images.gmk b/jdk/makefiles/Images.gmk
index 28322675559..029a488f0f0 100644
--- a/jdk/makefiles/Images.gmk
+++ b/jdk/makefiles/Images.gmk
@@ -602,6 +602,7 @@ define create-info-file
 	$(call info-file-item, "OS_NAME",      "$(REQUIRED_OS_NAME)")
 	$(call info-file-item, "OS_VERSION",   "$(REQUIRED_OS_VERSION)")
 	$(call info-file-item, "OS_ARCH",      "$(OPENJDK_TARGET_CPU_LEGACY)")
+	if [ -n "$(JDK_ARCH_ABI_PROP_NAME)" ]; then $(call info-file-item, "SUN_ARCH_ABI", "$(JDK_ARCH_ABI_PROP_NAME)"); fi
 	$(call info-file-item, "SOURCE",       "$(ALL_SOURCE_TIPS)")
 endef
 
diff --git a/jdk/src/share/native/java/lang/System.c b/jdk/src/share/native/java/lang/System.c
index 8efd95e09b7..faef4b09314 100644
--- a/jdk/src/share/native/java/lang/System.c
+++ b/jdk/src/share/native/java/lang/System.c
@@ -212,6 +212,10 @@ Java_java_lang_System_initProperties(JNIEnv *env, jclass cla, jobject props)
     PUTPROP(props, "os.version", sprops->os_version);
     PUTPROP(props, "os.arch", sprops->os_arch);
 
+#ifdef JDK_ARCH_ABI_PROP_NAME
+    PUTPROP(props, "sun.arch.abi", sprops->sun_arch_abi);
+#endif
+
     /* file system properties */
     PUTPROP(props, "file.separator", sprops->file_separator);
     PUTPROP(props, "path.separator", sprops->path_separator);
diff --git a/jdk/src/share/native/java/lang/java_props.h b/jdk/src/share/native/java/lang/java_props.h
index e6c11c262c0..86a69d7a124 100644
--- a/jdk/src/share/native/java/lang/java_props.h
+++ b/jdk/src/share/native/java/lang/java_props.h
@@ -41,6 +41,10 @@ typedef struct {
     char *os_version;
     char *os_arch;
 
+#ifdef JDK_ARCH_ABI_PROP_NAME
+    char *sun_arch_abi;
+#endif
+
     nchar *tmp_dir;
     nchar *font_dir;
     nchar *user_dir;
diff --git a/jdk/src/solaris/native/java/lang/java_props_md.c b/jdk/src/solaris/native/java/lang/java_props_md.c
index c7d3ba6eff5..c8c18982585 100644
--- a/jdk/src/solaris/native/java/lang/java_props_md.c
+++ b/jdk/src/solaris/native/java/lang/java_props_md.c
@@ -514,6 +514,11 @@ GetJavaProperties(JNIEnv *env)
         }
     }
 
+    /* ABI property (optional) */
+#ifdef JDK_ARCH_ABI_PROP_NAME
+    sprops.sun_arch_abi = JDK_ARCH_ABI_PROP_NAME;
+#endif
+
     /* Determine the language, country, variant, and encoding from the host,
      * and store these in the user.language, user.country, user.variant and
      * file.encoding system properties. */

From f58612a3ade7ce90e744d1df25bdbf1b4387a569 Mon Sep 17 00:00:00 2001
From: James Laskey <james.laskey@oracle.com>
Date: Fri, 22 Feb 2013 23:33:46 -0400
Subject: [PATCH 214/311] 8008776: Revise BuildNashorn.gmk for changes in new
 build system

Reviewed-by: jjh
---
 nashorn/makefiles/BuildNashorn.gmk | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/nashorn/makefiles/BuildNashorn.gmk b/nashorn/makefiles/BuildNashorn.gmk
index 56896c65e15..490149804ee 100644
--- a/nashorn/makefiles/BuildNashorn.gmk
+++ b/nashorn/makefiles/BuildNashorn.gmk
@@ -30,10 +30,6 @@ default: all
 include MakeBase.gmk
 include JavaCompilation.gmk
 
-# TODO: build-infra, move this to SPEC
-JAVAC_JARS ?= "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \
-		-jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar
-
 JDK_CLASSES := $(JDK_OUTPUTDIR)/classes
 
 NASHORN_JAR := $(NASHORN_DIST)/nashorn.jar
@@ -47,23 +43,23 @@ ifdef MILESTONE
 endif
 
 # Need to use source and target 7 for nasgen to work.
-$(eval $(call SetupJavaCompiler,COMPILER_SETUP,\
+$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE_DEBUG,\
     JVM:=$(JAVA),\
-    JAVAC:=$(JAVAC_JARS),\
+    JAVAC:=$(NEW_JAVAC),\
     FLAGS:=-g -source 7 -target 7 -bootclasspath $(JDK_CLASSES),\
     SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
     SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
 
 # Build nashorn into intermediate directory
 $(eval $(call SetupJavaCompilation,BUILD_NASHORN,\
-    SETUP:=COMPILER_SETUP,\
+    SETUP:=GENERATE_NEWBYTECODE_DEBUG,\
     SRC:=$(NASHORN_TOPDIR)/src,\
     COPY:=.properties .js,\
     BIN:=$(NASHORN_OUTPUTDIR)/nashorn_classes))
 
 # Build nasgen
 $(eval $(call SetupJavaCompilation,BUILD_NASGEN,\
-    SETUP:=COMPILER_SETUP,\
+    SETUP:=GENERATE_NEWBYTECODE_DEBUG,\
     SRC:=$(NASHORN_TOPDIR)/buildtools/nasgen/src,\
     BIN:=$(NASHORN_OUTPUTDIR)/nasgen_classes,\
     ADD_JAVAC_FLAGS:=-cp $(NASHORN_OUTPUTDIR)/nashorn_classes))

From 797ef551291c76ba23ee556680b127aa71e166d1 Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Sat, 23 Feb 2013 13:32:32 -0800
Subject: [PATCH 215/311] 6556996: (ann spec) SuppressWarnings strings should
 be documented

Reviewed-by: mduigou, chegar, abuckley
---
 jdk/src/share/classes/java/lang/Deprecated.java |  3 ++-
 jdk/src/share/classes/java/lang/Override.java   |  4 ++--
 .../share/classes/java/lang/SafeVarargs.java    |  3 ++-
 .../classes/java/lang/SuppressWarnings.java     | 17 ++++++++++++-----
 .../classes/java/lang/annotation/Inherited.java |  3 ++-
 .../classes/java/lang/annotation/Retention.java |  3 ++-
 .../classes/java/lang/annotation/Target.java    |  5 ++++-
 7 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/jdk/src/share/classes/java/lang/Deprecated.java b/jdk/src/share/classes/java/lang/Deprecated.java
index 2b1546bc64b..58a0691f054 100644
--- a/jdk/src/share/classes/java/lang/Deprecated.java
+++ b/jdk/src/share/classes/java/lang/Deprecated.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,6 +36,7 @@ import static java.lang.annotation.ElementType.*;
  *
  * @author  Neal Gafter
  * @since 1.5
+ * @jls 9.6.3.6 @Deprecated
  */
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/jdk/src/share/classes/java/lang/Override.java b/jdk/src/share/classes/java/lang/Override.java
index ea6e54a151e..bf77344296c 100644
--- a/jdk/src/share/classes/java/lang/Override.java
+++ b/jdk/src/share/classes/java/lang/Override.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,7 @@ import java.lang.annotation.*;
  *
  * @author  Peter von der Ah&eacute;
  * @author  Joshua Bloch
- * @jls 9.6.1.4 Override
+ * @jls 9.6.1.4 @Override
  * @since 1.5
  */
 @Target(ElementType.METHOD)
diff --git a/jdk/src/share/classes/java/lang/SafeVarargs.java b/jdk/src/share/classes/java/lang/SafeVarargs.java
index cb14134ffbe..6fcd48e97d7 100644
--- a/jdk/src/share/classes/java/lang/SafeVarargs.java
+++ b/jdk/src/share/classes/java/lang/SafeVarargs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -85,6 +85,7 @@ import java.lang.annotation.*;
  * @since 1.7
  * @jls 4.7 Reifiable Types
  * @jls 8.4.1 Formal Parameters
+ * @jls 9.6.3.7 @SafeVarargs
  */
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/jdk/src/share/classes/java/lang/SuppressWarnings.java b/jdk/src/share/classes/java/lang/SuppressWarnings.java
index babb060396a..22895dc7b2c 100644
--- a/jdk/src/share/classes/java/lang/SuppressWarnings.java
+++ b/jdk/src/share/classes/java/lang/SuppressWarnings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,8 +41,13 @@ import static java.lang.annotation.ElementType.*;
  * suppress a warning in a particular method, you should annotate that
  * method rather than its class.
  *
- * @since 1.5
  * @author Josh Bloch
+ * @since 1.5
+ * @jls 4.8 Raw Types
+ * @jls 4.12.2 Variables of Reference Type
+ * @jls 5.1.9 Unchecked Conversion
+ * @jls 5.5.2 Checked Casts and Unchecked Casts
+ * @jls 9.6.3.5 @SuppressWarnings
  */
 @Target({TYPE, FIELD, METHOD, PARAMETER, CONSTRUCTOR, LOCAL_VARIABLE})
 @Retention(RetentionPolicy.SOURCE)
@@ -56,9 +61,11 @@ public @interface SuppressWarnings {
      * free to emit a warning if an annotation contains an unrecognized
      * warning name.
      *
-     * <p>Compiler vendors should document the warning names they support in
-     * conjunction with this annotation type. They are encouraged to cooperate
-     * to ensure that the same names work across multiple compilers.
+     * <p> The string {@code "unchecked"} is used to suppress
+     * unchecked warnings. Compiler vendors should document the
+     * additional warning names they support in conjunction with this
+     * annotation type. They are encouraged to cooperate to ensure
+     * that the same names work across multiple compilers.
      */
     String[] value();
 }
diff --git a/jdk/src/share/classes/java/lang/annotation/Inherited.java b/jdk/src/share/classes/java/lang/annotation/Inherited.java
index a7efa6b41d2..83391e29eac 100644
--- a/jdk/src/share/classes/java/lang/annotation/Inherited.java
+++ b/jdk/src/share/classes/java/lang/annotation/Inherited.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,6 +44,7 @@ package java.lang.annotation;
  *
  * @author  Joshua Bloch
  * @since 1.5
+ * @jls 9.6.3.3 @Inherited
  */
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/jdk/src/share/classes/java/lang/annotation/Retention.java b/jdk/src/share/classes/java/lang/annotation/Retention.java
index df04a31db90..1c27ca0871e 100644
--- a/jdk/src/share/classes/java/lang/annotation/Retention.java
+++ b/jdk/src/share/classes/java/lang/annotation/Retention.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,6 +38,7 @@ package java.lang.annotation;
  *
  * @author  Joshua Bloch
  * @since 1.5
+ * @jls 9.6.3.2 @Retention
  */
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/jdk/src/share/classes/java/lang/annotation/Target.java b/jdk/src/share/classes/java/lang/annotation/Target.java
index dc67de3f071..cdf4a748ae5 100644
--- a/jdk/src/share/classes/java/lang/annotation/Target.java
+++ b/jdk/src/share/classes/java/lang/annotation/Target.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -59,6 +59,9 @@ package java.lang.annotation;
  *        ...
  *    }
  * </pre>
+ *
+ * @since 1.5
+ * @jls 9.6.3.1 @Target
  */
 @Documented
 @Retention(RetentionPolicy.RUNTIME)

From 68d2d95f008bec155e83626b06d42584b3eb1bea Mon Sep 17 00:00:00 2001
From: Petr Pchelko <pchelko@openjdk.org>
Date: Mon, 25 Feb 2013 10:17:25 +0000
Subject: [PATCH 216/311] 8006634: Unify LWCToolkit.invokeAndWait() and
 sun.awt.datatransfer.ToolkitThreadBlockedHandler

Changed the logic for the nested event loops and deleted deadlock detection

Reviewed-by: art, denis
---
 .../sun/lwawt/macosx/CPlatformWindow.java     |  12 +-
 .../macosx/CToolkitThreadBlockedHandler.java  |  32 ++---
 .../classes/sun/lwawt/macosx/LWCToolkit.java  |  99 ++++++----------
 jdk/src/macosx/native/sun/awt/AWTView.m       |   6 +-
 .../native/sun/awt/ApplicationDelegate.m      |   5 +-
 jdk/src/macosx/native/sun/awt/CClipboard.m    |   8 +-
 jdk/src/macosx/native/sun/awt/CDropTarget.m   |   3 +-
 jdk/src/macosx/native/sun/awt/CMenu.m         |  10 +-
 jdk/src/macosx/native/sun/awt/CMenuBar.m      |   8 +-
 jdk/src/macosx/native/sun/awt/CMenuItem.m     |   2 +-
 .../sun/awt/JavaComponentAccessibility.m      |  24 ++--
 jdk/src/macosx/native/sun/awt/LWCToolkit.m    |  52 +++------
 .../native/sun/osxapp/ThreadUtilities.h       |   9 +-
 .../native/sun/osxapp/ThreadUtilities.m       | 109 ------------------
 14 files changed, 113 insertions(+), 266 deletions(-)

diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java b/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
index dc51373cc1b..3fb585bdb53 100644
--- a/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
@@ -30,6 +30,7 @@ import java.awt.Dialog.ModalityType;
 import java.awt.event.*;
 import java.awt.peer.WindowPeer;
 import java.beans.*;
+import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
 import javax.swing.*;
@@ -861,7 +862,16 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
 
     private void flushBuffers() {
         if (isVisible() && !nativeBounds.isEmpty()) {
-            LWCToolkit.getLWCToolkit().flushPendingEventsOnAppkit(target);
+            try {
+                LWCToolkit.invokeAndWait(new Runnable() {
+                    @Override
+                    public void run() {
+                        //Posting an empty to flush the EventQueue without blocking the main thread
+                    }
+                }, target);
+            } catch (InterruptedException | InvocationTargetException e) {
+                e.printStackTrace();
+            }
         }
     }
 
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CToolkitThreadBlockedHandler.java b/jdk/src/macosx/classes/sun/lwawt/macosx/CToolkitThreadBlockedHandler.java
index 94a74e5174b..6bc6cc7c41b 100644
--- a/jdk/src/macosx/classes/sun/lwawt/macosx/CToolkitThreadBlockedHandler.java
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CToolkitThreadBlockedHandler.java
@@ -25,27 +25,33 @@
 
 package sun.lwawt.macosx;
 
+import sun.awt.Mutex;
 import sun.awt.datatransfer.ToolkitThreadBlockedHandler;
 
-final class CToolkitThreadBlockedHandler implements ToolkitThreadBlockedHandler {
-    private final LWCToolkit toolkit = (LWCToolkit)java.awt.Toolkit.getDefaultToolkit();
+final class CToolkitThreadBlockedHandler extends Mutex implements ToolkitThreadBlockedHandler {
+    private long awtRunLoopMediator = 0;
+    private final boolean processEvents;
 
-    public void lock() {
-    }
-
-    public void unlock() {
-    }
-
-    protected boolean isOwned() {
-       return false;
+    CToolkitThreadBlockedHandler() {
+        super();
+        this.processEvents = true;
     }
 
     public void enter() {
-        // Execute the next AppKit event while we are waiting for system to
-        // finish our request - this will save us from biting our own tail
-        toolkit.executeNextAppKitEvent();
+        if (!isOwned()) {
+            throw new IllegalMonitorStateException();
+        }
+        awtRunLoopMediator = LWCToolkit.createAWTRunLoopMediator();
+        unlock();
+        LWCToolkit.doAWTRunLoop(awtRunLoopMediator, processEvents);
+        lock();
     }
 
     public void exit() {
+        if (!isOwned()) {
+            throw new IllegalMonitorStateException();
+        }
+        LWCToolkit.stopAWTRunLoop(awtRunLoopMediator);
+        awtRunLoopMediator = 0;
     }
 }
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java b/jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java
index 801c3d41605..83bc9f1f700 100644
--- a/jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java
@@ -63,8 +63,6 @@ public final class LWCToolkit extends LWToolkit {
 
     private static native void initIDs();
 
-    static native void executeNextAppKitEvent();
-
     private static CInputMethodDescriptor sInputMethodDescriptor;
 
     static {
@@ -502,30 +500,6 @@ public final class LWCToolkit extends LWToolkit {
         synchronized(ret) { return ret[0]; }
     }
 
-    /**
-     * Just a wrapper for LWCToolkit.invokeAndWait. Posts an empty event to the
-     * appropriate event queue and waits for it to finish.
-     */
-    public static void flushPendingEventsOnAppkit(final Component component) {
-        try {
-            invokeAndWait(new Runnable() {
-                @Override
-                public void run() {
-                }
-            }, component);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    // Kicks an event over to the appropriate eventqueue and waits for it to finish
-    // To avoid deadlocking, we manually run the NSRunLoop while waiting
-    // Any selector invoked using ThreadUtilities performOnMainThread will be processed in doAWTRunLoop
-    // The CInvocationEvent will call LWCToolkit.stopAWTRunLoop() when finished, which will stop our manual runloop
-    public static void invokeAndWait(Runnable event, Component component) throws InterruptedException, InvocationTargetException {
-        invokeAndWait(event, component, true);
-    }
-
     public static <T> T invokeAndWait(final Callable<T> callable, Component component) throws Exception {
         final CallableWrapper<T> wrapper = new CallableWrapper<T>(callable);
         invokeAndWait(wrapper, component);
@@ -555,10 +529,27 @@ public final class LWCToolkit extends LWToolkit {
         }
     }
 
-    public static void invokeAndWait(Runnable event, Component component, boolean detectDeadlocks) throws InterruptedException, InvocationTargetException {
-        long mediator = createAWTRunLoopMediator();
+    // Kicks an event over to the appropriate eventqueue and waits for it to finish
+    // To avoid deadlocking, we manually run the NSRunLoop while waiting
+    // Any selector invoked using ThreadUtilities performOnMainThread will be processed in doAWTRunLoop
+    // The InvocationEvent will call LWCToolkit.stopAWTRunLoop() when finished, which will stop our manual runloop
+    // Does not dispatch native events while in the loop
+    public static void invokeAndWait(Runnable event, Component component) throws InterruptedException, InvocationTargetException {
+        final long mediator = createAWTRunLoopMediator();
 
-        InvocationEvent invocationEvent = new CPeerEvent(event, mediator);
+        InvocationEvent invocationEvent =
+                new InvocationEvent(component != null ? component : Toolkit.getDefaultToolkit(), event) {
+                    @Override
+                    public void dispatch() {
+                        try {
+                            super.dispatch();
+                        } finally {
+                            if (mediator != 0) {
+                                stopAWTRunLoop(mediator);
+                            }
+                        }
+                    }
+                };
 
         if (component != null) {
             AppContext appContext = SunToolkit.targetToAppContext(component);
@@ -571,7 +562,7 @@ public final class LWCToolkit extends LWToolkit {
             ((LWCToolkit)Toolkit.getDefaultToolkit()).getSystemEventQueueForInvokeAndWait().postEvent(invocationEvent);
         }
 
-        doAWTRunLoop(mediator, true, detectDeadlocks);
+        doAWTRunLoop(mediator, false);
 
         Throwable eventException = invocationEvent.getException();
         if (eventException != null) {
@@ -583,7 +574,8 @@ public final class LWCToolkit extends LWToolkit {
     }
 
     public static void invokeLater(Runnable event, Component component) throws InvocationTargetException {
-        final InvocationEvent invocationEvent = new CPeerEvent(event, 0);
+        final InvocationEvent invocationEvent =
+                new InvocationEvent(component != null ? component : Toolkit.getDefaultToolkit(), event);
 
         if (component != null) {
             final AppContext appContext = SunToolkit.targetToAppContext(component);
@@ -688,31 +680,6 @@ public final class LWCToolkit extends LWToolkit {
         return false;
     }
 
-    // Extends PeerEvent because we want to pass long an ObjC mediator object and because we want these events to be posted early
-    // Typically, rather than relying on the notifier to call notifyAll(), we use the mediator to stop the runloop
-    public static class CPeerEvent extends PeerEvent {
-        private long _mediator = 0;
-
-        public CPeerEvent(Runnable runnable, long mediator) {
-            super(Toolkit.getDefaultToolkit(), runnable, null, true, 0);
-            _mediator = mediator;
-        }
-
-        public void dispatch() {
-            try {
-                super.dispatch();
-            } finally {
-                if (_mediator != 0) {
-                    LWCToolkit.stopAWTRunLoop(_mediator);
-                }
-            }
-        }
-    }
-
-    // Call through to native methods
-    public static void doAWTRunLoop(long mediator, boolean awtMode) { doAWTRunLoop(mediator, awtMode, true); }
-    public static void doAWTRunLoop(long mediator) { doAWTRunLoop(mediator, true); }
-
     private static Boolean sunAwtDisableCALayers = null;
 
     /**
@@ -737,12 +704,20 @@ public final class LWCToolkit extends LWToolkit {
      * Native methods section
      ************************/
 
-    // These are public because they are accessed from WebKitPluginObject in JavaDeploy
-    // Basic usage:
-    // createAWTRunLoopMediator. Start client code on another thread. doAWTRunLoop. When client code is finished, stopAWTRunLoop.
-    public static native long createAWTRunLoopMediator();
-    public static native void doAWTRunLoop(long mediator, boolean awtMode, boolean detectDeadlocks);
-    public static native void stopAWTRunLoop(long mediator);
+    static native long createAWTRunLoopMediator();
+    /**
+     * Method to run a nested run-loop. The nested loop is spinned in the javaRunLoop mode, so selectors sent
+     * by [JNFRunLoop performOnMainThreadWaiting] are processed.
+     * @param mediator a native pointer to the mediator object created by createAWTRunLoopMediator
+     * @param processEvents if true - dispatches event while in the nested loop. Used in DnD.
+     *                      Additional attention is needed when using this feature as we short-circuit normal event
+     *                      processing which could break Appkit.
+     *                      (One known example is when the window is resized with the mouse)
+     *
+     *                      if false - all events come after exit form the nested loop
+     */
+    static native void doAWTRunLoop(long mediator, boolean processEvents);
+    static native void stopAWTRunLoop(long mediator);
 
     private native boolean nativeSyncQueue(long timeout);
 
diff --git a/jdk/src/macosx/native/sun/awt/AWTView.m b/jdk/src/macosx/native/sun/awt/AWTView.m
index cc16a2026ee..7e1f248c7ed 100644
--- a/jdk/src/macosx/native/sun/awt/AWTView.m
+++ b/jdk/src/macosx/native/sun/awt/AWTView.m
@@ -227,7 +227,7 @@ AWT_ASSERT_APPKIT_THREAD;
 
 - (void) mouseMoved: (NSEvent *)event {
     // TODO: better way to redirect move events to the "under" view
-
+    
     NSPoint eventLocation = [event locationInWindow];
     NSPoint localPoint = [self convertPoint: eventLocation fromView: nil];
 
@@ -668,7 +668,7 @@ AWT_ASSERT_APPKIT_THREAD;
 
 - (void) setDropTarget:(CDropTarget *)target {
     self._dropTarget = target;
-    [ThreadUtilities performOnMainThread:@selector(controlModelControlValid) onObject:self._dropTarget withObject:nil waitUntilDone:YES awtMode:YES];
+    [ThreadUtilities performOnMainThread:@selector(controlModelControlValid) on:self._dropTarget withObject:nil waitUntilDone:YES];
 }
 
 /********************************  BEGIN NSDraggingSource Interface  ********************************/
@@ -1215,7 +1215,7 @@ JNF_CLASS_CACHE(jc_CInputMethod, "sun/lwawt/macosx/CInputMethod");
     fprintf(stderr, "AWTView InputMethod Selector Called : [abandonInput]\n");
 #endif // IM_DEBUG
 
-    [ThreadUtilities performOnMainThread:@selector(markedTextAbandoned:) onObject:[NSInputManager currentInputManager] withObject:self waitUntilDone:YES awtMode:YES];
+    [ThreadUtilities performOnMainThread:@selector(markedTextAbandoned:) on:[NSInputManager currentInputManager] withObject:self waitUntilDone:YES];
     [self unmarkText];
 }
 
diff --git a/jdk/src/macosx/native/sun/awt/ApplicationDelegate.m b/jdk/src/macosx/native/sun/awt/ApplicationDelegate.m
index 9a5aee94d44..6b584b21ca3 100644
--- a/jdk/src/macosx/native/sun/awt/ApplicationDelegate.m
+++ b/jdk/src/macosx/native/sun/awt/ApplicationDelegate.m
@@ -567,10 +567,9 @@ JNIEXPORT void JNICALL Java_com_apple_eawt__1AppEventHandler_nativeRegisterForNo
 {
 JNF_COCOA_ENTER(env);
     [ThreadUtilities performOnMainThread:@selector(_registerForNotification:)
-                                onObject:[ApplicationDelegate class]
+                                      on:[ApplicationDelegate class]
                               withObject:[NSNumber numberWithInt:notificationType]
-                           waitUntilDone:NO
-                                 awtMode:NO]; // AWT_THREADING Safe (non-blocking)
+                           waitUntilDone:NO]; // AWT_THREADING Safe (non-blocking)
 JNF_COCOA_EXIT(env);
 }
 
diff --git a/jdk/src/macosx/native/sun/awt/CClipboard.m b/jdk/src/macosx/native/sun/awt/CClipboard.m
index fb300f72971..bfba06b47d1 100644
--- a/jdk/src/macosx/native/sun/awt/CClipboard.m
+++ b/jdk/src/macosx/native/sun/awt/CClipboard.m
@@ -120,7 +120,7 @@ static CClipboard *sClipboard = nil;
             fClipboardOwner = JNFNewGlobalRef(inEnv, inClipboard);
         }
     }
-    [ThreadUtilities performOnMainThread:@selector(_nativeDeclareTypes:) onObject:self withObject:inTypes waitUntilDone:YES awtMode:YES];
+    [ThreadUtilities performOnMainThread:@selector(_nativeDeclareTypes:) on:self withObject:inTypes waitUntilDone:YES];
 }
 
 - (void) _nativeDeclareTypes:(NSArray *)inTypes {
@@ -135,7 +135,7 @@ static CClipboard *sClipboard = nil;
 - (NSArray *) javaGetTypes {
 
     NSMutableArray *args = [NSMutableArray arrayWithCapacity:1];
-    [ThreadUtilities performOnMainThread:@selector(_nativeGetTypes:) onObject:self withObject:args waitUntilDone:YES awtMode:YES];
+    [ThreadUtilities performOnMainThread:@selector(_nativeGetTypes:) on:self withObject:args waitUntilDone:YES];
 
     //NSLog(@"CClipboard getTypes returns %@", [args lastObject]);
     return [args lastObject];
@@ -152,7 +152,7 @@ static CClipboard *sClipboard = nil;
 - (void) javaSetData:(NSData *)inData forType:(NSString *) inFormat {
 
     CClipboardUpdate *newUpdate = [[CClipboardUpdate alloc] initWithData:inData withFormat:inFormat];
-    [ThreadUtilities performOnMainThread:@selector(_nativeSetData:) onObject:self withObject:newUpdate waitUntilDone:YES awtMode:YES];
+    [ThreadUtilities performOnMainThread:@selector(_nativeSetData:) on:self withObject:newUpdate waitUntilDone:YES];
     [newUpdate release];
 
     //NSLog(@"CClipboard javaSetData forType %@", inFormat);
@@ -170,7 +170,7 @@ static CClipboard *sClipboard = nil;
 - (NSData *) javaGetDataForType:(NSString *) inFormat {
 
     NSMutableArray *args = [NSMutableArray arrayWithObject:inFormat];
-    [ThreadUtilities performOnMainThread:@selector(_nativeGetDataForType:) onObject:self withObject:args waitUntilDone:YES awtMode:YES];
+    [ThreadUtilities performOnMainThread:@selector(_nativeGetDataForType:) on:self withObject:args waitUntilDone:YES];
 
     //NSLog(@"CClipboard javaGetDataForType %@ returns an NSData", inFormat);
     return [args lastObject];
diff --git a/jdk/src/macosx/native/sun/awt/CDropTarget.m b/jdk/src/macosx/native/sun/awt/CDropTarget.m
index 60cd7818254..9dda8ae3551 100644
--- a/jdk/src/macosx/native/sun/awt/CDropTarget.m
+++ b/jdk/src/macosx/native/sun/awt/CDropTarget.m
@@ -390,8 +390,7 @@ extern JNFClassInfo jc_CDropTargetContextPeer;
 
     // Release dragging data if any when Java's AWT event thread is all finished.
     // Make sure dragging data is released on the native event thread.
-    [ThreadUtilities performOnMainThread:@selector(safeReleaseDraggingData:) onObject:self
-                              withObject:draggingSequenceNumberID waitUntilDone:NO awtMode:NO];
+    [ThreadUtilities performOnMainThread:@selector(safeReleaseDraggingData:) on:self withObject:draggingSequenceNumberID waitUntilDone:NO];
 }
 
 - (jint)currentJavaActions {
diff --git a/jdk/src/macosx/native/sun/awt/CMenu.m b/jdk/src/macosx/native/sun/awt/CMenu.m
index e6325c2c3db..8b643b3bca0 100644
--- a/jdk/src/macosx/native/sun/awt/CMenu.m
+++ b/jdk/src/macosx/native/sun/awt/CMenu.m
@@ -55,11 +55,11 @@ AWT_ASSERT_APPKIT_THREAD;
 //- (void)finalize { [super finalize]; }
 
 - (void)addJavaSubmenu:(CMenu *)submenu {
-    [ThreadUtilities performOnMainThread:@selector(addNativeItem_OnAppKitThread:) onObject:self withObject:submenu waitUntilDone:YES awtMode:YES];
+    [ThreadUtilities performOnMainThread:@selector(addNativeItem_OnAppKitThread:) on:self withObject:submenu waitUntilDone:YES];
 }
 
 - (void)addJavaMenuItem:(CMenuItem *)theMenuItem {
-    [ThreadUtilities performOnMainThread:@selector(addNativeItem_OnAppKitThread:) onObject:self withObject:theMenuItem waitUntilDone:YES awtMode:YES];
+    [ThreadUtilities performOnMainThread:@selector(addNativeItem_OnAppKitThread:) on:self withObject:theMenuItem waitUntilDone:YES];
 }
 
 - (void)addNativeItem_OnAppKitThread:(CMenuItem *)itemModified {
@@ -70,7 +70,7 @@ AWT_ASSERT_APPKIT_THREAD;
 - (void)setJavaMenuTitle:(NSString *)title {
 
     if (title) {
-        [ThreadUtilities performOnMainThread:@selector(setNativeMenuTitle_OnAppKitThread:) onObject:self withObject:title waitUntilDone:YES awtMode:YES];
+        [ThreadUtilities performOnMainThread:@selector(setNativeMenuTitle_OnAppKitThread:) on:self withObject:title waitUntilDone:YES];
     }
 }
 
@@ -93,7 +93,7 @@ AWT_ASSERT_APPKIT_THREAD;
 
 - (void)deleteJavaItem:(jint)index {
 
-    [ThreadUtilities performOnMainThread:@selector(deleteNativeJavaItem_OnAppKitThread:) onObject:self withObject:[NSNumber numberWithInt:index] waitUntilDone:YES awtMode:YES];
+    [ThreadUtilities performOnMainThread:@selector(deleteNativeJavaItem_OnAppKitThread:) on:self withObject:[NSNumber numberWithInt:index] waitUntilDone:YES];
 }
 
 - (void)deleteNativeJavaItem_OnAppKitThread:(NSNumber *)number {
@@ -139,7 +139,7 @@ CMenu * createCMenu (jobject cPeerObjGlobal) {
     // We use an array here only to be able to get a return value
     NSMutableArray *args = [[NSMutableArray alloc] initWithObjects:[NSValue valueWithBytes:&cPeerObjGlobal objCType:@encode(jobject)], nil];
 
-    [ThreadUtilities performOnMainThread:@selector(_create_OnAppKitThread:) onObject:[CMenu alloc] withObject:args waitUntilDone:YES awtMode:YES];
+    [ThreadUtilities performOnMainThread:@selector(_create_OnAppKitThread:) on:[CMenu alloc] withObject:args waitUntilDone:YES];
 
     aCMenu = (CMenu *)[args objectAtIndex: 0];
 
diff --git a/jdk/src/macosx/native/sun/awt/CMenuBar.m b/jdk/src/macosx/native/sun/awt/CMenuBar.m
index 23c79496189..b0d67f71a2a 100644
--- a/jdk/src/macosx/native/sun/awt/CMenuBar.m
+++ b/jdk/src/macosx/native/sun/awt/CMenuBar.m
@@ -197,7 +197,7 @@ static BOOL sSetupHelpMenu = NO;
 
     if (self == sActiveMenuBar) {
         NSArray *args = [[NSArray alloc] initWithObjects:theMenu, [NSNumber numberWithInt:-1], nil];
-        [ThreadUtilities performOnMainThread:@selector(nativeAddMenuAtIndex_OnAppKitThread:) onObject:self withObject:args waitUntilDone:YES awtMode:YES];
+        [ThreadUtilities performOnMainThread:@selector(nativeAddMenuAtIndex_OnAppKitThread:) on:self withObject:args waitUntilDone:YES];
         [args release];
     }
 }
@@ -216,7 +216,7 @@ static BOOL sSetupHelpMenu = NO;
 
     if (self == sActiveMenuBar) {
         NSArray *args = [[NSArray alloc] initWithObjects:theMenu, [NSNumber numberWithInt:index], nil];
-        [ThreadUtilities performOnMainThread:@selector(nativeAddMenuAtIndex_OnAppKitThread:) onObject:self withObject:args waitUntilDone:YES awtMode:YES];
+        [ThreadUtilities performOnMainThread:@selector(nativeAddMenuAtIndex_OnAppKitThread:) on:self withObject:args waitUntilDone:YES];
         [args release];
     }
 }
@@ -286,7 +286,7 @@ static BOOL sSetupHelpMenu = NO;
 
 - (void) javaDeleteMenu: (jint)index {
     if (self == sActiveMenuBar) {
-        [ThreadUtilities performOnMainThread:@selector(nativeDeleteMenu_OnAppKitThread:) onObject:self withObject:[NSNumber numberWithInt:index] waitUntilDone:YES awtMode:YES];
+        [ThreadUtilities performOnMainThread:@selector(nativeDeleteMenu_OnAppKitThread:) on:self withObject:[NSNumber numberWithInt:index] waitUntilDone:YES];
     }
 
     @synchronized(self) {
@@ -388,7 +388,7 @@ Java_sun_lwawt_macosx_CMenuBar_nativeCreateMenuBar
     // We use an array here only to be able to get a return value
     NSMutableArray *args = [[NSMutableArray alloc] initWithObjects:[NSValue valueWithBytes:&cPeerObjGlobal objCType:@encode(jobject)], nil];
 
-    [ThreadUtilities performOnMainThread:@selector(_create_OnAppKitThread:) onObject:[CMenuBar alloc] withObject:args waitUntilDone:YES awtMode:YES];
+    [ThreadUtilities performOnMainThread:@selector(_create_OnAppKitThread:) on:[CMenuBar alloc] withObject:args waitUntilDone:YES];
 
     aCMenuBar = (CMenuBar *)[args objectAtIndex: 0];
 
diff --git a/jdk/src/macosx/native/sun/awt/CMenuItem.m b/jdk/src/macosx/native/sun/awt/CMenuItem.m
index 2281d8bcd95..b67c70658dd 100644
--- a/jdk/src/macosx/native/sun/awt/CMenuItem.m
+++ b/jdk/src/macosx/native/sun/awt/CMenuItem.m
@@ -386,7 +386,7 @@ JNF_COCOA_ENTER(env);
         args = [[NSMutableArray alloc] initWithObjects:[NSValue valueWithBytes:&cPeerObjGlobal objCType:@encode(jobject)], [NSNumber numberWithBool:NO],  nil];
     }
 
-    [ThreadUtilities performOnMainThread:@selector(_createMenuItem_OnAppKitThread:) onObject:[CMenuItem alloc] withObject:args waitUntilDone:YES awtMode:YES];
+    [ThreadUtilities performOnMainThread:@selector(_createMenuItem_OnAppKitThread:) on:[CMenuItem alloc] withObject:args waitUntilDone:YES];
 
     aCMenuItem = (CMenuItem *)[args objectAtIndex: 0];
 
diff --git a/jdk/src/macosx/native/sun/awt/JavaComponentAccessibility.m b/jdk/src/macosx/native/sun/awt/JavaComponentAccessibility.m
index f886c4afbe1..a01bd781faa 100644
--- a/jdk/src/macosx/native/sun/awt/JavaComponentAccessibility.m
+++ b/jdk/src/macosx/native/sun/awt/JavaComponentAccessibility.m
@@ -1113,18 +1113,10 @@ static NSObject *sAttributeNamesLOCK = nil;
     JNIEnv *env = [ThreadUtilities getJNIEnv];
     id value = nil;
 
-    // This code frequently gets called indirectly by Java when VoiceOver is active.
-    // Basically, we just have to know when we going to be a bad state, and do something "special".
-    // Note that while NSApplication isn't technically correct, we post a focus changed notification
-    // (which will call this method, but with the correct codepath) shortly afterwards. See +postFocusChanged.
-    if (sInPerformFromJava) {
-        return [NSApplication sharedApplication];
-    } else {
-        jobject focused = JNFCallStaticObjectMethod(env, jm_getFocusOwner, fComponent); // AWT_THREADING Safe (AWTRunLoop)
-        if (focused != NULL) {
-            if (JNFIsInstanceOf(env, focused, &sjc_Accessible)) {
-                value = [JavaComponentAccessibility createWithAccessible:focused withEnv:env withView:fView];
-            }
+    jobject focused = JNFCallStaticObjectMethod(env, jm_getFocusOwner, fComponent); // AWT_THREADING Safe (AWTRunLoop)
+    if (focused != NULL) {
+        if (JNFIsInstanceOf(env, focused, &sjc_Accessible)) {
+            value = [JavaComponentAccessibility createWithAccessible:focused withEnv:env withView:fView];
         }
     }
 
@@ -1149,7 +1141,7 @@ JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CAccessibility_focusChanged
 {
 
 JNF_COCOA_ENTER(env);
-    [ThreadUtilities performOnMainThread:@selector(postFocusChanged:) onObject:[JavaComponentAccessibility class] withObject:nil waitUntilDone:NO awtMode:NO];
+    [ThreadUtilities performOnMainThread:@selector(postFocusChanged:) on:[JavaComponentAccessibility class] withObject:nil waitUntilDone:NO];
 JNF_COCOA_EXIT(env);
 }
 
@@ -1164,7 +1156,7 @@ JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CAccessible_valueChanged
 (JNIEnv *env, jclass jklass, jlong element)
 {
 JNF_COCOA_ENTER(env);
-    [ThreadUtilities performOnMainThread:@selector(postValueChanged) onObject:(JavaComponentAccessibility *)jlong_to_ptr(element) withObject:nil waitUntilDone:NO awtMode:NO];
+    [ThreadUtilities performOnMainThread:@selector(postValueChanged) on:(JavaComponentAccessibility *)jlong_to_ptr(element) withObject:nil waitUntilDone:NO];
 JNF_COCOA_EXIT(env);
 }
 
@@ -1177,7 +1169,7 @@ JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CAccessible_selectionChanged
 (JNIEnv *env, jclass jklass, jlong element)
 {
 JNF_COCOA_ENTER(env);
-    [ThreadUtilities performOnMainThread:@selector(postSelectionChanged) onObject:(JavaComponentAccessibility *)jlong_to_ptr(element) withObject:nil waitUntilDone:NO awtMode:NO];
+    [ThreadUtilities performOnMainThread:@selector(postSelectionChanged) on:(JavaComponentAccessibility *)jlong_to_ptr(element) withObject:nil waitUntilDone:NO];
 JNF_COCOA_EXIT(env);
 }
 
@@ -1191,7 +1183,7 @@ JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CAccessible_unregisterFromCocoaAXSy
 (JNIEnv *env, jclass jklass, jlong element)
 {
 JNF_COCOA_ENTER(env);
-    [ThreadUtilities performOnMainThread:@selector(unregisterFromCocoaAXSystem) onObject:(JavaComponentAccessibility *)jlong_to_ptr(element) withObject:nil waitUntilDone:NO awtMode:NO];
+    [ThreadUtilities performOnMainThread:@selector(unregisterFromCocoaAXSystem) on:(JavaComponentAccessibility *)jlong_to_ptr(element) withObject:nil waitUntilDone:NO];
 JNF_COCOA_EXIT(env);
 }
 
diff --git a/jdk/src/macosx/native/sun/awt/LWCToolkit.m b/jdk/src/macosx/native/sun/awt/LWCToolkit.m
index 45c546181f0..ec4870eba69 100644
--- a/jdk/src/macosx/native/sun/awt/LWCToolkit.m
+++ b/jdk/src/macosx/native/sun/awt/LWCToolkit.m
@@ -332,7 +332,7 @@ AWT_ASSERT_APPKIT_THREAD;
  * Signature: (JZZ)V
  */
 JNIEXPORT void JNICALL Java_sun_lwawt_macosx_LWCToolkit_doAWTRunLoop
-(JNIEnv *env, jclass clz, jlong mediator, jboolean awtMode, jboolean detectDeadlocks)
+(JNIEnv *env, jclass clz, jlong mediator, jboolean processEvents)
 {
 AWT_ASSERT_APPKIT_THREAD;
 JNF_COCOA_ENTER(env);
@@ -341,26 +341,25 @@ JNF_COCOA_ENTER(env);
 
     if (mediatorObject == nil) return;
 
-    if (!sInPerformFromJava || !detectDeadlocks) {
+    // Don't use acceptInputForMode because that doesn't setup autorelease pools properly
+    BOOL isRunning = true;
+    while (![mediatorObject shouldEndRunLoop] && isRunning) {
+        isRunning = [[NSRunLoop currentRunLoop] runMode:[JNFRunLoop javaRunLoopMode]
+                                             beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.010]];
+        if (processEvents) {
+            //We do not spin a runloop here as date is nil, so does not matter which mode to use
+            NSEvent *event;
+            if ((event = [NSApp nextEventMatchingMask:NSAnyEventMask
+                                           untilDate:nil
+                                              inMode:NSDefaultRunLoopMode
+                                             dequeue:YES]) != nil) {
+                [NSApp sendEvent:event];
+            }
 
-        NSRunLoop *currentRunLoop = [NSRunLoop currentRunLoop];
-        NSDate *distantFuture = [NSDate distantFuture];
-        NSString *mode = (awtMode) ? [JNFRunLoop javaRunLoopMode] : NSDefaultRunLoopMode;
-
-        BOOL isRunning = YES;
-        while (isRunning && ![mediatorObject shouldEndRunLoop]) {
-            // Don't use acceptInputForMode because that doesn't setup autorelease pools properly
-            isRunning = [currentRunLoop runMode:mode beforeDate:distantFuture];
         }
-
     }
-#ifndef PRODUCT_BUILD
-    if (sInPerformFromJava) {
-        NSLog(@"Apple AWT: Short-circuiting CToolkit.invokeAndWait trampoline deadlock!!!!!");
-        NSLog(@"\tPlease file a bug report with this message and a reproducible test case.");
-    }
-#endif
 
+   
     CFRelease(mediatorObject);
 
 JNF_COCOA_EXIT(env);
@@ -379,7 +378,7 @@ JNF_COCOA_ENTER(env);
 
     AWTRunLoopObject* mediatorObject = (AWTRunLoopObject*)jlong_to_ptr(mediator);
 
-    [ThreadUtilities performOnMainThread:@selector(endRunLoop) onObject:mediatorObject withObject:nil waitUntilDone:NO awtMode:YES];
+    [ThreadUtilities performOnMainThread:@selector(endRunLoop) on:mediatorObject withObject:nil waitUntilDone:NO];
 
     CFRelease(mediatorObject);
 
@@ -463,20 +462,3 @@ Java_sun_font_FontManager_populateFontFileNameMap
 
 }
 
-/*
- * Class:     sun_lwawt_macosx_LWCToolkit
- * Method:    executeNextAppKitEvent
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_sun_lwawt_macosx_LWCToolkit_executeNextAppKitEvent
-(JNIEnv *env, jclass cls)
-{
-    // Simply get the next event in native loop and pass it to execution
-    // We'll be called repeatedly so there's no need to block here
-    NSRunLoop *theRL = [NSRunLoop currentRunLoop];
-    NSApplication * app = [NSApplication sharedApplication];
-    NSEvent * event = [app nextEventMatchingMask: 0xFFFFFFFF untilDate:nil inMode:NSDefaultRunLoopMode dequeue:YES];
-    if (event != nil) {
-        [app sendEvent: event];
-    }
-}
diff --git a/jdk/src/macosx/native/sun/osxapp/ThreadUtilities.h b/jdk/src/macosx/native/sun/osxapp/ThreadUtilities.h
index c0d2054f6e3..2ee65e94c65 100644
--- a/jdk/src/macosx/native/sun/osxapp/ThreadUtilities.h
+++ b/jdk/src/macosx/native/sun/osxapp/ThreadUtilities.h
@@ -122,19 +122,12 @@ do {                                  \
 #endif /* AWT_THREAD_ASSERTS */
 // --------------------------------------------------------------------------
 
-// This tracks if we are current inside of a performOnMainThread that is both waiting and in the AWTRunLoopMode
-extern BOOL sInPerformFromJava;
-
-// This is an empty Obj-C object just so that -performSelectorOnMainThread
-// can be used, and to use the Obj-C +initialize feature.
 __attribute__((visibility("default")))
-@interface ThreadUtilities : NSObject { }
+@interface ThreadUtilities { }
 
 + (JNIEnv*)getJNIEnv;
 + (JNIEnv*)getJNIEnvUncached;
 
-+ (void)performOnMainThread:(SEL)aSelector onObject:(id)target withObject:(id)arg waitUntilDone:(BOOL)wait awtMode:(BOOL)inAWT;
-
 //Wrappers for the corresponding JNFRunLoop methods with a check for main thread
 + (void)performOnMainThreadWaiting:(BOOL)wait block:(void (^)())block;
 + (void)performOnMainThread:(SEL)aSelector on:(id)target withObject:(id)arg waitUntilDone:(BOOL)wait;
diff --git a/jdk/src/macosx/native/sun/osxapp/ThreadUtilities.m b/jdk/src/macosx/native/sun/osxapp/ThreadUtilities.m
index 0b42f1b5896..d431386bbdb 100644
--- a/jdk/src/macosx/native/sun/osxapp/ThreadUtilities.m
+++ b/jdk/src/macosx/native/sun/osxapp/ThreadUtilities.m
@@ -34,85 +34,6 @@
 JavaVM *jvm = NULL;
 static JNIEnv *appKitEnv = NULL;
 
-static NSArray *sPerformModes = nil;
-static NSArray *sAWTPerformModes = nil;
-
-static BOOL sLoggingEnabled = YES;
-
-#ifdef AWT_THREAD_ASSERTS_ENV_ASSERT
-int sAWTThreadAsserts = 0;
-#endif /* AWT_THREAD_ASSERTS_ENV_ASSERT */
-
-BOOL sInPerformFromJava = NO;
-
-// This class is used so that performSelectorOnMainThread can be
-// controlled a little more easily by us.  It has 2 roles.
-// The first is to set/unset a flag (sInPerformFromJava) that code can
-// check to see if we are in a synchronous perform initiated by a java thread.
-// The second is to implement the CocoaComponent backward compatibility mode.
-@interface CPerformer : NSObject {
-    id fTarget;
-    SEL fSelector;
-    id fArg;
-    BOOL fWait;
-}
-
-- (id) initWithTarget:(id)target selector:(SEL)selector arg:(id)arg wait:(BOOL)wait;
-- (void) perform;
-@end
-
-
-@implementation CPerformer
-
-- (id) initWithTarget:(id)target selector:(SEL)selector arg:(id)arg {
-    return [self initWithTarget:target selector:selector arg:arg wait:YES];
-}
-
-- (id) initWithTarget:(id)target selector:(SEL)selector arg:(id)arg wait:(BOOL)wait {
-    self = [super init];
-    if (self != nil) {
-        fTarget = [target retain];
-        fSelector = selector;
-        fArg = [arg retain];
-        // Only set sInPerformFromJava if this is a synchronous perform
-        fWait = wait;
-    }
-    return self;
-}
-
-- (void) dealloc {
-    [fTarget release];
-    [fArg release];
-    [super dealloc];
-}
-//- (void)finalize { [super finalize]; }
-
-- (void) perform {
-    AWT_ASSERT_APPKIT_THREAD;
-
-    // If this is the first time we're going from java thread -> appkit thread,
-    // set sInPerformFromJava for the duration of the invocation
-    BOOL nestedPerform = sInPerformFromJava;
-    if (fWait) {
-        sInPerformFromJava = YES;
-    }
-
-    // Actually do the work (cheat to avoid a method call)
-    @try {
-        objc_msgSend(fTarget, fSelector, fArg);
-        //[fTarget performSelector:fSelector withObject:fArg];
-    } @catch (NSException *e) {
-        NSLog(@"*** CPerformer: ignoring exception '%@' raised during perform of selector '%@' on target '%@' with args '%@'", e, NSStringFromSelector(fSelector), fTarget, fArg);
-    } @finally {
-        // If we actually set sInPerformFromJava, unset it now
-        if (!nestedPerform && fWait) {
-            sInPerformFromJava = NO;
-        }
-    }
-}
-@end
-
-
 @implementation ThreadUtilities
 
 + (JNIEnv*)getJNIEnv {
@@ -129,36 +50,6 @@ AWT_ASSERT_APPKIT_THREAD;
     return env;
 }
 
-+ (void)initialize {
-    // Headless: BOTH
-    // Embedded: BOTH
-    // Multiple Calls: NO
-    // Caller: Obj-C class initialization
-    // Thread: ?
-
-    if (sPerformModes == nil) {
-        // Create list of Run Loop modes to perform on
-        // The default performSelector, with no mode argument, runs in Default,
-        // ModalPanel, and EventTracking modes
-        sPerformModes =    [[NSArray alloc] initWithObjects:NSDefaultRunLoopMode, NSModalPanelRunLoopMode, nil];
-        sAWTPerformModes = [[NSArray alloc] initWithObjects:NSDefaultRunLoopMode, NSModalPanelRunLoopMode, NSEventTrackingRunLoopMode, [JNFRunLoop javaRunLoopMode], nil];
-
-#ifdef AWT_THREAD_ASSERTS_ENV_ASSERT
-        sAWTThreadAsserts = (getenv("COCOA_AWT_DISABLE_THREAD_ASSERTS") == NULL);
-#endif /* AWT_THREAD_ASSERTS_ENV_ASSERT */
-    }
-}
-
-// These methods can behave slightly differently than the normal
-// performSelector...  In particular, we define a special runloop mode
-// (AWTRunLoopMode) so that we can "block" the main thread against the
-// java event thread without deadlocking. See CToolkit.invokeAndWait.
-+ (void)performOnMainThread:(SEL)aSelector onObject:(id)target withObject:(id)arg waitUntilDone:(BOOL)wait awtMode:(BOOL)inAWT {
-    CPerformer *performer = [[CPerformer alloc] initWithTarget:target selector:aSelector arg:arg wait:wait];
-    [performer performSelectorOnMainThread:@selector(perform) withObject:nil waitUntilDone:wait modes:((inAWT) ? sAWTPerformModes : sPerformModes)]; // AWT_THREADING Safe (cover method)
-    [performer release];
-}
-
 + (void)performOnMainThreadWaiting:(BOOL)wait block:(void (^)())block {
     if ([NSThread isMainThread] && wait == YES) {
         block(); 

From f688068adfedb5ba54ed75c6e6006a2f0e0c75b1 Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Mon, 25 Feb 2013 16:58:31 +0530
Subject: [PATCH 217/311] 8008731: Separate configuration environment (options,
 error/output writer etc.) from Context

Reviewed-by: hannesw, lagergren
---
 .../jdk/nashorn/internal/codegen/Attr.java    |  13 +-
 .../internal/codegen/ClassEmitter.java        |  33 ++-
 .../internal/codegen/CodeGenerator.java       |   6 +-
 .../internal/codegen/CompilationPhase.java    |  36 +--
 .../nashorn/internal/codegen/Compiler.java    |  38 +--
 .../internal/codegen/MethodEmitter.java       |  10 +-
 .../codegen/ObjectClassGenerator.java         |  10 +-
 .../nashorn/internal/ir/debug/JSONWriter.java |   7 +-
 .../jdk/nashorn/internal/objects/Global.java  |  30 ++-
 .../nashorn/internal/objects/NativeDate.java  |   8 +-
 .../internal/objects/NativeString.java        |   6 +-
 .../objects/ScriptFunctionTrampolineImpl.java |   5 +-
 .../jdk/nashorn/internal/parser/Parser.java   |  45 ++--
 .../internal/runtime/CodeInstaller.java       |   9 +
 .../jdk/nashorn/internal/runtime/Context.java | 253 +++---------------
 .../internal/runtime/JSONFunctions.java       |   2 +-
 .../internal/runtime/OptionsObject.java       | 141 ----------
 .../internal/runtime/ScriptEnvironment.java   | 249 +++++++++++++++++
 .../internal/runtime/ScriptRuntime.java       |   2 +-
 nashorn/src/jdk/nashorn/tools/Shell.java      |  24 +-
 nashorn/test/script/trusted/JDK-8006529.js    |   5 +-
 .../nashorn/internal/parser/ParserTest.java   |   2 +-
 .../framework/SharedContextEvaluator.java     |   2 +-
 23 files changed, 445 insertions(+), 491 deletions(-)
 delete mode 100644 nashorn/src/jdk/nashorn/internal/runtime/OptionsObject.java
 create mode 100644 nashorn/src/jdk/nashorn/internal/runtime/ScriptEnvironment.java

diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Attr.java b/nashorn/src/jdk/nashorn/internal/codegen/Attr.java
index 3bf8856955b..211140e4123 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Attr.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Attr.java
@@ -101,9 +101,6 @@ import jdk.nashorn.internal.runtime.ScriptObject;
  */
 
 final class Attr extends NodeOperatorVisitor {
-    /** Context compiler. */
-    private final Context context;
-
     /**
      * Local definitions in current block (to discriminate from function
      * declarations always defined in the function scope. This is for
@@ -123,11 +120,8 @@ final class Attr extends NodeOperatorVisitor {
 
     /**
      * Constructor.
-     *
-     * @param compiler the compiler
      */
-    Attr(final Context context) {
-        this.context = context;
+    Attr() {
     }
 
     @Override
@@ -258,7 +252,7 @@ final class Attr extends NodeOperatorVisitor {
         }
 
         if (functionNode.isScript()) {
-            initFromPropertyMap(context, functionNode);
+            initFromPropertyMap(functionNode);
         }
 
         // Add function name as local symbol
@@ -1271,10 +1265,9 @@ final class Attr extends NodeOperatorVisitor {
 
     /**
      * Move any properties from a global map into the scope of this method
-     * @param context      context
      * @param functionNode the function node for which to init scope vars
      */
-    private static void initFromPropertyMap(final Context context, final FunctionNode functionNode) {
+    private static void initFromPropertyMap(final FunctionNode functionNode) {
         // For a script, add scope symbols as defined in the property map
         assert functionNode.isScript();
 
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/ClassEmitter.java b/nashorn/src/jdk/nashorn/internal/codegen/ClassEmitter.java
index 208e64568d1..3b6433dd83b 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/ClassEmitter.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/ClassEmitter.java
@@ -62,11 +62,10 @@ import jdk.internal.org.objectweb.asm.ClassReader;
 import jdk.internal.org.objectweb.asm.ClassWriter;
 import jdk.internal.org.objectweb.asm.MethodVisitor;
 import jdk.internal.org.objectweb.asm.util.TraceClassVisitor;
-import jdk.nashorn.internal.codegen.Emitter;
 import jdk.nashorn.internal.codegen.types.Type;
 import jdk.nashorn.internal.ir.FunctionNode;
-import jdk.nashorn.internal.runtime.Context;
 import jdk.nashorn.internal.runtime.PropertyMap;
+import jdk.nashorn.internal.runtime.ScriptEnvironment;
 import jdk.nashorn.internal.runtime.ScriptObject;
 import jdk.nashorn.internal.runtime.Source;
 
@@ -121,8 +120,8 @@ public class ClassEmitter implements Emitter {
     /** The ASM classwriter that we use for all bytecode operations */
     protected final ClassWriter cw;
 
-    /** The context */
-    protected final Context context;
+    /** The script environment */
+    protected final ScriptEnvironment env;
 
     /** Default flags for class generation - oublic class */
     private static final EnumSet<Flag> DEFAULT_METHOD_FLAGS = EnumSet.of(Flag.PUBLIC);
@@ -137,13 +136,13 @@ public class ClassEmitter implements Emitter {
      * Constructor - only used internally in this class as it breaks
      * abstraction towards ASM or other code generator below
      *
-     * @param context  context
-     * @param cw       ASM classwriter
+     * @param env script environment
+     * @param cw  ASM classwriter
      */
-    private ClassEmitter(final Context context, final ClassWriter cw) {
-        assert context != null;
+    private ClassEmitter(final ScriptEnvironment env, final ClassWriter cw) {
+        assert env != null;
 
-        this.context        = context;
+        this.env            = env;
         this.cw             = cw;
         this.methodsStarted = new HashSet<>();
     }
@@ -151,13 +150,13 @@ public class ClassEmitter implements Emitter {
     /**
      * Constructor
      *
-     * @param context         context
+     * @param env             script environment
      * @param className       name of class to weave
      * @param superClassName  super class name for class
      * @param interfaceNames  names of interfaces implemented by this class, or null if none
      */
-    ClassEmitter(final Context context, final String className, final String superClassName, final String... interfaceNames) {
-        this(context, new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS));
+    ClassEmitter(final ScriptEnvironment env, final String className, final String superClassName, final String... interfaceNames) {
+        this(env, new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS));
         cw.visit(V1_7, ACC_PUBLIC | ACC_SUPER, className, null, superClassName, interfaceNames);
     }
 
@@ -168,8 +167,8 @@ public class ClassEmitter implements Emitter {
      * @param unitClassName Compile unit class name.
      * @param strictMode    Should we generate this method in strict mode
      */
-    ClassEmitter(final Context context, final String sourceName, final String unitClassName, final boolean strictMode) {
-        this(context,
+    ClassEmitter(final ScriptEnvironment env, final String sourceName, final String unitClassName, final boolean strictMode) {
+        this(env,
              new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS) {
                 private static final String OBJECT_CLASS  = "java/lang/Object";
 
@@ -372,10 +371,10 @@ public class ClassEmitter implements Emitter {
     }
 
     /**
-     * @return context used for class emission
+     * @return env used for class emission
      */
-    Context getContext() {
-        return context;
+    ScriptEnvironment getEnv() {
+        return env;
     }
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
index 0c17fa25f8f..380ecaff57d 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
@@ -175,7 +175,7 @@ final class CodeGenerator extends NodeOperatorVisitor {
      */
     CodeGenerator(final Compiler compiler) {
         this.compiler      = compiler;
-        this.callSiteFlags = compiler.getContext()._callsite_flags;
+        this.callSiteFlags = compiler.getEnv()._callsite_flags;
     }
 
     /**
@@ -2968,12 +2968,12 @@ final class CodeGenerator extends NodeOperatorVisitor {
      * @param ident identifier for block or function where applicable
      */
     private void printSymbols(final Block block, final String ident) {
-        if (!compiler.getContext()._print_symbols) {
+        if (!compiler.getEnv()._print_symbols) {
             return;
         }
 
         @SuppressWarnings("resource")
-        final PrintWriter out = compiler.getContext().getErr();
+        final PrintWriter out = compiler.getEnv().getErr();
         out.println("[BLOCK in '" + ident + "']");
         if (!block.printSymbols(out)) {
             out.println("<no symbols>");
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CompilationPhase.java b/nashorn/src/jdk/nashorn/internal/codegen/CompilationPhase.java
index 031b87988da..e22454cc459 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/CompilationPhase.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CompilationPhase.java
@@ -24,8 +24,8 @@ import jdk.nashorn.internal.ir.ReferenceNode;
 import jdk.nashorn.internal.ir.visitor.NodeVisitor;
 import jdk.nashorn.internal.ir.debug.ASTWriter;
 import jdk.nashorn.internal.ir.debug.PrintVisitor;
-import jdk.nashorn.internal.runtime.Context;
 import jdk.nashorn.internal.runtime.ECMAErrors;
+import jdk.nashorn.internal.runtime.ScriptEnvironment;
 import jdk.nashorn.internal.runtime.Timing;
 
 /**
@@ -153,15 +153,15 @@ enum CompilationPhase {
     ATTRIBUTION_PHASE(EnumSet.of(INITIALIZED, CONSTANT_FOLDED, LOWERED), ATTR) {
         @Override
         void transform(final Compiler compiler, final FunctionNode fn) {
-            final Context context = compiler.getContext();
+            final ScriptEnvironment env = compiler.getEnv();
 
-            fn.accept(new Attr(context));
-            if (context._print_lower_ast) {
-                context.getErr().println(new ASTWriter(fn));
+            fn.accept(new Attr());
+            if (env._print_lower_ast) {
+                env.getErr().println(new ASTWriter(fn));
             }
 
-            if (context._print_lower_parse) {
-                context.getErr().println(new PrintVisitor(fn));
+            if (env._print_lower_parse) {
+                env.getErr().println(new PrintVisitor(fn));
            }
         }
 
@@ -232,7 +232,7 @@ enum CompilationPhase {
     BYTECODE_GENERATION_PHASE(EnumSet.of(INITIALIZED, CONSTANT_FOLDED, LOWERED, ATTR, SPLIT, FINALIZED), EMITTED) {
         @Override
         void transform(final Compiler compiler, final FunctionNode fn) {
-            final Context context = compiler.getContext();
+            final ScriptEnvironment env = compiler.getEnv();
 
             try {
                 final CodeGenerator codegen = new CodeGenerator(compiler);
@@ -240,10 +240,10 @@ enum CompilationPhase {
                 codegen.generateScopeCalls();
 
             } catch (final VerifyError e) {
-                if (context._verify_code || context._print_code) {
-                    context.getErr().println(e.getClass().getSimpleName() + ": " + e.getMessage());
-                    if (context._dump_on_error) {
-                        e.printStackTrace(context.getErr());
+                if (env._verify_code || env._print_code) {
+                    env.getErr().println(e.getClass().getSimpleName() + ": " + e.getMessage());
+                    if (env._dump_on_error) {
+                        e.printStackTrace(env.getErr());
                     }
                 } else {
                     throw e;
@@ -262,22 +262,22 @@ enum CompilationPhase {
                 compiler.addClass(className, bytecode);
 
                 //should could be printed to stderr for generate class?
-                if (context._print_code) {
+                if (env._print_code) {
                     final StringBuilder sb = new StringBuilder();
                     sb.append("class: " + className).
                         append('\n').
                         append(ClassEmitter.disassemble(bytecode)).
                         append("=====");
-                    context.getErr().println(sb);
+                    env.getErr().println(sb);
                 }
 
                 //should we verify the generated code?
-                if (context._verify_code) {
-                    context.verify(bytecode);
+                if (env._verify_code) {
+                    compiler.getCodeInstaller().verify(bytecode);
                 }
 
                 //should code be dumped to disk - only valid in compile_only mode?
-                if (context._dest_dir != null && context._compile_only) {
+                if (env._dest_dir != null && env._compile_only) {
                     final String fileName = className.replace('.', File.separatorChar) + ".class";
                     final int    index    = fileName.lastIndexOf(File.separatorChar);
 
@@ -287,7 +287,7 @@ enum CompilationPhase {
                             if (!dir.exists() && !dir.mkdirs()) {
                                 throw new IOException(dir.toString());
                             }
-                            final File file = new File(context._dest_dir, fileName);
+                            final File file = new File(env._dest_dir, fileName);
                             try (final FileOutputStream fos = new FileOutputStream(file)) {
                                 fos.write(bytecode);
                             }
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java b/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
index 7a9a300dee3..0996f1f5193 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
@@ -51,8 +51,8 @@ import jdk.nashorn.internal.codegen.types.Type;
 import jdk.nashorn.internal.ir.FunctionNode;
 import jdk.nashorn.internal.ir.FunctionNode.CompilationState;
 import jdk.nashorn.internal.runtime.CodeInstaller;
-import jdk.nashorn.internal.runtime.Context;
 import jdk.nashorn.internal.runtime.DebugLogger;
+import jdk.nashorn.internal.runtime.ScriptEnvironment;
 import jdk.nashorn.internal.runtime.Source;
 import jdk.nashorn.internal.runtime.Timing;
 import jdk.nashorn.internal.runtime.options.Options;
@@ -83,13 +83,13 @@ public final class Compiler {
 
     private final CompilationSequence sequence;
 
-    private final Context context;
+    private final ScriptEnvironment env;
 
     private final String scriptName;
 
     private boolean strict;
 
-    private CodeInstaller<Context> installer;
+    private CodeInstaller<ScriptEnvironment> installer;
 
     /** logger for compiler, trampolines, splits and related code generation events
      *  that affect classes */
@@ -190,14 +190,14 @@ public final class Compiler {
     /**
      * Constructor
      *
-     * @param installer    code installer from
+     * @param installer    code installer
      * @param functionNode function node (in any available {@link CompilationState}) to compile
      * @param sequence     {@link Compiler#CompilationSequence} of {@link CompilationPhase}s to apply as this compilation
      * @param strict       should this compilation use strict mode semantics
      */
     //TODO support an array of FunctionNodes for batch lazy compilation
-    Compiler(final Context context, final CodeInstaller<Context> installer, final FunctionNode functionNode, final CompilationSequence sequence, final boolean strict) {
-        this.context       = context;
+    Compiler(final ScriptEnvironment env, final CodeInstaller<ScriptEnvironment> installer, final FunctionNode functionNode, final CompilationSequence sequence, final boolean strict) {
+        this.env           = env;
         this.functionNode  = functionNode;
         this.sequence      = sequence;
         this.installer     = installer;
@@ -222,32 +222,32 @@ public final class Compiler {
     /**
      * Constructor
      *
-     * @param installer    code installer from context
+     * @param installer    code installer
      * @param functionNode function node (in any available {@link CompilationState}) to compile
      * @param strict       should this compilation use strict mode semantics
      */
-    public Compiler(final CodeInstaller<Context> installer, final FunctionNode functionNode, final boolean strict) {
+    public Compiler(final CodeInstaller<ScriptEnvironment> installer, final FunctionNode functionNode, final boolean strict) {
         this(installer.getOwner(), installer, functionNode, SEQUENCE_DEFAULT, strict);
     }
 
     /**
-     * Constructor - compilation will use the same strict semantics as context
+     * Constructor - compilation will use the same strict semantics as in script environment
      *
-     * @param installer    code installer from context
+     * @param installer    code installer
      * @param functionNode function node (in any available {@link CompilationState}) to compile
      */
-    public Compiler(final CodeInstaller<Context> installer, final FunctionNode functionNode) {
+    public Compiler(final CodeInstaller<ScriptEnvironment> installer, final FunctionNode functionNode) {
         this(installer.getOwner(), installer, functionNode, SEQUENCE_DEFAULT, installer.getOwner()._strict);
     }
 
     /**
-     * Constructor - compilation needs no installer, but uses a context
+     * Constructor - compilation needs no installer, but uses a script environment
      * Used in "compile only" scenarios
-     * @param context a context
+     * @param env a script environment
      * @param functionNode functionNode to compile
      */
-    public Compiler(final Context context, final FunctionNode functionNode) {
-        this(context, null, functionNode, SEQUENCE_DEFAULT, context._strict);
+    public Compiler(final ScriptEnvironment env, final FunctionNode functionNode) {
+        this(env, null, functionNode, SEQUENCE_DEFAULT, env._strict);
     }
 
     /**
@@ -345,7 +345,7 @@ public final class Compiler {
         return constantData;
     }
 
-    CodeInstaller<Context> getCodeInstaller() {
+    CodeInstaller<ScriptEnvironment> getCodeInstaller() {
         return installer;
     }
 
@@ -357,8 +357,8 @@ public final class Compiler {
         bytecode.put(name, code);
     }
 
-    Context getContext() {
-        return this.context;
+    ScriptEnvironment getEnv() {
+        return this.env;
     }
 
     private static String safeSourceName(final Source source) {
@@ -403,7 +403,7 @@ public final class Compiler {
     }
 
     private CompileUnit initCompileUnit(final String unitClassName, final long initialWeight) {
-        final ClassEmitter classEmitter = new ClassEmitter(context, functionNode.getSource().getName(), unitClassName, strict);
+        final ClassEmitter classEmitter = new ClassEmitter(env, functionNode.getSource().getName(), unitClassName, strict);
         final CompileUnit  compileUnit  = new CompileUnit(unitClassName, classEmitter, initialWeight);
 
         classEmitter.begin();
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java b/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java
index 661ee746054..4cd0f5246b5 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/MethodEmitter.java
@@ -84,10 +84,10 @@ import jdk.nashorn.internal.ir.RuntimeNode;
 import jdk.nashorn.internal.ir.SplitNode;
 import jdk.nashorn.internal.ir.Symbol;
 import jdk.nashorn.internal.runtime.ArgumentSetter;
-import jdk.nashorn.internal.runtime.Context;
 import jdk.nashorn.internal.runtime.DebugLogger;
 import jdk.nashorn.internal.runtime.JSType;
 import jdk.nashorn.internal.runtime.Scope;
+import jdk.nashorn.internal.runtime.ScriptEnvironment;
 import jdk.nashorn.internal.runtime.ScriptObject;
 import jdk.nashorn.internal.runtime.linker.Bootstrap;
 import jdk.nashorn.internal.runtime.options.Options;
@@ -121,8 +121,8 @@ public class MethodEmitter implements Emitter {
     /** SplitNode representing the current split, or null if none exists */
     private SplitNode splitNode;
 
-    /** The context */
-    private final Context context;
+    /** The script environment */
+    private final ScriptEnvironment env;
 
     /** Threshold in chars for when string constants should be split */
     static final int LARGE_STRING_THRESHOLD = 32 * 1024;
@@ -171,7 +171,7 @@ public class MethodEmitter implements Emitter {
      * @param functionNode a function node representing this method
      */
     MethodEmitter(final ClassEmitter classEmitter, final MethodVisitor method, final FunctionNode functionNode) {
-        this.context      = classEmitter.getContext();
+        this.env          = classEmitter.getEnv();
         this.classEmitter = classEmitter;
         this.method       = method;
         this.functionNode = functionNode;
@@ -2237,7 +2237,7 @@ public class MethodEmitter implements Emitter {
                 sb.append(' ');
             }
 
-            if (context != null) { //early bootstrap code doesn't have inited context yet
+            if (env != null) { //early bootstrap code doesn't have inited context yet
                 LOG.info(sb.toString());
                 if (DEBUG_TRACE_LINE == linePrefix) {
                     new Throwable().printStackTrace(LOG.getOutputStream());
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/ObjectClassGenerator.java b/nashorn/src/jdk/nashorn/internal/codegen/ObjectClassGenerator.java
index 25175db821a..e70d2952895 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/ObjectClassGenerator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/ObjectClassGenerator.java
@@ -53,6 +53,7 @@ import jdk.nashorn.internal.runtime.DebugLogger;
 import jdk.nashorn.internal.runtime.FunctionScope;
 import jdk.nashorn.internal.runtime.JSType;
 import jdk.nashorn.internal.runtime.PropertyMap;
+import jdk.nashorn.internal.runtime.ScriptEnvironment;
 import jdk.nashorn.internal.runtime.ScriptObject;
 import jdk.nashorn.internal.runtime.ScriptRuntime;
 import jdk.nashorn.internal.runtime.options.Options;
@@ -369,7 +370,7 @@ public final class ObjectClassGenerator {
      * @return Open class emitter.
      */
     private ClassEmitter newClassEmitter(final String className, final String superName) {
-        final ClassEmitter classEmitter = new ClassEmitter(context, className, superName);
+        final ClassEmitter classEmitter = new ClassEmitter(context.getEnv(), className, superName);
         classEmitter.begin();
 
         return classEmitter;
@@ -468,12 +469,13 @@ public final class ObjectClassGenerator {
         classEmitter.end();
 
         final byte[] code = classEmitter.toByteArray();
+        final ScriptEnvironment env = context.getEnv();
 
-        if (context != null && context._print_code) {
-            Context.getCurrentErr().println(ClassEmitter.disassemble(code));
+        if (env._print_code) {
+            env.getErr().println(ClassEmitter.disassemble(code));
         }
 
-        if (context != null && context._verify_code) {
+        if (env._verify_code) {
             context.verify(code);
         }
 
diff --git a/nashorn/src/jdk/nashorn/internal/ir/debug/JSONWriter.java b/nashorn/src/jdk/nashorn/internal/ir/debug/JSONWriter.java
index bb42e30320c..68fb68b024b 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/debug/JSONWriter.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/debug/JSONWriter.java
@@ -68,6 +68,7 @@ import jdk.nashorn.internal.parser.Parser;
 import jdk.nashorn.internal.parser.TokenType;
 import jdk.nashorn.internal.runtime.Context;
 import jdk.nashorn.internal.runtime.ParserException;
+import jdk.nashorn.internal.runtime.ScriptEnvironment;
 import jdk.nashorn.internal.runtime.Source;
 
 /**
@@ -77,14 +78,14 @@ public final class JSONWriter extends NodeVisitor {
     /**
      * Returns AST as JSON compatible string.
      *
-     * @param context nashorn context to use
+     * @param env  script environment to use
      * @param code code to be parsed
      * @param name name of the code source (used for location)
      * @param includeLoc tells whether to include location information for nodes or not
      * @return JSON string representation of AST of the supplied code
      */
-    public static String parse(final Context context, final String code, final String name, final boolean includeLoc) {
-        final Parser       parser     = new Parser(context, new Source(name, code), new Context.ThrowErrorManager(), context._strict);
+    public static String parse(final ScriptEnvironment env, final String code, final String name, final boolean includeLoc) {
+        final Parser       parser     = new Parser(env, new Source(name, code), new Context.ThrowErrorManager(), env._strict);
         final JSONWriter   jsonWriter = new JSONWriter(includeLoc);
         try {
             final FunctionNode functionNode = parser.parse(CompilerConstants.RUN_SCRIPT.tag());
diff --git a/nashorn/src/jdk/nashorn/internal/objects/Global.java b/nashorn/src/jdk/nashorn/internal/objects/Global.java
index ed3973f3d8f..9f297bfd4bb 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/Global.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/Global.java
@@ -48,7 +48,7 @@ import jdk.nashorn.internal.runtime.GlobalFunctions;
 import jdk.nashorn.internal.runtime.GlobalObject;
 import jdk.nashorn.internal.runtime.JSType;
 import jdk.nashorn.internal.runtime.NativeJavaPackage;
-import jdk.nashorn.internal.runtime.OptionsObject;
+import jdk.nashorn.internal.runtime.ScriptEnvironment;
 import jdk.nashorn.internal.runtime.PropertyDescriptor;
 import jdk.nashorn.internal.runtime.regexp.RegExpResult;
 import jdk.nashorn.internal.runtime.Scope;
@@ -364,7 +364,7 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
          */
         this.setMap(getMap().duplicate());
 
-        final int cacheSize = context._class_cache_size;
+        final int cacheSize = context.getEnv()._class_cache_size;
         if (cacheSize > 0) {
             classCache = new ClassCache(cacheSize);
         }
@@ -383,6 +383,15 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
         return (Global)global;
     }
 
+    /**
+     * Script access to {@link ScriptEnvironment}
+     *
+     * @return the script environment
+     */
+    static ScriptEnvironment getEnv() {
+        return instance().context.getEnv();
+    }
+
     /**
      * Script access to {@link Context}
      *
@@ -398,7 +407,7 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
      * @return true if strict mode enabled in {@link Global#getThisContext()}
      */
     static boolean isStrict() {
-        return getThisContext()._strict;
+        return getEnv()._strict;
     }
 
     // GlobalObject interface implementation
@@ -578,7 +587,7 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
     public PropertyDescriptor newAccessorDescriptor(final Object get, final Object set, final boolean configurable, final boolean enumerable) {
         final AccessorPropertyDescriptor desc = new AccessorPropertyDescriptor(configurable, enumerable, get == null ? UNDEFINED : get, set == null ? UNDEFINED : set);
 
-        final boolean strict = context._strict;
+        final boolean strict = context.getEnv()._strict;
 
         if (get == null) {
             desc.delete(PropertyDescriptor.GET, strict);
@@ -1333,6 +1342,7 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
     private void init() {
         assert Context.getGlobal() == this : "this global is not set as current";
 
+        final ScriptEnvironment env = context.getEnv();
         // initialize Function and Object constructor
         initFunctionAndObject();
 
@@ -1352,7 +1362,7 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
         this.decodeURIComponent = ScriptFunctionImpl.makeFunction("decodeURIComponent", GlobalFunctions.DECODE_URICOMPONENT);
         this.escape             = ScriptFunctionImpl.makeFunction("escape",     GlobalFunctions.ESCAPE);
         this.unescape           = ScriptFunctionImpl.makeFunction("unescape",   GlobalFunctions.UNESCAPE);
-        this.print              = ScriptFunctionImpl.makeFunction("print",      context._print_no_newline ? PRINT : PRINTLN);
+        this.print              = ScriptFunctionImpl.makeFunction("print",      env._print_no_newline ? PRINT : PRINTLN);
         this.load               = ScriptFunctionImpl.makeFunction("load",       LOAD);
         this.exit               = ScriptFunctionImpl.makeFunction("exit",       EXIT);
         this.quit               = ScriptFunctionImpl.makeFunction("quit",       EXIT);
@@ -1395,7 +1405,7 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
 
         initTypedArray();
 
-        if (context._scripting) {
+        if (env._scripting) {
             initScripting();
         }
 
@@ -1411,11 +1421,11 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
         this.__LINE__ = 0.0;
 
         // expose script (command line) arguments as "arguments" property of global
-        final List<String> arguments = context.getOptions().getArguments();
+        final List<String> arguments = env.getArguments();
         final Object argsObj = wrapAsObject(arguments.toArray());
 
         addOwnProperty("arguments", Attribute.NOT_ENUMERABLE, argsObj);
-        if (context._scripting) {
+        if (env._scripting) {
             // synonym for "arguments" in scripting mode
             addOwnProperty("$ARG", Attribute.NOT_ENUMERABLE, argsObj);
         }
@@ -1493,7 +1503,7 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
         addOwnProperty("echo", Attribute.NOT_ENUMERABLE, value);
 
         // Nashorn extension: global.$OPTIONS (scripting-mode-only)
-        value = new OptionsObject(context);
+        value = context.getEnv();
         addOwnProperty("$OPTIONS", Attribute.NOT_ENUMERABLE, value);
 
         // Nashorn extension: global.$ENV (scripting-mode-only)
@@ -1568,7 +1578,7 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
 
     @SuppressWarnings("resource")
     private static Object printImpl(final boolean newLine, final Object... objects) {
-        final PrintWriter out = Global.getThisContext().getOut();
+        final PrintWriter out = Global.getEnv().getOut();
 
         boolean first = true;
         for (final Object object : objects) {
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeDate.java b/nashorn/src/jdk/nashorn/internal/objects/NativeDate.java
index 893e5d2ec04..c4bf8e54691 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeDate.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeDate.java
@@ -40,8 +40,8 @@ import jdk.nashorn.internal.objects.annotations.ScriptClass;
 import jdk.nashorn.internal.objects.annotations.SpecializedConstructor;
 import jdk.nashorn.internal.objects.annotations.Where;
 import jdk.nashorn.internal.runtime.ConsString;
-import jdk.nashorn.internal.runtime.Context;
 import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.ScriptEnvironment;
 import jdk.nashorn.internal.runtime.ScriptFunction;
 import jdk.nashorn.internal.runtime.ScriptObject;
 import jdk.nashorn.internal.runtime.ScriptRuntime;
@@ -104,10 +104,10 @@ public final class NativeDate extends ScriptObject {
     }
 
     NativeDate(final double time) {
-        final Context context = Global.getThisContext();
+        final ScriptEnvironment env = Global.getEnv();
 
         this.time = time;
-        this.timezone = context.getTimeZone();
+        this.timezone = env._timezone;
         this.setProto(Global.instance().getDatePrototype());
     }
 
@@ -886,7 +886,7 @@ public final class NativeDate extends ScriptObject {
             if (fields[DateParser.TIMEZONE] != null) {
                 d -= fields[DateParser.TIMEZONE] * 60000;
             } else {
-                d = utc(d, Global.getThisContext().getTimeZone());
+                d = utc(d, Global.getEnv()._timezone);
             }
             d = timeClip(d);
             return d;
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeString.java b/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
index e6b72579c00..1df4649757e 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
@@ -641,7 +641,7 @@ public final class NativeString extends ScriptObject {
     public static Object localeCompare(final Object self, final Object that) {
 
         final String   str      = checkObjectToString(self);
-        final Collator collator = Collator.getInstance(Global.getThisContext().getLocale());
+        final Collator collator = Collator.getInstance(Global.getEnv()._locale);
 
         collator.setStrength(Collator.IDENTICAL);
         collator.setDecomposition(Collator.CANONICAL_DECOMPOSITION);
@@ -996,7 +996,7 @@ public final class NativeString extends ScriptObject {
      */
     @Function(attributes = Attribute.NOT_ENUMERABLE)
     public static Object toLocaleLowerCase(final Object self) {
-        return checkObjectToString(self).toLowerCase(Global.getThisContext().getLocale());
+        return checkObjectToString(self).toLowerCase(Global.getEnv()._locale);
     }
 
     /**
@@ -1016,7 +1016,7 @@ public final class NativeString extends ScriptObject {
      */
     @Function(attributes = Attribute.NOT_ENUMERABLE)
     public static Object toLocaleUpperCase(final Object self) {
-        return checkObjectToString(self).toUpperCase(Global.getThisContext().getLocale());
+        return checkObjectToString(self).toUpperCase(Global.getEnv()._locale);
     }
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionTrampolineImpl.java b/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionTrampolineImpl.java
index fa2bc2b129a..27229b21f90 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionTrampolineImpl.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionTrampolineImpl.java
@@ -12,6 +12,7 @@ import jdk.nashorn.internal.codegen.types.Type;
 import jdk.nashorn.internal.ir.FunctionNode;
 import jdk.nashorn.internal.runtime.CodeInstaller;
 import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.runtime.ScriptEnvironment;
 import jdk.nashorn.internal.runtime.ScriptFunction;
 import jdk.nashorn.internal.runtime.ScriptFunctionData;
 import jdk.nashorn.internal.runtime.ScriptObject;
@@ -23,7 +24,7 @@ import jdk.nashorn.internal.runtime.ScriptObject;
  */
 public final class ScriptFunctionTrampolineImpl extends ScriptFunctionImpl {
 
-    private CodeInstaller<Context> installer;
+    private CodeInstaller<ScriptEnvironment> installer;
 
     /** Function node to lazily recompile when trampoline is hit */
     private FunctionNode functionNode;
@@ -37,7 +38,7 @@ public final class ScriptFunctionTrampolineImpl extends ScriptFunctionImpl {
      * @param scope        scope
      * @param allocator    allocator
      */
-    public ScriptFunctionTrampolineImpl(final CodeInstaller<Context> installer, final FunctionNode functionNode, final ScriptFunctionData data, final ScriptObject scope, final MethodHandle allocator) {
+    public ScriptFunctionTrampolineImpl(final CodeInstaller<ScriptEnvironment> installer, final FunctionNode functionNode, final ScriptFunctionData data, final ScriptObject scope, final MethodHandle allocator) {
         super(null, data, scope, allocator);
 
         this.installer    = installer;
diff --git a/nashorn/src/jdk/nashorn/internal/parser/Parser.java b/nashorn/src/jdk/nashorn/internal/parser/Parser.java
index aa12d7a95b5..41149e4b9f6 100644
--- a/nashorn/src/jdk/nashorn/internal/parser/Parser.java
+++ b/nashorn/src/jdk/nashorn/internal/parser/Parser.java
@@ -101,6 +101,7 @@ import jdk.nashorn.internal.runtime.DebugLogger;
 import jdk.nashorn.internal.runtime.ErrorManager;
 import jdk.nashorn.internal.runtime.JSErrorType;
 import jdk.nashorn.internal.runtime.ParserException;
+import jdk.nashorn.internal.runtime.ScriptEnvironment;
 import jdk.nashorn.internal.runtime.ScriptingFunctions;
 import jdk.nashorn.internal.runtime.Source;
 import jdk.nashorn.internal.runtime.Timing;
@@ -109,8 +110,8 @@ import jdk.nashorn.internal.runtime.Timing;
  * Builds the IR.
  */
 public class Parser extends AbstractParser {
-    /** Current context. */
-    private final Context context;
+    /** Current script environment. */
+    private final ScriptEnvironment env;
 
     /** Is scripting mode. */
     private final boolean scripting;
@@ -132,27 +133,27 @@ public class Parser extends AbstractParser {
     /**
      * Constructor
      *
-     * @param context parser context
+     * @param env     script environment
      * @param source  source to parse
      * @param errors  error manager
      */
-    public Parser(final Context context, final Source source, final ErrorManager errors) {
-        this(context, source, errors, context._strict);
+    public Parser(final ScriptEnvironment env, final Source source, final ErrorManager errors) {
+        this(env, source, errors, env._strict);
     }
 
     /**
      * Construct a parser.
      *
-     * @param context parser context
+     * @param env     script environment
      * @param source  source to parse
      * @param errors  error manager
      * @param strict  parser created with strict mode enabled.
      */
-    public Parser(final Context context, final Source source, final ErrorManager errors, final boolean strict) {
+    public Parser(final ScriptEnvironment env, final Source source, final ErrorManager errors, final boolean strict) {
         super(source, errors, strict);
-        this.context   = context;
-        this.namespace = new Namespace(context.getNamespace());
-        this.scripting = context._scripting;
+        this.env   = env;
+        this.namespace = new Namespace(env.getNamespace());
+        this.scripting = env._scripting;
     }
 
     /**
@@ -184,7 +185,7 @@ public class Parser extends AbstractParser {
 
         try {
             stream = new TokenStream();
-            lexer  = new Lexer(source, stream, scripting && !context._no_syntax_extensions);
+            lexer  = new Lexer(source, stream, scripting && !env._no_syntax_extensions);
 
             // Set up first token (skips opening EOL.)
             k = -1;
@@ -209,8 +210,8 @@ public class Parser extends AbstractParser {
                 errors.error(message);
             }
 
-            if (context._dump_on_error) {
-                e.printStackTrace(context.getErr());
+            if (env._dump_on_error) {
+                e.printStackTrace(env.getErr());
             }
 
             return null;
@@ -246,8 +247,8 @@ public class Parser extends AbstractParser {
                 errors.error(message);
             }
 
-            if (context._dump_on_error) {
-                e.printStackTrace(context.getErr());
+            if (env._dump_on_error) {
+                e.printStackTrace(env.getErr());
             }
         }
 
@@ -430,7 +431,7 @@ loop:
             if (!(lhs instanceof AccessNode ||
                   lhs instanceof IndexNode ||
                   lhs instanceof IdentNode)) {
-                if (context._early_lvalue_error) {
+                if (env._early_lvalue_error) {
                     error(JSErrorType.REFERENCE_ERROR, AbstractParser.message("invalid.lvalue"), lhs.getToken());
                 }
                 return referenceError(lhs, rhs);
@@ -1018,7 +1019,7 @@ loop:
      * Parse an empty statement.
      */
     private void emptyStatement() {
-        if (context._empty_statements) {
+        if (env._empty_statements) {
             block.addStatement(new EmptyNode(source, token,
                     Token.descPosition(token) + Token.descLength(token)));
         }
@@ -1126,7 +1127,7 @@ loop:
 
             // Nashorn extension: for each expression.
             // iterate property values rather than property names.
-            if (!context._no_syntax_extensions && type == IDENT && "each".equals(getValue())) {
+            if (!env._no_syntax_extensions && type == IDENT && "each".equals(getValue())) {
                 forNode.setIsForEach();
                 next();
             }
@@ -2416,7 +2417,7 @@ loop:
         // The object literal following the "new Constructor()" expresssion
         // is passed as an additional (last) argument to the constructor.
 
-        if (!context._no_syntax_extensions && type == LBRACE) {
+        if (!env._no_syntax_extensions && type == LBRACE) {
             arguments.add(objectLiteral());
         }
 
@@ -2572,7 +2573,7 @@ loop:
             verifyStrictIdent(name, "function name");
         } else if (isStatement) {
             // Nashorn extension: anonymous function statements
-            if (context._no_syntax_extensions || !context._anon_functions) {
+            if (env._no_syntax_extensions || !env._anon_functions) {
                 expect(IDENT);
             }
         }
@@ -2710,7 +2711,7 @@ loop:
             functionNode.setFirstToken(firstToken);
 
             // Nashorn extension: expression closures
-            if (!context._no_syntax_extensions && type != LBRACE) {
+            if (!env._no_syntax_extensions && type != LBRACE) {
                 /*
                  * Example:
                  *
@@ -3072,7 +3073,7 @@ loop:
      * Add a line number node at current position
      */
     private LineNumberNode lineNumber() {
-        if (context._debug_lines) {
+        if (env._debug_lines) {
             return new LineNumberNode(source, token, line);
         }
         return null;
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/CodeInstaller.java b/nashorn/src/jdk/nashorn/internal/runtime/CodeInstaller.java
index 3ec272a8eb9..4622f3f0121 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/CodeInstaller.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/CodeInstaller.java
@@ -51,4 +51,13 @@ public interface CodeInstaller<T> {
      * @return the installed class
      */
     public Class<?> install(final String className, final byte[] bytecode);
+
+    /*
+     * Verify generated bytecode before emission. This is called back from the
+     * {@link ClassEmitter} or the {@link Compiler}. If the "--verify-code" parameter
+     * hasn't been given, this is a nop
+     *
+     * @param bytecode bytecode to verify
+     */
+    public void verify(final byte[] code);
 }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Context.java b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
index 2d4b1648673..9145d9fc294 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/Context.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
@@ -43,22 +43,15 @@ import java.security.AccessController;
 import java.security.CodeSigner;
 import java.security.CodeSource;
 import java.security.PrivilegedAction;
-import java.util.Locale;
-import java.util.TimeZone;
 import jdk.internal.org.objectweb.asm.ClassReader;
 import jdk.internal.org.objectweb.asm.util.CheckClassAdapter;
-import jdk.nashorn.internal.codegen.ClassEmitter;
 import jdk.nashorn.internal.codegen.Compiler;
-import jdk.nashorn.internal.codegen.Namespace;
 import jdk.nashorn.internal.codegen.ObjectClassGenerator;
 import jdk.nashorn.internal.ir.FunctionNode;
 import jdk.nashorn.internal.ir.debug.ASTWriter;
 import jdk.nashorn.internal.ir.debug.PrintVisitor;
 import jdk.nashorn.internal.parser.Parser;
 import jdk.nashorn.internal.runtime.linker.JavaAdapterFactory;
-import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
-import jdk.nashorn.internal.runtime.options.KeyValueOption;
-import jdk.nashorn.internal.runtime.options.Option;
 import jdk.nashorn.internal.runtime.options.Options;
 import sun.reflect.Reflection;
 
@@ -71,7 +64,7 @@ public final class Context {
      * ContextCodeInstaller that has the privilege of installing classes in the Context.
      * Can only be instantiated from inside the context and is opaque to other classes
      */
-    public static class ContextCodeInstaller implements CodeInstaller<Context> {
+    public static class ContextCodeInstaller implements CodeInstaller<ScriptEnvironment> {
         private final Context      context;
         private final ScriptLoader loader;
         private final CodeSource   codeSource;
@@ -87,14 +80,19 @@ public final class Context {
          * @return context
          */
         @Override
-        public Context getOwner() {
-            return context;
+        public ScriptEnvironment getOwner() {
+            return context.env;
         }
 
         @Override
         public Class<?> install(final String className, final byte[] bytecode) {
             return loader.installClass(className, bytecode, codeSource);
         }
+
+        @Override
+        public void verify(final byte[] code) {
+            context.verify(code);
+        }
     }
 
     /** Is Context global debug mode enabled ? */
@@ -198,6 +196,12 @@ public final class Context {
         }
     }
 
+    /** Current environment. */
+    private final ScriptEnvironment env;
+
+    /** is this context in strict mode? Cached from env. as this is used heavily. */
+    public final boolean _strict;
+
     /** class loader to resolve classes from script. */
     private final ClassLoader  appLoader;
 
@@ -207,108 +211,12 @@ public final class Context {
     /** Class loader to load classes compiled from scripts. */
     private final ScriptLoader scriptLoader;
 
-    /** Top level namespace. */
-    private final Namespace namespace;
-
-    /** Current options. */
-    private final Options options;
-
     /** Current error manager. */
     private final ErrorManager errors;
 
-    /** Output writer for this context */
-    private final PrintWriter out;
-
-    /** Error writer for this context */
-    private final PrintWriter err;
-
-    /** Local for error messages */
-    private final Locale locale;
-
     /** Empty map used for seed map for JO$ objects */
     final PropertyMap emptyMap = PropertyMap.newEmptyMap(this);
 
-    // cache fields for "well known" options.
-    // see jdk.nashorn.internal.runtime.Resources
-
-    /** Always allow functions as statements */
-    public final boolean _anon_functions;
-
-    /** Size of the per-global Class cache size */
-    public final int     _class_cache_size;
-
-    /** Only compile script, do not run it or generate other ScriptObjects */
-    public final boolean _compile_only;
-
-    /** Accumulated callsite flags that will be used when boostrapping script callsites */
-    public final int     _callsite_flags;
-
-    /** Genereate line number table in class files */
-    public final boolean _debug_lines;
-
-    /** Package to which generated class files are added */
-    public final String  _dest_dir;
-
-    /** Display stack trace upon error, default is false */
-    public final boolean _dump_on_error;
-
-    /** Invalid lvalue expressions should be reported as early errors */
-    public final boolean _early_lvalue_error;
-
-    /** Empty statements should be preserved in the AST */
-    public final boolean _empty_statements;
-
-    /** Show full Nashorn version */
-    public final boolean _fullversion;
-
-    /** Create a new class loaded for each compilation */
-    public final boolean _loader_per_compile;
-
-    /** Do not support non-standard syntax extensions. */
-    public final boolean _no_syntax_extensions;
-
-    /** Package to which generated class files are added */
-    public final String  _package;
-
-    /** Only parse the source code, do not compile */
-    public final boolean _parse_only;
-
-    /** Print the AST before lowering */
-    public final boolean _print_ast;
-
-    /** Print the AST after lowering */
-    public final boolean _print_lower_ast;
-
-    /** Print resulting bytecode for script */
-    public final boolean _print_code;
-
-    /** Print function will no print newline characters */
-    public final boolean _print_no_newline;
-
-    /** Print AST in more human readable form */
-    public final boolean _print_parse;
-
-    /** Print AST in more human readable form after Lowering */
-    public final boolean _print_lower_parse;
-
-    /** print symbols and their contents for the script */
-    public final boolean _print_symbols;
-
-    /** is this context in scripting mode? */
-    public final boolean _scripting;
-
-    /** is this context in strict mode? */
-    public final boolean _strict;
-
-    /** print version info of Nashorn */
-    public final boolean _version;
-
-    /** should code verification be done of generated bytecode */
-    public final boolean _verify_code;
-
-    /** time zone for this context */
-    public final TimeZone _timezone;
-
     private static final ClassLoader myLoader = Context.class.getClassLoader();
     private static final StructureLoader sharedLoader;
 
@@ -362,6 +270,8 @@ public final class Context {
             sm.checkPermission(new RuntimePermission("createNashornContext"));
         }
 
+        this.env       = new ScriptEnvironment(options, out, err);
+        this._strict   = env._strict;
         this.appLoader = appLoader;
         this.scriptLoader = (ScriptLoader)AccessController.doPrivileged(
              new PrivilegedAction<ClassLoader>() {
@@ -371,73 +281,12 @@ public final class Context {
                     return new ScriptLoader(structureLoader, Context.this);
                 }
              });
-
-        this.namespace = new Namespace();
-        this.options   = options;
         this.errors    = errors;
-        this.locale    = Locale.getDefault();
-        this.out       = out;
-        this.err       = err;
-
-        _anon_functions       = options.getBoolean("anon.functions");
-        _class_cache_size     = options.getInteger("class.cache.size");
-        _compile_only         = options.getBoolean("compile.only");
-        _debug_lines          = options.getBoolean("debug.lines");
-        _dest_dir             = options.getString("d");
-        _dump_on_error        = options.getBoolean("doe");
-        _early_lvalue_error   = options.getBoolean("early.lvalue.error");
-        _empty_statements     = options.getBoolean("empty.statements");
-        _fullversion          = options.getBoolean("fullversion");
-        _loader_per_compile   = options.getBoolean("loader.per.compile");
-        _no_syntax_extensions = options.getBoolean("no.syntax.extensions");
-        _package              = options.getString("package");
-        _parse_only           = options.getBoolean("parse.only");
-        _print_ast            = options.getBoolean("print.ast");
-        _print_lower_ast      = options.getBoolean("print.lower.ast");
-        _print_code           = options.getBoolean("print.code");
-        _print_no_newline     = options.getBoolean("print.no.newline");
-        _print_parse          = options.getBoolean("print.parse");
-        _print_lower_parse    = options.getBoolean("print.lower.parse");
-        _print_symbols        = options.getBoolean("print.symbols");
-        _scripting            = options.getBoolean("scripting");
-        _strict               = options.getBoolean("strict");
-        _version              = options.getBoolean("version");
-        _verify_code          = options.getBoolean("verify.code");
-
-        int callSiteFlags = 0;
-        if (options.getBoolean("profile.callsites")) {
-            callSiteFlags |= NashornCallSiteDescriptor.CALLSITE_PROFILE;
-        }
-
-        if (options.get("trace.callsites") instanceof KeyValueOption) {
-            callSiteFlags |= NashornCallSiteDescriptor.CALLSITE_TRACE;
-            final KeyValueOption kv = (KeyValueOption)options.get("trace.callsites");
-            if (kv.hasValue("miss")) {
-                callSiteFlags |= NashornCallSiteDescriptor.CALLSITE_TRACE_MISSES;
-            }
-            if (kv.hasValue("enterexit") || (callSiteFlags & NashornCallSiteDescriptor.CALLSITE_TRACE_MISSES) == 0) {
-                callSiteFlags |= NashornCallSiteDescriptor.CALLSITE_TRACE_ENTEREXIT;
-            }
-            if (kv.hasValue("objects")) {
-                callSiteFlags |= NashornCallSiteDescriptor.CALLSITE_TRACE_VALUES;
-            }
-            if (kv.hasValue("scope")) {
-                callSiteFlags |= NashornCallSiteDescriptor.CALLSITE_TRACE_SCOPE;
-            }
-        }
-        this._callsite_flags = callSiteFlags;
-
-        final Option<?> option = options.get("timezone");
-        if (option != null) {
-            this._timezone = (TimeZone)option.getValue();
-        } else {
-            this._timezone  = TimeZone.getDefault();
-        }
 
         // if user passed -classpath option, make a class loader with that and set it as
         // thread context class loader so that script can access classes from that path.
         final String classPath = options.getString("classpath");
-        if (! _compile_only && classPath != null && !classPath.isEmpty()) {
+        if (! env._compile_only && classPath != null && !classPath.isEmpty()) {
             // make sure that caller can create a class loader.
             if (sm != null) {
                 sm.checkPermission(new RuntimePermission("createClassLoader"));
@@ -448,11 +297,11 @@ public final class Context {
         }
 
         // print version info if asked.
-        if (_version) {
+        if (env._version) {
             getErr().println("nashorn " + Version.version());
         }
 
-        if (_fullversion) {
+        if (env._fullversion) {
             getErr().println("nashorn full version " + Version.fullVersion());
         }
     }
@@ -465,12 +314,20 @@ public final class Context {
         return errors;
     }
 
+    /**
+     * Get the script environment for this context
+     * @return script environment
+     */
+    public ScriptEnvironment getEnv() {
+        return env;
+    }
+
     /**
      * Get the output stream for this context
      * @return output print writer
      */
     public PrintWriter getOut() {
-        return out;
+        return env.getOut();
     }
 
     /**
@@ -478,39 +335,7 @@ public final class Context {
      * @return error print writer
      */
     public PrintWriter getErr() {
-        return err;
-    }
-
-    /**
-     * Get the namespace for this context
-     * @return namespace
-     */
-    public Namespace getNamespace() {
-        return namespace;
-    }
-
-    /**
-     * Get the options given to this context
-     * @return options
-     */
-    public Options getOptions() {
-        return options;
-    }
-
-    /**
-     * Get the locale for this context
-     * @return locale
-     */
-    public Locale getLocale() {
-        return locale;
-    }
-
-    /**
-     * Get the time zone for this context
-     * @return time zone
-     */
-    public TimeZone getTimeZone() {
-        return _timezone;
+        return env.getErr();
     }
 
     /**
@@ -739,7 +564,7 @@ public final class Context {
 
     /**
      * Verify generated bytecode before emission. This is called back from the
-     * {@link ClassEmitter} or the {@link Compiler}. If the "--verify-code" parameter
+     * {@link ObjectClassGenerator} or the {@link Compiler}. If the "--verify-code" parameter
      * hasn't been given, this is a nop
      *
      * Note that verification may load classes -- we don't want to do that unless
@@ -749,7 +574,7 @@ public final class Context {
      * @param bytecode bytecode to verify
      */
     public void verify(final byte[] bytecode) {
-        if (_verify_code) {
+        if (env._verify_code) {
             // No verification when security manager is around as verifier
             // may load further classes - which should be avoided.
             if (System.getSecurityManager() == null) {
@@ -792,7 +617,7 @@ public final class Context {
         }
 
         // Need only minimal global object, if we are just compiling.
-        if (!_compile_only) {
+        if (!env._compile_only) {
             final ScriptObject oldGlobal = Context.getGlobalTrusted();
             try {
                 Context.setGlobalTrusted(global);
@@ -902,7 +727,7 @@ public final class Context {
         GlobalObject global = null;
         Class<?> script;
 
-        if (_class_cache_size > 0) {
+        if (env._class_cache_size > 0) {
             global = (GlobalObject)Context.getGlobalTrusted();
             script = global.findCachedClass(source);
             if (script != null) {
@@ -910,23 +735,23 @@ public final class Context {
             }
         }
 
-        final FunctionNode functionNode = new Parser(this, source, errMan, strict).parse();
-        if (errors.hasErrors() || _parse_only) {
+        final FunctionNode functionNode = new Parser(env, source, errMan, strict).parse();
+        if (errors.hasErrors() || env._parse_only) {
             return null;
         }
 
-        if (_print_ast) {
+        if (env._print_ast) {
             getErr().println(new ASTWriter(functionNode));
         }
 
-        if (_print_parse) {
+        if (env._print_parse) {
             getErr().println(new PrintVisitor(functionNode));
         }
 
         final URL          url    = source.getURL();
-        final ScriptLoader loader = _loader_per_compile ? createNewLoader() : scriptLoader;
+        final ScriptLoader loader = env._loader_per_compile ? createNewLoader() : scriptLoader;
         final CodeSource   cs     = url == null ? null : new CodeSource(url, (CodeSigner[])null);
-        final CodeInstaller<Context> installer = new ContextCodeInstaller(this, loader, cs);
+        final CodeInstaller<ScriptEnvironment> installer = new ContextCodeInstaller(this, loader, cs);
 
         final Compiler compiler = new Compiler(installer, functionNode, strict);
 
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/JSONFunctions.java b/nashorn/src/jdk/nashorn/internal/runtime/JSONFunctions.java
index 675780b414d..ba486be8ac5 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/JSONFunctions.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/JSONFunctions.java
@@ -71,7 +71,7 @@ public final class JSONFunctions {
                 new Source("<json>", str),
                 new Context.ThrowErrorManager(),
                 (context != null) ?
-                    context._strict :
+                    context.getEnv()._strict :
                     false);
 
         Node node;
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/OptionsObject.java b/nashorn/src/jdk/nashorn/internal/runtime/OptionsObject.java
deleted file mode 100644
index 6436b862aac..00000000000
--- a/nashorn/src/jdk/nashorn/internal/runtime/OptionsObject.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.nashorn.internal.runtime;
-
-import java.util.TimeZone;
-
-/**
- * A convenience object to expose only command line options from a Context.
- */
-public final class OptionsObject {
-    /** Always allow functions as statements */
-    public final boolean _anon_functions;
-
-    /** Size of the per-global Class cache size */
-    public final int     _class_cache_size;
-
-    /** Only compile script, do not run it or generate other ScriptObjects */
-    public final boolean _compile_only;
-
-    /** Accumulated callsite flags that will be used when bootstrapping script callsites */
-    public final int     _callsite_flags;
-
-    /** Generate line number table in class files */
-    public final boolean _debug_lines;
-
-    /** Package to which generated class files are added */
-    public final String  _dest_dir;
-
-    /** Display stack trace upon error, default is false */
-    public final boolean _dump_on_error;
-
-    /** Invalid lvalue expressions should be reported as early errors */
-    public final boolean _early_lvalue_error;
-
-    /** Empty statements should be preserved in the AST */
-    public final boolean _empty_statements;
-
-    /** Show full Nashorn version */
-    public final boolean _fullversion;
-
-    /** Create a new class loaded for each compilation */
-    public final boolean _loader_per_compile;
-
-    /** Package to which generated class files are added */
-    public final String  _package;
-
-    /** Only parse the source code, do not compile */
-    public final boolean _parse_only;
-
-    /** Print the AST before lowering */
-    public final boolean _print_ast;
-
-    /** Print the AST after lowering */
-    public final boolean _print_lower_ast;
-
-    /** Print resulting bytecode for script */
-    public final boolean _print_code;
-
-    /** Print function will no print newline characters */
-    public final boolean _print_no_newline;
-
-    /** Print AST in more human readable form */
-    public final boolean _print_parse;
-
-    /** Print AST in more human readable form after Lowering */
-    public final boolean _print_lower_parse;
-
-    /** print symbols and their contents for the script */
-    public final boolean _print_symbols;
-
-    /** is this context in scripting mode? */
-    public final boolean _scripting;
-
-    /** is this context in strict mode? */
-    public final boolean _strict;
-
-    /** print version info of Nashorn */
-    public final boolean _version;
-
-    /** should code verification be done of generated bytecode */
-    public final boolean _verify_code;
-
-    /** time zone for this context */
-    public final TimeZone _timezone;
-
-    /**
-     * Constructor
-     *
-     * @param context a context
-     */
-    public OptionsObject(final Context context) {
-        this._anon_functions = context._anon_functions;
-        this._callsite_flags = context._callsite_flags;
-        this._class_cache_size = context._class_cache_size;
-        this._compile_only = context._compile_only;
-        this._debug_lines = context._debug_lines;
-        this._dest_dir = context._dest_dir;
-        this._dump_on_error = context._dump_on_error;
-        this._early_lvalue_error = context._early_lvalue_error;
-        this._empty_statements = context._empty_statements;
-        this._fullversion = context._fullversion;
-        this._loader_per_compile = context._loader_per_compile;
-        this._package = context._package;
-        this._parse_only = context._parse_only;
-        this._print_ast = context._print_ast;
-        this._print_code = context._print_code;
-        this._print_lower_ast = context._print_lower_ast;
-        this._print_lower_parse = context._print_lower_parse;
-        this._print_no_newline = context._print_no_newline;
-        this._print_parse = context._print_parse;
-        this._print_symbols = context._print_symbols;
-        this._scripting = context._scripting;
-        this._strict = context._strict;
-        this._timezone = context._timezone;
-        this._verify_code = context._verify_code;
-        this._version = context._version;
-    }
-}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptEnvironment.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptEnvironment.java
new file mode 100644
index 00000000000..def0313f948
--- /dev/null
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptEnvironment.java
@@ -0,0 +1,249 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+import java.io.PrintWriter;
+import java.util.List;
+import java.util.Locale;
+import java.util.TimeZone;
+import jdk.nashorn.internal.codegen.Namespace;
+import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
+import jdk.nashorn.internal.runtime.options.KeyValueOption;
+import jdk.nashorn.internal.runtime.options.Option;
+import jdk.nashorn.internal.runtime.options.Options;
+
+/**
+ * Script environment consists of command line options, arguments, script files
+ * and output and error writers, top level Namespace etc.
+ */
+public final class ScriptEnvironment {
+    /** Output writer for this environment */
+    private final PrintWriter out;
+
+    /** Error writer for this environment */
+    private final PrintWriter err;
+
+    /** Top level namespace. */
+    private final Namespace namespace;
+
+    /** Current Options object. */
+    private Options options;
+
+    /** Always allow functions as statements */
+    public final boolean _anon_functions;
+
+    /** Size of the per-global Class cache size */
+    public final int     _class_cache_size;
+
+    /** Only compile script, do not run it or generate other ScriptObjects */
+    public final boolean _compile_only;
+
+    /** Accumulated callsite flags that will be used when bootstrapping script callsites */
+    public final int     _callsite_flags;
+
+    /** Generate line number table in class files */
+    public final boolean _debug_lines;
+
+    /** Package to which generated class files are added */
+    public final String  _dest_dir;
+
+    /** Display stack trace upon error, default is false */
+    public final boolean _dump_on_error;
+
+    /** Invalid lvalue expressions should be reported as early errors */
+    public final boolean _early_lvalue_error;
+
+    /** Empty statements should be preserved in the AST */
+    public final boolean _empty_statements;
+
+    /** Show full Nashorn version */
+    public final boolean _fullversion;
+
+    /** Create a new class loaded for each compilation */
+    public final boolean _loader_per_compile;
+
+    /** Do not support non-standard syntax extensions. */
+    public final boolean _no_syntax_extensions;
+
+    /** Package to which generated class files are added */
+    public final String  _package;
+
+    /** Only parse the source code, do not compile */
+    public final boolean _parse_only;
+
+    /** Print the AST before lowering */
+    public final boolean _print_ast;
+
+    /** Print the AST after lowering */
+    public final boolean _print_lower_ast;
+
+    /** Print resulting bytecode for script */
+    public final boolean _print_code;
+
+    /** Print function will no print newline characters */
+    public final boolean _print_no_newline;
+
+    /** Print AST in more human readable form */
+    public final boolean _print_parse;
+
+    /** Print AST in more human readable form after Lowering */
+    public final boolean _print_lower_parse;
+
+    /** print symbols and their contents for the script */
+    public final boolean _print_symbols;
+
+    /** is this environment in scripting mode? */
+    public final boolean _scripting;
+
+    /** is this environment in strict mode? */
+    public final boolean _strict;
+
+    /** print version info of Nashorn */
+    public final boolean _version;
+
+    /** should code verification be done of generated bytecode */
+    public final boolean _verify_code;
+
+    /** time zone for this environment */
+    public final TimeZone _timezone;
+
+    /** Local for error messages */
+    public final Locale _locale;
+
+    /**
+     * Constructor
+     *
+     * @param options a Options object
+     * @param out output print writer
+     * @param err error print writer
+     */
+    ScriptEnvironment(final Options options, final PrintWriter out, final PrintWriter err) {
+        this.out = out;
+        this.err = err;
+        this.namespace = new Namespace();
+        this.options = options;
+
+        _anon_functions       = options.getBoolean("anon.functions");
+        _class_cache_size     = options.getInteger("class.cache.size");
+        _compile_only         = options.getBoolean("compile.only");
+        _debug_lines          = options.getBoolean("debug.lines");
+        _dest_dir             = options.getString("d");
+        _dump_on_error        = options.getBoolean("doe");
+        _early_lvalue_error   = options.getBoolean("early.lvalue.error");
+        _empty_statements     = options.getBoolean("empty.statements");
+        _fullversion          = options.getBoolean("fullversion");
+        _loader_per_compile   = options.getBoolean("loader.per.compile");
+        _no_syntax_extensions = options.getBoolean("no.syntax.extensions");
+        _package              = options.getString("package");
+        _parse_only           = options.getBoolean("parse.only");
+        _print_ast            = options.getBoolean("print.ast");
+        _print_lower_ast      = options.getBoolean("print.lower.ast");
+        _print_code           = options.getBoolean("print.code");
+        _print_no_newline     = options.getBoolean("print.no.newline");
+        _print_parse          = options.getBoolean("print.parse");
+        _print_lower_parse    = options.getBoolean("print.lower.parse");
+        _print_symbols        = options.getBoolean("print.symbols");
+        _scripting            = options.getBoolean("scripting");
+        _strict               = options.getBoolean("strict");
+        _version              = options.getBoolean("version");
+        _verify_code          = options.getBoolean("verify.code");
+
+        int callSiteFlags = 0;
+        if (options.getBoolean("profile.callsites")) {
+            callSiteFlags |= NashornCallSiteDescriptor.CALLSITE_PROFILE;
+        }
+
+        if (options.get("trace.callsites") instanceof KeyValueOption) {
+            callSiteFlags |= NashornCallSiteDescriptor.CALLSITE_TRACE;
+            final KeyValueOption kv = (KeyValueOption)options.get("trace.callsites");
+            if (kv.hasValue("miss")) {
+                callSiteFlags |= NashornCallSiteDescriptor.CALLSITE_TRACE_MISSES;
+            }
+            if (kv.hasValue("enterexit") || (callSiteFlags & NashornCallSiteDescriptor.CALLSITE_TRACE_MISSES) == 0) {
+                callSiteFlags |= NashornCallSiteDescriptor.CALLSITE_TRACE_ENTEREXIT;
+            }
+            if (kv.hasValue("objects")) {
+                callSiteFlags |= NashornCallSiteDescriptor.CALLSITE_TRACE_VALUES;
+            }
+            if (kv.hasValue("scope")) {
+                callSiteFlags |= NashornCallSiteDescriptor.CALLSITE_TRACE_SCOPE;
+            }
+        }
+        this._callsite_flags = callSiteFlags;
+
+        final Option<?> option = options.get("timezone");
+        if (option != null) {
+            this._timezone = (TimeZone)option.getValue();
+        } else {
+            this._timezone  = TimeZone.getDefault();
+        }
+
+        this._locale = Locale.getDefault();
+    }
+
+    /**
+     * Get the output stream for this environment
+     * @return output print writer
+     */
+    public PrintWriter getOut() {
+        return out;
+    }
+
+    /**
+     * Get the error stream for this environment
+     * @return error print writer
+     */
+    public PrintWriter getErr() {
+        return err;
+    }
+
+    /**
+     * Get the namespace for this environment
+     * @return namespace
+     */
+    public Namespace getNamespace() {
+        return namespace;
+    }
+
+    /**
+     * Return the JavaScript files passed to the program
+     *
+     * @return a list of files
+     */
+    public List<String> getFiles() {
+        return options.getFiles();
+    }
+
+    /**
+     * Return the user arguments to the program, i.e. those trailing "--" after
+     * the filename
+     *
+     * @return a list of user arguments
+     */
+    public List<String> getArguments() {
+        return options.getArguments();
+    }
+}
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java
index 2528dc5a17a..c6f5167c78a 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java
@@ -403,7 +403,7 @@ public final class ScriptRuntime {
      * @return JSON string representation of AST of the supplied code
      */
     public static String parse(final String code, final String name, final boolean includeLoc) {
-        return JSONWriter.parse(Context.getContextTrusted(), code, name, includeLoc);
+        return JSONWriter.parse(Context.getContextTrusted().getEnv(), code, name, includeLoc);
     }
 
     /**
diff --git a/nashorn/src/jdk/nashorn/tools/Shell.java b/nashorn/src/jdk/nashorn/tools/Shell.java
index d0cb2a6b97d..0c040a2cf8b 100644
--- a/nashorn/src/jdk/nashorn/tools/Shell.java
+++ b/nashorn/src/jdk/nashorn/tools/Shell.java
@@ -45,6 +45,7 @@ import jdk.nashorn.internal.ir.FunctionNode;
 import jdk.nashorn.internal.parser.Parser;
 import jdk.nashorn.internal.runtime.Context;
 import jdk.nashorn.internal.runtime.ErrorManager;
+import jdk.nashorn.internal.runtime.ScriptEnvironment;
 import jdk.nashorn.internal.runtime.ScriptFunction;
 import jdk.nashorn.internal.runtime.ScriptObject;
 import jdk.nashorn.internal.runtime.ScriptRuntime;
@@ -157,12 +158,13 @@ public class Shell {
         }
 
         final ScriptObject global = context.createGlobal();
-        final List<String> files = context.getOptions().getFiles();
+        final ScriptEnvironment env = context.getEnv();
+        final List<String> files = env.getFiles();
         if (files.isEmpty()) {
             return readEvalPrint(context, global);
         }
 
-        if (context._compile_only) {
+        if (env._compile_only) {
             return compileScripts(context, global, files);
         }
 
@@ -237,6 +239,7 @@ public class Shell {
     private static int compileScripts(final Context context, final ScriptObject global, final List<String> files) throws IOException {
         final ScriptObject oldGlobal = Context.getGlobal();
         final boolean globalChanged = (oldGlobal != global);
+        final ScriptEnvironment env = context.getEnv();
         try {
             if (globalChanged) {
                 Context.setGlobal(global);
@@ -245,18 +248,18 @@ public class Shell {
 
             // For each file on the command line.
             for (final String fileName : files) {
-                final FunctionNode functionNode = new Parser(context, new Source(fileName, new File(fileName)), errors).parse();
+                final FunctionNode functionNode = new Parser(env, new Source(fileName, new File(fileName)), errors).parse();
 
                 if (errors.getNumberOfErrors() != 0) {
                     return COMPILATION_ERROR;
                 }
 
                 //null - pass no code installer - this is compile only
-                new Compiler(context, functionNode).compile();
+                new Compiler(env, functionNode).compile();
             }
         } finally {
-            context.getOut().flush();
-            context.getErr().flush();
+            env.getOut().flush();
+            env.getErr().flush();
             if (globalChanged) {
                 Context.setGlobal(oldGlobal);
             }
@@ -296,7 +299,7 @@ public class Shell {
                     apply(script, global);
                 } catch (final NashornException e) {
                     errors.error(e.toString());
-                    if (context._dump_on_error) {
+                    if (context.getEnv()._dump_on_error) {
                         e.printStackTrace(context.getErr());
                     }
 
@@ -341,6 +344,7 @@ public class Shell {
         final PrintWriter err = context.getErr();
         final ScriptObject oldGlobal = Context.getGlobal();
         final boolean globalChanged = (oldGlobal != global);
+        final ScriptEnvironment env = context.getEnv();
 
         try {
             if (globalChanged) {
@@ -353,7 +357,7 @@ public class Shell {
                 context.eval(global, source.getString(), global, "<shell.js>", false);
             } catch (final Exception e) {
                 err.println(e);
-                if (context._dump_on_error) {
+                if (env._dump_on_error) {
                     e.printStackTrace(err);
                 }
 
@@ -377,10 +381,10 @@ public class Shell {
 
                 Object res;
                 try {
-                    res = context.eval(global, source, global, "<shell>", context._strict);
+                    res = context.eval(global, source, global, "<shell>", env._strict);
                 } catch (final Exception e) {
                     err.println(e);
-                    if (context._dump_on_error) {
+                    if (env._dump_on_error) {
                         e.printStackTrace(err);
                     }
                     continue;
diff --git a/nashorn/test/script/trusted/JDK-8006529.js b/nashorn/test/script/trusted/JDK-8006529.js
index b5d2643c928..da08d2b516b 100644
--- a/nashorn/test/script/trusted/JDK-8006529.js
+++ b/nashorn/test/script/trusted/JDK-8006529.js
@@ -42,6 +42,7 @@
 var Parser         = Java.type("jdk.nashorn.internal.parser.Parser")
 var Compiler       = Java.type("jdk.nashorn.internal.codegen.Compiler")
 var Context        = Java.type("jdk.nashorn.internal.runtime.Context")
+var ScriptEnvironment = Java.type("jdk.nashorn.internal.runtime.ScriptEnvironment")
 var Source         = Java.type("jdk.nashorn.internal.runtime.Source")
 var FunctionNode   = Java.type("jdk.nashorn.internal.ir.FunctionNode")
 
@@ -89,9 +90,9 @@ function getFirstFunction(functionNode) {
 // representing it.
 function compile(source) {
     var source   = new Source("<no name>", source);
-    var parser   = new Parser(Context.getContext(), source, null);
+    var parser   = new Parser(Context.getContext().getEnv(), source, null);
     var func     = parseMethod.invoke(parser);
-    var compiler = new Compiler(Context.getContext(), func);
+    var compiler = new Compiler(Context.getContext().getEnv(), func);
 
     compileMethod.invoke(compiler);
 
diff --git a/nashorn/test/src/jdk/nashorn/internal/parser/ParserTest.java b/nashorn/test/src/jdk/nashorn/internal/parser/ParserTest.java
index da7236450e0..afffe0516d8 100644
--- a/nashorn/test/src/jdk/nashorn/internal/parser/ParserTest.java
+++ b/nashorn/test/src/jdk/nashorn/internal/parser/ParserTest.java
@@ -154,7 +154,7 @@ public class ParserTest {
                 Context.setGlobal(global);
             }
             final Source   source   = new Source(file.getAbsolutePath(), buffer);
-            new Parser(context, source, errors).parse();
+            new Parser(context.getEnv(), source, errors).parse();
             if (errors.getNumberOfErrors() > 0) {
                 log("Parse failed: " + file.getAbsolutePath());
                 failed++;
diff --git a/nashorn/test/src/jdk/nashorn/internal/test/framework/SharedContextEvaluator.java b/nashorn/test/src/jdk/nashorn/internal/test/framework/SharedContextEvaluator.java
index 4ea77ac44a0..ac2dc17293c 100644
--- a/nashorn/test/src/jdk/nashorn/internal/test/framework/SharedContextEvaluator.java
+++ b/nashorn/test/src/jdk/nashorn/internal/test/framework/SharedContextEvaluator.java
@@ -135,7 +135,7 @@ public final class SharedContextEvaluator implements ScriptEvaluator {
                     ScriptRuntime.apply(script, global);
                 } catch (final NashornException e) {
                     errors.error(e.toString());
-                    if (context._dump_on_error) {
+                    if (context.getEnv()._dump_on_error) {
                         e.printStackTrace(context.getErr());
                     }
 

From 445b8d2438b25957d6e8c46806222e806fe53492 Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Mon, 25 Feb 2013 18:13:23 +0530
Subject: [PATCH 218/311] 8008789: Enable java access and nashorn runtime tests
 for jtreg

Reviewed-by: lagergren, jlaskey, hannesw
---
 nashorn/make/build.xml                        |   2 +-
 nashorn/test/TEST.ROOT                        |   1 -
 .../api/javaaccess/BooleanAccessTest.java     |   7 +-
 .../api/javaaccess/MethodAccessTest.java      |  13 +-
 .../api/javaaccess/NumberAccessTest.java      |   7 +-
 .../api/javaaccess/NumberBoxingTest.java      |   7 +-
 .../api/javaaccess/ObjectAccessTest.java      |   9 +-
 .../api/javaaccess/StringAccessTest.java      |   7 +-
 .../nashorn/internal/runtime/ContextTest.java |  88 +------------
 .../nashorn/internal/runtime/JSTypeTest.java  |   3 +
 .../runtime/TrustedScriptEngineTest.java      | 119 ++++++++++++++++++
 11 files changed, 166 insertions(+), 97 deletions(-)
 create mode 100644 nashorn/test/src/jdk/nashorn/internal/runtime/TrustedScriptEngineTest.java

diff --git a/nashorn/make/build.xml b/nashorn/make/build.xml
index 0ffd177cee0..9df9d89fccb 100644
--- a/nashorn/make/build.xml
+++ b/nashorn/make/build.xml
@@ -275,7 +275,7 @@
     </condition>
     <fail unless="representation-ok">Representation test failed - output differs!</fail>
     <fileset id="test.classes" dir="${build.test.classes.dir}">
-      <include name="**/access/*Test.class"/>
+      <include name="**/api/javaaccess/*Test.class"/>
       <include name="**/api/scripting/*Test.class"/>
       <include name="**/codegen/*Test.class"/>
       <include name="**/parser/*Test.class"/>
diff --git a/nashorn/test/TEST.ROOT b/nashorn/test/TEST.ROOT
index 7869746450b..6512c34009f 100644
--- a/nashorn/test/TEST.ROOT
+++ b/nashorn/test/TEST.ROOT
@@ -4,4 +4,3 @@
 
 # The list of keywords supported in the entire test suite
 keys=2d dnd i18n
-
diff --git a/nashorn/test/src/jdk/nashorn/api/javaaccess/BooleanAccessTest.java b/nashorn/test/src/jdk/nashorn/api/javaaccess/BooleanAccessTest.java
index c7dbc2e7629..2cfdbf00046 100644
--- a/nashorn/test/src/jdk/nashorn/api/javaaccess/BooleanAccessTest.java
+++ b/nashorn/test/src/jdk/nashorn/api/javaaccess/BooleanAccessTest.java
@@ -36,6 +36,11 @@ import org.testng.TestNG;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
+/**
+ * @test
+ * @build jdk.nashorn.api.javaaccess.SharedObject jdk.nashorn.api.javaaccess.Person jdk.nashorn.api.javaaccess.BooleanAccessTest
+ * @run testng jdk.nashorn.api.javaaccess.BooleanAccessTest
+ */
 public class BooleanAccessTest {
 
     private static ScriptEngine e = null;
@@ -50,7 +55,7 @@ public class BooleanAccessTest {
         final ScriptEngineManager m = new ScriptEngineManager();
         e = m.getEngineByName("nashorn");
         e.put("o", o);
-        e.eval("var SharedObject = Packages.jdk.nashorn.internal.access.SharedObject;");
+        e.eval("var SharedObject = Packages.jdk.nashorn.api.javaaccess.SharedObject;");
     }
 
     @Test
diff --git a/nashorn/test/src/jdk/nashorn/api/javaaccess/MethodAccessTest.java b/nashorn/test/src/jdk/nashorn/api/javaaccess/MethodAccessTest.java
index 21adc9c1343..69ca20c6c16 100644
--- a/nashorn/test/src/jdk/nashorn/api/javaaccess/MethodAccessTest.java
+++ b/nashorn/test/src/jdk/nashorn/api/javaaccess/MethodAccessTest.java
@@ -39,6 +39,11 @@ import org.testng.TestNG;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
+/**
+ * @test
+ * @build jdk.nashorn.api.javaaccess.SharedObject jdk.nashorn.api.javaaccess.Person jdk.nashorn.api.javaaccess.MethodAccessTest
+ * @run testng jdk.nashorn.api.javaaccess.MethodAccessTest
+ */
 public class MethodAccessTest {
 
     private static ScriptEngine e = null;
@@ -54,8 +59,8 @@ public class MethodAccessTest {
         e = m.getEngineByName("nashorn");
         o.setEngine(e);
         e.put("o", o);
-        e.eval("var SharedObject = Packages.jdk.nashorn.internal.access.SharedObject;");
-        e.eval("var Person = Packages.jdk.nashorn.internal.access.Person;");
+        e.eval("var SharedObject = Packages.jdk.nashorn.api.javaaccess.SharedObject;");
+        e.eval("var Person = Packages.jdk.nashorn.api.javaaccess.Person;");
     }
 
     @Test
@@ -325,13 +330,13 @@ public class MethodAccessTest {
 
     @Test
     public void accessDefaultConstructor() throws ScriptException {
-        e.eval("var dc = new Packages.jdk.nashorn.internal.access.Person()");
+        e.eval("var dc = new Packages.jdk.nashorn.api.javaaccess.Person()");
         assertEquals(new Person(), e.get("dc"));
     }
 
     @Test
     public void accessCustomConstructor() throws ScriptException {
-        e.eval("var cc = new Packages.jdk.nashorn.internal.access.Person(17)");
+        e.eval("var cc = new Packages.jdk.nashorn.api.javaaccess.Person(17)");
         assertEquals(new Person(17), e.get("cc"));
     }
 
diff --git a/nashorn/test/src/jdk/nashorn/api/javaaccess/NumberAccessTest.java b/nashorn/test/src/jdk/nashorn/api/javaaccess/NumberAccessTest.java
index 63c471fd3b6..21994960176 100644
--- a/nashorn/test/src/jdk/nashorn/api/javaaccess/NumberAccessTest.java
+++ b/nashorn/test/src/jdk/nashorn/api/javaaccess/NumberAccessTest.java
@@ -36,6 +36,11 @@ import org.testng.TestNG;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
+/**
+ * @test
+ * @build jdk.nashorn.api.javaaccess.SharedObject jdk.nashorn.api.javaaccess.Person jdk.nashorn.api.javaaccess.NumberAccessTest
+ * @run testng jdk.nashorn.api.javaaccess.NumberAccessTest
+ */
 public class NumberAccessTest {
 
     private static ScriptEngine e = null;
@@ -50,7 +55,7 @@ public class NumberAccessTest {
         final ScriptEngineManager m = new ScriptEngineManager();
         e = m.getEngineByName("nashorn");
         e.put("o", o);
-        e.eval("var SharedObject = Packages.jdk.nashorn.internal.access.SharedObject;");
+        e.eval("var SharedObject = Packages.jdk.nashorn.api.javaaccess.SharedObject;");
     }
 
     // --------------------------------long
diff --git a/nashorn/test/src/jdk/nashorn/api/javaaccess/NumberBoxingTest.java b/nashorn/test/src/jdk/nashorn/api/javaaccess/NumberBoxingTest.java
index ae2a9827233..ae719e7fb62 100644
--- a/nashorn/test/src/jdk/nashorn/api/javaaccess/NumberBoxingTest.java
+++ b/nashorn/test/src/jdk/nashorn/api/javaaccess/NumberBoxingTest.java
@@ -35,6 +35,11 @@ import org.testng.TestNG;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
+/**
+ * @test
+ * @build jdk.nashorn.api.javaaccess.SharedObject jdk.nashorn.api.javaaccess.Person jdk.nashorn.api.javaaccess.NumberBoxingTest
+ * @run testng jdk.nashorn.api.javaaccess.NumberBoxingTest
+ */
 public class NumberBoxingTest {
 
     private static ScriptEngine e = null;
@@ -49,7 +54,7 @@ public class NumberBoxingTest {
         final ScriptEngineManager m = new ScriptEngineManager();
         e = m.getEngineByName("nashorn");
         e.put("o", o);
-        e.eval("var SharedObject = Packages.jdk.nashorn.internal.access.SharedObject;");
+        e.eval("var SharedObject = Packages.jdk.nashorn.api.javaaccess.SharedObject;");
     }
 
     // --------------------------------long
diff --git a/nashorn/test/src/jdk/nashorn/api/javaaccess/ObjectAccessTest.java b/nashorn/test/src/jdk/nashorn/api/javaaccess/ObjectAccessTest.java
index d082fc0e579..7172051416c 100644
--- a/nashorn/test/src/jdk/nashorn/api/javaaccess/ObjectAccessTest.java
+++ b/nashorn/test/src/jdk/nashorn/api/javaaccess/ObjectAccessTest.java
@@ -35,6 +35,11 @@ import org.testng.TestNG;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
+/**
+ * @test
+ * @build jdk.nashorn.api.javaaccess.SharedObject jdk.nashorn.api.javaaccess.Person jdk.nashorn.api.javaaccess.ObjectAccessTest
+ * @run testng jdk.nashorn.api.javaaccess.ObjectAccessTest
+ */
 public class ObjectAccessTest {
 
     private static ScriptEngine e = null;
@@ -49,8 +54,8 @@ public class ObjectAccessTest {
         final ScriptEngineManager m = new ScriptEngineManager();
         e = m.getEngineByName("nashorn");
         e.put("o", o);
-        e.eval("var SharedObject = Packages.jdk.nashorn.internal.access.SharedObject;");
-        e.eval("var Person = Packages.jdk.nashorn.internal.access.Person;");
+        e.eval("var SharedObject = Packages.jdk.nashorn.api.javaaccess.SharedObject;");
+        e.eval("var Person = Packages.jdk.nashorn.api.javaaccess.Person;");
     }
 
     @Test
diff --git a/nashorn/test/src/jdk/nashorn/api/javaaccess/StringAccessTest.java b/nashorn/test/src/jdk/nashorn/api/javaaccess/StringAccessTest.java
index 423c99a640e..6a7713bd6a4 100644
--- a/nashorn/test/src/jdk/nashorn/api/javaaccess/StringAccessTest.java
+++ b/nashorn/test/src/jdk/nashorn/api/javaaccess/StringAccessTest.java
@@ -35,6 +35,11 @@ import org.testng.TestNG;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
+/**
+ * @test
+ * @build jdk.nashorn.api.javaaccess.SharedObject jdk.nashorn.api.javaaccess.Person jdk.nashorn.api.javaaccess.StringAccessTest
+ * @run testng jdk.nashorn.api.javaaccess.StringAccessTest
+ */
 public class StringAccessTest {
 
     private static ScriptEngine e = null;
@@ -49,7 +54,7 @@ public class StringAccessTest {
         final ScriptEngineManager m = new ScriptEngineManager();
         e = m.getEngineByName("nashorn");
         e.put("o", o);
-        e.eval("var SharedObject = Packages.jdk.nashorn.internal.access.SharedObject;");
+        e.eval("var SharedObject = Packages.jdk.nashorn.api.javaaccess.SharedObject;");
     }
 
     @Test
diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/ContextTest.java b/nashorn/test/src/jdk/nashorn/internal/runtime/ContextTest.java
index 783fba9694c..16165ce704d 100644
--- a/nashorn/test/src/jdk/nashorn/internal/runtime/ContextTest.java
+++ b/nashorn/test/src/jdk/nashorn/internal/runtime/ContextTest.java
@@ -27,19 +27,16 @@ package jdk.nashorn.internal.runtime;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
 
 import java.util.Map;
-import javax.script.ScriptEngine;
-import javax.script.ScriptEngineFactory;
-import javax.script.ScriptEngineManager;
-import javax.script.ScriptException;
-import jdk.nashorn.api.scripting.NashornScriptEngineFactory;
 import jdk.nashorn.internal.runtime.options.Options;
 import org.testng.annotations.Test;
 
 /**
  * Basic Context API tests.
+ *
+ * @test
+ * @run testng jdk.nashorn.internal.runtime.ContextTest
  */
 public class ContextTest {
     // basic context eval test
@@ -113,83 +110,4 @@ public class ContextTest {
         final ScriptFunction func = cx.compileScript(source, global);
         return func != null ? ScriptRuntime.apply(func, global) : null;
     }
-
-    // Tests for trusted client usage of nashorn script engine factory extension API
-
-    private static class MyClassLoader extends ClassLoader {
-        // to check if script engine uses the specified class loader
-        private final boolean[] reached = new boolean[1];
-
-        @Override
-        protected Class findClass(final String name) throws ClassNotFoundException {
-            // flag that it reached here
-            reached[0] = true;
-            return super.findClass(name);
-        }
-
-        public boolean reached() {
-            return reached[0];
-        }
-    };
-
-    // These are for "private" extension API of NashornScriptEngineFactory that
-    // accepts a ClassLoader and/or command line options.
-
-    @Test
-    public void factoryClassLoaderTest() {
-        final ScriptEngineManager sm = new ScriptEngineManager();
-        for (ScriptEngineFactory fac : sm.getEngineFactories()) {
-            if (fac instanceof NashornScriptEngineFactory) {
-                final NashornScriptEngineFactory nfac = (NashornScriptEngineFactory)fac;
-                final MyClassLoader loader = new MyClassLoader();
-                // set the classloader as app class loader
-                final ScriptEngine e = nfac.getScriptEngine(loader);
-                try {
-                    e.eval("Packages.foo");
-                    // check that the class loader was attempted
-                    assertTrue(loader.reached(), "did not reach class loader!");
-                } catch (final ScriptException se) {
-                    se.printStackTrace();
-                    fail(se.getMessage());
-                }
-                return;
-            }
-        }
-
-        fail("Cannot find nashorn factory!");
-    }
-
-    @Test
-    public void factoryClassLoaderAndOptionsTest() {
-        final ScriptEngineManager sm = new ScriptEngineManager();
-        for (ScriptEngineFactory fac : sm.getEngineFactories()) {
-            if (fac instanceof NashornScriptEngineFactory) {
-                final NashornScriptEngineFactory nfac = (NashornScriptEngineFactory)fac;
-                final String[] options = new String[] { "-strict" };
-                final MyClassLoader loader = new MyClassLoader();
-                // set the classloader as app class loader
-                final ScriptEngine e = nfac.getScriptEngine(options, loader);
-                try {
-                    e.eval("Packages.foo");
-                    // check that the class loader was attempted
-                    assertTrue(loader.reached(), "did not reach class loader!");
-                } catch (final ScriptException se) {
-                    se.printStackTrace();
-                    fail(se.getMessage());
-                }
-
-                try {
-                    // strict mode - delete of a var should throw SyntaxError
-                    e.eval("var d = 2; delete d;");
-                } catch (final ScriptException se) {
-                    // check that the error message contains "SyntaxError"
-                    assertTrue(se.getMessage().contains("SyntaxError"));
-                }
-
-                return;
-            }
-        }
-
-        fail("Cannot find nashorn factory!");
-    }
 }
diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/JSTypeTest.java b/nashorn/test/src/jdk/nashorn/internal/runtime/JSTypeTest.java
index f9b500e9072..6cf18d02933 100644
--- a/nashorn/test/src/jdk/nashorn/internal/runtime/JSTypeTest.java
+++ b/nashorn/test/src/jdk/nashorn/internal/runtime/JSTypeTest.java
@@ -33,6 +33,9 @@ import org.testng.annotations.Test;
 
 /**
  * Tests for JSType methods.
+ *
+ * @test
+ * @run testng jdk.nashorn.internal.runtime.JSTypeTest
  */
 public class JSTypeTest {
     /**
diff --git a/nashorn/test/src/jdk/nashorn/internal/runtime/TrustedScriptEngineTest.java b/nashorn/test/src/jdk/nashorn/internal/runtime/TrustedScriptEngineTest.java
new file mode 100644
index 00000000000..0f147562fea
--- /dev/null
+++ b/nashorn/test/src/jdk/nashorn/internal/runtime/TrustedScriptEngineTest.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.nashorn.internal.runtime;
+
+
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineFactory;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+import jdk.nashorn.api.scripting.NashornScriptEngineFactory;
+import org.testng.annotations.Test;
+
+/**
+ * Tests for trusted client usage of nashorn script engine factory extension API
+ */
+public class TrustedScriptEngineTest {
+    private static class MyClassLoader extends ClassLoader {
+        // to check if script engine uses the specified class loader
+        private final boolean[] reached = new boolean[1];
+
+        @Override
+        protected Class findClass(final String name) throws ClassNotFoundException {
+            // flag that it reached here
+            reached[0] = true;
+            return super.findClass(name);
+        }
+
+        public boolean reached() {
+            return reached[0];
+        }
+    };
+
+    // These are for "private" extension API of NashornScriptEngineFactory that
+    // accepts a ClassLoader and/or command line options.
+
+    @Test
+    public void factoryClassLoaderTest() {
+        final ScriptEngineManager sm = new ScriptEngineManager();
+        for (ScriptEngineFactory fac : sm.getEngineFactories()) {
+            if (fac instanceof NashornScriptEngineFactory) {
+                final NashornScriptEngineFactory nfac = (NashornScriptEngineFactory)fac;
+                final MyClassLoader loader = new MyClassLoader();
+                // set the classloader as app class loader
+                final ScriptEngine e = nfac.getScriptEngine(loader);
+                try {
+                    e.eval("Packages.foo");
+                    // check that the class loader was attempted
+                    assertTrue(loader.reached(), "did not reach class loader!");
+                } catch (final ScriptException se) {
+                    se.printStackTrace();
+                    fail(se.getMessage());
+                }
+                return;
+            }
+        }
+
+        fail("Cannot find nashorn factory!");
+    }
+
+    @Test
+    public void factoryClassLoaderAndOptionsTest() {
+        final ScriptEngineManager sm = new ScriptEngineManager();
+        for (ScriptEngineFactory fac : sm.getEngineFactories()) {
+            if (fac instanceof NashornScriptEngineFactory) {
+                final NashornScriptEngineFactory nfac = (NashornScriptEngineFactory)fac;
+                final String[] options = new String[] { "-strict" };
+                final MyClassLoader loader = new MyClassLoader();
+                // set the classloader as app class loader
+                final ScriptEngine e = nfac.getScriptEngine(options, loader);
+                try {
+                    e.eval("Packages.foo");
+                    // check that the class loader was attempted
+                    assertTrue(loader.reached(), "did not reach class loader!");
+                } catch (final ScriptException se) {
+                    se.printStackTrace();
+                    fail(se.getMessage());
+                }
+
+                try {
+                    // strict mode - delete of a var should throw SyntaxError
+                    e.eval("var d = 2; delete d;");
+                } catch (final ScriptException se) {
+                    // check that the error message contains "SyntaxError"
+                    assertTrue(se.getMessage().contains("SyntaxError"));
+                }
+
+                return;
+            }
+        }
+
+        fail("Cannot find nashorn factory!");
+    }
+}

From 0248a988429a1414242599568d67bdbc3fe4b74f Mon Sep 17 00:00:00 2001
From: Attila Szegedi <attila@openjdk.org>
Date: Mon, 25 Feb 2013 16:51:04 +0100
Subject: [PATCH 219/311] 8006984: Introducing local into a function inside
 with statement confuses its scope

Reviewed-by: jlaskey, lagergren, sundar
---
 .../internal/runtime/ScriptObject.java        | 41 +++++++++--------
 .../nashorn/internal/runtime/WithObject.java  | 22 ++++++++++
 nashorn/test/script/basic/JDK-8006984.js      | 44 +++++++++++++++++++
 .../test/script/basic/JDK-8006984.js.EXPECTED |  1 +
 4 files changed, 89 insertions(+), 19 deletions(-)
 create mode 100644 nashorn/test/script/basic/JDK-8006984.js
 create mode 100644 nashorn/test/script/basic/JDK-8006984.js.EXPECTED

diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
index 8c645d8704d..45ed7f436b2 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
@@ -628,14 +628,15 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
      * @return FindPropertyData or null if not found.
      */
     public final FindProperty findProperty(final String key, final boolean deep) {
-        return findProperty(key, deep, false);
+        return findProperty(key, deep, false, this);
     }
 
     /**
      * Low level property API (not using property descriptors)
      * <p>
-     * Find a property in the prototype hierarchy. Note: this is final and not
-     * a good idea to override. If you have to, use
+     * Find a property in the prototype hierarchy. Note: this is not a good idea
+     * to override except as it was done in {@link WithObject}.
+     * If you have to, use
      * {jdk.nashorn.internal.objects.NativeArray{@link #getProperty(String)} or
      * {jdk.nashorn.internal.objects.NativeArray{@link #getPropertyDescriptor(String)} as the
      * overriding way to find array properties
@@ -645,27 +646,29 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
      * @param key  Property key.
      * @param deep Whether the search should look up proto chain.
      * @param stopOnNonScope should a deep search stop on the first non-scope object?
+     * @param start the object on which the lookup was originally initiated
      *
      * @return FindPropertyData or null if not found.
      */
-    public final FindProperty findProperty(final String key, final boolean deep, final boolean stopOnNonScope) {
-        for (ScriptObject self = this; self != null; self = self.getProto()) {
-            // if doing deep search, stop search on the first non-scope object if asked to do so
-            if (stopOnNonScope && self != this && !self.isScope()) {
-                return null;
-            }
+    FindProperty findProperty(final String key, final boolean deep, final boolean stopOnNonScope, final ScriptObject start) {
+        // if doing deep search, stop search on the first non-scope object if asked to do so
+        if (stopOnNonScope && start != this && !isScope()) {
+            return null;
+        }
 
-            final PropertyMap selfMap  = self.getMap();
-            final Property    property = selfMap.findProperty(key);
+        final PropertyMap selfMap  = getMap();
+        final Property    property = selfMap.findProperty(key);
 
-            if (property != null) {
-                return new FindProperty(this, self, property);
-            }
+        if (property != null) {
+            return new FindProperty(start, this, property);
+        }
 
-            if (!deep) {
-                return null;
+        if (deep) {
+            final ScriptObject proto = getProto();
+            if(proto != null) {
+                return proto.findProperty(key, deep, stopOnNonScope, start);
             }
-         }
+        }
 
         return null;
     }
@@ -1781,12 +1784,12 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
         final boolean scope = isScope();
         /*
          * If doing property set on a scope object, we should stop proto search on the first
-         * non-scope object. Without this, for exmaple, when assigning "toString" on global scope,
+         * non-scope object. Without this, for example, when assigning "toString" on global scope,
          * we'll end up assigning it on it's proto - which is Object.prototype.toString !!
          *
          * toString = function() { print("global toString"); } // don't affect Object.prototype.toString
          */
-        FindProperty find = findProperty(name, true, scope);
+        FindProperty find = findProperty(name, true, scope, this);
         // If it's not a scope search, then we don't want any inherited properties except those with user defined accessors.
         if (!scope && find != null && find.isInherited() && !(find.getProperty() instanceof UserAccessorProperty)) {
             // We should still check if inherited data property is not writable
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java b/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java
index e42088c2626..06da976b640 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java
@@ -184,6 +184,28 @@ public final class WithObject extends ScriptObject implements Scope {
         return null;
     }
 
+    /**
+     * Overridden to try to find the property first in the expression object (and its prototypes), and only then in this
+     * object (and its prototypes).
+     *
+     * @param key  Property key.
+     * @param deep Whether the search should look up proto chain.
+     * @param stopOnNonScope should a deep search stop on the first non-scope object?
+     * @param start the object on which the lookup was originally initiated
+     *
+     * @return FindPropertyData or null if not found.
+     */
+    @Override
+    FindProperty findProperty(final String key, final boolean deep, final boolean stopOnNonScope, final ScriptObject start) {
+        if (expression instanceof ScriptObject) {
+            final FindProperty exprProperty = ((ScriptObject)expression).findProperty(key, deep, stopOnNonScope, start);
+            if(exprProperty != null) {
+                return exprProperty;
+            }
+        }
+        return super.findProperty(key, deep, stopOnNonScope, start);
+    }
+
     @Override
     public void setSplitState(final int state) {
         getNonWithParent().setSplitState(state);
diff --git a/nashorn/test/script/basic/JDK-8006984.js b/nashorn/test/script/basic/JDK-8006984.js
new file mode 100644
index 00000000000..60702e36887
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8006984.js
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * findProperty on WithObject was not considering its object argument
+ * 
+ * @test
+ * @run
+ */
+
+var guiPkgs = { JFrame: function() { print("created"); } }; 
+
+with (guiPkgs) { 
+     var main = function() { 
+        var frame; // <---- this local variable caused scope to be not set properly prior to fix
+
+        function createFrame() { 
+            frame = new JFrame(); 
+        } 
+
+        createFrame(); 
+    } 
+} 
+main();
diff --git a/nashorn/test/script/basic/JDK-8006984.js.EXPECTED b/nashorn/test/script/basic/JDK-8006984.js.EXPECTED
new file mode 100644
index 00000000000..3151666398e
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8006984.js.EXPECTED
@@ -0,0 +1 @@
+created

From a04fad868ef960bde43050603d386c927a9858a9 Mon Sep 17 00:00:00 2001
From: Alan Bateman <alanb@openjdk.org>
Date: Mon, 25 Feb 2013 17:17:05 +0000
Subject: [PATCH 220/311] 8008808: Allowed dependencies added by JDK-8008481 no
 longer required

Reviewed-by: tbell, chegar
---
 jdk/make/tools/src/build/tools/deps/refs.allowed | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/jdk/make/tools/src/build/tools/deps/refs.allowed b/jdk/make/tools/src/build/tools/deps/refs.allowed
index 91605d535fe..ad9d5271199 100644
--- a/jdk/make/tools/src/build/tools/deps/refs.allowed
+++ b/jdk/make/tools/src/build/tools/deps/refs.allowed
@@ -33,8 +33,3 @@ sun.security.krb5.Realm=sun.security.ssl.krb5.KerberosClientKeyExchangeImpl,comp
 #
 java.beans.PropertyChangeListener=java.util.logging.LogManager,sun.org.mozilla.javascript.internal.Context,compact1,compact2,compact3
 java.beans.PropertyChangeEvent=sun.org.mozilla.javascript.internal.Context,compact3
-
-# JFR traces even in builds with JFR disabled
-com.oracle.jrockit.jfr.FlightRecorder: com.sun.management.MissionControl, compact3
-com.oracle.jrockit.jfr.management.FlightRecorderMBean: com.sun.management.MissionControl, compact3
-

From 944e1b9636cd93d9549d2cc43177a1cf727a04c2 Mon Sep 17 00:00:00 2001
From: Brent Christian <bchristi@openjdk.org>
Date: Mon, 25 Feb 2013 14:19:48 -0800
Subject: [PATCH 221/311] 8006039: test/tools/launcher/I18NJarTest.java fails
 on Mac w/ LANG=C, LC_ALL=C

Avoid automated test failure by just exiting when in 'C' locale

Reviewed-by: naoto, ksrini
---
 jdk/test/ProblemList.txt                 |  3 ---
 jdk/test/tools/launcher/I18NJarTest.java | 17 ++++++++++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt
index 7c621e00884..7adc6d2c660 100644
--- a/jdk/test/ProblemList.txt
+++ b/jdk/test/ProblemList.txt
@@ -327,9 +327,6 @@ tools/pack200/Pack200Test.java                                  solaris-all, mac
 # 7150569
 tools/launcher/UnicodeTest.java                                 macosx-all
 
-# 8006039
-tools/launcher/I18NJarTest.java                                 macosx-all
-
 # 8007410
 tools/launcher/FXLauncherTest.java                              linux-all
 
diff --git a/jdk/test/tools/launcher/I18NJarTest.java b/jdk/test/tools/launcher/I18NJarTest.java
index 9c033b47f8f..ad94abcce64 100644
--- a/jdk/test/tools/launcher/I18NJarTest.java
+++ b/jdk/test/tools/launcher/I18NJarTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,6 +52,8 @@ public class I18NJarTest extends TestHelper {
     private static final File cwd = new File(".");
     private static final File dir = new File("\uFF66\uFF67\uFF68\uFF69");
     private static final String encoding = System.getProperty("sun.jnu.encoding", "");
+    private static final String LANG = System.getenv("LANG");
+    private static final String LC_ALL = System.getenv("LC_ALL");
 
     public static void main(String... args) throws Exception {
         boolean localeAvailable = false;
@@ -63,7 +65,16 @@ public class I18NJarTest extends TestHelper {
         }
         if (!localeAvailable) {
             System.out.println("Warning: locale: " + Locale.JAPAN
-                    + " not found, test passes vacuosly");
+                    + " not found, test passes vacuously");
+            return;
+        }
+        if ("C".equals(LC_ALL) || "C".equals(LANG)) {
+            System.out.println("Warning: The LANG and/or LC_ALL env vars are " +
+              "set to \"C\":\n" +
+              "  LANG=" + LANG + "\n" +
+              "  LC_ALL=" + LC_ALL + "\n" +
+              "This test requires support for multi-byte filenames.\n" +
+              "Test passes vacuously.");
             return;
         }
         if (encoding.equals("MS932") || encoding.equals("UTF-8")) {
@@ -73,7 +84,7 @@ public class I18NJarTest extends TestHelper {
         } else {
             System.out.println("Warning: current encoding is " + encoding +
                     "this test requires MS932 <Ja> or UTF-8," +
-                    " test passes vacuosly");
+                    " test passes vacuously");
             return;
         }
         dir.mkdir();

From b3a313fa2bff811dbd063e26fd8139ecd717a2e3 Mon Sep 17 00:00:00 2001
From: Erik Joelsson <erik.joelsson@oracle.com>
Date: Mon, 25 Feb 2013 15:08:11 -0800
Subject: [PATCH 222/311] 8008914: Add nashorn to the tl build

Co-authored-by: James Laskey <james.laskey@oracle.com>
Reviewed-by: mr, tbell, jjh
---
 jdk/make/launchers/Makefile               | 1 +
 jdk/makefiles/CompileLaunchers.gmk        | 3 +++
 jdk/makefiles/CreateJars.gmk              | 8 ++++++++
 jdk/test/tools/launcher/VersionCheck.java | 1 +
 4 files changed, 13 insertions(+)

diff --git a/jdk/make/launchers/Makefile b/jdk/make/launchers/Makefile
index be16512e478..47645158793 100644
--- a/jdk/make/launchers/Makefile
+++ b/jdk/make/launchers/Makefile
@@ -77,6 +77,7 @@ $(call make-launcher, jmap, sun.tools.jmap.JMap, \
   -J-Dsun.jvm.hotspot.debugger.useWindbgDebugger, )
 $(call make-launcher, jps, sun.tools.jps.Jps, , )
 $(call make-launcher, jrunscript, com.sun.tools.script.shell.Main, , )
+$(call make-launcher, jjs, jdk.nashorn.tools.Shell, , )
 $(call make-launcher, jsadebugd, sun.jvm.hotspot.jdi.SADebugServer, , )
 $(call make-launcher, jstack, sun.tools.jstack.JStack, \
   -J-Dsun.jvm.hotspot.debugger.useProcDebugger \
diff --git a/jdk/makefiles/CompileLaunchers.gmk b/jdk/makefiles/CompileLaunchers.gmk
index 170dc164ec4..501c986082e 100644
--- a/jdk/makefiles/CompileLaunchers.gmk
+++ b/jdk/makefiles/CompileLaunchers.gmk
@@ -311,6 +311,9 @@ $(eval $(call SetupLauncher,jps,\
 $(eval $(call SetupLauncher,jrunscript,\
     -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.script.shell.Main"$(COMMA) }'))
 
+$(eval $(call SetupLauncher,jjs,\
+    -DJAVA_ARGS='{  "-J-ms8m"$(COMMA) "jdk.nashorn.tools.Shell"$(COMMA) }'))
+
 $(eval $(call SetupLauncher,jsadebugd,\
     -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.jvm.hotspot.jdi.SADebugServer"$(COMMA) }' \
     -DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }' \
diff --git a/jdk/makefiles/CreateJars.gmk b/jdk/makefiles/CreateJars.gmk
index 7e33790d299..857e0d5e9a4 100644
--- a/jdk/makefiles/CreateJars.gmk
+++ b/jdk/makefiles/CreateJars.gmk
@@ -1119,6 +1119,14 @@ endif
 
 ##########################################################################################
 
+# Import nashorn.jar from nashorn dist dir.
+$(IMAGES_OUTPUTDIR)/lib/ext/nashorn.jar: $(NASHORN_DIST)/nashorn.jar
+	$(install-file)
+
+JARS += $(IMAGES_OUTPUTDIR)/lib/ext/nashorn.jar
+
+##########################################################################################
+
 -include $(CUSTOM_MAKE_DIR)/CreateJars.gmk
 
 ##########################################################################################
diff --git a/jdk/test/tools/launcher/VersionCheck.java b/jdk/test/tools/launcher/VersionCheck.java
index 11f65cb2e9a..64f0e6adfb8 100644
--- a/jdk/test/tools/launcher/VersionCheck.java
+++ b/jdk/test/tools/launcher/VersionCheck.java
@@ -74,6 +74,7 @@ public class VersionCheck extends TestHelper {
         "jmap",
         "jps",
         "jrunscript",
+        "jjs",
         "jsadebugd",
         "jstack",
         "jstat",

From 5c31bde4c0155aad8468ca54166c85eee5bcc2ef Mon Sep 17 00:00:00 2001
From: Erik Joelsson <erik.joelsson@oracle.com>
Date: Mon, 25 Feb 2013 15:08:11 -0800
Subject: [PATCH 223/311] 8008914: Add nashorn to the tl build

Co-authored-by: James Laskey <james.laskey@oracle.com>
Reviewed-by: mr, tbell, jjh
---
 Makefile                               |  7 +++++++
 common/autoconf/generated-configure.sh | 16 ++++++++++++++++
 common/autoconf/source-dirs.m4         | 15 ++++++++++++++-
 common/autoconf/spec.gmk.in            |  3 +++
 common/bin/hgforest.sh                 |  2 +-
 common/makefiles/Main.gmk              | 18 +++++++++++++-----
 common/makefiles/MakeBase.gmk          |  3 ++-
 make/Defs-internal.gmk                 | 14 ++++++++++++++
 make/jdk-rules.gmk                     |  3 +++
 make/sanity-rules.gmk                  | 14 ++++++++++++++
 make/scripts/hgforest.sh               |  2 +-
 11 files changed, 88 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index f9162f0b641..f7b9d1b35e3 100644
--- a/Makefile
+++ b/Makefile
@@ -90,6 +90,7 @@ include ./make/corba-rules.gmk
 include ./make/jaxp-rules.gmk
 include ./make/jaxws-rules.gmk
 include ./make/jdk-rules.gmk
+include ./make/nashorn-rules.gmk
 include ./make/install-rules.gmk
 include ./make/sponsors-rules.gmk
 include ./make/deploy-rules.gmk
@@ -174,6 +175,11 @@ ifeq ($(BUILD_JDK), true)
   clobber:: jdk-clobber
 endif
 
+ifeq ($(BUILD_NASHORN), true)
+  generic_build_repo_series:: $(NASHORN)
+  clobber:: nashorn-clobber
+endif
+
 ifeq ($(BUILD_DEPLOY), true)
   generic_build_repo_series:: $(DEPLOY)
   clobber:: deploy-clobber
@@ -336,6 +342,7 @@ deploy_fastdebug_only:
 	    BUILD_HOTSPOT=false \
 	    BUILD_JDK=false \
 	    BUILD_LANGTOOLS=false \
+	    BUILD_NASHORN=false \
 	    BUILD_CORBA=false \
 	    BUILD_JAXP=false \
 	    BUILD_JAXWS=false \
diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
index 741160eab1d..00d5093259b 100644
--- a/common/autoconf/generated-configure.sh
+++ b/common/autoconf/generated-configure.sh
@@ -747,6 +747,7 @@ BUILD_OUTPUT
 OVERRIDE_SRC_ROOT
 ADD_SRC_ROOT
 JDK_TOPDIR
+NASHORN_TOPDIR
 HOTSPOT_TOPDIR
 JAXWS_TOPDIR
 JAXP_TOPDIR
@@ -15663,6 +15664,7 @@ CORBA_TOPDIR="$SRC_ROOT/corba"
 JAXP_TOPDIR="$SRC_ROOT/jaxp"
 JAXWS_TOPDIR="$SRC_ROOT/jaxws"
 HOTSPOT_TOPDIR="$SRC_ROOT/hotspot"
+NASHORN_TOPDIR="$SRC_ROOT/nashorn"
 JDK_TOPDIR="$SRC_ROOT/jdk"
 
 
@@ -15673,6 +15675,7 @@ JDK_TOPDIR="$SRC_ROOT/jdk"
 
 
 
+
 ###############################################################################
 #
 # Pickup additional source for a component from outside of the source root
@@ -15903,6 +15906,19 @@ $as_echo_n "checking if hotspot should be overridden... " >&6; }
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $HOTSPOT_TOPDIR" >&5
 $as_echo "yes with $HOTSPOT_TOPDIR" >&6; }
 fi
+if test "x$with_override_nashorn" != x; then
+    CURDIR="$PWD"
+    cd "$with_override_nashorn"
+    NASHORN_TOPDIR="`pwd`"
+    cd "$CURDIR"
+    if ! test -f $NASHORN_TOPDIR/makefiles/BuildNashorn.gmk; then
+        as_fn_error $? "You have to override nashorn with a full nashorn repo!" "$LINENO" 5
+    fi
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if nashorn should be overridden" >&5
+$as_echo_n "checking if nashorn should be overridden... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $NASHORN_TOPDIR" >&5
+$as_echo "yes with $NASHORN_TOPDIR" >&6; }
+fi
 if test "x$with_override_jdk" != x; then
     CURDIR="$PWD"
     cd "$with_override_jdk"
diff --git a/common/autoconf/source-dirs.m4 b/common/autoconf/source-dirs.m4
index eacd056066b..bb0aba1b826 100644
--- a/common/autoconf/source-dirs.m4
+++ b/common/autoconf/source-dirs.m4
@@ -33,12 +33,14 @@ CORBA_TOPDIR="$SRC_ROOT/corba"
 JAXP_TOPDIR="$SRC_ROOT/jaxp"
 JAXWS_TOPDIR="$SRC_ROOT/jaxws"
 HOTSPOT_TOPDIR="$SRC_ROOT/hotspot"
+NASHORN_TOPDIR="$SRC_ROOT/nashorn"
 JDK_TOPDIR="$SRC_ROOT/jdk"
 AC_SUBST(LANGTOOLS_TOPDIR)
 AC_SUBST(CORBA_TOPDIR)
 AC_SUBST(JAXP_TOPDIR)
 AC_SUBST(JAXWS_TOPDIR)
 AC_SUBST(HOTSPOT_TOPDIR)
+AC_SUBST(NASHORN_TOPDIR)
 AC_SUBST(JDK_TOPDIR)
 ])
 
@@ -233,7 +235,18 @@ if test "x$with_override_hotspot" != x; then
     fi
     AC_MSG_CHECKING([if hotspot should be overridden])
     AC_MSG_RESULT([yes with $HOTSPOT_TOPDIR])
-fi    
+fi
+if test "x$with_override_nashorn" != x; then
+    CURDIR="$PWD"
+    cd "$with_override_nashorn"
+    NASHORN_TOPDIR="`pwd`"
+    cd "$CURDIR"
+    if ! test -f $NASHORN_TOPDIR/makefiles/BuildNashorn.gmk; then
+        AC_MSG_ERROR([You have to override nashorn with a full nashorn repo!])
+    fi
+    AC_MSG_CHECKING([if nashorn should be overridden])
+    AC_MSG_RESULT([yes with $NASHORN_TOPDIR])
+fi
 if test "x$with_override_jdk" != x; then
     CURDIR="$PWD"
     cd "$with_override_jdk"
diff --git a/common/autoconf/spec.gmk.in b/common/autoconf/spec.gmk.in
index ec47d0364fd..3d6cac27e7b 100644
--- a/common/autoconf/spec.gmk.in
+++ b/common/autoconf/spec.gmk.in
@@ -141,6 +141,7 @@ CORBA_TOPDIR:=@CORBA_TOPDIR@
 JAXP_TOPDIR:=@JAXP_TOPDIR@
 JAXWS_TOPDIR:=@JAXWS_TOPDIR@
 HOTSPOT_TOPDIR:=@HOTSPOT_TOPDIR@
+NASHORN_TOPDIR:=@NASHORN_TOPDIR@
 COPYRIGHT_YEAR:=@COPYRIGHT_YEAR@
 
 # Location where build customization files may be found
@@ -230,6 +231,7 @@ JAXP_OUTPUTDIR=$(BUILD_OUTPUT)/jaxp
 JAXWS_OUTPUTDIR=$(BUILD_OUTPUT)/jaxws
 HOTSPOT_OUTPUTDIR=$(BUILD_OUTPUT)/hotspot
 JDK_OUTPUTDIR=$(BUILD_OUTPUT)/jdk
+NASHORN_OUTPUTDIR=$(BUILD_OUTPUT)/nashorn
 IMAGES_OUTPUTDIR=$(BUILD_OUTPUT)/images
 JCE_OUTPUTDIR=$(BUILD_OUTPUT)/jce-release
 
@@ -238,6 +240,7 @@ CORBA_DIST=$(CORBA_OUTPUTDIR)/dist
 JAXP_DIST=$(JAXP_OUTPUTDIR)/dist
 JAXWS_DIST=$(JAXWS_OUTPUTDIR)/dist
 HOTSPOT_DIST=@HOTSPOT_DIST@
+NASHORN_DIST=$(NASHORN_OUTPUTDIR)/dist
 
 BUILD_HOTSPOT=@BUILD_HOTSPOT@
 
diff --git a/common/bin/hgforest.sh b/common/bin/hgforest.sh
index 29e80301a06..9f0db97d578 100644
--- a/common/bin/hgforest.sh
+++ b/common/bin/hgforest.sh
@@ -96,7 +96,7 @@ pull_default=""
 repos=""
 repos_extra=""
 if [ "${command}" = "clone" -o "${command}" = "fclone" ] ; then
-  subrepos="corba jaxp jaxws langtools jdk hotspot"
+  subrepos="corba jaxp jaxws langtools jdk hotspot nashorn"
   if [ -f .hg/hgrc ] ; then
     pull_default=`hg paths default`
     if [ "${pull_default}" = "" ] ; then
diff --git a/common/makefiles/Main.gmk b/common/makefiles/Main.gmk
index 1fce2e25dc6..c43f590707c 100644
--- a/common/makefiles/Main.gmk
+++ b/common/makefiles/Main.gmk
@@ -123,6 +123,12 @@ jdk-only: start-make
 	@($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk $(JDK_TARGET))
 	@$(call TargetExit)
 
+nashorn: jdk nashorn-only
+nashorn-only: start-make
+	@$(call TargetEnter)
+	@($(CD) $(NASHORN_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildNashorn.gmk)
+	@$(call TargetExit)
+
 demos: jdk demos-only
 demos-only: start-make
 	@$(call TargetEnter)
@@ -131,7 +137,7 @@ demos-only: start-make
 
 # Note: This double-colon rule is intentional, to support
 # custom make file integration.
-images:: source-tips demos images-only
+images:: source-tips demos nashorn images-only
 images-only: start-make
 	@$(call TargetEnter)
 	@($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk images)
@@ -193,7 +199,7 @@ $(OUTPUT_ROOT)/source_tips: FRC
 
 
 # Remove everything, except the output from configure.
-clean: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-images clean-overlay-images clean-bootcycle-build clean-docs
+clean: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-overlay-images clean-bootcycle-build clean-docs
 	@($(CD) $(OUTPUT_ROOT) && $(RM) -r tmp source_tips build.log* build-trace*.log*)
 	@$(ECHO) Cleaned all build artifacts.
 
@@ -223,6 +229,8 @@ clean-hotspot:
 	$(call CleanComponent,hotspot)
 clean-jdk:
 	$(call CleanComponent,jdk)
+clean-nashorn:
+	$(call CleanComponent,nashorn)
 clean-images:
 	$(call CleanComponent,images)
 clean-overlay-images:
@@ -233,10 +241,10 @@ clean-docs:
 	$(call CleanComponent,docs)
 	$(call CleanComponent,docstemp)
 
-.PHONY: langtools corba jaxp jaxws hotspot jdk images overlay-images install
-.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only images-only overlay-images-only install-only
+.PHONY: langtools corba jaxp jaxws hotspot jdk nashorn images overlay-images install
+.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only nashorn-only images-only overlay-images-only install-only
 .PHONY: all test clean dist-clean bootcycle-images start-make
-.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-images clean-overlay-images clean-bootcycle-build
+.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-overlay-images clean-bootcycle-build
 .PHONY: profiles profiles-only profiles-oscheck
 
 FRC: # Force target
diff --git a/common/makefiles/MakeBase.gmk b/common/makefiles/MakeBase.gmk
index 708cbada085..4c1ecc8c8b7 100644
--- a/common/makefiles/MakeBase.gmk
+++ b/common/makefiles/MakeBase.gmk
@@ -51,8 +51,9 @@ decompress_paths=$(SED) -f $(SRC_ROOT)/common/makefiles/support/ListPathsSafely-
 		     -e 's|X98|$(OUTPUT_ROOT)|g' -e 's|X97|$(SRC_ROOT)|g' \
 		     -e 's|X00|X|g' | tr '\n' '$2'
 
+# Subst in an extra $ to prevent it from disappearing.
 define ListPathsSafely_If
-    $(if $(word $3,$($1)),$(eval $1_LPS$3:=$(call compress_paths,$(wordlist $3,$4,$($1)))))
+    $(if $(word $3,$($1)),$(eval $1_LPS$3:=$(call compress_paths,$(subst $$,$$$$,$(wordlist $3,$4,$($1))))))
 endef
 
 define ListPathsSafely_Printf
diff --git a/make/Defs-internal.gmk b/make/Defs-internal.gmk
index 6f40f763bc9..15374ff7c51 100644
--- a/make/Defs-internal.gmk
+++ b/make/Defs-internal.gmk
@@ -100,6 +100,7 @@ ABS_JAXP_TOPDIR:=$(call OptFullPath,"$(JAXP_TOPDIR)")
 ABS_JAXWS_TOPDIR:=$(call OptFullPath,"$(JAXWS_TOPDIR)")
 ABS_JDK_TOPDIR:=$(call OptFullPath,"$(JDK_TOPDIR)")
 ABS_HOTSPOT_TOPDIR:=$(call OptFullPath,"$(HOTSPOT_TOPDIR)")
+ABS_NASHORN_TOPDIR:=$(call OptFullPath,"$(NASHORN_TOPDIR)")
 ABS_INSTALL_TOPDIR:=$(call OptFullPath,"$(INSTALL_TOPDIR)")
 ABS_SPONSORS_TOPDIR:=$(call OptFullPath,"$(SPONSORS_TOPDIR)")
 ABS_DEPLOY_TOPDIR:=$(call OptFullPath,"$(DEPLOY_TOPDIR)")
@@ -165,6 +166,15 @@ ifeq ($(JDK_SRC_AVAILABLE),true)
   endif
 endif
 
+NASHORN_SRC_AVAILABLE := $(call MkExists,$(NASHORN_TOPDIR)/make/Makefile)
+ifndef BUILD_NASHORN
+  ifdef ALT_NASHORN_DIST
+    BUILD_NASHORN := false
+  else
+    BUILD_NASHORN := $(NASHORN_SRC_AVAILABLE)
+  endif
+endif
+
 DEPLOY_SRC_AVAILABLE := $(call MkExists,$(DEPLOY_TOPDIR)/make/Makefile)
 ifndef BUILD_DEPLOY
   BUILD_DEPLOY := $(DEPLOY_SRC_AVAILABLE)
@@ -308,6 +318,10 @@ ifndef ALT_JAXWS_DIST
   JAXWS_OUTPUTDIR = $(ABS_OUTPUTDIR)/jaxws
   ABS_JAXWS_DIST = $(JAXWS_OUTPUTDIR)/dist
 endif
+ifndef ALT_NASHORN_DIST
+  NASHORN_OUTPUTDIR = $(ABS_OUTPUTDIR)/nashorn
+  ABS_NASHORN_DIST = $(NASHORN_OUTPUTDIR)/dist
+endif
 
 # Common make arguments (supplied to all component builds)
 COMMON_BUILD_ARGUMENTS = \
diff --git a/make/jdk-rules.gmk b/make/jdk-rules.gmk
index 42ba6adf627..dc6b5556dd0 100644
--- a/make/jdk-rules.gmk
+++ b/make/jdk-rules.gmk
@@ -62,6 +62,9 @@ endif
 ifeq ($(BUILD_JAXWS), true)
   JDK_BUILD_ARGUMENTS += ALT_JAXWS_DIST=$(ABS_JAXWS_DIST)
 endif
+ifeq ($(BUILD_NASHORN), true)
+  JDK_BUILD_ARGUMENTS += ALT_NASHORN_DIST=$(ABS_NASHORN_DIST)
+endif
 
 ifeq ($(BUILD_HOTSPOT), true)
   JDK_BUILD_ARGUMENTS += ALT_HOTSPOT_IMPORT_PATH=$(HOTSPOT_DIR)/import
diff --git a/make/sanity-rules.gmk b/make/sanity-rules.gmk
index 544dba10ffd..ee3d6f88ab1 100644
--- a/make/sanity-rules.gmk
+++ b/make/sanity-rules.gmk
@@ -182,6 +182,14 @@ ifeq ($(JDK_SRC_AVAILABLE), true)
 	   "" >> $(WARNING_FILE)
   endif
 endif
+ifeq ($(NASHORN_SRC_AVAILABLE), true)
+  ifneq ($(BUILD_NASHORN), true)
+	@$(ECHO) "WARNING: You are not building the NASHORN sources.\n" \
+           "        The nashorn files will be obtained from \n" \
+           "        the location set in ALT_JDK_IMPORT_PATH. \n" \
+           "" >> $(WARNING_FILE)
+  endif
+endif
 ifeq ($(DEPLOY_SRC_AVAILABLE), true)
   ifneq ($(BUILD_DEPLOY), true)
 	@$(ECHO) "WARNING: You are not building the DEPLOY sources.\n" \
@@ -268,6 +276,9 @@ endif
 ifeq ($(JDK_SRC_AVAILABLE), true)
 	@$(ECHO) "   JDK_TOPDIR = $(JDK_TOPDIR)"  >> $(MESSAGE_FILE)
 endif
+ifeq ($(NASHORN_SRC_AVAILABLE), true)
+	@$(ECHO) "   NASHORN_TOPDIR = $(NASHORN_TOPDIR)"  >> $(MESSAGE_FILE)
+endif
 ifeq ($(DEPLOY_SRC_AVAILABLE), true)
 	@$(ECHO) "   DEPLOY_TOPDIR = $(DEPLOY_TOPDIR)"  >> $(MESSAGE_FILE)
 endif
@@ -303,6 +314,9 @@ endif
 ifeq ($(JDK_SRC_AVAILABLE), true)
 	@$(ECHO) "   BUILD_JDK    = $(BUILD_JDK) " >> $(MESSAGE_FILE)
 endif
+ifeq ($(NASHORN_SRC_AVAILABLE), true)
+	@$(ECHO) "   BUILD_NASHORN = $(BUILD_NASHORN) " >> $(MESSAGE_FILE)
+endif
 ifeq ($(DEPLOY_SRC_AVAILABLE), true)
 	@$(ECHO) "   BUILD_DEPLOY  = $(BUILD_DEPLOY) " >> $(MESSAGE_FILE)
 endif
diff --git a/make/scripts/hgforest.sh b/make/scripts/hgforest.sh
index ed937f3711e..f30d3eb7768 100644
--- a/make/scripts/hgforest.sh
+++ b/make/scripts/hgforest.sh
@@ -40,7 +40,7 @@ pull_default=""
 repos=""
 repos_extra=""
 if [ "${command}" = "clone" -o "${command}" = "fclone" ] ; then
-  subrepos="corba jaxp jaxws langtools jdk hotspot"
+  subrepos="corba jaxp jaxws langtools jdk hotspot nashorn"
   if [ -f .hg/hgrc ] ; then
     pull_default=`hg paths default`
     if [ "${pull_default}" = "" ] ; then

From f5666f9a691c21722765adb8e84543d1c99eb652 Mon Sep 17 00:00:00 2001
From: Krystal Mo <kmo@openjdk.org>
Date: Tue, 26 Feb 2013 11:05:26 +0000
Subject: [PATCH 224/311] 7087570: java.lang.invoke.MemberName information
 wrong for method handles created with findConstructor

REF_invokeSpecial DMHs (which are unusual) get marked explicitly; tweak the MHI to use this bit

Reviewed-by: jrose, twisti
---
 .../java/lang/invoke/DirectMethodHandle.java  |  52 ++-
 .../java/lang/invoke/MethodHandle.java        |   9 +-
 .../java/lang/invoke/MethodHandleImpl.java    |  16 +-
 .../java/lang/invoke/MethodHandleInfo.java    |  15 +-
 .../java/lang/invoke/MethodHandles.java       |   4 +-
 .../java/lang/invoke/7087570/Test7087570.java | 326 ++++++++++++++++++
 6 files changed, 401 insertions(+), 21 deletions(-)
 create mode 100644 jdk/test/java/lang/invoke/7087570/Test7087570.java

diff --git a/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java b/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java
index 0df8e730937..68fe71c72c0 100644
--- a/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java
+++ b/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,8 +55,7 @@ class DirectMethodHandle extends MethodHandle {
     }
 
     // Factory methods:
-
-    static DirectMethodHandle make(Class<?> receiver, MemberName member) {
+    static DirectMethodHandle make(byte refKind, Class<?> receiver, MemberName member) {
         MethodType mtype = member.getMethodOrFieldType();
         if (!member.isStatic()) {
             if (!member.getDeclaringClass().isAssignableFrom(receiver) || member.isConstructor())
@@ -64,8 +63,14 @@ class DirectMethodHandle extends MethodHandle {
             mtype = mtype.insertParameterTypes(0, receiver);
         }
         if (!member.isField()) {
-            LambdaForm lform = preparedLambdaForm(member);
-            return new DirectMethodHandle(mtype, lform, member);
+            if (refKind == REF_invokeSpecial) {
+                member = member.asSpecial();
+                LambdaForm lform = preparedLambdaForm(member);
+                return new Special(mtype, lform, member);
+            } else {
+                LambdaForm lform = preparedLambdaForm(member);
+                return new DirectMethodHandle(mtype, lform, member);
+            }
         } else {
             LambdaForm lform = preparedFieldLambdaForm(member);
             if (member.isStatic()) {
@@ -79,6 +84,12 @@ class DirectMethodHandle extends MethodHandle {
             }
         }
     }
+    static DirectMethodHandle make(Class<?> receiver, MemberName member) {
+        byte refKind = member.getReferenceKind();
+        if (refKind == REF_invokeSpecial)
+            refKind =  REF_invokeVirtual;
+        return make(refKind, receiver, member);
+    }
     static DirectMethodHandle make(MemberName member) {
         if (member.isConstructor())
             return makeAllocator(member);
@@ -114,6 +125,10 @@ class DirectMethodHandle extends MethodHandle {
 
     //// Implementation methods.
     @Override
+    MethodHandle viewAsType(MethodType newType) {
+        return new DirectMethodHandle(newType, form, member);
+    }
+    @Override
     @ForceInline
     MemberName internalMemberName() {
         return member;
@@ -357,6 +372,21 @@ class DirectMethodHandle extends MethodHandle {
         ((DirectMethodHandle)mh).ensureInitialized();
     }
 
+    /** This subclass represents invokespecial instructions. */
+    static class Special extends DirectMethodHandle {
+        private Special(MethodType mtype, LambdaForm form, MemberName member) {
+            super(mtype, form, member);
+        }
+        @Override
+        boolean isInvokeSpecial() {
+            return true;
+        }
+        @Override
+        MethodHandle viewAsType(MethodType newType) {
+            return new Special(newType, form, member);
+        }
+    }
+
     /** This subclass handles constructor references. */
     static class Constructor extends DirectMethodHandle {
         final MemberName initMethod;
@@ -369,6 +399,10 @@ class DirectMethodHandle extends MethodHandle {
             this.instanceClass = instanceClass;
             assert(initMethod.isResolved());
         }
+        @Override
+        MethodHandle viewAsType(MethodType newType) {
+            return new Constructor(newType, form, member, initMethod, instanceClass);
+        }
     }
 
     /*non-public*/ static Object constructorMethod(Object mh) {
@@ -395,6 +429,10 @@ class DirectMethodHandle extends MethodHandle {
         @Override Object checkCast(Object obj) {
             return fieldType.cast(obj);
         }
+        @Override
+        MethodHandle viewAsType(MethodType newType) {
+            return new Accessor(newType, form, member, fieldOffset);
+        }
     }
 
     @ForceInline
@@ -434,6 +472,10 @@ class DirectMethodHandle extends MethodHandle {
         @Override Object checkCast(Object obj) {
             return fieldType.cast(obj);
         }
+        @Override
+        MethodHandle viewAsType(MethodType newType) {
+            return new StaticAccessor(newType, form, member, staticBase, staticOffset);
+        }
     }
 
     @ForceInline
diff --git a/jdk/src/share/classes/java/lang/invoke/MethodHandle.java b/jdk/src/share/classes/java/lang/invoke/MethodHandle.java
index aa323eb358a..774faff5afb 100644
--- a/jdk/src/share/classes/java/lang/invoke/MethodHandle.java
+++ b/jdk/src/share/classes/java/lang/invoke/MethodHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1250,8 +1250,6 @@ assertEquals("[three, thee, tee]", asListFix.invoke((Object)argv).toString());
     /*non-public*/
     MethodHandle viewAsType(MethodType newType) {
         // No actual conversions, just a new view of the same method.
-        if (!type.isViewableAs(newType))
-            throw new InternalError();
         return MethodHandleImpl.makePairwiseConvert(this, newType, 0);
     }
 
@@ -1267,6 +1265,11 @@ assertEquals("[three, thee, tee]", asListFix.invoke((Object)argv).toString());
         return null;  // DMH returns DMH.member
     }
 
+    /*non-public*/
+    boolean isInvokeSpecial() {
+        return false;  // DMH.Special returns true
+    }
+
     /*non-public*/
     Object internalValues() {
         return null;
diff --git a/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java b/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java
index 3cdd99cc4a1..376a0a0f552 100644
--- a/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java
+++ b/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -367,11 +367,11 @@ import static java.lang.invoke.MethodHandles.Lookup.IMPL_LOOKUP;
 
         @Override
         MethodHandle viewAsType(MethodType newType) {
-            MethodHandle mh = super.viewAsType(newType);
+            if (newType.lastParameterType() != type().lastParameterType())
+                throw new InternalError();
+            MethodHandle newTarget = asFixedArity().viewAsType(newType);
             // put back the varargs bit:
-            MethodType type = mh.type();
-            int arity = type.parameterCount();
-            return mh.asVarargsCollector(type.parameterType(arity-1));
+            return new AsVarargsCollector(newTarget, newType, arrayType);
         }
 
         @Override
@@ -379,6 +379,12 @@ import static java.lang.invoke.MethodHandles.Lookup.IMPL_LOOKUP;
             return asFixedArity().internalMemberName();
         }
 
+        /*non-public*/
+        @Override
+        boolean isInvokeSpecial() {
+            return asFixedArity().isInvokeSpecial();
+        }
+
 
         @Override
         MethodHandle bindArgument(int pos, char basicType, Object value) {
diff --git a/jdk/src/share/classes/java/lang/invoke/MethodHandleInfo.java b/jdk/src/share/classes/java/lang/invoke/MethodHandleInfo.java
index ae579ab84c4..380ca59b6e1 100644
--- a/jdk/src/share/classes/java/lang/invoke/MethodHandleInfo.java
+++ b/jdk/src/share/classes/java/lang/invoke/MethodHandleInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,6 @@ import java.lang.invoke.MethodHandleNatives.Constants;
  */
 final class MethodHandleInfo {
    public static final int
-       REF_NONE                    = Constants.REF_NONE,
        REF_getField                = Constants.REF_getField,
        REF_getStatic               = Constants.REF_getStatic,
        REF_putField                = Constants.REF_putField,
@@ -48,12 +47,17 @@ final class MethodHandleInfo {
    private final MethodType methodType;
    private final int referenceKind;
 
-   public MethodHandleInfo(MethodHandle mh) throws ReflectiveOperationException {
+   public MethodHandleInfo(MethodHandle mh) {
        MemberName mn = mh.internalMemberName();
+       if (mn == null)  throw new IllegalArgumentException("not a direct method handle");
        this.declaringClass = mn.getDeclaringClass();
        this.name = mn.getName();
-       this.methodType = mn.getMethodType();
-       this.referenceKind = mn.getReferenceKind();
+       this.methodType = mn.getMethodOrFieldType();
+       byte refKind = mn.getReferenceKind();
+       if (refKind == REF_invokeSpecial && !mh.isInvokeSpecial())
+           // Devirtualized method invocation is usually formally virtual.
+           refKind = REF_invokeVirtual;
+       this.referenceKind = refKind;
    }
 
    public Class<?> getDeclaringClass() {
@@ -78,7 +82,6 @@ final class MethodHandleInfo {
 
    static String getReferenceKindString(int referenceKind) {
         switch (referenceKind) {
-            case REF_NONE: return "REF_NONE";
             case REF_getField: return "getfield";
             case REF_getStatic: return "getstatic";
             case REF_putField: return "putfield";
diff --git a/jdk/src/share/classes/java/lang/invoke/MethodHandles.java b/jdk/src/share/classes/java/lang/invoke/MethodHandles.java
index e7007dd2b89..80a44ff2f35 100644
--- a/jdk/src/share/classes/java/lang/invoke/MethodHandles.java
+++ b/jdk/src/share/classes/java/lang/invoke/MethodHandles.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1209,7 +1209,7 @@ return mh1;
             checkMethod(refKind, refc, method);
             if (method.isMethodHandleInvoke())
                 return fakeMethodHandleInvoke(method);
-            MethodHandle mh = DirectMethodHandle.make(refc, method);
+            MethodHandle mh = DirectMethodHandle.make(refKind, refc, method);
             mh = maybeBindCaller(method, mh);
             mh = mh.setVarargs(method);
             if (doRestrict)
diff --git a/jdk/test/java/lang/invoke/7087570/Test7087570.java b/jdk/test/java/lang/invoke/7087570/Test7087570.java
new file mode 100644
index 00000000000..572faccdf5a
--- /dev/null
+++ b/jdk/test/java/lang/invoke/7087570/Test7087570.java
@@ -0,0 +1,326 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+/* @test
+ * @bug 7087570
+ * @summary REF_invokeSpecial DMHs (which are unusual) get marked explicitly; tweak the MHI to use this bit
+ *
+ * @run main Test7087570
+ */
+
+import java.lang.invoke.*;
+import java.lang.reflect.*;
+import java.util.*;
+
+import static java.lang.invoke.MethodHandles.*;
+import static java.lang.invoke.MethodType.*;
+
+public class Test7087570 {
+    // XXX may remove the following constant declarations when MethodHandleInfo is made public
+    private static final int
+            REF_getField                = 1,
+            REF_getStatic               = 2,
+            REF_putField                = 3,
+            REF_putStatic               = 4,
+            REF_invokeVirtual           = 5,
+            REF_invokeStatic            = 6,
+            REF_invokeSpecial           = 7,
+            REF_newInvokeSpecial        = 8,
+            REF_invokeInterface         = 9,
+            REF_LIMIT                  = 10;
+
+    private static final TestMethodData[] TESTS = new TestMethodData[] {
+        // field accessors
+        data(DummyFieldHolder.class, "instanceField", getterMethodType(String.class), DummyFieldHolder.class, REF_getField),
+        data(DummyFieldHolder.class, "instanceField", setterMethodType(String.class), DummyFieldHolder.class, REF_putField),
+        data(DummyFieldHolder.class, "staticField", getterMethodType(Integer.class), DummyFieldHolder.class, REF_getStatic),
+        data(DummyFieldHolder.class, "staticField", setterMethodType(Integer.class), DummyFieldHolder.class, REF_putStatic),
+        data(DummyFieldHolder.class, "instanceByteField", getterMethodType(byte.class), DummyFieldHolder.class, REF_getField),
+        data(DummyFieldHolder.class, "instanceByteField", setterMethodType(byte.class), DummyFieldHolder.class, REF_putField),
+
+        // REF_invokeVirtual
+        data(Object.class, "hashCode", methodType(int.class), Object.class, REF_invokeVirtual),
+
+        // REF_invokeVirtual strength-reduced to REF_invokeSpecial,
+        // test if it normalizes back to REF_invokeVirtual in MethodHandleInfo as expected
+        data(String.class, "hashCode", methodType(int.class), String.class, REF_invokeVirtual),
+
+        // REF_invokeStatic
+        data(Collections.class, "sort", methodType(void.class, List.class), Collections.class, REF_invokeStatic),
+        data(Arrays.class, "asList", methodType(List.class, Object[].class), Arrays.class, REF_invokeStatic), // varargs case
+
+        // REF_invokeSpecial
+        data(Object.class, "hashCode", methodType(int.class), Object.class, REF_invokeSpecial),
+
+        // REF_newInvokeSpecial
+        data(String.class, "<init>", methodType(void.class, char[].class), String.class, REF_newInvokeSpecial),
+        data(DummyFieldHolder.class, "<init>", methodType(void.class, byte.class, Long[].class), DummyFieldHolder.class, REF_newInvokeSpecial), // varargs case
+
+        // REF_invokeInterface
+        data(List.class, "size", methodType(int.class), List.class, REF_invokeInterface)
+    };
+
+    public static void main(String... args) throws Throwable {
+        testWithLookup();
+        testWithUnreflect();
+    }
+
+    private static void doTest(MethodHandle mh, TestMethodData testMethod) {
+        Object mhi = newMethodHandleInfo(mh);
+
+        System.out.printf("%s.%s: %s, nominal refKind: %s, actual refKind: %s\n",
+                          testMethod.clazz.getName(), testMethod.name, testMethod.methodType,
+                          REF_KIND_NAMES[testMethod.referenceKind],
+                          REF_KIND_NAMES[getReferenceKind(mhi)]);
+        assertEquals(testMethod.name,           getName(mhi));
+        assertEquals(testMethod.methodType,     getMethodType(mhi));
+        assertEquals(testMethod.declaringClass, getDeclaringClass(mhi));
+        assertEquals(testMethod.referenceKind == REF_invokeSpecial, isInvokeSpecial(mh));
+        assertRefKindEquals(testMethod.referenceKind,  getReferenceKind(mhi));
+    }
+
+    private static void testWithLookup() throws Throwable {
+        for (TestMethodData testMethod : TESTS) {
+            MethodHandle mh = lookupFrom(testMethod);
+            doTest(mh, testMethod);
+        }
+    }
+
+    private static void testWithUnreflect() throws Throwable {
+        for (TestMethodData testMethod : TESTS) {
+            MethodHandle mh = unreflectFrom(testMethod);
+            doTest(mh, testMethod);
+        }
+    }
+
+    private static MethodType getterMethodType(Class<?> clazz) {
+        return methodType(clazz);
+    }
+
+    private static MethodType setterMethodType(Class<?> clazz) {
+        return methodType(void.class, clazz);
+    }
+
+    private static final String[] REF_KIND_NAMES = {
+        "MH::invokeBasic",
+        "REF_getField", "REF_getStatic", "REF_putField", "REF_putStatic",
+        "REF_invokeVirtual", "REF_invokeStatic", "REF_invokeSpecial",
+        "REF_newInvokeSpecial", "REF_invokeInterface"
+    };
+
+    private static final Lookup LOOKUP = lookup();
+
+    // XXX may remove the following reflective logic when MethodHandleInfo is made public
+    private static final MethodHandle MH_IS_INVOKESPECIAL;
+    private static final MethodHandle MHI_CONSTRUCTOR;
+    private static final MethodHandle MHI_GET_NAME;
+    private static final MethodHandle MHI_GET_METHOD_TYPE;
+    private static final MethodHandle MHI_GET_DECLARING_CLASS;
+    private static final MethodHandle MHI_GET_REFERENCE_KIND;
+
+    static {
+        try {
+            // This is white box testing.  Use reflection to grab private implementation bits.
+            String magicName = "IMPL_LOOKUP";
+            Field magicLookup = MethodHandles.Lookup.class.getDeclaredField(magicName);
+            // This unit test will fail if a security manager is installed.
+            magicLookup.setAccessible(true);
+            // Forbidden fruit...
+            Lookup directInvokeLookup = (Lookup) magicLookup.get(null);
+            Class<?> mhiClass = Class.forName("java.lang.invoke.MethodHandleInfo", false, MethodHandle.class.getClassLoader());
+            MH_IS_INVOKESPECIAL = directInvokeLookup
+                    .findVirtual(MethodHandle.class, "isInvokeSpecial", methodType(boolean.class));
+            MHI_CONSTRUCTOR = directInvokeLookup
+                    .findConstructor(mhiClass, methodType(void.class, MethodHandle.class));
+            MHI_GET_NAME = directInvokeLookup
+                    .findVirtual(mhiClass, "getName", methodType(String.class));
+            MHI_GET_METHOD_TYPE = directInvokeLookup
+                    .findVirtual(mhiClass, "getMethodType", methodType(MethodType.class));
+            MHI_GET_DECLARING_CLASS = directInvokeLookup
+                    .findVirtual(mhiClass, "getDeclaringClass", methodType(Class.class));
+            MHI_GET_REFERENCE_KIND = directInvokeLookup
+                    .findVirtual(mhiClass, "getReferenceKind", methodType(int.class));
+        } catch (ReflectiveOperationException ex) {
+            throw new Error(ex);
+        }
+    }
+
+    private static class TestMethodData {
+        final Class<?> clazz;
+        final String name;
+        final MethodType methodType;
+        final Class<?> declaringClass;
+        final int referenceKind; // the nominal refKind
+
+        public TestMethodData(Class<?> clazz, String name,
+                        MethodType methodType, Class<?> declaringClass,
+                        int referenceKind) {
+            this.clazz = clazz;
+            this.name = name;
+            this.methodType = methodType;
+            this.declaringClass = declaringClass;
+            this.referenceKind = referenceKind;
+        }
+    }
+
+    private static TestMethodData data(Class<?> clazz, String name,
+                                       MethodType methodType, Class<?> declaringClass,
+                                       int referenceKind) {
+        return new TestMethodData(clazz, name, methodType, declaringClass, referenceKind);
+    }
+
+    private static MethodHandle lookupFrom(TestMethodData testMethod)
+            throws NoSuchMethodException, NoSuchFieldException, IllegalAccessException {
+        switch (testMethod.referenceKind) {
+        case REF_getField:
+            return LOOKUP.findGetter(testMethod.clazz, testMethod.name, testMethod.methodType.returnType());
+        case REF_putField:
+            return LOOKUP.findSetter(testMethod.clazz, testMethod.name, testMethod.methodType.parameterType(0));
+        case REF_getStatic:
+            return LOOKUP.findStaticGetter(testMethod.clazz, testMethod.name, testMethod.methodType.returnType());
+        case REF_putStatic:
+            return LOOKUP.findStaticSetter(testMethod.clazz, testMethod.name, testMethod.methodType.parameterType(0));
+        case REF_invokeVirtual:
+        case REF_invokeInterface:
+            return LOOKUP.findVirtual(testMethod.clazz, testMethod.name, testMethod.methodType);
+        case REF_invokeStatic:
+            return LOOKUP.findStatic(testMethod.clazz, testMethod.name, testMethod.methodType);
+        case REF_invokeSpecial:
+            Class<?> thisClass = LOOKUP.lookupClass();
+            return LOOKUP.findSpecial(testMethod.clazz, testMethod.name, testMethod.methodType, thisClass);
+        case REF_newInvokeSpecial:
+            return LOOKUP.findConstructor(testMethod.clazz, testMethod.methodType);
+        default:
+            throw new Error("ERROR: unexpected referenceKind in test data");
+        }
+    }
+
+    private static MethodHandle unreflectFrom(TestMethodData testMethod)
+            throws NoSuchMethodException, NoSuchFieldException, IllegalAccessException {
+        switch (testMethod.referenceKind) {
+        case REF_getField:
+        case REF_getStatic: {
+                Field f = testMethod.clazz.getDeclaredField(testMethod.name);
+                return LOOKUP.unreflectGetter(f);
+            }
+        case REF_putField:
+        case REF_putStatic: {
+                Field f = testMethod.clazz.getDeclaredField(testMethod.name);
+                return LOOKUP.unreflectSetter(f);
+            }
+        case REF_invokeVirtual:
+        case REF_invokeStatic:
+        case REF_invokeInterface: {
+                Method m = testMethod.clazz.getDeclaredMethod(testMethod.name, testMethod.methodType.parameterArray());
+                return LOOKUP.unreflect(m);
+            }
+        case REF_invokeSpecial: {
+                Method m = testMethod.clazz.getDeclaredMethod(testMethod.name, testMethod.methodType.parameterArray());
+                Class<?> thisClass = LOOKUP.lookupClass();
+                return LOOKUP.unreflectSpecial(m, thisClass);
+            }
+        case REF_newInvokeSpecial: {
+                Constructor c = testMethod.clazz.getDeclaredConstructor(testMethod.methodType.parameterArray());
+                return LOOKUP.unreflectConstructor(c);
+            }
+        default:
+            throw new Error("ERROR: unexpected referenceKind in test data");
+        }
+    }
+
+    private static Object newMethodHandleInfo(MethodHandle mh) {
+        try {
+            return MHI_CONSTRUCTOR.invoke(mh);
+        } catch (Throwable ex) {
+            throw new Error(ex);
+        }
+    }
+
+    private static boolean isInvokeSpecial(MethodHandle mh) {
+        try {
+            return (boolean) MH_IS_INVOKESPECIAL.invokeExact(mh);
+        } catch (Throwable ex) {
+            throw new Error(ex);
+        }
+    }
+
+    private static String getName(Object mhi) {
+        try {
+            return (String) MHI_GET_NAME.invoke(mhi);
+        } catch (Throwable ex) {
+            throw new Error(ex);
+        }
+    }
+
+    private static MethodType getMethodType(Object mhi) {
+        try {
+            return (MethodType) MHI_GET_METHOD_TYPE.invoke(mhi);
+        } catch (Throwable ex) {
+            throw new Error(ex);
+        }
+    }
+
+    private static Class<?> getDeclaringClass(Object mhi) {
+        try {
+            return (Class<?>) MHI_GET_DECLARING_CLASS.invoke(mhi);
+        } catch (Throwable ex) {
+            throw new Error(ex);
+        }
+    }
+
+    private static int getReferenceKind(Object mhi) {
+        try {
+            return (int) MHI_GET_REFERENCE_KIND.invoke(mhi);
+        } catch (Throwable ex) {
+            throw new Error(ex);
+        }
+    }
+
+    private static void assertRefKindEquals(int expect, int observed) {
+        if (expect == observed) return;
+
+        String msg = "expected " + REF_KIND_NAMES[(int) expect] +
+                     " but observed " + REF_KIND_NAMES[(int) observed];
+        System.out.println("FAILED: " + msg);
+        throw new AssertionError(msg);
+    }
+
+    private static void assertEquals(Object expect, Object observed) {
+        if (java.util.Objects.equals(expect, observed)) return;
+
+        String msg = "expected " + expect + " but observed " + observed;
+        System.out.println("FAILED: " + msg);
+        throw new AssertionError(msg);
+    }
+}
+
+class DummyFieldHolder {
+    public static Integer staticField;
+    public String instanceField;
+    public byte instanceByteField;
+
+    public DummyFieldHolder(byte unused1, Long... unused2) {
+    }
+}
+

From 61e56e8ead612e72306dd14cb2d83b327f75b6b4 Mon Sep 17 00:00:00 2001
From: Erik Joelsson <erik.joelsson@oracle.com>
Date: Tue, 26 Feb 2013 14:08:19 +0000
Subject: [PATCH 225/311] 8008978: nashorn-rules.gmk missing

Co-authored-by: James Laskey <james.laskey@oracle.com>
Reviewed-by: alanb
---
 make/nashorn-rules.gmk | 59 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 make/nashorn-rules.gmk

diff --git a/make/nashorn-rules.gmk b/make/nashorn-rules.gmk
new file mode 100644
index 00000000000..a86a0475ced
--- /dev/null
+++ b/make/nashorn-rules.gmk
@@ -0,0 +1,59 @@
+#
+# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+################################################################
+# NASHORN TARGETS
+################################################################
+
+NASHORN_BUILD_ARGUMENTS = \
+   $(COMMON_BUILD_ARGUMENTS) \
+   ALT_OUTPUTDIR=$(NASHORN_OUTPUTDIR) \
+   ALT_BOOTDIR=$(BOOTDIR) \
+   ALT_JDK_IMPORT_PATH=$(JDK_IMPORT_PATH)
+
+ifeq ($(BUILD_LANGTOOLS), true)
+   NASHORN_BUILD_ARGUMENTS += ALT_LANGTOOLS_DIST=$(ABS_LANGTOOLS_DIST)
+endif
+
+# Default targets
+NASHORN = nashorn-build
+
+nashorn: nashorn-build
+nashorn-build:
+	$(MKDIR) -p $(NASHORN_OUTPUTDIR)
+	@$(call MakeStart,nashorn,all)
+	($(CD) $(NASHORN_TOPDIR)/make && \
+	 $(MAKE) $(NASHORN_BUILD_ARGUMENTS) all)
+	@$(call MakeFinish,nashorn,all)
+
+nashorn-clobber::
+	$(MKDIR) -p $(NASHORN_OUTPUTDIR)
+	@$(call MakeStart,nashorn,clobber)
+	($(CD) $(NASHORN_TOPDIR)/make &&  \
+	 $(MAKE) $(NASHORN_BUILD_ARGUMENTS) clobber)
+	@$(call MakeFinish,nashorn,clobber)
+
+.PHONY: nashorn nashorn-build nashorn-clobber 
+

From 8eaa894f7c13b225cd57c9b080ff798772f4836b Mon Sep 17 00:00:00 2001
From: Alan Bateman <alanb@openjdk.org>
Date: Tue, 26 Feb 2013 14:16:48 +0000
Subject: [PATCH 226/311] 8008977: profiles build broken by Nashorn build
 changes

Reviewed-by: chegar
---
 jdk/makefiles/profile-rtjar-includes.txt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/jdk/makefiles/profile-rtjar-includes.txt b/jdk/makefiles/profile-rtjar-includes.txt
index 4722727ea31..4cc528e67d5 100644
--- a/jdk/makefiles/profile-rtjar-includes.txt
+++ b/jdk/makefiles/profile-rtjar-includes.txt
@@ -349,6 +349,7 @@ PROFILE_3_RTJAR_INCLUDE_PACKAGES := \
     com/sun/rowset/providers \
     com/sun/script/javascript \
     com/sun/script/util \
+    com/sun/security/auth \
     com/sun/security/auth/callback \
     com/sun/security/auth/login \
     com/sun/security/auth/module \
@@ -448,8 +449,7 @@ PROFILE_3_RTJAR_INCLUDE_PACKAGES := \
     sun/tracing \
     sun/tracing/dtrace
 
-PROFILE_3_RTJAR_INCLUDE_TYPES := \
-    com/sun/security/auth/*.class
+PROFILE_3_RTJAR_INCLUDE_TYPES :=
 
 PROFILE_3_RTJAR_EXCLUDE_TYPES := \
     javax/management/remote/rmi/_RMIConnectionImpl_Tie.class \
@@ -457,10 +457,10 @@ PROFILE_3_RTJAR_EXCLUDE_TYPES := \
     javax/management/remote/rmi/_RMIServerImpl_Tie.class \
     javax/management/remote/rmi/_RMIServer_Stub.class \
     com/sun/security/auth/callback/DialogCallbackHandler.class \
-    com/sun/security/auth/callback/DialogCallbackHandler\$$$$1.class \
-    com/sun/security/auth/callback/DialogCallbackHandler\$$$$2.class \
-    com/sun/security/auth/callback/DialogCallbackHandler\$$$$Action.class \
-    com/sun/security/auth/callback/DialogCallbackHandler\$$$$ConfirmationInfo.class
+    com/sun/security/auth/callback/DialogCallbackHandler\$$1.class \
+    com/sun/security/auth/callback/DialogCallbackHandler\$$2.class \
+    com/sun/security/auth/callback/DialogCallbackHandler\$$Action.class \
+    com/sun/security/auth/callback/DialogCallbackHandler\$$ConfirmationInfo.class
 
 PROFILE_3_INCLUDE_METAINF_SERVICES := \
     META-INF/services/javax.script.ScriptEngineFactory 

From 20b2cd48901fbdbc0ae36926dc32aca81b3f1fae Mon Sep 17 00:00:00 2001
From: Tim Bell <tbell@openjdk.org>
Date: Tue, 26 Feb 2013 09:25:44 -0800
Subject: [PATCH 227/311] 8009019: Updates to generated-configure.sh required
 for 8008914

Reviewed-by: sundar, jlaskey, jjg
---
 common/autoconf/generated-configure.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
index 00d5093259b..04bef5cadc1 100644
--- a/common/autoconf/generated-configure.sh
+++ b/common/autoconf/generated-configure.sh
@@ -3733,7 +3733,7 @@ fi
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1361218904
+DATE_WHEN_GENERATED=1361899489
 
 ###############################################################################
 #

From 7bdfa989fff0385c4e54767a22d3bf09820f734f Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Tue, 26 Feb 2013 22:57:51 +0530
Subject: [PATCH 228/311] 8009021: nasgen should be run on boot jdk rather than
 currenly built jdk

Reviewed-by: jlaskey
---
 nashorn/makefiles/BuildNashorn.gmk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/nashorn/makefiles/BuildNashorn.gmk b/nashorn/makefiles/BuildNashorn.gmk
index 490149804ee..b80dc0664b1 100644
--- a/nashorn/makefiles/BuildNashorn.gmk
+++ b/nashorn/makefiles/BuildNashorn.gmk
@@ -57,10 +57,13 @@ $(eval $(call SetupJavaCompilation,BUILD_NASHORN,\
     COPY:=.properties .js,\
     BIN:=$(NASHORN_OUTPUTDIR)/nashorn_classes))
 
+NASGEN_SRC := $(FIXPATH) $(NASHORN_TOPDIR)/buildtools/nasgen/src
+ASM_SRC := $(FIXPATH) $(JDK_TOPDIR)/src/share/classes/jdk/internal/org/objectweb/asm
+
 # Build nasgen
 $(eval $(call SetupJavaCompilation,BUILD_NASGEN,\
     SETUP:=GENERATE_NEWBYTECODE_DEBUG,\
-    SRC:=$(NASHORN_TOPDIR)/buildtools/nasgen/src,\
+    SRC:=$(NASGEN_SRC) $(ASM_SRC), \
     BIN:=$(NASHORN_OUTPUTDIR)/nasgen_classes,\
     ADD_JAVAC_FLAGS:=-cp $(NASHORN_OUTPUTDIR)/nashorn_classes))
 
@@ -74,7 +77,7 @@ $(NASHORN_OUTPUTDIR)/classes/_the.nasgen.run: $(BUILD_NASGEN)
 	$(MKDIR) -p $(@D)
 	$(RM) -rf $(@D)/jdk $(@D)/netscape
 	$(CP) -R -p $(NASHORN_OUTPUTDIR)/nashorn_classes/* $(@D)/
-	$(FIXPATH) $(JDK_OUTPUTDIR)/bin/java \
+	$(FIXPATH) $(JAVA) \
 		-cp "$(NASHORN_OUTPUTDIR)/nasgen_classes$(PATH_SEP)$(NASHORN_OUTPUTDIR)/nashorn_classes" \
 		jdk.nashorn.internal.tools.nasgen.Main $(@D) jdk.nashorn.internal.objects $(@D)
 	for f in `$(FIND) $(@D)/jdk/nashorn/internal/objects/ -name "*.class"`; do \

From b0dc9de25e90f1aeef23e5a254ead3d70e32ac99 Mon Sep 17 00:00:00 2001
From: Robert Field <rfield@openjdk.org>
Date: Tue, 26 Feb 2013 10:38:58 -0800
Subject: [PATCH 229/311] 8008770: SerializedLambda incorrect class loader for
 lambda deserializing class

Current thread's context ClassLoader was used to load class by name, pass class not name in serialization (Thank you Peter Levart for test and prototype. Thank you Sundar and Peter for unofficial reviews)

Reviewed-by: forax
---
 .../invoke/InnerClassLambdaMetafactory.java   |   4 +-
 .../java/lang/invoke/SerializedLambda.java    |  20 +--
 .../LambdaClassLoaderSerialization.java       | 164 ++++++++++++++++++
 .../invoke/lambda/LambdaSerialization.java    |   1 -
 4 files changed, 170 insertions(+), 19 deletions(-)
 create mode 100644 jdk/test/java/lang/invoke/lambda/LambdaClassLoaderSerialization.java

diff --git a/jdk/src/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java b/jdk/src/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java
index f2bb8ebc62c..f7191f7679f 100644
--- a/jdk/src/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java
+++ b/jdk/src/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java
@@ -53,7 +53,7 @@ import java.security.PrivilegedAction;
     private static final String NAME_OBJECT = "java/lang/Object";
     private static final String DESCR_CTOR_SERIALIZED_LAMBDA
             = MethodType.methodType(void.class,
-                                    String.class,
+                                    Class.class,
                                     int.class, String.class, String.class, String.class,
                                     int.class, String.class, String.class, String.class,
                                     String.class,
@@ -284,7 +284,7 @@ import java.security.PrivilegedAction;
         mv.visitCode();
         mv.visitTypeInsn(NEW, NAME_SERIALIZED_LAMBDA);
         mv.visitInsn(DUP);;
-        mv.visitLdcInsn(targetClass.getName().replace('.', '/'));
+        mv.visitLdcInsn(Type.getType(targetClass));
         mv.visitLdcInsn(samInfo.getReferenceKind());
         mv.visitLdcInsn(invokedType.returnType().getName().replace('.', '/'));
         mv.visitLdcInsn(samInfo.getName());
diff --git a/jdk/src/share/classes/java/lang/invoke/SerializedLambda.java b/jdk/src/share/classes/java/lang/invoke/SerializedLambda.java
index 1a2db3f072a..3679e3f726d 100644
--- a/jdk/src/share/classes/java/lang/invoke/SerializedLambda.java
+++ b/jdk/src/share/classes/java/lang/invoke/SerializedLambda.java
@@ -40,7 +40,7 @@ import java.util.Objects;
  */
 public final class SerializedLambda implements Serializable {
     private static final long serialVersionUID = 8025925345765570181L;
-    private final String capturingClass;
+    private final Class<?> capturingClass;
     private final String functionalInterfaceClass;
     private final String functionalInterfaceMethodName;
     private final String functionalInterfaceMethodSignature;
@@ -73,7 +73,7 @@ public final class SerializedLambda implements Serializable {
      * @param capturedArgs The dynamic arguments to the lambda factory site, which represent variables captured by
      *                     the lambda
      */
-    public SerializedLambda(String capturingClass,
+    public SerializedLambda(Class<?> capturingClass,
                             int functionalInterfaceMethodKind,
                             String functionalInterfaceClass,
                             String functionalInterfaceMethodName,
@@ -99,7 +99,7 @@ public final class SerializedLambda implements Serializable {
 
     /** Get the name of the class that captured this lambda */
     public String getCapturingClass() {
-        return capturingClass;
+        return capturingClass.getName().replace('.', '/');
     }
 
     /** Get the name of the functional interface class to which this lambda has been converted */
@@ -166,9 +166,7 @@ public final class SerializedLambda implements Serializable {
             Method deserialize = AccessController.doPrivileged(new PrivilegedExceptionAction<Method>() {
                 @Override
                 public Method run() throws Exception {
-                    Class<?> clazz = Class.forName(capturingClass.replace('/', '.'), true,
-                                                   Thread.currentThread().getContextClassLoader());
-                    Method m = clazz.getDeclaredMethod("$deserializeLambda$", SerializedLambda.class);
+                    Method m = capturingClass.getDeclaredMethod("$deserializeLambda$", SerializedLambda.class);
                     m.setAccessible(true);
                     return m;
                 }
@@ -196,14 +194,4 @@ public final class SerializedLambda implements Serializable {
                              MethodHandleInfo.getReferenceKindString(implMethodKind), implClass, implMethodName,
                              implMethodSignature, instantiatedMethodType, capturedArgs.length);
     }
-
-    /*
-    // @@@ Review question: is it worthwhile implementing a versioned serialization protocol?
-
-    private void readObject(java.io.ObjectInputStream s) throws java.io.IOException, ClassNotFoundException {
-    }
-
-    private void writeObject(java.io.ObjectOutputStream s) throws java.io.IOException {
-    }
-*/
 }
diff --git a/jdk/test/java/lang/invoke/lambda/LambdaClassLoaderSerialization.java b/jdk/test/java/lang/invoke/lambda/LambdaClassLoaderSerialization.java
new file mode 100644
index 00000000000..9d38102b14a
--- /dev/null
+++ b/jdk/test/java/lang/invoke/lambda/LambdaClassLoaderSerialization.java
@@ -0,0 +1,164 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+@test
+@bug 8004970
+@summary Lambda serialization in the presence of class loaders
+@author Peter Levart
+*/
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.Arrays;
+
+public class LambdaClassLoaderSerialization {
+
+    public interface SerializableRunnable extends Runnable, Serializable {}
+
+    public static class MyCode implements SerializableRunnable {
+
+        private byte[] serialize(Object o) {
+            ByteArrayOutputStream baos;
+            try (
+                ObjectOutputStream oos =
+                    new ObjectOutputStream(baos = new ByteArrayOutputStream())
+            ) {
+                oos.writeObject(o);
+            }
+            catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+            return baos.toByteArray();
+        }
+
+        private <T> T deserialize(byte[] bytes) {
+            try (
+                ObjectInputStream ois =
+                    new ObjectInputStream(new ByteArrayInputStream(bytes))
+            ) {
+                return (T) ois.readObject();
+            }
+            catch (IOException | ClassNotFoundException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        @Override
+        public void run() {
+            System.out.println("                this: " + this);
+
+            SerializableRunnable deSerializedThis = deserialize(serialize(this));
+            System.out.println("    deSerializedThis: " + deSerializedThis);
+
+            SerializableRunnable runnable = () -> {System.out.println("HELLO");};
+            System.out.println("            runnable: " + runnable);
+
+            SerializableRunnable deSerializedRunnable = deserialize(serialize(runnable));
+            System.out.println("deSerializedRunnable: " + deSerializedRunnable);
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        ClassLoader myCl = new MyClassLoader(
+            LambdaClassLoaderSerialization.class.getClassLoader()
+        );
+        Class<?> myCodeClass = Class.forName(
+            LambdaClassLoaderSerialization.class.getName() + "$MyCode",
+            true,
+            myCl
+        );
+        Runnable myCode = (Runnable) myCodeClass.newInstance();
+        myCode.run();
+    }
+
+    static class MyClassLoader extends ClassLoader {
+        MyClassLoader(ClassLoader parent) {
+            super(parent);
+        }
+
+        @Override
+        protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
+            if (name.indexOf('.') < 0) {
+                synchronized (getClassLoadingLock(name)) {
+                    Class<?> c = findLoadedClass(name);
+                    if (c == null) {
+                        c = findClass(name);
+                    }
+                    if (resolve) {
+                        resolveClass(c);
+                    }
+                    return c;
+                }
+            } else {
+                return super.loadClass(name, resolve);
+            }
+        }
+
+        @Override
+        protected Class<?> findClass(String name) throws ClassNotFoundException {
+            String path = name.replace('.', '/').concat(".class");
+            try (InputStream is = getResourceAsStream(path)) {
+                if (is != null) {
+                    byte[] bytes = readFully(is);
+                    return defineClass(name, bytes, 0, bytes.length);
+                } else {
+                    throw new ClassNotFoundException(name);
+                }
+            }
+            catch (IOException e) {
+                throw new ClassNotFoundException(name, e);
+            }
+        }
+
+        static byte[] readFully(InputStream is) throws IOException {
+            byte[] output = {};
+            int pos = 0;
+            while (true) {
+                int bytesToRead;
+                if (pos >= output.length) { // Only expand when there's no room
+                    bytesToRead = output.length + 1024;
+                    if (output.length < pos + bytesToRead) {
+                        output = Arrays.copyOf(output, pos + bytesToRead);
+                    }
+                } else {
+                    bytesToRead = output.length - pos;
+                }
+                int cc = is.read(output, pos, bytesToRead);
+                if (cc < 0) {
+                    if (output.length != pos) {
+                        output = Arrays.copyOf(output, pos);
+                    }
+                    break;
+                }
+                pos += cc;
+            }
+            return output;
+        }
+    }
+}
diff --git a/jdk/test/java/lang/invoke/lambda/LambdaSerialization.java b/jdk/test/java/lang/invoke/lambda/LambdaSerialization.java
index ebe846b173e..6d681c35a66 100644
--- a/jdk/test/java/lang/invoke/lambda/LambdaSerialization.java
+++ b/jdk/test/java/lang/invoke/lambda/LambdaSerialization.java
@@ -25,7 +25,6 @@
 @test
 @bug 8004970
 @summary Lambda serialization
-@run main/othervm LambdaSerialization
 */
 
 import java.io.*;

From 18e1157d3b503b95087723b1475cb0ba624c190b Mon Sep 17 00:00:00 2001
From: Alan Bateman <alanb@openjdk.org>
Date: Tue, 26 Feb 2013 22:39:50 +0000
Subject: [PATCH 230/311] 8009029: SunEC provider classes ending up in rt.jar
 after Nashorn build changes

Reviewed-by: mduigou
---
 jdk/makefiles/CreateJars.gmk | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/jdk/makefiles/CreateJars.gmk b/jdk/makefiles/CreateJars.gmk
index 857e0d5e9a4..82b85dc97f3 100644
--- a/jdk/makefiles/CreateJars.gmk
+++ b/jdk/makefiles/CreateJars.gmk
@@ -213,28 +213,28 @@ RT_JAR_EXCLUDES += \
 	org/relaxng/datatype \
 	sun/awt/HKSCS.class \
 	sun/awt/motif/X11GB2312.class \
-	sun/awt/motif/X11GB2312\$$$$Decoder.class \
-	sun/awt/motif/X11GB2312\$$$$Encoder.class \
+	sun/awt/motif/X11GB2312\$$Decoder.class \
+	sun/awt/motif/X11GB2312\$$Encoder.class \
 	sun/awt/motif/X11GBK.class \
-	sun/awt/motif/X11GBK\$$$$Encoder.class \
+	sun/awt/motif/X11GBK\$$Encoder.class \
 	sun/awt/motif/X11KSC5601.class \
-	sun/awt/motif/X11KSC5601\$$$$Decoder.class \
-	sun/awt/motif/X11KSC5601\$$$$Encoder.class \
+	sun/awt/motif/X11KSC5601\$$Decoder.class \
+	sun/awt/motif/X11KSC5601\$$Encoder.class \
 	sun/jvmstat \
 	sun/net/spi/nameservice/dns \
 	sun/nio/cs/ext \
 	sun/rmi/rmic \
 	sun/security/ec/ECDHKeyAgreement.class \
 	sun/security/ec/ECDSASignature.class \
-	sun/security/ec/ECDSASignature\$$$$Raw.class \
-	sun/security/ec/ECDSASignature\$$$$SHA1.class \
-	sun/security/ec/ECDSASignature\$$$$SHA224.class \
-	sun/security/ec/ECDSASignature\$$$$SHA256.class \
-	sun/security/ec/ECDSASignature\$$$$SHA384.class \
-	sun/security/ec/ECDSASignature\$$$$SHA512.class \
+	sun/security/ec/ECDSASignature\$$Raw.class \
+	sun/security/ec/ECDSASignature\$$SHA1.class \
+	sun/security/ec/ECDSASignature\$$SHA224.class \
+	sun/security/ec/ECDSASignature\$$SHA256.class \
+	sun/security/ec/ECDSASignature\$$SHA384.class \
+	sun/security/ec/ECDSASignature\$$SHA512.class \
 	sun/security/ec/ECKeyFactory.class \
 	sun/security/ec/ECKeyPairGenerator.class \
-	sun/security/ec/SunEC\$$$$1.class \
+	sun/security/ec/SunEC\$$1.class \
 	sun/security/ec/SunEC.class \
 	sun/security/ec/SunECEntries.class \
 	sun/security/internal \

From a26b355e8b589745204fa0d21486428af22ca725 Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Tue, 26 Feb 2013 17:01:04 -0800
Subject: [PATCH 231/311] 8009102: Several docs warnings in Project Lambda APIs

Reviewed-by: mduigou
---
 .../java/lang/invoke/LambdaMetafactory.java   | 19 +++----------------
 .../java/util/function/BinaryOperator.java    |  2 +-
 .../util/function/ToDoubleBiFunction.java     |  2 +-
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/jdk/src/share/classes/java/lang/invoke/LambdaMetafactory.java b/jdk/src/share/classes/java/lang/invoke/LambdaMetafactory.java
index 24c0c72c71c..d179d438e8a 100644
--- a/jdk/src/share/classes/java/lang/invoke/LambdaMetafactory.java
+++ b/jdk/src/share/classes/java/lang/invoke/LambdaMetafactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -220,24 +220,11 @@ public class LambdaMetafactory {
      *               of the caller.
      * @param invokedName Stacked automatically by VM; the name of the invoked method as it appears at the call site.
      *                    Currently unused.
-     * @param invokedType Stacked automatically by VM; the signature of the invoked method, which includes the
+     * @param invokedType Stacked automatically by VM; the signature of the invoked method, which includes thefu
      *                    expected static type of the returned lambda object, and the static types of the captured
      *                    arguments for the lambda.  In the event that the implementation method is an instance method,
      *                    the first argument in the invocation signature will correspond to the receiver.
-     * @param samMethod The primary method in the functional interface to which the lambda or method reference is
-     *                  being converted, represented as a method handle.
-     * @param implMethod The implementation method which should be called (with suitable adaptation of argument
-     *                   types, return types, and adjustment for captured arguments) when methods of the resulting
-     *                   functional interface instance are invoked.
-     * @param instantiatedMethodType The signature of the primary functional interface method after type variables
-     *                               are substituted with their instantiation from the capture site
-     * @param flags A bitmask containing flags that may influence the translation of this lambda expression.  Defined
-     *              fields include FLAG_SERIALIZABLE and FLAG_MARKERS.
-     * @param markerInterfaceCount If the FLAG_MARKERS flag is set, this is a count of the number of additional
-     *                             marker interfaces
-     * @param markerInterfaces If the FLAG_MARKERS flag is set, this consists of Class objects identifying additional
-     *                         marker interfaces which the lambda object should implement, whose count equals
-     *                         markerInterfaceCount
+     * @param  args       argument to pass, flags, marker interface count, and marker interfaces as described above
      * @return a CallSite, which, when invoked, will return an instance of the functional interface
      * @throws ReflectiveOperationException
      * @throws LambdaConversionException If any of the meta-factory protocol invariants are violated
diff --git a/jdk/src/share/classes/java/util/function/BinaryOperator.java b/jdk/src/share/classes/java/util/function/BinaryOperator.java
index 5f1d5a41d83..e81bce8c553 100644
--- a/jdk/src/share/classes/java/util/function/BinaryOperator.java
+++ b/jdk/src/share/classes/java/util/function/BinaryOperator.java
@@ -30,7 +30,7 @@ package java.util.function;
  *
  * @param <T> the type of operands to {@code apply} and of the result
  *
- * @see BiFunction.
+ * @see BiFunction
  * @since 1.8
  */
 @FunctionalInterface
diff --git a/jdk/src/share/classes/java/util/function/ToDoubleBiFunction.java b/jdk/src/share/classes/java/util/function/ToDoubleBiFunction.java
index df299aa58d7..8826e12dad7 100644
--- a/jdk/src/share/classes/java/util/function/ToDoubleBiFunction.java
+++ b/jdk/src/share/classes/java/util/function/ToDoubleBiFunction.java
@@ -33,7 +33,7 @@ package java.util.function;
  * @param <U> the type of the second argument to the {@code applyAsDouble}
  * operation.
  *
- * @see BiFunction.
+ * @see BiFunction
  * @since 1.8
  */
 @FunctionalInterface

From 1caebc408da0517842f79a6304c96b1322242718 Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Tue, 26 Feb 2013 17:38:29 -0800
Subject: [PATCH 232/311] 8008279: Remove InvalidContainerAnnotationError.java

Reviewed-by: jfranck
---
 .../InvalidContainerAnnotationError.java      | 128 ------------------
 .../java/lang/reflect/AnnotatedElement.java   |   8 +-
 .../reflect/annotation/AnnotationSupport.java |  16 +--
 3 files changed, 10 insertions(+), 142 deletions(-)
 delete mode 100644 jdk/src/share/classes/java/lang/annotation/InvalidContainerAnnotationError.java

diff --git a/jdk/src/share/classes/java/lang/annotation/InvalidContainerAnnotationError.java b/jdk/src/share/classes/java/lang/annotation/InvalidContainerAnnotationError.java
deleted file mode 100644
index 37d00a98b40..00000000000
--- a/jdk/src/share/classes/java/lang/annotation/InvalidContainerAnnotationError.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package java.lang.annotation;
-
-import java.util.Objects;
-
-/**
- * Thrown to indicate that an annotation type expected to act as a
- * container for another annotation type by virture of an @Repeatable
- * annotation, does not act as a container.
- *
- * @see   java.lang.reflect.AnnotatedElement
- * @since 1.8
- * @jls   9.6 Annotation Types
- * @jls   9.7 Annotations
- */
-public class InvalidContainerAnnotationError extends AnnotationFormatError {
-    private static final long serialVersionUID = 5023L;
-
-    /**
-     * The instance of the erroneous container.
-     */
-    private transient Annotation container;
-
-    /**
-     * The type of the annotation that should be contained in the
-     * container.
-     */
-    private transient Class<? extends Annotation> annotationType;
-
-    /**
-     * Constructs a new InvalidContainerAnnotationError with the
-     * specified detail message.
-     *
-     * @param  message the detail message.
-     */
-    public InvalidContainerAnnotationError(String message) {
-        super(message);
-    }
-
-    /**
-     * Constructs a new InvalidContainerAnnotationError with the specified
-     * detail message and cause.  Note that the detail message associated
-     * with {@code cause} is <i>not</i> automatically incorporated in
-     * this error's detail message.
-     *
-     * @param message the detail message
-     * @param cause the cause, may be {@code null}
-     */
-    public InvalidContainerAnnotationError(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    /**
-     * Constructs a new InvalidContainerAnnotationError with the
-     * specified cause and a detail message of {@code (cause == null ?
-     * null : cause.toString())} (which typically contains the class
-     * and detail message of {@code cause}).
-     *
-     * @param cause the cause, may be {@code null}
-     */
-    public InvalidContainerAnnotationError(Throwable cause) {
-        super(cause);
-    }
-
-    /**
-     * Constructs InvalidContainerAnnotationError for the specified
-     * container instance and contained annotation type.
-     *
-     * @param  message the detail message
-     * @param  cause the cause, may be {@code null}
-     * @param container the erroneous container instance, may be
-     *        {@code null}
-     * @param annotationType the annotation type intended to be
-     *        contained, may be {@code null}
-     */
-    public InvalidContainerAnnotationError(String message,
-                                           Throwable cause,
-                                           Annotation container,
-                                           Class<? extends Annotation> annotationType) {
-        super(message, cause);
-        this.container = container;
-        this.annotationType = annotationType;
-    }
-
-    /**
-     * Returns the erroneous container.
-     *
-     * @return the erroneous container, may return {@code null}
-     */
-    public Annotation getContainer() {
-        return container;
-    }
-
-    /**
-     * Returns the annotation type intended to be contained. Returns
-     * {@code null} if the annotation type intended to be contained
-     * could not be determined.
-     *
-     * @return the annotation type intended to be contained, or {@code
-     * null} if unknown
-     */
-    public Class<? extends Annotation> getAnnotationType() {
-        return annotationType;
-    }
-}
diff --git a/jdk/src/share/classes/java/lang/reflect/AnnotatedElement.java b/jdk/src/share/classes/java/lang/reflect/AnnotatedElement.java
index d6cffec2f28..b2c43de3d7b 100644
--- a/jdk/src/share/classes/java/lang/reflect/AnnotatedElement.java
+++ b/jdk/src/share/classes/java/lang/reflect/AnnotatedElement.java
@@ -26,6 +26,7 @@
 package java.lang.reflect;
 
 import java.lang.annotation.Annotation;
+import java.lang.annotation.AnnotationFormatError;
 
 /**
  * Represents an annotated element of the program currently running in this
@@ -86,8 +87,8 @@ import java.lang.annotation.Annotation;
  *
  * <p>Attempting to read annotations of a repeatable annotation type T
  * that are contained in an annotation whose type is not, in fact, the
- * containing annotation type of T will result in an
- * InvalidContainerAnnotationError.
+ * containing annotation type of T, will result in an {@link
+ * AnnotationFormatError}.
  *
  * <p>Finally, attempting to read a member whose definition has evolved
  * incompatibly will result in a {@link
@@ -96,10 +97,9 @@ import java.lang.annotation.Annotation;
  *
  * @see java.lang.EnumConstantNotPresentException
  * @see java.lang.TypeNotPresentException
- * @see java.lang.annotation.AnnotationFormatError
+ * @see AnnotationFormatError
  * @see java.lang.annotation.AnnotationTypeMismatchException
  * @see java.lang.annotation.IncompleteAnnotationException
- * @see java.lang.annotation.InvalidContainerAnnotationError
  * @since 1.5
  * @author Josh Bloch
  */
diff --git a/jdk/src/share/classes/sun/reflect/annotation/AnnotationSupport.java b/jdk/src/share/classes/sun/reflect/annotation/AnnotationSupport.java
index 5ca88f90202..ed1443a5c5a 100644
--- a/jdk/src/share/classes/sun/reflect/annotation/AnnotationSupport.java
+++ b/jdk/src/share/classes/sun/reflect/annotation/AnnotationSupport.java
@@ -86,11 +86,11 @@ public final class AnnotationSupport {
             Class<? extends Annotation> containerClass = containerInstance.annotationType();
             AnnotationType annoType = AnnotationType.getInstance(containerClass);
             if (annoType == null)
-                throw new InvalidContainerAnnotationError(containerInstance + " is an invalid container for repeating annotations");
+                throw new AnnotationFormatError(containerInstance + " is an invalid container for repeating annotations");
 
             Method m = annoType.members().get("value");
             if (m == null)
-                throw new InvalidContainerAnnotationError(containerInstance +
+                throw new AnnotationFormatError(containerInstance +
                                                           " is an invalid container for repeating annotations");
             m.setAccessible(true);
 
@@ -103,11 +103,9 @@ public final class AnnotationSupport {
                  IllegalArgumentException | // parameters doesn't match
                  InvocationTargetException | // the value method threw an exception
                  ClassCastException e) { // well, a cast failed ...
-            throw new InvalidContainerAnnotationError(
+            throw new AnnotationFormatError(
                     containerInstance + " is an invalid container for repeating annotations",
-                    e,
-                    containerInstance,
-                    null);
+                    e);
         }
     }
 
@@ -129,12 +127,10 @@ public final class AnnotationSupport {
             return l;
         } catch (ClassCastException |
                  NullPointerException e) {
-            throw new InvalidContainerAnnotationError(
+            throw new AnnotationFormatError(
                     String.format("%s is an invalid container for repeating annotations of type: %s",
                         containerInstance, annotationClass),
-                    e,
-                    containerInstance,
-                    annotationClass);
+                    e);
         }
     }
 }

From 9f8e932d418e2da30668564125b32f5c6ef606d5 Mon Sep 17 00:00:00 2001
From: Alan Bateman <alanb@openjdk.org>
Date: Wed, 27 Feb 2013 14:12:45 +0000
Subject: [PATCH 233/311] 8008950: jdk8/tl failing with SetupJavaCompilation
 BUILD_NASGEN contains missing directory -c on Windows

Reviewed-by: chegar, sundar
---
 nashorn/makefiles/BuildNashorn.gmk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nashorn/makefiles/BuildNashorn.gmk b/nashorn/makefiles/BuildNashorn.gmk
index b80dc0664b1..d08f7e8fa6f 100644
--- a/nashorn/makefiles/BuildNashorn.gmk
+++ b/nashorn/makefiles/BuildNashorn.gmk
@@ -57,8 +57,8 @@ $(eval $(call SetupJavaCompilation,BUILD_NASHORN,\
     COPY:=.properties .js,\
     BIN:=$(NASHORN_OUTPUTDIR)/nashorn_classes))
 
-NASGEN_SRC := $(FIXPATH) $(NASHORN_TOPDIR)/buildtools/nasgen/src
-ASM_SRC := $(FIXPATH) $(JDK_TOPDIR)/src/share/classes/jdk/internal/org/objectweb/asm
+NASGEN_SRC := $(NASHORN_TOPDIR)/buildtools/nasgen/src
+ASM_SRC := $(JDK_TOPDIR)/src/share/classes/jdk/internal/org/objectweb/asm
 
 # Build nasgen
 $(eval $(call SetupJavaCompilation,BUILD_NASGEN,\

From a1ade22dc06a7835a2285eb2ee76b9b5bb95f433 Mon Sep 17 00:00:00 2001
From: Attila Szegedi <attila@openjdk.org>
Date: Wed, 27 Feb 2013 15:20:26 +0100
Subject: [PATCH 234/311] 8009143: Eliminate Dynalink dependency on java.beans

Reviewed-by: jlaskey, lagergren, sundar
---
 .../dynalink/beans/AbstractJavaLinker.java    | 28 ++++++++++++++++---
 .../internal/dynalink/beans/BeansLinker.java  |  9 ++----
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/nashorn/src/jdk/internal/dynalink/beans/AbstractJavaLinker.java b/nashorn/src/jdk/internal/dynalink/beans/AbstractJavaLinker.java
index 8fc76f049af..702c1509fd4 100644
--- a/nashorn/src/jdk/internal/dynalink/beans/AbstractJavaLinker.java
+++ b/nashorn/src/jdk/internal/dynalink/beans/AbstractJavaLinker.java
@@ -83,7 +83,6 @@
 
 package jdk.internal.dynalink.beans;
 
-import java.beans.Introspector;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
@@ -136,16 +135,16 @@ abstract class AbstractJavaLinker implements GuardingDynamicLinker {
             // Add the method as a property getter and/or setter
             if(name.startsWith("get") && name.length() > 3 && method.getParameterTypes().length == 0) {
                 // Property getter
-                setPropertyGetter(Introspector.decapitalize(name.substring(3)), introspector.unreflect(
+                setPropertyGetter(decapitalize(name.substring(3)), introspector.unreflect(
                         getMostGenericGetter(method)), ValidationType.INSTANCE_OF);
             } else if(name.startsWith("is") && name.length() > 2 && method.getParameterTypes().length == 0 &&
                     method.getReturnType() == boolean.class) {
                 // Boolean property getter
-                setPropertyGetter(Introspector.decapitalize(name.substring(2)), introspector.unreflect(
+                setPropertyGetter(decapitalize(name.substring(2)), introspector.unreflect(
                         getMostGenericGetter(method)), ValidationType.INSTANCE_OF);
             } else if(name.startsWith("set") && name.length() > 3 && method.getParameterTypes().length == 1) {
                 // Property setter
-                addMember(Introspector.decapitalize(name.substring(3)), methodHandle, propertySetters);
+                addMember(decapitalize(name.substring(3)), methodHandle, propertySetters);
             }
         }
 
@@ -170,6 +169,27 @@ abstract class AbstractJavaLinker implements GuardingDynamicLinker {
         }
     }
 
+    private static String decapitalize(String str) {
+        assert str != null;
+        if(str.isEmpty()) {
+            return str;
+        }
+
+        final char c0 = str.charAt(0);
+        if(Character.isLowerCase(c0)) {
+            return str;
+        }
+
+        // If it has two consecutive upper-case characters, i.e. "URL", don't decapitalize
+        if(str.length() > 1 && Character.isUpperCase(str.charAt(1))) {
+            return str;
+        }
+
+        final char c[] = str.toCharArray();
+        c[0] = Character.toLowerCase(c0);
+        return new String(c);
+    }
+
     abstract FacetIntrospector createFacetIntrospector();
 
     void setPropertyGetter(String name, MethodHandle handle, ValidationType validationType) {
diff --git a/nashorn/src/jdk/internal/dynalink/beans/BeansLinker.java b/nashorn/src/jdk/internal/dynalink/beans/BeansLinker.java
index 706d89f07c9..85811235699 100644
--- a/nashorn/src/jdk/internal/dynalink/beans/BeansLinker.java
+++ b/nashorn/src/jdk/internal/dynalink/beans/BeansLinker.java
@@ -83,7 +83,6 @@
 
 package jdk.internal.dynalink.beans;
 
-import java.beans.BeanInfo;
 import java.lang.invoke.MethodHandles;
 import jdk.internal.dynalink.CallSiteDescriptor;
 import jdk.internal.dynalink.DynamicLinkerFactory;
@@ -99,11 +98,9 @@ import jdk.internal.dynalink.linker.TypeBasedGuardingDynamicLinker;
  * <ul>
  * <li>expose all public methods of form {@code setXxx()}, {@code getXxx()}, and {@code isXxx()} as property setters and
  * getters for {@code dyn:setProp} and {@code dyn:getProp} operations;</li>
- * <li>expose all property getters and setters declared by the class' {@link BeanInfo};</li>
- * <li>expose all public methods and methods declared by the class' {@link BeanInfo} for invocation through
- * {@code dyn:callMethod} operation;</li>
- * <li>expose all public methods and methods declared by the class' {@link BeanInfo} for retrieval for
- * {@code dyn:getMethod} operation; the methods thus retrieved can then be invoked using {@code dyn:call};</li>
+ * <li>expose all public methods for invocation through {@code dyn:callMethod} operation;</li>
+ * <li>expose all public methods for retrieval for {@code dyn:getMethod} operation; the methods thus retrieved can then
+ * be invoked using {@code dyn:call};</li>
  * <li>expose all public fields as properties, unless there are getters or setters for the properties of the same name;</li>
  * <li>expose {@code dyn:getLength}, {@code dyn:getElem} and {@code dyn:setElem} on native Java arrays, as well as
  * {@link java.util.List} and {@link java.util.Map} objects; ({@code dyn:getLength} works on any

From 5b7d451617ea3fd32a2d161183f5bb8433043c4c Mon Sep 17 00:00:00 2001
From: Attila Szegedi <attila@openjdk.org>
Date: Wed, 27 Feb 2013 15:49:05 +0100
Subject: [PATCH 235/311] 8009146: Eliminate some dead code in preparation for
 immutable AST

Reviewed-by: hannesw, lagergren
---
 .../nashorn/internal/codegen/CodeGenerator.java    |  4 ----
 .../src/jdk/nashorn/internal/ir/Assignment.java    | 14 --------------
 nashorn/src/jdk/nashorn/internal/ir/UnaryNode.java | 10 ----------
 nashorn/src/jdk/nashorn/internal/ir/VarNode.java   | 10 ----------
 .../runtime/linker/NashornCallSiteDescriptor.java  |  2 --
 5 files changed, 40 deletions(-)

diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
index 380ecaff57d..2ffb5bd887d 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
@@ -46,7 +46,6 @@ import static jdk.nashorn.internal.codegen.CompilerConstants.typeDescriptor;
 import static jdk.nashorn.internal.ir.Symbol.IS_INTERNAL;
 import static jdk.nashorn.internal.ir.Symbol.IS_TEMP;
 import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_FAST_SCOPE;
-import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_FUNCTION_DECLARATION;
 import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_SCOPE;
 import static jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor.CALLSITE_STRICT;
 
@@ -2052,9 +2051,6 @@ final class CodeGenerator extends NodeOperatorVisitor {
 
         if (needsScope) {
             int flags = CALLSITE_SCOPE | getCallSiteFlags();
-            if (varNode.isFunctionVarNode()) {
-                flags |= CALLSITE_FUNCTION_DECLARATION;
-            }
             final IdentNode identNode = varNode.getName();
             final Type type = identNode.getType();
             if (varSymbol.isFastScope(getCurrentFunctionNode())) {
diff --git a/nashorn/src/jdk/nashorn/internal/ir/Assignment.java b/nashorn/src/jdk/nashorn/internal/ir/Assignment.java
index 142a7062d4c..8107a8725f0 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/Assignment.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/Assignment.java
@@ -46,18 +46,4 @@ public interface Assignment<D extends Node> {
      * @return get the assignment source node
      */
     public Node getAssignmentSource();
-
-    /**
-     * Reset the assignment source
-     *
-     * @param newSource new source node
-     */
-    public void setAssignmentSource(final Node newSource);
-
-    /**
-     * Reset the assignment destination
-     *
-     * @param newDest new destination node
-     */
-    public void setAssignmentDest(final D newDest);
 }
diff --git a/nashorn/src/jdk/nashorn/internal/ir/UnaryNode.java b/nashorn/src/jdk/nashorn/internal/ir/UnaryNode.java
index 99a749903e1..7b608edf7ac 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/UnaryNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/UnaryNode.java
@@ -108,16 +108,6 @@ public class UnaryNode extends Node implements Assignment<Node> {
         return getAssignmentDest();
     }
 
-    @Override
-    public void setAssignmentSource(final Node source) {
-        setAssignmentDest(source);
-    }
-
-    @Override
-    public void setAssignmentDest(final Node source) {
-        setRHS(source);
-    }
-
     @Override
     public boolean equals(final Object other) {
         if (!super.equals(other)) {
diff --git a/nashorn/src/jdk/nashorn/internal/ir/VarNode.java b/nashorn/src/jdk/nashorn/internal/ir/VarNode.java
index 82ab493fc36..07b6f8eca50 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/VarNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/VarNode.java
@@ -82,21 +82,11 @@ public class VarNode extends Node implements Assignment<IdentNode> {
         return isAssignment() ? name : null;
     }
 
-    @Override
-    public void setAssignmentDest(final IdentNode node) {
-        setName(name);
-    }
-
     @Override
     public Node getAssignmentSource() {
         return isAssignment() ? getInit() : null;
     }
 
-    @Override
-    public void setAssignmentSource(final Node source) {
-        setInit(source);
-    }
-
     /**
      * Does this variable declaration have an init value
      * @return true if an init exists, false otherwise
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java
index a4fbc0740c3..beab2e1dc9c 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java
@@ -43,8 +43,6 @@ public class NashornCallSiteDescriptor extends AbstractCallSiteDescriptor {
     public static final int CALLSITE_SCOPE                = 0x01;
     /** Flags that the call site is in code that uses ECMAScript strict mode. */
     public static final int CALLSITE_STRICT               = 0x02;
-    /** Flags that a property setter call site is part of a function declaration that assigns the function object to a name. */
-    public static final int CALLSITE_FUNCTION_DECLARATION = 0x04;
     /** Flags that a property getter or setter call site references a scope variable that is not in the global scope
      * (it is in a function lexical scope), and the function's scope object class is fixed and known in advance. Such
      * getters and setters can often be linked more optimally using these assumptions. */

From c44210c9714b50dafb57a97711f5f5b94bc5f6f7 Mon Sep 17 00:00:00 2001
From: Attila Szegedi <attila@openjdk.org>
Date: Wed, 27 Feb 2013 16:25:15 +0100
Subject: [PATCH 236/311] 8009150: Previous dead code elimination was
 incomplete

Reviewed-by: hannesw, lagergren
---
 nashorn/src/jdk/nashorn/internal/ir/BinaryNode.java | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/nashorn/src/jdk/nashorn/internal/ir/BinaryNode.java b/nashorn/src/jdk/nashorn/internal/ir/BinaryNode.java
index d1db336d8a4..26964ba5ca5 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/BinaryNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/BinaryNode.java
@@ -139,21 +139,11 @@ public class BinaryNode extends UnaryNode {
         return isAssignment() ? lhs() : null;
     }
 
-    @Override
-    public void setAssignmentDest(final Node node) {
-        setLHS(node);
-    }
-
     @Override
     public Node getAssignmentSource() {
         return rhs();
     }
 
-    @Override
-    public void setAssignmentSource(final Node source) {
-        setRHS(source);
-    }
-
     @Override
     public boolean equals(final Object other) {
         if (!super.equals(other)) {

From b097b0d23423f887bd5ef2f3a19e28c50fad62dc Mon Sep 17 00:00:00 2001
From: Denis Fokin <denis@openjdk.org>
Date: Wed, 27 Feb 2013 19:38:36 +0400
Subject: [PATCH 237/311] 7178079: REGRESSION: Some AWT Drag-n-Drop tests fail
 since JDK 7u6 b13

Reviewed-by: serb, anthony
---
 .../classes/sun/lwawt/macosx/CDropTargetContextPeer.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CDropTargetContextPeer.java b/jdk/src/macosx/classes/sun/lwawt/macosx/CDropTargetContextPeer.java
index 181d0847225..0f32d3178fd 100644
--- a/jdk/src/macosx/classes/sun/lwawt/macosx/CDropTargetContextPeer.java
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CDropTargetContextPeer.java
@@ -128,6 +128,15 @@ final class CDropTargetContextPeer extends SunDropTargetContextPeer {
         }
     }
 
+    @Override
+    protected int postDropTargetEvent(Component component, int x, int y, int dropAction,
+                                      int actions, long[] formats, long nativeCtxt, int eventID,
+                                      boolean dispatchType) {
+        // On MacOS X all the DnD events should be synchronous
+        return super.postDropTargetEvent(component, x, y, dropAction, actions, formats, nativeCtxt,
+                eventID, SunDropTargetContextPeer.DISPATCH_SYNC);
+    }
+
     // Signal drop complete:
     protected void doDropDone(boolean success, int dropAction, boolean isLocal) {
         long nativeDropTarget = this.getNativeDragContext();

From e19091b0b1943c67c5ac538e05ae0db133a59e5e Mon Sep 17 00:00:00 2001
From: Denis Fokin <denis@openjdk.org>
Date: Wed, 27 Feb 2013 20:34:04 +0400
Subject: [PATCH 238/311] 8009158: Incomplete fix for 7178079

Reviewed-by: serb, anthony
---
 jdk/src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jdk/src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java b/jdk/src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java
index 302a6dbc62e..360bb9a63a6 100644
--- a/jdk/src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java
+++ b/jdk/src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java
@@ -498,7 +498,7 @@ public abstract class SunDropTargetContextPeer implements DropTargetContextPeer,
         postDropTargetEvent(component, x, y, dropAction, actions,
                             formats, nativeCtxt,
                             SunDropTargetEvent.MOUSE_DROPPED,
-                            SunDropTargetContextPeer.DISPATCH_SYNC);
+                            !SunDropTargetContextPeer.DISPATCH_SYNC);
     }
 
     /**

From 526214260178077be6a0bedac46f66f1ea147c5d Mon Sep 17 00:00:00 2001
From: Mike Duigou <mduigou@openjdk.org>
Date: Wed, 27 Feb 2013 11:00:20 -0800
Subject: [PATCH 239/311] 8008785: IdentityHashMap.values().toArray(V[]) broken
 by JDK-8008167

Reviewed-by: alanb
---
 .../classes/java/util/IdentityHashMap.java    |   4 +-
 jdk/test/java/util/Map/ToArray.java           | 187 ++++++++++++++++++
 2 files changed, 189 insertions(+), 2 deletions(-)
 create mode 100644 jdk/test/java/util/Map/ToArray.java

diff --git a/jdk/src/share/classes/java/util/IdentityHashMap.java b/jdk/src/share/classes/java/util/IdentityHashMap.java
index f05bd144e04..49bb9943ff6 100644
--- a/jdk/src/share/classes/java/util/IdentityHashMap.java
+++ b/jdk/src/share/classes/java/util/IdentityHashMap.java
@@ -1106,12 +1106,12 @@ public class IdentityHashMap<K,V>
             Object[] tab = table;
             int ti = 0;
             for (int si = 0; si < tab.length; si += 2) {
-                if (tab[si++] != null) { // key present ?
+                if (tab[si] != null) { // key present ?
                     // more elements than expected -> concurrent modification from other thread
                     if (ti >= size) {
                         throw new ConcurrentModificationException();
                     }
-                    a[ti++] = (T) tab[si]; // copy value
+                    a[ti++] = (T) tab[si+1]; // copy value
                 }
             }
             // fewer elements than expected or concurrent modification from other thread detected
diff --git a/jdk/test/java/util/Map/ToArray.java b/jdk/test/java/util/Map/ToArray.java
new file mode 100644
index 00000000000..f7a8de716cf
--- /dev/null
+++ b/jdk/test/java/util/Map/ToArray.java
@@ -0,0 +1,187 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8008785
+ * @summary Ensure toArray() implementations return correct results.
+ * @author Mike Duigou
+ */
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentSkipListMap;
+
+public class ToArray {
+
+    /**
+     * Number of elements per map.
+     */
+    private static final int TEST_SIZE = 5000;
+
+    private static void realMain(String[] args) throws Throwable {
+        Map<Integer, Long>[] maps = (Map<Integer, Long>[]) new Map[]{
+                    new HashMap<>(),
+                    new Hashtable<>(),
+                    new IdentityHashMap<>(),
+                    new LinkedHashMap<>(),
+                    new TreeMap<>(),
+                    new WeakHashMap<>(),
+                    new ConcurrentHashMap<>(),
+                    new ConcurrentSkipListMap<>()
+                };
+
+        // for each map type.
+        for (Map<Integer, Long> map : maps) {
+             try {
+                testMap(map);
+             } catch(Exception all) {
+                unexpected("Failed for " + map.getClass().getName(), all);
+             }
+        }
+    }
+
+    private static final Integer[] KEYS = new Integer[TEST_SIZE];
+
+    private static final Long[] VALUES = new Long[TEST_SIZE];
+
+    static {
+        for (int each = 0; each < TEST_SIZE; each++) {
+            KEYS[each]   = Integer.valueOf(each);
+            VALUES[each] = Long.valueOf(each + TEST_SIZE);
+        }
+    }
+
+
+    private static void testMap(Map<Integer, Long> map) {
+        System.out.println("Testing " + map.getClass());
+        System.out.flush();
+
+        // Fill the map
+        for (int each = 0; each < TEST_SIZE; each++) {
+            map.put(KEYS[each], VALUES[each]);
+        }
+
+        // check the keys
+        Object[] keys = map.keySet().toArray();
+        Arrays.sort(keys);
+
+        for(int each = 0; each < TEST_SIZE; each++) {
+            check( "unexpected key", keys[each] == KEYS[each]);
+        }
+
+        // check the values
+        Object[] values = map.values().toArray();
+        Arrays.sort(values);
+
+        for(int each = 0; each < TEST_SIZE; each++) {
+            check( "unexpected value", values[each] == VALUES[each]);
+        }
+
+        // check the entries
+        Map.Entry<Integer,Long>[] entries = map.entrySet().toArray(new Map.Entry[TEST_SIZE]);
+        Arrays.sort( entries,new Comparator<Map.Entry<Integer,Long>>() {
+                public int compare(Map.Entry<Integer,Long> o1, Map.Entry<Integer,Long> o2) {
+                        return o1.getKey().compareTo(o2.getKey());
+                }});
+
+        for(int each = 0; each < TEST_SIZE; each++) {
+            check( "unexpected entry", entries[each].getKey() == KEYS[each] && entries[each].getValue() == VALUES[each]);
+        }
+    }
+
+    //--------------------- Infrastructure ---------------------------
+    static volatile int passed = 0, failed = 0;
+
+    static void pass() {
+        passed++;
+    }
+
+    static void fail() {
+        failed++;
+        (new Error("Failure")).printStackTrace(System.err);
+    }
+
+    static void fail(String msg) {
+        failed++;
+        (new Error("Failure: " + msg)).printStackTrace(System.err);
+    }
+
+    static void abort() {
+        fail();
+        System.exit(1);
+    }
+
+    static void abort(String msg) {
+        fail(msg);
+        System.exit(1);
+    }
+
+    static void unexpected(String msg, Throwable t) {
+        System.err.println("Unexpected: " + msg);
+        unexpected(t);
+    }
+
+    static void unexpected(Throwable t) {
+        failed++;
+        t.printStackTrace(System.err);
+    }
+
+    static void check(boolean cond) {
+        if (cond) {
+            pass();
+        } else {
+            fail();
+        }
+    }
+
+    static void check(String desc, boolean cond) {
+        if (cond) {
+            pass();
+        } else {
+            fail(desc);
+        }
+    }
+
+    static void equal(Object x, Object y) {
+        if (Objects.equals(x, y)) {
+            pass();
+        } else {
+            fail(x + " not equal to " + y);
+        }
+    }
+
+    public static void main(String[] args) throws Throwable {
+        Thread.currentThread().setName(ToArray.class.getName());
+//        Thread.currentThread().setPriority(Thread.MAX_PRIORITY);
+        try {
+            realMain(args);
+        } catch (Throwable t) {
+            unexpected(t);
+        }
+
+        System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed);
+        if (failed > 0) {
+            throw new Error("Some tests failed");
+        }
+    }
+}

From e161c78dc39ea4dff8b93e495ae6ecdb1f707bf5 Mon Sep 17 00:00:00 2001
From: Chris Hegarty <chegar@openjdk.org>
Date: Thu, 28 Feb 2013 12:39:29 +0000
Subject: [PATCH 240/311] 8006409: ThreadLocalRandom should dropping padding
 fields from its serialized form

Reviewed-by: dl, martin, alanb, shade
---
 .../util/concurrent/ThreadLocalRandom.java    | 78 +++++++------------
 1 file changed, 30 insertions(+), 48 deletions(-)

diff --git a/jdk/src/share/classes/java/util/concurrent/ThreadLocalRandom.java b/jdk/src/share/classes/java/util/concurrent/ThreadLocalRandom.java
index 08c870f0c22..c19d5128574 100644
--- a/jdk/src/share/classes/java/util/concurrent/ThreadLocalRandom.java
+++ b/jdk/src/share/classes/java/util/concurrent/ThreadLocalRandom.java
@@ -83,22 +83,20 @@ public class ThreadLocalRandom extends Random {
      * programs.
      *
      * Because this class is in a different package than class Thread,
-     * field access methods must use Unsafe to bypass access control
-     * rules.  The base functionality of Random methods is
-     * conveniently isolated in method next(bits), that just reads and
-     * writes the Thread field rather than its own field. However, to
-     * conform to the requirements of the Random constructor, during
-     * construction, the common static ThreadLocalRandom must maintain
-     * initialization and value fields, mainly for the sake of
-     * disabling user calls to setSeed while still allowing a call
-     * from constructor.  For serialization compatibility, these
-     * fields are left with the same declarations as used in the
-     * previous ThreadLocal-based version of this class, that used
-     * them differently. Note that serialization is completely
-     * unnecessary because there is only a static singleton. But these
-     * mechanics still ensure compatibility across versions.
+     * field access methods use Unsafe to bypass access control rules.
+     * The base functionality of Random methods is conveniently
+     * isolated in method next(bits), that just reads and writes the
+     * Thread field rather than its own field.  However, to conform to
+     * the requirements of the Random superclass constructor, the
+     * common static ThreadLocalRandom maintains an "initialized"
+     * field for the sake of rejecting user calls to setSeed while
+     * still allowing a call from constructor.  Note that
+     * serialization is completely unnecessary because there is only a
+     * static singleton.  But we generate a serial form containing
+     * "rnd" and "initialized" fields to ensure compatibility across
+     * versions.
      *
-     * Per-instance initialization is similar to that in the no-arg
+     * Per-thread initialization is similar to that in the no-arg
      * Random constructor, but we avoid correlation among not only
      * initial seeds of those created in different threads, but also
      * those created using class Random itself; while at the same time
@@ -132,10 +130,11 @@ public class ThreadLocalRandom extends Random {
     private static final ThreadLocal<Double> nextLocalGaussian =
         new ThreadLocal<Double>();
 
-    /*
-     * Field used only during singleton initialization
+    /**
+     * Field used only during singleton initialization.
+     * True when constructor completes.
      */
-    boolean initialized; // true when constructor completes
+    boolean initialized;
 
     /** Constructor used only for static singleton */
     private ThreadLocalRandom() {
@@ -184,7 +183,8 @@ public class ThreadLocalRandom extends Random {
      * @throws UnsupportedOperationException always
      */
     public void setSeed(long seed) {
-        if (initialized) // allow call from super() constructor
+        // only allow call from super() constructor
+        if (initialized)
             throw new UnsupportedOperationException();
     }
 
@@ -357,39 +357,29 @@ public class ThreadLocalRandom extends Random {
             r ^= r >>> 17;
             r ^= r << 5;
         }
-        else if ((r = (int)UNSAFE.getLong(t, SEED)) == 0)
-            r = 1; // avoid zero
+        else {
+            localInit();
+            if ((r = (int)UNSAFE.getLong(t, SEED)) == 0)
+                r = 1; // avoid zero
+        }
         UNSAFE.putInt(t, SECONDARY, r);
         return r;
     }
 
-    // Serialization support, maintains original persistent form.
+    // Serialization support
 
     private static final long serialVersionUID = -5851777807851030925L;
 
     /**
      * @serialField rnd long
+     *              seed for random computations
      * @serialField initialized boolean
-     * @serialField pad0 long
-     * @serialField pad1 long
-     * @serialField pad2 long
-     * @serialField pad3 long
-     * @serialField pad4 long
-     * @serialField pad5 long
-     * @serialField pad6 long
-     * @serialField pad7 long
+     *              always true
      */
     private static final ObjectStreamField[] serialPersistentFields = {
             new ObjectStreamField("rnd", long.class),
-            new ObjectStreamField("initialized", boolean.class),
-            new ObjectStreamField("pad0", long.class),
-            new ObjectStreamField("pad1", long.class),
-            new ObjectStreamField("pad2", long.class),
-            new ObjectStreamField("pad3", long.class),
-            new ObjectStreamField("pad4", long.class),
-            new ObjectStreamField("pad5", long.class),
-            new ObjectStreamField("pad6", long.class),
-            new ObjectStreamField("pad7", long.class) };
+            new ObjectStreamField("initialized", boolean.class)
+    };
 
     /**
      * Saves the {@code ThreadLocalRandom} to a stream (that is, serializes it).
@@ -398,16 +388,8 @@ public class ThreadLocalRandom extends Random {
         throws java.io.IOException {
 
         java.io.ObjectOutputStream.PutField fields = out.putFields();
-        fields.put("rnd", 0L);
+        fields.put("rnd", UNSAFE.getLong(Thread.currentThread(), SEED));
         fields.put("initialized", true);
-        fields.put("pad0", 0L);
-        fields.put("pad1", 0L);
-        fields.put("pad2", 0L);
-        fields.put("pad3", 0L);
-        fields.put("pad4", 0L);
-        fields.put("pad5", 0L);
-        fields.put("pad6", 0L);
-        fields.put("pad7", 0L);
         out.writeFields();
     }
 

From f5f12c7995f0cca756485456826479f0af899c55 Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Thu, 28 Feb 2013 17:04:19 +0400
Subject: [PATCH 241/311] 8008660: Failure in 2D Queue Flusher thread on Mac

Reviewed-by: swingler, bae
---
 .../classes/sun/awt/CGraphicsConfig.java      |  2 +-
 .../classes/sun/awt/CGraphicsDevice.java      |  9 +++--
 .../sun/java2d/opengl/CGLGraphicsConfig.java  | 29 ++++++++--------
 .../classes/sun/lwawt/macosx/CRobot.java      |  8 ++---
 .../classes/sun/lwawt/macosx/LWCToolkit.java  |  2 +-
 jdk/src/macosx/native/sun/awt/CRobot.m        |  4 +--
 jdk/src/macosx/native/sun/awt/LWCToolkit.h    |  2 --
 jdk/src/macosx/native/sun/awt/LWCToolkit.m    | 33 -------------------
 .../sun/java2d/opengl/CGLGraphicsConfig.m     | 26 +++------------
 9 files changed, 32 insertions(+), 83 deletions(-)

diff --git a/jdk/src/macosx/classes/sun/awt/CGraphicsConfig.java b/jdk/src/macosx/classes/sun/awt/CGraphicsConfig.java
index fb37d01209c..055af2edb22 100644
--- a/jdk/src/macosx/classes/sun/awt/CGraphicsConfig.java
+++ b/jdk/src/macosx/classes/sun/awt/CGraphicsConfig.java
@@ -53,7 +53,7 @@ public abstract class CGraphicsConfig extends GraphicsConfiguration
 
     @Override
     public Rectangle getBounds() {
-        final Rectangle2D nativeBounds = nativeGetBounds(device.getCoreGraphicsScreen());
+        final Rectangle2D nativeBounds = nativeGetBounds(device.getCGDisplayID());
         return nativeBounds.getBounds(); // does integer rounding
     }
 
diff --git a/jdk/src/macosx/classes/sun/awt/CGraphicsDevice.java b/jdk/src/macosx/classes/sun/awt/CGraphicsDevice.java
index bcb24ea46f7..c4786eebcce 100644
--- a/jdk/src/macosx/classes/sun/awt/CGraphicsDevice.java
+++ b/jdk/src/macosx/classes/sun/awt/CGraphicsDevice.java
@@ -25,11 +25,11 @@
 
 package sun.awt;
 
+import java.awt.AWTPermission;
+import java.awt.DisplayMode;
 import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsDevice;
 import java.awt.Window;
-import java.awt.AWTPermission;
-import java.awt.DisplayMode;
 import java.util.Objects;
 
 import sun.java2d.opengl.CGLGraphicsConfig;
@@ -58,9 +58,12 @@ public final class CGraphicsDevice extends GraphicsDevice {
     }
 
     /**
+     * Returns CGDirectDisplayID, which is the same id as @"NSScreenNumber" in
+     * NSScreen.
+     *
      * @return CoreGraphics display id.
      */
-    public int getCoreGraphicsScreen() {
+    public int getCGDisplayID() {
         return displayID;
     }
 
diff --git a/jdk/src/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java b/jdk/src/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java
index 230f7057927..c8539a8e3f6 100644
--- a/jdk/src/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java
+++ b/jdk/src/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java
@@ -80,10 +80,8 @@ public final class CGLGraphicsConfig extends CGraphicsConfig
     private ContextCapabilities oglCaps;
     private OGLContext context;
     private final Object disposerReferent = new Object();
-
-    public static native int getDefaultPixFmt(int screennum);
     private static native boolean initCGL();
-    private static native long getCGLConfigInfo(int screennum, int visualnum,
+    private static native long getCGLConfigInfo(int displayID, int visualnum,
                                                 int swapInterval);
     private static native int getOGLCapabilities(long configInfo);
 
@@ -137,15 +135,16 @@ public final class CGLGraphicsConfig extends CGraphicsConfig
             // Java-level context and flush the queue...
             OGLContext.invalidateCurrentContext();
 
-            cfginfo = getCGLConfigInfo(device.getCoreGraphicsScreen(), pixfmt,
+            cfginfo = getCGLConfigInfo(device.getCGDisplayID(), pixfmt,
                                        kOpenGLSwapInterval);
-
-            OGLContext.setScratchSurface(cfginfo);
-            rq.flushAndInvokeNow(new Runnable() {
-                public void run() {
-                    ids[0] = OGLContext.getOGLIdString();
-                }
-            });
+            if (cfginfo != 0L) {
+                OGLContext.setScratchSurface(cfginfo);
+                rq.flushAndInvokeNow(new Runnable() {
+                    public void run() {
+                        ids[0] = OGLContext.getOGLIdString();
+                    }
+                });
+            }
         } finally {
             rq.unlock();
         }
@@ -253,8 +252,8 @@ public final class CGLGraphicsConfig extends CGraphicsConfig
 
     @Override
     public String toString() {
-        int screen = getDevice().getCoreGraphicsScreen();
-        return ("CGLGraphicsConfig[dev="+screen+",pixfmt="+pixfmt+"]");
+        int displayID = getDevice().getCGDisplayID();
+        return ("CGLGraphicsConfig[dev="+displayID+",pixfmt="+pixfmt+"]");
     }
 
     @Override
@@ -413,8 +412,8 @@ public final class CGLGraphicsConfig extends CGraphicsConfig
 
     @Override
     public void addDeviceEventListener(AccelDeviceEventListener l) {
-        int screen = getDevice().getCoreGraphicsScreen();
-        AccelDeviceEventNotifier.addListener(l, screen);
+        int displayID = getDevice().getCGDisplayID();
+        AccelDeviceEventNotifier.addListener(l, displayID);
     }
 
     @Override
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CRobot.java b/jdk/src/macosx/classes/sun/lwawt/macosx/CRobot.java
index e04a45fd579..c74a589a328 100644
--- a/jdk/src/macosx/classes/sun/lwawt/macosx/CRobot.java
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CRobot.java
@@ -65,7 +65,7 @@ class CRobot implements RobotPeer {
         mouseLastX = x;
         mouseLastY = y;
 
-        mouseEvent(fDevice.getCoreGraphicsScreen(), mouseLastX, mouseLastY,
+        mouseEvent(fDevice.getCGDisplayID(), mouseLastX, mouseLastY,
                    mouseButtonsState, true, true);
     }
 
@@ -79,7 +79,7 @@ class CRobot implements RobotPeer {
     public void mousePress(int buttons) {
         mouseButtonsState |= buttons;
 
-        mouseEvent(fDevice.getCoreGraphicsScreen(), mouseLastX, mouseLastY,
+        mouseEvent(fDevice.getCGDisplayID(), mouseLastX, mouseLastY,
                    buttons, true, false);
     }
 
@@ -93,7 +93,7 @@ class CRobot implements RobotPeer {
     public void mouseRelease(int buttons) {
         mouseButtonsState &= ~buttons;
 
-        mouseEvent(fDevice.getCoreGraphicsScreen(), mouseLastX, mouseLastY,
+        mouseEvent(fDevice.getCGDisplayID(), mouseLastX, mouseLastY,
                    buttons, false, false);
     }
 
@@ -163,7 +163,7 @@ class CRobot implements RobotPeer {
     }
 
     private native void initRobot();
-    private native void mouseEvent(int screen, int lastX, int lastY,
+    private native void mouseEvent(int displayID, int lastX, int lastY,
                                    int buttonsState,
                                    boolean isButtonsDownState,
                                    boolean isMouseMove);
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java b/jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java
index 83bc9f1f700..579468601e2 100644
--- a/jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java
@@ -352,7 +352,7 @@ public final class LWCToolkit extends LWToolkit {
     @Override
     public Insets getScreenInsets(final GraphicsConfiguration gc) {
         final CGraphicsConfig cgc = (CGraphicsConfig) gc;
-        final int displayId = cgc.getDevice().getCoreGraphicsScreen();
+        final int displayId = cgc.getDevice().getCGDisplayID();
         Rectangle fullScreen, workArea;
         final long screen = CWrapper.NSScreen.screenByDisplayId(displayId);
         try {
diff --git a/jdk/src/macosx/native/sun/awt/CRobot.m b/jdk/src/macosx/native/sun/awt/CRobot.m
index c04d5685a56..056fd19e29f 100644
--- a/jdk/src/macosx/native/sun/awt/CRobot.m
+++ b/jdk/src/macosx/native/sun/awt/CRobot.m
@@ -135,7 +135,7 @@ Java_sun_lwawt_macosx_CRobot_initRobot
 JNIEXPORT void JNICALL
 Java_sun_lwawt_macosx_CRobot_mouseEvent
 (JNIEnv *env, jobject peer,
- jint screenIndex, jint mouseLastX, jint mouseLastY, jint buttonsState,
+ jint displayID, jint mouseLastX, jint mouseLastY, jint buttonsState,
  jboolean isButtonsDownState, jboolean isMouseMove)
 {
     JNF_COCOA_ENTER(env);
@@ -149,8 +149,6 @@ Java_sun_lwawt_macosx_CRobot_mouseEvent
 
     CGError err = kCGErrorSuccess;
 
-    CGDirectDisplayID displayID =
-    FindCGDirectDisplayIDForScreenIndex(screenIndex);
     CGRect globalDeviceBounds = CGDisplayBounds(displayID);
 
     // Set unknown mouse location, if needed.
diff --git a/jdk/src/macosx/native/sun/awt/LWCToolkit.h b/jdk/src/macosx/native/sun/awt/LWCToolkit.h
index c318421c2e1..8df2c553996 100644
--- a/jdk/src/macosx/native/sun/awt/LWCToolkit.h
+++ b/jdk/src/macosx/native/sun/awt/LWCToolkit.h
@@ -44,8 +44,6 @@ extern jint* gButtonDownMasks;
 + (void) eventCountPlusPlus;
 @end
 
-CGDirectDisplayID FindCGDirectDisplayIDForScreenIndex(jint screenIndex);
-
 /*
  * Utility Macros
  */
diff --git a/jdk/src/macosx/native/sun/awt/LWCToolkit.m b/jdk/src/macosx/native/sun/awt/LWCToolkit.m
index ec4870eba69..47c72abbfa5 100644
--- a/jdk/src/macosx/native/sun/awt/LWCToolkit.m
+++ b/jdk/src/macosx/native/sun/awt/LWCToolkit.m
@@ -177,39 +177,6 @@ Java_sun_lwawt_macosx_LWCToolkit_beep
     NSBeep(); // produces both sound and visual flash, if configured in System Preferences
 }
 
-CGDirectDisplayID
-FindCGDirectDisplayIDForScreenIndex(jint screenIndex)
-{
-    // most common case - just one monitor
-    CGDirectDisplayID screenID = CGMainDisplayID();
-
-    CGDisplayCount displayCount = 0;
-    CGGetOnlineDisplayList(0, NULL, &displayCount);
-
-    if ((displayCount > 1) &&
-        (screenIndex >= 0) &&
-        (screenIndex < (jint)displayCount))
-    {
-        if (displayCount < 10) {
-            // stack allocated optimization for less than 10 monitors
-            CGDirectDisplayID onlineDisplays[displayCount];
-            CGGetOnlineDisplayList(displayCount, onlineDisplays, &displayCount);
-            screenID = (CGDirectDisplayID)onlineDisplays[screenIndex];
-        } else {
-            CGDirectDisplayID *onlineDisplays =
-            malloc(displayCount*sizeof(CGDirectDisplayID));
-            if (onlineDisplays != NULL) {
-                CGGetOnlineDisplayList(displayCount, onlineDisplays,
-                                       &displayCount);
-                screenID = (CGDirectDisplayID)onlineDisplays[screenIndex];
-                free(onlineDisplays);
-            }
-        }
-    }
-
-    return screenID;
-}
-
 /*
  * Class:     sun_lwawt_macosx_LWCToolkit
  * Method:    initIDs
diff --git a/jdk/src/macosx/native/sun/java2d/opengl/CGLGraphicsConfig.m b/jdk/src/macosx/native/sun/java2d/opengl/CGLGraphicsConfig.m
index 0bc58ec6ad3..a9de285758d 100644
--- a/jdk/src/macosx/native/sun/java2d/opengl/CGLGraphicsConfig.m
+++ b/jdk/src/macosx/native/sun/java2d/opengl/CGLGraphicsConfig.m
@@ -192,12 +192,12 @@ Java_sun_java2d_opengl_CGLGraphicsConfig_initCGL
 JNIEXPORT jlong JNICALL
 Java_sun_java2d_opengl_CGLGraphicsConfig_getCGLConfigInfo
     (JNIEnv *env, jclass cglgc,
-     jint screennum, jint pixfmt, jint swapInterval)
+     jint displayID, jint pixfmt, jint swapInterval)
 {
   jlong ret = 0L;
   JNF_COCOA_ENTER(env);
   NSMutableArray * retArray = [NSMutableArray arrayWithCapacity:3];
-  [retArray addObject: [NSNumber numberWithInt: (int)screennum]];
+  [retArray addObject: [NSNumber numberWithInt: (int)displayID]];
   [retArray addObject: [NSNumber numberWithInt: (int)pixfmt]];
   [retArray addObject: [NSNumber numberWithInt: (int)swapInterval]];
   if ([NSThread isMainThread]) {
@@ -217,7 +217,7 @@ Java_sun_java2d_opengl_CGLGraphicsConfig_getCGLConfigInfo
 + (void) _getCGLConfigInfo: (NSMutableArray *)argValue {
     AWT_ASSERT_APPKIT_THREAD;
 
-    jint screennum = (jint)[(NSNumber *)[argValue objectAtIndex: 0] intValue];
+    jint displayID = (jint)[(NSNumber *)[argValue objectAtIndex: 0] intValue];
     jint pixfmt = (jint)[(NSNumber *)[argValue objectAtIndex: 1] intValue];
     jint swapInterval = (jint)[(NSNumber *)[argValue objectAtIndex: 2] intValue];
     JNIEnv *env = [ThreadUtilities getJNIEnvUncached];
@@ -230,16 +230,11 @@ Java_sun_java2d_opengl_CGLGraphicsConfig_getCGLConfigInfo
     CGOpenGLDisplayMask glMask = (CGOpenGLDisplayMask)pixfmt;
     if (sharedContext == NULL) {
         if (glMask == 0) {
-            CGDirectDisplayID id =
-                FindCGDirectDisplayIDForScreenIndex(screennum);
-            glMask = CGDisplayIDToOpenGLDisplayMask(id);
+            glMask = CGDisplayIDToOpenGLDisplayMask(displayID);
         }
 
         NSOpenGLPixelFormatAttribute attrs[] = {
             NSOpenGLPFAClosestPolicy,
-            NSOpenGLPFANoRecovery,
-            NSOpenGLPFAAccelerated,
-            NSOpenGLPFAFullScreen,
             NSOpenGLPFAWindow,
             NSOpenGLPFAPixelBuffer,
             NSOpenGLPFADoubleBuffer,
@@ -412,7 +407,7 @@ Java_sun_java2d_opengl_CGLGraphicsConfig_getCGLConfigInfo
         return;
     }
     memset(cglinfo, 0, sizeof(CGLGraphicsConfigInfo));
-    cglinfo->screen = screennum;
+    cglinfo->screen = displayID;
     cglinfo->pixfmt = sharedPixelFormat;
     cglinfo->context = oglc;
 
@@ -422,17 +417,6 @@ Java_sun_java2d_opengl_CGLGraphicsConfig_getCGLConfigInfo
 }
 @end //GraphicsConfigUtil
 
-
-JNIEXPORT jint JNICALL
-Java_sun_java2d_opengl_CGLGraphicsConfig_getDefaultPixFmt
-    (JNIEnv *env, jclass cglgc, jint screennum)
-{
-    J2dTraceLn(J2D_TRACE_INFO, "CGLGraphicsConfig_getDefaultPixFmt");
-
-    CGDirectDisplayID id = FindCGDirectDisplayIDForScreenIndex(screennum);
-    return (jint)CGDisplayIDToOpenGLDisplayMask(id);
-}
-
 JNIEXPORT jint JNICALL
 Java_sun_java2d_opengl_CGLGraphicsConfig_getOGLCapabilities
     (JNIEnv *env, jclass cglgc, jlong configInfo)

From 66c2fc6e6611e0126602fff62a2f2c9d3304462d Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Thu, 28 Feb 2013 20:31:30 +0530
Subject: [PATCH 242/311] 8009229: ant makefile default target should be "test"

Reviewed-by: lagergren, jlaskey
---
 nashorn/make/build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nashorn/make/build.xml b/nashorn/make/build.xml
index 9df9d89fccb..34f56e4602b 100644
--- a/nashorn/make/build.xml
+++ b/nashorn/make/build.xml
@@ -21,7 +21,7 @@
  or visit www.oracle.com if you need additional information or have any
  questions.
 -->
-<project name="nashorn" default="all" basedir="..">
+<project name="nashorn" default="test" basedir="..">
   <import file="build-nasgen.xml"/>
   <import file="build-benchmark.xml"/>
   <import file="code_coverage.xml"/>

From 1270c690887e3b58d90b3a4a09a363f782d70dde Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Thu, 28 Feb 2013 20:27:38 +0400
Subject: [PATCH 243/311] 8003169: [macosx] JVM crash after disconnecting from
 projector

Reviewed-by: anthony, alexsch
---
 .../classes/sun/awt/CGraphicsDevice.java      | 20 +++++---
 .../classes/sun/lwawt/macosx/LWCToolkit.java  | 19 +-------
 .../macosx/native/sun/awt/CGraphicsDevice.m   | 46 ++++++++++++++++++-
 3 files changed, 60 insertions(+), 25 deletions(-)

diff --git a/jdk/src/macosx/classes/sun/awt/CGraphicsDevice.java b/jdk/src/macosx/classes/sun/awt/CGraphicsDevice.java
index c4786eebcce..1a5e22af582 100644
--- a/jdk/src/macosx/classes/sun/awt/CGraphicsDevice.java
+++ b/jdk/src/macosx/classes/sun/awt/CGraphicsDevice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@ import java.awt.AWTPermission;
 import java.awt.DisplayMode;
 import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsDevice;
+import java.awt.Insets;
 import java.awt.Window;
 import java.util.Objects;
 
@@ -110,8 +111,9 @@ public final class CGraphicsDevice extends GraphicsDevice {
         return nativeGetYResolution(displayID);
     }
 
-    private static native double nativeGetXResolution(int displayID);
-    private static native double nativeGetYResolution(int displayID);
+    public Insets getScreenInsets() {
+        return nativeGetScreenInsets(displayID);
+    }
 
     /**
      * Enters full-screen mode, or returns to windowed mode.
@@ -217,9 +219,15 @@ public final class CGraphicsDevice extends GraphicsDevice {
         return nativeGetDisplayModes(displayID);
     }
 
-    private native void nativeSetDisplayMode(int displayID, int w, int h, int bpp, int refrate);
+    private static native void nativeSetDisplayMode(int displayID, int w, int h, int bpp, int refrate);
 
-    private native DisplayMode nativeGetDisplayMode(int displayID);
+    private static native DisplayMode nativeGetDisplayMode(int displayID);
 
-    private native DisplayMode[] nativeGetDisplayModes(int displayID);
+    private static native DisplayMode[] nativeGetDisplayModes(int displayID);
+
+    private static native double nativeGetXResolution(int displayID);
+
+    private static native double nativeGetYResolution(int displayID);
+
+    private static native Insets nativeGetScreenInsets(int displayID);
 }
diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java b/jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java
index 579468601e2..a15eb46a1d1 100644
--- a/jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -351,22 +351,7 @@ public final class LWCToolkit extends LWToolkit {
 
     @Override
     public Insets getScreenInsets(final GraphicsConfiguration gc) {
-        final CGraphicsConfig cgc = (CGraphicsConfig) gc;
-        final int displayId = cgc.getDevice().getCGDisplayID();
-        Rectangle fullScreen, workArea;
-        final long screen = CWrapper.NSScreen.screenByDisplayId(displayId);
-        try {
-            fullScreen = CWrapper.NSScreen.frame(screen).getBounds();
-            workArea = CWrapper.NSScreen.visibleFrame(screen).getBounds();
-        } finally {
-            CWrapper.NSObject.release(screen);
-        }
-        // Convert between Cocoa's coordinate system and Java.
-        int bottom = workArea.y - fullScreen.y;
-        int top = fullScreen.height - workArea.height - bottom;
-        int left = workArea.x - fullScreen.x;
-        int right = fullScreen.width - workArea.width - left;
-        return  new Insets(top, left, bottom, right);
+        return ((CGraphicsConfig) gc).getDevice().getScreenInsets();
     }
 
     @Override
diff --git a/jdk/src/macosx/native/sun/awt/CGraphicsDevice.m b/jdk/src/macosx/native/sun/awt/CGraphicsDevice.m
index 9bc5393d765..1e2df28dd56 100644
--- a/jdk/src/macosx/native/sun/awt/CGraphicsDevice.m
+++ b/jdk/src/macosx/native/sun/awt/CGraphicsDevice.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,8 @@
  * questions.
  */
 
-#include "LWCToolkit.h"
+#import "LWCToolkit.h"
+#import "ThreadUtilities.h"
 
 /*
  * Convert the mode string to the more convinient bits per pixel value
@@ -146,6 +147,47 @@ Java_sun_awt_CGraphicsDevice_nativeGetYResolution
     return dpi;
 }
 
+/*
+ * Class:     sun_awt_CGraphicsDevice
+ * Method:    nativeGetScreenInsets
+ * Signature: (I)D
+ */
+JNIEXPORT jobject JNICALL
+Java_sun_awt_CGraphicsDevice_nativeGetScreenInsets
+  (JNIEnv *env, jclass class, jint displayID)
+{
+    jobject ret = NULL;
+    __block NSRect frame = NSZeroRect;
+    __block NSRect visibleFrame = NSZeroRect;
+JNF_COCOA_ENTER(env);
+    
+    [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
+        NSArray *screens = [NSScreen screens];
+        for (NSScreen *screen in screens) {
+            NSDictionary *screenInfo = [screen deviceDescription];
+            NSNumber *screenID = [screenInfo objectForKey:@"NSScreenNumber"];
+            if ([screenID pointerValue] == displayID){
+                frame = [screen frame];
+                visibleFrame = [screen visibleFrame];
+                break;
+            }
+        }
+    }];
+    // Convert between Cocoa's coordinate system and Java.
+    jint bottom = visibleFrame.origin.y - frame.origin.y;
+    jint top = frame.size.height - visibleFrame.size.height - bottom;
+    jint left = visibleFrame.origin.x - frame.origin.x;
+    jint right = frame.size.width - visibleFrame.size.width - left;
+    
+    static JNF_CLASS_CACHE(jc_Insets, "java/awt/Insets");
+    static JNF_CTOR_CACHE(jc_Insets_ctor, jc_Insets, "(IIII)V");
+    ret = JNFNewObject(env, jc_Insets_ctor, top, left, bottom, right);
+
+JNF_COCOA_EXIT(env);
+
+    return ret;
+}
+
 /*
  * Class:     sun_awt_CGraphicsDevice
  * Method:    nativeSetDisplayMode

From bd2109d3fa156438fd7523daed63d583cd479bf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Thu, 28 Feb 2013 22:59:31 +0100
Subject: [PATCH 244/311] 8009240: RegExpScanner code is inefficient and too
 complex

Reviewed-by: jlaskey, lagergren
---
 .../internal/runtime/regexp/JoniRegExp.java   |   4 -
 .../runtime/regexp/RegExpFactory.java         |  38 +-
 .../runtime/regexp/RegExpScanner.java         | 973 +++++-------------
 3 files changed, 274 insertions(+), 741 deletions(-)

diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/JoniRegExp.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/JoniRegExp.java
index 918ec20f30c..f8c35bfe99d 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/regexp/JoniRegExp.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/JoniRegExp.java
@@ -117,10 +117,6 @@ public class JoniRegExp extends RegExp {
             return new JoniRegExp(pattern, flags);
         }
 
-        @Override
-        protected String replaceToken(final String str) {
-            return str.equals("[^]") ? "[\\s\\S]" : str;
-        }
     }
 
     class JoniMatcher implements RegExpMatcher {
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpFactory.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpFactory.java
index 2cf65be76be..367cc85b28a 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpFactory.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpFactory.java
@@ -67,25 +67,6 @@ public class RegExpFactory {
         return new DefaultRegExp(pattern, flags);
     }
 
-    /**
-     * Replace a regexp token as suitable for regexp instances created by this factory.
-     *
-     * @param str a regular expression token
-     * @return the replacement token
-     */
-    protected String replaceToken(final String str) {
-        switch (str) {
-            case "\\s":
-                return "[" + Lexer.getWhitespaceRegExp() + "]";
-            case "\\S":
-                return "[^" + Lexer.getWhitespaceRegExp() + "]";
-            case "[^]":
-                return "[\\s\\S]";
-            default:
-                return str;
-        }
-    }
-
     /**
      * Compile a regexp with the given {@code source} and {@code flags}.
      *
@@ -98,16 +79,6 @@ public class RegExpFactory {
         return instance.compile(pattern,  flags);
     }
 
-    /**
-     * Replace a regexp token as needed by the currently installed factory instance.
-     *
-     * @param token a regexp token
-     * @return the replacement token
-     */
-    public static String replace(final String token) {
-        return instance.replaceToken(token);
-    }
-
     /**
      * Validate a regexp with the given {@code source} and {@code flags}.
      *
@@ -120,4 +91,13 @@ public class RegExpFactory {
     public static void validate(final String pattern, final String flags) throws ParserException {
         instance.compile(pattern, flags);
     }
+
+    /**
+     * Returns true if the instance uses the JDK's {@code java.util.regex} package.
+     *
+     * @return true if instance uses JDK regex package
+     */
+    public static boolean usesJavaUtilRegex() {
+        return instance != null && instance.getClass() == RegExpFactory.class;
+    }
 }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java
index bad878cd737..55f323dd71b 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java
@@ -25,15 +25,15 @@
 
 package jdk.nashorn.internal.runtime.regexp;
 
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.regex.PatternSyntaxException;
 
+import jdk.nashorn.internal.parser.Lexer;
 import jdk.nashorn.internal.parser.Scanner;
 import jdk.nashorn.internal.runtime.BitVector;
 
@@ -44,17 +44,13 @@ import jdk.nashorn.internal.runtime.BitVector;
 final class RegExpScanner extends Scanner {
 
     /**
-     * String builder to accumulate the result - this contains verbatim parsed JavaScript.
-     * to get the java equivalent we need to create a Pattern token and return its toString()
+     * String builder used to rewrite the pattern for the currently used regexp factory.
      */
     private final StringBuilder sb;
 
     /** Is this the special case of a regexp that never matches anything */
     private boolean neverMatches;
 
-    /** The resulting java.util.regex pattern string. */
-    private String javaPattern;
-
     /** Expected token table */
     private final Map<Character, Integer> expected = new HashMap<>();
 
@@ -62,11 +58,14 @@ final class RegExpScanner extends Scanner {
     private final List<Capture> caps = new LinkedList<>();
 
     /** Forward references to capturing parenthesis to be resolved later.*/
-    private final Map<Integer, Token> forwardReferences = new LinkedHashMap<>();
+    private final Set<Integer> forwardReferences = new LinkedHashSet<>();
 
     /** Current level of zero-width negative lookahead assertions. */
     private int negativeLookaheadLevel;
 
+    /** Are we currently inside a character class? */
+    private boolean inCharClass = false;
+
     private static final String NON_IDENT_ESCAPES = "$^*+(){}[]|\\.?";
 
     private static class Capture {
@@ -74,11 +73,6 @@ final class RegExpScanner extends Scanner {
          * Zero-width negative lookaheads enclosing the capture.
          */
         private final int negativeLookaheadLevel;
-        /**
-         * Captures that live inside a negative lookahead are dead after the
-         * lookahead and will be undefined if referenced from outside.
-         */
-        private boolean isDead;
 
         Capture(final int negativeLookaheadLevel) {
             this.negativeLookaheadLevel = negativeLookaheadLevel;
@@ -88,336 +82,6 @@ final class RegExpScanner extends Scanner {
             return negativeLookaheadLevel;
         }
 
-        public boolean isDead() {
-            return isDead;
-        }
-
-        public void setDead() {
-            this.isDead = true;
-        }
-    }
-
-    /**
-     * This is a token - the JavaScript regexp is scanned into a token tree
-     * A token has other tokens as children as well as "atoms", i.e. Strings.
-     */
-    private static class Token {
-
-        private enum Type {
-            PATTERN,
-            DISJUNCTION,
-            ALTERNATIVE,
-            TERM,
-            ASSERTION,
-            QUANTIFIER,
-            QUANTIFIER_PREFIX,
-            ATOM,
-            PATTERN_CHARACTER,
-            ATOM_ESCAPE,
-            CHARACTER_ESCAPE,
-            CONTROL_ESCAPE,
-            CONTROL_LETTER,
-            IDENTITY_ESCAPE,
-            DECIMAL_ESCAPE,
-            CHARACTERCLASS_ESCAPE,
-            CHARACTERCLASS,
-            CLASSRANGES,
-            NON_EMPTY_CLASSRANGES,
-            NON_EMPTY_CLASSRANGES_NODASH,
-            CLASSATOM,
-            CLASSATOM_NODASH,
-            CLASS_ESCAPE,
-            DECIMALDIGITS,
-            HEX_ESCAPESEQUENCE,
-            UNICODE_ESCAPESEQUENCE,
-        }
-
-        /**
-         * Token tyoe
-         */
-        private final Token.Type type;
-
-        /**
-         * Child nodes
-         */
-        private final List<Object> children;
-
-        /**
-         * Parent node
-         */
-        private Token parent;
-
-        /**
-         * Dead code flag
-         */
-        private boolean isDead;
-
-        private static final Map<Type, ToString> toStringMap = new HashMap<>();
-        private static final ToString DEFAULT_TOSTRING = new ToString();
-
-        private static String unicode(final int value) {
-            final StringBuilder sb = new StringBuilder();
-            final String hex = Integer.toHexString(value);
-            sb.append('u');
-            for (int i = 0; i < 4 - hex.length(); i++) {
-                sb.append('0');
-            }
-            sb.append(hex);
-
-            return sb.toString();
-        }
-
-        static {
-            toStringMap.put(Type.CHARACTERCLASS, new ToString() {
-                @Override
-                public String toString(final Token token) {
-                    return super.toString(token).replace("\\b", "\b");
-                }
-            });
-
-            // for some reason java regexps don't like control characters on the
-            // form "\\ca".match([string with ascii 1 at char0]). Translating
-            // them to unicode does it though.
-            toStringMap.put(Type.CHARACTER_ESCAPE, new ToString() {
-                @Override
-                public String toString(final Token token) {
-                    final String str = super.toString(token);
-                    if (str.length() == 2) {
-                        return Token.unicode(Character.toLowerCase(str.charAt(1)) - 'a' + 1);
-                    }
-                    return str;
-                }
-            });
-
-            toStringMap.put(Type.DECIMAL_ESCAPE, new ToString() {
-                @Override
-                public String toString(final Token token) {
-                    final String str = super.toString(token);
-
-                    if ("\0".equals(str)) {
-                        return str;
-                    }
-
-                    int value;
-
-                    if (!token.hasParentOfType(Type.CLASSRANGES)) {
-                        return str;
-                    }
-
-                    value = Integer.parseInt(str, 8); //throws exception that leads to SyntaxError if not octal
-                    if (value > 0xff) {
-                        throw new NumberFormatException(str);
-                    }
-
-                    return Token.unicode(value);
-                }
-            });
-
-        }
-
-        /**
-         * JavaScript Token to Java regex substring framework.
-         */
-        private static class ToString {
-            String toString(final Token token) {
-                final Object[] children = token.getChildren();
-
-                // Allow the installed regexp factory to perform global substitutions.
-                switch (children.length) {
-                    case 0:
-                        return "";
-                    case 1:
-                        return RegExpFactory.replace(children[0].toString());
-                    default:
-                        final StringBuilder sb = new StringBuilder();
-                        for (final Object child : children) {
-                            sb.append(child);
-                        }
-                        return RegExpFactory.replace(sb.toString());
-                }
-            }
-        }
-
-        /**
-         * Token iterator. Doesn't return "atom" children. i.e. string representations,
-         * just tokens
-         *
-         */
-        private static class TokenIterator implements Iterator<Token> {
-            private final List<Token> preorder;
-
-            private void init(final Token root) {
-                preorder.add(root);
-                for (final Object child : root.getChildren()) {
-                    if (child instanceof Token) {
-                        init((Token)child);
-                    }
-                }
-            }
-
-            TokenIterator(final Token root) {
-                preorder = new ArrayList<>();
-                init(root);
-            }
-
-            @Override
-            public boolean hasNext() {
-                return !preorder.isEmpty();
-            }
-
-            @Override
-            public Token next() {
-                return preorder.remove(0);
-            }
-
-            @Override
-            public void remove() {
-                next();
-            }
-        }
-
-        /**
-         * Constructor
-         * @param type the token type
-         */
-        Token(final Token.Type type) {
-            this.type = type;
-            children = new ArrayList<>();
-        }
-
-        /**
-         * Add a an "atom" child to a token
-         * @param child the child to add
-         * @return the token (for chaining)
-         */
-        public Token add(final String child) {
-            children.add(child);
-            return this;
-        }
-
-        /**
-         * Add a child to a token
-         * @param child the child
-         * @return the token (for chaining)
-         */
-        public Token add(final Token child) {
-            if (child != null) {
-                children.add(child);
-                child.setParent(this);
-            }
-            return this;
-        }
-
-        /**
-         * Remove a child from a token
-         * @param child the child to remove
-         * @return true if successful
-         */
-        public boolean remove(final Token child) {
-            return children.remove(child);
-        }
-
-        /**
-         * Remove the last child from a token
-         * @return the removed child
-         */
-        public Object removeLast() {
-            return children.remove(children.size() - 1);
-        }
-
-        /**
-         * Flag this token as dead code
-         * @param isDead is it dead or not
-         */
-        private void setIsDead(final boolean isDead) {
-            this.isDead = isDead;
-        }
-
-        /**
-         * Is this token dead code
-         * @return boolean
-         */
-        private boolean getIsDead() {
-            return isDead;
-        }
-
-        /**
-         * Get the parent of this token
-         * @return parent token
-         */
-        public Token getParent() {
-            return parent;
-        }
-
-        public boolean hasParentOfType(final Token.Type parentType) {
-            for (Token p = getParent(); p != null; p = p.getParent()) {
-                if (p.getType() == parentType) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        public boolean hasChildOfType(final Token.Type childType) {
-            for (final Iterator<Token> iter = iterator() ; iter.hasNext() ; ) {
-                if (iter.next().getType() == childType) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Set the parent of this token
-         * @param parent
-         */
-        private void setParent(final Token parent) {
-            this.parent = parent;
-        }
-
-        /**
-         * Get the children of this token
-         * @return an array of children, never null
-         */
-        public Object[] getChildren() {
-            return children.toArray();
-        }
-
-        /**
-         * Reset this token, remove all children
-         */
-        public void reset() {
-            children.clear();
-        }
-
-        /**
-         * Get a preorder token iterator with this token as root
-         * @return an iterator
-         */
-        public Iterator<Token> iterator() {
-            return new TokenIterator(this);
-        }
-
-        /**
-         * Get the type of this token
-         * @return type
-         */
-        public Type getType() {
-            return type;
-        }
-
-        /**
-         * Turn this token into Java regexp compatible text
-         * @return part of a java regexp
-         */
-        @Override
-        public String toString() {
-            ToString t = toStringMap.get(getType());
-            if (t == null) {
-                t = DEFAULT_TOSTRING;
-            }
-            return t.toString(this);
-        }
     }
 
     /**
@@ -437,13 +101,11 @@ final class RegExpScanner extends Scanner {
             return;
         }
 
-        for (final Map.Entry<Integer, Token> fwdRef : forwardReferences.entrySet()) {
-            if (fwdRef.getKey().intValue() > caps.size()) {
+        for (final Integer ref : forwardReferences) {
+            if (ref.intValue() > caps.size()) {
                 neverMatches = true;
                 break;
             }
-
-            fwdRef.getValue().setIsDead(true);
         }
 
         forwardReferences.clear();
@@ -459,12 +121,10 @@ final class RegExpScanner extends Scanner {
     public static RegExpScanner scan(final String string) {
         final RegExpScanner scanner = new RegExpScanner(string);
 
-        Token pattern;
-
         try {
-            pattern = scanner.pattern();
+            scanner.disjunction();
         } catch (final Exception e) {
-            throw new PatternSyntaxException(e.getMessage(), string, scanner.sb.length());
+            throw new PatternSyntaxException(e.getMessage(), string, scanner.position);
         }
 
         scanner.processForwardReferences();
@@ -472,24 +132,12 @@ final class RegExpScanner extends Scanner {
             return null; // never matches
         }
 
-        // go over the code and remove dead code
-        final Iterator<Token> iter = pattern.iterator();
-        while (iter.hasNext()) {
-            final Token next = iter.next();
-            if (next.getIsDead()) {
-                next.getParent().remove(next);
-            }
-        }
-
-        // turn the pattern into a string, p, the java equivalent string for our js regexp
-        final String p = pattern.toString();
-        // if builder contains all tokens that were sent in, we know
-        // we correctly parsed the entire JavaScript regexp without syntax errors
-        if (!string.equals(scanner.getStringBuilder().toString())) {
+        // Throw syntax error unless we parsed the entire JavaScript regexp without syntax errors
+        if (scanner.position != string.length()) {
+            final String p = scanner.getStringBuilder().toString();
             throw new PatternSyntaxException(string, p, p.length() + 1);
         }
 
-        scanner.javaPattern = p;
         return scanner;
      }
 
@@ -508,7 +156,7 @@ final class RegExpScanner extends Scanner {
     }
 
     String getJavaPattern() {
-        return javaPattern;
+        return sb.toString();
     }
 
     BitVector getGroupsInNegativeLookahead() {
@@ -527,11 +175,10 @@ final class RegExpScanner extends Scanner {
 
     /**
      * Commit n characters to the builder and to a given token
-     * @param token Uncommitted token.
      * @param n     Number of characters.
      * @return Committed token
      */
-    private Token commit(final Token token, final int n) {
+    private boolean commit(final int n) {
         final int startIn = position;
 
         switch (n) {
@@ -554,11 +201,7 @@ final class RegExpScanner extends Scanner {
             assert false : "Should not reach here";
         }
 
-        if (token == null) {
-            return null;
-        }
-
-        return token.add(sb.substring(startIn, sb.length()));
+        return true;
     }
 
     /**
@@ -586,36 +229,21 @@ final class RegExpScanner extends Scanner {
      * Recursive descent tokenizer starts below.
      */
 
-    /*
-     * Pattern ::
-     *      Disjunction
-     */
-    private Token pattern() {
-        final Token token = new Token(Token.Type.PATTERN);
-
-        final Token child = disjunction();
-        return token.add(child);
-    }
-
     /*
      * Disjunction ::
      *      Alternative
      *      Alternative | Disjunction
      */
-    private Token disjunction() {
-        final Token token = new Token(Token.Type.DISJUNCTION);
-
+    private void disjunction() {
         while (true) {
-            token.add(alternative());
+            alternative();
 
             if (ch0 == '|') {
-                commit(token, 1);
+                commit(1);
             } else {
                 break;
             }
         }
-
-        return token;
     }
 
     /*
@@ -623,15 +251,10 @@ final class RegExpScanner extends Scanner {
      *      [empty]
      *      Alternative Term
      */
-    private Token alternative() {
-        final Token token = new Token(Token.Type.ALTERNATIVE);
-
-        Token child;
-        while ((child = term()) != null) {
-            token.add(child);
+    private void alternative() {
+        while (term()) {
+            // do nothing
         }
-
-        return token;
     }
 
     /*
@@ -640,48 +263,37 @@ final class RegExpScanner extends Scanner {
      *      Atom
      *      Atom Quantifier
      */
-    private Token term() {
+    private boolean term() {
         final int startIn  = position;
         final int startOut = sb.length();
-        final Token token  = new Token(Token.Type.TERM);
-        Token child;
 
-        child = assertion();
-        if (child != null) {
-            return token.add(child);
+        if (assertion()) {
+            return true;
         }
 
-        child = atom();
-        if (child != null) {
+        if (atom()) {
             boolean emptyCharacterClass = false;
-            if ("[]".equals(child.toString())) {
+            if (sb.toString().endsWith("[]")) {
                 emptyCharacterClass = true;
+            } else if (sb.toString().endsWith("[^]")) {
+                sb.setLength(sb.length() - 2);
+                sb.append("\\s\\S]");
             }
 
-            token.add(child);
-
-            final Token quantifier = quantifier();
-            if (quantifier != null) {
-                token.add(quantifier);
-            }
+            boolean quantifier = quantifier();
 
             if (emptyCharacterClass) {
-                if (quantifier == null) {
+                if (!quantifier) {
                     neverMatches = true; //never matches ever.
-                } else {
-                    //if we can get away with max zero, remove this entire token
-                    final String qs = quantifier.toString();
-                    if ("+".equals(qs) || "*".equals(qs) || qs.startsWith("{0,")) {
-                        token.setIsDead(true);
-                    }
                 }
+                // Note: we could check if quantifier has min zero to mark empty character class as dead.
             }
 
-            return token;
+            return true;
         }
 
         restart(startIn, startOut);
-        return null;
+        return false;
     }
 
     /*
@@ -693,19 +305,18 @@ final class RegExpScanner extends Scanner {
      *      ( ? = Disjunction )
      *      ( ? ! Disjunction )
      */
-    private Token assertion() {
+    private boolean assertion() {
         final int startIn  = position;
         final int startOut = sb.length();
-        final Token token  = new Token(Token.Type.ASSERTION);
 
         switch (ch0) {
         case '^':
         case '$':
-            return commit(token, 1);
+            return commit(1);
 
         case '\\':
             if (ch1 == 'b' || ch1 == 'B') {
-                return commit(token, 2);
+                return commit(2);
             }
             break;
 
@@ -717,24 +328,18 @@ final class RegExpScanner extends Scanner {
                 break;
             }
             final boolean isNegativeLookahead = (ch2 == '!');
-            commit(token, 3);
+            commit(3);
 
             if (isNegativeLookahead) {
                 negativeLookaheadLevel++;
             }
-            final Token disjunction = disjunction();
+            disjunction();
             if (isNegativeLookahead) {
-                for (final Capture cap : caps) {
-                    if (cap.getNegativeLookaheadLevel() >= negativeLookaheadLevel) {
-                        cap.setDead();
-                    }
-                }
                 negativeLookaheadLevel--;
             }
 
-            if (disjunction != null && ch0 == ')') {
-                token.add(disjunction);
-                return commit(token, 1);
+            if (ch0 == ')') {
+                return commit(1);
             }
             break;
 
@@ -743,8 +348,7 @@ final class RegExpScanner extends Scanner {
         }
 
         restart(startIn, startOut);
-
-        return null;
+        return false;
     }
 
     /*
@@ -752,17 +356,14 @@ final class RegExpScanner extends Scanner {
      *      QuantifierPrefix
      *      QuantifierPrefix ?
      */
-    private Token quantifier() {
-        final Token token = new Token(Token.Type.QUANTIFIER);
-        final Token child = quantifierPrefix();
-        if (child != null) {
-            token.add(child);
+    private boolean quantifier() {
+        if (quantifierPrefix()) {
             if (ch0 == '?') {
-                commit(token, 1);
+                commit(1);
             }
-            return token;
+            return true;
         }
-        return null;
+        return false;
     }
 
     /*
@@ -774,45 +375,42 @@ final class RegExpScanner extends Scanner {
      *      { DecimalDigits , }
      *      { DecimalDigits , DecimalDigits }
      */
-    private Token quantifierPrefix() {
+    private boolean quantifierPrefix() {
         final int startIn  = position;
         final int startOut = sb.length();
-        final Token token  = new Token(Token.Type.QUANTIFIER_PREFIX);
 
         switch (ch0) {
         case '*':
         case '+':
         case '?':
-            return commit(token, 1);
+            return commit(1);
 
         case '{':
-            commit(token, 1);
+            commit(1);
 
-            final Token child = decimalDigits();
-            if (child == null) {
+            if (!decimalDigits()) {
                 break; // not a quantifier - back out
             }
             push('}');
-            token.add(child);
 
             if (ch0 == ',') {
-                commit(token, 1);
-                token.add(decimalDigits());
+                commit(1);
+                decimalDigits();
             }
 
             if (ch0 == '}') {
                 pop('}');
-                commit(token, 1);
+                commit(1);
             }
 
-            return token;
+            return true;
 
         default:
             break;
         }
 
         restart(startIn, startOut);
-        return null;
+        return false;
     }
 
     /*
@@ -825,81 +423,51 @@ final class RegExpScanner extends Scanner {
      *      ( ? : Disjunction )
      *
      */
-    private Token atom() {
+    private boolean atom() {
         final int startIn  = position;
         final int startOut = sb.length();
-        final Token token  = new Token(Token.Type.ATOM);
-        Token child;
 
-        child = patternCharacter();
-        if (child != null) {
-            return token.add(child);
+        if (patternCharacter()) {
+            return true;
         }
 
         if (ch0 == '.') {
-            return commit(token, 1);
+            return commit(1);
         }
 
         if (ch0 == '\\') {
-            commit(token, 1);
-            child = atomEscape();
+            commit(1);
 
-            if (child != null) {
-                if (child.hasChildOfType(Token.Type.IDENTITY_ESCAPE)) {
-                    final char idEscape = child.toString().charAt(0);
-                    if (NON_IDENT_ESCAPES.indexOf(idEscape) == -1) {
-                        token.reset();
-                    }
-                }
-
-                token.add(child);
-
-                // forward backreferences always match empty. JavaScript != Java
-                if (child.hasChildOfType(Token.Type.DECIMAL_ESCAPE) && !"\u0000".equals(child.toString())) {
-                    final int refNum = Integer.parseInt(child.toString());
-
-                    if (refNum - 1 < caps.size() && caps.get(refNum - 1).isDead()) {
-                        // reference to dead in-negative-lookahead capture
-                        token.setIsDead(true);
-                    } else if (caps.size() < refNum) {
-                        // forward reference: always matches against empty string (dead token).
-                        // invalid reference (non-existant capture): pattern never matches.
-                        forwardReferences.put(refNum, token);
-                    }
-                }
-
-                return token;
+            if (atomEscape()) {
+                return true;
             }
         }
 
-        child = characterClass();
-        if (child != null) {
-            return token.add(child);
+        if (characterClass()) {
+            return true;
         }
 
         if (ch0 == '(') {
             boolean capturingParens = true;
-            commit(token, 1);
+            commit(1);
             if (ch0 == '?' && ch1 == ':') {
                 capturingParens = false;
-                commit(token, 2);
+                commit(2);
             }
 
-            child = disjunction();
-            if (child != null) {
-                token.add(child);
-                if (ch0 == ')') {
-                    final Token atom = commit(token, 1);
-                    if (capturingParens) {
-                        caps.add(new Capture(negativeLookaheadLevel));
-                    }
-                    return atom;
+            disjunction();
+
+            if (ch0 == ')') {
+                commit(1);
+                if (capturingParens) {
+                    caps.add(new Capture(negativeLookaheadLevel));
                 }
+                return true;
             }
         }
 
         restart(startIn, startOut);
-        return null;
+        return false;
     }
 
     /*
@@ -907,9 +475,9 @@ final class RegExpScanner extends Scanner {
      *      SourceCharacter but not any of: ^$\.*+?()[]{}|
      */
     @SuppressWarnings("fallthrough")
-    private Token patternCharacter() {
+    private boolean patternCharacter() {
         if (atEOF()) {
-            return null;
+            return false;
         }
 
         switch (ch0) {
@@ -924,23 +492,26 @@ final class RegExpScanner extends Scanner {
         case ')':
         case '[':
         case '|':
-            return null;
+            return false;
 
         case '}':
         case ']':
             final int n = expected.get(ch0);
             if (n != 0) {
-                return null;
+                return false;
             }
 
        case '{':
            // if not a valid quantifier escape curly brace to match itself
            // this ensures compatibility with other JS implementations
-           final Token quant = quantifierPrefix();
-           return (quant == null) ? commit(new Token(Token.Type.PATTERN_CHARACTER).add("\\"), 1) : null;
+           if (!quantifierPrefix()) {
+               sb.append('\\');
+               return commit(1);
+           }
+           return false;
 
         default:
-            return commit(new Token(Token.Type.PATTERN_CHARACTER), 1); // SOURCECHARACTER
+            return commit(1); // SOURCECHARACTER
         }
     }
 
@@ -950,27 +521,9 @@ final class RegExpScanner extends Scanner {
      *      CharacterEscape
      *      CharacterClassEscape
      */
-    private Token atomEscape() {
-        final Token token = new Token(Token.Type.ATOM_ESCAPE);
-        Token child;
-
-        child = decimalEscape();
-        if (child != null) {
-            return token.add(child);
-        }
-
-        child = characterClassEscape();
-        if (child != null) {
-            return token.add(child);
-        }
-
-        child = characterEscape();
-        if (child != null) {
-            return token.add(child);
-        }
-
-
-        return null;
+    private boolean atomEscape() {
+        // Note that contrary to ES 5.1 spec we put identityEscape() last because it acts as a catch-all
+        return decimalEscape() || characterClassEscape() || characterEscape() || identityEscape();
     }
 
     /*
@@ -981,48 +534,31 @@ final class RegExpScanner extends Scanner {
      *      UnicodeEscapeSequence
      *      IdentityEscape
      */
-    private Token characterEscape() {
+    private boolean characterEscape() {
         final int startIn  = position;
         final int startOut = sb.length();
 
-        final Token token = new Token(Token.Type.CHARACTER_ESCAPE);
-        Token child;
-
-        child = controlEscape();
-        if (child != null) {
-            return token.add(child);
+        if (controlEscape()) {
+            return true;
         }
 
         if (ch0 == 'c') {
-            commit(token, 1);
-            child = controlLetter();
-            if (child != null) {
-                return token.add(child);
+            commit(1);
+            if (controlLetter()) {
+                return true;
             }
             restart(startIn, startOut);
         }
 
-        child = hexEscapeSequence();
-        if (child != null) {
-            return token.add(child);
-        }
-
-        child = unicodeEscapeSequence();
-        if (child != null) {
-            return token.add(child);
-        }
-
-        child = identityEscape();
-        if (child != null) {
-            return token.add(child);
+        if (hexEscapeSequence() || unicodeEscapeSequence()) {
+            return true;
         }
 
         restart(startIn, startOut);
-
-        return null;
+        return false;
     }
 
-    private boolean scanEscapeSequence(final char leader, final int length, final Token token) {
+    private boolean scanEscapeSequence(final char leader, final int length) {
         final int startIn  = position;
         final int startOut = sb.length();
 
@@ -1030,11 +566,11 @@ final class RegExpScanner extends Scanner {
             return false;
         }
 
-        commit(token, 1);
+        commit(1);
         for (int i = 0; i < length; i++) {
             final char ch0l = Character.toLowerCase(ch0);
             if ((ch0l >= 'a' && ch0l <= 'f') || isDecimalDigit(ch0)) {
-                commit(token, 1);
+                commit(1);
             } else {
                 restart(startIn, startOut);
                 return false;
@@ -1044,37 +580,29 @@ final class RegExpScanner extends Scanner {
         return true;
     }
 
-    private Token hexEscapeSequence() {
-        final Token token = new Token(Token.Type.HEX_ESCAPESEQUENCE);
-        if (scanEscapeSequence('x', 2, token)) {
-            return token;
-        }
-        return null;
+    private boolean hexEscapeSequence() {
+        return scanEscapeSequence('x', 2);
     }
 
-    private Token unicodeEscapeSequence() {
-        final Token token = new Token(Token.Type.UNICODE_ESCAPESEQUENCE);
-        if (scanEscapeSequence('u', 4, token)) {
-            return token;
-        }
-        return null;
+    private boolean unicodeEscapeSequence() {
+        return scanEscapeSequence('u', 4);
     }
 
     /*
      * ControlEscape ::
      *      one of fnrtv
      */
-    private Token controlEscape() {
+    private boolean controlEscape() {
         switch (ch0) {
         case 'f':
         case 'n':
         case 'r':
         case 't':
         case 'v':
-            return commit(new Token(Token.Type.CONTROL_ESCAPE), 1);
+            return commit(1);
 
         default:
-            return null;
+            return false;
         }
     }
 
@@ -1083,19 +611,18 @@ final class RegExpScanner extends Scanner {
      *      one of abcdefghijklmnopqrstuvwxyz
      *      ABCDEFGHIJKLMNOPQRSTUVWXYZ
      */
-    private Token controlLetter() {
+    private boolean controlLetter() {
         final char c = Character.toUpperCase(ch0);
         if (c >= 'A' && c <= 'Z') {
-            final Token token = new Token(Token.Type.CONTROL_LETTER);
-            commit(token, 1);
-            return token;
+            // for some reason java regexps don't like control characters on the
+            // form "\\ca".match([string with ascii 1 at char0]). Translating
+            // them to unicode does it though.
+            sb.setLength(sb.length() - 1);
+            unicode(c - 'A' + 1);
+            skip(1);
+            return true;
         }
-        return null;
-        /*
-        Token token = new Token(Token.Type.CONTROL_LETTER);
-        commit(null, 1);//add original char to builder not to token
-        this.neverMatches = c < 'A' || c > 'Z';
-        return token.add(""+c);*/
+        return false;
     }
 
     /*
@@ -1104,56 +631,115 @@ final class RegExpScanner extends Scanner {
      *      <ZWJ>  (200c)
      *      <ZWNJ> (200d)
      */
-    private Token identityEscape() {
-        final Token token = new Token(Token.Type.IDENTITY_ESCAPE);
-        commit(token, 1);
-        return token;
+    private boolean identityEscape() {
+        if (atEOF()) {
+            throw new RuntimeException("\\ at end of pattern"); // will be converted to PatternSyntaxException
+        }
+        // ES 5.1 A.7 requires "not IdentifierPart" here but all major engines accept any character here.
+        if (NON_IDENT_ESCAPES.indexOf(ch0) == -1) {
+            sb.setLength(sb.length() - 1);
+        }
+        return commit(1);
     }
 
     /*
      * DecimalEscape ::
      *      DecimalIntegerLiteral [lookahead DecimalDigit]
      */
-    private Token decimalEscape() {
-        final Token token = new Token(Token.Type.DECIMAL_ESCAPE);
+    private boolean decimalEscape() {
         final int startIn  = position;
         final int startOut = sb.length();
 
         if (ch0 == '0' && !isDecimalDigit(ch1)) {
-            commit(token, 1);
-            token.removeLast();
+            skip(1);
             //  DecimalEscape :: 0. If i is zero, return the EscapeValue consisting of a <NUL> character (Unicodevalue0000);
-            return token.add("\u0000");
+            sb.append("\u0000");
+            return true;
         }
 
         if (isDecimalDigit(ch0)) {
-            while (isDecimalDigit(ch0)) {
-                commit(token, 1);
+            final int num = ch0 - '0';
+
+            // Single digit escape, treat as backreference.
+            if (!isDecimalDigit(ch1)) {
+                if (num <= caps.size() && caps.get(num - 1).getNegativeLookaheadLevel() > 0) {
+                    //  Captures that live inside a negative lookahead are dead after the
+                    //  lookahead and will be undefined if referenced from outside.
+                    if (caps.get(num - 1).getNegativeLookaheadLevel() > negativeLookaheadLevel) {
+                        sb.setLength(sb.length() - 1);
+                    } else {
+                        sb.append(ch0);
+                    }
+                    skip(1);
+                    return true;
+                } else if (num > caps.size()) {
+                    // Forward reference to a capture group. Forward references are always undefined so we
+                    // can omit it from the output buffer. Additionally, if the capture group does not exist
+                    // the whole regexp becomes invalid, so register the reference for later processing.
+                    forwardReferences.add(num);
+                    sb.setLength(sb.length() - 1);
+                    skip(1);
+                    return true;
+                }
             }
-            return token;
+
+            if (inCharClass) {
+                // Convert octal escape to unicode escape if inside character class.
+                StringBuilder digit = new StringBuilder(4);
+                while (isDecimalDigit(ch0)) {
+                    digit.append(ch0);
+                    skip(1);
+                }
+
+                int value = Integer.parseInt(digit.toString(), 8); //throws exception that leads to SyntaxError if not octal
+                if (value > 0xff) {
+                    throw new NumberFormatException(digit.toString());
+                }
+
+                unicode(value);
+
+            } else {
+                // Copy decimal escape as-is
+                decimalDigits();
+            }
+            return true;
         }
 
         restart(startIn, startOut);
-
-        return null;
+        return false;
     }
 
     /*
      * CharacterClassEscape ::
      *  one of dDsSwW
      */
-    private Token characterClassEscape() {
+    private boolean characterClassEscape() {
         switch (ch0) {
+        // java.util.regex requires translation of \s and \S to explicit character list
         case 's':
+            if (RegExpFactory.usesJavaUtilRegex()) {
+                sb.setLength(sb.length() - 1);
+                sb.append('[').append(Lexer.getWhitespaceRegExp()).append(']');
+                skip(1);
+                return true;
+            }
+            return commit(1);
         case 'S':
+            if (RegExpFactory.usesJavaUtilRegex()) {
+                sb.setLength(sb.length() - 1);
+                sb.append("[^").append(Lexer.getWhitespaceRegExp()).append(']');
+                skip(1);
+                return true;
+            }
+            return commit(1);
         case 'd':
         case 'D':
         case 'w':
         case 'W':
-            return commit(new Token(Token.Type.CHARACTERCLASS_ESCAPE), 1);
+            return commit(1);
 
         default:
-            return null;
+            return false;
         }
     }
 
@@ -1162,29 +748,31 @@ final class RegExpScanner extends Scanner {
      *      [ [lookahead {^}] ClassRanges ]
      *      [ ^ ClassRanges ]
      */
-    private Token characterClass() {
+    private boolean characterClass() {
         final int startIn  = position;
         final int startOut = sb.length();
-        final Token token  = new Token(Token.Type.CHARACTERCLASS);
 
         if (ch0 == '[') {
-            push(']');
-            commit(token, 1);
+            try {
+                inCharClass = true;
+                push(']');
+                commit(1);
 
-            if (ch0 == '^') {
-                commit(token, 1);
-            }
+                if (ch0 == '^') {
+                    commit(1);
+                }
 
-            final Token child = classRanges();
-            if (child != null && ch0 == ']') {
-                pop(']');
-                token.add(child);
-                return commit(token, 1);
+                if (classRanges() && ch0 == ']') {
+                    pop(']');
+                    return commit(1);
+                }
+            } finally {
+                inCharClass = false;  // no nested character classes in JavaScript
             }
         }
 
         restart(startIn, startOut);
-        return null;
+        return false;
     }
 
     /*
@@ -1192,8 +780,9 @@ final class RegExpScanner extends Scanner {
      *      [empty]
      *      NonemptyClassRanges
      */
-    private Token classRanges() {
-        return new Token(Token.Type.CLASSRANGES).add(nonemptyClassRanges());
+    private boolean classRanges() {
+        nonemptyClassRanges();
+        return true;
     }
 
     /*
@@ -1202,40 +791,27 @@ final class RegExpScanner extends Scanner {
      *      ClassAtom NonemptyClassRangesNoDash
      *      ClassAtom - ClassAtom ClassRanges
      */
-    private Token nonemptyClassRanges() {
+    private boolean nonemptyClassRanges() {
         final int startIn  = position;
         final int startOut = sb.length();
-        final Token token  = new Token(Token.Type.NON_EMPTY_CLASSRANGES);
-        Token child;
 
-        child = classAtom();
-        if (child != null) {
-            token.add(child);
+        if (classAtom()) {
 
             if (ch0 == '-') {
-                commit(token, 1);
+                commit(1);
 
-                final Token child1 = classAtom();
-                final Token child2 = classRanges();
-                if (child1 != null && child2 != null) {
-                    token.add(child1);
-                    token.add(child2);
-
-                    return token;
+                if (classAtom() && classRanges()) {
+                    return true;
                 }
             }
 
-            child = nonemptyClassRangesNoDash();
-            if (child != null) {
-                token.add(child);
-                return token;
-            }
+            nonemptyClassRangesNoDash();
 
-            return token;
+            return true;
         }
 
         restart(startIn, startOut);
-        return null;
+        return false;
     }
 
     /*
@@ -1244,61 +820,44 @@ final class RegExpScanner extends Scanner {
      *      ClassAtomNoDash NonemptyClassRangesNoDash
      *      ClassAtomNoDash - ClassAtom ClassRanges
      */
-    private Token nonemptyClassRangesNoDash() {
+    private boolean nonemptyClassRangesNoDash() {
         final int startIn  = position;
         final int startOut = sb.length();
-        final Token token  = new Token(Token.Type.NON_EMPTY_CLASSRANGES_NODASH);
-        Token child;
 
-        child = classAtomNoDash();
-        if (child != null) {
-            token.add(child);
+        if (classAtomNoDash()) {
 
             // need to check dash first, as for e.g. [a-b|c-d] will otherwise parse - as an atom
             if (ch0 == '-') {
-               commit(token, 1);
+               commit(1);
 
-               final Token child1 = classAtom();
-               final Token child2 = classRanges();
-               if (child1 != null && child2 != null) {
-                   token.add(child1);
-                   return token.add(child2);
+               if (classAtom() && classRanges()) {
+                   return true;
                }
                //fallthru
            }
 
-            child = nonemptyClassRangesNoDash();
-            if (child != null) {
-                token.add(child);
-            }
-            return token; // still a class atom
+            nonemptyClassRangesNoDash();
+            return true; // still a class atom
         }
 
-        child = classAtom();
-        if (child != null) {
-            return token.add(child);
+        if (classAtom()) {
+            return true;
         }
 
         restart(startIn, startOut);
-        return null;
+        return false;
     }
 
     /*
      * ClassAtom : - ClassAtomNoDash
      */
-    private Token classAtom() {
-        final Token token = new Token(Token.Type.CLASSATOM);
+    private boolean classAtom() {
 
         if (ch0 == '-') {
-            return commit(token, 1);
+            return commit(1);
         }
 
-        final Token child = classAtomNoDash();
-        if (child != null) {
-            return token.add(child);
-        }
-
-        return null;
+        return classAtomNoDash();
     }
 
     /*
@@ -1306,33 +865,32 @@ final class RegExpScanner extends Scanner {
      *      SourceCharacter but not one of \ or ] or -
      *      \ ClassEscape
      */
-    private Token classAtomNoDash() {
+    private boolean classAtomNoDash() {
         final int startIn  = position;
         final int startOut = sb.length();
-        final Token token  = new Token(Token.Type.CLASSATOM_NODASH);
 
         switch (ch0) {
         case ']':
         case '-':
         case '\0':
-            return null;
+            return false;
 
         case '[':
             // unescaped left square bracket - add escape
-            return commit(token.add("\\"), 1);
+            sb.append('\\');
+            return commit(1);
 
         case '\\':
-            commit(token, 1);
-            final Token child = classEscape();
-            if (child != null) {
-                return token.add(child);
+            commit(1);
+            if (classEscape()) {
+                return true;
             }
 
             restart(startIn, startOut);
-            return null;
+            return false;
 
         default:
-            return commit(token, 1);
+            return commit(1);
         }
     }
 
@@ -1343,46 +901,45 @@ final class RegExpScanner extends Scanner {
      *      CharacterEscape
      *      CharacterClassEscape
      */
-    private Token classEscape() {
-        final Token token = new Token(Token.Type.CLASS_ESCAPE);
-        Token child;
+    private boolean classEscape() {
 
-        child = decimalEscape();
-        if (child != null) {
-            return token.add(child);
+        if (decimalEscape()) {
+            return true;
         }
 
         if (ch0 == 'b') {
-            return commit(token, 1);
+            sb.setLength(sb.length() - 1);
+            sb.append('\b');
+            skip(1);
+            return true;
         }
 
-        child = characterEscape();
-        if (child != null) {
-            return token.add(child);
-        }
-
-        child = characterClassEscape();
-        if (child != null) {
-            return token.add(child);
-        }
-
-        return null;
+        // Note that contrary to ES 5.1 spec we put identityEscape() last because it acts as a catch-all
+        return characterEscape() || characterClassEscape() || identityEscape();
     }
 
     /*
      * DecimalDigits
      */
-    private Token decimalDigits() {
+    private boolean decimalDigits() {
         if (!isDecimalDigit(ch0)) {
-            return null;
+            return false;
         }
 
-        final Token token = new Token(Token.Type.DECIMALDIGITS);
         while (isDecimalDigit(ch0)) {
-            commit(token, 1);
+            commit(1);
         }
 
-        return token;
+        return true;
+    }
+
+    private void unicode(final int value) {
+        final String hex = Integer.toHexString(value);
+        sb.append('u');
+        for (int i = 0; i < 4 - hex.length(); i++) {
+            sb.append('0');
+        }
+        sb.append(hex);
     }
 
     private static boolean isDecimalDigit(final char ch) {

From 618b36f5eb7a53831bde58ae8b9ca82b6dfa8433 Mon Sep 17 00:00:00 2001
From: Jason Uh <juh@openjdk.org>
Date: Thu, 28 Feb 2013 16:36:01 -0800
Subject: [PATCH 245/311] 8006853: OCSP timeout set to wrong value if
 com.sun.security.ocsp.timeout < 0

Reviewed-by: mullan
---
 jdk/src/share/classes/sun/security/provider/certpath/OCSP.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jdk/src/share/classes/sun/security/provider/certpath/OCSP.java b/jdk/src/share/classes/sun/security/provider/certpath/OCSP.java
index f57c832bfa5..03c910b8897 100644
--- a/jdk/src/share/classes/sun/security/provider/certpath/OCSP.java
+++ b/jdk/src/share/classes/sun/security/provider/certpath/OCSP.java
@@ -89,7 +89,7 @@ public final class OCSP {
                 new GetIntegerAction("com.sun.security.ocsp.timeout",
                                      DEFAULT_CONNECT_TIMEOUT));
         if (tmp < 0) {
-            tmp = DEFAULT_CONNECT_TIMEOUT;
+            return DEFAULT_CONNECT_TIMEOUT;
         }
         // Convert to milliseconds, as the system property will be
         // specified in seconds

From 1909e5f9d6f34ff00fd374c541babaf6fb9b3aaa Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Fri, 1 Mar 2013 15:58:29 +0530
Subject: [PATCH 246/311] 8009263: Fix all javadoc errors in nashorn code

Reviewed-by: hannesw, lagergren
---
 nashorn/make/project.properties               |  2 +-
 .../internal/codegen/ClassEmitter.java        |  2 +-
 .../codegen/ObjectClassGenerator.java         |  4 +-
 .../internal/codegen/RuntimeCallSite.java     | 48 ++++++++---------
 .../jdk/nashorn/internal/ir/RuntimeNode.java  | 10 ++--
 .../ir/visitor/NodeOperatorVisitor.java       | 52 +++++++++----------
 .../nashorn/internal/objects/DateParser.java  |  2 +-
 .../internal/objects/NativeJSAdapter.java     |  5 +-
 .../nashorn/internal/objects/NativeJava.java  | 28 +++++++---
 .../internal/runtime/CodeInstaller.java       |  2 +-
 .../jdk/nashorn/internal/runtime/Context.java |  4 +-
 .../internal/runtime/ScriptObject.java        |  4 +-
 .../internal/runtime/ScriptRuntime.java       |  8 +--
 .../runtime/linker/JavaAdapterFactory.java    |  2 +-
 .../linker/NashornCallSiteDescriptor.java     |  2 +-
 .../internal/runtime/options/Options.java     |  2 +-
 .../runtime/regexp/joni/EncodingHelper.java   |  2 +-
 17 files changed, 99 insertions(+), 80 deletions(-)

diff --git a/nashorn/make/project.properties b/nashorn/make/project.properties
index 0d85d02942b..c4d0b943cd7 100644
--- a/nashorn/make/project.properties
+++ b/nashorn/make/project.properties
@@ -24,7 +24,7 @@
 application.title=nashorn
 
 # location of JDK embedded ASM sources
-jdk.asm.src.dir=../jdk/src/share/classes/jdk/internal
+jdk.asm.src.dir=../jdk/src/share/classes/jdk/internal/org/objectweb/asm
 
 # source and target levels
 build.compiler=modern
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/ClassEmitter.java b/nashorn/src/jdk/nashorn/internal/codegen/ClassEmitter.java
index 3b6433dd83b..f99d8af1b54 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/ClassEmitter.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/ClassEmitter.java
@@ -95,7 +95,7 @@ import jdk.nashorn.internal.runtime.Source;
  * <p>
  * There is also a very nice debug interface that can emit formatted
  * bytecodes that have been written. This is enabled by setting the
- * environment "nashorn.codegen.debug" to true, or --log=codegen:<level>
+ * environment "nashorn.codegen.debug" to true, or --log=codegen:{@literal <level>}
  * <p>
  * A ClassEmitter implements an Emitter - i.e. it needs to have
  * well defined start and end calls for whatever it is generating. Assertions
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/ObjectClassGenerator.java b/nashorn/src/jdk/nashorn/internal/codegen/ObjectClassGenerator.java
index e70d2952895..c0308b6ee53 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/ObjectClassGenerator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/ObjectClassGenerator.java
@@ -112,7 +112,7 @@ public final class ObjectClassGenerator {
     private final Context context;
 
     /**
-     * The list of available accessor types in width order. This order is used for type guesses narrow->wide
+     * The list of available accessor types in width order. This order is used for type guesses narrow{@literal ->} wide
      *  in the dual--fields world
      */
     public static final List<Type> ACCESSOR_TYPES = Collections.unmodifiableList(
@@ -184,7 +184,7 @@ public final class ObjectClassGenerator {
 
     /**
      * Return the accessor type based on its index in [0..getNumberOfAccessorTypes())
-     * Indexes are ordered narrower->wider / optimistic->pessimistic. Invalidations always
+     * Indexes are ordered narrower{@literal ->}wider / optimistic{@literal ->}pessimistic. Invalidations always
      * go to a type of higher index
      *
      * @param index accessor type index
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/RuntimeCallSite.java b/nashorn/src/jdk/nashorn/internal/codegen/RuntimeCallSite.java
index efa8e141590..116bdd61364 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/RuntimeCallSite.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/RuntimeCallSite.java
@@ -459,120 +459,120 @@ public final class RuntimeCallSite extends MutableCallSite {
     }
 
     /**
-     * Specialized version of < operator for two int arguments. Do not call directly.
+     * Specialized version of {@literal <} operator for two int arguments. Do not call directly.
      * @param a int
      * @param b int
-     * @return a < b
+     * @return a {@code <} b
      */
     public static boolean LT(final int a, final int b) {
         return a < b;
     }
 
     /**
-     * Specialized version of < operator for two double arguments. Do not call directly.
+     * Specialized version of {@literal <} operator for two double arguments. Do not call directly.
      * @param a double
      * @param b double
-     * @return a < b
+     * @return a {@literal <} b
      */
     public static boolean LT(final double a, final double b) {
         return a < b;
     }
 
     /**
-     * Specialized version of < operator for two long arguments. Do not call directly.
+     * Specialized version of {@literal <} operator for two long arguments. Do not call directly.
      * @param a long
      * @param b long
-     * @return a < b
+     * @return a {@literal <} b
      */
     public static boolean LT(final long a, final long b) {
         return a < b;
     }
 
     /**
-     * Specialized version of <= operator for two int arguments. Do not call directly.
+     * Specialized version of {@literal <=} operator for two int arguments. Do not call directly.
      * @param a int
      * @param b int
-     * @return a <= b
+     * @return a {@literal <=} b
      */
     public static boolean LE(final int a, final int b) {
         return a <= b;
     }
 
     /**
-     * Specialized version of <= operator for two double arguments. Do not call directly.
+     * Specialized version of {@literal <=} operator for two double arguments. Do not call directly.
      * @param a double
      * @param b double
-     * @return a <= b
+     * @return a {@literal <=} b
      */
     public static boolean LE(final double a, final double b) {
         return a <= b;
     }
 
     /**
-     * Specialized version of <= operator for two long arguments. Do not call directly.
+     * Specialized version of {@literal <=} operator for two long arguments. Do not call directly.
      * @param a long
      * @param b long
-     * @return a <= b
+     * @return a {@literal <=} b
      */
     public static boolean LE(final long a, final long b) {
         return a <= b;
     }
 
     /**
-     * Specialized version of > operator for two int arguments. Do not call directly.
+     * Specialized version of {@literal >} operator for two int arguments. Do not call directly.
      * @param a int
      * @param b int
-     * @return a > b
+     * @return a {@literal >} b
      */
     public static boolean GT(final int a, final int b) {
         return a > b;
     }
 
     /**
-     * Specialized version of > operator for two double arguments. Do not call directly.
+     * Specialized version of {@literal >} operator for two double arguments. Do not call directly.
      * @param a double
      * @param b double
-     * @return a > b
+     * @return a {@literal >} b
      */
     public static boolean GT(final double a, final double b) {
         return a > b;
     }
 
     /**
-     * Specialized version of > operator for two long arguments. Do not call directly.
+     * Specialized version of {@literal >} operator for two long arguments. Do not call directly.
      * @param a long
      * @param b long
-     * @return a > b
+     * @return a {@literal >} b
      */
     public static boolean GT(final long a, final long b) {
         return a > b;
     }
 
     /**
-     * Specialized version of >= operator for two int arguments. Do not call directly.
+     * Specialized version of {@literal >=} operator for two int arguments. Do not call directly.
      * @param a int
      * @param b int
-     * @return a >= b
+     * @return a {@literal >=} b
      */
     public static boolean GE(final int a, final int b) {
         return a >= b;
     }
 
     /**
-     * Specialized version of >= operator for two double arguments. Do not call directly.
+     * Specialized version of {@literal >=} operator for two double arguments. Do not call directly.
      * @param a double
      * @param b double
-     * @return a >= b
+     * @return a {@literal >=} b
      */
     public static boolean GE(final double a, final double b) {
         return a >= b;
     }
 
     /**
-     * Specialized version of >= operator for two long arguments. Do not call directly.
+     * Specialized version of {@literal >=} operator for two long arguments. Do not call directly.
      * @param a long
      * @param b long
-     * @return a >= b
+     * @return a {@code >=} b
      */
     public static boolean GE(final long a, final long b) {
         return a >= b;
diff --git a/nashorn/src/jdk/nashorn/internal/ir/RuntimeNode.java b/nashorn/src/jdk/nashorn/internal/ir/RuntimeNode.java
index 474da4998e4..bfc47d1871a 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/RuntimeNode.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/RuntimeNode.java
@@ -64,17 +64,17 @@ public class RuntimeNode extends Node implements TypeOverride {
         EQ_STRICT(TokenType.EQ_STRICT, Type.BOOLEAN, 2, true),
         /** == operator with at least one object */
         EQ(TokenType.EQ, Type.BOOLEAN, 2, true),
-        /** >= operator with at least one object */
+        /** {@literal >=} operator with at least one object */
         GE(TokenType.GE, Type.BOOLEAN, 2, true),
-        /** > operator with at least one object */
+        /** {@literal >} operator with at least one object */
         GT(TokenType.GT, Type.BOOLEAN, 2, true),
         /** in operator */
         IN(TokenType.IN, Type.BOOLEAN, 2),
         /** instanceof operator */
         INSTANCEOF(TokenType.INSTANCEOF, Type.BOOLEAN, 2),
-        /** <= operator with at least one object */
+        /** {@literal <=} operator with at least one object */
         LE(TokenType.LE, Type.BOOLEAN, 2, true),
-        /** < operator with at least one object */
+        /** {@literal <} operator with at least one object */
         LT(TokenType.LT, Type.BOOLEAN, 2, true),
         /** !== operator with at least one object */
         NE_STRICT(TokenType.NE_STRICT, Type.BOOLEAN, 2, true),
@@ -184,7 +184,7 @@ public class RuntimeNode extends Node implements TypeOverride {
 
         /**
          * If this request can be reversed, return the reverse request
-         * Eq EQ -> NE.
+         * Eq EQ {@literal ->} NE.
          *
          * @param request request to reverse
          *
diff --git a/nashorn/src/jdk/nashorn/internal/ir/visitor/NodeOperatorVisitor.java b/nashorn/src/jdk/nashorn/internal/ir/visitor/NodeOperatorVisitor.java
index b4ffe6c09b5..6856282e069 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/visitor/NodeOperatorVisitor.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/visitor/NodeOperatorVisitor.java
@@ -542,7 +542,7 @@ public class NodeOperatorVisitor extends NodeVisitor {
     }
 
     /**
-     * Binary enter - callback for entering && operator
+     * Binary enter - callback for entering {@literal &&} operator
      *
      * @param  binaryNode the node
      * @return processed node
@@ -552,7 +552,7 @@ public class NodeOperatorVisitor extends NodeVisitor {
     }
 
     /**
-     * Binary leave - callback for leaving a && operator
+     * Binary leave - callback for leaving a {@literal &&} operator
      *
      * @param  binaryNode the node
      * @return processed node, which will replace the original one, or the original node
@@ -602,7 +602,7 @@ public class NodeOperatorVisitor extends NodeVisitor {
     }
 
     /**
-     * Binary enter - callback for entering &= operator
+     * Binary enter - callback for entering {@literal &=} operator
      *
      * @param  binaryNode the node
      * @return processed node
@@ -612,7 +612,7 @@ public class NodeOperatorVisitor extends NodeVisitor {
     }
 
     /**
-     * Binary leave - callback for leaving a &= operator
+     * Binary leave - callback for leaving a {@literal &=} operator
      *
      * @param  binaryNode the node
      * @return processed node, which will replace the original one, or the original node
@@ -722,7 +722,7 @@ public class NodeOperatorVisitor extends NodeVisitor {
     }
 
     /**
-     * Binary enter - callback for entering >>= operator
+     * Binary enter - callback for entering {@literal >>=} operator
      *
      * @param  binaryNode the node
      * @return processed node
@@ -732,7 +732,7 @@ public class NodeOperatorVisitor extends NodeVisitor {
     }
 
     /**
-     * Binary leave - callback for leaving a >>= operator
+     * Binary leave - callback for leaving a {@literal >>=} operator
      *
      * @param  binaryNode the node
      * @return processed node, which will replace the original one, or the original node
@@ -742,7 +742,7 @@ public class NodeOperatorVisitor extends NodeVisitor {
     }
 
     /**
-     * Binary enter - callback for entering a <<= operator
+     * Binary enter - callback for entering a {@literal <<=} operator
      *
      * @param  binaryNode the node
      * @return processed node
@@ -752,7 +752,7 @@ public class NodeOperatorVisitor extends NodeVisitor {
     }
 
     /**
-     * Binary leave - callback for leaving a <<= operator
+     * Binary leave - callback for leaving a {@literal <<=} operator
      *
      * @param  binaryNode the node
      * @return processed node, which will replace the original one, or the original node
@@ -762,7 +762,7 @@ public class NodeOperatorVisitor extends NodeVisitor {
     }
 
     /**
-     * Binary enter - callback for entering >>>= operator
+     * Binary enter - callback for entering {@literal >>>=} operator
      *
      * @param  binaryNode the node
      * @return processed node
@@ -772,7 +772,7 @@ public class NodeOperatorVisitor extends NodeVisitor {
     }
 
     /**
-     * Binary leave - callback for leaving a >>>= operator
+     * Binary leave - callback for leaving a {@literal >>>=} operator
      *
      * @param  binaryNode the node
      * @return processed node, which will replace the original one, or the original node
@@ -822,7 +822,7 @@ public class NodeOperatorVisitor extends NodeVisitor {
     }
 
     /**
-     * Binary enter - callback for entering & operator
+     * Binary enter - callback for entering {@literal &} operator
      *
      * @param  binaryNode the node
      * @return processed node
@@ -832,7 +832,7 @@ public class NodeOperatorVisitor extends NodeVisitor {
     }
 
     /**
-     * Binary leave - callback for leaving a & operator
+     * Binary leave - callback for leaving a {@literal &} operator
      *
      * @param  binaryNode the node
      * @return processed node, which will replace the original one, or the original node
@@ -986,7 +986,7 @@ public class NodeOperatorVisitor extends NodeVisitor {
     }
 
     /**
-     * Binary enter - callback for entering >= operator
+     * Binary enter - callback for entering {@literal >=} operator
      *
      * @param  binaryNode the node
      * @return processed node
@@ -996,7 +996,7 @@ public class NodeOperatorVisitor extends NodeVisitor {
     }
 
     /**
-     * Binary leave - callback for leaving >= operator
+     * Binary leave - callback for leaving {@literal >=} operator
      *
      * @param  binaryNode the node
      * @return processed node, which will replace the original one, or the original node
@@ -1006,7 +1006,7 @@ public class NodeOperatorVisitor extends NodeVisitor {
     }
 
     /**
-     * Binary enter - callback for entering > operator
+     * Binary enter - callback for entering {@literal >} operator
      *
      * @param  binaryNode the node
      * @return processed node
@@ -1016,7 +1016,7 @@ public class NodeOperatorVisitor extends NodeVisitor {
     }
 
     /**
-     * Binary leave - callback for leaving > operator
+     * Binary leave - callback for leaving {@literal >} operator
      *
      * @param  binaryNode the node
      * @return processed node, which will replace the original one, or the original node
@@ -1066,7 +1066,7 @@ public class NodeOperatorVisitor extends NodeVisitor {
     }
 
     /**
-     * Binary enter - callback for entering <= operator
+     * Binary enter - callback for entering {@literal <=} operator
      *
      * @param  binaryNode the node
      * @return processed node
@@ -1076,7 +1076,7 @@ public class NodeOperatorVisitor extends NodeVisitor {
     }
 
     /**
-     * Binary leave - callback for leaving <= operator
+     * Binary leave - callback for leaving {@literal <=} operator
      *
      * @param  binaryNode the node
      * @return processed node, which will replace the original one, or the original node
@@ -1086,7 +1086,7 @@ public class NodeOperatorVisitor extends NodeVisitor {
     }
 
     /**
-     * Binary enter - callback for entering < operator
+     * Binary enter - callback for entering {@literal <} operator
      *
      * @param  binaryNode the node
      * @return processed node
@@ -1096,7 +1096,7 @@ public class NodeOperatorVisitor extends NodeVisitor {
     }
 
     /**
-     * Binary leave - callback for leaving < operator
+     * Binary leave - callback for leaving {@literal <} operator
      *
      * @param  binaryNode the node
      * @return processed node, which will replace the original one, or the original node
@@ -1205,7 +1205,7 @@ public class NodeOperatorVisitor extends NodeVisitor {
     }
 
     /**
-     * Binary enter - callback for entering >> operator
+     * Binary enter - callback for entering {@literal >>} operator
      *
      * @param  binaryNode the node
      * @return processed node
@@ -1215,7 +1215,7 @@ public class NodeOperatorVisitor extends NodeVisitor {
     }
 
     /**
-     * Binary leave - callback for leaving >> operator
+     * Binary leave - callback for leaving {@literal >>} operator
      *
      * @param  binaryNode the node
      * @return processed node, which will replace the original one, or the original node
@@ -1225,7 +1225,7 @@ public class NodeOperatorVisitor extends NodeVisitor {
     }
 
     /**
-     * Binary enter - callback for entering << operator
+     * Binary enter - callback for entering {@literal <<} operator
      *
      * @param  binaryNode the node
      * @return processed node
@@ -1235,7 +1235,7 @@ public class NodeOperatorVisitor extends NodeVisitor {
     }
 
     /**
-     * Binary leave - callback for leaving << operator
+     * Binary leave - callback for leaving {@literal <<} operator
      *
      * @param  binaryNode the node
      * @return processed node, which will replace the original one, or the original node
@@ -1244,7 +1244,7 @@ public class NodeOperatorVisitor extends NodeVisitor {
         return leaveDefault(binaryNode);
     }
     /**
-     * Binary enter - callback for entering >>> operator
+     * Binary enter - callback for entering {@literal >>>} operator
      *
      * @param  binaryNode the node
      * @return processed node
@@ -1254,7 +1254,7 @@ public class NodeOperatorVisitor extends NodeVisitor {
     }
 
     /**
-     * Binary leave - callback for leaving >>> operator
+     * Binary leave - callback for leaving {@literal >>>} operator
      *
      * @param  binaryNode the node
      * @return processed node, which will replace the original one, or the original node
diff --git a/nashorn/src/jdk/nashorn/internal/objects/DateParser.java b/nashorn/src/jdk/nashorn/internal/objects/DateParser.java
index db0f74d0ccb..544525b1de1 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/DateParser.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/DateParser.java
@@ -221,7 +221,7 @@ public class DateParser {
      *
      * <p>English month names and selected time zone names as well as AM/PM markers are recognized
      * and handled properly. Additionally, numeric time zone offsets such as <tt>(+|-)hh:mm</tt> or
-     * <tt></tt>(+|-)hhmm</tt> are recognized. If the string does not contain a time zone offset
+     * <tt>(+|-)hhmm</tt> are recognized. If the string does not contain a time zone offset
      * the <tt>TIMEZONE</tt>field is left undefined, meaning the local time zone should be applied.</p>
      *
      * <p>English weekday names are recognized but ignored. All text in parentheses is ignored as well.
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java b/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java
index edef6241a0f..1a2b2769df2 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java
@@ -74,13 +74,16 @@ import jdk.nashorn.internal.runtime.linker.MethodHandleFactory;
  *    delete x.p;                 // calls y.__delete__
  *    for (i in x) { print(i); }  // calls y.__getIds__
  * </pre>
+ * <p>
  * JavaScript caller of adapter object is isolated from the fact that the property access/mutation/deletion are really
  * calls to JavaScript methods on adaptee.
- * </p><p>
+ * </p>
+ * <p>
  * JSAdapter constructor can optionally receive an "overrides" object. Properties of overrides object is copied to
  * JSAdapter instance. When user accessed property is one of these, then adaptee's methods like {@code __get__},
  * {@code __put__} etc. are not called for those. This can be used to make certain "preferred" properties that can be
  * accessed in the usual/faster way avoiding proxy mechanism. Example:
+ * </p>
  * <pre>
  *     var x = new JSAdapter({ foo: 444, bar: 6546 }) {
  *          __get__: function(name) { return name; }
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java b/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java
index c50a568779f..fc16962e185 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeJava.java
@@ -65,6 +65,7 @@ public final class NativeJava {
     }
 
     /**
+     * <p>
      * Given a name of a Java type, returns an object representing that type in Nashorn. The Java class of the objects
      * used to represent Java types in Nashorn is not {@link java.lang.Class} but rather {@link StaticClass}. They are
      * the objects that you can use with the {@code new} operator to create new instances of the class as well as to
@@ -75,7 +76,8 @@ public final class NativeJava {
      * different expression (e.g. {@code java.io.File}) as an argument in "new" and to address statics, and it is
      * distinct from the {@code Class} object (e.g. {@code java.io.File.class}). Below we cover in details the
      * properties of the type objects.
-     * <h2>Constructing Java objects</h2>
+     * </p>
+     * <p><b>Constructing Java objects</b></p>
      * Examples:
      * <pre>
      * var arrayListType = Java.type("java.util.ArrayList")
@@ -104,19 +106,24 @@ public final class NativeJava {
      * var arctype = Java.type("java.awt.geom.Arc2D")
      * var ftype = arctype.Float
      * </pre>
+     * <p>
      * You can access both static and non-static inner classes. If you want to create an instance of a non-static
      * inner class, remember to pass an instance of its outer class as the first argument to the constructor.
-     * </p><p>
+     * </p>
+     * <p>
      * If the type is abstract, you can instantiate an anonymous subclass of it using an argument list that is
      * applicable to any of its public or protected constructors, but inserting a JavaScript object with functions
      * properties that provide JavaScript implementations of the abstract methods. If method names are overloaded, the
      * JavaScript function will provide implementation for all overloads. E.g.:
+     * </p>
      * <pre>
      * var TimerTask =  Java.type("java.util.TimerTask")
      * var task = new TimerTask({ run: function() { print("Hello World!") } })
      * </pre>
+     * <p>
      * Nashorn supports a syntactic extension where a "new" expression followed by an argument is identical to
      * invoking the constructor and passing the argument to it, so you can write the above example also as:
+     * </p>
      * <pre>
      * var task = new TimerTask {
      *     run: function() {
@@ -124,30 +131,38 @@ public final class NativeJava {
      *     }
      * }
      * </pre>
+     * <p>
      * which is very similar to Java anonymous inner class definition. On the other hand, if the type is an abstract
      * type with a single abstract method (commonly referred to as a "SAM type") or all abstract methods it has share
      * the same overloaded name), then instead of an object, you can just pass a function, so the above example can
      * become even more simplified to:
+     * </p>
      * <pre>
      * var task = new TimerTask(function() { print("Hello World!") })
      * </pre>
+     * <p>
      * Note that in every one of these cases if you are trying to instantiate an abstract class that has constructors
      * that take some arguments, you can invoke those simply by specifying the arguments after the initial
      * implementation object or function.
-     * </p><p>The use of functions can be taken even further; if you are invoking a Java method that takes a SAM type,
+     * </p>
+     * <p>The use of functions can be taken even further; if you are invoking a Java method that takes a SAM type,
      * you can just pass in a function object, and Nashorn will know what you meant:
+     * </p>
      * <pre>
      * var timer = new Java.type("java.util.Timer")
      * timer.schedule(function() { print("Hello World!") })
      * </pre>
+     * <p>
      * Here, {@code Timer.schedule()} expects a {@code TimerTask} as its argument, so Nashorn creates an instance of a
      * {@code TimerTask} subclass and uses the passed function to implement its only abstract method, {@code run()}. In
      * this usage though, you can't use non-default constructors; the type must be either an interface, or must have a
      * protected or public no-arg constructor.
-     * </p><p>
+     * </p>
+     * <p>
      * You can also subclass non-abstract classes; for that you will need to use the {@link #extend(Object, Object...)}
      * method.
-     * <h2>Accessing static members</h2>
+     * </p>
+     * <p><b>Accessing static members</b></p>
      * Examples:
      * <pre>
      * var File = Java.type("java.io.File")
@@ -176,7 +191,7 @@ public final class NativeJava {
      * var File = Java.type("java.io.File")
      * print(File.class.static === File) // prints true
      * </pre>
-     * <h2>{@code instanceof} operator</h2>
+     * <p><b>{@code instanceof} operator</b></p>
      * The standard ECMAScript {@code instanceof} operator is extended to recognize Java objects and their type objects:
      * <pre>
      * var File = Java.type("java.io.File")
@@ -368,6 +383,7 @@ public final class NativeJava {
      * <li>If the Java method is overloaded (as in the above example {@code List.add()}), then your JavaScript adapter
      * must be prepared to deal with all overloads.</li>
      * <li>You can't invoke {@code super.*()} from adapters for now.</li>
+     * </ul>
      * @param self not used
      * @param types the original types. The caller must pass at least one Java type object of class {@link StaticClass}
      * representing either a public interface or a non-final public class with at least one public or protected
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/CodeInstaller.java b/nashorn/src/jdk/nashorn/internal/runtime/CodeInstaller.java
index 4622f3f0121..5fd16528e22 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/CodeInstaller.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/CodeInstaller.java
@@ -30,7 +30,7 @@ package jdk.nashorn.internal.runtime;
  * As only the code generating package (i.e. Context) knows about
  * the ScriptLoader and it would be a security hazard otherwise
  * the Compiler is given an installation interface for its code.
- * <p>>
+ * <p>
  * The compiler still retains most of the state around code emission
  * and management internally, so this is to avoid passing around any
  * logic that isn't directly related to installing a class
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Context.java b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
index 9145d9fc294..7e5d48b5215 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/Context.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
@@ -509,7 +509,7 @@ public final class Context {
      *
      * @param fullName  full name of class, e.g. jdk.nashorn.internal.objects.JO$2P1 contains 2 fields and 1 parameter.
      *
-     * @return the Class<?> for this structure
+     * @return the {@code Class<?>} for this structure
      *
      * @throws ClassNotFoundException if structure class cannot be resolved
      */
@@ -523,7 +523,7 @@ public final class Context {
      *
      * @param fullName full name of class to load
      *
-     * @return the Class<?> for the name
+     * @return the {@code Class<?>} for the name
      *
      * @throws ClassNotFoundException if class cannot be resolved
      */
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
index 45ed7f436b2..c95471d6d2b 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
@@ -1463,7 +1463,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
     }
 
     /**
-     * Returns the set of <property, value> entries that make up this
+     * Returns the set of {@literal <property, value>} entries that make up this
      * ScriptObject's properties
      * (java.util.Map-like method to help ScriptObjectMirror implementation)
      *
@@ -1524,7 +1524,7 @@ public abstract class ScriptObject extends PropertyListenerManager implements Pr
      * of their keys to their values
      * (java.util.Map-like method to help ScriptObjectMirror implementation)
      *
-     * @param otherMap a <key,value> map of properties to add
+     * @param otherMap a {@literal <key,value>} map of properties to add
      */
     public void putAll(final Map<?, ?> otherMap) {
         final boolean strict = getContext()._strict;
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java
index c6f5167c78a..216b381c41b 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptRuntime.java
@@ -815,7 +815,7 @@ public final class ScriptRuntime {
     }
 
     /**
-     * ECMA 11.8.1 - The less than operator (<) - generic implementation
+     * ECMA 11.8.1 - The less than operator ({@literal <}) - generic implementation
      *
      * @param x first object to compare
      * @param y second object to compare
@@ -828,7 +828,7 @@ public final class ScriptRuntime {
     }
 
     /**
-     * ECMA 11.8.2 - The greater than operator (>) - generic implementation
+     * ECMA 11.8.2 - The greater than operator ({@literal >}) - generic implementation
      *
      * @param x first object to compare
      * @param y second object to compare
@@ -841,7 +841,7 @@ public final class ScriptRuntime {
     }
 
     /**
-     * ECMA 11.8.3 - The less than or equal operator (<=) - generic implementation
+     * ECMA 11.8.3 - The less than or equal operator ({@literal <=}) - generic implementation
      *
      * @param x first object to compare
      * @param y second object to compare
@@ -854,7 +854,7 @@ public final class ScriptRuntime {
     }
 
     /**
-     * ECMA 11.8.4 - The greater than or equal operator (>=) - generic implementation
+     * ECMA 11.8.4 - The greater than or equal operator ({@literal >=}) - generic implementation
      *
      * @param x first object to compare
      * @param y second object to compare
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
index 190ada59d82..b5305d97b5b 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
@@ -87,7 +87,7 @@ import jdk.nashorn.internal.runtime.ScriptRuntime;
 import jdk.nashorn.internal.runtime.Undefined;
 
 /**
- * A factory class that generates adapter classes. Adapter classes allow implementation of Java interfaces and
+ * <p>A factory class that generates adapter classes. Adapter classes allow implementation of Java interfaces and
  * extending of Java classes from JavaScript. For every combination of a superclass to extend and interfaces to
  * implement (collectively: "original types"), exactly one adapter class is generated that extends the specified
  * superclass and implements the specified interfaces.
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java
index beab2e1dc9c..a2513912441 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java
@@ -180,7 +180,7 @@ public class NashornCallSiteDescriptor extends AbstractCallSiteDescriptor {
     /**
      * Returns the named operand in this descriptor's name. Equivalent to
      * {@code getNameToken(CallSiteDescriptor.NAME_OPERAND)}. E.g. for operation {@code "dyn:getProp:color"}, returns
-     * {@code "color"}. For call sites without named operands (e.g. {@link "dyn:new"}) returns null.
+     * {@code "color"}. For call sites without named operands (e.g. {@code "dyn:new"}) returns null.
      * @return the named operand in this descriptor's name.
      */
     public String getOperand() {
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/options/Options.java b/nashorn/src/jdk/nashorn/internal/runtime/options/Options.java
index 7cca54122df..0f30b1a171d 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/options/Options.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/options/Options.java
@@ -200,7 +200,7 @@ public final class Options {
 
     /**
      * Return an option given its resource key. If the key doesn't begin with
-     * <resource>.option it will be completed using the resource from this
+     * {@literal <resource>}.option it will be completed using the resource from this
      * instance
      *
      * @param key key for option
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/EncodingHelper.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/EncodingHelper.java
index 04d67c2e177..d3e54947aea 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/EncodingHelper.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/joni/EncodingHelper.java
@@ -219,7 +219,7 @@ public class EncodingHelper {
     }
 
     /**
-     * @see [http://www.geocities.jp/kosako3/oniguruma/doc/RE.txt]
+     * @see <a href="http://www.geocities.jp/kosako3/oniguruma/doc/RE.txt">http://www.geocities.jp/kosako3/oniguruma/doc/RE.txt</a>
      */
     public static boolean isCodeCType(int code, int ctype) {
         int type;

From 19bc54290f90b10094a7ab4b82bb50278fbbdcc8 Mon Sep 17 00:00:00 2001
From: Sergey Malenkov <malenkov@openjdk.org>
Date: Fri, 1 Mar 2013 14:30:52 +0400
Subject: [PATCH 247/311] 7163696: JCK Swing interactive test
 JScrollBarTest0013 fails with Nimbus and GTK L&Fs

Reviewed-by: alexsch
---
 .../classes/java/beans/PropertyDescriptor.java    |  7 +------
 jdk/test/java/beans/Introspector/Test7192955.java | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/jdk/src/share/classes/java/beans/PropertyDescriptor.java b/jdk/src/share/classes/java/beans/PropertyDescriptor.java
index c03149c0574..0abdcad972b 100644
--- a/jdk/src/share/classes/java/beans/PropertyDescriptor.java
+++ b/jdk/src/share/classes/java/beans/PropertyDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -109,10 +109,6 @@ public class PropertyDescriptor extends FeatureDescriptor {
         if (writeMethodName != null && getWriteMethod() == null) {
             throw new IntrospectionException("Method not found: " + writeMethodName);
         }
-        boundInitialization(beanClass);
-    }
-
-    private void boundInitialization(Class<?> beanClass) {
         // If this class or one of its base classes allow PropertyChangeListener,
         // then we assume that any properties we discover are "bound".
         // See Introspector.getTargetPropertyInfo() method.
@@ -163,7 +159,6 @@ public class PropertyDescriptor extends FeatureDescriptor {
         setReadMethod(read);
         setWriteMethod(write);
         this.baseName = base;
-        boundInitialization(bean);
     }
 
     /**
diff --git a/jdk/test/java/beans/Introspector/Test7192955.java b/jdk/test/java/beans/Introspector/Test7192955.java
index 13e874ba719..afce427bf30 100644
--- a/jdk/test/java/beans/Introspector/Test7192955.java
+++ b/jdk/test/java/beans/Introspector/Test7192955.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,17 +23,20 @@
 
 /*
  * @test
- * @bug 7192955
+ * @bug 7192955 8000183
  * @summary Tests that all properties are bound
  * @author Sergey Malenkov
  */
 
+import java.beans.IntrospectionException;
+import java.beans.Introspector;
 import java.beans.PropertyChangeListener;
+import java.beans.PropertyDescriptor;
 import java.util.List;
 
 public class Test7192955 {
 
-    public static void main(String[] args) {
+    public static void main(String[] args) throws IntrospectionException {
         if (!BeanUtils.findPropertyDescriptor(MyBean.class, "test").isBound()) {
             throw new Error("a simple property is not bound");
         }
@@ -43,6 +46,12 @@ public class Test7192955 {
         if (!BeanUtils.findPropertyDescriptor(MyBean.class, "readOnly").isBound()) {
             throw new Error("a read-only property is not bound");
         }
+        PropertyDescriptor[] pds = Introspector.getBeanInfo(MyBean.class, BaseBean.class).getPropertyDescriptors();
+        for (PropertyDescriptor pd : pds) {
+            if (pd.getName().equals("test") && pd.isBound()) {
+                throw new Error("a simple property is bound without superclass");
+            }
+        }
     }
 
     public static class BaseBean {

From 9abb185430387da7ce01e32b9c63014f09720aea Mon Sep 17 00:00:00 2001
From: Xue-Lei Andrew Fan <xuelei@openjdk.org>
Date: Fri, 1 Mar 2013 02:34:34 -0800
Subject: [PATCH 248/311] 7030966: Support AEAD CipherSuites

Reviewed-by: weijun, wetmore, valeriep
---
 .../provider/TlsKeyMaterialGenerator.java     |  28 +-
 .../spec/TlsKeyMaterialParameterSpec.java     |   8 +-
 .../internal/spec/TlsKeyMaterialSpec.java     |  26 +-
 .../pkcs11/P11TlsKeyMaterialGenerator.java    |  18 +-
 .../sun/security/ssl/Authenticator.java       | 161 +++++
 .../classes/sun/security/ssl/CipherBox.java   | 582 +++++++++++++-----
 .../classes/sun/security/ssl/CipherSuite.java | 230 +++++--
 .../sun/security/ssl/EngineInputRecord.java   | 148 ++---
 .../sun/security/ssl/EngineOutputRecord.java  | 160 +++--
 .../sun/security/ssl/EngineWriter.java        |  12 +-
 .../classes/sun/security/ssl/Handshaker.java  |  80 ++-
 .../classes/sun/security/ssl/InputRecord.java | 108 +++-
 .../classes/sun/security/ssl/JsseJce.java     |   7 +-
 .../share/classes/sun/security/ssl/MAC.java   | 124 +---
 .../sun/security/ssl/OutputRecord.java        | 149 +++--
 .../classes/sun/security/ssl/Record.java      |  35 +-
 .../sun/security/ssl/SSLEngineImpl.java       |  53 +-
 .../sun/security/ssl/SSLSocketImpl.java       |  44 +-
 jdk/test/sun/security/ec/TestEC.java          |   7 +-
 .../sun/security/pkcs11/fips/CipherTest.java  |  21 +-
 .../security/pkcs11/sslecc/CipherTest.java    |  21 +-
 .../SSLEngineBadBufferArrayAccess.java        |   8 +-
 .../javax/net/ssl/TLSv12/ShortRSAKeyGCM.java  | 445 +++++++++++++
 .../ciphersuites/CipherSuitesInOrder.java     |  27 +-
 .../ssl/sanity/interop/CipherTest.java        |  21 +-
 .../templates/SSLSocketSSLEngineTemplate.java |  11 +-
 26 files changed, 1828 insertions(+), 706 deletions(-)
 create mode 100644 jdk/src/share/classes/sun/security/ssl/Authenticator.java
 create mode 100644 jdk/test/sun/security/ssl/javax/net/ssl/TLSv12/ShortRSAKeyGCM.java

diff --git a/jdk/src/share/classes/com/sun/crypto/provider/TlsKeyMaterialGenerator.java b/jdk/src/share/classes/com/sun/crypto/provider/TlsKeyMaterialGenerator.java
index 4146f190875..d1255d42164 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/TlsKeyMaterialGenerator.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/TlsKeyMaterialGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -165,16 +165,18 @@ public final class TlsKeyMaterialGenerator extends KeyGeneratorSpi {
         // partition keyblock into individual secrets
 
         int ofs = 0;
-        byte[] tmp = new byte[macLength];
+        if (macLength != 0) {
+            byte[] tmp = new byte[macLength];
 
-        // mac keys
-        System.arraycopy(keyBlock, ofs, tmp, 0, macLength);
-        ofs += macLength;
-        clientMacKey = new SecretKeySpec(tmp, "Mac");
+            // mac keys
+            System.arraycopy(keyBlock, ofs, tmp, 0, macLength);
+            ofs += macLength;
+            clientMacKey = new SecretKeySpec(tmp, "Mac");
 
-        System.arraycopy(keyBlock, ofs, tmp, 0, macLength);
-        ofs += macLength;
-        serverMacKey = new SecretKeySpec(tmp, "Mac");
+            System.arraycopy(keyBlock, ofs, tmp, 0, macLength);
+            ofs += macLength;
+            serverMacKey = new SecretKeySpec(tmp, "Mac");
+        }
 
         if (keyLength == 0) { // SSL_RSA_WITH_NULL_* ciphersuites
             return new TlsKeyMaterialSpec(clientMacKey, serverMacKey);
@@ -198,7 +200,7 @@ public final class TlsKeyMaterialGenerator extends KeyGeneratorSpi {
 
             // IV keys if needed.
             if (ivLength != 0) {
-                tmp = new byte[ivLength];
+                byte[] tmp = new byte[ivLength];
 
                 System.arraycopy(keyBlock, ofs, tmp, 0, ivLength);
                 ofs += ivLength;
@@ -220,8 +222,8 @@ public final class TlsKeyMaterialGenerator extends KeyGeneratorSpi {
                 // TLS 1.0
                 byte[] seed = concat(clientRandom, serverRandom);
 
-                tmp = doTLS10PRF(clientKeyBytes, LABEL_CLIENT_WRITE_KEY, seed,
-                            expandedKeyLength, md5, sha);
+                byte[] tmp = doTLS10PRF(clientKeyBytes,
+                    LABEL_CLIENT_WRITE_KEY, seed, expandedKeyLength, md5, sha);
                 clientCipherKey = new SecretKeySpec(tmp, alg);
 
                 tmp = doTLS10PRF(serverKeyBytes, LABEL_SERVER_WRITE_KEY, seed,
@@ -239,7 +241,7 @@ public final class TlsKeyMaterialGenerator extends KeyGeneratorSpi {
                 }
             } else {
                 // SSLv3
-                tmp = new byte[expandedKeyLength];
+                byte[] tmp = new byte[expandedKeyLength];
 
                 md5.update(clientKeyBytes);
                 md5.update(clientRandom);
diff --git a/jdk/src/share/classes/sun/security/internal/spec/TlsKeyMaterialParameterSpec.java b/jdk/src/share/classes/sun/security/internal/spec/TlsKeyMaterialParameterSpec.java
index 80aa79a2596..71388b79718 100644
--- a/jdk/src/share/classes/sun/security/internal/spec/TlsKeyMaterialParameterSpec.java
+++ b/jdk/src/share/classes/sun/security/internal/spec/TlsKeyMaterialParameterSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -212,12 +212,6 @@ public class TlsKeyMaterialParameterSpec implements AlgorithmParameterSpec {
      *     generated.
      */
     public int getIvLength() {
-        // TLS v1.1 or later uses an explicit IV to protect against
-        // the CBC attacks.
-        if (majorVersion >= 0x03 && minorVersion >= 0x02) {
-            return 0;
-        }
-
         return ivLength;
     }
 
diff --git a/jdk/src/share/classes/sun/security/internal/spec/TlsKeyMaterialSpec.java b/jdk/src/share/classes/sun/security/internal/spec/TlsKeyMaterialSpec.java
index d1204962881..2dd8a93765b 100644
--- a/jdk/src/share/classes/sun/security/internal/spec/TlsKeyMaterialSpec.java
+++ b/jdk/src/share/classes/sun/security/internal/spec/TlsKeyMaterialSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,9 +58,8 @@ public class TlsKeyMaterialSpec implements KeySpec, SecretKey {
      * <code>new TlsKeymaterialSpec(clientMacKey, serverMacKey,
      * null, null, null, null)</code>.
      *
-     * @param clientMacKey the client MAC key
-     * @param serverMacKey the server MAC key
-     * @throws NullPointerException if clientMacKey or serverMacKey is null
+     * @param clientMacKey the client MAC key (or null)
+     * @param serverMacKey the server MAC key (or null)
      */
     public TlsKeyMaterialSpec(SecretKey clientMacKey, SecretKey serverMacKey) {
         this(clientMacKey, serverMacKey, null, null, null, null);
@@ -73,11 +72,10 @@ public class TlsKeyMaterialSpec implements KeySpec, SecretKey {
      * <code>new TlsKeymaterialSpec(clientMacKey, serverMacKey,
      * clientCipherKey, serverCipherKey, null, null)</code>.
      *
-     * @param clientMacKey the client MAC key
-     * @param serverMacKey the server MAC key
+     * @param clientMacKey the client MAC key (or null)
+     * @param serverMacKey the server MAC key (or null)
      * @param clientCipherKey the client cipher key (or null)
      * @param serverCipherKey the server cipher key (or null)
-     * @throws NullPointerException if clientMacKey or serverMacKey is null
      */
     public TlsKeyMaterialSpec(SecretKey clientMacKey, SecretKey serverMacKey,
             SecretKey clientCipherKey, SecretKey serverCipherKey) {
@@ -90,21 +88,17 @@ public class TlsKeyMaterialSpec implements KeySpec, SecretKey {
      * keys, client and server cipher keys, and client and server
      * initialization vectors.
      *
-     * @param clientMacKey the client MAC key
-     * @param serverMacKey the server MAC key
+     * @param clientMacKey the client MAC key (or null)
+     * @param serverMacKey the server MAC key (or null)
      * @param clientCipherKey the client cipher key (or null)
      * @param clientIv the client initialization vector (or null)
      * @param serverCipherKey the server cipher key (or null)
      * @param serverIv the server initialization vector (or null)
-     *
-     * @throws NullPointerException if clientMacKey or serverMacKey is null
      */
     public TlsKeyMaterialSpec(SecretKey clientMacKey, SecretKey serverMacKey,
             SecretKey clientCipherKey, IvParameterSpec clientIv,
             SecretKey serverCipherKey, IvParameterSpec serverIv) {
-        if ((clientMacKey == null) || (serverMacKey == null)) {
-            throw new NullPointerException("MAC keys must not be null");
-        }
+
         this.clientMacKey = clientMacKey;
         this.serverMacKey = serverMacKey;
         this.clientCipherKey = clientCipherKey;
@@ -143,7 +137,7 @@ public class TlsKeyMaterialSpec implements KeySpec, SecretKey {
     /**
      * Returns the client MAC key.
      *
-     * @return the client MAC key.
+     * @return the client MAC key (or null).
      */
     public SecretKey getClientMacKey() {
         return clientMacKey;
@@ -152,7 +146,7 @@ public class TlsKeyMaterialSpec implements KeySpec, SecretKey {
     /**
      * Return the server MAC key.
      *
-     * @return the server MAC key.
+     * @return the server MAC key (or null).
      */
     public SecretKey getServerMacKey() {
         return serverMacKey;
diff --git a/jdk/src/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java b/jdk/src/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java
index 94e731b01f9..14d1708537a 100644
--- a/jdk/src/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java
+++ b/jdk/src/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -168,10 +168,22 @@ public final class P11TlsKeyMaterialGenerator extends KeyGeneratorSpi {
             // Note that the MAC keys do not inherit all attributes from the
             // template, but they do inherit the sensitive/extractable/token
             // flags, which is all P11Key cares about.
-            SecretKey clientMacKey = P11Key.secretKey
+            SecretKey clientMacKey, serverMacKey;
+
+            // The MAC size may be zero for GCM mode.
+            //
+            // PKCS11 does not support GCM mode as the author made the comment,
+            // so the macBits is unlikely to be zero. It's only a place holder.
+            if (macBits != 0) {
+                clientMacKey = P11Key.secretKey
                     (session, out.hClientMacSecret, "MAC", macBits, attributes);
-            SecretKey serverMacKey = P11Key.secretKey
+                serverMacKey = P11Key.secretKey
                     (session, out.hServerMacSecret, "MAC", macBits, attributes);
+            } else {
+                clientMacKey = null;
+                serverMacKey = null;
+            }
+
             SecretKey clientCipherKey, serverCipherKey;
             if (keyBits != 0) {
                 clientCipherKey = P11Key.secretKey(session, out.hClientKey,
diff --git a/jdk/src/share/classes/sun/security/ssl/Authenticator.java b/jdk/src/share/classes/sun/security/ssl/Authenticator.java
new file mode 100644
index 00000000000..a97ce7d5f0c
--- /dev/null
+++ b/jdk/src/share/classes/sun/security/ssl/Authenticator.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package sun.security.ssl;
+
+import java.util.Arrays;
+
+/**
+ * This class represents an SSL/TLS message authentication token,
+ * which encapsulates a sequence number and ensures that attempts to
+ * delete or reorder messages can be detected.
+ *
+ * Each SSL/TLS connection state contains a sequence number, which
+ * is maintained separately for read and write states.  The sequence
+ * number MUST be set to zero whenever a connection state is made the
+ * active state.  Sequence numbers are of type uint64 and may not
+ * exceed 2^64-1.  Sequence numbers do not wrap.  If a SSL/TLS
+ * implementation would need to wrap a sequence number, it must
+ * renegotiate instead.  A sequence number is incremented after each
+ * record: specifically, the first record transmitted under a
+ * particular connection state MUST use sequence number 0.
+ */
+class Authenticator {
+
+    // byte array containing the additional authentication information for
+    // each record
+    private final byte[] block;
+
+    // the block size of SSL v3.0:
+    // sequence number + record type + + record length
+    private static final int BLOCK_SIZE_SSL = 8 + 1 + 2;
+
+    // the block size of TLS v1.0 and later:
+    // sequence number + record type + protocol version + record length
+    private static final int BLOCK_SIZE_TLS = 8 + 1 + 2 + 2;
+
+    /**
+     * Default construct, no message authentication token is initialized.
+     *
+     * Note that this construct can only be called for null MAC
+     */
+    Authenticator() {
+        block = new byte[0];
+    }
+
+    /**
+     * Constructs the message authentication token for the specified
+     * SSL/TLS protocol.
+     */
+    Authenticator(ProtocolVersion protocolVersion) {
+        if (protocolVersion.v >= ProtocolVersion.TLS10.v) {
+            block = new byte[BLOCK_SIZE_TLS];
+            block[9] = protocolVersion.major;
+            block[10] = protocolVersion.minor;
+        } else {
+            block = new byte[BLOCK_SIZE_SSL];
+        }
+    }
+
+    /**
+     * Checks whether the sequence number is close to wrap.
+     *
+     * Sequence numbers are of type uint64 and may not exceed 2^64-1.
+     * Sequence numbers do not wrap. When the sequence number is near
+     * to wrap, we need to close the connection immediately.
+     *
+     * @return true if the sequence number is close to wrap
+     */
+    final boolean seqNumOverflow() {
+        /*
+         * Conservatively, we don't allow more records to be generated
+         * when there are only 2^8 sequence numbers left.
+         */
+        return (block.length != 0 &&
+                block[0] == (byte)0xFF && block[1] == (byte)0xFF &&
+                block[2] == (byte)0xFF && block[3] == (byte)0xFF &&
+                block[4] == (byte)0xFF && block[5] == (byte)0xFF &&
+                block[6] == (byte)0xFF);
+    }
+
+    /**
+     * Checks whether the sequence number close to renew.
+     *
+     * Sequence numbers are of type uint64 and may not exceed 2^64-1.
+     * Sequence numbers do not wrap.  If a TLS
+     * implementation would need to wrap a sequence number, it must
+     * renegotiate instead.
+     *
+     * @return true if the sequence number is huge enough to renew
+     */
+    final boolean seqNumIsHuge() {
+        /*
+         * Conservatively, we should ask for renegotiation when there are
+         * only 2^48 sequence numbers left.
+         */
+        return (block.length != 0 &&
+                block[0] == (byte)0xFF && block[1] == (byte)0xFF);
+    }
+
+    /**
+     * Gets the current sequence number.
+     *
+     * @return the byte array of the current sequence number
+     */
+    final byte[] sequenceNumber() {
+        return Arrays.copyOf(block, 8);
+    }
+
+    /**
+     * Acquires the current message authentication information with the
+     * specified record type and fragment length, and then increases the
+     * sequence number.
+     *
+     * @param  type the record type
+     * @param  length the fragment of the record
+     * @return the byte array of the current message authentication information
+     */
+    final byte[] acquireAuthenticationBytes(byte type, int length) {
+        byte[] copy = block.clone();
+
+        if (block.length != 0) {
+            copy[8] = type;
+            copy[copy.length - 2] = (byte)(length >> 8);
+            copy[copy.length - 1] = (byte)(length);
+
+            /*
+             * Increase the sequence number in the block array
+             * it is a 64-bit number stored in big-endian format
+             */
+            int k = 7;
+            while ((k >= 0) && (++block[k] == 0)) {
+                k--;
+            }
+        }
+
+        return copy;
+    }
+
+}
diff --git a/jdk/src/share/classes/sun/security/ssl/CipherBox.java b/jdk/src/share/classes/sun/security/ssl/CipherBox.java
index 362f9b5d904..bce44dabda3 100644
--- a/jdk/src/share/classes/sun/security/ssl/CipherBox.java
+++ b/jdk/src/share/classes/sun/security/ssl/CipherBox.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,15 +29,18 @@ package sun.security.ssl;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.util.Hashtable;
+import java.util.Arrays;
 
 import java.security.*;
 import javax.crypto.*;
 import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.GCMParameterSpec;
 
 import java.nio.*;
 
 import sun.security.ssl.CipherSuite.*;
 import static sun.security.ssl.CipherSuite.*;
+import static sun.security.ssl.CipherSuite.CipherType.*;
 
 import sun.misc.HexDumpEncoder;
 
@@ -101,20 +104,41 @@ final class CipherBox {
     // cipher object
     private final Cipher cipher;
 
-    /**
-     * Cipher blocksize, 0 for stream ciphers
-     */
-    private int blockSize;
-
     /**
      * secure random
      */
     private SecureRandom random;
 
     /**
-     * Is the cipher of CBC mode?
+     * fixed IV, the implicit nonce of AEAD cipher suite, only apply to
+     * AEAD cipher suites
      */
-    private final boolean isCBCMode;
+    private final byte[] fixedIv;
+
+    /**
+     * the key, reserved only for AEAD cipher initialization
+     */
+    private final Key key;
+
+    /**
+     * the operation mode, reserved for AEAD cipher initialization
+     */
+    private final int mode;
+
+    /**
+     * the authentication tag size, only apply to AEAD cipher suites
+     */
+    private final int tagSize;
+
+    /**
+     * the record IV length, only apply to AEAD cipher suites
+     */
+    private final int recordIvSize;
+
+    /**
+     * cipher type
+     */
+    private final CipherType cipherType;
 
     /**
      * Fixed masks of various block size, as the initial decryption IVs
@@ -132,7 +156,13 @@ final class CipherBox {
     private CipherBox() {
         this.protocolVersion = ProtocolVersion.DEFAULT;
         this.cipher = null;
-        this.isCBCMode = false;
+        this.cipherType = STREAM_CIPHER;
+        this.fixedIv = new byte[0];
+        this.key = null;
+        this.mode = Cipher.ENCRYPT_MODE;    // choose at random
+        this.random = null;
+        this.tagSize = 0;
+        this.recordIvSize = 0;
     }
 
     /**
@@ -147,13 +177,13 @@ final class CipherBox {
         try {
             this.protocolVersion = protocolVersion;
             this.cipher = JsseJce.getCipher(bulkCipher.transformation);
-            int mode = encrypt ? Cipher.ENCRYPT_MODE : Cipher.DECRYPT_MODE;
+            this.mode = encrypt ? Cipher.ENCRYPT_MODE : Cipher.DECRYPT_MODE;
 
             if (random == null) {
                 random = JsseJce.getSecureRandom();
             }
             this.random = random;
-            this.isCBCMode = bulkCipher.isCBCMode;
+            this.cipherType = bulkCipher.cipherType;
 
             /*
              * RFC 4346 recommends two algorithms used to generated the
@@ -171,14 +201,40 @@ final class CipherBox {
                 iv = getFixedMask(bulkCipher.ivSize);
             }
 
-            cipher.init(mode, key, iv, random);
+            if (cipherType == AEAD_CIPHER) {
+                // AEAD must completely initialize the cipher for each packet,
+                // and so we save initialization parameters for packet
+                // processing time.
 
-            // Do not call getBlockSize until after init()
-            // otherwise we would disrupt JCE delayed provider selection
-            blockSize = cipher.getBlockSize();
-            // some providers implement getBlockSize() incorrectly
-            if (blockSize == 1) {
-                blockSize = 0;
+                // Set the tag size for AEAD cipher
+                tagSize = bulkCipher.tagSize;
+
+                // Reserve the key for AEAD cipher initialization
+                this.key = key;
+
+                fixedIv = iv.getIV();
+                if (fixedIv == null ||
+                        fixedIv.length != bulkCipher.fixedIvSize) {
+                    throw new RuntimeException("Improper fixed IV for AEAD");
+                }
+
+                // Set the record IV length for AEAD cipher
+                recordIvSize = bulkCipher.ivSize - bulkCipher.fixedIvSize;
+
+                // DON'T initialize the cipher for AEAD!
+            } else {
+                // CBC only requires one initialization during its lifetime
+                // (future packets/IVs set the proper CBC state), so we can
+                // initialize now.
+
+                // Zeroize the variables that only apply to AEAD cipher
+                this.tagSize = 0;
+                this.fixedIv = new byte[0];
+                this.recordIvSize = 0;
+                this.key = null;
+
+                // Initialize the cipher
+                cipher.init(mode, key, iv, random);
             }
         } catch (NoSuchAlgorithmException e) {
             throw e;
@@ -235,26 +291,11 @@ final class CipherBox {
         }
 
         try {
-            if (blockSize != 0) {
-                // TLSv1.1 needs a IV block
-                if (protocolVersion.v >= ProtocolVersion.TLS11.v) {
-                    // generate a random number
-                    byte[] prefix = new byte[blockSize];
-                    random.nextBytes(prefix);
-
-                    // move forward the plaintext
-                    System.arraycopy(buf, offset,
-                                     buf, offset + prefix.length, len);
-
-                    // prefix the plaintext
-                    System.arraycopy(prefix, 0,
-                                     buf, offset, prefix.length);
-
-                    len += prefix.length;
-                }
-
+            int blockSize = cipher.getBlockSize();
+            if (cipherType == BLOCK_CIPHER) {
                 len = addPadding(buf, offset, len, blockSize);
             }
+
             if (debug != null && Debug.isOn("plaintext")) {
                 try {
                     HexDumpEncoder hd = new HexDumpEncoder();
@@ -267,14 +308,28 @@ final class CipherBox {
                         System.out);
                 } catch (IOException e) { }
             }
-            int newLen = cipher.update(buf, offset, len, buf, offset);
-            if (newLen != len) {
-                // catch BouncyCastle buffering error
-                throw new RuntimeException("Cipher buffering error " +
-                    "in JCE provider " + cipher.getProvider().getName());
+
+
+            if (cipherType == AEAD_CIPHER) {
+                try {
+                    return cipher.doFinal(buf, offset, len, buf, offset);
+                } catch (IllegalBlockSizeException | BadPaddingException ibe) {
+                    // unlikely to happen
+                    throw new RuntimeException(
+                        "Cipher error in AEAD mode in JCE provider " +
+                        cipher.getProvider().getName(), ibe);
+                }
+            } else {
+                int newLen = cipher.update(buf, offset, len, buf, offset);
+                if (newLen != len) {
+                    // catch BouncyCastle buffering error
+                    throw new RuntimeException("Cipher buffering error " +
+                        "in JCE provider " + cipher.getProvider().getName());
+                }
+                return newLen;
             }
-            return newLen;
         } catch (ShortBufferException e) {
+            // unlikely to happen, we should have enough buffer space here
             throw new ArrayIndexOutOfBoundsException(e.toString());
         }
     }
@@ -288,7 +343,7 @@ final class CipherBox {
      * set to last position padded/encrypted.  The limit may have changed
      * because of the added padding bytes.
      */
-    int encrypt(ByteBuffer bb) {
+    int encrypt(ByteBuffer bb, int outLimit) {
 
         int len = bb.remaining();
 
@@ -297,66 +352,71 @@ final class CipherBox {
             return len;
         }
 
-        try {
-            int pos = bb.position();
+        int pos = bb.position();
 
-            if (blockSize != 0) {
-                // TLSv1.1 needs a IV block
-                if (protocolVersion.v >= ProtocolVersion.TLS11.v) {
-                    // generate a random number
-                    byte[] prefix = new byte[blockSize];
-                    random.nextBytes(prefix);
+        int blockSize = cipher.getBlockSize();
+        if (cipherType == BLOCK_CIPHER) {
+            // addPadding adjusts pos/limit
+            len = addPadding(bb, blockSize);
+            bb.position(pos);
+        }
 
-                    // move forward the plaintext
-                    byte[] buf = null;
-                    int limit = bb.limit();
-                    if (bb.hasArray()) {
-                        int arrayOffset = bb.arrayOffset();
-                        buf = bb.array();
-                        System.arraycopy(buf, arrayOffset + pos,
-                            buf, arrayOffset + pos + prefix.length,
-                            limit - pos);
-                        bb.limit(limit + prefix.length);
-                    } else {
-                        buf = new byte[limit - pos];
-                        bb.get(buf, 0, limit - pos);
-                        bb.position(pos + prefix.length);
-                        bb.limit(limit + prefix.length);
-                        bb.put(buf);
+        if (debug != null && Debug.isOn("plaintext")) {
+            try {
+                HexDumpEncoder hd = new HexDumpEncoder();
+
+                System.out.println(
+                    "Padded plaintext before ENCRYPTION:  len = "
+                    + len);
+                hd.encodeBuffer(bb.duplicate(), System.out);
+
+            } catch (IOException e) { }
+        }
+
+        /*
+         * Encrypt "in-place".  This does not add its own padding.
+         */
+        ByteBuffer dup = bb.duplicate();
+        if (cipherType == AEAD_CIPHER) {
+            try {
+                int outputSize = cipher.getOutputSize(dup.remaining());
+                if (outputSize > bb.remaining()) {
+                    // need to expand the limit of the output buffer for
+                    // the authentication tag.
+                    //
+                    // DON'T worry about the buffer's capacity, we have
+                    // reserved space for the authentication tag.
+                    if (outLimit < pos + outputSize) {
+                        // unlikely to happen
+                        throw new ShortBufferException(
+                                    "need more space in output buffer");
                     }
-                    bb.position(pos);
-
-                    // prefix the plaintext
-                    bb.put(prefix);
-                    bb.position(pos);
+                    bb.limit(pos + outputSize);
                 }
-
-                // addPadding adjusts pos/limit
-                len = addPadding(bb, blockSize);
-                bb.position(pos);
+                int newLen = cipher.doFinal(dup, bb);
+                if (newLen != outputSize) {
+                    throw new RuntimeException(
+                            "Cipher buffering error in JCE provider " +
+                            cipher.getProvider().getName());
+                }
+                return newLen;
+            } catch (IllegalBlockSizeException |
+                           BadPaddingException | ShortBufferException ibse) {
+                // unlikely to happen
+                throw new RuntimeException(
+                        "Cipher error in AEAD mode in JCE provider " +
+                        cipher.getProvider().getName(), ibse);
             }
-            if (debug != null && Debug.isOn("plaintext")) {
-                try {
-                    HexDumpEncoder hd = new HexDumpEncoder();
-
-                    System.out.println(
-                        "Padded plaintext before ENCRYPTION:  len = "
-                        + len);
-                    hd.encodeBuffer(bb, System.out);
-
-                } catch (IOException e) { }
-                /*
-                 * reset back to beginning
-                 */
-                bb.position(pos);
+        } else {
+            int newLen;
+            try {
+                newLen = cipher.update(dup, bb);
+            } catch (ShortBufferException sbe) {
+                // unlikely to happen
+                throw new RuntimeException("Cipher buffering error " +
+                    "in JCE provider " + cipher.getProvider().getName());
             }
 
-            /*
-             * Encrypt "in-place".  This does not add its own padding.
-             */
-            ByteBuffer dup = bb.duplicate();
-            int newLen = cipher.update(dup, bb);
-
             if (bb.position() != dup.position()) {
                 throw new RuntimeException("bytebuffer padding error");
             }
@@ -367,10 +427,6 @@ final class CipherBox {
                     "in JCE provider " + cipher.getProvider().getName());
             }
             return newLen;
-        } catch (ShortBufferException e) {
-            RuntimeException exc = new RuntimeException(e.toString());
-            exc.initCause(e);
-            throw exc;
         }
     }
 
@@ -398,11 +454,23 @@ final class CipherBox {
         }
 
         try {
-            int newLen = cipher.update(buf, offset, len, buf, offset);
-            if (newLen != len) {
-                // catch BouncyCastle buffering error
-                throw new RuntimeException("Cipher buffering error " +
-                    "in JCE provider " + cipher.getProvider().getName());
+            int newLen;
+            if (cipherType == AEAD_CIPHER) {
+                try {
+                    newLen = cipher.doFinal(buf, offset, len, buf, offset);
+                } catch (IllegalBlockSizeException ibse) {
+                    // unlikely to happen
+                    throw new RuntimeException(
+                        "Cipher error in AEAD mode in JCE provider " +
+                        cipher.getProvider().getName(), ibse);
+                }
+            } else {
+                newLen = cipher.update(buf, offset, len, buf, offset);
+                if (newLen != len) {
+                    // catch BouncyCastle buffering error
+                    throw new RuntimeException("Cipher buffering error " +
+                        "in JCE provider " + cipher.getProvider().getName());
+                }
             }
             if (debug != null && Debug.isOn("plaintext")) {
                 try {
@@ -416,7 +484,9 @@ final class CipherBox {
                         System.out);
                 } catch (IOException e) { }
             }
-            if (blockSize != 0) {
+
+            if (cipherType == BLOCK_CIPHER) {
+                int blockSize = cipher.getBlockSize();
                 newLen = removePadding(buf, offset, newLen,
                              blockSize, protocolVersion);
 
@@ -424,16 +494,11 @@ final class CipherBox {
                     if (newLen < blockSize) {
                         throw new BadPaddingException("invalid explicit IV");
                     }
-
-                    // discards the first cipher block, the IV component.
-                    System.arraycopy(buf, offset + blockSize,
-                                     buf, offset, newLen - blockSize);
-
-                    newLen -= blockSize;
                 }
             }
             return newLen;
         } catch (ShortBufferException e) {
+            // unlikely to happen, we should have enough buffer space here
             throw new ArrayIndexOutOfBoundsException(e.toString());
         }
     }
@@ -463,15 +528,29 @@ final class CipherBox {
              */
             int pos = bb.position();
             ByteBuffer dup = bb.duplicate();
-            int newLen = cipher.update(dup, bb);
-            if (newLen != len) {
-                // catch BouncyCastle buffering error
-                throw new RuntimeException("Cipher buffering error " +
-                    "in JCE provider " + cipher.getProvider().getName());
+            int newLen;
+            if (cipherType == AEAD_CIPHER) {
+                try {
+                    newLen = cipher.doFinal(dup, bb);
+                } catch (IllegalBlockSizeException ibse) {
+                    // unlikely to happen
+                    throw new RuntimeException(
+                        "Cipher error in AEAD mode \"" + ibse.getMessage() +
+                        " \"in JCE provider " + cipher.getProvider().getName());
+                }
+            } else {
+                newLen = cipher.update(dup, bb);
+                if (newLen != len) {
+                    // catch BouncyCastle buffering error
+                    throw new RuntimeException("Cipher buffering error " +
+                        "in JCE provider " + cipher.getProvider().getName());
+                }
             }
 
+            // reset the limit to the end of the decryted data
+            bb.limit(pos + newLen);
+
             if (debug != null && Debug.isOn("plaintext")) {
-                bb.position(pos);
                 try {
                     HexDumpEncoder hd = new HexDumpEncoder();
 
@@ -479,50 +558,33 @@ final class CipherBox {
                         "Padded plaintext after DECRYPTION:  len = "
                         + newLen);
 
-                    hd.encodeBuffer(bb, System.out);
+                    hd.encodeBuffer(
+                        (ByteBuffer)bb.duplicate().position(pos), System.out);
                 } catch (IOException e) { }
             }
 
             /*
              * Remove the block padding.
              */
-            if (blockSize != 0) {
+            if (cipherType == BLOCK_CIPHER) {
+                int blockSize = cipher.getBlockSize();
                 bb.position(pos);
                 newLen = removePadding(bb, blockSize, protocolVersion);
 
+                // check the explicit IV of TLS v1.1 or later
                 if (protocolVersion.v >= ProtocolVersion.TLS11.v) {
                     if (newLen < blockSize) {
                         throw new BadPaddingException("invalid explicit IV");
                     }
 
-                    // discards the first cipher block, the IV component.
-                    byte[] buf = null;
-                    int limit = bb.limit();
-                    if (bb.hasArray()) {
-                        int arrayOffset = bb.arrayOffset();
-                        buf = bb.array();
-                        System.arraycopy(buf, arrayOffset + pos + blockSize,
-                            buf, arrayOffset + pos, limit - pos - blockSize);
-                        bb.limit(limit - blockSize);
-                    } else {
-                        buf = new byte[limit - pos - blockSize];
-                        bb.position(pos + blockSize);
-                        bb.get(buf);
-                        bb.position(pos);
-                        bb.put(buf);
-                        bb.limit(limit - blockSize);
-                    }
-
                     // reset the position to the end of the decrypted data
-                    limit = bb.limit();
-                    bb.position(limit);
+                    bb.position(bb.limit());
                 }
             }
             return newLen;
         } catch (ShortBufferException e) {
-            RuntimeException exc = new RuntimeException(e.toString());
-            exc.initCause(e);
-            throw exc;
+            // unlikely to happen, we should have enough buffer space here
+            throw new ArrayIndexOutOfBoundsException(e.toString());
         }
     }
 
@@ -695,8 +757,8 @@ final class CipherBox {
                 // ignore return value.
                 cipher.doFinal();
             }
-        } catch (GeneralSecurityException e) {
-            // swallow for now.
+        } catch (Exception e) {
+            // swallow all types of exceptions.
         }
     }
 
@@ -706,6 +768,234 @@ final class CipherBox {
      * @return true if the cipher use CBC mode, false otherwise.
      */
     boolean isCBCMode() {
-        return isCBCMode;
+        return cipherType == BLOCK_CIPHER;
+    }
+
+    /*
+     * Does the cipher use AEAD mode?
+     *
+     * @return true if the cipher use AEAD mode, false otherwise.
+     */
+    boolean isAEADMode() {
+        return cipherType == AEAD_CIPHER;
+    }
+
+    /*
+     * Is the cipher null?
+     *
+     * @return true if the cipher is null, false otherwise.
+     */
+    boolean isNullCipher() {
+        return cipher == null;
+    }
+
+    /*
+     * Gets the explicit nonce/IV size of the cipher.
+     *
+     * The returned value is the SecurityParameters.record_iv_length in
+     * RFC 4346/5246.  It is the size of explicit IV for CBC mode, and the
+     * size of explicit nonce for AEAD mode.
+     *
+     * @return the explicit nonce size of the cipher.
+     */
+    int getExplicitNonceSize() {
+        switch (cipherType) {
+            case BLOCK_CIPHER:
+                // For block ciphers, the explicit IV length is of length
+                // SecurityParameters.record_iv_length, which is equal to
+                // the SecurityParameters.block_size.
+                if (protocolVersion.v >= ProtocolVersion.TLS11.v) {
+                    return cipher.getBlockSize();
+                }
+                break;
+            case AEAD_CIPHER:
+                return recordIvSize;
+                        // It is also the length of sequence number, which is
+                        // used as the nonce_explicit for AEAD cipher suites.
+        }
+
+        return 0;
+    }
+
+    /*
+     * Applies the explicit nonce/IV to this cipher. This method is used to
+     * decrypt an SSL/TLS input record.
+     *
+     * The returned value is the SecurityParameters.record_iv_length in
+     * RFC 4346/5246.  It is the size of explicit IV for CBC mode, and the
+     * size of explicit nonce for AEAD mode.
+     *
+     * @param  authenticator the authenticator to get the additional
+     *         authentication data
+     * @param  contentType the content type of the input record
+     * @param  bb the byte buffer to get the explicit nonce from
+     *
+     * @return the explicit nonce size of the cipher.
+     */
+    int applyExplicitNonce(Authenticator authenticator, byte contentType,
+            ByteBuffer bb) throws BadPaddingException {
+        switch (cipherType) {
+            case BLOCK_CIPHER:
+                // For block ciphers, the explicit IV length is of length
+                // SecurityParameters.record_iv_length, which is equal to
+                // the SecurityParameters.block_size.
+                if (protocolVersion.v >= ProtocolVersion.TLS11.v) {
+                    return cipher.getBlockSize();
+                }
+                break;
+            case AEAD_CIPHER:
+                if (bb.remaining() < (recordIvSize + tagSize)) {
+                    throw new BadPaddingException(
+                                        "invalid AEAD cipher fragment");
+                }
+
+                // initialize the AEAD cipher for the unique IV
+                byte[] iv = Arrays.copyOf(fixedIv,
+                                    fixedIv.length + recordIvSize);
+                bb.get(iv, fixedIv.length, recordIvSize);
+                bb.position(bb.position() - recordIvSize);
+                GCMParameterSpec spec = new GCMParameterSpec(tagSize * 8, iv);
+                try {
+                    cipher.init(mode, key, spec, random);
+                } catch (InvalidKeyException |
+                            InvalidAlgorithmParameterException ikae) {
+                    // unlikely to happen
+                    throw new RuntimeException(
+                                "invalid key or spec in GCM mode", ikae);
+                }
+
+                // update the additional authentication data
+                byte[] aad = authenticator.acquireAuthenticationBytes(
+                        contentType, bb.remaining() - recordIvSize - tagSize);
+                cipher.updateAAD(aad);
+
+                return recordIvSize;
+                        // It is also the length of sequence number, which is
+                        // used as the nonce_explicit for AEAD cipher suites.
+        }
+
+       return 0;
+    }
+
+    /*
+     * Applies the explicit nonce/IV to this cipher. This method is used to
+     * decrypt an SSL/TLS input record.
+     *
+     * The returned value is the SecurityParameters.record_iv_length in
+     * RFC 4346/5246.  It is the size of explicit IV for CBC mode, and the
+     * size of explicit nonce for AEAD mode.
+     *
+     * @param  authenticator the authenticator to get the additional
+     *         authentication data
+     * @param  contentType the content type of the input record
+     * @param  buf the byte array to get the explicit nonce from
+     * @param  offset the offset of the byte buffer
+     * @param  cipheredLength the ciphered fragment length of the output
+     *         record, it is the TLSCiphertext.length in RFC 4346/5246.
+     *
+     * @return the explicit nonce size of the cipher.
+     */
+    int applyExplicitNonce(Authenticator authenticator,
+            byte contentType, byte[] buf, int offset,
+            int cipheredLength) throws BadPaddingException {
+
+        ByteBuffer bb = ByteBuffer.wrap(buf, offset, cipheredLength);
+
+        return applyExplicitNonce(authenticator, contentType, bb);
+    }
+
+    /*
+     * Creates the explicit nonce/IV to this cipher. This method is used to
+     * encrypt an SSL/TLS output record.
+     *
+     * The size of the returned array is the SecurityParameters.record_iv_length
+     * in RFC 4346/5246.  It is the size of explicit IV for CBC mode, and the
+     * size of explicit nonce for AEAD mode.
+     *
+     * @param  authenticator the authenticator to get the additional
+     *         authentication data
+     * @param  contentType the content type of the input record
+     * @param  fragmentLength the fragment length of the output record, it is
+     *         the TLSCompressed.length in RFC 4346/5246.
+     *
+     * @return the explicit nonce of the cipher.
+     */
+    byte[] createExplicitNonce(Authenticator authenticator,
+            byte contentType, int fragmentLength) {
+
+        byte[] nonce = new byte[0];
+        switch (cipherType) {
+            case BLOCK_CIPHER:
+                if (protocolVersion.v >= ProtocolVersion.TLS11.v) {
+                    // For block ciphers, the explicit IV length is of length
+                    // SecurityParameters.record_iv_length, which is equal to
+                    // the SecurityParameters.block_size.
+                    //
+                    // Generate a random number as the explicit IV parameter.
+                    nonce = new byte[cipher.getBlockSize()];
+                    random.nextBytes(nonce);
+                }
+                break;
+            case AEAD_CIPHER:
+                // To be unique and aware of overflow-wrap, sequence number
+                // is used as the nonce_explicit of AEAD cipher suites.
+                nonce = authenticator.sequenceNumber();
+
+                // initialize the AEAD cipher for the unique IV
+                byte[] iv = Arrays.copyOf(fixedIv,
+                                            fixedIv.length + nonce.length);
+                System.arraycopy(nonce, 0, iv, fixedIv.length, nonce.length);
+                GCMParameterSpec spec = new GCMParameterSpec(tagSize * 8, iv);
+                try {
+                    cipher.init(mode, key, spec, random);
+                } catch (InvalidKeyException |
+                            InvalidAlgorithmParameterException ikae) {
+                    // unlikely to happen
+                    throw new RuntimeException(
+                                "invalid key or spec in GCM mode", ikae);
+                }
+
+                // update the additional authentication data
+                byte[] aad = authenticator.acquireAuthenticationBytes(
+                                                contentType, fragmentLength);
+                cipher.updateAAD(aad);
+                break;
+        }
+
+        return nonce;
+    }
+
+    /*
+     * Is this cipher available?
+     *
+     * This method can only be called by CipherSuite.BulkCipher.isAvailable()
+     * to test the availability of a cipher suites.  Please DON'T use it in
+     * other places, otherwise, the behavior may be unexpected because we may
+     * initialize AEAD cipher improperly in the method.
+     */
+    Boolean isAvailable() {
+        // We won't know whether a cipher for a particular key size is
+        // available until the cipher is successfully initialized.
+        //
+        // We do not initialize AEAD cipher in the constructor.  Need to
+        // initialize the cipher to ensure that the AEAD mode for a
+        // particular key size is supported.
+        if (cipherType == AEAD_CIPHER) {
+            try {
+                Authenticator authenticator =
+                    new Authenticator(protocolVersion);
+                byte[] nonce = authenticator.sequenceNumber();
+                byte[] iv = Arrays.copyOf(fixedIv,
+                                            fixedIv.length + nonce.length);
+                System.arraycopy(nonce, 0, iv, fixedIv.length, nonce.length);
+                GCMParameterSpec spec = new GCMParameterSpec(tagSize * 8, iv);
+
+                cipher.init(mode, key, spec, random);
+            } catch (Exception e) {
+                return Boolean.FALSE;
+            }
+        }   // Otherwise, we have initialized the cipher in the constructor.
+
+        return Boolean.TRUE;
     }
 }
diff --git a/jdk/src/share/classes/sun/security/ssl/CipherSuite.java b/jdk/src/share/classes/sun/security/ssl/CipherSuite.java
index 555304880b7..435693751c7 100644
--- a/jdk/src/share/classes/sun/security/ssl/CipherSuite.java
+++ b/jdk/src/share/classes/sun/security/ssl/CipherSuite.java
@@ -33,12 +33,14 @@ import java.security.InvalidKeyException;
 import java.security.SecureRandom;
 import java.security.KeyManagementException;
 
+import javax.crypto.Cipher;
 import javax.crypto.SecretKey;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 
 import static sun.security.ssl.CipherSuite.KeyExchange.*;
 import static sun.security.ssl.CipherSuite.PRF.*;
+import static sun.security.ssl.CipherSuite.CipherType.*;
 import static sun.security.ssl.JsseJce.*;
 
 /**
@@ -135,7 +137,9 @@ final class CipherSuite implements Comparable<CipherSuite> {
         this.keyExchange = keyExchange;
         this.cipher = cipher;
         this.exportable = cipher.exportable;
-        if (name.endsWith("_MD5")) {
+        if (cipher.cipherType == CipherType.AEAD_CIPHER) {
+            macAlg = M_NULL;
+        } else if (name.endsWith("_MD5")) {
             macAlg = M_MD5;
         } else if (name.endsWith("_SHA")) {
             macAlg = M_SHA;
@@ -385,6 +389,12 @@ final class CipherSuite implements Comparable<CipherSuite> {
         }
     }
 
+    static enum CipherType {
+        STREAM_CIPHER,         // null or stream cipher
+        BLOCK_CIPHER,          // block cipher in CBC mode
+        AEAD_CIPHER            // AEAD cipher
+    }
+
     /**
      * An SSL/TLS bulk cipher algorithm. One instance per combination of
      * cipher and key length.
@@ -417,14 +427,26 @@ final class CipherSuite implements Comparable<CipherSuite> {
         // for non-exportable ciphers, this is the same as keySize
         final int expandedKeySize;
 
-        // size of the IV (also block size)
+        // size of the IV
         final int ivSize;
 
+        // size of fixed IV
+        //
+        // record_iv_length = ivSize - fixedIvSize
+        final int fixedIvSize;
+
         // exportable under 512/40 bit rules
         final boolean exportable;
 
         // Is the cipher algorithm of Cipher Block Chaining (CBC) mode?
-        final boolean isCBCMode;
+        final CipherType cipherType;
+
+        // size of the authentication tag, only applicable to cipher suites in
+        // Galois Counter Mode (GCM)
+        //
+        // As far as we know, all supported GCM cipher suites use 128-bits
+        // authentication tags.
+        final int tagSize = 16;
 
         // The secure random used to detect the cipher availability.
         private final static SecureRandom secureRandom;
@@ -437,32 +459,34 @@ final class CipherSuite implements Comparable<CipherSuite> {
             }
         }
 
-        BulkCipher(String transformation, int keySize,
-                int expandedKeySize, int ivSize, boolean allowed) {
+        BulkCipher(String transformation, CipherType cipherType, int keySize,
+                int expandedKeySize, int ivSize,
+                int fixedIvSize, boolean allowed) {
+
             this.transformation = transformation;
             String[] splits = transformation.split("/");
             this.algorithm = splits[0];
-            this.isCBCMode =
-                splits.length <= 1 ? false : "CBC".equalsIgnoreCase(splits[1]);
+            this.cipherType = cipherType;
             this.description = this.algorithm + "/" + (keySize << 3);
             this.keySize = keySize;
             this.ivSize = ivSize;
+            this.fixedIvSize = fixedIvSize;
             this.allowed = allowed;
 
             this.expandedKeySize = expandedKeySize;
             this.exportable = true;
         }
 
-        BulkCipher(String transformation, int keySize,
-                int ivSize, boolean allowed) {
+        BulkCipher(String transformation, CipherType cipherType, int keySize,
+                int ivSize, int fixedIvSize, boolean allowed) {
             this.transformation = transformation;
             String[] splits = transformation.split("/");
             this.algorithm = splits[0];
-            this.isCBCMode =
-                splits.length <= 1 ? false : "CBC".equalsIgnoreCase(splits[1]);
+            this.cipherType = cipherType;
             this.description = this.algorithm + "/" + (keySize << 3);
             this.keySize = keySize;
             this.ivSize = ivSize;
+            this.fixedIvSize = fixedIvSize;
             this.allowed = allowed;
 
             this.expandedKeySize = keySize;
@@ -486,16 +510,20 @@ final class CipherSuite implements Comparable<CipherSuite> {
          * Test if this bulk cipher is available. For use by CipherSuite.
          *
          * Currently all supported ciphers except AES are always available
-         * via the JSSE internal implementations. We also assume AES/128
-         * is always available since it is shipped with the SunJCE provider.
-         * However, AES/256 is unavailable when the default JCE policy
-         * jurisdiction files are installed because of key length restrictions.
+         * via the JSSE internal implementations. We also assume AES/128 of
+         * CBC mode is always available since it is shipped with the SunJCE
+         * provider.  However, AES/256 is unavailable when the default JCE
+         * policy jurisdiction files are installed because of key length
+         * restrictions, and AEAD is unavailable when the underlying providers
+         * do not support AEAD/GCM mode.
          */
         boolean isAvailable() {
             if (allowed == false) {
                 return false;
             }
-            if (this == B_AES_256) {
+
+            if ((this == B_AES_256) ||
+                    (this.cipherType == CipherType.AEAD_CIPHER)) {
                 return isAvailable(this);
             }
 
@@ -513,19 +541,50 @@ final class CipherSuite implements Comparable<CipherSuite> {
         private static synchronized boolean isAvailable(BulkCipher cipher) {
             Boolean b = availableCache.get(cipher);
             if (b == null) {
-                try {
-                    SecretKey key = new SecretKeySpec
-                        (new byte[cipher.expandedKeySize], cipher.algorithm);
-                    IvParameterSpec iv =
-                        new IvParameterSpec(new byte[cipher.ivSize]);
-                    cipher.newCipher(ProtocolVersion.DEFAULT,
-                                            key, iv, secureRandom, true);
-                    b = Boolean.TRUE;
-                } catch (NoSuchAlgorithmException e) {
-                    b = Boolean.FALSE;
+                int keySizeInBits = cipher.keySize * 8;
+                if (keySizeInBits > 128) {    // need the JCE unlimited
+                                               // strength jurisdiction policy
+                    try {
+                        if (Cipher.getMaxAllowedKeyLength(
+                                cipher.transformation) < keySizeInBits) {
+                            b = Boolean.FALSE;
+                        }
+                    } catch (Exception e) {
+                        b = Boolean.FALSE;
+                    }
                 }
+
+                if (b == null) {
+                    b = Boolean.FALSE;          // may be reset to TRUE if
+                                                // the cipher is available
+                    CipherBox temporary = null;
+                    try {
+                        SecretKey key = new SecretKeySpec(
+                                            new byte[cipher.expandedKeySize],
+                                            cipher.algorithm);
+                        IvParameterSpec iv;
+                        if (cipher.cipherType == CipherType.AEAD_CIPHER) {
+                            iv = new IvParameterSpec(
+                                            new byte[cipher.fixedIvSize]);
+                        } else {
+                            iv = new IvParameterSpec(new byte[cipher.ivSize]);
+                        }
+                        temporary = cipher.newCipher(
+                                            ProtocolVersion.DEFAULT,
+                                            key, iv, secureRandom, true);
+                        b = temporary.isAvailable();
+                    } catch (NoSuchAlgorithmException e) {
+                        // not available
+                    } finally {
+                        if (temporary != null) {
+                            temporary.dispose();
+                        }
+                    }
+                }
+
                 availableCache.put(cipher, b);
             }
+
             return b.booleanValue();
         }
 
@@ -573,27 +632,31 @@ final class CipherSuite implements Comparable<CipherSuite> {
 
     // export strength ciphers
     final static BulkCipher B_NULL    =
-                        new BulkCipher("NULL",         0,  0, 0, true);
+        new BulkCipher("NULL",          STREAM_CIPHER,    0,  0,  0, 0, true);
     final static BulkCipher B_RC4_40  =
-                        new BulkCipher(CIPHER_RC4,     5, 16, 0, true);
+        new BulkCipher(CIPHER_RC4,      STREAM_CIPHER,    5, 16,  0, 0, true);
     final static BulkCipher B_RC2_40  =
-                        new BulkCipher("RC2",          5, 16, 8, false);
+        new BulkCipher("RC2",           BLOCK_CIPHER,     5, 16,  8, 0, false);
     final static BulkCipher B_DES_40  =
-                        new BulkCipher(CIPHER_DES,     5,  8, 8, true);
+        new BulkCipher(CIPHER_DES,      BLOCK_CIPHER,     5,  8,  8, 0, true);
 
     // domestic strength ciphers
     final static BulkCipher B_RC4_128 =
-                        new BulkCipher(CIPHER_RC4,     16,  0, true);
+        new BulkCipher(CIPHER_RC4,      STREAM_CIPHER,   16,  0,  0, true);
     final static BulkCipher B_DES     =
-                        new BulkCipher(CIPHER_DES,      8,  8, true);
+        new BulkCipher(CIPHER_DES,      BLOCK_CIPHER,     8,  8,  0, true);
     final static BulkCipher B_3DES    =
-                        new BulkCipher(CIPHER_3DES,    24,  8, true);
+        new BulkCipher(CIPHER_3DES,     BLOCK_CIPHER,    24,  8,  0, true);
     final static BulkCipher B_IDEA    =
-                        new BulkCipher("IDEA",         16,  8, false);
+        new BulkCipher("IDEA",          BLOCK_CIPHER,    16,  8,  0, false);
     final static BulkCipher B_AES_128 =
-                        new BulkCipher(CIPHER_AES,     16, 16, true);
+        new BulkCipher(CIPHER_AES,      BLOCK_CIPHER,    16, 16,  0, true);
     final static BulkCipher B_AES_256 =
-                        new BulkCipher(CIPHER_AES,     32, 16, true);
+        new BulkCipher(CIPHER_AES,      BLOCK_CIPHER,    32, 16,  0, true);
+    final static BulkCipher B_AES_128_GCM =
+        new BulkCipher(CIPHER_AES_GCM,  AEAD_CIPHER,     16, 12,  4, true);
+    final static BulkCipher B_AES_256_GCM =
+        new BulkCipher(CIPHER_AES_GCM,  AEAD_CIPHER,     32, 12,  4, true);
 
     // MACs
     final static MacAlg M_NULL = new MacAlg("NULL", 0);
@@ -893,11 +956,12 @@ final class CipherSuite implements Comparable<CipherSuite> {
          * Definition of the CipherSuites that are enabled by default.
          * They are listed in preference order, most preferred first, using
          * the following criteria:
-         * 1. Prefer the stronger buld cipher, in the order of AES_256,
-         *    AES_128, RC-4, 3DES-EDE.
-         * 2. Prefer the stronger MAC algorithm, in the order of SHA384,
+         * 1. Prefer Suite B compliant cipher suites, see RFC6460.
+         * 2. Prefer the stronger bulk cipher, in the order of AES_256(GCM),
+         *    AES_128(GCM), AES_256, AES_128, RC-4, 3DES-EDE.
+         * 3. Prefer the stronger MAC algorithm, in the order of SHA384,
          *    SHA256, SHA, MD5.
-         * 3. Prefer the better performance of key exchange and digital
+         * 4. Prefer the better performance of key exchange and digital
          *    signature algorithm, in the order of ECDHE-ECDSA, ECDHE-RSA,
          *    RSA, ECDH-ECDSA, ECDH-RSA, DHE-RSA, DHE-DSS.
          */
@@ -910,6 +974,16 @@ final class CipherSuite implements Comparable<CipherSuite> {
 
         //  ID           Key Exchange   Cipher     A  obs  suprt  PRF
         //  ======       ============   =========  =  ===  =====  ========
+
+
+        // Placeholder for cipher suites in GCM mode.
+        //
+        // For better compatibility and interoperability, we decrease the
+        // priority of cipher suites in GCM mode for a while as GCM
+        // technologies mature in the industry.  Eventually we'll move
+        // the GCM suites here.
+
+        // AES_256(CBC)
         add("TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384",
             0xc024, --p, K_ECDHE_ECDSA, B_AES_256, T, max, tls12, P_SHA384);
         add("TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384",
@@ -940,6 +1014,7 @@ final class CipherSuite implements Comparable<CipherSuite> {
         add("TLS_DHE_DSS_WITH_AES_256_CBC_SHA",
             0x0038, --p, K_DHE_DSS,     B_AES_256, T);
 
+        // AES_128(CBC)
         add("TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256",
             0xc023, --p, K_ECDHE_ECDSA, B_AES_128, T, max, tls12, P_SHA256);
         add("TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256",
@@ -970,6 +1045,7 @@ final class CipherSuite implements Comparable<CipherSuite> {
         add("TLS_DHE_DSS_WITH_AES_128_CBC_SHA",
             0x0032, --p, K_DHE_DSS,     B_AES_128, T);
 
+        // RC-4
         add("TLS_ECDHE_ECDSA_WITH_RC4_128_SHA",
             0xC007, --p, K_ECDHE_ECDSA, B_RC4_128, N);
         add("TLS_ECDHE_RSA_WITH_RC4_128_SHA",
@@ -981,6 +1057,51 @@ final class CipherSuite implements Comparable<CipherSuite> {
         add("TLS_ECDH_RSA_WITH_RC4_128_SHA",
             0xC00C, --p, K_ECDH_RSA,    B_RC4_128, N);
 
+        // Cipher suites in GCM mode, see RFC 5288/5289.
+        //
+        // We may increase the priority of cipher suites in GCM mode when
+        // GCM technologies become mature in the industry.
+
+        // Suite B compliant cipher suites, see RFC 6460.
+        //
+        // Note that, at present this provider is not Suite B compliant. The
+        // preference order of the GCM cipher suites does not follow the spec
+        // of RFC 6460.
+        add("TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384",
+            0xc02c, --p, K_ECDHE_ECDSA, B_AES_256_GCM, T, max, tls12, P_SHA384);
+        add("TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256",
+            0xc02b, --p, K_ECDHE_ECDSA, B_AES_128_GCM, T, max, tls12, P_SHA256);
+
+        // AES_256(GCM)
+        add("TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",
+            0xc030, --p, K_ECDHE_RSA,   B_AES_256_GCM, T, max, tls12, P_SHA384);
+        add("TLS_RSA_WITH_AES_256_GCM_SHA384",
+            0x009d, --p, K_RSA,         B_AES_256_GCM, T, max, tls12, P_SHA384);
+        add("TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384",
+            0xc02e, --p, K_ECDH_ECDSA,  B_AES_256_GCM, T, max, tls12, P_SHA384);
+        add("TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384",
+            0xc032, --p, K_ECDH_RSA,    B_AES_256_GCM, T, max, tls12, P_SHA384);
+        add("TLS_DHE_RSA_WITH_AES_256_GCM_SHA384",
+            0x009f, --p, K_DHE_RSA,     B_AES_256_GCM, T, max, tls12, P_SHA384);
+        add("TLS_DHE_DSS_WITH_AES_256_GCM_SHA384",
+            0x00a3, --p, K_DHE_DSS,     B_AES_256_GCM, T, max, tls12, P_SHA384);
+
+        // AES_128(GCM)
+        add("TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
+            0xc02f, --p, K_ECDHE_RSA,   B_AES_128_GCM, T, max, tls12, P_SHA256);
+        add("TLS_RSA_WITH_AES_128_GCM_SHA256",
+            0x009c, --p, K_RSA,         B_AES_128_GCM, T, max, tls12, P_SHA256);
+        add("TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256",
+            0xc02d, --p, K_ECDH_ECDSA,  B_AES_128_GCM, T, max, tls12, P_SHA256);
+        add("TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256",
+            0xc031, --p, K_ECDH_RSA,    B_AES_128_GCM, T, max, tls12, P_SHA256);
+        add("TLS_DHE_RSA_WITH_AES_128_GCM_SHA256",
+            0x009e, --p, K_DHE_RSA,     B_AES_128_GCM, T, max, tls12, P_SHA256);
+        add("TLS_DHE_DSS_WITH_AES_128_GCM_SHA256",
+            0x00a2, --p, K_DHE_DSS,     B_AES_128_GCM, T, max, tls12, P_SHA256);
+        // End of cipher suites in GCM mode.
+
+        // 3DES_EDE
         add("TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA",
             0xC008, --p, K_ECDHE_ECDSA, B_3DES,    T);
         add("TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA",
@@ -1024,17 +1145,22 @@ final class CipherSuite implements Comparable<CipherSuite> {
          */
         p = DEFAULT_SUITES_PRIORITY;
 
+        add("TLS_DH_anon_WITH_AES_256_GCM_SHA384",
+            0x00a7, --p, K_DH_ANON,     B_AES_256_GCM, N, max, tls12, P_SHA384);
+        add("TLS_DH_anon_WITH_AES_128_GCM_SHA256",
+            0x00a6, --p, K_DH_ANON,     B_AES_128_GCM, N, max, tls12, P_SHA256);
+
         add("TLS_DH_anon_WITH_AES_256_CBC_SHA256",
             0x006d, --p, K_DH_ANON,     B_AES_256, N, max, tls12, P_SHA256);
         add("TLS_ECDH_anon_WITH_AES_256_CBC_SHA",
-            0xC019, --p, K_ECDH_ANON,   B_AES_256, T);
+            0xC019, --p, K_ECDH_ANON,   B_AES_256, N);
         add("TLS_DH_anon_WITH_AES_256_CBC_SHA",
             0x003a, --p, K_DH_ANON,     B_AES_256, N);
 
         add("TLS_DH_anon_WITH_AES_128_CBC_SHA256",
             0x006c, --p, K_DH_ANON,     B_AES_128, N, max, tls12, P_SHA256);
         add("TLS_ECDH_anon_WITH_AES_128_CBC_SHA",
-            0xC018, --p, K_ECDH_ANON,   B_AES_128, T);
+            0xC018, --p, K_ECDH_ANON,   B_AES_128, N);
         add("TLS_DH_anon_WITH_AES_128_CBC_SHA",
             0x0034, --p, K_DH_ANON,     B_AES_128, N);
 
@@ -1044,7 +1170,7 @@ final class CipherSuite implements Comparable<CipherSuite> {
             0x0018, --p, K_DH_ANON,     B_RC4_128, N);
 
         add("TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA",
-            0xC017, --p, K_ECDH_ANON,   B_3DES,    T);
+            0xC017, --p, K_ECDH_ANON,   B_3DES,    N);
         add("SSL_DH_anon_WITH_3DES_EDE_CBC_SHA",
             0x001b, --p, K_DH_ANON,     B_3DES,    N);
 
@@ -1199,18 +1325,10 @@ final class CipherSuite implements Comparable<CipherSuite> {
         add("TLS_DH_RSA_WITH_AES_256_CBC_SHA256",          0x0069);
 
         // Unsupported cipher suites from RFC 5288
-        add("TLS_RSA_WITH_AES_128_GCM_SHA256",             0x009c);
-        add("TLS_RSA_WITH_AES_256_GCM_SHA384",             0x009d);
-        add("TLS_DHE_RSA_WITH_AES_128_GCM_SHA256",         0x009e);
-        add("TLS_DHE_RSA_WITH_AES_256_GCM_SHA384",         0x009f);
         add("TLS_DH_RSA_WITH_AES_128_GCM_SHA256",          0x00a0);
         add("TLS_DH_RSA_WITH_AES_256_GCM_SHA384",          0x00a1);
-        add("TLS_DHE_DSS_WITH_AES_128_GCM_SHA256",         0x00a2);
-        add("TLS_DHE_DSS_WITH_AES_256_GCM_SHA384",         0x00a3);
         add("TLS_DH_DSS_WITH_AES_128_GCM_SHA256",          0x00a4);
         add("TLS_DH_DSS_WITH_AES_256_GCM_SHA384",          0x00a5);
-        add("TLS_DH_anon_WITH_AES_128_GCM_SHA256",         0x00a6);
-        add("TLS_DH_anon_WITH_AES_256_GCM_SHA384",         0x00a7);
 
         // Unsupported cipher suites from RFC 5487
         add("TLS_PSK_WITH_AES_128_GCM_SHA256",             0x00a8);
@@ -1269,16 +1387,6 @@ final class CipherSuite implements Comparable<CipherSuite> {
         add("TLS_SRP_SHA_RSA_WITH_AES_256_CBC_SHA",        0xc021);
         add("TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA",        0xc022);
 
-        // Unsupported cipher suites from RFC 5289
-        add("TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256",     0xc02b);
-        add("TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384",     0xc02c);
-        add("TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256",      0xc02d);
-        add("TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384",      0xc02e);
-        add("TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",       0xc02f);
-        add("TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",       0xc030);
-        add("TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256",        0xc031);
-        add("TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384",        0xc032);
-
         // Unsupported cipher suites from RFC 5489
         add("TLS_ECDHE_PSK_WITH_RC4_128_SHA",              0xc033);
         add("TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA",         0xc034);
diff --git a/jdk/src/share/classes/sun/security/ssl/EngineInputRecord.java b/jdk/src/share/classes/sun/security/ssl/EngineInputRecord.java
index 6b064385203..0464d5b5de9 100644
--- a/jdk/src/share/classes/sun/security/ssl/EngineInputRecord.java
+++ b/jdk/src/share/classes/sun/security/ssl/EngineInputRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -177,71 +177,6 @@ final class EngineInputRecord extends InputRecord {
         return len;
     }
 
-    /*
-     * Verifies and removes the MAC value.  Returns true if
-     * the MAC checks out OK.
-     *
-     * On entry:
-     *     position = beginning of app/MAC data
-     *     limit = end of MAC data.
-     *
-     * On return:
-     *     position = beginning of app data
-     *     limit = end of app data
-     */
-    boolean checkMAC(MAC signer, ByteBuffer bb) {
-        if (internalData) {
-            return checkMAC(signer);
-        }
-
-        int len = signer.MAClen();
-        if (len == 0) { // no mac
-            return true;
-        }
-
-        /*
-         * Grab the original limit
-         */
-        int lim = bb.limit();
-
-        /*
-         * Delineate the area to apply a MAC on.
-         */
-        int macData = lim - len;
-        bb.limit(macData);
-
-        byte[] mac = signer.compute(contentType(), bb);
-
-        if (len != mac.length) {
-            throw new RuntimeException("Internal MAC error");
-        }
-
-        /*
-         * Delineate the MAC values, position was already set
-         * by doing the compute above.
-         *
-         * We could zero the MAC area, but not much useful information
-         * there anyway.
-         */
-        bb.position(macData);
-        bb.limit(lim);
-
-        try {
-            for (int i = 0; i < len; i++) {
-                if (bb.get() != mac[i]) {  // No BB.equals(byte []); !
-                    return false;
-                }
-            }
-            return true;
-        } finally {
-            /*
-             * Position to the data.
-             */
-            bb.rewind();
-            bb.limit(macData);
-        }
-    }
-
     /*
      * Pass the data down if it's internally cached, otherwise
      * do it here.
@@ -251,16 +186,85 @@ final class EngineInputRecord extends InputRecord {
      * If external data(app), return a new ByteBuffer with data to
      * process.
      */
-    ByteBuffer decrypt(CipherBox box, ByteBuffer bb)
-            throws BadPaddingException {
+    ByteBuffer decrypt(Authenticator authenticator,
+            CipherBox box, ByteBuffer bb) throws BadPaddingException {
 
         if (internalData) {
-            decrypt(box);
+            decrypt(authenticator, box);    // MAC is checked during decryption
             return tmpBB;
         }
 
-        box.decrypt(bb);
-        bb.rewind();
+        BadPaddingException bpe = null;
+        if (!box.isNullCipher()) {
+            try {
+                // apply explicit nonce for AEAD/CBC cipher suites if needed
+                int nonceSize =
+                    box.applyExplicitNonce(authenticator, contentType(), bb);
+
+                // decrypt the content
+                if (box.isAEADMode()) {
+                    // DON'T encrypt the nonce_explicit for AEAD mode
+                    bb.position(bb.position() + nonceSize);
+                }   // The explicit IV for CBC mode can be decrypted.
+
+                box.decrypt(bb);
+                bb.position(nonceSize); // We don't actually remove the nonce.
+            } catch (BadPaddingException e) {
+                // RFC 2246 states that decryption_failed should be used
+                // for this purpose. However, that allows certain attacks,
+                // so we just send bad record MAC. We also need to make
+                // sure to always check the MAC to avoid a timing attack
+                // for the same issue. See paper by Vaudenay et al and the
+                // update in RFC 4346/5246.
+                //
+                // Failover to message authentication code checking.
+                bpe = new BadPaddingException("invalid padding");
+            }
+        }
+
+        // Requires message authentication code for null, stream and block
+        // cipher suites.
+        if (authenticator instanceof MAC) {
+            MAC signer = (MAC)authenticator;
+            int macLen = signer.MAClen();
+            if (macLen != 0) {
+                if (bb.remaining() < macLen) {
+                    // negative data length, something is wrong
+                    throw new BadPaddingException("bad record");
+                }
+
+                int position = bb.position();
+                int limit = bb.limit();
+                int macOffset = limit - macLen;
+
+                bb.limit(macOffset);
+                byte[] hash = signer.compute(contentType(), bb);
+                if (hash == null || macLen != hash.length) {
+                    // something is wrong with MAC implementation
+                    throw new RuntimeException("Internal MAC error");
+                }
+
+                bb.position(macOffset);
+                bb.limit(limit);
+
+                try {
+                    for (byte b : hash) {       // No BB.equals(byte []); !
+                        if (bb.get() != b) {
+                            throw new BadPaddingException("bad record MAC");
+                        }
+                    }
+                } finally {
+                    // reset to the data
+                    bb.position(position);
+                    bb.limit(macOffset);
+                }
+            }
+        }
+
+        // Is it a failover?
+        if (bpe != null) {
+            throw bpe;
+        }
 
         return bb.slice();
     }
@@ -338,8 +342,8 @@ final class EngineInputRecord extends InputRecord {
         if (debug != null && Debug.isOn("packet")) {
             try {
                 HexDumpEncoder hd = new HexDumpEncoder();
-                srcBB.limit(srcPos + len);
                 ByteBuffer bb = srcBB.duplicate();  // Use copy of BB
+                bb.limit(srcPos + len);
 
                 System.out.println("[Raw read (bb)]: length = " + len);
                 hd.encodeBuffer(bb, System.out);
diff --git a/jdk/src/share/classes/sun/security/ssl/EngineOutputRecord.java b/jdk/src/share/classes/sun/security/ssl/EngineOutputRecord.java
index e9d39805b36..a46a88bf708 100644
--- a/jdk/src/share/classes/sun/security/ssl/EngineOutputRecord.java
+++ b/jdk/src/share/classes/sun/security/ssl/EngineOutputRecord.java
@@ -29,7 +29,6 @@ package sun.security.ssl;
 import java.io.*;
 import java.nio.*;
 
-
 /**
  * A OutputRecord class extension which uses external ByteBuffers
  * or the internal ByteArrayOutputStream for data manipulations.
@@ -101,51 +100,6 @@ final class EngineOutputRecord extends OutputRecord {
         return finishedMsg;
     }
 
-
-    /**
-     * Calculate the MAC value, storing the result either in
-     * the internal buffer, or at the end of the destination
-     * ByteBuffer.
-     * <P>
-     * We assume that the higher levels have assured us enough
-     * room, otherwise we'll indirectly throw a
-     * BufferOverFlowException runtime exception.
-     *
-     * position should equal limit, and points to the next
-     * free spot.
-     */
-    private void addMAC(MAC signer, ByteBuffer bb)
-            throws IOException {
-
-        if (signer.MAClen() != 0) {
-            byte[] hash = signer.compute(contentType(), bb);
-
-            /*
-             * position was advanced to limit in compute above.
-             *
-             * Mark next area as writable (above layers should have
-             * established that we have plenty of room), then write
-             * out the hash.
-             */
-            bb.limit(bb.limit() + hash.length);
-            bb.put(hash);
-        }
-    }
-
-    /*
-     * Encrypt a ByteBuffer.
-     *
-     * We assume that the higher levels have assured us enough
-     * room for the encryption (plus padding), otherwise we'll
-     * indirectly throw a BufferOverFlowException runtime exception.
-     *
-     * position and limit will be the same, and points to the
-     * next free spot.
-     */
-    void encrypt(CipherBox box, ByteBuffer bb) {
-        box.encrypt(bb);
-    }
-
     /*
      * Override the actual write below.  We do things this way to be
      * consistent with InputRecord.  InputRecord may try to write out
@@ -160,7 +114,8 @@ final class EngineOutputRecord extends OutputRecord {
          * Copy data out of buffer, it's ready to go.
          */
         ByteBuffer netBB = (ByteBuffer)
-            ByteBuffer.allocate(len).put(buf, 0, len).flip();
+            ByteBuffer.allocate(len).put(buf, off, len).flip();
+
         writer.putOutboundData(netBB);
     }
 
@@ -168,17 +123,19 @@ final class EngineOutputRecord extends OutputRecord {
      * Main method for writing non-application data.
      * We MAC/encrypt, then send down for processing.
      */
-    void write(MAC writeMAC, CipherBox writeCipher) throws IOException {
+    void write(Authenticator authenticator, CipherBox writeCipher)
+            throws IOException {
+
         /*
          * Sanity check.
          */
         switch (contentType()) {
-        case ct_change_cipher_spec:
-        case ct_alert:
-        case ct_handshake:
-            break;
-        default:
-            throw new RuntimeException("unexpected byte buffers");
+            case ct_change_cipher_spec:
+            case ct_alert:
+            case ct_handshake:
+                break;
+            default:
+                throw new RuntimeException("unexpected byte buffers");
         }
 
         /*
@@ -193,10 +150,10 @@ final class EngineOutputRecord extends OutputRecord {
          */
         if (!isEmpty()) {
             // compress();              // eventually
-            addMAC(writeMAC);
-            encrypt(writeCipher);
-            write((OutputStream)null, false,  // send down for processing
-                (ByteArrayOutputStream)null);
+            encrypt(authenticator, writeCipher);
+
+            // send down for processing
+            write((OutputStream)null, false, (ByteArrayOutputStream)null);
         }
         return;
     }
@@ -204,8 +161,8 @@ final class EngineOutputRecord extends OutputRecord {
     /**
      * Main wrap/write driver.
      */
-    void write(EngineArgs ea, MAC writeMAC, CipherBox writeCipher)
-            throws IOException {
+    void write(EngineArgs ea, Authenticator authenticator,
+            CipherBox writeCipher) throws IOException {
         /*
          * sanity check to make sure someone didn't inadvertantly
          * send us an impossible combination we don't know how
@@ -217,7 +174,7 @@ final class EngineOutputRecord extends OutputRecord {
          * Have we set the MAC's yet?  If not, we're not ready
          * to process application data yet.
          */
-        if (writeMAC == MAC.NULL) {
+        if (authenticator == MAC.NULL) {
             return;
         }
 
@@ -255,7 +212,7 @@ final class EngineOutputRecord extends OutputRecord {
          */
         int length;
         if (engine.needToSplitPayload(writeCipher, protocolVersion)) {
-            write(ea, writeMAC, writeCipher, 0x01);
+            write(ea, authenticator, writeCipher, 0x01);
             ea.resetLim();      // reset application data buffer limit
             length = Math.min(ea.getAppRemaining(),
                         maxDataSizeMinusOneByteRecord);
@@ -265,14 +222,14 @@ final class EngineOutputRecord extends OutputRecord {
 
         // Don't bother to really write empty records.
         if (length > 0) {
-            write(ea, writeMAC, writeCipher, length);
+            write(ea, authenticator, writeCipher, length);
         }
 
         return;
     }
 
-    void write(EngineArgs ea, MAC writeMAC, CipherBox writeCipher,
-            int length) throws IOException {
+    void write(EngineArgs ea, Authenticator authenticator,
+            CipherBox writeCipher, int length) throws IOException {
         /*
          * Copy out existing buffer values.
          */
@@ -286,39 +243,76 @@ final class EngineOutputRecord extends OutputRecord {
          * Don't need to worry about SSLv2 rewrites, if we're here,
          * that's long since done.
          */
-        int dstData = dstPos + headerSize;
+        int dstData = dstPos + headerSize + writeCipher.getExplicitNonceSize();
         dstBB.position(dstData);
 
+        /*
+         * transfer application data into the network data buffer
+         */
         ea.gather(length);
+        dstBB.limit(dstBB.position());
+        dstBB.position(dstData);
 
         /*
          * "flip" but skip over header again, add MAC & encrypt
-         * addMAC will expand the limit to reflect the new
-         * data.
          */
-        dstBB.limit(dstBB.position());
-        dstBB.position(dstData);
-        addMAC(writeMAC, dstBB);
+        if (authenticator instanceof MAC) {
+            MAC signer = (MAC)authenticator;
+            if (signer.MAClen() != 0) {
+                byte[] hash = signer.compute(contentType(), dstBB);
 
-        /*
-         * Encrypt may pad, so again the limit may have changed.
-         */
-        dstBB.limit(dstBB.position());
-        dstBB.position(dstData);
-        encrypt(writeCipher, dstBB);
+                /*
+                 * position was advanced to limit in compute above.
+                 *
+                 * Mark next area as writable (above layers should have
+                 * established that we have plenty of room), then write
+                 * out the hash.
+                 */
+                dstBB.limit(dstBB.limit() + hash.length);
+                dstBB.put(hash);
 
-        if (debug != null
-                && (Debug.isOn("record") || Debug.isOn("handshake"))) {
-            if ((debug != null && Debug.isOn("record"))
-                    || contentType() == ct_change_cipher_spec)
+                // reset the position and limit
+                dstBB.limit(dstBB.position());
+                dstBB.position(dstData);
+            }
+        }
+
+        if (!writeCipher.isNullCipher()) {
+            /*
+             * Requires explicit IV/nonce for CBC/AEAD cipher suites for TLS 1.1
+             * or later.
+             */
+            if (protocolVersion.v >= ProtocolVersion.TLS11.v &&
+                    (writeCipher.isCBCMode() || writeCipher.isAEADMode())) {
+                byte[] nonce = writeCipher.createExplicitNonce(
+                        authenticator, contentType(), dstBB.remaining());
+                dstBB.position(dstPos + headerSize);
+                dstBB.put(nonce);
+                if (!writeCipher.isAEADMode()) {
+                    // The explicit IV in TLS 1.1 and later can be encrypted.
+                    dstBB.position(dstPos + headerSize);
+                }   // Otherwise, DON'T encrypt the nonce_explicit for AEAD mode
+            }
+
+            /*
+             * Encrypt may pad, so again the limit may have changed.
+             */
+            writeCipher.encrypt(dstBB, dstLim);
+
+            if ((debug != null) && (Debug.isOn("record") ||
+                    (Debug.isOn("handshake") &&
+                        (contentType() == ct_change_cipher_spec)))) {
                 System.out.println(Thread.currentThread().getName()
                     // v3.0/v3.1 ...
                     + ", WRITE: " + protocolVersion
                     + " " + InputRecord.contentName(contentType())
                     + ", length = " + length);
+            }
+        } else {
+            dstBB.position(dstBB.limit());
         }
 
-        int packetLength = dstBB.limit() - dstData;
+        int packetLength = dstBB.limit() - dstPos - headerSize;
 
         /*
          * Finish out the record header.
@@ -333,7 +327,5 @@ final class EngineOutputRecord extends OutputRecord {
          * Position was already set by encrypt() above.
          */
         dstBB.limit(dstLim);
-
-        return;
     }
 }
diff --git a/jdk/src/share/classes/sun/security/ssl/EngineWriter.java b/jdk/src/share/classes/sun/security/ssl/EngineWriter.java
index e08dbb06069..c6a26562606 100644
--- a/jdk/src/share/classes/sun/security/ssl/EngineWriter.java
+++ b/jdk/src/share/classes/sun/security/ssl/EngineWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -99,7 +99,8 @@ final class EngineWriter {
      * other writeRecord.
      */
     synchronized void writeRecord(EngineOutputRecord outputRecord,
-            MAC writeMAC, CipherBox writeCipher) throws IOException {
+            Authenticator authenticator,
+            CipherBox writeCipher) throws IOException {
 
         /*
          * Only output if we're still open.
@@ -108,7 +109,7 @@ final class EngineWriter {
             throw new IOException("writer side was already closed.");
         }
 
-        outputRecord.write(writeMAC, writeCipher);
+        outputRecord.write(authenticator, writeCipher);
 
         /*
          * Did our handshakers notify that we just sent the
@@ -151,7 +152,8 @@ final class EngineWriter {
      * Return any determined status.
      */
     synchronized HandshakeStatus writeRecord(
-            EngineOutputRecord outputRecord, EngineArgs ea, MAC writeMAC,
+            EngineOutputRecord outputRecord, EngineArgs ea,
+            Authenticator authenticator,
             CipherBox writeCipher) throws IOException {
 
         /*
@@ -181,7 +183,7 @@ final class EngineWriter {
             throw new IOException("The write side was already closed");
         }
 
-        outputRecord.write(ea, writeMAC, writeCipher);
+        outputRecord.write(ea, authenticator, writeCipher);
 
         if (debug != null && Debug.isOn("packet")) {
             dumpPacket(ea, false);
diff --git a/jdk/src/share/classes/sun/security/ssl/Handshaker.java b/jdk/src/share/classes/sun/security/ssl/Handshaker.java
index 828b60bcab6..d03b8f7e5ac 100644
--- a/jdk/src/share/classes/sun/security/ssl/Handshaker.java
+++ b/jdk/src/share/classes/sun/security/ssl/Handshaker.java
@@ -49,6 +49,7 @@ import sun.security.ssl.HandshakeMessage.*;
 import sun.security.ssl.CipherSuite.*;
 
 import static sun.security.ssl.CipherSuite.PRF.*;
+import static sun.security.ssl.CipherSuite.CipherType.*;
 
 /**
  * Handshaker ... processes handshake records from an SSL V3.0
@@ -714,33 +715,47 @@ abstract class Handshaker {
     /**
      * Create a new read MAC and return it to caller.
      */
-    MAC newReadMAC() throws NoSuchAlgorithmException, InvalidKeyException {
-        MacAlg macAlg = cipherSuite.macAlg;
-        MAC mac;
-        if (isClient) {
-            mac = macAlg.newMac(protocolVersion, svrMacSecret);
-            svrMacSecret = null;
+    Authenticator newReadAuthenticator()
+            throws NoSuchAlgorithmException, InvalidKeyException {
+
+        Authenticator authenticator = null;
+        if (cipherSuite.cipher.cipherType == AEAD_CIPHER) {
+            authenticator = new Authenticator(protocolVersion);
         } else {
-            mac = macAlg.newMac(protocolVersion, clntMacSecret);
-            clntMacSecret = null;
+            MacAlg macAlg = cipherSuite.macAlg;
+            if (isClient) {
+                authenticator = macAlg.newMac(protocolVersion, svrMacSecret);
+                svrMacSecret = null;
+            } else {
+                authenticator = macAlg.newMac(protocolVersion, clntMacSecret);
+                clntMacSecret = null;
+            }
         }
-        return mac;
+
+        return authenticator;
     }
 
     /**
      * Create a new write MAC and return it to caller.
      */
-    MAC newWriteMAC() throws NoSuchAlgorithmException, InvalidKeyException {
-        MacAlg macAlg = cipherSuite.macAlg;
-        MAC mac;
-        if (isClient) {
-            mac = macAlg.newMac(protocolVersion, clntMacSecret);
-            clntMacSecret = null;
+    Authenticator newWriteAuthenticator()
+            throws NoSuchAlgorithmException, InvalidKeyException {
+
+        Authenticator authenticator = null;
+        if (cipherSuite.cipher.cipherType == AEAD_CIPHER) {
+            authenticator = new Authenticator(protocolVersion);
         } else {
-            mac = macAlg.newMac(protocolVersion, svrMacSecret);
-            svrMacSecret = null;
+            MacAlg macAlg = cipherSuite.macAlg;
+            if (isClient) {
+                authenticator = macAlg.newMac(protocolVersion, clntMacSecret);
+                clntMacSecret = null;
+            } else {
+                authenticator = macAlg.newMac(protocolVersion, svrMacSecret);
+                svrMacSecret = null;
+            }
         }
-        return mac;
+
+        return authenticator;
     }
 
     /*
@@ -1189,11 +1204,23 @@ abstract class Handshaker {
         int prfHashLength = prf.getPRFHashLength();
         int prfBlockSize = prf.getPRFBlockSize();
 
+        // TLS v1.1 or later uses an explicit IV in CBC cipher suites to
+        // protect against the CBC attacks.  AEAD/GCM cipher suites in TLS
+        // v1.2 or later use a fixed IV as the implicit part of the partially
+        // implicit nonce technique described in RFC 5116.
+        int ivSize = cipher.ivSize;
+        if (cipher.cipherType == AEAD_CIPHER) {
+            ivSize = cipher.fixedIvSize;
+        } else if (protocolVersion.v >= ProtocolVersion.TLS11.v &&
+                cipher.cipherType == BLOCK_CIPHER) {
+            ivSize = 0;
+        }
+
         TlsKeyMaterialParameterSpec spec = new TlsKeyMaterialParameterSpec(
             masterKey, protocolVersion.major, protocolVersion.minor,
             clnt_random.random_bytes, svr_random.random_bytes,
             cipher.algorithm, cipher.keySize, expandedKeySize,
-            cipher.ivSize, hashSize,
+            ivSize, hashSize,
             prfHashAlg, prfHashLength, prfBlockSize);
 
         try {
@@ -1201,14 +1228,15 @@ abstract class Handshaker {
             kg.init(spec);
             TlsKeyMaterialSpec keySpec = (TlsKeyMaterialSpec)kg.generateKey();
 
+            // Return null if cipher keys are not supposed to be generated.
             clntWriteKey = keySpec.getClientCipherKey();
             svrWriteKey = keySpec.getServerCipherKey();
 
             // Return null if IVs are not supposed to be generated.
-            // e.g. TLS 1.1+.
             clntWriteIV = keySpec.getClientIv();
             svrWriteIV = keySpec.getServerIv();
 
+            // Return null if MAC keys are not supposed to be generated.
             clntMacSecret = keySpec.getClientMacKey();
             svrMacSecret = keySpec.getServerMacKey();
         } catch (GeneralSecurityException e) {
@@ -1233,10 +1261,14 @@ abstract class Handshaker {
                 printHex(dump, masterKey.getEncoded());
 
                 // Outputs:
-                System.out.println("Client MAC write Secret:");
-                printHex(dump, clntMacSecret.getEncoded());
-                System.out.println("Server MAC write Secret:");
-                printHex(dump, svrMacSecret.getEncoded());
+                if (clntMacSecret != null) {
+                    System.out.println("Client MAC write Secret:");
+                    printHex(dump, clntMacSecret.getEncoded());
+                    System.out.println("Server MAC write Secret:");
+                    printHex(dump, svrMacSecret.getEncoded());
+                } else {
+                    System.out.println("... no MAC keys used for this cipher");
+                }
 
                 if (clntWriteKey != null) {
                     System.out.println("Client write key:");
diff --git a/jdk/src/share/classes/sun/security/ssl/InputRecord.java b/jdk/src/share/classes/sun/security/ssl/InputRecord.java
index 78e866a07ca..74d88f9b81b 100644
--- a/jdk/src/share/classes/sun/security/ssl/InputRecord.java
+++ b/jdk/src/share/classes/sun/security/ssl/InputRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -77,6 +77,17 @@ class InputRecord extends ByteArrayInputStream implements Record {
     /*
      * Construct the record to hold the maximum sized input record.
      * Data will be filled in separately.
+     *
+     * The structure of the byte buffer looks like:
+     *
+     *     |--------+---------+---------------------------------|
+     *     | header |   IV    | content, MAC/TAG, padding, etc. |
+     *     | headerPlusIVSize |
+     *
+     * header: the header of an SSL records
+     * IV:     the optional IV/nonce field, it is only required for block
+     *         (TLS 1.1 or later) and AEAD cipher suites.
+     *
      */
     InputRecord() {
         super(new byte[maxRecordSize]);
@@ -133,43 +144,82 @@ class InputRecord extends ByteArrayInputStream implements Record {
         return handshakeHash;
     }
 
-    /*
-     * Verify and remove the MAC ... used for all records.
-     */
-    boolean checkMAC(MAC signer) {
-        int len = signer.MAClen();
-        if (len == 0) { // no mac
-            return true;
-        }
+    void decrypt(Authenticator authenticator,
+            CipherBox box) throws BadPaddingException {
 
-        int offset = count - len;
+        BadPaddingException bpe = null;
+        if (!box.isNullCipher()) {
+            try {
+                int cipheredLength = count - headerSize;
 
-        if (offset < headerSize) {
-            // data length would be negative, something is wrong
-            return false;
-        }
+                // apply explicit nonce for AEAD/CBC cipher suites if needed
+                int nonceSize = box.applyExplicitNonce(authenticator,
+                            contentType(), buf, headerSize, cipheredLength);
+                pos = headerSize + nonceSize;
+                lastHashed = pos;   // don't digest the explicit nonce
 
-        byte[] mac = signer.compute(contentType(), buf,
-            headerSize, offset - headerSize);
+                // decrypt the content
+                int offset = headerSize;
+                if (box.isAEADMode()) {
+                    // DON'T encrypt the nonce_explicit for AEAD mode
+                    offset += nonceSize;
+                }   // The explicit IV for CBC mode can be decrypted.
 
-        if (len != mac.length) {
-            throw new RuntimeException("Internal MAC error");
-        }
+                count = offset + box.decrypt(buf, offset, count - offset);
 
-        for (int i = 0; i < len; i++) {
-            if (buf[offset + i] != mac[i]) {
-                return false;
+                // Note that we don't remove the nonce from the buffer.
+            } catch (BadPaddingException e) {
+                // RFC 2246 states that decryption_failed should be used
+                // for this purpose. However, that allows certain attacks,
+                // so we just send bad record MAC. We also need to make
+                // sure to always check the MAC to avoid a timing attack
+                // for the same issue. See paper by Vaudenay et al and the
+                // update in RFC 4346/5246.
+                //
+                // Failover to message authenticatoin code checking.
+                bpe = new BadPaddingException("invalid padding");
             }
         }
-        count -= len;
-        return true;
-    }
 
-    void decrypt(CipherBox box) throws BadPaddingException {
-        int len = count - headerSize;
-        count = headerSize + box.decrypt(buf, headerSize, len);
-    }
+        // Requires message authentication code for null, stream and block
+        // cipher suites.
+        if (authenticator instanceof MAC) {
+            MAC signer = (MAC)authenticator;
+            int macLen = signer.MAClen();
+            if (macLen != 0) {
+                int macOffset = count - macLen;
+                int contentLen = macOffset - pos;
+                if (contentLen < 0) {
+                    // negative data length, something is wrong
+                    throw new BadPaddingException("bad record");
+                }
 
+                count -= macLen;  // Set the count before any MAC checking
+                                  // exception occurs, so that the following
+                                  // process can read the actual decrypted
+                                  // content (minus the MAC) in the fragment
+                                  // if necessary.
+                byte[] hash = signer.compute(contentType(),
+                                            buf, pos, contentLen);
+                if (hash == null || macLen != hash.length) {
+                    // something is wrong with MAC implementation
+                    throw new RuntimeException("Internal MAC error");
+                }
+
+                int offset = macOffset;
+                for (byte b : hash) {
+                    if (buf[offset++] != b) {
+                        throw new BadPaddingException("bad record MAC");
+                    }
+                }
+            }
+        }
+
+        // Is it a failover?
+        if (bpe != null) {
+            throw bpe;
+        }
+    }
 
     /*
      * Well ... hello_request messages are _never_ hashed since we can't
diff --git a/jdk/src/share/classes/sun/security/ssl/JsseJce.java b/jdk/src/share/classes/sun/security/ssl/JsseJce.java
index e22caece0e2..49e89c6028e 100644
--- a/jdk/src/share/classes/sun/security/ssl/JsseJce.java
+++ b/jdk/src/share/classes/sun/security/ssl/JsseJce.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -154,6 +154,11 @@ final class JsseJce {
      * without padding.
      */
     final static String CIPHER_AES = "AES/CBC/NoPadding";
+    /**
+     * JCE transformation string for AES in GCM mode
+     * without padding.
+     */
+    final static String CIPHER_AES_GCM = "AES/GCM/NoPadding";
     /**
      * JCA identifier string for DSA, i.e. a DSA with SHA-1.
      */
diff --git a/jdk/src/share/classes/sun/security/ssl/MAC.java b/jdk/src/share/classes/sun/security/ssl/MAC.java
index 753a8c57ac4..30bf2e2e50f 100644
--- a/jdk/src/share/classes/sun/security/ssl/MAC.java
+++ b/jdk/src/share/classes/sun/security/ssl/MAC.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,19 +39,15 @@ import static sun.security.ssl.CipherSuite.*;
 
 /**
  * This class computes the "Message Authentication Code" (MAC) for each
- * SSL message.  This is essentially a shared-secret signature, used to
- * provide integrity protection for SSL messages.  The MAC is actually
- * one of several keyed hashes, as associated with the cipher suite and
- * protocol version.  (SSL v3.0 uses one construct, TLS uses another.)
- *
- * <P>NOTE: MAC computation is the only place in the SSL protocol that the
- * sequence number is used.  It's also reset to zero with each change of
- * a cipher spec, so this is the only place this state is needed.
+ * SSL stream and block cipher message.  This is essentially a shared-secret
+ * signature, used to provide integrity protection for SSL messages.  The
+ * MAC is actually one of several keyed hashes, as associated with the cipher
+ * suite and protocol version. (SSL v3.0 uses one construct, TLS uses another.)
  *
  * @author David Brownell
  * @author Andreas Sterbenz
  */
-final class MAC {
+final class MAC extends Authenticator {
 
     final static MAC NULL = new MAC();
 
@@ -64,26 +60,9 @@ final class MAC {
     // JCE Mac object
     private final Mac mac;
 
-    // byte array containing the additional information we MAC in each record
-    // (see below)
-    private final byte[] block;
-
-    // sequence number + record type + + record length
-    private static final int BLOCK_SIZE_SSL = 8 + 1 + 2;
-
-    // sequence number + record type + protocol version + record length
-    private static final int BLOCK_SIZE_TLS = 8 + 1 + 2 + 2;
-
-    // offset of record type in block
-    private static final int BLOCK_OFFSET_TYPE    = 8;
-
-    // offset of protocol version number in block (TLS only)
-    private static final int BLOCK_OFFSET_VERSION = 8 + 1;
-
     private MAC() {
         macSize = 0;
         mac = null;
-        block = null;
     }
 
     /**
@@ -91,6 +70,8 @@ final class MAC {
      */
     MAC(MacAlg macAlg, ProtocolVersion protocolVersion, SecretKey key)
             throws NoSuchAlgorithmException, InvalidKeyException {
+        super(protocolVersion);
+
         this.macSize = macAlg.size;
 
         String algorithm;
@@ -110,14 +91,6 @@ final class MAC {
 
         mac = JsseJce.getMac(algorithm);
         mac.init(key);
-
-        if (tls) {
-            block = new byte[BLOCK_SIZE_TLS];
-            block[BLOCK_OFFSET_VERSION]   = protocolVersion.major;
-            block[BLOCK_OFFSET_VERSION+1] = protocolVersion.minor;
-        } else {
-            block = new byte[BLOCK_SIZE_SSL];
-        }
     }
 
     /**
@@ -136,7 +109,15 @@ final class MAC {
      * @param len the size of the compressed record
      */
     final byte[] compute(byte type, byte buf[], int offset, int len) {
-        return compute(type, null, buf, offset, len);
+        if (macSize == 0) {
+            return nullMAC;
+        }
+
+        byte[] additional = acquireAuthenticationBytes(type, len);
+        mac.update(additional);
+        mac.update(buf, offset, len);
+
+        return mac.doFinal();
     }
 
     /**
@@ -151,78 +132,13 @@ final class MAC {
      *          demarcate the data to be MAC'd.
      */
     final byte[] compute(byte type, ByteBuffer bb) {
-        return compute(type, bb, null, 0, bb.remaining());
-    }
-
-    /**
-     * Check whether the sequence number is close to wrap
-     *
-     * Sequence numbers are of type uint64 and may not exceed 2^64-1.
-     * Sequence numbers do not wrap. When the sequence number is near
-     * to wrap, we need to close the connection immediately.
-     */
-    final boolean seqNumOverflow() {
-        /*
-         * Conservatively, we don't allow more records to be generated
-         * when there are only 2^8 sequence numbers left.
-         */
-        return (block != null && mac != null &&
-                block[0] == (byte)0xFF && block[1] == (byte)0xFF &&
-                block[2] == (byte)0xFF && block[3] == (byte)0xFF &&
-                block[4] == (byte)0xFF && block[5] == (byte)0xFF &&
-                block[6] == (byte)0xFF);
-    }
-
-    /*
-     * Check whether to renew the sequence number
-     *
-     * Sequence numbers are of type uint64 and may not exceed 2^64-1.
-     * Sequence numbers do not wrap.  If a TLS
-     * implementation would need to wrap a sequence number, it must
-     * renegotiate instead.
-     */
-    final boolean seqNumIsHuge() {
-        /*
-         * Conservatively, we should ask for renegotiation when there are
-         * only 2^48 sequence numbers left.
-         */
-        return (block != null && mac != null &&
-                block[0] == (byte)0xFF && block[1] == (byte)0xFF);
-    }
-
-    // increment the sequence number in the block array
-    // it is a 64-bit number stored in big-endian format
-    private void incrementSequenceNumber() {
-        int k = 7;
-        while ((k >= 0) && (++block[k] == 0)) {
-            k--;
-        }
-    }
-
-    /*
-     * Compute based on either buffer type, either bb.position/limit
-     * or buf/offset/len.
-     */
-    private byte[] compute(byte type, ByteBuffer bb, byte[] buf,
-            int offset, int len) {
-
         if (macSize == 0) {
             return nullMAC;
         }
 
-        block[BLOCK_OFFSET_TYPE] = type;
-        block[block.length - 2]  = (byte)(len >> 8);
-        block[block.length - 1]  = (byte)(len     );
-
-        mac.update(block);
-        incrementSequenceNumber();
-
-        // content
-        if (bb != null) {
-            mac.update(bb);
-        } else {
-            mac.update(buf, offset, len);
-        }
+        byte[] additional = acquireAuthenticationBytes(type, bb.remaining());
+        mac.update(additional);
+        mac.update(bb);
 
         return mac.doFinal();
     }
diff --git a/jdk/src/share/classes/sun/security/ssl/OutputRecord.java b/jdk/src/share/classes/sun/security/ssl/OutputRecord.java
index 900003dfd0f..d07c779f75e 100644
--- a/jdk/src/share/classes/sun/security/ssl/OutputRecord.java
+++ b/jdk/src/share/classes/sun/security/ssl/OutputRecord.java
@@ -54,6 +54,7 @@ class OutputRecord extends ByteArrayOutputStream implements Record {
     private int                 lastHashed;
     private boolean             firstMessage;
     final private byte          contentType;
+    private int                 headerOffset;
 
     // current protocol version, sent as record version
     ProtocolVersion     protocolVersion;
@@ -70,6 +71,23 @@ class OutputRecord extends ByteArrayOutputStream implements Record {
      * Default constructor makes a record supporting the maximum
      * SSL record size.  It allocates the header bytes directly.
      *
+     * The structure of the byte buffer looks like:
+     *
+     *     |---------+--------+-------+---------------------------------|
+     *     | unused  | header |  IV   | content, MAC/TAG, padding, etc. |
+     *     |    headerPlusMaxIVSize   |
+     *
+     * unused: unused part of the buffer of size
+     *
+     *             headerPlusMaxIVSize - header size - IV size
+     *
+     *         When this object is created, we don't know the protocol
+     *         version number, IV length, etc., so reserve space in front
+     *         to avoid extra data movement (copies).
+     * header: the header of an SSL record
+     * IV:     the optional IV/nonce field, it is only required for block
+     *         (TLS 1.1 or later) and AEAD cipher suites.
+     *
      * @param type the content type for the record
      */
     OutputRecord(byte type, int size) {
@@ -77,9 +95,10 @@ class OutputRecord extends ByteArrayOutputStream implements Record {
         this.protocolVersion = ProtocolVersion.DEFAULT;
         this.helloVersion = ProtocolVersion.DEFAULT_HELLO;
         firstMessage = true;
-        count = headerSize;
+        count = headerPlusMaxIVSize;
         contentType = type;
         lastHashed = count;
+        headerOffset = headerPlusMaxIVSize - headerSize;
     }
 
     OutputRecord(byte type) {
@@ -119,8 +138,9 @@ class OutputRecord extends ByteArrayOutputStream implements Record {
     @Override
     public synchronized void reset() {
         super.reset();
-        count = headerSize;
+        count = headerPlusMaxIVSize;
         lastHashed = count;
+        headerOffset = headerPlusMaxIVSize - headerSize;
     }
 
     /*
@@ -173,58 +193,84 @@ class OutputRecord extends ByteArrayOutputStream implements Record {
      * of sending empty records over the network.
      */
     boolean isEmpty() {
-        return count == headerSize;
+        return count == headerPlusMaxIVSize;
     }
 
     /*
-     * Return true if the record is of a given alert.
+     * Return true if the record is of an alert of the given description.
+     *
+     * Per SSL/TLS specifications, alert messages convey the severity of the
+     * message (warning or fatal) and a description of the alert. An alert
+     * is defined with a two bytes struct, {byte level, byte description},
+     * following after the header bytes.
      */
     boolean isAlert(byte description) {
-        // An alert is defined with a two bytes struct,
-        // {byte level, byte description}, following after the header bytes.
-        if (count > (headerSize + 1) && contentType == ct_alert) {
-            return buf[headerSize + 1] == description;
+        if ((count > (headerPlusMaxIVSize + 1)) && (contentType == ct_alert)) {
+            return buf[headerPlusMaxIVSize + 1] == description;
         }
 
         return false;
     }
 
     /*
-     * Compute the MAC and append it to this record.  In case we
-     * are automatically flushing a handshake stream, make sure we
-     * have hashed the message first.
+     * Encrypt ... length may grow due to block cipher padding, or
+     * message authentication code or tag.
      */
-    void addMAC(MAC signer) throws IOException {
+    void encrypt(Authenticator authenticator, CipherBox box)
+            throws IOException {
+
+        // In case we are automatically flushing a handshake stream, make
+        // sure we have hashed the message first.
         //
         // when we support compression, hashing can't go here
         // since it'll need to be done on the uncompressed data,
         // and the MAC applies to the compressed data.
-        //
         if (contentType == ct_handshake) {
             doHashes();
         }
-        if (signer.MAClen() != 0) {
-            byte[] hash = signer.compute(contentType, buf,
-                    headerSize, count - headerSize);
-            write(hash);
+
+        // Requires message authentication code for stream and block
+        // cipher suites.
+        if (authenticator instanceof MAC) {
+            MAC signer = (MAC)authenticator;
+            if (signer.MAClen() != 0) {
+                byte[] hash = signer.compute(contentType, buf,
+                    headerPlusMaxIVSize, count - headerPlusMaxIVSize);
+                write(hash);
+            }
+        }
+
+        if (!box.isNullCipher()) {
+            // Requires explicit IV/nonce for CBC/AEAD cipher suites for
+            // TLS 1.1 or later.
+            if ((protocolVersion.v >= ProtocolVersion.TLS11.v) &&
+                                    (box.isCBCMode() || box.isAEADMode())) {
+                byte[] nonce = box.createExplicitNonce(authenticator,
+                                    contentType, count - headerPlusMaxIVSize);
+                int offset = headerPlusMaxIVSize - nonce.length;
+                System.arraycopy(nonce, 0, buf, offset, nonce.length);
+                headerOffset = offset - headerSize;
+            } else {
+                headerOffset = headerPlusMaxIVSize - headerSize;
+            }
+
+            // encrypt the content
+            int offset = headerPlusMaxIVSize;
+            if (!box.isAEADMode()) {
+                // The explicit IV can be encrypted.
+                offset = headerOffset + headerSize;
+            }   // Otherwise, DON'T encrypt the nonce_explicit for AEAD mode
+
+            count = offset + box.encrypt(buf, offset, count - offset);
         }
     }
 
-    /*
-     * Encrypt ... length may grow due to block cipher padding
-     */
-    void encrypt(CipherBox box) {
-        int len = count - headerSize;
-        count = headerSize + box.encrypt(buf, headerSize, len);
-    }
-
-
     /*
      * Tell how full the buffer is ... for filling it with application or
      * handshake data.
      */
     final int availableDataBytes() {
-        int dataSize = count - headerSize;
+        int dataSize = count - headerPlusMaxIVSize;
         return maxDataSize - dataSize;
     }
 
@@ -270,11 +316,11 @@ class OutputRecord extends ByteArrayOutputStream implements Record {
          * Don't emit content-free records.  (Even change cipher spec
          * messages have a byte of data!)
          */
-        if (count == headerSize) {
+        if (count == headerPlusMaxIVSize) {
             return;
         }
 
-        int length = count - headerSize;
+        int length = count - headerOffset - headerSize;
         // "should" really never write more than about 14 Kb...
         if (length < 0) {
             throw new SSLException("output record size too small: "
@@ -299,7 +345,9 @@ class OutputRecord extends ByteArrayOutputStream implements Record {
          */
          if (firstMessage && useV2Hello()) {
             byte[] v3Msg = new byte[length - 4];
-            System.arraycopy(buf, headerSize + 4, v3Msg, 0, v3Msg.length);
+            System.arraycopy(buf, headerPlusMaxIVSize + 4,
+                                        v3Msg, 0, v3Msg.length);
+            headerOffset = 0;   // reset the header offset
             V3toV2ClientHello(v3Msg);
             handshakeHash.reset();
             lastHashed = 2;
@@ -314,11 +362,11 @@ class OutputRecord extends ByteArrayOutputStream implements Record {
             /*
              * Fill out the header, write it and the message.
              */
-            buf[0] = contentType;
-            buf[1] = protocolVersion.major;
-            buf[2] = protocolVersion.minor;
-            buf[3] = (byte)(length >> 8);
-            buf[4] = (byte)(length);
+            buf[headerOffset + 0] = contentType;
+            buf[headerOffset + 1] = protocolVersion.major;
+            buf[headerOffset + 2] = protocolVersion.minor;
+            buf[headerOffset + 3] = (byte)(length >> 8);
+            buf[headerOffset + 4] = (byte)(length);
         }
         firstMessage = false;
 
@@ -338,7 +386,8 @@ class OutputRecord extends ByteArrayOutputStream implements Record {
              * when holdRecord is true, the implementation in this class
              * will be used.
              */
-            writeBuffer(heldRecordBuffer, buf, 0, count, debugOffset);
+            writeBuffer(heldRecordBuffer,
+                        buf, headerOffset, count - headerOffset, debugOffset);
         } else {
             // It's time to send, do we have buffered data?
             // May or may not have a heldRecordBuffer.
@@ -346,15 +395,18 @@ class OutputRecord extends ByteArrayOutputStream implements Record {
                 int heldLen = heldRecordBuffer.size();
 
                 // Ensure the capacity of this buffer.
-                ensureCapacity(count + heldLen);
+                int newCount = count + heldLen - headerOffset;
+                ensureCapacity(newCount);
 
                 // Slide everything in the buffer to the right.
-                System.arraycopy(buf, 0, buf, heldLen, count);
+                System.arraycopy(buf, headerOffset,
+                                    buf, heldLen, count - headerOffset);
 
                 // Prepend the held record to the buffer.
                 System.arraycopy(
                     heldRecordBuffer.toByteArray(), 0, buf, 0, heldLen);
-                count += heldLen;
+                count = newCount;
+                headerOffset = 0;
 
                 // Clear the held buffer.
                 heldRecordBuffer.reset();
@@ -362,7 +414,8 @@ class OutputRecord extends ByteArrayOutputStream implements Record {
                 // The held buffer has been dumped, set the debug dump offset.
                 debugOffset = heldLen;
             }
-            writeBuffer(s, buf, 0, count, debugOffset);
+            writeBuffer(s, buf, headerOffset,
+                        count - headerOffset, debugOffset);
         }
 
         reset();
@@ -382,12 +435,11 @@ class OutputRecord extends ByteArrayOutputStream implements Record {
         if (debug != null && Debug.isOn("packet")) {
             try {
                 HexDumpEncoder hd = new HexDumpEncoder();
-                ByteBuffer bb = ByteBuffer.wrap(
-                        buf, off + debugOffset, len - debugOffset);
 
                 System.out.println("[Raw write]: length = " +
-                    bb.remaining());
-                hd.encodeBuffer(bb, System.out);
+                                                    (len - debugOffset));
+                hd.encodeBuffer(new ByteArrayInputStream(buf,
+                    off + debugOffset, len - debugOffset), System.out);
             } catch (IOException e) { }
         }
     }
@@ -400,8 +452,13 @@ class OutputRecord extends ByteArrayOutputStream implements Record {
         return firstMessage
             && (helloVersion == ProtocolVersion.SSL20Hello)
             && (contentType == ct_handshake)
-            && (buf[5] == HandshakeMessage.ht_client_hello)
-            && (buf[headerSize + 4+2+32] == 0); // V3 session ID is empty
+            && (buf[headerOffset + 5] == HandshakeMessage.ht_client_hello)
+                                            //  5: recode header size
+            && (buf[headerPlusMaxIVSize + 4 + 2 + 32] == 0);
+                                            // V3 session ID is empty
+                                            //  4: handshake header size
+                                            //  2: client_version in ClientHello
+                                            // 32: random in ClientHello
     }
 
     /*
diff --git a/jdk/src/share/classes/sun/security/ssl/Record.java b/jdk/src/share/classes/sun/security/ssl/Record.java
index 0494d9a4583..ca85a067ae3 100644
--- a/jdk/src/share/classes/sun/security/ssl/Record.java
+++ b/jdk/src/share/classes/sun/security/ssl/Record.java
@@ -52,20 +52,29 @@ interface Record {
     static final int    trailerSize = 20;       // SHA1 hash size
     static final int    maxDataSize = 16384;    // 2^14 bytes of data
     static final int    maxPadding = 256;       // block cipher padding
-    static final int    maxIVLength = 256;      // block length
+    static final int    maxIVLength = 256;      // IV length
+
+    /*
+     * The size of the header plus the max IV length
+     */
+    static final int    headerPlusMaxIVSize =
+                                      headerSize        // header
+                                    + maxIVLength;      // iv
 
     /*
      * SSL has a maximum record size.  It's header, (compressed) data,
-     * padding, and a trailer for the MAC.
+     * padding, and a trailer for the message authentication information (MAC
+     * for block and stream ciphers, and message authentication tag for AEAD
+     * ciphers).
+     *
      * Some compression algorithms have rare cases where they expand the data.
      * As we don't support compression at this time, leave that out.
      */
     static final int    maxRecordSize =
-                                      headerSize        // header
-                                    + maxIVLength       // iv
-                                    + maxDataSize       // data
-                                    + maxPadding        // padding
-                                    + trailerSize;      // MAC
+                                      headerPlusMaxIVSize   // header + iv
+                                    + maxDataSize           // data
+                                    + maxPadding            // padding
+                                    + trailerSize;          // MAC or AEAD tag
 
     static final boolean enableCBCProtection =
             Debug.getBooleanProperty("jsse.enableCBCProtection", true);
@@ -77,8 +86,7 @@ interface Record {
     static final int    maxDataSizeMinusOneByteRecord =
                                   maxDataSize       // max data size
                                 - (                 // max one byte record size
-                                      headerSize    // header
-                                    + maxIVLength   // iv
+                                      headerPlusMaxIVSize   // header + iv
                                     + 1             // one byte data
                                     + maxPadding    // padding
                                     + trailerSize   // MAC
@@ -104,11 +112,10 @@ interface Record {
      * Allocate a smaller array.
      */
     static final int    maxAlertRecordSize =
-                                      headerSize        // header
-                                    + maxIVLength       // iv
-                                    + 2                 // alert
-                                    + maxPadding        // padding
-                                    + trailerSize;      // MAC
+                                      headerPlusMaxIVSize   // header + iv
+                                    + 2                     // alert
+                                    + maxPadding            // padding
+                                    + trailerSize;          // MAC
 
     /*
      * The overflow values of integers of 8, 16 and 24 bits.
diff --git a/jdk/src/share/classes/sun/security/ssl/SSLEngineImpl.java b/jdk/src/share/classes/sun/security/ssl/SSLEngineImpl.java
index 41415337ca1..2da58577c94 100644
--- a/jdk/src/share/classes/sun/security/ssl/SSLEngineImpl.java
+++ b/jdk/src/share/classes/sun/security/ssl/SSLEngineImpl.java
@@ -280,7 +280,7 @@ final public class SSLEngineImpl extends SSLEngine {
     /*
      * Crypto state that's reinitialized when the session changes.
      */
-    private MAC                 readMAC, writeMAC;
+    private Authenticator       readAuthenticator, writeAuthenticator;
     private CipherBox           readCipher, writeCipher;
     // NOTE: compression state would be saved here
 
@@ -377,9 +377,9 @@ final public class SSLEngineImpl extends SSLEngine {
          * Note:  compression support would go here too
          */
         readCipher = CipherBox.NULL;
-        readMAC = MAC.NULL;
+        readAuthenticator = MAC.NULL;
         writeCipher = CipherBox.NULL;
-        writeMAC = MAC.NULL;
+        writeAuthenticator = MAC.NULL;
 
         // default security parameters for secure renegotiation
         secureRenegotiation = false;
@@ -586,7 +586,7 @@ final public class SSLEngineImpl extends SSLEngine {
 
         try {
             readCipher = handshaker.newReadCipher();
-            readMAC = handshaker.newReadMAC();
+            readAuthenticator = handshaker.newReadAuthenticator();
         } catch (GeneralSecurityException e) {
             // "can't happen"
             throw new SSLException("Algorithm missing:  ", e);
@@ -622,7 +622,7 @@ final public class SSLEngineImpl extends SSLEngine {
 
         try {
             writeCipher = handshaker.newWriteCipher();
-            writeMAC = handshaker.newWriteMAC();
+            writeAuthenticator = handshaker.newWriteAuthenticator();
         } catch (GeneralSecurityException e) {
             // "can't happen"
             throw new SSLException("Algorithm missing:  ", e);
@@ -958,34 +958,15 @@ final public class SSLEngineImpl extends SSLEngine {
              * throw a fatal alert if the integrity check fails.
              */
             try {
-                decryptedBB = inputRecord.decrypt(readCipher, readBB);
+                decryptedBB = inputRecord.decrypt(
+                                    readAuthenticator, readCipher, readBB);
             } catch (BadPaddingException e) {
-                // RFC 2246 states that decryption_failed should be used
-                // for this purpose. However, that allows certain attacks,
-                // so we just send bad record MAC. We also need to make
-                // sure to always check the MAC to avoid a timing attack
-                // for the same issue. See paper by Vaudenay et al.
-                //
-                // rewind the BB if necessary.
-                readBB.rewind();
-
-                inputRecord.checkMAC(readMAC, readBB);
-
                 // use the same alert types as for MAC failure below
                 byte alertType = (inputRecord.contentType() ==
                     Record.ct_handshake) ?
                         Alerts.alert_handshake_failure :
                         Alerts.alert_bad_record_mac;
-                fatal(alertType, "Invalid padding", e);
-            }
-
-            if (!inputRecord.checkMAC(readMAC, decryptedBB)) {
-                if (inputRecord.contentType() == Record.ct_handshake) {
-                    fatal(Alerts.alert_handshake_failure,
-                        "bad handshake record MAC");
-                } else {
-                    fatal(Alerts.alert_bad_record_mac, "bad record MAC");
-                }
+                fatal(alertType, e.getMessage(), e);
             }
 
             // if (!inputRecord.decompress(c))
@@ -1137,7 +1118,7 @@ final public class SSLEngineImpl extends SSLEngine {
                 hsStatus = getHSStatus(hsStatus);
                 if (connectionState < cs_ERROR && !isInboundDone() &&
                         (hsStatus == HandshakeStatus.NOT_HANDSHAKING)) {
-                    if (checkSequenceNumber(readMAC,
+                    if (checkSequenceNumber(readAuthenticator,
                             inputRecord.contentType())) {
                         hsStatus = getHSStatus(null);
                     }
@@ -1290,7 +1271,7 @@ final public class SSLEngineImpl extends SSLEngine {
 
         // eventually compress as well.
         HandshakeStatus hsStatus =
-                writer.writeRecord(eor, ea, writeMAC, writeCipher);
+                writer.writeRecord(eor, ea, writeAuthenticator, writeCipher);
 
         /*
          * We only need to check the sequence number state for
@@ -1307,7 +1288,7 @@ final public class SSLEngineImpl extends SSLEngine {
         hsStatus = getHSStatus(hsStatus);
         if (connectionState < cs_ERROR && !isOutboundDone() &&
                 (hsStatus == HandshakeStatus.NOT_HANDSHAKING)) {
-            if (checkSequenceNumber(writeMAC, eor.contentType())) {
+            if (checkSequenceNumber(writeAuthenticator, eor.contentType())) {
                 hsStatus = getHSStatus(null);
             }
         }
@@ -1346,7 +1327,7 @@ final public class SSLEngineImpl extends SSLEngine {
      */
     void writeRecord(EngineOutputRecord eor) throws IOException {
         // eventually compress as well.
-        writer.writeRecord(eor, writeMAC, writeCipher);
+        writer.writeRecord(eor, writeAuthenticator, writeCipher);
 
         /*
          * Check the sequence number state
@@ -1360,7 +1341,7 @@ final public class SSLEngineImpl extends SSLEngine {
          * of the last record cannot be wrapped.
          */
         if ((connectionState < cs_ERROR) && !isOutboundDone()) {
-            checkSequenceNumber(writeMAC, eor.contentType());
+            checkSequenceNumber(writeAuthenticator, eor.contentType());
         }
     }
 
@@ -1378,14 +1359,14 @@ final public class SSLEngineImpl extends SSLEngine {
      *
      * Return true if the handshake status may be changed.
      */
-    private boolean checkSequenceNumber(MAC mac, byte type)
+    private boolean checkSequenceNumber(Authenticator authenticator, byte type)
             throws IOException {
 
         /*
          * Don't bother to check the sequence number for error or
          * closed connections, or NULL MAC
          */
-        if (connectionState >= cs_ERROR || mac == MAC.NULL) {
+        if (connectionState >= cs_ERROR || authenticator == MAC.NULL) {
             return false;
         }
 
@@ -1393,7 +1374,7 @@ final public class SSLEngineImpl extends SSLEngine {
          * Conservatively, close the connection immediately when the
          * sequence number is close to overflow
          */
-        if (mac.seqNumOverflow()) {
+        if (authenticator.seqNumOverflow()) {
             /*
              * TLS protocols do not define a error alert for sequence
              * number overflow. We use handshake_failure error alert
@@ -1416,7 +1397,7 @@ final public class SSLEngineImpl extends SSLEngine {
          * Don't bother to kickstart the renegotiation when the local is
          * asking for it.
          */
-        if ((type != Record.ct_handshake) && mac.seqNumIsHuge()) {
+        if ((type != Record.ct_handshake) && authenticator.seqNumIsHuge()) {
             if (debug != null && Debug.isOn("ssl")) {
                 System.out.println(Thread.currentThread().getName() +
                         ", request renegotiation " +
diff --git a/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java b/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java
index f807c4c58ce..9c8b43f17ad 100644
--- a/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java
+++ b/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java
@@ -292,7 +292,7 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
     /*
      * Crypto state that's reinitialized when the session changes.
      */
-    private MAC                 readMAC, writeMAC;
+    private Authenticator       readAuthenticator, writeAuthenticator;
     private CipherBox           readCipher, writeCipher;
     // NOTE: compression state would be saved here
 
@@ -586,9 +586,9 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
          * Note:  compression support would go here too
          */
         readCipher = CipherBox.NULL;
-        readMAC = MAC.NULL;
+        readAuthenticator = MAC.NULL;
         writeCipher = CipherBox.NULL;
-        writeMAC = MAC.NULL;
+        writeAuthenticator = MAC.NULL;
 
         // initial security parameters for secure renegotiation
         secureRenegotiation = false;
@@ -829,8 +829,7 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
             boolean holdRecord) throws IOException {
 
         // r.compress(c);
-        r.addMAC(writeMAC);
-        r.encrypt(writeCipher);
+        r.encrypt(writeAuthenticator, writeCipher);
 
         if (holdRecord) {
             // If we were requested to delay the record due to possibility
@@ -861,7 +860,7 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
          * of the last record cannot be wrapped.
          */
         if (connectionState < cs_ERROR) {
-            checkSequenceNumber(writeMAC, r.contentType());
+            checkSequenceNumber(writeAuthenticator, r.contentType());
         }
 
         // turn off the flag of the first application record
@@ -986,29 +985,14 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
              * throw a fatal alert if the integrity check fails.
              */
             try {
-                r.decrypt(readCipher);
+                r.decrypt(readAuthenticator, readCipher);
             } catch (BadPaddingException e) {
-                // RFC 2246 states that decryption_failed should be used
-                // for this purpose. However, that allows certain attacks,
-                // so we just send bad record MAC. We also need to make
-                // sure to always check the MAC to avoid a timing attack
-                // for the same issue. See paper by Vaudenay et al.
-                r.checkMAC(readMAC);
                 // use the same alert types as for MAC failure below
                 byte alertType = (r.contentType() == Record.ct_handshake)
                                         ? Alerts.alert_handshake_failure
                                         : Alerts.alert_bad_record_mac;
-                fatal(alertType, "Invalid padding", e);
+                fatal(alertType, e.getMessage(), e);
             }
-            if (!r.checkMAC(readMAC)) {
-                if (r.contentType() == Record.ct_handshake) {
-                    fatal(Alerts.alert_handshake_failure,
-                        "bad handshake record MAC");
-                } else {
-                    fatal(Alerts.alert_bad_record_mac, "bad record MAC");
-                }
-            }
-
 
             // if (!r.decompress(c))
             //     fatal(Alerts.alert_decompression_failure,
@@ -1159,7 +1143,7 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
                * of the last record cannot be wrapped.
                */
               if (connectionState < cs_ERROR) {
-                  checkSequenceNumber(readMAC, r.contentType());
+                  checkSequenceNumber(readAuthenticator, r.contentType());
               }
 
               return;
@@ -1182,14 +1166,14 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
      * implementation would need to wrap a sequence number, it must
      * renegotiate instead."
      */
-    private void checkSequenceNumber(MAC mac, byte type)
+    private void checkSequenceNumber(Authenticator authenticator, byte type)
             throws IOException {
 
         /*
          * Don't bother to check the sequence number for error or
          * closed connections, or NULL MAC.
          */
-        if (connectionState >= cs_ERROR || mac == MAC.NULL) {
+        if (connectionState >= cs_ERROR || authenticator == MAC.NULL) {
             return;
         }
 
@@ -1197,7 +1181,7 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
          * Conservatively, close the connection immediately when the
          * sequence number is close to overflow
          */
-        if (mac.seqNumOverflow()) {
+        if (authenticator.seqNumOverflow()) {
             /*
              * TLS protocols do not define a error alert for sequence
              * number overflow. We use handshake_failure error alert
@@ -1219,7 +1203,7 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
          * Don't bother to kickstart the renegotiation when the local is
          * asking for it.
          */
-        if ((type != Record.ct_handshake) && mac.seqNumIsHuge()) {
+        if ((type != Record.ct_handshake) && authenticator.seqNumIsHuge()) {
             if (debug != null && Debug.isOn("ssl")) {
                 System.out.println(Thread.currentThread().getName() +
                         ", request renegotiation " +
@@ -2081,7 +2065,7 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
 
         try {
             readCipher = handshaker.newReadCipher();
-            readMAC = handshaker.newReadMAC();
+            readAuthenticator = handshaker.newReadAuthenticator();
         } catch (GeneralSecurityException e) {
             // "can't happen"
             throw new SSLException("Algorithm missing:  ", e);
@@ -2112,7 +2096,7 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
 
         try {
             writeCipher = handshaker.newWriteCipher();
-            writeMAC = handshaker.newWriteMAC();
+            writeAuthenticator = handshaker.newWriteAuthenticator();
         } catch (GeneralSecurityException e) {
             // "can't happen"
             throw new SSLException("Algorithm missing:  ", e);
diff --git a/jdk/test/sun/security/ec/TestEC.java b/jdk/test/sun/security/ec/TestEC.java
index 41d0f0361da..77217cae467 100644
--- a/jdk/test/sun/security/ec/TestEC.java
+++ b/jdk/test/sun/security/ec/TestEC.java
@@ -21,6 +21,11 @@
  * questions.
  */
 
+//
+// SunJSSE does not support dynamic system properties, no way to re-use
+// system properties in samevm/agentvm mode.
+//
+
 /**
  * @test
  * @bug 6840752
@@ -30,7 +35,7 @@
  * @library ../pkcs11/sslecc
  * @library ../../../java/security/testlibrary
  * @compile -XDignore.symbol.file TestEC.java
- * @run main TestEC
+ * @run main/othervm TestEC
  */
 
 import java.security.NoSuchProviderException;
diff --git a/jdk/test/sun/security/pkcs11/fips/CipherTest.java b/jdk/test/sun/security/pkcs11/fips/CipherTest.java
index 32bc6df4e16..2fc81c49c54 100644
--- a/jdk/test/sun/security/pkcs11/fips/CipherTest.java
+++ b/jdk/test/sun/security/pkcs11/fips/CipherTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -147,6 +147,25 @@ public class CipherTest {
             CS_16("TLS_DH_anon_WITH_AES_128_CBC_SHA256",     0x0303, 0xFFFF),
             CS_17("TLS_RSA_WITH_NULL_SHA256",                0x0303, 0xFFFF),
 
+            CS_20("TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384", 0x0303, 0xFFFF),
+            CS_21("TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256", 0x0303, 0xFFFF),
+            CS_22("TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",   0x0303, 0xFFFF),
+            CS_23("TLS_RSA_WITH_AES_256_GCM_SHA384",         0x0303, 0xFFFF),
+            CS_24("TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384",  0x0303, 0xFFFF),
+            CS_25("TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384",    0x0303, 0xFFFF),
+            CS_26("TLS_DHE_RSA_WITH_AES_256_GCM_SHA384",     0x0303, 0xFFFF),
+            CS_27("TLS_DHE_DSS_WITH_AES_256_GCM_SHA384",     0x0303, 0xFFFF),
+
+            CS_28("TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",   0x0303, 0xFFFF),
+            CS_29("TLS_RSA_WITH_AES_128_GCM_SHA256",         0x0303, 0xFFFF),
+            CS_30("TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256",  0x0303, 0xFFFF),
+            CS_31("TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256",    0x0303, 0xFFFF),
+            CS_32("TLS_DHE_RSA_WITH_AES_128_GCM_SHA256",     0x0303, 0xFFFF),
+            CS_33("TLS_DHE_DSS_WITH_AES_128_GCM_SHA256",     0x0303, 0xFFFF),
+
+            CS_34("TLS_DH_anon_WITH_AES_256_GCM_SHA384",     0x0303, 0xFFFF),
+            CS_35("TLS_DH_anon_WITH_AES_128_GCM_SHA256",     0x0303, 0xFFFF),
+
             // cipher suites obsoleted since TLS 1.2
             CS_50("SSL_RSA_WITH_DES_CBC_SHA",                0x0000, 0x0303),
             CS_51("SSL_DHE_RSA_WITH_DES_CBC_SHA",            0x0000, 0x0303),
diff --git a/jdk/test/sun/security/pkcs11/sslecc/CipherTest.java b/jdk/test/sun/security/pkcs11/sslecc/CipherTest.java
index 64153f58d20..26ecec4df0f 100644
--- a/jdk/test/sun/security/pkcs11/sslecc/CipherTest.java
+++ b/jdk/test/sun/security/pkcs11/sslecc/CipherTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -147,6 +147,25 @@ public class CipherTest {
             CS_16("TLS_DH_anon_WITH_AES_128_CBC_SHA256",     0x0303, 0xFFFF),
             CS_17("TLS_RSA_WITH_NULL_SHA256",                0x0303, 0xFFFF),
 
+            CS_20("TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384", 0x0303, 0xFFFF),
+            CS_21("TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256", 0x0303, 0xFFFF),
+            CS_22("TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",   0x0303, 0xFFFF),
+            CS_23("TLS_RSA_WITH_AES_256_GCM_SHA384",         0x0303, 0xFFFF),
+            CS_24("TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384",  0x0303, 0xFFFF),
+            CS_25("TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384",    0x0303, 0xFFFF),
+            CS_26("TLS_DHE_RSA_WITH_AES_256_GCM_SHA384",     0x0303, 0xFFFF),
+            CS_27("TLS_DHE_DSS_WITH_AES_256_GCM_SHA384",     0x0303, 0xFFFF),
+
+            CS_28("TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",   0x0303, 0xFFFF),
+            CS_29("TLS_RSA_WITH_AES_128_GCM_SHA256",         0x0303, 0xFFFF),
+            CS_30("TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256",  0x0303, 0xFFFF),
+            CS_31("TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256",    0x0303, 0xFFFF),
+            CS_32("TLS_DHE_RSA_WITH_AES_128_GCM_SHA256",     0x0303, 0xFFFF),
+            CS_33("TLS_DHE_DSS_WITH_AES_128_GCM_SHA256",     0x0303, 0xFFFF),
+
+            CS_34("TLS_DH_anon_WITH_AES_256_GCM_SHA384",     0x0303, 0xFFFF),
+            CS_35("TLS_DH_anon_WITH_AES_128_GCM_SHA256",     0x0303, 0xFFFF),
+
             // cipher suites obsoleted since TLS 1.2
             CS_50("SSL_RSA_WITH_DES_CBC_SHA",                0x0000, 0x0303),
             CS_51("SSL_DHE_RSA_WITH_DES_CBC_SHA",            0x0000, 0x0303),
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/SSLEngineBadBufferArrayAccess.java b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/SSLEngineBadBufferArrayAccess.java
index aeaf5792cb9..564342b8ee6 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/SSLEngineBadBufferArrayAccess.java
+++ b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/SSLEngineBadBufferArrayAccess.java
@@ -21,14 +21,16 @@
  * questions.
  */
 
+//
+// SunJSSE does not support dynamic system properties, no way to re-use
+// system properties in samevm/agentvm mode.
+//
+
 /*
  * @test
  * @bug 7031830
  * @summary bad_record_mac failure on TLSv1.2 enabled connection with SSLEngine
  * @run main/othervm SSLEngineBadBufferArrayAccess
- *
- *     SunJSSE does not support dynamic system properties, no way to re-use
- *     system properties in samevm/agentvm mode.
  */
 
 /**
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/TLSv12/ShortRSAKeyGCM.java b/jdk/test/sun/security/ssl/javax/net/ssl/TLSv12/ShortRSAKeyGCM.java
new file mode 100644
index 00000000000..ac78134f6d4
--- /dev/null
+++ b/jdk/test/sun/security/ssl/javax/net/ssl/TLSv12/ShortRSAKeyGCM.java
@@ -0,0 +1,445 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+//
+// SunJSSE does not support dynamic system properties, no way to re-use
+// system properties in samevm/agentvm mode.
+//
+
+/*
+ * @test
+ * @bug 7030966
+ * @summary Support AEAD CipherSuites
+ * @run main/othervm ShortRSAKeyGCM PKIX TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
+ * @run main/othervm ShortRSAKeyGCM PKIX TLS_RSA_WITH_AES_128_GCM_SHA256
+ * @run main/othervm ShortRSAKeyGCM PKIX TLS_DHE_RSA_WITH_AES_128_GCM_SHA256
+ * @run main/othervm ShortRSAKeyGCM PKIX TLS_DH_anon_WITH_AES_128_GCM_SHA256
+ */
+
+/*
+ * Need additional key materials to run the following cases.
+ *
+ * @run main/othervm ShortRSAKeyGCM PKIX TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256
+ * @run main/othervm ShortRSAKeyGCM PKIX TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
+ * @run main/othervm ShortRSAKeyGCM PKIX TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256
+ *
+ * Need unlimited JCE Unlimited Strength Jurisdiction Policy to run the
+ * following cases.
+ *
+ * @run main/othervm ShortRSAKeyGCM PKIX TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
+ * @run main/othervm ShortRSAKeyGCM PKIX TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384
+ * @run main/othervm ShortRSAKeyGCM PKIX TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+ * @run main/othervm ShortRSAKeyGCM PKIX TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384
+ * @run main/othervm ShortRSAKeyGCM PKIX TLS_RSA_WITH_AES_256_GCM_SHA384
+ * @run main/othervm ShortRSAKeyGCM PKIX TLS_DHE_RSA_WITH_AES_256_GCM_SHA384
+ * @run main/othervm ShortRSAKeyGCM PKIX TLS_DH_anon_WITH_AES_256_GCM_SHA384
+ */
+
+import java.net.*;
+import java.util.*;
+import java.io.*;
+import javax.net.ssl.*;
+import java.security.Security;
+import java.security.KeyStore;
+import java.security.KeyFactory;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateFactory;
+import java.security.spec.*;
+import java.security.interfaces.*;
+import sun.misc.BASE64Decoder;
+
+
+public class ShortRSAKeyGCM {
+
+    /*
+     * =============================================================
+     * Set the various variables needed for the tests, then
+     * specify what tests to run on each side.
+     */
+
+    /*
+     * Should we run the client or server in a separate thread?
+     * Both sides can throw exceptions, but do you have a preference
+     * as to which side should be the main thread.
+     */
+    static boolean separateServerThread = true;
+
+    /*
+     * Where do we find the keystores?
+     */
+    // Certificates and key used in the test.
+    static String trustedCertStr =
+        "-----BEGIN CERTIFICATE-----\n" +
+        "MIICkjCCAfugAwIBAgIBADANBgkqhkiG9w0BAQQFADA7MQswCQYDVQQGEwJVUzEN\n" +
+        "MAsGA1UEChMESmF2YTEdMBsGA1UECxMUU3VuSlNTRSBUZXN0IFNlcml2Y2UwHhcN\n" +
+        "MTEwODE5MDE1MjE5WhcNMzIwNzI5MDE1MjE5WjA7MQswCQYDVQQGEwJVUzENMAsG\n" +
+        "A1UEChMESmF2YTEdMBsGA1UECxMUU3VuSlNTRSBUZXN0IFNlcml2Y2UwgZ8wDQYJ\n" +
+        "KoZIhvcNAQEBBQADgY0AMIGJAoGBAM8orG08DtF98TMSscjGsidd1ZoN4jiDpi8U\n" +
+        "ICz+9dMm1qM1d7O2T+KH3/mxyox7Rc2ZVSCaUD0a3CkhPMnlAx8V4u0H+E9sqso6\n" +
+        "iDW3JpOyzMExvZiRgRG/3nvp55RMIUV4vEHOZ1QbhuqG4ebN0Vz2DkRft7+flthf\n" +
+        "vDld6f5JAgMBAAGjgaUwgaIwHQYDVR0OBBYEFLl81dnfp0wDrv0OJ1sxlWzH83Xh\n" +
+        "MGMGA1UdIwRcMFqAFLl81dnfp0wDrv0OJ1sxlWzH83XhoT+kPTA7MQswCQYDVQQG\n" +
+        "EwJVUzENMAsGA1UEChMESmF2YTEdMBsGA1UECxMUU3VuSlNTRSBUZXN0IFNlcml2\n" +
+        "Y2WCAQAwDwYDVR0TAQH/BAUwAwEB/zALBgNVHQ8EBAMCAQYwDQYJKoZIhvcNAQEE\n" +
+        "BQADgYEALlgaH1gWtoBZ84EW8Hu6YtGLQ/L9zIFmHonUPZwn3Pr//icR9Sqhc3/l\n" +
+        "pVTxOINuFHLRz4BBtEylzRIOPzK3tg8XwuLb1zd0db90x3KBCiAL6E6cklGEPwLe\n" +
+        "XYMHDn9eDsaq861Tzn6ZwzMgw04zotPMoZN0mVd/3Qca8UJFucE=\n" +
+        "-----END CERTIFICATE-----";
+
+    static String targetCertStr =
+        "-----BEGIN CERTIFICATE-----\n" +
+        "MIICNDCCAZ2gAwIBAgIBDDANBgkqhkiG9w0BAQQFADA7MQswCQYDVQQGEwJVUzEN\n" +
+        "MAsGA1UEChMESmF2YTEdMBsGA1UECxMUU3VuSlNTRSBUZXN0IFNlcml2Y2UwHhcN\n" +
+        "MTExMTA3MTM1NTUyWhcNMzEwNzI1MTM1NTUyWjBPMQswCQYDVQQGEwJVUzENMAsG\n" +
+        "A1UEChMESmF2YTEdMBsGA1UECxMUU3VuSlNTRSBUZXN0IFNlcml2Y2UxEjAQBgNV\n" +
+        "BAMTCWxvY2FsaG9zdDBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQC3Pb49OSPfOD2G\n" +
+        "HSXFCFx1GJEZfqG9ZUf7xuIi/ra5dLjPGAaoY5QF2QOa8VnOriQCXDfyXHxsuRnE\n" +
+        "OomxL7EVAgMBAAGjeDB2MAsGA1UdDwQEAwID6DAdBgNVHQ4EFgQUXNCJK3/dtCIc\n" +
+        "xb+zlA/JINlvs/MwHwYDVR0jBBgwFoAUuXzV2d+nTAOu/Q4nWzGVbMfzdeEwJwYD\n" +
+        "VR0lBCAwHgYIKwYBBQUHAwEGCCsGAQUFBwMCBggrBgEFBQcDAzANBgkqhkiG9w0B\n" +
+        "AQQFAAOBgQB2qIDUxA2caMPpGtUACZAPRUtrGssCINIfItETXJZCx/cRuZ5sP4D9\n" +
+        "N1acoNDn0hCULe3lhXAeTC9NZ97680yJzregQMV5wATjo1FGsKY30Ma+sc/nfzQW\n" +
+        "+h/7RhYtoG0OTsiaDCvyhI6swkNJzSzrAccPY4+ZgU8HiDLzZTmM3Q==\n" +
+        "-----END CERTIFICATE-----";
+
+    // Private key in the format of PKCS#8, key size is 512 bits.
+    static String targetPrivateKey =
+        "MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAtz2+PTkj3zg9hh0l\n" +
+        "xQhcdRiRGX6hvWVH+8biIv62uXS4zxgGqGOUBdkDmvFZzq4kAlw38lx8bLkZxDqJ\n" +
+        "sS+xFQIDAQABAkByx/5Oo2hQ/w2q4L8z+NTRlJ3vdl8iIDtC/4XPnfYfnGptnpG6\n" +
+        "ZThQRvbMZiai0xHQPQMszvAHjZVme1eDl3EBAiEA3aKJHynPVCEJhpfCLWuMwX5J\n" +
+        "1LntwJO7NTOyU5m8rPECIQDTpzn5X44r2rzWBDna/Sx7HW9IWCxNgUD2Eyi2nA7W\n" +
+        "ZQIgJerEorw4aCAuzQPxiGu57PB6GRamAihEAtoRTBQlH0ECIQDN08FgTtnesgCU\n" +
+        "DFYLLcw1CiHvc7fZw4neBDHCrC8NtQIgA8TOUkGnpCZlQ0KaI8KfKWI+vxFcgFnH\n" +
+        "3fnqsTgaUs4=";
+
+    static char passphrase[] = "passphrase".toCharArray();
+
+    /*
+     * Is the server ready to serve?
+     */
+    volatile static boolean serverReady = false;
+
+    /*
+     * Turn on SSL debugging?
+     */
+    static boolean debug = false;
+
+    /*
+     * Define the server side of the test.
+     *
+     * If the server prematurely exits, serverReady will be set to true
+     * to avoid infinite hangs.
+     */
+    void doServerSide() throws Exception {
+        SSLContext context = generateSSLContext(null, targetCertStr,
+                                            targetPrivateKey);
+        SSLServerSocketFactory sslssf = context.getServerSocketFactory();
+        SSLServerSocket sslServerSocket =
+            (SSLServerSocket)sslssf.createServerSocket(serverPort);
+        serverPort = sslServerSocket.getLocalPort();
+
+        /*
+         * Signal Client, we're ready for his connect.
+         */
+        serverReady = true;
+
+        SSLSocket sslSocket = (SSLSocket)sslServerSocket.accept();
+        sslSocket.setEnabledCipherSuites(sslSocket.getSupportedCipherSuites());
+        InputStream sslIS = sslSocket.getInputStream();
+        OutputStream sslOS = sslSocket.getOutputStream();
+
+        sslIS.read();
+        sslOS.write('A');
+        sslOS.flush();
+
+        sslSocket.close();
+    }
+
+    /*
+     * Define the client side of the test.
+     *
+     * If the server prematurely exits, serverReady will be set to true
+     * to avoid infinite hangs.
+     */
+    void doClientSide() throws Exception {
+
+        /*
+         * Wait for server to get started.
+         */
+        while (!serverReady) {
+            Thread.sleep(50);
+        }
+
+        SSLContext context = generateSSLContext(trustedCertStr, null, null);
+        SSLSocketFactory sslsf = context.getSocketFactory();
+
+        SSLSocket sslSocket =
+            (SSLSocket)sslsf.createSocket("localhost", serverPort);
+
+        // enable TLSv1.2 only
+        sslSocket.setEnabledProtocols(new String[] {"TLSv1.2"});
+
+        // enable a block cipher
+        sslSocket.setEnabledCipherSuites(new String[] {cipherSuite});
+
+        InputStream sslIS = sslSocket.getInputStream();
+        OutputStream sslOS = sslSocket.getOutputStream();
+
+        sslOS.write('B');
+        sslOS.flush();
+        sslIS.read();
+
+        sslSocket.close();
+    }
+
+    /*
+     * =============================================================
+     * The remainder is just support stuff
+     */
+    private static String tmAlgorithm;        // trust manager
+    private static String cipherSuite;        // cipher suite
+
+    private static void parseArguments(String[] args) {
+        tmAlgorithm = args[0];
+        cipherSuite = args[1];
+    }
+
+    private static SSLContext generateSSLContext(String trustedCertStr,
+            String keyCertStr, String keySpecStr) throws Exception {
+
+        // generate certificate from cert string
+        CertificateFactory cf = CertificateFactory.getInstance("X.509");
+
+        // create a key store
+        KeyStore ks = KeyStore.getInstance("JKS");
+        ks.load(null, null);
+
+        // import the trused cert
+        Certificate trusedCert = null;
+        ByteArrayInputStream is = null;
+        if (trustedCertStr != null) {
+            is = new ByteArrayInputStream(trustedCertStr.getBytes());
+            trusedCert = cf.generateCertificate(is);
+            is.close();
+
+            ks.setCertificateEntry("RSA Export Signer", trusedCert);
+        }
+
+        if (keyCertStr != null) {
+            // generate the private key.
+            PKCS8EncodedKeySpec priKeySpec = new PKCS8EncodedKeySpec(
+                                new BASE64Decoder().decodeBuffer(keySpecStr));
+            KeyFactory kf = KeyFactory.getInstance("RSA");
+            RSAPrivateKey priKey =
+                    (RSAPrivateKey)kf.generatePrivate(priKeySpec);
+
+            // generate certificate chain
+            is = new ByteArrayInputStream(keyCertStr.getBytes());
+            Certificate keyCert = cf.generateCertificate(is);
+            is.close();
+
+            Certificate[] chain = null;
+            if (trusedCert != null) {
+                chain = new Certificate[2];
+                chain[0] = keyCert;
+                chain[1] = trusedCert;
+            } else {
+                chain = new Certificate[1];
+                chain[0] = keyCert;
+            }
+
+            // import the key entry.
+            ks.setKeyEntry("Whatever", priKey, passphrase, chain);
+        }
+
+        // create SSL context
+        TrustManagerFactory tmf = TrustManagerFactory.getInstance(tmAlgorithm);
+        tmf.init(ks);
+
+        SSLContext ctx = SSLContext.getInstance("TLS");
+        if (keyCertStr != null && !keyCertStr.isEmpty()) {
+            KeyManagerFactory kmf = KeyManagerFactory.getInstance("NewSunX509");
+            kmf.init(ks, passphrase);
+
+            ctx.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
+            ks = null;
+        } else {
+            ctx.init(null, tmf.getTrustManagers(), null);
+        }
+
+        return ctx;
+    }
+
+
+    // use any free port by default
+    volatile int serverPort = 0;
+
+    volatile Exception serverException = null;
+    volatile Exception clientException = null;
+
+    public static void main(String[] args) throws Exception {
+        // reset the security property to make sure that the algorithms
+        // and keys used in this test are not disabled.
+        Security.setProperty("jdk.certpath.disabledAlgorithms", "MD2");
+
+        if (debug) {
+            System.setProperty("javax.net.debug", "all");
+        }
+
+        /*
+         * Get the customized arguments.
+         */
+        parseArguments(args);
+
+        /*
+         * Start the tests.
+         */
+        new ShortRSAKeyGCM();
+    }
+
+    Thread clientThread = null;
+    Thread serverThread = null;
+
+    /*
+     * Primary constructor, used to drive remainder of the test.
+     *
+     * Fork off the other side, then do your work.
+     */
+    ShortRSAKeyGCM() throws Exception {
+        try {
+            if (separateServerThread) {
+                startServer(true);
+                startClient(false);
+            } else {
+                startClient(true);
+                startServer(false);
+            }
+        } catch (Exception e) {
+            // swallow for now.  Show later
+        }
+
+        /*
+         * Wait for other side to close down.
+         */
+        if (separateServerThread) {
+            serverThread.join();
+        } else {
+            clientThread.join();
+        }
+
+        /*
+         * When we get here, the test is pretty much over.
+         * Which side threw the error?
+         */
+        Exception local;
+        Exception remote;
+        String whichRemote;
+
+        if (separateServerThread) {
+            remote = serverException;
+            local = clientException;
+            whichRemote = "server";
+        } else {
+            remote = clientException;
+            local = serverException;
+            whichRemote = "client";
+        }
+
+        /*
+         * If both failed, return the curthread's exception, but also
+         * print the remote side Exception
+         */
+        if ((local != null) && (remote != null)) {
+            System.out.println(whichRemote + " also threw:");
+            remote.printStackTrace();
+            System.out.println();
+            throw local;
+        }
+
+        if (remote != null) {
+            throw remote;
+        }
+
+        if (local != null) {
+            throw local;
+        }
+    }
+
+    void startServer(boolean newThread) throws Exception {
+        if (newThread) {
+            serverThread = new Thread() {
+                public void run() {
+                    try {
+                        doServerSide();
+                    } catch (Exception e) {
+                        /*
+                         * Our server thread just died.
+                         *
+                         * Release the client, if not active already...
+                         */
+                        System.err.println("Server died..." + e);
+                        serverReady = true;
+                        serverException = e;
+                    }
+                }
+            };
+            serverThread.start();
+        } else {
+            try {
+                doServerSide();
+            } catch (Exception e) {
+                serverException = e;
+            } finally {
+                serverReady = true;
+            }
+        }
+    }
+
+    void startClient(boolean newThread) throws Exception {
+        if (newThread) {
+            clientThread = new Thread() {
+                public void run() {
+                    try {
+                        doClientSide();
+                    } catch (Exception e) {
+                        /*
+                         * Our client thread just died.
+                         */
+                        System.err.println("Client died..." + e);
+                        clientException = e;
+                    }
+                }
+            };
+            clientThread.start();
+        } else {
+            try {
+                doClientSide();
+            } catch (Exception e) {
+                clientException = e;
+            }
+        }
+    }
+}
diff --git a/jdk/test/sun/security/ssl/sanity/ciphersuites/CipherSuitesInOrder.java b/jdk/test/sun/security/ssl/sanity/ciphersuites/CipherSuitesInOrder.java
index 3d081c1bd40..9dc1a923dc9 100644
--- a/jdk/test/sun/security/ssl/sanity/ciphersuites/CipherSuitesInOrder.java
+++ b/jdk/test/sun/security/ssl/sanity/ciphersuites/CipherSuitesInOrder.java
@@ -21,13 +21,15 @@
  * questions.
  */
 
+//
+// SunJSSE does not support dynamic system properties, no way to re-use
+// system properties in samevm/agentvm mode.
+//
+
 /*
  * @test
  * @bug 7174244
  * @summary NPE in Krb5ProxyImpl.getServerKeys()
- *
- *     SunJSSE does not support dynamic system properties, no way to re-use
- *     system properties in samevm/agentvm mode.
  * @run main/othervm CipherSuitesInOrder
  */
 
@@ -72,6 +74,22 @@ public class CipherSuitesInOrder {
         "SSL_RSA_WITH_RC4_128_SHA",
         "TLS_ECDH_ECDSA_WITH_RC4_128_SHA",
         "TLS_ECDH_RSA_WITH_RC4_128_SHA",
+
+        "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384",
+        "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256",
+        "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",
+        "TLS_RSA_WITH_AES_256_GCM_SHA384",
+        "TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384",
+        "TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384",
+        "TLS_DHE_RSA_WITH_AES_256_GCM_SHA384",
+        "TLS_DHE_DSS_WITH_AES_256_GCM_SHA384",
+        "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
+        "TLS_RSA_WITH_AES_128_GCM_SHA256",
+        "TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256",
+        "TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256",
+        "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256",
+        "TLS_DHE_DSS_WITH_AES_128_GCM_SHA256",
+
         "TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA",
         "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA",
         "SSL_RSA_WITH_3DES_EDE_CBC_SHA",
@@ -83,6 +101,9 @@ public class CipherSuitesInOrder {
 
         "TLS_EMPTY_RENEGOTIATION_INFO_SCSV",
 
+        "TLS_DH_anon_WITH_AES_256_GCM_SHA384",
+        "TLS_DH_anon_WITH_AES_128_GCM_SHA256",
+
         "TLS_DH_anon_WITH_AES_256_CBC_SHA256",
         "TLS_ECDH_anon_WITH_AES_256_CBC_SHA",
         "TLS_DH_anon_WITH_AES_256_CBC_SHA",
diff --git a/jdk/test/sun/security/ssl/sanity/interop/CipherTest.java b/jdk/test/sun/security/ssl/sanity/interop/CipherTest.java
index 9c5af7eda4a..106d4a75e53 100644
--- a/jdk/test/sun/security/ssl/sanity/interop/CipherTest.java
+++ b/jdk/test/sun/security/ssl/sanity/interop/CipherTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -148,6 +148,25 @@ public class CipherTest {
             CS_16("TLS_DH_anon_WITH_AES_128_CBC_SHA256",     0x0303, 0xFFFF),
             CS_17("TLS_RSA_WITH_NULL_SHA256",                0x0303, 0xFFFF),
 
+            CS_20("TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384", 0x0303, 0xFFFF),
+            CS_21("TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256", 0x0303, 0xFFFF),
+            CS_22("TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",   0x0303, 0xFFFF),
+            CS_23("TLS_RSA_WITH_AES_256_GCM_SHA384",         0x0303, 0xFFFF),
+            CS_24("TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384",  0x0303, 0xFFFF),
+            CS_25("TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384",    0x0303, 0xFFFF),
+            CS_26("TLS_DHE_RSA_WITH_AES_256_GCM_SHA384",     0x0303, 0xFFFF),
+            CS_27("TLS_DHE_DSS_WITH_AES_256_GCM_SHA384",     0x0303, 0xFFFF),
+
+            CS_28("TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",   0x0303, 0xFFFF),
+            CS_29("TLS_RSA_WITH_AES_128_GCM_SHA256",         0x0303, 0xFFFF),
+            CS_30("TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256",  0x0303, 0xFFFF),
+            CS_31("TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256",    0x0303, 0xFFFF),
+            CS_32("TLS_DHE_RSA_WITH_AES_128_GCM_SHA256",     0x0303, 0xFFFF),
+            CS_33("TLS_DHE_DSS_WITH_AES_128_GCM_SHA256",     0x0303, 0xFFFF),
+
+            CS_34("TLS_DH_anon_WITH_AES_256_GCM_SHA384",     0x0303, 0xFFFF),
+            CS_35("TLS_DH_anon_WITH_AES_128_GCM_SHA256",     0x0303, 0xFFFF),
+
             // cipher suites obsoleted since TLS 1.2
             CS_50("SSL_RSA_WITH_DES_CBC_SHA",                0x0000, 0x0303),
             CS_51("SSL_DHE_RSA_WITH_DES_CBC_SHA",            0x0000, 0x0303),
diff --git a/jdk/test/sun/security/ssl/templates/SSLSocketSSLEngineTemplate.java b/jdk/test/sun/security/ssl/templates/SSLSocketSSLEngineTemplate.java
index e31409a0f74..6bd63ae7104 100644
--- a/jdk/test/sun/security/ssl/templates/SSLSocketSSLEngineTemplate.java
+++ b/jdk/test/sun/security/ssl/templates/SSLSocketSSLEngineTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,14 +21,15 @@
  * questions.
  */
 
+//
+// SunJSSE does not support dynamic system properties, no way to re-use
+// system properties in samevm/agentvm mode.
+//
+
 /*
  * @test
  * @bug 7105780
  * @summary Add SSLSocket client/SSLEngine server to templates directory.
- *
- *     SunJSSE does not support dynamic system properties, no way to re-use
- *     system properties in samevm/agentvm mode.
- *
  * @run main/othervm SSLSocketSSLEngineTemplate
  */
 

From b6a841d5a330404bd1e34ff3efdf9797b66ccaba Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Fri, 1 Mar 2013 15:31:22 +0400
Subject: [PATCH 249/311] 7194902: [macosx]
 closed/java/awt/Button/DoubleActionEventTest/DoubleActionEventTest failed
 since jdk8b49 7181403: Invalid MouseEvent conversion with
 SwingUtilities.convertMouseEvent

Reviewed-by: malenkov, alexsch
---
 .../macosx/classes/sun/lwawt/LWComponentPeer.java   | 13 +++++++++----
 .../share/classes/javax/swing/SwingUtilities.java   |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/jdk/src/macosx/classes/sun/lwawt/LWComponentPeer.java b/jdk/src/macosx/classes/sun/lwawt/LWComponentPeer.java
index 301fbb476d8..052b91726b6 100644
--- a/jdk/src/macosx/classes/sun/lwawt/LWComponentPeer.java
+++ b/jdk/src/macosx/classes/sun/lwawt/LWComponentPeer.java
@@ -1227,10 +1227,10 @@ public abstract class LWComponentPeer<T extends Component, D extends JComponent>
     }
 
     protected void sendEventToDelegate(final AWTEvent e) {
+        if (getDelegate() == null || !isShowing() || !isEnabled()) {
+            return;
+        }
         synchronized (getDelegateLock()) {
-            if (getDelegate() == null || !isShowing() || !isEnabled()) {
-                return;
-            }
             AWTEvent delegateEvent = createDelegateEvent(e);
             if (delegateEvent != null) {
                 AWTAccessor.getComponentAccessor()
@@ -1244,7 +1244,12 @@ public abstract class LWComponentPeer<T extends Component, D extends JComponent>
         }
     }
 
-    protected AWTEvent createDelegateEvent(AWTEvent e) {
+    /**
+     * Changes the target of the AWTEvent from awt component to appropriate
+     * swing delegate.
+     */
+    private AWTEvent createDelegateEvent(final AWTEvent e) {
+        // TODO modifiers should be changed to getModifiers()|getModifiersEx()?
         AWTEvent delegateEvent = null;
         if (e instanceof MouseWheelEvent) {
             MouseWheelEvent me = (MouseWheelEvent) e;
diff --git a/jdk/src/share/classes/javax/swing/SwingUtilities.java b/jdk/src/share/classes/javax/swing/SwingUtilities.java
index 956bb838be7..6bb308d2f1e 100644
--- a/jdk/src/share/classes/javax/swing/SwingUtilities.java
+++ b/jdk/src/share/classes/javax/swing/SwingUtilities.java
@@ -356,7 +356,7 @@ public class SwingUtilities implements SwingConstants
                                       sourceEvent.getYOnScreen(),
                                       sourceEvent.getClickCount(),
                                       sourceEvent.isPopupTrigger(),
-                                      MouseEvent.NOBUTTON );
+                                      sourceEvent.getButton());
         }
         return newEvent;
     }

From 916da4ac2cb01f07f1f32d3977310bb917385464 Mon Sep 17 00:00:00 2001
From: Sergey Bylokhov <serb@openjdk.org>
Date: Fri, 1 Mar 2013 21:50:00 +0400
Subject: [PATCH 250/311] 7184945: [macosx] NPE in AquaComboBoxUI since
 jdk7u6b17, jdk8b47

Reviewed-by: malenkov, alexsch
---
 .../classes/com/apple/laf/AquaComboBoxUI.java | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaComboBoxUI.java b/jdk/src/macosx/classes/com/apple/laf/AquaComboBoxUI.java
index a4831d29ea9..8e8527f6541 100644
--- a/jdk/src/macosx/classes/com/apple/laf/AquaComboBoxUI.java
+++ b/jdk/src/macosx/classes/com/apple/laf/AquaComboBoxUI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,6 @@ import javax.swing.border.Border;
 import javax.swing.event.*;
 import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;
-import com.apple.laf.ClientPropertyApplicator;
 import com.apple.laf.ClientPropertyApplicator.Property;
 import apple.laf.JRSUIConstants.Size;
 
@@ -142,35 +141,46 @@ public class AquaComboBoxUI extends BasicComboBoxUI implements Sizeable {
         return new AquaComboBoxEditor();
     }
 
-    class AquaComboBoxEditor extends BasicComboBoxEditor implements UIResource, DocumentListener {
-        protected AquaComboBoxEditor() {
+    final class AquaComboBoxEditor extends BasicComboBoxEditor
+            implements UIResource, DocumentListener {
+
+        AquaComboBoxEditor() {
             super();
             editor = new AquaCustomComboTextField();
             editor.addFocusListener(this);
             editor.getDocument().addDocumentListener(this);
         }
 
+        @Override
         public void focusGained(final FocusEvent e) {
-            arrowButton.repaint();
+            if (arrowButton != null) {
+                arrowButton.repaint();
+            }
         }
 
+        @Override
         public void focusLost(final FocusEvent e) {
-            arrowButton.repaint();
+            if (arrowButton != null) {
+                arrowButton.repaint();
+            }
         }
 
+        @Override
         public void changedUpdate(final DocumentEvent e) {
             editorTextChanged();
         }
 
+        @Override
         public void insertUpdate(final DocumentEvent e) {
             editorTextChanged();
         }
 
+        @Override
         public void removeUpdate(final DocumentEvent e) {
             editorTextChanged();
         }
 
-        protected void editorTextChanged() {
+        private void editorTextChanged() {
             if (!popup.isVisible()) return;
 
             final Object text = editor.getText();

From 6cd495e473d8887edb1807fbd5b70442af66500a Mon Sep 17 00:00:00 2001
From: Sean Mullan <mullan@openjdk.org>
Date: Fri, 1 Mar 2013 16:12:50 -0500
Subject: [PATCH 251/311] 8008908: Access denied when invoking
 Subject.doAsPrivileged()

Wildcard principal names are not processed correctly

Reviewed-by: xuelei
---
 .../sun/security/provider/PolicyFile.java     | 22 ++++-
 .../PolicyFile/WildcardPrincipalName.java     | 94 +++++++++++++++++++
 .../provider/PolicyFile/wildcard.policy       |  7 ++
 3 files changed, 119 insertions(+), 4 deletions(-)
 create mode 100644 jdk/test/sun/security/provider/PolicyFile/WildcardPrincipalName.java
 create mode 100644 jdk/test/sun/security/provider/PolicyFile/wildcard.policy

diff --git a/jdk/src/share/classes/sun/security/provider/PolicyFile.java b/jdk/src/share/classes/sun/security/provider/PolicyFile.java
index 5ea389b51e9..f92e1d5905c 100644
--- a/jdk/src/share/classes/sun/security/provider/PolicyFile.java
+++ b/jdk/src/share/classes/sun/security/provider/PolicyFile.java
@@ -1336,10 +1336,9 @@ public class PolicyFile extends java.security.Policy {
 
             if (pppe.isWildcardName()) {
                 // a wildcard name matches any principal with the same class
-                for (Principal p : principals) {
-                    if (pppe.principalClass.equals(p.getClass().getName())) {
-                        continue;
-                    }
+                if (wildcardPrincipalNameImplies(pppe.principalClass,
+                                                 principals)) {
+                    continue;
                 }
                 if (debug != null) {
                     debug.println("evaluation (principal name wildcard) failed");
@@ -1414,6 +1413,21 @@ public class PolicyFile extends java.security.Policy {
         addPerms(perms, principals, entry);
     }
 
+    /**
+     * Returns true if the array of principals contains at least one
+     * principal of the specified class.
+     */
+    private static boolean wildcardPrincipalNameImplies(String principalClass,
+                                                        Principal[] principals)
+    {
+        for (Principal p : principals) {
+            if (principalClass.equals(p.getClass().getName())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     private void addPerms(Permissions perms,
                         Principal[] accPs,
                         PolicyEntry entry) {
diff --git a/jdk/test/sun/security/provider/PolicyFile/WildcardPrincipalName.java b/jdk/test/sun/security/provider/PolicyFile/WildcardPrincipalName.java
new file mode 100644
index 00000000000..d81149d036f
--- /dev/null
+++ b/jdk/test/sun/security/provider/PolicyFile/WildcardPrincipalName.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8008908
+ * @summary wildcard principal names are not processed correctly
+ * @run main/othervm/policy=wildcard.policy WildcardPrincipalName
+ */
+
+import java.security.AccessController;
+import java.security.Permission;
+import java.security.Principal;
+import java.security.PrivilegedAction;
+import java.util.HashSet;
+import java.util.PropertyPermission;
+import java.util.Set;
+import javax.security.auth.Subject;
+import javax.security.auth.x500.X500Principal;
+
+public class WildcardPrincipalName {
+
+    public static void main(String[] args) throws Exception {
+
+        X500Principal duke = new X500Principal("CN=Duke");
+        PropertyPermission pp = new PropertyPermission("user.home", "read");
+        RunAsPrivilegedUserAction runAsPrivilegedUserAction
+            = new RunAsPrivilegedUserAction(duke,
+                                            new CheckPermissionAction(pp));
+        AccessController.doPrivileged(runAsPrivilegedUserAction);
+        System.out.println("test PASSED");
+    }
+
+    private static class RunAsPrivilegedUserAction
+        implements PrivilegedAction<Void> {
+        private final PrivilegedAction<Void> action;
+        private final Principal principal;
+
+        RunAsPrivilegedUserAction(Principal principal,
+                                  PrivilegedAction<Void> action) {
+            this.principal = principal;
+            this.action = action;
+        }
+
+        @Override public Void run() {
+            Set<Principal> principals = new HashSet<>();
+            Set<Object> publicCredentials = new HashSet<>();
+            Set<Object> privateCredentials = new HashSet<>();
+
+            principals.add(principal);
+            Subject subject = new Subject(true,
+                                          principals,
+                                          publicCredentials,
+                                          privateCredentials);
+
+            Subject.doAsPrivileged(subject, action, null);
+            return null;
+        }
+    }
+
+    private static class CheckPermissionAction
+        implements PrivilegedAction<Void> {
+        private final Permission permission;
+
+        CheckPermissionAction(Permission permission) {
+            this.permission = permission;
+        }
+
+        @Override public Void run() {
+            AccessController.checkPermission(permission);
+            return null;
+        }
+    }
+}
diff --git a/jdk/test/sun/security/provider/PolicyFile/wildcard.policy b/jdk/test/sun/security/provider/PolicyFile/wildcard.policy
new file mode 100644
index 00000000000..55e942db37a
--- /dev/null
+++ b/jdk/test/sun/security/provider/PolicyFile/wildcard.policy
@@ -0,0 +1,7 @@
+grant principal javax.security.auth.x500.X500Principal * {
+  permission java.util.PropertyPermission "user.home", "read";
+};
+
+grant {
+  permission javax.security.auth.AuthPermission "doAsPrivileged";
+};

From 4994fe08404c0d0b72fd718677e480eb76f9b527 Mon Sep 17 00:00:00 2001
From: Dan Xu <dxu@openjdk.org>
Date: Fri, 1 Mar 2013 14:12:59 -0800
Subject: [PATCH 252/311] 8006645: TEST_BUG:
 java/nio/file/Files/CopyAndMove.java failing intermittently (sol)

Fix test failures and update java doc of Files.move

Reviewed-by: alanb, chegar
---
 .../share/classes/java/nio/file/Files.java    | 35 ++++++++++---------
 jdk/test/java/nio/file/Files/CopyAndMove.java |  9 ++---
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/jdk/src/share/classes/java/nio/file/Files.java b/jdk/src/share/classes/java/nio/file/Files.java
index c1c85b521e0..2db7ba25c4a 100644
--- a/jdk/src/share/classes/java/nio/file/Files.java
+++ b/jdk/src/share/classes/java/nio/file/Files.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1152,7 +1152,7 @@ public final class Files {
      *     and file system dependent and therefore unspecified. Minimally, the
      *     {@link BasicFileAttributes#lastModifiedTime last-modified-time} is
      *     copied to the target file if supported by both the source and target
-     *     file store. Copying of file timestamps may result in precision
+     *     file stores. Copying of file timestamps may result in precision
      *     loss. </td>
      * </tr>
      * <tr>
@@ -1169,12 +1169,12 @@ public final class Files {
      * implementation specific options.
      *
      * <p> Copying a file is not an atomic operation. If an {@link IOException}
-     * is thrown then it possible that the target file is incomplete or some of
-     * its file attributes have not been copied from the source file. When the
-     * {@code REPLACE_EXISTING} option is specified and the target file exists,
-     * then the target file is replaced. The check for the existence of the file
-     * and the creation of the new file may not be atomic with respect to other
-     * file system activities.
+     * is thrown, then it is possible that the target file is incomplete or some
+     * of its file attributes have not been copied from the source file. When
+     * the {@code REPLACE_EXISTING} option is specified and the target file
+     * exists, then the target file is replaced. The check for the existence of
+     * the file and the creation of the new file may not be atomic with respect
+     * to other file system activities.
      *
      * <p> <b>Usage Example:</b>
      * Suppose we want to copy a file into a directory, giving it the same file
@@ -1279,15 +1279,16 @@ public final class Files {
      * <p> An implementation of this interface may support additional
      * implementation specific options.
      *
-     * <p> Where the move requires that the file be copied then the {@link
-     * BasicFileAttributes#lastModifiedTime last-modified-time} is copied to the
-     * new file. An implementation may also attempt to copy other file
-     * attributes but is not required to fail if the file attributes cannot be
-     * copied. When the move is performed as a non-atomic operation, and a {@code
-     * IOException} is thrown, then the state of the files is not defined. The
-     * original file and the target file may both exist, the target file may be
-     * incomplete or some of its file attributes may not been copied from the
-     * original file.
+     * <p> Moving a file will copy the {@link
+     * BasicFileAttributes#lastModifiedTime last-modified-time} to the target
+     * file if supported by both source and target file stores. Copying of file
+     * timestamps may result in precision loss. An implementation may also
+     * attempt to copy other file attributes but is not required to fail if the
+     * file attributes cannot be copied. When the move is performed as
+     * a non-atomic operation, and an {@code IOException} is thrown, then the
+     * state of the files is not defined. The original file and the target file
+     * may both exist, the target file may be incomplete or some of its file
+     * attributes may not been copied from the original file.
      *
      * <p> <b>Usage Examples:</b>
      * Suppose we want to rename a file to "newname", keeping the file in the
diff --git a/jdk/test/java/nio/file/Files/CopyAndMove.java b/jdk/test/java/nio/file/Files/CopyAndMove.java
index 48ecb0dfcbc..4853b0dcdf4 100644
--- a/jdk/test/java/nio/file/Files/CopyAndMove.java
+++ b/jdk/test/java/nio/file/Files/CopyAndMove.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,7 @@
  */
 
 /* @test
- * @bug 4313887 6838333 6917021 7006126 6950237
+ * @bug 4313887 6838333 6917021 7006126 6950237 8006645
  * @summary Unit test for java.nio.file.Files copy and move methods
  * @library ..
  * @build CopyAndMove PassThroughFileSystem
@@ -37,6 +37,7 @@ import static java.nio.file.LinkOption.*;
 import java.nio.file.attribute.*;
 import java.io.*;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 
 public class CopyAndMove {
     static final Random rand = new Random();
@@ -94,8 +95,8 @@ public class CopyAndMove {
 
         // check last modified time if not a symbolic link
         if (!attrs1.isSymbolicLink()) {
-            long time1 = attrs1.lastModifiedTime().toMillis();
-            long time2 = attrs2.lastModifiedTime().toMillis();
+            long time1 = attrs1.lastModifiedTime().to(TimeUnit.SECONDS);
+            long time2 = attrs2.lastModifiedTime().to(TimeUnit.SECONDS);
 
             if (time1 != time2) {
                 System.err.format("File time for %s is %s\n", attrs1.fileKey(), attrs1.lastModifiedTime());

From 3a216a7fdcb0417556d0d39885692e6d0821626c Mon Sep 17 00:00:00 2001
From: Chris Hegarty <chegar@openjdk.org>
Date: Sat, 2 Mar 2013 08:54:37 +0000
Subject: [PATCH 253/311] 8008378: FJP.commonPool support parallelism 0, add
 awaitQuiescence

Co-authored-by: Doug Lea <dl@cs.oswego.edu>
Reviewed-by: chegar
---
 .../java/util/concurrent/ForkJoinPool.java    | 686 +++++++++---------
 .../java/util/concurrent/ForkJoinTask.java    |  40 +-
 .../concurrent/forkjoin/ThreadLessCommon.java | 135 ++++
 .../concurrent/forkjoin/ThrowingRunnable.java |  85 +++
 4 files changed, 602 insertions(+), 344 deletions(-)
 create mode 100644 jdk/test/java/util/concurrent/forkjoin/ThreadLessCommon.java
 create mode 100644 jdk/test/java/util/concurrent/forkjoin/ThrowingRunnable.java

diff --git a/jdk/src/share/classes/java/util/concurrent/ForkJoinPool.java b/jdk/src/share/classes/java/util/concurrent/ForkJoinPool.java
index 86bb3b59ebc..0bb27589e60 100644
--- a/jdk/src/share/classes/java/util/concurrent/ForkJoinPool.java
+++ b/jdk/src/share/classes/java/util/concurrent/ForkJoinPool.java
@@ -35,6 +35,7 @@
 
 package java.util.concurrent;
 
+import java.lang.Thread.UncaughtExceptionHandler;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -104,38 +105,45 @@ import java.util.concurrent.TimeUnit;
  * there is little difference among choice of methods.
  *
  * <table BORDER CELLPADDING=3 CELLSPACING=1>
+ * <caption>Summary of task execution methods</caption>
  *  <tr>
  *    <td></td>
  *    <td ALIGN=CENTER> <b>Call from non-fork/join clients</b></td>
  *    <td ALIGN=CENTER> <b>Call from within fork/join computations</b></td>
  *  </tr>
  *  <tr>
- *    <td> <b>Arrange async execution</td>
+ *    <td> <b>Arrange async execution</b></td>
  *    <td> {@link #execute(ForkJoinTask)}</td>
  *    <td> {@link ForkJoinTask#fork}</td>
  *  </tr>
  *  <tr>
- *    <td> <b>Await and obtain result</td>
+ *    <td> <b>Await and obtain result</b></td>
  *    <td> {@link #invoke(ForkJoinTask)}</td>
  *    <td> {@link ForkJoinTask#invoke}</td>
  *  </tr>
  *  <tr>
- *    <td> <b>Arrange exec and obtain Future</td>
+ *    <td> <b>Arrange exec and obtain Future</b></td>
  *    <td> {@link #submit(ForkJoinTask)}</td>
  *    <td> {@link ForkJoinTask#fork} (ForkJoinTasks <em>are</em> Futures)</td>
  *  </tr>
  * </table>
  *
  * <p>The common pool is by default constructed with default
- * parameters, but these may be controlled by setting three {@link
- * System#getProperty system properties} with prefix {@code
- * java.util.concurrent.ForkJoinPool.common}: {@code parallelism} --
- * an integer greater than zero, {@code threadFactory} -- the class
- * name of a {@link ForkJoinWorkerThreadFactory}, and {@code
- * exceptionHandler} -- the class name of a {@link
- * java.lang.Thread.UncaughtExceptionHandler
- * Thread.UncaughtExceptionHandler}. Upon any error in establishing
- * these settings, default parameters are used.
+ * parameters, but these may be controlled by setting three
+ * {@linkplain System#getProperty system properties}:
+ * <ul>
+ * <li>{@code java.util.concurrent.ForkJoinPool.common.parallelism}
+ * - the parallelism level, a non-negative integer
+ * <li>{@code java.util.concurrent.ForkJoinPool.common.threadFactory}
+ * - the class name of a {@link ForkJoinWorkerThreadFactory}
+ * <li>{@code java.util.concurrent.ForkJoinPool.common.exceptionHandler}
+ * - the class name of a {@link UncaughtExceptionHandler}
+ * </ul>
+ * The system class loader is used to load these classes.
+ * Upon any error in establishing these settings, default parameters
+ * are used. It is possible to disable or limit the use of threads in
+ * the common pool by setting the parallelism property to zero, and/or
+ * using a factory that may return {@code null}.
  *
  * <p><b>Implementation notes</b>: This implementation restricts the
  * maximum number of running threads to 32767. Attempts to create
@@ -225,18 +233,18 @@ public class ForkJoinPool extends AbstractExecutorService {
      * for work-stealing (this would contaminate lifo/fifo
      * processing). Instead, we randomly associate submission queues
      * with submitting threads, using a form of hashing.  The
-     * ThreadLocal Submitter class contains a value initially used as
-     * a hash code for choosing existing queues, but may be randomly
-     * repositioned upon contention with other submitters.  In
-     * essence, submitters act like workers except that they are
-     * restricted to executing local tasks that they submitted (or in
-     * the case of CountedCompleters, others with the same root task).
-     * However, because most shared/external queue operations are more
-     * expensive than internal, and because, at steady state, external
-     * submitters will compete for CPU with workers, ForkJoinTask.join
-     * and related methods disable them from repeatedly helping to
-     * process tasks if all workers are active.  Insertion of tasks in
-     * shared mode requires a lock (mainly to protect in the case of
+     * ThreadLocalRandom probe value serves as a hash code for
+     * choosing existing queues, and may be randomly repositioned upon
+     * contention with other submitters.  In essence, submitters act
+     * like workers except that they are restricted to executing local
+     * tasks that they submitted (or in the case of CountedCompleters,
+     * others with the same root task).  However, because most
+     * shared/external queue operations are more expensive than
+     * internal, and because, at steady state, external submitters
+     * will compete for CPU with workers, ForkJoinTask.join and
+     * related methods disable them from repeatedly helping to process
+     * tasks if all workers are active.  Insertion of tasks in shared
+     * mode requires a lock (mainly to protect in the case of
      * resizing) but we use only a simple spinlock (using bits in
      * field qlock), because submitters encountering a busy queue move
      * on to try or create other queues -- they block only when
@@ -469,7 +477,7 @@ public class ForkJoinPool extends AbstractExecutorService {
      * Common Pool
      * ===========
      *
-     * The static commonPool always exists after static
+     * The static common Pool always exists after static
      * initialization.  Since it (or any other created pool) need
      * never be used, we minimize initial construction overhead and
      * footprint to the setup of about a dozen fields, with no nested
@@ -548,6 +556,7 @@ public class ForkJoinPool extends AbstractExecutorService {
          *
          * @param pool the pool this thread works in
          * @throws NullPointerException if the pool is null
+         * @return the new worker thread
          */
         public ForkJoinWorkerThread newThread(ForkJoinPool pool);
     }
@@ -563,26 +572,6 @@ public class ForkJoinPool extends AbstractExecutorService {
         }
     }
 
-    /**
-     * Per-thread records for threads that submit to pools. Currently
-     * holds only pseudo-random seed / index that is used to choose
-     * submission queues in method externalPush. In the future, this may
-     * also incorporate a means to implement different task rejection
-     * and resubmission policies.
-     *
-     * Seeds for submitters and workers/workQueues work in basically
-     * the same way but are initialized and updated using slightly
-     * different mechanics. Both are initialized using the same
-     * approach as in class ThreadLocal, where successive values are
-     * unlikely to collide with previous values. Seeds are then
-     * randomly modified upon collisions using xorshifts, which
-     * requires a non-zero seed.
-     */
-    static final class Submitter {
-        int seed;
-        Submitter(int s) { seed = s; }
-    }
-
     /**
      * Class for artificial tasks that are used to replace the target
      * of local joins if they are removed from an interior queue slot
@@ -737,7 +726,7 @@ public class ForkJoinPool extends AbstractExecutorService {
          * shared-queue version is embedded in method externalPush.)
          *
          * @param task the task. Caller must ensure non-null.
-         * @throw RejectedExecutionException if array cannot be resized
+         * @throws RejectedExecutionException if array cannot be resized
          */
         final void push(ForkJoinTask<?> task) {
             ForkJoinTask<?>[] a; ForkJoinPool p;
@@ -936,7 +925,7 @@ public class ForkJoinPool extends AbstractExecutorService {
          * or any other cancelled task. Returns (true) on any CAS
          * or consistency check failure so caller can retry.
          *
-         * @return false if no progress can be made, else true;
+         * @return false if no progress can be made, else true
          */
         final boolean tryRemoveAndExec(ForkJoinTask<?> task) {
             boolean stat = true, removed = false, empty = true;
@@ -981,7 +970,7 @@ public class ForkJoinPool extends AbstractExecutorService {
 
         /**
          * Polls for and executes the given task or any other task in
-         * its CountedCompleter computation
+         * its CountedCompleter computation.
          */
         final boolean pollAndExecCC(ForkJoinTask<?> root) {
             ForkJoinTask<?>[] a; int b; Object o;
@@ -1055,7 +1044,6 @@ public class ForkJoinPool extends AbstractExecutorService {
         private static final int ABASE;
         private static final int ASHIFT;
         static {
-            int s;
             try {
                 U = sun.misc.Unsafe.getUnsafe();
                 Class<?> k = WorkQueue.class;
@@ -1063,13 +1051,13 @@ public class ForkJoinPool extends AbstractExecutorService {
                 QLOCK = U.objectFieldOffset
                     (k.getDeclaredField("qlock"));
                 ABASE = U.arrayBaseOffset(ak);
-                s = U.arrayIndexScale(ak);
+                int scale = U.arrayIndexScale(ak);
+                if ((scale & (scale - 1)) != 0)
+                    throw new Error("data type scale not a power of two");
+                ASHIFT = 31 - Integer.numberOfLeadingZeros(scale);
             } catch (Exception e) {
                 throw new Error(e);
             }
-            if ((s & (s-1)) != 0)
-                throw new Error("data type scale not a power of two");
-            ASHIFT = 31 - Integer.numberOfLeadingZeros(s);
         }
     }
 
@@ -1082,15 +1070,6 @@ public class ForkJoinPool extends AbstractExecutorService {
     public static final ForkJoinWorkerThreadFactory
         defaultForkJoinWorkerThreadFactory;
 
-    /**
-     * Per-thread submission bookkeeping. Shared across all pools
-     * to reduce ThreadLocal pollution and because random motion
-     * to avoid contention in one pool is likely to hold for others.
-     * Lazily initialized on first submission (but null-checked
-     * in other contexts to avoid unnecessary initialization).
-     */
-    static final ThreadLocal<Submitter> submitters;
-
     /**
      * Permission required for callers of methods that may start or
      * kill threads.
@@ -1103,12 +1082,15 @@ public class ForkJoinPool extends AbstractExecutorService {
      * to paranoically avoid potential initialization circularities
      * as well as to simplify generated code.
      */
-    static final ForkJoinPool commonPool;
+    static final ForkJoinPool common;
 
     /**
-     * Common pool parallelism. Must equal commonPool.parallelism.
+     * Common pool parallelism. To allow simpler use and management
+     * when common pool threads are disabled, we allow the underlying
+     * common.config field to be zero, but in that case still report
+     * parallelism as 1 to reflect resulting caller-runs mechanics.
      */
-    static final int commonPoolParallelism;
+    static final int commonParallelism;
 
     /**
      * Sequence number for creating workerNamePrefix.
@@ -1116,8 +1098,8 @@ public class ForkJoinPool extends AbstractExecutorService {
     private static int poolNumberSequence;
 
     /**
-     * Return the next sequence number. We don't expect this to
-     * ever contend so use simple builtin sync.
+     * Returns the next sequence number. We don't expect this to
+     * ever contend, so use simple builtin sync.
      */
     private static final synchronized int nextPoolId() {
         return ++poolNumberSequence;
@@ -1161,7 +1143,7 @@ public class ForkJoinPool extends AbstractExecutorService {
      */
     private static final int SEED_INCREMENT = 0x61c88647;
 
-    /**
+    /*
      * Bits and masks for control variables
      *
      * Field ctl is a long packed with:
@@ -1268,39 +1250,28 @@ public class ForkJoinPool extends AbstractExecutorService {
     final int config;                          // mode and parallelism level
     WorkQueue[] workQueues;                    // main registry
     final ForkJoinWorkerThreadFactory factory;
-    final Thread.UncaughtExceptionHandler ueh; // per-worker UEH
+    final UncaughtExceptionHandler ueh;        // per-worker UEH
     final String workerNamePrefix;             // to create worker name string
 
     volatile Object pad10, pad11, pad12, pad13, pad14, pad15, pad16, pad17;
     volatile Object pad18, pad19, pad1a, pad1b;
 
-    /*
+    /**
      * Acquires the plock lock to protect worker array and related
      * updates. This method is called only if an initial CAS on plock
-     * fails. This acts as a spinLock for normal cases, but falls back
+     * fails. This acts as a spinlock for normal cases, but falls back
      * to builtin monitor to block when (rarely) needed. This would be
      * a terrible idea for a highly contended lock, but works fine as
      * a more conservative alternative to a pure spinlock.
      */
     private int acquirePlock() {
-        int spins = PL_SPINS, r = 0, ps, nps;
+        int spins = PL_SPINS, ps, nps;
         for (;;) {
             if (((ps = plock) & PL_LOCK) == 0 &&
                 U.compareAndSwapInt(this, PLOCK, ps, nps = ps + PL_LOCK))
                 return nps;
-            else if (r == 0) { // randomize spins if possible
-                Thread t = Thread.currentThread(); WorkQueue w; Submitter z;
-                if ((t instanceof ForkJoinWorkerThread) &&
-                    (w = ((ForkJoinWorkerThread)t).workQueue) != null)
-                    r = w.seed;
-                else if ((z = submitters.get()) != null)
-                    r = z.seed;
-                else
-                    r = 1;
-            }
             else if (spins >= 0) {
-                r ^= r << 1; r ^= r >>> 3; r ^= r << 10; // xorshift
-                if (r >= 0)
+                if (ThreadLocalRandom.nextSecondarySeed() >= 0)
                     --spins;
             }
             else if (U.compareAndSwapInt(this, PLOCK, ps, ps | PL_SIGNAL)) {
@@ -1331,39 +1302,6 @@ public class ForkJoinPool extends AbstractExecutorService {
         synchronized (this) { notifyAll(); }
     }
 
-    /**
-     * Performs secondary initialization, called when plock is zero.
-     * Creates workQueue array and sets plock to a valid value.  The
-     * lock body must be exception-free (so no try/finally) so we
-     * optimistically allocate new array outside the lock and throw
-     * away if (very rarely) not needed. (A similar tactic is used in
-     * fullExternalPush.)  Because the plock seq value can eventually
-     * wrap around zero, this method harmlessly fails to reinitialize
-     * if workQueues exists, while still advancing plock.
-     *
-     * Additionally tries to create the first worker.
-     */
-    private void initWorkers() {
-        WorkQueue[] ws, nws; int ps;
-        int p = config & SMASK;        // find power of two table size
-        int n = (p > 1) ? p - 1 : 1;   // ensure at least 2 slots
-        n |= n >>> 1; n |= n >>> 2; n |= n >>> 4; n |= n >>> 8; n |= n >>> 16;
-        n = (n + 1) << 1;
-        if ((ws = workQueues) == null || ws.length == 0)
-            nws = new WorkQueue[n];
-        else
-            nws = null;
-        if (((ps = plock) & PL_LOCK) != 0 ||
-            !U.compareAndSwapInt(this, PLOCK, ps, ps += PL_LOCK))
-            ps = acquirePlock();
-        if (((ws = workQueues) == null || ws.length == 0) && nws != null)
-            workQueues = nws;
-        int nps = (ps & SHUTDOWN) | ((ps + PL_LOCK) & ~SHUTDOWN);
-        if (!U.compareAndSwapInt(this, PLOCK, ps, nps))
-            releasePlock(nps);
-        tryAddWorker();
-    }
-
     /**
      * Tries to create and start one worker if fewer than target
      * parallelism level exist. Adjusts counts etc on failure.
@@ -1406,7 +1344,7 @@ public class ForkJoinPool extends AbstractExecutorService {
      * @return the worker's queue
      */
     final WorkQueue registerWorker(ForkJoinWorkerThread wt) {
-        Thread.UncaughtExceptionHandler handler; WorkQueue[] ws; int s, ps;
+        UncaughtExceptionHandler handler; WorkQueue[] ws; int s, ps;
         wt.setDaemon(true);
         if ((handler = ueh) != null)
             wt.setUncaughtExceptionHandler(handler);
@@ -1450,7 +1388,7 @@ public class ForkJoinPool extends AbstractExecutorService {
      * array, and adjusts counts. If pool is shutting down, tries to
      * complete termination.
      *
-     * @param wt the worker thread or null if construction failed
+     * @param wt the worker thread, or null if construction failed
      * @param ex the exception causing failure, or null if none
      */
     final void deregisterWorker(ForkJoinWorkerThread wt, Throwable ex) {
@@ -1489,7 +1427,7 @@ public class ForkJoinPool extends AbstractExecutorService {
                 if (e > 0) {             // activate or create replacement
                     if ((ws = workQueues) == null ||
                         (i = e & SMASK) >= ws.length ||
-                        (v = ws[i]) != null)
+                        (v = ws[i]) == null)
                         break;
                     long nc = (((long)(v.nextWait & E_MASK)) |
                                ((long)(u + UAC_UNIT) << 32));
@@ -1526,10 +1464,10 @@ public class ForkJoinPool extends AbstractExecutorService {
      * @param task the task. Caller must ensure non-null.
      */
     final void externalPush(ForkJoinTask<?> task) {
-        WorkQueue[] ws; WorkQueue q; Submitter z; int m; ForkJoinTask<?>[] a;
-        if ((z = submitters.get()) != null && plock > 0 &&
+        WorkQueue[] ws; WorkQueue q; int z, m; ForkJoinTask<?>[] a;
+        if ((z = ThreadLocalRandom.getProbe()) != 0 && plock > 0 &&
             (ws = workQueues) != null && (m = (ws.length - 1)) >= 0 &&
-            (q = ws[m & z.seed & SQMASK]) != null &&
+            (q = ws[m & z & SQMASK]) != null &&
             U.compareAndSwapInt(q, QLOCK, 0, 1)) { // lock
             int b = q.base, s = q.top, n, an;
             if ((a = q.array) != null && (an = a.length) > (n = s + 1 - b)) {
@@ -1549,34 +1487,48 @@ public class ForkJoinPool extends AbstractExecutorService {
     /**
      * Full version of externalPush. This method is called, among
      * other times, upon the first submission of the first task to the
-     * pool, so must perform secondary initialization (via
-     * initWorkers). It also detects first submission by an external
-     * thread by looking up its ThreadLocal, and creates a new shared
-     * queue if the one at index if empty or contended. The plock lock
-     * body must be exception-free (so no try/finally) so we
-     * optimistically allocate new queues outside the lock and throw
-     * them away if (very rarely) not needed.
+     * pool, so must perform secondary initialization.  It also
+     * detects first submission by an external thread by looking up
+     * its ThreadLocal, and creates a new shared queue if the one at
+     * index if empty or contended. The plock lock body must be
+     * exception-free (so no try/finally) so we optimistically
+     * allocate new queues outside the lock and throw them away if
+     * (very rarely) not needed.
+     *
+     * Secondary initialization occurs when plock is zero, to create
+     * workQueue array and set plock to a valid value.  This lock body
+     * must also be exception-free. Because the plock seq value can
+     * eventually wrap around zero, this method harmlessly fails to
+     * reinitialize if workQueues exists, while still advancing plock.
      */
     private void fullExternalPush(ForkJoinTask<?> task) {
-        int r = 0; // random index seed
-        for (Submitter z = submitters.get();;) {
+        int r;
+        if ((r = ThreadLocalRandom.getProbe()) == 0) {
+            ThreadLocalRandom.localInit();
+            r = ThreadLocalRandom.getProbe();
+        }
+        for (;;) {
             WorkQueue[] ws; WorkQueue q; int ps, m, k;
-            if (z == null) {
-                if (U.compareAndSwapInt(this, INDEXSEED, r = indexSeed,
-                                        r += SEED_INCREMENT) && r != 0)
-                    submitters.set(z = new Submitter(r));
-            }
-            else if (r == 0) {               // move to a different index
-                r = z.seed;
-                r ^= r << 13;                // same xorshift as WorkQueues
-                r ^= r >>> 17;
-                z.seed = r ^ (r << 5);
-            }
-            else if ((ps = plock) < 0)
+            boolean move = false;
+            if ((ps = plock) < 0)
                 throw new RejectedExecutionException();
             else if (ps == 0 || (ws = workQueues) == null ||
-                     (m = ws.length - 1) < 0)
-                initWorkers();
+                     (m = ws.length - 1) < 0) { // initialize workQueues
+                int p = config & SMASK;         // find power of two table size
+                int n = (p > 1) ? p - 1 : 1;    // ensure at least 2 slots
+                n |= n >>> 1; n |= n >>> 2;  n |= n >>> 4;
+                n |= n >>> 8; n |= n >>> 16; n = (n + 1) << 1;
+                WorkQueue[] nws = ((ws = workQueues) == null || ws.length == 0 ?
+                                   new WorkQueue[n] : null);
+                if (((ps = plock) & PL_LOCK) != 0 ||
+                    !U.compareAndSwapInt(this, PLOCK, ps, ps += PL_LOCK))
+                    ps = acquirePlock();
+                if (((ws = workQueues) == null || ws.length == 0) && nws != null)
+                    workQueues = nws;
+                int nps = (ps & SHUTDOWN) | ((ps + PL_LOCK) & ~SHUTDOWN);
+                if (!U.compareAndSwapInt(this, PLOCK, ps, nps))
+                    releasePlock(nps);
+            }
             else if ((q = ws[k = r & m & SQMASK]) != null) {
                 if (q.qlock == 0 && U.compareAndSwapInt(q, QLOCK, 0, 1)) {
                     ForkJoinTask<?>[] a = q.array;
@@ -1598,7 +1550,7 @@ public class ForkJoinPool extends AbstractExecutorService {
                         return;
                     }
                 }
-                r = 0; // move on failure
+                move = true; // move on failure
             }
             else if (((ps = plock) & PL_LOCK) == 0) { // create new queue
                 q = new WorkQueue(this, null, SHARED_QUEUE, r);
@@ -1612,7 +1564,9 @@ public class ForkJoinPool extends AbstractExecutorService {
                     releasePlock(nps);
             }
             else
-                r = 0; // try elsewhere while lock held
+                move = true; // move if busy
+            if (move)
+                r = ThreadLocalRandom.advanceProbe(r);
         }
     }
 
@@ -1703,7 +1657,7 @@ public class ForkJoinPool extends AbstractExecutorService {
      * park awaiting signal, else lingering to help scan and signal.
      *
      * * If a non-empty queue discovered or left as a hint,
-     * help wake up other workers before return
+     * help wake up other workers before return.
      *
      * @param w the worker (via its WorkQueue)
      * @return a task or null if none found
@@ -1758,14 +1712,13 @@ public class ForkJoinPool extends AbstractExecutorService {
                         else if ((int)(c >> AC_SHIFT) == 1 - (config & SMASK))
                             idleAwaitWork(w, nc, c);
                     }
-                    else if (w.eventCount < 0 && !tryTerminate(false, false) &&
-                             ctl == c) {         // block
+                    else if (w.eventCount < 0 && ctl == c) {
                         Thread wt = Thread.currentThread();
                         Thread.interrupted();    // clear status
                         U.putObject(wt, PARKBLOCKER, this);
                         w.parker = wt;           // emulate LockSupport.park
                         if (w.eventCount < 0)    // recheck
-                            U.park(false, 0L);
+                            U.park(false, 0L);   // block
                         w.parker = null;
                         U.putObject(wt, PARKBLOCKER, null);
                     }
@@ -1774,7 +1727,7 @@ public class ForkJoinPool extends AbstractExecutorService {
                     (ws = workQueues) != null && h < ws.length &&
                     (q = ws[h]) != null) {      // signal others before retry
                     WorkQueue v; Thread p; int u, i, s;
-                    for (int n = (config & SMASK) >>> 1;;) {
+                    for (int n = (config & SMASK) - 1;;) {
                         int idleCount = (w.eventCount < 0) ? 0 : -1;
                         if (((s = idleCount - q.base + q.top) <= n &&
                              (n = s) <= 0) ||
@@ -1814,7 +1767,8 @@ public class ForkJoinPool extends AbstractExecutorService {
      */
     private void idleAwaitWork(WorkQueue w, long currentCtl, long prevCtl) {
         if (w != null && w.eventCount < 0 &&
-            !tryTerminate(false, false) && (int)prevCtl != 0) {
+            !tryTerminate(false, false) && (int)prevCtl != 0 &&
+            ctl == currentCtl) {
             int dc = -(short)(currentCtl >>> TC_SHIFT);
             long parkTime = dc < 0 ? FAST_IDLE_TIMEOUT: (dc + 1) * IDLE_TIMEOUT;
             long deadline = System.nanoTime() + parkTime - TIMEOUT_SLOP;
@@ -1832,6 +1786,7 @@ public class ForkJoinPool extends AbstractExecutorService {
                 if (deadline - System.nanoTime() <= 0L &&
                     U.compareAndSwapLong(this, CTL, currentCtl, prevCtl)) {
                     w.eventCount = (w.eventCount + E_SEQ) | E_MASK;
+                    w.hint = -1;
                     w.qlock = -1;   // shrink
                     break;
                 }
@@ -1973,7 +1928,6 @@ public class ForkJoinPool extends AbstractExecutorService {
      * @param task the task to join
      * @param mode if shared, exit upon completing any task
      * if all workers are active
-     *
      */
     private int helpComplete(ForkJoinTask<?> task, int mode) {
         WorkQueue[] ws; WorkQueue q; int m, n, s, u;
@@ -2125,29 +2079,22 @@ public class ForkJoinPool extends AbstractExecutorService {
 
     /**
      * Returns a (probably) non-empty steal queue, if one is found
-     * during a random, then cyclic scan, else null.  This method must
-     * be retried by caller if, by the time it tries to use the queue,
-     * it is empty.
+     * during a scan, else null.  This method must be retried by
+     * caller if, by the time it tries to use the queue, it is empty.
      * @param r a (random) seed for scanning
      */
     private WorkQueue findNonEmptyStealQueue(int r) {
-        for (WorkQueue[] ws;;) {
-            int ps = plock, m, n;
-            if ((ws = workQueues) == null || (m = ws.length - 1) < 1)
-                return null;
-            for (int j = (m + 1) << 2; ;) {
-                WorkQueue q = ws[(((r + j) << 1) | 1) & m];
-                if (q != null && (n = q.base - q.top) < 0) {
-                    if (n < -1)
-                        signalWork(q);
-                    return q;
-                }
-                else if (--j < 0) {
-                    if (plock == ps)
-                        return null;
-                    break;
+        for (;;) {
+            int ps = plock, m; WorkQueue[] ws; WorkQueue q;
+            if ((ws = workQueues) != null && (m = ws.length - 1) >= 0) {
+                for (int j = (m + 1) << 2; j >= 0; --j) {
+                    if ((q = ws[(((r + j) << 1) | 1) & m]) != null &&
+                        q.base - q.top < 0)
+                        return q;
                 }
             }
+            if (plock == ps)
+                return null;
         }
     }
 
@@ -2159,37 +2106,34 @@ public class ForkJoinPool extends AbstractExecutorService {
      */
     final void helpQuiescePool(WorkQueue w) {
         for (boolean active = true;;) {
-            ForkJoinTask<?> localTask; // exhaust local queue
-            while ((localTask = w.nextLocalTask()) != null)
-                localTask.doExec();
-            // Similar to loop in scan(), but ignoring submissions
-            WorkQueue q = findNonEmptyStealQueue(w.nextSeed());
-            if (q != null) {
-                ForkJoinTask<?> t; int b;
+            long c; WorkQueue q; ForkJoinTask<?> t; int b;
+            while ((t = w.nextLocalTask()) != null) {
+                if (w.base - w.top < 0)
+                    signalWork(w);
+                t.doExec();
+            }
+            if ((q = findNonEmptyStealQueue(w.nextSeed())) != null) {
                 if (!active) {      // re-establish active count
-                    long c;
                     active = true;
                     do {} while (!U.compareAndSwapLong
                                  (this, CTL, c = ctl, c + AC_UNIT));
                 }
-                if ((b = q.base) - q.top < 0 && (t = q.pollAt(b)) != null)
+                if ((b = q.base) - q.top < 0 && (t = q.pollAt(b)) != null) {
+                    if (q.base - q.top < 0)
+                        signalWork(q);
                     w.runSubtask(t);
+                }
             }
-            else {
-                long c;
-                if (active) {       // decrement active count without queuing
+            else if (active) {       // decrement active count without queuing
+                long nc = (c = ctl) - AC_UNIT;
+                if ((int)(nc >> AC_SHIFT) + (config & SMASK) == 0)
+                    return;          // bypass decrement-then-increment
+                if (U.compareAndSwapLong(this, CTL, c, nc))
                     active = false;
-                    do {} while (!U.compareAndSwapLong
-                                 (this, CTL, c = ctl, c -= AC_UNIT));
-                }
-                else
-                    c = ctl;        // re-increment on exit
-                if ((int)(c >> AC_SHIFT) + (config & SMASK) == 0) {
-                    do {} while (!U.compareAndSwapLong
-                                 (this, CTL, c = ctl, c + AC_UNIT));
-                    break;
-                }
             }
+            else if ((int)((c = ctl) >> AC_SHIFT) + (config & SMASK) == 0 &&
+                     U.compareAndSwapLong(this, CTL, c, c + AC_UNIT))
+                return;
         }
     }
 
@@ -2205,8 +2149,11 @@ public class ForkJoinPool extends AbstractExecutorService {
                 return t;
             if ((q = findNonEmptyStealQueue(w.nextSeed())) == null)
                 return null;
-            if ((b = q.base) - q.top < 0 && (t = q.pollAt(b)) != null)
+            if ((b = q.base) - q.top < 0 && (t = q.pollAt(b)) != null) {
+                if (q.base - q.top < 0)
+                    signalWork(q);
                 return t;
+            }
         }
     }
 
@@ -2235,7 +2182,7 @@ public class ForkJoinPool extends AbstractExecutorService {
      * producing extra tasks amortizes the uncertainty of progress and
      * diffusion assumptions.
      *
-     * So, users will want to use values larger, but not much larger
+     * So, users will want to use values larger (but not much larger)
      * than 1 to both smooth over transient shortages and hedge
      * against uneven progress; as traded off against the cost of
      * extra task overhead. We leave the user to pick a threshold
@@ -2288,45 +2235,49 @@ public class ForkJoinPool extends AbstractExecutorService {
      * @return true if now terminating or terminated
      */
     private boolean tryTerminate(boolean now, boolean enable) {
-        if (this == commonPool)                     // cannot shut down
+        int ps;
+        if (this == common)                    // cannot shut down
             return false;
+        if ((ps = plock) >= 0) {                   // enable by setting plock
+            if (!enable)
+                return false;
+            if ((ps & PL_LOCK) != 0 ||
+                !U.compareAndSwapInt(this, PLOCK, ps, ps += PL_LOCK))
+                ps = acquirePlock();
+            int nps = ((ps + PL_LOCK) & ~SHUTDOWN) | SHUTDOWN;
+            if (!U.compareAndSwapInt(this, PLOCK, ps, nps))
+                releasePlock(nps);
+        }
         for (long c;;) {
-            if (((c = ctl) & STOP_BIT) != 0) {      // already terminating
+            if (((c = ctl) & STOP_BIT) != 0) {     // already terminating
                 if ((short)(c >>> TC_SHIFT) == -(config & SMASK)) {
                     synchronized (this) {
-                        notifyAll();                // signal when 0 workers
+                        notifyAll();               // signal when 0 workers
                     }
                 }
                 return true;
             }
-            if (plock >= 0) {                       // not yet enabled
-                int ps;
-                if (!enable)
+            if (!now) {                            // check if idle & no tasks
+                WorkQueue[] ws; WorkQueue w;
+                if ((int)(c >> AC_SHIFT) != -(config & SMASK))
                     return false;
-                if (((ps = plock) & PL_LOCK) != 0 ||
-                    !U.compareAndSwapInt(this, PLOCK, ps, ps += PL_LOCK))
-                    ps = acquirePlock();
-                if (!U.compareAndSwapInt(this, PLOCK, ps, SHUTDOWN))
-                    releasePlock(SHUTDOWN);
-            }
-            if (!now) {                             // check if idle & no tasks
-                if ((int)(c >> AC_SHIFT) != -(config & SMASK) ||
-                    hasQueuedSubmissions())
-                    return false;
-                // Check for unqueued inactive workers. One pass suffices.
-                WorkQueue[] ws = workQueues; WorkQueue w;
-                if (ws != null) {
-                    for (int i = 1; i < ws.length; i += 2) {
-                        if ((w = ws[i]) != null && w.eventCount >= 0)
-                            return false;
+                if ((ws = workQueues) != null) {
+                    for (int i = 0; i < ws.length; ++i) {
+                        if ((w = ws[i]) != null) {
+                            if (!w.isEmpty()) {    // signal unprocessed tasks
+                                signalWork(w);
+                                return false;
+                            }
+                            if ((i & 1) != 0 && w.eventCount >= 0)
+                                return false;      // unqueued inactive worker
+                        }
                     }
                 }
             }
             if (U.compareAndSwapLong(this, CTL, c, c | STOP_BIT)) {
                 for (int pass = 0; pass < 3; ++pass) {
-                    WorkQueue[] ws = workQueues;
-                    if (ws != null) {
-                        WorkQueue w; Thread wt;
+                    WorkQueue[] ws; WorkQueue w; Thread wt;
+                    if ((ws = workQueues) != null) {
                         int n = ws.length;
                         for (int i = 0; i < n; ++i) {
                             if ((w = ws[i]) != null) {
@@ -2337,7 +2288,7 @@ public class ForkJoinPool extends AbstractExecutorService {
                                         if (!wt.isInterrupted()) {
                                             try {
                                                 wt.interrupt();
-                                            } catch (SecurityException ignore) {
+                                            } catch (Throwable ignore) {
                                             }
                                         }
                                         U.unpark(wt);
@@ -2348,7 +2299,7 @@ public class ForkJoinPool extends AbstractExecutorService {
                         // Wake up workers parked on event queue
                         int i, e; long cc; Thread p;
                         while ((e = (int)(cc = ctl) & E_MASK) != 0 &&
-                               (i = e & SMASK) < n &&
+                               (i = e & SMASK) < n && i >= 0 &&
                                (w = ws[i]) != null) {
                             long nc = ((long)(w.nextWait & E_MASK) |
                                        ((cc + AC_UNIT) & AC_MASK) |
@@ -2374,26 +2325,26 @@ public class ForkJoinPool extends AbstractExecutorService {
      * least one task.
      */
     static WorkQueue commonSubmitterQueue() {
-        ForkJoinPool p; WorkQueue[] ws; int m; Submitter z;
-        return ((z = submitters.get()) != null &&
-                (p = commonPool) != null &&
+        ForkJoinPool p; WorkQueue[] ws; int m, z;
+        return ((z = ThreadLocalRandom.getProbe()) != 0 &&
+                (p = common) != null &&
                 (ws = p.workQueues) != null &&
                 (m = ws.length - 1) >= 0) ?
-            ws[m & z.seed & SQMASK] : null;
+            ws[m & z & SQMASK] : null;
     }
 
     /**
      * Tries to pop the given task from submitter's queue in common pool.
      */
     static boolean tryExternalUnpush(ForkJoinTask<?> t) {
-        ForkJoinPool p; WorkQueue[] ws; WorkQueue q; Submitter z;
-        ForkJoinTask<?>[] a;  int m, s;
+        ForkJoinPool p; WorkQueue[] ws; WorkQueue q;
+        ForkJoinTask<?>[] a;  int m, s, z;
         if (t != null &&
-            (z = submitters.get()) != null &&
-            (p = commonPool) != null &&
+            (z = ThreadLocalRandom.getProbe()) != 0 &&
+            (p = common) != null &&
             (ws = p.workQueues) != null &&
             (m = ws.length - 1) >= 0 &&
-            (q = ws[m & z.seed & SQMASK]) != null &&
+            (q = ws[m & z & SQMASK]) != null &&
             (s = q.top) != q.base &&
             (a = q.array) != null) {
             long j = (((a.length - 1) & (s - 1)) << ASHIFT) + ABASE;
@@ -2445,9 +2396,10 @@ public class ForkJoinPool extends AbstractExecutorService {
                 if (task != null)
                     task.doExec();
                 if (root.status < 0 ||
-                    (u = (int)(ctl >>> 32)) >= 0 || (u >> UAC_SHIFT) >= 0)
+                    (config != 0 &&
+                     ((u = (int)(ctl >>> 32)) >= 0 || (u >> UAC_SHIFT) >= 0)))
                     break;
-                if (task == null) {
+               if (task == null) {
                     helpSignal(root, q.poolIndex);
                     if (root.status >= 0)
                         helpComplete(root, SHARED_QUEUE);
@@ -2463,14 +2415,14 @@ public class ForkJoinPool extends AbstractExecutorService {
      */
     static void externalHelpJoin(ForkJoinTask<?> t) {
         // Some hard-to-avoid overlap with tryExternalUnpush
-        ForkJoinPool p; WorkQueue[] ws; WorkQueue q, w; Submitter z;
-        ForkJoinTask<?>[] a;  int m, s, n;
+        ForkJoinPool p; WorkQueue[] ws; WorkQueue q, w;
+        ForkJoinTask<?>[] a;  int m, s, n, z;
         if (t != null &&
-            (z = submitters.get()) != null &&
-            (p = commonPool) != null &&
+            (z = ThreadLocalRandom.getProbe()) != 0 &&
+            (p = common) != null &&
             (ws = p.workQueues) != null &&
             (m = ws.length - 1) >= 0 &&
-            (q = ws[m & z.seed & SQMASK]) != null &&
+            (q = ws[m & z & SQMASK]) != null &&
             (a = q.array) != null) {
             int am = a.length - 1;
             if ((s = q.top) != q.base) {
@@ -2496,18 +2448,6 @@ public class ForkJoinPool extends AbstractExecutorService {
         }
     }
 
-    /**
-     * Restricted version of helpQuiescePool for external callers
-     */
-    static void externalHelpQuiescePool() {
-        ForkJoinPool p; ForkJoinTask<?> t; WorkQueue q; int b;
-        if ((p = commonPool) != null &&
-            (q = p.findNonEmptyStealQueue(1)) != null &&
-            (b = q.base) - q.top < 0 &&
-            (t = q.pollAt(b)) != null)
-            t.doExec();
-    }
-
     // Exported methods
 
     // Constructors
@@ -2524,7 +2464,7 @@ public class ForkJoinPool extends AbstractExecutorService {
      *         java.lang.RuntimePermission}{@code ("modifyThread")}
      */
     public ForkJoinPool() {
-        this(Runtime.getRuntime().availableProcessors(),
+        this(Math.min(MAX_CAP, Runtime.getRuntime().availableProcessors()),
              defaultForkJoinWorkerThreadFactory, null, false);
     }
 
@@ -2572,50 +2512,63 @@ public class ForkJoinPool extends AbstractExecutorService {
      */
     public ForkJoinPool(int parallelism,
                         ForkJoinWorkerThreadFactory factory,
-                        Thread.UncaughtExceptionHandler handler,
+                        UncaughtExceptionHandler handler,
                         boolean asyncMode) {
+        this(checkParallelism(parallelism),
+             checkFactory(factory),
+             handler,
+             asyncMode,
+             "ForkJoinPool-" + nextPoolId() + "-worker-");
         checkPermission();
-        if (factory == null)
-            throw new NullPointerException();
+    }
+
+    private static int checkParallelism(int parallelism) {
         if (parallelism <= 0 || parallelism > MAX_CAP)
             throw new IllegalArgumentException();
+        return parallelism;
+    }
+
+    private static ForkJoinWorkerThreadFactory checkFactory
+        (ForkJoinWorkerThreadFactory factory) {
+        if (factory == null)
+            throw new NullPointerException();
+        return factory;
+    }
+
+    /**
+     * Creates a {@code ForkJoinPool} with the given parameters, without
+     * any security checks or parameter validation.  Invoked directly by
+     * makeCommonPool.
+     */
+    private ForkJoinPool(int parallelism,
+                         ForkJoinWorkerThreadFactory factory,
+                         UncaughtExceptionHandler handler,
+                         boolean asyncMode,
+                         String workerNamePrefix) {
+        this.workerNamePrefix = workerNamePrefix;
         this.factory = factory;
         this.ueh = handler;
         this.config = parallelism | (asyncMode ? (FIFO_QUEUE << 16) : 0);
         long np = (long)(-parallelism); // offset ctl counts
         this.ctl = ((np << AC_SHIFT) & AC_MASK) | ((np << TC_SHIFT) & TC_MASK);
-        int pn = nextPoolId();
-        StringBuilder sb = new StringBuilder("ForkJoinPool-");
-        sb.append(Integer.toString(pn));
-        sb.append("-worker-");
-        this.workerNamePrefix = sb.toString();
-    }
-
-    /**
-     * Constructor for common pool, suitable only for static initialization.
-     * Basically the same as above, but uses smallest possible initial footprint.
-     */
-    ForkJoinPool(int parallelism, long ctl,
-                 ForkJoinWorkerThreadFactory factory,
-                 Thread.UncaughtExceptionHandler handler) {
-        this.config = parallelism;
-        this.ctl = ctl;
-        this.factory = factory;
-        this.ueh = handler;
-        this.workerNamePrefix = "ForkJoinPool.commonPool-worker-";
     }
 
     /**
      * Returns the common pool instance. This pool is statically
-     * constructed; its run state is unaffected by attempts to
-     * {@link #shutdown} or {@link #shutdownNow}.
+     * constructed; its run state is unaffected by attempts to {@link
+     * #shutdown} or {@link #shutdownNow}. However this pool and any
+     * ongoing processing are automatically terminated upon program
+     * {@link System#exit}.  Any program that relies on asynchronous
+     * task processing to complete before program termination should
+     * invoke {@code commonPool().}{@link #awaitQuiescence awaitQuiescence},
+     * before exit.
      *
      * @return the common pool instance
      * @since 1.8
      */
     public static ForkJoinPool commonPool() {
-        // assert commonPool != null : "static init error";
-        return commonPool;
+        // assert common != null : "static init error";
+        return common;
     }
 
     // Execution methods
@@ -2671,7 +2624,7 @@ public class ForkJoinPool extends AbstractExecutorService {
         if (task instanceof ForkJoinTask<?>) // avoid re-wrap
             job = (ForkJoinTask<?>) task;
         else
-            job = new ForkJoinTask.AdaptedRunnableAction(task);
+            job = new ForkJoinTask.RunnableExecuteAction(task);
         externalPush(job);
     }
 
@@ -2738,27 +2691,23 @@ public class ForkJoinPool extends AbstractExecutorService {
         // In previous versions of this class, this method constructed
         // a task to run ForkJoinTask.invokeAll, but now external
         // invocation of multiple tasks is at least as efficient.
-        List<ForkJoinTask<T>> fs = new ArrayList<ForkJoinTask<T>>(tasks.size());
-        // Workaround needed because method wasn't declared with
-        // wildcards in return type but should have been.
-        @SuppressWarnings({"unchecked", "rawtypes"})
-            List<Future<T>> futures = (List<Future<T>>) (List) fs;
+        ArrayList<Future<T>> futures = new ArrayList<Future<T>>(tasks.size());
 
         boolean done = false;
         try {
             for (Callable<T> t : tasks) {
                 ForkJoinTask<T> f = new ForkJoinTask.AdaptedCallable<T>(t);
+                futures.add(f);
                 externalPush(f);
-                fs.add(f);
             }
-            for (ForkJoinTask<T> f : fs)
-                f.quietlyJoin();
+            for (int i = 0, size = futures.size(); i < size; i++)
+                ((ForkJoinTask<?>)futures.get(i)).quietlyJoin();
             done = true;
             return futures;
         } finally {
             if (!done)
-                for (ForkJoinTask<T> f : fs)
-                    f.cancel(false);
+                for (int i = 0, size = futures.size(); i < size; i++)
+                    futures.get(i).cancel(false);
         }
     }
 
@@ -2777,7 +2726,7 @@ public class ForkJoinPool extends AbstractExecutorService {
      *
      * @return the handler, or {@code null} if none
      */
-    public Thread.UncaughtExceptionHandler getUncaughtExceptionHandler() {
+    public UncaughtExceptionHandler getUncaughtExceptionHandler() {
         return ueh;
     }
 
@@ -2787,7 +2736,8 @@ public class ForkJoinPool extends AbstractExecutorService {
      * @return the targeted parallelism level of this pool
      */
     public int getParallelism() {
-        return config & SMASK;
+        int par = (config & SMASK);
+        return (par > 0) ? par : 1;
     }
 
     /**
@@ -2797,7 +2747,7 @@ public class ForkJoinPool extends AbstractExecutorService {
      * @since 1.8
      */
     public static int getCommonPoolParallelism() {
-        return commonPoolParallelism;
+        return commonParallelism;
     }
 
     /**
@@ -3055,7 +3005,7 @@ public class ForkJoinPool extends AbstractExecutorService {
      * Possibly initiates an orderly shutdown in which previously
      * submitted tasks are executed, but no new tasks will be
      * accepted. Invocation has no effect on execution state if this
-     * is the {@link #commonPool}, and no additional effect if
+     * is the {@link #commonPool()}, and no additional effect if
      * already shut down.  Tasks that are in the process of being
      * submitted concurrently during the course of this method may or
      * may not be rejected.
@@ -3073,7 +3023,7 @@ public class ForkJoinPool extends AbstractExecutorService {
     /**
      * Possibly attempts to cancel and/or stop all tasks, and reject
      * all subsequently submitted tasks.  Invocation has no effect on
-     * execution state if this is the {@link #commonPool}, and no
+     * execution state if this is the {@link #commonPool()}, and no
      * additional effect if already shut down. Otherwise, tasks that
      * are in the process of being submitted or executed concurrently
      * during the course of this method may or may not be
@@ -3136,9 +3086,10 @@ public class ForkJoinPool extends AbstractExecutorService {
     /**
      * Blocks until all tasks have completed execution after a
      * shutdown request, or the timeout occurs, or the current thread
-     * is interrupted, whichever happens first. Note that the {@link
-     * #commonPool()} never terminates until program shutdown so
-     * this method will always time out.
+     * is interrupted, whichever happens first. Because the {@link
+     * #commonPool()} never terminates until program shutdown, when
+     * applied to the common pool, this method is equivalent to {@link
+     * #awaitQuiescence(long, TimeUnit)} but always returns {@code false}.
      *
      * @param timeout the maximum time to wait
      * @param unit the time unit of the timeout argument
@@ -3148,6 +3099,12 @@ public class ForkJoinPool extends AbstractExecutorService {
      */
     public boolean awaitTermination(long timeout, TimeUnit unit)
         throws InterruptedException {
+        if (Thread.interrupted())
+            throw new InterruptedException();
+        if (this == common) {
+            awaitQuiescence(timeout, unit);
+            return false;
+        }
         long nanos = unit.toNanos(timeout);
         if (isTerminated())
             return true;
@@ -3166,6 +3123,62 @@ public class ForkJoinPool extends AbstractExecutorService {
         return terminated;
     }
 
+    /**
+     * If called by a ForkJoinTask operating in this pool, equivalent
+     * in effect to {@link ForkJoinTask#helpQuiesce}. Otherwise,
+     * waits and/or attempts to assist performing tasks until this
+     * pool {@link #isQuiescent} or the indicated timeout elapses.
+     *
+     * @param timeout the maximum time to wait
+     * @param unit the time unit of the timeout argument
+     * @return {@code true} if quiescent; {@code false} if the
+     * timeout elapsed.
+     */
+    public boolean awaitQuiescence(long timeout, TimeUnit unit) {
+        long nanos = unit.toNanos(timeout);
+        ForkJoinWorkerThread wt;
+        Thread thread = Thread.currentThread();
+        if ((thread instanceof ForkJoinWorkerThread) &&
+            (wt = (ForkJoinWorkerThread)thread).pool == this) {
+            helpQuiescePool(wt.workQueue);
+            return true;
+        }
+        long startTime = System.nanoTime();
+        WorkQueue[] ws;
+        int r = 0, m;
+        boolean found = true;
+        while (!isQuiescent() && (ws = workQueues) != null &&
+               (m = ws.length - 1) >= 0) {
+            if (!found) {
+                if ((System.nanoTime() - startTime) > nanos)
+                    return false;
+                Thread.yield(); // cannot block
+            }
+            found = false;
+            for (int j = (m + 1) << 2; j >= 0; --j) {
+                ForkJoinTask<?> t; WorkQueue q; int b;
+                if ((q = ws[r++ & m]) != null && (b = q.base) - q.top < 0) {
+                    found = true;
+                    if ((t = q.pollAt(b)) != null) {
+                        if (q.base - q.top < 0)
+                            signalWork(q);
+                        t.doExec();
+                    }
+                    break;
+                }
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Waits and/or attempts to assist performing tasks indefinitely
+     * until the {@link #commonPool()} {@link #isQuiescent}.
+     */
+    static void quiesceCommonPool() {
+        common.awaitQuiescence(Long.MAX_VALUE, TimeUnit.NANOSECONDS);
+    }
+
     /**
      * Interface for extending managed parallelism for tasks running
      * in {@link ForkJoinPool}s.
@@ -3175,9 +3188,9 @@ public class ForkJoinPool extends AbstractExecutorService {
      * not necessary. Method {@code block} blocks the current thread
      * if necessary (perhaps internally invoking {@code isReleasable}
      * before actually blocking). These actions are performed by any
-     * thread invoking {@link ForkJoinPool#managedBlock}.  The
-     * unusual methods in this API accommodate synchronizers that may,
-     * but don't usually, block for long periods. Similarly, they
+     * thread invoking {@link ForkJoinPool#managedBlock(ManagedBlocker)}.
+     * The unusual methods in this API accommodate synchronizers that
+     * may, but don't usually, block for long periods. Similarly, they
      * allow more efficient internal handling of cases in which
      * additional workers may be, but usually are not, needed to
      * ensure sufficient parallelism.  Toward this end,
@@ -3235,6 +3248,7 @@ public class ForkJoinPool extends AbstractExecutorService {
 
         /**
          * Returns {@code true} if blocking is unnecessary.
+         * @return {@code true} if blocking is unnecessary
          */
         boolean isReleasable();
     }
@@ -3319,7 +3333,7 @@ public class ForkJoinPool extends AbstractExecutorService {
     private static final long QLOCK;
 
     static {
-        int s; // initialize field offsets for CAS etc
+        // initialize field offsets for CAS etc
         try {
             U = sun.misc.Unsafe.getUnsafe();
             Class<?> k = ForkJoinPool.class;
@@ -3339,54 +3353,58 @@ public class ForkJoinPool extends AbstractExecutorService {
                 (wk.getDeclaredField("qlock"));
             Class<?> ak = ForkJoinTask[].class;
             ABASE = U.arrayBaseOffset(ak);
-            s = U.arrayIndexScale(ak);
-            ASHIFT = 31 - Integer.numberOfLeadingZeros(s);
+            int scale = U.arrayIndexScale(ak);
+            if ((scale & (scale - 1)) != 0)
+                throw new Error("data type scale not a power of two");
+            ASHIFT = 31 - Integer.numberOfLeadingZeros(scale);
         } catch (Exception e) {
             throw new Error(e);
         }
-        if ((s & (s-1)) != 0)
-            throw new Error("data type scale not a power of two");
 
-        submitters = new ThreadLocal<Submitter>();
-        ForkJoinWorkerThreadFactory fac = defaultForkJoinWorkerThreadFactory =
+        defaultForkJoinWorkerThreadFactory =
             new DefaultForkJoinWorkerThreadFactory();
         modifyThreadPermission = new RuntimePermission("modifyThread");
 
-        /*
-         * Establish common pool parameters.  For extra caution,
-         * computations to set up common pool state are here; the
-         * constructor just assigns these values to fields.
-         */
+        common = java.security.AccessController.doPrivileged
+            (new java.security.PrivilegedAction<ForkJoinPool>() {
+                public ForkJoinPool run() { return makeCommonPool(); }});
+        int par = common.config; // report 1 even if threads disabled
+        commonParallelism = par > 0 ? par : 1;
+    }
 
-        int par = 0;
-        Thread.UncaughtExceptionHandler handler = null;
-        try {  // TBD: limit or report ignored exceptions?
+    /**
+     * Creates and returns the common pool, respecting user settings
+     * specified via system properties.
+     */
+    private static ForkJoinPool makeCommonPool() {
+        int parallelism = -1;
+        ForkJoinWorkerThreadFactory factory
+            = defaultForkJoinWorkerThreadFactory;
+        UncaughtExceptionHandler handler = null;
+        try {  // ignore exceptions in accesing/parsing properties
             String pp = System.getProperty
                 ("java.util.concurrent.ForkJoinPool.common.parallelism");
-            String hp = System.getProperty
-                ("java.util.concurrent.ForkJoinPool.common.exceptionHandler");
             String fp = System.getProperty
                 ("java.util.concurrent.ForkJoinPool.common.threadFactory");
-            if (fp != null)
-                fac = ((ForkJoinWorkerThreadFactory)ClassLoader.
-                       getSystemClassLoader().loadClass(fp).newInstance());
-            if (hp != null)
-                handler = ((Thread.UncaughtExceptionHandler)ClassLoader.
-                           getSystemClassLoader().loadClass(hp).newInstance());
+            String hp = System.getProperty
+                ("java.util.concurrent.ForkJoinPool.common.exceptionHandler");
             if (pp != null)
-                par = Integer.parseInt(pp);
+                parallelism = Integer.parseInt(pp);
+            if (fp != null)
+                factory = ((ForkJoinWorkerThreadFactory)ClassLoader.
+                           getSystemClassLoader().loadClass(fp).newInstance());
+            if (hp != null)
+                handler = ((UncaughtExceptionHandler)ClassLoader.
+                           getSystemClassLoader().loadClass(hp).newInstance());
         } catch (Exception ignore) {
         }
 
-        if (par <= 0)
-            par = Runtime.getRuntime().availableProcessors();
-        if (par > MAX_CAP)
-            par = MAX_CAP;
-        commonPoolParallelism = par;
-        long np = (long)(-par); // precompute initial ctl value
-        long ct = ((np << AC_SHIFT) & AC_MASK) | ((np << TC_SHIFT) & TC_MASK);
-
-        commonPool = new ForkJoinPool(par, ct, fac, handler);
+        if (parallelism < 0)
+            parallelism = Runtime.getRuntime().availableProcessors();
+        if (parallelism > MAX_CAP)
+            parallelism = MAX_CAP;
+        return new ForkJoinPool(parallelism, factory, handler, false,
+                                "ForkJoinPool.commonPool-worker-");
     }
 
 }
diff --git a/jdk/src/share/classes/java/util/concurrent/ForkJoinTask.java b/jdk/src/share/classes/java/util/concurrent/ForkJoinTask.java
index 3b4fbb1d8fa..a17cc28b744 100644
--- a/jdk/src/share/classes/java/util/concurrent/ForkJoinTask.java
+++ b/jdk/src/share/classes/java/util/concurrent/ForkJoinTask.java
@@ -464,7 +464,7 @@ public abstract class ForkJoinTask<V> implements Future<V>, Serializable {
     }
 
     /**
-     * Records exception and possibly propagates
+     * Records exception and possibly propagates.
      *
      * @return status on exit
      */
@@ -497,7 +497,7 @@ public abstract class ForkJoinTask<V> implements Future<V>, Serializable {
     }
 
     /**
-     * Removes exception node and clears status
+     * Removes exception node and clears status.
      */
     private void clearExceptionalCompletion() {
         int h = System.identityHashCode(this);
@@ -635,7 +635,7 @@ public abstract class ForkJoinTask<V> implements Future<V>, Serializable {
                 throw (Error)ex;
             if (ex instanceof RuntimeException)
                 throw (RuntimeException)ex;
-            throw uncheckedThrowable(ex, RuntimeException.class);
+            ForkJoinTask.<RuntimeException>uncheckedThrow(ex);
         }
     }
 
@@ -645,8 +645,9 @@ public abstract class ForkJoinTask<V> implements Future<V>, Serializable {
      * unchecked exceptions
      */
     @SuppressWarnings("unchecked") static <T extends Throwable>
-        T uncheckedThrowable(final Throwable t, final Class<T> c) {
-        return (T)t; // rely on vacuous cast
+        void uncheckedThrow(Throwable t) throws T {
+        if (t != null)
+            throw (T)t; // rely on vacuous cast
     }
 
     /**
@@ -681,7 +682,7 @@ public abstract class ForkJoinTask<V> implements Future<V>, Serializable {
         if ((t = Thread.currentThread()) instanceof ForkJoinWorkerThread)
             ((ForkJoinWorkerThread)t).workQueue.push(this);
         else
-            ForkJoinPool.commonPool.externalPush(this);
+            ForkJoinPool.common.externalPush(this);
         return this;
     }
 
@@ -857,7 +858,7 @@ public abstract class ForkJoinTask<V> implements Future<V>, Serializable {
      * <p>This method is designed to be invoked by <em>other</em>
      * tasks. To terminate the current task, you can just return or
      * throw an unchecked exception from its computation method, or
-     * invoke {@link #completeExceptionally}.
+     * invoke {@link #completeExceptionally(Throwable)}.
      *
      * @param mayInterruptIfRunning this value has no effect in the
      * default implementation because interrupts are not used to
@@ -1007,8 +1008,9 @@ public abstract class ForkJoinTask<V> implements Future<V>, Serializable {
         if (Thread.interrupted())
             throw new InterruptedException();
         // Messy in part because we measure in nanosecs, but wait in millisecs
-        int s; long ns, ms;
-        if ((s = status) >= 0 && (ns = unit.toNanos(timeout)) > 0L) {
+        int s; long ms;
+        long ns = unit.toNanos(timeout);
+        if ((s = status) >= 0 && ns > 0L) {
             long deadline = System.nanoTime() + ns;
             ForkJoinPool p = null;
             ForkJoinPool.WorkQueue w = null;
@@ -1104,7 +1106,7 @@ public abstract class ForkJoinTask<V> implements Future<V>, Serializable {
             wt.pool.helpQuiescePool(wt.workQueue);
         }
         else
-            ForkJoinPool.externalHelpQuiescePool();
+            ForkJoinPool.quiesceCommonPool();
     }
 
     /**
@@ -1390,6 +1392,24 @@ public abstract class ForkJoinTask<V> implements Future<V>, Serializable {
         private static final long serialVersionUID = 5232453952276885070L;
     }
 
+    /**
+     * Adaptor for Runnables in which failure forces worker exception
+     */
+    static final class RunnableExecuteAction extends ForkJoinTask<Void> {
+        final Runnable runnable;
+        RunnableExecuteAction(Runnable runnable) {
+            if (runnable == null) throw new NullPointerException();
+            this.runnable = runnable;
+        }
+        public final Void getRawResult() { return null; }
+        public final void setRawResult(Void v) { }
+        public final boolean exec() { runnable.run(); return true; }
+        void internalPropagateException(Throwable ex) {
+            rethrow(ex); // rethrow outside exec() catches.
+        }
+        private static final long serialVersionUID = 5232453952276885070L;
+    }
+
     /**
      * Adaptor for Callables
      */
diff --git a/jdk/test/java/util/concurrent/forkjoin/ThreadLessCommon.java b/jdk/test/java/util/concurrent/forkjoin/ThreadLessCommon.java
new file mode 100644
index 00000000000..1dd3b660f60
--- /dev/null
+++ b/jdk/test/java/util/concurrent/forkjoin/ThreadLessCommon.java
@@ -0,0 +1,135 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * Written by Doug Lea with assistance from members of JCP JSR-166
+ * Expert Group and released to the public domain, as explained at
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+/*
+ * @test
+ * @bug 8008378
+ * @summary Basic checks for parallelism 0, and null returning factory
+ * @run main/othervm -Djava.util.concurrent.ForkJoinPool.common.parallelism=0 ThreadLessCommon
+ * @run main/othervm -Djava.util.concurrent.ForkJoinPool.common.threadFactory=ThreadLessCommon$NullForkJoinWorkerThreadFactory ThreadLessCommon
+ * @author Chris Hegarty
+ */
+
+import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.ForkJoinPool.ForkJoinWorkerThreadFactory;
+import java.util.concurrent.ForkJoinWorkerThread;
+import java.util.concurrent.RecursiveTask;
+
+public class ThreadLessCommon {
+
+    static final int THRESHOLD = 1000;
+    static final boolean debug = true;
+
+    private static void realMain(String[] args) throws Throwable {
+        if (debug) {
+            String pp = System.getProperty(
+                    "java.util.concurrent.ForkJoinPool.common.parallelism");
+            System.out.println(
+                    "java.util.concurrent.ForkJoinPool.common.parallelism:" + pp);
+            String tf = System.getProperty(
+                    "java.util.concurrent.ForkJoinPool.common.threadFactory");
+            System.out.println(
+                    "java.util.concurrent.ForkJoinPool.common.threadFactory:" + tf);
+        }
+
+        long from = 0, to = 50000;
+        RecursiveTask<Long> task = new SumTask(from, to, Thread.currentThread());
+        long sum = task.invoke();
+        System.out.printf("%nSum: from [%d] to [%d] = [%d]%n", from, to, sum);
+
+        task.fork();
+        sum = task.join();
+        System.out.printf("%nSum: from [%d] to [%d] = [%d]%n", from, to, sum);
+
+        sum = ForkJoinPool.commonPool().invoke(task.fork());
+        System.out.printf("%nSum: from [%d] to [%d] = [%d]%n", from, to, sum);
+    }
+
+    static class SumTask extends RecursiveTask<Long> {
+        final Thread expectedThread;
+        final long from;
+        final long to;
+        SumTask(long from, long to, Thread thread) {
+            this.from = from; this.to = to; expectedThread = thread;
+        }
+
+        @Override
+        public Long compute() {
+            check(Thread.currentThread() == expectedThread,
+                  "Expected " + expectedThread + ", got " + Thread.currentThread());
+            long range = to - from;
+            if (range < THRESHOLD) {
+                long acc = 0;
+                for (long i = from; i <= to; i++)
+                    acc = acc + i;
+                return acc;
+            } else {
+                long half = from + range / 2;
+                SumTask t1 = new SumTask(from, half ,expectedThread);
+                SumTask t2 = new SumTask(half+1, to ,expectedThread);
+                if (half % 2 == 0) {
+                    t1.fork();
+                    return t2.compute() + t1.join();
+                } else {
+                    invokeAll(t1, t2);
+                    try { return t1.get() + t2.get(); }
+                    catch (Exception x) { unexpected(x); return 0L;}
+                }
+            }
+        }
+    }
+
+    public static class NullForkJoinWorkerThreadFactory
+        implements ForkJoinWorkerThreadFactory
+    {
+        @Override
+        public ForkJoinWorkerThread newThread(ForkJoinPool pool) {
+            return null;
+        }
+    }
+
+    //--------------------- Infrastructure ---------------------------
+    static volatile int passed = 0, failed = 0;
+    static void pass() {passed++;}
+    static void fail() {failed++; /*Thread.dumpStack();*/}
+    static void fail(String msg) {System.out.println(msg); fail();}
+    static void unexpected(Throwable t) {failed++; t.printStackTrace();}
+    static void check(boolean cond, String msg) {if (cond) pass(); else fail(msg);}
+    static void equal(Object x, Object y) {
+        if (x == null ? y == null : x.equals(y)) pass();
+        else fail(x + " not equal to " + y);}
+    public static void main(String[] args) throws Throwable {
+        try {realMain(args);} catch (Throwable t) {unexpected(t);}
+        System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed);
+        if (failed > 0) throw new AssertionError("Some tests failed");}
+}
diff --git a/jdk/test/java/util/concurrent/forkjoin/ThrowingRunnable.java b/jdk/test/java/util/concurrent/forkjoin/ThrowingRunnable.java
new file mode 100644
index 00000000000..47e6f3543db
--- /dev/null
+++ b/jdk/test/java/util/concurrent/forkjoin/ThrowingRunnable.java
@@ -0,0 +1,85 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * Written by Doug Lea with assistance from members of JCP JSR-166
+ * Expert Group and released to the public domain, as explained at
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+/*
+ * @test
+ * @bug 8008378
+ * @run main/othervm -Djava.util.concurrent.ForkJoinPool.common.exceptionHandler=ThrowingRunnable
+ *                   ThrowingRunnable
+ * @summary FJP.execute(Runnable), uncaught exception should cause worker thread
+ *          to die.
+ * @author Chris Hegarty
+ */
+
+import java.lang.Thread.UncaughtExceptionHandler;
+import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.Phaser;
+import java.util.concurrent.TimeUnit;
+
+public class ThrowingRunnable implements Runnable, UncaughtExceptionHandler {
+
+    static final Phaser phaser = new Phaser(2);
+
+    private static void realMain(String[] args) throws Throwable {
+        ThrowingRunnable r = new ThrowingRunnable();
+        ForkJoinPool.commonPool().execute(r);
+        phaser.awaitAdvanceInterruptibly(phaser.arrive(), 10, TimeUnit.SECONDS);
+        pass();
+    }
+
+    @Override
+    public void run() {
+        throw new RuntimeException("This is an exception.");
+    }
+
+    @Override
+    public void uncaughtException(Thread t, Throwable e) {
+        pass();
+        phaser.arrive();
+    }
+
+    //--------------------- Infrastructure ---------------------------
+    static volatile int passed = 0, failed = 0;
+    static void pass() {passed++;}
+    static void fail() {failed++; /*Thread.dumpStack();*/}
+    static void fail(String msg) {System.out.println(msg); fail();}
+    static void unexpected(Throwable t) {failed++; t.printStackTrace();}
+    static void check(boolean cond, String msg) {if (cond) pass(); else fail(msg);}
+    static void equal(Object x, Object y) {
+        if (x == null ? y == null : x.equals(y)) pass();
+        else fail(x + " not equal to " + y);}
+    public static void main(String[] args) throws Throwable {
+        try {realMain(args);} catch (Throwable t) {unexpected(t);}
+        System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed);
+        if (failed > 0) throw new AssertionError("Some tests failed");}
+}

From bffaa53287e3f47b473ee9493fa2cc0fccac9d7b Mon Sep 17 00:00:00 2001
From: Kumar Srinivasan <ksrini@openjdk.org>
Date: Sun, 3 Mar 2013 20:52:04 -0800
Subject: [PATCH 254/311] 8007297: [pack200] allow opcodes with
 InterfaceMethodRefs

Reviewed-by: jrose
---
 .../sun/java/util/jar/pack/ClassReader.java   |  2 +-
 .../sun/java/util/jar/pack/ConstantPool.java  |  4 ++
 .../com/sun/java/util/jar/pack/Constants.java |  6 +++
 .../sun/java/util/jar/pack/Instruction.java   | 20 ++++++--
 .../sun/java/util/jar/pack/PackageReader.java |  6 +++
 .../sun/java/util/jar/pack/PackageWriter.java | 15 +++++-
 .../com/sun/java/util/jar/pack/constants.h    |  4 ++
 .../com/sun/java/util/jar/pack/unpack.cpp     |  9 ++++
 jdk/test/tools/pack200/AttributeTests.java    | 12 +----
 jdk/test/tools/pack200/InstructionTests.java  | 49 ++++++-------------
 jdk/test/tools/pack200/Utils.java             | 14 ++++++
 11 files changed, 89 insertions(+), 52 deletions(-)

diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java b/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java
index 3df8706da37..3da159f6e29 100644
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java
@@ -564,7 +564,7 @@ class ClassReader {
         code.bytes = new byte[readInt()];
         in.readFully(code.bytes);
         Entry[] cpMap = cls.getCPMap();
-        Instruction.opcodeChecker(code.bytes, cpMap);
+        Instruction.opcodeChecker(code.bytes, cpMap, this.cls.version);
         int nh = readUnsignedShort();
         code.setHandlerCount(nh);
         for (int i = 0; i < nh; i++) {
diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java b/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java
index ad2175f9993..c23dcb9d4a7 100644
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java
@@ -207,6 +207,10 @@ class ConstantPool {
             return tag;
         }
 
+        public final boolean tagEquals(int tag) {
+            return getTag() == tag;
+        }
+
         public Entry getRef(int i) {
             return null;
         }
diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/Constants.java b/jdk/src/share/classes/com/sun/java/util/jar/pack/Constants.java
index 15882624381..5059bc07967 100644
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/Constants.java
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/Constants.java
@@ -479,4 +479,10 @@ class Constants {
     public final static int _qldc   = _xldc_op+7;
     public final static int _qldc_w = _xldc_op+8;
     public final static int _xldc_limit = _xldc_op+9;
+
+    // handling of InterfaceMethodRef
+    public final static int _invoke_int_op = _xldc_limit;
+    public final static int _invokespecial_int = _invoke_int_op+0;
+    public final static int _invokestatic_int = _invoke_int_op+1;
+    public final static int _invoke_int_limit = _invoke_int_op+2;
 }
diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/Instruction.java b/jdk/src/share/classes/com/sun/java/util/jar/pack/Instruction.java
index 31ee22b059d..93175fe8ecf 100644
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/Instruction.java
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/Instruction.java
@@ -446,12 +446,14 @@ class Instruction  {
     public static boolean isCPRefOp(int bc) {
         if (bc < BC_INDEX[0].length && BC_INDEX[0][bc] > 0)  return true;
         if (bc >= _xldc_op && bc < _xldc_limit)  return true;
+        if (bc == _invokespecial_int || bc == _invokestatic_int) return true;
         return false;
     }
 
     public static byte getCPRefOpTag(int bc) {
         if (bc < BC_INDEX[0].length && BC_INDEX[0][bc] > 0)  return BC_TAG[0][bc];
         if (bc >= _xldc_op && bc < _xldc_limit)  return CONSTANT_LoadableValue;
+        if (bc == _invokestatic_int || bc == _invokespecial_int) return CONSTANT_InterfaceMethodref;
         return CONSTANT_None;
     }
 
@@ -647,7 +649,8 @@ class Instruction  {
         }
     }
 
-    public static void opcodeChecker(byte[] code, ConstantPool.Entry[] cpMap) throws FormatException {
+    public static void opcodeChecker(byte[] code, ConstantPool.Entry[] cpMap,
+            Package.Version clsVersion) throws FormatException {
         Instruction i = at(code, 0);
         while (i != null) {
             int opcode = i.getBC();
@@ -658,10 +661,17 @@ class Instruction  {
             ConstantPool.Entry e = i.getCPRef(cpMap);
             if (e != null) {
                 byte tag = i.getCPTag();
-                if (!e.tagMatches(tag)) {
-                    String message = "illegal reference, expected type=" +
-                                     ConstantPool.tagName(tag) + ": " +
-                                     i.toString(cpMap);
+                boolean match = e.tagMatches(tag);
+                if (!match &&
+                        (i.bc == _invokespecial || i.bc == _invokestatic) &&
+                        e.tagMatches(CONSTANT_InterfaceMethodref) &&
+                        clsVersion.greaterThan(Constants.JAVA7_MAX_CLASS_VERSION)) {
+                    match = true;
+                }
+                if (!match) {
+                    String message = "illegal reference, expected type="
+                            + ConstantPool.tagName(tag) + ": "
+                            + i.toString(cpMap);
                     throw new FormatException(message);
                 }
             }
diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java b/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java
index df4687b4aff..b42dda30eb4 100644
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java
@@ -2256,6 +2256,12 @@ class PackageReader extends BandStructure {
                         int origBC = bc;
                         int size = 2;
                         switch (bc) {
+                        case _invokestatic_int:
+                            origBC = _invokestatic;
+                            break;
+                        case _invokespecial_int:
+                            origBC = _invokespecial;
+                            break;
                         case _ildc:
                         case _cldc:
                         case _fldc:
diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java b/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java
index 47959294fd2..a78c9ae9969 100644
--- a/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java
+++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java
@@ -1409,6 +1409,10 @@ class PackageWriter extends BandStructure {
         int bc = i.getBC();
         if (!(bc >= _first_linker_op && bc <= _last_linker_op))  return -1;
         MemberEntry ref = (MemberEntry) i.getCPRef(curCPMap);
+        // do not optimize this case, simply fall back to regular coding
+        if ((bc == _invokespecial || bc == _invokestatic) &&
+                ref.tagEquals(CONSTANT_InterfaceMethodref))
+            return -1;
         ClassEntry refClass = ref.classRef;
         int self_bc = _self_linker_op + (bc - _first_linker_op);
         if (refClass == curClass.thisClass)
@@ -1609,7 +1613,16 @@ class PackageWriter extends BandStructure {
                 case CONSTANT_Fieldref:
                     bc_which = bc_fieldref; break;
                 case CONSTANT_Methodref:
-                    bc_which = bc_methodref; break;
+                    if (ref.tagEquals(CONSTANT_InterfaceMethodref)) {
+                        if (bc == _invokespecial)
+                            vbc = _invokespecial_int;
+                        if (bc == _invokestatic)
+                            vbc = _invokestatic_int;
+                        bc_which = bc_imethodref;
+                    } else {
+                        bc_which = bc_methodref;
+                    }
+                    break;
                 case CONSTANT_InterfaceMethodref:
                     bc_which = bc_imethodref; break;
                 case CONSTANT_InvokeDynamic:
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/constants.h b/jdk/src/share/native/com/sun/java/util/jar/pack/constants.h
index 040d8edd55b..2f125e0d800 100644
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/constants.h
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/constants.h
@@ -505,5 +505,9 @@ enum {
   bc_qldc    = _xldc_op+7,
   bc_qldc_w  = _xldc_op+8,
   _xldc_limit = _xldc_op+9,
+  _invoke_int_op = _xldc_limit,
+  _invokespecial_int = _invoke_int_op+0,
+  _invokestatic_int = _invoke_int_op+1,
+  _invoke_int_limit =  _invoke_int_op+2,
   _xxx_3_end
 };
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp b/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
index 9ce0308089f..aae7921ae43 100644
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
@@ -2942,6 +2942,9 @@ band* unpacker::ref_band_for_op(int bc) {
   case bc_putfield:
     return &bc_fieldref;
 
+  case _invokespecial_int:
+  case _invokestatic_int:
+    return &bc_imethodref;
   case bc_invokevirtual:
   case bc_invokespecial:
   case bc_invokestatic:
@@ -4177,6 +4180,12 @@ void unpacker::write_bc_ops() {
         }
         origBC = bc;
         switch (bc) {
+        case _invokestatic_int:
+          origBC = bc_invokestatic;
+          break;
+        case _invokespecial_int:
+          origBC = bc_invokespecial;
+          break;
         case bc_ildc:
         case bc_cldc:
         case bc_fldc:
diff --git a/jdk/test/tools/pack200/AttributeTests.java b/jdk/test/tools/pack200/AttributeTests.java
index 6526737b732..c12891829e7 100644
--- a/jdk/test/tools/pack200/AttributeTests.java
+++ b/jdk/test/tools/pack200/AttributeTests.java
@@ -67,17 +67,7 @@ public class AttributeTests {
         File testjarFile = new File(cwd, "test" + Utils.JAR_FILE_EXT);
         Utils.jar("cvf", testjarFile.getName(), javaClassName);
 
-        // pack using native --repack
-        File nativejarFile = new File(cwd, "out-n" + Utils.JAR_FILE_EXT);
-        Utils.repack(testjarFile, nativejarFile, false,
-                     "--unknown-attribute=error");
-        Utils.doCompareVerify(testjarFile, nativejarFile);
-
-        // pack using java --repack
-        File javajarFile = new File(cwd, "out-j" + Utils.JAR_FILE_EXT);
-        Utils.repack(testjarFile, javajarFile, true,
-                     "--unknown-attribute=error");
-        Utils.doCompareBitWise(nativejarFile, javajarFile);
+        Utils.testWithRepack(testjarFile, "--unknown-attribute=error");
     }
     /*
      * this test checks to see if we get the expected strings for output
diff --git a/jdk/test/tools/pack200/InstructionTests.java b/jdk/test/tools/pack200/InstructionTests.java
index ce92c0ed558..7015ae9a11f 100644
--- a/jdk/test/tools/pack200/InstructionTests.java
+++ b/jdk/test/tools/pack200/InstructionTests.java
@@ -26,11 +26,10 @@ import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.List;
 import static java.nio.file.StandardOpenOption.*;
-import java.util.regex.Pattern;
 
 /*
  * @test
- * @bug 8003549
+ * @bug 8003549 8007297
  * @summary tests class files instruction formats introduced in JSR-335
  * @compile -XDignore.symbol.file Utils.java InstructionTests.java
  * @run main InstructionTests
@@ -48,52 +47,34 @@ public class InstructionTests {
         List<String> scratch = new ArrayList<>();
         final String fname = "A";
         String javaFileName = fname + Utils.JAVA_FILE_EXT;
-        scratch.add("interface IntIterator {");
+        scratch.add("interface I {");
         scratch.add("    default void forEach(){}");
         scratch.add("    static void next() {}");
         scratch.add("}");
-        scratch.add("class A implements IntIterator {");
-        scratch.add("public void forEach(Object o){");
-        scratch.add("IntIterator.super.forEach();");
-        scratch.add("IntIterator.next();");
-        scratch.add("}");
+        scratch.add("class A implements I {");
+        scratch.add("    public void forEach(Object o){");
+        scratch.add("        I.super.forEach();");
+        scratch.add("        I.next();");
+        scratch.add("    }");
         scratch.add("}");
         File cwd = new File(".");
         File javaFile = new File(cwd, javaFileName);
         Files.write(javaFile.toPath(), scratch, Charset.defaultCharset(),
                 CREATE, TRUNCATE_EXISTING);
 
-        // make sure we have -g so that we  compare LVT and LNT entries
+        // -g to compare LVT and LNT entries
         Utils.compiler("-g", javaFile.getName());
 
+        File propsFile = new File("pack.props");
+        scratch.clear();
+        scratch.add("com.sun.java.util.jar.pack.class.format.error=error");
+        scratch.add("pack.unknown.attribute=error");
+        Files.write(propsFile.toPath(), scratch, Charset.defaultCharset(),
+                CREATE, TRUNCATE_EXISTING);
         // jar the file up
         File testjarFile = new File(cwd, "test" + Utils.JAR_FILE_EXT);
         Utils.jar("cvf", testjarFile.getName(), ".");
 
-        // pack using --repack
-        File outjarFile = new File(cwd, "out" + Utils.JAR_FILE_EXT);
-        scratch.clear();
-        scratch.add(Utils.getPack200Cmd());
-        scratch.add("-J-ea");
-        scratch.add("-J-esa");
-        scratch.add("--repack");
-        scratch.add(outjarFile.getName());
-        scratch.add(testjarFile.getName());
-        List<String> output = Utils.runExec(scratch);
-        // TODO remove this when we get bc escapes working correctly
-        // this test anyhow would  fail  at that time
-        findString("WARNING: Passing.*" + fname + Utils.CLASS_FILE_EXT,
-                        output);
-
-        Utils.doCompareVerify(testjarFile, outjarFile);
-    }
-
-    static boolean findString(String str, List<String> list) {
-        Pattern p = Pattern.compile(str);
-        for (String x : list) {
-            if (p.matcher(x).matches())
-                return true;
-        }
-        throw new RuntimeException("Error: " + str + " not found in output");
+        Utils.testWithRepack(testjarFile, "--config-file=" + propsFile.getName());
     }
 }
diff --git a/jdk/test/tools/pack200/Utils.java b/jdk/test/tools/pack200/Utils.java
index 07a64595e9f..f3d1d4666b8 100644
--- a/jdk/test/tools/pack200/Utils.java
+++ b/jdk/test/tools/pack200/Utils.java
@@ -314,6 +314,20 @@ class Utils {
             throw new RuntimeException("jar command failed");
         }
     }
+
+    static void testWithRepack(File inFile, String... repackOpts) throws IOException {
+        File cwd = new File(".");
+        // pack using --repack in native mode
+        File nativejarFile = new File(cwd, "out-n" + Utils.JAR_FILE_EXT);
+        repack(inFile, nativejarFile, false, repackOpts);
+        doCompareVerify(inFile, nativejarFile);
+
+        // ensure bit compatibility between the unpacker variants
+        File javajarFile = new File(cwd, "out-j" + Utils.JAR_FILE_EXT);
+        repack(inFile, javajarFile, true, repackOpts);
+        doCompareBitWise(javajarFile, nativejarFile);
+    }
+
     static List<String> repack(File inFile, File outFile,
             boolean disableNative, String... extraOpts) {
         List<String> cmdList = new ArrayList<>();

From 242e864599b3b8c6f3bd36cdd6f5e60ec91355b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Walln=C3=B6fer?= <hannesw@openjdk.org>
Date: Mon, 4 Mar 2013 11:44:54 +0100
Subject: [PATCH 255/311] 8008370: coffee script compiler doesn't work with
 Nashorn

Reviewed-by: lagergren, attila
---
 .../runtime/regexp/RegExpScanner.java         | 15 ++++++-
 nashorn/test/script/basic/JDK-8008370.js      | 44 +++++++++++++++++++
 .../test/script/basic/JDK-8008370.js.EXPECTED | 13 ++++++
 3 files changed, 70 insertions(+), 2 deletions(-)
 create mode 100644 nashorn/test/script/basic/JDK-8008370.js
 create mode 100644 nashorn/test/script/basic/JDK-8008370.js.EXPECTED

diff --git a/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java b/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java
index 55f323dd71b..b579865b693 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/regexp/RegExpScanner.java
@@ -66,6 +66,9 @@ final class RegExpScanner extends Scanner {
     /** Are we currently inside a character class? */
     private boolean inCharClass = false;
 
+    /** Are we currently inside a negated character class? */
+    private boolean inNegativeClass = false;
+
     private static final String NON_IDENT_ESCAPES = "$^*+(){}[]|\\.?";
 
     private static class Capture {
@@ -719,7 +722,12 @@ final class RegExpScanner extends Scanner {
         case 's':
             if (RegExpFactory.usesJavaUtilRegex()) {
                 sb.setLength(sb.length() - 1);
-                sb.append('[').append(Lexer.getWhitespaceRegExp()).append(']');
+                // No nested class required if we already are inside a character class
+                if (inCharClass) {
+                    sb.append(Lexer.getWhitespaceRegExp());
+                } else {
+                    sb.append('[').append(Lexer.getWhitespaceRegExp()).append(']');
+                }
                 skip(1);
                 return true;
             }
@@ -727,7 +735,8 @@ final class RegExpScanner extends Scanner {
         case 'S':
             if (RegExpFactory.usesJavaUtilRegex()) {
                 sb.setLength(sb.length() - 1);
-                sb.append("[^").append(Lexer.getWhitespaceRegExp()).append(']');
+                // In negative class we must use intersection to get double negation ("not anything else than space")
+                sb.append(inNegativeClass ? "&&[" : "[^").append(Lexer.getWhitespaceRegExp()).append(']');
                 skip(1);
                 return true;
             }
@@ -759,6 +768,7 @@ final class RegExpScanner extends Scanner {
                 commit(1);
 
                 if (ch0 == '^') {
+                    inNegativeClass = true;
                     commit(1);
                 }
 
@@ -768,6 +778,7 @@ final class RegExpScanner extends Scanner {
                 }
             } finally {
                 inCharClass = false;  // no nested character classes in JavaScript
+                inNegativeClass = false;
             }
         }
 
diff --git a/nashorn/test/script/basic/JDK-8008370.js b/nashorn/test/script/basic/JDK-8008370.js
new file mode 100644
index 00000000000..5e05becb317
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8008370.js
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8008370: coffee script compiler doesn't work with Nashorn
+ *
+ * @test
+ * @run
+ */
+
+print(/\sx/.exec(" x"));
+print(/[a\s]x/.exec(" x"));
+print(/[a\s]x/.exec("ax"));
+print(/[^a\s]x/.exec("bx"));
+print(/[^a\s]x/.exec("ax"));
+print(/[^a\s]x/.exec(" x"));
+
+print(/\Sx/.exec("ax"));
+print(/[a\S]x/.exec("ax"));
+print(/[a\S]x/.exec("xx"));
+print(/[^a\S]x/.exec("ax"));
+print(/[^a\S]x/.exec("bx"));
+print(/[^\n\S]x/.exec(" x"));
+print(/[^ \S]x/.exec(" x"));
diff --git a/nashorn/test/script/basic/JDK-8008370.js.EXPECTED b/nashorn/test/script/basic/JDK-8008370.js.EXPECTED
new file mode 100644
index 00000000000..42269b453ef
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8008370.js.EXPECTED
@@ -0,0 +1,13 @@
+ x
+ x
+ax
+bx
+null
+null
+ax
+ax
+xx
+null
+null
+ x
+null

From dc1c8a5cd72caf63e22409ab30243586e9d2f8db Mon Sep 17 00:00:00 2001
From: James Laskey <james.laskey@oracle.com>
Date: Mon, 4 Mar 2013 11:01:26 -0400
Subject: [PATCH 256/311] 8009379: Remove $ from generated class names

Reviewed-by: attila, lagergren
---
 .../src/jdk/nashorn/internal/codegen/ClassEmitter.java    | 2 +-
 nashorn/src/jdk/nashorn/internal/codegen/Compiler.java    | 2 +-
 .../jdk/nashorn/internal/codegen/CompilerConstants.java   | 4 ++--
 nashorn/src/jdk/nashorn/internal/codegen/MapCreator.java  | 2 +-
 .../src/jdk/nashorn/internal/codegen/ObjectCreator.java   | 2 +-
 nashorn/src/jdk/nashorn/internal/ir/Symbol.java           | 4 ++--
 nashorn/src/jdk/nashorn/internal/objects/Global.java      | 4 ++--
 .../src/jdk/nashorn/internal/objects/NativeJSAdapter.java | 2 +-
 .../jdk/nashorn/internal/runtime/AccessorProperty.java    | 2 +-
 nashorn/src/jdk/nashorn/internal/runtime/Context.java     | 4 ++--
 nashorn/src/jdk/nashorn/internal/runtime/ECMAErrors.java  | 4 ++--
 nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java | 4 ++--
 .../jdk/nashorn/internal/scripts/{JO$.java => JO.java}    | 8 ++++----
 .../jdk/nashorn/internal/scripts/{JS$.java => JS.java}    | 2 +-
 14 files changed, 23 insertions(+), 23 deletions(-)
 rename nashorn/src/jdk/nashorn/internal/scripts/{JO$.java => JO.java} (93%)
 rename nashorn/src/jdk/nashorn/internal/scripts/{JS$.java => JS.java} (98%)

diff --git a/nashorn/src/jdk/nashorn/internal/codegen/ClassEmitter.java b/nashorn/src/jdk/nashorn/internal/codegen/ClassEmitter.java
index f99d8af1b54..35e74824958 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/ClassEmitter.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/ClassEmitter.java
@@ -188,7 +188,7 @@ public class ClassEmitter implements Emitter {
         this.unitClassName        = unitClassName;
         this.constantMethodNeeded = new HashSet<>();
 
-        cw.visit(V1_7, ACC_PUBLIC | ACC_SUPER, unitClassName, null, pathName(jdk.nashorn.internal.scripts.JS$.class.getName()), null);
+        cw.visit(V1_7, ACC_PUBLIC | ACC_SUPER, unitClassName, null, pathName(jdk.nashorn.internal.scripts.JS.class.getName()), null);
         cw.visitSource(sourceName, null);
 
         defineCommonStatics(strictMode);
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java b/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
index 0996f1f5193..ca23c42809e 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/Compiler.java
@@ -411,7 +411,7 @@ public final class Compiler {
         final MethodEmitter initMethod = classEmitter.init(EnumSet.of(Flag.PRIVATE));
         initMethod.begin();
         initMethod.load(Type.OBJECT, 0);
-        initMethod.newInstance(jdk.nashorn.internal.scripts.JS$.class);
+        initMethod.newInstance(jdk.nashorn.internal.scripts.JS.class);
         initMethod.returnVoid();
         initMethod.end();
 
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CompilerConstants.java b/nashorn/src/jdk/nashorn/internal/codegen/CompilerConstants.java
index 23a50685993..1dcad563fdd 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/CompilerConstants.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CompilerConstants.java
@@ -141,9 +141,9 @@ public enum CompilerConstants {
     INIT_ARGUMENTS("$arguments", 3),
 
     /** prefix for all ScriptObject subclasses with fields, @see ObjectGenerator */
-    JS_OBJECT_PREFIX("JO$"),
+    JS_OBJECT_PREFIX("JO"),
 
-    /** name for allocate method in JO$ objects */
+    /** name for allocate method in JO objects */
     ALLOCATE("allocate"),
 
     /** prefix for split methods, @see Splitter */
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/MapCreator.java b/nashorn/src/jdk/nashorn/internal/codegen/MapCreator.java
index 865c46bf010..00f3f80f55b 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/MapCreator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/MapCreator.java
@@ -49,7 +49,7 @@ public class MapCreator {
     /**
      * Constructor
      *
-     * @param structure structure to generate map for (a JO$ subclass)
+     * @param structure structure to generate map for (a JO subclass)
      * @param keys      list of keys for map
      * @param symbols   list of symbols for map
      */
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/ObjectCreator.java b/nashorn/src/jdk/nashorn/internal/codegen/ObjectCreator.java
index 69a200d75a4..e4e7b7daeeb 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/ObjectCreator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/ObjectCreator.java
@@ -146,7 +146,7 @@ public abstract class ObjectCreator {
 
     /**
      * Get the class name for the object class,
-     * e.g. {@code com.nashorn.oracle.scripts.JO$2P0}
+     * e.g. {@code com.nashorn.oracle.scripts.JO2P0}
      *
      * @return script class name
      */
diff --git a/nashorn/src/jdk/nashorn/internal/ir/Symbol.java b/nashorn/src/jdk/nashorn/internal/ir/Symbol.java
index 92a98ed5f55..a58a7c14961 100644
--- a/nashorn/src/jdk/nashorn/internal/ir/Symbol.java
+++ b/nashorn/src/jdk/nashorn/internal/ir/Symbol.java
@@ -517,7 +517,7 @@ public final class Symbol implements Comparable<Symbol> {
 
     /**
      * Get the index of the field used to store this symbol, should it be an AccessorProperty
-     * and get allocated in a JO$-prefixed ScriptObject subclass.
+     * and get allocated in a JO-prefixed ScriptObject subclass.
      *
      * @return field index
      */
@@ -528,7 +528,7 @@ public final class Symbol implements Comparable<Symbol> {
 
     /**
      * Set the index of the field used to store this symbol, should it be an AccessorProperty
-     * and get allocated in a JO$-prefixed ScriptObject subclass.
+     * and get allocated in a JO-prefixed ScriptObject subclass.
      *
      * @param fieldIndex field index - a positive integer
      */
diff --git a/nashorn/src/jdk/nashorn/internal/objects/Global.java b/nashorn/src/jdk/nashorn/internal/objects/Global.java
index 9f297bfd4bb..9b277e37fb7 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/Global.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/Global.java
@@ -58,7 +58,7 @@ import jdk.nashorn.internal.runtime.ScriptRuntime;
 import jdk.nashorn.internal.runtime.ScriptingFunctions;
 import jdk.nashorn.internal.runtime.Source;
 import jdk.nashorn.internal.runtime.linker.InvokeByName;
-import jdk.nashorn.internal.scripts.JO$;
+import jdk.nashorn.internal.scripts.JO;
 
 /**
  * Representation of global scope.
@@ -1290,7 +1290,7 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
      * @return New empty object.
      */
     public static ScriptObject newEmptyInstance() {
-        final ScriptObject sobj = new JO$();
+        final ScriptObject sobj = new JO();
         sobj.setProto(objectPrototype());
         return sobj;
     }
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java b/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java
index 1a2b2769df2..79bde705038 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java
@@ -159,7 +159,7 @@ public final class NativeJSAdapter extends ScriptObject {
     }
 
     private static ScriptObject wrapAdaptee(final ScriptObject adaptee) {
-        final ScriptObject sobj = new jdk.nashorn.internal.scripts.JO$();
+        final ScriptObject sobj = new jdk.nashorn.internal.scripts.JO();
         sobj.setProto(adaptee);
         return sobj;
     }
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/AccessorProperty.java b/nashorn/src/jdk/nashorn/internal/runtime/AccessorProperty.java
index b69806cc97a..576f357ecce 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/AccessorProperty.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/AccessorProperty.java
@@ -94,7 +94,7 @@ public class AccessorProperty extends Property {
     /**
      * Delegate constructor. This is used when adding properties to the Global scope, which
      * is necessary for outermost levels in a script (the ScriptObject is represented by
-     * a JO$-prefixed ScriptObject class, but the properties need to be in the Global scope
+     * a JO-prefixed ScriptObject class, but the properties need to be in the Global scope
      * and are thus rebound with that as receiver
      *
      * @param property  accessor property to rebind
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Context.java b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
index 7e5d48b5215..202112b187f 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/Context.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
@@ -214,7 +214,7 @@ public final class Context {
     /** Current error manager. */
     private final ErrorManager errors;
 
-    /** Empty map used for seed map for JO$ objects */
+    /** Empty map used for seed map for JO objects */
     final PropertyMap emptyMap = PropertyMap.newEmptyMap(this);
 
     private static final ClassLoader myLoader = Context.class.getClassLoader();
@@ -507,7 +507,7 @@ public final class Context {
      * @see AccessorProperty
      * @see ScriptObject
      *
-     * @param fullName  full name of class, e.g. jdk.nashorn.internal.objects.JO$2P1 contains 2 fields and 1 parameter.
+     * @param fullName  full name of class, e.g. jdk.nashorn.internal.objects.JO2P1 contains 2 fields and 1 parameter.
      *
      * @return the {@code Class<?>} for this structure
      *
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ECMAErrors.java b/nashorn/src/jdk/nashorn/internal/runtime/ECMAErrors.java
index 3c5c1fb6064..35a0f2f48f9 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ECMAErrors.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ECMAErrors.java
@@ -32,7 +32,7 @@ import java.util.Locale;
 import java.util.ResourceBundle;
 
 import jdk.nashorn.api.scripting.NashornException;
-import jdk.nashorn.internal.scripts.JS$;
+import jdk.nashorn.internal.scripts.JS;
 
 /**
  * Helper class to throw various standard "ECMA error" exceptions such as Error, ReferenceError, TypeError etc.
@@ -55,7 +55,7 @@ public final class ECMAErrors {
     /** We assume that compiler generates script classes into the known package. */
     private static final String scriptPackage;
     static {
-        String name = JS$.class.getName();
+        String name = JS.class.getName();
         scriptPackage = name.substring(0, name.lastIndexOf('.'));
     }
 
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java b/nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java
index 872200ba5fe..19c12b7a277 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/PropertyMap.java
@@ -153,7 +153,7 @@ public final class PropertyMap implements Iterable<Object>, PropertyListener {
         final Context context = Context.fromClass(structure);
 
         // Reduce the number of empty maps in the context.
-        if (structure == jdk.nashorn.internal.scripts.JO$.class) {
+        if (structure == jdk.nashorn.internal.scripts.JO.class) {
             return context.emptyMap;
         }
 
@@ -180,7 +180,7 @@ public final class PropertyMap implements Iterable<Object>, PropertyListener {
      * @return New empty {@link PropertyMap}.
      */
     public static PropertyMap newEmptyMap(final Context context) {
-        return new PropertyMap(jdk.nashorn.internal.scripts.JO$.class, context, EMPTY_MAP);
+        return new PropertyMap(jdk.nashorn.internal.scripts.JO.class, context, EMPTY_MAP);
     }
 
     /**
diff --git a/nashorn/src/jdk/nashorn/internal/scripts/JO$.java b/nashorn/src/jdk/nashorn/internal/scripts/JO.java
similarity index 93%
rename from nashorn/src/jdk/nashorn/internal/scripts/JO$.java
rename to nashorn/src/jdk/nashorn/internal/scripts/JO.java
index a773b439313..44412364113 100644
--- a/nashorn/src/jdk/nashorn/internal/scripts/JO$.java
+++ b/nashorn/src/jdk/nashorn/internal/scripts/JO.java
@@ -31,12 +31,12 @@ import jdk.nashorn.internal.runtime.ScriptObject;
 /**
  * Empty object class.
  */
-public class JO$ extends ScriptObject {
+public class JO extends ScriptObject {
 
     /**
      * Constructor
      */
-    public JO$() {
+    public JO() {
         super();
     }
 
@@ -45,7 +45,7 @@ public class JO$ extends ScriptObject {
      *
      * @param map the property map
      */
-    public JO$(final PropertyMap map) {
+    public JO(final PropertyMap map) {
         super(map);
     }
 
@@ -57,6 +57,6 @@ public class JO$ extends ScriptObject {
      * @return newly allocated ScriptObject
      */
     public static ScriptObject allocate(final PropertyMap map) {
-        return new JO$(map);
+        return new JO(map);
     }
 }
diff --git a/nashorn/src/jdk/nashorn/internal/scripts/JS$.java b/nashorn/src/jdk/nashorn/internal/scripts/JS.java
similarity index 98%
rename from nashorn/src/jdk/nashorn/internal/scripts/JS$.java
rename to nashorn/src/jdk/nashorn/internal/scripts/JS.java
index b7c0af6854d..8711d648ba6 100644
--- a/nashorn/src/jdk/nashorn/internal/scripts/JS$.java
+++ b/nashorn/src/jdk/nashorn/internal/scripts/JS.java
@@ -28,6 +28,6 @@ package jdk.nashorn.internal.scripts;
 /**
  * Root of script classes.
  */
-public class JS$ {
+public class JS {
     // Empty
 }

From bc576240bccd3624ce8f1290d5f9debebe2c0ce2 Mon Sep 17 00:00:00 2001
From: Joe Darcy <darcy@openjdk.org>
Date: Mon, 4 Mar 2013 19:42:56 -0800
Subject: [PATCH 257/311] 8009267: Restore isAnnotationPresent methods in
 public AnnotatedElement implementations

Reviewed-by: jjg
---
 jdk/src/share/classes/java/lang/Class.java    | 11 ++++
 jdk/src/share/classes/java/lang/Package.java  | 11 ++++
 .../java/lang/reflect/AccessibleObject.java   | 10 ++++
 .../reflect/OldenCompilingWithDefaults.java   | 54 +++++++++++++++++++
 4 files changed, 86 insertions(+)
 create mode 100644 jdk/test/java/lang/reflect/OldenCompilingWithDefaults.java

diff --git a/jdk/src/share/classes/java/lang/Class.java b/jdk/src/share/classes/java/lang/Class.java
index 671d04a65c7..441f25a8a2c 100644
--- a/jdk/src/share/classes/java/lang/Class.java
+++ b/jdk/src/share/classes/java/lang/Class.java
@@ -25,6 +25,7 @@
 
 package java.lang;
 
+import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Array;
 import java.lang.reflect.GenericArrayType;
 import java.lang.reflect.Member;
@@ -3083,6 +3084,16 @@ public final
         return (A) annotations.get(annotationClass);
     }
 
+    /**
+     * {@inheritDoc}
+     * @throws NullPointerException {@inheritDoc}
+     * @since 1.5
+     */
+    @Override
+    public boolean isAnnotationPresent(Class<? extends Annotation> annotationClass) {
+        return AnnotatedElement.super.isAnnotationPresent(annotationClass);
+    }
+
     /**
      * @throws NullPointerException {@inheritDoc}
      * @since 1.8
diff --git a/jdk/src/share/classes/java/lang/Package.java b/jdk/src/share/classes/java/lang/Package.java
index b9776f478db..7d1d38db64d 100644
--- a/jdk/src/share/classes/java/lang/Package.java
+++ b/jdk/src/share/classes/java/lang/Package.java
@@ -25,6 +25,7 @@
 
 package java.lang;
 
+import java.lang.reflect.AnnotatedElement;
 import java.io.InputStream;
 import java.util.Enumeration;
 
@@ -385,6 +386,16 @@ public class Package implements java.lang.reflect.AnnotatedElement {
         return getPackageInfo().getAnnotation(annotationClass);
     }
 
+    /**
+     * {@inheritDoc}
+     * @throws NullPointerException {@inheritDoc}
+     * @since 1.5
+     */
+    @Override
+    public boolean isAnnotationPresent(Class<? extends Annotation> annotationClass) {
+        return AnnotatedElement.super.isAnnotationPresent(annotationClass);
+    }
+
     /**
      * @throws NullPointerException {@inheritDoc}
      * @since 1.8
diff --git a/jdk/src/share/classes/java/lang/reflect/AccessibleObject.java b/jdk/src/share/classes/java/lang/reflect/AccessibleObject.java
index d198d939d4b..f98aed5db25 100644
--- a/jdk/src/share/classes/java/lang/reflect/AccessibleObject.java
+++ b/jdk/src/share/classes/java/lang/reflect/AccessibleObject.java
@@ -181,6 +181,16 @@ public class AccessibleObject implements AnnotatedElement {
     }
 
     /**
+     * {@inheritDoc}
+     * @throws NullPointerException {@inheritDoc}
+     * @since 1.5
+     */
+    @Override
+    public boolean isAnnotationPresent(Class<? extends Annotation> annotationClass) {
+        return AnnotatedElement.super.isAnnotationPresent(annotationClass);
+    }
+
+   /**
      * @throws NullPointerException {@inheritDoc}
      * @since 1.8
      */
diff --git a/jdk/test/java/lang/reflect/OldenCompilingWithDefaults.java b/jdk/test/java/lang/reflect/OldenCompilingWithDefaults.java
new file mode 100644
index 00000000000..c8609b35f9d
--- /dev/null
+++ b/jdk/test/java/lang/reflect/OldenCompilingWithDefaults.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8009267
+ * @summary Verify uses of isAnnotationPresent compile under older source versions
+ * @compile -source 1.5 -target 1.5 OldenCompilingWithDefaults.java
+ * @compile -source 1.6 -target 1.6 OldenCompilingWithDefaults.java
+ * @compile -source 1.7 -target 1.7 OldenCompilingWithDefaults.java
+ * @compile                         OldenCompilingWithDefaults.java
+ */
+
+import java.lang.reflect.*;
+
+public class OldenCompilingWithDefaults {
+    public OldenCompilingWithDefaults(){}
+    static Object f;
+
+    public static void main(String... args) throws Exception {
+        Class<OldenCompilingWithDefaults> clazz = OldenCompilingWithDefaults.class;
+        Package pkg = clazz.getPackage();
+        Constructor<OldenCompilingWithDefaults> ctor = clazz.getConstructor();
+        Method m = clazz.getMethod("main", String[].class);
+        Field f = clazz.getField("f");
+
+        if(clazz.isAnnotationPresent(SuppressWarnings.class) ||
+           pkg.isAnnotationPresent(SuppressWarnings.class) ||
+           ctor.isAnnotationPresent(SuppressWarnings.class) ||
+           m.isAnnotationPresent(SuppressWarnings.class) ||
+           f.isAnnotationPresent(SuppressWarnings.class))
+            System.out.println("An annotation is present.");
+    }
+}

From 16bd2e129810019abfcc836a5ba6da8c42ba657a Mon Sep 17 00:00:00 2001
From: Naoto Sato <naoto@openjdk.org>
Date: Mon, 4 Mar 2013 20:46:42 -0800
Subject: [PATCH 258/311] 8004240: Return value from getAdapterPrefence() can
 be modified

Reviewed-by: okutsu
---
 .../provider/LocaleProviderAdapter.java       | 37 +++++++-------
 jdk/test/java/util/Locale/Bug8004240.java     | 49 +++++++++++++++++++
 2 files changed, 69 insertions(+), 17 deletions(-)
 create mode 100644 jdk/test/java/util/Locale/Bug8004240.java

diff --git a/jdk/src/share/classes/sun/util/locale/provider/LocaleProviderAdapter.java b/jdk/src/share/classes/sun/util/locale/provider/LocaleProviderAdapter.java
index 2f12f6540ce..d7e32408cbc 100644
--- a/jdk/src/share/classes/sun/util/locale/provider/LocaleProviderAdapter.java
+++ b/jdk/src/share/classes/sun/util/locale/provider/LocaleProviderAdapter.java
@@ -33,6 +33,7 @@ import java.text.spi.DateFormatSymbolsProvider;
 import java.text.spi.DecimalFormatSymbolsProvider;
 import java.text.spi.NumberFormatProvider;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 import java.util.ResourceBundle;
@@ -89,10 +90,7 @@ public abstract class LocaleProviderAdapter {
      * LocaleProviderAdapter preference list. The default list is intended
      * to behave the same manner in JDK7.
      */
-    private static Type[] adapterPreference = {
-        Type.JRE,
-        Type.SPI,
-    };
+    private static final List<Type> adapterPreference;
 
     /**
      * JRE Locale Data Adapter instance
@@ -129,10 +127,11 @@ public abstract class LocaleProviderAdapter {
     static {
         String order = AccessController.doPrivileged(
                            new sun.security.action.GetPropertyAction("java.locale.providers"));
-        // Override adapterPreference with the properties one
+        List<Type> typeList = new ArrayList<>();
+
+        // Check user specified adapter preference
         if (order != null && order.length() != 0) {
             String[] types = order.split(",");
-            List<Type> typeList = new ArrayList<>();
             for (String type : types) {
                 try {
                     Type aType = Type.valueOf(type.trim().toUpperCase(Locale.ROOT));
@@ -153,18 +152,22 @@ public abstract class LocaleProviderAdapter {
                     LocaleServiceProviderPool.config(LocaleProviderAdapter.class, e.toString());
                 }
             }
-
-            if (!typeList.isEmpty()) {
-                if (!typeList.contains(Type.JRE)) {
-                    // Append FALLBACK as the last resort.
-                    fallbackLocaleProviderAdapter = new FallbackLocaleProviderAdapter();
-                    typeList.add(Type.FALLBACK);
-                }
-                adapterPreference = typeList.toArray(new Type[0]);
-            }
         }
-    }
 
+        if (!typeList.isEmpty()) {
+            if (!typeList.contains(Type.JRE)) {
+                // Append FALLBACK as the last resort.
+                fallbackLocaleProviderAdapter = new FallbackLocaleProviderAdapter();
+                typeList.add(Type.FALLBACK);
+            }
+        } else {
+            // Default preference list
+            typeList.add(Type.JRE);
+            typeList.add(Type.SPI);
+        }
+
+        adapterPreference = Collections.unmodifiableList(typeList);
+    }
 
     /**
      * Returns the singleton instance for each adapter type
@@ -202,7 +205,7 @@ public abstract class LocaleProviderAdapter {
     /**
      * Returns the preference order of LocaleProviderAdapter.Type
      */
-    public static Type[] getAdapterPreference() {
+    public static List<Type> getAdapterPreference() {
         return adapterPreference;
     }
 
diff --git a/jdk/test/java/util/Locale/Bug8004240.java b/jdk/test/java/util/Locale/Bug8004240.java
new file mode 100644
index 00000000000..84f291b93ba
--- /dev/null
+++ b/jdk/test/java/util/Locale/Bug8004240.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8004240
+ * @summary Verify that getAdapterPreference returns an unmodifiable list.
+ * @compile -XDignore.symbol.file Bug8004240.java
+ * @run main Bug8004240
+ */
+
+import java.util.List;
+import sun.util.locale.provider.LocaleProviderAdapter;
+
+public class Bug8004240 {
+
+    public static void main(String[] args) {
+        List<LocaleProviderAdapter.Type> types = LocaleProviderAdapter.getAdapterPreference();
+
+        try {
+            types.set(0, null);
+        } catch (UnsupportedOperationException e) {
+            // success
+            return;
+        }
+
+        throw new RuntimeException("LocaleProviderAdapter.getAdapterPrefence() returned a modifiable list.");
+    }
+}

From 112317dbe3a0674c1f3ec012d33c5a4634992e91 Mon Sep 17 00:00:00 2001
From: Staffan Larsen <sla@openjdk.org>
Date: Tue, 5 Mar 2013 08:50:59 +0100
Subject: [PATCH 259/311] 8009287: [parfait] Uninitialised variable in
 hotspot/agent/src/os/linux/ps_core.c

Reviewed-by: dholmes, kvn, mikael, morris
---
 hotspot/agent/src/os/linux/ps_core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hotspot/agent/src/os/linux/ps_core.c b/hotspot/agent/src/os/linux/ps_core.c
index 30023f2397b..c211ff3b34a 100644
--- a/hotspot/agent/src/os/linux/ps_core.c
+++ b/hotspot/agent/src/os/linux/ps_core.c
@@ -132,12 +132,12 @@ static map_info* add_map_info(struct ps_prochandle* ph, int fd, off_t offset,
 }
 
 // Part of the class sharing workaround
-static map_info* add_class_share_map_info(struct ps_prochandle* ph, off_t offset,
+static void add_class_share_map_info(struct ps_prochandle* ph, off_t offset,
                              uintptr_t vaddr, size_t memsz) {
    map_info* map;
    if ((map = allocate_init_map(ph->core->classes_jsa_fd,
                                 offset, vaddr, memsz)) == NULL) {
-      return NULL;
+      return;
    }
 
    map->next = ph->core->class_share_maps;

From 1ba4dd5979d8124c19f89f2c4133617d8eb44d4d Mon Sep 17 00:00:00 2001
From: Eric Wang <ewang@openjdk.org>
Date: Tue, 5 Mar 2013 10:10:55 +0000
Subject: [PATCH 260/311] 8009259: TEST_BUG: sun/misc/Cleaner/exitOnThrow.sh
 failing intermittently

Reviewed-by: chegar, alanb
---
 jdk/test/sun/misc/Cleaner/ExitOnThrow.java | 6 +-----
 jdk/test/sun/misc/Cleaner/exitOnThrow.sh   | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/jdk/test/sun/misc/Cleaner/ExitOnThrow.java b/jdk/test/sun/misc/Cleaner/ExitOnThrow.java
index 03ea83d9d45..f4fd8021748 100644
--- a/jdk/test/sun/misc/Cleaner/ExitOnThrow.java
+++ b/jdk/test/sun/misc/Cleaner/ExitOnThrow.java
@@ -28,21 +28,17 @@ import sun.misc.*;
 
 public class ExitOnThrow {
 
-    private static volatile boolean ran = false;
-
     public static void main(String[] args) throws Exception {
         Cleaner.create(new Object(),
                        new Runnable() {
                                public void run() {
-                                   ran = true;
                                    throw new RuntimeException("Foo!");
                                }
                            });
-        while (!ran) {
+        while (true) {
             System.gc();
             Thread.sleep(100);
         }
-        System.exit(0);
     }
 
 }
diff --git a/jdk/test/sun/misc/Cleaner/exitOnThrow.sh b/jdk/test/sun/misc/Cleaner/exitOnThrow.sh
index 7506ce4403f..4a22114ab18 100644
--- a/jdk/test/sun/misc/Cleaner/exitOnThrow.sh
+++ b/jdk/test/sun/misc/Cleaner/exitOnThrow.sh
@@ -25,7 +25,7 @@
 
 #
 # @test
-# @bug 4954921
+# @bug 4954921 8009259
 # @summary Ensure that if a cleaner throws an exception then the VM exits
 #
 # @build ExitOnThrow

From 7659fe9df29c3325df8020c5a921c5387d2a0ccf Mon Sep 17 00:00:00 2001
From: Andrew Brygin <bae@openjdk.org>
Date: Tue, 5 Mar 2013 17:18:55 +0400
Subject: [PATCH 261/311] 7152608: [macosx] Crash in liblwawt.dylib in
 AccelGlyphCache_RemoveCellInfo

Reviewed-by: jgodinez, ant
---
 jdk/src/macosx/classes/sun/font/CStrike.java   | 10 ++++++++--
 .../classes/sun/font/CStrikeDisposer.java      |  2 ++
 jdk/src/macosx/native/sun/font/AWTStrike.m     | 18 ++++++++++++++++++
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/jdk/src/macosx/classes/sun/font/CStrike.java b/jdk/src/macosx/classes/sun/font/CStrike.java
index 61fe234cb29..9635b85a1de 100644
--- a/jdk/src/macosx/classes/sun/font/CStrike.java
+++ b/jdk/src/macosx/classes/sun/font/CStrike.java
@@ -500,7 +500,10 @@ public class CStrike extends FontStrike {
                 final Iterator<Long> i = generalCache.values().iterator();
                 while (i.hasNext()) {
                     final long longValue = i.next().longValue();
-                    if (longValue != -1 && longValue != 0) StrikeCache.freeLongPointer(longValue);
+                    if (longValue != -1 && longValue != 0) {
+                        removeGlyphInfoFromCache(longValue);
+                        StrikeCache.freeLongPointer(longValue);
+                    }
                 }
             }
 
@@ -512,7 +515,10 @@ public class CStrike extends FontStrike {
         private static void disposeLongArray(final long[] longArray) {
             for (int i = 0; i < longArray.length; i++) {
                 final long ptr = longArray[i];
-                if (ptr != 0 && ptr != -1) StrikeCache.freeLongPointer(ptr); // free's the native struct pointer
+                if (ptr != 0 && ptr != -1) {
+                    removeGlyphInfoFromCache(ptr);
+                    StrikeCache.freeLongPointer(ptr); // free's the native struct pointer
+                }
             }
         }
 
diff --git a/jdk/src/macosx/classes/sun/font/CStrikeDisposer.java b/jdk/src/macosx/classes/sun/font/CStrikeDisposer.java
index 7357ea6bd42..661bd6a7b42 100644
--- a/jdk/src/macosx/classes/sun/font/CStrikeDisposer.java
+++ b/jdk/src/macosx/classes/sun/font/CStrikeDisposer.java
@@ -85,4 +85,6 @@ class CStrikeDisposer extends FontStrikeDisposer {
     }
 
     private native void freeNativeScalerContext(long pContext);
+
+    protected static native void removeGlyphInfoFromCache(long glyphInfo);
 }
diff --git a/jdk/src/macosx/native/sun/font/AWTStrike.m b/jdk/src/macosx/native/sun/font/AWTStrike.m
index 261bd34ae57..7f04b530ade 100644
--- a/jdk/src/macosx/native/sun/font/AWTStrike.m
+++ b/jdk/src/macosx/native/sun/font/AWTStrike.m
@@ -27,11 +27,13 @@
 #import "java_awt_geom_PathIterator.h"
 #import "sun_awt_SunHints.h"
 #import "sun_font_CStrike.h"
+#import "sun_font_CStrikeDisposer.h"
 #import "CGGlyphImages.h"
 #import "CGGlyphOutlines.h"
 #import "AWTStrike.h"
 #import "CoreTextSupport.h"
 //#import "jni_util.h"
+#include "fontscalerdefs.h"
 
 /* Use THIS_FILE when it is available. */
 #ifndef THIS_FILE
@@ -423,3 +425,19 @@ JNF_COCOA_EXIT(env);
 
     return metrics;
 }
+
+extern void AccelGlyphCache_RemoveAllInfos(GlyphInfo* glyph);
+/*
+ * Class:     sun_font_CStrikeDisposer
+ * Method:    removeGlyphInfoFromCache
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_sun_font_CStrikeDisposer_removeGlyphInfoFromCache
+(JNIEnv *env, jclass cls, jlong glyphInfo)
+{
+    JNF_COCOA_ENTER(env);
+
+    AccelGlyphCache_RemoveAllCellInfos((GlyphInfo*)jlong_to_ptr(glyphInfo));
+
+    JNF_COCOA_EXIT(env);
+}

From d2b27faad41f29cfd2126f8a661a740018a0259e Mon Sep 17 00:00:00 2001
From: John Zavgren <jzavgren@openjdk.org>
Date: Tue, 5 Mar 2013 14:30:18 +0000
Subject: [PATCH 262/311] 8008804: file descriptor leak in
 src/windows/native/java/net/DualStackPlainSocketImpl.c

Reviewed-by: alanb, chegar, dsamersoff
---
 .../windows/native/java/net/DualStackPlainDatagramSocketImpl.c   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jdk/src/windows/native/java/net/DualStackPlainDatagramSocketImpl.c b/jdk/src/windows/native/java/net/DualStackPlainDatagramSocketImpl.c
index d3de6e7f024..cdd969cef79 100644
--- a/jdk/src/windows/native/java/net/DualStackPlainDatagramSocketImpl.c
+++ b/jdk/src/windows/native/java/net/DualStackPlainDatagramSocketImpl.c
@@ -89,6 +89,7 @@ JNIEXPORT jint JNICALL Java_java_net_DualStackPlainDatagramSocketImpl_socketCrea
     rv = setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, (char *) &opt, sizeof(opt));
     if (rv == SOCKET_ERROR) {
         NET_ThrowNew(env, WSAGetLastError(), "Socket creation failed");
+        closesocket(fd);
         return -1;
     }
 

From 838b7a170643806f679728889565399e697f6b22 Mon Sep 17 00:00:00 2001
From: John Zavgren <jzavgren@openjdk.org>
Date: Tue, 5 Mar 2013 09:50:53 -0500
Subject: [PATCH 263/311] 4880778: URL final class has protected methods

The two set() methods have been defined to be package private.

Reviewed-by: alanb, chegar, khazra
---
 jdk/src/share/classes/java/net/URL.java              | 10 +++++-----
 jdk/src/share/classes/java/net/URLStreamHandler.java |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/jdk/src/share/classes/java/net/URL.java b/jdk/src/share/classes/java/net/URL.java
index 62271037126..caa1d5964cb 100644
--- a/jdk/src/share/classes/java/net/URL.java
+++ b/jdk/src/share/classes/java/net/URL.java
@@ -661,8 +661,8 @@ public final class URL implements java.io.Serializable {
      * @param file the file on the host
      * @param ref the internal reference in the URL
      */
-    protected void set(String protocol, String host,
-                       int port, String file, String ref) {
+    void set(String protocol, String host, int port,
+             String file, String ref) {
         synchronized (this) {
             this.protocol = protocol;
             this.host = host;
@@ -698,9 +698,9 @@ public final class URL implements java.io.Serializable {
      * @param query the query part of this URL
      * @since 1.3
      */
-    protected void set(String protocol, String host, int port,
-                       String authority, String userInfo, String path,
-                       String query, String ref) {
+    void set(String protocol, String host, int port,
+             String authority, String userInfo, String path,
+             String query, String ref) {
         synchronized (this) {
             this.protocol = protocol;
             this.host = host;
diff --git a/jdk/src/share/classes/java/net/URLStreamHandler.java b/jdk/src/share/classes/java/net/URLStreamHandler.java
index 6af130b6c4c..0561527488d 100644
--- a/jdk/src/share/classes/java/net/URLStreamHandler.java
+++ b/jdk/src/share/classes/java/net/URLStreamHandler.java
@@ -509,8 +509,8 @@ public abstract class URLStreamHandler {
 
     /**
      * Sets the fields of the <code>URL</code> argument to the indicated values.
-     * Only classes derived from URLStreamHandler are supposed to be able
-     * to call the set method on a URL.
+     * Only classes derived from URLStreamHandler are able
+     * to use this method to set the values of the URL fields.
      *
      * @param   u         the URL to modify.
      * @param   protocol  the protocol name.
@@ -539,8 +539,8 @@ public abstract class URLStreamHandler {
 
     /**
      * Sets the fields of the <code>URL</code> argument to the indicated values.
-     * Only classes derived from URLStreamHandler are supposed to be able
-     * to call the set method on a URL.
+     * Only classes derived from URLStreamHandler are able
+     * to use this method to set the values of the URL fields.
      *
      * @param   u         the URL to modify.
      * @param   protocol  the protocol name. This value is ignored since 1.2.

From 2b100092d00d34b87508126912b157c597fa958d Mon Sep 17 00:00:00 2001
From: Staffan Larsen <sla@openjdk.org>
Date: Tue, 5 Mar 2013 19:25:35 +0100
Subject: [PATCH 264/311] 8009397: test/com/sun/jdi/PrivateTransportTest.sh:
 ERROR: transport library missing onLoad entry: private_dt_socket

Reviewed-by: alanb
---
 jdk/src/share/back/transport.c              |  3 +++
 jdk/src/share/demo/jvmti/hprof/hprof_init.c |  9 +++++++++
 jdk/src/solaris/back/linker_md.c            |  9 +++++++--
 jdk/src/solaris/demo/jvmti/hprof/hprof_md.c | 11 ++++++++---
 jdk/src/windows/back/linker_md.c            | 11 ++++++++---
 jdk/src/windows/demo/jvmti/hprof/hprof_md.c | 11 ++++++++---
 6 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/jdk/src/share/back/transport.c b/jdk/src/share/back/transport.c
index 40608b31239..1d7335d660b 100644
--- a/jdk/src/share/back/transport.c
+++ b/jdk/src/share/back/transport.c
@@ -117,6 +117,9 @@ loadTransportLibrary(char *libdir, char *name)
 
     /* Construct library name (simple name or full path) */
     dbgsysBuildLibName(libname, sizeof(libname), plibdir, name);
+    if (strlen(libname) == 0) {
+        return NULL;
+    }
 
     /* dlopen (unix) / LoadLibrary (windows) the transport library */
     handle = dbgsysLoadLibrary(libname, buf, sizeof(buf));
diff --git a/jdk/src/share/demo/jvmti/hprof/hprof_init.c b/jdk/src/share/demo/jvmti/hprof/hprof_init.c
index 328c474d410..aa3c820f1fc 100644
--- a/jdk/src/share/demo/jvmti/hprof/hprof_init.c
+++ b/jdk/src/share/demo/jvmti/hprof/hprof_init.c
@@ -1899,11 +1899,17 @@ load_library(char *name)
      */
     getSystemProperty("sun.boot.library.path", &boot_path);
     md_build_library_name(lname, FILENAME_MAX, boot_path, name);
+    if ( strlen(lname) == 0 ) {
+        HPROF_ERROR(JNI_TRUE, "Could not find library");
+    }
     jvmtiDeallocate(boot_path);
     handle = md_load_library(lname, err_buf, (int)sizeof(err_buf));
     if ( handle == NULL ) {
         /* This may be necessary on Windows. */
         md_build_library_name(lname, FILENAME_MAX, "", name);
+        if ( strlen(lname) == 0 ) {
+            HPROF_ERROR(JNI_TRUE, "Could not find library");
+        }
         handle = md_load_library(lname, err_buf, (int)sizeof(err_buf));
         if ( handle == NULL ) {
             HPROF_ERROR(JNI_TRUE, err_buf);
@@ -1968,6 +1974,9 @@ Agent_OnLoad(JavaVM *vm, char *options, void *reserved)
     getSystemProperty("sun.boot.library.path", &boot_path);
     /* Load in NPT library for character conversions */
     md_build_library_name(npt_lib, sizeof(npt_lib), boot_path, NPT_LIBNAME);
+    if ( strlen(npt_lib) == 0 ) {
+        HPROF_ERROR(JNI_TRUE, "Could not find npt library");
+    }
     jvmtiDeallocate(boot_path);
     NPT_INITIALIZE(npt_lib, &(gdata->npt), NPT_VERSION, NULL);
     if ( gdata->npt == NULL ) {
diff --git a/jdk/src/solaris/back/linker_md.c b/jdk/src/solaris/back/linker_md.c
index a1cbcce3fcf..dbcfc04a40a 100644
--- a/jdk/src/solaris/back/linker_md.c
+++ b/jdk/src/solaris/back/linker_md.c
@@ -60,6 +60,7 @@ static void dll_build_name(char* buffer, size_t buflen,
 
     char *path_sep = PATH_SEPARATOR;
     char *pathname = (char *)pname;
+    *buffer = '\0';
     while (strlen(pathname) > 0) {
         char *p = strchr(pathname, *path_sep);
         if (p == NULL) {
@@ -69,13 +70,17 @@ static void dll_build_name(char* buffer, size_t buflen,
         if (p == pathname) {
             continue;
         }
-        (void)snprintf(buffer, buflen, "%.*s/lib%s." LIB_SUFFIX, (p - pathname),
+        (void)snprintf(buffer, buflen, "%.*s/lib%s." LIB_SUFFIX, (int)(p - pathname),
                        pathname, fname);
 
         if (access(buffer, F_OK) == 0) {
             break;
         }
-        pathname = p + 1;
+        if (*p == '\0') {
+            pathname = p;
+        } else {
+            pathname = p + 1;
+        }
         *buffer = '\0';
     }
 }
diff --git a/jdk/src/solaris/demo/jvmti/hprof/hprof_md.c b/jdk/src/solaris/demo/jvmti/hprof/hprof_md.c
index 1df2271ce4e..204636328f9 100644
--- a/jdk/src/solaris/demo/jvmti/hprof/hprof_md.c
+++ b/jdk/src/solaris/demo/jvmti/hprof/hprof_md.c
@@ -385,6 +385,7 @@ static void dll_build_name(char* buffer, size_t buflen,
     // Loosely based on os_solaris.cpp
 
       char *pathname = (char *)pname;
+      *buffer = '\0';
       while (strlen(pathname) > 0) {
           char *p = strchr(pathname, ':');
           if (p == NULL) {
@@ -395,12 +396,16 @@ static void dll_build_name(char* buffer, size_t buflen,
               continue;
           }
           (void)snprintf(buffer, buflen, "%.*s/lib%s" JNI_LIB_SUFFIX,
-                         (p - pathname), pathname, fname);
+                         (int)(p - pathname), pathname, fname);
 
           if (access(buffer, F_OK) == 0) {
-            break;
+              break;
+          }
+          if (*p == '\0') {
+              pathname = p;
+          } else {
+              pathname = p + 1;
           }
-          pathname = p + 1;
           *buffer = '\0';
       }
 }
diff --git a/jdk/src/windows/back/linker_md.c b/jdk/src/windows/back/linker_md.c
index e3ca2584cef..ad48d3d57c2 100644
--- a/jdk/src/windows/back/linker_md.c
+++ b/jdk/src/windows/back/linker_md.c
@@ -44,6 +44,7 @@ static void dll_build_name(char* buffer, size_t buflen,
 
     char *path_sep = PATH_SEPARATOR;
     char *pathname = (char *)pname;
+    *buffer = '\0';
     while (strlen(pathname) > 0) {
         char *p = strchr(pathname, *path_sep);
         if (p == NULL) {
@@ -54,16 +55,20 @@ static void dll_build_name(char* buffer, size_t buflen,
             continue;
         }
         if (*(p-1) == ':' || *(p-1) == '\\') {
-            (void)_snprintf(buffer, buflen, "%.*s%s.dll", (p - pathname),
+            (void)_snprintf(buffer, buflen, "%.*s%s.dll", (int)(p - pathname),
                             pathname, fname);
         } else {
-            (void)_snprintf(buffer, buflen, "%.*s\\%s.dll", (p - pathname),
+            (void)_snprintf(buffer, buflen, "%.*s\\%s.dll", (int)(p - pathname),
                             pathname, fname);
         }
         if (_access(buffer, 0) == 0) {
             break;
         }
-        pathname = p + 1;
+        if (*p == '\0') {
+            pathname = p;
+        } else {
+            pathname = p + 1;
+        }
         *buffer = '\0';
     }
 }
diff --git a/jdk/src/windows/demo/jvmti/hprof/hprof_md.c b/jdk/src/windows/demo/jvmti/hprof/hprof_md.c
index e5cbeda0f69..4bd4a40f049 100644
--- a/jdk/src/windows/demo/jvmti/hprof/hprof_md.c
+++ b/jdk/src/windows/demo/jvmti/hprof/hprof_md.c
@@ -372,6 +372,7 @@ static void dll_build_name(char* buffer, size_t buflen,
     // Loosley based on os_windows.cpp
 
     char *pathname = (char *)pname;
+    *buffer = '\0';
     while (strlen(pathname) > 0) {
         char *p = strchr(pathname, ';');
         if (p == NULL) {
@@ -382,16 +383,20 @@ static void dll_build_name(char* buffer, size_t buflen,
             continue;
         }
         if (*(p-1) == ':' || *(p-1) == '\\') {
-            (void)_snprintf(buffer, buflen, "%.*s%s.dll", (p - pathname),
+          (void)_snprintf(buffer, buflen, "%.*s%s.dll", (int)(p - pathname),
                             pathname, fname);
         } else {
-            (void)_snprintf(buffer, buflen, "%.*s\\%s.dll", (p - pathname),
+          (void)_snprintf(buffer, buflen, "%.*s\\%s.dll", (int)(p - pathname),
                             pathname, fname);
         }
         if (_access(buffer, 0) == 0) {
             break;
         }
-        pathname = p + 1;
+        if (*p == '\0') {
+            pathname = p;
+        } else {
+            pathname = p + 1;
+        }
         *buffer = '\0';
     }
 }

From 8391257f03fd2ccf35be23327cc00ca7b3d5a9d6 Mon Sep 17 00:00:00 2001
From: Martin Buchholz <martin@openjdk.org>
Date: Tue, 5 Mar 2013 13:16:40 -0800
Subject: [PATCH 265/311] 8006988: build-infra: Configure fails if 'cl' is in
 path on linux

Respect user CC and CXX environment variables; use cl iff on windows

Reviewed-by: erikj
---
 common/autoconf/generated-configure.sh | 36 ++++++++++++++++----------
 common/autoconf/toolchain.m4           | 34 ++++++++++++++----------
 2 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
index 04bef5cadc1..5772ad39a19 100644
--- a/common/autoconf/generated-configure.sh
+++ b/common/autoconf/generated-configure.sh
@@ -3733,7 +3733,7 @@ fi
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1361899489
+DATE_WHEN_GENERATED=1362517596
 
 ###############################################################################
 #
@@ -18105,14 +18105,18 @@ fi
 
 ### Locate C compiler (CC)
 
-# gcc is almost always present, but on Windows we
-# prefer cl.exe and on Solaris we prefer CC.
-# Thus test for them in this order.
-if test "x$OPENJDK_TARGET_OS" = xmacosx; then
-  # Do not probe for cc on MacOSX.
-  COMPILER_CHECK_LIST="cl gcc"
+# On windows, only cl.exe is supported.
+# On Solaris, cc is preferred to gcc.
+# Elsewhere, gcc is preferred to cc.
+
+if test "x$CC" != x; then
+  COMPILER_CHECK_LIST="$CC"
+elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then
+  COMPILER_CHECK_LIST="cl"
+elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
+  COMPILER_CHECK_LIST="cc gcc"
 else
-  COMPILER_CHECK_LIST="cl cc gcc"
+  COMPILER_CHECK_LIST="gcc cc"
 fi
 
 
@@ -19076,7 +19080,7 @@ $as_echo "$as_me: The result from running with --version was: \"$COMPILER_VERSIO
 $as_echo "$as_me: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&6;}
 
 
-# Now that we have resolved CC ourself, let autoconf have it's go at it
+# Now that we have resolved CC ourself, let autoconf have its go at it
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -19678,13 +19682,17 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 ### Locate C++ compiler (CXX)
 
-if test "x$OPENJDK_TARGET_OS" = xmacosx; then
-  # Do not probe for CC on MacOSX.
-  COMPILER_CHECK_LIST="cl g++"
+if test "x$CXX" != x; then
+  COMPILER_CHECK_LIST="$CXX"
+elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then
+  COMPILER_CHECK_LIST="cl"
+elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
+  COMPILER_CHECK_LIST="CC g++"
 else
-  COMPILER_CHECK_LIST="cl CC g++"
+  COMPILER_CHECK_LIST="g++ CC"
 fi
 
+
   COMPILER_NAME=C++
 
   CXX=
@@ -20645,7 +20653,7 @@ $as_echo "$as_me: The result from running with --version was: \"$COMPILER_VERSIO
 $as_echo "$as_me: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&6;}
 
 
-# Now that we have resolved CXX ourself, let autoconf have it's go at it
+# Now that we have resolved CXX ourself, let autoconf have its go at it
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
diff --git a/common/autoconf/toolchain.m4 b/common/autoconf/toolchain.m4
index 740b0c48093..80d81c4ff6e 100644
--- a/common/autoconf/toolchain.m4
+++ b/common/autoconf/toolchain.m4
@@ -248,30 +248,38 @@ fi
 
 ### Locate C compiler (CC)
 
-# gcc is almost always present, but on Windows we
-# prefer cl.exe and on Solaris we prefer CC.
-# Thus test for them in this order.
-if test "x$OPENJDK_TARGET_OS" = xmacosx; then
-  # Do not probe for cc on MacOSX.
-  COMPILER_CHECK_LIST="cl gcc"
+# On windows, only cl.exe is supported.
+# On Solaris, cc is preferred to gcc.
+# Elsewhere, gcc is preferred to cc.
+
+if test "x$CC" != x; then
+  COMPILER_CHECK_LIST="$CC"
+elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then
+  COMPILER_CHECK_LIST="cl"
+elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
+  COMPILER_CHECK_LIST="cc gcc"
 else
-  COMPILER_CHECK_LIST="cl cc gcc"
+  COMPILER_CHECK_LIST="gcc cc"
 fi
 
 TOOLCHAIN_FIND_COMPILER([CC],[C],[$COMPILER_CHECK_LIST])
-# Now that we have resolved CC ourself, let autoconf have it's go at it
+# Now that we have resolved CC ourself, let autoconf have its go at it
 AC_PROG_CC([$CC])
 
 ### Locate C++ compiler (CXX)
 
-if test "x$OPENJDK_TARGET_OS" = xmacosx; then
-  # Do not probe for CC on MacOSX.
-  COMPILER_CHECK_LIST="cl g++"
+if test "x$CXX" != x; then
+  COMPILER_CHECK_LIST="$CXX"
+elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then
+  COMPILER_CHECK_LIST="cl"
+elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
+  COMPILER_CHECK_LIST="CC g++"
 else
-  COMPILER_CHECK_LIST="cl CC g++"
+  COMPILER_CHECK_LIST="g++ CC"
 fi
+
 TOOLCHAIN_FIND_COMPILER([CXX],[C++],[$COMPILER_CHECK_LIST])
-# Now that we have resolved CXX ourself, let autoconf have it's go at it
+# Now that we have resolved CXX ourself, let autoconf have its go at it
 AC_PROG_CXX([$CXX])
 
 ### Locate other tools

From 5116181e1f80882289f8c89a674be38af9954099 Mon Sep 17 00:00:00 2001
From: Ioi Lam <ioi.lam@oracle.com>
Date: Tue, 5 Mar 2013 13:55:56 -0800
Subject: [PATCH 266/311] 7107135: Stack guard pages are no more protected
 after loading a shared library with executable stack

Detect the execstack attribute of the loaded library and attempt to fix the stack guard using Safepoint op.

Reviewed-by: dholmes, zgu
---
 hotspot/src/os/linux/vm/globals_linux.hpp     |   5 +-
 hotspot/src/os/linux/vm/os_linux.cpp          | 120 +++++++++++++++++-
 hotspot/src/os/linux/vm/os_linux.hpp          |   3 +
 .../os_cpu/linux_sparc/vm/os_linux_sparc.cpp  |   5 +
 .../src/os_cpu/linux_x86/vm/os_linux_x86.cpp  |   5 +
 hotspot/src/share/vm/runtime/thread.hpp       |   7 +-
 .../src/share/vm/runtime/vm_operations.hpp    |   1 +
 hotspot/src/share/vm/utilities/elfFile.cpp    |  24 ++++
 hotspot/src/share/vm/utilities/elfFile.hpp    |  10 ++
 hotspot/test/runtime/7107135/Test.java        |  65 ++++++++++
 hotspot/test/runtime/7107135/Test7107135.sh   |  98 ++++++++++++++
 hotspot/test/runtime/7107135/TestMT.java      |  85 +++++++++++++
 hotspot/test/runtime/7107135/test.c           |  39 ++++++
 13 files changed, 464 insertions(+), 3 deletions(-)
 create mode 100644 hotspot/test/runtime/7107135/Test.java
 create mode 100644 hotspot/test/runtime/7107135/Test7107135.sh
 create mode 100644 hotspot/test/runtime/7107135/TestMT.java
 create mode 100644 hotspot/test/runtime/7107135/test.c

diff --git a/hotspot/src/os/linux/vm/globals_linux.hpp b/hotspot/src/os/linux/vm/globals_linux.hpp
index 56bb45213ad..af4947b1b86 100644
--- a/hotspot/src/os/linux/vm/globals_linux.hpp
+++ b/hotspot/src/os/linux/vm/globals_linux.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,6 +40,9 @@
   product(bool, UseHugeTLBFS, false,                                    \
           "Use MAP_HUGETLB for large pages")                            \
                                                                         \
+  product(bool, LoadExecStackDllInVMThread, true,                       \
+          "Load DLLs with executable-stack attribute in the VM Thread") \
+                                                                        \
   product(bool, UseSHM, false,                                          \
           "Use SYSV shared memory for large pages")
 
diff --git a/hotspot/src/os/linux/vm/os_linux.cpp b/hotspot/src/os/linux/vm/os_linux.cpp
index b14615e58e8..6dfe962b1c5 100644
--- a/hotspot/src/os/linux/vm/os_linux.cpp
+++ b/hotspot/src/os/linux/vm/os_linux.cpp
@@ -44,6 +44,7 @@
 #include "runtime/extendedPC.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/interfaceSupport.hpp"
+#include "runtime/init.hpp"
 #include "runtime/java.hpp"
 #include "runtime/javaCalls.hpp"
 #include "runtime/mutexLocker.hpp"
@@ -61,6 +62,7 @@
 #include "utilities/decoder.hpp"
 #include "utilities/defaultStream.hpp"
 #include "utilities/events.hpp"
+#include "utilities/elfFile.hpp"
 #include "utilities/growableArray.hpp"
 #include "utilities/vmError.hpp"
 
@@ -1796,9 +1798,93 @@ bool os::dll_address_to_library_name(address addr, char* buf,
   // in case of error it checks if .dll/.so was built for the
   // same architecture as Hotspot is running on
 
+
+// Remember the stack's state. The Linux dynamic linker will change
+// the stack to 'executable' at most once, so we must safepoint only once.
+bool os::Linux::_stack_is_executable = false;
+
+// VM operation that loads a library.  This is necessary if stack protection
+// of the Java stacks can be lost during loading the library.  If we
+// do not stop the Java threads, they can stack overflow before the stacks
+// are protected again.
+class VM_LinuxDllLoad: public VM_Operation {
+ private:
+  const char *_filename;
+  void *_lib;
+ public:
+  VM_LinuxDllLoad(const char *fn) :
+    _filename(fn), _lib(NULL) {}
+  VMOp_Type type() const { return VMOp_LinuxDllLoad; }
+  void doit() {
+    _lib = os::Linux::dll_load_inner(_filename);
+    os::Linux::_stack_is_executable = true;
+  }
+  void* loaded_library() { return _lib; }
+};
+
 void * os::dll_load(const char *filename, char *ebuf, int ebuflen)
 {
-  void * result= ::dlopen(filename, RTLD_LAZY);
+  void * result = NULL;
+  bool load_attempted = false;
+
+  // Check whether the library to load might change execution rights
+  // of the stack. If they are changed, the protection of the stack
+  // guard pages will be lost. We need a safepoint to fix this.
+  //
+  // See Linux man page execstack(8) for more info.
+  if (os::uses_stack_guard_pages() && !os::Linux::_stack_is_executable) {
+    ElfFile ef(filename);
+    if (!ef.specifies_noexecstack()) {
+      if (!is_init_completed()) {
+        os::Linux::_stack_is_executable = true;
+        // This is OK - No Java threads have been created yet, and hence no
+        // stack guard pages to fix.
+        //
+        // This should happen only when you are building JDK7 using a very
+        // old version of JDK6 (e.g., with JPRT) and running test_gamma.
+        //
+        // Dynamic loader will make all stacks executable after
+        // this function returns, and will not do that again.
+        assert(Threads::first() == NULL, "no Java threads should exist yet.");
+      } else {
+        warning("You have loaded library %s which might have disabled stack guard. "
+                "The VM will try to fix the stack guard now.\n"
+                "It's highly recommended that you fix the library with "
+                "'execstack -c <libfile>', or link it with '-z noexecstack'.",
+                filename);
+
+        assert(Thread::current()->is_Java_thread(), "must be Java thread");
+        JavaThread *jt = JavaThread::current();
+        if (jt->thread_state() != _thread_in_native) {
+          // This happens when a compiler thread tries to load a hsdis-<arch>.so file
+          // that requires ExecStack. Cannot enter safe point. Let's give up.
+          warning("Unable to fix stack guard. Giving up.");
+        } else {
+          if (!LoadExecStackDllInVMThread) {
+            // This is for the case where the DLL has an static
+            // constructor function that executes JNI code. We cannot
+            // load such DLLs in the VMThread.
+            result = ::dlopen(filename, RTLD_LAZY);
+          }
+
+          ThreadInVMfromNative tiv(jt);
+          debug_only(VMNativeEntryWrapper vew;)
+
+          VM_LinuxDllLoad op(filename);
+          VMThread::execute(&op);
+          if (LoadExecStackDllInVMThread) {
+            result = op.loaded_library();
+          }
+          load_attempted = true;
+        }
+      }
+    }
+  }
+
+  if (!load_attempted) {
+    result = ::dlopen(filename, RTLD_LAZY);
+  }
+
   if (result != NULL) {
     // Successful loading
     return result;
@@ -1952,6 +2038,38 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen)
   return NULL;
 }
 
+void * os::Linux::dll_load_inner(const char *filename) {
+  void * result = NULL;
+  if (LoadExecStackDllInVMThread) {
+    result = ::dlopen(filename, RTLD_LAZY);
+  }
+
+  // Since 7019808, libjvm.so is linked with -noexecstack. If the VM loads a
+  // library that requires an executable stack, or which does not have this
+  // stack attribute set, dlopen changes the stack attribute to executable. The
+  // read protection of the guard pages gets lost.
+  //
+  // Need to check _stack_is_executable again as multiple VM_LinuxDllLoad
+  // may have been queued at the same time.
+
+  if (!_stack_is_executable) {
+    JavaThread *jt = Threads::first();
+
+    while (jt) {
+      if (!jt->stack_guard_zone_unused() &&        // Stack not yet fully initialized
+          jt->stack_yellow_zone_enabled()) {       // No pending stack overflow exceptions
+        if (!os::guard_memory((char *) jt->stack_red_zone_base() - jt->stack_red_zone_size(),
+                              jt->stack_yellow_zone_size() + jt->stack_red_zone_size())) {
+          warning("Attempt to reguard stack yellow zone failed.");
+        }
+      }
+      jt = jt->next();
+    }
+  }
+
+  return result;
+}
+
 /*
  * glibc-2.0 libdl is not MT safe.  If you are building with any glibc,
  * chances are you might want to run the generated bits against glibc-2.0
diff --git a/hotspot/src/os/linux/vm/os_linux.hpp b/hotspot/src/os/linux/vm/os_linux.hpp
index 414ccd976fc..356f7f67afa 100644
--- a/hotspot/src/os/linux/vm/os_linux.hpp
+++ b/hotspot/src/os/linux/vm/os_linux.hpp
@@ -94,6 +94,9 @@ class Linux {
   static void print_libversion_info(outputStream* st);
 
  public:
+  static bool _stack_is_executable;
+  static void *dll_load_inner(const char *name);
+
   static void init_thread_fpu_state();
   static int  get_fpu_control_word();
   static void set_fpu_control_word(int fpu_control);
diff --git a/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp b/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp
index 81c013301d2..cf8634f90cb 100644
--- a/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp
+++ b/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp
@@ -410,6 +410,11 @@ inline static bool checkOverflow(sigcontext* uc,
       // to handle_unexpected_exception way down below.
       thread->disable_stack_red_zone();
       tty->print_raw_cr("An irrecoverable stack overflow has occurred.");
+
+      // This is a likely cause, but hard to verify. Let's just print
+      // it as a hint.
+      tty->print_raw_cr("Please check if any of your loaded .so files has "
+                        "enabled executable stack (see man page execstack(8))");
     } else {
       // Accessing stack address below sp may cause SEGV if current
       // thread has MAP_GROWSDOWN stack. This should only happen when
diff --git a/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp b/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
index bfb0e960a0c..4c9d3dbed8b 100644
--- a/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
+++ b/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
@@ -305,6 +305,11 @@ JVM_handle_linux_signal(int sig,
           // to handle_unexpected_exception way down below.
           thread->disable_stack_red_zone();
           tty->print_raw_cr("An irrecoverable stack overflow has occurred.");
+
+          // This is a likely cause, but hard to verify. Let's just print
+          // it as a hint.
+          tty->print_raw_cr("Please check if any of your loaded .so files has "
+                            "enabled executable stack (see man page execstack(8))");
         } else {
           // Accessing stack address below sp may cause SEGV if current
           // thread has MAP_GROWSDOWN stack. This should only happen when
diff --git a/hotspot/src/share/vm/runtime/thread.hpp b/hotspot/src/share/vm/runtime/thread.hpp
index 98f8d254545..259a4765cf4 100644
--- a/hotspot/src/share/vm/runtime/thread.hpp
+++ b/hotspot/src/share/vm/runtime/thread.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1289,6 +1289,7 @@ class JavaThread: public Thread {
   void enable_stack_red_zone();
   void disable_stack_red_zone();
 
+  inline bool stack_guard_zone_unused();
   inline bool stack_yellow_zone_disabled();
   inline bool stack_yellow_zone_enabled();
 
@@ -1759,6 +1760,10 @@ inline CompilerThread* JavaThread::as_CompilerThread() {
   return (CompilerThread*)this;
 }
 
+inline bool JavaThread::stack_guard_zone_unused() {
+  return _stack_guard_state == stack_guard_unused;
+}
+
 inline bool JavaThread::stack_yellow_zone_disabled() {
   return _stack_guard_state == stack_guard_yellow_disabled;
 }
diff --git a/hotspot/src/share/vm/runtime/vm_operations.hpp b/hotspot/src/share/vm/runtime/vm_operations.hpp
index 949fa2d34f7..ec3e8519968 100644
--- a/hotspot/src/share/vm/runtime/vm_operations.hpp
+++ b/hotspot/src/share/vm/runtime/vm_operations.hpp
@@ -94,6 +94,7 @@
   template(ReportJavaOutOfMemory)                 \
   template(JFRCheckpoint)                         \
   template(Exit)                                  \
+  template(LinuxDllLoad)                          \
 
 class VM_Operation: public CHeapObj<mtInternal> {
  public:
diff --git a/hotspot/src/share/vm/utilities/elfFile.cpp b/hotspot/src/share/vm/utilities/elfFile.cpp
index 155a78f5d04..9fba1c39cc2 100644
--- a/hotspot/src/share/vm/utilities/elfFile.cpp
+++ b/hotspot/src/share/vm/utilities/elfFile.cpp
@@ -197,4 +197,28 @@ ElfStringTable* ElfFile::get_string_table(int index) {
   return NULL;
 }
 
+#ifdef LINUX
+bool ElfFile::specifies_noexecstack() {
+  Elf_Phdr phdr;
+  if (!m_file)  return true;
+
+  if (!fseek(m_file, m_elfHdr.e_phoff, SEEK_SET)) {
+    for (int index = 0; index < m_elfHdr.e_phnum; index ++) {
+      if (fread((void*)&phdr, sizeof(Elf_Phdr), 1, m_file) != 1) {
+        m_status = NullDecoder::file_invalid;
+        return false;
+      }
+      if (phdr.p_type == PT_GNU_STACK) {
+        if (phdr.p_flags == (PF_R | PF_W))  {
+          return true;
+        } else {
+          return false;
+        }
+      }
+    }
+  }
+  return false;
+}
+#endif
+
 #endif // _WINDOWS
diff --git a/hotspot/src/share/vm/utilities/elfFile.hpp b/hotspot/src/share/vm/utilities/elfFile.hpp
index 60f2a880482..d6aa886bbbb 100644
--- a/hotspot/src/share/vm/utilities/elfFile.hpp
+++ b/hotspot/src/share/vm/utilities/elfFile.hpp
@@ -43,6 +43,7 @@ typedef Elf64_Addr      Elf_Addr;
 
 typedef Elf64_Ehdr      Elf_Ehdr;
 typedef Elf64_Shdr      Elf_Shdr;
+typedef Elf64_Phdr      Elf_Phdr;
 typedef Elf64_Sym       Elf_Sym;
 
 #if !defined(_ALLBSD_SOURCE) || defined(__APPLE__)
@@ -59,6 +60,7 @@ typedef Elf32_Addr      Elf_Addr;
 
 typedef Elf32_Ehdr      Elf_Ehdr;
 typedef Elf32_Shdr      Elf_Shdr;
+typedef Elf32_Phdr      Elf_Phdr;
 typedef Elf32_Sym       Elf_Sym;
 
 #if !defined(_ALLBSD_SOURCE) || defined(__APPLE__)
@@ -123,6 +125,14 @@ protected:
    ElfFile*  next() const { return m_next; }
    void set_next(ElfFile* file) { m_next = file; }
 
+ public:
+  // Returns true if the elf file is marked NOT to require an executable stack,
+  // or if the file could not be opened.
+  // Returns false if the elf file requires an executable stack, the stack flag
+  // is not set at all, or if the file can not be read.
+  // On systems other than linux it always returns false.
+  bool specifies_noexecstack() NOT_LINUX({ return false; });
+
  protected:
     ElfFile*         m_next;
 
diff --git a/hotspot/test/runtime/7107135/Test.java b/hotspot/test/runtime/7107135/Test.java
new file mode 100644
index 00000000000..84f3ab3393f
--- /dev/null
+++ b/hotspot/test/runtime/7107135/Test.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2002-2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011 SAP AG.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+class Test {
+
+    static boolean loadLib(String libName){
+        try {
+            System.loadLibrary(libName);
+            System.out.println("Loaded library "+ libName + ".");
+            return true;
+        } catch (SecurityException e) {
+            System.out.println("loadLibrary(\"" + libName + "\") throws: " + e + "\n");
+        } catch (UnsatisfiedLinkError e) {
+            System.out.println("loadLibrary(\"" + libName + "\") throws: " + e + "\n");
+        }
+        return false;
+    }
+
+    public static int counter = 1;
+
+    static int Runner() {
+        counter = counter * -1;
+        int i = counter;
+        if(counter < 2) counter += Runner();
+        return i;
+    }
+
+    public static int run() {
+        try{
+            Runner();
+        } catch (StackOverflowError e) {
+            System.out.println("Caught stack overflow error.");
+            return 0;
+        } catch (OutOfMemoryError e) {
+            return 0;
+        }
+        return 2;
+    }
+
+    public static void main(String argv[]) {
+        loadLib(argv[0]);
+        System.exit(run());
+    }
+}
diff --git a/hotspot/test/runtime/7107135/Test7107135.sh b/hotspot/test/runtime/7107135/Test7107135.sh
new file mode 100644
index 00000000000..6dc91a3039c
--- /dev/null
+++ b/hotspot/test/runtime/7107135/Test7107135.sh
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+#
+#  Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+#  Copyright (c) 2011 SAP AG.  All Rights Reserved.
+#  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+#  This code is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License version 2 only, as
+#  published by the Free Software Foundation.
+#
+#  This code is distributed in the hope that it will be useful, but WITHOUT
+#  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#  version 2 for more details (a copy is included in the LICENSE file that
+#  accompanied this code).
+#
+#  You should have received a copy of the GNU General Public License version
+#  2 along with this work; if not, write to the Free Software Foundation,
+#  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+#  Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+#  or visit www.oracle.com if you need additional information or have any
+#  questions.
+#
+
+##
+## @test Test7107135.sh
+## @bug 7107135
+## @summary Stack guard pages lost after loading library with executable stack.
+## @run shell Test7107135.sh
+##
+
+if [ "${TESTSRC}" = "" ]
+then TESTSRC=.
+fi
+
+if [ "${TESTJAVA}" = "" ]
+then
+  PARENT=`dirname \`which java\``
+  TESTJAVA=`dirname ${PARENT}`
+  echo "TESTJAVA not set, selecting " ${TESTJAVA}
+  echo "If this is incorrect, try setting the variable manually."
+fi
+
+BIT_FLAG=""
+
+# set platform-dependent variables
+OS=`uname -s`
+case "$OS" in
+  Linux)
+    NULL=/dev/null
+    PS=":"
+    FS="/"
+    ;;
+  *)
+    NULL=NUL
+    PS=";"
+    FS="\\"
+    echo "Test passed; only valid for Linux"
+    exit 0;
+    ;;
+esac
+
+ARCH=`uname -m`
+
+THIS_DIR=`pwd`
+
+cp ${TESTSRC}${FS}*.java ${THIS_DIR}
+${TESTJAVA}${FS}bin${FS}javac *.java
+
+gcc -fPIC -shared -c -o test.o -I${TESTJAVA}${FS}include -I${TESTJAVA}${FS}include${FS}linux ${TESTSRC}${FS}test.c
+ld -shared -z   execstack -o libtest-rwx.so test.o
+ld -shared -z noexecstack -o libtest-rw.so  test.o
+
+
+LD_LIBRARY_PATH=${THIS_DIR}
+echo   LD_LIBRARY_PATH = ${LD_LIBRARY_PATH}
+export LD_LIBRARY_PATH
+
+# This should not fail.
+echo Check testprogram. Expected to pass:
+echo ${TESTJAVA}${FS}bin${FS}java -cp ${THIS_DIR} Test test-rw
+${TESTJAVA}${FS}bin${FS}java -cp ${THIS_DIR} Test test-rw
+
+echo
+echo Test changing of stack protection:
+echo ${TESTJAVA}${FS}bin${FS}java -cp ${THIS_DIR} Test test-rw
+${TESTJAVA}${FS}bin${FS}java -cp ${THIS_DIR} Test test-rwx
+
+if [ "$?" == "0" ]
+then
+  echo
+  echo ${TESTJAVA}${FS}bin${FS}java -cp ${THIS_DIR} TestMT test-rwx
+  ${TESTJAVA}${FS}bin${FS}java -cp ${THIS_DIR} TestMT test-rwx
+fi
+
+exit $?
diff --git a/hotspot/test/runtime/7107135/TestMT.java b/hotspot/test/runtime/7107135/TestMT.java
new file mode 100644
index 00000000000..edea698ac8c
--- /dev/null
+++ b/hotspot/test/runtime/7107135/TestMT.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2002-2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011 SAP AG.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+class TestMT {
+
+    static boolean loadLib(String libName) {
+        try {
+            System.loadLibrary(libName);
+            System.out.println("Loaded library "+ libName + ".");
+            return true;
+        } catch (SecurityException e) {
+            System.out.println("loadLibrary(\"" + libName + "\") throws: " + e + "\n");
+        } catch (UnsatisfiedLinkError e) {
+            System.out.println("loadLibrary(\"" + libName + "\") throws: " + e + "\n");
+        }
+        return false;
+    }
+
+    public static int counter        = 1;
+    static int Runner() {
+        counter = counter * -1;
+        int i = counter;
+        if (counter < 2) counter += Runner();
+        return i;
+    }
+
+    public static int run(String msg) {
+        try {
+            Runner();
+        } catch (StackOverflowError e) {
+            System.out.println(msg + " caught stack overflow error.");
+            return 0;
+        } catch (OutOfMemoryError e) {
+            return 0;
+        }
+        return 2;
+    }
+
+    public static void main(String argv[]) {
+        try {
+            for (int i = 0; i < 20; i++) {
+                Thread t = new DoStackOverflow("SpawnedThread " + i);
+                t.start();
+            }
+            run("Main thread");
+            loadLib("test-rwx");
+            run("Main thread");
+        } catch (Exception e) {
+            System.out.println(e);
+        }
+    }
+
+    static class DoStackOverflow extends Thread {
+        public DoStackOverflow(String name) {
+            super(name);
+        }
+        public void run() {
+            for (int i = 0; i < 10; ++i) {
+                TestMT.run(getName());
+                yield();
+            }
+        }
+    }
+}
diff --git a/hotspot/test/runtime/7107135/test.c b/hotspot/test/runtime/7107135/test.c
new file mode 100644
index 00000000000..602063f640e
--- /dev/null
+++ b/hotspot/test/runtime/7107135/test.c
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2002-2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011 SAP AG.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include "jni.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+JNIEXPORT jint JNICALL Java_Test_someMethod(JNIEnv *env, jobject mainObject) {
+  return 3;
+}
+
+#ifdef __cplusplus
+}
+#endif

From 4bec822d4011f873fb72cc7a803fa0bd2ef48a7e Mon Sep 17 00:00:00 2001
From: Tao Mao <tao.mao@oracle.com>
Date: Tue, 5 Mar 2013 15:36:56 -0800
Subject: [PATCH 267/311] 8008079: G1: Add nextObject routine to CMBitMapRO and
 replace nextWord

Update the task local finger to the start of the next object when marking aborts, in order to avoid the redundant scanning of all 0's when the marking task restarts, if otherwise updating to the next word. In addition, reuse the routine nextObject() in routine iterate().

Reviewed-by: johnc, ysr
---
 .../share/vm/gc_implementation/g1/concurrentMark.cpp   |  2 +-
 .../share/vm/gc_implementation/g1/concurrentMark.hpp   | 10 +++++++---
 .../vm/gc_implementation/g1/concurrentMark.inline.hpp  |  6 ++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
index cc2a611f0f0..ca22b90c769 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
@@ -4111,7 +4111,7 @@ void CMTask::do_marking_step(double time_target_ms,
         // bitmap knows by how much we need to move it as it knows its
         // granularity).
         assert(_finger < _region_limit, "invariant");
-        HeapWord* new_finger = _nextMarkBitMap->nextWord(_finger);
+        HeapWord* new_finger = _nextMarkBitMap->nextObject(_finger);
         // Check if bitmap iteration was aborted while scanning the last object
         if (new_finger >= _region_limit) {
           giveup_current_region();
diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp
index 6ec27c7d9fa..61e64df8b9c 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp
@@ -97,7 +97,6 @@ class CMBitMapRO VALUE_OBJ_CLASS_SPEC {
                                        HeapWord* limit = NULL) const;
 
   // conversion utilities
-  // XXX Fix these so that offsets are size_t's...
   HeapWord* offsetToHeapWord(size_t offset) const {
     return _bmStartWord + (offset << _shifter);
   }
@@ -105,8 +104,13 @@ class CMBitMapRO VALUE_OBJ_CLASS_SPEC {
     return pointer_delta(addr, _bmStartWord) >> _shifter;
   }
   int heapWordDiffToOffsetDiff(size_t diff) const;
-  HeapWord* nextWord(HeapWord* addr) {
-    return offsetToHeapWord(heapWordToOffset(addr) + 1);
+
+  // The argument addr should be the start address of a valid object
+  HeapWord* nextObject(HeapWord* addr) {
+    oop obj = (oop) addr;
+    HeapWord* res =  addr + obj->size();
+    assert(offsetToHeapWord(heapWordToOffset(res)) == res, "sanity");
+    return res;
   }
 
   // debugging
diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp
index f084bca5a77..d962842b39a 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -252,12 +252,10 @@ inline bool CMBitMapRO::iterate(BitMapClosure* cl, MemRegion mr) {
 
     start_offset = _bm.get_next_one_offset(start_offset, end_offset);
     while (start_offset < end_offset) {
-      HeapWord* obj_addr = offsetToHeapWord(start_offset);
-      oop obj = (oop) obj_addr;
       if (!cl->do_bit(start_offset)) {
         return false;
       }
-      HeapWord* next_addr = MIN2(obj_addr + obj->size(), end_addr);
+      HeapWord* next_addr = MIN2(nextObject(offsetToHeapWord(start_offset)), end_addr);
       BitMap::idx_t next_offset = heapWordToOffset(next_addr);
       start_offset = _bm.get_next_one_offset(next_offset, end_offset);
     }

From a9a7cc3a2301ac338b92dbae11631648ef2779b6 Mon Sep 17 00:00:00 2001
From: David Holmes <dholmes@openjdk.org>
Date: Tue, 5 Mar 2013 22:45:59 -0500
Subject: [PATCH 268/311] 8009529: Fix for 8006988 missed closed configure
 changes

Reviewed-by: mr
---
 common/autoconf/generated-configure.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
index a941e313bd7..cdafd221faa 100644
--- a/common/autoconf/generated-configure.sh
+++ b/common/autoconf/generated-configure.sh
@@ -3725,7 +3725,7 @@ fi
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1362517596
+DATE_WHEN_GENERATED=1362540061
 
 ###############################################################################
 #

From a99c6a7fe59941b9c9bf0fcd89830e651f6f0da3 Mon Sep 17 00:00:00 2001
From: Alexander Scherbatiy <alexsch@openjdk.org>
Date: Wed, 6 Mar 2013 19:42:26 +0400
Subject: [PATCH 269/311] 6877495: JTextField and JTextArea does not support
 supplementary characters

Reviewed-by: serb, alexp
---
 .../sun/awt/datatransfer/DataTransferer.java  |  49 ++++--
 .../SuplementaryCharactersTransferTest.java   | 165 ++++++++++++++++++
 2 files changed, 199 insertions(+), 15 deletions(-)
 create mode 100644 jdk/test/sun/awt/datatransfer/SuplementaryCharactersTransferTest.java

diff --git a/jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java b/jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java
index f8dd9dfc380..7465d52c8bf 100644
--- a/jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java
+++ b/jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java
@@ -1873,7 +1873,7 @@ search:
      */
     public class ReencodingInputStream extends InputStream {
         protected BufferedReader wrapped;
-        protected final char[] in = new char[1];
+        protected final char[] in = new char[2];
         protected byte[] out;
 
         protected CharsetEncoder encoder;
@@ -1926,7 +1926,7 @@ search:
 
             try {
                 encoder = Charset.forName(targetEncoding).newEncoder();
-                out = new byte[(int)(encoder.maxBytesPerChar() + 0.5)];
+                out = new byte[(int)(encoder.maxBytesPerChar() * 2 + 0.5)];
                 inBuf = CharBuffer.wrap(in);
                 outBuf = ByteBuffer.wrap(out);
             } catch (IllegalCharsetNameException e) {
@@ -1950,31 +1950,50 @@ search:
             }
         }
 
+        private int readChar() throws IOException {
+            int c = wrapped.read();
+
+            if (c == -1) { // -1 is EOS
+                eos = true;
+                return -1;
+            }
+
+            // "c == 0" is not quite correct, but good enough on Windows.
+            if (numTerminators > 0 && c == 0) {
+                eos = true;
+                return -1;
+            } else if (eoln != null && matchCharArray(eoln, c)) {
+                c = '\n' & 0xFFFF;
+            }
+
+            return c;
+        }
+
         public int read() throws IOException {
             if (eos) {
                 return -1;
             }
 
             if (index >= limit) {
-                int c = wrapped.read();
-
-                if (c == -1) { // -1 is EOS
-                    eos = true;
+                // deal with supplementary characters
+                int c = readChar();
+                if (c == -1) {
                     return -1;
                 }
 
-                // "c == 0" is not quite correct, but good enough on Windows.
-                if (numTerminators > 0 && c == 0) {
-                    eos = true;
-                    return -1;
-                } else if (eoln != null && matchCharArray(eoln, c)) {
-                    c = '\n' & 0xFFFF;
+                in[0] = (char) c;
+                in[1] = 0;
+                inBuf.limit(1);
+                if (Character.isHighSurrogate((char) c)) {
+                    c = readChar();
+                    if (c != -1) {
+                        in[1] = (char) c;
+                        inBuf.limit(2);
+                    }
                 }
 
-                in[0] = (char)c;
-
                 inBuf.rewind();
-                outBuf.rewind();
+                outBuf.limit(out.length).rewind();
                 encoder.encode(inBuf, outBuf, false);
                 outBuf.flip();
                 limit = outBuf.limit();
diff --git a/jdk/test/sun/awt/datatransfer/SuplementaryCharactersTransferTest.java b/jdk/test/sun/awt/datatransfer/SuplementaryCharactersTransferTest.java
new file mode 100644
index 00000000000..75f63496bfa
--- /dev/null
+++ b/jdk/test/sun/awt/datatransfer/SuplementaryCharactersTransferTest.java
@@ -0,0 +1,165 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+   @bug 6877495
+   @summary JTextField and JTextArea does not support supplementary characters
+   @author Alexander Scherbatiy
+   @run main SuplementaryCharactersTransferTest
+*/
+
+
+import java.io.*;
+import java.util.*;
+import java.awt.*;
+import java.awt.datatransfer.*;
+import sun.awt.datatransfer.*;
+import sun.awt.datatransfer.DataTransferer.ReencodingInputStream;
+
+public class SuplementaryCharactersTransferTest {
+
+    public static final long TEXT_FORMAT = 13;
+
+    public static void main(String[] args) throws Exception {
+
+        DataTransferer dataTransferer = new TestDataTransferer();
+        dataTransferer.registerTextFlavorProperties("UNICODE TEXT", "utf-16le", "\r\n", "2");
+        ByteTransferable transferable = new ByteTransferable();
+        ReencodingInputStream is = dataTransferer.new ReencodingInputStream(transferable.getByteInputStream(), TEXT_FORMAT,
+                DataTransferer.getTextCharset(transferable.getDataFlavor()), transferable);
+
+        byte[] bytes = transferable.getBytes();
+        byte[] result = new byte[bytes.length];
+
+        is.read(result);
+
+        for (int i = 0; i < bytes.length; i++) {
+            if (bytes[i] != result[i]) {
+                throw new RuntimeException("Characters are not equal!");
+            }
+        }
+
+    }
+
+    static class ByteTransferable implements Transferable, ClipboardOwner {
+
+        private final DataFlavor dataFlavor;
+
+        public ByteTransferable() throws Exception {
+            dataFlavor = DataFlavor.getTextPlainUnicodeFlavor();
+        }
+
+        public DataFlavor getDataFlavor() {
+            return dataFlavor;
+        }
+
+        public DataFlavor[] getTransferDataFlavors() {
+            return new DataFlavor[]{dataFlavor};
+        }
+
+        public boolean isDataFlavorSupported(DataFlavor flavor) {
+            return flavor.equals(dataFlavor);
+        }
+
+        public byte[] getBytes() {
+            return new byte[]{97, 0, 64, -40, 32, -36, 98, 0};
+        }
+
+        public InputStream getByteInputStream() {
+            return new ByteArrayInputStream(getBytes());
+        }
+
+        public Object getTransferData(DataFlavor flavor)
+                throws UnsupportedFlavorException, IOException {
+            if (flavor.equals(dataFlavor)) {
+                return getByteInputStream();
+            } else {
+                throw new UnsupportedFlavorException(flavor);
+            }
+        }
+
+        public void lostOwnership(Clipboard clipboard, Transferable contents) {
+        }
+    }
+
+    static class TestDataTransferer extends DataTransferer {
+
+        @Override
+        public String getDefaultUnicodeEncoding() {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public boolean isLocaleDependentTextFormat(long format) {
+            return false;
+        }
+
+        @Override
+        public boolean isFileFormat(long format) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public boolean isImageFormat(long format) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        protected Long getFormatForNativeAsLong(String str) {
+            return TEXT_FORMAT;
+        }
+
+        @Override
+        protected String getNativeForFormat(long format) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        protected ByteArrayOutputStream convertFileListToBytes(
+                ArrayList<String> fileList) throws IOException {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        protected String[] dragQueryFile(byte[] bytes) {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        protected Image platformImageBytesOrStreamToImage(InputStream str,
+                byte[] bytes, long format) throws IOException {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        protected byte[] imageToPlatformBytes(Image image, long format)
+                throws IOException {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        @Override
+        public ToolkitThreadBlockedHandler getToolkitThreadBlockedHandler() {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+    }
+}
\ No newline at end of file

From b1d7c46e1428251f988db984d892a697e258eafb Mon Sep 17 00:00:00 2001
From: Mikhail Cherkasov <mcherkas@openjdk.org>
Date: Wed, 6 Mar 2013 20:10:04 +0400
Subject: [PATCH 270/311] 8007295: Reduce number of warnings in awt classes

Reviewed-by: bae, anthony
---
 .../classes/java/awt/CheckboxMenuItem.java    |  2 +-
 jdk/src/share/classes/java/awt/Cursor.java    | 20 +++++++++----------
 .../share/classes/java/awt/EventQueue.java    |  6 +++---
 jdk/src/share/classes/java/awt/Menu.java      | 18 ++++++++---------
 jdk/src/share/classes/java/awt/MenuBar.java   | 12 +++++------
 .../share/classes/java/awt/MenuComponent.java |  4 ++--
 jdk/src/share/classes/java/awt/MenuItem.java  |  2 +-
 .../classes/java/awt/RenderingHints.java      |  9 +++++----
 .../java/awt/datatransfer/Clipboard.java      |  8 ++++----
 .../java/awt/dnd/DragGestureEvent.java        |  7 +++----
 .../java/awt/dnd/DragGestureRecognizer.java   |  2 +-
 .../classes/java/awt/dnd/DragSource.java      |  9 ++++-----
 .../awt/dnd/InvalidDnDOperationException.java |  2 ++
 .../java/awt/geom/AffineTransform.java        | 19 ++++++++++++++++++
 14 files changed, 70 insertions(+), 50 deletions(-)

diff --git a/jdk/src/share/classes/java/awt/CheckboxMenuItem.java b/jdk/src/share/classes/java/awt/CheckboxMenuItem.java
index 635e9b55b89..ad12d4c29a9 100644
--- a/jdk/src/share/classes/java/awt/CheckboxMenuItem.java
+++ b/jdk/src/share/classes/java/awt/CheckboxMenuItem.java
@@ -277,7 +277,7 @@ public class CheckboxMenuItem extends MenuItem implements ItemSelectable, Access
      * @since 1.4
      */
     public synchronized ItemListener[] getItemListeners() {
-        return (ItemListener[])(getListeners(ItemListener.class));
+        return getListeners(ItemListener.class);
     }
 
     /**
diff --git a/jdk/src/share/classes/java/awt/Cursor.java b/jdk/src/share/classes/java/awt/Cursor.java
index c340532b20d..d022a647869 100644
--- a/jdk/src/share/classes/java/awt/Cursor.java
+++ b/jdk/src/share/classes/java/awt/Cursor.java
@@ -163,11 +163,11 @@ public class Cursor implements java.io.Serializable {
      * hashtable, filesystem dir prefix, filename, and properties for custom cursors support
      */
 
-    private static final Hashtable  systemCustomCursors         = new Hashtable(1);
+    private static final Hashtable<String,Cursor> systemCustomCursors = new Hashtable<>(1);
     private static final String systemCustomCursorDirPrefix = initCursorDir();
 
     private static String initCursorDir() {
-        String jhome =  (String) java.security.AccessController.doPrivileged(
+        String jhome = java.security.AccessController.doPrivileged(
                new sun.security.action.GetPropertyAction("java.home"));
         return jhome +
             File.separator + "lib" + File.separator + "images" +
@@ -298,7 +298,7 @@ public class Cursor implements java.io.Serializable {
     static public Cursor getSystemCustomCursor(final String name)
         throws AWTException, HeadlessException {
         GraphicsEnvironment.checkHeadless();
-        Cursor cursor = (Cursor)systemCustomCursors.get(name);
+        Cursor cursor = systemCustomCursors.get(name);
 
         if (cursor == null) {
             synchronized(systemCustomCursors) {
@@ -319,11 +319,11 @@ public class Cursor implements java.io.Serializable {
             final String fileName =
                 systemCustomCursorProperties.getProperty(key);
 
-            String localized = (String)systemCustomCursorProperties.getProperty(prefix + DotNameSuffix);
+            String localized = systemCustomCursorProperties.getProperty(prefix + DotNameSuffix);
 
             if (localized == null) localized = name;
 
-            String hotspot = (String)systemCustomCursorProperties.getProperty(prefix + DotHotspotSuffix);
+            String hotspot = systemCustomCursorProperties.getProperty(prefix + DotHotspotSuffix);
 
             if (hotspot == null)
                 throw new AWTException("no hotspot property defined for cursor: " + name);
@@ -348,9 +348,9 @@ public class Cursor implements java.io.Serializable {
                 final int fy = y;
                 final String flocalized = localized;
 
-                cursor = (Cursor) java.security.AccessController.doPrivileged(
-                    new java.security.PrivilegedExceptionAction() {
-                    public Object run() throws Exception {
+                cursor = java.security.AccessController.<Cursor>doPrivileged(
+                    new java.security.PrivilegedExceptionAction<Cursor>() {
+                    public Cursor run() throws Exception {
                         Toolkit toolkit = Toolkit.getDefaultToolkit();
                         Image image = toolkit.getImage(
                            systemCustomCursorDirPrefix + fileName);
@@ -447,8 +447,8 @@ public class Cursor implements java.io.Serializable {
             systemCustomCursorProperties = new Properties();
 
             try {
-                AccessController.doPrivileged(
-                      new java.security.PrivilegedExceptionAction() {
+                AccessController.<Object>doPrivileged(
+                      new java.security.PrivilegedExceptionAction<Object>() {
                     public Object run() throws Exception {
                         FileInputStream fis = null;
                         try {
diff --git a/jdk/src/share/classes/java/awt/EventQueue.java b/jdk/src/share/classes/java/awt/EventQueue.java
index 5ba9756a1af..7f84721dd9e 100644
--- a/jdk/src/share/classes/java/awt/EventQueue.java
+++ b/jdk/src/share/classes/java/awt/EventQueue.java
@@ -171,7 +171,7 @@ public class EventQueue {
      * The modifiers field of the current event, if the current event is an
      * InputEvent or ActionEvent.
      */
-    private WeakReference currentEvent;
+    private WeakReference<AWTEvent> currentEvent;
 
     /*
      * Non-zero if a thread is waiting in getNextEvent(int) for an event of
@@ -809,7 +809,7 @@ public class EventQueue {
         pushPopLock.lock();
         try {
                 return (Thread.currentThread() == dispatchThread)
-                ? ((AWTEvent)currentEvent.get())
+                ? currentEvent.get()
                 : null;
         } finally {
             pushPopLock.unlock();
@@ -1167,7 +1167,7 @@ public class EventQueue {
                 return;
             }
 
-            currentEvent = new WeakReference(e);
+            currentEvent = new WeakReference<>(e);
 
             // This series of 'instanceof' checks should be replaced with a
             // polymorphic type (for example, an interface which declares a
diff --git a/jdk/src/share/classes/java/awt/Menu.java b/jdk/src/share/classes/java/awt/Menu.java
index e702a9cb8fd..ae5d2fa2f82 100644
--- a/jdk/src/share/classes/java/awt/Menu.java
+++ b/jdk/src/share/classes/java/awt/Menu.java
@@ -66,7 +66,7 @@ public class Menu extends MenuItem implements MenuContainer, Accessible {
 
         AWTAccessor.setMenuAccessor(
             new AWTAccessor.MenuAccessor() {
-                public Vector getItems(Menu menu) {
+                public Vector<MenuComponent> getItems(Menu menu) {
                     return menu.items;
                 }
             });
@@ -78,7 +78,7 @@ public class Menu extends MenuItem implements MenuContainer, Accessible {
      * @serial
      * @see #countItems()
      */
-    Vector              items = new Vector();
+    Vector<MenuComponent> items = new Vector<>();
 
     /**
      * This field indicates whether the menu has the
@@ -313,7 +313,7 @@ public class Menu extends MenuItem implements MenuContainer, Accessible {
             }
 
             int nitems = getItemCount();
-            Vector tempItems = new Vector();
+            Vector<MenuItem> tempItems = new Vector<>();
 
             /* Remove the item at index, nitems-index times
                storing them in a temporary vector in the
@@ -330,7 +330,7 @@ public class Menu extends MenuItem implements MenuContainer, Accessible {
                already in the correct order in the temp vector.
             */
             for (int i = 0; i < tempItems.size()  ; i++) {
-                add((MenuItem)tempItems.elementAt(i));
+                add(tempItems.elementAt(i));
             }
         }
     }
@@ -379,7 +379,7 @@ public class Menu extends MenuItem implements MenuContainer, Accessible {
             }
 
             int nitems = getItemCount();
-            Vector tempItems = new Vector();
+            Vector<MenuItem> tempItems = new Vector<>();
 
             /* Remove the item at index, nitems-index times
                storing them in a temporary vector in the
@@ -396,7 +396,7 @@ public class Menu extends MenuItem implements MenuContainer, Accessible {
                already in the correct order in the temp vector.
             */
             for (int i = 0; i < tempItems.size()  ; i++) {
-                add((MenuItem)tempItems.elementAt(i));
+                add(tempItems.elementAt(i));
             }
         }
     }
@@ -475,13 +475,13 @@ public class Menu extends MenuItem implements MenuContainer, Accessible {
         return null;
     }
 
-    synchronized Enumeration shortcuts() {
-        Vector shortcuts = new Vector();
+    synchronized Enumeration<MenuShortcut> shortcuts() {
+        Vector<MenuShortcut> shortcuts = new Vector<>();
         int nitems = getItemCount();
         for (int i = 0 ; i < nitems ; i++) {
             MenuItem mi = getItem(i);
             if (mi instanceof Menu) {
-                Enumeration e = ((Menu)mi).shortcuts();
+                Enumeration<MenuShortcut> e = ((Menu)mi).shortcuts();
                 while (e.hasMoreElements()) {
                     shortcuts.addElement(e.nextElement());
                 }
diff --git a/jdk/src/share/classes/java/awt/MenuBar.java b/jdk/src/share/classes/java/awt/MenuBar.java
index 1fd442e1583..bd0a7d890c0 100644
--- a/jdk/src/share/classes/java/awt/MenuBar.java
+++ b/jdk/src/share/classes/java/awt/MenuBar.java
@@ -81,7 +81,7 @@ public class MenuBar extends MenuComponent implements MenuContainer, Accessible
                     return menuBar.helpMenu;
                 }
 
-                public Vector getMenus(MenuBar menuBar) {
+                public Vector<Menu> getMenus(MenuBar menuBar) {
                     return menuBar.menus;
                 }
             });
@@ -94,7 +94,7 @@ public class MenuBar extends MenuComponent implements MenuContainer, Accessible
      * @serial
      * @see #countMenus()
      */
-    Vector menus = new Vector();
+    Vector<Menu> menus = new Vector<>();
 
     /**
      * This menu is a special menu dedicated to
@@ -309,7 +309,7 @@ public class MenuBar extends MenuComponent implements MenuContainer, Accessible
      * be called on the toolkit thread.
      */
     final Menu getMenuImpl(int i) {
-        return (Menu)menus.elementAt(i);
+        return menus.elementAt(i);
     }
 
     /**
@@ -321,10 +321,10 @@ public class MenuBar extends MenuComponent implements MenuContainer, Accessible
      * @since       JDK1.1
      */
     public synchronized Enumeration<MenuShortcut> shortcuts() {
-        Vector shortcuts = new Vector();
+        Vector<MenuShortcut> shortcuts = new Vector<>();
         int nmenus = getMenuCount();
         for (int i = 0 ; i < nmenus ; i++) {
-            Enumeration e = getMenu(i).shortcuts();
+            Enumeration<MenuShortcut> e = getMenu(i).shortcuts();
             while (e.hasMoreElements()) {
                 shortcuts.addElement(e.nextElement());
             }
@@ -438,7 +438,7 @@ public class MenuBar extends MenuComponent implements MenuContainer, Accessible
       // HeadlessException will be thrown from MenuComponent's readObject
       s.defaultReadObject();
       for (int i = 0; i < menus.size(); i++) {
-        Menu m = (Menu)menus.elementAt(i);
+        Menu m = menus.elementAt(i);
         m.parent = this;
       }
     }
diff --git a/jdk/src/share/classes/java/awt/MenuComponent.java b/jdk/src/share/classes/java/awt/MenuComponent.java
index ebd9c0576ba..4895fdc9548 100644
--- a/jdk/src/share/classes/java/awt/MenuComponent.java
+++ b/jdk/src/share/classes/java/awt/MenuComponent.java
@@ -290,7 +290,7 @@ public abstract class MenuComponent implements java.io.Serializable {
     public void setFont(Font f) {
         font = f;
         //Fixed 6312943: NullPointerException in method MenuComponent.setFont(Font)
-        MenuComponentPeer peer = (MenuComponentPeer)this.peer;
+        MenuComponentPeer peer = this.peer;
         if (peer != null) {
             peer.setFont(f);
         }
@@ -303,7 +303,7 @@ public abstract class MenuComponent implements java.io.Serializable {
      */
     public void removeNotify() {
         synchronized (getTreeLock()) {
-            MenuComponentPeer p = (MenuComponentPeer)this.peer;
+            MenuComponentPeer p = this.peer;
             if (p != null) {
                 Toolkit.getEventQueue().removeSourceEvents(this, true);
                 this.peer = null;
diff --git a/jdk/src/share/classes/java/awt/MenuItem.java b/jdk/src/share/classes/java/awt/MenuItem.java
index 3b8b2cffa0e..4838d187a89 100644
--- a/jdk/src/share/classes/java/awt/MenuItem.java
+++ b/jdk/src/share/classes/java/awt/MenuItem.java
@@ -564,7 +564,7 @@ public class MenuItem extends MenuComponent implements Accessible {
      * @since 1.4
      */
     public synchronized ActionListener[] getActionListeners() {
-        return (ActionListener[])(getListeners(ActionListener.class));
+        return getListeners(ActionListener.class);
     }
 
     /**
diff --git a/jdk/src/share/classes/java/awt/RenderingHints.java b/jdk/src/share/classes/java/awt/RenderingHints.java
index 5b8daa9e519..48cf9e11d32 100644
--- a/jdk/src/share/classes/java/awt/RenderingHints.java
+++ b/jdk/src/share/classes/java/awt/RenderingHints.java
@@ -92,7 +92,7 @@ public class RenderingHints
      * {@code equals()} method.
      */
     public abstract static class Key {
-        private static HashMap identitymap = new HashMap(17);
+        private static HashMap<Object,Object> identitymap = new HashMap<>(17);
 
         private String getIdentity() {
             // Note that the identity string is dependent on 3 variables:
@@ -138,7 +138,7 @@ public class RenderingHints
             }
             // Note: Use a weak reference to avoid holding on to extra
             // objects and classes after they should be unloaded.
-            identitymap.put(identity, new WeakReference(k));
+            identitymap.put(identity, new WeakReference<Key>(k));
         }
 
         private int privatekey;
@@ -195,7 +195,7 @@ public class RenderingHints
         }
     }
 
-    HashMap hintmap = new HashMap(7);
+    HashMap<Object,Object> hintmap = new HashMap<>(7);
 
     /**
      * Antialiasing hint key.
@@ -1267,12 +1267,13 @@ public class RenderingHints
      * object.
      * @return a clone of this instance.
      */
+    @SuppressWarnings("unchecked")
     public Object clone() {
         RenderingHints rh;
         try {
             rh = (RenderingHints) super.clone();
             if (hintmap != null) {
-                rh.hintmap = (HashMap) hintmap.clone();
+                rh.hintmap = (HashMap<Object,Object>) hintmap.clone();
             }
         } catch (CloneNotSupportedException e) {
             // this shouldn't happen, since we are Cloneable
diff --git a/jdk/src/share/classes/java/awt/datatransfer/Clipboard.java b/jdk/src/share/classes/java/awt/datatransfer/Clipboard.java
index d58bd92f3e0..cce9c74c192 100644
--- a/jdk/src/share/classes/java/awt/datatransfer/Clipboard.java
+++ b/jdk/src/share/classes/java/awt/datatransfer/Clipboard.java
@@ -71,7 +71,7 @@ public class Clipboard {
      *
      * @since 1.5
      */
-    private Set currentDataFlavors;
+    private Set<DataFlavor> currentDataFlavors;
 
     /**
      * Creates a clipboard object.
@@ -313,7 +313,7 @@ public class Clipboard {
         if (flavorListeners == null) {
             return;
         }
-        Set prevDataFlavors = currentDataFlavors;
+        Set<DataFlavor> prevDataFlavors = currentDataFlavors;
         currentDataFlavors = getAvailableDataFlavorSet();
         if (prevDataFlavors.equals(currentDataFlavors)) {
             return;
@@ -339,8 +339,8 @@ public class Clipboard {
      *
      * @since 1.5
      */
-    private Set getAvailableDataFlavorSet() {
-        Set set = new HashSet();
+    private Set<DataFlavor> getAvailableDataFlavorSet() {
+        Set<DataFlavor> set = new HashSet<>();
         Transferable contents = getContents(null);
         if (contents != null) {
             DataFlavor[] flavors = contents.getTransferDataFlavors();
diff --git a/jdk/src/share/classes/java/awt/dnd/DragGestureEvent.java b/jdk/src/share/classes/java/awt/dnd/DragGestureEvent.java
index 298436fc50f..3b72ed9afda 100644
--- a/jdk/src/share/classes/java/awt/dnd/DragGestureEvent.java
+++ b/jdk/src/share/classes/java/awt/dnd/DragGestureEvent.java
@@ -165,7 +165,7 @@ public class DragGestureEvent extends EventObject {
      * <P>
      * @return an Iterator for the events comprising the gesture
      */
-
+    @SuppressWarnings("unchecked")
     public Iterator<InputEvent> iterator() { return events.iterator(); }
 
     /**
@@ -184,7 +184,7 @@ public class DragGestureEvent extends EventObject {
      * <P>
      * @return an array of the events comprising the gesture
      */
-
+    @SuppressWarnings("unchecked")
     public Object[] toArray(Object[] array) { return events.toArray(array); }
 
     /**
@@ -333,7 +333,6 @@ public class DragGestureEvent extends EventObject {
         component = (Component)f.get("component", null);
         origin = (Point)f.get("origin", null);
         action = f.get("action", 0);
-
         // Pre-1.4 support. 'events' was previously non-transient
         try {
             events = (List)f.get("events", null);
@@ -351,7 +350,7 @@ public class DragGestureEvent extends EventObject {
     /*
      * fields
      */
-
+    @SuppressWarnings("rawtypes")
     private transient List events;
 
     /**
diff --git a/jdk/src/share/classes/java/awt/dnd/DragGestureRecognizer.java b/jdk/src/share/classes/java/awt/dnd/DragGestureRecognizer.java
index 4b433264701..1f1b9a3f488 100644
--- a/jdk/src/share/classes/java/awt/dnd/DragGestureRecognizer.java
+++ b/jdk/src/share/classes/java/awt/dnd/DragGestureRecognizer.java
@@ -297,7 +297,7 @@ public abstract class DragGestureRecognizer implements Serializable {
      * @return the initial event that triggered the drag gesture
      */
 
-    public InputEvent getTriggerEvent() { return events.isEmpty() ? null : (InputEvent)events.get(0); }
+    public InputEvent getTriggerEvent() { return events.isEmpty() ? null : events.get(0); }
 
     /**
      * Reset the Recognizer, if its currently recognizing a gesture, ignore
diff --git a/jdk/src/share/classes/java/awt/dnd/DragSource.java b/jdk/src/share/classes/java/awt/dnd/DragSource.java
index 2311ccc6283..bceedda646b 100644
--- a/jdk/src/share/classes/java/awt/dnd/DragSource.java
+++ b/jdk/src/share/classes/java/awt/dnd/DragSource.java
@@ -600,7 +600,7 @@ public class DragSource implements Serializable {
      * @since    1.4
      */
     public DragSourceListener[] getDragSourceListeners() {
-        return (DragSourceListener[])getListeners(DragSourceListener.class);
+        return getListeners(DragSourceListener.class);
     }
 
     /**
@@ -660,8 +660,7 @@ public class DragSource implements Serializable {
      * @since    1.4
      */
     public DragSourceMotionListener[] getDragSourceMotionListeners() {
-        return (DragSourceMotionListener[])
-            getListeners(DragSourceMotionListener.class);
+        return getListeners(DragSourceMotionListener.class);
     }
 
     /**
@@ -896,8 +895,8 @@ public class DragSource implements Serializable {
      * @since 1.5
      */
     public static int getDragThreshold() {
-        int ts = ((Integer)AccessController.doPrivileged(
-                new GetIntegerAction("awt.dnd.drag.threshold", 0))).intValue();
+        int ts = AccessController.doPrivileged(
+                new GetIntegerAction("awt.dnd.drag.threshold", 0)).intValue();
         if (ts > 0) {
             return ts;
         } else {
diff --git a/jdk/src/share/classes/java/awt/dnd/InvalidDnDOperationException.java b/jdk/src/share/classes/java/awt/dnd/InvalidDnDOperationException.java
index 4ea863c981b..ed94ceefcf7 100644
--- a/jdk/src/share/classes/java/awt/dnd/InvalidDnDOperationException.java
+++ b/jdk/src/share/classes/java/awt/dnd/InvalidDnDOperationException.java
@@ -36,6 +36,8 @@ package java.awt.dnd;
 
 public class InvalidDnDOperationException extends IllegalStateException {
 
+    private static final long serialVersionUID = 5156676500247816278L;
+
     static private String dft_msg = "The operation requested cannot be performed by the DnD system since it is not in the appropriate state";
 
     /**
diff --git a/jdk/src/share/classes/java/awt/geom/AffineTransform.java b/jdk/src/share/classes/java/awt/geom/AffineTransform.java
index 2fa1dc2137a..751deac2497 100644
--- a/jdk/src/share/classes/java/awt/geom/AffineTransform.java
+++ b/jdk/src/share/classes/java/awt/geom/AffineTransform.java
@@ -876,6 +876,7 @@ public class AffineTransform implements Cloneable, java.io.Serializable {
      * they have not been cached.
      * @see #getType
      */
+    @SuppressWarnings("fallthrough")
     private void calculateType() {
         int ret = TYPE_IDENTITY;
         boolean sgn0, sgn1;
@@ -1038,6 +1039,7 @@ public class AffineTransform implements Cloneable, java.io.Serializable {
      * @see #TYPE_UNIFORM_SCALE
      * @since 1.2
      */
+    @SuppressWarnings("fallthrough")
     public double getDeterminant() {
         switch (state) {
         default:
@@ -1250,6 +1252,7 @@ public class AffineTransform implements Cloneable, java.io.Serializable {
         default:
             stateError();
             /* NOTREACHED */
+            return;
         case (APPLY_SHEAR | APPLY_SCALE | APPLY_TRANSLATE):
             m02 = tx * m00 + ty * m01 + m02;
             m12 = tx * m10 + ty * m11 + m12;
@@ -1631,6 +1634,7 @@ public class AffineTransform implements Cloneable, java.io.Serializable {
      * Y axis direction
      * @since 1.2
      */
+    @SuppressWarnings("fallthrough")
     public void scale(double sx, double sy) {
         int state = this.state;
         switch (state) {
@@ -1705,6 +1709,7 @@ public class AffineTransform implements Cloneable, java.io.Serializable {
         default:
             stateError();
             /* NOTREACHED */
+            return;
         case (APPLY_SHEAR | APPLY_SCALE | APPLY_TRANSLATE):
         case (APPLY_SHEAR | APPLY_SCALE):
             double M0, M1;
@@ -2224,6 +2229,7 @@ public class AffineTransform implements Cloneable, java.io.Serializable {
      * @see #preConcatenate
      * @since 1.2
      */
+    @SuppressWarnings("fallthrough")
     public void concatenate(AffineTransform Tx) {
         double M0, M1;
         double T00, T01, T10, T11;
@@ -2432,6 +2438,7 @@ public class AffineTransform implements Cloneable, java.io.Serializable {
      * @see #concatenate
      * @since 1.2
      */
+    @SuppressWarnings("fallthrough")
     public void preConcatenate(AffineTransform Tx) {
         double M0, M1;
         double T00, T01, T10, T11;
@@ -2655,6 +2662,7 @@ public class AffineTransform implements Cloneable, java.io.Serializable {
         default:
             stateError();
             /* NOTREACHED */
+            return null;
         case (APPLY_SHEAR | APPLY_SCALE | APPLY_TRANSLATE):
             det = m00 * m11 - m01 * m10;
             if (Math.abs(det) <= Double.MIN_VALUE) {
@@ -2751,6 +2759,7 @@ public class AffineTransform implements Cloneable, java.io.Serializable {
         default:
             stateError();
             /* NOTREACHED */
+            return;
         case (APPLY_SHEAR | APPLY_SCALE | APPLY_TRANSLATE):
             M00 = m00; M01 = m01; M02 = m02;
             M10 = m10; M11 = m11; M12 = m12;
@@ -2885,6 +2894,7 @@ public class AffineTransform implements Cloneable, java.io.Serializable {
         default:
             stateError();
             /* NOTREACHED */
+            return null;
         case (APPLY_SHEAR | APPLY_SCALE | APPLY_TRANSLATE):
             ptDst.setLocation(x * m00 + y * m01 + m02,
                               x * m10 + y * m11 + m12);
@@ -2968,6 +2978,7 @@ public class AffineTransform implements Cloneable, java.io.Serializable {
             default:
                 stateError();
                 /* NOTREACHED */
+                return;
             case (APPLY_SHEAR | APPLY_SCALE | APPLY_TRANSLATE):
                 dst.setLocation(x * m00 + y * m01 + m02,
                                 x * m10 + y * m11 + m12);
@@ -3043,6 +3054,7 @@ public class AffineTransform implements Cloneable, java.io.Serializable {
         default:
             stateError();
             /* NOTREACHED */
+            return;
         case (APPLY_SHEAR | APPLY_SCALE | APPLY_TRANSLATE):
             M00 = m00; M01 = m01; M02 = m02;
             M10 = m10; M11 = m11; M12 = m12;
@@ -3157,6 +3169,7 @@ public class AffineTransform implements Cloneable, java.io.Serializable {
         default:
             stateError();
             /* NOTREACHED */
+            return;
         case (APPLY_SHEAR | APPLY_SCALE | APPLY_TRANSLATE):
             M00 = m00; M01 = m01; M02 = m02;
             M10 = m10; M11 = m11; M12 = m12;
@@ -3252,6 +3265,7 @@ public class AffineTransform implements Cloneable, java.io.Serializable {
         default:
             stateError();
             /* NOTREACHED */
+            return;
         case (APPLY_SHEAR | APPLY_SCALE | APPLY_TRANSLATE):
             M00 = m00; M01 = m01; M02 = m02;
             M10 = m10; M11 = m11; M12 = m12;
@@ -3347,6 +3361,7 @@ public class AffineTransform implements Cloneable, java.io.Serializable {
         default:
             stateError();
             /* NOTREACHED */
+            return;
         case (APPLY_SHEAR | APPLY_SCALE | APPLY_TRANSLATE):
             M00 = m00; M01 = m01; M02 = m02;
             M10 = m10; M11 = m11; M12 = m12;
@@ -3436,6 +3451,7 @@ public class AffineTransform implements Cloneable, java.io.Serializable {
      *                                         inverted.
      * @since 1.2
      */
+    @SuppressWarnings("fallthrough")
     public Point2D inverseTransform(Point2D ptSrc, Point2D ptDst)
         throws NoninvertibleTransformException
     {
@@ -3547,6 +3563,7 @@ public class AffineTransform implements Cloneable, java.io.Serializable {
         default:
             stateError();
             /* NOTREACHED */
+            return;
         case (APPLY_SHEAR | APPLY_SCALE | APPLY_TRANSLATE):
             M00 = m00; M01 = m01; M02 = m02;
             M10 = m10; M11 = m11; M12 = m12;
@@ -3679,6 +3696,7 @@ public class AffineTransform implements Cloneable, java.io.Serializable {
         default:
             stateError();
             /* NOTREACHED */
+            return null;
         case (APPLY_SHEAR | APPLY_SCALE | APPLY_TRANSLATE):
         case (APPLY_SHEAR | APPLY_SCALE):
             ptDst.setLocation(x * m00 + y * m01, x * m10 + y * m11);
@@ -3754,6 +3772,7 @@ public class AffineTransform implements Cloneable, java.io.Serializable {
         default:
             stateError();
             /* NOTREACHED */
+            return;
         case (APPLY_SHEAR | APPLY_SCALE | APPLY_TRANSLATE):
         case (APPLY_SHEAR | APPLY_SCALE):
             M00 = m00; M01 = m01;

From 32091fcb1b4baa359b7adbef1b75d44ad4917d44 Mon Sep 17 00:00:00 2001
From: Mike Duigou <mduigou@openjdk.org>
Date: Wed, 6 Mar 2013 08:37:27 -0800
Subject: [PATCH 271/311] 8009162: root repo "make test" target should run
 against image

Reviewed-by: alanb, martin, erikj
---
 common/makefiles/Main.gmk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/makefiles/Main.gmk b/common/makefiles/Main.gmk
index c43f590707c..2be24af977b 100644
--- a/common/makefiles/Main.gmk
+++ b/common/makefiles/Main.gmk
@@ -184,9 +184,10 @@ bootcycle-images:
 	@$(ECHO) Boot cycle build step 2: Building a new JDK image using previously built image
 	@($(CD) $(SRC_ROOT)/common/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) SPEC=$(dir $(SPEC))bootcycle-spec.gmk images)
 
-test: start-make
+test: images test-only
+test-only: start-make
 	@$(call TargetEnter)
-	@($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= PRODUCT_HOME=$(OUTPUT_ROOT)/jdk JPRT_JAVA_HOME=$(OUTPUT_ROOT)/jdk ALT_OUTPUTDIR=$(OUTPUT_ROOT) $(TEST)) || true
+	@($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= PRODUCT_HOME=$(JDK_IMAGE_DIR) JPRT_JAVA_HOME=$(JDK_IMAGE_DIR) ALT_OUTPUTDIR=$(OUTPUT_ROOT) $(TEST)) || true
 	@$(call TargetExit)
 
 # Stores the tips for each repository. This file is be used when constructing the jdk image and can be

From 4f3800def1d9440c92ecf2e1fa0837bff9550da8 Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Wed, 6 Mar 2013 22:38:18 +0530
Subject: [PATCH 272/311] 8009553: Object.create(Array.prototype) doesn't
 respect reset length

Reviewed-by: jlaskey, lagergren
---
 .../jdk/nashorn/internal/objects/Global.java  |  2 +-
 nashorn/test/script/basic/JDK-8009553.js      | 56 +++++++++++++++++++
 2 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 nashorn/test/script/basic/JDK-8009553.js

diff --git a/nashorn/src/jdk/nashorn/internal/objects/Global.java b/nashorn/src/jdk/nashorn/internal/objects/Global.java
index 9b277e37fb7..7de45a91ea2 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/Global.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/Global.java
@@ -1385,7 +1385,7 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
 
         // add Array.prototype.length
         final ScriptObject arrayPrototype = getArrayPrototype();
-        arrayPrototype.addOwnProperty("length", Attribute.NON_ENUMERABLE_CONSTANT, 0.0);
+        arrayPrototype.addOwnProperty("length", Attribute.NOT_ENUMERABLE|Attribute.NOT_CONFIGURABLE, 0.0);
 
         this.DEFAULT_DATE = new NativeDate(Double.NaN);
 
diff --git a/nashorn/test/script/basic/JDK-8009553.js b/nashorn/test/script/basic/JDK-8009553.js
new file mode 100644
index 00000000000..3617f16292e
--- /dev/null
+++ b/nashorn/test/script/basic/JDK-8009553.js
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ * 
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ * 
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * 
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8009553: Object.create(Array.prototype) doesn't respect reset length
+ *
+ * @test
+ * @run
+ */
+
+var desc = Object.getOwnPropertyDescriptor(Array.prototype, "length");
+if (! desc.writable) {
+    fail("Array.prototype.length is not writable");
+}
+
+if (desc.value != 0) {
+    fail("Array.prototype.length != 0");
+}
+
+var array = Object.create(Array.prototype);
+if (array.hasOwnProperty("length")) {
+    fail("array has 'length'");
+}
+
+if (array.length != 0) {
+    fail("array.length != 0");
+}
+
+array.length = 4;
+if (! array.hasOwnProperty("length")) {
+    fail("array does not have 'length'");
+}
+
+if (array.length != 4) {
+    fail("array.length != 4");
+}

From a65f7e7df086db25709035716a0aedfab5f02184 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20Borggr=C3=A9n-Franck?= <jfranck@openjdk.org>
Date: Wed, 6 Mar 2013 18:35:51 +0100
Subject: [PATCH 273/311] 8007808: Missing method:
 Executable.getAnnotatedReturnType()

Reviewed-by: darcy, forax
---
 .../classes/java/lang/reflect/Constructor.java     |  1 +
 .../classes/java/lang/reflect/Executable.java      | 14 ++++++++++++++
 .../share/classes/java/lang/reflect/Method.java    |  1 +
 3 files changed, 16 insertions(+)

diff --git a/jdk/src/share/classes/java/lang/reflect/Constructor.java b/jdk/src/share/classes/java/lang/reflect/Constructor.java
index bbfd1d5ab9d..bdbd7c30e20 100644
--- a/jdk/src/share/classes/java/lang/reflect/Constructor.java
+++ b/jdk/src/share/classes/java/lang/reflect/Constructor.java
@@ -532,6 +532,7 @@ public final class Constructor<T> extends Executable {
      * {@inheritDoc}
      * @since 1.8
      */
+    @Override
     public AnnotatedType getAnnotatedReturnType() {
         return getAnnotatedReturnType0(getDeclaringClass());
     }
diff --git a/jdk/src/share/classes/java/lang/reflect/Executable.java b/jdk/src/share/classes/java/lang/reflect/Executable.java
index 83b5e9c87a4..1a89968b175 100644
--- a/jdk/src/share/classes/java/lang/reflect/Executable.java
+++ b/jdk/src/share/classes/java/lang/reflect/Executable.java
@@ -476,6 +476,20 @@ public abstract class Executable extends AccessibleObject
         return declaredAnnotations;
     }
 
+    /**
+     * Returns an AnnotatedType object that represents the potentially
+     * annotated return type of the method/constructor represented by this
+     * Executable.
+     *
+     * If this Executable represents a constructor, the AnnotatedType object
+     * represents the type of the constructed object.
+     *
+     * If this Executable represents a method, the AnnotatedType object
+     * represents the use of a type to specify the return type of the method.
+     *
+     * @since 1.8
+     */
+    public abstract AnnotatedType getAnnotatedReturnType();
 
     /* Helper for subclasses of Executable.
      *
diff --git a/jdk/src/share/classes/java/lang/reflect/Method.java b/jdk/src/share/classes/java/lang/reflect/Method.java
index 1507c77194a..30e764694d0 100644
--- a/jdk/src/share/classes/java/lang/reflect/Method.java
+++ b/jdk/src/share/classes/java/lang/reflect/Method.java
@@ -629,6 +629,7 @@ public final class Method extends Executable {
      * {@inheritDoc}
      * @since 1.8
      */
+    @Override
     public AnnotatedType getAnnotatedReturnType() {
         return getAnnotatedReturnType0(getGenericReturnType());
     }

From a6be16446db1fdea8b29b285a0eee9aabbdcb8a9 Mon Sep 17 00:00:00 2001
From: Joseph Provino <jprovino@openjdk.org>
Date: Wed, 6 Mar 2013 13:38:17 -0500
Subject: [PATCH 274/311] 8008310: Some adjustments needed to minimal VM
 warnings and errors for unsupported command line options

Changes to arguments.cpp for warnings vs. errors.  Changes for CDS arguments.

Reviewed-by: coleenp, cjplummer
---
 hotspot/make/excludeSrc.make               |  2 +-
 hotspot/src/share/vm/memory/filemap.hpp    | 15 ++++--
 hotspot/src/share/vm/runtime/arguments.cpp | 55 +++++++++++++---------
 3 files changed, 46 insertions(+), 26 deletions(-)

diff --git a/hotspot/make/excludeSrc.make b/hotspot/make/excludeSrc.make
index b3c468f0455..1f044812352 100644
--- a/hotspot/make/excludeSrc.make
+++ b/hotspot/make/excludeSrc.make
@@ -69,7 +69,7 @@ ifeq ($(INCLUDE_CDS), false)
       CXXFLAGS += -DINCLUDE_CDS=0
       CFLAGS += -DINCLUDE_CDS=0
 
-      Src_Files_EXCLUDE += metaspaceShared.cpp
+      Src_Files_EXCLUDE += filemap.cpp metaspaceShared.cpp
 endif
 
 ifeq ($(INCLUDE_ALL_GCS), false)
diff --git a/hotspot/src/share/vm/memory/filemap.hpp b/hotspot/src/share/vm/memory/filemap.hpp
index 75f01d0510a..a11914b9c01 100644
--- a/hotspot/src/share/vm/memory/filemap.hpp
+++ b/hotspot/src/share/vm/memory/filemap.hpp
@@ -112,12 +112,19 @@ public:
   char*  region_base(int i)           { return _header._space[i]._base; }
   struct FileMapHeader* header()      { return &_header; }
 
-  static void set_current_info(FileMapInfo* info)  { _current_info = info; }
-  static FileMapInfo* current_info()  { return _current_info; }
+  static void set_current_info(FileMapInfo* info) {
+    CDS_ONLY(_current_info = info;)
+  }
+
+  static FileMapInfo* current_info() {
+    CDS_ONLY(return _current_info;)
+    NOT_CDS(return NULL;)
+  }
+
   static void assert_mark(bool check);
 
   // File manipulation.
-  bool  initialize();
+  bool  initialize() NOT_CDS_RETURN_(false);
   bool  open_for_read();
   void  open_for_write();
   void  write_header();
@@ -141,7 +148,7 @@ public:
   void fail_continue(const char *msg, ...);
 
   // Return true if given address is in the mapped shared space.
-  bool is_in_shared_space(const void* p);
+  bool is_in_shared_space(const void* p) NOT_CDS_RETURN_(false);
 };
 
 #endif // SHARE_VM_MEMORY_FILEMAP_HPP
diff --git a/hotspot/src/share/vm/runtime/arguments.cpp b/hotspot/src/share/vm/runtime/arguments.cpp
index db634c621b3..554d6a75433 100644
--- a/hotspot/src/share/vm/runtime/arguments.cpp
+++ b/hotspot/src/share/vm/runtime/arguments.cpp
@@ -2273,10 +2273,12 @@ jint Arguments::parse_each_vm_init_arg(const JavaVMInitArgs* args,
         }
 #if !INCLUDE_JVMTI
         if ((strcmp(name, "hprof") == 0) || (strcmp(name, "jdwp") == 0)) {
-          warning("profiling and debugging agents are not supported in this VM");
-        } else
+          jio_fprintf(defaultStream::error_stream(),
+            "Profiling and debugging agents are not supported in this VM\n");
+          return JNI_ERR;
+        }
 #endif // !INCLUDE_JVMTI
-          add_init_library(name, options);
+        add_init_library(name, options);
       }
     // -agentlib and -agentpath
     } else if (match_option(option, "-agentlib:", &tail) ||
@@ -2293,16 +2295,19 @@ jint Arguments::parse_each_vm_init_arg(const JavaVMInitArgs* args,
         }
 #if !INCLUDE_JVMTI
         if ((strcmp(name, "hprof") == 0) || (strcmp(name, "jdwp") == 0)) {
-          warning("profiling and debugging agents are not supported in this VM");
-        } else
+          jio_fprintf(defaultStream::error_stream(),
+            "Profiling and debugging agents are not supported in this VM\n");
+          return JNI_ERR;
+        }
 #endif // !INCLUDE_JVMTI
         add_init_agent(name, options, is_absolute_path);
-
       }
     // -javaagent
     } else if (match_option(option, "-javaagent:", &tail)) {
 #if !INCLUDE_JVMTI
-      warning("Instrumentation agents are not supported in this VM");
+      jio_fprintf(defaultStream::error_stream(),
+        "Instrumentation agents are not supported in this VM\n");
+      return JNI_ERR;
 #else
       if(tail != NULL) {
         char *options = strcpy(NEW_C_HEAP_ARRAY(char, strlen(tail) + 1, mtInternal), tail);
@@ -2443,8 +2448,9 @@ jint Arguments::parse_each_vm_init_arg(const JavaVMInitArgs* args,
 #if INCLUDE_FPROF
       _has_profile = true;
 #else // INCLUDE_FPROF
-      // do we have to exit?
-      warning("Flat profiling is not supported in this VM.");
+      jio_fprintf(defaultStream::error_stream(),
+        "Flat profiling is not supported in this VM.\n");
+      return JNI_ERR;
 #endif // INCLUDE_FPROF
     // -Xaprof
     } else if (match_option(option, "-Xaprof", &tail)) {
@@ -2478,8 +2484,9 @@ jint Arguments::parse_each_vm_init_arg(const JavaVMInitArgs* args,
 #if INCLUDE_MANAGEMENT
         FLAG_SET_CMDLINE(bool, ManagementServer, true);
 #else
-        vm_exit_during_initialization(
-            "-Dcom.sun.management is not supported in this VM.", NULL);
+        jio_fprintf(defaultStream::output_stream(),
+          "-Dcom.sun.management is not supported in this VM.\n");
+        return JNI_ERR;
 #endif
       }
     // -Xint
@@ -2492,16 +2499,10 @@ jint Arguments::parse_each_vm_init_arg(const JavaVMInitArgs* args,
     } else if (match_option(option, "-Xcomp", &tail)) {
       // for testing the compiler; turn off all flags that inhibit compilation
           set_mode_flags(_comp);
-
     // -Xshare:dump
     } else if (match_option(option, "-Xshare:dump", &tail)) {
-#if !INCLUDE_CDS
-      vm_exit_during_initialization(
-          "Dumping a shared archive is not supported in this VM.", NULL);
-#else
       FLAG_SET_CMDLINE(bool, DumpSharedSpaces, true);
       set_mode_flags(_int);     // Prevent compilation, which creates objects
-#endif
     // -Xshare:on
     } else if (match_option(option, "-Xshare:on", &tail)) {
       FLAG_SET_CMDLINE(bool, UseSharedSpaces, true);
@@ -2514,7 +2515,6 @@ jint Arguments::parse_each_vm_init_arg(const JavaVMInitArgs* args,
     } else if (match_option(option, "-Xshare:off", &tail)) {
       FLAG_SET_CMDLINE(bool, UseSharedSpaces, false);
       FLAG_SET_CMDLINE(bool, RequireSharedSpaces, false);
-
     // -Xverify
     } else if (match_option(option, "-Xverify", &tail)) {
       if (strcmp(tail, ":all") == 0 || strcmp(tail, "") == 0) {
@@ -2828,8 +2828,9 @@ SOLARIS_ONLY(
       FLAG_SET_CMDLINE(bool, UseVMInterruptibleIO, true);
 #if !INCLUDE_MANAGEMENT
     } else if (match_option(option, "-XX:+ManagementServer", &tail)) {
-      vm_exit_during_initialization(
-        "ManagementServer is not supported in this VM.", NULL);
+        jio_fprintf(defaultStream::error_stream(),
+          "ManagementServer is not supported in this VM.\n");
+        return JNI_ERR;
 #endif // INCLUDE_MANAGEMENT
     } else if (match_option(option, "-XX:", &tail)) { // -XX:xxxx
       // Skip -XX:Flags= since that case has already been handled
@@ -3135,7 +3136,9 @@ jint Arguments::parse(const JavaVMInitArgs* args) {
 #if INCLUDE_NMT
       MemTracker::init_tracking_options(tail);
 #else
-      warning("Native Memory Tracking is not supported in this VM");
+      jio_fprintf(defaultStream::error_stream(),
+        "Native Memory Tracking is not supported in this VM\n");
+      return JNI_ERR;
 #endif
     }
 
@@ -3254,6 +3257,16 @@ jint Arguments::parse(const JavaVMInitArgs* args) {
   force_serial_gc();
 #endif // INCLUDE_ALL_GCS
 #if !INCLUDE_CDS
+  if (DumpSharedSpaces || RequireSharedSpaces) {
+    jio_fprintf(defaultStream::error_stream(),
+      "Shared spaces are not supported in this VM\n");
+    return JNI_ERR;
+  }
+  if (UseSharedSpaces || PrintSharedSpaces) {
+    warning("Shared spaces are not supported in this VM");
+    FLAG_SET_DEFAULT(UseSharedSpaces, false);
+    FLAG_SET_DEFAULT(PrintSharedSpaces, false);
+  }
   no_shared_spaces();
 #endif // INCLUDE_CDS
 

From e1f180f82e29f200c86cb545e3fcfc328fa7e843 Mon Sep 17 00:00:00 2001
From: Joseph Provino <jprovino@openjdk.org>
Date: Wed, 6 Mar 2013 13:46:55 -0500
Subject: [PATCH 275/311] 8006498: #if <symbol> is wrong in the code

ASSERT and other symbols used incorrectly with #if are supposed to be defined or not.

Reviewed-by: dholmes, mikael
---
 hotspot/src/cpu/x86/vm/frame_x86.cpp             |  2 +-
 hotspot/src/cpu/x86/vm/frame_x86.hpp             |  2 +-
 hotspot/src/share/vm/c1/c1_LIR.hpp               |  2 +-
 hotspot/src/share/vm/ci/ciTypeFlow.cpp           |  2 +-
 hotspot/src/share/vm/code/compressedStream.cpp   |  4 ++--
 .../vm/gc_implementation/g1/concurrentMark.cpp   | 16 ----------------
 hotspot/src/share/vm/prims/jvmtiImpl.cpp         |  2 +-
 hotspot/src/share/vm/prims/jvmtiTrace.hpp        |  4 ++--
 8 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/hotspot/src/cpu/x86/vm/frame_x86.cpp b/hotspot/src/cpu/x86/vm/frame_x86.cpp
index fa0855c458c..93180c8e37d 100644
--- a/hotspot/src/cpu/x86/vm/frame_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/frame_x86.cpp
@@ -356,7 +356,7 @@ frame frame::sender_for_entry_frame(RegisterMap* map) const {
 // Verifies the calculated original PC of a deoptimization PC for the
 // given unextended SP.  The unextended SP might also be the saved SP
 // for MethodHandle call sites.
-#if ASSERT
+#ifdef ASSERT
 void frame::verify_deopt_original_pc(nmethod* nm, intptr_t* unextended_sp, bool is_method_handle_return) {
   frame fr;
 
diff --git a/hotspot/src/cpu/x86/vm/frame_x86.hpp b/hotspot/src/cpu/x86/vm/frame_x86.hpp
index b3c3f416c46..0033077dde4 100644
--- a/hotspot/src/cpu/x86/vm/frame_x86.hpp
+++ b/hotspot/src/cpu/x86/vm/frame_x86.hpp
@@ -170,7 +170,7 @@
     return (intptr_t*) addr_at(offset);
   }
 
-#if ASSERT
+#ifdef ASSERT
   // Used in frame::sender_for_{interpreter,compiled}_frame
   static void verify_deopt_original_pc(   nmethod* nm, intptr_t* unextended_sp, bool is_method_handle_return = false);
   static void verify_deopt_mh_original_pc(nmethod* nm, intptr_t* unextended_sp) {
diff --git a/hotspot/src/share/vm/c1/c1_LIR.hpp b/hotspot/src/share/vm/c1/c1_LIR.hpp
index cec92f78c27..72051f19f34 100644
--- a/hotspot/src/share/vm/c1/c1_LIR.hpp
+++ b/hotspot/src/share/vm/c1/c1_LIR.hpp
@@ -2375,7 +2375,7 @@ class LIR_OpVisitState: public StackObj {
   // collects all register operands of the instruction
   void visit(LIR_Op* op);
 
-#if ASSERT
+#ifdef ASSERT
   // check that an operation has no operands
   bool no_operands(LIR_Op* op);
 #endif
diff --git a/hotspot/src/share/vm/ci/ciTypeFlow.cpp b/hotspot/src/share/vm/ci/ciTypeFlow.cpp
index bdbeeaf933e..b76dd3d0fe3 100644
--- a/hotspot/src/share/vm/ci/ciTypeFlow.cpp
+++ b/hotspot/src/share/vm/ci/ciTypeFlow.cpp
@@ -2540,7 +2540,7 @@ void ciTypeFlow::build_loop_tree(Block* blk) {
   } else if (innermost->head() == blk) {
     // If loop header, complete the tree pointers
     if (blk->loop() != innermost) {
-#if ASSERT
+#ifdef ASSERT
       assert(blk->loop()->head() == innermost->head(), "same head");
       Loop* dl;
       for (dl = innermost; dl != NULL && dl != blk->loop(); dl = dl->parent());
diff --git a/hotspot/src/share/vm/code/compressedStream.cpp b/hotspot/src/share/vm/code/compressedStream.cpp
index 1d5cb341372..82b05fc03f9 100644
--- a/hotspot/src/share/vm/code/compressedStream.cpp
+++ b/hotspot/src/share/vm/code/compressedStream.cpp
@@ -195,7 +195,7 @@ void CompressedWriteStream::write_int_mb(jint value) {
 // for this block (a matching directive turns it back on later).
 // These directives can be removed once the MS VS.NET 2005
 // compiler stack overflow is fixed.
-#if _MSC_VER >=1400 && !defined(_WIN64)
+#if defined(_MSC_VER) && _MSC_VER >=1400 && !defined(_WIN64)
 #pragma optimize("", off)
 #pragma warning(disable: 4748)
 #endif
@@ -276,7 +276,7 @@ void test_compressed_stream(int trace) {
   guarantee(fails == 0, "test failures");
 }
 
-#if _MSC_VER >=1400 && !defined(_WIN64)
+#if defined(_MSC_VER) &&_MSC_VER >=1400 && !defined(_WIN64)
 #pragma warning(default: 4748)
 #pragma optimize("", on)
 #endif
diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
index cc2a611f0f0..b6a8cac6f53 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
@@ -1310,11 +1310,6 @@ void ConcurrentMark::checkpointRootsFinal(bool clear_all_soft_refs) {
     _markStack.expand();
   }
 
-#if VERIFY_OBJS_PROCESSED
-  _scan_obj_cl.objs_processed = 0;
-  ThreadLocalObjQueue::objs_enqueued = 0;
-#endif
-
   // Statistics
   double now = os::elapsedTime();
   _remark_mark_times.add((mark_work_end - start) * 1000.0);
@@ -2555,17 +2550,6 @@ void ConcurrentMark::checkpointRootsFinalWork() {
   guarantee(satb_mq_set.completed_buffers_num() == 0, "invariant");
 
   print_stats();
-
-#if VERIFY_OBJS_PROCESSED
-  if (_scan_obj_cl.objs_processed != ThreadLocalObjQueue::objs_enqueued) {
-    gclog_or_tty->print_cr("Processed = %d, enqueued = %d.",
-                           _scan_obj_cl.objs_processed,
-                           ThreadLocalObjQueue::objs_enqueued);
-    guarantee(_scan_obj_cl.objs_processed ==
-              ThreadLocalObjQueue::objs_enqueued,
-              "Different number of objs processed and enqueued.");
-  }
-#endif
 }
 
 #ifndef PRODUCT
diff --git a/hotspot/src/share/vm/prims/jvmtiImpl.cpp b/hotspot/src/share/vm/prims/jvmtiImpl.cpp
index 4a1747e1bd2..c569b8fdcb4 100644
--- a/hotspot/src/share/vm/prims/jvmtiImpl.cpp
+++ b/hotspot/src/share/vm/prims/jvmtiImpl.cpp
@@ -890,7 +890,7 @@ void JvmtiSuspendControl::print() {
 
   tty->print("Suspended Threads: [");
   for (JavaThread *thread = Threads::first(); thread != NULL; thread = thread->next()) {
-#if JVMTI_TRACE
+#ifdef JVMTI_TRACE
     const char *name   = JvmtiTrace::safe_get_thread_name(thread);
 #else
     const char *name   = "";
diff --git a/hotspot/src/share/vm/prims/jvmtiTrace.hpp b/hotspot/src/share/vm/prims/jvmtiTrace.hpp
index b6d42249776..6be50d8ade8 100644
--- a/hotspot/src/share/vm/prims/jvmtiTrace.hpp
+++ b/hotspot/src/share/vm/prims/jvmtiTrace.hpp
@@ -43,10 +43,10 @@
 
 // Support tracing except in product build on the client compiler
 #ifndef PRODUCT
-#define JVMTI_TRACE 1
+#define JVMTI_TRACE
 #else
 #ifdef COMPILER2
-#define JVMTI_TRACE 1
+#define JVMTI_TRACE
 #endif
 #endif
 

From 94853afaeedcf2eeaf4b49112d05492902c5baba Mon Sep 17 00:00:00 2001
From: Joseph Provino <jprovino@openjdk.org>
Date: Wed, 6 Mar 2013 13:50:54 -0500
Subject: [PATCH 276/311] 8008474: Add -Wundef to warning flags

Force use of undefined macros to be and error.

Reviewed-by: dholmes, mikael
---
 hotspot/make/bsd/makefiles/gcc.make     | 6 +++---
 hotspot/make/linux/makefiles/gcc.make   | 6 +++---
 hotspot/make/solaris/makefiles/gcc.make | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/hotspot/make/bsd/makefiles/gcc.make b/hotspot/make/bsd/makefiles/gcc.make
index 2cee1b0034e..b742eb12992 100644
--- a/hotspot/make/bsd/makefiles/gcc.make
+++ b/hotspot/make/bsd/makefiles/gcc.make
@@ -168,12 +168,12 @@ endif
 # conversions which might affect the values. To avoid that, we need to turn
 # it off explicitly. 
 ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0"
-ACCEPTABLE_WARNINGS = -Wpointer-arith -Wsign-compare
+WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wundef
 else
-ACCEPTABLE_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare
+WARNING_FLAGS = -Wpointer-arith -Wconversion -Wsign-compare -Wundef
 endif
 
-CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS)
+CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(WARNING_FLAGS)
 # Special cases
 CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) 
 # XXXDARWIN: for _dyld_bind_fully_image_containing_address
diff --git a/hotspot/make/linux/makefiles/gcc.make b/hotspot/make/linux/makefiles/gcc.make
index 9ef83664535..b2c4bdfa491 100644
--- a/hotspot/make/linux/makefiles/gcc.make
+++ b/hotspot/make/linux/makefiles/gcc.make
@@ -131,12 +131,12 @@ WARNINGS_ARE_ERRORS = -Werror
 # conversions which might affect the values. To avoid that, we need to turn
 # it off explicitly. 
 ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0"
-ACCEPTABLE_WARNINGS = -Wpointer-arith -Wsign-compare
+WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wundef
 else
-ACCEPTABLE_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare
+WARNING_FLAGS = -Wpointer-arith -Wconversion -Wsign-compare -Wundef
 endif
 
-CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS)
+CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(WARNING_FLAGS)
 # Special cases
 CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) 
 
diff --git a/hotspot/make/solaris/makefiles/gcc.make b/hotspot/make/solaris/makefiles/gcc.make
index 66ab8c55d6a..e946d65d256 100644
--- a/hotspot/make/solaris/makefiles/gcc.make
+++ b/hotspot/make/solaris/makefiles/gcc.make
@@ -118,8 +118,8 @@ endif
 # Compiler warnings are treated as errors 
 WARNINGS_ARE_ERRORS = -Werror 
 # Enable these warnings. See 'info gcc' about details on these options
-ADDITIONAL_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare 
-CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ADDITIONAL_WARNINGS) 
+WARNING_FLAGS = -Wpointer-arith -Wconversion -Wsign-compare -Wundef
+CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(WARNING_FLAGS)
 # Special cases 
 CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@))  
 

From 46b80b3416753c63a170c53f2f1b98de6d3e4bd7 Mon Sep 17 00:00:00 2001
From: Martin Buchholz <martin@openjdk.org>
Date: Wed, 6 Mar 2013 17:43:10 -0800
Subject: [PATCH 277/311] 8008759: Do not let internal JDK zlib symbols leak
 out of fastdebug libzip.so

Define FILES_m to force use of linker script

Reviewed-by: sherman, alanb, ohair
---
 jdk/make/java/zip/Makefile                    | 10 ++++++++++
 jdk/src/share/native/java/util/zip/Inflater.c | 16 ++++++++++++----
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/jdk/make/java/zip/Makefile b/jdk/make/java/zip/Makefile
index 67a8557de0b..99afd603d7c 100644
--- a/jdk/make/java/zip/Makefile
+++ b/jdk/make/java/zip/Makefile
@@ -68,6 +68,16 @@ ifeq ($(PLATFORM), solaris)
     FILES_reorder += reorder-$(ARCH)
   endif
 endif
+
+#
+# Use mapfile unconditionally (even with fastdebug).
+# JDK's internal zlib is incompatible with stock zlib, because the
+# size of struct z_stream has been changed, so internal zlib
+# implementation must not be allowed to leak outside of libzip.so,
+# else you get hard to debug failures with fastdebug jdk when user
+# native code includes stock zlib.
+#
+FILES_m = mapfile-vers
 include $(BUILDDIR)/common/Mapfile-vers.gmk
 include $(BUILDDIR)/common/Library.gmk
 
diff --git a/jdk/src/share/native/java/util/zip/Inflater.c b/jdk/src/share/native/java/util/zip/Inflater.c
index b67fff24f09..3778ff4e40c 100644
--- a/jdk/src/share/native/java/util/zip/Inflater.c
+++ b/jdk/src/share/native/java/util/zip/Inflater.c
@@ -27,6 +27,7 @@
  * Native method support for java.util.zip.Inflater
  */
 
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -60,12 +61,13 @@ Java_java_util_zip_Inflater_init(JNIEnv *env, jclass cls, jboolean nowrap)
 {
     z_stream *strm = calloc(1, sizeof(z_stream));
 
-    if (strm == 0) {
+    if (strm == NULL) {
         JNU_ThrowOutOfMemoryError(env, 0);
         return jlong_zero;
     } else {
-        char *msg;
-        switch (inflateInit2(strm, nowrap ? -MAX_WBITS : MAX_WBITS)) {
+        const char *msg;
+        int ret = inflateInit2(strm, nowrap ? -MAX_WBITS : MAX_WBITS);
+        switch (ret) {
           case Z_OK:
             return ptr_to_jlong(strm);
           case Z_MEM_ERROR:
@@ -73,7 +75,13 @@ Java_java_util_zip_Inflater_init(JNIEnv *env, jclass cls, jboolean nowrap)
             JNU_ThrowOutOfMemoryError(env, 0);
             return jlong_zero;
           default:
-            msg = strm->msg;
+            msg = ((strm->msg != NULL) ? strm->msg :
+                   (ret == Z_VERSION_ERROR) ?
+                   "zlib returned Z_VERSION_ERROR: "
+                   "compile time and runtime zlib implementations differ" :
+                   (ret == Z_STREAM_ERROR) ?
+                   "inflateInit2 returned Z_STREAM_ERROR" :
+                   "unknown error initializing zlib library");
             free(strm);
             JNU_ThrowInternalError(env, msg);
             return jlong_zero;

From 556ff23124bf2725e2466d4b40b9694c261ee7b8 Mon Sep 17 00:00:00 2001
From: Weijun Wang <weijun@openjdk.org>
Date: Thu, 7 Mar 2013 11:32:14 +0800
Subject: [PATCH 278/311] 8009604: old make images failed: JarBASE64Encoder
 class not found

Reviewed-by: xuelei, wetmore
---
 jdk/make/common/Release.gmk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/jdk/make/common/Release.gmk b/jdk/make/common/Release.gmk
index 70033e457d0..5371d044b91 100644
--- a/jdk/make/common/Release.gmk
+++ b/jdk/make/common/Release.gmk
@@ -348,7 +348,6 @@ TOOLS = \
 	sun/tools/serialver	\
 	sun/tools/tree		\
 	sun/tools/util		\
-	sun/security/tools/jarsigner/JarBASE64Encoder.class \
 	sun/security/tools/jarsigner/Main.class \
 	sun/security/tools/jarsigner/JarSignerParameters.class \
 	sun/security/tools/jarsigner/Resources.class \
@@ -576,7 +575,6 @@ $(NOT_RT_JAR_LIST): FRC
 	$(ECHO) "sun/tools/serialver/" >> $@
 	$(ECHO) "sun/tools/tree/" >> $@
 	$(ECHO) "sun/tools/util/" >> $@
-	$(ECHO) "sun/security/tools/jarsigner/JarBASE64Encoder.class" >> $@
 	$(ECHO) "sun/security/tools/jarsigner/Main.class" >> $@
 	$(ECHO) "sun/security/tools/jarsigner/JarSignerParameters.class" >> $@
 	$(ECHO) "sun/security/tools/jarsigner/Resources.class" >> $@

From 6c0e4804276fd48c5ffab5c1330be3b234360727 Mon Sep 17 00:00:00 2001
From: Andrew Brygin <bae@openjdk.org>
Date: Thu, 7 Mar 2013 14:05:21 +0400
Subject: [PATCH 279/311] 8005530: [lcms] Improve performance of ColorConverOp
 for default destinations

Reviewed-by: prr, jgodinez
---
 jdk/make/sun/cmm/lcms/Makefile                |   3 +
 jdk/make/sun/cmm/lcms/mapfile-vers            |   9 +-
 jdk/makefiles/CompileNativeLibraries.gmk      |   2 +-
 jdk/makefiles/mapfiles/liblcms/mapfile-vers   |   9 +-
 .../classes/sun/java2d/cmm/lcms/LCMS.java     | 137 +++++++-
 .../sun/java2d/cmm/lcms/LCMSImageLayout.java  | 295 ++++++++++++------
 .../sun/java2d/cmm/lcms/LCMSTransform.java    |  25 +-
 jdk/src/share/demo/java2d/J2DBench/build.xml  |  12 +-
 .../resources/cmm_images/img_icc_large.jpg    | Bin 0 -> 430301 bytes
 .../resources/cmm_images/img_icc_medium.jpg   | Bin 0 -> 148164 bytes
 .../resources/cmm_images/img_icc_small.jpg    | Bin 0 -> 16258 bytes
 .../tests/cmm/ColorConversionTests.java       |   1 +
 .../tests/cmm/EmbeddedProfileTests.java       | 166 ++++++++++
 .../share/native/sun/java2d/cmm/lcms/LCMS.c   |  95 +++---
 14 files changed, 572 insertions(+), 182 deletions(-)
 create mode 100644 jdk/src/share/demo/java2d/J2DBench/resources/cmm_images/img_icc_large.jpg
 create mode 100644 jdk/src/share/demo/java2d/J2DBench/resources/cmm_images/img_icc_medium.jpg
 create mode 100644 jdk/src/share/demo/java2d/J2DBench/resources/cmm_images/img_icc_small.jpg
 create mode 100644 jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/cmm/EmbeddedProfileTests.java

diff --git a/jdk/make/sun/cmm/lcms/Makefile b/jdk/make/sun/cmm/lcms/Makefile
index 24fde37fba0..85b02e4960e 100644
--- a/jdk/make/sun/cmm/lcms/Makefile
+++ b/jdk/make/sun/cmm/lcms/Makefile
@@ -28,6 +28,9 @@ PACKAGE = sun.java2d.cmm.lcms
 LIBRARY = lcms
 PRODUCT = sun
 
+# Use highest level of optimization on this library
+OPTIMIZATION_LEVEL = HIGHEST
+
 include $(BUILDDIR)/common/Defs.gmk
 
 #
diff --git a/jdk/make/sun/cmm/lcms/mapfile-vers b/jdk/make/sun/cmm/lcms/mapfile-vers
index ac4e7458b37..3d9074f746d 100644
--- a/jdk/make/sun/cmm/lcms/mapfile-vers
+++ b/jdk/make/sun/cmm/lcms/mapfile-vers
@@ -27,13 +27,12 @@
 
 SUNWprivate_1.1 {
 	global:
-        Java_sun_java2d_cmm_lcms_LCMS_loadProfile;
-        Java_sun_java2d_cmm_lcms_LCMS_freeProfile;
+        Java_sun_java2d_cmm_lcms_LCMS_loadProfileNative;
+        Java_sun_java2d_cmm_lcms_LCMS_freeProfileNative;
         Java_sun_java2d_cmm_lcms_LCMS_getProfileSize;
         Java_sun_java2d_cmm_lcms_LCMS_getProfileData;
-        Java_sun_java2d_cmm_lcms_LCMS_getTagSize;
-        Java_sun_java2d_cmm_lcms_LCMS_getTagData;
-        Java_sun_java2d_cmm_lcms_LCMS_setTagData;
+        Java_sun_java2d_cmm_lcms_LCMS_getTagNative;
+        Java_sun_java2d_cmm_lcms_LCMS_setTagDataNative;
         Java_sun_java2d_cmm_lcms_LCMS_colorConvert;
         Java_sun_java2d_cmm_lcms_LCMS_getProfileID;
         Java_sun_java2d_cmm_lcms_LCMS_initLCMS;
diff --git a/jdk/makefiles/CompileNativeLibraries.gmk b/jdk/makefiles/CompileNativeLibraries.gmk
index 01dbc2ba417..46f1778a5fc 100644
--- a/jdk/makefiles/CompileNativeLibraries.gmk
+++ b/jdk/makefiles/CompileNativeLibraries.gmk
@@ -1218,7 +1218,7 @@ ifdef OPENJDK
                 OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\
                 SRC:=$(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms,\
 		LANG:=C,\
-		OPTIMIZATION:=LOW, \
+		OPTIMIZATION:=HIGHEST, \
 		CFLAGS:=$(filter-out -xc99=%none,$(CFLAGS_JDKLIB)) \
 			$(SHARED_LIBRARY_FLAGS) \
 			-I$(JDK_TOPDIR)/src/share/native/sun/java2d \
diff --git a/jdk/makefiles/mapfiles/liblcms/mapfile-vers b/jdk/makefiles/mapfiles/liblcms/mapfile-vers
index 04703dffc5a..024511423d3 100644
--- a/jdk/makefiles/mapfiles/liblcms/mapfile-vers
+++ b/jdk/makefiles/mapfiles/liblcms/mapfile-vers
@@ -27,13 +27,12 @@
 
 SUNWprivate_1.1 {
 	global:
-        Java_sun_java2d_cmm_lcms_LCMS_loadProfile;
-        Java_sun_java2d_cmm_lcms_LCMS_freeProfile;
+        Java_sun_java2d_cmm_lcms_LCMS_loadProfileNative;
+        Java_sun_java2d_cmm_lcms_LCMS_freeProfileNative;
         Java_sun_java2d_cmm_lcms_LCMS_getProfileSize;
         Java_sun_java2d_cmm_lcms_LCMS_getProfileData;
-        Java_sun_java2d_cmm_lcms_LCMS_getTagSize;
-        Java_sun_java2d_cmm_lcms_LCMS_getTagData;
-        Java_sun_java2d_cmm_lcms_LCMS_setTagData;
+        Java_sun_java2d_cmm_lcms_LCMS_getTagNative;
+        Java_sun_java2d_cmm_lcms_LCMS_setTagDataNative;
         Java_sun_java2d_cmm_lcms_LCMS_colorConvert;
         Java_sun_java2d_cmm_lcms_LCMS_getProfileID;
         Java_sun_java2d_cmm_lcms_LCMS_initLCMS;
diff --git a/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMS.java b/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMS.java
index 5cfda3cdb74..c6eae65a73a 100644
--- a/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMS.java
+++ b/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMS.java
@@ -25,29 +25,91 @@
 
 package sun.java2d.cmm.lcms;
 
-import java.awt.color.ColorSpace;
 import java.awt.color.ICC_Profile;
-import java.awt.color.CMMException;
+import java.util.Arrays;
+import java.util.HashMap;
 import sun.java2d.cmm.ColorTransform;
 import sun.java2d.cmm.PCMM;
-import sun.java2d.cmm.lcms.LCMS;
-import sun.java2d.cmm.lcms.LCMSTransform;
 
 public class LCMS implements PCMM {
 
     /* methods invoked from ICC_Profile */
-    public native long loadProfile(byte[] data);
+    @Override
+    public long loadProfile(byte[] data) {
+        long id = loadProfileNative(data);
 
-    public native void freeProfile(long profileID);
+        if (id != 0L) {
+            if (profiles == null) {
+                profiles = new HashMap<>();
+            }
+            profiles.put(id, new TagCache(id));
+        }
+        return id;
+    }
+
+    private native long loadProfileNative(byte[] data);
+
+    @Override
+    public void freeProfile(long profileID) {
+        TagCache c = profiles.remove(profileID);
+        if (c != null) {
+            c.clear();
+        }
+        if (profiles.isEmpty()) {
+            profiles = null;
+        }
+        freeProfileNative(profileID);
+    }
+
+    private native void freeProfileNative(long profileID);
 
     public native synchronized int getProfileSize(long profileID);
 
     public native synchronized void getProfileData(long profileID, byte[] data);
 
-    public native synchronized int getTagSize(long profileID, int tagSignature);
-    public native synchronized void getTagData(long profileID, int tagSignature,
-                                               byte[] data);
-    public native synchronized void setTagData(long profileID, int tagSignature,
+    @Override
+    public synchronized int getTagSize(long profileID, int tagSignature) {
+        TagCache cache = profiles.get(profileID);
+
+        if (cache ==  null) {
+            cache = new TagCache(profileID);
+            profiles.put(profileID, cache);
+        }
+
+        TagData t = cache.getTag(tagSignature);
+        return t == null ? 0 : t.getSize();
+    }
+
+    private static native byte[] getTagNative(long profileID, int signature);
+
+    @Override
+    public synchronized void getTagData(long profileID, int tagSignature,
+                                               byte[] data)
+    {
+        TagCache cache = profiles.get(profileID);
+
+        if (cache ==  null) {
+            cache = new TagCache(profileID);
+            profiles.put(profileID, cache);
+        }
+
+        TagData t = cache.getTag(tagSignature);
+        if (t != null) {
+            t.copyDataTo(data);
+        }
+    }
+
+    @Override
+    public synchronized void setTagData(long profileID, int tagSignature, byte[] data) {
+        TagCache cache = profiles.get(profileID);
+
+        if (cache != null) {
+            cache.clear();
+        }
+        setTagDataNative(profileID, tagSignature, data);
+    }
+
+    private native synchronized void setTagDataNative(long profileID, int tagSignature,
                                                byte[] data);
 
     public static native long getProfileID(ICC_Profile profile);
@@ -103,4 +165,59 @@ public class LCMS implements PCMM {
 
         initLCMS(LCMSTransform.class, LCMSImageLayout.class, ICC_Profile.class);
     }
+
+    private static class TagData {
+        private int signature;
+        private byte[] data;
+
+        TagData(int sig, byte[] data) {
+            this.signature = sig;
+            this.data = data;
+        }
+
+        int getSize() {
+            return data.length;
+        }
+
+        byte[] getData() {
+            return Arrays.copyOf(data, data.length);
+        }
+
+        void copyDataTo(byte[] dst) {
+            System.arraycopy(data, 0, dst, 0, data.length);
+        }
+
+        int getSignature() {
+            return signature;
+        }
+    }
+
+    private static class TagCache  {
+        private long profileID;
+        private HashMap<Integer, TagData> tags;
+
+        TagCache(long id) {
+            profileID = id;
+
+            tags = new HashMap<>();
+        }
+
+        TagData getTag(int sig) {
+            TagData t = tags.get(sig);
+            if (t == null) {
+                byte[] tagData = getTagNative(profileID, sig);
+                if (tagData != null) {
+                    t = new TagData(sig, tagData);
+                    tags.put(sig, t);
+                }
+            }
+            return t;
+        }
+
+        void clear() {
+            tags.clear();
+        }
+    }
+
+    private static HashMap<Long, TagCache> profiles;
 }
diff --git a/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSImageLayout.java b/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSImageLayout.java
index 3695a163211..b53bd9a45d3 100644
--- a/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSImageLayout.java
+++ b/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSImageLayout.java
@@ -22,26 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
 package sun.java2d.cmm.lcms;
 
-import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
 import java.awt.image.ComponentColorModel;
-import java.awt.image.Raster;
-import java.awt.image.WritableRaster;
-import java.awt.image.SinglePixelPackedSampleModel;
 import java.awt.image.ComponentSampleModel;
 import java.awt.image.DataBuffer;
-import java.awt.image.DataBufferByte;
-import java.awt.image.DataBufferUShort;
-import java.awt.image.DataBufferInt;
 import java.awt.image.ColorModel;
+import java.awt.image.Raster;
+import java.awt.image.SampleModel;
 import sun.awt.image.ByteComponentRaster;
 import sun.awt.image.ShortComponentRaster;
 import sun.awt.image.IntegerComponentRaster;
 
-
 class LCMSImageLayout {
 
     public static int BYTES_SH(int x) {
@@ -49,47 +42,34 @@ class LCMSImageLayout {
     }
 
     public static int EXTRA_SH(int x) {
-        return x<<7;
+        return x << 7;
     }
 
     public static int CHANNELS_SH(int x) {
-        return x<<3;
+        return x << 3;
     }
-
-    public static final int SWAPFIRST   = 1<<14;
-
-    public static final int DOSWAP      = 1<<10;
-
+    public static final int SWAPFIRST = 1 << 14;
+    public static final int DOSWAP = 1 << 10;
     public static final int PT_RGB_8 =
-        CHANNELS_SH(3) | BYTES_SH(1);
-
+            CHANNELS_SH(3) | BYTES_SH(1);
     public static final int PT_GRAY_8 =
-        CHANNELS_SH(1) | BYTES_SH(1);
-
+            CHANNELS_SH(1) | BYTES_SH(1);
     public static final int PT_GRAY_16 =
-        CHANNELS_SH(1) | BYTES_SH(2);
-
+            CHANNELS_SH(1) | BYTES_SH(2);
     public static final int PT_RGBA_8 =
-        EXTRA_SH(1) | CHANNELS_SH(3) | BYTES_SH(1);
-
+            EXTRA_SH(1) | CHANNELS_SH(3) | BYTES_SH(1);
     public static final int PT_ARGB_8 =
-        EXTRA_SH(1) | CHANNELS_SH(3) | BYTES_SH(1) | SWAPFIRST;
-
+            EXTRA_SH(1) | CHANNELS_SH(3) | BYTES_SH(1) | SWAPFIRST;
     public static final int PT_BGR_8 =
-        DOSWAP | CHANNELS_SH(3) | BYTES_SH(1);
-
+            DOSWAP | CHANNELS_SH(3) | BYTES_SH(1);
     public static final int PT_ABGR_8 =
-        DOSWAP | EXTRA_SH(1) | CHANNELS_SH(3) | BYTES_SH(1);
-
-    public static final int PT_BGRA_8 = EXTRA_SH(1) | CHANNELS_SH(3) |
-        BYTES_SH(1) | DOSWAP | SWAPFIRST;
-
-    public static final int DT_BYTE     = 0;
-    public static final int DT_SHORT    = 1;
-    public static final int DT_INT      = 2;
-    public static final int DT_DOUBLE   = 3;
-
-
+            DOSWAP | EXTRA_SH(1) | CHANNELS_SH(3) | BYTES_SH(1);
+    public static final int PT_BGRA_8 = EXTRA_SH(1) | CHANNELS_SH(3)
+            | BYTES_SH(1) | DOSWAP | SWAPFIRST;
+    public static final int DT_BYTE = 0;
+    public static final int DT_SHORT = 1;
+    public static final int DT_INT = 2;
+    public static final int DT_DOUBLE = 3;
     boolean isIntPacked = false;
     int pixelType;
     int dataType;
@@ -98,25 +78,30 @@ class LCMSImageLayout {
     int nextRowOffset;
     int offset;
 
+    /* This flag indicates whether the image can be processed
+     * at once by doTransfrom() native call. Otherwise, the
+     * image is processed scan by scan.
+     */
+    private boolean imageAtOnce = false;
     Object dataArray;
+
     private LCMSImageLayout(int np, int pixelType, int pixelSize) {
         this.pixelType = pixelType;
         width = np;
         height = 1;
-        nextRowOffset = np*pixelSize;
+        nextRowOffset = np * pixelSize;
         offset = 0;
     }
 
     private LCMSImageLayout(int width, int height, int pixelType,
-                            int pixelSize) {
+            int pixelSize) {
         this.pixelType = pixelType;
         this.width = width;
         this.height = height;
-        nextRowOffset = width*pixelSize;
+        nextRowOffset = width * pixelSize;
         offset = 0;
     }
 
-
     public LCMSImageLayout(byte[] data, int np, int pixelType, int pixelSize) {
         this(np, pixelType, pixelSize);
         dataType = DT_BYTE;
@@ -135,102 +120,218 @@ class LCMSImageLayout {
         dataArray = data;
     }
 
-    public LCMSImageLayout(double[] data, int np, int pixelType, int pixelSize)
-    {
+    public LCMSImageLayout(double[] data, int np, int pixelType, int pixelSize) {
         this(np, pixelType, pixelSize);
         dataType = DT_DOUBLE;
         dataArray = data;
     }
 
-    public LCMSImageLayout(BufferedImage image) {
-        ShortComponentRaster shortRaster;
-        IntegerComponentRaster intRaster;
-        ByteComponentRaster byteRaster;
+    private LCMSImageLayout() {
+    }
+
+    /* This method creates a layout object for given image.
+     * Returns null if the image is not supported by current implementation.
+     */
+    public static LCMSImageLayout createImageLayout(BufferedImage image) {
+        LCMSImageLayout l = new LCMSImageLayout();
+
         switch (image.getType()) {
             case BufferedImage.TYPE_INT_RGB:
-                pixelType = PT_ARGB_8;
-                isIntPacked = true;
+                l.pixelType = PT_ARGB_8;
+                l.isIntPacked = true;
                 break;
             case BufferedImage.TYPE_INT_ARGB:
-                pixelType = PT_ARGB_8;
-                isIntPacked = true;
+                l.pixelType = PT_ARGB_8;
+                l.isIntPacked = true;
                 break;
             case BufferedImage.TYPE_INT_BGR:
-                pixelType = PT_ABGR_8;
-                isIntPacked = true;
+                l.pixelType = PT_ABGR_8;
+                l.isIntPacked = true;
                 break;
             case BufferedImage.TYPE_3BYTE_BGR:
-                pixelType = PT_BGR_8;
+                l.pixelType = PT_BGR_8;
                 break;
             case BufferedImage.TYPE_4BYTE_ABGR:
-                pixelType = PT_ABGR_8;
+                l.pixelType = PT_ABGR_8;
                 break;
             case BufferedImage.TYPE_BYTE_GRAY:
-                pixelType = PT_GRAY_8;
+                l.pixelType = PT_GRAY_8;
                 break;
             case BufferedImage.TYPE_USHORT_GRAY:
-                pixelType = PT_GRAY_16;
+                l.pixelType = PT_GRAY_16;
                 break;
             default:
-            // TODO: Add support for some images having
-            // SinglePixelPackedModel and ComponentSampleModel
-                throw new IllegalArgumentException(
-                    "CMMImageLayout - bad image type passed to constructor");
+                /* ColorConvertOp creates component images as
+                 * default destination, so this kind of images
+                 * has to be supported.
+                 */
+                ColorModel cm = image.getColorModel();
+                if (cm instanceof ComponentColorModel) {
+                    ComponentColorModel ccm = (ComponentColorModel) cm;
+
+                    // verify whether the component size is fine
+                    int[] cs = ccm.getComponentSize();
+                    for (int s : cs) {
+                        if (s != 8) {
+                            return null;
+                        }
+                    }
+
+                    return createImageLayout(image.getRaster());
+
+                }
+                return null;
         }
 
-        width = image.getWidth();
-        height = image.getHeight();
+        l.width = image.getWidth();
+        l.height = image.getHeight();
 
         switch (image.getType()) {
             case BufferedImage.TYPE_INT_RGB:
             case BufferedImage.TYPE_INT_ARGB:
             case BufferedImage.TYPE_INT_BGR:
-                intRaster = (IntegerComponentRaster)image.getRaster();
-                nextRowOffset = intRaster.getScanlineStride()*4;
-                offset = intRaster.getDataOffset(0)*4;
-                dataArray = intRaster.getDataStorage();
-                dataType = DT_INT;
+                do {
+                    IntegerComponentRaster intRaster = (IntegerComponentRaster)
+                            image.getRaster();
+                    l.nextRowOffset = intRaster.getScanlineStride() * 4;
+                    l.offset = intRaster.getDataOffset(0) * 4;
+                    l.dataArray = intRaster.getDataStorage();
+                    l.dataType = DT_INT;
+
+                    if (l.nextRowOffset == l.width * 4 * intRaster.getPixelStride()) {
+                        l.imageAtOnce = true;
+                    }
+                } while (false);
                 break;
 
             case BufferedImage.TYPE_3BYTE_BGR:
             case BufferedImage.TYPE_4BYTE_ABGR:
-                byteRaster = (ByteComponentRaster)image.getRaster();
-                nextRowOffset = byteRaster.getScanlineStride();
-                int firstBand = image.getSampleModel().getNumBands() - 1;
-                offset = byteRaster.getDataOffset(firstBand);
-                dataArray = byteRaster.getDataStorage();
-                dataType = DT_BYTE;
+                do {
+                    ByteComponentRaster byteRaster = (ByteComponentRaster)
+                            image.getRaster();
+                    l.nextRowOffset = byteRaster.getScanlineStride();
+                    int firstBand = image.getSampleModel().getNumBands() - 1;
+                    l.offset = byteRaster.getDataOffset(firstBand);
+                    l.dataArray = byteRaster.getDataStorage();
+                    l.dataType = DT_BYTE;
+                    if (l.nextRowOffset == l.width * byteRaster.getPixelStride()) {
+                        l.imageAtOnce = true;
+                    }
+                } while (false);
                 break;
 
             case BufferedImage.TYPE_BYTE_GRAY:
-                byteRaster = (ByteComponentRaster)image.getRaster();
-                nextRowOffset = byteRaster.getScanlineStride();
-                offset = byteRaster.getDataOffset(0);
-                dataArray = byteRaster.getDataStorage();
-                dataType = DT_BYTE;
+                do {
+                    ByteComponentRaster byteRaster = (ByteComponentRaster)
+                            image.getRaster();
+                    l.nextRowOffset = byteRaster.getScanlineStride();
+                    l.offset = byteRaster.getDataOffset(0);
+                    l.dataArray = byteRaster.getDataStorage();
+                    l.dataType = DT_BYTE;
+
+                    if (l.nextRowOffset == l.width * byteRaster.getPixelStride()) {
+                        l.imageAtOnce = true;
+                    }
+                } while (false);
                 break;
 
             case BufferedImage.TYPE_USHORT_GRAY:
-                shortRaster = (ShortComponentRaster)image.getRaster();
-                nextRowOffset = shortRaster.getScanlineStride()*2;
-                offset = shortRaster.getDataOffset(0) * 2;
-                dataArray = shortRaster.getDataStorage();
-                dataType = DT_SHORT;
+                do {
+                    ShortComponentRaster shortRaster = (ShortComponentRaster)
+                            image.getRaster();
+                    l.nextRowOffset = shortRaster.getScanlineStride() * 2;
+                    l.offset = shortRaster.getDataOffset(0) * 2;
+                    l.dataArray = shortRaster.getDataStorage();
+                    l.dataType = DT_SHORT;
+
+                    if (l.nextRowOffset == l.width * 2 * shortRaster.getPixelStride()) {
+                        l.imageAtOnce = true;
+                    }
+                } while (false);
                 break;
+            default:
+                return null;
+        }
+        return l;
+    }
+
+    private static enum BandOrder {
+        DIRECT,
+        INVERTED,
+        ARBITRARY,
+        UNKNOWN;
+
+        public static BandOrder getBandOrder(int[] bandOffsets) {
+            BandOrder order = UNKNOWN;
+
+            int numBands = bandOffsets.length;
+
+            for (int i = 0; (order != ARBITRARY) && (i < bandOffsets.length); i++) {
+                switch (order) {
+                    case UNKNOWN:
+                        if (bandOffsets[i] == i) {
+                            order = DIRECT;
+                        } else if (bandOffsets[i] == (numBands - 1 - i)) {
+                            order = INVERTED;
+                        } else {
+                            order = ARBITRARY;
+                        }
+                        break;
+                    case DIRECT:
+                        if (bandOffsets[i] != i) {
+                            order = ARBITRARY;
+                        }
+                        break;
+                    case INVERTED:
+                        if (bandOffsets[i] != (numBands - 1 - i)) {
+                            order = ARBITRARY;
+                        }
+                        break;
+                }
+            }
+            return order;
         }
     }
 
-    public static boolean isSupported(BufferedImage image) {
-        switch (image.getType()) {
-            case BufferedImage.TYPE_INT_RGB:
-            case BufferedImage.TYPE_INT_ARGB:
-            case BufferedImage.TYPE_INT_BGR:
-            case BufferedImage.TYPE_3BYTE_BGR:
-            case BufferedImage.TYPE_4BYTE_ABGR:
-            case BufferedImage.TYPE_BYTE_GRAY:
-            case BufferedImage.TYPE_USHORT_GRAY:
-                return true;
+    public static LCMSImageLayout createImageLayout(Raster r) {
+        LCMSImageLayout l = new LCMSImageLayout();
+        if (r instanceof ByteComponentRaster) {
+            ByteComponentRaster br = (ByteComponentRaster)r;
+
+            ComponentSampleModel csm = (ComponentSampleModel)r.getSampleModel();
+
+            l.pixelType = CHANNELS_SH(br.getNumBands()) | BYTES_SH(1);
+
+            int[] bandOffsets = csm.getBandOffsets();
+            BandOrder order = BandOrder.getBandOrder(bandOffsets);
+
+            int firstBand = 0;
+            switch (order) {
+                case INVERTED:
+                    l.pixelType |= DOSWAP;
+                    firstBand  = csm.getNumBands() - 1;
+                    break;
+                case DIRECT:
+                    // do nothing
+                    break;
+                default:
+                    // unable to create the image layout;
+                    return null;
+            }
+
+            l.nextRowOffset = br.getScanlineStride();
+            l.offset = br.getDataOffset(firstBand);
+            l.dataArray = br.getDataStorage();
+            l.dataType = DT_BYTE;
+
+            l.width = br.getWidth();
+            l.height = br.getHeight();
+
+            if (l.nextRowOffset == l.width * br.getPixelStride()) {
+                l.imageAtOnce = true;
+            }
+            return l;
         }
-        return false;
+        return null;
     }
 }
diff --git a/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java b/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java
index aa9d0bf054f..de8a77c75f3 100644
--- a/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java
+++ b/jdk/src/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java
@@ -161,13 +161,18 @@ public class LCMSTransform implements ColorTransform {
     }
 
     public void colorConvert(BufferedImage src, BufferedImage dst) {
-        if (LCMSImageLayout.isSupported(src) &&
-            LCMSImageLayout.isSupported(dst))
-        {
-            doTransform(new LCMSImageLayout(src), new LCMSImageLayout(dst));
-            return;
-        }
         LCMSImageLayout srcIL, dstIL;
+
+        dstIL = LCMSImageLayout.createImageLayout(dst);
+
+        if (dstIL != null) {
+            srcIL = LCMSImageLayout.createImageLayout(src);
+            if (srcIL != null) {
+                doTransform(srcIL, dstIL);
+                return;
+            }
+        }
+
         Raster srcRas = src.getRaster();
         WritableRaster dstRas = dst.getRaster();
         ColorModel srcCM = src.getColorModel();
@@ -439,6 +444,14 @@ public class LCMSTransform implements ColorTransform {
     public void colorConvert(Raster src, WritableRaster dst) {
 
         LCMSImageLayout srcIL, dstIL;
+        dstIL = LCMSImageLayout.createImageLayout(dst);
+        if (dstIL != null) {
+            srcIL = LCMSImageLayout.createImageLayout(src);
+            if (srcIL != null) {
+                doTransform(srcIL, dstIL);
+                return;
+            }
+        }
         // Can't pass src and dst directly to CMM, so process per scanline
         SampleModel srcSM = src.getSampleModel();
         SampleModel dstSM = dst.getSampleModel();
diff --git a/jdk/src/share/demo/java2d/J2DBench/build.xml b/jdk/src/share/demo/java2d/J2DBench/build.xml
index a36aca8cec7..c29611d0f7a 100644
--- a/jdk/src/share/demo/java2d/J2DBench/build.xml
+++ b/jdk/src/share/demo/java2d/J2DBench/build.xml
@@ -52,7 +52,7 @@
     <javac debug="flase" source="1.5" target="1.5" srcdir="${src}" destdir="${build}"/>
   </target>
 
-  <target name="run" depends="dist" 
+  <target name="run" depends="dist"
     description="run J2DBench" >
     <java jar="${dist}/J2DBench.jar"
        fork="true"
@@ -60,7 +60,7 @@
     </java>
   </target>
 
-  <target name="analyze" depends="dist" 
+  <target name="analyze" depends="dist"
     description="run J2DAnalyzer" >
     <java jar="${dist}/J2DAnalyzer.jar"
        fork="true"
@@ -80,6 +80,10 @@
     <copy todir="${build}/j2dbench/tests/iio/images">
       <fileset dir="${resources}/images" />
     </copy>
+    <mkdir dir="${build}/j2dbench/tests/cmm/images"/>
+    <copy todir="${build}/j2dbench/tests/cmm/images">
+      <fileset dir="${resources}/cmm_images" />
+    </copy>
   </target>
 
   <target name="dist" depends="compile, resources"
@@ -88,14 +92,14 @@
     <mkdir dir="${dist}"/>
 
     <!-- Put everything in ${build} into the J2DBench.jar file -->
-    <jar jarfile="${dist}/J2DBench.jar" basedir="${build}" 
+    <jar jarfile="${dist}/J2DBench.jar" basedir="${build}"
         excludes="j2dbench/report/**" >
       <manifest>
         <attribute name="Built-By" value="${user.name}"/>
 	<attribute name="Main-Class" value="j2dbench.J2DBench"/>
       </manifest>
     </jar>
-    <jar jarfile="${dist}/J2DAnalyzer.jar" basedir="${build}" 
+    <jar jarfile="${dist}/J2DAnalyzer.jar" basedir="${build}"
         includes="j2dbench/report/**" >
       <manifest>
         <attribute name="Built-By" value="${user.name}"/>
diff --git a/jdk/src/share/demo/java2d/J2DBench/resources/cmm_images/img_icc_large.jpg b/jdk/src/share/demo/java2d/J2DBench/resources/cmm_images/img_icc_large.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..6d61c9f120fd60e556ee88419c641f5253249774
GIT binary patch
literal 430301
zcmb@v4Rl=PdG9+Kd4xT-h=H-|YK344%V);1xE2|x>ztEH789hAaYth}b+ovvwhTl=
zL+gB)^yZwiYRO38ff7j>1Oak73?o1(x3!z$9D3L3DkvCA?qyXH?kP=s&w}(`()i}A
zHa9uFNmiTO-~V~uJrYUR{aTl-$n&xHyWhQM@8AAE|L1w%{gbzT@^)-%{-Z-5jkUD2
z#0L3a>?c2tec;Y}#_qi1jyvzzdFs=@c~|L^ckcY`ouB#aft{Z`@##<8`IB$9{9tHc
z;MWSpU;gOOp&Tp5Vl99B$&>edCcZBgyXQAP`|0AX2X`L(_~_0n-io!x-XFU%wj<Vk
z;^b#e^%n|<Vn6#I>&N*2Kl~^Cjm6&VQCmN|*#G4xo9?*tGbdT%@A>~-Cr^F)vov{(
z*X^JC>?yq-=XL7Sbc)yiMz25NuV?gn%wN}SnWM!4mU)raTR-8i|5UHX{PkOU9k#{G
z*p^S0e&fy)pWgWy_F3=$fBo;Xcm5WAkHvoDH-F<!{i|cDe`B%l9k657vi*s*&wlgK
zSZx2_#bT{rSo>`3=~(PP{7x*k<FD5~+x28D_P(>R*uVdeCr^L+UT@ES#MuAc`=9((
zY#^3s-LPRpYl1(CM567AEgP@kzxQq4ylKl-@4NcytKN6jRo85P|Ib~M>ezPGRXaL&
zbX<Gwb=O^Y&Chl1>iWR0_kZBJ52%qAR=uL_iYqs6yz&F7t5P5MfBoN2UW#3{acgXA
zthJ>p7Qd>c^{SSiyb`;PA1=XptW!DKuXyVQdbx2^ax)9Our(HMX>E<ue|CVS|7}aW
zHMZfZ#MPa>{cYEboVcRvQ>hy#W}n)4{lN<_Z!50+{jLv<eR^_Ja{JHi`1y|R-Txw;
z*^|BL=3m(Viw6d7$$j+J!J+(-qrdX8U*+JQyyMQhJ~3Xp`!k<CeedUf>%aT_+54uZ
z?|<N2dG3pqN9G@W>`RZ=o~|!E^XzkrU-`qYHeUGm|KY_y`X83Q_R7UqU;ES7zrOnB
zr9b~qfAQ8|e&d~Q{>}gLzrOpezy0>*@BZ)K`~H9ZhyUXTKm3vQtA+iH{_`E9-|P45
zD)uYR&$8hP?N>|ubNs*cstt+G-nOgzN3J;WscX7!oY<H;IQ!Ivmp5Jiq2k|f8~gN1
za{I3AJKf*auGyabKijd%|4)0?+_AO&`bKO^YYRVK>s7H|ik&IGnM?n{U;Xm8Ue5J&
z$0u_OsY-F{cXQbziyKFVZ(B&+*R%h~c)j!cM{);dyUL^Yq^k#4SBvG@&G}5DHgRRD
zu`)b3FqNt_?n^JEzA-X5d#Uz#rnK>NYI1(&{^aQRLcOz8%H+C^HEMI^gV(ZF<G%gH
zH~SargO@WbSST$$p2>C6T;}ef?UiC7z4h|QZ42AF-k&MezC1XeUU;TFdQflZ*E{)4
zI(6>kV(#YoFJ41iEw$O}7jrwSM;|zyerC0N%fqP#n|+K$lcTp>$Q@A2$qbv{y*vGE
z@}6{k_*(X9TbKUQ&Q$uDH>Y+FZ=av56vt9Wrf#kroqKI$Xn3$cmpXbrIWU|XZpmcE
z7ms(RMv5(b_K@D4yt<rTJkB1oNPaXw&livE-8z!nw)X^!oGBJpk3N*HmFHWA_-Jck
zyteRAK2zFrEI}hL@x{#6m9Xr2T6%7W*4$7l`vUvw3-!h0Z8NJY#h3EwT2)PIvBe#q
ztCib_Tha^l=X~4x@MJPwTd*zmPO0?_Z*ALgH5#XNy54wXtz-M>@t%)rchr-4ZH?we
za>Fs(F0Tf5RP<IGi(c*7u~g2edqws*U3<#6U^}Kp;>DGrf;DGbwH_z)>F2z2p|w57
zUSSt^*fFqP^4qT+5;~G?JhFujFK$q8*mA!PaX4Vfbbaw;D@VfjGF_WnI8zv}FVf3B
zA5A6sksr*ZlDW=YYGkn9)6?CP*jXLPXE+7R_9vauNl;2nmeZ-!RIQxpeJa<pbD>^L
zCQ`M@nc`}3HN%dTlgZIUPuI*yE>%9rq753Do1a-8$?+izEf<p<{=!HuT^-Mi*Jk^N
zSui<Dn`eqExz6fBDml_WNISXC@mhJHKi3nd@s(U+=K^mJuH@pjN-8xnJUE`{Nfipk
za=P9-UYi)Kry3)DYa7~ED~~4obE)Ev#z?Mf^3fMkg?$UDk$!D)nnedW$n>t9DQ)p?
zr>iH1IdAP_HO~vypeNeQzS?}bjl<eGrERh|ol~g>pO(`*=v|kN63xs{oY5!tbx*3I
z<CNCsTa%gbItypEu+I}ysp7JFH*od5uinamo1o#Muc=Pbw;0W|vPdQsdaKQisuQuO
z`&&2{`Z%%1qZN6R)`o1cR*tJq{>B-0Q0uiO`B}D%YGeG$d{b2CWA@Exo^?2uw3O2F
zR~%n>`i0b%^g?ZhHq}g_B^RHM*0duN<6C{8tyWLu)3urF4y?Xe`t^V6`la8!;;wnf
zu`^X%9eI4y`!oH|tX_KHG#C8U!062>J}-lkR}Pf(qqjUbeA~0dtu<aA)W`daTN^db
zm0hDStlqga|HN?L6y)g<;1b(*0jQP3)k7ld;x+G2*Ws&yDSHm|B}WhHZ|25Z;pVf+
zgJZ&NeK)i$m3otzr6=;4s}EF)BZCLuoVs~__WG%wY;pA(p>ck8?<qKWYH@3Ao~3%h
zGAN$kZyoKtRD*BboGj^Wd*^8&Y{#jpcG4jB&>;|79w`pOSS|wY0|DUA7VkJ8(J9^m
zKKgY1o(X_iOy|>C!@|Ou%E+*wRlQ`u3T)~a-E(Xcm+l3QwIOYdh7OGu&fB|>Ej|4G
z=xct!`S{3iU<xOMH$bBf+oKmA7_XJ5^+n$rMf3_zIhh~1p0n~P10&ll+<h$3opN@a
znN};-XrjBPdw55&xKc1~wZ1?HU+o5$#vwuWk-hP=xoum<qJ0(l9ha=Ox`uza)ZHV9
z&(9ftrz8B{WMKDhb*p(!R~Rnx()%4cE+T5(@c$ARI=YXyj&P34P@puY*K|vN?W`X^
zJM^5>(_uMlL^q;XDXcr)l80XH3C^$jXmVr-6zXc`cNO%uPe6bwfK2y5hhj%^WH2+%
zcirj5%w{eX&JRw2NtOa!oS|joTt7GH@pO8jTHHZX^&(eJZ4z`Ob{DsE1=V}fFl-tm
z<pfY8@UT!&n^|_q%+0g-TzP;~ytrH_h@^Z0lZ0#V(!QBXbdm;2Fr!lJ*bW*p30<J`
z<<T5BpXDq^uZtalL?!y7`+94?uvZn3U~`ohVp?Ba?1SdUlXN<R3gLi9xSJCR3}a$i
z6N&aodWWsWehc&wa2n8U7zCwjlZHjzF@Q~chQ1jx_0`Np+r+YSE7dI~h6Pi$9lGEU
zora_lnHq*(E)Ih?+=N@OcxuOjAvJaXakUz@KJlQqUVGHP(t>BS+X9?5&IdEEu<HPG
zxKA%)&TMbom*+y^#kxg!V+U`n_{|8>;P$-VCv^C^2VVD!D?`J-_U+Dp{DG^yfyL4v
z!8ashj|3LXyT4fGD5L2TJ)pJiiTs`+1R8sCWepx~Z8ZLR6;`#2G17=n3=bY$E%)a-
zdtX|8Gk4&N*QB5vDpA_6-gyaCIrP9Ot+{Jd8d4C<rS-)(3Z<)&q@`Tvl~RU>2A%^{
zv)4bz*>~S-t;4sa{;2*+`dPjo+B<Ssf^<M?akdL&BJ!+DXhx7Z^VnqwuzT<w*10^}
zo9hWkJu>yrO2(5@S^&(ZzHzGl`q=7fu{_@tmE4WSbm5*Uc8m@n!y;|dBJfQ}TAlQ-
zxx&wYHZJ7MZQa8i_MzzFh?$!Y<a@QvU-C^nLYlogxlUMFTP(q^FNrvsZ(?Wh<iU|V
z@@h%zLbQ(X&0NGMV+%04_4BAy!%TLh@TwCp+TIpx*Ay=27SgTTVYPq=2DMz7?8S#y
zg+Xb;d~{RLt{6d~rGQQQ4tiQKu^d#Kt>74SO&RdE*8KVojpX|5E^^Lj7cny4!Oh2!
znc;vACb~1IXF)cmE-%f{J-_jAlFvYI2eKWQ7M;9ZGr%sDnyeIpJVf}RCUOE_l~XEd
z<V++Gbn~-)nG#@xZs1NTrXJ_&2QH}wCvvK2B2yqWWeMN*c_TWDGh#82<T4-U5-+k8
zprxY{kcpmF*00SX9p`6xRmiej{~%w!(47dNl9nA!a-?UL;elF8W~7FM;7q$(D-@T(
zvSib^Ft98z(9KF?T7t03wps=1s?f$yG1|tO>9j6><Ga2)fxHwX)CqA3E(8@;PI5zW
zY_Q`e_?k~@jw5Rj*3i3!>hX1J6~$8P4FVBR069~z?b@kcF>rZ}kB%_Ym7{H(^bTxs
zZ_7wugm3lH7L=f+BhBTwlb{%pflgh$Go{#Q>du}1fpI%^<;%W<^Jl=EcDX!o-kb34
za`voYeaW`klZqjPBh=c48fWtS%Ds`0Jodw{BLjaD8zPn-=OB0XKYP~`eT2?;0njO<
zVC~C?h&zE$BK3UdrDXr`;34pafK+h2;Xvg`3ApL}*{!hmlmRwABLOM)@#Eg|a7~T1
z%|CIN$edelao1`6Rm=<kLty<*j-%b1+kYgp1ef0|SzujU?kwfH<Mn~Rt+&BL;5$4t
zx1W1I4CYcmXqpmT+%<ZNQ2NlJk;96pFVKpyHnoyRn7Z<Pt;ov7K{_49_=DPh?Tglp
z7j|7(nisiG$N9U}_&Rrt<1A^;McCfW)d`8DV|J#dVP2u4E4ID>Kr2w~e5;tzB6f1h
z1f23KgrNJNMV{+LsG?knD^qMN2PK14?2Q^|4-sw;6q8z0AIcC?NK{8479nnPBfZX<
zwPqsttq-;{C0bQ0&Cr%Ej6|VuP;b+{?b-)+eZDtcT?r`EEx{C~k<tSC3)*DpuiZ*G
z66@6<eLNvYAs+4Ew2lz)4a8HlKHxj$(Ry>Mh~-!*x+Pgp3e$EpeFdOASmJK6tQ%1r
zbrxdPLGUs=$lYqVpOZwal(LfAOQjTK^S+#iQ+x+__*nD-kggmdj8T*ib&e%AD?;ZQ
zq;VQ36dEJ61(XnfGHrlgm1`3oEYpezTr1PIx*$A>a7iMvhHWoyV6tt3I3oS_nD~Q4
zO`vRf$(B(#rX@u=KJM;;2xvO}fqv^WVM7r%$1cGpEQl418wBY&w5cQ<0X$zBNCt$9
z6m%wPbQzUnzZ{HgNWwJHlSn}Mu@$%?(?L9)yl+90PSg{cS(moGk?|<{H8N^pmV>bD
zGu#%`gk?1DiLf1{n#J1$v7AI7W?K@-qLoBuGZfd_dH)nXp%QB|U*qUmw0p1Ja;^?*
zX)~Q~v8ong<3eWS7tmvEVK9ycoOp{Lug&@d2RRG<F4En@{^#i>pH%O~iwXV4G{6{I
z<M0)4d>_U+9Ywyr=X(^s3J(iyGxv`?4h#<>1$#QLOw|<WLN`;D(ujX)Cg90Mgl2Fk
zFBeJ}i3b#?vjXQV;kN|jt;Ms0Vx^mqY{5*yZ;TWnDzQxO=6rj1+)TrTMTP1kFtE5v
zL_9{Yy}xKOv_$;O`ld#Q`p~p!(l?Ns+=CY$80Bm(T@5$erF=Qj>iCCnZp<u7{6q6R
zcke&4IQe7-!+?!G_E_T`^BdLw`XM59fpzK0jFz~_ExNXF?%`;QT>1}ipby1is{-lF
z-F<n*vi!b}El-z^458Cp-{j}xs~zhV&2fWi+%9A3M@}~V`7aV+O$aHnUW-Gg_tmqF
z4#MpwSO&DT3E0g>8+8K=7w+BxD}$*?pj)1{)(t`EDo3sn36Ax2JBZNNMA&O|ja<#A
zCX=`X7lh$xK_l7E%1CW8n3R=goYZ?`ijxhLb|e%|Pe+2*ZX?0c++p_;F6N_w=4(`K
z$Fb#tGU-}9;R={zwb2h4uXI3M#KPB`n#;P^dZwf4ZXQ|Wdf%xtV>U3d0ZBS@Tr(aK
zmlZdcZk$>7aikC3HjEVL{KW7eEF*fZDe&ENn5(-eT4kl-*uVr|0pRLW<8CktnYBv6
zgJL9JKX2_b0}P=$E;!<}HuI7Z%zDJ8tK+s9Uzo~6iy3B#-PHz1OE1_I9X9v~r;>qm
zM*2!xQr&FD&P)-qr{1%T;0@A>0I!SRXbTr<S4gGFUUAjbU_lhFO;ov6Ks5_vYm++B
zWpOqM+m<RcJ;JbtND9O)nD#gtT#B7StB4vHWbCvz9u2Ga>)I9Jy(M!7)Z2?YgCJ~L
z1jbMu8xdGH0WCY+x5>B2p)pa|)4kJ3?Td_9?Cqq6r$id2G1<Hw(|U`JGT^l4HYcJ!
z(C;ljd=ZTO`akXdrGIyE;f?OpeFr9Tsf{ovy{P0zqp|TcVd%`%f|Q>uzY!GVY5PQZ
zn;&IJnauVJFdO#c`|P<z;ri{%o!{rzyM<d;ZQl4(9_b@DgQ%2-E6={KW<pIc8?1rU
zQjBfYDjl~xY^ZveHb#}Ysm;5>Yn&s2l6t{YG(&S2aT`YuDw{%g2KaH~9w(nBwSt@=
z_{V@eI_DV}M{{ql5&G)aBo0iTf?#(tuQyxMB6U`JZ8_5-TS4-2=COB%S^DFhT)F75
z72?nQ5%<$(xOde-=Go%cMI)0|J2~7+m}HM$cuE&GN8M8?l81Zx@`_@c`p;yQR+|p#
z4H5B#uhHH_fds1OeIg&Q!ZwU>8>%bH7LC^yCa=acv~~AIWOS=f!0V)M9a?!!tG1_(
z`hqO|-0`z7NXmAvvmsr_Id5Sh_X2Iyl^*i-DR6Woatigeh2js0iiYU;NU#FdHu{{W
zuqMmxI1e4dqHwn%t9|KM)4WaX4I^A#Z;7A1_4CR?g~NHFTF>H_+Hv9+kOfTMrrQ=D
z>08u^Pgu;-KR-S?+Anf&%QTGDi!EG1sVTv&+}{Vtg6vaRSLe4z2VztTJDkFV8$`-N
zsp4zors&dH=8B)3Asn}bs)Xa5#)`)kUdvTnsG_87rOkjU6aF9tftRo3YtsK>dK3bI
zBIP{XQOvR1eM=l`harAsDVTaF9hM|vQ~U={v0$S5+7=rVimzC(T`!o4#{L_`Kr;3x
z>X*PBK-za;`NVLaZy6`nVI>Tk@C29n(Sg7ZnWKt-dyH<K4?1gP3J`>1aq^WB#bG)|
z9}I5_v?n;u#T|vrr-Wo#k5IB=j2(S%>PHNeuG6O$Vhfi>)b-hv7fq7(aeNGlNJLtv
z@6E89?OAZnaxje!IHl>|cIRcPc<rQj0);7-#st3*Nt@OMxlwi}(w35^I)oR#_urxo
z|77*-55FS>-oCo^^5{LF5_fq+PdYnUo;`LdOP&RAjy8p4nR6mol~b|@G5-1pgl9N1
zlM2t#Irk?KdKR8@Cz;}=UOss8Vv2U|yBP8*9V~!YCHzHoR>jnZ^%wR@0bI{tAS_Os
za=j-_Fg=<d8A3GT!IKj|v#QJxO2KVM980;Ti$-#f_Iq{@r(}v;lQIFhiG&g2b=dRY
zEN61E_9R=F-OH_@a`b^nPGTM`!Cj&DLhlk3U;1J<=g83u{7fE08}gcIXbVT1N^pMR
z%ruAK67ginKUm1<sSAVEiT5NRJZ|lFFoc*FCnQVCB&fkXJ2sBHlIk&Fcp$7G-6-sN
z6y>wc8+E8D8w1tl2P)Gpk_0iTop_Z~VjyHs=FoiFx%C<{1ob-<j%zmyVASAAR%R5*
z=FsITQCw}C&7uI|ok!AJR}^9k`IxNgRQ3_yOKrB93%6tz4uTeo4iz?}DRijsnz<4}
zcevU{zAI$NbZ0@s;t}WPCEJE$6kF70mT?(j3^<S$G;eWo{)?H--0Mo)IiZR~wp=0Q
zzCgCP`E$wS!Lr54n3M`|<DPXU2`-U`@y7{ilC-nRNmH$+xTsV7vAnVwmW}ekBG;hM
z<usNRnNsqlp=~KK4nj<BdN@5#8c~XE-4~m=qz&9=BC_ttpl!}VRtY;akFZ~`h_|>5
z^em@hLB0G-v516^>oS4HbL3`ia!4%5l+H^P$dg-wUi6cS<0c@?!V@=I`Q?6EJ@yKS
z=+~qc`dLJ>hOm{EX*oY}j$=%+WgbZ<Ta_cjE!GW1!0p*_e5;25_i#>bqBD)PEFC4D
zTG$@QS%@^HEmzmw&c8v!FO^4|vQmI8#VQ<h|C)V!#UyuH0r^4`idt@b$0R0$P&rM8
z-d2deoD2Q~CzKtGh_HnZy*sO7mmgPt_s_;w-<_Kv6XHcQDt@^S2M1@76R>ekaCtPV
zyhLt;DZW`E>ek_Yk}3=J_`855H+21CKiQTI2PPE#Vo_#`ElXcM)J6bn4LLgR!@=Y%
zzBS4DxVv+SH@J#D2Ncb7jw#oz#1J4%XV0t@5p{#<`s-}H`sS2*kTNZMRC!b=U3&R&
z>YPXzEXe*vD+>~x+ezf`hIOq4eW57*M{+<PyT8D;aRJCFfp((!r8;SFYz2B{3p{30
zvOfPWL%wRAupHt?m540Qw~m_^Ig%SR?vRa{Q4s7(%%kNEmS8ZgDGSpg=w>8ISZxMh
zq|-KX?ymbRWRD|gj7e*5zzhlY-$0JISfX+-odFo8(3B~$pcg!5o39L%UPvQQIx<bG
zt=E)djcpU|A=1>8y)vZ;l*&=&2n+OLT_$Bd>YD*gP*mlRr*B-WT1yp?QO${kVzzfh
zcIV6`HbIbo&VcIQjxQR$H)@NfO)X<>;*-0^O?%g5x;8e`I@C|2EIc2}Tr!-MEZVM~
z#+L+?Bv3d(E>*ZF(xkHC;$WI0jATET#FqvW(w>Qsb}3Q`1B6lpP713NM5C;gFlDDd
z7Cl2ZyU@A(at73$wfS;VD4ZSal}O__tS2W+vx>IUkp#si#0q+4&?9i3a2Sr$Dl8^v
zy~ESqn4G5ml$4P%YI$=}FxM(h7)GU>jK#uTKMGmFZJOx+=@%fNv>SV^{_0~0SRLuR
zsOHoi&K=pEZk>V^En~!SZxa8{@+b|Owt#e9Qpi5>f}fB~8PSfHrM+m`3<dQ=hr;CE
z?YwGkP|Fnd=`PUx^lG{p<A~ZZktkKiCh!|CS{F?zsxj}2y8sP%C<8$Ir8SEy&ET78
z+1iq}^<!}DSse|o)4uOSHwFZ0aaFMxt$U^^c$+xPm4<to(Hgndk9=YQA^0b&Pyg`m
zt>O{voCPRW@+f&o4*B5O;m8P-&QyV;gcgNAf}^a#m0_~l+@}W*mQN`Rrbx1o4!Ie{
z*attL;G5D!Wzzu@`5P<w5e%bP{<QFS^OJjSxo82kX}%7OLTv-2m8l}~Es@gRX_b%J
z;w5(uFP$4JE0IJMqxp^(Q<sVEcc-(L#}~FKAET-uRN)ikd|peQdL}8g37Gc`jah&B
zw76Q(A}%d02Q;e{V0TzSnev6jv6IB-N2YcUHh{`jCl{|w$XVufM`65q*%N15>CL{@
zAqAn!#xyarJJlhHRy^7}A+bj3%i{qqoE=7}4kS_~Sd%0^REimSn6M+HPeR^%jkbYu
zLRB0UeQzj2RD|rlX^@X9sENR2;k0nOMNB6p6zUW$pA_j_)dFE(x}<!StHgz<8tHui
zy1Qe@iR|JQ^%y{VKG~iM`FDLA;7JG9^sB}4B-D$a!yI^z)?AudUG0c^YKpab$y%@@
z-9d$_d%5nSZVFqMcC8+LXp|^Zb&Qt88C2v941wRs&|zX}E;*Na{dw+~#L8Gh4Yr=3
zT$ej2O0?hdK3wzA!lHPBZGEcnoO7SG$W+IJFR4#Q{EuaXlpR`4!bCZTf|{6RIqgER
zB~LQhdZ2nC1=SS(Aok*x+g4gfl|~kS63>HlO9`n!$U0+DpeM?$#F3AsK@)7kWu%kT
za#6Hu@#o~3B60V0TpCJ3n|qG+sBgKUY9tBWGg5mTfG%zfQfED#(}rvbM3gLYPCR0v
z0e)KporEA53Uxz{wu`n*1~m47Z;l8*`is>NjEiaFu&u_MM};tT2`H_yNmGb4zmVD@
zo{8{l3x}?^vh^9KUCqPvD<oP4$-eLGhIz0)GroD#Fgx&oBTyTG*m-q3rMO%N!ONNS
zK_5S)2+jd9ZJMs`4Im|-W9u}E2wxH0;T_f~eE7N>SI-g<|H<lCfA}2=z6nMRpc_RG
zT)#%8VUaV=9%r89T=||GC=Kt)cAW0qoWl&;d^q*>Q*J^Y0&3Y%&R8j`s!_Qff{|LC
zLZN$l;_@FcH*+dhobj)zlT?g-$_mfJ`k}(-IcYZhLbnasR@bp8E`Jj_+f_cTav-bu
z4k>hCjcqy$VTry%6{qY4Vtm6p^^w_?{GN|fE=hDnPN&8hZjpOfqS*OO-5IQUbAj?u
zVS9Mjzg2(L1h)|cc%o-`mlRFQpi-`hRON-W+V5BIs}VQ`k!M=2yQfW_np=$PC8C#5
zw}-Do5~VX}P7hY$uo-euQWz<zib#*IDdK5gCo-dihqSMR*;+njU~AFE<BCkl5a>(n
zdZaANGSvBqgo?%k&FocVN3MCQTTEXEW0F?l(tQ${&B*(v2)U|AV%xELc71IU<}EC@
zEVhz9QoXlzn+3a<w%~nahDLfjGFpYqzNNXd;b3wVsHTbjdKDI)&f$7C_><(d2OFe$
z4OpN`p*W|7QZS8?K2_foS5cgtRmy>nwoTR0lFM9=EC2`mQ$_7@3Dw%{!7{>T9Fo~u
z)WqnL6F}`x0pdZ)?MQ=3&M7eusj$o|z{hpT_SFy<^W@CE60lw$q^icEXt2Z?k^t^N
zm4>Rv^+f>%H8^gopgH9ScyvmPPk$#p=+39jh074=dM;(TK})+xSwK7Mhu26WV?7CE
ze%`j@de;x&6tU*m3*|AIDI9Jqc(YS$p9WZ}L19$@lm0VMDLrn5nj9UIsm5oK+=Xdy
zJJ+Xg9&)G_EHSO`E$w}dLj;uL7QI8Yh6VmYRwuX`RLWZ(qZOsEkIWs%R;sS9G{b38
zSlA9_lzb(^Mly7?&pPOf7!(z&%VI#)p64f1j4pX>M@GHCFj%O5;(r?BZ23uS_<i5H
z0LMtu95_?T+)a`OJZ_|pLB3&uC`$QdTmcH^D3(+mPp<QQW;Biog(SQiE9lMAB}voO
zvLb3}vMz8*mCi<U1P?mfwyMZ+!-ItOgZG!E00yZLKaBYMa2E1%ueb3uB}<umXkJgf
zu<JoILF!A&#2i`NgvD7@4u?}yu4JuJyaPc=etbwp=c{Ke<-^b#-{2h=F3GWc<uyyk
zN6_W0!^QL^x`AOOdFaroXOnmCFY-><?Uh>~NFPqUd{}kzRESEdp5BMn9OkrMJU-bJ
zj+-QOIE|cVA>%U=av&awOKK5BhFpcEO(ubr2JfIr*BYoe-PQu)thF4KarXy=a^e!A
zTgWd)l0+Z8TZ#<>Qm%jkU*0yeB)%azjx;aHY1QhHbtp!XEm{{jp8>K1Rsf}tJotoy
ztQi0gsex#>WUwM0x#FVw@qb23zEX?InvSa`9JQmS5Vy-kgtm7^-F;~w*9Po4SQx1s
zF_-D~O}Yy4J8h43+|lBX?2WBTo$62|++S3boP?W_bL4P}FcG97$eQk?3?`I8kuV)d
zhJiTSC&|=E)Flw8D*z5Y!nQ_Z(mczEijs|G0;!}`1C3%aQi??72!dAiNM4jV$id0&
zTtI~tq}k5ECf?E`jrOS*)Fxcu6E+v5C>Of6V@4*+WKEgcXZ)F{3YC($8u>E}?4{zM
zQ#pBX#XSHg_xi#h)q<j`pedU)A;|eY2#BS)oaem28>MY2zLHypbU499Zae~0t^rZy
zCjCgktdo|VQ~c~Xei<@Sg=X|V-1jxkFs*7?6zEnC37xlW(V+BLz#{U%M0DAeOQ3D=
zUIpj;o<gX*h-gU@m2NhmU1c(Q=}(M9FmPT<S!@@5T~_iViFP1cuI#98Db~M2%kW1d
zG0ZZet6CpbJ9=T#c74`dJxNzL*sUgAd+;H$K?vRA@`v7q9v}Rt8yJ_Pv3XK}tIJeF
z7Bwj63@;6(AwRv#1|GtHGSctQ<lHJ$Y2-!DM1f0~5kMu!rf6w(?AkugmUGwUc4iy6
zqFHIscK$g#IJ-1&u4(S(N3$xegil1_+*}#gqw*k^pC(lsk4;&`JxC_Xd`VfX8fp{8
z_bx6C;<t#dq3~QKn`+Uj(BCO`E=g<5%VoVAp(*_K_ENPe_fp}#h82-_|A6lG;91hr
z#_g<@=ZCLT%3ehQQkwH0p`qd{!cVN8ZA_br?Bh4Xn#+PIi@%o~sCHos3(f&81B66C
z1fwqY<E7y1x$LrRM>9X;iQ%BV#2SdYE;c@AY>{wOn+BpWwHcpTjhJh$;j$2A188iS
zHFvdJc^sop+~pm5QLl_hTe#}1YE!x|vL}=3JX?Fplyi)cjF7fN3=_TR9*0E39w$X<
zR%<5bb<5DY19tO>_N7C&4PSR8M~S%|LpLxV{`01Ir;pRYBo0SOsUPcsOuuc{a|<)r
zNiwczNFe2oJ)GXF7M42)ZET`);^LrLnb6TBB;$BmR0U{UnnZMZV@6J?yQJyUvK6Y6
z2+DE2*LxsFvj&pfkLQViYfO1@TC#Z8a@`oCRjO>zoeaF;YJ)V&B2|&KiO!r?>k!QM
z!-Hnrj-TMfvQXdfo355PJg7y?$Ytr^Nx5B1KqehR=^kTMk;BZ#$mz)mB$@WCUu_45
zxb0_ls+G{6;H##nltf=sjjj(v*m?rYl*y(2GxCvB-C}nKPo%LYrUWrD(6Hu^jH(%R
zI8w<F?Sr9~j|RCXnrbb}k<(xZzN1Z`_J#*VG08r}uGz*GUqji8sf5{;ER2QfnS3o1
z)k>P?jH2w~Dkrab64K0P(3MDBl&vXWeq426!urp0>1)66=-(1f{`gU)dsbU>JFgWt
za#B}fqpBrgLLUvlhiH^`98rg~GeeVDSBj9)GL{!g-tvW1G1OHq1s^n8&0<=^m{3Zp
z=DydGT*e!z8J7%I2<>gm-MWI1?e$zaD-gk}u)NjQ5GscQYYC01jfA)|Dnt3@t^7`B
z83C^H_nW#xV9#hC0{4@PzH^+#bqQoMVe3`YWa@1iT9~uwyYosCRF!uCD$VY><u&Yr
z{Tc{Ka>*nnyN$Vdnj+Cd^F(`Ir5!hk)B*z}F&BO(p%~Fbk6?q!V>qGoqbt9k%GC&q
zUX8vMp}xv_FdWNPXy0@qzkS4_Vi-i|=oKqN^e=iro8b+{ECDkTpX7rG?AONI08NzO
zODnbrA^t;|^nxeO*Qklzswy4AW!uFlGM46KWiMZkcFA);O}s0<#;BmrA$=aFe&03V
zcskqB9#G#ODOAB7D!->76pUc*Qa-TmCeX|)X*ZF+lo5q7^fCvh1&-Nqsk{(zbBQc0
zLathQ^TBenln9IxIk|@9+%}QtwxzF_Q&4X1rb$$nj^kBXnx;1^itP=nXrgEocU97q
z?S((`LAB6OWs+;2Gh4VImR0zkRCdS}uW~pVU4yg)WlA8UEaejbRZ!5-3K(EH0NH0@
zwxqIY$epfuh}jvzV{tGmTfQ9RqR=ubelJ*WLS?qsCy6hn#Z354g@7Auimj4Y91jKN
zY9rmTeNG{|w4MYV;c}`BP{d<{S(NOFtVxukIj=MTW}>0e^AtV3a#0;$Q+#G$(niHY
zZRhEjI#6kt>SQn3FU|>b4=h?|qlDzDoYc{evO*BfT}iVr*IAUs<v4ddb_UdThpnqq
zmeo;NIt8kz@B28AQkPBevP~TUQ=0533@0KF$`z0Fx*JsRv+c)^UH4}vpF?5*$U`fG
z1Il`L=5Db1a*ej;gH+>rz-S@1WTfhidg7FQOGDyjo~pm1EVvIc^tmXOZ6xGQrDML#
zNExy*%$q@^&H!#;wVUybCi|3(_Bu*IjUk38xO+<sI5%c<F74H*Y%9K$H=zD5dRFNU
z=xmioQmng9c^T4#7{1so(5jqC!E@KKnr^~wh1O>oZK*P$QTYo>2w8$$gN;rTd*haJ
z5TuZYuD_^u?|4|&=a6RCU}*U3C%=tFOF_MWyx6UwNMGD)Y^pz7Bux>GPVqYQ0w;v{
zlAj?1;)xm`^_=Jo$#rtlBg4*w<_sC|roBhBdkEPlZ0)7)D6%I5Rt8unQlx8;BeEA)
z3-C8pA-l9BWOYOJD37D4xvpgLc*t-^K|aJ<&qkq$Gbd7*_@=%f1oJ8Y3A}X!z1J+w
z^<b@23$@N8O@?7QlA=waYLc}dnT^&CL&EKDBPxf|RIC?QrIN)~tm&HEJKWwK?ii?n
z{HVd`=sb7$5OW)&h?W&dj&A2-uuRNaNNtthp4%zso+_0jA_>*4@)Gb8j%f`a{}Uo;
zd7sLo!xiRTX;z&R=~_gMYl$><9V=wlIY;Rje-d5RFIX0#Ip|;j?zy3+pDF1G*)8Ih
zm;)nRfsv#{G1`{{T+EFW_vDg@X1ui$A<R-+hhWr2vBi~jK~gfx<tS??Z(bc+@en-N
zpJAEFNzPqrFC|2UM}whJ##JQMoDMVVIJgIKn6>*Zf_ss13x$@>*|+kez0JyT+sK4C
zq?*h}UbR5qvDnkPm7Vtf`5uX4R;=!>f<PX(p#6lqirTBNLuw+|lS)h)^|j>%C$t>M
zXaWr@nPRyVmgIaH|8o5Y%@n=eP>P!qp^tRdcfUn@bmhw&+TXw8e>}>M`jgn9FMR9e
z&#07$V(`buK_*x$l{SuYU+mm$B}PIW=^km!U8j5Y9brbH!_O?stfa7=cziNUTQNdV
zMV?1v5>bR+Ag-Z?;{@b3qEYe^v6#gcwVHN}Lzer#WNR2E<kqH-djxSB_oy}GcB&pS
znmohO*+Cjo$Vp}9Y2uu1yB@TW;x+@u=q+y<?Ie+BikB|*+WbVjtpXjFK%x8KRLaKl
z;4c_^)t#I6&Z<8ejP%Z-XOp*FV2C@C6XAJS&M2<wQ3e_jJarxWt}y$hE)?4qqTm&)
zVh`SBi*)4!<Ll7@(x{kRUvpC!x3E?5x|At$HF5$KvQE!cR@Mj1jJG7(24@!P9@~VF
z@c>mx^N=3b92nHnn=zX44?TG197CLO4A%yI2VMiLHA_;0Z(SOQ&Vo2=-{WQ=)?wxM
z+Ku;w>WaQ!aSf{Ul-*1WeqwpIsa6h2*!w&L*AeoXP1?^!pw=PTx<a*(Q<7%3$gA{J
z)DpM9ORm;KuRSmyP+(3aU7T`_x<(NSTj?G&rrg0&LUHY~5P}#>R844#E!0Nl;>6fW
zlLI1t9n+r=9xM~;!70vad5cz|6s64-3zIufcq#{{(*{2V71^z-9ONMz))+>xX)&(0
zOKx0ji%87I)q{2xFX!46Qez%aWrR?cK$Pdmj&NZIp{k(2!aN|fZemVOr<P!LhsKB{
z>+O~DRm(v?f$9YKOtNWZgO_!PfUHR90F)`<wn7uT{uO&~Um?&Md?ihmuKr#`5@_e?
z6FH)$I1^p)N+GP&u_zOqOG#5TJuwxxq>`<m%1U!Lg}ocXS~gyZaoMg#HHa~w5eqWp
zbqx6S2B{lbW_#>e!X&7L^z6G)o36wh%=|Kv=HjuXsv@B||H!MhdwF(^gVMyQY=x*U
z({?T$<5Y4dbeQF&b!%^P;5)VRe>N|0{Kb#%`t5)9FpMDp|KmmKxm9AhN-cZBG5R6R
zt7e0JQq@(2=AvMuY{^;sB3pcy5Sx%U)J3XV2+b#llwp);Jk5CFQMmM~%tMm%smlkq
zQv_tPRk1Z=9}BW5pILpE`7jWphBy<Cta5bjVjBwa5+lu(#J=#-n<_3sHkR|eQ>@-T
z=$uu7dV}gqNzMtUu3~W!(U#b+uzTrChf`njs`U#<&n6j*n#zsxlW7J`hD|Rlc7H)h
zE{)DaC^Lle@(8B?uyRMFxUSysleK9Irum)X$Hr3T(j!ebE@(dPb`Fasd{i0(B&DiC
zq;1jd9OD@+!NQOF-0@BUPjP><A}C@Lsw<eATH1x5>s&J3k@eZcY6UI&9)odhxMRq@
z6TGiutB<ktQI2X`!TfuIZwsv5_@pO;cOT;<_5d9NfK=5(k!5S9z_BGwUZinJ>oQFb
zwRg8seXtIy61t$0D<JHy8bx{so5L*8-`S)99}TjHO%@TPR(LdNg8MR#b%Z_S##$mM
zDIbz@OhRN6hp7S@G|@9e#-<`#t*cIAXBsIk1p;pqogRKmIa+m67ltRPOVw=>wxfIa
zU^S`n<>-`RQsqgTwdsSZXXggptz}VfR3}+wXm>O!+`{lp7zILAx}(J{gP2A9=6XU(
z4uk_)o@J?B0Q(i8*j`CRLTgK{6R<-b1?R;yyEsu5ztwYTH8)T>0UOhtQ#NQ5AhJW}
zX@RJ{TiT6oJpIS+0-!eYKFbkn2cd}4*7l4U7x`3j?nPLV4uzd;)I=<7v?RE~=B9UO
zMNMR#S(Z+aOQJrMeYOfzHUUS8wOgFEusXevy8i?XLb`Q%Z$;9b+Akrxnfz{pfsvuf
z%xa+x7&zflmk8T+Fk}u1cMg;ScJet58}t}>JAdZtibF9cHOv+q=YCh<PR60;ZpICK
ziG!#EsU@cW%~u4wKY8;AWk*WkY`x5n-kDU^hUk<82my0nc2e|H@O<9Db{~c4D%E_W
zTZ;9zwn{OKJ)e^J#Nez_7}SMdN!_HCcxvp;3i&4E9HmO6x<e$4Hl#jYsdvtOAiYmv
zHsTXeYLjkgeEH4ub(MlL(p$(1F|=0-<ujY?GgZJV;`UN>5NdK#>T}fc;r-7R70N3U
zPc+^Urf3_TlY(UAlH34zEh{u$H}z=)*D+9UJf>oJTu?B1BPIHliywSU1yGow%4F?l
zIOduFKRw(%CHqq~L2H$qkvXV}nTk*ChQRuq$u8wXr>S8YH>)ueoF9~YlK~jQ=V`G`
z3mRG#v6}L9v-5#*wZLa?Nm@ma-lAPc`h(ZV<zrcV#H2*wCf=&VD43xNmCcE4Qgqw`
z{&ngXRt7+t9UvHE9?+%vtN>^AKfarYMAx5y7s_$EMQy=G%iwzt)rE7`Ezb}2hq07g
zC>Gj><~Iu5I{<LEX;1_8tM_HsBq`fy!Hh7b_Hil3nP~%B_8=5Y%HcT9Ym~1HO2nw7
zsU>&hiUyooUfn3DI9uWUDA!%mZGa+Igj6bAvMDhcRs;;qzErY@xgj{OtRP<ba<098
zM5}WYn0m}#k_4u2qOCY9qGFSa_F9~51WgkPYpOQn;)qSomX?m?dY!<1jA&_wXBVn>
zxNn)gqz1{CXZALBoIi%INl{kHZ<afR#$Qu~)Syw;LpSlG{Y*wEvJS0HxMjEnPM*T4
zJ`L{CV9k=EkYut2Xim`c5+8nT>nlh`ZT6&U6AvVsCZ{ErBqzO>5pmbR_WR;JjY+8b
z0C<yw+7o>e6{4#?-4j)swSxt#{?2-xkazj3KfMi;wrWR{x~VbA<iJ4=n(hbUaL>+U
z?|VSYv~co#t#(wRH!&#z51v&b@1rU|a<n#s1ikyW{}l(lQ6-<QDcQ{Gyf2+K?uAd<
zW;!%4Wrw11K$6qUmy(dPrG8D&VR`ATHAU856Thoadg)CSEU|&rYqnR4N#vR){3VKK
zem4F=(h-`!u2@=0a!q>VRsrQiXAe^j%H~OhE5|OQR9IGB(AQ68H5oDQxS<)biNeX_
z2(M6B7G)H)Z)VUhV=OgJvMS9?y%Bm<xuBxvmJ2oQO8b1osx<9Rpb3EwJce~3uM`3L
zaO(2$>^tz^4AH&6rF+RC%YfZ|?6J$IR73wd@a3L!Xx7T+>+=UtL}Q!@gyBBT5!B)q
z7INfkIE#%(o~AxKZ!tQr9x;IjrJ5CvA`LO~->C&imd>Keh?m<9TCxadF0pnb;VLFL
zo0)Gk=~KTWXs(Uj3G7m+udv$z$SEXDS?#HqO6&pwLm7O~mrHYeZ8cZYq`v)Q%N4xL
zX&)%cZW?%x+K3<9;@X^*E@b^sbStXgN_KpG4hxZL(+xNGE2v;g6EWdOs7_EZ{q$26
zPGZBV?g*4NNV%Ti7caGMRuPgV)a&v)t95yhN*h&2`o~9<Yan6BX{oRol5)vX;n{?5
zCMm_2n#2MvZ|=`?gT$}VylfU}s}Z43YZI9wJ|R+5+p641>nd+0pwWs?DW?y)`k<#W
zDs*qp%Y2QAK=iJmmmboyVgzU4ssLWYi9Asi66jE$6qn0P+qe(8)QXy3qfjsl(xfMh
z9#gH7M6S;uYztBFWHcnQ?F3BXX>CSkD|(dmCD!<bUB61>@sXv2lA$iXY!pO~viqhC
zX=GXOvxb%`@=OC#Bdz!z%hL)ZBT9NbIsHKOaX_G)$K~w0v3A;yLwPi>5%V5sbHKG(
zuNk5<{wV|T!`6K0<{56GR&XC^9tZS%5|3J;zp=cmU0yh~+0zydpeKg3c^NY=Zff?5
z+m_x;vu(9`<~(=L>L<RQt*$0N_)ov^OaJaWN~{+<nRcUG7~jgwL<(Z9jMGU<=x%jL
z2|RRMQpQdyX4gcO4!0cnl=#g3Wr<jvQ)2X##*0JE;D>6mOrrVnEnm>dyVYz?sof(}
zLwlM1qtda7+l-~^Ss{C$&6&Z_^ASnef9Z8g8Wy>`Q*&)9=dR-VI^D|B+S@kP@=JTU
zJdBG>x4EtBB+i3RPV|k_SelKON=plKuOT?Gd!3Rt#RuTkbVlTyLLof1C)5sA?_Sam
zWDh*4@LrItSTbI&fT_{TcnWk0HQJNr(xPd0>MJ(E$NA(v2Y{RAyR`T;R?jw^Ed=fr
zLlFUYGmdw?<rAO5m!B<J%1S!ou5!XP(?<+HdT_90rJF^En`iq4z#XqtS3ULe)I*0a
z2{`gg-OuDq_lbjjoTS;CS<ViXaLPW-2cz=BR9hHm6nH4P`>GbSERYFd>lM2hR*}99
z1XdBJ&tYsaxOo9PT54xmTOH5=@ySYpj1Gq&x*2c>3YmDjL3B&tbCFGFDO3s>C(in5
zw$Q=!A=azdvtUYUFqvLA{M=|MtYVb*kE@(rQq{+ZD@VWcS-!JzmTrD(xDYy4?qtNw
zq<O36Jt90eBU^g7kSMS$knG<Mlw9SRM1--FB4rW)%7m#;v*{^!t*O;j4kVUKa=OKd
zjbEqp#Lznz2p~|W-SA=9NIQ-atsq&&Wno297x2Nmgk&C9#!j?jA9sWy-do9b?wAQg
zrn5`%ilWfkgbfT5YP;PY2>EHFtdC9dicm38y*r_9ilXMas`&}QuDbBFp@s<Ah7Pa~
zo#H4SgLgQ957i3VjZli~EeoXb0wFL0mo~*GO}RPqoo>S@z<P!HvgPdpyjI>(c`<CB
zUI}!@ZP}<5+g-IF>fVsvyfL^6nwQ>i+uD*hX{#}oObxhYWZlRiwcSD>AT3SBrmgxA
z-CN7T6VAw=-7?DA>5P{EZA8c}r#B~L2?TSvaK-B{y*YK`qc{EdNpkXxa?BQN+RIr^
zCp~Q<g!V$k`_s~jDp#tw1*+GC_8{aJvW+vUOn(;-^s6>u2O<^p+W5@blHpmOXihg7
zsPAY<`B5twV)TwB=3RZ-<isTg#ivjNvsbpE75mYxs6%C`P`rxcCq2T??-}|)n%lT$
z2VrA_O!-D=|C+rSc7JpBoAZw|Yh14wX_7aWUc82tm=#1C^&8AZXS1`<cUsO#lOZEL
zt`4&qpJEB>v*bqX8EP^(OIvpjowUTiNot$n$tDc_QyoC8Q}YSlDZWmwbKBnjpf>|!
z5)!BPWvwXOElh}de(MUOHFt1<5Xm>KQO+FGr#BJeM>!-9*e8jdg9;nciq@!St=85a
z^3Yz4MEka=?tCLBR<Jl#zZ5LbbhA##T-vIs-E~}5Ilx+OiE*d@MV>(=B<<JWyASN$
z<h85nkyjH$ql`pb>k(I-%mxyD51{?5@7~%vua%q0Z4$`b6qaby%~dW2?kH_YaT`+F
z!f|CFsEX#rcijkhjE6Kdt8BYok)I80R4`3;n?i7p+>N7`CPT3k3L!-zlrckA@F`co
z2<0>tWHq0Au4i{qIt||0Y$4*RR9HU(w>Sy}AzY#-%2Bbw)ug@*t=Y801olENy2Ugx
zl9R-JBvmE2Y={$j)vB3H++qZp)I&NIOf!O-WEh@AiNH{sgF`6iYlITnFvu?Xiz|6v
zF}lV=NpKQ~_W>6&V!^0|NCq1Un-J_45z9|-U1}S1VhM*q)<&NqTN&3$EvdFhWbFVa
z^JUSsLC0$(6)3l&1SR}LKAUSkOoQ~0=cWq#1n2i6m7kCPFv^I-C04TP!bOeGY*YfN
zna_z`SBePMB9VRXNgV0MG0mU)y(C0U)Fvh;0zFl=bOT%R`P#+Hz+lov^i*PV*hgw|
z=d!4u>yL5qf#dnVVROw*HcRdSzATMZPj9gXJ)SSeUwfU9<}ZHqX@dRs{T+8|4CW1`
zM9Lo0Q$KhXTTlkTAK|2K3-f0rM~}leSVLqjFH_Z=0v(R%;d=b6!g!_)iP)=R^yh>z
zjS}j}Z2CgmyyEC7j!}|zWULMbEV|=~kI=6qxrV!EHsNt{9PTfV9_O<%9wa_0U*EZ3
zgWu_bJ(Gf#@8?8L>>j2=-SIDOHAmp4U9LFMs5WV+lxD?BJT(SM_9yS?H5V0wl|Za~
z1qLtcGv27|{@EnOpQz6oP3AMzH^1_6tGQAQ{e<SGv)!a8-?wB|BwJ+)NVe|R948Xg
z(ZJ3yGzb-E#2}6)Mn|$n)t?D`$1o5`pMk*OkrpIGU#Uf5w&kcS;I4G9TN#dlEHCi1
zDySWlQ`Hym6yd`A=#@6@-m8^2DUc^kZemclG!&vs*C*tAr)bPYZX{*H)N)qZq;Gs2
zeMIr#hO&Rk3dwm8v@fu`Y%ZdEbVGP1IIJ78rk{mLW9m#0+FolL*qPGT)s?}!f4*P0
zENi<GW|xD|wYe`3qCKf4T2{1{*&K!+aqeJ+lCW2Jo_mUsNG50jtR&%qNhP!ar_!WW
z$+VrWGS1y_$tv<5O?ZmKlgkZPnUb0$(#!qSrfRU}TA+`Tbh{yZDkHIB@-<!_&FzxV
zVbzg-ge6_Y$?U6+m8}Q*!=4p>WeT}Va!KFMwWxA*22geB4-*lGLFD!L1bHCmFDpu4
z_7B1g`MYQ@tc5)<>tfgTG+~panh=V?@tjl*EH^C8e&OM^pgb-jcJj+Di=kqe^tj<Q
zVdND|F;Iz!xe=&MCn0Fc8>6%e1MBe*L^DJ4aWRjgr%1}066K?FCcRDS8bt#otwr0$
zLsEpItltMjJd4orA$BZS&TE2SDjKTZ%;kH_(OLl0IV)#WupWs5_sA*k9d`TEIr&ZH
z=&?p_R|RT}Gmd*ms&W4b_S+l*Sp;-I+~v64%Q;9ViWH;T{jE0fyWPcd-}oPV|MF|!
zd+Ra+_v&=^?NX&mK5En_h$FnNNi<fmC$nUw&f8K4<{tyYOjr!gkf2InVN+sWe*XyA
z^NEZpT~~VDxCQ_Xn?4VyCC2k+wt{6<8?~B8NeTSs!(n<Qn$&Q1{K|uGPCQf29Amm8
zhA*)(yi%V{4(@UuH}E(8F=+((0MYaKs=CVUFW$id+|G}^jbyGIWulP=0+i|L$|@!}
zwUAmaF}V^B7PkaB8Jx8!*4t9=6kYE+uNfpNHJa5dQ&D42YT6NIE&U=GzKq?l*FDzV
zyTLcb`!lZ{nabj-9y*o1%q?NwhJTLfacl!EjYbEx<Pi~YH_2wB29<o57ulTMcz}ZY
zz_{}&N1EQJ_aQL_T6`W5q^OycKCOp^$C_JYt%BdCDSB^N=X>g-L_6bNG-$}_iI-Vi
z{n#f@=*e(#6y`}K%su%Pjh?d6|8AK|R%av>Z3jXXlRtH60~GT<#7CmZkjSRtor<pJ
ze2(c0z1q9MYzzHKNbgz|Y<T534kCS!JB??!gmZ2Ss9Oz!f9edkVG=#0#cTBj$05`+
zX)Zc=Nrs*TuT9}eIaJW8wb|gS#<`9(y;7=iBiVYAR*fDZaA))&Hsysh<S7=CT7Ae|
zY&lb-|IO!fhU;B4Vr4;LsF6%kd8%c327&CRCrhav-n$X%N=;A)c7q{B`Al?2SH(*#
z1m(K8(Tw!1N+A|?>B~9je6WxHh?|XV$7|(6=1P8luOqdHy~^ESlF){E<WZNMyjAhO
z(F?;fOp)Zyr*<9m_AOJqP#vcg(qA$c0M?SeV-HMmPMoR9T_hAR1ubgYQ#f{jR-+xw
zc}l8T6F;+5;hquD=xK1yD*O-bM~O*?B+Q4zhNj*OUs_)1MR<=sm-ER!0B2P)eJYm<
z^EF9^@*Qmz_EE-b4r*^n_ZGUiIqat>-}AwT@+z)pTeftIk#*iphucqZu<t)!n=i+-
zv&t@6v-cus^=KliPf(M$7vjZly0Vq@)-3`QzjR19k0~7{Zbw#QDwMObny1$v8Dzq^
z+;2a7|M&i9iN8$pYZT`*kw^!#zgJh!>oXn~nb^r(?#e*5Ym$%#CF}?{0&EgUrH!}C
zU+kE*iqwrVOPTH?E*BLP+ruHP@~XuA$}UYk9|g|(7333Q*|fx(3mN<sN(`<~@ec{B
z4x5e%{{R#UyPLkC8vMB&b)~e9ltfHObFK{YBqK{~4Qr$+gX<3~VI|*`N-mzqM!Eg)
zR-3)<OV^tv>ti^JyFa1~SV(<Q^>5V;p2gD0c*<MDWK4_xz__D-$TK#%_EdZNc;?S{
zdHGeBY61Llnhoq$>DB}FSuH`+Kf?R+`AB%O+v#qo*qlP7Bd;1x!DN$YYa_#V?BxBi
zr5WZy^5L8n3P-<wHPbGK_fTldhAepH#0e4eD>5v({FHDqKQoejuUK1H2aYk$Qg<cS
zm6dK)dnzbk-eD_5)z)n}=2Rkrmx<uK=ESqkzsG#-R_040G%vPQwBe_-W(0u4bhCuN
zLyNfUz(57dke%<(wVkz_f-M+<7RJU!^Q|ipa>-A%g{FO+sTJpHb46Z71^{+9QZg?P
zXyPRLWTTk!qjSbCue?8_=l58JR2M&DesuG}WzP=j@of;~!>i_*Y7VBvwr+$Ub)l-x
ze6T;ynXJL^H0?4|Eqz^LmB1aM+oU5%N(nglEJbW&)Sq2&s~-@@rF`LGCV^sZJ7eYm
zPQs`uOqmBn?~>b^9V9tAK*e@Yw#4*LTSi}UlA&13W-CCUc3T7mY4Va0T@FG^NHJT9
z3(7juGgLwW^g1T`aDSfx6tw*c>!g(<^I<|&`irK8Fii_Wt^l8yjcbpk<Aim^CXNgw
z*^H;WD!LyS>=eNRNehe(<5Akj*7LEIC%`xlFA_4-8u}DGg)3jS5$y}Lx#**4)Rg2i
zyNoMfDEn03v3$YchyRdwk?S=H-i7)3nPcH&sZ=lvj?Z)W&iJm&ux+f1`X39~e~bFz
zyykFnp{w1DzdXz_+)5jUQtv|;htKIM@oYC05@+1CK73tQ8Fc)?_kZx?e+`e`AOml%
z<dvi<m?EABv}x=SS*XS)4e+TSEaQ}76{yZ?n+5TXB8J^Fe_Xpwsr*M+1<Iq_@c8Tt
zT^e~R<%$V_1-l5U!Ltpe*T^OnM44AmHOWW_-u7jt&7<BF?R#Xg@-}{^MnV+^*OgR(
ztT49;K|G$sk}TAVHV`Q&U7y`_7ix37+HsK4@HU<lOlv&8#(2(atSS5-d%p&NQi&>*
zQ%&UwFsn-F8QSt&knxfaf->~VB|y%T8oNl<zlNJGeHs7vb-GCYZP+$`YH@7Lo-cPt
z?>A-79((Ma!zvH>Q?p#-A-?tJ^bp>zC9*;-Q}7T2ZGoCz9qZ(`HSOo+nwBDx@d;K0
zp;pPbNa;!1Hc>h*-a)jerga@zWzSkFzX?XygeDywt+)hU`s8-P65FB@A7ZxSY52%b
zN3uF$Zi2pj)d|ct*L$;itJJ;~P-*bh^u~0Sp<=eD3EK0l+DR@oG1f~0^s0MpzEZut
z_A6el5IWOzP|_NBmeg?2M(VQt<&?!fMf+q_15(;PWpz^}bfjKpQfKtUj;>`PBs_h{
z%HXgPEYUAR!I_*B;JEsuBoqdvh{q+=LwJZ6!1Ye8YbYJnvQ=fHv<(|e4~mtNGIHt<
zip|D?S~b7N_gt<>v=*_|`lHf&pIiwbYkVpVqQ}kAu%Su}+0=|g$jlT9+uE#XtSkXK
zE2vI@I|WM0m?>OBKxsvZ-CU}ug`kJ!eyBCwfexDzu(TSt0n1nc6fEDqDmMYGrlmDM
zyNTH-QLoh+RscF3Sqz#_#KG)1rTD=Z7ML3ZC?IWYk>(@L#;aAkY{5ZyZ?bnd_j9_3
zOk>@Wc_Im^cUCsa?+(VGmj+H*f?pt29?OcRbO+I%sin-PnlV2~Fsk3~l}8=3mfVQ2
zaRm8aRbfQS@tV=sYipw_0BL+LPuM9aYdBS5`?@XIp5@=Bn~^6l(sx}aMfWJxZ+-8r
z?}TAYNrH5VHkX=RIZq$ivn~6cSLOQb=Eos%ZAnua>v5FmG*D%!Dr`?@Yx)i9=Pm7S
zIV9B;BuF8J2}r1?N>RG{hAh*;DxrRn*_ghqwEi{QaYB)T=30ihzghakCfX)#xTlXj
zjUGdU13HYIV74eS`=m?@N#1A0b}hfKZSMfwlg3<<l-YGE3oe&*lep(Vc#v?UF-_Up
z{LUIUJIpjG*u@=(rm46h@8z@P&stTL*$xaI(>9RJ8ZY}cjzh8g3#exXQK=5%!0Z-t
z9R8en0NT}o-tRL3jOMm4Fo{vm&5p4+)~G-G63T^HnJum49&58w$>*|r_1bS|Zi|ZE
z8I<Zm&XVgpB!3Z@=)oyr4>#1mb}rehr6!D(*#D&t57DFYRpTA<F(n6rE;TDjtyq*u
zU%h^HvdL==0{EE<skmDL5qzV2K@+dk$aWidwUOA031zD;P<9_=M(H#l7~Lf_L5Ufu
zR^_05%3A*z6fvOrthmbD;eD?qAfmwnhSCEX#H&Z~G9L}ArZ7W6l`I~jF@8HBDU@=J
z@dx{TQpiQNf}v$nSZGPmR?eSJNQ$})Ru$@?Y==m;s!_JWDyu3gZPuyE6aci!rSl;)
zP9jiMBs(b*DtA^CU-U=MSdu-=Lb_3CfWB98c@cnF5dH;QT{m-yc7pApNtIj*d|ifI
zT{BI=T7zov;f8dE-*a%B#vv?K4_0!jKP6yJp8%7MQmD;*Cs5WXyqeB?Q=XzvbFX2}
zBbUXBv=!qUldZ(Fm2<K1;ms1R^lX4#yO@COl8<IBkotF(DsJ1*PPb3x6F_MrZc19z
z0(?9OuLTu|t9x0Mji4WSbeAkxcU9d)UASn^>KI)&qKSpfV$dogq~q7z447!sFe6Y+
zc>11(shADVf@h<MJF(6#*emTG!Cqc*{E?S992_s}xD86Us5$yZV?T^@=l$*HuK3>D
z0_7WBw|Yq_2^{5zENIVh<}nyRLKdk>kln|qC_M@(O8`IakvYqj$9Z%cresZ(^a`e>
zQO}HD(6mZ64`^GI{8AYI3|X=;v7RO~4I9?8K;)}ttyGJWQJJD<4$$}q-<L{`XD{=J
z5JGNCpve%(HWd7uIXic2Qsc6C4m@XxZG>|=l;@u#DTYunAo3l{pQXg?n=%V_o4rcG
zf(?QqGleo{Hfc@dtbX&0Te2%uWyxz$0oG)tWA4^fc3Q&Mbn_j~@GzmXD_KeqG}|-t
zNe!Tq(Y~*QDfm={2ORGI@AU+u?v#Vg#-?^m7b+@8Vx+%HL5X_rL%r(RyTK*!!X<w2
zW<bq&eha#dO#=0_-Y-l_24bWlfX(A<4$}(u>^hVQdR!w`92>>_Lt$)|)TJrv;3qV(
zyxt)&1-eNs*hcfBq`wvT_hl_Z<>qev`M2nNQO{&HvbqRvRx98j%LH(f!5>Z9L~f^!
zgzEfF!gDJL+Mc@Gl*%liG=)JG=4vJZ4vb`SVgVQ&aS2Da^8_Rxaj!g8-h6<}cGs}-
z0a6-uDqND^UF{(UW@)Z}@p&SANuS{1#_=yL`qvzz2+C0c`_o-A55!2e%S_QS2BHb6
zgyb+LAmLIsE_VQ`i=zcxu0(Ur6$SxJHRZ5a0F}hsxYZ*d<|d^R(ps+|;b(eSAZB|;
zCU&X`*d?o;&Cy>Wvp{Q|Rr+Ek>qS5(B1*0vu(mqcu=wZSuhOUu*YEF#ozoI$oFG=h
z+KOtn9Mz*Czl7zXe%yat@I?7Xde2MBS`nI-4x<+?iVdJ@MAn1YOjfKi0<zRD3n4o_
z99N6Hn`o9u`8cSkPyh|f`a&aZ2+QvogFkwO`V%t_4+B+rM|#Q@zJWQJ^#z}iPF@NP
zoXOt~A35mG?6>683bhe8A$tI*9Zzy2xes!Ou?C)LVJ|@L4QZxL;b2=%%bNPZ4?0Hg
z+4ke=@BZ1ns&rDhKFYR>4p%6&8vPB1^xs=zu;)gGlP<K?EwiP<`^IvK;@6C(Gj-5j
zzWq%N|A(fR7{v*is{>z^gzVx3LBMf;w46SZqHKD2q0LI7WO!m6kck?kT^xtqU!$^V
z^=y90x^nLQ?aYPRA7((=dihlL8;Q<i%&?4+YL=#Lj*+Tg5OV9Y3`F1*>Xqjia#Jtt
zlBOIUItQr%BP*G6yO8?p)$*KWuQU$#5~|ZY2<A8W?(m`1JE9_)trzyr8iC1kX_9}>
zb7@X$n@OLVtS=qrj$ljf>eZ6!15SmUR_<0Rt4&jA0P3Gj9%pnd0B7jf&=$>ExbOh?
zekK;}k8A?s<}i`74Z>dwqs0`V>H^Ai+m@}s*OqgWbt5;P2#74>_5M6hIkY8%*RoNb
z0YgpJ=GSDerQUCPFIWQ>73izB3b4u`@W3B|8@AvnHp~ex9*~B%##l$8{d?bf?rJS{
z<_+3y0NqM?S%2-TDzwEm$gaC-=mAn4LCbch)(ub9Jwrm>>nVJOd^UVq@pp>}!zrsw
zCCCr8s;S0<)Y4lqmCtSx*W~v}w^6+oi>O;f(U2-jiRGH&Rj%mH1#D7Nop);kQ~|J`
zKoZUsU8_FDyim&;vC6R2WrM6<_Jioj8L-i1f1XFXCK6PiCe@_n+swe=BA)#iX*hPE
zUnK#P+!8vg@WOIh$v(u<<P3Nml2I^Gt?`%=gq-zQMgL5dnj=A`9dN;0V%wmQivh5f
zlQD^_C5!^{`bLBLuPBXgbW>xN>L*8L8j)#2b(82HF86AQJf=c`p!*5zF_h}{W&01V
zpI6k=^iJ)vxe3DeL{pwB`)-MU8?lw>;Zg5i`9%6hb}&6QV)M?kLWq5;0mkSn*?OOv
zS%an`7Xi;<5@?!|gyCfJb$A5mW09zpx)ngflSM|Xp|X<vF06rWCINJx+4uAdO_^&W
zs5IqEnKQx-4i28FT35aF<yfA;<5L{o<qvNZgA;aJz>UC!@Zng2<*8!qBA5CVC;#R@
zVj1-R!GGQI<A2TYs$dqBm2Sc?rFwrzqg9`I7wRhVenU=cS~O<L{i@-X$eibh=vnb^
z5Lq8|gW!2fDA^N`dNlMN!N<H-c?iw;1fNz)16(T|Oht05rSh4mpA0^a>V%S1ylRZU
zhV^GM{q@1OOF0c7U8V=A>Z%9rGxsx0A8E}sH9_S8Mg7%F4``ZuwgGCnSBzduip%se
ziLpIYP%S;KX{M*ZB$NADVT0z5Cb)v=K8%6jUc<7i^Mj9BHtgIum}F)ZL$(b~IQ0yZ
z3!vF^JS4@dv>1?O4#)5{15+9rHr)BJ&CT+d#&A)I@Hz|Q795&4t$g$kcYIgAFhd#2
zn%>|KkBK*NZmE~377f!f^-joR4ctNjdTl<L2`3t})dL$AH}^9P)S7M?Eb%b-4)bWa
zvjU@LA(cw~!;Dos5~>&N2<w``K=}e%7a2G-JoxK3+p2ng@_Jtsc;5ADN|}02o1bzT
zfb4rL*Bup~|H|dDMfW$MR4FREk&_zBppBb{jMp%5Hp>H~Lv`3%;~MKvr@}JquDb+b
z;sN&5A^Z}<g*%_SlM~&?h#gyNSGYN_EQ2+@*rT9zl$X$o>lr6N_%jFg>j!l~Ax9aT
z0<4&5Z=5+UdG=i*UH>~g-JZCFs7N4`A$C_04ot(GGu^9CM=b1r5?z{LIm5crWnA+7
zZHE4mtkTr<p=-%ZQYZnYO{ofq{W-CjKa#5vpfMmxdeP-Vp<(2mu%atTY#fMo^$Qit
zRmt7kACGP-S>KB~J@^^HrDbi7A`=V-0=u-OljdNEZuW?HO|Q&Md0MorxSSV7^FS~|
zDL+zK#_Y%R#aK}a5CvP7w;2WOMnT^Yduor_o0wM0fBM?zYL#T0h-u{G29Xo4Y)f0x
z7X#<u6DpP;hns{Xtrdu+f=UhfBr{=|=SsRbs@7^~VaZx1aEW-kRtcc{5<{mSO-;Vc
ze$iK}98k*3)a~d$Ys8}Jtq5UkVk#ba$B{_oW~9mjOU*H>499i@d!Rr-;O}WYUumqD
zvuv=>TnTv$F@n^#fAd+G(=qaEmplLQA8aIRG=)AUtT_P;GgY<LCP-Xey`<#*>e)V-
ztdLZE6P6K~N{`J<$<_T#P^&f-OOzh7%2g(G7J6+~02OPQT}$-MBj~>^i&K+Nw-Miu
z7D@@F%o<Xjx&ttDz}S6GZ^*A{SOjHLo*1(#Ee3GOiuFlc82rV83~znimcTmoX<1FX
z56RM?!xw^hmC1_U{4FypZaj8bnYX!Io0ral^-7Ir=Gk+kHa*Plap7)Z*%eKNpk<g9
zCiNqVbJ-$}E{|v~BaIo50p;~f0F9G%N0-^Fx9ZC__bMcH_nt<iy#fq)R5E2prdd_N
z8fI(`RzY)!|B}sMqGXsA4?JWkD1O8MpuCD_`D5m3G$wY&s!5}1oqL}W*El)c&6QnC
zcppjV@K(BYO{j7fxhYIFZux^ZueT3=inUFVi@+Yd+il(MR48+O!bfRku_~U3n$%3x
zG8OuBJQGS23iv1l_gift-3LNTsB4_v=Ga#^qHQ6YqQIvQP#so%9I>F-RY`8Dv<SGH
zUO*fdpeL?@Tg16Gc8ZEEd{upH^Q3G?3wb7tF$u-;9JT_r2mSxqJOkB}toAU|6js!n
z5G=A<HEbc{`LroGts2;#xN(u?mTd-?7U;C?I7u8}94fv-9YY$~2)a203?V~}si48c
zHl~82@{}oKwq|*(+UyYbkA}@vn%D`s27Dc%{CVq(sHKD#cLNHV>PY31+(|3yk`P|U
zT`X5oZ@8RD!R&H^8KcOvX~*hO5fnqVNaV?6xV^Y%X^fkN;Z?ehvnDtYpwa3^EweVo
zP6oDmnG~{B@qZA>F9On%wLyID)Yd!6Z++}Ttj?SIHkF<0iJ2G`&YCQ?ZjfqJu|w;5
zQI2_2l-}cqbXcRmH~r^zy|q$b<FY`Fq7C`DdwmtghDqsq2W+IosLfy1{Ge&Qo@Zxt
zL$ERfvrJ51U->dek*;#14}v&dZ(&P1^yJZgzFxie=du;Mjbz?>-@_$T*kAnUf#3d!
z)Zg&qdTg??_@A+nR5%CB8+iKWP<L?635Ftokk+qi3?JjQI18s>X6il)qL3U{!rl68
z|Fb+5MfF}BOU&GRn6ebgVFcJr(oBTKUHa<%9V1M}XOfyH06g1@VWGKMm`g=P2oTN6
zV@KyAAzY*V-NV<Buv*+`Q>sekE^G9HW!h|tE+&-WS$>l~tqN>Z8G-!QlZ#l%Ut~Bf
zk2C!Wpf==s4OZu|(;6qBDFxm+q%K@k4sA~6ZsYPnlfYjY98;yP_v^3<yKp*|zKEPv
zSuQRth67?305hK~kl%kKu^&0B7T&?l&@^3)(8Y#cZ}6%bVVI@a9HVOYa<<LKi$@j}
z(ud&*JC>)*YmdguG9`+f1%=Y8=*pVM&^@q$N7mmI3b9N@x|b`Fxqen>6O7$=Nv7He
zt>@obik60OsK(}7PmRI0mEZ|$TVboA2J3S;3G2|QQLoL3xtp^XfO4^0W`QI!<Rsei
zvIod1V`M$cxob$3JL$z?kQy1lYj-1{@AVj-{(Fk24wA~#9jm>q?9;nU?`sZ}&D=;@
zOf?5a!0`mpu#J5!p+2piOZ8Xa5#xcB7?D1YmC^^~5Hysl&!nv?7x-8Sr~hr}urUmU
zjPbCFNF`s@ti@FY0u0Ovgt;oas`4!9Wwp##42r08&A5@ftm&^ZJVBbsySl*9(U>li
zo?Z0GdKH<uYuqI%hoA+l{TRMRDKiOXhZ1x<&7Wl=A@fNkCRr4ziJ5E4R*pfxfIBVy
zSw7zYR>F8@({PTsnZKdD!D;OZm$19)(_#;fV=<c*s~M}A!oZ*iGk-6}o(_OL#Hd#V
zSjiamVaQIiR8P?KG`~@+KnksVH$_T5MlA0blW!VQWD~>XHpHM!r$tp3e6t0cg$5Mu
zcw+(Kbm>uocKXm}o3Ls4Ih2a$Yk#AghmAUG0esvd)|H>J7skpnQpJ%`P;TqK0sG}`
zn$oa|hpcsHXad;{cRg5$RnYt=yiL=>bTt(0vZXQZAI%c4OnS#%W(jwvUK-8k-8BBh
zYuUTz%0G#X{PMRhTq6ECc<tk(5^dWb&1xXm)7i=Si7T-W+IYMk{;rdB_GSlaQi)u9
zc7S63cF264&zN;Nqt8Png9ZDr?FPUXN=nVVWn05igySe@en(^~Rad*eCPUY!wMGwW
zM*d9iF}cG`YY?7ob#{=kRM+Ln@7wSNGG3bgMI*(awcR96Wq~%81<Xcsc`gUgDSvnj
z2r^cG*XjKo<JF^cn$e}S>8T~<9qtf53#uo>npNT}i`9V*%PpX|x)UfT7=h~#P7#}J
zI+@gED#lRQOH{8>?B(7ugU!^=2ZG`~D^nQvSbCmWU%sq=ShT3RgrJc%_RL%g6TH*P
zaS1t=fA=X=#3pL?E&DYP4Y=Kc8)37pj)(kycj}M79m!py&H;H0K4)skS4sX#1DnZe
z@>0W6VZ6fle@47MPc}<KR}Jy+rE<4E!;O9ZEg-17gwj<JU<Y<gJI$qMwJRZWCKCXp
z2Ip4~X$6-Z@*27`wXd2{{8NK+*X|^1m9$&N3gf}Kh2}$rucK2`#$ZlJ_K_{HVWNPJ
zWe}^>Zr<dl<1o>++&~iWxgH6<UBAL1$0>xgDXQR$MnzdEL3uNCwlF75f-Et^7+|IQ
zwJfXf9dv+YdqQfTK2WH?UFK+_lY6Ecu9K=<IOW#tY>9^4D+a(;TN?@(%6syLRjxDf
z(guamLYK+SVt<}1NkzMYK40qLrmECp(Mjd#3KF<;0wtHL1U4NjCaHkZTL<(IpRIP_
zFv}kv&9s9L8~k;}arp_riDl(;=$@o}6%!ap1&*;kgIR48;@oim$JDNhsa#*8=iPcW
z8I6bfDXTOyQ7pw+NnUZBAp_vwiU~$@0=wurffN=3A?vWV6cLQ3qtA0a7NDDBfL6o<
zurh@Kf_Br2<6IP`Az!4_izDKCRQD0scdzVW!Bhz@+dlM{0w(;|HY&g0LQf>hV=_zv
zJT-0hH_M|psB|o3#%LKuZ2pI>Sg`MC!I&;vq_927ZsSKcGkJx?&Ll@N=-X6f%V=H=
zfZX&OO|{E0yz8-x^=##?GavcIg=bcN?Q-THe{kT@tk`uLIrBV|#CZK`j!6o5=2UkN
zUc5e;)$m*B_)*R$6s~Gel}1~yQ&;j!qOi?s_~zo(TJLsh%SKE?tCn`ih7SZ4tvL>v
zfB?gypAiY>Ysk)(w``9uKrZ*}tQO^)cHGJEEKyMY2eEu@_U89z`X#{!mFLQAdJ2!V
zT@SxvBRq-f)HB!(C%;{)QYN4!<U!b21txXT<NFY}hJ299jzHgwX+7};g-oNT7ViM&
zQ2fy81Na5Ql#nsVtJO1X3yXKiq~IWZX|FlTE_Gcx>zUbBw7YVc#g@1SENt6r8(z{t
zGLe0+WdRYw7gOJ*kZowj(su5OtVv+i9vCgnNm#Cg3AF{h@Tlf3Ck9InU`@P*&SeUK
zrt2vRvu1vpYjhjD#$0t2n#N6-q?F5GUu*i+yVj{+s|Z+v@q(KVZg?UZY75ut!P@+S
z4$tGFGQE(k5Iy<jt9&T+Jv1C#;dPYeLca^`?xu*U4}3OpS-xRPm<;!mHk=JNAl9~M
z)<{$o2GccW?NzQOH=~&rmwSS4a+iLG+S&w>exorNCN5BsmtM=h)eMEG;LS>mr6w!I
z<Y^5Tvn4O_S5*#L7mdM(2-GQ+a!I^CneIu%tr`rQ*D$Slvc|)#ggv&=1hkZ=P?G@G
zAB3;fa+#3EYpcg~1K?wG7U1Wot4$mdjdRdqTsdV^x6329ejcwwgWH60fV&+ka3`>;
zGV^Ow(`HA^&|M%*?@W6SX!Xg-3CbOmS(;(oY-BS?1S?CY+?JIlutfwLoFUgYKr7Y(
zvtD^t6;Oj<xVqfCj_Y2th0zpNv5S-?z*fHAs=a(BZ79d2h?1OAnn|+_ByyR85StV{
zTGc==PX%=TRST+VZ9sVlO37I3HQ|dFt0(k0E5qkon$W-&X{zU5IxCXPf-sy5@RovW
z4&}A%o6la*X3h6%Xe~F&SG$8YwtWnnwn?+NC2&k4)8U&B734vfLZ)$V_>A1>`;TkO
z>=ux|UAF}<u857~cCg<*^vtc?8%iHi&+4@=pJ@u;csY}K=tF=xHu88rGbPS{;<ec7
zyVwq<hW`rxpnS_)(xwu{ne-d+YagdnK~ogG$)K+f^8G{~uQ7Vjrx?LJ5g<;)wC(<6
z;uo^DM^q3&JVP}tUp>f>Tjn~n8M2@!@%$|pK0{CrW#8c+%>YBb4o~<7;nH(-k&Q5}
z>RA~YvVAqD^<ss@-)W?3R3mXgF2|CJ%t~a{(4=2t#_h*#Y{TsJ6Wjm_DBVl7nF4dX
zvfI%k3A<6hz>=9?RM)0DFW#LqOM(HsRzQ1+sb&z-sArohR)(+UO4x;at4av^&IK;i
zCr{f5-s9xzus!7dzIIks9D5m3EVF@Tk<t5A%&=IiFtI}0m(j+Q5c`8%8#W^YD_K)r
z%D<@%7H%}Bq!}c4=G6iU<cGcXma`8`38r3Kptl>xeSVdp!pr2EqMEDshWM~G7yx61
zQc3o$AdPZ8dA0uuX}7i6XFhl{^o;a#C3w2)yo=^@ug$T2<II<zGZR6yL|*#@u+P7>
ziBpF`8BXM^5qsq0o;$Q%F|to}gJBz)?3QpCNFgA1M-N``Cv(RPw%jL#dQ>@ApXRKk
z{$a^fc+-mL%@O;1Z342F%iAV8%<svQCQHk02=)OfvlYZM(;b?4R)UPjurl0s27ZCt
zgXJ{MR4u6$mt<|kxmHDJISs-$;EpRdR+e1>t}8Z@jlaMG+~-ooJLN{O1W!$1QZG)R
zIk8sH)w0QNkjdL6UT64JVp*_O^E<^dElJDrv5~2EYjEj`U0j>+rL}iWhF5L5cCG9!
zV8L{Uf-&J4F<&kILp`g!Pe!)`LU8vmT*;=?0RYH8O(LIf9~TDOC8B@N=*L}PKn#|k
z422LU*hlNml-r)gRm<sf!<e6VK=P8`rh0;V@66Z!-u5Z*osk(2`9oi92_?}4N7dZ+
zRqu^y2dA(pu8`EGW+Ec?dCfD(aw0Kuw(M)USFrS`n*~&K`G%VXx|AGPH;}>+_p2MU
zGbWWyiF-<oESlXBUJS;DeibVPe(@z_ugnQEJQyQ^kNY*tp>cV}*e-PrJ2+TtUhmlB
z)>HWphgR>3GJHcHExi?gXcbA!=<R4}Uc7W$s&b_DZ!`?;rXSaS_s?qYYH--cc#I5@
zcjsR!-Nx*)q`j&GD8`k+k6ou{vp)Yp8!nLrzsz#DaN^i0_=i5O>LD`(_OOrwT|Q!#
z1y!E$WSDHFxb?fZy_z<Qb?U<dswT5kS*_ABdnHR-%|bEBNDa9dMrQYraTK<Gw~zDg
z+<9O)N$xFrQlV>GA=c(+uyh$uf3;^>8_5|kp~-7BvJAPsJg6H14{gnq&b&DlDtha)
z$lMm@_kP&4u*Ph3jLr{Bvuj2MN*VeCx0_Z3g~9NaC&g+e+?(()F46hv{T+J9m(8Y#
z2{SDw+vE&JabQcwKTb+c#TCt2!3A*DMuZyz|H^A-+69UK%ap;9i7&p+>4HjDIROB&
zxxoW)?O9#Ym4y70Vybd#VW=<=#5~~GxzTaP6z4d?7|4of5d}kn&EDd$`jZdJZ?L?K
z0~fp!xYQmzVJI|10_a=HFi6+;=+}>Z5-VlhFp7d6Ufs;znR>=exa(E2xX5*ry44j|
z&u{o1E%}VM^o5N@YqqVI_qT<FCEu@E#M3_1j@{G!zy{b+t)=JT<-w<kQPqN#MNt{E
zJ@KXn_OWO_*mt#@H!-V4%pAtZNRA$IPoYY@E#^M_eXI3Nj?OKcB~g-1hd^~8t6lP0
zW=PkCRsiZC44VhI@I0OAL{qQAL@8-_ZZ*g2a(mHYAf4i19`6mUBPMHwm0T<Lf>fBv
zRwf4n9jt^6==l?8XJlXS2W$Agg@t-OJ4J4?e<&fxq949leZ%kZ%Z3acw*-shleuGt
zGkVF)43dJ7i+h72_r@569G5n~K?`HHT%m7sLN+dNugqq9;!I#2$vv;3KuY#>ai$`7
zg;4q{y=iuELkugXL7lY)BUN3oYJ(U|GHb3KYuFTbTes_Cxe20lcq_5m6O*SLOk|WU
z^40jb4^T?{ce|Ev)6GPNNhER^*cZ*$#m#7eF&fP^Ybt`^-bxB_)ZA*5<guE@rdiG|
zU5%I1Dmn{ExJ2r%Iqq`ec5&oTyd13H6S>{v+3&QNBp%B3YJpg~Uax)ae1pZf#_l?k
z{Ls+j`I8sE`;rRIe)UJ?-~PxkAr&l20DsKte#f`ne;0YS4>G9j=6OA=i#cxI_XcEX
z*LXDK^+87OHi}z+lwgKih6<Zm&<guBG6NBevi34xz|0vtaFMi`oC#^>a{Gs~UoQag
zXOAR$2B~4|U}BG3i|?v-_SWT0A~kj55?(?n`88MtH+P+mKi+<ze#jkWFFT_wLpOvA
zZ?C?I9_88Kl?LL}N+j&DhnHNqD+?!o<=plsWi*Sx%cbzHJlkuVq2TQ>70Edql}kp>
z2;sSX+)M<_j^kOc2Ie6RcQmZbVp!t&t|#Fvh-R7{=3kVDym0O*W$pOfvvnbRhc5qu
z`XTS)y^{HY+samKF+aN{@<A?YZgQLrVRUkik~PF7u;lbqVDCvh@l05Df?_&*ahWD;
z{P+c{Yt!=PN61Mw!eiB%G>%%57)_0QoN2se8Q7!22Ji@i42Sy9Yd8dXJDJQX%b-?Q
z776E(FZ71h_fAGW^#^Z`kNB`-p9mtr+p6AVtNhfRf&8KQD9dK9%&bKEx}~0tHo|`2
zv}K%5ee9E*|C)}$d>GN6(Z!J&)2{AYBj&bLbeur#=|M`*(3yHn;v`;0l(&mhG!YX{
zo&pHwALyk_fn~01rQ;-GIeI+_TLJ>(QfQb2j<LHG98YVIIt$DV<nOW%-jz*IrBLH?
zuG0*Ne$YYvaV|bN2M<+qA(*p-pe)i$?Mmp<&`yVRLk9N{eJ%f=biIFY)c2j{sUNg#
zHwd%1Q9yf65Jp@#Mn13_kI&>12_d3x2_iLwl~vRY!nU^CvFGgg%%$cgGm=2UG>Ric
zTQ(xewnYn@37eDcc9q$G24u^QJ<*=jC>i2QO<|{o*)VKvT$5~NQZsw^dfuN;x5&=i
zA0d*u``cg1())S8pXYf$9~=6q`Sb7*uJ`52GMYJl!(KwkR8>wl$N6nYsHP>=`toPQ
z9gDCSH0uQa#hgo`l?PywdEO7IR2gSzHB}R<C_ZVUcVR(rre!HTE#<nho_kmXMZl`>
z3Sk0LALo_%0x3opia8@%*UkLA=~{licN}tMl7IyY9fmQ-LU2kAOAe~d!~BdZjeS+w
zr}P=&VSTU#l4<KqyAi60MGKmiJ$R`&3SGbGoG{ke3yGphsLrly&G*NF3hHgPbE`ik
z!aD6dd(3?A;F8tbpw(GfA?SLY@d84IYZQw&90L?Kl)7Um0)uSh42KSvD2g!<D`jAn
z>3by*%J|-$V`e+b7Gkl9Lk)b5&LLcuI~UE|V!yB6zKOE%+@@6I#hHazYfTw+#i2j>
z-=vED6@~fBD?@!}<6+`p@ch!k&P5YsH|~RTuvLqr^wG9XJfxilrF*9?O*ukVX<^v{
zt**LcljX!gdw-efT;e<ALAch_30pz`OILa%btiLl-Z<gKk9gUDm1wq=W0dB71Ltpy
zzvNivT>H+#QGKz%$&G|SaL2VhJ52<nP4_j|nT!>L8`c^JKoC3eov9G{;(mP??qM&V
zF2WW|q|=he6`6mzDD1Ed6v%-pxQ-MScih$@vjykgS}AAQ0#5p9d~?kF!w=WG_r{qf
z69#)A5FS<Ix$)yL5>OrDIGC=)W{@>Dc87hc95gZ_s#wZ?h9HLvb=)G(yhml+Q0N0c
zK`bA(NT+}@cI9Tw`}Qs7<f$?K9`|qk*R7Ev%S_GOz9L&}e<|DEalt+sC(+s|w`Z5}
z3+C52D0CE3(HPd?5^xhW1Fp(+PkhcX*Xq8XSn7wBdnS@tuS|#4f-mTDrqV&<LPUrV
zj+@*!magu*;z~Gm-cZD@EUAyhi+YMX^om>{^;Tg4gv(S|XzHT<?J+7?EjLnv4)Dk=
z+u0Xyvx*2=zzg;5K*<ChGAMz4qqqlmSM%iPqGQjgdjM{cpJ3uO%UW<u;$9~4#H%T}
zf#`uDi0A)*T4q{RT1%^XwqpznVf=!5C{)XW{;>d0gCn5i^K*g0pzvde8{*IY!BN^3
zNo_r4qK<9X!|~IUGc&DGxs9aAbhQRHT7le%^rQ;xDsHHg7fTUjPUc?~Rds(G#`tQM
z{@b#|T<5(Y?M)?`pC=Z#!;~I#vSDnXvThWUY;<z3Y}2FEy}F?gMO7GNNP-p^&UHf3
zhHH6u3~^Ln<<{seZP16tIYdnif+e$N4{j>x{l3=EuS?S{o_rgDA$yusKnP~4IsLMl
zSSNqce5<JDu`CQ3?U3(^{|%Tik8bAT#wcP%pRR6!J2a{pCc<<;w+5&3T&$?=@n4i`
zIK-~?%6Ts$8ZDy^|1eFu3a`GSWmB`jNAX4CL|#^3&F$!aOa~_TsemsKbVJR(29y4d
zYp!Jqs<_f>go`tKly$`>sw=0@kEO%YGwFC^2Rub-A-Q_p`SOWKB+{SHh<%QP%Tol6
z^j_N+Gl&`MuNh0nADh0!-vfR0B!xZExeX?|zWlLY{IQD5Uo1ZM55Lt?*8qJ0zfTvD
z0O?Gjk;jaDfEIqZmI$*TMu~~0R4O>5>W0aelWQ+ao=a*AO|iRboU2}r9@~L&0o&X)
z7-M`BR_UelP5e<Zx5u8tQ)NoHUaZy)D?>M*fK8c!T1jj=j{Np<qx`#|2<{JaQv_#l
zoZ-GuKyNF%B6=&gYMkcG2Ybru20Rtfw>PSKLsV~DB$t8g2e=DU8=JKieV5u;uMR5a
zQ7d|v7a@Fmo_<(aJB~9>W5gpag1xt>&xf@12&GrL&`BLk=GNhS{I2!CEG_rQbU{^h
zHe=3@G%KCygg}7*|J;vw7N%~Q-CUn+gtIUqbQ7I$;~QqnNKnX4f_!7fSZd2eU$GNU
zTy;y63LhuzC=lI~uMo+#w(`a=t{EXz%KoP(aU)CBTjGV;+ACJq%LQU6=e)K@P4=0*
z6hIl&ti=1%&Ca_1Ta1URk}%g^;!}y|=^1s|D$z|WnE5B&rTXa#bFt<QN9z#-&sxTg
z2nZVLsJ)Y_zjE7d@32p(YwqQXuFIcZU5uF!i&J#B@r&(YMn8!6{7-|MlkH<0H7Grx
za?FIkZ-{>>$5h_GgcerHj*8()8e)1}{<VBazK%`Kx@aqn)E)Xt+0n#`sPs~lAc{xb
zbBc|15bC-@6!m<*Q{1suGpM2gy`%Zp%;`qQ{MW{OxN0l^u#9)*@|>x#LSd-mrN@RP
z8PrXTQl2)*0!Kl&qTQ}a?N;;jkX7nZ(MIm2*iH^!<W`JnW^02`p-O_!1U6J|WsO4`
zvk@p=FcTD)owL<H@eGm)O|Mh3B{Ai$QuDhYhE?3N{K`#E^%Kub$q;dnh`18&dPx>G
z!v9(7-pdq4Dx(#<cXFLp=pxB;YNU-sE`%{+l&YpRlPy899%<L`!uZmeyIN_T_O!3@
zgRJ7Yv&y(75er4NPO7ACi0bUR>w}$?{aI5QBTAE01KZQGin{B&WVOWn_={a~(^R&S
zZ<i|WmNsm>Fmp%+Z^Q*ur9XAXxy~A%#a74RQVTs&Aojx3%hYApAdk#%og6LfQ(Zn^
z^SS65W2$3K%VVwe+iok<r=w@iMc<D=19w*72Bpu)%~fJcrd%hTW*7;t`|NG#jK5fX
z?jQc^yBFw{Il@tPH8swv+;;M<{A@fRW;(rdI!~Ut(j^rS@j6iu_uqMt<qQ_^rf+t&
zRfkSY-*hJci2#wd_wz#fz(!6!Uzor}H<65D${5%)HFfwYDR5l&Qz%=K&)B*q#K$P(
z0^#Q8gI(0^eQ$Ljv3bD{yL2c&)N5PKw!5c|VtFbcJ$@~AM7V%yP8)J6^J-cxXj1I&
z>JRo^=vTkXLWZ5E%QD^2hP4*zv*CZJrf6O^E=2jjs-?UhB0^H$hivm*an=jIe*z|S
zEE;|dSFP`Z<ftYqIEvRA>j-Nl(aDLsqc_J}?%iAUN~CpD+h->Ez1jVlQv_dB@9YXP
zq{wPtr)_VKm%Gh8GJo|w&}w^f1fttAfyXSevSlNyXKS`pF+7+uMqa}b15sQVSxTUI
z%lXfi8fiyZh?Yi9qtSN7&TsF<tX(dd?5KV)7zwCi)o<^t@Qt)_ACy{^-Z_?2thJ@m
zU#?zq*oE=HiEf@N7EhyALe{6>ZgD0_a*eCu{5kRL+R~ID-<|KFU1Se`GOFRlZ+;u6
z!hIc*MI^{5%=?4<{kki!SOyRPB-#rR(P4~6C=uPs9MP5NF{|9VWHEa}q=Z~)B|9Aj
z$i6~R_q%mgH|cb>JhI;UW7TCi?gF1`Bicv{`&cBhJ+Qn9R>U>iwAt2dGrS}Kg8ytC
zzVDnxU7t!VS2^uZ(AKiKt#@;!6ke2W%E^&Z4Jl4V@<ZJ%b@UYENIj)nb;oUxSoV+^
zI(n6a=@@5PH7ew+St8)08T3_Ifgsglw_Had=a`#jD|p$&Vn(HFn&K7^6>Dp2mKnVA
z3h%^4p(wxw5yRAd@)+s_k9Qp6Ejr~-hBn4Lj7(^K@L^+K^c*Xtw9KL<N<>C0Z{a%F
zN~NLI^-p3W(NrQF8PI2R)|`GGKL{D+J7dx26~=n>w9rxaw8-M&AEfS!@}7Ez2jmLo
z91b<zr9NDup4sHe_1*elHlx-P)MvKnv|i}=7)gbI4`1U)QK`GebF$Qd_nnTeyfWd;
z80Vsw>52tXG|%yltJ9S4NMvYeu3k_vmM-gQ5ewZDx8k2M%ktWMsYXX2W>nJ022RFW
zao5pc-)gAG&Y`C?{^C$d8Im|T{_ns2yOmbpT85l~jt;r)0Kbe{EJ4c~y-3q6QLv{c
z9=IRU141{s>XyvTvHJ!l$NE#KhM4Yd(4Nb3M)X<$GtnKD?GsO6XP|$jf8KN)K44*@
z=s*5eg{!hr-s;r#1&MV#<%S61b>_|V&Wj%%T!iuc-kxkN1-KY%LGw&T5F|Kf56ftm
z>%gu2bj2y>a^u_|_BWo~HGe&Y!y~fV%yf0#e*HO5c01<|0S!N6|M`NMJ5<l5*5NOq
zo`-JkBKjQ$qHV(YmQT_Cf5N6o?i6G=Tha9|npK({A&6^O4sk4$bdf)k+A6$o`6^Cm
zmIk3yf>@ZXImUY}WExuw2Z9&yL)lOELVn}sgI#&F;ckxHz;dU`j0CCoAnphsw5Ee_
zuEiR1+<v~*wk%8vQs!pd5`I;y=1ppIHCXm&_<<;YZk`u`&3Fl3q*U3hK^4b=)JOmA
z*pg)`%J0`J3B$fvyIRH4wbF^i{MR3%IksIEm<<c?$=C%eidA22HoP+KV`Wb0{7f!j
z1p1?I(AzpTnzcRC4&A-ES|5SasW7U=6Fa^n+x1GCWl=^PwBDW)eYRx6vt7UmD!mGK
zZ_KB=4_9<1y_K4L#&jT7bUQ0Y{XuVZw&uFIopoTs*I9;ciYyMA`A*F)H6&=vHBGQZ
z2#abib6Y9qI5vZxj%YLLLnWt3X{f=qemsX<*Se|4(t;e3A<A6Vj7);A!H$XGV=TqA
z)vdD4$<|?gH+9_|9u%>HY>#WhFUvK#ym2MAGy()zo2-X4y)zD|v{R{SDLdNk>oj^<
z1)INS%3X;q;d{1@G_5KfqOQ3Hl_f#StSlLH^Y)x}9AoyO+GFeBBlbe$ZzIbY4(zZB
z(H^)6HLlQ{iWr6p>6CieTYRhGdJhoRWz&8-t&iesEJWf{E~M&@nQrpbPSr?#&mcAX
zEnopIYU|IfGCS)u?<v3WNJ+`V>Sitr?m#!B9^Lzm)nH=|NhPKA{eGAQgbIS92#zK-
z%`IxOK_GWKPHEJ4EDe$CJ1RTD2M<6?pOka%mB2cRHSjk&zb!demz&%Ax#(~@-s^em
z;gR`msYv*|`f@IOCOcmf<Wu!1hZ^cbeS9rL(_ZZi(Q{k%;EupD$P{1{RwOKXWSAp}
z-p}VhKKNI^d-2b{{33Db?eUo!x6DUR?T^2Z0mQoF@iUI!9_NTkb+^kN?qY(ZTH}hC
z>RmY}`4RV<8SfmEp;&m=xYv$7WsRsgpJ~%obVCv#Z@@TH&Lt^oFR+IQ%+ce0+Co`P
z*>$$)=N}~b;$oOx!?FTmp0&;XD0r>BKy8Bt!Jbp9%sSEnZX4)vahX-46OQ^Qzz%~@
z@D|k#T+ebd-3}t26JL3CQk$5Vj`8CKrUbm$596V$<x_L)X?xpRcF{tda7--^U4Ifj
zJF12pqNMg24Au0|i_Y{+W=H0F>Ol;Gjw!iHLH_ec8&;w#s+>Ez#-+ZIrU6|;I{Y@8
z`zp*Kdh1qJ31#^M3wV{@?URJ(w3QJbd2(G{oB5&XaE+|}_MJ)RDpns$DRmXyT2f!2
zOT+=c$XX@L{`4s`yGe?)o*mOgOFZc-?FnNwLJ0&tUG2`ey5?2$NoQiFh$@4EKPH(x
zU?f!Di(NH+vV($RYtBncg5&}Bro0FagkKSmL41e5r&4E*lp%V$KndqYaEJJ9N0o8g
z7B80ZDt{>Qqi<kZk;hM|9M#Uc$5P7XDpZ$Do=`T*Wm~@T-#1h^L6AaCFD6g4neSA~
zYlgh1gWeog8#=-noFz1h_N4%OgLR5Oy>acC&~f_!w{rEy1^5wHcA;H(eNfd^HI^6i
zY0>)u$G}6B#GPrYx3q55`y%5(-^{*qGu<<&VRpP=vpAC&y?R>JTAHNDc;95x+_tXg
zp<r8pp+`?3`clPp%;dk(F2`KcSLRfg&7K#WR;70lL(SAQlH}?2V-yJ0Q5tY42G`G9
z2diE>5zz_<^-7Pc79Qae%mA*wyUpn!9R1|LNs5~_<i{mot5b(W*~A;bA|w`?577Tw
zHI)o$K8?B){O|(Z+<g^w(z~XO6VZEkoslu2NPgRBpioM6!XjumuIY9vgz<*jUwRi-
zlmG!EBoqpC5P;^_#KwY8xr(8StI_kef_+dB!<CKY7CFNSZ+3dSaBP-9WMypns@}PE
z&NbE4URCWOE3u8cQ;i*gIa=hI8CZ@=N-*Drym;1O^MTyZuGZ@XP#^u%{L1fOg(VVR
zzI=Czl3m4Dt(H5YgjXI}v7p>!Ond{MW!2pN;m!Z~w`ExCl5-oLvdsAPqDA<GK9N@W
zezZt2))?)ZhTP#rCHr()p;Batnr&4$^N>g!#Dbwyji;z)RAYz<{*_}StEhPzS6B|`
zo(@Onm9lYxU<^4ypk8F@_`S^*r3<r5{fI2m7g6(E4Hr40-H<q2EXvTpd;BF8eLgE-
z352hXplT-CJ}Y+dH(7>x<+w<aH5;AGm~(sxlr|)`%CD>~P&M?>ACdenf%ED>j`mo+
zw2vj)<w)^%nsw6RLuc-jYN{$rFRjYGQUP!rJSTX90avhR`D^=e;DImCY^UO1hka5y
za%evFWSd%P>#$vEUNY>ZC63DAN9*lKZlTIJy*KJ5`lPZro^Pq6X&@!JL>S;&_Q$Gi
z4YtsHI^!I_vsT8*tq{v=_7CcxJbP8J8~+{UK^tqSMvmTaF-X+p%739o4^zGWg+lB)
zVxr#EapRvB1SqUSL<xfcl|fFC?82kdJWgAFw6%(wZ<duVCus61VWD;u(p!fHN1;C8
zrlHGu>KfZIWKYqumvmKjBuo2+wUO$+kL*$+w70I3y17<nJS7xWpb9Q;4F#7I3xgn;
zBs31DgSnFW%1Ipovvs(oz@mj(jyv}%wbJ}<*a~4*Ch74U)!1p7^$#c5xT1PctoeNu
z%^{Q+9H+#Y)|ba9ZC|IQrev!oI**F_ecM=3wU!&NBGbhyE3|m7%AJT%#JxP}iYvFt
zS9!TO8Nmld{T<^}#Ew|Ep2_RTBP-noCt}3|b|0$TH1)(E<*WJLDc#&-7%K|KI!d?d
z?O%^rDO8!)awN^VeU2pBt^8$`_29GuM%Bow2tV6eH_UrcOo0^D>v!m~!Nin``ws%4
zchq^)ydPsDQwpb?fAr0z#Ny3YD3fa2$v3u+S!ar7&>?>z0$VkmiUmQTH<PPFFLq70
zE5^WSC9H)z%_wDua!~FmdGZn}24s|`!kXzenWd|WSkn5wutd{G6D4$ZX#o(PhBuZS
zWQlH{EjI_ZNEWw*-Md@g__b|}0p*zRTutq!I9I*WP0I`&lJ2;=Hh(5tfS^wFrF###
z0^hOF%J({!=J)+vlp5TY@?MZRoYVYKcF>fEbJ;D}N3?HvE_x<=q~>%qAx7NFc-NsI
zT=!PKW(sC?8NGVugWe<@jMUcm|K#7QbpP4wfBW~pg#kVn_4Ybh`!co5EKtrYe5n*^
z9ErpYa*mwcndVy(X0vP`z7ne{Uy=+-vx+U7T^Ut&ZI|SaeTlC@j_9%pi?O4?Cs@U4
zJ1Z|BtcV;Zh=}y*;wfyK5n6(PrUXg$=GMmSVT&;^@{1prLw^{hA%PNd$Gr}2rS^Fk
z__41L>&E-x`V$z?fImdN2cFFPJ==hJZ@YXcI(hC@N^am`JG@EO4Y3)fVg@-X1pB#*
z!Be;g!-`|XYZcDyS!msheLBE`4Ah4T^UX1B=!i!*ofGDSae?|=t&88(BF?t!1({4b
z#=qz&6OrC@=pwrzU~r6!oYzLV9<PNv5fk&84lXI4SYog--0}sZ(zgshLf*X&#%p`h
zoYk&3r;>Uu;x;GUvPqYqL65r%P4oA<+CftiBij46D(rX<EBFB?T>6|(YrkD5ZLV(-
z<HCv|Z4*iar6TLv0F3;Gu7WSYis*AV_Y#{j?D=!}n=1K7^cc^;xYwscPBj}qY?}$@
zP97`Dn6dVc)&1X&JV&uBHc$GU%0v7O*yGsOYhAbh=o?ftx>|~P{Udf}{Z#HRElqCs
z3k)RGQcBg7Qsn~fS?=EoQ6)_jKx0A*F4zN4iQ<$eAyUPQ^B}wdujOAh71@9R3FHby
z;4BsB{26-WP-jBVG-;AW9BwFol7C_4v5^2SS)@NKB^Bbi!7;!^C7C*`!n|IMu#qPe
zc(uzE_!1`2ty*<nZjJSU8Y2)OCPaPc0<^W(jl;XB@7L$l-F!m67c+;r4a8hDlqKa-
z#LjL94UQ2vdd8}?u9B=RkB7+vrSGnl7;9y?nRjAUQVS~xr$%^}Xq0v;rz`#ZXzo2~
zVyPU^xIIiegp%PY`IT4FVK^E+Y?axHGTk=sV1*inMj3d}`_yI~++in_r~sc6Ft`Id
zXnv`(<@!(BOVI^=ph8Zh8Gk6XwEyi|1TWp72$lf9X=?iag?fID2QyqyS|xqIwbp)^
z2!zf68#LIH?*=1{u?`n@#JlaInxBgvo3EJYD0Fq`8{xQ;>d>uXgDoYp&$~y)PL|;?
z!KY1thsbTumYjj`egMuT8^}eAN+m=MJ-dEpd_Yw{Gx@#az0bv{<e@I<o)eL~vWIVA
zOF2^ciw<jyrD*;mb=PbnPa{MUiA=eLrv7;W!=N-ws{K|<HNhYx=~GZywNWG!CJ<XB
zrw6ZWH}a$}voBdCK3zvd*T1T$XK9VmkGtYC)M{!i-WFIHVwx)VWO0B?03}PLDcY|?
zqX@E-hh&b_y-pn5GPa1nfy}lersLJDHY%>4ia+$oM0m}{YiNkJTtoX>tno2NXUOa)
zFsY}Tx1*w_eKhG!vEe6@bj)}ONh7(Q;=SwL<~rH-u<i8q6F@>^^pmz>?YU1~xW_nZ
z1_Wcru>=Y})b?BWos%Y?kFAhv1ulILRb17Z7e6CYAk4OW-B2hX%f2CE`Hh2bUoYmU
zq;R_UQxIl_`|=iNa~UW)S19tI+GS$6$|26(=j=!#nDW!VIo>3GxN5;WHacAlJ+;!R
zHQ5_fNih+b{P3%yl4;*Fc^58ck|T#LVe3;Vq{%ihQ?*naN(L;bu+s1QW1dAhuf@Nu
zVq31=8+dQuN|zJ9d|T<4La8#ly2O^B5bSWh(Vt42bfo-k+d6hts22ki{^q1;nqI2e
zpf()!_hPyy)VsbX)*Y9K7rR?)?Cr_?#lEzn!oCL;_3(vSk=2DKUgb~PxNaKdq_Ht)
zEFCY=V|max`qaP||5c`F+NFsYaif!?q<K=A$W5Z-$9+fvu%#Uu`Ft?2f~H=K4Ip6u
zifCCc=@Zt4X4^ONMMGdiK;8f5ICVMO2?2xb>R+0pVHV3Xmg(ehG2Gc82Lvv#kc#}D
z_)`3rJO|^5mS%c=&_aE<{=p1G3Y^$?nsFX0q5$_mhs*%sPtX%o1l73PIen_{e&Vo0
zO$V9@nznY^Xdu3cs?ozhkj_L^z#Lveigkl=8Za)j==_#hCr&_~N;YMXzF5t5=!czM
z?T(CY(Wfh~P#+CKW-Ei-gi-Hi(9>GG%_LM^-psT~mz3;6npC%CF0|I#<slVYcIlAZ
zzmY_uNQ|P_U?6fwmAt{TDRkcccqgy0x+Qs6MeWo)g;t9>zeBHnX9gy|%_2r*4n%j&
zO^%&h(Sr~0#ThDVxXkzJblbLB{^Awu>g(%wtem;Qs?FLih!k_ASZ^N4O^#e$t1B%J
z@W*+Jr1hh4;+cKibX*sUSJ9L2n|AbjHN;HC0$j^Tm=?Wz3t+=63zC#w%H`(PWe;mQ
z5aG@o0oDH7|0wIo|Mi>o|5))Zg*1UH#p)mDqt3A^d90z~p_l3De+DDNsynNV^0g>o
z1bet|uJLNOX^CClzq*xkn8lAa-=|JqM>EkO%hatFeyCTAjwCau<DE`1r9D1C5D6_3
zJ3#a^b+`(*syRMBkK_A!BBTpf1CJQd<2Z6?pPYJmx?#2U1{Y>ztk&W@1V$|RO()g*
zb)L(G0$ULV3c?7O8g=!m?GP?B+s^Bv9h{pM-4~_sQ{nAND%NVfD`}C1EY8b<Z$zE7
z>8-Mci}m4d<Pg`h+0;}6zW+@+c;fqpHX*j!?hY;&I{arYtp64hiT2{vc#~13G_3t&
z^PlOMKi$#wlz?D`J!>4k$n;dJ?Cg9h6BQokCmUs*aqYZa+|xZ;1TxC~M~}VEmiPMe
zS1-^8^QS{Ot|f3^lBQ(IqW62PQb79o%kT5rrD}AAaVXSXlSSoCL_FoU4Evt(-homp
zja`I?I0!)1d(<D&VugIWMV9i`N@jI@xbVUE+T4Yo4@3=FCvP1&ER6vQgS?i8DCg1v
z9-Usfh_EUE(Z)NBjcU3*K?M6gK6hkK31FPkE0N%AS$2VmW=3x~BY<+>Y{mEJmT9~*
z3I0nsS9p{jo}x?9ucxZx$_vxhFE|2*f0Kh5(JfSRvFrbxJrTD_*%TL}xYtW6O;hyK
z9sq1sfXE1)Y@?2u%THRXK6Jddyo>Yl7}8!_w@Fb|1eN-GSG-~C>8<T%WM$#f5ng^$
zWXzx`rOtauS#}-yf1!e_y3^w$gHoacfsMv~ucr=Ec*8l0tMt|ZI$$2|YD=k!)`x)&
zV>~`<|7KHM#Y!vHna5>QDNBUae*;j7`L7-0wp5+Damx#t)=2O*F+OVK6Y~<_H$daN
zjYIZ>a3+eUp!ufm0t>vp3JyF;Coig7+|<e$-d~<`Se#q5vrdC$v*sO<5ik%hhsxXA
zesEXXOQMu_Rb75(5i}bVX6G;<3{JQsP5l0Oi|qmVlKpZB?D%v%&F&?@AcRm5H6D{v
z)webMR?(eJ-H~T^-`2UqqoaSe9Wir^Yu+)dboCB}hDWYyu>ry-)^WIikEOGGqS0+h
z%IG~(*mtjYu1N9Rlwzz|!CKB%9$JvUCA_?xT7HBEUXtgT-1!~LWAy2;J6(tHiFaHr
zS4N4TFH@G!^o^-+7dcPQRTWAkI%{g!kcX6~?CWb7%Fji4c6~^j%AI$-zdzB3JMr|d
z{uLYS570for8vG_*S;0{`PB<|cERH0>Iexzx$QoZYGt7ZQYMd8d>Mb`A0J#yzpISZ
zENsj9w8EkycpAm5KgXKT1T8S8mxIvg3N!if)wc{B&@5y3LDi?1Av3a+`DAM^Ai;A=
zMss>+Jn2KdzYeP6PTzcfD*$9<3v<9Tv^4u)V9Zc`rJBO!Z!8vj6H(R3V~4j%0B<-h
z8GZ~$6WYy};EGX)?%7uL`4n%;FPouQw9^BXLa%MHQ*0GQKasy>9M`){HM~2tO@i=1
z%r$HhA*XV1fH`MaEE-UiuS|R>kT^6II#c;ec@~}KX`A`J99P<@t=|5qVz1*1+Jrl}
zA~C*b^%S<oeXHXwdNbTJ9z;5Z9jnuVdMki>a4m*MW|3FX4VV|Y*azhT&a#g5{m9g4
zNU4C8{Qdg?Q;UwKGjg``_}sSx#@pMnj1}?qQSGto8E#YFfda<ENO38%j$YqZcvN1a
z)Y~D6lhQ*S18)vPapCf-)4!WiiW6NsLKNr(UAU?)bHZjZN(Y`w>RBZN;{pZTihEFB
z-3j9ZMhS>yttmcD&P83UxJX~o`Nv(&{+cte^lT2P$ggE0*^c&L(rmQ!ePwh?;nrp<
z@LNwHF=p%_*FeL4yDF^Xu2AL6H&p(6z<g3GHW#!mAG+BA8?KI=$MK6#j*op8`b29&
zB>zdXq}6r}d%75BlEfEgUAxSSw7p?7#O%+QZ;&etaFU^DoG}F1R{Hpx&1%@y<L4-G
zvb*qa4X0=c6sSmpg&L#H9USmV1_PS>W(qRbvGNZiPxWl2(-&DE4_mpPbhbuz^;NiI
zfr@?+|9V~#3Unv5`=bSVKc<KU)$SmKzn(QdK;SFC@(1`Y!tn5HYp7ZwET;~rNe-eW
zvgvP*7~}BysK*oeMwI9v7%@4AjRNN)90Wel&wE?p4RiyI4V2SP8g#Kzd^;+Xmi+o`
z)2;PWvoJkF{L1MXpa4IpN{Y3}mLeSkhI$U)%#LoKXmAjfwEPfbO8ghxH=nvv&8dMV
z0Zfjc9EpQ?p1zT2+RL}DtJ*|jNK|GM2JQZeZTzDG%M+Z}GMueQH?rVFO>Z4;peWBd
zyCIiv?C4c_FI%>NDN!vvRE;BKRKRE0%$z8@i(SmV?+v>hdgEsLv_9lYa%SaBp^uGB
zsxujYxLqvldP}HJ0|*U#e?F7x>J>F4lT3%MK2qotSJbhv_j0L&?}<0IZk^^r8e8Dx
zc_nvKA1eRsB_&1u)$d0Cv|>ke-*Z%QI`0Uq$#Z+=%uaq~uN>zEMiL7;G2>!{ZB6kk
zf0TNT<SM#lY%*D1+;-se@G3V>-KT@MytWFj4~Y%$Go4qN(vd5I1Id><L}mhc7D*ST
zCT~OzSDw~BKHHZYL6|5<%c@dSzwha#(Z`rr2O$r64NqSinWXm9%NJ|^Bt}G6?C(U1
zB>%to={>zL+q$E)7g{loS0NGnuB)T!d%^-Lc9bQkU$WHGqbpkll}a1R!s^&N;?aa1
z%G^ZXwe~xP%s`V)002kWxWys4hsL@;qfTdFjIQI0`QK%Vg!;z>D%BKT=d>jTV1coA
z9C3CFJdlQksj(#*o<nXh;Mgp&$RRT3o;(As{{wrT6?kol>d5m?@vs{~^m>umd2|Ku
zG_r5j>ja-AoELIuZT$I%jI&wcXp^j}t|F>SWl<mUn-A~KAK6mH9(JWxJbT;M6|5qq
zwDdBL$?}c2U!|W(S37Gtg}<7MxgOgPMeVgSMsms9_#B8A@$SYTSwl~a2V0^xQ^e;+
z!sxQD*_W{32N6Fkcr1|+n~r$WUUk2SExfS@ykpVMq_^Y{C&R_pQn9-dQAmeGdiM)~
z2DFfTMMhM(oq2fQE~~#;{MusdRoAmq904Asx7GlVhped?rTAl)DbqFJ)TzUC_>R>v
z!kv1&Nt6pjy#1R9Ivgm{I&{A%qf~aSx0}g^{{s{N7nSo^8AVraoRF{P8yhH+Z13lY
z&k}iWf-A7aGoW^4(nPf7B{AyzQcX|$dfz5}Axpo{Js+TpmexvA3JyZhh7P;Esh~;@
z7KkqbI92<%?JhcNY@E1AI)6`#dip>&1>LrP*fkoF7TOa*qokISYFGhlG76R5mZEnq
zY^K|kaRo-l*=Kq+pI8m|YA&4s6}X{HCx8PR>hJyNph*Go_zE4i73QxEX1F_5<&x}a
zJb4}hzJjeHl{gh>bXgE%o?lqAVIG!yQr>t;1(9dlTR-U4kCiXjv01ZzzjKB+=L!U4
z@j<SfIu9-|lZfRKD{mf|x@)qp6F^A%6xKz;O=@mi(wrQ7WriwzI(qpa#op+qMzQ8V
z0G65EN%1s71E`k@sx3d}`bz1kI&rr?bgLY}Ru!B_3?*p&{le%vdjB#|U~bzm2AY0N
zD({0E6J;v*8V__Wm3On{xY>ZWh(!9?9(4|PGv+We)R+Cq6LAQX`~NBS<qEBKrdl^V
zwF4r2H(a|gp-{fKFSU5F?GmgGBCU2xF`TPYw*w9?;lNR?WzV$dppiP(PX{50oG*v(
zR-`?@SZ7zxX;COXBl28TSgu1Fde!q(x1`y#6K2kdcD0>F7}bK$^aMxM;5Rp~Jk~>=
z3(%`;$9N71h>lme4>5KWR{e@|!=%U3orfk7igjfy>>Q>D+XAuUNFYNBW)J*4EG@Bv
zghjIrqK5VSJu4~da3}Xm;iYM|ns3r7jlW$3skIu^dBcViA4dpeG~Df`3^<o6-8YAb
zBQ%@29T$+gc`iWnDCfPHAT{OY%%R&?z{=<c`o=Ci&g>xP=xMrnPtM?bH`d?i`nR`O
z)|Lg<0uD;ky6`FMPVIHC@;IOW=&|CEA+(5ZUbljRg1VsB6@oqEZE!nYKP}3(C7aD%
z{IaVq7LDj=n=TB1dJH23LnD=SYj%OkTQA2;GeGd<T5`AKCx`4f@Kn|h0u*v>203QO
zo=n;H^v&kA^Ife~Zz`zUor>@#1BHLjZ70l<SugD2S5FwAMN<CyUb4m2CD)D~YWDWd
zvp(C9)EKJ&7|FQX7{-MZd~dpUpu_Bvc=bRoaSetYNEaD>NKvNb=NeeIPDGpIk-#IT
z31z`EQ(M<+w)T`b6no&*B>i~g$@ZNT1<^F|NMy$JT}B0GtsK;`U>geM?bJ*${yYoX
z0-Gapt0n^XFYrQTr{v(d;dbyzHroqSY4uvDp(ZM$75hx5PkK=YZ!?7%aLjwtq*=vC
zAFfZSweG#y6@52+<Ocis{z|kDf`GSSLeMY{h$FIprY%=xV|`KJ9UKc%?{uaDwO^bK
z2%r;qRr?2oJ6w|=i%j(mm9qbvza}qE++&ed)MgtA#C1mwf;VodXz(I6-Bs6XyotS%
z^6E|PI-;D8ovKEKmboVWi)n4%hV{-Tj9ubC%W+$FqNsBnc0GX!o)?6W5;=rCzz-%U
zx*k)G!w)IHMbnJrT1_E-WmTWjhYSn>6a21O!j|F$^paV7ov!B&O-L*!tVSe?3mlAZ
zfp?!{|MMUwNPwVg;>g<CyK-~&W%9bea!X&S5`lBRM&6jpnsl5cestHaL#%`%!vYYH
zQgblzPKaH{Yq=U^4|}Z|B<e$F&dVODA4t79YDjE}ISrPI&*)&Beg@8dGR<#ztZ5eR
zo()x?NHGJN6`TnuwmVq{a*(gXpwW*nePq6-=BTkwpvafDs*YopKmFLRAZ8ZS{=d~~
zj6TJVuAZWwJ~(gtsD(8{Q*-qp$Qa~Z{OLWAL`(<NaT^&(3)dQyGP-o~PLq-ZF3}X<
zrHsVpsS7gPP}K3mKk*2u-_;FU@%oS!a6WiYZU1+xAJoYW=E7&%kgQ9~9w1RM3hxt;
zspnTI_!*8y@D%=CuS#@))!|4QZ?mMF@@$U?Pkm9=d!{Z<mekX5y8rm9mYN{>Wyhq&
z=F8;dB0)%y)jU8rx>O2mG?aGDJCb~_KiQ4pUT)9(S6iumTXav_R#P8_w8v5E1>MjK
zw%;Va=QHs5s`6W+5b>2L7C~4gb^II}(M)ar{m%b+iusH>|I~wShS;BP`8@Fk3_IiP
zE#jECrW*$IQfy4Rc-?oZ{2@IaS!&%*mK!Jb4J?fX4R`O;AYm(1zcl@z2VUldl2LOm
zYjLu2D!z57E~i+SomR`0s_4&PXtuI!BY;mKa9uo=b`VyFn(Etjb={>F--vt-0!7Qt
zQll^GrrrSrz4?3A-J1|A7&+~<2;=V+9CPv7<pO5S57jVPA-8J+2A<ZLJn9k*VEn7s
zXp*7DFVaK6)~W@O{Rm@4U7$2NyzxRZ3K_ME%JceTHRA8Jv`WP{qt2R5CkO+lM@Qft
zgmtG&h7F=5Q^e;PA)fc%_}Y!(zawEa(ExhXQ^=8NCBP0L&%RxsrSkRQn4!v?6o13=
zDS)G*zc&}s!*t4eYA_JUQJ^fP3pS^Wf-Ah?Wk&nBomFH3%@}R!te=3lflXSkIf43*
z9Bn)jQDG+2HdJsX#ZkR^Yu3WPsKqu6*l-}$2)z4!1_%`+86kwALKigdsMUXHX^Lp9
z0F?lN!HD5V7b4UZ<0sY_rSHm-u9p7_H%%Xo1D^`kP&rL;_q{&lncA<4epx??1Hprx
zfe?`6sy}l@+|e<4>Ny{h1m-6WE@I*_lsmn6dpf8kQDdA`$jSCv<=);*I$7VbYfPEd
zMBuer-3_;B#hh619RZSFUitu}0#P7;mQySBkr<tPqVUdplYVj5If!N%2ABxC<g;&Y
z+akXv_#uA|#CxXuaDg1~Qd-NV)6rYoo@=d(W@cufP`GT2wbkQ?sM8kYa!=DNZc4}E
z*Vo8S`3haUX}J5QXLH#?pX@h%W3uQNPC@hI0D{ZOTM7Xn^H>n?&K3imnRH8Q8JN@9
zS{X7!5UQ{t)`)nav9z|V&P6eVhBEIf%iLiVcaI%h2G77G31UDJpK83|!gA^}IQ+Y{
zxF{!j{@=31S1(_DBwaj|{ZjS-CrC6ZxZE_~Hm$oVUWQt40`O75LxM3@8*}<tz>IjM
zb5U$Tdt~@AF+kB_$iPMu-RwCOy+tm$I3GLuUG985Jzf!*lZt%l{0-8`ie^qxN@&Gs
z4!C!0y9(7omuA#ZN=<h0bnkU<zsL9kqs#7>Xnbh>n|9)_Irh8vtfZ7?5D;MCsgoFU
zpot)WHobdgO1=0h5GkKOG40B_rIBIT_zHA;WxSd=M!ASs?*e-8=V-}F>_0lPkxS4(
z)M+3n@7<W@+C&|I*3oJd7m&yR9mOh?slz0ndnW1E5KfL^l5$|NyUMls(4+!y$d@=>
z`+24m(s1PaH=r3lE-gULPROX;_K1r`*s}D9ZcB><y3N;u!<hN?CJZJE^t;-`!a-^0
zxF145pma({_31QsIr;Ukq0kA5DXFx>{BiVMZlMTDOfELzIB={tFE;iVf8r(Z=+9`1
zaQTeTOhr_1+pTEB*58wy;9gQJ<mnIH=N=$1rb18gD_?{c-5#s9POb0+lC9oq@VIyl
z5{QT16Q5PCZxcw-R8U`~Km_1th1O(6RPn6xoG7RvasQ{XY-QlEnygXMinHp=*V$TO
zpb+mO>~RVS#P+h{HcM0tBske!r}$V<*y6WWms|0N_s7u#UQon*+0IVc$HjjKzt@IO
zpC*_BUm;1MAJ~B{G8RddAJm}aYNimU1NQ?1&vTib1v79x{qn`j3JNmRrCNE&ntz8W
z*2UA{OO+*(MjRHe>}ob3K~NBEbaP2>+w@-sYUt#Hz#qbZUTEk9L)IDPUgCuI0y3uE
z4#=rlmWV(}QCX<Upco&57+jeh(_}X2R=Zk2k6FtZv)&x}R>%`Qrf<6WfZk=tU65$z
z4q^n5N-Vm50GT%q=!xzL-f>7ES~P?@Sr}LVa*rPZrh>u_W08#MpV#XR&~&B4kW<?L
zh#yMr9RM6SYhqSI#ANzlCuhkq_Ps+(ZTSkFJLu41ScEtHek+w`=@bcY?l4bwLj<?^
z!x|HTXVN>FHC8ON*4LP26L-A)lu$JjQgi!83;UM)+?l#)Csmg&8_Mi-bcHqgNA5iu
z#m5QH6RF;I66a5L3l0C?cY`E1CfDYVF-xep=dy>HAG8%~k2lS7fqm1OMG%Y0-lbT_
zChq9nQ@<|v+96E<8Z{VGfUj4&(J4a01|J=1w@@Z(D#Q@tuE|WY4+sNf>Z`_1B2A!T
z2LO#KO&{G5Q`vtz`|C?^J%4z!>$j4B^NbSC@Na#3VwKGS%nv_Ptu%8cP5sSCBf`T2
zDH;16s}$Jq)R$h4Y6(ln#j%P7ip*Enb^oc_|K~S6#mHWjCMUQ{DurbScc!}0m_;lh
z13$NiES)c*B4m*t3KleWAEAwu>AL8br59}9C<keVM=RloDou&zQ%Z2&q+;z)g~`l$
zScy0;*8oT(*vxQa8b3Ztb<AX7{=?d$Y_{;mec(h|!-<oNi{wz-goQ8^_p6>l(bWk>
zRj0PN!GLp*02Xmcq3l&8-?6Wt9H5A-o=1SFa=eyyWZNyby(>2Pm7{yt+>3vodXMD5
z>BkuKFQ+)NL*s&_p@D?f;eS)#$94|SFkjJj&mzI6eTs=nJ6<LpLnDcH(ta*OkHZ7m
zP>nyL)NR{i(~O@UJbo2lvaY)Hl0QZX5tR73!ZSGgx4n>bY`bbar*N`vWmJrKB~SdT
zj=%bQcF>r4IvtxMR%lX+ubW3`&k=Q(gy5p83`>RWvzn-c)3k8TC{*+enVpoGqRL1o
z8GTgs6@ugPZfNqnqWqyFjsyUru>?iM(~HC@g|~Zh3p7*~u|2^n;#wbIQP)Nq=ajWg
zfc5+*Wlo^kpVwIxwd+Hlu$SAoi(g{&WHSmuH~}q~etP(;UIK~sCN=*7?-<fU$w3ff
zaol1fsq?S#vyhN%3WPC2ra-KhfhO-!XkH~c$eyH$7~m37Vp1b$zZHST8d{3-JYY57
zhp43x4{Vx{giwJXuw3kqM;9&VN|n|e!PG&-uS_}Ab=wKE$-p=D^vAiu0Z5u0gqI}j
z1tA9gya*vEs|rW?S14x<^hmdvJb=3gr%#R&%ad7Xbxcx=x^@i)-tLoV=2vF4pdzfR
z5lKm+Z|-YH1pyibX5A36brPNRT|wFbw-v_sq4GWg@9)>Qre;6K9vH=56qb?oNr?ng
z-?*rs<-Nyvu?-uTH%%j8b`itXs(>1MFYrRc(#a8N0var29XiZC2?T8H_&qPE8H)-|
zOaMe?8`e+1!jI82OAtbR_(0=#X(*V8hqD#w77G36qQ~a<)Ni#ENIg^4_Xd3b2n{`&
z@{O^v^pUlFBMUM7{nU7vrz8tonhK;WOQndxFIm2gf^IgY`t!<VQ27_AM6MlyHL|On
zVG%$P4IHh}RaB6nkq!efMqrum=v?%JUa&+!z-e>>ogF~MrljTuxG!50kf^~O4)yaW
z->1zJz%dzW6;M~<vU4nut^4dxQxxmJSUmTuZU4YVlv$3@K(G~QWq^_{lMyTuoc%;V
zUzEzMEQeBf8H`je1cr3Vb$UN>4LFK$m}(Va+U60&UwghD+q&<qCdDu`ZQno<{~1=+
zT{<$TUwSqKJp9%1V5h_ntsT(GxD7Q0VG0+z<z{s-@rhtTzErI*C=a+icmLfXxGtV`
zR_nGH`@cgu*X&224&Z^}Kyhxqu<2b=eW~uHmEfY8h;0Pur43JMnK;a_LFcZZVC`m6
z;#<%IxVXj(2^B=eGbA)@=-Ftx1Ljb(kX~LKB}<;^h0~af%u2L~IRaF6eFrwnl!wpa
z_-8>t@mEUF89q_YH5B&lW9Wqn*Pq;)`prfyx^2Z1>)u_SqANBfz(*O|RI70T25tYF
z>()#D@nb~v`jc%%p~KB2TwJQP<nE$x3H<mQH=F!A5$qY3K+)1Uf0uf8uTM*a&eExG
zKfA2HMC)r?K)!x?kZ8zC)RNY9d9Et^_^4-uY@fHpFQx9^<U$$f`)cRD?YjS&QK=0S
zqKmKKT$M+4Ok+liZbPinCex*D%y2LRB(y$$*|x?$()L+#*3i&0EduS)Z9{d4<F?Cy
z|4F<OO_he5;?@Cs%L1OVTr@9fT|>~Sg2ak%2S9{1E3gVRyTo`Y5vf+AhvWxZ2x8ag
zuZ-%i1z^|BCsCjk+|y-}#3W_0)ac_fMUWLc6^jSZDMJ2bl=lsV8VWPuLY5DgQXL=X
z>0K~eDc;4NK#dD*ETf^{+)fivkzOv~Fg&WzON0VUAZ~Io6RGAC;gjSA28y0$n+r@V
zAJeeJFd_&j00A08gowaFv$hE+s@fm!4CpJu3OFdiMvuNg8BI?o(!veNCwy7Y$mAsz
z^G359E_$v@7vZ*AEZcbV6-B|tG$k|@uo{`|lmn2^jk)pqhP7(nnNyG_v~~ps2+Ne#
zrfI^o0L!bl{-13FS(;2p&aaepl5u9X$YSaFa*MjhZP)nO*192Bs+kNcZbt4=`9u`S
zv#RL<HVlDW?2$glN?Pxx4FS+UA1N}#H1J~8-XPze#|sMhGB;6V65cmjZY}<iwU<=w
zjdK$1e@1!25-KW<JVJoLG&JmI49@Tn0t~T%U_qCnuX0wiOLimrekP$YZ5U9wm)k5M
zZJ{!XrF7eKY#pFASSF9CDLOOiz4n3SH3h|(3o2l>WLllThNVcMxscyXfc_HLAa;*n
zVzTGiE`%N8REB!amFq(QVs(8v6Amdtzx@x`rvC8eqrbiPco!^JVfuJqMrVqG8PXcI
zRH9MC+4#9*25p0-Gh>6KO?)ILD6Ur0dlm4IwTuV`l@s6rQExW}#AN{hYmRqD0-<Bb
z-ajwEAF-7%(V5iv;&#!PxFuZUXo7e`@YXSXM-_hqY1AY4XWeBOr!p=h%TY*IH#I{F
zK>GxT9vRA@b*PHh-8~nEui;sIncvxmIFy=Ixl`R3{7Zf$=89>X2RKA^;I&Hd=hV`?
z!RHbfTqvefv(Y10eUOGsdwT<7$@LV(7GiOR=>E;Ey=wpQ8s5RpRb}K=(xx!c$e>L0
zGOGj32ar|v0ErlDHon>H)P`N6$Of_OYEIB4v|M~acvLL~{Wc<Lyrt#J6jRAhq;fbj
z?TS&qXKc!eg6y5VvERI_CXAG3i{cbwtW;&<N5-N-Pcb{05c1YT|4V9-m#jc1BaBT8
zYbF;f)FDd_TWRe;GDN(m#m>gN|Dh=IL=iadOqN_lht=#avyR@GPmzrq>K}jq-V5v|
z6n77D(L9)-*S|7f>y1rSxL<jH8wnoQ5l~DZ)CMJdHiIZOg)n-cj?|2ej}>Q+(FJHG
z7@}ckh&^plphX~QO9`kXwv(aZ)0CNIG*?XT<kae)Iz!dk1ZJlHhYpkbtA?^-@>v`l
z&!QcKGB!uB+SRy=?pW5Q2>#YnlUi9@w1Y@8iM|(v7Z6D}wD(=8rO6*?(%$hveDj{w
zqJy$j@`3h*ZHv9*MCtsuSHVOnxgH$^Udk9JW(UVOg*+8Seb*a7B=LiAy9IJdWfDOf
z8U{oUc@zjV1YnyIi<wa*XB@3T=Wf-gkqT6Jc$tU0N};@)=@l$6riy!C(kwc;K8G5$
zfm$J#hW|Cg8T$92Bxy<}K*jfKY*)b4023Sh_VXyRkBm?**IrPw0PrCS_{{~O3#~G<
z2t$OJr~o%Db>r}W$TCq?dCLD`E^sg74zrM?4h;el7r3Xd0a(w*f1$6c5jGSU)K$&I
zL_N>gh#|Rx6F!vkU~HAHu?_!`jHpC>azlcO-2~=;>YYzu%GA`e*Cb#J@OIv=dJiDu
z1oOZkOJ~k0CFLOuiv)YapUkFYak>~O+!I5(*4|fWhNJQlear{M(O+{r#^S9uy;6<@
zk=`O|mGbTN@5gFzJXPRMWoLnx+wSmO{kqo<akvw1+fC_+!bIVpcvIt_bXGN=XBb?x
z=b)U<A}$cW`AWC&sYYvUwgIQ$&bZvL38oM*Lt~1v-iWb46xVSAOgKyuHd~l<F>)2?
z#0G_8q1)_24#!zrcFFNmIvh}sBBbd49{coTO8M9Ssr}2#I2OBNfaCoX7eoNF!Nr8U
zty)^>d0MjwdIOU|XEn3Pof-uWE?$$MF&7HH`=93c;t4$wCHx2!7MxO0I>At{1{$NI
zAa_PDsy1gyZN_lK=_c;D5*RFvErhv!zFI4BZrfODHj+lO=fapMIA<F9<&@18EJoZA
zHI}-w3k#8w@YBMQ#cMi=1-Lk{@ms3l&DON*c|>YxJDKGSMhFxc!X^f!q3<I1lb2(U
z(p-{jW3b2;v>9<_s_M+%s+Zil8mrXeh?uwZfEsq~LX-F=75!6y*K*|C`kOQmxt*9K
zewC7j0f1;*&z^f79u6@Djr;r6yHPPpsS|JLa*Cgbs`|55VXF@|s+ijU478O&$kOoO
zt*zIee6;%Re+D~V2S+JaAaqOJSWuG`YRRZut}E`zweMmTS~rJ8eqBEj=_J4Ayy*vb
zMa5L9{U_U=wK9YN*WIfeM}Y||@RABbJ~6_IH$w$hDwJtkPk<WIGwLJSkT5i1EH-Kg
zsHv};n)GPk#|}*(ceRH84=+e)?D)`+A=&w)VaX2E4BJK)8CHC?W)!D+lw|q?9S+Z`
z#<az3_l`Wn2vWwB(ZVg*FlFD84Ievgwc4TNYK>5{u=4~qhvXcSvO)JBo78Y%v{4hH
z6`xVDffQHP70--H4%JTT&=V9zy$)7LOK)QOI~LYYp?{z)@QJ9S0lT1<qrK^gfkz1x
z3^vsM<<gr)N*S%?MTra)6H|yiV2ERvV$UKj8cLv-D)SmRtd;Cm1q}o6U{rR&0DA*5
zz{-8$fBkj3Ej$|rFT{gMTA!*o71ME4x=bkOsV(NB47<`4ab*)R9~5x}DO==JIviFw
z{f05=&U^)<lvd!@a<Y{;Fy<Pjj1>KH{BK~%RKFARfq*{L_Ct!HLjb}P45$ztZq+{^
zl_S9Om~CwHd0bP;l-W?l*yInp^^1X_+n?iBFpRx=*3S~$Zp$>$8mZEz!~@~YGXlz9
zK!r-my4(`JpvBChipLqvwo3D;k+SaYfpKW9^cQ3e_#4#c%IUr||F?uA5fXnkC7swU
zo9hsO*C;!ZQh=m6<2seQiC=_RYd>|pu|u3uxoOSl+|+5r1Up2~g;SK0g*eO=uWF4g
z#YuXYFe9zB6hfO7svnlG6+Vk(Ip&Pldikm709d}jYXA!dBEEVO%FB^c-NhFm!&^Yn
z3_;R>2xu18*;m+kxr}z{_!P#gCe0DE{nMAYMTtQeY~8jt-&;U$P}D<0U5CE3W$uAg
z{_X#E{tJWMJ%mu?`-K&aj2X%=BKH|K4ETW9Vr_!#{)W2coI(2l1)8Y;`Re<TLoDdX
z4IQGd7D!FfrkxfG?EDoCA7wZU4!A%HN#jToAx^7xE?SbKWj{r!=p*7;K3Q|ZN@?$a
z9lLw#{87|;l<G4R7<Z3Qq|2uOxL+HucIs#L;_Vxf_;!C@&?<M>faaUgOHenVi@1;k
zk7GKAi`;6ktW#Xnh8{y61{7A*>~mAF!`mNPrGaH!NCGZ69VJZ?stF??2dot=S0(Fr
z@+=7}#f8;ML9tsDNrhFa+`LnQn7viln&8gZ`*^d5AqlwiLj<q&BLeY77<JtO-Zz<x
zLT`J@i3|*B?_keq1|fGK3oO<CLvm5swuYd<CLctMO3!pL#%P=33IQ6|oreC_LtorC
zyOrF#_Kl%Wy3*e?ht=k7U#&tjhvPCBaiaP<ZDL5N|Iy=v<F7=1vtn4-p&h*FOJ|!5
zM?ee;Gxb`NgzEAOda!y0y}7t24J)>y0b9h!Kf`%j45O3Z^*~1jE7d65v3OFt1bcTK
z23tkeD*Mw8Aj9wIZ5yD0GYS1o4lzX9KE%LM{kXH~zChRXVJWtw_|+5Kox9@JT-0OT
zhy5ODYO70}+bAp=%(M0{v^2<EGYkvYL7@SF_GklqnaHR8p&?1uIt>x5Ktb1_0K&wn
zZwwa@PO(V^XYdJi7r@}$7c`Ej>`tz}XZF9f%dJ@>foo6C1ZSHsjELfNmW&oO7K?Z=
zHO>=7f|bX^Tw?iG?2}Muz>uVYf0LlrBMcu9Q3+djV<_Pdota`G4*OJ26?S6zNsS<<
zV#`~lc5p{o`EygEqG;O1vb6#PL11eTAP759VRDio_1}ox>S`9x#cSinaB1rB=tIdj
zAmYDf8SlaCJ2@yE_&{JVbt9rJJ9YnY(4%b9Ab}oVmI?{pqOu@h-pOg-+QY*&ZRZiI
zF+R}d&iuZ{51Fwg?Isx8)=)hUzm~Z7*eulB*AP9H^l=?`%lov@Auy`EgOY79qNye$
zLEMFMNW*Vpf9^#s<MG%OKC8>z6gZ`6MkJfvQ@V+1huRw9XIG5YsNfs=efQL`BxTkn
zG%}blfyb3V|JmFovgy!&DB)_}cZi=mgX%CLORX_o-8h|2N8cAuRfAD*ZpVu7T%Bej
zphbD4>$IR@2B>OdvWU8~DMf0FO(ka#OW?!mIj_aRP_+=j<x-y%dW9s|BX}UGnBcKH
zWk|4G@C2}Vifh`97p!ZW*9)YyCG7r#pdDJfWOU#YOIL>bv`J8C#mM8)N(UAk;=8aw
zz4PWUE^7eA?wHMFuSUN9PaR(lSgk#X5f_OA>nb}H6Uk_2ol=rCF(_6^lYnFs`D`EN
zDah)jLve8(>ZEgR=*>CAN#j|%+0&HF)%}B17E?|5)kKKT)IJR-^*f;K5~eHUVB^CO
zLQGNtUL>iw?2dgX9JaANr&kI`8ul<aX>gc2+~dw>sk<9rl|nMUFu^6|s{-#h;^pqD
zaV!4VnW{LC;7)2kFOyIbj()^Co`n49r3-J|_seD^{7Cm6jJXu}1YdY=X@Af0VK8!*
zu9vmx!#3o8A|sbZfPIG%&Y`55xg%&K+*!bh)7XI%BbEd~5hj=Lg}TWmd|c=xTTU??
zy#7mERTl11+Z7vSx-pNGZ3K$*Lb>;m9M0^e%NF-L1PPrCDytbo+`3=z8xuIK6q~B6
zylSXn%E)nU&(mOT9C;Ah4YsYNZnF6{@!g{ON~6oC-`7*x>t1A?Z`}qh`AL<w;e<j=
zW~mUv*{}c=nVb}qvCOSdS6Y2{!iOcEu2%m)KTIXxL_yI)HX6MXLEyCPs$Gw2Tcg%_
zuMD)9E~=cVR-?xfup9$k+{(yST~~aV|6Eu2X9A1qH?Q2)JgM6bGapsPbS=AIlU)Rb
zASe3(wnYg3Jv~D7OCmkU;DGqBfNV|mXHto^Cx~NWOz_Z=WEN#6VM0Mbv00{#{S9_H
zG}6c$#Vn(MKIpM2#+TZS51@gBFStVs@ModRgucDHMiwhic!~D9ZJ=>;hMBpNKo@2%
zH=fvvAlqvU2Q{b`fXck~M_h1+A&Y&;Ex>>ApG^pYQ~?$_o-0u1P(xSD^M*!CF@-FF
ziQNZZ0PtePp+oB#$RiT(!PLM;;hB+Nbx5TPz)(fT(N=O_F)2yUPOahB21l*2R1({@
z{o!aVe~b(&w>!a?1?^+AB$>YSktezw{gmkhen66<j=l}njQ39+^pQ@I$18aS<P|b~
zCXb>*=Cr<IWSJBdVCLZA!%k-rsIh;-8itTgm}wlFNibPKkl)_sb;$XJcN~~d^5;OY
z33^~;^quTqFzKksw(Y5lqO3PIn?jvHEAKVgVTkXYS!Iri;XG1CYd!l>c5c_P1+h#V
zI>3+tGHkn+NHy-(24X!2gUR-)@x|z}X2~l(0172uu^wJ;Um8#9(Jr225b*~YpvMrP
ziXx(cgJ1Prv<#Yy_&!i10Aih)e0Mru8wY*#BJDhCJOU9dhr1sanXUcVN+EMkth5sn
zF?-i@5={7wHRVL%PTZ5>51bfJUgy4r8rwK*{PaJtf&FI}j$c3by6xzR$ts(_|L$|@
z{FzAXsDi9~z3#X#@FAc7m_rh1!}DxVH!7UtBJjf=9>WMf9O1wXg{>M4NSCqkMsv*N
ztLP<8U(sp2*nVw(p`7n}k-R>ZK}3_;qyhsLc@B+*4!#QRt#ISaL>EC&@#@Ctb+*X+
zbzf_=1ffl7<_qcb-Y)zGYu{$%)#Hd1NB14p9tcpVvB`|U$JpWUha5=6k##E4OzRHJ
zDSX6sIhbv9l-d~J^a#5h!RNVBjPb**kh|p%ivV#Wk8}yFR%cBZ*+)KKi{MJz9y+l`
zf_s$Lnvcu9m!DV!LLVFzmA6Ar(S6D41&f7hKeqN)auXZZCa!8|Q&BUCnx7!RZb*yM
z;&0mx`C{!euU~oXs8kbKiW!z_Hv&+ZPddGhB0=SkMdFzQ?6a=)Guv0p8Bg{N+c%dT
z;MLLj&%U~*cH*0g2xOT2$%_7*1Zyfj_@QxRyDBkM*zlOVQ_amz_xNj#7#w5i3coE~
zoL0uSO*v9ofS=pGz=yyJZeav{075g3x9EaLEDQRX2v3(m02&Jm;KWri*$@^|ns4f|
z3sT;B_O=&N3M+iiShKqXGfY=#IU&VxzfXyMT)s1>(|G?dvI^e}<33}LUH^R>U&H_g
z*b;mVYHX|^Hms}dCtv}Ef6Sb_Ho8P2i)Rc-)@+eJubD*p$T)z4dL6!?ZE+1R22`4L
zA^}{(Jcb)M$&BGObLl1Y=Zg~?fiT{vD6;f>^RJ<eNG)mgBB|)uMVLV!iQwX2CLw<<
zh%fP0dZrn7ahZW0odE`$n{m@ZB%&kl@Y0vL)xo8CrGguk-OL7)knN%81P)8)EqjRQ
z?)rubCKMPmPM~yy5p~wydBl-w!+djYB{0qSGsUEGgh`Ce5)h}H_ZPnuHPL;ehJ`|q
z?>{}QajSZLmT)|GI6O0tKuL->b^c|=Y;WT!$_tb*Ps|eFVSJiiY0CY|89r>d|3#(*
z(OjnL7hi3U$>}v<<4DqU6N8s+?dg95tnnj8RC@q~(+R*F6=|3Si+0eZIWgGyy*)BJ
zwBM%@Dz}MP?72D$_hs!>gg!XLG}6@z7HP{vr$RnJi$D493Pu(fB#OFuwf0ixGkv2z
z62$7U!u)h5PM<b02=pM&iHQOJD>n&JL_n(L&{b~pZz-DFcK#sbxHnV~tiq@#$SK+g
zoJ=1P%2Xh_q$48{xVUa?!14!!I4rAp->$IdHNTn20mW{Wki>8HR0jB~Vz!UR?^p`-
zmb}7$ZcGR4mG=wESRk?NaHcc86;|br1%(PKa*BuV{Z1OegbcyxKi0Azl7fXgk_76G
zaj@k?&w*9flZf_sux^}fU3QIg&)~2s-+~=mH`NOi8Bq8jZ{X&~C?$4$&y)hd9geV<
z_y^I+0hj+lh}6$?AU!K4T3o?sJc~QYY+-;*4jb1aXPTn-^!{32Wj`*xy+P_b%D=1w
zI@;K*%lzd&WVT|Pb(Gb8mbu7_Gs+avnP*2kY?earCZhH|nZ=mJa1RS~!q90fo`X)^
z2rtq%;_v0fVbQcJshhFxGD%ssg>DOiGV(rJFN3gcpgg1P8AXV+TEdjQkbzCnBqVox
z0Mr1YwfX&dfI}}0y}+BY#b}%5V9#2ui<o(fJ03m}u*)~dOy<_wF~ONk<1`o@Y@8hB
zt@^M2ISPxEevo39GX(%RyFff>w5iG3&sTr3cEr<W_9U1!>~vz({QPv`@dukyGv`8|
zbt;gGv8^=tOpQtvFb$t({FU>}QK&h;dUD&|eVq_y@)^9nVoqaC?W$puGGx=bHlIQG
z{@CK2e7ux4O{nh~*fSd|%svJ>NV|XkfBa)7;aBT9B{UJ#h@j%BKv!i9VQ15}>M8)>
zvd=7O*8I_y+EZs^3j(|Z8S!J=*-9KO%zs@&k%pc&>GjM?FP*N%{?!VC5GVL`TU|fx
zwhzq^Cbt?xRawgJiemWnP0-1}P=qg-q0H^zgIvJuOQ*$`eXlc7zBe=|&Z{B(OWeP6
zt7uU|)RwlMF1B;_teRBiUnmno*>Gcc<LI>2;>WaJ$OT};<S9$YIfe<t$goiU+pCST
zDww986ivpt$$W{qXT4@8{tabrO0>ZnV5T!8%fKfaMpWyirVLS<?Ma3{PTxtJe&U|k
z$>^bLm-5A(jFc{OJekWvWJ5)Rh-flEgyloqN6|59%v)Z-2eghM&6t*>rvh=no0)Ez
z*@C<c;!4B)nNh$(nC2~Ct(Bf|%V^V4y8S!39aWNp4gfjM14hoEs=WpkEB(R@Kn2F_
zusa$Ux(q=iuSv<GN$jJZZN_t%-?(D%qDePqDH9Cg0$U}c8~>Gg@rq)^p-vy>5`cz#
z>uvY~9Cv26VI|s{6%61yJpR%L26kKyv(=G`B)<~uzCa$inFh?+lxl1W?%9;Ijq`gL
zukNAwr^~_Cd$5p5Xo(Q3m5Kk$b?6S5CCBa&w;#xK7B=~1Sn|8el$uax6@!SI8;WsK
zW(KBtsuY1m(5;(W=4=m91~Og%L`1Ijwz9`w-s^0@1`=l`WmN_dWEgM~i(Y;Nz`zoW
z8<-P<=9rJ<Mq||T4ujr3f>v0)G3YtG2Q?bXww-LPXA>SiOuB!Wkobs0Ag$E9{1XN#
z{YU9SW^w=|@{Cf5*1zY=Rh05RXtEjtPn0{w7!jVUStCdA?o^o>z_63at~;kts)!x`
z!$2@OaQ9q@5+2YqaeghIcm|0b>zCrqZD^7FADlVLWy8!reVJPANIoMB5>!oq1I$6!
z3paQl^!VFgM?Qh<zGhj(6oe~APp)MX{|#rj8t*xAfJtfZoPux9qT*D>H}BFkf&2KO
zFH9V~+Q>}_OK5xUBx!_2mpzWS<MNXGxgkOv8zi&8aUTgS0y1c{@iP<BSX}ZV040rn
zYRyBKpXC@xcZ@Zg5$&viLabQy%tLN>WsPCS<;BC_<&7S5hUN#M(8A16+aJOPApbC%
zis<&b8I4!WelT;CoYI~NHUL;PGYBgl(dachPKZ&eTw~F~dg(WEC_BKy2VexAadAfA
zVJ8-L@bUNyPRk+o3JB8F*SP@a_6>MIHzGOck(vVr$+!IJxzKO07MQ{M8;gxnb#_Po
z&gCZJK6sFs>65Mt1nBbI)DQN){&?V_?@`z*<P~$lBdr1H`W!MLpkc1@ey+0sfdB=`
zBwuul%^1*7rokC$I}ZT_Jf)NU4TKXOeDikWnSl^gn!5@x!wQXGTStzGIuJ5O&8WMb
zy2=**nB`6|WN|LF(#4t1{2iHl%_c5cm_bc#v6vtEbXhKHgkd;$vA8x5d4#YZs7uYj
zY;A{EW0nznhD4J~4uMeLWsOC0jG#z@&2DYV+Xy6KKB6BXRGg+AhMqYf$qhYn{v!Mn
zrwBjii8M1fuYWCw&pA*0mT_fRkM|Tos)y(*sJhlr{tS?ib>y4zaSa5TSh&^&AyOi}
z-1g!%{V*rVAY5@OR%V}|vpYcr69RKV5u^k+Uam<rqmSTy8z2B8hLmIT(=1#V^_t12
z)sB;6u3$cDl9U5Cbt(pG=$s>Vdo0Erua-fX7(o02&feS^#k(vPj$+T%m^Q-in4YuY
zqMLq@Ywpjmb!4mQMx{BAaT%NR#i+xEN)dDSzqBOQ10-eat^~RTgT;}DcNe1v8f4y?
znmqXugTyvK%4OZUm6WyE#(+RcN{*95$<bT|)HtnQPd2dvtv}w#q$2093|8}dcB}v^
zI20ngCBnobWu|S9#gbFs*XrY~)42jTRD&%{Q;R7r$|s*D73&^OuLx;`(Jp*zjb;-a
zLu4r^bN(vqp(uqs0J?!sw<OFIH&<jX7>ZKfhgJQh{%BEMl8ocWzy>?}Lbd^IM)r;2
zEE75%0+RZt^FX33Wv%iJnDB!RQ(Z49U+L&GIK<eGL}Z%q+3LLNq&8dJiAX?>r_kgj
z<A;Ly1Tq6t8qUDX2AxrA6r>a>uuL-;{Tgfh$WIkBr@8R?#!u5EW<4N4x?}p1^PTMg
zqBt-5cM%zq@hS7oSpo{Zqz*jF%H@ocxv|N@5z%81S?mZ4h9s~B0?s^Y7atk1v|S&0
z^`eF%b}%pCE8u$nxIoO8p_W3kZc*&#071QV^JI?YLQ!k1+%zfa3m%JuQElZib%rH<
z8K4gql4n<jZs8dK9#Lfup)rZDA~S_RM?1<x#<oAea(wTEW+}F7>}d>9Uzo66&8P+q
z6#l37h?{G~I`_tU;H-V0BpF3yRom%G_7roX$;E&*O;nm#IrC35V|_~yA*3?r7Q@vz
zq?c@O68UZ5!5sDwg&Rv7!7K1<=U8tf-dBzXS<T#;roh-IU#&U^<F>%;A<%>3V=OTO
zOtc)@O$sD1!HGy;jZiWJyuq{4{&9@y-J&uk6vh9fTW}e8Jqh}KbNkxc2A;9`-$adU
z+XAA=c%Ub>0fL9WU)|maerZAH!FB6F&+Soi8y$W3-OcN&S2NNP?mK0i+}hXDeog<Q
zC)b^Axe!Udo@|kA;IupiM<2~cHRt5PndE<Q$J05I4KrHNsyu&Z67#d^I7LH%_A+H-
zBVR>3HV(dC$_x(*oJ@o{&8nn`GYbHIWoDFYT_e!ml#f6nQMA*hBDa>0$Dok-uaJ5I
z$tUVa2;*bHAV{}&5el(f6V<ofjSNA%aXZZdxgp%lAF|$AGEj$gt3&k)DTB{rTgF^x
zr!hB&66w>sFrU2^+<ihrknwXAe&<Eggaajo_m3T!48&U_%p7%J%pALvl401b*>nPI
zun7rtOMzGdA|<it+Wm<%gc%88lz9<jBKPEAXv-6+GNR#!nF8(K?#P+Wn2n@GiH?(_
z&70<sQ{;3L%CuJ4wX~pb=piuEtmU~nv>$YMpv4J8?wu<PO0d=8V{;$l%FCgmXzF3O
zLgQJl6-EJ4CTOxx5-^<Am?Tj}a**?&&62Z%(ZZ!L{?PmagBRs1aNaMn6?FvC^x$~9
zGt3-@hv0`%K4F_5POkX?Fj#T&+v|a>wiE==r%XMd&03paq+xL>7W);^m3Rk6PhU8k
z37TfZ(1N#Z@)vSDo23n}0CSRN8J=94wDjBu2<Y{U-$>$9rXbx1tNU<kmD7aRCZ}(O
z`pgr6A#AT`HH049pGRRCv(WRHgd@#ILqqt|Sa&%IAf!g*K+~pr<StBM%`SRnLasFC
zqEO~?57Ui%2i6lgJOg@5wgP6Fx+qi32>X0H%7khJr-M*Ogl*ffM4XOxiz_pa8zKyH
z63(z`s6SzjTh1YSi$s-1b1&GWBi_tF#Ni<9oZJe5!I1(BGMJs^WrI2-0Kk7ix=rX-
zIcgAZCg&N*9A@LvP6+8(uv4Kp*W(6X6}E2Gyai$#Hzyu4qogtJnnA7f!?HZdM!p9&
zaKg*K5MrZ--J0jWGqVL^u8EmtkqjC^k<CJv5l_}-TmIAe8!z(^vJO9ZZMNhIYQ&SA
zG?MHOqEcp<IG%1`w6dzNFfd^W{^(0as0kc|KulUy(tNO6i*IYiOkhhemz>qWhAZM-
zlCmoNefyr!C0I3<cs`CG^)OKI8nXZp*>&lB0*CW25pkY3KN_P>lmU!L_3D_7ND&V6
zj()K-0+znv7Hql_dyc1dC-|=a9)BEJEm)_a?k=DpY4XS)W9||1<dnaKUjR=6Bp-SA
zyNVRv9xQ7Qz>^K&DUj<8aH(epF9MLrNv%atB7gCn4QLKxHW6O=kHBAWMT;^LxxO1g
z(y>`)|25<Fr0N&(?a3bTX;P?I<`<e_m|%8kWAGVK&aumoiA1FZ)sEDn*$ClY=ab=f
z$JS}mD#F;09_RKXf8k1iW?T#2)XHLDKq%(VIThy26vt&AkMc&q)vR&?0I+XN4D&``
z+<*A{c<YWI{py;vuT^&bC<(I!PuS8Z?k+8``k+u~Xy{w0z?8t2N*o_r@^GyUOFDt?
z&Ezt_9|PUhvic}K1>^5JmPMr&DGJ{C)ZRRF%o(1|p|F$r3nUuL01B@HaTi~y)}uO5
zv-t00%|^;;2WYqiP68N0>ODk#)B-w9#6N1n2O*<cjCVIvLdT&L(j}x{b^!naZ_uM0
zC<?BeBU`2jOCjTV^DZY~Si)5=YbigeG;q1F-ECINjL;VO$(99{{we*No|MJ;d$9@k
zDGs<yu$is?QKQ`)tp^5CCWS~IDjwkn8$)7>?XAGF5J$XE7|00F04PSXRGFY~H)C>E
z*yNNT0T5fC?h{J5%{<!jA=3Q;km<1d5`3HA<*Z<kgQfF9#3c-3v?{s~-mcGu;LseV
zfKbe^vdQhXu|}GbR_eipykLiKA+jC>VuaFU0W@)w_H_iKW)zwYW2?t;m;qTYGd{sP
z$|~lJXdIqlIWD%<p9Saus10VtLmT2}#n1!*3W4S^5!j@oX$y0&WE0urwlS(5JhD0i
zIO<gJgWj7^G_jFY@HG>AD3Ave3(s1fZ{3oC4Wt8qZAPM>Hz&3CEr?zM<IswLSAmz0
z{yKKmffDb3I(m<RQilt5LA0@L6`2J1Z>Gqv%o#pmio)$h$wgTK*);rM?d_Pak+pfw
zv3M?Ja*1ZMO?^WM<d$PP%vE*=_%*wdU;IDM6`1jd8IcAVTyC6>4hyh6`8P+-nA51n
zlnVw@a7G9#Kb-0fuvKZqfk1;=v!|6QE1uO%P()?~4j=^ifR>R0o1K8{`+7brHz1%)
z29^_}>j)s_ncJPpn*s#7;nd~_;ORqK=aJow4<bS_&Q@o_WPONXE-=a1=H@=oRu3^Z
zfm@Nt$Zx-|LFBJ~_uW7JR|=8AucmYV76=yxO~|hg^e*;|;uIj5jHIxCI7hOjq9wKJ
zQX%JpJ`;j8YGiSCYd&QsQ{&MdOk~JC4xMg_sX{s$3VnQV-o?^Hx>@<hZU@};Yj5Y&
zL!S@B3qH9E1baFhRRWFndDx7>O07_1cP%n56Gu7r)?z7@>|$WX%kO&&Hy*Pc(UJ`a
zQ;Ni77w0*?8J2M}ljq;l(S%AxQ24!}#ZIM<DGcl@77ivy!}UU1oaQEBS?2naPubWc
zN{q*5WSx5(LXL^1dWReb40{@!Hjc`R02DUd4fyC3LI+WsWxf8S>&ADhH!-0Z&VYs{
z0cmOzq=}L{4P1yCggrzRazvhSe0a5)Tb_yj3jWVo=ENHUS|@NbjPU%1RSWB*lS(OL
zmXSxU`9gA>X-MN7V-c_KI;uq<d%lz<%Aj~gOm<+EO>sR!nCji<zi)z(jCa*7kbd9a
zjB=Ft@y8o&chs5YKqmM*!(owrf<kWk^}eTZ;~|PMV?Aa#wwXC<_DknbpVn0`Z%ZLC
zt@>C%HP7%;cX0wmm>o|Op`NZbKlW)wqEY=bnwm5(VI2tJe0DS*<BK+J#M&|903x;j
zv1Qc)xJ4d7ttKUb5k7@I^@q)lml>8TBGVr)sZ=(aF<ohORr?wT61@HR*c(M-wZ|(a
zrIBjl1}^5frrtcP@Ee8OpSHuuWr;`}0Mqo%D7BytZqEa#g7hiL_!pP&B<xab9ae{C
zD7Q|VmTGZc2YXI4@JKVdZ~qXdgJ<?n08R{5eau_%eH{xHTyvB03xX{tlv79zaMn~z
z3g8tD&OT?_mBkAfi#U(-SQ1mvfC(mVvMI7CPXqOvf8F@x{&n(E5ty`vM9Km4Q^4%h
zrVokFa|kED8<Wx)^A=B#`Ay@PP{I(T%rNNX&=2MN!!s8M+kB)s4Sp}oSFl!eHOClM
z#QUut=haHWf56y64KB=rF);4%;237@bD<x?1*R>#K7@ywdsp7^05T2`_;P5CozZQS
zT^3f3vK;7^O_~_v;%2A`J}ix9fa2Pnz%pI?%cwtYwi1(93Mb%&99)a4Wb%+(-?90L
zXKf=XM}E2EhZq56v6BNEs5;1S#jT9Yd#s|qvhZ1?^9tA)c0_+plaJdh24}|1!|-BJ
z!y?eIs>xAcrf3L2ePp%;CX<!WSycQLlzsL##mt#)yGja^!J9i(Ft>^InJixIE!gWU
zDPU7lC!}bs;r=GDxk2#hjY-91VKdLNC-=uwmjf{Mh(3s1U=&YM01lAhFiHd4%*+Cy
z!Jx%7B&W5eEeSyaGX-mEO~^nNkebyjw{k`xrCT-~NeRi^i=2HLAWb{tslJaea4H25
z$a}%F&esIZxXm~x6s&zr?{HcUzP>cyy0dO$KxdTXs9Y&&fjPLv%1?XSJLVw$_I^1C
zRHdJ8Saz*PV^4R>TQben+>4B(u;sT%yvc$$a}9qGO@LgMUjRN3aE}HA320`BP6CSu
zzamQnz;z3EoNNrXO$6J=W~y68&4@P)+I8g#_Xpvk{TyJ?W^1iE_Ozj+5lo<W<0Up(
zg<v5iCO@Zr%~cxj<kdzsdMLvUNi4e36ur0yPadG!CN#Az)1PUI$s`C|lUFbP-goA-
zhx#*s$?SkJfYns9Zm30Zhj5K}DZbZH_44+I?$K^3<lp_P=l@ZoNp|s?jC54=Dz=B1
z%07Btla?u4JV$C2c%hSf**7&5<C0Hkp~z0bazGUX7UjZV_JRXq4kF|LAA}NdOboL5
z4EKU3@h+z>7sT0_Kvk>B3zNg;!sB_HvTC3CJ8^{aLV#k`s|>sVSxth9H&_W6IZ%<y
zjuFZ{7f4Wmmg!SAnz5GD`5_3a!v+Q}^gZQF7I-U)6IP2hk<g)JuGqMb+3YpxSa&mZ
zfr=}j4b5+1ul%NscMj7ub}@f3TIyM`*7ec1t5?+#Yk%PBG9AS`K@g`xoHLo5EsvTR
z8=HYvP?>@>xM<8-mXq%Q%YryQpu#*A`ifXTBl_MrBx12m^Uw|(i}X?<5rNA+@sC;s
zbhEY{1mP%=YHbF2>5WnT9^I0vR)@mEDq-h)jx@|7UG>_$X6ZbhE*ui5dAe}5lr9V4
zd=N5n^ruhv!zi^r{?X3DJQG#V&H@q4?c3YT;te3BaC1*h<bbJ+2*7<q;sY<BOGOsR
z-P{|>K>10fdYB0dg$LZhTt5hS0cG}CoZAD!5V_XW=Zfs2aEbw|p~9IOj8t5*PlV1e
zf_WM*69f$%8dV59KuvHIa!|w_FlBghJC<Q&wz11{(JXU;m6}2A0NK7RxuP)v9dO5B
zb;;m~QH$vfGH@2aI&xcXg0v`M-r<aduC$3yNP;<lr%4$H{W9P&jy(`LsOhPIi$eAU
zXg#Iq;8$Sc;*y$vz!>hB_W;GJ>mp6gFky_I1tPca2B(Y}#C|<ra#Y}`i?sfp0A)Ul
z*~)1qQITsUPkFu5sR+oy=k21Oxh-sV?<|28W6?UWBuohvomZzg<ro}Q$Ch<B(wstm
zM7uPKl4(@1rG%R}mVhjC)MFysY{OKCYxRvzw1^<<8!d49A(Yvza*Y&6P;HoIj388g
z^BHz-xQ5_{x53X)p*LZ$iFIsIn3}But+VU|=ib&yj0qt@+75Ja<l6MDbz%?o5VMa?
zWxRKYFW6F#nHV-DAuFK{`Dp-d*I@G;Q~@Dn^l?SYLj*@Ux3dIQdSelorNK))p?wpR
zmw8L4ZB1~A)6wE`sz2?kKYzy1?*?~6TpSD_ZJ-m?G?dx^hK?qhuuluM_3N@*?3<|k
zw8sqMfBVVK8|G?|2jUDMVfHwk^(eo(PI*MAsT4?%g@X#kD0Y`dG63$t=NLMk<NOy;
z%p|5QkEEM9Z3be`P8UF<LeILpN{Rfs>ck%<@%4SH3^#)Xxp}VfMketF15z0KUxCHa
z2~O<doq)%K5PIg(Bh<~j6O%I{B`-1NY|`bJ*DS+9;*#uwpcNQ2XJE47EA!PHb#U?i
zy9tNG*UN6wL0JX>RfxI-fapf1*ZMeYhMBHCvFW(Vtn)N9iyL(6RD3hTk&F;sHoY}-
z+&p98bptc*Py0rUKboaNmd0>RUItv+mGPORrJCZKur1Wx&c<g#6RhG_(n1$aKPXWG
z4IFmbehQB3&SbN=ym*c2N|KdkDs%LOw>PY2%({-3uF70`03M(9=nc5}_QZmQDX%C2
zrt)z(43eAA4P^F_rZ3qm_DB1;^7X|-IQ!}+TbU4#ezoe=GYpLxep+}p7`ooZWZ3!R
zpRIrGsGs08)G>ASEo_*8iu@vBaUdEK9AejQ4PbotCS+Yl|2qHbnKzsF@+`uD@_@!$
z$(>yS7E4sicV<X{-ukbNjH{J4H4K3``cpZ(HB%AzgR7#tLE)Zb<C33%qgm6k03|ll
zw(}&hcX3gQJOxa;OcnyDCZ#J<h9LY{-K&b&aT=5$u5jQ%f~O7PTGwQTLB8%E`S+Vl
zd-{;!OF?wqGh?FvjIrdx_!Dz?Myf-@%wyyP?J?4D&q%yQc8>Rj2G6`60l_N39R3gW
z>hyj}y%VOMuWyL`xsir5wvrU25f+vKICD<TifN$A$|=r^O!;!y!~|9v&%CXI+y(hC
zHn)q6^g#Dr=DZTq*Sy!P;SSoceFLW06AGHtz#G{jO8-7<wmsNKsaGIJX>`j6H5q03
z<B^jv)Y-FhK7eTf?vJx}rJC`L#ke`Pk@$}Q1e#AyGm?xDe(o|ag|=Y54RFe16NgG3
zCOpRgOoN>kQPW}%;S+(Gu4h?j5}@KEw^^%|hbgKR7#kSkfU#%Ezfl6SVVv8No%+U@
zWr4!$*=v#|6X2vv`giVcR*{Z4T;zu36W5kg93$gFXY7M`BmjbQg-6_=W&UvnG#LN@
zD)S+LGdlwEP~!>MG|E_$v;EfPu!cH!R~UeNl$%=yLd?~nADL%DlG8Gx(`s-|v;TTa
z%90!i5P2>fv@zC!IU;FWM39U;0|%hgrPzeV5#X#FlLdJ>WT$zRN=vg`1}0I{3XCDw
zvXf_YAPiXs8r|dvpV*1GW`_f8I~nuf@!}N*qi&5cnfHMziBtdxpewpA(%9_36Lw<_
zv4BZfLwtntWVnqZ*(D|bX1)zS4@sfYcB~Gf=T6J8fS5A_TRFS2ATn{)tvbY*af~f2
z0*gddVy0jy<JZVc?TlOXAq)7?m&p8aOI?u&qnsu+M=vsg@!yeiZZ?t)`ttVw_WBow
zx;eVBmLqK#ZP;u@gTmCOY)_$6U}%c8hQX%{!{Rd}$C28jb1h|0zxtdsF@&#z7{N?!
zA9f1PMm7&%0$2O}!I>NIlkku7L(JjEL-Jw@V-u+rf)8;^CPO<L8Pncg!X2JpNAA!|
z@&;bjzSG@vT#cvO&;~TvjTYXxkC~3Qli0?~u{*#t_K>8&1wYdXHmAsR$bZDwW!pGA
z(J1?dW%HOkmqp=nU%)8>&`ONkb0T>}=WFVoBy#P0tC;?VPImX4p;eT`hhGZgKm^=}
zCOSbBGAd5$oF1gGk7OUz7y7SW&{$?0v*r!dZ3=J%R?$z)^RAHy5aNa65VMOIEnorx
zMq6P*Uc*($m+}l^ix}B?Ru^!yOG*}l<dRje_BQCtYyKI~B!n#;D$B8sppkuKk21ww
zUwja&`oq{O@Co|y%URTCWD8k$Ru|#>ta?=dDwrehA^OFAS8T+3fpJboj>^s=xoEQ<
zTfBTb_S!2z8T2A<H<q{btk7>>U%WcYO!lqN(W!=(U2uKW{(dlO&FL2GdJEVy3_2#1
z{RUI0gOe}5QWrMnE+g1U%80&ag&=FR&U7v&Hp3c_FJaJ>SepTBx;02eR>WJ{KSlr(
zI|(3-777OvIzH#(<8rQl)PiTdQ2Tz14Qeg7eLYB`{A26k4KL=1ZU6v*!P@(4<X!yu
zqZa;d-W+`|>XxSV#k${ME{h7+yh+f)g0T2?{$(4kbF7*_Q7Gwa!4CKTaDNrwjbPk+
z5>gKw+OxVw=%-IJ1T6t%4Q0};go0B@W?k*jhHglsTQ!sWj7UYzO#I(X2DOuI(z<x5
zSjh_#z!(BSEIbhR@e2?MV6+G=dDtBg{(p?Ue{@uJn(mu~4w^uefr2KPaWqIWRYF+C
z6tpAuOac_0R1!=oNXHz`8Hk!wLG7b5()Qf>kwA!2L_35sLLuB3D?x0=1CpL)&Yimk
zqM=8+b2|xWE6X)Y>6V#hxU<@EX5F5?bJn?^=l$+o33i`#?jH@6`mt+QVdvS;kN0^6
zR=lJCXCON&#zn`%(dcJsXb1&&^3{ZF!GQ+1OeYOzY9LsVF1gRe_W1o?MpBSxd34MP
zfshzWt#@L45fA~=Kz8?(KrfUB{VjAy4m=5qD;l&6AyT4-pay6b0>i*Fj<j35)`EfO
z=u;RP+-(50;-zh%=6ai$<t=OuDmg&%La=06bt~*C*RFd2k>a6*vgw?Vl7$I+<+3Az
z{QOg~&W)k?+tUmCEd^L!D+Q8&4iC#jxAZ0moOg}2l5v-(WuXgY6#3N&jZ)zcIHNd(
zs|a1!{$VQ!0`uAvrW4&cU)$w;9UgvAS-Pabg&9=pcEk3mN#(P&CLL~4vZ8VOUL-pu
zHq?AT%3FKtYb>C_6W6<zwp8dtVGd0XsFNCo1<dfDKshnFMKxdxxOBZ7)FFANIymjm
z^iqFEcT4G;1Ha=Va7>O>D&Guvq45Ev{Zi&{Cv-2!uoaX`^pLSx$k@Y6dd0Q`qK05D
zZ)ippcer()D$wRteAQae%!KgFxD{!5&OX<^m9;{oi7as{gIz%+opex3DvdZPwc6pH
zfyK0D(^J<hR6bu;5@-O!0}ciQq?XQdG2kU0C1U>RMjELT|08Sj17knXs8fs7Kp_cw
zUubk_fUfK##=KUw@9qa?E{%Mw%*HR`U|gp)3n>_=T2pItSk<1iXd&j6JT$ij?kutO
z%5XCQK_?jkbh4;;pEv;a?9c=;KIA|wuDMCdNl)NHi5)VUEBSHy>Y<P_?@&N(d^o4D
z`&`cCBTY*g>cYRQ9~DE5`_J;5xb0;YG(0Jl%&_r_`XRK9!GHkpbJai8a@+7OQTI<w
z5JYN(Z_S0ydEV7314O~}&Zg}^q|QNMbP0)@=9;}GI}8{F6jVB~nndBh$t$DoZo^^g
zFIC3Su{eAxp37q*NOtSqB8$dXF{2d&i1g-)aX6C<4Ra={G0Xp&{FO1f$0bPW1#~x9
zwu3Wry%9i?u`&4EHVB{DV<L~Jjz;Q)am-GcQzm)`+7-YWg@D3BP5wIFQ3pa$yh7og
z9`<ky&?-VK#0CSjxHD;5<>wihQM|6Y;C}KRdnulXkXYQqnQ`9;vsth{-rDDXP&P6n
zp9}Gth)O<r@}v1J>$Qca3%c}Bn9@=b<?+@Amg_KB<&!T4t0Wq_p6vaVvc3)mZ2&lZ
zGryP}mQ|g6B&@t5%!~YBE2CRxka3Jh^LTah-y%F#KeoiAL|zsgJl!irQ-7L_=?GlX
zQiSrudb;Nd0bzVH!5-1-hh(>Mi-qO1C+ST?Yq4M6lTCfv0`bX?5RKijpuONw9{Qm)
z$HbHA+cF{ezzZ?c7X@9Yh7P*83aMvq3qE(y?gkZ+77-3XLm(^~s=!L~((xdg4G5Rq
zXYSW-n;LE)MWR$9luEwZK&&(72DeVI_ea4+tq+3x$-o*?svg!QwkAS3vb!I^fwjkN
z4_ywY+p?||SiCnT@G?O$^K4Km;1judykuOYD$dRtN{fbu(y?{1M3!D*7zM7V2bO#x
zB+WTzuFQztZDlL^dx0m!!YCEt&@0m803q;c!45z%8-Q}1tGHh}bSr37#p1WdTB`AQ
z)woUZ?xt#J0I^i}2zp#;_fysFYPR6P*cAxZxMa{RqGoe!E;u4Xt?a8s>+~kfM*(O&
zm1~LXCAf5Kc5^7YG4zxSvP6rR3)too92VDhWX;9T1rnqSd#!n>)KeGns>o|h@f-U^
zr4XwjV+X;M;Hh~vHK_tE0c}$paU_|cb@G^MQY*`qUH<_AcOLk`HWL9AmoG%v)3Q(o
zdojIiNLcv?-Uf4x`QVDk?lB_tKIs!;cxw|l_w^gw_wJ^bbz+Xi-wy%y$}|G8FfN9;
z;8KQhqIJSz+W^#t|ECqyP$LmTFdjYflnZy%O>6xrAh%t1*xFo)m1GQ6b>z^H1U$<e
z_+~bp)q9PDXvWMWilUlInJpYVD-~15UWN9JmP%qAN$M5&c{0Xa73;4vH6y`$3%xmF
zKA(&>PQ)+av-LvOoU{?yRCy9q&<Z@qIals(-^u9hU%c^qpYFo^;<tSCtdbZ3bxe$E
zI9Tk<01b_?al0b(WHIp2F0@o;Y^#B$_PA|-n4sRss)mR$5`MRtD;S^sjZI0B-xmTz
zb?pVv5c6II(?UC|h`dv&bi&0-vIn-@E(eXm*FOYqvPsVWo936vcEH%ag(0<_bw$@N
zR!EC{QkX*ntIN!<vCyRXV%k7j1uQ9lC=4V%ua5`4eCLa3!97V!2on4!<Kfz7Wzd~d
zdy?9f6wKJQV}pBtmF)#M5wAnfI2^Jlzxua@opDApT@`0vjk0<UyX|?>8)Pc_hsPXI
zqFGi_rCu05S?XsG(JIM(D5l>crwsB$x^aVVm4#Ejlv&gV+Dd)AW~2?>&?%A@l?1#b
z99n$DqiT)~8bJi6yhAGwVsAYB%3T(Obik<h5c8Td8}4w@pnHa!E<*y&#l2jKD*8-}
z1R@)zjsVjMX|ndPiI(&AMBQ>2`1N{Cs8y`l7y14AjZ8XsgP=`68QK6ihTA|v%_{4e
z(a;YW6x#y~-i}21#6sJFN*F)ML|C7dd%ySUzDVdFYXpgNkqXP^qfmMsd*K|#3oon}
zCK|u8Fh^Kwqj+Mu4Hy^B51CMzM6^7=egR3_)jcjV!k@#)nc{$jI_mo7zm0=fB<?#^
z(b3}xm+Fm$E&{c@t~&`8tmM-2F=!)9?hz~PgVoU$<xXL>37#&%GJe`lAygoPt?{Ac
zUSc5x?ejxpy+q_Us~*F0_xF+qIjEFKegj00+#hTWd?Z2tObyWvbu3BPtW-Kbi=c@f
z<u|q(G8(bt?t}0N!iM0CM?H}9Ogbz71Ao3>x=$?{oz>teq?X2vf&5&Mvno;s>%)!9
zQM!asN4tUN!3}7P_-|eUGRdTr<jhD8N+cvnq!6t6CRs}4K`Who=>iYKNU`alfp9e~
z^^<}LM=OV&@fV0W*|JWt6n~T}qhMNw5eS80X<I}RsF8b?jA?$WmNzXS*FKQmO|qUt
zgG2lYC^4T59pkNeALhy;H0_<uT{@^5KaNyvDy8!K7Lo_*nN{{!p#ao91yz(>h{f$k
z8bP+*Xp(L$8Jb7Fktc$Yw&zIJoZCIE-{Ryv_+2XRjBEKYsl-G*5*<+G9?Y)~B#nPD
z!lWIfMs#k}Hi1ag#9k`HNeM!<cFhB3yzXy1d>uUyl0VIpDr68zZQ~r?5)x*sLAOLR
zjn>Hm!}JSWzniBtEU}hX_?jz48ntK&cOn~d;>Jw*%^d2m1HzUHwe(0?!VfJTd8)ak
zqFy<DR@kxDLI}p>7Y9?%U?RFrPnB#65ra|ELQYa8?agxSvW%m|$<T*$NWG9B;Uruo
zh6t^qkfM9@<`LL{8q<AFa8dM5bN$;0=!4p@PZx%Kjqgv>W#BX*U)OrI51dBJ%o*d%
zbV0(0z@oF5rusC9OLA(8mf*%2+G$?eue*i30+YcxS5`vJw3l`Bci(xutPCGbnCDk%
z98PVWG6<xn>6%g<-h&L7*;<RK?XG`TYmFd&K$gll<m~Ou>4Oy#D>;%1x|aq{7JG63
z&o^?UfLAyRCaM%%K@wK9GR-9_DXWhc@2NxoRMJt53|@y9s6r=x01k2P<R*$oa%uxp
zsV$}U%vV%{D+|z&Qq8wboyPoxorcTAAzj9Cf)yErHm4ndGZ7OITCu1#+OmzhKqOar
zgiH(wftqY)O-kiqCW{BT>pox)!nj9hsYXK&#Lz`8o-yrAJ6KSsnRW)DOsNUoJ1%yn
zrz{j{ylTdX8}ah@=JNq;jBD2j;*#pH#dK4oMeGf*Bg3gM%B;iq!X%8(2V9q%R3g&R
zE@$@{REp;*YUz?D$f_lSjh4tf(e}ixbC22EgndHj5RySR5kkwF@aFOZA)aHe5i@~V
z@_QUGd_6wFeV<&aywt(KfYp15cou?j0^M^wZb{1r=;(+asK0;nx?=^%oG;aD5J7^c
zyKh*iINX0|_<w)s%$j0VZPaHGeS2im+B;H~Wqd0h2h<84QO1(2i8B7D>7|7k%6>CT
zk97Yd<s;Ct^XnHPWu~2G`pC@!LxaSEhl}?SI&tzQh8^3!s~;;YxH&$!r&+@UhIX?1
z-qkq(fMj9dm4TQ^q5tU;kI(I$!u%7&6+BwJms7DrZYjeo1TwQJ1&N-o+pdQnInV#;
zAc_Sgfm^=6zevmv0^J^v#5p#U8aGfo(RRXt+u=7VK}dR2+$6we&&6}tMP}dxNTr~P
z6jEwC9D@{_!+ZNwYA2#6yl>{m9#cIBAXOSd<57%2U@Et)7LijBNhDV>4zy5)twj!X
zpK(NEiiBBw+BsqnCskE^(QAZK7ZlV>?d&Wb&&{z%lRz`zbBzNs@eFaRf<2m$Dj5_$
zW^u_F;^)n<OQ(CHcVevZr{GnTP{~ViIlwI#XoMby2>+i1c9|dRLzd(OO2F7|4XM%f
z6zk;SJ^@xPkQvmFGXD)APC^->X4*CGRc4H9<sbhjPeJv-)}g0G`>2@}0^@fD-qt<7
zJGY)`XmnN$ti3(R6dEa$X@2o)Cj?rbuRvPl5v;mi{t^7l&Hb`}Pq-kUV}3bRfS1Ov
z<c&1I!q^-TfqUj|X_RU!P3ADa_E4U-s!H~g(ZxL2^$@^i>LWBu<PCDhJQux$1l;Mh
z&D|@ALB&+U#WYaSE<%QFsF?yR+Q_4MVrlK655c)o7llkQa-c#DBus&DC=Y|qI-s=6
zJEqq{MLC?P=vkqkw!A9o;*$0j)mNs)XNPu>AT1u8IqxrMDgwxG^E8~GpD_fLa};pC
z$cbsbSyXg_Jx!o}793Guhgo%?n8Gm~G6XU5pooL#q~r$97Xp)#PRa1l4q_tejKyb{
z60Yu0=^U0!Nd<+5x~^RfT8n`;@XwWORP!{vmS@cWWp@Hp`J-zGe);Hgd|{#Ho7y^{
zs5#hpuZg*VK9^A;zW}pGiHS(Vbo<1eIC?=yW;*K174vG<zJ3c)N+5%EvOQ2T^iFE4
zKuXvn^-^jJ%oeQvc^rZ%o3D*bOJs$u+|bmtReNZ7jY=u?ug~S|z*qK9QC0=s3InTD
z7{Y03GQrIeNF3#OZJssPrr4!hhs(rT3|tK|%Jzq0m9isUp1LM`3?x;5uCX*lGi?As
zw6^Ye+wi+19vSrFEd0JXmHJ%<0vMQPwhiXU)6LNnk246A8mjOl*q9W$m<T#I8AFYP
zyNdXE!vOe<TS_Egsw1}#!b)C5I;zt&?PwlGwKr#Q&5S;S)Eg1d<sqec`b5*_1-^`X
z4a%<=+A&XHj$P|3!%hj!;H%R_McFd;;SIK+38m@?u?e_eNE3b5aX&kdhoGW)3Ty5a
zY&v2oh^%^`3C1TwutfY7ZYXuN>C&ZW`zIefA+)@JR=OD6tS<OEEOGJtiNQu*Gv@(r
zeK$=n$P)`$4U#^YQj<vc={~12rYxrN>b@F!q$c0xk(YWj*T#UFxq&N{Kk4Z<dYSCd
zimHc~b&2?8LF~H8S@sF)CIMQ9VfP4Udq3bW5}e}zny4OcuBY}QhB{O=ofSzG5?CY-
zX_g<)a@fhsosEbB3nz`+PO1=rPu#%2vV*-v%yY0Wxuq_BuQ(rBOMbtDjN*bblLHb(
z0}Nw7X-FqxC&ZJ|>ER`!CII7JoulbD@;{q$((m8l(k&db<X-uSM{P<Qu{HTA@JP;4
zI4H~#W`0^}B+*Z4Isp|1CXNSbWwPHwnmK|s8!;dnWAoRJd+wgj&t=;p`54WcO~X#h
zay9Yxl<mP9^0*xwlE?_i$$O@EcK~ciq^=l*+{-Aihyd9)AKVdW3d<IfU#gm!DDVM~
zCU|YUk};Ueu?d(6Q%9%@A-Ea+Y`NOecdJo85TmwATh75XEtg_KU=O5~89BxTfJg2D
zXVFq4=X){oLW@DbgcDH3L^A;u2Z4|yzLL=zHm3)QZbFoF6Knz%rA9QNrle)kqLw7-
zm9aE@Y!8<9&PrK|@epUM0i?h;6jRw_KqtL~eYETD<x$s!2n3;;+WF+AOAlRN8$O&a
zb$|<pli25WJ|)OqZX4{?0zzW`eH{S_u9#@hojowH6b(|GiRz>z%krCFNfGX%<;r2r
z#0-qdOf+|`4&75svAo;J9#SQut9ayD>AARd9MarJNGoG#jBxMgmc(bs9r`YXz(Ah9
z6Sy6EY9Vs%Sb_s~;P#QXIdzQ%A>{wBgZexv>{*Oz4$df^Jr}e1SaLd57m^WHZ8%)x
z3XFkEJrx%<oV77J)o3yDz;%LsIB%&H5Xw>$<WbwYE2woF*!6a2TMA?q67}WEtfAtH
ze9wwMx^@(DxE8d4WG#MfO0xmYEAOSnc4#}<O{#oheH$%NvK25~aVx8)#2cUF6?lUH
zr(OU>R8Yl1R(vAo)UVJy#m7jQlodDs8G<ODqtcm|LvBqjrM)o*0a{iPt;`Xv^zPP>
zn`Jo78suizBn;3FMm|Rw7c@_tL-9fQ+X$NDRdJ=k19$#hNX*t<N7<SgVhG~A(FXD?
zBM9b2ve*O(6x5<m(Ue;JI9xU>0EV~G?(wRUGMuc}!kDy4g9&v=>OhiaLsdo@HN0^4
z(moIOis~0ml`7ssi#&&aGJHXuBaS^X)MoTijLbVM4AH}|*8<{M5=+GuU6YpN$@F`a
zzdHL*BLpIqZVVtuO6C`ys`@2y(*#ztF1=9amrTJ~#L&kzBZd(UDB5YF<!mg~1%z)P
zqOBH*56%)#A)fesudT7EJi1IW{^KVSMWvL^;c*#|HhYJpy5SA@BmvL$3V1%ddO`SK
zDHb*lk(YC;idk_^hS1FZ2No|_z3hX>xv#da>4DedKe8If$-HW&@6z2}^77&jtJNgg
zOCLS5r(=a7Q8j2GswoLgXkin45mc%L^DJdk7@!0N)MC`G;W3j$QB3orE(ilWT2^zR
zsj}do!$;37WM<D)S1<YrJ}zKr&jVbTVjt4&LO3KO(DjiRnu<fRO}?=F`S`#TuZM%y
zJXG^S);}^;@XCE#9*qE9n14qi^Q?-o?X)~Z8&N2`SL1dMoopB}Tkw&+HY4t>+FHEQ
z>l*g5H2F;8X<85au!HG=;EA?<#vm~nCConQ7Y)PsL_3}2IslHMdMe*JuhPqmqAVh5
z<|q#8&63Mv1RFs;Q%fg9J8G-TGkF-5=#w{{hR-orhFqG{pJ2#*xBc0b)8F3%ymFt0
z8z^90)~75^E;Le+ml#f4^$4TVhL2=OrGI87@$7XC49s;6IqYNT&7v>MG+H;5BX-zN
zdoa%BI50|%Q@eagthi_U^ifZE3aK<5z=dVQ2`?oVs@aD;0VcqTJ!sv&wjsrhZI85q
zgKnl_2=fsn_6ivzwAv?Hs3CE6BbIzoBoYZzbI9x3Lp|!&<u^ZZmO-Ecq9@;LD^g)}
zC1Ar<jb$~(_yVy-P%i-<{+(VWnpl{gNp9-6GR=e~nI-KK8nN<JjWxKt-Nwg>GwRTY
zk?^n@?7^#$CQcy+_Au0zQcx6C(iVvbmsP`SawlS{+(x*baECyugw?|XyKa-)Shte6
zzm2UOR_8nd<Ti}Bo=KaF(;)z3U~2*sQL!DOL51RvXqtVtpqIV8Fx6)4PdERdpb95s
zbKinfUdSdEo6}Pm2iHyuROELOWYuYBmTNgU&mq%7yJUh{LD1TEe~Ex<G+p0GE<UQS
z@a~t5scejm^r@1PX?9*-z88QLOO^eobSd+G5KPoo{SQr<kkA^29qruAx6S(HUs#Xh
z-@IS(i+_|P%3>~B@K?o8;U8i!N;YkGBoL^qjdYc<=1bs5C!`IROHOC*97eduluyW)
z+V9E5@T^<a94Uj5dkshlhHB>)shYzQN>%w~b;d?eZ=I{r35TSUao+jQL_Y(bu1a!8
zV|kdZV-|tQM&;DB-PWnrZ=kmh%^e;)^*Kxvx@rU!;}DEwVB+da)J!VQ(%xK8IX?WY
z1;Lg5Dn=Z&#|u3Y91^*thW<r+3J6z!>(GScQF5gL(ankau1On=NHAP}MX)?GaE?9b
zLYqu1xJ)TC)?Rvs%LHEViK0D8l@x=N5;cvE+LQtm)x|ukJltf&M4D#Qq4unhi?7cD
z>QYucAydb8XsO8t6FO_f*ql>1lh=U{J}ci&ZY48!Ow%E6{!cijsG%EIFv(O>@asZI
zH!cCf@d-RdH43)tNGrSdRk@EQ*wjt2M8KHoJprE!-WbB$O=6{dgWOD#FkP4eVvRA@
zYq%Yd+<k2LwI-xi<xaU7_#8DA+{Ly0lT>%x<hAv+kw=$TUzRmk{JgNTr`N{%`m|sY
z^DkkoDm9W`VT3FRLrzufbhVj>&_Iin3dNj<XiBM4rpxaRV-g~$GQgJrCSi;E0i#lw
ziG4VRUrA~Pd@TrwD8fHa0j*|2S{4WL$~_==0RXB9&%?zw)8`XV49oSPB)<quwheuw
zW&8!l8&OofIrPE3ihM3EJuOJXTzup?I2@}(1&k6&KM3;s9>V7sWQKSWnvuQ8&-$CW
z_B6><OP`vU8rxyBeWYmcCQ(Y!SiPS951~c;H$zIs?kl5o#m$*3+{1mbY3ojAaeYu3
z9H!`?kD*G;H)iu3qE;H&)G)$+`G7$*PyGo&<Q%|V-ckyyg+d4W`*%;%5p47_f|M&$
zP{CAiU0NyPW=!2Hu}QU3>P<M}QXLVe?=!StU@Ed)nHc)@$04}<AaS%h^b{g(ckk~0
z1ZW7!v)S@i1Y6*c6<=c#SaX-NN|;u!p>dnl+u9Jk>ufFq8@<yil(c?*dc2tIoAw%$
zGy7J08WB}n`)7%#izJYyr^&Uz1_4O&peUV1HoAbD2o`~*4kOhktS+wVdbdzZ&YNfo
z6(~FTlQJ*kc&Z~7;WLQckCf|=jJNfP{;^lyEqN5sa=_F|0n<dWAQCsz7^M!C**|YZ
z#TufJ&j;f1$)J5)0BA>xoBN9c%4n(}79$&Qu}+10coHM!g86O(>Lv4(Oc}l#NYl_C
zuIGnh$Ex`non;(SSe$e9AoF<E&ZT&ak~oezLM6dz#vvfNBtxdi#u%e>vlX6&m>mf?
zzc97Z7_NA3!g+$|!A`N3;>*{VoDYv>L{Jb7QN&O*L?>Pg;^}J@ede0WM*MJ6UCu_V
zTSd`uRw%BNRojoLE*ThNz~<@;<~UDOSjw?%z|qmm+i!(FlDp~u!&^^Xw^GS`=EK!g
zZ$s#1OBPUTIT^}j?Icc~aZAFeb328n99`yNraCMJC*?^XBy)wDW@n|07$*ysWgPB)
z=Nu$e0}VqH_q-g|5*h-mn$p9*16;Ed&>_Lv@<gHOutrj?(o(o>yJoJUk;;zrO8P|^
zrTj9z&f6Thg+V~NR9tt<VZF$efSK#K^<ve4GB$f)!CC0DB5HgP6K1(G5Z;;r86a_L
zER{%&gIpTHs2eL{%EP*t;j|#EOinjOLD)y=VT6&2Oq*1fPYKAJ@wzYpAH&BHL|RJ4
zP*~mAp#wdoOT9R%8}{?mR2xy>2<WHulC#LuFgy<^d5xEZ5$*e5qo)UIv*6LPtrn2+
zX(I?bLpu%Wq6Ou+fzm@QSZX5@13o%~sSnH@1k9YsTCf34)yvY{(SA)eWad7a(U`eO
zUCW+LP3D3Q7M1W~4qy}$da7dyYjX+f48LMGs~kX1yjHp|U;&|o%^*I@NXEI7mx;dq
z@zC&z<6E96gfCvYe4#q0kJ8MVf&wb(l*|FX`dm_`chb0AwcNiIg$3kJt4=QOcF^i8
zsOubebbof!O4jTT4|XSl;4ES-aB4AChrK74hrP&-16snVPP*;=0B%Wpvteq{81>H{
z_jGWLHmfsG@|Cp&B@a_C?eaZAh5+A7dfaiOVNhYu&1afzb!LA569L*+=r^5cb<eo7
z`PGQg#Wo)`-@DPTtVuUm8JXl+uxHw2+T8oB+oe(y9tg78Ru(gao{RMeH|(_8M0nku
z_}XSr>aQL3%&Z2nH;a}B5HZs~gs3(!41#Lw7^I#f{S`)v3J}Q>k9@@}Ofv<UK{TIo
z#5I&L#qN?k9scmV<#AXsImi%)4&p}R9WzZ!^+ZD@PfB2?DnhCi6g6N4WGe@toIoZD
zthOZB>;-oPMn+^_0(wOxU|$QU$wk$d@ZJ{ZDke@faK1JlKR$=i#1<ZPfzzeTHr`~#
z%qw0rs}gl~Da3P*HWX|O5?H06MZGPv)K&#q<Oi0bXWGP`!2(g0in{LsXig)ot}lji
zWlaH((nUcV2I5JP6oq=4YSe{Et1`>O=1)}<-SO}+2gGbgxwZJr(e6S+JFpr0C>971
z%D00tmDiwnGGUMZsJ@kIqnX^!Ou)Z*4mH#a%)>yXEtT=~+DWJA;sNeO*Ax%a24}HT
zffmr)v=rr16=SL)vw%%HOg*J=5lRW@*_W|D3*=<v9ct$m$YgUR5OMh*5SkAPOC@Gn
zjpE5`Ex<FOP5@biu8}1>0{APR%GCil`xSj1Gtg!8C8~aIv@EJd2&Kmg+Gj2hAm@^A
z9f0x)%$Ve}m=cR)i7;$?(*kEbhtt*%C{yd3u_)#we^eRcEKo;8p`WQ}mJk|QS@bv1
z=)Ll$cfiQl)xUYa_V(w2!#01)J&~gV7h%=dRk?x;8V(e>q|B#4wwlLAMh)sF*7SIb
z+H7_skc=%5s)dLoIoKs^;~>>SIjJoR_&ax%wis|=gVeb$BlJv}%e6wMm}q3a0(h-(
z`PV%v-Lx$`c%!EXwT=$A^@D%5c2tk3W0QeHOvJ#CjQ;|NW`X{j1%pmK$EVN(QfZ-(
zc2tAPL5^Z${MRpiSbqx{Rr0NiV5yF9s%Xs;s+4yc2V{W51XIT(f%CZtytV5co_ZZ+
zhI@-P*jxo6+5KK`nRu+(bO^9FDz#e`jEzk#5la@#iYOX?^Hzi!JM{Zz{{LVmBo<1i
zT+eJ8`s+XnW>Q-wN!U4*#slHIVwd8XWKtuJQkIDkx|`^)LFl5FAo4NQ$YBAYRCg$;
zu0}N7T!&SAHq5B9Ay2hcK1V0;^?GTwx;LZsCZ30k9^qaxt&JgO^m{IsFwmG3D8Dz@
z08C?T>T%r6r6{~dHrC&g4lC=rKtvO;LkE3tzMR5>hnI(o2c{iu?BBz^7EyhVgpL`E
z5W~gBS;0t4s@fBxW9!$cC)87P^X9LQ%oPju^jAk_LBeW!&DvMw>6pAEpFdG-nd@KQ
zTy4`Kg#oIh^+VO5Tu=>zJW_sZOK?!cR0q3<L654z(-@dZ2=Kuo*crU>@KdJHf|(Fd
zIheI;5`m@@3hD5-LO&a)+=RX{(E%5G9ZWRBESZi7wQInGw$B|8d3o0vCD&>{$qLC~
z6hT#CC)#Y*@oadl!aADaV6=xHFTJo(!|@`TMsoLoJ4R2X?k>}wXo<Tm-l$^^k}U3K
zAbDLN>g>yWM>)agFYV_k3BnU0qxg!bx`SMF&`|?Cd4E;aaJ3J!%)(aWA=P98lyFa^
z)KDc6nrT+yWXt<ZXv~A|mP!*@<yA5f@8U$BAsPKC9w!;sWyrb^<v_24Odxi0E$_l?
zBqNYzGAR*?E3XSg^G_vXSG4*jYe;K&g5xB6ib&jUgv>I?I8m%N7;LeT<f59o@1coS
z)R(Hmtczd&9Skb2iyv=2S%_L`I9cKCCIDd%4=;hM#WcwQWn9<((suY0kr-BjGWwzD
zigm~YJ!_I*>;g#!K_=Jc*NeP?-I_5}_D2oWp3<qbE8$EdmjV<6x5H*LO6fhm?bJv&
zr7I38UX)a;2@N|ErYN%OsI*Nzt&O;)QbbHLs;OBmF(PUDEMl9xWzY)Iy}6F$4}c|r
zPtX<tnq5GMONcCJt-gtnI52~oitffazlzFR_!EcmDrEA*m3#oQQtd(|#~zIm>uZp_
z%)&RtjkqY_)5;EI*k3y8(ndou#$z;$LGH$mIrxq$N3|x7PXM;!lnVR#7$){gkmbbY
z!Z&Fyu%SlF@7PpIMvise*O<=%<GUtrHv+}c;6M)7IJ9a*au+mmI@@J{t`u<=6&KC6
zH4P<Mf4VjjO8?h?ZTR<%=W1&rIj06ex{w>u@3<|MZBzVIQfm%g$)1r0QBfoWMQ>dH
z+UvmC*2yKRW0U^+Oqmz#A-NORjEA|R3auInYrw=yy^=l6x+a>t--aJY+Q2t&pToV(
zMuO;+0qmp$P5`^H-BW#2Pv~d0t{oPy6cBkp3-7ZrOPhz}d}*u^M!`$}fJ*>ID^Gfd
z1=1+7NfsSpx>D$=9dw#?bO>%KSVv3OuKwNjNd4Z{N=}0)&uQ|gFLOv6l6>W^`(d7L
zNK!8}wbnVBA3}%)j;G5Own=YwV<Qrgw|XOvQb9FVsSv2eWqq_2bgDqWI<P%DXeeh~
zw%+H6MrK)XXZ-*f5S*2RB}3{V;|xRt$3>aZNB>A(s5Jwk4$bvc7u50aRv>9lZJ5DZ
zskLx&U%2Ha(;~s}XToz?n*$e<K(i9CoC^tA-E?yAoC&ZOki-Tp@v-;m)C=|gy~Bfu
zxDSmy!qNV92A!Qf>TveN>zyaEg|3m+cjy_9t>JL|ihk_(?_`YwNVweg1r;vq0%(ga
zRDVU>ugf^7nV`6vPGnu)AjP$-x459#h8{}-!+oa?tP_uIu8vz|=nm_ATNu<2+l%4A
z_57t_5x`OJ#eMO?gdo^nq=L8RYMQp8z*#YYYYkO4x^F<B50qkvlEWoB`+Gaal+#_^
zqi(nL&9vhHE?ZW{8|8%FRd|wKQ5ls&Q=#a=_<&$??4S>?o;3>a_Bo|iq}7yL_qUW>
znVAQhUj-QXTL~ixyD^MMk<SiyTp6U^k6A>3PGn(lvdqE2yu-BJP=wH|-HjUiN{BAg
zaCOxt!&i(?UPODSq+c)?UyvCP<_~ieBg!$KldvhVo@v^p8$HVVlu=E1qN%&e7I6lO
z;&M3hKe(8<qprLLr*T}dB8cg<oXsIO4XK&{l;pPuMxddF%g|7vbACC;hU9{%hTGcm
zjT?HBbPyAe7W-j@k`~jqVX$De^Ek6qYOQM1gw04QF$>yS3jjDuM#yc`E|2^G{yNeI
zqb&d$;7T-gKH3~(>u9wW{Y=&~+%RvhaxqKp8oTPc%v?H1b|lIzGx8~3iVlh#>Om!N
zN(|*NOX)N+QtDWoCL5&=zxd9XY8~~Iex3V1C!7zvm8T%K5+kkP_xthfd*RC97**5t
z))(4FEZ0+bl_b?fr3hDr60|cj{cu5?%c*)PxRdq8LTqqK6P4h5s7HZZhB5@Xx)9))
z7G4EL1gDxD;RO7$n-UIYF`U2{JXnDsi?BMkm+bG7S!(i80zskR(oy-O=(hxH?OSvB
z$fXB<tx3HEZ6hUFV3+B&+{Gupn+peON6n5jC7eAGS(*b?WEMM9JBpZ>k>N?T0>H<I
zH(6OBCJWr!P-YwSSDJF2mQh%tHk}51s1E8KTog++1KJ)d&~zJHCH^X#%U}v!2V%h6
zWYJm_i8q3!&(jr-yA-j3nLoIFuwRt}-+lLSGJ%yROPI1f#GkE*&r;(n4NF6S7ekrf
zQZ5IS935zsjf(tBTxeH(!ZzJqYhh+HvYRdAWU&|gLLpjFN^@JimkkY$QRQuRt2AS2
zvHa)?-P#oKQE%KTsmEk#1=#cvxPgvKqiWXaQnM*>B1_PMsNN27w@6~(VqBF2pWvZ_
z-Zrbk%!)`T#F%md<Dm4E;+c|j5>Pv$xYI&FkVlh(f5jVUagsJc7>Lu+tp#)*nxa$J
zqts5^9lOdE!N0>?Rd4E%RL>TD{oE{>cEtIp#C**@b;Fe&yn>;!R83Ch0z<PZ#s_Dr
z1`H|<URSsdIHQXh%XRo&Y)?lgGY7hHfHFfjXX(B(67QF0E$vXx{+fe&?)6TMSb7dB
zLnp=-eOp${)8nhjqNh`qVj?r^vs~T0zepq$H#Azn>?I;IB5@FGy#wU6oBtCab&({L
z-^~oLEK7sBdfmU`t>T!1sQ_^!Q6wlU?3O8){lN0%2wvq|kXLz~)o}wicxXlk?&_V?
zh$aCfrYMWX_)G97g1br5u8*S(U2bR15xll5;djjOG7m_%{<Br~z(RSmQ@v`5d-FTS
zkugz2!NJj=HSmb6)XR>{3b2`j(E+NYKj+O4Q7H#k1%tVdS<QNYb}SjYW#rR`?wR})
zCvq%(IVh|>nqjUrV6N%GM<V$a%0&+rgi<Ew^x(0fBN5Yo7q9#v*kC~=8&r|PJ8my&
z70IQnh5;6#^;vSe${Tqzp6vPqgh$kQuuwKCzp*Qs(QFdTW?P<jU)E4gr}SbFiHvS>
zdnI6ORdM3BxSzmeR;bc=urX4`GRFh77ZBNPBzIdI2?qQ&@N5;AvQw#6)0BpPMuY{>
zW^E?GbO2L5J?*kkxk_k!x(^T*wM~HJ`~Z+2sL2H;GZHYoTGlJQ1W)&6<D9ng_|hS7
zX%cS)*HyNNp1G=;Jc-BJQ$dJGG2M-!t?VfWbyaR4?#kMto<@*&oZrACZ)tG@v7kQD
zU4qYE@bAOctE6fWXK4sXxxkQM6dEXsW}_w`&=0nw%$CMWZQ-k<ohYHHmD+D4Iw#8N
zIiVJ$Y4=mCQJb~Etn+Cq2-kJdXypX3Q=$ofE$~AG1?@GsF9uplidH!v)x|C8bL&|x
z+-tJ1Lczl37~P;Q=Ok(fq)KLH<V1v6i^}EZE+N1Yk%r4K3jCS6fa?My)y!#`kwjaj
zGQHlrLP@LeFFQZ!$%dz>*JPH!9iZB_P5^s_=~8{p8snx4+&l~;6$Mmts>r3bS6FkY
z;Tc;3CwNG-ROC2_!fZ$?{M2E{1VK`1K;Sc}(g@VkS*ilHlgkb!X!vek3y&EOo~y5$
zqB$I1PR+YefRJ-xg1#$dR}2-pEjgOfS^d+2*9wI3kKw?c{|vaM8D65Z&gJdYh`?on
zYKWvq)5dBBEH!m^rpL<`(^9vuIf}-!5{WD@zMZ7n{=`^oUq3-3vIxT~&~bwUTfPb%
zodT!S89ue$rE%}D8B9OXyAu*DN7XUjKr(-wwGFfh_NE}8mQ2zL_QiW)rlSn0&^&&R
z%gzc>@mSqdiBw_Ot%g}T-E>M9UEMC!Boj4!*+qQ)xY57(Vy^;9N*jGq8CLFA38fTU
zkvM^msP8Ed-k!a9rY_JnJa)P?9$^2HS+B5k2e<-NEMv!2Bi8<1MU2R#T*<&kQ(IIY
zE-8E3YwvNj+>(v2TFH+vQq2oCUZOZ~%km7Fc8aZHOoC)FK&;W*Q&v`I5nmVbv7s2l
zT1vv*2#naTlZ$6}A2=-3T#yd*n+U2$aM=)L!5|+M1<M9{Gc7+eu<J5Jv!80H=>%bc
zA~<))y{7FpdC&DtQm6R3d*zohDT80S8Tx7%En;go1(nNy$>$kk0b=hWjimgpFnIVF
zc<q$p6DI<f?%GiaK~0$x+w{QPGcaPQ!X>Mhfw3ttmUl_dJ<}$Ph1niwCE+7eWhGhD
zAH+5k3`%#cEVjQQHzVMhMm*TxcglBN$NKsY{-4{ItNy1LSvUY-dPybj3yi$<<6;J6
zK*w3kR2r}V)7=GZDxtJsstQ;Q+qg_uLi?UfD-IfFhtj}rLCM@bBzAvS^6%)+s4Hr0
ze(!}mbn6v)<(+9%?3$##y64ciG1W6|2fXm^k;pAG(y+~e0<3O(2BNW8Ex-zX68y!A
zjo1pOkp{<V9}5IN(Ev=_doxdvNZU^^=}FH_&8O!lhiGs4rX23nP$|Qdl6V83M%0*K
zuIt|&cw=3s53<gb&1!l*0CY+~_Bw>Fn70~K^FdsMHrosKvWw5UUm4*XRNc?GGPlUj
z7E+oP`erkOlGggZmU(I@H~{fvIqdi{0=PV831GBdo=AFF)@(GFvOLp@gX2<+6}w%g
z&@MxrWRh51o9s;v5LeQ;XE0!KCxc|9<z*+8W1{S}KarIVGl|+*C6I1?$-=nSN-iqf
z(MapK?F#H6mn2%Ja!}Syw4Q`%5;0mkKSt8X#a~rfr{J#cUvk@Xi|WBs<9z6z4_l+%
zB12nYpLXeyR~nc2ni<#Rr8eORUW2_R8;kFvAzO7Fs7{*Ke$^A`(IO3FUG#`M93KIB
zrRxIhfiCo4;EePx2lIzVtdLxzGUA-RcWc)L5Y1)@z{7WY+Ak~>0AnZzvPy@nD;whY
zV3|x^bXQHN@J9Hbbis1fz`%)2T;$!9z)-p`=$iEAK_hd7e`13h8Dq`(y@FAF1vXqV
zM^mc^&k5dOyU&_!M<NjZ3<n$}tmRc5@aecx&}v<FUJ!uZD-qa@wK{G~@=ajrhCq?(
z@sdgZPF236IF{U2gGLjxX@JnaDJ}1%)D^kcGi&+x^a!^umS(yVq&PDzq$`rTR-X>r
z(qArRdZr{wJ7lh@yhZ<7Svt$HgdjT_>im2)+REQt`swGj?2${f%6#bSH0a&35XGcn
zMXm$j@v@R^!LXR_NHU*|QPH5WPVqv*N~CgK*w>XVAoP~Gxle<!+f!gLq2SlRz$zO&
zrCXsw@n5k>f$AB8#|Cp6V08f{?1073Y3Zbyrfph$WkR*IVm;Lo#(<?t&~>a|NM07u
z-%6P|wAV9oRf@3vU(kb%<I>jvc#22UB*f|sR~%$VHgnffO2Da2l7hN)@9_aGYXrjD
zUJfS$yEIhC#WTL#>;;{wyhR>Teg)I{?>ax$r@A<{8Bji}1yr-eVwcyQxpRwEmS>W^
zHu<Amu&)N6hGIs|N2OoL4;(%2dJj6SbKy7pu)*+vd{!i8OX>P^EY6a(?2?m+2_$(E
zv7YLWyx2&L*`!#q%Y2~pZ!*23K<|@ZmU=xlyP=@kg_kxdyyWGWnlM^{NuR7fYfkHq
z$m;ymf%-NRpTTILH~a|i*IU$8<nDeW^OS=dW^N}B+?D#XjiD=N;_r2)k2gJ5Se$Ed
zV5Hh^R@mnWKgk&t@2fHunR~HjYt$fH(_9l!z6pq=L};$WU8Aeygu~q+WH2o9s-Hx1
zX+t<>wkxu4U%w%!W?GlW=8#Y-e)Bs8z`N6vfl`Y_ee-@Md+ZovWQFtY=?cSnySh6F
zT5K-`e`Cr$6*bmGS1gG+k+}OY!&NGv9Jgf=*k6m&4zm5r05ykuGO4Hds}Vy|2gbbU
zgP<FZS(C`#1VU=qCjUwA2F51~5;yP7Ns{TojGc$#t9+9(NTQ}zRdfR1(i@MV9>JQ7
z;HnMAXPxHE@eUzoZ|KN}4Yn7#a&`MFSFJ=$cp~JZ*{b)*JY2AKutT&LC?;S9-?aoW
zZ`vwTmYJ0HTyOal*bAr<4Gy(4CCZ|Zt)!be><6Q>)A=;#VZo|jhzZaJ7aV4TyDIvI
z0$a_z9l&HQudR)&ctO!73lj_NF?=KTr&7XnB`BLT!Un5^mM_j#{E65uek;%{ARA~$
z2V_uj9F<be=XIh(r3_#G0En^Og{kN|MUDc(N*BltcbfogwD7C)XDK!prm_Qf>?-i1
zxl8crMl%(#*;WsAn`N}}I>gx;X|{v!1bBDGH+F(Id8)BHoTfcU!z?mh0UgP@F=D(W
zOR{&usV2(z!s{{-VpCYReFe}|X{}ud0MD>qTuCuwcVa$gXG%mQT=+uc_(ULSh-P@I
zgU%Oh$8UQMT1>~S=pF}!m!*|XLJPL}7oxS=TEc-!NDo8GtqsWtrWPWi-x4C8150%Z
zu9?gOD>X4B0b5M<R3o!9ny}S+D?JYk6AUYs1$289Ip?ZYd+2>w-BA`GSiH;L&MhOh
zdRc0iRB<F4zd!35|4g=@ikfuo1mQg7_3{}koYiy+95;w`s7__DdVD#3Qo%{IYV(*m
z9d9aE@XML#^?dJAtBFCW&(_$k0N&OY>$F`Z(l4?4%m3(F`!D~pi^-hD)W0AfH`YeJ
zy109)Hc}1(x4U~Gyo1Jif!<P<_$2drTB5ve%fgqrf>|-oGit4dz0<~42`Hf{3z6Y`
zR5K{tL~())(UlmxEdVS*<&?x{Auz}cXx6)4z%AMI99>Q1A=Dag1t%-RA5Tghmbn_E
zKk%xTl5%>lu-gT;q#M8fg%@yYg8zBaGT7>cg1vl{Nb`;wP2D6VcUvyXK$`GV*l?RY
zkVTK$N!gpx&qrN@skS;%?sL&7cb`CcA;Bt@9qDMQ&4uF@`L9Uv8AM{iVkyF+rW4Rv
zhn6yPU6%s$HpPQ=QkHLEuCCm{_4{R{V{g649k{169Q8Mco<K+{6#URq$CrY@)<@(k
zza}_)8t)C&MVx*HDre2yNF;XUM37Sxlx4z#;pod!oLxM4Ho`g|_ma$8C4t@4jg(=?
zY+CgUCK!wQE(B#Anf0Lgk*T{q9a+KR<i$&uqJXan$wrCY?O4%G(UuF<oj7<~7Amo%
zB-9fDOjy{hMrszWU)T7JKUtAijPVN1q`zTLWP9<eBeB%_t^e!>Z5A%=-V<4DEEljw
zBd)F4`p==<k^r1`A+UK&$DIaBjhp_sc!2e;EAkAtSMw^0RvE?VovME9m?_5v+n03>
z{L5hPPwuDrkIC4D4{MwUpjA&`m>-RmHotX6{1wRjJJXOes2bEgPdd$bHnmj@sb-{M
zz#>x~I74<pU_!nT3C~GFzqCE@6QQQdrY;{fHx~W5X{WqfP_Slj9Y~gwG+CMVA7|)B
zC4njjbllg-u5BnGEM;S^@qnUF%1#+0{v=4FpSq2xi<m0TI_~;tafBJANpgPb!)0cs
zC3FvPiF(^o1;nZUp;dD@qb3~#n7Jg0$0@Sq-tuZz4!_L@&|%pfOcO5J^@w#nXfTHz
zAlf*R%%4Yo7>oBavQqputJVT!0CpW?u&Wq;J%ma;5TpIClV58xU4!ZH9_CVAs!8j<
zI1zqeSMgF3Hs!S&h4OBSR9KtZ#f!XFzT$AVxu5R-+jj5PK+W34rV@L`Dc~o26ecQO
zc#vPkh_=u?uyhGBC>0I~$3-RlN^6E5qEr@|&I>RZU}!Q$Gpal+<lsTPT?KDV`o)QL
zGc=%+D^1|(54$OyEGA|7!E{w)w1vtv9Tpz#QfkTDg<|W90raNqdWgGOwGbcIHmgBc
zoq(ojWp<k7svVRRDS_M^U%<+l;*nBA$ABnLQ#Q#d&&Fs8F4bMc^fX~xFI6NskmLeF
zz3y(Rm!>7L+`+R5yCzEWo?yLVWdR{H8<MHMT|19pm_k_MzKr80q^w5(@tTNNi!|z3
zs6OG6#J6ay)kqJ5bgM1}vfB#++Dv8xKU@u*Qkctzb*$zc2iTLD4d=z;rC>XVS9=7m
zFW-UYU_0hdMIfKt(gl+j4C87gOXEr<{3)-OgP#SX`LtZDfVWuDx>(Sgo^1ii`IbyC
zcZ}Wu9}%F3i-6mg#F}0x`HK_JUHM=kt(1$q(#IR?w*0pKql5yZGW+);d*r!$Jso<m
zv-t`Be*z_jL+?+#gT^yg{P^uO#q&C}3XO~(!*1i6hP_2An^&SSqcu~2M5&TbZY2^c
zzkDPWa=g_6=)X}%L5G9{W+j!ZUH5Q?FlT|Rw*%;A<AR=QqIbO5&qpaGOdC8UgdH9q
zuHx0UPq}WcN}vACs4fM#R*|HE99kg!=6Me3jlXgn#%Mj_dcT1Dv<Ic0A`K0#-^YDy
zGy%9v_i_4y+zlf&DV008Sd;;`H@TzGlv%W<6*B;<23{O$kXx$p2Jqgn7fS3TYattV
z8i;>_6MFW`<2-tt)nC3S>|wLST^!!Bg%E!0D|D6b3PAk^c6(z0%DNqVuU1=7>{Sjp
zGYKj$3ndZwf-`8>`<imY)In|<-YPd`DslJ|rJG7kC3dqrn+2xr*GyAxip^;_p)AzI
z;Dd&@X4Wo(p!*@JdkmfbBxNvsDY0WQvh&1ip=Axgv25On!!?V_?qhEDWV+{&WtiT(
zS=|!b$wt9aPxTcom=e)-=Boj59GMv^DiPTIO=Jq|6{O|=1tmNG))SOH*xj9KkFWmm
zvR<gMwCKx@`UZutiFJ*Ux$tDtQUx<F18%>0|KY0Yc$nvF3Kr?vwt?ljy)VlzNSuy>
z$c@v-LW8fYSkoT3w`p&ft)5>?{7z^rB{g|mg}Y7TwO@nD=J=sxl;`Z2V#=Q4jFk)K
zwh>QOi(m{IY~Cycc>qfmF*-G_77D;!Jea|ugPV6N{>0xM##F7cJ{P=xpG7X9vV++t
zHA@S?LYFsmP{9!RG<tPkmJ&>=rUx*expPAotqdBH-TexLclfh(R*drap`AQGVKc3U
zyxQ)C1}&$UhC-W<Ax71&%&=Iv__8I4X>UlVnRgsaCLWa!W-3z!2&a{fy0Y8qmC&?V
zfGMdts!Y`~tB%N3R;q_E72s=s^5bXA?@$+^6RU;K)6C3L6v2y%(@O`4M&+yXp@NYe
z61(J;02>ewyd+L6bPc4w)$Y+)njA`bKw({0O+L4XQC2~sXm3n<^2j29*LQOx-TD=6
zLE<8Q!GnXz!@T@CC66UW;~XMtx`2{i%Rw<sL0h0fSPmFgHbbvrkZW&Am-473fYEj>
zB?KME;1t9X7zVdwyW&84M-q`Mc9;QVLQO+bKhKK3YaT~HT_mK9Mv-fk`!ZAwY3quh
zNl=L@iyJJ3x+Mg(!H##gk4XHk;A1bz@NJ2~V$k5Zt!oaRGB)fyZk?6ZvM4&$?P#=C
zaB^MIAtu_vC}tZ2v+VV>c0cI>K&+JFal~(hq<W^fkl?8_;ev=cd_AOsgC4@ux5rj!
z!R`dilq2PgT_vV$&5o&UG6w|nd~l?Piij<8nXFg*iY{L|r<HHwQp@IigyI%>rt`@y
znpP4@n_7hW5)-sVjpT8z^yb_6;@nW}Si<sA?g108Rm13bZqB(B92i*|hg=_8e>${A
z7%;>(;ab5fN~ErF$T?Sj6^j4Ye+~Zoe}d=MSiGuX1-Q#OQ6p9<4jdoW9RY}NM1Rmy
zeTvP#(Qm_|U&i9~?ukv?>u`@l<@S`=l#%8`!1h*vR(0|}uaZWagZiwwT;ssB^ICm`
z8jgTlr(2u7N-GrQNf#tF!;Vu0ZX%XRT+wJ|iz2$?4|#?N@9ilTDbE0`RB6pISpmM*
zw#em0aDM#@m~Y;z#(WiA-qrrma9gK_eIUXeQ}ihrep-XYCvJ$>@>z!p*1EOP8Gz=B
zQgJMJtp&4usMa8Evo>rRK<iNnznS?S^%!pOSgDmad0Wc-kkuToW&*pFR(o`3JJ3wk
zy&rutDx5jetdx}Z)LG81$C?LbQDH}FsiY7UHc~4P7Zo-T_ns>D+Tr`Q>Xewxij5%a
z0HVUgoPk)4#safSG|TR_0Uig!7NdFuj~BbQ$dXaQ<5vM+Y0&O&A9yqT*9Tr`G0$Es
ztbGsMeH8rNTVFkVCVrv%aQ)YJlmOdDHpVtw*b#Ys^Q8o+-m*L$&d27hbV74M9(ksM
z?Itn%2Jh(45{{LUzoNvRv{Y03CD0O<T+eerZezR-q|+u&JD6Q@EMkT&q_}tbSW+*E
z4}#+jN+s`PbT>W#@$Cx3eED0Qi*J4>kRi@A9_F#}%<e^uZiHw*ykI&JZERi>V@<fy
z$_`9XnG65A;nS$i);{Zx(0;zI)1j#^Kv(D?W6{QUvoLi{iq0A`{TjVjg}~CHg~4xC
zY9KaJ`WO|$K_#rfcsa&OU<u-D-l)u7t4SLxK?H=sTyf?*2{;RcnYx`HyV6-JFh)Fv
zT<dQcx>eC&PXDkl+Damrq|L77(Ohg-)a5+pc7m9{<C;EFp;NL^?Dl0^9TcRZe9%^%
zMapteqLq}g0w*!r4kmNNwX<tC@{<+yPUjo+G6j@qSp`&6XTi)6wNPrM7y!;;#R-Jz
z(VCleEYO@&(H82NPN&3rW@NAQ_uvSd;M|vAQO)n_?%q*Jvu>Jay1f8#_MlIHNdUoi
zA9Os{TwH#&ntaQz(XNYN4ZPXez)*}TX~OLlK2m$&^;&ouL-u>OOkk^e^Ea-&mo<{|
zlPhX!Hk|`ejT)QLTPR^yR`32>-Z{gmxXBu$$h(#>p2IoA>WpqD-NistjiIIjUqWS0
z$>psa5L2kjsp_48XJfdUc>#NqAT8N3Qq69bMnI@lYn&NS=q0NGd=QUA2CgsBn2%jY
z2p{<hT)PtCTYyV`tTI}r?@DdnCEJ#vR8Gpu2Z;*<;Oa#bQNF$;AT5{=Y<9BVTJE?K
zz=#4jB!me>a}9uzsqd*ur!q%SOki0~Gv}imR}N8ZYqBR|RT60H^x{>6N4PK$F0;U`
zA~M(V##|r8%v<N1RPR$z6&4H=a|^Xz-<HsmgF)+^;A~>MxUWLd%3Vu&)<pu2QdR)|
zYpJiCscMpB2E3y8Ymq8~gJ<bZOs#aD^f({FVL7L4;cQEG&Ebm*&dUvOPPZ3MbDjG?
zvKoJU{wsqfRVRWO6s}Fw0k!;BZG?Fopys)`+sg@v>N%J>0%(Sf47Ej*Ez&h!>MPtK
z;t@PW0KF)X9BBf`lZj}qR1WyJW|0hI|DC3cxCG~)Yk<d0T*A-<t7(ZM>-18WiZ2|Y
zMh}*}{qBeMkZZiyQ$OJldUQD7ALfl|GFR~E!qo6`$FBbYCECiZtfCmKrpv;B(*x7m
zltyWl|1!gwvvHENjSf4bnR%M4a+BZn{9mv9@H;|jk37${Ei>0IeaCpW3o}E2y=sct
z+Vo63%OJjC$Ng5Z=;yC)93|TMB}>?fFErmX$2v89pBVaE3BW?He?5uiCVw;1HGwFN
z-e&OFNcD}OEC=0QXgL$*@&|V905{~9Z+4?XhhWt=yPQ=WIjeQU$3RlZFM~kt?l5<2
zg2-^ZlRy=8`GY44xjWs|K)~wc<$L0X!QWR=uobkr3(I&Nk3BT<=<?amIm&Yenqr}o
zsdD#x-M)NJUun~(;n499VjJtM+c&TH=D3nif$$VLsAJf+MI@_g1llB)i(eR+s(SM~
zHislbSmEcLe+y>QyAKjqVGK{8W-}%PgsXj6oVbX|+^dJ)1%u5amKQw%eRh!C^?xhf
zoWe&g;79{1AwIU=`0!P>!r7HVDZX>8=<g2}S?Kx4rFR?MJ>7Nyh;EA9zxj*@$gj73
zZp8N!=Mm>JW7Pj&0{7-OfZDp{1n&76BU!9?FNvzy#Ff4BSR)$rbs4RR){dr*0j7rJ
zD081V$w86m9le?i`sA*9;!>3ZO{XEia*A^fsP7+erthB^GYD^kyUz6G#~hpP%`(Ca
z)6RJXD%};h1`m$+Ca;x8X_6u+&B)KFrhs9+E&P=u1seXUHmPU}2)l9L%_z&2U^s>{
z^qkG2V5@ZQ5l!@F+2j!6=gPsCe(18$xWXW^f?UM8av4QR<~#Ko&so#B5}?JHc_)?a
z)6du?s!XLKQR<hO>y5HL#^~|ZhWce7Gt6vdSo$!L;Bf|pKvl8Rd{}S=Jy6v#O`7H%
zZ|%eJ%^)vWX+Rg82%|1P*QP*~==CT7uUDhv>c#w=E|rQcO#T>ht2-nZ!w^l}-q@a=
zWGeTdVK1Fb%)ctW3`h#|LwL+upvF--8R2bPA5NzpM*ih@DX{X~cB7t<Y|dedZe!K!
zOClBmQeWlpQM^zXmQ?Br?rIrnSn)7D^gPifUyX{#xD3g~0EV#-bJisQ(YAWAXCPSz
z;rY;i*dXvL?-A2gsV@$U&|4JMSTLt$l-tZ@e%Q+h&t-9URV`j$LQ34+U#$a2Qsq+#
zj76~d67YL<B_Vy+Qcf%aH=V+YtV-sbN=t~AVC@w#@6VEr%vWNlZiB~=SuPjougbjZ
zptcQIZaZM7nG_@oSgrkoV3iiax+0QoxABDmoKA-3RI;Qwk0~(*M^^U-$AQ`c{h%|S
z1?Aj4Y#qhzZ*__|j|7^DPz!{m$V+Wtwn;L&Vc?uF$JI$_t%DZV@y~#K;3_-VDM$Qk
zPYrX-x1B)g{)39ao~b{&R`tuj)LY;5R6ISD&W;2ca$w3|otH;SBb4x2^YxgA%44yn
z6S^A(d|ttL;9As=f<d<jKxIR8q^BOhIXwi0Ryupj!oHUSLhJs-s`~D!+HZ(#x0i$E
zqeByG*r8)CvN}ApmOI;+=uSVQRXB{b3@tWk*_iXFkHUq+ZT==4tA-L&_G4QP*o}g}
zHi1TL$?CK1A93(!!)^2?dOA1j#nHKeXcL-ka~xXsj>j|pu{>p6H*f`@@<rxcuX{$d
zrhOIf%7mb=O8v%DejJTjQ@Y;ButtmA<dLNA-=J2bMrVeQJfk@yVY>j90$e`(^(K$Z
zh;Cq^z&YvGzyA1_3mXSqY?~tDk|t4N+n(x1h-_!718$2*`xqWxzu_$OdsYCt%FQe7
zQAxkk!1bWliGhGlJ`1F+067KiW*PgG+4UY@lk{!43<DSb>h7~B+jlveco7GH4|ims
zJ9HxZ<mGbUHx@FUT-uY~m(1wdg&AJ`7QFgsJ*-}s9)5WFA6RGc2D+edhl`1Ffyc#g
zSb+GwfFrm@oB7eH%*Qmn3wF<cqU655(cy6M@WmHOcGjhfseLq3Y=C?Z|5c~oY?s|!
z{a6YFHVh9LSKldC-c+-7I>fuek&Ad#KdKA4VCQ?ufS^2l$Z}ynCdUPzUi{<I7}7N?
zwr!&Ix%?-G6VEPQ`43F~b|6eQ2yjiZKKffAwvk~d^f4iJ_kRiG9P<DhTI}LoWUMr^
zbY-s%>*jYqA;!$@BDZvBaj8nIM6$_y-G@vKkOR5gs39Ru1L8oe?SRO3ZW)|f!$!N9
zC5D~z5{0q?z~46|b@Mk$cr4K%n|NI|6Tt+#cB4$MBJgFLmb8{WLtN%A((`_`J4F@C
z(t0`Wh7+sqk>4=_-4dRn_!W?C)yaS^OH|hxi(YQg>PWgYq`F4p(mI|@W1bpOklJ4O
z6ij=o?<<RAgUqOTBIC)o$!K91BV028T)weg7-P^3CSwf?nl&VJkl)da9i{h5iOz$<
z?rP5)27XbYfg7OuWC%iKxa+yc0%R{m4f6H?t%XR=b@;}mFj+x)8Eo4Ikc@7hhN2*U
zdpPRnyErEAaS2xF3*^w(?Y_4D9Ls5V2*-C;0!(krr;vVbimupeMg5@BU<JEcxNPVF
zGlio#wg9@qV<ONS0a;Va%_r6w>gZ5fHxFwvyh+eXmRSr~GrmqUFji%61=qLybrn)K
zpC_@4_jhBl0(fKDK;?D5lmwNN0X00A;TSL@Y$(-wwU3~flZtt3E>3W$>!!Q}v*wq?
z-{d~)MGiz~sxJIg7F`}-K0U^Vl@fF4JOblI{*F?@;l;sXZGIlhL~BO0J*QjsntUA{
zik~N0OTf7r*QdF|t}cMY9K-i<*uGU~FdmGsZfd^H#v5xgbGU8}ja%9>U^SJ5!8xX?
zH$nQ?RSq2Vh`8uEBDua2$FubebaQj9Jx?1tUZ;x<s5KuXOFBUgZhffdm(!>hKlxS9
zpWpf95Z4g5T+t=Z+avTTU+w%DHa~dIAbc$q1A#1&<dxFE0bg^go#aigjFD-+l&F#E
z%T6U<74kW@*!c0M1l!|Z`S1y%jw|xGN6fsa1>kQz$e@BAeyWBP_~<~<dQd!58~H^v
z<ajYgwxi%*2!|zN-(OV0;`5>{nAcWHb%T2?|JYIOrm8{OA{B~8hz6KZyep{E@G7+&
zPo6ArcY(a&vk?77t#uCD%%|3&3~r<Lw9{+U1SwrwYgxVf$a2-%K&^&*y-{P!Zrepb
zp7iSstU8kHH+@*>tHd4ATi=t3T{~1Q^)q9cl8wq)96Ym0KtZe{e(1|8wZyy;t8G(&
zoBSnV?E=!75)P}=kT`voaF*q=1-gP_t9&#&+-cec>oW2-H?3m>rQ6-qVf|hWO&@6-
z*ns!~^GOTbZk{@a&(P`8eMYBEqn4x%ojwuB;PV`x9((w_MzS}zt8^hy-uHWk+fecP
z!kR_A&cpeI=-v;m&Plyg|HxGGz&*!;R84+x&&HLrGGO1lp9D1_Xw2r4lKVhlnaw!F
zDy4!UYx#kIIeehnq;ODHMl<p>`LUwUyw?sl=-!F)=i3X)ir;Lfl7qIbopm66J=oqV
z-+Sw{_%lIlJt|PIODo&`=6Br2^AyhtD%FkqoQOX8<}MGf@tgxq<6*4k`<59>pWR$B
zNG1$LTJE#Ova^NY;IDYK!*X>_W@z{ny13?+6de=l@|f54p{XbZw>&~EVmx%_5!c&M
z_d&3HQ-Isjy+xtNYc=<j(_ur$SwrJlYVp8d&PnEP<bgob8}$npK-2RZQNVM{q?`lN
z9jeZ<L^RU2a%-Mfo!`RL@m3)_C_Nd95cTrri4P40=;9~?R}-2MCM8xbqnVi~EjB*{
z$|8a93B;zSC1Oi7hm~{5ZvuCVbyz)BTd7LsR`OqE+I}aU8^+)sLjY8_$J?)ksnPOb
zIt)DalJFWkC|O#t442LTb#b`s{bq=w1JCaX@D>5;x4d&AZ<rTwW1kQ^DdH`q+dO3{
zu%-I}{yc}~#>qE2tCs_DDWEzJ0Y9-X_nv^SZ8B)$9%iK4G@vZzJZh>gfAd7`svB|n
zEjiM5<#37PVMyADlgP0;dhKQ4q;MM75ZZoF88o#wLK&ql8#x81#Yu&$N}3I(*oH3H
zx55tF2%wF1yxt$6h39hFfX7^+&m!{dP|9iC(I`F0e5o7b^!<aFsxBr^#`D_x`Z&^6
zQe)bshaaog#@s$U%|>k#33lnOIg-}7u3(N<k89?}I4)3mZeu)MYQw{AuxAO+h}5K>
z6*`N16<BuBVtRnswGvo5n9dt%9pa0(og#b%0J?EC)lq}aR)z@(3hvy{wF7ZWl>vn3
zjWlZ{nE^4o7T{_t3sEDXiDZVAX|6siA6))2e!0@y?80@x%9RMPFYREI<JsIYUyX;z
zi14!_+$=z}HA496+w|dBZN&AJ3x})0i>c^Lj9cT)ar_ePVqnM6PopeKc<jGd|KTlf
zkHi|Qzx~xP>xZ@rv?uQ19$Mb^i?oC2wW*t)9O9&P@APdNzw&f+g}uKObc`D8)qJzq
zb@Z9i(8ntkEK|tLByqg$Mefl$k@b&Z-$zY(M^Dd(zn`wb-_~^iOk4@_mhzgaHD5&%
z_j*Ct$H3^7M0AvKx1tvAt#K(QpA!bNUG1)>!^G=F8~9J^W9uC;4t&)m#*Aejaj%oM
zu2zo;_R_+wkEXtBu<qEidPZEXOUAd?fO%w5tKl#~G(V7yB+j+L*-PIcn%%{wp_u}Y
znRM7Hg{U(u8fv|$HN%oE!|kQJykPgG5zmeuQu~%~EL+Cfi(|XT!C6oK&QRxB9`p^G
zHzax1Q`gIF_A=Pct_ES12iHKc@o9gym=y@(!Xn&u^MdtfB`+b0-;D~M0p|OQFp@2=
z4Rkl`0c=siA4MF`$7@#J>yr4iON#xT;kA>$UxAQ23;Mmm89Vwsb~LiMb#Fboe3K}-
z@V$QNdy7IRHebqzmml1C&xUJ;*9XAso&)!#djHtSc<9c&;`4nPmRhzUEcjK=hrDCy
z)>zSD%~DC-Hjs{9)k@n}+P^=+g7*^P@n9FP>K+{~FDTaJR9k~RJAA?Bq}r@!3zSx!
z*4B%`^)-=_r+@TnL7)g7d|gbOns9ayDSb_hf=bl#(lBdk4Z)$>DUiH1Ax3@jp){;n
zvrvT>P2GOLacm7F!=r=86KK*y#<8in$~9ys2FBC>x&ehc1JFF_%(DZ5PlD3I2SH%z
z)Wpho%^gVH#K(+HyNN5NpA;V(kOhqlKG*?`Rtl|E2{K+$ib7uNn01yG@_iE8`aWVZ
zM0oSZS~8T+<-lL<U^_uSFm5Tb{072Z*|n8JCnSEOrN4}LzVIj{mjNb-{<uW)L&sZD
z$IE0X$F87m;~2jTY?tZKF?rIh98bKtY^m1nu@qL7T&?}4odfGbPrHey>3r=9y1?tF
zJDGpNxAqBkrxq3ExVZQ9m7eLMsss$WG=92f9;gVWB3P%V7u6e6mO|ZqaP^kE#;%GQ
zUIkP?a<cO{My>>5ADYdT<~bJEb}p&LjMSC|O%?SvehgkY?1aGTA>-5+cWM$?$Ln)%
z0M-Mq2&3xzkbdr7tkkm1O!3c$?OvA{<H%By1A233DZ^M-#fK02R|UoyK~`@h>o7x2
zF8g+9oL}-%g86veyTzP&mH=DV2yV^^0BrxztYd3t)<-7SRqAyx$BH-+143rBOj5SK
z>7AS>mjq>n4B5E68Co`C@J5ww!nkw5D4YObsEv2!kr8U7g=h+cThN+s$%;9^XxYzv
zI4iq!LG)OxahsFLh5z0nBl*m0+`9!~-+O>K^M$2)>-xsx@g`em&P6e=i7at@fUeNE
zH*XNy>*CxoJcPo*b9Mn?DQitfb$%$+6XE5MlEmE%RJNAzHrZ#a0=)T`?0nJX@L<8N
z8d_<zMkNbix-^=hw?MEB)SX1GQZMI6_}3jA9#cZOwlyBPx1p=^Zdw}T=Tw*iE3uNz
zMx_#vDr5uX?gn^gMZryszrCojruL7n{r)fiqhNWJ<;ex%1K+-luOa<a2@JQ51Kwie
z6}8ph&gWEbleV67W!eOp{n7tp=NAj--dc6+e`{*r(emHEe__*)nA&QklQ)<V+>N29
zkH=a&<aAf90ljMyWY!SH8dflT?UeO#CE6T_JHB4mbi$|b$nToaK6E_RP_L-lq2U$t
zQrT%<qLsS$7?x9c?F};%rmQe?d#A6suky@oCb_s40Fcf27WaPV3lV7lE-`eky3(v{
zdk_=($gQ-E^bkx_+1I^A-*rN`dFFFp>Z0rNBZjBclgR-#vR*f3!_}F6xPo_pK7P;}
zK6X$1MhXTG6g#Hxa^MtoN?A8|8xEW)67kaACY=*u^K;@v!hK~M_;nF6C!Jg2hjzZt
z!v9%M9q>hPFHQFA(z(l^$-Op1+LjeL%i2n&57*z%F!Iw(P?6|XbQ_V|g5DMicY?W|
z;R)s-dbVV5>FAyt?YY<HOmkaGw{x!_cJ6h^D7mB9`9QTG`vTA{irogqz7M;*(xmb2
zVEj;11K9pS%%0?U_@m1?QZSrof4}Fz^Ox6e66Njgo^Co(u(L)J%FyN-ON0T}-D~!U
zD94?gUXNma@ANlUUifX<&|=lR`r_6z62(QUU*OgCB~RDATCnC7J^nEJBzQPj5S~s&
zKRXPP<BIp&xYakqA61*Z-v7Aj!+4L!UuFENWM|C_#Mk1BCrX)j7U^!A7}y*51(5#z
z`9Ftie~=1Yc~t=ZEO39~KW||48Ie5E{l~O+b<#5OD!Fh-xCir&bt|%FxwPE%7~(Tb
zTohiAkN-_P?3KIzgD;ZTwoO^k4Bfo#^z%S{2UTJp3912hW6uPtRZoI4EvPpOd?@Fo
ziCA_NxCXVK*Tuj<Oz?dck-dI`?MPe#$n+LpRy<r$Zi|C=)+V-Y{@5a70&Mz2Mn+y(
zxByu16eq`R)+Rya*3{$m6iPZtvnz)Eukjv}$mf$J#rxQtv=zIYG@H?N0z~ogWx{xW
z8Lp%7g#iD2)jd~Kf#c9<+M*MuuB~ea${%d)3+NFDbwM#CGHs?be>!Ylr5USIIOlCV
z38X+%|0qpIp&0Z|v38@pq71^~>la~px`)?0w;E3Cy&TeP7X*S(q5i!(5u?AQ24~Gm
zV`o4bW!E%qJK6|$D?F{2*g<3%{~ASiBUZEDt=VRXNrsDvl0H+C4S9hhk$N@}oGX|l
zYbOM?K+g3-Kn7`7_$-&4&$&oF&?fkbKSOt=rV|j$If(mOQTYR1<s`@6IU}OWOQ6`g
z%7D6S0@>W_waC&euYd%9JY~~lgNL}sjb`cBv(8F`TqN$zskR3>V=AG!n8EI@Yei+Y
zt@C{Pj#Jlsl^`13E}*r+D<0AGwacv81k?n^wbXXb1ks)#UBetsQeHA-^n8HNJ7rf1
zsg(+habbi;z%>bQ$%`z1ZXb}V50z!>G*(IiR}zh@0NOKQgjvtv9w=<*Md>U)#+%}J
z^QoZcHj+iiyF`}+T%y2_DZu71c;Q@UiN||Ryb0o=9stvvY~LXFJbmG;v(H7tot|I^
zY*d<ECzs1J=9Y0mU_GC{jn0>I>kFZsHIct~{qH~dfB08!to)}kEqcfuM}&_Fzxz8s
zX3Ba1*3N@lTcGmoP<6hj+r}r#*7WZeZ;!y^+w@Em6JYOc+~$iJ63Y+8v+%;f^Va@8
zHw7lLer+ZV_ZuMIroG4E^$d)~hX#-0n44gqB(Gkti-D%MPp)BFGcgvs+7oNt{rJ5I
z?5}w=-HGt$6i4@cZj$7h@}8@96q~cgpcar@(p!UC5NqMG$?1~?PLG$5{ktaL&#?19
zw{~tw{Jw0>ZqX|y4c+W>SDGym8~AoHHKc!wsVOM7#xiaa4C+PgGZS0b^IR?Lps&Ou
z>NeZuiT1PD_w3m$v3DD-(u+(C&(ut-Mmq!K%vH|<@(j724diuPqj+KRyS?z5F>Z1C
zPcDTWQCBh?#NK8C`B|gn7U))lJoS4L*1bfUdj>n2Dm;)@Q0=|JZHC3FBRRO?!k=9e
zFzbg|z&!G>Bi|0m$*mbkBeX-rC7gRiJhGSf?W~UuzZDmAk1DKo;$-S>r?dwyz42J#
zorTMuS$)UPq49$Fh3it$XV#2f-M3)6>4i0;!-<7`2;@e^Wk*kuJ9{Sllkg;BJ97HU
zsp|F9dctQZTlX;97W?g*O~a|r4p%E>c5C!A^RLC#yL+dZ#y%K~wjXb*fBHv==`9Y<
zVe4lg`tbjiAFab6Dt_~!x0nXIbouI$rA5&K{n!=$Z202%&cE8~6Z5IBK*Osx<-B^d
zd|l@QvbqbW0{4<K1A(~}6pWwUd}fgO=&|1XXBW@^heTHB3PAn(<A29}XBmT*jP7pb
z*c=%5J;1GvcYypl@)2C{Y?1MAJrT%~9^T+#J2*acrg<PRfCQgkPt&L3<7dUbvlT_}
zI5El?n347sso?Vl-8FAixrf5lV0mN0q;<mS+7QfaHE;8M9P?GWhgFGB;jO>fQfVk%
zM2rjz+oR+oK)c>oeVqv5V)!`bnw(ZA37aQ0+{MV)(~N)hs6cEF#hWh&-gL5ggB)~&
zb7X(8UeCFDpk{6m%sM<czT6D!RQ=jO?-fA1sP6sd?@8<yNAK<h*e&U8cM0411>Xx{
zUSxSSLHdr9W+6K`6-vXFAAF7<h2$dg5VTnwoidJLW8}Xh%m)W}bx79(QsKc|C*B(!
z22Ii6EvqIYTUcKfm?nk|QI$@w*9b4CjfeAEA-TrB@@T?DgLenprFXGvQ2!Y6i*-gA
zr3#;)kiI@<I<*<#K%t#*k1i1;^ZKv0Vo`qG3l5bFhlo0Uzu#8(+SD^xtFHs;{US7#
zFN}=Vb*^C&yNH}aq7^x3$_f(z#L~z$R|4|AVes<Dbt)X(P|_AnIpn27TNf146Lfvy
zrN_Z(O*-4xB<(?`262w^?f^P5GMNyF7zVZWkHJTydQ;)FY%Ucvh~3EGodwdkt|)Qv
zjqJ^Jl2@1_yrl>Ys!kg>w-_M<wzmnp$)a)9fwD~s{O*|;xi$q8Dg&WCy<Yh0=B35`
zA@(6&BuU_I3);^)q0E9^O<4ABJ691<dnEPQbJxtj`x*9|GM4~|^j>1l$@@7Vtd>IA
z)?;WpLWoNX+V#bNzC&z+zP^5jz!h){BpYrzkA(h{U%mL}c@ornw;EIDomxn`p*rM_
zbNSP-_C<ZQFFl8I&UY~m=-&1Y+I)l4<A3@(*G}oLN+aPP|3$7J?6qaZKFW`<c#5Z%
z#)r0<jL)(;!F+5gBDi+*XG;fGg44m$cj9n*V7$C0@eE8nj$h_u`l0mreTh{o9J%kl
zqGx+KyCTv0w@;P;_oe5+awGsPb96CxXQXRxI|^Pqy6uu`&OvXpq3)|MizZK>N_p$5
zERc>4uRyvO_&0QkKr@Qxb6ew?S?JJsjY_Yz$?#1R8k%0CN-?v>qhoPK&r}#{3omS@
zI(*XAk(g8tyPwsja$WIp0(4Oqj1$)1m??Ln`i;@HjK^K&d)zJREz#T-&iEn!3c$@-
z-|Pmpx4Daf6Y*|bYv+tJ*X7?FEHV$A06E1cM9uazC~hWPH+Z&vPN?45uV?G-_XeLa
z*<B;o;_YJP0d<Sr<CAG}<TJND@%%<6?u+L>;7dGzss5XW+2)R)ctgs1^1!SI(ml)f
z=kM6O`ac##yHCf*s!wq#@ZjX7*A3aXSEXB;nkSaBrx-F_Z`6E6DlX4D{L&A@VTQKS
zZ$32G+kIq{evTEXK&3w(ceMJ^;?VHXnym+mip&syC@B-YZ?v?bJJo(Z^;qAdj;sHO
zdT$O7XNP^S87;j4jKjwJAGiBg^gnLHV5@()CbqD5`eOal6EEb4uB1jjZ$8sp9JwDX
zZs~re>J~KZERpbYdeA56fvE>_UOh8x?J37{*TdBn7ti75*9_5_{4)N|OR>*?`dg8E
zjZA+eDL$tYA6!k`;OpSfk@L$sqmH5XR1$row+v)wCQQ#toxcNf93KC*HP!a~0q}ef
z$($!1Hsc(uZes3Qb!2BZr(S;^?1!cA+_1-82OLQ)zaub+SWe=NtA`GItb;)<#mkA6
z2R?0jdfMo?2FvnlD>1W8P#1Iy;RV`y+(134>1i452<HmAJq7(X-mVqHC9AlyhtqRt
z#=vB#i;ZXbC=S0iGg~btrBH4k#fJ}W8ee`doEs)BI35PR*X=m@;B(;m*IdDuI6KT7
zi2usPngOq|1mFivujr^K(+>WPWNTrC0^;bU9($M3F6d3m5kE`>PK8^buR|sysKb!k
zSz<es-+$2+!83_EPz<>3Ql`xXyMRHD#)HuOo?p2{<l6eWmA%so#F;JSR!=FJp5A3e
zU4X7Y6ol3%maMDS8b!uk*L0FDBy|0tyfndYJ!<~HdCx*_-A^5=oNoE)b>O5!QKqed
zg|i@wQFwFqZ{Xcp<s@(e;ge#f(%ZfD!^rU&c;9pmDO>Z>jvVX#G^`E*=6!&FT^I48
zfnuGRI|?LtjRSw=YRT!|kT%)93f|H(XYhJmUl_L8saoh=Fs+lyD&ryvP}GHkkef>d
z7G>}Q#zuOOuL+#CWFFw|`cuF(PFv4b!&{G)!IWgJ4L32kZCXC&w{5DjiwL_0NoI}g
z0w<eW!B`;POQ$KDpXp4|>J!uYE&SGqpPz$Ro}-HjJ5QS(2xed68?<S+Sp(uWs%B@q
zecNE7BC`9OcfDYtI;?b{8dU!X7}kK<-~YePGoNOo_9_71`RQWmT&B$9vBH6G>oR0=
z?Or5{+;R3|RQ}U_oJciya~1I9Yhkf@w2N;q>8EaGJp>+WAHI%kf9jv4KJ@<6s&<rt
zY+W62wA-YDi0c=B+!AdGW;4+l7-LNBKG%dwM(#5IM^<W%6*m9Gq+9fv5{;`V3@@*p
z+ZsOy+gp!jCe~|eBlkS+1@&GI6R#Vm@O$E(1Os6hIFzYirGJ9{OptC1I~%9yFJs_~
zxpCE-GUWEI6mcjuv2vy0u38`-=C9DZx5n`c)Ojz{HUu~R(09JohbGi_#ihsFluoA~
z)YIK(5qC?cyCAw&KZ^Eyr7Tt%u4PkIuE%9|VlBhW1;*I|<9~d>*XU<q_^$(Z2JS&?
z5AHRl{fZx66Y^^;tfj&(0&GI87;65>r8{iqYs9i^<k!}3tfvyCDU(kJ*aL1VY}2e6
zvS*A?f8D70CnU>rZ8E!lNr2n`%~*QRf$iw<--CsVjoSmcyy!i~x}RBnSL#jh`Ju4W
z)gQbB0}sK#$Ltz`2Wpl|mEZino_W4{top5PLv!);Jf77zu)ZmD@{yk99Tpb<VjYMI
ztv<7U!9_;9e;97KSlxaeUOqW_c|D=>Gm)FyZ*4&^?~A9y(-e6BET#CGusXiJKKxT2
zc(iz!LqvaecwJHZ@uK!OYm&I^Q2XT<)-@T(KMdv95gvCzx0<(lyZiR&XItvA^$ZsY
zH?=fXzWLBSy`MfHyngFHZ&>i@139VO`}4u|{M`FvW%q8b7{2*Q(&@TS2ybj#8a(JL
z_IzfrTv)psV88Fq1!UEQ=l|F9@50bUv%4pLy1>HexwT&tdaJXn?Q^N>Y^wSXYkDG{
zsm@Kq_Dwm%SErtbk3*d|e|)(-ONR-bc>MhhGwAM<`qhohoDHGN*QZ|Zpm^z(Tz)xk
z;DA}Ixq72G(L%ayXlLZNAkDz^iP0T*<d$W{I-^$;#n{@+lE1*S`{B|e-)voUJ34aG
zgxlUmHINI>^@ke*XE1DDHAEks|APIk+&bF4T3I0aCcxvw_mGJ*T0R{=-7Zsny1n8-
zW!dty*5ULPNS5GR+b=9z_Mp<{UB37&S}u%z%0u7pnL-a{7p*&3qoD1BvfTOY#go#+
zydCJ<lZ@Ac^Ncu=A_KaibcWF|WaIF<3&wABSMRY)Mc}18ga^+_0{+)wrY6hR7lQrb
zv^t7;+&+w-fl0$1$pe!J69EUH4Zu;Y9hnEY^-@ez-Vm!m<lZvk0Kb18Az29AeNa`U
z98vt$<bg?|=oX|C-<}D_6E}lh?~$g?`Q)ir42VFh*NaJb@fwYhgPL6DtTY$+rtRDg
znVMkowi0^|%DHGzDN7t{THldAM9;;z6OtWZ@5Mw<Cg-cgMf2hc!CBxf*?beHEdGgv
z&b}`2$*xL3D@M6gWXd&w+wWnLKi4N-r%E{|qo_KgYQUZJ2u9Urpz)A^)wU|@B8bh)
zs-EK%t#(|7xe|V$u<L=5Lc(X7BrJ};rHd0gBlE(2c$PLn$Sp-`MiPF6jJ<zx;J3QC
ztCnX_4Cc2u`p-+U@&L;WAak(*#M4Q`SX;z;)ii59Xx-w@Jh0*NB}DS}o4%0kDf=<5
zu{bZTC1$jGEfQ(0%;gdU{72s~avz`b(?2DswsFOOkBt8NFV`e?g~}_pDsx`<Z4TP;
zwtYG;GY9^ssz7MIBSd)u`m*4S?oW`8Hyxhu-;(l|gQvDW6G+B{?&A2hrr{f{zr?p&
z^^}Z{X5oBcdhLG3$#>Rb2H=t)<*N?Wevmd0h-C*+=J$4umm15j+4LHeUcGL+ABXIh
zZ@O~o5Eg!eCfSz`uP8vSZ+x0Zo+(+Icn7cULz>^r*MH>0C~;aCzFt+=zlRi_M%)R?
zHA<5|UE030agT!V=;iKK{=0`A{@SVyK-r#0$r@wl>KGS#%Rkrt$|}{y@Vumk(#5}l
zesOkZnmfeix?!u-d#gPyb)q~(-L2Ws8ZDowGjE>By}OC<N-K!*DY>_y`9@J*(C@*y
zEtgaP{RZ~VaCw6P_c`}e@@y7n&t%nYVI))Aj<TaEaC2B)E$0ZyF^6WEIgmQb@@|)r
z;)e(9$@NY(_hWFdcK}`GX%>ldEIn*-x8K0n_jxRx(eLuUm3ZaAw*X(b?$h_X^+1Cj
zC^}z#em1Tjt3K5|wB9H?3Atq#ie4)C=K3ZIT3-ClvK>#{bu75LYf1#&h`RII+q%0`
z!uNxbJcr`(SBHE5#o(KeoHBIFCnvcSz)=5v@cg3u`BKPz0cpG6PZkfS(C~jpG~H->
zx+F|@=}!+$c5@}b6~J4)MNjZVA-zgXe|jWz^Pj{TxM-M2&V8x<wZFXon-!~qPaglv
z)jO&lI`hWO4WVmT>w~WzZCJne>ydEN+1DTc`R+jev&zK%_I=y-&JcT$T)6(x#ia=v
z#L?Ti0(hRkkmwQS9ZC~^2lqW&z2FGM+^6)d!esRI$2~m1H~)yq^(q=KbHY6XYj&T4
z?quMb-^DK1<;BPEZ$NnGN+LG;#`9`JYq;xM;Iytio~nL-1D6ThMtWUlceQVw+5kv%
zNdQIc2(VqF|D}nA3&4DyxZi3|%N34?h#N2G|C0??y{2L{CfuStQaSYWr42~)Pf-G+
z;qL|p&d})5>ZREajhE7Px+l;Ed;{?&vkzZ=!x8jR6WsaJXYa!Qyx{{iw*ZEYz3&ue
zyCJhK5ODRDqIFyeV1LiXW&`OiE*Dgz#yf%NrGj9=^+)N6u+(>s$<eLkg=+(zCMXAn
zT~nH&t3Nnyv3mbGydGHBwLz7q@4xF^QHZubflBMr?%vgdT~0_aaMujrFXY<b9a)?=
z15Qnd=i&scl=|((*QsIgX*Wp4!-7YyVchIEJvPV$TyQuDh3M<qAr8Nixp9zJAvBKt
zWn70-`$mFYVvvcGJ3vLLCebUj@FEqZzl%Qw{-e5(k=sxzr$DANm}ZwpAmz+83KF!P
zyGK=RbBTO<o?%0CAO{qBrm9>5gk7>2=DSNG9a`3auAzje5P!ZN$@IdSUEsHL0g%tL
z!%_LYHIhPTzSViU_9;Xb2moL99hgMGv>$Q>j9i$n%YbN>u1u5);J6AFc;Jh8;7&6Y
z%`!ySCBxED?v$-xX47aM_Oh;we-P#QoSBex@&wlrdWq@&IP;S4y#ya(43{>-Y--#<
z_9i|(H;Dn@gP8FyNVoPFD|RipTbE{@Me+X;_9kFe)qC5&LuzT512~`!pb%Tb9KcyK
z6@)D)dozeTvOq=Hg-0~4sGcL{#1>2x6mSS(Gi*@PgbsA_yr$qx1#BA3dJTt?Ja)1?
zozCez@BhBPzqK~dbFSxqbt!AFX|J_Rf1h>V_xJnjL4ZM5b+)gW00K}E|1Ph;iuY!Z
z|2`P^->=qOHaPRjQm=&Jh1muISZNrypx*uDO20C*DfLQ<`)zZ=woP?NxFzJ>@c~7|
zX#>6T@G*#MnLHWczrgj0E`WD<_D_WmK>X6){=2nOrvX6(VKZ+R7=ei~cifSO(HBmD
z;tQjp@3rH2!qfpU0k+N{=Ee}_^y8`S$7z#&rZcZ!?>;cTDgmLrnnRP^RYXq$c@Nl7
zo;nz&fY<<4k;jn1AFzveq_uC4+xvjgjnO@su52g*^62nJy<I$eE}?A=y1wb{W@xvw
z;i^8yvou{d?e&6m3I`*h3()PBfnAV706|V|Z`3SyQToM<FTpG%nrbh7W-vNasz)Q4
z98Lb`%fC|Ewdtef-JZ~)IrM675WqqQhaS6je4!7VjPM)g$5eA#auL2g&3H!TUGevm
zT%20)N?;e&6J|eBb?cFtYXA)}^4<j);5i<e0HbcwAEr*axx}dW`%$b@`8lmDP4R#|
z!^xL^*YKWAb)M~C+Q<C{jQbbxJ}<I8Ue%$_M+ZI|ZruFtPJw_OEz1K(0Rr%HU#gA!
zLq{9{5tPn}-r+olH+>R;y*$EM*>n_#9L?E`B;4wT2iyX3+Ausrt(TYnU32DydzE>n
ztPXeIh!Ne3TeLAByNE)+eYqDC_JL=|Yg<Nb@^TAk&T@_Zr8PGx%0og}V|XAOJ!H;K
zG_wvp91AL(KSd~@neYFjY&#;OB2OL~`a!=N82!;CW<tgNtIE>DyB#Pxz9OpMRm0WD
zS!L-FAC-HZ6qTM#u(dGqq~zpR%uS##PX*wkygDZBWN|AN#b+NjbwvMJm}3j$Jqdts
z{usF@{$a>^Wau&U&sQ(}9M0cMQ7dy$C|3+&pdAZPg}%zepK?B^p#($v1-0bBxUa_V
zBi5oJeA_1h6!ASCV>;GBz1P<HD#;-jFo137UJe%@`_v$kXZ2?Eosqn)XxhetGz%7*
zAkuSF4(0nGSOYSnH2cQTd$-KS?=|EC9-GhLocU%!xK}`|eG^7_=<zKhpT#^{vdnsN
z8SN{MHVqHQ2+a{4#{9-+i1`)uv8l2oez$%AqvI<(ut30VRI7_C9*xnNobbCBc4!C~
zC*jQVI1X>3ysPmTN<Jn1Y4{!g+G)ByF13;)i9kW`aJ)owoaGuw2kOnYeP_I`tBf3u
z;`_Pl4L@H;3X!yl8m_Y_b$~_iQ2oWG$JJ1d#!m3%F$`mzY5yX=n}dE-g<MV!hkOi_
z6cpO1&o4zm8orE!CGYRU_&OaJ*bVe-JcoEh(&fb*t=_cqHaG`TL5?#kM*-1x8XFv=
zP_<vEv<4ZQ*?taR8Vq8XB_k~5cb?`p2UcFkZ3qu284&ZDMP_Pj7JGr#Fs~Q)EN|z`
zwgWtS(kj7})zZv{wdxr6Q2w0=2cUz6KCK7FY2gpv2xVsJwvH)CWoi?V$Wg||KI;Mr
z1>H_D+z`>-fqHLR9#TjzfP^hLx1QLq%E6z8yl5|_>7XKts+dj76R2(hY|;wNfW?4P
z1W)|{`^%6{?IgzpKZC-%`g$44IWhKT%zrI5I*asGqK-XhluFMMKq6c>KDFnGBI-tv
z+q3l?DkHuYzQ?z#S_bJ_!@>wx$2y!8x`>6f^Le*le-q=SZS=pNs{QTzRH*B1#%|YA
zgQmGBtgpEYCh#?Ezb3EMMc<^>6zvb1w*6XC{WSNyqH8r*Oi&N}`efA)DKjnjCN&4D
zf?v&@iR|dKv?d1~?)q#_77Cz{0s#n<p3onl1Ay!1i@&V@og$!u1D%9~KHG>sQVY<4
zfIw4oa+2r_iQ*!Jmk4MCCyipLK=5I{Aj6nJ12Hj@neB4wr*81`Q1(AX0^9+_0?l23
z^s)B=TUcayQEO5PgvBAH^XDX$)b~V?5E;S!=Z{`7p-TV0s-Y!4_u33L%)-*M7%IR<
zv}UX2R3*|&PF#3bdm5(ycDc67R9{;28WO@fZ8o#wo|yeiOXkUGTsvBP8rbEgkQH==
zs%lM}+oV&4oCN!xhZd3ky9zpBg+dV&+o`c01H9gG2DyAy3nvwFi0h%T8@L0#Ul-sg
zA%vmO`4s@TD&8siuN-;7I!hDrQwBO<<adu`b`LBtLq*`LmbLP|A5uN_fPJAH|KG1>
zYu591N4cS;g42|Y&v2>!D29XTUm<n?3gC)j;onzWP%-<A<p|+bGEN^pBvkEHjdUK#
zzyWz+S>Sj@29*7E7;urn106Bpfe{5EIZfs_v(c)i*sF90NA;17f&|8E1qL?>=nZcS
zNwx=E3qLYNA;FH%xCXsyyp8|`N@e7a?u~;`P*+pozA@l3r2g#(H7|g)ptg+PahWE-
z_F|s5Dz{!J0ogp#LHeg}8mrIyM$Pk|4m@zigtcuLUUZ;p!-49(Q?G9ED=RNer-@(D
ze|V1>LEg4i9($)2Vl~Ep2>TzE&y7Yjze`y;R0GlR@rvJR@w@i5-|6apiRKrqr`XUg
z9EeK*-9Fv?MOA|6`+$KC62hSbY*U#&9U%5n^e-d^gf~RZ!fQILfZT?txezU8m3T}F
zFe%gCw#a1@;H@nKFZ_t<Q7_<<yz7HP@D~lRfYXV-VA%>`LJ%R3ykS|yb0J;dntQ>7
z`8$aOTan%yQXH_&q#?m=%j{ht81~s%Mj=6Rz-{xK<6H+LUw|PQV>4dceTfh#XNPux
zu5R+;p9)uCS7<?{%J0eW%8h)t_K07j`|PeDpC<T6Guwxq`DTtba|8gbO73ZSo7M(u
zW&&^y^<Is*pB~%SUg+_{F0bM^5hVnK?tD0q3IIHfu^6><zl-g&T?}CX;{v2{+V-qH
z)0qRoJC6Gb0J1<D951O=;BJ^^>tH2>aTZY)vdb<wYx|YptZ>@-Ez`vI@2EzI_RnwU
z{@eIXd@+VHj~UM}NYT0gf{-i3<!}}AspLH_Lz?X1iF7|M?LzVIIRQxqK8~NX1J)r=
z0OmM#8sjg605IgcQeN@nvr>2?PB{X77F>W-ogu~8^$Xku-pYA#dUg*%J{6j)Vh=q&
zW^e$ZL+1d0P>r(U`Kqr?fsH$Y%Rq#v1!RCc@GdHp0u_Pfjav1AgauHs$FW~k6l_C5
zpGnVJfO=?+C+3|su?&HJKORrlFI>U|x&b2WhFMhj08qova&}FHV2J`Y;_`7z%4dMm
zFVl-Nc|Z$g5CnfYAG+5fKL`jwB|i5?BX+dAVM731wlD&F>;!dZI6*`P9LUT+Uf_G6
zZl3go`~v=90c|w&d#GF@zXLf4JS$ODpnTx*s7vW}&YAO@IpO~_fBE)Di-y_A27Wbh
zA|M#9ygV#u>Mr*#mkpm6Lq!lVA?{`FWCu6k9X#0Y;WMpx2{+l|Q)}!12vHf@#(^8;
zV?z2B9tCrM@GzV4zYODo&hoHO6!@9u+l)(V%r_Ykq_QK`1GR7waIHnB;X_DSfsgwJ
z=mzj2Zc8$QnFRa=Y|kJ966A69N=;6#GCzD4w8(}F+c6zX(3VuRtX-L8*K&x?NPJXH
z`&8<XAwpIc_)N`=80}UM-xFR$Cc_7G7bJ;*;^3Y66VW<Xn&8*_fRGCJN_(ICKIbC}
znwD{}s<tRI(&ymQs2vCr+d)hO<_wyTixt6IeCbCo^SHE&4!RK0Ar=Vdf?|Nw-HB5X
zTJ)ky0HR7zGX`i-r0O05(g&0c7zwb@(LV`C|IH{A>$&*CZJ<~HLIMo#3keKp=ZC~r
zLcvCyM5uyQ^Pq~vR*f30o42OYT9}2MHe=}j5D~!9kxtoz@&Gnr9?^`+Py^C|3v+@O
zjBG<R@LAaZiVhAOMr5!uCVZ&TXOk6*K#bJg;RB91au`Yc%j0t9_im976cKXfkJ63@
z5%5D);9~FsVtppy!H$+_;K79ud^iYJfQk^fbY#5W?j6o@>${%$Xa>LL{GbTuIr$Jj
za!u$U5QMeDb3gjR<3mJq*4)h{505^O^sV)jl+o=>>IcC9Nxtn#TI0Hh=SDP#vK}wG
zKfwVx0FSx!4g7@{lyu-RTN4vJHyt#TBK-eNxv~}l>m!gdU=zE*p&^JD@aSMmzb04*
zsZmQg`AhN<!@E27-}*k>{hr5#FAnv);c$<PQJm1#>{nV|mcID-yZu2AMLT+@**1Sv
zGuO1xM4g}k_y9}6-DbENHF521ZxBUxkSGao^j)HYo)&<<;96|g7bfW-;drqFNF?d{
z!!wgI>H0G<Fj3PN7zHTqujv!d1cE*|*w_2INCBEXgM(roR4DV{BrS&Zn4Jt@03ShY
z2S0)Y)C3@jN)mM2<6d<{hJR-Jm7D<iAnHnW|8aB=P-b7A0a>ASy&<l;U%j7uLS~cy
zT(r5N*}g4=K>&h+O<#)EmM{bwyy_?x6okX&m((8K(cM*iKY(m-o5gxC13c$s@I{_5
z!AkrI;Ywdn!2%g!+o|Fv%>&HJA_ekL6%<R<Lo`=nLV$<~>Kz?<|4-N`4=>3o_zz=%
zMQKV#7s25+c|(g1(uEMgf$L&9U}`(#@b(ZwdwhVI|DkqYXa^hyu`kDTmtmnp241iA
zZ&Z!~Mz2gd4x|K84%i`wCWU;Bypk(~vEUSH=mk+Ilbp?HadA1~jSvW!$<s!A{`<RA
z;6<)qNgo6doJYOJ%A>>K7=C0#pTulFEq-M4G0tOba)AK`0zLuknU6~o4<Po5sl=ir
zmg`?OtjCj60)i24g+u@hASk@=E7TBaAGewZ1&3^aZhS*a8-v!1xdD*^*D6JQ+K{TE
z{t!wq?2DhED&bf=fXIAOpC10Ae^B<8eS+3cz_2P21DqGbZ3^q@HHE%PF9+n%eH#x*
z8511eWi;ktNUx~ox~HH^Fo}R;Q8=$E@Z@?ic*9*#BuLKCr2r8`&@o?vfdT{CENpn+
zml<rdP(SdX3nT+6WGvdjbSJt6G6c~BGK?lS;QU~%p8j|=`rPGss*-LrK+Th$1rQQo
z00>%W@PY3O4f5&o`ko+vkN@8PXv1kr1_}GmOk#g37z<}Gbe0#6nSgb{&=-;o|FG8&
z79jyCy||Y#jNYcAP!;JIH>(a31fU|WC-9+-pkXt<;e(xv(0L~kP?0IJLtLUCg8nZH
zWB^jOL9__90VBv4&@{#cof&USb?+Z^>RM8XcV^_nb*Pz#q<}cABo!y1b_&&mY!X$E
zd#Mtmf}RD5YCE58`jxfrm+==U)d^Rq>8Oe?cCQhbOBG_6Q&S7*;2wBFL2>KIpg2hD
zAvi&gHcF8~eS8&qZqI^ofrbLhK8MhNJB$&AI)C&s^ccT^bCT*oRCngjp%}9<0-6M#
zAuJnMAMj{aTe=`WX*0?+v5+ISsj|PtW!)p=19Uq>j}^G4m`N{7l;-uyKG5c!NvHOZ
zv=?dvj0Bb(Feab`0Zm4*YVgpHiiDC8;7dS}(1`)%{fZdK27(FemFE!ViD)5yVFzGB
zpjw=~>&=C35k1Q`Q#!~Cq|m^o^)<U3Sfwcn`?xxAhUH-KqydNlRL?@@5Cwh+4`f>^
z-!zYoNf|nMw|jF-g;EzTm=GB7;D^KLI`6mJqaw%(X3#JJ%y5VRVb5GXfM!EXj3c_z
zH`50naxKsoqAQUlnEP&NX-q|Vi)adjhA0XQfQB^}d~&S$ZqaihN5qVuH$6MqEo^he
zLB}Vb4wx6v=|f|(+XC5wraTP+ApilN)eS>4By_O72z3FauqINYf)19#Z`kpf8(~3P
zg_Hr&Vsnw<{^Y7_;ej7U*s&_LwBVa^i%KGRDg`3>NN=SxT>hr~q9_k3tDG<{pge#>
zKoSTnPQ_6dW|spO2H8!q6N(Ck7unrg9D|Opc(Gr_s37+ikH<Xru88x7MbX=8%MMEX
z;*0xj;D%X-w$T%zF+>=yGH-DF#kP$>s2=b}<6Jj*6DoUv#j&s{P~*1>i{tb~e^)rc
zgE@pE&1P`1!@=Vn*+JL<b^K5s9@7mAi6COor~5!Nfnh{M5XF8#10TYHraa8W7*7@A
zrVZ&r*{^Xfn(@GrP!N%-;Y1kzWiWisYyl7gQbL3KY!v!Iytrt35Oslm4L!;?vl3uq
zV?q<F@a@f^p!ngC0h(wunCGCjE}$Se5NHV5KOC44uo+9hiO>SOEhLpm10Y66uu$tn
zL!b@;Z6diZ#$W7ML7@QOAtnV&3u^WB-Xz`Vm$&cAz5otv#jq&qzLxUei=qEm49owt
z<K%rG>H&y>>W1bqfN6juFe^Hw6gs#9lnGddD16Z|V4%DNO_)%n1XTDj24M@v6Lr3u
zn7>1YD-r@WaQxQ=16Jfoy8;gAI3k5(p9?mS=rifB@%uNls};B&AOh5V(G)s;mqY}m
zC<15PM!$pA1Q_k4kstm=mKj+w1d<SVff9y5E<t56p^iKu^$LUF@{=6KZG)@=<r{Dy
zwfQ$Wt(=ep-G>|m{xIePJ?LI2bwc~xi#&r4dPp}SU?798;tjOj$5@~)T4u1LT2FNz
zZV10p#S669Ko6{d9HV>;`GM@jQipo~$5Zs9L~sQmJu%vG8Z#;-`SK0$;Olr7MDJPo
zK(T`3k+2D(0Esp@D~Jt%LC~}Z=Q)ZQPBm$u3;N|l0gzHbwm}fng0TveHpHR{B8w-0
zGn$2>2MjPG#^NHR3{a&T(H=mw4BmVCHXx4FL{LFNvH*|GY+8U$K==Zx5D)s<OVnHd
ziY3GZA!<kyMyYL}6d@%EnB`W56lF4ZN)qyX3Lo0_V=zj3NB?{BQw4Vb4f}1zG1D>-
zUT}{agBR{0^di{K(p`xJL8n^riXCjYvNZK+uI(Xwft~V--VTKq0aXHgp;#f*HU<g<
z!wygyIG5~FaX0Fxt%sd~^S?aQ)`>>W@|&235F5mqu>aJxarjrI*uAgz^Uk!)qPK0c
zA%&#4+v$AZ4-1k8D;wx>K+N(21>|#iLZ}KoqV)lr^Y=={AGs7tqDCTy?GPwPDA+(N
z1b33e4o}!6Q^hnv{m2?X#9IG}nV&?Th2VrBg}rF^dSn~gU~V*lsA2#|>-@@Azc>k`
zkdTRP!f0HWkniutz_feZUZf@4!Xz(&_DBA1)L|lPCk{gzqW{zWy-}@zzZt4s{$p(P
zhyK1S5<p~O;M_u$WQ<|tfQCcQ4y6fN_aEp1O&uc(79Y0-ZVVktBq4{{2#|!XNCbv&
z#iB|rigdst1O^z}RRk`o(uCcaS3=VvD0BxnH1-{N!TGlqBo$f+4R0=tK~15s1fe0_
za=;VQ*VOF`3^^R#;%LJ@lXrKIY^msBWews2$_dqrVjwh-AfgmO99~?LZ}iEvf-Ocz
z*;>%yht|X4=;(@Q>-oAfrY9<+Dq0p>>@h$Hp8-vvhKgdW$;sYWWC2T5R0M`)#hxEx
z^sz%`hzWK?d<sw~vVa((qpbO!M|V!SF`x<3Le!kdgNQ07*HvvU%WRn&IMwr1$jyE8
zldLZVn%ou+J@V>^-KqWuTXUSL1?ZE%J+Zo9b2$3{c+3q5;DTpsxeZbQn&+=_26=53
z7egolQN_RyO@lTUpekWboCiD#$t}DcQALR%<b@3fLy`q2u9jPP%I5G@QL2^!dk+=y
z0`O7ne}9tc=`ug)4y{}KfDi6b+hUI&**6bTL%7N8cj(J$$#ts%41qx*MaN&fy)lS_
zL(zdA1c>b-KFk12e0IN0G>IJ|M07#m5voJP7cF26rW3`xm<4%4{D@o1rJ(0g)G^bj
z=NzPh!5zHefOXLiRSy{WO>0~%v6A8gSpbO#t%d>J{yxQ?5FZE_A}@d@kaH+U!2)Sw
z5xoUi5({8JNC2T|4<(0zI1d<Nkv~`h=kr5xLXi)%iLf|Ow18YfaR6iphzrmJwhbzh
z@<5FkKnd^{Mq0LFc&A_hI?!YXU2G6xf$VUnbQhZbD9BKg)C>&65tSYo$p>;cwFgi<
zkd%V-212$GVFuml=UaKW?*=I@gqH#JKuQ8sP*Kza#R>E|_zsS@X1qkxWx(jtz9t`o
zG%OIN3>7)lLXD1=5ueI})@EQ`pAHEIz<}%ZT=x|)Uah0Xz)A~76n&*k5Q4P&P7eQ|
z94G=9wsk*bg3Gt)L<sN&Iv5)rosK3muiuG_1#7gIH>fe+_3aq400De)hM+(0^L26!
zd^xYhpbRO1od=Yp!Lg46yhJXz;iNoVmI+`qGz+It62YlpEhr5IO1^eUxD+NTCO{~V
zBFSz%Mu`X*3+W(43{t@a(OP)7>`=%VYk&qKI)GKseiy?mo*3T$W1ko*NP=-)4fK(C
zZmc%s`@1j;Km?{fb&xRJzs$1RF4;rA$R~K<ju;X|)DC5bf()8n(xoaArH`CxHnJ<u
z40A=^dYK9o7eLehF;@WF9wWsGm52khTp|Z%K1IF4k)(lCB3losPJ>W2#J&+Vr=tQP
zv&l<8AwdSFA<z{NQjC;YqM4$WYwRlag}g_jHW6VH&ZVQiTc}36Jg`TOv?J~Ym0wOl
zUV{|z;e0$09*GHenUBPCeRPxw=EUfK2R@bGt{!Xv1gOx$T9?T%D=uXS#>t3jSxRKM
zg9Qxsrd5nbYB~ixh^2@+ET|t+IA$V-+HuqnM9u&ja0EqA;)*%pZ5y<Sq0k)spk!ns
z5+O>4i!`8BNIF7bhN?s!sKR6$GcB{&UFj8yDrkR%MgEAkg#S^>u$Q%BRKK#^y%i40
zsa8`#98!&Uz+M_^bgyYMbS+}j1^$mEWtCe}lh>eok;+zb)g(42B8-Sx!r#%<ssxk*
z=J1F90cE5rF?*4eWJ;R`#4C2%EOQ2AV&a1s&*X6niqcnS+3TMIV<^(VefVx}@?7Uv
zKi<O2KNd9Dr*5SIj}Yj=N96gkeEz&>+s;o=R2hn%$!M*ByrT#gaZETc4Oz4Erp6mu
zfg?kgT9$!XhdNcBc-8vioD9`^NV@w2M$qjSdPLumCvmDdk?7vPWq`6ckc`Bl^KU3(
zU}xZru~v8>_~q7*zC|F+iop4EbwPryfiot9E4o-;u{J<?Se5)uMHlBi>*mZW^Lv9i
z;sRk@WbDd_2MSbNXz{M5qk$;H;pkil4h_YR4>$z{f*}Wd7>o~K2yW3B!Ul#Yi8*v7
z3^D{a5iib|U}PArQPzqqb7hP<!$lOv!?7292V|spLY3IsB0>cC!n)tHVno!rmW@Sg
zKJux8!%>k1SprH#>odWQ#)_iA1zEA7!;fdAxGfwO9nuh+Rap>ngM_hmiide(W&eV2
z3#RyH(3|i&GBw)^3n+J}v3l<~E#Ah4B7<815|pJiqr5+9hH?=e_$^RFvJXq%Fzc&Y
z{N=#rC2!1Tcrx7UovDr_MHoM|A?3hTM|x*gLBl{g@>}Qf$9`C73bW(}tq$GWJZHDv
zBsj6R6HeSI>wiJS32)o^<L~YZ0&tX;JGuZmy!uB)t&g1LaF0pZziMlR4iv%}P$$xC
zG(5T(u1fLaM|sdMP`#ihClQzY+o)$)Cn=IddApr)@c1ho><q0GvV=MXDS=^#V9lk7
zdhdlHY+?YWpgOT$)DIPe1beU;0)7UOp@xoyP)^s#HPNVo#EFo1lmw*66V+U|$2~E-
zs3S-uTRY-ILAW`{Z#&fn>ILSltrRBgz7B6mIm({;$_D8_1VMs^gfuJwEuaCBh!o*C
zL_kBl32Y5(UK0YRBLu^pxEh^|3&4SHTrdg9_$2HNJ$6Xhg5`=zYlz+g6p*?}yPQ?2
z4jp0!JcI0xbxOzx_vMQ+zgb3c9Wc}-kRs?B0B2;lmG8wUs_m>6pf89TAP_*gK)*JO
zN0``7*Fyk29BqYsIKe$i9&lr7aBs%&$H1akAsp?sz$Jd-?O8EayGL?X<O?;j0zR0e
z;Etjz0DQy;kqLV7l~DSjsVIMhsfH%N2D=<;K8CVK;7lu-0$8N{2C4)@1WweX0HFma
zq;P2^Xj25g0t!KQo*I|XHQt#6jUHpLBor~==g=lWdVs~0xTd9`1I&hpi_{zjuns^%
z^*f@;p&<cL17U;Tp#w4wp#`E{NKFLqxsQkm^gJ|?0R4<qHKI_Ik_U3m@DB!W{~W|A
zFQ_^OW*qT{qzV^s?H~^XA#ewp5J6MnCiZWaAf$eSn>SF@U=%`?Kga^yk8XGm7F;-q
zCm{8sfHhZ92Za($7s!H-Fgh4w%>ag!W};mhiz+cR_CR6-)KDCtX(}`?B$&zmO04&g
z#{-IjPQjdq)`tPQ3%fGW&N2FRzp)RBfzKaHAOFecOr!7t>JWen@u|@GF&OHK1AqZp
zL+TLYn3?F4p}_#&%B9+3rC1lRKYTExLba%3NydU}HJ6aDRA<=*Mj({n_#r6TkbDJj
zMBD?&8KOtr8K-E3?h5u7w%{4t6${Zepj?1*?DaEYwBQ7JW!Rb6<7@Z_EQm4VX{V56
zD3J^SFR6=|w&_d)w;<n1(?+|z1>Tv0N>EU?e}n&ffD%<zmnX2xBk*uEOcdZS3ONc4
zRaILkc5vIYfGSkmNV^D%9;6M}Eltfy4c<ql1&E+_g=oDeAok_qZm>_9kn1eP+y~f+
zY8HZ;)H(12T_FU#!Xj&@7pJO6K5*-0ZW$jJjQhH63Ob((JqPL!S7b(JVMd2N{i|wA
zkmsCigWB+xI|UDoB}x+FLctMAv4{%=M-WR&isC}?qsWaq#&B7Sog%R>xkHByCkiU?
z%i^UNMI#J2A39;s?&yjGQoSHeOb?ueP4k0SBI&Tox*nesTM?u<EVc;tnUMNKPuLkX
z*0gG*F0oUZk}OvGE`UnW>4PR&?9Iq2S{#F8-lYXnlXn68L8Yjqnvs#IsT9@5ti?v(
z@fpdWkcx_yQPoTR@{B$u)?82QSl*IZgnUFx#WHI-nPPm#$9}sT^-lvb8Yb`QU-6Q)
zG%K<=hM%zQC97jt)ORf#voB8GGs1dcVnu4T0LS%x^Ro+%4dus7v_U*Sd5`;bv*(K`
z3j;5jAD;k(r0cONYO975A4ZFEQIP!3)C$9cf*&9Jv%HFuM|1eAE%P-sV{epel~G?6
zy&DCa#^llu+71ymV3?3USlIE{_0Qfm?G_m$D#|uGUvvy;8vNk<QCliJ5mHF`p}o@_
zb<rN)wjjhT_O4hvS%i!tJM0e#9AbaaAt7uKAWk0oa_TqzQP{!0N{J9PHrQTqhckl6
zX1^{vcWgZ=^2Og!(K!N%2uV@85QHJjv6_-${^En@VR=X$hN2CE$E1k}R}dFYMqP19
z8KK8Dp1}4%5i1~4Xyq2S*>5SjKWsw~iWZv4>5V!0;BS0nc%XE5(HYx_jMClY1c$eC
z-azp(pi-EqL!5GMs@UnzBm{F3<{*$lvT`hpI0%P;3tXFl53H+DzK4o51jZQVu1l_!
zMoMm87!1KJ)<bkpAP2y{fTO{_h6D(5$xV#g(nv|A8FYXcb^16R6C^j`n23R)g#20v
z6H-56Z&xpPDy;9IXE2BPNI1<AUnP2IBW@F<l(2v4<e`Tc)R_ud(xHLEf8Z51{}*1l
z57Gt(IOT<iRKOGlh7l!l;D)iVO=1riG9`;iR|Ay|;)3X0uvF`!)Gp;n&QjZvm$I2F
z$QK+=IjyjZ4DjzLMp8|%pliXq7wv^VRb~NS84vMTq!{Y=)cC<ZFga+{U}R?|6puxW
z8u}CXqNylKR5pzO1#tueHHtn|5CMq>Nsvg*L?XI_;ih$_f)$`uJMhO|*e+YlS~7sG
zjMd|zHG>OL=?mi%-OKT)ln9}^8Y7Cxxf66@#MPDp<s5vc<(XB-hnyT4&6NrveVD1>
zD4Kyh0R&_TDzT?qJ5Hc3GBgP0(IzFUXd}G17Mzw4MvW?<;P(q@;E|hPAW?B(gi^XG
z`iWL!hVLQC2tg5ybbLy{i1jRLL~(|sAK1DvpTwte2rRIZQ_)HiH62>R2-Wuy$AZ!d
zy9eMK_*FtPB9E{aay;e<M)jz=0L?-{kqBfDG<-yQrRe1ACpb7m-*~e2x6_I>N+BB<
zoH=o0eCU6~iKoHgTm>%j;(!<uxs;#67;2c8w{?u_Y6ot>B!%=g5I)F^?AnPaI(Z;|
z<OY@S1Ug*d7l8^8+Jvql5=n>%1f?JgDlEVR4AqJo)R?W-yseJmzMVKFh;b2MlZ&HB
zKneRraZ!+jOQQfGFtkvS3Pl*W8zdB2Kqf@H%AhfR_1$ao5wgfREBQ~2Kc0|Q6iKT8
zlp+)sp3Y}$v}=wvFuh6=2qj3EB3gv{m1N{a3*s6Rj*Lkr!ylTqy@Y5ITPgo{j2Xgi
zlTXLv+Gg&|+eZZX&D?*%^%|fZZfM)iRtQK?eV~TK^Lfotn|MRoK9RL!ywNzy*AIO1
zR?i$y8@o^GNP$TjGW<XmecMoDs)0tp)fWE&t%zB89&|IJhGX)s&47&Vk#9x?%*mJx
zxY!stnNG{&J@<JQ(vE>h@{I$kM)HRh7Gj3B_v9U|u`y+vE83uP^z~iovmUC)5%36%
zk(%8euu<XwDU?2zTMj5+WiP-)IVO=Um6HYzom+L-JUTiW9?J35@sKp2jv!~@QTcfL
zrd-RrsYq%XK_1aD4pZgOxo1rN#UKxpr8M|Z$-o2rbgm`b6Q6wWX$+N)aL+P+D(L(v
zb<CNTse$IKic^7WE<FB3Yg}+;|7v`!ONsj_1HiG=dVE;)kjsb8v|OCLZ%xL!iIu%q
zkJ^_Kvow&Ow_X#qWAh;<FIfxnHacyWN-ASNU<A#b3gX|HSOF~r@<{WN<xvP>fLTgE
zxLm^B8o~o_M(YyD@)*~~LydC4=_M&KC=4yP2i)`cwxQrd>kRlM1>lX?_g*${y$9B?
z+H!*uzW6S3>kaup!1!vxh@2>!!Cm3WDi7_D#S_;>Ze?i0W@sBVY?@bBphqF%o(;#3
z^y}gNH$RO+x=2}wxGY%YTC{(B{xL3M)+H>0GD@(B29Q{bat(STALxq_Du=<fk?>ZM
z^c|Sapuhp6<czA`0FkuJmF*?<r~#4APm#x1+<{;h4U(jyA;pvJ{$c(>S?=?8g<~Py
zKPuZg;$r0d$Uc#w6(QCAZ#eAD^CQ<pWgACqiv)A19nO<9l=R^b5U57}QukQqN5`VV
zgLJ?OkF5-4Hh6(Lz#2FL<Ctt6OX`@WvxZVbHe#f=9lfhj2WBc{PY6!B@F=B~<~87m
z-<Y^mu}Tc_KpkX4DRbbo2m&DMDdGk&LTMTdf}oO63PHocHLMMVD!|%K6|TUGJQp+t
zq_H3oL#c=xTH^?L_t!j^j-rB+C2%3JVqN5O_=jGgz(f{^Dhhh=4LA)u7g56C#6|K`
zmoT)u;b{K5vmq6tVjY}M$u*ekvIO-O43|`CTmZ9@m#;fKf)&3b8zPTlA37><76>Xr
zFhw9SDiJyxsgY5z1*pKJMK3(MBr#S193paD5p-ZV1QU?D$P%2qNiq-M0RbG&ljuSe
z6l~&hMLJ;A&Q+ZP82}}n5F?<eU=MH=AF(#WAUZ4^Z9^^;a)(Ykcz?zJ2Vf+;`tv~A
zFZB)R3?bO$CvzS73`H#k^?*}oE5)&!brYI3<Lc=w-y!v*sPe!BiBL08^C+SXZVKTO
z30XF<GDA9I&@|Cl1Db{pr+`p_Pu^o!no!_Ysv6Qw6MrCG2o=0=Eem4r@F00bu#p(#
z)DS{s6q(t95)G+_n__!NkVT0dsKC@_pyE}^El~ynnIX@C%ct@pLJBTO6^GzF@Um#d
zbU*f!2S@lt|FryZ3^786+B^<~-B>v4#6YiU2&#}&R0a_?ItD)TaEeGqDB6r;x+TDA
zfHl$y9fBZ1;0<01NlXjs?;}63{**!q7ihc4Fw4RcUJ%ZPOelw4C5V_o2BZ|y&T?TA
z#SY%kKR{0)Djy}-lxqeKMsH0RQQ=f5B=9nD6CpvM734vn^6UbF$o;8`6~GUN_lGH#
zY~_u15KEXwReVH}krWBehp$Z7<>4#0amgI{qi8RnAJ*5R3FQ!b{aDGE&VjL0ThcIS
z6qFKlLWgC;UYYBX&`3iIndaJ%Kjo`P`jvHXe2RAby2X4GGf_1r)NV<{lvI`{7L9GQ
zBm!crbIK_hzKoe_z_B$-3yLciV%rD;88HqQ&>zytkRV^fbzJQERC402al{pIy!M|<
z9Xh|jZ1D4`i*Q~|&a<C)kEP90=$z&NSAbYR9SD1RQZY$~qyi{$q;_8YX5{IpuGl*+
zB=vE(g>KQO@p*E74fthq1qo%itdCL4VJ`p0a<HzU?x-gqL_1(Nvz~{r0;n>1cQii$
zL}HXwlC2~Vsv`($cvMtS9hnSuq#B$8(W63FM@$t(aAcs4h~pAmkwnMEZ{OW?_%H3B
zGExB}+&1Y%yx+cNd^{A~5{h+4UY&~^$FXXdE`FEGvMLXlrmPt7b4ttzYw@t?yvw!U
z4%|s%Nt{?Qu6l7+<?htU6?0Dvi!Q%h9^7K}J+ip&nq$CKY9uQHeu|6sUVZxv83cmJ
zA>$k{MMJ=6dtF>IrUK}3dLg*v*=3d?ic8+F7knvr;o_mB%?0sjZuQQX<BCvDFL^eR
zp$`MJkx}QWy6-ZVmwys<Vf5y(TP6L!8x`$d?=i}DChX_rxvN1XfkDQicVGP3pyfRH
z;fJ!WQBf5JK#0dK=p(%WG9mZ{GHG6480o|`6A(haxW9|XV-P}25s*q0f*>N&wy|r_
zlpsG$3^8o#(k|c+KbSFC><WFvC>5<+PtKxoGabz-uDRB#Mb@68&g4Eh42ywS)Krnn
z5KtKKNZ6Gq&dV4|B^sC%KSsl)Yw#@S9U^?3FCC;q#x|jl`O!#f+{O4mKQgouKvM50
z;eQZ8=Dr%x<UEz!CwioESg-?$<vOJiVv2FZd8#M~QMx1l(XNtUeqLrUagcK(y_$-8
z7&to$;-QpKmr(H#3L9#I2b)Qs&#CX}Kbb)@fQ?GNoGY89H3^f$(KksA7#Jqo9+GWZ
zo<rA7Fj~9P8=^b>q&KG)*+Lu1adL4^G|CaVg<~PBO_2#vS&v#au-<}!OO4KI0j3Hq
zBW3P@GnlOO72Z%s>z;`V8ajA9R9Y0ifLf%dghn3vkgfz0sv5jemDbRQcc?44Oi?_v
ziVg)UV4)ASG7wyf)GN~6Kz}D)W6_#J=7Sy($!CI5XiYy#Z;PRWlDI;UKvcsDi9I4`
zN(Rt$61>mrCI}#h&|*Rq73Xx<k%tNei&o1UCTdAg%tW;TJcdROyc!WM<RVeRvWAT<
z0Uk=b04mv@V63zXHK%x)%+Y=z_lY)LIGkxu0SwH!+-5K!A<9zMlj>|F6t=yf?<4w(
zs#6gsNO?rHCE7fTlu}eagkjBm&c)31#X4aMI4l#$SG<kbUZ`0`wI`4Uc)@O-L4ul0
zdLmg0I-vm~*BaRsCr#fL8pO&|*gE_Qnj*}gCV?Q3)`;z8=A_Qdh!PY)GPrsd+kjnE
zUIRf!x;*V*VG?XBF!r2^Zks0=fptwkDFTxK7=kfi4>r*VTCY!AHAq2<a1XSd*FVOf
zUi5#O_P%{_62^Cob*TmhHy_mTK*7r3u24+cq;bVs)RoYjDaW9zF@>ZsFsA=cmPt~w
z2J8mfB1%Bf>P`S7pq0iB1+pCZ@il}46%G-+fjdLVMcW|Mpw49&w@`{}ai#r*2#6;`
zuxp;AMRXm6XamydXv^rkXaz91knPuW3Q|ylyeg1~{?Oo|wy>x?VVZHl5_;7xLHR!m
zu^R~{&jHXO(~wi{hvJgR%Y!#m`-mSjnEngCSv{T$kY`p;B`@H+Q9wHmCBLTu-0o=T
z!Pl0X+dNX&7~urPzJ3Z#!h(|@%3GJrM%#l%=dFcoi5WF!su!G_8$c|0GiVs?79!JX
zbuFr2^H5JVP#f)TpNUR2Xcy|9V6$|8+66CAidgM)y(SX@9^Bjft(VOG@et|vAO(y+
z)Y`ryaF?Isc6YS;CeJaOY!9S9Lfz!%KF?evO(~8*4RMG;gJcNlrEbfBRS-nFKu6g#
zV0b8qBbuN4j-<?@VG7WM7*m7D$d&=awU~&~N}dly7zCUH7*Se@_%VA$MPYyh8cRdn
z1(QEr8k3d`>DB~9K{7-_BN5nCp*EEad|=jl@MWR{Vb>hX3G?aJiqL5k4Vp8iDL3$G
zK~_|D+cN7Z)0DDqZSn~Q&9^xVl23v(wvsdwCW2FL?CaAA2C3KxF~oXv--0Q1*qm2D
z5Sgez<hSscBJ0N)70&Ru;~A&Tz8k|M?|B$~D^vH`t~my7ww_|llxz~JvB@5b&%w=k
z$u|pLxNvBjtQ-4T?qW}`Qmo5+;rt;8B%2Q;XDta|I#)~`w^sx6Rb0gL?h6y<dX*li
zD$P#&Y)?#Z_MA_m&Kb6jit@PV3$5g5kMX?|dgu3u_f3l`oB}i{*id3x9C{$juXj<2
zP)O{1X}|<zQoR8$%b=ok0h-K~OvrotdLTn$SHV@UE~bUuHi^Zv?6Ka4HeERBrrS5A
z{rVx3Do#$3vS*k%{VuZ$GpFpbLDL474EtrcgcB67KtsXi5;V|E0?J@Bqo@_#Q02PE
zeFZWig<VWL44{kh>IV0DgFp}XRbdJ+Jz~kje+8DqbE$}wI5sxVkM`SLG#$c6yfrz{
z>Qnv}q!a!}`6Ppq3KomZTkkrX_@9-ug4{@xl&Wm~4Tu6VSy1nX!@dgl4}D)}5GyR0
z5`{2Ge{8wHepTR_vV_`syFx7abZEGFjc6*KbAAekYr_obqxc=K#NYy`B8eD#>oHla
zvTs}}3oVL)3PXq}F82k)oU&n1+oFVwL>8p93nLv=m&AOjONF#?$&~}q7oeF?JW=&5
zGUNhKo)9|-1E!{;5MqQ>fHf2zIvX{e<rLRd(BR-Oubl?}{wUc3n4~2@c<<N+eK*7;
z!arf`BZ*NF8+ZvgWCw#Ms#pYVv~?SZ|8hw!3Q~8xMC>S*4O>{!NkWPr@lSryEae5s
z7c%vMrd$(v5JqX)e3p15FYQ=Bbt{HwO<n?IY~i)w@+r2!Hqrzg6qSgp1L5EcHn$XY
zh4X94b!e?WW!5YJ7A{Mq2S@~}QI)?~6Gogv#32^Sn%UqACXUuhlOI4_(ku)A9*_H6
zk`lx)DNz+kgGC*mPf+TGuCDMCv?oFvn4(-sI|!qKEQX?EnA`)M7Y^$xqH$7}B6_+L
zl)3>~$Ot*A0~Yn02`J}zScEVE1O!cZLR_=L1kecMu)r3aK*S0>aS@J`hQWR(pqVy2
z2(;Y5!&DbTz$qkJ#llvi&jZGh87+rYp+TpHH!7J@3a&xiMk-$rvMuaocBvwA5%&o%
z>5rIMSozhBhEZ&f0JFLI=%azH9Kc8a+qd?&!+NR7CZ<-MOr@f;R+#3k%!*qsBb(AH
z7|j5p#1SakbrK39QiuWzMhA{~Eu~5sM9Y&jqCcjVLNRFKh>#10$0CIkKeEpkWdIE^
zeni<!yB>210?ZKT9>}A(>UJ4RMJ@$kpac<>Tmf?6P+p>_Clpv*>_Ma<O^_XkLH~hm
z)V|X)c{Fn?lB?B}9Udg{l;7(rN|g~zF(>Rwp~A957iwq`K`|n^AcTrbe#<?<PD*%r
zM7@_whDop!eXvRcp5<eb!56(&H4LSJbV;lrV|`p4d!6Dh@1<!0wfG-;j``sN3;s@k
zXDGnXJIdLDiNX-Ha&Ae?@l^Qol>F5;)*Bw;--V|a4Mw|y##u>T?i(Sn%&HB}ZU-5;
z>9{=urbh(fX3JI&4^GewrO8?KU7%EhcP6g~o5Z`X3Hm+3Ob=WHqA|D5$#@=G%pxc(
z5uKJ3TVs{#@+MW6-E&YObCd`(aMFOL>KUkmiEKIX{iK19BdMzKNJHKElbt-CJ~VQo
zG>>Q2dxy=H(Lrh1OWw^1Ti&hpgz>GYmbPVSXG~*r`fR;7eug>Nk^TM9x!>mWDgST%
z;{#Al`kcErJtfN2_EH+iWkt8&{t$Vl<>^Nb1>gJFZ{P9s|C&@e?!*cxCzHq~``qsT
z8kWx616%S6YRd+0x4R7~I6Svy|G?;)g4)LiZkEq=^4U^TG54poxqo&h79?d}Hy2zz
zJaA9q*yix*&2Fzo7g0Akki7W=+m8Wr+{RL0$$l2TPdt4e&)OpJ3f-Qx+l_A4__DyU
zpS|^L0pcaeXYyV+_s$4F%#O&{oLfg<-23N=rAN;96J%ND@v(2(OV7{fVcbx#q4eq4
z&;$GZ`XXRbTIh(18NZ^$*j@QM6{CGW4%X46{LnMg94BG=_$f@mG8Gj`pKKb}#o>_z
zY&rho_Zzz?IH9DXhy*c`TN{-&BKcOAc=8b?6>tc9dcV@Xm~@i14c5cq!CF{7!Lu;?
z=JN_qHUUqfdJ#^5CzYM>q>-3m1(R4y1~}(IQ&GG4&rP+?cAj#cYBBnh?{tBUK#4Uz
z0Fe@dwnvjSXTE79=q1cQ#NzPInKv*5<g=rCn!C`>%C=-{B^Ci9n;fW!!FIHJV7so@
zi+{qB6)+N4eBLga2%u$m=}i>82F5(RWmib}1i;MEUtu&MbkYtj?*l%5MT1DJI(qvl
z5`jcpcZJf8QO&rpJ5wQ4T7W8mB7G-tfR-x}AW;J+-bVBc2n`zD1G=qyNAevQqSq0c
zpsL(f(up=Gcc3BhLNc2tC<SIhXK_ZMN{23<9f^k&;fkH8v<X=VU&OOO(BW7APLh#`
zil(Xv0)S-{)o4tD8vtQwR+ElI+y&4@rAHS^G|z|sxM7IK<PE%j3~_wRm!X@ZIz<nx
zIV&%5AOz4Ju|dcK5(VK;%>u3vN?kdvG|fvu$uLGx1Xh{_0{~0J3ItU2APnzB4_H8#
z=}rPbJu+#DT{LCL?M5q1Gm{Vog$>glRAG4w%{vi?C?05X0zD|jP(l#O;(;guzDVCL
z5Y<Bf3GG3VwPB*guPe0?blh&2H97#$&=OE18*zbolz+plste>EBr++s)C?T0ovQvr
z*J{}7BcTybtDQQYmnex|0i%j&STHInRnbwjIvapk0=R|^!0`(q8cHzJbo)oMt(5G7
zYn3c58=H||&?yum5RD=dknjy1CWtW|b(k){o*_;A(Z1)Y9Q6F8<gp%F2tlEHssvKI
zP(m?`n{@|i27lD#Hln<iHMdhGG&*iR!=#fCnHOP0X&~LM;T7Gf88u)O7&_CNh#-x+
z!2{#Ql{+D6pfE>}MI#%5DKHHI#igu}TzsX6h=x+Mj3kZ1WNxVK4NX~T(?YlHB|L;0
zWg@9Cib4%_txCuN&M;Ohf(Q^s1zFDO)jd#Hu*G+VLjtu}0-Oo&P%D{kl47BU&;1DT
zg^kZ>w_t(i!-J&m<61KUsDyi~i36{=2u56}>&wg<!BEZFNNef(D|T<Y5@-zLfI#kd
zW+qHGC!iOTaE|XNHY7Wnx)1*o!ZjP!iuV8%<cRokS;rZ?vVdOX@6u?GOEc9!22QSc
z8nGAij^D&Ih8*)0*e7v)(lO(lTQX~!yWRi32)ChyX%Emc@*C{e1kETrBxu^s*0ES~
z4mUa{{SjW*4%?VH8ABzj6CJmuYhm^Rw~!!TKd-tS0G2uDO5BWftlWJwdX@94WKwqE
zXB@X>^hNUI6)}Axkejujnm0N^f-4Jplpr1(<F=4hHdg>B-qlfV=Fy+7^c|m`vc$fq
z!q(z_BC&P3-(a{#Y31)=(*oZC>8VRf=2ckljXHrq?1diAwERcPE1ehaWfraBr~QwV
z7dy}K(?>n7>z_XM8-6_f;INjhUmw4gc5K*Z(+gLB)N|t>Vn(EWoYi*e52$H6Ywnr(
zhnR%4kFwgF3!$Xc<MYCp*0hF<wkr$c)<9Y5nd866%X(>3+w~{o)_T9%@_h2CmMOQQ
z4zA2yJt6l<?_<;dnSH#UE#BcauJXb=UA-rS2mHO%^T*1%s<F*()0;g%uzc6@Ae<m;
z{5u2tC290B7)vyO;@=tY=fFAPW1F+aezt8%@Yd+>BOinB^WEr=c1`oE%kB}jArF)i
zcX!3%;O^91%115p*qGnexc)lqpt&BSdczWOM0!AT$&M*OawRRmu>lf`_hDrTg?U(m
zEZ~-EL}sTZpjbGf5(UD0r+I}1A&N4K1;3y5PJo<})B6=m!|_u0I@mavbeugyN>u^{
zLQ13OQtYZbK>{c;XUSMk?(4pc6O?r6abGK>l7<DJ1xAeY4@)dZlqA}(p!^~51pkXE
zN-82ybP!W2#ygu@pr8Ot1ZXNu8kXn~1HYz&^s-5LKRc=es>kA2;DDUaK9QlsoQfNU
zxoWjnV5r~<wg*&C^SJO7z+;kmP({cQ({;!x{O_m}f(nQPlX+5FaV?Qy5KWnB`js{j
zhU(Xg&ld*{<!s=qxBCJHl*qD6^p8jVBw?cVvis%>ro2izVYv%M7K|fGRTxOTpr1qF
z&?FhkE+8L)8Z9lt_8)jjmYBvsS)inXztFB>-lb>YD>R<KnT2V9935~+Vkj_MG-n4x
zI?ksq$G2UI(8-F}BcndC0bdEyu%FX>q4qVR!vIJ4-8#bDmSn6#3SkYMF*<7=eD~5s
z5be4-wu4QmimW3TQ5_k>%&MMy5emY9$3B|WAT$V3&CMV!Xo(t~d)lc+`vP}rSTgAA
zMo11IP5yO6N=AnhHN0zDhXa4UoD~%%4XFNAS9OXogy}MAs5D^a4p=RIN7*nG<1U_)
ztI4<E4{;@lJ<fnDy+o$~Rp2fs(D6a8MJjRRg9|vwgAWHyL=+K+mZCUHgbXMg>iKm1
z0Y+1OK-(t?L&H!_*TA^%a)eNS3{|8nQYVa<3`LlP6Tw0eLH#Y}4-ZaWkM^U<$d$+h
zWca_-6)}Na1c!%zC`uq9V2CiqAKbqi1ty3!_!CotjOsw52|=gCO+!tym`{pJjL?EG
z6N)xxIp!@xm`2ngv6?6o!Kl*{FwDEiEa?yJKgK}mJ3nv!_U>BMBjg$@eVLnO2d*A<
zl5U_<LQw{zrOJhLRUumi6ts$%Fa@3{uL0^t5wou+=_>&Tddk7<cZ!p+-3X>5!)8<s
zmuYHEN95@ws|ZH5$7EEHRZF@^B~XI8E{$VwPVmw{T)j<j#Y~*Q?fBg>jI?MaJ`_<D
zW@x+WfmvSRI90zaHqej1(`|N;R#*olaTUl*dByH`AwlTE4FfUy#o#i@FJtD}?iXyi
zGfz29TH1x@5$gGU{zZhBJJYhWLv5JKg$@%y0f?nm?ZN|2y|N94R4T5`bJ;6)ia3!q
zzivHe_b#dTa*unxZmvnBp42PbZLcyO{L=#k6Xw6S%iZIW|IpH(f(AW0R*}mf1FR(~
zwz)R5%-)XwbxXW{Ex|vXwM7tTFcbU)G-cslrEkhMX97C97gip`Gg|B4t(w;_*_c&i
zGXl<zt7C1mM}<X(K&k1uv}t_^|8KaHc-0T6veh=leeuwmfpm>NbbNTCZFtBk|DFn4
z?)CLm*b?owa1m;MR{2+=D@nzP8A}kP#fK={J=2l{@32KlkNULSC5}p`?H-DH3gZ?z
zqT6<!Fut?c*mHdP+DA&~Rro<!S?V|ZZu+bE^h?G4+Q-u8<~bVMHp~cn>xWoluYjvb
zXYNh^!{YDoTio6Bi&GPGz%73ysMP%-?s)py$)2VemW=NwK3+L)#_ErHc^DJz1ec2d
zmnY-aq<?7cX@7E2eA<OgZMUC{i+&8?Vm)<l-JnC|OWv7v@57kK^DRBDg#}!nVwtn#
z*;j^d&2ntETjM=i6TFkQHjH&<nF{{)<NYlUS~Ia&{mPJCv6<GTk(Z0De@lG=Yq6Nu
z@=d}>0L>pFjY&^8yt4L&qbmA~Clbn@Hk}z&mr%3pWAnydg^o`m`$c_M{ju+B?uNIX
zj(n`N$a$`MWB&K1(kVTR+d{TQj{0;!_N}JU-lL)|9@c0JBQB9WEZH%eEV(i7uAX+Q
zxqpm3x+L1+@xsK9+Fq(NE#!x8pQh~JQ5qO?pvRP$1A`#9Y#Mhk`J3bqlRvZ$n|d&8
zR@GI5S{@NbT=_5=v#z`poVT79(1ux#+N$LB?zP?WJ`PJP&8~WWMnPVKX?N*_=<<T{
z0fR~>L@ftuIK!#5>;}j5i7ww=*v>AEv#7LW0x&EY){&$Va*WZ}*1qiH=aO1(kZESO
z48<>_4_u!ROEL8ov6CJszi3`bc)=dfXqueA8eurW#%V)+4Z^tQL8XYeLV$T{Z4Z3O
zCI>B`rh#Gp=!ovdgOWEk4RT@3UI&onqDh%RtKaga9W*JDvP(!fQnwgu9tj^>IuJbZ
zs2_|S_&Ezs-@rhJ?2672qQBhSHS=e9JinJzbg&_!^gRusho;eo#2D2XO`{(ru3+5j
zX!2<K4N-?@=I|P(GOYZ|O=UxzCYjkpTC1uMt-f!2bcGp9at#C`4UaVOgS)6K3%4MD
z+9_6xWC@L--w7rZ89Is<z#CXDniIro9Hl~hA@w#)&%)UG4=N0AM}|$oA5474U@k8U
zBXJ5*M}4<6Se?M<GKNh<Q5}T)5az<wx*&%rq!~rx)+mo>qS{?97(NBw1erADJSw+g
zjzDH&P0u=I%P4n-UC=?H;0=-?vLo$62Ua62D^;Gip^=kWATX%{9{q==80BN=CyS6+
z264ty6(*%IV=wIvdkB-ou;r-k2Z6Sf$|KX5K&LRfs*k8tu!EeOs*~t~Y18mW(~ZOi
z0;`w6D-P9iKE^JrGPPkd%ZBi%aobw8H1pKj2ZVspDUBWyI+*zjIpRBHGM4u0WOeaC
zN(5ZkHeKsa(i<@zm{L+5g!=~r(P5G}3`t6l%y2<Z(lAZqgQsA2ag4seN@NxtfBQaW
zFZpBfFHh~fGm$VLA_{6rIOJnQu3_qwaZ<GVQj{Rs6im=UzepugjA1;klWhbaY0O~G
zmV%L6#bhyaD$}_99lgV-kYM0brVhD=qq|fOQ_Q)9I%rKp`OQQ!VBkU!MEOM6PUQq*
ziwHw{*^pcr6S@>vp!?)0z+!wu6dP(Ggp>|tLjoy^G9*WXOVKNm|92P?<3~XY&aY`V
zly^D`Dzt=fHzKGA<*DckzDYC_jc_Q{jPNGmV4ry+{QyhUd4edufJ($;qR7GPbHNXo
zL1{0SaF_@)M4k7PRx`-&%Z^%&m*wS$&%M`_Q1WF+%>J{Nf@5}hjKLr4wVU2p0V(J5
z%a4xhZ<#&HY?#;#0=hM7cGceGD<xjQ?2_b(pUjMhPLpT9xd9^19{INsnoSe(z!PXa
zq3AlFGEP1x!DaHsl8?WL69Nh$`kajj3h<0;8g*+kgquWLxAU3a%062icmFwieMpcO
z6`Y~&8zDCJUvP6}_paXiJU1BZk>gkSJhX68#cxfU9fX+CpcHZo6q>8gEOL0X6`TkG
z#0;H0*rP2dt(4NsN?;45mqiuEd)_COU0phA`Hi$(N-q`nath=91|!arR`^!rh)>6-
zZ*&w8W>(m9r-l+?ZWZ)D|3l1(oyUvQ_K!UB>Z}|4Cm5&9fbg<7`+UsOowa4%x4+ad
z*<NXyvHYx$#b&&|ukWawhFE*$suRnDe4g2Cyyob>;qU~@;L4*Xmd){bc7w6i(fy;!
zu+P)metxLw*wz2aJ=h&pLA~}^@{e_oIvjQQ|9*YMapAMQ7SBhX4fz7V5|wGlS~AGD
zOa8z}w~&@$i#~2GvTg;$WIM8+n`R4c9AV9J{MA(b`W-_--O@<U11-Zmf4vfxl@QQ;
z&Hcmkj#kUx+AiGwzIfQXvGuW8*2(w{v&Q}XZ$F<sGwPK8_`u5hs~db@3o!Hza%3m>
zw=T1sGS5g0*c9Y2B?UQhUw9zop26G$AOn~gbS&qs;9M^<4n>*s=YA*)@knl~x?xE>
zyzKhRk#_IHGh+5tF6^_o_Tg1_pv|CtgANQr!Ls|AO=Vpd^kMOGX@D#X!Zdn5-{ZdY
zuodNBd}pftAbIC;=Zp7-%?SS30?}o_ap&^3@jsusXZ5YPFVlJI-q5u8w8puOvvN+1
zJrN8I<}j9boCv56hQ8w9G9(o)Bj(a=HfUz3l3+snm<N?_GY_hSGDCqy?OrlqHfoV)
zeEoBi(@D#SNF$+_3@?pz;z|_hd=+9T$S{J7CIPAXM6b>Qw1hhwKr(l805ww7?6}Ld
z<e#scw-*__WCvlH^Y*X88oaFQM(6w&KnCyU0GGSY#QgVnt)2Ez&Z{$j&M#dF7<niM
zuLxoy0d+#(&kG-lsOo<qVWEb1z=Blg;Dth45IYFA67~^K<_XOgf^g$2wi2|MpHy!*
zeJ6~fvNuny+$g2j;IF49Ik*^#5fHe?f>)g-7?u9Ti7}We%+S3k4VQS3A|DKh#EP*0
zRaQ|s7yL`2R1`H-LuimjD|kt7C#(+kk0u6n$l|cNxZ?#;`;c>eAp^5q2OT5rMmrIW
z{%tB93!q7H*Nh&p2{jVw)5`PFyUD@hQk_uXyP#zW1sA4Aab}oKenL#zk1#b&o)U?0
zs74}6lE6f;hD}>cAfGP6P|_%!E)v?WD31kC5s<Z;Ruo|XLJYZs$rg5#6@>Z(PE_O?
zaFMzY&DCS$b%7;nJ@SVHvQPwa3jYG*d&!mv&H(O=ZX)o2I%xL{8nhF}nlfhqcf=hu
z!c|#Y6!IiUwpL^rZFf|vCU1HZG)K5`SyY_FMT)J7B2aDwQXu;5v~m7f7C;+SvlP)}
zR9=RVqIp5gA}d`85#Ncs0V69h3tOMi(D?}9s-5tC5OOs5k+vyPPP9$}Fce|Buwgv<
zySb7uNW>u9j9g8@^SD!U_mgOCzUZG**8J+-YQ}tQ+RQOT5EZsnjuKF&6X_5=z&&l+
zRCE~SYud|?=pO07A~qG2kWMO(4p71;3UM?vg583Mu&aUy+|WzQ>Z0cghIp67MAN06
zZ4~1O9jU@+Rh^_qU$g+Q#!W7-2`UG<NEts$n)wfkjQ+)NzBH&39p*Qc=B3vJ(ds|i
zQL>A&k!WhE2(PZ)zzxC^Rl9r%ykgcSyET*H;K6+prbAPC#K~G~9Ht^QB$@E4jjXYf
zRk(JX+c6GU_<CJzu?H-_Y1^;I+Uw^NsYJ&4tNlv^Z%8@))n42fUIoqO75kSEc~Yjm
zmA5U$%d#g0fH5;+M%7+x9DS-wbAx;@?{Np*yj~ZSJkj}Oa_{EaxVmXrtWQQ9`KNw=
zwU3TW!P#%D>36lUVg7qN4o}Mpc?;_EdpK!P&YQ4@-Pb&AoRf};cku6^Em9YJs>g?+
zt1VzCwq*P)kkFe@eEh@S7$RZh=f*z>zG)a9F(@ovgPrR&{aXuyj3l7MTiFRvc&Pj2
zPfgfTR_UB;UhVhp_?Ipkf4-MiI>eU!+}8(BUWgbo8ZZ+C=jqUu2TQu$Why4RE$EMF
z=TDxBy7=9_Q8OYIk6O0#Sk8k!VSm{fb<1bP$lURvu@`zxcN7?WVz)0$YX}|n($3l&
z-3x#-*MF((e|~YQ0M55z*Y}Sw19_b0*FKFhN9SS2`{v0N=D^mShfn(~3wr#7Ku*}z
z%8<`DFHAde-~Q2_Lr2{n@Y-i?#ua;Gva9dQJ@^Nogr^@rk@U>@C2v?(<XZA;SKcdL
z`RkBF(~_sIv8-!)>76lE4?S{X{7=2JDrT*&Ee(7nuVRI#w>7IG#$(u`hJ@CX0lwu0
zCDyFUo8yu$j|?|ehqMe_bg}h|4}t@OoqsRC{FkMJCnOzQI+SVF1k0ZWeD>DFv^>kQ
zZ2!d|p52FotItn)<i8);@sCf-vXYM-1_A9h&$!?o6y#_G^1NjEHs`H`tbRbAWRo?@
za>hKv81*zHn=)^wt$JJbcg;oKheIkCP{4V7#QXcbDysfgb<YB~>D*s8c^w1*U9I|C
z_1^5yde52Ne5!fFCm|k#r^bhLDcoVmyf<)0Z*;6LHGXV5?hFInBo(H3E<1#UxgUqE
zIPC70^T6U;+-ux{s)&FHpB1Hp%eVcjxzDGzo)!0%+}flekWDQsvkCf+XgaU8`0Xw<
z0(pvrT`cJaP1G@GSnn%=sN)UB$uYvq3b7P{V;pl8_KbIaMImSB9iGNKsO*9{!?%sW
zoA8#nlGSfv&tm*~+h82I*U=~HH3vnOk+L@Q{r$EZI9>R>_p_Y0XPW-y=o8roO;b06
zgoag2Z(0c@Cv=h-e1p&ppav;kj=D3=7z<%AF+g*tuzH>#!oM8En_tSFzd<u*l1Yow
zz)(``BBXQ7S0G477DyM^TZ9+U9uhI?i^U|OM5k;Fd1RduX_S6(N!NpJDg#L1N|X(3
zS%>Vg;-((5@Vk8pF%X!<EDFQOsH7fMvQqp1&qRnh^PvBs`6%T`S64ddHW-=PfkvD$
zr6B(Y6G|r>MFQvrM-+n6V`82Kr-t%_Sn&ojQwOS|Xrz4yqO4MV!=x-OK><@YCT!3n
zoT`Wxk0H*81Eoj{XQeR1+=kY`7WfFv=%@=J_)@DrtA1_p^tAvC(yqAh&M3kzGLrax
z0$79pZK%80Vg5*4dg;)j)(QWJx^f#sc}^FmbMrL7(IgfekDReOjkKOcutn|!l);p9
z4)BClRd>RTP9BN2bzPJG%HAiCNw$eSW<H9i1DZLB8CgU|!D@*q>#7YagS30YnLNN|
zFwUgy+lJlj7+V0t2&K(F?Db|4{Rr9&{%2h;LKN64OdP8TM45cfgr~_|unX3+e=5`>
z?RV%$Kptvfj1SXmWN9@u9^R%nTRMNH_$#PGAvq=zNL~-EEi{DiHdd}RhWD5ENFQ>A
z&mW6>-Sw$M)ApkEM4hTgAreX}HBzh8&LxeY5cH*G5EyKr1$Mcz=&II|<)ko7UTHVD
z5kQ!p+G-`asBFzz=2Ae*at>So6%Gw>RB?4j@usu)q~a>LW(~q{4)|dm942LbwF^H4
z9DG}Qsz#H9+Mz`?#?>xBKu3ZzcU%_^$^fBAX_9J(t3_%~T^pM$vWloi(pp9f*{Jq)
zKdRpU>I&}Yg-x1{<dTAdPUpq5<_RPFTX{k^Ks8nBq@{LtrQmsWJRa&0HLGku45goM
zE(O^pI`QWQw$WG!Xv3iKup~$|BI*QRez|YL6Xq0HS?_^yg5JxFs<Dp_;?k~^aDoeI
z2;h@4jNn7s`P}~H!aOpNJ?hKkiOn~u|Abdhyc}NjtL>)Om!a>KLK%8{?5|smO(~A|
zno`Ox%}nT4waNO%2TdMjm(1B+Ewig<UQV{WUT^4^8;}<`4oAnGHhUwC;AKg+yc}f6
zD2Pbz-SoVzPvpZ0`AyLjqL-syMVsD1rJPmhvE-*6$BN457fdcio0>uX;p0N=qm6E3
zl6z*xyElzm!uqhu{XI%sOGiVtx>OSO*2u`*??#7@UKpHkYu6LGqs~YD`mo``^(b_x
z%YSv5BgR<xZqzoP6@Ei5<QMLYIuHIiaBqC*53v{WKOU863;iL|e&AjKHavbJe$<NT
zw>&c*KM}j#cp>zSwz}1yO?T`&ZnvKGx7eObJGcG0wBzp84O3Tm7=!D~|7xizIh0iL
zOXaGIKg6vmUF9rFIsN2`XE!{TR=4@Nv_IeXmwTtp**9B?R(|;8iKH(tHXVIz&(~Ec
zH*PIi3ldtA@yRoxO;vwgb}Q~))rrwDpDx+=8HAwLR>Q+R{(L>b9v_u5^46k%mIt=B
zCV%%z%ZQ8KgUT<LS~Dtd96Nfn^_*u>T7H}FJK1MP$9<PE(7Dh&WA42l|M7+8=8q$+
z33r``l0P}}!u1~`ooyw<-hE~F;kxPvM=$cS+-(c_=Ww3^A>g8_b2|?Q=boMNXwc@O
zCtir@pOiJ~l+Wr5^ZvZ0@c!!YKBIgVWW?RgzHKTD98elm<{ed$yV0JOQ|=b+h)%wc
z>wS2+;gPJVBck7^2(qjOA}yZsaMgF2@V1&a{PUC8-ka~No4vJ1$rC;1HbsT|fP==_
z!|q~fcGGLl6rZHRmxA*rgqo^y`|!7l^s3}t6QBU~c?t@TweSVcWtV<FleXzV-p4V8
zR>!WvAfx%s^8rSLp^~-%KR4a8c34I@c;Fz?6GA&MyNpYARL`{(EP+kc%?xhpFYXn*
zF}uGBzfj+lPN}Cqw3=Uy5k4qof_=sq&a9kjFY8wPdcF7tR{NXo*!>sg95IVvq-38^
z$T#zVI5SOmcdkUe)K{VJzwP&{C{4eZSC(B^Wbkd9-SSA%R||7qFaE{!eld1H^f$C1
z9IBM~SvNDC8dssR`VvOghjMlW>~%mQnAQsiqaF%<UPKi_%7@;Pru-=S@ojrzxE=dq
zTUq?wx8Pr_#4sr#=ENjlL}7jkPR3@S(akI;&aSP|R2JG+8p1G{4CRT;rNSjDAjH_P
z4Cb;$DM<nq$e+j-B|C}bhVmi!a!P-KE}_dsTa;z=b{e%8rBQXr4GYa^Un$?@$~g;^
z(5OPvrCkK-;6RDDMS)5scUY(0QRC4|qjgvzw`sZvm6S31Gy$4mqz-K_oq`udoyVU(
zTDxDPiAg|84Bc8BnRJ2&-_ZqAv+&?rrSmK%@MDU114iwFFvM|Kk<FA6`_!!08t&<O
zj}$s{Ag4V=Dri#E_UYInzLh5W@CWE9l4!y|49FcmgSt9d#s$oCfaPGHK`O#^uy2d>
zh%-H}zJU`YQtM%+2A2<pn?EZS_v8n8Nsr1f!=!zZ&Mj;LjPKz&5dczr*+nR`tCYUG
z)F(BC5WqxIzEGIt3F$xBQy70z?YN>~P&nocen(@wT5fjDAdF`Nno?HQe_F`=q^tN{
zaLe4KTuQaZlb$nxxBu<X_OnXEJTK*@!Fzk?0jcTze_ev^{PD3X!YN%+#Ob=PXb;-&
zD^y`STv|o#HWOE1`?l?^s-X;nI4pb$mB=tep>ohg$439?sE<9-Vc%t?L6PaiHoE=-
z#R=p4ZF8$?<nlRjMEiP7Nu*syJEwGx<g`0)m&6zoYp%0H)<FPr$w~jo2U8f-`TJb)
z;Z7&{he`>xS6^wBTFMwZCD|REjpC7lIouxvA*xj_^NW>LOD}KRbnfqs?@0<-d1XL9
zau#~wsG4vI<!Hi?lwTn+ba`Uqs+%Lelw6OvWuoqE+cNHv%gPBuM46{ZDT2cVC23;g
zd;3oVno?v*VbT2evM3il0~V?&CLnD|8R7t0{`64Z#>2js_X3xuyotqO))aVQKY3i5
zqp{S?_@DaaLL`C&MS>cZ+}rstMNnj-DVEt)zi#<xR?LpW3-D`ZLhaVxO&*R5q^7{}
zwb)}RWT_JGoC`OSOROIn!*iUr$k93W%R#ZD!wu1w%=x_n5=#x?h6Uf1jLR?i>S<$m
z>48lZZ>E>HnXcN#C&xBM`Fv&cENbwx#`s71HVpUN8i>V!=w4UN9)*Ep+Jas?6b}H~
z>y5b3{L=gf+<V5Gb4zn8YBL?(&YSJIT`ddd8DqjuMQwBVgzfxv)#|Cvj3-a57?n7{
zZXNlTdsFBCusHO|6AOp`<=#fe@aCcy=J_uM44owq4R2|fI&b)Qd&kZHA*N{W*T)j}
zetkG-(uvg{W!Ib2YaeV$d*H<PJ%^rXyFTHy&peFt_Q#}u@@2yhmO($gbhGyJ$8R+x
zeYx-lAkpKwOVXR332!cFsoql-c<IZ9SgLxvEbzu6`zv_`y&_jUx!{E*U;Hv=bl&m3
zWr2TMI%&ZRb#+ZMU-JmA|GP&Y+y2_29s_N^hP^R5?wf6+Pt3kI&H2!C59L+H-AeD{
z>}y?7{>Wbjj@y4^?X0ZY$(8;5XTAC4qQV8acRjvcm-fokxJw5-Dvy=~b&LKyvdrVA
zGyh)R^vVC&d3bJ4wvQ!av~A7Iy?r*{-*hNA=U7SX+#`!G{c`jlspYxjeP#?Oo%{DA
zuZI2I@0&AVq@16Px#nXz9~*ZMPbdj-ER3o*EVrD$@a-E@yA0ZJGHT(ICuZMmj(G9*
zrU5VS`TF3iqk8QwN`B+}*ygEAL-yN$DK9Xl<M+$P%K;77utI$<4alu1P4S%jSD)af
zsGi29p%y>Sie)z-9d-R<TKvw#vsxk_e=_XJh&`o)f2oWJh&q3<xsTHanB?pe;rnDb
zH|(j5@Sl};BH+aACBULt)!h=DP4^y1oBj1Yg-(0Q=Qj-&06GBx!mrm${01;S1ow=q
z_pJ48+lF6OAFQ^2MT!F7*h`=hJ>!@Zd1G`=PPN*D<OJj)_9!k|SuR{O6A(41{7)uX
zJIU-?`>b<s#SG`(@*9tWeW*B*kwPbgzOVUYyVm+9?{&ae0zv_e04aUV;ZB8159RDo
z>z;th)cAfe;f9oC!pJOaRQ?mjY_L&q@<ymS!&&J?*$4rm#sW&Wik8Sm)S(pK5Q%_R
z?QGO84v~Ps01_Z3peQ*CgYB=XEL$?r`SjHEjIqKGo#I?Rl}pyi=fNFHz;vX*RRV-C
zOv*LEzyUxg%dVEKVjcp0;LTnUSNmCA2&Sc{|Hl@t5HZA+dIrZKM6(9BB~aCon6`j4
za5Iu^#%wO4JMc0TpkYtN1B1HaXn;pocvNsIK|mUg9Cx{2m>EdaC=!Wu++_e-YhA-s
zQf!QHqQBk)Pz9I?V`_E-_+F5ITrfg4N8-qU28dnAGxtTU_f3?YBaO_b!ip{N`6T+J
zZdot;mQUd&BqUrP6dGt@DYz~{N<TKmLAk9qWg+X&d7bJ9WF$sw1XOebsvDZcBe0`2
z!4vn1(Vxx>omqyan65pEK;(WBURAeKO#m5jvY1t-Qp8?1qF8Asl+ZJosOTiLFB2kE
z(g;U2qQPxzdX}o>=Na&Ly0jV5LJ(a85T|A=+NS1I(!XEro7oIih>H}?x&c{57NbEY
z9f2`xPnTELy0?w~_rTiU-oSLpm{S?kBZ5Wr-{Ua5u@QkGB$(L)msQ{B65h^8J(M^0
zyCe>9rmy%}V1{;Bxgzr;3g&>Kr0ATQ6L^6YSn#ia3+ySQ)k5V+Ef|74ny%EDW0dpc
zI)DOHyVs_2P5KJS72}dznv~u#hhN@FPSUNuj+S002-DKan$YDEf>=_e($BkC@GjA0
zexG(Ps4~|gL0a(^zK1DjK2OahW3@c#NFB|P&$caN<tP;D-xO;Mk!9UV1Cm~U1tu9}
zwbOYB4nY`7zA|Mi^eIG~W&dGToB{y!RtlEzlx8OQSEaySyF6xi-7`tF%T!TUiep`)
z4eP{d6HRE)<?!k;pe=|${;<#zNJ0;Rl!jTKtx74*o3eFX<9j7v248;tw5Az7ZNcJW
zUp{RSe%d0?v=HC~Xxaf+E%L9$T=e*RlSkz+LeuDdZvuzjPVq9ne)`+dx9x_Q-c2u-
z+CfUj*}2aj_Psz-syFnG-kGz>;BYUEHiVcDyO-uvL>j^>%mrAs8=^|h`4J^v#wzoU
zlECq~vya?wzj-L{R_W9u%Pi%yJ#zx5mjskdD-MccBje@a!?!zQ8>2Cs<hj6}x6PYN
zE?6sef}KjyRj|Yn*SOT!Z2V_bp>3?&w4Jxgj`d4)|9OvliD8ppW8O#UiBsNad*$XY
zhi;F(wP5l6-$&dkUHwt|vEg6eOEmoZ`vFt_-B!2eU!P6?ZeOn7uunezVNv{n+JBTm
zHM;WJXAc`6?-4hp@x!O!kbT@-aP#>Z@X#~Z(8JPe&od9Mo%pARryPD^{`P&J`J}8N
z5Y^slcs2UFN5(w<;JS&CKi~Y*ivXz9b&F<9IsEUL*UAFFX-#@GF!S`oxyQF`&#hl^
z>-e|BKi!p?2`)ObIrG<w9oKVh@AiJj$Fd`O@e4m?UY`D^iKUBn7VdC1c^-N7`O!Z;
z@oCACb<K->{uK9V*84BDR$e{}g{t`0b0aJ(oXbCd;q%@1xBWb>`T1>^-<dPG`qk=D
zkEU!m^<w{dF~!^WyRWrQ{@%9sp|Vro^qlu_Y{;!2&qmtUUNju|>w^Z*d67@7^)7rk
zd2vfxOy5PH-%E~9kLddJ+9kR7?fO^C%X_~rcyq<Ug%2e(H~bJWy*m2lFXc=AkoI-J
z_L>O)>3_M`=i(31mgmwkN`5(99C9mbK=XW4K=tAhfYNhmUqnvI^1g@_xzDN<Es=p(
z5gL{}qwUzPuk)5wMm0oxpWm6+6uri0?0KTo@;9*%G1NdnA}q~sS^e{-wj8zW>;Z79
z)s_iSXa@MW22mB){b%h1M9uljjuSIY<pT%X!B+PF3x#NQ%GW<{su%#4sWo2rg<p0M
zy>Y-l4}hP_Uk3CT;x_&nF(QGbM-5}z!dnKlftv_Doz_0m7VcdARt|aVE&Kvajr=MY
z=rzo7cZ=G$+<zYQrb(uP4%@jX48)bmpHB&$5Zv}wz)Cn~Bfkn2(s?rnAk~IsHo$1-
z%Hp-~;o$5&`hFIrs-QQSL8999At;OZBo*zn?HZrgY`AtI%0(<X|496qp0|!u8vg*1
zP)nwf3RNtfM<DR9@=NkUIOcbeA}xNzv#Bi|%EU#lYR9(D(i2YKVOJ$9=@OC4VEY|2
zsa`bzoer*;7NP##p2BRMPpau#f*Obe`DrZGNp*ruBsren%SHb~Kav%y0RVz7LS5h~
z<=*)Tx2Z`cl}g3rGogxeB6LL`v=r2IffMv@GK|3pc7QhEIDrH}atIYcpCS1mWdj)y
z`DTbi=o2Vv4Lv9|sQ`^Gp-a82U5>`Kp(;;JwFqaCiZ`V<Q8ZF=m~<UPtVyIaQHoGN
zPZCiKm#(F`wK6v7Q2bi?zE7b3z!8h*d71E5O_6bbkeV<n1O+D;h`euAN3Yq4+!Oo-
zDE<GKd+)d?&h?Gk5;b;3us2kc1wo})2p9xGSU_Qc1y?jS5LVF$VvR<lSO5`}uA%}<
zS(*impm^-DV4@TYQ4<>mY*7?7#&h25ex8|S@#OdWz3+eT=R}!(X6BihCFe8WT-SBq
z4?^D>KTP!KV2klsId{bb?~LOo|FU?Vx<wH+EEGB-<KKD|g`tdXeFx2-4A2m-b3fQd
z*8?j`#1*wbph$si(N2m?V*|gnQ=l^{`V&gd7)^0ck&eNwkSMp@dK#0EzWHOr-yyV?
z6PzkqGI@+`XVm!2-KE<J?_w%xZ%-o0aKn~>i(47zTYv-zu3GYh^jB!#!<Jia%W_A}
zgVxIpg|HF<2Q9Jytx1reP#@1sv@}}n8d{Z@p+@SOpF`Nv)Px5(Mse(Be5N%ZhL@5w
z=lXQqE_5Jl)-VWj@KQCh<#-1loWj)~hI889o`_sxq1hNIZ^6SW!=kjkJ%S{0z$Tme
z18R*h=%H#ZF*YsgPtdHAAo&0!Sym}Am?0L=S~JHE*&&b;rH}Ar<*eEbU*)4UfFh)=
zG!qJ3g%$yzui-|1jG;!7!UQrKLuF;pp>|E!dK5H-Ff|Zp2%rdVTi~(K?u0$~GX-86
z?T59tZ!|{JgGqr3<ut`4rgmcpx5$FSDA{$pVb?XZ8`Fi2G6>Uw0~cJx%(%`#ILsG4
z`^jKTnZ+PXd(#;Dlzc2R?m|x1*u^jKAAWhlmY;n9P<e|oZa<%vR1k6qkQE4WDp;Bm
zFI^+k&2^A;@O&ciG6GdSmp96Kf68gt?j=d8>lC&qt5`oe$5rK?IWIHmle#WCWuDs8
z#7oi}oK-rnF=Na}Pwx)iXtNm<T}Wfa?!{hd?iF*wXO3Cp={l=g8hG8?Xz|ee@iwk=
z8#66tRr_5^xo~Vl-RTY4<@1+i7@dh6zOe73V{KDp$;Tqx-%L+2icR?4Jvy#!n8lyJ
zUw@r4>dw?S|AT)#`N>nBcI=(np=F(0&6R6a#~i0vx=M;W|5EnN4^Qru#3d)@D}H!-
zuS7lP#j3a8ZkZ7r_EM3MICDb5*n2PU6+K^K6*?<;k>t_b(F;QTS5&6_R{7$u&{^O6
zuc=JAS6Nun|K^s6GlRxOo%%2^R&{q-ZRx_GFJg9h%nDV_ii%!%`1<0rvwNH_+*Llh
zp#1%wD_`EvQ5mXtR@ZIOb6oxRzO9lFzlI>QjLh^6E1X@%<c{s$Bii_t-@PACUVrv`
zcIhsslAvBwjpa3_@p^j(7|*Kds{9~*JFOxludJx(Oa0tyXP-~|p{w$Er-{{%tJG_6
zbR4x@(cPg}u_AhuGJZ&l`LCoEX<dwWdM=q)H~M|Q4u>|}*c{t!skeXWJN3>xAFubF
zIwSS`NQ20VJ8P<gM!Zv-`K_s5aqL||lKWTpH;;1uy3DrWWA%uA(4sy)O|zJqJ?Bc{
zxU$KWYpRFuyO$PJ_H^ZStD&}~m20XHkq#=WH@C!UTo<+ltKMZ=6uVz}>1y`zMntSS
zZH8H8r_{F?a5Jk`2SmgMUc%OzYEJ`;OY)qAoSv?6l?HM%PuF;9vNCr5B{wtBn8hWp
z{ff-#fGh96e_3t!R@%nM{|7jGEmsGv{w|!h!|O{{yS??>_-G`d){=}-(_(;HZ+61~
z46n=HZo6;o@V_>$?N|3Y{-WE-U19bocddml*8_ZGfBfFAu>R>_G3U|)AgJ%s9~t1s
z76wxKrhqPk?7IX~fU`6~tNMJ?v3`O*u&JNgq-t?G)Gh)z(x)DGk#W_Ejqc9A>wyb0
z?@myjb_VRS90(fe!c?id5LYH38MPQ{6j7R6RREMKLM>Q{&7q5gFOEr!o5<>7suzhZ
zLMWTl7qhrTc}U~pv4MJmE)?*i<tYmQvo|@Xum3?(VlVzC9D{#IB)~m3&L4Px3j?kw
z)fcWOdV~BjqH?tu&&{sO2Pk>1B^j}l4{n}!3((9eU=A*WEcJiqxBpAdX{uLa)Cuv2
zi(!K7BbtI-fLc!7`}n1JV46sayND%RMPquA(48kJoczbn7=zh}=x@kwuDNCe41tiu
zOfu+F{1a~vNQ*$QOgCMdysqI|V2F#*SMv{FGmaci-y!*U^n*<<gsrIk5kV3qvzvY_
z*BmRH0?Ob~aZ~{UNLpzEQ@9~ci4v@Q>5G22NQZ|ZM@1?c9t$fLq86Wu@!)?V(#}&^
z0=J+_j{uY8E6^SiNaTT1e}X2zP3yB5{T2$#=s>1VkuAv`y3dY4m<iGok9AY|-3F$i
zc{m1QRR~%cLMmBb<l&$nuIrI98&z_Hscn(nb!Qh^B!hOPNWfzbl(jN<f`XR7R?uu0
zC98N4@t+p<i@)zDEW$0um(FFNP9C6vFcX6#NIxWKfo*tG<=!gR_UC+Ww&)exE3lfN
z7{v%bHKA-SW}&_xYM1OmB8v_k(<I7?4TRb^T<`zDDt9J$X{DWri2fIg@Nb%2qlsxz
z6?IT<hFL7+M0ZZT{?JR2CC}r<T)9S!`s|$ln&iI*NLmY^S&wm>juPj*z#qU@AOMt@
z|6aibE&9e;iJB07LaK=>+eFEVO(%+2n2zgOoUEvd4QG+phr%|dYc*b{Es8#|E!-he
zPTQGE^)17$T^zfBKe7j~_&Ajj9-Y?2q53xgT5XrP12{>6%DO?GqPP_H>*EaYS0LNJ
zTe-GqcOWuSK(Y9VHPEfPgmf-il+!3%l%Dk6qke|BJ)fof_dor!&u!<!d5hBhp>f4y
zXYN;$v7S%5gq*zW7QbLYaX-T+gC@-IAGe@bar?RB<?kLghR=)(H@ca~x8344TmAUB
zV%4(H9W{EL)>Un`DtTPdyYAy8b-4Kei=TX4mu<FExvRV~KwxF+cZp7Ov!1tA$GOg`
zs_a$#&6qW^-eu}|S^PZf^RA;m$`j+CqhF7=i+5CI*Wxh;8uQJ&7F(QsE>|byCI`1G
zcD%MmUb3+!X?A0-_x7HHF9tf*xf(twzWT4?G5Md=)$@EGxSqg&(M?V*UYlR09$SpV
zhFpCZY4q5wO*?m`ym)A)(!5h-MUL~bfGgeGFCJ2~b*-|zSGZHVi2RSIt3#cpPrK(Q
zTPnMgEK_*~EKz*(aFAv2Ev5C2lw)BR9}mnsy=vr?+N(=%oW8Ko{_45Md#>15FWc)h
z|GVm6|L7ZIuul2s-EqDh92LiHTKl<QX}EbcV8V<e*WRDFIeb^-wRe%zCpVtnaA|<D
z_?JF;)7sV7jqje=drrjNll?-!+4?H8^EH*kV%-w?rfm7Q0ZaQm?l>bQ_^9oJBSpEP
z7LO0zJ3hel)bHOF|6P{ypfYFp+LxXD&CgkW)h52Mb;OOMN9)e}9xd|nJKEx1&al!S
zx`&^(Y|t~FaD4KotdSS*$Vvz4wsf4@BFp;vh4GJWc>k>0^LO>$i3j#QP<66+Qu6lw
zqQZDAOuFW!SLTU#c|lA5Rimz$^`vaM=jmH->t>r=yOr?rUaoW4%ju(5ymT+SSr#^>
z)AF<J=6SzZTi^58yS$?%kh&h;`!TxzAJMuM3wNyEp7k!T_Sn13KA)a?+uj>LZ&DU;
z?B3hd1@AJG%j&CpIBXe}TvoSv$?CKKjHs)JI@q4@&rDuhADehD#s8hU(LrrcIjYR!
zidT6Nf@&&P)#Ri8?=sB1?MIdA@4C0|h(u<RY*UvxZFO#~Y*p&pS>@|47T3!97!@W@
zNuCx{7%;s-(kXsMc}9ceb=TVoD=L<#Kh}-=Sox?gaL)N;?#p)>zfBqZDS6)7e)T8+
za(nZk-9_KuoKNom&GE1AHa;35Y))t$vk#)wmbIjF(I_Le3HC9&!CV8FC#XLbr1n)d
z!c-HSe*{6{50Tif*>~Mvq=)rCaM=Y47E{tVlZm9pnT+kHxYqWn5K%p2Q!&y5-c136
zK>@2D=P{e<Y&*jGWgiS-`dBHm5bruFt*@8vCG`v$_v@vRNN5FKor0a3Om~wR$4$k^
zHrveUEQnt^c*B>|+q%gp<o&0+czj4_gxFChAgXE=0fNYRB3)_RKP{omu|9y1ph;8X
z%?4Pos0q<Tn9>-9SUHerj!OEpwL2bc7XwoNBa!_BqWm)&ir3|+g$x>rM4XKTTMcR=
zkI(yI12=q!zMKDr_x|~aIYR17&M=b&*Fkj1Qd56_taSlREXA-}30tKovJ;X?u)gq%
zNT&N@No&?Ji2O4`DDu0^9oEBd17vgNVumLBL@{f!9wS*<8zw;Ln&uG(K|X|VyaKT$
z)&hYRM=OE^9_)g%;+por5mk(A1w6;E4@Wfp&F=Le3*HlHBPZrD8|@g1s8fKHY6;2i
zV}c!UizTQ~@rFLtt*PRU7;!KQ#|sf~{07cYPMmUKoU*h^<&Yes!)Vd3mK@*UGqU|0
z=g!bB2`O@r(YRWb!UALX+>{;T>%y}b837}o0!zOWZ=%07zzsks^FYrj-8kw>z)2Ko
zc=T_=b%fovzO)7@^McnO#DAc$MbZJ6Y*e=hH$ckUp@+xP5<qWuFTU?{2b!2d;`aqI
z-{{;3WsI6jZ$ED;3Ea;b5v0W<RfQw&@K2FU9fM=YdR+6QRT2H5l0D+Exd{Y+5q`1<
z?5E%^BCN%QEb2%AHlkyh^~ee7eTGKnTG7m!Y$7$OU>i>5#e#mgW;yS`$P(alBcP9w
z%9qHEzp0S)gqS+OiS)2~lI##Sq9m1gsL-E4m~6RZDcOksaEM?qYJ%&c<0uaF7ds@t
zon<9~%vU4~gXopTkoBK=j1)l4vH!0Q;mLHSq2V_N?~t&LL7YtyoJb9wu_1CDmx2>X
z{nCTR*`J6E=!Ttxpnb6*7VwV_TTaTBMnwaJk^Knei+PS8WzU5Jno*jlhcyj`Ftq#V
z!BsNHntfm}n{0x&IKZ37VG_@7J6_)B-_Iteq1}YGglYc6e^E|2yQlE*_V{`JrkAmq
zkIe=C1aCz~z&x<ql*B3H*Vq+;+ln7wfBezo=YiL9@Z<4E?|+%@Fpd7UF?^couFJWp
zGY8Hbc+Dnf+U1Pb>X-2@kJorMZg?)8=u@l@W9`GNs#KrifmQ2nr9YOfnpl0{@fwdu
zA3dJi|JvumAmy|XHAN@(DXsS@Z4RypwKxr!TO-ekeeUuIlbrqQ^v>W<Ii3GiyztY$
zn#5=Ks@8n_*QJQyvYgDDH9t<g`h3dmwK<>We?Q~U`e5^#q(u!irC%RjBl{HjDFtIL
z0~TkQ-k9+3zT4jX{ht<{!+x9di_#-&!Fy$b)m`cI_|iQtbz2Tv_6TYib$9sj)2b)$
zgC08G{oB&T+$GfMiS^!TRttlw9{uz_+GxhYE4lJ7dOkd)_s6#TpZ?S0^k3dvPv}4C
zziRp~#gc$G!9klE{{Bj?-eqR3|Ij07Y45!ep;f8I_bjf;IxldDcyYV>(wY7P-`2_p
zb)0u{_N>7hk1spFy4~5rFJ`=7{UIOC!5;_2w{PX@+~L^Ata)8$P26<z(L|%#={D9o
zi>IzrB)s!k{#}CAW}iLt46mL2WoJf4g1T<_vtJh;{Wx&j{j0qvDR<t9?fY=TVq<x*
z;>`8s=e)PRSa{)tTfzIAZpT*^n?HFz{_dbbsyRFQlwaKzIdt_ny}ttwcX+?=o>c1G
z_;v34@6Q^o>}2gdK~h(0Q_yg3(zdhzE>4_SeEj`?S}0z>c{M8eKP^nYR>X&u{r1z0
zpN2NB?V7u#^GB1BD=O+se!1%Xo9vfYKD{md{?kIwu<FR)-iNOQU%TsXUDoALVZ*)j
zg}<$?UH2QP@#Eq()p>f`dw#Qc%j6|Cb(>$_JLvGFY>@I@*4r7KXXh>Mw{LY&$-BHI
z#cQrN?pyu6&!B3z(4{Y(7QD+VELwB@$;ZmZHfw#W8a~x^`uE%9Cm%6#{h57zZQ|aS
z&QI3d_<rxpDSKZ|yWRCxukw3uR-JrnfAw8D{<+=m(5O`>-=qf18rJ@Se;VgJb2+)B
zY@okqLtukV-N!K>hx`Tr^tQfiec2{y4L&&6dVgbnZwLMf7+79h>v2;3A#O=}j7{<a
zkl)e2#$CTSu>8o$?QdtS?f2=AM_mJ^1O0MermyY4vC)6~n<d%fK3+c=Jt?FIhI|MP
z(;tmok{&kc<n}iqTR8ib{Q;RSgh_g(O{1jUiG##;0w!W`C%Djo10Sh;GuV;;p9U?#
zlOC7*XOtl4_5v^a3C^MLP&pZb*4AW`UkWG?L_8ih13zBv1A#9P_{fkhtS7u(pd#QR
zd@eu(akI!S=aT;$`<P}3mz5v;!#RMHIg`w46FDL_;htcj{{Le@6cdBQei3BY3ff_l
zR++|q;Xk<0213SKvr<N(=zoqV8A+Bdq-XK=F~A;$z_<p;oB@4q0|HqU!x0x()m3Bo
zd^>mJTZWGq%KDl&ZJ<t1atoj<^S}jQiDD5-p~VEHy|9L*209rzqUAQ#8lZmz5iT(q
z=SiGg1zZHZ0drYfDk_qsQPv-mmPn%maXL<*o2#J456;fK8li@c#68C)!(b&{(Zra*
z?M?-BQ-!EwqWV#RM@F=a_cJFO_8A&7NVrajh7y3a-7fSPkS<lss%6rfQ00fjTV7A7
znnj*Wm}Ei!&olR80w0iuyOD7hl&{Mxd=a8ss&yxoXtqESt<c3nFi)Mi2#iD;`!9{6
zB2oFHnTc{W55jLU*aTz>6<5XV*0Id~*5yy!bO9W}(H4)PJs};(P?i1I?ZUqy;fvxw
zFbRJgb{UQ4N*XI#Mld}RoQs>%sFfKR_&1=6^Do`(`qxI1r7nb)rr-BM*8dnW5Eivp
z5p$(sjcH1_ahnr9DG`~t4jXUq{SP~3LTw|!kWR7Xm5!4TmpcSAQ8OL$Mg<1suB<36
ziUo_@!qj3$BGiA>_JFrd<|k=y%==745{@GzTV{p3!~dLn<13=z;YmL<re#l9Rf0CK
zHXq<!8#INFM4>fJy(OaX9R$?OEP6(2Btmnnu|vo0IO&$^r{Z3k5=aPzzmhO1n!3I8
zF3jCt#5GJ<pG{&WvGES1@5g`*{dNSZ#7E?*xGr;c2Vx|c3|bhXAA^=Yr=S~-AA9|1
z{Q2@JsCL{P_-oS`S+a)bS-xK|cj??IAWbS9C?`f`-m9M<OTRr&Us5cP=-8UE6-@9u
zF6P^gl4I*aEUKZ(UQhw4al~>=_2{cWn7ir0rn8^W{(Zsy3~PIVBWK2sy*#rhl#p_)
z*GI{68AiVWP444FDZ-`SgU0aSxZ_3_F3*e$-BM({DE$f~!|zIIe95Sq9j5uKmVNoh
zlU_x}tCp==R~<OT<#9#h4~^m9nC=)=lmB5^+Skfi*Jf4aJg)dKt9sFtsomGeuv?|y
zt9Vqr&v%7N4{Rt$Es|k;>ss}nTWa>`H>#dHH=b|VwRqI7=ZaQ?l;3Wt$@*32Y4U@v
zN{@EML0{VBoaw4e^xd-6+~MRJ&+va0D^31Y>~!?s)m=(<pG&s;wI=oG$?CkL_o|H)
zALUDQ{6|iYKAKu>bbF1wLb1ks>$8TMLkWgwe1Gj7G%vN<diA>RH~;wHaAWR4-v#d%
zrmXz6f0%i{unB)GD+hSa`mw@%M?$H~%&*3OSg5!;ZSv_k5e-iR{BlFD6z;aHda`KQ
z;B(*YQ!SZZH}=Nw=Gh}EirQYpa<J+KmzUp2QkJ$m9C^e#;#g_*-opKfJ-%?uZnfc-
z=ZUdDeVlUj-T4J~F72uQ)FOEH!VkY~Z%9e{5aRsDnmu2+B=%|FxWMB<{=m-ibABIY
zpB#P1CuU{jnLna$MXmFGQR<Qx^I_V>IT5E`nZ~GgKQ8?F^@+=wJ=gvG*Pz>f4?X8S
z)NxG6#Fb^&GdAo<n7%IFdHbDq?P83p!?q7@wNCN)ZRe5r@o~@C`RY+CKP_y(`@&(r
znmuVs(-RY?+{inh{p7uRVcEDo9~O>XsFM{H@ut_|?A5W2dTzci8~*k-oAvRgl|1kl
zzl!`Th4(HVxIeeC-NwjUbqNjkGG_d1b?w9B?{X@h-aC|_d&c*x0WC`2Wkv2=ea2<q
z>iETLpN`lvIzhLl*T6UTzb>1X|5KUuw3pLM+b-#}aNDQ4$^U*EH{xB^wzB$}J;rUZ
zICt;O{c&Xh?aS)UELpv8zRUg~kYJkPXPu9gn@+x+cyY(vZyMIteOHrapwg*moZIN|
za%^I`ddN4czcI_Yz3W-zNq=CXj%=GD?fb?2-Ub7&2Fc{Ok~Yt-tXohva6y^3&YFr3
zsc&dt#-~4id+EL6W5r93il%?%o=jY8I%$pB&wq`pUi)TAdYoVQ-Zu~x|M<-%ZbHX?
zfBfeC4hP5iZTeWZ0tXzg10GHU-t{BAD{24Eqx8UUWY<Da?5FNrbv*lV7rWr9#T30u
zG%Ruc5&Q4Dlt#OwHi4z-uwTaZ%U+~IS`_s_2T@NX{yR=0qUtVg0OsurDqW!SuTn6N
zsf4vmdGwgWkdsM*q#-J8sunYEmvlvQkrYkq1re}c4oQ9H0Lw6D4>K;*D2B$61F6Pg
zWKYnf2AMt+{r)!!tR+1P^u-GTIgaIhE<gU49;q2PBQ~ng(io}wG?c&j@xE`a1{P^s
zyR1rqlgwu(aPvl@U_8HObq$~}f&Q3IYRYX=YLU$Gk5s~5SO5Yh?;KIC#5t^NLF^p{
zMgl?My2c&E7GcD1_#QO15c;2;%P)h9240zohXYjo&*n2ia18l?equb2n6asx0?s3c
z73gy!!Zb0SNHBO7VNeUR7(r@PD4;5nkd@jz@PY|OTy$9z;yhL@$qN8D2=TS-Sb7h`
z8uDS;Hd0~PLSd}W7k)pq6dms++7g%ymSpF-x6WZ|pUGI14k&_6TIj;<rNRMStO{J@
zu74ZQYS^2V6L4r=&bm|RlbYF@y1;+IAR5)7Qgr%4RIi-}SU<2EHBm)73z*+6t62Xp
zU}Wo__}#gre1Te!t7v74kygwc4kY^-E-ouiz?qst3hEn%qgv3@!$(HDRIYGpjsUPz
zXL&)|Z29PoXLjKm-G7f1S8kzIVX!s~t0B<d1|2cQPldH((9x79>@?*IpVes=kZwq&
zo;-R-bi)19$Oy47msp-D8mgLl&Cdpylt(5pAscRj!=EIG!JyD_wOKzhQs8*7POyS;
zb<tMkVj!3C$Z!UR3HQb3K1B3{f#%t`fd66Ovq$+{z=X9e7`-BF${yhHNsZ(;@VVwl
zbq7%ULab#ENS-_|Wd3}J1_iJa4q<yR+m<oC`N#v<yAUcROQoPRYGukC-}Agyq5rux
zLCabD3%_#|%L8mdBDCQWVLY#Ca4QN<qe*z=4gg2H$5uR7m78)gvEn)DhK%JLYbJz4
zbxdRgSh5j0J1X#muE=1Jvm99OxeFR#uw(6UtQ-EA&IyePR^9e&(+D6;ns9NfY!muo
zJj02P`bm}p^6UumIPcl5kv-uUI9@t4uH^jBwmOOa(+<ZOn1-x9(DrgG@0ir81Cr3l
z8oj?uJqGx;pW40R$%q=g6aP|r3@V=9y>e5S^`p}8IRgx%^S}I*bLMO1zCahXH&I-f
z`d0LwA&ohWo2*omdKFtcJeQyIdey7gCEGsFv-=v)O%tob<~C;GxB;Hyd^7YLb9xR^
zmLB}*71^~opg!5^vEG)N3||}d>$A^2hYhTb%kAUR%^jb;er(LGYgasNz`u&;89lK+
zWbnn&#+-*o8}q+>{z+XWzgPW>^`tA-9((l)i)U=EtSOpv6ilc1=wsmOeA=h?g3}A0
zD|$BCM@5wMH`<u8YSFU7u_w*r8tUiz+iXr7HgAK|OSgdRnYp!xZpSCo8kv;YO?jt2
zVl&ZEUGbydhuYBOv8h=z$9KEDVzl0ojHtPX=6z7<m1HfA_<M)By58+beTbnVYs`&0
z**v}6RUPj9x}eWsd6(2%=a==AwK`_g`MYTS@mG=umHqj`<n*wmDHl@B0ArRWU+;Q-
zGrRuA`bQi53RD4RD+_0|j#@tDX`jWjpA}o*Ydl+c#rK`uI@S2($s<qC&%Jy5?SqrM
zyGBj?spF1@@w+2ODGyj?6^FeWyLV;Y)5vd>Z|mmnSiX7e6BC1iuF_2zk=Jh8TNW03
zCHz`*{J_?dI?wYXN_HBA)f-Jd_AXav#z*f}CZBTWKO7on=#;$Jrrvwsy(8s|%i3pj
zd0OROH{zg`^D|}MzuykI`f|FlrS!;}8;iHaW%o^6vU+9Wy~8(_td8~1+dH(EZ3U?8
zTye_b%5x{*c8T4c7PxI~-5JF%Y_v=A?u>5$Vm9?#ckUUMv+Uxs$TLz81DVd6%1!YD
z%eOd{4pZr@sU9<;?5lFs#c4-O0A(lry>w(-avqJiodC{KANW)UID6FVh{+PwZ{GG5
zTX3BIg0-f9<ugnR>A3<2ovvGfL-glixR8cDLV9db-36z;P+c~)TU&J;90s!%$d<E$
zIL(D^+I#iOSs~M=FF&}soypC`47<Qvg0btyja`q+rVP|TUx`fIgE}{}DkKsW5-gVo
z)FKNQ7Oo7+8`J(0!+Q2&r4pi2R|0lR8EGnmumKe=zL|LESG5KTqkw65AuQz)ol&!5
zRExSar!x`C=4g4ef=0)<4GTCBdudlf`1(=tX)<vW=B1Xd+79eL4WLb+Ttgurgog8<
z`NtYw<3d_<7nK&52#D<PnHHxJ=bF>t|KY%X&@4CH1Zd4NcE+F8O0@XDtYP9d3cfMa
z!dD^?6Zz?IQ^}u9VDg?{1*>o1ZYnZrH4xo|rEa)OiVO<5q|7m;ZD>eoyP1+GCgZSx
zyF)lEM_#NT{NM!;;-HYUOJU|O?{&fSFEWN1!qI&J4B0Ob@WH0KO}*!xNNpNU&F5h>
zbBPNcbaSE1FoR>@9Oi;M3}#B4P@*6ZVv|k<%}q}T)Zv26az&i5mG(I>YyY91L1U>>
z4~{nBD$4Ys6&wB*zcm=IpfuD@L<CbwEfi0l_aka+#a2mfAsosn3KWeqWcV!s{aCUQ
zxk6SA+O&EPhMSi;pdy#K=e(JjP|-o&I-we`CFN)T*XJE0g~l7UJ09%jMFV2~P3*RT
z@=_`&wJjK%0A$(#GuS1<&)ryCX=}wKI-Cf#3H{9Ou)2koTAj?SB3eC!=BH5L2im~P
zj#0G*SE~LwS@!_T_lbl?qMG0ZH+jAP!vN3RK~=*kK6*rVB7q4_UNPYEPnw=~#P4s^
zb}|$LRuweKe|**^1Qbg}L0~T0g&G_In-L#qu_=w%T(lG5P=j$3HqS*@RxO_6)Fyin
zk9eL&g(G#1`NE01e`DAA5Ni+CWS%6o#Ne-kO>0a|L0oe)ppy}h=~8K_;jxmfjTO&H
zqGN42;1jFP1EIPjVdsqgaun%vtl5Q={m#JVmG-2wqp?3&1;%59h1O==<`qV9CQT3w
z{*pbXBdBfb@~Yz`#F>VWX?(OIoRF_u(Q)PMqBhvX=y9W&MaP3eJMP&MY<hWju%W{5
z45T`#PF6>k!--?8MRxOQz!Cn2)0BG*45faL8e+aswU@U7;yp1aUyq@KI(u|f<y+hf
zboLC*Z7Dfz<aa5o!vm{tqw@&RtP;%z*d5zZgMCB3R<4XbP^DjO{AJw(tHVRH^1`|t
z*sYd>&2EfR79H}6>{V=^J-<F)ZWKE=*QHmn^pJe&fv8+Pa9aGF+#o$^%ng}(j?sCq
zEj5`=HtHJt=bk@xEuLePW&JdM=*F77Dea19L=RFP=|8ag7ptF!y=voxyxyI$|E^XV
zj`3Wdd(CHnv~j%JXUSZ{{T**){QhlQLo9PwXm--{Lf<P(r>n;*9hKX+uN<E@XX)0j
zyrx#=DSKJIUio)G)V(o%hI+5+>{Poy=H}^uq}`celXMhOM;9(WH%~7%&`N%OpYnZ_
zOUc`0>)?5dFCB`wb7WoohQQVGvh-zz9lQ72r+)Ny)uM$L(|p&SpItxp?#lct3$hFE
zcWU42SdLp|{Emu{XY#H0U*@lV<(rsLwz8n&uipywwyj!nGveK!w>CcgGbw#XY4OwZ
z0e5DEJt)1ByY7U1=GA}AGOkJAI&n+ahzYBnm%j4K{IRiM=bG=8>6ZU0UhVZX^?ZNl
zpRX)=?wzr*=Euy9HENf3#VhPe{-`|HJ7m&xck7AO#lt36&vIIutJaIY<ufLAkTUAR
z6lwL!wd!7xHKjwn>bI{+{@|ZAvUtve#_ZHl%InVN-iC+d-vGbV7tE|Y*Ugz?H0NUS
zN|$NV*VeC(i7tA(Q&p*7F>0ISfpq_{ti1T$ne*#<ZAyJ}pJCUzcraO}pN{9bcqiv+
zI$p=R)g_#Z`~9t}jrG@M_8Yn+2ilCc@$M=ebWe3E(Y0vco`LEu?^In~V(3Ghjhyym
z#iZI@T<!kW&&F`IU&ia6tz|C}xwEf&y$i`Ym(twLBvko@uYYq~ee$oFRV5A=r<Ep#
zO~M~j*{b&MpkIxnl4gP_0y79?y<nQoto~9tP9|)20a%sT1FQ^{Tf$81CpcV|_Du}4
zrzt#uRzzm(BBC%Rnyo4BB9D!%sErRt1*u=vbnct79GtwD#59meX(DF1l(NIP^9keB
z6ve6mLbMJ`N1P!qm8oA^t|%uVWA1&za>J`i04+{w03KL=q{w_`kHRtp&XwbhE}V>4
zI($ejYKd^hu?>dX2d(R{q5?X!*{pw34XTzj1q3o>>s)Y|O;E2OD>XIBXcC^pz@Bhj
zIl!(NPkk;x@r)a5ZNU~q)@W7$yd%`Vf?tG+I#DD^-CF5QPJeT<a|~+90%G{K(2<Kr
z;xy8kz?n_bnXpH^2ygi@ob{jQB@SJvG!w2K^d#iGAh>b!l$B=^78xGQBLD<&@K5yM
zV%Y?*M?py|$(sY9JM~e4`IxH5ics-y3`s`#u3J(n4w*du5Ll;&{UTTuDGniM<Z(R#
zKoH4e#RdNbAVRZ?R;>NnhG;6l*l&;75@?kl-kx44&g8x0QNKZ-wMrXGxOGZtI@;v9
zIKd%h1}4+ggf6o}X+%{V9hX2~LJ(W>2R+&dr{G2^IHvC0xgNwStR%=PIT$*zwjS>K
z)QW>Ca`YSH;X_`IE9hP#it%=|_$JVkgtf(Gc}77eYg*ce)vCI;OS+B%%fdIUp1d-F
z48|Cys0cJ6tVvkVOD94BpYs7>6M|^igL>2g-fYZPkdx3Qmi4q}-C}V>8&sfb>Kn9*
zLOqtE!V{=924OhEe>{K{Ku`w}x_}^0Stb16G8!g?(uApnSRNP82(N@&CF2ul2o<TB
z^ab#WKTi*ZUTS2T{u9n==~x9U^e0C1no*P}q=~G=4sBLt0Uy;=vkWvOFWhqy99FIA
z$v-^?tF=i<!)!t#FABvB?^WlG#rcI}QLo?w513RgW3>F>6{eA3D$J9pTfoGy%2)Va
zh`7L6ATBaM$=RGqr4EfBA-{pjjOiTOAK}vrP0?mD=W{9Oi_uj_Vy78Fc2&EBmXqH(
z8dEJNjf_T@^U)D-SX;scJpgusNM?vm`Xa0Ks!?^6_DmdI0z!M1V@J?6ZA>?XdusJ)
zg?qg9xrUhM(8<0~;WAU_Pm<W7!K__XLyw;)>%<wjf}?iDn$Fk9@O}Jgh^e*1P-gq*
zQ`^gGU6Q|?ru<gA$6&mHeR7urEv6|~vJWoFyR&VFW^JwiHtucof%2<WgS%JWu-ZE>
zr{~wotMt+LQ_j-?zP|MiJ8F)Eby9g19P-NTRXp`jRqlZK^}R3W%$(bpBR4u2>vc)b
z-)OUr+Q+F(z4AeB`(DMav2q=C=+r~4prj3j7aDD}cWCSU(4TXzSe+Y#atXawm8Huv
zclm`G-+B@fqMH(grFz>JnjIacqnk3XZ~N?9H@9y+mtwfF@AmD+`19Srjdd344(%I$
zb;9<^wI_Z0ZM}2Pa9+yR*SE4tG9As{zDoM*N2{C*&yFv$lB)`pKmRzuSo&-6cW>uC
z4Y^fwL6uXdNVr;YICzJ&;zt|f%XvGlncc3rP<CWl?lGMy5#>KFj$hZd&@^M(@l*2R
zsE@a-Uitp`EqEz6`)sG^w>wsJon@TW)$6Z22B8V18w>RkL)&4XbPH`^*X?xQzdB7E
zT>D~hqq@iG=QH)rO|0H$Jz!-aYDR9S`<+VZs>~WWu)54*VztzFZSKjv^Qu&S=Mn}f
z^MO&tBPUkNfl^2Hrv4RHzDmDQ{Zen?rC!B8JB{kXJrC<eWkuE;SXq|q0hF3$^v8Bj
zwO-VZku~Xoxy}!=XN^+USa#W3ZJzSAa(nul{I=2QflvM2?^#N}8LjH#;2T&!Hag$g
z++o-SLaVJmMJ(>^d3fGq*P>xrThw#5W*Jw3r4n0LZmhO_^ZVN_Us(Ac#7}n{Ya9Cw
zyE7GCr*`$W|5&-P>X^>&imuXux$Uyr<t)`db(m4r)UL7zE*s{LD>GbOfPra}E^P>(
zTD&=s6A~G7uy34=PiGL2#I((NFw-&Rx5`ujrCQ5K<C3i<gON6;X`>X`l3$U=#Q}>^
z75R#UQgN2X9pk9F!Gsf-X}vit#;X`iv<OH82LZZVpg#$=BeNxOCLBy`rjtBH8kc3y
zpisbG21+~~Qv9yNfTYA3n+ETBtTchcc3d@OH3-~MBxMTkP13bUk#eC{X)2aEGiRJ4
zM9uV2xges9AI;cPPt$`;EHV`j;V?y|1<fQcb`H1m<jqNpnTT54qY=YEDgx$cRaNi{
zlb)jy!)|kBOU#UEox`0!+${41fiLW4wHQrn5~?X6nZ_l>--LUG_!@bVtGSLw2lC4^
znM!mO+X>fTphNl<+d)%w1ffabl(L0(gcz7O#b=NQ)r#=Y1Dz(&T#TtCdAu}%S16D^
z!`h!Q#fEEYY#kp1f+nB{h)1JKL5MOST`?4l=Fn3Ql*f@vQbcAS_!0&mi9Yl<vnWw!
zNl|<OGl*W$@Ztw{8z`N`ze2pzT2KdmXTAzQa_hKMMYqfE8UZU>ibu>@{ev>44N^>&
zqTXsE8{(J6geZKSLa{BaWkk{%ldmdjiGE1XYsJ1ERt6iyWTi^6`)wCw@bG;wF5=?g
zdWE7HK$2odiy<ZpJw{lQG=`6wb)2cnRWK8qmWR};MWxH5V1oIMY`p*#icuvPX|}#l
zM2iMLG%nNo^fC1PW<ZnzL;^R_M7IUr{X#JTAVg>)i_%gI14oFUgk=vMP|83NG8|kW
z_EjT7GN2`+n^}{fH&&a<^d2pJNfHF~Auwv5QPU*OIF<Nlt4vLzmX?{RAt%mMeuOEK
zrJwibfM!M(Bqu~6Zw78@N~CF9qwnbv*r9ATjrGVm%$P(!9yCL%TM!eJH|l`G${e(1
zE!5P4g8WE6WBwtX1lDBJp+bX9NF?}>CKC-+zz@=75aB?4*bs7bhHM%%kTaDCQ8qsh
zFwg^tR)_#LZ9$9b=z<osASl0cD^=&MO>hF-#-QbujTIXl&Leil79;YTuo+zD)W)=i
zL6x5;1TLE9x$3+#n5+L8HV>7l^0TWp1ld*85=fbfN*9dIqZv@U2%eZc#^I^Af(Y$f
zMJn{IHbAs+VyD!(gNuGI9<0FdT)&GyRD|c)dHzrlVo<&ndQ_4Lh-?UkJ%8{zKyuW!
zQ2mZzD9<mlzQ_sDFW+P^enc_B7DOwv!EwLGkCuKb-D1}NqMhd%uhWwIMt<dY?YhOi
zl_twlbEcOhmu}LRJRRVgBO4jkC1C1-4q3%chdz3t{rgYYDLv5PC)vn#)mH59UCB}E
zn7nn>MpHcV!i=W)UOuo%9h0%H+RVXoSeVt6=f2VdSFJK6z^_=Z4Ys;H{2FrSwRbz%
zqDx#4CpU|f2RVMbJK(2XP{z%@@)G9`SoODk=B`=Zs~>0RTU@ZnsO$}-DhP~;QjWFA
zQ;xN4c(1O#Ztq*QD5#u1jlX>1x_$48Qxh^R-C7hTp8NUPv$GdooBkSc?ML<K4rOgt
zc~8qbW$b(H$NY|=6-V~xUK<$y#Cyu^+5QXrerq`^JlCwX&jDqFdg!xny-ns#S{HWS
z<9KADo^p8B)ZK}eS9@I<TK{cv^y+%k6LSCZS=HC>oWF6zbV%XU?Vi7#y)ohA*43}P
zMgXYFmi8)kPc?c|=WUZ>86`Q;sP?pfK4X`|bFa+Enz9aI)4)_ceaqB&ht|l?9rB(&
zx3S=sw@u%$sBJ^k6%Nl8_~ZQuBGi5N=UKj&SC*;UMb;D#i^x6UUD<cbe52$Y117(^
zvFj&y>#!5b0i)Fmtk+fdn4%ap!0y$JSJ}%Pb0(!{r&yi5UKKoGVc*TKvfTsgwhx#E
zjFMKn)>w8J8FwZ=Y*$UvC50qK9d6y-@qy84=^SaXaY9DYsW-p>`%Oh$MTW=xpXOgW
z3#M8WD;>CN>z<C2>Q2{ZuU@%2QKx@L{hZVF2UmZ)dJDE&V*DVmXzH+IJ?&+i)%SDk
zy<W%sJ{{DQi>7%wOASu#K@Z~f_ycn4*b=+@<=D#}8=T|AruBYlk4JQNDc#?B>RnF_
zMUi@S*$up82l=U)^pq-FRPh4HRV!q=((b-=q&bGOP?tusa$p*g0SL&XYJbJS5@&Ol
zlt?IAumIUgTzynPCSVt``BLh_kx1Rp9Jp|`3MnA*u(Z<@+z$x6%M~f~v3-%ow5e=J
zO>)$5vMG4HpJ_yJ0U3vJ^KE}$A;z^HmL6XWOhglU`EyZ9t_?auEJ{GF4yYC&-AbFI
z*xIUawLWN!LB?su9E!-kWHd(gl^lw&hiHsmry?D3a)C&M2t6Y8U>|CT(Uh%<XLO_y
zy%+>h<9e+bw2`lbID#VzkG_k{(}YcFT&*I%j_F;jjTevtaEG#2hJQ`8)eM!$U*xVE
z(G8wYkkXj=#C)pTbfztPCNV3H*mp%`r~@8dq$q*{!9QFNNeUvAEl>krFI(vc<(>S?
z>e-DoE=xN_k3;A|aO1Gv55!X;JBW^CaV%YhG!oXNroQ>?;#m7Rn=SF2jgUL=2$_Gv
zE8;iCbgVS8jb<bcD*)6>@ziMfO6X%naVGK}ot^MCA|gdVi2h@Q92#AUxDMY$S|nPR
zA>{;k+CU3u)1n4MdANP46yK&GHSxA?5b98b$?=XZ@cCzRhr!e>!xojB6bEy_s?e<4
z2EOJNLa#H%JxnYE=;6AWv>CfMO`cxN+2ePFix7{(h`fp<S*x=-+{7d%ZAGM9gvAY*
z?Z~#Nh(Ti5`sY_JP>a6#&FAYa1xVpDRf^+LQ~I9VJ7(L_`yLI=mioB@vlLtiYUauH
z(A6~8C%$2HLD8XOH7&B{Moc0Fi7f(6KQT(E!O~U0fu*D*f!mslIufVYx{#nCR}T#Y
ziB+1naIZc{g=wz{K#~v`rMW1j=}XH4T3Xzs4LAbMd<6{AzA<e&0;&k69}y2%jhcvu
zK^L7|&PWPzD}0-bd>HnDUqpZs^ZrdvVI<ZeTFRs>G(5v?LRaE70lbw7f?a?&o;hpU
zz!z99+W-~>8J)%LESD_5zBIHGK7S1SRr;W|cN<fJGNwBn5BeP{7%qdDd=hNU{%6Nl
zY?#(j+J^5{y1|h1OND@S9Gk%)s7_5*Ady%`M@V}FQ*Z^(!>~Koz;r8s5$RTQASP`H
zIvo_+qkJ;f9wwT~5{3^DZy8*S0vpAcj5nD!#&j|rO~XJU8ji!T3*@IsL8q1OpexhK
zC9y<Ic9lO=m2|6}th1-5s{PdV?vDa$9d-8fs8O|_23g8JxtlaZCDlpIajy-)L8&^K
zURi4S;(*2Tr9h~7S%z2Mo$@^w<0bX+X6OdbkV!}7bf`)lZ}ii2X@FVw<U>_C1Ee{!
zjIg-OIYyhD2e`(5L>Kvgx0wSuDrc#BeOT7AjNvgUwR=5n&JRy<`=Zjhz$kumOh%<M
z4ga3&TeKe9QxDhSCu*uAo!Vy}+7J2Zb?yz5!Sh__NrN_lnesR@Jpd*B{y>?MVY%J$
z!k!CB7f!CwbH8D@M4mf3I)2vIW%B!azk9D(a3DNdmF+NVbIw^G{er$*s(!DIJXn3p
z&0}+cea$hWLEanv-@EyRt2a3oOkTJ-ZDM+Rv%gK`F^^_f_uj79mKz=T*CG>Hzofrz
z1fN^GaIyED5_PZcZ}TOt@3Or|zZm-T{DNQf7W++^-tg0nG9&M<bGLi;T&a$`F0Z;?
zElDr5+iPE?^7<*kC}*U1A;41R`ziP6Ui<4=UY8QA@`tUf&K()1aC&-JuS<QHYspac
z>nVzzQvgiSrE}b$g?o;92#x7$<@J^I?RLP&GcV9{eHVQo@ad$7*{N3dAT(8(*H~>!
z&wUZ!!yvfN-tO5R^RttU8VnpSDJ}%OqEEMtp3<kB-A3VKrSlB@Fk<Xr?ptMK=Gnpf
zC{XFTYqe{(EJ>Chm#LfUY2j%Uf4+aj9+gGDB33znPLBOGd5SzWYPFer)dBTDhn8DO
zCpra2D(JhXuj*W4t5Zt%YCp^ImP~D`I#5>M0$;G{uw%P6t2(>4RdsfWOVpub+Sa>Q
zTW7q+@LhN2?WM|QW6A;ev&#ALZ~&8gTl6Is(orisf0P}vMuV~y=r9Yyg5w5nubZ+p
zSE1aiyO3g(ine9@tEO|kiHT5*j#kJvXK$3fct=ze5Z9L?QsGdc#(Ay6o82#?1SN|>
zp$vgcmE`cDL{Si)V8WGT9{~%A!jZ3h7*#=H1dT1$v)mJrj|fHN)R8K~!AW|C?7b!d
ziY|io5VcIe5+hckt%sL+Ed{<s!XbU-10V=sqaAe;8hZWBOglQKx%0=8TU>k5)~J}j
zBp`q`kC8VAz2zBER})fkor!ybx|c}-YG4h<@<2D7;68^i0kKFd!^;s5ZOn2y;5bT8
zGx4cLP?8wqupaavQh_hzL};{@4t43GzsYu!Q+j8lxOx%G#baV|F(9HGJZHS{lL3y{
z&Wk1neDNhB8F%5$Oo|jil^biRkDjr3ffGD1KqHY$Jb<VUsVY1Ld(-2ZNRgBBL}Bt2
z3K(fSfJ~AT%k@A-AcG%(J@`E`91}uaO!29Wy4E_Iz8oPzR3ZSHjAR)OV#uZI!U3d(
zv+KbXJ-bn43<43=D^d<0?KkKOzSN^1yvD-oyhR0(7EYvxgY3j^Qpk>Tk4>x^1bMM;
zX(V&;W@Kpd3Mv|jmSgDiuj`J6|J*Z-X-c5el^L&*WW{|&)|<mXw}U`UjEewcMQt`(
z6fq<VW{k+Z*`_WWNW(+nf>GG;H~N-E`MfLp<$f;p(syC4VLgPusrv<@)aQh_dP{%|
zaR?V!nCXT{4RK4e&=M0>kb-BDQ<L07oh|TMB~ZeZIN*p&3jw%psRTEWXUMH!T7g}T
z38IzOg$Z}YCh8V_PA<R*@y>`w0CZY{62GUWn-N_*=rRI@@i;oG%VcIFyS$JwXSb)(
zdvFd{m;|PSd~{w6n=_T{6|o!u$+`n6Obn2O7(TnFg3%q=ngSI20?;6{F0d2NaJ_P@
z;boiD(Un9rCLfV0hYdVCv>;~1^&;ZA#T`5rUUxt+in8x`>=M$6oFiHg+JKNiLvZQL
zb&m(#4_ZpB)N_6DaKm4vj~Y4wUiKZ0GXWS8lTm<*)Fwl$JM3OmvJFSZnK<=~>p(Qb
zGE&kurgK+qJ%eCWE9gPBy+)q`MA?!_*Q4B#Xb8-dm6SMSG*gafj*y|hPVFdblhp>Q
z5Xfje%_or2X`J~d5NJYo+AShb&s5AZt)u%RqMntC7z1kq``9k<@$MVh#t%{1$L>zn
zQQ62c+RKc*CiIyQYvdJyVS=7MC9!JHY9nuHtn5hWn7E7aY*Xcxx2N3S%o3v+UOC>j
zc`EZhuG?i9EjsvB^ng~hD>%YU-(pimK*<6xcxv$1Dth>Z8O0I$>`w`@JS)p_Zb^e~
z!;cwNn+)b~R5-R+R?#YGQ^hW~;V0D9E>3o|?K*Fk&Fai;U%GMdIbrQ!@3r|*_N~gA
zben~z&z0XW+^H{rpr_E6rxgxg^mg<i6FZ|jmNL`o#YPX4-z0g>h$xt>+~ciepX4*Q
zR%dUQZLL1Ged*OfQ^I4H53R_%po|O1yRdL);9vbM?dtnS_1%15ay=#X!sCK9w^N^Y
z*zEeMy3fPL{B0H4Kc`mzDqT?McwmP`m^AQH?ySI1>OGfczNuXur|zTk)6EDl4*p^2
zv*#DPczaXd`n=eW@{HJz-a$hPF1o(VaxdS>Xeeul_bQ#z1LjBdI^B%kzw)U=#r|al
zTg#t@+fR6yJ=1tn#R2+Q7jCyvWmo5O*Ql4Y#@uSCd)g(B!`?Tf+jbs}`gv=W#LR0^
zeAv$P`T1T~)6I4njM<rg7$fTBq5!Y?nP#A#?K_J+Ej^8NK|KCJQSoW9>SQm~Xq7_Z
zDv@UdV(A4pV>uQ_sLtstiI1r4P`$ILqFCvW6CY7AyZVQsGsRMeobHb*HfQN&#%Jw+
zk@PzlW@L9qH`Kp<3;1aP+Of_60A;n!ZY|rK!{njymbO@*0g-Lzcc2r9OEjDWZn6bO
z!IB$x8e-DmirOqd&Fr8RUizZp=8i;@dysD`a!v=--GWxgApdN1=gVS^h)c5Ulf6Mj
zdJd^WgR2hY0C3h<Y<x+L9-#a9L0&ondZGNdU)5|V6O>)L>e#stgdc-n%7|@{UE=*5
zN>p<g0O9RV+@tZ^SR~vSHGMpo)DgWRN@yXXrh|kac?AoblMlwY2XQ72H6);DvPuFY
z#Y6KUxycXFC&ArnUaZFi9KMH;h1J6GEL3d-L?(_qEI3XAOY?KF^M8jI1e`#P+Ld(x
zEy5YD`!pjJEVIa7vz*p=9trYH2|9E^p<w!t)(x`olqf=7=MzzYX)PqFolv40G*%hc
za7e1ch2>4IV3TqLG{F~0FhZDU8pPvKqybSpiY-D!ogE-#p(8^w;8vJLxSb|U!4z0z
z2NN*Gisj6yCl|yh-8;;f;->>MXqI+F6e_IDh%6J7A*yL(9Zt!);{8lX#p1DSt`l*6
zglgH)D=Q$XLaR>};E3+SVQiuWv)=$V1P??sP;#iUkAV({EieRbmEBmM%!+F~ZQf+b
zu@$2czRqAVd5!EuYb9Z&$pO?X_8-&Q96~tX0DJnVz@A@1KT12>sRDY~CV-5Lfz~s6
zLSu$3>}btGN9_W3(i+@7X&r2UR0{8W&*+GO6}KOoK2!N0ThYmIf0tfVW9RcO=kHOZ
z)BtRLV8YMb4J7ywr%)AM^QH_6KXg2xV!ev%%nq_*UACB<(~<Cr+A)xL0}?@PU3S`o
zV{z#J<wN^4FM4K$vHHGa`+dYEt{*UiY7$Ehd2lg>%skwPmShA?h20UO3zjJ7Hz?Rx
zqP8R;nkWo$9f)`YY7bZ=NyStrk#`UP67U9vasUc}?<i07nLDP<IjmurXo@vckw8G~
zSqNsZ!DCRc$>5}E)T4rN!R$(+fQ1KRN)}v27HWDA%?2BWBq#|`gkAm5;@9+E03KSf
zk-=3sgCTbGGud-|<KQiF(hA%zv?MHAUO_aZ`gI!cg|m(BpI}GQe8_Thm-wa5*$}i8
z>QK*2t|HwJvPGT<U~>Stgr%unVonw9_dElErlGw?+A*E$2MP*j6trlIKIuXC@n?e0
zBP|LNhn0R?Lxy(LrXXt*`k#F)=|e<85P}>R&!4k4=RQNCE|Vw3h69OORaPteN8P#b
zMb@SqJxP7>?$}+)eTjX%8*}uG#|<6Fs3tW>W+Y$iC`&pI#K8v=hRkrBG$-QQ7Vd8I
zB*_!T4lqP2abarM7ZQujyDT={w5acL3e?j#$nug^_%PF;jO!_O3!_zbJ6i>1T!T4w
zKgT^|eTrQmU}x1^WkL+#=ZB!o6E(#h0Xi7~o#7`+t2;W`yA6-4?7T{^zV9%y&N7o0
zUO4Akv}t(C1Z8KVE(^~U8XpNXaZcA$8Wr}=9dq-G+t22tO^?Vs@12fM!+!a`lOiJD
zQJLo*VD&ipP49piQPoLTy`mZ4y!*4l<btw1Acy`c2|%{U>`p+QzB)GLP@jUJp}!t*
zcix%fx_6<|_AA~2(q)h5-Ap$(ny>aWP?pC}onKHNYGdWysYIrh#^)G$JIjvGF~0_$
ziMLS~ZF{be8OURe5BK=0uF8DAG=GRZZkzWbY5k_3Z+V$#NDJzoE6fahmK7v{aDX(n
zb<Y{o+%va2V5T7)e40muW9EHxnsVFDAET~51k^ZQ^66tVTzbQNT-4=7@%^~4<2`g`
zdFCb8`MER_n6a==d>=_vaq!M`|9su;UYAv1ouCBr%KBmz1aM7S(FH~EPzSR^iaCnI
z(0THmuDj;pXCA;NS7zc=AWssuEo8>D5-2UNDU&#@&mY$|3#*fRWhi314U=uo!g$s)
z?@C=5V>{YL<6X6FBd45<2P1T5gNeW}jEUNk`a?30%eK)<3TwMpj~x-W8$2-yqjUY7
z?GfzWDBDOtbC;Q1gg$;1o6#tBa}LmFg=`~*iC}I?`!a9JZ5!pSnT|su503<Kdb!rw
zxWhT9J-sbNvN<B9p=4ECNHW~R;-Mg9fRxrk)|(g0F``*auT%&?h;D14jR-K1jkui!
zg(cDA6toJqQBGK(r4b>3L^!}h+*;F6W*Z2=bs(S>v4o(uOeEA0YwwVU5<DWJ2b!%J
z?C1(s81uvcRkzbEt}zLQFAq)kB+MpwK)4KxXrB?7ir)Y_eUd1{ZL=_jN16dnU%Y1m
z(F?!IX95qCvcwx@w?Qbud5Ww#AvaAN;45dz-bsQQBtR5GUPJ<je6#zA7^#m(VbO2X
zpg0zNq7XGXa$?yW6RDUdW*W%cByy;zcPW=_Qv4V|h+XR;pyZh_3n!b`lCjuSHtT($
z9aZv`_o5}KVe5cXgn~CM1c5B1sXfClf-g3-#e-BNF~rR^9}^~5iIMN7xDBG+8tQ3<
zE@3r>ErkimjuM3xzzu{G)^(H&F9s8aY|)|JF1C5NUr0tx{RDXUTa#GAT0bn$&f4G8
zuRzdnpaf|wE=(=*TEuMf=3;opo+{^HCQ@n&{Rdppg%(a8uZ<Hhis2iVg;J!7FLVR=
zGD5AlohKRP`&EO^Bnr534&6?D^v<R0qEo4cafkxw<v-kzG#8KyuO?&K4)e0Gw+$7U
z5!T$1JxE9pMHCJyASTR7+6iTYc(?l`Tw*Ruaf5n%y4?|QW*hbj{Rj@xJD=6!i49B1
zK*M>2N!S6laxkVg2*f-5GtV9oP^nn{yNRqAYzSp=BpzwCC^&|jzGm2pLO+mOGzbJc
zkW?Z8j{aG!(O7Kae8?!Z(#ivg))!Z8I22Kgi99etqv^$hL4YCAN^6Cb_<pAT2+z<;
zJ931h<2q0~0=l8+Sr67@roL?;`^0td8Nq}a9A02L2kGg`SIpH4kl1D+v%^k!kP5*D
z$IVtCl!QVxpbo4rWQuCo$z)#HRo$6t4*>_~w2HqJ(i_4JL!m?vi!E1n3@*-AxFh_-
zBpf;*6@OG0w~(?^^e1<&I)Q1X5!XDj2P5%epbHH*2|ffm<au?mZ&i7Q{#P}j8z6~9
zo~a#4v+3lWr3U9XD7Fk8VP>g_m8a%T^Ue-25A6-E@uVG>E?z39MUJO>pZ`h~@M!*{
z!G5yZjn2N(`Qd#shVMKWZ|me&5fB4{NeSz4u!mD1468?b?eg00vgqLkz}e{3Ssz=&
zkJWog24f%6K7N))x*TdcgKv7qY^rotSyU|iIoF-&#Z6*ycGk?G1PrrHZ)|Q(3c8R~
z{qSaTn!Ve^F|IFV7mP1uzxX-AMYi(1Z}k4?yeWRWZ1z}<oFX5pepQ|HG-bh$Tkv6?
z`g--&rwI#6w)iJqogP)~d(}7UrbX<FIk%PO@}ZV;`s?bjHD1FMQB{8^^8&K${a#Nw
zV&|V>aXT?$vgN3Iiqn7mGApY5!%mQl$_yk^8g%hZj%#_mQC^Nhrt*$AKH9^kL#VmG
zG#4C`<DDUWy6NZoP;d;mCTbf#6W6%@5^L06r|@EYYt^zd3;c$=FUuZa^bu$?vwQN*
z_Hi>I*_^0zFI^*lm0U?5hf7O=HaA`+U+)u_j8DfP<;V}ko(S+HC+nfXWO!HoF8Dht
zwhJmwY*B!>fA($VuO^OHo^z6^@>f=xjLr|tP-c1?yBf=rgTfa&4D}YUCh0S*0m=~G
zw85g}Rgu7&%=nzkr1kX7um$>vSkn?Ki|@&|$d|<`C%3`E=jVeuR7=<)4pVVhj+1H#
zbQC9S?!8>v0=kPTXhPcQ`O>~|eYcEPbw&>-XF?#Lj3-fz=Z5T1u!qhAS44m&LkV)*
zw$z|)qGdNilaQSorJW~ZhjEX~(#|chdNdnEF1pF58VyqDF&92c+FiylqKSpY3`4QJ
zA>#_NrP@Nwv28xYxdd}fV)_nMnQ>n#2`Ugz1aYT|)sTsn6(kiAbeKFen;Tusp(5>O
zf8PKt;-N?nD;lF<P)m|hgtC0R)yX_c>f8di_%#%T05KEIirGK#`7{9?ZCb&x%@i3N
zOG1*sFL)N#F_WYafCBdLSP@FgpiTf8SR_f*YzS;{1EktOS89@zC^RF6c>*XW1oeSf
zBb3=mA|f#o0x0nPG%>I1Vk(r@J@H%N6T-}5fJ5<LKmb!&U_fa?N5D@8V)%lnK_y<a
zyeE`U=6*1b`VK)ifu;d-jR`Xd^|&Dm-x6$yTy(b*NGQ}?-JI+r=woCh1yD!!!DR5U
zf-{uOb7h2?VPF*%TRR5^6r`0R+&M*dLS1;=#h90b8FS-_rN2Q^e0@U1t(*KEz>$C?
zXcL-ZZkuO{?658V?;uu{F?WmWIz0A6s3{cb!`;lztf*~b3-Y*-Ez+z3ZJ5#0r758-
zc1F@DF?OUuv718W9Ig37#d5?-Vj>7s6GP!3*my#Bb{T}5oe_rAe~D;@m6uWfCECEV
zFuRS(KkN%AYJq=6g}Bn8pBPDezhd7RWMI%!ooP16LX%<wk%nb<03_fR2O<b+s|n@i
zA%e>ew7j7S&;jNaCkJsUX#q;E^SCod4*pJ`8|5x)LA<z2P=OvK@M13t=|B|{%kO!j
zWxKdiG+n33d7?8oel*3OxdkN{WUPLx3C4(kw3Qex)*${&oFfV*1a4eHab)fku0U3i
zCJ3$J8zL})D;~g%(l}U}D`++#LhWb0LFrOV(E)z7qP(-H)&M+MIT<Fz!RuuYQrl>V
z%#aB<NaT=`vmHv#@8VTc+h}EjM3HC%fs5zSN<5Iy@P}h758)d_#(DHLcv7u6^whWm
zX2O}FWe5dlzpTXi?AXd5D%WSV^bGOa+>!{#P~l^6F+g$}@gH_%$EmG|g%U0@!oem*
zZ|rSV3|c(PN!TH1IY9bM6XFmAF*Sz|r!w+6a8VR_?l&Es+VjB0tKg)S_}}V$7*m*#
z&}fLT{T8FvCIl>F<QYUcr&=8eF%RjRJGHfL(WV=+<d$f~+j)*8e4~X-=3||S)eoe0
zLB^?`eeF{0ot@l5r~3QKf-*NcEll8CV^Q-k$2|yU)U}|@V`?u+ON-4vAjPaF4c|XJ
zCCJU<W}E48F`H9@oHJ7zl;uP+7-XCJnSGaL_I>>n;*7=FsTP&9+=BWJo>goyH*J#V
z;KH$so~9wL(%xM)HU5{OH}`LQnA^R2S#Ep3*ET6_w$`t#KM^*^IAuz)?V$m__TK3^
z4+~ZeJl}S@z2^b-MddQfUxuyG9j5hZ^_%(lq>p{`EjPv1Ur+krGej*dUKTROU0SsN
z+3IDP3#9S#$@zWc>dVD9+Ybz%kX!*l#wOQpvbw?~?97zl3CXVwd}5959MrE(!tD5G
z+d7{|&}L?iiDkgjj)29=XY%~8Gyc7#;T45eUZ(LU<}br1#kQRVrCz4R_~ht6jy{=r
zxyBdKr?HA{3G9;^EaSz1#lZ0jSjLf9CV?EOVztOJl_p~niezx44nvelfEaV#soE)z
z#FzL?GjgHyxC?crSm_wy5CR8kHqaz6BQV1UDhyX;NTK-$tYOR&lkduyrFe)AoUAbl
zJGfbrZh8=OKtgI)3`>Y`R6&`t*!BuLqq&j{@8Po8UKR`V^mQwWUU;8F0y-vtxMcID
zWL4X=T2}RyXaUy?y^-dOM=5=0kJi%8kYWt38iHx|R~#B^&^E4bBr5L_rNPTIl5-Bq
zvU&nT=B}ayb5vh=Kj=;*q-oBr2i#mWw8%q+SE8WV#Pmf+AtDFOQB)L9nHz05VF?>;
zIR|<SN2h~-A`yJG4_ILx+rSGNrV|o6%zbK0_4Z^#aXDzDfG0vXB+`svKjF=Z_dPTe
z+%asY)~pRT**bh4F)KsdgL{Rlg#X^=<ig+Y#3usfh$r#+@D>+O0s>HUnb|r5<uHc@
zvQl1ixke+x$WRgwiv(ezGdN0%LE!!T%~-&mSjN5QAf}QCE4Ps2MP$>Ik!C1_v<bOO
z6uc!pgL4r6qn|MVqAe`+!c>)#Oj!kVBCV2qV<r`#gCnoSXCOjS4ob{f&RB>tvwRF`
z3d|q^ffW@oZ3ke6hh)q_VQ5A|Ld6+Vjo<<qV=k@eF%u>dcEdOnK!|?eRn8JcUxIk9
zJ5WdnT^~t%p(GCIqRBCW_Qgm>lV)bF6nQmNX$5fyL1}zI0*0r1SZqj!A~dl95${NV
zv=1|cIHZaFfHshRa}~@39?~uOEK^MV!3Ez73KJPgLR>o7l)6e17&F0z8B9&J|8WRC
zDHOy(&PX&jX+A>ShmWwSNt2;YmoT45w;?z)Y)R`Awu#09&1eE%_~PvQ(Tl0voIt{Z
zQZfh;3wUyjv=F>t$2dxYf*`;k`obj@yyT%PJm3xybDtC(SD1lB1aQ8k;A|BbZxc8O
z_)x{97hD$S3z7^|ScEJO1RMc(gg3ob$QieRV*WJNmy(Gqg37{f7l~dHGgxREp<+#i
z74<eE<B6bzp#pm%!8!Xca-lMQChIU|MnIU)IOSW+Cz?|v=inRS)I{eX>LOf<Sca#Q
zS@ej5&nZ!wVS<WqEm5q|I8MyD!bC}gYWsN<DJxhjY$JVihcuVDdl8tSqsDiDlLQ1q
zQ*zJss*uH_JNS8?sUWU7C9$hKMKTK_%7%({5<4=apyVvC`Bs;iR7X=WzI*2*3lk1D
zixTzMdlJ~R$)QbIc-Drgf=bh7e1~u8(9uv-2zO9`wHXo)lV%S0-;5Luj%_B#AYa^x
z;SLMbG^sR>i|vuOVRB4KH_SId4$jF%>=@gm*x1N9+QiC9`Qg+8kF2fX)qqC<ch5v!
z3o`EGY6}BA$hf`h@}5}6K(3Q4?^MxO(mC|<yw*;E83n7#m$wS)tQ&u2Lj3HjOn)g^
zU<QAw{r(htztE&>5M)3$(HWO*!6=>ek+bpF@2ro+O+klUCM`2}N#QsBb;RV$pv*X=
zaB8cQo$OsL9=ci9ddH^q#bCvXLerv1`)gi*7!Avb@#!C3Z<uVfEL)Z-eG>ch`s7zt
zb?ydJ<2UV4Y_RgerYn(6ns0QLv>@Kf$9l)C$PvUZb)Ncp!*<A{A`Jm6GdsI(E_t*=
z5f%BR@afP_8!NMs`l^`u0qOR#Xh-8-2kI)4W!~z;`GL}6g+u;<p(po5edw9%RJ@MC
z%9$x)fEN>=Sfjrqy&oy+Hbq|!HFSdPGAmZuPEi*Xeatlt+*18SvEfGP(4hrABvw^j
zio<Rk2+MysG_!}Kw92%2>5Vk@$y{PqwWv5aA<aKO9Trmd6%VuOqX3wrQQIGyr9)_u
z-&PJ+R6E@>H#&?1gA!mUd2LTO%LTXO9j@#HwZ*qweFf6XbS}LNIRwTbc)1bbs0OfH
zP#lyeT|u@6z=ESX@NA9VW#A6wX+Sj)Syajpp0mNYwCXYGGuw5y;#jsF7bzR8fgKZA
zQ2L4_K#<QE>0|?@&j48zvF&xiH@e}<0s@&JJ)n-!E{W5o2s<NLQMi&e^Y!&4SQ{!N
zZtI~bmYi-b)W-GgP|<yw?X{IKqVNLF>&enIP({wY-U-@qD5ZCl&SsVpCbprh4MlPC
zoH`>VQvth*>o9SB<s*1HhD4gP4bskxHRie^h68W`KWt?9q9w%e6Uh`Al;X~6)io9F
z+SU_;Byy4HdbJE+C_Dpih(%<Od*<p2FU?{G&*?dDs9iJ(I!xK&x!z=!dud>0@lEEI
zNID(P{sH3g5VaKwl4w<E)o6v3#WE~z1`&W5lf|V`SMcSD!i<ppNdWgipTOH%n|p|`
zN`$3~p%tO$G9ADmN;4M|n&81vA8Mq8Ny&jALCOhF1@m&JpdhY)z?C7nfeAw@(vX-%
z)B?;w&HqpY&Vi{Fi9OI!069p4oFO2Q2$%%DhbLiJV<3<Mu~Z3U2AUW2aGR>SskjOE
zihG9T1TI@oHCp(HQ-K{+TSe>tVijMU1WO7uDCBM^SxiiVY9^Dhlv^RqX+L+JWSnVO
z48{<v{Gp<p^b#ftQC>!)2~o~Pb#-v3idyow7*C88Wfuw+Gy3D|kP68ko>S(9?kMgO
z<shDo=J$haFD<plB&YptRK#U%en8%ZI0CI61?LDiphuZt601OP6nZ8{j4LbD&{~vZ
z1mCC|);Pw}#%b&65AK%D2cwE{iMVbueWq+uYdmSn7p#7agfD6X#QJ1A2DVN@&UVZ<
zcYVJ8VX;APG`EIYKy9y?8X>zL(Tc({c>hymmbw6iFNM1#h#^*Rdf38v*lka;26vwb
z5}a^2qBl&>adDydIBMQ0C<_PzC6N&XD59(l)E=JHWkDUR%*XRGX-)YRipB8!&3=l{
z5cdGCzzOv3#{@WmOB~=6@D$`9CK&M>0yv2>5q1mReK^N}DR9pW3HS!V7}I0~(TE%!
zO)(VTV96a!bBu%1_zuF&<8Fag+E<`UiPS>7SaFpomoUU3=pnvfh(q&GEfpd!B-4N{
zptn4_6R3*>Gxn8io=Zcv%xtoyqcGJ5X`8PwN6EN8NWt(2u~oq#1IQ%MPF96Z4pz-N
ziEU2FIEv^1OH@!>+NfH=FDlwi3XN?Rj&*~HL~x?}yU}9EDw0z;@`s8NQ+PhuKy>D)
zeatloGp9V)6Vz<L1{-yWxdsX5cgbnx4E>9Nx=ouXI$w!DTZRzTAPNH*3c(R<5W_>q
z=~FrfGL5qT){wr;o)XoV)%oK)gn?2X4eqT%GT&da(-emB)p?TWQ*OF4xmnVw6nh7Q
zIg+UM85T0RPSP_I1|6$h4}>~T%Dib&`&CEh6niJPke~fqW(<$8TbK~q7eJGl@@UUx
z+n~;EV{Ym>LuG-Dlwo<En8l)kGs|F$N-)bYql+2(nJJ!bmQTE61MS@`GE){_%^h-W
zbL{GCK^Kj$X1};PxOkW}*~lViXGz9t3lAf&OCF$;O*>=}2GYGox;Z-!LNghT%`f=o
z2yB*mUGjB$Yk2sK*CluT9QPYKHj0r4H)q;=U#q&fu>HWjlAhhFvXyNtjZ!W+y{U6L
zxLM`tT~(!C*k|Z<)exUPdJ2bJqoAE8hQ}ec=nhll52<F%QrUh$(Ibyo<%vk23`OCP
zo36u_+d1^<xj$C<EYjWTrYpo1hY=u^f>J=r^*#gKliffnxzWWP^Ot=7se7y&xP|Qt
z?lYi!vIn>&cTsT<li)u6E;z`+E%}G5T%oR<n9rP|N&pNAFW3d)#jMJIq4&_hi+NW(
z4hve#4Kri2%09}o@Q@U->R4Z3g|D$IWoC3Eo-wh7@9@J8GJg=0K{SSYMRG)7w8z)y
zTSV;1r{k625|wf;kOpz#Zn4m5M6rcwFhPop%QAgqCkIyti-?RXGW{Vj5pjSM=eP_z
z2V#^>B*C-?%g7`hs@diyuMAmtH?zti>`;q{-0fy&m<xw`mN>`GjaJ%8zRU_KKr_Gn
z5q6Tz8#k!hCX=QB{HRT9%Mb>_NN*<32=QLI-nL1MYN~F5Hbj;gO!;2m%5W{Ug*+vi
zqAL_0W=m0J6SI;;f}wqkP9X8)Y}iATwGj=T23w1AO>L9NASGZeI!jYng=I8Y?ga`8
z)o(+!5w0p^KLBS8HOS$?$>gCRGlN@&DDn9$NYP*qhY!d$fG?sC9<+gHLg1q5A4usL
z?VQaKF7q(Mhh2yFH6$Kl9t>{_2>A#{FhPZs70w8NEzTa?l+xRR6BvsC8jwg~rVoFq
zJJCX8^q>8#sSP=0cux<f)`x5r3rIgOk=n4u+gK?R2{+V_dS`^Z<!#Jnc#xh*lXhW%
zgPY}v7;1I{SBY6WLK24F+C&gM2ZOJS_m?Jkpqs#{aRD26QU|GDmg!|82WvM7QHZz!
zpu*IJkyu>=uX`9VLFh0D%Z0f{ttd0hVC4?dy8^9H?KI}W6|i(hEtM2uB{=XFg=~al
z@Jpn}MzROhO4Lb^=V^bSsI9pxYvDtNQAKS`+n`YRKTX;S=mhk@yf9vfJrXrnSTqfV
z<^d75EZ5Vbh)h4q2Q$)SW9*KYvcztVC_}=E#OYb+WQrwA5dWcP=*CN~SiQK&J2H37
zC&)g;d7OMuL!}#cE)?ZPj>aETpZq_3y$e{C_nGdk7>yw@RkJWk4qHgDEEKmWYEIon
zaT!1`u)q^xuC0g$JfzVyhjw2xRU<~1Bn3r+s2L;+lz12qn9=$2U1MpmYGN9|*u?tv
zYsg{JB$FAZ?RU*|cXz(u{rul|fob=?u9^6*_q<k8@B6v$`+5HVI;D|dN=Ml+;kEjS
zEb|g&G~u(Utn#aIIu7`KMgoUOcnhYJdh1KAtxo=EZS6|(rVq;e@pwm!BWM_pM>_yr
zXa;W7<U2<r-gxGe%c__PgN@>?`UaLee&RNq$njL5LqXY$`7(LDxQ@tzXoz?fwBgUq
zo(_+DNRn|R$7ezPJK!s3?1-<pJnqD;q)eblHxd_5*pb{J&Q$63Y}-5O9bh@i$aotY
zoGj&kGw7PQh{sdl7JDpa?0D0>2vUxb5+XJDJiJjoB;qsz%FIABLW<@SuFDGitKC7g
z;yA9;PNFk?d!ZW&xp11)m9BTDh<%8tq{DyGAAwq(nVC3L&ePeFYrdp1IPa4)x506q
zDt#(prXntEz*!zofqanh?b#Uqa5BOOrV=vBhqs$XVnWP|NzE`8_Ui-~)O^A#g&*z_
zeF?%t<Ozv|AeIcJS;^B@HeG&j+?f$3zsw(!aQoaRXAf-+bnMzwmy}c4a-x0<oP5Xe
z`m?3^rlvG!h6`7Z%a7X;$?Ggm<v;SHKgfS}$SlmB)vp$h-4e;pS>5z>>WB%I(dlnL
zDDsk+U3PN!EF%~@o(>MS9e~rwp2QJJN7Hr$rJVF6e$<{UOGxHWZeVlf7BrWii;mc?
zeG5bTzg7Cf-kVG7CT_{U+H`qWTFJpHt+N*A{H{H@q<u$A-tLLF+`H@kyj@dEg2gGz
z@9T}`YcqUg*?pH==CgT=+k0V0Ti(XBio+E@{QmBT5_hEyoj$dx^U>Dao%`DhFUPN1
zFukVk^PakgnsyarwY3&6$-Vcb;2rG;W+t~3huaVD{(tAs8J)hcZq@H3ne>c)cz<%u
z_QIS~>q7_cmx6MdRLAAf>1EFxyk~XW)Q3Jw-g6}D%SHFBy0i3GQy<#j|LOCZmm6~q
zep&br@Be*iH7d!=jpq-3iDvTmrQ5FXY3unL6qICBP<ErBe3<hqs0Q4`S5T4<NnF{z
zY6gzaRUKM$s^W;)N@9D$hwME8NihlK+0y0di&vN##F47%RX_1uqN5=sn1r?j#dSAC
zmPuz>cw|~AISyj*V4(9<RTD-J5tsAM=wWx7C`naAboRogkl8|0FK^95Wa+AM3JSrO
z#z<9ZhodBoM`n7Iq!e}%_*xPRJft{Jlw_1`t}EG{H)lmvRP1E_r@>L93MPi@azYC(
z=5K}1Og2t32TGG9G3K80=iBPSeYKJ2(mt7^sh@C{MdRjHeGpA<{CZH&3k6+wgTvBc
zehXyZ8T6@$HDu!uf!hDGeHQEh8Rq_Bj?Fmf!$G|7{2U*z(1{mfnPN_p**pECYfvHX
zzck3F2u@bP&GGda&oELW(+m9;(m=jqe$fy?*;g@*M5YkdjOQC!BR8-rj^jxqume!s
z`7oN;Ovkh)vxvX+pRtlvOHo43v=xc9c>Li%d_J)f^FzdgV%a_0eH8s58Z3Sx1uGUV
zaS{o*Zfj;4gV8IDNq8~**&cZ=o`zzA4&-XKD2}?ad5$~mSv0N<$qVOle=u8jSxMkl
z_KG|ja-^})ZxP?^X{WFVG?QEk2LA`#UkStl%HG`K*~S{=+V~4jU?!o#i1S%^rn_mD
zmT#y5uysQdV2HjLV?nEuS%Zu-4^GFg;*=H15SFvGi86pSKTE3#3fzhwb<qr-BE4eZ
zC_S>cq;91<EQO27!qSAlIDQfnemt>?ej%T^@U<Z>RT8LOZ?xC2?fToLl*CDIGNoh(
zWKKVjwF$vExCZxT<tv$PPK~sdQdva0mLCY7casb9>g8Kla|~Xi@08;Y0PN>A9kPL3
zkGHKnhKfTN2fp>*;LtcHzDxl*E4zNQzU)tfZCD@hDVEVi12rTitVk`NaB@O&Puv2r
zL{?n~O}vQ^EJFdI`64672^{!4kd+XCuRFtB0BIzOp<*ze&cF`OI8m%Nrg3z@CDH}C
zEMGAo)1rRsuL$rOPw?~??x5j#F1qV(p{$49O6^Yr@E@&ZyB{L)B#Z%J-oJ3y7%@Sl
za8qj%-io_XT2ZRRUO`$A<Yj;k!~18o5;^g08~BXQ9#nibmXfjP3h(dO$5IFlLy|=o
zVt4Y7Jt@10G)sY)i6b(EQf!y$ERL*X;{N<Pys>!wliE6Kx{OYX+dFjPjt|}`K0coW
zZo!2$C>(b5lQ%f8<6j+H;gDzR*llDVp|BXmh-*D@7qnvN1L+UMH<-l2##0IDwVz~)
z?R5M)?JkKTPZ5ZL#3Wf11x8a!;w4eB6)w!KcyI(<<*~TEW8~;m!lfz?u1`4@ZP{^R
z{m7zF(&4=?E=3ew7_L1FV@D>rEr@BeIXb1eM|5OaPG#oiE2C@AV(m<PH9R&kdscM%
z&x3(sJ0jU-y^Wo<aF+&XNm9#B(UK7}pd6p<jm!><ggl585|scFiAH88W=kD;J;&6M
zoYkAOtEx4#w=CiQ(viId5A@P$R1r>CRdTSWwe*vn549)HX%D}aw`=0KdtbUg2da@P
zs?i<IgQMhzTbJM00~fhrb7J_2_QFN73)Ay=)%<ww&I#G!BeQp<Eu8wD#QfbO^4j(n
zhttb{KD&M!;)vvuE8$1?&!2M<f)dwMS5VOn6FE><c>dJXrbiQkAMU&SNw{v+En|-6
zoVscI<L4eNyPuDDmcH?&w2>vhxFz8pJe|{gx^lhleSNZH|L}`B72iJ>dbG6q%8`G#
zJn58zCwwyf!~3*IpTsyiD!w-^VF{F?19Rs}x37)7?Q0_|W!T8vX{qa|SSY5kg*~Uj
zGioAVow_T1$wZHcxbTUEZRO>xAUiv5Rc|KVjC>s>ai@FRy~B^(;r3fVg_KEL5Q`^R
zt<#e@UAqryw>XIsCvXdSHi4eB-gJzb%p;yOlAH`v@l+B7lRRxgE+8oom4rpXsmVbj
z9}CuB-ugywPJ2!?d7qAB`UFqEekN~DMe(|DU4eGiurohAYQg%WVkDD;(c;s+_a)ax
zYT17@Tu~7o6<*8L=XQ^S+GsfZE@mCD;NOJcwL>+8K(;!X@>x^p?)S#rI|3=hsT?j0
zvh4;bM14O1{ZFjR8Bzo6F?9v+;t{1<y#6B-Je<+v)D;*>-Uwiohk>4QN}Rx9S<`n&
zxyDA*xCOWrn7Kg>@vhP%0C#hTyeNxSd2nPUCYab8Zq(b`AtNWQSIP3S-*pbhVj6;s
z#u)gUq2jTa_NP5@L$~N~kyfGbZ$teL(|7hshVmx`EgRtiSA#y`Fe3))ayFgWZ+L1C
zXLd*_^2{PfP?Umo3XAxKqOsU67VZ^s0`hUx;4%J8whp`4#axuVg*EcCkZ5teMaDZ&
zANb+yJ&KG!C~6Dq5D$|b2LSiC4zW9Ml__;azC%LDLwqWIjHOSaafb0uk8#uXq`Bbi
z@U!*nF$&9SFrHi%){DSN;;mAp_b9=#(6kvvS4F3I85dw3z+#4+w4@89BFn5J{1QB}
zWg<#EO}dOt{?(ci)~Ah|WHdlb0?wjkOKm-Q)Qua)=jD~XH+WtF|1GE~+DOtQNgD3E
z8LPwlV(@aSdq*P|(q=+akaUWgkXbf~#Ax6i{~zv=cmgMjGaaRizx0_h$odhiTR|%4
zXJQBc{o2g${`||ABx4i~fiqlo!PmK|kO&RR)A9}8u;7;M5zpMw&a&`E7R>^qLw63&
zFfYeL=()%s_E~i13#Soa4EfE~2m@ZD5lE}xOMmu*D2aNBCUW^@%n;v6LT$kF@huRk
zDt82&`rx-R^$qr3KxD+drkx-U$^}I-1n=b}H}tCC)GOviG!<sR+tBUfB|tE<Bo@gC
z(zhSLaR%Pb5h#x=*cce!+z}<oBpI@y8Lh*5rQjw;E&6p3u?>&YAZs9Xkp4g#nIKX_
z$|UVck9UxOojKBD8^$MMyaSzPFKh#6h)a!u$fd#b*|Xz=_s~!_&?uxUU=U&;PS4;O
zI*gnlkLJwnCUS7~yb5s@+ex4E{wj`21d+sX7F)*j5Kk~EWN((NngiACYeY35C_`y-
z9<g<3dP>5c+84;hFL@ApF|Osr`my{6ns?#+&}ehd!l|`qyK`q9UXfIt64=cj+jDb6
z%YwI!NC|8?Rv*dHpJzTzs!nQoq3pM{olTXQi!wi%BD3ZH{<2{`)T6m4@zcGLAqB0`
z=@%ZnEgQzN<;=H}Yhf4Bm=3ZiLFz~EyaGI%P_r(^sey|`|0S>L=F(pud^`Jc$)Tbn
zd8dAU-_afSm+o3My?xAyy3fOKkk&b;(ymPUUDfE;yi=n~+Lz?~E;zb1e^-3Tp~WY=
z#X&BkhlrV6*wI>Ay=uYX-JgdmUSGA~;KJ6@bC2#X*coguxtz8tG=1m8zd5l2i>A6D
zr|m@LzZ^(jF+F+Uhi?}Z1rM|zzWQ+0`HJle{-0I9tch&wDp~U3Eij~wSB{)M_*bi2
zCVjCv^5m&ok39a2efrJjh|Cy1-Lv}n^S`Ny9Ce?T4EVHyGb>NFOeG{DiGwuB^822b
z(J~dI<t0m#B%e&5^Y%jVkSkN67Vn5!5RUa7nO%n_v8OV+cAUu{$KEy<rX=zy7ubh8
zriUjII5DrLa`)?4FH_{zOjNWa3+dwk+odR1ZkrC}-7R&4OP3`)7(nwdDWtA=R6#P7
zXlqW}sA5QgHix&_-ges?+l+`xwAGdDUNvV<ao**(igR34cDVK~MDx&I-;ptfa%929
zuuoPF)$bk^Xynws*FT*gvJph;$Ujs!Dkqe)5cwlG^^szuDzATRR0UR2F!ku8@Q~TT
zj0Nj=CTlg}oY2EBe<D)CJMX)Ax--a{!CZ@o679;3<QJd*dK&A2ccIHXymiFns*Jg*
zW4|)FLit#ECj?SlQ?h!Y&6V+o(jkttmamb#E-HeSfm|XB!c-DRMaH#Jn>y{n+aORG
z%XwJh#1EJ_0mS5!6|uPOAV`nNDB?QO3xbvjF|M@T-iC86uIluNe#&F{6;D?&_CPvT
zZcl7=DNDBG@Hq&;T57|-7iD@ZiV>PP+$CfO5Q(Z;ZQVKcDyeG8_RS>YKaN4ngvBVA
zp)MlXBePs9kWUO6whu2<Z!PSk2<F4vf5BP;3bz^y0UxRLiIETuk%j~4B2#F|0&y{{
zihQT9SToE@>*}=@9eyb55hCd+c5qCHUg`pzG&b`#5-rrH13p6w7zCqV16ja`i~g9%
zxAejyG}jm``#I7k?&w5?U7H8!2@1`C`EU>|T?Gl@2~5d@;;5y^(?yD!QU|r-NqIwX
z6%nzth~~Vt5<ga_jnNr+h9eLB4(Kdkeqo#plfnA6YTf+e8#I^2&ed^N%e));3jD-|
z1M@vPYyz<!YC%>fsCYS*aj#_#4_2i{J^MvZbe+|nh|=0TNuypi#<<SP4aavQRs7vQ
z|Mrjn)6+o4pKfe<g%vo<^7?Zj1T{9GbC8B*A{}0Y7Vm@!)P%(_E_=R;BLrU7L_p0F
zoz7M9nS~c7P3?*^)dXDxg~hczcXZhFUB87${Xu<XMSS*vI^vubZFt^GzbWIW%njYi
z`FgTZ1=^;GnRrT!XX6;zv9T<k1!4hOb8CpYq=NPgaKpWE=~NRZoW#O-Vdv5C?VY$0
z(=C|KM$BXVlSWdS9h=fVXVN%B#Zn$Fc_NQREQ2p(3D!L?#l0d{z;k7Y97p0wIW7vK
z?`u8}=eH?XLe^w{*Tiic?AtpuHDRXsNgPR5@fiXkb~j=qA|R8=ge;e5;&BY+K#)j$
z3UapO4Pqc-DDzG4;2!d9-k7)C@d|d{y@gmSw;I!W;_*c84Rev)AvuM6mCVSlwM0oz
z1mR<3{4)VrEORTPhp%l&ZP{^h{n$1<l?&&W!O{=!-NOF_R*%bBmQxVeRUe&_S(Ll@
zV%D%o-o#sSmKLN)`B<=lwj6z=27q^Lo7J*|Kbm1G@Q%X7wdqMmtIj`*%~D#0<PjKF
z+nuv|$NI#06Ek+!(QFJM`4|o4jvU!8Mm)CE_ZF-xQNUG-$MkWP*?ApX_O_gEyOezD
z-cxCpSBH<3zk9XvhnJ0mKonX+?F(B<cdefATyH-cDNccyq_l^RKk?Ve3);un@gD{*
zz%xWUqR;hK916EXJBpX&{7akLeFN(_wUcz}9l`d1qa*ay#6Ild$mo|tbNlwT?b;HW
z{oYrbBS+J2E`6h~dEMh(`wHudl>3;UhUGE|&T%yD&V(vuR{P#<JpcNaMGw8-CdXy_
zL-%2wz$A9B`gZBnNuSq54wL_YN$g%-dEPvhHK$gHfE3S+k&N9&GL9M>Nw_P0)$TVd
z7O5}ir;<S0R*y^gpk&RdWetsQmj=m-V7SEZ(}xMGqKlU0FIzYc3et_SG7RH|fJda`
zQVH4A;piVZ(mAY;SjLQLA%s0}K^BU9Ks=;q>_pLsh=({!W>-Js$b)8V6``oAg^skL
zb%a;6j~bQlZNeQgBlXaN-t?)XgT_4yrq*xe3K5xhmj;o1u~Rz8@b=+RcJ540-bw2Y
zgd=($$)c5;V#oZL_Xx|5fn11>^rRhqxUMc&;zzJ;fzK(p<a{(anp_(>^ztYF16zl`
z3cp@({`lOq{NkJg>xiQdKfp!LrF{%N$qAv1Ja=E$1X#;(4*odsX76zh-t*S5S28yj
zMTR|)IJoU;OJQKvSZ>61700@3hA5vZ`k*Z9^O-|DW#k4M#^(>y6yEUrY^03%b9kw<
zS)9OgSs*6f02Rj<l>Cg@F28x2h9dD2N%`vd{oG1u-yQMdv}b@r!XaoFVg+i=Nj1F1
zG7#j8o+!{M=!ZMWsR_S_n9%RwIFIMIR{uj!EO!DETWOMosUcu$HjS`IBeED=l7!PW
z+yxf1HlY6LAPSNPn)Cp}(|p*M@L+}qG)mpH0IYEf#Wq;Gn`RvIhTMxzdPs(m*M+=M
zXXd%^YE`8d<)k=wj?yqRD!Ui+Mq=3#&{*umTCc4g8K5WnVdG@HCST}|mvB8}kqKYs
zkYJ)&X+~5`DdFdny(9$)Jp!JhUSvf(-i!N;hbwK$Uy6%eHxEN`@v`XYxx~~MHR9}c
zYKr|6nvx^Q#9xmaq<5wXya$2VCtnB@1d%U8$6T^?5}b@RDe-nlpGL@`lD_R2<Psi`
zoAGX;OIbu?M%rTGYGrcW$;N0(okwFDjC>l2HY3ewVOVfL^vMX4=kkbyg$9>zp~@!_
z^3;D0`p(xW*a=RoST`>RsFQS{!6OdySuLOi4MK5Ii;>D+@f?U7Optl=lwAc*#T@GW
zUKtFWiN0C_j7oGMgsNs-OO|M8iWX_~f*NLjV8vJy4H|=Skba~`CSkyen2)s|<JiRF
zA8?Ws-OISpe4t!P!q@{gcLe!>Z|IZ=Hef5pr4U%W(1$13ST+<|A;ZVlC}I(h_`bne
z{*hFD%{!e}<8|Et_6nS2nRw!BCN9_EI%+PQHe1AY$=VUqn1Lc<->%>-2m+gJyqfE~
z@hzDfgpj^+&MH2R*}@Nfpq$~g+m4HkaIwgWA|el%mZ8APKmnt5y^#mRjFLC9eL~WJ
zE29jEV;n|8bPX@1Xh<_>mfNk(bs4YoiZ>iw({QdDK_!%3H#m20RodMfigQB<9GwW0
z5;#(uuguS)#Av#7epzlPrTmjA&E2_6^0MQDBNA$&Q%Gf9nOfT!2~Hd*juE|NT1QZ}
z3fB_*U@sO7Cd*BjE+d|PH#@897C6WgNzKGJa?5(_a<X%(sz$7zA5z1N{FW`l@L}8z
z889Coyf`}?CY732gTf)kv0z-z!@XA;PbL52{+F6xJd)GVg}m{^GnqN3l6%KQOE2uZ
z+?{-RyY!Ep54Z0~&pDNNdAmqN-l=4`NqWV*e}Gz~O9;vT+IG$hr>}hX4{LTIb2QlX
zAEt4AI>N>i&&=SerfsW2hj;%H@#8={XB00v`Np1<;&AX_$>qrE8PE3Cr8U()?a3WU
z#8vK0Sg|EEr*H2Pe3Y`1+tYd@)m`5k^Zm{cR!P^Ab%iIcTz?|JVj-%>s@@}W`u^Ui
z#*sN+E-Wj-MOo54E}^j`Kke=KZPlyCV5t!6NLZnMn4Mx8X)_X*RYNC2d&D5NnWHk1
zDYVEQ8P$uI;i0tK5xf><Jz7>CuNxB2hbad?Sh#IZaHL|W&nnrW1V`G`G*TW3Eh}HA
zIc9SSNz^nW7x~Gk9LZkD!<>^g1P@q(+z^Qz@Pf99zR0l)axqF8#{I|$5R4;Jdo60p
zxw#EU6h;Z0uwf=jiFn9BlSK&*9XFFj8VLNLt<R$rHIXM}vOp;YxG0M~`rs=db@M-+
zFjoN(%d}QhpnI%C+1RyyYVfr9O4IT)&TdJ5{nN6VNPfv?f+Qc~)wnIUPiD-^pFFRH
zXE`V-<T2;Uz;q@AGv<GM=3c2IJCQ<ay6(oP;q*Sjm5j>l0y+1Zqwv{=Drd^v81tB1
zd3=Tol8TJHH^MOk&an)uC!6>^zcJ>rQW}O$cayYYP;a1ZAnoNv#U~h|DiOwmevf!m
zFZ*4w=uC{WKr=Mn6+BnU(qIxT0}Vkq>q4;-Tijb@CTiodd=e<kNi~o--tc5)D-%I%
z*+!ee25QIo?*>6}3<Ce;Nt$IAs`13lBe4{!8ajf*nWrH|MNjpgHY4KVDY}>F5>&_9
zV-Al&?GP^z_3_8~*U}Dy%0cQu+1B@DS#)$Pp8c6J5azyUP>UNcMg+q(z7W;K1i~E9
z5!z}e8ssWgamEA+>ZwafjwjJ^f)iuf2skUrg6`xZ=_<39*-8W~wrw+ATyKd6?3-`Y
z(Xk0Aw)PflCQj!^Zs{~{#TZc#dLcO1J9S9r@K4pCTKEC~bn-%;jnOSy#!tZHHlBsO
z<c68BYLb2&MPXPIK*?1%sLhhA7%XTUnzP0_mym}^`i^!QstzKC-|LdvJX`F=jU#~w
zvgte=8wRI-A(=iA*CgY_7b2?`VZn6?rKAs9&;peI-9PXA<L|7sHxQ4ZQGC$irgZ8`
z8*s>di^lLf67iZ&f+I)`Xl;>QA%}#fnj-!zlrgeyUf!=oH+&!lk;hxJjEjoCVj&2)
zi-k&r|MMcVJw1e*vU_r{O5k4Ttw_Yujv-z}VG@`^Mu=9Gs8NV=oA$;xQ0#Rr>l1pB
zPWC`gt_^7R#YM`qMx76wG-3~l5s0!yBjYnr6H+bO0oXh7L865Vs(KWKjAn)?ijfvJ
z><O;LmSz=XkOI?E99gMH5QwEc9Jf$!iyRX1q>Z%CO5)(23We(1et?R>KsZ?@++so>
z<_JFl&)MMYmOW%lF*;xxrhoLgt{CwXae`|DgpKmSp4fqOqD*QbVbbGqJv`H+9$cWN
zmo4sMWliBIs3;OM?%wQQlXQI0fx&shf~)SD&=>B`Dafwfgd{PO7Of~9w+|0SrdV?3
zHd8ZLGfQGdNb&^-@Kj(H*|Rbe&xJ8nP&2ZJgaTWR6ECf&+eJKs5hF5FU=;de(Ie4}
z;0Q#FALK++QXK6tKJm2iiPlUyc1H|{mq^^$L`*bg{rqgw8(1e7+zx^rCuo4_>0SNu
z8U;K$e)apG71h6(Zmi<WhusC=Dy^&9F4iDLV|#vS-Rc?770+SM+*8RS5U>uhiWT?0
zu{&9cN6x7|{j6i!KiEz<h^R=rWDc%>R@z3;ag7e+8u4`nE8o4kW>>*?kVFDk)_nDX
z@r#Ax8YgbsRq#mSHhh+om0xY%7Ru;K&HVWM!4JON9C=sLMc3@UQ`;XZzi2u}^=#3J
z<csg7eLG=A*X&M{F-}IdRWDgrH04OkyIap6?xU4uQrZMG4OEO{2OAeOB-|1I{xow@
zjvcx!ZAR()(<;v&?R;(7!m%Z5CeDFc{9o}eiCP>xQjDSUl`)WvYI!4n)$m&K;VEsS
zN+(F%C>{%gI0u_JjwW#~;b91gP8y6LF)e;|e8;5#HpnP48B;8_VUY{kSXM^n+z(#E
zA*5!|UQ2wmGi@gc4xK@Sv~-1<TM#Q6oo;bSY6U#R=N8I!RLpT!2WmwU#KdVFp0MGa
zs!VB4+wR;tkr&AoZ<{NEs_;6!Eu&1N7$9*F<@hlPjm_{84#QV+LYN?E7=%mf3c41!
z00%q*PsLFWT7J!4LBx3dbnjSB|2J5}r)A4fNpMpheko&fxSaktb`cT@eqt1484gZ{
znJ~{syWAtrK{5UqF5maFb&b(voe%LyWy8#vK)r7I@o6yOl|W;2IiSBz8A|f3imZC$
z@tw`$TPJ2&z&kJ!AOu5~os}3;3S&^yu12=SqzX6&c<pQ)%R@NQ(Vr0!Hu7jr0d;{+
zc!|J5!h<&>M6|@^Q3DqxxVTBLG7ltCh*K0><L=XLN{C&kIUSVX0A>`Rw+DFV6Gl;I
z2av~YWpNl;X~O@&PTDPY<Idl;sT2Hns~XZD;;p{Z!PpPqdhjx#j({*EE!MN48>hz|
z<IC7QHPd8}UNnYQSk01ul1q#zdElx+9gc(G-B{>DD2)$8po1KQHSJ<^taL0z>ng${
zI5JdcD|#WqVnzoNi;H0>d+JRaiL<OK?Y%ai-sA@-j&Nf;t1@b-(i_YO-ggE=@!>XZ
zdc4Ua!O8?u6W)15I*oluxY66Moh-S+n2HOiYHWQ=BxtPWCVf*@3<`G8;A{V)MJ)c=
zOO@EH6E8i2Of?$;LMhi)R(VFXu^-8P2`7`70t9suFX_PTflP3b0<cPqXf_&4Lw^_z
z6lIOl>V$v##dm*xm-L8A;5lFP0GFda-0iCTj?>MPjReG5<7;G*A{v+DCnve22EkDJ
zQZ^}IkZ!y|?g>#&(BHWy9u~`bk@UdO)KZt@>@aVm;gta5MV{ZF;=&lCEemq%R@D5C
za-%LxH*tub?sf8>bqWJq!g_E-PQ3fV8Db#{*ZoRvqt><Cln!;gMQGh<uOyj*M%KRV
z7F<<7Z^UIY9PD@bZMMy<b+qdO5Rba?jjofJ++h@nF9$6Ur*LfHtkD$NAkr8ne7w$s
zeB!q3RG3uH!wJC|$&a0dmLOIk#)IUbgO<4v_)Cb8%aKL5%GRMWZy4|q;~qOc5DV$T
zR7o*b0IO&??`KDIPdq+SBt)FTqampYBWgd`AWpF_{Gq}YfnB%H9<!sSr{uvw9he<6
z6`hEnMTC^X7@87T_+)l`p0h&2i5JdK3PxKZFpAt+QS6cQlwmZbYzaU(^0J2@Ux+*e
zj7g|7B|Nr>s78uzDObe(k-SMBNE7MMJoJkBp`l4FwZBkC<7#nk*~vP>pr!Px)V`Hj
zPZo5?8sZo8uuP0Qumcj2GUUjx>Z7?QYJcB8rm^GqhnKuxFgpD^-{cU__GVv+mX@PT
zoIKI^`}T#emHu!5n}7^d_!Q%x+j7!E2RZrDzK#oHqQyl=z5|6QhC;-9x`b&Qy;n{?
zQ86y9w`*?4@2Bs1c>IOXcMAN?lHSXg^H$9&?Eb~DoDn%~Eya%&FX?z@c2?j1bql|h
z{Mx!XOWq&0U|rDzhbE_uNqBQf_n3vS1wM!*e7=3+1CWF*33o+|F-$qQd({AG!qkY)
zH}ah$lJ--WLgns`ibb#mxWt5n*H>Pb{@~Gv=>zFQ?5wGfjOEG0L>cVz*STVuM;}_)
zULL;}U!$rC79h)_F;u#8TP>Rh`ZtB=mAhLiZZaZ4paO-#*&BAQBM<NhI!DZ^2(M^!
zrpEw@BD$c>qY+AER4GQ$p98gS*|LuFm?Dxm%>SU9Hc}Pnb*4y;E`mn5iw-sH9!Jm=
z10>j%dH%YQ2gOLI5+eoFn^wfsin8eW>jfV0n=7KIMW*vdcDhT<aoKkf^?|LnKH~*l
zj~Fi)C-xwxq+hmpCp_x0WT#O~(9l9C%XMeKTzhUD9D)ze-D4D^NHLG=b0H#*Yjk}V
zqH_A{nWQQEb_Q+>KCMofrN{o&e2g1Nfwiv22!#*+VEcc#4w75da0|w2)<>pw#t0Lw
zLAIy~-~sJz7#Y;#uTA!M8ik@DR(msp!{FXR9gGVj3qdD|4I25iE=(U|wBh13bobxs
z#-<Ng6Ui7G8Zi>YreJrXg4cFSVLS15Lw69kpG_2_XB_*Ybgk?b7vOX;Pa0sw2)MH=
zz?~-}e&R_SawO0UJT=1^F!C0NNRr%Oa)#?-<%MXX@Zz33`X{zZwb2_XS;?<#T^epm
znVb}P6gK)od`*C9W8$$d+_Ho$aRX}7iesZn+&lEU7v6$=AU+y|!X^l~^srd&Lqo`{
zpZ1asPgCnDDGRI-Oa}9N#ChOCES?Od(O@t+F~n793{luZ3`UbgAXx*}UX}wRE-|#F
z2C*hdSZ@pfeuM^LmW8bmXxUUF3(^x{9Q|#!S=J3>P7IB_`eLT+5d9c@xqi2wadn&}
zinI|M-jV8>PxN*qSzr`nZi6*s{P(Lb{>LxZDO};(5iO=Kv}|{f$|5;^MgF)|8y~9m
z15x@@#0@m<BNoM!GN2R#YvedXLksJ0Hccbjh*-*ru$GpbMWPBYfDzCaf}U=7r3eKy
z#`2cVf^oUaS}%X8^YBs3qwztz2Vl3xS890)9gZHj<`j$^=E_S>kkas^dN^cNJn46}
z>eXUd3Kz3Lofx>s6bCpGXiv>A_rvwV4vw*xvXX01g43;H34CXg4?N7zVp#OkhyYOE
zsB`Sg=}pxYE23mWQUQ9o8u3nouzQ(4fmhP5^r&IKXJw#m6t90A7Gg1u3v04?9*P2;
zCTyW6D7`7qg6&*7Ngxttet2n&KNBb#8X{XR#0OIkt{(&=cv0fR;cG80ZQ0R4hC+GG
zOXuToEoKtXG`qu66-z7CNirCUez-NMI*^!mQ8GkGeI)E!k+c!H!jy@e)wkqGwJ-<7
zafj9@Ok!K^yxg*XtDBWm89iEMhRF1vTdD%;Q2Sn34oE>gjjQ+?pYBN<UE7^owsXaJ
zsD&s*WnLZ>V<*9iwBG;Gd*w{UrQ{cne5dNrV<7)i#ug0YM<ru^z$-rdFfP<S<~0)(
zitnfKb<C@%3`=uPjdx_B9<osSQq`BZ6^Ib{Ax0ZgN`EN1V&%K%r`px9j;~(0zqGbw
zp4++Lz>zr!8*9F_owHv(b=#LOqy&CHJyFjt8<*VlJkuS1KYheKg%y#?WjP&Rw={q8
z!uWNCr$rYMqK-Q}V9<|~F$Nwm<<RXM=~(jSlE12+(|H)hVd3$W*H=7?>TnE^p|tIL
zI?HDZ-5j{fJFwP2FasLVU4b+KL2zz`+g={uJ+0zADn;6}flf%o9pjh53YHa-ba=h)
zR(L~WM5ioZ_~_=6w~7}pXsg^!S^`63vo>!Dbb6c7IiV@e+h|~~{0hi`PVhFx3x=am
zFv+yzJV@^Xp12%-*N9q0Ebg!~-L;Cy#egk1o5Hn{_{YToP$HbmQ5S|Wgjb+cOwd!6
zrf>p-D26jUpeXV&JQjc`aZT<8{Uu6rlIb+-V}i*EH+ma>ABun8$DRk`x11zf&J#ZH
zgMjlpjGKsPq(TK6Unly>7_&OZ7iuGalbXDp7qMd&(vUquzN5xddo8xn?UM_~DP9Zo
zr6xmI_I5Wt8%(|Dr<p~Oyg`QjD&_qy71i>4ng-)9{86JX4E0s*dj^8vQeu+D$_Cfr
z;*CJ1%C1j*vND<kSgRkzLKRaRypdtnmf;;i{y=vJiYVo^YBI3*nL>}!1*~-yT0s{k
z(ug98))8y*P>lfvZA)4E7q~^D;2BQ4kfx!Y1H}z^S?8;m+wqDmkON1FtW6&;Jbf)w
zM}e%HQ9)#&XxU%BuR-m2dlzv5VEz(lshB0+34m%^0ccE7t*dAE^j1cP9JCHt<t+Wo
zr?Lo^yR0?t!a8{V;=?wNj36c2is%@kjaKOsKHJa1s>H6Dl?SKmA!HWh9U%U%C3@=S
zSx7jbV#m`F!kSH?_kcuU5BHM`L=Ku%0e57ET4!~LX7Qx2lu+PchY2ct9XCFdrVh$~
zmdBH;0C({3Y=g{@NrdRfV#&&m#j`BKDG@`air9^saR{e4H^*MZACys)Wn(;Iy)#N}
zTFlj3e8znx7Z5$3PCrP(|7!WszD500Eo>N<Z#M{QD?RA9_6<XM!8fME&~w7-8{`9I
z1wplg?)q|~1jaoM6sgc}flf%oAfS0P)|){OEa>Uci~bR#P8jGAKKoLLV*)-S7%J-E
zsD_jhF%eOXK644W9*EE24jTw(KvFb=%h3>;N2u^cJ6y&xMj`-s!LCbW4w$6n%ooR6
zbeaDMyMCP>A$}o^;f?@VN(C&X6mTof9;6#;4u%VI8nHlY;M<}Jh!oiHP_zdNTCzHf
z><%@cj`zuc<OHZi+LIGJ+afHj!B-tTvw~4y{ieoSPzTy(E%Kln6M3+P5h)r3FZFU&
zs~(^5Q7Ewc;F{SzMY)9^3=I@wRdm)ir5?VvB>+XZbSyp({&0`ni*Jv|h}gBK_N#Qf
z2htHxhi{LMpB74~_+$#hDkgrLevfqfpfMOy9OPZ(hKBJ0!9rR?INY;vG`c~N$b+&H
z(`ihN(&s@qA}KndzQ@drU_r{$1vSu(>6c~{ZrRa*_VB@b_4RE#&aAvRvPU_HB_}X4
zXjENOj*nr|L)@#u?cw-;T6rv+_(Hh>^+->A`0&G<zOyRSmJaqmbGEMP%Y0;pHD7J~
z28F0yxaO-3Tp<yHqiMZYj8;5zwzl}nYYF3_8pCoret+=FtEcun^lOBLRnrd~@fZY#
zMnN_^he~a@zU1WVx78*-fAA*<B3qvM$&TQG7mC^synxm)YsZkshP^iI)e+ebE$xC6
zwEsh7dE^dUi?87Z%ev-tVqqj-{0i4%86@G2?K8KVHG%37e`V6uNk=<doEuScsgJY7
z1750LwYy`9q=os$BG!({;?Lq^2hZbDY#$G!XvdIPxUH$p?UzZhYPUPTv9lxp{hW=}
z8P)T_{f<k;;tg#?FzM^)X9cU6k~Jmbq=yOGY(#}<k@Vnu5oib=ZD`_zm@8oxhNBoR
z{LpVu_`M#qWq2Zk(<4g70KE9Z01*P;VSrv?$HfplT4DVkI20lSaD^swD3Bwp>!YpC
zc3R&louzesIt*MZglW-B+C!$2a3I^T$eKNTdxN8rAYx(7(_cTTl!R;$R_;bWkXi9D
znF?!JC75{==7w5F-U*k#YFW*3m>d7Da0F-hJtPnbG=;AhoP+K-=>ki`KiwB4IO7lb
zMdUxNEzRj15E0163K`016I1z{EcNu)<63IM<r{=9HpOAsE14J7^%@(CPOi}n^6>Ns
z22psEB+R5>8JA(eF!=ii<sb1demmEKk2mWyKAwyX+%lZ@lbZd-zvOmG`dI7|Xkn%)
zIs(lTx}Mw78lZ$jNO$*IRn^FmWrH&YgY)Ddt|~KWy`{=5GXFukhSpbM{)EjHwb>n}
z4}h98nft+a^um%opIOi{zdJ{qf*6Opatt1T>(yko2Ao8Q@4t!aaJ(YcsDs8>zlMZ(
z!6<m2hw_iTfE2--cy0%Dz-2!Q$J`?yWuPshz(_ixy%%Z_YZz+Yj#iXYy{<+IH{{E*
z4MoeaVlajjE>P4`>!PsQt$JjEe@&85PiI+g6;m#ZFThL!dc<z|1|7SZ|HWy;O&GD+
zWG*HND<KI>-zR>=c&RAfgo~Dlj0P8;98CYoYnl9(;i7!;l`vujY)YGFnrDRqT80j3
z!%i2o&;jSqs6STJhaI+7UC(<%YXo(t{@30g?fr!u`R>@rtOVAgYp7M`K|QAA7}R3w
z*4H)c4kw&bU4Gih5UnkJ7JQ^Er{}a3#8kOW))Jw?k3Eu?5b*1PCMKvg#8v)g3>3Mw
z+c?g1kIvNP>4W7ckZCAeL?f$52aphKoW?%7LBZt#S^yCVYep3q<2=AY{BaUx;U0lG
z)Wt@eikzs%AFqdS_dR}K)UI+k&k>JrI5J@DM(P6oON2;(r4!0U1w2PYu7p;0v7Dnu
zVX5?&-tZO^F4#m|cu#)9D+x0hn&GB?y4)jT0V6>r5y)CVQ}D<`K|d?dmTv4$gARBz
zE6@+n89e;}9ubQ=xY)wb^m!HBxUyyc@uAS~gX;%BjX*GBLs2LNascelI0ps5jkv?<
z2DROxl^=A%5Xd*+L%<v`8y*}KPE4J?v$k``3n38%sS0B|h%kg}J6{N;n4ZvLsfHqG
zLVVsdu?1b8lC-soIK$!l&kfr_I`ZF^Lm}L!$cU$N>r;~G0{ub8HhM8&2?z=GZN?AC
zFZ3jSwkLRt4y?aaLj;0mjY%Ko1lt;F7xCx%%bU!Kcyr|M4@4>tL?kHmbA{{S^eM$%
zpg2?k?H~b=|Bgo$zJw}tWk^IgdebIohO~&<`vY)+XadTBwz|YEezGI|k>WA0PP8qL
zADo^#OEJsj%hO)Jt*+|Vm&-*TnlA);e{!(vk;E-<f_O27cx{O(M1FXATH9^4;bWIF
zi(j06bN-S$NI()hm~zN*1Be3L;8gyvpaZY11L;3lcwtZ1E_y1`q#3+Ft@6Y${@hnR
zmy^U9EWwbEF3@5cfxL+uIKzb1V`e+fplIX-w{78se7HdagdiE7Kug5tl6M5>t9IXt
z{E&fa(3_dBRtq+zIyf0XMB<y9@(()R=3LF3P^KZK6IiQ-rvt=X1%i|6?KIax;e?o^
zAjv=oJWw5AsDvRtv$M!px}XA*!$9@GyOo<sF*_L549_~xi%9#V0<Q#sez@KyQ5e8;
z*s}@_Y3m21Da+W(3FQLm*Qy2_?ehj&cr<~d&)tXXpyZ?rJRmE`W~k*R%0)~OC%}xL
z8^pWYb7LV3F`D3Dex;YMTyTz{#71|A$htuN*AKr0C;4Mo-Kc(E;^PdxU}FnW2($*d
zA*bKbXl2*}nF?bY55E+Zr(ul3@drR6P~OOhrw%n{2=(a`Py^{OMJHm7sY>2Sl>e$n
zfeHK#=UO;|(NN2u9nO0|wot~wvI~R_bX{y<r^{8SL~W;1AIC>dWA-MhLU%!{lnU0-
zt$I2KF};I@VmG+<OvXq+KC}pn0u5J#Aox6+vw>xAyB)cR#(n0EJ9s72MIYpHlxdU{
z+@YD!BG})q3<KT?(E{e0OJ0y@57ZMIbbdvgGL%Iy2q_NPza<|zY0TXt1mByqY@4mi
zqL~jSD>%1ep5ePfli=k>>$@0)S`gs<4fTme>dWy0seEPsjr4<>z~SW=ML<B+4R|yo
zJI*L;aK;i8mRzK$N8<3b2?YfljaV#&z|DC`@=1=poQq%{^wGYmia-HakH`b5;D<Ci
zak<{6b^4td@F{PUhtn|7fNU`r<wnD{whZl~8kbe-GXv`bk>s&ZbJjbI-?&%<?1AwX
zp#V)Eyu*LRap;cx>7DPs`|vgjZfj&{1@2uNXl+@ZW<G3`MNm~~PJx0B>>Mxz+=K<$
z3LOTwjK(5QQ0Qie3x_u|PK(f_n;v0n!5KOm1t5>8R*zPb4A{-UDngJ3x+E~+0@4Vq
zZ6nr2y3RK!oX8+uA~kOBjk!oCJAlo?f0g{#{GepxfIXr&`l9j+Tu_o;(VY?uN?m*a
z<TkDWoD0M`*X152xY&X1k?zms1s=!1JwPT<;8C7|YzM&qjhXTS2Ivb+^)|@?t3W-S
z&PFit0f8Y_{X5Y?c7o##N<r{qrX0vmxE9k8-k9f_B?v*n4EXogdVFZ0zGTK=Bz}nn
zMNM1IVXGAa{=u}n1~oT{8VLN)5L5`4%$U*=!Cj~(p-`}a{|F%oJG5g9`r8S45(6j!
ztb!&^^aXl2qs`so0!*gT3<;!z&TyiABBqcsEOIV?SwUvUuAfg3sW`Tikiv+BpHC>P
zukYA$CVGw&SaNmw=-Qs9yw7$rG&5L0f9G-I6zB%E^%xI}&=a<7oV9;-Lw?62#aEhw
zV0+8(rw$y+Gzy^P<4+!g0yG;1c>drMWw(rZwWG^8!@UY32;{Tss`?sL?jOBr`(p`s
z1N-+qb${ve&Uj!8kHPMNEU+r$u~KOPK0lbXBVGIeeE|H|dBgVaE3DY`YFfs8xJ6+F
z6r-m2CkLO%A2<F0v}B`gWnM=|h~M)4t{*=V+18a8JRF?x{ZOsTCES5R@T*B1p#~`b
zL=<PL_@B}aEubyJA^%^Z2OFUYcEKIfxgdX8@f48Xlml=3j_LUuun%^l5|plNCr-dA
zhzoaQ=2urwiR|Y85e|}wAj}WVwd?`e6UP&zA)NDh!d7^~G-yMWlL(|Cu<3*YHouW!
zwB}1<kS@;n4T%7`!D$Tt8^rG?4?_GHc^KHT>EwX6aK#)=e8|<1E1gMq!-DljD8xOg
z`WZofRgI@BeC<Y8jVhpnVuBQbMiu?$C?G%(QMCRFQyrudDDSw-<rl>b9M<d7X=Dtp
zn}p!-+lOn7>y%#LG6+-b0Zu|lHksg14ZRqSF63};)>Qb}Iv)I3R}u{1B07f54ABN-
z4ag==o*0)K`5S8+eUj89)ztvDa8W5QwQ}gbyvEuTNJ#T@cSZ8ZT_Ik8!>L^u)GQc5
z>wpviXHW>4ey3=qRyzS<h5Oc*X$nM#Wf`T-8{)GehEeI}To6A1kxdXM!kBG+7@nPA
z-4d*8+l}9USyLA^(aLV)5e8c)m3Nx$oQp}+(QfLL=mLofL)s+uc+|@<aV9>FzQ_bx
zIkNdiK$EBhfjd7M!9GKF^+rgtAkLt8fRPV)0Z#s9Mu+B|m0%!%G#_9nUI#<8Tu>uP
zsy-A$BOM?HoTtKB*##^UTUjK^ur9SKcp--xq6QM<Uo2v1gSW67ReQsRV=IX&5>rrt
zufbg!JC3rU4i5`SNGfq!faX~q9^Z;M;hH!l4|tQas+_LCSIjFNG!4JN8!%-e2j50n
z5n(nii{uFr4Ss@BKwa}BIyM9?n5itp0ONr*O5g;89o?~0`2k!*r#dxV|15b1#Glrs
zo|4c?7Sivym_|IZO5uV<|6lH(zUL-6Z2&dX$3{JqfHnw|04%rwKC9d=weE%n8wv$_
z<M7|2kiZ6ta#D({J`z(2o*5gx(+!NuI+}t}p}Up>xs#LRPiQ)((g|4tX23SwGoW7q
zA^-{TU|+o9fPpgD?vUJV7?p6czBCJ>hmJzHt_Z9In<eFI1S!fBa0z(?zT?0EqjpF<
z`13AJX%7y~ZQ&2~HkceD@xUs1><UE<?6h?=<Wh8LK7(WdHBh>z!5c(2{6vHF0eFKO
z6%{ia5GimH>`HNoGwItzifpE3me)iP%PM-8c85QlsqTgBrRfu@Qrp+?ul6AS0Qbih
zAr92!mF7*Hah8A0Y^$$<W9$$cDEve`V8&VH2b4z)Y&p56d?zRFtX&*T&GfAV!Uo}m
z={3P%)x=;<CBdE(JFWlWLXF~zqn8FS0FLiW%}dSP0_aOzsA+twnVjOQ8fqCuFW^63
zSOLutlUZ~%-#R7voJq%IbowROLS`6&AT=+Wd_wPXjD%Mq3~d)j@9pSD)qnTx$lbv&
z3j)&bhp+DyDJXpRU{Ytabg6K^@ZOH=`Jnp~B{xTY*bAhOdw+0WG+;CVr2r;C8sYuH
zUp}T?w|%kUdieHTiM?Gb-#z#(f(0-EDFu!b-1bGkW&jg-qy$mmw%>3R?(k~bxc7(U
z1Unl$K3Z}TA)vTxZm@6vzA4MQbXwZDULAZba6SBP<J4JsKd^^=zWqK^`stT!xzy*P
z00avhBk%w|W(RzO5p>@m7+jfD-OmVO$X~hpFdl<gz?4Y$w373S>2dJ10Ac(@fW2j9
zd)+9r4``U2LporJ*UC^a$)yhPAY%5x0O+^YNI!t!bxC>=L`4l~h9H9IssAgt#Wwqc
zi@@|id%=xxqW?j<fMDFW2V4~4&vgNV`JOcEf1tDnF~LwH1R4<4FBa%djqjLPAONS=
zA@Fa4)V3+c9EPi<f}%dh9@%K|!&*2*V<#uE-^NQZ-!e&IMoqd*-eXYTtd4Q-Aj*L<
zkIi6phUo{??}q2)J9!qReSZH)2%HD&iEw^{=2F$54g6aWmT?!v<M>=Q`W=XjS?*;C
zCpeCf_HmV^yC*B#(C2XmsT&UX;Q=wG;L8cRRF(*G!hxRh?Js}4E|+%~W0+j|8UqP)
zk(#OHX^Q~a$qxvlzbK`%LddO(91B3^KR|)Bp5Luu0l=ysT5Q0yM}aU}LEUaG4iEs%
zSOB7C4-6$*uAzmQ*)lY+5)kJ-UIO+|PfOP)8>d+a)Z}?un5{!xLhTcUfVQ~{RZqtT
zHI&B2OOS#n6qaj&EOdv%W9}s3$2+)*)3<sAhwGW+pj@JxTWNI0Wi907JHenx^n&1@
zh7~Yg0Sq45fxy9B4eI7;ge$y-PQ^%K?1KP6t3?!T%(ks6D&u0dRF3g#cQkW?ISw`5
zO<=Q;1l~<dLPUgr0mM1{IHem@DW((Ru0tntBO^c%1xyBn6njC{>SF-uA^c|kf*gum
zIF?|@ZW;$y74eJ17vL^P34_uF|A;O;JcL}M?1HlrCQ%idjo@1q`q$tuUt%6Z!b=f`
zLw&XSZ$JBIH$aIMJ1k_tkSG<xS;`b>2!cU!>7tPUa6@D$1+-cYK61ohGHr}L%$sV!
zISzrV)PAs82kD*EdS-42WmapeI02MEHFOH%fGs2@z@Dw={<^=<pv(Fy9KwfOFwp!5
zB@mv}1*j129c3{<5-eY++@BW%fSWLV0pL%y{)^Kx|22+*&IR>IoQ>C4ab`o6*7f41
z){5ZI#~#QR1_{11Ov2Zb-4j*zE2qF77g8iFU@K|B9Nc&)FM2?eLVtn)>Y%)UmIJez
zpV^b@RzORzE(Ed)@&%q$CXxHZ9D=GD^UC8(LHk)6j_^3qz?S{T;!~S1&zJ&-v?@Pu
z%h}RANdW&63M^b(6Pz{+@1QzRzi{n_qTEpSawQLc$%TNuZSN6h*aM^&Et!#FY(b^}
z_T>r~)He<$t#~nC<C>1|WTA}U#9#*8AhDBOBLa!%^2-Z>dy<Hp)|p?P2=nO7j}9Zf
z_)j|%l{bJMm>cj<{P{wN#>lCgY8h+Ylut`U%b8EkC6UefMdt2V3|(kD({`>paJ``P
zsl!VSkG$@o_olnkX61_sv<<0#q&W0Q$+XvpG`t!-WXS&Mfyk=fYJhz-rF%IR0AT-^
zNWzw9vVN%616_wvkY)wGR08lCDlr<Q_Z5K$@CgLwh!2gyPQUn<T(I=Qn7zSGdyNnT
zt`|j~Z+{|x>~(SjfsYE`-Fjk{x7BzetE#hc!~-SMS|<IdD1X^w!|JM2_P^Pm1(@(X
zmj%$sgZ4e4TK+6iXuv{*!J4#{xC8?KG5o3Wz8~Z>FbI6Wx8}u)+f4kgN$Z_X*`HCJ
z-`Pm5|GGi@J85cMFv&lU-G~In0|quFSgXQ-z1q}RgHoZm3lt1s1m6?`EF|#fVgT&}
zN({~gZ~r%KkggS>FXkku#P=p6Sl!R0$G2@xH89UAD>g16#{~v}X;v)t2UV8?!m*i8
z1F&Cl1DpP|K<x`TAr<ZUhhkEJiTpXCnIJwbkE5(MS8?wuc_anGgaY~rl=<pMIP_9R
zqbh$H1=0s39=z=IeKjN)Qp^3HOMt-wk7X--Eg(bny=niNq3zg!e@rQY#+Fa{duzDa
z0e9Xd6T%ZFJcFQ%qF?p`420A-3c{$|$X`$3@87k$i=vCCqX&xAZ;8m!HMaS=adU&`
z^e*;NYO{Drw=mtnk1=#Nm1blOgBsLpx{zh`o~<0VXP(AF+Go~ySG5h`X*45?mR1W$
z4Y{eAZE6BI>83u};^sDm0sq=s9e~kkEc!WIs<-gfgb2#_RK*j<847Cbq~<o5g+MmY
zrZEV2fp&+QvKy|JqP=7JTXUs)24E*^G5jTJC@gr;+79fUl??>0O+Z-4<N#~_gY(oE
z^2~q+Z8NKKG9c*|^_02K`~r0__NZ=Fh0Y66Y3t3I9i_&KAt!~L*(dch#zs5;zT;{s
z{SK7&)`n>HIsAfK*fdC9A0D900m(rLAiBFU3_OoMhjFF};HS`QnI)9w9OGT)u%P0|
zR<Oc<P-$ulqbg&0M>-X8T3sK7J%Ox2`heyH^+UdvX%>w*fVDfg1VK@j)B%efj<?z$
z<H3!{w#iZEKFrIy>v@&?fA`hAzy0iz1O8yyY;_O}0$o96vI7*dGWR9b`(Ta4A5!p8
zdOkRNXFTG4oQnx?iiPmpY837gLE@s3r2X&`yu2XuByq+_A^`to)amTc)1Q*~8Ia(R
z*bQqSXVA0J7AUpiUo8f>43<1JKi>v0!X%{UqlZh7aM1+sl=^seJSwMWRG`tN{`4M^
zrvif!HGtc7d0@CY4g2u)P4b5yY_}!^4pPPQYnUK!Jp`y8J{xck1;UjWh=mY@;FS1`
zKOi7zEF$H2hN^#emU#g5F*3u+h=JXdoz|(Sbbz`S9a*3O@hmvszGfCEoNmCqG*INw
z`{0^E-Jyi^n$+lP(?@Ke_&)qgGJznzv4P`~_<?;#41jvgG`Iu-2q)^FfIOOh4`e|8
ze}R(+1o%6-f9{eQg>Z!B69&_pxMD&^K?*GejXym_lyJEee&qi0MCgOc`^1U2WNgdL
zV~z5RjWP)=4UoBObK`sALY4ebhD`Ya{7({9V1Ll2B6v}O+?Qkp#GQ#=oE>?-E%N-~
z58oX5(PM%4C8?i%{y@4(|4Uyqi5_Sk-1n;I0T@Q31vGvua2-+rlHVTqJvTs<zu6b`
zvz|W?5d+YjA~iA*njb0d%76}#^^-c_74Z*N!3zxcyQUPwAt>VK2Yxa?VG`v(4F+R%
zi>@CBKC<U*J>DlOkT$M+j1+<3*~=$eCOx0|b&Kw{r>n**`hzqNcou%6K|P^>l6O3)
zpTwWjsNJp3r&yonnhPtm-)l6yaT{t-9^9<RAoo<Gp<;ql$6(yA^gVxH37A78pqq7s
zD3HTY1BM_7sqfbmg4m=*gL)Sj{N|=##xK)|q;cF{EeHM>1KnVN1(53(|3(`;3qV(?
zc(<!6{Nf*6RwzKreck}@?zp!)g^&6UnfuSw?C3iA|61_^M5fM;Em<+Dz~&e5^*~(O
z4J%a0Yvdzil0a8e?+uGJqESm=%+|UXxf0j?_CnBKxk6<E46^gxTm)Q%d<*=M^J|+H
zC?60C)Cyme`4EVmfwF<ki<=Cab<A&PRC|I)8va`IBF9C7A4Iz{t{IH$0H(o118}?S
zxx0Mka4pQJ{|rKh$rKy;W>x&Ikr-BoA0p^VadyLL`3{8-*Dz8h9|kZ}>pHuQdU6k0
zUu(?(ew<rhYT1{Y_0!CiWE30G-xZ`s2Y7*z&WZwpb__5ghp2H;)t4yQN%irW<-Wxa
zz!uGBR_egUF%l!3EE9oiKQ~tZ=e`HI{LW0q^{5}f=0?+!*rHehW<{*H7q{>$d7Gfb
zU7bXKhPv7!0S2MRi1f?3cQJvXiX~hP4*DY@K<-WS!7&)v#^fqDq=*99br9-{NnbFT
zK&80&jK)uYLAL|}0nI#c2?Ja5OOuAgBAmyNWeaVM2b!;zPO|pHk^V4A>T|uQHEdc_
zfUEQMtISpjkCZSbLSrCvqhpCcw2QDze{WH6<ojtMsFZPmS<7bWHbWpu9Z(JZ$Vx!a
zoS_0AT({Q9ks8)`jQReKdkl>=EHDAWS~-yfSi$qPOvgWpmTiY~xt@@f&dH#}S5|_b
zicS)}=b+Emg_wx+qovpWbI^2aER^{Ua2MrFwhA@_#eVDozw8f|-PFPWf{_FW(BJXT
z4dM~oLCJ;&R>tBeXp0X(aE}{74zfJy-^W!S;Z@iJ(kKaAdbn4|Cd~!13LFF984tt|
zy4NYLX#7J>JXV*h=r`Quzve6v2YU$y5}25tfn{IM39|QLBF*tG6$nqbA?goALue@T
z;{@kwQ?x;fD&fUn*sDoJLS;`jP#j=@<}XbiiQlM3oPFsTu9oj&F$ln3An!Q?!gH*D
zSPeHtx!28|rLPu%)9t7C#Bu@B1Hy>;Ne1#nN_Xr(HfBeJ+Px(*d)4FjR0FxV`mP%Q
z4}ValeGcRD4-N1+gMZ)X_tN|o2y~vlbN$~K?5cm2`3~6;{v8h>0HC$0_E-l%c)4<Z
zQAGz9U#JPP1oxGx%ZJR;$`Kr4rR|!=_qer#e=2;H`-1<%)xbYRyI8<1hAxg?F*K>Q
z?H7-*Y87Tb)qdjIpt6BmD>d4A_w2-?-1!MFtVrtI8*IU`|9<FpDt)V?Z!dkm?FePP
z)%QcSao?4_!9(*CZu`yFSTP^N^rr@ZyN~kmo+}XiGN1e(Q~*MNM$e5rrM`QZkNX+R
zyB;XEhur3~gXEvN(+$ua+Be>S_LBH7_5CdJR9pO02cMX;_)nLw1e$y5a(-nBeH+k!
zh<KmU`}tn--zb3mdp!G%X3o#`pc@<BihZZtzvUVN4BfqOpF?*IEo!el29A%?-Mgnw
z0FldsHPrWJ@#j;ld+EMBx0y_tZ+n%~i-iJj*pvZJ<}cO|ct{O_j1NH6Z^tOmCZhW{
zGk>PNFYq0DO&TykpLD((rg%fpZ<O^8N(m5X6AO?DZ%IA`eJ9CV%wKZ@Y&-$*ZlOMJ
z05eLwx&Z7j?E)HE1d>shyMad10hVVdu#Z0O=KwX)xzEY+O8PmaUUj~Q+%c=)o3n^f
zzy6V!2#`Zf9dTov8#S2G^$n0r_J$L9%>|wqFjKeZCGR<BFAhU69iP9e)?Is9t=771
z)&X$#>rCG9Evw+2XAn~54qjWS4p8SUS5D9kQJNV5uoWPv7lIQHTpRczkB9KJEMsVo
z73F{<JR5`)+!cC=Qvc48@)vRedSZrcuJ3V&6oMA+!UX@h!ME(Lr&}5#H?NyEuL(l5
zR4~?~Q3BQ<K%g*4;_n`{6AD~cx_$(qY%BJFz!b=~Y#+0Mg;SUXew|G<tyzpF&@a|9
z5ON%-IW<wyV-x1gJ075NS9f!=0TTt}L<rAS=t}sX=O!p3paZOVo!+zpM?rA!S$k7m
zm2F{M4Synl%Ipo&-kC>?<qqCTJ>bfo9<D&@*BB)z2zR7w($oNX>?-HafWRGxlbjep
ziR@}^#0WJWAPDFb><$_c9ChH%+><KYLA0&>Ky=YZ)`c7ktlSV!I?t`lZNHiC6sQ89
zpil(=67qsh@yK%H6wP_*$9A6V9zfL}?ipzdOUZap_AibIr1F`brSIH=xSDRwFQ_lP
z8H*l3{nI~w_mVKOG#KAkjtt+oeM5b@^7s={1;1YA-&4=$WqDTnNX`M_=>h~xHRfnw
z)SrS_(tr@0J4mV*1otQ^kFhRnF5-DZslp`|th<E|f@RJI@1l2Vb%o32+jp)LOW@v=
z_5NHR^W`h`Ob@@^aA&&rOtzO+5T{AZ1m_vZ=<cZ!dtKQqV*xhV2laq=fxako?@E5a
z*A7wr!v_FdW&4Jzco(j_W5BcD!Kcnbr?sO5@Hii{DbVR4U~#8y#{m7o%sTYu0AL{$
zoOL&K0|DSe6!v+l*yG?_Veq-WL>TN#@{qrhH`HE-Q4cd!Oi!M@z#jcQC3|Urs#(w-
zViPI;jVb&K-*Psl$D`E;Df9<5cT=Q0C}&bYO2r3*4c0gE&kL0P=_%y|`(6mGuyXxk
zzPJI_JV(#v^RS8IGPc1Brpj?|%3hpXGlGdk$9A&L6Qc=h8o4sp?TkpT-%;PQaP;z#
z-6qs;{zf4`Kd@=<#9>u|2a3Bgi>v27l>A~mrMv+0W{^@F`6I8-4|Jo`|7HWly{!1p
zH)zlNQdgTh_>KYk4|}VpSIJ+$8+Tu|ePgWn{&C>bHnRCo<UfjBAP~-9EPDWo@cH(8
zgH-g$_M@=ni-#h@w@or+ztU>E%&G4l^GKqh_sZ)s?@|64BXqCo_|DcnuEziMs&Q{F
z-b{3V`K65NOsxCGY&&6oaZH$(7=J5OyW#wVwPR+7Jj|z)ufM(DVSBWAxPW_%75Xar
zzfqTuWdH!nMNapF`^xYOt{Kte;`~+S=9?U^5_>>45B0x4xbNXPAgjkE`@Q@zXa~>l
zgBy4mey6-^wMk&s%kaC5zJqSp^ry8O-0|=zZ-|h&>8kNPJjY@mV9=YKU#zshY3iO_
zFP$CJpP4}N-7_yzVE4GCD3Jve#JAO<KvJvl6PKGHpTq#8jK;P;Rr8su=F{?v*TDsD
zX!Sz~2wsc2%3a{?x$%c~t=r7HmjJFGqjPvZ>M_dxYgH=#f9DJMb-5V(&RX|w0NQd{
z@(#PXdG}kJdnK$B5X_A%KmAV8d~UEy0({>N-*tC2{$r-hqfdUNmH_JRc3A*D`1H}{
z$uqfum;s4FPt#Zbvrf30F+a**r|Kp6!f6Db)q>QGL=oKa;N|+S@4SQGuYAYGYx!Xo
zx{(h->`M7S*6^e0@bpy)3+!GOdN@#jdmjj16j>Ue*vnF3PJZ5oBWoIf(ARVR1@%na
zllKh~Kmbr1pK0*44+v|YrZl&9K~(ry(}5~)CHSm0uPC(Hdw{I@9?<m?XdmmSH;mSh
zASeWlcpviD8MU%hcf@z<@IeFhez=3W>HxnPoF&<x2N`Iqm0n7`J3}Ia4KrfpOr`rR
z7JwG-A*wa>sjbdf0Lg$-3Uj&QZV@OeilvO(0A;-J$<o_d@0xB!H%BO&-$?d@Y<Fk`
zDS967F#-3&{_+vB?7?Gx;F~mGz{wvs!<tO{*FzKwK-HI~!U;DFATV<wPD@ZIx}a&2
zB0HfCoX&Y*xycXGCTb5qQv!Ya$G>~*x3g_Du>^AjbQ8PjE@35Ws%O$|t_G)h4#4ZH
zm8b4QDm8k%0kq*ab+B{o(fDmnfYkCllzPwUhcy(*5Fbp}V9<*CyrJn9n&ZX}W<$bi
zS?x&WTPdSspJlyofn}sm+?r3v!Bd0+I|S`==;Z~Fw9{cgnizoz^Inso1An-$E8Z=@
zcV^~oG7gZ}?OHS29eDd4{K)1q5jM`Zb&+`K(nWWam%BBVtXbbGaNEUOP^WM5j(Hlp
zuha9sau8Y~4R29uH#G=!TQSwmStn-yfwXi9=p{4a_-|>R@Y#>q1FT!D0ncHwcNJ~=
zYgnBi!5Qqn0*@<B3%}fVA-=lwMyLw6ZOVBk#-CWTOjR{5JH2&Qmlv)MPKnP8j-UiL
z7+)sQeH_Q>?B6-IkOdi!?M&nZ?em;@_41>`hkNkp_w(PB%5qxwuZ&g{pT7Ra_v*Ja
z>^Sp@li!~@{9&{ZgzmPI+uQhj>x~<w4W2Szo&C`GM~WMoq@risE%0Syl)o{B+@2H6
zzZLihCtsL-<iRRc^Pf}A8)pB;!)yo8hS_N82jVLw|A%6r?`rT7FpCRAsoBk5=d7g%
z;v2p<21Vbp_;VJ+C?wkdN_XJcmbGIZ2~TMbzZ$yl`4bb&P@jtx-i<@<8|^+mTQmOb
z&c@DG>$G>>bd<;{vXd#tTM^ukSjJBIH!J2h6TsIDAFI6^J6%U!HywHEoHM*n#-Bet
za9WQ|_Hntm*ycjX_vuq-crtrir3L3a?R<_&_7=ATVtEP7^)|nx#*!Z>vvaBy(q3Fn
zK0K#7%bdlL20}dj@gS<_)3f~10EqAJ)*sNjM~Y7Vd9K9w^bF{Qs^fmkox`r8pP7(L
zUp?AEIVi5Bqos~}dc6tk;pN^@hWlM|>bn!^;RGh952({6&D)xf2H2*s!zkLP;=+64
zcTKWNePR9zPaAMGzohg>BUbQUbcOZoVD&kA^g&|D0-i2E%J0#8rx3Ul7s!lcKPEIa
zx!sr1QO(C%b*?I0Xg%D^;d5e@s(1?g89Vk_xepcj_b563t9j1&_vCwo{>$YXECCo2
zXont%4EJkv$U`OAy^jef!t%C<QRwHUQt#Kg9G}?_K>I}w%JR?1o!^ym=RI$|mf2C>
zNM(VrY>j@%_;SemRs4pg5oEt4yW0q4b=L#*nsXeR;ZMoTdPj8rrEr}I(4^%xT?qGI
zdHTR0O~*+xC^a{q(Z(VI^RnOwEX$y^2P9YPWB@o0PH{DLq~;8a_f2&x$OnJeVo5o`
zo6&txgK0DZl1&S2cDK3pTP`=qI~ohYy>?9jJh{c$?-MON-!b$B1>)%JvwT4il7L>o
z^U(9*EM)m9|83YnRTV`ul{~We({3GtS{FU!iRzr2reOolKe$!#X~XzwA%_3R2(XGD
z0wVK(Ux07Jy(sFza_I}w3krz{%xF-U&a?Q3ZX&O@P({C!8*mRiYE$-}Q2@`bxb>cA
z0l?6Y{_4McwnD2tdw^XDxTz{<okUg61mevs2lF)ZPd)OdL2p&%WI<-5GY`n#S$&-z
zS6jvn0%fx#n`h)Kil<<9W_lLIxChf#(3?V?l!3&p9{!9Fvx9}c;H5DDw0D~xC<z?l
z0EJ!?a>fT-xZVtFq<c*5h8hOu82Yn7k&DSo7U%IQtcA^x6LAVYy54#7#Oq>`I30U&
z0C~wZ&r_F9&udv4uHdCOEeD_+o;mOSS&G#4F?jE6Veqn+Cy=AgL>_>=v@|$ld`l$l
z@j<xSF@Of8sh6jzmUf$}wKr8#d=rTrc#Jq)Uh4D_1MKp_<l0cyQ<>^3E1d>A#Q7V6
z9IRejQ<|;RT#5{J?_>ZO^!BXuoYfN~+{<mxbjo^QVR-rIh~YRgz~Ks7>Rmm~Okm{l
zY_rmvX`|DpykZsN<m)liJ6#<<nm>T<vpt2Chwo?h&g~tEMKsrCS3h8>xXS$@;&DRB
zR98|re1DE#TmSjSTQu0wV-L7ezgx3?Y@__o_QVdk4Hf%_zfb`-sww~3FnydFJ%-3u
znp@m%>+vrKfV5y<0A7vjK5ynX%J7d0QQBYd&mK#<eP8?GROEGq;U%@JV&3MqPbv5|
zM`gOh>?B}3T<3b^zfpFFkF`zlWpuz-F*yYDPH%QEDLA`OVDH=L>U>w#Y&ttl@SQ?W
zX7@Vl+vVtZmf#r|+=pk&(8tF03H5zL+#$6x^j0@}NbTw513=w{-+)@v;nf~j<#cox
zjQ1MqM-^yf?-Y(H9B0M4tx)LF@*2J84ck$T?V9Y-%uPL4)oxFBR|A3Q16GWaojYgv
zc&+%%BDY$A7EY9YZa36?Kbz`DV|z?L&oDJ!Q}^6WxYTdAv!Of^xZT|(<lB|=lWTY<
zh2(8lzL$hQ#Q7?qbyg4SEA?>}_tGOlTa5U9xzxsJ=rP+I0->HhT_o|Gy1WNKmsnoD
z$=C0#`>t=tz6eu#tPmHp_XLB#YdrAO>8tt0Tccf5kEVdta@bE>0e{cAZm<3p1;|Bh
z2YzoVRItwE`xzF^TdFq--N{G+(E}h{hNWZyL-uoYFoM}kKWW)FE8t20mh01MwS(8y
z>%pwngjDebZ-yk_9a%cAWhZEZERNak1aGx=GYOc{cHXob4Fq;Wh}G~NOX*ReoJEV)
z48wG+_f}VTTU3u#7*O!7W6e6=WRJ(pdehv!764DxM=3WiI!_ro0MmOBVsTo#he-Xr
zEcx?-XcjLrhg<V?6$==^DQa(5kibHFQXLG)&qU+iqbopGzti}e7`V6Ff^=Z7XN{}M
zR`9^h!{Hu$O)6w&9{|UBopJ-5+#T0Fx01D|1>H|8YdD1TUH4K61WnTHt9WtmjjJk0
zIw+@*cMCB-OJ!|MfLf@6qT9*#c9QOYqiRogLh7YJ;lz9Pfs|c8di-xcD`0Mp&8`7H
zrJ8HB4P9*3<?aR9^M)qjWD|4)OF5;SA$<aGmEb0EYp$PQ9=~~BWY#(=-i8Kbc2)1X
zkplCm)k4rRDt;;CvFuq3QogQ|#EvoF)5k*2Jc%0pWA?^C*kIj(C=Zg++^66>MmB^2
zz!s#tNIVqd)J&XloPOr~f8-2!Pf$<Kb-3+a>UrS6wNv4l$nSFS%Fy*lS06lAH<r@Q
zkU@*E`;Vr>?Ug_al;92;*}DR#(sw>(xZSejh42T%_&3sO-uL6mt8Mw&GOX=ZE4rPE
zP9iNq&1{hdde{7N-0AC4OmWrh`;Xa7JVNa{t`wY2$#H>q-PPsa-pEMJL|@kp_beZh
zQ`vID9P~W`=ZO=zQA9%eFo)$^P5{P~>`^_HjyLpjLU1GN>)Up4B>b!axx90MbriGw
zY){cF4D!uZsw*~+x}MFNLDc9j4xfnhuDZND9Lam?@VK0(RQN`=d~cM4?~{UW+avh4
zn)rL8$ey+AO<U4Es`FKCjI#};*Zd84sDF>0<F4WyHa7ij_}#6s()wkk=RVS&dxD)!
zo_g+T?B|d7y{e!avvLihyRv6)x8hz(xw}pfZDx48<aE32B$p{4H-fY84W8|#T0dEN
zyl+cj(<`TP-&}GRskdE#wg9#<rmK5kt0{L*KHtqLO1QZi+N$L{XlUziYFh@5TdZvk
z({C5|7u?a}#cFDsgB(8)v6mGr^K)yIpaV8-n!c;8V~}o`=o;EhYWFj6-<ZKaVEo;H
zxciMJ_yCif;9G3kjpB3_u8y`@y0K|FuA)D!0lieag6D_Tt>($|fU=L-AihIjzw3=I
zd6Uv%30{&d=BDFV1N|P3Qv*-%bpb*3j#sO+OI0=UyVf<fwsa=!>Is)A!q1FT@-0(V
zH@diw${E&o)*qQeo@bXEx+^#@->w(;cKLXzTmCybciP7sfhBOu9uvfuXXHKxrXpPf
z<TAz;zvmY)Ebn?i;Wv*<0JC7YmD?(q)ym&NWuHHcxBnY;+KuA|u2<eZVtrFtTMOMY
zf!kewT-%*vL#(|9yST_-mqhB}1I6vZnml>v`OC@U{Wp4>?M8;?Dyw9)^TK1VNdri|
zbz81==)Z&w;3@E34|Hdht?*=h{ZK{t{2k%$tXs(3`))gp^Gc{|!cOa@sf_Ef$vNK0
zo1EEJK|38-fq6t<D|Kndw-VLVb&JF^Gmes7OhC1|^l!$|sjyBG)Y0xu1g*dCUTADF
zcumREMX(4?bL$e4a6<;S);AvSI^;E#j<ueh?><p!IM(S?&$<`H-@wXARKXeqOml#n
zL02m`z%PzLV5@qALtzN@e*PV8p3Xmw^r4YIOG*4fdl5UyhVZrQBFK*DP1Q~0pralS
z!LZn19f`uZ-=O+h85S4`O2?x|q?=s9sbuV!(?{B$W3x!mDc@fNjbSQ^$O_)LMC#Rl
zc<(<4Wl(Y3QatfsSzPVru0cRANjCm%TOCXti<8Yi`M=qkme+Io7HZ|w%{EFuBw$m;
zOi9gz+)65TK{mxHcMyPr-3+_a6gv~IiP1MS?0So6I}fAIMKb3z^)5hNG)oG%T|8Pa
zADQ)3+y;Q%)xHg`c6K4SpMuQw@snL<egmyyThvIOr3QLSwG%kA6uxhw^CoIVH;LX=
z*D<&ja+mGFz%TOsa0T1eKh7&qcawO>`>x>&eR7Qri_pIn*FbqavM4lR75!$@LMii>
zrc)RD=Jw7^xA{f}OFB|zN2cY<{q_`cp*apWI*m$k2Guy*+eXv~=Vf?XY|UlfR$F+@
z(ruL3UJX7>vN>~QD8h-V{Zcop_@I;GS#9i~x0Lpspm!=_dOam~u3(=t6hvb_jg!-{
zz16M85p?uS0GqHIxL$ECzziB(ZkuUSac+|?>QobZv!|AGY!<gTwYl-^GY29RuNRug
zu6<N+PZfwr8LeGgzK0D?9jtmfm9}#!=?LgoK+;#!mc03Byfeh-JnAg+mDinIjsSjl
z@NJiZ1Dj(T2<TvQ3~W6d_DXeX=B?M~-!p&*0M>6x2DhjFrFvR^d=U}03qw=eUNEg(
z%%U}cLAIV~9;?S^#I6rTR?SHG_NwgJGqzh{O$DvmTTN$vcNqyc!sRx{R)gqVo?SU{
zO^pGksm^Va3*}cYkGJ+PH*CfXZ8keqWKU<J4VAUmi{@=E^Rj5pyGC($1v!Z752Q6J
zP+^a73*<O(_EPCqIa68R-D@KG|FQJ;!tRF7UNFsbxBWHwTwmINSi38kf%NBPc@u_{
z(XApqLymc!%3>;Cwr)(g{Ta4fvl>lrrjmp7q|g2J`MfUow!YUt9*|8}#EsiOT<_4^
zTQ#^*;(XbUwHlwq@h5{(n`(n0&O4X$RIj=Q+ViVaAxki~b~j77Ww@R>uZ?VnQgB7{
zsnFF<2H3R#$volJP>OQtx>%F}7VjMgk!z~p8`rJeruzQCO|r2S2VL^bs&<bG@G@1d
z1uj-pTh*@eIY&M1Jg&pu(cwPrZ|2lnA$`C?bzp6uChrQv?F;iaq6O|NTQ!n|i+41N
zx%@#vIFW-JFnwphE6@j}q>!YO!Y<|gsd3b7uR$29^aXDJxUwrKS~4?$I65f5=Q9h?
z%Nw>fE;ljnYANyZV27sBs9IfY>G(^5!%3IHC30O1-ce2+WKwA>cb(E!v+6CKCjA~@
z{x3pQy7O)D%$=E<vWfexm1eNAseNUPtJhxoIXKTp0p-;)5^2C=OQ*T)>f57KR!VIG
zNGo`hFWo_S9(kUXe~HDtH|DmU&n!vy8Mhy)=>P=dq}AKpz|!DQiQ;|(S)8sWRmTE}
zIYU{hWV_S5oybk9Tr>9S`R2-@>#3DS3c@47a6@wx`g)FQ5kRu)snIw}|FB!yN9Oi+
zS_W+x5XXH;_jrIywEaNkY{Neu{_$_)`zS1{)`7G2>|wPVA6~)S)5EA}$2OyVtNe9k
zIM7(%(d;C2wW`HYo#KP5LiPsfe^ung$q2N?D(;U2_3CyrIXt10_?%150fm#3Kt#%R
z)zAd(>}m^+b2V2{mJi}T6MD`7Or3^I&3}=xSh$Jf>NVFHU8&xcf>;I3(F085K3&fr
z^W2+pQ`cAycPU#GFQzcmDeVl4mv*mH5y1z+Lv~?Z%b8}}@Qwa;bb5LX_C&jcX@FW)
z^oBysjL~Pb?Fp5_Y<+eGcGS7v`)$^|soAQ!YcJ1;YXX8tY#^<<@`JOKu>Hcgi=bm@
z-)beb2hvQJU%Mf3AYeCW5Dl=6Fiya2hERA(f7#6WVaCg%f(NIlDn|vcClY6-Hi0!2
z&&PKrj->OAJR9uNgz*>XRntrv$>cF%JS+sSEOIb>#V@BRupbD=KSj-IiaA30^Dhf?
z9n>25Ug~qwx2fVd+@1Rk;K`|(mX2Uvoh|V7@!d8i{pvn1Qr>c3wI$F_KJN-`5Z73N
zF2YQgOYNu5Xc=>W-ybaRucaxRt=CMbo@a&sn~UA`w_TkCaxXnFBz&pGFTuN)|D?Gm
zz9_tQOa@8w`p8Sw;guKa1kKEb8CVs22{cM*D}^UvR7YL@e6H7Brg1T*f9Koe7`JIN
z=v^@!^RL7G!{nuJdnGb8c1f&F3~WZ~c8KmRZYMw{&Ne_R|I0PDca_2TU$nB7Sy#}U
zp7p<Qd_cMEjfU|GYq`-(qqiaR{$LsD*)hEKL*?G&7^}d)p`_PzNwR-ZO8RiGecT$(
zb;)ynf-PZ@*IdrNw2yPhvUSajmFHXboojq2W|D)>Zj?(+SIQ%i?EC?lwiSNE_huIt
z`?O35yR}*M^Qhd%Bp-k5zXQ=SQ`6Ng7Wl#?;;6a7ytX>(b1LD)P>P#mH!YC3jt=t$
zR@N7WG6<!8A=^9CYHv4>ZZE%-kljn6i|U|V*Cb08&nkOTeeAkJH|e!0a<~t|I97ni
z=8|X3PgV$B^?ArpHrl2rx))MYH+vBHmm)9(&)m(e33SLR=kM>}wdL#d-3Z0CAe%OV
zz2&b2ED?|OeGX5cJy`t~9q`Tycvy!-4O$w@)}}aHp1-prllAf)g>fri$t>R)IBVF0
zuHIBi_m^8CM~!OMUrntD2tTPQ?;M)vmVU97_vo_XTw?Dam*v<%&pR`lxiHS<<tMt9
zba((w-`;99n{DQe){Ze{8|?339-kJ+lV2^@o=6#WHYn=_(>Ou4wT*!T*R`9u^MLDO
z#mO#BBx&vnaSCncGAG$M;P)`2J&7G7-UidRMhB~0x0IYh^se`;%I4H|_yW6)s_{sK
z<Z~$x2EV!x_j(~ZfMw%g4;)wfyHWwXB2)VU;X-w-X?~56-{tCWy%!a@bmAY*{^y|o
z`Zc90gWmX8S&AJ!8YFCnfC<NG=29JNqvE>K)8mBX6uBei-xyGX*Q`=gJqW0-1>l90
zBO6<|L%d?!9_C3+w;r(AgnHs-n}JbeXO+XG&lF!bx7#MQ(TdL7IJta7ST9mXu{>C7
z&@u*w3z_<q<l^M-8SsO$uBVFt9I#s`Z0|e0Nz1}CV||k)hkFRanJA+bW-MH8jq7np
z-Zmwk*JZvuLt)h!-a<P#DeQDLU6Bs2>2~$870F@hVWq{XiWMBsE8TK758eA1Xr~5m
zzaQ*zwQ4zY+YD=e;+v(%Ra;BrHXL{D-YTneR?jd|TpGGpOM94}J1-ac+qv4{v+Dy>
zwT<LG2xPajC4cKg=F6(OR{hOCv(*+p#k6fZY5{Tt@k$!U_@kWHRNok0HgUDgltAGR
z`8e7|&-xMECdhBh&6_wTe7Dn|o4Qm|BS{-%j<<?B)k^Dz?~Uqo>i3(ErsH(W;1<rZ
zanb>}EMs4)-ujWlWJ|9pA8z2RbH4%3-bG5T$H3VExrl+`w_e6GwN<ba7Vm4_W12jb
zvmZCJD4Lw?>;aYYj{_}D!S|`I4XooEh@_d@o!havtq}=-`2M>>b%_$TElFlsvsEr4
zzV+aFYUe2~%FP;aw%|Q!G%DL=4wW1I>e@AA1G*Bn^BtONk+>LEOKtWl@s^4;c7jFJ
zyj0jX+P}_w{o`)ryYS2!u?INJrbp|l^Ip@K-wEc4+yhSa8n|$lz3y)l!5!ERaKQh}
z!M64>jA=Q;17X=Ta8=ohXzX%UI)@z?qkO9=tg0W$ne-yKg(FadYa-0~0jm1&15Fs=
zG)v7)NCBU}F%af&sfKO%i`nJeLv^7;+OGdbKHR@6fH_UIb_aW?@FhA|)kM3jF%1l6
zY^4R+SfW$aWmLUr{w$bJ!ihp~AtJ>-RyR-xewqtz-CH0#^(#R$b%n_d$EH4>ONwo+
z-S+I0LABFZ2l)eluj*4yG_0iTjd($IYGXnAZwzdyX3ZZjn*XsS(sHx()_*+~5Bwri
zVshkTBd|*)sHAFX%Q%hA9$6;09U0yV_ya{|gagg@yyY9=h?tQ<nr6d&5eyvDkXt@h
zsrPbbg(}%5$9;2{PjPtTR=hXa7y4LbIzz?{xHn!~I~EPrV;zI?rtvp+{*cUYxh9@d
zB+_<<S#85;sGPMTo<HD){Q4RCzEvXIvN5>Vh~jwQ7NT~&>p0YxCR8CF4->jtkWJvI
zrZ<rQroNNqrY@fCLnkop0NTdivuGaq^Q&&+t1X>}iC$}CT4%Fd9KmhiU7<7qb*VYj
z=>yGiTd_q`-<(HIZXOab=ph!wiKXduZBv%!wbAyia@mF5NYx30<9-qfFpAdk7@I@;
z|1<VJz){|Jnx_z;V2m7a8e49U_mEuDcH0(3<A!)~W&+6Vv|198S~#{fYz;^;r6$3J
zW`=ljQ`vwGGH#2EKn;<F*@$+lLD+HPq@7c0_ijBH$q5OymIOYBP<t`XWXH^`uae2s
zU3|0I`#j&@?`?@Bb#+x!Hgv!J_S@~u`}FhY`+Su@H)L*Huzkz~Z_;W60_sCV^6V#s
zr{e_FLz2}0_;!Ks%KzT=)vtfu7RWm(+xEmUk>v)n-d=p~zTAXpt|Q#g%v+fuGfP?m
z%W|H~%gdet@i(&#MSNPiG=w;L!qeuP4}yYU4;`@KW>6m%%|<+Sr#rmVdiK&pp_1Qq
z6ZvD4dn^v80<~UV^r|J)sF*Ry+g7ucaEoE+AT_@zq+B}!uajL89P?M{?}XzN5BHgH
znDTR~UTKUFMZ*QRWpK8m4JZB2pR8~60`}EPih+RQK+tCFD%*PLdzSMSsE&Vev9p)s
zxvk%O5LsKWO%NRTWSmP1whZIrQ}q(O?HRq)K$-|R7z<+-<#r%VJDMfHd1{mLWr)(8
z3bOlM2ett!BTV~@IPVzb%Q)EQ&`$U%FvZ9mdbcsiMX|eLY_D;uO@(zia-uAj4|ubF
zP<Y<Vm=_^%gK0O{9WV7mwzWt8v1GT!xjz4+fFt*wDx<H7*wAO7aL`~g|6&xM_x@g^
z(H^?ve+hO6!85Qs0V8G-+avWmrkF29G3O~rZa(M0wv7B9j~&AXk0T6{@s>8K1^Qw@
zGoTH2JNElmGN6gSaTVX~y%DqboY^_u6TDo<BqHN_#2@^cK2>h(cOMI=cImPAQklh(
z!tUGR*#XMbH3Qa(?(IY1;>F=(@N1E1vfxhN76L!E6+CkKwr00%70aRQ7nXXmD?@ou
zvs>c5qUZCxWuwz&v=(re<6;l}eq78&&n$&@L*8uOtGs-DgVOEkw#B{cqK3<IzmJqH
zWoHY|+Jgd2>ss*`O9y+6eSi$|wj61>vjopR<3nGB)u>&GlR%pX%Zyp+Gef3%8xO(%
zK~Zu8$BgB~l<6+dfCVPC3!BBWLwpaf#)ILmKlfAMVW_mxU9deqb!{X;$(agW>dJX=
z8}3rDtW2Cexqf5{En6g5eQV5Q_Za9=AcKoMe0pZZBf{E#%}krx4KoD?QH0s%;u71S
zu-G>!3)(9FmF_fK{3D?+zXLupS2?I#3oA?p&c+CUN$KX_i#Wd94QX4ioTbTaHH_)n
zI!v)Kqq~fTd)VAA02j9g@!uVV@p84$*|+-m0Wdte+C|J_S5qmSNjm+d9FBFCUk9Yq
zb(KWOhYP3Eoi#aoA#5C|-nh*ad_HSIXJcdt;D?HvW8Q;p-pex3dXww<VS%AdO1+s$
zBl+5I>p-|&YzrOUJXpVQBDeGS)6so98C$m*X92aD-RCTu&bHb2V5y@<dM}2wppNw}
zgvnUnF14G6)SF?O<fg54MV>S~9IO>nw`94WK7*xtiJBqwF4o#BqwdsjU{z8#g*3{j
z?E^XQ7*$a_K+irnZHLLpW@ek6ROOw-x9=cL?no>!ec!?}q`?l@JefRc0^}B8S9F_3
zc$<$y-1ighaAi_!KrMf$U~-I3cqCCy{DLLQRPnORZ;+Kbes$*UTIjPYWVI+8^I}}j
z_CLNir0mph&wlzxC!RyvCJOFmuWvH0ya|h#uh~_vgUwW{(205o<Yd)5a(58Y?gl{f
zUniZ`&x2^qwQ{xPBr6z(^{eTuNCQDK7xN~sg_yh~Wpw;zTx3SOl-+)q-WJK*mTD7e
z=Y&MiG*0b+7k~x&d0V_=aqFP=%!b90y)~!Bdy?Je0I2nZsPZyMzaBUkfp4d-eKFRO
zSouke<j||qoyWh(&%2J!JxfJ+^^eyM@?VjERw>Pm+c5TRJYA@+pOF@WroVJvq8kvM
z8`N_Ax2$7JvKB~_zXoX?^9>r(k*X&R)uT~2bM5)Clx{R?!L~Y6oXZ@f#um_5YF={{
zjVs~E=sRsBzIdc^Fqp``asFDN@JS*3F|lW`Rfcm=qIyScRHF3&^{P~-{V-S0;P#G&
zc*Fu<7r*Y@WTU2z&tAD(5LVW#0o%Njmc?G(A^&CGA)24QL4CgQknhex_NUTW^RMSf
zcD5rKO_;}Q!&+Cox=q3h%v3PUyk>Fhz&$Q=VEC=Sm>a3@+86I>%fH3%hncLnu-;Pf
zFn_*ROy$mPJ(2jE>(K+92dk4xfDPQ^a@w7^zLx`BovoQ0vl1IMI(t7L9amwBve`S-
zW-_N^TmI|wq{s{I*tL!Yn;;zYrMc!4y)4*vM&?^>WuDIlqt-UEHGiV&_gV1Vt4wG1
z0j|=VB3&$t-}3@qernoSv?in_sW)_)9~{m&#oCI?9|=fww;RKf3;f8BY^a)-u!q&X
z&k5C|pW{x?)687|O-TKvb>ku7w|=ZxtC>B<Y2ez5klS#w&1UhK0L{j$`A*y{G+}Ui
zGe5WGOkQ=9I8cW63JBLqC!VnZY4<vQ3ApN0EneXuPD-FFwj~a`Ewa|-^t46Kl8i=)
zlCvD`PX+;Jqr0G;v1UP|Vq=0m;E$=T0GjD$bs%?g$_B2Xr-Dlmn<ekjfV5_N^yr}i
zl-9!K{wM(0s#L^>8N&7owS(GA-H_1+-<^WXogbdUk<O;7;v9;veLIz_?@GPC+R>uR
z=@pDl8Q+EBLf$o2rc2U9mn3uElRTO`G~Hf_G(h`{kzcSimN0YrIlG*VA2xvPofFmE
z)4TT*DaXv7$mOoLcGmC>qPlMb^}%q?$jfp#)Ht7zc%IzAgm{X3_L@&HEmdcJ>%~>-
zYFB}|$;nEA`K_bsVu32UvFPVz56e*26t{(`eVANK6q>8fl8B9wL0Uf@rxIQXbnf6N
z+7iA2Z{wb{!5|pJOYw49ce2?+TqZ+{s4A0H($Z8jtVO50%oDy>Zgp=kepR%+b2%(z
zH^a>emUcvU81bUju2D_J@MOLDabROw{t}jM1MUx^Nm~o6rO@uz@K*ZUF1+pFo+_B+
z$F~T^`u^<lzy8gxIE0b0r<LcxFUN7mCZ$Ug`dY$QDUg--qA{%~-!xm%qWA>Ycujj`
zIgv3orlC!XAX{8I5n<w4@#jYPDo?UUE$Bj#nyv8nC@S)+wHUWspuPYv$JSCsrvKHr
zQu1iu#sflfvza?K@*|F3GG1H(kHt;46gZ}IZs|i;Q%Y`CavIuCL-dLf@-E3lmh4<o
zx*P~=lLkz+=T4iD%4biAj+(MO_U+p-U<2tHjJ4pk%www@(~y*GW5Y~^xX_?oh)Xte
zxsgl_WC~k1)*CQ;;%ksy5%+m77un)@Oj{eIl2Yxqli?+w_xnhU11A7i8PUFuTm;*u
zu&6Avo>Q0oIv*D{o8Nmvo6BIYswJ}$GaTh=%V_(k*C<O#7^da|dm04E)?jKd%zEIS
zT2F89c%|JT*Rm^-J!3SR0CS1ZdsKZQ`F5!4<es)`52Ul3@Nloxsk0P<DJG0btRu{8
z#tHsil=cR2%lh9%=>US!u73x}8>R!TS!}m0ls^S98tpYbx}z<0JpfTD%e)%(8RY$F
z56vjXaUsonTh^1>R=-KXpjctAckcVEvCwo%P@Lr~@1?(R+XLx;#>)=9@CwZ*pBF|J
z$!tj}HfX(!RoY+BfD_P4@H#zWa`oM?V$slE^LooUYz;GawgR}`_GN6DmzkG4Z$!#7
zVViq$QZj45$V=lqdsVsISF%PyuRla-=RkDc+>|>sIWN35lK8g)9>Z>%gZ?q6YHMt|
zZS5amw{yJI;@WP`$x2KNG9kY*mC<FDyvB4TZp9w*8oI>=qea=mAYD^1ekF<5Ww%sk
z{%R1olEhqR8Ei_)Hs8}~%gk#sR$Pj~G84$fz}~O;H2`)~25LdAC3$sx@{asEH;z3(
zm|NO18hG<(&3T=WXsf~HnH6};GNbj3koAJwgXRXaEce}JI5#{sve`AGD29~|!#_c8
zwU^agz|Pf6nQA^$H|!E)rbUwq1Ca)3Dg*m1o|S*$QKhF3m?i5nW2FNw=nV(v;DhpS
z)mH|u{3vA;)({Tj-zKt4f@T^@7ml&ads!qbkdU`)c<T&x=UF+&)}wkJ7LF9XA-j5^
zIJSe}0daVQ#bI|z5aFXQCa6g-BQR;8iX8WDJDdTon+NztH%GsA&0zUsnzhb9zwe4}
z$pfu(s<r=Fl6YgY;=_pP`QzED^@i?1G9PdBDYj<ES{LE?#{7iR%rCUMQ{860qfO&<
zqqtU1@=`)88%-wW<;>R+d{&!dvfi-UG*?B@*TA%frbSg51hcAk@nGBE;z;Ek6h#{R
z%2U25e%oPExUgNA>!R9>Nx2?S6}Nz;_th%utxmB4YFqM0)nYEu*$r+h?!}5VuoP?#
zmEo7u4Lajlm$*?)GHz{|I@q|gx*il8$l~HR{;M%i>)wxY|D)o*S8MXwZSA#)#d1_d
zFMTUmUyId`Qmm<3Fj3Rs>Dt&vFiat*QnwOVK{xoQd|+Yj@qzYL)Palt@~;xOOFC@v
zy@#G;g~l{<(7f5kS66|zDh{!5G(ekjxh-uSeYeoY<_&4jeZpuNy1s{W3(LM=vmGA^
zP<R!;!GLn@Dc=)X+VyC|dyvYjN=!{iH0DpKs1eQYiET<Ee!=FJOejV(HYHh&A%?Vu
ze1^2bQ#@UJ6&!U8rJ0lJ`4o9+V#-3<KuES{z{RRlHxgMQ(NJVw6x4|ARPvhcFtJ-{
z(!rP$N;b|gk7@+UiogNHpgW95kd7VoRsO2s4e?^7v`Q=hIj8Akl;!FW3&B#=p?*j(
zy!$&t75sdFx~d8Mjy38Z0cPneSvS!Cv<zQ--&{JKoy<MEbWb6aADgpy^9O~j;+SCW
z(-6Oh_8PhUeN6oS0h_;b2r6$`Eq(|jS0)+?>vd!U>^HwT2ghY_47^`WEg8+N4hXir
z!QTRsCF7|l30ir~ePtfowRf6xe1TSn%iodqoJrjM*lYhCA+=-E_&SK?JfXP!$AMXC
zvp&&Wv-K61u(|`(U30_eQdh(8m4yIhvVhADZ`q)AJlGX{npf+Fm|fMk1Zu1Lc7&4*
zm&e*b9+s^8`z>KM+hn5fY!dl(PDn03417U3%MBwseV`ft4yw*MxL^yM(doy1`XvCs
zx{VuwLd>>Iz0WlrI9$Z^<)?>ANf4wj7-%shY&^A`$wDAb_w==qR<5<BU^YQq=DM8Y
z(V%^7V)jn+n!_p%^Bye@uO+roY*&D|yr)H_fZ@(CLqcM<?w#<FNh<*tLDX4ht=~1C
z%v|k>IDmfY&SU~HRlgDHp|_wLAB6;#{Mb66sfg13jL^{xT_Q|4yHGr!5HA$`zb<Y0
z$F@iG2`vG^%KZ>~7L=Af%jHNdmLb~>{6bJobC!uaxrWTwh9D=U{BvD)uc_dUzOq+T
zqAur9+bMo+?s|+W(O}qXPB=a)B6_+#b9MDv!#j935-{Wzm^P4v>1s4epFv_W0AI_`
z2twjFBQd98)2;0ZVJ34?*@_g^P|k(^ASP+qzTyXs{ze>}KeeEQa9E|(bt{)ej%?$3
z_%N)Pd$D5KeF<E3xUZM5^`l|+gU_+Zs#w`EvJHlfI9#C|R({Y)xmq})5hQOJGlGN^
ztArLSH(-^@U+tu$ECX4F%nAvEsCGR9_D)Yi)n)!{niQFzPxkcJwsH)b9*p$N2)4zc
zebuLGLUDR+^a(W@{)>|AN1gl@u@0iu1JiC!$y>M3^+wBmY5W?sdf&IxzYqh~NY_3p
z%|*0*d6;@xIPciSRe$`aD(m=9;~)Rk{|0MC;T^Qa6!6SF`P|Zo996jPa&pw*?JA{~
zrioiU2L%lsG!xcM922Nsu9>E5`%$8yt(y^k`St-=lQwLcmj`)9rz~{`9Upxy$<30P
z;hi-cKMHT{CI;=xMPSq#yi%muFV#@$Sr;+0Ke<^4N>OI68A2>$nvtU?SLL&U*7`ff
zC#rhA(tAw&^aNlvh)IhqF)!DQJiIA>jDI?Ut3hEkdB7n}PIkFyxT^DTh0pLrl2U5Z
zCV%Bn^oDt*`88jFGW=Kgiu=nsn=C@*<z)!48MztcWD#y@$W{91rqSugnK#Zq<AB&r
zDgBf^TBNDA^Y&g`R)fe~cStx|Ep|(kN``J+|734Aqe|qd;IfDKE?~T0l7OuJTnNZN
z7%jvxd$${|?);G_n{Zj9uF?B@vo2=k;!CHO4(Wlx&Sz7{cb8MqA#;A`L8B+Lb15r_
zi1wm$xipdEi+Lv>&t<eqpSh*va$Es?8ptd9Tt;E>TWIsBY1){>K(1V3dAN@7La4=5
zw}{L-Lak?rRGs5TgmZwC0dP0G=3QR#-30b=GpL-h(6r$BE)?tN{aeqY57!otY&P%(
zW-VVOEx72&?Z^(;+dFO#w)bmAE#Fj|h(PoQl6u`AFB)~VJ=sqGb<aB%I~RyTKt2=*
z$Yl^!s;ev@lS=X@n0wV9Ok9=I%ku={V!4IeVp=;wv&NzWPt^gcxGNhmoI>0r;KoX|
z%NIcMtHHfyjszd3G<)tf#&=<_12fW(%lL^_objgXStmJv14620TUw(b5BCl)=o*sR
zvg_g+7}n2SB#J|hXlJ*jna34X*0|Fzfm){$&#c%=ILj(WTpIezg*e$`#iLVCY}+Yl
zJUT3`nKKvLe@q7=<oEV4SPxzG8@qEK#)k6>F@rh%FDB|abs^pPfz1<3*LC)&MUm9r
z!Q<fs$eIUw9cmjV-CM=`SOd3qbSiMY4;GB7d!9ck5Peu(p($gAhYFIT!Pm$FF+-s|
zcTX=i6PaS-S%n`1>g)s-=WXn;`fiA$p=ttqmHVs<RfE`*`pNJyfD_`(DKTnqUr^$1
z*~vt5OJV^bYddS^rO^9Uj-s#?*CT39OEUmp4<vJ|j%^fn<{hVIW#~b$o8K04lKXg1
zu)br<&(<r><zd&xqL$$-hqhH+8vuySR~{a%ns!dQ6-VJV!+9eMA{STl9WIvo3iOV2
zZEUO{1oO1>aW@O8tWhMOpl$+LTSa{HB_63!Uu0dAe;I6M#TK0#Uir29u@Nx&>NHzO
zR6nM@9hSI;liK!9zW`L7*_4gB!6(fHyPYFainVHl3nU1}4765;GmgaX1g9TY8o-*X
z3|K4fMKF4KsUxvq`^84asBMV&?*Bd3lBoIC^@acP3h>uLx>+#!{GpWGR2jCe_PTv>
zV`%AnSwWeQOryQYP5jmEwxWGY5;OlJp`<f1W+TWb#RVC-l^SdUm0js2DBVbjNEdw_
zep`hNHwi-Fth`qXrtAXj-2zqAT`|h3t$eF7bf6ORz$SplfZ=Q4f2EdrZxTO+q`ok=
zM>{5-TtK|nLdeZ>UyJWAjlyXGLZ|r}5Xy$lp7`3|2CsB!sN)*im7HswHZ`|}Qa-L#
zUnc4;?!2;EmM5ImG~(LPX&1CwzX1MdK-`Y{tEr%hX&SIyhIuip(i2!s_c}MWTA)r@
zN3&`(W!+-vs(#Co#<XTvX{yLrEAzunWmd2m!ut$!Mv6)O)G5d32B%Su&*!t%Y`5Z<
z#N@Yc6}@E%28*bXjv>AuPuZC8${bTh9f_XWLu{(5M<`AhM_qdjk2WQp6}()f5!$;C
zMhb|j4oHQG4|I;_(T_`?DFbRMx>)I>Kic3PDO<K>SGVlP<~jSOlwR!9Rvs)}Zt4kv
zrGxT<f9+nKS9qELxqsOrS$DU*T+JPGl8!c_R`x)CUfRi-v8cuCpZ}lcu+q!N<Clci
zmv1r2xp}0x!6l{4uH_^nMVRgSTzXyWUlm6>QoGtdVR~@ff=^{?>wvaKoz$ftyxUog
z6RCX_^k}(dPyvT6dbKy1VT#B_m*sx`4jDyn)-Z4Y#703~ve=wjJk#jUQBYekT1}eX
zMYrZ!;Y=_jWFqR^i0zHwIY0p<*9C9&W@x!j%R{C_-m)Vrv3l(gjB_rHY(}f3X3paa
zuMc!y46@4htW{sT_%j67b6$a!o~7*LP0p85nTPAUTG8g9TF?iITDJKS?YEYbiK0B=
z?A=|Yq*iEfmpzr1l0uAzt%g$?@QF_yF-sBESuvtRoGMlvAten@3@6s}c5by4YN~_B
z*ARroa3?t*XVGp75!?t^cR=x_XST#;Y-+E?B>=XF>?~j{9q2sl2aH5-Ybe%aXjbi+
zxSUSQMXptXi9SLj#jTuerrX*)To_qyrmNXVcfMv(WO^{sRJG)?`x}O63Jim60;-K7
z&|e~O-6KLG7>1put)9y!oT~Zp@UA>t$;DwQ&-{Ks6Q)8DB!!nAWmX8v*mJ9>Zo7P8
zIQDy1$yKM8ZC!Yexvm|3&+*mK4&nk)&{^IQdD{l44VS0!m%X>!2ggNO7AdV5Mw7Jf
zfUAd|qcFF2LXiR3jUNK7M^C<y67Y&hC)Vh##Jn}Q^wa__r(_!TKbFhAiFk1wKO(Lf
z+K%x7_t`+PiY}9t>dscnG^0k^aj6n+*K{rUwqv^+>S2mWjbTvV?~kgmGCDVs{I(KG
z@LcVha9cT;Z_<qMDh)PsxM{k*rZkHiTfL^HeKq(5nlj#`fg#(EMV5-NlU~uaNv1EY
zor*(4zfqn6WUS$bnV(W)rn7u?S+9KTTQi{Eqrd*=|NN^_!n!1VE3b7sG-cL?K8|Rj
z#s+H$`LfF5CWPWXoAyD!rI-UT81h(8zIZ|@CiMAN?>&eIFlbD4g6SRS)h-dZy3rku
zJ=hmhl1Y3OnYe2+QZwJZ_Btqfwb(sdI)L<?$w-#o7kzi!yjTt20%?wl?jw_QFY&k3
zJx@yNmEW3uw5;D^q5`cyGpM{7^zzjio|9%%X15xiwx~)HBI=D;=f?KGQ7yI#UYRBg
zs0JRaj8?z#QQ;}VPdfl<h^g<GhRur7`k`Ji(g0(D)J1kaqqDr<z3cyWv1g(T3W2m>
z>^XWW?Vpl?!+5n~wcq(-FCUK7vgBXRPg~YhmHji6qYg_EX0={IYk8tR6u!5CXtS%>
zKo3sSQQakM4M)aS4uu_jE_<ggD|PtDD<1IHAIg&|HnbF~F+}6>^`fAWsM63JR?3h4
z16X+qmWzc8-pxDIkhj?oQBy`@r|S)*g|qXRtiww8jG3fC(5jg$v<Eoiq~(?KlYV5W
zThXR$N3+<qa>ncE&`8A7*&(##oKjn0rp2s=9((Pa#)^m5K~^*TNNDRc(mEd20lPO8
zF0a9DZGLAYaTCoLnQtQfhC$7{0arss01`bI1e(V=0{{hJ3j)wtVcA?GWv~;X|AxXz
zYms&*rNH9zF2wBY*nkuoz6zC{E?jLqvz&>tLTGs0Iw$dNB~}C({DCLOCMyRCqjKWO
z#Ngma80EjuAnalmyDYJ_Rg?1>$+*1^Uk=S~^=4{jWs>~x;4H6^{hF}}9y>k|oTV5C
zz*r3kJhCk_z~CzkM?}{^mL!yZC;Xb{jH-SGZP=J6EL;#do7B?COu#{D)etTH06vRp
zyE!^Fn9YNu#D{^0sbO_Iqw&5B1GHIL1X)znR8Q;fTCzvgYke|l_`~>&0L-S0!nOwz
zP4>aiu_hrK#Ps%XPg`y1pPI8`wopu0eI<zcP^MxX|GwW9T(}wzN8na81C81pfk|p`
z+|f5MItxsxsZwgR7D~8`vMIid)Z%n4+YK%<X;hRrYaCdcE^JH)nn#8zeeEc}dF{Dv
zsm&a#lrl+Uz9=S-RwR3kbYi{Yh(Wn6Z8a&vN@iGu8Q+vJ6oI7TLQ4_z>Xgxc)>%!A
z&N}#Fku{gLLJF`88r!TBRP{@dJRgbx*W?;IrNUDXPkmCQofqZ5&id+MjU|~G{hIo+
zrx_UDM;;jp3x-CoR`Ecpsv)A(6tCiU1`k9`H#Y7oWUqkKHqiP7{@Nr{BP$g0#|JtW
z5OcB&GxZ*o+UsziW1sigLg}uJ4-$OxTB}+v0_~W*5!1IKnDAb2xvrOfjMR%Tn*(!2
zNB7&_O=8JR6x-Obo7l~jn094tW*}HQC0a`>rhU9w>#Ib4&5U)+r=YyPi&|-C4HozO
z#I`m3+3d5wX%P>VMT)TcFpC#7fyyXU2jmosb27r$$aB|@Tk46%r{v}ZNUi`T{FAoI
z_h`RTWrf>!sL5G;ScY<1fZV0;ZG=xE<W|6bv*4wbQwx6gMQ?rAVB0#Xm2?8V+oQ}7
zsctHxzA2Kwq==&1fDNeU!xV;k77A?1P95uGp#g(5P)o}!0h(55(cw61XWv27ZR_E%
zYv5(TWg{dLAy_)EPY{b~7S>t1$?Z}6QvtC{47<#dkNp}S4TT;2A^}V2UCapuc@lyL
zr!8k}byYs7)U;hB)6vUn-WEiy%vQTsyz<ip4j66aVzo6-5+Y-cHf8-()JM(ls#1?t
zSL%mKH?JFd;wE0ywl8N@(UO&82hEN}@@3R^f&AFp+BKW=cyiHLDEHpuYX?C{VMn*)
zifwtHOA?gYxD13a;i;)OYua&D=5oYQZE*H6<Wy#O8jQ5wQp)?eRy)L`-I?+utpQ23
z9F*+TcLHJ9Q_&%3!75k;s!D=&>=jh)b`MBYhG%-~)I?fGO@}@&VEhNqH_1AUjnJsI
zba$kn2_K6(?HYcsrH#1o*0%(|`Jr{KU%|}nNb@+MX5JJCJ$E7%4L3Z{o>+By@5+Yp
zfx6*cO|3h&9yV&KY_Olck>zR7=Y-ubQJ#4A%W_YFAwLk~(!Pkr^B*+F^b#N!D7e6>
z!&n|%5)jY8Fg1bmo44KIeTsO619?{=rMY+XSbBqV>NYNj90s9Z&u`n-5i>IX5qygu
z@V!w&I^(?6glzA5^%1v*Nu5-|MT|Vb4g_d&I-K`R5k@O&341)y8C|=<DjJOgZ;t+A
zB%>D^y7K-4LZRzhef<LAIG9>pdwQhxk<k62{%;WD?JKT7A$Qhe<<HZPtaNQr^ZZvx
z>jm*r8ICZ_e#}bA#7oXjsLTSqdJ6}Z{wN8_M+KQM&H>)mrF`FSZq0zTR!9l8>^u{<
zp;~U|PmuFja++ycMT>zOSZz4t24OhA;KQwL8qm}%fN;&GcPyW4j8Z%`vCt)YV^=dm
z0tKhQ%eVT5C8w?i+ij}WB0<64=DQdv;!Bqo*(kuJzCS-)jq(fI<8V`J<=sN-=$<Aa
zb)IOJ<B{xf?Cu_9b_Q0A8r&X}plgj+bX)Ap<pNI1`ic(qR7!4M9RY-$8VgbC2+$LY
z6k&LR1C;)ymtzCmHpSOW6{fn0fl6I<1=M2Wc~~RKVpmq#b0@kXHPj-T@LA4W|KPqH
zKLGZ#a?exJh~VC%r^bh4E}_i%)dFIUtS(KY7k$|0o<P8t2osfLbZQWmJyQ#9WrFor
zHwi1Lt+whXo>kGZjmF?#Rw}})h6xf(7B0R`8DP~ps(jhgNNuukbGz1nDZM$t0w=cs
zlF$)E6s_6jWI^wxDw{^gwE`=xcP2(<%(UkxAM}At_kOhNzy2nnZGYLWjrF!h3H|l$
z=tejtjwH;`W^{yfV~|O{?CfH5N-NQB)$+((j(~B=CLp&DJy=6FCe~&$7USiwwg`bh
z5><~@wD_a}GQnU}-mF5s(T)5!0DdWP8tR5E8l7|CX!2{Dv`=B@Jx@X#Q*8s<B<KT3
ze#c;XVnM-Ur=^DYN1)B#xqyJ~ydGtjQc|abKn&~zq1@9rt@1GWhYU-~l!HaYDFfvo
z*{kM8P_;bLDv7qtCruRA>OwacD+kmdkvDPGPbSsMN)<YaYO2T)0e1I3_87TvFcYl`
z^Zt}iEE?%h*=LZVnFqnju(aI>pbrT>`phO?kfU?i<l1gt5LFU*AL{Jsr5AGt9ngIt
zKt3}*(^+YvSeWRzuR%mXBnMFt&vijk*AdSE8d+fQf*7E3OF`sl*^P&o()#Au0~&Z8
zIgj%?t<aEwE?}H+!sA~ECT#+cbc_>W^}Ly$EARUW(rXzCVZ3&&!f~-ii}d~^cFsiE
zkyDp+WI<vreUwTW@kEISVmvVh6n-sqy>~2h*wM^`&H0{#fal)kv-<bUOuV&|<P3Ck
ziK4!Rtpm~iaR-Wjy)@(K;7ECRH7=-oIic_^e}eAG%OoD`kT9dsk~YsfmFPK=aU-9Z
zmmhwv46gGASA(`hW0*Tl7QSp;)XEy?<D==aNU+sz4H5{nE@>k*B9M-Bs`QwNnd&%C
zPFes7QYE2wwk884W;_sbiOIPHk#{fo1iM}pOGMF)XI~aeH2_y`cP{PY*rc%V3cn&W
zcRFb!F>zXvi1XOHuCctWqnwiu%m9M9z(eIsTrKx-`Ip^;Y&h(<u~lEV{EI;&fJ>M~
zg?K(u8)E(@*AFfhCLaNYxV;;b<qR{H@)1}g=i2EfW5u-torgga#yWAS;iQAJXC`At
zZZGn%6*CoM1%OTxs?Za8cc%Nr3=%4=P51T^s6$Ri!>IbJ+fE?JL`Zd!AOooGlgSK^
z#z03&xi+|RxDdZC_p+H#Q`ovE;{DGL7)P8kM^SGH#*%MRc6swW`&95+0cu$`2tu8Z
zPV5R8xvtUdc9TSVjMOgUj4y?z;#r1WM^_6}^``tyK_H%a0}s@6(|Y}&skstOz7!%|
zq-oZtZZ!zj5Nx{rcBOPdWl*$r&e?pIaULC&T75hJN+{M$BNYNMDz0(P%J*YRaT%dx
zOxRFzfz9Eb?qhtjuX!VN{~kE?JiiJmL`-Ao$>`ATf;Uc0r+QEK@el>k%#sM1Bk|$<
zunn?;c3+S0i~fZ?NyT#uwM3ItvBbhA^%*B_!}JUiOQz(ic`@Q9YDO1p&9SV}`-u}}
zBR5xNI8mkVZ!G<IW=0t(6)?M&ip6&z=Q>@t;Bvz|tvwRF{fmct^ZWnRPt;KSXEXoT
zr!U-0bAy#4LLniPvKB|vntlmn*8NPUQhF>}N&JWK5RD9a-d<#=XZ;O4ckS5udPZA-
zJ8B$aIH=NGZG<Hz5_%v+1C%9kX-D*PFC=dP#XxIK)Jtm>gG?aYE)Kcz(PM9IhY)YQ
z3fKr4-P7iE=1v6oXGgk_t!0LeHSR0rIz%gTK7`9D`BSoYK3pp4<5{8<P$4B$5z1y6
zprHK0@ka%NbPk(1m2&HXLPUI?7u=e3D>>Nk(wdJqDU%zY8;Ut9FO&~qK*({uDaK59
z!wsEh>DlKAW1{G?q=>9K8SB#kR$_0^gWR8uyfS=~gj(LRu#N?RB!Gu)WTp`NOlnVI
zY~`{UNvj$RF^Tm$&?I`e0X`Qn%m>mlqH|Qr35WE&i~amT#_5kRf~maDpo3YFRi8k@
z|7>yiI*%*{x~ha$GfrP&@Ww-?S53dB2TF%Mz2p?SKKYqew4?zXU$nIASxLeKesn4h
z*!mXWjt~oZltP=l96N^~i_U8QMwo5bz~3W<8_47fTSA9F@kf#P(<jpxJ8LLy7@SR>
z1;j=&!jx~`rk(~U(m4;6gR_FYhkg$LhvI&OboO)4`#+t-SyX+I0x)(S;GsD3`%^9f
zkqqWXe{eCdAn98Om-DiQl;x8vt!pPAX_9d2gyNAWFby*T&yMDSI+3(~p91=_Di~((
zj`s`odKn$XWCYa#Ht-Bij2CHBpJsRZ6+l~TUKDWhQCmr$&Wjwe)`%h<540%+ubhl~
zSheXC09Mi2e()9is6GAXgXh$IgqsPd_P>~kan*gv40qy~#9lt~h1Mq&0}2;J4RIq=
zPDZ7RaLR!+EHMID;?5Gy?Gu&F!A)by1Wirw%;M|^G5FurG=+z9Gy&ImZYnO6Rs~@M
zAQsI$LXUyg`j)Wn24^8Xn2Wa0r{21oCgk~bPE5^&6%^{}jh6(4Jh~yf^bQ#8=BQFZ
zjGdZ7t0pI_X_8W_ft8->MIz6jD7eGb%xcy}SzP60&np33AG3}m50eW8(7zNEI=Pl5
zMUp?em8<35b<I2a_y!B3FXL%mhgnvOd+t9B_Y~VhwOz!=>*Xy#TdY=Nk0`nPKX&Mi
zl-$fR732rQiso!py>#Ism<E_upynoG&t-ASKq#1A^lEpy6H|79ePYKa7v2fHZCkBT
z)f`5Tkn$++Zj-ci`zEeJTkF{~zB&rlkIrx+XSc$5+AG6cnlP3~65=f9jWs)z<R=1o
zCipCb7^1a9d=tF+kn?wvFlwx4Td!**T!23N3x-%=coxaUe7hmr%W47|kJ8_EIUuEM
z4J}JcD5x(e^J5VoqnAv#!h)!pP+NrCh+JWcE2?jPFihW~hEpq4t3*Krdjuw~@t^U}
zX8xB?|L~_cj7slR;#LZz_}(f5*;7rugleIcv7~WB)hCpg&1A_g$1zS4L}iKWYVgzn
zEWHT~yBtt`FiU@;y$(S4aLo5V32>MsdM~Vr8o|Yd{Ly1?ApSCj66#1vENw$OZBD%(
z9N4BjOaPSi0OOZ<M&wfeAUxx>(}?!&=t0Y{dU|L`XdF@JfQH)mCo`mXx<7hV_5ZWz
zAG=feA6{?cEKRmFz+<Dyrx=nxAf&g30)|mVHJ{=T)~To9A?MLJs9;hpMuNY2I9Ux^
zYEp(&kI(sp(N;N2`g5(68IGhb>KX{to}1@XR+jl>HL2RlY==`-<vSjNxIIn0<xu`4
zT(9}8*HR&6QcRl-oT&akqCXfJY<ji}R!B6}QNAD%lrQ|QPAYBl24Avy#D|K$+xxr~
zG&G!X2Lv(Q<GYxYnFocp<itUpVd>{p@4LLz(zFF#Al9OBK`N4x0(Db^&w!1+pgfrO
zVl;>M2^qX}g&&Fpc|1rO%(h;R3H}>f;;nx*rltmgBAKAV#m>7V-X^E@d?o>jJiKOh
zvbJ!z^X~ZUXX6HMxMx5>ZxC;-P78{bjN=-X<R7+u%0O}rGcGa`-9v!Eblwl0NE+S2
z0I6(FBXTwsVv?p2OFN(8W&mHNq54)K$R_Bl0Zg{)I)HU*DxmC*Ptm~5(Y!i`W^w$s
zTD^h<R7NYK9%suXgGp-)6fkBy9Zc?W4M*w@JYq=dqOQu*B7Az-{C8Zv&L_&rlu0-d
zpZ#UC762JYF<kqo;ce~8rdG?b4uPI;N(F6dTiNFcVNixtO${Lr$xIw#g5<$a|JlE*
zmgWoi{W#tEg93mC7MS3vU40CnAf5UK1ulUs&dUQkR9O^8`W=Ow$;ZohSJWKBYrq_s
z+q@+Xujxi~MOGAx%fSa#H2gO2a8!ke1Gt)IC(d*`le0!47lEJ_?G1=vMqx~>x|1rq
zf;t6t15eh5DgtE0^R%E2r%{V9$|&w#hb{`7g19+$i3}=3GqtyBKS>*ASdl3~E$ZgF
zbJLU%LSbDR2(c~WM@@h?9r%e*jy-x-CCKFi9bby5;z426ffVW{Asey37|02u)q8{%
zYYP!SA!=M$M>ZzmUB@DkcJ+m>UY|`zCW+q&4i(&yb_+#GZ4W#~fu-v~8rCm@9U$0D
zdkh280H0{=*kt{hPcV4_+9@4;vp}2Zk+3jek!nh2Gf7MHMm#8eT3uFEeTZw>wrG-v
z>;t(A<_ASDCuieZOEcdH#0yZTD=}4}MLnATq~8b;G{PPrsiI2D(ql~9!u?{0P|FM|
zsQkuzX?^gCAVRVEEaoLBC-n0*4!Dwu(Bh|$`|5?AZkBWman^Pfy!PQRfz|A9kADBR
zZMK6}nb(X|P-cADlk>C1{AV3}nr?(?w+wbb)%*`E#SR4gc=%=<$2=S3($lHMBw|%&
z4@~Z}h>l2Pj44he)4cMl$8iofflB5S?om<|>5s>N!R({LBoRUp!1~auP&WV9MTAR@
zIhJKkO?@!`c>E3WM+HHG3$GflOB=5<1Qd^hAR=>uk{%${av*{zY;*#r7@j-a{at#h
z_Y!}fC3=^UHS9>Mkg;+=r^Q^xltpY5uHpRFxht2@hEnE%olSA7FTvt9G9%l+u>K7h
zj;;XEgJspxXTZaAL$Axxd^;y_JZBH_zpvU?6eqg3Ax5$Yudx<}xE;Lfe0l9)o`0Qf
zYuCRHHlIZoUH@V<>`|>@n!n3b6yAv0?RwV4(1tlZGXX5xjK-;RNUJUhYtrhv&EA-l
z*1BrUiK4>Jbxj9BoPV?H@qqG4l@)&skkZ^h37CU2`>+Wes_pd@keH6K$J0w&9sFGe
zL2V2C(AEtaJ{=Mfe40<eCE0m{e>cc?JWYso&scGm58E@IfG0luoH5PU(M^Sb4?k!8
zk{<!crTn<)9i}5twDKXFCxHdNq|uNS>99fH{mO6_9?7fpcGu>pjcDAh!Hm{*y(OYC
zm-<I`0aS!$YC*c$c<T<`&S$qiZ-3x5z}@}H%rA7*KwK2lGO0i-F9C?ih)S!pQ&<6m
z+w~49T^IO#02^n6cL?IL{7H`A3Lc|mK<5()L~6|xIuk|IN=^0`F!O9C<ZMFuS6Pm8
zN!X~~HU29mFxBtZht0Usj?yrVW<OwBTx7V16XFX3;YIXf)K)i5nORaCo)w7<d%_t1
zCl_{2W-bxKDNKc>g~D14F|Bb3@Q5Fyu%Nn1+;U1-`X@(Uc=XP;IEtuh3$(88Wto$F
zFv6&7WcgM5$r0F2n0ZV9Id=hbQKduz8Q2`iCt<NrCs3}HN{UH{YY5AFVv&T$wS;`2
zS?aw#9X8SkOD7HkiOXHz9ChX)rlBQ9A3Pk_9UJ~dl9TEL<#a&4QtrCw7Kn36a3&*9
z#0c7k7bgdmtJocSA8KbY((dOuYc;qoI8vfkKv>LvOsLvndaC$lci4f~0Wcv^?m5~d
z{I#k-@w`!i)EYQhjS@8Ca(oQHh_q|&eT-4x>Gw&^QyO~MEXaN?hD!YpVSl~$x=RN-
z7a;f+;F{nw?jxfy5y1^$=#XYx)ie|Qz7+wOIy1R&;z~8%<Q|22xDsJoRXt!&J7GQZ
zCVUN=hN&QI;{{TAo|C}nVv#>MVojdJEr<#*iohbyrYfj@Pn1KksE~;_TGhj#^e>;P
z(vn8-UHw|PiRL^wqOEkphP*b&5?ztC3S~_zy4c(LG|3#c$_du!Hd1L3?2k#5SBR?~
z->0(u)Hy33te}CHI$q{Dk82(5Tt2ql*2gkEf@E6x)_;TmR($J&h5vGVsgkDm9@<EE
zU!`zvI&tnjzMj6M?KQ_ee41G53{yB=T`}W-rS_y0(ryQ6U7N8B)2<$uB0wc)W~P&X
zT%c=4BV&6YX2&G%m8sv#Pb$)a_~)ahC-&t^9nFf8hzRB!%d?}|WNK}C7Mrn3J?9aI
z8Q3ru7yJW#6D**fz?TTDw3KPf_9_dIdLZ;E8pOo-v1$j5M(rs1nHvSc8q`T`Qc`|l
zmlH_)Zye;XNe|RbYHDpZ#Js*|+-kU2eu|fu*!k`%O>X!agAiL_eExKYOVWrwa{5kc
z`_{bldZ?ejfQ*cL*q}#8;;xsKKV^(0#x>eX*THvMdx7U44m4T8K|C^cSB8nh(7{j%
z@B@czh6B1KlGg%Yb<7-fswJ5cghmZrIQ24*!3K$H=imGvN~48P+q(HTV<CZb`ncdT
z?oOpp4tW+G*fJN1@ggSk8?U)}$ihz?lRF~H85a;MGozf3VbxNw%!`{qo8Z+LAo*90
z2Y0b04NZy8e8NAlj?R%NTl<utkp<~b__%WcyC8g*a0gf3H|?k+(HhW@>Y#XQ*Iv+&
z=Y^V$cRwWcbS69W&|BfmSZGCZdhL2(ExhC9hYvA$_*vA-BfTU;$E%sfz=T_OP>x$t
zkVg${0F6js0fz$4dZ%L$Gmf+DjD{)Vm+OX{8hJSnXvAlEwUNRygv}<6Jo*y6&Nkq0
zjlj`{Jgj^GtuoY4JXWTpgF5s605PFK#z4$Y(p#DeE6ORY(v5OhhtGOuI*JCH_lStr
z4XKf5wyh&$nkeiNc`#v<iRJkW_3F8^ho+r$%3(vy3oc<m|A_{x#Or^dX-Odt8l1@-
zhB0$H{jjS?0M>o>eeE|D{tRJdeF-=a#tG{P!D9dEQ0f7OLI7t6C*cQ1)Mz2a^A{AB
z<V)(Am^Hz3YWPCxEA<`J3|RdwQOqTyvxf?2HM@xJNm51mjp|1bK((gLb>Jowi){|`
zFf<9h(RJejgg}*+&783^J+A!Z1%+ycsmV(`FvIRQow8jEVNg!B%*AX%`DZ;7GrsfQ
z1}|l*H9IYDZ~fX=0lIe!LJMM^@nugK8w6r)ybva%YZN_mkr|9PfN-^8E*X{0j=EU|
zff|HB1WlJ{w(%yW4OHOcEW}hR=&U37*OvDrDQc+E?Ttao%`F2>@IFbbCP>XlrevcG
zP_8<kZRySm0K9j!2m25>2bB;}VQOfR_73c{c?0g1<tG8`McsT5;|T(!yc!5lUjYOL
z3?yEo2~22Os~?ga%|@J;XtnwehJw9xvB*myals|v<r`o!Lno3>7dUQ5ST$0U16%?S
zgvWLW1o^&}iE|I%lxVD9IMIy)3(hh-x;(sXhSq#F<cbfL_5qO;&$EawKL`c%OXcX@
zHDQ!24&ApJm@EsW8W4$KEAsq;|C7MyboRH0KmEfsl9``BXua%|&)Meh=(dF+ZAd%7
zQ?>_PTIkaE<OZq+mWF|3CI2Kcs&q}|(@$2U_a`*p&*yQI65vJZ#6IFeSsLCtn56Jw
z7X?K%jyMz#N4M<|w^K$G<`>=dWThSB(2T95nz(SY{^DhBaDr3jI+{@dbLPpV-82N0
zk=h;bb8ds_&Uw10H~RoXr9lIlC#WS*qm}@a*7?uqjYaE9AR;@${Rl=mTccGj?m@Io
zKAQ#{o%shs8p`QS>`hTU6<hf!--dBJKLL61+a`E2oH)Y(#cmB#GRHB~-V02Upb7ub
zTHlGQva^(SS+H*Xns~0`@ihw#Cofpcbe~y)%qld4KFh%@5ib}SQx`*V_wO+Yksec8
zAZ87_4!SYK?|@?Uh@z%T9(RhS*FJ?Pfjk-f`(n3kXh{pwfG|Qe0IL@vo$?7ElOfk?
zi4}JSL6Ffl@jS0;Hk?6)Rk*YLmtf#=7jRMdv+3XlLEXH6OOkBZ_3SM<{KiY)eaK-Y
z>@+>gN7^}_)yyT#?$90(UwW=%dSIF2rTHUy1~H<EySKgtALKe9fTb&-^(XFXxuQ3U
zw>GuyfTXn%i^&v4zosQMVmTGZZ##r}C-=|I_e*G0;hp%BSYS=&z*ZtLN}~V<IDX@|
z37e!Uf|5+%8*m0p&!+T^D>jRBt%G2B0tX)qj6F)+#lzYhz6!#o1~1p)qltboih(oP
zFA7>W_+y*n-z73Qa}T5c%uTo{hRaMrI=;6uSy+>8(oCNyosB?(nf&!)TnEJjnN3^N
zXJZH~S1$u(`Wp6cBzI+<tXTjKh=X1`!GMGs+m5u6NYOaOk>;(;A~N^iNtzUlGCfaU
zKrO0cb^WKZPu`PlRd{nG#oVDfUYY%XR7q=updm#v1HuK6LV>!re+X_JR!o#h{=<vh
zX7kewC6bp}#LYd&q&`GdBm@E`0JHRpI&qYisT-bx*I`Q)VRZipW!2slI@NpbOlHn2
zgV}#FtJz7e{!=rsB2dSPnt*_xR&-774)1<_fDt{|v(487j{-il&JUDH5zI;sz24ff
z2QLiZ(6Vx-Gpeo~eG#fPPn8rKvSAN>aUCuzN-v&(Po^0xj`4jsF_`FZ&&)hNqa|lr
zc?PbB3kNXEQUj<CB>*y9I>E+-ananlYaJ~QM{0OTm3PRbfSS0|jm99D#^i)B_9U?x
zTj2ur;|p{2j7C})V?`g$!L+8uE<x7qW&#RQndhWcKya*o0+#%2xz4l&V7jP)WXaok
z^2T-;vC8ar!hNAzu62W(8&!BqO?^k!;hscLU;ERs$IL}qS*Pb<kBn?3g6Wp`%eYsp
z?0DGi35UpODiYn&PjGCulqmt3nO_i?(Y(Zt-aH+6HoK^8W~I`CU*Ezk{^VB^-}w1q
zHMgQVp0CmBu><5)Iuet6NEnsWl4Gkzy4_4a2)u0*|9LmEFjSjIfw@({cj_AV`GBxB
zkAP%Hvt97C8_;b>;*P@j#GCPX52hYfRz)vtZuX9x%eQbKV+jS|C-?d%7tj^pOK&Rh
zLjyz4T)lD~ju2A*9_{G2iPag^EBDO>1diu}Ivi4#!I(r2jN|Rj%%wV&DJ^gA9-Nsm
z%;KaVuz*W?B`neMq@sFpoI8+8r%r=>z^!KX<DB*;!l0TG6mJ9f)ynQ2zsJ8<*|AAe
z`W<S3?dI}N%&W(t@<u&6AZyikY|r<*=i`8&?J)^o+?UHA&3&%5;Km^y&);?uY)W3f
z86-mw>`3wdA1~xXa3_r!EM+u;A;PU3Or)hXaL?YUo0(ZkE)u*$^t@kB@0JYNwFi07
z;L>1B0w%a7(bI9T?g+t936toLFi8?80ZB6;3jS^+jhPGqTuS`0m!JyoFHSd`*x)H2
zI;6u*yAIyxZt>0&z~FM6xN>|&u@(Qa?pcA`&_iN`T@RD?EKRqhdxx(ZeVaD=wqb0f
z*eK9!kbLQUyv!wG>nHBIGLlJD9myLY%!bD`vCyw=9@ug_mB^%lRcHYfgOgcj8flfe
zJtYt}0C6)-bz*GFVVLF_R~HRv1lk!CdOxpF_s!4?ce(7SQl#aCrdenQU|XL4)p4@*
zx{M>HRswd8TIn*Z7JcL>P)mYRxyyA3nNGEgyCh1uNsGbE<r~q}lhSO{>>sVH#CQ-b
zL1G0*J&?+IJ0P$eyc_~Pb4IL`7%9}9u}}=q;Sws;uf_%xm$AWq-u%nOkteDZ;2_=-
zpK6B~k@&>2E3>!wRTN6i-j7$ul=r~!%-Zg4K=JA+lM5%HDY^HXK{>H6!O~T3>UD$v
z%srm>LP2E^Km27Co@PQ<DHUK&kBLL>${7tMs4I{A<Rg7LeKLU>XVdDL!z>(mjiJJ7
zXbl3ZxEq(UUSAj|R%;Epk*OJu*{FXebatm+D(u2=KY38rq<~baHMNNeCMPtO0kqg#
zkVHwZ*!W=_6;BQ58u}w)3Q{q6my)d)Lx}Ct%9V%FHjR9Kg{y|%tY~$5WR<XjKO5sS
zQ0@-sl$<vBl)Z1wFik1bd$cT)=|m@MqL4CS0VFAOl4xAy5+fD6^*cbcPWoeanokG)
zi=hzOv>)bPESZ7X^-6y{M|&I}fXo2cDl_l-ee;qpHz^hC*p<DBA}#2m9W6j?r4aop
zl5URuqCAqSh*mdhop|&Tc&~+~lLUGIShQdEXh7@$Uh%qaxF#tUy_tqIs4ZF+faA%j
zdUY0PXi*o)bml%Op-<iQW@s3esmN;UqWpk1tjyOoU$GTsw(hJ{(%zHM63rd%d+pb2
z#6o}j+^2u=GjJ<i?l*5FxoOSh8*M2jGa$?LX<%$>GRME`9qWVSSe!&utbRU8b9+0y
zJlV&6KP_02?3hkZ&@^z&4JlCA<~%r48S&-nLnpYcqbhd5K#W-7)7jC-j|NJmF*pmM
z1Sv{G2sa*Y1aArkX6Bt+gV`d<&pb43{E&ynb^Cf5V}Y8;gPggda<B)}%W%+3l2f7f
zaxeveZ!%aB|I+hum)vwzOpMPa12z7q5a_Ab_RrBYA+0%e>+GLUxOlE8b<%PvmQ;Cy
zFDU#&5nI|?ExJNPmE6hGL^J_1=;Kg@RgT}hd4~V3G#gei(B^G4jJ7U>!(O5w$!I2g
z%1pL`2d*P$LwgO$K(w(@8D0@a&_M_#OB_?X-Wv#*3aLB<qDhYQqM}Qfkld7=H%}yV
z5C}pA5fo)rK#|KrP@zYlIyUq^TMndvw4!25Ng=`9yn2ZknGgZ<F_eZwdmHP~D9c);
z5cjwdJAm$S=$MXf1-p(PRoRToX98U<I_W2rM9HP&2$cnV#C%}e?Jth>72<Wo88!aC
z3rJg19DzN2?)irZpQwDM&~-P6(uDG8y5yJtAt@tmBy)Ns6Bu7@eypJ2A}upvQjlh+
z!GGX!0FJG&x<>|_!je$CQ~e|I>tJR5BfB`c%_YQ%T#)%N-bA9(oHlX2q3AL<!KSn&
zA|(%@H5!1NRcZxVC*9Bca&AoT8o|vZ@km&m?e~C`3B}0xThx+3CJG}c*nF(7sEt^J
zL>ku2a;B!%Qx2k3>7vkwifO?2C8w{AuoXnXc?B$4d-Y-lO%NaLD?X)pI;=J~+YPm{
zNp2Zvl^f=+&xnCh9%VkSU=;G}8~TP2c<j+gh8we7qCz^%d9kwMInpJ}?%9nU1_kv=
z@O;tc-dH(}riiU4Y;+OL?r$*pcQ~%$^OIsJ*YLicx^ojED*C1Z7PmuSxJ2OZB!l-P
z|LK0sSp;Q;5-J&Pcwkw#+_qbfn!J|;xzXu%*SfGu3^2>T&mC4-N31(7i?%^OpTER-
z%O8hMas;6cW07Hs#W{SEJR~lh&`Yy<OA3=wiImX1CB=oklcvMTNs|C*-RA#7$OZZa
zQ5AamK%<aKlM5O=0E0~JM1Yj!M|_ia=t731E|rW5i0L99HT124Ih@ADQbhaI69R5Q
zrlceCBLLZw|8cgi7F4hTME_w4sh~S9s*|s#V%GSS+_-&Uv3KcO?Oo*3k*<`AnqWq7
zg6JskGjHNS10IA~3X>H=JD`l$FBI74-^XzxXv$f^vS=p8JRq}=+zmlO4RkEF;eC@-
zJ2pz8j9raPhT1F1bui=D0ZVifeG06wG~|9(ir5mb{f~Wgj|LCke(N{4L$^w!?bc8l
zv8g%~BKTPTI7Me_SJTMBQYuQzrkTertUqarxl)cjQ)N31Crxl*gXAtR`3CGGy1sJ8
zPn@$Q!-Xg%_lcLG*$HNThm!fJ@iH{I4OEg58v|W&&FFM;m%*R=hcPcBNr0edW(tAK
zP2N?ZU}D#m>6q6AZMmc*#;1(vl|v(*ZdsCK{`!rbqFCX6nP2ViY9`RfDFHuQJjpb{
zfGb7CDqH7Ml@dg)*A#BX=tn@mss^Vq;*=iQ$pwV(wd-e1B!8z^6-2xs(~bU7YDiDi
za93Ws=S(B%p2d*@n9zZYXf%eKJ<w&@$+HAm8M#|0m?MjS3y+GtIL34X+zCHQ@3n=l
z0~<i&aT6$oYu^os+q5&w=AL-$c_<RVX2zUm1HKl57V-jf%bG`OFJ0g5mCR}8@;uXO
zkpe2u%VktZMcPOmX4&$*5+i$sRLq|*J>H8X%K!fCg{#KMiJDh-H>bxUYZh+llS1ow
z7w0FIm?DT~n8urqUE-6@?BxG_fX?Xs51H6VoaA~J{WWbIRUIlS^YNyVB-m^BJN?hb
z1{Ck;E$N;<+h!?9{$QYj!luY2PuU-m0u}fcx@4dqzL4=Fc)}o?0w~%RsG^|9rA~;S
z2!s6VOh_z_02H%rao$&Ora+3zp$JDY>1u$Yi?yCV&8%qC+wpo~S?CH=1tv8zDq*AR
zntS6_p*2ENO_k3?ONx^uY7ZF4f~ryM$p`v=Q=5{M{aoM$lMGLxA%bJAoe(t`5Rr}v
z!XWHBeq`IJLT6I_*cJ~l84;M`d#Zb(8TF7zJHP~=dB3^UjvPt#pj5h9`iWTv9wi%H
z&?byJ#Z$~Jdm*`lgey4mBwFeRF>v*hAR|0WI51`D4g|thq)yQW)rBexIOSBr!?DsZ
zVG&7<pan`J&`3-Zy2V;(bH^Ni%Uu^5p(`TBxy}?p6xoxt8g#E47F&a0i2*7>Nv?z&
zuav>|jLbQK0vi}JrbFVsfnmA^#VvR<g$wVR8nGL^X=yqQw|tbmT9L6W7C)&%sl=!<
zo@4~bh6je#<XuM;q?Qr7+xcxkQ;kSn-2m?*k_9HBF;;494T$Q7h?&R=0O%4vGzk*M
zCG=gyO*;%EahsR+S-sG`mP6biUV@+s-WZ>&+dMNa<tm_PBjqoJw7nY0WTQv#Se#!1
zz*A23EKY5N^TEs@V!RUx5ysQeHFLQMh!Za&t;6ABPMR|i&<uzXDisQDBQC-q_f6<C
zd<YsA5DX!p36L?LC33>yg5M6Qmw;hCl+G|y3NC9d<zpI-t(gGhMBMcH=8aW~Q-1uV
z-buR0zV-Jl-}rgL7C#jhBqEyXey)WLO;6j*H(3$$y>76$QaEUFVGUpvSX>SkM8a|%
z<v4$H>Sv8mqpL3P$emps*mKdxW1p0E=m2id(ym|vPJ18>sM-v7#OMs$fHi4_mC!fl
z&FaO?G@)kLgmj0fXbDUAbd`e{Gs<4CmX2wHV6e~PhSW%TO1!KeGOZw*M$l3uP*Huj
z+8fhz1928|B%4o~(RkQ1dP*bSh=J@ews60vXA7|AkPhQmT!?`tBO3Zx{3D=guqqX7
z!>wwo>C0BN_A`&a_FSTh^oJ$^c4Etoe(sAs<A0sLrS$rJ0utfGLlJQ>cuylyzwx*w
zLh{fnOFcS23fOSsVqknFO-{r%0t`Z^e<P4HAnoBZdu^`Hb2P)Ky#`LQ-_#9SPKO)<
zH$`_G7K()d30#Dw7vWywcBK9tB{b4?>561ZOM--J&zTBo_8Z~Lv60#g$^HOYj|+ww
zBju#h0~Kz}YeIlGW7n!K@&kc1X^_TvdM4g9Zly8$KCDi~a5KqY6ZPO*z_gGU%^%}?
zF`l*t#`O<vahvuQ6`Jl<Bt#sncSkYI<lM`N{Qb#{d@AK4)&A+myxWo))WRX=>&Qi_
zOvOVSe;_kbOZ%71E0-?8mf{aguDvaUBJ<!vi-HTGPu;)gRLb4UW?KgkhOxC^LKY9f
zteb8=9Cs-aFiO0TGjZc*SX?`xhQgWBKgrD!VfzJx*bTn#%Q&2y(7VvoXIds!88ZP6
z+gRuDzzh)&^Uh#bhnK;zxQ!_qV$%j7;uG~``^9VY_Ti^YvsAHJtfV|3HdvbuK>brL
zzYr%hsQ0@Z!Y<34hx**flarR4NPW3@Z3H8VQ8ubmfFFS-_j|M@HG~q|ADykaB4d&}
zx9hOB&TH<jRC<D0VBV}+z`zhlR%c`f{n)z8_j&zI4<Zqo?Zr#-FQPq4gFM;1>CrGy
z!AP~31wca(!tx&k7cFCfZRM1@T<&@kZ*zcKEZj|ON9tZd9LYhHUP-?wgLA%=Wgm-}
z@<JcgoJ^6d;{fP|0qgb1f|8?w2#`eP)$paZvU)*|a)ofA3I+2u6{kA0dX2G-uGW%9
z;jM1^jI`SkP(t0lbuj?Z6xqquCd1k6AF&e+klQCi1ngxJ++v=$E47KBcuk{s%2p&b
zBnO2m57R*k7up)fE$>-s)94Nf5|yIdf`dgqlCL4;k{gxRI_N1A_?<RK>tmYYQ&(Cq
zv`r}c6r+03KVU^<tOF#4UF|0n>WxHwDpL?|<YItPB)@N&zVy{Ddf5%IMTm0t!rhFD
zP4mA?0VUtxf(TzP36=!$(Lebc-u1T!zW>{%ewkmaM{18$Lar=szr@3fZ|s64jXap1
zfL;XgL?sh-jOc?#&*rilskVK@FKw~!F-89bOO8_k9BGSX1Z#gSw@3`%CHW1i+=fEL
zLK|q)>lo8k5R!)KGH408CKOl{!6Lv&oZn4#n+v7$1dD-hJ<jvgRQg&kBXn>tq0SCy
zlt;cGo)J8w*)^f1Wj6F6QAV*xlNs^H2Hz%wAp^`F^{XIMC><DL7QmQd5fW9^w>oqS
zN6vVak(CWXB+Rf%>@@5$E*HsAfkv^clP@b2axcggPjiS6;>UCD7PtJp4MwSy!Z%eA
zZ--7DWIjYdD#DsaR!J+gn8)5#001zu8y~1PqdR*!vbg*@LY-vB<3~lXZb-<dZ4PdF
z3(=2`6n&h9i_6jTG#_V#%o|<&|DEGcmPWMWB>yF&yV^Lpxo}3)02%nvzy6;A9e@(M
z3>A=E2qj)79(Fy<Ux}j>rkDD(#u+CP>OJ$q=C{%_hLXG(!n7PQuq8Qt3xCtUKqN%d
z+XRKos0jg^Wss5Q5XCZ8v#W<ehvUxaf`=5kYBEKO9Fo!~3OyW*fKB<gVKa{Ugq=8O
zz?5y;ntkZ=;vv{lFf|}<P&l^JC;gAy!M(y}xqFrr;$*y0WK7Xh5Ym&V4q!|O!|mO{
z7?2ninSvjA@Peorz7W{xX)^0-uEXT4<il?y;ZWzIT=SB%5qR76ChbU2FV^LieI)^}
zaV$QZ%D?&@dt;KUAhxwGv5fn<!iM3*CqW9<CkQiPkxj}FlFtyD88JF}LD9#V70hJo
zh$m&_ptwyjFdc!4{NKd?$uf!|J>rvrMn_a*B1uui2@6i7My?aF!?h@Z6h%WtCdfCk
zzz|gv(&PrPAzoBsGUdi4RK<mH8rO!CfQZPNOmhdWmwG5A6!OV651?xlF!gC>O`}_3
zQVG`ZtXEGGv?oERM20&++5Xm^4EmnkhfN0D@Qjaa@Jv!1kW%JoGS77%J-LazBcJ+G
z`y<xGrG7~uif9K~*kQyqL#sMGD84k`@zK=UEx3>fd3=B*pQKA+(RGX?Yy6B!kE3}@
z!f6iIXo+FhdX2)tYe-ahpwo@IUiW*j3YRU*+q&gPz{Q+qXoGFJ>xAwR5z!ol7`z*Q
zmb110>SnaW&IKiA(iYfA_jwYfY*^G3n$Xe0k6#loRTzO(kn!m7O~`yGgY^tIh<a7H
zv$m4RFeA;duv}vzZBObT{Hpsn0S#@QQoMsk7EAq$lTo^&?*v@JgySYzPWbz4h~$4}
zgsZF^!rB)8{YQ(9Q{DeB&ssE|2>pBq3VK94*rOE}6^f|fj_SofNQNTvte9`+AF_gi
zu8=aps&<5D-m_m+GVn<bmTt&h@n-;*jZ@2Ua(0;GO#&kkpBv}K7Aq{sjoSvpfFxsG
zjz{?%ggsMjSZ1emrcxP<x_rmh-0AOBWWypB$Bh^9Oi^hKpSB1}MgR^I5>FYNAns}0
z+FY!uMjh(xDWwRF-Ki;yxIVuw9+zHe%q&G{aFiAHGTiRf3+mDP!q6v;j3M<YRcOe@
z242z{qMa8RsRXND8$HcEw>=FTA^INQ{IybE?1u^JLg@8!@?wGQ`1|hG#tqWI4hc@s
z@r-We(mT1+uNu2+moXwGFCHR!VZjK|G49xRDUYbUp8x^~OGFBaZQLxe4=~c`b>eO$
z#2FItfZ=sss|zrYIn$vRH=o5cD!nJX@Q~wPBZ_s26K;SL8P9{yNQ|6;3vDJ>@s}1$
z9J81tLHd`*06*h-$A{ob8J+QF-ls(%rZo!>AF_)9iB3Yg3@`I`s5HOZhDG!)1$`s(
zv)W`}$?obLzir>l3T}2sGz|?e>i_0#{UbXRr*}Zby*^QAnjpy4Q^Pg|jhVrP=0TS+
zpf^3yl0+vk(m>V`G(|aF64UsD#=bOk=9!TGkU_S?>FVk+1#Y%YV5BU9_z&(>=AI+m
ztBsc^nNb_!&db6A8(Vf!3+42-w!hg-ZecbWD|EIodz|mbHk#7k4=7zhIB@VPs@;h2
z3RF6uUa>VRgu6D95juekE0cvdbSF+5rC!5L(gvTEUzngW<g@W(e2OeQ=m__J-f3Jn
zY%v?x8-hO7ucsB)AgK839JDAbA!}eq0delkQ+H@P?h8$A*g?|sRB;8o@YZApH4ki%
zl~p&#08?gd#r9d;CoG~PNv72pEF=8bA>^4P0AEAaZ``tmW}l3tELR~jX0<+y@*aG1
z{QhPDi`I^eI;{-CM01WLjKHXmOWGg8of<^=3$cNmw)qJm;3+Xlb_#1GP5y)1C`e8y
zz;5DA>aYSd{OnbXFy1qI$TkTjqV5DrHIM{!BhZQxc9Qsz%qKpjOhX+Z1%($iKAoah
zL=4J}e;G533zNDzKu=wAF$)&)N<y=D;z{oLmh{7<vWd6-cJ+`Lq`6tp>qB5q@|_e&
zm=)R_ix2`51=a{Y?7oj_C{fYgWI&T>@GLjg?XrPbVCEz#JgEPKz)J>F(@k#BX2*cQ
z?g3*@1X4)H*NnQ#XbFBdIpa(Jfuv<>(Az@y2ODlgIx#65)>b~lqwmLG`k*)epGH6Y
z>fn3a;e!~uvgn9B;w46d#9F`{(Ie2|-;7TnarwV5p408}&k%bL7}30Jg>I^Lh7%Qe
z7Vg-&ghq3O$g&lNENx;7mYWF7DM1o2WrCc|MT-?3b;6(VlN+D090X5$R%Y?_K=~7x
z;4*dNi3#w^e23VAW~ApDuEqi{YLReCu8{JBUfOdipHId+K#{Zu=@MzeFRDJwm-4yY
zEbPmlQb+Q417b8*_-~KDwjcbIapm6ab6;GZ3rE%&bnTp~<tqfAa;5(7Y_Bzv1R@Y5
z?~=E~?|;cv#2;!CzzS(Q?$RP7+<cerkq=dJUQ!u~=CFk<{4B%C&OlP~n;Ed=h8ZZ9
zGqV(Q5OByT+N*3{fK(pI1W{J4NFXZ@aB*j6T)F|mBjt~`zTP`eR<!#*eT;%8R7Q93
zeE>>vmR0D&KtGq|2%9VFkW=O;*IpLzNTL)7a-n<Ii`&@ylUVN{D&c^1H?v#7T)WDV
zZTbv8w3yHMqt=cs40K6$EKNh9<WIHV(?Y5up2M|rq+~Xsbi>anb!=QFzGISJ2pta0
zXsT9kve3vX7cq)x95&iSrkrSi!tOwX$$nn5yG)=VBeGGn7eRXJP~MFF$Wy9DOVjD-
z70zhJ7`TFcWSh!4c}-4%4Z?uk#2dKj+f()k=!y0wQBZQ4o)QN$CNyyxoh%CJ0LTos
z^ocq!n`XJ->1Kk0#3zXQ#b+}=Pji>&mH!C%{9Sb&IRg^~4_N9>n25LYLQ|jMz_on9
zOH6zFZ2U@(3?ax&l-CicXqT|m7wR7AnRwIU;I3Ut!@^pgL+%19(j?-+oxYtU`mg&1
zP+RJ<y;>J58nj*-l!m0QNqu^%W+oCZqAy9GqeF|kdi~;UyQ_GL1iJvmGJ7mUSIvYN
zM=h>V&Q8(|UC<giMczd^Ac_*rgq;e3#~}+Ju78Fg+sFEdHfW+*8_0Mnp1WR67k`sk
zM@=%4Ld!C$|1&L+z+VZ__*ftL089JXD43+U{jiIYZpw<k1w08MN_Ls4da%}@0h#+O
zr5KJT9m??CuyaoFdDw;+mEgh+O<BI4(*K$(<oT}3W%6*;p!glH0)mZZC>!yB0n|2D
z*1|;4yIKJOcnq)yN|Z#q$hj+R*S86qN0m&r120X{l;U>OKDH~r$S2ZXT!E$$BR6Nf
zSTdap^Q}P`lB8zHMk-K2cS(-?rZ}jAWTh<nQ1hT=5=(_dB<&(55Mtc1x&C&tneR#h
zm1GAB@OAP{vFAXFD~=VqBbbCzm%aC+rT_Ie%elvPsyN@~qp0<FAmd=E@1Sv&d9IN(
zx#pJ6J^J0CnvCc+-L6G+{Cw47N(6zM&+KBzs<}n?{Iq#aqnEy?IVPdb+;(#p@cUDj
zBadYwc_k+3fV$ZqdE;yq{)~G{l3Y0?Q4Z+=mB$)|dnVQyiE$YUmqQmIc;CpFkW@yA
zaSnE5T`_FTgYX)!-4)JoHD#0mJOzEpU1CG`)F2fS-ZOTj7cJv!kl~ao+E|s5rqSu-
z7o6@^N&oN}1wYW_v=)x9V$N&gbk#ej4#X`M(NAALh&i_ML|FP$SF7;Hc*<XsCkKvh
zL6779Zs0_OkJWJ=qauODG_=lehbdeaO^4gST6QT3$6%6#K5`H?a4dm~9D~#8;8Rp*
zNSC|LY%V<JoMgg>ZEk7{m@t#YM+%?1WZIZBYcvDpTq>Png8*+_Mcp2JaH}p|;S<;;
zBgI9}xiXK83pT)U5EZ9ywjAE__hyuiK>eFRm>Y6{1)aI83_TLxTo|HJAhX3nAR|iR
zcLP_TS8E4x!Cft_CIkwCO6YdS%MtZtabypSC_{q50tkjdK+p3YdTfMB5kD}ZZOuQs
zS}D-T!IH<5v@>}Or)op*6Zu1eGX#4c)}w|Edqld_*~F;>oepzYc)H@VfE(_NqVH;y
zVzMU~2R_mUo3dy^hWwn%HxR9pZ1)jjUtvl$k<E~(3yR1Il$LO>7iF5kyZQhsw+tAA
za|j>7qDL<1hCc)8$*GEQ7JeW(tp5ymetq;z&Sj%9xMre7xWM5UHwVuARD^aXQ0^*W
z1UL<pYv@jfmuN|h>^5{`AXv>5FEoh_7AD)L)EY$t#vR!u`u#k`JeA_oeADFWE@*rS
zy>6uDiV$i_fj>r;ERsjS1R=}xG@)XKtRbkWn0NsSVH`!-2sJ4N)4QoB1fXbV8VN#h
z1nBB$sBa}62+xu#SKb6Cd_yi9oPA9N7i7Prr`fM>&S@7&sg;`cVNrF8fD5+d0tu+(
zs7RqB49??W^0nGNZclQ*9Y!4l5VuTz(sk5hO0A9nTb{qz1~>yGbSTS~GY+iJDW=rT
z?**U7GbQd&LJ5otg$OK`;PMv(4(2@MflZfkZ=}EknJvE3LZLfbq@%U2yg!V}!GjA1
zPPZ;HyGX$jFUSEM7I+ZFtZdIvopD}P&@hv5B9h9bOI?cqHLA*xbZ1<p9@~gax=5b1
zHa&qv>DZY%sfhQ1Nvr@++Cf0tHjg7&(+FClFgj)-h&77%+3fPdzrPZVeCzM;{Kn6d
zz=;JD%#j&{byz~-*tx$|qTA_i3A2bSt3XOu3<<X4L8;7@fEIq`%RCau97V`u5Lpxh
zwT&R1A&+ly;#TiQfF-dx!$!d2AjLv^2~n8_eIv4JelOV2XtEfb$lFB%21jqa7I#j1
zo`acm*uDIWAAbUNO!=D&HjH~76VNlCwhM}#d>oHJotNtTU=&dnpIT^t_iaA4=9`{L
zG+Ca`_Lr^~%CuAFq(NYPFDH~@0MyicSffD1yNheb;#PK{ke({^zt}5xe&gHDo6%iA
zWf(-F0SBk6E7fK9W<ZC#JIOqNVU~ej-He4Q+|IcP|FxyX9k^r?tNy{ourtxj{XT3*
z_D#eI+3TQF;ZAWF?8*!z*)g~@>R3vsKCm2xb7I_(<thG~X=MryEPv^n{v3v5<}($u
zU1Svy5e1lTgemyjT~Ri2SYqL6)pVQzzaT#2iS=~zE|=UWMG?|;ux=I=(qi(qKE};D
znf&&d6q;bGebPj8CM#IWgljJ?6+UW?DwAmF5*>392t>f6vwy_y9lj)&f{PPrurRr4
zX2@wfuyh0fn*3cRXWzo%pa;qwGrpE7=Mc-~VH>r6%{2~!T#%dHK1V)7E0aN4NP?S>
z+bP0llfO1~#Yit_!41K<sTCDVhkFZCh-eJfih<1vOd8f`Dz*qw@<}_+Wi!T*Dd3A6
z{z%x83f(U>4<P=7QIAHe`6bT`tgolI`bdaQTqoY)wtQ+Pe2N}H1s7~s%6fN~#dCBB
z$4=#dE~<p3ZY9Vitk>b)R`P_Oq`-sXZP9^@qSt!8&Py(9J$HBb7)W;A#%Z|$!iaMJ
z*q(S~>i$sfp8x>ZPrNfiJPv!JW=6$GS~@ClV2sHCqs>L&iX_S15bmWF8>dFxG?FHh
zeK>C`WRHl!>X_uHuqj)5PbK4+^5w2>JGi^CNlXR<F}N}bfDGwag1}Yfl9NEUvN2(~
zUXT!e+Jg?5GMM!P!j+ay@F8PNHvw;hv%2X^zDpu|iR)l<ag(*%H$U}N4X6>OxLfv_
z?UG_Pd^)U{1K)~XjK>44F$G2KHbqjr2s<mSq@zXA482eXweHNdY%s+{7+V@0@d2Ho
zi7}z$M>Q~n&}goa(CDu7fHBcL^sgbPQjB^f<r0*8pvYgZaO>uX3!<ATB4NAH#6d)E
zMk_rb0(`XgO*s$}aDC0Kl}80sUK#|+CZ(rwJ_R9^^R_NT_zV-p66Az@qDzn=8yf~q
zp=I2*b;0};p{@T?ZkweTa#LTqoe%o&{zt`M{7aU5dVnLu$q<Ip6O$L~LuuWz19ykV
z7Kcg(5B2x%E4gZSXWiI7v14!CRHi<<LaPJ}0&_0o?W!bBh)`Idp+QnzP>zcl<t!dR
z$Q1zk)Ip_BA$ay9-r$FF6>fm2h{xy{?&%&&wzE>x<>7!P11)<^s(PikQdUE>VBvmo
z7)30=D=*Ud*9USNY{$_gl?qw_T{&*e@A7_#a%o0&x!kZK2!s!ormCw>Db=7gXVtZi
z;(#xN<l>-HJB{+xOz4U+e+IFHpf>1pO+@D|x^{_*4AZ?|+#WrL&-3(PDbN4!OjpPR
zlJJ(%e9@}AGM99Zb{TK62o4>3NTE7%2tW>oO#U_!2Ut5`4|ifnj2IJCB?lQ1RiQWn
zQH!A`V>_H(bxX(1S|S$!!rZ0~CVR`pjW#o@qC%H$2r_Zxw|Nuhisn*n%)mOQh`fOu
zB9|o4OjRv~`0|F3_<+pdS&cYlO4nOU5z!{;ZH?>sywJ2b?M%x{C77MAm+>VTLdx|)
zZn{7*dj+46>&)kv5;}MMgj6;VFT=iUJ~xkw76pu_bp7E&oo(@-WvZ13=r6?I0YBDq
zZ?(ubw|)_oq(`CW5wDEpIFKlg5Ls{`?WlCR_>2V<SY4@1oISHki3LY;YDIG71D(>H
zp3^ImCXxffSna!z#ZjfC&u&YmE0HTFT<uOT$4DfqE!02K#O>WhwsncUB2~atk0RxS
zAV|VNO-#@e!f*|+9P~5-e53{>`8`ova<9<4USrtlQT6g6jlDb&H|XHACH_Q_30ocp
zXCWLw$$P+=hE;6af2Jo=r}Q?-H{}8-kuaAgg0rQOA#s^QZV5CHGF)sI#pxfOz0*Q=
zr=TO6>M2^~yvAD(SyUP+G1Wuz4Q6Eq|F~)fixx$r1PN|3A#_S6=x~t99&t!e&0U*H
zT(E`6u@y&TQ%fgcY~fVTotr{M28>XA&Wpm->V3&q=cc#3Z#PwLyhvGZ><$%`yGEJZ
zTlGRy1X{D506@arp$O23bOoZ?g(!TcfuUGSHfqr|s%kfL3no{{EEq>I8D!><_3fc5
z!i>N)f`H1BA#l<6j@%Y&?G`ap$oXMoZ14x^Zwm3jEJR?crm40QEg}z~20wv1xsD~=
z(-Eogr1;$Iy*4{$0YB)p<ppq&$ORmsWp>Cig4{g?B$AyrS4L=xCDa8Gd#1&;zpDZ;
z;>MDMooHureW+35dseT0`$90Qir_*>2nj0!vc%~GQwzCGTGW6kT^=AN;lNKn2ZX)~
zuS?!zOl!;g6FCm9?C`Q%#Yc77$hZEF55Ib3KlH_LWexQ>HsNZ}BdQ}E%>j{U%u(`a
zzhnMDTLKD{dsRjAX7P~JrejGrav3|uY^)Q)A%NpS{vDM+;E+c9N15XYPUbe35MB^S
z%w^o>o}L$JGlmqXY5{gZF%Zn$t8vdfL>R0|`AYQz7Al{0<FpJqi73r6pEF<V=He^?
zt_KMN=sK6}NcI}<Qbg`)R$9VrLSfFGE9F2QK!-yhZp$i<vgk{pI|6S)y?w@Db~Ll$
za{Yo$SU!iB^a6HkY&6LhY7TS&{448E$;>eUNh6^+_WbOZJ!3XU<AxKY)GStj+o9>#
z4cvImY<KPI4vQQSvUEU~Ll&_W7epw8ZcxE);5OW;%g)h}vj#jG#m$3868oG+=G>+L
zyzVx%GpYrY@i(p>wQn4Xfk3Bdc<6;*jo}K{u6ONz0EEbJA^{`O0pnFSXl>wyK}@2)
z@<=Zl-j%)f7Gx|AbxBKmf-gvXMLC2}>3Pv34_A8bQeg3nNN!_rc9i10T9b|}?DnhZ
z>mn;|tmssZJG+K(-n0}Pg4}FtoKc=M*n(bmLZpQW8}~pNZ2B#L?bBuqDG9NhAH(!$
z6F7nXbw2$_9bJ2IXoQV1^?_7$*=dxAg(d%XinQGk43{P>9Kpf?vUY?LRN%m5&${HP
zk|KArE*hY+1~*aE0~YC5uQGPRvvxCBNJ#rWiZiE(n}I9w_>{FaRj=(2tLlh10%ul8
z%YqXquBHGsfoyfR?^f3k+dir-fPgk<%2piUKqDKEZH+4v04Z=;H*(U>URqL&JHA6c
zTOcO%h-0+ZBovvjH-dbC4A-mYYG=8R<2U&v14#j-Id0IpDOWSp$`5vE#c)BVF|;Cy
zhL$?1z6Ki$dV*JX55KMJ(%pFlb`qg&epOfT31s|}-LlNLkqZ$h)FZJCAVBS`B@4^R
zF_{q~s`@&kM6RG<x5kQYxyFgBV=$TxT!#V!lbYwTAy8Wz1{^Rq3%c=6DzK1Q!%h13
zTg$*BlHtP$8b%WCY=TK0R(wv7#h0hqRzx{?&KuIREHh03knY#UTYw?11;!yojt@6~
zL`U#qd<nAz(?=c)Yr_B<4JtW5$Azn1pkVn73`D*P?*(dV1GGP^?&v;lX|AE~=*e@}
zx~)$M7@@y?DJgSQMJ^NcAzEii1fk-*kQ`8>{{o;UP?-Qq6^zhS(ZEMxLCce0J#q?Y
z(NFjC1Q3lsRQQzFctBy6W_(<_91eisG~W<pyGbbo?xJ+sDYUl0<CXNQlu;5kDO(so
z&#v;Ehe-Ax#1+3kL;-<RfJc(abo;gN!CZ5?B5OgyO;7iO816uklwdX1Vuv-%3`xuL
z`r3JpB+KSA1LHT47SWZ(D1Inm?Y%H15fvjfe8gi45+rxkfW6{0xtTC)wK&$TY1UzA
zV(zurF<iyhE-w>Aod_%64GeWaVVY9R{0PW)PSvBIfkXQfkyn0_6b#rebw$>^ROWu@
zV`_Acmx+mHY9w3%1Bxiioe^tMUtZY`LH=57sv0s`VEyCf>rjhZr#fa_c1?|Q{Qfs3
z4gj<Ga$aNz^-5x$n}sC-p!6FrIVV>KOGqy<)vnoPsh#|`*x&UbRWK&Rzp_6hNCC$P
zT8ruEZGeq{;NbC$nptHJCQGhN$R(%+Zr67=Hjt-4PUCetG9d=z=n`utGi#+cD&ydp
zOxe59(mEmrO&iDJ61U(Lm+M4Mri{M0fPjM<hzF9A9GQ%Bc(@@WSBV+?2q_El;Jq5f
z4ww`=BEE5(zjs50bS_uDY8it;<(L5(weDGxAgvJ`bN-Fi;G%#@sBcJDq?R+qGcIe^
zk0>T73;Ty?wCtB?41Fn6&E;t>H6zz1dg(wX>!d?aDy{dJ;jN^dDM(j$f)P^!Qq5q(
zH6;m7|GB@$S4A>@LAb42?-!L54<U*b?+=N<T)0z1OZQ|o217=gtB(G921^KAzlx%|
zRA1g{YS$uQju0|+YCuef<iKw5kyIN03k7!y-0=~lu5#~%c47R0w<*)CxMn#?8Ld2?
zfzcG(^`n2(ydqw2<_LFdwRca(XloEA@b0Q^a2bFjET637M?T+%Nl8T2B;S#`h6Erc
z^`Pi1!u{Z-sik*jWqj;jq+Ed-6HMt*u>%5^XpmJ0t=5>VW=FZ>(vOgmyCa`p?z$`x
z4dBF7P;NoDZ9z`VH3YFa5tNoYW8^><K3Or?6WW!lxvP-g2PptegcWR=a?F5M2RFw0
zG=h}25>i%Y1`K_scA;m0OxVjHt*v^*PX=)lUjuIenIdGF7bB)6cza226m|{H0w<RU
z$C0&>;%09^Os;}BgG%;*3x-au@u!A9J%<Bk+f?K_#A!;*S}_5OxQW8YH()9lA4G&k
z9+s}9lrxCZ(fCV9R@~6+qqT($o;c_$s@?g2{_a2j>Qj+<0qFYV&CRr|`o=lWLS(gA
zAWc~TZ>U_|lnCWsT{EUUS!2CL*BGl&Z@@-5Bp`~P{sCmRijDwP*efL5toA2oikO=R
z0&~g&*}OPFv-vEEma_I`W(xnvxwslPd@qebdVoen+HSD;MT{Q9pQ-k-0NvOH5^DYN
zp=LLdT2{NZT3XpK>C}KNVbs-&VI0-pL6Y;M(}^bFh#VRp>Y2yCed{xX3%JCUa~x&s
z8a-&Z0WvB0Y+R>XtBFlxLzANu0SqKF9kw*|!ARls*28k~b>HoB^h7su6Q|5YKPVqX
z-nvTY5_7y}@GsRcu#cFR6PWDwE>Ph_{NR5Y??Z7ke!x2mhR^`|m{MLgrKz?8lhp7r
z>Sgla$}`Z3US)5cQJes3AsfUl52v0Z*PF4D$CN+ptQ1R>%}Uw=lGF`Lu1wNaVimY|
zi;~b_8*1I_^`|cVuj5=EFeqkrak;u0pv$I^DT<ff?MWEWYH_r+Z)*^zgk=O~jXUj2
zW)JV4xec>t(?%Z`DB#7=nJ{Fj0f$>eth?^AxOA^!%50(-JIFSTVF^w+GsV|EJFyv4
z85JmB{hHos5?!Ixn*ke<6O5YpV<I*IxG2hIcVh1MMp{h6(kVx9T1bS+*{OC31R=*P
zu>e9<#%}UpPSJ|w05TXzVTznHCu~QsLSZW+QDxvfp|yjv=Fdp9Gb6`raT*qsr#jmt
zumj5I!cht!fEDV?6;y^hRR__vHPc%dpT%-P7Gi%Cg$Af(r$k<)aABAjZ7M3wdrD)Q
zqBaF?bTPRwA~W3O(EtS&rnE`S;#5!sRV7Hqf^DS3`Th|cl})2!B23zlP_tufq=f1`
z+dph(zCi=O-b=!St34SE8*cRNd}dr6ewEW^P<7m_8*ceXKgdfH(%m|1E&vcP7*oxJ
zIi@@50$7KEI>p(sr$}aZ=w_?5*MO#2D59B@xp<t38}TkdiSGZsqupTz$3UmBi$LQy
zxc$B$5`hLOU$_#$id>iWUiKN19hdN>xEc5DdS-H}xo+Uev?^37lh-=^t-c+S&9tY+
zEM;zhTt<FM5RTQAEU3x`XAxz9<ZzGIr*joPsVcSe*!Mu%I|pX!2CoKiiC4-x%R8Yc
z?;8K_vgLjGHw$8*4QnvORfK0ujS7w)v@W8B7NlN4xgFU80fzH^JcA)#v05GK^7u&|
zNKqq74Ji4R)ox|YKwL|*3E+sxeY6yo@?Spu>d{&V1y)MhRIrV~P2Wg`n~RZ>^=L)m
z;vK%^6nSe*8W}aE{7_dO!2VP^X6Z54<E`@rut73_8+gI!gF*ntGaNrLqh6GTLlild
z0pU_%h8un)2XyliSpXSwTy6k{M()=2mXCHCn6(ywEmED3w8X;fj84b0E9kfU0IbF1
zSZu#1EYW*vCb>*=WsKEWk*Owd9HAkICX}jCilBx%8~_4<bS%c)`)X&N=wrnW)?=nP
z<!gHeo4JXX-n%|dlvyD)Rz3Mt^JkzZse4lTQIFaKY@EalNk}_#H|tBsg(V(YBz$pu
zmL9}nU+(V8o5{z(VL2ym!QTi1SQbrp{<sETF69Xcn9m{{5%HLDH3)W}4@in3iQC@<
z|M0AY|4(RC9$E|vM9C~}ta}?cC~*PkOS;X2AUc@~EbnxaG43M45VJ)P^3DmfdjDU#
z-aokR`@GI1DS?q7LX|w%3WZ&FMS7qDvgnG+mFmiMO$rMK1W5$|<;G<*twb(cz!SC6
zwp!05vkgU2hzyHah`!>=R9u5FM2T)UwRf*O>a>|^6_MG>lMM+nU601wjpa0{nYBBU
zdYet!H2XZ~{oV`6?fxSH7vEp^0zB{eoO9my!$S^mwP#<|9J#H_;v=Eu!I^*Y!W_#o
zmo&WZ*4OXtKJ;`gy&ifQ>z=byJED1gVGdbsxh$H_qi1+B(likTS*Gwaw6-jB^!gch
zKwNtM7gyVZhxFI+CA96S7r?C}P|vTnf7Mi3)-Pw^^Bi!t+BsQK=$y<Wgwa4#%M_Yp
zVE98b^Uv4!M3%39cc{$@g!14*gZR`72Or=(sPyV5cQBL2oEef8<Xx@JJ1A{!Gdg?|
zVP&K)3dt;(ss-_S<Ka;2SOqO$=Vyttf-U0>h<7od26Ki>T=49Z#JuQ{IcoiwI)<%t
z)rkT)@L>P>{Ey9!t~}E2Tw0i(zg7)EN4`i28lNA6*p}AC!syh_SPb|yyvnkO%ir@0
zNq(`IFchrP)cK=%N&w!${R<WcCgZ5_w7>7+q>zAKwv=H1LH7QgoY&pP%hn1a@tRUG
zhPBVS&CL|-qqJnQxH&uZ)Q#*eagpgQH=Soe1|P0=70L#*8tz<g=akJc7$X^4im>$^
zb_LXFZoSQi!h)oRYhSuN&(!VOzhd{;O^Qz|UU670M^l25u)upg;BtcUiF}lF6fKUY
zs9|OGqe|Jzc^_EI??l8^5IS$Uz+HgE1L=>AjIfG{<AJ+?WEUpi1f;QT+S50<IO0tp
zW$A-QLUYZ;lk^xq^W1vg_`A>3Xhap{O^=X(a}C1Wv|20WE?Orp3MdNH3Y$eoHs#w>
z7yXomSTk%TIgn8|C99EyMgUXvn&}k-MsDMzaQtS53(cwQIJ28yE*}y~8w;-V(Oj~C
zWo<$hniN?M{G+WFjbHxx(+|(CmDjGe)jB?vZvDm`F?fuxfhEso5aRyn#U*y0uS}PH
z{(U{HA4;ZG^YJP}e8owrK19x3d{AT3&r&6))&e)Ogn1<jSGMbm^b}Dl<F9F(c_kI1
zX|rsWAC0P1&O8OBGqZm-HNaX@(*$-M?@nuz^qu=GPs|y6jqXAf7du$|szSqjg*Bo&
zR_;9}3gg?(u|q_9UD~w0Sbes$lE5lq+4U&DxW4T|<xtaVUc8Ts()r@bWNwVT;1f#Q
zP7I7!N7djqPtNsTy=b_&`d|wBBQg;~ero6CLB{|<)3q%WyK0{3%F|)ptQBw&VoPL|
zpvCfMe^wuyH4J;9v$j}LI-)|PuSA5e)bMwWiZ!){Wy+Q2;9erwCC)tgv}RhtwWb~n
zrZ5etXSuXVAxJWqbwi?B>lG#0FGqb+Q4$Z(AbJ12T}+>*XqBVGTI-(uEQx&Rr%=w)
z%!3J1*<%(&i;Xi<k!tt+qhe7&u6?e4M0A-lG`f12Xu{L8S%X}^b8cpT)-2!NQ)`};
zm#0RLEvx5rUzk7DrfZUruuUz@oX$i6n=n~u*uSy*sh;kYB?<=?Tw7_t&Ibqz$MKlA
zEk^FXvQ#IKOb*UhU9j?Ovv=j5#qn4ZtVdXe#C%T#Z5ET8@2d?)nm-e@jM(oaON86^
zJ?ecaPi)CxQ0)E0oY_S6U|T2sDK}yO-dSz@<ggQE4(>h&Zl4;t-)Eu5O*<7}4LcuQ
ziJ9K5_Tp4VJA=rzWu8jd%EIjv(B{iD$ow{hdX+pEo6bG|#Dia4#NX*Mw0h)z-sA3{
z*m?T3qfffQd)xJjs@gr@Vg3!*w}Zt+LWa+<E<s3ZU&^3Q=CKWZ<jR57`zeiMY~E#K
zB&(Y5zP`+i>sI%Zq=Kn_Cl<)~j@)MsI*X#@th5d&8}9)4T)G*WE%0x35&_av2E=6Z
zy;{alYDMkLW#Kj;`T<%MUH^<S_KmBUZ(hC%OunFErLd)+%*(`<Ub5$%nksfT{fMp-
z7*PP?pLb^HLo}d_)cRtU?TmCYo>v3Q;2YLq$2%uy>Heo?ILO;4p`NfoQFA0qr+DAC
z-4LtVLW3n&_py8kTW%aNz#a(RtSp!e8ubAwBo|C0Q@Y&j9dJiTYn<~q@sZ^8QJPwW
zy~LL{Vn4Y-(ynF)+nXseH|U-p*!r#xe~JSV7$wtuT4s;>KKS^{ONsi&CP-7YkKpP>
z@GPNa&c5OQx-hr;5C7%=@cReAF<tMG4<W`ZDm>lAQP~Eevc;}9+~$rIgv`IO*!_ya
zQYFJGKs~@}*7x>u`$$GA9Rc$Dg6C3n8(;KO_D{~UEE&6JPt>d|C;HpG>gr>*55VIe
za23(hrEUPD|B?QAUc6WJDPJKW5nQ&D(KSeoiOJf6?iW`CSsTQhS-2$FyQDdnJXRE}
z<{DF@?L@U)AaG0!5Z)7pzMJIno|;W#Ej_hnS%^)43H1F-KYhg7;zy{e)o)$#VOVnz
z9=4ywGm*18!!A^)F*oD8-?RNPw!_SH+touCC_Frx<;7xF3-yvR7TGFb-0+kDefn}!
zM`p?jnV;D5Gz!%9tOg7ePwc!5jYk2pG*CIP%h^nCn7uIuOR-{b4KKzkAwPxKB??b!
zfa^Mh+;^B06#Ih<sBWcj%{<b=it&0cv*kk9P+1l`bq*aQ{*ZD}-uvt#<>$=}g@T*9
zfXT9=DHJ^qgNzp8tluPRz*@ndHRX^Y)UnqopN9z*xQyC`*M9Ddw@EU=&qarS^&70!
z(5{iH_U+-nHg<k~mpwHsJ$`KvPh|CQN<jC@oXG5;GMYwSb^bJ?nh}Y<Vg~E#DLj)U
z26-t`%{?z>*XzIDWVGm3OmF1`z-jd<y91j%{s*EIbbXN@1Pe>v!q)i5s8`>j{iByC
zZeP}yxyI_Fe017WC<GJ@iVuqt|9=*_YLaT<K<Br|4?g%MYDtpBw@d4_ziESc@)0#H
z5cw1;R5D&z6udn;K+|f^!e^Xj$M$#jAw$_Fzg~DI)n6VhcCVAZHui&;aM0PMr`^d+
z85SrCSJ)!h+q9;DW64{=`oCy%=eL|`b8-4DJ2sJ?h5=gV#YoVP{gf4pb_$y>?^#$_
zJA}!Ag&@#Z^9>6aE`tHCzpeZ)li#VYVL?fMiBo5w6qF0zU3mm7Ww2UUS<KVrJLHn!
zNepv?Tq;QbV-iz0+{U6^?;UgA1n?Zi%nMl?7GAn}(k2jRmQnc7Z|cfWeWb4RjZ8hZ
zLklLYC~dnFQLns(CV<3Sn*M>efIf7w-C2gEs=4?e@YJ+ZB2cMmQAot}Cw2Sj0%iH7
zjgGdox4-!Cx%c$)xHDWe-67oN3dKmp32}?hg?E<S@><kHR#>dIj8836ZW@0?P0U+v
zqH3YErTQA{J-&by&XU3$Gz*f?Z0>dTXAhsL306!%)2}@_N~L1O@(eAKt?A8d9x=+|
zhb5OwK5F65eXlk9lmF&NKmO16Vv#QaVWl?x7UzD5$s|Kn7mi1-Vnf^Wzr|JiTGV<D
zc=3S1|2G}_oO+YA@7<P|7gT<}wW(>_&jO?X-!e1BNHd^Q9LFX%SnC2M{>O{=0@TU*
z@*hR3_0>nd`sP4SQF6jcvnI&mq<^4`hm}`)%Lu+oqhju*Kt}%8HcQtlNdj-n4K=#)
zD@guYrM5jzRr_>SDsf8qPshV47cuMkE#a$dy4-X&mJBvr4thM1Hb+`L{=qljSereY
z%Fz^-_2@6v=^^$2_#kNQH2$bO#;ew}h$krRwt2Xp_R8Q>(0+}8DNXWT(D(QD0QGwx
zp(V0$!&yg&svg66y-;mm_Axk>nJb-aRoBQ(Z#uALt{Jvc1w+GpC4sDKcqI|FFb(cl
zuNvuV1hF;c`JlR^cGy$vt`D?afA|dhz;xDhE_W2h#$OBRpGcRbS{MIdT_*L)17--%
zP<!feAC^$_=wMX~tY>;Bz&~v?cl^R23Rgw8x+K4n5Vne}@&R3)zs6_4O2oqkc)z=D
zWg)eHeAi||KjZtNOW|Xr-{aRG6#4g+XmtC*l#U&$QP>uZJHd_w#Cabyz~ynT(bQN`
zEcU}j#<_Q%lxxOkqHdiUaccqNxXL?qnQ^)S8KFY+Atp4<g3STsZ(RypJ$V1ZS)*LT
zJ@x6O%VmeVib+ivQidWpMXCEzc3frQBkJoN+t}Y;WN!b}y_541%_^?dd7IQ%wk#k#
zG(5H1rjY!^MT*v>m1A<=926o^XW<1(*2zz9%U0g*)yB8X{n7&=z~!mOhT8Es&e!VZ
zlUU!c0r?BTFU6%pqkrq$u4yvC<&@?JN{FaVxe$R50yh{FKUj#v4xp)X?Os@9sgz1}
z;O}ce^Y!B4@jW+9;2K|LGt?eJEBG@&rk#;zNdr+N8mq#(H134PU9I;&*&RL<RYy6j
z03L&6M|O#Eds1tX3y(kZvlbuRVFJh$3Wz`1r?pIqSv7=*8l}RcckSAx>w<(eAA>Fh
zW7IFQ!QJ6ZVkRJrHNyF2mRtCqTWxP*%^~Gy&j&Rm(YlsEpoM-*4Ujgo)ksTv`66@X
zc2?1#f8_a@14nMBC~PvZi@G%x_rjPmzjn7w@N%qJ)S!$5Qw$#)aide!yryaMX3noc
zoD?zRTNF5!5<D==o8#nzu{aEh;nnkB_e`xhGArL{)=G$RS#{j`Z~jha=CA$J|LV8D
zsuESJ0Tvh0pBhnVX11TH+SAMCs!}CQ)%fEB0IxHa@w}@zq=wLZ-z-ixl#iyrgu^N_
zWgkVQgDaZrmG|VQY>w8O5k@KK9o>L?trx1qa7tf2Qf#7_74}<fHpG1S7Sn;sF#AnD
zuq-x6;ez^@_ou6HO#A%x+GbJ$UdG53Mak9Jxu({%=`b;-n+3>U`swDfvwYjTvsDLY
z<MiTCRg}$>^8~Bd1fY_<?!%_D5~_ZB2?GEtdtldHzxT-M;fw$SmM@QrxgJsWg;0&b
zVY*6-f|!wUr|K5*z;#&ecYD}7g0AEIFH^9*aaJC#9Tb_mfIpa<0<mH7kuJffg6-c%
z(YemD0H`Ky>)lEY1N`lXv@Ts+Sz=%c_5!Evy5(Q;3~8y1a%35BC177iPq%XILSowK
znr3({3a(%f)Xd^iMJ#e@1SwA&b&18rvWcuKYf4nFn9Mqy=x>}G*DX3MtfE*VeSR0^
zGcLw1;=l91$S#J92fD2GpP+vHm!tgNXb6G)&!4w3BwD}iga)YQklicG)RT-vOgrXp
za^nBj*#LAcDcgj48Ti#KC(Jgv?ugVx2zT+o6Ly?jofzUeJ730`h-_m>*GBo&f-f;J
z3wu|`yVAbHU@^j!L%XVlQ6HU<)5?<C4>m>?Lj<a9B4NdW-=N0RsrAS?5d8K>+MO$u
z05u)mj9K-fyi@E49g>%>BI^GRixwK;{|FyKgQZpra{74S;5($AeMr+c!btwBfIi)R
zEX#~Z4KWslKKkXWj!B-EOj|58T}-A<mr6x|Dk&??6RJt_VY|y6p>VWV{A}-_3C2jj
zzB`urlSG*GvGIZTJwkAJclUPmc}mm~{f{g8dZ%g(u;27DQajShc#hu<HShR4^mL%s
zNZEf4W4hu|7`n00t7+piw=pkmwOws|m)d+IgYJ;zeU8c$C!II6Ti-(9rARPOOP!yR
z!fGhS0v`QVhQCbQr$539<IAn{oCp?w|3^dqfm>V{*D`GTspHKLd8AvdCG`7^sM`VM
zB(9+Tx+AcBVfuy$X57PJ%Fy?C8mv8N8a&c$_<3g0sbU!StS_vFZnS{fl=&!;wJ2W{
zjRyBI$;|*zN$?|*I%d^#ppmHD<L&s76vOOd!vQg4c+ATC5_ub-^7{R2=YQm%LYV*k
z*MH;pe+pzoaM~B0DI>LFU;MH%Ph_U!^eF`Ymw>r^v9474Ri;e#6e*;ZyFlI~cgHzC
zo^-ZH8;<)C_Z&}p43$dCu2h9<(KQMMf+JHIeX>LaeytdB5zcG|mR)YVn9~CJ%|e8$
zWc~?P<$eXgUO8W7{Sfjm<oDMPy{~N2*sjxHiy&2rdY4G=f00xC2vQI3vsy1W0CItm
z&`Z}+5Hd++`(>Ka`$JcT-v6>U+)lY}Cb1akEi3#ng10Oz?pj%-ibb_iYuacYH@L5k
z0x6~z^v&y77vJ#k{)%H)FM~VEj%Nq147k%7T$^EC%`xS2WGdDNCbpb;MP^TFh#?%W
z+QO3fQ8kosTXZBUOSB=Mi^-1fWT<dmT8mrz+N-cK;9t?_9G+q<N*OB{9YZ6cR$1EB
zrs%@O87bB_y5o0}gW5+M;zQ<X|1!-SDPyC6`dSLX&qPL=8c=JyI?pm^MhoI|8TCbd
zyf*mAHE;cFJ4K?5aB2mSDwZ1E>vzt7j`W!yq2b-t80L38+rA1)=qng(Dr3TJqe((l
zRLW$m<wNcdoG)F?ME%!ld*}uJZ<RQEY+L!;j8N&Mx<Jma|4mpqrz7)VXn386ofa7c
zV*;eW&QgSO#Es74^`Zkk+87~7OffD#xvl(ja#Aqsov*oo`R?kWGMtBYKhKtFxaQ2k
zih6_)HR3X4iQ$aHPfXLor`d8$1u6;=<k;ZT!ZVMsei)rc@uuH>7=nA~;QhaheevJ7
z3l`gq;9^BWVR^DF4m&n(pI}5Y1lkpcN{dYr_JmCGM)9awBOGCx%G^bI;?AKPA-}6(
z1-S9nGraMbu~v-l&uE)RQtCk2-*pu70~15bYeaBZp%BVCr;AWqmED8_1YjMdU|=9X
z__JsLPAwiRr)tVSj9n@XOSgyOR2y3F;sv{0S)RKyZAx1{p0ehFh#ObpVsxyS1x?-+
zZ-X+x&u#Dsrc)4eEY12XA!ZJ2#cED^sGf~Fm2M3;M&nWI+fK)}jYD74fnVv+b4MU1
z1*kYX&&BVvXJ7DkHc=;#y!H~0^2;N7?=B_cbf|JQ<zc27X|fqfh;7=?qng_Jyj5j&
z`SIFVG_xT$(>792pJmf-w`kFVXDt%*fvea0V<jJx_w8&;+=}JJ2BmB3&;3ek=CA#e
zFa7o#3>B^cS)0npe&s?9y?=9Y?8hcu6j%zX8?e6Ud(|VmMuPnZfa+!up-}TW*gok?
zf^rU6-wQhJ-z6AX0%AWe4Qx$c#VfsSo`GjIrjK5k4Y7Z0gaae&Bs>-H7Og2K%U4AC
z5c}q2YDxx@l<)9L!cS@4tH=|A)c9=H2ZiXo$<nwe47=W+UJ4{8qe;&YrwYD%$aZhi
zTNzkISR=eK#g3O&jK5?FqfujuJD(^kyshiNL4Wyc=M3QT@C-T`GySxEga7aaz;0qo
zwL-+mUKDh<oOya`?EcGG2f!w(iBTgL5S0o-VvnGc6w*Tp6L}nrqn8_6S+yIxTD32H
z`G0a|)#9jWqP}}zR<`_y@-0?rX?H%BkQz{b<$HZb@6{q5#Q-k}C)KL))V)(w|0_vG
z1&lucf3F;F<ytY}vBJH5?B*<4s4tC6&YGjKP>fLVF3nm+%F0jbfmXFl*4C!S5RI}T
zp=PpLX__^dZGyzb4O*@)JQmIE9R)5jR+uwTM9W8rEIB2e0!@f6bX~N+dJt=2u0j3P
z>30l9J!*A8I-+d6E%!bcRDXAj2_z~|KUf3ysV~SR)1dvoWk3n>D9$^mzrX+!s>2I4
zS3eFj150!XZg;|BoyHnt1X*S@wPRwI)q$}iS_z*a_WJ1s$*o>E^8GAw7{)YWP8rjv
zKCV~(H+N&c$SPs@T$6HQ^O<>)QLc`d>^MB};NP34{f~I-g`w%oKs$!WJt8;;H1_l(
zZM2Q62S3`not-nEnNqVS9*aYM=Uzb;CF#OFJO()CG^<5AG``PWX{>;lVi=?a@22w<
zHx@T#B`}=CNg1&uc%$!I0{y)VYZG!yh&rzueg))(H<&a_gN3sY{RZiQR;x;NV-Wsz
zkQd(a<}P@-wM{Ok&B%MO`jPJ#xhjkK^yeVzS&&%U9I6F%cQhhHeV5dPpz$xA|Iyp<
z{*$_ej4STD7|^mO1cU}gvo{(K^#a$xZJn)D@w<l~e{!^4RG&r5yHfKb!%n`ZTJUxR
zWZZLgd?rXD0r_<L24l^5#N%F@v}(wC77=>Kv~h84w?YG9?-zNFSnECSIZf^`fBa)R
z@h-i)Xj->&wg_X(*-+YzR2Ys0?9_(NX$-%($?d(GTd-n5G`C5ekO#JU+R)!cK%*!y
zP1uzPSGR(^@dr4=|M36(iQk`70J@~iu!V$EV4OVC5OPw;e*yg{yM39N9Z8b}D+;uf
z4_0xA(iFNMDe8>4&AIy~CWZTNa*AZ1BGE_QOrc*IJUljbAD3Va!IZqe;@EZ)M~xEn
zLv>)%8&?yzb>Lp$SC@H}K~-MheP<AY#CUJs*a&vf?YQ6tGeN|!7~T73<6~q}$ouaN
z@C)r}n6QPT>HUr;p_QJc!WmZ%zkb4`lD9@X(gb<_qqDdOw0}opV!KF#uB;B2p4iAo
z6RjF$g#zV|U3L8W^8@sDU+X-JVXW^u2ai3_74$1R3iU;6G5ND$5uv}_9UK6=b(w$6
zf&uz%p?QL{JPw<79vQwQnNsZyDs{V8{sj^hXge_ad$YQ?d%ZG$W)SYG2k`VoTQHa~
z#X3E#x+m>$of&buR3y}Yahm(}vZ*XVv_xvxudbs)6#grPTPoE=DLgt3-=<DzCWF|<
zV{HN#-m_{j^LocG@YmL}N^I8)ivQ=lX|6DMr(sy`$Kqmb@$_XRuUA@k^!@7gA-2)t
zz3<;U_cK<aPCW4wm(TNw4^srPLkV4bB_S0_|JI?29o?%T^9%X{z<FSuQNCl)=6&Gt
zLEMT*xj_3W>c8=!-##?iL|Jhm;PfOpGoP2F6W4H^!MH*yh5Hm=#b3pM?y{^PcMDwK
zeqfHW@Z{=OkerZK>WV)g6H7u=u&ouv7ba<CU_~+gPK@Q3V85&F@)DkyvA-MG=LA&$
ze>@JBL8XnGQZ@im{cFGZB+01Q$qR&gB-X2p*`1r`e|WbO9C16AuyPmGfg>RAqdLI&
z0~EY(uDmw)1U;n?Z-P-BBp7{PH{5DpAEV(Lmd&Ji4D?r@YykeHP6vIZfZu?n)~r?L
zla~mo0<|D0<2fehe*hb=<WM*2i#iL$+*S(3t8ZodUhB*&%U8D}Q(f|+Hq`y1iU-cL
z#&Xjhp&Jk`&r>V|>^v9=9fxDou26XMHuG)IxDVC}3HZSOqduwke0a=mhubrH&`*Mu
zgIIY;W1?Cl^d0Q_M*hJGP;k-(&LcPKf3p+S3sg>?_?@vyOA-%5O<)>3G@ZPv3x={9
zZg3um;|q72jlHO`kVL9(N5I;u!%rN8IK`X8H%iladNzQ08b4TMIdLR!ac1J9&l+*H
z%UpnGX{WQmkas<6(8qN_nh9A;q$?068gpgSA3QX=^3VRx$N%{oD~TFSjco&`me?NA
z_-Rr~;&~YjOXNn=)_`=gZW~nm=yia!zpV%fr>R;PWTeOg%0_pWNFxS|#w8YsnO^J_
zq@u=L*Z}cdBgG>@B31}>X2P+B?P4mZPdUm@CFU<~+jJ#SCE=P=9>6$mY6ePAu3$}Y
z)2vz&q)xqgy0a$XXK8Uq<2d)01HEsne-0NKYR_$nCm|q}NBy2=2*!oX6Fjo6<jE@C
zx@GA~bKY)HFp!Oe`NEvSi@>|4Uc(ZgHHdgWK?mA0TFe*6+k3|5V#E&EnmzCljCqk5
z3522mx`DwZ^>c+=yMgsRv<YZBkji-o+x41-pwn9plsOUPE+|G4lJOtXrCryhAmL3h
z2(Bh{WLF$1sf^(m8({UYiM0UO-u*TOi^DK=Ghd1oED@negH}jE{)j*5raDmTni8NM
zM$U?#xSE&%v?*WqEu@*@@Bw-uCa4i=PzCf&1**l-TGSxCW;-90jrd$#R*beB4&oG%
zm=x9lZw-;-IZg_=?JI@&4tK(GW!uI(7Bq03K#02TX7mwvI*K|XKDMtZBD9{LXumU;
zHH0k%9<}dL0#AX;2tluPofdd?-U%2?<nT(3t9!7`RKkfJ&_(*Hbq&f>;M6aSQ(qL9
zh}$~A3Y?6P|8~8;^QFs;=YTX16=$f&>!>*Gw$;fIx@i;WP4U>?EE-ZnoY66alC=A|
z)B-#VmqDmJs#4B*w+tnj>Z-)GiQia!uGRoNJF%72-*>umg}ty+D9(Z3B^2oi0BO~G
zO;b1o8Ln)7A|=J=DXTuqLO@7ooNU|m1Z#s+BLjx^Yu=QTn5HHe0Y&Ws7a5+LQUE!I
zSyP^<IzwYXS#Y1$=2wZ8T2q8<?Sg=@^xm<$AY(SxrA+MhS-4h7FQw<d!JH5fS)~O}
z*1l+-OL-mewWDF_3W?RMR`BnyIYi|3FaHXk9m^HwRW%I=87hbo(D$Clu!HZ*vLLWc
z&<7JitfprVy{blyz|+T^tO(*doud{OO;m`_vqm{Nn6Ms%_6R5%Zn85zE?sGGTB9U`
zK;Aw5(wi(W*cj4FedkHm@fCU6q&Sr_wS~X;1DO@2r_iaVN(d@ey!(pm-t!y(Ee`A-
z|L?#1hkyR@CU3MVqKVYTQ+oms^KI{N7(2+S<TF)qRH$+}0}A$i;$P#?s|VYx&nsU8
z1ot@#DU+o1idR-|q|V&O7j`p@Oj-?619}I2KHPgVcT1Qk)&S?N2JdwN+E9P%f)Dgn
zW26)lyQ+E3uR^n7?1)SGHc=*TocQSeqc>O~C<~m%h{8|3`AnrxsXaU}F(m~5T-sXU
zGNHL@ww2;Ri49o*T;*5~8q&`%gpg9-EMTlHW<i=7`1>NRx_8e?=h5AtgHF%4KtmFm
zE1Mq?e~V(Hew0zmFALyrU1u;LcCGN97KOkoq&-Lu#s}PMQ2G9{89+<omzIQ=9|1MX
zdH@f{e*Ey6y10$elp3{>r*f%pL(jQ!uc=KQ&ymO{X--2+`Gvkq(NqJPFA_dg!B>m{
zwo`{J1I6a?G)&Bb_!4i_n87DTOYcu{%l*H9ZB`?EzByO%CM$u{s9rBWvdm)0jF2V4
zQg?0T>_fAQw_pf7NZXqn-_cSt`}QnT+;A9Z7pG{P;M~+P`W__z+~F2JgsH=)Kc7tN
zEf22^v(+*!3{EXN#w3i!HKvO=E^_-j3_ag*9-dAJb*PQD5D)p)vyby~H^59l3H+Q|
zoo0h~`<d}=Ig0?PXN|NoSjlmNF@;r`eh^>RA73~Rp$A%-U@o!$qbDTc?>bGEHGmtx
z-{}v3bBCcGkW)eG_KEw^p&t3**{PK!SU=33y>BTLlrNVAlk>a`BWF)Rppzv5Z%iH!
z)R&6Fd~?iS8Xtr(Vz0J8Jj75bWu`#%?fwq|sM*)aWKpVB_Nw|W8z)|kY7^8?%Nsg*
zn$Z-PAfWc{xnvN~&NY%fivqX&kWP0-<k8!&qJ@*B)K_qpIle<M785oLheLM1*#%s6
zLRZ(bItx@B-itcZMPM(TW3Cz|*vpU`yVovo7?bw)zP1#i9G;H0auI<XA9@Pu1UsXt
z6*o$vKPg0V59fAlMuB3(s<&3#n#K;5dhkTEtPpyqu)GyfZkS^W5dpj;r0Ly5wiw(%
zUe3g7i9PBq2s2#V-s+T=^#Xv|&ITMkU8vvjup4aW_m_d^rcn7<)9P$($i`6#p}HF3
z?4BFI=R+tp8`HBS`W9vGCd(S5IUM(7Hi>}j=5#zyjq6VH?;!nd)PlL?KlQih#{Gkj
ze(AUW-yVYZ0Dl!wROaa%huk)~AT%P;xrhGLflX*6)s+DLzIfLz<Q-9QsR8uX0!C~S
zL?QHhfdARepO{nSv1j@sLW+lGT>3sKf86Hi?iD%}sZ$x6*SOubl3Um+wltux4i5F)
zTprhIFocw&Xm2t3Y2HR}{*qq>&=q<<6+%8z>ioq1@_?IS;9=<{*h-GbL$WgX6xX9n
zbf!N|<1*4tF3?)&eKpeJ2RHKs_wnAE9=2K?4ABC;a38Sv^$#}iY<RN_-(G%3YHCtH
zfGPFGp#=z`?SX!b+RFDJbL)N{Gw83V<B+CV+3!Ga0EH_6=c_i*%WYTmgGI{TB_jD$
z+z4jv1)ZfgAkbPQP|UAWnyN>-2s`TQ+=*X$=<0;CEaD2slcqS}HSj~*$TER_hGdeQ
zyqslvBJz%!X-%m2vssAX{|1=5?*RR8;uHG-hKhJlo|lu{uE}>o&WV-BRi;mQ!z6%O
zeoi*M$?9VkGq7VB<$rl*Vy8K*r(Nmfzfbor$tvniUfS1rNoxMi?a*sjH%T95cZcIm
z+Jp8E!ysrxIN1IMu4`USfmjiGf!tB3G7cZ)ALEyd4w8)y!5u_J;mNPj_>7T2Ls($j
z1w=%kHaji-faOJAWl!50yEJik7<|q7v;TlW;w&I+BYy5Y@l@ntlp<@%j<2v4pN-MS
zhK#DVFWoQor{I(pga8lLPtG&dbteS2H-Q`=e(wC)qYC0|MeDs=74dY&AF7REC*G3U
zytT*1wWLa6^nBMrZogOwP%@lAFOm{#0w6YHD!}cBVUny?6n>_h^V;nY+OfrL*e%?7
z%8?yz%IaevhTD0}3M0vWsrlni4tcS+dEG8(Y8JSUI5s)QfTnEaN8zF^TJViT)JW~|
zkWu!pUKpc$j8db7kI2!v&cG?I`&bAqWWBKjAjEU8wDnnqZs>f-ISgADHLC`*M9TL<
z@5HVh>nj4E{m2(TLDQEd?Rdw@-n>EPI6bkIza;XZ+bMx<S`)Uj!0_x0meQ5JflC7a
zE(@5MVL&J=fSV__QxGU%ZW_xG@j)z=aC=&4-kTyqPAdMNTQzHrYKMpz)kKOk?K=)w
zq8+VfTxE?Q`t#X+l&4hcd42W#=1-7Te~#N8|Ht3!PS1bn4?gsze+76KIfr_Ov<IKj
zxh3QheMaPE+@93+E^sg!jU0XTn}DC~$wTY3KTCxVol=`ms{j`rx!bmbSilnZ7mXN+
z&7QA$EN$MuiM?23$-bc6qS;Vsp~&%KZqsEDMaU(|5LZqFX-A<uyngc21?R?o!o@dH
z!b=0<r{U*ykLprRolx>g{wJFZ=BvOrW5t_@5Fy|~^WNfM(N<;6=uEE|h$qbZD5d|+
zrM0zK!4!b0!{hkFIsrX>Kf1%=0XcsC*B`7!&Ox>q*ae8+!t7TN{m_LjBe=IDjd^S9
z)@~ZgmS@1>6JJb{e+9W8_6}jL3K8~PjzNJUd3!>lrKKb}R0KT9Pqxcw>|rt1zBk>5
zLTo1>6@GWGtJ;_k%8a9gZ?5sKP-rr)!U1}XFAYjxTX{KELJ#AwQ+IsIkAUXQSn#Bg
zIx8piD;k40a?+Z-f1=P_*`}xQlvYKJ3b#Kzh10R(4zsFaa)17v&&<wNCjp-v#VdN5
zm5hs>Sc+TDdZ~Nm5ta`-mS@jS$fTco5RSev@RKO!6Epz>sIh8Gd;fYFybE8LL$4tt
zs<vVpXvl17{qT2aAf7Xeg0e0GGW<w!W$lxizZ^SPIt-FL+x;<wf*aV?#!}#s_OQzh
zGCQ5rgPpG(g*;v=q25;BbQ%-$+4l&yya{*V6n$p2g*`RGJSLwYRQ!>42eN*Z+)ePl
z4Ya>Y!|$I%F;K;!yUd3}S|Yeawx{I+2C!n8LlDQJGSVi3(~*%+eB|on`DuEj&ty_J
z9s;^gwRsVfqz3I4p-4qSype+TvLQ=Aj1@@Iq7rE6GK~O=Jm78<<;Mar?4G^@Uz(gh
z=wNb3775iDpyD_9oO$CK1Y4O2#l4oL<ww4#EPs}tH>SXF6n#+KmS{9{+>M^vo^30v
zX}03(oF+14%P;)b|J?AtrM0su6-R8ig4LH&)F?s+-1EV?+`h{8KeJ<{{;#rD;7Q2Q
zXeV@ZDiZfpwNEbdA|(6>bf34wFhNY#jX9xos$prP%HOR19u=rMj^nyo6DsX_#LbCZ
zZe%P56DQEaWa*KRV$=E@wH|=kYZK7u{29iz;p~<>e5m%fh!?D#O9kvs|H#*`kor9J
z8^3=NVr|+#Z2c}UauSy}InYq^B{5dk{*#-&H&L^|KLIeK`m9Eap#+SSrlZb1jumjB
zhvT*&Gh?E7H-~TU0>DC~9>C!#mkm+zpPBt8AHt(w6XAp2+zti~(DD)~AQb<eBs5h5
zPyzpqY<@~(*YtdabUr1<%KGKgJaBX4M}E*v5GP7dPyZQH=@-8nk-yY-m7un-HOqs?
z>|C(jSp8lhXKN$xZ>>Io?SXqfGWRJ;F<_6phcns2x3*=&puEKySnT1!lDK8DCUqJ%
zY_eXCULznRxM&u^N7M2>(yyA{Fz~VfDu-VxjRDR$!|{DLEC)srj+oM_m~=nHd*iKI
zE2<!|jwu0PdNV1nd6vK?N(_Obl9Yn6y28l!r7sETjlqy|;3&U16e?7a*xy6<F@!%d
zJ>~;nN7_S$+BY?7>q5AE-W{ip&E@{P_RaA}MjNr493k0Iui_{`sb)X0Ct0BmZ@QKQ
z@b_!{J(hOmx?r@m*q9o;JwDHjLppYs5I35=9?-8>r?F*Atk-{?)9Xc7Aqa}EiH2`c
zu*ukttrjA_7``|)x4I73j_h7Br|IGMU7o-6vN@orGpz*-!h+$ZbAW^3xa?AtkrV(o
zqDfSqxvCW`E}kIbGkg@K9est{9&$cK(<X2((4VqEh9;2D5AXhSt=Pd-0K5veJmov^
zlc3JX?&sTZYlRu$sNI&+_gc14*=IkA%)*Moijt_l62j%R(KrynKU5sA!m&(HRg!iL
zQRF6Ukj10h=P)#in=c>14m!k|1aPG|z$te-la1Roy#v8UA)J@6W)WyE)})}mvQo)X
z3A9qW<$^^5FwXCXg+ovho=yCR3tLCb|EsefdD<e<d0RYuY)4CUHzs5Yfn$%FYenc_
z7YRfX7au*V_Voo2eNVQXpyz674V#pus`2}tMw1S(8cJaf$fu8x;}i%A2RK33+gl)K
z77v?b(mXUDKx7oO02Uts`V0?3gzrf{v`Ij^?`!7(-t?vg-oQ~uNsx!N(O7wZla5IW
zi%=iMNe4H<(Icq=RTe%x!j=%3Sj19;H?Wn}3J)-P{zpId6~+;L>%%|a+1mg&vmS_<
z1iiuEC8hdp09A$fMc%vk*$yyQ<X=_adDMuc3coUodJS6&iHAx1+YaFCIqjfQ$kcCb
zrCLa;4?W3c0`^I9e%|nnYJQZJKza%Mf-uz}+RNd4K4l%)?V0O)4P`t~DgqyMbQMUv
zkSoMC(tYQAwf)}vxHc<G2*W;=yWhX5&A|=rUwOuJyDw&u5UbaNAGr6%<tux86YA9J
z|8%E`XioF4HVQZQ`n){gtht_;z}mAP6l^5g(X0m#3vq)pdt~5Oh;TM=9;8*iPMjYe
zoY9~Sp7!*d8X#Asbsa)MzrLPt^gj-2+J@t?ek06WCA}M!Xv*0=>igicfzY%HaEWOB
zA>%nNuBXE+z}X_ny|>U^q3MeurS|3~610UvvFol^r@!&=TDUz2DA`Ajsm8IAV_Ygw
zV=M}79=|uyl)s$_@l7GAl}W?gF=3wt;*&3>TtLvBL$rrVkT+CM4aGUez>K~I##@~o
zJUm#kJ@@1kURq%7gT4aEy#F%bo;lmd$uQ?tEl_RSljcvNvj~+745K4IIU7lxIE<|U
z90Uheg*Qlo<D1@L88!0v0}d)eBeE0AjY4xJ`8uFE`RN6xzCoBP_6XdUOk`eWc+MCM
ze4DA(W;c=iuR!9D+OowQ)6X~7u&JAjh>)P)ZPOQeeOkl1cE(1pze!1ASkc860(fV0
zE`kJ?UsyZzPmq~D^S-n5*Iv|}K(P76cZX3ocGvPjNk>&id}n^@;-OL?s0fPZ*{$tu
z(AqJezJf@7k^iEBpfTMHBENM0hJ&dcN7>HdiTi&UZJkg)(Ho}jSVrDzJ1K~1I8(|q
zjWA-**X-G;qgt9a^G1h<h2D@ZGbuTQoqO04tHQ&w=bC;&I?bBVYs6z*to+-3k9^yW
z8o>G?pYQuTK*;{E37rV}6c5ufW2fRCzy8jU(#;X$Gk~MRq}4-wN6FJL`G<P7-2lx+
zdbYd`Rb{v?#ueEWl!{p<06be=3B?G`4<`><A8I4x*fu;njM3_=y2a#a)Rm&gq&rMX
zzk9c0*ru1<GLM?VhCVwqV$(C`tKfR3n&vIT)kheB)9inJ<hW&ygb`JuB%?olWuo<y
z-}{4)zb)Ghg%{12JnSds+Rm2?bwAL2@t>f5bIeck^9-U3C9h7dEe)<u4z#!singp@
zvF7w@VYaUCNGSTSpxyz-8#TTp9UqDk^UQmvU9+F)>l&b`8@nhT=p$eLdLz-F;T*X9
zs(d?j0Sr%S(_R6UB?b0I!%3K@Sow*j=1>x7=uPJ@s|S=97a|w};Pibrz~4*!;l&+U
z2K1%_F|E2+Opt}*#G)?g(Q?;B@}HW#JZOIw+6crK6jcYQG-ZQp_w3*Mh@=!oYJ>0o
zJ(754LIGhR`)DT^j6Ha5FmfLKy19yFp%>2qLz}#d_+9B7W&Zb|pFjHR&t>WZl)v;N
z77YY9^Ke@uw9rP|nKc!UuI_&cN~V*_r3hJ49|+4divB=PFJc|xyUg<=2bGkhqcG1&
zA0WGLNs+TBonzUmcb1sZVJg4!&a9(<pzis!)}BF`pXJoi)*ZhvE%Q$$OhK3!sJ(tr
z=6mm9B1@Rg>==cM$w664aC=sni?x-{v2)Pq3!`Q*N$6j=<G!o-p%C@+FWUv1#3aru
zQ5-av;kk3?Uq+pW)~~T$w2o*xXdgwlIrQt=w}LVXKX&cy0p};!>GRRhW{lE<gyhe^
zb}qU_yY0xhIKDB0y^yCcHuTcVHDA=or}>$y+kX||1gKX7dFd;o-V(%xeX8Y0eVGf-
zr!aZZk?BkCzMPoN5a@8}q+aoPl@qgwL#=nm0RJdAI~uwUl&If;sOQd`mRVh9^fisW
zQs@OXlc5+*FiZl<4XUvh9DN0kuTbz#=~hprU#ZbfY7ugEyHjaQ^c3O#+QIW5eQus-
zhw~PFX8SjUadbF(2G$NCEp2^a0^HxuJh^rw?@Ti<f@q?Xs6YBVt!6}Q!kT+Epp!R|
z8J<;girpfcL?t<dyx(D`&+VPzpAv0(Ke(!@ORNKQW^<!x{_<p+$5cd20!>le)&rKq
z87y>CBb4QYKkIYy-F72$#Vx3iiPX3a8p{1>l>=zAk7CQ2iVg;aVveFe385LJ6|$zO
zY41L-+D~2{oS&R?08sAXg5z~2;_>fi`N;IVA4YTh;-&+ZfFl%-sv9IdGyzEE=)UqM
zp2Z|iopG}uVE$u&Z*lBH|L)&^>0jLihV^H>MQC{eevH;W+sF4NgxN6mjEYVmM+zS3
z-a}dNto}Dku;WB^g6cs0>@1``5KDs=sE&$4dcVi-@6|8`<B8`;y8A`oA6X<eaUy9=
zdzh>~DFO=(18-6_pnN&B()ie;QFkmDC8T)m%0F@|P=16JKttJ?JJ)CRuN}Q%A8AdO
z97BLJlzlyNgW#aI>IFx?{Ppq8c2@a7XBZ~!#?qDoXnsFdX>eqW<At+5jOqcD>c6Y4
z>l4e!%MB%NtWv}iL3tt}d~lpCmr2#1c^b4TRpr*!-~ioP!WBmWS9p?}nsU*r9sP|E
zsw(Jy_H~}7s?hd?fy(3HQSxXC`A9|C2AW4?b2sz%A?zQR7-5-#Y93#>tjv09n_Z>r
zHRDvPv)4V#i4?5zelvy#m4(H^u4IY^XZE^M!E+`jxwd%chS5CLPy6k?oO<xpN6#Eb
zYQNm97<RDe`Og)BRsO84l`eNM6<9B<jYS>encqX*U*5lW@@JNf2;G#?oNZ$B!fy0<
zGVi;FkXe}N69EQ5hsvXjuvNf8qUOxXQ7?I7c2u5^I+Lzj+P5<KW=9LS$CZ_CXIZe@
z0d9uvZHCgJ9AgtVN3kJloPI6a2aGgvNv>R?y-w_T0FsG7q-CfR6c>$HV>}gsR2gZ#
zbL^*dJ+B@($03J4z2Jy4Hg03O^<N}c12ab3c^^$j;^*y9<LO`B+ZeMPchpd$3|Poc
zs#Cgdl<55v+b&uFwuCveP9T?AGRxK^By+TQd~`D8TN5C<_%-wQTCVlUsNu+~CF^D}
zV~etMm>8*)jH#C}-;rc$s1mFYu(Ne4MNk-fHelo4HPs-LIQYhnGDs^N+-{AGIKRIO
z)NQ>Y#9|9%UIR#M2FEPRl=Rw7L619LNTp<4a0Out96Lltk4Kuh1VLBP-@n&RBqVyz
z<t$or`yx$m^uiGrI5$vlm?wQ7;zuvA$)i2}*#@=glwyIQksGdGEwE06V_g!deoIs%
zK8M+{(M|n)WZ^N-X-z<f3A$4aKFXt{EHRG9;>pKSwP442JAXHz`}vG-yYv5sPX66*
z{e0(tooHp>vtrgT?~O^y%-f8)TG>hG*6aac!>PxGJCW=zUipy1h}W0}t7j$6LVTo^
z&u^Y@Qk1I_S;IO;AV+p3$dc7SpGfBlYBwdhh^;YVYyX+P68|7Kc`@pTsLe>WM*2ZS
zfmnZ&3KITbxyj)i0{AXiAW}UNw^0&%aho1)w3mBtlZqF?&q6?W7WPvtw!hVeey3s}
z{1ByVRs<#7?|zm$-ZwZ!5Qjy>!1(5CK;_QMkXq(D^Izrg(IV?X-=+=f%p%eW97}o|
zs@fN2X4n3DI5VjJ#Y!bM7X;Pao^lO68^Qk5`{BEL=@wEv>CJrW<zlP^fPYb8$E_)Z
zY=MwRfDf@<N@6Ek%o<NwQ`tBS6lL*(PCt<01*qYnzL57w^VtVxK<pN-5zza5J&Ow8
zx`9Yt*_X-51l!H&cx=@tFOAgl8Z4mrH_+Vsn3f^imF(f)iv`hXoi1ReX7<?-)fv2n
z9i5r)kTlTpDjyn&n&uRU```p3QUapPDP_(A!O%HaI!$$}Wqp>|4l!nq!OOyNm)Hy6
zRvRh|J9v8kl7l|k8(>EX*(7F&l&i4sC-H6|rL=Um<-S^|R+ndc8KUkc42x;g@p{&)
zkB%RVC0a0j!DL}f)U)%Yo$y0?Smoc``2a;l$+~lSzH|Q~cz%@aD!VEu3lt;g^FXa5
z={U1S%XRm27`RAHCz%mS6VKIsY{_;1$#w-#3Z*5Rv-+hGt@|Q+(__W0Upv3M<M6ZS
z>@j8y-3KJy5C-*I>-*5K_?DrYyoCdYM(ts3JHYbviIZuA0@*-N>FE6PPu%T{<&UDN
z===hCXets^;oR^0P^()I6u$rD#XRr(tZK~^wH?vn3;RnnXG{aQYuIwmsWW!7`jvA0
zLra$t-W`4LEn|d`@ehyU@bWbwNZw7&POvaky2Zy}Qyl^)d_~#eDH=hA*S_cZyC`oj
zWM@o75r#MHR@BylwM>j1*HhSvEN*y5P2RpQ;rPaOr#swiF|eD{k#=@h5R+{+nSsC!
z)lMMU&%4x6abdtUI?NBx>d7z$mJslL0iPK=m8AcXCw07+|I|?+>5pIklTBl&5^5}R
z@YAafL=df2%#}$3%LU&6CZxRkVxYU9a?g~Vv_A=Sdw|RXJ*_3zxRF<5c8b^g1ZOe0
zKlw(jy;D?K%%o&Qs40}KF#6s0qaGKKkHhVPte<+bNjPp0!=rdqUzO!(8+QTFF>{6I
zLUo_8$-v01r&0#kHhH@>2wA;1`M}a}%3afh>|r$>;w~10cENw772Zi&pN7&%yRGyV
zlknRf7l|etVmo$C$rn>G9YhVDt6T6FZCD%yOiTlHm!ZvH+;`>#{JY%LARiHxaA<W3
z;EssO?BdwOz;gCQo*Uq)+z5v2%E;M^tPhP*W15`hy1=2@Gq8oIObkT|LUe6a@`}v_
zAa`x^8y;lW;Am^mR19Lx^x-?6p0M>c1CVpeXg<zbpq>b`7?mqnn~`2-w1$^F5u7ap
zw&gtMZ*b_kfL}zON;s&JQ)3RK{j-3)ZL*lHqh{nsa8nNtjO-fNaV>|=&#&;g+`1ws
z??r(8fn1)Ctvk(GJfas$bM4X!BNEnj-E0#qS#ne9Lhd9&@)I*KY=ESD<>5o*8yT7=
zCq6rmoe5&SpF=9&=vcGx?tO?fl?P|m8P;m@=t;*2+Rv!ee<sA3jb$eOg6*+&Pzfs*
z4E8vg8BZ>To>laWhlwXv{eYu8D0<<3qbaLo40(CNr`~(soK6gYloscpWlCn`ac1^3
zId{APV|xT*4xAf1|4Vc2x9{Bh3Uw#>j2eK`z7&5ndW(2i!#3Nf?3q6^eC%cjD}^Ks
z+VTFeUD+StB*7k4;)`H0@~+7nIkZAK+EujdQs2$)#JW{r*{ss7R4k+uC|o-t;;WC)
zIs2HtE}_egJ00AA64rU#ETszrz&fJ^(0Z!8<P=!F>xkW9!c5I!8jOUt-Pz{aB_T~8
z*smEN1C2lW<OEgAeX<H^9nF)>p@Ij={o^n7XERr%rqN+?6b~0Yol(y!EJA9}<)nBZ
zH}Q{{kPNr^Fh6SOHTQn0*~9AyEL$C)lX@8#0yuK}w8N$v%&^RO6Z-ua%M12|Nfti6
zt<*mQJ`7LZ!e!Enl{9CctVf`qJO5+f1O)#0fBxM+<R49XSF>GYFYp*iL?g6z@7m<3
zf?M`A!AMa&@tD^^Kol8}7$WRfA?CytLDAYbOiYY+qGBCg9vVLq?(HdtB@a&>5Ol@(
zyGDYj#Nnf0aQjEU_SyX#M3l<5kVV{8!iocF-hZ#f!bxaTXLiqv_dQ9(i8>8E=NU?R
zzjw<LVHpJzxco=!%QktNk;GV*uYHYA&L6Knux*RiJ|bYN%^<lPYSNOKg0`g@wohR~
zo9TsRCbss}^UHKG9iP2Cy83p2Zi9vnkdbSj>1n(h_+%p+D8oc<2Xn(l<+{a;p{X|b
zkfTZRJ*>Mm7;bODh_e|;FE(2_@ik$x(W#vXhNw=>tU<$#gwgMy!aMak5$$_rfYB5C
zsUmw#twgwSh0*Zjkm_ZgNtyn{Wk(o9K#EJsyP$B4woIYV`Ve^+vuH&W4%za=w%!;6
zA>Vg){_1NKuK8|vQGLA@4ezkD;kRp)(drj)zV<oZ$DY;MY!lfe<8QIl4eXmd{M3Wi
z9sa>iO4)g!+>tqG`<SSFi>#Wkx^Cv%5z7H&K@#0tM)#Wuva4Z$q8HBF+D~HS(ZjU=
zkM+8NY%r>QjU9vxKla-q>0;=d*~0l28V#}o?L@gcQ(dMA){GL>vmj`)qN_MMY#1jq
zdHdUp-Yg!yjcL#)8`RA;IPRcC^_)sgk}d)zef_}i5cVd|iKp8K^Tbs^_MLc=?>yCd
z`%Xpq^<7iK_kGMG=CqF8t;C+Yk=v2r?>Ijl!U&q40<x(Jpy%Qf(M#Zkk-MuH92tIs
z`I1&B!Y$GIGv%>{dxdzHD8ff4Q<hb>gKG({SNP=UJfGhNwPiOd{+Gz7G<!5!<``xm
zBqQ{&cZ&O13DgUX0b09{G$Sd&RdkI~VSIZu`A{&hWizSR?okHWn4&3Frh+ah0h`i9
ztDU<HrO(j&rL`-2ZsyOfnEYn>uXpYhid)~+?F4{(Ewc%`yZ>bG49iJwWWe!VyxNOB
z;*LDfGJc;exC~QfxPoNgCBSy~HlB&}4)-U_uIDG~H$(sB2v(@)%(MB}-zDhs&Tstw
zYoObb@O+$Cm%ujB*%adF18GCr)F>tez<iUL_a69SdU*D5TGSELAL5EUTwQ2NcQnxz
z0*YN=KHuF8xIfl|dSUy6qUrHr27f`)w~~?Rpo|0F!)GFDlw%33G9tRk!9;hl05GLs
zos&0G`k6*NA)k_1i`C())(IZCJzUa?uiZB|o@K#E0J`6u)EvC9p}SQKzp-8V3c87*
zmq_hz@V;xNC2tI+WwIGbFndX&`t=c~_sXCNvz&<8SUkDRxy4)dI;?&_sT7!X@HKMr
zz^-kpQC+U^v9O8M9cLB?;FiUO`}hs<7BQVlW>BwTv;p>L9VLTQqC`lIs-hC(52EJO
zv4zxC9a_lKsx>lYHxX`t+-Q61305oF74`ZP%%5cTfZBTr@fH+NzXbFL*VB#7KEGCi
zP-CH-Un1pzqB3YvK!LeF>d9WIQAjw1lEedYH2+0KVOHkKsz1$K8rDPR6!%WteOTh}
zH(c(A)bbT7)!s>X4)2D~iv3fR*8O!rjL%<Qe0X@C2{Df@_C^n6uvmP~_c)u7N_<8-
zO0femEzeFJ%Kv~z123o91pcMVh6VX<72<$#I#l|4Y*a`;v>t()CMNt*Mjn@z0uD25
zo?yu@5k?;!M^t~OaW)@C`SIU<^^h`OvH*UfsRRfoZ3e^hOz7caEsWW844Yno$e$^;
z-%OlTh;CnEu$quuN%BAnZ-Sxxuw6G?JjtXQ!ywf~#QTZNj0iOKu#5OKE-5CvooptV
zc|-X4!AxNk)22HMssUl{QFQyV37r2Kie(c8w2N~0fjKo8aga}?K}!pSi0;gTs3(dV
z3rS-_n;l7$C&6*tqKJVof{1hqFhq=x@yP}F_t=eV$uRz@LQqUxV<tT6c0d{EV~#St
zI^3MU1KdgU6C0T#Qb4MCD;MFtHO0l1!`#K1f5Vwh9&?_}QC0~>gl{uqgc3u}{;F~Z
zxANV6xR2&q7l5uA8;U^Ehp+c<Z3q(bogY746B+D<Dq&@lgX<%&utN+o4Ua*r(Rl*#
zK-qAS&*WqOoj&LP@*n>G9ZkRJU9I7u?bte4HxhP6%&f{XL%P*Fa?A$6Uky%Y$6VF%
zo(z*&lL`&3<K&<tvltGq79a(V&&!&v0}9)(T;P{bLi#Ju+tez^?^j?q8N*=7bu!;v
z!&pkU$TI-loS;s>ElB@n<DR~^QM8+Z1l4_-JM^XoG%3i>76JE>hMF!Sgd1ZijuML;
z?gF3$bYD!$1qyy@06pY|&oM<{)*N6XeKb*N5NhliuKM9YsO?}V`Rw7rr`nFeBDe^u
zfQ}JR)RY?mqUVo-V*}|2Li2^uHeel)W9ArKcGs2$@PeWZZ6(3C2PEj46bVf7I{?X4
zAJ%zvl^67trggIkIl`|K3|!Z-H#HdE3!>LfQ@QR8Te_<Q`D|*}1(bQK5oq#JL~V(K
z*;DG_(V#9X15V5{mKu|l2md0Z;oN=+8NInmFDywQvC731(uw0}D30`(&dz3J8EYHm
z8zlG<H5Hap2G?8N`<D=zr|0j8B0}a6d4Wx?ih7$IJP)GIWLy`vAn+36EL`%l%o30T
zANuqQ<Vf28_8{tlY5_UKi|$y6kPV+lwT=%6Pd3v|Hl|dM2;i9-cChs}JH7wXMC<Zp
zyH`&;8wSxk#Mc!-8kVX>h|LjCrc<cX=HGw&HzO4+Fly!rH^>5`(j*F$R$EhIGJu=n
zG*^Wh?s?13rq0`T2gw7`>7%B5v%uguYR%vOZ0gJRBgZ3$Uqt(e#&L|K2Y}KMtUsf+
zq@h@yo&iyV-O}ceeFJxes$z=;i1kA!Zf5|tiKtf(X-Fw4@p;s(VfBO4UwGKL$%6VE
z`gWTcT$gB^njb>dCf3)8CSKXfu*p)>L|<}7kMXLv@W*ml-NCP{4;PJABFMjVehW~Z
z{GLWCmnt{aqi!+_DgNT-io&7n6ol|<Irf3<JR8NEg7I#2m=?SGMnz{p@#bW8)cL6j
z6Sn`X4YLtS?#D5KZ}6HPi0%BSVlPemlEQda5V^%0jofZIgc^QkGq-4F7qq75?)<&K
zgOT}v{O$kn4*<+kxuHUP6hlCs*~fN~1q3L=onJsum=y`{0z>7((Z7SsO1?cH&)F|Z
zL-8=tP1MoHy}Ad*zT5<Dy<25k{kt!cm@=QOk&$8I;$z|=c#cCQjWn1kaEsm%GWcmV
z`zNX%(ME;3nJdOq_OP7!F}lf(2u?+@i1Z|v-n}ATtG0m3E)2@*Y??q(#`D$9eKeoq
zqPUkR=+=>b#&Bk~tx(&WZ9BkLA>z=+)E_bm$VvF(JvxTs^RAXgA;`D#`8avttKUSx
z;Ky6EA`8cw)*&Q_%2yj&nR{y2h``^o1I1!sve<L?y2lz3v10Vj1BAUgqg4n6PPFU-
zg3|(@RFA}85;S33330Wg2b=z(vE{9HPmmw{NK|T{v`(ZP^nA};gePqI(?RYU*<2CB
z2lXBT?icsYjd2EDQ4V!%;gmj6>jgiJ4EF`K!Qf*GF1*jkLg4Qp`nDWA>|0u0T6Z3&
ztkb3LY!ff{<8uOK=`fSs9j5Xg9;4gdG&n*;$EN;})AvK9NnL}D5NWiHC=vL7BHL@L
z_o;rsUkw3rL=BXTZCMh_DLPQc58_Zhx_hX`MslcP%t61KzU+yFQZjsTd*UmC_8Mce
zc!)ELG>*<*hS-~L(Tt=Dj3?|iYx1M*Fh-`mAG?X^4?2vIF-8s0xQqbvEF(0P-VAy?
zFfMYEBaD~X8HwHlKI+#Nq`FWjz8t;@y+)7G9vr3`^u!sG<qY}Kx2#<TA;mzo@TA&Z
zffF)<WIg2l87?D^p1;AHt8x#ML6I?9N<gQniPqb%y8-wOd0$(A$aIc|-Cw5@r_sf`
zhqlwOT0SL>n+eWDgbBAD!#m^%XfdoFX-)2GsoB8F0dSuZt{i~2lNPetS&R-HZZBbv
zx`HWbrU$VG7Ji(dd9UdxO!|mIjq924_ZxY>+WU!Z*WWw%#ZJwT@~25%k}G6Fi=9Qb
zj3RYMye3;n_{7SDEWYmmu?sYkC{`q57RZL9i}Tq;d};SvJ#YQpe{h91&zb-DlZXtF
zJ&gA;oEO+kNaVM`<sG1r3UnsAJgQ8+hb8MZp{bCX^f2~jDJq<qLn5zmtzhv7J^76u
zSIz`pH0N;WzM)yOb`7g|ejlcBPXT-BI2t$q`D(FnXnHpF_|(9k`PswlG03xog7<hY
zBg>VfL2`OEd2ggw#(r-0(XTB7z$D0V?zaWx`CO{!v#uaK`_Q|e?%(v;*6eVudLI-G
zq<3z+LU(a;l8i~HAZHJc4aGj){>GsT1H1N34(!@ONG^!hI{wtF0LH{}GkUiRY9M-)
zz>Sd?6zU7y*n)0aF@k})x02#bTPTQB2BYX!0&<V$hK&wvfq~!BOnv0^emGi!dKoSS
z?o$co?>LbOD?PAX3Hswjf^<b$>!Eu!0@<R;Eppo`LHdsH-fp*=b50N<X+~x(K7}t?
z24T-Im80`iJ$2hGhycqk#Rqh{mU{HgrRyxT{19ZqronM;SE^X7yfFFHmL)QUh}CLA
zJn`k(l6v6#@gbX4Nw-@i;q+1$u#dUP<p%L(48?4rE?f(8uMH23xx*~~HhPWy=OPey
zfl#%JgDoNFJi&04jhFHJy3M@ZRu=FNX3j2-;<Y9`h(40<9PlDAUlEGkBYepJ&8T4C
z4v<Cf$iOc*p{f|*xl=pIrmvw*Cv0-kHly}s5#9YX98vY+_&Dlu)94TEg$!RZS4if>
zH&M|*s4pV`pxQfDcMAC{FxPWH1{%aw-)pC}gV8y_QG1qW{7wQB^c|rOX}P9NW+ytT
z;TfdvwJ|zcEe7_i9L+GBV=T&-&~gh{(vCke@=+SAkhQ1hnN?Y4BoV`RgY45+DK2nY
zpxB*_9PwC<LZbYZVX`2Jwg}E)nCS^pCwZTJN6iQqskt4Ho2DG52rB!oA6D|%N;m|B
z=8qPol>gMWNl$FIG`tU8+L$5bfQ(1OxqD%~pW^LFeBtlWrdvlE4I`a438EJiZ<(GC
z9mc*;xyXwppBPO9(w%<zX8%^eiOU0v<BEj*%l2N{%(J=MquG?9VP|N0Sqgyt|5Y>m
zl)}6ZF=h}+9RxSAcyK#-Khc6FrdlvN?C*WezMdcd!@mkPPu|QwEY*oUJzD+Ca?FNp
zM~OxSVeQ{z+#+db!7~f-$C4je6<?J^GDA_hVzw_wD;@MX`s4t66NT?WO}m}AmjqDQ
z9Gn6Wl>TZXK|}qe;|-OLDjmMQcxLw~@Ou~cXfRkrx0qD;<Sib5(<q&ol_24=jg)PW
z&?SJvbn_KYtw_^v$4@^FZ`LAVa{M4%9C)a9p6#%Y@%7la(HNe<VFn9Z_%lKdV2%oS
zGtsJ`vs<E)7FitZH)%=*GfSoZdxD=5kWkl-6oQT{<`*Asa&-`23TvY*k3XB(M=8&?
zU&441A_n?G3YSV7zVHfXRjz3DhpDWq-!f@zJyYCr=eJ?wQtzLe6-G0CtIzMNaxCMb
zY9}^|3h6}N?<^Y)k{-LW(X$Z?`^gZ>fHo;af_sRzYh$;zEMUAF$hhxg16lX75kc;r
zZDsL6nd_iqtW=emxQph@WhH4ja>Kx9_D;&S@0k+&M-j{OS;PX(?QX#!B}lmI!C!K6
zO^;twB!&US<wyz4MA?=Wm{pP?g~ABlXOHcW9y2~&7P#}Z@)(mwp?m$F7lQ6jD3*w)
z66Flv0(jZimAHtSZ-U)BmynW$SIPlsaaHQ=z!byf3_jUKC{Pxi%pbv)qk5A|zd6Ju
zs1FM0MQj0Dqb4D%-phy}5;@+df_KDl&=>RcRrUg8s4!AB8+S|=2fnfN1NN*FojDbT
z{L*Edx_(n9JK+M*;OPAeSCpU;eV7QTSh93=yfWRwkrQ6PBSh)LW6^11_{nqgn9S>E
zY5;P3RA<_Sj#4a~<ie5yyoIO}tT1Q6MfO~J0n&}Jse~Re#UusVt*Z!C66J2^av85H
zo!no9uR66#b}vg+V$M93tPp@yegXl<ima<vP(-~R{>}+-R-PSl4qf(KF6CW+{AZbF
za^wg^9EApU?Lj=%;oUHDDp~a{<+1ISgt7A}z=IiaWiU{hj{F4S->lmi4jny6EH1z|
ztDR@(y|8BB+<kQF=Tnag#7|Q*YMZ3hi`kGw_-1U&o!5VW5_0+H&mc@FcSNcXY8yE1
zG&>!k8Qg`w4TipwuKL-{V{`Er1D~D{SwtT0R;(LmCT;|BAsBrm?Uu9sTg*B|E3p34
zTN+8C_0m8S_&_{{Nq>q`5MT_24vO#YXGhX=A890b{<uWk)72<s)nKdw&c?t9A5TB^
zS0tbLC>%1!vaY%=Eek*7Eym82SwC>^+}OGX;^QSOcpu1n&nJSsqNq@&gzbM}btORr
zuWyOdSUZc3HgX3L@+#tV=>tl<4J0qpN8Zzp0q!}yKroz^n3@=Fn#1+KV#y@(H@Mrt
zeIxC9C1i#5W}cGA*=o;rmY-YWF$dtxRShgI5j$GbA{}*rpg4)`(f5zAkLu~CgUbd2
zx%fglFex2dHddK}RQ~!VBGi=5;pKt;Dl;X{Jn_)y$GERcfD$;OhD^Rk4H1z)$0oDu
z>Fx;9iY&<4bnt`GZUc+2iztJ70;nteJmF9C_R()<#{Gnwc`DS0xl{%nQUHE@4;7_2
zHZbg<^0|UNUp;SZdKA1OG~!(J-#Huf>Iua=zA}1D)I2tnBNkpl5g|mkB1E$NMKR!r
z9;n%fEz4KOwzW-tAZlmCF1K(X3*Yv#Aavxkjc(I}(?yIUKXULdTy+Z#bAaP~_ZN8t
z!~|&e%?z9Z;F%qJdH(rhTXipoBNWU4-|7KZvk!$1B?<3^CINEj!t3YTY3$kB1Vr4q
zAq|S~R@H2%cOzF{=bf!|kh)2+`~Vd?WS`VWBZ`26MmVrF?Z#(c>r|B;-v#s<&6qkv
z6#?o9PgAH=&U=~(C^wnIGEz#@k&aYf;C{fH(dfcy3Y(IFI0&`PSM{Hplp@rSiN-`3
zZ{&}g!fyLS+aZm@XNDFU+V&>BEZ`0JiF%Mo!v+bF(2ERnP5z9Xfk+jhs%)CNDcpbm
z<eWlsCBAhm3*$-nRZU>b)leRrvy&02n1`U<d1F1S!cIl=Hcc*Hb*+H_10@f&=CyjB
zCgRs9BAEp6{Qon>#ualP|Hf@lX#r4T+qA=%QTXLw31POKWy8L9;8`Xba)t~$(r;-Y
zywU+?n=FW;N)%|3Q!3tL;IoD}kVlFit4+6Fl1>MbVY`(X2h}T}SK_q~u`&9`&A-}j
zVBb&I43IoMSBb(xURk)Ge~<pc)$il?26;Zic1JwxLK8ov)Vw#)C)e*yO7XLid{<oC
z_x!cz<|O1$cFRPCPLj|@p;J_b{zj-^0bZ$xUfZPEJqX@trK&@Pdw!wZb76LKUkL`1
zlipA~i9#_rwhl%~VpP66a0Z)<lPQ<wrU7q$&@&^c0}9iP@}X5IC)FMNHanl1B;V*g
zS~E6*{oOA}R>kT)%W26;Uc1;Wuk7oPr1m@+bR>;p^t}g1@OaQd)n6#6Lady2p`f1K
z<ou-at)3~UT%sy{7jJ{2#`|`_ZNtTnMZ-WfS?hfgA=d8yfsB1(>H5sUW=jyiN$7-P
zfWDIdcB6mr?~ZyALEIZK&1H$s8<;h~r40S6lk>mB*44r+a2THb=(HGx;A|V_*g01G
zv%|@KTw5FKoNT|t+!XX*NO19JTXKA{<&bd?1tr11h%C*{Z{PYPdc@hMww@hMzObh|
zbk<<3_QAWU(0Iw?N26;~E+o=D*@h=zVyu*MTIuD*$+;&+KC(6qt!7uEbEhtX)R)_r
z1n24R_p>C5*}#AGx{sqV$bc7%>IN3;6(O;D88I#w)eBw%iAl)8nC-ok*MDX`&0!`(
z5JpCSYP%hp#3n*74{YUaGr`<iwl&f4Bg4sc1jYOeqf}@fYU>U2FgGwMgza@MBA1{;
zud{4^Jx4)BaW*7&-=3QSv6{dr)Ua4(Yg-%3g1mdw)^n-4q!&h8jv*|*^3Y2}4bAvD
zVkC6>zBKq)UsOZ*iJu3dJg;13L#UPW_lfjAH-H;So}?#;G~E7XelI07qj=O9^GV_$
z{NX9s5OG1j(S}Um;{$KG*=s}~&s)ARpN`LAKAp2hm;c5EmFhqLAOA8~+C2_jzi4Vs
zEx9L7?6p&JJ=-VLmRKFJV>VjFCyFrFHwqVHn`WApaXIN~UvyBvb|BRlJh#RU-o>f=
zm1e|jDReq3)gRW)!VLx>2+sYX$CCJUK+lA!=}&*^4c-lGx7k1xNxG3$VriZ`9{83=
zOX|t!t&1y8Bk8m5rVodq<y@;C<F&`Oo@Sy+PXd{5MCmtE0k#s~Yx_Pn2bV$FJ#_6+
zbr%QS8^|Pve3+%Xn((GqmWx#82iIKlD{usP*a{+x{aYSpf6zy5PkE)1Z*oM0)`XA^
zHYDUwl83bY7y0={kiLT{e=_W#_u`E9-wC#n5TvKXEBopZ9w7KN*cP22>P17~@9>&#
zf!FOcQNcclQ%2zIflaC$r!^Psa_AR$BVcR5nzx9vsy$dU1o;4PS@~O-<qc+;v5X*;
z+{q+`15V8@*-?4Iic1zT__vCrPbJ~{*sScYO*}bsswVDUhxp}L(0gWLfSQoT{S~#9
z#1*6B@GNl?F(GBx5_Uhs<`Wp8LuX>EXV|pTYqf#D(nLd&A+rcGo4eiV>LE_fUt<%v
z+jtXNh|jPC0bP<t@qTmXN#k(A*xw&Jk9b@m4=Ac8-wxMlh{VIho+F7cSzHVu$A=ep
z3Pyh2n--q09-99Fd)DbO&YkNfC~(%q#u1bn=3qr{DWN;fm0aP|3mIIs^Q@#-&oU@h
zqf5ql=8o|aExnW?ff$zT%?1)R-|hOJW_XC_`Ned`6KE5&+^CL|@dU9HjUk);OE#N7
zXGfUOfZf0(%JtCh=jOYAl=X$NI*=|AhR6|&v}I`Fku=Jb9MO1eJKPxKToe_S2oPs>
zVH#GwZU=lfZ1`MaiO$~H2oj_(B-$K5Q(Ajp3%S<W1h|^L<|8CQPLaKcoYHj4R}9Wx
z(-Z>*V#N5~C@Q&sCfCZ}clVH3IL>ep1eH2^`Eubc5~xp;ZQiEmmTzPcq1OIW873=v
zU)NF0gkv3o_xxFtCoHw5sSEs5*~EhsV&e%|FL>ZBGZ5~NJq)M(<6rudP4`{|wlXpb
zzpyWLL<m`G&{Iqvnk3r{3|9yw&5ma7IHYj*gB!kS(0wXx?!n+{jR`?M-fd={cse-R
zgs5TBOV@<Mb+M!7lthy#*rbv1F)$z!`2KSCcpj1)y&$&DJJRunfJ1#PN|0lidn0?>
z3-h>C+*>8LG5nti`}wXYDO7-)y@<y$^}I&X>OJm?WZjN1{q*b`e4qvs;K{^%Ct5M+
z3|!MSPPk!Cn4AEeZFCHig(IS3qm2k0fpJVTS{nCBZRgU>CqyZ?&M8myNT}_HoY14p
zEx@N?-SA(vkKkyAh7j}!>sHnPrU2kw?f@-R2WBfC4UDz);uwE8BF|;E6X5=4p|e;E
zI`iy3AoY!%fET~XsJ<SP&X8{26=h(cmq%eI&dJqGiACT+Og`7)#L^{f*g2uv!MjXN
zAq;Kynm4JW@=hZ;Q*4%-tsZ#u^6(r(;u|c!Eap>g65TuDSwC}u+v8WRQusJkgzph)
zTuv0~1V_p~u<d<pkR^mjCERwvNW**d_ObL<UVeA%>*F|6XQ$?ROuH25xhELYq=pei
zyCjUSxE&`l#7P>+lL;v@UV_N<JI*9I>mirU&ciRsYQXf|bPjCpb}j>t-Q+=3HRR3o
zEG9V8G?Ndpx#iS3<Or0IhldmQj&u=rebV82#-^9-_u#@Nu^q3<d=mGAfTiy4f*o^5
zV=i*9>*IUJkw$2Ke=s9Epqpcv9WG_=kyu4)D?@4H!5$<@kv#c~KDSM8NQR)=JZ`un
z3NuCNIUxQd3x%zm7N*!kxaw#(+AM!`*xvemD=SS`<GXlm#{;wQ{U-YX9@gB|C>}5D
zJAg{MsLyFOqg%$}8!1ar{ERx``nhZVbE6Qtm5*PQSk*+B-x9KIw3^51w=Tluz}m*J
z4DHPnE5g*R?m}M=k))$XcWuLbYvuVFQhlf;sv0#c@J87>K#iw3da>2Gl;ZAsTu@5h
zXXEF8?CQU!gYl(5*|ZC)mNdm47@%TuVW;0^e8>T@&>V!Rjz|&5iJ%#;Gd4XGtFg)I
zRga=Ti7GNXTY#IZH#9c0|4=h3j~7qS`#{%s_1hO~-<+T)N#!1JQn9kj+j>(uG<{<V
z<k|i#L6n)MJ-kP-FERG2lo8unDx*P(0iyS=)THi4-PXnQ@g?;3IZpl6Yhm*JScjeF
z0du+ajqMzXwm=HcfgQx#LPQ5zA!)VGX5?1ba1scG$#C5(jr9iD&}`aJT{<}`O;@h~
zu_sVmwfzQ4qi%j2jGg70MViA@0oqwl7JK@j%U?$i*CnZb19`0>OqH`hjJd0YnMe(J
zh0TNl%A?Db{VT*Y;T^d<;5?~E7&>Zw;m=kQo|v55>s<au^U@r|olr_iE&O|-eZ~KZ
zoguIl%%iq0rn!aJYe6tk0!O_*Xs0JI-UItuoVat3?6)^S#2(ShquB}~thv;Y$V@tp
z{3Zt2Pa4@6%bseuwuTa9(J>{+Ls4|XqsQ1IrhR2{inbWKSP1A{R;j4Tu1v`@qY){X
zGzL-#dn`opg<NM;)BQ^e=p+v?UMfQIP*(8rReIW&<g+hM>;M_bbPdm&6sfC_=8%m;
zPO;Qp99NolpG-x8IVJHVL!h|mt7zk(>%xMB7b_4p_!R|Sq+r04hhw!)F?efdX}qiO
zLax(7DM_dgs1|<D0h>@>b9il=Q!q7|c)j(+!rAiss1x!)qsZpVLG!Rv9$dz+@^PE+
zU!`Je)dk9yF%T#r_lQg_d+&W+q5uTe2wuqzi8X-2+_FMxh01K>RvHHEu~7OTxIO^}
zmM{#&lUIRWU+a*)KEoz$*0TgW<ebeTXbjp!7(`ZgRzN7vugUH?xEAQ7X%IBL4PB<?
zXA||IN&~?L5+Dv)xq%f(;&C$I(@#IG=a>9Nq>@UNtb>0~oM-~pRtep|2K76omscDd
zaarle8(FQe0(h8B;JtzhB8VT=-*^?6{P$!3@vm%<GJxQz!&7@8BkpNa!8-=`l_b3c
zJd3YA-J?VhV9sfMh0H(QoD|=%uTX!rp{$_kN-=KJ(xqSo3{@et8#CHZ;E($2(a|9`
z$k3ezdhhk1$3{w7R+KJWWurE)LdDbjY@pP;7v?VX@^cQ~Mw9OJ=W`3W9M{0`?DU*+
zMv-u~S6C!sS7u}E!>x<s0eiMbTYdG>Q!eSxoyos-ZMy*CU?Jh)Q+G!W9tB@l&Hzy}
zHfhH{6mSt)pAOH4kivWAy7IjNzz4LVN4i7?ViYwlBd?<_usm;4c8wkoIYK+Keh?L<
zhv<@ReM-)dW{;Yg82j`Tm0&O5<T2vbA*R%gsuF;Bq2dC*uOMYN{Wd)J+o89&#GwnW
zOVvx-r9dU@U17opOMou5+4X^+&%lnkm2l$|i-VwZPh}Rs8^|97<>y{~v~vPpJ^hWn
zkF;zr%wxm|1z91)12r}zsSg(+)}}3<P%};ZFj}n!h;ukvj_=8Ic#?j+jk8mS$M;UA
z=R1<a!3V}4RzP?MF~X=_d)lyte3sdNUoQYf)X>|z2M5oHU3+(RBtAUsj8;&CCH-s8
z^)uOV6S#FX%rj1&TQ~R`Y?;Gp*=D<*HrTg=sUGva{bm+srY3gS#~rLBTC#Go*+4$v
z`i@x&U>agfo~{xg1VJ2v%|c&2L@I3?bYRtFHSqo`-wl91Lj>XI!?T1*&b2BM7!ihp
zHzGG!Zy&R{47Z_2az4WRC&#XKgEFC>3bhb_`Yb<Ncg{o*O6OLLH=iq^2k>7aeL2rY
z%0<B$)D$4!lEQLSqqe5Irr7nxB9&x2Kx`If)QsfT7Th*DeA56n@<qgngFS$yGWM7*
zzXJf6Ng!04zHBTUO0aVY18_I>2z6=H2{MEJj2L-$@$o0YR(|e!!p-LuH@0SDhv{e<
zN9}iaP-~+`WZpMyn!z5PbG(Bzk`RY)m{dt4Yd`%h_X1L}a1P<RAkDWFjMlIH?W=I#
ze|GHS-#Fet<y}zAN&c)sG`P#_2pCh}aed!|QUYxoG>$%T{_?Lh!8%TuWC<A{9S6aI
z*Qwq&wN;K%FAzJkZ#@h*(APjH2jS-esDer35b`&;J^-qiuT&Q|uOZ^{_}G%1Kv2Jl
z?(y3ArsXTrUw~YEPajOwjcr?&)}kM;Px;s&oy7Yi!q)`!Wa)7HKE_+NupAwxeL{@p
zF<R0(^A6(O+}I{xfzGb6%qCB)3OiWjQtwSUSAm(8=EPn9rk`<>&iT@E&td~h?|P*L
zkg+(IBZBh-ydZ9wz#wndk`NXa7Ey)|1HjbZ;*`B8$5L17h$XnMA<!oxkI;qP8XVPw
z`!heQ2+m(YVb~qdHjl;cGf-GDYaaRv1Dpgq20ZQBB9}*pu#j+I1@(w5pH_2l5>uMI
zjdSzKjPc2+agf}OwW&0c_Z0!hg@e5;5LtB`RgdTnRvuMqiW5)r(9@IjBBCTicb&hw
zHijrOUvEi;gHP`aRc?<94YZffJA4*VX-|{kP%&wN@=E3i9%?!4nIL86N;gSYr=6j<
zYwLv;xi^~N(wt2Y<4*L48jT8W%BI&2O@M$0M`ns)Bg*!;u7f$wqkW)Hlw1KDZRR@}
zZu7WLnx7*AqS9>hwHzB$Q9rN<_j+dwg2WB(UO9}2QR+s{an^=i-Q%j=H}6ZJm?D7|
zp>=4*h#3Ztj9GZd%`!p1ssgZEF)p3kU2tQ10q6y^H=M*}u<Q)CHR>?*k4DIb$<j1J
z!O>_F{`>j6PH}KR>^Zav=xh<tX5WSEsjyA!GORE^8@dn0`!$XQuig%TyY5fQyJmF=
z*uE3$0ogbn0?FWr_jIPz^0`dm(5EU7PndR#&BmK6?05Ug&ETeTGKGhKs=XEw33F8n
zb!F_K@*E+)i;1F)tq<g@DN@4fMq@A=S4zC^>j@r5GT*5YH-;z+1<?}VBj)k8@^9BL
z3b1db;JnfP)3mnz;46UffAjHgED6T^Nv1g^%7kFt8*U1|mQc{(E4<m*8Ly`AyB~_)
zc#cH1e}OoA#~T<<)GjA;2sFI6Re?E>oVA@!^l;-?eP08)1>g;xE2_iyeCjRG^}hzy
zXD_KRqYjtyu;<M%=Uw=NkIi{j7b?v8=A*IvyeG2BMu{2Om?P2^2<UFB6v&tXIi9G&
z<sssK+jHe8)<fKp)28qF#6v(ZAQ}vuTggU<K_S73-#iq!b|p|eut8+$&;@bi)^5*M
z>v>Uv2Ov)94s7gUDbUg1@Z|)`!=Yz)vP3VQ*@zdQ{m%vT3z|zZsFisWs#5{6M|!%q
zkJ$ipSv8nn`o>^H3JEXs_c}XvtBNd$&4x7Y9<V$u$bz3iF_hXLp=v}tj=BNvrXnF|
zAS3{<r{TX2V_IJQv!6!RCh`qX0+)VHz%Jb`y%@>ztWj`qRM>AI9q7Jwd73^Qwlc^k
z$lxTwyvvAiNi?~UfqX=&%ykTBmLNgh+YIWCj<F1>6+<MFn3gKuy!Q<(nPa#)?Q<;G
zv%4d-nC%KOEQug=jIr})i_-3nPiL@={blA)h58<B?P$G2gCF}H#DR;jV3tEFTd|GB
zIrkuT5YtJ_!5|4!jNZn<ZnvG4ry&Q~y?<$K6b0fn*4_#YC@0^g^@XGyf`&n4=p&K7
z$~Q-oSiOjf9NB@iL51pooa8wgfnub6^|dw}R^2r~TDpax!mB9+e44Gu5a+T&SLChz
zB0*<D>_`nVO}O8#tzTf$pj7wl*pqNM6_B^ndV&nC&_FQ>9P^;^-ZHe>m*)?<0VFRR
z%fg>Ic_=5<=i;lf)b*epmp7~M^eJ{KI}w?q^of9N8GBo>+BDEy3X~$iSdVGhx4T79
zWOh%OR#r&w^IPuURe7<1<V=3jE_R)9emnzhG<;0Ke$<Uc9+`SpLdpmDesnV?AeZEi
zyrOsCqN#H6!$p+w@Q(9I@T;|SY!F8VZSdK8Wr`6T5j<jss#KT)E+a7|0!*6zu{F@+
zkC*;r(}zzi8lGs<$QoH_5*y=i!ZeHZo@J+;A$8>}501JZcSd`S%#hRHpSBQH37o;x
zXJVtd;>YUq+70r?ri)0OSsRVa{DFUcq2IIeJlpy$d2}{j1as|1*&m^#*)&qzlyIX@
zkpEDrD9CLj5^(!w5cq4)l9-5O%rghK_v-o81BY6V+j(9LTA<%<R=Fo>H^VoIRo{q&
zp848m?vtCYHUKE$WjWqV<H!~Rt=Y?OYxW6JL6v+7I_>LZQeFiw?wlKYlO-7x4MdKW
zrXUf#%=+CtN31X`!Pa#^4Y(KC30HiZS3sw%)q{=zja1qGj?m-TLb(zkuI#DBx{2PB
zc}x5DYu5j|VvS%t5FH$rIzSE>iFpT1SDj^w54%xcxq*xy=FT9ap3u<1owSn@AQ<Lt
zP?f$nJImsr`f++Xy8SqMic;nsb5Sh@n;Y;+)*?d;=KX=z3hq#gd_AC2F>6|6Hq!Xj
ziHG>eR43LYag_>|FMQIJuV6V7Mky(s*$hj8Zezq+GU=HZh)wvyB<|3q(<dvF%$B@~
zE$`?KqmhEPiWd;b&e|t;E;YmK!ieMC+4sFT_SPZB&dHh6mhu+-GL*N(iydsw2qLHj
zix%(sMoJD~!yQ4S%cYP&^+wv{HMnncO7)BHJ~ws~s4&}Pyp(;BLO=qw5<&58Tb0L7
zZCmySNlU~x<Y@#2RT+4)4@Sx@+5ti|O@bDK6DK1_Pa`kPGtx+e$~y>3HhDFqTErAp
zaJo^hOwA8fhX=DS#@OAx5*>hlE$Yt!lBZ}%0nd|9%R=1=OHjjsV0yIN#5TCe#q@4a
zq26k5&_yf)+z5=Ey|R}()M`I19NBuHKs?WAB>0(X!v^Vgz9*eb8SxzNZnAjy#8?Xf
zhJTqQYR8_V9?6lXCi=b`>xdy9e%t()L(Mme5I+R6n<59JG7a7LI!{`e3d#!u_N)vy
zS`jyUyT_Gxgz`OfoY3_$qbbUbkALh>J0xlUm;Ti^`)~^yD-wus!Y*K01M6N2guc^2
z_Xh#S&&!^d0^i`JOZQ3OH*MRH-!b!V)pc?g*ST9-`ZfOjz)b~w5f;iDFxN>-#!fmq
zyCJg1t&iSO4^u~~VPx*~3r`D~9KO%q!))e0-Q1yJx{;7s$AraSV1Jk9t7_iM6px-D
z3^0>BDjuARe0J~3Gc||$hee7&`2w?&PVg>>g)l!F^GIakpSs>sX|{kDOXR+k+&Fu^
zZf21NSPKA3hj*}iKYUBUZhj_<4u)t{K`aL#;ETyo@Y`ghG!PRIy#B}!K-htg9Gd5H
z5jX}*hmI_=j>s7TT|FCx$dX5~6^87>y>wxSeoYnyy+*6wkYf;OC*t~vzsd)QB~1@u
zpp58;JsYSCP6nNkm?~e0@Dkr_<|W(q8~HT4LpGR!v(qO+Iu2IMg|1#`=8x>C`?Pql
z)o$zC2OYm**`v-x&sOzNteE2=`7F>u?1OX#z&H+NY1l6D=4Mag;4lUry7-0kn=G$B
zBn(HR;W}Ktz`o@MVk{w?pwwCjY%U2oCl8G?9qBvRXKAk9>1YgXueMfS6L6mV^pXUZ
zFz~~U%wxLJ{E*NjS~to?b~uDYqN|=oOMrNSh;y%?O9OX=a3ebmO*_yC_6UvcW`2fd
z*=)x6BW@gQGg8AO^r?2n4W+*@sxbme#W4V7o>bY_klOiV?!2Qpjew}6Rsd8F)&Yab
z^4^|*Vryqjv<~!xd`_3+8q?wJppG*ySQC)Z09UteNVo0&?7{Z+v5xT(HjPywIX6bv
zIi%LY!s%>71r}8-4x26{J(LuMS{wvr#b#3>&2|MOAx3xhvK>KI6z70(2{3%nJ<+!m
zh=dyA))nb*+`&!{&`D#gtJKxx=RN5P@yUeBoljSD&3_^<|NoF?3Yw|A8B}5DPz*+Q
zf1SPof#$tA4sw0c;r?;8`QsZtkzwX!;nuqn@B7#=sg{3s^yA-n19;oRldZZ5davaJ
zmEt`raIt8i7(6BNh7Q06=wZk|{3CFX<I18F(>^%Jzy1(tAys<3FWPY+5yIK;?Jgfs
zTqZOfb8dL4m@Wn2Ha@Uf-hOR^%M_&sMM=W+rWJWow23~fTLgwfbbZzkb@oE6hiGJs
zXc2YKw3;;ChfP%Zwkv(!%?+!QFxzn5J5Y2I49pr_yyBHF?&}0k?Z_BJ91fby!QNzn
z;mruPp^oYSCcIXFUlI^}PO`;y>3PxoTCL#&#PVRVZvgJgRAdmEXx%kO6Gh-a32{9i
zxisQ(Wi(jZ$7t(m0U}(Q!y6Tq-(|>X9z;dL%aa5~olqfZsH(iU+sxYoLV2I)##Rr_
zIeuNe7WB2nG)|X5i_%@Pula@vs|uBZ$^#?rMYp*b5PgTUqYG6r<0uT?o=SBMR^5y{
z1x6JudKkJU){EK!>e7l|a9QC_jBfFwZjEwsz0bHCjy&B}M(0SxX|Z{hB;D0{;N5d~
zUUq)NV6wpBkeBE!xou5`Z2G}z8*toAIKt(-%7h~Z7oO(`K@S<jjRQ0QLA}0kfhNov
zKU1Z-E>x7=Zg;xJVfy{fo$CsT9jUW9v;}QFbz<@jpcg1<&o}|-6(KV>I`<shcHu-q
z99+8c5313RI*b{qLrqnEmwd)@8n#JZw7M^jn=N1?#V})rAwdLRXpR)-KdT1K91K>|
z&%xFW$O*Hi0D)tMZ=m4P!5yJG7*BDqUj)&WC$(uL@&@|L7YhDwU>*N7Z-rdJN&e;9
z%oySLI-PXbLC^C{ooXAT6#S1Q#JYxl^D1z@6jmu-9#pYCjDA8Ud3Jc~4u}kRYI_Wb
zRoHyvY8$DVK*uNgQifYATJ~&x5j{&FZsg+|tGTiFJYXX{UhYaGNQt`UFRUqVZEO=v
zgLURfpH*2tIC29_4#?e?p>>7s>cSCpCKQF5y?Q4oYRMkwif2wU<|s2ce0;?4O|kfX
z><T3Kj~9RU4}TUYNUmbM&~+48ZoSw5ujbrn1cc_Ng}svAkY}ZeZCpsEyb3V-O~0SJ
znRvwH8i^;!>?Q$#8sCwPLoN`Wo8&^1bynkmMCWIqqfZf?AXECAE|o&_ac(_zfUdp`
zF^Z!;MF2kd+KWhpjK5;@$T?GubwO^lP+##5vy1tKex~9-$zJe44{W=!T~9lDVK}*n
z(gtK@w;)Nhx>B!o<$-_T^X{#p&R|-?ECm!aQDW)wK(F~(Z_FP6R)a!TgabI<QWvzw
za4NDah+XC^e5SmVaIw8@xlJeg0k|ALwqu@GHU=)7DWvMaZJgX(Y6SHGOk70U;PvqE
zU?R5zhnqVDEZ=^3?cd2?f$t97l;)Ey$tYMV6hi!gs3@-UQ$S7Ua2l9f%eZJD)pr#Q
z`3x~MAT^#^HM3AFpwiS311hZ(4F)G?jAcnv^+P9Q;NjazCo@}R*R9Lx6qz5;R}_Lb
zRS~KXoHOzo8VvJZyBs5s;iA}qHf~2q9&PdK;Ay-!GrLgBeb?P#mm+jH0D$8#Kj8O4
zeL32R$*c|Czr@VX)vqL;HhvIC4)7dXNg7VuZ|&?oi`(h2bG5DN3+@^&hFLNQNX>%O
z95@Z|k|Zk`pe7@w-Gt1rT-YfaV{Eg<nE(9{Z+8M*y8O{oc9vAvVMUwK8br%6Q*T^!
zhd*!Bit(NjK@@>f67C7`0LghWBX~!_TbA-FEA9dtXgeSKPl)aJTKBM9eYq6tc0-UQ
ztnyl;72u9Lgpt%!t7&B2QHJ7QGAqGS{PlM{P>hE%BZP?Ri3(c<0O>1>1U>@A*0ZfO
z*+T4wz+SW4Iw+2GZmxLGTRT-G5F^?$Q{NJQvB(rYJ~e-v(3Zyx8a5=@3T2NV6QG|(
zd=Mw$^SLl;H22A4Cz=*bqZu97D;r0YLHg=2<-nUP--x!eh~0=GrvZqoi9I+-r8$mV
z-Q<ts_r0~kUjy6o+S2|1vGx8jdfiug-*Bj5q!GE5-FID?fl-YXBg`nvl$2k)iw)2n
zikQuCB)Y?)w{_WIBT>+1#;wvd8fVcI$dZ&evB%biqF%Ey4I{(ZA#E9LV;8e+ieeLm
zl~hz|w!<Nv6h_c?H)uBznx?>RQ)IF6_Vanp_ud)W`9mYlJNL);-uK?;`<&-I=X|>v
z#IcS=K$j;U{{5dNk9Xnc{?7l-8wt+-lW<m$ceck?IPlq|;fgL#rxLr@F%}*HQDwKd
zF_w3=t5q9**vQkLdlYd%9DP&3ES!e&P%PJa#r^y2I6ZZR;|HaC=fecI>aBNgZ3Qn6
z1y-XBr!#)9E+~`e!1#9lk+wk|=DSTWE{s>+u7bOWAPN^hHMh!)7KK=)L&V)K%iT*S
z7gibe1jQhab6t^Csz#+{@Ic`MGrU8g*(a`mLR-UNk)%!d1STg$23H+4p9LUolhQ}{
zl|#w~RdR{y<7ndx0Bh3l0c2_Gs_3KGbTQYNTmKZK`@}y|T2OdE+nfY8!o~S(K5m`n
zgVq7V=)nM^h#9knGeFQ2w30HjhAsn{0h)D06ec1OID?ppyS0%y!xc^VH?A?~0MM0b
z0vtnX5X_Z@`L^@9ON4jWYZIi*L**!8W&-T^#;fOrCl;i+17QEkpmjh+MIbKXeo^&3
zF?FX6#N||+1t|6q>w}gA6ZbhSt8{VSnH_ckcsMp4n(Po-1pE|;%8;|K<hn!JN#u*W
zGXK5fzs%%=Ou;wT&RYzbU-$yq^k^J#^3iiCb6)*Uir%*G3emrZYT$AwRQ1JvJU>O0
zo(gMl?o8`A_dx^;IxnAk?j)XJ9T1zZQ6wi&^AoHGYga>awbfaa{ZjnM^G7tl9WvDh
zeb#^R5+QIzjo-&KCupHYNLTx;9jH{T<Um)~I*AIwe2s8SLwoe&QEVI?sL_XdR$N5Z
zv{)NR-ySn_B_wtfHkaEZkUuFuMWMJ6O`+iy6VwICu~ENb1vxB$_oN9n!i0z>{^`g;
zlXskucF98^Q1u1*c15lVJQZ!lY(Ry}x$pV0BaO<M)laCc;4ApVyTfcPy#=0`hSq5`
zga_l-nFSs%Lj)PbO&eK6`(?Vr+;Fz5aJFaEf$cWfay`WH%fWC2f(rwh)m1;|<=+8v
z(P@&qi@go^gTHs=I_?V&9IBhRz|#uwA}cq=qXk~^$33-gY1*7-n(d&@$lyH8IN{#I
zsqy=8us`w7{?$KxM;ZyHNn6wK?G4Z|L|BjmpiAN%KZ_{LW}&g@18A_2%4oguRNUcD
z52(nB41Jdjx#zUmI(tDE@`X(Io%DrK`Vg&b370=TwyP4Xb|G4-Hwfk8;>y0p`>G#B
zp_PP1{mK<)$2(VdR+=$m+Il(<_HK7X#x|ejzxN9oo#auOyDzgki|Z2Z)#IUHpA?}7
zO19TZD}@z{VkDrzLlB`P$Z`kJDq<d<+`0?dmwE8&Z>qdfY77pPr=awLXLee)ZO?Dq
zF=%0UYNgd+8}bWo8A35lsx#oEboyc4@22LqqL6k-kPCp_mJ|bkm5GzL3etsZV3r~Y
z&%;@$qntR}1gb2G_RSD>870<-U@f(C*d6?2GKoX}&3FnVZC%fU8ICN^cQ=&u5+WRV
zN$Zc!cNOH)@d&qw4yCU|O_wGQpsEAT(Tfxk?upWTRA}ZD85Z+RpnS-mnd|J^T#h{M
zlnj^3LHi(4mbbLTHHUONk1zu8`QGaMlUE*K#atq~=PcDB&z@TV9anBfOR%kFbc5mT
zYu_&NN<(MmW7ApCza2^%)PPykeb<(5aM@}EN9#A~tIC7KHKH?WZ8{o(nQ28)GR6Ar
z8N|~gtQx<HbRj?9^2Ke1chPrg@m6q%<)Z8o0d_=DL0p5}ANwy*P4H@TeyzZ@D-QPJ
zLUW`E#XEK*PCd#!q*m}B1clxGjdDrMce4ZPE||*|3<EWybtVV6xNJETaNG7iwYw)s
zSq4q=>TeBn8Ra}CLbU}!83jQuEAs8aM{igvCz`(Xu(bYgwH&qRn5nDWa=_t*`uqEP
z8b%4fstbK#pX^lASxW6BqFG>3yF=J%hw9@OkP1o_8BnzDnpcIrec@b5Acq{<!3TNq
z#Zj9U)~dK9YZOAeyDl2eOyCU!86yAwT`X?n2r*S8lG)_I|8|#>k4Jv^LL;NS0Zo+c
z*ZVH23N-cDYjJd0*?2wY0NJcG1zEio+6<63ay%-BTB*X*ktEQc`7|Of+l}6`I6H8c
z)Z62z&QT9C9W<%8*mb4eI(**>J{JW)S~~W1?bW?iqt+P=c*m;-aEIi!b4#i}rK|4S
zFI;BYFs$fdJ)MNAMQ57<7<%sy*_x2R@>b8JIT}D50I3=XC|J=n=q)Tz=t<Av&`$`Y
zYnQBt!+qS0f6(a7-_+eD$ljD5hV+>{63`)aAO(OTx%)T%Qh-=QthAQQ^=(KW^(G@A
zME&*v2(>D7>1Qr$1lYpilm|v|PV;G;8kmY-Ln2x1`f^A*7GWm<mQt1W-kdj~2G?gD
zZB~hjn4rGmuBq>HU&h`bdWn;u&Fl)Kf+`4oNz(`)?7o~CM6%6bHiOS+Z7quXB9JJ-
zM%yJpL4_WdIK{(3n82<(SOQ^;seCSEPV@T-wwTmbq5V#-UX}^?e96Wp^2Al+k;w2J
z2i{%(cxmRy+z2PNW)>`cd-Jl}Goo3BJ{-IT)VyMyolC*04==N9Y}Z-HEm&|Qb$V+m
z$e)E-0@?Pd=Y>wsIPJN%p0JRtYnu6*rm%0X0OiZ)W*=Et1(X#A1_%{otc2Dt&=;S4
z8L*DXaZkfV^`A(OoM+b0Ev$~L1XFdEm9DK3<GZS=5^1a#NELe3Y}GImH}8S;v?wk2
z{k>)uGENTWN#wHDsTG!%XBZrM{k=iy94r{<j06KzPEiq+bP8m2vuH{If9kCg0oKx^
zQ4wy0DvRA0%)~`au2}_q#5-XPBFu0m%hz7er!jxr-bt}PlvR$p<cJ+oaIFW10BXoQ
zPU^%EW93{ovQq@vxC|^J0i3ibD))zFU?WHTnX_|8o@~HdDYhI09?M3M*=EOM$3vag
zK^pTw+{~PFs0hpo0GSwKz#D?F$V_zUTRcL=2Sin}U*ZN$G`ixH5vkUy2Z@Q};NRR_
z{}cc0;2++B<~&eIm+lkr#mEtMtxzf`qT7Kiys(;8O!JDq2%{xXu69C-1`z1IUpT<_
zH$QA2kGjLu8YU3f>LJAO%3-D$yd^tbxNJG|9loP3zt)v)EUj#9iOtgVS|8-AB-x^M
zG_9A}A{Y;6-njqW2egS!e{M^l=pSDA{M^j2wW9d09GX@X`#N+2%$@!1#1+e)StU9-
zws}QWUhWB8u8IT(;Oi$pBW(i^68i7u`uREx_PK519oQn1Txq}zm7Wl&VmMPgAWwyy
zV8t2Q#!bmDl(tE(schJjSr2%emys_Zv(QY3l*2m${@pdy<Op^0VDra*?e}ZMS~9MG
z<1^+Kt%fGq*8FWKr;u1KbzJ!Y6~)XKV4aTv-|7mdTyYG<?)r>QwCtl&2lE0p1(4VV
zcP@~)QE<3P*cMcG-vP<Jj>~825Zp6etY0hHMxvYfBBIVJ*UCVeRqw3X&~R-SHi+Cs
z6%b<;qKXwl?kW2gT%)9j)bq@Pcl`polph|sRJQPy%=kSLk>8k664<6^+flSD#7hZj
z=VcSro?a6$LEZ9$Nlb_L=1Ws}d5UiVWdYovOj_~FrKg7ll0Sfr8kP@(XE8U-KXWxD
zcDfhXXkoR<!UXnul{GLU+J2TgJQ72Q9i?ZW6I;1)>g2P_AMt%>&??IjcHIl{)zvN<
zGX}Hnk#P(1OnvLZ)qC;RE>W+|SV|&b*O{Y&H;~375q=weL<TIBIuV8NTA;yQA?_dQ
zg%~1&W}rD`!)U9K#q1z(cqVx?JZ*4OS$2?V&m0^ukJfuwpzXBaz+qPva)7@SCC!Eo
zvP9zpJY!`=%UXXpp&QR`#ce!wuI)rGYX%DpLzWe^JD&Uk2jVZ-)a<9(5_!SUhc-t|
zFp#j*OfF)JpkI1I*lqes+rffzJq&5N{DU8TmA-DL_MgF_-d!L6-T#Ev_5ar&`{#1e
z&SqBL-cBF@C9w=W)Pbx*!Z;KW!ikZX2V3>QaQ}e@6X~s)=EW+shW>%h^rZ+fU6>H8
znLQUCA&eJ$8Nqg35qmw4u{4}r(9Rb-a0$qLq1_Rvs2eyTWIqjT*ID)>p61FNdU7h4
z)pu)R=#-2*l3Wt3Plpzx0PAk!88WrkKAYNnwaXBK{*O;g-5NHP7&iGF$lFP{3bAUv
zj1z0s_;tu394hz(X;oqE6LFIimqB{PR;Z&mC{XtfEm&MQFNn+vt#3Dg<0;cCAUowt
zP-Bi3EH+h&&K7XbS58a^8R+o<>)o_7kz{=E^#$%TGXgNZ%5m(Rvn@c+Nx*}El&wh)
zMa<?vCYEpQ<OV3UKw_^#gp1m#ja_-#z^S`2CU+tU=p7Nm?T}wGFw7KOwMs#VGC;W^
z!ZGS5Kf~2s1Ut$~{g9PXw*kx#V*03PB1dt|-9Y((LAab2o_LmqZ~0J$#rYTE`b?2i
zH|M#h^7S*{TKa&Ka;q+1w-V%vdCDiO&zq1yTmO8D?|2q$O#3w!@S~iWSpjOJQQ<Y~
z;>^Oi{wdrMi6HXoZRl!)=g;boz|@P+O^&*w>kUnSY!sh?#r2C|Qo4iQHPvDKXaK^w
zli!(<8pnAIDGnqW=d;kp1>ki4#6NfiS%HpieLEo34+)z%&-o;wLgM1eZ~(EjN4_O+
zhr+9GB-Sq>xx^GcxbAX#=`pdfOV^zX(04-oT4>I++n=8qe)x(YORXV%5GU=Rmu>-I
zwlKYx!OMw@-~!N9IDxiNuISFI2EUAfBvOG3y|!9lkWE?nBcF+<f;^@J31F|ibwIcr
z$f?_kC%RbZ_2WF?X(YrI--DO7z-QU)@uOKS1tdiV$tZcD6cIr63qk%rIm>l&4wr+9
zRFSil@A<+}DKyi|fcdBO&j+9}`!YRYV?)fgZlkRl623hm2?ubalx(`hAL#r)e1Z4;
zwn2IFd57Hp&;1Ix`3L{}hZiPzR-r8h^^4)L0n-B@>lVlsXuJqry4sV`>~QV+)!mBu
z8*1*sH8O%wd6n&2GvnqdmZXM@#z$6y03>?rMKU1n-UG8DhIoB!`YA<Mw!~iiF%84K
z0ZIMkP$0j(kqco*4pQNvweb;1O`<KobW#fJr5v6a3bWkgPEKBKwI8SWt918f+{Gu3
zv~i|Y1^P2hCzAD>sBqgbAISL-5P6~*ybRR0&o0iWZZ@|9x<tvra@Zz71O>sV`EkoD
z%3?O4y~E}u9cE&7W6r^B*(AxJ5+`g&A)o=S#S6E$Sp{3x7_XMi>`Pb;SFK~EYXpvE
z>&{aAk$HjYj2H^c{O^=5%&qG{+lt_v$oi1e)W0d`?krChs&+{;rW@E1q%vp25hKCm
z-?X^|=wZAww|7I9CEn+*d|LWU#xNHx`)-ZZT3t2(oFKt#RdkT9GS4#)=peo_(PZJf
zGF4`St~`2bo|po_opXDn@XiA)4quir+c}@GM^iA(Bq-#M27PvJ=R?NgY=O*>ajqzH
zgxPycW)eG1j9Bm^4Q-&NuYda6ETKfWiPCTn6@r3gn^3Tp6HANWkB~Qh>eNSR1cdHT
zX5ms+CCcSxL(LVx+b(Cxy#Z>Y*S1s(e(=0tiG>TeNrMWdUyn?o9X0x{oTpWH#Q_Xq
zZYmy3(7M6~?w+JrDm<7ZVmH`5_dOH^$}#}bqm?t;5-?7M(H)WgipLlVQhOqPM!KLu
zQB}^p+bO`r@`@*xcu1l{72_)S0zaQLftPfYfXyROb<TFDghCG0R+}zS#c#!u8GhN~
zeh1rD!%GH<omLmJDZ%0U11F2<Cy;HT`R6(M>_xGy$S}AVm>i9X!I@9y;H&~8qC~-F
zOXS@e(h4&{hKu8cka{NM2!Pwey>YUTJJ<5=&~rrIfHR2xS;KmJ^k=%Xnrk;9T+h^n
zvvNo%deLAz#{tJ<f8JlKrCWwy$lPTEe`UxrAb;~$-?|Cz(9S2$vd#`XN-yI+38%~|
z+MPDRh54*!zhuxF7?PH=?D%@G`S#^-*0_m%hf?!Fmxx*%wIl-xe`v6--o`^?*B$M3
zNd`b$;fLFRway7&8v{V5u1xRYC~3Ljs9Y3?7EPx3-j^Gy-a?Z&ixfkGZXDig5j5yd
zEk>>ARGGU4oDaRrA*8&C6{HElU5k<fQUSlb+)&POn24&SA^~FqGy)OgZVK9p%?4c{
zoLU?Tu@;(r0pHmJCfTv*7C0iv_(K)dU7HXr#K4}bqp{gD*d7JMUqm?ObIxa;t=BCY
zas%jqtw}GwstH{S$(7L!86-p!E>?)ddtIU~a#l{PgIj|8)D1Hf{#qC{W8X}#a(6ch
zwfpc?P>XjK3{?;T_vW?c6~lF20)v@QlNPgBIn@`=LODw06XvZNMwj_B#(+Q<W;@Xp
zsN#GU#glL2g7H!F5FMMa%^DNP=K4%>Y0p<&A+2Uggb*(uHUIXN^zW4Mj*be)z3t(E
z+s!C$Jhik9D4j$kfSxX_nj|}e$?DcH#TS(Fo;m{_N+pp7kQb(B2jWa;X23m+6^p(;
zXryGmz`|pPzI}6hWcSOIFxzL1MXz5Qjy_zCTnRBAS)1{}sWXSJU%P?iNHuJ$-SG6l
zAx8|iRB44C3#%2!<EntexdW;KadJG$Ip^0G%5)YaoAN3OykpYB?%+J3I0}6iydK-t
z3#K%I)F3eNDLsVKiSy_@cRru~#P39I_0|;X7WCqDQ$uiVBgz+n^*D>A$%q5RT=$v9
znhsKZHy`3Q^a5*{F)X@JbqSMC;juD9yH%dhPLs8?QY4#)o6r#A{y<3tngEcFNx>*(
znw35t`FU7LWy+d-ySaYoDVQm<0oOP->N0T$B5Et-{@>h)2qw*{#yc?f<6^~#_*uw4
z0flD=SKo#-A87b|dhWM=XMN_c|NX!EdxII$VrIDj%yK#ChX`*3)qW)9Ch(1_E9U+t
z5Uhf_vd`uVc7;q<Q+O$4fV)`hbdgHx>CBsL7eF?i8d^*1%b#Xa2`r*xG@5#mZ*8&X
z%J6P}`^sqs%Ih8STP(L%3Sz%l@s9%Z+ZPywdd1cI4yRP$3upiIUwV3sw`CtW{@lC6
zrIo(>4@o+h$kz@RK%1^Q@@SPHkFOV;fRy(MUZJUC1-1u}q;Re+k~CPR!_2Y;Y;kSD
zN6o6oU4{lx?zD=Mw?U~L;ac-V)<6Y3VA7$_X5u=sOO#G(sq~D`F9Pw&t^tRY+-vl+
zvFZmBeX#J({1)WhT%TZPF&#yOFFSTPh5+<b<c|y@FfEtg3!WJ#+m(MhpCf6z73n$%
z?{!<8VGOWk*4%dhd&C)*F|+9FN|QFy37F7cnUzOt<g}1xoF?cJ_Y2ufY0+&hDF)D$
z9IjpE88s{bclGchy2Q%R;D0b$`k)B&<oU%V4h|W{99-fx^HNmd(wGr0J~79`U&NQX
zJ?;d*H{u(Br*c``V6D+rn3`ypwrldob!#=qltp$hgG9njp_Xiw9LdI!<zg`NRVlGg
z<4sd})tLqEXqwogx5y2I*08w6mmiKMQN7=VJ|qN81G>V}>oHsv$fWY_2wLwA86}5f
z>1*w3d@E`KRdGjIAIPQF96(mm09@g{RY!LSi^91xG<a)VGj0ddR%#-$=%ly|%n?(X
z2cn(exsy$5HQNPs_9RFa{<FAX@ZUCP%~1jUJG`%mLjwZd1ECOrr%>!~l(33i!G|5K
zMl*N}JZI*DVOEWAC9fdAAZ?hfm@W^lz7R(c8Ms%+->U>!Q<80ydF?GE!^#uF%1zX*
zK;y^oOgP4xWN5OZzH$UeKa`2bA7jCO%^0R3k0Nz+%QQX0%|7_iuhy|P`*lFTUVxd+
z_{TOgivPmf0309uQ=iA)`-?yKKmBq;-G~Cl?V>Jz1?|3-9{YKIiH6WhDb}xk^!oau
zo8Wq|2##$Z;l=G>4_&sZnOWJo1YnT2I!W}k4O=J3Wmc($jUd|j&Mr&cw`B8gP1rg(
z%EF(*fYFy)s1J04F;8fhbpuzAkN{KNh=<M1=s!8iWu%f0qZ(0Sr_-jYIG)|U1%x$q
z+|Opa5b|kAVHdWOA<JiZZij<S;I&I&1$hR`_w7H>Wx61@2Jf<9(mtxPpb&CEma5~0
zE>D8IxWQSUPa_<LN%o6)lw>NOlQ8F)r0<g1f<E34TMah_vzGo&+ygL0IPVAi8%kc@
z<MiMqy_Qi+Vhh;q<{(tNuSg9F{Y(q$nXe^>Vq8fF$g-!cgGfCvDaA?8b^rQhBn5@-
ztIQh^1u(i*{1&ma?WGEcP^nZQm`C-E5hQ?VFmIs0^I<4%$sJKAqFAF7e8|j+ffqP*
zPT2nKlM6z21cj}o&aP{6kB3_BE6MIU!{1xw-y3{IOmHmffmED}$4G{->_tYBj^2w7
zl|fH*!(HeOI5AlI;A2;J?_xDeW$z<h0Y*u=QF)ahx+V_GV6ZAJq_Dx3m2o!e35R?V
zhl45m8xTR+F;*%=d+?fFUSpECuLFm+H$y;v`G#G4=zpDZ3UEb@*iH$?`{<%sJz5Hj
z^J1tgI0o8?3d02GQAV1Y+OHYvgs`aw3&%|1h2Ap3`b!d6StNgJ8*D#FXt~sby1-&B
z(53)HahQfK!fsq*WZ+(TsK6KAoSwXWS2cwQ9R#)7G_tF|>u8I`0(3-MNbZj>HS9A#
zWUM{*4n3bx$9RGAG<}E$QJOC%2XE0y+A*l$<ZS$C$^js)iGnrfn*5CB`%tc<-9pYY
z4xD#JkF)c-%nCW*!L*B3J>Z+bx7@FJ2d~xbaojpPf&*?{-yuHpfoHxy8gqq?JHPuM
z%uoO1AN=DVzRc5xxLZ;C6FtI$lVhOY8Xp9I53E8S3xF4Aw#JD@df~Rqss*sGI>w-=
zN<v{du%)4^91tGx&b9UP_#FPCMRCnp;F-ye!GcBapC2e0L#76p<)p|UY)^Mx^fTvr
z<IB%=Z7Mn0J~I1+$+GtcXMeD-uUeGo{pqxAAo$g8e{KRhtZ|U<UC}1NR1gLF@rPHG
zjHTkd`LbFgdES3CvgJuMfG(T0x!$MLM$3S(YUTH*Hy~ojvnzlCV{W44Q+mAwp@~7M
znu5i8TKj@2pK!a-PpKd{3m@GnZCG55axC=h$J}+J@3L_5MYbvk1Zdp}zxeyQCvvEZ
z(PN8IS7F|+i$Axz+ztHhrHEu2VT$0vC}V(ZI|MTd2PeC^B8oW%==)vi@iAsr>|L-=
zFEw6SJpv7{1DAa<F?ikUA>Pq)EY#G(e9{~ajClq}gm|qEVd=CQiV%A_;?BI()LFn`
zM%d;^oyHKQgb_w`VA5Dx`p~<{rN!>X2f5P`9R`B^?#teE&Zo@*k>?i5hoEruv0YpO
zls*ja{at(C*vNeWEAI_nPrLWrA2q-2O;_)*=dcKN^R@`s9KR<5+7P(&N6s#wR7fXz
z1(9jhj$0cD;Q^e1k11eO&Mjnf8*GHu?X0psbSi!uWwjk~%Y6l<ztmh4!0_DrI}9S|
zo%%C4wZ!lYX(>ka(39Wbw492rUN0ZnY@vL&<Ob}1NDp-lbi(MX?peY9-jYRU)J=M4
z!Gm=7RmIv4*mD#sE2<;S%wkr}K&rt=W~<?VyFc9LU{Ko$;J6@y%d;iU9Edf^(nV*C
zSE;Ee=)F-}wM}_6P)yP|etzK8SJOvl3Pap~S7_yE)KaIi0|6j5h?qW#ZFjB+ww`EG
zbEU*yq77Q45S(?+H+9&D7<~`2O@i>tZJeE(^b;Q_E&SWRH&gVo3VZ=M;jqNj7sFY}
z%*#&sRIkEbX03-{_DO6Hx|UxnqV5X~vWe$6_OCK0Z+xG3y&PoR_!tzj?*UfbEKHk#
zS$lv=b_un@Up&2mZh&t;vz=v$<%^w0d%zS}Yze|6%_?I>=<{a$ZQ4We);%5NSWHEh
z=-_mMKLX^3lF`#<hF^opZofd=(X6s0l;V0Fm?>odOj2a9R!u0K>;z50w$g8af?MoD
z+jzIJisA_quM{=;@s*Z+bF+!SXMj0$u>qecBiGlIIFqd}C$4xpKal4^%Yc|`iI357
z!Pjm0+<H*x@^v8H(;7UB<53PIffEX%jXmZBssR=0cYtfHhoEW|g5I`(DnmrQwiz$a
zoGJ^C&C8V!^8lS`H|aj?$ef}x6?g2Pi|3tUuISZ-ME2Yc^N>*!gmu8avC?1OOcsv8
z5JQw45NvmIpcpSO`0MOb9tjTfihc<d16_Dr=<wXz&-f)x92BS<3r{J_Or(X6KfA*h
z_N;oAwti6Vc+ji>)Z7`~TEGU#8K!s)kFU#iV$9l=-KqQ9W{jQz1pPL#xtf$c7Tu31
zxSGmEi4ejc=4+U}2}~-E7Ji$AQuih5)w`8~4HS%{9^CQ3fvYW=#sOF^nsNDRUsq8m
zZMTG56-wyJAnRr%Arx(-X{pVBYxSBjb|wI9y025gT#a>vE8}fsi<QSmugNLPv{r;r
zO?4QeN%>dTymA1OR0Am5DsGNVBT#?+*(DyhuTo@ecB!lZ$_HFLQ_vTbd@r>4e&3&S
zpCXdLa7$2alrg7}hl<fDD3fyrHj#CRs`6vslAe?7UmY2G7_anKsIt4hunK*xlQ%xh
zSE6!o;>$m;^Wkm|8u%x7Nh(be{GQo3Fr9u4GX>HQ(GTL>$Nv|i@;~_PAHIAAEZYZ>
zC<Tkva<L<!qlTpVwcwwk({T(`wkL}@tE2@86tGl!Ygb4X!L}S&1>*Ay?{WyZZYve;
zQ)3jm{jY`65d^+>WxA6irb&ezC9b|-k}HM8F)qx}8O6hER+|d<&9S2NzH|N*b3uw7
z!j8rN9)e$F)X9~-5SV3L_M-gSPj9qY!t=9%{Q7mV_MITY@EC>x^F6%2;~*52a@;IX
z5DKR0iz}&GpAp}>w;V;0n4c7pXe$Nd2MhekgXP2&N+i2ghnB~gQ<onKToW_w&>_r3
z7;GJeGdJ2QGt8oF1+yIT>h_X=ik_j*G;G<%IkG>{w~yhkiS9e+|Fz$csxp@kw!@b(
z!!iIZ23yiN2&z-WI3JrvOM4$a2DrQx@m@6M7!G}a!=qaaMwrRM13jO!!XCE`if%wF
zxv;y<bum+Ay^?gUee##7bO<_+qaS!TneDx<P1-zEFNmp|+-hm|2+cy1!6}CXEOI(>
z2)RgJS_=h<{hnRt$n4JzSZB0z8#nJm%wBGqEMIQ<bk{J7pfz}|J<;c~w+Rt>IAYDP
zn`HJ`{7sX>?HjmXmnlCp7k22|1n&YN9F#(c_#1xk(ql|4M_UiEy?TnF<-Td>@V=H_
zby!;Byzm-mg?)@<(6X5-)+}1#P)8oga&vLIK4Sqy^;MUX9#!BaVoqH}iK-MW_f@$p
zJt`;%Z*H%ditl7wKxqlbgSE#I5i1?1MFEhbv;%b%Lk2vpTV1Vl+rq&+<Cj83@$FhX
zh{&0Km$P(6H~2>%=J$RjHf~F2B3_I(N)(->m5DQ0<+HOF@k;DT2IaWu^jM(V(Ed_t
zG5m2*^?BGhs)ID9ErFupuTEqM@u8+#@W`1JFVVt;TOGR{mgPSa`sYV;E`XJskkfQX
zYnur0I%`!ZqBCUG2;zx4sv*eIIM%%%*{<9RpZqRl@L&A$AB}wyxcdKuswe~(U9|!*
z5_^l%K6<*-4Zu7>^-ca1?I2~qPk?2CT2T1M*e=v}vFQhZmhRi~Wx+ags0NiMdwLwM
z+-i)awPH8)xsqB>0F4hgc<b<rvw`#geSZ#t*(<5`457u<ob1qk68!oEu3N>0Mw%zM
z$b|!28+VuLvs)Wlp+eu_N2A2@nmy-_Jy~%zH11o=vrtFg^!dT|SHedLc5NrgBejz3
z65z?)(u`FHh)K~1I0o;3kHd6msFmcz?k;36+Zh<KuRS^#vubw-&L$#(*s$Gz8T}jJ
zi2R5vqGgbD#760L?2EI3eL$8?gvEgDzO21yMc(dmsj%x(!Ky0=imJSVoIEgHL*LCy
zWw7AjOboYB6*|j>eS#1x@VElHx@H5TakG`>;-86ZP)hzjWF9b9pC2I0Hp!rFd-Zy(
z6k5C5Ok3P+O|wfMVuRK|$KG?HsmyjH$1tsO374wt1?%;Zu+wb8d{QXNsmuIeWdy@M
z0?IRXhT(Y8q%UX2K^Ngj0_f5@+Q69s32><A=2h}hXCSbk+3Ib&>F&CcgmCsUJsGOQ
zVj_N!>pL@PZuacsIsm>S6E*UGV_`M=q>aVm?xNldL}2Y9m{eEr8v-lKEjUd-9f<19
zFu2!**@Ni^K_g3afVp>(U2!;Q^jaq-?uA%0ZY3D(YZC?;7ADFEJlmbZB$Pxskg<I9
z&zyBVPwJWNd>)*I-HKnWB22sSFr-u}N_0Q9=~<(J28w{S%4_wU)=uJQ;Ds&+L_?o%
zEnkQ~)$wM~abkG<LhH_<Tfx7O`}$@Cjt6sP+LKr9b|pX#<(`9m?HP0ML$RMRwyr=|
z*2z6Q5h<lsW+O@TFOv`UI^;C8p4q@|){xh0DGP6x1ml{=Iq<_9f9}ufxBcxO{t~bH
zGW1PIZCWZ|kPo)X>9ruQ3xx4$vto_5;~Nm%V7#Naa$&qx?rV77jIuCNvCUOAr=L2p
z($=0(GVT0h5or77IyNqQT2fjk4M1{^Ta*C*>CZp!uNOIWbOC|4?=VJt-sRo;SPJVL
z5c5IRI!Jl*5k#7!GnUdII8TWRJ;Kf{?p39E+HyjTp>Cc6GhsGjsoJBG<N+W-9D{M5
z#G9~`ND~>7sm8Ze1{ZB0^lp#4m3^V0Ya=3PXEy~np^c#T#MC^upzsgy%z2AmHXgan
zUx7OUWzVC;DHy_b=r>lbfnx*Yf^}IObc|uUd&WITrmLfvo$D70cXg95z6Ioj`0I~C
zMWd>A)>)<n_%>9X`sU`9V4Pg0lSA-34Tw3B7n@sC1-Owim}`-8Lqe%hXu1NazB6re
zg$aOALb`yNIco?B=)5-#4l^w*KD}56Zy%eG<LbE;TzHc%tZGAKb;|Q5a2;PI24Uu6
zlDuT=F=(xgayTy00bS7;ZE;y|6Ujt=H;7pI*3uH(Z}!NfI5#mRdbujw?Qfpe1?EBp
ze|%xyrGfAw99{iRM1dI>s{ocZ*LEA%EGH{Tng5>DI7uxMCa++-4J5-k5ffq`V{g!7
zMjtK>*>f&Q(z)5g7_WL7o7IC%;<z@3t-YwgU`;oWn6P$-o;n?<rL%5j<Ci)YnUOCn
zhx8i2nOJ`H_VK6_Abdk<r3j`BlmnNrui@cmyZjo6e=5w<6rL@|O}TBz=J5}}|HRf!
zhA?}EQi!&nED*Q}G|6hW&8)p=n$RBXW8gBfO2>86X0j{?O%%}j8=4DzaR#+dAT3@B
zRGI<nuUWuGYHF`Cj5+4PUkf&wzg`g0V-1LeyQkxJPA`|3P`BM|slbaovY9(_igZUP
zX*nK?aWJ+diSai%Ba_q4O1`gRwul(@*Pr;Wk!1hg|NMJDquc)g0hm?;)YM{y2TuQh
z%+(zMio4fmx7G%Dp?X9P9+KfW{xQ(;=fTsIgv|w5c}0N5JxzgM(kKULPI{|@)~e7A
zJO12d3b;HB$+ms{c;(6=%|&TP9qGJ7;;NG?(naTujR%!luIKvr(Ym0{P5U6TRpWSQ
z*k*;t0gKOmck)P+6jWokm>LqDJ{VcgQ#zZBy7aYh0knH#fdJI#lsxx3Z?S|FuN4x*
zC6S}&tU_G#ElkLxh?BoKU7>hM0l<VHvXeL+G#4Q*+rKdxu-2#`iKGtzgJj}@8Nd0D
zgR|=)eg&M_Q$?frnUVyqC!W?O_5zpdw)28my-nyI)uMAV?2y6(8{Lx#AAqMkjmu);
z&2=csY)b`}+X8igE;yIEd520h8MgK+t`?Rkh(?^{b~b9O(@QU_vINqA2L;IGmHo8C
z#wOVYYnQ(X8uQ00$E{ln9sj_TUgCjNm|?T^LTbaM50XTjfI(wPAPBL1WPRo+w;t;q
zPl^+wDuK8688CXZB%vlsVP3jFx;#3%NY)a0VduokkS`Z?_6u7#kv1){lAX3TW58TI
z1@|Ze8zf6*$?r>D2L*s-r{ldOrRZdnb!5_K0i{!|_B9@X;opA5Al1$b^5wghJjiW>
z4X%<#oUTj(&(x>I9~;|@eL!+og0HNbs5`+wSb7hBXDh{<+}o$uWZtC3ZiFqH1Zyg6
zxw@E14weV(%V}J&z5F}$x&i3RJjO7M&>4c9cC=oE*JM)Pv?0WmA2w2qx_cjJRne72
zs@+nakoD(5?+dnM>}xedKoeYLrE=mS2tV;KoOu0(s?7k@8URArIXCx4mm0mo1l*h^
zRsibF!gmWQiyhMdeLEm87|PV$8O$G%m+2J*mDNwLn>PzWs`WyMYa}vL09U5$i>-`Y
zwpqGw_Kgx47Ic~ErrckCd0zyp{_^&(e*L%ip)0hs;C5|LK!*_9JOZSUq6KKLDp_GB
z7TV5Bz#C#>Ogx;r;!$AAPYfWKLNuAJwsMaFeZS54uXM7*6ZyxeNOkyUn5rC<-@sd%
z-<lq4Yf>P^T;z)55#wl;Y<uGh9948KUzXHAH4@QzT~cVz%Me-Cl`SgEHYXUDpzE{P
zNHBnN6-@FS7Ht6>UskX*<)INd7lBx&4zkhYQp6Gvmazc_`;qxpc~%?Fy>Y=jS#wTF
zb(LXhT2r*D0EjXP`I}iSiJF~aaUvPQDp(wQbk4(r{_*G&ijRlIRbd%8(w3;?AYywQ
zPio7A?BjbLfJ_2c23%ICoYYOSInO5H=a9e=cSyC=c_So{GjxLRfzO02ig6Q}D3*Gg
zmHaUSs#8dRSD?)E6Fn+(*nI_Gd{IUN914sjhqVL!<bDSXC!5ItX`m{@8hd|ZVJ7+v
z*}5roRxScG-)rKCyS9ra_--dHT=;rjU;ut4H4$}XkXiGS#ANRYxkY9jz><q)t~|cI
zO`C;BL7m}X2)dEJ8tp<GDVjCx&C(90w<sylXVn@TEGXZuUBC8r?4w`~UaoIftA&Fp
z<^8rb4n;@dp6Mu)Rs<@!&vM_aDU&ImRPPmXn*h6%YPPXhqF|`oG$t$KZ55Y+?5<a_
zh!k0bG#?bhN?|H$apVB}{08{@h@>?dLQxUEs1|E?Wotst&FzompRm#cG#-x?7hGrZ
zIDPV2vsEvop>G}1GTeiId|fAQM?1O3J?xzsig=*W#TsMsXm_Bthq{BL<bdA;&`vck
zJ;qQ9V|xS(B+Hb)$6sX80^T8)m=`w#ia(;pGESA@y*{@M%TF-i<4IceyJ<BI7XL_M
z3@uXCcjRh4z-vqd7e~qQarCi0Q`(2$rak!zS}fsn>pK%jO$w~|<wwEmF;F->5ehoG
z$m^B1FNMPd9Sb0!t-&hCZ(-{k0NbmypxyHF<J$n>0bmHEEpwK5rla;)>w>_Tb#6rw
zkiRaidbK9B#NsMOdr9j10&M6vg77B<(**n;EcFW^$8DcIsRB|85U1oeV(pj@*gmhV
z>9EeSfE`#spX!B%@o$Dcn(|rlJ(PX&GA88}9TZT6npI3H_hJ3p9xP(dR9D~zcib!~
z83OBq6GK&)*iv<)NlILjNIe%I*^04v9EuhnhKMEe)<JC9QhT*vdG}X<ZK7P#X<~f3
zW(A{_Z|6M<CnGagOS`MZioJ{k5@*6^K(ycZIG=ho)M@SYg0aXV!0F)_<lu6FdS|5F
z&Dy?I>;PVoU~=Lxdap@j@{4d7K$Cv5PA*(~=`eh+ilnaMLx*y36;oK!{N8#){({>+
zes7c=CQU#Oh=Q%kE}w>daypa%CxL4WZnSh9&TAIZ#ubyu3H)usZo5hdCy=qhTyI7@
z5R=&(oO5>m;7KJ0Z-7*GnK(sqf9WP~09^hk=_;sfC}5<@n_sp_;3G85<$pKPN(C^}
z|0cyK1PjQxgoM7&W&Q$_t2~+Q#m#&nC7P#_x~)ZPBs6c!F07f*mxyXyO0ZtO1`Pss
z0~7I0M<w_s^{?D}_p?h@OaMALq$E^K2h-xetxf_WG`#|HT-wG+XF>8Q;&{DOQ0T9H
z;RpcoPOd6I_W@M{0`gNi)b#A;MV+G>udImU9i9-{P+#rKs6DG=mh!p+K;H3QXHA@4
z7e&#6Q13C4eky?@7B{O~Pef?0q?xO;XRx%h#if7-5p1i%-(r_e9I2)~8<~QMiQ^uO
z!dzafg;npx^v~>m#7@3-N;FlTi8vm*4l>R?TjteD5}4nY6yt`kzc6jZLfvBYBsM##
z@(lCsj(PBBZ!Dq`eEo+j5Y8YaDEL`K%^QnK1?U1@ZES(4-mDm2&;2rgPE?O{nSab4
z?viAW0g4Z#xYEa94q#L%oqj5($Tm2@#zCade)UM5J<Ci0lEN&{Hh@|L)fE5wDUt60
z-Ed1&y~BvcR`(ce$|Ar?Mw~MUs%E-KmmTd6lQh^nF3}#KWo9s|c6#}PgFp-a64})V
zTEPNM%V&P_35q1(o%HjXdHD(Jy5?cp2AAvS=YynW)r#q00-<paO)B<{YpVx0$)H^m
zsuvY+ykyWe<7Z)wf&}C$X>o9TJPi{HZ^C6OH%8^Fk#c#nCX2)-W0W|U(}$UfDDOpm
zNXwebOq69CD0F2b(_(dgK*Q_dqB`{${a~uF1Ozj<SNA<O9@9jDu-sah7pW#E)lf5o
zD7^kiQ3Awu(Z97JPtR<Tddl%w5dJ}KP2iCfTo96}Y`__oYHQ{JR_^O{f?Bbm!0_-!
zJGLMS;paY9welu<KzWEK_^M|d$1^3Nr@0LW1}*ml+2XJ$74YH{mMwfef^3%SQOTH}
z`bs$LYbclSGLd9SY1Q-+Kf%p=Z{HS1Htw;8<veO*(p*XH2e<-X0}BvH|4XFyQPVH2
zYT^Qp*^M4!Is*C%Dm8|*R5;ZTFn?{yb&7!(UI8hLltmYNzof#TMf+c(csiLbF?}<s
zD1-5?24My90A2a{3rj1*H0Iu>ETX^`{Av{gN&r!vBY`@77+)*u#(qYW9Xa-W#E%b^
zOgmf+T$Ta0$5nx;W7a3gl+o_I%W`>QTi))4;QM8U!$DwwR7xKp3$yMU&EWdw`u4=y
zJ(p|yLke#t+|b~4ZdG?8%fjZ4cyGWvWdf6cX6Yo{2J58=AdNFi?44qMPaD8e0HJyR
zFZ@1&z<>3tH%<a4W9&ybKP`x4tp$HOwt(nhE84D(fIo#Cg0=pIolr<e`?6ej&`jlz
z&+`Pw0<iGzt%6|nf%JXJ$4@|oKmR$dtJ!Bu2uOm=I6pam(YIsDB(wltLGsPVm%vof
zugEHo5yu!VtvcZ(w^jYbS$e2cg6j`69;AYObUA*m<D1uh)HDElrkWOpOuEg*Z_rzd
z6UND8F;T>U?TDWwAN4mWnBp#-F>JQNN(4Ij+}z&Brj%rn1KwR;^s>??>W7&XT<Y0u
z{>|b{0jax;z%AIjW0;<%j#mY`d<Ug`Rz%*8XVHFQ-^rYoYNi^E=CBnYZxT6l9N;ZD
zWq8u#37IX6rAb9s_8A_~QEe?_W(bva#=yNDb-prXgw45%ZlGxbTN??}Id1hW6pEcU
zm^5xdG<%l;*?!d&;d7ZYGrx2NSf0}h{>f?gNlTbnyOY!Jab*TnE;EDQLL`w9_JS3^
zkpqSWbVJj?#hsVb>Z42BMQ>*O2HS7lDS8_#7}pmDzF&AH%}9_^F0!2=Tms=$jG28H
zx;{%o!z0+Xq>@DcP(jOvXg~Y?^b6Q<1)VQWeaH2INhrNbbkEC<0pTa-s}OAGU9>~j
z>aigK<}AbA;qtC6!en5qzd*_#sg&fE^syF!ghE-*+gw%DDx_&b=%DpX8ldca@P3A6
zlFQ13NR#Lc71u|wyaswmt4i)gvnXS3>rg8$OOG><QAvq~G!pT9Z!-#9t#+6Jbd8{0
z*GD3{uFbS$fR1^Vi-ER;Vavm+v~pOSM2>1sto#Eg6@We;rgIik7LnQ*z|D^NL0WM~
zj0@0lUQlq41Q%=zipT}lVPOJOVd&M?+?>9>fL*?v3SmpO3~$7`(0b{|)dZd}khR2w
zATA}iXu^)6Tm<6mTc7yU;Ow9M&;Q#0`4&`)#62@`bWvVX1NAM5WEar)4QfGILh@0u
z+2b2`E3gl|1$ROHK%_MD>bumFcNT-dRN(Q2m5tryv0JzX5|neAeZqjV?BRylkwYuD
zb!UC?d~eJW%Y&RjK7k#jbYDyl8e2ZQIMZE1SHne~O|W-t)w9OgA!Q7%C&B4n%`KqC
zE&g^A8ckX?aK2k2Vz5mXhI{{Vh5q2E8}#BpL&kA6gQ9>6p+!EsrDkd$IB!MB@T!o{
z<c{b{!0*1hut@rFbE>dD075Mj*lTd!36N5()iBH^8<;&}Gmpm9z>s$X3Si2vngR#r
zM?ZRPU2_g_mB@D@SjU7A5IQ^Wn!EwETx1BXX(<`xNfzz07AnzsLh8xMqJv|>H{Jo9
zX$h~Tuehut7PH6ho^k5X6*=*nmLZd?Z<uKqZdZb$&FtvSsdOGApeDfk$-Q%e!%+a?
z&DxM`b{eL<1QkU=TJm&nD9&z3k+o+y7tmhf2c0z_%E1$|+sonSTDBhNi#-2)8UVxk
z(G;MnxDbvVg5gqV4~iznjScAsF||$)hfQ{^K3>Uj-2{tJ0e}dtuRsnUX`(CGI1g6v
z#+@0^vqcwd7n+lMA`kW6^fPN!osYzsEk(AY_5p|b9jX-~HGdZAO>;!IYhJOef|f*<
zq_P$^Si6j8mhy)}qitb4qN$mtp+YC(L9C}-$m{)Pbpb8SZ;@+1noYs9Bd6&|gU;9l
ziZ1fEkJ$y&R@{Ix@q=!?URsDfR;yG9oY6>7MK1)jz;)3c(DN_;_>w8XUOI@c_0<Na
zOy}swq_x<3YQtF8f9(|qL_;kh6#%>u91jEK(n)tUGnn%ZYop!ATgHspRD}xbOQ_fv
z{pZ@Hq)}HxUk~1*wfFz~<{#b{_X0@*B@+Q@`yuI}3dk$u@6ztVQ(#ft#Tr%Uq%r_#
zK9H?iE~Y7VHC=S@8n1Rr2<DI>YCQ(Av+x-OHX-<n1(YV8wnwDQPA`wM%#G&<dxsA!
zq^lwje(d2IYu>mILSHKcp5SBZ7aH9Zfn~QQxDe5}x@4?8z~}NehpE7@#hJ|!)zVu<
znLxB9D33Jl{Mpc$5oe!iD%}KtRSd8K&XF%IM080%|KKw4SX2-S%Hc`&uao1d8ht=&
zqLv-tRVFB|W-k)ZuM|V8*c~)5Ytuk8T7%tW^c-;$jBka*6>4AiBS&`xQ3q&qkY2!q
z=qxY;oyG8ky^y$yoB2{8g$#`~e)ri8f`g@2a0#;ma&r)LN1@Lj814<V)`<nuJBKdc
z0s;R&iM|>t%T&{JXD+6x2Fo*Q9!dwDf8kPaQ@8*2x>c>g$*^ng1fQxi^i8?hn=!l}
zT)eVL+9?WaCO%|V&U%8ka<EPY?(9kBiE=tjp5jj$Z`n6``COD}Kz_tm#kaqH=&$gN
zuPBn=;(Lainl=X`sE*Y+WwJ=-_9~KFvQe`)flAa-P}jn&waBU@PhJlsoH3@q{nw26
zE2<vKzK{!8woG<*In}kq>wJQ=3EEMqWqgi^d!CgRZiGid?gYeSjhZwd?8t*<z_QY7
ztQ_{i<RW<<r3JjH%d^$(Aeo(L6k>Z9T#GT*)^bb@ucV{uINM>$hRFH|xC8(=s5~?*
zPT0@*!<a{-?Y44D@cJPLYcy0VUi$?a;i7w(7@2d-ir@luqUm9{Fd)aSs2b4@OrkYN
zg!+=PKU?x<RyCV1wEZ$~=y(L?1nHS9__4EkabypHQlu+)r6Lg>bl8=}qLhU5-se*I
z;>(A%X4KC$RVfydF=qnd$J}>k#BE`(w!>lf|KzWWr>}yi-1H`vO8WLPPExtPI{@<H
zXd4>Yn!>`Q_x_ZO5a$U93sW>~X(4$>YeNe)qE3RZb-r6);<e<XY3Q!X<@B-X(Bn`>
z)>S|D)QOql(Wm1(1zsh@M}DL>K>buMTAlzoa_^rFcuI|_ST$Y7)15I?$=3$?v^TCa
z9Bx%uP}349?hv@HshXY&EPl|MXbS{`<tk)X0_Dz&QQ>i&Ckc6!0xNtuVVlLOM7<^R
z{Z)h?EaI&PQw6mrMZ_>XdIAJ%M#u-m<$d##P7?s(Cr>7Obd1R>bo3eC`(QsWxQtmY
z8<8_~EFROSsSPc8Jv%`l7y`V6&PDRXA8H)jR8ip+ymgNlydv3d>!>I96=ZDyv&;JB
z;*k`6($fb1_F{Q1-j9i!fyqg3fm&+dnCGcf)vG&FLjE@Ylhd5Q!;PbxevsSo2~d)I
zjrSnSn018!TzF%d+}2DJoW$F+ICC`TlQ^$WCb?F%Y247%RE)M`S%vRH!lBvBQb#74
z!M2vH3?Ag(?&qn@RAZLn9@IWYHj9bUg4My3Yj;m>e)}dht*;O7Jrsvf8W5N)O2<EO
zY$Xt@s2WTJt&+GRn;yV>FybeJ1l)pH#XG^6*TAI9SG7*vrsRjb6)so)JrscbDI)ev
zb`WFho8*(g^Od8MudrCzK;HncU`?y|8*7+JFz&)zX-s(N)9YWjePfS6RvlNFTY)Cb
zqUBNDB%DQc0C#}cB@|;jybghzm>@(f&rp)4hE7G%P-qLA8Y8SmU_oT|hugKk(EnP@
zZ=GrRJ{nhr`N*BQB(`jlrm88dI*W>fX&MQ_5tD(>qBkARsjf5%eIJZG3m%ps!8DZn
z?eWm;(o;=F3qd79@2UzI9J5lYen&Vm1TcGm?P&)o9bWq6uk#fB^}qM8{NCqy$LD~<
z1;|EXVU4QcqCY(WfbyqG_`{?NL`m<@9*5AmO{WO-JqRMGcF6lrDpfzm4ieFy`Y2~;
zd^T3t5*6T#hZ4gZ{}YV+DY^W|j{=u!%rO^m(jyB{$scPjFrC;Rg?CuAH++*rW?jb7
zTR^eRu2@OY(aKTj!Iee^rNGV}pIoHZ))+B!+_KM&Nz?FA^_aK~a>_FSRNqx0BLOea
zfc+j|WKb^?EgNJ54asYiBoHRJ@8fVowidw@GXV?4R*Dfqp@iIdj{y|$7YI>7PjN0?
z1eH>PiWaf#NnRs@tE&uA!evQ8gTm+ohRb_$Z{c<fM|%=x9I0Sd=vn|9tR5}3VuyV^
zy)yWb80;e>F|PPuqzsFTEYZ-oj(2QYj$Q@;sXe!B+#QM7Z?<dUuGtyDgk2Z;Z(AOF
z)vVgah7er$!FjB|51^eGe-Pkg&BPUqQ+q6&J}h7}cVd8}ftQGQ0exFXz`_N1?S$R4
z=s}QtzS~mB#mVdTAG)0Tz_{skK2Bci6M<vS4fh5NrZ&iLL#sY`mgT%$*Z_fvAQPA)
zc~9A@=2BjKxGTM5jZ~$Al2eizSMMDyi|g!>O)&BRhht@$p^Xh~X4uE#u@aP5mDhQ{
zx$_)=1(93XGOQl~pr0AK?4tO(6C|^kzN^AY$o!@G>7V_^+&dEMl2I9-ad>H=$O5lf
ziC|KGp9*VAEm6L3*;x)0D#T_}a=fI0Lc?o*Re>mw)Rq<2c4Av7FRlvuHXw%Wc??95
zgRt^SD+P_`j=aa7C6|_~3qW`&7Troh_3G(Cx-2X$X=po+(Q1JkB4wOGqbB%7iKgpo
zu)k7g9FnWM*kp%qmW}{|Dc^F!v3yzROGlYrF!E}dvZZTSdtD-&_9zpRszQgSd$^nV
za_N&iq%zdM55$0GRi|2>f8h^W*JvTQ$xVy_DiUd=#yvFMBdWkAkhC0aHI{s#v*V$I
zul>{{Aw#bnyt4?h@u)%yM`urWN-BWItR+~to~ukOPhiTYdls(dw>d*o2u6UX>aBD(
z$uC*5Mu4mL#mvO~q{`xVJ$lvSIXV+jr?K)53s_$SVT}kD9_CeS?O=|LU%#~BdIflS
z!XHsilLMmrl8FnWd~k!8^vBasi+Le+v`#$1dM>0`c=-WL9s@MJ>8>6<2(b@(K%}lo
zbs@IrGx=h|1-S4XpX@{ajUMPDDW;v@0tNwL8rVp|Y@+EsIywO|b3W$-yi#QWdr(UF
z{9+_iup_8gM3qQhT89)nsjZ%SFYy$iyCB_pV1jv|%Z~ATd8)YLJ&_dT+~BsW#HJ7o
zCldF2eo6)nBhEc?_>)Zf59auss$OdPFuqmbQav_01UEOmSBMbSYJJ5}=C6mtZ+PQ5
zI$A=(YW)tD-+$ekq>F1_t%YH@;Mi7-R{K=cZ5~5ZRKMl}vfjtJ1vgPqFU?Q6Sj&U<
zsdOY<nV*8UB5&TnxkO1m(cs}&k2bH4MuNn&E_e|17j(J4uG2hbq(fk8NS>*oje7@z
zKv<*<>5o!{dIpHXC>2til7S?DjF1VlEif8>ZT=CB2P&Ar)LAPOs_Sc^u;$N8UqYj`
ziFX)fjt7i0*g`h)W()^Jg5il!MS2?(-3PPG2p#8(bDs2(c*M1FXAFl;VNo~mE(<3%
zuc<g#+NGqnayc)_N6Rs#>gt8JtPmi!--#M?66~?r^t~T~T7qy+LzG<I1`2E|<F8^-
zQZJAuX3A{2B_8FFmn&LoIO|4$x^eK2Q(M~>0N;d(lPBjqL1+?DfJzkExLV7MMcB_}
z|3`#WfAHV_@IRd3H_~9FfdYV`pFLAdDu1pa(J~ydN3nr505OmTz{Ix0P`mS8=4UVC
z#9KLg_&mMfg1<A3bSi}c(aZg5gVztWG4RW%`%Az(kQZty^uDP%KOe>8|5IS5<*bDA
zjUxv$RVC75rF{N2C;U`4Ra~eDe{p7Gm)S;fmErITPtfST*UuW*l;2dCJ5pNX6<}>@
z<5mDb4%#s}mLLh0OiVf=J58~aVw+s@n{XyydSPj`G&o*Q-uKTyN~;SuN1cG~nt%ye
z?HHbMeLEYd?e@&M$z1_MGU0Bo2JxWpxT0h^LMs!EstLO4?JReKXlgJWrItitL$cI9
z0g>V)&r%>uX!e9lc7Me}%8}&G^}{jZmbt=((KLpGCWXGPp&+WNw^I;q?*C|+Fz0pz
zGgdq7B+oYxU=(}}?*Y&dNML)tF<LNAZtT+Cz|4hp?(9=R!5Jv6U>vN=>fW@eGT$cM
zT+TjPYbzgh_0A;(878LFqY%|KiMEpfr)QK#9MnXlTp(W~O#&L(o<KeB{xr!wLIb+O
z)5NN^#_lQN#|@g&Cv23#un^W$ZQ&KD18t~eJE8z@p<Y$|sSj)51W!Nhq6815_w$lh
z4b$3dwYs-epwV4fOZ&Cq58`I^<(7W}sGt}{2d2}3OCUoR=D`wXCAXksTcZjRn+!gL
z&hXzg#YFQXteXh7urrP)O#E^$2K*2UFBE`GJZ!3reamSH@CO|&I)%wa#8nsuNly+O
zPWqd|Odoc5(Ll;QmF&N#={p5LRROr6;>5iB+aX(newb~!4fw)h9#9Ub;)HWaLy^>i
zmN%h6_QiFxE&zvX`8NLL>=0pKFR!&<HR!i6`eh<0+t>Xy80?HW|0MpmlF|1%XFC<v
z=}Hj-Fg@^_7XAaKS0Y9B%XNocqD@xt9^Yp}+0#~-E<Z*Ee&S$=Wsj`rm^8X*_?TW-
z5hqm!h|<B>9&k@wv1>MixCo%RkX2cxJVoT$J4H~-aaDkaqSYTQvT7(T#Q>bO(Or0N
zTSZpU6pL5aar@|ExwNX#|IXFBF;%%Ng59Y&aLKVG9n43~&QDzd|Bjk!TH_s`00kH-
z?wVwh1gM!t(9Xg*v!?9j>#{WFubI#-0Jg)24pwHwQul4vCJ9rk2*AK9m=K)u;sYtZ
zsGb!1`NatkL=55EjApq4f(R-`qV;1?ELE&++|_q~Zy3hPBH?_cbtb!p1v%5R>qYDq
z&l}4&Yk<-PJg%50zz3`fY01~n2Y_kdhz!v~Vw<lsRZ71jx|b;>sug7+(gyYCLAFd%
zr>iR$j22$m?#=GKRT4$3^Zk}TG2lKFu)dM|lyDtre&yJ~0&v9aN<ncyOw`dsg)iVT
zEO>2+iEVc9vkDhPSj4Y^Nmy_0${C~-4{?Oqt+2TifkWJ2A`E#p-!t!l>geHMw0G`M
zCO}uBT|Ep&rR-tp1Kt^aPv6ofUjuHWU@pKFShALs*HB3`75vAhY{LTA#D7{ZzKoF&
zPj3_=!TW0r>-|KQ#{WR5u<4Rn@V9W++e?-@nG^bgD9duEdn-o?h0zlB2xn@kl8DiK
zHNON!Miia==&Qm!>rb1T*Blhi4EQLczL%W7z$rL`Kj+?ldQC`7Gn7z9!r00wZR|jU
z+y0EZ2;ftN-vPryM5F$L=(cG$$l-g4>(Fi3V);@t8;X@V=|rk!H!k4VXYO&d<7YLH
zZN~k1Ccded&N{N&!{<16L;JsfI18=RVERBOEY)Y;>PGW{p+ixgjmQrgyT9P#FMXD4
z9`x3_@8sakgyGKQ?f|MhVu$|x-TCRi{9pd+H%{_iz!s;U@cjhWk_BqPcT)2L-4Q+=
zrBXjkF^Ko*zHQ&MX}?&78~|H1NPiZL(=9qGz^t>>VH96gL*I6X!)$w%z#aR5%enw)
z)T)*;@REnXEzsxsivycz3K!K+n(=&Yf^rX!1}yS~$DV(nh3ti(e0=(=r}*f5B53zF
zdQnw4&#<*Mt>{An2I@_f?5QJSuo?O4!b*ia9(=HRVv5&u;bw`W6s5L2R5DdSL5rSk
z|FIq%A@eNYG-w0%Ra3K>$R*8uZtfj%k-AUda$|*emSi<h6@s|~axRt!6l*|`G<co&
zxx+omO@mld8^wdcmaJ&lAzpu`O1HQhVu4qi>h^%q8{xxEQ-FsFr9x{af|=^pPb48X
z4SWk_wWF5+clLKdX-XtAE3Y=;R=Gw2e-hXuz~13Dp-m!Qwou;N%GuiQGWJDYjv1MD
zj{Ty)=G*C}tV^I`_igbfadm6SyZm^cbvj%elRs@(2!&9Z*{7iT(v=YA(xv&LqJ}1a
zMy@s!C=knBFu~l~^XG}Fo2xLWK~@a>>f*D|pQU>c(IY1yS{h1=FA5@*Cz?*D8FJiD
zE(7rH){qxmoJ>-Fn8dqKaS}l=>3co>ucnm;*{OBhP|_?gDnUEN*D;+QnRtZB7*=N&
zfrp-yr;WOHs<l+WRV<kl0eqh<IHf(RpjYn|i~K?L-d`ptuY+nbX!I3$l;38c<Xx!4
z!b2dCR6fe)B#o@`U4#h_u*Ih2wnkY)U995%z~BjR9)?-*eHd)!lnS<G&iIYG^L@EW
z>7nQ3mcj!|_I&=KtoMC4^8i#@tbi{LBPr}z188A@Bs-KXN6!@S5OfXhwH%zyNREt6
z4}KHI8=X6pvQJzsS(-^lnwS~*iVjY4IZc=-I{-I(6XtpaRDI_M%A&vYtKWE$H|THN
z5j`8)fo(tHe=;8S&tZ^j1Dc~m%#=?ikMlmS)UJiD!eTZQLZP82_vF!#&;61r3h2yM
zf@#nVeRGRgomX`&Zqmf>p7DEE4y_lBm12s9i_%-y6$m@+HBk{h+HGK0bs!w`DG#Dj
zy0tR1SM*=Aglg#v+}GCPZ}6d+TzJm<sgvB3nJ-FU;GIT$yy}uafdw);17Yz^W+Byy
z1o$y9`6}mi4{z&`Nz$pq=UTj}QR1e+-VW3XRc+#lO1E+L2c09{<30(Q64iAhA$-DG
zlay|iSCzAGSPh8|8-4%^fjbaMODv|KCrVF*sa*zGFLP+nyw1yT0JaWG1U3t3g<C1O
zWtdP<@Tme{LvXoVrVJ0->|bJxtGalgMxqr>dvtezm-_jDbD)ttx4?bPlG>;Pxatup
zoxA|TjhoU_(tS27F?;Wqz~Bk%Tj2fiplUJjaW6?!hT+D3Kz#tTvqV(Bts&*9RkgZt
zlc#)pjRc`tLOfA-=WcDh*uJ@{ta_$M=_UciaXIVKHm5$t)VYWgi#df?1$2Lmw|Qp%
z;Yzk+*ax0|5NoAb`<EYH-TsHC&%kvE;cp^!R^8}FPHVhhJ#ze6lPr+CVO4x~dLwjo
z$dcL%>=reTecjw;U!|mX)jf}@YWjf=)6OE_nN1;VtcHj_P?pP-hw9sB4aAj2Lw)0B
zLS|z2^jQIy7Y*OFadG5xr=RT%l{fgbEeSv|k|z>viv?RmaPRFCbIP%@S-^W>LsU3(
z0cFEnC51Vq*RJ}KjViGBdZ6(oP^v>-zq%vQ45w~vGwLl`CuN%Jkr?<f$q*1R;p959
zHUzVjA|=yvftsg5`ICMm2@l>f@7xd)#nLWS#BKiv%mdZPh12iJrKP@dCvVGA^{CcL
zt_1y@TtJ>V_)9dF`u<=2y}uyRu}O%c&{P;jwzR2|OEG&U@HVi<-E_L;?Rk*Mo-bbg
z*tO0Db-GnViNL77*S6%Eg?DTWeLiF=Nre5{6P#*_<0UgRH{DPSqf`q2Zw1((l0}H4
zm_kLPAUxNQno}g|KRSD44<$oB-{G2=DfYSWR|txx!;mGsU5k_bpIrqQExzA{14f~1
z$S`@HFOo!)G9&<6l(P{iroj)WX#zwH?<XGZR&ZLlz_)b%<H2HIeK{GId%EZ;hcTq=
zyW<lQ$~6O5Fmg8C?%hli!nIgRxVtJO?1sbwcq=?^=K9_Diu0F%o?>z@z@x$V<~@;{
zH4OlSkplMs$Hh5EtQ5<dRAb!-lpU*<2ucl6J}=2Iw<LLGB>-H`&OsnE?!?0UsBTRX
zZnI(X(v|a^wf7nY2iui~+eRwp4ic-+m47p;D7P@ddnjX*8_s&Sxpd?Kt^<JmkoULp
z_LE$VaXjD19q{zcqRZnwv_5}<c-c*>AK3iD&TsSO)HJ|#A+F}DN>YF5VVFadO)K7j
zym~XqVs+mSx&D-rrfM=#cBrVeM~|h?-d?5&0{IFoi&A^+NaX2l4FMy9KP7yZq2Ur`
zd4Vp|6MK9~lVN}9UP56&V%h80z8!u>Q9aR+_9)ock?HEmmqsYDII7%t8Fg#~IqA#r
z*7W?G21P+TYPHl4Nn?qZM7$jMNzza&w}zwlF}DO@Pd)!4NV)NnqG+t_;lM@VDkeut
zxIrFF2)el~e0v(Ad5uzhKS|Pr1S@!$7Xr4TT5epp;PrJyM?zxGsi3PEqST<FHtzX`
zl>kd**x(>tSgaoa(Q=ES-Evd07#Qx*^<lxb<&zXa*aY%CNZ-F+Db>2m)Ea@7lK&NK
zPr*v=N~a$vgK#zRM16x7+5mnNev-ggn2WgS`ct!GM}@#rCF2O~0hCTsdm(k!oi221
z6{7uN=)iv~{rw9mr>le?_(gLZBc<d*Bt>5jaI>HI=&LE$w~-1GK(>Mwlurq~)!x+V
zK3yunvv^t!{UsW>hi8(R&W<f%Ts5FaYDmI;7BOYN)oDDCKTWEiVWJYWs?a2hCufdM
zGPJxb60intdwKW}Lqre-Ok!aLMe!4a`IlwndCv!vy(ntpq-l!@VZlUEb-7Tj(bES2
zE@&uUogc4^)cy#5C_I4lf{1jgiIbP}DPN=flWBo)TLww0g$AODi*r8zh)XpfRX;2X
z%4U$mxt?RX2PnOX77>ETaavZZ8ak6i;)U>UUHd!kA5MMnNT}^x0^pne(9Szb?Cqq(
zcl!YJ^Myi8PeYpT6o&0JLv>a#6?DBa=uKa+V?VgY+(O3`@sa3zJKdt&fR~owH$?Rr
zl=^|qQr2U^ze(Nf-X9KA^we&L)LG%v+lqLx<BUP~DMG?^ZXM#M2q<#lbt)M9^!kxK
zHM4r+$!IoqNx!Ta$O}D`lHx=HNE3;pPi`fj-ffq_KD5-f&O#dfN`TEII!=Tjna1~U
zx2sGOt<vJo8)0jFOVnLa-BZ95;f^Ays#Qw800(`cHTMS`Pytj0LuoaH${W)hucK>9
zubBJIVq=QhO=?D9MGZh75ChqZcsV}^<5xOh1ZfzIxXEpTRl9OGRCl&T!yT_vMGg4X
zY=S{FM*I2JpFbjN9Wv)p;(Y(^bL-WfALQiRl`tA^ztu~ZtR{t?Cx(WrVsHh2FMWxL
zVwm&25VFjfk07uB#nW>6cX?L!Qt{3N$D`whuR`i7QT54RTwgr@FFyB2WB=ym7XJ!F
zlD<77QzsuvKbt(cSoQS*Eh;p7LGlUah=l6~$dxGv#s=o=0k_fe0gdtFKT0@7Ln&m^
zMB~7>hpCkP{`lS;mN<F{CR;%04yL%?&U#XkOcF?><42Nagpa)p{2Nz<>pN`fMT`lp
zGF%97C7-ga{UHEh0?=z2XaYcq;m6j=5J=Y`CcLR>vDa5I0hPY0hbx7WH(6__jJ4>?
zKa~<1@_$gT^!kj)L6(eXy^J)fp9+D^Vk%robsFh}J*Ffn@@PvhoeXr=pvDU@QEGc5
zWMbRCTatv2L74LZj?1s!#p@GcvMapy$zCDg&QCWDvBl_Wi1jxkV`qngw}x>k{EUiF
z#4^LSkV%Hj*}Se43N7FNs`nu`kx$L;l%N^lo&vW5_GG7DW*V$M(Qxel6zy9DU~uFo
zHbHB3OCZ^p{nrM|u-OBd0ThE}o97RKsI9FN)BV2Gk+jw>C)fo%Oziw@`x`%HMrfsd
zVB->d`Hz^rEKm8+S;F5t%2^36j=UoP8=Nf7p7@Gf?50Vco%eTEhD%HLsB6Fa{c-SR
z_vlBSja#W2C}XcN)D|^oQ3(+~>yu=tDNV9IpJpN=Vsi4yje~b4Liid!b&7+5Co6R{
zv_l9OaIDqyLP?S=3D{t5XaNrWm}oIV3A_#_B*3JE<c{BY{DZyVRUABY7eCS3U0K>t
zI{?A^dDbOK(#5=#0~p$_WIH}os2O+zz<~Wg&8tb?W87L?JpXUWp#{Nc0BWfSn!Vbv
zuX7UvYOyeABbahHJ60tem+Fnd2$LIfL(EtS%K7_A*eB$<{G=sJ&|t4C9gR9$KWf<l
zp8Sig3h8#20LmGeZcVwvJQ?2@6=pf&&T6vku7ld0c9V-_7MdR8`S7cOlZNC@GUkKl
z`5OM#zw>i{_x}M{jt73YT@-ch+1Vp7R<awU1ArEhHBm$ZUbJpT0*u+ci?#EovW+qk
zb;f%TbUJ$nzHn?JNCIdLZb{pVe;^{q;&q8c3E!P9#wf&wJ}!#Oyq)2i3CpdSzkXnW
z{9MBET!M3*JO0}Dg~>pyd*cg5PKCv0xEvx)oqpWLWVjBm(F+<Bi;xD22_=#6E?>tF
zcyq;s$hr`^ZsunL^o_9C;A>8fva3QyzJr(4>TY7_d4F_})?QD7UWg%YHYMRHbZY&g
z0z!&wVgm!H49sN8egF>+s|@R_T;)VvR(yapM}}1?6mTX{`D&qo*30yRuEPO6pgk8H
z`u8Mz5sE_sIRxY3I3<n>W8>@R`HM3NpqN}3%rIN_CmZCBy;0UpwOnqI1hZ|IBX&Rf
z)Qt)zf-Lt<I1EZ^xaV<D9pG%^>oYGuIzLYFyuJjx+$oB-&aj2a2%WpT%r#z04IPb>
zTW6E~(ejMU5&DRoRXnd%PX-)9+>WOSE9gck4Ys2Z^N|j&zDGUO*;9UV%Y2c8rB43@
znF%)LCj@nD8kz5SWL#j%#!JN23#&IxkOv8EuW!EQXoaP0GhpRYy7H4bLNZERtLTQK
z^I<-|cgF0^jao>q9QXJwK|!rfg037;M7+H|83#S7=G}8g(E`mNvBgZoU_I>#vLT*j
z&4D0xUaBvWD7VmlABHsGE6O>HnIMT5bx-@`Ev#rBEP4qGB$8Hb*e7NdU40)c?s}S3
zh1Bwm<|~3B!fAom5-X+#D8Vbas*b4YXBFMbUkZR;4CAu`Kt5<_&iG0fZK8n6fOD8Q
z{{TR8oQte7UH02b21z|z;k-HlM2+2=O52+8d-;!;xO!{rTW2HJnj~UdcGxqoqPo&Y
z@KZDNBK`ON+V8^15|3lythUWlSD<IwiY~H6<C$Px`#}7JUM9XDmJJDD>zE}uo@wmQ
zY$L`lPa&uElyQz1bx-OP7Q;L*$qG4MV6j4QB<&8S8A#{jZ`%YCD>*+Zd`#FKC1HtB
z{RJ3r;Piyo@y>&-M(Y}xIUR6#Zk2VKdO2BaQ9zqe{n~o}@~D$KQS~l0m`sq#%Pfx!
z;H?^RkKK|)`KfPdaVSiQfXMSv&Y(5&y&M-#mwqG3F(*CU_@}|YN9c%>G5~`i<3lC;
z$p9~RHKfc#aX;l$sHD8gJ#`)J!{`dx0dhdVln#qEnFS{e1ytEzlM_N0+i7qWbjRY$
zne{^Va?QCWad~n^Xu^Utsp$aDY96Ogc3Yd}NQ-<XUtI^{TgjHq)j;0du$=vwIEuV)
z^MaNksZBCGV?f)tCMhQsQIn}6plS9^d3`1?l7UWU+~6m#p1bmC7^67Z*zz2KiS!@w
z1vt#8=60Ntu;tIrRzK4&9^fj5kgQB}OP%ToslCMXnEN|def|J^x~ht_)I$v?<xaQP
zKXM8XM4!8TgE+h?gNT@4ua7HSucXotBzPIHBvPEp64SPI78@z<p@X!%&Jy_dqihaG
z1NJ2oED@3j$};bn!6~HaOBzAuctAn6>`-|gEmEEMSBQT5>OCDYIs}NRb$}vM7B&GC
z5Ipr$)?g`uNCQ=#^Mi$3XHO~+erEWVp?YHRJ|*81$Ak7{4#Y)1O>d=cs^Bq3$%LOO
zx0)0?6GLVrp!-Tenf*2%8aB8tXnQOR5OUFbE>D7Vg8MQaq53h%4(VDp3VAbGbZ^@d
z%0#GcE2<isekgcO)fIa>D1TVP`6IUb9JYCv_~WH-%@6+F55M)#@9;cJ8q<0soDA43
zTRY?}!Eomn3XU2bgE_G=S@Toj{2RW`k~*vC`;gjS=BR~Az<k_*TtIzuObv3DF&IN@
zII=Z#Z4~EHCjeY*A$Gr-$v!lsQRrzocEFZ|ebtWQ0BDwZP&uUcjW6-S?ZaU8(9zM(
z^qH5o<54rvi8*<rxnp=FZz1qzY);Lf+)tq5PqYezq1_dd0ExMs?FN5Ol1ff^+yqnX
zO+1>ulQUaOu&~At72~QBvX9jl6$%MUZ`GnF0p>?};h}By!q=*Fpw(r0+n^mxGEnXz
zUh5e$@(gKPrp2+?xdckimd?&*pvBn3aN*06&(KOvA+*m23$?2^a_yyrTo>Cbj1HQ`
zj+6*|1gKted?NQTW)N;b;05egCFGKT`_4N*4n0kgfALUJIm|lP!)U#zh>q*eqL{!Q
zbC<m3A{a0S7^~Alb%#H5Rw`dNR<Kn&fFUvi4AxUre}U(7{wZ(zuB;QvguwJnisiX0
z&<*Zub<8(~-sQI7qWJ<C3trU2Zp1C=B+nUUnX5Y-XadIBl4j`Ce#Hl$mA(Z1XhL!%
zVI~pq;);Z=_#j|LE@x@^F@{8&XTI>8Ec02qB~3?ncD#(1GU<IqF3&d#1w<qu4=+j;
zKmil+gu+{8Nm@ANY-Hh=MxzR^hlah;EUQP|XSRl}gsMEbrnRZS^)7~i1DKkE$;n5H
z8%2n*{=BrXDO?A__Tu=5xo8fc`3IS_#pV^T3qa4F6{{I-nX(MQx%~WqK({8K@aGXe
zs_jY}G3wim*ma~6>0u8z1@kt_Zn07mNKK*SR=+U)iGNgjCLX3u4y7-^TveCLvbR5Q
zyw4H;E2s<m1<f8e5eZ8yxh?93n^*Gb?>;@V`L}-I=YH!k4L=0PEty{6)5XqExoa(M
z2ZU;qX*SlB1m!E>d?Kg|lF}ojcfA|>({=go>7bh1Ch%^En^e0>qh_Yo`uRmru9Gx-
z?pqa{k85`aX-iMg`t-cx3SIQ$!vL^{Prv21FXKs0of)7Eo!<ouZvnF>w=^5HmV3{U
z5vLNnC>A`cB0T8dSBS7z2jd2-Vw|2G@Wh1B!pa^y^OdF-MSJh(;e-UUQlBKM+ft&w
z?a?pK;^5rLQA}n~>S$cqVrVUli?P2b7J>^g&@gu6_?GOMpn?Y%*Bio|10q~sNpdPM
z2wnkrHCC)NvkG;UPg)7t<Hxu;k%^$(1n?R`m3e8pvg%{T#@L{WWhUm;nRG^Cnd|gM
z+<#plY?VaJ788mHQ4;up31MfuN(w9+0<!Gr57MQ`er`t$V;B&~+{v<;9+puOlhb3a
z=q>0ExdgE?U*UQ8OR@fk2LF87VYW$=hcj~%(2rvr<9FWH3K<56q0^ig+zS(D!6vjt
zE;`hmZ*5J#zN5hke+3L=9^q@>kTpBF`Gbk+$=w0D#xm)S8cBJJY|{;T<2zwIlWAyi
z@!b5wm@$`U$vFcC%`Tsq6T4<oL(Rju#oEhcCGFD$VY~>yEtz8Z1zO-iBab8ktvEjm
z+*x0kFdgK)LvQ9MQ+nAIfWz2uhJu51Vuk{W%Lt45Jm-M5_gT1aCCpK{svNbN9z9J`
z)!s$LCS}wNc$!+GCvm>adB4r45>S*$>H54NVO2Zu0+0*(0!~gPc5}RfXTW}(FD1=3
z^P^JLu58!ZiDb<FNH!}~08s=WhunK?{T)GVgb;z?k=Q^vwD9;+l*t#S5vaxK>X6(l
zqx_mp+?6dH8^^o|7(+sbb?bAobEHQM>w8B$mjDAL!Ozq8-ti$1`M+5Dqp_cPjjtm?
zbj8Hw5L#d&FIAF30ClB7esvMI#~ALq&&xfDvnwt(NqG^xBD~%uyFKI(Jle}$&O5Yl
zY-F07<GjP3DJEJ2bStj!GC&OA={bNbqY<2w^Eq&G^VJ0?cxB2tuza&h)A#=p8vw`|
zOtwGBGEDnO`0HoI$v3$j3ECGvUygYX(j<P3@Ee;Hnek?mWN_W&0Ne(**Um$}-R4p8
zrC*Z7!N-${<?qO86XWY$EIJN8QH{g_pdz~jhhH2_LW)Y-48xPR1yU2Oe|B_v9jcT{
zqRS>BJWbBEMT9s>Fer3ERAswjkL;J!c~pdcT!|Jzo_KtC+k+&=xZ!u^st#dKEHhQR
zkdSI~E+UCwhAw!BoUsWH?*`@F$cys>neAYEiDvMZL>-bcp55EUKfxF755lXOhD<jB
zF87C*#|tSt!jVVIqBSlJ<%|$W?y`1Su9h>_IE%uTI4jj2gw3Kb_H5N#@$#5pcD$RS
zR3%wLq+5!Rc`Hh0l4J~?>v=EenlzGpd;Y14*_rNUHeSpeCh^^sn~q=lH8Ar{jJjv%
zvRg9lhiWF|_T6#rdDifM>IzfV<*OgU5<_j7K4+UdUiT$gBBaY%`W|0Cm`cnoqw*bO
zN0w)fHK#4xoYg;Weo40Wda~M8iTS=McKK9!iOxTr(ogK~!p}I7G=c59n^<BAn#>F(
zY217*H`TdG<Dw3G_Skso%z#c&pql>hYgtWtU~n!N&%RFY(iUN}$<oU0gO<cs-;H-e
zE0GE8iKiUd@P6pQ#L3>j*@*-+-Do00G=K=3V1p<q&Gt+pmfeqnf;Oll)_)f={;cXo
zW1FdlKkO1!wG%LRo80{ocEumnQ`C7UhE9q6gwCVJU1Jc)d66C(t8_u7>Z61v(Pf@8
z5+zdv+ai@kidXd1S4%#mRS**)m#PJ5-SHt`{onfR&;6EQX*8_ZIJ(F`62uB{y^shP
zxrv;vsw(&Xq^$TPuX4I5_kBekX5)}J#n5Dm_Cj?jEuRKL$)EQvM?l4+RY56r1YL(D
zY(5s(CZS1>qz3jD5LKVKSU10SWl%Y(IH}T6i4BVFKE8$+;P{mQh{)AxpG#5cXD`}N
zZjH7{3oi&u)&IlLv~uTr&6c21mGkCxV&uRA8FWy#)fj?j3D5ai{HG&OJR5LTaZe(X
z7<;`qkEAIH<pP>wYzfyVd)S2N%#UAcoruK0%e=OV0(xx%pbv7)D?tpQ(hCsIf)k96
zxEn;2oDpod*m<te;Pfzw<%dg>V}j;f4}6h-`vLGJ+)UkE`SsrrV>4~kO_&2$fx*@h
zIj1}jW*$-wJ~0LoD`C>zT)^`Mk(Q}*0}Do7jzd4db<610Cux7g1Hk^1%>e4<ES<P-
zaS{KD%jx_f^G#s9qJlKn_?qU^+-)eTCQkTp^<kpCme~RHs}`U}IgwokYsUywI!nZv
zB)XuU9ydsC7QcZy-I*CUjiax{xU{uoQ~yK9cuq|eE%T6J9-o0}D&&#%zP(n?Oikr3
zcpQIx7VM-O97UGeEi1wvo|xHaF<>k6(S@Yecz;CoI^#)#sZuQIc4_TVgG4r&o+7eM
zNs<^@k*-wJIGerC9Zj)%_~R*ZMsmH>;Yb)+cX<yChdGRBR?Z=SB>LhZ%uOMnC$SBv
zKN2>ty>$n!`s2oUk%whV_At8h_h`izoo*D-%lJSc%R#w0HB>JSX;qpBK#PcsZlA`u
zH!ilbcy#y=JF>}y034sC;1b~?|GID%n*B(m*|^_vVU>~!0vFK~PJ8^9=s)bhO-wxy
z$cwh#rC+pO=+qznL!s`@dSYt=?T>f5WqlH2XYTyX$4A?v%3<@|%rUm*13a11OP3c(
zLc3JV{R(Bp>O|9GTmha~CFuIlcIs$MK>aWMPT{VL(M%i1<<wo5k<imMUdT1U^;1tU
zBDt{0Sc&oux<fk4{eB8w3AExr4Uwv7mMd8LKx=q;Q%vF{S6p)66>csxYGObm2_X6_
z6<c=+nLyD_au;u)t2N`Md@1E9u66EPX5q@4v-M9dJv}EHX(S`tfRnJf$QT!rl<~g$
z8_!eF0akAYH4~4suTg2e{)YCQnL7di_eR|6aayam+j0kld=N;+#mTx7^AyfUAy_9Z
z&_JV$V!IimJ0Hj~|ENGJ)(_r#PxiMwi5d-Bafy=<MHB4|g30VJ*5Ayy@F47PD+Pao
zcK?+k%L}`hdBn5@*df!B;WAJpu)zXDuGx>ma){}*OLIF-hP^5uruMkOIQbp3KB_Dm
zVjhR%_P}NtSa+xV?oUEpXWp)Mb5L4}G4DI1OAsRV))Dc_%+0UnpLh9Iz+0MNNmWbq
zWQFB$a_Xa2xY+Q&Raz#W+_-!4l-~3ou^(;Ht4_nCajWP+ia98HZ1A@qIi2pA(7UCz
z8yJ^*A0*4zDG}nmBw!D8;aSI#TJ4aQfI6{R5z$~;I1Ok_AN$F9!g{cR5WUwiL+VJP
zQv#`}ewS|b#F`s1U}6Oiog+>c>{%+g(kRHKQ*c_0KEPzlYhMhOmu+W?kd_*qoSO?g
z_qYbCm4{k@-DJ^A;C`s0(eqG}$O~1z%$uJ7p>EXE$BEp)YVM}?fqfDF-fHw^$;1%J
z)$$g!)Vee?-gZ1f)p<k`+o<EwPIf450WK~~Hj_K&>0L|(mG8?_2k_@kNO<`N=$7Yx
z?zfgCT$S+-kR{Mf$s;h>W6|g$$46u26CPjTGA!+<cp38PS9v}B2f3c%HgPgtl^)nQ
zIUH~zE7yOO`-335{&dB}CymWdwzlxb_$ieH{SCUS1U*`$yfoO{l?7=yV!?QDkpp$K
zGQUyJaM+fe*~Q?WL(b-O%ZirSkr4CpH&0T!V-F-oUJ>tvZ`K9ENI01q*h$vqsJ8^F
z#hWIp*{0&<E^oJ_w02E`-0hQtU3f9ExA9(u)yAb8ysoB)lNp}xNFw0MV?^2lNs;{*
z3BE)3R^o6RPjG$-1dm0$+I$cz0szFMgBk~PuPKL^7CBtfF7~E`2(I#_2`eDwt|Ja8
zp};2Dv7VLE`e@%RZN6@w&Fm@wf^}OEHvsIfoVAW=TcnT}b9eGP&o-P6Tnlb30ba)1
z!D6OWml9?#o){Bdt$opRb33_x!93tAR`=()Y25CG1j*W%mXF^8V!_S)FskM&j<bAA
zEi`!b9HBbc?>a{nj~l7uM)$_27?LHDL5#0*k5hNWH)#-U$M{vB$S`<2dNz-HG?Ev2
z7WhJ*sC;>=>9l-+S!Lk-xQaYaU8Z<m>v?3oCJ*U4j}s3kw4NB=V~LK0pD&pa-hTh$
z?ok>Ftt6E(wR!#8<=2L5*ROsbsgi`mOR9wFD0GgZp{{ZKD<>{-|4Grz4}O8Xi0SYE
z8ZUc_a?F=sW74?EwQM}bw8jXDkLmf@0?FX<0~#hWoY1$gW$}9eamfdcVT_CpW>L^8
zkcHoe*!Qh>p9~gx*d48<*4W5T`SH-uqR~jShdoSj!6d<DXoj)%gQY<iWr?b)?`~$^
zSoilXKt5j1$WO0h4jMs+BZ;0ku`u7a#XDPFHDhX*MXKdqGq2BW9}|9iRZ^U*iq3t#
zI9uYp)fAPvT}&VA&c<F=pED}JryVUEd;I@kU8C>(>%V)vVPBXRJa1zcAgrds4G{@a
zN8+EMbO()mInM%pSs;kcvH4T;6mb`WXxW>c5@`dR<lIeK^C&hG5?{DcF?cJ4x)_oF
z5Dz&-=waH&8B41R*gBIW5BJ**-{kOmItu~eh?OGGZZEOX(?36j(>6xZ5KW%BQVo3G
zO{Vi-avUHa6wkWzNncy)mIiS^p7Pz!yW7fCCcw9Y2BWLb6y}7Qgd)AiF`;?@V&N7o
z@)i2#<WW4F{vdS3;(3G<t7S&^1CDdb1E5Y=)<o;kx#7{ac`b!-;ihePGGLrW%Ozy8
zO^}inN_W0NXCL3<NP~%qyYssL1G^Hw2`V+%iL^_CHi33I@AhSpRWU(4=&~lF&1HqV
zBt4>t)~SP5vbfOIOWXqk-KIrsUiu1eMokz5t)pdJM1V@&2LHM8GMLn;XzQTCZ7o5-
z!cUl7<|qcobE<cs>_`@sms$X^#TZGNZ?*3Jsl@R4;>I-sXc-R894xUKN6RBErF81D
zAa1Wtb4<J(_=avV?c^jZ$DNh#x3^DxMeuBf%&<*G*S3;9iZFLYVo4r$BEsUDYa7vm
z2Yv|1Kpo0WgST=NE6*ARM~GWkBF&Ook&p|&<NsS+eR>_NB*AcMC8%b;9VxIH#z#qm
zCr&A&UA|hXWpT>t>W(gG_WayYAv6~7208ZnP%>@NCD4q(39iCmx6ays<VqLvzTg3>
zj!@PrZXStI>B!HlzY-uxMCuQVCQokSaIDfx7fKF&R2W1$>;hRhDc9Rpw+#17E~b(%
z#Ru2po-fF4HH;-ATBG09SK7YQkR3*7Hl~0QMfKdmN+@985WWmSUSks5`z@G2>mks1
zvDSn4el&qHssWP?*b}j%Q&|5Ss=fc<>p%RDuNa6nB!YpBwl6L=w33RQ`Y7{lWJO}n
zRjKC`J9IGkr@HnWDXJ8PTqyY1wCGg*Foia;FwwOBA=|vW@^MOU3JdMClpPp_Id%(j
zfM(E)snpoM5C7>8-&5H>Y(Lb0>PZ$*P<H#Bf`>(3r@Nq=zC<yJfP<P)0PE83Quruk
zG#2&El8DF{yE-43$}wffB{-Jk#<hrKS8F;l;ieKhF1}eSyKsE9&QTz9$yW}H8Lz75
zR-%2;#T~2;G+q{}`29ndhnU-<I}i9&l3Z*{VlhdkYdqk*$c3hbG>(U$8Z6Q(*<A#)
zK1X$jH<Shd0<O>mFTyO>=3uxg(LF&iSeIN)F2-0Jm}Ea0Y>S=e-J$GMU7wHiA?C$D
z%A-^vzvL5gSz3mt0cOC_v-9Mgli^W~h4krN<hHRzb;x|vq_c7FBHVg$cAKc33y$y@
z36i|c1e6uOB-N4CheNT}yLQl$dj6#+Q$Zo6rKPvBS`p7Rp8C=9OKI&s!OZFO!?4JR
z#ZaXQVkv`x3Yb7j{)T6Dhwp*W@LU4b{4LwGMK>}pazEFkh}zcCBWK0R;rqwe)e;F=
z@2}kuv|f#>XA`#BX5$%ta4KRXIqHpjurE4tER8@I63s{LwDDvkOKO$?Zi4kL84~bd
zyzX`4iYS^e8q(G<Lv&0w$AkFh8vuh_X__n-1HbwEDRVgl&-&U~QNhk?B#jI^Q;q#j
z8adHV={y5U$tQnO1TaMBC9Sm0LGY;W?MBo}+DK8*sP>^D+z|b?H6A%$$>qLDn^-Cx
z#?+`B!76oB*T9M4nft{``Bl+H2;P|ru2U55nT5@*4O<~;^JESw3H2^)7Ztimo)0j`
z5zd*g-1|6`&XRU2U(&FF<Uy(dHtv1=m#!g9e)120mj_brRw?BNLT~xt`0n!Eu5|og
zu09r$c?59i{8jG27V&dwm)IUVCWrEw)cB7WllU{@a)-B4*_Mgti%OfL=N{vGpcx&K
zBhS(O?|S?IH{%u<%cps~!`I@QTRrKloX@lg_#;n&yInTiXWk^K>yXhtv&_iJv0NUh
zei4?ow|kO6d3S~{@euzt>5O;!(D*k2&}3VemKY*&CM>ktMG(W0aB0$^cE>6m%m*8{
zv}p3yQ_oCJq#@IK&;ux&+u<%nYnz`0pI3@FMe8e?3m=5wUE#(~0E@huX}c5BImNK%
zWuhh*ikKFD>I7;eP|%-0*pbQ_$%G=|fA*U-l-!f%C+ZxQ><=i5Ysr7Jh{b><gu!#0
zP{PF{NjMzBbBXc1|D?HZNFafACs2}H2Bf_ztJI5J=FXEIGNH20bNe`R0|<H78IljV
zQ~AMAzVh6eTS><x-z0(+5q|!~+!7%%6c<UAJGjaOa8PLTD=QujBo;NCAb-u)o)1PV
z9F`{Hy_xVXMt(e47;b5gJCgspG+*-qC}}*-ld<wexb<b&=n^P<1d!Jy_*gX%qMF7Q
zn>-stp)H+bw@gUcak9|6=jIRGzV~`{C2H?{43sOj!Q`za>tTf=Iq+0d+N1+|D%i|k
z9IeIlXbq#;_UVJqo+Ud&q?#Vb5#y%QlDJHUQ2B?!;^>sDFQ0Otz)D63I9<JGXEwyV
zfU3wQ)<i~ZSzlu4|1RdvwBp2$iGoLa4+Cb1CZ}PE2{`9ynpwy+4V{Ss#&m1$6C;gJ
zR<+UC$TYqbw9G>W#IV#E3fomsIe*EAkzEUI`K*IO<|C^@$$){tqYf;+M_lWKHvak&
zc%ss%Xh{FuedAEJ<xtFC;BISDRC(@z?XZn>?tlD8ScIPcqp_c5LbdA<AO<%wf(5DM
zji(nb+=ahQ3x9MH=(%O%g@ZNj$Jas*K`3x`R3S7wlVRzWe(MM)umwZ)NVItmkQP6j
zUO3>Xd!k6Dhau1o{>PIxRaX>Rs47yx%F~)1L`e%9KWkIWuDY>{+Fz}5$(jewy$yY$
z4`v0v)YwGe19T1wms=#4Nuly&cO~I;<B?*W8kj&KD3_hUtCA`)iF|3k5-|jVScL?+
zsD|K`P(i+!eT%dCI@VjB^1&74K}<3M>PpVcgLyn-p*AUpE+$xtT>)EUIz&1cTZ1zr
z%<eU3px3Y7f%b!yvO?VRPqHaGf_tA7pb9M0W_M~sSPMQdpvlUG2O7F&n4pUmqBfm$
zCmfKIa^eW41PL!oYCSJOI+w3Iyra_N($}0l7l3DeB4d)0fv;~AXoi@IjOzxmjETK2
zVZiD)kcg(@FtC5n87VZMZKZ`%8;mlRf>Zn{E64Fz_qWKzIhSHCEBB3W1#5fXK69_(
z2KDD`GNau|b#s6k3o~6|c;?x8Mm~0l-+3<v-Rc;^?u?VwWqE!1#M9Kh7Q~><+r+0+
z;%A8c(wX2<DwS6v_~lg|>3ew#^7;RFbq1|<T~`#A<vii4HW(s`t4VEx!*h$lE+P~%
zk?o2ovRxFVg_22QrvbU6c90G_sjbANQBsiIhe-_~vXF(-Q3Cn_u8BR!NLD;(JLt4f
zXlEU?l(yfu_POsVnFvYm-FweH_nvjuT6>>;LXfs@-M{PFne($LKYaQyJ^D%?C=8ym
zmj(e7>_AE28+e+Ar-vaNKdN0B!8=L_m*j^2ne#{(W?K#zA}F5D9xEeJ(ibd}YLZdU
z@Wqb=WequH*`Yu*A$CpxLdJ|zCd98*lD!BtVRq-YO*o9mU$o*6zqN?+Vg;c9&W4PH
zn2_YLS%HjL1j&7bP+C7EV5k0<{~dH@i1qnE>$jE%0RnUT@iLo(IgaajMr>aPo;#5H
zbW^Kiz;|HjfTS~45z2Igeefx8BR4H)lfX~I(jPyi9MR@4KR6~(5z|VBPUqdFOxvvM
zz5|%NE@D_LLF`KP?QQfo%ub4j9;W6t2-um4vQ9$GZO@61d4CFkgMxImOb@i24kQOv
zqpk5P2l?eO@7gWR#-Uef1bcIQn(ck`10ukCCzAg@bWH>6oONlau<K?l#bE}9ydjv1
zx&mMr&DPIg9AL&34RlcQf71xjvpxR5bi~liXkiSCL4s+Hd5p5o!dk01M7&8+VD=IB
z{*p<B%YB9IwFp~n%;ktpfgt2Bj74SM&crC=J~iza%mfOeO@}rmRLCRwq`@Q1wf=^Y
zHW&l{?5f3Wi>xKsQ~WpxwFe(%oedui<FInmbIJgTWoXG37liP3mk&YBk7SiA@EHn0
zM5K7<MXuz;P`I{2r{^T$%4-eD>xr*(<_Y>|c(_&3IKW0!KM93kacJwfNsu64ls=PF
zyAqRs3(e;kyUl50DoUDF-5k?Lzqsbf{Cv@L_Tg&(?f@p-7^IT?N_08&b9TpB#0h1}
zjDQw0Pk!cOK8Dq|9Lg2_j;Ft2Dg=Ffh3K|MAfY6e*xm9@<?>X0OtKptoq)?75_KG!
z<oQU?rt}xBmw`to4{HA6@6LsJQ9olE0?F@L0GQmM$3^srp|>2GQxk6|o9FezyNKXR
zUC_k!+B0&&Ean05ye_N?`)-uiD1d0fiM3U>eRIYpxrEXMfz%Eq0W%2JesESZZL-F%
z&L<Wd6@f$wvj=T7*w-=+A!lG3w3eHn;>W=SbD>UyS9Sxdl{yf!sxfkkvz-loJ-BG&
z<csT~Od$UHjiQCl3meT%G~i(GSk;&ZcxdDHdnQF)ZM*#>a>Z*9UYu69piYa-aNb5=
z$v!8FMKme__Wsv--aq>2!@vGewBpPffr&`R?E|a>U*V5@lGV{~3w6-Og+>9pm~|;=
zfvlvi5L(#9X*-NO%8nMHczznSY*?D}Ct^a7r7dwh*d>|+lSyt*C|WL?F!$?|{mq%6
zCv^F0EzAKc<4+!Yhpeb9`3?v^@E9+j4Jtpm0eth#W*-sFp6pj*u(U9{5>Qfzx8QhW
zaYoAS8{uErTdFY0kbg7Yc+&hmRX*Y*pi>ssO|Y+*P{H*G<nuhRrld3YkY|vlMRQre
zrQ<Q^_Qui~$T)+XuJVh{3Z;H+iF7}*7F~@(BaWx?FE`Mk1faxtt&H%*THu~1nZ6o*
zgz;8*;~s;adUT0L<T4BCfi4qqT(}ReixTi)CJbDLibw#s(YdDRYy!L50?^{5RJxjF
zs!Ji_kxPqbclZvmUjpiW+eIr_wdEI*LU6`#k_oAN%EssB8^*Xm@k0B`;ltbPC-9!d
zE-c4sQR|DczU@wXGmV|*?@o}ri+WD`H`=ed&iugMeVIZsdvHr#8|kz~<}TP0(<8mV
z$Un3tS8ki~;I<b|m5K5zqj4g`SLs?>%trvQrB#UTyh{(9<~NMpaIdrT%nebUz0@K9
z$#r-k`RC8SC3RuHnwF6Rv4SPtxkwUU7p+-@xlAv>ukf7!ovRz2kcJWB%-v;+GN!O@
z9Z!rz5Gx$Aa$Q`DNRf`%e<YS`FEZ+D%ZUTFj%AOr--I)Taa;V7WOL~mt|p4TZ4)tE
zF$0tgo?H^|2qx<mrtSO~mXM^OJ&+^2ytz@tUK^3*N}I~f5PpwHe&i+eA4TYJ%}gSR
z(NuirnHgE3kTu2=FBfy)p<H3r{s9^HZI3vjI8V+F6p^`LPb4O{=`I~{O+kd}rcrLs
zm6xI0pYklh$jVq<{|W<LS^WYp<{n)Oe|X4k%>tN`tm#?OuCw=J!0GVfa#6rh`VKtJ
zvX`A0-&0bJm*`6Zn~6pgZWY(sL7q5vB40+}yJaL7E@}LbkAz7h)M0@|Q(I+?qx<(3
z3BJttKG6_KOC_CX?Vx4bgVHbTEx$%LVKSndYAA=`NU~b)pdbVWAWx%;k3$g9rx|4l
z05Ixb{6#Imxd$frP3*xQ!kH|c5Wbu90M~UtxTtPz>_>IDaI(0lps}(h*u1Om)jLaG
z%F+>DBWP_$9qUZ%k-_^eFm7*b(40!6yaLw=l}wBSqyY|3j)BC-J#p`=oOpiOxKi$5
zXUQOacouCME#(meZGwoLCTzPpn{!BuroKZjRiO)Xar>NW7C@+H0a8GTlAwv~aOAT8
zTq0VN#!9o}hjz)GbO2CANWYtN&Y$Bo1gV5X;Wb{uJTn6FS6aO(a#`y~Vh3Gix&WhY
z__$Wq_$bt~$31evnsHcQnY2uhI!{_U%;S<1lh5?rnWsdCnCs=2CJLCR#4T8*vU4Ca
z?fIbiXInWrT<gswXtPoT^?H6?r&Ki0k*;8k$aKG7d!!vQ?WcpETOVB7nwbzaSeawS
z&K!n7S&d7sGXydL1h`qTq`9fjo}FSD_95cgl|aa%7}56(HPIzagTeOT4+cXMA5TnI
zC?q!swM&9xFhzY_(lV*$V`VjRXaP?^aI^xZZ2*x{JMy{r4`jU~{Ps?tsz_BryeZ>?
zb_FnyA@spZ$6%aH3k$D60z3X^AUQh#9WQ)LExAO0%KjUpF&5C=i>A;_fG!E<NbGs*
z8FfrIQhZxo%>Qr^LtIM@%R$A=LjS!SGQcT^>?#zCxhHsiOw*KamPfg@4}!G+8&<t|
z@n3&zOA7-*?`b#_y*PDLR}kuzRnj9p%wxTkIaN_y={+!jYb_1(`yU6~c;#V-6>Ao}
zOy7w<KF!A=j|Hp?4fc37uQA@5d}dx6D)WGuAM=b{Qd4}?U^dA2B`v)Uqb;>h%SUj^
z>EyXV+kJZV<u=-aIoeh0Raitk4zQT79iRcwS}fF|y&5U#pgf3ah-y34Dm)~EvT~kp
z5DX#Lu_y7Pd0(VbLyr>T*t{`Oh(PxMGlML_#W1xoLZ#&UL0dA|EpFDG$p}R&1Bv)<
zMx-(pT*V?w`s75G44zvx?rU3<w#_;3VdKr}KkgE)$nD(_a0<%Wif`zl{Fhhog=!Bl
z^wNN@aVHlDThmJHRsc$fVur9Vq$x*zygOd|!b`-ao-AP3;y%1Sk(>~neV$yP6Ud;Y
zNalo_X~;~M<(cR(u^;!H0Dgg_EU^K3fonjTN5M_G0FsBt92I@uYwVJ=POk0?5YY>p
zL`t8(j}U$!rVc|nA@Y4@o;xR>Rw?xH0mM9azl1SK=dXag1lN!5Rpye@$;mP|>n>=`
zA)`yA%Jagz)*ldG2Cn&yXLTs+5Q~5%jr<b(<W8^4=90u?&W;MSRp&W@%f?=5qT>!;
zVM>&ff0I-l>r`U6MP@_XV0!yIwOlg0Td>oJS5PC+C(%rD3^0WqXcXOeZCD|p)3Knp
zn?uL~&6pO7IuI$;P#JeA=@gNW4TCtHYZ)i+Qg*UorKBL~d48aH?R&Dd&ja5hwLeTu
zRC~)n=}Z)MXeiy$3YzIJ2Kz;<AZ&h2JTYx*gprJ)mQCL<5(`sgGfN=xFfq4auaVQn
zEjtR?a?V>Tgh&q18@;nI_9pR^f8YG?&jF8!Y85j&_d=wwLRR*eAjT)X`bDXIdsA0a
zbPVGIN{2Z&Y;NAxc>^l7W8>Fa%^(0T3FXZU9Bh}f_`s|9Wf89geQS*P_TC}?0FYxh
z`dxwUrE7zf>z!%m@SAv=B!5%1b13;Euf_Pb4~3+Wc2hWw5zf2rD9~+`;}DXL4n{(e
zuNbp_!!g3&B#aaEG;<sPnWGyNevIqOY=b)tR+BQl!?{;QCg2KqTdTi!K|U97Pg*PS
z3xS;G?FEs*^;c_5wYUw}EAP$L$>N4GP`MkHreMEmmQLA$QTpLMasEaS*}?uOLetTz
zIbc2jlpbmICQLyu*D)ARuaZG6g$<-BKn2QT$t=a=zegsA$SP1ekya8;@F>fo!#I~f
z)x=;1OK(i(Jk?_yedOVFry%&5cTEL5UI;?OL}cD&z6w`NO8e7HX+rehD@1i}wP|N)
zsGW2fL!u|4JkM>ko_C#1&2)%>G6JCW319cd5m?#;pQQ#+aXzc0HRBPqZynE+_2)Ma
z^30u4JLl0C#66utU!Qz$oyTZ?P<Z2(S>U|nk5|@qcPSIJd~YTou=aVN4xfyOh8yKL
z77bAx-Zeyhw?BjSti*Bk@cR!wp9fQ0_8)Tb{m@JtLb+6xMIUE&Od<{F_iLU{Vzj2{
z;9)8iff+I>iBr>pfNhpqmm8_v7E9vlt?eApH+194#8p;LUQ^Mw=*&dSN>s#9l2Zt-
zaF|!7@THv|UjRYe?Ll^V{%RogXU1{B<;K>GK+!yKHVeBc`}=(D3I-}RXjGRY;Av9j
zJ#n>`nyBZP4;0U){3N}pQXUITdAZDZ=b8b|tdPNkrJd7-@B4VwEc62<9W)MF-+i=+
zp#Cm``dqOrV2O$SnR^?RO%pfI7g5+c1|Xy|g^3eUwk>zN0J2!#iBl(z0b5bbV>}Qu
zBj+E!6-u~FB4qOf`AV`GMb>f~Iq<o_pw#g+V{t?ffs~UZB$b%<9Yo((a6DTw*702P
zvM9QM8L$EnVo8RjE~KEvYbUs%L+!#CGk@vZxiP5M?88j&YTg@=Ww;ekLHH50A>2|~
z!p+s<tW}{5&?xAGGl6M;A(+aYrV`C&xBE&W5R6`-#$dRTQQQK;cv@A(CduHVv_U1_
zaBOpZfVw4LH}#G9>_s0pJ{EZ%hYX@qgSYf<tiI3~^{S9Q%U_Yam41`aPe?=<4{X!(
zggrWmTA>Jz%^|YiaR}Nf8hmP{_FG6<pB(<g<VqY;4tI59|5aW!Yu$orU?caM4?r29
zlTV!<0Kd&e?gjdXsP&7qk(uv0Ius8=m_zaw?(XRxCPStoxMSj2ZPIxnZOf7)xICS^
zAxxj-O`YA@*36YG=H_Y237i@s7jSMWTKeg01L+4?G8aHZ<?_+=MrfeTpx_nQX<3fv
z?}NB{9$Cl^q;lZvxubR|W9wXnH;MDWcDl?$FcMk36~J>9G69Ljz=6?*+Ld8_*~$&S
zxB9uGmtfJBD1}m{i?l5rztjCjlBytjmnXCPN(Oo2K%a$Aig%~Yv*Dm3jyV$~>71NP
zH<Oh-jF(u3#z0J7loFmi6DCG;L9C)&iEJc^CfMGEj!nMF&I#oiRvPA}IoyyDEX0{D
z;_}>I(jdj6OXV)kKtm1C&@NDlYHRS>#Gr?fnU+Eh_J;rp+Jl{|EN~oA#+kvv12JkL
zs<r2jw9p$V;yBiw*=UlEX7yrnI+@7G3ve5>jsuVJW+Z!Dr2f`FpZ(82809X#{^l&`
z@Y@y_DKAiDYp`hWnfQjrw2>IVkFfRnlUi{y4iI^uI;Mf;g`7d=Kv<^!Td6a=C<{X<
z^T4VxNrf`=<_lc~U@ndDe)as&a1?K|S3~Mq45d1kbi!WS4b!A)Eh2pzXa{U7)kmVp
zgmB-`az!Un3-@*mz)5_yUgbc~NkrC{hl^0eGV=F)(LdrlQ;SQSK<S6V6_E@<z$kYZ
zX^cjJwLzeA7%J!av@Ky}1LG(?Ts{8gGXRxR4PNcFTrHm`cyQX_P{IP{eNUor!2%P}
z8P}>`nz!89pc^GeeN3uq*-JAvS*a6h8}E~v4uZM|Yjzf+!6OAYOg{|0oJSRdO3f5S
z#E)w-xPV6pBM6@Lj$p_Tgu74+a@*q|$-EajsvOMMIFrPUxuBX<sK=AygssFetC?-O
z%n|Sf2d>#6=~JEz@0-(#jU<L6fD`=!ZB1`4a}=Ij$*5fwPv6Q)DR(A12;?pGf4b44
zG>Of86qXo+lHTo1<G}qR+TtRk3Wu|x=hD=+-I~A)HUgJMfP=e<&NwUO7bXHTcj#c=
zi|0Q$t7{Q2bK=+rVO};>WQ#G2nWOr)Zn>21EbIwYOTzVRa-O@02&h2`3$u1)ExU`q
zI>D=>%v6sGZPpAbZ3@FARUB&gG@+bI`>Ramw<}2oKnpr;?FW};rlusWWW}sU+E$H>
zF}U5d`9B423CA>Sy!#GCFA(+6wY8m;t_7hgOVZN>7uEheBNxZ8`DDj9S10|A#WvX$
zhzHkYQvzcPJZXjAnRixMQeKhhJ=CzPCcH2~Yr7~o*J3rLb%XegCEG4He>oA8Vz_VV
rG8#l`@t+`W$#A*=Y5ek>wrW`gqdI97tT|-3Nx};%HbnjKe}DQv`I8l5

literal 0
HcmV?d00001

diff --git a/jdk/src/share/demo/java2d/J2DBench/resources/cmm_images/img_icc_medium.jpg b/jdk/src/share/demo/java2d/J2DBench/resources/cmm_images/img_icc_medium.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..6b4ef3f38d14d03a7f990e4d50e25af75e1d3a8b
GIT binary patch
literal 148164
zcmb@v4RloZmE|i5O9t6xFcieD@dv_^S_PH|n}RTeP9#LxQV9{MMAM-0n&!hORT$EA
zFm96ROoRa0lu0avESm!Iq;g3hhvb1N_q5;YS&gxAY^T*Nm1M_e`t>rNHXYOM_3R`)
zZ|s#x-fy4(t&;3y=6$T^tVpF>_ui@!cb~KOKKp<5o40@SZo#a`{SEgQ6c!d1)bqcB
z-~77Z&TTulY<uXTZ4b@g^^HGnkMGzv|B-FGA6YSf=eCF9dv^Zjy~6+2P*?Xy&C##k
z->@dkkp%^XKijc&=kB7#1qD05{>V3?53HKMVPo6;>)$SzR&ZOvO$E0URBYb5dsl69
z^O}O+{*U7e`2T->OJ55L#;bL%-`?$ix@E>g+jehdkB|6&`_^6Gc!X1K;IZ#dAK9hH
zF&_KB!JFdopXu?}+~aON-r^poZJ%|~I`;Vs9?$xkd;FRnZ*h;`)?@Frcvx`bj`-KN
zZT`mm-F#;K{Qv8Jk8In^doL*X`X7INo4)IJs_z8_zgS_vtHOE5C%66a(**^~|Br%#
zX-`gW+wyEd!GHX2LBTD5H@U6+L_xvK{RIVo{+C<#eB)7fKKn;3_`m!4H~+byuAq3@
zb=O@tt(Y&x#l<Dp-#Gnx{+oHj4Kr@MdFJfdH_yEJ<~j3j`@$T5VD8N~-%@r<;P%_^
zyz|aEUszDS;EwX!?zr;~ourUMuP?d&rs>mfy2F37|BnCH|NZ7d!OhdB7fdghR=A*`
z=;p#{Hy8fqm4Z9@hb!hn*0r4bTt(Ba<6TalQF;SAyfCYvsBqe}BHlkAfW5z6STwER
zx|@q<m)%=iGN)zp^$Y&Qf8V|%1JmzXb?&9P(Xo%pmu&e)=Zw;MU%2JgKt<*6RRtG@
zmM;6^@_)0UZgu$n2kILlt?T|^{U7qn-TKhB_OHd_+jl>*=g~ji`^|6dKX9<?vBwW3
zdXDx!)%Wx>$C9aM(}P2&P7go#{Q1lafBql;;>G{%;>)jGdiBSzz5YgaeB#Zwe){%1
zm#@6{U;g3!tN-}353YUu^I!b(U;gX=`QJYIRG+Jm&zbwreK6kl)X#M@pR0&}mg}z9
z=PE4vQ~p2g=Ie^f?k$;J+j9NpKbf=OzJ1gEtBwquduhg9OQIjm-SUmG(s|{fD-|E>
zquD3>fA+yT|37`Q{0E!-T$c-OoL0y`-n5$wzEW^)cz2Wkg-@S)^8LPpr=~TPBvxm>
z-1m%cMfYQ+Z9A(MY`9ij;Xkl4(6Yw=ZhZQ#!J+I#&*;1Hc&0yF`SQW)P&BdXHsA8V
zwyMyfv!Av!mGq_ShV^8{_x#s34VE0aYdBsw=s&PLn%K5H(9?E%c>dt<meQ)!(1o(}
zspyu${?bTr`-T}||GG?JeLOZC+tN~-8a!N;N^}*qgy&Wl^hUGm&K>l(L`RD&s^{K#
zT`IA#?UpDTL(|!*udBk}(mYzs^A{q)xUa6RG}7j)EA*bqJmo9kEH`ehkH;5o-~<(Q
z1)SiP(cWk>($(S98Mm}FHZ)%d2IC8FxtORry-6p0wZfly>c*m;zC_o(?yW@hba!@a
z<JsBlwAH@wQgs{8mew_f?FDVuk;8VTVt;h~j?E3;Gb4v1Rs9o-*?-ZpdxOE)Qhf{_
zRt=_?^7`Sq$N5Cb$Vf*tI@Ww45^0N!=r=HOxGo$_pLyFp_?AGVwSiZwN}b=j%05#=
zBR}&-&b)oe|LhOv56-P9i(fpxHXZ9|9e(zQD~^U%C0ZIH3pd8vS{fSb$4Z0o;_ACr
zR}K0*d!yAitWEnf$5MrS`%fPP%HrXQs^RJz8ta4cKv}qY{;AS68GkBKeAnvg6+L}N
zV#U=(iKDBRH*@q8tFqbBw)-D%YpZRn&)DhKCCkE9=|TT7UWzl!JLpg8pcYOSwpZ-U
za8x4FQlF{zN3+#s;i5!axZj`Ad4e&2v|4YjD&5AD(TP6(wIfyA`UkaZF$V;1i116D
z*PTgqvt>Tp6Jeh1>^l-KULGxN<C;n(!UJ)>r`t+fY6jEMQhv2<wGqBXOIsS&_Gda1
z!SI4^Hv6Bb=bWh{^}$%`NP|At4G;8|?h3u};7>m-{m#Fh+20zjE(@)AIy4%O&)NK5
zA{OGh-%~ZzdcOYn4at@!F6NbiHZJB>XRkCi4VI*j-&E3fJmOn4n`?Y$b=gh+D{FM!
ze-KZBg@e`0dZU#u?>p5RtW7uG5sasL1AUdt18qA2%+}NC!Qoh~uKl6_7jI*YF1u=7
zvDG(nnFtIId~4w?y1GYa)N-|VM5;pT?&bFrz2N)3Z?#3by8JES#zH>ka4dhdbrrfZ
zR;30GgNcQKTUx>;gB`ssVR!MrA_RbHV3kAEEf;(GdImalS#1e$Tt`<z*PvahvwB-<
z-37nN-#gSjp_kWn*V>SWN$;2*+E$+f6c;L2ao1vZnTG(AyW)L(z~exWr~1cg&%7<*
z-+QnO90&s0^*g{^&-tyTRq4~b8vF9zL5IEf^dMNckTsxaYrw93_s-d&{Z)4@QpQ^2
z6Hly4==$WU*OlF_tM#qEBPlMa(tr2MCsvK~(RF2}{V!BL-VzDw;+xmU<ppT=gjx?S
z7)|v?qY17~&OgZIt;^24hR3)Zi&qE}{%AV~SNT(EUDw(>%#{@@UeO&*7=Bvn$8?3d
z>ps!fR@zov)jw8T#ifxc>I0sAoqdVmyn};$R-L`Jv7wJ2xUyrwB6TEQFxW2;2weI^
zLeRl}aHXS*7j$Pby{V(sH|SMu*F+dp_og~~=5e_<uql-&t#9$31|#KqQ9HOQNG0K2
z_`%d@6r}hwi3fTp`S(2h-=}}&>Bpk`b)~Q9ZLJ;jpILO%V9D{uXwzf+8`qTd23Fls
zHI&_7fBYtY=JJEtSs%sYy<TtFA8oALH|W3I95*ynrOPg!Om3@6H{RLU#Ba&LA>SG<
z0gk|tn@Ucu@zXE{Cb*Pm>Dn*oN>mNUROvTx={LVx($lv;stb%BV1=Gy8nW(iqbtsh
z4bfNm4X(3|cT>>AbwEjdfeV}#!j)e)o8Mkn7pF?}6*b2U8nM%x%F=_WfqtvztJDWL
z&5(7Tk^zcw)~-$9pflXkYd_ON+Ap}5Rbx>R7LL5e0=5<{D`cacspq^d;&t~P3YR2Q
z+&SN&u%E^d_8STo-eUXfqa42_0AO4Pc=bR!l<5)*Qs+16a~QbnRrJ!`Z|&F=4>q~C
zG4kC!gbYpVcWmKbn1B3O+aAhcj8e?SNO6n@-@JRQfD8WGnz0*d`kRA+vWZM5SAal}
z0vW9bmz`Ll3)*V}RoZL?eS6caR9|=N!CWb?U8^h9u+$Q5o9BQ+lll8TuEksn(ZRvk
z;M__;QBhqy5UwujUB~6VFA@x>Ua#SWUDYnyM_T}2>7NL*5#YczoOz<Yr3MVPAG)C?
zWpJ?CZrz19oB=A-`L@EwL~-?k(b6{XYn8vP23Teis_{{9BlOJoXIkph)!qgkcAf|p
zR~OSk3LB$Q%5P>Kzz6ec5B=$HP7n2u$HU(l_`RS1%VW`T>ju4n*kHQ;T3alXIq>7s
z=6L3X^0#+|GF<1=cZE`_{-uy1uIANjz6KdOu#zLImX>FhN5|t-{@a3K8o{h9YyEG4
zjnPlrz8(+PJBHN;e`*b0$d-HL3OIG1@GWSYClF8$RrMon3)@uXPsfV1bqn1B7Q|)a
zGk%mQh^6+^A}FSz#az*Yc17#pp25RGU-ewyjgEj+r3O{n>zYR?Ydr&pt3oaC4N)Hf
zYxET;nLy+SQOu(`hMbN_TX4}b>iNQ3W`w!gYutq`hNJ4-egQ63c6uvSUpsJ(i`F=J
zxK;otDAC^4Okvl@IrH|#p5E*_M~p&csr}v_yd^I0SN$y_Jfc0i_H}jxL`feA(CKq6
zBcXR@-GNWB@!WvW>3(+aB(ZBKv1@o6m*6BKj#}{t3yyjG#L*M`X+?U>7(y!75ZWSb
zYckbU{Br0HRbIz{PK;XlWt*;AI26BA3hI>x{a~-<u+bM&Nr!XsQjT6#ShrF6?}#R9
zVQf6xdaxlT64cKtrQlk;p6fX33Ek>O*=pAfN~=VSJR0QB7#Y&O^=-xe%oCJyQJ+TM
z1uv>rk^8DM+)%@@+vX1z?Q5)!RdH53Pd3Qe1i3Z<6D$jhV3ij{$0AjLhf}1VyaSE{
zB)<0ZkFKmOITi_)zWhNr6lkFb43;E){xkJlwH@R8(u;2L0|%boH#pR~Z@BzXQwnn*
zYlk8Q=WM<(e(*l}$8Euh%PrBy+k9Rh89_(vudh1~I$G+Fyw?i_t9OUY9{ngDz7IG&
zPzv>$Tb_Y?ZGxQkRa-YGQ}zB=VXw$H*7#{5RC=h%C|q7WgsU7dv^GSw0r*(`7jSOW
zWxs)cvP2iGiqmj$Iov?*MO`L4gD&boA!JCLgs$?6&MI=`#DW1Ra7#4snM>bZdVuS8
zE|)qN<h@m5L7N-6Y_Ico^+I*%0_zsfPWV2<Z#Xx+AHYXM;{s9+5PsePy}=Z~IoOgB
zG@lR>s9I|5sQp63H+6665*;HoLPHWDWA03K0=GT1iodXNk|-e|AVW?Va0zfxFR{x|
zUF3>-O3G?|SU@^edUQ1cp`{^N78i9NnWak<3e*PJ_B6yG9hvXuwpmNLZ<Hny<;q^s
zhd4+<g(%$Gl!cukRIKic`A~iuqr4>D$<q)ZO<jzWYrp%l224~$wUIczi$1IA3r3@f
z;PysiGxNH61yQzaDNPF88iUI5|I%<d|0pfBak$e974(y6;)Z%~wXZ&XknQyuxNwy}
zA@0;41$T6+G~B7p7*ug_xui=t?Jwms^sJ1v9{ghHg<n5*=TCkJHSEu3XMLF6kEmX7
z_T!qN{krZaQpX$X>s}fhnzq(|aC7Zox}Q$5H<WoP;#;ue%YDh<_SI?>;RPG6tQ`^*
zE>#VU)gPZ((o1KU=vmRH!}pykHJSY}T&jQKakY#6^+(>#ju)e>ABZMsQH^z%suu@#
zEv=qCngI$m{w}qTo&KR7gto5l(&=1^T^0U-iRdvHQklsLPbL`m5>FD4T*Gnlm|s?3
z2iKCX4w^2F>cmBp8bOX5aV_hrbuA$P*mSX*h_<U(IJ8s4h!)TGXue&^C|JW`5f#dj
zqZ>C*WlWw1wvJ#OqWR%v;!H?qNnixH$HCfP?c5(OG0wE{+#v*$N%Ge_fM%pCMDN*n
z@4<?H{Vjn*sM4D-(UX%B-Pvs5bw~EDwPbtXEAA?E<Y=MMAd?8X48g{Vq)3%X3@|cC
z3yM8fYV6A)<$k9Qj)q`Nz3?Fu8pAXU9Z$oUFdD^`_D@l`4=Nor<(rhQ!lIJ~yHZg(
zV@EkfgIe+6mS;>aR1AdGGrl`3lj?zqxi+De!L>_I;0#XrrfPzK^NE^Zj7wX}9~@=`
zHeRcU1Cb|oguc4#+*CulBRUpdfb^FX7vYLZkT@A%r3PY%$dm^C-5J+*_~#7XagVPm
zbQx_u|2y}5Z_xjD+3eZm?FN$aJyjuoocq|c#wJ9?@zR%v;Yh}yGGh^6*-c#hAY#Yz
z0OGtkzTx=H!J++)(Xxwu$CGM2db$>Y0eTSX7smGumF`*!EgKx-H<trTY_CufExV9S
z>_mn*2$rOeTs+}h9N4p<?RLHPx=g)83s+`l8ZdG+Ypa|cX>wQc#lr*uZScB@YW(29
zA^HzI%!v#PB*Tt`t`8B9{FdVs$VpfU4{Im<k_E&eQ@ftTaEL=w)ITf{VbsdBw^IgU
zN?(%D)mzdR@ggdF5x$h!MzWM-8>zf+s*u#SmvzdT(?ZjDaUWmp@|SgF0>qB$i0ae_
zBw!Y&r9bpRcr8!x?03Y9j^e8>JM#?8s<i9giA?Vc0)RP7)yruBj#oYV!@DSGiJefX
zf>Y5_>k{D#EUB8{L}xEFN>W!fKGoeiZ0?iS3lfke$Drsi5#%%Aa%~9<Xo72Y0vtJT
zIa)=FXp=0~j!2G_iGZJYFQaczGG2y`6Sq^TQK=0H5>TG+&MMtgQC;b@e{~sFRHBDV
zoU)!RL}2u1xacDb=_tYAMcgJ4BV>`F=}+x5ZWZOS_pB#LlKwQG4-X5uG@rvedz*uC
ze>c9F*-=s^`amLRfHhhJ1#4~tiC9s01RI-1s=t%^y`TTH)VDu+?ye8Q6mxN^7l&F8
zmO-_Sxh~S)8(3fYG7eMkx}%#fWUnGX@SQSajrDzxO@p5`CV6`J;xqh9%@nsX%XT+r
zRX2hLL4PQ=H}oQXrgcjjmQ;T>vED>{f3|$DshRpS%ccL*b#*VDD%}*K+3bbp1tna9
z{o~KIsdpM0q)NDsJM?px6hTOrl6xvp5b8p==Tu1uY^i8FP~bmRmka<MC=f)&I}dmO
zYm=Nz^r@nqGvow^onBOG2wKN+?t(X`*a)3zZ^0(OrOhSk>20r1d}e>I=8Ma5rFWU@
z1Y=VFqMPh<TBIbA2a6iZ*4g{RbB`AK9P)T;4lafDaY&Z)x_$@Ws(-k$sJW_t{f+_P
zk~tRJ)xU?DEHYCcl(ZK2|C|>^8xe&!Th*VE|3s^qFg{hvwJwpZBhj%{)_7#)`lF+w
zXx1ydi=5ZsQf`Pj56a=RQfj348t!XqUxb#%^^G7G0g@s&NEj(o{}6Mc&&Z{v({i~N
zo%DDb$eCSA<FY<vg+G-LAu?K2)VB}wiK-9`SHir2r|~RYvd%tnF5dL1(r~|El<w^7
zIT1vEQxCAVrf$;Nqrjv{))p{{8ce7(MSXzf4&RqTZ?yfUAUyN^|11rH9BaEh;^SI>
zyY7;Il+Mtk#=<4fwM^|F+>FnJ6%{(uSoe$Y{80OmWw!+{9*g+uAIswLW)8)6A^U3w
z2RCo{c2(#?90MzW+<yTD-@0#T)K@mspGx|w7ogU8;pXiPTVERFWy0EiY%P8-w%1r=
zvS-K2=>9eSYpXLWqlrzScejT(PxRv<ENHuv7k#06wwgmt8NXrA!IIhQyKxouVQICw
zS!yy1+X|#U229C9yJF4_lUqb5p{=e9LFxG-qsd8m(L3QO=$hAQtYafz=ymV}&4IRU
z%-AraqfU6zpd{xvQR5{-#J)_n<W&O=#PKXtixcdx7%;d@tUpZgzI+eSkpi5N1Dqt0
zmqvFpm$ooH7~*6`@QQk*e){P#j%<Cl$INW2N<FXEOAn-86rJC8lW~_-iCt7)LBWiv
z6ePk87i8g{ZdvQUyh}QTOHBJL#{w24<n|s*%{vjyTyvdC-J`GPWIa|G)f4d&c1AEi
zoW~O2gR#3riC9|x`u2{skqR4Qoz(Z?c@oyq7!p1hN0aOeS69Y5Mc5>3yoN(>u`Va+
z4Y^8>Y4m|y>1MW~9)nm%qm1IdKEZ)7vFyCwW>5uc_{!C9<`$=<9fc+FxljZI*Fo4|
zPDO*hcCrh?Nze8-8|+Xk{(hYeL3Bw%<vvX{9{%t1zVh_-$Z33(GhYg2F2pY$S;lXZ
z$;A3uHrYd4gw#xIvOzClt7B$+s-^jxZaOt>jX!hf&WJcv(}B@z&GC+`=7!j0APKK4
z6ipln2?;g{sfD+3RLO~8Z~sI$&RFeW$x+vFCVChx;xyaIut2IMdC)VfzsGAZT<Lpk
ztln2$c>vfzyed|pV@yT3jwAXspeBKCF^&&-kR)|r!P`$l#`A(z={=P{Ym6G7kwqkt
z(pY=i%w_>aW`Mdtmz2{;ry0ZU1+B1$bUL*>I2JH9Xqm@5Y3KUd@dw1ALK<Iy<Mh(w
z1@@S$e+*e-KG*@Seu0f0J<1l0f9WkYm@%Lh<n;S@iz`q+&s>x;$r%9qrW~aS<YGQ9
zGr>Sr2=P=OkNY0F5J6xpTGniZeA~c83Mq4b9hVv^*|9CNayxtX42SB5#Yc3JCW;%L
zyPeL$$gUb6$fz6^lCibOt{ibPXX;ex{f~Q11;rb@=+QhnlTg_RcG{3UkSm69{wGZR
zr0H6wdcswh&r85s%4}V1g4u$>+zMk+{$r_CW4h{5BzkG{)<Bo}U!1*I5HWn#%T)+B
zLfYt{5-rZma?MEa^Y->@ASeh3WB6+=wGE}TrtKUJ?TXv5rnJ6TV@{fj<7ONYt*tTh
z*mO;~|1aom{v%gHGyx_gU--(?cds}+9-lZgPttt-Z9bX5>*vbRy$3b&&Z%}<OWDjp
zKb-_&qgkNS9KeUI%ob-0Hh2Z)dzJ?_g)(O<A1mEO-`U;}`w#KmU{jNGo}Pn}nYL!6
zYPkH{fUj+R#egXt8W8*04tMyf7h|>Y1R4kAU^$DsIV)gK!(BR_*^5I`<0`{O-ZDeJ
z2k^;akzl>Ug2605G*MFla6Zp2gVMDC7PS^%fqVc*?yRdo|BRHmHiTO%Of6d0MXz&Q
z4KvEPBEVrYg;s8uCrQ{K>X*|cG$!E-Hpk@*$`C5g%wS)$nyt?`7g`SyL5DC@meO2M
z`N9Zazgx`q#j|WysAlHFD(e;C1jM8HnIim6O6Pf}bPl-I)|JQuD2heKFpyb_3I26e
zr%Gd(kB)zBOx+fIK+@w)E~nz<K#7jwuJGlp;pKu&77*zm;7F(8n%gKRK@CTKT0B56
z<HGPpgeG-PtxL|AU~+>?H4lLnnubiF@0btlX_qTe+R#4v5RxLABqB)YFJ_8~<7JM;
zZ)lW@$9yr3wRgxF6>avu!f6a<Vb6JKXcbADqFyWt2JJ0q9<U;D0&oN$XOr<lqHoVm
z(J>BJ<{Sj)dzuK%Gf$caG1Ql6Lr^gy?d-ubpkaN~_Tc#L#y|Smn@_%f?n0J_NzF_$
zms=c)4x=?po8W#8j&Q}VIx91+B(c66UIuPvP|hSpR;by$upnk^4f1E*sBP7qk)V9&
zCP}D~>V{=^HYTBAHo?EzccfaatK{jW<xd(0XXL<C@4%E;1(<M~9cbuX)ieFDw<^Ge
zDJ|ioSq<&!IOwGmfhMyEmL*zUmvJE#O<N#it}k^ly!3D)S*`I(tuZzDo9jSDGN$2O
zP{NSG!ZvvP4PBxZ1<fli@oa?l9OILo>8dCJW#|h#r__?CXkcjOQJ;BxdR$PFpM8Go
ztTAJ9A<r6+l>i{rrObnK14|LLfJIe&|N2{z*P)K14==ly0S|(QzS#Yitn2k_u5+A@
zVsO+(K(8LqNMFtXW^)||-s^`W@(SLbp{CIO1`Lil41GlYl#w*&449kTw_TU4n?su5
zXJEfJy<HAL&Q!SK+ROH)X0A&wSYig6r1spq4V7^ki}2?BV{0HSVVm^(J3$%<VA?o#
z0|QJ(i;t`JPY9XC4qJBJYDPaCs(&z=h*-)cg1!e-RsI}SoR0t&kvR*p{^(fEuxzv(
zg}ZAtaPwc2U##bIW`ek+iT<C6=&hjF+~b;ALSTs|3e<8U#nyiu<b<q5ea<1EL6$2Q
zqj6?49-H}aN8SykjwN?3{q^@Y{JQPzhhwI96i=xN9o+m&s2!t6@>sH@uS9&yAbe^L
zG?!{L6E<43?32NfCE#N=nXcUy@xqlGjrkAdy9(BIBsd*k;2C0Gt1|>+G`guXFI#>B
z=0kAyC{v+leD`c`0ENOVV(Q&EWbf_1#}cTh7t@*#G1Y83wDnR|=#5?J*JHaR+UR0?
zPqp&fw`hU?U4Gspcdb*7*656eh^Kr4T%r9FPQF;{Q2R+bpV~%|cx^f3!Fq{jc%OF@
zAoCe)GHSE_Gnb`x0#H5Kb54|4D{}1&)q&KXW<CHIuBfXaH6WW#c;iXrO;_GJE6nfK
zt_+#ueQtLD{8kzeN~cKkNij#z23RXQs19a63m{ef-Yk>(QhZUR7nn&UUhl+fD0$u-
z2fdze?ujn{_}cW+qlH{PRcGF*NAh$^v{bJ+z82PmHN|B=((FtD3;=9}=QciPn`I<e
z4CPHZ2X8Xufk<(Y!>)>}?=oVDB2pXE#_{2dWdtON)-jmZ*i+%HsJROADyq>i&V|5m
z;5otPAks^i;?$D;o*RMHj9gFA8FRTXd&_9}{i{3s<gk<KQs2TqW-tk6I;5Y(8|PLy
zr;WG_L~I*BAlouH48eIoPi(EgYg(8JOgR;Z$tw54*TZl_^&V|!OQn$KpV$2t^g)I?
zrkP|axIm1ZFA?+~`NcmokNoMUE5B1sqzh5MZ-eO|axc>&zAuKNvp#*$IRty|Vc0pW
z7PM(Fy=W#oCwBq3cLx1$><ZB%EZ4GO7eN>q)fjW)f+c;=Fy$xaLTF~<ZM4-%1Wxy3
z%!hg%{wDq!r@H>*i0{4=APROU()df^F6vkyF8TTeFEbk2A6dBi$7FE?n6n?#;Z9A%
z`NOBcuz~k!2hITGls0RuJB=lGK!T=gauj6k36e%7_a^>?WrAs9WRn{_#YBr!e5UHm
zWpgF^8Jn1O?QC)SQ<1kJx_)PYi`H;~$F?-X-2_}cmh?F*_w2ZxNwzZ-4&LUq9l+Hp
zcbeCN)Y;H9NKVo-62$WE9iRcpg$Tj;9*^~pZFE^0vCPWF>74Ctc7u^c^)?Q(T^Fxv
zj(I>k8c+|UV_73BLRTb4dUI17f9o*#2@J$9<|aE_m&cy7%?mfC=ACRh6>UE)^ei{K
zfQ$0zQaKZYdG^P@FR*kr#Wf9pgtVoAD%Y{Z=Ax*7m!`SWkeu&1aVf4~umv`bSS~Y#
zTVR>S7&$LT0(l_`BrG+|Hn|n_#QB3M0yGDOh5HY2QDb<^v<?Q!y&+|$6tJ4Z=Vq8a
zW;^61k<5E(s(m&6IOQ2EKWkHRr3b-GDHJ#Aeo)g9h0_z}JP;PJaE)Ftyr4%`x*A?p
zfBMPq69B-b{!Kys%=dqA(@6EQzNZezQ5$6bi6h3pJdFusAQIfL{`REx2+y!fufHuA
z&%BssW&`yKVazf2VNTk12XO(-Mrl2eN{l#Q7CnpM?FTqq|5pK6xJll&f;puxW6-_P
zj2QDKq~^?>nihG*1d=~PL<fiN8u*Yx0$cLzcw=+#?sEapo((|DrbY)P(fTKP_+6I(
zV(fI+&MF_@!nMTghi-!DEwLoUM7yc3Xq3T5YykFb>`q37#TA^KqS^xv$r0;ZBXYCV
z&*Y&q2ZeB%A`+YHeru<td_o2BVC>90tAr&2qk1)26P{FJch7I2y&-}YE%W+}wJLO*
zH|tUOjke-#73S1;@+O3^Bvek1(Sr`x)eeSeX4?B1Ie$0{#^^?STZB`8V9~Pa3LdDD
zaaQvn)@*S?Ec(6P-qiUZfe^>w{>hOptUBk|2}IT}R%9t#+dap7fJPOyDG;NfgOwfu
zWY*(Ul%8hqoWFf~kIX>N6hsgiUCc^|q2RX*HbAi)Mu@vCX(VPT83gRx4;8T4qB@-8
zg~~%WM2e+{XhT>C8l|4vGMFrf#BnIFlDptkTRH8o4XB-pwss8Dmom^+XEs3ny#AC3
z*2u(D@LH}m`Jqltg1{u*j?fw0&OAD)v+jN<YR=$mcBVuw!&VApPwFI{eH~_p^SLC+
zB&W>Rc;IhdWWss%ud+)%d1#j#>TC{~5f{~fbyW7lFNo?eKwVF4Gw~p?{g(zul)@3k
zW4i$)xLYIB_Gf~-qm@v$ugjl+5i%U*G&zGJ(Y6Ug{7IlfvcEg&Mo0J!fn7tT&D(d-
zx-b!=6$9^P6Wf*t)*O*j5#6s7Hph>ln^API#1%szkX}Vkb(jX+jTKK?dz|R`aiV3-
zsc8*bV{l=-@YJ*@GbkOkeBHT_vOl3K4XI+;;Dx@56(}Z!)hrg;JnBOI9)zH2;8HVL
z4~8~wbrQ<5|5bDh@PqV{(o$Ojf3g)v48CR>Zp>I{0N!acVcHx|*2kOX9<Oo61Kwc{
zR(2AB*v79|3PAg~UfclMR3W(J080DA=UY=Cf8uowR1sG4GN0dC6Xyp|Mg#3073=H8
ziQHd%CT(xzHNx4U_0fVfJ+OX@0eRL~ZR+{%SJK!R903R1(;lKRh#9V9@WJ)9gzrL_
zL8#6A2uzIot&2hT$mB9=z5g^|bTG^>7NEsJ4by&WQTP?%Mp_*gog<sIYe`k(n(2iE
zupE+1!VNoi>76R9w9vW^oDcCtJ7ZsWshXyj{0WrvmR*+uE9zp<)}HJa3|b<X9(?`K
zMY^O|-6WcXjeUZVnv>xdYo3yWd~B;#b`)0YoILNb4#%cvENiNZb_XLg{8iJ#NS(SP
zMvXKwul<u6(_t8-;q;&V7cs#Xe%<rG{6wBP!s@IW)>giJsaitHl5eBFMJT2W-DiW^
zQqp(p@LY(VI3z9xA)s_6!b#(#2TYE26Nx}Kwa~<}``3(AHyr@MT<Y{H*&IYqg$917
zbLu`YZxDid!Uu*45ve&YY(Q{bQHok`1F&!3ki0F(5z84O8+>G8ybByll|H3;^=A__
zzL!p|d*t2i8<*V?4BvN>7vH~j?kzy>HBu9rs5N4H@aFLcUEFRu?_{Y%m8E{bjGRH&
z%AA>Q<S}5q%}uaiaUQ}fF&ZkOHKDmQphbnDiALvh?a~BIJXypDe}nVdLIkB4=rOiX
z#z9n#Qh`vl*oQn*&zmh_SyZyRMz*07Wo5iw&+Nm6>2a7mn%8>`8}IE`uY0B#k@pZO
zbMxNo<FrFVo5i+Y@92^a>xQs$c3Rz{;EfTv?yt=vFnw}kFL8w?Tst)k+5=u-SWV{i
zE-rJH7PN7d+fN`eYD^I;mYpWXWRGWvPiR;3<@?oL&{H^s^GWewawrojU02JTwmEan
zK@560nC$mo!&E<}5S>NuFvKU$(|im)rsD)Of9J_)tXr&1jfsBx+{Tnr4e62Dg;)%L
z#fHV271ge#F$#9s_Cp?A=w$Flx$B@#gcTK~Y#>MJRUIYFlR*z+mx=&MbrC(&K~zAj
zF@s|ijP<ziP;L|FBuSUbyCglO#b(l16?K5lBfn_pqF>VZM<4wDlkXp&Nd{t?yh4`Z
zWUu051RflZt7#326CPL00e5`XwdVMXNHR@?eR37#0^SqfP<P%kMx-KsQ9~MOBJr}g
zr%tz57X3R+eQB1Lan;W%Z|b<<RV3h3##U+11SM)|SqpbGqOa6eXMef3weZxsw>8&d
z4hGb_)aL-!k<bdjc_Mh<17tCt@l`Ed=CC&nt}Bf3f?*B1PWT>JTQVpvSxaOItgj@w
z=i!e^(vh8bzKwMgC4Gabu<Lj<kZNmc4ol8=S6cy;lXi&p8LyvBfuHTC)GN%;AZs=_
z`+-CoY0>ve5OxSfr|F#YSpTqgkHP=UK$Q5izDeI>Lyk!b9b%SKxMKTDSoZY~i%<5y
zwMNVOc(OY?N*Y4^R!~(}l(%B@Uf@U^WIcN#&kE9^p>7=&rUM=b8QUZRe&!!S{%bo|
zoDbsQUEX6@kw1?>lTYuQ3>e=l2C0QjTkyEyfl$i`jZf`Rr~_E)bY7<Qxp_=+4Yx%Y
zgi0&zLaw=%Q_AWePG@9L6R#Ce(z{kO_7x!QG-8!p`bJo};!E#0b}7dL$D~bTWAJ-F
zkfQfUw+YI#8D`P_03iWQnoTJdA1u|#CEhy*hx#E(k8v++*Kqx@(#>L|F39^}P#1TM
zv@9m5Ndoq<md#=C*<27$d5ly?FjhUkzgZ2=2&1T{*Wi@;c1YbvO^DVugv&znj{IVq
z8q~;l2A6%M@9yO-N#<G8nMmPPJay>ohvUP?3|>Q+>30c3;YFpd^tJ;w{10^9Zd)a!
zX)(jF{WWCoBCim1?WcK#&X`leS_v`EtIq^$2RCcl%Q6W7;)y+j-wE0$%PQzVO^422
zBmL(>;jlphOY-@n*|TT9d@{KylyVL|IP4kyn6*hK@oH#sv}J?b>6hqcYID+e(Q`Ij
zX7<c1Z2#JlXK_z9R?igatsQ<y;0qDQt$h6K$Do#xCIho3PB>Q9fd5gmEMa0!VJFbA
z)aRE;0qm44%}t$Ulo&CDFos-^Nuw_|E5n4(Vk*n%WxFj+qNM?+u8ulh0^=SvxPFJR
z(cD>_%OO{v<Ja%JQOS*m%>MU)rq+ci-;0SKFikhzben8N2PEsUs5Sx15k`5EYp^>T
zHrCtM#is5qxXpAwpH0;^IFF?s=O(*8dR-CDM``D13M~?S_-0l*2o^S11|7~?MCc{?
zwb9%#PcF(9A+-v_liow3v0H20Hrr|pTokNG+a3R*GJf+#wY$cp_0BNiX(tzjC+K6}
z_HN;gh=+(HJyf`}hC82DD6>PP*R?x!Ps13PKd3H7+(OsBk;74mFpasuq0U4*lj5^T
z2Apy`TiYUg#0KpE8kXEcZ^#wPb-!V`@QREVS63{jJ+@E;Oy>bPrrVk=<9l{yON)yP
zn5;BXLo6+r0zJ2_ql!J^#TEW+ELheQ8f^+CQ%@d8c?|-=d4iz1`G){T{KXWDvNa@@
zrqf(YeD7x^Zut>lbbWD;@xuQQlW9`sc%su}OqmaYJP2mh@VR9S%EVriw>KtZp%mDD
zH+~T$z)ZEsPgcE|_#Id)=r(%RMRePjKr$1%ReCqQ{ebMf-oVc42FEd%2bfMzSmVMe
zQLv<TaLbOBv_`Q_`7-ZrUmTZvB7{*f*ktULo=VQ}unn=_I}z;cUH3d@52}-x$m&o%
zj}CKbkS|Hp#J9JVqnAM5<zSQWCxxdthl>q*iVjcE`TCZV0yi)=kxtP~A;xp`E&JhU
zsI3pI!&dRMAd51rgF0WvG+LSYpZ#yy+1S;5l4q0|8R_U103nvHt*OImT4wx|?J5$U
zLxRezbL$07<el3(=LPDB=SF&{v=E4UY)fNhz0h85ebm-6@*^O(p!KmfRNP-@mhXXR
zrjDFpeGF^8o3^Zwq1pGa;6$SDO}Q`L7yycQ_vHnMCkIZ4Lh~ncLN9a7PQ!kH_yP5*
zjn5J05uTbe9yulK6sF%=E0q&zuNrlG@iSd-*Kqr=vsRXfbt26SoV^aSpg2TZGp5VY
zfH($43^KO^s=b7?Iz5;x&1j-b!?@r@Efb*@D6!$SzIY8&Hnmnj3=N&&KwA>>+tk#x
zSAG$vnNTOx7Qtv7YPyfrP<TQ`Y$M@eB9T@ZR4=R@8n2#T*`1s*bac%R3PT4*<1?NM
z-gOn?*W3ToPg}NrvdLxx_3OdU*JE~_KR8}EIKo1}4``MnbS`1!#neT8KQ=g079wj!
z-o0F-v18;6LtlOxC~qhCTRYUwWKMA@B8p1x)((~K;Y1KkP4Jq`KjD-IHv_j#gXu8@
zo2*mTj(i0`E{OovJA%Z0NjW-`B$a0Eh>#>m3i9+pMr;wbup0f6pv79MFP{i@klV8U
zOj{gG33cnXobZ9Qm96{eo~1f`{NUn%jr<fOv6&tm_N7R079f97q5FB%ffK&_gYTrr
zs%NIU18rT0)b!|uhBd!1YWB*cy}2D@)U#TC?^|YjK6SjNgC4|CoQoar(nfQ=G#~Kh
zan_iy%KBVT&QRT@8Rgb6ZwB#;DzQLY*cuGJ+Vi|~br`BO%{^Mj98Srrurn${Ho8U{
z*6}Xo-#8v?3bCYHOF$GESu{`G+C9V`4K+WE@Y8tWLR~{dle%;$^VDH|A|V`m^_f>f
z&9O5NIa>Qtf!Uqww+&q6dTyzI>#oPNFbZtEMq?Wj#BNwSH2&PiGvQOM;T3L(;I&DB
zYh*Q&BdHgUoC!M@)j2IvgTV3Pk>?cNm`J|DDS?-?XOZC5qD8R{&xypscbnDbkfPRy
zkE9gFx)R-vESyj5%epE=nxuR$qYOjl#iJqmT9G(ukygr@t7*A-IgYLYXKV^V<JDam
z90kR|k=kr?<7}t-tl9P%<fJAwC%_l2k!=K6N!w?EAKW$Wao52jP9WOKDbwngayx6R
zQ+ABULcJT(od(H2*wP(X6$^Decd7ik@rM3nJoI7ofsua2N&e`A@RRR9anlHkOSFQD
z%zW}u1R!fm4#OH(A{%LPO}H}0l5MMQXKqJ3-LT%$Bl1SAotAC*b^*(FQH8iTu8pDg
zVkJ*`w|*f0@gc(rge5TRQ_@R2UY3`7Axrpbq)9u{zMeXyd<wd92Lo`0`4v9~-dD}K
z(M<iG?K>(D70ThP8r%}N!?!|g)XX9{bWgxk=UP8UG1Ws(I*if}75Eb9XpT*@y@tB<
z?mV$2o=kEd-eeJe?H;q|c$wjIzL^SO47g5M;g@`b8Y*twuf&!vX*#P3%FdiR>>_Al
zSrqI~`X`t+P8x9d1EU)G#lQ{uN5@rd4X@*>Ob7)}o!D8TuiLm|WZ<AnHyZTJQGFbX
zNk|e$H6f^`{g9Mo7+OlJ?CnxfakBATw^(c7jT(*BgMLo1;kD~R#L&=_vS^IoZg|a|
zM`r3_?_e`S4z{lg<K6hLG#p>;Ve+j72^TVcrRA*?!Ry-?G<08KPQeW%axTp)>Rm=#
zv2f;Af@ZPNw-$_>X|u&f4bhP;PFyxFecZ<J94<QBXZc|!+XBD8^JylF&U(3<@tgn+
z0A<6r!FEBF8mB^9u5r?xfF~9V?a+3T)FgKX-UXfszzTm2R|?XO$BObYrmIR>%PltU
zx+{IV+A6?Ps^%aI7?nh+>UXH4$wF+ek$XAhnygr^Ho<j;N)6z7+nqVU<^?1*uC+e1
zKXlnwc4|vc>8kjQbZD%hxC~@2ZSZ%`sc-WC-J5eaRrYko)8pqF?);*9UEg12pSbfU
z^X|MKeu$$(dn7=waRLzC9l2=MNB5a(nicU#5GzZxUl@)`JZkRV%YBC=9zS8$_;g65
zc#YhiBkFj7@8D*hpiMR`yFJ<LUc?O^7>@snUAS4%kzZ;S39y+rOsEoYY@$70J6w^f
ziTPPZV4a;M$J3&`-qRuG`@EHQIX?LmjL`Ygp#QJO0hyL;1~{HhID4A%(Y6+onLdw(
zV_h<V32UZDlXpshUTGENp|`dh?X=%U9v;}|R?iy!2)?|@PR!|oBxo8}hgN9q)aU^V
zjA{I_F;mE$le}2wjST2aF2ZsrM;|t}V4Ob5X}wzjoR1X%A$qLWjr~s@mAB+5GqphX
z$9UdLateO*(lOF88tB7yJFFqT%1(e5EZQ`K67UdO)_#y)-8O&re%_?a9h(z|*55}L
z&pg#Dr>Xm`sI4n_s2QAZn@^+8@^nDy|DajIG~KGyIdW^Y{}kR@_PFkQv8_y6GQ52K
zwj6GuwJutgGLOgjt3)Wcv?o4@?!4Jls>Y0lU!KtSqsvygn*+3;a~6_AtVSIP{~kBh
z@J5ag-yGI$T_i+p*^LA#c%#i~CNj5jSZG{f{Z+I2XrT&&mwcgKD3^&<OWcxGHydRI
zaZ>@!_pM{&^RSXY-j5sATPwu}W-yaSB32H`Y-Syo=*S(m*e6~f?kWy!+!ZD4`K~}*
z$~7-zZ)^##z#wvN4}MqV{iz&y4vje(?@!h>`MU%0(46{sZ+Bp4Np~{+ME#7R<cxHs
z`fPSiZ79n#fVnKxHC&edv;Uo_ibnhmAAaZV4dxMzT&FDOSYza($x8I*1pJhMv^Q(q
zQ1=omp;;xfJh11!r(xB<$})rR&z`&Myd+^Yq?h3&*m9GQl0GmD=WW-mn0|=?yq4uW
zOhk58L$5#8ssq_ebXW?9{3gLn$!NB`v=;5in-SNBdz)EXiU`%51c<I?irEVA(X<-1
z3=VE-D~B@R%vyjzN9lMZt6n6ULv!=?wu&dY!IL~$$g-MsdhG6Qsu^a|j=H)_%hzoh
zKiEj|h~pNkU4!o_jT^^!8Yi1sa<XN=J$t)sp)y997)3UWEW#n(j#PCRtg;*32;!zT
zp})5FM`Op!7DBtsVl*{Xb8&C!g@9hZ4*c2{MCSngG^C!ZCDNIq<~YPv_rQT46WYPx
zwccn)tLX~ANM&Qv0R`2VUYhpxOs8|*uk??Fx0Q)<Ys}wTd*&g`Tt#ujiEs5y$9;N3
zrdH3n?u*^oWaN@jX$Ru&JVDlkg-$5}`xgnbiw2!%dontbvL~YLV-AoFXIR;;>BJaZ
z7poU0EG6o7R+MY(2^us(0s&Z)7Z1n{nXurCB34W0_;b);ge;NnVfAz1il#I;gUDbY
zjekVrb%b~q`-vZ0Sm0v!9y^W^h@_}mFi*1_M?cBL!ca1smwq~!!+aQw0#$+90TIP4
zCf#Z3*3C{Bq@aJXk_I*JP&9y=#4t0_46AlY8)Cgil(mCKDK><O$W&6(jso0+mB}Wc
z=^?kNa(F>cQM_vCXw!mhQG5oNUI*?&lCeA}Z3-oWGlq^d6o$I?+rD4^`bc#S!;79A
zsa_nlPAr!PWHD<gebkLK+X)Pu{Z-aFGfobM?mZfT(2`RINfHB)VIV{nCvx%Zr%Rgr
z{jBZAOLBgzI&+Ni3n^51INN!CLW@_4qmtr*m^aH&%6qg!vW>;P)#tTrNu8Lv$`TR?
zZ~q6^6#?xXKB9P8;&iUt?pdVRf@x#aG6PRJz-qFDc4(t^fKYxx$y5;d?1*K#Kem}n
zC4Q7mQ71B<XMAGeM&C@3E!XPpK4`k%4rS28peA%hWucTR1mahtyZ5O0wAp>E>Q>Fl
zwhk-(qm%(;G}4vet8}eyPw3gZg06_R`mfC`)e%kI_Kum3bsf9vO!5}ym)_Xr@+~Ka
z8OOLyulF-i(Z0&Y9j&t;LN)`f?CLa_Ux&#Tc%$A{!16Ub_X)vszYwdYYy|uv=A{g3
zn(?XXHk?%{aVmCOnUxP?%_82+Q~!CxYn$t-BDY#w&LP?-8vl?7>8=Nz7qv0-K&ft}
z*0}8Pl-<Ta=90Lx*R6-!$7CCk3-P)%8w|s@16ukxMiNH~FT<bh&cM)AG+1)Hnt!G<
zQn@15f;G9JhyCz+(61F7c^r#DV=o6U4km#+Yf#s~yK#@PxzNfab{NUP%PB%26Y^~S
zmfkS~7NzTk3plA#1&wO>G-ft(3JF+bHH#;529#Bi*5?|zqlgjfYsE!2{fRgUY+(gy
zX*&~NbBOlCoaaf|R(2<OFsG>!zWio+v_?pdhZxv^_FyQxy(c(7bRbJ7j)rN>%}t><
zH>9l+j5mO8!F)z~>3aMsWU3@F6V!iy0}I2Eyk|d(Nq*W=KSrgxUmFdV?bc5<Sm|Jd
zI<jDg`m7t;a1#==Fd@D#hA@_7DK8<?&9d|lalFvDcP7dAXyq)i0rEYB%MGy<1a8v6
zDvb=2A3dYx7;4dN>eXfe^YSlw&y;hF2)Nz!M5jHtMNL$}qDK0vab&2zsJ&b=k$z4o
zC%c>%aay~_>JdG?-ZzQzh!%uM^wRN*O)ZO5=Up!4kbtkb%%7#<lFrlU({rn5L(N?k
z$keUw$Qnr>tG)qITDOX&RPgO$EnGL*D!U3Yjt*59u7#OvyviWQORr0B8^`Wa_qDcc
zU(HX-sbjfiucw4yrE8tF#bGpRvJW;!0{P%HDL<^|dG*?C;8i!zu}IX$`?Q*A>+c}c
zLT+e%RFU$Et!4X^odDqeOxL;YQ8KZKS5+Un--3ikB$&%|8ppf08t;A}vg`D=SN4d2
z(|qaP>Y_X4Hw&m<*9P-foXwS!)W^eSMO!rxe;#(yczHCB@mxpV=~u`0yll?Nj&|;4
z3C&ISxFN3?wwcfnZ=2bY_H(<n6U=*5ZFmYXXBGp7O=2H;j$ErGHHAlwe72Gh*5@4)
z_vEs>O+`IvJUv;WX$~#7+TX9-;2^K0m;}DEH(9bYYzp7(UTA@dZkIT6@XwE5)0Ic!
zg=v9$+$c9x+Yl@ZYn4C^yw%Lr!-ov|ZL5x|2>AXWQSU1Q@_|Q%{86fc1AIxcsRcPr
z7agfu`s<?`eyuR=*JCC746OifiV=p{B&VxJ@OKlO7cs)7t;KzQ>Hz9{G`@XDe*f7m
z%$MF}f09Ydp4RM^-u{vj6Oe1y<K=JDv6sQ^l`rHjN2aCIO%`>Zoc)NSJ0e~(bkVp2
zELd>|Xfx0~&Rtf;#Yb!|>^3Q*bU`y?wd4<-!_7*OX%KHFRUgGKKI<k_+QbK^F1&YQ
z;nXh8s|TzufLmI!m;g1z4WS&P_sxc%bDD*1V(XsDMxa|=;s#1nA>YXjk(aLv)ve0j
z>}+jsmA(9ENOR5`v%!s8xghTvIuN!%A;a5(9H&Q6s}Ud9+={kqF<qCC7qUgo)zd%Q
z#<!5Ef|eutd!Fx+C$@DyFip_d$x}rx4S?hHnY87kT)RHpbs!y*L0y(2)?|uXpwBV$
zY~Z4?el_|S2M(D#Ca`aw3ij~IbxZ0!hJJjtOI2*lINJ=WzT9FLYVZc>_OaUy^v1!}
zb!qUD;e%$dp^9<4HIF*jka5dYhL<JOpRp-X*En5Qq9YE~{$uPRc`Y4o9sF(-G>kWK
z|2Y&p@HRyaq;azULiwrUyA&`i>Mdo0#G6473>S#e%jB|`q{U}%((3+IiDs4~%Hy`g
zW2~FAGDL!?YhKM}m-6VaaNth}yGzDf7~YD7ZWqS<SU2U{BB~zXMtKaCVdw6v7IG;$
zSQbJ&Ph$P+vCsi^a<%56tIu6Z)5c@K-5PiR!wlcd2)h|(X*0E#hBwSek6>`~oS*(b
zr{NE5r*vg^@(1LjSOA=v_D3Jw`>P)^)=g}adj7@zYTi81qAwBgYr)KmFz4lgM+H{W
z@(LP02s0-cWnlV{hC1>k(i<*;fnv{GF7%kS9ijZ9PQ6c9^9zs$a|rsQV6;$uU)rCh
zjNZ1~mA&3Bs>D@%H8cb9jJM4gGpVl>2C@OYtmaR8i+3rs)ANn=BQ2m1xt$tZ!H^oy
zG$b`*lV(>~gCay6#DSc(VKin(_Zw`C<?#h4#6Q>Jt+;R^)Ok4tKy@S2m^(Z=22-#^
z7lp&C441_3qkN9iuE*!u(lj4Hq&3@PO=q<ZQ(LaH?LsR)_(g$Vw<m-kTr{4JSkA6*
z@|!|8pRI|}w6%1T@fg{X=0*#s1!V8f0ruXE2t1xxcw0Fqz<0yOHo~p7)o5~VOu0T9
zfcy*S3g6SiMdE4e0hl`J5-;nq!NoapJFU{97-z=i>x69b1G4=@3l91}#vgAUSy06^
zOGB&6cOA6GPc8UBvU}b6y&eN#;(Q{QI<e6Ao~O5`Fab}X8*qVmN>L5=Oyx{+uL!KU
zT;=)j_J9~b@{*(T4K(eG@C@ZSZ1D9wt(#Lcd3>E|mTJOL6${qc<UF~%75Ntv(9x~W
z5$%9<7kR`$bLUZbNQfqn3c*GX#wZ{7Z6XG2*5JEHca4fEIl_%*O`~T@wVs&(Bwbzt
zAgkjnlV5y`0sn!B<M3GEmC0}#^iG=KbnrLJ+iIH37hmtS`@jz{$eTvg_l@%JZ%C#S
zDjnT$f-_VM^?k<)Y$LmC_I1E~^!*AI|KX=!-TKM8Z{Gt6_aEH+%hug?KicywUb)q&
z=L>QC^s}E9D)PAM>^1IRtG>+w8a%i&W$$LO=nRClP=O=M?lhRGh<u>PV-V}DpFQNT
zT{Uyt(j&fQ9q|on^`s<^zyVm+X=@DJ12u3Pb7A$V(n#Vn@5UonaZvidG0GTQ>V5pY
zMIX)0n*_8u0S<;cm|R<{<{s;UE=vBObLl)`o_pE^ym<P>DPyu&*CFVJ>^84%;3*8t
zX867h&-xyxz<4HKjuL48o!0}Ja!+!9S7MqG{@g!>a2U#2#v1Lw-E2DV!~t3tlQhpR
zH^jCHH5q6t50>f>^=9;KjU5u846}w*GTP;ZM{7Ed`ZMcQCfXuzK=5U=ng7NnjBzUu
zPxW?FYI@G~SOm<q^oQ>Cm3h=Yy8b>U0j&)iUbFe!<}#Kr#Fid5ckk7(hIO-zQPB8N
z2KU)w(|idaaKza9bo&ucNP8`P;P@-M%)k@%H{eU|v+JJ5FB%*0#DVMndE#(;PA<GW
z=n06NyY6?+edU;I?}Nv~4*DVhW&qy(R+XY*H1^ysi1<^bEHJgu7%g4E&QSxX!h}RV
zz5VEFhyfe}`98?0j1c4;zfN=kyg~wA({i^+2&zxN_cX&bG&>UC&n{SQnnX+R8}Y|r
zmk|$%%XE69>PCltC*0xq(&SKdHF>WN%<E2%H}S)B_34fzFh<MgawZsb1WlysLxz77
z0MT0Z8VR|Q5W=0$2Fn_Tj@G)_w{|X*(ErC$OP_ov{o|j%@YvPFPK~B-8o4K)Y44sK
zoPGJQ!dt+YAoWg3dzQJXw{yP|^8k3pRwb0t&?yC&1Q>SVFNWX^N$%BaCfsJ$#9rGJ
zdXX9+rGa4Q<|oVL(4*W<%Dbbd;U8v{PANRqZom`1HN0cG2OgQsYt?KUuK)*tlr$X}
ztK>y_BpHx1?(p}V+Q><I2i=oNMr_7WCVc^Si09P1vA7$k8DYp70-2ns&rQ;yBvZJ9
zdGlWLFPkC@awUYi0%OP(j&9|(B{1^4o~GKc`gZN<*bxjSt@~4!1#^y(*+5<wKn+IS
zB0l>H1)u2hG=U;BGV+{kz+liQjmQgfAB20<pdkl+6$rEQHoTrM5RDD|pg`%?@_U26
zAPwGPIQ*o=3yuw7;!(Glj0Yln%FOJGFPg#R&>wiUZdH`C<_ZGKY&X=i@K$WYj-SD)
z&FSaQTo^Uj;xs^AUhx0@0)f!lyczFzyA3Hs02M=Kn=2GD3mhY8HqYOSr&&lQFAK~I
zh@lUhDIf;os=zt}KY$fgD6+u-f<YDp$CBs7Hb}_JV=-@<(y-4wKJ0bfuXVovLv~D$
zxDlO%goFjwf4`Q^E?LJxZ~)4Npv~TH@OF?P_<M2@T-?QSrAdtcoHg$i53?3DHGk17
z7Yxh?Z!b1AAlPQ(<X<EL(pdFa^l2qNbNwE(K3*tY(4ChGN1^=2{bko@^N(`dPA2N3
zI>$05bfzez47%quXh!#;xP!>Y`h`FK8!ZiFm0;^9>tEi-tslbkxPPRPcKCoKf^hxf
z&=_NP%sfV3;tLN-crThU@ZQtv?Q=GNqMIMd63}{G-LZ%|^10bOJ$^K%q?&v>d4o{<
zTBX1*+HG8(WqOW{KKFLAqQ)kyl8EfLlAT+yqapv|I!wht9seEGqMjX08yxJ*{gjoQ
z4gi7u*;rF<+U{9|ei0nc7@X4gV>0neunj|JWaMEsSkP6HhN9%qKj|ZA$EDT3ivW0a
zLS+U5k*@<ey+9Bk&pMpQu#(X=W!JJ)Bv?2|oe=n?8&oLl#(d#ol>i0KBMQi{=s^?$
zL%_s?*$YdpLQoDoxxo}lqCn1~nE%ql81oDeqkvhK{_ET<!zzUn1)QE8SYQETpxGlA
zkOi&7L;R%u?z@G1=ivsv66(S^m>tmc!U+lr3NC~U#Prewq<K#LuwwH9^BJ9Iuz5aX
z`qbGYt8}As*oI>WT{&rR>t8-_Q$|%|(mD8|XA|C-6Bg(94t$1AP$fS0EP|;e0A%;B
zTN1Ny9Y{7M@%u6w#2Soq<miLSf#!#z4;Dl}Zp(ocz!Q`i4B{V}6G%Cbrr7v=4I~4e
zP;b;^Ps4Myjm!eR8|B7)77yQr+#;u=FhHJ5l<UTrEZ#qONyOtkW4>l*Dahq#u3uQA
z^i4r<LNU4<m7&!r(8b#tv)}8@GX9%l2u$G$4blNNhgb11j}ToDcSAfQ3sFP{Jb-+v
zC<QJ-)5sqr&ZhIaV~BkB0rML<EH}#6?&sW~VCd*tYKLmmfj2ii`sF`?HFRh}u}a0y
zM$G%WNq^#^j0*8?ytieGfVe62A<bO3K$Ei2N?|$n@CepjndlH!cVqnFQS>Ub^A$x!
zB@pgR28sJ%1j;>NuAqc?8)d+31Xza*J}M98ASXb?2r&DPC0kmz?5Gd!7MJI>Y?E$?
z=7Is9ci@hDNqmM|ad2BFuZ+M2Qr@&rrKO!UCMqqIKo@t#z@#3S{?Hu40zACm+_p)_
z0xfaXiiS6YOphTOB90Oqa;3mVj(KCEadm%of6M-_%5L!Hkf&9LoG6)69;Q~3&oGL@
zQ~Q$^5t_yQcdcmn2n={d!)~y~D8Xj?#Ag2lJt7}aRYSRR^09R9q?Z#w@_Y89OT|(f
z<O#}CRFaMfq2mvTg8RfQyl41f6?esv-014-IcxI<ZIc^8J*eX#tw;9Ugs!s`kAQpx
z&!^y9O52!Ks5+oBW?yF(12RLF<AMXB{XYz*88?{R*n8$3j6zut(UJF@F1Y*eJ?CM`
z-tQUn&@(yr@rrZ-R>b$r>1$k;aC613KekDNBMlDQo~zjKm(AWWF;9Ptq;kO^c@VM|
zQcg7-WsmA27CCRQJvEEeY7jz$<pm}ya`NKnLpX-!Cy0<}T4-_HZy`g9POz-enTOn?
zfae(FV_B#+5C}5Xq7a`{2)d)dvUXQ+D!BbXfyY7I2%#`nD*$|L=pxd=X#rOkm>o!0
znCLL4!MTk&q9LtdZlh@irSddcppZDqVJam!Wva+-6^tFsb66FB+vba9p<`5;T;@Py
z3ZCwPd;Hn^W;}i;{pVkKiX|%#j>kM(aHP6y!=sc3s)~pMRKv3*Vkt}Ru=tWm;<GHu
z^u&RU8l_82pwQ`e-!Ew~qJiE!!_*v26sLuS|B?HiUb-xII|KLx`SuR(WzCjT>oy@a
zk{$+aMxo<tIbH%}Nls;GNhuWs2PC)~?7J);abfaGOgogT2hk5|5JBqCOb8|F5eC>6
z%oIgjD20kGIR3$~5`H6Od&gP@!I7Mz8gk2EWI4h>u9pDGyN_NV&{Ro&BbKB$toW@-
zrE?}idGqu0yRHm8j!5y%8mr2i7<E4*4t{*K&Hpon0G){?h~%rpfGq`8(eOLdLANs{
z^Yail<MPA^ckLbEVCjnt>|&$T2)2P~777Ryf=MLAgc+i36T2`L;#W);^Fm>R8S@!s
z)<1l!meEygE*rq>d`g~!NJ+OP3IEYJ3?}3O<&rMeVTU9m+GsyHih(PtT2fV4Uln@x
zhn&W7hg<Us<Kx@_!gDJq3CmkAg$O0&T#6+anD2eYrT9zpF+@D-FgrEwlu+4g;r)-D
zVu8ST-sNYNifI@G3W~$1$OSlsn1?b$b1PrRN_2yZ<q!_0BPt|jTB1f&VsJObNW@I~
zS)j5+ql*L?WH%EjvXO<n$@bx5N|J)V)f5Xz2sX!io@YT4LFEbEQq-qo38=UgX4SU`
z)0mY8XJ!mojnW9RAAVO2kvD;N@j2t-GghXGPFaJqDV>J_zi?9wH=sa<h^fFcJX_;S
zb2poH;f@@-dN?}=bz?Q8JNYOk#@*b?{{Dymd&Rk54J+=~jyu`JDon3-fLqy=AC8~r
z7LIZ+*nZ4t0#lDnM&*U60QX+VWd+k3USe^IbSU<pFG(;9@`lF{8>%eEcZMvp1e{r6
zuEeq9Bi^#tPhH7SIFY5Hco2A`AR9B2b>sHOPb~thGis{wfsHQFM^}wD$cpis#h5QK
zq=>!bgNB#XliiFloi?(Q*yO>O3!bKv7p_W3vM@58qDd^O<k_2(rlseTD)#R&4bsG)
zcQW^#QnJxGp(b=xB<9E88?d=Z&gJMO)wDSN?!?q0bDU|(bBp8Gwg<`vCUnc9G8=bx
zXlY)~y&$V=`6UfLoOWrll#{IkFuw!q)TSKxm(%0OAm?V<H&3rPZ4w>Z@Vbwi0h;yM
z5Q&{B*MI^`!nn^_L<~el-x87?HWAfyvu)?*1)V+8Fw9V{?cD6b4u4x_A!5dyF{?QT
zeqZa*^<)3ogFmmTtLYzIG{cv(HyCj~7Quk%`s14~eqZyAjbk~#)2kDw+f`(6AXHLp
z7j%x9rd|bMhKj1O#4>>im8jw>4pMQk2t|%pOsy?uShyjnjMN-S*>bQ*v(0sqIjnwr
zSGlKDAGu%#s{M|QtP=}aF0<3z7t{??P~{oDoCBLtCfj+x8lGA@v4$VfKBdjfQwk_i
zP!+hzslr?hc_&^Vm&2KzO_dayCNEGp$s9gE=g4l)PSzC+PRliz!D&-ZHyhP}BOiL0
zbU!^ogR$wB4!~uYb$B)8GYrOw9E^@tN9&s^bEQU(imJ&9%l!XU_TS$5#-q1~5i+^~
z*-pQr3<V1P+meI7&a&tSSj&sFq3D!ilf0W<{eQ<8lj-RAzM=L6yRdTI_a)V(=v5Z}
zP)RP`!!kdJ#a9$plp2z%&{;?rx<$Gw7g97-3pou|#eSvp7_C4}EDq?7fFctzIFzHx
zdmrAkgOj@DL$>NcVn9ZR^E^>mW?*<mr^*?T3oipDn^ZLDaNto&lNg6;Mc&7x{N$yE
zR_~#P%+yfT@zhTs&s{Y8{fJsn`&oOV!cGs%P-fyI3JBv=5t5fq?~|wEo6QTR7`N0-
zNm)5UGXJ;AO25j=1!_&*Fs0-;=_<sF-FMK|94Hns1j;wst#f6A?AKIu8WT7rBJnbe
zf!K(Yo2|Km@|4_;!H}~`<#~vrT&%wi9S>8%mTjuoS{~A$qh_n|7rwPb;=avhc=#BY
zkosGCKxfH)J0m-FsQaziRhr*E_;Xi+#9Xp}xDv|Jn-QHs+w6XAz{i+4@zQs5B?a9g
z22z*vKJNaROb{f;l)CZxit@RlvzPi|OoR&XmlmbSR|(iku8`z{R2x-D__Kv~|Gnpx
zqL45}0CoCuRkN#I=9aSRK*R>_!ODp$=Yp8*VJ(A=SZy6XF$pS%=@&OtDZ*XVdI$X1
z5HnFfoQH6v)(p9o3Humm>Q5HJRLt{GJ}M}RaQ`7QJD-7Oq|N<!risOWc^~ArYl`D4
z8hMDn<kFFfNLeYdL5diM%~m8$%wpwxvgu2H1}{1Ol6G^GDdlCov5=#TQam;k=g(VF
zR3v!vwI|ed<QGFR-6FJM>nCepX22Q?wea^ss=+VnMeBPpP)SK&b=9QZnIPK2nj%*k
zYHh@NJM~~m#5Zs5V^<l9nmzg}c+O<ZLW#){f*QI}sP5Fe#0eha*$@?b0pl(p&rW=<
zQci}^CH~T)c#SC->JgTSqSY!1s!Y6mUcsnJc$I_Y$^!iM6%Z3{01%-fxeDX>#`?-v
zBvp8|<HC4<K1-b&zrbK>6}6s{y)e3Adroo?Zv=~F`=ONxcTQ4Sc?UILjHVpqStP4{
zE2o;RfhoJnY~9~7%~n)YcqI(8wU-Yui;85szB^H)byOp%=J=Z$+BoL2e&_U^vQ6zz
zvb=@4Y6QlrPEwYL6G7fgwznG*WaAZ8rL-BY&T6H^Tx7WeR;#TMrf_KeKUKy4(&KCe
zvoT7_zDr&Mp3-Z^YIuh3B=@&YMJbsfkyO7~>1t*%S^@Qa>8I|Wu1qLQ{=xwg-My+V
z=A1xd9ASwM@*3-JOnX&j+2ilqT(;{G#w`gk7d>F9MWPQ1W0TrjRZTLTCstT`!^F?Y
zo1r5NMJOJg+bZwG4)-2#xR=YkHPh_sl}eA97wuzp2dix6^PbCRnD_}7!Im<%`dE%H
zS_Tf$=<-~r3fa=p+JQA<9H!TV61oT5!+(st#s!UXmeyOe6Y^4Eb7PcFk&IQb8LAEI
zlW!3*sj=*q8@%9?=q7LlRa(Uq(9~7n&oPQnGNTnu&PjEwWQt=lRSPL<EuU3EP1zke
zKZWnvIk_oKvI&30#xEgFUA+3TzPfC;m8NmeDY0SiK|9@Vi6PZ8)tvN*v7Gf^U_eB@
zdhX@=PkxGH3Rt;=>WAM6;-SPlrDQDLX+lPo<f%?2zA#uF#n{c=cvP0YZpG$9GGX_y
zdczG^d1jxvv;C%qs6K3A!K4jotoX>Nd1t6y%cSe8N?<uMSI#S7(hdQ7*DD2c4=s_^
zQ-V#aHI#Y)EnsaHC!B$kLhYk!!F^OjoZ+iA)^1#D5z^yxwooq2dZGRyk?b5QKWhEr
zLEIUOMcbjN(#GzMMdh(&7`!>Cljo0!_IxhBt@>muFcll&7RbL<V5}5$9je8tv8plE
zpUKstsRgDlzw5Kh>>-rKRMPi-tKAGpwZ@ed3d{v+%}bgE+Y5ZPWI#s^QXuy?kNIwp
z|FP_V-K#)JkVTb=+1=yAT5e?#FPF$v2!zqB)=YQFomHw!<OC^Xkum$WhY~}j38pA2
z{E;dBBpo(G+9r)k(uxg<CDwqfpN)eOKp$b(aI59rultu-(n~4Pt{4A-QE_#}?$@jc
zp@PVcq<{2Hn<<+QGt|Q_dZ8Epq4{!4Z9ny9rMa)|vSH0oS+T(U*h_V}2a|fp*bA~{
zNy<!IPY<cwd~LOAiIQc1U#02r+POE1q}UuLM{Jht9jLLV*vDfldDq2i66r1#oE6;8
zgB2hyJ9c8>zhWnR6|9iUP#I2*oqEaCkBx}A^@lQ~asJ4Q#ma2Cbs9^zh}-MQv2`gB
zB4O+Pe7ho|&?S_Qg+sYrf}$W=pIy)_)0G009-m=3uRJedn=uq6zH$sjRVC-rx>3y(
zhJvzz`b=dlpB?;&m>Bi3O5<59)Eqr}bPDw`cb1xyAMX$+_fyK2G^j|mA5{gjO>6kh
z>z@gRy4W~=Hv8p0ESJWAx$E4o(q9R2Q!nS)O1f|_bnYl*N{Fn8TmAtr!J36=NB~ii
zzJ03}TjRb=IO}E_Qy94~tO60qk&42z<=9;Lf{9Q7h=DjC=2mVh=9JdyUtsi{tGHE5
zC@p8o2w8_yT@?IQLPT}O(HxmTt{Pp{ymlE94XPq8q*<?ba;gB*3YDfHhzOS^Q`Deb
zD$J(HQ(WA<QX+QhN{{lYIr&7%^W>5Ft)}umW8!-C<g?RbSFfgOB3sTK;Z0kLq{6El
zHa%A5;J1lpioknh;u@iH@(L@aKPRt_^Kc(ZOQpq>Rx9-;6{tXPt@8bTQ{DYL(MU|W
zZrUDL@~uMeZqnR+Q}iaO6{2!po{!DywSh52g$Xd`36(;t%2wC_h^N@5Wg)ZmZ9jI5
zFV&kxJy}Jvl7gpOW)T->&MZA}#D>og{+uIDn3j@o<45J%{&1xm5=%I7Q~19vBa+rs
z_M>n5;6!oX?$^@tcb2jlzV%?%5@~<CpexDEhF;hooM{7~jpz41>3@GHv3K}utDWC+
z`fF<*D3wo3S^3-p_OU|qRjV&wRmHjSXN-x=w^^~ka;_gYkL2mgC56vmAUQ4d`KP$?
zvzK0(qQI8K`jt+-kTYy{vFMapvQq5Y86WmUkbR&q+Gic}C5lTjjfD%%!PDg~3>;#H
zO*2cxb*OP2JQ?^BRt;ycfU2M2k0!=c9@QLs^!e)JLMB@E`P(K9VRb7_T3VJXO*sdb
zZQhy_J?p}!?Y5}YWE9D?s7jP^Dw`ImgjjunS80%J6Qs#GwUr@!X0wL<Nor2L$C~u$
zOTJ0!^W{e|O*#-)_kX8~X!&mQP~a*{nx6F>T+Mc;Q-&~(-9WkBY~aBW$51};rbu66
zOnof%ggG-ERyRB^*<0MA1RS)(&8KZOiz`k1U3-rc$-RMT=?@j@eoWjL`&rqui)Od?
zuG=(z9!;e`O6*D+mB=%4fa?-wK~`gy-a)ld0_ABQy^~*eYUYkNiOF#!M%X#|^f`Yx
zH%B_B1nNpATehQ^mdP~{4o8TzBQtTuOB{*H4V3JrPC0*OssWtmPKYZhrYS6DmWiX^
zszrHmrCm*2?L}N!`0al{cqmCsy^Z@wow<j_)%P~77)UKEa-p~DpdZedNhsq^)Wp8+
zskA{6u8SpAC_go<@ke@blNT1XbeD;snExw#H!N=$w}v~U=|@!<CPq$Css3=!HKRTM
z?w3y?w+O{iTFRTddQPewaeL*^Q=Ta-vqq`e5!EBBLt;=%`LSW`&`(ibGIZ((2(g^1
z-u-;{m9P3=qN3p6OnLC8Bp2hR#CDbiuUPQdZ&jpb_WoV<=c9$Uj^#wxBdnHtH<<eV
z6njS&vQua{KmLx^OO0Pl6rhuC%6z1~M0MU>h&D4H7<u)c=M|r)D!t1@DEhFU>S5-w
zu^=%eD^7P|@lbjm)cgta#(6n>FD7*lae`ghnmHxn4iudzrd*Mcw-OXH1BVeZRpzs%
zu(qvN<q_9#9LIug|1<d|qLg=*Et+Ch4!5S@dw%)4J&J3Et225g#hF*h@{?-PEKI5;
z;$HNM(6RJLC~=muBQ@uqq#jw(GTxOG13QpyCqw7E>mPTC@BCGE(VcHBGrPu;vzWe(
z*uwgQ7Kd3xbJeX`)lJ}>bE}mwRy}SDqR-suNq>#WO{@ADP9eHfCq#nw;uv#NDG8}@
zlWz8mmd$hC&k!ch#2KS>L25>%j+_*fuEOAXaN?U9gyGU8%o`@R>#S!laLbcks#cFA
zzfS)G>NDvGX=d(<h)e9{YK)wtt4|%G0y!&3BX3#6Fq`}eIWMX&-+0m<GXG{!3+#N0
za)T!-V)bmQWPZ=j<mx|9j4}~UIAwb6`O0EDyjQUuN=l0Jvp6Tmk$ks$N9`3|a^ozU
zT=kDnOw5-ilmBB@kREQMewhc|K3462GjwevB~y5PlP%SYy5;l@H}3RXQciTq2v1f8
zi@#`^BRs6LaXJghHutbr(OMOPN+s(kFy!Y{ezXeb!Jmg2bV;C5UnY=UIx^&ar_Pi&
z6R*MWk@%~i(8xsEtvV*+WD9%(SC7;-sY2=R+GPJQl$gz*wtfFckFI;b?qdT5x?T_V
z8U=C>)?DwEpf&l*(|Ma_-tP^byw|2sE7$M%Sz>OSP5%`Ao5x+9ndC<ZI>(PxQ*8Oo
zz{#6)b8u}zoyi<>PaQ{NC7dEFV1&erSOFqYYc<KwfV&8_#*Y$f%Jf%hj)hOuQlkfW
zKQ+dKM4epm(en5cR*kBi@hl#s>GyS`O^cJhs6V+ml&dlaH2h(JRTRhLwaTN&?1Axy
zALM)-xjdc<vu)3OCN(qZ0g<lBdBNU{+!J3`KiqzjUT(df$c*K9Jv-=8c{=v2xjTAf
z$$f3psvZ@qqvkE&;L6*YACzi>m9DfzFW)IbjLXxN$CGQu&wlu4AB&Bk%@&;d)qn)n
z7z=sK2Yzsj8MM<tmcKim45~EfKIl{gxj~pfnt(598Yy63t57OPGfNJS$FvJF&G8n~
ze7Rbck?HdZ0?LshSF^V4ut<OI%%81!7&rN{rD9?Q^QuPRT7kHd0n|#du`O$|@@HU2
z?&cko7c-_QIaa~;w_H7$<PLk502cqsd(YTQfS)4iN?6{?HtX4<d%b}tf%K$ML%kvR
zOkVA<!0%@U<+@u3<-iV)I1lOZ0F}d4wkh?7(v(wIR&Vm9DPLr4<mG9y{H~0=q`ox$
zvMRMESI}<FxQBaPGUuc1vor{6r(peyGpv{3U4JWiuxVwW>+t1@bh>rznalI#+iV$C
z0r71szqcxsVQy}Nt^4XQtTpW7p12jxd$y>ahEPh;T!Rd4ZGt#SlNmLN)iKff(KpM!
zn-2XKeC8Zgf=H=IL7?!Pp-MPD{XY#Isoz;P*#Fa&-LGbe`z2#&zGUR;G42)>h+O5i
z@G_8wnh6bGexI8Nk@4fFUMN!OKW=;FTjQ4&x4t!Sa+Xz`ivuSYbEDE^=HuqSdFCd!
zxbSbDDZBXn%-C1kx*oZ7lL<PC*sLpSizrYO8qb&h8pX>E$;L?VXgN>UBjHl2STSx=
z3SY>gHke1v!FOA2;@<E7h*7!QO<GQT$LymHHzAY9^l!iDEj?s?fvAmcR$`>ets~Iw
zdFFl*#~S4Y9b58Hha}iZm=rTI&dt5RG*vGex=PlMs?`$V0a5=sYqo|bOVC}b&FWcG
z`9tORtyJ+SSD?rYS6T_87)`Z=j4n;)e%&;Evc{<1OuE{vAE54d+ss7r_>xTJ221RT
z2Px}!gDZ#mZBlu4hs;^BIl3FFZTNweB~_!dX<1B1Lmz%go0gb*d(ecZ_P=W9CH3>=
zZ=${m|JPq8e*E)qJNm+0eR#K#q3ieK7@LU8txl#Yc@di!;!Rv=&#kbnC#+t%QQ5CX
zF`o5IUJ5Fc=Wf=SEHvzUGOm^+;oh8GrJ8b#Wd>-q!&-Yp5i>hVzL08B&MLyCMyY8u
zcFa+tn6rw^9LG0u77rDRxf$%|MRy}1o28lEq={P#CtN>ArqJ&gjp@BAQz!|Dy+a&8
zc9eJDf}BosZnidB&gZwq+oU+ldDwXU&gXHJC>Qzh<w%yRM7c5l)Z_ExuqEh3C*JV5
zMTcNU8tK=f*oI{!$y0jiw0?wTY0LhvwrcAeB!0Y7wK(+tWU1P_bary@(&H4nXrOSU
zx_yj+d`PJtZ0MzjDLSpgzOCg&$U8S7lddy+Xwi)MbN-VfPs;u!E+VdauR)iH`xwFE
zzG5-N+P#@xt5X9*cu9*?uO1Z%qC#=-kKzj$xKnnnGI)o31+FHmB6XyNlKfq3Uh={7
zb*lpQ^ER`WzVX)s!J(5)KZ+l=wM>26X7I-(_WtNm?pyS&@#5cqc-bQt_MS>?I`zZ4
z6`Rc5rhYX$#zg&cjETDP(oJocO)#xBvy}V!{=!?wugjGtDw#P!OH$a{u%HWg-&HMN
zrKY`Wk0@o|FGd|6q^!soH;Y>pg`$QJ)T$a)Q@oNfmysn(nfTKmQ=~AF#FluX+nG@N
zas;Yytv|X?V>RMFQgJ==SYW_WR-~X-UuR@b`RY6JTx~67VZ*32+hW}rY<=#LCR?Rb
zwn=2A-{cRO!B&jv<R@xwPVaP?r^a&5kqAzHe3m!AEplijDmN>0CQ|uwD@eQTm91Ra
z4UAmjl7-C#en^X;zF@|Z=J+o<A3R5_ESpRfL29y_oNhkS+DjY$B=mR2%DTE=%(Jd3
z<qDPd;<HPC-Tn5j*Pgwmza_(b{KGNs<t<8NnI3N4{h^KWxi^x?Q}zaB1&<Bd_Wc&v
zBOiooZ9aB8KDJ7V!q18<Q%J0~%%kqu^xrwoXhNtLv1XZBcE1MIA5G#=koky!?S$nd
z5qL;{;WPIf1@%_Qlp{4P!AQDfkz8_%7UjsA5(y$$%OOOvq*z!rWx9rb^Xze}M+e4C
z-evbIs63*Xz6^P{s(~TkRC`KUAQ?bSxf}pym<5E)K+4r9R)-?=^1Nq?!>v25)MySr
zW%xE(qb5i8ZJO?TI&JE%mEP-PKs|#eK3&s&k)^%vVOeUEdjY5J{w24=F__c=c0wPn
z!4zLLWYlbqJSpt*^Rd@ck-D0HGkE55`OXr=+kKDQA85PJylSlPS*-n^*@mNJHzw8k
zYi4uhUd#s$b}IUZu%o20FMOpwre(VQ3MGk<K*jR$rrjeq)@jl8NO?36_bo@bjY6i9
zzTHj!Wj!iI1CPhCrGB(A#bKgTqF(&itE$-j)4Si8os?c|zjsIx0Dk;_u=D$ixZ}p&
zQ$JkXda3<yo|)P9jq&jBZ@=};Lgf^_V#HvM=T1Ygf<M6V{y@6#NE{Z{T-TxL{yu0}
zS&begRL`hcHl@pr;yy^+MhJ*F4_>*y^@0uSWl>R9j8}P2da)wUkb)SID{!6@wmH?P
zpR)9h8B=&iTFI#-z(wgoIM;kC6y)n<jlW+8l$-A#(;6&RM}0u?ieh%Z8Y=fDY@40i
z4I@c5apP0+LqfY*P4);QYSqy-y2BD>OKy@CFdb}%xS-MJ%9fHoUVYQ*Y<6^mH+|3D
zjm6uRXIbUfO;LO^^lpBaGoB1@h>9{*O7T&9q(r@%#*E+0a=qNi$0YQ+lWSy3jhG5_
zR@C@z&mxyr6v_JcvbcZxY3<feR!G^k$76~eX=x`s=K|?z3ktoLa8-<Gz>5kU<{1>>
z0SZYCQN?L4RDGM+(%{HESK0b)!S`pVS#*lgZq<){>_)3O2TO5A8S1FLc9qUoj`auH
z<#=O}E3j>j)w6jwt0d=@>&@o^*(DZ9S|iSq*MR%il1Z|Jft+_G0sb%6-aM|UYi;{S
zt=gh!ML@+F0U1O^z!^muWD1f%5Gf9zBE)J1#Q|%TsvwgxkBSfiBmta&b40~DfCH8)
z5S)%uYaJ?jN*y>pYOBBNUVA6tIp=+T?;r2SQg-%UdnZiaecji6t(7hho~B%AasogV
z7jfo#d8CJ68nJYMS_DCZQ2>&%*@z`F`-sa&s{3wgDv`1xdy0j!IaeE~;+y|)-8nw7
zW*wJ4(x8k_9|dT<bd+rjRjA<9RHMw1nok5kRF#xIAcOpqO^t1y&P14^{EiJ^#}ke=
zqjJ?OE6E=q(YG_oZ7ed4ZT2=Rm&LIt0SHCeqQvBjO^`uwo4C+)jQSCrbTXv8Y-5h5
znynpMYUutX)sUNDk%}Z^dMERuV$cf&s8HZBZN;qctG3`95M+yY+a#-MLX)eb0Ovo-
z9opg=b}_XkBz`z4x6D<a6VU9gTH}?3=|p%ImM}Z4(rn(sfaT8?20RH#8CCVdQ{U*u
z*X=vW5nmY4$f+zU4&`cX<@=@PnByM%Fll~u|90NJf)=A`8FG$Y6pY4VRV7@FcNVG)
zPWV~Q2}Ar5oB`q>uE;~zpMc&U05i|4Cs|q1OpQ5`;zF~|ftr5NUOj0dMw=P=RM1Yt
zrzSc;R-t8wq&2kHPAIy+tsS}(@{J_c?W$nZj#?rl9qXaruu4R;?6%WP4Y~#sk#@Ht
zM9E?TfEeF_OO#+rhA0fuMPOR-UkXLVr~8<brJ3P{j5TwpSXG$t-zvcW@X7zXZ54(@
z0lflXj|xcu3mOe5Y{mo**j9#)m0Z9Q5KANTyg5uJ?#eT92G(QvR^cSo)Wl*qgQ*22
z*BnA+WOE2XEa=wT4giZ{2BVMtnTI*$9J6jy7q6yx`OzBM@P@GB>$ri9R$SZwJK#m5
zL?o<Hg~zQn3vom5O2kp<F;=*631$8{m&N|G35(zWfnBZ_1lukLYAC8XN8u$FdZH<+
zoIC?^SYnBHyZSIEtZ_2QB3{;^J|sA?3J{4X-qU6iL~?R%kS^f!0q*>QcT`ZKWQ5g3
zZw*6REHI@u<@;pt8jPforchKbcf-$1<$QN0$B+u=)EXGG0MbtFW3eoh+BerY^z$?f
zqqqaia?V%pZeC%MDoYV`<+XWVowwlCjund`OoqqC%0Ne_vp9>@iBudiX-BcAXjU@v
zWYgd*x>O<Wfe)yy^;{u&V=Z0RwWI)Hg^;E+r}nT;?c6BPY-%iKn;uVhgNNSa-!P7S
zf)S4Z66bOuD!@U_WKa_2wx0lF@V8JX;;q2}GqW&?Cp=Ci&m3M=F2RlJLh~;Kw(WR4
zG=|et@s0wb-=kc^;VgjQCZ$S}Va+|P)G+L@TN2|Kl$eQai-K{C@MqlcWn^iEEj~8b
zxDM3oEU`k_7<o3T<wkZ@r+l?<-wOM%G9ub~f}9@h`trp>ykk>5b~)~u?c>K3+6;K^
zq}5tKn-NBd$MV~)C?Qoau%NF%lG!4NEvC$fGukmQ=g+dxBx*;@1<CI{25h3PAuA9u
zNd;SMWadwM@uo1q)cHa(<iW6CM7K|?$yFIzNAik+%Nq_BWEc_(dl}ap6kp%5Mqkmp
z_ayhU&^lt6-7s6@E^<)`h_FGBom3Ow{$GU{u&1dXkyJ3ZJ<m-nlYK@eQV=D%ndX9?
z>z4iIqEIZp!1em5y5xK+-e!mF>q-(JVXgrnCB3`RjE(COXGm=Fg(1sZG4e8WQ3tS*
zW~gzp&(F{?4(&pi@5d0z#4xwqO@<u)&^u&YLpyQSfJ@hEq%>!ZgIN)3PLg7v*_3V}
z1ujegM9ouYqp<W&7T%zS%`ia)Nn<e$o+&6=mji2MW4$c(ay@_&*A2vF)$u7Zxd=wQ
z#_HZNls~09lERrlCJ!uHc!TR!YL2lU0IM-!aZxXUtq;m(p>W<DKdA&?PPdE$B`Rsw
zEt&Fa`g!ESb!Qc$2j;1JhuN~^6<1oq#%Hi%NTfJ6Z_o2VF4l@fJC7M<d<=nwt5~&K
z1<#(t67(8}EuMA%Sw-^F%Zw~_0@N68nhLM1KE)n)oTi!Z00Z{&ut}a5IsL3Kq!}w@
z-*ZhyYz{UD)_8xcfw^WX2Cx!Y9{{X`bexK7GnU_(5}G3b*L+0gw0#hf2Y%CsrjjH|
zF<&kepWti3?Q$Q-@N`~i22ECy`-C*uL9*pT0X6ClGFxjAjCh)9ANYy|9AIlXe*x*`
z7}(<YWs6`YgH{;x^D{$NP?s?^R5rFGHyk3&R>b42kmVa<YD}pNMS<y-PGxHH%@GX%
zA$1~6MLnR;O5-1g9353Xro;-Z!Dl;PEYz!4^bYyy#DIX5umm{uk>`kc6~sJLjV}ZN
zn6cmbnY}ZE9*#0=zmua`y&dd$o08APrSXt{F_H6Fv}y}gqk7s~AgSsd$w8wvcY1i=
zZqb|0=`6?9PQhxdZFDh$AS2CHxuuTL42o=8qBHNpH~#u1Gw*jQzHS4$&SNZ!OKxBR
zFVoC=W)-_t1&=gGt(JXpcao?Nib}|`Dok?2ju=d)$Kv3kutct$WN8K$+G)kbE+<n{
zQPWDqITQ(3Pjb@;Fkr%!Fb1^o1taLAo~X}pr3-f)e`qAXu+MI0)yFa+hDCd<#@5k6
z7BUa#>RiM&N3fcfrnpe@!8FW<#TRn;aU$v<qRu1)hTtXIx#@6M!9GG;BR8LgBwG#9
z>q4cgU>cQ{<<qHBCZPsA;)QT%W1=kNho<+VuWUl?$W|Dw<T`=Nxl9D6rQF73HC6%w
zQ+Jzao(hUo8~1ZTZ;4jDz?OIF<vc2xk;Tq|$RlqaZ_p#864Azm)uB*sq~I8}h-_+(
zX(Sv6G#p|Q?%(N0jYNVc&L5>Sj2CmL{kq&UP?rNCKk0^rx7Z>AD8?R>?S_mO^UM(5
zYMclP-IiU?MdyL@@Oe`V^&tS*Qi<}d(ejIbOK*|k2Kx(@9ku=Vq?Vd{-DpOaL>UWr
zi`oJ#rOr9@v|@4h_*D;Trm`hWHOfsFh$|o?jZ<5_C}_o!Ton4mnna0r{)<rtPi;BF
z7S3wyzDa6KE9^eO%nR<A1B;EWGj7LVZJOgt0Ar?ENhMB<M3b^-Zi;{tZ0(ZXto}52
z0_3DV3;UuCAkd~v>Ctp2Tli*{UpP^&ODD)I9adLY;>s+M!R+N;YGK0h!Xy_a(T1kC
zc){AY73t=oMY*_;T9g7p7~<>j^3$9@4=X{QG(w<fOF>fOCRb8wIN-=3?8IX_)3zlr
z%^Yq&LZvg(V{+mC>xBO(>zQA5PGq&g#(!WyREvQO`Yintlv;ww3UC{Xs&u)+pmO!f
zFCQs-TT7hFZ{LJ2dnV8W$!>mTk1Zk6UeCTC(VO&}C9w||Y*qAjoLK-dCPgn&yAch7
zou$zrqCN^${jmG6&(PUCKQ0p`s9vYO&cVrhVejLW^akNjqGB5E9~Q%Bj?*CQw?s^w
zVZx3OhfVzF5%PjlXQ(>Ap{kRDpqY(D>?BdXg`numr-Bs#O&Cf{bRS&>)=2?afCN_l
z{IK0O;+X8xkc~Y5!SMXaC?ki9Q)T>N%}$Lh<2^GOWhn4w$RxWU!FaiavXxtvjDr_f
z6?Sz3nCt%_4CfN%m^n|{jJ8nAvY9mMC>Ix3hj|a5i%fis!<66wkYLz`F%~<Ro|jvQ
zgyQNO#6dC+T1arg;=*_g;Ok6EvkyTv`k2k=t0Osx4kj9%#7V4-HfsQEwi<HYR-6TT
zs=&BsU>w#a;wwvNGJ-)r4?&||?^s4Qa=AdK&_;6fyHg6dn!wkNoX|5Tjm26A)DU2Y
z64l8IVpCU~3{P^FH5^{CY80IX6s%ajohvxiS`Upzj!cPc<q~y*45JzDhEdS8k#Iuq
zHmVkKARtS+BdkiVfFU{#5|o+ye%yGPH>BR;dIacqk`&Vvz+9t&3$?PwfF@i4r%o4v
z1;oPGDO|`@W5$73ARo7M0AgQ!$CAw-<WgB@o5@$>$k*kNVa|`b5ETahXJ3G&P08UO
zqahzZ>yL0ZA3=G<B~1I|8&W~(;WRys41P|>k)-3w%si+2E$Qko7@@B>Ya)b?heA`f
zOPm2PFR+jHcha`W9sureiOgql)yfB6B{Dy`UJD7o>6tyGMLwclxecyY%6cREwOcy2
z1cdW<H_-vJKsum}tg|PB$c^h$^F%lK4z(j&_F`!@^axh#CZi0!n0(XrfwhipOOgqg
z7L)59UXqJ?6p{{Y0?;i?#_CXMGVHiq$G{EFV>u^n13*{>GF}2H*^x+X9)L<*#gPcO
z!Mvv`L0I8h{bOT+y~J65qd4G7H{vyfMyb9>y;^?z_GdWEYS>Nl1_mVi^meVzn>8lZ
z%HG*7?AhYV!=G;{m6t>>6ncY_R~HJw!Jd_0!-oU#LQCax^`_n*mQ#O{J0XIBx-~wA
z^%kPhQb6IFjlB;jg`soMngB=<FRO!t*e1H2Ot_)uq@jDE+}K%}B<#2v_bbkS>*4NY
zA^4S8=Xx>wVy?@T9#C=C@>@hWOT!>gVVJVnPN<i=!VuhR#T1-!^42_81hD=AAcPsl
zc;7?@5_X)C>64x6**f5&27&);w^QBO6aX#IbX-3Zp$p6#WR5=z*)w*r92rL-a_*?S
z<g#Gg(Jp)KmYQ~~Z$Pwj!w-D~NlsuIR75Haq+}uxrW(YWTJRCtfV#UZ*2-%-<psb9
zYS1+7)+V|JcW}!97QHy~defzsct=C7*6cTc`k4$?bd*zQtd!*(v|&7<G~Lp$4V;>@
z!FrIE>IGSPa|=T<8a2V^=SogY*s)RTIVx|FHp}bQCq)mGlZP0C=oh8{p*W@x2biU9
zIq<JX&Bb|YyKbT;r%}Lyu!Dm=uj{DoIyQZY0kx01!euMG!4=$sI*~GIe7==RccjzM
zhVaN`lN4{u&!KSU7I1saWjz3%SHw0h5la(^P?(x=aewqY-MJ*a27Ty*aNSR~d`khz
zKeq0?rcXd4xw4pVc>--@*P(9p-bI=F5pLwKu}wpcax8w&H3Yf=k+Q9I)aTqueNL)@
z{~%GPstN(Ly5OioL_ENR+<MY?5(jFalD=~&$*<rM=Ob3B;@3<~Jm7}Ul9Rb90cerd
z9j)L1DQPSswdY<^rcmhJSUa@A`2OQvo_<)Q?xN5}a^5=(AvCj{NWo$~mAx064a1Q%
zb3#Rm24<-)02gVp!E2l&>Q5>680$b~hLZsY6dE@HVrt+qI5Gs11iWNx3ojaU{8b)5
z-;im($U!Sum!V#$qr;LP599%?u(hlAmSHfi9AD@Pp%>h8qh@jS6laA&Q9#O?she7i
z^^H_(NcP<U1QR^5({xjd;|+{d?ezQlc}c95YgIipC!T*lLW;fd$$o1OCQ}PSX@R%y
zn0Y_e3`mrhMuU!nMpRKg0~~y|+nG6W(I{j;kMC{o3~|Sh$cP40k8zOaTy`B&Yo8!*
zwl?{8T?H<+9AL^7tE*nwec!x`W4wA>C-s+1wQZg%q#~BXpNzxbP>@g_A5g@#8$zX@
zwe%BNm!t(4OQbN~zz))VdjUPXL7X~|2Dm`jIf+!wq|?+IFMzGeFdca{cD#B}T?<M}
ze%cRfwW8@t?mo`qtvO8t0aA=bZ@F3(hgsi%2{~AS-C>8+2A@BplM$M&Bc;f5lxaYe
zw-ZU4vPJRL4F<jB2c+H*ksWaUF+rBAU_DvC6h$qyEvVB<D8y?m4U)~G)&wR%>Ic;|
zhvemA*DW+U+$dYyJi9OS(c{FM?`EucYuW`N3WES|-*bDIY(ol!$TbV(qO1oOS_4{`
zFBd|s3B1i+SFIX)w0rB7#X{8G3*Nfxs&sjEiSC73G2;3(MKJ{2L7bn}$CMLc<u@n&
zI9bSrQa;I$P-g-t;)XL0@(bt@iJ4|(=AU|U5)+851>%bLqn=ECSvH{>l`Pt<lmkJJ
z0gL@pX{^qMbn^jW<<V=bE8w1$*L`Ecn8c&v6{RrN;3W=zS_UI-LL8iL_(`t;Z3|8!
zqHPhYyBxOyun_B14aQ}FE{gk8dUiLksj>Q4=<O`%I*<Ij0mk>$n|X25ZSS{IOeDZ2
zoGC+aibnjRxUbS;69VcE0-DkIXe=798!6d>;x?+<(FOHyt5I&Wz@B4YNj{G|=sta=
zv)vNddzGOL!U^UIeI*g{c<4oXpw}8HNfE4UN|bsH2(@jMM6NQ+sr^i5M6oqtkE$4y
zt{WQ0VF^PRd!XS1%>32?4w>9De0ad!QD8DNFR*fN9p~IlPbcQd4$qJ#w+JY!yDt=A
zL;e;J<Vk6<mrw^TKH#|+b{M<J`76o&Mb7djErRtbD>WfS`XmKq0gpmnUjZ7EsL;J9
z&?Vq0434i}Ys<8tYjxTzMd34%m9?|0v=Vz~IJ;K0QYm~}Fp!dL)kf%L9Cge@-7A&#
ztXv&vG{f26+158<@!vMhH;P`^GX-6Y#!BTNeS8KM!NC(wV!ckiojxkxsT<E@h|m=R
zGKMKe#CI3=EUc7T(_&R%USVYktUOfD3xPi=*N}iX<gGqYT724;x-aUjb5n9j2R7{m
z1+O;>EBzF}-^HR8j)qAnfE$dCl~~JGF!?71ASGNeERRQdJeJHoTS!G7Z~!2aifF?+
zt63M|jG?yF0_EDYGUBFRiey|I;ghkD)E-B`y$=YVtYa|%$4J_x^5!AySdfJWF!DJ!
zP>GM=($&kwe09ra1`r_8c5vh9O5@-OHWF#O=|XXA2wRnc7MWnj$OxQ8utu`vg6k%Z
znVT#wpo>8cU(l_<>#+JjML$jhh9Gr9g)s`@TQK)95lTR5-{;MPv1*^BeAcMG&Qrm}
zX)E52QZw-!>uYeUP>?&9>j%BaLTW%?CCccoxUL#~dTb#Z8(TFTQT|S#zzQmA=*2#)
zu|eF_;LYVfn!J=yL0`CAJspBc-Q6&Wa9a<J66^~9a=MXK*r=zW>mC<@-c<0y83eFU
z#dkS_OmC78Nd+=R=eXD|eL?8tY9=mlSmh^BK_t?QD>eRha?+5^O~4w(5Q%tF>^sMY
ziPzg1usNaXN?Bd%QbRbL(}Ud>;bZW06m`#)FlSGldt)XcR|@aKJCm`%uA>j6BO&vg
z@=FxSRgQ5a0%_A0n-Yr4-EXz}@_`o$Wu_8`ok;5g9QG-VA@N8Y#BNDU;$623J{QF6
zTgR~NbERdz@Bv%%I3`vv;#wJe!K~_Jdhj^ZBdJD=62%1t$o#03#*tx8$16mZ;#HCi
zj*ynVO3CqR_lm`~E6mco!<1pIiPDuOCTL&GmRidwD7?Xoub(UTUT>j^oe@8ojAh`A
zfNX?193-&2!gG-}P(z~w{6K-^3no>y1d0ctW+uT{FGL|6R+<}j*l=$Zrv_uB=BTu(
zHntmt;0ld8r&fyJ7lw*SA7-q{IjF~xQCyz$vtVFAhQyA@7-{QTZA7-=m4mA5oeG2O
zYUsn?OJd~;J@|pr<6r-?B(}m;irpY%)%8dEMlHTRXUqRF%e*ckK3Q85pW+;H`zF(c
zM)6zp^MFk1a3EP%{*Rfz48qs~?WlO-;s1|Z%%%#N#Zq|RkmsTNwmd|BtJV0Mp}WAp
z{;k6eo5qO;`K!KG+4z3lDs?%wSEl+pG(>*8%qhv&IizGTs_1|!*H)k}F|41@P!!B0
z6IHugz9?gR8PHHWV=v%E;;?!U5Xac(5^sc!WOQ&*C-dy%*l3{9iMv}oe5ewpo(3UN
zmLSw<LS6~7fE`ZfBqM8YK)ZdaDEaOO05=_y3^G(>C35|WyHwq>#xBF(!5F-rFW~(#
z$FBsk&yyr59;4xkCN4HG4mKmG2V7Dc1dyaw%7vpf1$YLa6zO4DjOh7}Br>BC1}*Ur
zl=QlA?0!1*pUtx0?(KiLjRk<Iealw=%AH`qrj3(|W0<2AdZN2^g^7f{IUAAG8JiCQ
zKM^?mv3oO^tF{TA6oV=5Lwxm6uX@TYV1fP$#p>WIZm04Wr7M~#e0!J+{4qp=m0c#J
z+KnXm4uojq6MJ3pyvE6fSZNGRSpbZS?$KmZ#zUeeJCDoZa8Ji{VJ78YXcWzSSC``C
z3_75c?M6~)N>(Vd{4$p-QD=)8BFQa;YGh0NkZQyW;QJuF!>EoPKTu0ab)SUZp<QQi
zA9cwbh?2RF+|lQp;@AM=0wx9f$Qc;PIXtHb&C*@2q6iBZ8S=nWO~WrAcp8#*cmS(z
zOi$ajP)7~M1AyXTLuv=FgR)eqv{g(_!Z5THuUGwnLiw(TwyM)^39yHDZ}<dDpH`*`
z`Kp=lhY~t`O1g(dt5LO|pF+QEYT_#02FS)T0I@YKE>XG|dzET3W{Q<!yTx?51D+<j
zQERos1VLswd&8>Q$v(V(2ligZ)#>TkcigGHOAN%GI}Z=Iu#K3S@u;)83fYJkfZ@I{
zAxm<%k|u<5gxxrnVX=j(ZXG9#LRY2agoP1N^kVKB&=A8RAz!tVod^uC_q9U*7bx_r
zG2Yl>%xxY|`MFCv7ItlJx3zb6ClucB<O!(<WoUEqzyhMBua64lbkzfBN>YzPNXC}E
zkDv|X&D$+af4b}x5g!$=){Nd34#Y@ST|;;#gOMaFnNTFns2s!#MQBFa{G_DrA1>PH
zGDbi`v1o;F%IRQG(T+YODOJIihDo$Pq(XOUB5-IU0w&jRXf%+8lvr2j+6ncOCRf{5
z+vTEB3{37(l&h#y42(^#hJ<VlGmx4~I0?w$*{s4pPFT|3Vr8?HQ#eB^I7nBJwE&=>
zXh``!#zqFhm)voPM74%257^7t*abK?wQB&#8)kdA)gNqSA-yn}y1PN^iPcdhOsk-d
zMY&6TU_X{!;rb_>)<oF2jO&6lVigXi1ko7bg(yuq<;5h^gt!JW%zW3R(Ew1SrJaeB
zP?e-sX*ji8)czwtJ92+-2Cv2)MSgQrfJ4}Q9FhP}Y7Ya8e7l&^E#Gsq#TYn!Hh5rq
zD+=(n!=xBkVAz#s=29;x#D_r>vStb2kKyH>rZHn9=#$ulAvA-7^Bu84lV!1z8i-2#
z;<$$;)F{AGrH1XN*Q512H2!5^6F1p@IlW#k>8#E$V|oZlOErqA0L5k5>@d=uEFI&(
z)&ik0BFcKYXLJYREXc#NT?nPOx=<J6{zS&^J|*>NNJjEO=Yr<PQas8V+<*qL9nHjm
zdr9+Jqf7hHGH5Ulxx$%cXsB?82;^&MNoHKQsg8O8Iwsh}L-HMQwz{4^i!aB~XO}M|
z<#fq<2`(Xt*&9Bd&eQSI!PGG9-Xe((IAB;<G)?!cB%<2EFu#KKFSna*w@3#pRc~|f
zJ3zpc9IjaCCl9v?pHN1?tahzfJUxe%*Ek}w^jl{-C2kc-$p%m}<iQFv!lFc3Au96|
zftUe)3b9fNE$QE2sv8$(DD%lJuMidaO^Mqr^>A}9wKY5+ZUb8pzT;~09m8ctHLC{|
z#v~K_X4Dmy<c2-YU6UGaMlBY{K(Uc%DCTCg2pB4vg1jIyDJ;Qo+nc>VA*8_emB8*v
zt212!th}ZKQKtf*r`wAQsgq-S^Pq3l42f8tSsd^vrPVcq+q{yWWb9r|#$&~bao0=Y
z42lDioZYL__s>rqRc#R;41pN@)4T9dAfiAhGJ|qdKsly3+X1D=zy7^+P=k59Ir)!i
ztJhB7hY=-!DL{I3FLvsot|pHXEftl>jO|~)*Nk)`^_L5&lcGfwZQt#{VmBl@gV<h?
zwE{YFg|O1QQD`GJ1}{-b)3%?|v}tcSU^&jtI=5OlHE~{UcB3nm+3}{w_LhewsuFQ9
zR4S3q$SpEODc%@hmMf2M^t2L$lvMh~8JfihWH$<|1Xg}2N{pAaELQAMqUs(2cX6zQ
zl%te$82gDq&*{~uwIyK^Qi%b%^bc7YRN!L?uqdXT!f69|MO|G-7$uWYwSZ|$S}PjY
z;z(>9fMOg1P~#&OE69Z80)4dPG<q*!E-Gr`BT_)@O|#f3oC%42sHxTcVvc;&H=!Ie
z4NF7FnK_Bwo5>tTiIictKvrBmv{4Mz2#qJ>kx52n&@HOXAAgTQ{b)`;Uw*f^6@i_j
z2GVjzb{`TCUCtayM`1VmZ{k`p;FL2uAF%#V3KK%Hp|L1Yd<y{<%}DBL|65(1L-RbS
zMZ;R$w2{tVj7h{#txC{z0>r0A^RW%q=4Mz!?aUM_718P%zLJG|ID?UQCj0P%DBgoY
zSuIiV%Ibh%hD9#INIodv!bZiNM$>I+R$NzgO}?jEVzN#*hNT<!z%U&o3)8r~AKOP7
z@-~y58nY6$xHB1;eq8AdIm>ryCQ>(>1Y$H>JDX1!hWTgddZUIOqk{bjsYoED<0k+|
z9q$-2BL^6tZQ12J1|L-(tg_ZZbxoButV{<A;4nC{!DKd`Q~aXTQt`F-bUPTHjFZrg
zty*9u<Ys0s(6xu6y;TP_c?=5f9yn!$=Uor_d_och{H=W8&q+jA!@@e&jnU{z0Ms|W
zmFdO1p2fNiAgP#8d8H1XWEljeIH1@CQgW4UGaVA*P=j!Cx<_cMMYXS=BBgAY(|MuQ
zINyTD$}-=}sK|rNQVkv52RMJW$o4_V)a3YZy*rN%xTCc)GZor0`3|e9EmEkMUWj5E
z=!AaEhkjH#$!w`}ZFpayd;J1alGjj~H=C2XJpE2yg`=}u1Y28$u0ag3PsGlJNKz9s
z^L*(j0KB!@!|_J3dz{4g@Zyo_aUx*S!nb^7lx>QUuhPO+k?uFe-q1BlJEymcv{>j*
zShbgk_3HI4;;-cIG22gMG*kHcSsi@MOUz<O%*~LP`bP0ohOfMR&ud&d&q)D<s0H*U
zIyfNi*g+1Z(ev@JvGVYjOihwSdBOn|H)fmYBfql~p5#vRa>)RBo!@L<Pt?|)trF80
zdm$bf4<*uXhQ<SuK8ux8C9O_(tn~p#0MQ22RO8g8F+iSsaa@ifQFTL-lv^c)qU5k?
zBbE_P37ei)z^U0jE6<RU%#uvLM+1Ec)oF;`;HqhE0B2YB^KmQ5RH8bsql&vrVB#9S
z@GGxk-(c5(3Z9k#tH@c-UjdtD`<R++ZgnFb&sU+=2QJkNMRuA+0!eqekGlfwHj=V*
z+De`Pn{&(R=#t0C4sJ!&Y{O#N1i4Jq)+8;#L{3_|QTYx6auGw!fJ2$h`Z82z(?Kf1
z;XpDfmJI|$iMixcqTuF4CU=YsODfMNFiC2II^E(zB`y$3iR|4%+SpNKFgF>hlv+E`
zfzO+;yf#(ZY|#@|g0o)B%y?QX7tSWBQB541gkuvIB<u?7p!|hUMfpw}+*r*V6>h@-
zlS=k;DV!#(4IaWR&kNpCy9YGaw1$RpK^;=2d`>ciEK1farvxQeb$4}wU~$^0)7)&W
zCwwI+(D7V6E=g;0ET$!<y6DQxP8J^O<pK%0i^Z@5k=X%^IZKo}LERcVA(VdPu1Xo|
z4LBi-mGYJ9br5(|nvtE!+S^phgRTTk)~nHoQ>+6__+)V%S<^&yDc)6o^Bo@8l>|p!
z(xi59IqfLA!&mc#5TX}+qUF6fZ<9mjdP%G<?S@AQgibVFhjtEOatrN;vizep5VAAm
zK?smpS|&zQM-n@DyzY5|Uj`tX7nj#1EFI(0IK#4=%5;`MNm}}OnTq1VNPsE<%9SKQ
zGk{JxCqQ>gzw%QEl~OxifQB0uyC~yZr`WA9JMc1Yt)Xm0tFI)-@L0OnR;TS_OCzaJ
z*Ja%tyGx>8jyh;_I|fFMQIk{R1p2wsK06YkjHVVGO^KJmXlzsN5#$UF;tF$#^g8u~
z1a^<b2n8`E`lB)wh5s`coHtH46c;}AF>%V6vdDPf9kUDzUwLYY`^5#NZn_oj-xtmE
zF<D_6<(u58KP5h?xBK@;)9fvT#zK*tkyEs~$bDS8uac?Fgw;h}<5a%!cp!%K+&(=X
z)MWxSZ<gXLmFjwsp1|mR3$WD)A0fB@@wpaQ>&z05>vt;6+iCTKN;Jr|w6_c`=npnd
zn^~w8B0mVna<TH)!BS9C8d8XlilV_=>ihu3ToRgH3Y3tUchRVlr);Qn&Cq?YG8My=
zQ(BdA%Ds<qN^-SzZiQ2;lb<9=vc_(5H78B819CxAKPf59$xxU<lBy)V1vWk&KK*<=
znDAt>6T1_HqXf3qRPb|r1Ye;+<0Rt}Fc|;DP?j%M=UI&pJxT;DRun5qn%eGB>~1zt
z9&=YWhs5!8G1feyq0A&ewlRG{2s~3-f9|l5if)is7LyF-btz6l9eUSLh7gWWkTi_s
zC|W*gm_5V$m2eWdc8yv>Ql#5dQ>~+^GaA={@M7H^b!VJh0X1YzS+(By83u*&^?PFX
zLVlD!G0SR)^j`q!%y`t|pDIq$kp|$JCj%=Yk#rqCCj=~UVw5?TECbY?v3kT>I+tf+
zC>fVj>Z`3t)=}5U)9#eyTu$bqeo~wB?~uS{gVY8ny$F1xG;D=Bg&{zFpikIJNbRF`
zG|9(gxaB6uu!<gnHBW&UCKc^&Sl^uErvrG$z)NkT{fN4AtX#~bYfW(<DVk$|>tia^
zX-)LF4HOSz`yfe~cbYE>WW~E33sV+Cb7FqXcwKKu&&6blJ~GvDH$?Gnn8EdkNIF7^
zrp9o!xrkAfDNzv_oXph(Rhhxr`Z+I3b<DVmohp6iYW7itkF7gkH{Ecj9bgL>F2`pF
zQl)jVsNUC0Xuo6J0F#|ON*ys~X0@wfSxl*=@ARA#nPTwvC}(QI?u7XCx3do*S;}{N
z{@v~zKiJ%<iW)&;c9M0vhdYoeCNsdCv}c*Gyj4gdb=BZ6oK7V9j1${RGQdtxlb#Rk
zypnuVlp7`Ig)>U=Xs%p&8I%nIWs_nJ9WkBeis-W>quj8EKCXu?lDP)Y?nU~pdNDX^
z8*{?Kp~^;&bn4Pb|Mct&T=6cBBaFfheI==@noOcpXKRL(gKWv^lb2~9Nl|gqmn{PO
zu#0(Zr<L_mCq=5%J;!q2g6(?l8B=`Sd<q~-(}hMPMZYhZ=kJzZtmpcD@jTCYqJnbc
zYhLMYUjm|g!Og^+r=q=`P^gml4Cmn6zcn*4>I_I;sk~m=qX7kcJge-tPuE8M?@F%d
z)XhFSsj{a7d8=2B(I$*CUtp|O&-^}Sz4R_glAui&N%q`HA#{!#Tr!zBDhrY4l!ex{
zefnSoN_w(5fy>jumUb=>rDz2?4-T!{fcl=tt+Kl)O<YjvyGl{4NQA&u0)pVBPd~`m
zc(%P5=u-*w78sNmK%g3w32lX=P_+ZM0ToWwgX(eO9t=sx5a?GLR3>CaJZk(fNwKa<
zy_<yVBL#CtNn$35=!#IA5U$t+BNayJ3({OE&ED!~4%VVUMW}-d%jJ*!iw8YyaVvRD
z)jJMDQVM8!h1mcg4U7#^AGNsfN`Q7a;^EA%#5M6&xvZjRtseFqyv{_B2h(D@TutCu
z#>D7b)=-yr2~`GKh*5}G0GfJC>WvArv<1jha-1Co&kxVLWeKfx^+VH|(U<*LiO;ag
z)|sK^5z2p3i!cp{t|Of>DVoPFa^idvoia&mfJRm_D-=OX(vDK7N{j%Qxaowi{*OaB
z$f|qm8h`?q9AtZaav2I9acz9=!gV=-HCvGsH<=u65ea;a>K+k}GDlV2JHO7I4r$6d
zN_^a$JHJcG_QJPa$}PCnjjZYwZ0uDbSeGkHV-Mh3DC{L)Te9G#p(cg2j@JEZ@W7!7
zBza$^#uV#NKM4-0Crcp}DoCypEs3`taR?kCB!oEpMAYigtIaVQk*d0{DrYr5gCeI)
zW0)KbH>txKG?LwRX1pAw3jP;mpeq@p)I4ICJqoM>n=x`Aw`&`oC%W#+Uliw9l|L4u
zl*)HzhW25NAWpxsu8@+P(Gxk-4KkF@us;|2mEZMT)$<Nl<vUZA?+t*)6F~jS9}OPn
z@Hg0?VrR7689?vYc_#TbDSaguQS<kcgPkH5R`WlmM>Dxc`2^ROcGFu|Mjae(cWwHJ
z=A=DbaUVIx7-cz%_VudhuteLK1I}ZQ%qiFQWcW-0Qw_jWBNYFq?;Nx0Z+n42yDBs@
z#t<e!&=HF&4@be|mPXr~X^RbF41;K&>2X^}!L-`xEeir(S{gcKSZtJwO5A@<`K`(6
zicf)DRO<dD<(be)f$dZV)#{<C1qyGUFMTgteqp038uXjRO1(M=*Ylp8<_;0s8NJCN
zJq88q&3mWv@|D--ALt7k6jrFOpCEtF^q$}@r%ms9X@RcunGbLq+xc2Oqw8J%DXh8u
zx%NN3Pl;x!CbpIbN4oSph3bA^YrpEXLk|wxS>8GrKB!aUS1zV6c0QKGalkwlcX~O@
zPuQJs0hDo7%kAlbjnA+$G2<#hmR0^7S1&?*HbJ0n18}oJN)oGEv5)>WIW>_?WZTt)
zok2v<6MkvBM>niC!33R83ba*XBHxel-qXr8Kmpp;H8Tt=g{&~gh&@b}BJxBGPNltj
za6!zZ;aJPmtZ45`l<9B=aybtm$aasioOa4uJVcmQ6G6s65Sf;;+35G=DQv{SH9Uz`
z&u0yUf;`VA?2LlxNip<+>8x+g>``!%G-_<nZEha*(dW~tXveVu7p}+}C-XW~W0-QF
zG#G(Pfqh-gDdai97r3LKBhKfwDmCnRWlIuwHgq4@WA`D!|APbT9O-e|6kI~lkF~iN
z6V+JdCJxd%&Kf1k%IgU%+Q~@B`2n21rMeyOZo!NMP0xw515n~uGScE{9&>hQKi)Ux
zCm}*Ja-x`vj^bsKisWYnecGVX2vfGmDe?gfjJEvrqHd?bBaPG|aSz*+r8xOE6#1^*
zMw3+Cs$O19UDnsg@q+!vr{j%{`BkI4AsNz^83=`n&Ay9C69)$()k#oaXg(2gcb6!p
zI4FYgl;7D-hATQ`k4*cvrQ10frrQbP9+A<SV9O}GTt%uDn_k9en`6*W>Z1T<3jsbV
z`lpVq%LYGpLvNb0Mij?Q2-x*F3RhK<g-U-HtMu=;PBdmlDXaPi7*B^$${`fUWjH+t
z{Eq0_u5Bj=)dG#Cay0e}>l*8hqbnuG)i@2yXv+FbUM3mPrAoA+%BBq-&!H75PoTAd
z(5h?|E|o0;b)iP9-H-UTD#cL^LhJN?dkLnC6e-V!IXz*I>_rRk=nHyuxpRuWaDk!;
zj~*ZB*Hr7jK>2y+>~8{J#$BC0r1iMDU{O+g<P7~rLhWwbW(!Aw(FuveU@HBcZR20H
zpOsCHC!h7m%<_JYFj_B{<i337P&GL|NTD<NW=4QXVN5nPu&z`LcADIxW3Pxg9rasN
ze}eXfrS=;`W9+a#g`Ms8_7`P_b-6S1XU5>;LCRBarx)=Ddpiy-8+3Da&hzU|a*K`n
zy4nYOZ@7|Q`+4dZMKa@TzGtWWY)Ws>@3T2wTQPLNJfATo1)%Aa)uryelA&wm7OS9Z
ze{1GNs#rf^bs>0K%&FJEZT2a#h+ltSc-=R`-sQ>HV=QYOIvnv4aB+O#7|ZJU9j+bT
zr*6E6YZ^LWlYFsaSo;vk9qXCndi>Nm+|DkaIRVni5UrIy!#F3Ed%)YOcmQLR<g66f
zon5Vwv*I4lfj|6%XpQf68_)v*A#=rysCdLgE2l^yT3Kxl=t7Y)=mNQ<YrCLJbbX}O
zvfXzV>%uB!EDkI-+i#kzHV*a!$=LzP@DQ+<^l);uEzAIXg0p}ncHj%3`9&gBwE&Wp
zL3feap8$9W1gvE`>kpy5Kag!flg`p_U^)~>N5(?h(&Qh$yoc&EbOcSgg(^m3W+x;l
z$P7B3Qm{gwJVo00lX<93WWH+5RBX_dx^tDORZx%Ft9UwyS9q`q48k>(mAb@Deq8gH
z{;@xI1l`8+J%MmbYl^WVH5^DtTq3l(`0pLdyjVn?2$Ecy{u4Qhn*TPXmj2BuB^B6Z
zjB-%{K3iqOoKC=pELgly&JN|6%a!LgOhc+W|LV(7H;j|Sy?N`DJXp>2By3=2XTPoq
zN91R4O)!9#cUSF3abvm}4_p%qHY-12X&uR1^yawrVVU!a+tR4^9=L^cCoaqZgaQI(
z1x;`cPARaJLme?K+!~N>k|e-`rKv*`+i8n>T}xWOq^*dwkaWXX4y|8<rv&8St!|E@
z7&NJLe1c${7E|A;PjPUd+b+>AZ%AJs+C+b8tin;m6z)0YNKkpJTbEEpQ0f<jBlPPz
zWq=7;1I!L6h8;i-YakwbFgxJBW;+>tru}3SBx8&}+s=y)#b-aV86Je(4<Pr|8wc~^
z(xRD>TFBhjwCJ?~vPH`HPNUk82dm5sTHBqY;Hp~Q@G_ke9lo@9k<z`>0*6+Z4H38d
zM#+wd%5I>mU$At6LfD>a@44T<q3>*Zl+qqgkKFs(-e0z$Y*6j$BGrr94L|jra6i<g
zGk9A0|Fo66bVAIgMQ`_V?o*i5zJ8wmB~f1+zoE`!^<J9G7WEETo_)d7Zfr@)(p3Sg
zN?btR<oF={M>nFwQgYY$#$>O#a-^5j<wiTj<Lot;ju2@L^TR5Zni`qzO(f_hEj1l$
zSeWEGr_)k2sqKjFna4-(=FdDfRQaMcyMFzTo$G(gpP6s%ebJ&WxTfUVHv@G;>lY4{
z|EfPbxJGtOvfItu_cHu}jr!M2x9N?sXS^*XAEDZCMKTV_tEXr`Nwasit)J&((QKqr
zS`M>mF80*(Rl*6dxB+21bGh`;*`huAdi#Yn_q?)?+dFi)jZ+QitXjTle$P{?iLY-)
z?P>da;sCkBhT8cZg3a>9&$gWXEwS$`mFMdlQE`Xb{+8&q_v{9HmusG@<vGvDH5heG
zSlKeHeQFfCSCdEa0FG*+2iH8wb4>(u%OQ2MuXTXI1{Hb&-@cV_2k=iU&o$eR-joo4
z#eTiM_$<E)>lCdl^?rgbm{{$?I|be7YRpcRS@}xIX}!nj>TV)Wg?T^*g7T4C$ii1}
z*D&?l;s}gLBQ30~$J4+n0BNa5B@w6^Rm^OCuV6~|V2qTc>>dU4VjqLaK;6-|3)0-!
zOn_s7MXzWJlK16)KvdSe4qN-s2p`M}eBcn=;R}402l$gr-0n^)_3Lfu0=K>kgTF~K
z6~OPJC`nlcXtqHUE<-Tk5~%<(LrW>>4lMKNMn}x~`%8O4RW!7unREBUwxFY3OK51U
zfC-pSsSY@8;Q6TzI6**@r1l%l1?4G%kE@vRm=^Ifnz|G+KY$_z93jaFU?Tj#Iu6VS
zU@Yb&Df5IWx$qq=s?Ehu@!CFhC7873AkQ`SHLo9QwXysF2X}hinp{-_|5hhVY_nw6
zIqI6JrEN&Ij>bLUA_e5${tkXpq+plmF>8A5f{)t-5sL;I)2MzXp!XXQhDD_IB45^q
zEQ7~cb_VTeYX!<k3xB29EIL}_Hm~@ea2-VsUZ(yI2X=$IVR2yuN8I9j*o&?ef~P=o
z!$R}P5^r)~CHX>b#P7vA9_eab>)kqAM*6jnyq73O@yG<$Kst|H8lpii-`HX@7+HXG
zXmYXU7v%!lkD{*ydE9R-w&kqHHLd4$WCg@J3kNd%E&_hVQBff2%KKm8L92L&=8;0b
zU0UmU1ipfM@A{~erHV3Dd?$ja1xpqYWNY1zEOzgs8y&f{WP#EQQg(&eQ1_gzqe@A|
zPO%R%8_`_CA$J^*i-#>Gp%)3czY%gFYST)>TslLhy(z!dR$gxs@l#)Y_mG`q;^$kK
z<(ITu?yIoLDYM?~^SR=4pm(igg=b=X7`6v36+{t+Cj-N4v|l`HvGv^BqT}8=d{M&Q
zXyrJ`3g0A8$sflC**b+}tNvADw`FL$Wbd7nsOD;;$RmBuJidPS*w8ZT_#-0&5*K}T
zZFT>+U-d(*y`3z646ZS~wu9*FpXe)$uN-<ftn%)Kv#HiT1tl&P8v`Dv*(>!f6)3Lz
z2qh~6K-?(XOGc`Os=d`ytb)u(RTu^<Rmv*xw;D!nvrN0{gP!+#X<^DU+rv?MPj~P4
zc71(&RN3Xu)1Yqllc?yn+z#(qH=UM8p3i>6Jvv2?=Ht<xw(M&{n;T8hO+yE6mghW8
z>>O;rcIfbny>5fJN%=*qD|`jN_IUpKqWVEmPZzdXG6X<f!PG4sLukO;m=y4;zn<=?
zZHE*41^ij~wR=eH_JlTV9R^)nt*heq1DPJ)9AL?cCAT)2F&GM$q%4M$Et~GfY+gck
zrWDoy1Z*xW294TPsoaHh6~v~hMRD%r(aNt7v0)sjc4NY+L1~bD|2?;pIVY2=XX#1j
zMj|MS1B6yrfembkTat0K6=~YeVgxzRtag5*&Hhs5DZoVkZwbK~(F$&OU3f&wc6FOt
z+U6861Vf>@orJ*vrvX!(;K)Mbvf;egh1)upOQrfl<B}|-^c7{Ka)`5><bzjBohx2Y
zZ$PF1J_FBfCWFav*s_l$tA1#jHTqH}p9s*nwV<gFw}=PtgAU-m12(Xm8iopnpG#7=
z67SJVQj+MeP90D^ji<)MD*hB|iLtPk#=JnG&UwJ3eOWw9ZAoyG?C~YB%c>0sys{d#
z-N0@RoKH+kn6MR>$YRz=S4=hFyjs?UBXO<4F7_DZ<o1vPw$wc%J0y+nHn<P5&;nW0
zTn~(kcJUH;VkkD2sLCgbh|!S~+x>=^n}%)Z;Q0$fc0cvz8az&dwai06224VYwDXTl
z?s=SqM5a^BB=B*YPGX<{j_ybmQ_JT7<*^C`5VpGgUG%$rGs8DXe2)aLM|!?!EfnsT
zs(-3#oDl0zN9HQs4i<)5<<>rpNX7mGh6U)a71w2<>*dYc4S@(2?1IJ6-EN@m69&j=
ziP2(f>x2(s;Mg_Dz_EoLXdPg>u6M!fKRSKwXOmuL+uru}ODn@|)?3Av#wz1qcSa$J
z(DMPv>r1M)@oa<lL`#s@jSPkZ{fj+M9}!u;Z#4mtkFTGcG36!nZHMn5sNe=~JbY*G
zwSVz%9DrYzgc@hebX$DI#4FWLH@b0VNa8ns<5DYEq?Ru*ArbsEH~flUaBAf^>=<9W
z!K?2`_mFatSS~A<%gVyt0yE4H*qP^!jPh|UaeAw8J*-`|&#(M)wvQ`=vLMRY)X90W
zO6D^Z@Rfz;3@R~9*<)RHzOKbC!6?X6lA=gjHa9-H+%>mIlA)Y><Y4_cUnkZ00K>iS
zZvGTJZKnC}i{mTm#nQ5H?N=q+PWWdU>4%K<uCq|hKk@jQ^nydKwciSTz2NeT)mNu(
z?_-!_yvA=_z)JexqXYXl40MgM@=S0uRQ*=nXg;b@d%je4S&idr!}-#dE86B?Xxq1c
zu~P2-q}V<AxSLoO^>ymD)~&{GDt_s8@}PCITZi~z)XLOts)6HcBVGEgG~b`n-ZyH+
z6`ssF;~<EIr!)H1elv9Bpc2;(p^a)CgE2h<qg7vb4!4&Sd}FvWv2*y`S{KOT_cxS%
zUPO<BS{7ESRy`B<68H3rS~0iQ>6+&x3cu>wwDeQ0db)?<7|k*jaI8VIGuJTF;8@j#
zV`Vo<+=b)$t-SW-6m&XpOvLWuF4#+sFNtX=-s(A`8n=F;br3V_N*flLBRDGwX`kO3
zSR6r~M9xX@bB^$lVw#T)Oof5zTj37p$gI2|nVAA2shbL&yFU`3B>CGO5;o0;xa|V(
zcbd=92$IA(Z~^oiu&6nX+BnAsy;pFwgaFOqdR+r)6jQkn#)K-Qv`FQ$t{cM!OkvWd
zAqO?O@)JOlZ;T@>5r$`Ae5a0oh^D>9hYeoL#vB3t4{`n<W|LA~rRP6^R?Q@UGR}8p
zU^&)O17CealL4b?{G<rE1GEM)IEu7GS73p{vS6?J8Y~_5X?Kk$Eq|nIRg`YN1}D(F
zb=fpu`vev@fN~|zf*A_`J{Dg)=SRR|p$+;1IRcZ@K$xYO4cMbTyGH&BV^~&UD@S?2
zz3C(i-Zm~c6vc-e7>WI}=se7)fNiS*G2vH-Ex{5~V8~+{UdueW4#62<PT+WMCRx(T
z>*Q044c@;O-y`^XhdIJN#%7@GAFvf>K|Mbj0!6$8ig<~t#tpFskCTN!Z<g5sxD+vr
z-_Xp{F+vL@o-KXE_0T@m%z$tv^fITJ$DTzyZB!X>FM8k+y^`4uUIRrB9BJF$Zy>h~
zJA!R{V}GdqY<u5<3o!=P1U`$wZ57fCL-e1vcM6!p+y8DqawXvD>OY&-YrN-4(3oJn
zvixrURm5gl#=MmZKlcW2Yrxpe$2cQD)mJgTmZ@WDs_zw()y5f9um)6LTcWSerSY{P
zV6Xo^_a_-PnH!U)KP<DpvKUw%m(^BN>iMg}^+x={sA|28G`;*ziTU<tsT+T?NKe|k
zvMgo#IQ^vlXF4|x+x~1{vCXwI*E7y`dyKt4KUWH`B5M4^pXxl#cl&a5mIkbxV4i5<
zr$1c#?VsXt{>M$_*}gwoOx1t2<-~AjFr(GdSFmhSVp5XSNp&o;P@Yin?V0f#lv#CO
z?cP|H9AEZ%+0lI&k9}7+-G8unxA?@KMcAEUwO+Nl<rnibr)r6vTpCcVdvnCY?V}7+
z0O}P1D?RW(fO^M3C;uDeM$InOGp#nbFQ}fs*Qn*zo>8xDdh7dzt+73@KOkdJ^A)j4
zYTktWPQS&LO1*3I4~~6FY)&mo4LD+)(W<@rYja&UlSQfS``j$PFg~2!GHa}B%0u~5
z_aypX+vJ%+o}WBi;hB>!g<J7gyJ_m*yr(5i@q-@5j@tloXp0Fp+D)T^qM96T`_Kan
zV~<)L(rYKzIxWp!TH(;-kddFeR62=a+e|mBBuk#q;?WA1LKjYhJi*6fTdO>?z#ZDR
zXp&$O{D|nWlKHKJfYigH^e;T1w4D|GIEkEG?Zh$Jc#onV1tyd=?m`pJ$+#zgau%Q)
zHw9ktTT;$$CyVe=mj10Q52Lp!`uV`rNP`$otR5@*w&;;Dlg??8fcb(<nU&`~7!RY(
zK)1wdcnNgYG@pJVG}ap20Q4W3K|x$*gnsL01MS@I*#we9Rl~0Y=f7*W5k5{*f&Fh~
zrli_p8;I2eWRB=+M*;?~0keDoZO;2`RPpmwaarzF5cJjL!eUcu`+|8LjF}|H2YYew
zWX>^hoW$-Zt9WY<=N*MlUfkPVuUF;M?+a%uz23W}nen}Y%!;KukEV+rBzha@#s>=H
zd!85O28x1r9)&8-F4EIJ4{{3~`~#bE-Oc*-gGdgA1_k1$#&^kZW*~GkF<^I)<|mIq
zV}x+6x~>l0r+S;wTGP$rIh$<Q?JCUVeylN{afBB1Q$G>!MF8Y~sffT>?0~i4P}C6P
zS$7U*2E1bRp>6Veq@lZ1HD*3w^b9u}CV$C($bsiTwZTM@02f8&FkuAt>CiqLJtglW
z1*@5gPE_G?glE82+Blp{<$pjXgTBIsiJ~Q{Q%Wn<x?*gu#U>nJMMOe+UgU7>?L&Ll
zLott}0SnFNw38YJshu0VAe`r&%!-^S+Uj<JvG;ccSU#tHy<}IUnIus5l57kl8616I
zrr!5Q@<EJY#SI?O2$k6{8t6U>^1A0`$@-}BQ3tRc+qHc*tLOEo^-)UNe>N7|TcYHn
z@<$b(Z9Mxod{#g)zmc!E*?2V?eD<7MYrm|mk{&8Mjjs5L+nrM@*H77a^{R>M@ola8
zsj|hE(|Qf_nN*(NX>n!oGZXjY+ir+TR#>>i6Q*;C%_}Tc&sG?^K`+0*5$x9CV|=D_
zx8gvHOmfM}f8VmG27DYFai+7;V)cZlhA%ui{G^%39%Po+PpXahDW_f(SKYrl0yx$k
zw!QtK&7zU+3l90k)qGYRHNL;Kzqd!nqWgJmCoGz0H>d<XEvD-Ic6a)l;-IB-OrsmB
z#smqEDsK6HZTTd8qagV5P+w1rP5Ohi-+sH+a(I2Rom1zm_&v`aT3<hQ+I4B>fU5mo
zI~QGg@L}BX@82XG)vo<qnXLUo&zouDLyMyKJP+6-d1&eFP`ye2>C)|PqnGTG33OXe
zWESnQxa$@uHs0=Hu=BUn@{8#y#fy_H_eIQ!9q8cSeBejDZOyZGFSR((;uoF(x5Kt?
zqm@tQvZ$5K?^|cAdUN>X#{FIyx^Ao9D35z|2(McCr3O6TV{_)9?qU<=OE>Q;lWHAa
zzQ5^felS_){&JgY()il>FW;*MT5WX6xvA}RZG5fMOJC@0r{--pUX*NfNwIP35ZY$+
zbHo3t!VV6Sc{TeAa89%D+VQn(h7Nbhv2lZhwlcAnRp{wtObLlvVLzXVXhY@7dI)IU
z*XKK>(b5u6;95GV!*h~fL1=;J(%hwmgyVvMXzQq;9Z`F0ZEF$G{jB(DvC`=Eo_07K
zCX?Vk4=KrlFm^}>Quk7vmxh40P~eJ}>7Y7?>_z78{BA&aH1x6n9*BU$v}-^SKunn4
zqnO5F+A=-4y0_9ul_zI|rvdf-#Qu!P7%)u;=B_J>bO}g{gg^$IBNyaO^LaEt_+EZb
z_&ZBSB<BiLBzqaVBgp}oFh}Hx@GqW<cEXFECJIRyn2uHbSSJsE>au$Tu?vqz6Yare
z+zXh^K@?WcnZVuQQ!euooU#C<?Z}K~Nmvq+>W&^DL@J%^4)zS3YeE36WJmlbZ0XcH
zA^qWc<^Qyw7kW7NP*b|e!Qb6Hv|s|>i{0CjgSf0TI8E>Td7)RmsTsIF(Tt9skS4^_
zi9`B*LFDiD$<s$JeQ@-yFg{W*aKbb_Jo+W5%11$`TIto}dFpXvD6&0Kgii?T*6V4X
z%e8Tfw`O+$PoXR1c1WHx@1IcUt;n{4>}+z5G24SAF=_~Y0vzvh;C{y)Ax}ch>|!>S
zlh0jev&%HY@3nD}Aaj<`J8rX(sv`0|Aba=Qu9Kd_4>$`yVCZ@L*aDH(ZM5u%9~%e_
z;T-|{IMVrK5_umScbRE%3cm>W4H;3`AUK%>+048VI{u}qhU4-&Qo==$&E#+JvUzIz
zlGZ-$-UQ=?CwI0E;5G#(VP4#Wf;OKm1AN8X;fq8hB$JQ4=$;p|KmhdGb{NJ{u%Hck
zHB(l?QS`{<?D0|Qygr6*wx4b<9@ybE(C4xT1TsAUu|eZoAhR4~E=`X01dT_x0mpq6
z>&LcC>{}XVksY-@6`XFF7_0a!!^v&oV*B<H{qIeAc|`=3H*e(|g@Jn`4o@o2FanFm
z*8<Tu*5xEB3@yRs8<Hy`*_qBXf^)71!*FKmd({=IAn;k9tFT%K2&bm`KAlz@WU;{Z
zx4c1(9eykF+Kv_FwUu9*1}7us5@4*?))_IZ_L;W1@~+SOn<nn#bprbQIe1&^Z>Db!
ze>d!}_Sb{o-_&s*pBE6_^pD1lMNPYo)Nc6OtM@k!mj5;5$du|{mygVozS54{<5@m3
z!o1w_Z2d3$e4qP;3#XS&wCJn<a{4=in$wGy)X(n>s&{yBX1I0fnuC*9Z7%&s{2Ene
zQSrB?)7(bI=r0Yu{`ZlVF889umaCoyY`W5X+P!(s&l8Kc85Atd`0g{gRZH=*Xv-hV
zZ2oz4dW65IqAvZ`ihq@*EC|#$-M(&c{|R9p<8}|#OTGN%a&f=7zn)F6zjDYi_QI`i
zUu|n0R`N#v<WQTuac=Eqku>Uc=wQLLr4m`?Hr15I4zY1w+o>Se*NW@oQ<p_m7*~Im
z2I~V~`3cdiAg6<m<fE2F9exE)TW!3Ua#PzRHmj|0>-P3jS3A5<SDy|$Xf5>*voK9-
zE2}!wIoz$|E0>%mL+6;ZHffkepVXo$+ioaxs=@|WrC&@ft4hBxzBaVrYeia)d5rtc
zD<qi>Eml4UpnF7xMOF85_B;SxJ)hInKI6e>Z{n}FmBRtxc|Mq}aH#GX{JOdGi>UdX
z?!C<h<FMSLc?jBh4%xM~)lL{vmR{U*Ep)Q3YL7ymahXFjQ^8+shQs`K(K;olJF#7W
zznl3$^dl3fXz9IqB$-X_35c-w7J}BNK<lsMY?IU1(}WFkL?Tt5(jNZu%l+wTP&^Z^
z2OKhkR(3%d3pj$?vU@}hj1;hu%nBg^-EQN&i_sV(u=I;*m<_Qyp|3fsy2+Xzojc7J
zH8yPPH^P%S)J=q_hTV~7>%YmEcS1(MLP7lvCxltEiSL`1<2+C1JHzhgaXZ&GPeBr#
z4>NFf31)+6{082Dpew5-C#P*;mt0B%X?GM{deO=$YHKF0i}b35>yJV~cl(qcoEbmS
zKsWUu5!nq0{@qfipoJk=)Z|PMmjTCS#YJE<A)Zs@6D_}pci&`I-y`UR^dOOVomu@X
zJt%Zge3LmIdkQ_`&Gez{8MUG6q2c+PMl{_o>L(w)V}6S+IyKSfm>XWgV7=fhy<prU
zf)k<qh3g*;j}H_*h@Uv3DBQ*TmNX$DeXU-**@=iG=|MM#h&Y$9a2K;7X25v7*#Pgx
zVMTcMM?-Aa$#BmZV)joJ+n{g$a7DH>p<g=jys6P(0B*34i>?%zVi*1F@ni5C04lEo
zsoN)z7+xp;yYOU|Swt$_3&v+DXFuO_X%8$!jCcu{yF>-C3>DlSi;qC*Bhz~h655>M
z$RzYgMqg}BY~RHV7>~1KBYVi1RwjUxn!fC1m=(DQdOgdmrr&VIX4uT9o<^iy_P^(G
zrmUlQAPkc|J6{*JpLyr~y2kC{1nd&;YL12A9?OB+YoHrb&ED{sr`vl(Ps|}^`-0iT
z=@Z6pO1~gBM`iU~GUd0_1INW<O{Tkf-w%13wL85ttxX<hetuz8mS?Q%nd9432_~!K
z!k$@$Jk6Qu5`VQrG@&~8xGI5roXZ|(AAhe(m{uF|bZA4IGHsjc%Cy>*<!zl)1Reej
zDZAx{AhiF!Z=x=`)wXXu)K>Gz>CwSn>&*XZSNXiZ(SO7HR{3H3XSo{(%*@_U5VIrd
zRPRe(YYxQx+IHA6ydzL-HbQ^>rG?*wcLey|9695#U%x|9O@FI-+PJm#=##W%+L1T1
zM$V|vay;xDaU*NVjEX$V!v}8ekGl}~$BUtxhinWC_r7d#Z9t8_Ucxey>|dtM2yRH#
zt{796YUP){=*f)g0bd>5cw6M2dwrvPRoPU>=|_I79BF!OS<fRv!_0){>I$D?;c>5w
zV_~D+-=2Im*R5gwKW|ljGuplB`<d}~CLZuh9JD;-bZ+&)>&O2bwRfX+bEAdyzR$Yx
zzJccDWo3s?-<VwT_}by~zf6c*w{GUE#W#nH>g-*At#<Xb4IN7}Cd~N#`uWU|6K|A0
z3p>R0IrZ+gn}uG{?adbqiVw9Z@of~R?f|tvbl%n;zkT+Mb@&FJ2EZ2`YAe`U`>e#)
z>x8$}>9)>(S3AU`zKMz}c~kML>(iv3Emwu$wYXTGyDaLCZPKq!Rn6~JYbVu;!?r(7
zvXUtBT;f*AN^CRyuXcD&5i3KKDXU~}N`~3DA4_Y?UHPU$-^SVX=*p5Di<(qCRC?R`
zUimS-xw8izm3dq7=zhc4?K6QO-4BrVHuo`|<hrx~A7#nKJtJN>w*lmW*DCjiZ2!-0
zXL92LcO%829Qiu0y=K8>&w%7wC&*w}7+?Gy@ZL;*^ql!?fmSQv{pJ4T^lDR}cQ^@Y
z4(U+c3(yE6Rm5*XK0`v!5u()&IOAghh)uTw=5CK*peNN0W-s}#%w8vlKHfCi+_W9~
z9d-7u^zTA(p`u6w+DA%zUFq^iRE`7O(A-QR=a91F$xM*t^(3(0<s@kIJ0xabI5TPd
zG2Z_+;MvS)?s!36LnZ)ZEAw9%wW-CXZZ)b6-|sJFHj)4FQOn`*juE%q&4IiVKx=#e
zw6O~y+9Svsp9&_Jn$^QRiFuHvR}~zs9zZG^d@cet`{~rP|6|)7Aoha2a);OKobjR!
zI=gUM9T$b-9?B#;DQ+pK{D~XWJE$s{m>-dZ%Xxb9;NJOf_Z8e_nBv#a+{IkQpl<CY
zO^7wSgHH$R8>Z<6<Hj>Uh|%w?oiC)XGq?7tA1eKY9f-Gf=0;!xhu9qkr_wFPtbWK4
zv%8|;L-C&cMRC>x+%o9&Qo46&u9IDgyGeLNQvG<_KSjYf|3Fik2VQ=S6Yc_8dfp?X
z5aAQe>U%!Yp_|6gf*A|211~ILY{WodJH)KsV8~edwb^2ex#5?A>+Oz>!)zh1v+V$Q
z)1-@x-%mHUZoioHnpF3wtnG__c6k>leK;Yu_-FCo-#2#@U!FMsa+G)HSKEg_jp&zL
zeI{$W_-FS~S!3t?ST*Y4<87@DA6}nXHF4g|RmZ?+-#;6KCJS-wq;awCwpQ!$wPvYl
zB@2&FWW<&d*zMbwOc`nPKWS|TOx`GaE{j^9)mGdxw%PWxs?Myo%H3yP|6=7>;wTN9
z(AH_xxcK{TqSoiN6*k*!6o~WMWQ%K`nTNb7E&tG&CtYRH=j1}j?hl=bmG4z$b8A;v
znCf203k&b?8+YPOx!#F4iqt1<$1-~5Z&^_o|D>(r!iJ8(yPM~9hFBhndXzunSH<p`
zTPD^%o8Q*aR%5pAulDCd@;mDnX#?DwXU+QR%z+#A8BfOL{$h0`YD2({&G+U=UOxL}
z;E=&Px9^{S^mJdX-0RDSMa*0@IA}-9<HK2kGk!hX9-P@QGWz7|A0PaYTJn2>sKPhf
zFEM^t#Ed?QpQ_*P+p#lzp<{k};_W?4TC%1qH}|Z1E&IvxkLQmf#G&sz^G9@wrk0O;
z`c>xo*AEm=j}G2v`Q1-iL&irh8y2Vh?q<rP-`zsp)(+^i(A}dfBWaUDe&icnyE~=P
z{zGp5c__C=;hnKy(|1`rujYEpzjyD+_}nWsr=B$mPo8<!7!tVj<<=v?F<-t*ob%Za
z_BU&VxzE}vALFo3W=C7?%q>1Qi*_9=w7LeI|Jqjh@Z=k1$A*q2M=#{>nQdNZa;bLF
z*1y_!-GvGd?^rUZV3TA2W!PZ=O<(n)bNIrJuP(+ljhGP$oqy+>C|S$4mi}#>O4(Y&
z-WRjlvf;~^=C$Rn0=379oldL*$G5lVWah3a^KI1Ey`2T1D`S>Lg=Mu>_*jXoa_pa$
zER0eT+%u-M8Z`mw%8Tw{Q25EkuE$rtkxddO=D*H+`chAk**|^HU(gtW&cHp}rksny
z=UUT`T2bHfkCtsWefRCIhZDY${p^j8h3SXqZ-=*{^ZFY`@z;5OwFC4|f$>9;W1)gf
z+h;7eOcm{bcY@b%9h1pZgpo*tiOet^-xQHDm*4XSedl;XU6D58>Cemc8E(^r(DN?1
z7VZNC|0GpJEQ7aN&dcw0(0u?P&$7({v~$Tkp=7~u#Y>C~vte+D-lKhFnK1bcLCx(#
zQ<0=R`5}Nj?-s)fNBfV&IviRO<S5>me5Y<@m!k|*oh)oly{q;3J>G&*CplP$lg>Fw
zD^8FngX%%;m6H{dQ?im4kl1evb^PJO+<lz99;_$o?x;X+6YSOAc$bPMB(s6xfIM%Q
zb0-4e=H@Eg2i95vYdv749K#SW8-UjV9fM)34~L`%++&&urR*m095(xfQ0^e^9PxqP
zobaYm4<OOGlertiQ2G=o#eImtOj6(4>z4)-QzqzVxNyUv)Y+4D@mWLl|AhGfA?{On
z2@@x(H`LD_IKw44(dPwjd=ZJb-h(tf?BSoGM!oT$Pj%Tw4>t$AykziuF77h*|Gp<7
zcFd2WU@8|*)bvq5MSpq<x?S)a>mQD*AF9Aj_O5--D6@Zvf^lrylnKK4G~6E&Zl^p*
zG)!ANJoLo2DRZ`mK9>E%<<7)OAq&zxGE3JMtsOGt`0x|Wv9_l||Kalezvh2qduG+}
zu&GT2waLGjOv>r-#OMiop1XZ^=Cw2+VXf&MKd1M)XETZCrvyXiRMmLb#(gd5@Pdgk
zDep#>mB(%AlAeF$wdIe0Q~u9Jk6OhxW5)}*!3go)-FCw}B~~J|85oe|6dOC$;MX?U
zSBIkN1|N!AUt>3LK*%2@FPCgnJ>A?9*nV$Y%Z-k<<C#M*`p-IOyBU2(%b%kj8N6yM
z_ISRz++=r6<7}OGBM%JupAQz-|E3E6Q+$4bd_`?Qg3qNFi%dLwzZ+o}arL#m(N&*|
zb0oiQZ1nF5o_lQnYIJ?Tjez^2IZ-deXZWPv`s2k`%hX$MmW=js^Bp(&Tt&a#4G$x9
zw)WZoz}atE+jrH!EgkuyckRRAVaCJk2dw$U=K1$x^Hbv<*z_+sY#8`7)c;hVVcYfP
z6NbcJQH{GWFv7C(kJi*nlJVJl9HzJ(dAQWJ<c}>iKABHcf4KDA@_f+*apU%xw~YF%
z)9MhmM;!<^cbeYwc;wH6=ILfj*Xu1BqWGVk)^kt)wdU9Lx3>qpe4IL0ImK&4`k2G}
z61-dIjelHjS?e+5ZCT!_8;*lt-T3<5;T`d3_7BXQUa|kw`G>z-u8^Kk&Ap=>ylmUe
zxf6@h-Y8FJz5QVE`sw|(*Z*a{>TkcTySlYQEIak4d_nCSdG4#WlSR9a{iDCm$>EbC
zJG^VJ)vmPrxpwkB7~vO24m$7Ox@Lb=5(=RSci*=NF4cw}eSB3rtm?z-3v+8j^7coC
z9cruaw)NlObge^R<G1xtTi%mxtx6MR?^n}m$L6)kht)ov-4P{8agW||wL>uFee0xY
zZTqK|-PV8Z0sJqVs(5?mb^hwwxgm>=TjiMd&+qj4vFOLr=a-%*EL~kYHdXmHeQW;f
zzq0>IS@WapmBo>qjs-ajlfV11@=V%xzgK3j?4Q0Icsp}*^Eb-(Pp36qo*S|ldcLfq
zX!{(8f2~S_o<H*ryXW8z@Qr+0)0snKA_jNReE~LR(ZlgSyPYf~W~-r34h!xIrX1b}
zK=Q-U6rSAYje?o%8XoVsRkV{ej^dl$ABxgvxM3JO?uas*dQ$7?o{>k^Ide?iSZzRV
z40kx>5DIq4HhAnpsCZl%DFyOnAlt}}!Tm(Ejyzu^S#Xe0tS$i5-8fJhE(|7+kPFU<
z_BVXD5FUZXg`vqT<R%YLXP`A=o$cr{Y}EIK|F}_f+i~pt_WVh2Km7fp)|q7=wc?7N
zzu0lD^M}7)e$@I?;3xgz<cHF)K72p^jpIkH<hjWosy#k@d#U5lM=jIE?`JQ2_18Ba
zwZ8q~qt@UBw;z1eI`nME`$r$O{wKG>d9<kFqt?8^?+ZU_UG95BvEy3yU#~uDJxrLp
zI^n|(9O}sWsP!Q9lS_!7n!U^T=H2Iq?hX9lFh}!5#{ci1NM6(~{^2*H9UJGq)q2-D
z>Ful0XLkIVvby_MKDztslvL|&_xk%^pDp}7_M_IA(E-IDwdSmNbM2#6>V&`km+#$v
zh2KZ5g1En~;|uTg%=d>UKYsW2qt;93LzNdkYR$dzQR~gsk6JHmKl%16Rl-h-pI;A}
zdvf%jJGV=+{(QUt=eZwTEC03ShbQlT{_u9k2h;tP_1#Xl3y7c7^%ELcA;OQr`u&rS
zT2~CdyEgF8k6K@S)cSeKj{ovBGc`}MuG`b>=z5y&uacgoSo4eUe|VZnAGPY5y1mje
z;R03Jj_Xbze%tY~r{)`-v-<fTAGI{UW20Bca=#HdbN~GpXW+Aq>TlYrL!W%r_@<5K
zerH$W_vq7~&!mdx?%#tU{P*C0dvU$q-TS}$EpXTT7Ic4>%<r!K+p}=r#Wegq(GOJf
zo&NB5^`8&@R?q!k{(OA8{(Sm%eHZYn)BR`P^<AL9+)sXWx}NDj{!oA6{!kw;{9yX&
z52)Ms;J^NW=uh_l<Lphqn!48ZZ?(lb6e|iUID(=i6bcwns9FmIAu=WeFk)K~C<$T(
z#9FPbBVq&u8DvltNCF9iRf&aGPn|$eXl2rho}P+|t(G3G)%V!xeD||<g4i?s-}k$`
zB5SX`_TCwP>wfO%*?T|#R!?94zxye)J@@;0wowj#KZehdW6$8@hL!Er;zu&@0~+`)
z{6Bs`vH$DMp8E<}mfuSmfWn}+Vh|1ozN+k<I1$%2ebC4B(v|Q3BjpBt(o$sOemOXR
zxq&YPeN2OfExBg+nC>v17R_DKb>Hwy8v6LNw;%Pr@!>y*Jhl1iIqWVP_`%bcy?b?g
z(Q{~c?q^{{!@vG4{>w(}TmFZb(PYr)rn^=y7!1f~A20!O(7<xzFaOaT%o+dbt@xMU
z#{crI7(DEM{Z`<&`=_^J&~NuYzOMiN#YHCI-+Y(Az5gHIrAyC!=`dps`jSXdQu%-W
zE>)p2^BIvgui5+ODTb&u@Ii4hpl$ZQKaT9V3H<r*Y}J4G&boYM_-eP%H~a19faV%5
zX!s9roq-JOi}T+P^v1Iv$A9@oeAw|ECrloHX54Pz336KI?dN7|Jj3U<d*S}Nj}7xW
zrl`R)=AYpF=dV(^QA5yI={f!N90ULKRhrIemH#w_{(CNchuL;Oei<fPgZvu&W%?7C
zmKcQI|LNCgd=CMp|MK1gOdmg|5C0F(@R>sV)c6d6PQjoT^8B}>hQ5YI5dw7n@17y9
zf%d$58~Btl`FIVIUxLj=gJ+Ri%n5^D+35SZ1K*A#f7;H-MJ8bWwB1Wr?FK%xOK-<M
z_n8fTsnTQs;MqIUFz}AZxOe2~8%&y)KAZ7%h+PIh!~gY>5DY#4jtsmq;h$d_dq;jd
zM3My2(zADe*e`dC-{1FsxI9<_4t|9S&AoYpHE@yvQ2w7ji5nzN2Y(2z5?FWt?R`Ly
z0@|GK_}%znF};NP)IS~QA53ijKM(Y=AxL?91>V_3Gg&0y@Z7%3pL>0wfAhKbvG~Zd
zfaq%6$6uwffauc4#@9~rcTwBmxu|>L&+j2p`R5QWR2jN?{jT5GGxTrx&u>K#tkOm5
zw~Zm&#H*D9hx)>JDEjfs7hQU3kTS-x)(AF>zAy$kuN?`-m&S|*68jB9{|I9GKH?2y
zh@ky(QEIw=`k+@f`u;yYe)^EYslwzRK6w^M&bjsucK53xJgnOFb9sExpm@Ue7NGa2
zmuVW8tJh`>8oQ{4p5}Efh;fbZ={sPZ{LNs6H}Zqj$$xyfgvF!*Pki6F`v<}#ZVvn8
z<IA3Z`-$3>jmJy+N=~faEZ-b<<o6f9Vu74j>nDFR9Mt)vOC!Foyw0Re*@z3jornD9
z;R8wfdi>X255F(`!)ljj{D&-%87^*f+Ve*wcfiFnLpmj&B6Ox-vHZKnjf(Yu`=8cB
zzXiOt%lE4XS9aEJo3uCQ=ju5Vr#>9_s}{lEOAh{bUzqyf0efQ$gTD!|e3~*k`JY3E
z(zC2NIOpxIn%feKR{teshz-w&H5K1X$xdDMyZxyL729UKAHHvfd6J*StyM<_@;4i<
z<UGZ%AZyY4F1@RDxziU-c;)UJfB1j#;O_a2n!2Msf0HL)OuMwZ?DUU|-u@=Ra^XvF
zM82H;`K?zb$A8x!TQdFRC#i4b&dmGj*7hq$P6kJuvpA)D(fgeZQv)|%O)xoC@_B{o
zeP7Kx_2DxQl^*H+`}jw%PI>gtAqiF=w);7}f9jjhW_|I(jR!fqlZqnl{kUQNxuPq_
z^NasEL{Re2A&HM3|2<8=EMotsxtrtNR>&TIcE0yi&f5<Z-u)-6pN89RzIl4bAAkS(
z$P1$jZ_eKTYRK;^w|(j48g*bs_UT2X>o%5$25fS_m$4$HX?NYBeU+EgtNsz+mFl?X
z+O)O>Yo`8?x%RLAAMey^`riJr=&zgSO+OcWD)o)jPo>}gWtV@V;E>m(8%uxh^t;>g
zUA(mVXiveFkGjjMUXZ?ZXq8jjoKn@JLzl1Yu6v>>ep{gyoA58&eQ@ME`GN~SyKcC?
zNfPjd{tfxKya@B(F8nMgS@nxmeZueB1$z}AKD6)g*7nUSEpL6#D=d9lS4oh5(S}_M
zM4w;3+<xj5|ErvSzdMpXue-b7-n22K;go5_Puc}K_pGPA;op3d``&w^qjxrmKL~xA
z^|XEXlb_2If7bq{3v$eip3=N4k(N$=w%{}OtYn+17dkR7bf|y&?x*kiy!yPCXUx7O
z`Cwh~LhYj&v@|(m>9LI56)(Bi+=#oOSW(ioy6ijm><PDgZi!bvDUX?mO*UbW9}O~T
zpB7;0I{RWk-H+S8iw&?8{9cz(_MKyDbbC$^8N|;zZ?2m=JH6<m9=G;&6LCqd=&s_p
z>%z+`%x)V-PV{n#YpLjmll<nu$i%<CjJ)Nc6B%_YOfI(;xyXOTHfN2;saX4&WsXn4
z>*PtVFl{Lp^w%Y**Vf;_X|r_biIcg;`=c{Z21*w7pBv_pj;T1O=tTR8Jv*DwfbWkT
zvHcuoYbX&=+5nFXW<Bk$AE|;69HG4kiRxkBA=^UrKR==%3dx6wqjwk0rDSWQfBPW?
z4d})7uBf`FzK|>EY(n`wtbdcQUT?Ehm3{G-pj)H&pt!Thj{RA>I1*P|Nw7TZh)dq6
z+VI!GQdKT6X>2nu?8VO7Q4Uo!tQV&P#HL@KI8hM0kNcA&2%b1WDVn=DGP2#zC(fd=
z9A^X{+}7LfC!A4VCk_cblNhHe+hfvLwomygjkNnDGDK)=J7IKY8C8<vf24jQQ_Op?
zB86QQ%zn>OT#=#dOyV^ao(TRX3-KB!jNaoTpG#vS*>ic7o&>T=*fm}cr28kybW%j0
z@>NIfqT<5s1%`9cUUK?@J3)60t?8M&n2l^V4hVUt4_D&p2q{`W(Ft!i-rrZJ7%%kb
zZoIM%w{y6ftdWD~!Sx`4<<73mgA<q?jpYSXScNd2^O!^&uoWNF#QBt#Vm(i}%Qj58
zWhg(3yoIt~DnI+zF|Wl@y=~i+&QFpv@!G!a__lrJrZ<y)<ZeZ7MS_WS6JhwS$X%^I
zeClvvdCKcCj$bJpxA(l<Hd_&p`<E3Hy?^z5waEQv?FsSIkGdMNPHA5f)Vt2lJTSBT
z;OL&bPr4Embu-mw9e3yS<gK>~v8;-EO|f=Q&;GhOJ-NT>LMG~0m~E2mc&mF+*Zzny
z>n9Z>HtQbj={aEiM4RH5a?xhGV(s>xBWatp_g~U`Rma{h?0rSC;nOEI7TbGN5es!w
zljo()4f|V<YWaJL&ZQqK3LQ>W%}I04x4XFfZAG5L!m4Esr*!An|D`+q=$r))V?CGM
z)ki2V^_+;Rds4Ob+CPUJkL+yx`nERnQ;F5&m;X7$^sP@jzqnRYwQ0(enx#v}9CBDI
zy|7%{7v5Ua)mYc@Xm9?fb^TMuEs|aRr1SXR{Lcbj3$UE-u%X~&i@M=a{f%p?$NadB
zHh26)_lDV?Tok!#NJ>T1?iV+OCVx|PW8p_B=iOWL+;SHAoUqwY_|0<j_a;01<Lc6z
z*UOaUu9qT9;+HSUnbh}1!G^+LH~y5f==jcuue_2LFl|SP^oOCdni9`co4zd^a=><Z
zr=!zLt|xXn+VuQ$$iWZ!2Oj*?x$2i7>#t^goAYkL-@czQ{--OhR|?aA)8F&RKj8i}
z{?Mt;hllb{Rl7y?-1vRsOT}*a6(vCxtNx)laAI2bjTI3oPvhM-y{34=TeW6WSMub?
z^Pj$YO80rsrf{ii$?H<TgoRa~O{yx%Sdj3gynnN9_K7F8%B62BYM*@5-9E+d>dVV^
zT=}Nk5}(MYpFXK9dPQ+9++*f$XMp|OOZwG<Y2B0G?3eMIs>VhaEYxbIE4tz~Yg4By
z^bzghb6;N6mCEmM`c?AsTipt+;^={>Co1PnVO#g~6h%GJNk>bS!(USb@sCW>zASy~
zvO2VEmCCuhbGqJoZ_lARo|HEUGs<TTcYYOru<rN6zn4lbseZcmxBb4WD!vS_;{)UG
z>Sfpbjvbo+due#gWd4^I-6VIX*YSTSk6Cuj?|2XOFGqjVMYoVIr`*|`yIT7s<k%sn
zrx$;<yDq_~Dd+CaxQ>ApAnk`|zI^jU&U^ZxPkS=zl3zKn{XP9;#pb$V`J<QI$Mgi~
z7lHY$i=s^H60|^V<~x1X*l2&kWUP0dfc0+N`l(pIo~^gx*2ndYi86HJ$Z6PCjTP?O
z3-%;T(ys4_!k%Vc@Au*RgU(aVN0eI-gvUf7VY%PDpzKzkF`MbQMCnY)%(V^E>>B-)
z0e|U=bWeM@RQVAbzJT(Z?}Q{iGV4tbEx;@>CJJ32*<qr&g<L4jIOhrsc~#c)4-|4b
zBIAm(Aa01UgHo^;5(~=Bf1~NbQt2E-)jfkdSh-Jf8xPl{asB<5k0;%b@$58&WFDjQ
z%0z(0?r=CUdh{NltvLg0*_L`RF*leYAM*e^AB+%8gD`yvhZ;7Uh-rfcgY(ZuVMf5N
zX2%VJIAgg*V;P5T{6XbcVwVIV9>;%77+sRMva|K~fMg*i5}J5kojA2fM1SpR5&&xd
zGoT6PbVZ-Tk!SnTu`MW%XS+rYVB@|&e-9`-xU-e0iZciXO%QmEg-Bk}Hl4}B3EV{C
zUUs%`s*n6+$G4ZKoW<!IQR!ADt(N72sEoRooG`mWE)44%kMagcgh+Rq%%5N~-&63e
zAUWvz(i3}jIZqe7(^V{A-_bYGd4lOASI3?eb;+ag4VtW2QTMq#nZBVb@C{_WyAp;f
z5~z3dfn70^6>D=7)UA$5Q*%G(C*+n=@AeqSiwA5SFGildJL6ja(qk1PMdS9nFStFF
z=NWpF=PABB(S7*E;JkNi?L?8cfAy>vp*=@G-_|j4lV^Qq?vnm6PjTAsy2$1yJ6BHE
z&&RU&M_o6kE-iE{jaU+B)}1|d!4mPkvG?-4*WH|`mzn)4IsaDon9?!YU}1ld*(T{x
z3*V!gLOoK~9QF6=7r(lwJ0VIt;Wb5Dw@ZpL{uRCGlV7EcyL!~V@w_nSyrg|+`X#fb
zb*IdDqTTn3;-WO&HjQWdg+6HN7y7p{Ur`*#-{gx8mlpW>y#Ag-Z*fHbmhx{sHRlpK
zm3K;J^lFtnulWA(n*N2lA12)Rxn^?wTL;2TBK`Wpnk*bv|B@(svVO(<stG3!&PRP}
z;1Y}5z0ON^DVwstf3jkJO>=pK<b|5CO-EllH7n!oxqF+gEetwTwX8d<MW$`-UQi>A
zaebQk!JZ`lj$BbriT>k&)ltX$s@9vPhu<nZaw_EbHy7`;Nat!h@0^};<#FzfG4XlF
zK8!k1WBYyEhb6NQes%R&WV}*#(8}dvvF!NYt9LDs^sE1;>bpxeH>+AtYEQk=aqPFv
z9bLD7{Na~}%fj6@Z>YWU<JDS|=)cN-+Hk}t)$W&SH^HsDbx(8>*{|W!#Q3YquS%}>
zoDxOk^px*$*Cu@SP#O)CXU4y$sBrjVq5Wr*wzpR(on`^z(_T^h6>sJdyszD(?yh#8
zZGWaexNchau?L$%UwcLWp4A2a#Nl3E{ULRWx^)kJ4Gl0|tt)P7$iK`$u4&&CnqU#9
zE9N)J3FI}y_w*FBZwgbE>Z;!@&}!aL{AHD9((k%%&u;PV%p#mF(c~e|tO*rJMLuZM
z7JRSqPzURSRjV)=bf3-boGLC9l?JQl#VqIfii=p=T698OB(6H34%Ue?@}kwVzfyd7
zhnJ@mudcG?jgs_P6)umNeew9QoR~$4kMd509IH-HT?;Dskb`_jLPhJMB-7ktMN>~e
z-P2tldj@_Up2YQCDBC!M$A{-YaK953co3JtYz>;3D<6%;&oSUcPQoG%@x>VHzN=M;
zo&fwlpKdSM1#l<&*!4{Z_km>k&2m`xJ8|$r>k_4ZD9T5GTLQcre#pC=r}dyu?)Iys
z{%P8ic2<ePb=IpICr-y|BD<tMnZX-fV^$jYJLUX_atoA-(jcNfN+&TPIPw7NAD>@`
zf*HtvLs3j*EbrM|L8Ua$A%B4ITtHx`yG*_m2buiw;jlN-Yw4ysai7#W*xHh8hVI@%
z5`1waKu^nUMy7B57l4DQ!)_h-D`G+(w>cxMV+t5WI)3Q$dqQMjo*QhR8ds)Vxt2l+
zPJx4-6f!`tpQRatXo`XCk7Jw$=Xk6%ihNsJ^9V<eefyLqZ0cxq>LVp@Uay*hlg)fk
z9$HVQ8lWobT(S^nI_%ly^i3Q}g*JsGM#h-`Chpy{v)M3zTCg{6>506vw>PM-gSn_`
zidu-7+^rpx@;Q8nR3{WZ27RB)|Di@DD?SdC7VS5$HH_=%FT2^g1mCjRfH3Pc(YgWb
z1(D~M%hz|6#$8`p;EvCpoBVgOp^iOn1oUY@H*M9h6JN6Z38D!Z)TDh8=F#+?us>lb
z);O+A&gxfRmzb!pFL7!}Ti@}6c3Vfkwr|dX9kzC|;uz@mmF`(DR=lX)Cf=cL4RRk5
zqzKNN4}34U-H^3IJyL?l(gXWlhLm)Di~hAiiv2DtJcs0#@=uG_iuSuq1>Q?$YR|8G
zI9<QAa7<|=X#T5oD{vm%=T#YQ)_FeVoh3mL_ojNy3#~ocdBx+{(XKrc^|ALXJ=8JE
zlA}`f9!U18dBIIm(WQxc(NSsco*s?wsVYmUb6%9r3m{+AEr;$e-_>(8Pf{XPw!ESb
znli0hF@Lk}{Mui`7u=t6yfzF}*PBo4j-9_y*A=`e{MGwYq|PQA5`G84|LBgI<dGQu
z&i0;qUHF1~_4_7o`shGdp8nH7{?ZK|iL&)qexHBDO`qIyWcOq_rhqHktgY^znq~H)
zrQnHcZ|_mJB^hB=#b!N+lY^3j8;)ePIxkn6&CKeSoBH=vwY+^OR(~W}S2QEP;`l=T
zNd9t3#~1Dw?$7Ny^LfDJ^%*$nAo}}=^)(%OhePTQA8$BRdMBlSRZ>sjfh!p&|MGbE
zn&0g`M|y<kg%$qKwU6vqt(@fXZFhXt+N4Ckmk;uLoMO(@E_~<bMW2t{<FqE>RMnzQ
zADs*jN*wMJ@76o!WOxk!?iXI;l9QJ|?$us;NxyFHnf_4C_MTH#DPM)<&p4C+ilPd%
z{`}Qx-QtMNRmUv$dX~&++&5jZ_2!eBLhC2GzrUhS@zh=$)#r5%DCe;K+C=?2A8of)
z({f>mK&p8d8eoxNRpA|PSu;`Z(;l`*2*9W4D&MoxY+4dh@O#yp<xeVmJlaEDrJ~_)
zDCB#4jtJJBn;NHy)8+cF>zum6x%1@|MXa*azd|oiM>=<olJbi9J3Vtd@>Z(_YFVKI
z5Vsc90o+=D0(X{L#tYzuYQ%*RSig+HT@e$NyAw)XE~<^ny?96N*1fH6r~J_?2WrEz
zY9j1?!wxx%Vm8<9RGg7{61l^#`516bQk}!KbL8#Gan~gYs_P*B`PZLoib3y11aTD`
zu*50Z4C9Prg>tv9>vFeFu-i;Vn%%Q5^277X<F1P_KJX@ffb^>ipw3NlXX@+^!teGW
zC(jp=DyK3+z?%S@QTOAbs0EusKnI)-HRb#!?1wo1;}T33INP;f2%do7Jf^4x1*l52
ztB>4kjuJ*xypxV6YG<-B<h-CZ5oMFS8_?wiZ04X<gLF9R9wSk1PlEhbeJjcP#@8A1
zn=xmME(s9YTKuu?P*eCQI{+K(6FT94Ty`N+27L|R10arIviuVwIXNLh1K=5L>v9VT
z^mVwaFY{d(uM294(t}hxYEdV?++KuwQ<KEG?3Aw2yM>OtMA6Mel&#VWOkic9_Bhwz
z`4FO>>#%1<q3L407VZrgn6_$B!cUVEH(RM2?UfX}V6LM`rJkxh*Rq$5gY`B{<0Tp+
z6Ph6nW5MRpw103?*oe6}QUb&S+$=sq{bxaJk6Twkxp^%|bvgy1&yr!=t)spnH7Y&S
zAhU_@35K1xL3?|4V0y-0#jxP)_Y~|+aO}y!!`(<~1ImMe@?ehN`xE>K+EE{*odBgh
zJNhBRqh{2VDuS6fhdgjZ{AeeOJpU*gN0QJ3&>kxb&a;!Pl|h|bj}9Cy-dSOy?XztK
z;zb3v^KIwYOlkI%YzsZZJHwA`Nw$V|uNWCPQrzcNI06u-Azp=JqOBKd&+ymgJ}BuP
z6Ya5M=tAvHevD|N+N-d*(sO1-^+(+v7lI;w*G*~ttEWk(3au3Ue}CRwUg(U7d&10$
zh<nn^<0&u4fb+kGYA5O=eD8(s1+=|JN@qlz(nas-sqodUQ=+3JMfANzMCNOXlKJpq
z5;uh}&>c8l{pOTK0QhEIT<?>r5Mh7hab03pwU_zA`BiJr^@|%{(MQ4}xUCKSwkk3c
ze$a1Y*YzHJaUuWrlZ(2~gdOd>QfqtCLjB^KKEA4LGlu(Wcc1P(dGYZNA4nDMua9Ud
zUnRoh?S*^Jo0+?|dG?j`m92W)HnS#qL)kpn7rJT{6OSlc=WIIY<o%j>`Lw*roi+D+
zor{`(Jombv)rkx0xa*&aE`I7-`a*bybo#sdyYv}x(~g{eob$rEs>}Kh^ii8jhM%fd
zoc-f*(wyr0w`$HmJ|ljq`=;~oeNHR4heUc6MF)jhY@OuVR=w=!h!5Y)Td;70PU6+S
zyi-`B$i4h)cz{R6QJ;pLh--+{YvMNRR7W?3r+8GTMGbq<EAy?2@>SGjZwim*AMCns
z=_2e8Uhr0T)vUL=Uuf)K;as`i^JwnF&>#!>N$Kdu{^d=jomQGvOZr0uDXNEE0aM?z
z+U2b%Y@6!Seq}rBC4#Gm?}Y~M?#nEXyDyv@*JW4meX7UF_O1lrTcI;=U3WHbt=g$V
zPcS#XC=p4I<#v>G6U>7N-3-&RN-6$^DY2H9uaWY6B|X)-nmnDv!M_?Tj{v{5zG|1F
zGEe<GYC%o7vnbj`t|n0HBO7^n7dtGfOn9HmADL?wgXMvExZ32Vjq0$_KIyQ~^;u;P
z@A1^T1M6M8S{H}qBm|wvs#z38LI#!!lk7&LgsJdn)CS=PuwD)+l#}rKUZZ^i#VsUb
z1S<SPa!+RWfbPsbVO8Ew(~kP|0NFI`1UVz9MNfO^M-)GJA!&g)N=?<|PZ{CG(8)#?
zPi+Q>L7pEc!hd1)<u@3&3Bj>kdHOT9w-T?7YzM#sIXVOTXKy9?F^7ghi7MgWpRDxf
zAiv=;+2@zb|M8{K4C#nf+Ko<)YcmhF-^tFxJ<rbMs%O{LnK+IL|Lu1+wUhtSTaR;b
zIoLU}8h%GQFN?7=5hn^@4K(e30&)0gV^M$oWnLn;?G5gHEVicCKw?tJ%3IiYfVX5e
z)nh288KUb_b`F<e8zQl|7Y7ve8ipV*fp-eWj0_(zjp`Zk!|~!-$YNOI$U_66)Nd>w
z!3-vK;-JX@PaEQ#V?QQ=T~3(l@OkAm!h~YM&_t)UzjP%~jX&Iy1ooM?CnmoP+5Qo4
zJusg3q@(u`PDMuRY)3Cicla?J<yX{2Mq+ATOyXRf2%?u`q7LT4OyP(Q9G~r*IeICk
zbkT(U&I>Ts6SvLr<b?XLu2QZENbBun0R3*5ccKaE(V__z1^aDg)P1X;LF_*N$jn4-
zWOs9#gPkbXVZK9<vt#s|;C68Cw}0t&^lr!^wr}g)7TPej&vV>?aT)^oZLh+y0C}$M
z0uJQ7n;8Ef&oOolw!O)hiZ+OL&7Bv#TU?@*@Fm^$^RTc}0^NNt#)xohAbf9+22_`3
z9!qx4^EA&?WA$EmD))K*XQd;=9)&Zt`|w|NOz_=2@vOZ)6`5}+^5_4qTbJ2zC%EsR
z*bdw_YwQ<an7S;}<L*JPeJQ@T_ViRYPSpFE!^*WgRkbf=3_s6DI1wa&O|dRS`gK&T
zN8T%oYF5tJ({tp^1fI3B;yWk%uc|^HDMAyz9(lpMNucUl9p7~R%3NO`*U47NRv8%|
zKH(p&4!+_#-fEN8?y5fLJjVoc=X(>hvNFZfS6A1r^WOdaJ1RxQ#;Yw+f0<dk_x#&i
zey)1p`tD-I4|CKXNX;Hk;`KD8n|9Qm{j0slgsLq4+R)vPH+X2$1HyVYeu)atfJn*i
zpZ_6i!gV!QZTu=j*P0NSv-{^s8}I!5j*qEJ#8yj-DG8GDVNUVGi{Aazv*D27t?s~x
zQ&ozHGnN*C5mkzmAaUNRX_)V-v%^jv-6WN-s{LB}`uA5{F#lDxOw=n{riSg~-`nYR
z!ovST=HU(Z18!AL^Y|{qOK0JKHM4ZXec`Rjx86{E<2t6Gdv1@%?(&-9nPqYJ<66JV
z@Z7!x;`@Vg2<~qGZ(K(?O!a9Amw9CD(@R`4Jd16yw2bd2YWKeu$~y)kpAfCYLc4#Z
zxIkQ!t1+*V2qgSmO>UKtx0B!1W`41er&hFx<T5obd)x>tqb(ZLMnB1IhU+|$P-}6q
zQ$*5Rk*k#0=Yh3(Dtl?GID4o}E;~?TE&H&MH#R|KPu(Q4C(B25-I0H;XizfOgshT7
z&XMO|XL{N>s6gSpoHa+0v?jZpr1ewIHUY5BA(S2Jis4HZRKTM)^Fti$cVbT-!rUAJ
zI=LCk;~M==Ks`TAOXGg#Q=5-McZ13RH4%Vq+K+Vr>$w7hjK<y|+6u@=abhP2O_tw)
zRqoGF|2_wA379<~n++!r{WzCt&A^+qZxD`T<7_hF-#4P4L}vkqek1YkrbFHzU5c}N
zy&ONbB4mM@d4N1SH!Bhhu2(lYl1k^!d<9R19*m;m-u+m|a7t&wS~NlGGqJpeWAe>J
zc2x$VDPi^5E_Tw$ha{_??UMl>Gr_<<=xFtr698*&j(BbxTEj&PhHYSP*b|b!K0FEu
z;XweVy};^M)9!#|?q$PPGVHFFQ{hnVv7GqEe(BkQv}_f@A8#5dbwkgf2AnHP$nn#M
zM}@Pg>G!(N<7hJ|ej;^h6uc9=>mril`xD-v<0rq|I0W*YobY$dhl*i)U@hD)d?&V2
z3)Z*_q|SrRKe6BZ_qu+DWAv23Fo9X}GHV_@K^R}jVZ7@R2l_0B*O@Xu+p$wStaDq}
zqj9&rCmfid0>}3|J9@8_pHVCZ%fV<f6EK>FG>p6LGa=VOgkkFDT`oX9lj-}R$InW(
zVUD<|n39%kLkQndu|u0=-I@l3i-7gg=C;;!=yK6GRcK}M++>^33SFo!_pzw0wWT!!
z92e_Cm3hU5xjHj`Xw_6-EQbZgx>R~=#nmZ%wMe^6L`&ISEz|YBN4r|4uHqf|snQ3_
zQ+>0$9$ttLy(_q9rb>yL|NX-YVKYJSx%nx>mrU0$1Ju_gb{CY_%Dd*@lTJ2IS!4Ho
zRAx=%)TF@DMsa1fus_^7Gi_DX5R)n47NT8;#OiZfoOr5^oPbqtt=OpXGo4+~bRfVd
zU_-r9vzv5x;3{0b-PzStJgKQ%0T=jfcV%I<kE?h0OskBlzQm+?yT^+guVh#5t@-fF
zImu=DcfJmY+|fNraogu)Puee2X6?CL^yzr%qzqZwRSWOUZWBsBLQ%bIFhh0n?w=zR
z>hF50o4S46s?79BU(PwTOZS$Kwq2JCN{0)|Hig<xw5V6@bMg^-XGrYB93mc9Ug2Gu
zD$V!k&K_!MA@jW-5xUSS#a}z~iLPUbY~K>8YH!bHH-q~tLR<HFY`yiQhBp&{{yxL&
z7y!MuhY=cf_#2Av(!Z<>o%;<CUG-z$_zL}dmIuu$gX8Ya&OCA~)IYB}cAZbDu)Ojb
z|Gup^-2Y;q(tv&C(N)!XlWi561go8HqKtjDE)q+7;asUpAy|E)#h)kR6>0NCl2OvK
z+_QNKA7zXfR!N-NNiEAJ8>B-Y4H+%YE-Q?v5y1Nhun$wo3L|R-YHEk7#AsVH7!$|u
z@QA>px_RcRaM&aj7{c+I)6`G*h-aW%gU2DKuC(=?>oMA`JJ|wKJFCVY50cs<h;e0y
z1>A8+?I^VkTyFHDN1Nz(qG(m04X8}%$y#QETR8T3k~lt!PMfS6i0-}S#fpHs1Y&qp
zjs;KVPq==F)s3@xH^?(#!L>n&^F~x8a;kX}+knF~;gwPSnSM?LzTs`dI2k0QEkF^n
zQVa>mfhphydD~|2TV7{A0;Z0MmU|UOQ-rQB0NH(a4?9iv<I;+UHBCS-bTA`bU?T{{
zC`~y{2*|Gy5QMYK){qPa{!?fLV=;+$j<ie`(?}B8oI$~@A(7228@2`@9FWDr#zcr;
zcG&Sum~%RLJulI)TUZeGB$%10LEOd~2wXz1VMh4}_te-c!&AcE#J!|}8J+(H(+u34
z+-8#tO&PV^(}gpGt;z5n(A4ljD2U-8>)11J@Hfnd;)w$449eUDfa!xHH=eTN$}QsF
z5@3)E2tMiw=0%o7EfDu>okbG>Vjqxq!Kh$3;46#eiz~J=I?qjT<lU4fif%U$k%_Tv
zWUhnngxpcZIjv3(jy)R;s<|Jk8K9T6&asB-=9IT>b2@O1!4S}6yoPn`d}3s_kAd0h
z=KVHK;58&UnC<>D4xt(yG#XkudlGh>1?{~wdrb67Fq*JF#%B$+`HOQO%XTq-cT-!m
zYvvpmC;ZK|T_`@DG&gx>sMdln6lIH#C%ZgbfTGTA?uHQ07OO+6)pITVGsdaCwPp)-
zp`wct_dCH+w*I?=ytUc(BmM8@y_uG`AhEN<qeM_`JGUrh_=TwvnI7xpk_%IlzkGMr
zy^&K=V(q?PB|2`Na>@Nb3jf8B?)q|-(&L!UJlxjrfGdAkM%lKw*+sa6ysn@Wcfb+J
zRaf)g(w2FS_g^K#9d#cbwJ;rLrgN)s);J#-J$|lts@|vTC&k>ihR^mnI;nedXhw+s
z!za9A8@IAWb*{L{M#=d#?*%2@@Tu`usHCwo-}<n<|K_swGsDVUMKi-zxn2-#9%B{r
zb=$J^?)hyI=~rKE|NG5*6IUsYPL|ryvY`FP;L6Ah+|F5(!9m%azu!z3t*FFJpToxO
zz8|7n9;RCNVsxl)w~Icyd#@-@T%Fx5pII{}*hg`4x6Je1%^s<%v%BBVtWyOkj@X3z
z$FBD*J@9?7N7x?q;_p|O6?TtG-E<-NnDl={J3D(mn>klwG0L%|d%W#i>nac0Gwr+w
z5GHvXr0ALJG1Dc7)UqX0%RO^>$3j=<B?8Vhp&6kU(?Q+@S}@PZ#ljU)U5h_0m|s-$
zb}HIMD`onbLRcCrWyivb!fJfm{j2e}+5)zR*ulTn(5@QPM!&DIU)Sg0y9MkH#5h<Z
zHsk6#U~n)E&U_Ej*vaN9PpqyWFguI9O@PQoU_7!G1l|$aDF0jza7L)?#Sr0vcX;Gh
z_oLki6Wh!}WkZaXUgW@xT^wvuAroogxKKNyB8dWBGB60e5voR!kh3!UC|kw#*|4>c
z!L#|e8ZU&j3;EW>RiSc()|n`poy{2?uMfD-2ISs?#cCM*tmm2aVg4JK`fMXc?!i<x
z;yKcB!wIH_zqow=P}Be5G6o#j1|%~Pl|vM8X_80^dJrWIxCSkE8xoa&9>H;xY0qaK
z2xnGsG8+ak=S|>B0FiNw;D+NdBofLww%6lY3J|V;f;>=Xpgr?3Xe`YblB0_m!X0_1
zjV23N4j+RFdS+-`4{97j7RrE8!o)JhKt2Z!L-LTRaJ(JQ8jf`JA3`-;50KVmh`3=M
z$>xV56Nq;cHK09Ibo<7d9!v}HQ6kU5miefM1h~_v6?G5D8Sk3}tb)vSwLwm8b%!Nq
zJ4h{00-4`1FO_2xSRWNT)x+{yk}%SNOzMCZwh=)%(EE{De}zc}SrZMUga;t}4&X}W
zMoCm;+S$%+op_LLc5<*Y0v4l<y4l@~cEEJ=SPYr(umJzOvd3Tu$6#POduIiy@3UR*
zmJNnB?2MW7TwLLCWQRd4Cvn*2-OIC4$KH<a^MN#$bOXsP%@-w;v|{)l;BZT86D{Z@
z?R*ee?3CMN6WW~nvnX%e(cH`r{1wk|+;^a<EcBt;eOyHb;M{lMd<Or#ynm^cG_9kd
zV(z|_VS*}WTQhZp@O166)>~TVkhONRbBpAz=fX-;dvTkv+|H56E_!whlke!jjXn8j
zTHzLBMJruzT`es0bam>?aIR`P@852!$k6sfDnA@2@Up^<jw*XjPFd>eWtDBX&D<z<
zrz70tsN45mYi#}OO_SCyPwy^h3r+7%YfEaI_Tw~RJt5e)Ey%J~UVi;t>!+4gW<`~$
z6<(1YxJG+SeNTmtj_zKX+%oNy)y_Iap_Q%_H-#QKv%5U_SdGM98mh<(ST$>7sBS`D
zWy*`OWno%r)$Hnx=Jzaa6L!P4+s$-+aktFp-2{)+O#rWKOx_FXbw2M#@-2VN8?AnO
zUF8b<vbi3mF5A`K--jRMPZSwg%g{SVbj|;}^o#z`zmd_E*X*S;<61Q>A;;iTWaR6`
zZs`}(v1)mY#wASW(_R>oU(ga($V-O`*2ReH&gMneIOo@i1rmD;jRh=>bUn%AsJgTI
z=o+UQS$0`AWUxUJ$Em_d8jk`?wG#%kZ>UOU@G3|`E5OxJjH{5xiy3a2g3cb(Lw3fz
z1R7$?hI}s9g2+N^Spmc~a*%0IzG@=t#Xf8N(KK4is`eJ_P<q0`kjvh;FW3XkD>nKT
z%3P&q-H+mIGZ~aFfQ|Y*<o>eA^X;<%WyQD})}6>bNb#Zj{prq@aE4(4lc_+%NaM0P
zK5~MI%FNyv(7%Ix=;#m{9>N4Pvy=y?3yHl0KE)u5nsYgzx=ADBg1%s{dQt^ljm+!E
zkEaltQ2HHAAwPt0?ZnAc2o5jc8CjXggiPd^h!Mm&gOW73%Z#jpjD!Jq`5ERoHEWd5
zoD+S|z<8Q9nD7O#Y5(k^Uk2CX&qIvXG-XMR5Pn8u2KOy6h@bfr2EA*vq-iXkE}Koj
z$@Pqr1O5aX90?k~1IL1%4X4MASpFJ>WNMpaa?+Z)=7%Mx$$=P9$BekYiFcAwF<NBu
z22y$9bKq2zqC$k6ib)d<+=jv(70mlqvPIjl;2h*D;5%B>%izlt@IC`Wx$WU9Kj58F
ze6X7hSio#!s9p}Z9euXVMh?SyFmM<IC3AxO3nUD0du5%j`?l^u-2)Q3hAq!_H4um0
z!%8NUOn@PQy=-9r+E{yIjqik#s$d}2Ijp2g%<t@u2Z)`OdK>jZu}WHfBR#T--=&0J
z&J!O?awfv+a_>Oe9m`FRan|MW!BmZRb<E6>47Z})5}PoW?5}ufXo$-~zsuX9N)C*&
z0ektjK~~`lG)Z5sB<iMhRNM46+?~5G*<zykEuo<3mNxj@T0w{0Pm}Z3X4%eJ)|w(Q
z-I-oL8iH4F%is0RmBKhLYAJq-Z>^gtF`eIOy5aHdxYVLmk_^Gsj1@)JxWn8B8mouS
zFL%GJ5dPX#6EJ<_N!hPO7n07WM0wOef7i!uELab^rnQA-RzT8b_g~Id%#}1L>SDpy
zpOzf;6slZ3taPaww&W9|a&@t)#!`geG`(ehR+mn3tf<g*<*beCbQ7dHsp~RRk>=>W
zg?#B~ez#3gtwtq@r~_#ygmxUe9V$`?U5mqB*LGQF^IsC3yp$dMnY3w1^z7huPbydN
z9|66~o8AqbEe3G;_tl=4mNzZ&kCjAMF2j;HEqTXE)>RhrZ$b3RntUD>!g+|PTCJb#
zpim`P=0W$$PFxB(c7-@A&BrSLx+Yn>@0GdyV-icnB?khnD}mOfdmjM%JZN<Qty9f1
zdw=pC4A7-^94K1AbTG6p^e*M|NaN~lh7H!Zog%mlYIw+EYcN`p2iXisyaVhe$3dJe
z0(8}iDA>#mG{iTINLv)c8=Fm@0Z5yx@(zQMV7^1rAoBJWn?d>7Lj`l|XY*@aZET>D
zRnV>%#WsyE!sxXzWc(7SMHxJm4LkrT@fB=lviGoov_8TCN0;CWFN4_$Hk_{ji<ovX
z0N=supsrptvX_``RJW*yrp+2(&t#PegBqy6m;)hM_C@>XLl@>Tt~nS|V&p7v=p}i`
zIm0{8H%?Ns3J0V7oNZXanXO2X(LSE(QchXo#2iT1A^#22gZ&8uEJ<KKV?6l>L&=}u
zyar=~Y+f#52(S)rY~qLwyO^;Sq=XRx9+UE9nL%RgK!X&h!4>9SEpr)|;w8ZvZe;?`
z!^qfgp`6*#zU3`uig_4Ww|LghFmX*Vyg2>3$YjANW)Syo;e89^_x26q_12}z;@!=0
zfHEvx)wKoZhNy>?nAn-uF3q|j-WoI-9s}g9iJj~tuyoB*5D_Cgw{<i)dNKK1F;tQi
znF?>0U_8)-WKAN#t_2#`$^cky1a({go9>;JhHf$#yt0dN6i}B82J#?+q!7^<GB;^b
zm6%*)3ovz#wX*Ip_P(*kD?6v4Tb3Pm0Jy!f#wT!<R3Vfl)%aE|bGH<&l0w&V3zM**
zpaoIYGLer<L6@j-T;2qY5U?$gn2pm2)!t9wHCX!I%{}j}ZMVb2exxt7t#_4~dW3#K
zeB@8rm)w<mf)?6+#~WEI%W>Mc6@U#8Ts8H}7(wb)eq>SgC10-qfu<<Ft;(fiY-a#Z
zQ}oE*zs_1?m8h}$>AtVA6>n%2{bYX}w^9z6-x;vs@wKu^^76lfz9~nh9aZ_^W_8kz
z3K89@J|?X#Ftth@nA&iAleuNoTuG_!J4LkXSF<+$9KFm-V$GIzWZw_TjxqI5t+Li;
zT^YAT>l3qs<E<p3W!gbrzBzdNSrJpS0!@TO%&Ro-QpV5D{3ZESp4PlO#nq;$rTi}k
zJ<k?}4N>k6@YNiT>#qpj-BG%(YR54C98qQSy&V@F^Tw-J0I~5Kn!iuK7??M{CNib+
zV0>INRP36(@eYwOm4)#!Gt1x~bgkAWfTQpa%3aDGd@h9*D%@n<zC8dcR>|`VF3Gf$
zeS~4MjQkoG^ps`mvX`MZOw?(q=*kFHHp<iWG5G~y5V&G{7nWyZ+!ZE)o$ov+a5?UB
zNjK&N4~SZL#1OS=1#Ke|^2S;q8ArB+zn*Lc{s2=0Y{>I1iqVeEMiVxz7<lc6pOEb<
zlwKt03jKxi%$a6g(^G8T!LJo(PvDKv`hs34qkup~3nOi8;46@43vV|IC!YYxkz^|@
zCDq!McGOq6REZNLrOij*L<)}cc2V~5Ox!{PbCv;k3|oQ8V&O$}F{gp)Rip8%vcXmS
zcsJf>l>%@rjDUTAY7>r4b#0lqp@1nbhn^fx?|wD5(E--L+uvn;b*n0)(cp(7UcSc)
zEtV=}q~?rCx!w@NX^t!>HqipWW#K(gEH}jP(4GUyI?8t$Gi<$ZNRFbofOCp5ge(D;
z=6Zezj0Izr1-Z*4l^M4OG&5%?aFzh8dO)cGC<;Z~%kqc@UxI2T*o;AA*nS4~%q(BB
z1O`Lcz+Td)fcSjEBg80jYivRRm)GLG;ku4uPqS|=rctnJ8GV6HJnf-@EXkL&Mt}`T
zMeivfnjVGEu<z^3yv0T?4h<YlBf(XM&<@C5chh0Hqc*?|m<Lvxe+zHdv+Krw>%%Bj
z+ltMzZVMdj%n5@Iq--hlx0B_!Bw0bA9x!1}tWnOAC>3A?je$Av=WY_egw@MNIm@s*
zIuKwbtXfqCp{=!0Oi90y3dt(J2gzHUos%^ft6mmHtTtGRyg*W!RF)UUG%Vc_Sf}UL
zMBiS?OREx>b)Z9^tD*&o&E-83n=3BaJ2W=7fqOi0C(8)Y5`ks}Zjv^F-BNhUqXL_*
zQ+6+yr@}cn`1wxj!yQ(=T4$BDpi?B*)GPc|TZ-grK}Y<y0k(cw<&u?JMC2_F6PB6^
zh`cU!dpxaHR#?f8IM(g)3V?wixSF@D$XZh%Zz_s!slMbDFz?j-&P`WyB06SiCF;d_
zF5y%5dhTAykFFf25uII9Bg`M$)vWl;s?ZcxK#k=D;}T;3+~^1nvQpO_+240$uMF_l
z0J6bXT$ZRsF?rzTR?za;zJ;SCAZaKgX=C|c4qO@q$vUhkJ0Q0GuYu9`<o6UNjIk#U
zv~+c3ji~JE?CKJ%_l#bnA6>J2rcHTDh2_-X!hkEKF;$uR@ip&RPBkkG$S<R%(GCfg
zlbd3~-d60+uQ}G`udj}N&(gvYK!s*?xpFkSE?NqcpgSKhCEGyR3SBFUsk|01oEgzv
zO&T<hEyUPxCM_@vacXb`MqN?*C_&Y;psK)N8#oQv2H{3Y3I$6ptv?iO4HPW7w9as8
zRhKx``i!dR_S7qc29!eYy5y$$GVW#vxOAZjJC*^~%q*bMUno$j2%A|Do^l3Qb0$@B
zR}8GT(KHH_?^|V?0kG>k%%n-RLfkw%QfwA@C)v!*S11x%6DH04IMjx7?g3$SkGUBI
z?^IjNiWPV_s<L~txB>{|)3}vzUULi>9*Fw)QW+ZO!CF(51o4<NY&oH9KrU0TgSq+&
zIj%nTzmIG9?R`U1Y#WQ5jg<;oL)NN`im;pq{L(tm2V!mUza+ZEz4_0WW-MJ8AS|V-
zfHb(h;RY&m;uf`OR3X9K(tpvXLn&`&5Sm6lGgg9K98U>iTulT697N_1!6vk7KNv--
z^hSts1CncviHD7bY(cqk74-xI^ny{4{*!1f00N_+Qv?3AJ-rGNpxCRywN*C;wA7#G
zU6*r?0d{_Xq$>e&YaqA_{thAE_OQ7AKq>$^f7DuwdFZPc8aV6#XnPy(07Cx7+SP26
zAiy<X-)#YSZ3L@i3yoDD<K*a8(FFCe$keR>^DxvRpchsv{nM`AWnC&igMU<t0Q;bX
zh)dN9totU+S#$%##Ldycw`0LxAQmX!HFF+@U;u3inCf8e=E?5?ro{%B21#MYg1E2-
z@&MGf=8NKig_h<fv00c(ss@W8aV>p?AZ%WkT3W3hya02+*Gv&g{GC9?EEb|=^f)Va
zzhfPu2zIi2Vc7P_M}=Sh^}HYzwrj0l>$n#J1gg$}#Lz;&p_(E|fNP^T<}gQCzP}3Q
z0J`pWXUCCv&ANIpOo%Q5XIquc<<0=XtpL})u$WTnD~P{DFclDB_eZpw3cmUIR=`4Z
z%4UfQ`R3Yv4YS@4nS<twBtjR8UOmW<c3lBg`bqXZarAeJ7}sG|d8TBjsvtp0$Hus(
zXMZow_JA^7Oc8&}v<%(^C{w_a4?%jl!iJP7BW&D{6)yjF;dtB+6)rJ`VOZGFlH0l0
zrfhhLrnJ0v{G|IK9^K{5m4B6Mr#iz!1yNTUhzj*-0IDwgBoJCzsOW@LUCx`_G+3Ap
zqHCSlP0UPyRM{#x2MSdf$K6#9WVb@UhE=<C5>RzQlAM&rLTb#W0jaT1fMKM@45=<^
z53&I;hAaUBY8?YA^eDX7Lh@TF^zY#3Fh@XnKq<G7=fZjgi3y#TfX<>YjZKm8b?UW7
zIf19%4~75+AeGfKh^?JG7qS8BRW?NAG{SJP@_nA~UZ`0(uF|BOXY@=1Wj!HJlXA#k
zr51Up1=<k^_DPJg;(;ohSz%DNoihRO98$aC219laf_qlAOCr=jU?^38Ni*t!!CfPY
zIqsGjAdBj>8!V|#jRy#k_nSxIe)ESe>>p=PlZf!aS&*#`Vv^!`14#*EG@RM3)G(+)
z*tgh(>H#?DmLcd~%(7$H7U&&ZvHP4=i*<;EVQ1oSsP&p?+`oOsFiv(FBYbjV5!Z9I
z2wY>L72x%?k*N=#3EF4Ul=E-<2ex99K%&Tmd!{(JQEMVKW++)0MmavDttdBUd}^nu
zii^WNq-k-+Fyb`X07e~}L!gFY92Gu(m2==Q0Ghuhpb7GIJ@(t+kPdnpj)a8Q2J^$A
zH}ab}zCy09GVnE^Wi{>Zw3_h~X)l5z@sort_OLX%!4w!}!Zh056kw!&BULd-d~J-E
zC*0R95S;+*Rs$v@4S>Z{AbOHNi<B6pvP>!Nhp)gSDqPh-H~}zFZ=~+jTF5ELN11`O
zPH$7gr(nOq(%lr?lwU+g?ClsH7Nl&{AgW5^=NLe`le8-=*BL^sG)}6`j;FAHhftdx
zhX)qUieHrF`PhYQ6~&MAJ@ffil|UT+YM(vWX=+{T-l`hT<mXgBbFN|GXTF66`!}^V
zS*ckahc?0sP(hJGxpuy_d71eRL1!RZDPb}zx#j?j*n8D=0v7gvpkEdz*AykfDB$O(
z7Rm3^xES%}pSAl+MTPeJmc-2V&*O*k#OhTuJ5?=RT`j@Z+OVS_X7oLU6zZ~&Wv2=~
ztbk8Fzo^OgXP$3ifJk##BGy(HEgY3Jhl})e6zO9jND{2onqLW++I2e+xD7_=PYZqi
zw4klnzN~J&q|gPT)l*Xf2jD)T^i1WO72AW`ua3-lA@F|43qiw6%XQ<e?uWQ^m%t-c
zEb)#GC30SO@V-ROYPOUR>kkDQ57BDmsJ~tZl^O<3$`C8#A@+}jT&+IVX&En_DYZEc
zixup&gk&`=P*O|mDz?wl9D_f)6DtUkq*A%$)=)t8Kn)n!W}Y^xa}>s?q#9#Bi-r(9
zRVWTnNoU7V`GAm!S%+vIw1kWmiV^PTX|g4dnOX?bG_DEZIW~`JRAp5@hg5LQA9V>V
z+~?q_$>y8^e*&eLS6`8oo7PO7{l3`kY;S;=Nk@OCCVc_tLKeZ3n=m+*4}dWMyS0h}
z{T!;zy^(GpFY$H<=aSO-Yd^7+7+}dnEi(qV@f<%Hp3Q<9p@s!4)DIR8)}}8b&Zh*H
z_m3Y>k3=C60S(lmtk$pr9XK9$po9t}PZc~H6t~lz%Af{E8<JFsRN=+EN^Vm~Q`SL|
zG-tnZ86!H+g82ml$uVGwMshk5;4)#x!9c3t*ua>zl&oUAM=WeiKn-}Jth@kN%N=E4
zF9%OZYL;%o8eq<VS`xI_0fCh=Q1hT5x!4{5uSFM;5<+wfgJ<q2u8VXljp77mqn*XP
z@v9cA87d8Z(3j!1M>$OM*DPIy1E6G!7a5R&HAajQ8UbprtjoO9l5HJZ$s#4HF(5j6
zd3J0iotodAWCZ}OHUE~s+_pJRh6e1`<<>A}zpbO@WUk4~0Qdr<*3u9@dKc4fJGW?8
zw_!6fTQ|s3u`@{4T!)2Wl%QG+CshZpwC(sjYYPV5dwSDC4wgjGw&TxHROE^L6vBCq
zq9Y(w5zZ_1Ioatd8(60za#;g?T(bBG`te|K{s@ZmtHe5r^Hm7zYk6k!?sV14Ico*E
zVynIbJBDXnmYXI8dU=lbmCH2^b8NC086#6>iC^%I6QtJbd{wrBjt(p0XD&=t>sqUQ
z4yI7AodF*_o+TzHRpojngaAn~zDJeA2ze^UQKnvf<G<9&CdrY+3iv?3)a!~G_Xdux
zT{d;yZm~wRQxRGny-`r;5?U2pg9OvN<$gJ~qSR7ZUOaEw&e{H{YNBB16^Cg%-N&QR
zH40$OSyCG4eG&2dD4;MJ@w@lEfnfeR77)x^7=roTxlF9u6t$Hf8#mhs*o3KTv+V>A
z6f-c=%HyU@u>9Mu#UN?iy&b#XtVpTcN<{6n9D(q?I};Qg?=jP+igQV4lS}GiPo8KD
zXQ1A~D!`F^Q(bm72hmFy42be9uE8c<N#o4nnf`!XeR9b^re-|jrb{=;R9P%V_Z@sh
z`24O6BP-PdJSCCJG1OP9?DPe?NsF@KBsw8DAxkaf#6l)I;f?;8n*>AZ#UBw1=)py~
ztN@#GQdG&B`Gsac+77W<Xkp}ep&aI^COhyBgC!3dG>7Nn0>qAhqnejw1JYq{(xyUk
zSs^=%Vj_(!%|pV<Ol$_Kk^r?)*<>lJsE=-H0y}gjELdwGoAOkoVkv^Rq=F@Xs8dp)
z&|?_IbS>5)&w_QF?Fx_8*9cBz%bE&rBDk$DxA;RD`Ntde1zb_pbJDZR$SLIa0k@^b
zs2OCSs2LG_-JcaH$5yCUavYf_>I^wcGL}OX99N`<{!=39nT1Kbt!GIrYH&)H0e8R>
zpy-;kDb-eSYLzKT#z(_3Nk5XL<l=NT8j}NODGX&VhH>&RDySxdsi!$Bl~9P6QJeuC
z%Gm-$xGhu;h4bSUS76IxM(wr0ZNoecZ;+PIr@5m@c-9wBV#s51b0-DnjHibwNEbm)
zo&e=Y$Z8uLGB{y5Dx6Ue+ioQ>iDPhqJH_w}%tSsTMlqBaSqGwmk_1tN?F^$2D23H^
z0!RiKsp)16;MdAhTW{<@!K<hYN&IWYS;#S&GZdnI84OLT0aL+C3s|Igkb8<n>~910
zDXL=9G-d`ADC8tX?>t`%z|{giDG5*$B&e9?OmfcM8m1POa#8(A43e5F>wakxJLOCu
zNG1n*zT6QK;M(SHYGOM)>*}oA93dO#SeKeo$CTURu^m<j*Dtt3RT3Z*L$l*XvIzd1
zSZHl(4apg4Vaf7PSyxSbpg2u=s)g~}s(7ZH3f(Nu;$r%{UBD<ON7bd5#5LY}{?%7A
zb>3Ct8c#j{ivQ0%ml$mradN^&^Fn?X;ZvWR`OE4;*q!JG7ylNJ0|D8^2OD#iq!2#2
zh2lXA3-8a)>`9tUGBmWa>q^4Zy4y@_ZVwtx`f@i&NSczhLqW)`71~Pbhvww^zo+&K
zobJ@P*bYB<rF{4S)1^!NqhHpKcL=&tbjdUJAwqA6&R1DFAJ%B$GbonZeD2^wQ8}k9
z*@BbC<%+gQ%h>t414%_LgCBtmz6@G1d?hkUBOpKhyM4DPNo6`I+vjp2y1Q&8v2Zb1
z7$|gN;#1T)Lffn{Lxzh9&hrvqoqszAPGGIm!DSrJ5X1A(OL`HCR0dCz;_eYT|GH-8
ziIO1YJWuFT*7OznLP+}MBbrBGZ{ESvh@&aJ5A@Oc-XhSJl2XyphR#*unb?*P{5~I1
zH%v~3MygjOTpGa1l1<H&J%U`MjX7}2v$NR&4RrvB=A|gF0$c|PO>$e)8=1HjvJ=Wa
zGU!r6cIvB9bmv>}@`izzFh56gS#wVOac2f_@i$JtWg$CD*N8iM=^QW)evBPh$AQfd
z?*nnq$x`M7u#C4+II_t28D5RqevY#Pb*a?AszFK=a*<BK1?vqdblM^I15W_~uo3A1
zozYO`lqC0rFz6W<VJC3Fvoj>tpf(xXEV!T=3NimYPRN3uE>`vebrju$ag3vjp-+i>
zprE$C*b35-*n0cK3<y*VWkLA21VF!I%dJSyQvMw+(vF8iPb_6J695%oGbPRvK-~s9
zLy{&B;L-MIsobC(cUd#$a=|+1hMIUqyUk$I^K|Hm*xP9GJUdTQ*p4@Y;`&mE$sv^5
z3NkcxD96$fNo{~gCOt`RDum`b9_-K9K&C38EbZM|59|oxL?zm48Y43g)!EN(jX_(A
zwi4qxeW}#*l^6Yqo_V0>hDk`(Tl(4wtVCzUGkA6?*Guk*zXKesYvs*RVk@!SK0nFM
z%QsHt+Tw1$tw`?28aq@1E3e4ptjmbY;f3<|@kRiMnxfvyOP*F<EXRa&5?g1LZV;2(
z%E8Li+zzX6D-8jAJ>NXF2%}9ucs$xGUnR>>2q7;8En%cIrPZqUJ8flo3JY!6vFyJE
z?1Qm4uB&R<@z08FiF&zRdm^Zfc+?h}v8{ZdUm5QPG};cQ&|5pSy72nQ@jTEkmtit1
z+ez@)bzIR#Y*9Oo?deSe8o7{MTixSPYV(f#G$$;9Ne-VcKv<3(2fUU6lU~52$n^CZ
zAJh3(`I%|W$QfBUxoeJHE<70>PQmy&(vh<hEG@1fn*`~&QZ_r@(&FpT)tsmt?<StH
zGUOO^WX8_8LS6O?pk;(jIYyzjN$6A)c*)<U4zNRJNLfJHqgWmC?K?sduOrR}?Ep_D
zfLVl?T4N?T);Xez&`6_692zwxILaBBYT!#2qovFbl0?+Yf_0`T$?4?e<t37r7S5bz
zwBe~x+5}B0&o*o&&wVB|{jvc*Mp1*N41kiH?E{`7`>tyUHzuB7jv6VM;bM@N#!%fr
zPSi-jFJ+l@ipFo%pT+60Ht7b-lhc`l()4ed|3+!5$dz0^iJ7I8ut%PLgAa?7zi5v?
z)I5(Fn=CtCk8m71Z7W11yR<M%0C5VAX);QpfH_nUWrxNvIGG$Tfyuf7I@bL#AQ8Ee
zr6F8FJ}9C_B|X5$okmO98MZmAt71ufByKnl6*`cPz#`{BhFwt3keSDsSP*}9qzAd2
z_kf=Yf*yvtV_71~+Axojfrw)wI37r%75ejl38jY?bKp)|GlQb?z+swy=VZDWq#%PM
zkrrVzZNSM*_>#ozVH(0D^)({%zJ-Hsv7vRqh)#$`4w%T-1oPayqCizjBsoyB{xr0w
zN#*L)CWD^LZ>D|M0k}YG)KH@MS_{*{h7p{|)H`G`G{PtdzBa}aK|MJD`AkA$=mr{U
z3PKv1BPNuT<%N})#6nCC4Gh7lRUu4c^6pW5ZUIOxHd!d-gP+G&w={EH+!B^hC|X>m
zl9nPbR9#Hsk=p8zWhYkghABx@X1yFH1}}#yO@|}ll0DQn?(kKC%GuPqEbFS^cCeL~
zkob65kh<MBK0nC{@ivD=bofQ)WcyP7+$%DN_z3-(*p_Qll`#e_DTS8wWpz$IGERCn
zhG0-<2jXvFk+U`<T}OKbKzgRuE6gEu6}H+54a?g7^Ay6$e6_6QVAnO9uBs3RUwzK&
z+GA4fgfdxnyxaSd=u1Ho^lFa1o8acJDFHP>#PyxgRYXldFkoukH9OZCuB<<^**7m>
zVSqQr6)%aL<!`#cYB!d>mPF4IX-Z7JvD{X!8)rKlZ7h2&37sV}#dy}QLH_|ZCN;C5
zIoE2f>sSQmG6da=je+@h>AQzQW^NCJy;<fm9C5SAUA2;=<%*rCUYZ0Vmc<^$f^&XF
zjK--(f<(}<&Pky^)Sb2WZZlW@z}q3+hKELh>Uw{h3L8`|K|bzKt{Qcq#(5`#aPJo-
zq!XbkNgS@Ua5p~-aR?YXDM?_~!NwGI`f6cAh831&kHp$2PAHB9=%@*E)7XT3<eF+l
z4$qfp2ziJck;}i*P<4^flC4Juh)hgPHd2Av*~Hi)q2QuF=Q)xnH7d#1Gl0W-8i}+J
zX+RWyGMmz%5J`tZHCkJQPi<~iH3G0qHTnwa3{=Vi4W!Nu(lhfGVt5L{sY+>wr1>x@
zRAi6dV1YWT45fJf?si;jP~7`P`=&$9gdCR9v1V*z+4JY*VF!z82~#XsMuSUK1Att(
zOFg4^3sLVB89s0VDO4UK<ZfuYC}V^yCulueLp4p<h9nr<y`k)>VcvLJ=9D3W9~}@8
zEfsDux6-H;*;6=gglO;3#gKy(Xp`4CaL}(AU>8&5Zm=d<<<Rb<1Vf@H@-ze}WNc=i
z2S^Bh6ik!0#LiC4BlJ~7ftoDlHWVF!V+@A^LNRztsT&$+)QZ7y6k%8{CLfXtjW}8k
zW~BI<LmC~H$Tz@9(<}ocIeAHCq7+>p9a3RJZUEDa6j8&CB%#QjcxvnQv1EoypdM4t
zW0akYad8CmO1}+ti~V{FN>3{(DFm;Qzt}EBY*KyQCCN<aTji-lh<z<5%T8+^TonZ7
zMc*D0s;sj^fDP%0VB0*nOl3e}o)Cd}xkV08csNRFR~=*X;^B6`$e*$<i>*v;lP?Nq
z2y&qVJF`xASfPAV-u#YSliLygDuvTx=)z^qDsn09_a#|zkZW->c$0k>J+1tSk;yUE
z8csu|vjmWJEkB)XOROSBvedZ+7|G1abHOSB;&k75WvMTCR}S9g6?e{p1az&aiT$z%
zh;#7K+g$PgQPVO(B?+lnXaJvsH}&>wTEfulun@IF*M^JqHeE}DWNim?uelU$>=Mbp
zMHHPiK*`ku!Lo#sG@SA)F^z5S=GtUQ4k$tbqyH>lKrzi~V-dkH%W4CIp%sJS>8^Lk
zrF;fMHDEYv_`#xdFw=B$ljkSUj3K^fceIt;47Zr<5O@}KoFpH?HSO1u5oA2huqilO
zu`(pvpb-H#!k-TKBe*%$j2A%E6$mMMu4@}V0|;Vy8Q^aOWnlbmYUX-3gFIYbrjrC9
zMYMI7{FxUC&UFg>2P7oRg>!1M2v#Cxy{V$;8S{vV1I!!Hm4@{@q_crCJTV+Ez{N;9
z6n7fqY$?%k4a<NN2wAm|u3-S42&u`lbY@Par6FOHTZonfSfm2?0GyOh=tR_P{u5=?
zYl(jkDF&xR4W}gOnkx{ORT%FpT%e>;8=#gzyYOFLOMW`)mOOE(kg_RUHO~1#t{?7o
zO#%)BK(HH3+R-&ks8Khd9p5zigB+zOA3d04G}urx$*qDygC945SEe%ugdM3<Xg9k?
z4<kK+Fz|2aAP3Vp7`urCvjz?})+jL3P{B?hG$M`#+eSUfqHjdLH|QEACXPs06aL6c
zq}n3FAhDFxBf5)`;U?ta36JLl9e7E6W0DO?8n$+TZ){t{x2%_`Mg~VP4@Tnv)VN#^
z1SF>mIp$G<+s?uP#N=v;N+}GdtPjP>)JfIzT<{Fu?$nZ&Gzvhd(+74)o0lGUJI|>?
zO4Se@hl+;=U(1QItJu2O!bV9RBtu(C*>Nz@T+$`3tf(X=npoJ>jAHS$m@#nxe%ZoN
zd?DB;ey8l9&^Cr=xm#$S_Z9DDQ(N|jXUY@w+|5<K;3tyXmn2O}-It$r_0`(~Yn7l5
zWtTQkeA|$p`BFHP#mdK5jRWSO31ddc?F4x(Zow2DGyZX6F$J{4t~B+17sozUsRenB
zZer##*7A2UM0!Q0j55eUo%vR1z$+@*o!BmbPL?6RzwG!4E*92KI1b$>s>9VsRDfGn
z^fp2s>dxPdar4!vWV;o@>O#=3?g0nQW)~ssMSw6h<;*^Wx8>%KU5h=wZJ}ZzF3nPk
zG|N4-dyi9^Whe|prshcemGEak=n2-H_1*%$ovEN8*>W6wNAeQAkizywfSe8#I!rao
zo+0>F;e@za@E(Q)vLQ>6*B;b8O6a`P*VNh^<Qwb4L|~IeS*$kiYY7A)FP-0Mq#(u9
zio&7hO{DfnCxUUGfPyd!%c5sN52ih@_B1kMZz$7%<PehZL$6U8vL*~et;+x!4Y;F#
zn7NGx+!+F5G7~j_auA~sTN5K$m5;6gBMnjVK<I2p%utl<kMuORI-C=bl%g?2$pJP8
zFZ!><f&Im(&P274HOswl6407uw2{Y_Jfs+!P7;FNgR3|RdeImi50H`*kBE+8?0KYz
z|KgndbX+eOQP09yA0ARITt1mjFSn)KHFwhGFb+c`)u<+td5gZ`bXq1e5Rq76`43WK
zb%&WJ2wpJ_H+Tpe3*p7l&3_=nO#tgf&^nNxVH=a}=pPJ`L?|@cj!1_XaxKr4AD%y8
z%7R|Rm4krCUt^yJ+#rlc&ZK~9jfid(qys~S>hUNBVIUB$BI<HD4fwS>Y58O&<*5<$
z0)mFjO`3`0b0UvyMLGaD$3VozuZVQFaKUkY%W9;LsjWU{a0U+#3UoQj(Q`pEhAcqv
z6u#nMU1&(Vkj5j=@-z;^G@khb<fb`Y2pq;Hq=AtTga~(|h6aUDlss4$wlxdQAMipY
zr>n2eT@Bm?mz9(u%Q7QGY*#8=C^RZSM!V>*AqK^GP+;s?SrOukYMs`Rs<Q17A}=Vp
z4y&``Nme4BeTjII*oywx@k~)$e#iQ->To;cAHrP7!p@i(s>4u!UthKop`vHmv8-I!
zec`WOL#T^<bi?eXEuEBw_M;W~#U%YGv62enjVp!=nAoZ!c=p_?WZ4+s_{>sYxr%Bh
zr(9eNu@*(VyF3l8c(H@m>oZX3*R@pa5dCHSIK;q{Dr&r5e}`yDgu8ZixUYUjWj=?%
zJwZTZ@9}pdE$!g-T|o)XyP=jd-~&!VzWB>}m&J<3;2Y_`;OK27ralO8y*ySTi0wtS
zBa3-S+A*y*bu1Fl29B+3@;=<TmBU{90QQy+V2?>VkdX}$x1Ti7aILGu<R)WxaC=?!
zd}Ri(_hLwLjLmR_r|T^&;p}M^!vjRPdlo(*;$}l!>*~LSS#$)w@toY_g5Uw@DZIHR
zL!mc^LYR122un4PhqBn+oS$dFmw@WSk$Hi&$3YRnszJC>F#Bg=X9$K_>R9WNLpEO)
zw)bP&jB?OWd&bUi2L!vuk(5AT;jB0s;i)ggWR-E7sG?P<=RpP=37!VO^hN<YLz2Xx
zAu1Mdu`rU*s5K{TH$ulw%BjG@kJ2VH8fM5)vy*Z7cel2KH{rj`1?tGl3+5&II=XQ#
z-!t{q8};XM8xm}EjUjM@^k404JC0}wa)~z#k7$wpV-f7L6L)H74@gBq9fr;}xPVAS
z*8!dw3QVEFMYR84U+*6tb$zG(hG=*+H7)AEVr;tvO`Z%GFM>m4S=vnqqxp%+gsMcY
zXCWZXAo|3%Y^~SsY4{O@5p94WjYQlqP6Dx%1&LhvT)Wp|mY}$$N`fp}PY<xRR(#H$
z)orgm?b&wE>wbSe-^pP6JpaIC<~uV%=Y7BL`+nc=&vcqbHJ|XZ0hN0r@i?BJJtw}b
z$*xFSyX2`G9ZN=Qs&Thw6%!*5-Blvj4x}^p&=QD!+xYjJPGt)67kU`&3dxfM2CbZm
zZL|CAsr79W%GMA}#4ro=3@_beB(U#<YJUL!9DoTYuL3aSG4K3_!^!)Elm0@~D){Ck
z?i=fJob_j*_9UhPNC!?X%>SBz@GhQxQ55dLy3<E;hI0CG2K&}Lx-s!&f?>z3TjvIt
zhwXP{so+nV7NFZd_W9C-=^y=jesy%}=JXu0H22R%zBaYbgW6TY@Z6n+A11eiwj?;v
z;^92DXC7GCD~UUM&o@eKU<}5!G?o>AvoY!DUdgE<DBF8K>nnxK{X1S@g+UlzAapOx
zQqAobz{p<$cCVJaxu_+6?!AA0&I~}%FzIF>kN>DY^sB-AC;#cLc^hVqpYI+16(E)y
z-Ty-g+I9bP!wi4x<4w1>J^_Zka>K`)id&!D<AH5P<df#aljqmzPL${V#Fq6{JAa6o
zC)^X*>ES)P^P2mnPRFGyT(IJF$e>A)naNJOK5^jd4XbOy7m=$Q0=e376_o?LjLIp4
z1M?G=t1Fm;iZx6d+oY>ub>06OKQTUO0MoA>Dcmt{I+)p7vHhtV8&=*od1L8?cNqY$
z%HP{1@Y>crhZ)9Uk++vTO}i11`<%1tu>N#YR-N6v5rn*&yg}(4c@yXJK&NrXAi)|#
zx7t61Zd@vK6DGpr?g=h+M6K6&pa-&$4KbL87(NC5o+()K2gC44n-nYW7--$_`)N>X
z<_k<jV0R7&M~U4?%mQ>ufE#u$((u_v#UP@&c`pddez4sheT+oSbbkIoJLWbRLGJ#`
zpT3X>#GEB~c+a8l-sT1mZQ@c!yt2m^<&^@Tj^n*4WUDvpa@@o?BPBs4lx?zYuZ|4b
z#-1W7Fp#{NOPSEZw*+91FR#lo_%5U}@5>DVofzOv0Xr+#B(^dIpVDLovSsrQ2YwJf
zXV7Un0$<|!@I>*c2TCr3YMI}|LWg~hh_%7Z6q!CU0ffRv4`*4LwHPF6!`t&7pG5Au
z404I{NtE&n0Zo#?7rnL>G&N3;IS*1Ia}Q-e%0?MHDNC|WJe&bL@8UT$bB5idEU?46
zGq9@+XkBn&juy$6<f2j!BYSgN&MmE2eSv3onTq{MUg%e$QYqKF*5zbKTSb2OV$<aC
zBY$#N#lI96htmfiF3KxP?L3@JOoNy~;;L$ecI5@dVAkpFkhk5NdrwB1Yk{{JieWG8
zeVdsEc(y%U3PugSSsB+TxFQmIuSLX8L`^@(5V2zq7?_=9^05xWhEhFUzRx9Ob}<GH
zHx_@RAziHNPtSGG#?QGg%ql;hp8BIRGrqF6%6z%?Cw9ayzc_Wqfv+#We%cGK6poLs
zfr(XN;DwE;fq^fEK56>#fw`6OkKHq>cIH2MuFa6|_7Hd`v~tMSfn@DJtvm~mx8+--
zJJFZDNY5?bih_4ejV@?Ao##j#2)26T^Rwm%z`k{lF|kpuedh9MH>#LA!Ou2{wk<5|
zIA9n2Gn7zP-iD#}_ptAhg)2O)A&3b%WFy=>Ts1}%iS3wiEk!FEW)7}w^bXvO6J{JY
zv+fOUl6U5&)1eI(hPgSI(R#N|QwJoeO(hhI8GZx7t7oBJ1Nvp0Y=YA%%Hjda8Gk?M
z0gT3E!M)Uweq$@S6(A?A8E}J$970u~$bdq&-D>CM*?dEEizH0A92|3-E15~h^7!@%
zo+nh}CCLy1fBPYG^6hF9-$A#&`hZaF|1~R*0fwREtPeXclZcLf_r(YPYzK<1jga4=
zKO#MSB<gvVF)tyErV4KxztY^b8K{sHEN8%5ZtTsNmW!h3o0gz+?l~?OBb4JAj>p|8
z{fm8<%m?_C8$|y}9-h=w91{a4?Dcs>paJ{iioYl|vIUD0;N7fC9B>)pfszJEB%I-W
z0+>n8cC-0|T(mYvC^5|VO<1`T;u%Pxc17FxCyJzTy**gR8(&n&g%>kp%$zvgdk7QH
z8*JI090Jy<OguSM=0FyLWkVD&sei9w*`y`8oi>|T0SMZgFr^S42S|6759eg7m!L+>
zGGf%8Qt;fd937~v$;2_?Q{JCMQLUY*(#riCmf`FHWBa0}TEV=gyc&kMyH=!Lm|U9M
z1Nzz4^8It$@(GB{zNNeiJUg-r`Po`G(y$UexqI_-RRo`BztGTLSJzVeU@fpVdFQJi
zoSMAT(Y9g~>IbJf$9Tri`<Op8#b@tXm$pZbuBwdd;tb9S*Y?!?tPdA&Q}i2+$<2c=
z3=eO4b&bt2>OSZ_X{O$qrg3JrqHMV@yfXdc`&xg#ru+8RCy}H1Th>=TvHyqVPGrs;
zAH8STpiA^ka0UU}pV;1Ve&1dR%vt64O%+~+xGsFz-S>((*)8LfztXsH>5B2uY95}n
zKe4stwF6&Yyv&~5#fV|q46Z6?mb&-G)t%#Ab6UEp7tG|s{Ov8H(wz&rUP$%dr(wMD
zIsnyA0jlSbwAlbRdEmt-uA*h&S8uq=p_;q6=b5(Gb#Fl_%<i7*t%Ha6UsDxYw>Cq?
zvI*K+)T6Po`?vMj1tMs6fj8P5gY&d)vBQ!KSA&3Mi&9M+CPb-|g#g?eSpetrDw-k0
z<%?;;x_AQMMl-bU%byvx#vPX<wr2*LUkVZaebVUg&!)B@lj1CMcy%2n;U*M%pXC<j
zTd2uHTDmi^-R|bM==EEDICfy?U;bx~9Ut~LzkKY&Pru@fE61jQ9ssAA<8vI{vRJVM
zr+M|FUy3cme|TV0jzO2tF}r7g4PGHSvK0&g`ko13E`xWPyaq0rUeH1+pBWvvnB9gJ
zEo^v!Y1qdMa~G~3*b)F7428SwH<C|h0Oy7XU>PpG^UoYsa+L;|Zo+{41T6h*z=S3S
znFa4MC}qK9UL>s<DS(T+cD3Ym5cgQM1`uAkn$M<GGZ4oRz(x@h-dnc#6pxY&Jz<Vo
zXD~IjN$X*cp0^h17Ldi-hg7H|X715Ia5g!UEzf2S8YCQUzOQ*v!XVDT?nwp>eL1r#
z!=aWRRQ%{C$2BHh6~3-C)qQ^Ms{Fdv>IYA6*Zg36?+D|9^Ea)UayD9Y@b*)Di`667
z&)posd3(X3+gl|OgQ`z?TEXO3KX{V?YAbTo#s~n~^kfoaEb`o<m<Fx!mp6)--Eje+
zDy;iC+-{4e5%1R2)wS0B?72mSbqq~+>bc{O^dLzIFCSW#oB@PA{FO)c?pgfA{=|y?
zi8FiWd^vo%H~cZ4*cV#6mqN9GshZ(WU{y=+8oZ&qrKi_$t^DHnXnFh}mmPhH`@k@s
z&^tG}KcCmw@~zjthX9=(0snfBTm~nFYiFk|EPUd?s9xm`-fMfyYeQdO{NTSr07I9W
ze!TVN%J|5O3=<0Pe)`J*)r!ca*cp+rd^a8yotr8Jx$JKNz)P$#fmC-q5xLYL&UN?p
zr#yVEIkGz0KhD#3wI8`S-euvuM|tOt$ZK^4wJ&x5bK}hC3;xTVig|FHmE_z;X6=e(
zZff{Ry&JR2x~Y`0Nk8Hxo^QdI1V=Y|mKIPmqfS=`Mq1eVfSQR~ncWr;DpoSGsGE=t
zEb;qoMR2l1PEfY(VXe(`D^}sWVwBs~`y((EF7<6m%e345Fu!b}aw4@_12*Eu$zx(`
zcLRH#t!a3AoqI!GTQdYyD%#SvH54NOxT1H4ANlPUU;U3AkLRS2eCgTS92!B2bjD4k
zv7~|AZm5_0${qm6;A=`g2@iucK+eVqMxr!N@WTSAK|t0Lts-klG@qwg1JE|u48Vbm
z#K4M!b6Ph8;P$u46U&7WD$!vcm*|`ExPW$vrg^77kdUmqk>co7F3!b1WSlu>h5DSI
z&mi*sY{}`IE=RyBhxB3><&(MS8~kkQ-5I{*Zs~RVFy$SG(tScFD4V~<TV$*;-b{}L
z@eV^VNlnc+ebD0%jRWp8QdUttLCSQ?xYlP_SC=!!_!T^MHS4)oWR`_mPE1g(m>Z2k
zwNhQ7D`$>YjO<Lz4wqja4Q)BHtMD2;u<f{A&CyjQbJ9k-u=A&)7gGsQuiC2A;a!FK
zkCqj$EWti2<P^e(C#6$~4|f4caHbEi!XkqZu{Uqp*|YQ2^eG0RgnmIR4Lm_ErxB5w
z3cwMgdzlNka7}qQ%#X|Ds0rELB%?b%G|2r0#o^SeYntABVz6cOn=fBpXov&$T#Ky_
z@2Os}qGlK<_|<{0FP;9$eWBMFWf}+#=09=p-FGGndCtEu3vOl4gm2A3{e=;L+*K0>
zf_UcQ2S33U6MT(+Ptvku-W|Vq`t}enYxq<J{xB*ya~Vz)dTq&66y&Pcgku{Htoejj
zD_|IQZurq@HDS44Q}6ic9o;R$pQT5i0NbL@AB%o(^7G-&u}!fvsnb|vy*y<P@0LNV
zu|#{M|J<Iz3BdZ7;j!?Ev*&wG4F#UP+_D{rN$|vODr<(RuR)|IJ$p(5+bhe|$DtDI
zqVSdHMJIYd()dz<gO(JIr2nv%T%;Yc3}E4F2|sG36*K(H2Rkxj%S9r9u~mjNjWb{R
z*`T<Tw#S^U?--N=CpIyZio0(A<?eA2F>~{0?XpFS`(}1aX!e>!)cFQGw9g9<OTYEk
zk4x_T`7bX0$1Z1ljR8+W4#c8P61XaiadT)ASA#<ti3noNwroXah<SX#@iS6qyo7+l
z;gS#oKb>j8^4ORI7$8crD+|j+)~5bLXp+I7pBb8G&o3m&=t#{Gv#KfwUPKm-bV}Vp
zsLBNj^3_C!{P6LFW}pvvu+jRfo(~ogvz>x8bC}edjWv}Sc_?c>7;2u7>BTP)@F@X@
z0&Cgi$O+1fB^G<NpfjTwbDWCIgfArecvNI-f_8BWdgVckThe?s=S2M}+MCgVN_hPK
zeM)F#A=j_;j9H0q;P^9+JXTg*R&?-#)7M~N36+}K52jCHE=9now_|HI0aE3q5j=co
zQmGNC*!?%H%CD}kdF1-?ZPCd)52G3Jxu8+i^%99_MR6?lzRHRYeW!dwT8Um$l7prl
z8CXVo@#>Y$!1ux`D}+uV|8}2&pV>U~RK+I6f0H2&)0*A0O35}nveG*6smt)`yius$
zFSI@}nBQ^m-SOP2C9Ot{PB@;03;#Vp$LP=vc2`;Tf*Ggt=C|Y-&oYJtuC=}X!}%@b
zEnrA6Dg3ID0d$|ouCsv6NN+eQ0hkA8+MnNp>H|~Ex;Fp<c81n`vT9T>l8+_?Sonq9
zU4<(Ku(@!@%)K94a~3?y7x6kf{NN{bLdQlEfU>og4MWvNkb;rtUgENA8gRaLEj4)<
zj@G`k>Nn#x{e|CdeW(x=nnPwxiwUSWchk&wWp2HD?-ii{>9cu?Y#5uc>^*kXIPAL7
zxlbN@GU?k4b{RGqnQ~+cw$#%*B90_%lP6Db%*#M#lNQ+xJS*?>V}6;>C9A4e6G_0<
z!e)Sz&JEOYTB~raT<q2@!=}HsoG6-%dJ}*DADJyqTm8vjpB8%=;5!i&y1LwBAi>|e
zM~JmL3u>D#-QY}op@1$Eb;`^Sxe=I5=F!8D%6#;esspP|k!qdp28-VhrOdn%=!hxJ
zFnh`H$6$=ZpnAnsM5`<_rg!4G;!dyLEog~Dk8J*F5GP6|6?e)Q)YbfoO<RN=GR@|T
z_WtG;DJIs|W~ky{6Uk=T*9jc5TWCE$n)C?>uxTPAn>BKL6{6!EDZeq$L`2rfwLsSK
z*85(*H75*mvM!Jv!pQjc80y|A3#1-GP?C`N1SyIYDU*Nr^3HfyxYj+&I#$JNgeJhY
zQCV06sqQ_eU#^5At-dgVVe~K<B%*X}h!G)HRdJ~BR6|>Hv={~zNj5)tI*F8<eSP`X
zcsR~q!W^Vuex12i)ln8u@!z)yRKCNLMXVGK6A+z@NaZcm-=bD;BH*A>qF=1;pDFK;
zm^~l9-Z80X_?vClhW^3vp;yinZEf!-oKgDd{FcV~5B%w!w~a1r$(z6QuGBTUA)vVi
zWbik>5;r~sQo*05-tf`W2tl*og*=WcO$+GLjjKSeHW(GEu0<YHy+M$@_!9^(nOXpq
za7XW_yEbIu4p8*W<<}G0Py}{)owj7^9Vk2bSzYyrK_T3Ub4MRMayi)&Efq@PZmk%Y
zJOFWmObMlSeX)S|DNV0^ZpJ|9M7(M!((qThW@^dM_daf%nJoNo!^foZGSaTA>wm|T
z<Rm#@Qk2YFRhcCy8!O%evMDs-4R)hC2sY<x8NX_<4FCjPM({a)mBAp-zj$1yK&4wq
zitP}v*|1Q#T7Zez*K|moZ3tv$i9yi9CWvk_c;iy#BWB{ETNuI{>>jlmz@@+b3JME?
z@}D{P-uJ-|&~ol5(r_FNRAl>_mb15!+t~5V{+tp6u7TVQ%j@u>TBW`uz7$`GU8e9E
z@~OlfT8K<RWbQFyVrIG<-u23niVJFF0V$D%787eScyp*`Fl2%a%<$T<E{{Vx4^iu)
zMw%MhMSD3oL`HqaP70Lco#CiyxlXxCj+&{^vuRL(Qf{Hibe88*_ItT3f*<qo`Wcc0
ztnBtfK--_s(OXz<;txAbf)F67CjbtgZP0SPqg597@)QbMWv&tax=4}{r-E*LaVOxI
z@a;dq<V@LDf1Oby0oFCftJ-=J)yt06tdV}3V@7$&o6cqGOkyR4%ez9NM!E6QlzHa`
zaHzKx$^xHOY9#24ZR1GMl_llj0#kKN1n<8IQ8$nVkhaP!f>~isiALGcA|R1btUc8?
z?SwEbyda!H@;STw=iR&q_ETibX0y$I-n3=s-o`_5;uZ4To069r_ve53@Zu*va$xg|
z&QF$v&MpCUIwjw9W2?XMi)}N^RqBx}LyTc60Z2}~c>**dFFeDE43I_vBnL34GY>;Y
zQ<7wJOt2Y<7+>=ERUz9cAW1D7;Bocb6^=$?n_>VH&l8h!6bbO@laec#6H9<vHQ}nk
z{Pnj9q42G)?0WFXMM4merpA^pA_ntH=amdWvcjF?8`5igFIp;M=tyeS{}{WmGV(9O
z&)j?)`pvTSXKcu)(Himn&zMSHqj_Yw8jdo`FPP^^d3iXp^-V(-ooV+6<XR@MAf6P2
z6O1QiJR(eTPiwT^Y4%h`*qKRg5Bq(l|HJI^TijFZKF&urPBe%6u+=%{?%&=qZ3P^C
z4>(EyFW#9J?{P$E*sO6LStNt#au0@i8;>Htl(RA)x?J#K@WW9eCf!(dcQZX=1+vPe
znS@xT51YbK>AkuDqFh430BJik%Be3IP&`fHDm_h@<?gW;Vo}^YZ<HDO5PSg(eDvU|
zA>9Pr309=!+{UEg-9++$M1x2T*0_^nTEGl$WoVEd^&-p!mzQ2HI%-2bqdXINDu+_S
zlHZ@{8NUkDonuRKzX)J?-n2zf$0*KTj;k}eY(tHlZ)LLFtsjv?Q0`ti)XvZ_(W)Bq
z?>mpK%T0u5mz)a4ngAboPU2L<3X%k9wve1~3?*U#+k5khL-)^p__}sC(j#9AT`J@<
zjPNZYO8Zb<cuno>TP8*t+G0weicmq2=5FkMyB%2C2GwEq$76fAl4nPDpDAg=slqGw
zmeYrZLxLqoo4Q9xna+MeiPk-{_e2Z!msKS1zab5+fy1o%@m7o<hcM3uH$HDSVn6PE
z7AaQ-WlD*gAhpO9*wvR}9*-v2&}jADPk+(KlYfjk9d{X(85!ss-I?D(Vl*K+W_aWk
z8cb=JyJCrU?4$SY=#C{olTGacJ6@pnZy)?bBf4n)JYES{nI97uDvg{#6XF<QHibvh
z#++6}Qt5ZfFN05o&9Sw;pVT*^*6taS&lHc=rdExX0fGiaBhS^%YP|W6&+m!mjQ@|Z
zh(`w!o>_FsWekkBxDgzKGm;6JjKPFV%O1gvyR>HpbIertR&`6wpe!ga<E|Rvi9%ha
z$Xs;F{B6UMOoViG?8f^>`34SfPN#8jN+&6JAyy-Y#gmhAaf752ezCTflx1+@?4Mu#
zxAS(?<)8oJw{Ly$noy*a>gQW49Jy&DD5VH!lGOX|(T-7BC;bm-IdIqlpm&Db#eoz~
zaGp(6K;YyW0jkE4?Vv)SuAE05a35nsmT=c4f-cyQIoc0p0#i9c9RGT789)1XY0sSI
z1o~`w;}*lEj28_TGf>e*9>&<-*?B=si^n|7U>%tnq~0f@o`z_EoFAQWOUL^LHuYmR
z{_i9bFkudPX5&G_o*-XaDS<3acHrvE3<C*#28f~*JD!gcQrRMoogE#5Q8B@t0$BRd
zPn3!>nFf4aDLt^RQyitS6OFaz!rS~QA(kAwKenohXn=Er<|SoW&%R}j66`#}91Z$|
zUbCzKO3Xq9hA%_}AVfkGOe6bi?nYB=+iJ};s^%|oAG~k#x5;rH?mlTVwuOl)XRG@E
zY2g+#g}zgehc|^%b3v(vTgXSH1LpHV)0Si`mUu1s6yhg=G4!|h+6_iwx{*(uY4N@J
zct%fr1kEwN<M8E$@TMP1xZURUT7W_rK3ST~)Yj1_0(t~uK&I+uEi>rY6BhQ^Yo_)A
zLNJolUX1A1^PLWJ!YadwJhh3=X?bbcL2v#{sIT<-JN`;^X(^8P!ont`W5I1pU%y5G
zH3IgG2(mVy!#ehxFzfxKuAm~hRK|9*;-R-KejS*Lyi&65dmq<CXLuImXZoT(o)C$z
ztaJmp|3%a(;7-E<j95I~CSvAfp8~C%)9sbm@39;=n#)YtCY0DjKE35}$74i&2y3n?
z=QT%ts<Ye~)UvOgWIH69V<r#>R4819F%<vng<~kN*}whcSO23AL;+}uq^itbR>?_S
z!6zUs7M&ahSgywva^rp^5inwIbF0ZNylo{lx0LEBR6NUkFetYTsFQYl8mY$zGcl%1
zY>Jh!p`DAJQpGZ#N1=)Bz>O>?&;GNG*W3tg$*9Shs~8PMzt`~|o^aI)wNI}D2pdg*
znT2ze<t)Y|?&1vOfW_?ct1#j-P!afDps)feVxASpIA-9&2`rAb_@E+?WL~BjG}!{+
zgd=nnpScQiq@^;((R@)HW`OptKl({1e?1#9-JxV*-I>GrrTym{x7U?2^=AZ@KG=6{
zsJV7o#hg^4`oUvzd6p4CGN!W;3Iw!-VqRozx5=4^khwn`8UZMkdt|AD>4?54<Yb1m
zbA}2gAKq0e)OoN5hI4lLr-epgKI}Fpdh?cI;+2QK6AH<XUWm-X4}Yr&d#SPbn{S8<
zJ+LrwYhAdY^x!Qu5SI4+`Dgl0I_A>z-*1Fcq!@mk)eXW(%iIljk9j=?879Pj0o(Y;
zMrL44z64Q$pByc<xfiAkBd!b_IjJ<^+>Gq&i$2R(UqMTNX#`H<m6fw~+K>D)Wxy1D
z)+TMzS~0}arPw3Jgc#&M$g{9{3Q8WGHeWKVId)bSG{#b4&)VKgb>ZQDn9CCbp|fzA
zmM@3nkR`B4sMZ{7@BP;}>Z~L3%*|g6$NR?;yB5Dbc4JNW+%q>%4?G-OZnj~$Kji_g
z^8@+B#wL`f^qVWvN7|9Gykyo;|1-#<{p7C+xwHaE@%vZGa-<()nr6dzfMhQx19_Ox
zw9H%_=PSLR$za+_9}sklP0+@C@`wo<^v4g_80vrcmcFv9bn5TAm;Y|b@uUV(+m35w
zrNKFt4(`jzVo{Z|LJXY-;YL~B(cwJs-6wMdHErF2_3ZYGne!jwi3VDD(@F58_=q%{
zf<+y<qC0s-0e>PM#83)XSTEimdz-*e2QWon2aR%6#SW+>o$?yFOB&;U$|iQcklvEV
z?8ur<T@$!Df*}QhK$C%7@WK~;AgpxRiToxX0^$;pD3K83URfYv#<115w}`X!5|jMH
z;xXY7w2@q6puq>b`3D3lX#z_o_)Eqrp191*CH{FjQr0=j7(*n6mZW<2y`0<4u?Q6>
zN>ho`N2HU^9Kkh)(8QXn4l*g{tOXK2P4NPF4RC_FBl7Ybscej#9A$ji4#o6EQZ*5Y
zBvxdG&-L=2VLvzFC7YNcW5iF1Z~>MwDvHtAq9%^2+1xuKBiTtS!rue{>PD)~(s`j;
zNOS*9rQzXWFr^>kc{g}NsQl1(WZ)z|+);gBYjah<DJKk-(dvq=m*n4kiI~rgBOX8;
zvk{>QU;_a}tz*^%hRhSNkv{+}&N3D>J@2@SfQW&*hpzx*s%6kr4JMkE6v`_#XcCE$
zi-RpQ9~VcDr3|*31t^8<1N1RWc<!L)T&W&e$wHr$-RK{WmZs0Ne3@C-+i}!ZLr3Hi
zoCTfqMc!>}Q!Ok;8Z9J9IS0LJyqRkU#}fB!dv;**9>!rPtfElzQq5TxxY79s8979H
z+wBHp(PSkSvmbX8b$t(3uv5bDJTuDjD|2p4kLfFN;|`h;>G0`nGC*Hjj#`^Q6Ymb&
zOWwy}3$^Ze1+*6HdfsH#J3gTcC9511X{YY1-xgu{n_qT<D!m}gbk8{IYqaHoNJ7Ol
zYiUFh2qIB7dn+jM{gC|}uN)9{fnw0prJ7X#%;|HTmt$MGj%b+C8?&)HPYS|?s24?i
z;5VG=$5R1>EL#R0B-Qqf#|#Y6N}N;RaOw1M4o!fk$Z*zV+Gb*?oB%~iZA?~j5qPo6
zHrquYB~ajb93Fjo9Vj9&s1UHYHC=~4@`fEeED;iUHe*uigu$ABs`Fp!vJK%0*<|x`
zejT%EOh8FzDdhu3XR?Y}u#=4^PBtk?M6|~s^c8Gl>igRVf083GIV`y7dpJ+C^FG~k
z+QEx9Kkhdc^YXfDBMhr>h+z`4XP7U^A_jg|pV~~)=S}ey;maIWd^I<R+pH#AZ4-AA
zIWlV|WBKr;Eg+PpT96QsVzNO=9kVS_7ts@4c6f&}h`O(kL?T$j53m|pG5mytLRd9z
z*#NBERQN?9#XtP8`tGfll;)Xw!%uJPnr}=)kRf_7VY>Y7y|jArfEl0nE_cl*z=E-W
zCu9K!PZybh`Y_KHVvQNV=vLjVTbO!VvZv&e0H4|&_0ZMsp*zl#IZXA2&pj91bHjUg
zbjS~itvP}jgAWW~7#AUJXm46NB)<k9IdRX>vy=DgcZap;jc{NtIayR9tZL~(73DWK
zhEnOX<)S>v7_=rL&&EA4xrYZXcPFZrOx}?Say5J0;@S=-T0lzx9T1rb36u>30n^AD
zRuLL>!DqHX>=bF6l1n#fC&Nvfln^u?)a`aRY85ZU=;fF{VF&vhiuy<vIW$`7LWP(v
z%*Mf`HpL5D8s%)W^ZRedL;cP545Mnk@WIbr%*LFMvx%ng%`VBaA$qb{7I6(TD9qn(
zxWw>rs+m}{a3U~=-Jn|7qT#x5LQlX8&RnUXw(iNzh#};M2!<mc1KboEB|WfM#fzZa
z06}W)OI*x2!4%m&vR*pfliluqDfsX}$t8m>ERqxX&EDZ1T|hAh;>Qk+@^mFg^td3Q
zxX&f;`BLeylnG_zpWp`B;wz1IJc_KE;LWokg!1PV1R=-jT|DsWq>dpCG3ANNEKkTk
zi>2C5S-EhMTk}iP2i9p-tZzk#NZ!lqR+0tm!}j196dPABJ2r`Xb_MrTSEab7Hahv`
zb(phUb5lYl?<8!Jm$j-PzvZL^l0wgAJQ68N8DeNSWr!h6!Q<t-i?@^hD_+IS8pqeB
zN=%@xhi>Qx;6p3AD5M+MzU3|t8}ei1!z2f};AEr;UpQ3M-_$;J^OmO!77naAYhZ%+
zak4`ZXN+62&iV3Ke=0Wx`4R}Dz>v+%ol!5k)&*;DSSeyNT;M!zJahsZb}6%<kVFio
z3L*wRbG4~bI+$o$+XxF0`KYyMO)9xm18u8u;l_gA@H-_?7vnJV@Qy)0rE0S7z*pG;
zpp*`7S|VE|!W%|WIRpk7b8mYVYd2a3OeBOKc46ebR<ur{8CnBc@Jfl+=-~X=rp646
z)M3M%^0n`Sg25o$EmCB=yrLb>%z(DYaRnc2a%6_AO^yP&w9Bov1_>Ljec5_#FgeoG
zWtzC{e-}RX8tAxXZ3Hq`iJY%#(PE)eH(z^e?-2|AeN^z)2Oldt@_1d|A35)2fRu6q
z%rH=JnLE26TC}{po-J6>5QfUmvxTQ<sX=3Dxw)4rDeKE}d+($WAPp3|e<g&(@wAyQ
z=pC}eq;|$M^#LlJ0j#)=`7^vUuOi)ZvD8w0T$1Q8`eUOa7A$fmf;NbYC8IOp9gfua
z7_jk<N(>0W$K57Dmhc5`j+A6qe#z-|RYARLN6RYTZ)@Sh;**HFD4f$7m@SNuGi*bo
zggpma%jeMK>`<SZLr=_(I8Dw$g_$!UsUq*IT#S|O=O8;UV$0EWQYLQtQ*kQP99?ta
zWIqCjNf0K92Mq?(b;ukh(#RaN2)m{jA}|o3p$+?%QFiTi%h62N!!m3k3~Z}9<{?!w
zm-|YY9|0;87D^arX72Rl-XS?Crhh~$P&d^Xe2|0zX21^}u{8VoP*G}Abmfc;B`J*{
zc&aNu4(La3_%g*$YsWdkFrgp6IG`-AtMH~XsrfcDBB8>hhvEcY98zpCcSW%jV#*ny
z!0pJmuUILd0fia>#e_=f7^?8qZ_{V@EN6{a1`it*3~GRd7%Bzch@&&6Jv?YIa(0GF
z4TB&&nleNQ6o{eGyoU96#sQ!`C8!v93;Jdt^q!m&y?9|ODn@7~74s41?@(dM{6Yg2
zUZ50Ek;)03t&g>?+R&e<j8~=Gd+|$D<dH1?5x$ClxIwakKtL93I(?mI6~YiPgR4_|
z-nT{i*!gZgy61Dl8EKRC9ETE*$)V+yUx-6bAU8q|t=ND4$HO=nW#3KT`{`c=@}ndi
z#e49&CDhfC3xybS6K1Sgi<+o9F9Q>$N(*0dn!=0>`3tI0o}q1dDI@2vI;o>IsoWlu
z9bD*Si}Ost5I+a{#zU5%IboQQ>f~!G{5_QI-OPNYZ604PJ-`cmaBTX3Rr&iUBIpxN
zu%9F&fV_M$0fb|#L9(0ZLL0VeIf36+mCCa!GZ8y_|AZF{#&B5{fACi9Rg)Y14rjmy
zX%_F|2EdXb7n}gRVM%Vcn?Q3E8>!zQOSc5n!O<wFZWF73XTSt1PTfLnR-7s}XlRa3
zKDw^05TWv@iH^SMq82MCU!e!;0xhEpw_h(|a%_?cn$!!&c_e$?3d8h5MSTGd4=?73
zXgUOZ_(ynkAOntbxO=4gtTYe20+S?CES^$CaCnnR6|Z8>K8UL-G(x@zE4*%rUPr=C
z_f^%!^Hvq@11D0?&#rhRFjf&KuFwN8xO=Np5;wdj@)5plw8R+3qc>ho#`0xmINZQg
z@uK6sjQBD2k~GF)D#%T5vhjnNu+{lec^X#7F1Z^X*+r#0F0;1x3W~|B5pg7L5L6N6
zsF&c7ym>}<*mlC8q)C3WV5DbH0r@-N;bJ^_sdf*dWeBTP2FbwWzPfN>$pQh5*DBA?
zs&7~?2PN(RWMJ~{XKwxyW-WOa{^}n)*FzMhW-zgQtgIXtLUY^5nVU0H<Lq%xV54Nr
zjn5={Gg`&sD^9Bz39&tM4*_u|$>p1~nTPVg`@b>n%nu$eTve`h&i8R_Pwk0^{*7&Q
zw8~&O9)JALKbrd1&pu~S)l~PP=_w|}7Ed8kxA=Xk8pnV`G2jQLGH^dN-yta?FCrKW
zZ#!-#$<&iF6<QydVi*w5*EwvW9#D?@C>gpAN)-<Sw?hMFW;sl6{p8u)6);8#Sk*YF
zGpSxyt6)erCv+kQI-^U>MTjN(ws{_aM^c<UhnXZFr6b!AF^?oe8?JIrMH`gq^|}Jk
z;N2^)p57W3fdfOfJTNic`ClW%A5tkmT~poygvhi6Bi=<e+|3I$H(k&+(i%|&{Lo3*
z82|zGsy{=8XUso6eORTvtb&at?w6x_`Y@wl<}}lr7zoSrkk*jRA;|(}C@`m;f|LDc
zIqppJ8lxPg!h#T)T{Z>$R9L!1Q{jS@MRH5#ZQrs{#z!|S1n<Hai49~9-cAe{+}Kwz
z8Fo>`iUBUk>T)JL0r9w{;Pa*tmK}XC5DS+XYeXa{oQW!3LJ6Zwj<yGE!!FT8)+RTo
zhjwp+oXI@-5Ay~`GBh_qdmJ>+gL$wMA$T8lkIYr?V&pSX`HgjZyF~L6bV`q)!Py%1
z%9G%k%9{X99*aw+44r$;ED6*JPgweTqSd>jxE|+>XS5H<vKZp$F#yDkYHt2xkr_re
z>!nSg6_b1V>I!C#8#?IjJDJyj5|`?rD}~WP#m?yC&hR)#?XrV8G2P8FNUvf9-o?lu
zgMCGTJJW)VCVwi0lP951ZCYb2VoVwSId0rCF=UC5`d6^Tq|aB^J6kmI;inv)ST@~~
zv@Xr@`1RC1Sa9+}?|{u?bpRI!i9sOvn*u*HyNm0~W<I8p*3U)d)Ul?$M5)y4r7pzZ
zfd?6;*cvbeuKmVikO1IAW~h?-H9ZC=%VQ;%63d$~E0#ZCNZ>-QoRz&iW+jb%zz|5~
z9=p8bZi?Srg!e1MBXs=0r<lm-^M*bD5Q32q{OH5+ko};Lhgq5Fcg0OKY2wU7?xJSR
z`#=}iDz+m7mRd9Np#8^|PX0Rt<blsRaaNBY#wYk~Ea94+S^JZ$oUCFZWXzf_Y-CKK
zNvzFaVGpPQB*kH4607n#)JA*)y%Aw#>n0}!YcAv&SwL54aLZZ{nj~2$Wx~i7xQOuQ
zByV9b)-{OO4Hs2~le4dm{?{iNwM30CG{Y)73)wST{iYntBfBO!)51K|)lH61<T;2C
zpAeA<?cSVV95Z#h6CgQTjEIzKlHz@gQ`Ob3;_u3U0{Q~G;oM!nU+4i!Ot1pS^l=>m
z!C{xUIv<0OB$wVrip(apOk)K<Zqflg7};fl!_-Oi*)PS#0#woVw;PW*x-ooqNl2`K
z65ix7!1ja8upF==f0P8i!e)APqYW8H(=1Pq8sA>q+&G|wewi#$CnlJbjNpuFj?1v6
z(HxC|5Zqx}?-j5FiE%L=tq=$-NEX`9+#PwP7(ZiAdnC0ZzReFt2U`PQ)J<*InxSDc
zQaKKmf5ne%X(X6GXWXJ@j6eKXl|%lsn1<U3vIDPII%gwDx_W;!&=rC0$xHs_hY35H
z0cZ2jcT2TtxLgB`GVD%8uW%ug{A`K%e8Lv+2BKU#U~pEgrWC1UexCC;<suY|_Ma2k
zS8Hbkiv@~V>BI_{v5lu3z^jlLF$}?@c;1aaNtK<2eVY-XD`EC<3PTm94WUCNCv*3r
zWZ(@37W!fjSK7uTtd4;yS(%jt+5O9E1=<k-H+-PX`7R}p0B*oHe)w*VnQ3>)-?XTP
zWm<E5qJjWeMq~VeyFeK<Nwyb}ZCL~!$BMkN(9((;cKXa$SgH~p#-zl%)bN90#!nCo
zMcj6p0>J=JpaoZ)2$y14%BbwasMLTp#x`N!B&`oNK9hk7=z$VoC3ZPG&Dw+3dXJ|K
z3XKI5lig2iMvD_63qx0-2HwycY-eC99kD_A_aoici#)8Fxe*Ja@KiOtW-4<MIEEJ$
z{3TH_-9dvJe~j$gBmV*Oao5#6AVU>Y;rG&PHSUx{VRMaO8Y0`%%6f4JA$#T<x;999
z1^nX3h@rwB8JC(&So%T}h`?cJc(?qVQyOir=dZU6yf+pC(Gb7OWi1%M*dzP%8_0jT
zmj!IV81G~zS{pRiPyj>-6HoO(3HU|A?^54amNRvgv1t=jG=!la8l#Z<7k4mjLH#2_
zOk%WxHm&a707QnBDH|9nD<Ap(4<m)mHNz(<`S0k9F#YPWkA_(?G_#o_n{uM;?eHoE
zD;znPSi%{9BW>PfpK!z<d{toS)|Ijv(k%@<)utobOn&~vi=ou_r~Yoo`@d^;@pTdu
zWjU(e=`e!fE~Xrm|00Y44MJa?p(<)!L|Q|&ZZ;u}8co1@hegBK_NyEU8aVgUJZ;9I
zB7#Oh3bu3oNf`wg7uNEz8fQKhN|DaMcPv+%PVKmRilGdeML!=Oy19*0toBc;v4p4{
zS|GV#z5v`n-P;F0>DIL`KSs&(2Cl?KL!bl(Aex%mD?$X^!dzCS!hpbekymFz`6qYi
zM3$B=K}ptQ4;dKAom37K(Bal-ZVzXA-i{M^U|pW$|HP}dC_ZuK2t5`9GM9?}3G+*@
z6HG0r=Gka*w@Ykz8SnwH;OIJ{=^9|vwDV^!dCw9t|78`_vD``FLYXrWEPj!M_D}2^
z>m;h`Wi`SI_4z8I?u;>6`77!&+7Aa&fpb;eDVMCcr2u<EwgWWc4c<D!?JWsTR!~Tk
zeP)|k5CUDZBlH<bV9lQY8zTOc)H`<s-M?>fvyvAu_$<-juaN1lr4@$+`>e_-?p+uQ
zG~<B&zo|=9h}y1G3H$nor7uYnqoAmOprsbrv|KrIV8qQL#*E#MR}E;CX|vNi-YGw)
zcQ4td(l02bv^8CoY`D_oOMXG0G852zRKyyt8-A}D0>JW2(Afv3s<V%qb)b^gizve$
zqqNZoI1T(#kFts!e^zj@7N?;M=ThShWj9*eZmfxZl_g!b4O4Aw-K+eN9dj^&0CE-;
z(Q?)yWv{`hJ&g9h<ufLt7XlLq;6@v?eU2fpdFER`yLD?`8AFDy$N5S_`%6R_eov2<
zfv6o8;s`E?eYw-o^>)kxsue{r^RZ%e{juYl6hS9c#mnaG&tFW$05X2T+H<SQ(+9`<
zW1JdC&MT$KMcH)udDLw@PHUfui2#_SOHSnL83=_@*Ik31I#~Y}X%1@k0qf6!ZGdTa
zw}KI>@CPgp#q(Ppx6vf80iDlpM*N582Ay6qK+PGlfLI{esc+tPsf0_cv2a(IS5RBm
zymLYZ1VtZIxFL^q|0|_K>$<IzE4rX6?>_(NGm}z4fZ8!7Ovvd`9rq@wFJF+ngQ{Px
zeMK>R|4}Pm{#5co9NY;5r8Q+A(wkTFA`Tfe=d@_1+IYx&0Gu%Z66mx5%C|C<9NhVG
zw>Ev-+*~7kLpa?2e?RyJC(j`UQ218r3@zr`=z>2B3nrUEF#DDph<H-mnm9bnc+(k%
zb$E$yw5xatA>5MAZrdieJ<Tt1<ICuTJKzdko3M%%*htX@7#iCGBSBt(@BRB#*7JP9
zGleuevgW)CE#&t+qD-a6npVKnX<!AGWL31dIpYT#KPEcJMo9+1Le#Ed7GW`f^?DKN
z6o)T`)A+>4=z#unM@clmIZ*fC3k@ruc{5L~P~(4X0OL`-KiLwG-xUNOhWY(!E5!$3
zHCPPIfJD!Z`1d9!s_MeidKn#W;5om%rZIG7=lHZ_?3$?j0@(;<<tN4fqR`U~1(ETO
z3L-Y7yw9f*lxd2*Q<5bPT;yroP8%QGK}B=!h&L1N;d{Si6fT)*-{hbu!$*X|Yx$yf
z*8Q!!A7GAX%{`_ik=&l{&9H2Vblf+ercC0Q`s9)#3Bzp=bxM>zS|dSCx`1x4CsE36
zeDGEK*2Q%P_vV$^kwcf0v9S_2oMdc}q_z~iChuLBC$m7<BKO}Y_g|nQHcH`}F-U{A
z8Dy2)q;(M{zb>ZE>penH2IoH<<zkvRWm*|}Ma*3dJ6gZmryV2^e1-phe|P2Yy?(na
zlR>ce3+^(B0LAa&#)8DGhi<2;&q;aP5FlE;N=vFp^l0(qeSxAcP5(b`cvvt|&#u<t
z?g9em3(n9|nalv=^u_?X&$61YcH7AKP{Hkh`xie<JfWTkwY_0Q&7aCWMcb_8W$-Hx
z<s3dRqUd0{DXAu2SsZG5<Q6wTyoDSB-d>ucM|5A^7sy)E_$3SiG!Uhyznj`GbPc`w
zPIYNgg@M->ly~iL002iawYz@)w_N{Lt5jskU6Nk=RK7UBR6(kb&VSxIKY*a8(whgE
zTdH|ar5U3NHa;INq%&F<Crb@8U!V;QF?2Wl<4R2nY1;u)x59j$O4fyY8}{czu``dO
z+ojW0zYGoK7Gmj}F(3f=P2LQr*D>uVVErQXl&naBTRp2t;<hm<uvC-95q8kVaR8+b
zoCEm9f>1J*hR$!|wV!TiZHiAq<3DRJ1w#C{VRD%>$8%Yl|IJw8omSQA$$agK7FB=V
z{SM2oYb->NCFw2Zm}&P|crV1u-9RD!0mFy6h6oBWu`NHJ@}dtv@SECi{<@B3_a2H>
zc9p#U0eumGqQ=4Y2K!;Cb^h2u@<4&eRJv!xT3HS80uU^I(+uYV@}q`@V%s?SE{70*
z+yad%JZb!#*x9<g+PiO%U#9UQfMPEXLr&=nnK~#;3flsY>cJJ(-Umh--&m*L*tovC
zA-c}*Y-{X-hnB8Dz<2l<HKphxMWDgd+p+XHdl&njh$Bb34v4l}a6n&0$EEy+*2@8-
z6p`pjO9%q!j2~`*AtaJ=S`LI>DeGpOxAxYcYbUlqxi#3sb>CfJGk<HzXAX-fSFf6e
zpHEOAVl7==+g*|jp{W&(#<5$`F5#WKNo!sTLi<2LL^dDbVRl|8!+zB{(>}R+wCZ(j
zO;Gw3fx{OoJdM0>dW8LUu9>Dl<FXp@{cs4EuKK|@^!gI(()BvhOii1{KMKWA{fjl6
zs+MKo%zO_5C6Q9MTJilGN8IcV+iu91wV(SrT`t33#2TUg2v<^paB$bOmmLfWpGI$8
zbzZgO;{J+op$!!o*zdcnnq7L7Zrglbb-rhxt72HY`mpT$46#qi_lvDz>2vt~F%>2w
zzx<$g$K=x6=#Mep0)BHvg~SZ5aN%%jXVRwvEDSJAEn1%zwMMsVf(Ot%2Wo6{HR%eM
z{(J>%FMY<SJzYC^@Eio6xIh=Xwqo!bYSqe}8i+q#S1=>Oy}}3FzDxD|!}z-}9{SCq
zQt$6a6or<rcV9#?Ll+++!EAAXmNP|gdI@-u@voigeN&UWwX*Uw>+5TH@xv*0%*A)p
zPkp*uCs^eFMR@t5*yRmm3)OaYY=!(a+<FW)tIE1o3*WdPp{+g)=L-OQw$E%hvH?o}
zq>J?2?_2r2P0vnTl#=fVZNAWHO?>7<H!EnYHLDZ(ObgX^T|`++8OD`S*duzWT=V5A
zVwvf&w^>%-NwGuWoy!Irw{y9u@j4sDmG)b;c7}`|h|EW^(K+77hJy*&^=jE8gbJO3
zuR!zu{3?#F^AB+}7~Q;yFTGs)G8AH@GracJBBo$VEv_TNOjFi~jOMFS%-vLl`t~xr
zsr`Tp2U29teWQ0@8<8nTwWzA)zM;O2sH?HlS6x`pD7sniE~xCAHXWI#I9uK*`_t14
z>D=qCRaMHBr><>$zpMs_ZSu>SzNt<%^`n?^>opBPk+)YnmCf&!+(L}8`}`gF{#@jY
zIq`5}hRQatK9wops2jOC13sl5D(alh7;6Xbjg95AMR4QDUg~65`_p3X>`%72)~dqp
zp>TZMka<~k#zcn-%K>*K>E>u|Rmtf4OKr~%o94D|J)GL{68%1}437*P$otbs&|HI(
zb)*>}z+{h!@>)46K`1SK7Mq^PY~s-c>~Om#eI`S?N4@6`Z>VEF@7X)0-}<PZ+wZ3q
z;~LZXC)dbSqa(#_I;XnjQk&5Y)0u5@7ac4sjdY&Xl?oTC?mxD^O$KN0`R>H$$o7pZ
zE=U@fi5h}ixg2k=Ptb0ibGkB=^m6?2p6J3cb>*)<u15Gzzp43dnAD4omtp7~RjZ={
zpU*@2o>W5~-h3fRWz-{cDRC+2&DieRgw$l59_vPJIwYcQd9!|`If`T_pw!ISH>*TS
zhl&r6mg?oU9arITbp`!?QXRxvWpa^pvN2>jGpd$npoZC+T$0O6Y4pzTmEwyJ?Garf
zuNx`u5_pJd*HO(kv)YW-&d|H$?yxHca?^gN(PrrO@>a8xIOdI(>qUB>wij)x?hW>H
zmcUyoCS6=@MY}?$P*uEXVP2VKTTZyGMVzWxx8jP+5BIJ(Gc~8B-4z;(`^IY}b1WzB
znyS^cRkzFkn%R!j-6J(E*2|Ise=?zmO;d+0wad&CSKZQgt*64fDO+>i;mw@<VAH!d
z`DzNfcsM7?=D~xi=`g)l>KJFOQO(!tpC=?vZ`aTamreb?!Nhaj?7227GgDj@_Iy}F
zv=pZ&cvD<i+rZVj%~@g<)!4}>S(tQl4ZPI#;O1DSTQ5ZwSM=<frzZU#{@4-GcXiE$
za+rqZRc}y&IP_e~7`GktQkCXsd~ILTSnZC|f)=mb;Rx`EA~<5PF)PU#DqV5=9!Il7
z+89zJT-#`Tx}|I8xbf<s80~5C;VbuSds;G^N}J59E8g1$VW#C-7xg(DN>-Aak~P%~
zZ*HxlpFdsSXf@6z6PlSP6j097z8~4xv!j+*O<Da8ZmO>v9h^@6)<p9#&uyQ1kNEW%
zJ$2989h7hPIQx+d$?ZF*(<<(JgD-aYYR3Si_<`TlfAiN%F1s?@nlq4^Nb%cF4sDSZ
zNCVF8-e_u*Mr<w_2U4*%ST?g74@_%-WM9uAn|DCCWr<aWFQ^A<M9xbrIu83pjo)2z
zIe&dFFL^t&E{b<KTAbicjG-8#t`qXfxUQ^LMY%zzGti_p5`*?8RK~`vDelh(;x^Q`
zK(?`{op5)--XI}+2kn!o`~3W!R{XY>nA@{~9UmWri`Ew>L<rWykJU}vw3So9qFz*m
zTH6GpCFbHPO+r|WR+`vC_v{;=!-=*YS?c7ikIz!;bU20MB2Z>tO=llCn$0;Zrl={c
z0*mb9irM;)^zTvEKF#H7SgA}uUK!OHk=1pCePkpso5bmZ9M4i#{4n3`$8FVLWH$nt
zKrN9NvMk1g=k1zg3b>bV#bW#L4f{uM-e&0jn0eZ60Ji#6m(}8r4qR1}D$;}#t9wq$
z19LK#qFi5MML5h1nY=zlHnrq{_GxgCpAuv37@D_8wbfkn&KK0}rj}T3YNq5gDAT8a
zCy$z!EvuT|Ugqs8$>PsjWfUp_%fQGLrTQi-!VJqbyjHcF=rynUi{XD5n7AX1U8O+H
zOUrC571&tO1v^r0V`HGi;@3G_!Rk}LxRP?1*(g?Co_pPsT6bbxiK0`4&Hy)S+i_@I
ztW0Z7hlZbnCi}{CL-FBMcXLfT(8u2VzBYE_lJv}tyKbe&!hjDgyCog@G(5<ch{i+j
zLz6B422I|ht>Lf#7`dnK$D^;l&(||0gMssy5nF4ZOkAL=c81ch+ATU*XGJ1#Rd!a_
z_|=w|x51No;FNq$C|JArLcaCfO1kF$STXrird!sDA<HyK-n%m#zqv#GaiqJGtDw-*
zn<)imWoh%k35}lis|`!-CTQA?CofRMNZ|p6TWx%F{7`OE?fg#EXKv5HHZNIgR&YkS
z7py7jktMy{BwM|iE-K|J1XwZ@6ecvctTQQAn@c#ABSm1V`;LeW(^&6)664vt<s$Q-
zF^j5g1;$A7nhV#p(`4y%RG%FLAOg)qDky9<RUXX@sd*_9u8?K9P_7+QfODiTf1)F_
zskY{yQqMMYHhvwHpGjP6h`p02&Uw2^xu;<D2{GQ7tZ|}ibmMvOUS>?VXo|UERR@1+
zj!gqyByWoAlXA7+P9<CJZS6StCSCDk+Tm^Letg_}tm4Mb9bLTuFX##kH@aXCt8Xt&
zqwA1eZ$j?rZ_j}5Ip7PK@}h}x42b)C$4k?AIt2JB=RqwN<)-zu_}<w>k0pXuvX$2O
z9zD6sO`zmF`Q~P0EX?2~YN>9(G-B*luwb4uU0*{Xw*zA>TKtv&K<HjHshcMS*;KoC
z{hU}r1EaAfKTcYJ;nW20zHRa7K$@l+PlV%PiZ-N6q)c7kB!;4r)w&HdxH2umi-?WL
zfwuNLO#(U*bzxX8f&9ai;lj^{uj{v9>8D}o*@6nz>jo2Ae8I9xq{hE$=Yr(^{a6cK
z6AcHCC1Xm{5;+yM#WrHZlfQ_5*iQbmhP)^frVg53Yk5sy7b%k%=TG;uM!)p^#;w%N
zgtn!_+MF0>Dm{r?Mapu=-8Vg-$Fmo|U#DIeo84s&62{St{nV7=p?ed-P*`1V@z%Tr
zXvD|rR}xlZt=B@P)M}bK%~uyxz4M>0tkd?|V)aIvNquqH&m_u`-pbo?`)VUeG4Y|*
z6=k9382PTAo%=M)Q5jlmR8!>h3vcZ|>l&tOXq1~8=!_uyk<!yxd8P4L%Zm)|RQXbo
z3S}%imaFnL?)j7H1i0o=xvn4;AamO&&p0NmMYT0nu2yyTugmQogKk<eGX~~zxk6}1
zUSNx(v%PA+Ix9b+Eqsbl8q<~H!CqV6zd`nMx7w=9mszYt)1Xvhlo=Crxu*TUw5q|W
z4$Cl6AGz_I?A?+hU#hQF_ls!;f*E8+lV`5=FjT}M`|7G9SwPkWbz~0)R85$02DPkh
zHC!btqctisiNqGF*fm$0Y3-h(5w~vtl0L9XcbD4aC>RK5mz&>RMG0DBgTtUbbM2d`
z#=91eI))4jP4&qE*6*FCEtFD-vRZA_)eIbUmKtdpW1;x7XNZtOcdh$1pePvvTkW~0
z;5|Lv(2?4ynycqur&_}=nrp38Pwy|Rs;^0ps_jaTT9HoU@D>Uf!|Bz5bj*S$8!?Zs
z+kZ_>bmp#GT|l%Zeah@2eQnRhJlvSS`DOBVOX+4%M`9N}G!M0_o(+}MPIKL?Xh%OJ
zGk(*BN%d@nUZ-c|cK2!gV`46qfPq$G)P{}^(KvC2^NOxd=*6tLZI2}uA5+k?<?+ek
z5w5-I0*qJl*OiIp==}U0q$3kB;D^*1pP%(ujkUcY_C4HuhSPjbAXf=?<&~zi6xJC^
zC0ZAIT8iN8D&^OkRg2%F%MR6mA9UV<onp?K!14$z+5Fqs*=T(mYVJ(+3T<gqMWv|$
z2Ba=rU1n^RI?GcCdjyx%DNGd-0~h|Zekr3zHR>9hY?i(iR?55(M3wT|Bh6{^))Qy-
zsCcLLJ*++>VxQzEP9JtH&@PAF_MfNfs!~U}8oMZ>KaF83s&W0nUbW8C+g07=)X`4t
zUKHd9N?X^xS#7Ihdds4N&R3!_(^zwa7lgKgB7L|>$M7th1GgOi!Q8ipuROY7$H6Eq
z=u334v!8dh(nNoO81|`1aCaN0=;ysP@8pNion11thQ?=unggm|i0S8j2XlY#KqN+s
z%O)!DfGUuwsm(^U8`|V*xcw<Uu-H2LWJQsj@M9j?GcE%GsZ<;FKVE4bW2RD~fCYU~
z25u0rD6808Gc59}oTYg{sy`(s=E6al3~QmBwr1m4YjQL)o3scr3QI~OSCp=T%r=q7
z=C`+=_e(gmIX|Wm`!S8>{CwmspS0v?KN>;)(TvoNT4p+%RD?}@FsM^&n7g37{bO&p
zu80@RZ=(37$FJKTYYG4H-D4Z@R%idV_|JCVi3vNYzVZ-*5Q0p%=ZFz5QaJKOQd1pT
zhze~kW*RY|vu%3lM$wK?o8;q7Ie4a(I5s?!%+&2#`Memu9_~3XAbYl1afqyo-p*UV
z7m2F#Iq!y+x^116)zB0b$rVBus<tb1HR2BaE=R5AMK!VvMsbQiPQ9aN1aPQKYdJ#A
zb@eeusaUiuO1bgLvKeN~vajiKi$oKL*5!;j2`C+yq*J}TF%dRvra*V7)U+YBVsg*}
zt*!Z<$cNwPBv;wDA&_(2#3b}&q>y5~R<5g7ncO8(gM7S?8D+E}^g2sAkb~HyT?vs-
zDn7EiPxRKB(wY-2b<4w%UgY2y`kE@IFXzR-3t_szG$jU^hg#SCHvKKj^05gD2Mkk)
z2t&e^Qj$ehs<XodT9(3v<;m5{-k8!dG<<1UPuKpIIF*(!HOTzYNTDbw?ankG!Gd#p
z_MIEv$WWqsC_00lWi9MHlrO6pGF#cTxXcR2_eK+hRKnSSj=HzFZLuGC5G7QOX<Cv4
z`BXh}f~clp7mwChgiXtL%Cm~ml@nGA8g5821~oVA8rqkBG00|$p6b#{A=1g(hq44z
zeWQX2lznD>Qr&5+neQclSCVhUGqt`)v3grZMRSE&Dse{D(?+#8vs`82MoY@digWcW
zUXdzX&<9b4CREbj4!}xmW=fe-gml8Hcp_Tye8IJ`@LfOu4R!@9ko!OFx058VtK%c<
z=Z^J>#aqMeB!x_<MHN;;bw$Y#8vA@eRWQ6wbI^gI<C~Q{P{Bm$REtrN{ft$vlTmX{
z(+lcn*euoglnqz5C713pwRdi_6;=N?wO^oEQ2x$EJ=OpzD#jPJGxBI%v@)our4ReE
zS{YUL?j1bEj9NE4dHKPVRo}a1^vlrFV>MLQ0jeuDW*&+CvAYac#mTcK+a20+YNPe7
zor)6ySv06-O*U3W$rVq+B(>UMVCgak95LxQXr{}#cII+N*Py)Ak5qN^Ck-zALK5|1
zNd(FR;|1P$dZTS9P-)CEsS8g9ReIc<yp#PzUWsvqwhf%)a=+7%CJp(v6BQKY)_vZc
zwqQn!wX`j68WJwJ9)t8vJHV;%$CVrRHtxTFU7F7aJn}%Zm?GXK3=EPkqR7W90@)<X
zbK6pVSk-*oNHMZ#yh{f*?i=apj*SK6k&7Xbt-F?*AiQU5t7^s>FUtCx%@LGv3H{6I
zLyaS#Wq~a8rSA3wsTS|SiURV{CIw(JN}cK))Ua_1&C!h<@n%RAtS_s09y%A4X_@Hc
z)6#~<8$%m=<bw`d=wO5jcM2|+*g5{iQdO>+l<QplLzE|`D>~DKhL>1hVWKcmS86X}
zLz2|aWK)b@*i28|-_owsaanOF(XgKXRnmUpJpI7I4E52c8-D$dco?0te|y`X?S9M+
zBIKK}y0g4WpKpj>rzZSG>QYFoojGtrTM`Hzr^=9EWgIq8<2=)CM^u|VCew0a=iF$K
zR8d!{#fHcTSf$9=c$}sr&je3J^fV8fllq{rJK>RzCu(Uw-JL7_MNOLXlJ3r2ti|Ru
zBg&2tGp_m-)(5BFP6tzRuZFS2dRJVI4#pfEBrs3-K4XYvIhwgBCgt)6OqJ2e)J;S!
zZGOmX0`cZ&i<ZlylX+H1rdN;o@NUq&;A|Pare>v8pTaYeT5FJ6svEhPE)ry^eN%xK
z)R~UbPi3g+K(z}a-E8{Ol4xZ932H@iw4I|P*KkbfY^C#d6&k(Gl$U}7K*;H5tbyr#
z*mL8{4(B)5)-9mC)K55P*?o>x1=hK`_UAu(6`6Cj0*phk_USXu0Kdpp8<u7>8t=@M
zOZ5!L(QM|F^t79II=1G3jUtCky1nPM+VJ1K)F=Z6VKhZU3K2l2e)D4yUP~s9qm5JV
zfWuND&pFpo!Jcz}H#BUkGfD*EajG6<bvhSPznBZuIs<h0z4h`y5;h>TUrVent#}Rt
z1-%|EZa}p|vD0|GZ>fNfXx|l_9;#FSEPm2k=y_y!X;G~ZuU*a)Ws;GoYig(0#Y?HC
z*7e3X`C+p4u=iA=O>q_4um3NG^lg7XcH6I)lCX9AZcOmf58U8A#gz8trqE4jTgUr2
z#-~oKPc=uzHkVd|j-!5Jvl-xFfpU6}0xaR{>NGuA%$=G8N<oF}O!z84+(QXgG9Jv`
z8>O6%^YQ~jH?K@M_6R|&<7gn)_b$a6PpIg`IaQ%XIw^4t<kc51k^j>aUTSR8lJo#U
zS1RbCob;K=%;|6myaMaTOz<9u)ftYW6<eKU-nXdPxUE<x$ix~&^Xy6F+U!-BxzoFD
z0H}NivKQo&i~Hw$mdK{G8;++{i<=M}!T00}&ho(sVf0ttMQby0CM{L4##-H+s+xAA
zh$unD=VWYn7n9ebAyPA&oU5r7+p2>X;Duae-pFftvMD*?Q1@((=+9!)YI%H|ruKy)
zZH(}CVHPSaLxHT1wD5^H*x%*)5OX=Cltu;=3am|*BrSrn+*9-qKXh)#0X~o8UH$^%
zY{mu8Ju^l5QV1hfBuYn;3bN^5<;5SmMke(qc1I<tH8M`8C5np{sYG0T(bdlKk>vv;
zoh8%3buV}%FG>0LP{DMGluQ-%9_U@B!&%n}y~5Pq<e;-Tth;2GWxUYdj6$N)Rb81v
zvLub`T^Hj_6=-@<QNmhR$Ed&IWIq08Ve6xJ#zV$3Ln^@JH9-L;8k#2Ri%$5L|Bm5V
z`8U7(%irCP+&aQonvHQd9z(hj>8tqiMJOe{%jKpENkmv|3Xa8mGb7K%E~n*9vZ9i%
z>1^qeaalqQ=*Kq5-K@n5iOKSq5xPQ4`$naTNx^h^9U7g<HG%jIgkG8H7Q{w&6eXG~
z(Rk}@dRALR^Gr&CJx^IL-KiOy<^{G(7F*q^iQlYc^t>y1W%aB1tkR&6KsNRskfDJS
zSnSGY)<cu{RNBzn_bz@8$e}n{(5m2TREvtrDo+V-Jqs}-|BweQp0=vW%965EDpl4X
zbM2t^IA@cVBU3*o!V7u-!%D*%o2ra1CI%|*xdoPpNw{i}4zEy=a(fCfxizO)B%R8Z
zng-x?PL-89NmY^iZH?%#7-?=NRYk8|Uq#W0g_>5Itfy2j8QjC$B<h-%z1(eH!w_9!
zJ=*A<&*2@culGHp1n(XHgSHeuhZFCs$=VW;mwOHvEUWh5k5(Psl4fzfQz2YPCqpkm
z31xxA^zpCKy_y&(3uDirgm_ox@m5i^ss^qe<4I~7dJ=Zu$c~gLGMRr2=iG#R*u9<f
znlt`nFG^d%#bA8Q-K;bNHN}rZ!&Yu4j~0l1!rhoU(5J?SzzE)1-3N}Ti5xOcgfXq6
zp~yP=DR;dQ|LEvosW&y^7(TkfwJ<X^Qaye3Rkf5&sb5%$=HZ=KjlK2PCkDu8{mn1G
z^}GA!B37nn&|YXEC70?^Dn-kgxsf<ix4}uEorvc-pJD0=u8+>v!3{*PNr*({V;p80
zCx?%+IuX0QN~7?aK8zBYnDQlfi8bA-4tBa$YDRXXrkkpO%h^vuG`+wPRM3=an=jH*
z&%&8#sq0<llhCtb=Z-b<i5kNA#vF8hM4pOjr2FmmKqhHgtxf15FPre`f^iv6p6^d|
zu3$&Y6(FBh=VCz6_)M=TR#jO=P;2-gqKF5LUGlRWLXo!#>X)8(1Jk+L&bOd^tf&J0
zHAh8O-bD?sakXhF6!(fMkX{@TCVM=VIHR?W*^s&j1xU%NO_}_n4DWYAH64?S|9GwZ
z6cxW5%7MW>r?ct^7x1pdC~*!~GBL$u**pe@Q;ReRZcw}NT`XVw44PbzQ8Hd*NqV`4
z!bSHuTTp@rEkl?1{6J`<Y6Vjxu7+adt06E-Qf_)2sUE_>yKS*#5CqZKm!3+6V%axi
zl1FRXTeX~V&(@BQ>NIfXDQ*P=8AAn4>)EMuCF3I&ytMEqy+o=?IWmN_GawYlrjDv8
zi`uAVORNyC!M<=k%f@2)R%yIDWz?EQ2tP-?(P5EMigeS?!jp_MDonNu^HD#H;q`}l
z`!OA1dunR^Z^ypAVeImTy1ehcc<-mjZQRA7_gb--xp>sZT_<QvbgIXfYv;%uda*w$
zh&j|Nw_{7-8XlTqF|0J+dTV)oO(V<>DMSSzwT5n9AqQha&C~RbaFi`AS$CH9%H3O2
zRgcx-wbJg>bU(D2X(N>-K7}2xf=5U_{So~Q8ql^56ELr=<PAPYE=5@&6Tm21J?QRD
z28(DEbT-%iltS5PUWC3Fxkt*U+SP>i8YY;XYQ%9mx7?hWi3$B>>t*S%H76jWv!-k6
zl!=L?_F3aFlIWseGBw;d%-rz`8;{v;6&w_HXwxotF0~p|;hCgWqS@y-4g(NBQdqe9
zE+OqY&~+|T$-lxe#3TDuV5d9DVskkP&&jL4Nf_d#2j8u+fic>I&!9f(urXNKJzH(i
z%k-HKob?bTGuP9yR8#lB=&b!vX__lhCCVpzZ*S=WKFw+~)`g^}Gy{_)Q;-DTP#<e^
z@2w8VQehhE^^DyiI*eK3B*^F(f2n>^!fBj%w3xxLy$qlBq4@ACW<p9EO_M>w@1|xY
zkIz2K2@6!3(YR9+<a|ETIDN(eX(8)N&`T2=%o-gBri8cu3d%}asf#lTXC-4&P5LMF
zr)@-C>s$wwQJ9h$hL4IO;ufZ5ROGid43FYk;P<^Y6pugh+gtu@_rH`dGfs7HVoubg
zW<qGfgb+PohBYB|BvK!oWeVpr>uv%2Ky{F?bR+x^_k2eVWUv`8z*G#g-01_VfUV&u
z8A<a6Lsy`P6rPeCG`0mhNH@yWkTs5DZyb-OELunCgY5F^IT(IOw}w0_vc7ibh2ds5
zike4bDNWOU{B&v7Lo%n`82F(a8w1mhoJU?yoYA>><~R86!c%3ZTenduVnw(Z6+H@S
zwA4QC1=|ZS0v`3#W#PPHlA?;tzTCanO8i)#k@z_vS3z1wgw2a8*RBvtE9rW)711+I
zpl$WYog<((-vpnlQzp_PRTn17ch_53E1O-CtE0vAMzlP08q}XK*j1#3nu*bRIXU2T
zXOjP~SPrU`f%HFu<i+g$xZnjJZ1}zVV4k%}F`rD6E9x#=`5&IAp^}QqPp}9$TKmYz
zBNWeY5_elUD4N3OC9dc#a@8q6If5~n5UyUv;FC4O^S{MKm=DwjN=h#;Q{Z!|ySZ;)
zQI0u9b`nL?E~&<n4+SgFn&bt))iw(<T5r+62Xk+RGuLTYw$2;JzcZ4Cz>%G&&$(XI
zDxfS+RzwJ$L)mk^9DT0WV4G5GZLVd+g!0l4(mMP_e;gYN%VnU952OeBherp_@RqgD
zntDsW-dv+R<ic633C#ZOv_I>itzbAyxeN~zuQ(YRR{Cf$A6zZ*htJV}u7ixBbfop0
z=`PAcrRC90s;{Y1F{w1_V0na?SUOP3f;#hEMajpU0Z3sTH88vl0w@lqcyBUxdpRZp
ziv%u2VH4Zf*zK+GwVrg(s62xy_{Q~2Z7Bd%!9)Ck)3%5YjT~=3%C!%!<7l})(v)0!
z>^eQJ54NA|Ue^w1^X@^D!WKbQ6*^tBMUx^)9x*!&mu%jvCgTXz7JX{@L{mSVG0lc#
zxqE|79M24cW0Pv+t!K@msLkDGe~XoQ*&-`%@=^V>f=k5@ORm#FJGc=xii*G$k3I|t
zID6s3$+R3oe(Bj2958HA436DkZfs^ksd$h+ju>|O=*uI(jt)A9jc%T@&m*k|6>suI
zA7k|xm#K);)Z4rC466>`H_Uvi3;*3mI0`T)zDS@*<03Al4k(9KNE%$h6b(IvY_KYk
z5Bb2*!~3HAWgJWLgts~;LdEA<mbfBJ=~nyTyWN}k|2c$wPj%bK$k8}WcE{{fFALku
z_F+EZq0TW5&5}>TPhx&=x2l7%fJ57oPoP0C_BJ)(RZCUBd2%o@@jYI#)V=WhLVo#~
zyJ*fEylJ5JvZ<CxFp2-<Fg{&#4Zr5spHfHQyRNH$-F8WF2#F0iRV56oKL*2+yf3Pc
z`mhq8cRu~<17!H{w>hRp$JcOz6;@k)Ox-4jqkQ>_<z%e5ON}GVe<+JHl>0Ji)w(Pz
zXgJ={Mu?fKljcf>v+%PhO97`foQ28R%=Op|RR<?EwGU}N>Z?VTm5KcUN~E<q%M!qh
zGfTjeu^1n^piZ!kmsW7FgSOeMC#ho`u2M^(0=)9KWZ(^AP^zv%hvV*N|M^uhQBkhr
zsA1qISkhj~#!r&?t^V|Eliu4q2N~gVRbx1*Cph+|m2-`3X%{n`;qYIdR4J;@5Kf8=
zcAr;I#VPQ#kyqZQv+4ApFPHxN*D>>fM3tHQg$tGsS%dt@(M6n#%rF2_PcX098E3R3
z#Dx*9i4U{7$wu19=dh<KCVsMc&K23yDkddcos3!9!^ank7{35KABLd;;day{38>I>
z?T7~+)X<X_Bd?D{pHdRq92e-vr^&dm_A`!jZ>QG{s}?j+GIv3BqUqGyW%A$>t)Fvt
zT}(7gg-$hyNu}(gt_$fin#`KPAWy&$ged(6RuzWn62Qr>F9|q!1wL0QC!=EW5zKs}
zr(g^W_e(y-OCfIffn~L|FBDgjpZ)u@cl~+|MnKN~Hde=bdibD|Q{eMH#r(2p2W>}(
zzV)26uq^{wKFtIGI|p(ToD!4N&Pux5WDVNK5ir{hq059)YBHUQE~uf<xjD<hS5YdN
z-=N(xbEoC)wJxT>@S<5f@j0LrewjplE?q?pW!9}a0nHjp!tCjR!`A@X1;TfJMrr6O
zS!GsDI9F~s<obhX+Gm|=O<3>%tZRwO>6yayrnS?t*NUsf^~~&Y{m7iMW7d8q8O8GQ
zWWv{ma-o@GOUr3z&iV4>Oou;f{4+>rGGb<>alJ`=lO#6xnWO-b^X9Be**eQS*Gz0(
z)Kt{Ec1P{1$C$o0T-&eTIS?EAKvN(lq^TCc`jp`-b+96UX`_h>(rxBir$aCP(A)wA
z6M}2`A1|U7OkNWzg}Y1*SubF!BO@8v02fp5fQsR7c^4cl0lw4Fe7B;%Ns*L&UUMDj
zmRVZ@_)LcAm15!)?{$d#Fvpo#-qaQ9SSiSwIdXiG>3GA=2e7^%aTB6EqI}zfPe5RB
z1eqUdOCC7&QK?3w+=4MHcaR(Zb0ub!A_{Uq5-Z_Q@5OdA44M&0SE41kD#G+z|M~9!
E4}Ybyp8x;=

literal 0
HcmV?d00001

diff --git a/jdk/src/share/demo/java2d/J2DBench/resources/cmm_images/img_icc_small.jpg b/jdk/src/share/demo/java2d/J2DBench/resources/cmm_images/img_icc_small.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..41fb2eaccbafed7d86598d7e7642e197192f402e
GIT binary patch
literal 16258
zcmb`u3p|tk|35BrS4szr5S3GHQp~1ub61$dY!0&xbLe)qN##_T+kJOHEMl0LGu!N7
z<gk((_njh#B(@Qi?#@xtfsS|G|MxZZxj)~>@BjE8evcnr^Lo9m_vCs#53hH+u77U*
z^Ow?Eth1Z5(vl@hlw855(m!97bRuFyBf`TY!Z#g`KNLwl5V0vSA|dgg2TMM<IXdq5
zB6vEx;V|GGN=i$f9SDm}P_|T3ianSZPjGSA<mXS>wCt9WiqZz9)k^D?OhdvF4)62w
z!YTc)AK?8;;CMF%y(%e5Euio9zb^ZKtgHx+NC*QfUV$Sr>~MS{_?CVkRzI3}7>c7o
ztQ8M_C=mYw#ZilK9u$Wz#vH{OBEb=?X#?@vsKvMsibEIUTTuM%?*gIHssq%65h3xL
z62LV>`Tx<6#E4_yXID}>c<5jR^cCtU^i@get*xS0OSDV>tsOe2q_k^JNl7L5-&$y`
zlG4Q-C8hOu{;ipmDJiWvrKEJBBP=QY$l~`?fT;BUmj82G$x%sFW$DtTDyrZ`RaNze
zWviAi10QQvu3WKd-5L#zb!*nG)70Leqp76_Teoig=Jk381{*hS)YLIDF)}pSV7So`
z`X)=jTbKQ?Z1wWxs|~f*X&L_i{`lulrFF}dm6VlKmKZ51uUn$BZplAal{Nz4Q~`k@
z4u8KcWtFAir(C{5Z6#PBS*xVHL`6jz{QTeo!0OZ`$|_1r*Qsi3w%YfDrgz9Pqc|<(
z31;<jV~3{8Fv7?y6YJ3UlPlD;b=K?ZnVN0c3P+&OHamCiwsmyEIJ>yIVSR`svM*?E
zSa?KaR5X>AkeGDj=&@w_skHQr)0tU}{DMMO(YfLhc1<mZ%d6uHgv~9jk_#8xF12@G
zx!Tivt*?JzR4S8?jo+G>y#L_gqsLF4KAWC-{pRib!n^k$K7N9(YYDi{?;nd727d1U
zzOHrPx|9JdOP4{{wM6+SI8@dxRo!g$gT_AZWg&5zM#vM(wH%n$O_x^~TN7TvLgPo&
zv`tX=O<zNorns{IZx?p*f9uNrb7B8p*QC-al_dZ?m32ycl;*?msJD3ZLXy#MM%6qv
zwKs2E)wM7~&(Q-V4TP<Wrt;Wv9Q0E;W^)Fc`h*>GLwLp!kCNt~#>+|Cpj4+vZL|?6
zmhsqcg@xZsA`5j?Mxhj+EccIgbnT2riGov|sap0ll2#84!FbBN?Y737u$8w}KqTWU
z(s$)T316T^#+T1O*p0!~uxmKp{x(N_G9SZ?7&HbG6Fza<!w9S(Yz3=g%Ud68)p`Zj
zA~MWvZuB{UuW&6N8PO)G+vtR+G81E`Hq;_qs|5ecOVv&-<3{mbEuTND)DFYc%dL(t
z@l-wz|C4Bw*sG+vOU(-k53SDx>y+x25GF>}AJ_V8t8$sDd*n#w60GW0t-lZfJF}fY
zWvf;d(Iyt0uOgiAP%emU$~;cE=>g{o^!N-sN`jJDu?5DYbyuY;3EDhuk*h@W1S+G9
zs{UING3#%;3_WTco7$kpgsY>ZpuNFKenn8b*ddL!LeQ?o8j+$$<&{x+9Rqw0N{ZhF
zTF7$$*76c!tD>ZyECF4`qj>C?>%u_?y?AMg>`d@4Q#{#N?M<Q(&Onf0*(J{inG2xR
zp=vDEFf%%;#vbDey2=GzrE7r}e@{S*g$R<C9JIN=rM(OTfZ%|mzVyeCB}5;Ym#RG`
za$;h+T1`a_6XUAt7!|%rZLzKYqr?2Y7_C=Zl`Fsk+|Nor$GM<ij!{lfsOWp?f0}(E
z(OG$khjJl6!=h9XLTKEXv|OupSgXnl@75Y>0AK0jFUXdSqP;f^;UalOJZlo4%|B~_
zkL0!ZtR(S^YIaF1LBmlJiZf%&dMb~#8uP;+ztfz)YJ>JwfcAZAg0DhJJ-@XXYJEtf
zP5t*yp8F4Zk<Av0bytE(p*N*?)I&V_@fcKs5DJQnRuDR*5z%6yyddx*Qhhcx=vwpg
zO}q(w-X=g^WE2-`e3Li;&qNSG)2E@PLxg2vK-0Bqpgx1P)ifWNhyNK5Xl$gQ@?8(*
z?^MQ@%l<+z=nM>a+fYmMS{TM2qXwS=v~F7@EuE3^Z#dM#Tf0{6m=@r0bqf!)?3h-S
z&vC(l>FlKng8qfj-}#>q&~~x<B9z+_{pVizF|9PIu7L7nB=ZR^42=RUq+|&*AIN%X
zR9Xm4qKR48BS;r;1?fT=UdyG3rwux<E%HWr8&ZlXY;cI3Mw}jn($4XPOtgPav-#(4
zj^};d-flqSb*`A?g`Z6<rFc6jAZRE7paKCgFoJRf<Q}pdXHiV6K|6tq^w;OCy@Er%
z#i1XQA?A;kQ8PLiJqiOV24{!XDv+29CPhY{t`g)CqY>e-9<w7OSw?`(R;sv@=L_ty
zR)&Dh_<e+``tV_o!ex8`(Pu5O&s^7fgu8?YWB{3iuJz5jB?AbI76XBS6-1@(QUku?
z3VF+gqdv!l@R_X;*KhwAqNH3=a~!NGjSAdk#5krUg#QIx#_RZTpFg?Y9-!GmMc+ZQ
z`HE&&D2zeh)_4hU4J`1HqM?US=>8|Kg;?6FlBHZcgpcG;2n+E<mlk4#pdNHtqDlJR
zVG%|VgI<5@HsCe*bO$`&nrnfxz=MNaL&<z28<lm-M&&d!#ufujQZc*b0bQc$`#$@@
zZ!2Ucj>W^(ZOr=W*bhW11(BAF5P`bocnL-In_CZvHJzLR46-Z1_~;^q0fjUgwgW&c
zAwY5iN7PYQJW*GI(Fsl{sX8#5V+#{C>!~^g*yw%1cwa%iHiwT$gz2f3sK&chu-4~q
z667hGT!CAN{*w;M0F0U@0EVUE$!}noKwtoq21X5ed(Kuh0F$ESHb<pA1mM4#0*j<w
z%K;7!3O!6LS61|V2BH7sX53!*418}Lzy7vuHE8JxsJj_A_<Q%l|AKtCx}`>86@S5x
z!FEFZugZh#3T<c_ms)?`&8`IwK|BE3HJ~y9iZN&_cB{9-MnFSxkzy?X2e6axtzNBY
zG}P+o8arSokf~6zYCzk&7u#;i&s8kJTM%m~Sv^h*v@P|wD#T6;U#53ecFQ+WuP#J*
zV4|*mLENzjOxl#ZV1%Wn5i{7BWJy(I=8&Z<qd2CoQTgT-9C|YkeQe=DG*ryNp&yJp
zXNK_fl6iWs<Cc%Cf^g_<)Lcu;&<laQN^|Yd+A9QS#7_&T&<;kfPfh;sru%%V_<5u>
z*q|AGev|7--aZ_tG$dP(*DiU62-ms_L#lN{xWofo&}7~|Keq}lB2*}Yq#!hh16|-q
zFe9;=#E8+0n}<tPDNHhpyf|lhMq*bH1O_mBwNQlY_@eQTtNjeRe^~1;iF)~A-X<_|
z_tu^8nvkl6fv@{E`RL9Z1rS`n#h(ylFX-D-vRZ$(uK*ZW0}N`Qgk1~_oIfEVX_Ay3
z<oak!FeJrJ^1aExaG=i-r;)vRpzYA-V&fsccSC$P0n&i%NLc6&3<$Cx$bcjo4nPjN
zGzU4>lwW4zNv@$^&zg~W?!O1y^qV@7N4vUkP^Z2vxWQqehp?=Y`~xSJ$siy)c97}W
z<CT<Ut5_wvJiS6jm@hL}1(z*VcLm;qb5dWY@1s{i%?UO%GRw@C>Tzf}qRUrniB>`z
zfnF``Rh$_=3@niA`<}>*<m(g(9>P|I);pW`m;QM8wOKYPvj?+Yw2twlz`lL0NjC8r
zm<NflA+r<|JQo8r<4sG1rIkGQ<{{Kd$V_c6rry+82H>Eu$Z6mJ3PKPslewg7GKW+j
zV6T>V83bIC02X6*V<zz`sgAEmb{aQp^$KOj3F#0D<7%O*bxS-}?)w>`Z(EHET!N3{
zS<7(qvV)1vDibp{^e}s;VanFh-lY&W&cog<V?wi$6UJ!gVO$iz1Xz%=Gr%Cb(^3*$
zL#uLypc?d9NoJTamSzJGbm>%RDkwWZF_;nGVg*2;`}tr#fc3z$ifUW|K(!XG6oHdu
z-D7Bk0NgIQd)vK%Bkp+md%Mk%ALRe>2V(EnO#<9l2KLg*F&vWA7v6x#vzuuhI%e4D
zFtNTq(`4GWivE{K<+>QxhOtVw_jt@>274HlT+f^=?&i=!8rNv5xHg;d(5?W8;Rm5H
z8aDh%4lT_0#sg-n>trpBDYR)U>#_D@N~{F4-V5lrZ6*3n`Bvmw*ir|vllfq&eIRN@
z4J_2k+Zk~^^it$-${JigS};Ow5_{^6Z!4L-$+OqyVK_OoaLUud+|ZoOeG-JlatYER
z1a8RH+bbdnZ=N9t$B@kFQ4SE27y)GCzuRDbdbx;z7!}GGk^<&kk32@}0wrE-r(_Nx
zmbTLUPfnx?*J;kp>;~V*B#Q4poxPxGPhD@YjtArdumE69TJFqVp$menisE32m(605
z15S&z)N7RieLErCAO~Bq5(p1DuTaU-?D<joy8m0CAen%%t|43D?z0k%AV^7Grohg;
zwK)nq+YB(x298I_!UC}^f(FE9Hvm8*kevvmHcsRGYOeK%8m@7$uKmnBGGz>fB;5*c
z&?_9a6&pvcu%G!`gS<_H^uc6$=rD<woFvdcY>&f41@zBR)?IkqxV_VU4T7`VZw#id
zR+8@A-LZ{ig~>b5pX364J$ZfDCQFkTOOQCp->z?s)i8s=%n?0qIxuAti}!v@kZf~g
ze=NgEY~iBjW9b1|wB_I>W~kKug#|LYsJ>US!JQmNd03WPeT86>L%SM-gI)q#m@n^7
zug;+*Qk*E|+Ls<1Pt-cC1BenSCEDi;bICdDU^EiQfba@)u`G~bD3BDJ<AL&=0f?<_
zDq{4V)vR)`GjNUDL_B2b{D!#3H1OvnhZ6ICuis^{rVejX#zszz=!IWj(A?AMH0*5+
z(hh2V%V*gEfUWZ|g|FXRVh+hphi5&;_(50#r-uM=Yj;q#>hU$s@pSkl)7%-b(^}y!
zT`9v%r+<sxiI{0Fv;$kQQtB>)V3WCfnE=@4yo-26LT?LTm?()e5S*w`qD)Y@A(hrZ
zD0Bn=?%<yxXoDqAd6LbvOmO_d-CE(M)wOUCPEYWA?LJ4YIXCsk%}dff*+Ord>T^>K
zjypVJG;~vEULeO|*r;-H*6&NZ7Ji-DPrrO}KmF##qK;3k!`mgAzfMu47xFJXPmb{z
z3uZkbbB=vrm|cDpSsUWC=2DzzNU$M-`Siexz1=k-K5hIm-@%7ec26GKNp3B}?>9c1
zlk>n~L6g|%jsE4x?px0Q>gUBy$>>Pc>HX%JMRiB?b}}PjqBsjjHF+PoV<!Kn+7+&B
zQ<0SzX)5wIjl1D8dOtcBU`ut=BNdNc+G2d~%FU(Na_uy1xdw!9^<Jm_v=Z&IEJBU1
z9f#h^SH}oQ)PcgUS_%HU4OxgyqJ2Mi!t>op;KH;5ehhJ9J>my@($gRFgRzsS8*K!$
zWQ0z^RCO}KtYGS5j&%(xi;d0V@F|}3ERMKVr3Tf{#^zK`RZ|f*`9PdG$VhrlMRnAB
zo(@na3rPlE>kwQF+*VH*-ZP#4WkzFubb<B*V<{J4{NJ(BeD?y)l&`77JI8nTahGo`
zs=@`cgR6JA1_SR@zzM0D3#k@@6WHt4!YV8!PvQg)pwy-5f|bMo!AelB!9uQk*OgKU
z53I}Tv7j&x(R<DwqD!=<7QQlWF#rCIkacm@)WQ+n_5?p~{2cjy=~SDLVE3t2{e#)`
zP;|hMl>M}-a;ow6u$29m$my-Qm#sUsJ%MthCGp865%p67rKn~8Nk_XZSAX5!=~?JK
zDwh%h7dUr!i%Z=cS4DOlz-wN<N{BmZ8t2s}T8-EOdsF<$=2Dt}P|x0l5OBQum~D~3
zTe`-p6Str;e)$Pfa)YnF@0{rT4y;J2U%WD@F<)%q8KvU!xLCW<fwgpn?|tlBA@1`A
zn0l5GR-)k(g1xBWyXr}*ht8^PRB{;B2-~9PYw{#@^~O~;D8UH4k7a9`Fc8(^vf4_6
zOS(oOkTCnUO)V5P+hd6<D)x3FI`U;2_&L&}b5j@6joZsLl1=%B`{^ehL$A+rj2pDv
z*X-zYcq2brRFfQYOllkETF&9Ku_rk1!RsVy=pmF(f*icaeRk#;9my{q_5yBbli%uv
z&Ow4SxC-gBs$!w$gplVETnw<p?I2f03ko2OyGz~Wd~HDig!jr(9ibPB*nbA-T6KD*
zoUipivHv=s4!Dy3WtzW;xI=KB#21cT$_0pHpn;0@GP~;<z&@R%5Vpok&Rt;TcRdTa
zfH$Q=3t6e)O>W`Gue&>Et|p|6ZA(azXFh%3IG>T|`RL=#ouQRe;wyVPf5z<T3}F05
ze_XDa!Q1fcXMlge9e{V=LHn5(I))2Z$S0nXuNYt?*F1pOAJ(A<ZU@dkX`MYtPY8~n
zEz8ZkVvtl0&K(^1wQO8JDnZJ=-E?Vs=vW(j*>LEqYx^~q<xa652&UgFJ!E%1G&btm
zZ+Yd}aAjGbX=wdPQ9qdjqhSA@v*8XV&<==Aee>(xNx9ope+?<cj{is%6<M6)Qg3hZ
zKyYgk#Q}bweEY~H3lous@3sY8^Sz%tS$i>;yZ_`4+M5~KPjgGsZuy116ER)fR|U%t
zZtWDE<T^gLEZ*02jck0jazo;iq<uZ{mv%PI-G6m5T@6Xi$1PJ94aLooOe?2^sM0$N
zf{-)Fp*d1`>6FNAPp5DGZ}gdT&8~_KEhbY7OAAuuzNJ%D$s!@jqtDC2ZfarW;2bIV
z5Iu|gUi{E?I!9x0aL&86Yk|b&PwuBf<j@#&^KO;+4dSRVB-|wGjQW;ND~@o;)Dp}?
zM5K@z!Qts5THNqRk}y(O@^e29N&EpDk}uvX!JQ9g@1GKt*h4cx9frJ2r_zsiqB;pD
zuqC?{@n$+#S&obczOsalUjV<E(mV$^b#(Ml-2mZ)70qGchffajK<-w}gPa{+=Q#H~
z3x7$w4Vd#I-vVMt5MYRrEFCZ;?;POI8Hhu*kIe46wbxj<wO4Na=ve|TzkJL4`n#M&
zRCRgk^Do;IrF)9&PTPc4PSy9s&H1g|ZIIw|En&`Y;6%UAszmR=&+=Q_Q=gYGo=%B-
zlI8*nu9Tq<*O3k-N!g<p+NX!&*9LtaOP4(Lh#3}V*tLJKmbCo-C?Vj;&eYuvt4H70
zp(SCdeNQ@mabEi>?$}1-5!CIjvT?VltwnZG?6)~KAL8En`q$oD)rfw({)Jighrh2Z
zeJI>%3L|^_x~)EO+L5$n{m`#rmG{du?SuzvEih~En!4HBUfyXFw?8wgp!Eg)gY7SG
zT}N7Sxd$jcQieEejSAy->!}kxzeE}dKK<%>Jl0}az!fRu=E;q;qz*&*uUk)MSEwe#
zXqDA}A)iK6Z?ODK%0{fF!4GO!r3-a*Qj_boOs!`Q-_lRqJ`}I?C)zotqC>9R&^c3f
zF?eCzb5)Ag`SfX^qWW`&3(oG9^oI9_3%6J8e&*ACj#D`$>iD|g_R@Yvr*f)2Z13}o
z4ef6~%XaMSBv8N1*i=qk$kF7XR_5&Nbe5*b%}S?=r72@VW^1&L-hO%xR|uVm5R;4}
zoZ2Gz*CoV398xZfWMm!apTi+j<UTt(QT=2A8-b}cMfH<#74sQbE>7aw9L_r@?DeEO
znnFbSx!*Ndqzhlg!m0`*PML0|H+JQ9`fh?)l|Iw;X{Gd$`9#4v&W<@R9l)Qw1_!9F
zK3_WhW=&pMr`e}dsjAa}Kc%T=GpAGa6=4zx!J(j%^S>cr6=2p`?>B&r7TyQnLoW48
z-B3vSjsa?g4}J7N-2Q12^Y6Z<6))}h_S3vQSkJN}Ro1I}b6kc!_U>$S^mMyRm;N$L
ziMNZ$STIfKTeeJ#E18W;K_sNyYJxpkL-}2Gt~30;`V!aAV*i1{@C47L+$QPm{SP;c
zNh+$df01`{TDElhpYjUdV}ps4Uxpt@K9=3ob-HePvS|57QT>R-iuu+z$Dj7W_(?;7
z+t{BWZ@)_ZdKiB}dh_EiSIlDV*QAW>AV+s=KOYs}X|N8Cy<eW}*mz@)?R-p3T1SgU
z_0oszzyHX3BR~+2?AdkQ(x+SgJH`5^r{ZX;rG^fp7IChPs3K@+aXfG8`?&GZOOwX_
z%>2|fy!+W*e(jS+W0kbSyTpU;!OOIsr$qmijY`|fKZJIDs2a9O?E{@<N}Aj<_tD02
zYfq5Q#Df#bo7lBSf8Bk#C*<zTrQsp}b9zN?A4N1jU3>rc>jOos1F?7Zr^r_{(%<?u
z&**+d2u$C9CQbWX_IoFYc=znU;L$k}r~Q5X(T?~0;JK;x`{_-0SHW_k+Clnss+s+K
zsy3#Q{_O0AnX_x9DY^8V2K(ohcT%M4*E(r@eV0{K)Yk=l&pH1mztKY~r&@`4@`jt#
z&S@U4D)K$Aq;rO)iP_r`0m9UoEOy@D99f{nKZom@mzw&#O`TrVwGez=0%!{sAgYTB
zuGhU7AfEX(s&nUcVOPYK63>a;3GI#nM^h5g`w1xp*;x{Go%0rPv1HEekEyf!J|p|-
zJLR!o6)c=60)8j_JiSx;Xk*K^L+@)-eebz-o!$3Fd*?`(Xs$N(C$C3aK&9%Q^Cv(_
z5Vlu?<1DD&b)Gr(owNEv16gV3v&X9)Vr2*UN4>uh^{)3p&Rv(S@fGVHr4aOgqm8|>
z=YQTK`K_kn&R6?S{duvS0^a!Kg|4AltVJsS)1O~kL-ajq)Yf+mr(Sf)YKA8($4)QY
z-Z0T(pN^W`^$ef*VDJn3@cH3aBMX=RQHl-_41B2wxjDL?XW*sx+_|*!eq95r@_y~}
z5zMyR=LEeU53c!iVIwvl{xtLN`YSW$EqKkNuSmrmJOB9V|COb2otj#^`zgv|j*~!%
z%6w@NbTlg0F<AWS`2+QmHur!_Cr^L$c*uDA;_ubl*Q;nJ%mxMLysC7I(44WF&23n=
zbo@q?-yI&&bm4SF*yEP^BlzHgoPfH=f*CgKM3;<>+0@Ng-}P&t;m3xG)EJ!9_{{^R
zN!}{W$+nz5-Q9ED8G}x;9rYCX*}k#+<w2=eH2b~=CMtJ)_G@}=R%yQNoch*{Qya!#
zZ9kOW{iLM9h$#Hbh<}XtpZv6QCiixS>0kBDT|S;#qAj~=QgY1xN>A%C^bS~kcHEZd
ze&=jI{Pyrm%s{vtz4feV&L1jxy%&|&+EQaEfqT~PNc=LIyRw`8KFJ;t6n6CWR|y60
zxu+*k@A;2^oaN~8eq&tp-@n6A5Pqk8b-!f8KT0sC@q4qr2s9M#+W(t`w4k2|kGSwG
zk@t40_~4i4l{yvkf5g16TX0`9WAp4_X(OF_>3#ivNmS=XDyW8hA@mMUrcSH(ri{5v
z+E4#FGUsxBqdaH-o~eT2_w|45nL0Q8zV3zN%oAqmRKbn+^>aT?<=W<k8vc3nE&pxm
z%;|EM@;R60jZHg}yXKR-7F>qj*MdJ2%bK=-R21BYxNlRRy$gA9rXs3yO9{ztz;3|4
zIK}8*iA%}c_Y8Rtu>T2ZKQb3txhVxX_Ky;zf%!wVdG;kysb-%VyK?5^mjMMp0&xDc
zds&|!_@bzu-W&!N0IEauPL&<v17$$`2j@YN4;AMR@^=zm))wwwanZZI8VF;zV_|8M
zzEEBEJ2>w+>|`jre`uBxvrJ+i`$hD5WPDG0g~@g8DcS4TS&Hb;EP;Db68ZWELXYms
zm|21aFNHin`AmF0nL;M?tasN9gKg^+9(%E8LflvXMR>>NC;6~l#93_d=OoKeY0KZ}
zBkDVLeT=ETc>cyu6j`e@-eoWlov<>=ZssGmy=<13oBtE`o)oqA>MxbtLw?i8m0bT6
zV~FX8Pj+lLc&M-R(%TR9lkub5>LTg_CiterPMc4m#1lTATVUn!6X*|f>tDm%MhZ3U
zKG8^~Ll*v{AGU|Bo{D43UVEggzHokk+GzPyrMli?$%WX4dw5pF>A_$3!T!FTT_*5-
z*R+RYXE#)Ls#cHs>{#!``#t1CcfYdw?>!4~`)EG3@Ws?ERJ*O*2dh+B)OBjd4O0`z
zo?2wbCj#SlJH}JDNe>+u)_u3v-}T*{dY^GBdo054Qg00p?ss#sdP1oTIz5zJRJR_}
zopN)#X>irJqkYDn4E|8WIOFA6BaJ)rA&j*5&h#n61*5y4rJR;`!a17D-Wbx0M+Z8~
z&bTMdc?ML{Z&=yRo0XPm=SJw9Pg&oY6B0M)33lvfO+#dQhbyPJH%;&7oY>R3qjJvQ
z;Ws*{RF7C6OCaLsux9V;FYoNM!_N_(<vr7LI7HvSbE+k6YX1I?PIr!H6UuH9DqQWF
zzi;8$vgOvfj(ha|NdCvx`=&c0J)5_Gte8(`;oRJx5Z;Bp!we(OT^9la-%;W|ab}|E
z?}4BNpX*ij+xMj)r#|hJ2hIQf<=G>h77M^mGN4`H$#)UuU*~_Hx$r4y{*p>wQ&-Ny
z{?sL4$>yk3eX#EcnvXw|SD6Y3IDd#cup#ZU;3!f58RW#8FKd(bwHKndd&g@YtU^1s
z=g8tu!+)CD33j#M{3Wd0G6}Zmt2}wrJHhB0+Sf5w*x#>;HdTR=Z9od?!|WH~^&?;9
z!-%KbUYq@Lq)SdS-%q>AxINk67&{v%vDyN|`B$pfN%miCneN$tQ8L{_4WJ}GXhS^6
zMRuWTV<M!Cu?wxPy?(^ky-jD!Zq5d8H#Zo#XeVSn_C95)qH==tnC?q!H1@sv<WfP4
zta$I)Na4YRO@<40;xSPjlJWQHOsj+3k!SZG&KV!Y?&?XRhqqlr_fwy)Z(v-0&G`GN
zu70KX)!it(F*h-w*phxC5WFqB!kj)3%(9qYi8!d-!6q5#-ufcidVM28_BP1jO2L~k
z*yG$_^P3ARfAWN#NQoL}eA>3%@^ihR{RHjsMVp{w^%F0?h+2MceclrpNJ)Co*}kjg
z+4&E*%d*ER<b;6zw3#T$JE3(ziZ9nwgDz`|+G%=G;+ygt?ODWycf!$t&%S|H%Tn#U
zPrmyq*StI%5WjEM%g#_P)q5IfWoDIjws17tR!@G+UZ{O~QbIa-NN>92V;t7RxPc~h
zob_%+*RUfQap9r+>Br7Zu}4yTR)u><H%)FUbD#6jkmD?C6V!IEO+f`~q>O%KIk{qX
zxy=!#^QLvuz^^knCUq+isU_Q)iEeXP6JaR!aDH9hY22kJggIfzbT>9Itv%vAAW{_|
zH@yPT?It~FfoQ+=H+o>&XXF^*9@r;TPsgv!Yu-3@4v^2i>m1xJJqNr6V%a53pWj`D
z4GI9^01f3o%mm3G?k$=hRE0tV*+B&j`FFhl|2EV-vL&9Htan)^p`6`FYuR8Z|B`^X
z_VJwUW52)NiL3%XllWEdL~;9O16vy6h*x3N7vG7_1NIeLd=Wm1Q{6DGPI+4CtASB%
z+rVz>&Q@E&v-T~>>bdnWwtr@oTvM`&wuSaF`=DjpRTn@dpF6VcF%PV_k)*aE8gM*v
zb@-5mUO>oO->19FgQ<oYdOv-#*_J|nT##6A?jdiCruz;)fDMntC%?IMucd%XyWJKs
zN!RO^{K^s>_+sAEs51YeQ8PSaM*Gi456&NorN0h3xRm*@Gh*uY!h>x4D4npE=l#U%
zdhbpyJZNr+ZGRn<boY;7bF(M+8euQJu5NV8=-D9dxhU~sgM#!<z`}!;rx)Kfl35A2
zYqNIui@ylVfY@#hEtB}L*U;wb0_Uegak`t{3E%9S4amPdOA0?d*?!;eWyYpnK$&Hy
zCocqVq&2)6cZxAM+z{UJlU&nrmeQyrad@5L>qINJs*h+T>0@Rohjb)PBPrx2;UT@=
z7|bj#x>JOydB>mJLz5G2a(wJ-dFy9ByUgOOK9htQ41sI4R&fY<(l+F*7&k&Re@XLN
zfagvYhrJWFo0nLw0c?8D)8b5GwD*PgpOT)EA1d~4V+7Vb!c;-V#0PZpSlS*@HD5h*
zp6<0^m)53zbo8|F^7Q5Dc#XgOfr&M2oGP^U+<IxH{<Nd~@O-r(z5tME&b_@#-FXIl
zqiqKvr#hDeIn_(<U9W@OyY7X6m3(!GL)!_-o<xW|T4=k&fG^dJGb`kK2HIJDp{Ict
zEt9x!*t?2daC}z-f>nR`hA3sZP|It`6>rIY^ZWrWAC}|Xn}OEXdllzbKs=G-^n{h;
z)Y}!Mn`y()ds3a?nc%&<@$9v+&KsFEThJEgr@cD;E*h9Wcpcx7>$tr0Ep}W&yKTr~
z#ZI=0hq13?HYOAejG@J)Tx!4{*uIMgS=9&Sk4ahYOHyO}#!t++XI|m$6&|(^&N{Ka
z@h94ir;|T7{a}B`;8=Yr-}ZG7Mz;GYjFqq^*t|JCZ2GYLM&yGvwBd@?bYGV^P_#Wp
ze;q7FT)XH1{-v@^LSS#CO|cC-Nbu_CJ#^G_LowpXhV!3E{vq$gmqLX3S7w9G3qiej
z)Nz(HwS#sme+Nx$LXxZ19WdA3q2L8s)B_xdG@@5WG}k=@a~dHR^vrtOkveDwR>H{E
zV7aCX#bTqxdE_&Bgnvknm*9enhPdI~`m0>XkJaP;a260jG-Lp+U_=g7yI#Y=eJOw|
ztv)D{S_C{DaUUCkl~`lE_yjgVT*xaFK_}ATT*L^Lisd3@1Gn)T7-d`(*ViiW*_k-*
z8V|TDq5S5{;%b4TkJ{+ZBjMUk)q>kIU9Q|aRNx}#^$P8M)v<c#;M-MmWWNiQz>$m@
z@B{?et3L(i86nW^3L%59LU_p?*zR+$=FDV$jVf2kV(Iui8auY9e}!A$3SNOL9>sne
z<Gb`YJ4|oA)NedDvmrV!n`VQmr)I}=UmZue#^~kb>;~-UI;7(_xiw5LYsfywN&cp7
zvb3~k)gHPy;4F)jOuMB1OXtxe^j(-a9r0&!&ZTMpo1_ow$t=(FfBx<_a$NpFJ+hnj
z!mMM44}S6L?k7zbzOeAmlLTgoPI5f!FOQ*qFgQ$OT@RvN#S^e6#?dE#ss9v+4pV+&
z*g;Oc`jh;RI33Dx#r6*0YOG-PX8q5@IudWT-rb5Fv|3cK{Fzipmx<Qr_mE7_OkUuf
znG_7_NREIaO0@nBW|s7bA>p2x6uE(-gW#S=Q-KLdrDv9skMVLdNbIeiP~!z$^Xf?A
zy_T)nC`oj#maFk%uFZO*ewEj}mRT4a(mU-$E187|Ab)qZCi;trWL<++vw+|xJ;CPG
ziitzDUNs|9UBq)2?`AUi&094-znIW~Bt{@)LnMc40R9C4JYa(lLW`&MP6SaxHl#Jc
z{VxVUaX(;##7H*K16L!RY)wZLp7Ak{<(QMzq*yszi|1?Z)+&1pSCc2eZtOedjK`7L
z<nn<h>-7rJaEe1~w7u$G_x6%gZbRBI=6n`vG}?@f|8<<)^wo*8RO(j64gvQb)l>H3
zt#aU~?wD(hej}ULOV^J!@o$Zv&J@xh<m;^XlU={Tyv6|5IpDuICBKYqj~rS4k#=dh
zkeMXP8$ab;QL#>Ev*^5hEA0{bve&0F{U*AmZwT5!lYAe2#e1XAsgi0<QX8A^M3dnI
zeO#m=G@S=DiGC#CNlvqAaJ%|x8`}Gz@i5xqSf_{>at=m5_N?wl!^dj8ZLdkXHDbX-
zuz7Hq4Vs@Zl<4v7Mp8&_VdCW4cf$N@L9!Xc90bp)NlrBu`-cffU4ruXN2S6DH<)j}
ztt{VGY?35bJAD9AlJ7DL5C!n<0EqThk3)!lD;ONoEw|)HbtGwC^PRNK%D<R>qgb{T
zfURj79L}Gx7x`VEM5}FM>2HyMyu_SjeM|-~<WC?Tnp)+z`k-?hN<koQ_E7^`7e+V~
zcC!v}p)&y7LI_+808*B-2yQ=xO5qw~kOB%7+e#=Vi(MtiOQ3chASd`AF&C-aIx6{D
zj1m)=v~X1_mv$L?uTf#9+9*sgpdbJz^#>~FCeZAcgJPe*^ITW(H20xKV+O^<kxgdB
zcnH+KMq+Ckh|PV}kF_x}veZ$%b$VgI*salw^>Tfm$>Nx&O$2o2hx7o3$O$1MJ-WVd
zo_|q?2L1?O6h_;VR70&x>qK#STo@&De8b56F@K#<G|iY;16~3XTt-58K{>+fvBX+*
zs7(X-_30Ja_Fmb0uR(UBJ}Hg%B)@6)Cf}#RmJ2%Ch$O-DFV<O)alQK3KS>CF&neNL
z<h#QfW|G!8vmCek&D1l;I8Ac@u!cU|T%FhT{5`;%lj=;8C{7K0+{-$zAy7H#`rO%d
zW?AlJdzf_tY}He2`a|(D?1_gBnb&919ZuDO(Jp_F%^F<<5=q3dlJjfA--&Aha9f*+
z2Utn@wc+A02u38x;-CyD7FlX)$qfkSX^FK!QVU^<l<JyetN~is5K1d(6+!GO#|a5+
zay^U35)mwLLNc4M7^8g5VW0-#Bm*La&O>qG8N&aJIp#j#oRDDQdR)AjQl@|x>(Z`?
zH#<q?jL)EH8y`*X1!I^1vJy%)bvfR0v;dEOG|rFCOOxsqN>?=MbquY|sHLR<M2oZ7
zn{#k;9<=Ds^7{`=VzfK~WFi-GXrpaZV+Mx*JE{10lHbhrq<-srSF|69tk@!$fA;vc
zk-7UNG;4AgngG2FqEgzDwI8BGtx3k<C9v7$(&>^|bx(bg>ySrI;2W0~hwA8fD=!?&
zNH0aHyV>LV!ZVq*nI}zvAanXjrr4P}aIcTobrzyNixSTzvCNw_f1H+ChkMe*M&!aQ
z5(hhzc4IPW)wG7Fk5y|#I*OgnzR^dtzKhVoc1?TP`Z`4>byx2jtxgoZWUZ`|K#DBE
zjMgNI8d#d9AX`_00Vs*;K^Ci9+8bep&B+ILdVp0Qc}TZ#0%3z~8w5_vaBeE`h87-Z
z?Zu9`PT=_D;z4o=JUs>jX%0fMA7@U1>j_v4shT{$wOc}SW<-Pnp@oYr#S|tjBK|+3
zt6>HLbo|Wm=41{<5qpsHATeU%ThnRKIxGfmIDp@b0^t4OCi4162~JR^ra^E$A@L~=
z;KnLVoLPrZigI<tp&sJUk9<p_7o&&c%o;taruc^<+t(s{e3fL&*?Jc*7qW2!yrRoM
z+gM~JkDj@jG-Q4IN>Lbunt|WhOOYwXM=06y%pp>?JPkc$l9FhmNQqE7Y?6X9qd59h
z3;DEgkkRKO|C6OLpL_FdNkb$S;@R%?{0OWUD;HaMeS#puvT6||Dxv+pbywN-iErpo
zHQKAKFO*%M)~HGpuYihj-SWJWeWO*0q8qH0+(c)WKr^pIeh}g<*I_!KHwtIwoyadi
zJYUS5A_<B7a>R2}r@;Vc7pF)cV4A=yo%$)g&aX?niy(Md`ld8atS(EJnk}Ig)kcVk
zIkmtO!%Qg={0RV-AGpsL7a_u=3bGXl5xyZ5&7twg<~VaQR;o(_p2~Qv@Wl`c7?R&&
zg})j>o>~S3_HR7|^3Gg;FaeiJ@xP{%qdo@b=~1D3nukQlQE(S;A$03AkFplJFHt?2
z#EDKrU4d@O#UyKIpntLr5g0d`)yk&WGPZ4#!CsbK(xCBJ)tPnj%$bfPTVK1}$P=Nq
zO}fI@vgyD#_Uu(nx}xQ@X1#Lt1UJK;72001XCNz44*|%817tP}`xbGMMf!iw(wH;e
zB@ya&Io;Kc1VKH;-qvT6LQ@*slZB(E)D;HvPonx*!A_z#roK$`28|!7*N2&i6&j6D
zv7y-YMcTk>mI`-&lJF&KMAyKp#7%*jWThBjMl|zI0=PUBJ3R-u;2@MrXb-snrQZLb
zWZ^XU9i<4-0g0xC0wsTh4W$+6YfR`oQbNiv?kD>L+-jKhk)#M7QeH#}vjD(w05B0E
zQz|4j60*g@QtS^E2q?n8&Il0e`Hq+|#z+|m5Snm6cuuO+^luYRmg|m^VyV2YPxZrZ
z?l0l#`2a!5fpoy#(l`(?smmA9O5!Zuyq?h^yxzKn&O&S+<6+-M-e9{E!UdyM*mCm<
z7tuaVt_Mq**bhLVo2CgyMIcSfrJUJjiem*K64ArPV>N@z0Tw}P&`7;**9Csx`3#;T
z>87kNW`(h=)~Fkx=IcnPt`E=kC>&IyMWFrhSYA`Uy`IlD6{dGztC0GX>HlKbp=^L)
z;mf4WpCLV>OlkaBjm(CkP9u4;c6*p{gC^Wowpwxo!#9YjLE2U$3&al3eS>JrD9^Ib
z@^PH!-nQ~<l=QKS*=LKd^PYPn71@RCvzgcVgCM&=$tt>#o%0Y`YvDXdo}igg<gQcJ
z2&C+QB=)<4M9`@cnhj;dbrOka1{U`(Hr^}|PNENhiiUtP{|2ED7@H+9IZyy6d?B+_
z18)=P!C}xA<0Rye7{OXF+7`DQdT@h}JTRPiT{E2Fw@UyJ(6a-dn!i7OAqoHfJi#PX
z19!Dw0e7`iV02l(7Z=C6Y%FA$VM`ENg8U{x_AQIydFITB8MYj;RFHq^5xv#lme@yI
z3c%=f5nu|c1$i<Ep0r#-b`}7I*1o7BBFBTrb@bXS@ESw9aIu(lG=km0<NElc=qTuv
zj~85^HHJ4#-<=!B1UNLW#vn0Vov`+@0i?y==f2^TlbD9gzUOHSqy+%N1hl^0*jT6m
zP}(ku8>>zNCuh<a9zZ-nN&KLgV|~+UjDsKx1S*P&?t7NaH~{(y466iWQ=r{496+K5
z^0J3U-;jVnQXrvA8{8pr9;68LoiUM=Z1Fdri|(r*1g(c`u!bpQ1{Kvpz$nI*(eFS(
z0GLGuv3M}BpGb#1FB1SHgM9B>tN@A1h8uv}*?nANW@lXgQ9^ow8{hG$@k#<_vpQ;&
zO>O+C{)_{7Dgk<Y26|RT@wh=OnX-X}B)a*S#=Ab}WD$7SbVPW)2|Y0@pQ{MNq40aP
z&>snKQ56uHnA3!aG&F*^lE4i!mU8-U$_8kvXoOy`>pa!99EhXJM<EyI!Yr9g2%t1#
z_t)O6GfDzMI^LDn6g>wL)Wbf0p^On@b9N@)m`VFx92Cd&vX%F`gqskO_y)A+;=Rv<
z)-mNPwC)0tv_1D~AA1clm;p_Pa$zwWSpm}p893KGHo_dy1(_M;0#M8MOyOHl))7tu
zlZ7UQ3~mvFoTB<>pq(0KGt(dFN3^ZAR{@qeq^Jl;QCc}fFjLZLR{#)@zxhHc`Bxok
zi|TM@fc?OzWH%T%Bi5L2g9lhzB*O*B<doa~7=p{knl#AK)DIJxu8Ysn42z6z0*HFq
zF~h<^NBkDLkE`u?xpz^PHW!<NAT>}8TA4<~es5DOD?8VjiIfSv#5hTIE|!TP0wrOg
zumDmLOh9g8J{t`mBnbFqE(L-B86hCb5Ht+BFxR<Y3x$Q>3)JA(O4oXXTa*QH3~w<1
zJpmdqkUjF?aTWy=3liKKt#OK$^b=z^tXTum4qPj4tSU)dYuum#Z&#=TWDkvb8VE=$
zv12ug3<<Jri&?F44H7t$2bk?Z54Fa}`h<{$@hCY83tLo&KkzAFVaWe(cr7?(wFr!m
zSszY@#!CixS1Z9L8(@(w2`MTbg!XT+2>{FyN(gYe5!Vw%#pJpOpb!F@unB+!cGygE
zNey!eIA6w~QY6M0<6}}hoP&PHGWo4^IRru8xVoE`0u^2x0{IP#leOSkDT`%X#JH+6
z)u3OSOUa>O8jc(pbrKQ8&Jv?B+&oo7jAd!aM1Fnqa7_!WL`@M=zlHv;^Kj69jT#Cw
zM%OUMM$vFFR#NcebaMpSNDpFvGsOM~;8u&tODI{?MRW9jB`wjj;0$U3t;WvN8>(&A
zFuY<^og_HHYvYuk?Q`V=1;{S~(*hHsxQ`D_kGgNuqfZD;4=97C$M@D}f$Y06L9L%e
z?#yP?0|)bmwp=9RXlP+G7#KN45*&mI*kN4(^8|Fe7X$X4;{U8`AVYG2yf0D+&V*U`
z0hq?J*a9#z)MPJ!jvyf@!xuNnV1uog?eQR&q6ld9&0Lgpe-seKpJ|Fm_72M;HY<vO
zXkADh;EAX!-bHDs$GnQxg$B4ieskNrfLu#q#b_V(F`=+%rhxKM)vin$xDT958E{EO
zk_6z<6=n>00II);L&>6H>Pzn73*Z86MfIo@sKdfZ0$iwkeges6;vIM#N`JXb5jz3q
z`=gHfFcC5a%@p*z)FpPeCYT)x2^D}uL!e0Z0;g(oW#RYm`Gr!M40Xi8F$kDX^A)3-
zq&n>+2aGRlrI-Q@hhr^({<bn4LJB5J0H%B$aF`mXWttYTy869f0Av-3Eup#5atsUr
z0G6Wb1OUkOML<dvfHZW2My~>u=#tiO-w6IK611)rCwFatpvs_xsg1aTq`P>KtV^?j
zK_f&3=%>ycX9TTM=mIh=pam6RVjdV2qjgB@jB_3|5nA}eZ_Ae`W(EV|eMV7!8x5H!
zb*18M+Jwlwqjh4-B!PC@qu8b3F-raz2edi~iGiSC#=s3^kUX+zq<YR#=^`rH&CGi^
z7LA0~ke%_jZZ9<j+d5N$c1u)}4G!$X-3b=qH)am7@UD`zXdtDRynf=pEeBGmkZ1sG
z!fy;fYj`z2o<9DqM;x4lz{xb&$I$8qc}xWOx>kWvpb1vpn6a1o1><~;XyOanP8$?E
zJ!m~+8)hV8WTgYPLjA2lnp^UVN#|go_1cGYVI^QdG%E%~<ZCc)AymNTR&K4p0ct74
z{z;_yc`z&h`@37Aq*)fRC<R`O?pkO(gn&EC#nvRFAGCTY<weDq=n^oy(=8e22fdjT
fGa6?v#*$IS2vY;b1J;ZpLgCyPry;G}e<uDfyi>Tg

literal 0
HcmV?d00001

diff --git a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/cmm/ColorConversionTests.java b/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/cmm/ColorConversionTests.java
index e71b18857f1..4916929c32f 100644
--- a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/cmm/ColorConversionTests.java
+++ b/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/cmm/ColorConversionTests.java
@@ -51,6 +51,7 @@ public class ColorConversionTests extends CMMTests {
 
         DataConversionTests.init();
         ColorConvertOpTests.init();
+        EmbeddedProfileTests.init();
     }
 
     protected ColorConversionTests(Group parent, String nodeName, String description) {
diff --git a/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/cmm/EmbeddedProfileTests.java b/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/cmm/EmbeddedProfileTests.java
new file mode 100644
index 00000000000..3af6313eff1
--- /dev/null
+++ b/jdk/src/share/demo/java2d/J2DBench/src/j2dbench/tests/cmm/EmbeddedProfileTests.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. 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 with the distribution.
+ *
+ *   - Neither the name of Oracle nor the names of its
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * This source code is provided to illustrate the usage of a given feature
+ * or technique and has been deliberately simplified. Additional steps
+ * required for a production-quality application, such as security checks,
+ * input validation and proper error handling, might not be present in
+ * this sample code.
+ */
+
+package j2dbench.tests.cmm;
+
+import j2dbench.Group;
+import j2dbench.Option;
+import j2dbench.Result;
+import j2dbench.TestEnvironment;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.net.URL;
+import javax.imageio.ImageIO;
+import javax.imageio.ImageReader;
+import javax.imageio.stream.ImageInputStream;
+
+/* This benchmark verifies how changes in cmm library affects image decoding */
+public class EmbeddedProfileTests extends ColorConversionTests {
+
+    protected static Group grpRoot;
+    protected static Group grpOptionsRoot;
+
+    protected static Option inputImages;
+
+    public static void init() {
+        grpRoot = new Group(colorConvRoot, "embed", "Embedded Profile Tests");
+
+        grpOptionsRoot = new Group(grpRoot, "embedOptions", "Options");
+
+        inputImages = createImageList();
+
+        new ReadImageTest();
+    }
+
+    private static enum IccImageResource {
+        SMALL("images/img_icc_small.jpg", "512x512", "Small: 512x512"),
+        MEDIUM("images/img_icc_medium.jpg", "2048x2048", "Medium: 2048x2048"),
+        LARGE("images/img_icc_large.jpg", "4096x4096", "Large: 4096x4096");
+
+        private IccImageResource(String file, String name, String description) {
+            this.url = CMMTests.class.getResource(file);
+            this.abbrev = name;
+            this.description = description;
+        }
+
+        public final URL url;
+        public final String abbrev;
+        public final String description;
+    }
+
+    private static Option createImageList() {
+        IccImageResource[] images = IccImageResource.values();
+
+        int num = images.length;
+
+        String[] names = new String[num];
+        String[] abbrev = new String[num];
+        String[] descr = new String[num];
+
+        for (int i = 0; i < num; i++) {
+            names[i] = images[i].toString();
+            abbrev[i] = images[i].abbrev;
+            descr[i] = images[i].description;
+        }
+
+         Option list = new Option.ObjectList(grpOptionsRoot,
+                "Images", "Input Images",
+                names, images, abbrev, descr, 1);
+
+         return list;
+    }
+
+    public EmbeddedProfileTests(Group parent, String nodeName, String description) {
+        super(parent, nodeName, description);
+        addDependencies(grpOptionsRoot, true);
+    }
+
+    private static class Context {
+        URL input;
+
+        public Context(TestEnvironment env, Result res) {
+
+            IccImageResource icc_input = (IccImageResource)
+                    env.getModifier(inputImages);
+
+            input = icc_input.url;
+        }
+    }
+
+     public Object initTest(TestEnvironment env, Result res) {
+        return new Context(env, res);
+    }
+
+    public void cleanupTest(TestEnvironment env, Object o) {
+        Context ctx = (Context)o;
+        ctx.input = null;
+    }
+
+    private static class ReadImageTest extends EmbeddedProfileTests {
+        public ReadImageTest() {
+            super(grpRoot, "embd_img_read", "ImageReader.read()");
+        }
+
+        public void runTest(Object octx, int numReps) {
+            final Context ctx = (Context)octx;
+            final URL url = ctx.input;
+            ImageInputStream iis = null;
+            ImageReader reader = null;
+
+            try {
+                iis = ImageIO.createImageInputStream(url.openStream());
+                reader = ImageIO.getImageReaders(iis).next();
+            } catch (IOException e) {
+                throw new RuntimeException("Unable to run the becnhmark", e);
+            }
+
+            do {
+                try {
+                    reader.setInput(iis);
+                    BufferedImage img = reader.read(0);
+                    reader.reset();
+
+                    iis = ImageIO.createImageInputStream(url.openStream());
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            } while (--numReps >= 0);
+        }
+    }
+}
diff --git a/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c b/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c
index 7da0370baad..1340c82a822 100644
--- a/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c
+++ b/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c
@@ -117,6 +117,7 @@ static jfieldID IL_offset_fID;
 static jfieldID IL_nextRowOffset_fID;
 static jfieldID IL_width_fID;
 static jfieldID IL_height_fID;
+static jfieldID IL_imageAtOnce_fID;
 static jfieldID PF_ID_fID;
 
 JavaVM *javaVM;
@@ -237,7 +238,7 @@ JNIEXPORT jlong JNICALL Java_sun_java2d_cmm_lcms_LCMS_createNativeTransform
  * Method:    loadProfile
  * Signature: ([B)J
  */
-JNIEXPORT jlong JNICALL Java_sun_java2d_cmm_lcms_LCMS_loadProfile
+JNIEXPORT jlong JNICALL Java_sun_java2d_cmm_lcms_LCMS_loadProfileNative
   (JNIEnv *env, jobject obj, jbyteArray data)
 {
     jbyte* dataArray;
@@ -284,7 +285,7 @@ JNIEXPORT jlong JNICALL Java_sun_java2d_cmm_lcms_LCMS_loadProfile
  * Method:    freeProfile
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL Java_sun_java2d_cmm_lcms_LCMS_freeProfile
+JNIEXPORT void JNICALL Java_sun_java2d_cmm_lcms_LCMS_freeProfileNative
   (JNIEnv *env, jobject obj, jlong id)
 {
     storeID_t sProf;
@@ -369,48 +370,22 @@ static cmsBool _getHeaderInfo(cmsHPROFILE pf, jbyte* pBuffer, jint bufferSize);
 static cmsBool _setHeaderInfo(cmsHPROFILE pf, jbyte* pBuffer, jint bufferSize);
 static cmsBool _writeCookedTag(cmsHPROFILE pfTarget, cmsTagSignature sig, jbyte *pData, jint size);
 
-/*
- * Class:     sun_java2d_cmm_lcms_LCMS
- * Method:    getTagSize
- * Signature: (JI)I
- */
-JNIEXPORT jint JNICALL Java_sun_java2d_cmm_lcms_LCMS_getTagSize
-  (JNIEnv *env, jobject obj, jlong id, jint tagSig)
-{
-    storeID_t sProf;
-    TagSignature_t sig;
-    jint result = -1;
-
-    sProf.j = id;
-    sig.j = tagSig;
-
-    if (tagSig == SigHead) {
-        result = sizeof(cmsICCHeader);
-    } else {
-      if (cmsIsTag(sProf.pf, sig.cms)) {
-          result = cmsReadRawTag(sProf.pf, sig.cms, NULL, 0);
-        } else {
-            JNU_ThrowByName(env, "java/awt/color/CMMException",
-                            "ICC profile tag not found");
-        }
-    }
-
-    return result;
-}
 
 /*
  * Class:     sun_java2d_cmm_lcms_LCMS
  * Method:    getTagData
  * Signature: (JI[B)V
  */
-JNIEXPORT void JNICALL Java_sun_java2d_cmm_lcms_LCMS_getTagData
-  (JNIEnv *env, jobject obj, jlong id, jint tagSig, jbyteArray data)
+JNIEXPORT jbyteArray JNICALL Java_sun_java2d_cmm_lcms_LCMS_getTagNative
+  (JNIEnv *env, jobject obj, jlong id, jint tagSig)
 {
     storeID_t sProf;
     TagSignature_t sig;
     cmsInt32Number tagSize;
 
-    jbyte* dataArray;
+    jbyte* dataArray = NULL;
+    jbyteArray data = NULL;
+
     jint bufSize;
 
     sProf.j = id;
@@ -419,12 +394,14 @@ JNIEXPORT void JNICALL Java_sun_java2d_cmm_lcms_LCMS_getTagData
     if (tagSig == SigHead) {
         cmsBool status;
 
-        bufSize =(*env)->GetArrayLength(env, data);
+        // allocate java array
+        bufSize = sizeof(cmsICCHeader);
+        data = (*env)->NewByteArray(env, bufSize);
 
-        if (bufSize < sizeof(cmsICCHeader)) {
-           JNU_ThrowByName(env, "java/awt/color/CMMException",
-                            "Insufficient buffer capacity");
-           return;
+        if (data == NULL) {
+            JNU_ThrowByName(env, "java/awt/color/CMMException",
+                            "Unable to allocate buffer");
+            return NULL;
         }
 
         dataArray = (*env)->GetByteArrayElements (env, data, 0);
@@ -432,7 +409,7 @@ JNIEXPORT void JNICALL Java_sun_java2d_cmm_lcms_LCMS_getTagData
         if (dataArray == NULL) {
            JNU_ThrowByName(env, "java/awt/color/CMMException",
                             "Unable to get buffer");
-           return;
+           return NULL;
         }
 
         status = _getHeaderInfo(sProf.pf, dataArray, bufSize);
@@ -442,9 +419,10 @@ JNIEXPORT void JNICALL Java_sun_java2d_cmm_lcms_LCMS_getTagData
         if (!status) {
             JNU_ThrowByName(env, "java/awt/color/CMMException",
                             "ICC Profile header not found");
+            return NULL;
         }
 
-        return;
+        return data;
     }
 
     if (cmsIsTag(sProf.pf, sig.cms)) {
@@ -452,16 +430,15 @@ JNIEXPORT void JNICALL Java_sun_java2d_cmm_lcms_LCMS_getTagData
     } else {
         JNU_ThrowByName(env, "java/awt/color/CMMException",
                         "ICC profile tag not found");
-        return;
+        return NULL;
     }
 
-    // verify data buffer capacity
-    bufSize = (*env)->GetArrayLength(env, data);
-
-    if (tagSize < 0 || 0 > bufSize || tagSize > bufSize) {
+    // allocate java array
+    data = (*env)->NewByteArray(env, tagSize);
+    if (data == NULL) {
         JNU_ThrowByName(env, "java/awt/color/CMMException",
-                        "Insufficient buffer capacity.");
-        return;
+                        "Unable to allocate buffer");
+        return NULL;
     }
 
     dataArray = (*env)->GetByteArrayElements (env, data, 0);
@@ -469,7 +446,7 @@ JNIEXPORT void JNICALL Java_sun_java2d_cmm_lcms_LCMS_getTagData
     if (dataArray == NULL) {
         JNU_ThrowByName(env, "java/awt/color/CMMException",
                         "Unable to get buffer");
-        return;
+        return NULL;
     }
 
     bufSize = cmsReadRawTag(sProf.pf, sig.cms, dataArray, tagSize);
@@ -479,8 +456,9 @@ JNIEXPORT void JNICALL Java_sun_java2d_cmm_lcms_LCMS_getTagData
     if (bufSize != tagSize) {
         JNU_ThrowByName(env, "java/awt/color/CMMException",
                         "Can not get tag data.");
+        return NULL;
     }
-    return;
+    return data;
 }
 
 /*
@@ -488,7 +466,7 @@ JNIEXPORT void JNICALL Java_sun_java2d_cmm_lcms_LCMS_getTagData
  * Method:    setTagData
  * Signature: (JI[B)V
  */
-JNIEXPORT void JNICALL Java_sun_java2d_cmm_lcms_LCMS_setTagData
+JNIEXPORT void JNICALL Java_sun_java2d_cmm_lcms_LCMS_setTagDataNative
   (JNIEnv *env, jobject obj, jlong id, jint tagSig, jbyteArray data)
 {
     storeID_t sProf;
@@ -586,6 +564,7 @@ JNIEXPORT void JNICALL Java_sun_java2d_cmm_lcms_LCMS_colorConvert
     char* inputRow;
     char* outputRow;
     jobject srcData, dstData;
+    jboolean srcAtOnce = JNI_FALSE, dstAtOnce = JNI_FALSE;
 
     srcOffset = (*env)->GetIntField (env, src, IL_offset_fID);
     srcNextRowOffset = (*env)->GetIntField (env, src, IL_nextRowOffset_fID);
@@ -594,6 +573,9 @@ JNIEXPORT void JNICALL Java_sun_java2d_cmm_lcms_LCMS_colorConvert
     width = (*env)->GetIntField (env, src, IL_width_fID);
     height = (*env)->GetIntField (env, src, IL_height_fID);
 
+    srcAtOnce = (*env)->GetBooleanField(env, src, IL_imageAtOnce_fID);
+    dstAtOnce = (*env)->GetBooleanField(env, dst, IL_imageAtOnce_fID);
+
     sTrans.j = (*env)->GetLongField (env, trans, Trans_ID_fID);
 
     if (sTrans.xf == NULL) {
@@ -625,10 +607,14 @@ JNIEXPORT void JNICALL Java_sun_java2d_cmm_lcms_LCMS_colorConvert
     inputRow = (char*)inputBuffer + srcOffset;
     outputRow = (char*)outputBuffer + dstOffset;
 
-    for (i = 0; i < height; i++) {
-        cmsDoTransform(sTrans.xf, inputRow, outputRow, width);
-        inputRow += srcNextRowOffset;
-        outputRow += dstNextRowOffset;
+    if (srcAtOnce && dstAtOnce) {
+        cmsDoTransform(sTrans.xf, inputRow, outputRow, width * height);
+    } else {
+        for (i = 0; i < height; i++) {
+            cmsDoTransform(sTrans.xf, inputRow, outputRow, width);
+            inputRow += srcNextRowOffset;
+            outputRow += dstNextRowOffset;
+        }
     }
 
     releaseILData(env, inputBuffer, srcDType, srcData);
@@ -670,6 +656,7 @@ JNIEXPORT void JNICALL Java_sun_java2d_cmm_lcms_LCMS_initLCMS
     IL_width_fID = (*env)->GetFieldID (env, IL, "width", "I");
     IL_height_fID = (*env)->GetFieldID (env, IL, "height", "I");
     IL_offset_fID = (*env)->GetFieldID (env, IL, "offset", "I");
+    IL_imageAtOnce_fID = (*env)->GetFieldID (env, IL, "imageAtOnce", "Z");
     IL_nextRowOffset_fID = (*env)->GetFieldID (env, IL, "nextRowOffset", "I");
 
     PF_ID_fID = (*env)->GetFieldID (env, Pf, "ID", "J");

From 7d6b4b81def031fd213fab050c8db1fe04eed29d Mon Sep 17 00:00:00 2001
From: Chris Hegarty <chegar@openjdk.org>
Date: Thu, 7 Mar 2013 10:07:13 +0000
Subject: [PATCH 280/311] 6370908: Add support for HTTP_CONNECT proxy in Socket
 class

Co-authored-by: Damjan Jovanovic <damjan.jov@gmail.com>
Reviewed-by: chegar
---
 .../java/net/HttpConnectSocketImpl.java       | 210 +++++++++++++
 jdk/src/share/classes/java/net/Socket.java    |   9 +-
 jdk/test/java/net/Socket/HttpProxy.java       | 281 ++++++++++++++++++
 3 files changed, 497 insertions(+), 3 deletions(-)
 create mode 100644 jdk/src/share/classes/java/net/HttpConnectSocketImpl.java
 create mode 100644 jdk/test/java/net/Socket/HttpProxy.java

diff --git a/jdk/src/share/classes/java/net/HttpConnectSocketImpl.java b/jdk/src/share/classes/java/net/HttpConnectSocketImpl.java
new file mode 100644
index 00000000000..b6e70cafd94
--- /dev/null
+++ b/jdk/src/share/classes/java/net/HttpConnectSocketImpl.java
@@ -0,0 +1,210 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.net;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Basic SocketImpl that relies on the internal HTTP protocol handler
+ * implementation to perform the HTTP tunneling and authentication. The
+ * sockets impl is swapped out and replaced with the socket from the HTTP
+ * handler after the tunnel is successfully setup.
+ *
+ * @since 1.8
+ */
+
+/*package*/ class HttpConnectSocketImpl extends PlainSocketImpl {
+
+    private static final String httpURLClazzStr =
+                                  "sun.net.www.protocol.http.HttpURLConnection";
+    private static final String netClientClazzStr = "sun.net.NetworkClient";
+    private static final String doTunnelingStr = "doTunneling";
+    private static final Field httpField;
+    private static final Field serverSocketField;
+    private static final Method doTunneling;
+
+    private final String server;
+    private InetSocketAddress external_address;
+    private HashMap<Integer, Object> optionsMap = new HashMap<>();
+
+    static  {
+        try {
+            Class<?> httpClazz = Class.forName(httpURLClazzStr, true, null);
+            httpField = httpClazz.getDeclaredField("http");
+            doTunneling = httpClazz.getDeclaredMethod(doTunnelingStr);
+            Class<?> netClientClazz = Class.forName(netClientClazzStr, true, null);
+            serverSocketField = netClientClazz.getDeclaredField("serverSocket");
+
+            java.security.AccessController.doPrivileged(
+                new java.security.PrivilegedAction<Void>() {
+                    public Void run() {
+                        httpField.setAccessible(true);
+                        serverSocketField.setAccessible(true);
+                        return null;
+                }
+            });
+        } catch (ReflectiveOperationException x) {
+            throw new InternalError("Should not reach here", x);
+        }
+    }
+
+    HttpConnectSocketImpl(String server, int port) {
+        this.server = server;
+        this.port = port;
+    }
+
+    HttpConnectSocketImpl(Proxy proxy) {
+        SocketAddress a = proxy.address();
+        if ( !(a instanceof InetSocketAddress) )
+            throw new IllegalArgumentException("Unsupported address type");
+
+        InetSocketAddress ad = (InetSocketAddress) a;
+        server = ad.getHostString();
+        port = ad.getPort();
+    }
+
+    @Override
+    protected void connect(SocketAddress endpoint, int timeout)
+        throws IOException
+    {
+        if (endpoint == null || !(endpoint instanceof InetSocketAddress))
+            throw new IllegalArgumentException("Unsupported address type");
+        final InetSocketAddress epoint = (InetSocketAddress)endpoint;
+        final String destHost = epoint.isUnresolved() ? epoint.getHostName()
+                                                      : epoint.getAddress().getHostAddress();
+        final int destPort = epoint.getPort();
+
+        SecurityManager security = System.getSecurityManager();
+        if (security != null)
+            security.checkConnect(destHost, destPort);
+
+        // Connect to the HTTP proxy server
+        String urlString = "http://" + destHost + ":" + destPort;
+        Socket httpSocket = privilegedDoTunnel(urlString, timeout);
+
+        // Success!
+        external_address = epoint;
+
+        // close the original socket impl and release its descriptor
+        close();
+
+        // update the Sockets impl to the impl from the http Socket
+        AbstractPlainSocketImpl psi = (AbstractPlainSocketImpl) httpSocket.impl;
+        this.getSocket().impl = psi;
+
+        // best effort is made to try and reset options previously set
+        Set<Map.Entry<Integer,Object>> options = optionsMap.entrySet();
+        try {
+            for(Map.Entry<Integer,Object> entry : options) {
+                psi.setOption(entry.getKey(), entry.getValue());
+            }
+        } catch (IOException x) {  /* gulp! */  }
+    }
+
+    @Override
+    public void setOption(int opt, Object val) throws SocketException {
+        super.setOption(opt, val);
+
+        if (external_address != null)
+            return;  // we're connected, just return
+
+        // store options so that they can be re-applied to the impl after connect
+        optionsMap.put(opt, val);
+    }
+
+    private Socket privilegedDoTunnel(final String urlString,
+                                      final int timeout)
+        throws IOException
+    {
+        try {
+            return java.security.AccessController.doPrivileged(
+                new java.security.PrivilegedExceptionAction<Socket>() {
+                    public Socket run() throws IOException {
+                        return doTunnel(urlString, timeout);
+                }
+            });
+        } catch (java.security.PrivilegedActionException pae) {
+            throw (IOException) pae.getException();
+        }
+    }
+
+    private Socket doTunnel(String urlString, int connectTimeout)
+        throws IOException
+    {
+        Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress(server, port));
+        URL destURL = new URL(urlString);
+        HttpURLConnection conn = (HttpURLConnection) destURL.openConnection(proxy);
+        conn.setConnectTimeout(connectTimeout);
+        conn.setReadTimeout(this.timeout);
+        conn.connect();
+        doTunneling(conn);
+        try {
+            Object httpClient = httpField.get(conn);
+            return (Socket) serverSocketField.get(httpClient);
+        } catch (IllegalAccessException x) {
+            throw new InternalError("Should not reach here", x);
+        }
+    }
+
+    private void doTunneling(HttpURLConnection conn) {
+        try {
+            doTunneling.invoke(conn);
+        } catch (ReflectiveOperationException x) {
+            throw new InternalError("Should not reach here", x);
+        }
+    }
+
+    @Override
+    protected InetAddress getInetAddress() {
+        if (external_address != null)
+            return external_address.getAddress();
+        else
+            return super.getInetAddress();
+    }
+
+    @Override
+    protected int getPort() {
+        if (external_address != null)
+            return external_address.getPort();
+        else
+            return super.getPort();
+    }
+
+    @Override
+    protected int getLocalPort() {
+        if (socket != null)
+            return super.getLocalPort();
+        if (external_address != null)
+            return external_address.getPort();
+        else
+            return super.getLocalPort();
+    }
+}
diff --git a/jdk/src/share/classes/java/net/Socket.java b/jdk/src/share/classes/java/net/Socket.java
index 22d4d6acd0a..d4f28e9ab6d 100644
--- a/jdk/src/share/classes/java/net/Socket.java
+++ b/jdk/src/share/classes/java/net/Socket.java
@@ -117,8 +117,10 @@ class Socket implements java.io.Closeable {
         if (proxy == null) {
             throw new IllegalArgumentException("Invalid Proxy");
         }
-        Proxy p = proxy == Proxy.NO_PROXY ? Proxy.NO_PROXY : sun.net.ApplicationProxy.create(proxy);
-        if (p.type() == Proxy.Type.SOCKS) {
+        Proxy p = proxy == Proxy.NO_PROXY ? Proxy.NO_PROXY
+                                          : sun.net.ApplicationProxy.create(proxy);
+        Proxy.Type type = p.type();
+        if (type == Proxy.Type.SOCKS || type == Proxy.Type.HTTP) {
             SecurityManager security = System.getSecurityManager();
             InetSocketAddress epoint = (InetSocketAddress) p.address();
             if (epoint.getAddress() != null) {
@@ -133,7 +135,8 @@ class Socket implements java.io.Closeable {
                     security.checkConnect(epoint.getAddress().getHostAddress(),
                                   epoint.getPort());
             }
-            impl = new SocksSocketImpl(p);
+            impl = type == Proxy.Type.SOCKS ? new SocksSocketImpl(p)
+                                            : new HttpConnectSocketImpl(p);
             impl.setSocket(this);
         } else {
             if (p == Proxy.NO_PROXY) {
diff --git a/jdk/test/java/net/Socket/HttpProxy.java b/jdk/test/java/net/Socket/HttpProxy.java
new file mode 100644
index 00000000000..92f14d2d32a
--- /dev/null
+++ b/jdk/test/java/net/Socket/HttpProxy.java
@@ -0,0 +1,281 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 6370908
+ * @summary Add support for HTTP_CONNECT proxy in Socket class
+ */
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import static java.lang.System.out;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.ServerSocket;
+import java.net.Socket;
+import sun.net.www.MessageHeader;
+
+public class HttpProxy {
+    final String proxyHost;
+    final int proxyPort;
+    static final int SO_TIMEOUT = 15000;
+
+    public static void main(String[] args) throws Exception {
+        String host;
+        int port;
+        if (args.length == 0) {
+            // Start internal proxy
+            ConnectProxyTunnelServer proxy = new ConnectProxyTunnelServer();
+            proxy.start();
+            host = "localhost";
+            port = proxy.getLocalPort();
+            out.println("Running with internal proxy: " + host + ":" + port);
+        } else if (args.length == 2) {
+            host = args[0];
+            port = Integer.valueOf(args[1]);
+            out.println("Running against specified proxy server: " + host + ":" + port);
+        } else {
+            System.err.println("Usage: java HttpProxy [<proxy host> <proxy port>]");
+            return;
+        }
+
+        HttpProxy p = new HttpProxy(host, port);
+        p.test();
+    }
+
+    public HttpProxy(String proxyHost, int proxyPort) {
+        this.proxyHost = proxyHost;
+        this.proxyPort = proxyPort;
+    }
+
+    void test() throws Exception {
+        InetSocketAddress proxyAddress = new InetSocketAddress(proxyHost, proxyPort);
+        Proxy httpProxy = new Proxy(Proxy.Type.HTTP, proxyAddress);
+
+        try (ServerSocket ss = new ServerSocket(0);
+             Socket sock = new Socket(httpProxy)) {
+            sock.setSoTimeout(SO_TIMEOUT);
+            sock.setTcpNoDelay(false);
+
+            InetSocketAddress externalAddress =
+                new InetSocketAddress(InetAddress.getLocalHost(), ss.getLocalPort());
+
+            out.println("Trying to connect to server socket on " + externalAddress);
+            sock.connect(externalAddress);
+            try (Socket externalSock = ss.accept()) {
+                // perform some simple checks
+                check(sock.isBound(), "Socket is not bound");
+                check(sock.isConnected(), "Socket is not connected");
+                check(!sock.isClosed(), "Socket should not be closed");
+                check(sock.getSoTimeout() == SO_TIMEOUT,
+                        "Socket should have a previously set timeout");
+                check(sock.getTcpNoDelay() ==  false, "NODELAY should be false");
+
+                simpleDataExchange(sock, externalSock);
+            }
+        }
+    }
+
+    static void check(boolean condition, String message) {
+        if (!condition) out.println(message);
+    }
+
+    static Exception unexpected(Exception e) {
+        out.println("Unexcepted Exception: " + e);
+        e.printStackTrace();
+        return e;
+    }
+
+    // performs a simple exchange of data between the two sockets
+    // and throws an exception if there is any problem.
+    void simpleDataExchange(Socket s1, Socket s2) throws Exception {
+        try (final InputStream i1 = s1.getInputStream();
+             final InputStream i2 = s2.getInputStream();
+             final OutputStream o1 = s1.getOutputStream();
+             final OutputStream o2 = s2.getOutputStream()) {
+            startSimpleWriter("simpleWriter1", o1, 100);
+            startSimpleWriter("simpleWriter2", o2, 200);
+            simpleRead(i2, 100);
+            simpleRead(i1, 200);
+        }
+    }
+
+    void startSimpleWriter(String threadName, final OutputStream os, final int start) {
+        (new Thread(new Runnable() {
+            public void run() {
+                try { simpleWrite(os, start); }
+                catch (Exception e) {unexpected(e); }
+            }}, threadName)).start();
+    }
+
+    void simpleWrite(OutputStream os, int start) throws Exception {
+        byte b[] = new byte[2];
+        for (int i=start; i<start+100; i++) {
+            b[0] = (byte) (i / 256);
+            b[1] = (byte) (i % 256);
+            os.write(b);
+        }
+    }
+
+    void simpleRead(InputStream is, int start) throws Exception {
+        byte b[] = new byte [2];
+        for (int i=start; i<start+100; i++) {
+            int x = is.read(b);
+            if (x == 1)
+                x += is.read(b,1,1);
+            if (x!=2)
+                throw new Exception("read error");
+            int r = bytes(b[0], b[1]);
+            if (r != i)
+                throw new Exception("read " + r + " expected " +i);
+        }
+    }
+
+    int bytes(byte b1, byte b2) {
+        int i1 = (int)b1 & 0xFF;
+        int i2 = (int)b2 & 0xFF;
+        return i1 * 256 + i2;
+    }
+
+    static class ConnectProxyTunnelServer extends Thread {
+
+        private final ServerSocket ss;
+
+        public ConnectProxyTunnelServer() throws IOException {
+            ss = new ServerSocket(0);
+        }
+
+        @Override
+        public void run() {
+            try (Socket clientSocket = ss.accept()) {
+                processRequest(clientSocket);
+            } catch (Exception e) {
+                out.println("Proxy Failed: " + e);
+                e.printStackTrace();
+            } finally {
+                try { ss.close(); } catch (IOException x) { unexpected(x); }
+            }
+        }
+
+        /**
+         * Returns the port on which the proxy is accepting connections.
+         */
+        public int getLocalPort() {
+            return ss.getLocalPort();
+        }
+
+        /*
+         * Processes the CONNECT request
+         */
+        private void processRequest(Socket clientSocket) throws Exception {
+            MessageHeader mheader = new MessageHeader(clientSocket.getInputStream());
+            String statusLine = mheader.getValue(0);
+
+            if (!statusLine.startsWith("CONNECT")) {
+                out.println("proxy server: processes only "
+                                  + "CONNECT method requests, recieved: "
+                                  + statusLine);
+                return;
+            }
+
+            // retrieve the host and port info from the status-line
+            InetSocketAddress serverAddr = getConnectInfo(statusLine);
+
+            //open socket to the server
+            try (Socket serverSocket = new Socket(serverAddr.getAddress(),
+                                                  serverAddr.getPort())) {
+                Forwarder clientFW = new Forwarder(clientSocket.getInputStream(),
+                                                   serverSocket.getOutputStream());
+                Thread clientForwarderThread = new Thread(clientFW, "ClientForwarder");
+                clientForwarderThread.start();
+                send200(clientSocket);
+                Forwarder serverFW = new Forwarder(serverSocket.getInputStream(),
+                                                   clientSocket.getOutputStream());
+                serverFW.run();
+                clientForwarderThread.join();
+            }
+        }
+
+        private void send200(Socket clientSocket) throws IOException {
+            OutputStream out = clientSocket.getOutputStream();
+            PrintWriter pout = new PrintWriter(out);
+
+            pout.println("HTTP/1.1 200 OK");
+            pout.println();
+            pout.flush();
+        }
+
+        /*
+         * This method retrieves the hostname and port of the tunnel destination
+         * from the request line.
+         * @param connectStr
+         *        of the form: <i>CONNECT server-name:server-port HTTP/1.x</i>
+         */
+        static InetSocketAddress getConnectInfo(String connectStr)
+            throws Exception
+        {
+            try {
+                int starti = connectStr.indexOf(' ');
+                int endi = connectStr.lastIndexOf(' ');
+                String connectInfo = connectStr.substring(starti+1, endi).trim();
+                // retrieve server name and port
+                endi = connectInfo.indexOf(':');
+                String name = connectInfo.substring(0, endi);
+                int port = Integer.parseInt(connectInfo.substring(endi+1));
+                return new InetSocketAddress(name, port);
+            } catch (Exception e) {
+                out.println("Proxy recieved a request: " + connectStr);
+                throw unexpected(e);
+            }
+        }
+    }
+
+    /* Reads from the given InputStream and writes to the given OutputStream */
+    static class Forwarder implements Runnable
+    {
+        private final InputStream in;
+        private final OutputStream os;
+
+        Forwarder(InputStream in, OutputStream os) {
+            this.in = in;
+            this.os = os;
+        }
+
+        @Override
+        public void run() {
+            try {
+                byte[] ba = new byte[1024];
+                int count;
+                while ((count = in.read(ba)) != -1) {
+                    os.write(ba, 0, count);
+                }
+            } catch (IOException e) {
+                unexpected(e);
+            }
+        }
+    }
+}

From 3baff284ba4c5ef69118024dab4f8ee1c88c07e3 Mon Sep 17 00:00:00 2001
From: Tao Mao <tao.mao@oracle.com>
Date: Thu, 7 Mar 2013 10:44:04 -0800
Subject: [PATCH 281/311] 8008368: Deprecate MaxGCMinorPauseMillis

Deprecate MaxGCMinorPauseMillis and emit a warning if set by users

Reviewed-by: brutisso, johnc
---
 hotspot/src/share/vm/runtime/arguments.cpp | 8 ++++++++
 hotspot/src/share/vm/runtime/arguments.hpp | 1 +
 2 files changed, 9 insertions(+)

diff --git a/hotspot/src/share/vm/runtime/arguments.cpp b/hotspot/src/share/vm/runtime/arguments.cpp
index db634c621b3..d6e4c308444 100644
--- a/hotspot/src/share/vm/runtime/arguments.cpp
+++ b/hotspot/src/share/vm/runtime/arguments.cpp
@@ -1813,6 +1813,13 @@ void Arguments::check_deprecated_gcs() {
   }
 }
 
+void Arguments::check_deprecated_gc_flags() {
+  if (FLAG_IS_CMDLINE(MaxGCMinorPauseMillis)) {
+    warning("Using MaxGCMinorPauseMillis as minor pause goal is deprecated"
+            "and will likely be removed in future release");
+  }
+}
+
 // Check stack pages settings
 bool Arguments::check_stack_pages()
 {
@@ -3292,6 +3299,7 @@ jint Arguments::parse(const JavaVMInitArgs* args) {
     set_g1_gc_flags();
   }
   check_deprecated_gcs();
+  check_deprecated_gc_flags();
 #else // INCLUDE_ALL_GCS
   assert(verify_serial_gc_flags(), "SerialGC unset");
 #endif // INCLUDE_ALL_GCS
diff --git a/hotspot/src/share/vm/runtime/arguments.hpp b/hotspot/src/share/vm/runtime/arguments.hpp
index c116e2028bb..26c029744da 100644
--- a/hotspot/src/share/vm/runtime/arguments.hpp
+++ b/hotspot/src/share/vm/runtime/arguments.hpp
@@ -414,6 +414,7 @@ class Arguments : AllStatic {
   // Check for consistency in the selection of the garbage collector.
   static bool check_gc_consistency();
   static void check_deprecated_gcs();
+  static void check_deprecated_gc_flags();
   // Check consistecy or otherwise of VM argument settings
   static bool check_vm_args_consistency();
   // Check stack pages settings

From 4cdcd6dc138f4a951f40a784b226b4e260aff1ea Mon Sep 17 00:00:00 2001
From: Zhengyu Gu <zgu@openjdk.org>
Date: Thu, 7 Mar 2013 14:06:44 -0500
Subject: [PATCH 282/311] 8008257: NMT: assert(new_rec->is_allocation_record())
 failed when running with shared memory option

Corrected virtual memory recording and tagging code when large pages are used

Reviewed-by: coleenp, ccheung
---
 hotspot/src/os/bsd/vm/os_bsd.cpp         | 15 +++++++++++++-
 hotspot/src/os/linux/vm/os_linux.cpp     | 14 ++++++++++++-
 hotspot/src/os/solaris/vm/os_solaris.cpp | 14 ++++++++++++-
 hotspot/src/os/windows/vm/os_windows.cpp | 26 +++++++++++++++++++++++-
 4 files changed, 65 insertions(+), 4 deletions(-)

diff --git a/hotspot/src/os/bsd/vm/os_bsd.cpp b/hotspot/src/os/bsd/vm/os_bsd.cpp
index fdf5772a764..b8d976dd486 100644
--- a/hotspot/src/os/bsd/vm/os_bsd.cpp
+++ b/hotspot/src/os/bsd/vm/os_bsd.cpp
@@ -57,6 +57,7 @@
 #include "runtime/threadCritical.hpp"
 #include "runtime/timer.hpp"
 #include "services/attachListener.hpp"
+#include "services/memTracker.hpp"
 #include "services/runtimeService.hpp"
 #include "utilities/decoder.hpp"
 #include "utilities/defaultStream.hpp"
@@ -2275,13 +2276,25 @@ char* os::reserve_memory_special(size_t bytes, char* req_addr, bool exec) {
      return NULL;
   }
 
+  // The memory is committed
+  address pc = CALLER_PC;
+  MemTracker::record_virtual_memory_reserve((address)addr, bytes, pc);
+  MemTracker::record_virtual_memory_commit((address)addr, bytes, pc);
+
   return addr;
 }
 
 bool os::release_memory_special(char* base, size_t bytes) {
   // detaching the SHM segment will also delete it, see reserve_memory_special()
   int rslt = shmdt(base);
-  return rslt == 0;
+  if (rslt == 0) {
+    MemTracker::record_virtual_memory_uncommit((address)base, bytes);
+    MemTracker::record_virtual_memory_release((address)base, bytes);
+    return true;
+  } else {
+    return false;
+  }
+
 }
 
 size_t os::large_page_size() {
diff --git a/hotspot/src/os/linux/vm/os_linux.cpp b/hotspot/src/os/linux/vm/os_linux.cpp
index 6dfe962b1c5..59cb59d6805 100644
--- a/hotspot/src/os/linux/vm/os_linux.cpp
+++ b/hotspot/src/os/linux/vm/os_linux.cpp
@@ -58,6 +58,7 @@
 #include "runtime/threadCritical.hpp"
 #include "runtime/timer.hpp"
 #include "services/attachListener.hpp"
+#include "services/memTracker.hpp"
 #include "services/runtimeService.hpp"
 #include "utilities/decoder.hpp"
 #include "utilities/defaultStream.hpp"
@@ -3212,13 +3213,24 @@ char* os::reserve_memory_special(size_t bytes, char* req_addr, bool exec) {
     numa_make_global(addr, bytes);
   }
 
+  // The memory is committed
+  address pc = CALLER_PC;
+  MemTracker::record_virtual_memory_reserve((address)addr, bytes, pc);
+  MemTracker::record_virtual_memory_commit((address)addr, bytes, pc);
+
   return addr;
 }
 
 bool os::release_memory_special(char* base, size_t bytes) {
   // detaching the SHM segment will also delete it, see reserve_memory_special()
   int rslt = shmdt(base);
-  return rslt == 0;
+  if (rslt == 0) {
+    MemTracker::record_virtual_memory_uncommit((address)base, bytes);
+    MemTracker::record_virtual_memory_release((address)base, bytes);
+    return true;
+  } else {
+   return false;
+  }
 }
 
 size_t os::large_page_size() {
diff --git a/hotspot/src/os/solaris/vm/os_solaris.cpp b/hotspot/src/os/solaris/vm/os_solaris.cpp
index a80a0ea4590..ce24b906534 100644
--- a/hotspot/src/os/solaris/vm/os_solaris.cpp
+++ b/hotspot/src/os/solaris/vm/os_solaris.cpp
@@ -3420,13 +3420,25 @@ char* os::reserve_memory_special(size_t size, char* addr, bool exec) {
   if ((retAddr != NULL) && UseNUMAInterleaving) {
     numa_make_global(retAddr, size);
   }
+
+  // The memory is committed
+  address pc = CALLER_PC;
+  MemTracker::record_virtual_memory_reserve((address)retAddr, size, pc);
+  MemTracker::record_virtual_memory_commit((address)retAddr, size, pc);
+
   return retAddr;
 }
 
 bool os::release_memory_special(char* base, size_t bytes) {
   // detaching the SHM segment will also delete it, see reserve_memory_special()
   int rslt = shmdt(base);
-  return rslt == 0;
+  if (rslt == 0) {
+    MemTracker::record_virtual_memory_uncommit((address)base, bytes);
+    MemTracker::record_virtual_memory_release((address)base, bytes);
+    return true;
+  } else {
+   return false;
+  }
 }
 
 size_t os::large_page_size() {
diff --git a/hotspot/src/os/windows/vm/os_windows.cpp b/hotspot/src/os/windows/vm/os_windows.cpp
index b1556bf6491..4a99a1b3975 100644
--- a/hotspot/src/os/windows/vm/os_windows.cpp
+++ b/hotspot/src/os/windows/vm/os_windows.cpp
@@ -60,6 +60,7 @@
 #include "runtime/threadCritical.hpp"
 #include "runtime/timer.hpp"
 #include "services/attachListener.hpp"
+#include "services/memTracker.hpp"
 #include "services/runtimeService.hpp"
 #include "utilities/decoder.hpp"
 #include "utilities/defaultStream.hpp"
@@ -2836,7 +2837,7 @@ static char* allocate_pages_individually(size_t bytes, char* addr, DWORD flags,
                                 PAGE_READWRITE);
   // If reservation failed, return NULL
   if (p_buf == NULL) return NULL;
-
+  MemTracker::record_virtual_memory_reserve((address)p_buf, size_of_reserve, CALLER_PC);
   os::release_memory(p_buf, bytes + chunk_size);
 
   // we still need to round up to a page boundary (in case we are using large pages)
@@ -2898,6 +2899,11 @@ static char* allocate_pages_individually(size_t bytes, char* addr, DWORD flags,
       if (next_alloc_addr > p_buf) {
         // Some memory was committed so release it.
         size_t bytes_to_release = bytes - bytes_remaining;
+        // NMT has yet to record any individual blocks, so it
+        // need to create a dummy 'reserve' record to match
+        // the release.
+        MemTracker::record_virtual_memory_reserve((address)p_buf,
+          bytes_to_release, CALLER_PC);
         os::release_memory(p_buf, bytes_to_release);
       }
 #ifdef ASSERT
@@ -2909,10 +2915,19 @@ static char* allocate_pages_individually(size_t bytes, char* addr, DWORD flags,
 #endif
       return NULL;
     }
+
     bytes_remaining -= bytes_to_rq;
     next_alloc_addr += bytes_to_rq;
     count++;
   }
+  // Although the memory is allocated individually, it is returned as one.
+  // NMT records it as one block.
+  address pc = CALLER_PC;
+  MemTracker::record_virtual_memory_reserve((address)p_buf, bytes, pc);
+  if ((flags & MEM_COMMIT) != 0) {
+    MemTracker::record_virtual_memory_commit((address)p_buf, bytes, pc);
+  }
+
   // made it this far, success
   return p_buf;
 }
@@ -3099,11 +3114,20 @@ char* os::reserve_memory_special(size_t bytes, char* addr, bool exec) {
     // normal policy just allocate it all at once
     DWORD flag = MEM_RESERVE | MEM_COMMIT | MEM_LARGE_PAGES;
     char * res = (char *)VirtualAlloc(NULL, bytes, flag, prot);
+    if (res != NULL) {
+      address pc = CALLER_PC;
+      MemTracker::record_virtual_memory_reserve((address)res, bytes, pc);
+      MemTracker::record_virtual_memory_commit((address)res, bytes, pc);
+    }
+
     return res;
   }
 }
 
 bool os::release_memory_special(char* base, size_t bytes) {
+  assert(base != NULL, "Sanity check");
+  // Memory allocated via reserve_memory_special() is committed
+  MemTracker::record_virtual_memory_uncommit((address)base, bytes);
   return release_memory(base, bytes);
 }
 

From 9849742625be80c3f11e0b34b4717c9045e72f4a Mon Sep 17 00:00:00 2001
From: Alan Bateman <alanb@openjdk.org>
Date: Fri, 8 Mar 2013 12:03:26 +0000
Subject: [PATCH 283/311] 8006000: TEST_BUG:
 java/lang/invoke/lambda/LambdaAccessControlTest.java fails intermittently

Reviewed-by: chegar
---
 jdk/test/java/lang/invoke/lambda/LUtils.java  | 171 ++++++++++++++++++
 .../LambdaAccessControlDoPrivilegedTest.java  | 147 +--------------
 .../lambda/LambdaAccessControlTest.java       |   2 +-
 3 files changed, 173 insertions(+), 147 deletions(-)
 create mode 100644 jdk/test/java/lang/invoke/lambda/LUtils.java

diff --git a/jdk/test/java/lang/invoke/lambda/LUtils.java b/jdk/test/java/lang/invoke/lambda/LUtils.java
new file mode 100644
index 00000000000..a7b013e3a6c
--- /dev/null
+++ b/jdk/test/java/lang/invoke/lambda/LUtils.java
@@ -0,0 +1,171 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/*
+ * support infrastructure to invoke a java class from the command line
+ */
+class LUtils {
+    static final sun.tools.jar.Main jarTool =
+            new sun.tools.jar.Main(System.out, System.err, "jar-tool");
+    static final com.sun.tools.javac.Main javac =
+            new com.sun.tools.javac.Main();
+    static final File cwd = new File(".").getAbsoluteFile();
+    static final String JAVAHOME = System.getProperty("java.home");
+    static final boolean isWindows =
+            System.getProperty("os.name", "unknown").startsWith("Windows");
+    //static final boolean isSDK = JAVAHOME.endsWith("jre");
+    static final File JAVA_BIN_FILE = new File(JAVAHOME, "bin");
+    static final File JAVA_CMD = new File(JAVA_BIN_FILE,
+            isWindows ? "java.exe" : "java");
+
+    protected LUtils() {
+    }
+
+    public static void compile(String... args) {
+        if (javac.compile(args) != 0) {
+            throw new RuntimeException("compilation fails");
+        }
+    }
+
+    static void createFile(File outFile, List<String> content) {
+        try {
+            Files.write(outFile.getAbsoluteFile().toPath(), content,
+                    Charset.defaultCharset());
+        } catch (IOException ex) {
+            throw new RuntimeException(ex);
+        }
+    }
+
+    static File getClassFile(File javaFile) {
+        return javaFile.getName().endsWith(".java")
+                ? new File(javaFile.getName().replace(".java", ".class"))
+                : null;
+    }
+
+    static String getSimpleName(File inFile) {
+        String fname = inFile.getName();
+        return fname.substring(0, fname.indexOf("."));
+    }
+
+    static TestResult doExec(String... cmds) {
+        return doExec(null, null, cmds);
+    }
+
+    /*
+     * A method which executes a java cmd and returns the results in a container
+     */
+    static TestResult doExec(Map<String, String> envToSet,
+            java.util.Set<String> envToRemove, String... cmds) {
+        String cmdStr = "";
+        for (String x : cmds) {
+            cmdStr = cmdStr.concat(x + " ");
+        }
+        ProcessBuilder pb = new ProcessBuilder(cmds);
+        Map<String, String> env = pb.environment();
+        if (envToRemove != null) {
+            for (String key : envToRemove) {
+                env.remove(key);
+            }
+        }
+        if (envToSet != null) {
+            env.putAll(envToSet);
+        }
+        BufferedReader rdr = null;
+        try {
+            List<String> outputList = new ArrayList<>();
+            pb.redirectErrorStream(true);
+            Process p = pb.start();
+            rdr = new BufferedReader(new InputStreamReader(p.getInputStream()));
+            String in = rdr.readLine();
+            while (in != null) {
+                outputList.add(in);
+                in = rdr.readLine();
+            }
+            p.waitFor();
+            p.destroy();
+
+            return new TestResult(cmdStr, p.exitValue(), outputList,
+                    env, new Throwable("current stack of the test"));
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new RuntimeException(ex.getMessage());
+        }
+    }
+
+    static class TestResult {
+        String cmd;
+        int exitValue;
+        List<String> testOutput;
+        Map<String, String> env;
+        Throwable t;
+
+        public TestResult(String str, int rv, List<String> oList,
+                Map<String, String> env, Throwable t) {
+            cmd = str;
+            exitValue = rv;
+            testOutput = oList;
+            this.env = env;
+            this.t = t;
+        }
+
+        void assertZero(String message) {
+            if (exitValue != 0) {
+                System.err.println(this);
+                throw new RuntimeException(message);
+            }
+        }
+
+        @Override
+        public String toString() {
+            StringWriter sw = new StringWriter();
+            PrintWriter status = new PrintWriter(sw);
+            status.println("Cmd: " + cmd);
+            status.println("Return code: " + exitValue);
+            status.println("Environment variable:");
+            for (String x : env.keySet()) {
+                status.println("\t" + x + "=" + env.get(x));
+            }
+            status.println("Output:");
+            for (String x : testOutput) {
+                status.println("\t" + x);
+            }
+            status.println("Exception:");
+            status.println(t.getMessage());
+            t.printStackTrace(status);
+
+            return sw.getBuffer().toString();
+        }
+    }
+}
diff --git a/jdk/test/java/lang/invoke/lambda/LambdaAccessControlDoPrivilegedTest.java b/jdk/test/java/lang/invoke/lambda/LambdaAccessControlDoPrivilegedTest.java
index 8c3d1c5ed5b..e9e5cbcd1c2 100644
--- a/jdk/test/java/lang/invoke/lambda/LambdaAccessControlDoPrivilegedTest.java
+++ b/jdk/test/java/lang/invoke/lambda/LambdaAccessControlDoPrivilegedTest.java
@@ -26,20 +26,12 @@
  * @bug 8003881
  * @summary tests DoPrivileged action (implemented as lambda expressions) by
  * inserting them into the BootClassPath.
- * @compile -XDignore.symbol.file LambdaAccessControlDoPrivilegedTest.java
+ * @compile -XDignore.symbol.file LambdaAccessControlDoPrivilegedTest.java LUtils.java
  * @run main/othervm LambdaAccessControlDoPrivilegedTest
  */
-import java.io.BufferedReader;
 import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.nio.charset.Charset;
-import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 public class LambdaAccessControlDoPrivilegedTest extends LUtils {
     public static void main(String... args) {
@@ -87,140 +79,3 @@ public class LambdaAccessControlDoPrivilegedTest extends LUtils {
         jarFile.delete();
     }
 }
-
-/*
- * support infrastructure to invoke a java class from the command line
- */
-class LUtils {
-    static final sun.tools.jar.Main jarTool =
-            new sun.tools.jar.Main(System.out, System.err, "jar-tool");
-    static final com.sun.tools.javac.Main javac =
-            new com.sun.tools.javac.Main();
-    static final File cwd = new File(".").getAbsoluteFile();
-    static final String JAVAHOME = System.getProperty("java.home");
-    static final boolean isWindows =
-            System.getProperty("os.name", "unknown").startsWith("Windows");
-    //static final boolean isSDK = JAVAHOME.endsWith("jre");
-    static final File JAVA_BIN_FILE = new File(JAVAHOME, "bin");
-    static final File JAVA_CMD = new File(JAVA_BIN_FILE,
-            isWindows ? "java.exe" : "java");
-
-    protected LUtils() {
-    }
-
-    public static void compile(String... args) {
-        if (javac.compile(args) != 0) {
-            throw new RuntimeException("compilation fails");
-        }
-    }
-
-    static void createFile(File outFile, List<String> content) {
-        try {
-            Files.write(outFile.getAbsoluteFile().toPath(), content,
-                    Charset.defaultCharset());
-        } catch (IOException ex) {
-            throw new RuntimeException(ex);
-        }
-    }
-
-    static File getClassFile(File javaFile) {
-        return javaFile.getName().endsWith(".java")
-                ? new File(javaFile.getName().replace(".java", ".class"))
-                : null;
-    }
-
-    static String getSimpleName(File inFile) {
-        String fname = inFile.getName();
-        return fname.substring(0, fname.indexOf("."));
-    }
-
-    static TestResult doExec(String... cmds) {
-        return doExec(null, null, cmds);
-    }
-
-    /*
-     * A method which executes a java cmd and returns the results in a container
-     */
-    static TestResult doExec(Map<String, String> envToSet,
-            java.util.Set<String> envToRemove, String... cmds) {
-        String cmdStr = "";
-        for (String x : cmds) {
-            cmdStr = cmdStr.concat(x + " ");
-        }
-        ProcessBuilder pb = new ProcessBuilder(cmds);
-        Map<String, String> env = pb.environment();
-        if (envToRemove != null) {
-            for (String key : envToRemove) {
-                env.remove(key);
-            }
-        }
-        if (envToSet != null) {
-            env.putAll(envToSet);
-        }
-        BufferedReader rdr = null;
-        try {
-            List<String> outputList = new ArrayList<>();
-            pb.redirectErrorStream(true);
-            Process p = pb.start();
-            rdr = new BufferedReader(new InputStreamReader(p.getInputStream()));
-            String in = rdr.readLine();
-            while (in != null) {
-                outputList.add(in);
-                in = rdr.readLine();
-            }
-            p.waitFor();
-            p.destroy();
-
-            return new TestResult(cmdStr, p.exitValue(), outputList,
-                    env, new Throwable("current stack of the test"));
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex.getMessage());
-        }
-    }
-
-    static class TestResult {
-        String cmd;
-        int exitValue;
-        List<String> testOutput;
-        Map<String, String> env;
-        Throwable t;
-
-        public TestResult(String str, int rv, List<String> oList,
-                Map<String, String> env, Throwable t) {
-            cmd = str;
-            exitValue = rv;
-            testOutput = oList;
-            this.env = env;
-            this.t = t;
-        }
-
-        void assertZero(String message) {
-            if (exitValue != 0) {
-                System.err.println(this);
-                throw new RuntimeException(message);
-            }
-        }
-
-        @Override
-        public String toString() {
-            StringWriter sw = new StringWriter();
-            PrintWriter status = new PrintWriter(sw);
-            status.println("Cmd: " + cmd);
-            status.println("Return code: " + exitValue);
-            status.println("Environment variable:");
-            for (String x : env.keySet()) {
-                status.println("\t" + x + "=" + env.get(x));
-            }
-            status.println("Output:");
-            for (String x : testOutput) {
-                status.println("\t" + x);
-            }
-            status.println("Exception:");
-            status.println(t.getMessage());
-            t.printStackTrace(status);
-
-            return sw.getBuffer().toString();
-        }
-    }
-}
diff --git a/jdk/test/java/lang/invoke/lambda/LambdaAccessControlTest.java b/jdk/test/java/lang/invoke/lambda/LambdaAccessControlTest.java
index 361a4cffcce..6ca9fb0beb2 100644
--- a/jdk/test/java/lang/invoke/lambda/LambdaAccessControlTest.java
+++ b/jdk/test/java/lang/invoke/lambda/LambdaAccessControlTest.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 8003881
  * @summary tests Lambda expression with a a security manager at top level
- * @compile -XDignore.symbol.file LambdaAccessControlTest.java
+ * @compile -XDignore.symbol.file LambdaAccessControlTest.java LUtils.java
  *
  * @run main/othervm LambdaAccessControlTest
  */

From 5d0afe6210f05bfb5b92a925fe5b26b0bcddd60d Mon Sep 17 00:00:00 2001
From: Alejandro Murillo <amurillo@openjdk.org>
Date: Fri, 8 Mar 2013 08:22:18 -0800
Subject: [PATCH 284/311] 8009688: new hotspot build - hs25-b23

Reviewed-by: jcoomes
---
 hotspot/make/hotspot_version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hotspot/make/hotspot_version b/hotspot/make/hotspot_version
index b52c3c52dfb..28b5a9a1114 100644
--- a/hotspot/make/hotspot_version
+++ b/hotspot/make/hotspot_version
@@ -35,7 +35,7 @@ HOTSPOT_VM_COPYRIGHT=Copyright 2013
 
 HS_MAJOR_VER=25
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=22
+HS_BUILD_NUMBER=23
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8

From addd95f165c2db5c2aedc8d7ed27fcd73d9e3a01 Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Fri, 8 Mar 2013 11:47:57 -0500
Subject: [PATCH 285/311] 8003553: NPG: metaspace objects should be zeroed in
 constructors

Zero metadata in constructors, not in allocation (and some in constructors)

Reviewed-by: jmasa, sspitsyn
---
 hotspot/src/share/vm/interpreter/rewriter.cpp |  6 +-
 hotspot/src/share/vm/memory/metablock.cpp     |  7 +-
 hotspot/src/share/vm/memory/metaspace.cpp     |  3 +-
 hotspot/src/share/vm/oops/constMethod.cpp     |  6 ++
 hotspot/src/share/vm/oops/cpCache.cpp         | 12 ++-
 hotspot/src/share/vm/oops/cpCache.hpp         | 14 ++-
 hotspot/src/share/vm/oops/instanceKlass.cpp   | 98 ++++++++++---------
 hotspot/src/share/vm/oops/instanceKlass.hpp   |  4 +-
 hotspot/src/share/vm/oops/klass.cpp           | 18 ++--
 hotspot/src/share/vm/oops/klass.hpp           |  5 -
 hotspot/src/share/vm/oops/method.cpp          |  8 +-
 hotspot/src/share/vm/oops/methodData.cpp      | 26 ++---
 hotspot/src/share/vm/runtime/vmStructs.cpp    |  1 -
 13 files changed, 111 insertions(+), 97 deletions(-)

diff --git a/hotspot/src/share/vm/interpreter/rewriter.cpp b/hotspot/src/share/vm/interpreter/rewriter.cpp
index 0b5d2513925..249fca33afe 100644
--- a/hotspot/src/share/vm/interpreter/rewriter.cpp
+++ b/hotspot/src/share/vm/interpreter/rewriter.cpp
@@ -84,15 +84,13 @@ void Rewriter::make_constant_pool_cache(TRAPS) {
   const int length = _cp_cache_map.length();
   ClassLoaderData* loader_data = _pool->pool_holder()->class_loader_data();
   ConstantPoolCache* cache =
-      ConstantPoolCache::allocate(loader_data, length, CHECK);
+      ConstantPoolCache::allocate(loader_data, length, _cp_cache_map,
+                                  _invokedynamic_references_map, CHECK);
 
   // initialize object cache in constant pool
   _pool->initialize_resolved_references(loader_data, _resolved_references_map,
                                         _resolved_reference_limit,
                                         CHECK);
-
-  No_Safepoint_Verifier nsv;
-  cache->initialize(_cp_cache_map, _invokedynamic_references_map);
   _pool->set_cache(cache);
   cache->set_constant_pool(_pool());
 }
diff --git a/hotspot/src/share/vm/memory/metablock.cpp b/hotspot/src/share/vm/memory/metablock.cpp
index 8aa6a9f8372..7ffaec57f71 100644
--- a/hotspot/src/share/vm/memory/metablock.cpp
+++ b/hotspot/src/share/vm/memory/metablock.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -65,10 +65,9 @@ Metablock* Metablock::initialize(MetaWord* p, size_t word_size) {
   }
 
   Metablock* result = (Metablock*) p;
-
-  // Clear the memory
-  Copy::fill_to_aligned_words((HeapWord*)result, word_size);
 #ifdef ASSERT
+  // Add just to catch missing initializations
+  Copy::fill_to_words((HeapWord*) result, word_size, 0xf1f1f1f1);
   result->set_word_size(word_size);
 #endif
   return result;
diff --git a/hotspot/src/share/vm/memory/metaspace.cpp b/hotspot/src/share/vm/memory/metaspace.cpp
index b0891150d9c..7853b3d51f1 100644
--- a/hotspot/src/share/vm/memory/metaspace.cpp
+++ b/hotspot/src/share/vm/memory/metaspace.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,7 +52,6 @@ const bool metaspace_slow_verify = false;
 const uint metadata_deallocate_a_lot_block = 10;
 const uint metadata_deallocate_a_lock_chunk = 3;
 size_t const allocation_from_dictionary_limit = 64 * K;
-const size_t metadata_deallocate = 0xf5f5f5f5;
 
 MetaWord* last_allocated = 0;
 
diff --git a/hotspot/src/share/vm/oops/constMethod.cpp b/hotspot/src/share/vm/oops/constMethod.cpp
index 35b7be24fc9..ad02e5df35b 100644
--- a/hotspot/src/share/vm/oops/constMethod.cpp
+++ b/hotspot/src/share/vm/oops/constMethod.cpp
@@ -58,6 +58,12 @@ ConstMethod::ConstMethod(int byte_code_size,
   set_inlined_tables_length(sizes);
   set_method_type(method_type);
   assert(this->size() == size, "wrong size for object");
+  set_name_index(0);
+  set_signature_index(0);
+  set_constants(NULL);
+  set_max_stack(0);
+  set_max_locals(0);
+  set_method_idnum(0);
 }
 
 
diff --git a/hotspot/src/share/vm/oops/cpCache.cpp b/hotspot/src/share/vm/oops/cpCache.cpp
index 11ab856e1ca..c2175ca81ff 100644
--- a/hotspot/src/share/vm/oops/cpCache.cpp
+++ b/hotspot/src/share/vm/oops/cpCache.cpp
@@ -44,6 +44,8 @@
 void ConstantPoolCacheEntry::initialize_entry(int index) {
   assert(0 < index && index < 0x10000, "sanity check");
   _indices = index;
+  _f1 = NULL;
+  _f2 = _flags = 0;
   assert(constant_pool_index() == index, "");
 }
 
@@ -533,13 +535,17 @@ void ConstantPoolCacheEntry::verify(outputStream* st) const {
 
 // Implementation of ConstantPoolCache
 
-ConstantPoolCache* ConstantPoolCache::allocate(ClassLoaderData* loader_data, int length, TRAPS) {
+ConstantPoolCache* ConstantPoolCache::allocate(ClassLoaderData* loader_data,
+                                     int length,
+                                     const intStack& index_map,
+                                     const intStack& invokedynamic_map, TRAPS) {
   int size = ConstantPoolCache::size(length);
 
-  return new (loader_data, size, false, THREAD) ConstantPoolCache(length);
+  return new (loader_data, size, false, THREAD) ConstantPoolCache(length, index_map, invokedynamic_map);
 }
 
-void ConstantPoolCache::initialize(intArray& inverse_index_map, intArray& invokedynamic_references_map) {
+void ConstantPoolCache::initialize(const intArray& inverse_index_map,
+                                   const intArray& invokedynamic_references_map) {
   assert(inverse_index_map.length() == length(), "inverse index map must have same length as cache");
   for (int i = 0; i < length(); i++) {
     ConstantPoolCacheEntry* e = entry_at(i);
diff --git a/hotspot/src/share/vm/oops/cpCache.hpp b/hotspot/src/share/vm/oops/cpCache.hpp
index c1e058d81db..27ca7980c07 100644
--- a/hotspot/src/share/vm/oops/cpCache.hpp
+++ b/hotspot/src/share/vm/oops/cpCache.hpp
@@ -377,14 +377,21 @@ class ConstantPoolCache: public MetaspaceObj {
   debug_only(friend class ClassVerifier;)
 
   // Constructor
-  ConstantPoolCache(int length) : _length(length), _constant_pool(NULL) {
+  ConstantPoolCache(int length, const intStack& inverse_index_map,
+                    const intStack& invokedynamic_references_map) :
+                                        _length(length), _constant_pool(NULL) {
+    initialize(inverse_index_map, invokedynamic_references_map);
     for (int i = 0; i < length; i++) {
       assert(entry_at(i)->is_f1_null(), "Failed to clear?");
     }
   }
 
+  // Initialization
+  void initialize(const intArray& inverse_index_map, const intArray& invokedynamic_references_map);
  public:
-  static ConstantPoolCache* allocate(ClassLoaderData* loader_data, int length, TRAPS);
+  static ConstantPoolCache* allocate(ClassLoaderData* loader_data, int length,
+                                     const intStack& inverse_index_map,
+                                     const intStack& invokedynamic_references_map, TRAPS);
   bool is_constantPoolCache() const { return true; }
 
   int length() const                             { return _length; }
@@ -405,9 +412,6 @@ class ConstantPoolCache: public MetaspaceObj {
   friend class ConstantPoolCacheEntry;
 
  public:
-  // Initialization
-  void initialize(intArray& inverse_index_map, intArray& invokedynamic_references_map);
-
   // Accessors
   void set_constant_pool(ConstantPool* pool)   { _constant_pool = pool; }
   ConstantPool* constant_pool() const          { return _constant_pool; }
diff --git a/hotspot/src/share/vm/oops/instanceKlass.cpp b/hotspot/src/share/vm/oops/instanceKlass.cpp
index f492b895605..1b46824aac6 100644
--- a/hotspot/src/share/vm/oops/instanceKlass.cpp
+++ b/hotspot/src/share/vm/oops/instanceKlass.cpp
@@ -220,63 +220,71 @@ InstanceKlass::InstanceKlass(int vtable_len,
                              bool is_anonymous) {
   No_Safepoint_Verifier no_safepoint; // until k becomes parsable
 
-  int size = InstanceKlass::size(vtable_len, itable_len, nonstatic_oop_map_size,
-                                 access_flags.is_interface(), is_anonymous);
+  int iksize = InstanceKlass::size(vtable_len, itable_len, nonstatic_oop_map_size,
+                                   access_flags.is_interface(), is_anonymous);
 
   // The sizes of these these three variables are used for determining the
   // size of the instanceKlassOop. It is critical that these are set to the right
   // sizes before the first GC, i.e., when we allocate the mirror.
-  this->set_vtable_length(vtable_len);
-  this->set_itable_length(itable_len);
-  this->set_static_field_size(static_field_size);
-  this->set_nonstatic_oop_map_size(nonstatic_oop_map_size);
-  this->set_access_flags(access_flags);
-  this->set_is_anonymous(is_anonymous);
-  assert(this->size() == size, "wrong size for object");
+  set_vtable_length(vtable_len);
+  set_itable_length(itable_len);
+  set_static_field_size(static_field_size);
+  set_nonstatic_oop_map_size(nonstatic_oop_map_size);
+  set_access_flags(access_flags);
+  _misc_flags = 0;  // initialize to zero
+  set_is_anonymous(is_anonymous);
+  assert(size() == iksize, "wrong size for object");
 
-  this->set_array_klasses(NULL);
-  this->set_methods(NULL);
-  this->set_method_ordering(NULL);
-  this->set_local_interfaces(NULL);
-  this->set_transitive_interfaces(NULL);
-  this->init_implementor();
-  this->set_fields(NULL, 0);
-  this->set_constants(NULL);
-  this->set_class_loader_data(NULL);
-  this->set_protection_domain(NULL);
-  this->set_signers(NULL);
-  this->set_source_file_name(NULL);
-  this->set_source_debug_extension(NULL, 0);
-  this->set_array_name(NULL);
-  this->set_inner_classes(NULL);
-  this->set_static_oop_field_count(0);
-  this->set_nonstatic_field_size(0);
-  this->set_is_marked_dependent(false);
-  this->set_init_state(InstanceKlass::allocated);
-  this->set_init_thread(NULL);
-  this->set_init_lock(NULL);
-  this->set_reference_type(rt);
-  this->set_oop_map_cache(NULL);
-  this->set_jni_ids(NULL);
-  this->set_osr_nmethods_head(NULL);
-  this->set_breakpoints(NULL);
-  this->init_previous_versions();
-  this->set_generic_signature(NULL);
-  this->release_set_methods_jmethod_ids(NULL);
-  this->release_set_methods_cached_itable_indices(NULL);
-  this->set_annotations(NULL);
-  this->set_jvmti_cached_class_field_map(NULL);
-  this->set_initial_method_idnum(0);
+  set_array_klasses(NULL);
+  set_methods(NULL);
+  set_method_ordering(NULL);
+  set_local_interfaces(NULL);
+  set_transitive_interfaces(NULL);
+  init_implementor();
+  set_fields(NULL, 0);
+  set_constants(NULL);
+  set_class_loader_data(NULL);
+  set_protection_domain(NULL);
+  set_signers(NULL);
+  set_source_file_name(NULL);
+  set_source_debug_extension(NULL, 0);
+  set_array_name(NULL);
+  set_inner_classes(NULL);
+  set_static_oop_field_count(0);
+  set_nonstatic_field_size(0);
+  set_is_marked_dependent(false);
+  set_init_state(InstanceKlass::allocated);
+  set_init_thread(NULL);
+  set_init_lock(NULL);
+  set_reference_type(rt);
+  set_oop_map_cache(NULL);
+  set_jni_ids(NULL);
+  set_osr_nmethods_head(NULL);
+  set_breakpoints(NULL);
+  init_previous_versions();
+  set_generic_signature(NULL);
+  release_set_methods_jmethod_ids(NULL);
+  release_set_methods_cached_itable_indices(NULL);
+  set_annotations(NULL);
+  set_jvmti_cached_class_field_map(NULL);
+  set_initial_method_idnum(0);
+  _dependencies = NULL;
+  set_jvmti_cached_class_field_map(NULL);
+  set_cached_class_file(NULL, 0);
+  set_initial_method_idnum(0);
+  set_minor_version(0);
+  set_major_version(0);
+  NOT_PRODUCT(_verify_count = 0;)
 
   // initialize the non-header words to zero
   intptr_t* p = (intptr_t*)this;
-  for (int index = InstanceKlass::header_size(); index < size; index++) {
+  for (int index = InstanceKlass::header_size(); index < iksize; index++) {
     p[index] = NULL_WORD;
   }
 
   // Set temporary value until parseClassFile updates it with the real instance
   // size.
-  this->set_layout_helper(Klass::instance_layout_helper(0, true));
+  set_layout_helper(Klass::instance_layout_helper(0, true));
 }
 
 
@@ -2781,7 +2789,7 @@ void InstanceKlass::print_on(outputStream* st) const {
   st->print(BULLET"protection domain: "); ((InstanceKlass*)this)->protection_domain()->print_value_on(st); st->cr();
   st->print(BULLET"host class:        "); host_klass()->print_value_on_maybe_null(st); st->cr();
   st->print(BULLET"signers:           "); signers()->print_value_on(st);               st->cr();
-  st->print(BULLET"init_lock:         "); ((oop)init_lock())->print_value_on(st);             st->cr();
+  st->print(BULLET"init_lock:         "); ((oop)_init_lock)->print_value_on(st);             st->cr();
   if (source_file_name() != NULL) {
     st->print(BULLET"source file:       ");
     source_file_name()->print_value_on(st);
diff --git a/hotspot/src/share/vm/oops/instanceKlass.hpp b/hotspot/src/share/vm/oops/instanceKlass.hpp
index 600cb56465c..c4cf8bbc051 100644
--- a/hotspot/src/share/vm/oops/instanceKlass.hpp
+++ b/hotspot/src/share/vm/oops/instanceKlass.hpp
@@ -269,6 +269,8 @@ class InstanceKlass: public Klass {
 
   JvmtiCachedClassFieldMap* _jvmti_cached_class_field_map;  // JVMTI: used during heap iteration
 
+  NOT_PRODUCT(int _verify_count;)  // to avoid redundant verifies
+
   // Method array.
   Array<Method*>* _methods;
   // Interface (Klass*s) this class declares locally to implement.
@@ -586,7 +588,7 @@ class InstanceKlass: public Klass {
 
   // symbol unloading support (refcount already added)
   Symbol* array_name()                     { return _array_name; }
-  void set_array_name(Symbol* name)        { assert(_array_name == NULL, "name already created"); _array_name = name; }
+  void set_array_name(Symbol* name)        { assert(_array_name == NULL  || name == NULL, "name already created"); _array_name = name; }
 
   // nonstatic oop-map blocks
   static int nonstatic_oop_map_size(unsigned int oop_map_count) {
diff --git a/hotspot/src/share/vm/oops/klass.cpp b/hotspot/src/share/vm/oops/klass.cpp
index 341f60c3fe8..edfda97a539 100644
--- a/hotspot/src/share/vm/oops/klass.cpp
+++ b/hotspot/src/share/vm/oops/klass.cpp
@@ -146,16 +146,16 @@ void* Klass::operator new(size_t size, ClassLoaderData* loader_data, size_t word
 Klass::Klass() {
   Klass* k = this;
 
-  { // Preinitialize supertype information.
-    // A later call to initialize_supers() may update these settings:
-    set_super(NULL);
-    for (juint i = 0; i < Klass::primary_super_limit(); i++) {
-      _primary_supers[i] = NULL;
-    }
-    set_secondary_supers(NULL);
-    _primary_supers[0] = k;
-    set_super_check_offset(in_bytes(primary_supers_offset()));
+  // Preinitialize supertype information.
+  // A later call to initialize_supers() may update these settings:
+  set_super(NULL);
+  for (juint i = 0; i < Klass::primary_super_limit(); i++) {
+    _primary_supers[i] = NULL;
   }
+  set_secondary_supers(NULL);
+  set_secondary_super_cache(NULL);
+  _primary_supers[0] = k;
+  set_super_check_offset(in_bytes(primary_supers_offset()));
 
   set_java_mirror(NULL);
   set_modifier_flags(0);
diff --git a/hotspot/src/share/vm/oops/klass.hpp b/hotspot/src/share/vm/oops/klass.hpp
index 803f4da2737..d2a41914653 100644
--- a/hotspot/src/share/vm/oops/klass.hpp
+++ b/hotspot/src/share/vm/oops/klass.hpp
@@ -79,7 +79,6 @@
 //    [last_biased_lock_bulk_revocation_time] (64 bits)
 //    [prototype_header]
 //    [biased_lock_revocation_count]
-//    [verify_count  ] - not in product
 //    [alloc_count   ]
 //    [_modified_oops]
 //    [_accumulated_modified_oops]
@@ -172,10 +171,6 @@ class Klass : public Metadata {
   markOop  _prototype_header;   // Used when biased locking is both enabled and disabled for this type
   jint     _biased_lock_revocation_count;
 
-#ifndef PRODUCT
-  int           _verify_count;  // to avoid redundant verifies
-#endif
-
   juint    _alloc_count;        // allocation profiling support
 
   TRACE_DEFINE_KLASS_TRACE_ID;
diff --git a/hotspot/src/share/vm/oops/method.cpp b/hotspot/src/share/vm/oops/method.cpp
index bb9a5115693..da19ccaad31 100644
--- a/hotspot/src/share/vm/oops/method.cpp
+++ b/hotspot/src/share/vm/oops/method.cpp
@@ -77,20 +77,14 @@ Method* Method::allocate(ClassLoaderData* loader_data,
   return new (loader_data, size, false, THREAD) Method(cm, access_flags, size);
 }
 
-Method::Method(ConstMethod* xconst,
-                             AccessFlags access_flags, int size) {
+Method::Method(ConstMethod* xconst, AccessFlags access_flags, int size) {
   No_Safepoint_Verifier no_safepoint;
   set_constMethod(xconst);
   set_access_flags(access_flags);
   set_method_size(size);
-  set_name_index(0);
-  set_signature_index(0);
 #ifdef CC_INTERP
   set_result_index(T_VOID);
 #endif
-  set_constants(NULL);
-  set_max_stack(0);
-  set_max_locals(0);
   set_intrinsic_id(vmIntrinsics::_none);
   set_jfr_towrite(false);
   set_method_data(NULL);
diff --git a/hotspot/src/share/vm/oops/methodData.cpp b/hotspot/src/share/vm/oops/methodData.cpp
index c7a200f9e47..c9687fb32b6 100644
--- a/hotspot/src/share/vm/oops/methodData.cpp
+++ b/hotspot/src/share/vm/oops/methodData.cpp
@@ -652,23 +652,25 @@ MethodData::MethodData(methodHandle method, int size, TRAPS) {
   // Set the method back-pointer.
   _method = method();
 
-  if (TieredCompilation) {
-    _invocation_counter.init();
-    _backedge_counter.init();
-    _invocation_counter_start = 0;
-    _backedge_counter_start = 0;
-    _num_loops = 0;
-    _num_blocks = 0;
-    _highest_comp_level = 0;
-    _highest_osr_comp_level = 0;
-    _would_profile = true;
-  }
+  _invocation_counter.init();
+  _backedge_counter.init();
+  _invocation_counter_start = 0;
+  _backedge_counter_start = 0;
+  _num_loops = 0;
+  _num_blocks = 0;
+  _highest_comp_level = 0;
+  _highest_osr_comp_level = 0;
+  _would_profile = true;
   set_creation_mileage(mileage_of(method()));
 
   // Initialize flags and trap history.
   _nof_decompiles = 0;
   _nof_overflow_recompiles = 0;
   _nof_overflow_traps = 0;
+  _eflags = 0;
+  _arg_local = 0;
+  _arg_stack = 0;
+  _arg_returned = 0;
   assert(sizeof(_trap_hist) % sizeof(HeapWord) == 0, "align");
   Copy::zero_to_words((HeapWord*) &_trap_hist,
                       sizeof(_trap_hist) / sizeof(HeapWord));
@@ -677,6 +679,7 @@ MethodData::MethodData(methodHandle method, int size, TRAPS) {
   // corresponding data cells.
   int data_size = 0;
   int empty_bc_count = 0;  // number of bytecodes lacking data
+  _data[0] = 0;  // apparently not set below.
   BytecodeStream stream(method);
   Bytecodes::Code c;
   while ((c = stream.next()) >= 0) {
@@ -710,6 +713,7 @@ MethodData::MethodData(methodHandle method, int size, TRAPS) {
   post_initialize(&stream);
 
   set_size(object_size);
+
 }
 
 // Get a measure of how much mileage the method has on it.
diff --git a/hotspot/src/share/vm/runtime/vmStructs.cpp b/hotspot/src/share/vm/runtime/vmStructs.cpp
index 158060b6958..b3e445f3d9e 100644
--- a/hotspot/src/share/vm/runtime/vmStructs.cpp
+++ b/hotspot/src/share/vm/runtime/vmStructs.cpp
@@ -336,7 +336,6 @@ typedef BinaryTreeDictionary<Metablock, FreeList> MetablockTreeDictionary;
   nonstatic_field(Klass,                       _access_flags,                                 AccessFlags)                           \
   nonstatic_field(Klass,                       _subklass,                                     Klass*)                                \
   nonstatic_field(Klass,                       _next_sibling,                                 Klass*)                                \
-  nonproduct_nonstatic_field(Klass,            _verify_count,                                 int)                                   \
   nonstatic_field(Klass,                       _alloc_count,                                  juint)                                 \
   nonstatic_field(MethodData,           _size,                                         int)                                   \
   nonstatic_field(MethodData,           _method,                                       Method*)                        \

From 1430ceb19da7c3040ac2270951f9da5e105b0661 Mon Sep 17 00:00:00 2001
From: Alan Bateman <alanb@openjdk.org>
Date: Fri, 8 Mar 2013 19:51:09 +0000
Subject: [PATCH 286/311] 8009645: ClassFileTransformer hooks in ClassLoader no
 longer required

Reviewed-by: mchung, iris
---
 .../share/classes/java/lang/ClassLoader.java  | 61 +------------------
 .../sun/misc/ClassFileTransformer.java        | 50 ++++++---------
 2 files changed, 20 insertions(+), 91 deletions(-)

diff --git a/jdk/src/share/classes/java/lang/ClassLoader.java b/jdk/src/share/classes/java/lang/ClassLoader.java
index e62c69a1ccd..a1e18ffe62d 100644
--- a/jdk/src/share/classes/java/lang/ClassLoader.java
+++ b/jdk/src/share/classes/java/lang/ClassLoader.java
@@ -51,7 +51,6 @@ import java.util.Vector;
 import java.util.Hashtable;
 import java.util.WeakHashMap;
 import java.util.concurrent.ConcurrentHashMap;
-import sun.misc.ClassFileTransformer;
 import sun.misc.CompoundEnumeration;
 import sun.misc.Resource;
 import sun.misc.URLClassPath;
@@ -669,41 +668,6 @@ public abstract class ClassLoader {
         return source;
     }
 
-    private Class<?> defineTransformedClass(String name, byte[] b, int off, int len,
-                                            ProtectionDomain pd,
-                                            ClassFormatError cfe, String source)
-      throws ClassFormatError
-    {
-        // Class format error - try to transform the bytecode and
-        // define the class again
-        //
-        ClassFileTransformer[] transformers =
-            ClassFileTransformer.getTransformers();
-        Class<?> c = null;
-
-        if (transformers != null) {
-            for (ClassFileTransformer transformer : transformers) {
-                try {
-                    // Transform byte code using transformer
-                    byte[] tb = transformer.transform(b, off, len);
-                    c = defineClass1(name, tb, 0, tb.length,
-                                     pd, source);
-                    break;
-                } catch (ClassFormatError cfe2)     {
-                    // If ClassFormatError occurs, try next transformer
-                }
-            }
-        }
-
-        // Rethrow original ClassFormatError if unable to transform
-        // bytecode to well-formed
-        //
-        if (c == null)
-            throw cfe;
-
-        return c;
-    }
-
     private void postDefineClass(Class<?> c, ProtectionDomain pd)
     {
         if (pd.getCodeSource() != null) {
@@ -783,17 +747,8 @@ public abstract class ClassLoader {
         throws ClassFormatError
     {
         protectionDomain = preDefineClass(name, protectionDomain);
-
-        Class<?> c = null;
         String source = defineClassSourceLocation(protectionDomain);
-
-        try {
-            c = defineClass1(name, b, off, len, protectionDomain, source);
-        } catch (ClassFormatError cfe) {
-            c = defineTransformedClass(name, b, off, len, protectionDomain, cfe,
-                                       source);
-        }
-
+        Class<?> c = defineClass1(name, b, off, len, protectionDomain, source);
         postDefineClass(c, protectionDomain);
         return c;
     }
@@ -881,20 +836,8 @@ public abstract class ClassLoader {
         }
 
         protectionDomain = preDefineClass(name, protectionDomain);
-
-        Class<?> c = null;
         String source = defineClassSourceLocation(protectionDomain);
-
-        try {
-            c = defineClass2(name, b, b.position(), len, protectionDomain,
-                             source);
-        } catch (ClassFormatError cfe) {
-            byte[] tb = new byte[len];
-            b.get(tb);  // get bytes out of byte buffer.
-            c = defineTransformedClass(name, tb, 0, len, protectionDomain, cfe,
-                                       source);
-        }
-
+        Class<?> c = defineClass2(name, b, b.position(), len, protectionDomain, source);
         postDefineClass(c, protectionDomain);
         return c;
     }
diff --git a/jdk/src/share/classes/sun/misc/ClassFileTransformer.java b/jdk/src/share/classes/sun/misc/ClassFileTransformer.java
index 61524ba3b30..669b9e8aac8 100644
--- a/jdk/src/share/classes/sun/misc/ClassFileTransformer.java
+++ b/jdk/src/share/classes/sun/misc/ClassFileTransformer.java
@@ -25,43 +25,31 @@
 package sun.misc;
 
 import java.util.ArrayList;
+import java.util.List;
 
 /**
- * This is an abstract base class which is called by java.lang.ClassLoader
- * when ClassFormatError is thrown inside defineClass().
- *
- * The purpose of this class is to allow applications (e.g. Java Plug-in)
- * to have a chance to transform the byte code from one form to another
- * if necessary.
- *
- * One application of this class is used by Java Plug-in to transform
- * malformed JDK 1.1 class file into a well-formed Java 2 class file
- * on-the-fly, so JDK 1.1 applets with malformed class file in the
- * Internet may run in Java 2 after transformation.
+ * This is an abstract base class originally intended to be called by
+ * {@code java.lang.ClassLoader} when {@code ClassFormatError} is
+ * thrown inside {@code defineClass()}. It is no longer hooked into
+ * {@code ClassLoader} and will be removed in a future release.
  *
  * @author      Stanley Man-Kit Ho
  */
 
-public abstract class ClassFileTransformer
-{
-    // Singleton of ClassFileTransformer
-    //
-    private static ArrayList<ClassFileTransformer> transformerList
+@Deprecated
+public abstract class ClassFileTransformer {
+
+    private static final List<ClassFileTransformer> transformers
         = new ArrayList<ClassFileTransformer>();
-    private static ClassFileTransformer[] transformers
-        = new ClassFileTransformer[0];
 
     /**
      * Add the class file transformer object.
      *
      * @param t Class file transformer instance
      */
-    public static void add(ClassFileTransformer t)
-    {
-        synchronized(transformerList)
-        {
-            transformerList.add(t);
-            transformers = transformerList.toArray(new ClassFileTransformer[0]);
+    public static void add(ClassFileTransformer t) {
+        synchronized (transformers) {
+            transformers.add(t);
         }
     }
 
@@ -70,13 +58,11 @@ public abstract class ClassFileTransformer
      *
      * @return ClassFileTransformer object array
      */
-    public static ClassFileTransformer[] getTransformers()
-    {
-        // transformers is not intended to be changed frequently,
-        // so it is okay to not put synchronized block here
-        // to speed up performance.
-        //
-        return transformers;
+    public static ClassFileTransformer[] getTransformers() {
+        synchronized (transformers) {
+            ClassFileTransformer[] result = new ClassFileTransformer[transformers.size()];
+            return transformers.toArray(result);
+        }
     }
 
 
@@ -89,5 +75,5 @@ public abstract class ClassFileTransformer
      * @return Transformed byte array
      */
     public abstract byte[] transform(byte[] b, int off, int len)
-                           throws ClassFormatError;
+        throws ClassFormatError;
 }

From 9db647931860a3f80cb9f705ba75b52d37152802 Mon Sep 17 00:00:00 2001
From: Henry Jen <henry.jen@oracle.com>
Date: Fri, 8 Mar 2013 15:45:06 -0800
Subject: [PATCH 287/311] 8001667: Comparator combinators and extension methods

Reviewed-by: mduigou, briangoetz
---
 jdk/make/java/java/FILES_java.gmk             |   1 +
 .../share/classes/java/util/Collections.java  |   2 +-
 .../share/classes/java/util/Comparator.java   |  94 +++++
 .../share/classes/java/util/Comparators.java  | 279 ++++++++++++++
 .../java/util/Collections/ReverseOrder.java   |  37 +-
 jdk/test/java/util/ComparatorsTest.java       | 353 ++++++++++++++++++
 6 files changed, 763 insertions(+), 3 deletions(-)
 create mode 100644 jdk/src/share/classes/java/util/Comparators.java
 create mode 100644 jdk/test/java/util/ComparatorsTest.java

diff --git a/jdk/make/java/java/FILES_java.gmk b/jdk/make/java/java/FILES_java.gmk
index 8c2f80c5248..189b9fcb7c2 100644
--- a/jdk/make/java/java/FILES_java.gmk
+++ b/jdk/make/java/java/FILES_java.gmk
@@ -257,6 +257,7 @@ JAVA_JAVA_java = \
         sun/util/calendar/ZoneInfoFile.java \
     java/util/TooManyListenersException.java \
     java/util/Comparator.java \
+    java/util/Comparators.java \
     java/util/Collections.java \
     java/util/Iterator.java \
     java/util/ListIterator.java \
diff --git a/jdk/src/share/classes/java/util/Collections.java b/jdk/src/share/classes/java/util/Collections.java
index 58eae6f9509..b6bac484dac 100644
--- a/jdk/src/share/classes/java/util/Collections.java
+++ b/jdk/src/share/classes/java/util/Collections.java
@@ -3759,7 +3759,7 @@ public class Collections {
             return c2.compareTo(c1);
         }
 
-        private Object readResolve() { return reverseOrder(); }
+        private Object readResolve() { return Collections.reverseOrder(); }
     }
 
     /**
diff --git a/jdk/src/share/classes/java/util/Comparator.java b/jdk/src/share/classes/java/util/Comparator.java
index 35ead373b82..017c2e78e2c 100644
--- a/jdk/src/share/classes/java/util/Comparator.java
+++ b/jdk/src/share/classes/java/util/Comparator.java
@@ -25,6 +25,11 @@
 
 package java.util;
 
+import java.util.function.Function;
+import java.util.function.ToIntFunction;
+import java.util.function.ToLongFunction;
+import java.util.function.ToDoubleFunction;
+
 /**
  * A comparison function, which imposes a <i>total ordering</i> on some
  * collection of objects.  Comparators can be passed to a sort method (such
@@ -165,4 +170,93 @@ public interface Comparator<T> {
      * @see Object#hashCode()
      */
     boolean equals(Object obj);
+
+    /**
+     * Returns a comparator that imposes the reverse ordering of this
+     * comparator.
+     *
+     * @return A comparator that imposes the reverse ordering of this
+     *         comparator.
+     * @since 1.8
+     */
+    default Comparator<T> reverseOrder() {
+        return Collections.reverseOrder(this);
+    }
+
+    /**
+     * Constructs a lexicographic order comparator with another comparator.
+     * For example, a {@code Comparator<Person> byLastName} can be composed
+     * with another {@code Comparator<Person> byFirstName}, then {@code
+     * byLastName.thenComparing(byFirstName)} creates a {@code
+     * Comparator<Person>} which sorts by last name, and for equal last names
+     * sorts by first name.
+     *
+     * @param other the other comparator used when equals on this.
+     * @throws NullPointerException if the argument is null.
+     * @since 1.8
+     */
+    default Comparator<T> thenComparing(Comparator<? super T> other) {
+        return Comparators.compose(this, other);
+    }
+
+    /**
+     * Constructs a lexicographic order comparator with a function that
+     * extracts a {@code Comparable} key.  This default implementation calls
+     * {@code thenComparing(this, Comparators.comparing(keyExtractor))}.
+     *
+     * @param <U> the {@link Comparable} type for comparison
+     * @param keyExtractor the function used to extract the {@link Comparable} sort key
+     * @throws NullPointerException if the argument is null.
+     * @see Comparators#comparing(Function)
+     * @see #thenComparing(Comparator)
+     * @since 1.8
+     */
+    default <U extends Comparable<? super U>> Comparator<T> thenComparing(Function<? super T, ? extends U> keyExtractor) {
+        return thenComparing(Comparators.comparing(keyExtractor));
+    }
+
+    /**
+     * Constructs a lexicographic order comparator with a function that
+     * extracts a {@code int} value.  This default implementation calls {@code
+     * thenComparing(this, Comparators.comparing(keyExtractor))}.
+     *
+     * @param keyExtractor the function used to extract the integer value
+     * @throws NullPointerException if the argument is null.
+     * @see Comparators#comparing(ToIntFunction)
+     * @see #thenComparing(Comparator)
+     * @since 1.8
+     */
+    default Comparator<T> thenComparing(ToIntFunction<? super T> keyExtractor) {
+        return thenComparing(Comparators.comparing(keyExtractor));
+    }
+
+    /**
+     * Constructs a lexicographic order comparator with a function that
+     * extracts a {@code long} value.  This default implementation calls
+     * {@code thenComparing(this, Comparators.comparing(keyExtractor))}.
+     *
+     * @param keyExtractor the function used to extract the long value
+     * @throws NullPointerException if the argument is null.
+     * @see Comparators#comparing(ToLongFunction)
+     * @see #thenComparing(Comparator)
+     * @since 1.8
+     */
+    default Comparator<T> thenComparing(ToLongFunction<? super T> keyExtractor) {
+        return thenComparing(Comparators.comparing(keyExtractor));
+    }
+
+    /**
+     * Constructs a lexicographic order comparator with a function that
+     * extracts a {@code double} value.  This default implementation calls
+     * {@code thenComparing(this, Comparators.comparing(keyExtractor))}.
+     *
+     * @param keyExtractor the function used to extract the double value
+     * @throws NullPointerException if the argument is null.
+     * @see Comparators#comparing(ToDoubleFunction)
+     * @see #thenComparing(Comparator)
+     * @since 1.8
+     */
+    default Comparator<T> thenComparing(ToDoubleFunction<? super T> keyExtractor) {
+        return thenComparing(Comparators.comparing(keyExtractor));
+    }
 }
diff --git a/jdk/src/share/classes/java/util/Comparators.java b/jdk/src/share/classes/java/util/Comparators.java
new file mode 100644
index 00000000000..75821339b49
--- /dev/null
+++ b/jdk/src/share/classes/java/util/Comparators.java
@@ -0,0 +1,279 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.util;
+
+import java.io.Serializable;
+import java.util.function.BinaryOperator;
+import java.util.function.Function;
+import java.util.function.ToDoubleFunction;
+import java.util.function.ToIntFunction;
+import java.util.function.ToLongFunction;
+
+/**
+ * This class consists of {@code static} utility methods for comparators. Mostly
+ * factory method that returns a {@link Comparator}.
+ *
+ * <p> Unless otherwise noted, passing a {@code null} argument to a method in
+ * this class will cause a {@link NullPointerException} to be thrown.
+ *
+ * @see Comparator
+ * @since 1.8
+ */
+public class Comparators {
+    private Comparators() {
+        throw new AssertionError("no instances");
+    }
+
+    /**
+     * Compares {@link Comparable} objects in natural order.
+     *
+     * @see Comparable
+     */
+    private enum NaturalOrderComparator implements Comparator<Comparable<Object>> {
+        INSTANCE;
+
+        @Override
+        public int compare(Comparable<Object> c1, Comparable<Object> c2) {
+            return c1.compareTo(c2);
+        }
+    }
+
+    /**
+     * Returns a comparator that imposes the reverse of the <em>natural
+     * ordering</em>.
+     *
+     * <p>The returned comparator is serializable.
+     *
+     * @param <T> {@link Comparable} type
+     *
+     * @return A comparator that imposes the reverse of the <i>natural
+     *         ordering</i> on a collection of objects that implement
+     *         the {@link Comparable} interface.
+     * @see Comparable
+     */
+    public static <T extends Comparable<? super T>> Comparator<T> reverseOrder() {
+        return Collections.reverseOrder();
+    }
+
+    /**
+     * Returns a comparator that imposes the reverse ordering of the specified
+     * {@link Comparator}.
+     *
+     * <p>The returned comparator is serializable (assuming the specified
+     * comparator is also serializable).
+     *
+     * @param <T> the element type to be compared
+     * @param cmp a comparator whose ordering is to be reversed by the returned
+     *            comparator
+     * @return A comparator that imposes the reverse ordering of the
+     *         specified comparator.
+     */
+    public static <T> Comparator<T> reverseOrder(Comparator<T> cmp) {
+        Objects.requireNonNull(cmp);
+        return Collections.reverseOrder(cmp);
+    }
+
+    /**
+     * Gets a comparator compares {@link Comparable} type in natural order.
+     *
+     * @param <T> {@link Comparable} type
+     */
+    public static <T extends Comparable<? super T>> Comparator<T> naturalOrder() {
+        return (Comparator<T>) NaturalOrderComparator.INSTANCE;
+    }
+
+    /**
+     * Gets a comparator compares {@link Map.Entry} in natural order on key.
+     *
+     * @param <K> {@link Comparable} key type
+     * @param <V> value type
+     */
+    public static <K extends Comparable<? super K>, V> Comparator<Map.Entry<K,V>> naturalOrderKeys() {
+        return (Comparator<Map.Entry<K, V>> & Serializable)
+            (c1, c2) -> c1.getKey().compareTo(c2.getKey());
+    }
+
+    /**
+     * Gets a comparator compares {@link Map.Entry} in natural order on value.
+     *
+     * @param <K> key type
+     * @param <V> {@link Comparable} value type
+     */
+    public static <K, V extends Comparable<? super V>> Comparator<Map.Entry<K,V>> naturalOrderValues() {
+        return (Comparator<Map.Entry<K, V>> & Serializable)
+            (c1, c2) -> c1.getValue().compareTo(c2.getValue());
+    }
+
+    /**
+     * Gets a comparator compares {@link Map.Entry} by key using the given
+     * {@link Comparator}.
+     *
+     * <p>The returned comparator is serializable assuming the specified
+     * comparators are also serializable.
+     *
+     * @param <K> key type
+     * @param <V> value type
+     * @param cmp the key {@link Comparator}
+     */
+    public static <K, V> Comparator<Map.Entry<K, V>> byKey(Comparator<? super K> cmp) {
+        Objects.requireNonNull(cmp);
+        return (Comparator<Map.Entry<K, V>> & Serializable)
+            (c1, c2) -> cmp.compare(c1.getKey(), c2.getKey());
+    }
+
+    /**
+     * Gets a comparator compares {@link Map.Entry} by value using the given
+     * {@link Comparator}.
+     *
+     * @param <K> key type
+     * @param <V> value type
+     * @param cmp the value {@link Comparator}
+     */
+    public static <K, V> Comparator<Map.Entry<K, V>> byValue(Comparator<? super V> cmp) {
+        Objects.requireNonNull(cmp);
+        return (Comparator<Map.Entry<K, V>> & Serializable)
+            (c1, c2) -> cmp.compare(c1.getValue(), c2.getValue());
+    }
+
+    /**
+     * Accepts a function that extracts a {@link java.lang.Comparable
+     * Comparable} sort key from a type {@code T}, and returns a {@code
+     * Comparator<T>} that compares by that sort key.  For example, if a class
+     * {@code Person} has a {@code String}-valued getter {@code getLastName},
+     * then {@code comparing(Person::getLastName)} would return a {@code
+     * Comparator<Person>} that compares {@code Person} objects by their last
+     * name.
+     *
+     * @param <T> the original element type
+     * @param <U> the {@link Comparable} type for comparison
+     * @param keyExtractor the function used to extract the {@link Comparable} sort key
+     */
+    public static <T, U extends Comparable<? super U>> Comparator<T> comparing(Function<? super T, ? extends U> keyExtractor) {
+        Objects.requireNonNull(keyExtractor);
+        return (Comparator<T> & Serializable)
+            (c1, c2) -> keyExtractor.apply(c1).compareTo(keyExtractor.apply(c2));
+    }
+
+    /**
+     * Accepts a function that extracts an {@code int} value from a type {@code
+     * T}, and returns a {@code Comparator<T>} that compares by that value.
+     *
+     * <p>The returned comparator is serializable assuming the specified
+     * function is also serializable.
+     *
+     * @see #comparing(Function)
+     * @param <T> the original element type
+     * @param keyExtractor the function used to extract the integer value
+     */
+    public static <T> Comparator<T> comparing(ToIntFunction<? super T> keyExtractor) {
+        Objects.requireNonNull(keyExtractor);
+        return (Comparator<T> & Serializable)
+            (c1, c2) -> Integer.compare(keyExtractor.applyAsInt(c1), keyExtractor.applyAsInt(c2));
+    }
+
+    /**
+     * Accepts a function that extracts a {@code long} value from a type {@code
+     * T}, and returns a {@code Comparator<T>} that compares by that value.
+     *
+     * <p>The returned comparator is serializable assuming the specified
+     * function is also serializable.
+     *
+     * @see #comparing(Function)
+     * @param <T> the original element type
+     * @param keyExtractor the function used to extract the long value
+     */
+    public static <T> Comparator<T> comparing(ToLongFunction<? super T> keyExtractor) {
+        Objects.requireNonNull(keyExtractor);
+        return (Comparator<T> & Serializable)
+            (c1, c2) -> Long.compare(keyExtractor.applyAsLong(c1), keyExtractor.applyAsLong(c2));
+    }
+
+    /**
+     * Accepts a function that extracts a {@code double} value from a type
+     * {@code T}, and returns a {@code Comparator<T>} that compares by that
+     * value.
+     *
+     * <p>The returned comparator is serializable assuming the specified
+     * function is also serializable.
+     *
+     * @see #comparing(Function)
+     * @param <T> the original element type
+     * @param keyExtractor the function used to extract the double value
+     */
+    public static<T> Comparator<T> comparing(ToDoubleFunction<? super T> keyExtractor) {
+        Objects.requireNonNull(keyExtractor);
+        return (Comparator<T> & Serializable)
+            (c1, c2) -> Double.compare(keyExtractor.applyAsDouble(c1), keyExtractor.applyAsDouble(c2));
+    }
+
+    /**
+     * Constructs a lexicographic order from two {@link Comparator}s.  For
+     * example, if you have comparators {@code byLastName} and {@code
+     * byFirstName}, each of type {@code Comparator<Person>}, then {@code
+     * compose(byLastName, byFirstName)} creates a {@code Comparator<Person>}
+     * which sorts by last name, and for equal last names sorts by first name.
+     *
+     * <p>The returned comparator is serializable assuming the specified
+     * comparators are also serializable.
+     *
+     * @param <T> the element type to be compared
+     * @param first the first comparator
+     * @param second the secondary comparator used when equals on the first
+     */
+    public static<T> Comparator<T> compose(Comparator<? super T> first, Comparator<? super T> second) {
+        Objects.requireNonNull(first);
+        Objects.requireNonNull(second);
+        return (Comparator<T> & Serializable) (c1, c2) -> {
+            int res = first.compare(c1, c2);
+            return (res != 0) ? res : second.compare(c1, c2);
+        };
+    }
+
+    /**
+     * Constructs a {@link BinaryOperator} which returns the lesser of two elements
+     * according to the specified {@code Comparator}
+     *
+     * @param comparator A {@code Comparator} for comparing the two values
+     * @param <T> the type of the elements to be compared
+     * @return a {@code BinaryOperator} which returns the lesser of its operands,
+     * according to the supplied {@code Comparator}
+     */
+    public static<T> BinaryOperator<T> lesserOf(Comparator<? super T> comparator) {
+        return (a, b) -> comparator.compare(a, b) <= 0 ? a : b;
+    }
+
+    /**
+     * Constructs a {@link BinaryOperator} which returns the greater of two elements
+     * according to the specified {@code Comparator}
+     *
+     * @param comparator A {@code Comparator} for comparing the two values
+     * @param <T> the type of the elements to be compared
+     * @return a {@code BinaryOperator} which returns the greater of its operands,
+     * according to the supplied {@code Comparator}
+     */
+    public static<T> BinaryOperator<T> greaterOf(Comparator<? super T> comparator) {
+        return (a, b) -> comparator.compare(a, b) >= 0 ? a : b;
+    }
+}
diff --git a/jdk/test/java/util/Collections/ReverseOrder.java b/jdk/test/java/util/Collections/ReverseOrder.java
index d4fed080783..9831b57c5a5 100644
--- a/jdk/test/java/util/Collections/ReverseOrder.java
+++ b/jdk/test/java/util/Collections/ReverseOrder.java
@@ -23,23 +23,56 @@
 
 /*
  * @test
- * @bug 4593209
+ * @bug 4593209 8001667
  * @summary Reverse comparator was subtly broken
  * @author Josh bloch
  */
 
 import java.util.*;
+import java.io.*;
 
 public class ReverseOrder {
+    static byte[] serialBytes(Object o) {
+        try {
+            ByteArrayOutputStream bos = new ByteArrayOutputStream();
+            ObjectOutputStream oos = new ObjectOutputStream(bos);
+            oos.writeObject(o);
+            oos.flush();
+            oos.close();
+            return bos.toByteArray();
+        } catch (Throwable t) {
+            throw new Error(t);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    static <T> T serialClone(T o) {
+        try {
+            ObjectInputStream ois = new ObjectInputStream
+                (new ByteArrayInputStream(serialBytes(o)));
+            T clone = (T) ois.readObject();
+            return clone;
+        } catch (Throwable t) {
+            throw new Error(t);
+        }
+    }
+
     public static void main(String[] args) throws Exception {
         Foo[] a = { new Foo(2), new Foo(3), new Foo(1) };
         List list = Arrays.asList(a);
-        Collections.sort(list, Collections.reverseOrder());
+        Comparator cmp = Collections.reverseOrder();
+        Collections.sort(list, cmp);
 
         Foo[] golden = { new Foo(3), new Foo(2), new Foo(1) };
         List goldenList = Arrays.asList(golden);
         if (!list.equals(goldenList))
             throw new Exception(list.toString());
+
+        Comparator clone = serialClone(cmp);
+        List list2 = Arrays.asList(a);
+        Collections.sort(list2, clone);
+        if (!list2.equals(goldenList))
+            throw new Exception(list.toString());
     }
 }
 
diff --git a/jdk/test/java/util/ComparatorsTest.java b/jdk/test/java/util/ComparatorsTest.java
new file mode 100644
index 00000000000..1640c2d657a
--- /dev/null
+++ b/jdk/test/java/util/ComparatorsTest.java
@@ -0,0 +1,353 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8001667
+ * @run testng ComparatorsTest
+ */
+
+import java.util.Comparator;
+import java.util.Comparators;
+import java.util.AbstractMap;
+import java.util.Map;
+import org.testng.annotations.Test;
+
+import java.util.function.Function;
+import java.util.function.ToIntFunction;
+import java.util.function.ToLongFunction;
+import java.util.function.ToDoubleFunction;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.assertSame;
+
+/**
+ * Unit tests for helper methods in Comparators
+ */
+@Test(groups = "unit")
+public class ComparatorsTest {
+    private static class Thing {
+        public final int intField;
+        public final long longField;
+        public final double doubleField;
+        public final String stringField;
+
+        private Thing(int intField, long longField, double doubleField, String stringField) {
+            this.intField = intField;
+            this.longField = longField;
+            this.doubleField = doubleField;
+            this.stringField = stringField;
+        }
+
+        public int getIntField() {
+            return intField;
+        }
+
+        public long getLongField() {
+            return longField;
+        }
+
+        public double getDoubleField() {
+            return doubleField;
+        }
+
+        public String getStringField() {
+            return stringField;
+        }
+    }
+
+    private final int[] intValues = { -2, -2, -1, -1, 0, 0, 1, 1, 2, 2 };
+    private final long[] longValues = { -2, -2, -1, -1, 0, 0, 1, 1, 2, 2 };
+    private final double[] doubleValues = { -2, -2, -1, -1, 0, 0, 1, 1, 2, 2 };
+    private final String[] stringValues = { "a", "a", "b", "b", "c", "c", "d", "d", "e", "e" };
+    private final int[] comparisons = { 0, -1, 0, -1, 0, -1, 0, -1, 0 };
+
+    private<T> void assertComparisons(T[] things, Comparator<T> comp, int[] comparisons) {
+        for (int i=0; i<comparisons.length; i++) {
+            assertEquals(comparisons.length + 1, things.length);
+            assertEquals(comparisons[i], comp.compare(things[i], things[i+1]));
+            assertEquals(-comparisons[i], comp.compare(things[i+1], things[i]));
+        }
+    }
+
+    public void testIntComparator() {
+        Thing[] things = new Thing[intValues.length];
+        for (int i=0; i<intValues.length; i++)
+            things[i] = new Thing(intValues[i], 0L, 0.0, null);
+        Comparator<Thing> comp = Comparators.comparing(new ToIntFunction<ComparatorsTest.Thing>() {
+            @Override
+            public int applyAsInt(Thing thing) {
+                return thing.getIntField();
+            }
+        });
+
+        assertComparisons(things, comp, comparisons);
+    }
+
+    public void testLongComparator() {
+        Thing[] things = new Thing[longValues.length];
+        for (int i=0; i<longValues.length; i++)
+            things[i] = new Thing(0, longValues[i], 0.0, null);
+        Comparator<Thing> comp = Comparators.comparing(new ToLongFunction<ComparatorsTest.Thing>() {
+            @Override
+            public long applyAsLong(Thing thing) {
+                return thing.getLongField();
+            }
+        });
+
+        assertComparisons(things, comp, comparisons);
+    }
+
+    public void testDoubleComparator() {
+        Thing[] things = new Thing[doubleValues.length];
+        for (int i=0; i<doubleValues.length; i++)
+            things[i] = new Thing(0, 0L, doubleValues[i], null);
+        Comparator<Thing> comp = Comparators.comparing(new ToDoubleFunction<ComparatorsTest.Thing>() {
+            @Override
+            public double applyAsDouble(Thing thing) {
+                return thing.getDoubleField();
+            }
+        });
+
+        assertComparisons(things, comp, comparisons);
+    }
+
+    public void testComparing() {
+        Thing[] things = new Thing[doubleValues.length];
+        for (int i=0; i<doubleValues.length; i++)
+            things[i] = new Thing(0, 0L, 0.0, stringValues[i]);
+        Comparator<Thing> comp = Comparators.comparing(new Function<Thing, String>() {
+            @Override
+            public String apply(Thing thing) {
+                return thing.getStringField();
+            }
+        });
+
+        assertComparisons(things, comp, comparisons);
+    }
+
+    public void testNaturalOrderComparator() {
+        Comparator<String> comp = Comparators.naturalOrder();
+
+        assertComparisons(stringValues, comp, comparisons);
+    }
+
+    public void testReverseComparator() {
+        Comparator<String> cmpr = Comparators.reverseOrder();
+        Comparator<String> cmp = cmpr.reverseOrder();
+
+        assertEquals(cmp.reverseOrder(), cmpr);
+        assertEquals(0, cmp.compare("a", "a"));
+        assertEquals(0, cmpr.compare("a", "a"));
+        assertTrue(cmp.compare("a", "b") < 0);
+        assertTrue(cmpr.compare("a", "b") > 0);
+        assertTrue(cmp.compare("b", "a") > 0);
+        assertTrue(cmpr.compare("b", "a") < 0);
+    }
+
+    public void testReverseComparator2() {
+        Comparator<String> cmp = (s1, s2) -> s1.length() - s2.length();
+        Comparator<String> cmpr = cmp.reverseOrder();
+
+        assertEquals(cmpr.reverseOrder(), cmp);
+        assertEquals(0, cmp.compare("abc", "def"));
+        assertEquals(0, cmpr.compare("abc", "def"));
+        assertTrue(cmp.compare("abcd", "def") > 0);
+        assertTrue(cmpr.compare("abcd", "def") < 0);
+        assertTrue(cmp.compare("abc", "defg") < 0);
+        assertTrue(cmpr.compare("abc", "defg") > 0);
+    }
+
+    @Test(expectedExceptions=NullPointerException.class)
+    public void testReverseComparatorNPE() {
+        Comparator<String> cmp = Comparators.reverseOrder(null);
+    }
+
+    public void testComposeComparator() {
+        // Longer string in front
+        Comparator<String> first = (s1, s2) -> s2.length() - s1.length();
+        Comparator<String> second = Comparators.naturalOrder();
+        Comparator<String> composed = Comparators.compose(first, second);
+
+        assertTrue(composed.compare("abcdefg", "abcdef") < 0);
+        assertTrue(composed.compare("abcdef", "abcdefg") > 0);
+        assertTrue(composed.compare("abcdef", "abcdef") == 0);
+        assertTrue(composed.compare("abcdef", "ghijkl") < 0);
+        assertTrue(composed.compare("ghijkl", "abcdefg") > 0);
+    }
+
+    private <K, V> void assertPairComparison(K k1, V v1, K k2, V v2,
+                                        Comparator<Map.Entry<K, V>> ck,
+                                        Comparator<Map.Entry<K, V>> cv) {
+        final Map.Entry<K, V> p11 = new AbstractMap.SimpleImmutableEntry<>(k1, v1);
+        final Map.Entry<K, V> p12 = new AbstractMap.SimpleImmutableEntry<>(k1, v2);
+        final Map.Entry<K, V> p21 = new AbstractMap.SimpleImmutableEntry<>(k2, v1);
+        final Map.Entry<K, V> p22 = new AbstractMap.SimpleImmutableEntry<>(k2, v2);
+
+        assertTrue(ck.compare(p11, p11) == 0);
+        assertTrue(ck.compare(p12, p11) == 0);
+        assertTrue(ck.compare(p11, p12) == 0);
+        assertTrue(ck.compare(p12, p22) < 0);
+        assertTrue(ck.compare(p12, p21) < 0);
+        assertTrue(ck.compare(p21, p11) > 0);
+        assertTrue(ck.compare(p21, p12) > 0);
+
+        assertTrue(cv.compare(p11, p11) == 0);
+        assertTrue(cv.compare(p12, p11) > 0);
+        assertTrue(cv.compare(p11, p12) < 0);
+        assertTrue(cv.compare(p12, p22) == 0);
+        assertTrue(cv.compare(p12, p21) > 0);
+        assertTrue(cv.compare(p21, p11) == 0);
+        assertTrue(cv.compare(p21, p12) < 0);
+
+        Comparator<Map.Entry<K, V>> cmp = Comparators.compose(ck, cv);
+        assertTrue(cmp.compare(p11, p11) == 0);
+        assertTrue(cmp.compare(p12, p11) > 0);
+        assertTrue(cmp.compare(p11, p12) < 0);
+        assertTrue(cmp.compare(p12, p22) < 0);
+        assertTrue(cmp.compare(p12, p21) < 0);
+        assertTrue(cmp.compare(p21, p11) > 0);
+        assertTrue(cmp.compare(p21, p12) > 0);
+
+        cmp = Comparators.compose(cv, ck);
+        assertTrue(cmp.compare(p11, p11) == 0);
+        assertTrue(cmp.compare(p12, p11) > 0);
+        assertTrue(cmp.compare(p11, p12) < 0);
+        assertTrue(cmp.compare(p12, p22) < 0);
+        assertTrue(cmp.compare(p12, p21) > 0);
+        assertTrue(cmp.compare(p21, p11) > 0);
+        assertTrue(cmp.compare(p21, p12) < 0);
+    }
+
+    public void testKVComparatorable() {
+        assertPairComparison(1, "ABC", 2, "XYZ",
+                         Comparators.<Integer, String>naturalOrderKeys(),
+                         Comparators.<Integer, String>naturalOrderValues());
+    }
+
+    private static class People {
+        final String firstName;
+        final String lastName;
+        final int age;
+
+        People(String first, String last, int age) {
+            firstName = first;
+            lastName = last;
+            this.age = age;
+        }
+
+        String getFirstName() { return firstName; }
+        String getLastName() { return lastName; }
+        int getAge() { return age; }
+        long getAgeAsLong() { return (long) age; };
+        double getAgeAsDouble() { return (double) age; };
+    }
+
+    private final People people[] = {
+        new People("John", "Doe", 34),
+        new People("Mary", "Doe", 30),
+        new People("Maria", "Doe", 14),
+        new People("Jonah", "Doe", 10),
+        new People("John", "Cook", 54),
+        new People("Mary", "Cook", 50),
+    };
+
+    public void testKVComparators() {
+        // Comparator<People> cmp = Comparators.naturalOrder(); // Should fail to compiler as People is not comparable
+        // We can use simple comparator, but those have been tested above.
+        // Thus choose to do compose for some level of interation.
+        Comparator<People> cmp1 = Comparators.comparing((Function<People, String>) People::getFirstName);
+        Comparator<People> cmp2 = Comparators.comparing((Function<People, String>) People::getLastName);
+        Comparator<People> cmp = Comparators.compose(cmp1, cmp2);
+
+        assertPairComparison(people[0], people[0], people[1], people[1],
+                         Comparators.<People, People>byKey(cmp),
+                         Comparators.<People, People>byValue(cmp));
+
+    }
+
+    private <T> void assertComparison(Comparator<T> cmp, T less, T greater) {
+        assertTrue(cmp.compare(less, greater) < 0, "less");
+        assertTrue(cmp.compare(less, less) == 0, "equal");
+        assertTrue(cmp.compare(greater, less) > 0, "greater");
+    }
+
+    public void testComparatorDefaultMethods() {
+        Comparator<People> cmp = Comparators.comparing((Function<People, String>) People::getFirstName);
+        Comparator<People> cmp2 = Comparators.comparing((Function<People, String>) People::getLastName);
+        // reverseOrder
+        assertComparison(cmp.reverseOrder(), people[1], people[0]);
+        // thenComparing(Comparator)
+        assertComparison(cmp.thenComparing(cmp2), people[0], people[1]);
+        assertComparison(cmp.thenComparing(cmp2), people[4], people[0]);
+        // thenComparing(Function)
+        assertComparison(cmp.thenComparing(People::getLastName), people[0], people[1]);
+        assertComparison(cmp.thenComparing(People::getLastName), people[4], people[0]);
+        // thenComparing(ToIntFunction)
+        assertComparison(cmp.thenComparing(People::getAge), people[0], people[1]);
+        assertComparison(cmp.thenComparing(People::getAge), people[1], people[5]);
+        // thenComparing(ToLongFunction)
+        assertComparison(cmp.thenComparing(People::getAgeAsLong), people[0], people[1]);
+        assertComparison(cmp.thenComparing(People::getAgeAsLong), people[1], people[5]);
+        // thenComparing(ToDoubleFunction)
+        assertComparison(cmp.thenComparing(People::getAgeAsDouble), people[0], people[1]);
+        assertComparison(cmp.thenComparing(People::getAgeAsDouble), people[1], people[5]);
+    }
+
+    public void testGreaterOf() {
+        // lesser
+        assertSame(Comparators.greaterOf(Comparators.comparing(
+                                    (Function<People, String>) People::getFirstName))
+                              .apply(people[0], people[1]),
+                   people[1]);
+        // euqal
+        assertSame(Comparators.greaterOf(Comparators.comparing(
+                                    (Function<People, String>) People::getLastName))
+                              .apply(people[0], people[1]),
+                   people[0]);
+        // greater
+        assertSame(Comparators.greaterOf(Comparators.comparing(
+                                    (ToIntFunction<People>) People::getAge))
+                              .apply(people[0], people[1]),
+                   people[0]);
+    }
+
+    public void testLesserOf() {
+        // lesser
+        assertSame(Comparators.lesserOf(Comparators.comparing(
+                                    (Function<People, String>) People::getFirstName))
+                              .apply(people[0], people[1]),
+                   people[0]);
+        // euqal
+        assertSame(Comparators.lesserOf(Comparators.comparing(
+                                    (Function<People, String>) People::getLastName))
+                              .apply(people[0], people[1]),
+                   people[0]);
+        // greater
+        assertSame(Comparators.lesserOf(Comparators.comparing(
+                                    (ToIntFunction<People>) People::getAge))
+                              .apply(people[0], people[1]),
+                   people[1]);
+    }
+}
\ No newline at end of file

From 2ec1224ff0bb8fa3447a8c061844e99f088265db Mon Sep 17 00:00:00 2001
From: Weijun Wang <weijun@openjdk.org>
Date: Sat, 9 Mar 2013 17:27:58 +0800
Subject: [PATCH 288/311] 8000653: SPNEGO tests fail at
 context.getDelegCred().getRemainingInitLifetime(mechOid)

Reviewed-by: valeriep
---
 .../sun/security/jgss/GSSCredentialImpl.java  |  7 +++
 .../jgss/spnego/SpNegoCredElement.java        |  2 +-
 jdk/test/sun/security/krb5/auto/Context.java  |  7 +++
 .../security/krb5/auto/SpnegoLifeTime.java    | 58 +++++++++++++++++++
 4 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 jdk/test/sun/security/krb5/auto/SpnegoLifeTime.java

diff --git a/jdk/src/share/classes/sun/security/jgss/GSSCredentialImpl.java b/jdk/src/share/classes/sun/security/jgss/GSSCredentialImpl.java
index 6330f71c1b0..584e1784c8a 100644
--- a/jdk/src/share/classes/sun/security/jgss/GSSCredentialImpl.java
+++ b/jdk/src/share/classes/sun/security/jgss/GSSCredentialImpl.java
@@ -29,6 +29,7 @@ import org.ietf.jgss.*;
 import sun.security.jgss.spi.*;
 import java.util.*;
 import com.sun.security.jgss.*;
+import sun.security.jgss.spnego.SpNegoCredElement;
 
 public class GSSCredentialImpl implements ExtendedGSSCredential {
 
@@ -87,6 +88,7 @@ public class GSSCredentialImpl implements ExtendedGSSCredential {
             throw new GSSException(GSSException.NO_CRED);
     }
 
+    // Wrap a mech cred into a GSS cred
     public GSSCredentialImpl(GSSManagerImpl gssManager,
                       GSSCredentialSpi mechElement) throws GSSException {
 
@@ -103,6 +105,11 @@ public class GSSCredentialImpl implements ExtendedGSSCredential {
                                         usage);
         tempCred = mechElement;
         hashtable.put(key, tempCred);
+        // More mechs that can use this cred, say, SPNEGO
+        if (!GSSUtil.isSpNegoMech(mechElement.getMechanism())) {
+            key = new SearchKey(GSSUtil.GSS_SPNEGO_MECH_OID, usage);
+            hashtable.put(key, new SpNegoCredElement(mechElement));
+        }
     }
 
     void init(GSSManagerImpl gssManager) {
diff --git a/jdk/src/share/classes/sun/security/jgss/spnego/SpNegoCredElement.java b/jdk/src/share/classes/sun/security/jgss/spnego/SpNegoCredElement.java
index 69116f56bd2..ee5999ced55 100644
--- a/jdk/src/share/classes/sun/security/jgss/spnego/SpNegoCredElement.java
+++ b/jdk/src/share/classes/sun/security/jgss/spnego/SpNegoCredElement.java
@@ -44,7 +44,7 @@ public class SpNegoCredElement implements GSSCredentialSpi {
 
     private GSSCredentialSpi cred = null;
 
-    SpNegoCredElement(GSSCredentialSpi cred) throws GSSException {
+    public SpNegoCredElement(GSSCredentialSpi cred) throws GSSException {
         this.cred = cred;
     }
 
diff --git a/jdk/test/sun/security/krb5/auto/Context.java b/jdk/test/sun/security/krb5/auto/Context.java
index aae14f46bd3..738f2c3d4e3 100644
--- a/jdk/test/sun/security/krb5/auto/Context.java
+++ b/jdk/test/sun/security/krb5/auto/Context.java
@@ -296,6 +296,13 @@ public class Context {
         return s;
     }
 
+    /**
+     * Returns the cred inside, if there is one
+     */
+    public GSSCredential cred() {
+        return cred;
+    }
+
     /**
      * Disposes the GSSContext within
      * @throws org.ietf.jgss.GSSException
diff --git a/jdk/test/sun/security/krb5/auto/SpnegoLifeTime.java b/jdk/test/sun/security/krb5/auto/SpnegoLifeTime.java
new file mode 100644
index 00000000000..906cfbee786
--- /dev/null
+++ b/jdk/test/sun/security/krb5/auto/SpnegoLifeTime.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8000653
+ * @summary SPNEGO tests fail at context.getDelegCred().getRemainingInitLifetime(mechOid)
+ * @compile -XDignore.symbol.file SpnegoLifeTime.java
+ * @run main/othervm SpnegoLifeTime
+ */
+
+import org.ietf.jgss.Oid;
+import org.ietf.jgss.GSSCredential;
+import sun.security.jgss.GSSUtil;
+
+public class SpnegoLifeTime {
+
+    public static void main(String[] args) throws Exception {
+
+        Oid oid = GSSUtil.GSS_SPNEGO_MECH_OID;
+        new OneKDC(null).writeJAASConf();
+
+        Context c, s;
+        c = Context.fromJAAS("client");
+        s = Context.fromJAAS("server");
+
+        c.startAsClient(OneKDC.SERVER, oid);
+        c.x().requestCredDeleg(true);
+        s.startAsServer(oid);
+
+        Context.handshake(c, s);
+
+        GSSCredential cred = s.delegated().cred();
+        cred.getRemainingInitLifetime(oid);
+        cred.getUsage(oid);
+    }
+}
+

From d9cd2f6ad3e802b6e5b73a6c4ca7b12acda97caf Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Sat, 9 Mar 2013 21:49:32 +0530
Subject: [PATCH 289/311] 8009559: clean up method handle lookup code

Reviewed-by: ahgross, jlaskey, attila, sundar
---
 .../tools/nasgen/StringConstants.java         |   2 +-
 nashorn/make/java.security.override           |   2 +-
 .../beans/CheckRestrictedPackage.java         |  47 +++-
 .../beans/CheckRestrictedPackageInternal.java | 252 ------------------
 .../dynalink/beans/FacetIntrospector.java     |   7 +-
 .../dynalink/beans/SafeUnreflector.java       | 156 +++++++++++
 .../dynalink/beans/SafeUnreflectorImpl.java   | 146 ++++++++++
 .../dynalink/beans/SandboxClassLoader.java    | 228 ++++++++++++++++
 .../dynalink/beans/StaticClassLinker.java     |   2 +-
 .../Unreflector.java}                         |  61 +++--
 .../internal/codegen/CompilerConstants.java   |   2 +-
 .../internal/codegen/FunctionSignature.java   |   2 +-
 .../codegen/ObjectClassGenerator.java         |   2 +-
 .../internal/codegen/RuntimeCallSite.java     |   6 +-
 .../{runtime/linker => lookup}/Lookup.java    |   2 +-
 .../MethodHandleFactory.java                  |   2 +-
 .../MethodHandleFunctionality.java            |   2 +-
 .../jdk/nashorn/internal/objects/Global.java  |   2 +-
 .../internal/objects/NativeArguments.java     |   4 +-
 .../internal/objects/NativeBoolean.java       |   4 +-
 .../nashorn/internal/objects/NativeError.java |   2 +-
 .../internal/objects/NativeJSAdapter.java     |   6 +-
 .../internal/objects/NativeNumber.java        |   4 +-
 .../objects/NativeStrictArguments.java        |   4 +-
 .../internal/objects/NativeString.java        |   4 +-
 .../internal/objects/PrototypeObject.java     |   4 +-
 .../internal/objects/ScriptFunctionImpl.java  |   2 +-
 .../objects/ScriptFunctionTrampolineImpl.java |   2 +-
 .../internal/runtime/AccessorProperty.java    |   8 +-
 .../jdk/nashorn/internal/runtime/Context.java |   2 +-
 .../internal/runtime/FindProperty.java        |   2 +-
 .../internal/runtime/GlobalFunctions.java     |   2 +-
 .../internal/runtime/ScriptFunction.java      |   4 +-
 .../internal/runtime/ScriptFunctionData.java  |   2 +-
 .../internal/runtime/ScriptObject.java        |   6 +-
 .../internal/runtime/ScriptingFunctions.java  |   2 +-
 .../internal/runtime/SetMethodCreator.java    |   4 +-
 .../internal/runtime/SpillProperty.java       |   4 +-
 .../nashorn/internal/runtime/Undefined.java   |   2 +-
 .../runtime/UserAccessorProperty.java         |   2 +-
 .../nashorn/internal/runtime/WithObject.java  |   2 +-
 .../runtime/linker/JSObjectLinker.java        |   4 +-
 .../runtime/linker/JavaAdapterFactory.java    |   2 +-
 .../linker/JavaArgumentConverters.java        |   2 +-
 .../runtime/linker/LinkerCallSite.java        |   3 +-
 .../runtime/linker/NashornBottomLinker.java   |   4 +-
 .../runtime/linker/NashornGuards.java         |   2 +-
 .../runtime/linker/NashornLinker.java         |   4 +-
 .../linker/NashornPrimitiveLinker.java        |   4 +-
 .../linker/NashornStaticClassLinker.java      |   2 +-
 .../runtime/linker/PrimitiveLookup.java       |   3 +-
 .../JDK-8006529.js                            |   0
 52 files changed, 680 insertions(+), 351 deletions(-)
 delete mode 100644 nashorn/src/jdk/internal/dynalink/beans/CheckRestrictedPackageInternal.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/beans/SafeUnreflector.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/beans/SafeUnreflectorImpl.java
 create mode 100644 nashorn/src/jdk/internal/dynalink/beans/SandboxClassLoader.java
 rename nashorn/src/jdk/internal/dynalink/beans/{RestrictedPackageTester.java => sandbox/Unreflector.java} (67%)
 rename nashorn/src/jdk/nashorn/internal/{runtime/linker => lookup}/Lookup.java (99%)
 rename nashorn/src/jdk/nashorn/internal/{runtime/linker => lookup}/MethodHandleFactory.java (99%)
 rename nashorn/src/jdk/nashorn/internal/{runtime/linker => lookup}/MethodHandleFunctionality.java (99%)
 rename nashorn/test/script/{trusted => currently-failing}/JDK-8006529.js (100%)

diff --git a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/StringConstants.java b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/StringConstants.java
index 4617eb6648c..8c2dcef0e85 100644
--- a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/StringConstants.java
+++ b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/StringConstants.java
@@ -28,12 +28,12 @@ package jdk.nashorn.internal.tools.nasgen;
 import java.lang.invoke.MethodHandle;
 import java.lang.reflect.Method;
 import jdk.internal.org.objectweb.asm.Type;
+import jdk.nashorn.internal.lookup.Lookup;
 import jdk.nashorn.internal.objects.PrototypeObject;
 import jdk.nashorn.internal.objects.ScriptFunctionImpl;
 import jdk.nashorn.internal.runtime.PropertyMap;
 import jdk.nashorn.internal.runtime.ScriptFunction;
 import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.linker.Lookup;
 
 /**
  * String constants used for code generation/instrumentation.
diff --git a/nashorn/make/java.security.override b/nashorn/make/java.security.override
index 45f2687a6d7..0021985287e 100644
--- a/nashorn/make/java.security.override
+++ b/nashorn/make/java.security.override
@@ -11,4 +11,4 @@
 # passed to checkPackageAccess unless the
 # corresponding RuntimePermission ("accessClassInPackage."+package) has
 # been granted.
-package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.,jdk.internal.,jdk.nashorn.internal.ir., jdk.nashorn.internal.codegen., jdk.nashorn.internal.parser.
+package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,com.sun.org.apache.xerces.internal.utils.,com.sun.org.apache.xalan.internal.utils.,com.sun.org.glassfish.external.,com.sun.org.glassfish.gmbal.,jdk.internal.,jdk.nashorn.internal.ir., jdk.nashorn.internal.codegen., jdk.nashorn.internal.lookup., jdk.nashorn.internal.parser.
diff --git a/nashorn/src/jdk/internal/dynalink/beans/CheckRestrictedPackage.java b/nashorn/src/jdk/internal/dynalink/beans/CheckRestrictedPackage.java
index 6c877a4d5d6..360759f8674 100644
--- a/nashorn/src/jdk/internal/dynalink/beans/CheckRestrictedPackage.java
+++ b/nashorn/src/jdk/internal/dynalink/beans/CheckRestrictedPackage.java
@@ -84,26 +84,55 @@
 package jdk.internal.dynalink.beans;
 
 import java.lang.reflect.Modifier;
+import java.security.AccessControlContext;
+import java.security.AccessController;
+import java.security.Permissions;
+import java.security.PrivilegedAction;
+import java.security.ProtectionDomain;
 
 /**
- * A utility class to check whether a given class is in a package with restricted access e.g. "sun.*" etc. See
- * {@link CheckRestrictedPackageInternal} for implementation details.
+ * A utility class to check whether a given class is in a package with restricted access e.g. "sun.*" etc.
  */
 class CheckRestrictedPackage {
+    private static final AccessControlContext NO_PERMISSIONS_CONTEXT = createNoPermissionsContext();
+
     /**
      * Returns true if the class is either not public, or it resides in a package with restricted access.
      * @param clazz the class to test
      * @return true if the class is either not public, or it resides in a package with restricted access.
      */
     static boolean isRestrictedClass(Class<?> clazz) {
-        return !Modifier.isPublic(clazz.getModifiers()) ||
-                (System.getSecurityManager() != null && isRestrictedPackage(clazz.getPackage()));
+        if(!Modifier.isPublic(clazz.getModifiers())) {
+            // Non-public classes are always restricted
+            return true;
+        }
+        final SecurityManager sm = System.getSecurityManager();
+        if(sm == null) {
+            // No further restrictions if we don't have a security manager
+            return false;
+        }
+        final String name = clazz.getName();
+        final int i = name.lastIndexOf('.');
+        if (i == -1) {
+            // Classes in default package are never restricted
+            return false;
+        }
+        // Do a package access check from within an access control context with no permissions
+        try {
+            AccessController.doPrivileged(new PrivilegedAction<Void>() {
+                @Override
+                public Void run() {
+                    sm.checkPackageAccess(name.substring(0, i));
+                    return null;
+                }
+            }, NO_PERMISSIONS_CONTEXT);
+        } catch(SecurityException e) {
+            return true;
+        }
+        return false;
     }
 
-    private static boolean isRestrictedPackage(Package pkg) {
-        // Note: we broke out the actual implementation into CheckRestrictedPackageInternal, so we only load it when
-        // needed - that is, if we need to check a non-public class with a non-null package, in presence of a security
-        // manager.
-        return pkg == null ? false : CheckRestrictedPackageInternal.isRestrictedPackageName(pkg.getName());
+    private static AccessControlContext createNoPermissionsContext() {
+        return new AccessControlContext(new ProtectionDomain[] { new ProtectionDomain(null, new Permissions()) });
     }
 }
diff --git a/nashorn/src/jdk/internal/dynalink/beans/CheckRestrictedPackageInternal.java b/nashorn/src/jdk/internal/dynalink/beans/CheckRestrictedPackageInternal.java
deleted file mode 100644
index 2ab6cfc404e..00000000000
--- a/nashorn/src/jdk/internal/dynalink/beans/CheckRestrictedPackageInternal.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * This file is available under and governed by the GNU General Public
- * License version 2 only, as published by the Free Software Foundation.
- * However, the following notice accompanied the original version of this
- * file, and Oracle licenses the original version of this file under the BSD
- * license:
- */
-/*
-   Copyright 2009-2013 Attila Szegedi
-
-   Licensed under both the Apache License, Version 2.0 (the "Apache License")
-   and the BSD License (the "BSD License"), with licensee being free to
-   choose either of the two at their discretion.
-
-   You may not use this file except in compliance with either the Apache
-   License or the BSD License.
-
-   If you choose to use this file in compliance with the Apache License, the
-   following notice applies to you:
-
-       You may obtain a copy of the Apache License at
-
-           http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing, software
-       distributed under the License is distributed on an "AS IS" BASIS,
-       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-       implied. See the License for the specific language governing
-       permissions and limitations under the License.
-
-   If you choose to use this file in compliance with the BSD License, the
-   following notice applies to you:
-
-       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 with the distribution.
-       * Neither the name of the copyright holder nor the names of
-         contributors may be used to endorse or promote products derived from
-         this software without specific prior written permission.
-
-       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
-       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-package jdk.internal.dynalink.beans;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.reflect.Method;
-import java.security.AccessController;
-import java.security.Permissions;
-import java.security.PrivilegedAction;
-import java.security.ProtectionDomain;
-import java.security.SecureClassLoader;
-
-/**
- * A utility class to check whether a given class is in a package with restricted access e.g. "sun.*". These packages
- * are normally listed in the security property "package.access" for most JRE implementations, although we fortunately
- * don't rely on it but solely on {@link SecurityManager#checkPackageAccess(String)}).
- *
- * This class accomplishes the check in a fashion that works reliably even if Dynalink itself (and all the code on the
- * stack that led to the invocation) has the permission to access the restricted package.
- *
- * If Dynalink has a broad set of privileges (notably, it is loaded from boot or extension class path), then it loads
- * the {@link RestrictedPackageTester} class into a isolated secure class loader that gives it no permissions
- * whatsoever, and uses this completely unprivileged class to subsequently invoke
- * {@link SecurityManager#checkPackageAccess(String)}. This will reliably throw a {@link SecurityException} for every
- * restricted package even if Dynalink and other code on the stack have the requisite {@code "accessClassInPackage.*"}
- * {@link RuntimePermission} privilege.
- *
- * On the other hand, if Dynalink does not have a broad set of privileges normally granted by the boot or extension
- * class path, it will probably lack the privilege to create a new secure class loader into which to load the tester
- * class. In this case, it will invoke {@link SecurityManager#checkPackageAccess(String)} itself with the reasoning that
- * it will also be sufficient to discover whether a package is restricted or not.
- *
- * The rationale for this design is that if Dynalink is running as part of a privileged classpath - boot or extension
- * class path, it will have all privileges, so a security manager's package access check might succeed if all other code
- * on the stack when requesting linking with a particular restricted class is also privileged. A subsequent linking
- * request from less privileged code would then also succeed in requesting methods in privileged package. On the other
- * hand, if Dynalink is privileged, it will be able to delegate the package access check to the unprivileged class and
- * narrow the access based on its result. Finally, if Dynalink itself is unprivileged, it will not be able to load the
- * unprivileged class, but then it will also fail the security manager's package access.
- *
- * With this design, Dynalink effectively restrains itself from giving unauthorized access to restricted packages from
- * classes doing the linking in case it itself has access to those packages. The only way to defeat it would be to
- * selectively give Dynalink some {@code "accessClassInPackage.*"} permissions while denying it the privilege to
- * manipulate class loaders.
- */
-class CheckRestrictedPackageInternal {
-    private static final MethodHandle PACKAGE_ACCESS_CHECK = getPackageAccessCheckMethod();
-    private static final String TESTER_CLASS_NAME = "jdk.internal.dynalink.beans.RestrictedPackageTester";
-
-    /**
-     * Returns true if the specified package has restricted access.
-     * @param pkgName the name of the package to check.
-     * @return true if the specified package has restricted access, false otherwise.
-     * @throws NullPointerException if pkgName is null, or if there is {@link System#getSecurityManager()} returns null
-     * as this method is only expected to be invoked in the presence of a security manager.
-     */
-    static boolean isRestrictedPackageName(String pkgName) {
-        try {
-            if(PACKAGE_ACCESS_CHECK != null) {
-                // If we were able to load our unprivileged tester class, use it to check package access
-                try {
-                    PACKAGE_ACCESS_CHECK.invokeExact(pkgName);
-                } catch(Error|RuntimeException e) {
-                    throw e;
-                } catch(Throwable t) {
-                    throw new RuntimeException(t);
-                }
-            } else {
-                // If we didn't have sufficient permissions to load our unprivileged tester class, we're definitely not
-                // running in a privileged class path, so invoking SecurityManager.checkPackageAccess() directly should
-                // have the same effect as going through an unprivileged tester.
-                System.getSecurityManager().checkPackageAccess(pkgName);
-            }
-            return false;
-        } catch(SecurityException e) {
-            return true;
-        }
-    }
-
-    private static MethodHandle getPackageAccessCheckMethod() {
-        try {
-            return AccessController.doPrivileged(new PrivilegedAction<MethodHandle>() {
-                @Override
-                public MethodHandle run() {
-                    return getPackageAccessCheckMethodInternal();
-                }
-            });
-        } catch(SecurityException e) {
-            // We don't have sufficient privileges to load our tester class into a separate protection domain, so just
-            // return null so isRestrictedPackageName() will default to itself invoking
-            // SecurityManager.checkPackageAccess().
-            return null;
-        }
-    }
-
-    static MethodHandle getPackageAccessCheckMethodInternal() {
-        try {
-            // Can't use MethodHandles.lookup().findStatic() -- even though both this class and the loaded class are in
-            // the same package, findStatic() will throw an IllegalAccessException since they have different class
-            // loaders. That's why we have to use unreflect with a setAccessible(true)...
-            final Method m = getTesterClass().getDeclaredMethod("checkPackageAccess", String.class);
-            m.setAccessible(true);
-            return MethodHandles.lookup().unreflect(m);
-        } catch(IllegalAccessException|NoSuchMethodException e) {
-            throw new AssertionError(e);
-        }
-    }
-
-    private static Class<?> getTesterClass() {
-        final ClassLoader loader = getTesterClassLoader();
-        try {
-            final Class<?> checkerClass = Class.forName(TESTER_CLASS_NAME, true, loader);
-            // Sanity check to ensure we didn't accidentally pick up the class from elsewhere
-            if(checkerClass.getClassLoader() != loader) {
-                throw new AssertionError(TESTER_CLASS_NAME + " was loaded from a different class loader");
-            }
-            return checkerClass;
-        } catch(ClassNotFoundException e) {
-            throw new AssertionError(e);
-        }
-    }
-
-    private static ClassLoader getTesterClassLoader() {
-        // We deliberately override loadClass instead of findClass so that we don't give a chance to finding this
-        // class already loaded anywhere else. Not that there's a big possibility for this, especially since the parent
-        // class loader is the bootstrap class loader, but still...
-        return new SecureClassLoader(null) {
-
-            @Override
-            protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
-                if(name.equals(TESTER_CLASS_NAME)) {
-                    final byte[] bytes = getTesterClassBytes();
-                    // Define the class with a protection domain that grants no permissions.
-                    Class<?> clazz = defineClass(name, bytes, 0, bytes.length, new ProtectionDomain(null,
-                            new Permissions()));
-                    if(resolve) {
-                        resolveClass(clazz);
-                    }
-                    return clazz;
-                }
-
-                return super.loadClass(name, resolve);
-            }
-        };
-    }
-
-    static byte[] getTesterClassBytes() {
-        try {
-            final InputStream in = CheckRestrictedPackage.class.getResourceAsStream("RestrictedPackageTester.class");
-            try {
-                final ByteArrayOutputStream out = new ByteArrayOutputStream(2048);
-                for(;;) {
-                    final int b = in.read();
-                    if(b == -1) {
-                        break;
-                    }
-                    out.write(b);
-                }
-                return out.toByteArray();
-            } finally {
-                in.close();
-            }
-        } catch(IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-}
diff --git a/nashorn/src/jdk/internal/dynalink/beans/FacetIntrospector.java b/nashorn/src/jdk/internal/dynalink/beans/FacetIntrospector.java
index c1480fc5a3c..f4fbd8244f1 100644
--- a/nashorn/src/jdk/internal/dynalink/beans/FacetIntrospector.java
+++ b/nashorn/src/jdk/internal/dynalink/beans/FacetIntrospector.java
@@ -92,7 +92,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
-import jdk.internal.dynalink.support.Lookup;
 
 /**
  * Base for classes that expose class field and method information to an {@link AbstractJavaLinker}. There are
@@ -161,15 +160,15 @@ abstract class FacetIntrospector {
 
 
     MethodHandle unreflectGetter(Field field) {
-        return editMethodHandle(Lookup.PUBLIC.unreflectGetter(field));
+        return editMethodHandle(SafeUnreflector.unreflectGetter(field));
     }
 
     MethodHandle unreflectSetter(Field field) {
-        return editMethodHandle(Lookup.PUBLIC.unreflectSetter(field));
+        return editMethodHandle(SafeUnreflector.unreflectSetter(field));
     }
 
     MethodHandle unreflect(Method method) {
-        return editMethodHandle(Lookup.PUBLIC.unreflect(method));
+        return editMethodHandle(SafeUnreflector.unreflect(method));
     }
 
     /**
diff --git a/nashorn/src/jdk/internal/dynalink/beans/SafeUnreflector.java b/nashorn/src/jdk/internal/dynalink/beans/SafeUnreflector.java
new file mode 100644
index 00000000000..e82870128ce
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/beans/SafeUnreflector.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.beans;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import jdk.internal.dynalink.beans.sandbox.Unreflector;
+
+/**
+ * Provides lookup of unreflected method handles through delegation to an instance of {@link SafeUnreflectorImpl}. If
+ * Dynalink is run as trusted code, the delegate class is loaded into an isolated zero-permissions protection domain,
+ * serving as a firebreak against an accidental privilege escalation downstream.
+ */
+final class SafeUnreflector {
+    private static final String UNREFLECTOR_IMPL_CLASS_NAME = "jdk.internal.dynalink.beans.SafeUnreflectorImpl";
+    private static final Unreflector impl = createImpl();
+
+    private SafeUnreflector() {
+    }
+
+    /**
+     * Performs a {@link java.lang.invoke.MethodHandles.Lookup#unreflect(Method)}, converting any encountered
+     * {@link IllegalAccessException} into an {@link IllegalAccessError}.
+     *
+     * @param m the method to unreflect
+     * @return the unreflected method handle.
+     */
+    static MethodHandle unreflect(Method m) {
+        return impl.unreflect(m);
+    }
+
+    /**
+     * Performs a {@link java.lang.invoke.MethodHandles.Lookup#unreflectGetter(Field)}, converting any encountered
+     * {@link IllegalAccessException} into an {@link IllegalAccessError}.
+     *
+     * @param f the field for which a getter is unreflected
+     * @return the unreflected field getter handle.
+     */
+    static MethodHandle unreflectGetter(Field f) {
+        return impl.unreflectGetter(f);
+    }
+
+    /**
+     * Performs a {@link java.lang.invoke.MethodHandles.Lookup#unreflectSetter(Field)}, converting any encountered
+     * {@link IllegalAccessException} into an {@link IllegalAccessError}.
+     *
+     * @param f the field for which a setter is unreflected
+     * @return the unreflected field setter handle.
+     */
+    static MethodHandle unreflectSetter(Field f) {
+        return impl.unreflectSetter(f);
+    }
+
+    static MethodHandle unreflectConstructor(Constructor<?> c) {
+        return impl.unreflectConstructor(c);
+    }
+
+    private static Unreflector createImpl() {
+        final Class<?> unreflectorImplClass = AccessController.doPrivileged(new PrivilegedAction<Class<?>>() {
+            @Override
+            public Class<?> run() {
+                return SandboxClassLoader.loadClass(UNREFLECTOR_IMPL_CLASS_NAME);
+            }
+        });
+        try {
+            return (Unreflector)unreflectorImplClass.newInstance();
+        } catch(InstantiationException | IllegalAccessException e) {
+            throw new RuntimeException(e.getMessage(), e);
+        }
+    }
+}
diff --git a/nashorn/src/jdk/internal/dynalink/beans/SafeUnreflectorImpl.java b/nashorn/src/jdk/internal/dynalink/beans/SafeUnreflectorImpl.java
new file mode 100644
index 00000000000..5ae843041bd
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/beans/SafeUnreflectorImpl.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.beans;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import jdk.internal.dynalink.beans.sandbox.Unreflector;
+
+/**
+ * Performs lookup of unreflected method handles by delegating to {@link MethodHandles#lookup()} using itself as the
+ * lookup class. When Dynalink runs as trusted code, this class is loaded into an isolated zero-permissions protection
+ * domain to stop any accidental privilege escalation.
+ */
+final class SafeUnreflectorImpl implements Unreflector {
+
+    SafeUnreflectorImpl() {
+    }
+
+    @Override
+    public MethodHandle unreflect(Method m) {
+        try {
+            return MethodHandles.lookup().unreflect(m);
+        } catch(IllegalAccessException e) {
+            final IllegalAccessError ee = new IllegalAccessError("Failed to unreflect method " + m);
+            ee.initCause(e);
+            throw ee;
+        }
+    }
+
+    @Override
+    public MethodHandle unreflectGetter(Field f) {
+        try {
+            return MethodHandles.lookup().unreflectGetter(f);
+        } catch(IllegalAccessException e) {
+            final IllegalAccessError ee = new IllegalAccessError("Failed to unreflect getter for field " + f);
+            ee.initCause(e);
+            throw ee;
+        }
+    }
+
+    @Override
+    public MethodHandle unreflectSetter(Field f) {
+        try {
+            return MethodHandles.lookup().unreflectSetter(f);
+        } catch(IllegalAccessException e) {
+            final IllegalAccessError ee = new IllegalAccessError("Failed to unreflect setter for field " + f);
+            ee.initCause(e);
+            throw ee;
+        }
+    }
+
+    @Override
+    public MethodHandle unreflectConstructor(Constructor<?> c) {
+        try {
+            return MethodHandles.lookup().unreflectConstructor(c);
+        } catch(IllegalAccessException e) {
+            final IllegalAccessError ee = new IllegalAccessError("Failed to unreflect constructor " + c);
+            ee.initCause(e);
+            throw ee;
+        }
+    }
+}
diff --git a/nashorn/src/jdk/internal/dynalink/beans/SandboxClassLoader.java b/nashorn/src/jdk/internal/dynalink/beans/SandboxClassLoader.java
new file mode 100644
index 00000000000..00f1e7ac794
--- /dev/null
+++ b/nashorn/src/jdk/internal/dynalink/beans/SandboxClassLoader.java
@@ -0,0 +1,228 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file, and Oracle licenses the original version of this file under the BSD
+ * license:
+ */
+/*
+   Copyright 2009-2013 Attila Szegedi
+
+   Licensed under both the Apache License, Version 2.0 (the "Apache License")
+   and the BSD License (the "BSD License"), with licensee being free to
+   choose either of the two at their discretion.
+
+   You may not use this file except in compliance with either the Apache
+   License or the BSD License.
+
+   If you choose to use this file in compliance with the Apache License, the
+   following notice applies to you:
+
+       You may obtain a copy of the Apache License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied. See the License for the specific language governing
+       permissions and limitations under the License.
+
+   If you choose to use this file in compliance with the BSD License, the
+   following notice applies to you:
+
+       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 with the distribution.
+       * Neither the name of the copyright holder nor the names of
+         contributors may be used to endorse or promote products derived from
+         this software without specific prior written permission.
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+       PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDER
+       BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+       CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+       SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+       BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+       WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+       OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+       ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package jdk.internal.dynalink.beans;
+
+import static jdk.internal.org.objectweb.asm.Opcodes.ACC_PUBLIC;
+import static jdk.internal.org.objectweb.asm.Opcodes.ASM4;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.Permissions;
+import java.security.ProtectionDomain;
+import java.security.SecureClassLoader;
+import java.security.SecureRandom;
+import jdk.internal.org.objectweb.asm.ClassReader;
+import jdk.internal.org.objectweb.asm.ClassVisitor;
+import jdk.internal.org.objectweb.asm.ClassWriter;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+
+/**
+ * A utility class that can load a class with specified name into an isolated zero-permissions protection domain. It can
+ * be used to load classes that perform security-sensitive operations with no privileges at all, therefore ensuring such
+ * operations will only succeed if they would require no permissions, as well as to make sure that if these operations
+ * bind some part of the security execution context to their results, the bound security context is completely
+ * unprivileged. Such measures serve as firebreaks against accidental privilege escalation.
+ */
+final class SandboxClassLoader {
+    private final String className;
+    private final String randomizedClassName;
+
+    private SandboxClassLoader(String className) {
+        this.className = className;
+        final String simpleClassName = className.substring(className.lastIndexOf('.') + 1);
+        this.randomizedClassName = "randomPackage" + Long.toHexString(new SecureRandom().nextLong()) + "." + simpleClassName;
+    }
+
+    /**
+     * Load the named class into a zero-permissions protection domain. Even if the class is already loaded into the
+     * Dynalink's class loader, an independent class is created from the same bytecode, thus the returned class will
+     * never be identical with the one that might already be loaded. The class to be loaded is supposed to be package
+     * private and have no public constructors. This is not a functional requirement, but it is enforced to ensure that
+     * the original class was made adequately inaccessible. The returned class will be public and its constructors will
+     * be changed to public. The only permission given to the returned class will be
+     * {@code accessClassInPackage.jdk.internal.dynalink.beans.sandbox}. That package should be used solely to define
+     * SPI interfaces implemented by the loaded class.
+     * @param className the fully qualified name of the class to load
+     * @return the loaded class, renamed to a random package, made public, its constructors made public, and lacking any
+     * permissions except access to the sandbox package.
+     * @throws SecurityException if the calling code lacks the {@code createClassLoader} runtime permission. This
+     * normally means that Dynalink itself is running as untrusted code, and whatever functionality was meant to be
+     * isolated into an unprivileged class is likely okay to be used directly too.
+     */
+    static Class<?> loadClass(String className) throws SecurityException {
+        return new SandboxClassLoader(className).loadClass();
+    }
+
+    private Class<?> loadClass() throws SecurityException {
+        final ClassLoader loader = createClassLoader();
+        try {
+            final Class<?> clazz = Class.forName(randomizedClassName, true, loader);
+            // Sanity check to ensure we didn't accidentally pick up the class from elsewhere
+            if(clazz.getClassLoader() != loader) {
+                throw new AssertionError(randomizedClassName + " was loaded from a different class loader");
+            }
+            return clazz;
+        } catch(ClassNotFoundException e) {
+            throw new AssertionError(e);
+        }
+    }
+
+    private ClassLoader createClassLoader() throws SecurityException {
+        final String lclassName = this.randomizedClassName;
+        // We deliberately override loadClass instead of findClass so that we don't give a chance to finding this
+        // class already loaded anywhere else. We use this class' loader as the parent class loader as the loaded class
+        // needs to be able to access implemented interfaces from the sandbox package.
+        return new SecureClassLoader(getClass().getClassLoader()) {
+            @Override
+            protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
+                if(name.equals(lclassName)) {
+                    final byte[] bytes = getClassBytes();
+                    // Define the class with a protection domain that grants (almost) no permissions.
+                    Class<?> clazz = defineClass(name, bytes, 0, bytes.length, createMinimalPermissionsDomain());
+                    if(resolve) {
+                        resolveClass(clazz);
+                    }
+                    return clazz;
+                }
+
+                final int i = name.lastIndexOf('.');
+                if (i != -1) {
+                    final SecurityManager sm = System.getSecurityManager();
+                    if (sm != null) {
+                        sm.checkPackageAccess(name.substring(0, i));
+                    }
+                }
+                return super.loadClass(name, resolve);
+            }
+        };
+    }
+
+    /**
+     * Create a no-permissions protection domain. Except, it's not really a no-permissions protection domain, since we
+     * need to give the protection domain the permission to access the sandbox package where the interop interfaces are
+     * defined.
+     * @return a new (almost) no-permission protection domain.
+     */
+    private static ProtectionDomain createMinimalPermissionsDomain() {
+        final Permissions p = new Permissions();
+        p.add(new RuntimePermission("accessClassInPackage.jdk.internal.dynalink.beans.sandbox"));
+        return new ProtectionDomain(null, p);
+    }
+
+    private byte[] getClassBytes() {
+        try(final InputStream in = getClass().getResourceAsStream("/" + className.replace('.', '/') + ".class")) {
+            final ClassReader cr = new ClassReader(in);
+            final ClassWriter cw = new ClassWriter(cr, 0);
+            cr.accept(new ClassVisitor(ASM4, cw) {
+                @Override
+                public void visit(int version, int access, String name, String signature, String superName,
+                        String[] interfaces) {
+                    // Rename the class to its random name, and make it public (otherwise we won't be able to
+                    // instantiate it). The privileged template class is package-private.
+                    if((access & ACC_PUBLIC) != 0) {
+                        throw new IllegalArgumentException("Class " + className + " must be package-private");
+                    }
+                    super.visit(version, access | ACC_PUBLIC, randomizedClassName.replace('.', '/'),
+                            signature, superName, interfaces);
+                }
+
+                @Override
+                public MethodVisitor visitMethod(int access, String name, String desc, String signature,
+                        String[] exceptions) {
+                    // Make the constructor(s) public (otherwise we won't be able to instantiate the class). The
+                    // privileged template's constructor(s) should not be public.
+                    final boolean isCtor = "<init>".equals(name);
+                    if(isCtor && ((access & ACC_PUBLIC) != 0)) {
+                        throw new IllegalArgumentException("Class " + className + " must have no public constructors");
+                    }
+                    return super.visitMethod(isCtor ? (access | ACC_PUBLIC) : access, name, desc, signature,
+                            exceptions);
+                }
+            }, 0);
+            return cw.toByteArray();
+        } catch(IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/nashorn/src/jdk/internal/dynalink/beans/StaticClassLinker.java b/nashorn/src/jdk/internal/dynalink/beans/StaticClassLinker.java
index 333ad8ff4c1..c87d666732b 100644
--- a/nashorn/src/jdk/internal/dynalink/beans/StaticClassLinker.java
+++ b/nashorn/src/jdk/internal/dynalink/beans/StaticClassLinker.java
@@ -138,7 +138,7 @@ class StaticClassLinker implements TypeBasedGuardingDynamicLinker {
             final Constructor<?>[] ctrs = clazz.getConstructors();
             final List<MethodHandle> mhs = new ArrayList<>(ctrs.length);
             for(int i = 0; i < ctrs.length; ++i) {
-                mhs.add(drop(Lookup.PUBLIC.unreflectConstructor(ctrs[i])));
+                mhs.add(drop(SafeUnreflector.unreflectConstructor(ctrs[i])));
             }
             return createDynamicMethod(mhs, clazz, "<init>");
         }
diff --git a/nashorn/src/jdk/internal/dynalink/beans/RestrictedPackageTester.java b/nashorn/src/jdk/internal/dynalink/beans/sandbox/Unreflector.java
similarity index 67%
rename from nashorn/src/jdk/internal/dynalink/beans/RestrictedPackageTester.java
rename to nashorn/src/jdk/internal/dynalink/beans/sandbox/Unreflector.java
index 622ddb75365..b5174cd3633 100644
--- a/nashorn/src/jdk/internal/dynalink/beans/RestrictedPackageTester.java
+++ b/nashorn/src/jdk/internal/dynalink/beans/sandbox/Unreflector.java
@@ -81,33 +81,52 @@
        ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package jdk.internal.dynalink.beans;
+package jdk.internal.dynalink.beans.sandbox;
 
-import java.security.AccessController;
-import java.security.PrivilegedAction;
+import java.lang.invoke.MethodHandle;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 
 /**
- * This class is never referenced directly from code of any other class, but is loaded into a secure class loader that
- * gives it no permissions whatsoever, so it can be used to reliably test whether a given package has restricted access
- * or not. See {@link CheckRestrictedPackageInternal} for details.
- * @author Attila Szegedi
- * @version $Id: $
+ * Interface for creating unreflected method handles. This class is public for implementation purposes and is not part
+ * of any supported API.
  */
-class RestrictedPackageTester implements PrivilegedAction<Void> {
+public interface Unreflector {
+    /**
+     * Performs similarly to {@link java.lang.invoke.MethodHandles.Lookup#unreflect(Method)} for some lookup object,
+     * also converting any encountered {@link IllegalAccessException} into an {@link IllegalAccessError}.
+     *
+     * @param m the method to unreflect
+     * @return the unreflected method handle.
+     */
+    public MethodHandle unreflect(Method m);
 
-    private final String pkgName;
+    /**
+     * Performs similarly to {@link java.lang.invoke.MethodHandles.Lookup#unreflectGetter(Field)} for some lookup
+     * object, also converting any encountered {@link IllegalAccessException} into an {@link IllegalAccessError}.
+     *
+     * @param f the field for which a getter is unreflected
+     * @return the unreflected field getter handle.
+     */
+    public MethodHandle unreflectGetter(Field f);
 
-    private RestrictedPackageTester(String pkgName) {
-        this.pkgName = pkgName;
-    }
+    /**
+     * Performs similarly to {@link java.lang.invoke.MethodHandles.Lookup#unreflectSetter(Field)} for some lookup
+     * object, also converting any encountered {@link IllegalAccessException} into an {@link IllegalAccessError}.
+     *
+     * @param f the field for which a setter is unreflected
+     * @return the unreflected field setter handle.
+     */
+    public MethodHandle unreflectSetter(Field f);
 
-    static void checkPackageAccess(String pkgName) {
-        AccessController.doPrivileged(new RestrictedPackageTester(pkgName));
-    }
+    /**
+     * Performs similarly to {@link java.lang.invoke.MethodHandles.Lookup#unreflectConstructor(Constructor)} for some
+     * lookup object, also converting any encountered {@link IllegalAccessException} into an {@link IllegalAccessError}.
+     *
+     * @param c the constructor to unreflect
+     * @return the unreflected constructor handle.
+     */
+    public MethodHandle unreflectConstructor(Constructor<?> c);
 
-    @Override
-    public Void run() {
-        System.getSecurityManager().checkPackageAccess(pkgName);
-        return null;
-    }
 }
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CompilerConstants.java b/nashorn/src/jdk/nashorn/internal/codegen/CompilerConstants.java
index 1dcad563fdd..1d978d96310 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/CompilerConstants.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CompilerConstants.java
@@ -25,7 +25,7 @@
 
 package jdk.nashorn.internal.codegen;
 
-import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+import static jdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/FunctionSignature.java b/nashorn/src/jdk/nashorn/internal/codegen/FunctionSignature.java
index bc61678fc2d..ded12b0c007 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/FunctionSignature.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/FunctionSignature.java
@@ -25,7 +25,7 @@
 
 package jdk.nashorn.internal.codegen;
 
-import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+import static jdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.lang.invoke.MethodType;
 import java.util.ArrayList;
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/ObjectClassGenerator.java b/nashorn/src/jdk/nashorn/internal/codegen/ObjectClassGenerator.java
index c0308b6ee53..6e032e2ce1e 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/ObjectClassGenerator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/ObjectClassGenerator.java
@@ -34,7 +34,7 @@ import static jdk.nashorn.internal.codegen.CompilerConstants.JS_OBJECT_PREFIX;
 import static jdk.nashorn.internal.codegen.CompilerConstants.MAP;
 import static jdk.nashorn.internal.codegen.CompilerConstants.className;
 import static jdk.nashorn.internal.codegen.CompilerConstants.constructorNoLookup;
-import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+import static jdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
diff --git a/nashorn/src/jdk/nashorn/internal/codegen/RuntimeCallSite.java b/nashorn/src/jdk/nashorn/internal/codegen/RuntimeCallSite.java
index 116bdd61364..1731da8ef7a 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/RuntimeCallSite.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/RuntimeCallSite.java
@@ -28,7 +28,7 @@ package jdk.nashorn.internal.codegen;
 import static jdk.nashorn.internal.codegen.CompilerConstants.staticCallNoLookup;
 import static jdk.nashorn.internal.codegen.types.Type.BOOLEAN;
 import static jdk.nashorn.internal.codegen.types.Type.INT;
-import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+import static jdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.lang.invoke.CallSite;
 import java.lang.invoke.MethodHandle;
@@ -43,8 +43,8 @@ import jdk.nashorn.internal.ir.RuntimeNode;
 import jdk.nashorn.internal.ir.RuntimeNode.Request;
 import jdk.nashorn.internal.runtime.ScriptRuntime;
 import jdk.nashorn.internal.runtime.linker.Bootstrap;
-import jdk.nashorn.internal.runtime.linker.Lookup;
-import jdk.nashorn.internal.runtime.linker.MethodHandleFactory;
+import jdk.nashorn.internal.lookup.Lookup;
+import jdk.nashorn.internal.lookup.MethodHandleFactory;
 
 /**
  * Optimistic call site that assumes its Object arguments to be of a boxed type.
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/Lookup.java b/nashorn/src/jdk/nashorn/internal/lookup/Lookup.java
similarity index 99%
rename from nashorn/src/jdk/nashorn/internal/runtime/linker/Lookup.java
rename to nashorn/src/jdk/nashorn/internal/lookup/Lookup.java
index 6a95a3c4422..a454527aec2 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/Lookup.java
+++ b/nashorn/src/jdk/nashorn/internal/lookup/Lookup.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.linker;
+package jdk.nashorn.internal.lookup;
 
 import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
 import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/MethodHandleFactory.java b/nashorn/src/jdk/nashorn/internal/lookup/MethodHandleFactory.java
similarity index 99%
rename from nashorn/src/jdk/nashorn/internal/runtime/linker/MethodHandleFactory.java
rename to nashorn/src/jdk/nashorn/internal/lookup/MethodHandleFactory.java
index cbf296303da..2161c782946 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/MethodHandleFactory.java
+++ b/nashorn/src/jdk/nashorn/internal/lookup/MethodHandleFactory.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.linker;
+package jdk.nashorn.internal.lookup;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/MethodHandleFunctionality.java b/nashorn/src/jdk/nashorn/internal/lookup/MethodHandleFunctionality.java
similarity index 99%
rename from nashorn/src/jdk/nashorn/internal/runtime/linker/MethodHandleFunctionality.java
rename to nashorn/src/jdk/nashorn/internal/lookup/MethodHandleFunctionality.java
index 0a9cfb04977..c7dd83b2790 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/MethodHandleFunctionality.java
+++ b/nashorn/src/jdk/nashorn/internal/lookup/MethodHandleFunctionality.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.nashorn.internal.runtime.linker;
+package jdk.nashorn.internal.lookup;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
diff --git a/nashorn/src/jdk/nashorn/internal/objects/Global.java b/nashorn/src/jdk/nashorn/internal/objects/Global.java
index 7de45a91ea2..b89d207344b 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/Global.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/Global.java
@@ -27,7 +27,7 @@ package jdk.nashorn.internal.objects;
 
 import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
 import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
-import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+import static jdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.io.IOException;
 import java.io.PrintWriter;
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeArguments.java b/nashorn/src/jdk/nashorn/internal/objects/NativeArguments.java
index d3ffefc1eab..afc2b57e090 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeArguments.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeArguments.java
@@ -28,7 +28,7 @@ package jdk.nashorn.internal.objects;
 import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
 import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 import static jdk.nashorn.internal.runtime.arrays.ArrayIndex.getArrayIndexNoThrow;
-import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+import static jdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -42,7 +42,7 @@ import jdk.nashorn.internal.runtime.ScriptObject;
 import jdk.nashorn.internal.runtime.ScriptRuntime;
 import jdk.nashorn.internal.runtime.arrays.ArrayData;
 import jdk.nashorn.internal.runtime.arrays.ArrayIndex;
-import jdk.nashorn.internal.runtime.linker.Lookup;
+import jdk.nashorn.internal.lookup.Lookup;
 
 /**
  * ECMA 10.6 Arguments Object.
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeBoolean.java b/nashorn/src/jdk/nashorn/internal/objects/NativeBoolean.java
index 0c87f6c8b43..a63f0d48287 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeBoolean.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeBoolean.java
@@ -26,7 +26,7 @@
 package jdk.nashorn.internal.objects;
 
 import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
-import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+import static jdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -39,7 +39,7 @@ import jdk.nashorn.internal.objects.annotations.ScriptClass;
 import jdk.nashorn.internal.runtime.JSType;
 import jdk.nashorn.internal.runtime.ScriptObject;
 import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.linker.MethodHandleFactory;
+import jdk.nashorn.internal.lookup.MethodHandleFactory;
 import jdk.nashorn.internal.runtime.linker.PrimitiveLookup;
 
 /**
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeError.java b/nashorn/src/jdk/nashorn/internal/objects/NativeError.java
index eff8af866b5..8cea0c70271 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeError.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeError.java
@@ -26,7 +26,7 @@
 package jdk.nashorn.internal.objects;
 
 import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
-import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+import static jdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java b/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java
index 79bde705038..409b9fa4c14 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java
@@ -27,7 +27,7 @@ package jdk.nashorn.internal.objects;
 
 import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
 import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
-import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+import static jdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -46,8 +46,8 @@ import jdk.nashorn.internal.runtime.ScriptFunction;
 import jdk.nashorn.internal.runtime.ScriptObject;
 import jdk.nashorn.internal.runtime.ScriptRuntime;
 import jdk.nashorn.internal.runtime.arrays.ArrayLikeIterator;
-import jdk.nashorn.internal.runtime.linker.Lookup;
-import jdk.nashorn.internal.runtime.linker.MethodHandleFactory;
+import jdk.nashorn.internal.lookup.Lookup;
+import jdk.nashorn.internal.lookup.MethodHandleFactory;
 
 /**
  * This class is the implementation of the Nashorn-specific global object named {@code JSAdapter}. It can be
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java b/nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java
index 87209ca0001..edb83f06d18 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeNumber.java
@@ -30,7 +30,7 @@ import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
 import static jdk.nashorn.internal.runtime.JSType.isRepresentableAsInt;
 import static jdk.nashorn.internal.runtime.JSType.isRepresentableAsLong;
 import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
-import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+import static jdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -47,7 +47,7 @@ import jdk.nashorn.internal.objects.annotations.Where;
 import jdk.nashorn.internal.runtime.JSType;
 import jdk.nashorn.internal.runtime.ScriptObject;
 import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.linker.MethodHandleFactory;
+import jdk.nashorn.internal.lookup.MethodHandleFactory;
 import jdk.nashorn.internal.runtime.linker.PrimitiveLookup;
 
 /**
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeStrictArguments.java b/nashorn/src/jdk/nashorn/internal/objects/NativeStrictArguments.java
index 8b5a7b5ed47..a643c190c5c 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeStrictArguments.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeStrictArguments.java
@@ -26,7 +26,7 @@
 package jdk.nashorn.internal.objects;
 
 import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
-import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+import static jdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -36,7 +36,7 @@ import jdk.nashorn.internal.runtime.PropertyMap;
 import jdk.nashorn.internal.runtime.ScriptFunction;
 import jdk.nashorn.internal.runtime.ScriptObject;
 import jdk.nashorn.internal.runtime.arrays.ArrayData;
-import jdk.nashorn.internal.runtime.linker.Lookup;
+import jdk.nashorn.internal.lookup.Lookup;
 
 /**
  * ECMA 10.6 Arguments Object.
diff --git a/nashorn/src/jdk/nashorn/internal/objects/NativeString.java b/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
index 1df4649757e..b2b1cf2bcbc 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/NativeString.java
@@ -29,7 +29,7 @@ import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
 import static jdk.nashorn.internal.runtime.JSType.isRepresentableAsInt;
 import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 import static jdk.nashorn.internal.runtime.arrays.ArrayIndex.getArrayIndexNoThrow;
-import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+import static jdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -55,7 +55,7 @@ import jdk.nashorn.internal.runtime.ScriptFunction;
 import jdk.nashorn.internal.runtime.ScriptObject;
 import jdk.nashorn.internal.runtime.ScriptRuntime;
 import jdk.nashorn.internal.runtime.arrays.ArrayIndex;
-import jdk.nashorn.internal.runtime.linker.MethodHandleFactory;
+import jdk.nashorn.internal.lookup.MethodHandleFactory;
 import jdk.nashorn.internal.runtime.linker.NashornGuards;
 import jdk.nashorn.internal.runtime.linker.PrimitiveLookup;
 
diff --git a/nashorn/src/jdk/nashorn/internal/objects/PrototypeObject.java b/nashorn/src/jdk/nashorn/internal/objects/PrototypeObject.java
index 59c1521bbff..edcc3274064 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/PrototypeObject.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/PrototypeObject.java
@@ -26,7 +26,7 @@
 package jdk.nashorn.internal.objects;
 
 import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
-import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+import static jdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -34,7 +34,7 @@ import jdk.nashorn.internal.runtime.Property;
 import jdk.nashorn.internal.runtime.PropertyMap;
 import jdk.nashorn.internal.runtime.ScriptFunction;
 import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.linker.Lookup;
+import jdk.nashorn.internal.lookup.Lookup;
 
 /**
  * Instances of this class serve as "prototype" object for script functions.
diff --git a/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java b/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
index fad137ba23a..0514bd25bf0 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
@@ -34,7 +34,7 @@ import jdk.nashorn.internal.runtime.PropertyMap;
 import jdk.nashorn.internal.runtime.ScriptFunction;
 import jdk.nashorn.internal.runtime.ScriptFunctionData;
 import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.linker.Lookup;
+import jdk.nashorn.internal.lookup.Lookup;
 
 /**
  * Concrete implementation of ScriptFunction. This sets correct map for the
diff --git a/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionTrampolineImpl.java b/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionTrampolineImpl.java
index 27229b21f90..4d3df5093ed 100644
--- a/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionTrampolineImpl.java
+++ b/nashorn/src/jdk/nashorn/internal/objects/ScriptFunctionTrampolineImpl.java
@@ -1,6 +1,6 @@
 package jdk.nashorn.internal.objects;
 
-import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+import static jdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/AccessorProperty.java b/nashorn/src/jdk/nashorn/internal/runtime/AccessorProperty.java
index 576f357ecce..9f6867ddaf8 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/AccessorProperty.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/AccessorProperty.java
@@ -36,16 +36,16 @@ import static jdk.nashorn.internal.codegen.ObjectClassGenerator.createSetter;
 import static jdk.nashorn.internal.codegen.ObjectClassGenerator.getAccessorType;
 import static jdk.nashorn.internal.codegen.ObjectClassGenerator.getAccessorTypeIndex;
 import static jdk.nashorn.internal.codegen.ObjectClassGenerator.getNumberOfAccessorTypes;
-import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
-import static jdk.nashorn.internal.runtime.linker.MethodHandleFactory.stripName;
+import static jdk.nashorn.internal.lookup.Lookup.MH;
+import static jdk.nashorn.internal.lookup.MethodHandleFactory.stripName;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import jdk.nashorn.internal.codegen.ObjectClassGenerator;
 import jdk.nashorn.internal.codegen.types.Type;
-import jdk.nashorn.internal.runtime.linker.Lookup;
-import jdk.nashorn.internal.runtime.linker.MethodHandleFactory;
+import jdk.nashorn.internal.lookup.Lookup;
+import jdk.nashorn.internal.lookup.MethodHandleFactory;
 
 /**
  * An AccessorProperty is the most generic property type. An AccessorProperty is
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Context.java b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
index 202112b187f..1c4a08c843b 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/Context.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Context.java
@@ -29,7 +29,7 @@ import static jdk.nashorn.internal.codegen.CompilerConstants.RUN_SCRIPT;
 import static jdk.nashorn.internal.codegen.CompilerConstants.STRICT_MODE;
 import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
 import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
-import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+import static jdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/FindProperty.java b/nashorn/src/jdk/nashorn/internal/runtime/FindProperty.java
index f81af9a9b35..35ffed9329c 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/FindProperty.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/FindProperty.java
@@ -25,7 +25,7 @@
 
 package jdk.nashorn.internal.runtime;
 
-import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+import static jdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import jdk.nashorn.internal.codegen.ObjectClassGenerator;
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/GlobalFunctions.java b/nashorn/src/jdk/nashorn/internal/runtime/GlobalFunctions.java
index 96ce6c33063..9101153325f 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/GlobalFunctions.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/GlobalFunctions.java
@@ -26,7 +26,7 @@
 package jdk.nashorn.internal.runtime;
 
 import static jdk.nashorn.internal.runtime.JSType.digit;
-import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+import static jdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
index 61f49e874fa..2d28f91e1a4 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunction.java
@@ -28,7 +28,7 @@ package jdk.nashorn.internal.runtime;
 import static jdk.nashorn.internal.codegen.CompilerConstants.virtualCallNoLookup;
 import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
 import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
-import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+import static jdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -38,7 +38,7 @@ import jdk.internal.dynalink.linker.GuardedInvocation;
 import jdk.internal.dynalink.linker.LinkRequest;
 import jdk.nashorn.internal.codegen.CompilerConstants.Call;
 import jdk.nashorn.internal.objects.annotations.SpecializedFunction;
-import jdk.nashorn.internal.runtime.linker.MethodHandleFactory;
+import jdk.nashorn.internal.lookup.MethodHandleFactory;
 import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
 import jdk.nashorn.internal.runtime.linker.NashornGuards;
 
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunctionData.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunctionData.java
index 047bf3f0617..8f8193e4786 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunctionData.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptFunctionData.java
@@ -27,7 +27,7 @@ package jdk.nashorn.internal.runtime;
 
 import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
 import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
-import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+import static jdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
index c95471d6d2b..1942ec22a0f 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptObject.java
@@ -39,7 +39,7 @@ import static jdk.nashorn.internal.runtime.PropertyDescriptor.WRITABLE;
 import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
 import static jdk.nashorn.internal.runtime.arrays.ArrayIndex.getArrayIndexNoThrow;
 import static jdk.nashorn.internal.runtime.arrays.ArrayIndex.isValidArrayIndex;
-import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+import static jdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -65,8 +65,8 @@ import jdk.nashorn.internal.objects.AccessorPropertyDescriptor;
 import jdk.nashorn.internal.objects.DataPropertyDescriptor;
 import jdk.nashorn.internal.runtime.arrays.ArrayData;
 import jdk.nashorn.internal.runtime.linker.Bootstrap;
-import jdk.nashorn.internal.runtime.linker.Lookup;
-import jdk.nashorn.internal.runtime.linker.MethodHandleFactory;
+import jdk.nashorn.internal.lookup.Lookup;
+import jdk.nashorn.internal.lookup.MethodHandleFactory;
 import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
 import jdk.nashorn.internal.runtime.linker.NashornGuards;
 
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java b/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java
index 4bf4859e0cf..596ec1bf955 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/ScriptingFunctions.java
@@ -27,7 +27,7 @@ package jdk.nashorn.internal.runtime;
 
 import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
 import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
-import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+import static jdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.io.BufferedReader;
 import java.io.File;
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/SetMethodCreator.java b/nashorn/src/jdk/nashorn/internal/runtime/SetMethodCreator.java
index 4790e3ef4d7..8012ce02ec4 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/SetMethodCreator.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/SetMethodCreator.java
@@ -26,13 +26,13 @@
 package jdk.nashorn.internal.runtime;
 
 import static jdk.nashorn.internal.runtime.ECMAErrors.referenceError;
-import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+import static jdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import jdk.internal.dynalink.CallSiteDescriptor;
 import jdk.internal.dynalink.linker.GuardedInvocation;
 import jdk.nashorn.internal.codegen.ObjectClassGenerator;
-import jdk.nashorn.internal.runtime.linker.Lookup;
+import jdk.nashorn.internal.lookup.Lookup;
 import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
 import jdk.nashorn.internal.runtime.linker.NashornGuards;
 
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/SpillProperty.java b/nashorn/src/jdk/nashorn/internal/runtime/SpillProperty.java
index 90f5f8bfc1f..716097d00d5 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/SpillProperty.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/SpillProperty.java
@@ -25,11 +25,11 @@
 
 package jdk.nashorn.internal.runtime;
 
-import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+import static jdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
-import jdk.nashorn.internal.runtime.linker.Lookup;
+import jdk.nashorn.internal.lookup.Lookup;
 
 /**
  * The SpillProperty is a subclass of AccessorProperties. Anything not in the initial property map
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/Undefined.java b/nashorn/src/jdk/nashorn/internal/runtime/Undefined.java
index b9286cbeaff..a19c2445f57 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/Undefined.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/Undefined.java
@@ -26,7 +26,7 @@
 package jdk.nashorn.internal.runtime;
 
 import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
-import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+import static jdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/UserAccessorProperty.java b/nashorn/src/jdk/nashorn/internal/runtime/UserAccessorProperty.java
index c4c6f60e511..83d3c8d7152 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/UserAccessorProperty.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/UserAccessorProperty.java
@@ -26,7 +26,7 @@
 package jdk.nashorn.internal.runtime;
 
 import java.lang.invoke.MethodHandle;
-import jdk.nashorn.internal.runtime.linker.Lookup;
+import jdk.nashorn.internal.lookup.Lookup;
 
 /**
  * Property with user defined getters/setters. Actual getter and setter
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java b/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java
index 06da976b640..5eaf5f50193 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/WithObject.java
@@ -25,7 +25,7 @@
 
 package jdk.nashorn.internal.runtime;
 
-import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+import static jdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java
index 458469afe9f..df9c47ff623 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java
@@ -25,6 +25,8 @@
 
 package jdk.nashorn.internal.runtime.linker;
 
+import jdk.nashorn.internal.lookup.MethodHandleFunctionality;
+import jdk.nashorn.internal.lookup.MethodHandleFactory;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
@@ -42,7 +44,7 @@ import netscape.javascript.JSObject;
  * A Dynalink linker to handle web browser built-in JS (DOM etc.) objects as well
  * as ScriptObjects from other Nashorn contexts.
  */
-public final class JSObjectLinker implements TypeBasedGuardingDynamicLinker {
+final class JSObjectLinker implements TypeBasedGuardingDynamicLinker {
    /**
      * Instances of this class are used to represent a method member of a JSObject
      */
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
index b5305d97b5b..a9e4bd01469 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaAdapterFactory.java
@@ -41,7 +41,7 @@ import static jdk.internal.org.objectweb.asm.Opcodes.ILOAD;
 import static jdk.internal.org.objectweb.asm.Opcodes.ISTORE;
 import static jdk.internal.org.objectweb.asm.Opcodes.RETURN;
 import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
-import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+import static jdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodType;
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java
index a8e14a1689b..3d8363e10d9 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/JavaArgumentConverters.java
@@ -27,7 +27,7 @@ package jdk.nashorn.internal.runtime.linker;
 
 import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
 import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
-import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+import static jdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java
index 445f87d8bd1..05b1a9396ef 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/LinkerCallSite.java
@@ -25,7 +25,8 @@
 
 package jdk.nashorn.internal.runtime.linker;
 
-import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+import jdk.nashorn.internal.lookup.MethodHandleFactory;
+import static jdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java
index 1ab9c42cc81..3e73ff11cea 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java
@@ -27,7 +27,7 @@ package jdk.nashorn.internal.runtime.linker;
 
 import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
 import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
-import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+import static jdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import jdk.internal.dynalink.CallSiteDescriptor;
@@ -46,7 +46,7 @@ import jdk.nashorn.internal.runtime.ScriptRuntime;
  * setters for Java objects that couldn't be linked by any other linker, and throw appropriate ECMAScript errors for
  * attempts to invoke arbitrary Java objects as functions or constructors.
  */
-class NashornBottomLinker implements GuardingDynamicLinker {
+final class NashornBottomLinker implements GuardingDynamicLinker {
 
     @Override
     public GuardedInvocation getGuardedInvocation(final LinkRequest linkRequest, final LinkerServices linkerServices)
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornGuards.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornGuards.java
index 5993f932cff..ed152485376 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornGuards.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornGuards.java
@@ -25,7 +25,7 @@
 
 package jdk.nashorn.internal.runtime.linker;
 
-import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+import static jdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornLinker.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornLinker.java
index 74260dd80f0..3a4a5d77487 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornLinker.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornLinker.java
@@ -25,7 +25,7 @@
 
 package jdk.nashorn.internal.runtime.linker;
 
-import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+import static jdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -47,7 +47,7 @@ import jdk.nashorn.internal.runtime.Undefined;
  * language runtimes by being declared in {@code META-INF/services/jdk.internal.dynalink.linker.GuardingDynamicLinker}
  * file of Nashorn's distribution.
  */
-public class NashornLinker implements TypeBasedGuardingDynamicLinker, GuardingTypeConverterFactory, ConversionComparator {
+final class NashornLinker implements TypeBasedGuardingDynamicLinker, GuardingTypeConverterFactory, ConversionComparator {
     /**
      * Returns true if {@code ScriptObject} is assignable from {@code type}, or it is {@code Undefined}.
      */
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java
index 71edc44acc0..ccd95fda642 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornPrimitiveLinker.java
@@ -25,7 +25,7 @@
 
 package jdk.nashorn.internal.runtime.linker;
 
-import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+import static jdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -45,7 +45,7 @@ import jdk.nashorn.internal.runtime.GlobalObject;
  * engines. It is used for treatment of strings, boolean, and numbers as JavaScript primitives. Also provides ECMAScript
  * primitive type conversions for these types when linking to Java methods.
  */
-class NashornPrimitiveLinker implements TypeBasedGuardingDynamicLinker, GuardingTypeConverterFactory, ConversionComparator {
+final class NashornPrimitiveLinker implements TypeBasedGuardingDynamicLinker, GuardingTypeConverterFactory, ConversionComparator {
     @Override
     public boolean canLinkType(final Class<?> type) {
         return canLinkTypeStatic(type);
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java
index d912b586604..738162d5cda 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/NashornStaticClassLinker.java
@@ -48,7 +48,7 @@ import jdk.nashorn.internal.runtime.ECMAErrors;
  *   var r = new Runnable(function() { print("Hello World" })
  * </pre>
  */
-class NashornStaticClassLinker implements TypeBasedGuardingDynamicLinker {
+final class NashornStaticClassLinker implements TypeBasedGuardingDynamicLinker {
     private static final GuardingDynamicLinker staticClassLinker = BeansLinker.getLinkerForClass(StaticClass.class);
 
     @Override
diff --git a/nashorn/src/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java b/nashorn/src/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java
index 131b63b17fc..968dba91e58 100644
--- a/nashorn/src/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java
+++ b/nashorn/src/jdk/nashorn/internal/runtime/linker/PrimitiveLookup.java
@@ -25,7 +25,8 @@
 
 package jdk.nashorn.internal.runtime.linker;
 
-import static jdk.nashorn.internal.runtime.linker.Lookup.MH;
+import jdk.nashorn.internal.lookup.Lookup;
+import static jdk.nashorn.internal.lookup.Lookup.MH;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodType;
diff --git a/nashorn/test/script/trusted/JDK-8006529.js b/nashorn/test/script/currently-failing/JDK-8006529.js
similarity index 100%
rename from nashorn/test/script/trusted/JDK-8006529.js
rename to nashorn/test/script/currently-failing/JDK-8006529.js

From a181e6d5056d9a25eee3319cd4475844f7b831d2 Mon Sep 17 00:00:00 2001
From: Kevin Walls <kevinw@openjdk.org>
Date: Mon, 11 Mar 2013 12:56:00 +0000
Subject: [PATCH 290/311] 8009723: CMS logs "concurrent mode failure" twice
 when using (disabling) -XX:-UseCMSCompactAtFullCollection

Reviewed-by: jwilhelm, ehelin, brutisso
---
 .../concurrentMarkSweep/concurrentMarkSweepGeneration.cpp    | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
index a9b2714c213..9375c0efb53 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
@@ -2063,11 +2063,6 @@ void CMSCollector::do_mark_sweep_work(bool clear_all_soft_refs,
       // required.
       _collectorState = FinalMarking;
   }
-  if (PrintGCDetails &&
-      (_collectorState > Idling ||
-       !GCCause::is_user_requested_gc(GenCollectedHeap::heap()->gc_cause()))) {
-    gclog_or_tty->print(" (concurrent mode failure)");
-  }
   collect_in_foreground(clear_all_soft_refs);
 
   // For a mark-sweep, compute_new_size() will be called

From 1aa6c2729857895f7d8e624c8508854f717a270b Mon Sep 17 00:00:00 2001
From: Mikael Gerdin <mgerdin@openjdk.org>
Date: Tue, 12 Mar 2013 09:42:24 +0100
Subject: [PATCH 291/311] 8009282: Assertion "assert(used_and_free ==
 capacity_bytes) failed: Accounting is wrong" failed with -XX:+Verbose
 -XX:+TraceMetadataChunkAllocation

Assertion is only valid when at a safepoint, adjust accordingly.

Reviewed-by: stefank, jmasa, tamao
---
 hotspot/src/share/vm/memory/metaspace.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hotspot/src/share/vm/memory/metaspace.cpp b/hotspot/src/share/vm/memory/metaspace.cpp
index b0891150d9c..56b14c22cf7 100644
--- a/hotspot/src/share/vm/memory/metaspace.cpp
+++ b/hotspot/src/share/vm/memory/metaspace.cpp
@@ -2440,7 +2440,8 @@ void MetaspaceAux::print_on(outputStream* out, Metaspace::MetadataType mdtype) {
              free_chunks_capacity_bytes / K,
              used_and_free / K,
              capacity_bytes / K);
-  assert(used_and_free == capacity_bytes, "Accounting is wrong");
+  // Accounting can only be correct if we got the values during a safepoint
+  assert(!SafepointSynchronize::is_at_safepoint() || used_and_free == capacity_bytes, "Accounting is wrong");
 }
 
 // Print total fragmentation for class and data metaspaces separately

From 1e1174e0be3a6e7fbecf9bb729179f3a1ab73853 Mon Sep 17 00:00:00 2001
From: Stefan Karlsson <stefank@openjdk.org>
Date: Mon, 11 Mar 2013 02:24:01 -0700
Subject: [PATCH 292/311] 8004697: SIGSEGV on Solaris sparc with -XX:+UseNUMA

Don't scan pages outside the given range.

Reviewed-by: jwilhelm, jmasa
---
 hotspot/src/os/solaris/vm/os_solaris.cpp                        | 2 +-
 .../src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/hotspot/src/os/solaris/vm/os_solaris.cpp b/hotspot/src/os/solaris/vm/os_solaris.cpp
index a80a0ea4590..147254dd4de 100644
--- a/hotspot/src/os/solaris/vm/os_solaris.cpp
+++ b/hotspot/src/os/solaris/vm/os_solaris.cpp
@@ -2945,7 +2945,7 @@ char *os::scan_pages(char *start, char* end, page_info* page_expected, page_info
   while (p < (uint64_t)end) {
     addrs[0] = p;
     size_t addrs_count = 1;
-    while (addrs_count < MAX_MEMINFO_CNT && addrs[addrs_count - 1] < (uint64_t)end) {
+    while (addrs_count < MAX_MEMINFO_CNT && addrs[addrs_count - 1] + page_size < (uint64_t)end) {
       addrs[addrs_count] = addrs[addrs_count - 1] + page_size;
       addrs_count++;
     }
diff --git a/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp b/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp
index 8de8b3a2983..d3d758b79bd 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp
+++ b/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp
@@ -948,6 +948,8 @@ void MutableNUMASpace::LGRPSpace::scan_pages(size_t page_size, size_t page_count
       break;
     }
     if (e != scan_end) {
+      assert(e < scan_end, err_msg("e: " PTR_FORMAT " scan_end: " PTR_FORMAT, e, scan_end));
+
       if ((page_expected.size != page_size || page_expected.lgrp_id != lgrp_id())
           && page_expected.size != 0) {
         os::free_memory(s, pointer_delta(e, s, sizeof(char)), page_size);

From 2f5e08742afb0fce35e3a134eb0b3aed7c30d2d1 Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <aleksey.shipilev@oracle.com>
Date: Mon, 11 Mar 2013 14:00:09 -0400
Subject: [PATCH 293/311] 8008965: @Contended fails with classes having static
 fields

Disable @Contended support for static fields

Reviewed-by: coleenp, kvn
---
 .../share/vm/classfile/classFileParser.cpp    | 110 +------
 hotspot/test/runtime/8003985/Test8003985.java | 302 ++++++++++++++++++
 2 files changed, 311 insertions(+), 101 deletions(-)
 create mode 100644 hotspot/test/runtime/8003985/Test8003985.java

diff --git a/hotspot/src/share/vm/classfile/classFileParser.cpp b/hotspot/src/share/vm/classfile/classFileParser.cpp
index 3650e05406f..005bda61bd3 100644
--- a/hotspot/src/share/vm/classfile/classFileParser.cpp
+++ b/hotspot/src/share/vm/classfile/classFileParser.cpp
@@ -3492,7 +3492,6 @@ instanceKlassHandle ClassFileParser::parseClassFile(Symbol* name,
     int next_static_word_offset;
     int next_static_short_offset;
     int next_static_byte_offset;
-    int next_static_padded_offset;
     int next_nonstatic_oop_offset;
     int next_nonstatic_double_offset;
     int next_nonstatic_word_offset;
@@ -3505,33 +3504,25 @@ instanceKlassHandle ClassFileParser::parseClassFile(Symbol* name,
     int next_nonstatic_padded_offset;
 
     // Count the contended fields by type.
-    int static_contended_count = 0;
     int nonstatic_contended_count = 0;
     FieldAllocationCount fac_contended;
     for (AllFieldStream fs(fields, cp); !fs.done(); fs.next()) {
       FieldAllocationType atype = (FieldAllocationType) fs.allocation_type();
       if (fs.is_contended()) {
         fac_contended.count[atype]++;
-        if (fs.access_flags().is_static()) {
-          static_contended_count++;
-        } else {
+        if (!fs.access_flags().is_static()) {
           nonstatic_contended_count++;
         }
       }
     }
-    int contended_count = static_contended_count + nonstatic_contended_count;
+    int contended_count = nonstatic_contended_count;
 
 
     // Calculate the starting byte offsets
     next_static_oop_offset      = InstanceMirrorKlass::offset_of_static_fields();
 
-    // class is contended, pad before all the fields
-    if (parsed_annotations.is_contended()) {
-      next_static_oop_offset += pad_size;
-    }
-
     next_static_double_offset   = next_static_oop_offset +
-                                  ((fac.count[STATIC_OOP] - fac_contended.count[STATIC_OOP]) * heapOopSize);
+                                  ((fac.count[STATIC_OOP]) * heapOopSize);
     if ( fac.count[STATIC_DOUBLE] &&
          (Universe::field_type_should_be_aligned(T_DOUBLE) ||
           Universe::field_type_should_be_aligned(T_LONG)) ) {
@@ -3539,13 +3530,11 @@ instanceKlassHandle ClassFileParser::parseClassFile(Symbol* name,
     }
 
     next_static_word_offset     = next_static_double_offset +
-                                  ((fac.count[STATIC_DOUBLE] - fac_contended.count[STATIC_DOUBLE]) * BytesPerLong);
+                                  ((fac.count[STATIC_DOUBLE]) * BytesPerLong);
     next_static_short_offset    = next_static_word_offset +
-                                  ((fac.count[STATIC_WORD]   - fac_contended.count[STATIC_WORD]) * BytesPerInt);
+                                  ((fac.count[STATIC_WORD]) * BytesPerInt);
     next_static_byte_offset     = next_static_short_offset +
-                                  ((fac.count[STATIC_SHORT]  - fac_contended.count[STATIC_SHORT]) * BytesPerShort);
-    next_static_padded_offset   = next_static_byte_offset +
-                                  ((fac.count[STATIC_BYTE]   - fac_contended.count[STATIC_BYTE]) * 1);
+                                  ((fac.count[STATIC_SHORT]) * BytesPerShort);
 
     first_nonstatic_field_offset = instanceOopDesc::base_offset_in_bytes() +
                                    nonstatic_field_size * heapOopSize;
@@ -3738,8 +3727,8 @@ instanceKlassHandle ClassFileParser::parseClassFile(Symbol* name,
       // skip already laid out fields
       if (fs.is_offset_set()) continue;
 
-      // contended fields are handled below
-      if (fs.is_contended()) continue;
+      // contended instance fields are handled below
+      if (fs.is_contended() && !fs.access_flags().is_static()) continue;
 
       int real_offset;
       FieldAllocationType atype = (FieldAllocationType) fs.allocation_type();
@@ -3943,86 +3932,6 @@ instanceKlassHandle ClassFileParser::parseClassFile(Symbol* name,
 
       // handle static fields
 
-      // if there is at least one contended field, we need to have pre-padding for them
-      if (static_contended_count > 0) {
-        next_static_padded_offset += pad_size;
-      }
-
-      current_group = -1;
-      while ((current_group = (int)bm.get_next_one_offset(current_group + 1)) != (int)bm.size()) {
-
-        for (AllFieldStream fs(fields, cp); !fs.done(); fs.next()) {
-
-          // skip already laid out fields
-          if (fs.is_offset_set()) continue;
-
-          // skip non-contended fields and fields from different group
-          if (!fs.is_contended() || (fs.contended_group() != current_group)) continue;
-
-          // non-statics already handled above
-          if (!fs.access_flags().is_static()) continue;
-
-          int real_offset;
-          FieldAllocationType atype = (FieldAllocationType) fs.allocation_type();
-
-          switch (atype) {
-
-            case STATIC_BYTE:
-              next_static_padded_offset = align_size_up(next_static_padded_offset, 1);
-              real_offset = next_static_padded_offset;
-              next_static_padded_offset += 1;
-              break;
-
-            case STATIC_SHORT:
-              next_static_padded_offset = align_size_up(next_static_padded_offset, BytesPerShort);
-              real_offset = next_static_padded_offset;
-              next_static_padded_offset += BytesPerShort;
-              break;
-
-            case STATIC_WORD:
-              next_static_padded_offset = align_size_up(next_static_padded_offset, BytesPerInt);
-              real_offset = next_static_padded_offset;
-              next_static_padded_offset += BytesPerInt;
-              break;
-
-            case STATIC_DOUBLE:
-              next_static_padded_offset = align_size_up(next_static_padded_offset, BytesPerLong);
-              real_offset = next_static_padded_offset;
-              next_static_padded_offset += BytesPerLong;
-              break;
-
-            case STATIC_OOP:
-              next_static_padded_offset = align_size_up(next_static_padded_offset, heapOopSize);
-              real_offset = next_static_padded_offset;
-              next_static_padded_offset += heapOopSize;
-              break;
-
-            default:
-              ShouldNotReachHere();
-          }
-
-          if (fs.contended_group() == 0) {
-            // Contended group defines the equivalence class over the fields:
-            // the fields within the same contended group are not inter-padded.
-            // The only exception is default group, which does not incur the
-            // equivalence, and so requires intra-padding.
-            next_static_padded_offset += pad_size;
-          }
-
-          fs.set_offset(real_offset);
-        } // for
-
-        // Start laying out the next group.
-        // Note that this will effectively pad the last group in the back;
-        // this is expected to alleviate memory contention effects for
-        // subclass fields and/or adjacent object.
-        // If this was the default group, the padding is already in place.
-        if (current_group != 0) {
-          next_static_padded_offset += pad_size;
-        }
-
-      }
-
     } // handle contended
 
     // Size of instances
@@ -4035,10 +3944,9 @@ instanceKlassHandle ClassFileParser::parseClassFile(Symbol* name,
     // and/or adjacent object.
     if (parsed_annotations.is_contended()) {
       notaligned_offset += pad_size;
-      next_static_padded_offset += pad_size;
     }
 
-    int next_static_type_offset     = align_size_up(next_static_padded_offset, wordSize);
+    int next_static_type_offset     = align_size_up(next_static_byte_offset, wordSize);
     int static_field_size           = (next_static_type_offset -
                                   InstanceMirrorKlass::offset_of_static_fields()) / wordSize;
 
diff --git a/hotspot/test/runtime/8003985/Test8003985.java b/hotspot/test/runtime/8003985/Test8003985.java
new file mode 100644
index 00000000000..5e30f670257
--- /dev/null
+++ b/hotspot/test/runtime/8003985/Test8003985.java
@@ -0,0 +1,302 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.lang.Class;
+import java.lang.String;
+import java.lang.System;
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CyclicBarrier;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import sun.misc.Unsafe;
+import sun.misc.Contended;
+
+/*
+ * @test
+ * @bug     8003985
+ * @summary Support Contended Annotation - JEP 142
+ *
+ * @run main/othervm -XX:-RestrictContended Test8003985
+ */
+public class Test8003985 {
+
+    private static final Unsafe U;
+    private static int ADDRESS_SIZE;
+    private static int HEADER_SIZE;
+
+    static {
+        // steal Unsafe
+        try {
+            Field unsafe = Unsafe.class.getDeclaredField("theUnsafe");
+            unsafe.setAccessible(true);
+            U = (Unsafe) unsafe.get(null);
+        } catch (NoSuchFieldException | IllegalAccessException e) {
+            throw new IllegalStateException(e);
+        }
+
+        // When running with CompressedOops on 64-bit platform, the address size
+        // reported by Unsafe is still 8, while the real reference fields are 4 bytes long.
+        // Try to guess the reference field size with this naive trick.
+        try {
+            long off1 = U.objectFieldOffset(CompressedOopsClass.class.getField("obj1"));
+            long off2 = U.objectFieldOffset(CompressedOopsClass.class.getField("obj2"));
+            ADDRESS_SIZE = (int) Math.abs(off2 - off1);
+            HEADER_SIZE = (int) Math.min(off1, off2);
+        } catch (NoSuchFieldException e) {
+            ADDRESS_SIZE = -1;
+        }
+    }
+
+    static class CompressedOopsClass {
+        public Object obj1;
+        public Object obj2;
+    }
+
+    public static boolean arePaddedPairwise(Class klass, String field1, String field2) throws Exception {
+        Field f1 = klass.getDeclaredField(field1);
+        Field f2 = klass.getDeclaredField(field2);
+
+        if (isStatic(f1) != isStatic(f2)) {
+            return true; // these guys are in naturally disjoint locations
+        }
+
+        int diff = offset(f1) - offset(f2);
+        if (diff < 0) {
+            // f1 is first
+            return (offset(f2) - (offset(f1) + getSize(f1))) > 64;
+        } else {
+            // f2 is first
+            return (offset(f1) - (offset(f2) + getSize(f2))) > 64;
+        }
+    }
+
+    public static boolean isPadded(Class klass, String field1) throws Exception {
+        Field f1 = klass.getDeclaredField(field1);
+
+        if (isStatic(f1)) {
+            return offset(f1) > 128 + 64;
+        }
+
+        return offset(f1) > 64;
+    }
+
+    public static boolean sameLayout(Class klass1, Class klass2) throws Exception {
+        for (Field f1 : klass1.getDeclaredFields()) {
+            Field f2 = klass2.getDeclaredField(f1.getName());
+            if (offset(f1) != offset(f2)) {
+                return false;
+            }
+        }
+
+        for (Field f2 : klass1.getDeclaredFields()) {
+            Field f1 = klass2.getDeclaredField(f2.getName());
+            if (offset(f1) != offset(f2)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public static boolean isStatic(Field field) {
+        return Modifier.isStatic(field.getModifiers());
+    }
+
+    public static int offset(Field field) {
+        if (isStatic(field)) {
+            return (int) U.staticFieldOffset(field);
+        } else {
+            return (int) U.objectFieldOffset(field);
+        }
+    }
+
+    public static int getSize(Field field) {
+        Class type = field.getType();
+        if (type == byte.class)    { return 1; }
+        if (type == boolean.class) { return 1; }
+        if (type == short.class)   { return 2; }
+        if (type == char.class)    { return 2; }
+        if (type == int.class)     { return 4; }
+        if (type == float.class)   { return 4; }
+        if (type == long.class)    { return 8; }
+        if (type == double.class)  { return 8; }
+        return ADDRESS_SIZE;
+    }
+
+    public static void main(String[] args) throws Exception {
+        boolean endResult = true;
+
+        // --------------- INSTANCE FIELDS ---------------------
+
+        if (arePaddedPairwise(Test1.class, "int1", "int2") ||
+                isPadded(Test1.class, "int1") ||
+                isPadded(Test1.class, "int2")) {
+            System.err.println("Test1 failed");
+            endResult &= false;
+        }
+
+        if (!arePaddedPairwise(Test2.class, "int1", "int2") ||
+                !isPadded(Test2.class, "int1") ||
+                isPadded(Test2.class, "int2")) {
+            System.err.println("Test2 failed");
+            endResult &= false;
+        }
+
+        if (!arePaddedPairwise(Test3.class, "int1", "int2") ||
+                !isPadded(Test3.class, "int1") ||
+                !isPadded(Test3.class, "int2")) {
+            System.err.println("Test3 failed");
+            endResult &= false;
+        }
+
+        if (arePaddedPairwise(Test4.class, "int1", "int2") ||
+                !isPadded(Test4.class, "int1") ||
+                !isPadded(Test4.class, "int2")) {
+            System.err.println("Test4 failed");
+            endResult &= false;
+        }
+
+        if (!arePaddedPairwise(Test5.class, "int1", "int2") ||
+                !isPadded(Test5.class, "int1") ||
+                !isPadded(Test5.class, "int2")) {
+            System.err.println("Test5 failed");
+            endResult &= false;
+        }
+
+        if (!arePaddedPairwise(Test6.class, "int1", "int2") ||
+                !isPadded(Test6.class, "int1") ||
+                !isPadded(Test6.class, "int2")) {
+            System.err.println("Test6 failed");
+            endResult &= false;
+        }
+
+        if (arePaddedPairwise(Test7.class, "int1", "int2") ||
+                !isPadded(Test7.class, "int1") ||
+                !isPadded(Test7.class, "int2")) {
+            System.err.println("Test7 failed");
+            endResult &= false;
+        }
+
+        if (!arePaddedPairwise(Test8.class, "int1", "int2") ||
+                !isPadded(Test8.class, "int1") ||
+                !isPadded(Test8.class, "int2")) {
+            System.err.println("Test8 failed");
+            endResult &= false;
+        }
+
+        if (!arePaddedPairwise(Test9.class, "int1", "int2") ||
+                !isPadded(Test9.class, "int1") ||
+                !isPadded(Test9.class, "int2")) {
+            System.err.println("Test9 failed");
+            endResult &= false;
+        }
+
+        if (!sameLayout(Test4.class, Test7.class)) {
+            System.err.println("Test4 and Test7 have different layouts");
+            endResult &= false;
+        }
+
+        if (!sameLayout(Test5.class, Test6.class)) {
+            System.err.println("Test5 and Test6 have different layouts");
+            endResult &= false;
+        }
+
+        if (!sameLayout(Test8.class, Test9.class)) {
+            System.err.println("Test8 and Test9 have different layouts");
+            endResult &= false;
+        }
+
+        System.out.println(endResult ? "Test PASSES" : "Test FAILS");
+        if (!endResult) {
+           throw new Error("Test failed");
+        }
+    }
+
+    // ----------------------------------- INSTANCE FIELDS -----------------------------------------
+
+    // naturally packed
+    public static class Test1 {
+                                 private int int1;
+                                 private int int2;
+    }
+
+    // int1 is padded
+    public static class Test2 {
+        @Contended               private int int1;
+                                 private int int2;
+    }
+
+    // both fields are padded
+    public static class Test3 {
+        @Contended               private int int1;
+        @Contended               private int int2;
+    }
+
+    // fields are padded in the singular group
+    public static class Test4 {
+        @Contended("sameGroup")  private int int1;
+        @Contended("sameGroup")  private int int2;
+    }
+
+    // fields are padded in disjoint groups
+    public static class Test5 {
+        @Contended("diffGroup1") private int int1;
+        @Contended("diffGroup2") private int int2;
+    }
+
+    // fields are padded in disjoint groups
+    public static class Test6 {
+        @Contended               private int int1;
+        @Contended("diffGroup2") private int int2;
+    }
+
+    // fields are padded in the singular group
+    @Contended
+    public static class Test7 {
+                                 private int int1;
+                                 private int int2;
+    }
+
+    // all fields are padded as the group, and one field is padded specifically
+    @Contended
+    public static class Test8 {
+        @Contended               private int int1;
+                                 private int int2;
+    }
+
+    // all fields are padded as the group, and one field is padded specifically
+    @Contended
+    public static class Test9 {
+        @Contended("group")      private int int1;
+                                 private int int2;
+    }
+
+}
+

From 0f54c506382f5c2826660a668e3199fba78acc79 Mon Sep 17 00:00:00 2001
From: Joseph Provino <jprovino@openjdk.org>
Date: Tue, 12 Mar 2013 00:02:16 -0400
Subject: [PATCH 294/311] 8009835: Only produce a warning when -Xshare:auto is
 explicitly requested

The minimal JVM is printing a warning message for default settings when it should quitely ignore them.

Reviewed-by: coleenp, dholmes
---
 hotspot/src/share/vm/runtime/arguments.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hotspot/src/share/vm/runtime/arguments.cpp b/hotspot/src/share/vm/runtime/arguments.cpp
index 554d6a75433..a74e62d6b95 100644
--- a/hotspot/src/share/vm/runtime/arguments.cpp
+++ b/hotspot/src/share/vm/runtime/arguments.cpp
@@ -3262,7 +3262,7 @@ jint Arguments::parse(const JavaVMInitArgs* args) {
       "Shared spaces are not supported in this VM\n");
     return JNI_ERR;
   }
-  if (UseSharedSpaces || PrintSharedSpaces) {
+  if ((UseSharedSpaces && FLAG_IS_CMDLINE(UseSharedSpaces)) || PrintSharedSpaces) {
     warning("Shared spaces are not supported in this VM");
     FLAG_SET_DEFAULT(UseSharedSpaces, false);
     FLAG_SET_DEFAULT(PrintSharedSpaces, false);

From c51ea967ce53ad1533e2ec8aa507d77a67c024ce Mon Sep 17 00:00:00 2001
From: Bengt Rutisson <brutisso@openjdk.org>
Date: Tue, 12 Mar 2013 08:33:57 +0100
Subject: [PATCH 295/311] 8001049: VM crashes when running with large -Xms and
 not specifying ObjectAlignmentInBytes

Take the initial heap size into account when checking the heap size for compressed oops

Reviewed-by: jmasa, kvn, hseigel, ctornqvi
---
 hotspot/src/share/vm/memory/universe.cpp   |  2 +
 hotspot/src/share/vm/runtime/arguments.cpp | 59 +++++++++++++---------
 hotspot/src/share/vm/runtime/arguments.hpp |  1 +
 3 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/hotspot/src/share/vm/memory/universe.cpp b/hotspot/src/share/vm/memory/universe.cpp
index a7a6c24bfd2..79e092a3b19 100644
--- a/hotspot/src/share/vm/memory/universe.cpp
+++ b/hotspot/src/share/vm/memory/universe.cpp
@@ -885,6 +885,8 @@ ReservedSpace Universe::reserve_heap(size_t heap_size, size_t alignment) {
   // the actual alignment depends on its size.
   Universe::set_class_metaspace_size(align_size_up(ClassMetaspaceSize, alignment));
   size_t total_reserved = align_size_up(heap_size + Universe::class_metaspace_size(), alignment);
+  assert(!UseCompressedOops || (total_reserved <= (OopEncodingHeapMax - os::vm_page_size())),
+      "heap size is too big for compressed oops");
   char* addr = Universe::preferred_heap_base(total_reserved, Universe::UnscaledNarrowOop);
 
   ReservedHeapSpace total_rs(total_reserved, alignment, UseLargePages, addr);
diff --git a/hotspot/src/share/vm/runtime/arguments.cpp b/hotspot/src/share/vm/runtime/arguments.cpp
index d6e4c308444..44acefb4c05 100644
--- a/hotspot/src/share/vm/runtime/arguments.cpp
+++ b/hotspot/src/share/vm/runtime/arguments.cpp
@@ -1381,6 +1381,40 @@ bool Arguments::should_auto_select_low_pause_collector() {
   return false;
 }
 
+void Arguments::set_use_compressed_oops() {
+#ifndef ZERO
+#ifdef _LP64
+  // MaxHeapSize is not set up properly at this point, but
+  // the only value that can override MaxHeapSize if we are
+  // to use UseCompressedOops is InitialHeapSize.
+  size_t max_heap_size = MAX2(MaxHeapSize, InitialHeapSize);
+
+  if (max_heap_size <= max_heap_for_compressed_oops()) {
+#if !defined(COMPILER1) || defined(TIERED)
+    if (FLAG_IS_DEFAULT(UseCompressedOops)) {
+      FLAG_SET_ERGO(bool, UseCompressedOops, true);
+    }
+#endif
+#ifdef _WIN64
+    if (UseLargePages && UseCompressedOops) {
+      // Cannot allocate guard pages for implicit checks in indexed addressing
+      // mode, when large pages are specified on windows.
+      // This flag could be switched ON if narrow oop base address is set to 0,
+      // see code in Universe::initialize_heap().
+      Universe::set_narrow_oop_use_implicit_null_checks(false);
+    }
+#endif //  _WIN64
+  } else {
+    if (UseCompressedOops && !FLAG_IS_DEFAULT(UseCompressedOops)) {
+      warning("Max heap size too large for Compressed Oops");
+      FLAG_SET_DEFAULT(UseCompressedOops, false);
+      FLAG_SET_DEFAULT(UseCompressedKlassPointers, false);
+    }
+  }
+#endif // _LP64
+#endif // ZERO
+}
+
 void Arguments::set_ergonomics_flags() {
 
   if (os::is_server_class_machine()) {
@@ -1410,30 +1444,7 @@ void Arguments::set_ergonomics_flags() {
 
 #ifndef ZERO
 #ifdef _LP64
-  // Check that UseCompressedOops can be set with the max heap size allocated
-  // by ergonomics.
-  if (MaxHeapSize <= max_heap_for_compressed_oops()) {
-#if !defined(COMPILER1) || defined(TIERED)
-    if (FLAG_IS_DEFAULT(UseCompressedOops)) {
-      FLAG_SET_ERGO(bool, UseCompressedOops, true);
-    }
-#endif
-#ifdef _WIN64
-    if (UseLargePages && UseCompressedOops) {
-      // Cannot allocate guard pages for implicit checks in indexed addressing
-      // mode, when large pages are specified on windows.
-      // This flag could be switched ON if narrow oop base address is set to 0,
-      // see code in Universe::initialize_heap().
-      Universe::set_narrow_oop_use_implicit_null_checks(false);
-    }
-#endif //  _WIN64
-  } else {
-    if (UseCompressedOops && !FLAG_IS_DEFAULT(UseCompressedOops)) {
-      warning("Max heap size too large for Compressed Oops");
-      FLAG_SET_DEFAULT(UseCompressedOops, false);
-      FLAG_SET_DEFAULT(UseCompressedKlassPointers, false);
-    }
-  }
+  set_use_compressed_oops();
   // UseCompressedOops must be on for UseCompressedKlassPointers to be on.
   if (!UseCompressedOops) {
     if (UseCompressedKlassPointers) {
diff --git a/hotspot/src/share/vm/runtime/arguments.hpp b/hotspot/src/share/vm/runtime/arguments.hpp
index 26c029744da..d75fc9a82bd 100644
--- a/hotspot/src/share/vm/runtime/arguments.hpp
+++ b/hotspot/src/share/vm/runtime/arguments.hpp
@@ -309,6 +309,7 @@ class Arguments : AllStatic {
   // Garbage-First (UseG1GC)
   static void set_g1_gc_flags();
   // GC ergonomics
+  static void set_use_compressed_oops();
   static void set_ergonomics_flags();
   static void set_shared_spaces_flags();
   // Setup heap size

From 401d1f315d080b806636e06fa6c6f90b87b4191f Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Tue, 12 Mar 2013 15:10:39 +0100
Subject: [PATCH 296/311] 8008684: CMS: concurrent phase start markers should
 always be printed

Print the concurrent phase start markers for CMS when PrintGCDetails is enabled, not only if both PrintGCDetails and PrintGCTimeStamps are.

Reviewed-by: mgerdin, jmasa
---
 .../concurrentMarkSweep/concurrentMarkSweepGeneration.cpp   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
index 9375c0efb53..1d056338c7d 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
@@ -3395,10 +3395,10 @@ CMSPhaseAccounting::CMSPhaseAccounting(CMSCollector *collector,
   if (PrintCMSStatistics != 0) {
     _collector->resetYields();
   }
-  if (PrintGCDetails && PrintGCTimeStamps) {
+  if (PrintGCDetails) {
     gclog_or_tty->date_stamp(PrintGCDateStamps);
-    gclog_or_tty->stamp();
-    gclog_or_tty->print_cr(": [%s-concurrent-%s-start]",
+    gclog_or_tty->stamp(PrintGCTimeStamps);
+    gclog_or_tty->print_cr("[%s-concurrent-%s-start]",
       _collector->cmsGen()->short_name(), _phase);
   }
   _collector->resetTimer();

From 7d74801ce2e73b529c394db6f20f40f12d290bf6 Mon Sep 17 00:00:00 2001
From: Harold Seigel <harold.seigel@oracle.com>
Date: Tue, 12 Mar 2013 10:35:44 -0400
Subject: [PATCH 297/311] 7154889: Non-zero padding is still not allowed in the
 tableswitch/lookupswitch instructions

Do not check that the padding bytes are zero if class file format version >=51.

Reviewed-by: dholmes, coleenp, mullan, kvn
---
 jdk/src/share/native/common/check_code.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/jdk/src/share/native/common/check_code.c b/jdk/src/share/native/common/check_code.c
index 7ecf096a679..e1170293f07 100644
--- a/jdk/src/share/native/common/check_code.c
+++ b/jdk/src/share/native/common/check_code.c
@@ -206,6 +206,8 @@ enum {
 
 #define LDC_METHOD_HANDLE_MAJOR_VERSION 51
 
+#define NONZERO_PADDING_BYTES_IN_SWITCH_MAJOR_VERSION 51
+
 #define STATIC_METHOD_IN_INTERFACE_MAJOR_VERSION  52
 
 #define ALLOC_STACK_SIZE 16 /* big enough */
@@ -1146,11 +1148,14 @@ verify_opcode_operands(context_type *context, unsigned int inumber, int offset)
         int *saved_operand;
         int keys;
         int k, delta;
-        /* 4639449, 4647081: Padding bytes must be zero. */
-        unsigned char* bptr = (unsigned char*) (code + offset + 1);
-        for (; bptr < (unsigned char*)lpc; bptr++) {
-            if (*bptr != 0) {
-                CCerror(context, "Non zero padding bytes in switch");
+
+        if (context->major_version < NONZERO_PADDING_BYTES_IN_SWITCH_MAJOR_VERSION) {
+            /* 4639449, 4647081: Padding bytes must be zero. */
+            unsigned char* bptr = (unsigned char*) (code + offset + 1);
+            for (; bptr < (unsigned char*)lpc; bptr++) {
+                if (*bptr != 0) {
+                    CCerror(context, "Non zero padding bytes in switch");
+                }
             }
         }
         if (opcode == JVM_OPC_tableswitch) {

From 79c091f28714c5c0ce01a724942eeb4f8194443f Mon Sep 17 00:00:00 2001
From: Jon Masamitsu <jmasa@openjdk.org>
Date: Tue, 12 Mar 2013 11:00:49 -0700
Subject: [PATCH 298/311] 6976528: PS: assert(!limit_exceeded ||
 softrefs_clear) failed: Should have been cleared

Reviewed-by: johnc
---
 .../gc_implementation/parallelScavenge/parallelScavengeHeap.cpp | 2 +-
 hotspot/src/share/vm/memory/collectorPolicy.cpp                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp
index cbd56f755c5..21e08b6f874 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp
@@ -409,7 +409,7 @@ HeapWord* ParallelScavengeHeap::mem_allocate(
         // heap remains parsable.
         const bool limit_exceeded = size_policy()->gc_overhead_limit_exceeded();
         const bool softrefs_clear = collector_policy()->all_soft_refs_clear();
-        assert(!limit_exceeded || softrefs_clear, "Should have been cleared");
+
         if (limit_exceeded && softrefs_clear) {
           *gc_overhead_limit_was_exceeded = true;
           size_policy()->set_gc_overhead_limit_exceeded(false);
diff --git a/hotspot/src/share/vm/memory/collectorPolicy.cpp b/hotspot/src/share/vm/memory/collectorPolicy.cpp
index ab8f2ca7fc0..d5eb387a04c 100644
--- a/hotspot/src/share/vm/memory/collectorPolicy.cpp
+++ b/hotspot/src/share/vm/memory/collectorPolicy.cpp
@@ -620,7 +620,7 @@ HeapWord* GenCollectorPolicy::mem_allocate_work(size_t size,
 
       const bool limit_exceeded = size_policy()->gc_overhead_limit_exceeded();
       const bool softrefs_clear = all_soft_refs_clear();
-      assert(!limit_exceeded || softrefs_clear, "Should have been cleared");
+
       if (limit_exceeded && softrefs_clear) {
         *gc_overhead_limit_was_exceeded = true;
         size_policy()->set_gc_overhead_limit_exceeded(false);

From 9e5da0ad31d3ee5626ed4ba4c0fdc49a6fe64af9 Mon Sep 17 00:00:00 2001
From: Bradford Wetmore <wetmore@openjdk.org>
Date: Tue, 12 Mar 2013 15:31:49 -0700
Subject: [PATCH 299/311] 8009925: Back out AEAD CipherSuites temporarily

Reviewed-by: valeriep
---
 .../provider/TlsKeyMaterialGenerator.java     |  28 +-
 .../spec/TlsKeyMaterialParameterSpec.java     |   8 +-
 .../internal/spec/TlsKeyMaterialSpec.java     |  26 +-
 .../pkcs11/P11TlsKeyMaterialGenerator.java    |  18 +-
 .../sun/security/ssl/Authenticator.java       | 161 -----
 .../classes/sun/security/ssl/CipherBox.java   | 582 +++++-------------
 .../classes/sun/security/ssl/CipherSuite.java | 228 ++-----
 .../sun/security/ssl/EngineInputRecord.java   | 148 +++--
 .../sun/security/ssl/EngineOutputRecord.java  | 160 ++---
 .../sun/security/ssl/EngineWriter.java        |  12 +-
 .../classes/sun/security/ssl/Handshaker.java  |  80 +--
 .../classes/sun/security/ssl/InputRecord.java | 110 +---
 .../classes/sun/security/ssl/JsseJce.java     |   7 +-
 .../share/classes/sun/security/ssl/MAC.java   | 124 +++-
 .../sun/security/ssl/OutputRecord.java        | 149 ++---
 .../classes/sun/security/ssl/Record.java      |  35 +-
 .../sun/security/ssl/SSLEngineImpl.java       |  53 +-
 .../sun/security/ssl/SSLSocketImpl.java       |  44 +-
 jdk/test/sun/security/ec/TestEC.java          |   7 +-
 .../sun/security/pkcs11/fips/CipherTest.java  |  21 +-
 .../security/pkcs11/sslecc/CipherTest.java    |  21 +-
 .../SSLEngineBadBufferArrayAccess.java        |   8 +-
 .../javax/net/ssl/TLSv12/ShortRSAKeyGCM.java  | 445 -------------
 .../ciphersuites/CipherSuitesInOrder.java     |  27 +-
 .../ssl/sanity/interop/CipherTest.java        |  21 +-
 .../templates/SSLSocketSSLEngineTemplate.java |  11 +-
 26 files changed, 706 insertions(+), 1828 deletions(-)
 delete mode 100644 jdk/src/share/classes/sun/security/ssl/Authenticator.java
 delete mode 100644 jdk/test/sun/security/ssl/javax/net/ssl/TLSv12/ShortRSAKeyGCM.java

diff --git a/jdk/src/share/classes/com/sun/crypto/provider/TlsKeyMaterialGenerator.java b/jdk/src/share/classes/com/sun/crypto/provider/TlsKeyMaterialGenerator.java
index d1255d42164..4146f190875 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/TlsKeyMaterialGenerator.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/TlsKeyMaterialGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -165,18 +165,16 @@ public final class TlsKeyMaterialGenerator extends KeyGeneratorSpi {
         // partition keyblock into individual secrets
 
         int ofs = 0;
-        if (macLength != 0) {
-            byte[] tmp = new byte[macLength];
+        byte[] tmp = new byte[macLength];
 
-            // mac keys
-            System.arraycopy(keyBlock, ofs, tmp, 0, macLength);
-            ofs += macLength;
-            clientMacKey = new SecretKeySpec(tmp, "Mac");
+        // mac keys
+        System.arraycopy(keyBlock, ofs, tmp, 0, macLength);
+        ofs += macLength;
+        clientMacKey = new SecretKeySpec(tmp, "Mac");
 
-            System.arraycopy(keyBlock, ofs, tmp, 0, macLength);
-            ofs += macLength;
-            serverMacKey = new SecretKeySpec(tmp, "Mac");
-        }
+        System.arraycopy(keyBlock, ofs, tmp, 0, macLength);
+        ofs += macLength;
+        serverMacKey = new SecretKeySpec(tmp, "Mac");
 
         if (keyLength == 0) { // SSL_RSA_WITH_NULL_* ciphersuites
             return new TlsKeyMaterialSpec(clientMacKey, serverMacKey);
@@ -200,7 +198,7 @@ public final class TlsKeyMaterialGenerator extends KeyGeneratorSpi {
 
             // IV keys if needed.
             if (ivLength != 0) {
-                byte[] tmp = new byte[ivLength];
+                tmp = new byte[ivLength];
 
                 System.arraycopy(keyBlock, ofs, tmp, 0, ivLength);
                 ofs += ivLength;
@@ -222,8 +220,8 @@ public final class TlsKeyMaterialGenerator extends KeyGeneratorSpi {
                 // TLS 1.0
                 byte[] seed = concat(clientRandom, serverRandom);
 
-                byte[] tmp = doTLS10PRF(clientKeyBytes,
-                    LABEL_CLIENT_WRITE_KEY, seed, expandedKeyLength, md5, sha);
+                tmp = doTLS10PRF(clientKeyBytes, LABEL_CLIENT_WRITE_KEY, seed,
+                            expandedKeyLength, md5, sha);
                 clientCipherKey = new SecretKeySpec(tmp, alg);
 
                 tmp = doTLS10PRF(serverKeyBytes, LABEL_SERVER_WRITE_KEY, seed,
@@ -241,7 +239,7 @@ public final class TlsKeyMaterialGenerator extends KeyGeneratorSpi {
                 }
             } else {
                 // SSLv3
-                byte[] tmp = new byte[expandedKeyLength];
+                tmp = new byte[expandedKeyLength];
 
                 md5.update(clientKeyBytes);
                 md5.update(clientRandom);
diff --git a/jdk/src/share/classes/sun/security/internal/spec/TlsKeyMaterialParameterSpec.java b/jdk/src/share/classes/sun/security/internal/spec/TlsKeyMaterialParameterSpec.java
index 71388b79718..80aa79a2596 100644
--- a/jdk/src/share/classes/sun/security/internal/spec/TlsKeyMaterialParameterSpec.java
+++ b/jdk/src/share/classes/sun/security/internal/spec/TlsKeyMaterialParameterSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -212,6 +212,12 @@ public class TlsKeyMaterialParameterSpec implements AlgorithmParameterSpec {
      *     generated.
      */
     public int getIvLength() {
+        // TLS v1.1 or later uses an explicit IV to protect against
+        // the CBC attacks.
+        if (majorVersion >= 0x03 && minorVersion >= 0x02) {
+            return 0;
+        }
+
         return ivLength;
     }
 
diff --git a/jdk/src/share/classes/sun/security/internal/spec/TlsKeyMaterialSpec.java b/jdk/src/share/classes/sun/security/internal/spec/TlsKeyMaterialSpec.java
index 2dd8a93765b..d1204962881 100644
--- a/jdk/src/share/classes/sun/security/internal/spec/TlsKeyMaterialSpec.java
+++ b/jdk/src/share/classes/sun/security/internal/spec/TlsKeyMaterialSpec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,8 +58,9 @@ public class TlsKeyMaterialSpec implements KeySpec, SecretKey {
      * <code>new TlsKeymaterialSpec(clientMacKey, serverMacKey,
      * null, null, null, null)</code>.
      *
-     * @param clientMacKey the client MAC key (or null)
-     * @param serverMacKey the server MAC key (or null)
+     * @param clientMacKey the client MAC key
+     * @param serverMacKey the server MAC key
+     * @throws NullPointerException if clientMacKey or serverMacKey is null
      */
     public TlsKeyMaterialSpec(SecretKey clientMacKey, SecretKey serverMacKey) {
         this(clientMacKey, serverMacKey, null, null, null, null);
@@ -72,10 +73,11 @@ public class TlsKeyMaterialSpec implements KeySpec, SecretKey {
      * <code>new TlsKeymaterialSpec(clientMacKey, serverMacKey,
      * clientCipherKey, serverCipherKey, null, null)</code>.
      *
-     * @param clientMacKey the client MAC key (or null)
-     * @param serverMacKey the server MAC key (or null)
+     * @param clientMacKey the client MAC key
+     * @param serverMacKey the server MAC key
      * @param clientCipherKey the client cipher key (or null)
      * @param serverCipherKey the server cipher key (or null)
+     * @throws NullPointerException if clientMacKey or serverMacKey is null
      */
     public TlsKeyMaterialSpec(SecretKey clientMacKey, SecretKey serverMacKey,
             SecretKey clientCipherKey, SecretKey serverCipherKey) {
@@ -88,17 +90,21 @@ public class TlsKeyMaterialSpec implements KeySpec, SecretKey {
      * keys, client and server cipher keys, and client and server
      * initialization vectors.
      *
-     * @param clientMacKey the client MAC key (or null)
-     * @param serverMacKey the server MAC key (or null)
+     * @param clientMacKey the client MAC key
+     * @param serverMacKey the server MAC key
      * @param clientCipherKey the client cipher key (or null)
      * @param clientIv the client initialization vector (or null)
      * @param serverCipherKey the server cipher key (or null)
      * @param serverIv the server initialization vector (or null)
+     *
+     * @throws NullPointerException if clientMacKey or serverMacKey is null
      */
     public TlsKeyMaterialSpec(SecretKey clientMacKey, SecretKey serverMacKey,
             SecretKey clientCipherKey, IvParameterSpec clientIv,
             SecretKey serverCipherKey, IvParameterSpec serverIv) {
-
+        if ((clientMacKey == null) || (serverMacKey == null)) {
+            throw new NullPointerException("MAC keys must not be null");
+        }
         this.clientMacKey = clientMacKey;
         this.serverMacKey = serverMacKey;
         this.clientCipherKey = clientCipherKey;
@@ -137,7 +143,7 @@ public class TlsKeyMaterialSpec implements KeySpec, SecretKey {
     /**
      * Returns the client MAC key.
      *
-     * @return the client MAC key (or null).
+     * @return the client MAC key.
      */
     public SecretKey getClientMacKey() {
         return clientMacKey;
@@ -146,7 +152,7 @@ public class TlsKeyMaterialSpec implements KeySpec, SecretKey {
     /**
      * Return the server MAC key.
      *
-     * @return the server MAC key (or null).
+     * @return the server MAC key.
      */
     public SecretKey getServerMacKey() {
         return serverMacKey;
diff --git a/jdk/src/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java b/jdk/src/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java
index 14d1708537a..94e731b01f9 100644
--- a/jdk/src/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java
+++ b/jdk/src/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -168,22 +168,10 @@ public final class P11TlsKeyMaterialGenerator extends KeyGeneratorSpi {
             // Note that the MAC keys do not inherit all attributes from the
             // template, but they do inherit the sensitive/extractable/token
             // flags, which is all P11Key cares about.
-            SecretKey clientMacKey, serverMacKey;
-
-            // The MAC size may be zero for GCM mode.
-            //
-            // PKCS11 does not support GCM mode as the author made the comment,
-            // so the macBits is unlikely to be zero. It's only a place holder.
-            if (macBits != 0) {
-                clientMacKey = P11Key.secretKey
+            SecretKey clientMacKey = P11Key.secretKey
                     (session, out.hClientMacSecret, "MAC", macBits, attributes);
-                serverMacKey = P11Key.secretKey
+            SecretKey serverMacKey = P11Key.secretKey
                     (session, out.hServerMacSecret, "MAC", macBits, attributes);
-            } else {
-                clientMacKey = null;
-                serverMacKey = null;
-            }
-
             SecretKey clientCipherKey, serverCipherKey;
             if (keyBits != 0) {
                 clientCipherKey = P11Key.secretKey(session, out.hClientKey,
diff --git a/jdk/src/share/classes/sun/security/ssl/Authenticator.java b/jdk/src/share/classes/sun/security/ssl/Authenticator.java
deleted file mode 100644
index a97ce7d5f0c..00000000000
--- a/jdk/src/share/classes/sun/security/ssl/Authenticator.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.security.ssl;
-
-import java.util.Arrays;
-
-/**
- * This class represents an SSL/TLS message authentication token,
- * which encapsulates a sequence number and ensures that attempts to
- * delete or reorder messages can be detected.
- *
- * Each SSL/TLS connection state contains a sequence number, which
- * is maintained separately for read and write states.  The sequence
- * number MUST be set to zero whenever a connection state is made the
- * active state.  Sequence numbers are of type uint64 and may not
- * exceed 2^64-1.  Sequence numbers do not wrap.  If a SSL/TLS
- * implementation would need to wrap a sequence number, it must
- * renegotiate instead.  A sequence number is incremented after each
- * record: specifically, the first record transmitted under a
- * particular connection state MUST use sequence number 0.
- */
-class Authenticator {
-
-    // byte array containing the additional authentication information for
-    // each record
-    private final byte[] block;
-
-    // the block size of SSL v3.0:
-    // sequence number + record type + + record length
-    private static final int BLOCK_SIZE_SSL = 8 + 1 + 2;
-
-    // the block size of TLS v1.0 and later:
-    // sequence number + record type + protocol version + record length
-    private static final int BLOCK_SIZE_TLS = 8 + 1 + 2 + 2;
-
-    /**
-     * Default construct, no message authentication token is initialized.
-     *
-     * Note that this construct can only be called for null MAC
-     */
-    Authenticator() {
-        block = new byte[0];
-    }
-
-    /**
-     * Constructs the message authentication token for the specified
-     * SSL/TLS protocol.
-     */
-    Authenticator(ProtocolVersion protocolVersion) {
-        if (protocolVersion.v >= ProtocolVersion.TLS10.v) {
-            block = new byte[BLOCK_SIZE_TLS];
-            block[9] = protocolVersion.major;
-            block[10] = protocolVersion.minor;
-        } else {
-            block = new byte[BLOCK_SIZE_SSL];
-        }
-    }
-
-    /**
-     * Checks whether the sequence number is close to wrap.
-     *
-     * Sequence numbers are of type uint64 and may not exceed 2^64-1.
-     * Sequence numbers do not wrap. When the sequence number is near
-     * to wrap, we need to close the connection immediately.
-     *
-     * @return true if the sequence number is close to wrap
-     */
-    final boolean seqNumOverflow() {
-        /*
-         * Conservatively, we don't allow more records to be generated
-         * when there are only 2^8 sequence numbers left.
-         */
-        return (block.length != 0 &&
-                block[0] == (byte)0xFF && block[1] == (byte)0xFF &&
-                block[2] == (byte)0xFF && block[3] == (byte)0xFF &&
-                block[4] == (byte)0xFF && block[5] == (byte)0xFF &&
-                block[6] == (byte)0xFF);
-    }
-
-    /**
-     * Checks whether the sequence number close to renew.
-     *
-     * Sequence numbers are of type uint64 and may not exceed 2^64-1.
-     * Sequence numbers do not wrap.  If a TLS
-     * implementation would need to wrap a sequence number, it must
-     * renegotiate instead.
-     *
-     * @return true if the sequence number is huge enough to renew
-     */
-    final boolean seqNumIsHuge() {
-        /*
-         * Conservatively, we should ask for renegotiation when there are
-         * only 2^48 sequence numbers left.
-         */
-        return (block.length != 0 &&
-                block[0] == (byte)0xFF && block[1] == (byte)0xFF);
-    }
-
-    /**
-     * Gets the current sequence number.
-     *
-     * @return the byte array of the current sequence number
-     */
-    final byte[] sequenceNumber() {
-        return Arrays.copyOf(block, 8);
-    }
-
-    /**
-     * Acquires the current message authentication information with the
-     * specified record type and fragment length, and then increases the
-     * sequence number.
-     *
-     * @param  type the record type
-     * @param  length the fragment of the record
-     * @return the byte array of the current message authentication information
-     */
-    final byte[] acquireAuthenticationBytes(byte type, int length) {
-        byte[] copy = block.clone();
-
-        if (block.length != 0) {
-            copy[8] = type;
-            copy[copy.length - 2] = (byte)(length >> 8);
-            copy[copy.length - 1] = (byte)(length);
-
-            /*
-             * Increase the sequence number in the block array
-             * it is a 64-bit number stored in big-endian format
-             */
-            int k = 7;
-            while ((k >= 0) && (++block[k] == 0)) {
-                k--;
-            }
-        }
-
-        return copy;
-    }
-
-}
diff --git a/jdk/src/share/classes/sun/security/ssl/CipherBox.java b/jdk/src/share/classes/sun/security/ssl/CipherBox.java
index bce44dabda3..362f9b5d904 100644
--- a/jdk/src/share/classes/sun/security/ssl/CipherBox.java
+++ b/jdk/src/share/classes/sun/security/ssl/CipherBox.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,18 +29,15 @@ package sun.security.ssl;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.util.Hashtable;
-import java.util.Arrays;
 
 import java.security.*;
 import javax.crypto.*;
 import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.GCMParameterSpec;
 
 import java.nio.*;
 
 import sun.security.ssl.CipherSuite.*;
 import static sun.security.ssl.CipherSuite.*;
-import static sun.security.ssl.CipherSuite.CipherType.*;
 
 import sun.misc.HexDumpEncoder;
 
@@ -104,41 +101,20 @@ final class CipherBox {
     // cipher object
     private final Cipher cipher;
 
+    /**
+     * Cipher blocksize, 0 for stream ciphers
+     */
+    private int blockSize;
+
     /**
      * secure random
      */
     private SecureRandom random;
 
     /**
-     * fixed IV, the implicit nonce of AEAD cipher suite, only apply to
-     * AEAD cipher suites
+     * Is the cipher of CBC mode?
      */
-    private final byte[] fixedIv;
-
-    /**
-     * the key, reserved only for AEAD cipher initialization
-     */
-    private final Key key;
-
-    /**
-     * the operation mode, reserved for AEAD cipher initialization
-     */
-    private final int mode;
-
-    /**
-     * the authentication tag size, only apply to AEAD cipher suites
-     */
-    private final int tagSize;
-
-    /**
-     * the record IV length, only apply to AEAD cipher suites
-     */
-    private final int recordIvSize;
-
-    /**
-     * cipher type
-     */
-    private final CipherType cipherType;
+    private final boolean isCBCMode;
 
     /**
      * Fixed masks of various block size, as the initial decryption IVs
@@ -156,13 +132,7 @@ final class CipherBox {
     private CipherBox() {
         this.protocolVersion = ProtocolVersion.DEFAULT;
         this.cipher = null;
-        this.cipherType = STREAM_CIPHER;
-        this.fixedIv = new byte[0];
-        this.key = null;
-        this.mode = Cipher.ENCRYPT_MODE;    // choose at random
-        this.random = null;
-        this.tagSize = 0;
-        this.recordIvSize = 0;
+        this.isCBCMode = false;
     }
 
     /**
@@ -177,13 +147,13 @@ final class CipherBox {
         try {
             this.protocolVersion = protocolVersion;
             this.cipher = JsseJce.getCipher(bulkCipher.transformation);
-            this.mode = encrypt ? Cipher.ENCRYPT_MODE : Cipher.DECRYPT_MODE;
+            int mode = encrypt ? Cipher.ENCRYPT_MODE : Cipher.DECRYPT_MODE;
 
             if (random == null) {
                 random = JsseJce.getSecureRandom();
             }
             this.random = random;
-            this.cipherType = bulkCipher.cipherType;
+            this.isCBCMode = bulkCipher.isCBCMode;
 
             /*
              * RFC 4346 recommends two algorithms used to generated the
@@ -201,40 +171,14 @@ final class CipherBox {
                 iv = getFixedMask(bulkCipher.ivSize);
             }
 
-            if (cipherType == AEAD_CIPHER) {
-                // AEAD must completely initialize the cipher for each packet,
-                // and so we save initialization parameters for packet
-                // processing time.
+            cipher.init(mode, key, iv, random);
 
-                // Set the tag size for AEAD cipher
-                tagSize = bulkCipher.tagSize;
-
-                // Reserve the key for AEAD cipher initialization
-                this.key = key;
-
-                fixedIv = iv.getIV();
-                if (fixedIv == null ||
-                        fixedIv.length != bulkCipher.fixedIvSize) {
-                    throw new RuntimeException("Improper fixed IV for AEAD");
-                }
-
-                // Set the record IV length for AEAD cipher
-                recordIvSize = bulkCipher.ivSize - bulkCipher.fixedIvSize;
-
-                // DON'T initialize the cipher for AEAD!
-            } else {
-                // CBC only requires one initialization during its lifetime
-                // (future packets/IVs set the proper CBC state), so we can
-                // initialize now.
-
-                // Zeroize the variables that only apply to AEAD cipher
-                this.tagSize = 0;
-                this.fixedIv = new byte[0];
-                this.recordIvSize = 0;
-                this.key = null;
-
-                // Initialize the cipher
-                cipher.init(mode, key, iv, random);
+            // Do not call getBlockSize until after init()
+            // otherwise we would disrupt JCE delayed provider selection
+            blockSize = cipher.getBlockSize();
+            // some providers implement getBlockSize() incorrectly
+            if (blockSize == 1) {
+                blockSize = 0;
             }
         } catch (NoSuchAlgorithmException e) {
             throw e;
@@ -291,11 +235,26 @@ final class CipherBox {
         }
 
         try {
-            int blockSize = cipher.getBlockSize();
-            if (cipherType == BLOCK_CIPHER) {
+            if (blockSize != 0) {
+                // TLSv1.1 needs a IV block
+                if (protocolVersion.v >= ProtocolVersion.TLS11.v) {
+                    // generate a random number
+                    byte[] prefix = new byte[blockSize];
+                    random.nextBytes(prefix);
+
+                    // move forward the plaintext
+                    System.arraycopy(buf, offset,
+                                     buf, offset + prefix.length, len);
+
+                    // prefix the plaintext
+                    System.arraycopy(prefix, 0,
+                                     buf, offset, prefix.length);
+
+                    len += prefix.length;
+                }
+
                 len = addPadding(buf, offset, len, blockSize);
             }
-
             if (debug != null && Debug.isOn("plaintext")) {
                 try {
                     HexDumpEncoder hd = new HexDumpEncoder();
@@ -308,28 +267,14 @@ final class CipherBox {
                         System.out);
                 } catch (IOException e) { }
             }
-
-
-            if (cipherType == AEAD_CIPHER) {
-                try {
-                    return cipher.doFinal(buf, offset, len, buf, offset);
-                } catch (IllegalBlockSizeException | BadPaddingException ibe) {
-                    // unlikely to happen
-                    throw new RuntimeException(
-                        "Cipher error in AEAD mode in JCE provider " +
-                        cipher.getProvider().getName(), ibe);
-                }
-            } else {
-                int newLen = cipher.update(buf, offset, len, buf, offset);
-                if (newLen != len) {
-                    // catch BouncyCastle buffering error
-                    throw new RuntimeException("Cipher buffering error " +
-                        "in JCE provider " + cipher.getProvider().getName());
-                }
-                return newLen;
+            int newLen = cipher.update(buf, offset, len, buf, offset);
+            if (newLen != len) {
+                // catch BouncyCastle buffering error
+                throw new RuntimeException("Cipher buffering error " +
+                    "in JCE provider " + cipher.getProvider().getName());
             }
+            return newLen;
         } catch (ShortBufferException e) {
-            // unlikely to happen, we should have enough buffer space here
             throw new ArrayIndexOutOfBoundsException(e.toString());
         }
     }
@@ -343,7 +288,7 @@ final class CipherBox {
      * set to last position padded/encrypted.  The limit may have changed
      * because of the added padding bytes.
      */
-    int encrypt(ByteBuffer bb, int outLimit) {
+    int encrypt(ByteBuffer bb) {
 
         int len = bb.remaining();
 
@@ -352,71 +297,66 @@ final class CipherBox {
             return len;
         }
 
-        int pos = bb.position();
+        try {
+            int pos = bb.position();
 
-        int blockSize = cipher.getBlockSize();
-        if (cipherType == BLOCK_CIPHER) {
-            // addPadding adjusts pos/limit
-            len = addPadding(bb, blockSize);
-            bb.position(pos);
-        }
+            if (blockSize != 0) {
+                // TLSv1.1 needs a IV block
+                if (protocolVersion.v >= ProtocolVersion.TLS11.v) {
+                    // generate a random number
+                    byte[] prefix = new byte[blockSize];
+                    random.nextBytes(prefix);
 
-        if (debug != null && Debug.isOn("plaintext")) {
-            try {
-                HexDumpEncoder hd = new HexDumpEncoder();
-
-                System.out.println(
-                    "Padded plaintext before ENCRYPTION:  len = "
-                    + len);
-                hd.encodeBuffer(bb.duplicate(), System.out);
-
-            } catch (IOException e) { }
-        }
-
-        /*
-         * Encrypt "in-place".  This does not add its own padding.
-         */
-        ByteBuffer dup = bb.duplicate();
-        if (cipherType == AEAD_CIPHER) {
-            try {
-                int outputSize = cipher.getOutputSize(dup.remaining());
-                if (outputSize > bb.remaining()) {
-                    // need to expand the limit of the output buffer for
-                    // the authentication tag.
-                    //
-                    // DON'T worry about the buffer's capacity, we have
-                    // reserved space for the authentication tag.
-                    if (outLimit < pos + outputSize) {
-                        // unlikely to happen
-                        throw new ShortBufferException(
-                                    "need more space in output buffer");
+                    // move forward the plaintext
+                    byte[] buf = null;
+                    int limit = bb.limit();
+                    if (bb.hasArray()) {
+                        int arrayOffset = bb.arrayOffset();
+                        buf = bb.array();
+                        System.arraycopy(buf, arrayOffset + pos,
+                            buf, arrayOffset + pos + prefix.length,
+                            limit - pos);
+                        bb.limit(limit + prefix.length);
+                    } else {
+                        buf = new byte[limit - pos];
+                        bb.get(buf, 0, limit - pos);
+                        bb.position(pos + prefix.length);
+                        bb.limit(limit + prefix.length);
+                        bb.put(buf);
                     }
-                    bb.limit(pos + outputSize);
+                    bb.position(pos);
+
+                    // prefix the plaintext
+                    bb.put(prefix);
+                    bb.position(pos);
                 }
-                int newLen = cipher.doFinal(dup, bb);
-                if (newLen != outputSize) {
-                    throw new RuntimeException(
-                            "Cipher buffering error in JCE provider " +
-                            cipher.getProvider().getName());
-                }
-                return newLen;
-            } catch (IllegalBlockSizeException |
-                           BadPaddingException | ShortBufferException ibse) {
-                // unlikely to happen
-                throw new RuntimeException(
-                        "Cipher error in AEAD mode in JCE provider " +
-                        cipher.getProvider().getName(), ibse);
+
+                // addPadding adjusts pos/limit
+                len = addPadding(bb, blockSize);
+                bb.position(pos);
             }
-        } else {
-            int newLen;
-            try {
-                newLen = cipher.update(dup, bb);
-            } catch (ShortBufferException sbe) {
-                // unlikely to happen
-                throw new RuntimeException("Cipher buffering error " +
-                    "in JCE provider " + cipher.getProvider().getName());
+            if (debug != null && Debug.isOn("plaintext")) {
+                try {
+                    HexDumpEncoder hd = new HexDumpEncoder();
+
+                    System.out.println(
+                        "Padded plaintext before ENCRYPTION:  len = "
+                        + len);
+                    hd.encodeBuffer(bb, System.out);
+
+                } catch (IOException e) { }
+                /*
+                 * reset back to beginning
+                 */
+                bb.position(pos);
             }
 
+            /*
+             * Encrypt "in-place".  This does not add its own padding.
+             */
+            ByteBuffer dup = bb.duplicate();
+            int newLen = cipher.update(dup, bb);
+
             if (bb.position() != dup.position()) {
                 throw new RuntimeException("bytebuffer padding error");
             }
@@ -427,6 +367,10 @@ final class CipherBox {
                     "in JCE provider " + cipher.getProvider().getName());
             }
             return newLen;
+        } catch (ShortBufferException e) {
+            RuntimeException exc = new RuntimeException(e.toString());
+            exc.initCause(e);
+            throw exc;
         }
     }
 
@@ -454,23 +398,11 @@ final class CipherBox {
         }
 
         try {
-            int newLen;
-            if (cipherType == AEAD_CIPHER) {
-                try {
-                    newLen = cipher.doFinal(buf, offset, len, buf, offset);
-                } catch (IllegalBlockSizeException ibse) {
-                    // unlikely to happen
-                    throw new RuntimeException(
-                        "Cipher error in AEAD mode in JCE provider " +
-                        cipher.getProvider().getName(), ibse);
-                }
-            } else {
-                newLen = cipher.update(buf, offset, len, buf, offset);
-                if (newLen != len) {
-                    // catch BouncyCastle buffering error
-                    throw new RuntimeException("Cipher buffering error " +
-                        "in JCE provider " + cipher.getProvider().getName());
-                }
+            int newLen = cipher.update(buf, offset, len, buf, offset);
+            if (newLen != len) {
+                // catch BouncyCastle buffering error
+                throw new RuntimeException("Cipher buffering error " +
+                    "in JCE provider " + cipher.getProvider().getName());
             }
             if (debug != null && Debug.isOn("plaintext")) {
                 try {
@@ -484,9 +416,7 @@ final class CipherBox {
                         System.out);
                 } catch (IOException e) { }
             }
-
-            if (cipherType == BLOCK_CIPHER) {
-                int blockSize = cipher.getBlockSize();
+            if (blockSize != 0) {
                 newLen = removePadding(buf, offset, newLen,
                              blockSize, protocolVersion);
 
@@ -494,11 +424,16 @@ final class CipherBox {
                     if (newLen < blockSize) {
                         throw new BadPaddingException("invalid explicit IV");
                     }
+
+                    // discards the first cipher block, the IV component.
+                    System.arraycopy(buf, offset + blockSize,
+                                     buf, offset, newLen - blockSize);
+
+                    newLen -= blockSize;
                 }
             }
             return newLen;
         } catch (ShortBufferException e) {
-            // unlikely to happen, we should have enough buffer space here
             throw new ArrayIndexOutOfBoundsException(e.toString());
         }
     }
@@ -528,29 +463,15 @@ final class CipherBox {
              */
             int pos = bb.position();
             ByteBuffer dup = bb.duplicate();
-            int newLen;
-            if (cipherType == AEAD_CIPHER) {
-                try {
-                    newLen = cipher.doFinal(dup, bb);
-                } catch (IllegalBlockSizeException ibse) {
-                    // unlikely to happen
-                    throw new RuntimeException(
-                        "Cipher error in AEAD mode \"" + ibse.getMessage() +
-                        " \"in JCE provider " + cipher.getProvider().getName());
-                }
-            } else {
-                newLen = cipher.update(dup, bb);
-                if (newLen != len) {
-                    // catch BouncyCastle buffering error
-                    throw new RuntimeException("Cipher buffering error " +
-                        "in JCE provider " + cipher.getProvider().getName());
-                }
+            int newLen = cipher.update(dup, bb);
+            if (newLen != len) {
+                // catch BouncyCastle buffering error
+                throw new RuntimeException("Cipher buffering error " +
+                    "in JCE provider " + cipher.getProvider().getName());
             }
 
-            // reset the limit to the end of the decryted data
-            bb.limit(pos + newLen);
-
             if (debug != null && Debug.isOn("plaintext")) {
+                bb.position(pos);
                 try {
                     HexDumpEncoder hd = new HexDumpEncoder();
 
@@ -558,33 +479,50 @@ final class CipherBox {
                         "Padded plaintext after DECRYPTION:  len = "
                         + newLen);
 
-                    hd.encodeBuffer(
-                        (ByteBuffer)bb.duplicate().position(pos), System.out);
+                    hd.encodeBuffer(bb, System.out);
                 } catch (IOException e) { }
             }
 
             /*
              * Remove the block padding.
              */
-            if (cipherType == BLOCK_CIPHER) {
-                int blockSize = cipher.getBlockSize();
+            if (blockSize != 0) {
                 bb.position(pos);
                 newLen = removePadding(bb, blockSize, protocolVersion);
 
-                // check the explicit IV of TLS v1.1 or later
                 if (protocolVersion.v >= ProtocolVersion.TLS11.v) {
                     if (newLen < blockSize) {
                         throw new BadPaddingException("invalid explicit IV");
                     }
 
+                    // discards the first cipher block, the IV component.
+                    byte[] buf = null;
+                    int limit = bb.limit();
+                    if (bb.hasArray()) {
+                        int arrayOffset = bb.arrayOffset();
+                        buf = bb.array();
+                        System.arraycopy(buf, arrayOffset + pos + blockSize,
+                            buf, arrayOffset + pos, limit - pos - blockSize);
+                        bb.limit(limit - blockSize);
+                    } else {
+                        buf = new byte[limit - pos - blockSize];
+                        bb.position(pos + blockSize);
+                        bb.get(buf);
+                        bb.position(pos);
+                        bb.put(buf);
+                        bb.limit(limit - blockSize);
+                    }
+
                     // reset the position to the end of the decrypted data
-                    bb.position(bb.limit());
+                    limit = bb.limit();
+                    bb.position(limit);
                 }
             }
             return newLen;
         } catch (ShortBufferException e) {
-            // unlikely to happen, we should have enough buffer space here
-            throw new ArrayIndexOutOfBoundsException(e.toString());
+            RuntimeException exc = new RuntimeException(e.toString());
+            exc.initCause(e);
+            throw exc;
         }
     }
 
@@ -757,8 +695,8 @@ final class CipherBox {
                 // ignore return value.
                 cipher.doFinal();
             }
-        } catch (Exception e) {
-            // swallow all types of exceptions.
+        } catch (GeneralSecurityException e) {
+            // swallow for now.
         }
     }
 
@@ -768,234 +706,6 @@ final class CipherBox {
      * @return true if the cipher use CBC mode, false otherwise.
      */
     boolean isCBCMode() {
-        return cipherType == BLOCK_CIPHER;
-    }
-
-    /*
-     * Does the cipher use AEAD mode?
-     *
-     * @return true if the cipher use AEAD mode, false otherwise.
-     */
-    boolean isAEADMode() {
-        return cipherType == AEAD_CIPHER;
-    }
-
-    /*
-     * Is the cipher null?
-     *
-     * @return true if the cipher is null, false otherwise.
-     */
-    boolean isNullCipher() {
-        return cipher == null;
-    }
-
-    /*
-     * Gets the explicit nonce/IV size of the cipher.
-     *
-     * The returned value is the SecurityParameters.record_iv_length in
-     * RFC 4346/5246.  It is the size of explicit IV for CBC mode, and the
-     * size of explicit nonce for AEAD mode.
-     *
-     * @return the explicit nonce size of the cipher.
-     */
-    int getExplicitNonceSize() {
-        switch (cipherType) {
-            case BLOCK_CIPHER:
-                // For block ciphers, the explicit IV length is of length
-                // SecurityParameters.record_iv_length, which is equal to
-                // the SecurityParameters.block_size.
-                if (protocolVersion.v >= ProtocolVersion.TLS11.v) {
-                    return cipher.getBlockSize();
-                }
-                break;
-            case AEAD_CIPHER:
-                return recordIvSize;
-                        // It is also the length of sequence number, which is
-                        // used as the nonce_explicit for AEAD cipher suites.
-        }
-
-        return 0;
-    }
-
-    /*
-     * Applies the explicit nonce/IV to this cipher. This method is used to
-     * decrypt an SSL/TLS input record.
-     *
-     * The returned value is the SecurityParameters.record_iv_length in
-     * RFC 4346/5246.  It is the size of explicit IV for CBC mode, and the
-     * size of explicit nonce for AEAD mode.
-     *
-     * @param  authenticator the authenticator to get the additional
-     *         authentication data
-     * @param  contentType the content type of the input record
-     * @param  bb the byte buffer to get the explicit nonce from
-     *
-     * @return the explicit nonce size of the cipher.
-     */
-    int applyExplicitNonce(Authenticator authenticator, byte contentType,
-            ByteBuffer bb) throws BadPaddingException {
-        switch (cipherType) {
-            case BLOCK_CIPHER:
-                // For block ciphers, the explicit IV length is of length
-                // SecurityParameters.record_iv_length, which is equal to
-                // the SecurityParameters.block_size.
-                if (protocolVersion.v >= ProtocolVersion.TLS11.v) {
-                    return cipher.getBlockSize();
-                }
-                break;
-            case AEAD_CIPHER:
-                if (bb.remaining() < (recordIvSize + tagSize)) {
-                    throw new BadPaddingException(
-                                        "invalid AEAD cipher fragment");
-                }
-
-                // initialize the AEAD cipher for the unique IV
-                byte[] iv = Arrays.copyOf(fixedIv,
-                                    fixedIv.length + recordIvSize);
-                bb.get(iv, fixedIv.length, recordIvSize);
-                bb.position(bb.position() - recordIvSize);
-                GCMParameterSpec spec = new GCMParameterSpec(tagSize * 8, iv);
-                try {
-                    cipher.init(mode, key, spec, random);
-                } catch (InvalidKeyException |
-                            InvalidAlgorithmParameterException ikae) {
-                    // unlikely to happen
-                    throw new RuntimeException(
-                                "invalid key or spec in GCM mode", ikae);
-                }
-
-                // update the additional authentication data
-                byte[] aad = authenticator.acquireAuthenticationBytes(
-                        contentType, bb.remaining() - recordIvSize - tagSize);
-                cipher.updateAAD(aad);
-
-                return recordIvSize;
-                        // It is also the length of sequence number, which is
-                        // used as the nonce_explicit for AEAD cipher suites.
-        }
-
-       return 0;
-    }
-
-    /*
-     * Applies the explicit nonce/IV to this cipher. This method is used to
-     * decrypt an SSL/TLS input record.
-     *
-     * The returned value is the SecurityParameters.record_iv_length in
-     * RFC 4346/5246.  It is the size of explicit IV for CBC mode, and the
-     * size of explicit nonce for AEAD mode.
-     *
-     * @param  authenticator the authenticator to get the additional
-     *         authentication data
-     * @param  contentType the content type of the input record
-     * @param  buf the byte array to get the explicit nonce from
-     * @param  offset the offset of the byte buffer
-     * @param  cipheredLength the ciphered fragment length of the output
-     *         record, it is the TLSCiphertext.length in RFC 4346/5246.
-     *
-     * @return the explicit nonce size of the cipher.
-     */
-    int applyExplicitNonce(Authenticator authenticator,
-            byte contentType, byte[] buf, int offset,
-            int cipheredLength) throws BadPaddingException {
-
-        ByteBuffer bb = ByteBuffer.wrap(buf, offset, cipheredLength);
-
-        return applyExplicitNonce(authenticator, contentType, bb);
-    }
-
-    /*
-     * Creates the explicit nonce/IV to this cipher. This method is used to
-     * encrypt an SSL/TLS output record.
-     *
-     * The size of the returned array is the SecurityParameters.record_iv_length
-     * in RFC 4346/5246.  It is the size of explicit IV for CBC mode, and the
-     * size of explicit nonce for AEAD mode.
-     *
-     * @param  authenticator the authenticator to get the additional
-     *         authentication data
-     * @param  contentType the content type of the input record
-     * @param  fragmentLength the fragment length of the output record, it is
-     *         the TLSCompressed.length in RFC 4346/5246.
-     *
-     * @return the explicit nonce of the cipher.
-     */
-    byte[] createExplicitNonce(Authenticator authenticator,
-            byte contentType, int fragmentLength) {
-
-        byte[] nonce = new byte[0];
-        switch (cipherType) {
-            case BLOCK_CIPHER:
-                if (protocolVersion.v >= ProtocolVersion.TLS11.v) {
-                    // For block ciphers, the explicit IV length is of length
-                    // SecurityParameters.record_iv_length, which is equal to
-                    // the SecurityParameters.block_size.
-                    //
-                    // Generate a random number as the explicit IV parameter.
-                    nonce = new byte[cipher.getBlockSize()];
-                    random.nextBytes(nonce);
-                }
-                break;
-            case AEAD_CIPHER:
-                // To be unique and aware of overflow-wrap, sequence number
-                // is used as the nonce_explicit of AEAD cipher suites.
-                nonce = authenticator.sequenceNumber();
-
-                // initialize the AEAD cipher for the unique IV
-                byte[] iv = Arrays.copyOf(fixedIv,
-                                            fixedIv.length + nonce.length);
-                System.arraycopy(nonce, 0, iv, fixedIv.length, nonce.length);
-                GCMParameterSpec spec = new GCMParameterSpec(tagSize * 8, iv);
-                try {
-                    cipher.init(mode, key, spec, random);
-                } catch (InvalidKeyException |
-                            InvalidAlgorithmParameterException ikae) {
-                    // unlikely to happen
-                    throw new RuntimeException(
-                                "invalid key or spec in GCM mode", ikae);
-                }
-
-                // update the additional authentication data
-                byte[] aad = authenticator.acquireAuthenticationBytes(
-                                                contentType, fragmentLength);
-                cipher.updateAAD(aad);
-                break;
-        }
-
-        return nonce;
-    }
-
-    /*
-     * Is this cipher available?
-     *
-     * This method can only be called by CipherSuite.BulkCipher.isAvailable()
-     * to test the availability of a cipher suites.  Please DON'T use it in
-     * other places, otherwise, the behavior may be unexpected because we may
-     * initialize AEAD cipher improperly in the method.
-     */
-    Boolean isAvailable() {
-        // We won't know whether a cipher for a particular key size is
-        // available until the cipher is successfully initialized.
-        //
-        // We do not initialize AEAD cipher in the constructor.  Need to
-        // initialize the cipher to ensure that the AEAD mode for a
-        // particular key size is supported.
-        if (cipherType == AEAD_CIPHER) {
-            try {
-                Authenticator authenticator =
-                    new Authenticator(protocolVersion);
-                byte[] nonce = authenticator.sequenceNumber();
-                byte[] iv = Arrays.copyOf(fixedIv,
-                                            fixedIv.length + nonce.length);
-                System.arraycopy(nonce, 0, iv, fixedIv.length, nonce.length);
-                GCMParameterSpec spec = new GCMParameterSpec(tagSize * 8, iv);
-
-                cipher.init(mode, key, spec, random);
-            } catch (Exception e) {
-                return Boolean.FALSE;
-            }
-        }   // Otherwise, we have initialized the cipher in the constructor.
-
-        return Boolean.TRUE;
+        return isCBCMode;
     }
 }
diff --git a/jdk/src/share/classes/sun/security/ssl/CipherSuite.java b/jdk/src/share/classes/sun/security/ssl/CipherSuite.java
index 435693751c7..555304880b7 100644
--- a/jdk/src/share/classes/sun/security/ssl/CipherSuite.java
+++ b/jdk/src/share/classes/sun/security/ssl/CipherSuite.java
@@ -33,14 +33,12 @@ import java.security.InvalidKeyException;
 import java.security.SecureRandom;
 import java.security.KeyManagementException;
 
-import javax.crypto.Cipher;
 import javax.crypto.SecretKey;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 
 import static sun.security.ssl.CipherSuite.KeyExchange.*;
 import static sun.security.ssl.CipherSuite.PRF.*;
-import static sun.security.ssl.CipherSuite.CipherType.*;
 import static sun.security.ssl.JsseJce.*;
 
 /**
@@ -137,9 +135,7 @@ final class CipherSuite implements Comparable<CipherSuite> {
         this.keyExchange = keyExchange;
         this.cipher = cipher;
         this.exportable = cipher.exportable;
-        if (cipher.cipherType == CipherType.AEAD_CIPHER) {
-            macAlg = M_NULL;
-        } else if (name.endsWith("_MD5")) {
+        if (name.endsWith("_MD5")) {
             macAlg = M_MD5;
         } else if (name.endsWith("_SHA")) {
             macAlg = M_SHA;
@@ -389,12 +385,6 @@ final class CipherSuite implements Comparable<CipherSuite> {
         }
     }
 
-    static enum CipherType {
-        STREAM_CIPHER,         // null or stream cipher
-        BLOCK_CIPHER,          // block cipher in CBC mode
-        AEAD_CIPHER            // AEAD cipher
-    }
-
     /**
      * An SSL/TLS bulk cipher algorithm. One instance per combination of
      * cipher and key length.
@@ -427,26 +417,14 @@ final class CipherSuite implements Comparable<CipherSuite> {
         // for non-exportable ciphers, this is the same as keySize
         final int expandedKeySize;
 
-        // size of the IV
+        // size of the IV (also block size)
         final int ivSize;
 
-        // size of fixed IV
-        //
-        // record_iv_length = ivSize - fixedIvSize
-        final int fixedIvSize;
-
         // exportable under 512/40 bit rules
         final boolean exportable;
 
         // Is the cipher algorithm of Cipher Block Chaining (CBC) mode?
-        final CipherType cipherType;
-
-        // size of the authentication tag, only applicable to cipher suites in
-        // Galois Counter Mode (GCM)
-        //
-        // As far as we know, all supported GCM cipher suites use 128-bits
-        // authentication tags.
-        final int tagSize = 16;
+        final boolean isCBCMode;
 
         // The secure random used to detect the cipher availability.
         private final static SecureRandom secureRandom;
@@ -459,34 +437,32 @@ final class CipherSuite implements Comparable<CipherSuite> {
             }
         }
 
-        BulkCipher(String transformation, CipherType cipherType, int keySize,
-                int expandedKeySize, int ivSize,
-                int fixedIvSize, boolean allowed) {
-
+        BulkCipher(String transformation, int keySize,
+                int expandedKeySize, int ivSize, boolean allowed) {
             this.transformation = transformation;
             String[] splits = transformation.split("/");
             this.algorithm = splits[0];
-            this.cipherType = cipherType;
+            this.isCBCMode =
+                splits.length <= 1 ? false : "CBC".equalsIgnoreCase(splits[1]);
             this.description = this.algorithm + "/" + (keySize << 3);
             this.keySize = keySize;
             this.ivSize = ivSize;
-            this.fixedIvSize = fixedIvSize;
             this.allowed = allowed;
 
             this.expandedKeySize = expandedKeySize;
             this.exportable = true;
         }
 
-        BulkCipher(String transformation, CipherType cipherType, int keySize,
-                int ivSize, int fixedIvSize, boolean allowed) {
+        BulkCipher(String transformation, int keySize,
+                int ivSize, boolean allowed) {
             this.transformation = transformation;
             String[] splits = transformation.split("/");
             this.algorithm = splits[0];
-            this.cipherType = cipherType;
+            this.isCBCMode =
+                splits.length <= 1 ? false : "CBC".equalsIgnoreCase(splits[1]);
             this.description = this.algorithm + "/" + (keySize << 3);
             this.keySize = keySize;
             this.ivSize = ivSize;
-            this.fixedIvSize = fixedIvSize;
             this.allowed = allowed;
 
             this.expandedKeySize = keySize;
@@ -510,20 +486,16 @@ final class CipherSuite implements Comparable<CipherSuite> {
          * Test if this bulk cipher is available. For use by CipherSuite.
          *
          * Currently all supported ciphers except AES are always available
-         * via the JSSE internal implementations. We also assume AES/128 of
-         * CBC mode is always available since it is shipped with the SunJCE
-         * provider.  However, AES/256 is unavailable when the default JCE
-         * policy jurisdiction files are installed because of key length
-         * restrictions, and AEAD is unavailable when the underlying providers
-         * do not support AEAD/GCM mode.
+         * via the JSSE internal implementations. We also assume AES/128
+         * is always available since it is shipped with the SunJCE provider.
+         * However, AES/256 is unavailable when the default JCE policy
+         * jurisdiction files are installed because of key length restrictions.
          */
         boolean isAvailable() {
             if (allowed == false) {
                 return false;
             }
-
-            if ((this == B_AES_256) ||
-                    (this.cipherType == CipherType.AEAD_CIPHER)) {
+            if (this == B_AES_256) {
                 return isAvailable(this);
             }
 
@@ -541,50 +513,19 @@ final class CipherSuite implements Comparable<CipherSuite> {
         private static synchronized boolean isAvailable(BulkCipher cipher) {
             Boolean b = availableCache.get(cipher);
             if (b == null) {
-                int keySizeInBits = cipher.keySize * 8;
-                if (keySizeInBits > 128) {    // need the JCE unlimited
-                                               // strength jurisdiction policy
-                    try {
-                        if (Cipher.getMaxAllowedKeyLength(
-                                cipher.transformation) < keySizeInBits) {
-                            b = Boolean.FALSE;
-                        }
-                    } catch (Exception e) {
-                        b = Boolean.FALSE;
-                    }
-                }
-
-                if (b == null) {
-                    b = Boolean.FALSE;          // may be reset to TRUE if
-                                                // the cipher is available
-                    CipherBox temporary = null;
-                    try {
-                        SecretKey key = new SecretKeySpec(
-                                            new byte[cipher.expandedKeySize],
-                                            cipher.algorithm);
-                        IvParameterSpec iv;
-                        if (cipher.cipherType == CipherType.AEAD_CIPHER) {
-                            iv = new IvParameterSpec(
-                                            new byte[cipher.fixedIvSize]);
-                        } else {
-                            iv = new IvParameterSpec(new byte[cipher.ivSize]);
-                        }
-                        temporary = cipher.newCipher(
-                                            ProtocolVersion.DEFAULT,
+                try {
+                    SecretKey key = new SecretKeySpec
+                        (new byte[cipher.expandedKeySize], cipher.algorithm);
+                    IvParameterSpec iv =
+                        new IvParameterSpec(new byte[cipher.ivSize]);
+                    cipher.newCipher(ProtocolVersion.DEFAULT,
                                             key, iv, secureRandom, true);
-                        b = temporary.isAvailable();
-                    } catch (NoSuchAlgorithmException e) {
-                        // not available
-                    } finally {
-                        if (temporary != null) {
-                            temporary.dispose();
-                        }
-                    }
+                    b = Boolean.TRUE;
+                } catch (NoSuchAlgorithmException e) {
+                    b = Boolean.FALSE;
                 }
-
                 availableCache.put(cipher, b);
             }
-
             return b.booleanValue();
         }
 
@@ -632,31 +573,27 @@ final class CipherSuite implements Comparable<CipherSuite> {
 
     // export strength ciphers
     final static BulkCipher B_NULL    =
-        new BulkCipher("NULL",          STREAM_CIPHER,    0,  0,  0, 0, true);
+                        new BulkCipher("NULL",         0,  0, 0, true);
     final static BulkCipher B_RC4_40  =
-        new BulkCipher(CIPHER_RC4,      STREAM_CIPHER,    5, 16,  0, 0, true);
+                        new BulkCipher(CIPHER_RC4,     5, 16, 0, true);
     final static BulkCipher B_RC2_40  =
-        new BulkCipher("RC2",           BLOCK_CIPHER,     5, 16,  8, 0, false);
+                        new BulkCipher("RC2",          5, 16, 8, false);
     final static BulkCipher B_DES_40  =
-        new BulkCipher(CIPHER_DES,      BLOCK_CIPHER,     5,  8,  8, 0, true);
+                        new BulkCipher(CIPHER_DES,     5,  8, 8, true);
 
     // domestic strength ciphers
     final static BulkCipher B_RC4_128 =
-        new BulkCipher(CIPHER_RC4,      STREAM_CIPHER,   16,  0,  0, true);
+                        new BulkCipher(CIPHER_RC4,     16,  0, true);
     final static BulkCipher B_DES     =
-        new BulkCipher(CIPHER_DES,      BLOCK_CIPHER,     8,  8,  0, true);
+                        new BulkCipher(CIPHER_DES,      8,  8, true);
     final static BulkCipher B_3DES    =
-        new BulkCipher(CIPHER_3DES,     BLOCK_CIPHER,    24,  8,  0, true);
+                        new BulkCipher(CIPHER_3DES,    24,  8, true);
     final static BulkCipher B_IDEA    =
-        new BulkCipher("IDEA",          BLOCK_CIPHER,    16,  8,  0, false);
+                        new BulkCipher("IDEA",         16,  8, false);
     final static BulkCipher B_AES_128 =
-        new BulkCipher(CIPHER_AES,      BLOCK_CIPHER,    16, 16,  0, true);
+                        new BulkCipher(CIPHER_AES,     16, 16, true);
     final static BulkCipher B_AES_256 =
-        new BulkCipher(CIPHER_AES,      BLOCK_CIPHER,    32, 16,  0, true);
-    final static BulkCipher B_AES_128_GCM =
-        new BulkCipher(CIPHER_AES_GCM,  AEAD_CIPHER,     16, 12,  4, true);
-    final static BulkCipher B_AES_256_GCM =
-        new BulkCipher(CIPHER_AES_GCM,  AEAD_CIPHER,     32, 12,  4, true);
+                        new BulkCipher(CIPHER_AES,     32, 16, true);
 
     // MACs
     final static MacAlg M_NULL = new MacAlg("NULL", 0);
@@ -956,12 +893,11 @@ final class CipherSuite implements Comparable<CipherSuite> {
          * Definition of the CipherSuites that are enabled by default.
          * They are listed in preference order, most preferred first, using
          * the following criteria:
-         * 1. Prefer Suite B compliant cipher suites, see RFC6460.
-         * 2. Prefer the stronger bulk cipher, in the order of AES_256(GCM),
-         *    AES_128(GCM), AES_256, AES_128, RC-4, 3DES-EDE.
-         * 3. Prefer the stronger MAC algorithm, in the order of SHA384,
+         * 1. Prefer the stronger buld cipher, in the order of AES_256,
+         *    AES_128, RC-4, 3DES-EDE.
+         * 2. Prefer the stronger MAC algorithm, in the order of SHA384,
          *    SHA256, SHA, MD5.
-         * 4. Prefer the better performance of key exchange and digital
+         * 3. Prefer the better performance of key exchange and digital
          *    signature algorithm, in the order of ECDHE-ECDSA, ECDHE-RSA,
          *    RSA, ECDH-ECDSA, ECDH-RSA, DHE-RSA, DHE-DSS.
          */
@@ -974,16 +910,6 @@ final class CipherSuite implements Comparable<CipherSuite> {
 
         //  ID           Key Exchange   Cipher     A  obs  suprt  PRF
         //  ======       ============   =========  =  ===  =====  ========
-
-
-        // Placeholder for cipher suites in GCM mode.
-        //
-        // For better compatibility and interoperability, we decrease the
-        // priority of cipher suites in GCM mode for a while as GCM
-        // technologies mature in the industry.  Eventually we'll move
-        // the GCM suites here.
-
-        // AES_256(CBC)
         add("TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384",
             0xc024, --p, K_ECDHE_ECDSA, B_AES_256, T, max, tls12, P_SHA384);
         add("TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384",
@@ -1014,7 +940,6 @@ final class CipherSuite implements Comparable<CipherSuite> {
         add("TLS_DHE_DSS_WITH_AES_256_CBC_SHA",
             0x0038, --p, K_DHE_DSS,     B_AES_256, T);
 
-        // AES_128(CBC)
         add("TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256",
             0xc023, --p, K_ECDHE_ECDSA, B_AES_128, T, max, tls12, P_SHA256);
         add("TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256",
@@ -1045,7 +970,6 @@ final class CipherSuite implements Comparable<CipherSuite> {
         add("TLS_DHE_DSS_WITH_AES_128_CBC_SHA",
             0x0032, --p, K_DHE_DSS,     B_AES_128, T);
 
-        // RC-4
         add("TLS_ECDHE_ECDSA_WITH_RC4_128_SHA",
             0xC007, --p, K_ECDHE_ECDSA, B_RC4_128, N);
         add("TLS_ECDHE_RSA_WITH_RC4_128_SHA",
@@ -1057,51 +981,6 @@ final class CipherSuite implements Comparable<CipherSuite> {
         add("TLS_ECDH_RSA_WITH_RC4_128_SHA",
             0xC00C, --p, K_ECDH_RSA,    B_RC4_128, N);
 
-        // Cipher suites in GCM mode, see RFC 5288/5289.
-        //
-        // We may increase the priority of cipher suites in GCM mode when
-        // GCM technologies become mature in the industry.
-
-        // Suite B compliant cipher suites, see RFC 6460.
-        //
-        // Note that, at present this provider is not Suite B compliant. The
-        // preference order of the GCM cipher suites does not follow the spec
-        // of RFC 6460.
-        add("TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384",
-            0xc02c, --p, K_ECDHE_ECDSA, B_AES_256_GCM, T, max, tls12, P_SHA384);
-        add("TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256",
-            0xc02b, --p, K_ECDHE_ECDSA, B_AES_128_GCM, T, max, tls12, P_SHA256);
-
-        // AES_256(GCM)
-        add("TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",
-            0xc030, --p, K_ECDHE_RSA,   B_AES_256_GCM, T, max, tls12, P_SHA384);
-        add("TLS_RSA_WITH_AES_256_GCM_SHA384",
-            0x009d, --p, K_RSA,         B_AES_256_GCM, T, max, tls12, P_SHA384);
-        add("TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384",
-            0xc02e, --p, K_ECDH_ECDSA,  B_AES_256_GCM, T, max, tls12, P_SHA384);
-        add("TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384",
-            0xc032, --p, K_ECDH_RSA,    B_AES_256_GCM, T, max, tls12, P_SHA384);
-        add("TLS_DHE_RSA_WITH_AES_256_GCM_SHA384",
-            0x009f, --p, K_DHE_RSA,     B_AES_256_GCM, T, max, tls12, P_SHA384);
-        add("TLS_DHE_DSS_WITH_AES_256_GCM_SHA384",
-            0x00a3, --p, K_DHE_DSS,     B_AES_256_GCM, T, max, tls12, P_SHA384);
-
-        // AES_128(GCM)
-        add("TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
-            0xc02f, --p, K_ECDHE_RSA,   B_AES_128_GCM, T, max, tls12, P_SHA256);
-        add("TLS_RSA_WITH_AES_128_GCM_SHA256",
-            0x009c, --p, K_RSA,         B_AES_128_GCM, T, max, tls12, P_SHA256);
-        add("TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256",
-            0xc02d, --p, K_ECDH_ECDSA,  B_AES_128_GCM, T, max, tls12, P_SHA256);
-        add("TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256",
-            0xc031, --p, K_ECDH_RSA,    B_AES_128_GCM, T, max, tls12, P_SHA256);
-        add("TLS_DHE_RSA_WITH_AES_128_GCM_SHA256",
-            0x009e, --p, K_DHE_RSA,     B_AES_128_GCM, T, max, tls12, P_SHA256);
-        add("TLS_DHE_DSS_WITH_AES_128_GCM_SHA256",
-            0x00a2, --p, K_DHE_DSS,     B_AES_128_GCM, T, max, tls12, P_SHA256);
-        // End of cipher suites in GCM mode.
-
-        // 3DES_EDE
         add("TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA",
             0xC008, --p, K_ECDHE_ECDSA, B_3DES,    T);
         add("TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA",
@@ -1145,22 +1024,17 @@ final class CipherSuite implements Comparable<CipherSuite> {
          */
         p = DEFAULT_SUITES_PRIORITY;
 
-        add("TLS_DH_anon_WITH_AES_256_GCM_SHA384",
-            0x00a7, --p, K_DH_ANON,     B_AES_256_GCM, N, max, tls12, P_SHA384);
-        add("TLS_DH_anon_WITH_AES_128_GCM_SHA256",
-            0x00a6, --p, K_DH_ANON,     B_AES_128_GCM, N, max, tls12, P_SHA256);
-
         add("TLS_DH_anon_WITH_AES_256_CBC_SHA256",
             0x006d, --p, K_DH_ANON,     B_AES_256, N, max, tls12, P_SHA256);
         add("TLS_ECDH_anon_WITH_AES_256_CBC_SHA",
-            0xC019, --p, K_ECDH_ANON,   B_AES_256, N);
+            0xC019, --p, K_ECDH_ANON,   B_AES_256, T);
         add("TLS_DH_anon_WITH_AES_256_CBC_SHA",
             0x003a, --p, K_DH_ANON,     B_AES_256, N);
 
         add("TLS_DH_anon_WITH_AES_128_CBC_SHA256",
             0x006c, --p, K_DH_ANON,     B_AES_128, N, max, tls12, P_SHA256);
         add("TLS_ECDH_anon_WITH_AES_128_CBC_SHA",
-            0xC018, --p, K_ECDH_ANON,   B_AES_128, N);
+            0xC018, --p, K_ECDH_ANON,   B_AES_128, T);
         add("TLS_DH_anon_WITH_AES_128_CBC_SHA",
             0x0034, --p, K_DH_ANON,     B_AES_128, N);
 
@@ -1170,7 +1044,7 @@ final class CipherSuite implements Comparable<CipherSuite> {
             0x0018, --p, K_DH_ANON,     B_RC4_128, N);
 
         add("TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA",
-            0xC017, --p, K_ECDH_ANON,   B_3DES,    N);
+            0xC017, --p, K_ECDH_ANON,   B_3DES,    T);
         add("SSL_DH_anon_WITH_3DES_EDE_CBC_SHA",
             0x001b, --p, K_DH_ANON,     B_3DES,    N);
 
@@ -1325,10 +1199,18 @@ final class CipherSuite implements Comparable<CipherSuite> {
         add("TLS_DH_RSA_WITH_AES_256_CBC_SHA256",          0x0069);
 
         // Unsupported cipher suites from RFC 5288
+        add("TLS_RSA_WITH_AES_128_GCM_SHA256",             0x009c);
+        add("TLS_RSA_WITH_AES_256_GCM_SHA384",             0x009d);
+        add("TLS_DHE_RSA_WITH_AES_128_GCM_SHA256",         0x009e);
+        add("TLS_DHE_RSA_WITH_AES_256_GCM_SHA384",         0x009f);
         add("TLS_DH_RSA_WITH_AES_128_GCM_SHA256",          0x00a0);
         add("TLS_DH_RSA_WITH_AES_256_GCM_SHA384",          0x00a1);
+        add("TLS_DHE_DSS_WITH_AES_128_GCM_SHA256",         0x00a2);
+        add("TLS_DHE_DSS_WITH_AES_256_GCM_SHA384",         0x00a3);
         add("TLS_DH_DSS_WITH_AES_128_GCM_SHA256",          0x00a4);
         add("TLS_DH_DSS_WITH_AES_256_GCM_SHA384",          0x00a5);
+        add("TLS_DH_anon_WITH_AES_128_GCM_SHA256",         0x00a6);
+        add("TLS_DH_anon_WITH_AES_256_GCM_SHA384",         0x00a7);
 
         // Unsupported cipher suites from RFC 5487
         add("TLS_PSK_WITH_AES_128_GCM_SHA256",             0x00a8);
@@ -1387,6 +1269,16 @@ final class CipherSuite implements Comparable<CipherSuite> {
         add("TLS_SRP_SHA_RSA_WITH_AES_256_CBC_SHA",        0xc021);
         add("TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA",        0xc022);
 
+        // Unsupported cipher suites from RFC 5289
+        add("TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256",     0xc02b);
+        add("TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384",     0xc02c);
+        add("TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256",      0xc02d);
+        add("TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384",      0xc02e);
+        add("TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",       0xc02f);
+        add("TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",       0xc030);
+        add("TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256",        0xc031);
+        add("TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384",        0xc032);
+
         // Unsupported cipher suites from RFC 5489
         add("TLS_ECDHE_PSK_WITH_RC4_128_SHA",              0xc033);
         add("TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA",         0xc034);
diff --git a/jdk/src/share/classes/sun/security/ssl/EngineInputRecord.java b/jdk/src/share/classes/sun/security/ssl/EngineInputRecord.java
index 0464d5b5de9..6b064385203 100644
--- a/jdk/src/share/classes/sun/security/ssl/EngineInputRecord.java
+++ b/jdk/src/share/classes/sun/security/ssl/EngineInputRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -177,6 +177,71 @@ final class EngineInputRecord extends InputRecord {
         return len;
     }
 
+    /*
+     * Verifies and removes the MAC value.  Returns true if
+     * the MAC checks out OK.
+     *
+     * On entry:
+     *     position = beginning of app/MAC data
+     *     limit = end of MAC data.
+     *
+     * On return:
+     *     position = beginning of app data
+     *     limit = end of app data
+     */
+    boolean checkMAC(MAC signer, ByteBuffer bb) {
+        if (internalData) {
+            return checkMAC(signer);
+        }
+
+        int len = signer.MAClen();
+        if (len == 0) { // no mac
+            return true;
+        }
+
+        /*
+         * Grab the original limit
+         */
+        int lim = bb.limit();
+
+        /*
+         * Delineate the area to apply a MAC on.
+         */
+        int macData = lim - len;
+        bb.limit(macData);
+
+        byte[] mac = signer.compute(contentType(), bb);
+
+        if (len != mac.length) {
+            throw new RuntimeException("Internal MAC error");
+        }
+
+        /*
+         * Delineate the MAC values, position was already set
+         * by doing the compute above.
+         *
+         * We could zero the MAC area, but not much useful information
+         * there anyway.
+         */
+        bb.position(macData);
+        bb.limit(lim);
+
+        try {
+            for (int i = 0; i < len; i++) {
+                if (bb.get() != mac[i]) {  // No BB.equals(byte []); !
+                    return false;
+                }
+            }
+            return true;
+        } finally {
+            /*
+             * Position to the data.
+             */
+            bb.rewind();
+            bb.limit(macData);
+        }
+    }
+
     /*
      * Pass the data down if it's internally cached, otherwise
      * do it here.
@@ -186,85 +251,16 @@ final class EngineInputRecord extends InputRecord {
      * If external data(app), return a new ByteBuffer with data to
      * process.
      */
-    ByteBuffer decrypt(Authenticator authenticator,
-            CipherBox box, ByteBuffer bb) throws BadPaddingException {
+    ByteBuffer decrypt(CipherBox box, ByteBuffer bb)
+            throws BadPaddingException {
 
         if (internalData) {
-            decrypt(authenticator, box);    // MAC is checked during decryption
+            decrypt(box);
             return tmpBB;
         }
 
-        BadPaddingException bpe = null;
-        if (!box.isNullCipher()) {
-            try {
-                // apply explicit nonce for AEAD/CBC cipher suites if needed
-                int nonceSize =
-                    box.applyExplicitNonce(authenticator, contentType(), bb);
-
-                // decrypt the content
-                if (box.isAEADMode()) {
-                    // DON'T encrypt the nonce_explicit for AEAD mode
-                    bb.position(bb.position() + nonceSize);
-                }   // The explicit IV for CBC mode can be decrypted.
-
-                box.decrypt(bb);
-                bb.position(nonceSize); // We don't actually remove the nonce.
-            } catch (BadPaddingException e) {
-                // RFC 2246 states that decryption_failed should be used
-                // for this purpose. However, that allows certain attacks,
-                // so we just send bad record MAC. We also need to make
-                // sure to always check the MAC to avoid a timing attack
-                // for the same issue. See paper by Vaudenay et al and the
-                // update in RFC 4346/5246.
-                //
-                // Failover to message authentication code checking.
-                bpe = new BadPaddingException("invalid padding");
-            }
-        }
-
-        // Requires message authentication code for null, stream and block
-        // cipher suites.
-        if (authenticator instanceof MAC) {
-            MAC signer = (MAC)authenticator;
-            int macLen = signer.MAClen();
-            if (macLen != 0) {
-                if (bb.remaining() < macLen) {
-                    // negative data length, something is wrong
-                    throw new BadPaddingException("bad record");
-                }
-
-                int position = bb.position();
-                int limit = bb.limit();
-                int macOffset = limit - macLen;
-
-                bb.limit(macOffset);
-                byte[] hash = signer.compute(contentType(), bb);
-                if (hash == null || macLen != hash.length) {
-                    // something is wrong with MAC implementation
-                    throw new RuntimeException("Internal MAC error");
-                }
-
-                bb.position(macOffset);
-                bb.limit(limit);
-
-                try {
-                    for (byte b : hash) {       // No BB.equals(byte []); !
-                        if (bb.get() != b) {
-                            throw new BadPaddingException("bad record MAC");
-                        }
-                    }
-                } finally {
-                    // reset to the data
-                    bb.position(position);
-                    bb.limit(macOffset);
-                }
-            }
-        }
-
-        // Is it a failover?
-        if (bpe != null) {
-            throw bpe;
-        }
+        box.decrypt(bb);
+        bb.rewind();
 
         return bb.slice();
     }
@@ -342,8 +338,8 @@ final class EngineInputRecord extends InputRecord {
         if (debug != null && Debug.isOn("packet")) {
             try {
                 HexDumpEncoder hd = new HexDumpEncoder();
+                srcBB.limit(srcPos + len);
                 ByteBuffer bb = srcBB.duplicate();  // Use copy of BB
-                bb.limit(srcPos + len);
 
                 System.out.println("[Raw read (bb)]: length = " + len);
                 hd.encodeBuffer(bb, System.out);
diff --git a/jdk/src/share/classes/sun/security/ssl/EngineOutputRecord.java b/jdk/src/share/classes/sun/security/ssl/EngineOutputRecord.java
index a46a88bf708..e9d39805b36 100644
--- a/jdk/src/share/classes/sun/security/ssl/EngineOutputRecord.java
+++ b/jdk/src/share/classes/sun/security/ssl/EngineOutputRecord.java
@@ -29,6 +29,7 @@ package sun.security.ssl;
 import java.io.*;
 import java.nio.*;
 
+
 /**
  * A OutputRecord class extension which uses external ByteBuffers
  * or the internal ByteArrayOutputStream for data manipulations.
@@ -100,6 +101,51 @@ final class EngineOutputRecord extends OutputRecord {
         return finishedMsg;
     }
 
+
+    /**
+     * Calculate the MAC value, storing the result either in
+     * the internal buffer, or at the end of the destination
+     * ByteBuffer.
+     * <P>
+     * We assume that the higher levels have assured us enough
+     * room, otherwise we'll indirectly throw a
+     * BufferOverFlowException runtime exception.
+     *
+     * position should equal limit, and points to the next
+     * free spot.
+     */
+    private void addMAC(MAC signer, ByteBuffer bb)
+            throws IOException {
+
+        if (signer.MAClen() != 0) {
+            byte[] hash = signer.compute(contentType(), bb);
+
+            /*
+             * position was advanced to limit in compute above.
+             *
+             * Mark next area as writable (above layers should have
+             * established that we have plenty of room), then write
+             * out the hash.
+             */
+            bb.limit(bb.limit() + hash.length);
+            bb.put(hash);
+        }
+    }
+
+    /*
+     * Encrypt a ByteBuffer.
+     *
+     * We assume that the higher levels have assured us enough
+     * room for the encryption (plus padding), otherwise we'll
+     * indirectly throw a BufferOverFlowException runtime exception.
+     *
+     * position and limit will be the same, and points to the
+     * next free spot.
+     */
+    void encrypt(CipherBox box, ByteBuffer bb) {
+        box.encrypt(bb);
+    }
+
     /*
      * Override the actual write below.  We do things this way to be
      * consistent with InputRecord.  InputRecord may try to write out
@@ -114,8 +160,7 @@ final class EngineOutputRecord extends OutputRecord {
          * Copy data out of buffer, it's ready to go.
          */
         ByteBuffer netBB = (ByteBuffer)
-            ByteBuffer.allocate(len).put(buf, off, len).flip();
-
+            ByteBuffer.allocate(len).put(buf, 0, len).flip();
         writer.putOutboundData(netBB);
     }
 
@@ -123,19 +168,17 @@ final class EngineOutputRecord extends OutputRecord {
      * Main method for writing non-application data.
      * We MAC/encrypt, then send down for processing.
      */
-    void write(Authenticator authenticator, CipherBox writeCipher)
-            throws IOException {
-
+    void write(MAC writeMAC, CipherBox writeCipher) throws IOException {
         /*
          * Sanity check.
          */
         switch (contentType()) {
-            case ct_change_cipher_spec:
-            case ct_alert:
-            case ct_handshake:
-                break;
-            default:
-                throw new RuntimeException("unexpected byte buffers");
+        case ct_change_cipher_spec:
+        case ct_alert:
+        case ct_handshake:
+            break;
+        default:
+            throw new RuntimeException("unexpected byte buffers");
         }
 
         /*
@@ -150,10 +193,10 @@ final class EngineOutputRecord extends OutputRecord {
          */
         if (!isEmpty()) {
             // compress();              // eventually
-            encrypt(authenticator, writeCipher);
-
-            // send down for processing
-            write((OutputStream)null, false, (ByteArrayOutputStream)null);
+            addMAC(writeMAC);
+            encrypt(writeCipher);
+            write((OutputStream)null, false,  // send down for processing
+                (ByteArrayOutputStream)null);
         }
         return;
     }
@@ -161,8 +204,8 @@ final class EngineOutputRecord extends OutputRecord {
     /**
      * Main wrap/write driver.
      */
-    void write(EngineArgs ea, Authenticator authenticator,
-            CipherBox writeCipher) throws IOException {
+    void write(EngineArgs ea, MAC writeMAC, CipherBox writeCipher)
+            throws IOException {
         /*
          * sanity check to make sure someone didn't inadvertantly
          * send us an impossible combination we don't know how
@@ -174,7 +217,7 @@ final class EngineOutputRecord extends OutputRecord {
          * Have we set the MAC's yet?  If not, we're not ready
          * to process application data yet.
          */
-        if (authenticator == MAC.NULL) {
+        if (writeMAC == MAC.NULL) {
             return;
         }
 
@@ -212,7 +255,7 @@ final class EngineOutputRecord extends OutputRecord {
          */
         int length;
         if (engine.needToSplitPayload(writeCipher, protocolVersion)) {
-            write(ea, authenticator, writeCipher, 0x01);
+            write(ea, writeMAC, writeCipher, 0x01);
             ea.resetLim();      // reset application data buffer limit
             length = Math.min(ea.getAppRemaining(),
                         maxDataSizeMinusOneByteRecord);
@@ -222,14 +265,14 @@ final class EngineOutputRecord extends OutputRecord {
 
         // Don't bother to really write empty records.
         if (length > 0) {
-            write(ea, authenticator, writeCipher, length);
+            write(ea, writeMAC, writeCipher, length);
         }
 
         return;
     }
 
-    void write(EngineArgs ea, Authenticator authenticator,
-            CipherBox writeCipher, int length) throws IOException {
+    void write(EngineArgs ea, MAC writeMAC, CipherBox writeCipher,
+            int length) throws IOException {
         /*
          * Copy out existing buffer values.
          */
@@ -243,76 +286,39 @@ final class EngineOutputRecord extends OutputRecord {
          * Don't need to worry about SSLv2 rewrites, if we're here,
          * that's long since done.
          */
-        int dstData = dstPos + headerSize + writeCipher.getExplicitNonceSize();
+        int dstData = dstPos + headerSize;
         dstBB.position(dstData);
 
-        /*
-         * transfer application data into the network data buffer
-         */
         ea.gather(length);
-        dstBB.limit(dstBB.position());
-        dstBB.position(dstData);
 
         /*
          * "flip" but skip over header again, add MAC & encrypt
+         * addMAC will expand the limit to reflect the new
+         * data.
          */
-        if (authenticator instanceof MAC) {
-            MAC signer = (MAC)authenticator;
-            if (signer.MAClen() != 0) {
-                byte[] hash = signer.compute(contentType(), dstBB);
+        dstBB.limit(dstBB.position());
+        dstBB.position(dstData);
+        addMAC(writeMAC, dstBB);
 
-                /*
-                 * position was advanced to limit in compute above.
-                 *
-                 * Mark next area as writable (above layers should have
-                 * established that we have plenty of room), then write
-                 * out the hash.
-                 */
-                dstBB.limit(dstBB.limit() + hash.length);
-                dstBB.put(hash);
+        /*
+         * Encrypt may pad, so again the limit may have changed.
+         */
+        dstBB.limit(dstBB.position());
+        dstBB.position(dstData);
+        encrypt(writeCipher, dstBB);
 
-                // reset the position and limit
-                dstBB.limit(dstBB.position());
-                dstBB.position(dstData);
-            }
-        }
-
-        if (!writeCipher.isNullCipher()) {
-            /*
-             * Requires explicit IV/nonce for CBC/AEAD cipher suites for TLS 1.1
-             * or later.
-             */
-            if (protocolVersion.v >= ProtocolVersion.TLS11.v &&
-                    (writeCipher.isCBCMode() || writeCipher.isAEADMode())) {
-                byte[] nonce = writeCipher.createExplicitNonce(
-                        authenticator, contentType(), dstBB.remaining());
-                dstBB.position(dstPos + headerSize);
-                dstBB.put(nonce);
-                if (!writeCipher.isAEADMode()) {
-                    // The explicit IV in TLS 1.1 and later can be encrypted.
-                    dstBB.position(dstPos + headerSize);
-                }   // Otherwise, DON'T encrypt the nonce_explicit for AEAD mode
-            }
-
-            /*
-             * Encrypt may pad, so again the limit may have changed.
-             */
-            writeCipher.encrypt(dstBB, dstLim);
-
-            if ((debug != null) && (Debug.isOn("record") ||
-                    (Debug.isOn("handshake") &&
-                        (contentType() == ct_change_cipher_spec)))) {
+        if (debug != null
+                && (Debug.isOn("record") || Debug.isOn("handshake"))) {
+            if ((debug != null && Debug.isOn("record"))
+                    || contentType() == ct_change_cipher_spec)
                 System.out.println(Thread.currentThread().getName()
                     // v3.0/v3.1 ...
                     + ", WRITE: " + protocolVersion
                     + " " + InputRecord.contentName(contentType())
                     + ", length = " + length);
-            }
-        } else {
-            dstBB.position(dstBB.limit());
         }
 
-        int packetLength = dstBB.limit() - dstPos - headerSize;
+        int packetLength = dstBB.limit() - dstData;
 
         /*
          * Finish out the record header.
@@ -327,5 +333,7 @@ final class EngineOutputRecord extends OutputRecord {
          * Position was already set by encrypt() above.
          */
         dstBB.limit(dstLim);
+
+        return;
     }
 }
diff --git a/jdk/src/share/classes/sun/security/ssl/EngineWriter.java b/jdk/src/share/classes/sun/security/ssl/EngineWriter.java
index c6a26562606..e08dbb06069 100644
--- a/jdk/src/share/classes/sun/security/ssl/EngineWriter.java
+++ b/jdk/src/share/classes/sun/security/ssl/EngineWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -99,8 +99,7 @@ final class EngineWriter {
      * other writeRecord.
      */
     synchronized void writeRecord(EngineOutputRecord outputRecord,
-            Authenticator authenticator,
-            CipherBox writeCipher) throws IOException {
+            MAC writeMAC, CipherBox writeCipher) throws IOException {
 
         /*
          * Only output if we're still open.
@@ -109,7 +108,7 @@ final class EngineWriter {
             throw new IOException("writer side was already closed.");
         }
 
-        outputRecord.write(authenticator, writeCipher);
+        outputRecord.write(writeMAC, writeCipher);
 
         /*
          * Did our handshakers notify that we just sent the
@@ -152,8 +151,7 @@ final class EngineWriter {
      * Return any determined status.
      */
     synchronized HandshakeStatus writeRecord(
-            EngineOutputRecord outputRecord, EngineArgs ea,
-            Authenticator authenticator,
+            EngineOutputRecord outputRecord, EngineArgs ea, MAC writeMAC,
             CipherBox writeCipher) throws IOException {
 
         /*
@@ -183,7 +181,7 @@ final class EngineWriter {
             throw new IOException("The write side was already closed");
         }
 
-        outputRecord.write(ea, authenticator, writeCipher);
+        outputRecord.write(ea, writeMAC, writeCipher);
 
         if (debug != null && Debug.isOn("packet")) {
             dumpPacket(ea, false);
diff --git a/jdk/src/share/classes/sun/security/ssl/Handshaker.java b/jdk/src/share/classes/sun/security/ssl/Handshaker.java
index d03b8f7e5ac..828b60bcab6 100644
--- a/jdk/src/share/classes/sun/security/ssl/Handshaker.java
+++ b/jdk/src/share/classes/sun/security/ssl/Handshaker.java
@@ -49,7 +49,6 @@ import sun.security.ssl.HandshakeMessage.*;
 import sun.security.ssl.CipherSuite.*;
 
 import static sun.security.ssl.CipherSuite.PRF.*;
-import static sun.security.ssl.CipherSuite.CipherType.*;
 
 /**
  * Handshaker ... processes handshake records from an SSL V3.0
@@ -715,47 +714,33 @@ abstract class Handshaker {
     /**
      * Create a new read MAC and return it to caller.
      */
-    Authenticator newReadAuthenticator()
-            throws NoSuchAlgorithmException, InvalidKeyException {
-
-        Authenticator authenticator = null;
-        if (cipherSuite.cipher.cipherType == AEAD_CIPHER) {
-            authenticator = new Authenticator(protocolVersion);
+    MAC newReadMAC() throws NoSuchAlgorithmException, InvalidKeyException {
+        MacAlg macAlg = cipherSuite.macAlg;
+        MAC mac;
+        if (isClient) {
+            mac = macAlg.newMac(protocolVersion, svrMacSecret);
+            svrMacSecret = null;
         } else {
-            MacAlg macAlg = cipherSuite.macAlg;
-            if (isClient) {
-                authenticator = macAlg.newMac(protocolVersion, svrMacSecret);
-                svrMacSecret = null;
-            } else {
-                authenticator = macAlg.newMac(protocolVersion, clntMacSecret);
-                clntMacSecret = null;
-            }
+            mac = macAlg.newMac(protocolVersion, clntMacSecret);
+            clntMacSecret = null;
         }
-
-        return authenticator;
+        return mac;
     }
 
     /**
      * Create a new write MAC and return it to caller.
      */
-    Authenticator newWriteAuthenticator()
-            throws NoSuchAlgorithmException, InvalidKeyException {
-
-        Authenticator authenticator = null;
-        if (cipherSuite.cipher.cipherType == AEAD_CIPHER) {
-            authenticator = new Authenticator(protocolVersion);
+    MAC newWriteMAC() throws NoSuchAlgorithmException, InvalidKeyException {
+        MacAlg macAlg = cipherSuite.macAlg;
+        MAC mac;
+        if (isClient) {
+            mac = macAlg.newMac(protocolVersion, clntMacSecret);
+            clntMacSecret = null;
         } else {
-            MacAlg macAlg = cipherSuite.macAlg;
-            if (isClient) {
-                authenticator = macAlg.newMac(protocolVersion, clntMacSecret);
-                clntMacSecret = null;
-            } else {
-                authenticator = macAlg.newMac(protocolVersion, svrMacSecret);
-                svrMacSecret = null;
-            }
+            mac = macAlg.newMac(protocolVersion, svrMacSecret);
+            svrMacSecret = null;
         }
-
-        return authenticator;
+        return mac;
     }
 
     /*
@@ -1204,23 +1189,11 @@ abstract class Handshaker {
         int prfHashLength = prf.getPRFHashLength();
         int prfBlockSize = prf.getPRFBlockSize();
 
-        // TLS v1.1 or later uses an explicit IV in CBC cipher suites to
-        // protect against the CBC attacks.  AEAD/GCM cipher suites in TLS
-        // v1.2 or later use a fixed IV as the implicit part of the partially
-        // implicit nonce technique described in RFC 5116.
-        int ivSize = cipher.ivSize;
-        if (cipher.cipherType == AEAD_CIPHER) {
-            ivSize = cipher.fixedIvSize;
-        } else if (protocolVersion.v >= ProtocolVersion.TLS11.v &&
-                cipher.cipherType == BLOCK_CIPHER) {
-            ivSize = 0;
-        }
-
         TlsKeyMaterialParameterSpec spec = new TlsKeyMaterialParameterSpec(
             masterKey, protocolVersion.major, protocolVersion.minor,
             clnt_random.random_bytes, svr_random.random_bytes,
             cipher.algorithm, cipher.keySize, expandedKeySize,
-            ivSize, hashSize,
+            cipher.ivSize, hashSize,
             prfHashAlg, prfHashLength, prfBlockSize);
 
         try {
@@ -1228,15 +1201,14 @@ abstract class Handshaker {
             kg.init(spec);
             TlsKeyMaterialSpec keySpec = (TlsKeyMaterialSpec)kg.generateKey();
 
-            // Return null if cipher keys are not supposed to be generated.
             clntWriteKey = keySpec.getClientCipherKey();
             svrWriteKey = keySpec.getServerCipherKey();
 
             // Return null if IVs are not supposed to be generated.
+            // e.g. TLS 1.1+.
             clntWriteIV = keySpec.getClientIv();
             svrWriteIV = keySpec.getServerIv();
 
-            // Return null if MAC keys are not supposed to be generated.
             clntMacSecret = keySpec.getClientMacKey();
             svrMacSecret = keySpec.getServerMacKey();
         } catch (GeneralSecurityException e) {
@@ -1261,14 +1233,10 @@ abstract class Handshaker {
                 printHex(dump, masterKey.getEncoded());
 
                 // Outputs:
-                if (clntMacSecret != null) {
-                    System.out.println("Client MAC write Secret:");
-                    printHex(dump, clntMacSecret.getEncoded());
-                    System.out.println("Server MAC write Secret:");
-                    printHex(dump, svrMacSecret.getEncoded());
-                } else {
-                    System.out.println("... no MAC keys used for this cipher");
-                }
+                System.out.println("Client MAC write Secret:");
+                printHex(dump, clntMacSecret.getEncoded());
+                System.out.println("Server MAC write Secret:");
+                printHex(dump, svrMacSecret.getEncoded());
 
                 if (clntWriteKey != null) {
                     System.out.println("Client write key:");
diff --git a/jdk/src/share/classes/sun/security/ssl/InputRecord.java b/jdk/src/share/classes/sun/security/ssl/InputRecord.java
index 74d88f9b81b..78e866a07ca 100644
--- a/jdk/src/share/classes/sun/security/ssl/InputRecord.java
+++ b/jdk/src/share/classes/sun/security/ssl/InputRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -77,17 +77,6 @@ class InputRecord extends ByteArrayInputStream implements Record {
     /*
      * Construct the record to hold the maximum sized input record.
      * Data will be filled in separately.
-     *
-     * The structure of the byte buffer looks like:
-     *
-     *     |--------+---------+---------------------------------|
-     *     | header |   IV    | content, MAC/TAG, padding, etc. |
-     *     | headerPlusIVSize |
-     *
-     * header: the header of an SSL records
-     * IV:     the optional IV/nonce field, it is only required for block
-     *         (TLS 1.1 or later) and AEAD cipher suites.
-     *
      */
     InputRecord() {
         super(new byte[maxRecordSize]);
@@ -144,83 +133,44 @@ class InputRecord extends ByteArrayInputStream implements Record {
         return handshakeHash;
     }
 
-    void decrypt(Authenticator authenticator,
-            CipherBox box) throws BadPaddingException {
+    /*
+     * Verify and remove the MAC ... used for all records.
+     */
+    boolean checkMAC(MAC signer) {
+        int len = signer.MAClen();
+        if (len == 0) { // no mac
+            return true;
+        }
 
-        BadPaddingException bpe = null;
-        if (!box.isNullCipher()) {
-            try {
-                int cipheredLength = count - headerSize;
+        int offset = count - len;
 
-                // apply explicit nonce for AEAD/CBC cipher suites if needed
-                int nonceSize = box.applyExplicitNonce(authenticator,
-                            contentType(), buf, headerSize, cipheredLength);
-                pos = headerSize + nonceSize;
-                lastHashed = pos;   // don't digest the explicit nonce
+        if (offset < headerSize) {
+            // data length would be negative, something is wrong
+            return false;
+        }
 
-                // decrypt the content
-                int offset = headerSize;
-                if (box.isAEADMode()) {
-                    // DON'T encrypt the nonce_explicit for AEAD mode
-                    offset += nonceSize;
-                }   // The explicit IV for CBC mode can be decrypted.
+        byte[] mac = signer.compute(contentType(), buf,
+            headerSize, offset - headerSize);
 
-                count = offset + box.decrypt(buf, offset, count - offset);
+        if (len != mac.length) {
+            throw new RuntimeException("Internal MAC error");
+        }
 
-                // Note that we don't remove the nonce from the buffer.
-            } catch (BadPaddingException e) {
-                // RFC 2246 states that decryption_failed should be used
-                // for this purpose. However, that allows certain attacks,
-                // so we just send bad record MAC. We also need to make
-                // sure to always check the MAC to avoid a timing attack
-                // for the same issue. See paper by Vaudenay et al and the
-                // update in RFC 4346/5246.
-                //
-                // Failover to message authenticatoin code checking.
-                bpe = new BadPaddingException("invalid padding");
+        for (int i = 0; i < len; i++) {
+            if (buf[offset + i] != mac[i]) {
+                return false;
             }
         }
-
-        // Requires message authentication code for null, stream and block
-        // cipher suites.
-        if (authenticator instanceof MAC) {
-            MAC signer = (MAC)authenticator;
-            int macLen = signer.MAClen();
-            if (macLen != 0) {
-                int macOffset = count - macLen;
-                int contentLen = macOffset - pos;
-                if (contentLen < 0) {
-                    // negative data length, something is wrong
-                    throw new BadPaddingException("bad record");
-                }
-
-                count -= macLen;  // Set the count before any MAC checking
-                                  // exception occurs, so that the following
-                                  // process can read the actual decrypted
-                                  // content (minus the MAC) in the fragment
-                                  // if necessary.
-                byte[] hash = signer.compute(contentType(),
-                                            buf, pos, contentLen);
-                if (hash == null || macLen != hash.length) {
-                    // something is wrong with MAC implementation
-                    throw new RuntimeException("Internal MAC error");
-                }
-
-                int offset = macOffset;
-                for (byte b : hash) {
-                    if (buf[offset++] != b) {
-                        throw new BadPaddingException("bad record MAC");
-                    }
-                }
-            }
-        }
-
-        // Is it a failover?
-        if (bpe != null) {
-            throw bpe;
-        }
+        count -= len;
+        return true;
     }
 
+    void decrypt(CipherBox box) throws BadPaddingException {
+        int len = count - headerSize;
+        count = headerSize + box.decrypt(buf, headerSize, len);
+    }
+
+
     /*
      * Well ... hello_request messages are _never_ hashed since we can't
      * know when they'd appear in the sequence.
diff --git a/jdk/src/share/classes/sun/security/ssl/JsseJce.java b/jdk/src/share/classes/sun/security/ssl/JsseJce.java
index 49e89c6028e..e22caece0e2 100644
--- a/jdk/src/share/classes/sun/security/ssl/JsseJce.java
+++ b/jdk/src/share/classes/sun/security/ssl/JsseJce.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -154,11 +154,6 @@ final class JsseJce {
      * without padding.
      */
     final static String CIPHER_AES = "AES/CBC/NoPadding";
-    /**
-     * JCE transformation string for AES in GCM mode
-     * without padding.
-     */
-    final static String CIPHER_AES_GCM = "AES/GCM/NoPadding";
     /**
      * JCA identifier string for DSA, i.e. a DSA with SHA-1.
      */
diff --git a/jdk/src/share/classes/sun/security/ssl/MAC.java b/jdk/src/share/classes/sun/security/ssl/MAC.java
index 30bf2e2e50f..753a8c57ac4 100644
--- a/jdk/src/share/classes/sun/security/ssl/MAC.java
+++ b/jdk/src/share/classes/sun/security/ssl/MAC.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,15 +39,19 @@ import static sun.security.ssl.CipherSuite.*;
 
 /**
  * This class computes the "Message Authentication Code" (MAC) for each
- * SSL stream and block cipher message.  This is essentially a shared-secret
- * signature, used to provide integrity protection for SSL messages.  The
- * MAC is actually one of several keyed hashes, as associated with the cipher
- * suite and protocol version. (SSL v3.0 uses one construct, TLS uses another.)
+ * SSL message.  This is essentially a shared-secret signature, used to
+ * provide integrity protection for SSL messages.  The MAC is actually
+ * one of several keyed hashes, as associated with the cipher suite and
+ * protocol version.  (SSL v3.0 uses one construct, TLS uses another.)
+ *
+ * <P>NOTE: MAC computation is the only place in the SSL protocol that the
+ * sequence number is used.  It's also reset to zero with each change of
+ * a cipher spec, so this is the only place this state is needed.
  *
  * @author David Brownell
  * @author Andreas Sterbenz
  */
-final class MAC extends Authenticator {
+final class MAC {
 
     final static MAC NULL = new MAC();
 
@@ -60,9 +64,26 @@ final class MAC extends Authenticator {
     // JCE Mac object
     private final Mac mac;
 
+    // byte array containing the additional information we MAC in each record
+    // (see below)
+    private final byte[] block;
+
+    // sequence number + record type + + record length
+    private static final int BLOCK_SIZE_SSL = 8 + 1 + 2;
+
+    // sequence number + record type + protocol version + record length
+    private static final int BLOCK_SIZE_TLS = 8 + 1 + 2 + 2;
+
+    // offset of record type in block
+    private static final int BLOCK_OFFSET_TYPE    = 8;
+
+    // offset of protocol version number in block (TLS only)
+    private static final int BLOCK_OFFSET_VERSION = 8 + 1;
+
     private MAC() {
         macSize = 0;
         mac = null;
+        block = null;
     }
 
     /**
@@ -70,8 +91,6 @@ final class MAC extends Authenticator {
      */
     MAC(MacAlg macAlg, ProtocolVersion protocolVersion, SecretKey key)
             throws NoSuchAlgorithmException, InvalidKeyException {
-        super(protocolVersion);
-
         this.macSize = macAlg.size;
 
         String algorithm;
@@ -91,6 +110,14 @@ final class MAC extends Authenticator {
 
         mac = JsseJce.getMac(algorithm);
         mac.init(key);
+
+        if (tls) {
+            block = new byte[BLOCK_SIZE_TLS];
+            block[BLOCK_OFFSET_VERSION]   = protocolVersion.major;
+            block[BLOCK_OFFSET_VERSION+1] = protocolVersion.minor;
+        } else {
+            block = new byte[BLOCK_SIZE_SSL];
+        }
     }
 
     /**
@@ -109,15 +136,7 @@ final class MAC extends Authenticator {
      * @param len the size of the compressed record
      */
     final byte[] compute(byte type, byte buf[], int offset, int len) {
-        if (macSize == 0) {
-            return nullMAC;
-        }
-
-        byte[] additional = acquireAuthenticationBytes(type, len);
-        mac.update(additional);
-        mac.update(buf, offset, len);
-
-        return mac.doFinal();
+        return compute(type, null, buf, offset, len);
     }
 
     /**
@@ -132,13 +151,78 @@ final class MAC extends Authenticator {
      *          demarcate the data to be MAC'd.
      */
     final byte[] compute(byte type, ByteBuffer bb) {
+        return compute(type, bb, null, 0, bb.remaining());
+    }
+
+    /**
+     * Check whether the sequence number is close to wrap
+     *
+     * Sequence numbers are of type uint64 and may not exceed 2^64-1.
+     * Sequence numbers do not wrap. When the sequence number is near
+     * to wrap, we need to close the connection immediately.
+     */
+    final boolean seqNumOverflow() {
+        /*
+         * Conservatively, we don't allow more records to be generated
+         * when there are only 2^8 sequence numbers left.
+         */
+        return (block != null && mac != null &&
+                block[0] == (byte)0xFF && block[1] == (byte)0xFF &&
+                block[2] == (byte)0xFF && block[3] == (byte)0xFF &&
+                block[4] == (byte)0xFF && block[5] == (byte)0xFF &&
+                block[6] == (byte)0xFF);
+    }
+
+    /*
+     * Check whether to renew the sequence number
+     *
+     * Sequence numbers are of type uint64 and may not exceed 2^64-1.
+     * Sequence numbers do not wrap.  If a TLS
+     * implementation would need to wrap a sequence number, it must
+     * renegotiate instead.
+     */
+    final boolean seqNumIsHuge() {
+        /*
+         * Conservatively, we should ask for renegotiation when there are
+         * only 2^48 sequence numbers left.
+         */
+        return (block != null && mac != null &&
+                block[0] == (byte)0xFF && block[1] == (byte)0xFF);
+    }
+
+    // increment the sequence number in the block array
+    // it is a 64-bit number stored in big-endian format
+    private void incrementSequenceNumber() {
+        int k = 7;
+        while ((k >= 0) && (++block[k] == 0)) {
+            k--;
+        }
+    }
+
+    /*
+     * Compute based on either buffer type, either bb.position/limit
+     * or buf/offset/len.
+     */
+    private byte[] compute(byte type, ByteBuffer bb, byte[] buf,
+            int offset, int len) {
+
         if (macSize == 0) {
             return nullMAC;
         }
 
-        byte[] additional = acquireAuthenticationBytes(type, bb.remaining());
-        mac.update(additional);
-        mac.update(bb);
+        block[BLOCK_OFFSET_TYPE] = type;
+        block[block.length - 2]  = (byte)(len >> 8);
+        block[block.length - 1]  = (byte)(len     );
+
+        mac.update(block);
+        incrementSequenceNumber();
+
+        // content
+        if (bb != null) {
+            mac.update(bb);
+        } else {
+            mac.update(buf, offset, len);
+        }
 
         return mac.doFinal();
     }
diff --git a/jdk/src/share/classes/sun/security/ssl/OutputRecord.java b/jdk/src/share/classes/sun/security/ssl/OutputRecord.java
index d07c779f75e..900003dfd0f 100644
--- a/jdk/src/share/classes/sun/security/ssl/OutputRecord.java
+++ b/jdk/src/share/classes/sun/security/ssl/OutputRecord.java
@@ -54,7 +54,6 @@ class OutputRecord extends ByteArrayOutputStream implements Record {
     private int                 lastHashed;
     private boolean             firstMessage;
     final private byte          contentType;
-    private int                 headerOffset;
 
     // current protocol version, sent as record version
     ProtocolVersion     protocolVersion;
@@ -71,23 +70,6 @@ class OutputRecord extends ByteArrayOutputStream implements Record {
      * Default constructor makes a record supporting the maximum
      * SSL record size.  It allocates the header bytes directly.
      *
-     * The structure of the byte buffer looks like:
-     *
-     *     |---------+--------+-------+---------------------------------|
-     *     | unused  | header |  IV   | content, MAC/TAG, padding, etc. |
-     *     |    headerPlusMaxIVSize   |
-     *
-     * unused: unused part of the buffer of size
-     *
-     *             headerPlusMaxIVSize - header size - IV size
-     *
-     *         When this object is created, we don't know the protocol
-     *         version number, IV length, etc., so reserve space in front
-     *         to avoid extra data movement (copies).
-     * header: the header of an SSL record
-     * IV:     the optional IV/nonce field, it is only required for block
-     *         (TLS 1.1 or later) and AEAD cipher suites.
-     *
      * @param type the content type for the record
      */
     OutputRecord(byte type, int size) {
@@ -95,10 +77,9 @@ class OutputRecord extends ByteArrayOutputStream implements Record {
         this.protocolVersion = ProtocolVersion.DEFAULT;
         this.helloVersion = ProtocolVersion.DEFAULT_HELLO;
         firstMessage = true;
-        count = headerPlusMaxIVSize;
+        count = headerSize;
         contentType = type;
         lastHashed = count;
-        headerOffset = headerPlusMaxIVSize - headerSize;
     }
 
     OutputRecord(byte type) {
@@ -138,9 +119,8 @@ class OutputRecord extends ByteArrayOutputStream implements Record {
     @Override
     public synchronized void reset() {
         super.reset();
-        count = headerPlusMaxIVSize;
+        count = headerSize;
         lastHashed = count;
-        headerOffset = headerPlusMaxIVSize - headerSize;
     }
 
     /*
@@ -193,84 +173,58 @@ class OutputRecord extends ByteArrayOutputStream implements Record {
      * of sending empty records over the network.
      */
     boolean isEmpty() {
-        return count == headerPlusMaxIVSize;
+        return count == headerSize;
     }
 
     /*
-     * Return true if the record is of an alert of the given description.
-     *
-     * Per SSL/TLS specifications, alert messages convey the severity of the
-     * message (warning or fatal) and a description of the alert. An alert
-     * is defined with a two bytes struct, {byte level, byte description},
-     * following after the header bytes.
+     * Return true if the record is of a given alert.
      */
     boolean isAlert(byte description) {
-        if ((count > (headerPlusMaxIVSize + 1)) && (contentType == ct_alert)) {
-            return buf[headerPlusMaxIVSize + 1] == description;
+        // An alert is defined with a two bytes struct,
+        // {byte level, byte description}, following after the header bytes.
+        if (count > (headerSize + 1) && contentType == ct_alert) {
+            return buf[headerSize + 1] == description;
         }
 
         return false;
     }
 
     /*
-     * Encrypt ... length may grow due to block cipher padding, or
-     * message authentication code or tag.
+     * Compute the MAC and append it to this record.  In case we
+     * are automatically flushing a handshake stream, make sure we
+     * have hashed the message first.
      */
-    void encrypt(Authenticator authenticator, CipherBox box)
-            throws IOException {
-
-        // In case we are automatically flushing a handshake stream, make
-        // sure we have hashed the message first.
+    void addMAC(MAC signer) throws IOException {
         //
         // when we support compression, hashing can't go here
         // since it'll need to be done on the uncompressed data,
         // and the MAC applies to the compressed data.
+        //
         if (contentType == ct_handshake) {
             doHashes();
         }
-
-        // Requires message authentication code for stream and block
-        // cipher suites.
-        if (authenticator instanceof MAC) {
-            MAC signer = (MAC)authenticator;
-            if (signer.MAClen() != 0) {
-                byte[] hash = signer.compute(contentType, buf,
-                    headerPlusMaxIVSize, count - headerPlusMaxIVSize);
-                write(hash);
-            }
-        }
-
-        if (!box.isNullCipher()) {
-            // Requires explicit IV/nonce for CBC/AEAD cipher suites for
-            // TLS 1.1 or later.
-            if ((protocolVersion.v >= ProtocolVersion.TLS11.v) &&
-                                    (box.isCBCMode() || box.isAEADMode())) {
-                byte[] nonce = box.createExplicitNonce(authenticator,
-                                    contentType, count - headerPlusMaxIVSize);
-                int offset = headerPlusMaxIVSize - nonce.length;
-                System.arraycopy(nonce, 0, buf, offset, nonce.length);
-                headerOffset = offset - headerSize;
-            } else {
-                headerOffset = headerPlusMaxIVSize - headerSize;
-            }
-
-            // encrypt the content
-            int offset = headerPlusMaxIVSize;
-            if (!box.isAEADMode()) {
-                // The explicit IV can be encrypted.
-                offset = headerOffset + headerSize;
-            }   // Otherwise, DON'T encrypt the nonce_explicit for AEAD mode
-
-            count = offset + box.encrypt(buf, offset, count - offset);
+        if (signer.MAClen() != 0) {
+            byte[] hash = signer.compute(contentType, buf,
+                    headerSize, count - headerSize);
+            write(hash);
         }
     }
 
+    /*
+     * Encrypt ... length may grow due to block cipher padding
+     */
+    void encrypt(CipherBox box) {
+        int len = count - headerSize;
+        count = headerSize + box.encrypt(buf, headerSize, len);
+    }
+
+
     /*
      * Tell how full the buffer is ... for filling it with application or
      * handshake data.
      */
     final int availableDataBytes() {
-        int dataSize = count - headerPlusMaxIVSize;
+        int dataSize = count - headerSize;
         return maxDataSize - dataSize;
     }
 
@@ -316,11 +270,11 @@ class OutputRecord extends ByteArrayOutputStream implements Record {
          * Don't emit content-free records.  (Even change cipher spec
          * messages have a byte of data!)
          */
-        if (count == headerPlusMaxIVSize) {
+        if (count == headerSize) {
             return;
         }
 
-        int length = count - headerOffset - headerSize;
+        int length = count - headerSize;
         // "should" really never write more than about 14 Kb...
         if (length < 0) {
             throw new SSLException("output record size too small: "
@@ -345,9 +299,7 @@ class OutputRecord extends ByteArrayOutputStream implements Record {
          */
          if (firstMessage && useV2Hello()) {
             byte[] v3Msg = new byte[length - 4];
-            System.arraycopy(buf, headerPlusMaxIVSize + 4,
-                                        v3Msg, 0, v3Msg.length);
-            headerOffset = 0;   // reset the header offset
+            System.arraycopy(buf, headerSize + 4, v3Msg, 0, v3Msg.length);
             V3toV2ClientHello(v3Msg);
             handshakeHash.reset();
             lastHashed = 2;
@@ -362,11 +314,11 @@ class OutputRecord extends ByteArrayOutputStream implements Record {
             /*
              * Fill out the header, write it and the message.
              */
-            buf[headerOffset + 0] = contentType;
-            buf[headerOffset + 1] = protocolVersion.major;
-            buf[headerOffset + 2] = protocolVersion.minor;
-            buf[headerOffset + 3] = (byte)(length >> 8);
-            buf[headerOffset + 4] = (byte)(length);
+            buf[0] = contentType;
+            buf[1] = protocolVersion.major;
+            buf[2] = protocolVersion.minor;
+            buf[3] = (byte)(length >> 8);
+            buf[4] = (byte)(length);
         }
         firstMessage = false;
 
@@ -386,8 +338,7 @@ class OutputRecord extends ByteArrayOutputStream implements Record {
              * when holdRecord is true, the implementation in this class
              * will be used.
              */
-            writeBuffer(heldRecordBuffer,
-                        buf, headerOffset, count - headerOffset, debugOffset);
+            writeBuffer(heldRecordBuffer, buf, 0, count, debugOffset);
         } else {
             // It's time to send, do we have buffered data?
             // May or may not have a heldRecordBuffer.
@@ -395,18 +346,15 @@ class OutputRecord extends ByteArrayOutputStream implements Record {
                 int heldLen = heldRecordBuffer.size();
 
                 // Ensure the capacity of this buffer.
-                int newCount = count + heldLen - headerOffset;
-                ensureCapacity(newCount);
+                ensureCapacity(count + heldLen);
 
                 // Slide everything in the buffer to the right.
-                System.arraycopy(buf, headerOffset,
-                                    buf, heldLen, count - headerOffset);
+                System.arraycopy(buf, 0, buf, heldLen, count);
 
                 // Prepend the held record to the buffer.
                 System.arraycopy(
                     heldRecordBuffer.toByteArray(), 0, buf, 0, heldLen);
-                count = newCount;
-                headerOffset = 0;
+                count += heldLen;
 
                 // Clear the held buffer.
                 heldRecordBuffer.reset();
@@ -414,8 +362,7 @@ class OutputRecord extends ByteArrayOutputStream implements Record {
                 // The held buffer has been dumped, set the debug dump offset.
                 debugOffset = heldLen;
             }
-            writeBuffer(s, buf, headerOffset,
-                        count - headerOffset, debugOffset);
+            writeBuffer(s, buf, 0, count, debugOffset);
         }
 
         reset();
@@ -435,11 +382,12 @@ class OutputRecord extends ByteArrayOutputStream implements Record {
         if (debug != null && Debug.isOn("packet")) {
             try {
                 HexDumpEncoder hd = new HexDumpEncoder();
+                ByteBuffer bb = ByteBuffer.wrap(
+                        buf, off + debugOffset, len - debugOffset);
 
                 System.out.println("[Raw write]: length = " +
-                                                    (len - debugOffset));
-                hd.encodeBuffer(new ByteArrayInputStream(buf,
-                    off + debugOffset, len - debugOffset), System.out);
+                    bb.remaining());
+                hd.encodeBuffer(bb, System.out);
             } catch (IOException e) { }
         }
     }
@@ -452,13 +400,8 @@ class OutputRecord extends ByteArrayOutputStream implements Record {
         return firstMessage
             && (helloVersion == ProtocolVersion.SSL20Hello)
             && (contentType == ct_handshake)
-            && (buf[headerOffset + 5] == HandshakeMessage.ht_client_hello)
-                                            //  5: recode header size
-            && (buf[headerPlusMaxIVSize + 4 + 2 + 32] == 0);
-                                            // V3 session ID is empty
-                                            //  4: handshake header size
-                                            //  2: client_version in ClientHello
-                                            // 32: random in ClientHello
+            && (buf[5] == HandshakeMessage.ht_client_hello)
+            && (buf[headerSize + 4+2+32] == 0); // V3 session ID is empty
     }
 
     /*
diff --git a/jdk/src/share/classes/sun/security/ssl/Record.java b/jdk/src/share/classes/sun/security/ssl/Record.java
index ca85a067ae3..0494d9a4583 100644
--- a/jdk/src/share/classes/sun/security/ssl/Record.java
+++ b/jdk/src/share/classes/sun/security/ssl/Record.java
@@ -52,29 +52,20 @@ interface Record {
     static final int    trailerSize = 20;       // SHA1 hash size
     static final int    maxDataSize = 16384;    // 2^14 bytes of data
     static final int    maxPadding = 256;       // block cipher padding
-    static final int    maxIVLength = 256;      // IV length
-
-    /*
-     * The size of the header plus the max IV length
-     */
-    static final int    headerPlusMaxIVSize =
-                                      headerSize        // header
-                                    + maxIVLength;      // iv
+    static final int    maxIVLength = 256;      // block length
 
     /*
      * SSL has a maximum record size.  It's header, (compressed) data,
-     * padding, and a trailer for the message authentication information (MAC
-     * for block and stream ciphers, and message authentication tag for AEAD
-     * ciphers).
-     *
+     * padding, and a trailer for the MAC.
      * Some compression algorithms have rare cases where they expand the data.
      * As we don't support compression at this time, leave that out.
      */
     static final int    maxRecordSize =
-                                      headerPlusMaxIVSize   // header + iv
-                                    + maxDataSize           // data
-                                    + maxPadding            // padding
-                                    + trailerSize;          // MAC or AEAD tag
+                                      headerSize        // header
+                                    + maxIVLength       // iv
+                                    + maxDataSize       // data
+                                    + maxPadding        // padding
+                                    + trailerSize;      // MAC
 
     static final boolean enableCBCProtection =
             Debug.getBooleanProperty("jsse.enableCBCProtection", true);
@@ -86,7 +77,8 @@ interface Record {
     static final int    maxDataSizeMinusOneByteRecord =
                                   maxDataSize       // max data size
                                 - (                 // max one byte record size
-                                      headerPlusMaxIVSize   // header + iv
+                                      headerSize    // header
+                                    + maxIVLength   // iv
                                     + 1             // one byte data
                                     + maxPadding    // padding
                                     + trailerSize   // MAC
@@ -112,10 +104,11 @@ interface Record {
      * Allocate a smaller array.
      */
     static final int    maxAlertRecordSize =
-                                      headerPlusMaxIVSize   // header + iv
-                                    + 2                     // alert
-                                    + maxPadding            // padding
-                                    + trailerSize;          // MAC
+                                      headerSize        // header
+                                    + maxIVLength       // iv
+                                    + 2                 // alert
+                                    + maxPadding        // padding
+                                    + trailerSize;      // MAC
 
     /*
      * The overflow values of integers of 8, 16 and 24 bits.
diff --git a/jdk/src/share/classes/sun/security/ssl/SSLEngineImpl.java b/jdk/src/share/classes/sun/security/ssl/SSLEngineImpl.java
index 2da58577c94..41415337ca1 100644
--- a/jdk/src/share/classes/sun/security/ssl/SSLEngineImpl.java
+++ b/jdk/src/share/classes/sun/security/ssl/SSLEngineImpl.java
@@ -280,7 +280,7 @@ final public class SSLEngineImpl extends SSLEngine {
     /*
      * Crypto state that's reinitialized when the session changes.
      */
-    private Authenticator       readAuthenticator, writeAuthenticator;
+    private MAC                 readMAC, writeMAC;
     private CipherBox           readCipher, writeCipher;
     // NOTE: compression state would be saved here
 
@@ -377,9 +377,9 @@ final public class SSLEngineImpl extends SSLEngine {
          * Note:  compression support would go here too
          */
         readCipher = CipherBox.NULL;
-        readAuthenticator = MAC.NULL;
+        readMAC = MAC.NULL;
         writeCipher = CipherBox.NULL;
-        writeAuthenticator = MAC.NULL;
+        writeMAC = MAC.NULL;
 
         // default security parameters for secure renegotiation
         secureRenegotiation = false;
@@ -586,7 +586,7 @@ final public class SSLEngineImpl extends SSLEngine {
 
         try {
             readCipher = handshaker.newReadCipher();
-            readAuthenticator = handshaker.newReadAuthenticator();
+            readMAC = handshaker.newReadMAC();
         } catch (GeneralSecurityException e) {
             // "can't happen"
             throw new SSLException("Algorithm missing:  ", e);
@@ -622,7 +622,7 @@ final public class SSLEngineImpl extends SSLEngine {
 
         try {
             writeCipher = handshaker.newWriteCipher();
-            writeAuthenticator = handshaker.newWriteAuthenticator();
+            writeMAC = handshaker.newWriteMAC();
         } catch (GeneralSecurityException e) {
             // "can't happen"
             throw new SSLException("Algorithm missing:  ", e);
@@ -958,15 +958,34 @@ final public class SSLEngineImpl extends SSLEngine {
              * throw a fatal alert if the integrity check fails.
              */
             try {
-                decryptedBB = inputRecord.decrypt(
-                                    readAuthenticator, readCipher, readBB);
+                decryptedBB = inputRecord.decrypt(readCipher, readBB);
             } catch (BadPaddingException e) {
+                // RFC 2246 states that decryption_failed should be used
+                // for this purpose. However, that allows certain attacks,
+                // so we just send bad record MAC. We also need to make
+                // sure to always check the MAC to avoid a timing attack
+                // for the same issue. See paper by Vaudenay et al.
+                //
+                // rewind the BB if necessary.
+                readBB.rewind();
+
+                inputRecord.checkMAC(readMAC, readBB);
+
                 // use the same alert types as for MAC failure below
                 byte alertType = (inputRecord.contentType() ==
                     Record.ct_handshake) ?
                         Alerts.alert_handshake_failure :
                         Alerts.alert_bad_record_mac;
-                fatal(alertType, e.getMessage(), e);
+                fatal(alertType, "Invalid padding", e);
+            }
+
+            if (!inputRecord.checkMAC(readMAC, decryptedBB)) {
+                if (inputRecord.contentType() == Record.ct_handshake) {
+                    fatal(Alerts.alert_handshake_failure,
+                        "bad handshake record MAC");
+                } else {
+                    fatal(Alerts.alert_bad_record_mac, "bad record MAC");
+                }
             }
 
             // if (!inputRecord.decompress(c))
@@ -1118,7 +1137,7 @@ final public class SSLEngineImpl extends SSLEngine {
                 hsStatus = getHSStatus(hsStatus);
                 if (connectionState < cs_ERROR && !isInboundDone() &&
                         (hsStatus == HandshakeStatus.NOT_HANDSHAKING)) {
-                    if (checkSequenceNumber(readAuthenticator,
+                    if (checkSequenceNumber(readMAC,
                             inputRecord.contentType())) {
                         hsStatus = getHSStatus(null);
                     }
@@ -1271,7 +1290,7 @@ final public class SSLEngineImpl extends SSLEngine {
 
         // eventually compress as well.
         HandshakeStatus hsStatus =
-                writer.writeRecord(eor, ea, writeAuthenticator, writeCipher);
+                writer.writeRecord(eor, ea, writeMAC, writeCipher);
 
         /*
          * We only need to check the sequence number state for
@@ -1288,7 +1307,7 @@ final public class SSLEngineImpl extends SSLEngine {
         hsStatus = getHSStatus(hsStatus);
         if (connectionState < cs_ERROR && !isOutboundDone() &&
                 (hsStatus == HandshakeStatus.NOT_HANDSHAKING)) {
-            if (checkSequenceNumber(writeAuthenticator, eor.contentType())) {
+            if (checkSequenceNumber(writeMAC, eor.contentType())) {
                 hsStatus = getHSStatus(null);
             }
         }
@@ -1327,7 +1346,7 @@ final public class SSLEngineImpl extends SSLEngine {
      */
     void writeRecord(EngineOutputRecord eor) throws IOException {
         // eventually compress as well.
-        writer.writeRecord(eor, writeAuthenticator, writeCipher);
+        writer.writeRecord(eor, writeMAC, writeCipher);
 
         /*
          * Check the sequence number state
@@ -1341,7 +1360,7 @@ final public class SSLEngineImpl extends SSLEngine {
          * of the last record cannot be wrapped.
          */
         if ((connectionState < cs_ERROR) && !isOutboundDone()) {
-            checkSequenceNumber(writeAuthenticator, eor.contentType());
+            checkSequenceNumber(writeMAC, eor.contentType());
         }
     }
 
@@ -1359,14 +1378,14 @@ final public class SSLEngineImpl extends SSLEngine {
      *
      * Return true if the handshake status may be changed.
      */
-    private boolean checkSequenceNumber(Authenticator authenticator, byte type)
+    private boolean checkSequenceNumber(MAC mac, byte type)
             throws IOException {
 
         /*
          * Don't bother to check the sequence number for error or
          * closed connections, or NULL MAC
          */
-        if (connectionState >= cs_ERROR || authenticator == MAC.NULL) {
+        if (connectionState >= cs_ERROR || mac == MAC.NULL) {
             return false;
         }
 
@@ -1374,7 +1393,7 @@ final public class SSLEngineImpl extends SSLEngine {
          * Conservatively, close the connection immediately when the
          * sequence number is close to overflow
          */
-        if (authenticator.seqNumOverflow()) {
+        if (mac.seqNumOverflow()) {
             /*
              * TLS protocols do not define a error alert for sequence
              * number overflow. We use handshake_failure error alert
@@ -1397,7 +1416,7 @@ final public class SSLEngineImpl extends SSLEngine {
          * Don't bother to kickstart the renegotiation when the local is
          * asking for it.
          */
-        if ((type != Record.ct_handshake) && authenticator.seqNumIsHuge()) {
+        if ((type != Record.ct_handshake) && mac.seqNumIsHuge()) {
             if (debug != null && Debug.isOn("ssl")) {
                 System.out.println(Thread.currentThread().getName() +
                         ", request renegotiation " +
diff --git a/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java b/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java
index 9c8b43f17ad..f807c4c58ce 100644
--- a/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java
+++ b/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java
@@ -292,7 +292,7 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
     /*
      * Crypto state that's reinitialized when the session changes.
      */
-    private Authenticator       readAuthenticator, writeAuthenticator;
+    private MAC                 readMAC, writeMAC;
     private CipherBox           readCipher, writeCipher;
     // NOTE: compression state would be saved here
 
@@ -586,9 +586,9 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
          * Note:  compression support would go here too
          */
         readCipher = CipherBox.NULL;
-        readAuthenticator = MAC.NULL;
+        readMAC = MAC.NULL;
         writeCipher = CipherBox.NULL;
-        writeAuthenticator = MAC.NULL;
+        writeMAC = MAC.NULL;
 
         // initial security parameters for secure renegotiation
         secureRenegotiation = false;
@@ -829,7 +829,8 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
             boolean holdRecord) throws IOException {
 
         // r.compress(c);
-        r.encrypt(writeAuthenticator, writeCipher);
+        r.addMAC(writeMAC);
+        r.encrypt(writeCipher);
 
         if (holdRecord) {
             // If we were requested to delay the record due to possibility
@@ -860,7 +861,7 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
          * of the last record cannot be wrapped.
          */
         if (connectionState < cs_ERROR) {
-            checkSequenceNumber(writeAuthenticator, r.contentType());
+            checkSequenceNumber(writeMAC, r.contentType());
         }
 
         // turn off the flag of the first application record
@@ -985,14 +986,29 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
              * throw a fatal alert if the integrity check fails.
              */
             try {
-                r.decrypt(readAuthenticator, readCipher);
+                r.decrypt(readCipher);
             } catch (BadPaddingException e) {
+                // RFC 2246 states that decryption_failed should be used
+                // for this purpose. However, that allows certain attacks,
+                // so we just send bad record MAC. We also need to make
+                // sure to always check the MAC to avoid a timing attack
+                // for the same issue. See paper by Vaudenay et al.
+                r.checkMAC(readMAC);
                 // use the same alert types as for MAC failure below
                 byte alertType = (r.contentType() == Record.ct_handshake)
                                         ? Alerts.alert_handshake_failure
                                         : Alerts.alert_bad_record_mac;
-                fatal(alertType, e.getMessage(), e);
+                fatal(alertType, "Invalid padding", e);
             }
+            if (!r.checkMAC(readMAC)) {
+                if (r.contentType() == Record.ct_handshake) {
+                    fatal(Alerts.alert_handshake_failure,
+                        "bad handshake record MAC");
+                } else {
+                    fatal(Alerts.alert_bad_record_mac, "bad record MAC");
+                }
+            }
+
 
             // if (!r.decompress(c))
             //     fatal(Alerts.alert_decompression_failure,
@@ -1143,7 +1159,7 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
                * of the last record cannot be wrapped.
                */
               if (connectionState < cs_ERROR) {
-                  checkSequenceNumber(readAuthenticator, r.contentType());
+                  checkSequenceNumber(readMAC, r.contentType());
               }
 
               return;
@@ -1166,14 +1182,14 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
      * implementation would need to wrap a sequence number, it must
      * renegotiate instead."
      */
-    private void checkSequenceNumber(Authenticator authenticator, byte type)
+    private void checkSequenceNumber(MAC mac, byte type)
             throws IOException {
 
         /*
          * Don't bother to check the sequence number for error or
          * closed connections, or NULL MAC.
          */
-        if (connectionState >= cs_ERROR || authenticator == MAC.NULL) {
+        if (connectionState >= cs_ERROR || mac == MAC.NULL) {
             return;
         }
 
@@ -1181,7 +1197,7 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
          * Conservatively, close the connection immediately when the
          * sequence number is close to overflow
          */
-        if (authenticator.seqNumOverflow()) {
+        if (mac.seqNumOverflow()) {
             /*
              * TLS protocols do not define a error alert for sequence
              * number overflow. We use handshake_failure error alert
@@ -1203,7 +1219,7 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
          * Don't bother to kickstart the renegotiation when the local is
          * asking for it.
          */
-        if ((type != Record.ct_handshake) && authenticator.seqNumIsHuge()) {
+        if ((type != Record.ct_handshake) && mac.seqNumIsHuge()) {
             if (debug != null && Debug.isOn("ssl")) {
                 System.out.println(Thread.currentThread().getName() +
                         ", request renegotiation " +
@@ -2065,7 +2081,7 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
 
         try {
             readCipher = handshaker.newReadCipher();
-            readAuthenticator = handshaker.newReadAuthenticator();
+            readMAC = handshaker.newReadMAC();
         } catch (GeneralSecurityException e) {
             // "can't happen"
             throw new SSLException("Algorithm missing:  ", e);
@@ -2096,7 +2112,7 @@ final public class SSLSocketImpl extends BaseSSLSocketImpl {
 
         try {
             writeCipher = handshaker.newWriteCipher();
-            writeAuthenticator = handshaker.newWriteAuthenticator();
+            writeMAC = handshaker.newWriteMAC();
         } catch (GeneralSecurityException e) {
             // "can't happen"
             throw new SSLException("Algorithm missing:  ", e);
diff --git a/jdk/test/sun/security/ec/TestEC.java b/jdk/test/sun/security/ec/TestEC.java
index 77217cae467..41d0f0361da 100644
--- a/jdk/test/sun/security/ec/TestEC.java
+++ b/jdk/test/sun/security/ec/TestEC.java
@@ -21,11 +21,6 @@
  * questions.
  */
 
-//
-// SunJSSE does not support dynamic system properties, no way to re-use
-// system properties in samevm/agentvm mode.
-//
-
 /**
  * @test
  * @bug 6840752
@@ -35,7 +30,7 @@
  * @library ../pkcs11/sslecc
  * @library ../../../java/security/testlibrary
  * @compile -XDignore.symbol.file TestEC.java
- * @run main/othervm TestEC
+ * @run main TestEC
  */
 
 import java.security.NoSuchProviderException;
diff --git a/jdk/test/sun/security/pkcs11/fips/CipherTest.java b/jdk/test/sun/security/pkcs11/fips/CipherTest.java
index 2fc81c49c54..32bc6df4e16 100644
--- a/jdk/test/sun/security/pkcs11/fips/CipherTest.java
+++ b/jdk/test/sun/security/pkcs11/fips/CipherTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -147,25 +147,6 @@ public class CipherTest {
             CS_16("TLS_DH_anon_WITH_AES_128_CBC_SHA256",     0x0303, 0xFFFF),
             CS_17("TLS_RSA_WITH_NULL_SHA256",                0x0303, 0xFFFF),
 
-            CS_20("TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384", 0x0303, 0xFFFF),
-            CS_21("TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256", 0x0303, 0xFFFF),
-            CS_22("TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",   0x0303, 0xFFFF),
-            CS_23("TLS_RSA_WITH_AES_256_GCM_SHA384",         0x0303, 0xFFFF),
-            CS_24("TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384",  0x0303, 0xFFFF),
-            CS_25("TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384",    0x0303, 0xFFFF),
-            CS_26("TLS_DHE_RSA_WITH_AES_256_GCM_SHA384",     0x0303, 0xFFFF),
-            CS_27("TLS_DHE_DSS_WITH_AES_256_GCM_SHA384",     0x0303, 0xFFFF),
-
-            CS_28("TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",   0x0303, 0xFFFF),
-            CS_29("TLS_RSA_WITH_AES_128_GCM_SHA256",         0x0303, 0xFFFF),
-            CS_30("TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256",  0x0303, 0xFFFF),
-            CS_31("TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256",    0x0303, 0xFFFF),
-            CS_32("TLS_DHE_RSA_WITH_AES_128_GCM_SHA256",     0x0303, 0xFFFF),
-            CS_33("TLS_DHE_DSS_WITH_AES_128_GCM_SHA256",     0x0303, 0xFFFF),
-
-            CS_34("TLS_DH_anon_WITH_AES_256_GCM_SHA384",     0x0303, 0xFFFF),
-            CS_35("TLS_DH_anon_WITH_AES_128_GCM_SHA256",     0x0303, 0xFFFF),
-
             // cipher suites obsoleted since TLS 1.2
             CS_50("SSL_RSA_WITH_DES_CBC_SHA",                0x0000, 0x0303),
             CS_51("SSL_DHE_RSA_WITH_DES_CBC_SHA",            0x0000, 0x0303),
diff --git a/jdk/test/sun/security/pkcs11/sslecc/CipherTest.java b/jdk/test/sun/security/pkcs11/sslecc/CipherTest.java
index 26ecec4df0f..64153f58d20 100644
--- a/jdk/test/sun/security/pkcs11/sslecc/CipherTest.java
+++ b/jdk/test/sun/security/pkcs11/sslecc/CipherTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -147,25 +147,6 @@ public class CipherTest {
             CS_16("TLS_DH_anon_WITH_AES_128_CBC_SHA256",     0x0303, 0xFFFF),
             CS_17("TLS_RSA_WITH_NULL_SHA256",                0x0303, 0xFFFF),
 
-            CS_20("TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384", 0x0303, 0xFFFF),
-            CS_21("TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256", 0x0303, 0xFFFF),
-            CS_22("TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",   0x0303, 0xFFFF),
-            CS_23("TLS_RSA_WITH_AES_256_GCM_SHA384",         0x0303, 0xFFFF),
-            CS_24("TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384",  0x0303, 0xFFFF),
-            CS_25("TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384",    0x0303, 0xFFFF),
-            CS_26("TLS_DHE_RSA_WITH_AES_256_GCM_SHA384",     0x0303, 0xFFFF),
-            CS_27("TLS_DHE_DSS_WITH_AES_256_GCM_SHA384",     0x0303, 0xFFFF),
-
-            CS_28("TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",   0x0303, 0xFFFF),
-            CS_29("TLS_RSA_WITH_AES_128_GCM_SHA256",         0x0303, 0xFFFF),
-            CS_30("TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256",  0x0303, 0xFFFF),
-            CS_31("TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256",    0x0303, 0xFFFF),
-            CS_32("TLS_DHE_RSA_WITH_AES_128_GCM_SHA256",     0x0303, 0xFFFF),
-            CS_33("TLS_DHE_DSS_WITH_AES_128_GCM_SHA256",     0x0303, 0xFFFF),
-
-            CS_34("TLS_DH_anon_WITH_AES_256_GCM_SHA384",     0x0303, 0xFFFF),
-            CS_35("TLS_DH_anon_WITH_AES_128_GCM_SHA256",     0x0303, 0xFFFF),
-
             // cipher suites obsoleted since TLS 1.2
             CS_50("SSL_RSA_WITH_DES_CBC_SHA",                0x0000, 0x0303),
             CS_51("SSL_DHE_RSA_WITH_DES_CBC_SHA",            0x0000, 0x0303),
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/SSLEngineBadBufferArrayAccess.java b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/SSLEngineBadBufferArrayAccess.java
index 564342b8ee6..aeaf5792cb9 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/SSLEngineBadBufferArrayAccess.java
+++ b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/SSLEngineBadBufferArrayAccess.java
@@ -21,16 +21,14 @@
  * questions.
  */
 
-//
-// SunJSSE does not support dynamic system properties, no way to re-use
-// system properties in samevm/agentvm mode.
-//
-
 /*
  * @test
  * @bug 7031830
  * @summary bad_record_mac failure on TLSv1.2 enabled connection with SSLEngine
  * @run main/othervm SSLEngineBadBufferArrayAccess
+ *
+ *     SunJSSE does not support dynamic system properties, no way to re-use
+ *     system properties in samevm/agentvm mode.
  */
 
 /**
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/TLSv12/ShortRSAKeyGCM.java b/jdk/test/sun/security/ssl/javax/net/ssl/TLSv12/ShortRSAKeyGCM.java
deleted file mode 100644
index ac78134f6d4..00000000000
--- a/jdk/test/sun/security/ssl/javax/net/ssl/TLSv12/ShortRSAKeyGCM.java
+++ /dev/null
@@ -1,445 +0,0 @@
-/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-//
-// SunJSSE does not support dynamic system properties, no way to re-use
-// system properties in samevm/agentvm mode.
-//
-
-/*
- * @test
- * @bug 7030966
- * @summary Support AEAD CipherSuites
- * @run main/othervm ShortRSAKeyGCM PKIX TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
- * @run main/othervm ShortRSAKeyGCM PKIX TLS_RSA_WITH_AES_128_GCM_SHA256
- * @run main/othervm ShortRSAKeyGCM PKIX TLS_DHE_RSA_WITH_AES_128_GCM_SHA256
- * @run main/othervm ShortRSAKeyGCM PKIX TLS_DH_anon_WITH_AES_128_GCM_SHA256
- */
-
-/*
- * Need additional key materials to run the following cases.
- *
- * @run main/othervm ShortRSAKeyGCM PKIX TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256
- * @run main/othervm ShortRSAKeyGCM PKIX TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
- * @run main/othervm ShortRSAKeyGCM PKIX TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256
- *
- * Need unlimited JCE Unlimited Strength Jurisdiction Policy to run the
- * following cases.
- *
- * @run main/othervm ShortRSAKeyGCM PKIX TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
- * @run main/othervm ShortRSAKeyGCM PKIX TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384
- * @run main/othervm ShortRSAKeyGCM PKIX TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
- * @run main/othervm ShortRSAKeyGCM PKIX TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384
- * @run main/othervm ShortRSAKeyGCM PKIX TLS_RSA_WITH_AES_256_GCM_SHA384
- * @run main/othervm ShortRSAKeyGCM PKIX TLS_DHE_RSA_WITH_AES_256_GCM_SHA384
- * @run main/othervm ShortRSAKeyGCM PKIX TLS_DH_anon_WITH_AES_256_GCM_SHA384
- */
-
-import java.net.*;
-import java.util.*;
-import java.io.*;
-import javax.net.ssl.*;
-import java.security.Security;
-import java.security.KeyStore;
-import java.security.KeyFactory;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateFactory;
-import java.security.spec.*;
-import java.security.interfaces.*;
-import sun.misc.BASE64Decoder;
-
-
-public class ShortRSAKeyGCM {
-
-    /*
-     * =============================================================
-     * Set the various variables needed for the tests, then
-     * specify what tests to run on each side.
-     */
-
-    /*
-     * Should we run the client or server in a separate thread?
-     * Both sides can throw exceptions, but do you have a preference
-     * as to which side should be the main thread.
-     */
-    static boolean separateServerThread = true;
-
-    /*
-     * Where do we find the keystores?
-     */
-    // Certificates and key used in the test.
-    static String trustedCertStr =
-        "-----BEGIN CERTIFICATE-----\n" +
-        "MIICkjCCAfugAwIBAgIBADANBgkqhkiG9w0BAQQFADA7MQswCQYDVQQGEwJVUzEN\n" +
-        "MAsGA1UEChMESmF2YTEdMBsGA1UECxMUU3VuSlNTRSBUZXN0IFNlcml2Y2UwHhcN\n" +
-        "MTEwODE5MDE1MjE5WhcNMzIwNzI5MDE1MjE5WjA7MQswCQYDVQQGEwJVUzENMAsG\n" +
-        "A1UEChMESmF2YTEdMBsGA1UECxMUU3VuSlNTRSBUZXN0IFNlcml2Y2UwgZ8wDQYJ\n" +
-        "KoZIhvcNAQEBBQADgY0AMIGJAoGBAM8orG08DtF98TMSscjGsidd1ZoN4jiDpi8U\n" +
-        "ICz+9dMm1qM1d7O2T+KH3/mxyox7Rc2ZVSCaUD0a3CkhPMnlAx8V4u0H+E9sqso6\n" +
-        "iDW3JpOyzMExvZiRgRG/3nvp55RMIUV4vEHOZ1QbhuqG4ebN0Vz2DkRft7+flthf\n" +
-        "vDld6f5JAgMBAAGjgaUwgaIwHQYDVR0OBBYEFLl81dnfp0wDrv0OJ1sxlWzH83Xh\n" +
-        "MGMGA1UdIwRcMFqAFLl81dnfp0wDrv0OJ1sxlWzH83XhoT+kPTA7MQswCQYDVQQG\n" +
-        "EwJVUzENMAsGA1UEChMESmF2YTEdMBsGA1UECxMUU3VuSlNTRSBUZXN0IFNlcml2\n" +
-        "Y2WCAQAwDwYDVR0TAQH/BAUwAwEB/zALBgNVHQ8EBAMCAQYwDQYJKoZIhvcNAQEE\n" +
-        "BQADgYEALlgaH1gWtoBZ84EW8Hu6YtGLQ/L9zIFmHonUPZwn3Pr//icR9Sqhc3/l\n" +
-        "pVTxOINuFHLRz4BBtEylzRIOPzK3tg8XwuLb1zd0db90x3KBCiAL6E6cklGEPwLe\n" +
-        "XYMHDn9eDsaq861Tzn6ZwzMgw04zotPMoZN0mVd/3Qca8UJFucE=\n" +
-        "-----END CERTIFICATE-----";
-
-    static String targetCertStr =
-        "-----BEGIN CERTIFICATE-----\n" +
-        "MIICNDCCAZ2gAwIBAgIBDDANBgkqhkiG9w0BAQQFADA7MQswCQYDVQQGEwJVUzEN\n" +
-        "MAsGA1UEChMESmF2YTEdMBsGA1UECxMUU3VuSlNTRSBUZXN0IFNlcml2Y2UwHhcN\n" +
-        "MTExMTA3MTM1NTUyWhcNMzEwNzI1MTM1NTUyWjBPMQswCQYDVQQGEwJVUzENMAsG\n" +
-        "A1UEChMESmF2YTEdMBsGA1UECxMUU3VuSlNTRSBUZXN0IFNlcml2Y2UxEjAQBgNV\n" +
-        "BAMTCWxvY2FsaG9zdDBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQC3Pb49OSPfOD2G\n" +
-        "HSXFCFx1GJEZfqG9ZUf7xuIi/ra5dLjPGAaoY5QF2QOa8VnOriQCXDfyXHxsuRnE\n" +
-        "OomxL7EVAgMBAAGjeDB2MAsGA1UdDwQEAwID6DAdBgNVHQ4EFgQUXNCJK3/dtCIc\n" +
-        "xb+zlA/JINlvs/MwHwYDVR0jBBgwFoAUuXzV2d+nTAOu/Q4nWzGVbMfzdeEwJwYD\n" +
-        "VR0lBCAwHgYIKwYBBQUHAwEGCCsGAQUFBwMCBggrBgEFBQcDAzANBgkqhkiG9w0B\n" +
-        "AQQFAAOBgQB2qIDUxA2caMPpGtUACZAPRUtrGssCINIfItETXJZCx/cRuZ5sP4D9\n" +
-        "N1acoNDn0hCULe3lhXAeTC9NZ97680yJzregQMV5wATjo1FGsKY30Ma+sc/nfzQW\n" +
-        "+h/7RhYtoG0OTsiaDCvyhI6swkNJzSzrAccPY4+ZgU8HiDLzZTmM3Q==\n" +
-        "-----END CERTIFICATE-----";
-
-    // Private key in the format of PKCS#8, key size is 512 bits.
-    static String targetPrivateKey =
-        "MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAtz2+PTkj3zg9hh0l\n" +
-        "xQhcdRiRGX6hvWVH+8biIv62uXS4zxgGqGOUBdkDmvFZzq4kAlw38lx8bLkZxDqJ\n" +
-        "sS+xFQIDAQABAkByx/5Oo2hQ/w2q4L8z+NTRlJ3vdl8iIDtC/4XPnfYfnGptnpG6\n" +
-        "ZThQRvbMZiai0xHQPQMszvAHjZVme1eDl3EBAiEA3aKJHynPVCEJhpfCLWuMwX5J\n" +
-        "1LntwJO7NTOyU5m8rPECIQDTpzn5X44r2rzWBDna/Sx7HW9IWCxNgUD2Eyi2nA7W\n" +
-        "ZQIgJerEorw4aCAuzQPxiGu57PB6GRamAihEAtoRTBQlH0ECIQDN08FgTtnesgCU\n" +
-        "DFYLLcw1CiHvc7fZw4neBDHCrC8NtQIgA8TOUkGnpCZlQ0KaI8KfKWI+vxFcgFnH\n" +
-        "3fnqsTgaUs4=";
-
-    static char passphrase[] = "passphrase".toCharArray();
-
-    /*
-     * Is the server ready to serve?
-     */
-    volatile static boolean serverReady = false;
-
-    /*
-     * Turn on SSL debugging?
-     */
-    static boolean debug = false;
-
-    /*
-     * Define the server side of the test.
-     *
-     * If the server prematurely exits, serverReady will be set to true
-     * to avoid infinite hangs.
-     */
-    void doServerSide() throws Exception {
-        SSLContext context = generateSSLContext(null, targetCertStr,
-                                            targetPrivateKey);
-        SSLServerSocketFactory sslssf = context.getServerSocketFactory();
-        SSLServerSocket sslServerSocket =
-            (SSLServerSocket)sslssf.createServerSocket(serverPort);
-        serverPort = sslServerSocket.getLocalPort();
-
-        /*
-         * Signal Client, we're ready for his connect.
-         */
-        serverReady = true;
-
-        SSLSocket sslSocket = (SSLSocket)sslServerSocket.accept();
-        sslSocket.setEnabledCipherSuites(sslSocket.getSupportedCipherSuites());
-        InputStream sslIS = sslSocket.getInputStream();
-        OutputStream sslOS = sslSocket.getOutputStream();
-
-        sslIS.read();
-        sslOS.write('A');
-        sslOS.flush();
-
-        sslSocket.close();
-    }
-
-    /*
-     * Define the client side of the test.
-     *
-     * If the server prematurely exits, serverReady will be set to true
-     * to avoid infinite hangs.
-     */
-    void doClientSide() throws Exception {
-
-        /*
-         * Wait for server to get started.
-         */
-        while (!serverReady) {
-            Thread.sleep(50);
-        }
-
-        SSLContext context = generateSSLContext(trustedCertStr, null, null);
-        SSLSocketFactory sslsf = context.getSocketFactory();
-
-        SSLSocket sslSocket =
-            (SSLSocket)sslsf.createSocket("localhost", serverPort);
-
-        // enable TLSv1.2 only
-        sslSocket.setEnabledProtocols(new String[] {"TLSv1.2"});
-
-        // enable a block cipher
-        sslSocket.setEnabledCipherSuites(new String[] {cipherSuite});
-
-        InputStream sslIS = sslSocket.getInputStream();
-        OutputStream sslOS = sslSocket.getOutputStream();
-
-        sslOS.write('B');
-        sslOS.flush();
-        sslIS.read();
-
-        sslSocket.close();
-    }
-
-    /*
-     * =============================================================
-     * The remainder is just support stuff
-     */
-    private static String tmAlgorithm;        // trust manager
-    private static String cipherSuite;        // cipher suite
-
-    private static void parseArguments(String[] args) {
-        tmAlgorithm = args[0];
-        cipherSuite = args[1];
-    }
-
-    private static SSLContext generateSSLContext(String trustedCertStr,
-            String keyCertStr, String keySpecStr) throws Exception {
-
-        // generate certificate from cert string
-        CertificateFactory cf = CertificateFactory.getInstance("X.509");
-
-        // create a key store
-        KeyStore ks = KeyStore.getInstance("JKS");
-        ks.load(null, null);
-
-        // import the trused cert
-        Certificate trusedCert = null;
-        ByteArrayInputStream is = null;
-        if (trustedCertStr != null) {
-            is = new ByteArrayInputStream(trustedCertStr.getBytes());
-            trusedCert = cf.generateCertificate(is);
-            is.close();
-
-            ks.setCertificateEntry("RSA Export Signer", trusedCert);
-        }
-
-        if (keyCertStr != null) {
-            // generate the private key.
-            PKCS8EncodedKeySpec priKeySpec = new PKCS8EncodedKeySpec(
-                                new BASE64Decoder().decodeBuffer(keySpecStr));
-            KeyFactory kf = KeyFactory.getInstance("RSA");
-            RSAPrivateKey priKey =
-                    (RSAPrivateKey)kf.generatePrivate(priKeySpec);
-
-            // generate certificate chain
-            is = new ByteArrayInputStream(keyCertStr.getBytes());
-            Certificate keyCert = cf.generateCertificate(is);
-            is.close();
-
-            Certificate[] chain = null;
-            if (trusedCert != null) {
-                chain = new Certificate[2];
-                chain[0] = keyCert;
-                chain[1] = trusedCert;
-            } else {
-                chain = new Certificate[1];
-                chain[0] = keyCert;
-            }
-
-            // import the key entry.
-            ks.setKeyEntry("Whatever", priKey, passphrase, chain);
-        }
-
-        // create SSL context
-        TrustManagerFactory tmf = TrustManagerFactory.getInstance(tmAlgorithm);
-        tmf.init(ks);
-
-        SSLContext ctx = SSLContext.getInstance("TLS");
-        if (keyCertStr != null && !keyCertStr.isEmpty()) {
-            KeyManagerFactory kmf = KeyManagerFactory.getInstance("NewSunX509");
-            kmf.init(ks, passphrase);
-
-            ctx.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
-            ks = null;
-        } else {
-            ctx.init(null, tmf.getTrustManagers(), null);
-        }
-
-        return ctx;
-    }
-
-
-    // use any free port by default
-    volatile int serverPort = 0;
-
-    volatile Exception serverException = null;
-    volatile Exception clientException = null;
-
-    public static void main(String[] args) throws Exception {
-        // reset the security property to make sure that the algorithms
-        // and keys used in this test are not disabled.
-        Security.setProperty("jdk.certpath.disabledAlgorithms", "MD2");
-
-        if (debug) {
-            System.setProperty("javax.net.debug", "all");
-        }
-
-        /*
-         * Get the customized arguments.
-         */
-        parseArguments(args);
-
-        /*
-         * Start the tests.
-         */
-        new ShortRSAKeyGCM();
-    }
-
-    Thread clientThread = null;
-    Thread serverThread = null;
-
-    /*
-     * Primary constructor, used to drive remainder of the test.
-     *
-     * Fork off the other side, then do your work.
-     */
-    ShortRSAKeyGCM() throws Exception {
-        try {
-            if (separateServerThread) {
-                startServer(true);
-                startClient(false);
-            } else {
-                startClient(true);
-                startServer(false);
-            }
-        } catch (Exception e) {
-            // swallow for now.  Show later
-        }
-
-        /*
-         * Wait for other side to close down.
-         */
-        if (separateServerThread) {
-            serverThread.join();
-        } else {
-            clientThread.join();
-        }
-
-        /*
-         * When we get here, the test is pretty much over.
-         * Which side threw the error?
-         */
-        Exception local;
-        Exception remote;
-        String whichRemote;
-
-        if (separateServerThread) {
-            remote = serverException;
-            local = clientException;
-            whichRemote = "server";
-        } else {
-            remote = clientException;
-            local = serverException;
-            whichRemote = "client";
-        }
-
-        /*
-         * If both failed, return the curthread's exception, but also
-         * print the remote side Exception
-         */
-        if ((local != null) && (remote != null)) {
-            System.out.println(whichRemote + " also threw:");
-            remote.printStackTrace();
-            System.out.println();
-            throw local;
-        }
-
-        if (remote != null) {
-            throw remote;
-        }
-
-        if (local != null) {
-            throw local;
-        }
-    }
-
-    void startServer(boolean newThread) throws Exception {
-        if (newThread) {
-            serverThread = new Thread() {
-                public void run() {
-                    try {
-                        doServerSide();
-                    } catch (Exception e) {
-                        /*
-                         * Our server thread just died.
-                         *
-                         * Release the client, if not active already...
-                         */
-                        System.err.println("Server died..." + e);
-                        serverReady = true;
-                        serverException = e;
-                    }
-                }
-            };
-            serverThread.start();
-        } else {
-            try {
-                doServerSide();
-            } catch (Exception e) {
-                serverException = e;
-            } finally {
-                serverReady = true;
-            }
-        }
-    }
-
-    void startClient(boolean newThread) throws Exception {
-        if (newThread) {
-            clientThread = new Thread() {
-                public void run() {
-                    try {
-                        doClientSide();
-                    } catch (Exception e) {
-                        /*
-                         * Our client thread just died.
-                         */
-                        System.err.println("Client died..." + e);
-                        clientException = e;
-                    }
-                }
-            };
-            clientThread.start();
-        } else {
-            try {
-                doClientSide();
-            } catch (Exception e) {
-                clientException = e;
-            }
-        }
-    }
-}
diff --git a/jdk/test/sun/security/ssl/sanity/ciphersuites/CipherSuitesInOrder.java b/jdk/test/sun/security/ssl/sanity/ciphersuites/CipherSuitesInOrder.java
index 9dc1a923dc9..3d081c1bd40 100644
--- a/jdk/test/sun/security/ssl/sanity/ciphersuites/CipherSuitesInOrder.java
+++ b/jdk/test/sun/security/ssl/sanity/ciphersuites/CipherSuitesInOrder.java
@@ -21,15 +21,13 @@
  * questions.
  */
 
-//
-// SunJSSE does not support dynamic system properties, no way to re-use
-// system properties in samevm/agentvm mode.
-//
-
 /*
  * @test
  * @bug 7174244
  * @summary NPE in Krb5ProxyImpl.getServerKeys()
+ *
+ *     SunJSSE does not support dynamic system properties, no way to re-use
+ *     system properties in samevm/agentvm mode.
  * @run main/othervm CipherSuitesInOrder
  */
 
@@ -74,22 +72,6 @@ public class CipherSuitesInOrder {
         "SSL_RSA_WITH_RC4_128_SHA",
         "TLS_ECDH_ECDSA_WITH_RC4_128_SHA",
         "TLS_ECDH_RSA_WITH_RC4_128_SHA",
-
-        "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384",
-        "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256",
-        "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",
-        "TLS_RSA_WITH_AES_256_GCM_SHA384",
-        "TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384",
-        "TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384",
-        "TLS_DHE_RSA_WITH_AES_256_GCM_SHA384",
-        "TLS_DHE_DSS_WITH_AES_256_GCM_SHA384",
-        "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
-        "TLS_RSA_WITH_AES_128_GCM_SHA256",
-        "TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256",
-        "TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256",
-        "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256",
-        "TLS_DHE_DSS_WITH_AES_128_GCM_SHA256",
-
         "TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA",
         "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA",
         "SSL_RSA_WITH_3DES_EDE_CBC_SHA",
@@ -101,9 +83,6 @@ public class CipherSuitesInOrder {
 
         "TLS_EMPTY_RENEGOTIATION_INFO_SCSV",
 
-        "TLS_DH_anon_WITH_AES_256_GCM_SHA384",
-        "TLS_DH_anon_WITH_AES_128_GCM_SHA256",
-
         "TLS_DH_anon_WITH_AES_256_CBC_SHA256",
         "TLS_ECDH_anon_WITH_AES_256_CBC_SHA",
         "TLS_DH_anon_WITH_AES_256_CBC_SHA",
diff --git a/jdk/test/sun/security/ssl/sanity/interop/CipherTest.java b/jdk/test/sun/security/ssl/sanity/interop/CipherTest.java
index 106d4a75e53..9c5af7eda4a 100644
--- a/jdk/test/sun/security/ssl/sanity/interop/CipherTest.java
+++ b/jdk/test/sun/security/ssl/sanity/interop/CipherTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -148,25 +148,6 @@ public class CipherTest {
             CS_16("TLS_DH_anon_WITH_AES_128_CBC_SHA256",     0x0303, 0xFFFF),
             CS_17("TLS_RSA_WITH_NULL_SHA256",                0x0303, 0xFFFF),
 
-            CS_20("TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384", 0x0303, 0xFFFF),
-            CS_21("TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256", 0x0303, 0xFFFF),
-            CS_22("TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",   0x0303, 0xFFFF),
-            CS_23("TLS_RSA_WITH_AES_256_GCM_SHA384",         0x0303, 0xFFFF),
-            CS_24("TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384",  0x0303, 0xFFFF),
-            CS_25("TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384",    0x0303, 0xFFFF),
-            CS_26("TLS_DHE_RSA_WITH_AES_256_GCM_SHA384",     0x0303, 0xFFFF),
-            CS_27("TLS_DHE_DSS_WITH_AES_256_GCM_SHA384",     0x0303, 0xFFFF),
-
-            CS_28("TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",   0x0303, 0xFFFF),
-            CS_29("TLS_RSA_WITH_AES_128_GCM_SHA256",         0x0303, 0xFFFF),
-            CS_30("TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256",  0x0303, 0xFFFF),
-            CS_31("TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256",    0x0303, 0xFFFF),
-            CS_32("TLS_DHE_RSA_WITH_AES_128_GCM_SHA256",     0x0303, 0xFFFF),
-            CS_33("TLS_DHE_DSS_WITH_AES_128_GCM_SHA256",     0x0303, 0xFFFF),
-
-            CS_34("TLS_DH_anon_WITH_AES_256_GCM_SHA384",     0x0303, 0xFFFF),
-            CS_35("TLS_DH_anon_WITH_AES_128_GCM_SHA256",     0x0303, 0xFFFF),
-
             // cipher suites obsoleted since TLS 1.2
             CS_50("SSL_RSA_WITH_DES_CBC_SHA",                0x0000, 0x0303),
             CS_51("SSL_DHE_RSA_WITH_DES_CBC_SHA",            0x0000, 0x0303),
diff --git a/jdk/test/sun/security/ssl/templates/SSLSocketSSLEngineTemplate.java b/jdk/test/sun/security/ssl/templates/SSLSocketSSLEngineTemplate.java
index 6bd63ae7104..e31409a0f74 100644
--- a/jdk/test/sun/security/ssl/templates/SSLSocketSSLEngineTemplate.java
+++ b/jdk/test/sun/security/ssl/templates/SSLSocketSSLEngineTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,15 +21,14 @@
  * questions.
  */
 
-//
-// SunJSSE does not support dynamic system properties, no way to re-use
-// system properties in samevm/agentvm mode.
-//
-
 /*
  * @test
  * @bug 7105780
  * @summary Add SSLSocket client/SSLEngine server to templates directory.
+ *
+ *     SunJSSE does not support dynamic system properties, no way to re-use
+ *     system properties in samevm/agentvm mode.
+ *
  * @run main/othervm SSLSocketSSLEngineTemplate
  */
 

From 70b26044ba6130ab3b7fc17d7ac7abe116e204ed Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Wed, 13 Mar 2013 09:10:35 -0400
Subject: [PATCH 300/311] 8009836: nsk/regression/b4222717 fails with empty
 stack trace

Some zeroing was missed for bug 8003553, causing empty stack traces and Xcom crashes, add back zeroing to metablock

Reviewed-by: dholmes, rbackman
---
 hotspot/src/share/vm/memory/metablock.cpp | 5 +++--
 hotspot/src/share/vm/oops/constMethod.cpp | 3 ++-
 hotspot/src/share/vm/oops/method.cpp      | 3 +++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/hotspot/src/share/vm/memory/metablock.cpp b/hotspot/src/share/vm/memory/metablock.cpp
index 7ffaec57f71..450d2c3193d 100644
--- a/hotspot/src/share/vm/memory/metablock.cpp
+++ b/hotspot/src/share/vm/memory/metablock.cpp
@@ -65,9 +65,10 @@ Metablock* Metablock::initialize(MetaWord* p, size_t word_size) {
   }
 
   Metablock* result = (Metablock*) p;
+
+  // Clear the memory
+  Copy::fill_to_aligned_words((HeapWord*)result, word_size);
 #ifdef ASSERT
-  // Add just to catch missing initializations
-  Copy::fill_to_words((HeapWord*) result, word_size, 0xf1f1f1f1);
   result->set_word_size(word_size);
 #endif
   return result;
diff --git a/hotspot/src/share/vm/oops/constMethod.cpp b/hotspot/src/share/vm/oops/constMethod.cpp
index ad02e5df35b..dfee4244920 100644
--- a/hotspot/src/share/vm/oops/constMethod.cpp
+++ b/hotspot/src/share/vm/oops/constMethod.cpp
@@ -55,7 +55,7 @@ ConstMethod::ConstMethod(int byte_code_size,
   set_stackmap_data(NULL);
   set_code_size(byte_code_size);
   set_constMethod_size(size);
-  set_inlined_tables_length(sizes);
+  set_inlined_tables_length(sizes); // sets _flags
   set_method_type(method_type);
   assert(this->size() == size, "wrong size for object");
   set_name_index(0);
@@ -64,6 +64,7 @@ ConstMethod::ConstMethod(int byte_code_size,
   set_max_stack(0);
   set_max_locals(0);
   set_method_idnum(0);
+  set_size_of_parameters(0);
 }
 
 
diff --git a/hotspot/src/share/vm/oops/method.cpp b/hotspot/src/share/vm/oops/method.cpp
index da19ccaad31..0ee78f17605 100644
--- a/hotspot/src/share/vm/oops/method.cpp
+++ b/hotspot/src/share/vm/oops/method.cpp
@@ -87,6 +87,9 @@ Method::Method(ConstMethod* xconst, AccessFlags access_flags, int size) {
 #endif
   set_intrinsic_id(vmIntrinsics::_none);
   set_jfr_towrite(false);
+  set_force_inline(false);
+  set_hidden(false);
+  set_dont_inline(false);
   set_method_data(NULL);
   set_interpreter_throwout_count(0);
   set_vtable_index(Method::garbage_vtable_index);

From b243475fd27dbb37d9def8075a4adc1815545606 Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Wed, 13 Mar 2013 15:15:56 -0400
Subject: [PATCH 301/311] 8009829: CDS: JDK JPRT test fails crash in
 Symbol::equals()

-Xshare:dump was creating a Symbol in C_heap.  There's an assert there that jdk jprt wasn't hitting because it was only done in product

Reviewed-by: dholmes, hseigel, iklam
---
 hotspot/src/share/vm/classfile/symbolTable.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/hotspot/src/share/vm/classfile/symbolTable.cpp b/hotspot/src/share/vm/classfile/symbolTable.cpp
index 87de232d7a5..fc19dd55564 100644
--- a/hotspot/src/share/vm/classfile/symbolTable.cpp
+++ b/hotspot/src/share/vm/classfile/symbolTable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,18 +49,17 @@ Symbol* SymbolTable::allocate_symbol(const u1* name, int len, bool c_heap, TRAPS
 
   Symbol* sym;
 
-  if (c_heap) {
+  if (DumpSharedSpaces) {
+    // Allocate all symbols to CLD shared metaspace
+    sym = new (len, ClassLoaderData::the_null_class_loader_data(), THREAD) Symbol(name, len, -1);
+  } else if (c_heap) {
     // refcount starts as 1
-    assert(!DumpSharedSpaces, "never allocate to C heap");
     sym = new (len, THREAD) Symbol(name, len, 1);
     assert(sym != NULL, "new should call vm_exit_out_of_memory if C_HEAP is exhausted");
   } else {
-    if (DumpSharedSpaces) {
-      sym = new (len, ClassLoaderData::the_null_class_loader_data(), THREAD) Symbol(name, len, -1);
-  } else {
+    // Allocate to global arena
     sym = new (len, arena(), THREAD) Symbol(name, len, -1);
   }
-  }
   return sym;
 }
 

From c5867cb71b375e548b7c72339172833e07867af0 Mon Sep 17 00:00:00 2001
From: Coleen Phillimore <coleenp@openjdk.org>
Date: Wed, 13 Mar 2013 17:34:29 -0400
Subject: [PATCH 302/311] 8003419: NPG: Clean up metadata created during class
 loading if failure

Store metadata on ClassFileParser instance to be cleaned up by destructor.  This enabled some refactoring of the enormous parseClassFile function.

Reviewed-by: jmasa, acorn
---
 .../share/vm/classfile/classFileParser.cpp    | 1958 ++++++++---------
 .../share/vm/classfile/classFileParser.hpp    |  164 +-
 hotspot/src/share/vm/oops/constMethod.cpp     |    6 +
 hotspot/src/share/vm/oops/constMethod.hpp     |    1 +
 hotspot/src/share/vm/oops/instanceKlass.cpp   |  110 +-
 hotspot/src/share/vm/oops/instanceKlass.hpp   |   21 +-
 6 files changed, 1155 insertions(+), 1105 deletions(-)

diff --git a/hotspot/src/share/vm/classfile/classFileParser.cpp b/hotspot/src/share/vm/classfile/classFileParser.cpp
index 005bda61bd3..9f2a9f419a4 100644
--- a/hotspot/src/share/vm/classfile/classFileParser.cpp
+++ b/hotspot/src/share/vm/classfile/classFileParser.cpp
@@ -90,8 +90,7 @@
 // Extension method support.
 #define JAVA_8_VERSION                    52
 
-
-void ClassFileParser::parse_constant_pool_entries(ClassLoaderData* loader_data, constantPoolHandle cp, int length, TRAPS) {
+void ClassFileParser::parse_constant_pool_entries(int length, TRAPS) {
   // Use a local copy of ClassFileStream. It helps the C++ compiler to optimize
   // this function (_current can be allocated in a register, with scalar
   // replacement of aggregates). The _current pointer is copied back to
@@ -104,7 +103,7 @@ void ClassFileParser::parse_constant_pool_entries(ClassLoaderData* loader_data,
   assert(cfs->allocated_on_stack(),"should be local");
   u1* old_current = cfs0->current();
 #endif
-  Handle class_loader(THREAD, loader_data->class_loader());
+  Handle class_loader(THREAD, _loader_data->class_loader());
 
   // Used for batching symbol allocations.
   const char* names[SymbolTable::symbol_alloc_batch_size];
@@ -124,7 +123,7 @@ void ClassFileParser::parse_constant_pool_entries(ClassLoaderData* loader_data,
         {
           cfs->guarantee_more(3, CHECK);  // name_index, tag/access_flags
           u2 name_index = cfs->get_u2_fast();
-          cp->klass_index_at_put(index, name_index);
+          _cp->klass_index_at_put(index, name_index);
         }
         break;
       case JVM_CONSTANT_Fieldref :
@@ -132,7 +131,7 @@ void ClassFileParser::parse_constant_pool_entries(ClassLoaderData* loader_data,
           cfs->guarantee_more(5, CHECK);  // class_index, name_and_type_index, tag/access_flags
           u2 class_index = cfs->get_u2_fast();
           u2 name_and_type_index = cfs->get_u2_fast();
-          cp->field_at_put(index, class_index, name_and_type_index);
+          _cp->field_at_put(index, class_index, name_and_type_index);
         }
         break;
       case JVM_CONSTANT_Methodref :
@@ -140,7 +139,7 @@ void ClassFileParser::parse_constant_pool_entries(ClassLoaderData* loader_data,
           cfs->guarantee_more(5, CHECK);  // class_index, name_and_type_index, tag/access_flags
           u2 class_index = cfs->get_u2_fast();
           u2 name_and_type_index = cfs->get_u2_fast();
-          cp->method_at_put(index, class_index, name_and_type_index);
+          _cp->method_at_put(index, class_index, name_and_type_index);
         }
         break;
       case JVM_CONSTANT_InterfaceMethodref :
@@ -148,14 +147,14 @@ void ClassFileParser::parse_constant_pool_entries(ClassLoaderData* loader_data,
           cfs->guarantee_more(5, CHECK);  // class_index, name_and_type_index, tag/access_flags
           u2 class_index = cfs->get_u2_fast();
           u2 name_and_type_index = cfs->get_u2_fast();
-          cp->interface_method_at_put(index, class_index, name_and_type_index);
+          _cp->interface_method_at_put(index, class_index, name_and_type_index);
         }
         break;
       case JVM_CONSTANT_String :
         {
           cfs->guarantee_more(3, CHECK);  // string_index, tag/access_flags
           u2 string_index = cfs->get_u2_fast();
-          cp->string_index_at_put(index, string_index);
+          _cp->string_index_at_put(index, string_index);
         }
         break;
       case JVM_CONSTANT_MethodHandle :
@@ -174,11 +173,11 @@ void ClassFileParser::parse_constant_pool_entries(ClassLoaderData* loader_data,
           cfs->guarantee_more(4, CHECK);  // ref_kind, method_index, tag/access_flags
           u1 ref_kind = cfs->get_u1_fast();
           u2 method_index = cfs->get_u2_fast();
-          cp->method_handle_index_at_put(index, ref_kind, method_index);
+          _cp->method_handle_index_at_put(index, ref_kind, method_index);
         } else if (tag == JVM_CONSTANT_MethodType) {
           cfs->guarantee_more(3, CHECK);  // signature_index, tag/access_flags
           u2 signature_index = cfs->get_u2_fast();
-          cp->method_type_index_at_put(index, signature_index);
+          _cp->method_type_index_at_put(index, signature_index);
         } else {
           ShouldNotReachHere();
         }
@@ -200,21 +199,21 @@ void ClassFileParser::parse_constant_pool_entries(ClassLoaderData* loader_data,
           u2 name_and_type_index = cfs->get_u2_fast();
           if (_max_bootstrap_specifier_index < (int) bootstrap_specifier_index)
             _max_bootstrap_specifier_index = (int) bootstrap_specifier_index;  // collect for later
-          cp->invoke_dynamic_at_put(index, bootstrap_specifier_index, name_and_type_index);
+          _cp->invoke_dynamic_at_put(index, bootstrap_specifier_index, name_and_type_index);
         }
         break;
       case JVM_CONSTANT_Integer :
         {
           cfs->guarantee_more(5, CHECK);  // bytes, tag/access_flags
           u4 bytes = cfs->get_u4_fast();
-          cp->int_at_put(index, (jint) bytes);
+          _cp->int_at_put(index, (jint) bytes);
         }
         break;
       case JVM_CONSTANT_Float :
         {
           cfs->guarantee_more(5, CHECK);  // bytes, tag/access_flags
           u4 bytes = cfs->get_u4_fast();
-          cp->float_at_put(index, *(jfloat*)&bytes);
+          _cp->float_at_put(index, *(jfloat*)&bytes);
         }
         break;
       case JVM_CONSTANT_Long :
@@ -225,7 +224,7 @@ void ClassFileParser::parse_constant_pool_entries(ClassLoaderData* loader_data,
         {
           cfs->guarantee_more(9, CHECK);  // bytes, tag/access_flags
           u8 bytes = cfs->get_u8_fast();
-          cp->long_at_put(index, bytes);
+          _cp->long_at_put(index, bytes);
         }
         index++;   // Skip entry following eigth-byte constant, see JVM book p. 98
         break;
@@ -237,7 +236,7 @@ void ClassFileParser::parse_constant_pool_entries(ClassLoaderData* loader_data,
         {
           cfs->guarantee_more(9, CHECK);  // bytes, tag/access_flags
           u8 bytes = cfs->get_u8_fast();
-          cp->double_at_put(index, *(jdouble*)&bytes);
+          _cp->double_at_put(index, *(jdouble*)&bytes);
         }
         index++;   // Skip entry following eigth-byte constant, see JVM book p. 98
         break;
@@ -246,7 +245,7 @@ void ClassFileParser::parse_constant_pool_entries(ClassLoaderData* loader_data,
           cfs->guarantee_more(5, CHECK);  // name_index, signature_index, tag/access_flags
           u2 name_index = cfs->get_u2_fast();
           u2 signature_index = cfs->get_u2_fast();
-          cp->name_and_type_at_put(index, name_index, signature_index);
+          _cp->name_and_type_at_put(index, name_index, signature_index);
         }
         break;
       case JVM_CONSTANT_Utf8 :
@@ -283,11 +282,11 @@ void ClassFileParser::parse_constant_pool_entries(ClassLoaderData* loader_data,
             indices[names_count] = index;
             hashValues[names_count++] = hash;
             if (names_count == SymbolTable::symbol_alloc_batch_size) {
-              SymbolTable::new_symbols(loader_data, cp, names_count, names, lengths, indices, hashValues, CHECK);
+              SymbolTable::new_symbols(_loader_data, _cp, names_count, names, lengths, indices, hashValues, CHECK);
               names_count = 0;
             }
           } else {
-            cp->symbol_at_put(index, result);
+            _cp->symbol_at_put(index, result);
           }
         }
         break;
@@ -300,7 +299,7 @@ void ClassFileParser::parse_constant_pool_entries(ClassLoaderData* loader_data,
 
   // Allocate the remaining symbols
   if (names_count > 0) {
-    SymbolTable::new_symbols(loader_data, cp, names_count, names, lengths, indices, hashValues, CHECK);
+    SymbolTable::new_symbols(_loader_data, _cp, names_count, names, lengths, indices, hashValues, CHECK);
   }
 
   // Copy _current pointer of local copy back to stream().
@@ -310,23 +309,6 @@ void ClassFileParser::parse_constant_pool_entries(ClassLoaderData* loader_data,
   cfs0->set_current(cfs1.current());
 }
 
-// This class unreferences constant pool symbols if an error has occurred
-// while parsing the class before it is assigned into the class.
-// If it gets an error after that it is unloaded and the constant pool will
-// be cleaned up then.
-class ConstantPoolCleaner : public StackObj {
-  constantPoolHandle _cphandle;
-  bool               _in_error;
- public:
-  ConstantPoolCleaner(constantPoolHandle cp) : _cphandle(cp), _in_error(true) {}
-  ~ConstantPoolCleaner() {
-    if (_in_error && _cphandle.not_null()) {
-      _cphandle->unreference_symbols();
-    }
-  }
-  void set_in_error(bool clean) { _in_error = clean; }
-};
-
 bool inline valid_cp_range(int index, int length) { return (index > 0 && index < length); }
 
 inline Symbol* check_symbol_at(constantPoolHandle cp, int index) {
@@ -336,7 +318,7 @@ inline Symbol* check_symbol_at(constantPoolHandle cp, int index) {
     return NULL;
 }
 
-constantPoolHandle ClassFileParser::parse_constant_pool(ClassLoaderData* loader_data, TRAPS) {
+constantPoolHandle ClassFileParser::parse_constant_pool(TRAPS) {
   ClassFileStream* cfs = stream();
   constantPoolHandle nullHandle;
 
@@ -345,16 +327,13 @@ constantPoolHandle ClassFileParser::parse_constant_pool(ClassLoaderData* loader_
   guarantee_property(
     length >= 1, "Illegal constant pool size %u in class file %s",
     length, CHECK_(nullHandle));
-  ConstantPool* constant_pool =
-                      ConstantPool::allocate(loader_data,
-                                                    length,
-                                                   CHECK_(nullHandle));
+  ConstantPool* constant_pool = ConstantPool::allocate(_loader_data, length,
+                                                        CHECK_(nullHandle));
+  _cp = constant_pool; // save in case of errors
   constantPoolHandle cp (THREAD, constant_pool);
 
-  ConstantPoolCleaner cp_in_error(cp); // set constant pool to be cleaned up.
-
   // parsing constant pool entries
-  parse_constant_pool_entries(loader_data, cp, length, CHECK_(nullHandle));
+  parse_constant_pool_entries(length, CHECK_(nullHandle));
 
   int index = 1;  // declared outside of loops for portability
 
@@ -373,8 +352,7 @@ constantPoolHandle ClassFileParser::parse_constant_pool(ClassLoaderData* loader_
         if (!_need_verify) break;
         int klass_ref_index = cp->klass_ref_index_at(index);
         int name_and_type_ref_index = cp->name_and_type_ref_index_at(index);
-        check_property(valid_cp_range(klass_ref_index, length) &&
-                       is_klass_reference(cp, klass_ref_index),
+        check_property(valid_klass_reference_at(klass_ref_index),
                        "Invalid constant pool index %u in class file %s",
                        klass_ref_index,
                        CHECK_(nullHandle));
@@ -404,16 +382,12 @@ constantPoolHandle ClassFileParser::parse_constant_pool(ClassLoaderData* loader_
         if (!_need_verify) break;
         int name_ref_index = cp->name_ref_index_at(index);
         int signature_ref_index = cp->signature_ref_index_at(index);
-        check_property(
-          valid_cp_range(name_ref_index, length) &&
-            cp->tag_at(name_ref_index).is_utf8(),
-          "Invalid constant pool index %u in class file %s",
-          name_ref_index, CHECK_(nullHandle));
-        check_property(
-          valid_cp_range(signature_ref_index, length) &&
-            cp->tag_at(signature_ref_index).is_utf8(),
-          "Invalid constant pool index %u in class file %s",
-          signature_ref_index, CHECK_(nullHandle));
+        check_property(valid_symbol_at(name_ref_index),
+                 "Invalid constant pool index %u in class file %s",
+                 name_ref_index, CHECK_(nullHandle));
+        check_property(valid_symbol_at(signature_ref_index),
+                 "Invalid constant pool index %u in class file %s",
+                 signature_ref_index, CHECK_(nullHandle));
         break;
       }
       case JVM_CONSTANT_Utf8 :
@@ -425,22 +399,18 @@ constantPoolHandle ClassFileParser::parse_constant_pool(ClassLoaderData* loader_
       case JVM_CONSTANT_ClassIndex :
         {
           int class_index = cp->klass_index_at(index);
-          check_property(
-            valid_cp_range(class_index, length) &&
-              cp->tag_at(class_index).is_utf8(),
-            "Invalid constant pool index %u in class file %s",
-            class_index, CHECK_(nullHandle));
+          check_property(valid_symbol_at(class_index),
+                 "Invalid constant pool index %u in class file %s",
+                 class_index, CHECK_(nullHandle));
           cp->unresolved_klass_at_put(index, cp->symbol_at(class_index));
         }
         break;
       case JVM_CONSTANT_StringIndex :
         {
           int string_index = cp->string_index_at(index);
-          check_property(
-            valid_cp_range(string_index, length) &&
-              cp->tag_at(string_index).is_utf8(),
-            "Invalid constant pool index %u in class file %s",
-            string_index, CHECK_(nullHandle));
+          check_property(valid_symbol_at(string_index),
+                 "Invalid constant pool index %u in class file %s",
+                 string_index, CHECK_(nullHandle));
           Symbol* sym = cp->symbol_at(string_index);
           cp->unresolved_string_at_put(index, sym);
         }
@@ -491,12 +461,9 @@ constantPoolHandle ClassFileParser::parse_constant_pool(ClassLoaderData* loader_
       case JVM_CONSTANT_MethodType :
         {
           int ref_index = cp->method_type_index_at(index);
-          check_property(
-            valid_cp_range(ref_index, length) &&
-                cp->tag_at(ref_index).is_utf8() &&
-                EnableInvokeDynamic,
-              "Invalid constant pool index %u in class file %s",
-              ref_index, CHECK_(nullHandle));
+          check_property(valid_symbol_at(ref_index) && EnableInvokeDynamic,
+                 "Invalid constant pool index %u in class file %s",
+                 ref_index, CHECK_(nullHandle));
         }
         break;
       case JVM_CONSTANT_InvokeDynamic :
@@ -541,7 +508,6 @@ constantPoolHandle ClassFileParser::parse_constant_pool(ClassLoaderData* loader_
   }
 
   if (!_need_verify) {
-    cp_in_error.set_in_error(false);
     return cp;
   }
 
@@ -664,7 +630,6 @@ constantPoolHandle ClassFileParser::parse_constant_pool(ClassLoaderData* loader_
     }  // end of switch
   }  // end of for
 
-  cp_in_error.set_in_error(false);
   return cp;
 }
 
@@ -786,93 +751,92 @@ bool put_after_lookup(Symbol* name, Symbol* sig, NameSigHash** table) {
 }
 
 
-Array<Klass*>* ClassFileParser::parse_interfaces(constantPoolHandle cp,
-                                                 int length,
-                                                 ClassLoaderData* loader_data,
+Array<Klass*>* ClassFileParser::parse_interfaces(int length,
                                                  Handle protection_domain,
                                                  Symbol* class_name,
                                                  bool* has_default_methods,
                                                  TRAPS) {
-  ClassFileStream* cfs = stream();
-  assert(length > 0, "only called for length>0");
-  // FIXME: Leak at later OOM.
-  Array<Klass*>* interfaces = MetadataFactory::new_array<Klass*>(loader_data, length, NULL, CHECK_NULL);
+  if (length == 0) {
+    _local_interfaces = Universe::the_empty_klass_array();
+  } else {
+    ClassFileStream* cfs = stream();
+    assert(length > 0, "only called for length>0");
+    _local_interfaces = MetadataFactory::new_array<Klass*>(_loader_data, length, NULL, CHECK_NULL);
 
-  int index;
-  for (index = 0; index < length; index++) {
-    u2 interface_index = cfs->get_u2(CHECK_NULL);
-    KlassHandle interf;
-    check_property(
-      valid_cp_range(interface_index, cp->length()) &&
-      is_klass_reference(cp, interface_index),
-      "Interface name has bad constant pool index %u in class file %s",
-      interface_index, CHECK_NULL);
-    if (cp->tag_at(interface_index).is_klass()) {
-      interf = KlassHandle(THREAD, cp->resolved_klass_at(interface_index));
-    } else {
-      Symbol*  unresolved_klass  = cp->klass_name_at(interface_index);
-
-      // Don't need to check legal name because it's checked when parsing constant pool.
-      // But need to make sure it's not an array type.
-      guarantee_property(unresolved_klass->byte_at(0) != JVM_SIGNATURE_ARRAY,
-                         "Bad interface name in class file %s", CHECK_NULL);
-      Handle class_loader(THREAD, loader_data->class_loader());
-
-      // Call resolve_super so classcircularity is checked
-      Klass* k = SystemDictionary::resolve_super_or_fail(class_name,
-                    unresolved_klass, class_loader, protection_domain,
-                    false, CHECK_NULL);
-      interf = KlassHandle(THREAD, k);
-    }
-
-    if (!interf()->is_interface()) {
-      THROW_MSG_(vmSymbols::java_lang_IncompatibleClassChangeError(), "Implementing class", NULL);
-    }
-    if (InstanceKlass::cast(interf())->has_default_methods()) {
-      *has_default_methods = true;
-    }
-    interfaces->at_put(index, interf());
-  }
-
-  if (!_need_verify || length <= 1) {
-    return interfaces;
-  }
-
-  // Check if there's any duplicates in interfaces
-  ResourceMark rm(THREAD);
-  NameSigHash** interface_names = NEW_RESOURCE_ARRAY_IN_THREAD(
-    THREAD, NameSigHash*, HASH_ROW_SIZE);
-  initialize_hashtable(interface_names);
-  bool dup = false;
-  {
-    debug_only(No_Safepoint_Verifier nsv;)
+    int index;
     for (index = 0; index < length; index++) {
-      Klass* k = interfaces->at(index);
-      Symbol* name = InstanceKlass::cast(k)->name();
-      // If no duplicates, add (name, NULL) in hashtable interface_names.
-      if (!put_after_lookup(name, NULL, interface_names)) {
-        dup = true;
-        break;
+      u2 interface_index = cfs->get_u2(CHECK_NULL);
+      KlassHandle interf;
+      check_property(
+        valid_klass_reference_at(interface_index),
+        "Interface name has bad constant pool index %u in class file %s",
+        interface_index, CHECK_NULL);
+      if (_cp->tag_at(interface_index).is_klass()) {
+        interf = KlassHandle(THREAD, _cp->resolved_klass_at(interface_index));
+      } else {
+        Symbol*  unresolved_klass  = _cp->klass_name_at(interface_index);
+
+        // Don't need to check legal name because it's checked when parsing constant pool.
+        // But need to make sure it's not an array type.
+        guarantee_property(unresolved_klass->byte_at(0) != JVM_SIGNATURE_ARRAY,
+                           "Bad interface name in class file %s", CHECK_NULL);
+        Handle class_loader(THREAD, _loader_data->class_loader());
+
+        // Call resolve_super so classcircularity is checked
+        Klass* k = SystemDictionary::resolve_super_or_fail(class_name,
+                      unresolved_klass, class_loader, protection_domain,
+                      false, CHECK_NULL);
+        interf = KlassHandle(THREAD, k);
+      }
+
+      if (!interf()->is_interface()) {
+        THROW_MSG_(vmSymbols::java_lang_IncompatibleClassChangeError(), "Implementing class", NULL);
+      }
+      if (InstanceKlass::cast(interf())->has_default_methods()) {
+        *has_default_methods = true;
+      }
+      _local_interfaces->at_put(index, interf());
+    }
+
+    if (!_need_verify || length <= 1) {
+      return _local_interfaces;
+    }
+
+    // Check if there's any duplicates in interfaces
+    ResourceMark rm(THREAD);
+    NameSigHash** interface_names = NEW_RESOURCE_ARRAY_IN_THREAD(
+      THREAD, NameSigHash*, HASH_ROW_SIZE);
+    initialize_hashtable(interface_names);
+    bool dup = false;
+    {
+      debug_only(No_Safepoint_Verifier nsv;)
+      for (index = 0; index < length; index++) {
+        Klass* k = _local_interfaces->at(index);
+        Symbol* name = InstanceKlass::cast(k)->name();
+        // If no duplicates, add (name, NULL) in hashtable interface_names.
+        if (!put_after_lookup(name, NULL, interface_names)) {
+          dup = true;
+          break;
+        }
       }
     }
+    if (dup) {
+      classfile_parse_error("Duplicate interface name in class file %s", CHECK_NULL);
+    }
   }
-  if (dup) {
-    classfile_parse_error("Duplicate interface name in class file %s", CHECK_NULL);
-  }
-
-  return interfaces;
+  return _local_interfaces;
 }
 
 
-void ClassFileParser::verify_constantvalue(int constantvalue_index, int signature_index, constantPoolHandle cp, TRAPS) {
+void ClassFileParser::verify_constantvalue(int constantvalue_index, int signature_index, TRAPS) {
   // Make sure the constant pool entry is of a type appropriate to this field
   guarantee_property(
     (constantvalue_index > 0 &&
-      constantvalue_index < cp->length()),
+      constantvalue_index < _cp->length()),
     "Bad initial value index %u in ConstantValue attribute in class file %s",
     constantvalue_index, CHECK);
-  constantTag value_type = cp->tag_at(constantvalue_index);
-  switch ( cp->basic_type_for_signature_at(signature_index) ) {
+  constantTag value_type = _cp->tag_at(constantvalue_index);
+  switch ( _cp->basic_type_for_signature_at(signature_index) ) {
     case T_LONG:
       guarantee_property(value_type.is_long(), "Inconsistent constant value type in class file %s", CHECK);
       break;
@@ -886,7 +850,7 @@ void ClassFileParser::verify_constantvalue(int constantvalue_index, int signatur
       guarantee_property(value_type.is_int(), "Inconsistent constant value type in class file %s", CHECK);
       break;
     case T_OBJECT:
-      guarantee_property((cp->symbol_at(signature_index)->equals("Ljava/lang/String;")
+      guarantee_property((_cp->symbol_at(signature_index)->equals("Ljava/lang/String;")
                          && value_type.is_string()),
                          "Bad string initial value in class file %s", CHECK);
       break;
@@ -899,15 +863,11 @@ void ClassFileParser::verify_constantvalue(int constantvalue_index, int signatur
 
 
 // Parse attributes for a field.
-void ClassFileParser::parse_field_attributes(ClassLoaderData* loader_data,
-                                             constantPoolHandle cp,
-                                             u2 attributes_count,
+void ClassFileParser::parse_field_attributes(u2 attributes_count,
                                              bool is_static, u2 signature_index,
                                              u2* constantvalue_index_addr,
                                              bool* is_synthetic_addr,
                                              u2* generic_signature_index_addr,
-                                             AnnotationArray** field_annotations,
-                                             AnnotationArray** field_type_annotations,
                                              ClassFileParser::FieldAnnotationCollector* parsed_annotations,
                                              TRAPS) {
   ClassFileStream* cfs = stream();
@@ -927,12 +887,11 @@ void ClassFileParser::parse_field_attributes(ClassLoaderData* loader_data,
     cfs->guarantee_more(6, CHECK);  // attribute_name_index, attribute_length
     u2 attribute_name_index = cfs->get_u2_fast();
     u4 attribute_length = cfs->get_u4_fast();
-    check_property(valid_cp_range(attribute_name_index, cp->length()) &&
-                   cp->tag_at(attribute_name_index).is_utf8(),
+    check_property(valid_symbol_at(attribute_name_index),
                    "Invalid field attribute index %u in class file %s",
                    attribute_name_index,
                    CHECK);
-    Symbol* attribute_name = cp->symbol_at(attribute_name_index);
+    Symbol* attribute_name = _cp->symbol_at(attribute_name_index);
     if (is_static && attribute_name == vmSymbols::tag_constant_value()) {
       // ignore if non-static
       if (constantvalue_index != 0) {
@@ -944,7 +903,7 @@ void ClassFileParser::parse_field_attributes(ClassLoaderData* loader_data,
         attribute_length, CHECK);
       constantvalue_index = cfs->get_u2(CHECK);
       if (_need_verify) {
-        verify_constantvalue(constantvalue_index, signature_index, cp, CHECK);
+        verify_constantvalue(constantvalue_index, signature_index, CHECK);
       }
     } else if (attribute_name == vmSymbols::tag_synthetic()) {
       if (attribute_length != 0) {
@@ -971,10 +930,8 @@ void ClassFileParser::parse_field_attributes(ClassLoaderData* loader_data,
         runtime_visible_annotations_length = attribute_length;
         runtime_visible_annotations = cfs->get_u1_buffer();
         assert(runtime_visible_annotations != NULL, "null visible annotations");
-        parse_annotations(loader_data,
-                          runtime_visible_annotations,
+        parse_annotations(runtime_visible_annotations,
                           runtime_visible_annotations_length,
-                          cp,
                           parsed_annotations,
                           CHECK);
         cfs->skip_u1(runtime_visible_annotations_length, CHECK);
@@ -1004,18 +961,18 @@ void ClassFileParser::parse_field_attributes(ClassLoaderData* loader_data,
   *constantvalue_index_addr = constantvalue_index;
   *is_synthetic_addr = is_synthetic;
   *generic_signature_index_addr = generic_signature_index;
-  *field_annotations = assemble_annotations(loader_data,
-                                            runtime_visible_annotations,
+  AnnotationArray* a = assemble_annotations(runtime_visible_annotations,
                                             runtime_visible_annotations_length,
                                             runtime_invisible_annotations,
                                             runtime_invisible_annotations_length,
                                             CHECK);
-  *field_type_annotations = assemble_annotations(loader_data,
-                                            runtime_visible_type_annotations,
-                                            runtime_visible_type_annotations_length,
-                                            runtime_invisible_type_annotations,
-                                            runtime_invisible_type_annotations_length,
-                                            CHECK);
+  parsed_annotations->set_field_annotations(a);
+  a = assemble_annotations(runtime_visible_type_annotations,
+                           runtime_visible_type_annotations_length,
+                           runtime_invisible_type_annotations,
+                           runtime_invisible_type_annotations_length,
+                           CHECK);
+  parsed_annotations->set_field_type_annotations(a);
   return;
 }
 
@@ -1106,13 +1063,9 @@ class FieldAllocationCount: public ResourceObj {
   }
 };
 
-Array<u2>* ClassFileParser::parse_fields(ClassLoaderData* loader_data,
-                                         Symbol* class_name,
-                                         constantPoolHandle cp,
+Array<u2>* ClassFileParser::parse_fields(Symbol* class_name,
                                          bool is_interface,
                                          FieldAllocationCount *fac,
-                                         Array<AnnotationArray*>** fields_annotations,
-                                         Array<AnnotationArray*>** fields_type_annotations,
                                          u2* java_fields_count_ptr, TRAPS) {
   ClassFileStream* cfs = stream();
   cfs->guarantee_more(2, CHECK_NULL);  // length
@@ -1147,8 +1100,6 @@ Array<u2>* ClassFileParser::parse_fields(ClassLoaderData* loader_data,
   u2* fa = NEW_RESOURCE_ARRAY_IN_THREAD(
              THREAD, u2, total_fields * (FieldInfo::field_slots + 1));
 
-  AnnotationArray* field_annotations = NULL;
-  AnnotationArray* field_type_annotations = NULL;
   // The generic signature slots start after all other fields' data.
   int generic_signature_slot = total_fields * FieldInfo::field_slots;
   int num_generic_signature = 0;
@@ -1161,53 +1112,52 @@ Array<u2>* ClassFileParser::parse_fields(ClassLoaderData* loader_data,
     access_flags.set_flags(flags);
 
     u2 name_index = cfs->get_u2_fast();
-    int cp_size = cp->length();
-    check_property(
-      valid_cp_range(name_index, cp_size) && cp->tag_at(name_index).is_utf8(),
+    int cp_size = _cp->length();
+    check_property(valid_symbol_at(name_index),
       "Invalid constant pool index %u for field name in class file %s",
-      name_index, CHECK_NULL);
-    Symbol*  name = cp->symbol_at(name_index);
+      name_index,
+      CHECK_NULL);
+    Symbol*  name = _cp->symbol_at(name_index);
     verify_legal_field_name(name, CHECK_NULL);
 
     u2 signature_index = cfs->get_u2_fast();
-    check_property(
-      valid_cp_range(signature_index, cp_size) &&
-        cp->tag_at(signature_index).is_utf8(),
+    check_property(valid_symbol_at(signature_index),
       "Invalid constant pool index %u for field signature in class file %s",
       signature_index, CHECK_NULL);
-    Symbol*  sig = cp->symbol_at(signature_index);
+    Symbol*  sig = _cp->symbol_at(signature_index);
     verify_legal_field_signature(name, sig, CHECK_NULL);
 
     u2 constantvalue_index = 0;
     bool is_synthetic = false;
     u2 generic_signature_index = 0;
     bool is_static = access_flags.is_static();
-    FieldAnnotationCollector parsed_annotations;
+    FieldAnnotationCollector parsed_annotations(_loader_data);
 
     u2 attributes_count = cfs->get_u2_fast();
     if (attributes_count > 0) {
-      parse_field_attributes(loader_data,
-                             cp, attributes_count, is_static, signature_index,
+      parse_field_attributes(attributes_count, is_static, signature_index,
                              &constantvalue_index, &is_synthetic,
-                             &generic_signature_index, &field_annotations,
-                             &field_type_annotations, &parsed_annotations,
+                             &generic_signature_index, &parsed_annotations,
                              CHECK_NULL);
-      if (field_annotations != NULL) {
-        if (*fields_annotations == NULL) {
-          *fields_annotations = MetadataFactory::new_array<AnnotationArray*>(
-                                             loader_data, length, NULL,
+      if (parsed_annotations.field_annotations() != NULL) {
+        if (_fields_annotations == NULL) {
+          _fields_annotations = MetadataFactory::new_array<AnnotationArray*>(
+                                             _loader_data, length, NULL,
                                              CHECK_NULL);
         }
-        (*fields_annotations)->at_put(n, field_annotations);
+        _fields_annotations->at_put(n, parsed_annotations.field_annotations());
+        parsed_annotations.set_field_annotations(NULL);
       }
-      if (field_type_annotations != NULL) {
-        if (*fields_type_annotations == NULL) {
-          *fields_type_annotations = MetadataFactory::new_array<AnnotationArray*>(
-                                                  loader_data, length, NULL,
+      if (parsed_annotations.field_type_annotations() != NULL) {
+        if (_fields_type_annotations == NULL) {
+          _fields_type_annotations = MetadataFactory::new_array<AnnotationArray*>(
+                                                  _loader_data, length, NULL,
                                                   CHECK_NULL);
         }
-        (*fields_type_annotations)->at_put(n, field_type_annotations);
+        _fields_type_annotations->at_put(n, parsed_annotations.field_type_annotations());
+        parsed_annotations.set_field_type_annotations(NULL);
       }
+
       if (is_synthetic) {
         access_flags.set_is_synthetic();
       }
@@ -1224,7 +1174,7 @@ Array<u2>* ClassFileParser::parse_fields(ClassLoaderData* loader_data,
                       name_index,
                       signature_index,
                       constantvalue_index);
-    BasicType type = cp->basic_type_for_signature_at(signature_index);
+    BasicType type = _cp->basic_type_for_signature_at(signature_index);
 
     // Remember how many oops we encountered and compute allocation type
     FieldAllocationType atype = fac->update(is_static, type);
@@ -1245,8 +1195,8 @@ Array<u2>* ClassFileParser::parse_fields(ClassLoaderData* loader_data,
         bool duplicate = false;
         for (int i = 0; i < length; i++) {
           FieldInfo* f = FieldInfo::from_field_array(fa, i);
-          if (name      == cp->symbol_at(f->name_index()) &&
-              signature == cp->symbol_at(f->signature_index())) {
+          if (name      == _cp->symbol_at(f->name_index()) &&
+              signature == _cp->symbol_at(f->signature_index())) {
             // Symbol is desclared in Java so skip this one
             duplicate = true;
             break;
@@ -1280,8 +1230,9 @@ Array<u2>* ClassFileParser::parse_fields(ClassLoaderData* loader_data,
   // fields array is trimed. Also unused slots that were reserved
   // for generic signature indexes are discarded.
   Array<u2>* fields = MetadataFactory::new_array<u2>(
-          loader_data, index * FieldInfo::field_slots + num_generic_signature,
+          _loader_data, index * FieldInfo::field_slots + num_generic_signature,
           CHECK_NULL);
+  _fields = fields; // save in case of error
   {
     int i = 0;
     for (; i < index * FieldInfo::field_slots; i++) {
@@ -1303,7 +1254,7 @@ Array<u2>* ClassFileParser::parse_fields(ClassLoaderData* loader_data,
     bool dup = false;
     {
       debug_only(No_Safepoint_Verifier nsv;)
-      for (AllFieldStream fs(fields, cp); !fs.done(); fs.next()) {
+      for (AllFieldStream fs(fields, _cp); !fs.done(); fs.next()) {
         Symbol* name = fs.name();
         Symbol* sig = fs.signature();
         // If no duplicates, add name/signature in hashtable names_and_sigs.
@@ -1330,10 +1281,8 @@ static void copy_u2_with_conversion(u2* dest, u2* src, int length) {
 }
 
 
-u2* ClassFileParser::parse_exception_table(ClassLoaderData* loader_data,
-                                           u4 code_length,
+u2* ClassFileParser::parse_exception_table(u4 code_length,
                                            u4 exception_table_length,
-                                           constantPoolHandle cp,
                                            TRAPS) {
   ClassFileStream* cfs = stream();
 
@@ -1354,8 +1303,7 @@ u2* ClassFileParser::parse_exception_table(ClassLoaderData* loader_data,
                          "Illegal exception table handler in class file %s",
                          CHECK_NULL);
       if (catch_type_index != 0) {
-        guarantee_property(valid_cp_range(catch_type_index, cp->length()) &&
-                           is_klass_reference(cp, catch_type_index),
+        guarantee_property(valid_klass_reference_at(catch_type_index),
                            "Catch type in exception table has bad constant type in class file %s", CHECK_NULL);
       }
     }
@@ -1506,7 +1454,6 @@ void copy_lvt_element(Classfile_LVT_Element *src, LocalVariableTableElement *lvt
 u2* ClassFileParser::parse_localvariable_table(u4 code_length,
                                                u2 max_locals,
                                                u4 code_attribute_length,
-                                               constantPoolHandle cp,
                                                u2* localvariable_table_length,
                                                bool isLVTT,
                                                TRAPS) {
@@ -1544,20 +1491,16 @@ u2* ClassFileParser::parse_localvariable_table(u4 code_length,
           "Invalid length %u in %s in class file %s",
           length, tbl_name, CHECK_NULL);
       }
-      int cp_size = cp->length();
-      guarantee_property(
-        valid_cp_range(name_index, cp_size) &&
-          cp->tag_at(name_index).is_utf8(),
+      int cp_size = _cp->length();
+      guarantee_property(valid_symbol_at(name_index),
         "Name index %u in %s has bad constant type in class file %s",
         name_index, tbl_name, CHECK_NULL);
-      guarantee_property(
-        valid_cp_range(descriptor_index, cp_size) &&
-          cp->tag_at(descriptor_index).is_utf8(),
+      guarantee_property(valid_symbol_at(descriptor_index),
         "Signature index %u in %s has bad constant type in class file %s",
         descriptor_index, tbl_name, CHECK_NULL);
 
-      Symbol*  name = cp->symbol_at(name_index);
-      Symbol*  sig = cp->symbol_at(descriptor_index);
+      Symbol*  name = _cp->symbol_at(name_index);
+      Symbol*  sig = _cp->symbol_at(descriptor_index);
       verify_legal_field_name(name, CHECK_NULL);
       u2 extra_slot = 0;
       if (!isLVTT) {
@@ -1579,7 +1522,7 @@ u2* ClassFileParser::parse_localvariable_table(u4 code_length,
 
 
 void ClassFileParser::parse_type_array(u2 array_length, u4 code_length, u4* u1_index, u4* u2_index,
-                                      u1* u1_array, u2* u2_array, constantPoolHandle cp, TRAPS) {
+                                      u1* u1_array, u2* u2_array, TRAPS) {
   ClassFileStream* cfs = stream();
   u2 index = 0; // index in the array with long/double occupying two slots
   u4 i1 = *u1_index;
@@ -1591,8 +1534,7 @@ void ClassFileParser::parse_type_array(u2 array_length, u4 code_length, u4* u1_i
       index++;
     } else if (tag == ITEM_Object) {
       u2 class_index = u2_array[i2++] = cfs->get_u2(CHECK);
-      guarantee_property(valid_cp_range(class_index, cp->length()) &&
-                         is_klass_reference(cp, class_index),
+      guarantee_property(valid_klass_reference_at(class_index),
                          "Bad class index %u in StackMap in class file %s",
                          class_index, CHECK);
     } else if (tag == ITEM_Uninitialized) {
@@ -1613,8 +1555,7 @@ void ClassFileParser::parse_type_array(u2 array_length, u4 code_length, u4* u1_i
   *u2_index = i2;
 }
 
-Array<u1>* ClassFileParser::parse_stackmap_table(
-    ClassLoaderData* loader_data,
+u1* ClassFileParser::parse_stackmap_table(
     u4 code_attribute_length, TRAPS) {
   if (code_attribute_length == 0)
     return NULL;
@@ -1629,18 +1570,12 @@ Array<u1>* ClassFileParser::parse_stackmap_table(
   if (!_need_verify && !DumpSharedSpaces) {
     return NULL;
   }
-
-  Array<u1>* stackmap_data =
-    MetadataFactory::new_array<u1>(loader_data, code_attribute_length, 0, CHECK_NULL);
-
-  memcpy((void*)stackmap_data->adr_at(0),
-         (void*)stackmap_table_start, code_attribute_length);
-  return stackmap_data;
+  return stackmap_table_start;
 }
 
 u2* ClassFileParser::parse_checked_exceptions(u2* checked_exceptions_length,
                                               u4 method_attribute_length,
-                                              constantPoolHandle cp, TRAPS) {
+                                              TRAPS) {
   ClassFileStream* cfs = stream();
   cfs->guarantee_more(2, CHECK_NULL);  // checked_exceptions_length
   *checked_exceptions_length = cfs->get_u2_fast();
@@ -1657,8 +1592,7 @@ u2* ClassFileParser::parse_checked_exceptions(u2* checked_exceptions_length,
     for (int i = 0; i < len; i++) {
       checked_exception = cfs->get_u2_fast();
       check_property(
-        valid_cp_range(checked_exception, cp->length()) &&
-        is_klass_reference(cp, checked_exception),
+        valid_klass_reference_at(checked_exception),
         "Exception name has bad type at constant pool %u in class file %s",
         checked_exception, CHECK_NULL);
     }
@@ -1735,9 +1669,7 @@ int ClassFileParser::skip_annotation_value(u1* buffer, int limit, int index) {
 }
 
 // Sift through annotations, looking for those significant to the VM:
-void ClassFileParser::parse_annotations(ClassLoaderData* loader_data,
-                                        u1* buffer, int limit,
-                                        constantPoolHandle cp,
+void ClassFileParser::parse_annotations(u1* buffer, int limit,
                                         ClassFileParser::AnnotationCollector* coll,
                                         TRAPS) {
   // annotations := do(nann:u2) {annotation}
@@ -1767,17 +1699,17 @@ void ClassFileParser::parse_annotations(ClassLoaderData* loader_data,
     u1* abase = buffer + index0;
     int atype = Bytes::get_Java_u2(abase + atype_off);
     int count = Bytes::get_Java_u2(abase + count_off);
-    Symbol* aname = check_symbol_at(cp, atype);
+    Symbol* aname = check_symbol_at(_cp, atype);
     if (aname == NULL)  break;  // invalid annotation name
     Symbol* member = NULL;
     if (count >= 1) {
       int member_index = Bytes::get_Java_u2(abase + member_off);
-      member = check_symbol_at(cp, member_index);
+      member = check_symbol_at(_cp, member_index);
       if (member == NULL)  break;  // invalid member name
     }
 
     // Here is where parsing particular annotations will take place.
-    AnnotationCollector::ID id = coll->annotation_index(loader_data, aname);
+    AnnotationCollector::ID id = coll->annotation_index(_loader_data, aname);
     if (id == AnnotationCollector::_unknown)  continue;
     coll->set_annotation(id);
 
@@ -1836,6 +1768,12 @@ void ClassFileParser::FieldAnnotationCollector::apply_to(FieldInfo* f) {
     f->set_contended_group(contended_group());
 }
 
+ClassFileParser::FieldAnnotationCollector::~FieldAnnotationCollector() {
+  // If there's an error deallocate metadata for field annotations
+  MetadataFactory::free_array<u1>(_loader_data, _field_annotations);
+  MetadataFactory::free_array<u1>(_loader_data, _field_type_annotations);
+}
+
 void ClassFileParser::MethodAnnotationCollector::apply_to(methodHandle m) {
   if (has_annotation(_method_ForceInline))
     m->set_force_inline(true);
@@ -1894,10 +1832,9 @@ void ClassFileParser::copy_localvariable_table(ConstMethod* cm,
           && _need_verify
           && _major_version >= JAVA_1_5_VERSION) {
         clear_hashtable(lvt_Hash);
-        ConstantPool* cp = cm->constants();
         classfile_parse_error("Duplicated LocalVariableTable attribute "
                               "entry for '%s' in class file %s",
-                               cp->symbol_at(lvt->name_cp_index)->as_utf8(),
+                               _cp->symbol_at(lvt->name_cp_index)->as_utf8(),
                                CHECK);
       }
     }
@@ -1916,18 +1853,16 @@ void ClassFileParser::copy_localvariable_table(ConstMethod* cm,
       if (entry == NULL) {
         if (_need_verify) {
           clear_hashtable(lvt_Hash);
-          ConstantPool* cp = cm->constants();
           classfile_parse_error("LVTT entry for '%s' in class file %s "
                                 "does not match any LVT entry",
-                                 cp->symbol_at(lvtt_elem.name_cp_index)->as_utf8(),
+                                 _cp->symbol_at(lvtt_elem.name_cp_index)->as_utf8(),
                                  CHECK);
         }
       } else if (entry->_elem->signature_cp_index != 0 && _need_verify) {
         clear_hashtable(lvt_Hash);
-        ConstantPool* cp = cm->constants();
         classfile_parse_error("Duplicated LocalVariableTypeTable attribute "
                               "entry for '%s' in class file %s",
-                               cp->symbol_at(lvtt_elem.name_cp_index)->as_utf8(),
+                               _cp->symbol_at(lvtt_elem.name_cp_index)->as_utf8(),
                                CHECK);
       } else {
         // to add generic signatures into LocalVariableTable
@@ -1939,8 +1874,7 @@ void ClassFileParser::copy_localvariable_table(ConstMethod* cm,
 }
 
 
-void ClassFileParser::copy_method_annotations(ClassLoaderData* loader_data,
-                                       ConstMethod* cm,
+void ClassFileParser::copy_method_annotations(ConstMethod* cm,
                                        u1* runtime_visible_annotations,
                                        int runtime_visible_annotations_length,
                                        u1* runtime_invisible_annotations,
@@ -1961,8 +1895,7 @@ void ClassFileParser::copy_method_annotations(ClassLoaderData* loader_data,
 
   if (runtime_visible_annotations_length +
       runtime_invisible_annotations_length > 0) {
-     a = assemble_annotations(loader_data,
-                              runtime_visible_annotations,
+     a = assemble_annotations(runtime_visible_annotations,
                               runtime_visible_annotations_length,
                               runtime_invisible_annotations,
                               runtime_invisible_annotations_length,
@@ -1972,8 +1905,7 @@ void ClassFileParser::copy_method_annotations(ClassLoaderData* loader_data,
 
   if (runtime_visible_parameter_annotations_length +
       runtime_invisible_parameter_annotations_length > 0) {
-    a = assemble_annotations(loader_data,
-                             runtime_visible_parameter_annotations,
+    a = assemble_annotations(runtime_visible_parameter_annotations,
                              runtime_visible_parameter_annotations_length,
                              runtime_invisible_parameter_annotations,
                              runtime_invisible_parameter_annotations_length,
@@ -1982,8 +1914,7 @@ void ClassFileParser::copy_method_annotations(ClassLoaderData* loader_data,
   }
 
   if (annotation_default_length > 0) {
-    a = assemble_annotations(loader_data,
-                             annotation_default,
+    a = assemble_annotations(annotation_default,
                              annotation_default_length,
                              NULL,
                              0,
@@ -1993,8 +1924,7 @@ void ClassFileParser::copy_method_annotations(ClassLoaderData* loader_data,
 
   if (runtime_visible_type_annotations_length +
       runtime_invisible_type_annotations_length > 0) {
-    a = assemble_annotations(loader_data,
-                             runtime_visible_type_annotations,
+    a = assemble_annotations(runtime_visible_type_annotations,
                              runtime_visible_type_annotations_length,
                              runtime_invisible_type_annotations,
                              runtime_invisible_type_annotations_length,
@@ -2013,9 +1943,7 @@ void ClassFileParser::copy_method_annotations(ClassLoaderData* loader_data,
 // from the method back up to the containing klass. These flag values
 // are added to klass's access_flags.
 
-methodHandle ClassFileParser::parse_method(ClassLoaderData* loader_data,
-                                           constantPoolHandle cp,
-                                           bool is_interface,
+methodHandle ClassFileParser::parse_method(bool is_interface,
                                            AccessFlags *promoted_flags,
                                            TRAPS) {
   ClassFileStream* cfs = stream();
@@ -2026,22 +1954,20 @@ methodHandle ClassFileParser::parse_method(ClassLoaderData* loader_data,
 
   int flags = cfs->get_u2_fast();
   u2 name_index = cfs->get_u2_fast();
-  int cp_size = cp->length();
+  int cp_size = _cp->length();
   check_property(
-    valid_cp_range(name_index, cp_size) &&
-      cp->tag_at(name_index).is_utf8(),
+    valid_symbol_at(name_index),
     "Illegal constant pool index %u for method name in class file %s",
     name_index, CHECK_(nullHandle));
-  Symbol*  name = cp->symbol_at(name_index);
+  Symbol*  name = _cp->symbol_at(name_index);
   verify_legal_method_name(name, CHECK_(nullHandle));
 
   u2 signature_index = cfs->get_u2_fast();
   guarantee_property(
-    valid_cp_range(signature_index, cp_size) &&
-      cp->tag_at(signature_index).is_utf8(),
+    valid_symbol_at(signature_index),
     "Illegal constant pool index %u for method signature in class file %s",
     signature_index, CHECK_(nullHandle));
-  Symbol*  signature = cp->symbol_at(signature_index);
+  Symbol*  signature = _cp->symbol_at(signature_index);
 
   AccessFlags access_flags;
   if (name == vmSymbols::class_initializer_name()) {
@@ -2097,7 +2023,8 @@ methodHandle ClassFileParser::parse_method(ClassLoaderData* loader_data,
   bool parsed_checked_exceptions_attribute = false;
   bool parsed_stackmap_attribute = false;
   // stackmap attribute - JDK1.5
-  Array<u1>* stackmap_data = NULL;
+  u1* stackmap_data = NULL;
+  int stackmap_data_length = 0;
   u2 generic_signature_index = 0;
   MethodAnnotationCollector parsed_annotations;
   u1* runtime_visible_annotations = NULL;
@@ -2122,12 +2049,11 @@ methodHandle ClassFileParser::parse_method(ClassLoaderData* loader_data,
     u2 method_attribute_name_index = cfs->get_u2_fast();
     u4 method_attribute_length = cfs->get_u4_fast();
     check_property(
-      valid_cp_range(method_attribute_name_index, cp_size) &&
-        cp->tag_at(method_attribute_name_index).is_utf8(),
+      valid_symbol_at(method_attribute_name_index),
       "Invalid method attribute name index %u in class file %s",
       method_attribute_name_index, CHECK_(nullHandle));
 
-    Symbol* method_attribute_name = cp->symbol_at(method_attribute_name_index);
+    Symbol* method_attribute_name = _cp->symbol_at(method_attribute_name_index);
     if (method_attribute_name == vmSymbols::tag_code()) {
       // Parse Code attribute
       if (_need_verify) {
@@ -2171,7 +2097,7 @@ methodHandle ClassFileParser::parse_method(ClassLoaderData* loader_data,
       exception_table_length = cfs->get_u2_fast();
       if (exception_table_length > 0) {
         exception_table_start =
-              parse_exception_table(loader_data, code_length, exception_table_length, cp, CHECK_(nullHandle));
+              parse_exception_table(code_length, exception_table_length, CHECK_(nullHandle));
       }
 
       // Parse additional attributes in code attribute
@@ -2204,19 +2130,18 @@ methodHandle ClassFileParser::parse_method(ClassLoaderData* loader_data,
         calculated_attribute_length += code_attribute_length +
                                        sizeof(code_attribute_name_index) +
                                        sizeof(code_attribute_length);
-        check_property(valid_cp_range(code_attribute_name_index, cp_size) &&
-                       cp->tag_at(code_attribute_name_index).is_utf8(),
+        check_property(valid_symbol_at(code_attribute_name_index),
                        "Invalid code attribute name index %u in class file %s",
                        code_attribute_name_index,
                        CHECK_(nullHandle));
         if (LoadLineNumberTables &&
-            cp->symbol_at(code_attribute_name_index) == vmSymbols::tag_line_number_table()) {
+            _cp->symbol_at(code_attribute_name_index) == vmSymbols::tag_line_number_table()) {
           // Parse and compress line number table
           parse_linenumber_table(code_attribute_length, code_length,
             &linenumber_table, CHECK_(nullHandle));
 
         } else if (LoadLocalVariableTables &&
-                   cp->symbol_at(code_attribute_name_index) == vmSymbols::tag_local_variable_table()) {
+                   _cp->symbol_at(code_attribute_name_index) == vmSymbols::tag_local_variable_table()) {
           // Parse local variable table
           if (!lvt_allocated) {
             localvariable_table_length = NEW_RESOURCE_ARRAY_IN_THREAD(
@@ -2238,7 +2163,6 @@ methodHandle ClassFileParser::parse_method(ClassLoaderData* loader_data,
             parse_localvariable_table(code_length,
                                       max_locals,
                                       code_attribute_length,
-                                      cp,
                                       &localvariable_table_length[lvt_cnt],
                                       false,    // is not LVTT
                                       CHECK_(nullHandle));
@@ -2246,7 +2170,7 @@ methodHandle ClassFileParser::parse_method(ClassLoaderData* loader_data,
           lvt_cnt++;
         } else if (LoadLocalVariableTypeTables &&
                    _major_version >= JAVA_1_5_VERSION &&
-                   cp->symbol_at(code_attribute_name_index) == vmSymbols::tag_local_variable_type_table()) {
+                   _cp->symbol_at(code_attribute_name_index) == vmSymbols::tag_local_variable_type_table()) {
           if (!lvt_allocated) {
             localvariable_table_length = NEW_RESOURCE_ARRAY_IN_THREAD(
               THREAD, u2,  INITIAL_MAX_LVT_NUMBER);
@@ -2268,19 +2192,19 @@ methodHandle ClassFileParser::parse_method(ClassLoaderData* loader_data,
             parse_localvariable_table(code_length,
                                       max_locals,
                                       code_attribute_length,
-                                      cp,
                                       &localvariable_type_table_length[lvtt_cnt],
                                       true,     // is LVTT
                                       CHECK_(nullHandle));
           lvtt_cnt++;
         } else if (UseSplitVerifier &&
                    _major_version >= Verifier::STACKMAP_ATTRIBUTE_MAJOR_VERSION &&
-                   cp->symbol_at(code_attribute_name_index) == vmSymbols::tag_stack_map_table()) {
+                   _cp->symbol_at(code_attribute_name_index) == vmSymbols::tag_stack_map_table()) {
           // Stack map is only needed by the new verifier in JDK1.5.
           if (parsed_stackmap_attribute) {
             classfile_parse_error("Multiple StackMapTable attributes in class file %s", CHECK_(nullHandle));
           }
-          stackmap_data = parse_stackmap_table(loader_data, code_attribute_length, CHECK_(nullHandle));
+          stackmap_data = parse_stackmap_table(code_attribute_length, CHECK_(nullHandle));
+          stackmap_data_length = code_attribute_length;
           parsed_stackmap_attribute = true;
         } else {
           // Skip unknown attributes
@@ -2301,7 +2225,7 @@ methodHandle ClassFileParser::parse_method(ClassLoaderData* loader_data,
       checked_exceptions_start =
             parse_checked_exceptions(&checked_exceptions_length,
                                      method_attribute_length,
-                                     cp, CHECK_(nullHandle));
+                                     CHECK_(nullHandle));
     } else if (method_attribute_name == vmSymbols::tag_method_parameters()) {
       // reject multiple method parameters
       if (method_parameters_seen) {
@@ -2359,9 +2283,8 @@ methodHandle ClassFileParser::parse_method(ClassLoaderData* loader_data,
         runtime_visible_annotations_length = method_attribute_length;
         runtime_visible_annotations = cfs->get_u1_buffer();
         assert(runtime_visible_annotations != NULL, "null visible annotations");
-        parse_annotations(loader_data,
-            runtime_visible_annotations,
-            runtime_visible_annotations_length, cp, &parsed_annotations,
+        parse_annotations(runtime_visible_annotations,
+            runtime_visible_annotations_length, &parsed_annotations,
             CHECK_(nullHandle));
         cfs->skip_u1(runtime_visible_annotations_length, CHECK_(nullHandle));
       } else if (PreserveAllAnnotations && method_attribute_name == vmSymbols::tag_runtime_invisible_annotations()) {
@@ -2434,18 +2357,18 @@ methodHandle ClassFileParser::parse_method(ClassLoaderData* loader_data,
       0);
 
   Method* m = Method::allocate(
-      loader_data, code_length, access_flags, &sizes,
+      _loader_data, code_length, access_flags, &sizes,
       ConstMethod::NORMAL, CHECK_(nullHandle));
 
   ClassLoadingService::add_class_method_size(m->size()*HeapWordSize);
 
   // Fill in information from fixed part (access_flags already set)
-  m->set_constants(cp());
+  m->set_constants(_cp);
   m->set_name_index(name_index);
   m->set_signature_index(signature_index);
 #ifdef CC_INTERP
   // hmm is there a gc issue here??
-  ResultTypeFinder rtf(cp->symbol_at(signature_index));
+  ResultTypeFinder rtf(_cp->symbol_at(signature_index));
   m->set_result_index(rtf.type());
 #endif
 
@@ -2464,7 +2387,10 @@ methodHandle ClassFileParser::parse_method(ClassLoaderData* loader_data,
   // Fill in code attribute information
   m->set_max_stack(max_stack);
   m->set_max_locals(max_locals);
-  m->constMethod()->set_stackmap_data(stackmap_data);
+  if (stackmap_data != NULL) {
+    m->constMethod()->copy_stackmap_data(_loader_data, stackmap_data,
+                                         stackmap_data_length, CHECK_NULL);
+  }
 
   // Copy byte codes
   m->set_code(code_start);
@@ -2520,7 +2446,7 @@ methodHandle ClassFileParser::parse_method(ClassLoaderData* loader_data,
     parsed_annotations.apply_to(m);
 
   // Copy annotations
-  copy_method_annotations(loader_data, m->constMethod(),
+  copy_method_annotations(m->constMethod(),
                           runtime_visible_annotations,
                           runtime_visible_annotations_length,
                           runtime_invisible_annotations,
@@ -2560,9 +2486,7 @@ methodHandle ClassFileParser::parse_method(ClassLoaderData* loader_data,
 // from the methods back up to the containing klass. These flag values
 // are added to klass's access_flags.
 
-Array<Method*>* ClassFileParser::parse_methods(ClassLoaderData* loader_data,
-                                               constantPoolHandle cp,
-                                               bool is_interface,
+Array<Method*>* ClassFileParser::parse_methods(bool is_interface,
                                                AccessFlags* promoted_flags,
                                                bool* has_final_method,
                                                bool* has_default_methods,
@@ -2571,15 +2495,13 @@ Array<Method*>* ClassFileParser::parse_methods(ClassLoaderData* loader_data,
   cfs->guarantee_more(2, CHECK_NULL);  // length
   u2 length = cfs->get_u2_fast();
   if (length == 0) {
-    return Universe::the_empty_method_array();
+    _methods = Universe::the_empty_method_array();
   } else {
-    // FIXME: Handle leaks at later failures.
-    Array<Method*>* methods = MetadataFactory::new_array<Method*>(loader_data, length, NULL, CHECK_NULL);
+    _methods = MetadataFactory::new_array<Method*>(_loader_data, length, NULL, CHECK_NULL);
 
     HandleMark hm(THREAD);
     for (int index = 0; index < length; index++) {
-      methodHandle method = parse_method(loader_data,
-                                         cp, is_interface,
+      methodHandle method = parse_method(is_interface,
                                          promoted_flags,
                                          CHECK_NULL);
 
@@ -2590,7 +2512,7 @@ Array<Method*>* ClassFileParser::parse_methods(ClassLoaderData* loader_data,
         // default method
         *has_default_methods = true;
       }
-      methods->at_put(index, method());
+      _methods->at_put(index, method());
     }
 
     if (_need_verify && length > 1) {
@@ -2603,7 +2525,7 @@ Array<Method*>* ClassFileParser::parse_methods(ClassLoaderData* loader_data,
       {
         debug_only(No_Safepoint_Verifier nsv;)
         for (int i = 0; i < length; i++) {
-          Method* m = methods->at(i);
+          Method* m = _methods->at(i);
           // If no duplicates, add name/signature in hashtable names_and_sigs.
           if (!put_after_lookup(m->name(), m->signature(), names_and_sigs)) {
             dup = true;
@@ -2616,14 +2538,12 @@ Array<Method*>* ClassFileParser::parse_methods(ClassLoaderData* loader_data,
                               CHECK_NULL);
       }
     }
-    return methods;
   }
+  return _methods;
 }
 
 
-Array<int>* ClassFileParser::sort_methods(ClassLoaderData* loader_data,
-                                          Array<Method*>* methods,
-                                          TRAPS) {
+intArray* ClassFileParser::sort_methods(Array<Method*>* methods) {
   int length = methods->length();
   // If JVMTI original method ordering or sharing is enabled we have to
   // remember the original class file ordering.
@@ -2641,10 +2561,11 @@ Array<int>* ClassFileParser::sort_methods(ClassLoaderData* loader_data,
   // Note that the ordering is not alphabetical, see Symbol::fast_compare
   Method::sort_methods(methods);
 
+  intArray* method_ordering = NULL;
   // If JVMTI original method ordering or sharing is enabled construct int
   // array remembering the original ordering
   if (JvmtiExport::can_maintain_original_method_order() || DumpSharedSpaces) {
-    Array<int>* method_ordering = MetadataFactory::new_array<int>(loader_data, length, CHECK_NULL);
+    method_ordering = new intArray(length);
     for (int index = 0; index < length; index++) {
       Method* m = methods->at(index);
       int old_index = m->vtable_index();
@@ -2652,29 +2573,25 @@ Array<int>* ClassFileParser::sort_methods(ClassLoaderData* loader_data,
       method_ordering->at_put(index, old_index);
       m->set_vtable_index(Method::invalid_vtable_index);
     }
-    return method_ordering;
-  } else {
-    return Universe::the_empty_int_array();
   }
+  return method_ordering;
 }
 
 
-void ClassFileParser::parse_classfile_sourcefile_attribute(constantPoolHandle cp, TRAPS) {
+void ClassFileParser::parse_classfile_sourcefile_attribute(TRAPS) {
   ClassFileStream* cfs = stream();
   cfs->guarantee_more(2, CHECK);  // sourcefile_index
   u2 sourcefile_index = cfs->get_u2_fast();
   check_property(
-    valid_cp_range(sourcefile_index, cp->length()) &&
-      cp->tag_at(sourcefile_index).is_utf8(),
+    valid_symbol_at(sourcefile_index),
     "Invalid SourceFile attribute at constant pool index %u in class file %s",
     sourcefile_index, CHECK);
-  set_class_sourcefile(cp->symbol_at(sourcefile_index));
+  set_class_sourcefile(_cp->symbol_at(sourcefile_index));
 }
 
 
 
-void ClassFileParser::parse_classfile_source_debug_extension_attribute(constantPoolHandle cp,
-                                                                       int length, TRAPS) {
+void ClassFileParser::parse_classfile_source_debug_extension_attribute(int length, TRAPS) {
   ClassFileStream* cfs = stream();
   u1* sde_buffer = cfs->get_u1_buffer();
   assert(sde_buffer != NULL, "null sde buffer");
@@ -2698,12 +2615,10 @@ void ClassFileParser::parse_classfile_source_debug_extension_attribute(constantP
 #define RECOGNIZED_INNER_CLASS_MODIFIERS (JVM_RECOGNIZED_CLASS_MODIFIERS | JVM_ACC_PRIVATE | JVM_ACC_PROTECTED | JVM_ACC_STATIC)
 
 // Return number of classes in the inner classes attribute table
-u2 ClassFileParser::parse_classfile_inner_classes_attribute(ClassLoaderData* loader_data,
-                                                            u1* inner_classes_attribute_start,
+u2 ClassFileParser::parse_classfile_inner_classes_attribute(u1* inner_classes_attribute_start,
                                                             bool parsed_enclosingmethod_attribute,
                                                             u2 enclosing_method_class_index,
                                                             u2 enclosing_method_method_index,
-                                                            constantPoolHandle cp,
                                                             TRAPS) {
   ClassFileStream* cfs = stream();
   u1* current_mark = cfs->current();
@@ -2724,33 +2639,31 @@ u2 ClassFileParser::parse_classfile_inner_classes_attribute(ClassLoaderData* loa
   //    enclosing_method_class_index,
   //    enclosing_method_method_index]
   int size = length * 4 + (parsed_enclosingmethod_attribute ? 2 : 0);
-  // FIXME: Will leak on exceptions.
-  Array<u2>* inner_classes = MetadataFactory::new_array<u2>(loader_data, size, CHECK_0);
+  Array<u2>* inner_classes = MetadataFactory::new_array<u2>(_loader_data, size, CHECK_0);
+  _inner_classes = inner_classes;
+
   int index = 0;
-  int cp_size = cp->length();
+  int cp_size = _cp->length();
   cfs->guarantee_more(8 * length, CHECK_0);  // 4-tuples of u2
   for (int n = 0; n < length; n++) {
     // Inner class index
     u2 inner_class_info_index = cfs->get_u2_fast();
     check_property(
       inner_class_info_index == 0 ||
-        (valid_cp_range(inner_class_info_index, cp_size) &&
-        is_klass_reference(cp, inner_class_info_index)),
+        valid_klass_reference_at(inner_class_info_index),
       "inner_class_info_index %u has bad constant type in class file %s",
       inner_class_info_index, CHECK_0);
     // Outer class index
     u2 outer_class_info_index = cfs->get_u2_fast();
     check_property(
       outer_class_info_index == 0 ||
-        (valid_cp_range(outer_class_info_index, cp_size) &&
-        is_klass_reference(cp, outer_class_info_index)),
+        valid_klass_reference_at(outer_class_info_index),
       "outer_class_info_index %u has bad constant type in class file %s",
       outer_class_info_index, CHECK_0);
     // Inner class name
     u2 inner_name_index = cfs->get_u2_fast();
     check_property(
-      inner_name_index == 0 || (valid_cp_range(inner_name_index, cp_size) &&
-        cp->tag_at(inner_name_index).is_utf8()),
+      inner_name_index == 0 || valid_symbol_at(inner_name_index),
       "inner_name_index %u has bad constant type in class file %s",
       inner_name_index, CHECK_0);
     if (_need_verify) {
@@ -2794,33 +2707,27 @@ u2 ClassFileParser::parse_classfile_inner_classes_attribute(ClassLoaderData* loa
   }
   assert(index == size, "wrong size");
 
-  // Update InstanceKlass with inner class info.
-  set_class_inner_classes(inner_classes);
-
   // Restore buffer's current position.
   cfs->set_current(current_mark);
 
   return length;
 }
 
-void ClassFileParser::parse_classfile_synthetic_attribute(constantPoolHandle cp, TRAPS) {
+void ClassFileParser::parse_classfile_synthetic_attribute(TRAPS) {
   set_class_synthetic_flag(true);
 }
 
-void ClassFileParser::parse_classfile_signature_attribute(constantPoolHandle cp, TRAPS) {
+void ClassFileParser::parse_classfile_signature_attribute(TRAPS) {
   ClassFileStream* cfs = stream();
   u2 signature_index = cfs->get_u2(CHECK);
   check_property(
-    valid_cp_range(signature_index, cp->length()) &&
-      cp->tag_at(signature_index).is_utf8(),
+    valid_symbol_at(signature_index),
     "Invalid constant pool index %u in Signature attribute in class file %s",
     signature_index, CHECK);
-  set_class_generic_signature(cp->symbol_at(signature_index));
+  set_class_generic_signature(_cp->symbol_at(signature_index));
 }
 
-void ClassFileParser::parse_classfile_bootstrap_methods_attribute(ClassLoaderData* loader_data,
-                                                                  constantPoolHandle cp,
-                                                                  u4 attribute_byte_length, TRAPS) {
+void ClassFileParser::parse_classfile_bootstrap_methods_attribute(u4 attribute_byte_length, TRAPS) {
   ClassFileStream* cfs = stream();
   u1* current_start = cfs->current();
 
@@ -2841,10 +2748,14 @@ void ClassFileParser::parse_classfile_bootstrap_methods_attribute(ClassLoaderDat
   // The array begins with a series of short[2] pairs, one for each tuple.
   int index_size = (attribute_array_length * 2);
 
-  Array<u2>* operands = MetadataFactory::new_array<u2>(loader_data, index_size + operand_count, CHECK);
+  Array<u2>* operands = MetadataFactory::new_array<u2>(_loader_data, index_size + operand_count, CHECK);
+
+  // Eagerly assign operands so they will be deallocated with the constant
+  // pool if there is an error.
+  _cp->set_operands(operands);
 
   int operand_fill_index = index_size;
-  int cp_size = cp->length();
+  int cp_size = _cp->length();
 
   for (int n = 0; n < attribute_array_length; n++) {
     // Store a 32-bit offset into the header of the operand array.
@@ -2856,7 +2767,7 @@ void ClassFileParser::parse_classfile_bootstrap_methods_attribute(ClassLoaderDat
     u2 argument_count = cfs->get_u2_fast();
     check_property(
       valid_cp_range(bootstrap_method_index, cp_size) &&
-      cp->tag_at(bootstrap_method_index).is_method_handle(),
+      _cp->tag_at(bootstrap_method_index).is_method_handle(),
       "bootstrap_method_index %u has bad constant type in class file %s",
       bootstrap_method_index,
       CHECK);
@@ -2868,7 +2779,7 @@ void ClassFileParser::parse_classfile_bootstrap_methods_attribute(ClassLoaderDat
       u2 argument_index = cfs->get_u2_fast();
       check_property(
         valid_cp_range(argument_index, cp_size) &&
-        cp->tag_at(argument_index).is_loadable_constant(),
+        _cp->tag_at(argument_index).is_loadable_constant(),
         "argument_index %u has bad constant type in class file %s",
         argument_index,
         CHECK);
@@ -2883,17 +2794,13 @@ void ClassFileParser::parse_classfile_bootstrap_methods_attribute(ClassLoaderDat
   guarantee_property(current_end == current_start + attribute_byte_length,
                      "Bad length on BootstrapMethods in class file %s",
                      CHECK);
-
-  cp->set_operands(operands);
 }
 
-void ClassFileParser::parse_classfile_attributes(ClassLoaderData* loader_data,
-                                                 constantPoolHandle cp,
-                                                 ClassFileParser::ClassAnnotationCollector* parsed_annotations,
+void ClassFileParser::parse_classfile_attributes(ClassFileParser::ClassAnnotationCollector* parsed_annotations,
                                                  TRAPS) {
   ClassFileStream* cfs = stream();
   // Set inner classes attribute to default sentinel
-  set_class_inner_classes(Universe::the_empty_short_array());
+  _inner_classes = Universe::the_empty_short_array();
   cfs->guarantee_more(2, CHECK);  // attributes_count
   u2 attributes_count = cfs->get_u2_fast();
   bool parsed_sourcefile_attribute = false;
@@ -2918,11 +2825,10 @@ void ClassFileParser::parse_classfile_attributes(ClassLoaderData* loader_data,
     u2 attribute_name_index = cfs->get_u2_fast();
     u4 attribute_length = cfs->get_u4_fast();
     check_property(
-      valid_cp_range(attribute_name_index, cp->length()) &&
-        cp->tag_at(attribute_name_index).is_utf8(),
+      valid_symbol_at(attribute_name_index),
       "Attribute name has bad constant pool index %u in class file %s",
       attribute_name_index, CHECK);
-    Symbol* tag = cp->symbol_at(attribute_name_index);
+    Symbol* tag = _cp->symbol_at(attribute_name_index);
     if (tag == vmSymbols::tag_source_file()) {
       // Check for SourceFile tag
       if (_need_verify) {
@@ -2933,10 +2839,10 @@ void ClassFileParser::parse_classfile_attributes(ClassLoaderData* loader_data,
       } else {
         parsed_sourcefile_attribute = true;
       }
-      parse_classfile_sourcefile_attribute(cp, CHECK);
+      parse_classfile_sourcefile_attribute(CHECK);
     } else if (tag == vmSymbols::tag_source_debug_extension()) {
       // Check for SourceDebugExtension tag
-      parse_classfile_source_debug_extension_attribute(cp, (int)attribute_length, CHECK);
+      parse_classfile_source_debug_extension_attribute((int)attribute_length, CHECK);
     } else if (tag == vmSymbols::tag_inner_classes()) {
       // Check for InnerClasses tag
       if (parsed_innerclasses_attribute) {
@@ -2955,7 +2861,7 @@ void ClassFileParser::parse_classfile_attributes(ClassLoaderData* loader_data,
           "Invalid Synthetic classfile attribute length %u in class file %s",
           attribute_length, CHECK);
       }
-      parse_classfile_synthetic_attribute(cp, CHECK);
+      parse_classfile_synthetic_attribute(CHECK);
     } else if (tag == vmSymbols::tag_deprecated()) {
       // Check for Deprecatd tag - 4276120
       if (attribute_length != 0) {
@@ -2970,15 +2876,13 @@ void ClassFileParser::parse_classfile_attributes(ClassLoaderData* loader_data,
             "Wrong Signature attribute length %u in class file %s",
             attribute_length, CHECK);
         }
-        parse_classfile_signature_attribute(cp, CHECK);
+        parse_classfile_signature_attribute(CHECK);
       } else if (tag == vmSymbols::tag_runtime_visible_annotations()) {
         runtime_visible_annotations_length = attribute_length;
         runtime_visible_annotations = cfs->get_u1_buffer();
         assert(runtime_visible_annotations != NULL, "null visible annotations");
-        parse_annotations(loader_data,
-                          runtime_visible_annotations,
+        parse_annotations(runtime_visible_annotations,
                           runtime_visible_annotations_length,
-                          cp,
                           parsed_annotations,
                           CHECK);
         cfs->skip_u1(runtime_visible_annotations_length, CHECK);
@@ -3000,13 +2904,11 @@ void ClassFileParser::parse_classfile_attributes(ClassLoaderData* loader_data,
           classfile_parse_error("Invalid class index in EnclosingMethod attribute in class file %s", CHECK);
         }
         // Validate the constant pool indices and types
-        if (!cp->is_within_bounds(enclosing_method_class_index) ||
-            !is_klass_reference(cp, enclosing_method_class_index)) {
-          classfile_parse_error("Invalid or out-of-bounds class index in EnclosingMethod attribute in class file %s", CHECK);
-        }
+        check_property(valid_klass_reference_at(enclosing_method_class_index),
+          "Invalid or out-of-bounds class index in EnclosingMethod attribute in class file %s", CHECK);
         if (enclosing_method_method_index != 0 &&
-            (!cp->is_within_bounds(enclosing_method_method_index) ||
-             !cp->tag_at(enclosing_method_method_index).is_name_and_type())) {
+            (!_cp->is_within_bounds(enclosing_method_method_index) ||
+             !_cp->tag_at(enclosing_method_method_index).is_name_and_type())) {
           classfile_parse_error("Invalid or out-of-bounds method index in EnclosingMethod attribute in class file %s", CHECK);
         }
       } else if (tag == vmSymbols::tag_bootstrap_methods() &&
@@ -3014,7 +2916,7 @@ void ClassFileParser::parse_classfile_attributes(ClassLoaderData* loader_data,
         if (parsed_bootstrap_methods_attribute)
           classfile_parse_error("Multiple BootstrapMethods attributes in class file %s", CHECK);
         parsed_bootstrap_methods_attribute = true;
-        parse_classfile_bootstrap_methods_attribute(loader_data, cp, attribute_length, CHECK);
+        parse_classfile_bootstrap_methods_attribute(attribute_length, CHECK);
       } else if (tag == vmSymbols::tag_runtime_visible_type_annotations()) {
         runtime_visible_type_annotations_length = attribute_length;
         runtime_visible_type_annotations = cfs->get_u1_buffer();
@@ -3035,29 +2937,24 @@ void ClassFileParser::parse_classfile_attributes(ClassLoaderData* loader_data,
       cfs->skip_u1(attribute_length, CHECK);
     }
   }
-  AnnotationArray* annotations = assemble_annotations(loader_data,
-                                                      runtime_visible_annotations,
-                                                      runtime_visible_annotations_length,
-                                                      runtime_invisible_annotations,
-                                                      runtime_invisible_annotations_length,
-                                                      CHECK);
-  set_class_annotations(annotations);
-  AnnotationArray* type_annotations = assemble_annotations(loader_data,
-                                                           runtime_visible_type_annotations,
-                                                           runtime_visible_type_annotations_length,
-                                                           runtime_invisible_type_annotations,
-                                                           runtime_invisible_type_annotations_length,
-                                                           CHECK);
-  set_class_type_annotations(type_annotations);
+  _annotations = assemble_annotations(runtime_visible_annotations,
+                                      runtime_visible_annotations_length,
+                                      runtime_invisible_annotations,
+                                      runtime_invisible_annotations_length,
+                                      CHECK);
+  _type_annotations = assemble_annotations(runtime_visible_type_annotations,
+                                           runtime_visible_type_annotations_length,
+                                           runtime_invisible_type_annotations,
+                                           runtime_invisible_type_annotations_length,
+                                           CHECK);
 
   if (parsed_innerclasses_attribute || parsed_enclosingmethod_attribute) {
     u2 num_of_classes = parse_classfile_inner_classes_attribute(
-                            loader_data,
                             inner_classes_attribute_start,
                             parsed_innerclasses_attribute,
                             enclosing_method_class_index,
                             enclosing_method_method_index,
-                            cp, CHECK);
+                            CHECK);
     if (parsed_innerclasses_attribute &&_need_verify && _major_version >= JAVA_1_5_VERSION) {
       guarantee_property(
         inner_classes_attribute_length == sizeof(num_of_classes) + 4 * sizeof(u2) * num_of_classes,
@@ -3085,18 +2982,43 @@ void ClassFileParser::apply_parsed_class_attributes(instanceKlassHandle k) {
   if (_sde_buffer != NULL) {
     k->set_source_debug_extension(_sde_buffer, _sde_length);
   }
-  k->set_inner_classes(_inner_classes);
 }
 
-AnnotationArray* ClassFileParser::assemble_annotations(ClassLoaderData* loader_data,
-                                                       u1* runtime_visible_annotations,
+// Transfer ownership of metadata allocated to the InstanceKlass.
+void ClassFileParser::apply_parsed_class_metadata(
+                                            instanceKlassHandle this_klass,
+                                            int java_fields_count, TRAPS) {
+  // Assign annotations if needed
+  if (_annotations != NULL || _type_annotations != NULL ||
+      _fields_annotations != NULL || _fields_type_annotations != NULL) {
+    Annotations* annotations = Annotations::allocate(_loader_data, CHECK);
+    annotations->set_class_annotations(_annotations);
+    annotations->set_class_type_annotations(_type_annotations);
+    annotations->set_fields_annotations(_fields_annotations);
+    annotations->set_fields_type_annotations(_fields_type_annotations);
+    this_klass->set_annotations(annotations);
+  }
+
+  _cp->set_pool_holder(this_klass());
+  this_klass->set_constants(_cp);
+  this_klass->set_fields(_fields, java_fields_count);
+  this_klass->set_methods(_methods);
+  this_klass->set_inner_classes(_inner_classes);
+  this_klass->set_local_interfaces(_local_interfaces);
+  this_klass->set_transitive_interfaces(_transitive_interfaces);
+
+  // Clear out these fields so they don't get deallocated by the destructor
+  clear_class_metadata();
+}
+
+AnnotationArray* ClassFileParser::assemble_annotations(u1* runtime_visible_annotations,
                                                        int runtime_visible_annotations_length,
                                                        u1* runtime_invisible_annotations,
                                                        int runtime_invisible_annotations_length, TRAPS) {
   AnnotationArray* annotations = NULL;
   if (runtime_visible_annotations != NULL ||
       runtime_invisible_annotations != NULL) {
-    annotations = MetadataFactory::new_array<u1>(loader_data,
+    annotations = MetadataFactory::new_array<u1>(_loader_data,
                                           runtime_visible_annotations_length +
                                           runtime_invisible_annotations_length,
                                           CHECK_(annotations));
@@ -3144,6 +3066,581 @@ static void parseAndPrintGenericSignatures(
 #endif // ndef PRODUCT
 
 
+instanceKlassHandle ClassFileParser::parse_super_class(int super_class_index,
+                                                       TRAPS) {
+  instanceKlassHandle super_klass;
+  if (super_class_index == 0) {
+    check_property(_class_name == vmSymbols::java_lang_Object(),
+                   "Invalid superclass index %u in class file %s",
+                   super_class_index,
+                   CHECK_NULL);
+  } else {
+    check_property(valid_klass_reference_at(super_class_index),
+                   "Invalid superclass index %u in class file %s",
+                   super_class_index,
+                   CHECK_NULL);
+    // The class name should be legal because it is checked when parsing constant pool.
+    // However, make sure it is not an array type.
+    bool is_array = false;
+    if (_cp->tag_at(super_class_index).is_klass()) {
+      super_klass = instanceKlassHandle(THREAD, _cp->resolved_klass_at(super_class_index));
+      if (_need_verify)
+        is_array = super_klass->oop_is_array();
+    } else if (_need_verify) {
+      is_array = (_cp->unresolved_klass_at(super_class_index)->byte_at(0) == JVM_SIGNATURE_ARRAY);
+    }
+    if (_need_verify) {
+      guarantee_property(!is_array,
+                        "Bad superclass name in class file %s", CHECK_NULL);
+    }
+  }
+  return super_klass;
+}
+
+
+// Values needed for oopmap and InstanceKlass creation
+class FieldLayoutInfo : public StackObj {
+ public:
+  int*          nonstatic_oop_offsets;
+  unsigned int* nonstatic_oop_counts;
+  unsigned int  nonstatic_oop_map_count;
+  unsigned int  total_oop_map_count;
+  int           instance_size;
+  int           nonstatic_field_size;
+  int           static_field_size;
+  bool          has_nonstatic_fields;
+};
+
+// Layout fields and fill in FieldLayoutInfo.  Could use more refactoring!
+void ClassFileParser::layout_fields(Handle class_loader,
+                                    FieldAllocationCount* fac,
+                                    ClassAnnotationCollector* parsed_annotations,
+                                    FieldLayoutInfo* info,
+                                    TRAPS) {
+
+  // get the padding width from the option
+  // TODO: Ask VM about specific CPU we are running on
+  int pad_size = ContendedPaddingWidth;
+
+  // Field size and offset computation
+  int nonstatic_field_size = _super_klass() == NULL ? 0 : _super_klass()->nonstatic_field_size();
+#ifndef PRODUCT
+  int orig_nonstatic_field_size = 0;
+#endif
+  int next_static_oop_offset;
+  int next_static_double_offset;
+  int next_static_word_offset;
+  int next_static_short_offset;
+  int next_static_byte_offset;
+  int next_nonstatic_oop_offset;
+  int next_nonstatic_double_offset;
+  int next_nonstatic_word_offset;
+  int next_nonstatic_short_offset;
+  int next_nonstatic_byte_offset;
+  int next_nonstatic_type_offset;
+  int first_nonstatic_oop_offset;
+  int first_nonstatic_field_offset;
+  int next_nonstatic_field_offset;
+  int next_nonstatic_padded_offset;
+
+  // Count the contended fields by type.
+  int nonstatic_contended_count = 0;
+  FieldAllocationCount fac_contended;
+  for (AllFieldStream fs(_fields, _cp); !fs.done(); fs.next()) {
+    FieldAllocationType atype = (FieldAllocationType) fs.allocation_type();
+    if (fs.is_contended()) {
+      fac_contended.count[atype]++;
+      if (!fs.access_flags().is_static()) {
+        nonstatic_contended_count++;
+      }
+    }
+  }
+  int contended_count = nonstatic_contended_count;
+
+
+  // Calculate the starting byte offsets
+  next_static_oop_offset      = InstanceMirrorKlass::offset_of_static_fields();
+  next_static_double_offset   = next_static_oop_offset +
+                                ((fac->count[STATIC_OOP]) * heapOopSize);
+  if ( fac->count[STATIC_DOUBLE] &&
+       (Universe::field_type_should_be_aligned(T_DOUBLE) ||
+        Universe::field_type_should_be_aligned(T_LONG)) ) {
+    next_static_double_offset = align_size_up(next_static_double_offset, BytesPerLong);
+  }
+
+  next_static_word_offset     = next_static_double_offset +
+                                ((fac->count[STATIC_DOUBLE]) * BytesPerLong);
+  next_static_short_offset    = next_static_word_offset +
+                                ((fac->count[STATIC_WORD]) * BytesPerInt);
+  next_static_byte_offset     = next_static_short_offset +
+                                ((fac->count[STATIC_SHORT]) * BytesPerShort);
+
+  first_nonstatic_field_offset = instanceOopDesc::base_offset_in_bytes() +
+                                 nonstatic_field_size * heapOopSize;
+
+  // class is contended, pad before all the fields
+  if (parsed_annotations->is_contended()) {
+    first_nonstatic_field_offset += pad_size;
+  }
+
+  next_nonstatic_field_offset = first_nonstatic_field_offset;
+
+  unsigned int nonstatic_double_count = fac->count[NONSTATIC_DOUBLE] - fac_contended.count[NONSTATIC_DOUBLE];
+  unsigned int nonstatic_word_count   = fac->count[NONSTATIC_WORD]   - fac_contended.count[NONSTATIC_WORD];
+  unsigned int nonstatic_short_count  = fac->count[NONSTATIC_SHORT]  - fac_contended.count[NONSTATIC_SHORT];
+  unsigned int nonstatic_byte_count   = fac->count[NONSTATIC_BYTE]   - fac_contended.count[NONSTATIC_BYTE];
+  unsigned int nonstatic_oop_count    = fac->count[NONSTATIC_OOP]    - fac_contended.count[NONSTATIC_OOP];
+
+  bool super_has_nonstatic_fields =
+          (_super_klass() != NULL && _super_klass->has_nonstatic_fields());
+  bool has_nonstatic_fields = super_has_nonstatic_fields ||
+          ((nonstatic_double_count + nonstatic_word_count +
+            nonstatic_short_count + nonstatic_byte_count +
+            nonstatic_oop_count) != 0);
+
+
+  // Prepare list of oops for oop map generation.
+  int* nonstatic_oop_offsets;
+  unsigned int* nonstatic_oop_counts;
+  unsigned int nonstatic_oop_map_count = 0;
+
+  nonstatic_oop_offsets = NEW_RESOURCE_ARRAY_IN_THREAD(
+            THREAD, int, nonstatic_oop_count + 1);
+  nonstatic_oop_counts  = NEW_RESOURCE_ARRAY_IN_THREAD(
+            THREAD, unsigned int, nonstatic_oop_count + 1);
+
+  first_nonstatic_oop_offset = 0; // will be set for first oop field
+
+#ifndef PRODUCT
+  if( PrintCompactFieldsSavings ) {
+    next_nonstatic_double_offset = next_nonstatic_field_offset +
+                                   (nonstatic_oop_count * heapOopSize);
+    if ( nonstatic_double_count > 0 ) {
+      next_nonstatic_double_offset = align_size_up(next_nonstatic_double_offset, BytesPerLong);
+    }
+    next_nonstatic_word_offset  = next_nonstatic_double_offset +
+                                  (nonstatic_double_count * BytesPerLong);
+    next_nonstatic_short_offset = next_nonstatic_word_offset +
+                                  (nonstatic_word_count * BytesPerInt);
+    next_nonstatic_byte_offset  = next_nonstatic_short_offset +
+                                  (nonstatic_short_count * BytesPerShort);
+    next_nonstatic_type_offset  = align_size_up((next_nonstatic_byte_offset +
+                                  nonstatic_byte_count ), heapOopSize );
+    orig_nonstatic_field_size   = nonstatic_field_size +
+    ((next_nonstatic_type_offset - first_nonstatic_field_offset)/heapOopSize);
+  }
+#endif
+  bool compact_fields   = CompactFields;
+  int  allocation_style = FieldsAllocationStyle;
+  if( allocation_style < 0 || allocation_style > 2 ) { // Out of range?
+    assert(false, "0 <= FieldsAllocationStyle <= 2");
+    allocation_style = 1; // Optimistic
+  }
+
+  // The next classes have predefined hard-coded fields offsets
+  // (see in JavaClasses::compute_hard_coded_offsets()).
+  // Use default fields allocation order for them.
+  if( (allocation_style != 0 || compact_fields ) && class_loader.is_null() &&
+      (_class_name == vmSymbols::java_lang_AssertionStatusDirectives() ||
+       _class_name == vmSymbols::java_lang_Class() ||
+       _class_name == vmSymbols::java_lang_ClassLoader() ||
+       _class_name == vmSymbols::java_lang_ref_Reference() ||
+       _class_name == vmSymbols::java_lang_ref_SoftReference() ||
+       _class_name == vmSymbols::java_lang_StackTraceElement() ||
+       _class_name == vmSymbols::java_lang_String() ||
+       _class_name == vmSymbols::java_lang_Throwable() ||
+       _class_name == vmSymbols::java_lang_Boolean() ||
+       _class_name == vmSymbols::java_lang_Character() ||
+       _class_name == vmSymbols::java_lang_Float() ||
+       _class_name == vmSymbols::java_lang_Double() ||
+       _class_name == vmSymbols::java_lang_Byte() ||
+       _class_name == vmSymbols::java_lang_Short() ||
+       _class_name == vmSymbols::java_lang_Integer() ||
+       _class_name == vmSymbols::java_lang_Long())) {
+    allocation_style = 0;     // Allocate oops first
+    compact_fields   = false; // Don't compact fields
+  }
+
+  if( allocation_style == 0 ) {
+    // Fields order: oops, longs/doubles, ints, shorts/chars, bytes, padded fields
+    next_nonstatic_oop_offset    = next_nonstatic_field_offset;
+    next_nonstatic_double_offset = next_nonstatic_oop_offset +
+                                    (nonstatic_oop_count * heapOopSize);
+  } else if( allocation_style == 1 ) {
+    // Fields order: longs/doubles, ints, shorts/chars, bytes, oops, padded fields
+    next_nonstatic_double_offset = next_nonstatic_field_offset;
+  } else if( allocation_style == 2 ) {
+    // Fields allocation: oops fields in super and sub classes are together.
+    if( nonstatic_field_size > 0 && _super_klass() != NULL &&
+        _super_klass->nonstatic_oop_map_size() > 0 ) {
+      unsigned int map_count = _super_klass->nonstatic_oop_map_count();
+      OopMapBlock* first_map = _super_klass->start_of_nonstatic_oop_maps();
+      OopMapBlock* last_map = first_map + map_count - 1;
+      int next_offset = last_map->offset() + (last_map->count() * heapOopSize);
+      if (next_offset == next_nonstatic_field_offset) {
+        allocation_style = 0;   // allocate oops first
+        next_nonstatic_oop_offset    = next_nonstatic_field_offset;
+        next_nonstatic_double_offset = next_nonstatic_oop_offset +
+                                       (nonstatic_oop_count * heapOopSize);
+      }
+    }
+    if( allocation_style == 2 ) {
+      allocation_style = 1;     // allocate oops last
+      next_nonstatic_double_offset = next_nonstatic_field_offset;
+    }
+  } else {
+    ShouldNotReachHere();
+  }
+
+  int nonstatic_oop_space_count   = 0;
+  int nonstatic_word_space_count  = 0;
+  int nonstatic_short_space_count = 0;
+  int nonstatic_byte_space_count  = 0;
+  int nonstatic_oop_space_offset;
+  int nonstatic_word_space_offset;
+  int nonstatic_short_space_offset;
+  int nonstatic_byte_space_offset;
+
+  if( nonstatic_double_count > 0 ) {
+    int offset = next_nonstatic_double_offset;
+    next_nonstatic_double_offset = align_size_up(offset, BytesPerLong);
+    if( compact_fields && offset != next_nonstatic_double_offset ) {
+      // Allocate available fields into the gap before double field.
+      int length = next_nonstatic_double_offset - offset;
+      assert(length == BytesPerInt, "");
+      nonstatic_word_space_offset = offset;
+      if( nonstatic_word_count > 0 ) {
+        nonstatic_word_count      -= 1;
+        nonstatic_word_space_count = 1; // Only one will fit
+        length -= BytesPerInt;
+        offset += BytesPerInt;
+      }
+      nonstatic_short_space_offset = offset;
+      while( length >= BytesPerShort && nonstatic_short_count > 0 ) {
+        nonstatic_short_count       -= 1;
+        nonstatic_short_space_count += 1;
+        length -= BytesPerShort;
+        offset += BytesPerShort;
+      }
+      nonstatic_byte_space_offset = offset;
+      while( length > 0 && nonstatic_byte_count > 0 ) {
+        nonstatic_byte_count       -= 1;
+        nonstatic_byte_space_count += 1;
+        length -= 1;
+      }
+      // Allocate oop field in the gap if there are no other fields for that.
+      nonstatic_oop_space_offset = offset;
+      if( length >= heapOopSize && nonstatic_oop_count > 0 &&
+          allocation_style != 0 ) { // when oop fields not first
+        nonstatic_oop_count      -= 1;
+        nonstatic_oop_space_count = 1; // Only one will fit
+        length -= heapOopSize;
+        offset += heapOopSize;
+      }
+    }
+  }
+
+  next_nonstatic_word_offset  = next_nonstatic_double_offset +
+                                (nonstatic_double_count * BytesPerLong);
+  next_nonstatic_short_offset = next_nonstatic_word_offset +
+                                (nonstatic_word_count * BytesPerInt);
+  next_nonstatic_byte_offset  = next_nonstatic_short_offset +
+                                (nonstatic_short_count * BytesPerShort);
+  next_nonstatic_padded_offset = next_nonstatic_byte_offset +
+                                nonstatic_byte_count;
+
+  // let oops jump before padding with this allocation style
+  if( allocation_style == 1 ) {
+    next_nonstatic_oop_offset = next_nonstatic_padded_offset;
+    if( nonstatic_oop_count > 0 ) {
+      next_nonstatic_oop_offset = align_size_up(next_nonstatic_oop_offset, heapOopSize);
+    }
+    next_nonstatic_padded_offset = next_nonstatic_oop_offset + (nonstatic_oop_count * heapOopSize);
+  }
+
+  // Iterate over fields again and compute correct offsets.
+  // The field allocation type was temporarily stored in the offset slot.
+  // oop fields are located before non-oop fields (static and non-static).
+  for (AllFieldStream fs(_fields, _cp); !fs.done(); fs.next()) {
+
+    // skip already laid out fields
+    if (fs.is_offset_set()) continue;
+
+    // contended instance fields are handled below
+    if (fs.is_contended() && !fs.access_flags().is_static()) continue;
+
+    int real_offset;
+    FieldAllocationType atype = (FieldAllocationType) fs.allocation_type();
+
+    // pack the rest of the fields
+    switch (atype) {
+      case STATIC_OOP:
+        real_offset = next_static_oop_offset;
+        next_static_oop_offset += heapOopSize;
+        break;
+      case STATIC_BYTE:
+        real_offset = next_static_byte_offset;
+        next_static_byte_offset += 1;
+        break;
+      case STATIC_SHORT:
+        real_offset = next_static_short_offset;
+        next_static_short_offset += BytesPerShort;
+        break;
+      case STATIC_WORD:
+        real_offset = next_static_word_offset;
+        next_static_word_offset += BytesPerInt;
+        break;
+      case STATIC_DOUBLE:
+        real_offset = next_static_double_offset;
+        next_static_double_offset += BytesPerLong;
+        break;
+      case NONSTATIC_OOP:
+        if( nonstatic_oop_space_count > 0 ) {
+          real_offset = nonstatic_oop_space_offset;
+          nonstatic_oop_space_offset += heapOopSize;
+          nonstatic_oop_space_count  -= 1;
+        } else {
+          real_offset = next_nonstatic_oop_offset;
+          next_nonstatic_oop_offset += heapOopSize;
+        }
+        // Update oop maps
+        if( nonstatic_oop_map_count > 0 &&
+            nonstatic_oop_offsets[nonstatic_oop_map_count - 1] ==
+            real_offset -
+            int(nonstatic_oop_counts[nonstatic_oop_map_count - 1]) *
+            heapOopSize ) {
+          // Extend current oop map
+          nonstatic_oop_counts[nonstatic_oop_map_count - 1] += 1;
+        } else {
+          // Create new oop map
+          nonstatic_oop_offsets[nonstatic_oop_map_count] = real_offset;
+          nonstatic_oop_counts [nonstatic_oop_map_count] = 1;
+          nonstatic_oop_map_count += 1;
+          if( first_nonstatic_oop_offset == 0 ) { // Undefined
+            first_nonstatic_oop_offset = real_offset;
+          }
+        }
+        break;
+      case NONSTATIC_BYTE:
+        if( nonstatic_byte_space_count > 0 ) {
+          real_offset = nonstatic_byte_space_offset;
+          nonstatic_byte_space_offset += 1;
+          nonstatic_byte_space_count  -= 1;
+        } else {
+          real_offset = next_nonstatic_byte_offset;
+          next_nonstatic_byte_offset += 1;
+        }
+        break;
+      case NONSTATIC_SHORT:
+        if( nonstatic_short_space_count > 0 ) {
+          real_offset = nonstatic_short_space_offset;
+          nonstatic_short_space_offset += BytesPerShort;
+          nonstatic_short_space_count  -= 1;
+        } else {
+          real_offset = next_nonstatic_short_offset;
+          next_nonstatic_short_offset += BytesPerShort;
+        }
+        break;
+      case NONSTATIC_WORD:
+        if( nonstatic_word_space_count > 0 ) {
+          real_offset = nonstatic_word_space_offset;
+          nonstatic_word_space_offset += BytesPerInt;
+          nonstatic_word_space_count  -= 1;
+        } else {
+          real_offset = next_nonstatic_word_offset;
+          next_nonstatic_word_offset += BytesPerInt;
+        }
+        break;
+      case NONSTATIC_DOUBLE:
+        real_offset = next_nonstatic_double_offset;
+        next_nonstatic_double_offset += BytesPerLong;
+        break;
+      default:
+        ShouldNotReachHere();
+    }
+    fs.set_offset(real_offset);
+  }
+
+
+  // Handle the contended cases.
+  //
+  // Each contended field should not intersect the cache line with another contended field.
+  // In the absence of alignment information, we end up with pessimistically separating
+  // the fields with full-width padding.
+  //
+  // Additionally, this should not break alignment for the fields, so we round the alignment up
+  // for each field.
+  if (contended_count > 0) {
+
+    // if there is at least one contended field, we need to have pre-padding for them
+    if (nonstatic_contended_count > 0) {
+      next_nonstatic_padded_offset += pad_size;
+    }
+
+    // collect all contended groups
+    BitMap bm(_cp->size());
+    for (AllFieldStream fs(_fields, _cp); !fs.done(); fs.next()) {
+      // skip already laid out fields
+      if (fs.is_offset_set()) continue;
+
+      if (fs.is_contended()) {
+        bm.set_bit(fs.contended_group());
+      }
+    }
+
+    int current_group = -1;
+    while ((current_group = (int)bm.get_next_one_offset(current_group + 1)) != (int)bm.size()) {
+
+      for (AllFieldStream fs(_fields, _cp); !fs.done(); fs.next()) {
+
+        // skip already laid out fields
+        if (fs.is_offset_set()) continue;
+
+        // skip non-contended fields and fields from different group
+        if (!fs.is_contended() || (fs.contended_group() != current_group)) continue;
+
+        // handle statics below
+        if (fs.access_flags().is_static()) continue;
+
+        int real_offset;
+        FieldAllocationType atype = (FieldAllocationType) fs.allocation_type();
+
+        switch (atype) {
+          case NONSTATIC_BYTE:
+            next_nonstatic_padded_offset = align_size_up(next_nonstatic_padded_offset, 1);
+            real_offset = next_nonstatic_padded_offset;
+            next_nonstatic_padded_offset += 1;
+            break;
+
+          case NONSTATIC_SHORT:
+            next_nonstatic_padded_offset = align_size_up(next_nonstatic_padded_offset, BytesPerShort);
+            real_offset = next_nonstatic_padded_offset;
+            next_nonstatic_padded_offset += BytesPerShort;
+            break;
+
+          case NONSTATIC_WORD:
+            next_nonstatic_padded_offset = align_size_up(next_nonstatic_padded_offset, BytesPerInt);
+            real_offset = next_nonstatic_padded_offset;
+            next_nonstatic_padded_offset += BytesPerInt;
+            break;
+
+          case NONSTATIC_DOUBLE:
+            next_nonstatic_padded_offset = align_size_up(next_nonstatic_padded_offset, BytesPerLong);
+            real_offset = next_nonstatic_padded_offset;
+            next_nonstatic_padded_offset += BytesPerLong;
+            break;
+
+          case NONSTATIC_OOP:
+            next_nonstatic_padded_offset = align_size_up(next_nonstatic_padded_offset, heapOopSize);
+            real_offset = next_nonstatic_padded_offset;
+            next_nonstatic_padded_offset += heapOopSize;
+
+            // Create new oop map
+            nonstatic_oop_offsets[nonstatic_oop_map_count] = real_offset;
+            nonstatic_oop_counts [nonstatic_oop_map_count] = 1;
+            nonstatic_oop_map_count += 1;
+            if( first_nonstatic_oop_offset == 0 ) { // Undefined
+              first_nonstatic_oop_offset = real_offset;
+            }
+            break;
+
+          default:
+            ShouldNotReachHere();
+        }
+
+        if (fs.contended_group() == 0) {
+          // Contended group defines the equivalence class over the fields:
+          // the fields within the same contended group are not inter-padded.
+          // The only exception is default group, which does not incur the
+          // equivalence, and so requires intra-padding.
+          next_nonstatic_padded_offset += pad_size;
+        }
+
+        fs.set_offset(real_offset);
+      } // for
+
+      // Start laying out the next group.
+      // Note that this will effectively pad the last group in the back;
+      // this is expected to alleviate memory contention effects for
+      // subclass fields and/or adjacent object.
+      // If this was the default group, the padding is already in place.
+      if (current_group != 0) {
+        next_nonstatic_padded_offset += pad_size;
+      }
+    }
+
+    // handle static fields
+  }
+
+  // Size of instances
+  int notaligned_offset = next_nonstatic_padded_offset;
+
+  // Entire class is contended, pad in the back.
+  // This helps to alleviate memory contention effects for subclass fields
+  // and/or adjacent object.
+  if (parsed_annotations->is_contended()) {
+    notaligned_offset += pad_size;
+  }
+
+  int next_static_type_offset     = align_size_up(next_static_byte_offset, wordSize);
+  int static_field_size           = (next_static_type_offset -
+                                InstanceMirrorKlass::offset_of_static_fields()) / wordSize;
+
+  next_nonstatic_type_offset = align_size_up(notaligned_offset, heapOopSize );
+  nonstatic_field_size = nonstatic_field_size + ((next_nonstatic_type_offset
+                                 - first_nonstatic_field_offset)/heapOopSize);
+
+  next_nonstatic_type_offset = align_size_up(notaligned_offset, wordSize );
+  int instance_size = align_object_size(next_nonstatic_type_offset / wordSize);
+
+  assert(instance_size == align_object_size(align_size_up(
+         (instanceOopDesc::base_offset_in_bytes() + nonstatic_field_size*heapOopSize + ((parsed_annotations->is_contended()) ? pad_size : 0)),
+          wordSize) / wordSize), "consistent layout helper value");
+
+  // Number of non-static oop map blocks allocated at end of klass.
+  const unsigned int total_oop_map_count =
+    compute_oop_map_count(_super_klass, nonstatic_oop_map_count,
+                          first_nonstatic_oop_offset);
+
+#ifndef PRODUCT
+  if( PrintCompactFieldsSavings ) {
+    ResourceMark rm;
+    if( nonstatic_field_size < orig_nonstatic_field_size ) {
+      tty->print("[Saved %d of %d bytes in %s]\n",
+               (orig_nonstatic_field_size - nonstatic_field_size)*heapOopSize,
+               orig_nonstatic_field_size*heapOopSize,
+               _class_name);
+    } else if( nonstatic_field_size > orig_nonstatic_field_size ) {
+      tty->print("[Wasted %d over %d bytes in %s]\n",
+               (nonstatic_field_size - orig_nonstatic_field_size)*heapOopSize,
+               orig_nonstatic_field_size*heapOopSize,
+               _class_name);
+    }
+  }
+
+  if (PrintFieldLayout) {
+    print_field_layout(_class_name,
+          _fields,
+          _cp,
+          instance_size,
+          first_nonstatic_field_offset,
+          next_nonstatic_field_offset,
+          next_static_type_offset);
+  }
+
+#endif
+  // Pass back information needed for InstanceKlass creation
+  info->nonstatic_oop_offsets = nonstatic_oop_offsets;
+  info->nonstatic_oop_counts = nonstatic_oop_counts;
+  info->nonstatic_oop_map_count = nonstatic_oop_map_count;
+  info->total_oop_map_count = total_oop_map_count;
+  info->instance_size = instance_size;
+  info->static_field_size = static_field_size;
+  info->nonstatic_field_size = nonstatic_field_size;
+  info->has_nonstatic_fields = has_nonstatic_fields;
+}
+
+
 instanceKlassHandle ClassFileParser::parseClassFile(Symbol* name,
                                                     ClassLoaderData* loader_data,
                                                     Handle protection_domain,
@@ -3176,7 +3673,7 @@ instanceKlassHandle ClassFileParser::parseClassFile(Symbol* name,
                             jt->get_thread_stat()->perf_timers_addr(),
                             PerfClassTraceTime::PARSE_CLASS);
 
-  init_parsed_class_attributes();
+  init_parsed_class_attributes(loader_data);
 
   if (JvmtiExport::should_post_class_file_load_hook()) {
     // Get the cached class file bytes (if any) from the class that
@@ -3271,8 +3768,7 @@ instanceKlassHandle ClassFileParser::parseClassFile(Symbol* name,
   _relax_verify = Verifier::relax_verify_for(class_loader());
 
   // Constant pool
-  constantPoolHandle cp = parse_constant_pool(loader_data, CHECK_(nullHandle));
-  ConstantPoolCleaner error_handler(cp); // set constant pool to be cleaned up.
+  constantPoolHandle cp = parse_constant_pool(CHECK_(nullHandle));
 
   int cp_size = cp->length();
 
@@ -3290,7 +3786,6 @@ instanceKlassHandle ClassFileParser::parseClassFile(Symbol* name,
   access_flags.set_flags(flags);
 
   // This class and superclass
-  instanceKlassHandle super_klass;
   u2 this_class_index = cfs->get_u2_fast();
   check_property(
     valid_cp_range(this_class_index, cp_size) &&
@@ -3345,59 +3840,27 @@ instanceKlassHandle ClassFileParser::parseClassFile(Symbol* name,
     }
 
     u2 super_class_index = cfs->get_u2_fast();
-    if (super_class_index == 0) {
-      check_property(class_name == vmSymbols::java_lang_Object(),
-                     "Invalid superclass index %u in class file %s",
-                     super_class_index,
-                     CHECK_(nullHandle));
-    } else {
-      check_property(valid_cp_range(super_class_index, cp_size) &&
-                     is_klass_reference(cp, super_class_index),
-                     "Invalid superclass index %u in class file %s",
-                     super_class_index,
-                     CHECK_(nullHandle));
-      // The class name should be legal because it is checked when parsing constant pool.
-      // However, make sure it is not an array type.
-      bool is_array = false;
-      if (cp->tag_at(super_class_index).is_klass()) {
-        super_klass = instanceKlassHandle(THREAD, cp->resolved_klass_at(super_class_index));
-        if (_need_verify)
-          is_array = super_klass->oop_is_array();
-      } else if (_need_verify) {
-        is_array = (cp->unresolved_klass_at(super_class_index)->byte_at(0) == JVM_SIGNATURE_ARRAY);
-      }
-      if (_need_verify) {
-        guarantee_property(!is_array,
-                          "Bad superclass name in class file %s", CHECK_(nullHandle));
-      }
-    }
+    instanceKlassHandle super_klass = parse_super_class(super_class_index,
+                                                        CHECK_NULL);
 
     // Interfaces
     u2 itfs_len = cfs->get_u2_fast();
-    Array<Klass*>* local_interfaces;
-    if (itfs_len == 0) {
-      local_interfaces = Universe::the_empty_klass_array();
-    } else {
-      local_interfaces = parse_interfaces(
-          cp, itfs_len, loader_data, protection_domain, _class_name,
-          &has_default_methods, CHECK_(nullHandle));
-    }
+    Array<Klass*>* local_interfaces =
+      parse_interfaces(itfs_len, protection_domain, _class_name,
+                       &has_default_methods, CHECK_(nullHandle));
 
     u2 java_fields_count = 0;
     // Fields (offsets are filled in later)
     FieldAllocationCount fac;
-    Array<AnnotationArray*>* fields_annotations = NULL;
-    Array<AnnotationArray*>* fields_type_annotations = NULL;
-    Array<u2>* fields = parse_fields(loader_data, class_name, cp, access_flags.is_interface(), &fac, &fields_annotations,
-                                          &fields_type_annotations,
-                                          &java_fields_count,
-                                          CHECK_(nullHandle));
+    Array<u2>* fields = parse_fields(class_name,
+                                     access_flags.is_interface(),
+                                     &fac, &java_fields_count,
+                                     CHECK_(nullHandle));
     // Methods
     bool has_final_method = false;
     AccessFlags promoted_flags;
     promoted_flags.set_flags(0);
-    Array<Method*>* methods = parse_methods(loader_data,
-                                            cp, access_flags.is_interface(),
+    Array<Method*>* methods = parse_methods(access_flags.is_interface(),
                                             &promoted_flags,
                                             &has_final_method,
                                             &has_default_methods,
@@ -3405,7 +3868,7 @@ instanceKlassHandle ClassFileParser::parseClassFile(Symbol* name,
 
     // Additional attributes
     ClassAnnotationCollector parsed_annotations;
-    parse_classfile_attributes(loader_data, cp, &parsed_annotations, CHECK_(nullHandle));
+    parse_classfile_attributes(&parsed_annotations, CHECK_(nullHandle));
 
     // Make sure this is the end of class file stream
     guarantee_property(cfs->at_eos(), "Extra bytes at the end of class file %s", CHECK_(nullHandle));
@@ -3452,13 +3915,15 @@ instanceKlassHandle ClassFileParser::parseClassFile(Symbol* name,
       }
     }
 
+    // save super klass for error handling.
+    _super_klass = super_klass;
+
     // Compute the transitive list of all unique interfaces implemented by this class
-    Array<Klass*>* transitive_interfaces = compute_transitive_interfaces(loader_data, super_klass, local_interfaces, CHECK_(nullHandle));
+    _transitive_interfaces =
+          compute_transitive_interfaces(super_klass, local_interfaces, CHECK_(nullHandle));
 
     // sort methods
-    Array<int>* method_ordering = sort_methods(loader_data,
-                                               methods,
-                                               CHECK_(nullHandle));
+    intArray* method_ordering = sort_methods(methods);
 
     // promote flags from parse_methods() to the klass' flags
     access_flags.add_promoted_flags(promoted_flags.as_int());
@@ -3476,495 +3941,14 @@ instanceKlassHandle ClassFileParser::parseClassFile(Symbol* name,
                                                       CHECK_(nullHandle));
 
     // Size of Java itable (in words)
-    itable_size = access_flags.is_interface() ? 0 : klassItable::compute_itable_size(transitive_interfaces);
+    itable_size = access_flags.is_interface() ? 0 : klassItable::compute_itable_size(_transitive_interfaces);
 
-    // get the padding width from the option
-    // TODO: Ask VM about specific CPU we are running on
-    int pad_size = ContendedPaddingWidth;
+    FieldLayoutInfo info;
+    layout_fields(class_loader, &fac, &parsed_annotations, &info, CHECK_NULL);
 
-    // Field size and offset computation
-    int nonstatic_field_size = super_klass() == NULL ? 0 : super_klass->nonstatic_field_size();
-#ifndef PRODUCT
-    int orig_nonstatic_field_size = 0;
-#endif
-    int next_static_oop_offset;
-    int next_static_double_offset;
-    int next_static_word_offset;
-    int next_static_short_offset;
-    int next_static_byte_offset;
-    int next_nonstatic_oop_offset;
-    int next_nonstatic_double_offset;
-    int next_nonstatic_word_offset;
-    int next_nonstatic_short_offset;
-    int next_nonstatic_byte_offset;
-    int next_nonstatic_type_offset;
-    int first_nonstatic_oop_offset;
-    int first_nonstatic_field_offset;
-    int next_nonstatic_field_offset;
-    int next_nonstatic_padded_offset;
+    int total_oop_map_size2 =
+          InstanceKlass::nonstatic_oop_map_size(info.total_oop_map_count);
 
-    // Count the contended fields by type.
-    int nonstatic_contended_count = 0;
-    FieldAllocationCount fac_contended;
-    for (AllFieldStream fs(fields, cp); !fs.done(); fs.next()) {
-      FieldAllocationType atype = (FieldAllocationType) fs.allocation_type();
-      if (fs.is_contended()) {
-        fac_contended.count[atype]++;
-        if (!fs.access_flags().is_static()) {
-          nonstatic_contended_count++;
-        }
-      }
-    }
-    int contended_count = nonstatic_contended_count;
-
-
-    // Calculate the starting byte offsets
-    next_static_oop_offset      = InstanceMirrorKlass::offset_of_static_fields();
-
-    next_static_double_offset   = next_static_oop_offset +
-                                  ((fac.count[STATIC_OOP]) * heapOopSize);
-    if ( fac.count[STATIC_DOUBLE] &&
-         (Universe::field_type_should_be_aligned(T_DOUBLE) ||
-          Universe::field_type_should_be_aligned(T_LONG)) ) {
-      next_static_double_offset = align_size_up(next_static_double_offset, BytesPerLong);
-    }
-
-    next_static_word_offset     = next_static_double_offset +
-                                  ((fac.count[STATIC_DOUBLE]) * BytesPerLong);
-    next_static_short_offset    = next_static_word_offset +
-                                  ((fac.count[STATIC_WORD]) * BytesPerInt);
-    next_static_byte_offset     = next_static_short_offset +
-                                  ((fac.count[STATIC_SHORT]) * BytesPerShort);
-
-    first_nonstatic_field_offset = instanceOopDesc::base_offset_in_bytes() +
-                                   nonstatic_field_size * heapOopSize;
-
-    // class is contended, pad before all the fields
-    if (parsed_annotations.is_contended()) {
-      first_nonstatic_field_offset += pad_size;
-    }
-
-    next_nonstatic_field_offset = first_nonstatic_field_offset;
-
-    unsigned int nonstatic_double_count = fac.count[NONSTATIC_DOUBLE] - fac_contended.count[NONSTATIC_DOUBLE];
-    unsigned int nonstatic_word_count   = fac.count[NONSTATIC_WORD]   - fac_contended.count[NONSTATIC_WORD];
-    unsigned int nonstatic_short_count  = fac.count[NONSTATIC_SHORT]  - fac_contended.count[NONSTATIC_SHORT];
-    unsigned int nonstatic_byte_count   = fac.count[NONSTATIC_BYTE]   - fac_contended.count[NONSTATIC_BYTE];
-    unsigned int nonstatic_oop_count    = fac.count[NONSTATIC_OOP]    - fac_contended.count[NONSTATIC_OOP];
-
-    bool super_has_nonstatic_fields =
-            (super_klass() != NULL && super_klass->has_nonstatic_fields());
-    bool has_nonstatic_fields  =  super_has_nonstatic_fields ||
-            ((nonstatic_double_count + nonstatic_word_count +
-              nonstatic_short_count + nonstatic_byte_count +
-              nonstatic_oop_count) != 0);
-
-
-    // Prepare list of oops for oop map generation.
-    int* nonstatic_oop_offsets;
-    unsigned int* nonstatic_oop_counts;
-    unsigned int nonstatic_oop_map_count = 0;
-
-    nonstatic_oop_offsets = NEW_RESOURCE_ARRAY_IN_THREAD(
-              THREAD, int, nonstatic_oop_count + 1);
-    nonstatic_oop_counts  = NEW_RESOURCE_ARRAY_IN_THREAD(
-              THREAD, unsigned int, nonstatic_oop_count + 1);
-
-    first_nonstatic_oop_offset = 0; // will be set for first oop field
-
-#ifndef PRODUCT
-    if( PrintCompactFieldsSavings ) {
-      next_nonstatic_double_offset = next_nonstatic_field_offset +
-                                     (nonstatic_oop_count * heapOopSize);
-      if ( nonstatic_double_count > 0 ) {
-        next_nonstatic_double_offset = align_size_up(next_nonstatic_double_offset, BytesPerLong);
-      }
-      next_nonstatic_word_offset  = next_nonstatic_double_offset +
-                                    (nonstatic_double_count * BytesPerLong);
-      next_nonstatic_short_offset = next_nonstatic_word_offset +
-                                    (nonstatic_word_count * BytesPerInt);
-      next_nonstatic_byte_offset  = next_nonstatic_short_offset +
-                                    (nonstatic_short_count * BytesPerShort);
-      next_nonstatic_type_offset  = align_size_up((next_nonstatic_byte_offset +
-                                    nonstatic_byte_count ), heapOopSize );
-      orig_nonstatic_field_size   = nonstatic_field_size +
-      ((next_nonstatic_type_offset - first_nonstatic_field_offset)/heapOopSize);
-    }
-#endif
-    bool compact_fields   = CompactFields;
-    int  allocation_style = FieldsAllocationStyle;
-    if( allocation_style < 0 || allocation_style > 2 ) { // Out of range?
-      assert(false, "0 <= FieldsAllocationStyle <= 2");
-      allocation_style = 1; // Optimistic
-    }
-
-    // The next classes have predefined hard-coded fields offsets
-    // (see in JavaClasses::compute_hard_coded_offsets()).
-    // Use default fields allocation order for them.
-    if( (allocation_style != 0 || compact_fields ) && class_loader.is_null() &&
-        (class_name == vmSymbols::java_lang_AssertionStatusDirectives() ||
-         class_name == vmSymbols::java_lang_Class() ||
-         class_name == vmSymbols::java_lang_ClassLoader() ||
-         class_name == vmSymbols::java_lang_ref_Reference() ||
-         class_name == vmSymbols::java_lang_ref_SoftReference() ||
-         class_name == vmSymbols::java_lang_StackTraceElement() ||
-         class_name == vmSymbols::java_lang_String() ||
-         class_name == vmSymbols::java_lang_Throwable() ||
-         class_name == vmSymbols::java_lang_Boolean() ||
-         class_name == vmSymbols::java_lang_Character() ||
-         class_name == vmSymbols::java_lang_Float() ||
-         class_name == vmSymbols::java_lang_Double() ||
-         class_name == vmSymbols::java_lang_Byte() ||
-         class_name == vmSymbols::java_lang_Short() ||
-         class_name == vmSymbols::java_lang_Integer() ||
-         class_name == vmSymbols::java_lang_Long())) {
-      allocation_style = 0;     // Allocate oops first
-      compact_fields   = false; // Don't compact fields
-    }
-
-    if( allocation_style == 0 ) {
-      // Fields order: oops, longs/doubles, ints, shorts/chars, bytes, padded fields
-      next_nonstatic_oop_offset    = next_nonstatic_field_offset;
-      next_nonstatic_double_offset = next_nonstatic_oop_offset +
-                                      (nonstatic_oop_count * heapOopSize);
-    } else if( allocation_style == 1 ) {
-      // Fields order: longs/doubles, ints, shorts/chars, bytes, oops, padded fields
-      next_nonstatic_double_offset = next_nonstatic_field_offset;
-    } else if( allocation_style == 2 ) {
-      // Fields allocation: oops fields in super and sub classes are together.
-      if( nonstatic_field_size > 0 && super_klass() != NULL &&
-          super_klass->nonstatic_oop_map_size() > 0 ) {
-        int map_count = super_klass->nonstatic_oop_map_count();
-        OopMapBlock* first_map = super_klass->start_of_nonstatic_oop_maps();
-        OopMapBlock* last_map = first_map + map_count - 1;
-        int next_offset = last_map->offset() + (last_map->count() * heapOopSize);
-        if (next_offset == next_nonstatic_field_offset) {
-          allocation_style = 0;   // allocate oops first
-          next_nonstatic_oop_offset    = next_nonstatic_field_offset;
-          next_nonstatic_double_offset = next_nonstatic_oop_offset +
-                                         (nonstatic_oop_count * heapOopSize);
-        }
-      }
-      if( allocation_style == 2 ) {
-        allocation_style = 1;     // allocate oops last
-        next_nonstatic_double_offset = next_nonstatic_field_offset;
-      }
-    } else {
-      ShouldNotReachHere();
-    }
-
-    int nonstatic_oop_space_count   = 0;
-    int nonstatic_word_space_count  = 0;
-    int nonstatic_short_space_count = 0;
-    int nonstatic_byte_space_count  = 0;
-    int nonstatic_oop_space_offset;
-    int nonstatic_word_space_offset;
-    int nonstatic_short_space_offset;
-    int nonstatic_byte_space_offset;
-
-    if( nonstatic_double_count > 0 ) {
-      int offset = next_nonstatic_double_offset;
-      next_nonstatic_double_offset = align_size_up(offset, BytesPerLong);
-      if( compact_fields && offset != next_nonstatic_double_offset ) {
-        // Allocate available fields into the gap before double field.
-        int length = next_nonstatic_double_offset - offset;
-        assert(length == BytesPerInt, "");
-        nonstatic_word_space_offset = offset;
-        if( nonstatic_word_count > 0 ) {
-          nonstatic_word_count      -= 1;
-          nonstatic_word_space_count = 1; // Only one will fit
-          length -= BytesPerInt;
-          offset += BytesPerInt;
-        }
-        nonstatic_short_space_offset = offset;
-        while( length >= BytesPerShort && nonstatic_short_count > 0 ) {
-          nonstatic_short_count       -= 1;
-          nonstatic_short_space_count += 1;
-          length -= BytesPerShort;
-          offset += BytesPerShort;
-        }
-        nonstatic_byte_space_offset = offset;
-        while( length > 0 && nonstatic_byte_count > 0 ) {
-          nonstatic_byte_count       -= 1;
-          nonstatic_byte_space_count += 1;
-          length -= 1;
-        }
-        // Allocate oop field in the gap if there are no other fields for that.
-        nonstatic_oop_space_offset = offset;
-        if( length >= heapOopSize && nonstatic_oop_count > 0 &&
-            allocation_style != 0 ) { // when oop fields not first
-          nonstatic_oop_count      -= 1;
-          nonstatic_oop_space_count = 1; // Only one will fit
-          length -= heapOopSize;
-          offset += heapOopSize;
-        }
-      }
-    }
-
-    next_nonstatic_word_offset  = next_nonstatic_double_offset +
-                                  (nonstatic_double_count * BytesPerLong);
-    next_nonstatic_short_offset = next_nonstatic_word_offset +
-                                  (nonstatic_word_count * BytesPerInt);
-    next_nonstatic_byte_offset  = next_nonstatic_short_offset +
-                                  (nonstatic_short_count * BytesPerShort);
-    next_nonstatic_padded_offset = next_nonstatic_byte_offset +
-                                  nonstatic_byte_count;
-
-    // let oops jump before padding with this allocation style
-    if( allocation_style == 1 ) {
-      next_nonstatic_oop_offset = next_nonstatic_padded_offset;
-      if( nonstatic_oop_count > 0 ) {
-        next_nonstatic_oop_offset = align_size_up(next_nonstatic_oop_offset, heapOopSize);
-      }
-      next_nonstatic_padded_offset = next_nonstatic_oop_offset + (nonstatic_oop_count * heapOopSize);
-    }
-
-    // Iterate over fields again and compute correct offsets.
-    // The field allocation type was temporarily stored in the offset slot.
-    // oop fields are located before non-oop fields (static and non-static).
-    for (AllFieldStream fs(fields, cp); !fs.done(); fs.next()) {
-
-      // skip already laid out fields
-      if (fs.is_offset_set()) continue;
-
-      // contended instance fields are handled below
-      if (fs.is_contended() && !fs.access_flags().is_static()) continue;
-
-      int real_offset;
-      FieldAllocationType atype = (FieldAllocationType) fs.allocation_type();
-
-      // pack the rest of the fields
-      switch (atype) {
-        case STATIC_OOP:
-          real_offset = next_static_oop_offset;
-          next_static_oop_offset += heapOopSize;
-          break;
-        case STATIC_BYTE:
-          real_offset = next_static_byte_offset;
-          next_static_byte_offset += 1;
-          break;
-        case STATIC_SHORT:
-          real_offset = next_static_short_offset;
-          next_static_short_offset += BytesPerShort;
-          break;
-        case STATIC_WORD:
-          real_offset = next_static_word_offset;
-          next_static_word_offset += BytesPerInt;
-          break;
-        case STATIC_DOUBLE:
-          real_offset = next_static_double_offset;
-          next_static_double_offset += BytesPerLong;
-          break;
-        case NONSTATIC_OOP:
-          if( nonstatic_oop_space_count > 0 ) {
-            real_offset = nonstatic_oop_space_offset;
-            nonstatic_oop_space_offset += heapOopSize;
-            nonstatic_oop_space_count  -= 1;
-          } else {
-            real_offset = next_nonstatic_oop_offset;
-            next_nonstatic_oop_offset += heapOopSize;
-          }
-          // Update oop maps
-          if( nonstatic_oop_map_count > 0 &&
-              nonstatic_oop_offsets[nonstatic_oop_map_count - 1] ==
-              real_offset -
-              int(nonstatic_oop_counts[nonstatic_oop_map_count - 1]) *
-              heapOopSize ) {
-            // Extend current oop map
-            nonstatic_oop_counts[nonstatic_oop_map_count - 1] += 1;
-          } else {
-            // Create new oop map
-            nonstatic_oop_offsets[nonstatic_oop_map_count] = real_offset;
-            nonstatic_oop_counts [nonstatic_oop_map_count] = 1;
-            nonstatic_oop_map_count += 1;
-            if( first_nonstatic_oop_offset == 0 ) { // Undefined
-              first_nonstatic_oop_offset = real_offset;
-            }
-          }
-          break;
-        case NONSTATIC_BYTE:
-          if( nonstatic_byte_space_count > 0 ) {
-            real_offset = nonstatic_byte_space_offset;
-            nonstatic_byte_space_offset += 1;
-            nonstatic_byte_space_count  -= 1;
-          } else {
-            real_offset = next_nonstatic_byte_offset;
-            next_nonstatic_byte_offset += 1;
-          }
-          break;
-        case NONSTATIC_SHORT:
-          if( nonstatic_short_space_count > 0 ) {
-            real_offset = nonstatic_short_space_offset;
-            nonstatic_short_space_offset += BytesPerShort;
-            nonstatic_short_space_count  -= 1;
-          } else {
-            real_offset = next_nonstatic_short_offset;
-            next_nonstatic_short_offset += BytesPerShort;
-          }
-          break;
-        case NONSTATIC_WORD:
-          if( nonstatic_word_space_count > 0 ) {
-            real_offset = nonstatic_word_space_offset;
-            nonstatic_word_space_offset += BytesPerInt;
-            nonstatic_word_space_count  -= 1;
-          } else {
-            real_offset = next_nonstatic_word_offset;
-            next_nonstatic_word_offset += BytesPerInt;
-          }
-          break;
-        case NONSTATIC_DOUBLE:
-          real_offset = next_nonstatic_double_offset;
-          next_nonstatic_double_offset += BytesPerLong;
-          break;
-        default:
-          ShouldNotReachHere();
-      }
-      fs.set_offset(real_offset);
-    }
-
-
-    // Handle the contended cases.
-    //
-    // Each contended field should not intersect the cache line with another contended field.
-    // In the absence of alignment information, we end up with pessimistically separating
-    // the fields with full-width padding.
-    //
-    // Additionally, this should not break alignment for the fields, so we round the alignment up
-    // for each field.
-    if (contended_count > 0) {
-
-      // if there is at least one contended field, we need to have pre-padding for them
-      if (nonstatic_contended_count > 0) {
-        next_nonstatic_padded_offset += pad_size;
-      }
-
-      // collect all contended groups
-      BitMap bm(cp->size());
-      for (AllFieldStream fs(fields, cp); !fs.done(); fs.next()) {
-        // skip already laid out fields
-        if (fs.is_offset_set()) continue;
-
-        if (fs.is_contended()) {
-          bm.set_bit(fs.contended_group());
-        }
-      }
-
-      int current_group = -1;
-      while ((current_group = (int)bm.get_next_one_offset(current_group + 1)) != (int)bm.size()) {
-
-        for (AllFieldStream fs(fields, cp); !fs.done(); fs.next()) {
-
-          // skip already laid out fields
-          if (fs.is_offset_set()) continue;
-
-          // skip non-contended fields and fields from different group
-          if (!fs.is_contended() || (fs.contended_group() != current_group)) continue;
-
-          // handle statics below
-          if (fs.access_flags().is_static()) continue;
-
-          int real_offset;
-          FieldAllocationType atype = (FieldAllocationType) fs.allocation_type();
-
-          switch (atype) {
-            case NONSTATIC_BYTE:
-              next_nonstatic_padded_offset = align_size_up(next_nonstatic_padded_offset, 1);
-              real_offset = next_nonstatic_padded_offset;
-              next_nonstatic_padded_offset += 1;
-              break;
-
-            case NONSTATIC_SHORT:
-              next_nonstatic_padded_offset = align_size_up(next_nonstatic_padded_offset, BytesPerShort);
-              real_offset = next_nonstatic_padded_offset;
-              next_nonstatic_padded_offset += BytesPerShort;
-              break;
-
-            case NONSTATIC_WORD:
-              next_nonstatic_padded_offset = align_size_up(next_nonstatic_padded_offset, BytesPerInt);
-              real_offset = next_nonstatic_padded_offset;
-              next_nonstatic_padded_offset += BytesPerInt;
-              break;
-
-            case NONSTATIC_DOUBLE:
-              next_nonstatic_padded_offset = align_size_up(next_nonstatic_padded_offset, BytesPerLong);
-              real_offset = next_nonstatic_padded_offset;
-              next_nonstatic_padded_offset += BytesPerLong;
-              break;
-
-            case NONSTATIC_OOP:
-              next_nonstatic_padded_offset = align_size_up(next_nonstatic_padded_offset, heapOopSize);
-              real_offset = next_nonstatic_padded_offset;
-              next_nonstatic_padded_offset += heapOopSize;
-
-              // Create new oop map
-              nonstatic_oop_offsets[nonstatic_oop_map_count] = real_offset;
-              nonstatic_oop_counts [nonstatic_oop_map_count] = 1;
-              nonstatic_oop_map_count += 1;
-              if( first_nonstatic_oop_offset == 0 ) { // Undefined
-                first_nonstatic_oop_offset = real_offset;
-              }
-              break;
-
-            default:
-              ShouldNotReachHere();
-          }
-
-          if (fs.contended_group() == 0) {
-            // Contended group defines the equivalence class over the fields:
-            // the fields within the same contended group are not inter-padded.
-            // The only exception is default group, which does not incur the
-            // equivalence, and so requires intra-padding.
-            next_nonstatic_padded_offset += pad_size;
-          }
-
-          fs.set_offset(real_offset);
-        } // for
-
-        // Start laying out the next group.
-        // Note that this will effectively pad the last group in the back;
-        // this is expected to alleviate memory contention effects for
-        // subclass fields and/or adjacent object.
-        // If this was the default group, the padding is already in place.
-        if (current_group != 0) {
-          next_nonstatic_padded_offset += pad_size;
-        }
-      }
-
-      // handle static fields
-
-    } // handle contended
-
-    // Size of instances
-    int instance_size;
-
-    int notaligned_offset = next_nonstatic_padded_offset;
-
-    // Entire class is contended, pad in the back.
-    // This helps to alleviate memory contention effects for subclass fields
-    // and/or adjacent object.
-    if (parsed_annotations.is_contended()) {
-      notaligned_offset += pad_size;
-    }
-
-    int next_static_type_offset     = align_size_up(next_static_byte_offset, wordSize);
-    int static_field_size           = (next_static_type_offset -
-                                  InstanceMirrorKlass::offset_of_static_fields()) / wordSize;
-
-    next_nonstatic_type_offset = align_size_up(notaligned_offset, heapOopSize );
-    nonstatic_field_size = nonstatic_field_size + ((next_nonstatic_type_offset
-                                   - first_nonstatic_field_offset)/heapOopSize);
-
-    next_nonstatic_type_offset = align_size_up(notaligned_offset, wordSize );
-    instance_size = align_object_size(next_nonstatic_type_offset / wordSize);
-
-    assert(instance_size == align_object_size(align_size_up(
-                (instanceOopDesc::base_offset_in_bytes() + nonstatic_field_size*heapOopSize + ((parsed_annotations.is_contended()) ? pad_size : 0)),
-            wordSize) / wordSize), "consistent layout helper value");
-
-    // Number of non-static oop map blocks allocated at end of klass.
-    const unsigned int total_oop_map_count =
-      compute_oop_map_count(super_klass, nonstatic_oop_map_count,
-                            first_nonstatic_oop_offset);
     // Compute reference type
     ReferenceType rt;
     if (super_klass() == NULL) {
@@ -3974,53 +3958,42 @@ instanceKlassHandle ClassFileParser::parseClassFile(Symbol* name,
     }
 
     // We can now create the basic Klass* for this klass
-    int total_oop_map_size2 =
-      InstanceKlass::nonstatic_oop_map_size(total_oop_map_count);
+    _klass = InstanceKlass::allocate_instance_klass(loader_data,
+                                                    vtable_size,
+                                                    itable_size,
+                                                    info.static_field_size,
+                                                    total_oop_map_size2,
+                                                    rt,
+                                                    access_flags,
+                                                    name,
+                                                    super_klass(),
+                                                    !host_klass.is_null(),
+                                                    CHECK_(nullHandle));
+    instanceKlassHandle this_klass (THREAD, _klass);
 
-    Klass* ik = InstanceKlass::allocate_instance_klass(loader_data,
-                                                       vtable_size,
-                                                       itable_size,
-                                                       static_field_size,
-                                                       total_oop_map_size2,
-                                                       rt,
-                                                       access_flags,
-                                                       name,
-                                                       super_klass(),
-                                                       !host_klass.is_null(),
-                                                       CHECK_(nullHandle));
-
-    // Add all classes to our internal class loader list here,
-    // including classes in the bootstrap (NULL) class loader.
-    loader_data->add_class(ik);
-
-    instanceKlassHandle this_klass (THREAD, ik);
-
-    assert(this_klass->static_field_size() == static_field_size, "sanity");
-    assert(this_klass->nonstatic_oop_map_count() == total_oop_map_count,
+    assert(this_klass->static_field_size() == info.static_field_size, "sanity");
+    assert(this_klass->nonstatic_oop_map_count() == info.total_oop_map_count,
            "sanity");
 
     // Fill in information already parsed
     this_klass->set_should_verify_class(verify);
-    jint lh = Klass::instance_layout_helper(instance_size, false);
+    jint lh = Klass::instance_layout_helper(info.instance_size, false);
     this_klass->set_layout_helper(lh);
     assert(this_klass->oop_is_instance(), "layout is correct");
-    assert(this_klass->size_helper() == instance_size, "correct size_helper");
+    assert(this_klass->size_helper() == info.instance_size, "correct size_helper");
     // Not yet: supers are done below to support the new subtype-checking fields
     //this_klass->set_super(super_klass());
     this_klass->set_class_loader_data(loader_data);
-    this_klass->set_nonstatic_field_size(nonstatic_field_size);
-    this_klass->set_has_nonstatic_fields(has_nonstatic_fields);
+    this_klass->set_nonstatic_field_size(info.nonstatic_field_size);
+    this_klass->set_has_nonstatic_fields(info.has_nonstatic_fields);
     this_klass->set_static_oop_field_count(fac.count[STATIC_OOP]);
-    cp->set_pool_holder(this_klass());
-    error_handler.set_in_error(false);   // turn off error handler for cp
-    this_klass->set_constants(cp());
-    this_klass->set_local_interfaces(local_interfaces);
-    this_klass->set_fields(fields, java_fields_count);
-    this_klass->set_methods(methods);
+
+    apply_parsed_class_metadata(this_klass, java_fields_count, CHECK_NULL);
+
     if (has_final_method) {
       this_klass->set_has_final_method();
     }
-    this_klass->set_method_ordering(method_ordering);
+    this_klass->copy_method_ordering(method_ordering, CHECK_NULL);
     // The InstanceKlass::_methods_jmethod_ids cache and the
     // InstanceKlass::_methods_cached_itable_indices cache are
     // both managed on the assumption that the initial cache
@@ -4032,17 +4005,6 @@ instanceKlassHandle ClassFileParser::parseClassFile(Symbol* name,
     if (is_anonymous())  // I am well known to myself
       cp->klass_at_put(this_class_index, this_klass()); // eagerly resolve
 
-    // Assign allocations if needed
-    if (_annotations != NULL || _type_annotations != NULL ||
-        fields_annotations != NULL || fields_type_annotations != NULL) {
-      Annotations* annotations = Annotations::allocate(loader_data, CHECK_NULL);
-      annotations->set_class_annotations(_annotations);
-      annotations->set_class_type_annotations(_type_annotations);
-      annotations->set_fields_annotations(fields_annotations);
-      annotations->set_fields_type_annotations(fields_type_annotations);
-      this_klass->set_annotations(annotations);
-    }
-
     this_klass->set_minor_version(minor_version);
     this_klass->set_major_version(major_version);
     this_klass->set_has_default_methods(has_default_methods);
@@ -4077,8 +4039,6 @@ instanceKlassHandle ClassFileParser::parseClassFile(Symbol* name,
       this_klass->set_has_miranda_methods(); // then set a flag
     }
 
-    this_klass->set_transitive_interfaces(transitive_interfaces);
-
     // Fill in information needed to compute superclasses.
     this_klass->initialize_supers(super_klass(), CHECK_(nullHandle));
 
@@ -4087,7 +4047,7 @@ instanceKlassHandle ClassFileParser::parseClassFile(Symbol* name,
 
     // Compute transitive closure of interfaces this class implements
     // Do final class setup
-    fill_oop_maps(this_klass, nonstatic_oop_map_count, nonstatic_oop_offsets, nonstatic_oop_counts);
+    fill_oop_maps(this_klass, info.nonstatic_oop_map_count, info.nonstatic_oop_offsets, info.nonstatic_oop_counts);
 
     // Fill in has_finalizer, has_vanilla_constructor, and layout_helper
     set_precomputed_flags(this_klass);
@@ -4186,35 +4146,6 @@ instanceKlassHandle ClassFileParser::parseClassFile(Symbol* name,
       }
     }
 
-#ifndef PRODUCT
-    if( PrintCompactFieldsSavings ) {
-      ResourceMark rm;
-      if( nonstatic_field_size < orig_nonstatic_field_size ) {
-        tty->print("[Saved %d of %d bytes in %s]\n",
-                 (orig_nonstatic_field_size - nonstatic_field_size)*heapOopSize,
-                 orig_nonstatic_field_size*heapOopSize,
-                 this_klass->external_name());
-      } else if( nonstatic_field_size > orig_nonstatic_field_size ) {
-        tty->print("[Wasted %d over %d bytes in %s]\n",
-                 (nonstatic_field_size - orig_nonstatic_field_size)*heapOopSize,
-                 orig_nonstatic_field_size*heapOopSize,
-                 this_klass->external_name());
-      }
-    }
-#endif
-
-#ifndef PRODUCT
-    if (PrintFieldLayout) {
-      print_field_layout(name,
-            fields,
-            cp,
-            instance_size,
-            first_nonstatic_field_offset,
-            next_nonstatic_field_offset,
-            next_static_type_offset);
-    }
-#endif
-
     // preserve result across HandleMark
     preserve_this_klass = this_klass();
   }
@@ -4224,9 +4155,40 @@ instanceKlassHandle ClassFileParser::parseClassFile(Symbol* name,
   instanceKlassHandle this_klass (THREAD, preserve_this_klass);
   debug_only(this_klass->verify();)
 
+  // Clear class if no error has occurred so destructor doesn't deallocate it
+  _klass = NULL;
   return this_klass;
 }
 
+// Destructor to clean up if there's an error
+ClassFileParser::~ClassFileParser() {
+  MetadataFactory::free_metadata(_loader_data, _cp);
+  MetadataFactory::free_array<u2>(_loader_data, _fields);
+
+  // Free methods
+  InstanceKlass::deallocate_methods(_loader_data, _methods);
+
+  // beware of the Universe::empty_blah_array!!
+  if (_inner_classes != Universe::the_empty_short_array()) {
+    MetadataFactory::free_array<u2>(_loader_data, _inner_classes);
+  }
+
+  // Free interfaces
+  InstanceKlass::deallocate_interfaces(_loader_data, _super_klass(),
+                                       _local_interfaces, _transitive_interfaces);
+
+  MetadataFactory::free_array<u1>(_loader_data, _annotations);
+  MetadataFactory::free_array<u1>(_loader_data, _type_annotations);
+  Annotations::free_contents(_loader_data, _fields_annotations);
+  Annotations::free_contents(_loader_data, _fields_type_annotations);
+
+  clear_class_metadata();
+
+  // deallocate the klass if already created.
+  MetadataFactory::free_metadata(_loader_data, _klass);
+  _klass = NULL;
+}
+
 void ClassFileParser::print_field_layout(Symbol* name,
                                          Array<u2>* fields,
                                          constantPoolHandle cp,
@@ -4418,7 +4380,7 @@ void ClassFileParser::record_defined_class_dependencies(instanceKlassHandle defi
   }
 }
 
-// utility method for appending and array with check for duplicates
+// utility methods for appending an array with check for duplicates
 
 void append_interfaces(GrowableArray<Klass*>* result, Array<Klass*>* ifs) {
   // iterate over new interfaces
@@ -4430,8 +4392,9 @@ void append_interfaces(GrowableArray<Klass*>* result, Array<Klass*>* ifs) {
   }
 }
 
-
-Array<Klass*>* ClassFileParser::compute_transitive_interfaces(ClassLoaderData* loader_data, instanceKlassHandle super, Array<Klass*>* local_ifs, TRAPS) {
+Array<Klass*>* ClassFileParser::compute_transitive_interfaces(
+                                        instanceKlassHandle super,
+                                        Array<Klass*>* local_ifs, TRAPS) {
   // Compute maximum size for transitive interfaces
   int max_transitive_size = 0;
   int super_size = 0;
@@ -4478,7 +4441,7 @@ Array<Klass*>* ClassFileParser::compute_transitive_interfaces(ClassLoaderData* l
     // length will be less than the max_transitive_size if duplicates were removed
     int length = result->length();
     assert(length <= max_transitive_size, "just checking");
-    Array<Klass*>* new_result = MetadataFactory::new_array<Klass*>(loader_data, length, CHECK_NULL);
+    Array<Klass*>* new_result = MetadataFactory::new_array<Klass*>(_loader_data, length, CHECK_NULL);
     for (int i = 0; i < length; i++) {
       Klass* e = result->at(i);
         assert(e != NULL, "just checking");
@@ -4488,7 +4451,6 @@ Array<Klass*>* ClassFileParser::compute_transitive_interfaces(ClassLoaderData* l
   }
 }
 
-
 void ClassFileParser::check_super_class_access(instanceKlassHandle this_klass, TRAPS) {
   Klass* super = this_klass->super();
   if ((super != NULL) &&
diff --git a/hotspot/src/share/vm/classfile/classFileParser.hpp b/hotspot/src/share/vm/classfile/classFileParser.hpp
index 7cedcefb3a4..0fd8830463d 100644
--- a/hotspot/src/share/vm/classfile/classFileParser.hpp
+++ b/hotspot/src/share/vm/classfile/classFileParser.hpp
@@ -34,6 +34,7 @@
 #include "classfile/symbolTable.hpp"
 
 class FieldAllocationCount;
+class FieldLayoutInfo;
 
 
 // Parser for for .class files
@@ -47,6 +48,7 @@ class ClassFileParser VALUE_OBJ_CLASS_SPEC {
   u2   _major_version;
   u2   _minor_version;
   Symbol* _class_name;
+  ClassLoaderData* _loader_data;
   KlassHandle _host_klass;
   GrowableArray<Handle>* _cp_patches; // overrides for CP entries
 
@@ -58,33 +60,59 @@ class ClassFileParser VALUE_OBJ_CLASS_SPEC {
 
   // class attributes parsed before the instance klass is created:
   bool       _synthetic_flag;
+  int        _sde_length;
+  char*      _sde_buffer;
   Symbol*    _sourcefile;
   Symbol*    _generic_signature;
-  char*      _sde_buffer;
-  int        _sde_length;
-  Array<u2>* _inner_classes;
+
+  // Metadata created before the instance klass is created.  Must be deallocated
+  // if not transferred to the InstanceKlass upon successful class loading
+  // in which case these pointers have been set to NULL.
+  instanceKlassHandle _super_klass;
+  ConstantPool*    _cp;
+  Array<u2>*       _fields;
+  Array<Method*>*  _methods;
+  Array<u2>*       _inner_classes;
+  Array<Klass*>*   _local_interfaces;
+  Array<Klass*>*   _transitive_interfaces;
   AnnotationArray* _annotations;
   AnnotationArray* _type_annotations;
+  Array<AnnotationArray*>* _fields_annotations;
+  Array<AnnotationArray*>* _fields_type_annotations;
+  InstanceKlass*   _klass;  // InstanceKlass once created.
 
   void set_class_synthetic_flag(bool x)           { _synthetic_flag = x; }
   void set_class_sourcefile(Symbol* x)            { _sourcefile = x; }
   void set_class_generic_signature(Symbol* x)     { _generic_signature = x; }
   void set_class_sde_buffer(char* x, int len)     { _sde_buffer = x; _sde_length = len; }
-  void set_class_inner_classes(Array<u2>* x)      { _inner_classes = x; }
-  void set_class_annotations(AnnotationArray* x)  { _annotations = x; }
-  void set_class_type_annotations(AnnotationArray* x)  { _type_annotations = x; }
-  void init_parsed_class_attributes() {
+
+  void init_parsed_class_attributes(ClassLoaderData* loader_data) {
+    _loader_data = loader_data;
     _synthetic_flag = false;
     _sourcefile = NULL;
     _generic_signature = NULL;
     _sde_buffer = NULL;
     _sde_length = 0;
-    _annotations = _type_annotations = NULL;
     // initialize the other flags too:
     _has_finalizer = _has_empty_finalizer = _has_vanilla_constructor = false;
     _max_bootstrap_specifier_index = -1;
+    clear_class_metadata();
+    _klass = NULL;
   }
   void apply_parsed_class_attributes(instanceKlassHandle k);  // update k
+  void apply_parsed_class_metadata(instanceKlassHandle k, int fields_count, TRAPS);
+  void clear_class_metadata() {
+    // metadata created before the instance klass is created.  Must be
+    // deallocated if classfile parsing returns an error.
+    _cp = NULL;
+    _fields = NULL;
+    _methods = NULL;
+    _inner_classes = NULL;
+    _local_interfaces = NULL;
+    _transitive_interfaces = NULL;
+    _annotations = _type_annotations = NULL;
+    _fields_annotations = _fields_type_annotations = NULL;
+  }
 
   class AnnotationCollector {
   public:
@@ -124,11 +152,27 @@ class ClassFileParser VALUE_OBJ_CLASS_SPEC {
     void set_contended(bool contended) { set_annotation(_sun_misc_Contended); }
     bool is_contended() { return has_annotation(_sun_misc_Contended); }
   };
+
+  // This class also doubles as a holder for metadata cleanup.
   class FieldAnnotationCollector: public AnnotationCollector {
+    ClassLoaderData* _loader_data;
+    AnnotationArray* _field_annotations;
+    AnnotationArray* _field_type_annotations;
   public:
-    FieldAnnotationCollector() : AnnotationCollector(_in_field) { }
+    FieldAnnotationCollector(ClassLoaderData* loader_data) :
+                                 AnnotationCollector(_in_field),
+                                 _loader_data(loader_data),
+                                 _field_annotations(NULL),
+                                 _field_type_annotations(NULL) {}
     void apply_to(FieldInfo* f);
+    ~FieldAnnotationCollector();
+    AnnotationArray* field_annotations()      { return _field_annotations; }
+    AnnotationArray* field_type_annotations() { return _field_type_annotations; }
+
+    void set_field_annotations(AnnotationArray* a)      { _field_annotations = a; }
+    void set_field_type_annotations(AnnotationArray* a) { _field_type_annotations = a; }
   };
+
   class MethodAnnotationCollector: public AnnotationCollector {
   public:
     MethodAnnotationCollector() : AnnotationCollector(_in_method) { }
@@ -152,38 +196,30 @@ class ClassFileParser VALUE_OBJ_CLASS_SPEC {
   void set_stream(ClassFileStream* st)             { _stream = st; }
 
   // Constant pool parsing
-  void parse_constant_pool_entries(ClassLoaderData* loader_data,
-                                   constantPoolHandle cp, int length, TRAPS);
+  void parse_constant_pool_entries(int length, TRAPS);
 
-  constantPoolHandle parse_constant_pool(ClassLoaderData* loader_data, TRAPS);
+  constantPoolHandle parse_constant_pool(TRAPS);
 
   // Interface parsing
-  Array<Klass*>* parse_interfaces(constantPoolHandle cp,
-                                  int length,
-                                  ClassLoaderData* loader_data,
+  Array<Klass*>* parse_interfaces(int length,
                                   Handle protection_domain,
                                   Symbol* class_name,
                                   bool* has_default_methods,
                                   TRAPS);
   void record_defined_class_dependencies(instanceKlassHandle defined_klass, TRAPS);
 
+  instanceKlassHandle parse_super_class(int super_class_index, TRAPS);
   // Field parsing
-  void parse_field_attributes(ClassLoaderData* loader_data,
-                              constantPoolHandle cp, u2 attributes_count,
+  void parse_field_attributes(u2 attributes_count,
                               bool is_static, u2 signature_index,
                               u2* constantvalue_index_addr,
                               bool* is_synthetic_addr,
                               u2* generic_signature_index_addr,
-                              AnnotationArray** field_annotations,
-                              AnnotationArray** field_type_annotations,
                               FieldAnnotationCollector* parsed_annotations,
                               TRAPS);
-  Array<u2>* parse_fields(ClassLoaderData* loader_data,
-                          Symbol* class_name,
-                          constantPoolHandle cp, bool is_interface,
+  Array<u2>* parse_fields(Symbol* class_name,
+                          bool is_interface,
                           FieldAllocationCount *fac,
-                          Array<AnnotationArray*>** fields_annotations,
-                          Array<AnnotationArray*>** fields_type_annotations,
                           u2* java_fields_count_ptr, TRAPS);
 
   void print_field_layout(Symbol* name,
@@ -195,65 +231,52 @@ class ClassFileParser VALUE_OBJ_CLASS_SPEC {
                           int static_fields_end);
 
   // Method parsing
-  methodHandle parse_method(ClassLoaderData* loader_data,
-                            constantPoolHandle cp,
-                            bool is_interface,
+  methodHandle parse_method(bool is_interface,
                             AccessFlags* promoted_flags,
                             TRAPS);
-  Array<Method*>* parse_methods(ClassLoaderData* loader_data,
-                                constantPoolHandle cp,
-                                bool is_interface,
+  Array<Method*>* parse_methods(bool is_interface,
                                 AccessFlags* promoted_flags,
                                 bool* has_final_method,
                                 bool* has_default_method,
                                 TRAPS);
-  Array<int>* sort_methods(ClassLoaderData* loader_data,
-                           Array<Method*>* methods,
-                           TRAPS);
-  u2* parse_exception_table(ClassLoaderData* loader_data,
-                            u4 code_length, u4 exception_table_length,
-                            constantPoolHandle cp, TRAPS);
+  intArray* sort_methods(Array<Method*>* methods);
+
+  u2* parse_exception_table(u4 code_length, u4 exception_table_length,
+                            TRAPS);
   void parse_linenumber_table(
       u4 code_attribute_length, u4 code_length,
       CompressedLineNumberWriteStream** write_stream, TRAPS);
   u2* parse_localvariable_table(u4 code_length, u2 max_locals, u4 code_attribute_length,
-                                constantPoolHandle cp, u2* localvariable_table_length,
+                                u2* localvariable_table_length,
                                 bool isLVTT, TRAPS);
   u2* parse_checked_exceptions(u2* checked_exceptions_length, u4 method_attribute_length,
-                               constantPoolHandle cp, TRAPS);
+                               TRAPS);
   void parse_type_array(u2 array_length, u4 code_length, u4* u1_index, u4* u2_index,
-                        u1* u1_array, u2* u2_array, constantPoolHandle cp, TRAPS);
-  Array<u1>* parse_stackmap_table(ClassLoaderData* loader_data, u4 code_attribute_length, TRAPS);
+                        u1* u1_array, u2* u2_array, TRAPS);
+  u1* parse_stackmap_table(u4 code_attribute_length, TRAPS);
 
   // Classfile attribute parsing
-  void parse_classfile_sourcefile_attribute(constantPoolHandle cp, TRAPS);
-  void parse_classfile_source_debug_extension_attribute(constantPoolHandle cp,
-                                                        int length, TRAPS);
-  u2   parse_classfile_inner_classes_attribute(ClassLoaderData* loader_data,
-                                               u1* inner_classes_attribute_start,
+  void parse_classfile_sourcefile_attribute(TRAPS);
+  void parse_classfile_source_debug_extension_attribute(int length, TRAPS);
+  u2   parse_classfile_inner_classes_attribute(u1* inner_classes_attribute_start,
                                                bool parsed_enclosingmethod_attribute,
                                                u2 enclosing_method_class_index,
                                                u2 enclosing_method_method_index,
-                                               constantPoolHandle cp,
                                                TRAPS);
-  void parse_classfile_attributes(ClassLoaderData* loader_data,
-                                  constantPoolHandle cp,
-                                  ClassAnnotationCollector* parsed_annotations,
+  void parse_classfile_attributes(ClassAnnotationCollector* parsed_annotations,
                                   TRAPS);
-  void parse_classfile_synthetic_attribute(constantPoolHandle cp, TRAPS);
-  void parse_classfile_signature_attribute(constantPoolHandle cp, TRAPS);
-  void parse_classfile_bootstrap_methods_attribute(ClassLoaderData* loader_data, constantPoolHandle cp, u4 attribute_length, TRAPS);
+  void parse_classfile_synthetic_attribute(TRAPS);
+  void parse_classfile_signature_attribute(TRAPS);
+  void parse_classfile_bootstrap_methods_attribute(u4 attribute_length, TRAPS);
 
   // Annotations handling
-  AnnotationArray* assemble_annotations(ClassLoaderData* loader_data,
-                                        u1* runtime_visible_annotations,
+  AnnotationArray* assemble_annotations(u1* runtime_visible_annotations,
                                         int runtime_visible_annotations_length,
                                         u1* runtime_invisible_annotations,
                                         int runtime_invisible_annotations_length, TRAPS);
   int skip_annotation(u1* buffer, int limit, int index);
   int skip_annotation_value(u1* buffer, int limit, int index);
-  void parse_annotations(ClassLoaderData* loader_data,
-                         u1* buffer, int limit, constantPoolHandle cp,
+  void parse_annotations(u1* buffer, int limit,
                          /* Results (currently, only one result is supported): */
                          AnnotationCollector* result,
                          TRAPS);
@@ -267,8 +290,7 @@ class ClassFileParser VALUE_OBJ_CLASS_SPEC {
                      int* nonstatic_oop_offsets,
                      unsigned int* nonstatic_oop_counts);
   void set_precomputed_flags(instanceKlassHandle k);
-  Array<Klass*>* compute_transitive_interfaces(ClassLoaderData* loader_data,
-                                               instanceKlassHandle super,
+  Array<Klass*>* compute_transitive_interfaces(instanceKlassHandle super,
                                                Array<Klass*>* local_ifs, TRAPS);
 
   // Format checker methods
@@ -318,7 +340,7 @@ class ClassFileParser VALUE_OBJ_CLASS_SPEC {
   bool is_supported_version(u2 major, u2 minor);
   bool has_illegal_visibility(jint flags);
 
-  void verify_constantvalue(int constantvalue_index, int signature_index, constantPoolHandle cp, TRAPS);
+  void verify_constantvalue(int constantvalue_index, int signature_index, TRAPS);
   void verify_legal_utf8(const unsigned char* buffer, int length, TRAPS);
   void verify_legal_class_name(Symbol* name, TRAPS);
   void verify_legal_field_name(Symbol* name, TRAPS);
@@ -359,10 +381,17 @@ class ClassFileParser VALUE_OBJ_CLASS_SPEC {
   // In older versions of the VM, Klass*s cannot sneak into early phases of
   // constant pool construction, but in later versions they can.
   // %%% Let's phase out the old is_klass_reference.
-  bool is_klass_reference(constantPoolHandle cp, int index) {
-    return (EnableInvokeDynamic
-            ? cp->tag_at(index).is_klass_or_reference()
-            : cp->tag_at(index).is_klass_reference());
+  bool valid_klass_reference_at(int index) {
+    return _cp->is_within_bounds(index) &&
+         (EnableInvokeDynamic
+            ? _cp->tag_at(index).is_klass_or_reference()
+            : _cp->tag_at(index).is_klass_reference());
+  }
+
+  // Checks that the cpool index is in range and is a utf8
+  bool valid_symbol_at(int cpool_index) {
+    return (_cp->is_within_bounds(cpool_index) &&
+            _cp->tag_at(cpool_index).is_utf8());
   }
 
   void copy_localvariable_table(ConstMethod* cm, int lvt_cnt,
@@ -373,8 +402,7 @@ class ClassFileParser VALUE_OBJ_CLASS_SPEC {
                                 u2** localvariable_type_table_start,
                                 TRAPS);
 
-  void copy_method_annotations(ClassLoaderData* loader_data,
-                               ConstMethod* cm,
+  void copy_method_annotations(ConstMethod* cm,
                                u1* runtime_visible_annotations,
                                int runtime_visible_annotations_length,
                                u1* runtime_invisible_annotations,
@@ -391,9 +419,15 @@ class ClassFileParser VALUE_OBJ_CLASS_SPEC {
                                int annotation_default_length,
                                TRAPS);
 
+  // lays out fields in class and returns the total oopmap count
+  void layout_fields(Handle class_loader, FieldAllocationCount* fac,
+                     ClassAnnotationCollector* parsed_annotations,
+                     FieldLayoutInfo* info, TRAPS);
+
  public:
   // Constructor
   ClassFileParser(ClassFileStream* st) { set_stream(st); }
+  ~ClassFileParser();
 
   // Parse .class file and return new Klass*. The Klass* is not hooked up
   // to the system dictionary or any other structures, so a .class file can
diff --git a/hotspot/src/share/vm/oops/constMethod.cpp b/hotspot/src/share/vm/oops/constMethod.cpp
index dfee4244920..98a29a2e1dc 100644
--- a/hotspot/src/share/vm/oops/constMethod.cpp
+++ b/hotspot/src/share/vm/oops/constMethod.cpp
@@ -67,6 +67,12 @@ ConstMethod::ConstMethod(int byte_code_size,
   set_size_of_parameters(0);
 }
 
+// Accessor that copies to metadata.
+void ConstMethod::copy_stackmap_data(ClassLoaderData* loader_data,
+                                     u1* sd, int length, TRAPS) {
+  _stackmap_data = MetadataFactory::new_array<u1>(loader_data, length, CHECK);
+  memcpy((void*)_stackmap_data->adr_at(0), (void*)sd, length);
+}
 
 // Deallocate metadata fields associated with ConstMethod*
 void ConstMethod::deallocate_contents(ClassLoaderData* loader_data) {
diff --git a/hotspot/src/share/vm/oops/constMethod.hpp b/hotspot/src/share/vm/oops/constMethod.hpp
index 21fa344bc9d..0c4212564b0 100644
--- a/hotspot/src/share/vm/oops/constMethod.hpp
+++ b/hotspot/src/share/vm/oops/constMethod.hpp
@@ -280,6 +280,7 @@ public:
   // stackmap table data
   Array<u1>* stackmap_data() const { return _stackmap_data; }
   void set_stackmap_data(Array<u1>* sd) { _stackmap_data = sd; }
+  void copy_stackmap_data(ClassLoaderData* loader_data, u1* sd, int length, TRAPS);
   bool has_stackmap_table() const { return _stackmap_data != NULL; }
 
   void init_fingerprint() {
diff --git a/hotspot/src/share/vm/oops/instanceKlass.cpp b/hotspot/src/share/vm/oops/instanceKlass.cpp
index 89cf23a35c8..e296c501ccb 100644
--- a/hotspot/src/share/vm/oops/instanceKlass.cpp
+++ b/hotspot/src/share/vm/oops/instanceKlass.cpp
@@ -165,7 +165,8 @@ HS_DTRACE_PROBE_DECL5(hotspot, class__initialization__end,
 
 volatile int InstanceKlass::_total_instanceKlass_count = 0;
 
-Klass* InstanceKlass::allocate_instance_klass(ClassLoaderData* loader_data,
+InstanceKlass* InstanceKlass::allocate_instance_klass(
+                                              ClassLoaderData* loader_data,
                                               int vtable_len,
                                               int itable_len,
                                               int static_field_size,
@@ -207,10 +208,35 @@ Klass* InstanceKlass::allocate_instance_klass(ClassLoaderData* loader_data,
         access_flags, is_anonymous);
   }
 
+  // Check for pending exception before adding to the loader data and incrementing
+  // class count.  Can get OOM here.
+  if (HAS_PENDING_EXCEPTION) {
+    return NULL;
+  }
+
+  // Add all classes to our internal class loader list here,
+  // including classes in the bootstrap (NULL) class loader.
+  loader_data->add_class(ik);
+
   Atomic::inc(&_total_instanceKlass_count);
   return ik;
 }
 
+
+// copy method ordering from resource area to Metaspace
+void InstanceKlass::copy_method_ordering(intArray* m, TRAPS) {
+  if (m != NULL) {
+    // allocate a new array and copy contents (memcpy?)
+    _method_ordering = MetadataFactory::new_array<int>(class_loader_data(), m->length(), CHECK);
+    for (int i = 0; i < m->length(); i++) {
+      _method_ordering->at_put(i, m->at(i));
+    }
+  } else {
+    _method_ordering = Universe::the_empty_int_array();
+  }
+}
+
+
 InstanceKlass::InstanceKlass(int vtable_len,
                              int itable_len,
                              int static_field_size,
@@ -223,9 +249,6 @@ InstanceKlass::InstanceKlass(int vtable_len,
   int iksize = InstanceKlass::size(vtable_len, itable_len, nonstatic_oop_map_size,
                                    access_flags.is_interface(), is_anonymous);
 
-  // The sizes of these these three variables are used for determining the
-  // size of the instanceKlassOop. It is critical that these are set to the right
-  // sizes before the first GC, i.e., when we allocate the mirror.
   set_vtable_length(vtable_len);
   set_itable_length(itable_len);
   set_static_field_size(static_field_size);
@@ -288,12 +311,51 @@ InstanceKlass::InstanceKlass(int vtable_len,
 }
 
 
+void InstanceKlass::deallocate_methods(ClassLoaderData* loader_data,
+                                       Array<Method*>* methods) {
+  if (methods != NULL && methods != Universe::the_empty_method_array()) {
+    for (int i = 0; i < methods->length(); i++) {
+      Method* method = methods->at(i);
+      if (method == NULL) continue;  // maybe null if error processing
+      // Only want to delete methods that are not executing for RedefineClasses.
+      // The previous version will point to them so they're not totally dangling
+      assert (!method->on_stack(), "shouldn't be called with methods on stack");
+      MetadataFactory::free_metadata(loader_data, method);
+    }
+    MetadataFactory::free_array<Method*>(loader_data, methods);
+  }
+}
+
+void InstanceKlass::deallocate_interfaces(ClassLoaderData* loader_data,
+                                          Klass* super_klass,
+                                          Array<Klass*>* local_interfaces,
+                                          Array<Klass*>* transitive_interfaces) {
+  // Only deallocate transitive interfaces if not empty, same as super class
+  // or same as local interfaces.  See code in parseClassFile.
+  Array<Klass*>* ti = transitive_interfaces;
+  if (ti != Universe::the_empty_klass_array() && ti != local_interfaces) {
+    // check that the interfaces don't come from super class
+    Array<Klass*>* sti = (super_klass == NULL) ? NULL :
+                    InstanceKlass::cast(super_klass)->transitive_interfaces();
+    if (ti != sti) {
+      MetadataFactory::free_array<Klass*>(loader_data, ti);
+    }
+  }
+
+  // local interfaces can be empty
+  if (local_interfaces != Universe::the_empty_klass_array()) {
+    MetadataFactory::free_array<Klass*>(loader_data, local_interfaces);
+  }
+}
+
 // This function deallocates the metadata and C heap pointers that the
 // InstanceKlass points to.
 void InstanceKlass::deallocate_contents(ClassLoaderData* loader_data) {
 
   // Orphan the mirror first, CMS thinks it's still live.
-  java_lang_Class::set_klass(java_mirror(), NULL);
+  if (java_mirror() != NULL) {
+    java_lang_Class::set_klass(java_mirror(), NULL);
+  }
 
   // Need to take this class off the class loader data list.
   loader_data->remove_class(this);
@@ -308,17 +370,7 @@ void InstanceKlass::deallocate_contents(ClassLoaderData* loader_data) {
   // reference counting symbol names.
   release_C_heap_structures();
 
-  Array<Method*>* ms = methods();
-  if (ms != Universe::the_empty_method_array()) {
-    for (int i = 0; i <= methods()->length() -1 ; i++) {
-      Method* method = methods()->at(i);
-      // Only want to delete methods that are not executing for RedefineClasses.
-      // The previous version will point to them so they're not totally dangling
-      assert (!method->on_stack(), "shouldn't be called with methods on stack");
-      MetadataFactory::free_metadata(loader_data, method);
-    }
-    MetadataFactory::free_array<Method*>(loader_data, methods());
-  }
+  deallocate_methods(loader_data, methods());
   set_methods(NULL);
 
   if (method_ordering() != Universe::the_empty_int_array()) {
@@ -335,24 +387,8 @@ void InstanceKlass::deallocate_contents(ClassLoaderData* loader_data) {
   }
   set_secondary_supers(NULL);
 
-  // Only deallocate transitive interfaces if not empty, same as super class
-  // or same as local interfaces.   See code in parseClassFile.
-  Array<Klass*>* ti = transitive_interfaces();
-  if (ti != Universe::the_empty_klass_array() && ti != local_interfaces()) {
-    // check that the interfaces don't come from super class
-    Array<Klass*>* sti = (super() == NULL) ? NULL :
-       InstanceKlass::cast(super())->transitive_interfaces();
-    if (ti != sti) {
-      MetadataFactory::free_array<Klass*>(loader_data, ti);
-    }
-  }
+  deallocate_interfaces(loader_data, super(), local_interfaces(), transitive_interfaces());
   set_transitive_interfaces(NULL);
-
-  // local interfaces can be empty
-  Array<Klass*>* li = local_interfaces();
-  if (li != Universe::the_empty_klass_array()) {
-    MetadataFactory::free_array<Klass*>(loader_data, li);
-  }
   set_local_interfaces(NULL);
 
   MetadataFactory::free_array<jushort>(loader_data, fields());
@@ -360,9 +396,11 @@ void InstanceKlass::deallocate_contents(ClassLoaderData* loader_data) {
 
   // If a method from a redefined class is using this constant pool, don't
   // delete it, yet.  The new class's previous version will point to this.
-  assert (!constants()->on_stack(), "shouldn't be called if anything is onstack");
-  MetadataFactory::free_metadata(loader_data, constants());
-  set_constants(NULL);
+  if (constants() != NULL) {
+    assert (!constants()->on_stack(), "shouldn't be called if anything is onstack");
+    MetadataFactory::free_metadata(loader_data, constants());
+    set_constants(NULL);
+  }
 
   if (inner_classes() != Universe::the_empty_short_array()) {
     MetadataFactory::free_array<jushort>(loader_data, inner_classes());
diff --git a/hotspot/src/share/vm/oops/instanceKlass.hpp b/hotspot/src/share/vm/oops/instanceKlass.hpp
index c4dffdcb602..9d94b2436d9 100644
--- a/hotspot/src/share/vm/oops/instanceKlass.hpp
+++ b/hotspot/src/share/vm/oops/instanceKlass.hpp
@@ -147,7 +147,8 @@ class InstanceKlass: public Klass {
                 AccessFlags access_flags,
                 bool is_anonymous);
  public:
-  static Klass* allocate_instance_klass(ClassLoaderData* loader_data,
+  static InstanceKlass* allocate_instance_klass(
+                                          ClassLoaderData* loader_data,
                                           int vtable_len,
                                           int itable_len,
                                           int static_field_size,
@@ -266,7 +267,6 @@ class InstanceKlass: public Klass {
   u1              _init_state;                    // state of class
   u1              _reference_type;                // reference type
 
-
   JvmtiCachedClassFieldMap* _jvmti_cached_class_field_map;  // JVMTI: used during heap iteration
 
   NOT_PRODUCT(int _verify_count;)  // to avoid redundant verifies
@@ -358,16 +358,19 @@ class InstanceKlass: public Klass {
   // method ordering
   Array<int>* method_ordering() const     { return _method_ordering; }
   void set_method_ordering(Array<int>* m) { _method_ordering = m; }
+  void copy_method_ordering(intArray* m, TRAPS);
 
   // interfaces
   Array<Klass*>* local_interfaces() const          { return _local_interfaces; }
   void set_local_interfaces(Array<Klass*>* a)      {
     guarantee(_local_interfaces == NULL || a == NULL, "Just checking");
     _local_interfaces = a; }
+
   Array<Klass*>* transitive_interfaces() const     { return _transitive_interfaces; }
   void set_transitive_interfaces(Array<Klass*>* a) {
     guarantee(_transitive_interfaces == NULL || a == NULL, "Just checking");
-    _transitive_interfaces = a; }
+    _transitive_interfaces = a;
+  }
 
  private:
   friend class fieldDescriptor;
@@ -383,10 +386,9 @@ class InstanceKlass: public Klass {
   int java_fields_count() const           { return (int)_java_fields_count; }
 
   Array<u2>* fields() const            { return _fields; }
-
   void set_fields(Array<u2>* f, u2 java_fields_count) {
     guarantee(_fields == NULL || f == NULL, "Just checking");
-    _fields =  f;
+    _fields = f;
     _java_fields_count = java_fields_count;
   }
 
@@ -916,8 +918,15 @@ class InstanceKlass: public Klass {
   void clean_method_data(BoolObjectClosure* is_alive);
 
   // Explicit metaspace deallocation of fields
-  // For RedefineClasses, we need to deallocate instanceKlasses
+  // For RedefineClasses and class file parsing errors, we need to deallocate
+  // instanceKlasses and the metadata they point to.
   void deallocate_contents(ClassLoaderData* loader_data);
+  static void deallocate_methods(ClassLoaderData* loader_data,
+                                 Array<Method*>* methods);
+  void static deallocate_interfaces(ClassLoaderData* loader_data,
+                                    Klass* super_klass,
+                                    Array<Klass*>* local_interfaces,
+                                    Array<Klass*>* transitive_interfaces);
 
   // The constant pool is on stack if any of the methods are executing or
   // referenced by handles.

From 46a623ec88c0bf281016811e35d2c81c907c8272 Mon Sep 17 00:00:00 2001
From: Morris Meyer <morris@openjdk.org>
Date: Thu, 14 Mar 2013 07:44:18 -0700
Subject: [PATCH 303/311] 8008560: [parfait] Null pointer deference in
 hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp

Add null pointer check in signal handler

Reviewed-by: kvn
---
 hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp b/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp
index 9eabc200bb8..aa36599ea2a 100644
--- a/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp
+++ b/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp
@@ -516,7 +516,7 @@ JVM_handle_bsd_signal(int sig,
         // here if the underlying file has been truncated.
         // Do not crash the VM in such a case.
         CodeBlob* cb = CodeCache::find_blob_unsafe(pc);
-        nmethod* nm = cb->is_nmethod() ? (nmethod*)cb : NULL;
+        nmethod* nm = (cb != NULL && cb->is_nmethod()) ? (nmethod*)cb : NULL;
         if (nm != NULL && nm->has_unsafe_access()) {
           stub = StubRoutines::handler_for_unsafe_access();
         }

From 7866abdf81234b31596790493ec5545727ae994a Mon Sep 17 00:00:00 2001
From: David Katleman <katleman@openjdk.org>
Date: Thu, 14 Mar 2013 15:00:05 -0700
Subject: [PATCH 304/311] Added tag jdk8-b81 for changeset 13e9af9186a2

---
 .hgtags-top-repo | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags-top-repo b/.hgtags-top-repo
index e869333243b..8376608abe9 100644
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@@ -202,3 +202,4 @@ b43aa5bd8ca5c8121336495382d35ecfa7a71536 jdk8-b74
 fd1a5574cf68af24bfd52decc37ac6361afb278a jdk8-b78
 91d35211e74464dca5edf9b66ab01d0d0d8cded7 jdk8-b79
 907a926d3c96472f357617b48b6b968ea855c23c jdk8-b80
+145dbc56f931c134e837b675b9e6e7bf08902e93 jdk8-b81

From 4606c00f0dd4fb75ea0113b4fb41e3a597cf017a Mon Sep 17 00:00:00 2001
From: David Katleman <katleman@openjdk.org>
Date: Thu, 14 Mar 2013 15:00:09 -0700
Subject: [PATCH 305/311] Added tag jdk8-b81 for changeset f2ef1e5c2955

---
 corba/.hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/corba/.hgtags b/corba/.hgtags
index 7e7b0160fc2..edf54fe6b06 100644
--- a/corba/.hgtags
+++ b/corba/.hgtags
@@ -202,3 +202,4 @@ d4e68ce17795601017ac2f952baad7272942c36e jdk8-b75
 27d6368ae8ba570c31c2f0e696d39c99fa2f4538 jdk8-b78
 e41fb1aa0329767b2737303c994e38bede1baa07 jdk8-b79
 5f3d4a6bdd027a1631d97e2dfff63fd5e46987a4 jdk8-b80
+2a00aeeb466b9dee22508f6261f63b70f9c696fe jdk8-b81

From 82f7d021b6394b1d01098d2e38ad2b8e5ad076de Mon Sep 17 00:00:00 2001
From: David Katleman <katleman@openjdk.org>
Date: Thu, 14 Mar 2013 15:00:19 -0700
Subject: [PATCH 306/311] Added tag jdk8-b81 for changeset 25c319ff4cf4

---
 hotspot/.hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hotspot/.hgtags b/hotspot/.hgtags
index 5bf8e9848bb..829f4cd65f4 100644
--- a/hotspot/.hgtags
+++ b/hotspot/.hgtags
@@ -322,3 +322,4 @@ d5e12e7d2f719144d84903d9151455661c47b476 jdk8-b78
 df5396524152118535c36da5801d828b560d19a2 hs25-b21
 4a198b201f3ce84433fa94a3ca65d061473e7c4c jdk8-b80
 dd6350b4abc4a6c19c89dd982cc0e4f3d119885c hs25-b22
+65b797426a3bec6e91b64085a0cfb94adadb634a jdk8-b81

From 4e8c9ce3082e9d5d00d093a374d6c6ac32e18fd7 Mon Sep 17 00:00:00 2001
From: David Katleman <katleman@openjdk.org>
Date: Thu, 14 Mar 2013 15:00:33 -0700
Subject: [PATCH 307/311] Added tag jdk8-b81 for changeset 86a86261de2b

---
 jdk/.hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jdk/.hgtags b/jdk/.hgtags
index fbd3f71e449..92fe10a1d9a 100644
--- a/jdk/.hgtags
+++ b/jdk/.hgtags
@@ -202,3 +202,4 @@ b2fc8e31cecc35b76188e821d4c5dc0e0b74ac24 jdk8-b77
 00b7535d743f83eda763c10b3c9ea19ba4b67f55 jdk8-b78
 c933505d75c2a0a671f06d6dac5d2237a9228d2d jdk8-b79
 dfb40f066c6ce129822f0f5dc2ac89173808781a jdk8-b80
+c0f8022eba536dcdc8aae659005b33f3982b9368 jdk8-b81

From 943bd88ce1bf08fd45dcd8b82be21374f0e05e76 Mon Sep 17 00:00:00 2001
From: Alejandro Murillo <amurillo@openjdk.org>
Date: Fri, 15 Mar 2013 11:18:40 -0700
Subject: [PATCH 308/311] Added tag hs25-b23 for changeset 57159db35c41

---
 hotspot/.hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hotspot/.hgtags b/hotspot/.hgtags
index 829f4cd65f4..aa835932b92 100644
--- a/hotspot/.hgtags
+++ b/hotspot/.hgtags
@@ -323,3 +323,4 @@ df5396524152118535c36da5801d828b560d19a2 hs25-b21
 4a198b201f3ce84433fa94a3ca65d061473e7c4c jdk8-b80
 dd6350b4abc4a6c19c89dd982cc0e4f3d119885c hs25-b22
 65b797426a3bec6e91b64085a0cfb94adadb634a jdk8-b81
+0631ebcc45f05c73b09a56c2586685af1f781c1d hs25-b23

From 35dc8be1bf33219b53f08a2a6e89d47c55d28a04 Mon Sep 17 00:00:00 2001
From: Omair Majid <omajid@openjdk.org>
Date: Mon, 18 Mar 2013 10:46:49 -0400
Subject: [PATCH 309/311] 8010030: Allow configure to detect if EC
 implementation is present

Reviewed-by: andrew, dholmes
---
 jdk/makefiles/CompileNativeLibraries.gmk | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/jdk/makefiles/CompileNativeLibraries.gmk b/jdk/makefiles/CompileNativeLibraries.gmk
index 9df22fe8b6a..4c5d8dab855 100644
--- a/jdk/makefiles/CompileNativeLibraries.gmk
+++ b/jdk/makefiles/CompileNativeLibraries.gmk
@@ -2665,11 +2665,8 @@ BUILD_LIBRARIES += $(BUILD_LIBJ2PKCS11)
 
 ##########################################################################################
 
-ifndef DISABLE_INTREE_EC
-#
-# TODO Set DISABLE_INTREE_EC in configure if src/share/native/sun/security/ec/impl
-#      is not present
-#
+ifeq ($(ENABLE_INTREE_EC),yes)
+
 BUILD_LIBSUNEC_FLAGS:= -I$(JDK_TOPDIR)/src/share/native/sun/security/ec \
                        -I$(JDK_TOPDIR)/src/share/native/sun/security/ec/impl
 

From 7b22402218b6eb377d3e07fc586ab3fedf988db8 Mon Sep 17 00:00:00 2001
From: Omair Majid <omajid@openjdk.org>
Date: Mon, 18 Mar 2013 10:47:37 -0400
Subject: [PATCH 310/311] 8010030: Allow configure to detect if EC
 implementation is present

Reviewed-by: andrew, dholmes
---
 common/autoconf/configure.ac           |  1 +
 common/autoconf/generated-configure.sh | 25 ++++++++++++++++++++++++-
 common/autoconf/jdk-options.m4         | 19 +++++++++++++++++++
 common/autoconf/spec.gmk.in            |  1 +
 4 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/common/autoconf/configure.ac b/common/autoconf/configure.ac
index da9996f74d9..5e632c4ecb8 100644
--- a/common/autoconf/configure.ac
+++ b/common/autoconf/configure.ac
@@ -194,6 +194,7 @@ BASIC_COMPILE_FIXPATH
 ###############################################################################
 
 JDKOPT_SETUP_BUILD_TWEAKS
+JDKOPT_DETECT_INTREE_EC
 
 ###############################################################################
 #
diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
index bb61656ff39..85a453c9d55 100644
--- a/common/autoconf/generated-configure.sh
+++ b/common/autoconf/generated-configure.sh
@@ -612,6 +612,7 @@ SJAVAC_SERVER_JAVA
 JOBS
 MEMORY_SIZE
 NUM_CORES
+ENABLE_INTREE_EC
 SALIB_NAME
 HOTSPOT_MAKE_ARGS
 FIXPATH
@@ -3752,7 +3753,7 @@ fi
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1363150186
+DATE_WHEN_GENERATED=1363617192
 
 ###############################################################################
 #
@@ -10784,6 +10785,12 @@ else
 fi
 
 
+###############################################################################
+#
+# Enable or disable the elliptic curve crypto implementation
+#
+
+
 ###############################################################################
 #
 # Compress jars
@@ -31694,6 +31701,22 @@ fi
 
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if elliptic curve crypto implementation is present" >&5
+$as_echo_n "checking if elliptic curve crypto implementation is present... " >&6; }
+
+if test -d "${SRC_ROOT}/jdk/src/share/native/sun/security/ec/impl"; then
+    ENABLE_INTREE_EC=yes
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+    ENABLE_INTREE_EC=no
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+
 ###############################################################################
 #
 # Configure parts of the build that only affect the build performance,
diff --git a/common/autoconf/jdk-options.m4 b/common/autoconf/jdk-options.m4
index 48eb3f85c0e..d3d55e52952 100644
--- a/common/autoconf/jdk-options.m4
+++ b/common/autoconf/jdk-options.m4
@@ -364,6 +364,25 @@ else
 fi
 AC_SUBST(UNLIMITED_CRYPTO)
 
+###############################################################################
+#
+# Enable or disable the elliptic curve crypto implementation
+#
+AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC],
+[
+AC_MSG_CHECKING([if elliptic curve crypto implementation is present])
+
+if test -d "${SRC_ROOT}/jdk/src/share/native/sun/security/ec/impl"; then
+    ENABLE_INTREE_EC=yes
+    AC_MSG_RESULT([yes])
+else
+    ENABLE_INTREE_EC=no
+    AC_MSG_RESULT([no])
+fi
+
+AC_SUBST(ENABLE_INTREE_EC)
+])
+
 ###############################################################################
 #
 # Compress jars
diff --git a/common/autoconf/spec.gmk.in b/common/autoconf/spec.gmk.in
index 92c6d9cb98e..bfba636a7b1 100644
--- a/common/autoconf/spec.gmk.in
+++ b/common/autoconf/spec.gmk.in
@@ -539,6 +539,7 @@ endif
 
 # Build setup
 ENABLE_JFR=@ENABLE_JFR@
+ENABLE_INTREE_EC=@ENABLE_INTREE_EC@
 USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@
 USE_EXTERNAL_LIBGIF:=@USE_EXTERNAL_LIBGIF@
 USE_EXTERNAL_LIBZ:=@USE_EXTERNAL_LIBZ@

From 2e4abcea23a6303795642a1cbf42653db1b97779 Mon Sep 17 00:00:00 2001
From: Omair Majid <omajid@openjdk.org>
Date: Tue, 19 Mar 2013 11:25:05 -0400
Subject: [PATCH 311/311] 8010277: Configure doesn't fail when Xrender.h is
 missing

Reviewed-by: andrew
---
 common/autoconf/generated-configure.sh | 4 ++--
 common/autoconf/libraries.m4           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
index 85a453c9d55..4d9ec980421 100644
--- a/common/autoconf/generated-configure.sh
+++ b/common/autoconf/generated-configure.sh
@@ -3753,7 +3753,7 @@ fi
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1363617192
+DATE_WHEN_GENERATED=1363706268
 
 ###############################################################################
 #
@@ -29830,7 +29830,7 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
 _ACEOF
  X11_A_OK=yes
 else
-  X11_A_OK=no
+  X11_A_OK=no; break
 fi
 
 done
diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4
index 91b0a846e5f..6cc9d634b60 100644
--- a/common/autoconf/libraries.m4
+++ b/common/autoconf/libraries.m4
@@ -182,7 +182,7 @@ CFLAGS="$CFLAGS $X_CFLAGS"
 # Need to include Xlib.h and Xutil.h to avoid "present but cannot be compiled" warnings on Solaris 10
 AC_CHECK_HEADERS([X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h],
                  [X11_A_OK=yes],
-                 [X11_A_OK=no],
+                 [X11_A_OK=no; break],
                  [ # include <X11/Xlib.h>
                    # include <X11/Xutil.h>
                  ])